commit c478a783c00de3bc22dbf09ba689946c3fda37d2
Author: markpollack <mark.pollack@springsource.com>
Date:   Fri May 30 22:55:02 2008 +0000

    Initial import!

diff --git a/Spring.Net.2002.sln b/Spring.Net.2002.sln
new file mode 100644
index 00000000..91b574fa
--- /dev/null
+++ b/Spring.Net.2002.sln
@@ -0,0 +1,34 @@
+Microsoft Visual Studio Solution File, Format Version 7.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2002", "test\Spring\Spring.Core.Tests\Spring.Core.Tests.2002.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2002", "src\Spring\Spring.Core\Spring.Core.2002.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2002", "src\Spring\Spring.Aop\Spring.Aop.2002.csproj", "{828F16E3-20A4-4EC4-A8F4-CD95B8ED44C9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.Tests.2002", "test\Spring\Spring.Aop.Tests\Spring.Aop.Tests.2002.csproj", "{F856BCAE-421E-469A-B75F-E41E5BA7F160}"
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		ConfigName.0 = Debug-1.0
+		ConfigName.1 = Release-1.0
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug-1.0.ActiveCfg = Debug|.NET
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release-1.0.ActiveCfg = Release|.NET
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug-1.0.ActiveCfg = Debug|.NET
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug-1.0.Build.0 = Debug|.NET
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release-1.0.ActiveCfg = Release|.NET
+		{828F16E3-20A4-4EC4-A8F4-CD95B8ED44C9}.Debug-1.0.ActiveCfg = Debug|.NET
+		{828F16E3-20A4-4EC4-A8F4-CD95B8ED44C9}.Release-1.0.ActiveCfg = Release|.NET
+		{F856BCAE-421E-469A-B75F-E41E5BA7F160}.Debug-1.0.ActiveCfg = Debug|.NET
+		{F856BCAE-421E-469A-B75F-E41E5BA7F160}.Release-1.0.ActiveCfg = Release|.NET
+	EndGlobalSection
+	GlobalSection(SolutionItems) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/Spring.Net.2003.sln b/Spring.Net.2003.sln
new file mode 100644
index 00000000..63d7a2c3
--- /dev/null
+++ b/Spring.Net.2003.sln
@@ -0,0 +1,226 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2003", "src\Spring\Spring.Core\Spring.Core.2003.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2003", "test\Spring\Spring.Core.Tests\Spring.Core.Tests.2003.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2003", "src\Spring\Spring.Aop\Spring.Aop.2003.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.Tests.2003", "test\Spring\Spring.Aop.Tests\Spring.Aop.Tests.2003.csproj", "{2111596A-0327-4C9D-8919-294FBD988A23}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.2003", "src\Spring\Spring.Web\Spring.Web.2003.csproj", "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Tests.2003", "test\Spring\Spring.Web.Tests\Spring.Web.Tests.2003.csproj", "{EB2587B7-8B26-4FBC-852A-4128D5CACAFC}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Services.2003", "src\Spring\Spring.Services\Spring.Services.2003.csproj", "{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Services.Tests.2003", "test\Spring\Spring.Services.Tests\Spring.Services.Tests.2003.csproj", "{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2003", "src\Spring\Spring.Data\Spring.Data.2003.csproj", "{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Tests.2003", "test\Spring\Spring.Data.Tests\Spring.Data.Tests.2003.csproj", "{C5585365-561C-4EC4-8956-87FFBD9AB1CD}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Integration.Tests.2003", "test\Spring\Spring.Data.Integration.Tests\Spring.Data.Integration.Tests.2003.csproj", "{A9D3732A-D40B-4C35-80CE-9C4A53D2DEAD}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.2003", "src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2003.csproj", "{6B8639E3-88BB-4F7B-9F23-699E84C30D58}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.2003", "src\Spring\Spring.Data.NHibernate\Spring.Data.NHibernate.2003.csproj", "{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.Integration.Tests.2003", "test\Spring\Spring.Data.NHibernate.Integration.Tests\Spring.Data.NHibernate.Integration.Tests.2003.csproj", "{8DA67FF2-C473-4329-8FF6-3747182196D7}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.Tests.2003", "test\Spring\Spring.Data.NHibernate.Tests\Spring.Data.NHibernate.Tests.2003.csproj", "{8755D942-7828-4971-835B-37A5992C06C9}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.Tests.2003", "test\Spring\Spring.Testing.NUnit.Tests\Spring.Testing.NUnit.Tests.2003.csproj", "{E2689B4A-A951-420E-A274-BE5EBCD5F8D8}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate12.2003", "src\Spring\Spring.Data.NHibernate12\Spring.Data.NHibernate12.2003.csproj", "{2E12AE3E-5690-46A5-9F89-80F1D3004ADB}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Debug-1.1 = Debug-1.1
+		Release = Release
+		Release-1.1 = Release-1.1
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug.ActiveCfg = Debug-1.1|.NET
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug.Build.0 = Debug-1.1|.NET
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release.ActiveCfg = Release-1.1|.NET
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release.Build.0 = Release-1.1|.NET
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Release-1.1.Build.0 = Release-1.1|.NET
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug.ActiveCfg = Debug-1.1|.NET
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug.Build.0 = Debug-1.1|.NET
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release.ActiveCfg = Release-1.1|.NET
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release.Build.0 = Release-1.1|.NET
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release-1.1.Build.0 = Release-1.1|.NET
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug.ActiveCfg = Debug-1.1|.NET
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug.Build.0 = Debug-1.1|.NET
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release.ActiveCfg = Release-1.1|.NET
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release.Build.0 = Release-1.1|.NET
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release-1.1.Build.0 = Release-1.1|.NET
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug.ActiveCfg = Debug-1.1|.NET
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug.Build.0 = Debug-1.1|.NET
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release.ActiveCfg = Release-1.1|.NET
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release.Build.0 = Release-1.1|.NET
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release-1.1.Build.0 = Release-1.1|.NET
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug.ActiveCfg = Debug-1.1|.NET
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug.Build.0 = Debug-1.1|.NET
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release.ActiveCfg = Release-1.1|.NET
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release.Build.0 = Release-1.1|.NET
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release-1.1.Build.0 = Release-1.1|.NET
+		{EB2587B7-8B26-4FBC-852A-4128D5CACAFC}.Debug.ActiveCfg = Debug-1.1|.NET
+		{EB2587B7-8B26-4FBC-852A-4128D5CACAFC}.Debug.Build.0 = Debug-1.1|.NET
+		{EB2587B7-8B26-4FBC-852A-4128D5CACAFC}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{EB2587B7-8B26-4FBC-852A-4128D5CACAFC}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{EB2587B7-8B26-4FBC-852A-4128D5CACAFC}.Release.ActiveCfg = Release-1.1|.NET
+		{EB2587B7-8B26-4FBC-852A-4128D5CACAFC}.Release.Build.0 = Release-1.1|.NET
+		{EB2587B7-8B26-4FBC-852A-4128D5CACAFC}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{EB2587B7-8B26-4FBC-852A-4128D5CACAFC}.Release-1.1.Build.0 = Release-1.1|.NET
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Debug.ActiveCfg = Debug-1.1|.NET
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Debug.Build.0 = Debug-1.1|.NET
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Release.ActiveCfg = Release-1.1|.NET
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Release.Build.0 = Release-1.1|.NET
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Release-1.1.Build.0 = Release-1.1|.NET
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Debug.ActiveCfg = Debug-1.1|.NET
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Debug.Build.0 = Debug-1.1|.NET
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Release.ActiveCfg = Release-1.1|.NET
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Release.Build.0 = Release-1.1|.NET
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Release-1.1.Build.0 = Release-1.1|.NET
+		{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}.Debug.ActiveCfg = Debug-1.1|.NET
+		{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}.Debug.Build.0 = Debug-1.1|.NET
+		{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}.Release.ActiveCfg = Release-1.1|.NET
+		{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}.Release.Build.0 = Release-1.1|.NET
+		{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}.Release-1.1.Build.0 = Release-1.1|.NET
+		{C5585365-561C-4EC4-8956-87FFBD9AB1CD}.Debug.ActiveCfg = Debug-1.1|.NET
+		{C5585365-561C-4EC4-8956-87FFBD9AB1CD}.Debug.Build.0 = Debug-1.1|.NET
+		{C5585365-561C-4EC4-8956-87FFBD9AB1CD}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{C5585365-561C-4EC4-8956-87FFBD9AB1CD}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{C5585365-561C-4EC4-8956-87FFBD9AB1CD}.Release.ActiveCfg = Release-1.1|.NET
+		{C5585365-561C-4EC4-8956-87FFBD9AB1CD}.Release.Build.0 = Release-1.1|.NET
+		{C5585365-561C-4EC4-8956-87FFBD9AB1CD}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{C5585365-561C-4EC4-8956-87FFBD9AB1CD}.Release-1.1.Build.0 = Release-1.1|.NET
+		{A9D3732A-D40B-4C35-80CE-9C4A53D2DEAD}.Debug.ActiveCfg = Debug-1.1|.NET
+		{A9D3732A-D40B-4C35-80CE-9C4A53D2DEAD}.Debug.Build.0 = Debug-1.1|.NET
+		{A9D3732A-D40B-4C35-80CE-9C4A53D2DEAD}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{A9D3732A-D40B-4C35-80CE-9C4A53D2DEAD}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{A9D3732A-D40B-4C35-80CE-9C4A53D2DEAD}.Release.ActiveCfg = Release-1.1|.NET
+		{A9D3732A-D40B-4C35-80CE-9C4A53D2DEAD}.Release.Build.0 = Release-1.1|.NET
+		{A9D3732A-D40B-4C35-80CE-9C4A53D2DEAD}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{A9D3732A-D40B-4C35-80CE-9C4A53D2DEAD}.Release-1.1.Build.0 = Release-1.1|.NET
+		{6B8639E3-88BB-4F7B-9F23-699E84C30D58}.Debug.ActiveCfg = Debug-1.1|.NET
+		{6B8639E3-88BB-4F7B-9F23-699E84C30D58}.Debug.Build.0 = Debug-1.1|.NET
+		{6B8639E3-88BB-4F7B-9F23-699E84C30D58}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{6B8639E3-88BB-4F7B-9F23-699E84C30D58}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{6B8639E3-88BB-4F7B-9F23-699E84C30D58}.Release.ActiveCfg = Release-1.1|.NET
+		{6B8639E3-88BB-4F7B-9F23-699E84C30D58}.Release.Build.0 = Release-1.1|.NET
+		{6B8639E3-88BB-4F7B-9F23-699E84C30D58}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{6B8639E3-88BB-4F7B-9F23-699E84C30D58}.Release-1.1.Build.0 = Release-1.1|.NET
+		{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}.Debug.ActiveCfg = Debug-1.1|.NET
+		{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}.Debug.Build.0 = Debug-1.1|.NET
+		{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}.Release.ActiveCfg = Release-1.1|.NET
+		{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}.Release.Build.0 = Release-1.1|.NET
+		{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}.Release-1.1.Build.0 = Release-1.1|.NET
+		{8DA67FF2-C473-4329-8FF6-3747182196D7}.Debug.ActiveCfg = Debug-1.1|.NET
+		{8DA67FF2-C473-4329-8FF6-3747182196D7}.Debug.Build.0 = Debug-1.1|.NET
+		{8DA67FF2-C473-4329-8FF6-3747182196D7}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{8DA67FF2-C473-4329-8FF6-3747182196D7}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{8DA67FF2-C473-4329-8FF6-3747182196D7}.Release.ActiveCfg = Release-1.1|.NET
+		{8DA67FF2-C473-4329-8FF6-3747182196D7}.Release.Build.0 = Release-1.1|.NET
+		{8DA67FF2-C473-4329-8FF6-3747182196D7}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{8DA67FF2-C473-4329-8FF6-3747182196D7}.Release-1.1.Build.0 = Release-1.1|.NET
+		{8755D942-7828-4971-835B-37A5992C06C9}.Debug.ActiveCfg = Debug-1.1|.NET
+		{8755D942-7828-4971-835B-37A5992C06C9}.Debug.Build.0 = Debug-1.1|.NET
+		{8755D942-7828-4971-835B-37A5992C06C9}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{8755D942-7828-4971-835B-37A5992C06C9}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{8755D942-7828-4971-835B-37A5992C06C9}.Release.ActiveCfg = Release-1.1|.NET
+		{8755D942-7828-4971-835B-37A5992C06C9}.Release.Build.0 = Release-1.1|.NET
+		{8755D942-7828-4971-835B-37A5992C06C9}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{8755D942-7828-4971-835B-37A5992C06C9}.Release-1.1.Build.0 = Release-1.1|.NET
+		{E2689B4A-A951-420E-A274-BE5EBCD5F8D8}.Debug.ActiveCfg = Debug-1.1|.NET
+		{E2689B4A-A951-420E-A274-BE5EBCD5F8D8}.Debug.Build.0 = Debug-1.1|.NET
+		{E2689B4A-A951-420E-A274-BE5EBCD5F8D8}.Debug-1.1.ActiveCfg = Debug-1.1|.NET
+		{E2689B4A-A951-420E-A274-BE5EBCD5F8D8}.Debug-1.1.Build.0 = Debug-1.1|.NET
+		{E2689B4A-A951-420E-A274-BE5EBCD5F8D8}.Release.ActiveCfg = Release-1.1|.NET
+		{E2689B4A-A951-420E-A274-BE5EBCD5F8D8}.Release.Build.0 = Release-1.1|.NET
+		{E2689B4A-A951-420E-A274-BE5EBCD5F8D8}.Release-1.1.ActiveCfg = Release-1.1|.NET
+		{E2689B4A-A951-420E-A274-BE5EBCD5F8D8}.Release-1.1.Build.0 = Release-1.1|.NET
+		{2E12AE3E-5690-46A5-9F89-80F1D3004ADB}.Debug.ActiveCfg = Debug|.NET
+		{2E12AE3E-5690-46A5-9F89-80F1D3004ADB}.Debug.Build.0 = Debug|.NET
+		{2E12AE3E-5690-46A5-9F89-80F1D3004ADB}.Debug-1.1.ActiveCfg = Debug|.NET
+		{2E12AE3E-5690-46A5-9F89-80F1D3004ADB}.Debug-1.1.Build.0 = Debug|.NET
+		{2E12AE3E-5690-46A5-9F89-80F1D3004ADB}.Release.ActiveCfg = Release|.NET
+		{2E12AE3E-5690-46A5-9F89-80F1D3004ADB}.Release.Build.0 = Release|.NET
+		{2E12AE3E-5690-46A5-9F89-80F1D3004ADB}.Release-1.1.ActiveCfg = Release|.NET
+		{2E12AE3E-5690-46A5-9F89-80F1D3004ADB}.Release-1.1.Build.0 = Release|.NET
+	EndGlobalSection
+	GlobalSection(SolutionItems) = postSolution
+		doc\NamespaceSummary.xml = doc\NamespaceSummary.xml
+		Spring.build = Spring.build
+		Spring.include = Spring.include
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/Spring.Net.2005.sln b/Spring.Net.2005.sln
new file mode 100644
index 00000000..2b9e2f92
--- /dev/null
+++ b/Spring.Net.2005.sln
@@ -0,0 +1,325 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2005", "src\Spring\Spring.Core\Spring.Core.2005.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2005", "test\Spring\Spring.Core.Tests\Spring.Core.Tests.2005.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2005", "src\Spring\Spring.Aop\Spring.Aop.2005.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.Tests.2005", "test\Spring\Spring.Aop.Tests\Spring.Aop.Tests.2005.csproj", "{2111596A-0327-4C9D-8919-294FBD988A23}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F04753EF-7A1B-4837-AB63-8C0821E8155D}"
+	ProjectSection(SolutionItems) = preProject
+		Spring.build = Spring.build
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Services.2005", "src\Spring\Spring.Services\Spring.Services.2005.csproj", "{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Services.Tests.2005", "test\Spring\Spring.Services.Tests\Spring.Services.Tests.2005.csproj", "{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.2005", "src\Spring\Spring.Web\Spring.Web.2005.csproj", "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Tests.2005", "test\Spring\Spring.Web.Tests\Spring.Web.Tests.2005.csproj", "{C67E47AA-1ACD-41B4-A465-4D336A2319CA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2005", "src\Spring\Spring.Data\Spring.Data.2005.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Tests.2005", "test\Spring\Spring.Data.Tests\Spring.Data.Tests.2005.csproj", "{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.Integration.Tests.2005", "test\Spring\Spring.Data.Integration.Tests\Spring.Data.Integration.Tests.2005.csproj", "{91766D21-C568-459F-9BEA-759B011F23CF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Extensions.2005", "src\Spring\Spring.Web.Extensions\Spring.Web.Extensions.2005.csproj", "{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.2005", "src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2005.csproj", "{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.2005", "src\Spring\Spring.Data.NHibernate\Spring.Data.NHibernate.2005.csproj", "{130E1609-45A7-4F65-B112-105F2DD3E2CE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.Integration.Tests.2005", "test\Spring\Spring.Data.NHibernate.Integration.Tests\Spring.Data.NHibernate.Integration.Tests.2005.csproj", "{4A07E150-ED90-407C-8CAD-4760444DDFD9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate12.2005", "src\Spring\Spring.Data.NHibernate12\Spring.Data.NHibernate12.2005.csproj", "{90F2D070-6F98-4926-A626-BD7A6071D6D9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.Tests.2005", "test\Spring\Spring.Data.NHibernate.Tests\Spring.Data.NHibernate.Tests.2005.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Testing.NUnit.Tests.2005", "test\Spring\Spring.Testing.NUnit.Tests\Spring.Testing.NUnit.Tests.2005.csproj", "{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz.2005", "src\Spring\Spring.Scheduling.Quartz\Spring.Scheduling.Quartz.2005.csproj", "{E823D54C-CE82-4868-929F-5F95A999F61E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz.Tests.2005", "test\Spring\Spring.Scheduling.Quartz.Tests\Spring.Scheduling.Quartz.Tests.2005.csproj", "{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Nms.2005", "src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2005.csproj", "{AEB1578C-9018-4D49-B440-789F38DD2F29}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Nms.Tests.2005", "test\Spring\Spring.Messaging.Nms.Tests\Spring.Messaging.Nms.Tests.2005.csproj", "{FA7A6931-7DBE-4A32-A312-51FAD2E80332}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{710961A3-0DF4-49E4-A26E-F5B9C044AC84}.Debug|.NET.Build.0 = 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|.NET.Build.0 = 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
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.Build.0 = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|.NET.Build.0 = Debug|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|.NET.ActiveCfg = Release|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|.NET.Build.0 = Release|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2111596A-0327-4C9D-8919-294FBD988A23}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Debug|.NET.Build.0 = Debug|Any CPU
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Release|.NET.ActiveCfg = Release|Any CPU
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Release|.NET.Build.0 = Release|Any CPU
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Debug|.NET.Build.0 = Debug|Any CPU
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Release|.NET.ActiveCfg = Release|Any CPU
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Release|.NET.Build.0 = Release|Any CPU
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.Build.0 = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.Build.0 = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.Build.0 = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.ActiveCfg = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.Build.0 = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|.NET.Build.0 = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.ActiveCfg = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|.NET.Build.0 = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|.NET.Build.0 = Debug|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|.NET.ActiveCfg = Release|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|.NET.Build.0 = Release|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{91766D21-C568-459F-9BEA-759B011F23CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|.NET.Build.0 = Debug|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|.NET.ActiveCfg = Release|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|.NET.Build.0 = Release|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|.NET.Build.0 = Debug|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|.NET.ActiveCfg = Release|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|.NET.Build.0 = Release|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|.NET.Build.0 = Debug|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|.NET.ActiveCfg = Release|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|.NET.Build.0 = Release|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|.NET.Build.0 = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|.NET.ActiveCfg = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|.NET.Build.0 = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4A07E150-ED90-407C-8CAD-4760444DDFD9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Debug|.NET.Build.0 = Debug|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Release|.NET.ActiveCfg = Release|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Release|.NET.Build.0 = Release|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{90F2D070-6F98-4926-A626-BD7A6071D6D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|.NET.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|.NET.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|.NET.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|.NET.Build.0 = Debug|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|.NET.ActiveCfg = Release|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|.NET.Build.0 = Release|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Release|.NET.ActiveCfg = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E823D54C-CE82-4868-929F-5F95A999F61E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Release|.NET.ActiveCfg = Release|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|.NET.ActiveCfg = Release|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|.NET.ActiveCfg = Release|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		NAntAddinLastFileName = Spring.build
+	EndGlobalSection
+EndGlobal
diff --git a/Spring.build b/Spring.build
new file mode 100644
index 00000000..301b842f
--- /dev/null
+++ b/Spring.build
@@ -0,0 +1,1301 @@
+<?xml version="1.0" ?>
+<project name="Spring.NET" default="test">
+
+  <!-- global project settings -->
+  <property name="project.name" value="Spring.NET"/>
+  <property name="project.name.full" value="Spring.NET Framework"/>
+  <property name="spring.basedir" value="${project::get-base-directory()}"/>
+  <property name="nant.nunit2outproc.nunitpath" value="${project::get-base-directory()}/build-support/tools/nunit/" />
+
+  <!-- debug or release -->
+  <property name="project.build.config" value="debug"/>
+  <property name="project.build.package" value="false"/>
+  <property name="project.build.sign" value="false"/>
+  <!-- Include spring helpers -->
+  <include buildfile="${spring.basedir}/Spring.include"/>
+
+  <property name="package.version" value="1.1.2" unless="${property::exists('project.version')}"/>
+  <property name="using-clover" value="false"/>
+  <!-- change this to sync the sdk doc version generated -->
+  <property name="package.version.docs" value="1.1.0" unless="${property::exists('project.version')}"/>
+  <!-- make system environment variables available as NAnt properties -->
+  <sysinfo/>
+
+  <property name="project.company" value="SpringSource"/>
+  <property name="project.copyright" value="Copyright 2002-2008 Spring.NET Framework Team."/>
+
+  <property name="key.file" value="Spring.Net.snk"/>
+  <property name="project.year" value="2008"/>
+
+  <!-- Targets that are always executed -->
+  <call target="set-build-configuration"/>
+
+  <!-- What packages to build -->
+  <property name="build.allnamespaces" value="false"/>
+
+  <if test="${not build.allnamespaces}">
+    <call target="set-build-namespaces-release"/>
+  </if>
+  <if test="${build.allnamespaces}">
+    <call target="set-build-namespaces-all"/>
+  </if>
+
+  <call target="set-framework-configuration"/>
+  <call target="set-user-overrides"/>
+
+  <!-- Targets that check settings -->
+  <target name="check-package-version">
+    <fail message="A package version has not been specified." if="${not property::exists('package.version')}"/>
+  </target>
+  <target name="check-package-dir">
+    <property name="package.dir" value="build/package" overwrite="false"/>
+    <mkdir dir="${package.dir}"/>
+  </target>
+  <target name="check-current-package-dir">
+    <fail message="The current package directory has not been specified."
+          if="${not property::exists('current.package.dir')}"/>
+    <mkdir dir="${current.package.dir}"/>
+  </target>
+  <target name="check-htmlhelp-compiler">
+    <if test="${not property::exists('htmlhelp.compiler')}">
+      <readregistry property="htmlhelp.workshop.installroot"
+                    key="SOFTWARE\Microsoft\HTML Help Workshop\InstallDir" hive="CurrentUser"
+                    failonerror="false"/>
+      <if test="${property::exists('htmlhelp.workshop.installroot')}">
+        <property name="htmlhelp.compiler" value="${htmlhelp.workshop.installroot}/hhc.exe"/>
+      </if>
+    </if>
+    <if test="${not property::exists('htmlhelp.compiler')}">
+      <sysinfo/>
+      <property name="htmlhelp.compiler" value="${sys.os.folder.programfiles}/HTML Help Worshop/hhc.exe"/>
+    </if>
+  </target>
+  <!-- Target for cleaning up the current package directory -->
+  <target name="clean-current-package-dir" depends="check-current-package-dir"
+          description="Cleans the current package directory">
+    <echo message="Cleaning the ${current.package.dir} package directory."/>
+    <delete dir="${current.package.dir}" if="${directory::exists(current.package.dir)}"/>
+    <mkdir dir="${current.package.dir}"/>
+  </target>
+
+  <!-- Displays configuration info, usefull for working out why Spring.NET doesn't build -->
+  <target name="display-setup" depends="check-htmlhelp-compiler">
+    <!-- .NET Framework 1.0 -->
+    <if test="${framework::exists('net-1.0')}">
+      <property name="nant.settings.currentframework" value="net-1.0"/>
+      <call target="display-target-framework"/>
+    </if>
+    <if test="${not framework::exists('net-1.0')}">
+      <echo message=".NET Framework 1.0 runtime is not available."/>
+    </if>
+    <!-- .NET Framework 1.1 -->
+    <if test="${framework::exists('net-1.1')}">
+      <property name="nant.settings.currentframework" value="net-1.1"/>
+      <call target="display-target-framework"/>
+    </if>
+    <if test="${not framework::exists('net-1.1')}">
+      <echo message=".NET Framework 1.1 runtime is not available."/>
+    </if>
+    <!-- .NET Framework 2.0 -->
+    <if test="${framework::exists('net-2.0')}">
+      <property name="nant.settings.currentframework" value="net-2.0"/>
+      <call target="display-target-framework"/>
+    </if>
+    <if test="${not framework::exists('net-2.0')}">
+      <echo message=".NET Framework 2.0 runtime is not available."/>
+    </if>
+    <!-- .NET Compact Framework 1.0 -->
+    <if test="${framework::exists('netcf-1.0')}">
+      <property name="nant.settings.currentframework" value="netcf-1.0"/>
+      <call target="display-target-framework"/>
+    </if>
+    <if test="${not framework::exists('netcf-1.0')}">
+      <echo message=".NET Compact Framework 1.0 runtime is not available."/>
+    </if>
+    <!-- Mono 1.0 -->
+    <if test="${framework::exists('mono-1.0')}">
+      <property name="nant.settings.currentframework" value="mono-1.0"/>
+      <call target="display-target-framework"/>
+    </if>
+    <if test="${not framework::exists('mono-1.0')}">
+      <echo message="Mono 1.0 runtime is not available."/>
+    </if>
+    <!-- Mono 2.0 -->
+    <if test="${framework::exists('mono-2.0')}">
+      <property name="nant.settings.currentframework" value="mono-2.0"/>
+      <call target="display-target-framework"/>
+    </if>
+    <if test="${not framework::exists('mono-2.0')}">
+      <echo message="Mono 2.0 runtime is not available."/>
+    </if>
+    <!-- SSCLI 1.0 -->
+    <if test="${framework::exists('sscli-1.0')}">
+      <property name="nant.settings.currentframework" value="sscli-1.0"/>
+      <call target="display-target-framework"/>
+    </if>
+    <if test="${not framework::exists('sscli-1.0')}">
+      <echo message="SSCLI 1.0 runtime is not available."/>
+    </if>
+    <!-- HTML Help Compiler -->
+    <echo message="htmlhelp.compiler: ${htmlhelp.compiler}"/>
+  </target>
+
+
+  <target name="display-target-framework">
+    <echo message=""/>
+    <echo message="----------------------------------------------------------"/>
+    <echo message=" ${nant.settings.currentframework.description}"/>
+    <echo message="----------------------------------------------------------"/>
+    <echo message=""/>
+    <echo message="framework : ${framework::get-target-framework()}"/>
+    <echo message="description : ${framework::get-description(framework::get-target-framework())}"/>
+    <if test="${framework::sdk-exists(framework::get-target-framework())}">
+      <echo message="sdk directory : ${framework::get-sdk-directory(framework::get-target-framework())}"/>
+    </if>
+    <if test="${not framework::sdk-exists(framework::get-target-framework())}">
+      <echo message="sdk directory : &lt;not configured/available>"/>
+    </if>
+    <echo message="framework directory : ${framework::get-framework-directory(framework::get-target-framework())}"/>
+    <echo message="assembly directory : ${framework::get-assembly-directory(framework::get-target-framework())}"/>
+    <echo message=""/>
+  </target>
+
+
+  <!-- Target for setting the package configuration -->
+  <target name="set-package-configuration" depends="check-package-dir, check-package-version">
+    <!-- for .exe 
+    <property name="current.package.dir" value="${package.dir}/${project::get-name()}"/>
+    -->
+    <!-- for docs packaging MLP -->
+
+    <property name="current.package.dir" value="l:/release/${project::get-name()}"/>
+
+
+
+    <property name="doc.dir" value="${current.package.dir}/doc"/>
+    <property name="sdkdoc.dir" value="${doc.dir}/sdk"/>
+  </target>
+
+  <!-- Target for compiling all build configurations for all runtime configurations -->
+  <target name="compile-build-all" description="Compile all build configurations for all runtime configurations">
+    <echo message="Compiling all build configurations for all runtime configurations."/>
+
+    <call target="set-debug-build-configuration"/>
+    <call target="compile-build"/>
+
+    <!-- make the release build, which requires Spring.Net.snk, only if making an distributable release -->
+    <if test="${property::exists('project.build.package') and project.build.package}">
+      <call target="set-release-build-configuration"/>
+      <call target="compile-build"/>
+    </if>
+
+
+  </target>
+
+  <!-- Target for compiling all runtime configurations in the current build configuration -->
+  <target name="compile-build" description="Compile current build configurations for all runtime configurations">
+    <echo message="Compiling all framework versions for the ${current.build.config} build configuration."/>
+
+    <call target="compile-build-1.0"/>
+    <call target="compile-build-1.1"/>
+    <call target="compile-build-2.0"/>
+
+    <!-- Ignore Compact Framework 1.0 for now -->
+    <!-- call target="compile-build-netcf-1.0"/ -->
+    <!-- Ignore Mono 2.0 for now -->
+    <!-- call target="compile-build-mono-2.0"/-->
+
+  </target>
+
+  <target name="compile-build-1.0" description="Builds for .NET 1.0 if available">
+    <if test="${framework::exists('net-1.0')}">
+      <call target="compile-net-1.0"/>
+    </if>
+
+    <if test="${not framework::exists('net-1.0')}">
+      <if test="${property::exists('project.build.package') and project.build.package}">
+        <fail message="The .NET Framework 1.0 is not available."/>
+      </if>
+      <if test="${not(property::exists('project.build.package') and project.build.package)}">
+        <echo message="The .NET Framework 1.0 is not available. Build skipped."/>
+      </if>
+    </if>
+  </target>
+
+  <target name="compile-build-1.1" description="Builds for .NET 1.1 if available">>
+    <if test="${framework::exists('net-1.1')}">
+      <call target="compile-net-1.1"/>
+    </if>
+
+    <if test="${not framework::exists('net-1.1')}">
+      <if test="${property::exists('project.build.package') and project.build.package}">
+        <fail message="The .NET Framework 1.1 is not available."/>
+      </if>
+      <if test="${not(property::exists('project.build.package') and project.build.package)}">
+        <echo message="The .NET Framework 1.1 is not available. Build skipped."/>
+      </if>
+    </if>
+  </target>
+
+  <target name="compile-build-2.0" description="Builds for .NET 2.0 if available">
+    <if test="${framework::exists('net-2.0')}">
+      <call target="compile-net-2.0"/>
+    </if>
+
+    <if test="${not framework::exists('net-2.0')}">
+      <if test="${property::exists('project.build.package') and project.build.package}">
+        .NET 2.0 Build Skipped for Package
+        <fail message="The .NET Framework 2.0 is not available."/>
+        <echo message="The .NET Framework 2.0 is not available. Build skipped during package."/>
+      </if>
+      <if test="${not(property::exists('project.build.package') and project.build.package)}">
+        <echo message="The .NET Framework 2.0 is not available. Build skipped."/>
+      </if>
+    </if>
+  </target>
+
+
+  <!-- Targets for other .NET frameworks -->
+
+  <target name="compile-build-netcf-1.0" description="Builds for .NET 1.0 Compact Framework if available">
+    <if test="${framework::exists('netcf-1.0')}">
+      <call target="compile-netcf-1.0" />
+    </if>
+
+    <if test="${not framework::exists('netcf-1.0')}">
+      <if test="${property::exists('project.build.package') and project.build.package}">
+        <fail message="The .NET Compact Framework 1.0 is not available." />
+      </if>
+      <if test="${not(property::exists('project.build.package') and project.build.package)}">
+        <echo message="The .NET Compact Framework 1.0 is not available. Build skipped." />
+      </if>
+    </if>
+  </target>
+
+  <target name="compile-build-mono-2.0" description="Builds for mono 2.0 if available">
+     <if test="${framework::exists('mono-2.0')}">
+       <call target="compile-mono-2.0"/>
+     </if>
+     <if test="${not framework::exists('mono-2.0')}">
+         <if test="${property::exists('project.build.package') and project.build.package}">
+             <fail message="Mono 2.0 is not available."/>
+         </if>
+         <if test="${not(property::exists('project.build.package') and project.build.package)}">
+             <echo message="Mono 2.0 is not available. Build skipped."/>
+         </if>
+     </if>
+  </target>
+
+  <target name="compile" description="Builds the current build configuration for the current target framework."
+          depends="check-current-build-config">
+    <call target="compile-${framework::get-target-framework()}"/>
+  </target>
+
+  <target name="compile-test"> <!-- used as configurable template by all compile-{net|mono|netcf}-x.x targets -->
+    <property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+    <property name="nh.lib.dir" value="${spring.basedir}/lib/NHibernate10/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+    <property name="nh12.lib.dir" value="${spring.basedir}/lib/NHibernate12/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+    <call target="copylibs"/>
+
+    <!-- build assemblies -->
+    <nant buildfile="src/Spring/Spring.Core/Spring.Core.build" target="build"/>
+    <nant buildfile="src/Spring/Spring.Aop/Spring.Aop.build" target="build" if="${build-aop}"/>
+    <nant buildfile="src/Spring/Spring.Web/Spring.Web.build" target="build" if="${build-web}"/>
+    <nant buildfile="src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build" target="build" if="${build-web and (nant.settings.currentframework == 'net-2.0')}"/>
+    <nant buildfile="src/Spring/Spring.Data/Spring.Data.build" target="build" if="${build-data}"/>
+    <nant buildfile="src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-1.1' or nant.settings.currentframework == 'net-2.0')}"/>
+    <nant buildfile="src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-1.1' or nant.settings.currentframework == 'net-2.0')}"/>
+    <nant buildfile="src/Spring/Spring.Services/Spring.Services.build" target="build" if="${build-services}"/>
+    <nant buildfile="src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build" target="build" if="${build-testing}"/>
+    <nant buildfile="src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build" target="build" if="${build-web}"/>
+
+
+    <!-- build examples -->
+
+    <nant buildfile="examples/Spring/Spring.Examples.build" target="build" if="${build-examples and not using-clover}"/>
+
+    <!-- test assemblies -->
+    <nant buildfile="test/Spring/Spring.Core.Tests/Spring.Core.Tests.build" target="test"/>
+    <nant buildfile="test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build" target="test" if="${build-aop}"/>
+    <nant buildfile="test/Spring/Spring.Data.Tests/Spring.Data.Tests.build" target="test" if="${build-data}"/>
+    <nant buildfile="test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build" target="test" if="${build-data}"/>
+    <nant buildfile="test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-1.1' or nant.settings.currentframework == 'net-2.0')}"/>
+    <nant buildfile="test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-1.1' or nant.settings.currentframework == 'net-2.0')}"/>
+    <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
+    <nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web}"/>
+    <nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test"/>
+    <nant buildfile="test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build" target="test" if="false"/>
+  </target>
+
+  <target name="compile-net-1.0" description="Builds .NET Framework 1.0 version"
+          depends="set-net-1.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit">
+
+    <call target="copykeys" if="${project.build.sign}"/>
+    <call target="common.generate-assemblyinfo"/>
+    <!-- disable namespaces not supported in net-1.0 -->
+    <property name="build-web" value="false" />
+    <call target="compile-test" />
+  </target>
+
+  <target name="compile-net-1.1" description="Builds .NET Framework 1.1 version"
+          depends="set-net-1.1-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit">
+    <call target="copykeys" if="${project.build.sign}"/>
+    <call target="common.generate-assemblyinfo"/>
+    <call target="compile-test" />
+  </target>
+
+  <target name="compile-net-2.0" description="Builds .NET Framework 2.0 version"
+          depends="set-net-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit">
+    <call target="copykeys" if="${project.build.sign}"/>
+    <call target="common.generate-assemblyinfo"/>
+    <call target="compile-test" />
+  </target>
+
+  <target name="compile-mono-2.0" description="Builds MONO Framework 2.0 version"
+          depends="set-mono-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit">
+    <call target="copykeys" if="${project.build.sign}"/>
+    <call target="common.generate-assemblyinfo"/>
+    <call target="compile-test" />
+  </target>
+
+  <target name="copykeys">
+
+      <if test="${not file::exists(spring.basedir + '/Spring.Net.snk')}">
+          <echo message="Key file not found. You can generate a key file by running 'sn -k Spring.Net.snk'."/>
+          <echo message="The generated key file should be stored in the Spring.Net base directory."/>
+      </if>
+      <if test="${file::exists(spring.basedir + '/Spring.Net.snk')}">
+        <!-- copy the Spring key file to the location where the compiler expects it to be -->
+        <copy file="Spring.Net.snk" todir="${current.bin.dir}"/>
+      </if>
+      <!-- for .NET 2.0 need to provide keyfile argument to compiler -->
+      <if test="${net-2.0}" if="${project.build.sign}">
+        <property name="compiler.args" value="/keyfile:..\..\..\Spring.Net.snk"/>
+      </if>
+
+  </target>
+
+  <target name="copylibs">
+    <echo message="Current bin dir = ${current.bin.dir}"/>
+    <echo message="Current lib dir = ${lib.dir}"/>
+    <!-- copy framework-neutral libraries -->
+    <copy todir="${current.bin.dir}">
+      <fileset basedir="lib">
+        <include name="*.dll"/>
+        <include name="*.xml"/>
+      </fileset>
+    </copy>
+    <!-- copy framework-specific libraries -->
+    <copy todir="${current.bin.dir}">
+      <fileset basedir="${lib.dir}">
+        <include name="*.dll"/>
+        <include name="*.xml"/>
+        <exclude name="nunit.core.*" />
+      </fileset>
+    </copy>
+  </target>
+
+
+  <!-- Top level targets -->
+  <!-- target for developers to do just debug build and test everything in CVS -->
+  <target name="test">
+    <echo message="Compiling debug configuration for all runtime configurations."/>
+    <property name="nant.target.root.name" value="build"/>
+    <call target="build-all-function"/>
+  </target>
+
+  <target name="build-1.0">
+    <call target="set-build-namespaces-release"/>
+    <echo message="------------------------"/>
+    <echo message="Building .NET 1.0 DEBUG "/>
+    <echo message="----------------------- "/>
+    <call target="set-debug-build-configuration"/>
+    <call target="compile-build-1.0"/>
+
+    <if test="${property::exists('project.build.package') and project.build.package}">
+      <echo message="--------------------------"/>
+      <echo message="Building .NET 1.0 RELEASE "/>
+      <echo message="--------------------------"/>
+      <call target="set-release-build-configuration"/>
+      <call target="compile-build-1.0"/>
+    </if>
+
+  </target>
+
+  <target name="build-1.1">
+    <call target="set-build-namespaces-release"/>
+    <echo message="------------------------"/>
+    <echo message="Building .NET 1.1 DEBUG "/>
+    <echo message="------------------------"/>
+    <call target="set-debug-build-configuration"/>
+    <call target="compile-build-1.1"/>
+
+    <if test="${property::exists('project.build.package') and project.build.package}">
+      <echo message="------------------------"/>
+      <echo message="Building .NET 1.1 DEBUG "/>
+      <echo message="------------------------"/>
+      <call target="set-release-build-configuration"/>
+      <call target="compile-build-1.1"/>
+    </if>
+  </target>
+
+  <target name="build-2.0">
+    <call target="set-build-namespaces-release"/>
+    <echo message="------------------------"/>
+    <echo message="Building .NET 2.0 DEBUG "/>
+    <echo message="------------------------"/>
+    <call target="set-debug-build-configuration"/>
+    <call target="compile-build-2.0"/>
+
+
+    <if test="${property::exists('project.build.package') and project.build.package}">
+    <echo message="--------------------------"/>
+    <echo message="Building .NET 2.0 RELEASE "/>
+    <echo message="--------------------------"/>
+      <call target="set-release-build-configuration"/>
+      <call target="compile-build-2.0"/>
+    </if>
+  </target>
+
+  <target name="build-mono-2.0">
+
+    <if test="${property::exists('project.build.package') and project.build.package}">
+      <call target="set-release-build-configuration"/>
+      <echo message="--------------------------"/>
+      <echo message="Building MONO 2.0 RELEASE "/>
+      <echo message="--------------------------"/>
+      <call target="compile-build-mono-2.0"/>
+    </if>
+
+    <echo message="--------------------------"/>
+    <echo message="Building MONO 2.0 DEBUG   "/>
+    <echo message="--------------------------"/>
+    <call target="set-debug-build-configuration"/>
+    <call target="compile-build-mono-2.0"/>
+
+  </target>
+
+  <target name="clean" description="Deletes current build configuration">
+    <call target="cleanall"/>
+  </target>
+
+  <target name="cleanall" description="Deletes every build configuration">
+    <property name="target.dir" value="${path::combine(project::get-base-directory(),'build')}"/>
+    <echo message="Deleting all builds from all configurations : '${target.dir}'"/>
+    <delete
+            dir="${project::get-base-directory()}/build/net"
+            if="${directory::exists(target.dir)}"
+            failonerror="false"/>
+  </target>
+
+  <target name="clean-obj">
+	<delete dir="src/Spring/Spring.Aop/obj" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Aop/bin" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Core/obj" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Core/bin" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Data/obj" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Data/bin" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Data.NHibernate/obj" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Data.NHibernate/bin" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Data.NHibernate12/obj" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Data.NHibernate12/bin" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Services/obj" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Services/bin" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Messaging.Nms/obj" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Messaging.Nms/bin" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Scheduling.Quartz/obj" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Scheduling.Quartz/bin" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Testing.NUnit/obj" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Testing.NUnit/bin" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Web/obj" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Web/bin" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Web.Extensions/obj" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Web.Extensions/bin" failonerror="false"/>
+
+	<delete dir="test/Spring/Spring.Aop.Tests/obj" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Aop.Tests/bin" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Core.Tests/obj" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Core.Tests/bin" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Data.Tests/obj" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Data.Tests/bin" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Data.Integration.Tests/obj" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Data.Integration.Tests/bin" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Data.NHibernate.Tests/obj" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Data.NHibernate.Tests/bin" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Data.NHibernate.Integration.Tests/obj" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Data.NHibernate.Integration.Tests/bin" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Services.Tests/obj" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Services.Tests/bin" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Messaging.Nms.Tests/obj" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Messaging.Nms.Tests/bin" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Scheduling.Quartz.Tests/obj" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Scheduling.Quartz.Tests/bin" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Web.Tests/obj" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Web.Tests/bin" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Testing.NUnit.Tests/obj" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Testing.NUnit.Tests/bin" failonerror="false"/>
+
+
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Aspects/obj" failonerror="false"/>
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Aspects/bin" failonerror="false"/>
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/obj" failonerror="false"/>
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/bin" failonerror="false"/>
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/obj" failonerror="false"/>
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/bin" failonerror="false"/>
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/obj" failonerror="false"/>
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/bin" failonerror="false"/>
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/obj" failonerror="false"/>
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/bin" failonerror="false"/>
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/obj" failonerror="false"/>
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/bin" failonerror="false"/>
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/obj" failonerror="false"/>
+	<delete dir="examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/bin" failonerror="false"/>
+
+	<delete dir="examples/Spring/SpringAir/src/SpringAir.Core/obj" failonerror="false"/>
+	<delete dir="examples/Spring/SpringAir/src/SpringAir.Core/bin" failonerror="false"/>
+	<delete dir="examples/Spring/SpringAir/src/SpringAir.Data.Ado/obj" failonerror="false"/>
+	<delete dir="examples/Spring/SpringAir/src/SpringAir.Data.Ado/bin" failonerror="false"/>
+	<delete dir="examples/Spring/SpringAir/src/SpringAir.Data.IBatis/obj" failonerror="false"/>
+	<delete dir="examples/Spring/SpringAir/src/SpringAir.Data.IBatis/bin" failonerror="false"/>
+
+	<delete dir="examples/Spring/SpringAir/test/SpringAir.Core.Tests/obj" failonerror="false"/>
+	<delete dir="examples/Spring/SpringAir/test/SpringAir.Core.Tests/bin" failonerror="false"/>
+	<delete dir="examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/obj" failonerror="false"/>
+ 	<delete dir="examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/bin" failonerror="false"/>
+  </target>
+
+  <target name="prepare-docs" description="Create documentation from templates">
+    <if test="${file::exists('doc/CodeSmith/CodeSmithConsole.exe')}">
+      <foreach item="File" property="template.in">
+        <in>
+          <items>
+            <include name="doc/reference/src/templated/*.xml"/>
+          </items>
+        </in>
+        <do>
+          <property name="template.out" value="doc/reference/src/${path::get-file-name(template.in)}"/>
+          <echo message="${template.in} -> ${template.out}"/>
+          <exec program="doc/CodeSmith/CodeSmithConsole.exe" workingdir=".">
+            <arg value="/nologo"/>
+            <arg value="/template:${template.in}"/>
+            <arg value="/properties:doc/reference/src/templated/properties.props"/>
+            <arg value="/out:${template.out}"/>
+          </exec>
+        </do>
+      </foreach>
+    </if>
+  </target>
+
+
+  <target name="package" depends="set-package-configuration" description="Build and Package distribution">
+
+    <property name="project.build.package" value="true"/>
+
+    <call target="clean-current-package-dir"/>
+
+    <property name="nant.target.root.name" value="build"/>
+
+    <call target="set-build-namespaces-release"/>
+    <property name="project.build.package" value="true"/>
+
+    <call target="build-all-function"/>
+
+    <call target="prepare-docs"/>
+    <exec workingdir="./doc" program="cmd.exe" commandline="/c ant refdoc"/>
+
+    <call target="package-release-files"/>
+
+  </target>
+
+  <target name="releasepkg">
+    <call target="set-release-build-configuration"/>
+    <call target="package-release-files"/>
+  </target>
+
+  <!--
+        Target to use when packaging as a standalone .zip file. VS.NET docs
+        included but compressed sdk-web directory is. Intended for mono developers
+    -->
+  <target name="package-zip" description="Build and Package distribution as .zip file">
+    <call target="package"/>
+    <property name="project.zip-path" value="${package.dir}/${project.name}-${package.version}.zip"/>
+    <zip zipfile="${project.zip-path}">
+      <fileset basedir="${package.dir}/${project.name}-${package.version}">
+        <include name="**/*"/>
+        <exclude name="**/sdk-web/**"/>
+      </fileset>
+    </zip>
+  </target>
+
+  <target name="dailysnapshot">
+    <property name="nant.target.root.name" value="daily-build"/>
+    <property name="project.build.sign" value="true"/>
+    <call target="copykeys"/>
+    <call target="build-all-function"/>
+    <call target="package-cvs"/>
+    <!-- only copy the supporting tools directory for the daily build. -->
+    <call target="package-tools"/>
+    <call target="upload-cvs-release"/>
+  </target>
+
+  <target name="build-all-function" description="Build what is in cvs taking into account approrpiate clr versions and root target name">
+
+    <call target="${nant.target.root.name}-1.0" />
+
+    <call target="${nant.target.root.name}-1.1" />
+
+    <call target="${nant.target.root.name}-2.0" />
+
+    <!-- ignore Mono 2.0 for now -->
+    <!-- call target="${nant.target.root.name}-mono-2.0" / --> 
+
+  </target>
+
+  <target name="daily-build-1.0">
+    <call target="set-build-namespaces-all"/>
+    <call target="set-package-configuration"/>
+
+    <call target="set-debug-build-configuration"/>
+    <call target="compile-build-1.0"/>
+    <call target="set-release-build-configuration"/>
+    <call target="compile-build-1.0"/>
+
+  </target>
+
+  <target name="daily-build-1.1">
+    <call target="set-build-namespaces-all"/>
+    <call target="set-package-configuration"/>
+
+    <call target="set-debug-build-configuration"/>
+    <call target="compile-build-1.1"/>
+    <call target="set-release-build-configuration"/>
+    <call target="compile-build-1.1"/>
+
+  </target>
+
+  <target name="daily-build-2.0">
+    <call target="set-build-namespaces-all"/>
+    <call target="set-package-configuration"/>
+
+    <call target="set-debug-build-configuration"/>
+    <call target="compile-build-2.0"/>
+    <call target="set-release-build-configuration"/>
+    <call target="compile-build-2.0"/>
+
+  </target>
+
+
+  <!-- Target to use when packaging everything in CVS -->
+  <target name="package-cvs" description="Build and Package distribution">
+    <property name="project.build.package" value="false"/>
+    <tstamp/>
+    <property name="package.version" value="${tstamp.date}-${tstamp.time}"/>
+
+    <!--
+    <call target="set-build-namespaces-all"/>
+    <call target="set-package-configuration"/>
+    <call target="clean-current-package-dir"/>
+
+    <call target="set-debug-build-configuration"/>
+    <call target="compile-build"/>
+
+    <call target="set-release-build-configuration"/>
+    <call target="compile-build"/>
+    -->
+
+    <call target="prepare-docs"/>
+    <exec workingdir="./doc" program="cmd.exe" commandline="/c ant refdoc"/>
+
+    <call target="set-debug-build-configuration"/>
+
+
+    <call target="package-release-files"/>
+    <copy todir="${current.package.dir}">
+      <fileset>
+        <include name="Spring.Net.sln"/>
+      </fileset>
+    </copy>
+
+    <property name="project.zip-path" value="${package.dir}/${project.name}-${package.version}.zip"/>
+    <!-- for some reason this isn't being properly excluded in src.to.copy -->
+    <delete>
+      <fileset basedir="${current.package.dir}">
+        <include name="**/${project.name}-SDK-HTML.zip"/>
+      </fileset>
+    </delete>
+
+    <zip zipfile="${project.zip-path}">
+      <fileset basedir="${current.package.dir}">
+        <include name="**/*"/>
+        <exclude name="**/sdk-web/**"/>
+      </fileset>
+    </zip>
+  </target>
+
+  <target name="package-tools">
+    <!-- copy third-party tools -->
+    <mkdir dir="${current.package.dir}/build-support/tools"/>
+    <copy todir="${current.package.dir}/build-support/tools">
+      <fileset basedir="tools">
+        <include name="**/*.exe"/>
+        <include name="**/*.jar"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <target name="test-zip">
+    <property name="project.build.package" value="false"/>
+    <tstamp/>
+    <property name="package.version" value="${tstamp.date}-${tstamp.time}"/>
+
+
+    <call target="set-build-namespaces-all"/>
+    <call target="set-package-configuration"/>
+    <call target="set-debug-build-configuration"/>
+
+    <property name="project.zip-path" value="${package.dir}/${project.name}-${package.version}.zip"/>
+
+    <echo message="project.zip-path = ${project.zip-path}"/>
+
+    <delete>
+      <fileset basedir="${current.package.dir}">
+        <include name="**/${project.name}-SDK-HTML.zip"/>
+      </fileset>
+    </delete>
+
+    <zip zipfile="${project.zip-path}">
+      <fileset basedir="${current.package.dir}">
+        <include name="**/*"/>
+        <exclude name="**/sdk-web/**"/>
+      </fileset>
+    </zip>
+  </target>
+
+  <target name="upload-cvs-release">
+    <call target="set-package-configuration"/>
+    <property name="filetoupload" value="${project.name}-${package.version}.zip"/>
+
+    <property name="spring.ssh.server" value="spring02.managed.contegix.com" />
+    <property name="spring.ssh.user" value="markp"/>
+    <property name="spring.ssh.args" value=" -l ${spring.ssh.user} " />
+    <property name="spring.web.path" value="/var/www/domains/springframework.net/www/htdocs" />
+    <!-- setup property that holds partial path to be used by scp -->
+    <property name="serverpart" value="${spring.ssh.user + '@' + spring.ssh.server + ':' + spring.web.path}" />
+    <property name="nightly.builds.path" value="downloads/nightly"/>
+
+    <echo message="uploading ${filetoupload} to spring02.managed.contegix.com"/>
+    <exec workingdir="${package.dir}" program="scp" verbose="true">
+      <arg value="${filetoupload}" />
+      <arg value="${serverpart}/${nightly.builds.path}/${filetoupload}" />
+    </exec>
+
+    <echo message="extracting ${filetoupload} to downloads/latest"/>
+    <property name="extract.command" value="cd website/downloads/nightly/; ./update-latest.sh"/>
+    <exec workingdir="${package.dir}" program="ssh" verbose="true">
+      <arg value="${spring.ssh.user + '@' + spring.ssh.server}" />
+      <arg value="${extract.command}" />
+    </exec>
+
+  </target>
+
+  <target name="package-release-files" depends="set-package-configuration">
+    <echo message="Current package directory = ${current.package.dir}"/>
+    <copy todir="${current.package.dir}">
+      <fileset>
+        <include name="${solution.file.1.1.2002}"/>
+        <include name="${solution.file.1.1.2003}"/>
+        <include name="${solution.file.1.1.2005}"/>
+        <include name="readme.txt"/>
+        <include name="changelog.txt"/>
+        <include name="license.txt"/>
+        <include name="BreakingChanges-1.1.txt"/>
+        <!-- exclude VS.Net stuff -->
+        <exclude name="**/sdk-web/**"/>
+        <exclude name="**/*.suo"/>
+        <exclude name="**/*.user"/>
+        <exclude name="**/bin/**"/>
+        <exclude name="**/obj/**"/>
+        <exclude name="**/*.resharper"/>
+        <exclude name="**/*.resharper.user"/>
+        <exclude name="**/Thumbs.db"/>
+      </fileset>
+    </copy>
+
+    <!-- copy built assemblies -->
+    <mkdir dir="${current.package.dir}/bin/net"/>
+    <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
+      <copy todir="${current.package.dir}/bin/net">
+        <fileset basedir="./build/net">
+          <include name="**/Spring.Core.dll"/>
+          <include name="**/Spring.Core.xml"/>
+          <include name="**/Spring.Core.pdb"/>
+
+          <include name="**/Spring.Aop.dll"/>
+          <include name="**/Spring.Aop.xml"/>
+          <include name="**/Spring.Aop.pdb"/>
+
+          <include name="**/Spring.Data.dll"/>
+          <include name="**/Spring.Data.xml"/>
+          <include name="**/Spring.Data.pdb"/>
+
+          <include name="**/Spring.Data.NHibernate.dll"/>
+          <include name="**/Spring.Data.NHibernate.xml"/>
+          <include name="**/Spring.Data.NHibernate.pdb"/>
+
+          <include name="**/Spring.Data.NHibernate12.dll"/>
+          <include name="**/Spring.Data.NHibernate12.xml"/>
+          <include name="**/Spring.Data.NHibernate12.pdb"/>
+
+          <include name="**/Spring.Web.dll"/>
+          <include name="**/Spring.Web.xml"/>
+          <include name="**/Spring.Web.pdb"/>
+
+          <include name="**/Spring.Web.Extensions.dll"/>
+          <include name="**/Spring.Web.Extensions.xml"/>
+          <include name="**/Spring.Web.Extensions.pdb"/>
+
+          <include name="**/Spring.Services.dll"/>
+          <include name="**/Spring.Services.xml"/>
+          <include name="**/Spring.Services.pdb"/>
+
+          <include name="**/Spring.Testing.NUnit.dll"/>
+          <include name="**/Spring.Testing.NUnit.xml"/>
+          <include name="**/Spring.Testing.NUnit.pdb"/>
+
+          <include name="**/antlr.runtime.dll"/>
+          <include name="**/Common.Logging.dll"/>
+          <include name="**/Common.Logging.*.dll"/>
+
+	  <exclude name="**/release/Spring/**"/>
+	  <exclude name="**/debug/Spring/**"/>
+          <exclude name="**/examples/**"/>
+          <exclude name="**/results/**"/>
+          <exclude name="mono/**"/>
+        </fileset>
+      </copy>
+    </if>
+
+    <if test="${property::exists('build.allnamespaces') and build.allnamespaces}">
+      <copy todir="${current.package.dir}/bin/net">
+        <fileset basedir="./build/net">
+          <include name="**/Spring.Services.*.exe"/>
+          <include name="**/Spring.*.dll"/>
+          <include name="**/Spring.*.xml"/>
+          <include name="**/Spring.*.pdb"/>
+          <include name="**/antlr.runtime.dll"/>
+          <include name="**/log4net.dll"/>
+          <include name="**/log4net.xml"/>
+          <include name="**/log4net.pdb"/>
+          <include name="**/Common.Logging.dll"/>
+          <include name="**/Common.Logging.xml"/>
+          <exclude name="**/examples/**"/>
+          <exclude name="**/results/**"/>
+          <exclude name="**/Spring.*.Tests.dll"/>
+          <exclude name="**/Spring.*.Tests.xml"/>
+          <exclude name="**/Spring.*.Tests.pdb"/>
+          <exclude name="**/Spring.Examples.*"/>
+        </fileset>
+      </copy>
+    </if>
+
+    <delete>
+      <fileset basedir="${current.package.dir}/bin/net">
+        <include name="**/es/**"/>
+        <include name="**/PT-BR/**"/>
+        <include name="**/pt-BR/**"/>
+        <include name="**/sr/**"/>
+        <include name="**/sr-SP-Cyrl/**"/>
+        <include name="**/sr-Cyrl-CS/**"/>
+        <include name="**/results/**"/>
+        <include name="**/release/Spring/**"/>
+        <include name="**/debug/Spring/**"/>
+      </fileset>
+    </delete>
+
+    <!-- copy user reference documentation -->
+    <mkdir dir="${current.package.dir}/doc/reference"/>
+    <copy todir="${current.package.dir}/doc/reference">
+      <fileset basedir="doc/output/reference">
+        <include name="html/**/*"/>
+        <include name="pdf/**/*"/>
+        <include name="htmlhelp/**/*"/>
+        <include name="styles/**/*"/>
+        <include name="images/**/*"/>
+      </fileset>
+    </copy>
+
+    <!-- copy third-party libraries -->
+    <mkdir dir="${current.package.dir}/lib/Net"/>
+
+    <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
+      <copy todir="${current.package.dir}/lib/Net">
+        <fileset basedir="lib/Net">
+          <include name="**/DotNetMock*.dll"/>
+          <include name="**/log4net.dll"/>
+          <include name="**/Common.Logging.dll"/>
+          <include name="**/antlr.runtime.dll"/>
+          <include name="**/nunit.*.dll"/>
+          <include name="**/NUnitAsp.dll"/>
+          <include name="**/NUnitAspEx.dll"/>
+          <include name="**/Rhino.Mocks.dll"/>
+          <include name="**/System.Web.Extensions.dll"/>
+          <include name="**/EULA.rtf"/>
+        </fileset>
+      </copy>
+    </if>
+
+    <mkdir dir="${current.package.dir}/lib/NHibernate10"/>
+    <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
+      <copy todir="${current.package.dir}/lib/NHibernate10">
+        <fileset basedir="lib/NHibernate10">
+          <include name="**/*.dll"/>
+          <include name="**/*.license.txt"/>
+        </fileset>
+      </copy>
+    </if>
+
+    <mkdir dir="${current.package.dir}/lib/NHibernate12"/>
+    <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
+      <copy todir="${current.package.dir}/lib/NHibernate12">
+        <fileset basedir="lib/NHibernate12">
+          <include name="**/*.dll"/>
+          <include name="**/*.license.txt"/>
+        </fileset>
+      </copy>
+    </if>
+
+
+    <if test="${property::exists('build.allnamespaces') and build.allnamespaces}">
+      <copy todir="${current.package.dir}/lib">
+        <fileset basedir="lib">
+          <include name="**/*.dll"/>
+          <include name="**/*.xml"/>
+        </fileset>
+      </copy>
+    </if>
+
+    <!-- copy third-party icons -->
+    <mkdir dir="${current.package.dir}/icons"/>
+    <copy todir="${current.package.dir}/icons">
+      <fileset basedir="icons">
+        <include name="*.ico"/>
+        <include name="*.pal"/>
+      </fileset>
+    </copy>
+
+    <!-- copy schema and dtd -->
+    <mkdir dir="${current.package.dir}/doc/schema"/>
+    <copy todir="${current.package.dir}/doc/schema"
+          file="src/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-1.1.xsd"/>
+
+    <copy todir="${current.package.dir}/doc/schema"
+          file="src/Spring/Spring.Core/Objects/Factory/Xml/spring-tool-1.1.xsd"/>
+
+    <copy todir="${current.package.dir}/doc/schema"
+          file="src/Spring/Spring.Core/Validation/Config/spring-validation-1.1.xsd"/>
+
+
+    <copy todir="${current.package.dir}/doc/schema"
+          file="src/Spring/Spring.Aop/Aop/Config/spring-aop-1.1.xsd"/>
+
+    <copy todir="${current.package.dir}/doc/schema"
+          file="src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsd"/>
+
+    <copy todir="${current.package.dir}/doc/schema"
+          file="src/Spring/Spring.Data/Transaction/Config/spring-tx-1.1.xsd"/>
+
+    <copy todir="${current.package.dir}/doc/schema"
+          file="src/Spring/Spring.Services/Remoting/Config/spring-remoting-1.1.xsd"/>
+
+    <copy todir="${current.package.dir}/doc/schema"
+          file="doc/install-schema.build"/>
+
+    <echo message="copying source code for release..."/>
+
+    <!-- copy source code -->
+    <copy todir="${current.package.dir}" verbose="false">
+      <fileset refid="src.to.copy"/>
+    </copy>
+
+
+      <copy todir="${current.package.dir}/examples">
+        <fileset basedir="examples">
+          <include name="**/*.refresh"/>
+          <include name="**/*.refresh"/>
+        </fileset>
+      </copy>
+
+
+
+  </target>
+
+  <target name="package-sdkdocs" depends="set-package-configuration">
+    <if test="${property::exists('docx.generated')}">
+      <echo message="copying SDK docs..."/>
+      <call target="copy-sdkdoc-spring"/>
+    </if>
+  </target>
+
+  <!-- Copy over the SDK documentation generated by Document X -->
+  <target name="copy-sdkdoc-spring" depends="set-package-configuration">
+    <call target="set-release-build-configuration"/>
+    <delete dir="${current.package.dir}/doc/sdk/1.1/htmlhelp"/>
+    <delete dir="${current.package.dir}/doc/sdk/1.1/vsnet2003"/>
+    <delete dir="${current.package.dir}/doc/sdk/2.0/htmlhelp"/>
+    <delete dir="${current.package.dir}/doc/sdk/2.0/vsnet2005"/>
+
+    <mkdir dir="${current.package.dir}/doc/sdk/1.1/htmlhelp"/>
+    <mkdir dir="${current.package.dir}/doc/sdk/1.1/vsnet2003"/>
+    <mkdir dir="${current.package.dir}/doc/sdk/2.0/htmlhelp"/>
+    <mkdir dir="${current.package.dir}/doc/sdk/2.0/vsnet2005"/>
+
+    <property name="sdk.src.dir" value="l:/release/Spring.NET" overwrite="false"/>
+
+    <!-- Copy htmlhelp 1.0 files for .NET 1.1 and 2.0 assemblies -->
+    <copy todir="${current.package.dir}/doc/sdk/1.1/htmlhelp"
+          file="${sdk.src.dir}/doc/sdk/Spring-1.1/net-1.1/htmlhelp1and2/Spring.NET.chm"/>
+
+    <copy todir="${current.package.dir}/doc/sdk/2.0/htmlhelp"
+          file="${sdk.src.dir}/doc/sdk/Spring-1.1/net-2.0/htmlhelp1and2/Spring.NET.chm"/>
+
+    <!-- Copy generated htmlhelp 2.x files, install scripts, -->
+    <!-- and install utility for .NET 1.1 assemblies         -->
+    <copy todir="${current.package.dir}/doc/sdk/1.1/vsnet2003">
+      <fileset basedir="${sdk.src.dir}/doc/sdk/Spring-1.1/net-1.1/web">
+        <include name="COL_*.*"/>
+      </fileset>
+    </copy>
+    <copy todir="${current.package.dir}/doc/sdk/1.1/vsnet2003"
+          file="${sdk.src.dir}/doc/sdk/Spring-1.1/net-1.1/htmlhelp1and2/Spring.NET.hxs"/>
+    <copy todir="${current.package.dir}/doc/sdk/1.1/vsnet2003"
+          file="doc/InnovaHxReg.exe"/>
+    <copy todir="${current.package.dir}/doc/sdk/1.1/vsnet2003"
+          file="doc\docx\Spring-1.1\net-1.1\RegisterHelp2.bat"/>
+    <copy todir="${current.package.dir}/doc/sdk/1.1/vsnet2003"
+          file="doc\docx\Spring-1.1\net-1.1\UnRegisterHelp2.bat"/>
+
+    <!-- Copy generated htmlhelp 2.x files, install scripts, -->
+    <!-- and install utility for .NET 2.0 assemblies         -->
+    <copy todir="${current.package.dir}/doc/sdk/2.0/vsnet2005">
+      <fileset basedir="${sdk.src.dir}/doc/sdk/Spring-1.1/net-2.0/web">
+        <include name="COL_*.*"/>
+      </fileset>
+    </copy>
+    <copy todir="${current.package.dir}/doc/sdk/2.0/vsnet2005"
+          file="${sdk.src.dir}/doc/sdk/Spring-1.1/net-2.0/htmlhelp1and2/Spring.NET.hxs"/>
+    <copy todir="${current.package.dir}/doc/sdk/2.0/vsnet2005"
+          file="doc/InnovaHxReg.exe"/>
+    <copy todir="${current.package.dir}/doc/sdk/2.0/vsnet2005"
+          file="doc\docx\Spring-1.1\net-2.0\RegisterHelp2.bat"/>
+    <copy todir="${current.package.dir}/doc/sdk/2.0/vsnet2005"
+          file="doc\docx\Spring-1.1\net-2.0\UnRegisterHelp2.bat"/>
+
+  </target>
+
+  <target name="set-user-overrides" unless="${target::has-executed('set-user-overrides')}">
+    <!--
+             Per-user custom properties; we load any custom properties and / or
+             property overrides here... for instance, if a developer has installed
+             their Clover.NET executable into 'D:\dev_utils\Cenqua\Clover.NET', he or
+             she would use the following custom properties file...
+
+             <project name="MyCustomSpring.NETProperties">
+                <property name="Clover.home" value="D:\dev_utils\Cenqua\Clover.NET"/>
+             </project>
+
+             These custom properties are loaded from a single file named
+             'Spring.NET.xml' that must be placed in the ${sys.os.folder.applicationdata}
+             directory. NAnt expands this property to the 'home' folder of the
+             currently logged in user (on WinX boxes); for example...
+
+             C:\Documents and Settings\Rick Evans\Application Data
+        -->
+    <!-- has this user specified any custom properties / property overrides? -->
+    <property name="user.overrides.file" value="${sys.os.folder.applicationdata}\${project.name}.xml"/>
+    <if test="${file::exists(user.overrides.file)}">
+      <property name="user.overrides.present" value="true"/>
+    </if>
+    <if test="${not file::exists(user.overrides.file)}">
+      <property name="user.overrides.present" value="false"/>
+    </if>
+    <!-- if so, then include all of those custom properties / property overrides -->
+    <if test="${user.overrides.present}">
+      <echo message="Using overrides properties file '${user.overrides.file}'."/>
+      <include buildfile="${user.overrides.file}"/>
+    </if>
+  </target>
+  <target name="set-build-namespaces-all">
+    <property name="build.allnamespaces" value="true"/>
+    <property name="build-aop" value="true"/>
+    <property name="build-data" value="true"/>
+    <property name="build-services" value="true"/>
+    <property name="build-testing" value="true"/>
+    <property name="build-winservices" value="true"/>
+    <property name="build-web" value="true"/>
+    <property name="solution.file" value="Spring.Net.sln"/>
+    <fileset id="src.to.copy">
+      <include name="src/**"/>
+      <include name="examples/**"/>
+      <include name="test/**"/>
+      <!-- exclude VS.Net stuff -->
+      <exclude name="**/*.suo"/>
+      <exclude name="**/*.user"/>
+      <exclude name="**/bin/**"/>
+      <exclude name="**/obj/**"/>
+      <exclude name="**/_ReSharper*/**"/>
+      <exclude name="**/build/**"/>
+      <exclude name="**/sdk-web/**"/>
+      <exclude name="**/POC/**"/>
+      <exclude name="**/sdk/net/1.1/${project.name}-SDK-HTML.zip"/>
+      <exclude name="examples/Spring/SpringAir/src/SpringAir.Web.2005.References/*.dll"/>
+      <exclude name="examples/Spring/SpringAir/src/SpringAir.Web.2005.References/*.pdb"/>
+      <exclude name="examples/Spring/SpringAir/src/SpringAir.Web.2005.References/*.xml"/>
+      <exclude name="examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/*.dll"/>
+      <exclude name="examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/*.pdb"/>
+      <exclude name="examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/*.xml"/>
+      <include name="installer/**"/>
+
+    </fileset>
+  </target>
+  <target name="set-build-namespaces-release">
+    <property name="build-aop" value="true"/>
+    <property name="build-data" value="true"/>
+    <property name="build-services" value="true"/>
+    <property name="build-testing" value="true"/>
+    <property name="build-winservices" value="true"/>
+    <property name="build-web" value="true"/>
+    <property name="build-examples" value="true"/>
+    <property name="solution.file.1.1.2002" value="Spring.Net.1.1.2002.sln"/>
+    <property name="solution.file.1.1.2003" value="Spring.Net.1.1.2003.sln"/>
+    <property name="solution.file.1.1.2005" value="Spring.Net.1.1.2005.sln"/>
+    <fileset id="src.to.copy">
+      <include name="src/Spring/Spring.Core/**"/>
+      <include name="src/Spring/Spring.Aop/**"/>
+      <include name="src/Spring/Spring.Web/**"/>
+      <include name="src/Spring/Spring.Web.Extensions/**"/>
+      <include name="src/Spring/Spring.Services/EnterpriseServices/**"/>
+      <include name="src/Spring/Spring.Services/Remoting/**"/>
+      <include name="src/Spring/Spring.Services/Web/**"/>
+      <include name="src/Spring/Spring.Services/Spring.Services.2003.csproj"/>
+      <include name="src/Spring/Spring.Services/Spring.Services.2005.csproj"/>
+      <include name="src/Spring/Spring.Services/*.build"/>
+      <include name="src/Spring/Spring.Services/AssemblyInfo.cs"/>
+      <include name="src/Spring/Spring.Data/**"/>
+      <include name="src/Spring/Spring.Data.NHibernate/**"/>
+      <include name="src/Spring/Spring.Data.NHibernate12/**"/>
+      <include name="src/Spring/Spring.Testing.NUnit/**"/>
+      <include name="src/Spring/CommonAssemblyInfo.cs"/>
+
+      <include name="test/Spring/Spring.Core.Tests/**"/>
+      <include name="test/Spring/Spring.Aop.Tests/**"/>
+      <include name="test/Spring/Spring.Web.Tests/**"/>
+      <include name="test/Spring/Spring.Services.Tests/Data/**"/>
+      <include name="test/Spring/Spring.Services.Tests/EnterpriseServices/**"/>
+      <include name="test/Spring/Spring.Services.Tests/Remoting/**"/>
+      <include name="test/Spring/Spring.Services.Tests/Web/**"/>
+      <include name="test/Spring/Spring.Services.Tests/Spring.Services.Tests.2003.csproj"/>
+      <include name="test/Spring/Spring.Services.Tests/Spring.Services.Tests.2005.csproj"/>
+      <include name="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build"/>
+      <include name="test/Spring/Spring.Services.Tests/*.config"/>
+      <include name="test/Spring/Spring.Services.Tests/Spring.Services.Tests.dll.config"/>
+      <include name="test/Spring/Spring.Services.Tests/AssemblyInfo.cs"/>
+      <include name="test/Spring/Spring.Data.Tests/**"/>
+      <include name="test/Spring/Spring.Data.Integration.Tests/**"/>
+      <include name="test/Spring/Spring.Data.NHibernate.Tests/**"/>
+      <include name="test/Spring/Spring.Data.NHibernate.Integration.Tests/**"/>
+      <include name="test/Spring/Spring.Testing.NUnit.Tests/**"/>
+      <include name="test/Spring/CommonAssemblyInfo.cs"/>
+
+      <include name="examples/Spring/Spring.Examples.build"/>
+      <include name="examples/Spring/Spring.AopQuickStart/**"/>
+      <include name="examples/Spring/Spring.DataQuickStart/**"/>
+      <include name="examples/Spring/Spring.Data.NHibernate.Northwind/**"/>
+      <include name="examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Bin/*.refresh"/>
+      <include name="examples/Spring/Spring.TxQuickStart/**"/>
+      <include name="examples/Spring/Spring.IoCQuickStart.AppContext/**"/>
+      <include name="examples/Spring/Spring.IoCQuickStart.EventRegistry/**"/>
+      <include name="examples/Spring/Spring.IoCQuickStart.MovieFinder/**"/>
+      <include name="examples/Spring/Spring.Calculator/**"/>
+      <include name="examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/*.refresh"/>
+      <include name="examples/Spring/Spring.WebQuickStart/**"/>
+      <include name="examples/Spring/Spring.Web.Extensions.Example/**"/>
+      <include name="examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/*.refresh"/>
+      <include name="examples/Spring/SpringAir/**"/>
+      <include name="examples/SpringAir/src/SpringAir.Web.2005/bin/*.refresh"/>
+
+
+      <exclude name="src/Spring/Spring.Services/*WindowsService*"/>
+      <exclude name="test/Spring/Spring.Services/*WindowsService*"/>
+      <!-- exclude VS.Net stuff -->
+      <exclude name="**/sdk-web/**"/>
+      <exclude name="**/*.suo"/>
+      <exclude name="**/*.user"/>
+      <exclude name="**/bin/**"/>
+      <exclude name="**/obj/**"/>
+      <exclude name="**/_ReSharper*/**"/>
+      <exclude name="**/build/**"/>
+      <exclude name="**/*.resharper"/>
+    </fileset>
+  </target>
+
+  <!-- Set up test environment -->
+  <target name="TestInit">
+      <!-- custom task for testing under different runtimes -->
+    <loadtasks assembly="${spring.basedir}/build-support/tools/NAnt.NUnit2OutProc.Task/NAnt.NUnit2OutProcTasks.dll" />
+  </target>
+
+  <!-- Clover.NET code coverage targets... -->
+  <target name="CloverInit">
+    <!-- initializes the Clover environment -->
+    <echo message="Building with Clover.NET..."/>
+    <if test="${not property::exists('Clover.home')}">
+      <property name="Clover.home" value="K:\Program Files\Cenqua\Clover.NET 2.0 for .NET 2.0\"/>
+    </if>
+    <!-- 1595 - (Clover.NET workaround) 'type' is defined in multiple places; using definition from 'assembly' -->
+    <property name="nowarn.numbers" value="${nowarn.numbers},1595"/>
+    <copy todir="${Clover.home}" failonerror="false" overwrite="true">
+      <fileset basedir=".">
+        <include name="clovernet.license"/>
+      </fileset>
+    </copy>
+    <!-- Note: Using custom build CloverNant tasks -->
+    <loadtasks assembly="${Clover.home}\CloverNAnt-0.85.dll"/>
+    <clover-setup initstring="CloverBuild\clover.cdb" builddir="CloverBuild" enabled="true" flatten="false">
+      <fileset basedir=".">
+        <include name="src/Spring/Spring.Data/**/*"/>
+        <exclude name="examples/**/*"/>
+        <exclude name="test/**/*"/>
+        <exclude name="src/Spring/CommonAssemblyInfo.cs"/>
+      </fileset>
+    </clover-setup>
+  </target>
+  <target name="CloverClean">
+    <delete dir="CloverBuild" failonerror="false"/>
+    <!-- delete any Cloverised output lying around from previous Cloverisings -->
+    <property name="target.dir"
+              value="${project::get-base-directory()}/build/${nant.settings.currentframework}.${nant.platform.name}"/>
+    <delete
+            dir="${project::get-base-directory()}/build/${nant.settings.currentframework}.${nant.platform.name}/bin"
+            if="${directory::exists(target.dir)}"
+            failonerror="false"/>
+  </target>
+  <target name="CloverTest" depends="CloverInit">
+    <!-- let Clover instrument a debug build -->
+    <property name="using-clover" value="true"/>
+    <call target="test"/>
+  </target>
+  <target name="CloverReport" depends="CloverInit">
+    <clover-report>
+      <current title="${project.name} Code Coverage" output="report">
+        <format type="html"/>
+      </current>
+    </clover-report>
+  </target>
+  <target name="CloverAll" depends="CloverClean, CloverReport, CloverClean"
+          description="Convenience target to execute the full Clover build cycle.">
+  </target>
+  <target name="clovercruise" depends="CloverAll"
+          description="Convenience target to execute the full Clover build cycle with reporting for cruise control.">
+  </target>
+
+</project>
diff --git a/Spring.include b/Spring.include
new file mode 100644
index 00000000..900c7a40
--- /dev/null
+++ b/Spring.include
@@ -0,0 +1,434 @@
+<?xml version="1.0" ?>
+<!--
+     Copyright 2004-2005 The Apache Software Foundation
+     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.
+-->
+<project name="springnet-helpers" xmlnds="http://tempuri.org/nant-vs.xsd">
+    <!-- The path to the spring output directory for current build/runtime -->
+    <property name="spring.output.dir"
+              value="${spring.basedir}/bin/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"
+              dynamic="true"/>
+    <target name="check-bin-dir">
+        <if test="${not property::exists('bin.dir')}">
+            <property name="bin.dir" value="${project::get-base-directory()}/build"/>
+        </if>
+        <mkdir dir="${bin.dir}"/>
+    </target>
+    <target name="check-build-debug">
+        <if test="${not property::exists('build.debug')}">
+            <fail message="The build debug setting has not been specified."/>
+        </if>
+    </target>
+    <target name="check-build-defines">
+        <if test="${not property::exists('build.defines.csc')}">
+            <fail message="The build defines for the csc task have not been specified."/>
+        </if>
+        <if test="${not property::exists('build.defines.jsc')}">
+            <fail message="The build defines for the jsc task have not been specified."/>
+        </if>
+        <if test="${not property::exists('build.defines.vbc')}">
+            <fail message="The build defines for the vbc task have not been specified."/>
+        </if>
+        <if test="${not property::exists('build.defines.vjc')}">
+            <fail message="The build defines for the vjc task have not been specified."/>
+        </if>
+        <if test="${not property::exists('build.defines.cl')}">
+            <fail message="The build defines for the cl task have not been specified."/>
+        </if>
+    </target>
+    <target name="check-doc-dir">
+        <if test="${not property::exists('doc.dir')}">
+            <property name="doc.dir" value="doc"/>
+        </if>
+        <mkdir dir="${doc.dir}"/>
+    </target>
+    <target name="check-sdkdoc-dir" depends="check-doc-dir">
+        <if test="${not property::exists('sdkdoc.dir')}">
+            <property name="sdkdoc.dir" value="${doc.dir}/sdk"/>
+        </if>
+        <mkdir dir="${sdkdoc.dir}"/>
+    </target>
+    <target name="check-sdkdoc-debug">
+        <if test="${not property::exists('sdkdoc.debug')}">
+            <fail message="The sdk documentation debug setting has not been specified."/>
+        </if>
+    </target>
+    <target name="check-current-bin-dir">
+        <if test="${not property::exists('current.bin.dir')}">
+            <fail message="The current binaries directory has not been specified."/>
+        </if>
+        <mkdir dir="${current.bin.dir}"/>
+    </target>
+    <target name="check-current-build-debug">
+        <if test="${not property::exists('current.build.debug')}">
+            <fail message="The current build debug setting has not been specified."/>
+        </if>
+    </target>
+    <target name="check-current-build-defines">
+        <if test="${not property::exists('current.build.defines.csc')}">
+            <fail message="The current build defines for the csc task have not been specified."/>
+        </if>
+        <if test="${not property::exists('current.build.defines.jsc')}">
+            <fail message="The current build defines for the jsc task have not been specified."/>
+        </if>
+        <if test="${not property::exists('current.build.defines.vbc')}">
+            <fail message="The current build defines for the vbc task have not been specified."/>
+        </if>
+        <if test="${not property::exists('current.build.defines.vjc')}">
+            <fail message="The current build defines for the vjc task have not been specified."/>
+        </if>
+        <if test="${not property::exists('current.build.defines.cl')}">
+            <fail message="The current build defines for the cl task have not been specified."/>
+        </if>
+    </target>
+    <target name="check-current-sdkdoc-dir">
+        <if test="${not property::exists('current.sdkdoc.dir')}">
+            <fail message="The current sdk document directory has not been specified."/>
+        </if>
+        <mkdir dir="${sdkdoc.dir}"/>
+    </target>
+    <target name="check-current-sdkdoc-debug">
+        <if test="${not property::exists('current.sdkdoc.debug')}">
+            <fail message="The current sdk documentation debug setting has not been specified."/>
+        </if>
+    </target>
+    <target name="check-current-build-config">
+        <if test="${not property::exists('current.build.config')}">
+            <if test="${not property::exists('project.build.config')}">
+                <fail message="The build configuration has not been specified and no default build configuration is available."/>
+            </if>
+            <if test="${property::exists('project.build.config')}">
+                <property name="current.build.config" value="${project.build.config}"/>
+            </if>
+        </if>
+    </target>
+
+    <target name="check-spring-basedir">
+        <if test="${not property::exists('spring.basedir')}">
+            <fail message="The spring base directory has not been specified."/>
+        </if>
+    </target>
+    <target name="check-spring-output-dir">
+        <if test="${not property::exists('spring.output.dir')}">
+            <fail message="The log4net output directory has not been specified."/>
+        </if>
+    </target>
+    <target name="check-spring-assembly" depends="check-current-build-config, check-spring-output-dir">
+        <if test="${not file::exists(path::combine(spring.output.dir, 'Spring.Core.dll'))}">
+            <fail message="The Spring.Core '${current.build.config}' assembly for ${framework::get-description(framework::get-target-framework())} is not available."/>
+        </if>
+    </target>
+    <!-- Targets for cleaning up -->
+    <target name="clean-current-bin-dir" depends="check-current-bin-dir"
+            description="Cleans the current binaries directory">
+        <echo message="Cleaning the ${current.bin.dir} binaries directory."/>
+        <delete dir="${current.bin.dir}" if="${directory::exists(current.bin.dir)}"/>
+        <mkdir dir="${current.bin.dir}"/>
+    </target>
+    <target name="clean-current-sdkdoc-dir" depends="check-current-sdkdoc-dir"
+            description="Cleans the current SDK documentation directory">
+        <echo message="Cleaning the ${current.sdkdoc.dir} SDK documentation directory."/>
+        <delete dir="${current.sdkdoc.dir}" if="${directory::exists(current.sdkdoc.dir)}"/>
+        <mkdir dir="${current.sdkdoc.dir}"/>
+    </target>
+    <!-- Targets for setting up the environment -->
+    <target name="set-build-configuration" depends="check-current-build-config">
+        <property name="doc.dir" value="${project::get-base-directory()}/doc"/>
+        <!-- TODO externalize this value into a property -->
+        <property name="NDoc.home" value="C:\Program Files\NDoc 1.3\bin\net\1.1"/>
+        <!--
+             if Visual Studio Help Integration Kit has been installed
+             then change this to true or define the vshik.installed
+             property to the value 'true'.
+             It generates Visual Studio.NET 2003 documentation.
+        -->
+        <property name="vshik.installed" value="false" overwrite="false"/>
+        <!-- 1591 - do not report warnings for missing XML comments -->
+        <!-- 0618 - do not report deprecation warnings -->
+        <!-- 0067 - do not report uncalled events -->
+        <property name="nowarn.numbers" value="0618"/>
+        <!-- use a different set of warnings for building the tests -->
+        <!-- TODO: "nowarn.numbers.test.default" should be "current.nowarn.numbers.test" -->
+        <property name="nowarn.numbers.test.default" value="1591,0618,0067"/>
+        <if test="${not target::exists('set-' + current.build.config + '-build-configuration')}">
+            <fail message="The ${current.build.config} build configuration is not supported by ${project.name}."/>
+        </if>
+        <call target="set-${current.build.config}-build-configuration"/>
+    </target>
+
+    <target name="generate-build-number">
+
+    <script language="C#">
+        <imports>
+            <import namespace="System.Globalization" />
+            <import namespace="System.Threading" />
+        </imports>
+
+        <code>
+	<!-- format for assembly revision is RRXXX where RR = framework number (1.0=10; 1.1=11; 2.0=20 etc) and 
+             XXX is the number of days from the year the project 'started', property project.year.  -->
+            <![CDATA[
+                public static void ScriptMain(Project project) {
+		    int frameworkRevision = Convert.ToInt32(project.Properties["nant.settings.currentframework.revisionnumber"]);
+                    Version version = new Version(project.Properties["package.version"]);
+                    int major = version.Major;
+                    int minor = version.Minor;
+                    int build = version.Build;
+                    int revision = version.Revision;
+ 
+                    int startYear = Convert.ToInt32(project.Properties["project.year"]);
+                    DateTime start = new DateTime(startYear, 1, 1);
+		    TimeSpan ts = DateTime.Now - start;
+                    revision = ts.Days;
+                    revision = revision + (frameworkRevision*10000);
+		    
+
+                    version = new Version(major, minor, build, revision);
+                    project.Properties["project.version.numeric"] = version.ToString();
+                }
+            ]]>
+        </code>
+
+    </script>
+    </target>
+
+    <target name="common.set-assembly-attribute-values" depends="generate-build-number">
+        <property name="assembly.is-cls-compliant" value="false" />
+	<property name="assembly.configuration" value="${nant.settings.currentframework}.win32; ${current.build.config}"/>
+	<property name="assembly.product" value="${project.name.full} ${package.version} for .NET ${nant.settings.currentframework.number}" />
+	<property name="assembly.company" value="${project.company}" />
+	<property name="assembly.copyright" value="${project.copyright}" />
+	<property name="assembly.trademark" value="Apache License, Version 2.0" />
+        <property name="assembly.culture" value=""/>
+	<property name="assembly.version" value="${project.version.numeric}" />
+	<property name="assembly.delay.sign" value="false" />
+	<property name="assembly.keyfile" value="${key.file}" />
+
+        <!--
+	<property name="assembly.title" value="${project::get-name()}" />
+	<property name="assembly.description" value="" />
+	<property name="assembly.version.informational" value="${project.version.numeric}" />
+	-->
+
+    </target>
+
+    <target name="common.generate-assemblyinfo"
+            depends="common.set-assembly-attribute-values"
+            description="Generate AssemblyInfo.cs using assembly.* properties."
+	    >
+	<asminfo output="src/Spring/GenCommonAssemblyInfo.cs" language="CSharp">
+	    <imports>
+	        <import namespace="System" />
+	        <import namespace="System.Reflection" />
+	    </imports>
+	    <attributes>
+	        <attribute type="CLSCompliantAttribute" value="${assembly.is-cls-compliant}" />
+		<attribute type="AssemblyConfigurationAttribute" value="${assembly.configuration}" />
+		<attribute type="AssemblyProductAttribute" value="${assembly.product}" />
+		<attribute type="AssemblyCompanyAttribute" value="${assembly.company}" />
+		<attribute type="AssemblyCopyrightAttribute" value="${assembly.copyright}" />
+		<attribute type="AssemblyTrademarkAttribute" value="${assembly.trademark}" />
+		<attribute type="AssemblyCultureAttribute" value="${assembly.culture}" />
+		<attribute type="AssemblyVersionAttribute" value="${assembly.version}" />
+
+		<attribute type="AssemblyDelaySignAttribute" value="false"/>
+		<attribute type="AssemblyKeyFileAttribute" value="${assembly.keyfile}" if="${(nant.settings.currentframework == 'net-1.0' or nant.settings.currentframework == 'net-1.1') and project.build.sign}" />
+		
+			
+		<!--
+		<attribute type="AssemblyTitleAttribute" value="${assembly.title}" />
+		<attribute type="AssemblyDescriptionAttribute" value="${assembly.description}" />
+		<attribute type="AssemblyInformationalVersionAttribute" value="${assembly.version.informational}" />
+		<attribute type="AssemblyFileVersionAttribute" value="${assembly.version.file}" />
+		-->
+            </attributes>
+	</asminfo>
+    </target>
+    
+
+    <target name="set-debug-build-configuration">
+        <property name="compiler.args" value=""/>
+        <property name="net-2.0" value="false"/>
+        <property name="build.debug" value="Full"/>
+        <property name="build.defines.csc" value="DEBUG,TRACE"/>
+        <property name="build.defines.jsc" value="DEBUG,TRACE"/>
+        <property name="build.defines.vbc" value="DEBUG=True,TRACE=True"/>
+        <property name="build.defines.vjc" value="DEBUG,TRACE"/>
+        <property name="build.defines.cl" value="/D _DEBUG"/>
+        <property name="sdkdoc.debug" value="false"/>
+        <property name="current.build.config" value="debug"/>
+        <call target="set-build-configuration-flags"/>
+    </target>
+    <target name="set-release-build-configuration">
+        <property name="compiler.args" value=""/>
+        <property name="net-2.0" value="false"/>
+        <property name="build.debug" value="PdbOnly"/>
+        <property name="build.defines.csc" value="TRACE,STRONG"/>
+        <property name="build.defines.jsc" value="TRACE,STRONG"/>
+        <property name="build.defines.vbc" value="TRACE=True,STRONG=True"/>
+        <property name="build.defines.vjc" value="TRACE,STRONG"/>
+        <property name="build.defines.cl" value="/D STRONG"/>
+        <property name="sdkdoc.debug" value="false"/>
+        <property name="current.build.config" value="release"/>
+        <call target="set-build-configuration-flags"/>
+    </target>
+    <target name="set-build-configuration-flags" depends="check-current-build-config">
+        <property name="current.build.config.debug" value="false"/>
+        <property name="current.build.config.release" value="false"/>
+        <property name="current.build.config.${current.build.config}" value="true"/>
+    </target>
+    <target name="set-framework-configuration" depends="check-current-build-config">
+        <if test="${not target::exists('set-' + framework::get-target-framework() + '-runtime-configuration')}">
+            <fail message="The current target framework (${framework::get-description(framework::get-target-framework())}) is not supported by Spring.NET."/>
+        </if>
+        <call target="set-${framework::get-target-framework()}-runtime-configuration"/>
+    </target>
+    <target name="set-net-1.0-runtime-configuration"
+            depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
+        <property name="nant.settings.currentframework" value="net-1.0"/>
+        <property name="nant.settings.currentframework.number" value="1.0"/>
+        <property name="nant.settings.currentframework.revisionnumber" value="0"/>
+        <property name="current.build.debug" value="${build.debug}" dynamic="true"/>
+        <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_1_0" dynamic="true"/>
+        <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_1_0" dynamic="true"/>
+        <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_1_0=True" dynamic="true"/>
+        <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_1_0" dynamic="true"/>
+        <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_1_0" dynamic="true"/>
+        <property name="current.bin.dir"
+                  value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"/>
+        <property name="current.sdkdoc.dir"
+                  value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+        <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true"/>
+        <property name="link.sdkdoc.version" value="SDK_v1_0"/>
+        <property name="nowarn.numbers.test" value="${nowarn.numbers.test.default}"/>
+
+    </target>
+    <target name="set-net-1.1-runtime-configuration"
+            depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
+        <property name="nant.settings.currentframework" value="net-1.1"/>
+        <property name="nant.settings.currentframework.number" value="1.1"/>
+        <property name="nant.settings.currentframework.revisionnumber" value="1"/>
+        <property name="current.build.debug" value="${build.debug}" dynamic="true"/>
+        <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_1_1" dynamic="true"/>
+        <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_1_1" dynamic="true"/>
+        <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_1_1=True" dynamic="true"/>
+        <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_1_1" dynamic="true"/>
+        <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_1_1" dynamic="true"/>
+        <property name="current.bin.dir"
+                  value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"/>
+        <property name="current.sdkdoc.dir"
+                  value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+        <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true"/>
+        <property name="link.sdkdoc.version" value="SDK_v1_1"/>
+        <property name="nowarn.numbers.test" value="${nowarn.numbers.test.default}"/>
+    </target>
+    <target name="set-net-2.0-runtime-configuration"
+            depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
+        <property name="nant.settings.currentframework" value="net-2.0"/>
+        <property name="nant.settings.currentframework.number" value="2.0"/>
+        <property name="nant.settings.currentframework.revisionnumber" value="2"/>
+        <property name="net-2.0" value="true"/>
+        <property name="current.build.debug" value="${build.debug}" dynamic="true"/>
+        <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_2_0" dynamic="true"/>
+        <property name="current.build.defines.jsc" value="${build.defines.jsc},NET,NET_2_0" dynamic="true"/>
+        <property name="current.build.defines.vbc" value="${build.defines.vbc},NET=True,NET_2_0=True" dynamic="true"/>
+        <property name="current.build.defines.vjc" value="${build.defines.vjc},NET,NET_2_0" dynamic="true"/>
+        <property name="current.build.defines.cl" value="${build.defines.cl} /D NET /D NET_2_0" dynamic="true"/>
+        <property name="current.bin.dir"
+                  value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"/>
+        <property name="current.sdkdoc.dir"
+                  value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+        <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true"/>
+        <property name="nowarn.numbers.test" value="${nowarn.numbers.test.default},1701"/>
+    </target>
+    <target name="set-netcf-1.0-runtime-configuration"
+            depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
+        <property name="nant.settings.currentframework" value="netcf-1.0"/>
+        <property name="current.build.debug" value="${build.debug}" dynamic="true"/>
+        <property name="current.build.defines.csc" value="${build.defines.csc},NETCF,NETCF_1_0" dynamic="true"/>
+        <property name="current.build.defines.jsc" value="${build.defines.jsc},NETCF,NETCF_1_0" dynamic="true"/>
+        <property name="current.build.defines.vbc" value="${build.defines.vbc},NETCF=True" dynamic="true"/>
+        <property name="current.build.defines.vjc" value="${build.defines.vjc},NETCF" dynamic="true"/>
+        <property name="current.build.defines.cl" value="${build.defines.cl} /D NETCF /D NETCF_1_0" dynamic="true"/>
+        <property name="current.bin.dir"
+                  value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"/>
+        <property name="current.sdkdoc.dir"
+                  value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+        <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true"/>
+        <property name="link.sdkdoc.version" value="SDK_v1_1"/>
+        <property name="nowarn.numbers.test" value="${nowarn.numbers.test.default}"/>
+    </target>
+    <target name="set-mono-1.0-runtime-configuration"
+            depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
+        <property name="nant.settings.currentframework" value="mono-1.0"/>
+        <property name="current.build.debug" value="${build.debug}" dynamic="true"/>
+        <property name="current.build.defines.csc" value="${build.defines.csc},MONO,MONO_1_0" dynamic="true"/>
+        <property name="current.build.defines.jsc" value="${build.defines.jsc},MONO,MONO_1_0" dynamic="true"/>
+        <property name="current.build.defines.vbc" value="${build.defines.vbc},MONO=True,MONO_1_0=True" dynamic="true"/>
+        <property name="current.build.defines.vjc" value="${build.defines.vjc},MONO,MONO_1_0" dynamic="true"/>
+        <property name="current.build.defines.cl" value="${build.defines.cl} /D MONO /D MONO_1_0" dynamic="true"/>
+        <property name="current.bin.dir"
+                  value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"/>
+        <property name="current.sdkdoc.dir"
+                  value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+        <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true"/>
+        <property name="link.sdkdoc.version" value="MsdnOnline"/>
+        <property name="nowarn.numbers.test" value="${nowarn.numbers.test.default}"/>
+    </target>
+    <target name="set-mono-2.0-runtime-configuration"
+            depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
+        <property name="nant.settings.currentframework" value="mono-2.0"/>
+        <property name="current.build.debug" value="${build.debug}" dynamic="true"/>
+        <property name="current.build.defines.csc" value="${build.defines.csc},MONO,MONO_2_0" dynamic="true"/>
+        <property name="current.build.defines.jsc" value="${build.defines.jsc},MONO,MONO_2_0" dynamic="true"/>
+        <property name="current.build.defines.vbc" value="${build.defines.vbc},MONO=True,MONO_2_0=True" dynamic="true"/>
+        <property name="current.build.defines.vjc" value="${build.defines.vjc},MONO,MONO_2_0" dynamic="true"/>
+        <property name="current.build.defines.cl" value="${build.defines.cl} /D MONO /D MONO_2_0" dynamic="true"/>
+        <property name="current.bin.dir"
+                  value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"/>
+        <property name="current.sdkdoc.dir"
+                  value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+        <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true"/>
+        <property name="link.sdkdoc.version" value="MsdnOnline"/>
+        <property name="nowarn.numbers.test" value="${nowarn.numbers.test.default},0414"/>
+    </target>
+    <target name="set-sscli-1.0-runtime-configuration"
+            depends="check-bin-dir, check-current-build-config, check-build-debug, check-build-defines">
+        <property name="nant.settings.currentframework" value="sscli-1.0"/>
+        <property name="current.build.debug" value="${build.debug}" dynamic="true"/>
+        <property name="current.build.defines.csc" value="${build.defines.csc},SSCLI,SSCLI_1_0" dynamic="true"/>
+        <property name="current.build.defines.jsc" value="${build.defines.jsc},SSCLI,SSCLI_1_0" dynamic="true"/>
+        <property name="current.build.defines.vbc" value="${build.defines.vbc},SSCLI=True,SSCLI_1_0=True"
+                  dynamic="true"/>
+        <property name="current.build.defines.vjc" value="${build.defines.vjc},SSCLI,SSCLI_1_0" dynamic="true"/>
+        <property name="current.build.defines.cl" value="${build.defines.cl} /D SSCLI /D SSCLI_1_0" dynamic="true"/>
+        <property name="current.bin.dir"
+                  value="${bin.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}/${current.build.config}"/>
+        <property name="current.sdkdoc.dir"
+                  value="${sdkdoc.dir}/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
+        <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true"/>
+        <property name="link.sdkdoc.version" value="MsdnOnline"/>
+        <property name="nowarn.numbers.test" value="${nowarn.numbers.test.default}"/>
+    </target>
+    <target name="set-cli-1.0-configuration" depends="check-bin-dir">
+        <property name="nant.settings.currentframework" value="net-1.0"/>
+        <property name="current.build.debug" value="${build.debug}" dynamic="true"/>
+        <property name="current.build.defines.csc" value="${build.defines.csc},CLI,CLI_1_0" dynamic="true"/>
+        <property name="current.build.defines.jsc" value="${build.defines.jsc},CLI,CLI_1_0" dynamic="true"/>
+        <property name="current.build.defines.vbc" value="${build.defines.vbc},CLI=True,CLI_1_0=True" dynamic="true"/>
+        <property name="current.build.defines.vjc" value="${build.defines.vjc},CLI,CLI_1_0" dynamic="true"/>
+        <property name="current.build.defines.cl" value="${build.defines.cl} /D CLI /D CLI_1_0" dynamic="true"/>
+        <property name="current.bin.dir" value="${bin.dir}/cli/1.0/${current.build.config}"/>
+        <property name="current.sdkdoc.dir" value="${sdkdoc.dir}"/>
+        <property name="current.sdkdoc.debug" value="${sdkdoc.debug}" dynamic="true"/>
+        <property name="nowarn.numbers.test" value="${nowarn.numbers.test.default}"/>
+    </target>
+</project>
diff --git a/build-support/CruiseControl.xml b/build-support/CruiseControl.xml
new file mode 100644
index 00000000..154e3866
--- /dev/null
+++ b/build-support/CruiseControl.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+
+<!-- Bootstrap build file for ccnet -->
+
+<project name="ccnetlaunch" default="go">
+
+        <!-- These properties will be set via CCNET as defined in -->
+        <!-- ccnet.config, but they are set the the same values   -->
+	<!-- stand alone usage -->
+        <property name="cvs.executable" value="C:\Program Files\TortoiseCVS\cvs.exe"/>
+        <property name="build.file" value="Spring.build"/>
+
+	<!-- Get all the latest code and do the build+test -->
+        <target name="go" depends="cleansrc,update,build"/>
+
+        <target name="daily" depends="cleansrc,update,build-daily"/>
+
+
+        <target name="cleansrc" description="Deletes source code">
+	   <echo message="Deleting src directory" />
+           <delete dir="./src" failonerror="false" />
+           <mkdir dir="./src" verbose="true" />
+
+	   <echo message="Deleting test directory" />
+           <delete dir="./test" failonerror="false" />
+	   <mkdir dir="./test" verbose="true" />
+
+	   <echo message="Deleting examples directory" />
+           <delete dir="./examples" failonerror="false" />
+	   <mkdir dir="./examples" verbose="true" />
+
+	   <echo message="Deleting sandbox directory" />
+           <delete dir="./sandbox" failonerror="false" />
+	   <mkdir dir="./sandbox" verbose="true" />
+
+	   <echo message="Deleting Clover HTML report directory" />
+           <delete dir="./report" failonerror="false" />
+	   <mkdir dir="./report" verbose="true" />
+
+           <nant buildfile="${build.file}" 
+                 target="cleanall"      
+                 inheritall="true"/>
+
+        </target>
+
+        <target name="update">
+		<if test="${not property::exists('cvs.executable')}">
+                        <fail message="cvs.executable property not set, so can't update" />
+                </if>
+                <echo message="CVS Executable at [${cvs.executable}]" />
+                <exec basedir="." program="${cvs.executable}" 
+                        commandline="-q update -P -d"/>
+        </target>
+
+	<!-- Call the default NAnt target -->
+        <target name="build">
+                <nant buildfile="${build.file}" 
+                      target="test"      
+                      inheritall="true"/>
+        </target>
+
+	<!-- Call the default NAnt target -->
+        <target name="build-daily">
+                <nant buildfile="${build.file}" 
+                      target="dailysnapshot"      
+                      inheritall="true"/>
+        </target>
+</project>
diff --git a/build-support/install-schema.build b/build-support/install-schema.build
new file mode 100644
index 00000000..9b39f8f7
--- /dev/null
+++ b/build-support/install-schema.build
@@ -0,0 +1,132 @@
+<?xml version="1.0" ?>
+<project name="Spring.NET-Schema" default="deploy-schema">
+
+  <target name="locations"
+	  descriptions="Shows directories where .xsd files will be copied">
+    <property name="vsXXXX.version" value="VS.NET 2005"/>
+    <property name="vsXXXX.xml.schemas.install.dir" value="SOFTWARE\Microsoft\VisualStudio\8.0\InstallDir"/>
+    <property name="vsXXXX.relative.dir" value="..\\..\\Xml\\Schemas"/>
+    <!-- retrieve location of VS.NET 2005 schema store -->
+    <readregistry property="vs2005.xml.schemas" key="${vsXXXX.xml.schemas.install.dir}" hive="LocalMachine"
+                  failonerror="false"/>
+    <echo message="VS.NET 2005 xsd install directory = ${vs2005.xml.schemas}${vsXXXX.relative.dir}"/>
+  </target>
+
+
+  <target name="deploy-schema"
+          description="Deploys the Schema to VS.Net schemas dirs. Copies VS 7.0, 7.1, 8.0">
+
+    <!-- deploy spring schema to the VS.NET 2005 schema store -->
+    <property name="vsXXXX.version" value="VS.NET 2005"/>
+    <property name="vsXXXX.xml.schemas.install.dir" value="SOFTWARE\Microsoft\VisualStudio\8.0\InstallDir"/>
+    <property name="vsXXXX.relative.dir" value="..\\..\\Xml\\Schemas"/>
+    <!-- retrieve location of VS.NET 2005 schema store -->
+    <readregistry property="vs2005.xml.schemas" key="${vsXXXX.xml.schemas.install.dir}" hive="LocalMachine"
+                  failonerror="false"/>
+    <property name="vsXXXX.xml.schemas.notinstalled" value="true"/>
+    <if test="${property::exists('vs2005.xml.schemas')}">
+      <property name="vsXXXX.xml.schemas" value="${vs2005.xml.schemas}"/>
+      <call target="_deploy-schema"/>
+    </if>
+
+
+    <!-- deploy spring schema to the VS.NET 2003 schema store -->
+    <property name="vsXXXX.version" value="VS.NET 2003"/>
+    <property name="vsXXXX.xml.schemas.install.dir" value="SOFTWARE\Microsoft\VisualStudio\7.1\InstallDir"/>
+    <property name="vsXXXX.relative.dir" value="..\\Packages\schemas\xml"/>
+    <!-- retrieve location of VS.NET 2003 schema store -->
+    <readregistry property="vs2003.xml.schemas" key="${vsXXXX.xml.schemas.install.dir}" hive="LocalMachine"
+                  failonerror="false"/>
+    <property name="vsXXXX.xml.schemas.notinstalled" value="true"/>
+    <if test="${property::exists('vs2003.xml.schemas')}">
+      <property name="vsXXXX.xml.schemas" value="${vs2003.xml.schemas}"/>
+      <call target="_deploy-schema"/>
+    </if>
+
+
+    <!-- deploy spring schema to the VS.NET 2002 schema store -->
+    <property name="vsXXXX.version" value="VS.NET 2002"/>
+    <property name="vsXXXX.xml.schemas.install.dir" value="SOFTWARE\Microsoft\VisualStudio\7.0\InstallDir"/>
+    <property name="vsXXXX.relative.dir" value="..\\Packages\schemas\xml"/>
+    <!-- retrieve location of VS.NET 2003 schema store -->
+    <readregistry property="vs2002.xml.schemas" key="${vsXXXX.xml.schemas.install.dir}" hive="LocalMachine"
+                  failonerror="false"/>
+    <property name="vsXXXX.xml.schemas.notinstalled" value="true"/>
+    <if test="${property::exists('vs2002.xml.schemas')}">
+      <property name="vsXXXX.xml.schemas" value="${vs2002.xml.schemas}"/>
+      <call target="_deploy-schema"/>
+    </if>
+  </target>
+
+  <!-- 'private' scoped parameterised version of the 'deploy-schema' target -->
+
+
+  <target name="_deploy-schema">
+
+      <!-- deploy schema to VS.NET XXXX schema store -->
+      <echo message="-------------------------------------------------------"/>
+      <echo message="Copying spring-objects-1.1.xsd to ${vsXXXX.version} installation."/>
+      <echo message="-------------------------------------------------------"/>
+      <echo message=""/>
+      <copy file="spring-objects-1.1.xsd" todir="${vsXXXX.xml.schemas}${vsXXXX.relative.dir}"
+            verbose="true"
+	    overwrite="true"/>
+
+      <echo message="-------------------------------------------------------"/>
+      <echo message="Copying spring-tool-1.1.xsd to ${vsXXXX.version} installation."/>
+      <echo message="-------------------------------------------------------"/>
+      <echo message=""/>
+      <copy file="spring-tool-1.1.xsd" todir="${vsXXXX.xml.schemas}${vsXXXX.relative.dir}"
+            verbose="true"
+	    overwrite="true"/>
+
+      <echo message="----------------------------------------------------------"/>
+      <echo message="Copying spring-validation-1.1.xsd to ${vsXXXX.version} installation."/>
+      <echo message="----------------------------------------------------------"/>
+      <echo message=""/>
+      <copy file="spring-validation-1.1.xsd" todir="${vsXXXX.xml.schemas}${vsXXXX.relative.dir}"
+            verbose="true"
+	    overwrite="true"/>
+
+      <echo message="----------------------------------------------------------"/>
+      <echo message="Copying spring-aop-1.1.xsd to ${vsXXXX.version} installation."/>
+      <echo message="----------------------------------------------------------"/>
+      <echo message=""/>
+      <copy file="spring-aop-1.1.xsd" todir="${vsXXXX.xml.schemas}${vsXXXX.relative.dir}"
+            verbose="true"
+	    overwrite="true"/>
+
+      <echo message="----------------------------------------------------------"/>
+      <echo message="Copying spring-remoting-1.1.xsd to ${vsXXXX.version} installation."/>
+      <echo message="----------------------------------------------------------"/>
+      <echo message=""/>
+      <copy file="spring-remoting-1.1.xsd" todir="${vsXXXX.xml.schemas}${vsXXXX.relative.dir}"
+            verbose="true"
+	    overwrite="true"/>
+
+      <echo message="----------------------------------------------------------"/>
+      <echo message="Copying spring-database.xsd to ${vsXXXX.version} installation."/>
+      <echo message="----------------------------------------------------------"/>
+      <echo message=""/>
+      <copy file="spring-database-1.1.xsd" todir="${vsXXXX.xml.schemas}..\\..\\Xml\\Schemas" 
+            verbose="true"
+	    overwrite="true"/>
+
+      <echo message="----------------------------------------------------------"/>
+      <echo message="Copying spring-tx-1.1t.xsd to ${vsXXXX.version} installation."/>
+      <echo message="----------------------------------------------------------"/>
+      <echo message=""/>
+      <copy file="spring-tx-1.1.xsd" todir="${vsXXXX.xml.schemas}..\\..\\Xml\\Schemas" 
+            verbose="true"
+	    overwrite="true"/>
+t
+      <property name="vsXXXX.xml.schemas.notinstalled" value="false"/>
+
+    <if test="${vsXXXX.xml.schemas.notinstalled}">
+      <echo message=""/>
+      <echo message="Ignore Registry Value Not Found message."/>
+      <echo message=""/>
+    </if>
+  </target>
+
+</project>
\ No newline at end of file
diff --git a/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mia b/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mia
new file mode 100644
index 00000000..56c6b66d
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mia
@@ -0,0 +1,4150 @@
+Comment
+Comment
+Code Folding Region
+Code Folding Region
+Comment
+Code Folding Region
+Comment
+Code Folding Region
+Comment
+Set Variable
+Set Variable
+Compiler Variable If
+If
+Set Variable
+Set Variable
+End
+Compiler Variable End
+Code Folding Region
+Comment
+Code Folding Region
+Comment
+If
+Display Dialog
+If
+Terminate Install
+End
+Display Dialog
+Compiler Variable If
+If
+Set Variable
+Set Variable
+(Un)Install MSI Setup
+If
+MessageBox
+Terminate Install
+End
+If
+MessageBox
+If
+Reboot and Resume
+Else
+Terminate Install
+End
+End
+Set Variable
+End
+Compiler Variable End
+Hide Dialog
+End
+Code Folding Region
+Comment
+Code Folding Region
+Comment
+Code Folding Region
+Comment
+Define Component
+Comment
+Comment
+Get System Settings
+Get Folder Location
+Get Folder Location
+Get Folder Location
+Get Folder Location
+If
+Set Variable
+End
+Get Folder Location
+Get Folder Location
+Get Folder Location
+Get Folder Location
+Get Folder Location
+Code Folding Region
+Comment
+Code Folding Region
+If
+GoTo Label
+Else
+Compiler Variable If
+Comment
+Set Variable
+Set Variable
+Compiler Variable End
+End
+Comment
+Label
+Display Dialog
+If
+GoTo Label
+End
+Compiler Variable If
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Comment
+If
+Set Component State
+Else
+If
+Set Component State
+End
+End
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Compiler Variable End
+Label
+Display Dialog
+If
+Compiler Variable If
+GoTo Label
+Compiler Variable Else
+GoTo Label
+Compiler Variable End
+Else
+GoTo Label
+End
+Comment
+Label
+Comment
+Wizard Loop
+Display Dialog
+Display Dialog
+Display Dialog
+End
+Code Folding Region
+Comment
+Code Folding Region
+Label
+Comment
+If
+Terminate Install
+End
+Comment
+Comment
+Set Variable
+Set Variable
+Set Variable
+If
+Set Variable
+Else
+Set Variable
+End
+Display Dialog
+Comment
+Comment
+Code Folding Region
+If
+Comment
+Comment
+Apply Changes
+Set Variable
+Else
+Code Folding Region
+Code Folding Region
+Comment
+Create Shortcut
+Web Media Block
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Web Media Block
+Get Component State
+If
+End
+Comment
+Compiler Variable If
+Apply Patch
+Compiler Variable Else
+If
+Apply Changes
+Else
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Apply Changes
+End
+Compiler Variable End
+Set Variable
+End
+Code Folding Region
+Code Folding Region
+Comment
+Code Folding Region
+Comment
+Hide Dialog
+Display Dialog
+If
+If
+If
+Reboot Computer
+End
+End
+If
+If
+If
+Comment
+End
+End
+End
+End
+Code Folding Region
+Comment
+$
+{0AADAE47-CCD6-4CC9-BF83-32297AB40C37}
+{36ADC9A6-0B4F-4245-ACCE-4A50015A80A8}
+{9FF95FFA-C00A-4F12-B05E-DB5ED37B659C}
+{A4EDA82B-1FE9-4E39-AD3E-B88DCA4DBCC2}
+{5076ABBD-5015-4CE7-BD04-2E313FB65264}
+{B9949A57-3226-461B-910B-04EED077BFD2}
+{B51103C7-8FD1-43CD-9553-57945F20EDE8}
+{CDBD7138-E76A-4A1F-A427-97837EAF89CB}
+{7A4D8295-AAA0-4D43-8542-2746B3A3CB7E}
+{B62B7C2B-4668-4E4E-87C7-CC1525784712}
+{C7F738FC-2B5F-4380-9608-0DEA772B94C7}
+{8E733ADF-0692-4381-A6CE-1A14FC3B3EFD}
+{E3B49129-FB7E-494B-8868-3A7E035A1BB6}
+{95C7D535-8788-41B6-B8CA-D3742CDD3E2A}
+{DD78225E-3B68-40CE-B4E1-93AE4BE9C37F}
+{15A07272-08A0-428D-A9BD-D9B536BFE301}
+{73F169C4-5CC8-4F30-9586-F6C6550442B3}
+{DCC35A72-84BC-4C7A-97BA-17F3C2C6B183}
+{4D692B2D-36CC-437E-8B49-F054053A65B8}
+{CFCA2177-B5D4-4498-9341-74DA4A2BF10E}
+{007D81FD-F462-41C0-9766-5CA98DB29B4A}
+{B0E8FF3A-6587-4329-AD90-A5E8BD6B61D5}
+{2F15D329-6E80-4509-829F-C2F3352970ED}
+{CC974A69-AA46-4F01-934D-3AD31BE3EA59}
+{BA863E14-FDA9-4832-8A5C-8D3C6133D31C}
+{F8340D11-FC61-41E9-9E3F-6BC558DF4B68}
+{5B250495-2FD6-4B4D-BE79-23040614AF44}
+{A07B9E2D-B4D2-4987-9814-D9E37F8042F5}
+{B318EA01-0253-43B2-8A21-BB05E733C066}
+{D4F36731-7336-4097-A355-B0B1584CBB44}
+{CAC97A56-5D1A-405B-A78B-FE91751C7B09}
+{0C995B1F-7720-416B-8062-9D30A5BF4199}
+{C81A209F-B1AF-42AC-9982-8EC8CCC33464}
+{18516BF5-FA02-4D7B-BFD4-07714E2BC054}
+{345A0328-D054-4691-8073-84166C595BA5}
+{B5CCDB38-F907-47AB-B552-39C7A2B2F100}
+{BC322E68-8DCC-4C68-88F9-B1B2E20C4180}
+{EDE1F9CC-5316-44E4-8FEA-FE44558E9C84}
+{35873C23-DAB9-48D3-AD16-0C5140653771}
+{DDD28604-5F9E-464E-B26B-3F7F61EBB045}
+{373E3B8A-6592-4D42-9470-D0A5E9A6460E}
+{389865AC-1C56-47A5-8B49-B12BDF111071}
+{45CF9BB8-19DD-4841-8822-9B5E47CD95A6}
+{D6BA809F-6E50-4518-A1E8-9B88CBA27CC7}
+{B47D5127-9D59-471B-992B-F006D44A3F2E}
+{3BA88535-90E4-471C-8DE1-67DD268DAF38}
+{505F5EB8-1FC9-43BD-8064-B0E68BE663CA}
+{04ABB7B7-0915-407F-9520-6EEF5B5B6E4F}
+{90D54643-FAC1-4FBC-966D-507F1D2B43FB}
+{34379777-3444-4208-B99D-DE846461A34C}
+{8EE4916B-990A-45A0-91FC-AE6E73BAD205}
+{BEE14656-9B19-4E10-A494-FC09B7BE2537}
+{2D37F8AF-D65E-43A0-ADFF-D492484E9BB4}
+{543486BF-8C7F-46E6-B5E4-AF60671E5A79}
+{C65B04D2-F38D-4815-A963-34D67AD027BD}
+{A3A8A528-F4F5-4031-8308-7F556B64C129}
+{A7335220-876F-4C84-8F58-4C7CF63DAB43}
+{5232CF1A-2118-413C-BF18-594406FC60A0}
+{E4393F3D-D71C-4B0C-BE63-043394AC87F4}
+{89AA7DF5-3C08-48DF-A638-DE6B27BB689A}
+{DA7984D1-FFC6-46FD-AA05-CF9705718548}
+{93E95378-FCD0-4AD8-859C-F79D0659B4D4}
+{46249933-EAFF-48CC-83D4-A2B2D9A539DF}
+{8A95A867-00ED-469E-B99D-5FD8ABA81ABF}
+{7FFAA3DC-DDA0-4A59-BD77-84B4369F5078}
+{7D1B9FBD-2CB8-477E-B19D-5291A9B0DB2F}
+{73747553-3B70-47E7-A37E-EA9C3104CFB0}
+{8628DC93-23A1-402B-9482-4986B2460DCA}
+{3AC507BE-2DCF-4306-9D2A-2C8C6B346E2B}
+{8759C800-4115-4C0F-B44B-6E4A0A3B7271}
+{FEAA8A2C-3859-4A1D-B5BD-AFAE6A837273}
+{8B8FFBAD-57B5-4C26-8914-C49244985EAB}
+{17ED505D-22C9-4411-B251-BC1C7E4B1B5C}
+{44378BF2-B6DF-4AD7-871D-466D3AE158D3}
+{545506AF-96E2-44DE-B49C-3CDD3E25CE68}
+{C435DFAE-2EF8-4D28-A93F-3683596F4C3B}
+{A3C06778-3246-4A8B-B853-AF8247C33EDC}
+{A5001B5C-1CBD-4C2E-9942-64B73BFE5D3B}
+{7568CEA0-C91D-4D89-9091-98512904A1D1}
+{9CC32567-D081-4F97-8377-F414F884749A}
+{4632834D-AC50-48B5-A91B-503C03608212}
+{4B7055B6-C079-427E-8928-FAFA59966F0F}
+{BF47D251-C4D3-49C5-9CCC-C37F5AE762A0}
+{7536F78B-2039-40DE-B54D-9796403C0C65}
+{1D2C9F3A-3B3F-4046-8FC7-86624108C2B2}
+{0D00582F-F56D-4053-B79E-DB07C8A799D6}
+{A53F37B9-1DD2-4A99-956E-A8DE95E33B64}
+{1F8EF880-D9B8-4C12-B266-347647DE74EF}
+{20E4FDD0-E931-4A87-A6FD-2E57FD487532}
+{41DDD353-69A3-4173-808D-E7BDD8083D38}
+{0EB6104E-73F2-4562-B9A5-D4CCCAA77D07}
+{F1D0F40E-DC0E-4CBB-B78C-3FB463D8671F}
+{57144EC7-F2F4-450C-9821-C36B2AB9BEB2}
+{E1E3E44C-9A28-48CC-9811-B4F8546B03E1}
+{A4B3522B-6C94-4BB8-8E65-3E363A1B07E0}
+{63E87256-B27A-4FA6-8D19-0907F58CD451}
+{D0462D17-8893-4A99-B803-CEED288F68EB}
+{234E1C20-A8B0-43AA-A22B-41F04B752A4F}
+{86F727C2-2FE0-41B4-9FAE-EE51EC4D3AC0}
+{799297B7-F787-4C53-B04B-D884C74F885E}
+{048E3015-272E-475D-B275-CF0012C1B8FD}
+{190404D4-7B8C-4A9F-83CA-1347A04CBF6B}
+{A68F2EC8-98DD-40D3-8FF3-B8F5BDED323D}
+{F526A141-F701-41E5-B9CB-695C074CCE51}
+{2504B995-B89E-4EB1-8CD3-C1E4E32485C4}
+{1B6047FE-C9FB-4C1B-864E-AF9A7AB0BA0E}
+{D9BBD51B-CA5D-46F5-BE0C-900402CAA4A8}
+{C1D5C0FA-6D30-4E46-BF90-F71ACA911D60}
+{0391C72A-9386-4E58-B69A-CDA4F54F217F}
+{69B3686B-22D9-4ECB-91EB-EA9EEFE2AD8F}
+{8E64D5B8-C193-4954-B890-61E593B3F039}
+{30103E98-4AC5-4ED0-B524-7CC586B358ED}
+{A5486F28-FF0B-49ED-A1E8-463362714F25}
+{26C60264-6250-46C2-9EB9-1618F808612B}
+{1D0C8CC9-2523-41E9-96E0-3BA9F5B6AB8D}
+{0C2750E8-5450-4F8E-98EC-8AEBFCAB2462}
+{E4B8CFB6-5E34-4FE9-BCD0-6FD9AEADAA08}
+{04063350-70E9-4E12-AF22-3963C42B1E60}
+{ECC571C3-29CB-4AE6-97AC-C3F80801C5E1}
+{DCAEEBD8-66B2-4000-A6D9-CD370CE687BF}
+{E68D3F7A-911E-4FDD-934A-9DFFD6AC3A7B}
+{EC3EA5A4-8374-412A-A5C1-B2012FC9FFBE}
+{B2C9ED87-31EF-4A1B-BD2E-5DED878B210A}
+{5F0100BF-0D58-4492-A8AD-FDC458184AB5}
+{72C1054E-E429-44BB-8200-3F567FEFD2FE}
+{8FCAF2C3-4F88-4E68-89A7-AA3F874086AE}
+{12905F17-667A-4D90-AC96-73368992CC76}
+{CB3E023C-7C18-4A1E-B510-FA5FDC56D130}
+{5749130C-401B-46B6-A1F3-F227D549C673}
+{E475EE89-9547-4C98-AA33-0D58B5884209}
+{87BA9CDC-31A3-4AEB-8DB0-C1648A287FB2}
+{EDB251B5-EFEA-4792-B040-60474F526530}
+{14A8ED13-E1A4-42AF-8BBA-EFED617ED0A2}
+{4668CE2B-265C-46C6-8A02-759A9B167BC7}
+{A171750B-636E-46EB-A82D-AD3081D1E86E}
+{30166F16-C73F-4F86-A149-2B99BA37A858}
+{28FB5234-8E03-4416-8DA3-8C526C6948B9}
+{3C96C8AA-EC8E-476E-8B5A-BD00441FE51E}
+{723FB87B-D5CF-4631-9F6A-2BE1A60744DA}
+{526008DA-26A8-482F-B6E6-C2AB1793FC9D}
+{6E485127-81F0-4E78-A715-542B9BAC5541}
+{542E4901-D6B4-4EAF-BD8B-B6096C2F1B3C}
+{9501DCFC-E97B-440A-AA24-32AEB384AE8E}
+{2A369571-BD93-4C90-92E6-9BA8BA06AA56}
+{9115BE28-CD0B-452A-B055-23AF260640D1}
+{2F676623-128C-4C34-A1A8-5F1EF0D91DCF}
+{7BA3F47A-8115-4048-B47F-54FB1C8B39D2}
+{B1DDCFC1-633C-4E49-9516-6E890012B8D4}
+{5529E598-81EB-4901-A076-CE6F60CC6CEA}
+{CF8730FE-B482-4030-9CBC-A32BCF9032A5}
+{452C0F97-7CD5-41F7-9B6C-E0B2F7F662CA}
+{C931C77D-104E-467B-BBEF-D0A8FD9A4A56}
+{291FFEAD-958D-468E-850E-01B8A64FA4C2}
+{11BF4FE6-C05D-448C-A103-BC52BA23CCA5}
+{0FFDBB1C-5570-40C5-BC9D-A6A038498FDE}
+{DFF6C745-2E12-471A-BF81-EB166CA8B45E}
+{A6C0A248-8D0A-48A4-9EE6-2E320E35B86D}
+{A6380038-73A6-40BC-B13B-BAD29A36226C}
+{DA5F72B1-1E28-4654-89F4-2F5D09CB8A58}
+{EC8C2D00-919B-4FFE-B72C-C05B35BE3992}
+{BC245C08-2ED2-4E1A-B55C-32B85934E9B9}
+{AB79DEAC-D232-45EC-B80F-D602F13F1FFB}
+{DD1FC87B-3855-4370-8F31-64FDF70E4466}
+{C772DEC6-6D67-4E8B-80A4-587DCFC11E04}
+{C09182DB-2BDF-46A0-B6D7-6B6F6BF0F593}
+{182CEBF3-0BB0-4BCC-9676-E08A05BCD094}
+{85FC71FC-25EA-4ACB-B2ED-DCB1818F0810}
+{E6D79DA8-0828-4949-84E1-381593D0BDDE}
+{19B13FAF-F05D-4522-8258-31C76DF9D915}
+{0C569AC1-5457-4616-A508-005FF24580C2}
+{8090FC04-5B14-40FB-AF97-164E299B4A34}
+{A6F2320E-A194-482A-A13B-8446A653F1BE}
+{3135089D-17EA-4F51-8F35-1771FE4B61A8}
+{A7CD16FD-3D01-4E95-AA29-DC23DFE119D5}
+{D878A48E-1DC5-45C8-B282-0E36EA6D3473}
+{D1AC32FD-4A2D-41DB-9A0E-FCDB2A5B68A6}
+{41482B96-2613-47E5-ACCF-D9B854227C88}
+{828D4366-191D-40E6-A954-98D6BC2AB6B1}
+{2D7FCC84-17B1-4BC9-AE4A-AFE6F2561E74}
+{00902F7E-9682-4ECC-97F3-0C989404753B}
+{622D7A67-19E9-450F-9221-E0C455600021}
+{55A2971A-4283-43A2-933F-94C005EBB5C3}
+{E8D49994-8514-4EAF-8181-8DBE75A815D2}
+{A4D3550A-6E2F-44F0-9AA2-CB3F558E5B28}
+{43606175-29DB-4E0B-A271-A349EC540ADE}
+{D77A811D-0421-4824-A290-02DA2F506DBC}
+{CA901067-D569-4095-A422-B50D6AED708A}
+{B9D9D104-3211-46BE-BEF5-92A881ED7D40}
+{AD985BE7-9F53-40B3-8E58-EAC9A884FD52}
+{D57BFAD1-D19C-43F6-B54F-1234265A07A3}
+{D93C5C9D-3B2F-40F1-AF98-B66F194A35A6}
+{632BF2EF-3839-4517-BC09-C542894D3B33}
+{765C3B48-EAC5-4004-BFA2-CE4BF53F3650}
+{B0014B6C-1116-4E41-BBCC-E2349D4C4038}
+{347AE4EA-A715-4810-9AC4-C95A0AEE67C1}
+{C7B19EE0-FA22-40B3-B94C-879879BACD77}
+{61E88272-A2D3-4A54-8393-51AC2637C12B}
+{8EA1DB5A-D36D-4391-A93F-52B824ECCBED}
+{E445992E-4D8F-4D0E-B2C6-4C98E0FC7305}
+{81F00F0D-5139-4A39-B1E5-5EA513828FBD}
+{B502A097-C792-42A2-9007-80AC1988C851}
+{34D7AF5E-CC1B-4885-ABFF-37CAE9F00B27}
+{4BF2B76B-F5F9-4D46-BF67-779EE7EB56FA}
+{D63830B2-3590-4DCF-A77B-F7917A2E7F79}
+{90F49D4C-C196-4D02-AF50-E55A0BCFCA7C}
+{730C72F5-779C-47C1-9DBF-4F7BC79D8C0A}
+{EDEB4872-324A-4839-9037-B0EF3A6773A3}
+{67C00CFC-AD88-4390-B122-4ABA4AB39E20}
+{AB469D9A-56D5-4E0B-B13E-61BE4B70F773}
+{6A1EEA3F-4B75-4692-A758-01F3B78BE905}
+{8F5BEE7A-98A2-44E5-BB76-A2B68E108C87}
+{9647B504-7C7A-48F9-85D8-BCF9F0B1A0AB}
+{F3D1B9D2-7A04-44B6-9F91-860D3A2384C0}
+{08508DC4-D337-40B1-93B8-52D813007FB1}
+{C27E97F5-6F56-4072-950A-0E8C0ECD22E7}
+{074A5CF9-90CF-405D-82D3-6FEE0690119C}
+{E6B7586C-28EA-48D2-B7EB-17D42DBD1979}
+{4CB85B60-D0A0-442A-A683-94039B70DDA0}
+{346ECAFD-25C6-49CF-B532-765C963D176A}
+{94BDA812-5706-4256-BB6A-E8F451677F49}
+{52B94BDA-4FD4-4788-B28F-EEAB7C162721}
+{29F7BFC5-6D34-4A12-9B34-C5805014863F}
+{8862B1BF-C8BD-42FF-89D1-B0243A204059}
+{C71A3471-6E8E-49B4-BA18-10A4C9564959}
+{0359E329-55A1-4792-AB4E-AFEB1F335FF9}
+{DE5B6D64-509C-4FC7-BE75-F9B569E4B1B6}
+{28A3A0D3-1D22-4845-A97B-AC63DAF3413C}
+{432A824B-4E2F-4901-AEAB-DEB65367D193}
+{B60FA6EF-C69C-4EB8-9BBE-5EA91611D820}
+{1BF94E6D-2B78-4961-9F69-6DBD6632BD3D}
+{33DA50A7-F9E5-4CDA-B812-F54169CA8A89}
+{712378F3-5C02-4F64-A618-073A000505CC}
+{BEDC79F7-85D3-4837-881A-CF1A07342BB0}
+{D2D412A9-D472-4A95-BBCB-7FC0C3B8B592}
+{269A0E5E-A5B3-416F-B770-12532EE31550}
+{30B2A744-1A12-4C9E-BE0F-0E9066E87AFD}
+{0EA42729-AF8B-48C6-86E8-D11906E352CE}
+{791D8D35-3FEA-4E19-9C77-6329148C64F9}
+{5A4411F0-80E6-4F3B-BBB4-CA4A4C9B1096}
+{2B0A12F4-18DD-421F-BCA7-9CB0925004B8}
+{16B0C775-0F55-4F09-87BB-2264C7C72A11}
+{BF19F5CC-67FB-406B-81C3-678CDD88258E}
+{24BB4CEB-C041-4023-A448-3AE725EAEAC5}
+{F8031368-5974-4C5C-8EA0-001C812628D5}
+{EE9964D4-1BF6-48BE-BD08-1AA41E6CECD9}
+{E607AA22-7A1D-4CA6-9FA6-FBEC7CAF505D}
+{08D02487-7A25-4535-B2C3-D66D666F2884}
+{59F13A6B-AF40-45F7-B7F8-9D4DA03320B1}
+{D4618425-8024-415B-A39E-EA5A6A757E11}
+{E927FC6B-DA58-4F6B-86DE-BEE46E7D6F24}
+{3A2D9F38-3C4C-4909-BD58-F94AE94D60A6}
+{0D9E47BC-3A38-457C-BD4C-D5BABE1E3168}
+{0727C634-3C1B-445F-B8BE-C7D2D4E56FAB}
+{C8E7DA02-29FE-4E5E-BA96-8E9B48E6D5F1}
+{6028D781-1B56-4CF6-8567-B3266184A580}
+{9A899381-224C-4960-8EE9-114927CF3331}
+{5A52EB3A-E6DF-4A80-80ED-7479ECB6B587}
+{49B7241A-38C5-4AFA-8816-2DF906B2E558}
+{689F4852-777B-4865-B493-F42F05CF3EFA}
+{8A3D44F9-A8F2-489B-B57E-CC9146833960}
+{74EE6033-B67D-4559-A3CD-8EB3B5D601AB}
+{ED19961A-2407-4353-B639-99DCA4187BCC}
+{55E0BEAD-43B8-4A0F-A94C-D5D23B3C9250}
+{5023B1E0-3EE7-4FE8-BDC7-6FE3B0F1CD32}
+{F2F64080-E757-42C5-B023-C2B72DED1066}
+{E44E20C1-1D79-49EE-A44E-3208D7C0AB49}
+{BA9CE954-CC1E-4A8C-9AD5-E4A773242D09}
+{3AB6811B-92B2-46F1-98F1-EA0F0B84E196}
+{FBC19861-623F-4B92-9ECF-FEBD47DA4AC9}
+{A9984778-D722-4BD6-9599-A6E2CA5FDE13}
+{C47FA07F-CB64-4C9B-B31E-2469BA86C4E8}
+{58C976E0-0F30-4334-AD68-90C293A50E8C}
+{ED12CCAD-D43C-4CA0-B6FF-6EF6F1288B75}
+{EA3B37A7-6C0A-4E39-BD02-FFD9DE8A1425}
+{3AB54DCB-499F-4F7C-9916-6FB2B8D7F427}
+{F8AA2809-D6D7-40DD-A34D-7C77EC57F208}
+{248669E3-3B34-44F8-B5C6-D19512FAB392}
+{5BC2F138-2564-4ADC-9606-8EE54694D6A3}
+{ECA4D720-A9AA-41B4-8487-336179456282}
+{C2B8D56A-7A67-454D-8DFE-8FA17FCA47F8}
+{5A098B01-9784-414B-8B43-F702421DA9F3}
+{B9024C07-45AD-45A5-B551-D70AF8A241A4}
+{A38A7B60-A88E-4D09-A49E-0CBA4B8272EB}
+{5105D931-6D6C-406C-9820-D47CAEDA5C68}
+{37F91F10-6667-4967-B167-6CEABB7620C6}
+{2B9C2915-A46E-4301-B118-787D8E969E9E}
+{24393453-7A7C-4DC8-ADD6-44945E073D70}
+{CE007102-289B-4AAD-ACC0-78947B9FA68C}
+{97F657B1-22D5-4F55-9D77-8F7D23F8DD0D}
+{33BBA500-00B2-4FB1-9535-C74505BFBE15}
+{AC02E50D-0805-4672-B66E-42BC308B57E6}
+{10A30C9B-AB0E-4622-B39F-2058816C8AC9}
+{40E187E4-9812-43DF-BB93-F2729EC5F519}
+{F43AAB92-2311-4285-95F5-FBD2503543C3}
+{3EDD2AA2-2F08-414A-BD66-37240675D6DC}
+{C8FC0883-E862-4A8F-8421-CEA1AF318888}
+{E521F49A-503D-4708-9B8C-5F8D68D75CDC}
+{93CF5997-A66F-4AA4-AAF5-BBAAD4F951E6}
+{C63FE01E-7752-4B7B-9C32-AC04B4547229}
+{92F5D05F-D8AA-4996-A5BC-84A8C0CD8C31}
+{57388F2C-8AAE-468A-92AC-C6CADBAC344C}
+{C3F2E78C-8C6E-41DE-8F22-3CEAFC16702E}
+{D1099A76-F2D4-4ED8-9FF8-0CCC28759A8A}
+{A55D92B4-821D-4AF4-92A1-EAC924FDEA79}
+{D9204FF3-BEC7-47FD-9F8B-FA65852C8244}
+{FBE8A4BD-F1AD-4CDC-9BCE-6FFEB7BE5B16}
+{152AD548-99D6-4A5C-8941-2D3353EBF9E2}
+{94C4A1C7-4455-4C07-81BF-1C839F22E7AA}
+{EB267C6B-3753-4884-A293-FA6D434C721A}
+{01A1A5C5-4606-4A3B-A1B7-3EB40F900860}
+{581B8426-13B8-4FFD-BF40-DDF1B9D8259E}
+{6E07EA6C-1806-4732-AEAA-38BD6DE47E2B}
+{3EC1445C-8366-4C5C-AAF5-4D4149AB4B41}
+{59850623-26EC-4194-89A6-F30061F5062E}
+{719DFB9B-4E0F-45F5-AD4E-2C5BA47C906D}
+{A63461BB-D0E3-4619-8E23-A94309008D35}
+{0348BC02-8BDA-4CA5-AAEB-712972834273}
+{CE3DC0F6-F7EC-4D75-A549-21987A274057}
+{711AF477-C59C-4C49-BFA1-67FF06A2645C}
+{F62CCF0B-9819-449B-8F57-1AFBB40ADE4B}
+{E2EB93C1-70A8-49D7-9267-B08DC1139F9F}
+{ECBC6F47-D172-4FC2-A5ED-C126CCCD170C}
+{69CFC4AE-2A91-41B9-A624-39408E9577AA}
+{FAACD365-EC26-49B2-8BAC-04BF168C0512}
+{141FD384-7BE4-44B4-9396-2266E446C2B7}
+{762D6DFD-3E0F-4F1D-A04F-8BC7247205F9}
+{FF09C170-EE49-491E-B2D4-47DDA6BE2922}
+{C11FD511-7C71-4098-89B8-73A9B96AEA44}
+{31D2EF1E-5B69-4D49-BBAC-99B96E76669B}
+{1BF8EC9F-BF4D-4D26-9898-9F9F1EDFF353}
+{976658BC-A4FA-4B70-9291-19184485261A}
+{F5A36399-5FAC-4B74-BA14-77A64C844745}
+{F7D1C08F-E9AE-4A5A-ABDE-8E581D873E96}
+{65953F22-79D4-4DD3-A6FF-BC4CDD729792}
+{51A49E15-23E3-4559-817C-C38F389C3C72}
+{2A9B2662-0E11-4C5C-AF7F-742D1174ED14}
+{ADEE302B-F212-4751-8B50-EB8EAC9C8EFB}
+{2CD3CFCE-81DE-4466-AED7-12B2BDECA087}
+{585B4721-E2A3-404D-ACC0-EB6296E0E695}
+{465057F2-972D-4BAA-B6AD-BC8442E847CC}
+{23190313-3FA0-4237-8068-921135E8CCAF}
+{ECEAFDB1-38CE-4456-959F-8BCB7F8AB42C}
+{EDB712F1-60F1-4B32-A175-B958981EDD88}
+{C0815807-26C9-4C9B-AE4E-689621CF85A8}
+{AD1DA31F-EF7B-4BD9-AED9-254542C97BF6}
+{963CBCD6-CE3E-4D95-88EA-98B57180790C}
+{7D3AD7A9-DE39-4DFE-855D-D8E2EBC56EFE}
+{5DFAB593-E7EA-48F4-A54C-79D401A27AFF}
+{2FB2EC42-3861-4FE2-A94F-1D019ED05E48}
+{AB970539-32D3-4FB3-A98D-21247FF2E81B}
+{7DBC25B6-F82B-428C-853F-B2ED542DD7BB}
+{D6C99305-1C60-444F-B81F-6EC6846E0DF9}
+{C298BCA5-F5D8-4EF6-8AB9-9C5371DFB610}
+{D887138C-5E08-47C4-8A51-53A8F714EFB7}
+{0F86BF0F-F836-4FF4-B8AA-B7A826981964}
+{57BA5F33-63DD-4884-ABAD-ADC55B447BCA}
+{C5A04B8A-7853-4B45-92F3-E831B4C67BF9}
+{CA8886A7-0940-49AE-8FBF-B6D8857621C3}
+{830DA74D-7462-48B6-A133-06DA43BA64D6}
+{2FDC7A9C-BB27-44B0-A855-08F5E4E78C03}
+{E4B8248A-5A07-4606-8061-69DEFA22B79E}
+{BAAB438D-3BBF-4855-A549-802C1F2CFF14}
+{7F1D8FE4-A0A2-49D7-8199-50E1E92F0E20}
+{6AE77CFC-DF7B-48CC-BA55-7417EA654C3F}
+{40FA7FF1-7EE4-45CF-8FB3-A0EE1427DF27}
+{5B0EA42B-8215-4F05-864D-BEA0F71263C6}
+{F41EB7B2-6092-43A2-A09F-B3AF3A1382F6}
+{4F6BC49A-80EC-4F8C-9648-4265CC7CEB34}
+{16E358DF-D903-48F5-A026-FDC700D1C889}
+{694A3224-E9B6-498D-8D8B-53824B2D0242}
+{D945B365-B8FF-468C-AC0A-A53FF5149AC4}
+{AD75674E-20AF-421E-9DD0-1771C5D6BA2F}
+{C58C8DFD-EB05-472C-92A3-DD2888DE3674}
+{6F8F4166-032E-43A6-B903-AD9FCA26F96A}
+{15519B1B-26C0-4A56-A9D1-FB3FB582969A}
+{33651349-5F43-40EA-8E32-134B79F45775}
+{6AA35938-EA49-48DB-8552-D5F438A10886}
+{C52F9C0E-499B-4327-A60F-6F8A715CF1C8}
+{6C682C0F-1675-4A6C-97B8-DF16B9DCA351}
+{DC607F6D-F656-4907-9609-1B60B2B99AC7}
+{E72C40B3-44B4-4A99-AF57-9334DF0EF766}
+{E1C662D4-634B-48DC-84E4-BF0BA598483D}
+{23CAEA40-4550-45BE-B143-495EA08FC5C8}
+{44F053DF-FD18-43CE-9F54-FF5EAA2BDDF5}
+{55F68A46-D37C-4EFA-93AF-F5059BAA18A7}
+{D485BC83-02BA-4E8F-9B7B-8BE2E32EA86C}
+{54E4F522-B431-47C7-9CB8-FB85C3026B67}
+{8267DBB8-DF95-4537-A1A8-C6BDC5920DE4}
+{EE982A90-6EDC-423E-B1E2-48513B323585}
+{3386BE6B-4548-4263-8029-814446D9223A}
+{912B32EF-57AA-4281-A278-1BE53F8913B3}
+{6AAA80E4-2580-4EF5-9665-744AEC074AC0}
+{ACFD5194-BF16-4DFA-B98B-1444325CC84C}
+{3F6CFDF8-C369-4201-B7C7-B62C128726AA}
+{95AC3B82-B9FF-420D-A6B3-E7BBCBDF456B}
+{921BE086-1FF7-43EC-B66E-861590CA0871}
+{BDE0D739-0CDF-4BF6-8DB9-B7A1B2D0B60C}
+{B28E159D-F89A-43EB-8A0F-EA840FB3E87E}
+{092D0AED-2A8E-4EC6-84A0-9DAB5FD7DD10}
+{B00D614C-78A3-4680-83A9-DD5D768701EF}
+{617665D6-2657-4951-8DB2-5F009331A840}
+{1FB0BA56-4363-4128-B870-3938E4523420}
+{18C8BB36-009E-4641-9BA9-4EF16CB5FE60}
+{017E35F9-9B5A-437E-8C12-13160ACC8ADB}
+{588A301D-4159-4D88-A621-DE4ABF961C26}
+{36C3EC96-D18F-46A6-9421-F65FF74A3081}
+{B1EB5223-05FB-44D9-85EE-A8597E6EEBA9}
+{E47B4039-6B59-4330-97BC-B14676A32A9F}
+{1F6B7960-BB0F-4260-89DC-05FC2510687F}
+{3C2C1319-E0ED-435F-BA01-4169CFB84BBC}
+{28544AF2-D585-4602-BDD9-D1BCA1C45F56}
+{F63FB5FC-5E28-496A-8C38-BE0175526BB8}
+{D5D59AE2-B185-49F6-B4BD-0A7A6F8E52F3}
+{99ABD0FB-FFE1-4263-94AB-17A59D5C247C}
+{B847DB01-7EB5-49CE-88E9-0C4CA4A16D67}
+{4756E785-D8A3-4E29-B993-B01B01AA4D2A}
+$
+{0AADAE47-CCD6-4CC9-BF83-32297AB40C37}
+Spring.NET 1.1 M1 Setup Project
+{36ADC9A6-0B4F-4245-ACCE-4A50015A80A8}
+
+{5076ABBD-5015-4CE7-BD04-2E313FB65264}
+
+{B51103C7-8FD1-43CD-9553-57945F20EDE8}
+
+{7A4D8295-AAA0-4D43-8542-2746B3A3CB7E}
+Check setup pre-requisites
+{4D692B2D-36CC-437E-8B49-F054053A65B8}
+
+{007D81FD-F462-41C0-9766-5CA98DB29B4A}
+Install setup pre-requisites
+{8EE4916B-990A-45A0-91FC-AE6E73BAD205}
+
+{2D37F8AF-D65E-43A0-ADFF-D492484E9BB4}
+
+{C65B04D2-F38D-4815-A963-34D67AD027BD}
+Define Setup Components
+{A7335220-876F-4C84-8F58-4C7CF63DAB43}
+
+{5232CF1A-2118-413C-BF18-594406FC60A0}
+Initialize Setup Globals
+{17ED505D-22C9-4411-B251-BC1C7E4B1B5C}
+
+{7568CEA0-C91D-4D89-9091-98512904A1D1}
+First Time Install
+{7536F78B-2039-40DE-B54D-9796403C0C65}
+
+{12905F17-667A-4D90-AC96-73368992CC76}
+TO-DO: Customize your minimum setup here
+{A7CD16FD-3D01-4E95-AA29-DC23DFE119D5}
+
+{D1AC32FD-4A2D-41DB-9A0E-FCDB2A5B68A6}
+Maintenance Install/Uninstall
+{E8D49994-8514-4EAF-8181-8DBE75A815D2}
+
+{D77A811D-0421-4824-A290-02DA2F506DBC}
+Exit Setup if Wizard Loop cancelled
+{D57BFAD1-D19C-43F6-B54F-1234265A07A3}
+
+{D93C5C9D-3B2F-40F1-AF98-B66F194A35A6}
+Prepare to install
+{B502A097-C792-42A2-9007-80AC1988C851}
+
+{34D7AF5E-CC1B-4885-ABFF-37CAE9F00B27}
+Modify Target System
+{90F49D4C-C196-4D02-AF50-E55A0BCFCA7C}
+Uninstall product
+{730C72F5-779C-47C1-9DBF-4F7BC79D8C0A}
+TO-DO: Insert any additional uninstall commands here
+{9647B504-7C7A-48F9-85D8-BCF9F0B1A0AB}
+Install/Re-Install product
+{BAAB438D-3BBF-4855-A549-802C1F2CFF14}
+TO-DO: Insert any additional install commands here
+{921BE086-1FF7-43EC-B66E-861590CA0871}
+
+{B28E159D-F89A-43EB-8A0F-EA840FB3E87E}
+End of Installation
+{3C2C1319-E0ED-435F-BA01-4169CFB84BBC}
+TO-DO: Insert command that starts your application here
+{4756E785-D8A3-4E29-B993-B01B01AA4D2A}
+
+{B62B7C2B-4668-4E4E-87C7-CC1525784712}
+PREREQ
+FALSE
+{C7F738FC-2B5F-4380-9608-0DEA772B94C7}
+PRELIST
+
+{95C7D535-8788-41B6-B8CA-D3742CDD3E2A}
+PREREQ
+TRUE
+{DD78225E-3B68-40CE-B4E1-93AE4BE9C37F}
+PRELIST
+$PRELIST$$NEWLINE$Previous Version Uninstallation
+{D4F36731-7336-4097-A355-B0B1584CBB44}
+REMOVEOLD
+
+{CAC97A56-5D1A-405B-A78B-FE91751C7B09}
+ERROROLD
+
+{B47D5127-9D59-471B-992B-F006D44A3F2E}
+MAINTENANCE
+FALSE
+{7FFAA3DC-DDA0-4A59-BD77-84B4369F5078}
+SHORTCUTFILESALL
+$SHORTCUTFILES$
+{9CC32567-D081-4F97-8377-F414F884749A}
+TARGETDIR
+$PROGRAMFILES$\$TITLE$
+{4632834D-AC50-48B5-A91B-503C03608212}
+STARTMENU
+$TITLE$
+{632BF2EF-3839-4517-BC09-C542894D3B33}
+PROGRESSTEXT
+Installing $TITLE$
+{765C3B48-EAC5-4004-BFA2-CE4BF53F3650}
+SUCCESS
+
+{B0014B6C-1116-4E41-BBCC-E2349D4C4038}
+LASTERROR
+
+{C7B19EE0-FA22-40B3-B94C-879879BACD77}
+SHORTCUTFOLDER
+$SHORTCUTFILESALL$\$STARTMENU$
+{8EA1DB5A-D36D-4391-A93F-52B824ECCBED}
+SHORTCUTFOLDER
+$SHORTCUTFILES$\$STARTMENU$
+{67C00CFC-AD88-4390-B122-4ABA4AB39E20}
+PROGRESS
+100
+{6AAA80E4-2580-4EF5-9665-744AEC074AC0}
+PROGRESS
+100
+{8E733ADF-0692-4381-A6CE-1A14FC3B3EFD}
+BUILDMODE
+0
+PATCH
+TRUE
+{E3B49129-FB7E-494B-8868-3A7E035A1BB6}
+NEEDSUPGRADE
+0
+TRUE
+FALSE
+{B0E8FF3A-6587-4329-AD90-A5E8BD6B61D5}
+PREREQ
+0
+FALSE
+TRUE
+{CC974A69-AA46-4F01-934D-3AD31BE3EA59}
+WIZARD
+0
+CANCEL
+FALSE
+{A07B9E2D-B4D2-4987-9814-D9E37F8042F5}
+BUILDMODE
+0
+PATCH
+TRUE
+{B318EA01-0253-43B2-8A21-BB05E733C066}
+NEEDSUPGRADE
+0
+TRUE
+FALSE
+{C81A209F-B1AF-42AC-9982-8EC8CCC33464}
+REMOVEOLD
+0
+ERROR
+FALSE
+{BC322E68-8DCC-4C68-88F9-B1B2E20C4180}
+REMOVEOLD
+0
+REBOOT
+FALSE
+{35873C23-DAB9-48D3-AD16-0C5140653771}
+REBOOTNOW
+0
+OK
+FALSE
+{8A95A867-00ED-469E-B99D-5FD8ABA81ABF}
+SHORTCUTFILESALL
+0
+
+FALSE
+{545506AF-96E2-44DE-B49C-3CDD3E25CE68}
+MAINTENANCE
+0
+TRUE
+FALSE
+{A5001B5C-1CBD-4C2E-9942-64B73BFE5D3B}
+BUILDMODE
+0
+PATCH
+TRUE
+{A53F37B9-1DD2-4A99-956E-A8DE95E33B64}
+WIZARD
+0
+CANCEL
+FALSE
+{41DDD353-69A3-4173-808D-E7BDD8083D38}
+BUILDMODE
+0
+PATCH
+TRUE
+{57144EC7-F2F4-450C-9821-C36B2AB9BEB2}
+WIZARD
+0
+BACK
+FALSE
+{63E87256-B27A-4FA6-8D19-0907F58CD451}
+WIZARD
+0
+CANCEL
+FALSE
+{190404D4-7B8C-4A9F-83CA-1347A04CBF6B}
+WIZARD
+0
+BACK
+FALSE
+{2504B995-B89E-4EB1-8CD3-C1E4E32485C4}
+WIZARD
+0
+CANCEL
+FALSE
+{8E64D5B8-C193-4954-B890-61E593B3F039}
+WIZARD
+0
+BACK
+FALSE
+{26C60264-6250-46C2-9EB9-1618F808612B}
+WIZARD
+0
+CANCEL
+FALSE
+{DCAEEBD8-66B2-4000-A6D9-CD370CE687BF}
+WIZARD
+0
+BACK
+FALSE
+{B2C9ED87-31EF-4A1B-BD2E-5DED878B210A}
+WIZARD
+0
+CANCEL
+FALSE
+{CB3E023C-7C18-4A1E-B510-FA5FDC56D130}
+MINIMUM
+0
+TRUE
+FALSE
+{87BA9CDC-31A3-4AEB-8DB0-C1648A287FB2}
+COMPLETE
+0
+TRUE
+FALSE
+{28FB5234-8E03-4416-8DA3-8C526C6948B9}
+WIZARD
+0
+BACK
+FALSE
+{526008DA-26A8-482F-B6E6-C2AB1793FC9D}
+WIZARD
+0
+CANCEL
+FALSE
+{2F676623-128C-4C34-A1A8-5F1EF0D91DCF}
+WIZARD
+0
+BACK
+FALSE
+{5529E598-81EB-4901-A076-CE6F60CC6CEA}
+WIZARD
+0
+CANCEL
+FALSE
+{0FFDBB1C-5570-40C5-BC9D-A6A038498FDE}
+WIZARD
+0
+BACK
+FALSE
+{A6380038-73A6-40BC-B13B-BAD29A36226C}
+WIZARD
+0
+CANCEL
+FALSE
+{C09182DB-2BDF-46A0-B6D7-6B6F6BF0F593}
+WIZARD
+0
+BACK
+FALSE
+{182CEBF3-0BB0-4BCC-9676-E08A05BCD094}
+BUILDMODE
+0
+PATCH
+TRUE
+{CA901067-D569-4095-A422-B50D6AED708A}
+WIZARD
+0
+CANCEL
+FALSE
+{347AE4EA-A715-4810-9AC4-C95A0AEE67C1}
+ALLUSERS
+0
+TRUE
+FALSE
+{D63830B2-3590-4DCF-A77B-F7917A2E7F79}
+REMOVE
+0
+TRUE
+FALSE
+{2FDC7A9C-BB27-44B0-A855-08F5E4E78C03}
+SELECTED
+0
+TRUE
+FALSE
+{7F1D8FE4-A0A2-49D7-8199-50E1E92F0E20}
+BUILDMODE
+0
+PATCH
+FALSE
+{5B0EA42B-8215-4F05-864D-BEA0F71263C6}
+ADVERTISE
+0
+TRUE
+FALSE
+{617665D6-2657-4951-8DB2-5F009331A840}
+SILENT
+0
+FALSE
+FALSE
+{1FB0BA56-4363-4128-B870-3938E4523420}
+REBOOTCOMPUTER
+0
+TRUE
+FALSE
+{18C8BB36-009E-4641-9BA9-4EF16CB5FE60}
+SUCCESS
+0
+REBOOT
+FALSE
+{B1EB5223-05FB-44D9-85EE-A8597E6EEBA9}
+RUNAPP
+0
+TRUE
+FALSE
+{E47B4039-6B59-4330-97BC-B14676A32A9F}
+REMOVE
+0
+FALSE
+FALSE
+{1F6B7960-BB0F-4260-89DC-05FC2510687F}
+SUCCESS
+0
+COMPLETE
+FALSE
+{18516BF5-FA02-4D7B-BFD4-07714E2BC054}
+$TITLE$ Setup
+Unable to uninstall old version of $TITLE$. Please uninstall it yourself using Control Panel Add-Remove Programs before attempting to install this product.$NEWLINE$$NEWLINE$$ERROROLD$
+2
+1
+
+{EDE1F9CC-5316-44E4-8FEA-FE44558E9C84}
+$TITLE$ Setup
+Your computer needs to be restarted before $TITLE$ Setup can continue.$NEWLINE$$NEWLINE$Please save your work in all running programs and click OK to restart your computer. Setup will resume once your computer restarts.$NEWLINE$$NEWLINE$If you click CANCEL, setup will exit. You will have to run setup again at a later time to install $TITLE$.
+2
+2
+REBOOTNOW
+{2F15D329-6E80-4509-829F-C2F3352970ED}
+prereq
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{5B250495-2FD6-4B4D-BE79-23040614AF44}
+progressprereq
+WIZARD
+FALSE
+
+TRUE
+FALSE
+{0D00582F-F56D-4053-B79E-DB07C8A799D6}
+welcome
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{F1D0F40E-DC0E-4CBB-B78C-3FB463D8671F}
+licensecheck
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{048E3015-272E-475D-B275-CF0012C1B8FD}
+readme
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{69B3686B-22D9-4ECB-91EB-EA9EEFE2AD8F}
+registration
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{ECC571C3-29CB-4AE6-97AC-C3F80801C5E1}
+setuptype
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{30166F16-C73F-4F86-A149-2B99BA37A858}
+componentstree
+WIZARD
+TRUE
+PERSONALIZED
+TRUE
+FALSE
+{9115BE28-CD0B-452A-B055-23AF260640D1}
+destination
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{11BF4FE6-C05D-448C-A103-BC52BA23CCA5}
+startmenu
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{C772DEC6-6D67-4E8B-80A4-587DCFC11E04}
+startinstallation
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{828D4366-191D-40E6-A954-98D6BC2AB6B1}
+maintenance
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{2D7FCC84-17B1-4BC9-AE4A-AFE6F2561E74}
+componentstree
+WIZARD
+TRUE
+MODIFY
+TRUE
+FALSE
+{00902F7E-9682-4ECC-97F3-0C989404753B}
+startinstallation
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{81F00F0D-5139-4A39-B1E5-5EA513828FBD}
+progress
+WIZARD
+FALSE
+
+TRUE
+FALSE
+{B00D614C-78A3-4680-83A9-DD5D768701EF}
+finish
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{A3A8A528-F4F5-4031-8308-7F556B64C129}
+Spring.NET 1.1.2
+TRUE
+Spring.NET 1.1.2
+{5749130C-401B-46B6-A1F3-F227D549C673}
+Spring.NET 1.1.2
+FALSE
+{EDB251B5-EFEA-4792-B040-60474F526530}
+Spring.NET 1.1.2
+TRUE
+{830DA74D-7462-48B6-A133-06DA43BA64D6}
+Spring.NET 1.1.2
+SELECTED
+{16E358DF-D903-48F5-A026-FDC700D1C889}
+$TARGETDIR$\doc
+{694A3224-E9B6-498D-8D8B-53824B2D0242}
+$TARGETDIR$\doc\reference
+{D945B365-B8FF-468C-AC0A-A53FF5149AC4}
+$TARGETDIR$\doc\reference\html
+{AD75674E-20AF-421E-9DD0-1771C5D6BA2F}
+$TARGETDIR$\doc\reference\htmlhelp
+{C58C8DFD-EB05-472C-92A3-DD2888DE3674}
+$TARGETDIR$\doc\reference\images
+{6F8F4166-032E-43A6-B903-AD9FCA26F96A}
+$TARGETDIR$\doc\reference\pdf
+{15519B1B-26C0-4A56-A9D1-FB3FB582969A}
+$TARGETDIR$\doc\reference\styles
+{33651349-5F43-40EA-8E32-134B79F45775}
+$TARGETDIR$\examples
+{6AA35938-EA49-48DB-8552-D5F438A10886}
+$TARGETDIR$\examples\Spring
+{C52F9C0E-499B-4327-A60F-6F8A715CF1C8}
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart
+{6C682C0F-1675-4A6C-97B8-DF16B9DCA351}
+$TARGETDIR$\examples\Spring\Spring.Calculator
+{DC607F6D-F656-4907-9609-1B60B2B99AC7}
+$TARGETDIR$\examples\Spring\Spring.Data.NHibernate.Northwind
+{E72C40B3-44B4-4A99-AF57-9334DF0EF766}
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart
+{E1C662D4-634B-48DC-84E4-BF0BA598483D}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext
+{23CAEA40-4550-45BE-B143-495EA08FC5C8}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry
+{44F053DF-FD18-43CE-9F54-FF5EAA2BDDF5}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder
+{55F68A46-D37C-4EFA-93AF-F5059BAA18A7}
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart
+{D485BC83-02BA-4E8F-9B7B-8BE2E32EA86C}
+$TARGETDIR$\examples\Spring\Spring.Web.Extensions.Example
+{54E4F522-B431-47C7-9CB8-FB85C3026B67}
+$TARGETDIR$\examples\Spring\Spring.WebQuickStart
+{8267DBB8-DF95-4537-A1A8-C6BDC5920DE4}
+$TARGETDIR$\examples\Spring\SpringAir
+{EDEB4872-324A-4839-9037-B0EF3A6773A3}
+progress
+SUCCESS
+FALSE
+TRUE
+{F41EB7B2-6092-43A2-A09F-B3AF3A1382F6}
+progress
+SUCCESS
+FALSE
+FALSE
+{EE982A90-6EDC-423E-B1E2-48513B323585}
+progress
+SUCCESS
+TRUE
+FALSE
+{89AA7DF5-3C08-48DF-A638-DE6B27BB689A}
+PROGRAMFILES
+20
+FALSE
+{DA7984D1-FFC6-46FD-AA05-CF9705718548}
+COMMONFILES
+20
+TRUE
+{93E95378-FCD0-4AD8-859C-F79D0659B4D4}
+SHORTCUTFILESALL
+14
+TRUE
+{46249933-EAFF-48CC-83D4-A2B2D9A539DF}
+SHORTCUTFILES
+14
+FALSE
+{73747553-3B70-47E7-A37E-EA9C3104CFB0}
+DESKTOPDIR
+17
+FALSE
+{8628DC93-23A1-402B-9482-4986B2460DCA}
+WINDIR
+25
+FALSE
+{3AC507BE-2DCF-4306-9D2A-2C8C6B346E2B}
+WINSYSDIR
+23
+FALSE
+{8759C800-4115-4C0F-B44B-6E4A0A3B7271}
+QUICKLAUNCHDIR
+26
+FALSE
+{FEAA8A2C-3859-4A1D-B5BD-AFAE6A837273}
+WWWROOTDIR
+27
+FALSE
+{E4393F3D-D71C-4B0C-BE63-043394AC87F4}
+ISNT
+18
+{C27E97F5-6F56-4072-950A-0E8C0ECD22E7}
+L:\projects\Spring.Net\build\package\Spring.NET\readme.txt
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{E6B7586C-28EA-48D2-B7EB-17D42DBD1979}
+L:\projects\Spring.Net\build\package\Spring.NET\BreakingChanges-1.1.txt
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{346ECAFD-25C6-49CF-B532-765C963D176A}
+L:\projects\Spring.Net\build\package\Spring.NET\changelog.txt
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{52B94BDA-4FD4-4788-B28F-EEAB7C162721}
+L:\projects\Spring.Net\build\package\Spring.NET\license.txt
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{8862B1BF-C8BD-42FF-89D1-B0243A204059}
+L:\projects\Spring.Net\build\package\Spring.NET\bin\*.*
+TRUE|
+$TARGETDIR$\bin
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C71A3471-6E8E-49B4-BA18-10A4C9564959}
+L:\projects\Spring.Net\build\package\Spring.NET\icons\*.*
+TRUE|
+$TARGETDIR$\icons
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{0359E329-55A1-4792-AB4E-AFEB1F335FF9}
+L:\projects\Spring.Net\build\package\Spring.NET\Spring.Net.1.1.2005.sln
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{28A3A0D3-1D22-4845-A97B-AC63DAF3413C}
+L:\projects\Spring.Net\build\package\Spring.NET\Spring.Net.1.1.2003.sln
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{B60FA6EF-C69C-4EB8-9BBE-5EA91611D820}
+L:\projects\Spring.Net\build\package\Spring.NET\lib\*.*
+TRUE|
+$TARGETDIR$\lib
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{1BF94E6D-2B78-4961-9F69-6DBD6632BD3D}
+L:\projects\Spring.Net\build\package\Spring.NET\src\*.*
+TRUE|
+$TARGETDIR$\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{712378F3-5C02-4F64-A618-073A000505CC}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\htmlhelp\htmlhelp.chm
+FALSE|
+$TARGETDIR$\doc\reference\htmlhelp
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{D2D412A9-D472-4A95-BBCB-7FC0C3B8B592}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\images\admons\*.*
+TRUE|
+$TARGETDIR$\doc\reference\images\admons
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{269A0E5E-A5B3-416F-B770-12532EE31550}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\images\callouts\*.*
+TRUE|
+$TARGETDIR$\doc\reference\images\callouts
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{30B2A744-1A12-4C9E-BE0F-0E9066E87AFD}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\pdf\spring-net-reference.pdf
+FALSE|
+$TARGETDIR$\doc\reference\pdf
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{791D8D35-3FEA-4E19-9C77-6329148C64F9}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\pdf\images\*.*
+TRUE|
+$TARGETDIR$\doc\reference\pdf\images
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{5A4411F0-80E6-4F3B-BBB4-CA4A4C9B1096}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\styles\html.css
+FALSE|
+$TARGETDIR$\doc\reference\styles
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{2B0A12F4-18DD-421F-BCA7-9CB0925004B8}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\schema\*.*
+TRUE|
+$TARGETDIR$\doc\schema
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{16B0C775-0F55-4F09-87BB-2264C7C72A11}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.AopQuickStart\readme.txt
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{BF19F5CC-67FB-406B-81C3-678CDD88258E}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.AopQuickStart\Spring.AopQuickStart.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{F8031368-5974-4C5C-8EA0-001C812628D5}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.AopQuickStart\Spring.AopQuickStart.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{E607AA22-7A1D-4CA6-9FA6-FBEC7CAF505D}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.AopQuickStart\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{08D02487-7A25-4535-B2C3-D66D666F2884}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.AopQuickStart\Spring.AopQuickStart.build
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{59F13A6B-AF40-45F7-B7F8-9D4DA03320B1}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\Spring.Calculator.snk
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Calculator
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{D4618425-8024-415B-A39E-EA5A6A757E11}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\Spring.Calculator.build
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Calculator
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{E927FC6B-DA58-4F6B-86DE-BEE46E7D6F24}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\Spring.Calculator.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Calculator
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{0D9E47BC-3A38-457C-BD4C-D5BABE1E3168}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\Spring.Calculator.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Calculator
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C8E7DA02-29FE-4E5E-BA96-8E9B48E6D5F1}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\readme.txt
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Calculator
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{6028D781-1B56-4CF6-8567-B3266184A580}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\lib\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.Calculator\lib
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{9A899381-224C-4960-8EE9-114927CF3331}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.Calculator\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{5A52EB3A-E6DF-4A80-80ED-7479ECB6B587}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Data.NHibernate.Northwind\test_northwind.sql
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Data.NHibernate.Northwind
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{49B7241A-38C5-4AFA-8816-2DF906B2E558}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Data.NHibernate.Northwind\Spring.Northwind.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Data.NHibernate.Northwind
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{8A3D44F9-A8F2-489B-B57E-CC9146833960}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Data.NHibernate.Northwind\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.Data.NHibernate.Northwind\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{74EE6033-B67D-4559-A3CD-8EB3B5D601AB}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Data.NHibernate.Northwind\test\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.Data.NHibernate.Northwind\test
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{ED19961A-2407-4353-B639-99DCA4187BCC}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{5023B1E0-3EE7-4FE8-BDC7-6FE3B0F1CD32}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{E44E20C1-1D79-49EE-A44E-3208D7C0AB49}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.DataQuickStart\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{BA9CE954-CC1E-4A8C-9AD5-E4A773242D09}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.DataQuickStart\test\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart\test
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{3AB6811B-92B2-46F1-98F1-EA0F0B84E196}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.AppContext\Spring.IocQuickStart.AppContext.build
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{FBC19861-623F-4B92-9ECF-FEBD47DA4AC9}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.AppContext\Spring.IocQuickStart.AppContext.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C47FA07F-CB64-4C9B-B31E-2469BA86C4E8}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.AppContext\Spring.IocQuickStart.AppContext.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{ED12CCAD-D43C-4CA0-B6FF-6EF6F1288B75}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.AppContext\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{EA3B37A7-6C0A-4E39-BD02-FFD9DE8A1425}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.EventRegistry\Spring.IocQuickStart.EventRegistry.build
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{3AB54DCB-499F-4F7C-9916-6FB2B8D7F427}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.EventRegistry\Spring.IocQuickStart.EventRegistry.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{248669E3-3B34-44F8-B5C6-D19512FAB392}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.EventRegistry\Spring.IocQuickStart.EventRegistry.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{ECA4D720-A9AA-41B4-8487-336179456282}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.EventRegistry\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C2B8D56A-7A67-454D-8DFE-8FA17FCA47F8}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.MovieFinder\Spring.IocQuickStart.MovieFinder.build
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{5A098B01-9784-414B-8B43-F702421DA9F3}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.MovieFinder\Spring.IocQuickStart.MovieFinder.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{A38A7B60-A88E-4D09-A49E-0CBA4B8272EB}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.MovieFinder\Spring.IocQuickStart.MovieFinder.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{37F91F10-6667-4967-B167-6CEABB7620C6}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.MovieFinder\lib\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder\lib
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{2B9C2915-A46E-4301-B118-787D8E969E9E}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.MovieFinder\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{24393453-7A7C-4DC8-ADD6-44945E073D70}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{97F657B1-22D5-4F55-9D77-8F7D23F8DD0D}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{AC02E50D-0805-4672-B66E-42BC308B57E6}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.TxQuickStart\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{10A30C9B-AB0E-4622-B39F-2058816C8AC9}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.TxQuickStart\test\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart\test
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{40E187E4-9812-43DF-BB93-F2729EC5F519}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Web.Extensions.Example\Spring.Web.Extensions.Example.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Web.Extensions.Example
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{3EDD2AA2-2F08-414A-BD66-37240675D6DC}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Web.Extensions.Example\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.Web.Extensions.Example\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C8FC0883-E862-4A8F-8421-CEA1AF318888}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.WebQuickStart\Spring.WebQuickStart.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.WebQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{93CF5997-A66F-4AA4-AAF5-BBAAD4F951E6}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.WebQuickStart\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.WebQuickStart\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C63FE01E-7752-4B7B-9C32-AC04B4547229}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\SpringAir.build
+FALSE|
+$TARGETDIR$\examples\Spring\SpringAir
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{92F5D05F-D8AA-4996-A5BC-84A8C0CD8C31}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\SpringAir.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\SpringAir
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C3F2E78C-8C6E-41DE-8F22-3CEAFC16702E}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\SpringAir.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\SpringAir
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{A55D92B4-821D-4AF4-92A1-EAC924FDEA79}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\readme.txt
+FALSE|
+$TARGETDIR$\examples\Spring\SpringAir
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{D9204FF3-BEC7-47FD-9F8B-FA65852C8244}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\data\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\SpringAir\data
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{FBE8A4BD-F1AD-4CDC-9BCE-6FFEB7BE5B16}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\SpringAir\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{152AD548-99D6-4A5C-8941-2D3353EBF9E2}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\test\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\SpringAir\test
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{94C4A1C7-4455-4C07-81BF-1C839F22E7AA}
+L:\projects\Spring.Net\build\package\Spring.NET\test\*.*
+TRUE|
+$TARGETDIR$\test
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{EB267C6B-3753-4884-A293-FA6D434C721A}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\images\*.*
+TRUE|
+$TARGETDIR$\doc\reference\html\images
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{581B8426-13B8-4FFD-BF40-DDF1B9D8259E}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\ado.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{6E07EA6C-1806-4732-AEAA-38BD6DE47E2B}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\ajax.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{3EC1445C-8366-4C5C-AAF5-4D4149AB4B41}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\aop.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{59850623-26EC-4194-89A6-F30061F5062E}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\aop-aspect-library.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{719DFB9B-4E0F-45F5-AD4E-2C5BA47C906D}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\aop-quickstart.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{A63461BB-D0E3-4619-8E23-A94309008D35}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\background.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{0348BC02-8BDA-4CA5-AAEB-712972834273}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\dao.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{CE3DC0F6-F7EC-4D75-A549-21987A274057}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\data-quickstart.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{711AF477-C59C-4C49-BFA1-67FF06A2645C}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\dbprovider.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{F62CCF0B-9819-449B-8F57-1AFBB40ADE4B}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\expressions.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{E2EB93C1-70A8-49D7-9267-B08DC1139F9F}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{ECBC6F47-D172-4FC2-A5ED-C126CCCD170C}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index-core.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{69CFC4AE-2A91-41B9-A624-39408E9577AA}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index-javadevelopers.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{FAACD365-EC26-49B2-8BAC-04BF168C0512}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index-middle-tier.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{141FD384-7BE4-44B4-9396-2266E446C2B7}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index-quickstarts.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{762D6DFD-3E0F-4F1D-A04F-8BC7247205F9}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index-services.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{FF09C170-EE49-491E-B2D4-47DDA6BE2922}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index-vsnet.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C11FD511-7C71-4098-89B8-73A9B96AEA44}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\introduction.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{31D2EF1E-5B69-4D49-BBAC-99B96E76669B}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\javadevelopers.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{1BF8EC9F-BF4D-4D26-9898-9F9F1EDFF353}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\logging.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{976658BC-A4FA-4B70-9291-19184485261A}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\migration.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{F5A36399-5FAC-4B74-BA14-77A64C844745}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\misc.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{F7D1C08F-E9AE-4A5A-ABDE-8E581D873E96}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\objects.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{65953F22-79D4-4DD3-A6FF-BC4CDD729792}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\objects-misc.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{51A49E15-23E3-4559-817C-C38F389C3C72}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\orm.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{2A9B2662-0E11-4C5C-AF7F-742D1174ED14}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\pool.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{ADEE302B-F212-4751-8B50-EB8EAC9C8EFB}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\preface.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{2CD3CFCE-81DE-4466-AED7-12B2BDECA087}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\pt03.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{585B4721-E2A3-404D-ACC0-EB6296E0E695}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\quickstarts.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{465057F2-972D-4BAA-B6AD-BC8442E847CC}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\remoting.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{23190313-3FA0-4237-8068-921135E8CCAF}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\remoting-quickstart.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{ECEAFDB1-38CE-4456-959F-8BCB7F8AB42C}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\resources.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{EDB712F1-60F1-4B32-A175-B958981EDD88}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\services.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C0815807-26C9-4C9B-AE4E-689621CF85A8}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\springair.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{AD1DA31F-EF7B-4BD9-AED9-254542C97BF6}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\springobjectsxsd.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{963CBCD6-CE3E-4D95-88EA-98B57180790C}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\testing.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{7D3AD7A9-DE39-4DFE-855D-D8E2EBC56EFE}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\threading.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{5DFAB593-E7EA-48F4-A54C-79D401A27AFF}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\transaction.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{2FB2EC42-3861-4FE2-A94F-1D019ED05E48}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\tx-quickstart.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{AB970539-32D3-4FB3-A98D-21247FF2E81B}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\validation.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{7DBC25B6-F82B-428C-853F-B2ED542DD7BB}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\vsnet.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{D6C99305-1C60-444F-B81F-6EC6846E0DF9}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\web.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C298BCA5-F5D8-4EF6-8AB9-9C5371DFB610}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\web-quickstart.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{D887138C-5E08-47C4-8A51-53A8F714EFB7}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\webservices.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{0F86BF0F-F836-4FF4-B8AA-B7A826981964}
+L:\projects\Spring.Net\build\package\Spring.NET\Spring.Net.1.1.2002.sln
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{57BA5F33-63DD-4884-ABAD-ADC55B447BCA}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\extensible-xml.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C5A04B8A-7853-4B45-92F3-E831B4C67BF9}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\xsd-config.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{F3D1B9D2-7A04-44B6-9F91-860D3A2384C0}
+$UNINSTALLLINK$
+Uninstall Spring.NET 1.1.2
+$SHORTCUTFOLDER$
+Removes this Interface21 product
+
+
+
+
+0
+{074A5CF9-90CF-405D-82D3-6FEE0690119C}
+$TARGETDIR$\readme.txt
+View readme
+$SHORTCUTFOLDER$
+View the readme file
+
+
+
+
+0
+{432A824B-4E2F-4901-AEAB-DEB65367D193}
+$TARGETDIR$\Spring.Net.1.1.2003.sln
+.NET 1.1 Solution
+$SHORTCUTFOLDER$\Source Code
+
+
+
+
+
+0
+{DE5B6D64-509C-4FC7-BE75-F9B569E4B1B6}
+$TARGETDIR$\Spring.Net.1.1.2005.sln
+.NET 2.0 Solution
+$SHORTCUTFOLDER$\Source Code
+
+
+
+
+
+0
+{EE9964D4-1BF6-48BE-BD08-1AA41E6CECD9}
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart\Spring.AopQuickStart.2005.sln
+AOP
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{24BB4CEB-C041-4023-A448-3AE725EAEAC5}
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart\Spring.AopQuickStart.2003.sln
+AOP
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{3A2D9F38-3C4C-4909-BD58-F94AE94D60A6}
+$TARGETDIR$\examples\Spring\Spring.Calculator\Spring.Calculator.2005.sln
+Calculator
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{689F4852-777B-4865-B493-F42F05CF3EFA}
+$TARGETDIR$\examples\Spring\Spring.Data.NHibernate.Northwind\Spring.Northwind.sln
+Northwind NHibernate
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{55E0BEAD-43B8-4A0F-A94C-D5D23B3C9250}
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2005.sln
+Data Access
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{A9984778-D722-4BD6-9599-A6E2CA5FDE13}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext\Spring.IocQuickStart.AppContext.2005.sln
+Application Context
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{F8AA2809-D6D7-40DD-A34D-7C77EC57F208}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry\Spring.IocQuickStart.EventRegistry.2005.sln
+Event Registry
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{B9024C07-45AD-45A5-B551-D70AF8A241A4}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder\Spring.IocQuickStart.MovieFinder.2005.sln
+Movie Finder
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{CE007102-289B-4AAD-ACC0-78947B9FA68C}
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2005.sln
+Transactions
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{F43AAB92-2311-4285-95F5-FBD2503543C3}
+$TARGETDIR$\examples\Spring\Spring.Web.Extensions.Example\Spring.Web.Extensions.Example.2005.sln
+AJAX
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{E521F49A-503D-4708-9B8C-5F8D68D75CDC}
+$TARGETDIR$\examples\Spring\Spring.WebQuickStart\Spring.WebQuickStart.2005.sln
+Web
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{57388F2C-8AAE-468A-92AC-C6CADBAC344C}
+$TARGETDIR$\examples\Spring\SpringAir\SpringAir.2005.sln
+Spring Air
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{0727C634-3C1B-445F-B8BE-C7D2D4E56FAB}
+$TARGETDIR$\examples\Spring\Spring.Calculator\Spring.Calculator.2003.sln
+Calculator
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{F2F64080-E757-42C5-B023-C2B72DED1066}
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2003.sln
+Data Access
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{58C976E0-0F30-4334-AD68-90C293A50E8C}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext\Spring.IocQuickStart.AppContext.2003.sln
+Application Context
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{5BC2F138-2564-4ADC-9606-8EE54694D6A3}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry\Spring.IocQuickStart.EventRegistry.2003.sln
+Event Registry
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{5105D931-6D6C-406C-9820-D47CAEDA5C68}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder\Spring.IocQuickStart.MovieFinder.2003.sln
+Movie Finder
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{33BBA500-00B2-4FB1-9535-C74505BFBE15}
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2003.sln
+Transactions
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{D1099A76-F2D4-4ED8-9FF8-0CCC28759A8A}
+$TARGETDIR$\examples\Spring\SpringAir\SpringAir.2003.sln
+SpringAir
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{0EA42729-AF8B-48C6-86E8-D11906E352CE}
+$TARGETDIR$\doc\reference\pdf\spring-net-reference.pdf
+Reference - PDF
+$SHORTCUTFOLDER$\Documentation
+
+
+
+
+
+0
+{33DA50A7-F9E5-4CDA-B812-F54169CA8A89}
+$TARGETDIR$\doc\reference\html\index.html
+Reference - HTML
+$SHORTCUTFOLDER$\Documentation
+
+
+
+
+
+0
+{BEDC79F7-85D3-4837-881A-CF1A07342BB0}
+$TARGETDIR$\doc\reference\htmlhelp\htmlhelp.chm
+Reference - HTMLHELP
+$SHORTCUTFOLDER$\Documentation
+
+
+
+
+
+0
+{94BDA812-5706-4256-BB6A-E8F451677F49}
+$TARGETDIR$\changelog.txt
+View changelog
+$SHORTCUTFOLDER$
+
+
+
+
+
+0
+{29F7BFC5-6D34-4A12-9B34-C5805014863F}
+$TARGETDIR$\license.txt
+View license
+$SHORTCUTFOLDER$
+
+
+
+
+
+0
+{4CB85B60-D0A0-442A-A683-94039B70DDA0}
+$TARGETDIR$\BreakingChanges-1.1.txt
+View breaking changes
+$SHORTCUTFOLDER$
+
+
+
+
+
+0
+{01A1A5C5-4606-4A3B-A1B7-3EB40F900860}
+$TARGETDIR$\Spring.Net.1.0.2002.sln
+.NET 1.0 Solution
+$SHORTCUTFOLDER$\Source Code
+
+
+
+
+
+0
+{0C995B1F-7720-416B-8062-9D30A5BF4199}
+REMOVE=ALL,TRUE,$PRODUCTCODE$,FALSE,,,REMOVEOLD,ERROROLD,TRUE
+mMSI.dll\mMSIExec.dll
+{08508DC4-D337-40B1-93B8-52D813007FB1}
+
+
+FALSE
+{CA8886A7-0940-49AE-8FBF-B6D8857621C3}
+Spring.NET 1.1.2
+Spring.NET 1.1.2.7zip
+FALSE
+{1D2C9F3A-3B3F-4046-8FC7-86624108C2B2}
+Welcome Dialog
+{0EB6104E-73F2-4562-B9A5-D4CCCAA77D07}
+License Check
+{799297B7-F787-4C53-B04B-D884C74F885E}
+ReadMe Information
+{0391C72A-9386-4E58-B69A-CDA4F54F217F}
+User Registration
+{04063350-70E9-4E12-AF22-3963C42B1E60}
+Setup Type
+{A171750B-636E-46EB-A82D-AD3081D1E86E}
+Custom Setup
+{2A369571-BD93-4C90-92E6-9BA8BA06AA56}
+Destination Directory
+{291FFEAD-958D-468E-850E-01B8A64FA4C2}
+Start Menu
+{DD1FC87B-3855-4370-8F31-64FDF70E4466}
+Start Installation
+{D878A48E-1DC5-45C8-B282-0E36EA6D3473}
+Maintenance
+{43606175-29DB-4E0B-A271-A349EC540ADE}
+Main Install
+{C435DFAE-2EF8-4D28-A93F-3683596F4C3B}
+Maintenance
+{1F8EF880-D9B8-4C12-B266-347647DE74EF}
+Main Install
+{E1E3E44C-9A28-48CC-9811-B4F8546B03E1}
+Welcome Dialog
+{D0462D17-8893-4A99-B803-CEED288F68EB}
+Main Install
+{A68F2EC8-98DD-40D3-8FF3-B8F5BDED323D}
+License Check
+{1B6047FE-C9FB-4C1B-864E-AF9A7AB0BA0E}
+Main Install
+{30103E98-4AC5-4ED0-B524-7CC586B358ED}
+ReadMe Information
+{1D0C8CC9-2523-41E9-96E0-3BA9F5B6AB8D}
+Main Install
+{E68D3F7A-911E-4FDD-934A-9DFFD6AC3A7B}
+User Registration
+{5F0100BF-0D58-4492-A8AD-FDC458184AB5}
+Main Install
+{3C96C8AA-EC8E-476E-8B5A-BD00441FE51E}
+Setup Type
+{6E485127-81F0-4E78-A715-542B9BAC5541}
+Main Install
+{7BA3F47A-8115-4048-B47F-54FB1C8B39D2}
+Custom Setup
+{CF8730FE-B482-4030-9CBC-A32BCF9032A5}
+Main Install
+{DFF6C745-2E12-471A-BF81-EB166CA8B45E}
+Destination Directory
+{DA5F72B1-1E28-4654-89F4-2F5D09CB8A58}
+Main Install
+{85FC71FC-25EA-4ACB-B2ED-DCB1818F0810}
+Start Menu
+{19B13FAF-F05D-4522-8258-31C76DF9D915}
+Welcome Dialog
+{A6F2320E-A194-482A-A13B-8446A653F1BE}
+Main Install
+{6AE77CFC-DF7B-48CC-BA55-7417EA654C3F}
+SUCCESS
+{9FF95FFA-C00A-4F12-B05E-DB5ED37B659C}
+TRUE
+Check Application Requirements
+{A4EDA82B-1FE9-4E39-AD3E-B88DCA4DBCC2}
+FALSE
+
+{B9949A57-3226-461B-910B-04EED077BFD2}
+TRUE
+Check/Install Application Pre-Requisites
+{CDBD7138-E76A-4A1F-A427-97837EAF89CB}
+TRUE
+Check Application Pre-Requisites
+{DCC35A72-84BC-4C7A-97BA-17F3C2C6B183}
+FALSE
+
+{CFCA2177-B5D4-4498-9341-74DA4A2BF10E}
+TRUE
+Install Application Pre-Requisites
+{34379777-3444-4208-B99D-DE846461A34C}
+FALSE
+
+{BEE14656-9B19-4E10-A494-FC09B7BE2537}
+FALSE
+
+{543486BF-8C7F-46E6-B5E4-AF60671E5A79}
+TRUE
+Define Setup Globals
+{8B8FFBAD-57B5-4C26-8914-C49244985EAB}
+FALSE
+
+{44378BF2-B6DF-4AD7-871D-466D3AE158D3}
+TRUE
+Setup User Interview
+{55A2971A-4283-43A2-933F-94C005EBB5C3}
+FALSE
+
+{A4D3550A-6E2F-44F0-9AA2-CB3F558E5B28}
+TRUE
+Process (Un)Installation
+{4BF2B76B-F5F9-4D46-BF67-779EE7EB56FA}
+TRUE
+Perform Uninstallation
+{6A1EEA3F-4B75-4692-A758-01F3B78BE905}
+FALSE
+
+{8F5BEE7A-98A2-44E5-BB76-A2B68E108C87}
+TRUE
+Perform First Time or Maintenance Installation
+{3F6CFDF8-C369-4201-B7C7-B62C128726AA}
+FALSE
+
+{95AC3B82-B9FF-420D-A6B3-E7BBCBDF456B}
+FALSE
+
+{BDE0D739-0CDF-4BF6-8DB9-B7A1B2D0B60C}
+TRUE
+Finish Setup
+{B847DB01-7EB5-49CE-88E9-0C4CA4A16D67}
+FALSE
+
+$
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+C
+
+
+
+C
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+$
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+$
diff --git a/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mia.bak b/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mia.bak
new file mode 100644
index 00000000..56c6b66d
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mia.bak
@@ -0,0 +1,4150 @@
+Comment
+Comment
+Code Folding Region
+Code Folding Region
+Comment
+Code Folding Region
+Comment
+Code Folding Region
+Comment
+Set Variable
+Set Variable
+Compiler Variable If
+If
+Set Variable
+Set Variable
+End
+Compiler Variable End
+Code Folding Region
+Comment
+Code Folding Region
+Comment
+If
+Display Dialog
+If
+Terminate Install
+End
+Display Dialog
+Compiler Variable If
+If
+Set Variable
+Set Variable
+(Un)Install MSI Setup
+If
+MessageBox
+Terminate Install
+End
+If
+MessageBox
+If
+Reboot and Resume
+Else
+Terminate Install
+End
+End
+Set Variable
+End
+Compiler Variable End
+Hide Dialog
+End
+Code Folding Region
+Comment
+Code Folding Region
+Comment
+Code Folding Region
+Comment
+Define Component
+Comment
+Comment
+Get System Settings
+Get Folder Location
+Get Folder Location
+Get Folder Location
+Get Folder Location
+If
+Set Variable
+End
+Get Folder Location
+Get Folder Location
+Get Folder Location
+Get Folder Location
+Get Folder Location
+Code Folding Region
+Comment
+Code Folding Region
+If
+GoTo Label
+Else
+Compiler Variable If
+Comment
+Set Variable
+Set Variable
+Compiler Variable End
+End
+Comment
+Label
+Display Dialog
+If
+GoTo Label
+End
+Compiler Variable If
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Comment
+If
+Set Component State
+Else
+If
+Set Component State
+End
+End
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Label
+Display Dialog
+If
+GoTo Label
+Else
+If
+GoTo Label
+End
+End
+Compiler Variable End
+Label
+Display Dialog
+If
+Compiler Variable If
+GoTo Label
+Compiler Variable Else
+GoTo Label
+Compiler Variable End
+Else
+GoTo Label
+End
+Comment
+Label
+Comment
+Wizard Loop
+Display Dialog
+Display Dialog
+Display Dialog
+End
+Code Folding Region
+Comment
+Code Folding Region
+Label
+Comment
+If
+Terminate Install
+End
+Comment
+Comment
+Set Variable
+Set Variable
+Set Variable
+If
+Set Variable
+Else
+Set Variable
+End
+Display Dialog
+Comment
+Comment
+Code Folding Region
+If
+Comment
+Comment
+Apply Changes
+Set Variable
+Else
+Code Folding Region
+Code Folding Region
+Comment
+Create Shortcut
+Web Media Block
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Create Shortcut
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Install Files
+Web Media Block
+Get Component State
+If
+End
+Comment
+Compiler Variable If
+Apply Patch
+Compiler Variable Else
+If
+Apply Changes
+Else
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Create Folder
+Apply Changes
+End
+Compiler Variable End
+Set Variable
+End
+Code Folding Region
+Code Folding Region
+Comment
+Code Folding Region
+Comment
+Hide Dialog
+Display Dialog
+If
+If
+If
+Reboot Computer
+End
+End
+If
+If
+If
+Comment
+End
+End
+End
+End
+Code Folding Region
+Comment
+$
+{0AADAE47-CCD6-4CC9-BF83-32297AB40C37}
+{36ADC9A6-0B4F-4245-ACCE-4A50015A80A8}
+{9FF95FFA-C00A-4F12-B05E-DB5ED37B659C}
+{A4EDA82B-1FE9-4E39-AD3E-B88DCA4DBCC2}
+{5076ABBD-5015-4CE7-BD04-2E313FB65264}
+{B9949A57-3226-461B-910B-04EED077BFD2}
+{B51103C7-8FD1-43CD-9553-57945F20EDE8}
+{CDBD7138-E76A-4A1F-A427-97837EAF89CB}
+{7A4D8295-AAA0-4D43-8542-2746B3A3CB7E}
+{B62B7C2B-4668-4E4E-87C7-CC1525784712}
+{C7F738FC-2B5F-4380-9608-0DEA772B94C7}
+{8E733ADF-0692-4381-A6CE-1A14FC3B3EFD}
+{E3B49129-FB7E-494B-8868-3A7E035A1BB6}
+{95C7D535-8788-41B6-B8CA-D3742CDD3E2A}
+{DD78225E-3B68-40CE-B4E1-93AE4BE9C37F}
+{15A07272-08A0-428D-A9BD-D9B536BFE301}
+{73F169C4-5CC8-4F30-9586-F6C6550442B3}
+{DCC35A72-84BC-4C7A-97BA-17F3C2C6B183}
+{4D692B2D-36CC-437E-8B49-F054053A65B8}
+{CFCA2177-B5D4-4498-9341-74DA4A2BF10E}
+{007D81FD-F462-41C0-9766-5CA98DB29B4A}
+{B0E8FF3A-6587-4329-AD90-A5E8BD6B61D5}
+{2F15D329-6E80-4509-829F-C2F3352970ED}
+{CC974A69-AA46-4F01-934D-3AD31BE3EA59}
+{BA863E14-FDA9-4832-8A5C-8D3C6133D31C}
+{F8340D11-FC61-41E9-9E3F-6BC558DF4B68}
+{5B250495-2FD6-4B4D-BE79-23040614AF44}
+{A07B9E2D-B4D2-4987-9814-D9E37F8042F5}
+{B318EA01-0253-43B2-8A21-BB05E733C066}
+{D4F36731-7336-4097-A355-B0B1584CBB44}
+{CAC97A56-5D1A-405B-A78B-FE91751C7B09}
+{0C995B1F-7720-416B-8062-9D30A5BF4199}
+{C81A209F-B1AF-42AC-9982-8EC8CCC33464}
+{18516BF5-FA02-4D7B-BFD4-07714E2BC054}
+{345A0328-D054-4691-8073-84166C595BA5}
+{B5CCDB38-F907-47AB-B552-39C7A2B2F100}
+{BC322E68-8DCC-4C68-88F9-B1B2E20C4180}
+{EDE1F9CC-5316-44E4-8FEA-FE44558E9C84}
+{35873C23-DAB9-48D3-AD16-0C5140653771}
+{DDD28604-5F9E-464E-B26B-3F7F61EBB045}
+{373E3B8A-6592-4D42-9470-D0A5E9A6460E}
+{389865AC-1C56-47A5-8B49-B12BDF111071}
+{45CF9BB8-19DD-4841-8822-9B5E47CD95A6}
+{D6BA809F-6E50-4518-A1E8-9B88CBA27CC7}
+{B47D5127-9D59-471B-992B-F006D44A3F2E}
+{3BA88535-90E4-471C-8DE1-67DD268DAF38}
+{505F5EB8-1FC9-43BD-8064-B0E68BE663CA}
+{04ABB7B7-0915-407F-9520-6EEF5B5B6E4F}
+{90D54643-FAC1-4FBC-966D-507F1D2B43FB}
+{34379777-3444-4208-B99D-DE846461A34C}
+{8EE4916B-990A-45A0-91FC-AE6E73BAD205}
+{BEE14656-9B19-4E10-A494-FC09B7BE2537}
+{2D37F8AF-D65E-43A0-ADFF-D492484E9BB4}
+{543486BF-8C7F-46E6-B5E4-AF60671E5A79}
+{C65B04D2-F38D-4815-A963-34D67AD027BD}
+{A3A8A528-F4F5-4031-8308-7F556B64C129}
+{A7335220-876F-4C84-8F58-4C7CF63DAB43}
+{5232CF1A-2118-413C-BF18-594406FC60A0}
+{E4393F3D-D71C-4B0C-BE63-043394AC87F4}
+{89AA7DF5-3C08-48DF-A638-DE6B27BB689A}
+{DA7984D1-FFC6-46FD-AA05-CF9705718548}
+{93E95378-FCD0-4AD8-859C-F79D0659B4D4}
+{46249933-EAFF-48CC-83D4-A2B2D9A539DF}
+{8A95A867-00ED-469E-B99D-5FD8ABA81ABF}
+{7FFAA3DC-DDA0-4A59-BD77-84B4369F5078}
+{7D1B9FBD-2CB8-477E-B19D-5291A9B0DB2F}
+{73747553-3B70-47E7-A37E-EA9C3104CFB0}
+{8628DC93-23A1-402B-9482-4986B2460DCA}
+{3AC507BE-2DCF-4306-9D2A-2C8C6B346E2B}
+{8759C800-4115-4C0F-B44B-6E4A0A3B7271}
+{FEAA8A2C-3859-4A1D-B5BD-AFAE6A837273}
+{8B8FFBAD-57B5-4C26-8914-C49244985EAB}
+{17ED505D-22C9-4411-B251-BC1C7E4B1B5C}
+{44378BF2-B6DF-4AD7-871D-466D3AE158D3}
+{545506AF-96E2-44DE-B49C-3CDD3E25CE68}
+{C435DFAE-2EF8-4D28-A93F-3683596F4C3B}
+{A3C06778-3246-4A8B-B853-AF8247C33EDC}
+{A5001B5C-1CBD-4C2E-9942-64B73BFE5D3B}
+{7568CEA0-C91D-4D89-9091-98512904A1D1}
+{9CC32567-D081-4F97-8377-F414F884749A}
+{4632834D-AC50-48B5-A91B-503C03608212}
+{4B7055B6-C079-427E-8928-FAFA59966F0F}
+{BF47D251-C4D3-49C5-9CCC-C37F5AE762A0}
+{7536F78B-2039-40DE-B54D-9796403C0C65}
+{1D2C9F3A-3B3F-4046-8FC7-86624108C2B2}
+{0D00582F-F56D-4053-B79E-DB07C8A799D6}
+{A53F37B9-1DD2-4A99-956E-A8DE95E33B64}
+{1F8EF880-D9B8-4C12-B266-347647DE74EF}
+{20E4FDD0-E931-4A87-A6FD-2E57FD487532}
+{41DDD353-69A3-4173-808D-E7BDD8083D38}
+{0EB6104E-73F2-4562-B9A5-D4CCCAA77D07}
+{F1D0F40E-DC0E-4CBB-B78C-3FB463D8671F}
+{57144EC7-F2F4-450C-9821-C36B2AB9BEB2}
+{E1E3E44C-9A28-48CC-9811-B4F8546B03E1}
+{A4B3522B-6C94-4BB8-8E65-3E363A1B07E0}
+{63E87256-B27A-4FA6-8D19-0907F58CD451}
+{D0462D17-8893-4A99-B803-CEED288F68EB}
+{234E1C20-A8B0-43AA-A22B-41F04B752A4F}
+{86F727C2-2FE0-41B4-9FAE-EE51EC4D3AC0}
+{799297B7-F787-4C53-B04B-D884C74F885E}
+{048E3015-272E-475D-B275-CF0012C1B8FD}
+{190404D4-7B8C-4A9F-83CA-1347A04CBF6B}
+{A68F2EC8-98DD-40D3-8FF3-B8F5BDED323D}
+{F526A141-F701-41E5-B9CB-695C074CCE51}
+{2504B995-B89E-4EB1-8CD3-C1E4E32485C4}
+{1B6047FE-C9FB-4C1B-864E-AF9A7AB0BA0E}
+{D9BBD51B-CA5D-46F5-BE0C-900402CAA4A8}
+{C1D5C0FA-6D30-4E46-BF90-F71ACA911D60}
+{0391C72A-9386-4E58-B69A-CDA4F54F217F}
+{69B3686B-22D9-4ECB-91EB-EA9EEFE2AD8F}
+{8E64D5B8-C193-4954-B890-61E593B3F039}
+{30103E98-4AC5-4ED0-B524-7CC586B358ED}
+{A5486F28-FF0B-49ED-A1E8-463362714F25}
+{26C60264-6250-46C2-9EB9-1618F808612B}
+{1D0C8CC9-2523-41E9-96E0-3BA9F5B6AB8D}
+{0C2750E8-5450-4F8E-98EC-8AEBFCAB2462}
+{E4B8CFB6-5E34-4FE9-BCD0-6FD9AEADAA08}
+{04063350-70E9-4E12-AF22-3963C42B1E60}
+{ECC571C3-29CB-4AE6-97AC-C3F80801C5E1}
+{DCAEEBD8-66B2-4000-A6D9-CD370CE687BF}
+{E68D3F7A-911E-4FDD-934A-9DFFD6AC3A7B}
+{EC3EA5A4-8374-412A-A5C1-B2012FC9FFBE}
+{B2C9ED87-31EF-4A1B-BD2E-5DED878B210A}
+{5F0100BF-0D58-4492-A8AD-FDC458184AB5}
+{72C1054E-E429-44BB-8200-3F567FEFD2FE}
+{8FCAF2C3-4F88-4E68-89A7-AA3F874086AE}
+{12905F17-667A-4D90-AC96-73368992CC76}
+{CB3E023C-7C18-4A1E-B510-FA5FDC56D130}
+{5749130C-401B-46B6-A1F3-F227D549C673}
+{E475EE89-9547-4C98-AA33-0D58B5884209}
+{87BA9CDC-31A3-4AEB-8DB0-C1648A287FB2}
+{EDB251B5-EFEA-4792-B040-60474F526530}
+{14A8ED13-E1A4-42AF-8BBA-EFED617ED0A2}
+{4668CE2B-265C-46C6-8A02-759A9B167BC7}
+{A171750B-636E-46EB-A82D-AD3081D1E86E}
+{30166F16-C73F-4F86-A149-2B99BA37A858}
+{28FB5234-8E03-4416-8DA3-8C526C6948B9}
+{3C96C8AA-EC8E-476E-8B5A-BD00441FE51E}
+{723FB87B-D5CF-4631-9F6A-2BE1A60744DA}
+{526008DA-26A8-482F-B6E6-C2AB1793FC9D}
+{6E485127-81F0-4E78-A715-542B9BAC5541}
+{542E4901-D6B4-4EAF-BD8B-B6096C2F1B3C}
+{9501DCFC-E97B-440A-AA24-32AEB384AE8E}
+{2A369571-BD93-4C90-92E6-9BA8BA06AA56}
+{9115BE28-CD0B-452A-B055-23AF260640D1}
+{2F676623-128C-4C34-A1A8-5F1EF0D91DCF}
+{7BA3F47A-8115-4048-B47F-54FB1C8B39D2}
+{B1DDCFC1-633C-4E49-9516-6E890012B8D4}
+{5529E598-81EB-4901-A076-CE6F60CC6CEA}
+{CF8730FE-B482-4030-9CBC-A32BCF9032A5}
+{452C0F97-7CD5-41F7-9B6C-E0B2F7F662CA}
+{C931C77D-104E-467B-BBEF-D0A8FD9A4A56}
+{291FFEAD-958D-468E-850E-01B8A64FA4C2}
+{11BF4FE6-C05D-448C-A103-BC52BA23CCA5}
+{0FFDBB1C-5570-40C5-BC9D-A6A038498FDE}
+{DFF6C745-2E12-471A-BF81-EB166CA8B45E}
+{A6C0A248-8D0A-48A4-9EE6-2E320E35B86D}
+{A6380038-73A6-40BC-B13B-BAD29A36226C}
+{DA5F72B1-1E28-4654-89F4-2F5D09CB8A58}
+{EC8C2D00-919B-4FFE-B72C-C05B35BE3992}
+{BC245C08-2ED2-4E1A-B55C-32B85934E9B9}
+{AB79DEAC-D232-45EC-B80F-D602F13F1FFB}
+{DD1FC87B-3855-4370-8F31-64FDF70E4466}
+{C772DEC6-6D67-4E8B-80A4-587DCFC11E04}
+{C09182DB-2BDF-46A0-B6D7-6B6F6BF0F593}
+{182CEBF3-0BB0-4BCC-9676-E08A05BCD094}
+{85FC71FC-25EA-4ACB-B2ED-DCB1818F0810}
+{E6D79DA8-0828-4949-84E1-381593D0BDDE}
+{19B13FAF-F05D-4522-8258-31C76DF9D915}
+{0C569AC1-5457-4616-A508-005FF24580C2}
+{8090FC04-5B14-40FB-AF97-164E299B4A34}
+{A6F2320E-A194-482A-A13B-8446A653F1BE}
+{3135089D-17EA-4F51-8F35-1771FE4B61A8}
+{A7CD16FD-3D01-4E95-AA29-DC23DFE119D5}
+{D878A48E-1DC5-45C8-B282-0E36EA6D3473}
+{D1AC32FD-4A2D-41DB-9A0E-FCDB2A5B68A6}
+{41482B96-2613-47E5-ACCF-D9B854227C88}
+{828D4366-191D-40E6-A954-98D6BC2AB6B1}
+{2D7FCC84-17B1-4BC9-AE4A-AFE6F2561E74}
+{00902F7E-9682-4ECC-97F3-0C989404753B}
+{622D7A67-19E9-450F-9221-E0C455600021}
+{55A2971A-4283-43A2-933F-94C005EBB5C3}
+{E8D49994-8514-4EAF-8181-8DBE75A815D2}
+{A4D3550A-6E2F-44F0-9AA2-CB3F558E5B28}
+{43606175-29DB-4E0B-A271-A349EC540ADE}
+{D77A811D-0421-4824-A290-02DA2F506DBC}
+{CA901067-D569-4095-A422-B50D6AED708A}
+{B9D9D104-3211-46BE-BEF5-92A881ED7D40}
+{AD985BE7-9F53-40B3-8E58-EAC9A884FD52}
+{D57BFAD1-D19C-43F6-B54F-1234265A07A3}
+{D93C5C9D-3B2F-40F1-AF98-B66F194A35A6}
+{632BF2EF-3839-4517-BC09-C542894D3B33}
+{765C3B48-EAC5-4004-BFA2-CE4BF53F3650}
+{B0014B6C-1116-4E41-BBCC-E2349D4C4038}
+{347AE4EA-A715-4810-9AC4-C95A0AEE67C1}
+{C7B19EE0-FA22-40B3-B94C-879879BACD77}
+{61E88272-A2D3-4A54-8393-51AC2637C12B}
+{8EA1DB5A-D36D-4391-A93F-52B824ECCBED}
+{E445992E-4D8F-4D0E-B2C6-4C98E0FC7305}
+{81F00F0D-5139-4A39-B1E5-5EA513828FBD}
+{B502A097-C792-42A2-9007-80AC1988C851}
+{34D7AF5E-CC1B-4885-ABFF-37CAE9F00B27}
+{4BF2B76B-F5F9-4D46-BF67-779EE7EB56FA}
+{D63830B2-3590-4DCF-A77B-F7917A2E7F79}
+{90F49D4C-C196-4D02-AF50-E55A0BCFCA7C}
+{730C72F5-779C-47C1-9DBF-4F7BC79D8C0A}
+{EDEB4872-324A-4839-9037-B0EF3A6773A3}
+{67C00CFC-AD88-4390-B122-4ABA4AB39E20}
+{AB469D9A-56D5-4E0B-B13E-61BE4B70F773}
+{6A1EEA3F-4B75-4692-A758-01F3B78BE905}
+{8F5BEE7A-98A2-44E5-BB76-A2B68E108C87}
+{9647B504-7C7A-48F9-85D8-BCF9F0B1A0AB}
+{F3D1B9D2-7A04-44B6-9F91-860D3A2384C0}
+{08508DC4-D337-40B1-93B8-52D813007FB1}
+{C27E97F5-6F56-4072-950A-0E8C0ECD22E7}
+{074A5CF9-90CF-405D-82D3-6FEE0690119C}
+{E6B7586C-28EA-48D2-B7EB-17D42DBD1979}
+{4CB85B60-D0A0-442A-A683-94039B70DDA0}
+{346ECAFD-25C6-49CF-B532-765C963D176A}
+{94BDA812-5706-4256-BB6A-E8F451677F49}
+{52B94BDA-4FD4-4788-B28F-EEAB7C162721}
+{29F7BFC5-6D34-4A12-9B34-C5805014863F}
+{8862B1BF-C8BD-42FF-89D1-B0243A204059}
+{C71A3471-6E8E-49B4-BA18-10A4C9564959}
+{0359E329-55A1-4792-AB4E-AFEB1F335FF9}
+{DE5B6D64-509C-4FC7-BE75-F9B569E4B1B6}
+{28A3A0D3-1D22-4845-A97B-AC63DAF3413C}
+{432A824B-4E2F-4901-AEAB-DEB65367D193}
+{B60FA6EF-C69C-4EB8-9BBE-5EA91611D820}
+{1BF94E6D-2B78-4961-9F69-6DBD6632BD3D}
+{33DA50A7-F9E5-4CDA-B812-F54169CA8A89}
+{712378F3-5C02-4F64-A618-073A000505CC}
+{BEDC79F7-85D3-4837-881A-CF1A07342BB0}
+{D2D412A9-D472-4A95-BBCB-7FC0C3B8B592}
+{269A0E5E-A5B3-416F-B770-12532EE31550}
+{30B2A744-1A12-4C9E-BE0F-0E9066E87AFD}
+{0EA42729-AF8B-48C6-86E8-D11906E352CE}
+{791D8D35-3FEA-4E19-9C77-6329148C64F9}
+{5A4411F0-80E6-4F3B-BBB4-CA4A4C9B1096}
+{2B0A12F4-18DD-421F-BCA7-9CB0925004B8}
+{16B0C775-0F55-4F09-87BB-2264C7C72A11}
+{BF19F5CC-67FB-406B-81C3-678CDD88258E}
+{24BB4CEB-C041-4023-A448-3AE725EAEAC5}
+{F8031368-5974-4C5C-8EA0-001C812628D5}
+{EE9964D4-1BF6-48BE-BD08-1AA41E6CECD9}
+{E607AA22-7A1D-4CA6-9FA6-FBEC7CAF505D}
+{08D02487-7A25-4535-B2C3-D66D666F2884}
+{59F13A6B-AF40-45F7-B7F8-9D4DA03320B1}
+{D4618425-8024-415B-A39E-EA5A6A757E11}
+{E927FC6B-DA58-4F6B-86DE-BEE46E7D6F24}
+{3A2D9F38-3C4C-4909-BD58-F94AE94D60A6}
+{0D9E47BC-3A38-457C-BD4C-D5BABE1E3168}
+{0727C634-3C1B-445F-B8BE-C7D2D4E56FAB}
+{C8E7DA02-29FE-4E5E-BA96-8E9B48E6D5F1}
+{6028D781-1B56-4CF6-8567-B3266184A580}
+{9A899381-224C-4960-8EE9-114927CF3331}
+{5A52EB3A-E6DF-4A80-80ED-7479ECB6B587}
+{49B7241A-38C5-4AFA-8816-2DF906B2E558}
+{689F4852-777B-4865-B493-F42F05CF3EFA}
+{8A3D44F9-A8F2-489B-B57E-CC9146833960}
+{74EE6033-B67D-4559-A3CD-8EB3B5D601AB}
+{ED19961A-2407-4353-B639-99DCA4187BCC}
+{55E0BEAD-43B8-4A0F-A94C-D5D23B3C9250}
+{5023B1E0-3EE7-4FE8-BDC7-6FE3B0F1CD32}
+{F2F64080-E757-42C5-B023-C2B72DED1066}
+{E44E20C1-1D79-49EE-A44E-3208D7C0AB49}
+{BA9CE954-CC1E-4A8C-9AD5-E4A773242D09}
+{3AB6811B-92B2-46F1-98F1-EA0F0B84E196}
+{FBC19861-623F-4B92-9ECF-FEBD47DA4AC9}
+{A9984778-D722-4BD6-9599-A6E2CA5FDE13}
+{C47FA07F-CB64-4C9B-B31E-2469BA86C4E8}
+{58C976E0-0F30-4334-AD68-90C293A50E8C}
+{ED12CCAD-D43C-4CA0-B6FF-6EF6F1288B75}
+{EA3B37A7-6C0A-4E39-BD02-FFD9DE8A1425}
+{3AB54DCB-499F-4F7C-9916-6FB2B8D7F427}
+{F8AA2809-D6D7-40DD-A34D-7C77EC57F208}
+{248669E3-3B34-44F8-B5C6-D19512FAB392}
+{5BC2F138-2564-4ADC-9606-8EE54694D6A3}
+{ECA4D720-A9AA-41B4-8487-336179456282}
+{C2B8D56A-7A67-454D-8DFE-8FA17FCA47F8}
+{5A098B01-9784-414B-8B43-F702421DA9F3}
+{B9024C07-45AD-45A5-B551-D70AF8A241A4}
+{A38A7B60-A88E-4D09-A49E-0CBA4B8272EB}
+{5105D931-6D6C-406C-9820-D47CAEDA5C68}
+{37F91F10-6667-4967-B167-6CEABB7620C6}
+{2B9C2915-A46E-4301-B118-787D8E969E9E}
+{24393453-7A7C-4DC8-ADD6-44945E073D70}
+{CE007102-289B-4AAD-ACC0-78947B9FA68C}
+{97F657B1-22D5-4F55-9D77-8F7D23F8DD0D}
+{33BBA500-00B2-4FB1-9535-C74505BFBE15}
+{AC02E50D-0805-4672-B66E-42BC308B57E6}
+{10A30C9B-AB0E-4622-B39F-2058816C8AC9}
+{40E187E4-9812-43DF-BB93-F2729EC5F519}
+{F43AAB92-2311-4285-95F5-FBD2503543C3}
+{3EDD2AA2-2F08-414A-BD66-37240675D6DC}
+{C8FC0883-E862-4A8F-8421-CEA1AF318888}
+{E521F49A-503D-4708-9B8C-5F8D68D75CDC}
+{93CF5997-A66F-4AA4-AAF5-BBAAD4F951E6}
+{C63FE01E-7752-4B7B-9C32-AC04B4547229}
+{92F5D05F-D8AA-4996-A5BC-84A8C0CD8C31}
+{57388F2C-8AAE-468A-92AC-C6CADBAC344C}
+{C3F2E78C-8C6E-41DE-8F22-3CEAFC16702E}
+{D1099A76-F2D4-4ED8-9FF8-0CCC28759A8A}
+{A55D92B4-821D-4AF4-92A1-EAC924FDEA79}
+{D9204FF3-BEC7-47FD-9F8B-FA65852C8244}
+{FBE8A4BD-F1AD-4CDC-9BCE-6FFEB7BE5B16}
+{152AD548-99D6-4A5C-8941-2D3353EBF9E2}
+{94C4A1C7-4455-4C07-81BF-1C839F22E7AA}
+{EB267C6B-3753-4884-A293-FA6D434C721A}
+{01A1A5C5-4606-4A3B-A1B7-3EB40F900860}
+{581B8426-13B8-4FFD-BF40-DDF1B9D8259E}
+{6E07EA6C-1806-4732-AEAA-38BD6DE47E2B}
+{3EC1445C-8366-4C5C-AAF5-4D4149AB4B41}
+{59850623-26EC-4194-89A6-F30061F5062E}
+{719DFB9B-4E0F-45F5-AD4E-2C5BA47C906D}
+{A63461BB-D0E3-4619-8E23-A94309008D35}
+{0348BC02-8BDA-4CA5-AAEB-712972834273}
+{CE3DC0F6-F7EC-4D75-A549-21987A274057}
+{711AF477-C59C-4C49-BFA1-67FF06A2645C}
+{F62CCF0B-9819-449B-8F57-1AFBB40ADE4B}
+{E2EB93C1-70A8-49D7-9267-B08DC1139F9F}
+{ECBC6F47-D172-4FC2-A5ED-C126CCCD170C}
+{69CFC4AE-2A91-41B9-A624-39408E9577AA}
+{FAACD365-EC26-49B2-8BAC-04BF168C0512}
+{141FD384-7BE4-44B4-9396-2266E446C2B7}
+{762D6DFD-3E0F-4F1D-A04F-8BC7247205F9}
+{FF09C170-EE49-491E-B2D4-47DDA6BE2922}
+{C11FD511-7C71-4098-89B8-73A9B96AEA44}
+{31D2EF1E-5B69-4D49-BBAC-99B96E76669B}
+{1BF8EC9F-BF4D-4D26-9898-9F9F1EDFF353}
+{976658BC-A4FA-4B70-9291-19184485261A}
+{F5A36399-5FAC-4B74-BA14-77A64C844745}
+{F7D1C08F-E9AE-4A5A-ABDE-8E581D873E96}
+{65953F22-79D4-4DD3-A6FF-BC4CDD729792}
+{51A49E15-23E3-4559-817C-C38F389C3C72}
+{2A9B2662-0E11-4C5C-AF7F-742D1174ED14}
+{ADEE302B-F212-4751-8B50-EB8EAC9C8EFB}
+{2CD3CFCE-81DE-4466-AED7-12B2BDECA087}
+{585B4721-E2A3-404D-ACC0-EB6296E0E695}
+{465057F2-972D-4BAA-B6AD-BC8442E847CC}
+{23190313-3FA0-4237-8068-921135E8CCAF}
+{ECEAFDB1-38CE-4456-959F-8BCB7F8AB42C}
+{EDB712F1-60F1-4B32-A175-B958981EDD88}
+{C0815807-26C9-4C9B-AE4E-689621CF85A8}
+{AD1DA31F-EF7B-4BD9-AED9-254542C97BF6}
+{963CBCD6-CE3E-4D95-88EA-98B57180790C}
+{7D3AD7A9-DE39-4DFE-855D-D8E2EBC56EFE}
+{5DFAB593-E7EA-48F4-A54C-79D401A27AFF}
+{2FB2EC42-3861-4FE2-A94F-1D019ED05E48}
+{AB970539-32D3-4FB3-A98D-21247FF2E81B}
+{7DBC25B6-F82B-428C-853F-B2ED542DD7BB}
+{D6C99305-1C60-444F-B81F-6EC6846E0DF9}
+{C298BCA5-F5D8-4EF6-8AB9-9C5371DFB610}
+{D887138C-5E08-47C4-8A51-53A8F714EFB7}
+{0F86BF0F-F836-4FF4-B8AA-B7A826981964}
+{57BA5F33-63DD-4884-ABAD-ADC55B447BCA}
+{C5A04B8A-7853-4B45-92F3-E831B4C67BF9}
+{CA8886A7-0940-49AE-8FBF-B6D8857621C3}
+{830DA74D-7462-48B6-A133-06DA43BA64D6}
+{2FDC7A9C-BB27-44B0-A855-08F5E4E78C03}
+{E4B8248A-5A07-4606-8061-69DEFA22B79E}
+{BAAB438D-3BBF-4855-A549-802C1F2CFF14}
+{7F1D8FE4-A0A2-49D7-8199-50E1E92F0E20}
+{6AE77CFC-DF7B-48CC-BA55-7417EA654C3F}
+{40FA7FF1-7EE4-45CF-8FB3-A0EE1427DF27}
+{5B0EA42B-8215-4F05-864D-BEA0F71263C6}
+{F41EB7B2-6092-43A2-A09F-B3AF3A1382F6}
+{4F6BC49A-80EC-4F8C-9648-4265CC7CEB34}
+{16E358DF-D903-48F5-A026-FDC700D1C889}
+{694A3224-E9B6-498D-8D8B-53824B2D0242}
+{D945B365-B8FF-468C-AC0A-A53FF5149AC4}
+{AD75674E-20AF-421E-9DD0-1771C5D6BA2F}
+{C58C8DFD-EB05-472C-92A3-DD2888DE3674}
+{6F8F4166-032E-43A6-B903-AD9FCA26F96A}
+{15519B1B-26C0-4A56-A9D1-FB3FB582969A}
+{33651349-5F43-40EA-8E32-134B79F45775}
+{6AA35938-EA49-48DB-8552-D5F438A10886}
+{C52F9C0E-499B-4327-A60F-6F8A715CF1C8}
+{6C682C0F-1675-4A6C-97B8-DF16B9DCA351}
+{DC607F6D-F656-4907-9609-1B60B2B99AC7}
+{E72C40B3-44B4-4A99-AF57-9334DF0EF766}
+{E1C662D4-634B-48DC-84E4-BF0BA598483D}
+{23CAEA40-4550-45BE-B143-495EA08FC5C8}
+{44F053DF-FD18-43CE-9F54-FF5EAA2BDDF5}
+{55F68A46-D37C-4EFA-93AF-F5059BAA18A7}
+{D485BC83-02BA-4E8F-9B7B-8BE2E32EA86C}
+{54E4F522-B431-47C7-9CB8-FB85C3026B67}
+{8267DBB8-DF95-4537-A1A8-C6BDC5920DE4}
+{EE982A90-6EDC-423E-B1E2-48513B323585}
+{3386BE6B-4548-4263-8029-814446D9223A}
+{912B32EF-57AA-4281-A278-1BE53F8913B3}
+{6AAA80E4-2580-4EF5-9665-744AEC074AC0}
+{ACFD5194-BF16-4DFA-B98B-1444325CC84C}
+{3F6CFDF8-C369-4201-B7C7-B62C128726AA}
+{95AC3B82-B9FF-420D-A6B3-E7BBCBDF456B}
+{921BE086-1FF7-43EC-B66E-861590CA0871}
+{BDE0D739-0CDF-4BF6-8DB9-B7A1B2D0B60C}
+{B28E159D-F89A-43EB-8A0F-EA840FB3E87E}
+{092D0AED-2A8E-4EC6-84A0-9DAB5FD7DD10}
+{B00D614C-78A3-4680-83A9-DD5D768701EF}
+{617665D6-2657-4951-8DB2-5F009331A840}
+{1FB0BA56-4363-4128-B870-3938E4523420}
+{18C8BB36-009E-4641-9BA9-4EF16CB5FE60}
+{017E35F9-9B5A-437E-8C12-13160ACC8ADB}
+{588A301D-4159-4D88-A621-DE4ABF961C26}
+{36C3EC96-D18F-46A6-9421-F65FF74A3081}
+{B1EB5223-05FB-44D9-85EE-A8597E6EEBA9}
+{E47B4039-6B59-4330-97BC-B14676A32A9F}
+{1F6B7960-BB0F-4260-89DC-05FC2510687F}
+{3C2C1319-E0ED-435F-BA01-4169CFB84BBC}
+{28544AF2-D585-4602-BDD9-D1BCA1C45F56}
+{F63FB5FC-5E28-496A-8C38-BE0175526BB8}
+{D5D59AE2-B185-49F6-B4BD-0A7A6F8E52F3}
+{99ABD0FB-FFE1-4263-94AB-17A59D5C247C}
+{B847DB01-7EB5-49CE-88E9-0C4CA4A16D67}
+{4756E785-D8A3-4E29-B993-B01B01AA4D2A}
+$
+{0AADAE47-CCD6-4CC9-BF83-32297AB40C37}
+Spring.NET 1.1 M1 Setup Project
+{36ADC9A6-0B4F-4245-ACCE-4A50015A80A8}
+
+{5076ABBD-5015-4CE7-BD04-2E313FB65264}
+
+{B51103C7-8FD1-43CD-9553-57945F20EDE8}
+
+{7A4D8295-AAA0-4D43-8542-2746B3A3CB7E}
+Check setup pre-requisites
+{4D692B2D-36CC-437E-8B49-F054053A65B8}
+
+{007D81FD-F462-41C0-9766-5CA98DB29B4A}
+Install setup pre-requisites
+{8EE4916B-990A-45A0-91FC-AE6E73BAD205}
+
+{2D37F8AF-D65E-43A0-ADFF-D492484E9BB4}
+
+{C65B04D2-F38D-4815-A963-34D67AD027BD}
+Define Setup Components
+{A7335220-876F-4C84-8F58-4C7CF63DAB43}
+
+{5232CF1A-2118-413C-BF18-594406FC60A0}
+Initialize Setup Globals
+{17ED505D-22C9-4411-B251-BC1C7E4B1B5C}
+
+{7568CEA0-C91D-4D89-9091-98512904A1D1}
+First Time Install
+{7536F78B-2039-40DE-B54D-9796403C0C65}
+
+{12905F17-667A-4D90-AC96-73368992CC76}
+TO-DO: Customize your minimum setup here
+{A7CD16FD-3D01-4E95-AA29-DC23DFE119D5}
+
+{D1AC32FD-4A2D-41DB-9A0E-FCDB2A5B68A6}
+Maintenance Install/Uninstall
+{E8D49994-8514-4EAF-8181-8DBE75A815D2}
+
+{D77A811D-0421-4824-A290-02DA2F506DBC}
+Exit Setup if Wizard Loop cancelled
+{D57BFAD1-D19C-43F6-B54F-1234265A07A3}
+
+{D93C5C9D-3B2F-40F1-AF98-B66F194A35A6}
+Prepare to install
+{B502A097-C792-42A2-9007-80AC1988C851}
+
+{34D7AF5E-CC1B-4885-ABFF-37CAE9F00B27}
+Modify Target System
+{90F49D4C-C196-4D02-AF50-E55A0BCFCA7C}
+Uninstall product
+{730C72F5-779C-47C1-9DBF-4F7BC79D8C0A}
+TO-DO: Insert any additional uninstall commands here
+{9647B504-7C7A-48F9-85D8-BCF9F0B1A0AB}
+Install/Re-Install product
+{BAAB438D-3BBF-4855-A549-802C1F2CFF14}
+TO-DO: Insert any additional install commands here
+{921BE086-1FF7-43EC-B66E-861590CA0871}
+
+{B28E159D-F89A-43EB-8A0F-EA840FB3E87E}
+End of Installation
+{3C2C1319-E0ED-435F-BA01-4169CFB84BBC}
+TO-DO: Insert command that starts your application here
+{4756E785-D8A3-4E29-B993-B01B01AA4D2A}
+
+{B62B7C2B-4668-4E4E-87C7-CC1525784712}
+PREREQ
+FALSE
+{C7F738FC-2B5F-4380-9608-0DEA772B94C7}
+PRELIST
+
+{95C7D535-8788-41B6-B8CA-D3742CDD3E2A}
+PREREQ
+TRUE
+{DD78225E-3B68-40CE-B4E1-93AE4BE9C37F}
+PRELIST
+$PRELIST$$NEWLINE$Previous Version Uninstallation
+{D4F36731-7336-4097-A355-B0B1584CBB44}
+REMOVEOLD
+
+{CAC97A56-5D1A-405B-A78B-FE91751C7B09}
+ERROROLD
+
+{B47D5127-9D59-471B-992B-F006D44A3F2E}
+MAINTENANCE
+FALSE
+{7FFAA3DC-DDA0-4A59-BD77-84B4369F5078}
+SHORTCUTFILESALL
+$SHORTCUTFILES$
+{9CC32567-D081-4F97-8377-F414F884749A}
+TARGETDIR
+$PROGRAMFILES$\$TITLE$
+{4632834D-AC50-48B5-A91B-503C03608212}
+STARTMENU
+$TITLE$
+{632BF2EF-3839-4517-BC09-C542894D3B33}
+PROGRESSTEXT
+Installing $TITLE$
+{765C3B48-EAC5-4004-BFA2-CE4BF53F3650}
+SUCCESS
+
+{B0014B6C-1116-4E41-BBCC-E2349D4C4038}
+LASTERROR
+
+{C7B19EE0-FA22-40B3-B94C-879879BACD77}
+SHORTCUTFOLDER
+$SHORTCUTFILESALL$\$STARTMENU$
+{8EA1DB5A-D36D-4391-A93F-52B824ECCBED}
+SHORTCUTFOLDER
+$SHORTCUTFILES$\$STARTMENU$
+{67C00CFC-AD88-4390-B122-4ABA4AB39E20}
+PROGRESS
+100
+{6AAA80E4-2580-4EF5-9665-744AEC074AC0}
+PROGRESS
+100
+{8E733ADF-0692-4381-A6CE-1A14FC3B3EFD}
+BUILDMODE
+0
+PATCH
+TRUE
+{E3B49129-FB7E-494B-8868-3A7E035A1BB6}
+NEEDSUPGRADE
+0
+TRUE
+FALSE
+{B0E8FF3A-6587-4329-AD90-A5E8BD6B61D5}
+PREREQ
+0
+FALSE
+TRUE
+{CC974A69-AA46-4F01-934D-3AD31BE3EA59}
+WIZARD
+0
+CANCEL
+FALSE
+{A07B9E2D-B4D2-4987-9814-D9E37F8042F5}
+BUILDMODE
+0
+PATCH
+TRUE
+{B318EA01-0253-43B2-8A21-BB05E733C066}
+NEEDSUPGRADE
+0
+TRUE
+FALSE
+{C81A209F-B1AF-42AC-9982-8EC8CCC33464}
+REMOVEOLD
+0
+ERROR
+FALSE
+{BC322E68-8DCC-4C68-88F9-B1B2E20C4180}
+REMOVEOLD
+0
+REBOOT
+FALSE
+{35873C23-DAB9-48D3-AD16-0C5140653771}
+REBOOTNOW
+0
+OK
+FALSE
+{8A95A867-00ED-469E-B99D-5FD8ABA81ABF}
+SHORTCUTFILESALL
+0
+
+FALSE
+{545506AF-96E2-44DE-B49C-3CDD3E25CE68}
+MAINTENANCE
+0
+TRUE
+FALSE
+{A5001B5C-1CBD-4C2E-9942-64B73BFE5D3B}
+BUILDMODE
+0
+PATCH
+TRUE
+{A53F37B9-1DD2-4A99-956E-A8DE95E33B64}
+WIZARD
+0
+CANCEL
+FALSE
+{41DDD353-69A3-4173-808D-E7BDD8083D38}
+BUILDMODE
+0
+PATCH
+TRUE
+{57144EC7-F2F4-450C-9821-C36B2AB9BEB2}
+WIZARD
+0
+BACK
+FALSE
+{63E87256-B27A-4FA6-8D19-0907F58CD451}
+WIZARD
+0
+CANCEL
+FALSE
+{190404D4-7B8C-4A9F-83CA-1347A04CBF6B}
+WIZARD
+0
+BACK
+FALSE
+{2504B995-B89E-4EB1-8CD3-C1E4E32485C4}
+WIZARD
+0
+CANCEL
+FALSE
+{8E64D5B8-C193-4954-B890-61E593B3F039}
+WIZARD
+0
+BACK
+FALSE
+{26C60264-6250-46C2-9EB9-1618F808612B}
+WIZARD
+0
+CANCEL
+FALSE
+{DCAEEBD8-66B2-4000-A6D9-CD370CE687BF}
+WIZARD
+0
+BACK
+FALSE
+{B2C9ED87-31EF-4A1B-BD2E-5DED878B210A}
+WIZARD
+0
+CANCEL
+FALSE
+{CB3E023C-7C18-4A1E-B510-FA5FDC56D130}
+MINIMUM
+0
+TRUE
+FALSE
+{87BA9CDC-31A3-4AEB-8DB0-C1648A287FB2}
+COMPLETE
+0
+TRUE
+FALSE
+{28FB5234-8E03-4416-8DA3-8C526C6948B9}
+WIZARD
+0
+BACK
+FALSE
+{526008DA-26A8-482F-B6E6-C2AB1793FC9D}
+WIZARD
+0
+CANCEL
+FALSE
+{2F676623-128C-4C34-A1A8-5F1EF0D91DCF}
+WIZARD
+0
+BACK
+FALSE
+{5529E598-81EB-4901-A076-CE6F60CC6CEA}
+WIZARD
+0
+CANCEL
+FALSE
+{0FFDBB1C-5570-40C5-BC9D-A6A038498FDE}
+WIZARD
+0
+BACK
+FALSE
+{A6380038-73A6-40BC-B13B-BAD29A36226C}
+WIZARD
+0
+CANCEL
+FALSE
+{C09182DB-2BDF-46A0-B6D7-6B6F6BF0F593}
+WIZARD
+0
+BACK
+FALSE
+{182CEBF3-0BB0-4BCC-9676-E08A05BCD094}
+BUILDMODE
+0
+PATCH
+TRUE
+{CA901067-D569-4095-A422-B50D6AED708A}
+WIZARD
+0
+CANCEL
+FALSE
+{347AE4EA-A715-4810-9AC4-C95A0AEE67C1}
+ALLUSERS
+0
+TRUE
+FALSE
+{D63830B2-3590-4DCF-A77B-F7917A2E7F79}
+REMOVE
+0
+TRUE
+FALSE
+{2FDC7A9C-BB27-44B0-A855-08F5E4E78C03}
+SELECTED
+0
+TRUE
+FALSE
+{7F1D8FE4-A0A2-49D7-8199-50E1E92F0E20}
+BUILDMODE
+0
+PATCH
+FALSE
+{5B0EA42B-8215-4F05-864D-BEA0F71263C6}
+ADVERTISE
+0
+TRUE
+FALSE
+{617665D6-2657-4951-8DB2-5F009331A840}
+SILENT
+0
+FALSE
+FALSE
+{1FB0BA56-4363-4128-B870-3938E4523420}
+REBOOTCOMPUTER
+0
+TRUE
+FALSE
+{18C8BB36-009E-4641-9BA9-4EF16CB5FE60}
+SUCCESS
+0
+REBOOT
+FALSE
+{B1EB5223-05FB-44D9-85EE-A8597E6EEBA9}
+RUNAPP
+0
+TRUE
+FALSE
+{E47B4039-6B59-4330-97BC-B14676A32A9F}
+REMOVE
+0
+FALSE
+FALSE
+{1F6B7960-BB0F-4260-89DC-05FC2510687F}
+SUCCESS
+0
+COMPLETE
+FALSE
+{18516BF5-FA02-4D7B-BFD4-07714E2BC054}
+$TITLE$ Setup
+Unable to uninstall old version of $TITLE$. Please uninstall it yourself using Control Panel Add-Remove Programs before attempting to install this product.$NEWLINE$$NEWLINE$$ERROROLD$
+2
+1
+
+{EDE1F9CC-5316-44E4-8FEA-FE44558E9C84}
+$TITLE$ Setup
+Your computer needs to be restarted before $TITLE$ Setup can continue.$NEWLINE$$NEWLINE$Please save your work in all running programs and click OK to restart your computer. Setup will resume once your computer restarts.$NEWLINE$$NEWLINE$If you click CANCEL, setup will exit. You will have to run setup again at a later time to install $TITLE$.
+2
+2
+REBOOTNOW
+{2F15D329-6E80-4509-829F-C2F3352970ED}
+prereq
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{5B250495-2FD6-4B4D-BE79-23040614AF44}
+progressprereq
+WIZARD
+FALSE
+
+TRUE
+FALSE
+{0D00582F-F56D-4053-B79E-DB07C8A799D6}
+welcome
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{F1D0F40E-DC0E-4CBB-B78C-3FB463D8671F}
+licensecheck
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{048E3015-272E-475D-B275-CF0012C1B8FD}
+readme
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{69B3686B-22D9-4ECB-91EB-EA9EEFE2AD8F}
+registration
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{ECC571C3-29CB-4AE6-97AC-C3F80801C5E1}
+setuptype
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{30166F16-C73F-4F86-A149-2B99BA37A858}
+componentstree
+WIZARD
+TRUE
+PERSONALIZED
+TRUE
+FALSE
+{9115BE28-CD0B-452A-B055-23AF260640D1}
+destination
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{11BF4FE6-C05D-448C-A103-BC52BA23CCA5}
+startmenu
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{C772DEC6-6D67-4E8B-80A4-587DCFC11E04}
+startinstallation
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{828D4366-191D-40E6-A954-98D6BC2AB6B1}
+maintenance
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{2D7FCC84-17B1-4BC9-AE4A-AFE6F2561E74}
+componentstree
+WIZARD
+TRUE
+MODIFY
+TRUE
+FALSE
+{00902F7E-9682-4ECC-97F3-0C989404753B}
+startinstallation
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{81F00F0D-5139-4A39-B1E5-5EA513828FBD}
+progress
+WIZARD
+FALSE
+
+TRUE
+FALSE
+{B00D614C-78A3-4680-83A9-DD5D768701EF}
+finish
+WIZARD
+TRUE
+
+TRUE
+FALSE
+{A3A8A528-F4F5-4031-8308-7F556B64C129}
+Spring.NET 1.1.2
+TRUE
+Spring.NET 1.1.2
+{5749130C-401B-46B6-A1F3-F227D549C673}
+Spring.NET 1.1.2
+FALSE
+{EDB251B5-EFEA-4792-B040-60474F526530}
+Spring.NET 1.1.2
+TRUE
+{830DA74D-7462-48B6-A133-06DA43BA64D6}
+Spring.NET 1.1.2
+SELECTED
+{16E358DF-D903-48F5-A026-FDC700D1C889}
+$TARGETDIR$\doc
+{694A3224-E9B6-498D-8D8B-53824B2D0242}
+$TARGETDIR$\doc\reference
+{D945B365-B8FF-468C-AC0A-A53FF5149AC4}
+$TARGETDIR$\doc\reference\html
+{AD75674E-20AF-421E-9DD0-1771C5D6BA2F}
+$TARGETDIR$\doc\reference\htmlhelp
+{C58C8DFD-EB05-472C-92A3-DD2888DE3674}
+$TARGETDIR$\doc\reference\images
+{6F8F4166-032E-43A6-B903-AD9FCA26F96A}
+$TARGETDIR$\doc\reference\pdf
+{15519B1B-26C0-4A56-A9D1-FB3FB582969A}
+$TARGETDIR$\doc\reference\styles
+{33651349-5F43-40EA-8E32-134B79F45775}
+$TARGETDIR$\examples
+{6AA35938-EA49-48DB-8552-D5F438A10886}
+$TARGETDIR$\examples\Spring
+{C52F9C0E-499B-4327-A60F-6F8A715CF1C8}
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart
+{6C682C0F-1675-4A6C-97B8-DF16B9DCA351}
+$TARGETDIR$\examples\Spring\Spring.Calculator
+{DC607F6D-F656-4907-9609-1B60B2B99AC7}
+$TARGETDIR$\examples\Spring\Spring.Data.NHibernate.Northwind
+{E72C40B3-44B4-4A99-AF57-9334DF0EF766}
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart
+{E1C662D4-634B-48DC-84E4-BF0BA598483D}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext
+{23CAEA40-4550-45BE-B143-495EA08FC5C8}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry
+{44F053DF-FD18-43CE-9F54-FF5EAA2BDDF5}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder
+{55F68A46-D37C-4EFA-93AF-F5059BAA18A7}
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart
+{D485BC83-02BA-4E8F-9B7B-8BE2E32EA86C}
+$TARGETDIR$\examples\Spring\Spring.Web.Extensions.Example
+{54E4F522-B431-47C7-9CB8-FB85C3026B67}
+$TARGETDIR$\examples\Spring\Spring.WebQuickStart
+{8267DBB8-DF95-4537-A1A8-C6BDC5920DE4}
+$TARGETDIR$\examples\Spring\SpringAir
+{EDEB4872-324A-4839-9037-B0EF3A6773A3}
+progress
+SUCCESS
+FALSE
+TRUE
+{F41EB7B2-6092-43A2-A09F-B3AF3A1382F6}
+progress
+SUCCESS
+FALSE
+FALSE
+{EE982A90-6EDC-423E-B1E2-48513B323585}
+progress
+SUCCESS
+TRUE
+FALSE
+{89AA7DF5-3C08-48DF-A638-DE6B27BB689A}
+PROGRAMFILES
+20
+FALSE
+{DA7984D1-FFC6-46FD-AA05-CF9705718548}
+COMMONFILES
+20
+TRUE
+{93E95378-FCD0-4AD8-859C-F79D0659B4D4}
+SHORTCUTFILESALL
+14
+TRUE
+{46249933-EAFF-48CC-83D4-A2B2D9A539DF}
+SHORTCUTFILES
+14
+FALSE
+{73747553-3B70-47E7-A37E-EA9C3104CFB0}
+DESKTOPDIR
+17
+FALSE
+{8628DC93-23A1-402B-9482-4986B2460DCA}
+WINDIR
+25
+FALSE
+{3AC507BE-2DCF-4306-9D2A-2C8C6B346E2B}
+WINSYSDIR
+23
+FALSE
+{8759C800-4115-4C0F-B44B-6E4A0A3B7271}
+QUICKLAUNCHDIR
+26
+FALSE
+{FEAA8A2C-3859-4A1D-B5BD-AFAE6A837273}
+WWWROOTDIR
+27
+FALSE
+{E4393F3D-D71C-4B0C-BE63-043394AC87F4}
+ISNT
+18
+{C27E97F5-6F56-4072-950A-0E8C0ECD22E7}
+L:\projects\Spring.Net\build\package\Spring.NET\readme.txt
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{E6B7586C-28EA-48D2-B7EB-17D42DBD1979}
+L:\projects\Spring.Net\build\package\Spring.NET\BreakingChanges-1.1.txt
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{346ECAFD-25C6-49CF-B532-765C963D176A}
+L:\projects\Spring.Net\build\package\Spring.NET\changelog.txt
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{52B94BDA-4FD4-4788-B28F-EEAB7C162721}
+L:\projects\Spring.Net\build\package\Spring.NET\license.txt
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{8862B1BF-C8BD-42FF-89D1-B0243A204059}
+L:\projects\Spring.Net\build\package\Spring.NET\bin\*.*
+TRUE|
+$TARGETDIR$\bin
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C71A3471-6E8E-49B4-BA18-10A4C9564959}
+L:\projects\Spring.Net\build\package\Spring.NET\icons\*.*
+TRUE|
+$TARGETDIR$\icons
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{0359E329-55A1-4792-AB4E-AFEB1F335FF9}
+L:\projects\Spring.Net\build\package\Spring.NET\Spring.Net.1.1.2005.sln
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{28A3A0D3-1D22-4845-A97B-AC63DAF3413C}
+L:\projects\Spring.Net\build\package\Spring.NET\Spring.Net.1.1.2003.sln
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{B60FA6EF-C69C-4EB8-9BBE-5EA91611D820}
+L:\projects\Spring.Net\build\package\Spring.NET\lib\*.*
+TRUE|
+$TARGETDIR$\lib
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{1BF94E6D-2B78-4961-9F69-6DBD6632BD3D}
+L:\projects\Spring.Net\build\package\Spring.NET\src\*.*
+TRUE|
+$TARGETDIR$\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{712378F3-5C02-4F64-A618-073A000505CC}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\htmlhelp\htmlhelp.chm
+FALSE|
+$TARGETDIR$\doc\reference\htmlhelp
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{D2D412A9-D472-4A95-BBCB-7FC0C3B8B592}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\images\admons\*.*
+TRUE|
+$TARGETDIR$\doc\reference\images\admons
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{269A0E5E-A5B3-416F-B770-12532EE31550}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\images\callouts\*.*
+TRUE|
+$TARGETDIR$\doc\reference\images\callouts
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{30B2A744-1A12-4C9E-BE0F-0E9066E87AFD}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\pdf\spring-net-reference.pdf
+FALSE|
+$TARGETDIR$\doc\reference\pdf
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{791D8D35-3FEA-4E19-9C77-6329148C64F9}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\pdf\images\*.*
+TRUE|
+$TARGETDIR$\doc\reference\pdf\images
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{5A4411F0-80E6-4F3B-BBB4-CA4A4C9B1096}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\styles\html.css
+FALSE|
+$TARGETDIR$\doc\reference\styles
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{2B0A12F4-18DD-421F-BCA7-9CB0925004B8}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\schema\*.*
+TRUE|
+$TARGETDIR$\doc\schema
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{16B0C775-0F55-4F09-87BB-2264C7C72A11}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.AopQuickStart\readme.txt
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{BF19F5CC-67FB-406B-81C3-678CDD88258E}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.AopQuickStart\Spring.AopQuickStart.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{F8031368-5974-4C5C-8EA0-001C812628D5}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.AopQuickStart\Spring.AopQuickStart.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{E607AA22-7A1D-4CA6-9FA6-FBEC7CAF505D}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.AopQuickStart\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{08D02487-7A25-4535-B2C3-D66D666F2884}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.AopQuickStart\Spring.AopQuickStart.build
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{59F13A6B-AF40-45F7-B7F8-9D4DA03320B1}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\Spring.Calculator.snk
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Calculator
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{D4618425-8024-415B-A39E-EA5A6A757E11}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\Spring.Calculator.build
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Calculator
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{E927FC6B-DA58-4F6B-86DE-BEE46E7D6F24}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\Spring.Calculator.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Calculator
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{0D9E47BC-3A38-457C-BD4C-D5BABE1E3168}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\Spring.Calculator.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Calculator
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C8E7DA02-29FE-4E5E-BA96-8E9B48E6D5F1}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\readme.txt
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Calculator
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{6028D781-1B56-4CF6-8567-B3266184A580}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\lib\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.Calculator\lib
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{9A899381-224C-4960-8EE9-114927CF3331}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Calculator\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.Calculator\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{5A52EB3A-E6DF-4A80-80ED-7479ECB6B587}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Data.NHibernate.Northwind\test_northwind.sql
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Data.NHibernate.Northwind
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{49B7241A-38C5-4AFA-8816-2DF906B2E558}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Data.NHibernate.Northwind\Spring.Northwind.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Data.NHibernate.Northwind
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{8A3D44F9-A8F2-489B-B57E-CC9146833960}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Data.NHibernate.Northwind\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.Data.NHibernate.Northwind\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{74EE6033-B67D-4559-A3CD-8EB3B5D601AB}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Data.NHibernate.Northwind\test\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.Data.NHibernate.Northwind\test
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{ED19961A-2407-4353-B639-99DCA4187BCC}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{5023B1E0-3EE7-4FE8-BDC7-6FE3B0F1CD32}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{E44E20C1-1D79-49EE-A44E-3208D7C0AB49}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.DataQuickStart\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{BA9CE954-CC1E-4A8C-9AD5-E4A773242D09}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.DataQuickStart\test\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart\test
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{3AB6811B-92B2-46F1-98F1-EA0F0B84E196}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.AppContext\Spring.IocQuickStart.AppContext.build
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{FBC19861-623F-4B92-9ECF-FEBD47DA4AC9}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.AppContext\Spring.IocQuickStart.AppContext.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C47FA07F-CB64-4C9B-B31E-2469BA86C4E8}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.AppContext\Spring.IocQuickStart.AppContext.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{ED12CCAD-D43C-4CA0-B6FF-6EF6F1288B75}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.AppContext\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{EA3B37A7-6C0A-4E39-BD02-FFD9DE8A1425}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.EventRegistry\Spring.IocQuickStart.EventRegistry.build
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{3AB54DCB-499F-4F7C-9916-6FB2B8D7F427}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.EventRegistry\Spring.IocQuickStart.EventRegistry.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{248669E3-3B34-44F8-B5C6-D19512FAB392}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.EventRegistry\Spring.IocQuickStart.EventRegistry.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{ECA4D720-A9AA-41B4-8487-336179456282}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.EventRegistry\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C2B8D56A-7A67-454D-8DFE-8FA17FCA47F8}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.MovieFinder\Spring.IocQuickStart.MovieFinder.build
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{5A098B01-9784-414B-8B43-F702421DA9F3}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.MovieFinder\Spring.IocQuickStart.MovieFinder.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{A38A7B60-A88E-4D09-A49E-0CBA4B8272EB}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.MovieFinder\Spring.IocQuickStart.MovieFinder.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{37F91F10-6667-4967-B167-6CEABB7620C6}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.MovieFinder\lib\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder\lib
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{2B9C2915-A46E-4301-B118-787D8E969E9E}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.IoCQuickStart.MovieFinder\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{24393453-7A7C-4DC8-ADD6-44945E073D70}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{97F657B1-22D5-4F55-9D77-8F7D23F8DD0D}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{AC02E50D-0805-4672-B66E-42BC308B57E6}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.TxQuickStart\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{10A30C9B-AB0E-4622-B39F-2058816C8AC9}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.TxQuickStart\test\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart\test
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{40E187E4-9812-43DF-BB93-F2729EC5F519}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Web.Extensions.Example\Spring.Web.Extensions.Example.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.Web.Extensions.Example
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{3EDD2AA2-2F08-414A-BD66-37240675D6DC}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.Web.Extensions.Example\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.Web.Extensions.Example\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C8FC0883-E862-4A8F-8421-CEA1AF318888}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.WebQuickStart\Spring.WebQuickStart.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\Spring.WebQuickStart
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{93CF5997-A66F-4AA4-AAF5-BBAAD4F951E6}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\Spring.WebQuickStart\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\Spring.WebQuickStart\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C63FE01E-7752-4B7B-9C32-AC04B4547229}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\SpringAir.build
+FALSE|
+$TARGETDIR$\examples\Spring\SpringAir
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{92F5D05F-D8AA-4996-A5BC-84A8C0CD8C31}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\SpringAir.2005.sln
+FALSE|
+$TARGETDIR$\examples\Spring\SpringAir
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C3F2E78C-8C6E-41DE-8F22-3CEAFC16702E}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\SpringAir.2003.sln
+FALSE|
+$TARGETDIR$\examples\Spring\SpringAir
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{A55D92B4-821D-4AF4-92A1-EAC924FDEA79}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\readme.txt
+FALSE|
+$TARGETDIR$\examples\Spring\SpringAir
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{D9204FF3-BEC7-47FD-9F8B-FA65852C8244}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\data\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\SpringAir\data
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{FBE8A4BD-F1AD-4CDC-9BCE-6FFEB7BE5B16}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\src\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\SpringAir\src
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{152AD548-99D6-4A5C-8941-2D3353EBF9E2}
+L:\projects\Spring.Net\build\package\Spring.NET\examples\Spring\SpringAir\test\*.*
+TRUE|
+$TARGETDIR$\examples\Spring\SpringAir\test
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{94C4A1C7-4455-4C07-81BF-1C839F22E7AA}
+L:\projects\Spring.Net\build\package\Spring.NET\test\*.*
+TRUE|
+$TARGETDIR$\test
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{EB267C6B-3753-4884-A293-FA6D434C721A}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\images\*.*
+TRUE|
+$TARGETDIR$\doc\reference\html\images
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{581B8426-13B8-4FFD-BF40-DDF1B9D8259E}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\ado.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{6E07EA6C-1806-4732-AEAA-38BD6DE47E2B}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\ajax.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{3EC1445C-8366-4C5C-AAF5-4D4149AB4B41}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\aop.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{59850623-26EC-4194-89A6-F30061F5062E}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\aop-aspect-library.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{719DFB9B-4E0F-45F5-AD4E-2C5BA47C906D}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\aop-quickstart.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{A63461BB-D0E3-4619-8E23-A94309008D35}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\background.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{0348BC02-8BDA-4CA5-AAEB-712972834273}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\dao.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{CE3DC0F6-F7EC-4D75-A549-21987A274057}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\data-quickstart.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{711AF477-C59C-4C49-BFA1-67FF06A2645C}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\dbprovider.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{F62CCF0B-9819-449B-8F57-1AFBB40ADE4B}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\expressions.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{E2EB93C1-70A8-49D7-9267-B08DC1139F9F}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{ECBC6F47-D172-4FC2-A5ED-C126CCCD170C}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index-core.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{69CFC4AE-2A91-41B9-A624-39408E9577AA}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index-javadevelopers.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{FAACD365-EC26-49B2-8BAC-04BF168C0512}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index-middle-tier.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{141FD384-7BE4-44B4-9396-2266E446C2B7}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index-quickstarts.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{762D6DFD-3E0F-4F1D-A04F-8BC7247205F9}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index-services.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{FF09C170-EE49-491E-B2D4-47DDA6BE2922}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\index-vsnet.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C11FD511-7C71-4098-89B8-73A9B96AEA44}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\introduction.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{31D2EF1E-5B69-4D49-BBAC-99B96E76669B}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\javadevelopers.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{1BF8EC9F-BF4D-4D26-9898-9F9F1EDFF353}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\logging.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{976658BC-A4FA-4B70-9291-19184485261A}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\migration.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{F5A36399-5FAC-4B74-BA14-77A64C844745}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\misc.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{F7D1C08F-E9AE-4A5A-ABDE-8E581D873E96}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\objects.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{65953F22-79D4-4DD3-A6FF-BC4CDD729792}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\objects-misc.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{51A49E15-23E3-4559-817C-C38F389C3C72}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\orm.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{2A9B2662-0E11-4C5C-AF7F-742D1174ED14}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\pool.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{ADEE302B-F212-4751-8B50-EB8EAC9C8EFB}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\preface.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{2CD3CFCE-81DE-4466-AED7-12B2BDECA087}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\pt03.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{585B4721-E2A3-404D-ACC0-EB6296E0E695}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\quickstarts.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{465057F2-972D-4BAA-B6AD-BC8442E847CC}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\remoting.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{23190313-3FA0-4237-8068-921135E8CCAF}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\remoting-quickstart.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{ECEAFDB1-38CE-4456-959F-8BCB7F8AB42C}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\resources.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{EDB712F1-60F1-4B32-A175-B958981EDD88}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\services.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C0815807-26C9-4C9B-AE4E-689621CF85A8}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\springair.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{AD1DA31F-EF7B-4BD9-AED9-254542C97BF6}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\springobjectsxsd.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{963CBCD6-CE3E-4D95-88EA-98B57180790C}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\testing.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{7D3AD7A9-DE39-4DFE-855D-D8E2EBC56EFE}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\threading.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{5DFAB593-E7EA-48F4-A54C-79D401A27AFF}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\transaction.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{2FB2EC42-3861-4FE2-A94F-1D019ED05E48}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\tx-quickstart.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{AB970539-32D3-4FB3-A98D-21247FF2E81B}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\validation.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{7DBC25B6-F82B-428C-853F-B2ED542DD7BB}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\vsnet.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{D6C99305-1C60-444F-B81F-6EC6846E0DF9}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\web.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C298BCA5-F5D8-4EF6-8AB9-9C5371DFB610}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\web-quickstart.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{D887138C-5E08-47C4-8A51-53A8F714EFB7}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\webservices.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{0F86BF0F-F836-4FF4-B8AA-B7A826981964}
+L:\projects\Spring.Net\build\package\Spring.NET\Spring.Net.1.1.2002.sln
+FALSE|
+$TARGETDIR$
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{57BA5F33-63DD-4884-ABAD-ADC55B447BCA}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\extensible-xml.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{C5A04B8A-7853-4B45-92F3-E831B4C67BF9}
+L:\projects\Spring.Net\build\package\Spring.NET\doc\reference\html\xsd-config.html
+FALSE|
+$TARGETDIR$\doc\reference\html
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+FALSE
+{F3D1B9D2-7A04-44B6-9F91-860D3A2384C0}
+$UNINSTALLLINK$
+Uninstall Spring.NET 1.1.2
+$SHORTCUTFOLDER$
+Removes this Interface21 product
+
+
+
+
+0
+{074A5CF9-90CF-405D-82D3-6FEE0690119C}
+$TARGETDIR$\readme.txt
+View readme
+$SHORTCUTFOLDER$
+View the readme file
+
+
+
+
+0
+{432A824B-4E2F-4901-AEAB-DEB65367D193}
+$TARGETDIR$\Spring.Net.1.1.2003.sln
+.NET 1.1 Solution
+$SHORTCUTFOLDER$\Source Code
+
+
+
+
+
+0
+{DE5B6D64-509C-4FC7-BE75-F9B569E4B1B6}
+$TARGETDIR$\Spring.Net.1.1.2005.sln
+.NET 2.0 Solution
+$SHORTCUTFOLDER$\Source Code
+
+
+
+
+
+0
+{EE9964D4-1BF6-48BE-BD08-1AA41E6CECD9}
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart\Spring.AopQuickStart.2005.sln
+AOP
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{24BB4CEB-C041-4023-A448-3AE725EAEAC5}
+$TARGETDIR$\examples\Spring\Spring.AopQuickStart\Spring.AopQuickStart.2003.sln
+AOP
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{3A2D9F38-3C4C-4909-BD58-F94AE94D60A6}
+$TARGETDIR$\examples\Spring\Spring.Calculator\Spring.Calculator.2005.sln
+Calculator
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{689F4852-777B-4865-B493-F42F05CF3EFA}
+$TARGETDIR$\examples\Spring\Spring.Data.NHibernate.Northwind\Spring.Northwind.sln
+Northwind NHibernate
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{55E0BEAD-43B8-4A0F-A94C-D5D23B3C9250}
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2005.sln
+Data Access
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{A9984778-D722-4BD6-9599-A6E2CA5FDE13}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext\Spring.IocQuickStart.AppContext.2005.sln
+Application Context
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{F8AA2809-D6D7-40DD-A34D-7C77EC57F208}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry\Spring.IocQuickStart.EventRegistry.2005.sln
+Event Registry
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{B9024C07-45AD-45A5-B551-D70AF8A241A4}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder\Spring.IocQuickStart.MovieFinder.2005.sln
+Movie Finder
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{CE007102-289B-4AAD-ACC0-78947B9FA68C}
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2005.sln
+Transactions
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{F43AAB92-2311-4285-95F5-FBD2503543C3}
+$TARGETDIR$\examples\Spring\Spring.Web.Extensions.Example\Spring.Web.Extensions.Example.2005.sln
+AJAX
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{E521F49A-503D-4708-9B8C-5F8D68D75CDC}
+$TARGETDIR$\examples\Spring\Spring.WebQuickStart\Spring.WebQuickStart.2005.sln
+Web
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{57388F2C-8AAE-468A-92AC-C6CADBAC344C}
+$TARGETDIR$\examples\Spring\SpringAir\SpringAir.2005.sln
+Spring Air
+$SHORTCUTFOLDER$\Examples\.NET 2.0
+
+
+
+
+
+0
+{0727C634-3C1B-445F-B8BE-C7D2D4E56FAB}
+$TARGETDIR$\examples\Spring\Spring.Calculator\Spring.Calculator.2003.sln
+Calculator
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{F2F64080-E757-42C5-B023-C2B72DED1066}
+$TARGETDIR$\examples\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2003.sln
+Data Access
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{58C976E0-0F30-4334-AD68-90C293A50E8C}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.AppContext\Spring.IocQuickStart.AppContext.2003.sln
+Application Context
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{5BC2F138-2564-4ADC-9606-8EE54694D6A3}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.EventRegistry\Spring.IocQuickStart.EventRegistry.2003.sln
+Event Registry
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{5105D931-6D6C-406C-9820-D47CAEDA5C68}
+$TARGETDIR$\examples\Spring\Spring.IoCQuickStart.MovieFinder\Spring.IocQuickStart.MovieFinder.2003.sln
+Movie Finder
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{33BBA500-00B2-4FB1-9535-C74505BFBE15}
+$TARGETDIR$\examples\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2003.sln
+Transactions
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{D1099A76-F2D4-4ED8-9FF8-0CCC28759A8A}
+$TARGETDIR$\examples\Spring\SpringAir\SpringAir.2003.sln
+SpringAir
+$SHORTCUTFOLDER$\Examples\.NET 1.1
+
+
+
+
+
+0
+{0EA42729-AF8B-48C6-86E8-D11906E352CE}
+$TARGETDIR$\doc\reference\pdf\spring-net-reference.pdf
+Reference - PDF
+$SHORTCUTFOLDER$\Documentation
+
+
+
+
+
+0
+{33DA50A7-F9E5-4CDA-B812-F54169CA8A89}
+$TARGETDIR$\doc\reference\html\index.html
+Reference - HTML
+$SHORTCUTFOLDER$\Documentation
+
+
+
+
+
+0
+{BEDC79F7-85D3-4837-881A-CF1A07342BB0}
+$TARGETDIR$\doc\reference\htmlhelp\htmlhelp.chm
+Reference - HTMLHELP
+$SHORTCUTFOLDER$\Documentation
+
+
+
+
+
+0
+{94BDA812-5706-4256-BB6A-E8F451677F49}
+$TARGETDIR$\changelog.txt
+View changelog
+$SHORTCUTFOLDER$
+
+
+
+
+
+0
+{29F7BFC5-6D34-4A12-9B34-C5805014863F}
+$TARGETDIR$\license.txt
+View license
+$SHORTCUTFOLDER$
+
+
+
+
+
+0
+{4CB85B60-D0A0-442A-A683-94039B70DDA0}
+$TARGETDIR$\BreakingChanges-1.1.txt
+View breaking changes
+$SHORTCUTFOLDER$
+
+
+
+
+
+0
+{01A1A5C5-4606-4A3B-A1B7-3EB40F900860}
+$TARGETDIR$\Spring.Net.1.0.2002.sln
+.NET 1.0 Solution
+$SHORTCUTFOLDER$\Source Code
+
+
+
+
+
+0
+{0C995B1F-7720-416B-8062-9D30A5BF4199}
+REMOVE=ALL,TRUE,$PRODUCTCODE$,FALSE,,,REMOVEOLD,ERROROLD,TRUE
+mMSI.dll\mMSIExec.dll
+{08508DC4-D337-40B1-93B8-52D813007FB1}
+
+
+FALSE
+{CA8886A7-0940-49AE-8FBF-B6D8857621C3}
+Spring.NET 1.1.2
+Spring.NET 1.1.2.7zip
+FALSE
+{1D2C9F3A-3B3F-4046-8FC7-86624108C2B2}
+Welcome Dialog
+{0EB6104E-73F2-4562-B9A5-D4CCCAA77D07}
+License Check
+{799297B7-F787-4C53-B04B-D884C74F885E}
+ReadMe Information
+{0391C72A-9386-4E58-B69A-CDA4F54F217F}
+User Registration
+{04063350-70E9-4E12-AF22-3963C42B1E60}
+Setup Type
+{A171750B-636E-46EB-A82D-AD3081D1E86E}
+Custom Setup
+{2A369571-BD93-4C90-92E6-9BA8BA06AA56}
+Destination Directory
+{291FFEAD-958D-468E-850E-01B8A64FA4C2}
+Start Menu
+{DD1FC87B-3855-4370-8F31-64FDF70E4466}
+Start Installation
+{D878A48E-1DC5-45C8-B282-0E36EA6D3473}
+Maintenance
+{43606175-29DB-4E0B-A271-A349EC540ADE}
+Main Install
+{C435DFAE-2EF8-4D28-A93F-3683596F4C3B}
+Maintenance
+{1F8EF880-D9B8-4C12-B266-347647DE74EF}
+Main Install
+{E1E3E44C-9A28-48CC-9811-B4F8546B03E1}
+Welcome Dialog
+{D0462D17-8893-4A99-B803-CEED288F68EB}
+Main Install
+{A68F2EC8-98DD-40D3-8FF3-B8F5BDED323D}
+License Check
+{1B6047FE-C9FB-4C1B-864E-AF9A7AB0BA0E}
+Main Install
+{30103E98-4AC5-4ED0-B524-7CC586B358ED}
+ReadMe Information
+{1D0C8CC9-2523-41E9-96E0-3BA9F5B6AB8D}
+Main Install
+{E68D3F7A-911E-4FDD-934A-9DFFD6AC3A7B}
+User Registration
+{5F0100BF-0D58-4492-A8AD-FDC458184AB5}
+Main Install
+{3C96C8AA-EC8E-476E-8B5A-BD00441FE51E}
+Setup Type
+{6E485127-81F0-4E78-A715-542B9BAC5541}
+Main Install
+{7BA3F47A-8115-4048-B47F-54FB1C8B39D2}
+Custom Setup
+{CF8730FE-B482-4030-9CBC-A32BCF9032A5}
+Main Install
+{DFF6C745-2E12-471A-BF81-EB166CA8B45E}
+Destination Directory
+{DA5F72B1-1E28-4654-89F4-2F5D09CB8A58}
+Main Install
+{85FC71FC-25EA-4ACB-B2ED-DCB1818F0810}
+Start Menu
+{19B13FAF-F05D-4522-8258-31C76DF9D915}
+Welcome Dialog
+{A6F2320E-A194-482A-A13B-8446A653F1BE}
+Main Install
+{6AE77CFC-DF7B-48CC-BA55-7417EA654C3F}
+SUCCESS
+{9FF95FFA-C00A-4F12-B05E-DB5ED37B659C}
+TRUE
+Check Application Requirements
+{A4EDA82B-1FE9-4E39-AD3E-B88DCA4DBCC2}
+FALSE
+
+{B9949A57-3226-461B-910B-04EED077BFD2}
+TRUE
+Check/Install Application Pre-Requisites
+{CDBD7138-E76A-4A1F-A427-97837EAF89CB}
+TRUE
+Check Application Pre-Requisites
+{DCC35A72-84BC-4C7A-97BA-17F3C2C6B183}
+FALSE
+
+{CFCA2177-B5D4-4498-9341-74DA4A2BF10E}
+TRUE
+Install Application Pre-Requisites
+{34379777-3444-4208-B99D-DE846461A34C}
+FALSE
+
+{BEE14656-9B19-4E10-A494-FC09B7BE2537}
+FALSE
+
+{543486BF-8C7F-46E6-B5E4-AF60671E5A79}
+TRUE
+Define Setup Globals
+{8B8FFBAD-57B5-4C26-8914-C49244985EAB}
+FALSE
+
+{44378BF2-B6DF-4AD7-871D-466D3AE158D3}
+TRUE
+Setup User Interview
+{55A2971A-4283-43A2-933F-94C005EBB5C3}
+FALSE
+
+{A4D3550A-6E2F-44F0-9AA2-CB3F558E5B28}
+TRUE
+Process (Un)Installation
+{4BF2B76B-F5F9-4D46-BF67-779EE7EB56FA}
+TRUE
+Perform Uninstallation
+{6A1EEA3F-4B75-4692-A758-01F3B78BE905}
+FALSE
+
+{8F5BEE7A-98A2-44E5-BB76-A2B68E108C87}
+TRUE
+Perform First Time or Maintenance Installation
+{3F6CFDF8-C369-4201-B7C7-B62C128726AA}
+FALSE
+
+{95AC3B82-B9FF-420D-A6B3-E7BBCBDF456B}
+FALSE
+
+{BDE0D739-0CDF-4BF6-8DB9-B7A1B2D0B60C}
+TRUE
+Finish Setup
+{B847DB01-7EB5-49CE-88E9-0C4CA4A16D67}
+FALSE
+
+$
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+C
+
+
+
+C
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+C
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+$
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+$
diff --git a/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mia.brk b/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mia.brk
new file mode 100644
index 00000000..4d83659e
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mia.brk
@@ -0,0 +1,416 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mia.fld b/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mia.fld
new file mode 100644
index 00000000..c5a3448a
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mia.fld
@@ -0,0 +1,8 @@
+Check Application Requirements
+Check/Install Application Pre-Requisites
+Check Application Pre-Requisites
+Install Application Pre-Requisites
+Define Setup Globals
+Setup User Interview
+Perform Uninstallation
+Finish Setup
diff --git a/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mpr b/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mpr
new file mode 100644
index 00000000..39889927
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mpr
@@ -0,0 +1,500 @@
+Spring.NET-1.1.mia
+componentstree.dfm
+componentstree.dfm.miaf
+destination.dfm
+destination.dfm.miaf
+finish.dfm
+finish.dfm.miaf
+licensecheck.dfm
+licensecheck.dfm.miaf
+maintenance.dfm
+maintenance.dfm.miaf
+prereq.dfm
+prereq.dfm.miaf
+progress.dfm
+progress.dfm.miaf
+progressprereq.dfm
+progressprereq.dfm.miaf
+readme.dfm
+readme.dfm.miaf
+registration.dfm
+registration.dfm.miaf
+registrationwithserial.dfm
+registrationwithserial.dfm.miaf
+setuptype.dfm
+setuptype.dfm.miaf
+startinstallation.dfm
+startinstallation.dfm.miaf
+startmenu.dfm
+startmenu.dfm.miaf
+welcome.dfm
+welcome.dfm.miaf
+wizard.dfm
+wizard.dfm.miaf
+$
+icon.ico
+$
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+$
+$
+1
+4
+FALSE
+L:\projects\Spring.Net\msi
+SpringSource
+Spring.NET 1.1.2
+{4D418DBC-09E3-4265-ABBC-541C5610C3F0}
+{E4E36CA4-CA2E-4C28-9231-B76761E9D614}
+1.1.2
+English
+Spring.NET 1.1.2
+Spring.NET 1.1.2 Installation
+Spring.NET authors
+All rights reserved
+{868E6709-F92E-4EA6-BBED-63D32EF7EEA4}
+Spring.NET
+Spring.NET
+http://forum.springframework.net
+http://www.springframework.net
+All rights reserved
+FALSE
+Spring.NET-1.1.2
+TRUE
+FALSE
+
+
+http://timestamp.verisign.com/scripts/timstamp.dll
+
+
+$
+$
+
+
+Service Pack
+FALSE
+FALSE
+FALSE
+TRUE
+TRUE
+FALSE
+FALSE
+FALSE
+
+$
+FALSE
+
diff --git a/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mpr.bak b/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mpr.bak
new file mode 100644
index 00000000..44769465
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/Spring.NET-1.1.mpr.bak
@@ -0,0 +1,500 @@
+Spring.NET-1.1.mia
+componentstree.dfm
+componentstree.dfm.miaf
+destination.dfm
+destination.dfm.miaf
+finish.dfm
+finish.dfm.miaf
+licensecheck.dfm
+licensecheck.dfm.miaf
+maintenance.dfm
+maintenance.dfm.miaf
+prereq.dfm
+prereq.dfm.miaf
+progress.dfm
+progress.dfm.miaf
+progressprereq.dfm
+progressprereq.dfm.miaf
+readme.dfm
+readme.dfm.miaf
+registration.dfm
+registration.dfm.miaf
+registrationwithserial.dfm
+registrationwithserial.dfm.miaf
+setuptype.dfm
+setuptype.dfm.miaf
+startinstallation.dfm
+startinstallation.dfm.miaf
+startmenu.dfm
+startmenu.dfm.miaf
+welcome.dfm
+welcome.dfm.miaf
+wizard.dfm
+wizard.dfm.miaf
+$
+icon.ico
+$
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+$
+$
+1
+4
+FALSE
+L:\projects\Spring.Net\msi
+SpringSource
+Spring.NET 1.1.2
+{4D418DBC-09E3-4265-ABBC-541C5610C3F0}
+{E4E36CA4-CA2E-4C28-9231-B76761E9D614}
+1.1.2
+English
+Spring.NET 1.1.2
+Spring.NET 1.1.2 Installation
+Spring.NET authors
+All rights reserved
+{A32AB277-1F77-4A4D-BF8C-23EA049EA2F6}
+Spring.NET
+Spring.NET
+http://forum.springframework.net
+http://www.springframework.net
+All rights reserved
+FALSE
+Spring.NET-1.1.2
+TRUE
+FALSE
+
+
+http://timestamp.verisign.com/scripts/timstamp.dll
+
+
+$
+$
+
+
+Service Pack
+FALSE
+FALSE
+FALSE
+TRUE
+TRUE
+FALSE
+FALSE
+FALSE
+
+$
+FALSE
+
diff --git a/build-support/installer/installaware/Spring.NET-1.1/componentstree.dfm b/build-support/installer/installaware/Spring.NET-1.1/componentstree.dfm
new file mode 100644
index 00000000..f8190feb
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/componentstree.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/componentstree.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/componentstree.dfm.miaf
new file mode 100644
index 00000000..e69de29b
diff --git a/build-support/installer/installaware/Spring.NET-1.1/destination.dfm b/build-support/installer/installaware/Spring.NET-1.1/destination.dfm
new file mode 100644
index 00000000..371d3049
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/destination.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/destination.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/destination.dfm.miaf
new file mode 100644
index 00000000..e69de29b
diff --git a/build-support/installer/installaware/Spring.NET-1.1/finish.dfm b/build-support/installer/installaware/Spring.NET-1.1/finish.dfm
new file mode 100644
index 00000000..0cb0eeb5
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/finish.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/finish.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/finish.dfm.miaf
new file mode 100644
index 00000000..34895796
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/finish.dfm.miaf
@@ -0,0 +1,17 @@
+IF (checkSuccess.Caption = COMPLETE)  THEN  textComplete.Visible := True;
+IF (checkSuccess.Caption = REBOOT)  THEN  textReboot.Visible := True;
+IF (checkSuccess.Caption = CANCEL)  THEN  textCancelled.Visible := True;
+IF (checkSuccess.Caption = ERROR)  THEN  textError.Visible := True;
+IF (checkRemove.Caption = TRUE)  THEN  textRemove.Visible := True;
+IF (checkSuccess.Caption <> COMPLETE)  THEN  textComplete.Visible := False;
+IF (checkSuccess.Caption <> REBOOT)  THEN  textReboot.Visible := False;
+IF (checkSuccess.Caption <> CANCEL)  THEN  textCancelled.Visible := False;
+IF (checkSuccess.Caption <> ERROR)  THEN  textError.Visible := False;
+IF (checkRemove.Caption <> TRUE)  THEN  textRemove.Visible := False;
+IF (checkRemove.Caption = TRUE)  THEN  textComplete.Visible := False;
+IF (checkSuccess.Caption = CANCEL)  THEN  textRemove.Visible := False;
+IF (textReboot.Visible = True)  THEN  textRemove.Visible := false;
+IF (textComplete.Visible = True)  THEN  textRemove.Visible := false;
+IF (textError.Visible = True)  THEN  textRemove.Visible := false;
+IF (textCancelled.Visible = True)  THEN  textRemove.Visible := false;
+IF (checkSuccess.Caption = ERROR)  THEN  textRemove.Visible := False;
diff --git a/build-support/installer/installaware/Spring.NET-1.1/icon.ico b/build-support/installer/installaware/Spring.NET-1.1/icon.ico
new file mode 100644
index 00000000..cd7967e6
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/icon.ico differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/licensecheck.dfm b/build-support/installer/installaware/Spring.NET-1.1/licensecheck.dfm
new file mode 100644
index 00000000..bf044f56
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/licensecheck.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/licensecheck.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/licensecheck.dfm.miaf
new file mode 100644
index 00000000..7ccb1346
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/licensecheck.dfm.miaf
@@ -0,0 +1,2 @@
+IF (LicenseCheck.Checked = True)  THEN  Next.Enabled := True;
+IF (LicenseCheck.Checked = False)  THEN  Next.Enabled := False;
diff --git a/build-support/installer/installaware/Spring.NET-1.1/mMSIExec.dll b/build-support/installer/installaware/Spring.NET-1.1/mMSIExec.dll
new file mode 100644
index 00000000..a8289b96
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/mMSIExec.dll differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/maintenance.dfm b/build-support/installer/installaware/Spring.NET-1.1/maintenance.dfm
new file mode 100644
index 00000000..63f493b2
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/maintenance.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/maintenance.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/maintenance.dfm.miaf
new file mode 100644
index 00000000..e69de29b
diff --git a/build-support/installer/installaware/Spring.NET-1.1/prereq.dfm b/build-support/installer/installaware/Spring.NET-1.1/prereq.dfm
new file mode 100644
index 00000000..39f57028
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/prereq.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/prereq.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/prereq.dfm.miaf
new file mode 100644
index 00000000..c6e2d632
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/prereq.dfm.miaf
@@ -0,0 +1,6 @@
+IF (checkWINST.Caption <> TRUE)  THEN  WINST.Visible := True;
+IF (checkJS.Caption <> TRUE)  THEN  JS.Visible := True;
+IF (checkDotNET.Caption <> TRUE)  THEN  dotNET.Visible := True;
+IF (checkWINST.Caption = TRUE)  THEN  WINST.Visible := False;
+IF (checkDotNET.Caption = TRUE)  THEN  dotNET.Visible := False;
+IF (checkJS.Caption = TRUE)  THEN  JS.Visible := False;
diff --git a/build-support/installer/installaware/Spring.NET-1.1/progress.dfm b/build-support/installer/installaware/Spring.NET-1.1/progress.dfm
new file mode 100644
index 00000000..443f8669
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/progress.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/progress.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/progress.dfm.miaf
new file mode 100644
index 00000000..f69a5df2
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/progress.dfm.miaf
@@ -0,0 +1,4 @@
+IF (TestRemove.Caption <> TRUE)  THEN  CaptionInstall.Visible := True;
+IF (TestRemove.Caption = TRUE)  THEN  CaptionUninstall.Visible := True;
+IF (TestRemove.Caption <> TRUE)  THEN  CaptionUninstall.Visible := False;
+IF (TestRemove.Caption = TRUE)  THEN  CaptionInstall.Visible := False;
diff --git a/build-support/installer/installaware/Spring.NET-1.1/progressprereq.dfm b/build-support/installer/installaware/Spring.NET-1.1/progressprereq.dfm
new file mode 100644
index 00000000..182f5d5f
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/progressprereq.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/progressprereq.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/progressprereq.dfm.miaf
new file mode 100644
index 00000000..e69de29b
diff --git a/build-support/installer/installaware/Spring.NET-1.1/readme.dfm b/build-support/installer/installaware/Spring.NET-1.1/readme.dfm
new file mode 100644
index 00000000..5cf56f6b
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/readme.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/readme.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/readme.dfm.miaf
new file mode 100644
index 00000000..7ccb1346
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/readme.dfm.miaf
@@ -0,0 +1,2 @@
+IF (LicenseCheck.Checked = True)  THEN  Next.Enabled := True;
+IF (LicenseCheck.Checked = False)  THEN  Next.Enabled := False;
diff --git a/build-support/installer/installaware/Spring.NET-1.1/registration.dfm b/build-support/installer/installaware/Spring.NET-1.1/registration.dfm
new file mode 100644
index 00000000..da6fa199
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/registration.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/registration.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/registration.dfm.miaf
new file mode 100644
index 00000000..968dd502
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/registration.dfm.miaf
@@ -0,0 +1,4 @@
+IF (Name.Text <> )  THEN  Next.Enabled := True;
+IF (Company.Text <> )  THEN  Next.Enabled := True;
+IF (Name.Text = )  THEN  Next.Enabled := False;
+IF (Company.Text = )  THEN  Next.Enabled := False;
diff --git a/build-support/installer/installaware/Spring.NET-1.1/registrationwithserial.dfm b/build-support/installer/installaware/Spring.NET-1.1/registrationwithserial.dfm
new file mode 100644
index 00000000..722d2a23
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/registrationwithserial.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/registrationwithserial.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/registrationwithserial.dfm.miaf
new file mode 100644
index 00000000..4e4af64a
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/registrationwithserial.dfm.miaf
@@ -0,0 +1,14 @@
+IF (Name.Text <> )  THEN  Next.Enabled := True;
+IF (Company.Text <> )  THEN  Next.Enabled := True;
+IF (Serial1.Text <> )  THEN  Next.Enabled := True;
+IF (Serial2.Text <> )  THEN  Next.Enabled := True;
+IF (Serial3.Text <> )  THEN  Next.Enabled := True;
+IF (Serial4.Text <> )  THEN  Next.Enabled := True;
+IF (Serial5.Text <> )  THEN  Next.Enabled := True;
+IF (Name.Text = )  THEN  Next.Enabled := False;
+IF (Company.Text = )  THEN  Next.Enabled := False;
+IF (Serial1.Text = )  THEN  Next.Enabled := False;
+IF (Serial2.Text = )  THEN  Next.Enabled := False;
+IF (Serial3.Text = )  THEN  Next.Enabled := False;
+IF (Serial4.Text = )  THEN  Next.Enabled := False;
+IF (Serial5.Text = )  THEN  Next.Enabled := False;
diff --git a/build-support/installer/installaware/Spring.NET-1.1/setuptype.dfm b/build-support/installer/installaware/Spring.NET-1.1/setuptype.dfm
new file mode 100644
index 00000000..8d3caa4a
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/setuptype.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/setuptype.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/setuptype.dfm.miaf
new file mode 100644
index 00000000..e69de29b
diff --git a/build-support/installer/installaware/Spring.NET-1.1/startinstallation.dfm b/build-support/installer/installaware/Spring.NET-1.1/startinstallation.dfm
new file mode 100644
index 00000000..29c8ed52
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/startinstallation.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/startinstallation.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/startinstallation.dfm.miaf
new file mode 100644
index 00000000..e69de29b
diff --git a/build-support/installer/installaware/Spring.NET-1.1/startmenu.dfm b/build-support/installer/installaware/Spring.NET-1.1/startmenu.dfm
new file mode 100644
index 00000000..53ae879d
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/startmenu.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/startmenu.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/startmenu.dfm.miaf
new file mode 100644
index 00000000..bb3a2f01
--- /dev/null
+++ b/build-support/installer/installaware/Spring.NET-1.1/startmenu.dfm.miaf
@@ -0,0 +1,4 @@
+IF (MenuGroup.Text <> )  THEN  Next.Enabled := True;
+IF (MenuGroup.Text = )  THEN  Next.Enabled := False;
+IF (ISNT.Caption = TRUE)  THEN  AllUsers.Enabled := True;
+IF (ISNT.Caption <> TRUE)  THEN  AllUsers.Enabled := False;
diff --git a/build-support/installer/installaware/Spring.NET-1.1/welcome.dfm b/build-support/installer/installaware/Spring.NET-1.1/welcome.dfm
new file mode 100644
index 00000000..bf1e5cad
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/welcome.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/welcome.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/welcome.dfm.miaf
new file mode 100644
index 00000000..e69de29b
diff --git a/build-support/installer/installaware/Spring.NET-1.1/wizard.dfm b/build-support/installer/installaware/Spring.NET-1.1/wizard.dfm
new file mode 100644
index 00000000..2ff70aa8
Binary files /dev/null and b/build-support/installer/installaware/Spring.NET-1.1/wizard.dfm differ
diff --git a/build-support/installer/installaware/Spring.NET-1.1/wizard.dfm.miaf b/build-support/installer/installaware/Spring.NET-1.1/wizard.dfm.miaf
new file mode 100644
index 00000000..e69de29b
diff --git a/build-support/tools/NAnt.NUnit2OutProc.Task/NAnt.NUnit2OutProcTasks.dll b/build-support/tools/NAnt.NUnit2OutProc.Task/NAnt.NUnit2OutProcTasks.dll
new file mode 100644
index 00000000..6a669fcc
Binary files /dev/null and b/build-support/tools/NAnt.NUnit2OutProc.Task/NAnt.NUnit2OutProcTasks.dll differ
diff --git a/build-support/tools/antlr-2.7.6/antlr-2.7.6.exe b/build-support/tools/antlr-2.7.6/antlr-2.7.6.exe
new file mode 100644
index 00000000..038e7653
Binary files /dev/null and b/build-support/tools/antlr-2.7.6/antlr-2.7.6.exe differ
diff --git a/build-support/tools/antlr-2.7.6/antlr.jar b/build-support/tools/antlr-2.7.6/antlr.jar
new file mode 100644
index 00000000..3702b645
Binary files /dev/null and b/build-support/tools/antlr-2.7.6/antlr.jar differ
diff --git a/build-support/tools/antlr-2.7.6/charset.dll b/build-support/tools/antlr-2.7.6/charset.dll
new file mode 100644
index 00000000..6fdc358b
Binary files /dev/null and b/build-support/tools/antlr-2.7.6/charset.dll differ
diff --git a/build-support/tools/antlr-2.7.6/libiconv-2.dll b/build-support/tools/antlr-2.7.6/libiconv-2.dll
new file mode 100644
index 00000000..b53575f1
Binary files /dev/null and b/build-support/tools/antlr-2.7.6/libiconv-2.dll differ
diff --git a/build-support/tools/nunit/.cvsignore b/build-support/tools/nunit/.cvsignore
new file mode 100644
index 00000000..7ddf2f76
--- /dev/null
+++ b/build-support/tools/nunit/.cvsignore
@@ -0,0 +1,2 @@
+nunit-console-*
+
diff --git a/build-support/tools/nunit/nunit-console-net-1.0.exe b/build-support/tools/nunit/nunit-console-net-1.0.exe
new file mode 100644
index 00000000..998bae2c
Binary files /dev/null and b/build-support/tools/nunit/nunit-console-net-1.0.exe differ
diff --git a/build-support/tools/nunit/nunit-console-net-1.0.exe.config b/build-support/tools/nunit/nunit-console-net-1.0.exe.config
new file mode 100644
index 00000000..a321ee53
--- /dev/null
+++ b/build-support/tools/nunit/nunit-console-net-1.0.exe.config
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<configuration>
+    <!--
+     Application settings for NUnit-console.exe. Do NOT put settings
+	 for use by your tests here.
+	-->
+  <appSettings>
+
+	<!--
+	 Specify the location to be used by .NET for the cache
+	-->
+    <add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
+  
+  </appSettings>
+  
+    <!-- 
+     The startup section may be used to specify the runtime versions 
+     supported in the order that they will be used if more than one
+     is present. As supplied, this section is commented out, which
+     causes nunit-console to use the version of the framework with
+     which it was built.
+  	 
+	 Since .NET 1.0 does not recognize the <supportedRuntime> elements,
+	 a <requiredRuntime> element is used in case it is the only version
+	 of the framework that is installed.
+    -->
+    <!--
+  <startup>
+	  <supportedRuntime version="v2.0.50727" />
+	  <supportedRuntime version="v2.0.50215" />
+	  <supportedRuntime version="v2.0.40607" />
+	  <supportedRuntime version="v1.1.4322" />
+	  <supportedRuntime version="v1.0.3705" />
+	
+	  <requiredRuntime version="v1.0.3705" />
+  </startup>
+  -->
+
+   <!--
+    The following <runtime> section allows running nunit under 
+    .NET 1.0 by redirecting assemblies. The appliesTo attribute
+    causes the section to be ignored except under .NET 1.0version 1
+    on a machine with only the .NET version 1.0 runtime installed.
+    If application and its tests were built for .NET 1.1 you will
+    also need to redirect system assemblies in the test config file.
+   -->
+  
+ <runtime>
+
+   <legacyUnhandledExceptionPolicy enabled="1" />
+
+   <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
+			appliesTo="v1.0.3705">
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Data" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Drawing" 
+                          publicKeyToken="b03f5f7f11d50a3a" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Windows.Forms" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Xml" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+    </assemblyBinding>
+
+  </runtime>
+  
+</configuration>
\ No newline at end of file
diff --git a/build-support/tools/nunit/nunit-console-net-1.0.pdb b/build-support/tools/nunit/nunit-console-net-1.0.pdb
new file mode 100644
index 00000000..49c8275c
Binary files /dev/null and b/build-support/tools/nunit/nunit-console-net-1.0.pdb differ
diff --git a/build-support/tools/nunit/nunit-console-net-1.1.exe b/build-support/tools/nunit/nunit-console-net-1.1.exe
new file mode 100644
index 00000000..520bc38e
Binary files /dev/null and b/build-support/tools/nunit/nunit-console-net-1.1.exe differ
diff --git a/build-support/tools/nunit/nunit-console-net-1.1.exe.config b/build-support/tools/nunit/nunit-console-net-1.1.exe.config
new file mode 100644
index 00000000..a321ee53
--- /dev/null
+++ b/build-support/tools/nunit/nunit-console-net-1.1.exe.config
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<configuration>
+    <!--
+     Application settings for NUnit-console.exe. Do NOT put settings
+	 for use by your tests here.
+	-->
+  <appSettings>
+
+	<!--
+	 Specify the location to be used by .NET for the cache
+	-->
+    <add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
+  
+  </appSettings>
+  
+    <!-- 
+     The startup section may be used to specify the runtime versions 
+     supported in the order that they will be used if more than one
+     is present. As supplied, this section is commented out, which
+     causes nunit-console to use the version of the framework with
+     which it was built.
+  	 
+	 Since .NET 1.0 does not recognize the <supportedRuntime> elements,
+	 a <requiredRuntime> element is used in case it is the only version
+	 of the framework that is installed.
+    -->
+    <!--
+  <startup>
+	  <supportedRuntime version="v2.0.50727" />
+	  <supportedRuntime version="v2.0.50215" />
+	  <supportedRuntime version="v2.0.40607" />
+	  <supportedRuntime version="v1.1.4322" />
+	  <supportedRuntime version="v1.0.3705" />
+	
+	  <requiredRuntime version="v1.0.3705" />
+  </startup>
+  -->
+
+   <!--
+    The following <runtime> section allows running nunit under 
+    .NET 1.0 by redirecting assemblies. The appliesTo attribute
+    causes the section to be ignored except under .NET 1.0version 1
+    on a machine with only the .NET version 1.0 runtime installed.
+    If application and its tests were built for .NET 1.1 you will
+    also need to redirect system assemblies in the test config file.
+   -->
+  
+ <runtime>
+
+   <legacyUnhandledExceptionPolicy enabled="1" />
+
+   <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
+			appliesTo="v1.0.3705">
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Data" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Drawing" 
+                          publicKeyToken="b03f5f7f11d50a3a" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Windows.Forms" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Xml" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+    </assemblyBinding>
+
+  </runtime>
+  
+</configuration>
\ No newline at end of file
diff --git a/build-support/tools/nunit/nunit-console-net-1.1.pdb b/build-support/tools/nunit/nunit-console-net-1.1.pdb
new file mode 100644
index 00000000..ad7dabcd
Binary files /dev/null and b/build-support/tools/nunit/nunit-console-net-1.1.pdb differ
diff --git a/build-support/tools/nunit/nunit-console-net-2.0.exe b/build-support/tools/nunit/nunit-console-net-2.0.exe
new file mode 100644
index 00000000..e2fa7db7
Binary files /dev/null and b/build-support/tools/nunit/nunit-console-net-2.0.exe differ
diff --git a/build-support/tools/nunit/nunit-console-net-2.0.exe.config b/build-support/tools/nunit/nunit-console-net-2.0.exe.config
new file mode 100644
index 00000000..a321ee53
--- /dev/null
+++ b/build-support/tools/nunit/nunit-console-net-2.0.exe.config
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<configuration>
+    <!--
+     Application settings for NUnit-console.exe. Do NOT put settings
+	 for use by your tests here.
+	-->
+  <appSettings>
+
+	<!--
+	 Specify the location to be used by .NET for the cache
+	-->
+    <add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
+  
+  </appSettings>
+  
+    <!-- 
+     The startup section may be used to specify the runtime versions 
+     supported in the order that they will be used if more than one
+     is present. As supplied, this section is commented out, which
+     causes nunit-console to use the version of the framework with
+     which it was built.
+  	 
+	 Since .NET 1.0 does not recognize the <supportedRuntime> elements,
+	 a <requiredRuntime> element is used in case it is the only version
+	 of the framework that is installed.
+    -->
+    <!--
+  <startup>
+	  <supportedRuntime version="v2.0.50727" />
+	  <supportedRuntime version="v2.0.50215" />
+	  <supportedRuntime version="v2.0.40607" />
+	  <supportedRuntime version="v1.1.4322" />
+	  <supportedRuntime version="v1.0.3705" />
+	
+	  <requiredRuntime version="v1.0.3705" />
+  </startup>
+  -->
+
+   <!--
+    The following <runtime> section allows running nunit under 
+    .NET 1.0 by redirecting assemblies. The appliesTo attribute
+    causes the section to be ignored except under .NET 1.0version 1
+    on a machine with only the .NET version 1.0 runtime installed.
+    If application and its tests were built for .NET 1.1 you will
+    also need to redirect system assemblies in the test config file.
+   -->
+  
+ <runtime>
+
+   <legacyUnhandledExceptionPolicy enabled="1" />
+
+   <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"
+			appliesTo="v1.0.3705">
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Data" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Drawing" 
+                          publicKeyToken="b03f5f7f11d50a3a" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Windows.Forms" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+      <dependentAssembly> 
+        <assemblyIdentity name="System.Xml" 
+                          publicKeyToken="b77a5c561934e089" 
+                          culture="neutral"/>
+        <bindingRedirect  oldVersion="1.0.5000.0" 
+                          newVersion="1.0.3300.0"/>
+      </dependentAssembly>
+
+    </assemblyBinding>
+
+  </runtime>
+  
+</configuration>
\ No newline at end of file
diff --git a/build-support/tools/nunit/nunit-console-net-2.0.pdb b/build-support/tools/nunit/nunit-console-net-2.0.pdb
new file mode 100644
index 00000000..9379ebd0
Binary files /dev/null and b/build-support/tools/nunit/nunit-console-net-2.0.pdb differ
diff --git a/build-support/tools/nunit/nunit-console-runner.dll b/build-support/tools/nunit/nunit-console-runner.dll
new file mode 100644
index 00000000..0b6c40f9
Binary files /dev/null and b/build-support/tools/nunit/nunit-console-runner.dll differ
diff --git a/build-support/tools/nunit/nunit.core.dll b/build-support/tools/nunit/nunit.core.dll
new file mode 100644
index 00000000..3f06941f
Binary files /dev/null and b/build-support/tools/nunit/nunit.core.dll differ
diff --git a/build-support/tools/nunit/nunit.core.extensions.dll b/build-support/tools/nunit/nunit.core.extensions.dll
new file mode 100644
index 00000000..9802e811
Binary files /dev/null and b/build-support/tools/nunit/nunit.core.extensions.dll differ
diff --git a/build-support/tools/nunit/nunit.core.interfaces.dll b/build-support/tools/nunit/nunit.core.interfaces.dll
new file mode 100644
index 00000000..aca4c6d5
Binary files /dev/null and b/build-support/tools/nunit/nunit.core.interfaces.dll differ
diff --git a/build-support/tools/nunit/nunit.fixtures.dll b/build-support/tools/nunit/nunit.fixtures.dll
new file mode 100644
index 00000000..c0fae594
Binary files /dev/null and b/build-support/tools/nunit/nunit.fixtures.dll differ
diff --git a/build-support/tools/nunit/nunit.framework.dll b/build-support/tools/nunit/nunit.framework.dll
new file mode 100644
index 00000000..42cc12cf
Binary files /dev/null and b/build-support/tools/nunit/nunit.framework.dll differ
diff --git a/build-support/tools/nunit/nunit.framework.extensions.dll b/build-support/tools/nunit/nunit.framework.extensions.dll
new file mode 100644
index 00000000..27568460
Binary files /dev/null and b/build-support/tools/nunit/nunit.framework.extensions.dll differ
diff --git a/build-support/tools/nunit/nunit.mocks.dll b/build-support/tools/nunit/nunit.mocks.dll
new file mode 100644
index 00000000..b50197b0
Binary files /dev/null and b/build-support/tools/nunit/nunit.mocks.dll differ
diff --git a/build-support/tools/nunit/nunit.uikit.dll b/build-support/tools/nunit/nunit.uikit.dll
new file mode 100644
index 00000000..5c36138f
Binary files /dev/null and b/build-support/tools/nunit/nunit.uikit.dll differ
diff --git a/build-support/tools/nunit/nunit.util.dll b/build-support/tools/nunit/nunit.util.dll
new file mode 100644
index 00000000..0a70c4d5
Binary files /dev/null and b/build-support/tools/nunit/nunit.util.dll differ
diff --git a/changelog.txt b/changelog.txt
new file mode 100644
index 00000000..de25eec2
--- /dev/null
+++ b/changelog.txt
@@ -0,0 +1,959 @@
+SPRING.NET FRAMEWORK CHANGELOG
+==============================
+http://www.springframework.net
+
+Release 1.1.2, May 6, 2008
+
+Bug
+
+[SPRNET-930] - Validation user controls not rendering errors.
+[SPRNET-931] - PreviousPage property is not set correctly during Server.Transfer
+
+Improvement
+
+[SPRNET-558] - Enable Data Validation and Model Management for UserControl
+[SPRNET-785] - SessionScope / OSIV should obtain 1 EntityInterceptor per Session instance
+[SPRNET-926] - Add PessimisticLockingFailureException as base class for CannotAcquireLockException, CannotSerializeTransactionException, and DeadlockLoserDataAccessException.
+[SPRNET-927] - NHibernate Exception mapping improvements.
+[SPRNET-932] - Create signed DLLs in debug build configuration
+[SPRNET-933] - Support MethodInjection for objects declared inside the WebApplicationContext
+[SPRNET-935] - Release DLLs built with /DEBUG:pdbonly
+[SPRNET-937] - Add additional logging of cache inserts in Cache advice.
+
+Task
+
+[SPRNET-925] - Update documentation for DI in ASP.NET regarding use of name attribute and object definition inheritance
+[SPRNET-938] - Add documentation for authoring custom namespace parsers
+
+
+
+Release 1.1.1, April 7, 2008
+
+Bug
+
+[SPRNET-394] - Fix recursive calls to Context.GetRegistry()
+[SPRNET-538] - Binding fails with binding to property of nullable type
+[SPRNET-570] - ObjectNameAutoProxyCreator incompatible with NHibernate.LocalSessionFactoryObject 
+[SPRNET-576] - Allow formatting null values for .NET 2.0 Nullable Types
+[SPRNET-755] - SpEL method invocation fails if the same expression instance is used with two different context types
+[SPRNET-607] - TypeAliasConfigurer does not work in Spring.Web applications
+[SPRNET-818] - Provide .NET TypeConverter for ITransactionAttribute
+[SPRNET-820] - spring:CheckBoxList doesn't allow for <asp:ListItem> children
+[SPRNET-821] - HttpRequestBindingContainer can't bind to checkboxes
+[SPRNET-827] - TypedDataSetUtils should use IDbCommand instead of provider specified SqlDbCommand.
+[SPRNET-829] - Named constructor argument metadata should be stored/compared using consistent CultureInfo
+[SPRNET-838] - 404 exception handling in NET 1.1 does not work as expected / differs from standard behaviour
+[SPRNET-845] - OSIV/SessionScope generates the wrong key for EntityInterceptorObjectName
+[SPRNET-846] - ProxyFactory allows for advisors being added twice
+[SPRNET-847] - Implementations of AbstractPointcurAdvisor.Equals() and .GetHashCode() are wrong
+[SPRNET-852] - Creating a custom attribute did not take into account public field values that match the named arguments in the attribute declaration.
+[SPRNET-853] - Throw HibernateSystemException (part of Spring's DAO exception hierarchy) when can not translate inner exception in NHibernate.ADOException
+[SPRNET-854] - Fix NullReferenceException in HibernateAccessor when SqlString in ADOException is null. 
+[SPRNET-860] - Placeholders not resolved in name-values element 
+[SPRNET-861] - Couldn't resolve internal properties in Strong Typed resources in Web Application
+[SPRNET-862] - Resolve object references that use the Spring expression language while parsing config files
+[SPRNET-871] - GenericApplicationContext.ctor(IApplicationContext) always throws NullReferenceException
+[SPRNET-872] - Resolve WebResources relative to HttpContext.Current.Request.FilePath
+[SPRNET-873] - ReadCommitted was misspelled in spring-tx-1.1.xsd
+[SPRNET-874] - Null reference accessing TransactionSynchronizationManager.CurrentTransactionIsolationLevel when no Spring managed transaction is active
+[SPRNET-877] - IConfigurableFactoryObject instance cannot be proxied with the AOP auto proxy functionality
+[SPRNET-880] - Logging exception handler should continue processing of exception handler chain.
+[SPRNET-882] - Test "ExistsValidHttp" fails 
+[SPRNET-886] - IInitializingObject isn't honored in case of calls to ConfigureObject()
+[SPRNET-891] - Failure to create hiearchical context with depth greater than two.
+[SPRNET-893] - Retry advice goes into infinite loop when exception type not listed in advice is thrown
+[SPRNET-902] - DbProvider ExtractError method should explicitly perform ToString operation on object returned from SpEL expression to obtain error code
+[SPRNET-908] - ReflectionUtils.MethodIsOnOneOfTheseInterfaces does not correctly iterate over multiple interface types
+[SPRNET-920] - AbstractObjectFactory.GetObject(name,requiredType,arguments) does not propagate 'requiredType' and 'arguments' ParentObjectFactory
+
+Improvement
+
+[SPRNET-531] - It is not possible to call Page.SetResult() outside the page (e.g. from a Control)
+[SPRNET-558] - Enable Data Validation and Model Management  for UserControl
+[SPRNET-559] - Change ValidationError control to enable Message resolution for UserControl
+[SPRNET-762] - De-couple the url from the actual object definition name in WebServiceExporter
+[SPRNET-772] - Distribute Northwind sql server 2005 data files to provide easy 'out-of-the-box' running of NHibernate example application.
+[SPRNET-783] - Take TypeConverters into account in SpEL numeric aggregate functions
+[SPRNET-785] - SessionScope / OSIV should obtain 1 EntityInterceptor per Session instance
+[SPRNET-799] - Add support for IBinding.SetMessage() to DataBindingPanel
+[SPRNET-814] - Improve Spring.Web DataBinding error handling ("SetErrorMessage()") documentation
+[SPRNET-824] - Make WebApplicationContext and WebObjectFactory accessible from non Web threads
+[SPRNET-830] - Improved performance in Spring.Data by optimizing reflection calls.
+[SPRNET-835] - Add additional convenience method to set TableAdapter transaction/connection properties using DbProvider.
+[SPRNET-841] - Add option to specify external hibernate configuration files (hibernate.cfg.xml) in LocalSessionFactoryObject
+[SPRNET-842] - Using DbProvider to configure LocalSessionFactory object will by default integrate with NHibernate's 'external connection' management feature
+[SPRNET-855] - Update Oracle error code mapping to include ORA-2292 as a DataIntegrityViolationCodes 
+[SPRNET-856] - Add 03000 as BadSqlGrammarCode and 40001 as CannotSerializeTransactioncode for Postgress providers.
+[SPRNET-857] - Improved MySql provider error code mappings for DataIntegrityViolationCodes
+[SPRNET-858] - Added IDbProvider implementation, UserCredentialsDbProvider, to allow changing of username, password connection strings at runtime.
+[SPRNET-859] - Add addtional constructor to MultiDelegatingDbProvider that takes dictionary of target name/providers.
+[SPRNET-864] - Add additional result mapping variable prefix what will not clash with PropertyPlaceholderConfigurer
+[SPRNET-867] - Add line number to top level error message when there are XML parsing errors.
+[SPRNET-879] - LocalSessionFactoryObject can configure ISessionFactory to use Spring's IDbProvider as a NHibernate ConnectionProvider
+[SPRNET-887] - Add support for asp:HiddenField in DataBindingPanel
+[SPRNET-897] - Allow binding/unbding string.Empty to nullable types
+[SPRNET-898] - Add additional ICollectionProcessors to SpEL
+[SPRNET-901] - Extend SpEL selection with mysql-like LIMIT functionality
+[SPRNET-905] - RollbackRuleAttribute checks for null Type and null or empty string in constructor
+[SPRNET-906] - Build scripts generate unique revision numbers for assemblies
+[SPRNET-910] - Updated DB2 codes for exception translation
+[SPRNET-913] - Add convenience method in Spring.Web.UI.Page/UserControl to navigate to a Result using a user provided object for result expression evaluation.
+[SPRNET-914] - Add convenience method to get the Spring.Web.UI.Page Result as a url
+[SPRNET-915] - Add additional CannotSerializeTransactionCodes for Oracle providers
+[SPRNET-916] - Add additional BadSqlGrammarCode for Postgres
+[SPRNET-917] - Add additonal db error codes for exception translation for Oracle and MySql providers
+[SPRNET-918] - Add property to enable/disable logging of return value in SimpleLoggingAdvice
+[SPRNET-919] - Update NHibernate sample application to use NHibernate 1.2.1
+
+New Feature
+
+[SPRNET-892] - Introduce <spring:Panel> control for finer grained control over when to perform DI on user controls
+[SPRNET-907] - Add Required attribute and RequiredObjectFactoryPostProcessor, allowing to enforce required object properties
+[SPRNET-911] - Provide ParameterValidationAdvice to use validation framework to validate method arguments.
+
+Task
+
+[SPRNET-587] - Add example of validation usage in middle tier services
+[SPRNET-689] - Add more documentation describing ITransactionAttributeSource implementations.
+[SPRNET-775] - Document using a custom IFactoryObject to help with configuring embedded resources
+[SPRNET-780] - Valdiation example for ASP.NET refers to wrong namespace.
+[SPRNET-809] - Update to NHibernate 1.2.1
+[SPRNET-819] - Add Multiselection samples (CheckListBox, ListBox) to WebQuickStart DataBindingPanel sample
+[SPRNET-826] - Add section about manually registering objects with the container ("registersingleton" etc.)
+[SPRNET-831] - SpringAir html doesn't pass VS2005 default validation (not xhtml transitional)
+[SPRNET-849] - Add "SetErrorMessage" sample to Data Binding section in reference docs
+[SPRNET-865] - Add Documention for the expression attribute.
+[SPRNET-866] - Support .NET 1.1 for NHibernate 1.2
+[SPRNET-875] - Documentation incorrectly lists Unspecified as default isolation level, should be ReadCommitted.
+[SPRNET-885] - Add doc for <spring:Panel> server control usage
+[SPRNET-909] - Document that WebServiceExporter does not add WebServiceBinding attribute with WSI basic profile 1.1 by default.
+
+
+
+Release 1.1 final, December 7, 2007
+
+Bug
+
+[SPRNET-448] - TransactionTimeout setting not being applied correctly. 
+[SPRNET-453] - ConversionUtils should use ConvertFromInvariantString if failed to convert string value. 
+[SPRNET-511] - UrlResource Exists only returns true for file:// 
+[SPRNET-606] - Problems with Attributes in proxy generation 
+[SPRNET-719] - PropertyPlaceholderConfigurer does not replace property values in <list element-type=${prop}> 
+[SPRNET-723] - Head control renders not XHTML valid script tag 
+[SPRNET-752] - Implement advanced DataSet related methods in AdoTemplate 
+[SPRNET-759] - Wrong assembly named used to configure NHibernate12's SessionFactory property ExposeTransactionAwareSessionFactory 
+[SPRNET-760] - StoredProcedure.DeclaredParameters.AddOut("A", OracleType.Cursor); causes double ':' in Oracle10g stored procedure call 
+[SPRNET-761] - Fix use of Nested Transactions in TxScopeTransactionManager. 
+[SPRNET-767] - Generic AdoTemplate CommandTimeout property does not set corresponding ClassicAdoTemplate property 
+[SPRNET-769] - Resume and throw exception if exception is thrown at start of transaction. 
+[SPRNET-770] - Nested RequiresNew propagaion options not working in AdoPlatformTransaction manager . 
+[SPRNET-778] - AdoExceptionTranslator in HibernateTransactionManager did not have a default value 
+[SPRNET-779] - NHibernateTransactionManager can not convert AdoAcessException 
+[SPRNET-796] - AdoTemplate not using DbMetadata for CommandBuilderDeriveParamtersMethod 
+[SPRNET-800] - SimpleLoggingAdvice does not correctly check for logging level other than trace. 
+[SPRNET-802] - Default IsolationLevel should be ReadCommitted. 
+
+Improvement
+
+
+[SPRNET-497] - Print 'resultName's value if Page.SetResult() is called with a non-existant result name 
+[SPRNET-514] - dbproviders.xml configuration should allow for an optional 'DeriveParameters' method. 
+[SPRNET-555] - Improve ResourceSetMessageSource documentation and add example for ASP.NET 2.0 
+[SPRNET-756] - Add protected method to ErrorCodeExceptionTranslator to allow for a subclass to first attempt exception translation. 
+[SPRNET-766] - Add support for Sybase provider 
+[SPRNET-768] - Add support for ODBC provider 
+[SPRNET-774] - Add Designmode support for DataBindingPanel 
+[SPRNET-793] - Add Execute methods missing in Generic.AdoTemplate but present in non-generic version. 
+[SPRNET-797] - Make it such that DefaultTransactionStatus property Rollback can only be set to true 
+[SPRNET-803] - Allow web service base type to be configurable in WebServiceExporter. 
+
+Task
+
+[SPRNET-203] - Add test coverage for Spring.Net Web module 
+[SPRNET-217] - QuickStart documents for Spring.Air 
+[SPRNET-421] - Document programmatic use of data validation framework 
+[SPRNET-457] - ErrorCode translation can produce extraneous UncategorizedDataAccessException 
+[SPRNET-516] - Improve documentation on Spring.Data DataSet functionality 
+[SPRNET-574] - NHibernate and custom loader 
+[SPRNET-590] - Include use of Spring's implementation of NHibernate's ICurrentSessionContext in demo appliation. 
+[SPRNET-610] - AOP documentation improvements 
+[SPRNET-682] - Change vs.net 2002 solution to be Spring.Net.1.1.2002.sln 
+[SPRNET-708] - Remove "UniqueID" based usercontrol DI sample from web reference docs 
+[SPRNET-726] - Improve Spring.Data.NHibernate docs w.r.t FlushMode.Never in OSIV 
+[SPRNET-744] - update assembly version numbers to current builds in dbproviders.xml 
+[SPRNET-764] - NUnit 2.4.3 GUI-runner not executing Spring.Testing.NUnit based tests linked to NUnit 2.4.1. 
+[SPRNET-773] - Unit tests for ServiceDomainTransactionManager 
+[SPRNET-776] - Unit tests for AdoPlatformTransactionManager 
+[SPRNET-777] - Provide 10,000 ft intro page on spring.net features on web site 
+[SPRNET-781] - Add new providers added to dbproviders.xml to spring-dataase-1.1.xsd 
+[SPRNET-786] - Fix Spring.Data related projects in Spring VS2003 solution 
+[SPRNET-787] - add examples for DataBindingPanel to WebQuickStart 
+[SPRNET-788] - integrate Spring.Web.Tests with NUnitAspEx to support real HttpRuntime-integrated tests 
+[SPRNET-798] - Add overview documentation from web site into reference docs 
+
+Release 1.1 RC2, October 15, 2007
+
+(Note: A bug in the dbproviders.xml file was discovered shortly after the initial release of 1.1 RC2.  A new version was uploaded with the same name.  This should not present a problem, but if you have trouble creating an OracleODP-2.0 provider, please download again as it may take up to a day for the proxy servers to get updated)
+
+Bug 
+
+[SPRNET-297] - Cannot proxy ODP.NET OracleConnection 
+[SPRNET-500] - ProxyFactoryObject attempts to add all interfaces target implements even if ProxyInterfaces property is set 
+[SPRNET-659] - Page doesn't allow to specify neutral cultures for CultureResolver 
+[SPRNET-664] - Add description and show usage of Spring's WebSupportModule to documentation. 
+[SPRNET-667] - Update Common.Logging documentation to point to NetCommon sourceforge project web site. 
+[SPRNET-684] - Remove duplicate logging when completing transaction after thrown exception. 
+[SPRNET-685] - Rethrow exception during transaction manager rollback or commit and log correctly. 
+[SPRNET-686] - CacheResultAdvice should cache 'null' return values 
+[SPRNET-687] - AspNetCache does not differentiate cache-keys if several instances with different names exist 
+[SPRNET-688] - Registered transaction syncrhonizations should not have to implement IComparator. Add support for implemented Spring's IOrdered interface (optional). 
+[SPRNET-690] - AbstractSpringContextTests is not caching ApplicationContexts 
+[SPRNET-692] - Incorrect metadata in dbproviders.xml for parameterDbTypeProperty for OracleODP-2.0 
+[SPRNET-696] - AbstractMessageSource messes parameters when calling ParentMessageSource 
+[SPRNET-704] - UserControl's SharedState doesn't reload after changing/recompiling .ascx file 
+[SPRNET-706] - Page.DataBound and Page.DataUnbound events are only raised if Binding collection is not empty 
+[SPRNET-709] - SpEL fails evaluating expression 
+[SPRNET-710] - DotNetMock based AbstractMessageSourceTests and MessageSourceAccessorTests have both "false positives" and "false negatives" 
+[SPRNET-714] - SessionFactory not bound to thread local storage if DbProvider for HibernateTransactionManager is null 
+[SPRNET-715] - SpringSessionSynchronization did not close hibernate session with a nested transaction with TransactionPropagation.NotSupported 
+[SPRNET-716] - Create new session if thread local storage SessionHolder is marked as SyncrhonizedWithTransaction. 
+[SPRNET-721] - Intercept all target interfaces when using an introduction with ObjectNameAutoProxyCreator 
+[SPRNET-722] - ReflectionUtils.getMostSpecificMethod() throws exception when handling Generic methods with the same parameter signature and different generic types 
+[SPRNET-725] - Concurrency problem with Spring.Expressions.PropertyOrFieldNode.Set()/.Get() 
+[SPRNET-727] - MethodMatchTransactionAttributeSource does not correctly return transaction attributes on candidate target object if method registered using MethodInfo object is based on an interface 
+[SPRNET-728] - Add missing ExecuteFind<T> method on IHibernateOperations interface 
+[SPRNET-731] - OSIV configuration doesn't work as described in reference docs 
+[SPRNET-733] - PropertyOverrideConfigurer on abstract object definition does not work 
+[SPRNET-734] - Northwind FulfillmentServiceTests are broken 
+[SPRNET-739] - fix NHibernate12 solution + nant build script 
+[SPRNET-746] - StoredProcedure class doesn't return sproc return value in result dictionary 
+[SPRNET-749] - AdoTempate's QueryCallback did not property extract return or output values from stored procedure. 
+[SPRNET-750] - Add the property UseParameterPrefixInSql to IDbMetadata 
+
+Improvement
+
+[SPRNET-301] - Add IInstantiationAwareObjectPostProcessor functionality 
+[SPRNET-399] - Simplify custom config parser registration 
+[SPRNET-454] - PropertyPlaceholderConfigurer should be able to modify the values within expression elements 
+[SPRNET-485] - Add logging of transaction definition name and description when creating new transaction. 
+[SPRNET-486] - Provide better logging information in TransactionSynchronizationManager to identify ConnectionHolder, DbProvider and thread name 
+[SPRNET-679] - ResourceManagerConverter should throw a sensible exception in case of missing App_GlobalResources 
+[SPRNET-683] - Change type of "TimeToLive" parameter in ICache.Insert from int to TimeSpan 
+[SPRNET-697] - Refactor SessionScope initialization strategy 
+[SPRNET-705] - Page.SharedState must be discarded by PageHandler after .aspx recompile 
+[SPRNET-712] - Change ICache interface to be the least common denominator of potential cache implementations 
+[SPRNET-717] - Add default transaction timeout property on AbstractPlatformTransactionManager 
+[SPRNET-718] - Make node classes in SpEL public to allow for node traveral. 
+[SPRNET-720] - Change ObjectNameAutoProxyCreator default behavior to proxy the product of a IFactoryObject and not the IFactoryObject itself 
+[SPRNET-729] - Improve API documentation in NHibernate12 project using comment-checker program 
+[SPRNET-730] - Make current AppDomain's config file the default for RemotingConfigurer if filename==null 
+[SPRNET-732] - CollectionValidator should allow validation of any IEnumerable type 
+[SPRNET-740] - SpEL doesn't accept unicode characters 
+[SPRNET-742] - Exception handling aspect supports using SpEL expression as filtering condition as alternative to use of exception name. 
+[SPRNET-745] - Improved PropertyOverrideConfigurer to support 'ref' and 'expression' values override 
+
+
+New Feature
+
+[SPRNET-344] - Add the ability to bind to collections to data binding framework 
+[SPRNET-614] - Logging aspect based on Common.Logging 
+[SPRNET-693] - Add MultiDelegatingDbProvider to main distribution to support easy access to multiple databases selected at runtime. 
+[SPRNET-748] - Retry Advice 
+
+Task
+
+[SPRNET-495] - Add information on how to configure Spring under IIS7 to reference documentation 
+[SPRNET-544] - Update to use Common.Logging 1.2 
+[SPRNET-736] - Remove NHibernate integrations from CVS Integration module 
+[SPRNET-738] - Document configuring aop Namespace parser 
+[SPRNET-747] - Add description of how to do assembly redirects for database assemblies. 
+
+Release 1.1 RC1, August 10, 2007
+
+Summary:  Feature and bug fix release
+
+Bug
+
+[SPRNET-452] - Improve application context configuration error handling 
+[SPRNET-475] - ContextRegistry.GetContext() should print a detailed error 
+[SPRNET-583] - WebApplicationContext.Refresh() should be thread-safe 
+[SPRNET-607] - TypeAliasConfigurer does not work 
+[SPRNET-641] - MessageSource related code does not consistently use CultureInfo.CurrentUICulture as default 
+[SPRNET-642] - ObjectFactory must not call 'ObjectType' or 'GetObject()' of an IFactoryObject before calling IInitializingObject.AfterPropertiesSet() 
+[SPRNET-643] - ApplicationContextAwareProcessor and ObjectPostProcessorChecker may be registered twice on AbstractApplicationContext.Refresh() 
+[SPRNET-649] - AbstractLocalizer should by default use Thread.CurrentUICulturer instead of CurrentCulture 
+[SPRNET-650] - Introductions with AutoProxy 
+[SPRNET-655] - Proxy a Proxy where class explicitly implements interfaces with same method names and signatures 
+[SPRNET-658] - Npgsql-1.0 provider has incorrect configuration for parameter name prefix 
+[SPRNET-662] - DynamicMethod will call target method twice is target throws InvalidCastException 
+[SPRNET-666] - Change Log4NetFactoryObject to LogFactoryObject in documentation for IFactoryObject implementations (4.3.6) 
+[SPRNET-671] - Possible Null reference in HibernateAccessor.PrepareQuery 
+[SPRNET-675] - SpEL does not allow access to private/protected indexer 
+[SPRNET-677] - ReflectionUtils.GetMethodByArgumentValues() does not choose an exact overload match if available 
+
+Improvement
+
+[SPRNET-443] - Add support for SqlLite in DbProviders.xml 
+[SPRNET-461] - Support accessing WebApplicationContext from asynchronous worker threads 
+[SPRNET-469] - Add Generics support in Spring.Data.Object.* classes (e.g. support IRowMapper<T>) 
+[SPRNET-478] - Enhance the use of multiple object definition parsers 
+[SPRNET-481] - DelegateFactoryObject/MethodInvokingFactoryObject does not support generic methods 
+[SPRNET-490] - Make Model persistence customizable in Spring.Web.UI.Page 
+[SPRNET-565] - TxScopePlatformTransaction manager to support EnterpriseServicesInteropOption 
+[SPRNET-578] - Additional documentation for IVariableSource 
+[SPRNET-585] - Change spring-database.xsd to use 'provider' instead of 'dbprovider' element since it looks redundant in usage, i.e <db:dbProvider> instead of <db:provider> 
+[SPRNET-603] - Ignore missing local resources for asp.net 2.0 pages and user controls 
+[SPRNET-635] - Refactor implementation regarding finding correct overloaded factory-method 
+[SPRNET-644] - Make IConfigurableFactoryObject members of WebServiceProxyFactory virtual 
+[SPRNET-648] - Make ResourceSetLocalizer ignore missing invariant resourceset 
+[SPRNET-651] - In Spring.Caching.AspNetCache/Spring.Web replace usages of HttpContext.Current.Cache with HttpRuntime.Cache 
+[SPRNET-654] - Expose method ConfigureObject( name, target, objectDefinition ) on IListableObjectFactory and all implementations 
+[SPRNET-660] - Make configurable the choice of reflection library used in AOP proxies. 
+[SPRNET-661] - Rename CheckBoxListControl -> CheckBoxList and make it a first class citizen for DataBinding 
+[SPRNET-663] - Change signature of IVariableSource to string ResolveVariable(string name) instead of object return value to provide consistent contract with container property replacement.. 
+[SPRNET-665] - Enable RegistryVariableSource to deal with REG_MULTI_SZ and REG_DWORD values 
+[SPRNET-668] - Throw InvalidDataAccessApiUsageException if calling Execute<T>(ICommandCallback<T> action) with a provider whose IDbCommand implementation does not inherit from System.Data.Common.DbCommand. 
+[SPRNET-669] - Provide IDbProvider to IDbCommandCreator callback to simplify implementations that want to create parameters in provider neutral manner. 
+[SPRNET-673] - Rename XmlParserRegistry/IXmlObjectDefinitionParser to NamespaceParserRegistry/INamespaceParser for greater naming consistency. 
+[SPRNET-674] - Renaming/Moving of namespace parsers into Config subnamespace, renaming of *.xsd files to *-1.1.xsd for greater naming consistency 
+[SPRNET-681] - Add support for DB2 iSeries dbprovider. 
+
+New Feature
+
+[SPRNET-549] - Support for setting of TableAdapters transaction property for using typed data sets within a Spring demarcated transactional boundary 
+[SPRNET-556] - Add support for <httpModule> DI 
+[SPRNET-557] - Add DI support asp.net 2.0 intrinsic providers (membership,role,profile,sitemap) 
+[SPRNET-560] - Add custom HtmlForm tag to overcome "action"-Attribute rendering troubles 
+[SPRNET-599] - Create SessionScope based on top of current OSIV functionality 
+[SPRNET-647] - Add TabularMultiView control 
+[SPRNET-676] - Exception handling aspect for simple declarative configuration of common exception handling strategies. 
+
+Task
+
+[SPRNET-434] - Document ResourceHandlersSectionHandler to register custom IResource implementations 
+[SPRNET-439] - Refactor TransactionAspectSupport to use LogicalThreadContext for storage of TransactionInfo 
+[SPRNET-612] - Transaction quick start example to use tx schema and declarative exception handling advice. 
+[SPRNET-638] - Additional documentation regarding how NHibernateSessions are managed by both HibernateTransactionManager and OSIV 
+[SPRNET-646] - Document use of Client Certificates in WebServiceProxyFactory 
+
+Release 1.1 Milestone 2, July 11, 2007
+
+Summary:  Primarily a bug fix release
+
+Bug
+
+[SPRNET-501] - TxScopeTransactionManager's PromotableTxScopeTransactionObject property TransactionScope is always null. 
+[SPRNET-517] - Factory method IoC instantiation is not finding correct overloaded method. 
+[SPRNET-552] - Generic AdoTemplate to support Execute callbacks with IDbCommand as callback argument in addition to current DbCommand callback argument. 
+[SPRNET-613] - Recursive setting of ExposeTransactionAwareSessionFactory property in LocalSessionFactoryObject for NH12 
+[SPRNET-617] - Change aop namespace element from proxy-target-class to proxy-target-type 
+[SPRNET-621] - AbstractMessageSource does not correctly respect 'UseCodeAsDefaultMessage' when used within a hierarchical application context. 
+[SPRNET-624] - Support for nested transactions using TxScopeTransactionManager. 
+[SPRNET-625] - TxScopeTransaction manager did not copy declarative transaction information to TransactionOptions and TransactionScopeOption 
+[SPRNET-630] - AbstractObjectDefinitionReader did not correctly set default IResourceLoader 
+[SPRNET-631] - AdoTemplate.DataSet DataSetCreate(CommandType commandType, string sql, string[] tableNames) not using tableNames parameter 
+[SPRNET-633] - Allow multiple calls to proceed in AOP around advice 
+[SPRNET-634] - AutoProxyCreators does not take into account IFactoryObject when finding candidates advisors/aspects. 
+
+Improvement
+
+[SPRNET-140] - Add IVariableSource and VariablePlaceholderConfigurer allowing property placeholder data to be easily extensible to other data sources.
+[SPRNET-443] - Add support for SqlLite in DbProviders.xml 
+[SPRNET-482] - Update MqSql support to use latest 1.0.9 release 
+[SPRNET-483] - Add support for MySql 1.0.9/5.0/5.1 drivers 
+[SPRNET-586] - Change name of IRowMapper's method argument IDataReader from 'dataReader' to 'reader'
+[SPRNET-608] - Change transaction namespace element from proxy-target-class to proxy-target-type 
+[SPRNET-623] - Add additional functionality to TransactionSynchronizationManager (name, isolation level, etc) to level of Spring Java 2.x 
+[SPRNET-626] - BindingManager Configuration is not reloaded if UserControl or Page is modified 
+[SPRNET-632] - Update to use Common.Logging 1.1 
+[SPRNET-636] - Add provider support for DB2 9.0/9.1 databases 
+[SPRNET-637] - Add provider support for SqlLite database 
+
+
+New Feature
+
+[SPRNET-528] - Add AOP proxy type cache 
+[SPRNET-563] - Add CommonLoggingAroundAdvice in Calculator & Northwind sample 
+[SPRNET-629] - Add GenericApplicationContext to simplify creation of ApplicationContext from any (i.e. non XML) source of ObjectDefinitions 
+
+Task
+
+[SPRNET-253] - Document object scope in web tier. 
+[SPRNET-525] - Document use of InternalsVisibleTo assembly attribute to apply AOP to internal classes.
+[SPRNET-584] - Add AssemblyInfo.cs for those projects under ./src that are missing them in order to have AssemblyTitle and AssemblyDescription set correctly.
+[SPRNET-601] - Add tests for the new ProxyTargetAttributes property (Spring.Proxy and Spring.Aop) 
+[SPRNET-618] - Change MySql.Data.MySqlClient alias to refer to MySql 5.1 provider 
+
+
+
+Release 1.1 Milestone 1, June 1, 2007
+
+Summary:  In addition to bug fixes and various improvements to existing features, this
+release adds integration with NHibernate 1.0 and 1.2, NUnit, and ASP.NET AJAX.  
+Other new features are the introduction of aop and transaction namespace
+to simplify configuration of aop and delcartive transaction managment.  
+
+Bug
+
+[SPRNET-356] - Accessing HttpContext.Cache may throw an exception 
+[SPRNET-384] - Spring.Remoting.RemotingConfigurer.Filename within Windows Service 
+[SPRNET-385] - Cast to IAdvised wrong behavior 
+[SPRNET-391] - Table 4.5. - Duplicate entry 
+[SPRNET-392] - Section 4.5.3. Typos 
+[SPRNET-405] - ApplicationContext.ConfigureObject() doesn't process IApplicationContextAware, IMessageResolvable etc.? 
+[SPRNET-407] - BaseNode is not serializable 
+[SPRNET-420] - Page.IsPostBack is always false during PreInit in NET 1.1 
+[SPRNET-425] - Throw CannotGetAdoConnectionException when not able to retrieve Connection 
+[SPRNET-427] - Different access levels for property getter/setter cause exception 
+[SPRNET-428] - DynamicReflection doesn't work in DEBUG build if reflected properties are defined in transient modules 
+[SPRNET-431] - Concurrency issues in DynamicReflectionManager 
+[SPRNET-435] - Fallback translator should always throw uncategorized exception 
+[SPRNET-436] - Rollback for TxScopeTransactionManager should call TransactionScope.Dispose(), not System.Transactions.Transaction.Current.Rollback() 
+[SPRNET-438] - AdoTemplate QueryWithRowMapperDelegate always returns empty list. 
+[SPRNET-447] - Incorrect class level documentation on Spring.Validation.ExclusiveValidatorGroup 
+[SPRNET-449] - Spring.Util.CachedTypeResolver doesn't synchronize access to it's typecache 
+[SPRNET-450] - Numeric enum values not handled correctly by Spring.Expressions.PropertyOrFieldNode 
+[SPRNET-451] - Improve? support for Nullable Types in Spring.Expressions 
+[SPRNET-455] - Validation does not work properly if at least one error message is not specified 
+[SPRNET-460] - Remove "NotImplementedException" in TxScopeTransactionManager 
+[SPRNET-462] - Method cannot be matched by argument types when null value is passed as an argument 
+[SPRNET-466] - Stored Procedure call throws System.ArgumentOutOfRangeException if no NamedResultSetProcessors are declared. 
+[SPRNET-468] - AdoTemplate.AdoResultProcessorsQueryCommandCallback throws IndexOutOfRangeExeption on empty namedResultSetProcessors list 
+[SPRNET-470] - System.Type properties can't be evaluated by Spring.Expressions 
+[SPRNET-474] - Content (NET 1.1 version) control's "ContentPlaceHolderId" should match NET 2.0 name 
+[SPRNET-476] - Fix Spring.Web runtime setup (LogicalThreadContext, default resource protocol etc.) 
+[SPRNET-477] - ValidationConfigParser doesn't allow for XML comments 
+[SPRNET-479] - AbstractXmlApplicationContext does not correctly dispose an existing ObjectFactory during RefreshObjectFactory() 
+[SPRNET-487] - StoredProcedure doesn't return any rows 
+[SPRNET-489] - Aspects do not work with OUT of REF parameters 
+[SPRNET-494] - PropertyOrFieldNode can't resolve shadowed properties or fields 
+[SPRNET-498] - Make UserControl.Controller property virtual 
+[SPRNET-500] - ProxyFactoryObject attempts to add all interfaces target implements even if ProxyInterfaces property is set 
+[SPRNET-502] - PropertyOrFieldNode.GetPropertyInfo() should change to GetMemberInfo() 
+[SPRNET-505] - Proxies should be decorated with target attributes (type, method, parameter, return value attributes) 
+[SPRNET-509] - Web DI does not work in case of URL-rewriting 
+[SPRNET-515] - Multiple result sets not handled correctly in AdoTemplate in calls to IDictionary Query(...) and IDictionary Query IDictionary QueryByNamedParam(...) 
+[SPRNET-520] - WebServiceProxyFactory throws "MissingMethodException" on non-W3K machines 
+[SPRNET-522] - AOP ProxyFactoryObject seems to lack thread safety 
+[SPRNET-523] - DynamicReflectionManager race condition 
+[SPRNET-526] - ProxyFactoryObject recreates ProxyType on each call to GetObject() if non-singleton 
+[SPRNET-527] - AdvisedSupport lacks synchronization 
+[SPRNET-532] - Spring.Web.UI.Control.Head should derive from System.Web.UI.HtmlControl.HtmlHead for compatibility 
+[SPRNET-534] - When using an Oracle SP that only contains an output parameter through the StoredProcedure class, a System.IndexOutOfRangeException is thrown 
+[SPRNET-535] - Exception handling within AbstractPlatformTransactionManager causes loss of stackinformation 
+[SPRNET-536] - ContentReplacer resolves contentPlaceholderID incorrectly in case of Master templates 
+[SPRNET-537] - DbParametersBuilder did not copy size of each declared parameter when creating final IDbParameter collection 
+[SPRNET-543] - No output parameter is returned when using StoredProcedure with a stored procedure that only returns an output parameter. 
+[SPRNET-551] - DefaultTransactionStatus.HasTransaction() has reversed logic 
+[SPRNET-554] - Add a BooleanFormatter to Spring.Globalization.Formatters 
+[SPRNET-568] - Threading problems with dynamic type generation 
+
+Improvement
+
+[SPRNET-140] - Source of property placeholder data should be extensible. 
+[SPRNET-189] - Code duplication: resolving Ant style properties to environment variables. 
+[SPRNET-364] - ObjectNameAutoProxyCreator support for *xxx* pattern matching of object name in addition to "*xxx" and "xxx*" 
+[SPRNET-402] - Refactor ValidationErrors and delay the resolution of error messages. 
+[SPRNET-403] - Extract GetRedirectUri(object page) method from Result.DoRedirect() so it can be called independently 
+[SPRNET-423] - replace hardcoded html-tags with HtmlTextWriterTag enum values 
+[SPRNET-429] - Replace hardcoded HTML tag names with appropriate constants 
+[SPRNET-437] - Make Spring.Expressions serializable 
+[SPRNET-445] - Enable PropertyPlaceholderConfigurer to use the values from the standard connectionStrings section 
+[SPRNET-446] - Expression Language array initializer should allow for array size to be specified 
+[SPRNET-456] - Add support for set operations (union, intersection, difference) to expression language 
+[SPRNET-459] - Improve ObjectWrapper performance 
+[SPRNET-463] - Make Page / Control BindingManager's CacheKey customizable 
+[SPRNET-464] - Allow for "null" values and variable parameter lists in Spring.Expressions 
+[SPRNET-472] - Add Controller property to UserControl for easier switching databinding target 
+[SPRNET-473] - Allow users to specify root context and variables for the expressions within object definitions 
+[SPRNET-480] - Allow WebServiceClientFactory to generate proxy from a wsdl file 
+[SPRNET-484] - Add error reporting when Common.Logging can't load FactoryAdapter. 
+[SPRNET-496] - AttributeMatchMethodPointcut does not take into account implemented interfaces with method attributes 
+[SPRNET-506] - Introduce notion of templates and product templates within container. 
+[SPRNET-513] - Use of Dynamic Reflection in Spring.Aop 
+[SPRNET-539] - Add additional ctor argument XmlApplicationContext to supress refresh 
+[SPRNET-572] - Example project showing Spring.NET NHibernate features. 
+[SPRNET-581] - Refactor Advisor inheritance hierarchy to sync with Spring Java 2.0 
+[SPRNET-582] - Add custom parser infrastructur classes to aid with parsing of custom namespaces, sync with Spring Java 2.0 
+
+New Feature
+
+[SPRNET-278] - Implement commonly used validators (email, SSN, URL, credit card, etc.) 
+[SPRNET-285] - ASP.NET AJAX integration to allow access in JavaScript to container objects as WebService 
+[SPRNET-408] - Add TypeConverter for Nullable types 
+[SPRNET-430] - Add collection validator to data validation framework 
+[SPRNET-541] - Allow registration of custom resource handlers, type aliases, and type converters within standard <objects> configuration section. 
+[SPRNET-545] - Add Transaction namespace to simplify configuration of declarative transactions 
+[SPRNET-546] - Add AOP namespace to simplify use of AOP. 
+[SPRNET-571] - Add support for using plain NHiberatne API and participating in Spring managed transactions via custom ICurrentSessionContext implementation. 
+[SPRNET-573] - Spring NHibernate support 
+[SPRNET-580] - NUnit integratraion 
+
+Task
+
+[SPRNET-186] - Add Introductions Example to AOP Quickstart 
+[SPRNET-234] - Bundle SpringAir as self contained solution 
+[SPRNET-389] - Change how object id is generated when using ASP.NET pages 
+[SPRNET-400] - Can not run applications if Spring installed in GAC 
+[SPRNET-424] - Create NUnit task that runs in own process. 
+[SPRNET-432] - Remove System.Web dependency from Spring.Core 
+[SPRNET-512] - Merge WebServiceClientFactory & WebServiceProxyFactory 
+[SPRNET-566] - Update to NUnit 2.4.1  
+
+Release 1.1 Preview 3, December 6, 2006
+
+Summary:  This release is contains bug fixes and various improvements to existing features. 
+Major new features such as a Transaction Management Abstraction, ADO.NET data access framework, 
+and Spring "Services" allowing plain .NET objects to be exported as ServicedComponents, 
+Remoted objects, or Web Service.
+
+Bug
+
+[SPRNET-146] - Dependencies not injected into controls within Repeater 
+[SPRNET-225] - A Problem with Javascript and clientID of Master Page form like "Error: Expected ';' " (If use IE) 
+[SPRNET-254] - SpringAir WebServices doesn't work. 
+[SPRNET-260] - Concurent initialization of WebApplicationContext 
+[SPRNET-293] - Support for TransparentProxy in AOP Proxies 
+[SPRNET-294] - Page.PreviousPage.Items contents lost 
+[SPRNET-295] - Using soap header information in an exported PONO doesn't work 
+[SPRNET-315] - Circular reference not detected in web applications 
+[SPRNET-318] - IDisposable singletons with request or session scopr are not disposed of. 
+[SPRNET-319] - TypeConverterRegistry throws ArgumentException for valid converterTypeName 
+[SPRNET-325] - Hierarchical context issue 
+[SPRNET-327] - Objects section have to be named "objects" to be validated. 
+[SPRNET-328] - Converting a string value to IResource during property resolving in a Webapplication uses FileSystemResource 
+[SPRNET-329] - DefaultWebCultureResolver.GetDefaultLocale() throws exception on unknown Browserlanguage 
+[SPRNET-332] - Create a Proxy without Target 
+[SPRNET-333] - Some URLs generated can not be parsed by firefox 
+[SPRNET-334] - missing dependency injection on UserControl.LoadControl() 
+[SPRNET-335] - Duplicate context registration 
+[SPRNET-336] - Hierarchical context issue in Web application. 
+[SPRNET-337] - DataBinding stops working after Spring.Objects.InvalidPropertyException 
+[SPRNET-340] - CompositionProxyBuilder _targetMethods syncronization 
+[SPRNET-341] - AopContext not thread safe 
+[SPRNET-342] - Root context for the expression not updated properly 
+[SPRNET-345] - Base path should be ignored when relative path starts with slash 
+[SPRNET-346] - SessionHolder syncronization 
+[SPRNET-347] - Nested Contexts don't work in Web Applications 
+[SPRNET-350] - DynamicProxy doesn't support generic method declarations 
+[SPRNET-351] - Nested Child Contexts don't work in Web Applications 
+[SPRNET-354] - Update log4net version and use .NET 2.0 version 
+[SPRNET-356] - Accessing HttpContext.Cache may throw an exception 
+[SPRNET-358] - Creation via Factory Method does not support System.Type arguments. 
+[SPRNET-359] - WebObjectFactory and XmlObjectFactory behave differently regarding circular references 
+[SPRNET-360] - CacheAdvice does not take into account the parameters passed to the method 
+[SPRNET-365] - Page DI does not work on Server.Transfer 
+[SPRNET-367] - CaoExporter lifetime properties are not applied to the CAO 
+[SPRNET-368] - AutowireConstructor(string, RootObjectDefinition, object[]) does not work in some cases 
+[SPRNET-369] - Relative resources does not work with WebResource 
+[SPRNET-373] - .aspx, .ascx paths in object-definitions "type"-attribute don't resolve correctly 
+[SPRNET-374] - Use IDictionary.Item property instead of IDictionary.Add method to avoid ArgumentException in Spring.Expressions.PropertyOrFieldNode 
+[SPRNET-376] - ContextRegistry.Clear does not work with contexts registered by configuration 
+[SPRNET-377] - WebServiceHandlerFactory should not treat every Spring object as a Web Service 
+[SPRNET-379] - 'value' Attribute in spring objects schema does not allow empty strings 
+[SPRNET-393] - WebSupportModule throws exception if SessionState is not set to In-Process 
+[SPRNET-398] - Control DI doesn't work if @OutputCache directive is used 
+[SPRNET-413] - Sync issues in Common.Logging Adapter implementations 
+
+
+Improvement
+
+[SPRNET-58] - multi-value support in NameValueCollection 
+[SPRNET-174] - Refactor XmlObjectDefinitionReader inline with changes from Spring 1.2.4 
+[SPRNET-175] - replace log4net with something like SLF4J 
+[SPRNET-249] - Possibility to add other attributes than WebMethodAttribute to the WebServiceExporter 
+[SPRNET-270] - New Data Binding implementation 
+[SPRNET-273] - Spring.Web ASP.NET 2.0-compliant 
+[SPRNET-312] - Preserve exception stack trace in AOP proxy 
+[SPRNET-330] - Duplicate code in WebObjectDefinitionParser.CalculateId() and WebUtils.GetPageName() 
+[SPRNET-331] - FileSystemResource doesn't handle files under contention 
+[SPRNET-352] - Dynamic proxy code refactoring to remove duplicate code 
+[SPRNET-362] - ProxyTypeBuilder should apply target type/method attributes to the generated proxy. 
+[SPRNET-366] - Allow CAO to be disconnected from the client 
+[SPRNET-370] - Add support for cross-application mapping with WebResource 
+[SPRNET-371] - Make use of the newly Spring.Data module in SpringAir sample 
+[SPRNET-375] - Allow regular expression pointcut to specify RegexOptions 
+[SPRNET-380] - Enable data binding within user controls 
+[SPRNET-390] - Add Expressions support from the IoC container 
+[SPRNET-395] - Add the abiliity to configure additional type-level attributes to WebServiceExporter 
+[SPRNET-403] - Extract GetRedirectUri(object page) method from Result.DoRedirect() so it can be called independently 
+[SPRNET-406] - Allow BasePath-Placeholder in "configFile" configuration element for Common.Logging.Log4net.XXX Adapters 
+
+
+New Feature
+
+[SPRNET-35] - Add data validation support to Spring.Web 
+[SPRNET-207] - Dynamic Proxy to create MarshalByRefObject objects 
+[SPRNET-243] - Support hosting of SaoServiceExporter in IIS 
+[SPRNET-267] - Design time support for Spring.Web 
+[SPRNET-269] - Create rendering strategies for validation controls 
+[SPRNET-276] - Add the ability to reference Spring-managed objects to Expression Evaluator 
+[SPRNET-353] - Support ProxyTargetType=true in Aop Proxies 
+[SPRNET-378] - Enable Spring.Expressions to be used for DI 
+[SPRNET-383] - Added RemotingConfigurer convenience class to configure remoting infrastructure from Spring 
+[SPRNET-415] - ADO.NET Data Access Framework 
+[SPRNET-416] - Transaction Management abstraction supporting programmatic and declarative transactions for any persistence technology. 
+[SPRNET-417] - AOP support for for classes with virtual methods/properties 
+[SPRNET-419] - Create Logging framework to remove dependencies on specific log implementation (i.e. log4net) 
+
+Task
+
+[SPRNET-157] - Add XML config snippets chapter to reference documentation 
+[SPRNET-183] - Add IResource documentation chapter 
+[SPRNET-230] - DocBook callouts are broken in PDF stylesheet 
+[SPRNET-253] - Document object scope 
+[SPRNET-280] - Documentation for Validation Framework 
+[SPRNET-284] - Revert to old implementation of WebServiceProxyFactory 
+[SPRNET-321] - Documentation of code examples in C# code needs to be modified in order to conform to Document X! parsing rules. 
+[SPRNET-322] - Remove dependency on Log4Net 
+[SPRNET-323] - Unit tests for AutoProxy functionality 
+[SPRNET-324] - Update to use Antlr.NET 2.7.6 
+[SPRNET-343] - Reset Binding.IsValid to true after processing 
+[SPRNET-382] - Move Spring.Interop from Spring.Services to Spring.Interop.Iiop integration project 
+[SPRNET-397] - Implement expression parser that will allow for simpler attribute definitions in config files 
+[SPRNET-410] - Create vs.net 2003 solution for web quick start 
+[SPRNET-411] - Update docs for bi-direction data binding in Spring.Web 
+[SPRNET-412] - Create docs for Common.Logging 
+[SPRNET-418] - Create Data Access quick start application showing using of Spring.Data ADO.NET framework 
+
+-----------------------------
+
+Release 1.0.2, April 27, 2006
+
+Summary:  This release is contains bug fixes, new features and various improvements to existing features.
+
+Release Notes - Spring.NET - Version 1.0.2
+
+Bug
+[SPRNET-170] - Provide thread safety of IApplicationContext/IObjectFactory when retrieving lazy-init singletons.
+[SPRNET-193] - ResourceSetMessageSource Not Falling Back To Base Resources
+[SPRNET-244] - Registration of custom XML parsers should not use section name starting with 'config'.
+[SPRNET-247] - ExpressionEvaluatorTests class ignores Culture of test box
+[SPRNET-250] - Instrumentation code shouldn't use CutureInfo.CurrentUICulture as a formatter for debug messages
+[SPRNET-256] - Parent objects cannot be referenced via their aliases in child object defintions
+[SPRNET-262] - CopyTo method error in Spring.Collections.LinkedList
+[SPRNET-263] - LinkedList Contains(object value) throws exception if list is empty. Contains(null) also fails.
+
+Improvement
+[SPRNET-179] - Support setting of .NET Generic Collection Properties of type IList, IDictionary
+[SPRNET-261] - StringArrayConverter must not use the ListSeparator of the current Culture
+[SPRNET-275] - Refactor ProxyBuilder code
+[SPRNET-304] - Support concurent access to ContextRegistry.
+[SPRNET-305] - ReflectionUtils.ToInterfaceArray method to take inherited interfaces into account
+[SPRNET-306] - Added bool Contains method to CollectionUtils
+[SPRNET-307] - Changed IApplicationContext.DisplayName property name to IApplicationContext.Name
+[SPRNET-308] - Added ConfigurationUtils to encapsulate configuration framework differences between .NET 1.1 and 2.0 in one place
+[SPRNET-309] - Added TypeConverterRegistry and implemented section handler for 'typeConverters' config section.
+[SPRNET-313] - Use Innovasys Document X! to generate SDK documentation instead of NDoc.
+
+New Feature
+[SPRNET-101] - Added IInstantiationAwareObjectPostProcessor interface to IObjectFactory lifecycle
+[SPRNET-120] - Add Method Injection Functionality
+[SPRNET-248] - Add support to set indexer properties
+[SPRNET-277] - Implement support for custom actions in the config parser
+[SPRNET-298] - Add support for .NET 2.0 generics
+               - Creation of gernic types
+               - Dependency injection for generic collection properties (IList, IDictionary)
+	       - Register generic type aliases for more concise configuration
+               - Generic Factory methods.
+[SPRNET-302] - Object expression evaluation language - replaces object navigator 
+[SPRNET-303] - Added IQueue interface and a PriorityQueue implementation
+[SPRNET-310] - Added AOP AutoProxy functionality
+[SPRNET-311] - Added Validation Framework
+
+Task
+[SPRNET-131] - Support .NET Framework 2.0
+[SPRNET-246] - Document differences in ResourceManager.GetObject behaviour in .NET 2.0
+[SPRNET-255] - Classes using Regexs are inconsistently named
+[SPRNET-264] - Create strongly signed assemblies for ANTLR
+[SPRNET-265] - Document AOP AutoProxy functionality
+[SPRNET-279] - Test cases for Validation framework
+[SPRNET-300] - Documentation for Expressions support
+[SPRNET-314] - Use InstallShield instead of VS.NET solution to generate distribution file.
+
+
+----------------------------------------
+
+Release 1.1 Preview 2, November 16, 2005
+Release 1.0.1, November 16, 2005
+
+Summary:  This release is contains bug fixes, new features and various improvements to existing features.
+
+Bug
+[SPRNET-112] - IListableObjectFactory should treat factory methods as special case 
+[SPRNET-144] - Fix Request Scope on object defintions
+[SPRNET-192] - PropertyPlaceholderConfigurer does not work on IFactoryObject's property 
+[SPRNET-198] - Support overriden 'New' properties on a subclass that change the type of the property. 
+[SPRNET-200] - ObjectWrapper can not set property if it is a transparent proxy. 
+[SPRNET-201] - Exceptions from proxies are not being unwrapped from TargetInvocationException. 
+
+New Feature
+[SPRNET-6]   - Create SaoFactoryObject to access SAO on client. 
+[SPRNET-56]  - Create SaoServiceExporter to export and configure SAO on server 
+[SPRNET-82]  - Add Type aliasing for more concise configuration
+[SPRNET-116] - Allow configuration of the IoC container internals - resource handler, xml parsers.
+[SPRNET-168] - Add case insensitivity option for object names for better web support. 
+[SPRNET-181] - Add support for the <alias/> element tag in the XML object definition format 
+[SPRNET-240] - Create IRemoteFactory implementation to retrieve obtain CAO/SAO objects via 
+	       .NET Remoted ObjectFactory.
+[SPRNET-241] - Create QuickStart application to showcase .NET Remoting features
+
+Task
+[SPRNET-191] - Document config of params arguments 
+[SPRNET-195] - Rename ILocaleResolver to ICultureResolver 
+[SPRNET-196] - Move ILocaleResolver from Spring.Web to Spring.Core 
+[SPRNET-197] - Create archived (ZIP / TAR.GZ) files of the latest release. 
+[SPRNET-221] - Document the semantics of the IsSingleton property of ProxyFactoryObject 
+[SPRNET-222] - Document using prototype targets with the ProxyFactoryObject 
+[SPRNET-226] - Change references from DebugInterceptor to DebugAdvice in reference documentation 
+[SPRNET-229] - Document the use of prototype targets with AOP proxies 
+[SPRNET-232] - Document how target cannot be specified at end of InterceptorNames for ProxyFactoryObject 
+[SPRNET-236] - Document Page.GetMessage Resources Not Falling Back To Base Resources without 1.1 SP1 
+[SPRNET-218] - Add Clover.Net output to CC.NET implementation 
+
+
+Improvement
+[SPRNET-142] - StringArrayConverter to automatically trim spaces 
+[SPRNET-166] - ColorConverter to support more options. 
+[SPRNET-173] - Refactor RootBeanDefinition ctors inline with 1.2.4 release of Spring 
+[SPRNET-190] - AbstractFactoryObject To Supply IDisposable-style callback for singletons 
+[SPRNET-223] - Remove ability to list target name as last element in interceptor list. 
+[SPRNET-228] - Add documentation for creating advisor using AttributeMatchMethodPointcut 
+[SPRNET-237] - AbstractObjectFactory.GetObject to support calling constructor with array of arguments 
+[SPRNET-238] - Expose UserCulture setter within UserControl, in addition to getter
+[SPRNET-239] - Use CultureInfo.CreateSpecificCulture instead of new CultureInfo to create culture instances
+
+
+---------------------------------
+
+Release 1.0.0, September 14, 2005
+
+Summary:
+
+This release is primarly a bug fix and documentation enhancement release.  Minor new features were added.
+
+** Bugs
+[SPRNET-121] - Cannot proxy type declared as an inner class 
+[SPRNET-123] - ControlFlowPointcut breaks when method is jitted away 
+[SPRNET-148] - Implement methods in StaticListableObjectFactory and StaticMessageSource that throw NotImplementedException 
+[SPRNET-152] - Hyperlinks in pdf docs not showing correctly. 
+[SPRNET-158] - Remove Spring.Objects.Factory.NoSuchObjectDefinitionException thrown for flow control.
+[SPRNET-159] - CachedTypeResolver check for a null typeName parameter
+[SPRNET-163] - The 'clean' target of the NAnt build is broken 
+[SPRNET-176] - ContextHandler passes wrong arguments to DescendantContextInstantiator GetContextConstructor()
+               Fix incorrect processing of resources as applied to child and parent contexts that would create extraneous singleton instances.
+[SPRNET-178] - ThrowsAdvice should not examine InnerExceptions
+
+** New Features
+[SPRNET-167] - Configuration of custom collections 
+[SPRNET-171] - Expose PropertyComparator's SortDefinition 
+[SPRNET-185] - ContextRegistry.GetContext instantiates IApplicationContext from spring/context configuration section
+
+** Tasks
+
+[SPRNET-149] - Tests for IResource implementations to recognize '~' 
+[SPRNET-150] - Docs for PropertyResourceConfigurer NameValueCollection.Add behavior 
+[SPRNET-153] - DocBook HTML Help program listings not styled as per others 
+[SPRNET-154] - 'example programs' link on 1.0 RC1 forum announcement not working 
+[SPRNET-162] - Detail NameValueSectionHandler configuration in ASP.NET for PropertyXXXConfigurer 
+[SPRNET-165] - aop-quickstart.html not packaged in .msi 
+
+
+** Improvements
+
+[SPRNET-115] - Add .NET Compact Framework Support.  Prebuilt Assemblies not part of distro
+[SPRNET-143] - StringArrayConverter to use Culture specific list separator 
+[SPRNET-170] - Thread safety of IApplicationContext/IObjectFactory 
+[SPRNET-172] - Expose more information in the ToString of the various IObjectDefinition implementations 
+[SPRNET-180] - Use log4net in MovieFinder example. 
+[SPRNET-182] - Sync ProxyFactory / ProxyFactoryObject API with Spring.Java 1.2.4
+	       Added the missing AddAdvice / RemoveAdvice to the IAdvised interface.
+	       Removed convenience Add/Remove methods for BeforeAdvice, ThrowsAdvice and Interceptor
+
+--------------------------------
+
+Release 1.0 RC1, August 14, 2005
+
+Summary:
+
+This release is both a feature enhancement and bug fix release to the core 
+container and adds an AOP framework
+
+** Bug
+  [SPRNET-55] - PropertyResourceConfigurer should not use NameValueCollection.Add(NameValueCollection) 
+  [SPRNET-74] - thread unsafe access to application registry
+  [SPRNET-84] - MovieFinder example has misnamed file 
+  [SPRNET-85] - ApplicationListener not receiving ApplicationContext events  
+  [SPRNET-105] - ContextRegistry Silently Overwrites Contexts With The Same Name 
+  [SPRNET-130] - Object instantiation through Factory should not require class attribute 
+  [SPRNET-132] - DefaultListableObjectFactory should not throw an exception when MessageSource is not defined  
+
+** New Features
+  [SPRNET-43] - Add support for loosely coupled event wiring in configuration file and app context creation 
+  [SPRNET-86] - IResource implementations to recognize '~' 
+  [SPRNET-151] - AOP framework 
+
+** Tasks
+  [SPRNET-3] - VS.NET help integration 
+  [SPRNET-31] - Document AOP features 
+  [SPRNET-45] - FxCop code review 
+  [SPRNET-47] - build examples as part of nant build script. 
+  [SPRNET-48] - move Spring.Context.Tests into Spring.Core.Tests 
+  [SPRNET-76] - Finish documentation for quickstart examples 
+  [SPRNET-98] - Include block and architecture diagrams in the reference documentation 
+  [SPRNET-99] - Build file needs a finer granularity for build targets 
+  [SPRNET-109] - Investigate ConfigurableResourceLoader support for FTP 
+  [SPRNET-110] - Investigate ResourceConverter support for ${property} expansion 
+  [SPRNET-114] - Drop Support For Java Style Property Object Configuration 
+  [SPRNET-119] - Update example apps to use streamlined XML config syntax. 
+  [SPRNET-124] - ObjectsDtd.ClassAttribute constant is at odds with accepted naming conventions  
+  [SPRNET-125] - ProxyBuilder TargetClass & BaseClass properties at odds with accepted naming conventions 
+  [SPRNET-126] - ObjectsDtd class is inappropriately named 
+  [SPRNET-128] - IClassFilter name is at odds with accepted naming conventions 
+  [SPRNET-138] - Describe the lazy initialization of objects in the reference documentation 
+
+** Improvements
+  [SPRNET-2] - Integration with System.ComponentModel components dropped.
+  [SPRNET-111] - XmlObjectFactory now only supports instantiation via the IResource abstraction 
+  [SPRNET-113] - ApplicationEvent refactoring 
+  [SPRNET-122] - remove asserts on exception messages 
+  [SPRNET-129] - IMethodMatcher should use MethodInfo exclusively 
+  [SPRNET-139] - Add support for aliased arrays in the TypeAliasResolver class 
+  [SPRNET-147] - Add factory-method example with constructor arguments. 
+
+  [SPRNET-36] - Final pass over Spring.Java codebase to merge refactorings. 
+
+The SPRNET-36 changes consisted of synching with Spring.Java 1.2.2 - major changes were
+
+Spring.Objects namespace
+
+ - added IDictionary GetObjectsOfType(Type type) to IListableObjectFactory 
+ - added IObjectDefinition GetObjectDefinition(string name) to IConfigurableObjectFactory 
+ - added circular references check exception
+ - refined ObjectWrapperImpl and PropertyPlaceholderConfigurer to never log property values (which might be sensitive data) 
+ - added "GetObjectPostProcessorCount" method to ConfigurableObjectFactory interface 
+ - added "IgnoreDependencyInterface" method to AbstractAutowireCapableObjectFactory and ConfigurableListableObjectFactory 
+ - reworked AbstractAutowireCapableObjectFactory's dependency exclusion check to support ignored dependency interfaces 
+ - AbstractAutowireCapableObjectFactory registers ObjectFactoryAware as default ignored dependency interface 
+ - Factored out ObjectDefinitionVisitor from PropertyPlaceholderConfigurer, making the object definition traversal reusable 
+ - ConstructorArgumentValues holds generic ValueHolders in a List instead of a Set now, keeping their definition order 
+ - ConstructorArgumentValues offers "Get(Generic)ArgumentValue" variant that excludes already used ValueHolders 
+ - AbstractAutowireCapableObjectFactory applies generic constructor argument values of the same type in definition order 
+ - factored out ObjectDefinitionValueResolver helper class from AbstractAutowireCapableObjectFactory 
+ - added InstantiationAwareObjectPostProcessor extension of ObjecPostProcessor interface, intercepting before instantiation 
+ - added ObjectReferenceFactoryObject, allowing for exposure of a target object under a different name (effectively an alias) 
+ - refined AbstractObjectFactory's "GetType" to only suppress specific exceptions like ObjectCurrentlyInCreationException 
+ - refined AbstractAutowireCapableObjectFactory's "autowireConstructor" to only suppress UnsatisfiedDependencyException 
+ - added "value"/"ref" attributes to XML "property"/"constructor-arg" tag, as shortcut alternative to child elements 
+ - added "key" sub-element to XML "entry" tag for maps, allowing for inner beans, refs, values etc specified as key 
+ - added "key-ref" attribute to XML "entry" tag for maps, as shortcut alternative to a key element with "ref bean=" 
+
+Spring.Context namespace
+
+ - AbstractApplicationContext registers MessageSourceAware/ApplicationContextAware/etc as ignored dependency interfaces 
+ - fixed AbstractApplicationContext to not exclude dependencies of type MessageSource/ApplicationContext/etc by default 
+ - AbstractApplicationContext logs message when a bean is not eligible for getting processed by all ObjectPostProcessors 
+ - fixed GenericApplicationContext to correctly propagate the internal parent ObjectFactory in case of a "SetParent" call 
+ - GenericApplicationContext detects a passed-in ResourceLoader that implements ResourcePatternResolver and uses it 
+
+
+------------------------------------------------
+Release 0.6 Release Candidate 3  March 30, 2005.
+
+Summary:
+
+This is both a feature enhancement and bug fix release.
+
+Breaking changes from RC2 are the removal of the DTD.  The XML schema file 
+is used to validate the XML instead.  RC2 assemblies were delay signed, if you
+disabled assembly verification for any reason, enable it again.  The RC3 assemblies
+are strongly named.
+
+Changes:
+
+
+** Bug
+    * [SPRNET-54] - ConfigurationReader does not close resource stream
+    * [SPRNET-57] - Empty string not allowed as value for name-values collection
+    * [SPRNET-59] - Remove delay signing and generate stronly named assemblies.
+    * [SPRNET-62] - Inner IDisposable objects belonging to prototypes were autodestroyed
+    * [SPRNET-63] - Set default namespace if omitted.
+    * [SPRNET-68] - Invoke in EventUitls not throwing base exception.
+
+** New Feature
+    * [SPRNET-33] - Add support for configuration of existing objects.  Refer to the configure methods on IObjectFactory.
+    * [SPRNET-38] - Create IObjectPostProcessor for environment variable expansion
+    * [SPRNET-46] - Add factory class to create log4net log object
+    * [SPRNET-53] - Type converter for Color from RGB CSV
+
+** Task
+    * [SPRNET-37] - Update to NAnt 0.85rc1
+    * [SPRNET-49] - Documentation for MethodInvokingFactoryObject 
+    * [SPRNET-64] - Upgrade to NUnit 2.2
+    * [SPRNET-65] - Upgrade to .NET Mock 0.7.4
+
+** Improvement
+    * [SPRNET-29] - Add support for schema validation and drop DTD
+    * [SPRNET-51] - argument names for contructors and MessageInvocationFactory
+    * [SPRNET-61] - Add convenience methods to load Properties
+    * [SPRNET-66] - Display line numbers in errors and object definition resource descriptor
+    * [SPRNET-69] - Sync with Spring.Java APIs and refactorings.
+    * [SPRNET-72] - Release with strongly named assemblies
+    * Various miscellaneous documentation improvements and code cleanup.
+
+
+-------------------------------------------------
+Release 0.6 Release Candidate 2  February 6, 2005.
+
+Summary: 
+
+This is both a feature enhancement and bug fix release.  
+
+Breaking changes from the first release candidate to be aware of are
+changes to the DTD and the use of a new configuration section handler
+to create hierarchical contexts.  Spring.Context.dll and 
+Spring.Collections.dll where removed and their classes placed in
+Spring.Core.dll.  Refer to the example programs and documentation 
+for more information if you are upgrading from 0.6 RC1.
+
+Changes: 
+
+* Moved Spring.Collections and Spring.Context dlls/namespaces to Spring.Core dll.
+* Introduced threading utilities in Spring.Threading namespace.
+* Introduced object pooling utilities in Spring.Pool namespace.
+* Introduced object navigation support in Spring.Navigation namespace.
+* Introduced loosely coupled eventing in Spring.Objects.Events namespace.
+* Introduced pluggable URI based loading of application contexts. Supports file, http, https, config and embedeed assembly resource locations.
+* Introduced ContextRegistry as a service locator to retrieve IApplicationContext.
+* Introduced custom configuration section handler (ContextHandler) to create IApplicationContexts from custom configuration section.
+
+* Introduced AppContext and EventRegistry example programs.
+* Added GetSingletonCount() method to AbstractObjectFactory, returning the number of objects in the singleton cache.
+* Added support for relative resource creation to URL and AssemblyResource.  Refactored common code into base class AbstractResource. (SPRNET-23)
+* Added support for configuration of 'read-only' collection properties (ISet, IDictionary, IList).
+* Added support to create ConfigSectionResource using URI string, i.e. config://<sectionName>  (SPRNET-22)
+* Added convenience method to IMessageSource to use CurrentUICulture
+* Added generation of User Documenation in HTML Help (.chm) format (SPRNET-4)
+* Added support for retrieval of resource objects from IMessageSource
+
+* Changed IMessageSource to use variable arguments for replacement text values instead of object array.
+
+* Removed Close() and DestroySingletons() in IConfigurableObjectFactory and IConfigurableApplicationContext and replaced with use of IDisposable interface.  (SPRNET-19)
+* Removed Spring.Objects.Factory.Access and Spring.Context.Access namespace and contained classes.  Use ContextRegistry instead for service locator style access.
+
+* Removed Spring.Context.Support.ApplicationContextHandler, use ContextHandler instead.
+* Removed Spring's IDisposableObject interface and replaced with standard .NET IDisposable.  (SPRNET-18)
+
+* Fixed parsing of CDATA sections (SPRNET-27)
+* Fixed use of namespace in custom configuration section of .NET application configuration file.  (SPRNET-1)
+* Fixed validation of custom configuration section against DTD.  (SPRNET-13)
+* Fixed solution file to support building when base directory contains spaces (SPRNET-10)
+* Fixed System.ArgumentOutOfRangeException in Spring.Util.Properties (SPRNET-26)
+* Fixed registration of abstract IObjectPostProcessors and IObjectFactoryPostProcessor
+
+* Improvements to user documentation.
+
+DTD/XSD
+* Added 'abstract' element to XSD, was accidentally omitted.
+* Changed 'class' to 'type' in DTD/XSD
+* Changed <map> to <dictionary> in DTD/XSD
diff --git a/doc/BreakingChanges-1.1.txt b/doc/BreakingChanges-1.1.txt
new file mode 100644
index 00000000..d5887567
--- /dev/null
+++ b/doc/BreakingChanges-1.1.txt
@@ -0,0 +1,148 @@
+Expression Language
+------------------
+1. Changed TypeNode syntax from 
+
+type('qualifiedTypeName')
+
+to
+
+T(qualifiedTypeName)
+
+which is a bit shorter and doesn't require (or allows) type name to be quoted.
+
+2. Changed ReferenceNode syntax from
+
+@ctx:obj 
+
+to
+
+@(ctx:obj)
+
+in order to allow '@' character to be used for other purposes as well, such as for AttributeNode definitions (new in 1.1)
+
+3. Changed string literal escape character from \ (backslash) to ' (single quote).
+
+The only character that needs to be escaped in Spring.Expressions is single quote, and using standard .NET escape character, backslash, to do that lead to all kinds of problems 
+with literal strings containing standard .NET escape characters or regular expressions escape characters. Now you only need to double up the single quote if it is needed within 
+the string -- everything else is copied verbatim and resolved by .NET instead.
+
+
+Configuration
+-------------
+
+1. Renamed ResourcesSectionHandler to ResourceHandlersSectionHandler and changed resource handlers configuration section schema from
+
+<resources>
+   <resource protocol="..." type="..."/>
+</resources>
+
+to
+
+<resourceHandlers>
+   <handler protocol="..." type="..."/>
+</resourceHandlers>
+
+The new class and element names better reflect the purpose of this configuration section and help to avoid confusion with the context/resources section.
+
+Changes (RC2 to final)
+-----------------------------------
+
+Spring.Data
+
+1. Added additional method to IDbProvider to format parameter names when creating IDataParameter.  Will affect code only if you created your own IDbProvider implementation.
+
+Changes (RC2)
+-----------------------------------
+
+Spring.Core
+
+1. Changed TimeToLive parameter from int to TimeSpan in ICache
+
+Changes (M2 to RC1)
+-----------------------------------
+
+These changes are driven primarily by the removal of dependency cycles.  Some changes were made to have a consistent naming pattern
+
+Spring.Core
+
+1.  Refactored XmlResourceReader into interface IObjectDefinitionDocumentReader and class DefaultObjectDefinitionDocumentReader
+2.  IObjectFactory - removed convenience method ConfigureObject(object target) that would simply delgate to ConfigureObject(object target, string name) with the full type name of the target.
+3.  Moved GetObjectDefinition methods from IListableObjectFactory to IConfigurableListableObjectFactory to remove dependency cycle.
+4.  Moved IConfigurableObjectDefinition from namespace Factory.Config to Factory.Support to remove dependency cycle (property MethodOverrides)
+5.  Removed DependencyCheck and MethodOverrides property from IObjectDefinition to remove dependency cycle.
+6.  Moved ObjectDefinitionHolder from Factory.Support for Factory.Config to removed dependency cycle (ObjectDefinitionVisitor)
+7.  Moved ObjectFactoryHandler from Spring.Objects.Support to Spring.Objects.Factory.Xml.ObjectFactorySectionHandler
+8.  Moved PropertyChangeEventArgs from Spring.Objects to Spring.Core
+9.  Moved exceptions from Spring.Objects to Spring.Core to remove  dependency cycle between Spring.Objects and Spring.Expressions
+    Added ReflectionException and FatalReflectionException to Spring.Util
+10. Moved ICriteria implementations from Spring.Objects.Support to Spring.Core to remove several dependency cycles (ControlFlowFactory)
+11. Moved ConversionUtils from Spring.Util to Spring.Core to remove dependency cycle.
+12. Moved ObjectUtils from Spring.Objects to Spring.Util
+13. Moved TypeRegistry and related classes from Spring.Context.Support to Spring.Core.TypeResolution
+14. Renamed ConverstionUtils to TypeConversionUtils
+15. Split TypeResolver into non-generic (TypeResolver) and generic version GenericTypeResolver
+16. Moved Expressions.MethodNode.GetMethodByArgumentValues to ReflectionUtils.
+17. Moved ReferenceNode from Spring.Expressions to Spring.Context.Support to remove dependency cycle with Spring.Context.
+18. Moved Spring.Objects.Support.CriteriaMemberFilter to Spring.Core to remove dependency of Spring.Objects.Events on Spring.Objects.Support.
+19. Moved Spring.Objects.TypeConverters to Spring.Core.TypeConvesion
+20. Renamed XmlParserRegistry to NamespaceParserRegistry and IXmlObjectDefinitionParser to INamespaceParser
+21. Renamed DefaultXmlObjectDefinitionParser to ObjectsNamespaceParser
+    Renamed WebObjectDefinitionParser to WebObjectsNamespaceParser
+    Renamed spring-objects.xsd to spring-objects-1.1.xsd
+    Renamed Spring.Validation.ValidationConfigParser to Spring.Validation.Config.ValidationNamespaceParser
+    Renamed spring-validation.xsd to spring-validation-1.1.xsd and moved to Spring.Validation.Config
+22. Renamed ConfigurationParserAttribute to NamespaceParserAttribute
+23. Renamed ConfigParsersSectionHandler to NamespaceParsersSectionHandler
+24. Moved Spring.Util.DynamicReflection to Spring.Reflection.Dynamic
+
+Spring.Aop
+
+1.  Moved DefaultAopProxyFactory and CachedAopProxyFactory to Aop.Framework.DynamicProxy
+2.  Removed Spring.Aop.Advice.DebugAdvice
+3.  Removed Spring.Aop.Advice.CacheAdvice (New Spring.Aspects.Cache.CacheAspect functionality)
+
+
+Spring.Web
+
+1.  Moved HttpContextSwith from Context.Support to Spring.Util.
+2.  Moved SupportsWebDependencyInjectionMethodBuilder and SupportWebDependencyInjectionTypeBuilder from Spring.Proxy to Spring.Web.Support
+3.  Moved methods CreatePageInstance, GetControlType, and GetPageType from Spring.Util.WebUtils to new class Spring.Objects.Factory.Support.WebObjectUtils
+4.  Moved method InjectDependenciesRecursive from Spring.Util.WebUtils to new class Spring.Web.Support.WebDependencyInjectionUtils
+5.  Moved Spring.Util.ControlInterceptor, IInterceptionStrategy, InterceptControlCollectionOwnerStrategy, InterceptControlCollectionStrategy,
+    SupportsWebDependencyInjectionOwnerProxy to Spring.Web.Support
+6.  Moved WebResource from Spring.Web.IO to Spring.Core.IO
+7.  Moved Spring.Web.Validation to Spring.Web.UI.Validation
+8.  Moved Spring.Web.Process.AbstractProcess to Spring.Web.Support.AbstractProcessHandler
+9.  Added SlidingExpiration property to AspNetCache object and removed from BaseCacheAttribute
+
+Spring.Data
+
+1.  Moved TransactionTemplate, TransactionDelegate and ITransactionCallback from Spring.Data to Spring.Data.Support to remove dependency cycle
+2.  Moved AdoTemplate, AdoAccessor, AdoDaoSupport, RowMapperResultSetExtractor from Spring.Data to Spring.Data.Core
+3.  Moved AdoPlatformTransactionManager, ServiceDomainPlatformTransactionManager, and TxScopeTransactionManager from Spring.Data to Spring.Data.Core
+4.  Moved ErrorCodes from Spring.Data.Support to Spring.Data.Common to remove dependency cycle
+5.  Moved IDataReaderWrapper from Spring.Data.Support to Spring.Data
+6.  Changed schema to use 'provider' instead of 'dbProvider' element, usage is now <db:provider ... /> and not <db:dbProvider .../>
+7.  Moved namespace parser from Spring.Data to Spring.Data.Config namespace.  
+8.  Renamed from DatabaseConfigParser to DatabaseNamespaceParser
+9.  Renamed schema spring-database.xsd to spring-database-1.1.xsd
+10. Changed target schema from http://www.springframework.net/schema/tx to http://www.springframework.net/tx
+
+Spring.Services
+
+
+1.  Moved Spring.Remoting.RemotingConfigParser to Spring.Remoting.Config.RemotingNamespaceParser
+
+
+Changes (M2 to RC1)
+-----------------------------------
+
+Spring.Aop
+
+1. Changed DSL for exception handling.  
+   Instead of "on ArithmeticException log 'Logging an exception thrown from method ' + #method.Name"
+   now use    "on exception name ArithmeticException log 'Logging an exception thrown from method ' + #method.Name 
+
+   Basically add the words 'exception name' after the word 'on'
+   
+
diff --git a/doc/CodeSmith/CodeSmith.BaseTemplates.dll b/doc/CodeSmith/CodeSmith.BaseTemplates.dll
new file mode 100644
index 00000000..a7834c41
Binary files /dev/null and b/doc/CodeSmith/CodeSmith.BaseTemplates.dll differ
diff --git a/doc/CodeSmith/CodeSmith.CustomProperties.dll b/doc/CodeSmith/CodeSmith.CustomProperties.dll
new file mode 100644
index 00000000..0819048b
Binary files /dev/null and b/doc/CodeSmith/CodeSmith.CustomProperties.dll differ
diff --git a/doc/CodeSmith/CodeSmith.Engine.dll b/doc/CodeSmith/CodeSmith.Engine.dll
new file mode 100644
index 00000000..9c7ca869
Binary files /dev/null and b/doc/CodeSmith/CodeSmith.Engine.dll differ
diff --git a/doc/CodeSmith/CodeSmith.Engine.xml b/doc/CodeSmith/CodeSmith.Engine.xml
new file mode 100644
index 00000000..32badb4c
--- /dev/null
+++ b/doc/CodeSmith/CodeSmith.Engine.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>CodeSmith.Engine</name>
+    </assembly>
+    <members>
+        <member name="M:CodeSmith.Engine.About.InitializeComponent">
+            <summary>
+            Required method for Designer support - do not modify
+            the contents of this method with the code editor.
+            </summary>
+        </member>
+        <member name="T:CodeSmith.Engine.CodeSmithSerializerAttribute">
+            <summary>
+            Summary description for CodeSmithSerializerAttribute.
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/doc/CodeSmith/CodeSmithConsole.exe b/doc/CodeSmith/CodeSmithConsole.exe
new file mode 100644
index 00000000..597dc02b
Binary files /dev/null and b/doc/CodeSmith/CodeSmithConsole.exe differ
diff --git a/doc/CodeSmith/CodeSmithConsole.exe.config b/doc/CodeSmith/CodeSmithConsole.exe.config
new file mode 100644
index 00000000..7f37a1c0
--- /dev/null
+++ b/doc/CodeSmith/CodeSmithConsole.exe.config
@@ -0,0 +1,188 @@
+<?xml version="1.0"?>
+<configuration>
+	<startup>
+	<supportedRuntime version="v1.1.4322"/>
+	<supportedRuntime version="v1.0.3705"/>
+	<requiredRuntime version="v1.0.3705"/></startup><runtime>
+	<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
+	<dependentAssembly>
+		<assemblyIdentity name="Accessibility" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="cscompmgd" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="CustomMarshalers" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="IEExecRemote" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="IEHost" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="IIEHost" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="ISymWrapper" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="Microsoft.JScript" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="Microsoft.VisualBasic.Compatibility.Data" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="Microsoft.VisualBasic.Compatibility" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="Microsoft.VisualBasic" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="Microsoft.VisualBasic.Vsa" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="Microsoft.VisualC" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="Microsoft.Vsa" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="Microsoft.Vsa.Vb.CodeDOMProcessor" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="Microsoft_VsaVb" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="mscorcfg" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Configuration.Install" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Data" publicKeyToken="b77a5c561934e089" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Design" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.DirectoryServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Drawing.Design" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Drawing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.EnterpriseServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Management" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Messaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Runtime.Remoting" publicKeyToken="b77a5c561934e089" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Runtime.Serialization.Formatters.Soap" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Security" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.ServiceProcess" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Web" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Web.Mobile" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Web.RegularExpressions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Web.Services" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Windows.Forms" publicKeyToken="b77a5c561934e089" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="System.Xml" publicKeyToken="b77a5c561934e089" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="vjscor" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="VJSharpCodeProvider" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="7.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="vjslib" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="vjslibcw" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="vjswfc" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="VJSWfcBrowserStubLib" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="vjswfccw" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	<dependentAssembly>
+		<assemblyIdentity name="vjswfchtml" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+		<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.3300.0"/>
+	</dependentAssembly>
+	</assemblyBinding></runtime></configuration>
diff --git a/doc/CodeSmith/CodeSmithResources.dll b/doc/CodeSmith/CodeSmithResources.dll
new file mode 100644
index 00000000..fdac375d
Binary files /dev/null and b/doc/CodeSmith/CodeSmithResources.dll differ
diff --git a/doc/CodeSmith/license.rtf b/doc/CodeSmith/license.rtf
new file mode 100644
index 00000000..546fcfc6
--- /dev/null
+++ b/doc/CodeSmith/license.rtf
@@ -0,0 +1,87 @@
+{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\f36\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}MS Shell Dlg 2;}{\f37\froman\fcharset238\fprq2 Times New Roman CE;}{\f38\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f40\froman\fcharset161\fprq2 Times New Roman Greek;}
+{\f41\froman\fcharset162\fprq2 Times New Roman Tur;}{\f42\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f43\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f44\froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\f45\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f397\fswiss\fcharset238\fprq2 MS Shell Dlg 2 CE;}{\f398\fswiss\fcharset204\fprq2 MS Shell Dlg 2 Cyr;}{\f400\fswiss\fcharset161\fprq2 MS Shell Dlg 2 Greek;}
+{\f401\fswiss\fcharset162\fprq2 MS Shell Dlg 2 Tur;}{\f402\fswiss\fcharset177\fprq2 MS Shell Dlg 2 (Hebrew);}{\f403\fswiss\fcharset178\fprq2 MS Shell Dlg 2 (Arabic);}{\f404\fswiss\fcharset186\fprq2 MS Shell Dlg 2 Baltic;}
+{\f405\fswiss\fcharset163\fprq2 MS Shell Dlg 2 (Vietnamese);}{\f406\fswiss\fcharset222\fprq2 MS Shell Dlg 2 (Thai);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;
+\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}
+{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
+\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}}{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid1075826\rsid15156319}
+{\*\generator Microsoft Word 11.0.5604;}{\info{\author Eric J. Smith}{\operator Eric J. Smith}{\creatim\yr2004\mo2\dy1\hr12\min44}{\revtim\yr2004\mo2\dy1\hr12\min47}{\version2}{\edmins3}{\nofpages2}{\nofwords1135}{\nofchars6474}{\*\company ActiSolve}
+{\nofcharsws7594}{\vern24689}}\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3
+\jcompress\viewkind4\viewscale100\nolnhtadjtbl\rsidroot1075826 \fet0\sectd \linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3
+\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
+{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain 
+\ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\f36\fs17\insrsid1075826 CODESMITH LICENSE AGREEMENT
+\par 
+\par IMPORTANT--READ CAREFULLY: This End-User License Agreement ("EULA") is a legal agreement between you (either an individual or an entity) and Eric J. Smith ("SMITH") for the CodeSmith template based code generator 
+software product and any included components or materials ("SOFTWARE PRODUCT").  BY INSTALLING, COPYING, OR OTHERWISE USING THE SOFTWARE PRODUCT, YOU AGREE TO BE BOUND BY THE TERMS OF THIS EULA.  IF YOU DO NOT AGREE TO THE TERMS OF THIS EULA, YOU ARE NOT 
+AUTHORIZED TO INSTALL, COPY, OR OTHERWISE USE THE SOFTWARE PRODUCT.
+\par 
+\par SOFTWARE PRODUCT LICENSE
+\par 
+\par The SOFTWARE PRODUCT is protected by United States copyright laws and international copyright treaties, as well as other intellectual property laws and treaties.  The SOFTWARE PRODUCT is licensed, not sold.
+\par 
+\par 1. GRANT OF LICENSE. This EULA grants you the following rights:
+\par }{\f36\fs17\insrsid1075826\charrsid1075826 a. }{\f36\fs17\insrsid1075826 Software Product}{\f36\fs17\insrsid1075826\charrsid1075826 . You may install and }{\f36\fs17\insrsid1075826 use the SOFTWARE PRODUCT}{\f36\fs17\insrsid1075826\charrsid1075826  
+on a single computer. The primary user of the computer on which the }{\f36\fs17\insrsid1075826 SOFTWARE PRODUCT}{\f36\fs17\insrsid1075826\charrsid1075826  is installed may make a second copy for his or her exclusive use on a portable computer.}{
+\f36\fs17\insrsid1075826 
+\par }{\f36\fs17\insrsid1075826 b. Use of Generated Output.  You may distribute the output of your custom templates or the included templates in any way.
+\par 
+\par 2. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS. 
+\par a. Limitations on Reverse Engineering, Decompilation, and Disassembly. You may not reverse engineer, decompile, or disassemble the SOFTWARE PRODUCT, except and onl
+y to the extent that such activity is expressly permitted by applicable law notwithstanding this limitation.
+\par b. Separation of Components. The SOFTWARE PRODUCT is licensed as a single product. Its component parts may not be separated for use on more than one computer.
+\par c. Redistribution. The SOFTWARE PRODUCT may not be redistributed in any way.
+\par d. Custom Template Distribution.  You may distribute your custom templates for the SOFTWARE PRODUCT only if they are offered free of charge.
+\par e. No Rental.  You may not rent, lease, lend or provide commercial hosting services to third parties with the SOFTWARE PRODUCT.
+\par f. Termination. Without prejudice to any other rights, SMITH may terminate this EULA if you fail to comply with the terms and conditions of this EULA. In such event, you must destroy all copies of the SOFTWARE PRODUCT and all of its component parts.
+
+\par 
+\par 3. ADDITIONAL SOFTWARE/SERVICES.
+\par a. Support Services. SMITH may, but is not obligated to,  provide you with support services related to the SOFTWARE PRODUCT.
+\par b. Supplements.  This EULA applies to additional software and updates of the SOFTWARE PRODUCT, including without limitation supplements, service packages, hot fixes, or add-on components (collectively "Supplements") that SMITH may 
+provide to you or make available to you after the date you obtain your initial copy of the SOFTWARE PRODUCT, unless other terms are provided along with such Supplements.
+\par 
+\par 4. COPYRIGHT. All title and copyrights in and to the SOFTWARE PRODUCT (including but 
+not limited to any images, photographs, animations, video, audio, music, text, SAMPLE CODE, and "applets" incorporated into the SOFTWARE PRODUCT) and any copies of the SOFTWARE PRODUCT are owned by SMITH. The SOFTWARE PRODUCT is protected by copyright law
+s and international treaty provisions. Therefore, you must treat the SOFTWARE PRODUCT like any other copyrighted material except that you may install the SOFTWARE PRODUCT.
+\par 
+\par 5. U.S. GOVERNMENT RESTRICTED RIGHTS. All SOFTWARE PRODUCT provided to the U.S. Gove
+rnment pursuant to solicitations issued on or after December 1, 1995 is provided with the commercial license rights and restrictions described elsewhere herein. All SOFTWARE PRODUCT provided to the U.S. Government pursuant to solicitations issued prior to
+ December 1, 1995 is provided with "Restricted Rights" as provided for in FAR, 48 CFR 52.227-14 (JUNE 1987) or DFAR,48 CFR 252.227-7013 (OCT 1988), as applicable.
+\par 
+\par 6. EXPORT RESTRICTIONS. You acknowledge that the SOFTWARE PRODUCT is subject to U.S. export j
+urisdiction. You agree to comply with all applicable international and national laws that apply to these products, including the U.S. Export Administration Regulations, as well as end-user, end-use and destination restrictions issued by U.S. and other gov
+ernments.
+\par 
+\par 7. DISCLAIMER OF WARRANTY
+\par To the maximum extent permitted by applicable law, SMITH provides the SOFTWARE PRODUCT and support services (if any) AS IS AND WITH ALL FAULTS, and hereby disclaim all other warranties and conditions, whether express, im
+plied, or statutory, including, but not limited to, any (if any) implied warranties, duties or conditions of merchantability, of fitness for a particular purpose, of reliability or availability, of accuracy or completeness of responses, of results, of wor
+k
+manlike effort, of lack of viruses, and of lack of negligence, all with regard to the SOFTWARE PRODUCT, and the provision of or failure to provide support or other services, information, software, and related content through the SOFTWARE PRODUCT or otherw
+ise arising out of the use of the SOFTWARE PRODUCT. ALSO, THERE IS NO WARRANTY OR CONDITION OF TITLE, QUIET ENJOYMENT, QUIET POSSESSION, CORRESPONDENCE TO DESCRIPTION, OR NON-INFRINGEMENT WITH REGARD TO THE SOFTWARE PRODUCT.
+\par 
+\par 8.  EXCLUSION OF INCIDENTAL, CONSEQUENTIAL, AND CERTAIN OTHER DAMAGES. 
+\par TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL SMITH BE LIABLE FOR ANY SPECIAL, INCIDENTAL, PUNITIVE, INDIRECT, OR CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR L
+OSS OF PROFITS OR CONFIDENTIAL OR OTHER INFORMATION, FOR BUSINESS INTERRUPTION, FOR PERSONAL INJURY, FOR LOSS OF PRIVACY, FOR FAILURE TO MEET ANY DUTY INCLUDING OF GOOD FAITH OR OF REASONABLE CARE, FOR NEGLIGENCE, AND FOR ANY OTHER PECUNIARY OR OTHER LOSS
+ 
+WHATSOEVER) ARISING OUT OF OR IN ANY WAY RELATED TO THE USE OF OR INABILITY TO USE THE SOFTWARE PRODUCT, THE PROVISION OF OR FAILURE TO PROVIDE SUPPORT OR OTHER SERVICES, INFORMATION, SOFTWARE, AND RELATED CONTENT THROUGH THE SOFTWARE PRODUCT OR OTHERWISE
+ 
+ARISING OUT OF THE USE OF THE SOFTWARE PRODUCT, OR OTHERWISE UNDER OR IN CONNECTION WITH ANY PROVISION OF THIS EULA, EVEN IN THE EVENT OF THE FAULT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY, BREACH OF CONTRACT, OR BREACH OF WARRANTY OF SMITH, AND EVE
+N IF SMITH HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+\par 
+\par 9. LIMITATION OF LIABILITY AND REMEDIES. NOTWITHSTANDING ANY DAMAGES THAT YOU MIGHT INCUR FOR ANY REASON WHATSOEVER (INCLUDING, WITHOUT LIMITATION, ALL DAMAGES REFERENCED ABOVE AND ALL DIRECT 
+OR GENERAL DAMAGES), THE ENTIRE LIABILITY OF SMITH UNDER ANY PROVISION OF THIS EULA AND YOUR EXCLUSIVE REMEDY FOR ALL OF THE FOREGOING SHALL BE LIMITED TO THE GREATER OF THE AMOUNT ACTUALLY PAID BY YOU FOR THE SOFTWARE PRODUCT OR U.S.$5.00.  THE FOREGOING
+ LIMITATIONS, EXCLUSIONS AND DISCLAIMERS SHALL APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, EVEN IF ANY REMEDY FAILS ITS ESSENTIAL PURPOSE.
+\par 
+\par 10. APPLICABLE LAW. This EULA is governed by the laws of the State of Texas.
+\par 
+\par 11. ENTIRE AGREEMENT. This
+ EULA (including any addendum or amendment to this EULA which is included with the SOFTWARE PRODUCT) is the entire agreement between you and SMITH relating to the SOFTWARE PRODUCT and support services (if any), and it supersedes all prior or contemporaneo
+u
+s oral or written communications, proposals, and representations with respect to the SOFTWARE PRODUCT or any other subject matter covered by this EULA. To the extent the terms of any SMITH policies or programs for support services conflict with the terms 
+of this EULA, the terms of this EULA shall control.
+\par 
+\par }}
\ No newline at end of file
diff --git a/doc/CodeSmith/readme.txt b/doc/CodeSmith/readme.txt
new file mode 100644
index 00000000..96a11469
--- /dev/null
+++ b/doc/CodeSmith/readme.txt
@@ -0,0 +1,335 @@
+CodeSmith
+
+CodeSmith allows you to create templates that will generate code for any ASCII based language.  The code generated can be customized by the use of properties.  A property can be any .NET object that has a designer (most built in .NET types have designers already) and can be as simple as a boolean property that allows you to conditionally add or remove code from the result, to an object such as the included TableSchema object which provides everything you could possibly want to know about a table in a database.  Having access to this information allows you to generate things such as stored procedures, business objects, presentation layer code, or anything else you can think of based on a table schema.
+
+CodeSmith's syntax is almost identical to ASP.NET. So if you are familiar with ASP.NET then you should be able to quickly learn the template syntax.  You can use the C#, VB.NET or JScript.NET languages in your templates.
+
+The CodeSmith Explorer window allows you to view all templates in a given folder and allows you to drag and drop to any target that supports dropping text.  You can also double-click a template to execute it individually after the first time you run CodeSmith.
+
+I hope to receive feedback, bug reports and hopefully some useful templates to include in future versions.  I am also interested if someone would be willing to help with documentation. CodeSmith is a FREEWARE product. I am still considering releasing source code, but I would rather maintain control of the product in a single location. I think this will provide the best opportunity to build a solid community of users and templates. I also plan to build a template repository site that will allow anyone to submit a template and have it added to the repository.
+
+Enjoy,
+Eric J. Smith
+http://www.ericjsmith.net/codesmith/
+
+--------------------------------------------------
+History
+--------------------------------------------------
+Build 2.6.0 (RC1)
+  * Added GetCodeTemplateInstance method to CodeTemplate.  This can be used to compile and create an instance of another template.
+  * Added Toggle Template Code Expansion feature.  This allows easy viewing of the static content in the template. (Shortcut CTRL-SHIFT-M)
+  * Fixed up the syntax highlighting editor dialog and made it persist the settings.
+  * Made it so that you can manually enter a delimited list of strings for StringCollection in the property grid.
+  * Added several options to the options dialog.
+  * Improved outlining.
+  * Fixed various minor bugs.
+Build 2.5.18 (BETA)
+  * More performance improvements in the core CodeSmith engine.
+  * Made it so that if you reselect the same schema object it will refresh the schema information.
+  * Made the enter key open the selected template in CodeSmith Studio.
+  * Fixed bug with saving a property set file while overwriting an existing property set file that is set to read only.
+  * Made CodeSmith Studio a single instance application.
+  * Fixed bug where trying to open a file that was already open would cause the file to re-compile itself.
+  * Fixed bug when compiling templates that have ( ) or ' in their file names.
+Build 2.5.17 (BETA)
+  * Fixed issue with CodeSmith Studio hanging sometimes when <% was typed.
+  * Made the VS.NET custom tool MUCH better.  It now reports errors in much more detail.
+  * Added variable support to the VS.NET custom tool.
+  * Added default property support to the VS.NET custom tool.
+  * Made it so that goto line now expands the regions the line is on.
+Build 2.5.16 (BETA):
+  * Made various performance improvements to the engine and CodeSmith Studio.
+  * Added syntax highlighting to target languages.
+  * Added outlining support to CodeSmith Studio.
+  * Added line modification markers to CodeSmith Studio.
+  * Added auto copy output to clipboard option in CodeSmith Studio.
+  * Fixed several find and replace bugs.
+Build 2.5.15 (BETA):
+  * Added ToString override to the schema collections so that the names of the selected objects show up.
+  * Stopped indenting script blocks.
+  * Fixed highlighting issues with escaped template tags <%% %%>.
+  * Made register menu item hidden when already registered.
+  * Fixed bug where pressing F4 on codebehind causes exception.
+  * Changed RenderToFile using a merge strategy so that it creates a file if it doesn't exist.
+  * Changed the output encoding to UTF-8.
+  * Fixed bug in editor control where a black box was sometimes drawn.
+  * Fixed bug in editor control where a clipboard operation would sometimes cause an exception.
+  * Updated to the 1.5 version of Chris Nahr's collection templates.
+  * Various other minor bug fixes.
+Build 2.5.14 (Final):
+  * Turned CodeSmith Professional licensing on.
+Build 2.5.13 (RC4):
+  * Fixed the check to see if a given file is already open (was case-sensative).
+  * Fixed issue with setting properties programmatically if they were not an exact type match but were still related types.
+  * Disabled the replace and replace all buttons on the find dialog if a document is read only.
+  * Fixed the StoredProcedures.cst template to handle user defined types.
+  * Made it so that the explorer tree doesn't do a complete refresh on every file save.
+  * Fixed painting issues in the Highlighting Style Editor dialog.
+  * Fixed issue with the find function not always moving the find result into view.
+  * Fixed issue with CTRL-TAB and new documents.
+  * Fixed template parser to allow escaped "'s in the directive attributes.
+Build 2.5.12 (RC3):
+  * Fixed bug in SqlSchemaProvider where tables with .'s in their name would cause an error.
+  * Changed SchemaExplorer to lazy load extended properties.  This made a huge difference in databases with a lot of schema objects. 
+  * Fixed bug with RenderToFile where the file handle was not being released if an error occured during template execution.
+  * Added the awesome DBDocumenter templates to the samples.
+  * Added the C# CSLA.NET templates by Ricky Supit.
+  * Added the StoredProcedureDescriptions.cst template by Oskar Austegard.
+  * Fixed bug with save all button where not all documents would be saved.
+  * Added context menu to the output and compiled source editors.
+  * Fixed bug in the logo header of CodeSmithConsole.
+  * Fixed bug with determining if a file has been modified in CodeSmith Studio.
+  * Fixed various issues with the goto line feature in CodeSmith Studio.
+  * Fixed formatting issue with template comment tags.
+  * Fixed bugs with commands enabling and disabling in CodeSmith Studio.
+  * Changed the F6 mapping in Studio to toggle between views of the current document.
+  * Changed build shortcut to CTRL-SHIFT-B.
+  * Fixed bug with external change modification notice.  Whenever you closed a document and re-opened it you would then get errant external change modification notices.
+  * Fixed bug with CTRL-F sometimes causing a crash.
+  * Fixed various painting issues in the editor control.
+  * Added option to determine code behind open behaviour in CodeSmith Studio.
+  * Fixed issue with various menu item actions not updating the document title.
+  * Changed CTRL-TAB and CTRL-SHIFT-TAB to behave the same as VS.NET.
+  * Added ability to select template editor application from CodeSmith Explorer.
+  * Made it so the template will recompile if the code behind file has been modified.
+Build 2.5.11 (RC2):
+  * Fixed parser bug where whitespace would not be correctly handled in some scenerios.
+  * Fixed bug with custom assembly resolution.
+  * Fixed bug when closing multiple instances of Studio at the same time.
+  * Fixed bugs in a few sample templates.
+  * Fixed bug when using a \ in the find dialog.
+Build 2.5.10 (RC1):
+  * Added some new help content.  Thanks to James Avery.
+  * Updated to the latest collection and CSLA.NET templates.
+  * Added State (values: Default, Rendering, Validating, RestoringProperties, SavingProperties) property to CodeTemplate.  This can be used to tell what the template is currently doing.
+  * Fixed bug when saving a newly created template.
+  * Made the close start page on open setting work for all ways of opening files.
+  * Fixed bug in collections where indexers threw an exception for items that did not exist.  These indexers now return null if the item is not found.
+  * Added override for ToString() in CodeSmith.CustomProperties.StringCollection so that the items show up in the propertygrid instead of the type name.
+  * Fixed bug in RestorePropertiesFromHashtable where you get a NullReferenceException when trying to populate a property that has been removed since the last compile.
+  * Fixed bug in the about box where some names were being cut off.
+  * Fixed bug with Load Property Set XML in the stand-alone property grid.
+  * Fixed bug in CodeSmith Explorer with template folders that no longer exist.
+  * Fixed bug in CodeSmith Studio with opening files that no longer exist.
+Build 2.5.9 (Beta):
+  * Added context menus to the document tabs.
+  * Added CopyPropertiesTo method to CodeTemplate.  This can be used to copy all matching properties from one template instance to another.
+  * Dramatically improved compiler performance on large templates.
+  * Lots of improvements to the CodeSmith Explorer control.
+  * Rebuilt all of the Schema Explorer collections using the awesome collection templates by Chris Nahr.  These collections are now editable, although the instances returned by Schema Explorer are marked as read-only.
+  * Fixed bug where enum values were not being maintained during template compilation.
+  * Fixed bug where new files were not added to the MRU list.
+  * All configuration files have now been moved to the current user's ApplicationData folder.  It should now be possible to run CodeSmith as a non-Administrator user.
+  * Added folder monitoring to Explorer so that new files are automatically picked up.
+  * Added monitoring to all documents in CodeSmith Studio so that external changes are picked up.
+Build 2.2.8 (Beta):
+  * Added tool tip to document tabs in CodeSmith Studio.
+  * Added keyboard shortcuts to almost everything in CodeSmith Studio.
+  * Added ability to open any file type in CodeSmith Studio.
+  * Added error underlines to the compiled template source when there are compilation errors.  These also have tooltips to display the error message.
+  * Added Select All, Copy Output, Save Output, and Compile To Assembly menu items.
+  * Added Insert Content menu items and shortcuts.
+  * Added dialog to ask if you want to open the code behind for a template if it uses one.  (this really should be another tab in the template editor.)
+  * Added F3 support and made various fixes to the find and replace operations.
+  * Added menu item to save output to file.
+  * Added Windows menu to CodeSmith Studio.
+  * Added recent files menu to CodeSmith Studio.
+  * Added context sensative enabling/disabling of commands in CodeSmith Studio.
+  * Added options dialog with various settings.
+  * Fixed parser bug where comments (<%-- --%>) would collapse a line with other content on it.
+  * Added ability to change language background color in the highlighting style editor dialog.
+  * Added start page / embedded web browser to CodeSmith Studio.
+Build 2.2.7 (Beta):
+  * The Schema Explorer tool window in CodeSmith Studio works now (still need to have it let you manage your extended properties).
+  * The properties grid is now used to show properties on just about everything.
+  * Fixed bug when dropping a template onto the VS.NET Solution Explorer window.
+  * Updated to the latest version of the CSLA.NET templates.
+  * Created a new sample template CommandWrapperClass.cst.  This template creates a C# wrapper class for a stored procedure.
+  * There is now a Description property on all schema objects.  This is simply a shortcut to the CS_Description extended property.
+  * Made the find dialog set the currently selected text as the find value instead of it being hard-coded to "int".
+  * Made the find dialog restore focus to the editor window when the dialog is closed.
+  * Fixed bug in Studio where the same instance of a template was being used for multiple generations.
+  * Added CS_IsComputed and CS_IsDeterministic extended properties to ColumnSchema and ViewColumnSchema.
+  * Added CS_Default extended property to ParameterSchema.
+  * Added CTRL-TAB and CTRL-SHIFT-TAB support to CodeSmith Studio.
+  * Fixed printing issue in CodeSmith Studio where lines were not being wrapped.
+  * Fixed bug in parser that caused <% = expression %> (space between <% and =) to be incorrectly parsed.
+  * Fixed bug in parser that caused multi-line template comments to be incorrectly parsed.
+  * Updated to version 1.3.1 of Chris Nahr's collection templates.
+  * Created CodeSmith101 sample templates.
+Build 2.2.6 (Beta):
+  * Implemented cursor changes in CodeSmith Studio when the application is working.
+  * Fixed bug in extended properties where extended property value was NULL.
+  * Fixed several clipboard issues in CodeSmith Studio.
+  * Added error trapping around template execution so that it's obvious the exception was from bad code in the template and not CodeSmith.
+  * Updated to version 1.3.0 of Chris Nahr's collection templates.
+  * Fixed bug in CodeSmith Studio where template properties would be lost after a failed compilation.
+  * Added code to allow enum property types defined in multiple templates to be converted back and forth.
+Build 2.2.5 (Beta):
+  * Added icons to the Visual Studio .NET tool window and command.
+  * Added a blank data source to all designers.
+  * Added context menu items to the property grid to copy, save and load the property set XML.
+  * Fixed bug with right-clicking in the property grid on a category cell.
+  * Made a lot of internal changes to cleanup the way CodeSmith was searching for assemblies.
+  * Replaced VSUserControlHost with CodeSmithUserControlHost.  I believe this change will fix the infamous "Invalid VSUserControlHost" error message in Visual Studio.
+  * Added a ScriptTableData.cst sample template.
+  * Made CodeSmith Studio persist highlighting style changes.
+  * Added Schema Explorer tool window to CodeSmith Studio.
+  * Fixed highlighting bug where single line comments would over-ride the end of a template block (%>).
+  * Added highlighting support for template comments (<%-- %>).
+  * Implemented alternate method of retrieving command schema result information in certain scenerios where it would fail otherwise.
+  * Fixed bug with SQL7 and views.
+  * Added option to installer to select whether or not VS.NET support is installed.
+  * Made it so that Undo buffer is cleared right after document load.
+Build 2.2.4 (Beta):
+  * Added GetProperties and GetRequiredProperties to CodeTemplate.
+  * Added AllInputParameters, AllOutputParameters, and NonReturnValueParameters to the CommandSchema object.
+  * Fixed various exceptions in CodeSmith Studio.
+  * Added EngineSample (this was previously ConsoleSample).
+  * Added ConsoleSamples.  This contains various samples of using the command line client.
+  * Added option to installer to include Visual Studio .NET 2003 support.
+  * Made CodeSmith Studio handle saving to read-only files.
+  * Fixed issue with command parameters extended properties.
+  * Added new sample template that outputs all extended properties for a database.
+Build 2.2.3 (Beta):
+  * Fixed parser bug where first literal line of template would be parsed incorrectly and discarded.
+  * Fixed parser bug where <script> tags were being incorrectly parsed.
+  * Fixed bug in Property directive Default attribute where defaults would only work with properly cased types.
+  * Added ParseDefaultValue to CodeTemplate.  This method is called to parse the Property directive Default attribute value and assign the default value.  The method is virtual and can be overridden to extend the supported data types.
+  * The Property directive Default attribute now supports enum values as well as all integer data types (was Int32 only before).
+  * Made it so that you can press delete on a folder in the CodeSmith Explorer control to remove a folder.  Also, made it so that the full folder path is shown when hovering over the folder.
+Build 2.2.2 (Beta):
+  * Added merge capabilities (let's you merge into a region of an existing file) to CodeSmithConsole.
+  * Redesigned CodeSmithConsole parameters and switches.
+  * Added owner support to collections (indexer, Contains, IndexOf).
+  * Fixed issue with property sets not containing the owner information.
+  * Fixed bug where a SQL float type would be mapped to a Decimal instead of a Double.
+Build 2.2.1 (Beta):
+  * Added CodeSmith Studio.
+  * Added CommandSchema.CommandResults to allow for discovery of command results schema information.
+  * Added ViewSchema.ViewResult to allow for discovery of view result schema information.
+  * Added StringCollection to the CodeSmith.CustomProperties assembly.  This class fully supports the CodeSmith GUI and XML property set.
+  * Added XmlSerializedTypeConvertor to the CodeSmith.CustomProperties assembly.  This class allows conversion of XML serialized objects back and forth to the property set format.
+  * Added ability to save property set XML to file in the generator form.
+  * Added ability to load property set from XML file in the generator form.
+  * Added SavePropertiesToXmlFile and RestorePropertiesFromXmlFile to CodeTemplate.
+  * Added support for executing a template in CodeSmithConsole.
+  * Added more error handling support to CodeSmithConsole.
+  * Fixed bug with TableSchema extended properties.
+  * Made database extended properties populate.
+  * Fixed bug with version check.
+  * Added a custom exception dialog that can be expanded to show the stack trace in SchemaExplorer.
+  * Fixed problem with SchemaExplorer and non-dbo owners.  Also added owner information into the designers.
+  * Changed designers to default to the recently modified or added data source from the data source manager.
+  * Updated to version 1.2.1 of Chris Nahr's collection templates.
+  * Included CSLA.NET templates from Matt Altadonna.
+  * Made all fields required on the data source dialog.
+  * Modified XmlSerializedFilePicker to not require an attribute named type on the root element.  It will now assume the type of the property.
+  * Made parser ignore duplicate import and assembly directives.
+  * Included some nice synchronization changes to the CSVector.cst template contributed by Joel Mueller.
+  * Changed CommandSchema.InputParameters to only return Input parameters.  Previously it returned Input and InputOutput parameters.
+  * Changed CommandSchema.OutputParameters to only return Output parameters.  Previously it returned Output and InputOutput parameters.
+  * Added CommandSchema.InputOutputParameters to return InputOutput parameters for the command.
+  * Added CommandSchema.ReturnValueParameter to provide a reference to the return value parameter of a command.
+  * Fixed bug with CommandSchema and copy property set XML.
+Build 2.1.1270 (Release):
+  * Fixed bug with copy property set XML and null values.
+  * Added context menu to the property grid that allows clearing values and turning the help panel on and off.
+  * Added ViewText to the ViewSchema object.
+  * Implemented a workaround for the VB.NET on .NET 1.0 issue.
+  * Added designers for TableSchemaCollection, CommandSchemaCollection, and ViewSchemaCollection.  These types can now be used as properties in the GUI and in the VS.NET custom tool.
+  * Changed all Schema Explorer collections to make use of the new value based Equals method when calling Contains and IndexOf.
+  * Added ability to select multiple root folders in CodeSmith Explorer.
+  * Enabled the maximize button on the explorer and generator forms.
+  * Included the awesome C# collection templates built by Chris Nahr.  Hopefully someone will be willing to convert these to VB.NET and they can be included too.
+  * Implemented the Equals and GetHashCode methods for each schema object.  Equals will now check for value equality instead of reference equality.
+  * Made all schema explorer designers re-sizable and also made them bigger by default.
+  * Fixed various bugs in the generator form.
+  * Added CTRL-G to the generator form as a shortcut to the Generate button.
+  * Added CTRL-T to the generator form as a shortcut to the copy template output to clipboard button.
+  * Made it so that if you cancel out of a schema explorer designer, it will not null out your current selection.
+  * Made it so that if you had a previous selection the schema explorer designers will automatically select that item.
+  * Fixed a bug in the GUI where it would use the same instance of the template for each generation.
+  * Added CustomProperties sample.  This sample demonstrates using the XmlSerializer to deserialize an object and use it as a property.
+  * Added ExtendedProperties collection to all schema objects.  These can be used to hold any custom data.
+  * Made SqlSchemaProvider populate all extended properties from SQL 2000 into the ExtendedProperties collection on each schema object.
+  * Made SqlSchemaProvider populate five additional extended properties on each column: CS_IsIdentity, CS_IdentitySeed, CS_IdentityIncrement, CS_IsRowGuidCol, and CS_Default
+  * Added CommandText property to the CommandSchema object.  This can be used to get the code for the command.
+  * Added IsDependantOf method to the TableSchema object.  This will determine if a given table is a dependant of another table by crawling the ForeignKey heirarchy.
+  * Added TableDependancyComparer class.  This can be used to sort tables in order of dependancy.
+  * Made all Schema Explorer designers remember their last selected data source.
+  * Changed Indexes collection to include the primary key index.  I was explicitly excluding this index before.
+  * Added IsUnique to ColumnSchema.  This simply checks for a unique index on this column.
+  * Added IsPrimaryKey, IsUnique, and IsClustered properties to IndexSchema.
+  * Added DateCreated to TableSchema, ViewSchema, and CommandSchema.
+  * Added support for Debug attribute in the CodeTemplate directive.  This must be set to true before you will be able to debug your templates.
+  * Fixed various bugs in the SqlSchemaProvider assembly.
+  * Added Ctrl-A support to the output panels.
+  * Added Ctrl-G (go to line) support on the Compiled Template Source panel.
+  * Added error handling to CodeSmithConsole and changed it to return a non-zero number if it fails.
+  * Added System.Data and System.Drawing as default assembly references.
+  * Added System.Data as a default namespace import.
+  * Fixed a couple of bugs in the StoredProcedures.cst and added a AllStoredProcedures.cst.  This new template will generate stored procedures for every table in the database.
+  * Added typed DataSet sample template and test application (TypedDataSetTester).  These are a work in progress but I am hoping to get feedback.
+  * Fixed bug with SQL7 compatability.
+  * Made further changes to the installer so that it will hopefully work for more people.
+  * Re-fixed a bug with command parameters.  This accidentally got reverted.
+Build 2.0.1245:
+  * Added SampleCustomProperties project.  This project contains a sample of creating custom types and type editors for use as CodeSmith properties.
+  * Included CodeSmith.rtf User Documentation written by Pete Davis.
+  * Fixed bug with ForeignKey collection.  If foreign and primary key column names were different you would get a ArgumentNullException.
+  * Fixed bug with custom tool where assemblies in the same directory as the template could not be resolved.
+  * Fixed bug where installer wouldn't install if Visual Studio.NET wasn't installed.
+Build 2.0.1222:
+  * Removed expiration.
+  * Created installer.
+  * Changed to a build system instead of going on and on forever with beta builds.
+  * Dropped support for Visual Studio .NET 2002.  The Visual Studio features will only work with the final release of Visual Studio .NET 2003.
+  * Dropped RedRiver from all namespaces.  If you have templates that refer to RedRiver, you will need to update them.
+  * Fixed problem where SchemaExplorer would fail if collation was different from the master database.
+  * Added view support to SchemaExplorer.
+  * Fixed problem with SQL7 compatibility and column descriptions.
+  * Added a designer for the DatabaseSchema object.
+  * Added Owner property to TableSchema, ViewSchema, and CommandSchema and fixed bug relating to tables, stored procedures and views were assuming dbo as an owner.
+  * Updated CollectionGen templates from the latest CollectionGen release.
+  * Added a Visual Basic Code Generator Sample (VBCodeGeneratorSample).
+  * Added CodeSmithConsole.exe to enable processing a .xml property file from the command line. (CSharpCodeGeneratorSample and VBCodeGeneratorSample folders)
+Beta 6:
+  * Fixed bug where CodeSmith Explorer context menu was shown for node types other than templates.
+  * Added ability to specify the application used to edit templates.  Can be changed in the "CodeSmith.Gui.dll.config" (key "codetemplateexplorercontrol.editapplication") file.
+  * Fixed various bugs in SqlCodeTemplate.cs.
+  * Changed expiration to 7/1/2003.
+  * Seperated the VS.NET addin and custom tool into seperate assemblies.  This should allow the custom tool to run in VS.NET 2002 and 2003.
+  * Changed ColumnSchema.DataType and ParameterSchema.DataType to DbType instead of SqlDbType.
+  * Fix bug with ColumnSchema.IsPrimaryKeyMember when no primary key exists.
+Beta 5:
+  * Added a CodeSmith VS.NET custom tool.  This can be used to simulate generics (CSharpCodeGeneratorSample folder).
+  * Added a CodeSmith Explorer tool window addin to VS.NET.  This allows you to quickly generate code using drag and drop.
+  * Fixed a cosmetic parser bug (parser was eating too much white space after directives).
+  * Fixed a bug in drag and drop from CodeSmith Explorer when the code generation was canceled.
+Beta 4:
+  * Made necessary changes to allow Debugger.Break() to launch a debugger and step through the generated template code.
+  * Added ability to double-click compiler errors and go to the spot in the source code where this error was encountered.
+  * Added various additional error messages to the compiler.
+  * Added Response property to CodeTemplate so you can now use Response.Write statements in template code.
+  * Fixed file associations so that .cst files have a CodeSmith icon now.
+  * Fixed bug with removing data sources.
+  * Added SetProperty and GetProperty helper methods to CodeTemplate.
+  * Added a simple latest version check to the about dialog.  Also checks every 15 days (not yet configurable) when CodeSmith Explorer is run.
+  * Fixed about dialog showing the wrong build number.
+  * Added an example of using CodeSmith.Engine programatically (ConsoleSample folder).
+  * Fixed several sample template bugs.
+Beta 3:
+  * Added ability to save template output to file.
+  * Added ability to save compiled template to an assembly.
+  * Schema Explorer API documentation is included.
+  * Fixed a bug in the schema explorer data source manager when edit is clicked with no data source selected.
+  * Fixed a bug with the IsForeignKey property of ColumnSchema and changed the property name to IsForeignKeyMember.
+  * Fixed bug for templates that have spaces in their file names.
+  * Fixed file association bug.
+Beta 2:
+  * Fixed a bug with running CodeSmith on .NET 1.0.
+  * Added line and column information to the compiled template source tab.
+  * Fixed bug where compiled template source would not be shown if there was an error in the template.
+Beta 1:
+  * Initial public release.
diff --git a/doc/CodeSmith/sourcelicense.txt b/doc/CodeSmith/sourcelicense.txt
new file mode 100644
index 00000000..70940b52
--- /dev/null
+++ b/doc/CodeSmith/sourcelicense.txt
@@ -0,0 +1,45 @@
+CODESMITH SOURCE CODE LICENSE AGREEMENT
+
+IMPORTANT--READ CAREFULLY: This End-User License Agreement ("EULA") is a legal agreement between you (either an individual or an entity) and Eric J. Smith ("SMITH") for the CodeSmith template based code generator software product source code and any included components or materials ("SOURCE CODE").  BY INSTALLING, COPYING, OR OTHERWISE USING THE SOURCE CODE, YOU AGREE TO BE BOUND BY THE TERMS OF THIS EULA.  IF YOU DO NOT AGREE TO THE TERMS OF THIS EULA, YOU ARE NOT AUTHORIZED TO INSTALL, COPY, OR OTHERWISE USE THE SOURCE CODE.
+
+SOURCE CODE LICENSE
+
+The SOURCE CODE is protected by United States copyright laws and international copyright treaties, as well as other intellectual property laws and treaties.  The SOURCE CODE is licensed, not sold.
+
+1. GRANT OF LICENSE. This EULA grants you the following rights:
+a. Source Code. You may install and compile one copy of the SOURCE CODE on a single computer. The primary user of the computer on which the SOURCE CODE is installed may make a second copy for his or her exclusive use on a portable computer.
+b. Storage/Network Use. You may also store or install a copy of the SOURCE CODE on a storage device, such as a network server, used only to install or compile the SOURCE CODE on your other computers over an internal network; however, you must acquire and dedicate a license for each separate computer on which the SOURCE CODE is installed or compiled from the storage device. A license for the SOURCE CODE may not be shared or used concurrently on different computers.
+c. Use and Modification.  SMITH grants you the right to use and modify the SOURCE CODE to better fit your needs.  You may not distribute the SOURCE CODE, or any modified version of the SOURCE CODE, in any form. Any modifications made to the SOURCE CODE will continue to be subject to the terms and conditions of this EULA.  Any modified versions of the SOURCE CODE may only be executed in object form by users also owning a SOURCE CODE LICENSE or by users owning a CodeSmith Professional license. 
+d. Use of Generated Output.  You may distribute the output of your custom templates or the included templates in any way.
+
+2. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS. 
+a. Separation of Components. The SOURCE CODE is licensed as a single product.
+b. Redistribution. The SOURCE CODE may not be redistributed in any way.
+c. Custom Template Distribution.  You may distribute your custom templates for the SOURCE CODE only if they are offered free of charge.
+d. No Rental.  You may not rent, lease, lend or provide commercial hosting services to third parties with the SOURCE CODE.
+e. Non-Transferable. This license may not be transfered or sold in any way.
+f. Termination. Without prejudice to any other rights, SMITH may terminate this EULA if you fail to comply with the terms and conditions of this EULA. In such event, you must destroy all copies of the SOURCE CODE and all of its component parts.
+
+3. ADDITIONAL SOFTWARE/SERVICES.
+a. Support Services. SMITH may, but is not obligated to,  provide you with support services related to the SOURCE CODE.
+b. Supplements.  This EULA applies to additional software and updates of the SOURCE CODE, including without limitation supplements, service packages, hot fixes, or add-on components (collectively "Supplements") that SMITH may provide to you or make available to you after the date you obtain your initial copy of the SOURCE CODE, unless other terms are provided along with such Supplements.
+
+4. COPYRIGHT. All title and copyrights in and to the SOURCE CODE (including but not limited to any images, photographs, animations, video, audio, music, text, SAMPLE CODE, and "applets" incorporated into the SOURCE CODE) and any copies of the SOURCE CODE are owned by SMITH. The SOURCE CODE is protected by copyright laws and international treaty provisions. Therefore, you must treat the SOURCE CODE like any other copyrighted material except that you may install the SOURCE CODE.
+
+5. NON-DISCLOSURE. Under this agreement you are strictly forbidden to disclose any information about the SOURCE CODE to any third party, or publish in any form the SOURCE CODE, or any of its parts. SMITH understands that releasing SOURCE CODE means disclosing SMITH's know-how, and bears many potential risks to SMITH's position in software technology. SMITH is taking these risks to provide you with additional opportunities to facilitate your development process and improve your final products. In return SMITH expects you to act responsibly and not to disclose, either intentionally or not, to public or any third party the information you are provided with. SMITH expects you to treat the SOURCE CODE as your own confidential material.
+
+5. U.S. GOVERNMENT RESTRICTED RIGHTS. All SOURCE CODE provided to the U.S. Government pursuant to solicitations issued on or after December 1, 1995 is provided with the commercial license rights and restrictions described elsewhere herein. All SOURCE CODE provided to the U.S. Government pursuant to solicitations issued prior to December 1, 1995 is provided with "Restricted Rights" as provided for in FAR, 48 CFR 52.227-14 (JUNE 1987) or DFAR,48 CFR 252.227-7013 (OCT 1988), as applicable.
+
+6. EXPORT RESTRICTIONS. You acknowledge that the SOURCE CODE is subject to U.S. export jurisdiction. You agree to comply with all applicable international and national laws that apply to these products, including the U.S. Export Administration Regulations, as well as end-user, end-use and destination restrictions issued by U.S. and other governments.
+
+7. DISCLAIMER OF WARRANTY
+To the maximum extent permitted by applicable law, SMITH provides the SOURCE CODE and support services (if any) AS IS AND WITH ALL FAULTS, and hereby disclaim all other warranties and conditions, whether express, implied, or statutory, including, but not limited to, any (if any) implied warranties, duties or conditions of merchantability, of fitness for a particular purpose, of reliability or availability, of accuracy or completeness of responses, of results, of workmanlike effort, of lack of viruses, and of lack of negligence, all with regard to the SOURCE CODE, and the provision of or failure to provide support or other services, information, software, and related content through the SOURCE CODE or otherwise arising out of the use of the SOURCE CODE. ALSO, THERE IS NO WARRANTY OR CONDITION OF TITLE, QUIET ENJOYMENT, QUIET POSSESSION, CORRESPONDENCE TO DESCRIPTION, OR NON-INFRINGEMENT WITH REGARD TO THE SOURCE CODE.
+
+8.  EXCLUSION OF INCIDENTAL, CONSEQUENTIAL, AND CERTAIN OTHER DAMAGES. 
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL SMITH BE LIABLE FOR ANY SPECIAL, INCIDENTAL, PUNITIVE, INDIRECT, OR CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR LOSS OF PROFITS OR CONFIDENTIAL OR OTHER INFORMATION, FOR BUSINESS INTERRUPTION, FOR PERSONAL INJURY, FOR LOSS OF PRIVACY, FOR FAILURE TO MEET ANY DUTY INCLUDING OF GOOD FAITH OR OF REASONABLE CARE, FOR NEGLIGENCE, AND FOR ANY OTHER PECUNIARY OR OTHER LOSS WHATSOEVER) ARISING OUT OF OR IN ANY WAY RELATED TO THE USE OF OR INABILITY TO USE THE SOURCE CODE, THE PROVISION OF OR FAILURE TO PROVIDE SUPPORT OR OTHER SERVICES, INFORMATION, SOFTWARE, AND RELATED CONTENT THROUGH THE SOURCE CODE OR OTHERWISE ARISING OUT OF THE USE OF THE SOURCE CODE, OR OTHERWISE UNDER OR IN CONNECTION WITH ANY PROVISION OF THIS EULA, EVEN IN THE EVENT OF THE FAULT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY, BREACH OF CONTRACT, OR BREACH OF WARRANTY OF SMITH, AND EVEN IF SMITH HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+9. LIMITATION OF LIABILITY AND REMEDIES. NOTWITHSTANDING ANY DAMAGES THAT YOU MIGHT INCUR FOR ANY REASON WHATSOEVER (INCLUDING, WITHOUT LIMITATION, ALL DAMAGES REFERENCED ABOVE AND ALL DIRECT OR GENERAL DAMAGES), THE ENTIRE LIABILITY OF SMITH UNDER ANY PROVISION OF THIS EULA AND YOUR EXCLUSIVE REMEDY FOR ALL OF THE FOREGOING SHALL BE LIMITED TO THE GREATER OF THE AMOUNT ACTUALLY PAID BY YOU FOR THE SOURCE CODE OR U.S.$5.00.  THE FOREGOING LIMITATIONS, EXCLUSIONS AND DISCLAIMERS SHALL APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, EVEN IF ANY REMEDY FAILS ITS ESSENTIAL PURPOSE.
+
+10. APPLICABLE LAW. This EULA is governed by the laws of the State of Texas.
+
+11. ENTIRE AGREEMENT. This EULA (including any addendum or amendment to this EULA which is included with the SOURCE CODE) is the entire agreement between you and SMITH relating to the SOURCE CODE and support services (if any), and it supersedes all prior or contemporaneous oral or written communications, proposals, and representations with respect to the SOURCE CODE or any other subject matter covered by this EULA. To the extent the terms of any SMITH policies or programs for support services conflict with the terms of this EULA, the terms of this EULA shall control.
\ No newline at end of file
diff --git a/doc/InnovaHxReg.exe b/doc/InnovaHxReg.exe
new file mode 100644
index 00000000..ba1a6a07
Binary files /dev/null and b/doc/InnovaHxReg.exe differ
diff --git a/doc/build.xml b/doc/build.xml
new file mode 100644
index 00000000..e5c4792c
--- /dev/null
+++ b/doc/build.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0"?>
+
+<!--
+    Build file for the Spring.NET Docbook Documentation
+
+    $Id: build.xml,v 1.12 2007/12/06 15:53:07 oakinger Exp $
+
+    Build file based on build.xml from original Spring Framework, which
+		originated from the Hibernate documentation.  Building the documentation
+    requires you to download reference/lib from the sourceforge download area.
+-->
+
+<project name="Spring.NET Docbook" default="refdoc" basedir=".">
+
+  <property file="build.properties" />
+  <property file="project.properties" />
+
+  <target name="clean" description="Delete output and temporary directories.">
+    <delete dir="${basedir}/${doc.output.dir}" />
+  </target>
+
+
+  <target name="preparedocs"
+      description="Extra preparation for the documentation (common to all formats)">
+    <delete file="${basedir}/${doc.ref.dir}/src/dtd.xml"/>
+    <loadfile
+        property="doc.beansxsd"
+        srcFile="${src.dir}/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-1.1.xsd"/>
+    <copy
+        file="${basedir}/${doc.ref.dir}/src/xsd-template.xml"
+        tofile="${basedir}/${doc.ref.dir}/src/xsd.xml"/>
+    <replace
+        file="${basedir}/${doc.ref.dir}/src/xsd.xml"
+        token="@xsd-include@"
+        value="${doc.beansxsd}"/>
+  </target>
+
+  <!-- Extra preparation for HTML documentation -->
+  <target name="preparedocshtml">
+    <mkdir dir="${basedir}/${doc.ref.output.dir}/styles"/>
+    <copy file="${doc.ref.dir}/styles/html.css"
+      todir="${basedir}/${doc.ref.output.dir}/styles"/>
+
+    <!-- TODO fix this -->
+    <mkdir dir="${basedir}/${doc.ref.output.dir}/images/admons"/>
+    <mkdir dir="${basedir}/${doc.ref.output.dir}/images/callouts"/>
+
+    <copy todir="${basedir}/${doc.ref.output.dir}/images/admons">
+      <fileset dir="${doc.ref.dir}/images/admons"/>
+    </copy>
+    <copy todir="${basedir}/${doc.ref.output.dir}/images/callouts">
+      <fileset dir="${doc.ref.dir}/images/callouts"/>
+    </copy>
+
+  </target>
+
+  <target name="docpdf" depends="preparedocs"
+      description="Compile reference documentation to pdf">
+
+    <antcall target="copycommoncontent">
+      <param name="doc.type.output.dir"
+          value="${basedir}/${doc.ref.output.dir}/pdf/images"/>
+    </antcall>
+
+    <java classname="com.icl.saxon.StyleSheet" fork="true"
+        dir="${doc.ref.dir}">
+      <classpath>
+        <fileset dir="${basedir}/${docbook.lib.dir}">
+          <include name="**/*.jar" />
+        </fileset>
+      </classpath>
+      <arg value="-o" />
+      <arg value="${basedir}/${doc.ref.output.dir}/pdf/docbook_fop.tmp" />
+      <arg value="${basedir}/${doc.ref.dir}/src/index.xml" />
+      <arg value="${basedir}/${doc.ref.dir}/styles/fopdf.xsl" />
+    </java>
+
+    <java classname="org.apache.fop.apps.Fop" fork="true" maxmemory="1024m"
+        dir="${doc.ref.dir}">
+      <classpath>
+        <fileset dir="${basedir}/${docbook.lib.dir}">
+          <include name="**/*.jar" />
+        </fileset>
+      </classpath>
+      <arg value="-d" />
+      <arg value="${basedir}/${doc.ref.output.dir}/pdf/docbook_fop.tmp" />
+      <arg value="${basedir}/${doc.ref.output.dir}/pdf/spring-net-reference.pdf" />
+    </java>
+
+
+    <delete file="${doc.ref.output.dir}/pdf/docbook_fop.tmp" />
+
+
+  </target>
+
+  <target name="dochtml" depends="preparedocs,preparedocshtml"
+      description="Compile reference documentation to chunked html">
+
+    <antcall target="copycommoncontent">
+      <param name="doc.type.output.dir"
+          value="${basedir}/${doc.ref.output.dir}/html/images"/>
+    </antcall>
+
+    <java classname="com.icl.saxon.StyleSheet" fork="true"
+        dir="${doc.ref.output.dir}/html">
+      <classpath>
+        <fileset dir="${basedir}/${docbook.lib.dir}">
+          <include name="**/*.jar" />
+        </fileset>
+      </classpath>
+      <arg value="${basedir}/${doc.ref.dir}/src/index.xml" />
+      <arg value="${basedir}/${doc.ref.dir}/styles/html_chunk.xsl" />
+    </java>
+
+  </target>
+
+  <target name="dochtmlsingle" depends="preparedocs,preparedocshtml"
+      description="Compile reference documentation to single html">
+
+    <antcall target="copycommoncontent">
+      <param name="doc.type.output.dir"
+          value="${basedir}/${doc.ref.output.dir}/html_single/images"/>
+    </antcall>
+
+    <java classname="com.icl.saxon.StyleSheet" fork="true"
+        dir="${doc.ref.dir}">
+      <classpath>
+        <fileset dir="${basedir}/${docbook.lib.dir}">
+          <include name="**/*.jar" />
+        </fileset>
+      </classpath>
+      <arg value="-o" />
+      <arg value="${basedir}/${doc.ref.output.dir}/html_single/index.html" />
+      <arg value="${basedir}/${doc.ref.dir}/src/index.xml" />
+      <arg value="${basedir}/${doc.ref.dir}/styles/html.xsl" />
+    </java>
+
+  </target>
+
+  <target name="htmlhelp" depends="preparedocs,preparedocshtml"
+      description="Compile reference documentation to MS HTML-HELP">
+
+    <antcall target="copycommoncontent">
+      <param name="doc.type.output.dir"
+          value="${basedir}/${doc.ref.output.dir}/htmlhelp/images"/>
+    </antcall>
+
+    <java classname="com.icl.saxon.StyleSheet" fork="true"
+        dir="${doc.ref.output.dir}/htmlhelp">
+      <classpath>
+        <fileset dir="${basedir}/${docbook.lib.dir}">
+          <include name="**/*.jar" />
+        </fileset>
+      </classpath>
+      <arg value="${basedir}/${doc.ref.dir}/src/index.xml" />
+      <arg value="${basedir}/${doc.ref.dir}/styles/htmlhelp.xsl" />
+    </java>
+    <exec dir="${doc.ref.output.dir}/htmlhelp" executable="cmd.exe">
+      <arg line="/c 'C:\Program Files\HTML Help Workshop\hhc.exe' htmlhelp.hhp"/>
+    </exec>
+    <delete includeEmptyDirs="true">
+      <fileset dir="${doc.ref.output.dir}/htmlhelp">
+        <include name="**/*"/>
+        <exclude name="htmlhelp.chm"/>
+      </fileset>
+    </delete>
+
+
+
+  </target>
+
+  <!--
+  copies content common to all docs to the dir in the ${doc.type.output.dir} property
+  -->
+  <target name="copycommoncontent">
+    <mkdir dir="${doc.type.output.dir}"/>
+    <copy todir="${doc.type.output.dir}">
+      <fileset dir="${basedir}/${doc.ref.dir}/src/images">
+        <include name="*.gif"/>
+        <include name="*.svg"/>
+        <include name="*.jpg"/>
+        <include name="*.png"/>
+      </fileset>
+    </copy>
+    <copy todir="${doc.type.output.dir}">
+      <fileset dir="${basedir}/${doc.ref.dir}/images">
+        <include name="**/*.gif"/>
+        <include name="**/*.svg"/>
+        <include name="**/*.jpg"/>
+        <include name="**/*.png"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!-- this is the target to call for generating docs for the release -->
+  <target name="refdoc" depends="clean,dochtml,htmlhelp,docpdf"
+      description="Generate reference documentation"/>
+
+
+</project>
+
diff --git a/doc/docx/Spring-1.0/net-1.1/RegisterHelp2.bat b/doc/docx/Spring-1.0/net-1.1/RegisterHelp2.bat
new file mode 100644
index 00000000..9a60f2eb
--- /dev/null
+++ b/doc/docx/Spring-1.0/net-1.1/RegisterHelp2.bat
@@ -0,0 +1,12 @@
+REM Register the Namespace
+InnovaHxReg /R /N /Namespace:Spring.NET /Description:"Spring.Aop" /Collection:COL_Spring-1.0.2.hxc
+
+REM Register the help file (title in Help 2.0 terminology)
+InnovaHxReg /R /T /namespace:Spring.NET /id:Spring.NET-1.0.2 /langid:1033 /helpfile:Spring.NET.hxs
+
+REM Plug in to the Visual Studio.NET 2002 help system
+InnovaHxReg /R /P /productnamespace:MS.VSCC /producthxt:_DEFAULT /namespace:Spring.NET /hxt:_DEFAULT
+
+REM Plug in to the Visual Studio.NET 2003 help system
+InnovaHxReg /R /P /productnamespace:MS.VSCC.2003 /producthxt:_DEFAULT /namespace:Spring.NET /hxt:_DEFAULT
+
diff --git a/doc/docx/Spring-1.0/net-1.1/Spring-1.0.2.dxp b/doc/docx/Spring-1.0/net-1.1/Spring-1.0.2.dxp
new file mode 100644
index 00000000..f1bdf5ed
--- /dev/null
+++ b/doc/docx/Spring-1.0/net-1.1/Spring-1.0.2.dxp
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXProject Version="5.0" CompileHelpFile="True" RefreshIfExists="False" DocumentSourceCode="False" AlwaysCopySupportFiles="True" PropertyCommentsFrom="0" RelationshipsFrom="2" DefaultRelsOnlyForCollections="True" ProjectGroupName="Spring-1.0.2" HTMLHelpVersion="2" HHNamespace="Spring.NET" HHIdentifier="Spring.NET-1.0.2" H2PlugIn="True" H2PlugInNamespace="MS.VSCC,MS.VSCC.2003" LocaleID="0" ExcludeFiltersRegExp="False">
+    <OutputLocation OutputFolder="L:\projects\Spring.Net\doc\sdk\Spring-1.0\net-1.1\web\" HelpFileName="L:\projects\Spring.Net\doc\sdk\Spring-1.0\net-1.1\htmlhelp1and2\Spring.NET.hxs" UseFilenameAliases="False" StripMetadata="False" ClearBeforeBuild="False" RemoveOutputFilesAfterCompile="False"/>
+    <HTMLHelpOptions UseALinkMenus="False"/>
+    <OtherOptions CreateContextLinks="True" WriteHelpDescriptions="True" CopySourceCode="False" CreateWinHelpStub="False" Language="English"/>
+    <IncludeFilters IncludePrivate="False" IncludeFriend="False" IncludeProtected="True" IdentifyVisibility="False">
+        <Namespaces>
+            <Property Name="DX.NET:Method">True</Property>
+            <Property Name="DX.NET:Property">True</Property>
+            <Property Name="DX.NET:Field">True</Property>
+            <Property Name="DX.NET:Event">True</Property>
+            <Property Name="DX.NET:Constructor">True</Property>
+            <Property Name="DX.NET:Operator">True</Property>
+        </Namespaces>
+    </IncludeFilters>
+    <CommentExtraction UnTaggedBlocks="False" UnTaggedEnumerations="False" UnTaggedEvents="False" UnTaggedModules="False" UnTaggedUDTs="False" UnTaggedVariables="False" HelpDescriptionImport="1"/>
+    <Diagrams PageNestingLevels="2" OverviewNestingLevels="3" SupressSingleObjectDiagrams="True" DiagramStyleSource="0" ObjFillColor="0" ObjTextColor="0" ObjBorderColor="0" ColFillColor="0" ColTextColor="0" ColBorderColor="0" UseDropShadow="False" CenterCaptions="False" DiagramBold="False" BorderWidth="0" UseDiagramShapes="False"/>
+    <VariableValues>
+        <VariableValue Name="CopyrightNotice" Value="&amp;copy; 2004-2006 Spring.NET Authors. All Rights Reserved."/>
+        <VariableValue Name="FeedbackLink" Value="&lt;a href=&quot;http://forum.springframework.net&quot;&gt;Send comments&lt;/a&gt; on this topic."/>
+        <VariableValue Name="DefaultTypeRequirements" Value="&lt;h4 class=dxh4&gt;$$Requirements$$&lt;/h4&gt;&lt;p&gt;&lt;b&gt;Namespace: &lt;/b&gt;%%linkedcurrentnamespace%%&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Platforms:&lt;/b&gt; Windows 98, Windows NT 4.0, Windows Millennium Edition, Windows 2000, Windows XP Home Edition, Windows XP Professional, Windows Server 2003 family&lt;/p&gt;&lt;p&gt;&lt;b&gt;Assembly: &lt;/b&gt;%%assemblyname%% (in %%assemblyfilename%%)&lt;/p&gt;"/>
+        <VariableValue Name="DefaultMemberRequirements" Value="&lt;h4 class=dxh4&gt;$$Requirements$$&lt;/h4&gt;&lt;p&gt;&lt;b&gt;Platforms:&lt;/b&gt; Windows 98, Windows NT 4.0, Windows Millennium Edition, Windows 2000, Windows XP Home Edition, Windows XP Professional, Windows Server 2003 family&lt;/p&gt;"/>
+    </VariableValues>
+    <AdditionalFiles/>
+    <ModelComments/>
+    <IgnoreRelationships/>
+    <NamespaceExclusions>
+        <e>Spring.Core~Spring.Collections.DictionarySet+DictionarySetEnumerator</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+Node</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+NodeHolder</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+LinkedListEnumerator</e>
+        <e>Spring.Core~Spring.Collections.PriorityQueue+PriorityQueueEnumerator</e>
+        <e>Spring.Core~Spring.Context.Support.AbstractApplicationContext+ObjectPostProcessorChecker</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+ContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+RootContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+DescendantContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+ContextSchema</e>
+        <e>Spring.Core~Spring.Context.Support.DelegatingMessageSource+SpecialCaseNullMessageSource</e>
+        <e>Spring.Core~__Delegates</e>
+        <e>Spring.Core~Spring.Core.ControlFlowFactory+DefaultControlFlow</e>
+        <e>Spring.Core~Spring.Core.ControlFlowFactory+DefaultControlFlow+MethodsDeclaredTypeCriteria</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionLexer</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionParser</e>
+        <e>Spring.Core~Spring.Expressions.NodeWithArguments</e>
+        <e>Spring.Core~Spring.Expressions.ArrayConstructorNode</e>
+        <e>Spring.Core~Spring.Expressions.AssignNode</e>
+        <e>Spring.Core~Spring.Expressions.BinaryOperator</e>
+        <e>Spring.Core~Spring.Expressions.BooleanLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.CompareOperator</e>
+        <e>Spring.Core~Spring.Expressions.ConstructorNode</e>
+        <e>Spring.Core~Spring.Expressions.DateLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionListNode</e>
+        <e>Spring.Core~Spring.Expressions.HexLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.IndexerNode</e>
+        <e>Spring.Core~Spring.Expressions.IntLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.MethodNode</e>
+        <e>Spring.Core~Spring.Expressions.NullLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.OpADD</e>
+        <e>Spring.Core~Spring.Expressions.OpAND</e>
+        <e>Spring.Core~Spring.Expressions.OpDIVIDE</e>
+        <e>Spring.Core~Spring.Expressions.OpEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpGreater</e>
+        <e>Spring.Core~Spring.Expressions.OpGreaterOrEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpLess</e>
+        <e>Spring.Core~Spring.Expressions.OpLessOrEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpMODULUS</e>
+        <e>Spring.Core~Spring.Expressions.OpMULTIPLY</e>
+        <e>Spring.Core~Spring.Expressions.UnaryOperator</e>
+        <e>Spring.Core~Spring.Expressions.OpNOT</e>
+        <e>Spring.Core~Spring.Expressions.OpNotEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpOR</e>
+        <e>Spring.Core~Spring.Expressions.OpPOWER</e>
+        <e>Spring.Core~Spring.Expressions.OpSUBTRACT</e>
+        <e>Spring.Core~Spring.Expressions.OpUnaryMinus</e>
+        <e>Spring.Core~Spring.Expressions.OpUnaryPlus</e>
+        <e>Spring.Core~Spring.Expressions.ProjectionNode</e>
+        <e>Spring.Core~Spring.Expressions.PropertyOrFieldNode</e>
+        <e>Spring.Core~Spring.Expressions.RealLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.ReferenceNode</e>
+        <e>Spring.Core~Spring.Expressions.SelectorNode</e>
+        <e>Spring.Core~Spring.Expressions.StringLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.TernaryNode</e>
+        <e>Spring.Core~Spring.Expressions.TypeNode</e>
+        <e>Spring.Core~Spring.Expressions.VariableNode</e>
+        <e>Spring.Core~Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject+GenericObjectFactory</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.AutowireUtils+ConstructorComparer</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.AutowireUtils+MinimumArgumentCountCriteria</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy+MethodInjectingTypeBuilder</e>
+        <e>Spring.Core~Spring.Objects.Support.AutoWiringEventHandlerValue+AutoWirer</e>
+        <e>Spring.Core~Spring.Pool.Support.ISync</e>
+        <e>Spring.Core~Spring.Pool.Support.Semaphore</e>
+        <e>Spring.Core~Spring.Util.TypeResolver+TypeAssemblyInfo</e>
+        <e>Spring.Core~Spring.Validation.ValidationConfigParser+ValidatorDefinitionConstants</e>
+        <e>Spring.Core~Spring.Validation.ValidationConfigParser+MessageConstants</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.AfterReturningAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.BeforeAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.ThrowsAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.DynamicProxy.BaseProxyMethodBuilder</e>
+        <e>Spring.Aop~Spring.Aop.Framework.DynamicProxy.BoxingOpCodes</e>
+        <e>Spring.Aop~Spring.Aop.Framework.DynamicProxy.References</e>
+        <e>Spring.Aop~Spring.Aop.Framework.DynamicProxy.IntroductionProxyMethodBuilder</e>
+        <e>Spring.Aop~Spring.Aop.Framework.DynamicProxy.TargetProxyMethodBuilder</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Aspect</e>
+        <e>Spring.Aop~Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.MethodMatchers+UnionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.MethodMatchers+IntersectionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.TypeFilters+UnionTypeFilter</e>
+        <e>Spring.Aop~Spring.Aop.Support.TypeFilters+IntersectionTypeFilter</e>
+        <e>Spring.Aop~Spring.Aop.Support.UnionPointcut</e>
+        <e>Spring.Aop~Spring.Aop.Support.UnionPointcut+PointcutUnionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Target.EmptyTargetSource+EmptyTargetSourceObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TrueMethodMatcher+TrueMethodMatcherObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TruePointcut+TruePointcutObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TrueTypeFilter+TrueTypeFilterObjectReference</e>
+    </NamespaceExclusions>
+    <DotNetProperties IncludeRelationshipDiagrams="True" IncludeInheritanceHierarchies="True" IncludeBaseMembers="False" StandardInterfaces="System.*,Microsoft.*" OnlyLinkInherited="True" ExternalDocs="True" UseCommentFiles="True" DrillCommentFiles="True" GenerateXMLLinks="False" XMLIsland="" NoInheritedTopics="True" NoInheritedInLists="False" CreateXMLCommentFile="False" ExcludedLanguages="Delphi,JScript,CPP,CPP2005" GenerateAttributes="True" AttributeFilter="" AttributeFilterInclude="False" VBNETDefaultConstructor="False" LinkOverridenMembersToBaseImplementation="False" UseOverloadSummaryForMasterSummary="False" ExcludeEditorBrowsable="True" GenerateBreadCrumbs="True" IncludeAssemblyBreadCrumb="False"/>
+    <DatabaseProperties DocumentViewSource="True" DocumentTriggerSource="True" DocumentProcedureSource="True" RetainTaggedComments="False"/>
+    <XSDProperties UseCustomSettings="False" PageNestingLevels="2" SuppressSingleObjectDiagrams="True" ElementFillColor="15780518" ElementTextColor="0" ElementBorderColor="10789024" ElementBorders="True" ElementRefFillColor="12648447" ElementRefTextColor="0" ElementRefBorderColor="10789024" ElementRefBorders="True" ComplexTypeFillColor="15780518" ComplexTypeTextColor="0" ComplexTypeBorderColor="10789024" ComplexTypeBorders="True" AnyFillColor="13421772" AnyTextColor="0" AnyBorderColor="10789024" AnyBorders="True" NotationTextColor="8421504" RootLinesColor="10789024" DropShadows="False" BoldCaptions="True" GroupParticleSequenceImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\sequence.gif" GroupParticleChoiceImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\choice.gif" GroupParticleAllImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\all.gif"/>
+    <CommentFiles>
+        <CommentFile FileName="Spring.Core.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Core.dll"/>
+        <CommentFile FileName="Spring.Aop.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Aop.dll"/>
+    </CommentFiles>
+    <DocType Name="dx.net" Template="Microsoft .NET Framework SDK Style" UseHelpTemplates="False">
+        <TOCSource TOCSource="1" SpecificTOCName="">
+            <NodeDef Key="N17086" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Introduction$$" NodeIconIndex="1" NodeType="0" PageLayout="introduction.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N0" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N34" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Assembly" PageTypeNamespaceFilter="" ParentKey="N0" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N17085" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Getting_Started$$" NodeIconIndex="1" NodeType="0" PageLayout="gettingstarted.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N0" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N19" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N16" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N17" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N21" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Event" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N18" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N0" DependantCount="1" DependantOnnamespace="DX.NET:Assembly" DependantOnnamespace_Filter="" DependantStillProcessChildren="True" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Assembly" PageTypeNamespaceFilter="" ParentKey="" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5711" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Namespaces$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N0" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5758" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Namespace" PageTypeNamespaceFilter="" ParentKey="N5711" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5759" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="0" PageLayout="namespace.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5716" DependantCount="1" DependantOnnamespace="DX.NET:Class" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Classes$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5715" DependantCount="1" DependantOnnamespace="DX.NET:Enumeration" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Enumerations$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5713" DependantCount="1" DependantOnnamespace="DX.NET:Structure" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Structures$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5938" DependantCount="1" DependantOnnamespace="DX.NET:Interface" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Interfaces$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6003" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Class" PageTypeNamespaceFilter="" ParentKey="N5716" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5847" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="0" PageLayout="class.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5846" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Members$$" NodeIconIndex="1" NodeType="0" PageLayout="class_members.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N8630" DependantCount="1" DependantOnnamespace="DX.NET:Constructor" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Constructor_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Constructor" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N16" DependantCount="1" DependantOnnamespace="DX.NET:Method" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Methods$$" NodeIconIndex="1" NodeType="0" PageLayout="class_methods.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N17" DependantCount="1" DependantOnnamespace="DX.NET:Property" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Properties$$" NodeIconIndex="1" NodeType="0" PageLayout="class_properties.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7637" DependantCount="1" DependantOnnamespace="DX.NET:Field" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Fields$$" NodeIconIndex="1" NodeType="0" PageLayout="class_fields.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N18" DependantCount="1" DependantOnnamespace="DX.NET:Event" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Events$$" NodeIconIndex="1" NodeType="0" PageLayout="class_events.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20517" DependantCount="1" DependantOnnamespace="DX.NET:Operator" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Operators$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6004" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Enumeration" PageTypeNamespaceFilter="" ParentKey="N5715" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6005" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Structure" PageTypeNamespaceFilter="" ParentKey="N5713" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6006" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Interface" PageTypeNamespaceFilter="" ParentKey="N5938" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6010" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="0" PageLayout="class.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6011" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Members$$" NodeIconIndex="1" NodeType="0" PageLayout="class_members.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6012" DependantCount="1" DependantOnnamespace="DX.NET:Method" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Methods$$" NodeIconIndex="1" NodeType="0" PageLayout="Interface_methods.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6013" DependantCount="1" DependantOnnamespace="DX.NET:Property" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Properties$$" NodeIconIndex="1" NodeType="0" PageLayout="Interface_properties.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6014" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6013" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6016" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6012" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6017" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Event" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6015" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6495" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N19" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6496" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N20" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6497" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6016" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6498" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6014" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7064" DependantCount="1" DependantOnnamespace="DX.NET:Delegate" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="Delegates" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7065" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Delegate" PageTypeNamespaceFilter="" ParentKey="N7064" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7638" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Field" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N7637" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7639" DependantCount="1" DependantOnnamespace="DX.NET:Field" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Fields$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6015" DependantCount="1" DependantOnnamespace="DX.NET:Event" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Events$$" NodeIconIndex="1" NodeType="0" PageLayout="Interface_events.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7640" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Field" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N7639" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N8631" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Constructor_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Constructor" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N8630" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13683" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13635" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13684" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13636" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13685" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Field" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13637" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13686" DependantCount="1" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13683" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13736" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13684" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13737" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Constructor_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Constructor" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13631" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13738" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="0" PageLayout="structure.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13739" DependantCount="1" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Members$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_members.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13631" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Constructor_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Constructor" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13635" DependantCount="1" DependantOnnamespace="DX.NET:Method" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Methods$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_methods.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13636" DependantCount="1" DependantOnnamespace="DX.NET:Property" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Properties$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_properties.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13637" DependantCount="1" DependantOnnamespace="DX.NET:Field" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Fields$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_fields.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N19946" DependantCount="1" DependantOnnamespace="DX.NET:Event" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Events$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_events.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N19947" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Event" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N19946" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20518" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Operator" PageTypeNamespaceFilter="" ParentKey="N20517" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20519" DependantCount="1" DependantOnnamespace="DX.NET:Operator" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Operators$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20520" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Operator" PageTypeNamespaceFilter="" ParentKey="N20519" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+        </TOCSource>
+        <ModelCommentProfile Version="5.0" Namespace="dx.net" Name="" Description=""/>
+    </DocType>
+    <NetAssemblies RootAssemblyName="Spring.Core">
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Core.dll" mRootModule="" AssemblyName="Spring.Core" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Aop.dll" mRootModule="" AssemblyName="Spring.Aop" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+    </NetAssemblies>
+    <PropertyBag/>
+</DocumentXProject>
diff --git a/doc/docx/Spring-1.0/net-1.1/Spring.Aop.dxc b/doc/docx/Spring-1.0/net-1.1/Spring.Aop.dxc
new file mode 100644
index 00000000..4f146bd4
--- /dev/null
+++ b/doc/docx/Spring-1.0/net-1.1/Spring.Aop.dxc
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Aop.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Aop" RelatedProject="Spring-1.0-net-1.1.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="True" LoadOnDemand="False" LoadSourceComments="False">
+    <IgnoreWordList/>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Aop" tid="##PROJECT_INTRODUCTION" q="" cd="38813.6247569444"><![CDATA[<P><SPAN class=emphasis><EM>Aspect-Oriented Programming</EM></SPAN> (<SPAN class=emphasis><EM>AOP</EM></SPAN>) complements OOP by providing another way of thinking about program structure. Whereas OO decomposes applications into a hierarchy of objects, AOP decomposes programs into <SPAN class=emphasis><EM>aspects</EM></SPAN> or <SPAN class=emphasis><EM>concerns.&nbsp;</EM> This enables the modularization of concerns such as transaction management that would otherwise cut across multiple objects (such concerns are often termed <SPAN class=emphasis><EM>crosscutting</EM></SPAN> concerns).</SPAN></P>]]></c>
+<c eid="Spring.Aop" tid="##PROJECT_GETTINGSTARTED" q="" cd="38813.6255208333"><![CDATA[The <A href="http://www.springframework.net/doc/reference/html/aop-quickstart.html">AOP Quickstart</A> included in the distribution is a good starting point to explore the functionality offered in Spring.NET's AOP Framework.]]></c>
+<c eid="Spring.Aop~AopAlliance.Aop_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[AOP framework interfaces based on the <A href="http://aopalliance.sourceforge.net/">AOP Alliance</A> API.]]></c>
+<c eid="Spring.Aop~AopAlliance.Intercept_namespace" tid="##SUMMARY" q="" cd="38813.6244675926">AOP Alliance interception interfaces.</c>
+<c eid="Spring.Aop~Spring.Aop_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>Core Spring.NET AOP interfaces, built on top of and implementing all of the AOP Alliance AOP interoperability interfaces.</P>
+<P>Spring.NET AOP also offers:</P>
+<OL>
+<LI>Introduction support</LI>
+<LI>A pointcut abstraction, supporting "static" pointcuts (class and method-based) and "dynamic" pointcuts (also considering method arguments).</LI>
+<LI>A&nbsp;full range of advice types, including around, before, after returning and throws advice.</LI>
+<LI>Extensibility points allowing arbitrary custom advice types to be plugged in without modifying the core framework.</LI></OL>
+<P>Spring.NET AOP can be used programmatically or (preferably) in conjunction with the Spring.NET IoC container.</P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Advice_namespace" tid="##SUMMARY" q="" cd="38813.6244675926">Implementations of common types of Advice (Aspects).</c>
+<c eid="Spring.Aop~Spring.Aop.Framework_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>Basic AOP infrastructure compliant with the <A href="http://aopalliance.sourceforge.net/">AOP Alliance</A>&nbsp;interfaces.</P>
+<P>Spring.NET AOP supports proxying interfaces or classes, introductions, and offers static and dynamic pointcuts.<BR></P>
+<P>Any Spring.NET AOP proxy can be cast to the %ProxyConfig:Spring.Aop~Spring.Aop.Framework.ProxyConfig% AOP configuration interface in this namespace to add or remove interceptors.</P>
+<P>The %ProxyFactoryObject:Spring.Aop~Spring.Aop.Framework.ProxyFactoryObject% is a convenient way to create AOP proxies in an IObjectFactory or IApplicationContext. However, proxies can be created programmatically using the %ProxyFactory:Spring.Aop~Spring.Aop.Framework.ProxyFactory% class.</P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Framework.Adapter_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>Service Provider Interface (SPI) namespace allowing Spring.NET AOP framework to handle arbitrary advice types.<BR></P>
+<P>Users who want to use the Spring.NET AOP framework, rather than extend its capabilities, don't need to concern themselves with this namespace.</P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Framework.AutoProxy_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[Object&nbsp;post-processors for use in IApplicationContexts to simplify AOP usage by automatically creating AOP proxies without the need to use a ProxyFactoryObject. 
+<P>&nbsp; 
+<P>The various post-processors in this package need only be added to an IApplicationContext (typically in an XML object definition document) to automatically proxy selected objects. </P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Framework.AutoProxy.Target_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>Generic support classes for target source creation. </P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Framework.DynamicProxy_namespace" tid="##SUMMARY" q="" cd="38813.6245717593">Contains functionality relating to the creation of dynamic proxy instances.</c>
+<c eid="Spring.Aop~Spring.Aop.Support_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[Convenience classes for using Spring.NET's AOP API.]]></c>
+<c eid="Spring.Aop~Spring.Aop.Target_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>This namespace contains implementations of the %Spring.Aop.ITargetSource:Spring.Aop~Spring.Aop.ITargetSource% interface.<BR></P>
+<P>The simplest implementation is the %SingletonTargetSource:Spring.Aop~Spring.Aop.Target.SingletonTargetSource%, which is used in the AOP framework to wrap a single target instance. This is normally appropriate, and is the current default.</P>
+<P>Other features include pooling implementations, that provides a target from a pool for each request, ensuring a single threaded programming model; and a&nbsp;"prototype" implementation, that uses a new target instance for each invocation. (Much like single-call .NET remoting semanics).</P>]]></c>
+    </DocumentXComments>
+
diff --git a/doc/docx/Spring-1.0/net-1.1/Spring.Core.dxc b/doc/docx/Spring-1.0/net-1.1/Spring.Core.dxc
new file mode 100644
index 00000000..8240daa3
--- /dev/null
+++ b/doc/docx/Spring-1.0/net-1.1/Spring.Core.dxc
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Core.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Core" RelatedProject="Spring-1.0-net-1.1.dxp" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="True" LoadOnDemand="False" LoadSourceComments="False">
+    <IgnoreWordList>Globalization|instantiating</IgnoreWordList>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <lang_vbUsage>on</lang_vbUsage>
+        <lang_VB>on</lang_VB>
+        <lang_CS>on</lang_CS>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Core" tid="##PROJECT_INTRODUCTION" q="" cd="38801.9069444444"><![CDATA[<P>The Spring.Core namespace provides an implementation of an Inversion of Control container.&nbsp;</P>
+<P>Inversion of Control (IoC) containers provide a&nbsp;simple but powerful means to&nbsp;create and configure properties of objects in your application.&nbsp; These properties maybe simple types, such as strings or integers but much of the power of an IoC container comes from the ability to set properties that are refernces to other objects in your application, i.e. an objects dependencies.&nbsp;</P>
+<P>An introductory article to IoC containers can be found in the September 2005 edition of <A href="http://msdn.microsoft.com/msdnmag/issues/05/09/DesignPatterns/default.aspx">MSDN Magazine</A>.&nbsp; Links to additional introductory material on IoC containers can be found on&nbsp;the <A href="www.springframework.net">Spring.NET</A> or <A href="www.springframework.org">Spring Framework</A> websites.</P>
+<P>The design of Spring.NET's IoC container is such that your application objects configured by the IoC container almost always to not need to depend on any classes or interfaces contained in this namespace.&nbsp;</P>
+<P>However, you may find it useful to reference this namespace as it contains&nbsp;some general framework style classes&nbsp; &nbsp;These range from&nbsp;%Spring.Expressions:Spring.Core~Spring.Expressions_namespace% that provides&nbsp;evaluation of object graph expressions to&nbsp;%Spring.Util:Spring.Core~Spring.Util_namespace% that provides various Reflection, String, and XML utility functions.</P>]]></c>
+<c eid="Spring.Core" tid="##PROJECT_GETTINGSTARTED" q="" cd="38801.9067824074"><![CDATA[<P>Inversion of Control (IoC) containers provide a non-invasive means to configure the dependency of objects in your application.&nbsp; A more detailed&nbsp;introduction to IoC containers can be found is this <A href="http://martinfowler.com/articles/injection.html">article</A> by Martin Fowler which uses a simple movie search application as a means to demonstrate the IoC container.&nbsp; This example&nbsp;implemented using Spring.NET's IoC is available as part of the&nbsp;the Spring.NET distribution and documented as the <A href="http://www.springframework.net/doc/reference/html/quickstarts.html">MovieFinder Quickstart</A>.</P>]]></c>
+<c eid="Spring.Core~Spring.Attributes_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Custom .NET Attributes provided by the Spring.NET Framework.</c>
+<c eid="Spring.Core~Spring.Collections_namespace" tid="##SUMMARY" q="" cd="38801.9067824074"><![CDATA[Collection style classes used throughout the Spring.NET framework.&nbsp; Most notably an implementation of a %Set:Spring.Core~Spring.Collections.ISet% collection class.]]></c>
+<c eid="Spring.Core~Spring.Context_namespace" tid="##SUMMARY" q="" cd="38801.9067824074"><![CDATA[<P>Builds on the feature set provided by the Spring.Objects namespace to add support for&nbsp;message sources and for the Observer design pattern, and the ability for application objects to obtain resources.</P>
+<P>There is no necessity for Spring.NET applications explicitly to depend on the functionality provided by either of the&nbsp;%IApplicationContext:Spring.Core~Spring.Context.IApplicationContext% or %IObjectFactory:Spring.Core~Spring.Objects.Factory.IObjectFactory% interfaces. One of the strengths of the Spring.NET architecture is that application objects can almost always be configured without any dependency on Spring.NET-specific APIs.</P>]]></c>
+<c eid="Spring.Core~Spring.Context.Events_namespace" tid="##SUMMARY" q="" cd="38801.9067824074"><![CDATA[<P>Support classes for application events, such as standard context events.</P>]]></c>
+<c eid="Spring.Core~Spring.Context.Support_namespace" tid="##SUMMARY" q="" cd="38801.9067824074"><![CDATA[<P>Support classes for the functionality defined in the Spring.Context namespace.<BR></P>
+<P>Contains abstract base classes for the %IApplicationContext:Spring.Core~Spring.Context.IApplicationContext% and %IMessageSource:Spring.Core~Spring.Context.IMessageSource% interfaces.</P>]]></c>
+<c eid="Spring.Core~Spring.Core_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Provides core interfaces that are not specific to any part of the framework.</c>
+<c eid="Spring.Core~Spring.Core.IO_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Generic abstraction for resources such as files accessed via HTTP or the local file system.</c>
+<c eid="Spring.Core~Spring.DataBinding_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Provides data binding of objects to view components.</c>
+<c eid="Spring.Core~Spring.Expressions_namespace" tid="##SUMMARY" q="" cd="38801.9067824074"><![CDATA[Provides&nbsp;evaluation of object graph expressions.]]></c>
+<c eid="Spring.Core~Spring.Globalization_namespace" tid="##SUMMARY" q="" cd="38801.9067824074"><![CDATA[Defines the core interfaces and support classes for internationalization&nbsp;support.]]></c>
+<c eid="Spring.Core~Spring.Globalization.Localizers_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Defines implementations of the %ILocalizer:Spring.Core~Spring.Globalization.ILocalizer% interface that apply resources to target objects as well as any supporting classes.</c>
+<c eid="Spring.Core~Spring.Globalization.Resolvers_namespace" tid="##SUMMARY" q="" cd="38801.9067824074"><![CDATA[Defines implementations of the %ICultureResolver:Spring.Core~Spring.Globalization.ICultureResolver% strategy interface for resolving CultureInfo instances as well as&nbsp;any supporting classes.]]></c>
+<c eid="Spring.Core~Spring.Objects_namespace" tid="##SUMMARY" q="" cd="38801.9067824074"><![CDATA[<P>Contains interfaces and classes for manipulating plain old .NET objects (PONOs).</P>
+<P>The classes and interfaces declared in this namespace are central to Spring.NET's Inversion of Control (IoC) container implementation.</P>]]></c>
+<c eid="Spring.Core~Spring.Objects.Events_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Interfaces that define a loosely coupled event model.</c>
+<c eid="Spring.Core~Spring.Objects.Events.Support_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Support classes for the interfaces defined in the Spring.Objects.Events namespace, such as an implementation of the %IEventRegistry:Spring.Core~Spring.Objects.Events.IEventRegistry% interface.</c>
+<c eid="Spring.Core~Spring.Objects.Factory_namespace" tid="##SUMMARY" q="" cd="38801.9067824074"><![CDATA[The core namespace implementing Spring.NET's lightweight Inversion of Control (IoC) container.<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<BR>Provides an alternative to the Singleton and Prototype design patterns, including a consistent approach to configuration management. Builds on top of the classes defined in the %Spring.Objects:Spring.Core~Spring.Objects_namespace% namespace.]]></c>
+<c eid="Spring.Core~Spring.Objects.Factory.Config_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Configuration-related convenience classes for object factories.</c>
+<c eid="Spring.Core~Spring.Objects.Factory.Support_namespace" tid="##SUMMARY" q="" cd="38801.9067824074"><![CDATA[Classes supporting the classes defined in the Spring.Objects.Factory namespace.<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;p /&gt;<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Contains a number of abstract base classes for custom IObjectFactory implementations.]]></c>
+<c eid="Spring.Core~Spring.Objects.Factory.Xml_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Contains an abstract XML-based %IObjectFactory:Spring.Core~Spring.Objects.Factory.IObjectFactory% implementation, including an XML Schema for validation.</c>
+<c eid="Spring.Core~Spring.Objects.Support_namespace" tid="##SUMMARY" q="" cd="38801.9067824074"><![CDATA[<P>Classes supporting the classes defined in the %Spring.Objects.Factory:Spring.Core~Spring.Objects.Factory_namespace% namespace.<BR></P>
+<P>Contains a number of abstract base classes for custom %IObjectFactory:Spring.Core~Spring.Objects.Factory.IObjectFactory% implementations.</P>]]></c>
+<c eid="Spring.Core~Spring.Objects.TypeConverters_namespace" tid="##SUMMARY" q="" cd="38801.9067824074"><![CDATA[<P>TypeConverters are used to convert between string and objects and vice versa.<BR></P>
+<P>Some of the custom type converter implementation classes in this namespace are registered automatically by an appropriate IObjectWrapper implementation class.</P>
+<P><BR>Please consult either the reference documentation or the embedded (API) documentation (for the appropriate IObjectWrapper implementation class) for the specifics of which TypeConverters are pre-registered.</P>]]></c>
+<c eid="Spring.Core~Spring.Pool_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Contains object pool interfaces.</c>
+<c eid="Spring.Core~Spring.Pool.Support_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Contains simple object pool implementation.</c>
+<c eid="Spring.Core~Spring.Proxy_namespace" tid="##SUMMARY" q="" cd="38801.9067824074"><![CDATA[<P>Provides classes that can create proxy types via composition or inheritance, and apply any number of custom attributes to the class definition and / or members of the proxied type.<BR></P>
+<P>This is useful in those cases where attributes may need to be applied to a class definition to take advantage of behavior that relies on the presence of such attributes. Examples of behavior that can be controlled&nbsp;via the use of attributes include COM+ ServicedComponents and web services.</P>]]></c>
+<c eid="Spring.Core~Spring.Util_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Miscellaneous utility classes, such as string manipulation utilities.</c>
+<c eid="Spring.Core~Spring.Validation_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Provides validation functionality, for usage in business and / or UI layers.</c>
+<c eid="Spring.Core~Spring.Validation.Actions_namespace" tid="##SUMMARY" q="" cd="38801.9067824074">Implementations of %IValidationAction:Spring.Core~Spring.Validation.IValidationAction%.</c>
+    </DocumentXComments>
+
diff --git a/doc/docx/Spring-1.0/net-1.1/UnRegisterHelp2.bat b/doc/docx/Spring-1.0/net-1.1/UnRegisterHelp2.bat
new file mode 100644
index 00000000..5da54b7d
--- /dev/null
+++ b/doc/docx/Spring-1.0/net-1.1/UnRegisterHelp2.bat
@@ -0,0 +1,12 @@
+REM Remove the plug in to the Visual Studio.NET 2003 help system
+InnovaHxReg /U /P /productnamespace:MS.VSCC.2003 /producthxt:_DEFAULT /namespace:Spring.NET /hxt:_DEFAULT
+
+REM Remove the plug in to the Visual Studio.NET 2002 help system
+InnovaHxReg /U /P /productnamespace:MS.VSCC /producthxt:_DEFAULT /namespace:Spring.NET /hxt:_DEFAULT
+
+REM Un-Register the help file (title in Help 2.0 terminology)
+InnovaHxReg /U /T /namespace:Spring.NET /id:Spring.NET-1.0.2 /langid:1033 /helpfile:Spring.NET.hxs
+
+REM Un-Register the Namespace
+InnovaHxReg /U /N /Namespace:Spring.NET /Description:"Spring.Aop" /Collection:COL_Spring-1.0.2.hxc
+
diff --git a/doc/docx/Spring-1.0/net-2.0/RegisterHelp2.bat b/doc/docx/Spring-1.0/net-2.0/RegisterHelp2.bat
new file mode 100644
index 00000000..12d95c9b
--- /dev/null
+++ b/doc/docx/Spring-1.0/net-2.0/RegisterHelp2.bat
@@ -0,0 +1,8 @@
+REM Register the Namespace
+InnovaHxReg /R /N /Namespace:Spring.NET-1.0.2.2 /Description:"Spring.Aop" /Collection:COL_Spring-1.0.2.hxc
+
+REM Register the help file (title in Help 2.0 terminology)
+InnovaHxReg /R /T /namespace:Spring.NET-1.0.2.2 /id:Spring.NET-1.0.2-.NET-2.0 /langid:1033 /helpfile:Spring.NET.hxs
+
+REM Plug in to the Visual Studio.NET 2005 help system
+InnovaHxReg /R /P /productnamespace:MS.VSIPCC.v80 /producthxt:_DEFAULT /namespace:Spring.NET-1.0.2.2 /hxt:_DEFAULT
\ No newline at end of file
diff --git a/doc/docx/Spring-1.0/net-2.0/Spring-1.0.2.dxp b/doc/docx/Spring-1.0/net-2.0/Spring-1.0.2.dxp
new file mode 100644
index 00000000..4328e577
--- /dev/null
+++ b/doc/docx/Spring-1.0/net-2.0/Spring-1.0.2.dxp
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXProject Version="5.0" CompileHelpFile="True" RefreshIfExists="False" DocumentSourceCode="False" AlwaysCopySupportFiles="True" PropertyCommentsFrom="0" RelationshipsFrom="2" DefaultRelsOnlyForCollections="True" ProjectGroupName="Spring-1.0.2" HTMLHelpVersion="2" HHNamespace="Spring.NET-2.1.0.2" HHIdentifier="Spring.NET-1.0.2-.NET-2.0" H2PlugIn="True" H2PlugInNamespace="MS.VSIPCC.v80" LocaleID="0" ExcludeFiltersRegExp="False">
+    <OutputLocation OutputFolder="L:\projects\Spring.Net\doc\sdk\Spring-1.0\net-2.0\web\" HelpFileName="L:\projects\Spring.Net\doc\sdk\Spring-1.0\net-2.0\htmlhelp1and2\Spring.NET.hxs" UseFilenameAliases="False" StripMetadata="False" ClearBeforeBuild="False" RemoveOutputFilesAfterCompile="False"/>
+    <HTMLHelpOptions UseALinkMenus="False"/>
+    <OtherOptions CreateContextLinks="True" WriteHelpDescriptions="True" CopySourceCode="False" CreateWinHelpStub="False" Language="English"/>
+    <IncludeFilters IncludePrivate="False" IncludeFriend="False" IncludeProtected="True" IdentifyVisibility="False">
+        <Namespaces>
+            <Property Name="DX.NET:Method">True</Property>
+            <Property Name="DX.NET:Property">True</Property>
+            <Property Name="DX.NET:Field">True</Property>
+            <Property Name="DX.NET:Event">True</Property>
+            <Property Name="DX.NET:Constructor">True</Property>
+            <Property Name="DX.NET:Operator">True</Property>
+        </Namespaces>
+    </IncludeFilters>
+    <CommentExtraction UnTaggedBlocks="False" UnTaggedEnumerations="False" UnTaggedEvents="False" UnTaggedModules="False" UnTaggedUDTs="False" UnTaggedVariables="False" HelpDescriptionImport="3"/>
+    <Diagrams PageNestingLevels="2" OverviewNestingLevels="3" SupressSingleObjectDiagrams="True" DiagramStyleSource="0" ObjFillColor="0" ObjTextColor="0" ObjBorderColor="0" ColFillColor="0" ColTextColor="0" ColBorderColor="0" UseDropShadow="False" CenterCaptions="False" DiagramBold="False" BorderWidth="0" UseDiagramShapes="False"/>
+    <VariableValues>
+        <VariableValue Name="CopyrightNotice" Value="&amp;copy; 2004-2006 Spring.NET Authors. All Rights Reserved."/>
+        <VariableValue Name="FeedbackLink" Value="&lt;a href=&quot;forum.springframework.net&quot;&gt;Send comments&lt;/a&gt; on this topic."/>
+    </VariableValues>
+    <AdditionalFiles/>
+    <ModelComments/>
+    <IgnoreRelationships/>
+    <NamespaceExclusions>
+        <e>Spring.Core~__Delegates</e>
+    </NamespaceExclusions>
+    <DotNetProperties IncludeRelationshipDiagrams="True" IncludeInheritanceHierarchies="True" IncludeBaseMembers="False" StandardInterfaces="System.*,Microsoft.*" OnlyLinkInherited="True" ExternalDocs="True" UseCommentFiles="True" DrillCommentFiles="True" GenerateXMLLinks="False" XMLIsland="" NoInheritedTopics="True" NoInheritedInLists="False" CreateXMLCommentFile="False" ExcludedLanguages="Delphi,JScript,CPP,CPP2005" GenerateAttributes="True" AttributeFilter="" AttributeFilterInclude="False" VBNETDefaultConstructor="False" LinkOverridenMembersToBaseImplementation="False" UseOverloadSummaryForMasterSummary="False" ExcludeEditorBrowsable="True" GenerateBreadCrumbs="True" IncludeAssemblyBreadCrumb="False"/>
+    <DatabaseProperties DocumentViewSource="True" DocumentTriggerSource="True" DocumentProcedureSource="True" RetainTaggedComments="False"/>
+    <XSDProperties UseCustomSettings="False" PageNestingLevels="2" SuppressSingleObjectDiagrams="True" ElementFillColor="15780518" ElementTextColor="0" ElementBorderColor="10789024" ElementBorders="True" ElementRefFillColor="12648447" ElementRefTextColor="0" ElementRefBorderColor="10789024" ElementRefBorders="True" ComplexTypeFillColor="15780518" ComplexTypeTextColor="0" ComplexTypeBorderColor="10789024" ComplexTypeBorders="True" AnyFillColor="13421772" AnyTextColor="0" AnyBorderColor="10789024" AnyBorders="True" NotationTextColor="8421504" RootLinesColor="10789024" DropShadows="False" BoldCaptions="True" GroupParticleSequenceImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\sequence.gif" GroupParticleChoiceImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\choice.gif" GroupParticleAllImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\all.gif"/>
+    <CommentFiles>
+        <CommentFile FileName="..\net-1.1\Spring.Core.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\2.0\debug\Spring.Core.dll"/>
+        <CommentFile FileName="..\net-1.1\Spring.Aop.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\2.0\debug\Spring.Aop.dll"/>
+    </CommentFiles>
+    <DocType Name="dx.net" Template="Visual Studio 2005 Style" UseHelpTemplates="False">
+        <TOCSource TOCSource="0" SpecificTOCName=""/>
+        <ModelCommentProfile Version="5.0" Namespace="dx.net" Name="" Description=""/>
+    </DocType>
+    <NetAssemblies RootAssemblyName="">
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\2.0\debug\Spring.Core.dll" mRootModule="" AssemblyName="Spring.Core" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\2.0\debug\Spring.Aop.dll" mRootModule="" AssemblyName="Spring.Aop" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+    </NetAssemblies>
+    <PropertyBag/>
+</DocumentXProject>
diff --git a/doc/docx/Spring-1.0/net-2.0/UnRegisterHelp2.bat b/doc/docx/Spring-1.0/net-2.0/UnRegisterHelp2.bat
new file mode 100644
index 00000000..186f7954
--- /dev/null
+++ b/doc/docx/Spring-1.0/net-2.0/UnRegisterHelp2.bat
@@ -0,0 +1,8 @@
+REM Un-comment to remove the plug in to the Visual Studio.NET 2005 help system
+InnovaHxReg /U /P /productnamespace:MS.VSIPCC.v80 /producthxt:_DEFAULT /namespace:Spring.NET-1.0.2.2 /hxt:_DEFAULT
+
+REM Un-Register the help file (title in Help 2.0 terminology)
+InnovaHxReg /U /T /namespace:Spring.NET-1.0.2.2 /id:Spring.NET-1.0.2-.NET-2.0 /langid:1033 /helpfile:Spring.NET.hxs
+
+REM Un-Register the Namespace
+InnovaHxReg /U /N /Namespace:Spring.NET-1.0.2.2 /Description:"Spring.Aop" /Collection:COL_Spring-1.0.2.hxc
diff --git a/doc/docx/Spring-1.1/net-1.1/Copy of RegisterHelp2.bat b/doc/docx/Spring-1.1/net-1.1/Copy of RegisterHelp2.bat
new file mode 100644
index 00000000..5787a12a
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Copy of RegisterHelp2.bat	
@@ -0,0 +1,9 @@
+REM Register the Namespace
+InnovaHxReg /R /N /Namespace:Spring.NET /Description:"Spring.Web" /Collection:COL_Spring-1.1.0.hxc
+
+REM Register the help file (title in Help 2.0 terminology)
+InnovaHxReg /R /T /namespace:Spring.NET /id:Spring.NET-1.1.0-PR3 /langid:1033 /helpfile:Spring.NET.hxs
+
+REM Un-comment to plug in to the Visual Studio.NET 2003 help system
+InnovaHxReg /R /P /productnamespace:MS.VSCC.2003 /producthxt:_DEFAULT /namespace:Spring.NET /hxt:_DEFAULT
+
diff --git a/doc/docx/Spring-1.1/net-1.1/Copy of UnRegisterHelp2.bat b/doc/docx/Spring-1.1/net-1.1/Copy of UnRegisterHelp2.bat
new file mode 100644
index 00000000..556a8840
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Copy of UnRegisterHelp2.bat	
@@ -0,0 +1,8 @@
+REM Remove the plug in to the Visual Studio.NET 2003 help system
+InnovaHxReg /U /P /productnamespace:MS.VSCC.2003 /producthxt:_DEFAULT /namespace:Spring.NET /hxt:_DEFAULT
+
+REM Un-Register the help file (title in Help 2.0 terminology)
+InnovaHxReg /U /T /namespace:Spring.NET /id:Spring.NET-1.1.0-PR3 /langid:1033 /helpfile:Spring.NET.hxs
+
+REM Un-Register the Namespace
+InnovaHxReg /U /N /Namespace:Spring.NET /Description:"Spring.Web" /Collection:COL_Spring-1.1.0.hxc
diff --git a/doc/docx/Spring-1.1/net-1.1/RegisterHelp2.bat b/doc/docx/Spring-1.1/net-1.1/RegisterHelp2.bat
new file mode 100644
index 00000000..8fffebc9
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/RegisterHelp2.bat
@@ -0,0 +1,8 @@
+REM Register the Namespace
+InnovaHxReg /R /N /Namespace:Spring.NET /Description:"Spring.Testing.NUnit" /Collection:COL_Spring-1.1.0.hxc
+
+REM Register the help file (title in Help 2.0 terminology)
+InnovaHxReg /R /T /namespace:Spring.NET /id:Spring.NET-1.1.2 /langid:1033 /helpfile:"Spring.NET.hxs"
+
+REM Un-comment to plug in to the Visual Studio.NET 2003 help system
+InnovaHxReg /R /P /productnamespace:MS.VSCC.2003 /producthxt:_DEFAULT /namespace:Spring.NET /hxt:_DEFAULT
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring-1.1.0.dxp b/doc/docx/Spring-1.1/net-1.1/Spring-1.1.0.dxp
new file mode 100644
index 00000000..4cff0dbd
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring-1.1.0.dxp
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXProject Version="5.0" CompileHelpFile="True" RefreshIfExists="True" DocumentSourceCode="False" AlwaysCopySupportFiles="True" PropertyCommentsFrom="0" RelationshipsFrom="2" DefaultRelsOnlyForCollections="True" ProjectGroupName="Spring-1.1.2" HTMLHelpVersion="2" HHNamespace="Spring.NET" HHIdentifier="Spring.NET-1.1.2" H2PlugIn="True" H2PlugInNamespace="MS.VSCC,MS.VSCC.2003" LocaleID="0" ExcludeFiltersRegExp="False" OutputFileExtension=".html">
+    <OutputLocation OutputFolder="L:\release\Spring.Net\doc\sdk\Spring-1.1\net-1.1\web\" HelpFileName="L:\release\Spring.Net\doc\sdk\Spring-1.1\net-1.1\htmlhelp1and2\Spring.NET.hxs" UseFilenameAliases="True" StripMetadata="False" ClearBeforeBuild="True" RemoveOutputFilesAfterCompile="False"/>
+    <HTMLHelpOptions UseALinkMenus="False"/>
+    <OtherOptions CreateContextLinks="True" WriteHelpDescriptions="True" CopySourceCode="False" CreateWinHelpStub="False" Language="English"/>
+    <IncludeFilters IncludePrivate="False" IncludeFriend="False" IncludeProtected="True" IdentifyVisibility="False">
+        <Namespaces>
+            <Property Name="DX.NET:Method">True</Property>
+            <Property Name="DX.NET:Property">True</Property>
+            <Property Name="DX.NET:Field">True</Property>
+            <Property Name="DX.NET:Event">True</Property>
+            <Property Name="DX.NET:Constructor">True</Property>
+            <Property Name="DX.NET:Operator">True</Property>
+        </Namespaces>
+    </IncludeFilters>
+    <CommentExtraction UnTaggedBlocks="False" UnTaggedEnumerations="False" UnTaggedEvents="False" UnTaggedModules="False" UnTaggedUDTs="False" UnTaggedVariables="False" HelpDescriptionImport="1"/>
+    <Diagrams PageNestingLevels="2" OverviewNestingLevels="3" SupressSingleObjectDiagrams="True" DiagramStyleSource="0" ObjFillColor="0" ObjTextColor="0" ObjBorderColor="0" ColFillColor="0" ColTextColor="0" ColBorderColor="0" UseDropShadow="False" CenterCaptions="False" DiagramBold="False" BorderWidth="0" UseDiagramShapes="False"/>
+    <VariableValues>
+        <VariableValue Name="CopyrightNotice" Value="&amp;copy; 2004-2008 Spring.NET Authors. All Rights Reserved."/>
+        <VariableValue Name="FeedbackLink" Value="&lt;a href=&quot;http://forum.springframework.net&quot;&gt;Send comments&lt;/a&gt; on this topic."/>
+        <VariableValue Name="DefaultTypeRequirements" Value="&lt;h4 class=dxh4&gt;$$Requirements$$&lt;/h4&gt;&lt;p&gt;&lt;b&gt;Namespace: &lt;/b&gt;%%linkedcurrentnamespace%%&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Platforms:&lt;/b&gt; Windows 98, Windows NT 4.0, Windows Millennium Edition, Windows 2000, Windows XP Home Edition, Windows XP Professional, Windows Server 2003 family&lt;/p&gt;&lt;p&gt;&lt;b&gt;Assembly: &lt;/b&gt;%%assemblyname%% (in %%assemblyfilename%%)&lt;/p&gt;"/>
+        <VariableValue Name="DefaultMemberRequirements" Value="&lt;h4 class=dxh4&gt;$$Requirements$$&lt;/h4&gt;&lt;p&gt;&lt;b&gt;Platforms:&lt;/b&gt; Windows 98, Windows NT 4.0, Windows Millennium Edition, Windows 2000, Windows XP Home Edition, Windows XP Professional, Windows Server 2003 family&lt;/p&gt;"/>
+    </VariableValues>
+    <AdditionalFiles/>
+    <ModelComments/>
+    <IgnoreRelationships/>
+    <NamespaceExclusions>
+        <e>Spring.Core~Spring.Collections.DictionarySet+DictionarySetEnumerator</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+Node</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+NodeHolder</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+LinkedListEnumerator</e>
+        <e>Spring.Core~Spring.Collections.PriorityQueue+PriorityQueueEnumerator</e>
+        <e>Spring.Core~Spring.Context.Support.AbstractApplicationContext+ObjectPostProcessorChecker</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+ContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+RootContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+DescendantContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+ContextSchema</e>
+        <e>Spring.Core~Spring.Context.Support.DelegatingMessageSource+SpecialCaseNullMessageSource</e>
+        <e>Spring.Core~__Delegates</e>
+        <e>Spring.Core~Spring.Core.ControlFlowFactory+DefaultControlFlow</e>
+        <e>Spring.Core~Spring.Core.ControlFlowFactory+DefaultControlFlow+MethodsDeclaredTypeCriteria</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionLexer</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionParser</e>
+        <e>Spring.Core~Spring.Expressions.NodeWithArguments</e>
+        <e>Spring.Core~Spring.Expressions.ArrayConstructorNode</e>
+        <e>Spring.Core~Spring.Expressions.AssignNode</e>
+        <e>Spring.Core~Spring.Expressions.BinaryOperator</e>
+        <e>Spring.Core~Spring.Expressions.BooleanLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.ConstructorNode</e>
+        <e>Spring.Core~Spring.Expressions.DateLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionListNode</e>
+        <e>Spring.Core~Spring.Expressions.HexLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.IndexerNode</e>
+        <e>Spring.Core~Spring.Expressions.IntLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.MethodNode</e>
+        <e>Spring.Core~Spring.Expressions.NullLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.OpADD</e>
+        <e>Spring.Core~Spring.Expressions.OpAND</e>
+        <e>Spring.Core~Spring.Expressions.OpDIVIDE</e>
+        <e>Spring.Core~Spring.Expressions.OpEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpGreater</e>
+        <e>Spring.Core~Spring.Expressions.OpGreaterOrEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpLess</e>
+        <e>Spring.Core~Spring.Expressions.OpLessOrEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpMODULUS</e>
+        <e>Spring.Core~Spring.Expressions.OpMULTIPLY</e>
+        <e>Spring.Core~Spring.Expressions.UnaryOperator</e>
+        <e>Spring.Core~Spring.Expressions.OpNOT</e>
+        <e>Spring.Core~Spring.Expressions.OpNotEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpOR</e>
+        <e>Spring.Core~Spring.Expressions.OpPOWER</e>
+        <e>Spring.Core~Spring.Expressions.OpSUBTRACT</e>
+        <e>Spring.Core~Spring.Expressions.OpUnaryMinus</e>
+        <e>Spring.Core~Spring.Expressions.OpUnaryPlus</e>
+        <e>Spring.Core~Spring.Expressions.ProjectionNode</e>
+        <e>Spring.Core~Spring.Expressions.PropertyOrFieldNode</e>
+        <e>Spring.Core~Spring.Expressions.RealLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.StringLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.TernaryNode</e>
+        <e>Spring.Core~Spring.Expressions.TypeNode</e>
+        <e>Spring.Core~Spring.Expressions.VariableNode</e>
+        <e>Spring.Core~Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject+GenericObjectFactory</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.AutowireUtils+ConstructorComparer</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.AutowireUtils+MinimumArgumentCountCriteria</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy+MethodInjectingTypeBuilder</e>
+        <e>Spring.Core~Spring.Objects.Support.AutoWiringEventHandlerValue+AutoWirer</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.AfterReturningAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.BeforeAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.ThrowsAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.DynamicProxy.References</e>
+        <e>Spring.Aop~Spring.Aop.Framework.DynamicProxy.IntroductionProxyMethodBuilder</e>
+        <e>Spring.Aop~Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.MethodMatchers+UnionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.MethodMatchers+IntersectionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.TypeFilters+UnionTypeFilter</e>
+        <e>Spring.Aop~Spring.Aop.Support.TypeFilters+IntersectionTypeFilter</e>
+        <e>Spring.Aop~Spring.Aop.Support.UnionPointcut</e>
+        <e>Spring.Aop~Spring.Aop.Support.UnionPointcut+PointcutUnionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Target.EmptyTargetSource+EmptyTargetSourceObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TrueMethodMatcher+TrueMethodMatcherObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TruePointcut+TruePointcutObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TrueTypeFilter+TrueTypeFilterObjectReference</e>
+        <e>Spring.Web~__Delegates</e>
+        <e>Spring.Web~Spring.Util.VirtualEnvironment+HttpRuntimeEnvironment</e>
+        <e>Spring.Web~Spring.Web.Services.WebServiceExporter+WebServiceProxyTypeBuilder</e>
+        <e>Spring.Web~Spring.Web.Support.Script</e>
+        <e>Spring.Web~Spring.Web.Support.ScriptBlock</e>
+        <e>Spring.Web~Spring.Web.Support.ScriptFile</e>
+        <e>Spring.Web~Spring.Web.Support.ScriptEvent</e>
+        <e>Spring.Web~Spring.Globalization_namespace</e>
+        <e>Spring.Data~Spring.Data.Objects.MappingAdoQueryWithContext+RowMapperImpl</e>
+        <e>Spring.Data~Spring.Transaction.Support.AbstractPlatformTransactionManager+SuspendedResourcesHolder</e>
+        <e>Spring.Data~__Delegates</e>
+        <e>Spring.Data~Spring.Data.IDbCommandCreatorFactory+CommandCreatorWithParamValues</e>
+        <e>Spring.Data~Spring.Data.IDbCommandCreatorFactory+CommandCreatorImpl</e>
+        <e>Spring.Data~Spring.Transaction.Interceptor.TransactionAspectSupport+TransactionInfo</e>
+        <e>Spring.Data~Spring.Transaction.Interceptor.TransactionAttributeSourceEditor+PropertiesEditor</e>
+        <e>Spring.Services~Spring.Remoting.Support.RemoteObjectProxyTypeBuilder</e>
+        <e>Spring.Services~Spring.Remoting.CaoExporter+CaoRemoteFactory</e>
+        <e>Spring.Services~Spring.Remoting.SaoExporter+SaoRemoteObjectProxyTypeBuilder</e>
+        <e>Spring.Services~Spring.Web.Services.WebServiceProxyFactory+WebServiceProxyProxyTypeBuilder</e>
+        <e>Spring.Core~Spring.Collections.SynchronizedEnumerator</e>
+        <e>Spring.Core~Spring.Collections.SynchronizedDictionaryEnumerator</e>
+        <e>Spring.Core~Spring.Expressions.AttributeNode</e>
+        <e>Spring.Core~Spring.Expressions.NamedArgumentNode</e>
+        <e>Spring.Web~Spring.Util.ControlAccessor</e>
+        <e>Spring.Web~Spring.Util.ControlCollectionAccessor</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.HibernateAccessor+FlushModeHolder</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.CloseSuppressingMethodInterceptor</e>
+        <e>Spring.Data.NHibernate~__Delegates</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.ContainsHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.DeleteLockModeHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.DeletebyQueryHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.DeleteAllHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.EvictHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.FindHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.FindByNamedParamHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.FindByNamedQueryHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.FindByNamedQueryAndNamedParamHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.FindByNamedQueryAndValueObjectHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.FindByValueObjectHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.ExecuteHibernateCallbackUsingDelegate</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.GetByTypeHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.LoadByTypeHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.LoadByEntityHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.LoadAllByTypeHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.LockHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.RefreshHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.SaveObjectHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.SaveObjectWithIdHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.UpdateObjectHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.SaveOrUpdateObjectHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.SaveOrUpdateAllHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.SaveOrUpdateCopyHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.HibernateTransactionManager+HibernateTransactionObject</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.HibernateTransactionManager+SuspendedResourcesHolder</e>
+    </NamespaceExclusions>
+    <DotNetProperties IncludeRelationshipDiagrams="True" IncludeInheritanceHierarchies="True" IncludeBaseMembers="False" StandardInterfaces="System.*,Microsoft.*" OnlyLinkInherited="True" ExternalDocs="True" UseCommentFiles="True" DrillCommentFiles="True" GenerateXMLLinks="False" XMLIsland="" NoInheritedTopics="True" NoInheritedInLists="False" CreateXMLCommentFile="False" ExcludedLanguages="Delphi,JScript,CPP,CPP2005" GenerateAttributes="True" AttributeFilter="" AttributeFilterInclude="False" VBNETDefaultConstructor="False" LinkOverridenMembersToBaseImplementation="False" UseOverloadSummaryForMasterSummary="False" ExcludeEditorBrowsable="True" GenerateBreadCrumbs="True" IncludeAssemblyBreadCrumb="False"/>
+    <DatabaseProperties DocumentViewSource="True" DocumentTriggerSource="True" DocumentProcedureSource="True" RetainTaggedComments="False"/>
+    <XSDProperties UseCustomSettings="False" PageNestingLevels="2" SuppressSingleObjectDiagrams="True" ElementFillColor="15780518" ElementTextColor="0" ElementBorderColor="10789024" ElementBorders="True" ElementRefFillColor="12648447" ElementRefTextColor="0" ElementRefBorderColor="10789024" ElementRefBorders="True" ComplexTypeFillColor="15780518" ComplexTypeTextColor="0" ComplexTypeBorderColor="10789024" ComplexTypeBorders="True" AnyFillColor="13421772" AnyTextColor="0" AnyBorderColor="10789024" AnyBorders="True" NotationTextColor="8421504" RootLinesColor="10789024" DropShadows="False" BoldCaptions="True" GroupParticleSequenceImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\sequence.gif" GroupParticleChoiceImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\choice.gif" GroupParticleAllImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\all.gif"/>
+    <CommentFiles>
+        <CommentFile FileName="Spring.Aop.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Aop.dll"/>
+        <CommentFile FileName="Spring.Core.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Core.dll"/>
+        <CommentFile FileName="Spring.Data.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Data.dll"/>
+        <CommentFile FileName="Spring.Services.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Services.dll"/>
+        <CommentFile FileName="Spring.Web.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Web.dll"/>
+        <CommentFile FileName="Spring.Data.NHibernate.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Data.NHibernate.dll"/>
+        <CommentFile FileName="Spring.Testing.NUnit.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Testing.NUnit.dll"/>
+    </CommentFiles>
+    <DocType Name="dx.net" Template="Microsoft .NET Framework SDK Style" UseHelpTemplates="False">
+        <TOCSource TOCSource="1" SpecificTOCName="">
+            <NodeDef Key="N17086" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Introduction$$" NodeIconIndex="1" NodeType="0" PageLayout="introduction.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N0" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N34" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Assembly" PageTypeNamespaceFilter="" ParentKey="N0" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N17085" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Getting_Started$$" NodeIconIndex="1" NodeType="0" PageLayout="gettingstarted.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N0" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N19" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N16" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N17" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N21" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Event" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N18" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N0" DependantCount="1" DependantOnnamespace="DX.NET:Assembly" DependantOnnamespace_Filter="" DependantStillProcessChildren="True" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Assembly" PageTypeNamespaceFilter="" ParentKey="" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5711" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Namespaces$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N0" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5758" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Namespace" PageTypeNamespaceFilter="" ParentKey="N5711" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5759" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="0" PageLayout="namespace.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5716" DependantCount="1" DependantOnnamespace="DX.NET:Class" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Classes$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5715" DependantCount="1" DependantOnnamespace="DX.NET:Enumeration" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Enumerations$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5713" DependantCount="1" DependantOnnamespace="DX.NET:Structure" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Structures$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5938" DependantCount="1" DependantOnnamespace="DX.NET:Interface" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Interfaces$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6003" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Class" PageTypeNamespaceFilter="" ParentKey="N5716" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5847" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="0" PageLayout="class.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5846" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Members$$" NodeIconIndex="1" NodeType="0" PageLayout="class_members.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N8630" DependantCount="1" DependantOnnamespace="DX.NET:Constructor" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Constructor_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Constructor" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N16" DependantCount="1" DependantOnnamespace="DX.NET:Method" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Methods$$" NodeIconIndex="1" NodeType="0" PageLayout="class_methods.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N17" DependantCount="1" DependantOnnamespace="DX.NET:Property" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Properties$$" NodeIconIndex="1" NodeType="0" PageLayout="class_properties.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7637" DependantCount="1" DependantOnnamespace="DX.NET:Field" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Fields$$" NodeIconIndex="1" NodeType="0" PageLayout="class_fields.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N18" DependantCount="1" DependantOnnamespace="DX.NET:Event" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Events$$" NodeIconIndex="1" NodeType="0" PageLayout="class_events.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20517" DependantCount="1" DependantOnnamespace="DX.NET:Operator" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Operators$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6004" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Enumeration" PageTypeNamespaceFilter="" ParentKey="N5715" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6005" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Structure" PageTypeNamespaceFilter="" ParentKey="N5713" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6006" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Interface" PageTypeNamespaceFilter="" ParentKey="N5938" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6010" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="0" PageLayout="class.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6011" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Members$$" NodeIconIndex="1" NodeType="0" PageLayout="class_members.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6012" DependantCount="1" DependantOnnamespace="DX.NET:Method" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Methods$$" NodeIconIndex="1" NodeType="0" PageLayout="Interface_methods.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6013" DependantCount="1" DependantOnnamespace="DX.NET:Property" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Properties$$" NodeIconIndex="1" NodeType="0" PageLayout="Interface_properties.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6014" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6013" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6016" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6012" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6017" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Event" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6015" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6495" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N19" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6496" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N20" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6497" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6016" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6498" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6014" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7064" DependantCount="1" DependantOnnamespace="DX.NET:Delegate" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="Delegates" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7065" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Delegate" PageTypeNamespaceFilter="" ParentKey="N7064" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7638" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Field" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N7637" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7639" DependantCount="1" DependantOnnamespace="DX.NET:Field" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Fields$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6015" DependantCount="1" DependantOnnamespace="DX.NET:Event" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Events$$" NodeIconIndex="1" NodeType="0" PageLayout="Interface_events.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7640" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Field" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N7639" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N8631" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Constructor_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Constructor" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N8630" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13683" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13635" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13684" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13636" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13685" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Field" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13637" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13686" DependantCount="1" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13683" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13736" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13684" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13737" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Constructor_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Constructor" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13631" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13738" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="0" PageLayout="structure.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13739" DependantCount="1" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Members$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_members.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13631" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Constructor_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Constructor" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13635" DependantCount="1" DependantOnnamespace="DX.NET:Method" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Methods$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_methods.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13636" DependantCount="1" DependantOnnamespace="DX.NET:Property" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Properties$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_properties.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13637" DependantCount="1" DependantOnnamespace="DX.NET:Field" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Fields$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_fields.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N19946" DependantCount="1" DependantOnnamespace="DX.NET:Event" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Events$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_events.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N19947" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Event" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N19946" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20518" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Operator" PageTypeNamespaceFilter="" ParentKey="N20517" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20519" DependantCount="1" DependantOnnamespace="DX.NET:Operator" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Operators$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20520" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Operator" PageTypeNamespaceFilter="" ParentKey="N20519" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+        </TOCSource>
+        <ModelCommentProfile Version="5.0" Namespace="dx.net" Name="" Description=""/>
+    </DocType>
+    <NetAssemblies RootAssemblyName="">
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Aop.dll" mRootModule="" AssemblyName="Spring.Aop" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Core.dll" mRootModule="" AssemblyName="Spring.Core" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Data.dll" mRootModule="" AssemblyName="Spring.Data" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Services.dll" mRootModule="" AssemblyName="Spring.Services" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Web.dll" mRootModule="" AssemblyName="Spring.Web" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Data.NHibernate.dll" mRootModule="" AssemblyName="Spring.Data.NHibernate" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Testing.NUnit.dll" mRootModule="" AssemblyName="Spring.Testing.NUnit" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+    </NetAssemblies>
+    <PropertyBag/>
+</DocumentXProject>
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring-1.1.0.dxp.bak b/doc/docx/Spring-1.1/net-1.1/Spring-1.1.0.dxp.bak
new file mode 100644
index 00000000..3a892f03
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring-1.1.0.dxp.bak
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXProject Version="5.0" CompileHelpFile="True" RefreshIfExists="True" DocumentSourceCode="False" AlwaysCopySupportFiles="True" PropertyCommentsFrom="0" RelationshipsFrom="2" DefaultRelsOnlyForCollections="True" ProjectGroupName="Spring-1.1.2" HTMLHelpVersion="1" HHNamespace="Spring.NET" HHIdentifier="Spring.NET-1.1.2" H2PlugIn="True" H2PlugInNamespace="MS.VSCC,MS.VSCC.2003" LocaleID="0" ExcludeFiltersRegExp="False" OutputFileExtension=".html">
+    <OutputLocation OutputFolder="L:\release\Spring.Net\doc\sdk\Spring-1.1\net-1.1\web" HelpFileName="L:\release\Spring.Net\doc\sdk\Spring-1.1\net-1.1\htmlhelp1and2\Spring.NET.chm" UseFilenameAliases="True" StripMetadata="False" ClearBeforeBuild="True" RemoveOutputFilesAfterCompile="False"/>
+    <HTMLHelpOptions UseALinkMenus="False"/>
+    <OtherOptions CreateContextLinks="True" WriteHelpDescriptions="True" CopySourceCode="False" CreateWinHelpStub="False" Language="English"/>
+    <IncludeFilters IncludePrivate="False" IncludeFriend="False" IncludeProtected="True" IdentifyVisibility="False">
+        <Namespaces>
+            <Property Name="DX.NET:Method">True</Property>
+            <Property Name="DX.NET:Property">True</Property>
+            <Property Name="DX.NET:Field">True</Property>
+            <Property Name="DX.NET:Event">True</Property>
+            <Property Name="DX.NET:Constructor">True</Property>
+            <Property Name="DX.NET:Operator">True</Property>
+        </Namespaces>
+    </IncludeFilters>
+    <CommentExtraction UnTaggedBlocks="False" UnTaggedEnumerations="False" UnTaggedEvents="False" UnTaggedModules="False" UnTaggedUDTs="False" UnTaggedVariables="False" HelpDescriptionImport="1"/>
+    <Diagrams PageNestingLevels="2" OverviewNestingLevels="3" SupressSingleObjectDiagrams="True" DiagramStyleSource="0" ObjFillColor="0" ObjTextColor="0" ObjBorderColor="0" ColFillColor="0" ColTextColor="0" ColBorderColor="0" UseDropShadow="False" CenterCaptions="False" DiagramBold="False" BorderWidth="0" UseDiagramShapes="False"/>
+    <VariableValues>
+        <VariableValue Name="CopyrightNotice" Value="&amp;copy; 2004-2008 Spring.NET Authors. All Rights Reserved."/>
+        <VariableValue Name="FeedbackLink" Value="&lt;a href=&quot;http://forum.springframework.net&quot;&gt;Send comments&lt;/a&gt; on this topic."/>
+        <VariableValue Name="DefaultTypeRequirements" Value="&lt;h4 class=dxh4&gt;$$Requirements$$&lt;/h4&gt;&lt;p&gt;&lt;b&gt;Namespace: &lt;/b&gt;%%linkedcurrentnamespace%%&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Platforms:&lt;/b&gt; Windows 98, Windows NT 4.0, Windows Millennium Edition, Windows 2000, Windows XP Home Edition, Windows XP Professional, Windows Server 2003 family&lt;/p&gt;&lt;p&gt;&lt;b&gt;Assembly: &lt;/b&gt;%%assemblyname%% (in %%assemblyfilename%%)&lt;/p&gt;"/>
+        <VariableValue Name="DefaultMemberRequirements" Value="&lt;h4 class=dxh4&gt;$$Requirements$$&lt;/h4&gt;&lt;p&gt;&lt;b&gt;Platforms:&lt;/b&gt; Windows 98, Windows NT 4.0, Windows Millennium Edition, Windows 2000, Windows XP Home Edition, Windows XP Professional, Windows Server 2003 family&lt;/p&gt;"/>
+    </VariableValues>
+    <AdditionalFiles/>
+    <ModelComments/>
+    <IgnoreRelationships/>
+    <NamespaceExclusions>
+        <e>Spring.Core~Spring.Collections.DictionarySet+DictionarySetEnumerator</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+Node</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+NodeHolder</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+LinkedListEnumerator</e>
+        <e>Spring.Core~Spring.Collections.PriorityQueue+PriorityQueueEnumerator</e>
+        <e>Spring.Core~Spring.Context.Support.AbstractApplicationContext+ObjectPostProcessorChecker</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+ContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+RootContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+DescendantContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+ContextSchema</e>
+        <e>Spring.Core~Spring.Context.Support.DelegatingMessageSource+SpecialCaseNullMessageSource</e>
+        <e>Spring.Core~__Delegates</e>
+        <e>Spring.Core~Spring.Core.ControlFlowFactory+DefaultControlFlow</e>
+        <e>Spring.Core~Spring.Core.ControlFlowFactory+DefaultControlFlow+MethodsDeclaredTypeCriteria</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionLexer</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionParser</e>
+        <e>Spring.Core~Spring.Expressions.NodeWithArguments</e>
+        <e>Spring.Core~Spring.Expressions.ArrayConstructorNode</e>
+        <e>Spring.Core~Spring.Expressions.AssignNode</e>
+        <e>Spring.Core~Spring.Expressions.BinaryOperator</e>
+        <e>Spring.Core~Spring.Expressions.BooleanLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.ConstructorNode</e>
+        <e>Spring.Core~Spring.Expressions.DateLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionListNode</e>
+        <e>Spring.Core~Spring.Expressions.HexLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.IndexerNode</e>
+        <e>Spring.Core~Spring.Expressions.IntLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.MethodNode</e>
+        <e>Spring.Core~Spring.Expressions.NullLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.OpADD</e>
+        <e>Spring.Core~Spring.Expressions.OpAND</e>
+        <e>Spring.Core~Spring.Expressions.OpDIVIDE</e>
+        <e>Spring.Core~Spring.Expressions.OpEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpGreater</e>
+        <e>Spring.Core~Spring.Expressions.OpGreaterOrEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpLess</e>
+        <e>Spring.Core~Spring.Expressions.OpLessOrEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpMODULUS</e>
+        <e>Spring.Core~Spring.Expressions.OpMULTIPLY</e>
+        <e>Spring.Core~Spring.Expressions.UnaryOperator</e>
+        <e>Spring.Core~Spring.Expressions.OpNOT</e>
+        <e>Spring.Core~Spring.Expressions.OpNotEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpOR</e>
+        <e>Spring.Core~Spring.Expressions.OpPOWER</e>
+        <e>Spring.Core~Spring.Expressions.OpSUBTRACT</e>
+        <e>Spring.Core~Spring.Expressions.OpUnaryMinus</e>
+        <e>Spring.Core~Spring.Expressions.OpUnaryPlus</e>
+        <e>Spring.Core~Spring.Expressions.ProjectionNode</e>
+        <e>Spring.Core~Spring.Expressions.PropertyOrFieldNode</e>
+        <e>Spring.Core~Spring.Expressions.RealLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.StringLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.TernaryNode</e>
+        <e>Spring.Core~Spring.Expressions.TypeNode</e>
+        <e>Spring.Core~Spring.Expressions.VariableNode</e>
+        <e>Spring.Core~Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject+GenericObjectFactory</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.AutowireUtils+ConstructorComparer</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.AutowireUtils+MinimumArgumentCountCriteria</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy+MethodInjectingTypeBuilder</e>
+        <e>Spring.Core~Spring.Objects.Support.AutoWiringEventHandlerValue+AutoWirer</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.AfterReturningAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.BeforeAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.ThrowsAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.DynamicProxy.References</e>
+        <e>Spring.Aop~Spring.Aop.Framework.DynamicProxy.IntroductionProxyMethodBuilder</e>
+        <e>Spring.Aop~Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.MethodMatchers+UnionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.MethodMatchers+IntersectionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.TypeFilters+UnionTypeFilter</e>
+        <e>Spring.Aop~Spring.Aop.Support.TypeFilters+IntersectionTypeFilter</e>
+        <e>Spring.Aop~Spring.Aop.Support.UnionPointcut</e>
+        <e>Spring.Aop~Spring.Aop.Support.UnionPointcut+PointcutUnionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Target.EmptyTargetSource+EmptyTargetSourceObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TrueMethodMatcher+TrueMethodMatcherObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TruePointcut+TruePointcutObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TrueTypeFilter+TrueTypeFilterObjectReference</e>
+        <e>Spring.Web~__Delegates</e>
+        <e>Spring.Web~Spring.Util.VirtualEnvironment+HttpRuntimeEnvironment</e>
+        <e>Spring.Web~Spring.Web.Services.WebServiceExporter+WebServiceProxyTypeBuilder</e>
+        <e>Spring.Web~Spring.Web.Support.Script</e>
+        <e>Spring.Web~Spring.Web.Support.ScriptBlock</e>
+        <e>Spring.Web~Spring.Web.Support.ScriptFile</e>
+        <e>Spring.Web~Spring.Web.Support.ScriptEvent</e>
+        <e>Spring.Web~Spring.Globalization_namespace</e>
+        <e>Spring.Data~Spring.Data.Objects.MappingAdoQueryWithContext+RowMapperImpl</e>
+        <e>Spring.Data~Spring.Transaction.Support.AbstractPlatformTransactionManager+SuspendedResourcesHolder</e>
+        <e>Spring.Data~__Delegates</e>
+        <e>Spring.Data~Spring.Data.IDbCommandCreatorFactory+CommandCreatorWithParamValues</e>
+        <e>Spring.Data~Spring.Data.IDbCommandCreatorFactory+CommandCreatorImpl</e>
+        <e>Spring.Data~Spring.Transaction.Interceptor.TransactionAspectSupport+TransactionInfo</e>
+        <e>Spring.Data~Spring.Transaction.Interceptor.TransactionAttributeSourceEditor+PropertiesEditor</e>
+        <e>Spring.Services~Spring.Remoting.Support.RemoteObjectProxyTypeBuilder</e>
+        <e>Spring.Services~Spring.Remoting.CaoExporter+CaoRemoteFactory</e>
+        <e>Spring.Services~Spring.Remoting.SaoExporter+SaoRemoteObjectProxyTypeBuilder</e>
+        <e>Spring.Services~Spring.Web.Services.WebServiceProxyFactory+WebServiceProxyProxyTypeBuilder</e>
+        <e>Spring.Core~Spring.Collections.SynchronizedEnumerator</e>
+        <e>Spring.Core~Spring.Collections.SynchronizedDictionaryEnumerator</e>
+        <e>Spring.Core~Spring.Expressions.AttributeNode</e>
+        <e>Spring.Core~Spring.Expressions.NamedArgumentNode</e>
+        <e>Spring.Web~Spring.Util.ControlAccessor</e>
+        <e>Spring.Web~Spring.Util.ControlCollectionAccessor</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.HibernateAccessor+FlushModeHolder</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.CloseSuppressingMethodInterceptor</e>
+        <e>Spring.Data.NHibernate~__Delegates</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.ContainsHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.DeleteLockModeHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.DeletebyQueryHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.DeleteAllHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.EvictHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.FindHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.FindByNamedParamHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.FindByNamedQueryHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.FindByNamedQueryAndNamedParamHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.FindByNamedQueryAndValueObjectHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.FindByValueObjectHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.ExecuteHibernateCallbackUsingDelegate</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.GetByTypeHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.LoadByTypeHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.LoadByEntityHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.LoadAllByTypeHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.LockHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.RefreshHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.SaveObjectHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.SaveObjectWithIdHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.UpdateObjectHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.SaveOrUpdateObjectHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.SaveOrUpdateAllHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.SaveOrUpdateCopyHibernateCallback</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.HibernateTransactionManager+HibernateTransactionObject</e>
+        <e>Spring.Data.NHibernate~Spring.Data.NHibernate.HibernateTransactionManager+SuspendedResourcesHolder</e>
+    </NamespaceExclusions>
+    <DotNetProperties IncludeRelationshipDiagrams="True" IncludeInheritanceHierarchies="True" IncludeBaseMembers="False" StandardInterfaces="System.*,Microsoft.*" OnlyLinkInherited="True" ExternalDocs="True" UseCommentFiles="True" DrillCommentFiles="True" GenerateXMLLinks="False" XMLIsland="" NoInheritedTopics="True" NoInheritedInLists="False" CreateXMLCommentFile="False" ExcludedLanguages="Delphi,JScript,CPP,CPP2005" GenerateAttributes="True" AttributeFilter="" AttributeFilterInclude="False" VBNETDefaultConstructor="False" LinkOverridenMembersToBaseImplementation="False" UseOverloadSummaryForMasterSummary="False" ExcludeEditorBrowsable="True" GenerateBreadCrumbs="True" IncludeAssemblyBreadCrumb="False"/>
+    <DatabaseProperties DocumentViewSource="True" DocumentTriggerSource="True" DocumentProcedureSource="True" RetainTaggedComments="False"/>
+    <XSDProperties UseCustomSettings="False" PageNestingLevels="2" SuppressSingleObjectDiagrams="True" ElementFillColor="15780518" ElementTextColor="0" ElementBorderColor="10789024" ElementBorders="True" ElementRefFillColor="12648447" ElementRefTextColor="0" ElementRefBorderColor="10789024" ElementRefBorders="True" ComplexTypeFillColor="15780518" ComplexTypeTextColor="0" ComplexTypeBorderColor="10789024" ComplexTypeBorders="True" AnyFillColor="13421772" AnyTextColor="0" AnyBorderColor="10789024" AnyBorders="True" NotationTextColor="8421504" RootLinesColor="10789024" DropShadows="False" BoldCaptions="True" GroupParticleSequenceImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\sequence.gif" GroupParticleChoiceImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\choice.gif" GroupParticleAllImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\all.gif"/>
+    <CommentFiles>
+        <CommentFile FileName="Spring.Aop.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Aop.dll"/>
+        <CommentFile FileName="Spring.Core.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Core.dll"/>
+        <CommentFile FileName="Spring.Data.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Data.dll"/>
+        <CommentFile FileName="Spring.Services.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Services.dll"/>
+        <CommentFile FileName="Spring.Web.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Web.dll"/>
+        <CommentFile FileName="Spring.Data.NHibernate.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Data.NHibernate.dll"/>
+        <CommentFile FileName="Spring.Testing.NUnit.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Testing.NUnit.dll"/>
+    </CommentFiles>
+    <DocType Name="dx.net" Template="Microsoft .NET Framework SDK Style" UseHelpTemplates="False">
+        <TOCSource TOCSource="1" SpecificTOCName="">
+            <NodeDef Key="N17086" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Introduction$$" NodeIconIndex="1" NodeType="0" PageLayout="introduction.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N0" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N34" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Assembly" PageTypeNamespaceFilter="" ParentKey="N0" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N17085" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Getting_Started$$" NodeIconIndex="1" NodeType="0" PageLayout="gettingstarted.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N0" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N19" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N16" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N17" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N21" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Event" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N18" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N0" DependantCount="1" DependantOnnamespace="DX.NET:Assembly" DependantOnnamespace_Filter="" DependantStillProcessChildren="True" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Assembly" PageTypeNamespaceFilter="" ParentKey="" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5711" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Namespaces$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N0" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5758" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Namespace" PageTypeNamespaceFilter="" ParentKey="N5711" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5759" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="0" PageLayout="namespace.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5716" DependantCount="1" DependantOnnamespace="DX.NET:Class" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Classes$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5715" DependantCount="1" DependantOnnamespace="DX.NET:Enumeration" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Enumerations$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5713" DependantCount="1" DependantOnnamespace="DX.NET:Structure" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Structures$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5938" DependantCount="1" DependantOnnamespace="DX.NET:Interface" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Interfaces$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6003" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Class" PageTypeNamespaceFilter="" ParentKey="N5716" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5847" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="0" PageLayout="class.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N5846" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Members$$" NodeIconIndex="1" NodeType="0" PageLayout="class_members.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N8630" DependantCount="1" DependantOnnamespace="DX.NET:Constructor" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Constructor_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Constructor" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N16" DependantCount="1" DependantOnnamespace="DX.NET:Method" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Methods$$" NodeIconIndex="1" NodeType="0" PageLayout="class_methods.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N17" DependantCount="1" DependantOnnamespace="DX.NET:Property" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Properties$$" NodeIconIndex="1" NodeType="0" PageLayout="class_properties.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7637" DependantCount="1" DependantOnnamespace="DX.NET:Field" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Fields$$" NodeIconIndex="1" NodeType="0" PageLayout="class_fields.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N18" DependantCount="1" DependantOnnamespace="DX.NET:Event" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Events$$" NodeIconIndex="1" NodeType="0" PageLayout="class_events.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20517" DependantCount="1" DependantOnnamespace="DX.NET:Operator" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Operators$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6003" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6004" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Enumeration" PageTypeNamespaceFilter="" ParentKey="N5715" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6005" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Structure" PageTypeNamespaceFilter="" ParentKey="N5713" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6006" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Interface" PageTypeNamespaceFilter="" ParentKey="N5938" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6010" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="0" PageLayout="class.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6011" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Members$$" NodeIconIndex="1" NodeType="0" PageLayout="class_members.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6012" DependantCount="1" DependantOnnamespace="DX.NET:Method" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Methods$$" NodeIconIndex="1" NodeType="0" PageLayout="Interface_methods.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6013" DependantCount="1" DependantOnnamespace="DX.NET:Property" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Properties$$" NodeIconIndex="1" NodeType="0" PageLayout="Interface_properties.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6014" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6013" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6016" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6012" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6017" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Event" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6015" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6495" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N19" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6496" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N20" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6497" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6016" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6498" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6014" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7064" DependantCount="1" DependantOnnamespace="DX.NET:Delegate" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="Delegates" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N5758" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7065" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Short_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Delegate" PageTypeNamespaceFilter="" ParentKey="N7064" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7638" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Field" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N7637" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7639" DependantCount="1" DependantOnnamespace="DX.NET:Field" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Fields$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N6015" DependantCount="1" DependantOnnamespace="DX.NET:Event" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Events$$" NodeIconIndex="1" NodeType="0" PageLayout="Interface_events.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6006" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N7640" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Field" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N7639" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N8631" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Constructor_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Constructor" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N8630" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13683" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13635" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13684" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13636" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13685" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Field" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13637" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13686" DependantCount="1" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Method" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13683" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13736" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Property" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13684" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13737" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Constructor_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Constructor" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N13631" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13738" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Overview$$" NodeIconIndex="1" NodeType="0" PageLayout="structure.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13739" DependantCount="1" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Members$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_members.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13631" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Constructor_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Constructor" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13635" DependantCount="1" DependantOnnamespace="DX.NET:Method" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Methods$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_methods.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13636" DependantCount="1" DependantOnnamespace="DX.NET:Property" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Properties$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_properties.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N13637" DependantCount="1" DependantOnnamespace="DX.NET:Field" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Fields$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_fields.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N19946" DependantCount="1" DependantOnnamespace="DX.NET:Event" DependantOnnamespace_Filter="includeinherited=false" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Events$$" NodeIconIndex="1" NodeType="0" PageLayout="structure_events.html" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N19947" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Event" PageTypeNamespaceFilter="includeinherited=false" ParentKey="N19946" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20518" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Operator" PageTypeNamespaceFilter="" ParentKey="N20517" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20519" DependantCount="1" DependantOnnamespace="DX.NET:Operator" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="False" MarkAsNew="False" NodeCaptionTemplate="$$Operators$$" NodeIconIndex="1" NodeType="0" PageLayout="" PageTypeNamespace="" PageTypeNamespaceFilter="" ParentKey="N6005" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+            <NodeDef Key="N20520" DependantCount="0" DependantOnnamespace="" DependantOnnamespace_Filter="" DependantStillProcessChildren="False" FileNameTemplate="" LinkToPage="True" MarkAsNew="False" NodeCaptionTemplate="%%Local_Item_Title%%" NodeIconIndex="1" NodeType="1" PageLayout="" PageTypeNamespace="DX.NET:Operator" PageTypeNamespaceFilter="" ParentKey="N20519" UseCustomIcon="False" IsDefaultTopic="False" PlugInName="" PlugInData=""/>
+        </TOCSource>
+        <ModelCommentProfile Version="5.0" Namespace="dx.net" Name="" Description=""/>
+    </DocType>
+    <NetAssemblies RootAssemblyName="">
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Aop.dll" mRootModule="" AssemblyName="Spring.Aop" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Core.dll" mRootModule="" AssemblyName="Spring.Core" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Data.dll" mRootModule="" AssemblyName="Spring.Data" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Services.dll" mRootModule="" AssemblyName="Spring.Services" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Web.dll" mRootModule="" AssemblyName="Spring.Web" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Data.NHibernate.dll" mRootModule="" AssemblyName="Spring.Data.NHibernate" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Testing.NUnit.dll" mRootModule="" AssemblyName="Spring.Testing.NUnit" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+    </NetAssemblies>
+    <PropertyBag/>
+</DocumentXProject>
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring.Aop.dxc b/doc/docx/Spring-1.1/net-1.1/Spring.Aop.dxc
new file mode 100644
index 00000000..d271b644
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring.Aop.dxc
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Aop.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Aop" RelatedProject="Spring-1.0-net-1.1.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="True" LoadOnDemand="False" LoadSourceComments="False">
+    <IgnoreWordList/>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Aop" tid="##PROJECT_INTRODUCTION" q="" cd="38813.6247569444"><![CDATA[<P><SPAN class=emphasis><EM>Aspect-Oriented Programming</EM></SPAN> (<SPAN class=emphasis><EM>AOP</EM></SPAN>) complements OOP by providing another way of thinking about program structure. Whereas OO decomposes applications into a hierarchy of objects, AOP decomposes programs into <SPAN class=emphasis><EM>aspects</EM></SPAN> or <SPAN class=emphasis><EM>concerns.&nbsp;</EM> This enables the modularization of concerns such as transaction management that would otherwise cut across multiple objects (such concerns are often termed <SPAN class=emphasis><EM>crosscutting</EM></SPAN> concerns).</SPAN></P>]]></c>
+<c eid="Spring.Aop" tid="##PROJECT_GETTINGSTARTED" q="" cd="39245.5270833333"><![CDATA[The <A href="http://www.springframework.net/doc-latest/reference/html/aop-quickstart.html">AOP Quickstart</A> included in the distribution is a good starting point to explore the functionality offered in Spring.NET's AOP Framework.]]></c>
+<c eid="Spring.Aop~AopAlliance.Aop_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[AOP framework interfaces based on the <A href="http://aopalliance.sourceforge.net/">AOP Alliance</A> API.]]></c>
+<c eid="Spring.Aop~AopAlliance.Intercept_namespace" tid="##SUMMARY" q="" cd="38813.6244675926">AOP Alliance interception interfaces.</c>
+<c eid="Spring.Aop~Spring.Aop_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>Core Spring.NET AOP interfaces, built on top of and implementing all of the AOP Alliance AOP interoperability interfaces.</P>
+<P>Spring.NET AOP also offers:</P>
+<OL>
+<LI>Introduction support</LI>
+<LI>A pointcut abstraction, supporting "static" pointcuts (class and method-based) and "dynamic" pointcuts (also considering method arguments).</LI>
+<LI>A&nbsp;full range of advice types, including around, before, after returning and throws advice.</LI>
+<LI>Extensibility points allowing arbitrary custom advice types to be plugged in without modifying the core framework.</LI></OL>
+<P>Spring.NET AOP can be used programmatically or (preferably) in conjunction with the Spring.NET IoC container.</P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Config_namespace" tid="##SUMMARY" q="" cd="39423.6115856481">Custom schema for configuration</c>
+<c eid="Spring.Aop~Spring.Aop.Framework_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>Basic AOP infrastructure compliant with the <A href="http://aopalliance.sourceforge.net/">AOP Alliance</A>&nbsp;interfaces.</P>
+<P>Spring.NET AOP supports proxying interfaces or classes, introductions, and offers static and dynamic pointcuts.<BR></P>
+<P>Any Spring.NET AOP proxy can be cast to the %ProxyConfig:Spring.Aop~Spring.Aop.Framework.ProxyConfig% AOP configuration interface in this namespace to add or remove interceptors.</P>
+<P>The %ProxyFactoryObject:Spring.Aop~Spring.Aop.Framework.ProxyFactoryObject% is a convenient way to create AOP proxies in an IObjectFactory or IApplicationContext. However, proxies can be created programmatically using the %ProxyFactory:Spring.Aop~Spring.Aop.Framework.ProxyFactory% class.</P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Framework.Adapter_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>Service Provider Interface (SPI) namespace allowing Spring.NET AOP framework to handle arbitrary advice types.<BR></P>
+<P>Users who want to use the Spring.NET AOP framework, rather than extend its capabilities, don't need to concern themselves with this namespace.</P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Framework.AutoProxy_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[Object&nbsp;post-processors for use in IApplicationContexts to simplify AOP usage by automatically creating AOP proxies without the need to use a ProxyFactoryObject. 
+<P>&nbsp; 
+<P>The various post-processors in this package need only be added to an IApplicationContext (typically in an XML object definition document) to automatically proxy selected objects. </P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Framework.AutoProxy.Target_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>Generic support classes for target source creation. </P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Framework.DynamicProxy_namespace" tid="##SUMMARY" q="" cd="38813.6245717593">Contains functionality relating to the creation of dynamic proxy instances.</c>
+<c eid="Spring.Aop~Spring.Aop.Support_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[Convenience classes for using Spring.NET's AOP API.]]></c>
+<c eid="Spring.Aop~Spring.Aop.Target_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>This namespace contains implementations of the %Spring.Aop.ITargetSource:Spring.Aop~Spring.Aop.ITargetSource% interface.<BR></P>
+<P>The simplest implementation is the %SingletonTargetSource:Spring.Aop~Spring.Aop.Target.SingletonTargetSource%, which is used in the AOP framework to wrap a single target instance. This is normally appropriate, and is the current default.</P>
+<P>Other features include pooling implementations, that provides a target from a pool for each request, ensuring a single threaded programming model; and a&nbsp;"prototype" implementation, that uses a new target instance for each invocation. (Much like single-call .NET remoting semanics).</P>]]></c>
+<c eid="Spring.Aop~Spring.Aspects_namespace" tid="##SUMMARY" q="" cd="39423.514537037">Reusable aspects</c>
+<c eid="Spring.Aop~Spring.Aspects.Cache_namespace" tid="##SUMMARY" q="" cd="39423.5146412037">Caching asepct</c>
+<c eid="Spring.Aop~Spring.Aspects.Exceptions_namespace" tid="##SUMMARY" q="" cd="39423.514837963">Exception handling aspect</c>
+<c eid="Spring.Aop~Spring.Aspects.Logging_namespace" tid="##SUMMARY" q="" cd="39423.5148611111">Logging aspect</c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring.Aop.dxc.bak b/doc/docx/Spring-1.1/net-1.1/Spring.Aop.dxc.bak
new file mode 100644
index 00000000..b3d019d0
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring.Aop.dxc.bak
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Aop.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Aop" RelatedProject="Spring-1.0-net-1.1.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="True" LoadOnDemand="False" LoadSourceComments="False">
+    <IgnoreWordList/>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Aop" tid="##PROJECT_INTRODUCTION" q="" cd="38813.6247569444"><![CDATA[<P><SPAN class=emphasis><EM>Aspect-Oriented Programming</EM></SPAN> (<SPAN class=emphasis><EM>AOP</EM></SPAN>) complements OOP by providing another way of thinking about program structure. Whereas OO decomposes applications into a hierarchy of objects, AOP decomposes programs into <SPAN class=emphasis><EM>aspects</EM></SPAN> or <SPAN class=emphasis><EM>concerns.&nbsp;</EM> This enables the modularization of concerns such as transaction management that would otherwise cut across multiple objects (such concerns are often termed <SPAN class=emphasis><EM>crosscutting</EM></SPAN> concerns).</SPAN></P>]]></c>
+<c eid="Spring.Aop" tid="##PROJECT_GETTINGSTARTED" q="" cd="39245.5270833333"><![CDATA[The <A href="http://www.springframework.net/doc-latest/reference/html/aop-quickstart.html">AOP Quickstart</A> included in the distribution is a good starting point to explore the functionality offered in Spring.NET's AOP Framework.]]></c>
+<c eid="Spring.Aop~AopAlliance.Aop_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[AOP framework interfaces based on the <A href="http://aopalliance.sourceforge.net/">AOP Alliance</A> API.]]></c>
+<c eid="Spring.Aop~AopAlliance.Intercept_namespace" tid="##SUMMARY" q="" cd="38813.6244675926">AOP Alliance interception interfaces.</c>
+<c eid="Spring.Aop~Spring.Aop_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>Core Spring.NET AOP interfaces, built on top of and implementing all of the AOP Alliance AOP interoperability interfaces.</P>
+<P>Spring.NET AOP also offers:</P>
+<OL>
+<LI>Introduction support</LI>
+<LI>A pointcut abstraction, supporting "static" pointcuts (class and method-based) and "dynamic" pointcuts (also considering method arguments).</LI>
+<LI>A&nbsp;full range of advice types, including around, before, after returning and throws advice.</LI>
+<LI>Extensibility points allowing arbitrary custom advice types to be plugged in without modifying the core framework.</LI></OL>
+<P>Spring.NET AOP can be used programmatically or (preferably) in conjunction with the Spring.NET IoC container.</P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Framework_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>Basic AOP infrastructure compliant with the <A href="http://aopalliance.sourceforge.net/">AOP Alliance</A>&nbsp;interfaces.</P>
+<P>Spring.NET AOP supports proxying interfaces or classes, introductions, and offers static and dynamic pointcuts.<BR></P>
+<P>Any Spring.NET AOP proxy can be cast to the %ProxyConfig:Spring.Aop~Spring.Aop.Framework.ProxyConfig% AOP configuration interface in this namespace to add or remove interceptors.</P>
+<P>The %ProxyFactoryObject:Spring.Aop~Spring.Aop.Framework.ProxyFactoryObject% is a convenient way to create AOP proxies in an IObjectFactory or IApplicationContext. However, proxies can be created programmatically using the %ProxyFactory:Spring.Aop~Spring.Aop.Framework.ProxyFactory% class.</P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Framework.Adapter_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>Service Provider Interface (SPI) namespace allowing Spring.NET AOP framework to handle arbitrary advice types.<BR></P>
+<P>Users who want to use the Spring.NET AOP framework, rather than extend its capabilities, don't need to concern themselves with this namespace.</P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Framework.AutoProxy_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[Object&nbsp;post-processors for use in IApplicationContexts to simplify AOP usage by automatically creating AOP proxies without the need to use a ProxyFactoryObject. 
+<P>&nbsp; 
+<P>The various post-processors in this package need only be added to an IApplicationContext (typically in an XML object definition document) to automatically proxy selected objects. </P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Framework.AutoProxy.Target_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>Generic support classes for target source creation. </P>]]></c>
+<c eid="Spring.Aop~Spring.Aop.Framework.DynamicProxy_namespace" tid="##SUMMARY" q="" cd="38813.6245717593">Contains functionality relating to the creation of dynamic proxy instances.</c>
+<c eid="Spring.Aop~Spring.Aop.Support_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[Convenience classes for using Spring.NET's AOP API.]]></c>
+<c eid="Spring.Aop~Spring.Aop.Target_namespace" tid="##SUMMARY" q="" cd="38813.6244675926"><![CDATA[<P>This namespace contains implementations of the %Spring.Aop.ITargetSource:Spring.Aop~Spring.Aop.ITargetSource% interface.<BR></P>
+<P>The simplest implementation is the %SingletonTargetSource:Spring.Aop~Spring.Aop.Target.SingletonTargetSource%, which is used in the AOP framework to wrap a single target instance. This is normally appropriate, and is the current default.</P>
+<P>Other features include pooling implementations, that provides a target from a pool for each request, ensuring a single threaded programming model; and a&nbsp;"prototype" implementation, that uses a new target instance for each invocation. (Much like single-call .NET remoting semanics).</P>]]></c>
+<c eid="Spring.Aop~Spring.Aspects_namespace" tid="##SUMMARY" q="" cd="39423.514537037">Reusable aspects</c>
+<c eid="Spring.Aop~Spring.Aspects.Cache_namespace" tid="##SUMMARY" q="" cd="39423.5146412037">Caching asepct</c>
+<c eid="Spring.Aop~Spring.Aspects.Exceptions_namespace" tid="##SUMMARY" q="" cd="39423.514837963">Exception handling aspect</c>
+<c eid="Spring.Aop~Spring.Aspects.Logging_namespace" tid="##SUMMARY" q="" cd="39423.5148611111">Logging aspect</c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring.Core.dxc b/doc/docx/Spring-1.1/net-1.1/Spring.Core.dxc
new file mode 100644
index 00000000..3d552487
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring.Core.dxc
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Core.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Core" RelatedProject="Spring-1.0-net-1.1.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="True" LoadOnDemand="False" LoadSourceComments="False">
+    <IgnoreWordList>Globalization|instantiating</IgnoreWordList>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <lang_vbUsage>on</lang_vbUsage>
+        <lang_VB>on</lang_VB>
+        <lang_CS>on</lang_CS>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Core" tid="##PROJECT_INTRODUCTION" q="" cd="39053.9711574074"><![CDATA[<P>The Spring.Core namespace provides an implementation of an Inversion of Control container.&nbsp;</P>
+<P>Inversion of Control (IoC) containers provide a&nbsp;simple but powerful means to&nbsp;create and configure properties of objects in your application.&nbsp; These properties maybe simple types, such as strings or integers but much of the power of an IoC container comes from the ability to set properties that are references to other objects in your application, i.e. an objects dependencies.&nbsp;</P>
+<P>An introductory article to IoC containers can be found in the September 2005 edition of <A href="http://msdn.microsoft.com/msdnmag/issues/05/09/DesignPatterns/default.aspx">MSDN Magazine</A>.&nbsp; Links to additional introductory material on IoC containers can be found on&nbsp;the <A href="www.springframework.net">Spring.NET</A> or <A href="www.springframework.org">Spring Framework</A> web sites.</P>
+<P>The design of Spring.NET's IoC container is such that your application objects configured by the IoC container almost always to not need to depend on any classes or interfaces contained in this namespace.&nbsp;</P>
+<P>However, you may find it useful to reference this namespace as it contains&nbsp;some general framework style classes&nbsp; &nbsp;These range from&nbsp;%Spring.Expressions:Spring.Core~Spring.Expressions_namespace% that provides&nbsp;evaluation of object graph expressions to&nbsp;%Spring.Util:Spring.Core~Spring.Util_namespace% that provides various Reflection, String, and XML utility functions.</P>]]></c>
+<c eid="Spring.Core" tid="##PROJECT_GETTINGSTARTED" q="" cd="39245.5287152778"><![CDATA[<P>Inversion of Control (IoC) containers provide a non-invasive means to configure the dependency of objects in your application.&nbsp; A more detailed&nbsp;introduction to IoC containers can be found is this <A href="http://martinfowler.com/articles/injection.html">article</A> by Martin Fowler which uses a simple movie search application as a means to demonstrate the IoC container.&nbsp; This example&nbsp;implemented using Spring.NET's IoC is available as part of the&nbsp;the Spring.NET distribution and documented as the <A href="http://www.springframework.net/doc-latest/reference/html/quickstarts.html">MovieFinder Quickstart</A>.</P>]]></c>
+<c eid="Spring.Core~Spring.Caching_namespace" tid="##SUMMARY" q="" cd="39423.5169444444">General caching interfaces and abstract base classes.</c>
+<c eid="Spring.Core~Spring.Collections_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[Collection style classes used throughout the Spring.NET framework.&nbsp; Most notably an implementation of a %Set:Spring.Core~Spring.Collections.ISet% collection class.]]></c>
+<c eid="Spring.Core~Spring.Context_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[<P>Builds on the feature set provided by the Spring.Objects namespace to add support for&nbsp;message sources and for the Observer design pattern, and the ability for application objects to obtain resources.</P>
+<P>There is no necessity for Spring.NET applications explicitly to depend on the functionality provided by either of the&nbsp;%IApplicationContext:Spring.Core~Spring.Context.IApplicationContext% or %IObjectFactory:Spring.Core~Spring.Objects.Factory.IObjectFactory% interfaces. One of the strengths of the Spring.NET architecture is that application objects can almost always be configured without any dependency on Spring.NET-specific APIs.</P>]]></c>
+<c eid="Spring.Core~Spring.Context.Events_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[<P>Support classes for application events, such as standard context events.</P>]]></c>
+<c eid="Spring.Core~Spring.Context.Support_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[<P>Support classes for the functionality defined in the Spring.Context namespace.<BR></P>
+<P>Contains abstract base classes for the %IApplicationContext:Spring.Core~Spring.Context.IApplicationContext% and %IMessageSource:Spring.Core~Spring.Context.IMessageSource% interfaces.</P>]]></c>
+<c eid="Spring.Core~Spring.Core_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Provides core interfaces that are not specific to any part of the framework.</c>
+<c eid="Spring.Core~Spring.Core.IO_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Generic abstraction for resources such as files accessed via HTTP or the local file system.</c>
+<c eid="Spring.Core~Spring.Core.TypeConversion_namespace" tid="##SUMMARY" q="" cd="39423.5170717593">TypeConversion utilities</c>
+<c eid="Spring.Core~Spring.Core.TypeResolution_namespace" tid="##SUMMARY" q="" cd="39423.5171296296">TypeResolution utilities</c>
+<c eid="Spring.Core~Spring.DataBinding_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Provides data binding of objects to view components.</c>
+<c eid="Spring.Core~Spring.Expressions_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[Provides&nbsp;evaluation of object graph expressions.]]></c>
+<c eid="Spring.Core~Spring.Expressions.Processors_namespace" tid="##SUMMARY" q="" cd="39053.9716435185">Provides additional functionality such as MAX, MIN to evaluation of object graph expressions</c>
+<c eid="Spring.Core~Spring.Globalization_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[Defines the core interfaces and support classes for internationalization&nbsp;support.]]></c>
+<c eid="Spring.Core~Spring.Globalization.Formatters_namespace" tid="##SUMMARY" q="" cd="39053.9719097222">Useful formatters for application globalizaiton</c>
+<c eid="Spring.Core~Spring.Globalization.Localizers_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Defines implementations of the %ILocalizer:Spring.Core~Spring.Globalization.ILocalizer% interface that apply resources to target objects as well as any supporting classes.</c>
+<c eid="Spring.Core~Spring.Globalization.Resolvers_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[Defines implementations of the %ICultureResolver:Spring.Core~Spring.Globalization.ICultureResolver% strategy interface for resolving CultureInfo instances as well as&nbsp;any supporting classes.]]></c>
+<c eid="Spring.Core~Spring.Objects_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[<P>Contains interfaces and classes for manipulating plain old .NET objects (PONOs).</P>
+<P>The classes and interfaces declared in this namespace are central to Spring.NET's Inversion of Control (IoC) container implementation.</P>]]></c>
+<c eid="Spring.Core~Spring.Objects.Events_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Interfaces that define a loosely coupled event model.</c>
+<c eid="Spring.Core~Spring.Objects.Events.Support_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Support classes for the interfaces defined in the Spring.Objects.Events namespace, such as an implementation of the %IEventRegistry:Spring.Core~Spring.Objects.Events.IEventRegistry% interface.</c>
+<c eid="Spring.Core~Spring.Objects.Factory_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[The core namespace implementing Spring.NET's lightweight Inversion of Control (IoC) container.<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<BR>Provides an alternative to the Singleton and Prototype design patterns, including a consistent approach to configuration management. Builds on top of the classes defined in the %Spring.Objects:Spring.Core~Spring.Objects_namespace% namespace.]]></c>
+<c eid="Spring.Core~Spring.Objects.Factory.Config_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Configuration-related convenience classes for object factories.</c>
+<c eid="Spring.Core~Spring.Objects.Factory.Parsing_namespace" tid="##SUMMARY" q="" cd="39423.5176157407">Helper classes used when parsing XML configuration files</c>
+<c eid="Spring.Core~Spring.Objects.Factory.Support_namespace" tid="##SUMMARY" q="" cd="39053.972025463"><![CDATA[<P>Classes supporting the classes defined in the Spring.Objects.Factory namespace.<BR></P>
+<P>Contains a number of abstract base classes for custom IObjectFactory implementations.</P>]]></c>
+<c eid="Spring.Core~Spring.Objects.Factory.Xml_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Contains an abstract XML-based %IObjectFactory:Spring.Core~Spring.Objects.Factory.IObjectFactory% implementation, including an XML Schema for validation.</c>
+<c eid="Spring.Core~Spring.Objects.Support_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[<P>Classes supporting the classes defined in the %Spring.Objects.Factory:Spring.Core~Spring.Objects.Factory_namespace% namespace.<BR></P>
+<P>Contains a number of abstract base classes for custom %IObjectFactory:Spring.Core~Spring.Objects.Factory.IObjectFactory% implementations.</P>]]></c>
+<c eid="Spring.Core~Spring.Pool_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Contains object pool interfaces.</c>
+<c eid="Spring.Core~Spring.Pool.Support_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Contains simple object pool implementation.</c>
+<c eid="Spring.Core~Spring.Proxy_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[<P>Provides classes that can create proxy types via composition or inheritance, and apply any number of custom attributes to the class definition and / or members of the proxied type.<BR></P>
+<P>This is useful in those cases where attributes may need to be applied to a class definition to take advantage of behavior that relies on the presence of such attributes. Examples of behavior that can be controlled&nbsp;via the use of attributes include COM+ ServicedComponents and web services.</P>]]></c>
+<c eid="Spring.Core~Spring.Reflection.Dynamic_namespace" tid="##SUMMARY" q="" cd="39423.5177314815">High performance reflection</c>
+<c eid="Spring.Core~Spring.Threading_namespace" tid="##SUMMARY" q="" cd="39053.9727199074">Threading utilities such as LogicalThreadContext (Thread Local Storage) Latch and Semaphore.</c>
+<c eid="Spring.Core~Spring.Util_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Miscellaneous utility classes, such as string manipulation utilities.</c>
+<c eid="Spring.Core~Spring.Validation_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Provides validation functionality, for usage in business and / or UI layers.</c>
+<c eid="Spring.Core~Spring.Validation.Actions_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Implementations of %IValidationAction:Spring.Core~Spring.Validation.IValidationAction%.</c>
+<c eid="Spring.Core~Spring.Validation.Config_namespace" tid="##SUMMARY" q="" cd="39423.5178587963">Custom schema for validation</c>
+<c eid="Spring.Core~Spring.Validation.Validators_namespace" tid="##SUMMARY" q="" cd="39423.5185648148">Validation implementations such as CreditCardValidation, EmailValidator</c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring.Core.dxc.bak b/doc/docx/Spring-1.1/net-1.1/Spring.Core.dxc.bak
new file mode 100644
index 00000000..314ad7ea
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring.Core.dxc.bak
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Core.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Core" RelatedProject="Spring-1.0-net-1.1.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="True" LoadOnDemand="False" LoadSourceComments="False">
+    <IgnoreWordList>Globalization|instantiating</IgnoreWordList>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <lang_vbUsage>on</lang_vbUsage>
+        <lang_VB>on</lang_VB>
+        <lang_CS>on</lang_CS>
+        <dtscrollpos>2072</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Core" tid="##PROJECT_INTRODUCTION" q="" cd="39053.9711574074"><![CDATA[<P>The Spring.Core namespace provides an implementation of an Inversion of Control container.&nbsp;</P>
+<P>Inversion of Control (IoC) containers provide a&nbsp;simple but powerful means to&nbsp;create and configure properties of objects in your application.&nbsp; These properties maybe simple types, such as strings or integers but much of the power of an IoC container comes from the ability to set properties that are references to other objects in your application, i.e. an objects dependencies.&nbsp;</P>
+<P>An introductory article to IoC containers can be found in the September 2005 edition of <A href="http://msdn.microsoft.com/msdnmag/issues/05/09/DesignPatterns/default.aspx">MSDN Magazine</A>.&nbsp; Links to additional introductory material on IoC containers can be found on&nbsp;the <A href="www.springframework.net">Spring.NET</A> or <A href="www.springframework.org">Spring Framework</A> web sites.</P>
+<P>The design of Spring.NET's IoC container is such that your application objects configured by the IoC container almost always to not need to depend on any classes or interfaces contained in this namespace.&nbsp;</P>
+<P>However, you may find it useful to reference this namespace as it contains&nbsp;some general framework style classes&nbsp; &nbsp;These range from&nbsp;%Spring.Expressions:Spring.Core~Spring.Expressions_namespace% that provides&nbsp;evaluation of object graph expressions to&nbsp;%Spring.Util:Spring.Core~Spring.Util_namespace% that provides various Reflection, String, and XML utility functions.</P>]]></c>
+<c eid="Spring.Core" tid="##PROJECT_GETTINGSTARTED" q="" cd="39053.9711574074"><![CDATA[<P>Inversion of Control (IoC) containers provide a non-invasive means to configure the dependency of objects in your application.&nbsp; A more detailed&nbsp;introduction to IoC containers can be found is this <A href="http://martinfowler.com/articles/injection.html">article</A> by Martin Fowler which uses a simple movie search application as a means to demonstrate the IoC container.&nbsp; This example&nbsp;implemented using Spring.NET's IoC is available as part of the&nbsp;the Spring.NET distribution and documented as the <A href="http://www.springframework.net/doc/reference/html/quickstarts.html">MovieFinder Quickstart</A>.</P>]]></c>
+<c eid="Spring.Core~Spring.Attributes_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Custom .NET Attributes provided by the Spring.NET Framework.</c>
+<c eid="Spring.Core~Spring.Collections_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[Collection style classes used throughout the Spring.NET framework.&nbsp; Most notably an implementation of a %Set:Spring.Core~Spring.Collections.ISet% collection class.]]></c>
+<c eid="Spring.Core~Spring.Context_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[<P>Builds on the feature set provided by the Spring.Objects namespace to add support for&nbsp;message sources and for the Observer design pattern, and the ability for application objects to obtain resources.</P>
+<P>There is no necessity for Spring.NET applications explicitly to depend on the functionality provided by either of the&nbsp;%IApplicationContext:Spring.Core~Spring.Context.IApplicationContext% or %IObjectFactory:Spring.Core~Spring.Objects.Factory.IObjectFactory% interfaces. One of the strengths of the Spring.NET architecture is that application objects can almost always be configured without any dependency on Spring.NET-specific APIs.</P>]]></c>
+<c eid="Spring.Core~Spring.Context.Events_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[<P>Support classes for application events, such as standard context events.</P>]]></c>
+<c eid="Spring.Core~Spring.Context.Support_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[<P>Support classes for the functionality defined in the Spring.Context namespace.<BR></P>
+<P>Contains abstract base classes for the %IApplicationContext:Spring.Core~Spring.Context.IApplicationContext% and %IMessageSource:Spring.Core~Spring.Context.IMessageSource% interfaces.</P>]]></c>
+<c eid="Spring.Core~Spring.Core_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Provides core interfaces that are not specific to any part of the framework.</c>
+<c eid="Spring.Core~Spring.Core.IO_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Generic abstraction for resources such as files accessed via HTTP or the local file system.</c>
+<c eid="Spring.Core~Spring.DataBinding_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Provides data binding of objects to view components.</c>
+<c eid="Spring.Core~Spring.Expressions_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[Provides&nbsp;evaluation of object graph expressions.]]></c>
+<c eid="Spring.Core~Spring.Expressions.Processors_namespace" tid="##SUMMARY" q="" cd="39053.9716435185">Provides additional functionality such as MAX, MIN to evaluation of object graph expressions</c>
+<c eid="Spring.Core~Spring.Globalization_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[Defines the core interfaces and support classes for internationalization&nbsp;support.]]></c>
+<c eid="Spring.Core~Spring.Globalization.Formatters_namespace" tid="##SUMMARY" q="" cd="39053.9719097222">Useful formatters for application globalizaiton</c>
+<c eid="Spring.Core~Spring.Globalization.Localizers_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Defines implementations of the %ILocalizer:Spring.Core~Spring.Globalization.ILocalizer% interface that apply resources to target objects as well as any supporting classes.</c>
+<c eid="Spring.Core~Spring.Globalization.Resolvers_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[Defines implementations of the %ICultureResolver:Spring.Core~Spring.Globalization.ICultureResolver% strategy interface for resolving CultureInfo instances as well as&nbsp;any supporting classes.]]></c>
+<c eid="Spring.Core~Spring.Objects_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[<P>Contains interfaces and classes for manipulating plain old .NET objects (PONOs).</P>
+<P>The classes and interfaces declared in this namespace are central to Spring.NET's Inversion of Control (IoC) container implementation.</P>]]></c>
+<c eid="Spring.Core~Spring.Objects.Events_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Interfaces that define a loosely coupled event model.</c>
+<c eid="Spring.Core~Spring.Objects.Events.Support_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Support classes for the interfaces defined in the Spring.Objects.Events namespace, such as an implementation of the %IEventRegistry:Spring.Core~Spring.Objects.Events.IEventRegistry% interface.</c>
+<c eid="Spring.Core~Spring.Objects.Factory_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[The core namespace implementing Spring.NET's lightweight Inversion of Control (IoC) container.<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<BR>Provides an alternative to the Singleton and Prototype design patterns, including a consistent approach to configuration management. Builds on top of the classes defined in the %Spring.Objects:Spring.Core~Spring.Objects_namespace% namespace.]]></c>
+<c eid="Spring.Core~Spring.Objects.Factory.Config_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Configuration-related convenience classes for object factories.</c>
+<c eid="Spring.Core~Spring.Objects.Factory.Support_namespace" tid="##SUMMARY" q="" cd="39053.972025463"><![CDATA[<P>Classes supporting the classes defined in the Spring.Objects.Factory namespace.<BR></P>
+<P>Contains a number of abstract base classes for custom IObjectFactory implementations.</P>]]></c>
+<c eid="Spring.Core~Spring.Objects.Factory.Xml_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Contains an abstract XML-based %IObjectFactory:Spring.Core~Spring.Objects.Factory.IObjectFactory% implementation, including an XML Schema for validation.</c>
+<c eid="Spring.Core~Spring.Objects.Support_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[<P>Classes supporting the classes defined in the %Spring.Objects.Factory:Spring.Core~Spring.Objects.Factory_namespace% namespace.<BR></P>
+<P>Contains a number of abstract base classes for custom %IObjectFactory:Spring.Core~Spring.Objects.Factory.IObjectFactory% implementations.</P>]]></c>
+<c eid="Spring.Core~Spring.Objects.TypeConverters_namespace" tid="##SUMMARY" q="" cd="39053.9720949074"><![CDATA[<P>TypeConverters are used to convert between string and objects and vice versa.</P>
+<P>Some of the custom type converter implementation classes in this namespace are registered automatically by an appropriate IObjectWrapper implementation class.</P>
+<P><BR>Please consult either the reference documentation or the embedded (API) documentation (for the appropriate IObjectWrapper implementation class) for the specifics of which TypeConverters are pre-registered.</P>]]></c>
+<c eid="Spring.Core~Spring.Pool_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Contains object pool interfaces.</c>
+<c eid="Spring.Core~Spring.Pool.Support_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Contains simple object pool implementation.</c>
+<c eid="Spring.Core~Spring.Proxy_namespace" tid="##SUMMARY" q="" cd="39053.9711574074"><![CDATA[<P>Provides classes that can create proxy types via composition or inheritance, and apply any number of custom attributes to the class definition and / or members of the proxied type.<BR></P>
+<P>This is useful in those cases where attributes may need to be applied to a class definition to take advantage of behavior that relies on the presence of such attributes. Examples of behavior that can be controlled&nbsp;via the use of attributes include COM+ ServicedComponents and web services.</P>]]></c>
+<c eid="Spring.Core~Spring.Threading_namespace" tid="##SUMMARY" q="" cd="39053.9727199074">Threading utilities such as LogicalThreadContext (Thread Local Storage) Latch and Semaphore.</c>
+<c eid="Spring.Core~Spring.Util_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Miscellaneous utility classes, such as string manipulation utilities.</c>
+<c eid="Spring.Core~Spring.Util.DynamicReflection_namespace" tid="##SUMMARY" q="" cd="39053.9729050926">High performance reflection.</c>
+<c eid="Spring.Core~Spring.Validation_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Provides validation functionality, for usage in business and / or UI layers.</c>
+<c eid="Spring.Core~Spring.Validation.Actions_namespace" tid="##SUMMARY" q="" cd="39053.9711574074">Implementations of %IValidationAction:Spring.Core~Spring.Validation.IValidationAction%.</c>
+    </DocumentXComments>
+
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring.Data.NHibernate.dxc b/doc/docx/Spring-1.1/net-1.1/Spring.Data.NHibernate.dxc
new file mode 100644
index 00000000..d071c7d7
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring.Data.NHibernate.dxc
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Data.NHibernate.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Data.NHibernate" RelatedProject="Spring-1.1.0.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="False" LoadOnDemand="True" LoadSourceComments="False">
+    <IgnoreWordList/>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Data.NHibernate" tid="##PROJECT_GETTINGSTARTED" q="" cd="39234.7355439815"><![CDATA[The reference documentation and sample application, NHibernate Northwind&nbsp;are the best places to get started using the functionality contained in Spring.Data.NHibernate]]></c>
+<c eid="Spring.Data.NHibernate" tid="##PROJECT_INTRODUCTION" q="" cd="39234.7377662037"><![CDATA[<P>The Spring Framework provides integration with <SPAN class=emphasis><EM>NHibernate </EM></SPAN>in terms of resource management, DAO implementation support, and transaction strategies.</P>
+<P>Some of the benefits of using the Spring Framework to create your ORM DAOs include:</P>
+<UL>
+<LI><SPAN class=emphasis><EM>Ease of testing.</EM></SPAN> Spring's IoC approach makes it easy to swap the implementations and config locations of Hibernate <FONT color=#000000><CODE class=interfacename>SessionFactory</CODE> instances, ADO.NET <CODE class=interfacename>DbProvider</CODE> instances, transaction managers, and mapper object implementations (if needed). </FONT></LI>
+<LI>Common data access exceptions.Spring can wrap exceptions from your O/R mapping tool of choice, converting them from proprietary exceptions to a common runtime DataAccessException hierarchy.</LI>
+<LI><SPAN class=emphasis><EM>General resource management.</EM></SPAN> Spring application contexts can handle the location and configuration of Hibernate <FONT color=#000000><CODE class=interfacename>ISessionFactory</CODE> instances, ADO.NET <CODE class=interfacename>DbProvider</CODE> instances and other related resources.&nbsp; For example: related code using NHibernate generally needs to use the same NHibernate </FONT><FONT color=#000000><CODE class=interfacename>Session</CODE> for efficiency and proper transaction handling. Spring makes it easy to transparently create and bind a <CODE class=interfacename>Session</CODE> to the current thread</FONT></LI>
+<LI><SPAN class=emphasis><EM>Integrated transaction management.</EM></SPAN> Spring allows you to wrap your O/R mapping code with either a declarative, AOP style method interceptor, or an explicit 'template' wrapper class at the code level. In either case, transaction semantics are handled for you, and proper transaction handling (rollback, etc) in case of exceptions is taken care of.</LI></UL>]]></c>
+<c eid="Spring.Data.NHibernate~Spring.Data.NHibernate_namespace" tid="##SUMMARY" q="" cd="39423.5240046296">Provides integration of NHibernate with Spring concepts</c>
+<c eid="Spring.Data.NHibernate~Spring.Data.NHibernate.Support_namespace" tid="##SUMMARY" q="" cd="39423.5241782407">Classes supporting the Spring.Data.NHibernate namespace</c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring.Data.NHibernate.dxc.bak b/doc/docx/Spring-1.1/net-1.1/Spring.Data.NHibernate.dxc.bak
new file mode 100644
index 00000000..07b3072d
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring.Data.NHibernate.dxc.bak
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Data.NHibernate.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Data.NHibernate" RelatedProject="Spring-1.1.0.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="False" LoadOnDemand="True" LoadSourceComments="False">
+    <IgnoreWordList/>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Data.NHibernate" tid="##PROJECT_GETTINGSTARTED" q="" cd="39234.7355439815"><![CDATA[The reference documentation and sample application, NHibernate Northwind&nbsp;are the best places to get started using the functionality contained in Spring.Data.NHibernate]]></c>
+<c eid="Spring.Data.NHibernate" tid="##PROJECT_INTRODUCTION" q="" cd="39234.7377662037"><![CDATA[<P>The Spring Framework provides integration with <SPAN class=emphasis><EM>NHibernate </EM></SPAN>in terms of resource management, DAO implementation support, and transaction strategies.</P>
+<P>Some of the benefits of using the Spring Framework to create your ORM DAOs include:</P>
+<UL>
+<LI><SPAN class=emphasis><EM>Ease of testing.</EM></SPAN> Spring's IoC approach makes it easy to swap the implementations and config locations of Hibernate <FONT color=#000000><CODE class=interfacename>SessionFactory</CODE> instances, ADO.NET <CODE class=interfacename>DbProvider</CODE> instances, transaction managers, and mapper object implementations (if needed). </FONT></LI>
+<LI>Common data access exceptions.Spring can wrap exceptions from your O/R mapping tool of choice, converting them from proprietary exceptions to a common runtime DataAccessException hierarchy.</LI>
+<LI><SPAN class=emphasis><EM>General resource management.</EM></SPAN> Spring application contexts can handle the location and configuration of Hibernate <FONT color=#000000><CODE class=interfacename>ISessionFactory</CODE> instances, ADO.NET <CODE class=interfacename>DbProvider</CODE> instances and other related resources.&nbsp; For example: related code using NHibernate generally needs to use the same NHibernate </FONT><FONT color=#000000><CODE class=interfacename>Session</CODE> for efficiency and proper transaction handling. Spring makes it easy to transparently create and bind a <CODE class=interfacename>Session</CODE> to the current thread</FONT></LI>
+<LI><SPAN class=emphasis><EM>Integrated transaction management.</EM></SPAN> Spring allows you to wrap your O/R mapping code with either a declarative, AOP style method interceptor, or an explicit 'template' wrapper class at the code level. In either case, transaction semantics are handled for you, and proper transaction handling (rollback, etc) in case of exceptions is taken care of.</LI></UL>]]></c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring.Data.dxc b/doc/docx/Spring-1.1/net-1.1/Spring.Data.dxc
new file mode 100644
index 00000000..dd9a7a92
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring.Data.dxc
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Data.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Data" RelatedProject="Spring-1.1.0.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="True" LoadOnDemand="False" LoadSourceComments="False">
+    <IgnoreWordList/>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Data" tid="##PROJECT_INTRODUCTION" q="" cd="39053.8833449074"><![CDATA[<P>The Spring.Data assembly provides an implementation of best practice approaches to data access.</P>
+<P>Specifically, it contains an abstraction for transaction management that provides the following benefits</P>
+<UL>
+<UL>
+<LI>
+<P>Provides a consistent programming model across different transaction APIs such as ADO.NET, EnterpriseServices, System.Transactions, and NHibernate.</P>
+<LI>
+<P>Support for declarative transaction management with any of the above data access technologies</P>
+<LI>
+<P>Provides a simple API for programmatic transaction management</P>
+<LI>
+<P>Integrates with Spring's high level persistence integration APIs such as %AdoTemplate:Spring.Data~Spring.Data.AdoTemplate%.</P></LI></UL></UL>
+<P>&nbsp;</P>
+<P>Spring.Data&nbsp;also contains&nbsp;an abstraction for data access via ADO.NET that provides the following benefits and features</P>
+<UL>
+<UL>
+<LI>
+<P>Consistent and comprehensive database provider interfaces for both .NET 1.1 and 2.0</P>
+<LI>
+<P>Integration with Spring's transaction management features.</P>
+<LI>
+<P>'One-liner' implementations for the most common database usage patterns lets you focus on the 'meat' of your ADO.NET code.</P>
+<LI>
+<P>Template style use of DbCommand that removes the need to write typical ADO.NET boiler-plate code.</P>
+<LI>
+<P>Easy database parameter creation/management</P>
+<LI>
+<P>Provider independent exceptions with database error codes and higher level DAO exception hierarchy.</P>
+<LI>
+<P>Centralized resource management for connections, commands, data readers, etc.</P>
+<LI>
+<P>Simple DataReader to Object mapping framework.</P></LI></UL></UL>
+<P>&nbsp;</P>
+<P>For more information refer to the Getting Started section within this documentation and the reference documentation, the latest copy of which can be found on the <A href="www.springframework.net">Spring.NET web site</A>.</P>
+<P>&nbsp;</P>]]></c>
+<c eid="Spring.Data" tid="##PROJECT_GETTINGSTARTED" q="" cd="39053.8652083333">The reference documentation and Spring.DataQuickStart are the best places to get started using the functionality contained in Spring.Data.</c>
+<c eid="Spring.Data" tid="##SUMMARY" q="" cd="39423.5195138889">Provides ADO.NET Framework, Data Access Exception Hierarchy and declarative transaction managment.</c>
+<c eid="Spring.Data~Spring.Dao_namespace" tid="##SUMMARY" q="" cd="39053.7318055556"><![CDATA[Exception hierarchy enabling sophisticated error handling independent of the data access approach in use. For example, when DAOs and data access frameworks use the exceptions in this package (and custom subclasses), calling code can detect and handle common problems such as deadlocks without being tied to a particular data access strategy such as ADO.NET or ORM libraries, as well as vendor specific error codes.<BR>]]></c>
+<c eid="Spring.Data~Spring.Dao.Support_namespace" tid="##SUMMARY" q="" cd="39053.804537037">Support classes for DAO implementations, providing miscellaneous utility methods.</c>
+<c eid="Spring.Data~Spring.Data_namespace" tid="##SUMMARY" q="" cd="39053.8076967593"><![CDATA[<P>The classes in this package make ADO.NET easier to use and<BR>reduce the likelihood of common errors. The central class in this namespace&nbsp;is AdoTemplate, which removes the need to manage&nbsp;resource management for connections, commands, data readers, etc. and integrates with Spring's Transaction management features.</P>]]></c>
+<c eid="Spring.Data~Spring.Data.Common_namespace" tid="##SUMMARY" q="" cd="39053.808587963"><![CDATA[Consistent and comprehensive database provider interfaces for both .NET 1.1 and 2.0.&nbsp; Utility classes for easy database parameter creation.]]></c>
+<c eid="Spring.Data~Spring.Data.Config_namespace" tid="##SUMMARY" q="" cd="39423.5197222222">Custom schema for Spring.Data</c>
+<c eid="Spring.Data~Spring.Data.Core_namespace" tid="##SUMMARY" q="" cd="39423.5203819444">Provides the core ADO.NET framework, based on AdoTemplate and its associated callback interfaces, delegates and helper objects.</c>
+<c eid="Spring.Data~Spring.Data.Objects_namespace" tid="##SUMMARY" q="" cd="39053.811724537"><![CDATA[<P>The classes in this namespace represent RDBMS queries, updates,<BR>and stored procedures as thread-safe, reusable objects.</P>
+<P>This ADO.NET abstraction depends on the features of AdoTemplate and as such exceptions thrown are in are thrown are within Spring' DAO exception class hierarchy.</P>]]></c>
+<c eid="Spring.Data~Spring.Data.Support_namespace" tid="##SUMMARY" q="" cd="39053.8120138889">Classes supporting the Spring.Data namespace</c>
+<c eid="Spring.Data~Spring.Transaction_namespace" tid="##SUMMARY" q="" cd="39053.8597569444"><![CDATA[<P>Contains transaction manager, definition, and status interfaces.&nbsp; </P>
+<P>Transaction callback interfaces and delegates&nbsp;for use with TransactionTemplate.</P>
+<P>Exception hierarchy for Spring's transaction infrastructure,<BR>independent of any specific transaction management system.</P>]]></c>
+<c eid="Spring.Data~Spring.Transaction.Config_namespace" tid="##SUMMARY" q="" cd="39423.5206134259">Custom schema for declarative transaction management</c>
+<c eid="Spring.Data~Spring.Transaction.Interceptor_namespace" tid="##SUMMARY" q="" cd="39053.8137615741"><![CDATA[<P>Aspect-Oriented Programming (AOP) based solution for declarative transaction demarcation.&nbsp; Builds on the AOP infrastructure within Spring.Aop.&nbsp;</P>]]></c>
+<c eid="Spring.Data~Spring.Transaction.Support_namespace" tid="##SUMMARY" q="" cd="39053.8140162037">Classes supporting the Spring.Transaction namespace.</c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring.Services.dxc b/doc/docx/Spring-1.1/net-1.1/Spring.Services.dxc
new file mode 100644
index 00000000..a1c24c0f
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring.Services.dxc
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Services.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Services" RelatedProject="Spring-1.1.0.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="True" LoadOnDemand="False" LoadSourceComments="False">
+    <IgnoreWordList/>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Services" tid="##PROJECT_INTRODUCTION" q="" cd="39413.4980902778"><![CDATA[<P>Use this module to adapt plain .NET objects so they can be used with a specific distributed communication technology, such as .NET Remoting, Enterprise Services, and ASMX Web Services.</P>
+<P>The classes in this assembly provide server and client-side support to export plain .NET objects as a ServicedComponent, Remote object, or Web Service.&nbsp; Exporters can be configured via Dependency Injection and aspects can be applied to these exported objects.</P>]]></c>
+<c eid="Spring.Services" tid="##PROJECT_GETTINGSTARTED" q="" cd="39053.8903587963"><![CDATA[The reference documentation and QuickStart applications (Calculator and Spring.WebQuickStart) &nbsp;are the best places to get started using the functionality contained in Spring.Services.]]></c>
+<c eid="Spring.Services~Spring.EnterpriseServices_namespace" tid="##SUMMARY" q="" cd="39053.8894560185"><![CDATA[Provides functionality to&nbsp;export objects as ServicedComponents and to client side support.]]></c>
+<c eid="Spring.Services~Spring.Remoting_namespace" tid="##SUMMARY" q="" cd="39053.8895486111"><![CDATA[Provides functionality for&nbsp;exporting .NET remoting objects.]]></c>
+<c eid="Spring.Services~Spring.Remoting.Config_namespace" tid="##SUMMARY" q="" cd="39423.5211226852">Custom schema for .NET remoting</c>
+<c eid="Spring.Services~Spring.Remoting.Support_namespace" tid="##SUMMARY" q="" cd="39053.8896412037">Support classes for .NET remoting functionality.</c>
+<c eid="Spring.Services~Spring.Web.Services_namespace" tid="##SUMMARY" q="" cd="39053.8897800926">Provides functionality for exporting/consuming Web Services</c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring.Services.dxc.bak b/doc/docx/Spring-1.1/net-1.1/Spring.Services.dxc.bak
new file mode 100644
index 00000000..6b420771
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring.Services.dxc.bak
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Services.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Services" RelatedProject="Spring-1.1.0.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="True" LoadOnDemand="False" LoadSourceComments="False">
+    <IgnoreWordList/>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Services" tid="##PROJECT_INTRODUCTION" q="" cd="39413.4980902778"><![CDATA[<P>Use this module to adapt plain .NET objects so they can be used with a specific distributed communication technology, such as .NET Remoting, Enterprise Services, and ASMX Web Services.</P>
+<P>The classes in this assembly provide server and client-side support to export plain .NET objects as a ServicedComponent, Remote object, or Web Service.&nbsp; Exporters can be configured via Dependency Injection and aspects can be applied to these exported objects.</P>]]></c>
+<c eid="Spring.Services" tid="##PROJECT_GETTINGSTARTED" q="" cd="39053.8903587963"><![CDATA[The reference documentation and QuickStart applications (Calculator and Spring.WebQuickStart) &nbsp;are the best places to get started using the functionality contained in Spring.Services.]]></c>
+<c eid="Spring.Services~Spring.EnterpriseServices_namespace" tid="##SUMMARY" q="" cd="39053.8894560185"><![CDATA[Provides functionality to&nbsp;export objects as ServicedComponents and to client side support.]]></c>
+<c eid="Spring.Services~Spring.Remoting_namespace" tid="##SUMMARY" q="" cd="39053.8895486111"><![CDATA[Provides functionality for&nbsp;exporting .NET remoting objects.]]></c>
+<c eid="Spring.Services~Spring.Remoting.Support_namespace" tid="##SUMMARY" q="" cd="39053.8896412037">Support classes for .NET remoting functionality.</c>
+<c eid="Spring.Services~Spring.Web.Services_namespace" tid="##SUMMARY" q="" cd="39053.8897800926">Provides functionality for exporting/consuming Web Services</c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring.Testing.NUnit.dxc b/doc/docx/Spring-1.1/net-1.1/Spring.Testing.NUnit.dxc
new file mode 100644
index 00000000..fa7d32ec
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring.Testing.NUnit.dxc
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Testing.NUnit.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Testing.NUnit" RelatedProject="Spring-1.1.0.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="False" LoadOnDemand="True" LoadSourceComments="False">
+    <IgnoreWordList/>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Testing.NUnit" tid="##PROJECT_GETTINGSTARTED" q="" cd="39234.7393981482"><![CDATA[The reference documentation is the best place to get started using Spring and NUnit together.&nbsp; If you are not familiar with NUnit, check out the NUnit website at www.nunit.org]]></c>
+<c eid="Spring.Testing.NUnit" tid="##PROJECT_INTRODUCTION" q="" cd="39234.7411689815"><![CDATA[While dependecy injection generally leads to classes that are easier to unit test, precisely becuase there are no hidden dependencies in the code and an objects collaborators can be coded explicitly in the test, it is also important to be able to perform some integration testing enabling you to test things such as: 
+<DIV class=itemizedlist>
+<UL type=disc>
+<LI>
+<P>The correct wiring of your Spring IoC container contexts.</P>
+<LI>
+<P>Data access using ADO.NET or an ORM tool. This would include such things such as the correctness of SQL statements / or NHibernate XML mapping files.</P></LI></UL></DIV>
+<P>The Spring Framework provides first class support for integration testing in the form of the classes that are packaged in the <FONT color=#000000><CODE class=filename>Spring.Testing.NUnit.dll</CODE> library</FONT></P>]]></c>
+<c eid="Spring.Testing.NUnit~Spring.Testing.NUnit_namespace" tid="##SUMMARY" q="" cd="39423.5247569444">Classes for Applicationcontext-ased and transactional tests with NUnit</c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring.Testing.NUnit.dxc.bak b/doc/docx/Spring-1.1/net-1.1/Spring.Testing.NUnit.dxc.bak
new file mode 100644
index 00000000..e0516078
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring.Testing.NUnit.dxc.bak
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\net\1.1\debug\Spring.Testing.NUnit.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Testing.NUnit" RelatedProject="Spring-1.1.0.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="False" LoadOnDemand="True" LoadSourceComments="False">
+    <IgnoreWordList/>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Testing.NUnit" tid="##PROJECT_GETTINGSTARTED" q="" cd="39234.7393981482"><![CDATA[The reference documentation is the best place to get started using Spring and NUnit together.&nbsp; If you are not familiar with NUnit, check out the NUnit website at www.nunit.org]]></c>
+<c eid="Spring.Testing.NUnit" tid="##PROJECT_INTRODUCTION" q="" cd="39234.7411689815"><![CDATA[While dependecy injection generally leads to classes that are easier to unit test, precisely becuase there are no hidden dependencies in the code and an objects collaborators can be coded explicitly in the test, it is also important to be able to perform some integration testing enabling you to test things such as: 
+<DIV class=itemizedlist>
+<UL type=disc>
+<LI>
+<P>The correct wiring of your Spring IoC container contexts.</P>
+<LI>
+<P>Data access using ADO.NET or an ORM tool. This would include such things such as the correctness of SQL statements / or NHibernate XML mapping files.</P></LI></UL></DIV>
+<P>The Spring Framework provides first class support for integration testing in the form of the classes that are packaged in the <FONT color=#000000><CODE class=filename>Spring.Testing.NUnit.dll</CODE> library</FONT></P>]]></c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring.Web.dxc b/doc/docx/Spring-1.1/net-1.1/Spring.Web.dxc
new file mode 100644
index 00000000..50ef91a2
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring.Web.dxc
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Web.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Web" RelatedProject="Spring-1.1.0.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="True" LoadOnDemand="False" LoadSourceComments="False">
+    <IgnoreWordList>depednecy</IgnoreWordList>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>345</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Web" tid="##PROJECT_INTRODUCTION" q="" cd="39053.8824884259"><![CDATA[<P>Spring.Web is an framework that extends the functionality of ASP.NET.&nbsp; It provides the following features</P>
+<UL>
+<UL>
+<LI>Enables Dependency Injection for ASP.NET web pages and controls</LI>
+<LI>Enables bi-directional data binding </LI>
+<LI>Greatly improves support for data validation</LI>
+<LI>Adds localization support</LI>
+<LI>Implements ‘result mapping’-based page flow</LI>
+<LI>Adds Master Pages support to ASP.NET 1.1</LI></UL></UL>
+<P>&nbsp;</P>
+<P>&nbsp;</P>]]></c>
+<c eid="Spring.Web" tid="##PROJECT_GETTINGSTARTED" q="" cd="39053.8841666667"><![CDATA[The reference documentation and QuickStart applications (SpringAir and Spring.WebQuickStart) &nbsp;are the best places to get started using the functionality contained in Spring.Web.]]></c>
+<c eid="Spring.Web~Spring.Caching_namespace" tid="##SUMMARY" q="" cd="39423.5224537037">Caching provider based on ASP.NET cache</c>
+<c eid="Spring.Web~Spring.Context.Support_namespace" tid="##SUMMARY" q="" cd="39053.8687731481">Contains implementation of IoC Container for the web environment.</c>
+<c eid="Spring.Web~Spring.Core.IO_namespace" tid="##SUMMARY" q="" cd="39423.5229282407">Abstraction for web resources</c>
+<c eid="Spring.Web~Spring.DataBinding_namespace" tid="##SUMMARY" q="" cd="39053.8696296296"><![CDATA[Provides&nbsp;bidirectional data binding to handle the mapping of values to and from the controls on a page to the underlying data model]]></c>
+<c eid="Spring.Web~Spring.Globalization.Resolvers_namespace" tid="##SUMMARY" q="" cd="39053.8713888889"><![CDATA[Support for user culture management by exposing the current Culture info <FONT color=#000000>through the UserCulture&nbsp;property on the Page and UserControl classes.&nbsp; </FONT>]]></c>
+<c eid="Spring.Web~Spring.Objects.Factory.Support_namespace" tid="##SUMMARY" q="" cd="39053.8728125">Support classes for web based IoC container.</c>
+<c eid="Spring.Web~Spring.Objects.Factory.Xml_namespace" tid="##SUMMARY" q="" cd="39053.8729166667">Support classes for web based IoC container.</c>
+<c eid="Spring.Web~Spring.Threading_namespace" tid="##SUMMARY" q="" cd="39423.5231597222">Support classes for thread local storage</c>
+<c eid="Spring.Web~Spring.Util_namespace" tid="##SUMMARY" q="" cd="39053.8736111111">Miscellaneous utility classes</c>
+<c eid="Spring.Web~Spring.Web.Process_namespace" tid="##SUMMARY" q="" cd="39053.8749189815">Support for processing across multiple distinct requests.</c>
+<c eid="Spring.Web~Spring.Web.Services_namespace" tid="##SUMMARY" q="" cd="39053.8785763889">Exporters to create server and client side web service proxies that support dependency injection and AOP.</c>
+<c eid="Spring.Web~Spring.Web.Support_namespace" tid="##SUMMARY" q="" cd="39053.8791666667">Support classes for web based IoC container.</c>
+<c eid="Spring.Web~Spring.Web.UI_namespace" tid="##SUMMARY" q="" cd="39053.8796759259">Master Pages support for .NET 1.1 and Spring Page/UserControl base classes.</c>
+<c eid="Spring.Web~Spring.Web.UI.Controls_namespace" tid="##SUMMARY" q="" cd="39053.8800578704">Various web controls for use with validation and localization features of Spring.Web</c>
+<c eid="Spring.Web~Spring.Web.UI.Validation_namespace" tid="##SUMMARY" q="" cd="39423.5234722222">Renderers for the validaiton framework</c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-1.1/Spring.Web.dxc.bak b/doc/docx/Spring-1.1/net-1.1/Spring.Web.dxc.bak
new file mode 100644
index 00000000..0307dd06
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/Spring.Web.dxc.bak
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\package\Spring.NET\bin\net\1.1\debug\Spring.Web.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Web" RelatedProject="Spring-1.1.0.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="True" LoadOnDemand="False" LoadSourceComments="False">
+    <IgnoreWordList>depednecy</IgnoreWordList>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Web" tid="##PROJECT_INTRODUCTION" q="" cd="39053.8824884259"><![CDATA[<P>Spring.Web is an framework that extends the functionality of ASP.NET.&nbsp; It provides the following features</P>
+<UL>
+<UL>
+<LI>Enables Dependency Injection for ASP.NET web pages and controls</LI>
+<LI>Enables bi-directional data binding </LI>
+<LI>Greatly improves support for data validation</LI>
+<LI>Adds localization support</LI>
+<LI>Implements ‘result mapping’-based page flow</LI>
+<LI>Adds Master Pages support to ASP.NET 1.1</LI></UL></UL>
+<P>&nbsp;</P>
+<P>&nbsp;</P>]]></c>
+<c eid="Spring.Web" tid="##PROJECT_GETTINGSTARTED" q="" cd="39053.8841666667"><![CDATA[The reference documentation and QuickStart applications (SpringAir and Spring.WebQuickStart) &nbsp;are the best places to get started using the functionality contained in Spring.Web.]]></c>
+<c eid="Spring.Web~Spring.Context.Support_namespace" tid="##SUMMARY" q="" cd="39053.8687731481">Contains implementation of IoC Container for the web environment.</c>
+<c eid="Spring.Web~Spring.DataBinding_namespace" tid="##SUMMARY" q="" cd="39053.8696296296"><![CDATA[Provides&nbsp;bidirectional data binding to handle the mapping of values to and from the controls on a page to the underlying data model]]></c>
+<c eid="Spring.Web~Spring.Globalization.Resolvers_namespace" tid="##SUMMARY" q="" cd="39053.8713888889"><![CDATA[Support for user culture management by exposing the current Culture info <FONT color=#000000>through the UserCulture&nbsp;property on the Page and UserControl classes.&nbsp; </FONT>]]></c>
+<c eid="Spring.Web~Spring.Objects.Factory.Support_namespace" tid="##SUMMARY" q="" cd="39053.8728125">Support classes for web based IoC container.</c>
+<c eid="Spring.Web~Spring.Objects.Factory.Xml_namespace" tid="##SUMMARY" q="" cd="39053.8729166667">Support classes for web based IoC container.</c>
+<c eid="Spring.Web~Spring.Proxy_namespace" tid="##SUMMARY" q="" cd="39053.8734953704">Support classes for dependency injection on Page/UserControl classes.</c>
+<c eid="Spring.Web~Spring.Util_namespace" tid="##SUMMARY" q="" cd="39053.8736111111">Miscellaneous utility classes</c>
+<c eid="Spring.Web~Spring.Web.IO_namespace" tid="##SUMMARY" q="" cd="39053.8738078704">Support classes for web based IoC container</c>
+<c eid="Spring.Web~Spring.Web.Process_namespace" tid="##SUMMARY" q="" cd="39053.8749189815">Support for processing across multiple distinct requests.</c>
+<c eid="Spring.Web~Spring.Web.Services_namespace" tid="##SUMMARY" q="" cd="39053.8785763889">Exporters to create server and client side web service proxies that support dependency injection and AOP.</c>
+<c eid="Spring.Web~Spring.Web.Support_namespace" tid="##SUMMARY" q="" cd="39053.8791666667">Support classes for web based IoC container.</c>
+<c eid="Spring.Web~Spring.Web.UI_namespace" tid="##SUMMARY" q="" cd="39053.8796759259">Master Pages support for .NET 1.1 and Spring Page/UserControl base classes.</c>
+<c eid="Spring.Web~Spring.Web.UI.Controls_namespace" tid="##SUMMARY" q="" cd="39053.8800578704">Various web controls for use with validation and localization features of Spring.Web</c>
+<c eid="Spring.Web~Spring.Web.Validation_namespace" tid="##SUMMARY" q="" cd="39053.8802662037">Renderers for displaying results of validation.</c>
+    </DocumentXComments>
+
diff --git a/doc/docx/Spring-1.1/net-1.1/UnRegisterHelp2.bat b/doc/docx/Spring-1.1/net-1.1/UnRegisterHelp2.bat
new file mode 100644
index 00000000..fbae275b
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-1.1/UnRegisterHelp2.bat
@@ -0,0 +1,8 @@
+REM Remove the plug in to the Visual Studio.NET 2003 help system
+InnovaHxReg /U /P /productnamespace:MS.VSCC.2003 /producthxt:_DEFAULT /namespace:Spring.NET /hxt:_DEFAULT
+
+REM Un-Register the help file (title in Help 2.0 terminology)
+InnovaHxReg /U /T /namespace:Spring.NET /id:Spring.NET-1.1.2 /langid:1033 /helpfile:"Spring.NET.hxs"
+
+REM Un-Register the Namespace
+InnovaHxReg /U /N /Namespace:Spring.NET /Description:"Spring.Testing.NUnit" /Collection:COL_Spring-1.1.0.hxc
diff --git a/doc/docx/Spring-1.1/net-2.0/RegisterHelp2.bat b/doc/docx/Spring-1.1/net-2.0/RegisterHelp2.bat
new file mode 100644
index 00000000..08edafe4
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-2.0/RegisterHelp2.bat
@@ -0,0 +1,9 @@
+REM Register the Namespace
+InnovaHxReg /R /N /Namespace:Spring.NET /Description:"Spring.Web.Extensions" /Collection:COL_Spring-1.1.0.hxc
+
+REM Register the help file (title in Help 2.0 terminology)
+InnovaHxReg /R /T /namespace:Spring.NET /id:Spring.NET-1.1.2 /langid:1033 /helpfile:"Spring.NET.hxs"
+
+REM Un-comment to plug in to the Visual Studio.NET 2005 help system
+InnovaHxReg /R /P /productnamespace:MS.VSIPCC.v80 /producthxt:_DEFAULT /namespace:Spring.NET /hxt:_DEFAULT
+
diff --git a/doc/docx/Spring-1.1/net-2.0/Spring-1.1.0.dxp b/doc/docx/Spring-1.1/net-2.0/Spring-1.1.0.dxp
new file mode 100644
index 00000000..4003b084
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-2.0/Spring-1.1.0.dxp
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXProject Version="5.0" CompileHelpFile="True" RefreshIfExists="False" DocumentSourceCode="False" AlwaysCopySupportFiles="True" PropertyCommentsFrom="0" RelationshipsFrom="2" DefaultRelsOnlyForCollections="True" ProjectGroupName="Spring-1.1.2" HTMLHelpVersion="2" HHNamespace="Spring.NET" HHIdentifier="Spring.NET-1.1.2" H2PlugIn="True" H2PlugInNamespace="MS.VSIPCC.v80" LocaleID="0" ExcludeFiltersRegExp="False" OutputFileExtension=".html">
+    <OutputLocation OutputFolder="L:\release\Spring.Net\doc\sdk\Spring-1.1\net-2.0\web\" HelpFileName="L:\release\Spring.Net\doc\sdk\Spring-1.1\net-2.0\htmlhelp1and2\Spring.NET.hxs" UseFilenameAliases="True" StripMetadata="False" ClearBeforeBuild="True" RemoveOutputFilesAfterCompile="False"/>
+    <HTMLHelpOptions UseALinkMenus="False"/>
+    <OtherOptions CreateContextLinks="True" WriteHelpDescriptions="True" CopySourceCode="False" CreateWinHelpStub="False" Language="English"/>
+    <IncludeFilters IncludePrivate="False" IncludeFriend="False" IncludeProtected="True" IdentifyVisibility="False">
+        <Namespaces>
+            <Property Name="DX.NET:Method">True</Property>
+            <Property Name="DX.NET:Property">True</Property>
+            <Property Name="DX.NET:Field">True</Property>
+            <Property Name="DX.NET:Event">True</Property>
+            <Property Name="DX.NET:Constructor">True</Property>
+            <Property Name="DX.NET:Operator">True</Property>
+        </Namespaces>
+    </IncludeFilters>
+    <CommentExtraction UnTaggedBlocks="False" UnTaggedEnumerations="False" UnTaggedEvents="False" UnTaggedModules="False" UnTaggedUDTs="False" UnTaggedVariables="False" HelpDescriptionImport="3"/>
+    <Diagrams PageNestingLevels="2" OverviewNestingLevels="3" SupressSingleObjectDiagrams="True" DiagramStyleSource="0" ObjFillColor="0" ObjTextColor="0" ObjBorderColor="0" ColFillColor="0" ColTextColor="0" ColBorderColor="0" UseDropShadow="False" CenterCaptions="False" DiagramBold="False" BorderWidth="0" UseDiagramShapes="False"/>
+    <VariableValues>
+        <VariableValue Name="CopyrightNotice" Value="&amp;copy; 2004-2009 Spring.NET Authors. All Rights Reserved."/>
+        <VariableValue Name="FeedbackLink" Value="&lt;a href=&quot;forum.springframework.net&quot;&gt;Send comments&lt;/a&gt; on this topic."/>
+    </VariableValues>
+    <AdditionalFiles/>
+    <ModelComments/>
+    <IgnoreRelationships/>
+    <NamespaceExclusions>
+        <e>Spring.Core~__Delegates</e>
+        <e>Spring.Web~__Delegates</e>
+        <e>Spring.Web~Spring.Util.VirtualEnvironment+HttpRuntimeEnvironment</e>
+        <e>Spring.Web~Spring.Web.Services.WebServiceExporter+WebServiceProxyTypeBuilder</e>
+        <e>Spring.Web~Spring.Web.Support.Script</e>
+        <e>Spring.Web~Spring.Web.Support.ScriptBlock</e>
+        <e>Spring.Web~Spring.Web.Support.ScriptFile</e>
+        <e>Spring.Web~Spring.Web.Support.ScriptEvent</e>
+        <e>Spring.Web~Spring.Globalization_namespace</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.AfterReturningAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.BeforeAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.ThrowsAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.DynamicProxy.References</e>
+        <e>Spring.Aop~Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.MethodMatchers+UnionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.MethodMatchers+IntersectionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.TypeFilters+UnionTypeFilter</e>
+        <e>Spring.Aop~Spring.Aop.Support.TypeFilters+IntersectionTypeFilter</e>
+        <e>Spring.Aop~Spring.Aop.Support.UnionPointcut</e>
+        <e>Spring.Aop~Spring.Aop.Support.UnionPointcut+PointcutUnionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Target.EmptyTargetSource+EmptyTargetSourceObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TrueMethodMatcher+TrueMethodMatcherObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TruePointcut+TruePointcutObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TrueTypeFilter+TrueTypeFilterObjectReference</e>
+        <e>Spring.Core~Spring.Collections.DictionarySet+DictionarySetEnumerator</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+Node</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+NodeHolder</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+LinkedListEnumerator</e>
+        <e>Spring.Core~Spring.Collections.PriorityQueue+PriorityQueueEnumerator</e>
+        <e>Spring.Core~Spring.Collections.SynchronizedEnumerator</e>
+        <e>Spring.Core~Spring.Collections.SynchronizedDictionaryEnumerator</e>
+        <e>Spring.Core~Spring.Context.Support.AbstractApplicationContext+ObjectPostProcessorChecker</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+ContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+RootContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+DescendantContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+ContextSchema</e>
+        <e>Spring.Core~Spring.Context.Support.DelegatingMessageSource+SpecialCaseNullMessageSource</e>
+        <e>Spring.Core~Spring.Core.ControlFlowFactory+DefaultControlFlow</e>
+        <e>Spring.Core~Spring.Core.ControlFlowFactory+DefaultControlFlow+MethodsDeclaredTypeCriteria</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionLexer</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionParser</e>
+        <e>Spring.Core~Spring.Expressions.NodeWithArguments</e>
+        <e>Spring.Core~Spring.Expressions.ArrayConstructorNode</e>
+        <e>Spring.Core~Spring.Expressions.AssignNode</e>
+        <e>Spring.Core~Spring.Expressions.BinaryOperator</e>
+        <e>Spring.Core~Spring.Expressions.BooleanLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.ConstructorNode</e>
+        <e>Spring.Core~Spring.Expressions.DateLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionListNode</e>
+        <e>Spring.Core~Spring.Expressions.HexLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.IndexerNode</e>
+        <e>Spring.Core~Spring.Expressions.IntLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.MethodNode</e>
+        <e>Spring.Core~Spring.Expressions.NullLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.OpADD</e>
+        <e>Spring.Core~Spring.Expressions.OpAND</e>
+        <e>Spring.Core~Spring.Expressions.OpDIVIDE</e>
+        <e>Spring.Core~Spring.Expressions.OpEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpGreater</e>
+        <e>Spring.Core~Spring.Expressions.OpGreaterOrEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpLess</e>
+        <e>Spring.Core~Spring.Expressions.OpLessOrEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpMODULUS</e>
+        <e>Spring.Core~Spring.Expressions.OpMULTIPLY</e>
+        <e>Spring.Core~Spring.Expressions.UnaryOperator</e>
+        <e>Spring.Core~Spring.Expressions.OpNOT</e>
+        <e>Spring.Core~Spring.Expressions.OpNotEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpOR</e>
+        <e>Spring.Core~Spring.Expressions.OpPOWER</e>
+        <e>Spring.Core~Spring.Expressions.OpSUBTRACT</e>
+        <e>Spring.Core~Spring.Expressions.OpUnaryMinus</e>
+        <e>Spring.Core~Spring.Expressions.OpUnaryPlus</e>
+        <e>Spring.Core~Spring.Expressions.ProjectionNode</e>
+        <e>Spring.Core~Spring.Expressions.PropertyOrFieldNode</e>
+        <e>Spring.Core~Spring.Expressions.RealLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.StringLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.TernaryNode</e>
+        <e>Spring.Core~Spring.Expressions.TypeNode</e>
+        <e>Spring.Core~Spring.Expressions.VariableNode</e>
+        <e>Spring.Core~Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject+GenericObjectFactory</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.AutowireUtils+ConstructorComparer</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.AutowireUtils+MinimumArgumentCountCriteria</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy+MethodInjectingTypeBuilder</e>
+        <e>Spring.Core~Spring.Objects.Support.AutoWiringEventHandlerValue+AutoWirer</e>
+        <e>Spring.Data~Spring.Data.Objects.MappingAdoQueryWithContext+RowMapperImpl</e>
+        <e>Spring.Data~Spring.Transaction.Support.AbstractPlatformTransactionManager+SuspendedResourcesHolder</e>
+        <e>Spring.Data~__Delegates</e>
+        <e>Spring.Data~Spring.Data.IDbCommandCreatorFactory+CommandCreatorWithParamValues</e>
+        <e>Spring.Data~Spring.Data.IDbCommandCreatorFactory+CommandCreatorImpl</e>
+        <e>Spring.Data~Spring.Transaction.Interceptor.TransactionAspectSupport+TransactionInfo</e>
+        <e>Spring.Data~Spring.Transaction.Interceptor.TransactionAttributeSourceEditor+PropertiesEditor</e>
+        <e>Spring.Services~Spring.Remoting.CaoExporter+CaoRemoteFactory</e>
+    </NamespaceExclusions>
+    <DotNetProperties IncludeRelationshipDiagrams="True" IncludeInheritanceHierarchies="True" IncludeBaseMembers="False" StandardInterfaces="System.*,Microsoft.*" OnlyLinkInherited="True" ExternalDocs="True" UseCommentFiles="True" DrillCommentFiles="True" GenerateXMLLinks="False" XMLIsland="" NoInheritedTopics="True" NoInheritedInLists="False" CreateXMLCommentFile="False" ExcludedLanguages="Delphi,JScript,CPP,CPP2005" GenerateAttributes="True" AttributeFilter="" AttributeFilterInclude="False" VBNETDefaultConstructor="False" LinkOverridenMembersToBaseImplementation="False" UseOverloadSummaryForMasterSummary="False" ExcludeEditorBrowsable="True" GenerateBreadCrumbs="True" IncludeAssemblyBreadCrumb="False"/>
+    <DatabaseProperties DocumentViewSource="True" DocumentTriggerSource="True" DocumentProcedureSource="True" RetainTaggedComments="False"/>
+    <XSDProperties UseCustomSettings="False" PageNestingLevels="2" SuppressSingleObjectDiagrams="True" ElementFillColor="15780518" ElementTextColor="0" ElementBorderColor="10789024" ElementBorders="True" ElementRefFillColor="12648447" ElementRefTextColor="0" ElementRefBorderColor="10789024" ElementRefBorders="True" ComplexTypeFillColor="15780518" ComplexTypeTextColor="0" ComplexTypeBorderColor="10789024" ComplexTypeBorders="True" AnyFillColor="13421772" AnyTextColor="0" AnyBorderColor="10789024" AnyBorders="True" NotationTextColor="8421504" RootLinesColor="10789024" DropShadows="False" BoldCaptions="True" GroupParticleSequenceImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\sequence.gif" GroupParticleChoiceImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\choice.gif" GroupParticleAllImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\all.gif"/>
+    <CommentFiles>
+        <CommentFile FileName="..\net-1.1\Spring.Aop.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Aop.dll"/>
+        <CommentFile FileName="..\net-1.1\Spring.Core.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Core.dll"/>
+        <CommentFile FileName="Spring.Data.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Data.dll"/>
+        <CommentFile FileName="..\net-1.1\Spring.Services.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Services.dll"/>
+        <CommentFile FileName="..\net-1.1\Spring.Web.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Web.dll"/>
+        <CommentFile FileName="..\net-1.1\Spring.Data.NHibernate.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Data.NHibernate12.dll"/>
+        <CommentFile FileName="..\net-1.1\Spring.Testing.NUnit.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Testing.NUnit.dll"/>
+        <CommentFile FileName="Spring.Web.Extensions.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Web.Extensions.dll"/>
+    </CommentFiles>
+    <DocType Name="dx.net" Template="Visual Studio 2005 Style" UseHelpTemplates="False">
+        <TOCSource TOCSource="0" SpecificTOCName=""/>
+        <ModelCommentProfile Version="5.0" Namespace="dx.net" Name="" Description=""/>
+    </DocType>
+    <NetAssemblies RootAssemblyName="">
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Aop.dll" mRootModule="" AssemblyName="Spring.Aop" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Core.dll" mRootModule="" AssemblyName="Spring.Core" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Data.dll" mRootModule="" AssemblyName="Spring.Data" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Services.dll" mRootModule="" AssemblyName="Spring.Services" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Web.dll" mRootModule="" AssemblyName="Spring.Web" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Data.NHibernate12.dll" mRootModule="" AssemblyName="Spring.Data.NHibernate12" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Testing.NUnit.dll" mRootModule="" AssemblyName="Spring.Testing.NUnit" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Web.Extensions.dll" mRootModule="" AssemblyName="Spring.Web.Extensions" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+    </NetAssemblies>
+    <PropertyBag/>
+</DocumentXProject>
diff --git a/doc/docx/Spring-1.1/net-2.0/Spring-1.1.0.dxp.bak b/doc/docx/Spring-1.1/net-2.0/Spring-1.1.0.dxp.bak
new file mode 100644
index 00000000..cb65e4ce
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-2.0/Spring-1.1.0.dxp.bak
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXProject Version="5.0" CompileHelpFile="True" RefreshIfExists="False" DocumentSourceCode="False" AlwaysCopySupportFiles="True" PropertyCommentsFrom="0" RelationshipsFrom="2" DefaultRelsOnlyForCollections="True" ProjectGroupName="Spring-1.1.1" HTMLHelpVersion="2" HHNamespace="Spring.NET" HHIdentifier="Spring.NET-1.1.1" H2PlugIn="True" H2PlugInNamespace="MS.VSIPCC.v80" LocaleID="0" ExcludeFiltersRegExp="False" OutputFileExtension=".html">
+    <OutputLocation OutputFolder="L:\release\Spring.Net\doc\sdk\Spring-1.1\net-2.0\web\" HelpFileName="L:\release\Spring.Net\doc\sdk\Spring-1.1\net-2.0\htmlhelp1and2\Spring.NET.hxs" UseFilenameAliases="True" StripMetadata="False" ClearBeforeBuild="True" RemoveOutputFilesAfterCompile="False"/>
+    <HTMLHelpOptions UseALinkMenus="False"/>
+    <OtherOptions CreateContextLinks="True" WriteHelpDescriptions="True" CopySourceCode="False" CreateWinHelpStub="False" Language="English"/>
+    <IncludeFilters IncludePrivate="False" IncludeFriend="False" IncludeProtected="True" IdentifyVisibility="False">
+        <Namespaces>
+            <Property Name="DX.NET:Method">True</Property>
+            <Property Name="DX.NET:Property">True</Property>
+            <Property Name="DX.NET:Field">True</Property>
+            <Property Name="DX.NET:Event">True</Property>
+            <Property Name="DX.NET:Constructor">True</Property>
+            <Property Name="DX.NET:Operator">True</Property>
+        </Namespaces>
+    </IncludeFilters>
+    <CommentExtraction UnTaggedBlocks="False" UnTaggedEnumerations="False" UnTaggedEvents="False" UnTaggedModules="False" UnTaggedUDTs="False" UnTaggedVariables="False" HelpDescriptionImport="3"/>
+    <Diagrams PageNestingLevels="2" OverviewNestingLevels="3" SupressSingleObjectDiagrams="True" DiagramStyleSource="0" ObjFillColor="0" ObjTextColor="0" ObjBorderColor="0" ColFillColor="0" ColTextColor="0" ColBorderColor="0" UseDropShadow="False" CenterCaptions="False" DiagramBold="False" BorderWidth="0" UseDiagramShapes="False"/>
+    <VariableValues>
+        <VariableValue Name="CopyrightNotice" Value="&amp;copy; 2004-2009 Spring.NET Authors. All Rights Reserved."/>
+        <VariableValue Name="FeedbackLink" Value="&lt;a href=&quot;forum.springframework.net&quot;&gt;Send comments&lt;/a&gt; on this topic."/>
+    </VariableValues>
+    <AdditionalFiles/>
+    <ModelComments/>
+    <IgnoreRelationships/>
+    <NamespaceExclusions>
+        <e>Spring.Core~__Delegates</e>
+        <e>Spring.Web~__Delegates</e>
+        <e>Spring.Web~Spring.Util.VirtualEnvironment+HttpRuntimeEnvironment</e>
+        <e>Spring.Web~Spring.Web.Services.WebServiceExporter+WebServiceProxyTypeBuilder</e>
+        <e>Spring.Web~Spring.Web.Support.Script</e>
+        <e>Spring.Web~Spring.Web.Support.ScriptBlock</e>
+        <e>Spring.Web~Spring.Web.Support.ScriptFile</e>
+        <e>Spring.Web~Spring.Web.Support.ScriptEvent</e>
+        <e>Spring.Web~Spring.Globalization_namespace</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.AfterReturningAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.BeforeAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor</e>
+        <e>Spring.Aop~Spring.Aop.Framework.Adapter.ThrowsAdviceAdapter</e>
+        <e>Spring.Aop~Spring.Aop.Framework.DynamicProxy.References</e>
+        <e>Spring.Aop~Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.MethodMatchers+UnionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.MethodMatchers+IntersectionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Support.TypeFilters+UnionTypeFilter</e>
+        <e>Spring.Aop~Spring.Aop.Support.TypeFilters+IntersectionTypeFilter</e>
+        <e>Spring.Aop~Spring.Aop.Support.UnionPointcut</e>
+        <e>Spring.Aop~Spring.Aop.Support.UnionPointcut+PointcutUnionMethodMatcher</e>
+        <e>Spring.Aop~Spring.Aop.Target.EmptyTargetSource+EmptyTargetSourceObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TrueMethodMatcher+TrueMethodMatcherObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TruePointcut+TruePointcutObjectReference</e>
+        <e>Spring.Aop~Spring.Aop.TrueTypeFilter+TrueTypeFilterObjectReference</e>
+        <e>Spring.Core~Spring.Collections.DictionarySet+DictionarySetEnumerator</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+Node</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+NodeHolder</e>
+        <e>Spring.Core~Spring.Collections.LinkedList+LinkedListEnumerator</e>
+        <e>Spring.Core~Spring.Collections.PriorityQueue+PriorityQueueEnumerator</e>
+        <e>Spring.Core~Spring.Collections.SynchronizedEnumerator</e>
+        <e>Spring.Core~Spring.Collections.SynchronizedDictionaryEnumerator</e>
+        <e>Spring.Core~Spring.Context.Support.AbstractApplicationContext+ObjectPostProcessorChecker</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+ContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+RootContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+DescendantContextInstantiator</e>
+        <e>Spring.Core~Spring.Context.Support.ContextHandler+ContextSchema</e>
+        <e>Spring.Core~Spring.Context.Support.DelegatingMessageSource+SpecialCaseNullMessageSource</e>
+        <e>Spring.Core~Spring.Core.ControlFlowFactory+DefaultControlFlow</e>
+        <e>Spring.Core~Spring.Core.ControlFlowFactory+DefaultControlFlow+MethodsDeclaredTypeCriteria</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionLexer</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionParser</e>
+        <e>Spring.Core~Spring.Expressions.NodeWithArguments</e>
+        <e>Spring.Core~Spring.Expressions.ArrayConstructorNode</e>
+        <e>Spring.Core~Spring.Expressions.AssignNode</e>
+        <e>Spring.Core~Spring.Expressions.BinaryOperator</e>
+        <e>Spring.Core~Spring.Expressions.BooleanLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.ConstructorNode</e>
+        <e>Spring.Core~Spring.Expressions.DateLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.ExpressionListNode</e>
+        <e>Spring.Core~Spring.Expressions.HexLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.IndexerNode</e>
+        <e>Spring.Core~Spring.Expressions.IntLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.MethodNode</e>
+        <e>Spring.Core~Spring.Expressions.NullLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.OpADD</e>
+        <e>Spring.Core~Spring.Expressions.OpAND</e>
+        <e>Spring.Core~Spring.Expressions.OpDIVIDE</e>
+        <e>Spring.Core~Spring.Expressions.OpEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpGreater</e>
+        <e>Spring.Core~Spring.Expressions.OpGreaterOrEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpLess</e>
+        <e>Spring.Core~Spring.Expressions.OpLessOrEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpMODULUS</e>
+        <e>Spring.Core~Spring.Expressions.OpMULTIPLY</e>
+        <e>Spring.Core~Spring.Expressions.UnaryOperator</e>
+        <e>Spring.Core~Spring.Expressions.OpNOT</e>
+        <e>Spring.Core~Spring.Expressions.OpNotEqual</e>
+        <e>Spring.Core~Spring.Expressions.OpOR</e>
+        <e>Spring.Core~Spring.Expressions.OpPOWER</e>
+        <e>Spring.Core~Spring.Expressions.OpSUBTRACT</e>
+        <e>Spring.Core~Spring.Expressions.OpUnaryMinus</e>
+        <e>Spring.Core~Spring.Expressions.OpUnaryPlus</e>
+        <e>Spring.Core~Spring.Expressions.ProjectionNode</e>
+        <e>Spring.Core~Spring.Expressions.PropertyOrFieldNode</e>
+        <e>Spring.Core~Spring.Expressions.RealLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.StringLiteralNode</e>
+        <e>Spring.Core~Spring.Expressions.TernaryNode</e>
+        <e>Spring.Core~Spring.Expressions.TypeNode</e>
+        <e>Spring.Core~Spring.Expressions.VariableNode</e>
+        <e>Spring.Core~Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject+GenericObjectFactory</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.AutowireUtils+ConstructorComparer</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.AutowireUtils+MinimumArgumentCountCriteria</e>
+        <e>Spring.Core~Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy+MethodInjectingTypeBuilder</e>
+        <e>Spring.Core~Spring.Objects.Support.AutoWiringEventHandlerValue+AutoWirer</e>
+        <e>Spring.Data~Spring.Data.Objects.MappingAdoQueryWithContext+RowMapperImpl</e>
+        <e>Spring.Data~Spring.Transaction.Support.AbstractPlatformTransactionManager+SuspendedResourcesHolder</e>
+        <e>Spring.Data~__Delegates</e>
+        <e>Spring.Data~Spring.Data.IDbCommandCreatorFactory+CommandCreatorWithParamValues</e>
+        <e>Spring.Data~Spring.Data.IDbCommandCreatorFactory+CommandCreatorImpl</e>
+        <e>Spring.Data~Spring.Transaction.Interceptor.TransactionAspectSupport+TransactionInfo</e>
+        <e>Spring.Data~Spring.Transaction.Interceptor.TransactionAttributeSourceEditor+PropertiesEditor</e>
+        <e>Spring.Services~Spring.Remoting.CaoExporter+CaoRemoteFactory</e>
+    </NamespaceExclusions>
+    <DotNetProperties IncludeRelationshipDiagrams="True" IncludeInheritanceHierarchies="True" IncludeBaseMembers="False" StandardInterfaces="System.*,Microsoft.*" OnlyLinkInherited="True" ExternalDocs="True" UseCommentFiles="True" DrillCommentFiles="True" GenerateXMLLinks="False" XMLIsland="" NoInheritedTopics="True" NoInheritedInLists="False" CreateXMLCommentFile="False" ExcludedLanguages="Delphi,JScript,CPP,CPP2005" GenerateAttributes="True" AttributeFilter="" AttributeFilterInclude="False" VBNETDefaultConstructor="False" LinkOverridenMembersToBaseImplementation="False" UseOverloadSummaryForMasterSummary="False" ExcludeEditorBrowsable="True" GenerateBreadCrumbs="True" IncludeAssemblyBreadCrumb="False"/>
+    <DatabaseProperties DocumentViewSource="True" DocumentTriggerSource="True" DocumentProcedureSource="True" RetainTaggedComments="False"/>
+    <XSDProperties UseCustomSettings="False" PageNestingLevels="2" SuppressSingleObjectDiagrams="True" ElementFillColor="15780518" ElementTextColor="0" ElementBorderColor="10789024" ElementBorders="True" ElementRefFillColor="12648447" ElementRefTextColor="0" ElementRefBorderColor="10789024" ElementRefBorders="True" ComplexTypeFillColor="15780518" ComplexTypeTextColor="0" ComplexTypeBorderColor="10789024" ComplexTypeBorders="True" AnyFillColor="13421772" AnyTextColor="0" AnyBorderColor="10789024" AnyBorders="True" NotationTextColor="8421504" RootLinesColor="10789024" DropShadows="False" BoldCaptions="True" GroupParticleSequenceImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\sequence.gif" GroupParticleChoiceImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\choice.gif" GroupParticleAllImageFilename="K:\Program Files\Innovasys\documentx5\Configuration\Templates\XMLSchema\xDiagramImages\all.gif"/>
+    <CommentFiles>
+        <CommentFile FileName="..\net-1.1\Spring.Aop.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Aop.dll"/>
+        <CommentFile FileName="..\net-1.1\Spring.Core.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Core.dll"/>
+        <CommentFile FileName="Spring.Data.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Data.dll"/>
+        <CommentFile FileName="..\net-1.1\Spring.Services.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Services.dll"/>
+        <CommentFile FileName="..\net-1.1\Spring.Web.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Web.dll"/>
+        <CommentFile FileName="..\net-1.1\Spring.Data.NHibernate.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Data.NHibernate12.dll"/>
+        <CommentFile FileName="..\net-1.1\Spring.Testing.NUnit.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Testing.NUnit.dll"/>
+        <CommentFile FileName="Spring.Web.Extensions.dxc" DocType="dx.net" ItemMoniker="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Web.Extensions.dll"/>
+    </CommentFiles>
+    <DocType Name="dx.net" Template="Visual Studio 2005 Style" UseHelpTemplates="False">
+        <TOCSource TOCSource="0" SpecificTOCName=""/>
+        <ModelCommentProfile Version="5.0" Namespace="dx.net" Name="" Description=""/>
+    </DocType>
+    <NetAssemblies RootAssemblyName="">
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Aop.dll" mRootModule="" AssemblyName="Spring.Aop" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Core.dll" mRootModule="" AssemblyName="Spring.Core" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Data.dll" mRootModule="" AssemblyName="Spring.Data" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Services.dll" mRootModule="" AssemblyName="Spring.Services" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Web.dll" mRootModule="" AssemblyName="Spring.Web" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Data.NHibernate12.dll" mRootModule="" AssemblyName="Spring.Data.NHibernate12" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Testing.NUnit.dll" mRootModule="" AssemblyName="Spring.Testing.NUnit" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+        <Assembly Version="5.0" FileName="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Web.Extensions.dll" mRootModule="" AssemblyName="Spring.Web.Extensions" AssemblyType="1" ExamplesOnly="False" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivateItems="True"/>
+    </NetAssemblies>
+    <PropertyBag/>
+</DocumentXProject>
diff --git a/doc/docx/Spring-1.1/net-2.0/Spring.Data.dxc b/doc/docx/Spring-1.1/net-2.0/Spring.Data.dxc
new file mode 100644
index 00000000..26228d7a
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-2.0/Spring.Data.dxc
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\build\net\2.0\debug\Spring.Data.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Data" RelatedProject="Spring-1.1.0.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="True" LoadOnDemand="False" LoadSourceComments="False">
+    <IgnoreWordList/>
+<UserData>
+    <InPlaceEditor>
+        <dtscrollpos>704</dtscrollpos>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Data" tid="##PROJECT_INTRODUCTION" q="" cd="39053.9773611111"><![CDATA[<P>The Spring.Data assembly provides an implementation of best practice approaches to data access.</P>
+<P>Specifically, it contains an abstraction for transaction management that provides the following benefits</P>
+<UL>
+<UL>
+<LI>
+<P>Provides a consistent programming model across different transaction APIs such as ADO.NET, EnterpriseServices, System.Transactions, and NHibernate.</P>
+<LI>
+<P>Support for declarative transaction management with any of the above data access technologies</P>
+<LI>
+<P>Provides a simple API for programmatic transaction management</P>
+<LI>
+<P>Integrates with Spring's high level persistence integration APIs such as <A href="Spring.Data~Spring.Data.AdoTemplate.html">AdoTemplate</A>.</P></LI></UL></UL>
+<P>&nbsp;</P>
+<P>Spring.Data&nbsp;also contains&nbsp;an abstraction for data access via ADO.NET that provides the following benefits and features</P>
+<UL>
+<UL>
+<LI>
+<P>Consistent and comprehensive database provider interfaces for both .NET 1.1 and 2.0</P>
+<LI>
+<P>Integration with Spring's transaction management features.</P>
+<LI>
+<P>'One-liner' implementations for the most common database usage patterns lets you focus on the 'meat' of your ADO.NET code.</P>
+<LI>
+<P>Template style use of DbCommand that removes the need to write typical ADO.NET boiler-plate code.</P>
+<LI>
+<P>Easy database parameter creation/management</P>
+<LI>
+<P>Provider independent exceptions with database error codes and higher level DAO exception hierarchy.</P>
+<LI>
+<P>Centralized resource management for connections, commands, data readers, etc.</P>
+<LI>
+<P>Simple DataReader to Object mapping framework.</P></LI></UL></UL>
+<P>&nbsp;</P>
+<P>For more information refer to the Getting Started section within this documentation and the reference documentation, the latest copy of which can be found on the <A href="www.springframework.net">Spring.NET web site</A>.</P>]]></c>
+<c eid="Spring.Data" tid="##PROJECT_GETTINGSTARTED" q="" cd="39053.9774884259">The reference documentation and Spring.DataQuickStart are the best places to get started using the functionality contained in Spring.Data.</c>
+<c eid="Spring.Data~Spring.Dao_namespace" tid="##SUMMARY" q="" cd="39053.9757638889"><![CDATA[<P>Exception hierarchy enabling sophisticated error handling independent of the data access approach in use. </P>
+<P>For example, when DAOs and data access frameworks use the exceptions in this package (and custom subclasses), calling code can detect and handle common problems such as deadlocks without being tied to a particular data access strategy such as ADO.NET or ORM libraries, as well as vendor specific error codes.</P>]]></c>
+<c eid="Spring.Data~Spring.Dao.Support_namespace" tid="##SUMMARY" q="" cd="39053.975787037">Support classes for DAO implementations, providing miscellaneous utility methods.</c>
+<c eid="Spring.Data~Spring.Dao.Support.Generic_namespace" tid="##SUMMARY" q="" cd="39053.9759027778">Support classes for generic DAO implementations, providing miscellaneous utility methods.</c>
+<c eid="Spring.Data~Spring.Data_namespace" tid="##SUMMARY" q="" cd="39053.9760648148"><![CDATA[<P>The classes in this package make ADO.NET easier to use and<BR>reduce the likelihood of common errors. </P>
+<P>The central class in this namespace&nbsp;is AdoTemplate, which removes the need to manage&nbsp;resource management for connections, commands, data readers, etc. and integrates with Spring's Transaction management features.</P>]]></c>
+<c eid="Spring.Data~Spring.Data.Common_namespace" tid="##SUMMARY" q="" cd="39053.9761574074"><![CDATA[Consistent and comprehensive database provider interfaces for both .NET 1.1 and 2.0.&nbsp; Utility classes for easy database parameter creation.]]></c>
+<c eid="Spring.Data~Spring.Data.Config_namespace" tid="##SUMMARY" q="" cd="39423.612650463">Custom schema for DbProvider configuration</c>
+<c eid="Spring.Data~Spring.Data.Core_namespace" tid="##SUMMARY" q="" cd="39423.6130555556">Provides the core ADO.NET framework, based on AdoTemplate and its associated callback interfaces, delegates and helper objects.</c>
+<c eid="Spring.Data~Spring.Data.Generic_namespace" tid="##SUMMARY" q="" cd="39053.9766666667">Generic implementation of Spring.Data functionality such as AdoTemplate and RowMappers.</c>
+<c eid="Spring.Data~Spring.Data.Objects_namespace" tid="##SUMMARY" q="" cd="39053.9767361111"><![CDATA[The classes in this namespace represent RDBMS queries, updates,<BR>and stored procedures as thread-safe, reusable objects. 
+<P></P>
+<P>This ADO.NET abstraction depends on the features of AdoTemplate and as such exceptions thrown are in are thrown are within Spring' DAO exception class hierarchy.</P>]]></c>
+<c eid="Spring.Data~Spring.Data.Objects.Generic_namespace" tid="##SUMMARY" q="" cd="39423.6134027778">Generic implementation of functionality in the Spring.Data.Object namespace.</c>
+<c eid="Spring.Data~Spring.Data.Support_namespace" tid="##SUMMARY" q="" cd="39053.9768287037">Classes supporting the Spring.Data namespace</c>
+<c eid="Spring.Data~Spring.Transaction_namespace" tid="##SUMMARY" q="" cd="39053.9769097222"><![CDATA[Contains transaction manager, definition, and status interfaces.&nbsp; 
+<P></P>
+<P>Transaction callback interfaces and delegates&nbsp;for use with TransactionTemplate.</P>
+<P>Exception hierarchy for Spring's transaction infrastructure,<BR>independent of any specific transaction management system.</P>]]></c>
+<c eid="Spring.Data~Spring.Transaction.Config_namespace" tid="##SUMMARY" q="" cd="39423.6135763889">Custom schema for configuration of declarative transaction management.</c>
+<c eid="Spring.Data~Spring.Transaction.Interceptor_namespace" tid="##SUMMARY" q="" cd="39053.9769791667"><![CDATA[Aspect-Oriented Programming (AOP) based solution for declarative transaction demarcation.&nbsp; Builds on the AOP infrastructure within Spring.Aop.]]></c>
+<c eid="Spring.Data~Spring.Transaction.Support_namespace" tid="##SUMMARY" q="" cd="39053.977037037">Classes supporting the Spring.Transaction namespace.</c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-2.0/Spring.Web.Extensions.dxc b/doc/docx/Spring-1.1/net-2.0/Spring.Web.Extensions.dxc
new file mode 100644
index 00000000..1d044422
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-2.0/Spring.Web.Extensions.dxc
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Web.Extensions.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Web.Extensions" RelatedProject="Spring-1.1.0.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="False" LoadOnDemand="True" LoadSourceComments="False">
+    <IgnoreWordList/>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Web.Extensions" tid="##PROJECT_INTRODUCTION" q="" cd="39413.494837963"><![CDATA[Spring's ASP.NET AJAX integration allows for a plain .NET object (PONO), that is one that doesn't have any attributes or special base classes, to be exported as a web service, configured, via dependency injection, 'decorated' by applying AOP, and then exposed to client side java script.]]></c>
+<c eid="Spring.Web.Extensions" tid="##PROJECT_GETTINGSTARTED" q="" cd="39245.5166087963"><![CDATA[The reference documentation and sample application, listed under the shortcut 'AJAX', directory examples\Spring\Spring.Web.Extensions.Example, are the best places to get started using the functionality contained in Spring.Web.Extensions.]]></c>
+<c eid="Spring.Web.Extensions~Spring.Web.Script.Services_namespace" tid="##SUMMARY" q="" cd="39423.6144791667">Provides integration with ASP.NET AJAX allowing you to easily expose a plain object to client-side Javascript and have it configured with dependency injection and apply AOP aspects.</c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-2.0/Spring.Web.Extensions.dxc.bak b/doc/docx/Spring-1.1/net-2.0/Spring.Web.Extensions.dxc.bak
new file mode 100644
index 00000000..f66086b8
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-2.0/Spring.Web.Extensions.dxc.bak
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="5.0" Moniker="L:\projects\Spring.Net\bin\net\2.0\debug\Spring.Web.Extensions.dll" DocType="dx.Net" Template="" ShowInherited="False" SpellLastCheckDateTime="30/12/1899 00:00:00" TreePath="Spring.Web.Extensions" RelatedProject="Spring-1.1.0.dxp" RelatedHSProject="" LoadIncludeFilter="" LoadExcludeFilter="" LoadPrivate="False" LoadOnDemand="True" LoadSourceComments="False">
+    <IgnoreWordList/>
+<UserData>
+    <InPlaceEditor>
+        <inheritedMembers>on</inheritedMembers>
+        <protectedMembers>on</protectedMembers>
+        <dtscrollpos>0</dtscrollpos>
+    </InPlaceEditor>
+</UserData>
+<c eid="Spring.Web.Extensions" tid="##PROJECT_INTRODUCTION" q="" cd="39413.494837963"><![CDATA[Spring's ASP.NET AJAX integration allows for a plain .NET object (PONO), that is one that doesn't have any attributes or special base classes, to be exported as a web service, configured, via dependency injection, 'decorated' by applying AOP, and then exposed to client side java script.]]></c>
+<c eid="Spring.Web.Extensions" tid="##PROJECT_GETTINGSTARTED" q="" cd="39245.5166087963"><![CDATA[The reference documentation and sample application, listed under the shortcut 'AJAX', directory examples\Spring\Spring.Web.Extensions.Example, are the best places to get started using the functionality contained in Spring.Web.Extensions.]]></c>
+    </DocumentXComments>
diff --git a/doc/docx/Spring-1.1/net-2.0/UnRegisterHelp2.bat b/doc/docx/Spring-1.1/net-2.0/UnRegisterHelp2.bat
new file mode 100644
index 00000000..8e028de2
--- /dev/null
+++ b/doc/docx/Spring-1.1/net-2.0/UnRegisterHelp2.bat
@@ -0,0 +1,7 @@
+InnovaHxReg /U /P /productnamespace:MS.VSIPCC.v80 /producthxt:_DEFAULT /namespace:Spring.NET /hxt:_DEFAULT
+
+REM Un-Register the help file (title in Help 2.0 terminology)
+InnovaHxReg /U /T /namespace:Spring.NET /id:Spring.NET-1.1.2 /langid:1033 /helpfile:"Spring.NET.hxs"
+
+REM Un-Register the Namespace
+InnovaHxReg /U /N /Namespace:Spring.NET /Description:"Spring.Web.Extensions" /Collection:COL_Spring-1.1.0.hxc
diff --git a/doc/project.properties b/doc/project.properties
new file mode 100644
index 00000000..06833ecc
--- /dev/null
+++ b/doc/project.properties
@@ -0,0 +1,23 @@
+# $Id: project.properties,v 1.3 2006/10/19 19:43:28 markpollack Exp $
+# Ant and Maven properties for building the Spring.NET Docbook Documentation
+
+# Values in this file will be overriden by any values with the same name
+# in the user-created build.properties file.
+
+# ------------------------------------------------------------------------ 
+#     docbook reference documentation
+# ------------------------------------------------------------------------
+doc.output.dir=output
+
+# reference docbook source base directory
+doc.ref.dir=reference
+# reference docbook output base directory
+doc.ref.output.dir=${doc.output.dir}/reference
+
+# docbook libraries and dependencies
+#docbook.lib.dir=docbook/lib
+docbook.lib.dir=reference/lib
+
+# the main source code directory for the Spring.NET codebase
+src.dir=../src
+
diff --git a/doc/readme.txt b/doc/readme.txt
new file mode 100644
index 00000000..5c48fd37
--- /dev/null
+++ b/doc/readme.txt
@@ -0,0 +1,19 @@
+This Docbook documentation was taken from the Spring.Java project. The
+documentation can be generated using Java Ant. The targets are:
+
+* docpdf        - generates the PDF documentation
+* dochtml       - generates the HTML documentation
+* dochtmlsingle - generates single page HTML documentation
+* clean         - clean any output directories for docs
+
+To generate documentation, you need to include a lot of libraries, which
+haven't been added to CVS because they're simply too big. The libraries can
+be downloaded from sourceforge or from
+http://www.jteam.nl/spring/reference-libraries.zip.  Download them, and
+unzip the zip into reference/lib.  Then, the targets should work.
+
+Thanks to Spring.Java and Hibernate, for providing the skeleton for DocBook
+documentation!
+
+choy@rcn.com
+
diff --git a/doc/reference/images/admons/Thumbs.db b/doc/reference/images/admons/Thumbs.db
new file mode 100644
index 00000000..29ceb9f7
Binary files /dev/null and b/doc/reference/images/admons/Thumbs.db differ
diff --git a/doc/reference/images/admons/blank.png b/doc/reference/images/admons/blank.png
new file mode 100644
index 00000000..764bf4f0
Binary files /dev/null and b/doc/reference/images/admons/blank.png differ
diff --git a/doc/reference/images/admons/caution.gif b/doc/reference/images/admons/caution.gif
new file mode 100644
index 00000000..d9f5e5b1
Binary files /dev/null and b/doc/reference/images/admons/caution.gif differ
diff --git a/doc/reference/images/admons/caution.png b/doc/reference/images/admons/caution.png
new file mode 100644
index 00000000..5b7809ca
Binary files /dev/null and b/doc/reference/images/admons/caution.png differ
diff --git a/doc/reference/images/admons/caution.tif b/doc/reference/images/admons/caution.tif
new file mode 100644
index 00000000..4a282948
Binary files /dev/null and b/doc/reference/images/admons/caution.tif differ
diff --git a/doc/reference/images/admons/draft.png b/doc/reference/images/admons/draft.png
new file mode 100644
index 00000000..0084708c
Binary files /dev/null and b/doc/reference/images/admons/draft.png differ
diff --git a/doc/reference/images/admons/home.gif b/doc/reference/images/admons/home.gif
new file mode 100644
index 00000000..6784f5bb
Binary files /dev/null and b/doc/reference/images/admons/home.gif differ
diff --git a/doc/reference/images/admons/home.png b/doc/reference/images/admons/home.png
new file mode 100644
index 00000000..cbb711de
Binary files /dev/null and b/doc/reference/images/admons/home.png differ
diff --git a/doc/reference/images/admons/important.gif b/doc/reference/images/admons/important.gif
new file mode 100644
index 00000000..6795d9a8
Binary files /dev/null and b/doc/reference/images/admons/important.gif differ
diff --git a/doc/reference/images/admons/important.png b/doc/reference/images/admons/important.png
new file mode 100644
index 00000000..ad57f6f7
Binary files /dev/null and b/doc/reference/images/admons/important.png differ
diff --git a/doc/reference/images/admons/important.tif b/doc/reference/images/admons/important.tif
new file mode 100644
index 00000000..184de637
Binary files /dev/null and b/doc/reference/images/admons/important.tif differ
diff --git a/doc/reference/images/admons/next.gif b/doc/reference/images/admons/next.gif
new file mode 100644
index 00000000..aa1516e6
Binary files /dev/null and b/doc/reference/images/admons/next.gif differ
diff --git a/doc/reference/images/admons/next.png b/doc/reference/images/admons/next.png
new file mode 100644
index 00000000..45835bf8
Binary files /dev/null and b/doc/reference/images/admons/next.png differ
diff --git a/doc/reference/images/admons/note.gif b/doc/reference/images/admons/note.gif
new file mode 100644
index 00000000..f329d359
Binary files /dev/null and b/doc/reference/images/admons/note.gif differ
diff --git a/doc/reference/images/admons/note.png b/doc/reference/images/admons/note.png
new file mode 100644
index 00000000..ad57f6f7
Binary files /dev/null and b/doc/reference/images/admons/note.png differ
diff --git a/doc/reference/images/admons/note.tif b/doc/reference/images/admons/note.tif
new file mode 100644
index 00000000..08644d6b
Binary files /dev/null and b/doc/reference/images/admons/note.tif differ
diff --git a/doc/reference/images/admons/prev.gif b/doc/reference/images/admons/prev.gif
new file mode 100644
index 00000000..64ca8f3c
Binary files /dev/null and b/doc/reference/images/admons/prev.gif differ
diff --git a/doc/reference/images/admons/prev.png b/doc/reference/images/admons/prev.png
new file mode 100644
index 00000000..cf24654f
Binary files /dev/null and b/doc/reference/images/admons/prev.png differ
diff --git a/doc/reference/images/admons/tip.gif b/doc/reference/images/admons/tip.gif
new file mode 100644
index 00000000..823f2b41
Binary files /dev/null and b/doc/reference/images/admons/tip.gif differ
diff --git a/doc/reference/images/admons/tip.png b/doc/reference/images/admons/tip.png
new file mode 100644
index 00000000..ad57f6f7
Binary files /dev/null and b/doc/reference/images/admons/tip.png differ
diff --git a/doc/reference/images/admons/tip.tif b/doc/reference/images/admons/tip.tif
new file mode 100644
index 00000000..4a3d8c75
Binary files /dev/null and b/doc/reference/images/admons/tip.tif differ
diff --git a/doc/reference/images/admons/toc-blank.png b/doc/reference/images/admons/toc-blank.png
new file mode 100644
index 00000000..6ffad17a
Binary files /dev/null and b/doc/reference/images/admons/toc-blank.png differ
diff --git a/doc/reference/images/admons/toc-minus.png b/doc/reference/images/admons/toc-minus.png
new file mode 100644
index 00000000..abbb020c
Binary files /dev/null and b/doc/reference/images/admons/toc-minus.png differ
diff --git a/doc/reference/images/admons/toc-plus.png b/doc/reference/images/admons/toc-plus.png
new file mode 100644
index 00000000..941312ce
Binary files /dev/null and b/doc/reference/images/admons/toc-plus.png differ
diff --git a/doc/reference/images/admons/up.gif b/doc/reference/images/admons/up.gif
new file mode 100644
index 00000000..aabc2d01
Binary files /dev/null and b/doc/reference/images/admons/up.gif differ
diff --git a/doc/reference/images/admons/up.png b/doc/reference/images/admons/up.png
new file mode 100644
index 00000000..07634de2
Binary files /dev/null and b/doc/reference/images/admons/up.png differ
diff --git a/doc/reference/images/admons/warning.gif b/doc/reference/images/admons/warning.gif
new file mode 100644
index 00000000..3adf1912
Binary files /dev/null and b/doc/reference/images/admons/warning.gif differ
diff --git a/doc/reference/images/admons/warning.png b/doc/reference/images/admons/warning.png
new file mode 100644
index 00000000..1c33db8f
Binary files /dev/null and b/doc/reference/images/admons/warning.png differ
diff --git a/doc/reference/images/admons/warning.tif b/doc/reference/images/admons/warning.tif
new file mode 100644
index 00000000..7b6611ec
Binary files /dev/null and b/doc/reference/images/admons/warning.tif differ
diff --git a/doc/reference/images/callouts/1.gif b/doc/reference/images/callouts/1.gif
new file mode 100644
index 00000000..0d669771
Binary files /dev/null and b/doc/reference/images/callouts/1.gif differ
diff --git a/doc/reference/images/callouts/1.png b/doc/reference/images/callouts/1.png
new file mode 100644
index 00000000..7d473430
Binary files /dev/null and b/doc/reference/images/callouts/1.png differ
diff --git a/doc/reference/images/callouts/10.gif b/doc/reference/images/callouts/10.gif
new file mode 100644
index 00000000..fb50b06d
Binary files /dev/null and b/doc/reference/images/callouts/10.gif differ
diff --git a/doc/reference/images/callouts/10.png b/doc/reference/images/callouts/10.png
new file mode 100644
index 00000000..997bbc82
Binary files /dev/null and b/doc/reference/images/callouts/10.png differ
diff --git a/doc/reference/images/callouts/11.gif b/doc/reference/images/callouts/11.gif
new file mode 100644
index 00000000..9f5dba4f
Binary files /dev/null and b/doc/reference/images/callouts/11.gif differ
diff --git a/doc/reference/images/callouts/11.png b/doc/reference/images/callouts/11.png
new file mode 100644
index 00000000..ce47dac3
Binary files /dev/null and b/doc/reference/images/callouts/11.png differ
diff --git a/doc/reference/images/callouts/12.gif b/doc/reference/images/callouts/12.gif
new file mode 100644
index 00000000..a373d0b4
Binary files /dev/null and b/doc/reference/images/callouts/12.gif differ
diff --git a/doc/reference/images/callouts/12.png b/doc/reference/images/callouts/12.png
new file mode 100644
index 00000000..31daf4e2
Binary files /dev/null and b/doc/reference/images/callouts/12.png differ
diff --git a/doc/reference/images/callouts/13.gif b/doc/reference/images/callouts/13.gif
new file mode 100644
index 00000000..b00b1637
Binary files /dev/null and b/doc/reference/images/callouts/13.gif differ
diff --git a/doc/reference/images/callouts/13.png b/doc/reference/images/callouts/13.png
new file mode 100644
index 00000000..14021a89
Binary files /dev/null and b/doc/reference/images/callouts/13.png differ
diff --git a/doc/reference/images/callouts/14.gif b/doc/reference/images/callouts/14.gif
new file mode 100644
index 00000000..6d6642ee
Binary files /dev/null and b/doc/reference/images/callouts/14.gif differ
diff --git a/doc/reference/images/callouts/14.png b/doc/reference/images/callouts/14.png
new file mode 100644
index 00000000..64014b75
Binary files /dev/null and b/doc/reference/images/callouts/14.png differ
diff --git a/doc/reference/images/callouts/15.gif b/doc/reference/images/callouts/15.gif
new file mode 100644
index 00000000..cdd7072d
Binary files /dev/null and b/doc/reference/images/callouts/15.gif differ
diff --git a/doc/reference/images/callouts/15.png b/doc/reference/images/callouts/15.png
new file mode 100644
index 00000000..0d65765f
Binary files /dev/null and b/doc/reference/images/callouts/15.png differ
diff --git a/doc/reference/images/callouts/2.gif b/doc/reference/images/callouts/2.gif
new file mode 100644
index 00000000..100ff79f
Binary files /dev/null and b/doc/reference/images/callouts/2.gif differ
diff --git a/doc/reference/images/callouts/2.png b/doc/reference/images/callouts/2.png
new file mode 100644
index 00000000..5d09341b
Binary files /dev/null and b/doc/reference/images/callouts/2.png differ
diff --git a/doc/reference/images/callouts/3.gif b/doc/reference/images/callouts/3.gif
new file mode 100644
index 00000000..5008ca7d
Binary files /dev/null and b/doc/reference/images/callouts/3.gif differ
diff --git a/doc/reference/images/callouts/3.png b/doc/reference/images/callouts/3.png
new file mode 100644
index 00000000..ef7b7004
Binary files /dev/null and b/doc/reference/images/callouts/3.png differ
diff --git a/doc/reference/images/callouts/4.gif b/doc/reference/images/callouts/4.gif
new file mode 100644
index 00000000..0e5617d2
Binary files /dev/null and b/doc/reference/images/callouts/4.gif differ
diff --git a/doc/reference/images/callouts/4.png b/doc/reference/images/callouts/4.png
new file mode 100644
index 00000000..adb8364e
Binary files /dev/null and b/doc/reference/images/callouts/4.png differ
diff --git a/doc/reference/images/callouts/5.gif b/doc/reference/images/callouts/5.gif
new file mode 100644
index 00000000..9bc75ada
Binary files /dev/null and b/doc/reference/images/callouts/5.gif differ
diff --git a/doc/reference/images/callouts/5.png b/doc/reference/images/callouts/5.png
new file mode 100644
index 00000000..4d7eb460
Binary files /dev/null and b/doc/reference/images/callouts/5.png differ
diff --git a/doc/reference/images/callouts/6.gif b/doc/reference/images/callouts/6.gif
new file mode 100644
index 00000000..d3964070
Binary files /dev/null and b/doc/reference/images/callouts/6.gif differ
diff --git a/doc/reference/images/callouts/6.png b/doc/reference/images/callouts/6.png
new file mode 100644
index 00000000..0ba694af
Binary files /dev/null and b/doc/reference/images/callouts/6.png differ
diff --git a/doc/reference/images/callouts/7.gif b/doc/reference/images/callouts/7.gif
new file mode 100644
index 00000000..c90b2f3d
Binary files /dev/null and b/doc/reference/images/callouts/7.gif differ
diff --git a/doc/reference/images/callouts/7.png b/doc/reference/images/callouts/7.png
new file mode 100644
index 00000000..472e96f8
Binary files /dev/null and b/doc/reference/images/callouts/7.png differ
diff --git a/doc/reference/images/callouts/8.gif b/doc/reference/images/callouts/8.gif
new file mode 100644
index 00000000..6fe3287d
Binary files /dev/null and b/doc/reference/images/callouts/8.gif differ
diff --git a/doc/reference/images/callouts/8.png b/doc/reference/images/callouts/8.png
new file mode 100644
index 00000000..5e60973c
Binary files /dev/null and b/doc/reference/images/callouts/8.png differ
diff --git a/doc/reference/images/callouts/9.gif b/doc/reference/images/callouts/9.gif
new file mode 100644
index 00000000..bc5c8125
Binary files /dev/null and b/doc/reference/images/callouts/9.gif differ
diff --git a/doc/reference/images/callouts/9.png b/doc/reference/images/callouts/9.png
new file mode 100644
index 00000000..a0676d26
Binary files /dev/null and b/doc/reference/images/callouts/9.png differ
diff --git a/doc/reference/images/callouts/Thumbs.db b/doc/reference/images/callouts/Thumbs.db
new file mode 100644
index 00000000..fc135009
Binary files /dev/null and b/doc/reference/images/callouts/Thumbs.db differ
diff --git a/doc/reference/src/ado.xml b/doc/reference/src/ado.xml
new file mode 100644
index 00000000..4be10ed1
--- /dev/null
+++ b/doc/reference/src/ado.xml
@@ -0,0 +1,2307 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="ado">
+  <title>Data access using ADO.NET</title>
+
+  <sect1 id="ado-introduction">
+    <title>Introduction</title>
+
+    <para>Spring provides an abstraction for data access via ADO.NET that
+    provides the following benefits and features</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Consistent and comprehensive database provider interfaces for
+        both .NET 1.1 and 2.0</para>
+      </listitem>
+
+      <listitem>
+        <para>Integration with Spring's transaction management
+        features.</para>
+      </listitem>
+
+      <listitem>
+        <para>Template style use of DbCommand that removes the need to write
+        typical ADO.NET boiler-plate code.</para>
+      </listitem>
+
+      <listitem>
+        <para>'One-liner' implementations for the most common database usage
+        patterns lets you focus on the 'meat' of your ADO.NET code.</para>
+      </listitem>
+
+      <listitem>
+        <para>Easy database parameter creation/management</para>
+      </listitem>
+
+      <listitem>
+        <para>Provider independent exceptions with database error codes and
+        higher level DAO exception hierarchy.</para>
+      </listitem>
+
+      <listitem>
+        <para>Centralized resource management for connections, commands, data
+        readers, etc.</para>
+      </listitem>
+
+      <listitem>
+        <para>Simple DataReader to Object mapping framework.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>This chapter is divided up into a number of sections that describe
+    the major areas of functionality within Spring's ADO.NET support.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Motivations - describes why one should consider using Spring's
+        ADO.NET features as compared to using 'raw' ADO.NET API.</para>
+      </listitem>
+
+      <listitem>
+        <para>Provider Abstraction - a quick overview of Spring's provider
+        abstraction.</para>
+      </listitem>
+
+      <listitem>
+        <para>Approaches to ADO.NET Data Access - Discusses the two styles of
+        Spring's ADO.NET data access classes - template and object
+        based.</para>
+      </listitem>
+
+      <listitem>
+        <para>Introduction to AdoTemplate - Introduction to the design and
+        core methods of the central class in Spring's ADO.NET support.</para>
+      </listitem>
+
+      <listitem>
+        <para>Exception Translation - Describes the features of Spring's data
+        access exceptions</para>
+      </listitem>
+
+      <listitem>
+        <para>Parameter Management - Convenience classes and methods for easy
+        parameter management.</para>
+      </listitem>
+
+      <listitem>
+        <para>Custom IDataReader implementations - Strategy for providing
+        custom implementations of IDataReader. This can be used to centralized
+        and transparently map DBNull values to CLR types when accessing an
+        IDataReader or to provide extended mapping functionality in
+        sub-interfaces.</para>
+      </listitem>
+
+      <listitem>
+        <para>Basic data access operations - Usage of AdoTemplate for
+        IDbCommand 'ExecuteScalar' and 'ExecuteNonScalar' functionality</para>
+      </listitem>
+
+      <listitem>
+        <para>Queries and Lightweight Object Mapping - Using AdoTemplate to
+        map result sets into objects</para>
+      </listitem>
+
+      <listitem>
+        <para>DataSet and DataTable operations - Using AdoTemplate with
+        DataSets and DataTables</para>
+      </listitem>
+
+      <listitem>
+        <para>Modeling ADO.NET operations as .NET objects - An object-oriented
+        approach to data access operations.</para>
+      </listitem>
+    </itemizedlist>
+  </sect1>
+
+  <sect1 id="ado-motivations" label="">
+    <title>Motivations</title>
+
+    <para>There are a variety of motivations to create a higher level ADO.NET
+    persistence API.</para>
+
+    <para>Encapsulation of common 'boiler plate' tasks when coding directly
+    against the ADO.NET API. For example here is a list of the tasks typically
+    required to be coded for processing a result set query. Note that the code
+    needed when using Spring's ADO.NET framework is in italics.</para>
+
+    <orderedlist numeration="arabic">
+      <listitem>
+        <para>Define connection parameters</para>
+      </listitem>
+
+      <listitem>
+        <para>Open the connection</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Specify the command type and text</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>Prepare and execute the statement</para>
+      </listitem>
+
+      <listitem>
+        <para>Set up the loop to iterate through the results (if any)</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Do the work for each iteration</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para>Process any exception</para>
+      </listitem>
+
+      <listitem>
+        <para>Display or rollback on warnings</para>
+      </listitem>
+
+      <listitem>
+        <para>Handle transactions</para>
+      </listitem>
+
+      <listitem>
+        <para>Close the connection</para>
+      </listitem>
+    </orderedlist>
+
+    <para>Spring takes care of the low-level tasks and lets you focus on
+    specifying the SQL and doing the real work of extracting data. This
+    standard boiler plate pattern is encapsulated in a class, AdoTemplate. The
+    name 'Template' is used because if you look at the typical code workflow
+    for the above listing, you would essentially like to 'template' it, that
+    is stick in the code that is doing the real work in the midst of the
+    resource, transaction, exception management.</para>
+
+    <para>Another very important motivation is to provide an easy means to
+    group multiple ADO.NET operations within a single transaction while at the
+    same time adhering to a DAO style design in which transactions are
+    initiated outside the DAOs, typically in a business service layer. Using
+    the 'raw' ADO.NET API to implement this design often results in explicitly
+    passing around of a Transaction/Connection pair to DAO objects. This
+    infrastructure task distracts from the main database task at hand and is
+    frequently done in an ad-hoc manner. Integrating with Spring's transaction
+    management features provides an elegant means to achieve this common
+    design goal. There are many other benefits to integration with Spring's
+    transaction management features, see <xref linkend="transaction" /> for
+    more information.</para>
+
+    <para>Provider Independent Code: In .NET 1.1 writing provider independent
+    code was difficult for a variety of reasons. The most prominent was the
+    lack of a lack of a central factory for creating interface based
+    references to the core ADO.NET classes such as IDbConnection, IDbCommand,
+    DbParameter etc. In addition, the APIs exposed by many of these interfaces
+    were minimal or incomplete - making for tedious code that would otherwise
+    be more easily developed with provider specific subclasses. Lastly, there
+    was no common base class for data access exceptions across the providers.
+    .NET 2.0 made many changes for the better in that regard across all these
+    areas of concern - and Spring only plugs smaller holes in that regard to
+    help in the portability of your data access code.</para>
+
+    <para>Resource Management: The 'using' block is the heart of elegant
+    resource management in .NET from the API perspective. However, despite its
+    elegance, writing 2-3 nested using statements for each data access method
+    also starts to be tedious, which introduces the risk of forgetting to do
+    the right thing <emphasis>all the time</emphasis> in terms of both direct
+    coding and 'cut-n-paste' errors. Spring centralizes this resource
+    management in one spot so you never forget or make a mistake and rely on
+    it always being done correctly.</para>
+
+    <para>Parameter management: Frequently much of data access code is related
+    to creating appropriate parameters. To alleviate this boiler plate code
+    Spring provides a parameter 'builder' class that allows for succinct
+    creation of parameter collections. Also, for the case of stored
+    procedures, parameters can be derived from the database itself which
+    reduces parameter creation code to just one line.</para>
+
+    <para>Frequently result set data is converted into objects. Spring
+    provides a simple framework to organize that mapping task and allows you
+    to reuse mapping artifacts across your application.</para>
+
+    <para>Exceptions: The standard course of action when an exception is
+    thrown from ADO.NET code is to look up the error code and then re-run the
+    application to set a break point where the exception occurred so as to see
+    what the command text and data values were that caused the exception.
+    Spring provides exceptions translation from these error codes (across
+    database vendors) to a Data Access Object exception hierarchy. This allows
+    you to quickly understand the category of the error that occurred and also
+    the 'bad' data which lead to the exception.</para>
+
+    <para>Warnings: A common means to extract warning from the database, and
+    to optionally treat those warnings as a reason to rollback is not directly
+    supported with the new System.Data.Common API</para>
+
+    <para>Portability: Where possible, increase the portability of code across
+    database provider in the higher level API. The need adding of a parameter
+    prefix, i.e. @ for SqlServer or ':' for oracle is one such example of an
+    area where a higher level API can offer some help in making your code more
+    portable.</para>
+
+    <para>Note that Spring's ADO.NET framework is just 'slightly' above the
+    raw API. It does not try to compete with other higher level persistence
+    abstractions such as result set mappers (iBATIS.NET) or other ORM tools
+    (NHibernate). (Apologies if your favorite is left out of that short list).
+    As always, pick and choose the appropriate level of abstraction for the
+    task at hand. As a side note, Spring does offer integration with higher
+    level persistence abstractions (currently NHibernate) providing such
+    features as integration with Spring's transaction management features as
+    well as mixing orm/ado.net operations within the same transaction.</para>
+  </sect1>
+
+  <sect1 id="ado-providers">
+    <title>Provider Abstraction</title>
+
+    <para>Before you get started executing queries against the database you
+    need to connect to it. <xref linkend="dbprovider" /> covers this topic in
+    detail so we only discuss the basic idea of how to interact with the
+    database in this section. One important ingredient that increases the
+    portability of writing ADO.NET applications is to refer to the base
+    ADO.NET interfaces, such as IDbCommand or IDbParameter in your code.
+    However, In the .NET 1.1 BCL the only means to obtain references to
+    instances of these interfaces is to directly instantiate the classes, i.e.
+    for SqlServer this would be <programlisting> IDbCommand command = new SqlCommand();</programlisting>
+    One of the classic creational patterns in the GoF Design Patterns book
+    addresses this situation directly, the Abstract Factory pattern. This
+    approach was applied in the .NET BCL with the introduction of the
+    DbProviderFactory class which contains various factory methods that create
+    the various objects used in ADO.NET programming. In addition, .NET 2.0
+    introduced new abstract base classes that all ADO.NET providers must
+    inherit from. These base classes provide more core functionality and
+    uniformity across the various providers as compared to the original
+    ADO.NET interfaces.</para>
+
+    <para>Spring's database provider abstraction has a similar API to that of
+    .ADO.NET 2.0's DbProviderFactory. The central interface is IDbProvider and
+    it has factory methods that are analogous to those in the
+    DbProviderFactory class except that they return references to the base
+    ADO.NET interfaces. Note that in keeping with the Spring Framework's
+    philosophy, IDbProvider is an interface, and can thus be easily mocked or
+    stubbed as necessary. Another key element of this interface is the
+    ConnectionString property that specifies the specific runtime information
+    necessary to connect to the provider. The interface also has a IDbMetadata
+    property that contains minimal database metadata information needed to
+    support the functionality in rest of the Spring ADO.NET framework. It is
+    unlikely you will need to use the DatabaseMetadata class directly in your
+    application.</para>
+
+    <para>For more information on configuring a Spring database provider refer
+    to <xref linkend="dbprovider" /></para>
+
+    <sect2 id="ado-dbprovider-creating-instance">
+      <title>Creating an instance of IDbProvider</title>
+
+      <para>Each database vendor is associated with a particular
+      implementation of the IDbProvider interfaces. A variety of
+      implementations are provided with Spring such as SqlServer, Oracle and
+      MySql. Refer to the documentation on Spring's DbProvider for creating a
+      configuration for database that is not yet provided. The programmatic
+      way to create an IDbProvider is shown below</para>
+
+      <programlisting>IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.SqlClient");</programlisting>
+    </sect2>
+
+    <para>Please refer to the <xref linkend="dbprovider" /> for information on
+    how to create a IDbProvider in Spring's XML configuration file.</para>
+  </sect1>
+
+  <sect1 id="ado-namespaces">
+    <title>Namespaces</title>
+
+    <para>The ADO.NET framework consists of a few namespaces, namely
+    <package>Spring.Data</package>, <package>Spring.Data.Generic</package>,
+    <package>Spring.Data.Common</package>,
+    <package>Spring.Data.Support</package>, and
+    <package>Spring.Data.Object</package>.</para>
+
+    <para>The <package>Spring.Data</package> namespace contains the majority
+    of the classes and interfaces you will deal with on a day to day
+    basis.</para>
+
+    <para>The <package>Spring.Data.Generic</package> namespaces add generic
+    versions of some classes and interfaces and you will also likely deal with
+    this on a day to day basis if you are using .NET 2.0</para>
+
+    <para>The <package>Spring.Data.Common</package> namespaces contains
+    Spring's DbProvider abstraction in addition to utility classes for
+    parameter creation.</para>
+
+    <para>The <package>Spring.Data.Object</package> namespaces contains
+    classes that represent RDBMS queries, updates, and stored procedures as
+    thread safe, reusable objects.</para>
+
+    <para>Finally the <literal>Spring.Data.Support</literal> namespace is
+    where you find the <classname>IAdoExceptionTransactor</classname>
+    translation functionality and some utility classes.</para>
+  </sect1>
+
+  <sect1 id="ado-data-access-approaches">
+    <title>Approaches to Data Access</title>
+
+    <para>Spring provides two styles to interact with ADO.NET. The first is a
+    'template' based approach in which you create an single instance of
+    <classname>AdoTemplate</classname> to be used by all your DAO
+    implementations. Your DAO methods are frequently implemented as a single
+    method call on the template class as described in detail in the following
+    section. The other approach a more object-oriented manner that models
+    database operations as objects. For example, one can encapsulate the
+    functionality of a database query via an <classname>AdoQuery</classname>
+    class and a create/update/delete operation as a
+    <classname>AdoNonQuery</classname> class. Stored procedures are also
+    modelled in this manner via the class
+    <classname>StoredProcedure</classname>. To use these classes you inherit
+    from them and define the details of the operation in the constructor and
+    implement an abstract method. This reads very cleanly when looking at DAO
+    method implementation as you can generally see all the details of what is
+    going on.</para>
+
+    <para>Generally speaking, experience has shown that the AdoTemplate
+    approach reads very cleanly when looking at DAO method implementation as
+    you can generally see all the details of what is going on as compared to
+    the object based approach. The object based approach however, offers some
+    advantages when calling stored procedures since it acts as a cache of
+    derived stored procedure arguments and can be invoked passing a variable
+    length argument list to the 'execute' method. As always, take a look at
+    both approaches and use the approach that provides you with the most
+    benefit for a particular situation.</para>
+  </sect1>
+
+  <sect1 id="ado-adotemplate-intro">
+    <title>Introduction to AdoTemplate</title>
+
+    <para>The class <classname>AdoTemplate</classname> is at the heart of
+    Spring's ADO.NET support. It is based on an Inversion of Control (i.e.
+    callback) design with the central method '<literal>Execute</literal>'
+    handing you a <interfacename>IDbCommand</interfacename> instance that has
+    its Connection and Transaction properties set based on the transaction
+    context of the calling code. All resource management is handled by the
+    framework, you only need to focus on dealing with the
+    <interfacename>IDbCommand</interfacename> object. The other methods in
+    this class build upon this central 'Execute' method to provide you a quick
+    means to execute common data access scenarios.</para>
+
+    <para>There are two implementations of <classname>AdoTemplate</classname>.
+    The one that uses Generics and is in the namespace
+    <classname>Spring.Data.Generic</classname> and the other non-generic
+    version in <package>Spring.Data</package>. In either case you create an
+    instance of an <classname>AdoTemplate</classname> by passing it a
+    <interfacename>IDbProvider</interfacename> instance as shown below</para>
+
+    <programlisting>AdoTemplate adoTemplate = new AdoTemplate(dbProvider);</programlisting>
+
+    <para><classname>AdoTemplate</classname> is a thread-safe class and as
+    such a single instance can be used for all data access operations in you
+    applications DAOs. <classname>AdoTemplate</classname> implements an
+    <interfacename>IAdoOperations</interfacename> interface. Although the
+    <interfacename>IAdoOperations</interfacename> interface is more commonly
+    used for testing scenarios you may prefer to code against it instead of
+    the direct class instance.</para>
+
+    <para>If you are using the generic version of AdoTemplate you can access
+    the non-generic version via the property ClassicAdoTemplate.</para>
+
+    <para>The following two sections show basic usage of the
+    <classname>AdoTemplate</classname> 'Execute' API for .NET 1.1 and
+    2.0.</para>
+
+    <para></para>
+
+    <sect2 id="ado-execute-callback">
+      <title>Execute Callback</title>
+
+      <para>The <methodname>Execute</methodname> method and its associated
+      callback function/inteface is the basic method upon which all the other
+      methods in <classname>AdoTemplate</classname> delegate their work. If
+      you can not find a suitable 'one-liner' method in
+      <classname>AdoTemplate</classname> for your purpose you can always fall
+      back to the <methodname>Execute</methodname> method to perform any
+      database operation while benefiting from ADO.NET resource management and
+      transaction enlistment. This is commonly the case when you are using
+      special provider specific features, such as XML or BLOB support.</para>
+    </sect2>
+
+    <sect2 id="ado-execute-callback-net2">
+      <title>Execute Callback in .NET 2.0</title>
+
+      <para>In this example a simple query against the 'Northwind' database is
+      done to determine the number of customers who have a particular postal
+      code.</para>
+
+      <para><programlisting>public int FindCountWithPostalCode(string postalCode)
+{
+  return adoTemplate.Execute&lt;int&gt;(delegate(DbCommand command)
+         {
+             command.CommandText =
+                 "select count(*) from Customers where PostalCode = @PostalCode";
+                                                    
+             DbParameter p = command.CreateParameter();
+             p.ParameterName = "@PostalCode";
+             p.Value = postalCode;
+             command.Parameters.Add(p);
+                                                         
+             return (int)command.ExecuteScalar();
+
+          });
+
+}</programlisting>The <classname>DbCommand</classname> that is passed into the
+      anonymous delegate is already has it Connection property set to the
+      corresponding value of the dbProvider instance used to create the
+      template. Furthermore, the <methodname>Transaction</methodname> property
+      of the <classname>DbCommand</classname> is set based on the
+      transactional calling context of the code as based on the use of
+      Spring's transaction management features. Also note the feature of
+      anonymous delegates to access the variable 'postalCode' which is defined
+      'outside' the anonymous delegate implementation. The use of anonymous
+      delegates is a powerful approach since it allows you to write compact
+      data access code. If you find that your callback implementation is
+      getting very long, it may improve code clarity to use an interface based
+      version of the callback function, i.e. an
+      <interfacename>ICommandCallback</interfacename> shown below.</para>
+
+      <para>As you can see, only the most relevant portions of the data access
+      task at hand need to be coded. (Note that in this simple example you
+      would be better off using AdoTemplate's ExecuteScalar method directly.
+      This method is described in the following sections). As mentioned
+      before, the typical usage scenario for the Execute callback would
+      involve downcasting the passed in <classname>DbCommand</classname>
+      object to access specific provider API features.</para>
+
+      <para>There is also an interface based version of the execute method.
+      The signatures for the delegate and interface are shown below</para>
+
+      <programlisting>public delegate T CommandDelegate&lt;T&gt;(DbCommand command);  
+
+
+public interface ICommandCallback
+{
+  T DoInCommand&lt;T&gt;(DbCommand command);
+}</programlisting>
+
+      <para>While the delegate version offers the most compact syntax, the
+      interface version allows for reuse. The corresponding method signatures
+      on <package>Spring.Data.Generic.AdoTemplate</package> are shown
+      below</para>
+
+      <programlisting>public class AdoTemplate : AdoAccessor, IAdoOperations
+{
+   ...
+
+   T Execute&lt;T&gt;(ICommandCallback action);
+
+   T Execute&lt;T&gt;(CommandDelegate&lt;T&gt; del);
+
+   ...
+}</programlisting>
+
+      <para>While it is common for .NET 2.0 ADO.NET provider implementations
+      to inherit from the base class System.Data.Common.DbCommand, that is not
+      a requirement. To accommodate the few that don't, which as of this
+      writing are the latest Oracle (ODP) provider, Postgres, and DB2 for
+      iSeries, two additional execute methods are provided. The only
+      difference is the use of callback and delegate implementations that have
+      IDbCommand and not DbCommand as callback arguments. The following
+      listing shows these methods on AdoTemplate.</para>
+
+      <programlisting>public class AdoTemplate : AdoAccessor, IAdoOperations
+{
+   ...
+
+   T Execute&lt;T&gt;(IDbCommandCallback action);
+
+   T Execute&lt;T&gt;(IDbCommandDelegate&lt;T&gt; del);
+
+   ...
+}</programlisting>
+
+      <para>where the signatures for the delegate and interface are shown
+      below</para>
+
+      <programlisting>public delegate T IDbCommandDelegate&lt;T&gt;(IDbCommand command);
+
+
+public interface IDbCommandCallback&lt;T&gt;
+{
+  T DoInCommand(IDbCommand command);
+}</programlisting>
+
+      <para>Internally the <classname>AdoTemplate</classname> implementation
+      delegates to implementations of
+      <classname>IDbCommandCallback</classname> so that the 'lowest common
+      denominator' API is used to have maximum portability. If you
+      accidentally call <literal>Execute&lt;T&gt;(ICommandCallback
+      action)</literal>and the command does not inherit from
+      <classname>DbCommand</classname>, an
+      <classname>InvalidDataAccessApiUsageException</classname> will be
+      thrown.</para>
+
+      <para>Depending on how portable you would like your code to be, you can
+      choose among the two callback styles. The one based on
+      <classname>DbCommand</classname> has the advantage of access to the more
+      user friendly <classname>DbParameter</classname> class as compared to
+      <classname>IDbParameter</classname> obtained from
+      <classname>IDbCommand</classname>.</para>
+    </sect2>
+
+    <sect2 id="ado-execute-callback-net11">
+       &gt; 
+
+      <title>Execute Callback in .NET 1.1</title>
+
+       
+
+      <para>AdoTemplate differs from its .NET 2.0 generic counterpart in that
+      it exposes the interface <interfacename>IDbCommand</interfacename> in
+      its 'Execute' callback methods and delegate as compared to the abstract
+      base class <classname>DbProvider</classname>. Also, since anonymous
+      delegates are not available in .NET 1.1, the typical usage pattern
+      requires you to create a explicitly delegate and/or class that
+      implements the <interfacename>ICommandCallback</interfacename>
+      interface. Example code to query In .NET 1.1 the 'Northwind' database is
+      done to determine the number of customers who have a particular postal
+      code is shown below.</para>
+
+       
+
+      <programlisting>public virtual int FindCountWithPostalCode(string postalCode)
+{
+  return (int) AdoTemplate.Execute(new PostalCodeCommandCallback(postalCode));
+}</programlisting>
+
+       
+
+      <para>and the callback implementation is</para>
+
+       
+
+      <programlisting>private class PostalCodeCommandCallback : ICommandCallback
+{
+    private string cmdText = "select count(*) from Customer where PostalCode = @PostalCode";
+
+    private string postalCode;
+    
+    public PostalCodeCommandCallback(string postalCode)
+    {
+        this.postalCode = postalCode;
+    }
+
+    public object DoInCommand(IDbCommand command)
+    {
+        command.CommandText = cmdText;
+
+        IDbDataParameter p = command.CreateParameter();
+        p.ParameterName = "@PostalCode";
+        p.Value = postalCode;
+        command.Parameters.Add(p);
+        
+        return command.ExecuteScalar();
+
+    }
+}</programlisting>
+
+       
+
+      <para>Note that in this example, one could more easily use AdoTemplate's
+      ExecuteScalar method.</para>
+
+       
+
+      <para>The Execute method has interface and delegate overloads. The
+      signatures for the delegate and interface are shown below</para>
+
+       
+
+      <programlisting>public delegate object CommandDelegate(IDbCommand command);
+
+public interface ICommandCallback
+{
+  object DoInCommand(IDbCommand command);
+}</programlisting>
+
+       
+
+      <para>The corresponding method signatures on
+      <package>Spring.Data.AdoTemplate</package> are shown below</para>
+
+       
+
+      <programlisting>public class AdoTemplate : AdoAccessor, IAdoOperations
+{
+   ...
+
+   object Execute(CommandDelegate del);
+
+   object Execute(ICommandCallback action);
+
+   ...
+
+}</programlisting>
+
+       
+
+      <para>Note that you have to cast to the appropriate object type returned
+      from the execute method.</para>
+
+       
+    </sect2>
+
+    <sect2 id="ado-template-method-guide">
+      <title>Quick Guide to AdoTemplate Methods</title>
+
+      <para>There are many methods in AdoTemplate so it is easy to feel a bit
+      overwhelmed when taking a look at the SDK documentation. However, after
+      a while you will hopefully find the class 'easy to navigate' with
+      intellisense. Here is a quick categorization of the method names and
+      their associated data access operation. Each method is overloaded to
+      handle common cases of passing in parameter values.</para>
+
+      <para>The generic 'catch-all' method</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><methodname>Execute</methodname> - Allows you to perform any
+          data access operation on a standard DbCommand object. The connection
+          and transaction properties of the DbCommand are already set based on
+          the transactional calling context. There is also an overloaded
+          method that operates on a standard IDbCommand object. This is for
+          those providers that do not inherit from the base class
+          DbCommand.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The following methods mirror those on the DbCommand object.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><methodname>ExecuteNonQuery</methodname> - Executes the
+          'NonQuery' method on a DbCommand, applying provided parameters and
+          returning the number of rows affected.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>ExecuteScalar</methodname> - Executes the 'Scalar'
+          method on a DbCommand, applying provided parameters, and returning
+          the first column of the first row in the result set.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Mapping result sets to objects</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><methodname>QueryWithResultSetExtractor</methodname> - Execute
+          a query mapping a result set to an object with an implementation of
+          the <interfacename>IResultSetExtractor</interfacename>
+          interface.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>QueryWithResultSetExtractorDelegate</methodname> -
+          Same as QueryWithResultSetExtractor but using a
+          <interfacename>ResultSetExtractorDelegate</interfacename> to perform
+          result set mapping.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>QueryWithRowCallback</methodname> - Execute a
+          query calling an implementation of
+          <interfacename>IRowCallback</interfacename> for each row in the
+          result set.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>QueryWithRowCallbackDelegate</methodname> - Same
+          as QueryWithRowCallback but calling a
+          <interfacename>RowCallbackDelegate</interfacename> for each
+          row.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>QueryWithRowMapper</methodname> - Execute a query
+          mapping a result set on a row by row basis with an implementation of
+          the <interfacename>IRowMapper</interfacename> interface.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>QueryWithRowMapperDelegate</methodname> - Same as
+          QueryWithRowMapper but using a
+          <interfacename>RowMapperDelegate</interfacename> to perform result
+          set row to object mapping.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Mapping result set to a single object</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><methodname>QueryForObject</methodname> - Execute a query
+          mapping the result set to an object using a
+          <interfacename>IRowMapper</interfacename>. Exception is thrown if
+          the query does not return exactly one object.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Query with a callback to create the DbCommand object. These are
+      generally used by the framework itself to support other functionality,
+      such as in the Spring.Data.Objects namespace.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><methodname>QueryWithCommandCreator</methodname> - Execute a
+          query with a callback to
+          <interfacename>IDbCommandCreator</interfacename> to create a
+          IDbCommand object and using either a IRowMapper or
+          IResultSetExtractor to map the result set to an object. One
+          variation lets multiple result set 'processors' be specified to act
+          on multiple result sets and return output parameters.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>DataTable and DataSet operations</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><methodname>DataTableCreate</methodname> - Create and Fill
+          DataTables</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataTableCreateWithParameters</methodname> -
+          Create and Fill DataTables using a parameter collection.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataTableFill</methodname> - Fill a pre-existing
+          DataTable.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataTableFillWithParameters</methodname> - Fill a
+          pre-existing DataTable using parameter collection.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataTableUpdate</methodname> - Update the database
+          using the provided DataTable, insert, update, delete SQL.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataTableUpdateWithCommandBuilder</methodname> -
+          Update the database using the provided DataTable, select SQL, and
+          parameters.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataSetCreate</methodname> - Create and Fill
+          DataSets</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataSetCreateWithParameters</methodname> - Create
+          and Fill DataTables using a parameter collection.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataSetFill</methodname> - Fill a pre-existing
+          DataSet</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataSetFillWithParameters</methodname> - Fill a
+          pre-existing DataTable using parameter collection.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataSetUpdate</methodname> - Update the database
+          using the provided DataSet, insert, update, delete SQL.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataSetUpdateWithCommandBuilder</methodname> -
+          Update the database using the provided DataSet, select SQL, and
+          parameters..</para>
+        </listitem>
+      </itemizedlist>
+
+      <note>
+        <para>These methods are not currently in the generic version of
+        AdoTemplate but accessible through the property
+        ClassicAdoTemplate.</para>
+      </note>
+
+      <para>Parameter Creation utility methods</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><methodname>DeriveParameters</methodname> - Derive the
+          parameter collection for stored procedures.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>In turn each method typically has four overloads, one with no
+      parameters and three for providing parameters. Aside from the
+      DataTable/DataSet operations, the three parameter overloads are of the
+      form shown below</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>MethodName</literal>(CommandType cmdType, string
+          cmdText, <emphasis>CallbackInterfaceOrDelegate</emphasis>,
+          <emphasis>parameter setting arguments</emphasis>)</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The CallbackInterfaceOrDelegate is one of the three types listed
+      previously. The parameters setting arguments are of the form</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>MethodName( ... string parameterName, Enum dbType,
+          int size, object parameterValue</literal>)</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>MethodName( ... IDbParameters
+          parameters)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>MethodName( ... ICommandSetter
+          commandSetter)</literal></para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The first overload is a convenience method when you only have one
+      parameter to set. The database enumeration is the base class 'Enum'
+      allowing you to pass in any of the provider specific enumerations as
+      well as the common DbType enumeration. This is a trade off of
+      type-safety with provider portability. (Note generic version could be
+      improved to provide type safety...).</para>
+
+      <para>The second overload contains a collection of parameters. The data
+      type is Spring's IDbParameters collection class discussed in the
+      following section.</para>
+
+      <para>The third overload is a callback interface allowing you to set the
+      parameters (or other properties) of the IDbCommand passed to you by the
+      framework directly.</para>
+
+      <para>If you are using .NET 2.0 the delegate versions of the methods are
+      very useful since very compact definitions of database operations can be
+      created that reference variables local to the DAO method. This removes
+      some of the tedium in passing parameters around with interface based
+      versions of the callback functions since they need to be passed into the
+      constructor of the implementing class. The general guideline is to use
+      the delegate when available for functionality that does not need to be
+      shared across multiple DAO classes or methods and use interface based
+      version to reuse the implementation in multiple places. The .NET 2.0
+      versions make use of generics where appropriate and therefore enhance
+      type-safety.</para>
+    </sect2>
+
+    <sect2 id="ado-adotemplate-properties-quicguide">
+      <title>Quick Guide to AdoTemplate Properties</title>
+
+      <para>AdoTemplate has the following properties that you can
+      configure</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>LazyInit</literal> - Indicates if the
+          <classname>IAdoExceptionTranslator</classname> should be created on
+          first encounter of an exception from the data provider or when
+          <classname>AdoTemplate</classname> is created. Default is true, i.e.
+          to lazily instantiate.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>ExceptionTranslator</literal> - Gets or sets the
+          implementation of <classname>IAdoExceptionTranslator</classname> to
+          use. If no custom translator is provided, a default
+          <classname>ErrorCodeExceptionTranslator</classname> is used.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>DbProvider</literal> - Gets or sets the
+          <classname>IDbProvider</classname> instance to use.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>DataReaderWrapperType</literal> - Gets or set the
+          System.Type to use to create an instance of
+          <classname>IDataReaderWrapper</classname> for the purpose of
+          providing extended mapping functionality. Spring provides an
+          implementation to use as the basis for a mapping strategy that will
+          map <classname>DBNull</classname> values to default values based on
+          the standard <classname>IDataReader</classname> interface. See the
+          section <link linkend="ado-dbnull">custom IDataReader
+          implementations</link> for more information.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>CommandTimeout</literal> - Gets or sets the command
+          timeout for IDbCommands that this <classname>AdoTemplate</classname>
+          executes. Default is 0, indicating to use the database provider's
+          default.</para>
+        </listitem>
+      </itemizedlist>
+    </sect2>
+  </sect1>
+
+  <sect1 id="ado-transaction-management">
+    <title>Transaction Management</title>
+
+    <para>The AdoTemplate is used in conjunction with an implementation of a
+    <classname>IPlatformTransactionManager</classname>, which is Spring's
+    portable transaction management API. This section gives a brief overview
+    of the transaction managers you can use with AdoTemplate and the details
+    of how you can retrieve the connection/transaction ADO.NET objects that
+    are bound to the thread when a transaction starts. Please refer to the
+    section <link linkend="key-abstractions">key abstractions</link> in the
+    chapter on transactions for more comprehensive introduction to transaction
+    management.</para>
+
+    <para>To use local transactions, those with only one transactional
+    resource (i.e. the database) you will typically use
+    <classname>AdoPlatformTransactionManager</classname>. If you need to mix
+    Hibernate and ADO.NET data access operations within the same local
+    transaction you should use
+    <classname>HibernatePlatformTransaction</classname> manager which is
+    described more in the section on <link linkend="orm-tx-mgmt">ORM
+    transaction management</link>.</para>
+
+    <para>While it is most common to use Spring's <link
+    linkend="transaction">transaction management features</link> to avoid the
+    low level management of ADO.NET connection and transaction objects, you
+    can retrieve the connection/transaction pair that was created at the start
+    of a transaction and bound to the current thread. This may be useful for
+    some integration with other data access APIs. The can be done using the
+    utility class ConnectionUtils as shown below.</para>
+
+    <programlisting>IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.SqlClient");
+ConnectionTxPair connectionTxPairToUse = ConnectionUtils.GetConnectionTxPair(dbProvider);
+
+
+IDbCommand command = DbProvider.CreateCommand();
+command.Connection = connectionTxPairToUse.Connection;
+command.Transaction = connectionTxPairToUse.Transaction;</programlisting>
+
+    <para>It is possible to provide a wrapper around the standard .NET
+    provider interfaces such that you can use the plain ADO.NET API in
+    conjunction with Spring's transaction management features.</para>
+
+    <para>If you are using
+    <classname>ServiceDomainPlatformTransactionManager</classname> or
+    <classname>TxScopePlatformTransactionManager</classname> then you can
+    retrieve the currently executing transaction object via the standard .NET
+    APIs.</para>
+  </sect1>
+
+  <sect1 id="ado-exception-translation">
+    <title>Exception Translation</title>
+
+    <para>AdoTemplate's methods throw exceptions within a Data Access Object
+    (DAO) exception hierarchy described in <xref linkend="dao" />. In
+    addition, the command text and error code of the exception are extracted
+    and logged. This leads to easier to write provider independent exception
+    handling layer since the exceptions thrown are not tied to a specific
+    persistence technology. Additionally, for ADO.NET code the error messages
+    logged provide information on the SQL and error code to better help
+    diagnose the issue.</para>
+  </sect1>
+
+  <sect1 id="ado-parameter-management">
+    <title>Parameter Management</title>
+
+    <para>A fair amount of the code in ADO.NET applications is related to the
+    creation and population of parameters. The BCL parameter interfaces are
+    very minimal and do not have many convenience methods found in provider
+    implementations such as SqlClient. Even still, with SqlClient, there is a
+    fair amount of verbosity to creating and populating a parameter
+    collection. Spring provides two ways to make this mundane task easier and
+    more portable across providers.</para>
+
+    <sect2 id="ado-idbparametersbuilder">
+      <title>IDbParametersBuilder</title>
+
+      <para>Instead of creating a parameter on one line of code, then setting
+      its type on another and size on another, a builder and parameter
+      interface, <interfacename>IDbParametersBuilder</interfacename> and
+      <interfacename>IDbParameter</interfacename> respectfully, are provided
+      so that this declaration process can be condensed. The IDbParameter
+      support chaining calls to its methods, in effect a simple
+      language-constrained domain specific language, to be fancy about it.
+      Here is an example of it in use.</para>
+
+      <programlisting>IDbParametersBuilder builder = CreateDbParametersBuilder();
+builder.Create().Name("Country").Type(DbType.String).Size(15).Value(country);
+builder.Create().Name("City").Type(DbType.String).Size(15).Value(city);
+
+
+// now get the IDbParameters collection for use in passing to AdoTemplate methods.
+
+
+IDbParameters parameters = builder.GetParameters();</programlisting>
+
+      <para>Please note that <classname>IDbParameters</classname> and
+      <classname>IDbParameter</classname> are not part of the BCL, but part of
+      the Spring.Data.Common namespace. The IDbParameters collection is a
+      frequent argument to the overloaded methods of AdoTemplate.</para>
+
+      <para>The parameter prefix, i.e. '@' in Sql Server, is not required to
+      be added to the parameter name. The DbProvider is aware of this metadata
+      and AdoTemplate will add it automatically if required before
+      execution.</para>
+
+      <para>An additional feature of the IDbParametersBuilder is to create a
+      Spring FactoryObject that creates IDbParameters for use in the XML
+      configuration file of the IoC container. By leveraging Spring's
+      expression evaluation language, the above lines of code can be taken as
+      text from the XML configuration file and executed. As a result you can
+      externalize your parameter definitions from your code. In combination
+      with abstract object definitions and importing of configuration files
+      your increase the chances of having one code base support multiple
+      database providers just by a change in configuration files.</para>
+    </sect2>
+
+    <sect2 id="ado-idbparameters">
+      <title>IDbParameters</title>
+
+      <para>This class is similar to the parameter collection class you find
+      in provider specific implementations of IDataParameterCollection. It
+      contains a variety of convenience methods to build up a collection of
+      parameters.</para>
+
+      <para>Here is an abbreviated listing of the common convenience
+      methods.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>int Add(object parameterValue)</para>
+        </listitem>
+
+        <listitem>
+          <para>void AddRange(Array values)</para>
+        </listitem>
+
+        <listitem>
+          <para>IDbDataParameter AddWithValue(string name, object
+          parameterValue)</para>
+        </listitem>
+
+        <listitem>
+          <para>IDbDataParameter Add(string name, Enum parameterType)</para>
+        </listitem>
+
+        <listitem>
+          <para>IDbDataParameter AddOut(string name, Enum
+          parameterType)</para>
+        </listitem>
+
+        <listitem>
+          <para>IDbDataParameter AddReturn(string name, Enum
+          parameterType)</para>
+        </listitem>
+
+        <listitem>
+          <para>void DeriveParameters(string storedProcedureName)</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Here a simple usage example</para>
+
+      <programlisting>// inside method has has local variable country and city...
+
+IDbParameters parameters = CreateDbParameters();
+parameters.AddWithValue("Country", country).DbType = DbType.String;
+parameters.Add("City", DbType.String).Value = city;
+
+
+// now pass on to AdoTemplate methods.</programlisting>
+
+      <para>The parameter prefix, i.e. '@' in Sql Server, is not required to
+      be added to the parameter name. The DbProvider is aware of this metadata
+      and AdoTemplate will add it automatically if required before
+      execution.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="ado-dbnull">
+    <title>Custom IDataReader implementations</title>
+
+    <para>The passed in implementation of <classname>IDataReader</classname>
+    can be customized. This lets you add a strategy for handling null values
+    to the standard methods in the <classname>IDataReader</classname>
+    interface or to provide sub-interface of IDataReader that contains
+    extended functionality, for example support for default values. In
+    callback code, i.e. IRowMapper and associated delegate, you would downcast
+    to the sub-interface to perform processing.</para>
+
+    <para>Spring provides a class to map <literal>DBNull</literal> values to
+    default values. When reading from a IDataReader there is often the need to
+    map <classname>DBNull</classname> values to some default values, i.e. null
+    or say a magic number such as -1. This is usually done via a ternary
+    operator which decreases readability and also increases the likelihood of
+    mistakes. Spring provides an
+    <interfacename>IDataReaderWrapper</interfacename> interface (which
+    inherits from the standard <interfacename>IDataReader</interfacename>) so
+    that you can provide your own implementation of a IDataReader that will
+    perform DBNull mapping for you in a consistent and non invasive manner to
+    your result set reading code. A default implementation,
+    <classname>NullMappingDataReader</classname> is provided which you can
+    subclass to customize or simply implement the
+    <interfacename>IDataReaderWrapper</interfacename> interface directly. This
+    interface is shown below</para>
+
+    <programlisting>	public interface IDataReaderWrapper : IDataReader
+	{
+	    IDataReader WrappedReader
+	    {
+	        get;
+	        set;
+	    }
+	    
+	}</programlisting>
+
+    <para>All of AdoTemplates callback interfaces/delegates that have an
+    <interfacename>IDataReader</interfacename> as an argument are wrapped with
+    a <interfacename>IDataReaderWrapper</interfacename> if the AdoTemplate has
+    been configured with one via its
+    <methodname>DataReaderWrapperType</methodname> property. Your
+    implementation should support a zero-arg constructor.</para>
+
+    <para>Frequently you will use a common mapper for DBNull across your
+    application so only one instance of <classname>AdoTemplate</classname> and
+    <classname>IDataReaderWrapper</classname> in required. If you need to use
+    multiple null mapping strategies you will need to create multiple
+    instances of <classname>AdoTemplate</classname> and configure them
+    appropriately in the DAO objects.</para>
+  </sect1>
+
+  <sect1 id="ado-basic-operations">
+    <title>Basic data access operations</title>
+
+    <para>The 'ExecuteNonQuery' and 'ExecuteScalar' methods of
+    <classname>AdoTemplate</classname> have the same functionality as the same
+    named methods on the DbCommand object</para>
+
+    <sect2 id="ado-executenonquery">
+      <title>ExecuteNonQuery</title>
+
+      <para>ExecuteNonQuery is used to perform create, update, and delete
+      operations. It has four overloads listed below reflecting different ways
+      to set the parameters.</para>
+
+      <para>An example of using this method is shown below</para>
+
+      <para><programlisting>        public void CreateCredit(float creditAmount)
+        {
+            AdoTemplate.ExecuteNonQuery(CommandType.Text,
+                    String.Format("insert into Credits(creditAmount) VALUES ({0})",
+                    creditAmount));
+        }</programlisting></para>
+    </sect2>
+
+    <sect2 id="ado-executescalar">
+      <title>ExecuteScalar</title>
+
+      <para>An example of using this method is shown below</para>
+
+      <para><programlisting>int iCount = (int)adoTemplate.ExecuteScalar(CommandType.Text, "SELECT COUNT(*) FROM TestObjects");
+                </programlisting></para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="ado-lightweight-orm">
+    <title>Queries and Lightweight Object Mapping</title>
+
+    <para>A common ADO.NET development task is reading in a result set and
+    converting it to a collection of domain objects. The family of QueryWith
+    methods on AdoTemplate help in this task. The responsibility of performing
+    the mapping is given to one of three callback interfaces/delegates that
+    you are responsible for developing. These callback interfaces/delegates
+    are:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>IResultSetExtractor / ResultSetExtractorDelegate - hands you a
+        IDataReader object for you to iterate over and return a result
+        object.</para>
+      </listitem>
+
+      <listitem>
+        <para>IRowCallback / RowCallbackDelegate - hands you a IDataReader to
+        process the current row. Returns void and as such is usually stateful
+        in the case of IRowCallback implementations or uses a variable to
+        collect a result that is available to an anonymous delegate.</para>
+      </listitem>
+
+      <listitem>
+        <para>IRowMapper / RowMapperDelegate - hands you a IDataReader to
+        process the current row and return an object corresponding to that
+        row.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>There are generic versions of the IResultSetExtractor and IRowMapper
+    interfaces/delegates providing you with additional type-safety as compared
+    to the object based method signatures used in the .NET 1.1
+    implementation.</para>
+
+    <para>As usual with callback APIs in Spring.Data, your implementations of
+    these interfaces/delegates are only concerned with the core task at hand -
+    mapping data - while the framework handles iteration of readers and
+    resource management.</para>
+
+    <para>Each 'QueryWith' method has 4 overloads to handle common ways to
+    bind parameters to the command text.</para>
+
+    <para>The following sections describe in more detail how to use Spring's
+    lightweight object mapping framework.</para>
+
+    <sect2 id="ado-resultsetextractor">
+      <title>ResultSetExtractor</title>
+
+      <para>The ResultSetExtractor gives you control to iterate over the
+      IDataReader returned from the query. You are responsible for iterating
+      through all the result sets and returning a corresponding result object.
+      Implementations of IResultSetExtractor are typically stateless and
+      therefore reusable as long as the implementation doesn't access stateful
+      resources. The framework will close the IDataReader for you.</para>
+
+      <para>The interface and delegate signature for ResutSetExtractors is
+      shown below for the generic version in the Spring.Data.Generic
+      namespace</para>
+
+      <programlisting>public interface IResultSetExtractor&lt;T&gt;
+{
+  T ExtractData(IDataReader reader);
+}
+
+public delegate T ResultSetExtractorDelegate&lt;T&gt;(IDataReader reader);
+</programlisting>
+
+      <para>The definition for the non-generic version is shown below</para>
+
+      <programlisting>public interface IResultSetExtractor
+{
+    object ExtractData(IDataReader reader);
+}
+
+public delegate object ResultSetExtractorDelegate(IDataReader reader);</programlisting>
+
+      <para>Here is an example taken from the Spring.DataQuickStart. It is a
+      method in a DAO class that inherits from AdoDaoSupport, which has a
+      convenience method 'CreateDbParametersBuilder()'.</para>
+
+      <para></para>
+
+      <programlisting>        public virtual IList&lt;string&gt; GetCustomerNameByCountryAndCityWithParamsBuilder(string country, string city)
+        {
+
+            IDbParametersBuilder builder = CreateDbParametersBuilder();
+            builder.Create().Name("Country").Type(DbType.String).Size(15).Value(country);
+            builder.Create().Name("City").Type(DbType.String).Size(15).Value(city);
+            return AdoTemplate.QueryWithResultSetExtractor(CommandType.Text,
+                                                           customerByCountryAndCityCommandText,
+                                                           new CustomerNameResultSetExtractor&lt;List&lt;string&gt;&gt;(),
+                                                           builder.GetParameters());
+        }
+        </programlisting>
+
+      <para>The implementation of the ResultSetExtractor is shown
+      below.</para>
+
+      <programlisting>    internal class CustomerNameResultSetExtractor&lt;T&gt; : IResultSetExtractor&lt;T&gt; where T : IList&lt;string&gt;, new()
+    {
+
+        public T ExtractData(IDataReader reader)
+        {
+            T customerList = new T();
+            while (reader.Read())
+            {
+                string contactName = reader.GetString(0);
+                customerList.Add(contactName);
+            }
+            return customerList;
+        }
+    }</programlisting>
+
+      <para>Internally the implementation of the QueryWithRowCallback and
+      QueryWithRowMapper methods are specializations of the general
+      ResultSetExtractor. For example, the QueryWithRowMapper implementation
+      iterates through the result set, calling the callback method 'MapRow'
+      for each row and collecting the results in an IList. If you have a
+      specific case that is not covered by the QueryWithXXX methods you can
+      subclass AdoTemplate and follow the same implementation pattern to
+      create a new QueryWithXXX method to suit your needs.</para>
+    </sect2>
+
+    <sect2 id="ado-rowcallback">
+      <title>RowCallback</title>
+
+      <para>The RowCallback is usually a stateful object itself or populates
+      another stateful object that is accessible to the calling code. Here is
+      a sample take from the Data QuickStart</para>
+
+      <programlisting>    public class RowCallbackDao : AdoDaoSupport
+    {
+        private string cmdText = "select ContactName, PostalCode from Customers";
+
+        public virtual IDictionary&lt;string, IList&lt;string&gt;&gt; GetPostalCodeCustomerMapping()
+        {
+            PostalCodeRowCallback statefullCallback = new PostalCodeRowCallback();
+            AdoTemplate.QueryWithRowCallback(CommandType.Text, cmdText,
+                                             statefullCallback);
+
+            // Do something with results in stateful callback...
+            return statefullCallback.PostalCodeMultimap;
+        }
+             
+    }</programlisting>
+
+      <para>The PostalCodeRowCallback builds up state which is then retrieved
+      via the property PostalCodeMultimap. The Callback implementation is
+      shown below</para>
+
+      <programlisting>    internal class PostalCodeRowCallback : IRowCallback
+    {
+        private IDictionary&lt;string, IList&lt;string&gt;&gt; postalCodeMultimap =
+            new Dictionary&lt;string, IList&lt;string&gt;&gt;();
+
+        public IDictionary&lt;string, IList&lt;string&gt;&gt; PostalCodeMultimap
+        {
+            get { return postalCodeMultimap; }
+        }
+
+        public void ProcessRow(IDataReader reader)
+        {
+            string contactName = reader.GetString(0);
+            string postalCode = reader.GetString(1);
+            IList&lt;string&gt; contactNameList;
+            if (postalCodeMultimap.ContainsKey(postalCode))
+            {
+                contactNameList = postalCodeMultimap[postalCode];
+            }
+            else
+            {
+                postalCodeMultimap.Add(postalCode, contactNameList = new List&lt;string&gt;());
+            }
+            contactNameList.Add(contactName);
+        }
+    }</programlisting>
+    </sect2>
+
+    <sect2 id="ado-rowmapper">
+      <title>RowMapper</title>
+
+      <para>The RowMapper lets you focus on just the logic to map a row of
+      your result set to an object. The creation of a IList to store the
+      results and iterating through the IDataReader is handled by the
+      framework. Here is a simple example taken from the Data QuickStart
+      application</para>
+
+      <programlisting>    public class RowMapperDao : AdoDaoSupport
+    {
+        private string cmdText = "select Address, City, CompanyName, ContactName, " +
+                             "ContactTitle, Country, Fax, CustomerID, Phone, PostalCode, " +
+                             "Region from Customers";
+
+
+        public virtual IList&lt;Customer&gt; GetCustomers()
+        {
+            return AdoTemplate.QueryWithRowMapper&lt;Customer&gt;(CommandType.Text, cmdText,
+                                                  new CustomerRowMapper&lt;Customer&gt;());
+        }
+    }</programlisting>
+
+      <para>where the implementation of the RowMapper is</para>
+
+      <programlisting>    public class CustomerRowMapper&lt;T&gt; : IRowMapper&lt;T&gt; where T : Customer, new()
+    {        
+        public T MapRow(IDataReader dataReader, int rowNum)
+        {
+            T customer = new T();
+            customer.Address = dataReader.GetString(0);
+            customer.City = dataReader.GetString(1);
+            customer.CompanyName = dataReader.GetString(2);
+            customer.ContactName = dataReader.GetString(3);
+            customer.ContactTitle = dataReader.GetString(4);
+            customer.Country = dataReader.GetString(5);
+            customer.Fax = dataReader.GetString(6);
+            customer.Id = dataReader.GetString(7);
+            customer.Phone = dataReader.GetString(8);
+            customer.PostalCode = dataReader.GetString(9);
+            customer.Region = dataReader.GetString(10);
+            return customer;
+        }
+    }</programlisting>
+
+      <para>You may also pass in a delegate, which is particularly convenient
+      if the mapping logic is short and you need to access local variables
+      within the mapping logic.</para>
+
+      <programlisting>        public virtual IList&lt;Customer&gt; GetCustomersWithDelegate()
+        {
+            return AdoTemplate.QueryWithRowMapperDelegate&lt;Customer&gt;(CommandType.Text, cmdText,
+                        delegate(IDataReader dataReader, int rowNum)
+                            {
+                                Customer customer = new Customer();
+                                customer.Address = dataReader.GetString(0);
+                                customer.City = dataReader.GetString(1);
+                                customer.CompanyName = dataReader.GetString(2);
+                                customer.ContactName = dataReader.GetString(3);
+                                customer.ContactTitle = dataReader.GetString(4);
+                                customer.Country = dataReader.GetString(5);
+                                customer.Fax = dataReader.GetString(6);
+                                customer.Id = dataReader.GetString(7);
+                                customer.Phone = dataReader.GetString(8);
+                                customer.PostalCode = dataReader.GetString(9);
+                                customer.Region = dataReader.GetString(10);
+                                return customer;
+                            });
+        }</programlisting>
+    </sect2>
+
+    <sect2 id="ado-query-for-single-object">
+      <title>Query for a single object</title>
+
+      <para>The QueryForObject method is used when you expect there to be
+      exactly one object returned from the mapping, otherwise a
+      Spring.Dao.IncorrectResultSizeDataAccessException will be thrown. Here
+      is some sample usage taken from the Data QuickStart.</para>
+
+      <programlisting>    public class QueryForObjectDao : AdoDaoSupport
+    {
+        private string cmdText = "select Address, City, CompanyName, ContactName, " +
+                     "ContactTitle, Country, Fax, CustomerID, Phone, PostalCode, " +
+                     "Region from Customers where ContactName = @ContactName";
+        
+        public Customer GetCustomer(string contactName)
+        {
+            return AdoTemplate.QueryForObject(CommandType.Text, cmdText, 
+                                              new CustomerRowMapper&lt;Customer&gt;(),
+                                              "ContactName", DbType.String, 30, contactName);
+        }
+    }</programlisting>
+    </sect2>
+
+    <sect2 id="ado-queyr-commandcreator">
+      <title>Query using a CommandCreator</title>
+
+      <para>There is a family of overloaded methods that allows you to
+      encapsulate and reuse a particular configuration of a
+      <classname>IDbCommand</classname> object. These methods also allow for
+      access to returned out parameters as well as a method that allows
+      processing of multiple result sets. These methods are used internally to
+      support the classes in the <package>Spring.Data.Objects</package>
+      namespace and you may find the API used in that namespace to be more
+      convenient. The family of methods is listed below.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>object QueryWithCommandCreator(IDbCommandCreator cc,
+          IResultSetExtractor rse)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>void QueryWithCommandCreator(IDbCommandCreator cc,
+          IRowCallback rowCallback)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IList QueryWithCommandCreator(IDbCommandCreator cc,
+          IRowMapper rowMapper)</literal></para>
+        </listitem>
+      </itemizedlist>
+
+      <para>There is also the same methods with an additional collecting
+      parameter to obtain any output parameters. These are</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>object QueryWithCommandCreator(IDbCommandCreator cc,
+          IResultSetExtractor rse, IDictionary
+          returnedParameters)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>void QueryWithCommandCreator(IDbCommandCreator cc,
+          IRowCallback rowCallback, IDictionary
+          returnedParameters)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IList QueryWithCommandCreator(IDbCommandCreator cc,
+          IRowMapper rowMapper, IDictionary
+          returnedParameters)</literal></para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The IDbCommandCreator callback interface is shown below</para>
+
+      <programlisting>	public interface IDbCommandCreator 
+	{
+	    IDbCommand CreateDbCommand();
+	}</programlisting>
+
+      <para>The created IDbCommand object is used when performing the
+      QueryWithCommandCreator method.</para>
+
+      <para>To process multiple result sets specify a list of named result set
+      processors,( i.e. <classname>IResultSetExtractor</classname>,
+      <classname>IRowCallback</classname>, or <classname>IRowMapper).
+      </classname>This method is shown below</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>IDictionary QueryWithCommandCreator(IDbCommandCreator
+          cc, IList namedResultSetProcessors)</literal></para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The list must contain objects of the type
+      <classname>Spring.Data.Support.NamedResultSetProcessor</classname>. This
+      is the class responsible for associating a name with a result set
+      processor. The constructors are listed below.</para>
+
+      <programlisting>public class NamedResultSetProcessor  {
+  
+  public NamedResultSetProcessor(string name, IRowMapper rowMapper) { ... }
+
+  public NamedResultSetProcessor(string name, IRowCallback rowcallback)  { ... } 
+
+  public NamedResultSetProcessor(string name, IResultSetExtractor resultSetExtractor) { ... }
+
+  . . . 
+
+}</programlisting>
+
+      <para>The results of the RowMapper or ResultSetExtractor are retrieved
+      by name from the dictionary that is returned. RowCallbacks, being
+      stateless, only have the placeholder text, "ResultSet returned was
+      processed by an IRowCallback" as a value for the name of the RowCallback
+      used as a key. Output and InputOutput parameters can be retrieved by
+      name. If this parameter name is null, then the index of the parameter
+      prefixed with the letter 'P' is a key name, i.e P2, P3, etc.</para>
+
+      <para>The namespace Spring.Data.Objects.Generic contains generic
+      versions of these methods. These are listed below</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>T QueryWithCommandCreator&lt;T&gt;(IDbCommandCreator
+          cc, IResultSetExtractor&lt;T&gt; rse)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IList&lt;T&gt;
+          QueryWithCommandCreator&lt;T&gt;(IDbCommandCreator cc,
+          IRowMapper&lt;T&gt; rowMapper)</literal></para>
+        </listitem>
+      </itemizedlist>
+
+      <para>and overloads that have an additional collecting parameter to
+      obtain any output parameters.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>T QueryWithCommandCreator&lt;T&gt;(IDbCommandCreator
+          cc, IResultSetExtractor&lt;T&gt; rse, IDictionary
+          returnedParameters)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IList&lt;T&gt;
+          QueryWithCommandCreator&lt;T&gt;(IDbCommandCreator cc,
+          IRowMapper&lt;T&gt; rowMapper, IDictionary
+          returnedParameters)</literal></para>
+        </listitem>
+      </itemizedlist>
+
+      <para>When processing multiple result sets you can specify up to two
+      type safe result set processors.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>IDictionary
+          QueryWithCommandCreator&lt;T&gt;(IDbCommandCreator cc, IList
+          namedResultSetProcessors)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IDictionary
+          QueryWithCommandCreator&lt;T,U&gt;(IDbCommandCreator cc, IList
+          namedResultSetProcessors)</literal></para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The list of result set processors contains either objects of the
+      type Spring.Data.Generic.NamedResultSetProcessor&lt;T&gt; or
+      Spring.Data.NamedResultSetProcessor. The generic result set processors,
+      NamedResultSetProcessor&lt;T&gt;, is used to process the first result
+      set in the case of using QueryWithCommandCreator&lt;T&gt; and to process
+      the first and second result set in the case of using
+      QueryWithCommandCreator&lt;T,U&gt;. Additional
+      Spring.Data.NamedResultSetProcessors that are listed can be used to
+      process additional result sets. If you specify a RowCallback with
+      NamedResultSetProcessor&lt;T&gt;, you still need to specify a type
+      parameter (say string) because the RowCallback processor does not return
+      any object. It is up to subclasses of RowCallback to collect state due
+      to processing the result set which is later queried.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="ado-datatable-dataset">
+    <title>DataTable and DataSet</title>
+
+    <para>AdoTemplate contains several 'families' of methods to help remove
+    boilerplate code and reduce common programming errors when using
+    DataTables and DataSets. There are many methods in AdoTemplate so it is
+    easy to feel a bit overwhelmed when taking a look at the SDK
+    documentation. However, after a while you will hopefully find the class
+    'easy to navigate' with intellisense. Here is a quick categorization of
+    the method names and their associated data access operation. Each method
+    is overloaded to handle common cases of passing in parameter
+    values.</para>
+
+    <para>The 'catch-all' Execute methods upon which other functionality is
+    built up upon are shown below.</para>
+
+    <para>In <property>Spring.Data.Core.AdoTemplate</property></para>
+
+    <itemizedlist>
+      <listitem>
+        <para><literal>object Execute(IDataAdapterCallback
+        dataAdapterCallback)</literal> - Execute ADO.NET operations on a
+        IDbDataAdapter object using an interface based callback.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Where <classname>IDataAdapterCallback</classname> is defined
+    as</para>
+
+    <programlisting>public interface IDataAdapterCallback 
+{
+    object DoInDataAdapter(IDbDataAdapter dataAdapter);
+}</programlisting>
+
+    <para>The passed in <classname>IDbDataAdapter</classname> will have its
+    <property>SelectCommand</property> property created and set with its
+    <property>Connection</property> and <property>Transaction</property>
+    values based on the calling transaction context. The return value is the
+    result of processing or null.</para>
+
+    <para>There are type-safe versions of this method in
+    <classname>Spring.Data.Generic.AdoTemplate</classname></para>
+
+    <itemizedlist>
+      <listitem>
+        <para><literal>T Execute&lt;T&gt;(IDataAdapterCallback&lt;T&gt;
+        dataAdapterCallback) </literal>- Execute ADO.NET operations on a
+        IDbDataAdapter object using an interface based callback.</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>T Execute&lt;T&gt;(DataAdapterDelegate&lt;T&gt; del)
+        </literal>- Execute ADO.NET operations on a IDbDataAdapter object
+        using an delegate based callback.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Where IDataAdapterCallback&lt;T&gt; and DataAdapterDelegate&lt;T&gt;
+    are defined as</para>
+
+    <programlisting>public interface IDataAdapterCallback&lt;T&gt;
+{
+    T DoInDataAdapter(IDbDataAdapter dataAdapter);
+}
+
+public delegate T DataAdapterDelegate&lt;T&gt;(IDbDataAdapter dataAdapter);</programlisting>
+
+    <sect2 id="ado-datatable">
+      <title>DataTables</title>
+
+      <para>DataTable operations are available on the class
+      <classname>Spring.Data.Core.AdoTemplate</classname>. If you are using
+      the generic version,
+      <classname>Spring.Data.Generic.AdoTemplate</classname>, you can access
+      these methods through the property
+      <property>ClassicAdoTemplate</property>, which returns the non-generic
+      version of AdoTemplate. DataTable operations available fall into the
+      general family of methods with 3-5 overloads per method.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><methodname>DataTableCreate</methodname> - Create and Fill
+          DataTables</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataTableCreateWithParameters</methodname> -
+          Create and Fill DataTables using a parameter collection.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataTableFill</methodname> - Fill a pre-existing
+          DataTable.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataTableFillWithParameters</methodname> - Fill a
+          pre-existing DataTable using a parameter collection.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataTableUpdate</methodname> - Update the database
+          using the provided DataTable, insert, update, delete SQL.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataTableUpdateWithCommandBuilder</methodname> -
+          Update the database using the provided DataTable, select SQL, and
+          parameters.</para>
+        </listitem>
+      </itemizedlist>
+    </sect2>
+
+    <sect2 id="ado-dataset">
+      <title>DataSets</title>
+
+      <para>DataSet operations are available on the class
+      <classname>Spring.Data.Core.AdoTemplate</classname>. If you are using
+      the generic version,
+      <classname>Spring.Data.Generic.AdoTemplate</classname>, you can access
+      these methods through the property
+      <property>ClassicAdoTemplate</property>, which returns the non-generic
+      version of AdoTemplate. DataSet operations available fall into the
+      following family of methods with 3-5 overloads per method.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><methodname>DataSetCreate</methodname> - Create and Fill
+          DataSets</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataSetCreateWithParameters</methodname> - Create
+          and Fill DataTables using a parameter collection.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataSetFill</methodname> - Fill a pre-existing
+          DataSet</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataSetFillWithParameters</methodname> - Fill a
+          pre-existing DataTable using parameter collection.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataSetUpdate</methodname> - Update the database
+          using the provided DataSet, insert, update, delete SQL.</para>
+        </listitem>
+
+        <listitem>
+          <para><methodname>DataSetUpdateWithCommandBuilder</methodname> -
+          Update the database using the provided DataSet, select SQL, and
+          parameters.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The following code snippets demonstrate the basic functionality of
+      these methods using the Northwind database. See the SDK documentation
+      for more details on other overloaded methods.</para>
+
+      <para><programlisting>public class DataSetDemo : AdoDaoSupport
+{
+  private string selectAll = @"select Address, City, CompanyName, ContactName, " +
+                              "ContactTitle, Country, Fax, CustomerID, Phone, PostalCode, " +
+                              "Region from Customers";
+
+
+  public void DemoDataSetCreate()
+  {
+    DataSet customerDataSet = AdoTemplate.DataSetCreate(CommandType.Text, selectAll);
+
+    // customerDataSet has a table named 'Table' with 91 rows
+
+    customerDataSet = AdoTemplate.DataSetCreate(CommandType.Text, selectAll, new string[] { "Customers" });
+
+    // customerDataSet has a table named 'Customers' with 91 rows
+
+}
+
+
+  public void DemoDataSetCreateWithParameters()
+  {
+    string selectLike = @"select Address, City, CompanyName, ContactName, " +
+                         "ContactTitle, Country, Fax, CustomerID, Phone, PostalCode, " +
+                         "Region from Customers where ContactName like @ContactName";
+
+    DbParameters dbParameters = CreateDbParameters();
+    dbParameters.Add("ContactName", DbType.String).Value = "M%';
+    DataSet customerLikeMDataSet = AdoTemplate.DataSetCreateWithParams(CommandType.Text, selectLike, dbParameters);
+
+   // customerLikeMDataSet has a table named 'Table' with 12 rows
+  }
+
+  public void DemoDataSetFill()
+  {
+    DataSet dataSet = new DataSet();
+    dataSet.Locale = CultureInfo.InvariantCulture;
+    AdoTemplate.DataSetFill(dataSet, CommandType.Text, selectAll);
+  }</programlisting>Updating a DataSet can be done using a CommandBuilder,
+      automatically created from the specified select command and select
+      parameters, or by explicitly specifying the insert, update, delete
+      commands and parameters. Below is an example, refer to the SDK
+      documentation for additional overloads</para>
+
+      <programlisting>public class DataSetDemo : AdoDaoSupport
+{
+  private string selectAll = @"select Address, City, CompanyName, ContactName, " +
+                              "ContactTitle, Country, Fax, CustomerID, Phone, PostalCode, " +
+                              "Region from Customers";
+
+  public void DemoDataSetUpdateWithCommandBuilder()
+  {
+    DataSet dataSet = new DataSet();
+    dataSet.Locale = CultureInfo.InvariantCulture;
+    AdoTemplate.DataSetFill(dataSet, CommandType.Text, selectAll, new string[]{ "Customers" } );
+
+    AddAndEditRow(dataSet);.
+
+    AdoTemplate.DataSetUpdateWithCommandBuilder(dataSet, CommandType.Text, selectAll, null, "Customers");
+  }
+
+  public void DemoDataSetUpdateWithoutCommandBuilder()
+  {
+    DataSet dataSet = new DataSet();
+    dataSet.Locale = CultureInfo.InvariantCulture;
+    AdoTemplate.DataSetFill(dataSet, CommandType.Text, selectAll, new string[]{ "Customers" } );
+
+    AddAndEditRow(dataSet);.
+
+    string insertSql = @"INSERT Customers (CustomerID, CompanyName) VALUES (@CustomerId, @CompanyName)";
+    IDbParameters insertParams = CreateDbParameters();
+    insertParams.Add("CustomerId", DbType.String, 0, "CustomerId");   //.Value = "NewID";
+    insertParams.Add("CompanyName", DbType.String, 0, "CompanyName"); //.Value = "New Company Name";
+
+    string updateSql = @"update Customers SET Phone=@Phone where CustomerId = @CustomerId";                
+    IDbParameters updateParams = CreateDbParameters();
+    updateParams.Add("Phone", DbType.String, 0, "Phone");//.Value = "030-0074322"; // simple change, last digit changed from 1 to 2.
+    updateParams.Add("CustomerId", DbType.String, 0, "CustomerId");//.Value = "ALFKI";
+
+    AdoTemplate.DataSetUpdate(dataSet, "Customers",
+                                        CommandType.Text, insertSql, insertParams,
+                                        CommandType.Text, updateSql, updateParams,
+                                        CommandType.Text, null , null);
+  }
+
+  private static void AddAndEditRow(DataSet dataSet)
+  {
+    DataRow dataRow = dataSet.Tables["Customers"].NewRow();
+    dataRow["CustomerId"] = "NewID";
+    dataRow["CompanyName"] = "New Company Name";
+    dataRow["ContactName"] = "New Name";
+    dataRow["ContactTitle"] = "New Contact Title";
+    dataRow["Address"] = "New Address";
+    dataRow["City"] = "New City";
+    dataRow["Region"] = "NR";
+    dataRow["PostalCode"] = "New Code";
+    dataRow["Country"] = "New Country";
+    dataRow["Phone"] = "New Phone";
+    dataRow["Fax"] = "New Fax";
+    dataSet.Tables["Customers"].Rows.Add(dataRow);
+
+    DataRow alfkiDataRow = dataSet.Tables["Customers"].Rows[0];
+    alfkiDataRow["Phone"] = "030-0074322"; // simple change, last digit changed from 1 to 2.
+  }
+}</programlisting>
+
+      <para>In the case of needing to set parameter SourceColumn or
+      SourceVersion properties it may be more convenient to use
+      IDbParameterBuilder.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="ado-tableadapter-tx">
+    <title>TableAdapters and participation in transactional context</title>
+
+    <para>Typed DataSets need to have commands in their internal DataAdapters
+    and command collections explicitly set with a connection/transaction in
+    order for them to correctly participate with a surrounding transactional
+    context. The reason for this is by default the code generated is
+    explicitly managing the connections and transactions. This issue is very
+    well described in the article <ulink
+    url="http://www.code-magazine.com/Article.aspx?quickid=0605031">System.Transactions
+    and ADO.NET 2.0</ulink> by ADO.NET guru Sahil Malik. Spring offers a
+    convenience method that will use reflection to internally set the
+    transaction on the table adapter's internal command collection to the
+    ambient transaction. This method on the class
+    <classname>Spring.Data.Support.TypedDataSetUtils</classname> and is named
+    <methodname>ApplyConnectionAndTx</methodname>. Here is sample usage of a
+    DAO method that uses a VS.NET 2005 generated typed dataset for a
+    PrintGroupMapping table.</para>
+
+    <programlisting>public PrintGroupMappingDataSet FindAll()
+{
+
+   PrintGroupMappingTableAdapter adapter = new PrintGroupMappingTableAdapter();
+   PrintGroupMappingDataSet printGroupMappingDataSet = new PrintGroupMappingDataSet();
+       
+       
+   printGroupMappingDataSet = AdoTemplate.Execute(delegate(IDbCommand command)
+                              {
+                                  TypedDataSetUtils.ApplyConnectionAndTx(adapter, command);
+                                  adapter.Fill(printGroupMappingDataSet.PrintGroupMapping);
+                                  
+                                  return printGroupMappingDataSet;
+                              }) 
+                              as PrintGroupMappingDataSet;
+
+   return printGroupMappingDataSet;
+}</programlisting>
+
+    <para>This DAO method may be combined with other DAO operations inside a
+    transactional context and they will all share the same
+    connection/transaction objects.</para>
+
+    <para>There are two overloads of the method ApplyConnectionAndTx which
+    differ in the second method argument, one takes an IDbCommand and the
+    other IDbProvider. These are listed below</para>
+
+    <programlisting>public static void ApplyConnectionAndTx(object typedDataSetAdapter, IDbCommand sourceCommand)
+
+public static void ApplyConnectionAndTx(object typedDataSetAdapter, IDbProvider dbProvider)</programlisting>
+
+    <para>The method that takes IDbCommand is a convenience if you will be
+    using AdoTemplate callback's as the passed in command object will already
+    have its connection and transaction properties set based on the current
+    transactional context. The method that takes an IDbProvider is convenient
+    to use when you have data access logic that is not contained within a
+    single callback method but is instead spead among multiple classes. In
+    this case passing the transactionally aware IDbCommand object can be
+    intrusive on the method signatures. Instead you can pass in an instance of
+    IDbProvider that can be obtained via standard dependency injection
+    techniques or via a service locator style lookup.</para>
+  </sect1>
+
+  <sect1 id="ado-objects">
+    <title>Database operations as Objects</title>
+
+    <para>The <literal>Spring.Data.Objects and Spring.Data.Objects.Generic
+    </literal>namespaces contains classes that allow one to access the
+    database in a more object-oriented manner. By way of an example, one can
+    execute queries and get the results back as a list containing business
+    objects with the relational column data mapped to the properties of the
+    business object. One can also execute stored procedures and run update,
+    delete and insert statements.</para>
+
+    <para><note>
+        <para>There is a view borne from experience acquired in the field
+        amongst some of the Spring developers that the various RDBMS operation
+        classes described below (with the exception of the <link
+        linkend="ado-storedproc">StoredProcedure</link> class) can often be
+        replaced with straight <classname>AdoTemplate</classname> calls...
+        often it is simpler to use and plain easier to read a DAO method that
+        simply calls a method on a <classname>AdoTemplate</classname> direct
+        (as opposed to encapsulating a query as a full-blown class).</para>
+
+        <para>It must be stressed however that this is just a
+        <emphasis>view</emphasis>... if you feel that you are getting
+        measurable value from using the RDBMS operation classes, feel free to
+        continue using these classes.</para>
+      </note></para>
+
+    <sect2 id="ado-adoquery">
+      <title>AdoQuery</title>
+
+      <para><classname>AdoQuery</classname> is a reusable, threadsafe class
+      that encapsulates an SQL query. Subclasses must implement the
+      <methodname>NewRowMapper(..)</methodname> method to provide a
+      <interfacename>IRowMapper</interfacename> instance that can create one
+      object per row obtained from iterating over the
+      <interfacename>IDataReader</interfacename> that is created during the
+      execution of the query. The <classname>AdoQuery</classname> class is
+      rarely used directly since the <classname>MappingAdoQuery</classname>
+      subclass provides a much more convenient implementation for mapping rows
+      to .NET classes. Another implementations that extends
+      <classname>AdoQuery</classname> is
+      <classname>MappingadoQueryWithParameters</classname> (See SDK docs for
+      details).</para>
+
+      <para>The <classname>AdoNonQuery</classname> class encapsulates an
+      IDbCommand 's ExecuteNonQuery method functionality. Like the
+      <classname>AdoQuery</classname> object, an
+      <classname>AdoNonQuery</classname> object is reusable, and like all
+      <classname>AdoOperation</classname> classes, an
+      <classname>AdoNonQuery</classname> can have parameters and is defined in
+      SQL. This class provides two execute methods</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>IDictionary ExecuteNonQuery(params object[]
+          inParameterValues)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IDictionary ExecuteNonQueryByNamedParam(IDictionary
+          inParams)</literal></para>
+        </listitem>
+      </itemizedlist>
+
+      <para>This class is concrete. Although it can be subclassed (for example
+      to add a custom update method) it can easily be parameterized by setting
+      SQL and declaring parameters.</para>
+
+      <para>An example of an AdoQuery subclass to encapsulate an insert
+      statement for a 'TestObject' (consisting only name and age columns) is
+      shown below</para>
+
+      <programlisting>public class CreateTestObjectNonQuery : AdoNonQuery
+{
+  private static string sql = "insert into TestObjects(Age,Name) values (@Age,@Name)";
+   
+  public CreateTestObjectNonQuery(IDbProvider dbProvider) : base(dbProvider, sql)
+  {
+    DeclaredParameters.Add("Age", DbType.Int32);
+    DeclaredParameters.Add("Name", SqlDbType.NVarChar, 16);
+    Compile();
+  }
+
+  public void Create(string name, int age)
+  {
+     ExecuteNonQuery(name, age);
+  }
+
+}</programlisting>
+    </sect2>
+
+    <sect2 id="ado-mappingadoquery">
+      <title>MappingAdoQuery</title>
+
+      <para><classname>MappingAdoQuery</classname> is a reusable query in
+      which concrete subclasses must implement the abstract
+      <methodname>MapRow(..)</methodname> method to convert each row of the
+      supplied <interfacename>IDataReader</interfacename> into an object. Find
+      below a brief example of a custom query that maps the data from a
+      relation to an instance of the <classname>Customer</classname>
+      class.</para>
+
+      <programlisting>public class TestObjectQuery : MappingAdoQuery
+{
+    private static string sql = "select TestObjectNo, Age, Name from TestObjects";
+        
+    public TestObjectQuery(IDbProvider dbProvider) 
+        : base(dbProvider, sql)
+    {           
+        CommandType = CommandType.Text;
+    }
+
+    protected override object MapRow(IDataReader reader, int num)
+    {
+        TestObject to = new TestObject();
+        to.ObjectNumber = reader.GetInt32(0);
+        to.Age = reader.GetInt32(1);
+        to.Name = reader.GetString(2);
+        return to;
+    }
+}</programlisting>
+    </sect2>
+
+    <sect2 id="ado-adononquery">
+      <title>AdoNonQuery</title>
+
+      <para>The <classname>AdoNonQuery</classname> class encapsulates an
+      IDbCommand 's ExecuteNonQuery method functionality. Like the
+      <classname>AdoQuery</classname> object, an
+      <classname>AdoNonQuery</classname> object is reusable, and like all
+      <classname>AdoOperation</classname> classes, an
+      <classname>AdoNonQuery</classname> can have parameters and is defined in
+      SQL. This class provides two execute methods</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>IDictionary ExecuteNonQuery(params object[]
+          inParameterValues)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IDictionary ExecuteNonQueryByNamedParam(IDictionary
+          inParams)</literal></para>
+        </listitem>
+      </itemizedlist>
+
+      <para>This class is concrete. Although it can be subclassed (for example
+      to add a custom update method) it can easily be parameterized by setting
+      SQL and declaring parameters.</para>
+
+      <programlisting>public class CreateTestObjectNonQuery : AdoNonQuery
+{
+  private static string sql = "insert into TestObjects(Age,Name) values (@Age,@Name)";
+   
+  public CreateTestObjectNonQuery(IDbProvider dbProvider) : base(dbProvider, sql)
+  {
+    DeclaredParameters.Add("Age", DbType.Int32);
+    DeclaredParameters.Add("Name", SqlDbType.NVarChar, 16);
+    Compile();
+  }
+
+  public void Create(string name, int age)
+  {
+    ExecuteNonQuery(name, age);
+  }
+
+}</programlisting>
+    </sect2>
+
+    <sect2 id="ado-stored-procedure">
+      <title id="ado-storedproc">Stored Procedure</title>
+
+      <para>The StoredProcedure class is designed to make it as simple as
+      possible to call a stored procedure. It takes advantage of metadata
+      present in the database to look up names of in and out parameters.. This
+      means that you don't have to explicitly declare parameters. You can of
+      course still declare them if you prefer. There are two versions of the
+      StoredProcedure class, one that uses generics and one that doesn't.
+      Using the StoredProcedure class consists of two steps, first defining
+      the in/out parameter and any object mappers and second executing the
+      stored procedure.</para>
+
+      <para>The non-generic version of StoredProcedure is in the namespace
+      Spring.Data.Objects. It contains the following methods to execute a
+      stored procedure</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>IDictionary ExecuteScalar(params object[]
+          inParameterValues)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IDictionary ExecuteScalarByNamedParam(IDictionary
+          inParams)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IDictionary ExecuteNonQuery(params object[]
+          inParameterValues)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IDictionary ExecuteNonQueryByNamedParam(IDictionary
+          inParams)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IDictionary Query(params object[]
+          inParameterValues)</literal></para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IDictionary QueryByNamedParam(IDictionary
+          inParams)</literal></para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Each of these methods returns an
+      <classname>IDictionary</classname> that contains the output parameters
+      and/or any results from Spring's object mapping framework. The arguments
+      to these methods can be a variable length argument list, in which case
+      the order must match the parameter order of the stored procedure. If the
+      argument is an IDictionary it contains parameter key/value pairs. Return
+      values from stored procedures are contained under the key
+      "<literal>RETURN_VALUE</literal>". </para>
+
+      <para>The standard in/out parameters for the stored procedure can be set
+      programmatically by adding to the parameter collection exposed by the
+      property DeclaredParameters. For each result sets that is returned by
+      the stored procedures you can registering either an
+      <classname>IResultSetExtractor</classname>,
+      <classname>IRowCallback</classname>, or
+      <classname>IRowMapper</classname> by name, which is used later to
+      extract the mapped results from the returned
+      <classname>IDictionary</classname>.</para>
+
+      <para>Lets take a look at an example. The following stored procedure
+      class will call the CustOrdersDetail stored procedure in the Northwind
+      database, passing in the OrderID as a stored procedure argument and
+      returning a collection of OrderDetails business objects.</para>
+
+      <programlisting>    public class CustOrdersDetailStoredProc : StoredProcedure
+    {
+        private static string procedureName = "CustOrdersDetail";
+
+        public CustOrdersDetailStoredProc(IDbProvider dbProvider) : base(dbProvider, procedureName)
+        {           
+            DeriveParameters();
+            AddRowMapper("orderDetailRowMapper", new OrderDetailRowMapper() );
+            Compile();
+        }
+        
+        public virtual IList GetOrderDetails(int orderid)
+        {
+            IDictionary outParams = Query(orderid);
+            return outParams["orderDetailRowMapper"] as IList;
+        }
+
+    }</programlisting>
+
+      <para>The '<literal>DeriveParameters</literal>' method saves you the
+      trouble of having to declare each parameter explicitly. When using
+      <literal>DeriveParameters</literal> is it often common to use the Query
+      method that takes a variable length list of arguments. This assumes
+      additional knowledge on the order of the stored procedure arguments. If
+      you do not want to follow this loose shorthand convention, you can call
+      the method <literal>QueryByNamesParameters</literal> instead passing in
+      a IDictionary of parameter key/value pairs. <note>
+          <para>If you would like to have the return value of the stored
+          procedure included in the returned dictionary, pass in
+          <literal>true</literal> as a method parameter to
+          <literal>DeriveParameters</literal>().</para>
+        </note></para>
+
+      <para>The <classname>StoredProcedure</classname> class is threadsafe
+      once 'compiled', an act which is usually done in the constructor. This
+      sets up the cache of database parameters that can be used on each call
+      to Query or QueryByNamedParam. The implementation of
+      <classname>IRowMapper</classname> that is used to extract the business
+      objects is 'registered' with the class and then later retrieved by name
+      as a fictional output parameter. You may also register
+      <classname>IRowCallback</classname> and
+      <classname>IResultSetExtractor</classname> callback interfaces via the
+      <literal>AddRowCallback</literal> and
+      <literal>AddResultSetExtractor</literal> methods.</para>
+
+      <para>The generic version of StoredProcedure is in the namespace
+      Spring.Data.Objects.Generic. It allows you to define up to two generic
+      type parameters that will be used to process result sets returned from
+      the stored procedure. An example is shown below</para>
+
+      <programlisting>    public class CustOrdersDetailStoredProc : StoredProcedure
+    {
+        private static string procedureName = "CustOrdersDetail";
+
+        public CustOrdersDetailStoredProc(IDbProvider dbProvider) : base(dbProvider, procedureName)
+        {           
+            DeriveParameters();
+            AddRowMapper("orderDetailRowMapper", new OrderDetailRowMapper&lt;OrderDetails&gt;() );
+            Compile();
+        }
+        
+        public virtual List&lt;OrderDetails&gt; GetOrderDetails(int orderid)
+        {
+            
+            IDictionary outParams = Query&lt;OrderDetails&gt;(orderid);
+            return outParams["orderDetailRowMapper"] as List&lt;OrderDetails&gt;;
+        }
+
+    }</programlisting>
+
+      <para>You can find ready to run code demonstrating the StoredProcedure
+      class in the example 'Data Access' that is part of the Spring.NET
+      distribution.</para>
+    </sect2>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/ajax.xml b/doc/reference/src/ajax.xml
new file mode 100644
index 00000000..71ee9a06
--- /dev/null
+++ b/doc/reference/src/ajax.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2002-2007 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.
+ */
+-->
+<chapter id="ajax">
+  <title>ASP.NET AJAX</title>
+
+  <sect1 id="introduction-ajax">
+    <title>Introduction</title>
+
+    <para>Spring's ASP.NET AJAX integration allows for a plain .NET object
+    (PONO), that is one that doesn't have any attributes or special base
+    classes, to be exported as a web service, configured via dependency
+    injection, 'decorated' by applying AOP, and then exposed to client side
+    JavaScript.</para>
+  </sect1>
+
+  <sect1 id="webServices">
+    <title>Web Services</title>
+
+    <para>Spring.NET, and particularly Spring.Web, improved <ulink
+    url="http://www.springframework.net/doc-latest/reference/html/webservices.html">support
+    for web services</ulink> in .NET with the
+    <classname>WebServiceExporter</classname>. Exporting of an ordinary plain
+    .NET object as a web service is achieved by registering a custom
+    implementation of the <classname>WebServiceHandlerFactory</classname>
+    class as the HTTP handler for <literal>*.asmx</literal> requests.</para>
+
+    <para><ulink
+    url="http://www.springframework.net/doc-latest/reference/html/webservices.html">Microsoft
+    ASP.NET AJAX</ulink> introduced a new HTTP handler
+    <classname>System.Web.Script.Services.ScriptHandlerFactory</classname> to
+    allow a Web Service to be invoked from the browser by using
+    JavaScript.</para>
+
+    <para>Spring's integration allows for both Spring.Web and ASP.NET AJAX
+    functionality to be used together by creating a new HTTP handler.</para>
+
+    <sect2 id="exposingWebServices">
+      <title>Exposing Web Services</title>
+
+      <para>The <classname>WebServiceExporter</classname> combined with the
+      new HTTP handler exposes PONOs as Web Services in your ASP.NET AJAX
+      application.</para>
+
+      <para>In order for a Web service to be accessed from script, the
+      <classname>WebServiceExporter</classname> should decorate the Web
+      Service class with the <classname>ScriptServiceAttribute</classname>.
+      The code below is taken from the sample application
+      Spring.Web.Extensions.Sample, aka the 'AJAX' shortcut in the
+      installation. : <programlisting>
+&lt;object id="ContactWebService" type="Spring.Web.Services.WebServiceExporter, Spring.Web"&gt;
+  &lt;property name="TargetName" value="ContactService"/&gt;
+  &lt;property name="Namespace" value="http://Spring.Examples.Atlas/ContactService"/&gt;
+  &lt;property name="Description" value="Contact Web Services"/&gt;
+  &lt;property name="TypeAttributes"&gt;
+    &lt;list&gt;
+      &lt;object type="System.Web.Script.Services.ScriptServiceAttribute, System.Web.Extensions"/&gt;
+    &lt;/list&gt;
+  &lt;/property&gt;
+&lt;/object&gt;
+          
+        </programlisting></para>
+
+      <para>All that one needs to do in order to use the
+      <classname>WebServiceExporter</classname> is:</para>
+
+      <para><emphasis> 1. Configure the Web.config file of your ASP.NET AJAX
+      application as a Spring.Web application. </emphasis> <programlisting>
+&lt;sectionGroup name="spring"&gt;
+  &lt;section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/&gt;
+&lt;/sectionGroup&gt;
+        
+        </programlisting> <programlisting>
+&lt;spring&gt;
+  &lt;context&gt;
+    &lt;resource uri="~/Spring.config"/&gt;
+  &lt;/context&gt;
+&lt;/spring&gt;
+        
+        </programlisting></para>
+
+      <para><emphasis> 2. Register the HTTP handler and the Spring HttpModule
+      under the <literal>system.web</literal> section. </emphasis>
+      <programlisting>
+&lt;httpHandlers&gt;
+  &lt;remove verb="*" path="*.asmx"/&gt;
+  &lt;add verb="*" path="*.asmx" validate="false" type="Spring.Web.Script.Services.ScriptHandlerFactory, Spring.Web.Extensions"/&gt;
+  &lt;add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/&gt;
+  &lt;add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/&gt;
+&lt;/httpHandlers&gt;
+
+&lt;httpModules&gt;
+  &lt;add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/&gt;
+  &lt;add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/&gt;
+&lt;/httpModules&gt;
+        
+        </programlisting></para>
+
+      <para><emphasis> 3. Register the HTTP handler and the Spring HttpModule
+      under <literal>system.webServer</literal> section. </emphasis>
+      <programlisting>
+&lt;modules&gt;
+  &lt;add name="ScriptModule" preCondition="integratedMode" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/&gt;
+  &lt;add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/&gt;
+&lt;/modules&gt;
+&lt;handlers&gt;
+  &lt;remove name="WebServiceHandlerFactory-Integrated" /&gt;
+  &lt;add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" 
+       type="Spring.Web.Script.Services.ScriptHandlerFactory, Spring.Web.Extensions"/&gt;
+  &lt;add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode"
+       type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/&gt;
+  &lt;add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /&gt;
+&lt;/handlers&gt;
+        
+        </programlisting></para>
+
+      <para>You can find a full Web.config file in the example that comes with
+      this integration.</para>
+    </sect2>
+
+    <sect2 id="callingWebServices">
+      <title>Calling Web Services by using JavaScript</title>
+
+      <para>A proxy class is generated for each Web Service. Calls to Web
+      Services methods are made by using this proxy class. When using the
+      <classname>WebServiceExporter</classname>, the name of the proxy class
+      is equal to the <classname>WebServiceExporter</classname>'s id.
+      <programlisting>
+// This function calls the Contact Web service method 
+// passing simple type parameters and the callback function  
+function GetEmails(prefix, count)
+{
+    ContactWebService.GetEmails(prefix, count, GetEmailsOnSucceeded);
+}
+          
+        </programlisting></para>
+    </sect2>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/aop-aspect-library.xml b/doc/reference/src/aop-aspect-library.xml
new file mode 100644
index 00000000..8a277c32
--- /dev/null
+++ b/doc/reference/src/aop-aspect-library.xml
@@ -0,0 +1,733 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="aop-aspect-library">
+  <title>Aspect Library</title>
+
+  <sect1 id="aop-library-introduction">
+    <title>Introduction</title>
+
+    <para>Spring provides several aspects in the distribution. The most
+    popular of which is transactional advice, located in the Spring.Data
+    module. However, the aspects that are documented in this section are those
+    contained within the Spring.Aop module itself. The aspects in within
+    Spring.Aop.dll are Caching, Exception Handling, Logging, Retry, and
+    Parameter Validation. Other traditional advice types such as validation,
+    security, and thread management, will be included in a future
+    release.</para>
+  </sect1>
+
+  <sect1 id="caching-aspect">
+    <title>Caching</title>
+
+    <para>Caching the return value of a method or the value of a method
+    parameter is a common approach to increase application performance.
+    Application performance is increased with effective use of caching since
+    layers in the application that are closer to the user can return
+    information within their own layer as compared to making more expensive
+    calls to retrieve that information from a lower, and more slow, layer such
+    as a database or a web service. Caching also can help in terms of
+    application scalability, which is generally the more important
+    concern.</para>
+
+    <para>The caching support in Spring.NET consists of base cache interfaces
+    that can be used to specify a specific storage implementation of the cache
+    and also an aspect that determines where to apply the caching
+    functionality and its configuration.</para>
+
+    <para>The base cache interface that any cache implementation should
+    implement is <classname>Spring.Caching.ICache</classname> located in
+    <classname>Spring.Core.</classname> Two implementations are provided,
+    <classname>Spring.Caching.AspNetCache </classname>located in
+    <classname>Spring.Web</classname> which stores cache entries within an
+    ASP.NET cache and a simple implementation,
+    <classname>Spring.Caching.NonExpiringCache</classname> that stores cache
+    entries in memory and never expires these entries. Custom implementations
+    based on 3rd party implementations, such as Oracle Coherence, or
+    memcached, can be used by implementing the <literal>ICache</literal>
+    interface.</para>
+
+    <para>The cache aspect is
+    <literal>Spring.Aspects.Cache.CacheAspect</literal> located in
+    <literal>Spring.Aop</literal>. It consists of three pieces of
+    functionality, the ability to cache return values, method parameters, and
+    explicit eviction of an item from the cache. The aspect currently relies
+    on using attributes to specify the pointcut as well as the behavior, much
+    like the transactional aspect. Future versions will allow for external
+    configuration of the behavior so you can apply caching to a code base
+    without needing to use attributes in the code.</para>
+
+    <para>The following attributes are available</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><literal>CacheResult - used to cache the return
+        value</literal></para>
+      </listitem>
+
+      <listitem>
+        <para><literal>CacheResultItems - used when returning a collection as
+        a return value </literal></para>
+      </listitem>
+
+      <listitem>
+        <para><literal>CacheParameter - used to cache a method
+        parameter</literal></para>
+      </listitem>
+
+      <listitem>
+        <para><literal>InvalidateCache</literal> - used to indicate one or
+        more cache items should be invalidated.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Each <classname>CacheResult</classname>,
+    <classname>CacheResultItems</classname>, and
+    <classname>CacheParameter</classname> attributes define the following
+    properties.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><literal>CacheName</literal> - the name of the cache
+        implementation to use</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>Key</literal> - a string representing a Spring
+        Expression Language (SpEL) expression used as the key in the
+        cache.</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>Condition</literal> - a SpEL expression that should be
+        evaluated in order to determine whether the item should be
+        cached.</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>TimeToLive</literal> - The amount of time an object
+        should remain in the cache (in seconds).</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>The <classname>InvalidateCache</classname> attribute has properties
+    for the CacheName, the Key as well as the Condition, with the same
+    meanings as listed previously.</para>
+
+    <para>Each <classname>ICache</classname> implementation will have
+    properties that are specific to a caching technology. In the case of
+    <classname>AspNetCache</classname>, the two important properties to
+    configure are:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><literal>SlidingExperation</literal> - If this property value is
+        set to true, every time the marked object is accessed it's TimeToLive
+        value is reset to its original value</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>Priority</literal> - the cache item priority
+        controlling how likely an object is to be removed from an associated
+        cache when the cache is being purged.</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>TimeToLive</literal> - The amount of time an object
+        should remain in the cache (in seconds).</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>The values of the Priority enumeration are</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><literal>Low</literal> - low likelihood of deletion when cache
+        is purged.</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>Normal</literal> - default priority for deletion when
+        cache is purged.</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>High</literal> - high likelihood of deletion when cache
+        is purged.</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>NotRemovable</literal> - cache item not deleted when
+        cache is purged.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>An important element of the applying these attributes is the use of
+    the expression language that allows for calling context information to
+    drive the caching actions. Here is an example taken from the Spring Air
+    sample application of the AirportDao implementation that implements an
+    interface with the method GetAirport(long id).</para>
+
+    <programlisting>        [CacheResult("AspNetCache", "'Airport.Id=' + #id", TimeToLive = "0:1:0")]
+        public Airport GetAirport(long id)
+        {
+           // implementation not shown...
+        }
+        </programlisting>
+
+    <para>The first parameter is the cache name. The second string parameter
+    is the cache key and is a string expression that incorporates the argument
+    passed into the method, the id. The method parameter names are exposed as
+    variables to the key expression. If you do not specify a key, then all the
+    parameter values will be used to cache the returned value. The expression
+    may also call out to other objects in the Spring container allowing for a
+    more complex key algorithm to be encapsulated. The end result is that the
+    Airport object is cached by id for 60 seconds in a cache named
+    AspNetCache. The TimetoLive property could also have been specified on the
+    configuration of the AspNetCache object.</para>
+
+    <para>The configuration to enable the caching aspect is shown below</para>
+
+    <programlisting>  &lt;object id="CacheAspect" type="Spring.Aspects.Cache.CacheAspect, Spring.Aop"/&gt;
+  &lt;object id="AspNetCache" type="Spring.Caching.AspNetCache, Spring.Web"&gt;
+    &lt;property name="SlidingExpiration" value="true"/&gt;
+    &lt;property name="Priority" value="CachePriority.Low"/&gt;
+    &lt;property name="TimeToLive" value="00:02:00"/&gt;
+  &lt;/object&gt;
+
+
+  &lt;!-- Apply aspects to DAOs --&gt;
+  &lt;object type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop"&gt;
+    &lt;property name="ObjectNames"&gt;
+      &lt;list&gt;
+        &lt;value&gt;*Dao&lt;/value&gt;
+      &lt;/list&gt;
+    &lt;/property&gt;
+    &lt;property name="InterceptorNames"&gt;
+      &lt;list&gt;
+        &lt;value&gt;CacheAspect&lt;/value&gt;
+      &lt;/list&gt;
+    &lt;/property&gt;
+  &lt;/object&gt;</programlisting>
+
+    <para>in this example an <classname>ObjectNameAutoProxyCreator</classname>
+    was used to apply the cache aspect to objects that have Dao in their name.
+    The AspNetCache setting for TimeToLive will override the TimeToLive value
+    set at the method level via the attribute.</para>
+  </sect1>
+
+  <sect1 id="exception-aspect">
+    <title>Exception Handling</title>
+
+    <para>In some cases existing code can be easily adopted to a simple error
+    handling strategy that can perform one of the following actions</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>translations - either wrap the thrown exception inside a new one
+        or replace it with a new exception type (no inner exception is
+        set).</para>
+      </listitem>
+
+      <listitem>
+        <para>return value - the exception is ignored and a return value for
+        the method is provided instead</para>
+      </listitem>
+
+      <listitem>
+        <para>swallow - the exception is ignored.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>The applicability of general exception handling advice depends
+    greatly on how tangled the code is regarding access to local variables
+    that may form part of the exception. Once you get familiar with the
+    feature set of Spring declarative exception handling advice you should
+    evaluate where it may be effectively applied in your code base. It is
+    worth noting that you can still chain together multiple pieces of
+    exception handling advice allowing you to mix the declarative approach
+    shown in this section with the traditional inheritance based approach,
+    i.e. implementing IThrowsAdvice or IMethodInterceptor.</para>
+
+    <para>Declarative exception handling is expressed in the form of a
+    mini-language relevant to the domain at hand, exception handling. This
+    could be referred to as a Domain Specific Language (DSL). Here is a simple
+    example, which should hopefully be self explanatory.</para>
+
+    <para><programlisting>&lt;object name="exceptionHandlingAdvice" type="Spring.Aspects.Exceptions.ExceptionHandlerAdvice, Spring.Aop"&gt;
+  &lt;property name="exceptionHandlers"&gt;
+    &lt;list&gt;
+      &lt;value&gt;<emphasis role="bold">on exception name ArithmeticException wrap System.InvalidOperationException</emphasis>&lt;/value&gt;
+    &lt;/list&gt;
+  &lt;/property&gt;
+&lt;/object&gt;</programlisting>What this is instructing the advice to do is
+    the following bit of code when an ArithmeticException is thrown, throw new
+    System.InvalidOperationException("Wrapped ArithmeticException", e), where
+    e is the original ArithmeticException. The default message, "Wrapped
+    ArithmethicException" is automatically appended. You may however specify
+    the message used in the newly thrown exception as shown below</para>
+
+    <programlisting>on exception name ArithmeticException wrap System.InvalidOperationException 'My Message'</programlisting>
+
+    <para>Similarly, if you would rather replace the exception, that is do not
+    nest one inside the other, you can use the following syntax</para>
+
+    <programlisting>on exception name ArithmeticException replace System.InvalidOperationException
+
+or
+
+on exception name ArithmeticException replace System.InvalidOperationException 'My Message'</programlisting>
+
+    <para>Both wrap and replace are special cases of the more general
+    translate action. An example of a translate expression is shown
+    below</para>
+
+    <para><programlisting>on exception name ArithmeticException translate new System.InvalidOperationException('My Message, Method Name ' + #method.Name, #e)</programlisting>What
+    we see here after the translate keyword is text that will be passed into
+    Spring's expression language (SpEL) for evaluation. Refer to the chapter
+    on the <link linkend="expression">expression language</link> for more
+    details. One important feature of the expression evaluation is the
+    availability of variables relating to the calling context when the
+    exception was thrown. These are</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>method - the MethodInfo object corresponding to the method that
+        threw the exception</para>
+      </listitem>
+
+      <listitem>
+        <para>args - the argument array to the method that threw the
+        exception, signature is object[]</para>
+      </listitem>
+
+      <listitem>
+        <para>target - the AOP target object instance.</para>
+      </listitem>
+
+      <listitem>
+        <para>e - the thrown exception</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>You can invoke methods on these variables, prefixed by a '#' in the
+    expression. This gives you the flexibility to call special purpose
+    constructors that can have any piece of information accessible via the
+    above variables, or even other external data through the use of SpEL's
+    ability to reference objects within the Spring container.</para>
+
+    <para>You may also choose to 'swallow' the exception or to return a
+    specific return value, for example</para>
+
+    <programlisting>on exception name ArithmeticException swallow
+
+
+or
+
+
+on exception name ArithmeticException return 12</programlisting>
+
+    <para>You may also simply log the exception</para>
+
+    <programlisting>on exception name ArithmeticException,ArgumentException log 'My Message, Method Name ' + #method.Name</programlisting>
+
+    <para>Here we see that a comma delimited list of exception names can be
+    specified.</para>
+
+    <para>The logging is performed using the Commons.Logging library that
+    provides an abstraction over the underlying logging implementation.
+    Logging is currently at the debug level with a logger name of
+    "LogExceptionHandler" The ability to specify these values will be a future
+    enhancement and likely via a syntax resembling a constructor for the
+    action, i.e. log(Debug,"LoggerName").</para>
+
+    <para>Multiple exception handling statements can be specified within the
+    &lt;list&gt; shown above. The processing flow is on exception, the name of
+    the exception listed in the statement is compared to the thrown exception
+    to see if there is a match. A comma separated list of exceptions can be
+    used to group together the same action taken for different exception
+    names. If the action to take is logging, then the logging action is
+    performed and the search for other matching exception names continues. For
+    all other actions, namely translate, wrap, replace, swallow, return, once
+    an exception handler is matched, those in the chain are no longer
+    evaluated. Note, do not confuse this handler chain with the general advice
+    AOP advice chain. For translate, wrap, and replace actions a SpEL
+    expression is created and used to instantiate a new exception (in addition
+    to any other processing that may occur when evaluating the expression)
+    which is then thrown.</para>
+
+    <para>The exception handling DSL also supports the ability to provide a
+    SpEL boolean expression to determine if the advice will apply instead of
+    just filtering by the expression name. For example, the following is the
+    equivalent to the first example based on exception names but compares the
+    specific type of the exception thrown</para>
+
+    <programlisting><emphasis role="bold">on exception (#e is T(System.ArithmeticException))</emphasis> wrap System.InvalidOperationException</programlisting>
+
+    <para>The syntax use is 'on exception (SpEL boolean expression)' and
+    inside the expression you have access to the variables of the calling
+    context listed before, i.e. method, args, target, and e. This can be
+    useful to implement a small amount of conditional logic, such as checking
+    for a specific error number in an exception, i.e. <literal>(#e is
+    T(System.Data.SqlException) &amp;&amp; #e.Errors[0].Number in
+    {156,170,207,208})</literal>, to catch and translate bad grammar codes in
+    a SqlException.</para>
+
+    <para>While the examples given above are toy examples, they could just as
+    easily be changed to convert your application specific exceptions. If you
+    find yourself pushing the limits of using SpEL expressions, you will
+    likely be better off creating your own custom aspect class instead of a
+    scripting approach.</para>
+
+    <sect2>
+      <title>Language Reference</title>
+
+      <para>The general syntax of the language is</para>
+
+      <para><literal>on exception name [ExceptionName1,ExceptionName2,...]
+      [action] [SpEL expression]</literal></para>
+
+      <para>or</para>
+
+      <para><literal>on exception (SpEL boolean expression) [action] [SpEL
+      expression]</literal></para>
+
+      <para>The exception names are required as well as the action. The valid
+      actions are</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>log</para>
+        </listitem>
+
+        <listitem>
+          <para>translate</para>
+        </listitem>
+
+        <listitem>
+          <para>wrap</para>
+        </listitem>
+
+        <listitem>
+          <para>replace</para>
+        </listitem>
+
+        <listitem>
+          <para>return</para>
+        </listitem>
+
+        <listitem>
+          <para>swallow</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The form of the expression depends on the action. For logging, the
+      entire string is taken as the SpEL expression to log. Translate expects
+      an exception to be returned from evaluation the SpEL expression. Wrap
+      and replace are shorthand for the translate action. For wrap and replace
+      you specify the exception name and the message to pass into the standard
+      exception constructors (string, exception) and (string). The exception
+      name can be a partial or fully qualified name. Spring will attempt to
+      resolve the typename across all referenced assemblies. You may also
+      register type aliases for use with SpEL in the standard manner with
+      Spring.NET and those will be accessible from within the exception
+      handling expression.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="logging-aspect">
+    <title>Logging</title>
+
+    <para>The logging advice lets you log the information on method entry,
+    exit and thrown exception (if any). The implementation is based on the
+    logging library, <link linkend="???">Common.Logging</link>, that provides
+    portability across different logging libraries. There are a number of
+    configuration options available, listed below</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>LogUniqueIdentifier</para>
+      </listitem>
+
+      <listitem>
+        <para>LogExecutionTime</para>
+      </listitem>
+
+      <listitem>
+        <para>LogMethodArguments</para>
+      </listitem>
+
+      <listitem>
+        <para>LogReturnValue</para>
+      </listitem>
+
+      <listitem>
+        <para>Separator</para>
+      </listitem>
+
+      <listitem>
+        <para>LogLevel</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>You declare the logging advice in IoC container with the following
+    XML fragment. Alternatively, you can use the class
+    <classname>SimpleLoggingAdvice</classname> programatically.</para>
+
+    <programlisting>&lt;object name="loggingAdvice" type="Spring.Aspects.Logging.SimpleLoggingAdvice, Spring.Aop"&gt;
+  &lt;property name="logUniqueIdentifier" value="true"/&gt;               
+  &lt;property name="logExecutionTime"    value="true"/&gt;               
+  &lt;property name="logMethodArguments"  value="true"/&gt;
+  &lt;property name="LogReturnValue"      value="true"/&gt;
+
+  &lt;property name="Separator"           value=";"/&gt;
+  &lt;property name="LogLevel"            value="Info"/&gt;
+
+
+  &lt;property name="HideProxyTypeNames"  value="true"/&gt;
+  &lt;property name="UseDynamicLogger"    value="true"/&gt;
+&lt;/object&gt;</programlisting>
+
+    <para>
+      The default values for LogUniqueIdentifier, LogExecutionTime, LogMethodArguments and 
+      LogReturnValue are false. The default separator value is ", " and the
+      default log level is Common.Logging's LogLevel.Trace.</para>
+
+    <para>You can set the name of the logger with the property
+    <property>LoggerName</property>, for example "DataAccessLayer" for a
+    logging advice that would be applied across the all the classes in the
+    data access layer. That works well when using a 'category' style of
+    logging. If you do not set the <property>LoggerName</property> property,
+    then the type name of the logging advice is used as the logging name.
+    Another approach to logging is to log based on the type of the object
+    being called, the target type. Since often this is a proxy class with a
+    relatively meaningless name, the property
+    <property>HideProxyTypeNames</property> can be set to true to show the
+    true target type and not the proxy type.</para>
+
+    <para>To further extend the functionality of the
+    <classname>SimpleLoggingAdvice</classname> you can subclass
+    <classname>SimpleLoggingAdvice</classname> and override the methods</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><literal>string GetEntryMessage(IMethodInvocation invocation,
+        string idString)</literal></para>
+      </listitem>
+
+      <listitem>
+        <para><literal>string GetExceptionMessage(IMethodInvocation
+        invocation, Exception e, TimeSpan executionTimeSpan, string
+        idString)</literal></para>
+      </listitem>
+
+      <listitem>
+        <para><literal>string GetExitMessage(IMethodInvocation invocation,
+        object returnValue, TimeSpan executionTimeSpan, string
+        idString)</literal></para>
+      </listitem>
+    </itemizedlist>
+
+    <para>The default implementation to calculate a unique identifier is to
+    use a GUID. You can alter this behavior by overriding the method
+    <literal>string CreateUniqueIdentifier()</literal>. The
+    <classname>SimpleLoggingAdvice</classname> class inherits from
+    <classname>AbstractLoggingAdvice</classname>, which has the abstract
+    method <literal>object InvokeUnderLog(IMethodInvocation invocation, ILog
+    log)</literal> and you can also override the method <literal>ILog
+    GetLoggerForInvocation(IMethodInvocation invocation)</literal> to
+    customize the logger instance used for logging. Refer to the SDK
+    documentation for more details on subclassing
+    <classname>AbstractLoggingAdvice</classname>.</para>
+
+    <para>As an example of the Logging advice's output, adding the advice to
+    the method</para>
+
+    <programlisting>public int Bark(string message, int[] luckyNumbers)
+{
+  return 4;
+}</programlisting>
+
+    <para>And calling Bark("hello", new int[]{1, 2, 3} ), results in the
+    following output</para>
+
+    <programlisting>Entering Bark, 5d2bad47-62cd-435b-8de7-91f12b7f433e, message=hello; luckyNumbers=System.Int32[]
+
+Exiting Bark, 5d2bad47-62cd-435b-8de7-91f12b7f433e, 30453.125 ms, return=4</programlisting>
+
+    <para>The method parameters values are obtained using the ToString()
+    method. If you would like to have an alternate implementation, say to view
+    some values in an array, override the method string
+    GetMethodArgumentAsString(IMethodInvocation invocation).</para>
+
+    <para>The Spring 1.2 release will have an additional logging advice
+    implementation that leverages the Spring Expression Language to further
+    customize the content of the logging messages via simple configuration
+    using similar syntax to the retry and exception handling advice.</para>
+  </sect1>
+
+  <sect1 id="retry-aspect">
+    <title>Retry</title>
+
+    <para>When making a distributed call it is often a common requirement to
+    be able to retry the method invocation if there was an exception.
+    Typically the exception will be due to a communication issue that is
+    intermittent and retrying over a period of time will likely result in a
+    successful invocation. When applying retry advice it is important to know
+    if making two calls to the remote service will cause side effects.
+    Generally speaking, the method being invoked should be <ulink
+    url="http://en.wikipedia.org/wiki/Idempotent#Computer_Science">idempotent</ulink>,
+    that is, it is safe to call multiple times.</para>
+
+    <para>The retry advice is specified using a little language, i.e a DSL. A
+    simple example is shown below</para>
+
+    <programlisting>on exception name ArithmeticException retry 3x delay 1s</programlisting>
+
+    <para>The meaning is: when an exception that has 'ArithmeticException' in
+    its type name is thrown, retry the invocation up to 3 times and delay for
+    1 second between each retry event.</para>
+
+    <para>You can also provide a SpEL (Spring Expression Language) expression
+    that calculates the time interval to sleep between each retry event. The
+    syntax for this is shown below</para>
+
+    <programlisting>on exception name ArithmeticException retry 3x rate (1*#n + 0.5)</programlisting>
+
+    <para>As with the exception handling advice, you may also specify a
+    boolean SpEL that must evaluate to true in order for the advice to apply.
+    For example</para>
+
+    <programlisting>on exception (#e is T(System.ArithmeticException)) retry 3x delay 1s
+
+
+on exception (#e is T(System.ArithmeticException)) retry 3x rate (1*#n + 0.5)</programlisting>
+
+    <para>The time specified after the delay keyword is converted to a
+    TimeSpan object using Spring's TimeSpanConverter. This supports setting
+    the time as an integer + time unit. Time units are (d, h, m, s, ms)
+    representing (days, hours, minutes, seconds, and milliseconds). For
+    example; 1d = 1day, 5h = 5 hours etc. You can not specify a string such as
+    '1d 5h'. The value that is calculated from the expression after the rate
+    keyword is interpreted as a number of seconds. The power of using SpEL for
+    the rate expression is that you can easily specify some exponential retry
+    rate (a bigger delay for each retry attempt) or call out to a custom
+    function developed for this purpose.</para>
+
+    <para>When using a SpEL expression for the filter condition or for the
+    rate expression, the following variable are available</para>
+
+    <para><itemizedlist>
+        <listitem>
+          <para>method - the MethodInfo object corresponding to the method
+          that threw the exception</para>
+        </listitem>
+
+        <listitem>
+          <para>args - the argument array to the method that threw the
+          exception, signature is object[]</para>
+        </listitem>
+
+        <listitem>
+          <para>target - the AOP target object instance.</para>
+        </listitem>
+
+        <listitem>
+          <para>e - the thrown exception</para>
+        </listitem>
+      </itemizedlist>You declare the advice in IoC container with the
+    following XML fragment. Alternatively, you can use the
+    <classname>RetryAdvice</classname> class programatically.</para>
+
+    <programlisting>&lt;object name="exceptionHandlingAdvice" type="Spring.Aspects.RetryAdvice, Spring.Aop"&gt;
+  &lt;property name="retryExpression" value="<emphasis role="bold">on exception name ArithmeticException retry 3x delay 1s</emphasis>"/&gt;
+&lt;/object&gt;</programlisting>
+
+    <sect2>
+      <title>Language Reference</title>
+
+      <para>The general syntax of the language is</para>
+
+      <para><literal>on exception name [ExceptionName1,ExceptionName2,...]
+      retry [number of times]x [delay|rate] [delay time|SpEL rate
+      expression]</literal></para>
+
+      <para>or</para>
+
+      <para><literal>on exception (SpEL boolean expression) retry [number of
+      times]x [delay|rate] [delay time|SpELrate expression]</literal></para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="tx-aspect">
+    <title>Transactions</title>
+
+    <para>The transaction aspect is more fully described in the section on
+    <link linkend="transaction">transaction management</link>.</para>
+  </sect1>
+
+  <sect1 id="parameter-validation">
+    <title>Parameter Validation</title>
+
+    <para>Spring provides a UI-agnostic <link linkend="validation">validation
+    framework</link> in which you can declare validation rules, both
+    progammatically and declaratively, and have those rules evaluated against
+    an arbitrary .NET object. Spring provides additional support for rendering
+    of validation errors within Spring's ASP.NET framework. (See the section
+    on <link linkend="validation-aspnet-usage" os="">ASP.NET usage tips</link>
+    for more information.) However, validation is not confined to the UI tier.
+    It is a common task that occurs across most, if not all, applications
+    layers. Validation that is performed in the UI layer is often repeated in
+    the service layer, in order to be proactive in case non UI-based clients
+    invoke the service layer. Validation rules completely different from those
+    used in the UI layer may be used on the server side.</para>
+
+    <para>To address some of the common needs for validation on the server
+    side, Spring provides parameter validation advice so that applies Spring's
+    validation rules to the method parameters. The class
+    <classname>ParameterValidationAdvice</classname> is used in conjunction
+    with the <classname>Validated</classname> attribute to specify which
+    validation rules are applied to method parameters. For example, to apply
+    parameter validation to the method SuggestFlights in the BookingAgent
+    class used in the <link linkend="springair">SpringAir sample
+    application</link>, you would apply the <classname>Validated</classname>
+    attribute to the method parameters as shown below.</para>
+
+    <programlisting>public FlightSuggestions SuggestFlights( [Validated("tripValidator")] Trip trip)
+{
+   // unmodified implementation goes here
+}</programlisting>
+
+    <para>The <literal>Validated</literal> attribute takes a string name that
+    specifies the name of the validation rule, i.e. the name of the IValidator
+    object in the Spring application context. The
+    <classname>Validated</classname> attribute is located in the namespace
+    <literal>Spring.Validation</literal> of the <literal>Spring.Core</literal>
+    assembly.</para>
+
+    <para>The configuration of the advice is to simply define the an instance
+    of the <literal>ParameterValidationAdvice</literal> class and apply the
+    advice, for example based on object names using an
+    <classname>ObjectNameAutoProxyCreator</classname>, as shown below,</para>
+
+    <programlisting>  &lt;object id="<emphasis role="bold">validationAdvice</emphasis>" type="Spring.Aspects.Validation.ParameterValidationAdvice, Spring.Aop"/&gt;
+
+  &lt;object type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop"&gt;
+    &lt;property name="ObjectNames"&gt;
+      &lt;list&gt;
+        &lt;value&gt;bookingAgent&lt;/value&gt;
+      &lt;/list&gt;
+    &lt;/property&gt;
+    &lt;property name="InterceptorNames"&gt;
+      &lt;list&gt;
+        &lt;value&gt;<emphasis role="bold">validationAdvice</emphasis>&lt;/value&gt;
+      &lt;/list&gt;
+    &lt;/property&gt;
+  &lt;/object&gt;</programlisting>
+
+    <para>When the advised method is invoked first the validation of each
+    method parameter is performed. If all validation succeeds, then the method
+    body is executed. If validation fails an exception of the type
+    <classname>ValidationException</classname> is thrown and you can retrieve
+    errors information from its property <literal>ValidationErrors</literal>.
+    See the SDK documentation for details.</para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/aop-quickstart.xml b/doc/reference/src/aop-quickstart.xml
new file mode 100644
index 00000000..90e107ae
--- /dev/null
+++ b/doc/reference/src/aop-quickstart.xml
@@ -0,0 +1,1099 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="aop-quickstart">
+  <title>AOP Guide</title>
+
+  <sect1 id="aop-quickstart-introduction">
+    <title>Introduction</title>
+
+    <para>This is an introductory guide to Aspect Oriented Programming (AOP)
+    with Spring.NET.</para>
+
+    <para>This guide assumes little to no prior experience of having
+    <emphasis>used</emphasis> Spring.NET AOP on the part of the reader.
+    However, it <emphasis>does</emphasis> assume a certain familiarity with
+    the terminology of AOP in general. It is probably better if you have read
+    (or at least have skimmed through) the AOP section of the reference
+    documentation beforehand, so that you are familiar with a) just what AOP
+    is, b) what problems AOP is addressing, and c) what the AOP concepts of
+    <literal>advice</literal>, <literal>pointcut</literal>, and
+    <literal>joinpoint</literal> actually mean... this guide spends absolutely
+    zero time defining those terms. Having said all that, if you are the kind
+    of developer who learns best by example, then by all means follow along...
+    you can always consult the reference documentation as the need arises (see
+    <xref linkend="aop-introduction-defn" />).</para>
+
+    <para><emphasis> The examples in this guide are <emphasis
+    role="bold">intentionally</emphasis> simplistic. One of the core aims of
+    this guide is to get you up and running with Spring.NET's flavor of AOP in
+    as short a time as possible. Having to comprehend even a simple object
+    model in order to understand the AOP examples would not be conducive to
+    learning Spring.NET AOP. It is left as an exercise for the reader to take
+    the concepts learned from this guide and apply them to his or her own code
+    base. Again, having said all of that, this guide concludes with a number
+    of cookbook-style AOP 'recipes' that illustrate the application of
+    Spring.NET's AOP offering in a real world context; additionally, the
+    Spring.NET reference application contains a number of Spring.NET AOP
+    aspects particular to it's own domain model (see <xref
+    linkend="springair" />). </emphasis></para>
+  </sect1>
+
+  <sect1 id="aop-quickstart-basics">
+    <title>The basics</title>
+
+    <para>This initial section introduces the basics of defining and then
+    applying some simple advice.</para>
+
+    <sect2 id="aop-quickstart-basics-advice">
+      <title>Applying advice</title>
+
+      <para>Lets see (a very basic) example of using Spring.NET AOP. The
+      following example code simply applies advice that writes the details of
+      an advised method call to the system console. Admittedly, this is not a
+      particularly compelling or even useful application of AOP, but having
+      worked through the example, you will then hopefully be able to see how
+      to apply your own custom advice to perform useful work (transaction
+      management, auditing, security enforcement, thread safety, etc).</para>
+
+      <para>Before looking at the AOP code proper lets quickly look at the
+      domain classes that are the target of the advice (in Spring.NET AOP
+      terminology, an instance of the following class is going to be the
+      <emphasis>advised object</emphasis>.</para>
+
+      <programlisting>    public interface ICommand 
+    {
+        object Execute(object context);
+    }
+    
+    public class ServiceCommand : ICommand
+    {
+        public object Execute(object context)
+        {
+            Console.Out.WriteLine("Service implementation : [{0}]", context);
+            return null;
+        }
+    }</programlisting>
+
+      <para>Find below the advice that is going to be applied to the
+      <literal>object Execute(object context)</literal> method of the
+      <classname>ServiceCommand</classname> class. As you can see, this is an
+      example of <emphasis>around advice</emphasis> (see <xref
+      linkend="aop-introduction-advice-types" />).</para>
+
+      <programlisting>    public class ConsoleLoggingAroundAdvice : IMethodInterceptor
+    {
+        public object Invoke(IMethodInvocation invocation)
+        {
+            Console.Out.WriteLine("Advice executing; calling the advised method..."); <co
+          id="aop-quickstart-basics-advice-around-1" />
+            object returnValue = invocation.Proceed(); <co
+          id="aop-quickstart-basics-advice-around-2" /> <co
+          id="aop-quickstart-basics-advice-around-3" />
+            Console.Out.WriteLine("Advice executed; advised method returned " + returnValue); <co
+          id="aop-quickstart-basics-advice-around-4" />
+            return returnValue; <co id="aop-quickstart-basics-advice-around-5" />
+        }
+    }</programlisting>
+
+      <calloutlist>
+        <callout arearefs="aop-quickstart-basics-advice-around-1">
+           Some simple code that merely prints out the fact that the advice is executing. 
+        </callout>
+
+        <callout arearefs="aop-quickstart-basics-advice-around-2">
+           The advised method is invoked. 
+        </callout>
+
+        <callout arearefs="aop-quickstart-basics-advice-around-3">
+           The return value is captured in the 
+
+          <literal>returnValue</literal>
+
+           variable. 
+        </callout>
+
+        <callout arearefs="aop-quickstart-basics-advice-around-4">
+           The value of the captured 
+
+          <literal>returnValue</literal>
+
+           is printed out. 
+        </callout>
+
+        <callout arearefs="aop-quickstart-basics-advice-around-5">
+           The previously captured 
+
+          <literal>returnValue</literal>
+
+           is returned. 
+        </callout>
+      </calloutlist>
+
+      <para>So thus far we have three artifacts: an interface
+      (<classname>ICommand</classname>); an implementation of said interface
+      (<classname>ServiceCommand</classname>); and some (trivial) advice
+      (encapsulated by the <classname>ConsoleLoggingAroundAdvice</classname>
+      class). All that remains is to actually apply the
+      <classname>ConsoleLoggingAroundAdvice</classname> advice to the
+      invocation of the <literal>Execute()</literal> method of the
+      <classname>ServiceCommand</classname> class. Lets look at how to effect
+      this programmatically...</para>
+
+      <programlisting>    ProxyFactory factory = new ProxyFactory(new ServiceCommand());
+    factory.AddAdvice(new ConsoleLoggingAroundAdvice());
+    ICommand command = (ICommand) factory.GetProxy();
+    command.Execute("This is the argument");</programlisting>
+
+      <para>The result of executing the above snippet of code will look
+      something like this...</para>
+
+      <programlisting>    Advice executing; calling the advised method...
+    Service implementation : [This is the argument]
+    Advice executed; advised method returned </programlisting>
+
+      <para>The output shows that the advice (the
+      <literal>Console.Out</literal> statements from the
+      <classname>ConsoleLoggingAroundAdvice</classname> was applied
+      <emphasis>around</emphasis> the invocation of the advised method.</para>
+
+      <para>So what is happening here? The fact that the preceding code used a
+      class called <classname>ProxyFactory</classname> may have clued you in.
+      The constructor for the <classname>ProxyFactory</classname> class took
+      as an argument the object that we wanted to advise (in this case, an
+      instance of the <classname>ServiceCommand</classname> class). We then
+      added some advice (a <classname>ConsoleLoggingAroundAdvice</classname>
+      instance) using the <literal>AddAdvice()</literal> method of the
+      <classname>ProxyFactory</classname> instance. We then called the
+      <literal>GetProxy()</literal> method of the
+      <classname>ProxyFactory</classname> instance which gave us a proxy... an
+      (AOP) proxy that proxied the target object (the
+      <classname>ServiceCommand</classname> instance), and called the advice
+      (a single instance of the
+      <classname>ConsoleLoggingAroundAdvice</classname> in this case). When we
+      invoked the <literal>Execute(object context)</literal> method of the
+      proxy, the advice was <literal>'applied'</literal> (executed), as can be
+      seen from the attendant output.</para>
+
+      <para>The following image shows a graphical view of the flow of
+      execution through a Spring.NET AOP proxy.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/aop-chain.png" format="png" />
+        </imageobject>
+      </mediaobject>
+
+      <para>One thing to note here is that the AOP proxy that was returned
+      from the call to the <literal>GetProxy()</literal> method of the
+      <classname>ProxyFactory</classname> instance was cast to the
+      <classname>ICommand</classname> interface that the
+      <classname>ServiceCommand</classname> target object implemented. This is
+      very important... currently, Spring.NET's AOP implementation mandates
+      the use of an interface for advised objects. In short, this means that
+      in order for your classes to leverage Spring.NET's AOP support, those
+      classes that you wish to use with Spring.NET AOP <emphasis
+      role="bold">must</emphasis> implement at least one interface. In
+      practice this restriction is not as onerous as it sounds... in any case,
+      it is <emphasis>generally</emphasis> good practice to program to
+      interfaces anyway (support for applying advice to classes that do not
+      implement any interfaces is planned for a future point release of
+      Spring.NET AOP).</para>
+
+      <para>The remainder of this guide is concerned with fleshing out some of
+      the finer details of Spring.NET AOP, but basically speaking, that's
+      about it.</para>
+
+      <para>As a first example of fleshing out one of those finer details,
+      find below some Spring.NET XML configuration that does
+      <emphasis>exactly</emphasis> the same thing as the previous example; it
+      should also be added that this declarative style approach to Spring.NET
+      AOP is preferred to the programmatic style.</para>
+
+      <programlisting>    &lt;object id="consoleLoggingAroundAdvice"
+            type="Spring.Examples.AopQuickStart.ConsoleLoggingAroundAdvice"/&gt;
+    &lt;object id="myServiceObject" type="Spring.Aop.Framework.ProxyFactoryObject"&gt;
+        &lt;property name="target"&gt;
+            &lt;object id="myServiceObjectTarget"
+                type="Spring.Examples.AopQuickStart.ServiceCommand"/&gt;
+        &lt;/property&gt;
+        &lt;property name="interceptorNames"&gt;
+            &lt;list&gt;
+                &lt;value&gt;consoleLoggingAroundAdvice&lt;/value&gt;
+            &lt;/list&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;</programlisting>
+
+      <programlisting>    ICommand command = (ICommand) ctx["myServiceObject"];
+    command.Execute();</programlisting>
+
+      <para>Some comments are warranted concerning the above XML configuration
+      snippet. Firstly, note that the
+      <classname>ConsoleLoggingAroundAdvice</classname> is itself a plain
+      vanilla object, and is eligible for configuration just like any other
+      class... if the advice itself needed to be injected with any
+      dependencies, any such dependencies could be injected as normal.</para>
+
+      <para>Secondly, notice that the object definition corresponding to the
+      object that is retrieved from the IoC container is a
+      <classname>ProxyFactoryObject</classname>. The
+      <classname>ProxyFactoryObject</classname> class is an implementation of
+      the <classname>IFactoryObject</classname> interface;
+      <classname>IFactoryObject</classname> implementations are treated
+      specially by the Spring.NET IoC container... in this specific case, it
+      is not a reference to the <classname>ProxyFactoryObject</classname>
+      instance itself that is returned, but rather the object that the
+      <classname>ProxyFactoryObject</classname> produces. In this case, it
+      will be an advised instance of the <classname>ServiceCommand</classname>
+      class.</para>
+
+      <para>Thirdly, notice that the target of the
+      <classname>ProxyFactoryObject</classname> is an instance of the
+      <classname>ServiceCommand</classname> class; this is the object that is
+      going to be advised (i.e. invocations of its methods are going to be
+      intercepted). This object instance is defined as an inner object
+      definition... this is the preferred idiom for using the
+      <classname>ProxyFactoryObject</classname>, as it means that other
+      objects cannot acquire a reference to the raw object, but rather only
+      the advised object.</para>
+
+      <para>Finally, notice that the advice that is to be applied to the
+      target object is referred to by its object name in the list of the names
+      of interceptors for the <classname>ProxyFactoryObject</classname>'s
+      <literal>interceptorNames</literal> property. In this particular case,
+      there is only one instance of advice being applied... the
+      <classname>ConsoleLoggingAroundAdvice</classname> defined in an object
+      definition of the same name. The reason for using a list of object names
+      as opposed to references to the advice objects themselves is explained
+      in the reference documentation...</para>
+
+      <para><emphasis> '... if the <classname>ProxyFactoryObject</classname>'s
+      singleton property is set to false, it must be able to return
+      independent proxy instances. If any of the advisors is itself a
+      prototype, an independent instance would need to be returned, so it is
+      necessary to be able to obtain an instance of the prototype from the
+      context; holding a reference isn't sufficient.' </emphasis></para>
+    </sect2>
+
+    <sect2 id="aop-quickstart-basics-pointcuts">
+      <title>Using Pointcuts - the basics</title>
+
+      <para>The advice that was applied in the previous section was rather
+      indiscriminate with regard to which methods on the advised object were
+      to be advised... the <classname>ConsoleLoggingAroundAdvice</classname>
+      simply intercepted <emphasis role="bold">all</emphasis> methods (that
+      were part of an interface implementation) on the target object.</para>
+
+      <para>This is great for simple examples and suchlike, but not so great
+      when you only want certain methods of an object to be advised. For
+      example, you may only want those methods beginning with
+      <literal>'Start'</literal> to be advised; or you may only want those
+      methods that are called with specific runtime argument values to be
+      advised; or you may only want those methods that are decorated with a
+      <literal>Lockable</literal> attribute to be advised.</para>
+
+      <para>The mechanism that Spring.NET AOP uses to discriminate about where
+      advice is applied (i.e. which method invocations are intercepted) is
+      encapsulated by the <classname>IPointcut</classname> interface (see
+      <xref linkend="aop-pointcuts" />). Spring.NET provides many
+      out-of-the-box implementations of the <classname>IPointcut</classname>
+      interface... the implementation that is used if none is explicitly
+      supplied (as was the case with the first example) is the canonical
+      <classname>TruePointcut</classname> : as the name suggests, this
+      pointcut always matches, and hence <emphasis role="bold">all</emphasis>
+      methods that can be advised will be advised.</para>
+
+      <para>So let's change the configuration of the advice such that it is
+      only applied to methods that contain the letters
+      <literal>'Do'</literal>. We'll change the
+      <classname>ICommand</classname> interface (and it's attendant
+      implementation) to accommodate this...</para>
+
+      <programlisting>    public interface ICommand 
+    {
+        void Execute();
+
+        void DoExecute();
+    } 
+
+    public class ServiceCommand : ICommand
+    {
+        public void Execute()
+        {
+            Console.Out.WriteLine("Service implementation : Execute()...");
+        }
+
+        public void DoExecute()
+        {
+            Console.Out.WriteLine("Service implementation : DoExecute()...");
+        }
+    }</programlisting>
+
+      <para>Please note that the advice itself (encapsulated within the
+      <classname>ConsoleLoggingAroundAdvice</classname> class) does not need
+      to change; we are changing <emphasis>where</emphasis> this advice is
+      applied, and not the advice itself.</para>
+
+      <para>Programmatic configuration of the advice, taking into account the
+      fact that we only want methods that contain the letters
+      <literal>'Do'</literal> to be advised, looks like this...</para>
+
+      <programlisting>    ProxyFactory factory = new ProxyFactory(new ServiceCommand());
+    factory.AddAdvisor(new DefaultPointcutAdvisor(
+        new SdkRegularExpressionMethodPointcut("Do"),
+        new ConsoleLoggingAroundAdvice()));
+    ICommand command = (ICommand) factory.GetProxy();
+    command.DoExecute();</programlisting>
+
+      <para>The result of executing the above snippet of code will look
+      something like this...</para>
+
+      <programlisting>    Intercepted call : about to invoke next item in chain...
+    Service implementation...
+    Intercepted call : returned</programlisting>
+
+      <para>The output indicates that the advice was applied around the
+      invocation of the advised method, because the name of the method that
+      was executed contained the letters <literal>'Do'</literal>. Try changing
+      the pertinent code snippet to invoke the <literal>Execute()</literal>
+      method, like so...</para>
+
+      <programlisting>    ProxyFactory factory = new ProxyFactory(new ServiceCommand());
+    factory.AddAdvisor(
+        new DefaultPointcutAdvisor(
+            new SdkRegularExpressionMethodPointcut("Do"),
+            new ConsoleLoggingAroundAdvice()));
+    ICommand command = (ICommand) factory.GetProxy();
+
+    // note that there is no 'Do' in this method name
+    command.Execute();</programlisting>
+
+      <para>Run the code snippet again; you will see that the advice will not
+      be applied : the pointcut is not matched (the method name does not
+      contain the letters <literal>'Do'</literal>), resulting in the following
+      (unadvised) output...</para>
+
+      <programlisting>Service implementation...</programlisting>
+
+      <para>XML configuration that accomplishes exactly the same thing as the
+      previous programmatic configuration example can be seen below...</para>
+
+      <programlisting>    &lt;object id="consoleLoggingAroundAdvice"
+        type="Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor"&gt;
+        &lt;property name="pattern" value="Do"/&gt;
+        &lt;property name="advice"&gt;
+            &lt;object type="Spring.Examples.AopQuickStart.ConsoleLoggingAroundAdvice"/&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;
+    &lt;object id="myServiceObject"
+            type="Spring.Aop.Framework.ProxyFactoryObject"&gt;
+        &lt;property name="target"&gt;
+            &lt;object id="myServiceObjectTarget"
+                type="Spring.Examples.AopQuickStart.ServiceCommand"/&gt;
+        &lt;/property&gt;
+        &lt;property name="interceptorNames"&gt;
+            &lt;list&gt;
+                &lt;value&gt;consoleLoggingAroundAdvice&lt;/value&gt;
+            &lt;/list&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;</programlisting>
+
+      <para>You'll will perhaps have noticed that this treatment of pointcuts
+      introduced the concept of an <literal>advisor</literal> (see <xref
+      linkend="aop-advisors" />). An advisor is nothing more the composition
+      of a pointcut (i.e. <emphasis>where</emphasis> advice is going to be
+      applied), and the advice itself (i.e. <emphasis>what</emphasis> is going
+      to happen at the interception point). The
+      <literal>consoleLoggingAroundAdvice</literal> object defines an advisor
+      that will apply the advice to all those methods of the advised object
+      that match the pattern <literal>'Do'</literal> (the pointcut). The
+      pattern to match against is supplied as a simple string value to the
+      <literal>pattern</literal> property of the
+      <classname>RegularExpressionMethodPointcutAdvisor</classname>
+      class.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="aop-quickstart-going-deeper">
+    <title>Going deeper</title>
+
+    <para>The first section should (hopefully) have demonstrated the basics of
+    firstly defining advice, and secondly, of choosing where to apply that
+    advice using the notion of a pointcut. Of course, there is a great deal
+    more to Spring.NET AOP than the aforementioned single advice type and
+    pointcut. This section continues the exploration of Spring.NET AOP, and
+    describes the various advice and pointcuts that are available for you to
+    use (yes, there is more than one type of advice and pointcut).</para>
+
+    <sect2 id="aop-quickstart-going-deeper-other-advice-types">
+      <title>Other types of Advice</title>
+
+      <para>The advice that was demonstrated and explained in the preceding
+      section is what is termed <emphasis>'around advice'</emphasis>. The name
+      <emphasis>'around advice'</emphasis> is used because the advice is
+      applied <emphasis>around</emphasis> the target method invocation. In the
+      specific case of the <classname>ConsoleLoggingAroundAdvice</classname>
+      advice that was defined previously, the target was made available to the
+      advice as an <classname>IMethodInvocation</classname> object... a call
+      was made to the <classname>Console</classname> class before the target
+      was invoked, and a call was made to the <classname>Console</classname>
+      class after the target method invocation was invoked. The advice
+      surrounded the target, one could even say that the advice was totally
+      'around' the target... hence the name, <emphasis>'around
+      advice'</emphasis>.</para>
+
+      <para><emphasis>'around advice'</emphasis> provides one with the
+      opportunity to do things both <emphasis role="bold">before</emphasis>
+      the target gets a chance to do anything, and <emphasis
+      role="bold">after</emphasis> the target has returned: one even gets a
+      chance to inspect (and possibly even totally change) the return
+      value.</para>
+
+      <para>Sometimes you don't need all that power though. If we stick with
+      the example of the <classname>ConsoleLoggingAroundAdvice</classname>
+      advice, what if one just wants to log the fact that a method was called?
+      In that case one doesn't need to do anything <emphasis>after</emphasis>
+      the target method invocation is to be invoked, nor do you need access to
+      the return value of the target method invocation. In fact, you only want
+      to do something <emphasis>before</emphasis> the target is to be invoked
+      (in this case, print out a message to the system
+      <classname>Console</classname> detailing the name of the method). In the
+      tradition of good programming that says one should use only what one
+      needs and no more, Spring.NET has another type of advice that one can
+      use... if one only wants to do something <emphasis>before</emphasis> the
+      target method invocation is invoked, why bother with having to manually
+      call the <literal>Proceed()</literal> method? The most expedient
+      solution simply is to use <emphasis>'before advice'</emphasis>.</para>
+
+      <sect3 id="aop-quickstart-going-deeper-before-advice">
+        <title>Before advice</title>
+
+        <para><emphasis>'before advice'</emphasis> is just that... it is
+        advice that runs <emphasis>before</emphasis> the target method
+        invocation is invoked. One does not get access to the target method
+        invocation itself, and one cannot return a value... this is a good
+        thing, because it means that you cannot inadvertently forget to call
+        the <literal>Proceed()</literal> method on the target, and it also
+        means that you cannot inadvertently forget to return the return value
+        of the target method invocation. If you don't need to inspect or
+        change the return value, or even do anything after the successful
+        execution of the target method invocation, then <emphasis>'before
+        advice'</emphasis> is just what you need.</para>
+
+        <para><emphasis>'before advice'</emphasis> in Spring.NET is defined by
+        the <classname>IMethodBeforeAdvice</classname> interface in the
+        <literal>Spring.Aop</literal> namespace. Lets just dive in with an
+        example... we'll use the same scenario as before to keep things
+        simple. Let's define the <emphasis>'before advice'</emphasis>
+        implementation first.</para>
+
+        <programlisting>    public class ConsoleLoggingBeforeAdvice : IMethodBeforeAdvice
+    {
+        public void Before(MethodInfo method, object[] args, object target)
+        {
+            Console.Out.WriteLine("Intercepted call to this method : " + method.Name);
+            Console.Out.WriteLine("    The target is               : " + target);
+            Console.Out.WriteLine("    The arguments are           : ");
+            if(args != null)
+            {
+                foreach (object arg in args)
+                {
+                    Console.Out.WriteLine("\t: " + arg);
+                }
+            }
+        }
+    }</programlisting>
+
+        <para>Let's apply a single instance of the
+        <classname>ConsoleLoggingBeforeAdvice</classname> advice to the
+        invocation of the <literal>Execute()</literal> method of the
+        <classname>ServiceCommand</classname>. What follows is programmatic
+        configuration; as you can see, its pretty much identical to the
+        previous version... the only difference is that we're using our new
+        <emphasis>'before advice'</emphasis> (encapsulated as an instance of
+        the <classname>ConsoleLoggingBeforeAdvice</classname> class).</para>
+
+        <programlisting>    ProxyFactory factory = new ProxyFactory(new ServiceCommand());
+    factory.AddAdvice(new ConsoleLoggingBeforeAdvice());
+    ICommand command = (ICommand) factory.GetProxy();
+    command.Execute();</programlisting>
+
+        <para>The result of executing the above snippet of code will look
+        something like this...</para>
+
+        <programlisting>    Intercepted call to this method : Execute
+    The target is                   : Spring.Examples.AopQuickStart.ServiceCommand
+    The arguments are               :</programlisting>
+
+        <para>The output clearly indicates that the advice was applied
+        <emphasis role="bold">before</emphasis> the invocation of the advised
+        method. Notice that in contrast to <emphasis>'around
+        advice'</emphasis>, with <emphasis>'before advice'</emphasis> there is
+        no chance of forgetting to call the <literal>Proceed()</literal>
+        method on the target, because one does not have access to the
+        <classname>IMethodInvocation</classname> (as is the case with
+        <emphasis>'around advice'</emphasis>)... similarly, you cannot forget
+        to return the return value either.</para>
+
+        <para>If you can use <emphasis>'before advice'</emphasis>, then do so.
+        The simpler programming model offered by <emphasis>'before
+        advice'</emphasis> means that there is less to remember, and thus
+        potentially less things to get wrong.</para>
+
+        <para>Here is the Spring.NET XML configuration for applying our
+        <emphasis>'before advice'</emphasis> declaratively...</para>
+
+        <programlisting>    &lt;object id="beforeAdvice"
+	    type="Spring.Examples.AopQuickStart.ConsoleLoggingBeforeAdvice"/&gt;
+
+    &lt;object id="myServiceObject"
+        type="Spring.Aop.Framework.ProxyFactoryObject"&gt;
+        &lt;property name="target"&gt;
+            &lt;object id="myServiceObjectTarget"
+                type="Spring.Examples.AopQuickStart.ServiceCommand"/&gt;
+        &lt;/property&gt;
+        &lt;property name="interceptorNames"&gt;
+            &lt;list&gt;
+                &lt;value&gt;beforeAdvice&lt;/value&gt;
+            &lt;/list&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;</programlisting>
+      </sect3>
+
+      <sect3 id="aop-quickstart-going-deeper-after-advice">
+        <title>After advice</title>
+
+        <para>Just as <emphasis>'before advice'</emphasis> defines advice that
+        executes <emphasis role="bold">before</emphasis> an advised target,
+        <emphasis>'after advice'</emphasis> is advice that executes <emphasis
+        role="bold">after</emphasis> a target has been executed.</para>
+
+        <para><emphasis>'after advice'</emphasis> in Spring.NET is defined by
+        the <classname>IAfterReturningAdvice</classname> interface in the
+        <literal>Spring.Aop</literal> namespace. Again, lets just fire on
+        ahead with an example... again, we'll use the same scenario as before
+        to keep things simple.</para>
+
+        <programlisting>    public class ConsoleLoggingAfterAdvice : IAfterReturningAdvice
+    {
+        public void AfterReturning(
+            object returnValue, MethodInfo method, object[] args, object target)
+        {
+            Console.Out.WriteLine("This method call returned successfully : " + method.Name);
+            Console.Out.WriteLine("    The target was                     : " + target);
+            Console.Out.WriteLine("    The arguments were                 : ");
+            if(args != null)
+            {
+                foreach (object arg in args)
+                {
+                    Console.Out.WriteLine("\t: " + arg);
+                }
+            }
+            Console.Out.WriteLine("    The return value is                : " + returnValue);
+        }
+    }</programlisting>
+
+        <para>Let's apply a single instance of the
+        <classname>ConsoleLoggingAfterAdvice</classname> advice to the
+        invocation of the <literal>Execute()</literal> method of the
+        <classname>ServiceCommand</classname>. What follows is programmatic
+        configuration; as you can, its pretty much identical to the
+        <emphasis>'before advice'</emphasis> version (which in turn was pretty
+        much identical to the original <emphasis>'around advice'</emphasis>
+        version)... the only real difference is that we're using our new
+        <emphasis>'after advice'</emphasis> (encapsulated as an instance of
+        the <classname>ConsoleLoggingAfterAdvice</classname> class).</para>
+
+        <programlisting>    ProxyFactory factory = new ProxyFactory(new ServiceCommand());
+    factory.AddAdvice(new ConsoleLoggingAfterAdvice());
+    ICommand command = (ICommand) factory.GetProxy();
+    command.Execute();</programlisting>
+
+        <para>The result of executing the above snippet of code will look
+        something like this...</para>
+
+        <programlisting>    This method call returned successfully : Execute
+    The target was                         : Spring.Examples.AopQuickStart.ServiceCommand
+    The arguments were                     :
+    The return value is                    : null</programlisting>
+
+        <para>The output clearly indicates that the advice was applied
+        <emphasis role="bold">after</emphasis> the invocation of the advised
+        method. Again, it bears repeating that your real world development
+        will actually have an advice implementation that does something useful
+        after the invocation of an advised method. Notice that in contrast to
+        <emphasis>'around advice'</emphasis>, with <emphasis>'after
+        advice'</emphasis> there is no chance of forgetting to call the
+        <literal>Proceed()</literal> method on the target, because just like
+        <emphasis>'before advice'</emphasis> you don't have access to the
+        <classname>IMethodInvocation</classname>... similarly, although you
+        get access to the return value of the target, you cannot forget to
+        return the return value either. You can however change the state of
+        the return value, typically by setting some of its properties, or by
+        calling methods on it.</para>
+
+        <para>The best-practice rule for <emphasis>'after advice'</emphasis>
+        is much the same as it is for <emphasis>'before advice'</emphasis>;
+        namely that if you can use <emphasis>'after advice'</emphasis>, then
+        do so (in preference to using <emphasis>'around advice'</emphasis>).
+        The simpler programming model offered by <emphasis>'after
+        advice'</emphasis> means that there is less to remember, and thus less
+        things to get potentially wrong.</para>
+
+        <para>A possible use case for <emphasis>'after advice'</emphasis>
+        would include performing access control checks on the return value of
+        an advised method invocation; consider the case of a service that
+        returns a list of document URI's... depending on the identity of the
+        (Windows) user that is running the program that is calling this
+        service, one could strip out those URI's that contain sensitive data
+        for which the user does not have sufficient privileges to access. That
+        is just one (real world) scenario... I'm sure you can think of plenty
+        more that are a whole lot more relevant to your own development
+        needs.</para>
+
+        <para>Here is the Spring.NET XML configuration for applying the
+        <emphasis>'after advice'</emphasis> declaratively...</para>
+
+        <programlisting>    &lt;object id="afterAdvice"
+	    type="Spring.Examples.AopQuickStart.ConsoleLoggingAfterAdvice"/&gt;
+
+    &lt;object id="myServiceObject"
+        type="Spring.Aop.Framework.ProxyFactoryObject"&gt;
+        &lt;property name="target"&gt;
+            &lt;object id="myServiceObjectTarget"
+                type="Spring.Examples.AopQuickStart.ServiceCommand"/&gt;
+        &lt;/property&gt;
+        &lt;property name="interceptorNames"&gt;
+            &lt;list&gt;
+                &lt;value&gt;afterAdvice&lt;/value&gt;
+            &lt;/list&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;</programlisting>
+      </sect3>
+
+      <sect3 id="aop-quickstart-going-deeper-throws-advice">
+        <title>Throws advice</title>
+
+        <para>So far we've covered <emphasis>'around advice'</emphasis>,
+        <emphasis>'before advice'</emphasis>, and <emphasis>'after
+        advice'</emphasis>... these advice types will see you through most if
+        not all of your AOP needs. However, one of the remaining advice types
+        that Spring.NET has in its locker is <emphasis>'throws
+        advice'</emphasis>.</para>
+
+        <para><emphasis>'throws advice'</emphasis> is advice that executes
+        when an advised method invocation <emphasis>throws</emphasis> an
+        exception.. hence the name. One basically applies the
+        <emphasis>'throws advice'</emphasis> to a target object in much the
+        same way as any of the previously mentioned advice types. If during
+        the execution of ones application none of any of the advised methods
+        throws an exception, then the <emphasis>'throws advice'</emphasis>
+        will never execute. However, if during the execution of your
+        application an advised method <emphasis>does</emphasis> throw an
+        exception, then the <emphasis>'throws advice'</emphasis> will kick in
+        and be executed. You can use <emphasis>'throws advice'</emphasis> to
+        apply a common exception handling policy across the various objects in
+        your application, or to perform logging of every exception thown by an
+        advised method, or to alert (perhaps via email) the support team in
+        the case of particularly of critical exceptions... the list of
+        possible uses cases is of course endless.</para>
+
+        <para>The <emphasis>'throws advice'</emphasis> type in Spring.NET is
+        defined by the <classname>IThrowsAdvice</classname> interface in the
+        <literal>Spring.Aop</literal> namespace... basically, one defines on
+        one's <emphasis>'throws advice'</emphasis> implementation class what
+        types of exception are going to be handled. Lets take a quick look at
+        the <classname>IThrowsAdvice</classname> interface...</para>
+
+        <programlisting>    public interface IThrowsAdvice : IAdvice
+    {
+    }</programlisting>
+
+        <para>Yes, that is really it... it is a marker interface that has no
+        methods on it. You may be wondering how Spring.NET determines which
+        methods to call to effect the running of one's <emphasis>'throws
+        advice'</emphasis>. An example would perhaps be illustrative at this
+        point, so here is some simple Spring.NET style <emphasis>'throws
+        advice'</emphasis>...</para>
+
+        <programlisting>    public class ConsoleLoggingThrowsAdvice : IThrowsAdvice
+    {
+        public void AfterThrowing(Exception ex)
+        {
+            Console.Out.WriteLine("Advised method threw this exception : " + ex);
+        }
+    }</programlisting>
+
+        <para>Lets also change the implementation of the
+        <literal>Execute()</literal> method of the
+        <classname>ServiceCommand</classname> class such that it throws an
+        exception. This will allow the advice encapsulated by the above
+        <classname>ConsoleLoggingThrowsAdvice</classname> to kick in.</para>
+
+        <programlisting>    public class ServiceCommand : ICommand
+    {
+        public void Execute()
+        {
+            throw new UnauthorizedAccessException();
+        }
+    }</programlisting>
+
+        <para>Let's programmatically apply the <emphasis>'throws
+        advice'</emphasis> (an instance of our
+        <classname>ConsoleLoggingThrowsAdvice</classname>) to the invocation
+        of the <literal>Execute()</literal> method of the above
+        <classname>ServiceCommand</classname> class; to wit...</para>
+
+        <programlisting>    ProxyFactory factory = new ProxyFactory(new ServiceCommand());
+    factory.AddAdvice(new ConsoleLoggingThrowsAdvice());
+    ICommand command = (ICommand) factory.GetProxy();
+    command.Execute();</programlisting>
+
+        <para>The result of executing the above snippet of code will look
+        something like this...</para>
+
+        <programlisting>    Advised method threw this exception : System.UnauthorizedAccessException:
+    Attempted to perform an unauthorized operation.</programlisting>
+
+        <para>As can be seen from the output, the
+        <classname>ConsoleLoggingThrowsAdvice</classname> kicked in when the
+        advised method invocation threw an exception. There are a number of
+        things to note about the
+        <classname>ConsoleLoggingThrowsAdvice</classname> advice class, so
+        lets take them each in turn.</para>
+
+        <para>In Spring.NET, <emphasis>'throws advice'</emphasis> means that
+        you have to define a class that implements the
+        <classname>IThrowsAdvice</classname> interface. Then, for each type of
+        exception that your <emphasis>'throws advice'</emphasis> is going to
+        handle, you have to define a method with this signature...</para>
+
+        <programlisting>    void AfterThrowing(Exception ex)</programlisting>
+
+        <para>Basically, your exception handling method has to be named
+        <literal>AfterThrowing</literal>. This name is important... your
+        exception handling method(s) absolutely must be called
+        <literal>AfterThrowing</literal>. If your handler method is not called
+        <literal>AfterThrowing</literal>, then your <emphasis>'throws
+        advice'</emphasis> will <emphasis role="bold">never</emphasis> be
+        called, it's as simple as that. Currently, this naming restriction is
+        not configurable (although it may well be opened up for configuration
+        in the future).</para>
+
+        <para>Your exception handling method must (at the very least) declare
+        a parameter that is an <classname>Exception</classname> type... this
+        parameter can be the root <classname>Exception</classname> class (as
+        in the case of the above example), or it can be an
+        <classname>Exception</classname> subclass if you only want to handle
+        certain types of exception. It is good practice to always make your
+        exception handling methods have an <classname>Exception</classname>
+        parameter that is the most specialized
+        <classname>Exception</classname> type possible... i.e. if you are
+        applying <emphasis>'throws advice'</emphasis> to a method that could
+        only ever throw <classname>ArgumentException</classname>s, then
+        declare the parameter of your exception handling method as...</para>
+
+        <programlisting>    void AfterThrowing(ArgumentException ex)</programlisting>
+
+        <para>Note that your exception handling method can have any return
+        type, but returning any value from a Spring.NET <emphasis>'throws
+        advice'</emphasis> method would be a waste of time... the Spring.NET
+        AOP infrastructure will simply ignore the return value, so always
+        define the return type of your exception handling methods to be
+        <literal>void</literal>.</para>
+
+        <para>Finally, here is the Spring.NET XML configuration for applying
+        the <emphasis>'throws advice'</emphasis> declaratively...</para>
+
+        <programlisting>    &lt;object id="throwsAdvice"
+	    type="Spring.Examples.AopQuickStart.ConsoleLoggingThrowsAdvice"/&gt;
+
+    &lt;object id="myServiceObject"
+        type="Spring.Aop.Framework.ProxyFactoryObject"&gt;
+        &lt;property name="target"&gt;
+            &lt;object id="myServiceObjectTarget"
+                type="Spring.Examples.AopQuickStart.ServiceCommand"/&gt;
+        &lt;/property&gt;
+        &lt;property name="interceptorNames"&gt;
+            &lt;list&gt;
+                &lt;value&gt;throwsAdvice&lt;/value&gt;
+            &lt;/list&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;</programlisting>
+
+        <para>One thing that cannot be done using <emphasis>'throws
+        advice'</emphasis> is exception swallowing. It is not possible to
+        define an exception handling method in a <emphasis>'throws
+        advice'</emphasis> implementation that will swallow any exception and
+        prevent said exception from bubbling up the call stack. The nearest
+        thing that one can do is define an exception handling method in a
+        <emphasis>'throws advice'</emphasis> implementation that will wrap the
+        handled exception in another exception; one would then throw the
+        wrapped exception in the body of one's exception handling method. One
+        can use this to implement some sort of exception translation or
+        exception scrubbing policy, in which implementation specific
+        exceptions (such as <classname>SqlException</classname> or
+        <classname>OracleException</classname> exceptions being thrown by an
+        advised data access object) get replaced with a business exception
+        that has meaning to the service objects in one's business layer. A toy
+        example of this type of <emphasis>'throws advice'</emphasis> can be
+        seen below.</para>
+
+        <programlisting>    public class DataAccessExceptionScrubbingThrowsAdvice : IThrowsAdvice
+    {
+        public void AfterThrowing (SqlException ex)
+        {
+            // business objects in higher level service layer need only deal with PersistenceException...
+            throw new PersistenceException ("Cannot access persistent storage.", ex.StackTrace);
+        }
+    }</programlisting>
+
+        <para><emphasis> Spring.NET's data access library already has this
+        kind of functionality (and is a whole lot more sophisticated)... the
+        above example is merely being used for illustrative purposes.
+        </emphasis></para>
+
+        <para>This treatment of <emphasis>'throws advice'</emphasis>, and of
+        Spring.NET's implementation of it is rather simplistic.
+        <emphasis>'throws advice'</emphasis> features that have been omitted
+        include the fact that one can define exception handling methods that
+        permit access to the original object, method, and method arguments of
+        the advised method invocation that threw the original exception. This
+        is a quickstart guide though, and is not meant to be exhaustive... do
+        consult the <emphasis>'throws advice'</emphasis> section of the
+        reference documentation, which describes how to declare an exception
+        handling method that gives one access to the above extra objects, and
+        how to declare multiple exception handling methods on the same
+        <classname>IThrowsAdvice</classname> implementation class (see <xref
+        linkend="aop-introduction-advice-types-throws" />).</para>
+      </sect3>
+
+      <sect3 id="aop-quickstart-going-deeper-introduction-advice">
+        <title>Introductions (mixins)</title>
+
+        <para>In a nutshell, introductions are all about adding new state and
+        behaviour to arbitrary objects... transparently and at runtime.
+        Introductions (also called mixins) allow one to emulate multiple
+        inheritance, typically with an eye towards applying crosscutting state
+        and operations to a wide swathe of objects in your application that
+        don't share the same inheritance hierarchy.</para>
+      </sect3>
+
+      <sect3 id="aop-quickstart-going-deeper-layering-advice">
+        <title>Layering advice</title>
+
+        <para>The examples shown so far have all demonstrated the application
+        of a single advice instance to an advised object. Spring.NET's flavor
+        of AOP would be pretty poor if one could only apply a single advice
+        instance per advised object... it is perfectly valid to apply multiple
+        advice to an advised object. For example, one might apply
+        transactional advice to a service object, and also apply a security
+        access checking advice to that same advised service object.</para>
+
+        <para>In the interests of keeping this section lean and tight, let's
+        simply apply <emphasis>all</emphasis> of the advice types that have
+        been previously described to a single advised object... in this first
+        instance we'll just use the default pointcut which means that every
+        possible joinpoint will be advised, and you'll be able to see that the
+        various advice instances are applied in order.</para>
+
+        <para>Please do consult the class definitions for the following
+        previously defined advice types to see exactly what each advice type
+        implementation does... we're going to be using single instances of the
+        <classname>ConsoleLoggingAroundAdvice</classname>,
+        <classname>ConsoleLoggingBeforeAdvice</classname>,
+        <classname>ConsoleLoggingAfterAdvice</classname>, and
+        <classname>ConsoleLoggingThrowsAdvice</classname> advice to advise a
+        single instance of the <classname>ServiceCommand</classname>
+        class.</para>
+
+        <para>You can find the following listing and executable application in
+        the AopQuickStart solution in the project
+        <literal>Spring.AopQuickStart.Step1</literal>.</para>
+
+        <programlisting>    ProxyFactory factory = new ProxyFactory(new ServiceCommand());
+    factory.AddAdvice(new ConsoleLoggingBeforeAdvice());
+    factory.AddAdvice(new ConsoleLoggingAfterAdvice());
+    factory.AddAdvice(new ConsoleLoggingThrowsAdvice());
+    factory.AddAdvice(new ConsoleLoggingAroundAdvice());
+    ICommand command = (ICommand) factory.GetProxy();
+    command.Execute();</programlisting>
+
+        <para>Here is the Spring.NET XML configuration for declaratively
+        applying multiple advice.</para>
+
+        <para>You can find the following listing and executable application in
+        the AopQuickStart solution in the project
+        <literal>Spring.AopQuickStart.Step2</literal>.</para>
+
+        <programlisting>    &lt;object id="throwsAdvice"
+	    type="Spring.Examples.AopQuickStart.ConsoleLoggingThrowsAdvice"/&gt;
+    &lt;object id="afterAdvice"
+	    type="Spring.Examples.AopQuickStart.ConsoleLoggingAfterAdvice"/&gt;
+    &lt;object id="beforeAdvice"
+	    type="Spring.Examples.AopQuickStart.ConsoleLoggingBeforeAdvice"/&gt;
+    &lt;object id="aroundAdvice"
+	    type="Spring.Examples.AopQuickStart.ConsoleLoggingAroundAdvice"/&gt;
+
+    &lt;object id="myServiceObject"
+        type="Spring.Aop.Framework.ProxyFactoryObject"&gt;
+        &lt;property name="target"&gt;
+            &lt;object id="myServiceObjectTarget"
+                type="Spring.Examples.AopQuickStart.ServiceCommand"/&gt;
+        &lt;/property&gt;
+        &lt;property name="interceptorNames"&gt;
+            &lt;list&gt;
+                &lt;value&gt;throwsAdvice&lt;/value&gt;
+                &lt;value&gt;afterAdvice&lt;/value&gt;
+                &lt;value&gt;beforeAdvice&lt;/value&gt;
+                &lt;value&gt;aroundAdvice&lt;/value&gt;
+            &lt;/list&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;</programlisting>
+      </sect3>
+
+      <sect3 id="aop-quickstart-going-deeper-configuring-advice">
+        <title>Configuring advice</title>
+
+        <para>In case it is not immediately apparent, remember that advice is
+        just a plain old .NET object (a PONO); advice can have constructors
+        that can take any number of parameters, and like any other .NET class,
+        advice can have properties. What this means is that one can leverage
+        the power of the Spring.NET IoC container to apply the IoC principle
+        to one's advice, and in so doing reap all the benefits of Dependency
+        Injection.</para>
+
+        <para>Consider the case of throws advice that needs to report (fatal)
+        exceptions to a first line support centre. The throws advice could
+        declare a dependency on a reporting service via a .NET property, and
+        the Spring.NET container could dependency inject the reporting service
+        dependency into the throws advice when it is being created; the
+        reporting dependency might be a simple Log4NET wrapper, or a Windows
+        EventLog wrapper, or a custom reporting exception reporting service
+        that sends detailed emails concerning the fatal exception.</para>
+
+        <para>Also bear in mind the fact that Spring.NET's AOP implementation
+        is quite independent of Spring.NET's IoC container. As you have seen,
+        the various examples used in this have illustrated both programmatic
+        and declarative AOP configuration (the latter being illustrated via
+        Spring.NET's IoC XML configuration mechanism).</para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="aop-quickstart-going-deeper-attribute-pointcuts">
+      <title>Using Attributes to define Pointcuts</title>
+
+      <para></para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="aop-quickstart-cookbook">
+    <title>The Spring.NET AOP Cookbook</title>
+
+    <para>The preceding treatment of Spring.NET AOP has (quite intentionally)
+    been decidedly simple. The overarching aim was to convey the concepts of
+    Spring.NET AOP... this section of the Spring.NET AOP guide contains a
+    number of real world examples of the application of Spring.NET AOP.</para>
+
+    <sect2 id="aop-quickstart-cookbook-caching">
+      <title>Caching</title>
+
+      <para>This example illustrates one of the more common usages of AOP...
+      caching.</para>
+
+      <para>Lets consider the scenario where we have some static reference
+      data that needs to be kept around for the duration of an application.
+      The data will almost never change over the uptime of an application, and
+      it exists only in the database to satisfy referential integrity amongst
+      the various relations in the database schema. An example of such static
+      (and typically immutable) reference data would be a collection of
+      <classname>Country</classname> objects (comprising a country name and a
+      code). What we would like to do is suck in the collection of
+      <classname>Country</classname> objects and then pin them in a cache.
+      This saves us having to hit the back end database again and again every
+      time we need to reference a country in our application (for example, to
+      populate dropdown controls in a Windows Forms desktop
+      application).</para>
+
+      <para>The Data Access Object (DAO) that will load the collection of
+      <classname>Country</classname> objects is called
+      <classname>AdoCountryDao</classname> (it is an implementation of the
+      data-access-technology agnostic DAO interface called
+      <classname>ICountryDao</classname>). The implementation of the
+      <classname>AdoCountryDao</classname> is quite simple, in that every time
+      the <literal>FindAllCountries</literal> instance method is called, an
+      instance will query the database for an
+      <classname>IDataReader</classname> and hydrate zero or more
+      <classname>Country</classname> objects using the returned data.</para>
+
+      <programlisting>    public class AdoCountryDao : ICountryDao
+    {
+        public IList FindAllCountries ()
+        {
+            // implementation elided for clarity...
+            return countries;
+        }
+    }</programlisting>
+
+      <para>Ideally, what we would like to have happen is for the results of
+      the <emphasis>first</emphasis> call to the
+      <literal>FindAllCountries</literal> instance method to be cached. We
+      would also like to do this in a non-invasive way, because caching is
+      something that we might want to apply at any number of points across the
+      codebase of our application. So, to address what we have identified as a
+      <emphasis>cross cutting concern</emphasis>, we can use Spring.NET AOP to
+      implement the caching.</para>
+
+      <para>The mechanism that this example is going to use to identify (or
+      pick out) areas in our application that we would like to apply caching
+      to is a .NET <classname>Attribute</classname>. Spring.NET ships with a
+      number of useful custom .NET <classname>Attribute</classname>
+      implementations, one of which is the cunningly named
+      <classname>CacheAttribute</classname>. In the specific case of this
+      example, we are simply going to decorate the definition of the
+      <literal>FindAllCountries</literal> instance method with the
+      <classname>CacheAttribute</classname>.</para>
+
+      <programlisting>    public class AdoCountryDao : ICountryDao
+    {
+        [Cache]
+        public IList FindAllCountries ()
+        {
+            // implementation elided for clarity...
+            return countries;
+        }
+    }</programlisting>
+
+      <para>The SpringAir reference application that is packaged as part of
+      the Spring.NET distribution comes with a working example of caching
+      applied using Spring.NET AOP (see <xref linkend="springair" />).</para>
+    </sect2>
+
+    <sect2 id="aop-quickstart-cookbook-performance-monitoring-windows">
+      <title>Performance Monitoring</title>
+
+      <para>This recipe show how easy it is to instrument the classes and
+      objects in an application for performance monitoring. The performance
+      monitoring implementation uses one of the (many) Windows performance
+      counters to display and track the performance data.</para>
+    </sect2>
+
+    <sect2 id="aop-quickstart-cookbook-retry">
+      <title>Retry Rules</title>
+
+      <para>This final recipe describes a simple (but really quite useful)
+      aspect... retry logic. Using Spring.NET AOP, it is quite easy to
+      surround an operation such as a method that opens a connection to a
+      database with a (configurable) aspect that tries to obtain a database
+      connection any number of times in the event of a failure.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="aop-quickstart-best-practices">
+    <title>Spring.NET AOP Best Practices</title>
+
+    <para>Spring.NET AOP is an 80% AOP solution, in that it only tries to
+    solve the 80% of those cases where AOP is a good fit in a typical
+    enterprise application. This final section of the Spring.NET AOP guide
+    describes where Spring.NET AOP is typically useful (the 80%), as well as
+    where Spring.NET AOP is not a good fit (the 20%).</para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/aop.xml b/doc/reference/src/aop.xml
new file mode 100644
index 00000000..4c2646af
--- /dev/null
+++ b/doc/reference/src/aop.xml
@@ -0,0 +1,2470 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="aop">
+  <title>Aspect Oriented Programming with Spring.NET</title>
+
+  <sect1 id="aop-introduction-concepts">
+    <title>Introduction</title>
+
+    <para><emphasis>Aspect-Oriented Programming</emphasis>
+    (<emphasis>AOP</emphasis>) complements OOP by providing another way of
+    thinking about program structure. Whereas OO decomposes applications into
+    a hierarchy of objects, AOP decomposes programs into
+    <emphasis>aspects</emphasis> or <emphasis>concerns</emphasis>. This
+    enables the modularization of concerns such as transaction management that
+    would otherwise cut across multiple objects (such concerns are often
+    termed <emphasis>crosscutting</emphasis> concerns).</para>
+
+    <para>One of the key components of Spring.NET is the <emphasis>AOP
+    framework</emphasis>. While the Spring.NET IoC container does not depend
+    on AOP, meaning you don't need to use AOP if you don't want to, AOP
+    complements Spring.NET IoC to provide a very capable middleware
+    solution.</para>
+
+    <para>AOP is used in Spring.NET:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>To provide declarative enterprise services, especially as a
+        replacement for COM+ declarative services. The most important such
+        service is <emphasis>declarative transaction management</emphasis>,
+        which builds on Spring.NET's transaction abstraction. This
+        functionality is planed for an upcoming release of Spring.NET</para>
+      </listitem>
+
+      <listitem>
+        <para>To allow users to implement custom aspects, complementing their
+        use of OOP with AOP.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Thus you can view Spring.NET AOP as either an enabling technology
+    that allows Spring.NET to provide declarative transaction management
+    without COM+; or use the full power of the Spring.NET AOP framework to
+    implement custom aspects.</para>
+
+    <para>For those who would like to hit the ground running and start
+    exploring how to use Spring's AOP functionality, head on over to <xref
+    linkend="aop-quickstart" />.</para>
+
+    <sect2 id="aop-introduction-defn">
+      <title>AOP concepts</title>
+
+      <para>Let us begin by defining some central AOP concepts. These terms
+      are not Spring.NET-specific. Unfortunately, AOP terminology is not
+      particularly intuitive. However, it would be even more confusing if
+      Spring.NET used its own terminology.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Aspect</emphasis>: A modularization of a concern for
+          which the implementation might otherwise cut across multiple
+          objects. Transaction management is a good example of a crosscutting
+          concern in enterprise applications. Aspects are implemented using
+          Spring.NET as Advisors or interceptors.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>Joinpoint</emphasis>: Point during the execution of
+          a program, such as a method invocation or a particular exception
+          being thrown.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>Advice</emphasis>: Action taken by the AOP framework
+          at a particular joinpoint. Different types of advice include
+          "around," "before" and "throws" advice. Advice types are discussed
+          below. Many AOP frameworks, including Spring.NET, model an advice as
+          an <emphasis>interceptor</emphasis>, maintaining a chain of
+          interceptors "around" the joinpoint.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>Pointcut</emphasis>: A set of joinpoints specifying
+          when an advice should fire. An AOP framework must allow developers
+          to specify pointcuts: for example, using regular expressions.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>Introduction</emphasis>: Adding methods or fields to
+          an advised class. Spring.NET allows you to introduce new interfaces
+          to any advised object. For example, you could use an introduction to
+          make any object implement an <classname>IAuditable</classname>
+          interface, to simplify the tracking of changes to an object's
+          state.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>Target object</emphasis>: Object containing the
+          joinpoint. Also referred to as <emphasis>advised</emphasis> or
+          <emphasis>proxied</emphasis> object.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>AOP proxy</emphasis>: Object created by the AOP
+          framework, including advice. In Spring.NET, an AOP proxy is a
+          dynamic proxy that uses IL code generated at runtime.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>Weaving</emphasis>: Assembling aspects to create an
+          advised object. This can be done at compile time (using the
+          Gripper-Loom.NET compiler, for example), or at runtime. Spring.NET
+          performs weaving at runtime.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Different advice types include:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Around advice</emphasis>: Advice that surrounds a
+          joinpoint such as a method invocation. This is the most powerful
+          kind of advice. Around advice will perform custom behaviour before
+          and after the method invocation. They are responsible for choosing
+          whether to proceed to the joinpoint or to shortcut executing by
+          returning their own return value or throwing an exception.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>Before advice</emphasis>: Advice that executes
+          before a joinpoint, but which does not have the ability to prevent
+          execution flow proceeding to the joinpoint (unless it throws an
+          exception).</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>Throws advice</emphasis>: Advice to be executed if a
+          method throws an exception. Spring.NET provides strongly typed
+          throws advice, so you can write code that catches the exception (and
+          subclasses) you're interested in, without needing to cast from
+          Exception.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>After returning advice</emphasis>: Advice to be
+          executed after a joinpoint completes normally: for example, if a
+          method returns without throwing an exception.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Spring.NET provides a full range of advice types. We recommend
+      that you use the least powerful advice type that can implement the
+      required behaviour. For example, if you need only to update a cache with
+      the return value of a method, you are better off implementing an after
+      returning advice than an around advice, although an around advice can
+      accomplish the same thing. Using the most specific advice type provides
+      a simpler programming model with less potential for errors. For example,
+      you don't need to invoke the <literal>proceed()</literal> method on the
+      <classname>IMethodInvocation</classname> used for around advice, and
+      hence can't fail to invoke it.</para>
+
+      <para>The pointcut concept is the key to AOP, distinguishing AOP from
+      older technologies offering interception. Pointcuts enable advice to be
+      targeted independently of the OO hierarchy. For example, an around
+      advice providing declarative transaction management can be applied to a
+      set of methods spanning multiple objects. Thus pointcuts provide the
+      structural element of AOP.</para>
+    </sect2>
+
+    <sect2 id="aop-introduction-Spring.NET-defn">
+      <title>Spring.NET AOP capabilities</title>
+
+      <para>Spring.NET AOP is implemented in pure C#. There is no need for a
+      special compilation process - all weaving is done at runtime. Spring.NET
+      AOP does not need to control or modify the way in which assemblies are
+      loaded, nor does it rely on unmanaged APIs, and is thus suitable for use
+      in any CLR environment.</para>
+
+      <para>Spring.NET currently supports interception of method invocations.
+      Field interception is not implemented, although support for field
+      interception could be added without breaking the core Spring.NET AOP
+      APIs.</para>
+
+      <remark>Field interception arguably violates OO encapsulation. We don't
+      believe it is wise in application development.</remark>
+
+      <para>Spring.NET provides classes to represent pointcuts and different
+      advice types. Spring.NET uses the term <emphasis>advisor</emphasis> for
+      an object representing an aspect, including both an advice and a
+      pointcut targeting it to specific joinpoints.</para>
+
+      <para>Different advice types are
+      <classname>IMethodInterceptor</classname> (from the AOP Alliance
+      interception API); and the advice interfaces defined in the
+      <literal>Spring.Aop</literal> namespace. All advices must implement the
+      <classname>AopAlliance.Aop.IAdvice</classname> tag interface. Advices
+      supported out the box are <classname>IMethodInterceptor</classname> ;
+      <classname>IThrowsAdvice</classname>;
+      <classname>IBeforeAdvice</classname>; and
+      <classname>IAfterReturningAdvice</classname>. We'll discuss advice types
+      in detail below.</para>
+
+      <para>Spring.NET provides a .NET translation of the Java interfaces
+      defined by the <ulink url="http://aopalliance.sourceforge.NET/">
+      <emphasis>AOP Alliance</emphasis></ulink>. Around advice must implement
+      the AOP Alliance
+      <classname>AopAlliance.Interceptr.IMethodInterceptor</classname>
+      interface. Whilst there is wide support for the AOP Alliance in Java,
+      Spring.NET is currently the only .NET AOP framework that makes use of
+      these interfaces. In the short term, this will provide a consistent
+      programming model for those doing development in both .NET and Java, and
+      in the longer term, we hope to see more .NET projects adopt the AOP
+      Alliance interfaces.</para>
+
+      <remark>The aim of Spring.NET AOP support is not to provide a
+      comprehensive AOP implementation on par with the functionality available
+      in AspectJ. However, Spring.NET AOP provides an excellent solution to
+      most problems in .NET applications that are amenable to AOP.</remark>
+
+      <remark>Thus, it is common to see Spring.NET's AOP functionality used in
+      conjunction with a Spring.NET IoC container. AOP advice is specified
+      using normal object definition syntax (although this allows powerful
+      "autoproxying" capabilities); advice and pointcuts are themselves
+      managed by Spring.NET IoC.</remark>
+    </sect2>
+
+    <sect2 id="aop-introduction-proxies">
+      <title>AOP Proxies in Spring.NET</title>
+
+      <para>Spring.NET generates AOP proxies at runtime using classes from the
+      System.Reflection.Emit namespace to create necessary IL code for the
+      proxy class. This results in proxies that are very efficient and do not
+      impose any restrictions on the inheritance hierarchy.</para>
+
+      <para>Another common approach to AOP proxy implementation in .NET is to
+      use ContextBoundObject and the .NET remoting infrastructure as an
+      interception mechanism. We are not very fond of ContextBoundObject
+      approach because it requires classes that need to be proxied to inherit
+      from the ContextBoundObject either directly or indirectly. In our
+      opinion this an unnecessary restriction that influences how you should
+      design your object model and also excludes applying AOP to "3rd party"
+      classes that are not under your direct control. Context-bound proxies
+      are also an order of magnitude slower than IL-generated proxies, due to
+      the overhead of the context switching and .NET remoting
+      infrastructure.</para>
+
+      <para>Spring.NET AOP proxies are also "smart" - in that because proxy
+      configuration is known during proxy generation, the generated proxy can
+      be optimized to invoke target methods via reflection only when necessary
+      (i.e. when there are advices applied to the target method). In all other
+      cases the target method will be called directly, thus avoiding
+      performance hit caused by the reflective invocation.</para>
+
+      <para>Finally, Spring.NET AOP proxies will never return a raw reference
+      to a target object. Whenever a target method returns a raw reference to
+      a target object (i.e. "return this;"), AOP proxy will recognize what
+      happened and will replace the return value with a reference to itself
+      instead.</para>
+
+      <para>The current implementation of the AOP proxy generator uses object
+      composition to delegate calls from the proxy to a target object, similar
+      to how you would implement a classic Decorator pattern. This means that
+      classes that need to be proxied have to implement one or more
+      interfaces, which is in our opinion not only a less-intruding
+      requirement than ContextBoundObject inheritance requirements, but also a
+      good practice that should be followed anyway for the service classes
+      that are most common targets for AOP proxies.</para>
+
+      <para>In a future release we will implement proxies using inheritance,
+      which will allow you to proxy classes without interfaces as well and
+      will remove some of the remaining raw reference issues that cannot be
+      solved using composition-based proxies.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="aop-pointcuts">
+    <title>Pointcut API in Spring.NET</title>
+
+    <para>Let's look at how Spring.NET handles the crucial pointcut
+    concept.</para>
+
+    <sect2 id="aop-pointcut-concepts">
+      <title>Concepts</title>
+
+      <para>Spring.NET's pointcut model enables pointcut reuse independent of
+      advice types. It's possible to target different advice using the same
+      pointcut.</para>
+
+      <para>The <classname>Spring.Aop.IPointcut</classname> interface is the
+      central interface, used to target advices to particular types and
+      methods. The complete interface is shown below:</para>
+
+      <programlisting>public interface IPointcut
+{
+    ITypeFilter TypeFilter { get; }
+
+    IMethodMatcher MethodMatcher { get; }
+}</programlisting>
+
+      <para>Splitting the <classname>IPointcut</classname> interface into two
+      parts allows reuse of type and method matching parts, and fine-grained
+      composition operations (such as performing a "union" with another method
+      matcher).</para>
+
+      <para>The <classname>ITypeFilter</classname> interface is used to
+      restrict the pointcut to a given set of target classes. If the
+      <literal>Matches()</literal> method always returns true, all target
+      types will be matched:</para>
+
+      <programlisting>public interface ITypeFilter
+{
+    bool Matches(Type type);
+}</programlisting>
+
+      <para>The <classname>IMethodMatcher</classname> interface is normally
+      more important. The complete interface is shown below:</para>
+
+      <programlisting>public interface IMethodMatcher
+{
+    bool IsRuntime { get; }
+
+    bool Matches(MethodInfo method, Type targetType);
+
+    bool Matches(MethodInfo method, Type targetType, object[] args);
+}</programlisting>
+
+      <para>The <literal>Matches(MethodInfo, Type) </literal>method is used to
+      test whether this pointcut will ever match a given method on a target
+      type. This evaluation can be performed when an AOP proxy is created, to
+      avoid the need for a test on every method invocation. If the 2-argument
+      matches method returns true for a given method, and the
+      <literal>IsRuntime</literal> property for the
+      <classname>IMethodMatcher</classname> returns true, the 3-argument
+      matches method will be invoked on every method invocation. This enables
+      a pointcut to look at the arguments passed to the method invocation
+      immediately before the target advice is to execute.</para>
+
+      <para>Most <literal>IMethodMatchers</literal> are static, meaning that
+      their <literal>IsRuntime</literal> property returns false. In this case,
+      the 3-argument <literal>Matches</literal> method will never be
+      invoked.</para>
+
+      <remark>Whenever possible, try to make pointcuts static... this allows
+      the AOP framework to cache the results of pointcut evaluation when an
+      AOP proxy is created.</remark>
+    </sect2>
+
+    <sect2 id="aop-pointcut-operations">
+      <title>Operations on pointcuts</title>
+
+      <para>Spring.NET supports operations on pointcuts: notably,
+      <emphasis>union</emphasis> and <emphasis>intersection</emphasis>.</para>
+
+      <para>Union means the methods that either pointcut matches.</para>
+
+      <para>Intersection means the methods that both pointcuts match.</para>
+
+      <para>Union is usually more useful.</para>
+
+      <para>Pointcuts can be composed using the static methods in the
+      <emphasis>Spring.Aop.Support.Pointcuts</emphasis> class, or using the
+      <emphasis>ComposablePointcut</emphasis> class in the same
+      namespace.</para>
+    </sect2>
+
+    <sect2 id="aop-convenience-impls">
+      <title>Convenience pointcut implementations</title>
+
+      <para>Spring.NET provides several convenient pointcut implementations.
+      Some can be used out of the box; others are intended to be subclassed in
+      application-specific pointcuts.</para>
+
+      <sect3 id="aop-static-pointcuts">
+        <title>Static pointcuts</title>
+
+        <para>Static pointcuts are based on method and target class, and
+        cannot take into account the method's arguments. Static pointcuts are
+        sufficient--and best--for most usages. It's possible for Spring.NET to
+        evaluate a static pointcut only once, when a method is first invoked:
+        after that, there is no need to evaluate the pointcut again with each
+        method invocation.</para>
+
+        <para>Let's consider some static pointcut implementations included
+        with Spring.NET.</para>
+
+        <sect4 id="aop-regularexpression-pointcut">
+           
+
+          <title>Regular expression pointcuts</title>
+
+           
+
+          <para>One obvious way to specify static pointcuts is using regular
+          expressions. Several AOP frameworks besides Spring.NET make this
+          possible. The
+          <classname>Spring.Aop.Support.SdkRegularExpressionMethodPointcut</classname>
+          class is a generic regular expression pointcut, that uses the
+          regular expression classes from the .NET BCL.</para>
+
+           
+
+          <para>Using this class, you can provide a list of pattern Strings.
+          If any of these is a match, the pointcut will evaluate to true (so
+          the result is effectively the union of these pointcuts.). The
+          matching is done against the full class name so you can use this
+          pointcut if you would like to apply advice to all the classes in a
+          particular namespace.</para>
+
+           
+
+          <para>The usage is shown below:</para>
+
+           
+
+          <programlisting>&lt;object id="settersAndAbsquatulatePointcut" 
+    type="Spring.Aop.Support.SdkRegularExpressionMethodPointcut, Spring.Aop"&gt;
+    &lt;property name="patterns"&gt;
+        &lt;list&gt;
+            &lt;value&gt;.*set.*&lt;/value&gt;
+            &lt;value&gt;.*absquatulate&lt;/value&gt;
+        &lt;/list&gt;
+    &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+
+           
+
+          <para>As a convenience, Spring provides the
+          <classname>RegularExpressionMethodPointcutAdvisor</classname> class
+          that allows us to reference an <classname>IAdvice</classname>
+          instance as well as defining the pointcut rules (remember that an
+          <classname>IAdvice</classname> instance can be an interceptor,
+          before advice, throws advice etc.) This simplifies wiring, as the
+          one object serves as both pointcut and advisor, as shown
+          below:</para>
+
+           
+
+          <programlisting>&lt;object id="settersAndAbsquatulateAdvisor" 
+    type="Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor, Spring.Aop"&gt;
+    &lt;property name="advice"&gt;
+        &lt;ref local="objectNameOfAopAllianceInterceptor"/&gt;
+    &lt;/property&gt;
+    &lt;property name="patterns"&gt;
+        &lt;list&gt;
+            &lt;value&gt;.*set.*&lt;/value&gt;
+            &lt;value&gt;.*absquatulate&lt;/value&gt;
+        &lt;/list&gt;
+    &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+
+           
+
+          <para>The
+          <classname>RegularExpressionMethodPointcutAdvisor</classname> class
+          can be used with any <classname>Advice</classname> type.</para>
+
+           If you only have one pattern you can use the property name 
+
+          <literal>pattern</literal>
+
+           and specify a single value instead of using the property name 
+
+          <literal>patterns</literal>
+
+           and specifying a list. 
+
+          <para>You may also specify a <classname>Regex</classname> object
+          from the <literal>System.Text.RegularExpressions</literal>
+          namespace. The built in <classname>RegexConverter</classname> class
+          will perform the conversion. See <xref
+          linkend="object-objects-builtin-converters" /> for more information
+          on Spring's build in type converters. The Regex object is created as
+          any other object within the IoC container. Using an inner-object
+          definition for the Regex object is a handy way to keep the
+          definition close to the PointcutAdvisor declaration. Note that the
+          class <classname>SdkRegularExpressionMethodPointcut</classname> has
+          a <methodname>DefaultOptions</methodname> property to set the
+          regular expression options if they are not explicitly specified in
+          the constructor.</para>
+
+           
+        </sect4>
+
+        <sect4 id="aop-attribute-pointcut">
+          <title>Attribute pointcuts</title>
+
+          <para>Pointcuts can be specified by matching an attribute type that
+          is associated with a method. Advice associated with this pointcut
+          can then read the metadata associated with the attribute to
+          configure itself. The class
+          <classname>AttributeMatchMethodPointcut</classname> provides this
+          functionality. Sample usage that will match all methods that have
+          the attribute
+          <classname>Spring.Attributes.CacheAttribute</classname> is shown
+          below. <programlisting>&lt;object id="cachePointcut" type="Spring.Aop.Support.AttributeMatchMethodPointcut, Spring.Aop"&gt; 
+    &lt;property name="Attribute" value="Spring.Attributes.CacheAttribute, Spring.Core"/&gt;        
+&lt;/object&gt;</programlisting></para>
+
+          <para>This can be used with a
+          <classname>DefaultPointcutAdvisor</classname> as shown
+          below<programlisting>&lt;object id="cacheAspect" type="Spring.Aop.Support.DefaultPointcutAdvisor, Spring.Aop"&gt; 
+  &lt;property name="Pointcut"&gt; 
+      &lt;object type="Spring.Aop.Support.AttributeMatchMethodPointcut, Spring.Aop"&gt; 
+          &lt;property name="Attribute" value="Spring.Attributes.CacheAttribute, Spring.Core"/&gt;        
+      &lt;/object&gt; 
+  &lt;/property&gt; 
+  &lt;property name="Advice" ref="aspNetCacheAdvice"/&gt; 
+&lt;/object&gt; </programlisting> where aspNetCacheAdvice is an implementation
+          of an <classname>IMethodInterceptor</classname> that caches method
+          return values. See the SDK docs for
+          <classname>Spring.Aop.Advice.CacheAdvice</classname> for more
+          information on this particular advice.</para>
+
+          <para>As a convenience the class
+          <classname>AttributeMatchMethodPointcutAdvisor</classname> is
+          provided to defining an attribute based Advisor as a somewhat
+          shorter alternative to using the generic DefaultPointcutAdvisor. An
+          example is shown below.<programlisting>&lt;object id="AspNetCacheAdvice" type="Spring.Aop.Support.AttributeMatchMethodPointcutAdvisor, Spring.Aop"&gt; 
+   &lt;property name="advice"&gt; 
+      &lt;object type="Aspect.AspNetCacheAdvice, Aspect"/&gt; 
+   &lt;/property&gt; 
+   &lt;property name="attribute" value="Framework.AspNetCacheAttribute, Framework" /&gt; 
+&lt;/object&gt;</programlisting></para>
+        </sect4>
+      </sect3>
+
+      <sect3 id="aop-dynamic-pointucts">
+        <title>Dynamic Pointcuts</title>
+
+        <para>Dynamic pointcuts are costlier to evaluate than static
+        pointcuts. They take into account method
+        <emphasis>arguments</emphasis>, as well as static information. This
+        means that they must be evaluated with every method invocation; the
+        result cannot be cached, as arguments will vary.</para>
+
+        <para>The main example is the <literal>control flow</literal>
+        pointcut.</para>
+
+        <sect4>
+          <title>Control Flow Pointcuts</title>
+
+          <para>Spring.NET control flow pointcuts are conceptually similar to
+          AspectJ <emphasis>cflow</emphasis> pointcuts, although less
+          powerful. (There is currently no way to specify that a pointcut
+          executes below another pointcut.). A control flow pointcut is
+          dynamic because it is evaluated against the current call stack for
+          each method invocation. For example, if method ClassA.A() calls
+          ClassB.B() then the execution of ClassB.B() has occurred in
+          ClassA.A()'s control flow. A control flow pointcut allows advice to
+          be applied to the method ClassA.A() but only when called from
+          ClassB.B() and not when ClassA.A() is executed from another call
+          stack. Control flow pointcuts are specified using the
+          <literal>Spring.Aop.Support.ControlFlowPointcut
+          </literal>class.<note>
+              <para>Control flow pointcuts are significantly more expensive to
+              evaluate at runtime than even other dynamic pointcuts.</para>
+            </note></para>
+
+          <para>When using control flow point cuts some attention should be
+          paid to the fact that at runtime the JIT compiler can inline the
+          methods, typically for increased performance, but with the
+          consequence that the method no longer appears in the current call
+          stack. This is because inlining takes the callee's IL code and
+          inserts it into the caller's IL code effectively removing the method
+          call. The information returned from
+          <literal>System.Diagnostics.StackTrace</literal>, used in the
+          implementation of <literal>ControlFlowPointcut</literal> is subject
+          to these optimizations and therefore a control flow pointcut will
+          not match if the method has been inlined.</para>
+
+          <para>Generally speaking, a method will be a candidate for inlining
+          when its code is 'small', just a few lines of code (less than 32
+          bytes of IL). For some interesting reading on this process read
+          David Notario's blog entries (<ulink
+          url="http://blogs.msdn.com/davidnotario/archive/2004/10/28/248953.aspx">JIT
+          Optimizations I</ulink> and <ulink
+          url="http://blogs.msdn.com/davidnotario/archive/2004/11/01/250398.aspx">JIT
+          Optimizations II</ulink>). Additionally, when an assembly is
+          compiled with a Release configuration the assembly metadata
+          instructs the CLR to enable JIT optimizations. When compiled with a
+          Debug configuration the CLR will disable (some?) these
+          optimizations. Empirically, method inlining is turned off in a Debug
+          configuration.</para>
+
+          <para>The way to ensure that your control flow pointcut will not be
+          overlooked because of method inlining is to apply the
+          <literal>System.Runtime.CompilerServices.MethodImplAttribute</literal>
+          attribute with the value
+          <literal>MethodImplOptions.NoInlining</literal>. In this (somewhat
+          artificial) simple example, if the code is compiled in release mode
+          it will not match a control flow pointcut for the method
+          "GetAge".</para>
+
+          <programlisting>public int GetAge(IPerson person)
+{
+    return person.GetAge();
+}</programlisting>
+
+          <para>However, applying the attributes as shown below will prevent
+          the method from being inlined even in a release build.</para>
+
+          <programlisting>[MethodImpl(MethodImplOptions.NoInlining)] 
+public int GetAge(IPerson person)
+{
+    return person.GetAge();
+}</programlisting>
+        </sect4>
+      </sect3>
+    </sect2>
+
+    <sect2>
+      <title>Custom pointcuts</title>
+
+      <para>Because pointcuts in Spring.NET are .NET types, rather than
+      language features (as in AspectJ) it is possible to declare custom
+      pointcuts, whether static or dynamic. However, there is no support out
+      of the box for the sophisticated pointcut expressions that can be coded
+      in the AspectJ syntax. However, custom pointcuts in Spring.NET can be as
+      arbitrarily complex as any object model.</para>
+
+      <para>Spring.NET provides useful pointcut superclasses to help you to
+      implement your own pointcuts.</para>
+
+      <para>Because static pointcuts are the most common and generally useful
+      pointcut type, you'll probably subclass
+      <classname>StaticMethodMatcherPointcut</classname>, as shown below. This
+      requires you to implement just one abstract method (although it is
+      possible to override other methods to customize behaviour):</para>
+
+      <programlisting>public class TestStaticPointcut : StaticMethodMatcherPointcut {
+
+    public override bool Matches(MethodInfo method, Type targetType) {
+        // return true if custom criteria match
+    }
+}</programlisting>
+    </sect2>
+  </sect1>
+
+  <sect1 id="aop-advice-types">
+    <title>Advice API in Spring.NET</title>
+
+    <para>Let's now look at how Spring.NET AOP handles advice.</para>
+
+    <sect2 id="aop-introduction-advice-lifecycle">
+      <title>Advice Lifecycle</title>
+
+      <para>Spring.NET advices can be shared across all advised objects, or
+      unique to each advised object. This corresponds to
+      <emphasis>per-class</emphasis> or <emphasis>per-instance</emphasis>
+      advice.</para>
+
+      <para>Per-class advice is used most often. It is appropriate for generic
+      advice such as transaction advisors. These do not depend on the state of
+      the proxied object or add new state; they merely act on the method and
+      arguments.</para>
+
+      <para>Per-instance advice is appropriate for introductions, to support
+      mixins. In this case, the advice adds state to the proxied
+      object.</para>
+
+      <para>It's possible to use a mix of shared and per-instance advice in
+      the same AOP proxy.</para>
+    </sect2>
+
+    <sect2 id="aop-introduction-advice-types">
+      <title>Advice types</title>
+
+      <para>Spring.NET provides several advice types out of the box, and is
+      extensible to support arbitrary advice types. Let us look at the basic
+      concepts and standard advice types.</para>
+
+      <sect3>
+        <title>Interception Around Advice</title>
+
+        <para>The most fundamental advice type in Spring.NET is
+        <emphasis>interception around advice</emphasis>.</para>
+
+        <para>Spring.NET is compliant with the AOP Alliance interface for
+        around advice using method interception. Around advice is implemented
+        using the following interface:</para>
+
+        <programlisting>public interface IMethodInterceptor : IInterceptor
+{
+    object Invoke(IMethodInvocation invocation);
+}</programlisting>
+
+        <para>The <literal>IMethodInvocation</literal> argument to the
+        <literal>Invoke()</literal> method exposes the method being invoked;
+        the target joinpoint; the AOP proxy; and the arguments to the method.
+        The <literal>Invoke()</literal> method should return the invocation's
+        result: the return value of the joinpoint.</para>
+
+        <para>A simple <literal>IMethodInterceptor</literal> implementation
+        looks as follows:</para>
+
+        <programlisting>public class DebugInterceptor : IMethodInterceptor {
+
+    public object Invoke(IMethodInvocation invocation) {
+        Console.WriteLine("Before: invocation=[{0}]", invocation);
+        object rval = invocation.Proceed();
+        Console.WriteLine("Invocation returned");
+        return rval;
+    }
+}</programlisting>
+
+        <para>Note the call to the IMethodInvocation's
+        <literal>Proceed()</literal> method. This proceeds down the
+        interceptor chain towards the joinpoint. Most interceptors will invoke
+        this method, and return its return value. However, an
+        IMethodInterceptor, like any around advice, can return a different
+        value or throw an exception rather than invoke the
+        <literal>Proceed()</literal> method. However, you don't want to do
+        this without good reason!</para>
+      </sect3>
+
+      <sect3>
+        <title>Before advice</title>
+
+        <para>A simpler advice type is a <emphasis role="bold">before
+        advice</emphasis>. This does not need an
+        <literal>IMethodInvocation</literal> object, since it will only be
+        called before entering the method.</para>
+
+        <para>The main advantage of a before advice is that there is no need
+        to invoke the <literal>Proceed()</literal>method, and therefore no
+        possibility of inadvertently failing to proceed down the interceptor
+        chain.</para>
+
+        <para>The <classname>IMethodBeforeAdvice</classname> interface is
+        shown below.</para>
+
+        <programlisting>public interface IMethodBeforeAdvice : IBeforeAdvice
+{
+    void Before(MethodInfo method, object[] args, object target);
+}</programlisting>
+
+        <para>Note the return type is <literal>void</literal>. Before advice
+        can insert custom behaviour before the joinpoint executes, but cannot
+        change the return value. If a before advice throws an exception, this
+        will abort further execution of the interceptor chain. The exception
+        will propagate back up the interceptor chain. If it is unchecked, or
+        on the signature of the invoked method, it will be passed directly to
+        the client; otherwise it will be wrapped in an unchecked exception by
+        the AOP proxy.</para>
+
+        <para>An example of a before advice in Spring.NET, which counts all
+        methods that return normally:</para>
+
+        <programlisting>public class CountingBeforeAdvice : IMethodBeforeAdvice {
+
+    private int count;
+    
+    public void Before(MethodInfo method, object[] args, object target) {
+        ++count;
+    }
+
+    public int Count  {
+        get { return count; }
+    }
+}</programlisting>
+
+        <remark>Before advice can be used with any pointcut.</remark>
+      </sect3>
+
+      <sect3 id="aop-introduction-advice-types-throws">
+        <title>Throws advice</title>
+
+        <para>Throws advice is invoked after the return of the joinpoint if
+        the joinpoint threw an exception. The
+        <literal>Spring.Aop.IThrowsAdvice</literal> interface does not contain
+        any methods: it is a tag interface identifying that the implementing
+        advice object implements one or more typed throws advice methods.
+        These throws advice methods must be of the form:</para>
+
+        <programlisting>AfterThrowing([MethodInfo method, Object[] args, Object target], Exception subclass)</programlisting>
+
+        <para>Throws-advice methods must be named
+        <literal>'AfterThrowing'</literal>. The return value will be ignored
+        by the Spring.NET AOP framework, so it is typically
+        <literal>void</literal>. With regard to the method arguments, only the
+        last argument is required. Thus there are <emphasis>exactly</emphasis>
+        one <emphasis>or</emphasis> four arguments, depending on whether the
+        advice method is interested in the method, method arguments and the
+        target object.</para>
+
+        <para>The following method snippets show examples of throws
+        advice.</para>
+
+        <para>This advice will be invoked if a
+        <classname>RemotingException</classname> is thrown (including
+        subclasses):</para>
+
+        <programlisting>public class RemoteThrowsAdvice : IThrowsAdvice {
+
+    public void AfterThrowing(RemotingException ex) {
+        // Do something with remoting exception
+    }
+}</programlisting>
+
+        <para>The following advice is invoked if a
+        <classname>SqlException</classname> is thrown. Unlike the above
+        advice, it declares 4 arguments, so that it has access to the invoked
+        method, method arguments and target object:</para>
+
+        <programlisting>public class SqlExceptionThrowsAdviceWithArguments : IThrowsAdvice {
+
+    public void AfterThrowing(MethodInfo method, object[] args, object target, SqlException ex) {
+        // Do something will all arguments
+    }
+}</programlisting>
+
+        <para>The final example illustrates how these two methods could be
+        used in a single class, which handles both
+        <classname>RemotingException</classname> and
+        <classname>SqlException</classname>. Any number of throws advice
+        methods can be combined in a single class, as can be seen in the
+        following example.</para>
+
+        <programlisting>public class CombinedThrowsAdvice : IThrowsAdvice {
+
+    public void AfterThrowing(RemotingException ex)  {
+        // Do something with remoting exception
+    }
+ 
+    public void AfterThrowing(MethodInfo method, object[] args, object target, SqlException ex) {
+        // Do something will all arguments
+    }
+}</programlisting>
+
+        <para>Finally, it is worth stating that throws advice is only applied
+        to the actual exception being thrown. What does this mean? Well, it
+        means that if you have defined some throws advice that handles
+        <classname>RemotingException</classname>s, the applicable
+        <literal>AfterThrowing</literal> method will <emphasis
+        role="bold">only</emphasis> be invoked if the type of the thrown
+        exception is <classname>RemotingException</classname>... if a
+        <classname>RemotingException</classname> has been thrown and
+        subsequently wrapped inside another exception before the exception
+        bubbles up to the throws advice interceptor, then the throws advice
+        that handles <classname>RemotingException</classname>s will <emphasis
+        role="bold">never</emphasis> be called. Consider a business method
+        that is advised by throws advice that handles
+        <classname>RemotingException</classname>s; if during the course of a
+        method invocation said business method throws a RemoteException... and
+        subsequently wraps said <classname>RemotingException</classname>
+        inside a business-specific
+        <classname>BadConnectionException</classname> (see the code snippet
+        below) before throwing the exception, then the throws advice will
+        never be able to respond to the
+        <classname>RemotingException</classname>... because all the throws
+        advice sees is a <classname>BadConnectionException</classname>. The
+        fact that the <classname>RemotingException</classname> is wrapped up
+        inside the <classname>BadConnectionException</classname> is
+        immaterial.</para>
+
+        <programlisting>public void BusinessMethod()
+    {
+        try
+        {
+            // do some business operation...
+        }
+        catch (RemotingException ex)
+        {
+            throw new BadConnectionException("Couldn't connect.", ex);
+        }
+    }</programlisting>
+
+        <note>
+           Please note that throws advice can be used with any pointcut. 
+        </note>
+      </sect3>
+
+      <sect3>
+        <title>After Returning advice</title>
+
+        <para>An after returning advice in Spring.NET must implement the
+        <classname>Spring.Aop.IAfterReturningAdvice</classname> interface,
+        shown below:</para>
+
+        <programlisting>public interface IAfterReturningAdvice : IAdvice
+{
+  void AfterReturning(object returnValue, MethodBase method, object[] args, object target);
+}</programlisting>
+
+        <para>An after returning advice has access to the return value (which
+        it cannot modify), invoked method, methods arguments and
+        target.</para>
+
+        <para>The following after returning advice counts all successful
+        method invocations that have not thrown exceptions:</para>
+
+        <programlisting>public class CountingAfterReturningAdvice : IAfterReturningAdvice {
+    private int count;
+
+    public void AfterReturning(object returnValue, MethodBase m, object[] args, object target) {
+        ++count;
+    }
+
+    public int Count  {
+        get { return count; }
+    }
+}</programlisting>
+
+        <para>This advice doesn't change the execution path. If it throws an
+        exception, this will be thrown up the interceptor chain instead of the
+        return value.</para>
+
+        <note>
+           Please note that after-returning advice can be used with any pointcut. 
+        </note>
+      </sect3>
+
+      <sect3 id="aop-advice-ordering">
+        <title>Advice Ordering</title>
+
+        <para>When multiple pieces of advice want to run on the same joinpoint
+        the precedence is determined by having the advice implement the
+        IOrdered interface or by specifying order information on an
+        advisor.</para>
+      </sect3>
+
+      <sect3>
+         
+
+        <title>Introduction advice</title>
+
+         
+
+        <para>Spring.NET allows you to add new methods and properties to an
+        advised class. This would typically be done when the functionality you
+        wish to add is a crosscutting concern and want to introduce this
+        functionality as a change to the static structure of the class
+        hierarchy. For example, you may want to cast objects to the
+        introduction interface in your code. Introductions are also a means to
+        emulate multiple inheritance.</para>
+
+         
+
+        <para>Introduction advice is defined by using a normal interface
+        declaration that implements the tag interface
+        <classname>IAdvice</classname>. <note>The need for implementing this
+        marker interface will likely be removed in future versions.</note> As
+        an example, consider the interface <classname>IAuditable</classname>
+        that describes the last modified time of an object.</para>
+
+         
+
+        <programlisting>public interface IAuditable : IAdvice
+{
+    DateTime LastModifiedDate
+    {
+        get;
+        set;
+    }
+}</programlisting>
+
+         where 
+
+        <programlisting>public interface IAdvice
+{        
+}</programlisting>
+
+         
+
+        <para>Access to the advised object can be obtained by implementing the
+        interface <classname>ITargetAware</classname> <programlisting>public interface ITargetAware
+{
+  IAopProxy TargetProxy
+  {
+    set;
+  }
+}</programlisting> with the <classname>IAopProxy</classname> reference
+        providing a layer of indirection through which the advised object can
+        be accessed. <programlisting>public interface IAopProxy
+{
+  object GetProxy();
+}</programlisting></para>
+
+         
+
+        <para>A simple class that demonstrates this functionality is shown
+        below. <programlisting>public interface IAuditable : IAdvice, ITargetAware
+{
+    DateTime LastModifiedDate
+    {
+        get;
+        set;
+    }
+}</programlisting></para>
+
+         
+
+        <para>A class that implements this interface is shown below.</para>
+
+         
+
+        <programlisting>public class AuditableMixin : IAuditable
+{
+    private DateTime date;
+    private IAopProxy targetProxy;
+
+    public AuditableMixin()
+    {
+      date = new DateTime();
+    }
+
+    public DateTime LastModifiedDate
+    {
+       get { return date; }
+       set { date = value; }
+    }
+
+    public IAopProxy TargetProxy
+    {
+       set { targetProxy = value; }
+    }
+}</programlisting>
+
+         
+
+        <para>Introduction advice is not associated with a pointcut, since it
+        applies at the class and not the method level. As such, introductions
+        use their own subclass of the interface
+        <classname>IAdvisor</classname>, namely
+        <classname>IIntroductionAdvisor</classname>, to specify the types that
+        the introduction can be applied to.</para>
+
+         
+
+        <programlisting>public interface IIntroductionAdvisor : IAdvisor
+{
+    ITypeFilter TypeFilter { get; }
+    
+    Type[] Interfaces { get; }
+
+    void ValidateInterfaces();
+}</programlisting>
+
+         
+
+        <para>The <literal>TypeFilter</literal> property returns the filter
+        that determines which target classes this introduction should apply
+        to.</para>
+
+         
+
+        <para>The <literal>Interfaces</literal> property returns the
+        interfaces introduced by this advisor.</para>
+
+         
+
+        <para>The <literal>ValidateInterfaces()</literal> method is used
+        internally to see if the introduced interfaces can be implemented by
+        the introduction advice.</para>
+
+         
+
+        <para>Spring.NET provides a default implementation of this interface
+        (the <classname>DefaultIntroductionAdvisor</classname> class) that
+        should be sufficient for the majority of situations when you need to
+        use introductions. The most simple implementation of an introduction
+        advisor is a subclass that simply passes a new instance the base
+        constructor. Passing a new instance is important since we want a new
+        instance of the mixin classed used for each advised object.</para>
+
+         
+
+        <programlisting>public class AuditableAdvisor : DefaultIntroductionAdvisor
+{
+  public AuditableAdvisor() : base(new AuditableMixin())
+  {
+  }
+}</programlisting>
+
+         
+
+        <para>Other constructors let you explicitly specify the interfaces of
+        the class that will be introduced. See the SDK documentation for more
+        details.</para>
+
+         
+
+        <para>We can apply this advisor Programatically, using the
+        <literal>IAdvised.AddIntroduction(),</literal> method, or (the
+        recommended way) in XML configuration using the
+        <literal>IntroductionNames</literal> property on
+        <classname>ProxyFactoryObject</classname>, which will be discussed
+        later.</para>
+
+         
+
+        <remark>Unlike the AOP implementation in the Spring Framework for
+        Java, introduction advice in Spring.NET is not implemented as a
+        specialized type of interception advice. The advantage of this
+        approach is that introductions are not kept in the interceptor chain,
+        which allows some significant performance optimizations. When a method
+        is called that has no interceptors, a direct call is used instead of
+        reflection regardless of whether the target method is on the target
+        object itself or one of the introductions. This means that introduced
+        methods perform the same as target object methods, which could be
+        useful for adding introductions to fine grained objects. The
+        disadvantage is that if the mixin functionality would benefit from
+        having access to the calling stack, it is not available. Introductions
+        with this functionality will be addressed in a future version of
+        Spring.NET AOP.</remark>
+
+         
+      </sect3>
+    </sect2>
+  </sect1>
+
+  <sect1 id="aop-advisors">
+    <title>Advisor API in Spring.NET</title>
+
+    <para>In Spring.NET, an advisor is a modularization of an aspect. Advisors
+    typically incorporate both an advice and a pointcut.</para>
+
+    <para>Apart from the special case of introductions, any advisor can be
+    used with any advice. The
+    <classname>Spring.Aop.Support.DefaultPointcutAdvisor</classname> class is
+    the most commonly used advisor implementation. For example, it can be used
+    with a <classname>IMethodInterceptor</classname>,
+    <classname>IBeforeAdvice</classname> or
+    <classname>IThrowsAdvice</classname> and any pointcut definition.</para>
+
+    <para>Other convenience implementations provided are:
+    <classname>AttributeMatchMethodPointcutAdvisor</classname> shown in usage
+    previously in <xref linkend="aop-attribute-pointcut" /> for use with
+    attribute based pointcuts.
+    <classname>RegularExpressionMethodPointcutAdvisor</classname> that will
+    apply pointcuts based on the matching a regular expression to method
+    names.</para>
+
+    <para>It is possible to mix advisor and advice types in Spring.NET in the
+    same AOP proxy. For example, you could use a interception around advice,
+    throws advice and before advice in one proxy configuration: Spring.NET
+    will automatically create the necessary interceptor chain.</para>
+  </sect1>
+
+  <sect1 id="aop-pfo">
+    <title id="aop-proxyfactoryobject">Using the ProxyFactoryObject to create
+    AOP proxies</title>
+
+    <para>If you're using the Spring.NET IoC container for your business
+    objects - generally a good idea - you will want to use one of Spring.NET's
+    AOP-specific <classname>IFactoryObject</classname> implementations
+    (remember that a factory object introduces a layer of indirection,
+    enabling it to create objects of a different type - <xref
+    linkend="objects-advancedproperty-setting" />).</para>
+
+    <para>The basic way to create an AOP proxy in Spring.NET is to use the
+    <classname>Spring.Aop.Framework.ProxyFactoryObject</classname> class. This
+    gives complete control over ordering and application of the pointcuts and
+    advice that will apply to your business objects. However, there are
+    simpler options that are preferable if you don't need such control.</para>
+
+    <sect2 id="aop-pfb-1">
+      <title>Basics</title>
+
+      <para>The <classname>ProxyFactoryObject</classname>, like other
+      Spring.NET <classname>IFactoryObject</classname> implementations,
+      introduces a level of indirection. If you define a
+      <classname>ProxyFactoryObject</classname> with name
+      <literal>foo</literal>, what objects referencing <literal>foo</literal>
+      see is not the <classname>ProxyFactoryObject</classname> instance
+      itself, but an object created by the
+      <classname>ProxyFactoryObject's</classname> implementation of the
+      <literal>GetObject() </literal>method. This method will create an AOP
+      proxy wrapping a target object.</para>
+
+      <para>One of the most important benefits of using a
+      <classname>ProxyFactoryObject</classname> or other IoC-aware classes
+      that create AOP proxies, is that it means that advice and pointcuts can
+      also be managed by IoC. This is a powerful feature, enabling certain
+      approaches that are hard to achieve with other AOP frameworks. For
+      example, an advice may itself reference application objects (besides the
+      target, which should be available in any AOP framework), benefiting from
+      all the pluggability provided by Dependency Injection.</para>
+    </sect2>
+
+    <sect2 id="aop-pfb-2">
+      <title>ProxyFactoryObject Properties</title>
+
+      <para>Like most <classname>IFactoryObject</classname> implementations
+      provided with Spring.NET, the <classname>ProxyFactoryObject</classname>
+      is itself a Spring.NET configurable object. Its properties are used
+      to:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Specify the target object that is to be proxied.</para>
+        </listitem>
+
+        <listitem>
+          <para>Specify the advice that is to be applied to the proxy.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Some key properties are inherited from the
+      <classname>Spring.Aop.Framework.ProxyConfig</classname> class: this
+      class is the superclass for all AOP proxy factories in Spring.NET. Some
+      of the key properties include:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>ProxyTargetType</literal>: a boolean value that
+          should be set to true if the target class is to be proxied directly,
+          as opposed to just proxying the interfaces exposed on the target
+          class.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>Optimize</literal>: whether to apply aggressive
+          optimization to created proxies. Don't use this setting unless you
+          understand how the relevant AOP proxy handles optimization. The
+          exact meaning of this flag will differ between proxy implementations
+          and will generally result in a trade off between proxy creation time
+          and runtime performance. Optimizations may be ignored by certain
+          proxy implementations and may be disabled silently based on the
+          value of other properties such as
+          <literal>ExposeProxy</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IsFrozen</literal>: whether advice changes should be
+          disallowed once the proxy factory has been configured. The default
+          is false.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>ExposeProxy</literal>: whether the current proxy
+          should be exposed via the <literal>AopContext</literal> so that it
+          can be accessed by the target. (It's available via the
+          <literal>IMethodInvocation</literal> without the need for the
+          <literal>AopContext</literal>.) If a target needs to obtain the
+          proxy and <literal>ExposeProxy</literal> is <literal>true</literal>,
+          the target can use the <literal>AopContext.CurrentProxy</literal>
+          property.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>AopProxyFactory</literal>: the implementation of
+          <literal>IAopProxyFactory</literal> to use when generating a proxy.
+          Offers a way of customizing whether to use remoting proxies, IL
+          generation or any other proxy strategy. The default implementation
+          will use IL generation to create composition-based proxies.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Other properties specific to the
+      <classname>ProxyFactoryObject</classname> class include:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>ProxyInterfaces</literal>: the array of
+          <literal>string</literal> interface names we're proxying.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>InterceptorNames</literal>: <literal>string</literal>
+          array of <literal>IAdvisor</literal>, interceptor or other advice
+          names to apply. Ordering is significant... first come, first served
+          that is. The first interceptor in the list will be the first to be
+          able to interceptor the invocation (assuming it concerns a regular
+          MethodInterceptor or BeforeAdvice).</para>
+
+          <para>The names are object names in the current container, including
+          objectnames from container hierarchies. You can't mention object
+          references here since doing so would result in the
+          <classname>ProxyFactoryObject</classname> ignoring the singleton
+          setting of the advise.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IntroductionNames</literal>: The names of objects in
+          the container that will be used as introductions to the target
+          object. If the object referred to by name does not implement the
+          <literal>IIntroductionAdvisor</literal> it will be passed to the
+          default constructor of <literal>DefaultIntroductionAdvisor</literal>
+          and all of the objects interfaces will be added to the target
+          object. Objects that implement the
+          <literal>IIntroductionAdvisor</literal> interface will be used as
+          is, giving you a finer level of control over what interfaces you may
+          want to expose and the types for which they will be matched
+          against.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>IsSingleton</literal>: whether or not the factory
+          should return a single proxy object, no matter how often the
+          <literal>GetObject()</literal> method is called. Several
+          <literal>IFactoryObject</literal> implementations offer such a
+          method. The default value is <literal>true</literal>. If you would
+          like to be able to apply advice on a per-proxy object basis, use a
+          <literal>IsSingleton</literal> value of <literal>false</literal> and
+          a <literal>IsFrozen</literal> value of <literal>false</literal>. If
+          you want to use stateful advice--for example, for stateful
+          mixins--use prototype advices along with a
+          <literal>IsSingleton</literal> value of
+          <literal>false</literal>.</para>
+        </listitem>
+      </itemizedlist>
+    </sect2>
+
+    <sect2 id="aop-proxying-interfaces">
+      <title>Proxying Interfaces</title>
+
+      <para>Let's look at a simple example of
+      <literal>ProxyFactoryObject</literal> in action. This example involves:
+      <itemizedlist>
+          <listitem>
+            <para>A target object that will be proxied. This is the
+            "personTarget" object definition in the example below.</para>
+          </listitem>
+
+          <listitem>
+            <para>An <literal>IAdvisor</literal> and an
+            <literal>IInterceptor</literal> used to provide advice.</para>
+          </listitem>
+
+          <listitem>
+            <para>An AOP proxy object definition specifying the target object
+            (the personTarget object) and the interfaces to proxy, along with
+            the advices to apply.</para>
+          </listitem>
+        </itemizedlist></para>
+
+      <programlisting>&lt;object id="personTarget" type="MyCompany.MyApp.Person, MyCompany"&gt;
+    &lt;property name="name" value="Tony"/&gt;
+    &lt;property name="age" value="51"/&gt;
+&lt;/object&gt;
+
+&lt;object id="myCustomInterceptor" type="MyCompany.MyApp.MyCustomInterceptor, MyCompany"&gt;
+    &lt;property name="customProperty" value="configuration string"/&gt;
+&lt;/object&gt;
+
+&lt;object id="debugInterceptor" type="Spring.Aop.Advice.DebugAdvice, Spring.Aop"&gt;
+&lt;/object&gt;
+
+&lt;object id="person" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop"&gt;
+    
+    &lt;property name="proxyInterfaces" value="MyCompany.MyApp.IPerson"/&gt;
+
+    &lt;property name="target" ref="personTarget"/&gt;
+
+    &lt;property name="interceptorNames"&gt;
+        &lt;list&gt;
+            &lt;value&gt;debugInterceptor&lt;/value&gt;
+            &lt;value&gt;myCustomInterceptor&lt;/value&gt;
+        &lt;/list&gt;
+    &lt;/property&gt;
+
+&lt;/object&gt;</programlisting>
+
+      <para>Note that the <literal>InterceptorNames</literal> property takes a
+      list of <literal>strings</literal>: the object names of the interceptor
+      or advisors in the current context. Advisors, interceptors, before,
+      after returning and throws advice objects can be used. The ordering of
+      advisors is significant.</para>
+
+      <remark>You might be wondering why the list doesn't hold object
+      references. The reason for this is that if the
+      <literal>ProxyFactoryObject's</literal> singleton property is set to
+      false, it must be able to return independent proxy instances. If any of
+      the advisors is itself a prototype, an independent instance would need
+      to be returned, so it's necessary to be able to obtain an instance of
+      the prototype from the context; holding a reference isn't
+      sufficient.</remark>
+
+      <para>The "person" object definition above can be used in place of an
+      <literal>IPerson</literal> implementation, as follows:</para>
+
+      <programlisting>IPerson person = (IPerson) factory.GetObject("person");</programlisting>
+
+      <para>Other objects in the same IoC context can express a strongly typed
+      dependency on it, as with an ordinary .NET object:</para>
+
+      <para>
+        <programlisting>&lt;object id="personUser" type="MyCompany.MyApp.PersonUser, MyCompany"&gt;
+    &lt;property name="person" ref="person"/&gt;
+&lt;/object&gt;</programlisting>
+      </para>
+
+      <para>The <literal>PersonUser</literal> class in this example would
+      expose a property of type <literal>IPerson</literal>. As far as it's
+      concerned, the AOP proxy can be used transparently in place of a "real"
+      person implementation. However, its type would be a proxy type. It would
+      be possible to cast it to the <literal>IAdvised</literal> interface
+      (discussed below).</para>
+
+      <para>It's possible to conceal the distinction between target and proxy
+      using an anonymous <emphasis>inline object</emphasis>, as follows. (for
+      more information on inline objects see <xref
+      linkend="objects-inline-object" />.) Only the
+      <literal>ProxyFactoryObject</literal> definition is different; the
+      advice is included only for completeness:</para>
+
+      <programlisting>&lt;object id="myCustomInterceptor" type="MyCompany.MyApp.MyCustomInterceptor, MyCompany"&gt;
+    &lt;property name="customProperty" value="configuration string"/&gt;
+&lt;/object&gt;
+
+&lt;object id="debugInterceptor" type="Spring.Aop.Advice.DebugAdvice, Spring.Aop"&gt;
+&lt;/object&gt;
+
+&lt;object id="person" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop"&gt;
+    
+    &lt;property name="proxyInterfaces" value="MyCompany.MyApp.IPerson"/&gt;
+
+    &lt;property name="target"&gt;
+      &lt;!-- Instead of using a reference to target, just use an inline object --&gt;
+      &lt;object type="MyCompany.MyApp.Person, MyCompany"&gt;
+        &lt;property name="name" value="Tony"/&gt;
+        &lt;property name="age" value="51"/&gt;
+      &lt;/object&gt;
+    &lt;/property&gt;
+
+    &lt;property name="interceptorNames"&gt;
+        &lt;list&gt;
+            &lt;value&gt;debugInterceptor&lt;/value&gt;
+            &lt;value&gt;myCustomInterceptor&lt;/value&gt;
+        &lt;/list&gt;
+    &lt;/property&gt;
+
+&lt;/object&gt;</programlisting>
+
+      <para>This has the advantage that there's only one object of type
+      <literal>Person</literal>: useful if we want to prevent users of the
+      application context obtaining a reference to the un-advised object, or
+      need to avoid any ambiguity with Spring IoC
+      <emphasis>autowiring</emphasis>. There's also arguably an advantage in
+      that the ProxyFactoryObject definition is self-contained. However, there
+      are times when being able to obtain the un-advised target from the
+      factory might actually be an <emphasis>advantage</emphasis>: for
+      example, in certain test scenarios.</para>
+    </sect2>
+
+    <sect3>
+      <title>Applying advice on a per-proxy basis.</title>
+
+      <para>Let's look at an example of configuring the proxy objects
+      retrieved from <literal>ProxyFactoryObject</literal>.</para>
+
+      <para><programlisting>
+&lt;!-- create the object to reference --&gt;
+&lt;object id="RealObjectTarget" type="MyRealObject" singleton="false"/&gt;
+&lt;!-- create the proxied object for everyone to use--&gt;
+&lt;object id="MyObject" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop"&gt;
+	&lt;property name="proxyInterfaces" value="MyInterface" /&gt;
+	&lt;property name="isSingleton" value="false"/&gt;
+	&lt;property name="targetName" value="RealObjectTarget" /&gt;
+&lt;/object&gt;
+		</programlisting>If you are using a prototype as the target you must set the
+      <literal>TargetName</literal> property with the name/object id of your
+      object and not use the property <literal>Target</literal> with a
+      reference to that object. This will then allow a new proxy to be created
+      around a new prototype target instance. <para>Consider the above
+      Spring.Net object configuration. Notice that the
+      <literal>IsSingleton</literal> property of the
+      <literal>ProxyFactoryObject</literal> instance is set to false. This
+      means that each proxy object will be unique. Thus, you can configure
+      each proxy object with its' own individual advice(s) using the following
+      syntax </para> <programlisting>MyInterface myProxyObject1 = (MyInterface)ctx.GetObject("MyObject"); // Will return un-advised instance of proxy object
+
+IAdvised advised = (IAdvised)myProxyObject1;
+advised.AddAdvice( new DebugAdvice() );	// myProxyObject1 instance now has an advice attached to it.
+
+MyInterface myProxyObject2 = (MyInterface)ctx.GetObject("MyObject"); // Will return a new, un-advised instance of proxy object
+</programlisting></para>
+    </sect3>
+
+    <sect2>
+      <title>Proxying Classes</title>
+
+      <para>What if you need to proxy a class, rather than one or more
+      interfaces?</para>
+
+      <para>Imagine that in our example above, there was no
+      <literal>IPerson</literal> interface, rather we needed to advise a class
+      called <literal>Person</literal> that didn't implement any business
+      interface. In this case the <literal>ProxyFactoryObject</literal> will
+      proxy all public virtual methods and properties if no interfaces are
+      explicitly specified or if no interfaces are found to be present on the
+      target object. One can configure Spring.NET to force the use of class
+      proxies, rather than interface proxies, by setting the
+      <literal>ProxyTargetType</literal> property on the
+      <literal>ProxyFactoryObject</literal> above to true.</para>
+
+      <para>Class proxying works by generating a subclass of the target class
+      at runtime. Spring.NET configures this generated subclass to delegate
+      method calls to the original target: the subclass is used to implement
+      the <emphasis>Decorator</emphasis> pattern, weaving in the
+      advice.</para>
+
+      <para>Class proxying should generally be transparent to users. However,
+      there is an important issue to consider:
+      <emphasis>Non-<literal>virtual</literal> methods can't be advised, as
+      they can't be overridden.</emphasis> This may be a limiting factor when
+      using existing code as it has been common practice not to declare
+      methods as virtual by default.</para>
+    </sect2>
+
+    <sect2>
+      <title>Concise proxy definitions</title>
+
+      <para>Especially when defining transactional proxies, if you do not make
+      use of the transaction namespace, you may end up with many similar proxy
+      definitions. The use of parent and child object definitions, along with
+      inner object definitions, can result in much cleaner and more concise
+      proxy definitions.</para>
+
+      <para>First a parent, template, object definition is created for the
+      proxy:</para>
+
+      <programlisting>    &lt;object id="txProxyTemplate"  abstract="true"
+            type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data"&gt;
+        
+        &lt;property name="PlatformTransactionManager" ref="adoTransactionManager"/&gt;
+        &lt;property name="TransactionAttributes"&gt;
+            &lt;name-values&gt;
+                &lt;add key="*" value="PROPAGATION_REQUIRED"/&gt;
+            &lt;/name-values&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;</programlisting>
+
+      <para>This will never be instantiated itself, so may actually be
+      incomplete. Then each proxy which needs to be created is just a child
+      object definition, which wraps the target of the proxy as an inner
+      object definition, since the target will never be used on its own
+      anyway.</para>
+
+      <programlisting>&lt;object name="testObjectManager" parent="txProxyTemplate"&gt;
+        &lt;property name="Target"&gt;
+            &lt;object type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests"&gt;
+                &lt;property name="TestObjectDao" ref="testObjectDao"/&gt;
+            &lt;/object&gt;
+        &lt;/property&gt; 
+&lt;/object&gt;</programlisting>
+
+      <para>It is of course possible to override properties from the parent
+      template, such as in this case, the transaction propagation
+      settings:</para>
+
+      <programlisting>&lt;object name="testObjectManager" parent="txProxyTemplate"&gt;
+        &lt;property name="Target"&gt;
+            &lt;object type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests"&gt;
+                &lt;property name="TestObjectDao" ref="testObjectDao"/&gt;
+            &lt;/object&gt;
+        &lt;/property&gt; 
+        &lt;property name="TransactionAttributes"&gt;
+            &lt;name-values&gt;
+                &lt;add key="Save*" value="PROPAGATION_REQUIRED"/&gt;
+                &lt;add key="Delete*" value="PROPAGATION_REQUIRED"/&gt;
+                &lt;add key="Find*" value="PROPAGATION_REQUIRED,readonly"/&gt;
+            &lt;/name-values&gt;
+        &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+
+      <para>Note that in the example above, we have explicitly marked the
+      parent object definition as abstract by using the abstract attribute, as
+      described previously, so that it may not actually ever be instantiated.
+      Application contexts (but not simple object factories) will by default
+      pre-instantiate all singletons. It is therefore important (at least for
+      singleton object) that if you have a (parent) object definition which
+      you intend to use only as a template, and this definition specifies a
+      class, you must make sure to set the abstract attribute to true,
+      otherwise the application context will actually try to pre-instantiate
+      it.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="aop-proxy-mechanism">
+    <title>Proxying mechanisms</title>
+
+    <para>Spring creates AOP proxies built at runtime through the use of the
+    TypeBuilder API. Two types of proxies can be created, composition based or
+    inheritance based. If the target object implements at least one interface
+    then a composition based proxy will be created, otherwise an inheritance
+    based proxy will be created. The composition based proxy is implemented by
+    creating a type that implements all the interfaces specified on the target
+    object. The actual class name of this dynamic type is 'GUID' like. A
+    private field holds the target object and the dynamic type implementation
+    will first execute any advice before or after making the target object
+    method call on the target object. The inheritance based mechanism creates
+    a dynamic type where that inherits from the target type. This lets you
+    downcast to the target type if needed. Please note that in both cases a
+    target method implementation that calls other methods on the target object
+    will not be advised. To force inheritance based proxies you should either
+    set the ProxyTargetType property of a ProxyFactory or the element
+    proxy-target-type when using an AOP schema based configuration.</para>
+
+    <para>In .NET 2.0 you can define the assembly level attribute,
+    InternalsVisibleTo, to allow access of internal interfaces/classes to
+    specified 'friend' assemblies. If you need to create an AOP proxy on an
+    internal class/interface add the following code, [assembly:
+    InternalsVisibleTo("Spring.Proxy")] and [assembly:
+    InternalsVisibleTo("Spring.DynamicReflection")] to your to AssemblyInfo
+    file.</para>
+  </sect1>
+
+  <sect1 id="aop-prog">
+    <title>Creating AOP Proxies Programatically with the ProxyFactory</title>
+
+    <para>It's easy to create AOP proxies Programatically using Spring.NET.
+    This enables you to use Spring.NET AOP without dependency on Spring.NET
+    IoC.</para>
+
+    <para>The following listing shows creation of a proxy for a target object,
+    with one interceptor and one advisor. The interfaces implemented by the
+    target object will automatically be proxied:</para>
+
+    <programlisting>ProxyFactory factory = new ProxyFactory(myBusinessInterfaceImpl);
+factory.AddAdvice(myMethodInterceptor);
+factory.AddAdvisor(myAdvisor);
+IBusinessInterface tb = (IBusinessInterface) factory.GetProxy();</programlisting>
+
+    <para>The first step is to construct an object of type
+    <literal>Spring.Aop.Framework.ProxyFactory</literal>. You can create this
+    with a target object, as in the above example, or specify the interfaces
+    to be proxied in an alternate constructor.</para>
+
+    <para>You can add interceptors or advisors, and manipulate them for the
+    life of the <literal>ProxyFactory.</literal></para>
+
+    <para>There are also convenience methods on
+    <literal>ProxyFactory</literal> (inherited from
+    <literal>AdvisedSupport</literal>) allowing you to add other advice types
+    such as before and throws advice. <literal>AdvisedSupport</literal> is the
+    superclass of both <literal>ProxyFactory</literal> and
+    <literal>ProxyFactoryObject</literal>.</para>
+
+    <note>
+       Integrating AOP proxy creation with the IoC framework is best practice in most applications. We recommend that you externalize configuration from .NET code with AOP, as in general. 
+    </note>
+  </sect1>
+
+  <sect1 id="aop-advised-objects">
+    <title>Manipulating Advised Objects</title>
+
+    <para>However you create AOP proxies, you can manipulate them using the
+    <literal>Spring.Aop.Framework.IAdvised</literal> interface. Any AOP proxy
+    can be cast to this interface, whatever other interfaces it implements.
+    This interface includes the following methods and properties:</para>
+
+    <programlisting>public interface IAdvised
+{    
+    IAdvisor[] Advisors {	get; }
+    
+    IIntroductionAdvisor[] Introductions { get; }
+	
+    void  AddInterceptor(IInterceptor interceptor);
+	
+    void  AddInterceptor(int pos, IInterceptor interceptor);		
+
+    void  AddAdvisor(IAdvisor advisor);
+
+    void  AddAdvisor(int pos, IAdvisor advisor);
+		
+    void  AddIntroduction(IIntroductionAdvisor advisor);
+		
+    void  AddIntroduction(int pos, IIntroductionAdvisor advisor);    
+
+    int IndexOf(IAdvisor advisor);
+
+    int IndexOf(IIntroductionAdvisor advisor);
+
+    bool RemoveAdvisor(IAdvisor advisor);
+
+    void RemoveAdvisor(int index);
+	
+    bool RemoveInterceptor(IInterceptor interceptor);
+
+    bool RemoveIntroduction(IIntroductionAdvisor advisor);
+	
+    void RemoveIntroduction(int index);
+
+    void ReplaceIntroduction(int index, IIntroductionAdvisor advisor);
+
+    bool ReplaceAdvisor(IAdvisor a, IAdvisor b);
+}</programlisting>
+
+    <para>The <literal>Advisors</literal> property will return an
+    <literal>IAdvisor</literal> for every advisor, interceptor or other advice
+    type that has been added to the factory. If you added an
+    <literal>IAdvisor</literal>, the returned advisor at this index will be
+    the object that you added. If you added an interceptor or other advice
+    type, Spring.NET will have wrapped this in an advisor with a
+    <literal>IPointcut</literal> that always returns <literal>true</literal>.
+    Thus if you added an <literal>IMethodInterceptor</literal>, the advisor
+    returned for this index will be a
+    <literal>DefaultPointcutAdvisor</literal> returning your
+    <literal>IMethodInterceptor</literal> and an <literal>IPointcut</literal>
+    that matches all types and methods.</para>
+
+    <para>The <literal>AddAdvisor()</literal> methods can be used to add any
+    <literal>IAdvisor</literal>. Usually this will be the generic
+    <literal>DefaultPointcutAdvisor</literal>, which can be used with any
+    advice or pointcut (but not for introduction).</para>
+
+    <para>By default, it's possible to add or remove advisors or interceptors
+    even once a proxy has been created. The only restriction is that it's
+    impossible to add or remove an introduction advisor, as existing proxies
+    from the factory will not show the interface change. (You can obtain a new
+    proxy from the factory to avoid this problem.)</para>
+
+    <remark>It's questionable whether it's advisable (no pun intended) to
+    modify advice on a business object in production, although there are no
+    doubt legitimate usage cases. However, it can be very useful in
+    development: for example, in tests. I have sometimes found it very useful
+    to be able to add test code in the form of an interceptor or other advice,
+    getting inside a method invocation I want to test. (For example, the
+    advice can get inside a transaction created for that method: for example,
+    to run SQL to check that a database was correctly updated, before marking
+    the transaction for roll back.)</remark>
+
+    <para>Depending on how you created the proxy, you can usually set a
+    <literal>Frozen</literal> flag, in which case the
+    <literal>IAdvised</literal> <literal>IsFrozen</literal> property will
+    return <literal>true</literal>, and any attempts to modify advice through
+    addition or removal will result in an
+    <literal>AopConfigException</literal>. The ability to freeze the state of
+    an advised object is useful in some cases: For example, to prevent calling
+    code removing a security interceptor.</para>
+  </sect1>
+
+  <sect1 id="aop-autoproxy">
+    <title>Using the "autoproxy" facility</title>
+
+    <para>So far we've considered explicit creation of AOP proxies using a
+    <literal>ProxyFactoryObject</literal> or similar factory objects. For
+    applications that would like create many AOP proxies, say across all the
+    classes in a service layer, this approach can lead to a lengthy
+    configuration file. To simplify the creation of many AOP proxies Spring
+    provides "autoproxy" capabilities that will automatically proxy object
+    definitions based on higher level criteria that will group together
+    multiple objects as candidates to be proxied.</para>
+
+    <para>This functionality is built on Spring "object post-processor"
+    infrastructure, which enables modification of any object definition as the
+    container loads. Refer to <xref linkend="objects-factory-customizing" />
+    for general information on object post-processors.</para>
+
+    <para>In this model, you set up some special object definitions in your
+    XML object definition file configuring the auto proxy infrastructure. This
+    allows you just to declare the targets eligible for autoproxying: you
+    don't need to use <literal>ProxyFactoryObject</literal>.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Using an autoproxy creator that refers to specific objects in
+        the current context.</para>
+      </listitem>
+
+      <listitem>
+        <para>A special case of autoproxy creation that deserves to be
+        considered separately; autoproxy creation driven by source-level
+        attributes.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Autoproxying in general has the advantage of making it impossible
+    for callers or dependencies to obtain an un-advised object. Calling
+    GetObject("MyBusinessObject1") on an ApplicationContext will return an AOP
+    proxy, not the target business object. The "inline object" idiom shown
+    earlier in <xref linkend="aop-proxying-interfaces" /> also offers this
+    benefit.)</para>
+
+    <sect2 id="aop-autoproxy-choices">
+      <title>Autoproxy object definitions</title>
+
+      <para>The namespace <literal>Spring.Aop.Framework.AutoProxy</literal>
+      provides generic autoproxy infrastructure, should you choose to write
+      your own autoproxy implementations, as well as several out-of-the-box
+      implementations. Two implementations are provided,
+      <literal>ObjectNameAutoProxyCreator</literal> and
+      <literal>DefaultAdvisorAutoProxyCreator</literal>. These are discussed
+      in the following sections.</para>
+
+      <sect3 id="aop-nameautoproxy">
+        <title>ObjectNameAutoProxyCreator</title>
+
+        <para>The <literal>ObjectNameAutoProxyCreator</literal> automatically
+        creates AOP proxies for object with names matching literal values or
+        wildcards. The pattern matching expressions supported are of the form
+        "*name", "name*", and "*name*" and exact name matching, i.e. "name".
+        The following simple classes are used to demonstrate this autoproxy
+        functionality.</para>
+
+        <programlisting>public enum Language
+{
+    English = 1,
+    Portuguese = 2,
+    Italian = 3
+}
+
+
+public interface IHelloWorldSpeaker
+{
+   void SayHello();
+}
+
+
+public class HelloWorldSpeaker : IHelloWorldSpeaker
+{
+    private Language language;
+
+    public Language Language
+    {
+        set { language = value; }
+        get { return language; }
+    }
+
+    public void SayHello()
+    {
+        switch (language)
+        {
+            case Language.English:
+                Console.WriteLine("Hello World!");
+                break;
+            case Language.Portuguese:
+                Console.WriteLine("Oi Mundo!");
+                break;
+            case Language.Italian:
+                Console.WriteLine("Ciao Mondo!");
+                break;
+        }
+    }
+}
+
+
+public class DebugInterceptor : IMethodInterceptor
+{
+    public object Invoke(IMethodInvocation invocation)
+    {
+        Console.WriteLine("Before: " + invocation.Method.ToString());
+        object rval = invocation.Proceed();
+        Console.WriteLine("After:  " + invocation.Method.ToString());
+        return rval;
+    }
+
+}</programlisting>
+
+        <para>The following XML is used to automatically create an AOP proxy
+        and apply a Debug interceptor to object definitions whose names match
+        "English*" and "PortugueseSpeaker".</para>
+
+        <programlisting>&lt;object id="ProxyCreator" type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop"&gt;
+  &lt;property name="ObjectNames"&gt;
+      &lt;list&gt;
+          &lt;value&gt;English*&lt;/value&gt;
+          &lt;value&gt;PortugeseSpeaker&lt;/value&gt;
+      &lt;/list&gt;
+  &lt;/property&gt;
+  &lt;property name="InterceptorNames"&gt;
+      &lt;list&gt;
+          &lt;value&gt;debugInterceptor&lt;/value&gt;
+      &lt;/list&gt;
+  &lt;/property&gt;
+&lt;/object&gt;
+
+&lt;object id="debugInterceptor" type="AopPlay.DebugInterceptor, AopPlay"/&gt;
+
+&lt;object id="EnglishSpeakerOne" type="AopPlay.HelloWorldSpeaker, AopPlay"&gt;
+  &lt;property name="Language" value="English"/&gt;
+&lt;/object&gt;
+
+&lt;object id="EnglishSpeakerTwo" type="AopPlay.HelloWorldSpeaker, AopPlay"&gt;
+  &lt;property name="Language" value="English"/&gt;
+&lt;/object&gt;
+
+&lt;object id="PortugeseSpeaker" type="AopPlay.HelloWorldSpeaker, AopPlay"&gt;
+  &lt;property name="Language" value="Portuguese"/&gt;
+&lt;/object&gt;
+            
+&lt;object id="ItalianSpeakerOne" type="AopPlay.HelloWorldSpeaker, AopPlay"&gt;
+  &lt;property name="Language" value="Italian"/&gt;
+&lt;/object&gt;</programlisting>
+
+        <para>As with <literal>ProxyFactoryObject</literal>, there is an
+        InterceptorNames property rather than a list of interceptors, to allow
+        correct behavior for prototype advisors. Named "interceptors" can be
+        advisors or any advice type.</para>
+
+        <para>The same advice will be applied to all matching objects. Note
+        that if advisors are used (rather than the interceptor in the above
+        example), the pointcuts may apply differently to different
+        objects.</para>
+
+        <para>Running the following simple program demonstrates the
+        application of the AOP interceptor.</para>
+
+        <programlisting>
+IApplicationContext ctx = ContextRegistry.GetContext();
+IDictionary speakerDictionary = ctx.GetObjectsOfType(typeof(IHelloWorldSpeaker));
+foreach (DictionaryEntry entry in speakerDictionary)
+{
+    string name = (string)entry.Key;
+    IHelloWorldSpeaker worldSpeaker = (IHelloWorldSpeaker)entry.Value;
+    Console.Write(name + " says; ");
+    worldSpeaker.SayHello(); 
+}
+</programlisting>
+
+        <para>The output is shown below</para>
+
+        <programlisting>ItalianSpeakerOne says; Ciao Mondo!
+EnglishSpeakerTwo says; Before: Void SayHello()
+Hello World!
+After:  Void SayHello()
+PortugeseSpeaker says; Before: Void SayHello()
+Oi Mundo!
+After:  Void SayHello()
+EnglishSpeakerOne says; Before: Void SayHello()
+Hello World!
+After:  Void SayHello()</programlisting>
+      </sect3>
+
+      <sect3 id="aop-advisorautoproxy">
+         
+
+        <title>DefaultAdvisorAutoProxyCreator</title>
+
+         
+
+        <para>A more general and extremely powerful auto proxy creator is
+        <literal>DefaultAdvisorAutoProxyCreator</literal>. This will
+        automatically apply eligible advisors in the current application
+        context, without the need to include specific object names in the
+        autoproxy advisor's object definition. It offers the same merit of
+        consistent configuration and avoidance of duplication as
+        <literal>ObjectNameAutoProxyCreator</literal>.</para>
+
+         
+
+        <para>Using this mechanism involves:</para>
+
+         
+
+        <itemizedlist>
+          <listitem>
+            <para>Specifying a
+            <literal>DefaultAdvisorAutoProxyCreator</literal> object
+            definition</para>
+          </listitem>
+
+          <listitem>
+            <para>Specifying any number of Advisors in the same or related
+            contexts. Note that these <emphasis>must</emphasis> be Advisors,
+            not just interceptors or other advices. This is necessary because
+            there must be a pointcut to evaluate, to check the eligibility of
+            each advice to candidate object definitions.</para>
+          </listitem>
+        </itemizedlist>
+
+         
+
+        <para>The <literal>DefaultAdvisorAutoProxyCreator</literal> will
+        automatically evaluate the pointcut contained in each advisor, to see
+        what (if any) advice it should apply to each object defined in the
+        application context.</para>
+
+         
+
+        <para>This means that any number of advisors can be applied
+        automatically to each business object. If no pointcut in any of the
+        advisors matches any method in a business object, the object will not
+        be proxied.</para>
+
+         
+
+        <para>The <literal>DefaultAdvisorAutoProxyCreator</literal> is very
+        useful if you want to apply the same advice consistently to many
+        business objects. Once the infrastructure definitions are in place,
+        you can simply add new business objects without including specific
+        proxy configuration. You can also drop in additional aspects very
+        easily--for example, tracing or performance monitoring aspects--with
+        minimal change to configuration.</para>
+
+         
+
+        <para>The following example demonstrates the use of
+        <literal>DefaultAdvisorAutoProxyCreator</literal>. Expanding on the
+        previous example code used to demonstrate
+        <literal>ObjectNameAutoProxyCreator</literal> we will add a new class,
+        <literal>SpeakerDao</literal>, that acts as a Data Access Object to
+        find and store <literal>IHelloWorldSpeaker</literal> objects.
+        <programlisting>
+public interface ISpeakerDao
+{
+    IList FindAll();
+
+    IHelloWorldSpeaker Save(IHelloWorldSpeaker speaker);
+}
+
+public class SpeakerDao : ISpeakerDao
+{
+    public System.Collections.IList FindAll()
+    {
+        Console.WriteLine("Finding speakers...");
+	// just a demo...fake the retrieval.
+        Thread.Sleep(10000);
+        HelloWorldSpeaker speaker = new HelloWorldSpeaker();
+        speaker.Language = Language.Portuguese;
+
+        IList list = new ArrayList();
+        list.Add(speaker);
+        return list;
+    }
+
+    public IHelloWorldSpeaker Save(IHelloWorldSpeaker speaker)
+    {
+        Console.WriteLine("Saving speaker...");
+        // just a demo...not really saving...
+        return speaker;
+    }
+
+}
+</programlisting></para>
+
+         The XML configuration specifies two Advisors, that is, the combination of advice (the behavior to add) and a pointcut (where the behavior should be applied). A 
+
+        <literal>RegularExpressionMethodPointcutAdvisor</literal>
+
+         is used as a convenience to specify the pointcut as a regular expression that matches methods names. Other pointcuts of your own creation could be used, in which case a 
+
+        <classname>DefaultPointcutAdvisor</classname>
+
+         would be used to define the Advisor. The object definitions for these advisors, advice, and SpeakerDao object are shown below 
+
+        <programlisting>&lt;object id="SpeachAdvisor" type="Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor, Spring.Aop"&gt;
+    
+    &lt;property name="advice" ref="debugInterceptor"/&gt;            
+    &lt;property name="patterns"&gt;
+        &lt;list&gt;
+            &lt;value&gt;.*Say.*&lt;/value&gt;
+        &lt;/list&gt;
+    &lt;/property&gt;
+    
+&lt;/object&gt;
+
+&lt;object id="AdoAdvisor" type="Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor, Spring.Aop"&gt;
+    
+    &lt;property name="advice" ref="timingInterceptor"/&gt;            
+    &lt;property name="patterns"&gt;
+        &lt;list&gt;
+            &lt;value&gt;.*Find.*&lt;/value&gt;
+        &lt;/list&gt;
+    &lt;/property&gt;
+    
+&lt;/object&gt;
+
+// Advice
+&lt;object id="debugInterceptor" type="AopPlay.DebugInterceptor, AopPlay"/&gt;
+
+&lt;object id="timingInterceptor" type="AopPlay.TimingInterceptor, AopPlay"/&gt;
+
+// Speaker DAO Object - has 'FindAll' Method.
+&lt;object id="speakerDao" type="AopPlay.SpeakerDao, AopPlay"/&gt;
+
+// HelloWorldSpeaker objects as previously listed.
+
+</programlisting>
+
+         
+
+        <para>Adding an instance of
+        <literal>DefaultAdvisorAutoProxyCreator</literal> to the configuration
+        file <programlisting>&lt;object id="ProxyCreator" type="Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator, Spring.Aop"/&gt;</programlisting>
+        will apply the debug interceptor on all objects in the context that
+        have a method that contains the text "Say" and apply the timing
+        interceptor on objects in the context that have a method that contains
+        the text "Find". Running the following code demonstrates this
+        behavior. Note that the "Save" method of SpeakerDao does not have any
+        advice applied to it.</para>
+
+         
+
+        <programlisting>
+IApplicationContext ctx = ContextRegistry.GetContext();
+IDictionary speakerDictionary = ctx.GetObjectsOfType(typeof(IHelloWorldSpeaker));
+foreach (DictionaryEntry entry in speakerDictionary)
+{
+    string name = (string)entry.Key;
+    IHelloWorldSpeaker worldSpeaker = (IHelloWorldSpeaker)entry.Value;
+    Console.Write(name + " says; ");
+    worldSpeaker.SayHello(); 
+}
+ISpeakerDao dao = (ISpeakerDao)ctx.GetObject("speakerDao");
+IList speakerList = dao.FindAll();
+IHelloWorldSpeaker speaker = dao.Save(new HelloWorldSpeaker());
+</programlisting>
+
+         
+
+        <para>This produces the following output</para>
+
+         
+
+        <programlisting>
+ItalianSpeakerOne says; Before: Void SayHello()
+Ciao Mondo!
+After:  Void SayHello()
+EnglishSpeakerTwo says; Before: Void SayHello()
+Hello World!
+After:  Void SayHello()
+PortugeseSpeaker says; Before: Void SayHello()
+Oi Mundo!
+After:  Void SayHello()
+EnglishSpeakerOne says; Before: Void SayHello()
+Hello World!
+After:  Void SayHello()
+Finding speakers...
+Elapsed time = 00:00:10.0154745
+Saving speaker...
+</programlisting>
+
+         
+
+        <para>The DefaultAdvisorAutoProxyCreator offers support for filtering
+        (using a naming convention so that only certain advisors are
+        evaluated, allowing use of multiple, differently configured,
+        AdvisorAutoProxyCreators in the same factory) and ordering. Advisors
+        can implement the <literal>Spring.Core.IOrdered</literal> interface to
+        ensure correct ordering if this is an issue. The default is
+        unordered.</para>
+
+         
+      </sect3>
+
+      <sect3>
+        <title>AbstractAutoProxyCreator</title>
+
+        <para>This is the superclass of DefaultAdvisorAutoProxyCreator. You
+        can create your own autoproxy creators by subclassing this class, in
+        the unlikely event that advisor definitions offer insufficient
+        customization to the behavior of the framework
+        <literal>DefaultAdvisorAutoProxyCreator</literal>.</para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="aop-autoproxy-metadata">
+      <title>Using attribute-driven auto-proxying</title>
+
+      <para>A particularly important type of autoproxying is driven by
+      attributes. The programming model is similar to using Enterprise
+      Services with ServicedComponents.</para>
+
+      <para>In this case, you use the
+      <literal>DefaultAdvisorAutoProxyCreator</literal>, in combination with
+      Advisors that understand attributes. The Advisor pointcut is identified
+      by the presence of .NET attribute in the source code and it is
+      configured via the data and/or methods of the attribute. This is a
+      powerful alternative to identifying the advisor pointcut and advice
+      configuration through traditional property configuration, either
+      programmatic or through XML based configuration.</para>
+
+      <para>Several of the aspect provided with Spring use attribute driven
+      autoproxying. The most prominent example is <link
+      linkend="transactions">Transaction</link> support.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="aop-namespace">
+    <title>Using AOP Namespace</title>
+
+    <para>The AOP namespace allows you to define an advisor, i.e pointcut + 1
+    piece of advice, in a more declarative manner. Under the covers the
+    DefaultAdvisorAutoProxyCreator is being used. Here is an example,</para>
+
+    <programlisting>&lt;objects xmlns="http://www.springframework.net"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:aop="http://www.springframework.net/schema/aop"
+		xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/schema/objects/spring-objects-1.1.xsd
+				http://www.springframework.net/schema/aop http://www.springframework.net/schema/aop/spring-aop-1.1.xsd"&gt;
+
+	&lt;aop:config&gt;
+
+		&lt;aop:advisor id="getDescriptionAdvisor" pointcut-ref="getDescriptionCalls" advice-ref="getDescriptionCounter"/&gt;
+
+	&lt;/aop:config&gt;
+
+	&lt;object id="getDescriptionCalls" 
+		type="Spring.Aop.Support.SdkRegularExpressionMethodPointcut, Spring.Aop"&gt;
+		&lt;property name="patterns"&gt;
+			&lt;list&gt;
+				&lt;value&gt;.*GetDescription.*&lt;/value&gt;
+			&lt;/list&gt;
+		&lt;/property&gt;
+	&lt;/object&gt;
+	
+	
+	&lt;object id="getDescriptionCounter" type="Spring.Aop.Framework.CountingBeforeAdvice, Spring.Aop.Tests"/&gt;
+
+	&lt;object name="testObject" type="Spring.Objects.TestObject, Spring.Core.Tests"/&gt;
+
+
+&lt;/objects&gt;</programlisting>
+
+    <para>In this example, the TestObject, which implements the interface
+    ITestObject, is having AOP advice applied to it. The method
+    GetDescription() is specified as a regular expression pointcut. The
+    aop:config tag and subsequent child tag, aop:advisor, brings together the
+    pointcut with the advice.</para>
+
+    <para>In order to have Spring.NET recognise the aop namespace, you need to
+    declare the namespace parser in the main Spring.NET configuration section.
+    For convenience this is shown below. Please refer to the section titled
+    <link lang="" linkend="context-configuration">context configuration</link>
+    for more extensive information..</para>
+
+    <para><programlisting>&lt;configuration&gt;
+
+  &lt;configSections&gt;
+    &lt;sectionGroup name="spring"&gt;
+
+      &lt;section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/&gt;
+      &lt;section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" /&gt;
+        
+      <emphasis role="bold">&lt;section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/&gt;</emphasis> 
+        
+     &lt;/sectionGroup&gt;
+  &lt;/configSections&gt;
+
+  &lt;spring&gt;
+
+<emphasis role="bold">    &lt;parsers&gt; 
+      &lt;parser type="Spring.Aop.Config.AopNamespaceParser, Spring.Aop" /&gt; 
+    &lt;/parsers&gt; </emphasis>
+                                            
+        
+    &lt;context&gt;
+      &lt;resource uri="config://spring/objects"/&gt;       
+    &lt;/context&gt;     
+
+    &lt;objects xmlns="http://www.springframework.net"&gt;
+        ...
+    &lt;/objects&gt;
+
+  &lt;/spring&gt;
+
+&lt;/configuration&gt;
+        </programlisting></para>
+  </sect1>
+
+  <sect1 id="aop-targetsource">
+    <title>Using TargetSources</title>
+
+    <para>Spring.NET offers the concept of a
+    <emphasis>TargetSource</emphasis>, expressed in the
+    <literal>Spring.Aop.ITargetSource</literal> interface. This interface is
+    responsible for returning the "target object" implementing the joinpoint.
+    The <literal>TargetSource</literal> implementation is asked for a target
+    instance each time the AOP proxy handles a method invocation.</para>
+
+    <para>Developers using Spring.NET AOP don't normally need to work directly
+    with TargetSources, but this provides a powerful means of supporting
+    pooling, hot swappable and other sophisticated targets. For example, a
+    pooling TargetSource can return a different target instance for each
+    invocation, using a pool to manage instances.</para>
+
+    <para>If you do not specify a TargetSource, a default implementation is
+    used that wraps a local object. The same target is returned for each
+    invocation (as you would expect).</para>
+
+    <para>Let's look at the standard target sources provided with Spring.NET,
+    and how you can use them.</para>
+
+    <remark>When using a custom target source, your target will usually need
+    to be a prototype rather than a singleton object definition. This allows
+    Spring.NET to create a new target instance when required.</remark>
+
+    <sect2 id="aop-ts-swap">
+      <title>Hot swappable target sources</title>
+
+      <para>The
+      <literal>org.Spring.NETframework.aop.target.HotSwappableTargetSource</literal>
+      exists to allow the target of an AOP proxy to be switched while allowing
+      callers to keep their references to it.</para>
+
+      <para>Changing the target source's target takes effect immediately. The
+      <literal>HotSwappableTargetSource</literal> is thread safe.</para>
+
+      <para>You can change the target via the <literal>swap()</literal> method
+      on HotSwappableTargetSource as follows:</para>
+
+      <para><programlisting>HotSwappableTargetSource swapper = 
+    (HotSwappableTargetSource) objectFactory.GetObject("swapper");
+object oldTarget = swapper.swap(newTarget);</programlisting></para>
+
+      <para>The XML definitions required look as follows:</para>
+
+      <programlisting>&lt;object id="initialTarget" type="MyCompany.OldTarget, MyCompany"&gt;
+&lt;/object&gt;
+
+&lt;object id="swapper" 
+    type="Spring.Aop.Target.HotSwappableTargetSource, Spring.Aop"&gt;
+    &lt;constructor-arg&gt;&lt;ref local="initialTarget"/&gt;&lt;/constructor-arg&gt;
+&lt;/object&gt;
+
+&lt;object id="swappable" 
+    type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop"
+&gt;
+    &lt;property name="targetSource"&gt;
+        &lt;ref local="swapper"/&gt;
+    &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+
+      <para>The above <literal>swap()</literal> call changes the target of the
+      swappable object. Clients who hold a reference to that object will be
+      unaware of the change, but will immediately start hitting the new
+      target.</para>
+
+      <para>Although this example doesn't add any advice--and it's not
+      necessary to add advice to use a <literal>TargetSource</literal>--of
+      course any <literal>TargetSource</literal> can be used in conjunction
+      with arbitrary advice.</para>
+    </sect2>
+
+    <sect2 id="aop-ts-pool">
+      <title>Pooling target sources</title>
+
+      <para>Using a pooling target source provides a programming model in
+      which a pool of identical instances is maintained, with method
+      invocations going to free objects in the pool.</para>
+
+      <para>A crucial difference between Spring.NET pooling and pooling in
+      .NET Enterprise Services pooling is that Spring.NET pooling can be
+      applied to any PONO. (Plain old .NET object). As with Spring.NET in
+      general, this service can be applied in a non-invasive way.</para>
+
+      <para>Spring.NET provides out-of-the-box support using a pooling
+      implementation based on Jakarta Commons Pool 1.1, which provides a
+      fairly efficient pooling implementation. It's also possible to subclass
+      <literal>Spring.Aop.Target.AbstractPoolingTargetSource</literal> to
+      support any other pooling API.</para>
+
+      <para>Sample configuration is shown below:</para>
+
+      <programlisting>&lt;object id="businessObjectTarget" type="MyCompany.MyBusinessObject, MyCompany" singleton="false"&gt;
+    ... properties omitted
+&lt;/object&gt;
+
+&lt;object id="poolTargetSource" type="Spring.Aop.Target.SimplePoolTargetSource, Spring.Aop"&gt;
+    &lt;property name="targetObjectName" value="businessObjectTarget"/&gt;
+    &lt;property name="maxSize" value="25"/&gt;
+&lt;/object&gt;
+
+&lt;object id="businessObject" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop"&gt;
+    &lt;property name="targetSource" ref="poolTargetSource"/&gt;
+    &lt;property name="interceptorNames" value="myInterceptor"/&gt;
+&lt;/object&gt;</programlisting>
+
+      <para>Note that the target object--"businessObjectTarget" in the
+      example--<emphasis>must</emphasis> be a prototype. This allows the
+      <literal>PoolingTargetSource</literal> implementation to create new
+      instances of the target to grow the pool as necessary. See the SDK
+      documentation for <literal>AbstractPoolingTargetSource</literal> and the
+      concrete subclass you wish to use for information about it's properties:
+      maxSize is the most basic, and always guaranteed to be present.</para>
+
+      <para>In this case, "myInterceptor" is the name of an interceptor that
+      would need to be defined in the same IoC context. However, it isn't
+      necessary to specify interceptors to use pooling. If you want only
+      pooling, and no other advice, don't set the interceptorNames property at
+      all.</para>
+
+      <para>It's possible to configure Spring.NET so as to be able to cast any
+      pooled object to the <literal>Spring.Aop.Target.PoolingConfig</literal>
+      interface, which exposes information about the configuration and current
+      size of the pool through an introduction. You'll need to define an
+      advisor like this:</para>
+
+      <programlisting>&lt;object id="poolConfigAdvisor" 
+    type="Spring.Object.Factory.Config.MethodInvokingFactoryObject, Spring.Aop"&gt;
+    &lt;property name="target" ref="poolTargetSource" /&gt;
+    &lt;property name="targetMethod" value="getPoolingConfigMixin" /&gt;
+&lt;/object&gt;</programlisting>
+
+      <para>This advisor is obtained by calling a convenience method on the
+      <classname>AbstractPoolingTargetSource</classname> class, hence the use
+      of <classname>MethodInvokingFactoryObject</classname>. This advisor's
+      name (<literal>'poolConfigAdvisor'</literal> here) must be in the list
+      of interceptor names in the <classname>ProxyFactoryObject</classname>
+      exposing the pooled object.</para>
+
+      <para>The cast will look as follows:</para>
+
+      <programlisting>PoolingConfig conf = (PoolingConfig) objectFactory.GetObject("businessObject");
+Console.WriteLine("Max pool size is " + conf.getMaxSize());</programlisting>
+
+      <remark>Pooling stateless service objects is not usually necessary. We
+      don't believe it should be the default choice, as most stateless objects
+      are naturally threadsafe, and instance pooling is problematic if
+      resources are cached.</remark>
+
+      <para>Simpler pooling is available using autoproxying. It's possible to
+      set the TargetSources used by any autoproxy creator.</para>
+    </sect2>
+
+    <sect2 id="aop-ts-prototype">
+      <title>Prototype target sources</title>
+
+      <para>Setting up a "prototype" target source is similar to a pooling
+      TargetSource. In this case, a new instance of the target will be created
+      on every method invocation. Although the cost of creating a new object
+      may not be high, the cost of wiring up the new object (satisfying its
+      IoC dependencies) may be more expensive. Thus you shouldn't use this
+      approach without very good reason.</para>
+
+      <para>To do this, you could modify the
+      <literal>poolTargetSource</literal> definition shown above as follows.
+      (the name of the definition has also been changed, for clarity.)</para>
+
+      <programlisting>&lt;object id="prototypeTargetSource" 
+        type="Spring.Aop.Target.PrototypeTargetSource, Spring.Aop"&gt;
+    &lt;property name="targetObjectName" value="businessObject" /&gt;
+&lt;/object&gt;</programlisting>
+
+      <para>There is only one property: the name of the target object.
+      Inheritance is used in the TargetSource implementations to ensure
+      consistent naming. As with the pooling target source, the target object
+      must be a prototype object definition, the singleton property of the
+      target should be set to false.</para>
+    </sect2>
+
+    <sect2>
+      <title>ThreadLocal target sources</title>
+
+      <para>ThreadLocal target sources are useful if you need an object to be
+      created for each incoming request (per thread that is). The concept of a
+      ThreadLocal provides a facility to transparently store resource
+      alongside a thread. Setting up a ThreadLocalTargetSource is pretty much
+      the same as was explained for the other types of target source:</para>
+
+      <programlisting>&lt;object id="threadlocalTargetSource" 
+        type="Spring.Aop.Target.ThreadLocalTargetSource, Spring.Aop"&gt;
+    &lt;property name="targetObjectName" value="businessObject" /&gt;
+&lt;/object&gt;</programlisting>
+    </sect2>
+  </sect1>
+
+  <sect1 id="aop-extensibility">
+    <title>Defining new Advice types</title>
+
+    <para>Spring.NET AOP is designed to be extensible. While the interception
+    implementation strategy is presently used internally, it is possible to
+    support arbitrary advice types in addition to interception around, before,
+    throws, and after returning advice, which are supported out of the
+    box.</para>
+
+    <para>The <literal>Spring.Aop.Framework.Adapter</literal> package is an
+    SPI (Service Provider Interface) package allowing support for new custom
+    advice types to be added without changing the core framework. The only
+    constraint on a custom Advice type is that it must implement the
+    <classname>AopAlliance.Aop.IAdvice</classname> tag interface.</para>
+
+    <para>Please refer to the <literal>Spring.Aop.Framework.Adapter</literal>
+    namespace documentation for further information.</para>
+  </sect1>
+
+  <sect1 id="aop-futher-reading">
+    <title>Further reading and resources</title>
+
+    <para>The Spring.NET team recommends the excellent <emphasis>AspectJ in
+    Action</emphasis> by Ramnivas Laddad (Manning, 2003) for an introduction
+    to AOP.</para>
+
+    <para>If you are interested in more advanced capabilities of Spring.NET
+    AOP, take a look at the test suite as it illustrates advanced features not
+    discussed in this document.</para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/background.xml b/doc/reference/src/background.xml
new file mode 100644
index 00000000..c401cab5
--- /dev/null
+++ b/doc/reference/src/background.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="background">
+  <title>Background information</title>
+
+  <sect1 id="background-ioc">
+    <title>Inversion of Control</title>
+
+    <para>In early 2004, Martin Fowler asked the readers of his site: when
+    talking about Inversion of Control: <emphasis>"the question, is what
+    aspect of control are they inverting?"</emphasis>. After talking about the
+    term Inversion of Control Martin suggests renaming the pattern, or at
+    least giving it a more self-explanatory name, and starts to use the term
+    <emphasis>Dependency Injection</emphasis>. His <ulink
+    url="http://martinfowler.com/articles/injection.html">article</ulink>
+    continues to explain some of the ideas behind this important software
+    engineering principle.</para>
+
+    <para>Other references you may find useful are</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Wikipedia Article - <ulink
+        url="http://en.wikipedia.org/wiki/Dependency_injection">Dependency
+        Injection</ulink></para>
+      </listitem>
+
+      <listitem>
+        <para>CodeProject article - <ulink
+        url="http://www.codeproject.com/cs/design/DependencyInjection.asp">Dependency
+        Injection for Loose Coupling</ulink></para>
+      </listitem>
+    </itemizedlist>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/dao.xml b/doc/reference/src/dao.xml
new file mode 100644
index 00000000..30d7ad00
--- /dev/null
+++ b/doc/reference/src/dao.xml
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="dao">
+  <title>DAO support</title>
+
+  <section id="dao-introduction">
+    <title>Introduction</title>
+
+    <para>Spring promotes the use of data access interfaces in your
+    application architecture. These interfaces encapsulate the storage and
+    retrieval of data and objects specific to your business domain without
+    reference to a specific persistence API. Within a layered architecture,
+    the service layer is typically responsible for coordinating responses to a
+    particular business request and it delegates any persistence related
+    activities to objects that implement these data access interfaces. These
+    objects are commonly referred to as DAOs (Data Access Objects) and the
+    architectural layer as a DAL (Data Access Layer).</para>
+
+    <para>The benefits of using DAOs in your application are increased
+    portability across persistence technology and ease of testing. Testing is
+    more easily facilitated because a mock or stub implementation of the data
+    access interface can be easily created in a NUnit test so that service
+    layer functionality can be tested without any dependency on the database.
+    This is beneficial because tests that rely on the database are usually
+    hard to set up and tear down and also are impractical for testing
+    exceptional behavior.</para>
+
+    <para>The Data Access Object (DAO) support in Spring is aimed at making it
+    easy to work with data access technologies like ADO.NET and NHibernate in
+    a standardized way. Spring provides two central pieces of functionality to
+    meet this goal. The first is providing a common exception hierarchy across
+    providers and the second is providing base DAOs classes that raise the
+    level of abstraction when performing common ADO.NET operations. This
+    allows one to switch between the aforementioned persistence technologies
+    fairly easily and it also allows one to code without worrying about
+    catching exceptions that are specific to each technology.</para>
+  </section>
+
+  <section id="dao-exceptions">
+    <title>Consistent exception hierarchy</title>
+
+    <para>Database exceptions in the ADO.NET API are not consistent across
+    providers. The .NET 1.1 BCL did not provide a common base class for
+    ADO.NET exceptions. As such you were required to handle exceptions
+    specific to each provider such as
+    <classname>System.Data.SqlClient.SqlException</classname> or
+    <classname>System.Data.OracleClient.OracleException</classname>. The .NET
+    2.0 BCL improved in this regard by introducing a common base class for
+    exceptions, <classname>System.Data.Common.DbException</classname>. However
+    the common DbException is not very portable either as it provides a vendor
+    specific error code as the underlying piece of information as to what went
+    wrong. This error code is different across providers for the same
+    conceptual error, such as a violation of data integrity or providing bad
+    SQL grammar.</para>
+
+    <para>To promote writing portable and descriptive exception handling code
+    Spring provides a convenient translation from technology specific
+    exceptions like <classname>System.Data.SqlClient.SqlException</classname>
+    or <classname>System.Data.OracleClient.OracleException</classname> to its
+    own exception hierarchy with the
+    <classname>Spring.Dao.DataAccessException</classname> as the root
+    exception. These exceptions wrap the original exception so there is never
+    any risk that one might lose any information as to what might have gone
+    wrong.</para>
+
+    <para>In addition to exceptions from ADO.NET providers, Spring can also
+    wrap NHibernate-specific exceptions.. This allows one to handle most
+    persistence exceptions, which are non-recoverable, only in the appropriate
+    layers, without boilerplate using or catch and throw blocks, and exception
+    declarations. As mentioned above, ADO.NET exceptions (including
+    database-specific dialects) are also converted to the same hierarchy,
+    meaning that one can perform some operations with ADO.NET within a
+    consistent programming model. The above holds true for the various
+    template-based versions of the ORM access framework.</para>
+
+    <para>The exception hierarchy that Spring uses is outlined in the
+    following image:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="images/DataAccessException.gif" />
+      </imageobject>
+    </mediaobject>
+
+    <para>(Please note that the class hierarchy detailed in the above image
+    shows only a subset of the whole, rich,
+    <classname>DataAccessException</classname> hierarchy.)</para>
+
+    <para>The exception translation functionality is in the namespace
+    Spring.Data.Support and is based on the interface
+    <literal>IAdoExceptionTranslator</literal> shown below.</para>
+
+    <programlisting>public interface IAdoExceptionTranslator
+{
+  DataAccessException Translate( string task, string sql, Exception exception );
+}</programlisting>
+
+    <para>The arguments to the translator are a task string providing a
+    description of the task being attempted, the SQL query or update that
+    caused the problem, and the 'raw' exception thrown by the ADO.NET data
+    provider. The additional task and SQL arguments allow for very readable
+    and clear error messages to be created when an exception occurs.</para>
+
+    <para>A default implementation,
+    <literal>ErrorCodeExceptionTranslator</literal>, is provided that uses the
+    error codes defined for each data provider in the file dbproviders.xml.
+    Refer to this file, an embedded resource in the Spring.Data assembly, for
+    the exact mappings of error codes to Spring DataAccessExceptions.</para>
+
+    <para>A common need is to modify the error codes that are map onto the
+    exception hierarchy. There are several ways to accomplish this
+    task.</para>
+
+    <para>One approach is to override the error codes that are defined in
+    <code>assembly://Spring.Data/Spring.Data.Common/dbproviders.xml</code>. By
+    default, the <link
+    linkend="dbprovider-dbprovider">DbProviderFactory</link> will look for
+    additional metadata for the IoC container it uses internally to define and
+    manage the DbProviders in a file named <literal>dbProviders.xml</literal>
+    located in the root runtime directory. (You can change this location, see
+    the documentation on <link lang=""
+    linkend="dbprovider-dbprovider">DbProvider</link> for more information.)
+    This is a standard Spring application context so all features, such as
+    <link
+    linkend="objects-factory-customizing-factory-postprocessors">ObjectFactoryPostProcessors</link>
+    are available and will be automatically applied. Defining a <link
+    linkend="objects-factory-overrideconfigurer">PropertyOverrideConfigurer</link>
+    in this additional configuration file will allow for you to override
+    specific property values defined in the embedded resource file. As an
+    example, the additional <literal>dbProviders.xml</literal> file shown
+    below will add the error code <literal>2601</literal> to the list of error
+    codes that map to a
+    <literal>DataIntegrityViolationException</literal>.</para>
+
+    <para><programlisting>&lt;objects xmlns='http://www.springframework.net'&gt;
+ 
+  &lt;alias name='SqlServer-2.0' alias='SqlServer2005'/&gt;
+ 
+  &lt;object name="appConfigPropertyOverride" type="Spring.Objects.Factory.Config.PropertyOverrideConfigurer, Spring.Core"&gt;
+    &lt;property name="Properties"&gt;
+      &lt;name-values&gt;
+        &lt;add key="SqlServer2005.DbMetadata.ErrorCodes.DataIntegrityViolationCodes"
+             value="544,2601,2627,8114,8115"/&gt;
+      &lt;/name-values&gt;
+    &lt;/property&gt;
+  &lt;/object&gt;
+
+&lt;/objects&gt;</programlisting>The reason to define the alias is that <link
+    linkend="objects-factory-overrideconfigurer">PropertyOverrideConfigurer</link>
+    assumes a period <literal>(.)</literal> as the separator to pick out the
+    object name but the names of the objects in
+    <literal>dbProviders.xml</literal> have periods in them (i.e.
+    SqlServer-2.0 or System.Data.SqlClient). Creating an alias that has no
+    periods in the name is a workaround.</para>
+
+    <para>Another way to customize the mappings of error codes to exceptions
+    is to subclass <classname>ErrorCodeExceptionTranslator</classname> and
+    override the method, <literal>DataAccessException
+    TranslateException(string task, string sql, string errorCode, Exception
+    exception)</literal>. This will be called before referencing the metadata
+    to perform exception translation. The vendor specific error code provided
+    as a method argument has already been parsed out of the raw ADO.NET
+    exception. If you create your own specific subclass, then you should set
+    the property <literal>ExceptionTranslator</literal> on
+    <literal>AdoTemplate</literal> and
+    <literal>HibernateTemplate/HibernateTransactionManager</literal> to refer
+    to your custom implementation (unless you are using autowiring).</para>
+
+    <para>The third way is to write an implementation of
+    <literal>IAdoExceptionTranslator</literal> and set the property
+    <literal>FallbackTranslator</literal>'on
+    <literal>ErrorCodeExceptionTranslator</literal>. In this case you are
+    responsible for parsing our the vendor specific error code from the raw
+    ADO.NET exception. As with the case of subclassing
+    ErrorCodeExceptionTranslator, you will need to refer to this custom
+    exception translator when using <literal>AdoTemplate</literal> or
+    <literal>HibernateTemplate/HibernateTransactionManager</literal>.</para>
+
+    <para>The ordering of the exception translation processing is as follows.
+    The method TranslateException is called first, then the standard exception
+    translation logic, then the FallbackTranslator.</para>
+
+    <para>Note that you can use this API directly in your own Spring
+    independent data layer. If you are using Spring's ADO.NET abstraction
+    class, <literal>AdoTemplate</literal>, or
+    <literal>HibernateTemplate</literal>, the converted exceptions will be
+    thrown automatically. Somewhere in between these two cases is using
+    Spring's declarative transaction management features in .NET 2.0 with the
+    raw ADO.NET APIs and using <literal>IAdoExceptionTranslator</literal> in
+    your exception handling layer (which might be implemented in AOP using
+    Spring's exception translation aspect).</para>
+
+    <para>Some of the more common data access exceptions are described here.
+    Please refer to the API documentation for more details.</para>
+
+    <table>
+      <title>Common DataAccessExceptions</title>
+
+      <tgroup cols="2">
+        <colspec align="left" />
+
+        <thead>
+          <row>
+            <entry>Exception</entry>
+
+            <entry>Description</entry>
+          </row>
+        </thead>
+
+        <tbody>
+          <row>
+            <entry>BadSqlGrammarException</entry>
+
+            <entry>Exception thrown when SQL specified is invalid.</entry>
+          </row>
+
+          <row>
+            <entry>DataIntegrityViolationException</entry>
+
+            <entry>Exception thrown when an attempt to insert or update data
+            results in violation of an integrity constraint. For example,
+            inserting a duplicate key.</entry>
+          </row>
+
+          <row>
+            <entry>PermissionDeniedDataAccessException</entry>
+
+            <entry>Exception thrown when the underling resource denied a
+            permission to access a specific element, such as a specific
+            database table.</entry>
+          </row>
+
+          <row>
+            <entry>DataAccessResourceFailureException</entry>
+
+            <entry>Exception thrown when a resource fails completely, for
+            example, if we can't connect to a database.</entry>
+          </row>
+
+          <row>
+            <entry>ConcurrentyFailureException</entry>
+
+            <entry>Exception thrown when a concurrency error occurs.
+            OptimisticLockingFailureException and
+            PessimisticLockingFailureException are subclasses. This is a
+            useful exception to catch and to retry the transaction again. See
+            Spring's <link linkend="retry-aspect">Retry Aspect</link> for an
+            AOP based solution.</entry>
+          </row>
+
+          <row>
+            <entry>OptimisticLockingFailureException</entry>
+
+            <entry>Exception thrown when there an optimistic locking failure
+            occurs. The subclass ObjectOptimisticLockingFailureException can
+            be used to examine the Type and the IDof the object that failed
+            the optimistic locking.</entry>
+          </row>
+
+          <row>
+            <entry>PessimisticLockingFailure</entry>
+
+            <entry>Exception thrown when a pessimistic locking failure
+            occures. Subclasses of this exception are
+            CannotAcquireLockException, CannotSerializeTransactionException,
+            and DeadlockLoserDataAccessException.</entry>
+          </row>
+
+          <row>
+            <entry>CannotAcquireLockException</entry>
+
+            <entry>Exception thrown when a lock can not be acquired, for
+            example during an update, i..e a select for update</entry>
+          </row>
+
+          <row>
+            <entry>CannotSerializeTransactionException</entry>
+
+            <entry>Exception thrown when a transaction can not be
+            serialized.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </section>
+
+  <section>
+    <title>Consistent abstract classes for DAO support</title>
+
+    <para>To make it easier to work with a variety of data access technologies
+    such as ADO.NET, NHibernate, and iBatis.NET in a consistent way, Spring
+    provides a set of abstract DAO classes that one can extend. These abstract
+    classes have methods for providing the data source and any other
+    configuration settings that are specific to the technology one is
+    currently using.</para>
+
+    <para>DAO support classes:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><classname>AdoDaoSupport</classname> - super class for ADO.NET
+        data access objects. Requires a
+        <interfacename>DbProvider</interfacename> to be provided; in turn,
+        this class provides a <classname>AdoTemplate</classname> instance
+        initialized from the supplied
+        <interfacename>DbProvider</interfacename> to subclasses. See the
+        documentation for <literal>AdoTemplate</literal> for more
+        information.</para>
+      </listitem>
+
+      <listitem>
+        <para><classname>HibernateDaoSupport</classname> - super class for
+        NHibernate data access objects. Requires a
+        <interfacename>ISessionFactory</interfacename> to be provided; in
+        turn, this class provides a <classname>HibernateTemplate</classname>
+        instance initialized from the supplied
+        <interfacename>SessionFactory</interfacename> to subclasses. Can
+        alternatively be initialized directly via a
+        <classname>HibernateTemplate</classname>, to reuse the latter's
+        settings like <interfacename>SessionFactory</interfacename>, flush
+        mode, exception translator, etc. This is contained in a download
+        separate from the main Spring.NET distribution.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/data-quickstart.xml b/doc/reference/src/data-quickstart.xml
new file mode 100644
index 00000000..4395c959
--- /dev/null
+++ b/doc/reference/src/data-quickstart.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="data-quickstart">
+  <title>Data Access QuickStart</title>
+
+  <section>
+    <title>Introduction</title>
+
+    <para>The data access quick start demonstrates the API usage of
+    AdoTemplate (both generic and non-generic versions) as well as the use of
+    the object based data access classes contained in Spring.Data.Objects. It
+    uses the Northwind database and is located under the directory
+    examples/DataAccessQuickStart.</para>
+
+    <para>The quick start contains pseudo DAO objects and a collection of
+    NUnit tests to exercise them rather than a full blown application. To run
+    the tests from within VS.NET install <ulink
+    url="http://www.testdriven.net/"><link
+    linkend="???">TestDriven.NET</link></ulink>, <ulink
+    url="http://www.jetbrains.com/resharper/">ReSharper</ulink>, or an
+    equivalent . The listing of DAO classes and the parts of Spring.Data that
+    they demonstrate is shown below.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><classname>CommandCallbackDao</classname> - Use of the
+        ICommandCallback and CommandCallbackDelegate</para>
+      </listitem>
+
+      <listitem>
+        <para><classname>ResultSetExtractorDao</classname> - Use of
+        IResultSetExtractor and ResultSetExtractorDelegate</para>
+      </listitem>
+
+      <listitem>
+        <para><classname>RowCallbackDao</classname> - Use of IRowCallback and
+        RowCallbackDelegate</para>
+      </listitem>
+
+      <listitem>
+        <para><classname>RowMapperDao</classname> - Use of IRowMapper and
+        RowMapperDelegate</para>
+      </listitem>
+
+      <listitem>
+        <para><classname>QueryForObject</classname> - Use of QueryForObject
+        method.</para>
+      </listitem>
+
+      <listitem>
+        <para><classname>StoredProcDao</classname> - Use of
+        Spring.Data.Objects.StoredProcedure</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>The are simple domain objects in the Spring.DataQuickStart.Domain
+    namespace, collections of which are generally returned from the DAO
+    methods.</para>
+
+    <section>
+      <title>Database configuration</title>
+
+      <para>To get started running the 'unit test' you should configure the
+      database connection string. The listing in
+      DataQuickStart.GenericTemplate.ExampleTests.xml is shown below</para>
+
+      <programlisting>&lt;objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database"&gt;
+
+  &lt;db:provider id="dbProvider" 
+                provider="SqlServer-1.1" 
+                connectionString="Data Source=(local);Database=Northwind;User ID=springqa;Password=springqa;Trusted_Connection=False"/&gt;
+
+
+  &lt;! -- other definitions not shown 
+
+
+&lt;/objects&gt;</programlisting>
+
+      <para>You should change the value of the provider element to correspond
+      to you database and the connection string as appropriate. Please refer
+      to the documentation on the <link linkend="dbprovider">DbProvider</link>
+      abstraction for details particular to your database configuration. You
+      should also install the Northwind database, which is available for
+      SqlServer 2005 from this <ulink
+      url="http://www.microsoft.com/downloads/details.aspx?FamilyID=06616212-0356-46a0-8da2-eebc53a68034&amp;DisplayLang=en">download
+      location</ulink>. The minimal schema to support other database providers
+      may be supported in the future.</para>
+
+      <section>
+        <title>AdoTemplate Configuration</title>
+
+        <para>The various DAO objects refer to an instance of AdoTemplate
+        which is responsible for performing data access operations. This is
+        declared in ExampleTest.xml as shown below</para>
+
+        <programlisting>  &lt;object id="adoTemplate" type="Spring.Data.Generic.AdoTemplate, Spring.Data"&gt;
+    &lt;property name="DbProvider" ref="dbProvider"/&gt;
+    &lt;property name="DataReaderWrapperType" value="Spring.Data.Support.NullMappingDataReader, Spring.Data"/&gt;
+  &lt;/object&gt;
+</programlisting>
+
+        <para>The property DbProvider refers to the database configuration you
+        previously defined. Also the property DataReaderWrapper is set to the
+        NullMappingDataReader that ships with Spring. This provides convenient
+        default values for null values returned from the database. To read
+        more about AdoTemplate, refer to the chapter, <link linkend="???">Data
+        access using ADO.NET</link>.</para>
+      </section>
+    </section>
+
+    <section>
+      <title>CommandCallback</title>
+
+      <para>The code that exercises the use of a CommandCallback is shown
+      below</para>
+
+      <programlisting>        [Test]
+        public void CallbackDaoTest()
+        {
+            CommandCallbackDao commandCallbackDao = ctx["commandCallbackDao"] as CommandCallbackDao;
+            int count = commandCallbackDao.FindCountWithPostalCode("1010");
+            Assert.AreEqual(3, count);
+        }</programlisting>
+
+      <para>The configuration of the CommandCallbackDao is shown below</para>
+
+      <programlisting>  &lt;object id="commandCallbackDao" type="Spring.DataQuickStart.Dao.GenericTemplate.CommandCallbackDao, Spring.DataQuickStart"&gt;
+    &lt;property name="AdoTemplate" ref="adoTemplate"/&gt;
+  &lt;/object&gt;</programlisting>
+
+      <para>This the minimal configuration required for a DAO object,
+      typically DAO objects in your application will include other
+      configuraiton information, for example properties to specify the maximum
+      size of the result set returned etc. The implementation of the
+      FindCountWithPostalCode is shown below</para>
+
+      <programlisting>        public virtual int FindCountWithPostalCodeWithDelegate(string postalCode)
+        {
+            // Using anonymous delegates allows you to easily reference the
+            // surrounding parameters for use with the DbCommand processing.
+
+            return AdoTemplate.Execute&lt;int&gt;(delegate(DbCommand command)
+                   {
+                       // Do whatever you like with the DbCommand... downcast to get 
+                       // provider specific funtionality if necesary.
+                                                    
+                       command.CommandText = cmdText;
+                         
+                       DbParameter p = command.CreateParameter();
+                       p.ParameterName = "@PostalCode";
+                       p.Value = postalCode;
+                       command.Parameters.Add(p);
+
+                       return (int)command.ExecuteScalar();
+
+                   });
+
+        }</programlisting>
+
+      <para>Anonymous delegates are used to specify the implementation of the
+      callback function that passes in a DbCommand object. You can then use
+      the DbCommand object as you see fit to access the database. If you are
+      using Spring's delcarative transaction management features then this
+      DbCommand would have its transaction and connection properties based on
+      the context of the surrounding transaction. All resource management for
+      the DbCommand are handled for you by the framework, as well as error
+      reporting on error etc. If you execute the test, it will pass, assuming
+      you haven't modified any data in the Northwind database from its raw
+      installation.</para>
+    </section>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/dbprovider.xml b/doc/reference/src/dbprovider.xml
new file mode 100644
index 00000000..4cc9ce7d
--- /dev/null
+++ b/doc/reference/src/dbprovider.xml
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="dbprovider">
+  <title>DbProvider</title>
+
+  <section id="dbprovider-introduction">
+    <title>Introduction</title>
+
+    <para>Spring provides a generic factory for creating ADO.NET API artifacts
+    such as <code><classname>IDbConnection</classname></code> and
+    <code><classname>IDbCommand</classname></code>. The factory API is very
+    similar to the one introduced in .NET 2.0 but adds extra metadata needed
+    by Spring to support features provided by its DAO/ADO.NET framework such
+    as error code translation to a DAO exception hierarchy. The factory itself
+    is configured by using a standard Spring XML based configuration file
+    though it is unlikely you will need to modify those settings yourself, you
+    only need be concerned with using the factory. Out of the box several
+    popular databases are supported and an extension mechanism is available
+    for defining new database providers or modifying existing ones. A custom
+    database namespace for configuration aids in making terse XML based
+    declarations of Spring's database objects you wish to use.</para>
+
+    <para>The downside of Spring's factory as compared to the one in .NET 2.0
+    is that the types returned are lower level interfaces and not the abstract
+    base classes in System.Data.Common. However, there are still 'holes' in
+    the current .NET 2.0 provider classes that are 'plugged' with Spring's
+    provider implementation. One of the most prominent is the that the top
+    level DbException exposes the HRESULT of the remote procedure call, which
+    is not what you are commonly looking for when things go wrong. As such
+    Spring's provider factory exposes the vendor sql error code and also maps
+    that error code onto a consistent data access exception hierarchy. This
+    makes writing portable exception handlers much easier. In addition, the
+    DbParameter class doesn't provide the most common convenient methods you
+    would expect as when using say the SqlServer provider. If you need to
+    access the BCL provider abstraction, you still can through Spring's
+    provider class. Furthermore, a small wrapper around the standard BCL
+    provider abstraction allows for integration with Spring's transaction
+    management facilities, allowing you to create a DbCommand with its
+    connection and transaction properties already set based on the transaction
+    calling context.</para>
+  </section>
+
+  <section id="dbprovider-dbprovider">
+    <title>IDbProvider and DbProviderFactory</title>
+
+    <para>The <code><interfacename>IDbProvider</interfacename></code> API is
+    shown below and should look familiar to anyone using .NET 2.0 data
+    providers. Note that Spring's DbProvider abstraction can be used on .NET
+    1.1 in addition to .NET 2.0</para>
+
+    <programlisting>    public interface IDbProvider
+    {
+        IDbCommand CreateCommand();
+
+        object CreateCommandBuilder();        
+        
+        IDbConnection CreateConnection();
+
+        IDbDataAdapter CreateDataAdapter();
+        
+        IDbDataParameter CreateParameter();
+        
+        string CreateParameterName(string name);
+
+        string CreateParameterNameForCollection(string name);
+
+        IDbMetadata DbMetadata
+        {
+            get;
+        }               
+
+        string ConnectionString
+        {
+            set;
+            get;
+        }
+        
+        string ExtractError(Exception e);
+
+        bool IsDataAccessException(Exception e);
+        
+    }</programlisting>
+
+    <para>ExtractError is used to return an error string for translation into
+    a DAO exception. On .NET 1.1 the method IsDataAccessException is used to
+    determine if the thrown exception is related to data access since in .NET
+    1.1 there isn't a common base class for database exceptions.
+    CreateParameterName is used to create the string for parameters used in a
+    CommandText object while CreateParameterNameForCollection is used to
+    create the string for a IDataParameter.ParameterName, typically contained
+    inside a IDataParameterCollection.</para>
+
+    <para>The class <classname>DbProviderFactory</classname> creates
+    IDbProvider instances given a provider name. The connection string
+    property will be used to set the IDbConnection returned by the factory if
+    present. The provider names, and corresponding database, currently
+    configured are listed below.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><code>SqlServer-1.1</code> - Microsoft SQL Server, provider
+        V1.0.5000.0 in framework .NET V1.1</para>
+      </listitem>
+
+      <listitem>
+        <para><code>SqlServer-2.0</code> (aliased to
+        <code>System.Data.SqlClient</code>) - Microsoft SQL Server, provider
+        V2.0.0.0 in framework .NET V2.0</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>SqlServerCe-3.1</literal> (aliased to
+        <literal>System.Data.SqlServerCe</literal>) - Microsoft SQL Server
+        Compact Edition, provider V9.0.242.0</para>
+      </listitem>
+
+      <listitem>
+        <para><code>OleDb-1.1</code> - OleDb, provider V1.0.5000.0 in
+        framework .NET V1.1</para>
+      </listitem>
+
+      <listitem>
+        <para><code>OleDb-2.0</code> (aliased to
+        <code>System.Data.OleDb</code>) - OleDb, provider V2.0.0.0 in
+        framework .NET V2.0</para>
+      </listitem>
+
+      <listitem>
+        <para><code>OracleClient-2.0</code> (aliased to
+        <code>System.Data.OracleClient</code>) - Oracle, Microsoft provider
+        V2.0.0.0</para>
+      </listitem>
+
+      <listitem>
+        <para><code>OracleODP-2.0</code> (aliased to
+        <code>System.DataAccess.Client</code>) - Oracle, Oracle provider
+        V2.102.2.20</para>
+      </listitem>
+
+      <listitem>
+        <para><code>MySql</code> - MySQL, MySQL provider 1.0.10.1</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>MySql-1.0.9</literal> - MySQL, MySQL provider
+        1.0.9</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>MySql-5.0</literal> - MySQL, MySQL provider
+        5.0.7.0</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>MySql-5.0.8.1</literal> - MySQL, MySQL provider
+        5.0.8.1</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>MySql-5.1 </literal>- MySQL, MySQL provider
+        5.1.2.2</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>MySql-5.1.4</literal> - (aliased to
+        <literal>MySql.Data.MySqlClient</literal>) MySQL, MySQL provider
+        5.1.2.2</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>Npgsql-1.0</literal> - Postgresql provider 1.0.0.0 (and
+        1.0.0.1 - were build with same version info)</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>Npgsql-2.0-beta1</literal> - Postgresql provider
+        1.98.1.0 beta 1</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>DB2-9.0.0-1.1</literal> - IBM DB2 Data Provider 9.0.0
+        for .NET Framework 1.1</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>DB2-9.0.0-2.0 </literal>- (aliased to
+        <literal>IBM.Data.DB2</literal>) - IBM DB2 Data Provider 9.0.0 for
+        .NET Framework 2.0</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>DB2-9.1.0-1.1</literal> - IBM DB2 Data Provider 9.1.0
+        for .NET Framework 1.1</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>DB2-9.1.0.2</literal> - (aliased to
+        <literal>IBM.Data.DB2.9.1.0</literal>) - IBM DB2 Data Provider 9.1.0
+        for .NET Framework 2.0</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>SQLite-1.0.43 </literal>SQLite provider 1.0.43 for .NET
+        Framework 2.0</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>SQLite-1.0.47 </literal>- (aliased to
+        System.Data.SQLite) - SQLite provider 1.0.43 for .NET Framework
+        2.0</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>SybaseAse-12</literal> - Sybase ASE provider for ASE
+        12.x</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>SybaseAse-15</literal> - Sybase ASE provider for ASE
+        15.x</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>Odbc-1.1</literal> - ODBC provider V1.0.5000.0 in
+        framework .NET V1.1</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>Odbc-2.0</literal> - ODBC provider V2.0.0.0 in
+        framework .NET V2</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>An example using DbProviderFactory is shown below</para>
+
+    <programlisting>IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.SqlClient");</programlisting>
+
+    <para>The default definitions of the providers are contained in the
+    assembly resource
+    <code>assembly://Spring.Data/Spring.Data.Common/dbproviders.xml</code>.
+    Future additions to round out the database coverage are forthcoming. The
+    current crude mechanism to add additional providers, or to apply any
+    standard Spring <interfacename>IApplicationContext</interfacename>
+    functionality, such as applying AOP advice, is to set the public static
+    property DBPROVIDER_ADDITIONAL_RESOURCE_NAME in
+    <classname>DbProviderFactory</classname> to a Spring resource location.
+    The default value is <code>file://dbProviders.xml</code>. (That isn't a
+    typo, there is a difference in case with the name of the embedded
+    resource). This crude mechanism will eventually be replaced with one based
+    on a custom configuration section in App.config/Web.config.</para>
+
+    <para>It may happen that the version number of an assembly you have
+    downloaded is different than the one listed above. If it is a point
+    release, i.e. the API hasn't changed in anyway that is material to your
+    application, you should add an assembly redirect of the form shown
+    below.</para>
+
+    <programlisting>&lt;dependentAssembly&gt;
+  &lt;assemblyIdentity name="MySql.Data" 
+                           publicKeyToken="c5687fc88969c44d" 
+                           culture="neutral"/&gt;
+  &lt;bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535"
+                         newVersion="1.0.10.1"/&gt;
+&lt;/dependentAssembly&gt;</programlisting>
+
+    <para>This redirects any reference to an older version of the assembly
+    MySql.Data to the version 1.0.10.1.</para>
+  </section>
+
+  <section>
+    <title>XML based configuration</title>
+
+    <para>Creating a DbProvider in Spring's XML configuration file is shown
+    below in the typical case of using it to specify the DbProvider property
+    on an AdoTemplate.</para>
+
+    <programlisting>&lt;objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database"&gt;
+
+  &lt;db:provider id="DbProvider" 
+                provider="System.Data.SqlClient" 
+                connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/&gt;
+  
+  &lt;object id="adoTemplate" type="Spring.Data.AdoTemplate, Spring.Data"&gt;  
+    &lt;property name="DbProvider" ref="DbProvider"/&gt;                
+  &lt;/object&gt;
+
+&lt;/objects&gt;</programlisting>
+
+    <para>A custom namespace should be registered in the main application
+    configuration file to use this syntax. This configuration, only for the
+    parsers, is shown below. Additional section handlers are needed to specify
+    the rest of the Spring configuration locations as described in previous
+    chapters.</para>
+
+    <programlisting>&lt;configuration&gt;
+
+  &lt;configSections&gt;
+    &lt;sectionGroup name="spring"&gt;
+      &lt;section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" /&gt;
+    &lt;/sectionGroup&gt;
+  &lt;/configSections&gt;
+
+  &lt;spring&gt;
+    &lt;parsers&gt;
+      &lt;parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" /&gt;
+    &lt;/parsers&gt;
+  &lt;/spring&gt;
+
+&lt;/configuration&gt;</programlisting>
+  </section>
+
+  <section>
+    <title>Connection String management</title>
+
+    <para>There are a few options available to help manage your connection
+    strings.</para>
+
+    <para>The first option is to leverage the Spring property replacement
+    functionality, as described in <xref
+    linkend="objects-factory-placeholderconfigurer" />. This lets you insert
+    variable names as placeholders for values in a Spring configuration file.
+    In the following example specific parts of a connection string have been
+    parameterized but you can also use a variable to set the entire connection
+    string.</para>
+
+    <para>An example of such a setting is shown below</para>
+
+    <programlisting>&lt;configuration&gt;
+  &lt;configSections&gt;
+    &lt;sectionGroup name="spring"&gt;
+      &lt;section name='context' type='Spring.Context.Support.ContextHandler, Spring.Core'/&gt;
+    &lt;/sectionGroup&gt;
+
+    &lt;section name="databaseSettings" type="System.Configuration.NameValueSectionHandler, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /&gt;
+       
+  &lt;/configSections&gt;
+
+  &lt;spring&gt;
+    &lt;context&gt;      
+      &lt;resource uri="Aspects.xml" /&gt;
+      &lt;resource uri="Services.xml" /&gt;
+      &lt;resource uri="Dao.xml" /&gt;
+    &lt;/context&gt;
+  &lt;/spring&gt;
+
+  &lt;!-- These properties are referenced in Dao.xml --&gt;
+  &lt;databaseSettings&gt;
+    &lt;add key="db.datasource" value="(local)" /&gt;
+    &lt;add key="db.user" value="springqa" /&gt;
+    &lt;add key="db.password" value="springqa" /&gt;
+    &lt;add key="db.database" value="Northwind" /&gt;
+  &lt;/databaseSettings&gt;
+
+
+&lt;/configuration&gt;</programlisting>
+
+    <para>Where <literal>Dao.xml</literal> has a connection string as shown
+    below</para>
+
+    <programlisting>&lt;objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database"&gt;
+
+  &lt;db:provider id="DbProvider" 
+                provider="System.Data.SqlClient" 
+                connectionString="${db.datasource};Database=${db.database};User ID=${db.user};Password=${db.password};Trusted_Connection=False"/&gt;
+  
+  &lt;object id="adoTemplate" type="Spring.Data.AdoTemplate, Spring.Data"&gt;  
+    &lt;property name="DbProvider" ref="DbProvider"/&gt;                
+  &lt;/object&gt;
+
+  &lt;!-- configuration of what values to substitute for ${ } variables listed above --&gt;
+  &lt;object name="appConfigPropertyHolder"
+          type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core"&gt;
+    &lt;property name="configSections" value="DatabaseConfiguration"/&gt;
+  &lt;/object&gt; 
+
+&lt;/objects&gt;</programlisting>
+
+    <para>Please refer to the Section <xref
+    linkend="objects-factory-placeholderconfigurer" /> for more
+    information.</para>
+  </section>
+
+  <section id="dbprovider-additional">
+    <title>Additional IDbProvider implementations</title>
+
+    <para>Spring provides some convenient implementations of the IDbProvider
+    interface that add addtional behavior on top of the standard
+    implementation.</para>
+
+    <section id="dbprovider-usercredentials">
+      <title>UserCredentialsDbProvider</title>
+
+      <para>This <classname>UserCredentialsDbProvider</classname> will allow
+      you to change the username and password of a database connection at
+      runtime. The API contains the properties <literal>Username</literal> and
+      <literal>Password</literal> which are used as the default strings
+      representing the user and password in the connection string. You can
+      then change the value of these properties in the connection string by
+      calling the method <literal>SetCredentialsForCurrentThread</literal> and
+      fall back to the default values by calling the method
+      <literal>RemoveCredentialsFromCurrentThread</literal>. You call the
+      <literal>SetCredentialsForCurrentThread</literal> method at runtime,
+      before any data access occurs, to determine which database user should
+      be used for the current user-case. Which user to select is up to you.
+      You may retrieve the user information from an HTTP session for example.
+      Example configuration and usage is shown below</para>
+
+      <programlisting>&lt;object id="DbProvider" type="Spring.Data.Common.UserCredentialsDbProvider, Spring.Data"&gt;
+  &lt;property name="TargetDbProvider" ref="targetDbProvider"/&gt;
+  &lt;property name="Username" value="User ID=defaultName"/&gt;
+  &lt;property name="Password" value="Password=defaultPass"/&gt;
+&lt;/object&gt;
+ 
+&lt;db:provider id="targetDbProvider" provider="SqlServer-2.0"
+    connectionString="Data Source=MARKT60\SQL2005;Database=Spring;Trusted_Connection=False"/&gt;</programlisting>
+
+      <para>If you use dependency injection to configure a class with a
+      property of the type <literal>IDbProvider</literal>, you will need to
+      downcast to the subtype or you can change your class to have a property
+      of the type <literal>UserCredentialsDbProvider</literal> instead of
+      <literal>IDbProvider</literal>.</para>
+
+      <programlisting>userCredentialsDbProvider.SetCredentialsForCurrentThread("User ID=springqa", "Password=springqa");</programlisting>
+
+      <para><literal>UserCredentialsDbProvider's</literal> has a base class,
+      <literal>DelegatingDbProvider</literal>, and is intended for you to use
+      in your own implementations that delegate calls to a target
+      <literal>IDbProvider</literal> instance. This class in meant to be
+      subclassed with subclasses overriding only those methods, such as
+      <literal>CreateConnection()</literal>, that should not simply delegate
+      to the target <literal>IDbProvider</literal>.</para>
+    </section>
+
+    <section id="dbprovider-multidelegating">
+      <title>MultiDelegatingDbProvider</title>
+
+      <para>There are use-cases in which there will need to be a runtime
+      selection of the database to connect to among many possible candidates.
+      This is often the case where the same schema is installed in separate
+      databases for different clients. The
+      <classname>MultiDelegatingDbProvider</classname> implements the
+      <classname>IDbProvider</classname> interface and provides an abstraction
+      to the multiple databases and can be used in DAO layer such that the DAO
+      layer is unaware of the switching between databases.
+      <classname>MultiDelegatingDbProvider</classname> does its job by looking
+      into thread local storage under the key dbProviderName. This storage
+      location stores the name of the dbProvider that is to be used for
+      processing the request. <classname>MultiDelegatingDbProvider</classname>
+      is configured using the dictionary property
+      <literal>TargetDbProviders</literal>. The key of this dictionary
+      contains the name of a dbProvider and its value is a dbProvider object.
+      (You can also provide this dictionary as a constructor argument.) During
+      request processing, once you have determined which target dbProvider
+      should be use, in this example database1ProviderName, you should execute
+      the following code
+      <literal>LogicalThreadContext.SetData("dbProviderName",
+      "database1ProviderName")</literal> and then call the data access
+      layer.</para>
+
+      <para></para>
+    </section>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/expressions.xml b/doc/reference/src/expressions.xml
new file mode 100644
index 00000000..b9c1a745
--- /dev/null
+++ b/doc/reference/src/expressions.xml
@@ -0,0 +1,990 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="expressions">
+  <title>Expression Evaluation</title>
+  <sect1 id="expressions-introduction">
+    <title>Introduction</title>
+
+    <para>The Spring.Expressions namespace provides a powerful expression
+    language for querying and manipulating an object graph at runtime. The
+    language supports setting and getting of property values, property
+    assignment, method invocation, accessing the context of arrays,
+    collections and indexers, logical and arithmetic operators, named
+    variables, and retrieval of objects by name from Spring's IoC container.
+    It also supports list projection and selection, as well as common list
+    aggregators.</para>
+
+    <para>The functionality provided in this namespace serves as the
+    foundation for a variety of other features in Spring.NET such as enhanced
+    property evaluation in the XML based configuration of the IoC container, a
+    Data Validation framework, and a Data Binding framework for ASP.NET. You
+    will likely find other cool uses for this library in your own work where
+    run-time evaluation of criteria based on an object's state is required.
+    For those with a Java background, the Spring.Expressions namespace
+    provides functionality similar to the Java based Object Graph Navigation
+    Language, <ulink url="http://www.ognl.org/">OGNL</ulink>.</para>
+
+    <para>This chapter covers the features of the expression language using an
+    Inventor and Inventor's Society class as the target objects for expression
+    evaluation. The class declarations and the data used to populate them are
+    listed at the end of the chapter in section <xref
+    linkend="expressions-classes" />. These classes are blatantly taken from
+    the NUnit tests for the Expressions namespace which you can refer to for
+    additional example usage.</para>
+  </sect1>
+
+  <sect1 id="expressions-evaluating">
+    <title>Evaluating Expressions</title>
+
+    <para>The simplest, but not the most efficient way to perform expression
+    evaluation is by using one of the static convenience methods of the
+    <classname>ExpressionEvaluator</classname> class:<programlisting>public static object GetValue(object root, string expression);
+
+public static object GetValue(object root, string expression, IDictionary variables)
+
+public static void SetValue(object root, string expression, object newValue)
+
+public static void SetValue(object root, string expression, IDictionary variables, object newValue)</programlisting>
+    The first argument is the 'root' object that the expression string (2nd argument) will be 
+    evaluated against.  The third argument is used to support variables in the expression 
+    and will be discussed later.
+    
+    Simple usage to get the value of an object property is shown below using the 
+    <classname>Inventor</classname> class.
+    You can find the class listing in section <xref linkend="expressions-classes"/>.
+    <programlisting>Inventor tesla = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+
+tesla.PlaceOfBirth.City = "Smiljan";
+
+string evaluatedName = (string) ExpressionEvaluator.GetValue(tesla, "Name"); 
+
+string evaluatedCity = (string) ExpressionEvaluator.GetValue(tesla, "PlaceOfBirth.City"));</programlisting>
+    The value of 'evaluatedName' is 'Nikola Tesla' and that of 'evaluatedCity'
+    is 'Smiljan'. A period is used to navigate the nested properties of the
+    object. Similarly to set the property of an object, say we want to rewrite
+    history and change Tesla's city of birth, we would simply add the
+    following line <programlisting>ExpressionEvaluator.SetValue(tesla, "PlaceOfBirth.City", "Novi Sad");</programlisting></para>
+
+    <para>A much better way to evaluate expressions is to parse them once and
+    then evaluate as many times as you want
+    using<classname>Expression</classname>class. Unlike
+    <classname>ExpressionEvaluator</classname>, which parses expression every
+    time you invoke one of its methods, <classname>Expression</classname>
+    class will cache the parsed expression for increased performance. The
+    methods of this class are listed below: <programlisting>public static IExpression Parse(string expression)
+
+public override object Get(object context, IDictionary variables)
+
+public override void Set(object context, IDictionary variables, object newValue)</programlisting>
+    The retrieval of the Name property in the previous example using the
+    Expression class is shown below <programlisting>IExpression exp = Expression.Parse("Name");
+
+string evaluatedName = (string) exp.GetValue(tesla, null);</programlisting></para>
+
+    <para>The difference in performance between the two approaches, when
+    evaluating the same expression many times, is several orders of magnitude,
+    so you should only use convenience methods of the
+    <classname>ExpressionEvaluator</classname> class when you are doing
+    one-off expression evaluations. In all other cases you should parse the
+    expression first and then evaluate it as many times as you need.</para>
+
+    <para>There are a few exception classes to be aware of when using the
+    <classname>ExpressionEvaluator</classname>. These are
+    <classname>InvalidPropertyException</classname>, when you refer to a
+    property that doesn't exist,
+    <classname>NullValueInNestedPathException</classname>, when a null value
+    is encountered when traversing through the nested property list, and
+    <classname>ArgumentException</classname> and
+    <classname>NotSupportedException</classname> when you pass in values that
+    are in error in some other manner.</para>
+
+    <para>The expression language is based on a grammar and uses <ulink
+    url="http://www.antlr.org/">ANTLR</ulink> to construct the lexer and
+    parser. Errors relating to bad syntax of the language will be caught at
+    this level of the language implementation. For those interested in the
+    digging deeper into the implementation, the grammar file is named
+    Expression.g and is located in the src directory of the namespace. As a
+    side note, the release version of the ANTLR DLL included with Spring.NET
+    was signed with the Spring.NET key, which means that you should always use
+    the included version of <literal>antlr.runtime.dll</literal> within your
+    application. Upcoming releases of ANTLR will provide strongly signed
+    assemblies, which will remove this requirement.</para>
+  </sect1>
+
+  <sect1 id="expressions-language-ref">
+    <title>Language Reference</title>
+
+    <sect2 id="expressions-literals">
+      <title>Literal expressions</title>
+
+      <para>The types of literal expressions supported are strings, dates,
+      numeric values (int, real, and hex), boolean and null. String are
+      delimited by single quotes. To put a single quote itself in a string use
+      the backslash character. The following listing shows simple usage of
+      literals. Typically they would not be used in isolation like this, but
+      as part of a more complex expression, for example using a literal on one
+      side of a logical comparison operator. <programlisting>string helloWorld = (string) ExpressionEvaluator.GetValue(null, "'Hello World'"); // evals to "Hello World"
+
+string tonyPizza  = (string) ExpressionEvaluator.GetValue(null, "'Tony\\'s Pizza'"); // evals to "Tony's Pizza"
+
+double avogadrosNumber = (double) ExpressionEvaluator.GetValue(null, "6.0221415E+23");
+
+int maxValue = (int)  ExpressionEvaluator.GetValue(null, "0x7FFFFFFF");  // evals to 2147483647
+
+DateTime birthday = (DateTime) ExpressionEvaluator.GetValue(null, "date('1974/08/24')");
+
+DateTime exactBirthday = 
+  (DateTime) ExpressionEvaluator.GetValue(null, " date('19740824T131030', 'yyyyMMddTHHmmss')");
+
+bool trueValue = (bool) ExpressionEvaluator.GetValue(null, "true");
+
+object nullValue = ExpressionEvaluator.GetValue(null, "null");</programlisting>
+      Note that the extra backslash character in Tony's Pizza is to satisfy C#
+      escape syntax. Numbers support the use of the negative sign, exponential
+      notation, and decimal points. By default real numbers are parsed using
+      <classname>Double.Parse</classname> unless the format character "M" or
+      "F" is supplied, in which case <classname>Decimal.Parse</classname> and
+      <classname>Single.Parse</classname> would be used respectfully. As shown
+      above, if two arguments are given to the date literal then
+      <classname>DateTime.ParseExact</classname> will be used. Note that all
+      parse methods of classes that are used internally reference the
+      <classname>CultureInfo.InvariantCulture</classname>.</para>
+    </sect2>
+
+    <!-- PROPERTIES -->
+
+    <sect2 id="expressions-properties">
+      <title>Properties, Arrays, Lists, Dictionaries, Indexers</title>
+
+      <para>As shown in the previous example in <xref
+      linkend="expressions-evaluating" />, navigating through properties is
+      easy, just use a period to indicate a nested property value. The
+      instances of <classname>Inventor</classname> class,
+      <emphasis>pupin</emphasis> and <emphasis>tesla</emphasis>, were
+      populated with data listed in section <xref
+      linkend="expressions-classes" />. To navigate "down" and get Tesla's
+      year of birth and Pupin's city of birth the following expressions are
+      used <programlisting>int year = (int) ExpressionEvaluator.GetValue(tesla, "DOB.Year"));  // 1856
+
+string city = (string) ExpressionEvaluator.GetValue(pupin, "PlaCeOfBirTh.CiTy");  // "Idvor"</programlisting>
+      For the sharp-eyed, that isn't a typo in the property name for place of
+      birth. The expression uses mixed cases to demonstrate that the
+      evaluation is case insensitive.</para>
+
+      <para>The contents of arrays and lists are obtained using square bracket
+      notation. <programlisting>// Inventions Array
+string invention = (string) ExpressionEvaluator.GetValue(tesla, "Inventions[3]"); // "Induction motor"
+
+// Members List
+string name = (string) ExpressionEvaluator.GetValue(ieee, "Members[0].Name"); // "Nikola Tesla"
+
+// List and Array navigation
+string invention = (string) ExpressionEvaluator.GetValue(ieee, "Members[0].Inventions[6]") // "Wireless communication"</programlisting></para>
+
+      <para>The contents of dictionaries are obtained by specifying the
+      literal key value within the brackets. In this case, because keys for
+      the <emphasis>Officers</emphasis> dictionary are strings, we can specify
+      string literal.<programlisting>// Officer's Dictionary
+Inventor pupin = (Inventor) ExpressionEvaluator.GetValue(ieee, "Officers['president']";
+
+string city = (string) ExpressionEvaluator.GetValue(ieee, "Officers['president'].PlaceOfBirth.City"); // "Idvor"
+
+ExpressionEvaluator.SetValue(ieee, "Officers['advisors'][0].PlaceOfBirth.Country", "Croatia");</programlisting></para>
+
+      <para>You may also specify non literal values in place of the quoted
+      literal values by using another expression inside the square brackets
+      such as variable names or static properties/methods on other types.
+      These features are discussed in other sections.</para>
+
+      <para>Indexers are similarly referenced using square brackets. The
+      following is a small example that shows the use of indexers.
+      Multidimensional indexers are also supported. <programlisting>public class Bar
+{
+    private int[] numbers = new int[] {1, 2, 3};
+
+    public int this[int index]
+    {
+        get { return numbers[index];}
+        set { numbers[index] = value; }
+    }
+}
+
+Bar b = new Bar();
+
+int val = (int) ExpressionEvaluator.GetValue(bar, "[1]") // evaluated to 2
+
+ExpressionEvaluator.SetValue(bar, "[1]", 3);  // set value to 3</programlisting></para>
+
+      <sect3>
+        <title>Defining Arrays, Lists and Dictionaries Inline</title>
+
+        <para>In addition to accessing arrays, lists and dictionaries by
+        navigating the graph for the context object, Spring.NET Expression
+        Language allows you to define them inline, within the expression.
+        Inline lists are defined by simply enclosing a comma separated list of
+        items with curly brackets:<programlisting>{1, 2, 3, 4, 5}
+{'abc', 'xyz'}</programlisting> If you want to ensure that a strongly typed
+        array is initialized instead of a weakly typed list, you can use array
+        initializer instead: <programlisting>new int[] {1, 2, 3, 4, 5}
+new string[] {'abc', 'xyz'}</programlisting></para>
+
+        <para>Dictionary definition syntax is a bit different: you need to use
+        a # prefix to tell expression parser to expect key/value pairs within
+        the brackets and to specify a comma separated list of key/value pairs
+        within the brackets:<programlisting>#{'key1' : 'Value 1', 'today' : DateTime.Today}
+#{1 : 'January', 2 : 'February', 3 : 'March', ...}</programlisting></para>
+
+        <para>Arrays, lists and dictionaries created this way can be used
+        anywhere where arrays, lists and dictionaries obtained from the object
+        graph can be used, which we will see later in the examples.</para>
+
+        <para>Keep in mind that even though examples above use literals as
+        array/list elements and dictionary keys and values, that's only to
+        simplify the examples -- you can use any valid expression wherever
+        literals are used.</para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="expressions-methods">
+      <title>Methods</title>
+
+      <para>Methods are invoked using typical C# programming syntax. You may
+      also invoke methods on literals.</para>
+
+      <programlisting>//string literal 
+char[] chars = (char[]) ExpressionEvaluator.GetValue(null, "'test'.ToCharArray(1, 2)"))  // 't','e'
+
+//date literal 
+int year = (int) ExpressionEvaluator.GetValue(null, "date('1974/08/24').AddYears(31).Year") // 2005
+
+// object usage, calculate age of tesla navigating from the IEEE society.
+
+ExpressionEvaluator.GetValue(ieee, "Members[0].GetAge(date('2005-01-01')") // 149 (eww..a big anniversary is coming up ;)</programlisting>
+    </sect2>
+
+    <sect2 id="expressions-operators">
+      <title>Operators</title>
+
+      <sect3 id="expressions-relational">
+        <title>Relational operators</title>
+
+        <para>The relational operators; equal, not equal, less than, less than
+        or equal, greater than, and greater than or equal are supported using
+        standard operator notation. These operators take into account if the
+        object implements the <classname>IComparable</classname> interface.
+        Enumerations are also supported but you will need to register the
+        enumeration type, as described in Section <xref
+        linkend="expressions-typeregistration" />, in order to use an
+        enumeration value in an expression if it is not contained in the
+        mscorlib.</para>
+
+        <programlisting>ExpressionEvaluator.GetValue(null, "2 == 2")  // true
+
+ExpressionEvaluator.GetValue(null, "date('1974-08-24') != DateTime.Today")  // true
+
+ExpressionEvaluator.GetValue(null, "2 &lt; -5.0") // false
+
+ExpressionEvaluator.GetValue(null, "DateTime.Today &lt;= date('1974-08-24')") // false
+
+ExpressionEvaluator.GetValue(null, "'Test' &gt;= 'test'") // true</programlisting>
+
+        <para>Enumerations can be evaluated as shown below <programlisting>FooColor fColor = new FooColor();
+
+ExpressionEvaluator.SetValue(fColor, "Color", KnownColor.Blue);
+
+bool trueValue = (bool) ExpressionEvaluator.GetValue(fColor, "Color == KnownColor.Blue"); //true</programlisting>
+        Where FooColor is the following class. <programlisting>public class FooColor
+{
+    private KnownColor knownColor;
+
+    public KnownColor Color
+    {
+        get { return knownColor;}
+        set { knownColor = value; }
+    }
+}</programlisting></para>
+
+        <para>In addition to standard relational operators, Spring.NET
+        Expression Language supports some additional, very useful operators
+        that were "borrowed" from SQL, such as <emphasis>in</emphasis>,
+        <emphasis>like</emphasis> and <emphasis>between</emphasis>, as well as
+        <emphasis>is</emphasis> and <emphasis>matches</emphasis> operators,
+        which allow you to test if object is of a specific type or if the
+        value matches a regular expression.<programlisting>ExpressionEvaluator.GetValue(null, "3 in {1, 2, 3, 4, 5}")  // true
+
+ExpressionEvaluator.GetValue(null, "'Abc' like '[A-Z]b*'")  // true
+
+ExpressionEvaluator.GetValue(null, "'Abc' like '?'")  // false
+
+ExpressionEvaluator.GetValue(null, "1 between {1, 5}")  // true
+
+ExpressionEvaluator.GetValue(null, "'efg' between {'abc', 'xyz'}")  // true
+
+ExpressionEvaluator.GetValue(null, "'xyz' is int")  // false
+
+ExpressionEvaluator.GetValue(null, "{1, 2, 3, 4, 5} is IList")  // true
+
+ExpressionEvaluator.GetValue(null, "'5.0067' matches '^-?\\d+(\\.\\d{2})?$'"))  // false
+
+ExpressionEvaluator.GetValue(null, @"'5.00' matches '^-?\d+(\.\d{2})?$'")  // true</programlisting>Note
+        that the Visual Basic and not SQL syntax is used for the
+        <emphasis>like</emphasis> operator pattern string.
+        </para>
+      </sect3>
+
+      <sect3 id="expressions-logical">
+        <title>Logical operators</title>
+
+        <para>The logical operators that are supported are
+        <emphasis>and</emphasis>, <emphasis>or</emphasis>, and
+        <emphasis>not</emphasis>. Their use is demonstrated
+        below<programlisting>// AND
+bool falseValue = (bool) ExpressionEvaluator.GetValue(null, "true and false"); //false
+
+string expression = @"IsMember('Nikola Tesla') and IsMember('Mihajlo Pupin')";
+bool trueValue = (bool) ExpressionEvaluator.GetValue(ieee, expression);  //true
+
+// OR
+bool trueValue = (bool) ExpressionEvaluator.GetValue(null, "true or false");  //true
+
+string expression = @"IsMember('Nikola Tesla') or IsMember('Albert Einstien')";
+bool trueValue = (bool) ExpressionEvaluator.GetValue(ieee, expression); // true
+
+// NOT
+bool falseValue = (bool) ExpressionEvaluator.GetValue(null, "!true");
+
+// AND and NOT
+string expression = @"IsMember('Nikola Tesla') and !IsMember('Mihajlo Pupin')";
+bool falseValue = (bool) ExpressionEvaluator.GetValue(ieee, expression);</programlisting></para>
+      </sect3>
+
+      <sect3 id="expressions-math">
+        <title>Mathematical operators</title>
+
+        <para>The addition operator can be used on numbers, strings and dates.
+        Subtraction can be used on numbers and dates. Multiplication and
+        division can be used only on numbers. Other mathematical operators
+        supported are modulus (%) and exponential power (^). Standard operator
+        precedence is enforced. These operators are demonstrated below
+        <programlisting>// Addition
+int two = (int)ExpressionEvaluator.GetValue(null, "1 + 1"); // 2
+
+String testString = (String)ExpressionEvaluator.GetValue(null, "'test' + ' ' + 'string'"); //'test string'
+
+DateTime dt = (DateTime)ExpressionEvaluator.GetValue(null, "date('1974-08-24') + 5"); // 8/29/1974
+            
+// Subtraction
+
+int four = (int) ExpressionEvaluator.GetValue(null, "1 - -3"); //4
+
+Decimal dec = (Decimal) ExpressionEvaluator.GetValue(null, "1000.00m - 1e4"); // 9000.00
+
+TimeSpan ts = (TimeSpan) ExpressionEvaluator.GetValue(null, "date('2004-08-14') - date('1974-08-24')"); //10948.00:00:00
+
+// Multiplication
+
+int six = (int) ExpressionEvaluator.GetValue(null, "-2 * -3"); // 6
+
+int twentyFour = (int) ExpressionEvaluator.GetValue(null, "2.0 * 3e0 * 4"); // 24
+
+// Division
+
+int minusTwo = (int) ExpressionEvaluator.GetValue(null, "6 / -3"); // -2
+
+int one = (int) ExpressionEvaluator.GetValue(null, "8.0 / 4e0 / 2"); // 1
+
+// Modulus
+
+int three = (int) ExpressionEvaluator.GetValue(null, "7 % 4"); // 3
+
+int one = (int) ExpressionEvaluator.GetValue(null, "8.0 % 5e0 % 2"); // 1
+
+// Exponent
+
+int sixteen = (int) ExpressionEvaluator.GetValue(null, "-2 ^ 4"); // 16
+
+// Operator precedence
+
+int minusFortyFive = (int) ExpressionEvaluator.GetValue(null, "1+2-3*8^2/2/2"); // -45
+</programlisting></para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="expressions-assignment">
+      <title>Assignment</title>
+
+      <para>Setting of a property is done by using the assignment operator.
+      This would typically be done within a call to
+      <literal>GetValue</literal> since in the simple case
+      <literal>SetValue</literal> offers the same functionality. Assignment in
+      this manner is useful when combining multiple operators in an expression
+      list, discussed in the next section. Some examples of assignment are
+      shown below <programlisting>Inventor inventor = new Inventor();
+String aleks = (String) ExpressionEvaluator.GetValue(inventor, "Name = 'Aleksandar Seovic'");
+DateTime dt = (DateTime) ExpressionEvaluator.GetValue(inventor, "DOB = date('1974-08-24')");
+
+//Set the vice president of the society
+Inventor tesla = (Inventor) ExpressionEvaluator.GetValue(ieee, "Officers['vp'] = Members[0]");</programlisting></para>
+    </sect2>
+
+    <sect2 id="expressions-explist">
+      <title>Expression lists</title>
+
+      <para>Multiple expressions can be evaluated against the same context
+      object by separating them with a semicolon and enclosing the entire
+      expression within parentheses. The value returned is the value of the
+      last expression in the list. Examples of this are shown below
+      <programlisting>//Perform property assignments and then return Name property.
+
+String pupin = (String) ExpressionEvaluator.GetValue(ieee.Members, 
+  "( [1].PlaceOfBirth.City = 'Beograd'; [1].PlaceOfBirth.Country = 'Serbia'; [1].Name )"));
+
+// pupin = "Mihajlo Pupin"</programlisting></para>
+    </sect2>
+
+    <sect2 id="expressions-types">
+      <title>Types</title>
+
+      <para>In many cases, you can reference types by simply specifying type
+      name:<programlisting>ExpressionEvaluator.GetValue(null, "1 is int")
+
+ExpressionEvaluator.GetValue(null, "DateTime.Today")
+
+ExpressionEvaluator.GetValue(null, "new string[] {'abc', 'efg'}")</programlisting></para>
+
+      <para>This is possible for all standard types from
+      <literal>mscorlib</literal>, as well as for any other type that is
+      registered with the <literal>TypeRegistry</literal> as described in the
+      next section.</para>
+
+      <para>For all other types, you need to use special
+      <literal>T(typeName)</literal> expression:<programlisting>Type dateType = (Type) ExpressionEvaluator.GetValue(null, "T(System.DateTime)")
+
+Type evalType = (Type) ExpressionEvaluator.GetValue(null, "T(Spring.Expressions.ExpressionEvaluator, Spring.Core)")
+
+bool trueValue = (bool) ExpressionEvaluator.GetValue(tesla, "T(System.DateTime) == DOB.GetType()")</programlisting></para>
+
+      <note>
+        <para>The implementation delegates to Spring's
+        <classname>ObjectUtils.ResolveType</classname> method for the actual
+        type resolution, which means that the types used within expressions
+        are resolved in the exactly the same way as the types specified in
+        Spring configuration files.</para>
+      </note>
+    </sect2>
+
+    <sect2 id="expressions-typeregistration">
+      <title>Type Registration</title>
+
+      <para>To refer to a type within an expression that is not in the
+      mscorlib you need to register it with the
+      <literal>TypeRegistry</literal>. This will allow you to refer to a
+      shorthand name of the type within your expressions. This is commonly
+      used in expression that use the new operator or refer to a static
+      properties of an object. Example usage is shown below.</para>
+
+      <programlisting>TypeRegistry.RegisterType("Society", typeof(Society));
+
+Inventor pupin = (Inventor) ExpressionEvaluator.GetValue(ieee, "Officers[Society.President]");</programlisting>
+
+      <para>Alternatively, you can register types using
+      <literal>typeAliases</literal> configuration section.</para>
+    </sect2>
+
+    <sect2 id="expressions-ctor">
+      <title>Constructors</title>
+
+      <para>Constructors can be invoked using the new operator. For classes
+      outside mscorlib you will need to register your types so they can be
+      resolved. Examples of using constructors are shown below:
+      <programlisting>// simple ctor
+DateTime dt = (DateTime) ExpressionEvaluator.GetValue(null, "new DateTime(1974, 8, 24)");
+
+// Register Inventor type then create new inventor instance within Add method inside an expression list.  
+// Then return the new count of the Members collection.
+
+TypeRegistry.RegisterType(typeof(Inventor));
+int three = (int) ExpressionEvaluator.GetValue(ieee.Members, "{ Add(new Inventor('Aleksandar Seovic', date('1974-08-24'), 'Serbian')); Count}"));
+            
+</programlisting></para>
+
+      <para>As a convenience, Spring.NET also allows you to define named
+      constructor arguments, which are used to set object's properties after
+      instantiation, similar to the way standard .NET attributes work. For
+      example, you could create an instance of the <literal>Inventor</literal>
+      class and set its <literal>Inventions</literal> property in a single
+      statement:<programlisting>
+Inventor aleks = (Inventor) ExpressionEvaluator.GetValue(null, "new Inventor('Aleksandar Seovic', date('1974-08-24'), 'Serbian', Inventions = {'SPELL'})");
+</programlisting>The only rule you have to follow is that named arguments
+      should be specified <emphasis>after</emphasis> standard constructor
+      arguments, just like in the .NET attributes.</para>
+
+      <para>While we are on the subject, Spring.NET Expression Language also
+      provides a convenient syntax for .NET attribute instance creation.
+      Instead of using standard constructor syntax, you can use a somewhat
+      shorter and more familiar syntax to create an instance of a .NET
+      attribute class:<programlisting>
+WebMethodAttribute webMethod = (WebMethodAttribute) ExpressionEvaluator.GetValue(null, "@[WebMethod(true, CacheDuration = 60, Description = 'My Web Method')]");
+</programlisting>As you can see, with the exception of the
+      <literal>@</literal> prefix, syntax is exactly the same as in C#.</para>
+
+      <para>Slightly different syntax is not the only thing that
+      differentiates an attribute expression from a standard constructor
+      invocation expression. In addition to that, attribute expression uses
+      slightly different type resolution mechanism and will attempt to load
+      both the specified type name and the specified type name with an
+      <literal>Attribute</literal> suffix, just like the C# compiler.</para>
+    </sect2>
+
+    <sect2 id="expressions-variables">
+      <title>Variables</title>
+
+      <para>Variables can referenced in the expression using the syntax
+      <literal>#</literal><emphasis>variableName</emphasis>. The variables are
+      passed in and out of the expression using the dictionary parameter in
+      <classname>ExpressionEvaluator</classname>'s <literal>GetValue</literal>
+      or <literal>SetValue</literal> methods. <programlisting>public static object GetValue(object root, string expression, IDictionary variables)
+
+public static void SetValue(object root, string expression, IDictionary variables, object newValue)</programlisting>
+      The variable name is the key value of the dictionary. Example usage is
+      shown below; <programlisting>IDictionary vars = new Hashtable();
+vars["newName"] = "Mike Tesla";
+ExpressionEvaluator.GetValue(tesla, "Name = #newName", vars));</programlisting>
+      You can also use the dictionary as a place to store values of the object
+      as they are evaluated inside the expression. For example to change
+      Tesla's first name back again and keep the old value; <programlisting>ExpressionEvaluator.GetValue(tesla, "{ #oldName = Name; Name = 'Nikola Tesla' }", vars);
+String oldName = (String)vars["oldName"]; // Mike Tesla</programlisting>
+      Variable names can also be used inside indexers or maps instead of
+      literal values. For example; <programlisting>vars["prez"] = "president";
+Inventor pupin = (Inventor) ExpressionEvaluator.GetValue(ieee, "Officers[#prez]", vars);</programlisting></para>
+
+      <sect3 id="expressions-this">
+        <title>The '#this' and '#root' variables</title>
+
+        <para>There are two special variables that are always defined and can
+        be references within the expression: <literal>#this</literal> and
+        <literal>#root</literal>.</para>
+
+        <para>The <literal>#this</literal> variable can be used to explicitly
+        refer to the context for the node that is currently being
+        evaluated:<programlisting>// sets the name of the president and returns its instance
+ExpressionEvaluator.GetValue(ieee, "Officers['president'].( #this.Name = 'Nikola Tesla'; #this )")</programlisting></para>
+
+        <para>Similarly, the <literal>#root</literal> variable allows you to
+        refer to the root context for the expression:<programlisting>// removes president from the Officers dictionary and returns removed instance
+ExpressionEvaluator.GetValue(ieee, "Officers['president'].( #root.Officers.Remove('president'); #this )")</programlisting></para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="expressions-ternary">
+      <title>Ternary Operator (If-Then-Else)</title>
+
+      <para>You can use the ternary operator for performing if-then-else
+      conditional logic inside the expression. A minimal example is;
+      <programlisting>String aTrueString  = (String) ExpressionEvaluator.GetValue(null, "false ? 'trueExp' : 'falseExp'") // trueExp
+</programlisting> In this case, the boolean false results in returning the
+      string value 'trueExp'. A less artificial example is shown below
+      <programlisting>ExpressionEvaluator.SetValue(ieee, "Name", "IEEE");
+IDictionary vars = new Hashtable();
+vars["queryName"] = "Nikola Tesla";
+
+string expression = @"IsMember(#queryName) 
+                      ? #queryName + ' is a member of the ' + Name + ' Society' 
+                      : #queryName + ' is not a member of the ' + Name + ' Society'";
+
+String queryResultString = (String) ExpressionEvaluator.GetValue(ieee, expression, vars));
+
+// queryResultString = "Nikola Tesla is a member of the IEEE Society"</programlisting></para>
+    </sect2>
+
+    <sect2>
+      <title>List Projection and Selection</title>
+
+      <para>List projection and selection are very powerful expression
+      language features that allow you to transform the source list into
+      another list by either <emphasis>projecting</emphasis> across its
+      "columns", or <emphasis>selecting</emphasis> from its "rows". In other
+      words, projection can be thought of as a column selector in a SQL SELECT
+      statement, while selection would be comparable to the WHERE
+      clause.</para>
+
+      <para>For example, let's say that we need a list of the cities where our
+      inventors were born. This could be easily obtained by projecting on the
+      <literal>PlaceOfBirth.City</literal> property: <programlisting>IList placesOfBirth = (IList) ExpressionEvaluator.GetValue(ieee, "Members.!{PlaceOfBirth.City}")  // { 'Smiljan', 'Idvor' }
+</programlisting>Or we can get the list of officers' names:<programlisting>IList officersNames = (IList) ExpressionEvaluator.GetValue(ieee, "Officers.Values.!{Name}")  // { 'Nikola Tesla', 'Mihajlo Pupin' }
+</programlisting></para>
+
+      <para>As you can see from the examples, projection uses
+      <literal>!{</literal><emphasis>projectionExpression</emphasis><literal>}</literal>
+      syntax and will return a new list of the same length as the original
+      list but typically with the elements of a different type.</para>
+
+      <para>On the other hand, selection, which uses
+      <literal>?{</literal><emphasis>projectionExpression</emphasis><literal>}</literal>
+      syntax, will filter the list and return a new list containing a subset
+      of the original element list. For example, selection would allow us to
+      easily get a list of Serbian inventors:<programlisting>IList serbianInventors = (IList) ExpressionEvaluator.GetValue(ieee, "Members.?{Nationality == 'Serbian'}")  // { tesla, pupin }
+</programlisting>Or to get a list of inventors that invented
+      sonar:<programlisting>IList sonarInventors = (IList) ExpressionEvaluator.GetValue(ieee, "Members.?{'Sonar' in Inventions}")  // { pupin }
+</programlisting>Or we can combine selection and projection to get a list of
+      sonar inventors' names:<programlisting>IList sonarInventorsNames = (IList) ExpressionEvaluator.GetValue(ieee, "Members.?{'Sonar' in Inventions}.!{Name}")  // { 'Mihajlo Pupin' }
+</programlisting></para>
+
+      <para>As a convenience, Spring.NET Expression Language also supports a
+      special syntax for selecting the first or last match. Unlike regular
+      selection, which will return an empty list if no matches are found,
+      first or last match selection expression will either return an instance
+      of the matched element, or <literal>null</literal> if no matching
+      elements were found. In order to return a first match you should prefix
+      your selection expression with <literal>^{</literal> instead of
+      <literal>?{</literal>, and to return last match you should use
+      <literal>${</literal> prefix:<programlisting>ExpressionEvaluator.GetValue(ieee, "Members.^{Nationality == 'Serbian'}.Name")  // 'Nikola Tesla'
+ExpressionEvaluator.GetValue(ieee, "Members.${Nationality == 'Serbian'}.Name")  // 'Mihajlo Pupin'
+</programlisting>Notice that we access the <literal>Name</literal> property
+      directly on the selection result, because an actual matched instance is
+      returned by the first and last match expression instead of a filtered
+      list.</para>
+    </sect2>
+
+    <sect2>
+      <title>Collection Processors and Aggregators</title>
+
+      <para>In addition to list projection and selection, Spring.NET
+      Expression Language also supports several collection processors, such as
+      <literal>distinct</literal>, <literal>nonNull</literal> and
+      <literal>sort</literal>, as well as a number of commonly used
+      aggregators, such as <literal>max</literal>, <literal>min</literal>,
+      <literal>count</literal>, <literal>sum</literal> and
+      <literal>average</literal>.</para>
+
+      <para>The difference between processors and aggregators is that
+      processors return a new or transformed collection, while aggregators
+      return a single value. Other than that, they are very similar -- both
+      processors and aggregators are invoked on a collection node using
+      standard method invocation expression syntax, which makes them very
+      simple to use and allows easy chaining of multiple processors.</para>
+
+      <sect3>
+        <title>Count Aggregator</title>
+
+        <para>The count aggregator is a safe way to obtain a number of items
+        in a collection. It can be applied to a collection of any type,
+        including arrays, which helps eliminate the decision on whether to use
+        <literal>Count</literal> or <literal>Length</literal> property
+        depending on the context. Unlike its standard .NET counterparts, count
+        aggregator can also be invoked on the <literal>null</literal> context
+        without throwing a <classname>NullReferenceException</classname>. It
+        will simply return zero in this case, which makes it much safer than
+        standard .NET properties within larger expression.<programlisting>ExpressionEvaluator.GetValue(null, "{1, 5, -3}.count()")  // 3
+ExpressionEvaluator.GetValue(null, "count()")  // 0
+</programlisting></para>
+      </sect3>
+
+      <sect3>
+        <title>Sum Aggregator</title>
+
+        <para>The sum aggregator can be used to calculate a total for the list
+        of numeric values. If numbers within the list are not of the same type
+        or precision, it will automatically perform necessary conversion and
+        the result will be the highest precision type. If any of the
+        collection elements is not a number, this aggregator will throw an
+        <classname>InvalidArgumentException</classname>.<programlisting>ExpressionEvaluator.GetValue(null, "{1, 5, -3, 10}.sum()")  // 13 (int)
+ExpressionEvaluator.GetValue(null, "{5, 5.8, 12.2, 1}.sum()")  // 24.0 (double)
+</programlisting></para>
+      </sect3>
+
+      <sect3>
+        <title>Average Aggregator</title>
+
+        <para>The average aggregator will return the average for the
+        collection of numbers. It will use the same type coercion rules, as
+        the sum aggregator in order to be as precise as possible. Just like
+        the sum aggregator, if any of the collection elements is not a number,
+        it will throw an
+        <classname>InvalidArgumentException</classname>.<programlisting>ExpressionEvaluator.GetValue(null, "{1, 5, -4, 10}.average()")  // 3
+ExpressionEvaluator.GetValue(null, "{1, 5, -2, 10}.average()")  // 3.5
+</programlisting></para>
+      </sect3>
+
+      <sect3>
+        <title>Minimum Aggregator</title>
+
+        <para>The minimum aggregator will return the smallest item in the
+        list. In order to determine what "the smallest" actually means, this
+        aggregator relies on the assumption that the collection items are of
+        the uniform type and that they implement the
+        <classname>IComparable</classname> interface. If that is not the case,
+        this aggregator will throw an
+        <classname>InvalidArgumentException</classname>.<programlisting>ExpressionEvaluator.GetValue(null, "{1, 5, -3, 10}.min()")  // -3
+ExpressionEvaluator.GetValue(null, "{'abc', 'efg', 'xyz'}.min()")  // 'abc'
+</programlisting></para>
+      </sect3>
+
+      <sect3>
+        <title>Maximum Aggregator</title>
+
+        <para>The maximum aggregator will return the largest item in the list.
+        In order to determine what "the largest" actually means, this
+        aggregator relies on the assumption that the collection items are of
+        the uniform type and that they implement
+        <classname>IComparable</classname> interface. If that is not the case,
+        this aggregator will throw an
+        <classname>InvalidArgumentException</classname>.<programlisting>ExpressionEvaluator.GetValue(null, "{1, 5, -3, 10}.max()")  // 10
+ExpressionEvaluator.GetValue(null, "{'abc', 'efg', 'xyz'}.max()")  // 'xyz'
+</programlisting></para>
+      </sect3>
+
+      <sect3>
+        <title>Non-null Processor</title>
+
+        <para>A non-null processor is a very simple collection processor that
+        eliminates all <literal>null</literal> values from the
+        collection.<programlisting>ExpressionEvaluator.GetValue(null, "{ 'abc', 'xyz', null, 'abc', 'def', null}.nonNull()")  // { 'abc', 'xyz', 'abc', 'def' }
+ExpressionEvaluator.GetValue(null, "{ 'abc', 'xyz', null, 'abc', 'def', null}.nonNull().distinct().sort()")  // { 'abc', 'def', 'xyz' }
+</programlisting></para>
+      </sect3>
+
+      <sect3>
+        <title>Distinct Processor</title>
+
+        <para>A distinct processor is very useful when you want to ensure that
+        you don't have duplicate items in the collection. It can also accept
+        an optional <literal>Boolean</literal> argument that will determine
+        whether <literal>null</literal> values should be included in the
+        results. The default is <literal>false</literal>, which means that
+        they will not be included. <programlisting>ExpressionEvaluator.GetValue(null, "{ 'abc', 'xyz', 'abc', 'def', null, 'def' }.distinct(true).sort()")  // { null, 'abc', 'def', 'xyz' }
+ExpressionEvaluator.GetValue(null, "{ 'abc', 'xyz', 'abc', 'def', null, 'def' }.distinct(false).sort()")  // { 'abc', 'def', 'xyz' }
+</programlisting></para>
+      </sect3>
+
+      <sect3>
+        <title>Sort Processor</title>
+
+        <para>The sort processor can be used to sort uniform collections of
+        elements that implement <classname>IComparable</classname>.</para>
+
+        <programlisting>ExpressionEvaluator.GetValue(null, "{1.2, 5.5, -3.3}.sort()")  // { -3.3, 1.2, 5.5 }
+ExpressionEvaluator.GetValue(null, "{ 'abc', 'xyz', 'abc', 'def', null, 'def' }.sort()")  // { null, 'abc', 'abc', 'def', 'def', 'xyz' }
+</programlisting>
+      </sect3>
+    </sect2>
+
+    <sect2>
+      <title>Spring Object References</title>
+
+      <para>Expressions can refer to objects that are declared in Spring's
+      application context using the syntax
+      <literal>@(</literal><emphasis>contextName</emphasis><literal>:</literal><emphasis>objectName</emphasis><literal>)</literal>.
+      If no contextName is specified the default root context name
+      (<literal>Spring.RootContext</literal>) is used. Using the application
+      context defined in the MovieFinder example from <xref
+      linkend="quickstarts" />, the following expression returns the number of
+      movies directed by Roberto Benigni. <programlisting>public static void Main()
+{
+  . . .
+
+// Retrieve context defined in the spring/context section of 
+// the standard .NET configuration file.
+IApplicationContext ctx = ContextRegistry.GetContext();
+
+int numMovies = (int) ExpressionEvaluator.GetValue(null, 
+                      "@(MyMovieLister).MoviesDirectedBy('Roberto Benigni').Length");
+
+  . . .
+}</programlisting> The variable numMovies is evaluated to 2 in this
+      example.</para>
+    </sect2>
+
+    <sect2>
+      <title>Lambda Expressions</title>
+
+      <para>A somewhat advanced, but a very powerful feature of Spring.NET
+      Expression Language are lambda expressions. Lambda expressions allow you
+      to define inline functions, which can then be used within your
+      expressions just like any other function or method.</para>
+
+      <para>The syntax for defining lambda expressions is:</para>
+
+      <para><literal>#</literal><emphasis>functionName</emphasis><literal> =
+      {|</literal><emphasis>argList</emphasis><literal>|
+      </literal><emphasis>functionBody</emphasis><literal> }</literal></para>
+
+      <para>For example, you could define a <literal>max</literal> function
+      and call it like this:<programlisting>ExpressionEvaluator.GetValue(null, "(#max = {|x,y| $x &gt; $y ? $x : $y }; #max(5,25))", new Hashtable())  // 25</programlisting></para>
+
+      <para>As you can see, any arguments defined for the expression can be
+      referenced within the function body using a <emphasis>local
+      variable</emphasis> syntax,
+      <literal>$</literal><emphasis>varName</emphasis>. Invocation of the
+      function defined using lambda expression is as simple as specifying the
+      comma-separated list of function arguments in parentheses, after the
+      function name.</para>
+
+      <para>Lambda expressions can be recursive, which means that you can
+      invoke the function within its own body:<programlisting>ExpressionEvaluator.GetValue(null, "(#fact = {|n| $n &lt;= 1 ? 1 : $n * #fact($n-1) }; #fact(5))", new Hashtable())  // 120</programlisting></para>
+
+      <para>Notice that in both examples above we had to specify a
+      <literal>variables</literal> parameter for the
+      <literal>GetValue</literal> method. This is because lambda expressions
+      are actually nothing more than parameterized variables and we need
+      variables dictionary in order to store them. If you don't specify a
+      valid <literal>IDictionary</literal> instance for the
+      <literal>variables</literal> parameter, you will get a runtime
+      exception.</para>
+
+      <para>Also, in both examples above we used an expression list in order
+      to define and invoke a function in a single expression. However, more
+      likely than not, you will want to define your functions once and then
+      use them within as many expressions as you need. Spring.NET provides an
+      easy way to pre-register your lambda expressions by exposing a static
+      <literal>Expression.RegisterFunction</literal> method, which takes
+      function name, lambda expression and variables dictionary to register
+      function in as parameters:<programlisting>IDictionary vars = new Hashtable();
+Expression.RegisterFunction("sqrt", "{|n| Math.Sqrt($n)}", vars);
+Expression.RegisterFunction("fact", "{|n| $n &lt;= 1 ? 1 : $n * #fact($n-1)}", vars);</programlisting>Once
+      the function registration is done, you can simply evaluate an expression
+      that uses these functions, making sure that the <literal>vars</literal>
+      dictionary is passed as a parameter to expression evaluation
+      engine:<programlisting>ExpressionEvaluator.GetValue(null, "#fact(5)", vars)  // 120
+ExpressionEvaluator.GetValue(null, "#sqrt(9)", vars)  // 3</programlisting></para>
+
+      <para>Finally, because lambda expressions are treated as variables, they
+      can be assigned to other variables or passed as parameters to other
+      lambda expressions. In the following example we are defining a delegate
+      function that accepts function <literal>f</literal> as the first
+      argument and parameter <literal>n</literal> that will be passed to
+      function <literal>f</literal> as the second. Then we invoke the
+      functions registered in the previous example, as well as the lambda
+      expression defined inline, through our delegate:<programlisting>Expression.RegisterFunction("delegate", "{|f, n| $f($n) }", vars);
+ExpressionEvaluator.GetValue(null, "#delegate(#sqrt, 4)", vars)  // 2
+ExpressionEvaluator.GetValue(null, "#delegate(#fact, 5)", vars)  // 120
+ExpressionEvaluator.GetValue(null, "#delegate({|n| $n ^ 2 }, 5)", vars)  // 25</programlisting>While
+      this particular example is not particularly useful, it does demonstrate
+      that lambda expressions are indeed treated as nothing more than
+      parameterized variables, which is important to remember.</para>
+    </sect2>
+
+    <sect2>
+      <title>Null Context</title>
+
+      <para>If you do not specify a root object, i.e. pass in null, then the
+      expressions evaluated either have to be literal values, i.e.
+      ExpressionEvaluator.GetValue(null, "2 + 3.14"), refer to classes that
+      have static methods or properties, i.e.
+      ExpressionEvaluator.GetValue(null, "DateTime.Today"), create new
+      instances of objects, i.e. ExpressionEvaluator.GetValue(null, "new
+      DateTime(2004, 8, 14)") or refer to other objects such as those in the
+      variable dictionary or in the IoC container. The latter two usages will
+      be discussed later.</para>
+    </sect2>
+  </sect1>
+
+  <!-- SAMPLE CLASSES AND DATA -->
+
+  <sect1 id="expressions-classes">
+    <title>Classes used in the examples</title>
+
+    <para>The following simple classes are used to demonstrate the
+    functionality of the expression language.</para>
+
+    <programlisting>public class Inventor
+{
+    public string Name;
+    public string Nationality;
+    public string[] Inventions;
+    private DateTime dob;
+    private Place pob;
+
+    public Inventor() : this(null, DateTime.MinValue, null)
+    {}
+
+    public Inventor(string name, DateTime dateOfBirth, string nationality)
+    {
+        this.Name = name;
+        this.dob = dateOfBirth;
+        this.Nationality = nationality;
+        this.pob = new Place();
+    }
+
+    public DateTime DOB
+    {
+        get { return dob; }
+        set { dob = value; }
+    }
+
+    public Place PlaceOfBirth
+    {
+        get { return pob; }
+    }
+
+    public int GetAge(DateTime on)
+    {
+        // not very accurate, but it will do the job ;-)
+        return on.Year - dob.Year;
+    }
+}
+
+public class Place
+{
+    public string City;
+    public string Country;
+}
+
+public class Society
+{
+    public string Name;
+    public static string Advisors = "advisors";
+    public static string President = "president";
+
+    private IList members = new ArrayList();
+    private IDictionary officers = new Hashtable();
+
+    public IList Members
+    {
+        get { return members; }
+    }
+
+    public IDictionary Officers
+    {
+        get { return officers; }
+    }
+
+    public bool IsMember(string name)
+    {
+        bool found = false;
+        foreach (Inventor inventor in members)
+        {
+            if (inventor.Name == name)
+            {
+                found = true;
+                break;
+            }
+        }
+        return found;
+    }
+}</programlisting>
+
+    <para>The code listings in this chapter use instances of the data
+    populated with the following information.</para>
+
+    <programlisting>Inventor tesla = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+tesla.Inventions = new string[]
+    {
+        "Telephone repeater", "Rotating magnetic field principle",
+        "Polyphase alternating-current system", "Induction motor",
+        "Alternating-current power transmission", "Tesla coil transformer",
+        "Wireless communication", "Radio", "Fluorescent lights"
+    };
+tesla.PlaceOfBirth.City = "Smiljan";
+
+Inventor pupin = new Inventor("Mihajlo Pupin", new DateTime(1854, 10, 9), "Serbian");
+pupin.Inventions = new string[] {"Long distance telephony &amp; telegraphy", "Secondary X-Ray radiation", "Sonar"};
+pupin.PlaceOfBirth.City = "Idvor";
+pupin.PlaceOfBirth.Country = "Serbia";
+
+Society ieee = new Society();
+ieee.Members.Add(tesla);
+ieee.Members.Add(pupin);
+ieee.Officers["president"] = pupin;
+ieee.Officers["advisors"] = new Inventor[] {tesla, pupin};</programlisting>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/images/Copy of S2-banner-rhs.png b/doc/reference/src/images/Copy of S2-banner-rhs.png
new file mode 100644
index 00000000..a9f6d959
Binary files /dev/null and b/doc/reference/src/images/Copy of S2-banner-rhs.png differ
diff --git a/doc/reference/src/images/DataAccessException.gif b/doc/reference/src/images/DataAccessException.gif
new file mode 100644
index 00000000..ece7393f
Binary files /dev/null and b/doc/reference/src/images/DataAccessException.gif differ
diff --git a/doc/reference/src/images/S2-banner-rhs.png b/doc/reference/src/images/S2-banner-rhs.png
new file mode 100644
index 00000000..a9f6d959
Binary files /dev/null and b/doc/reference/src/images/S2-banner-rhs.png differ
diff --git a/doc/reference/src/images/Thumbs.db b/doc/reference/src/images/Thumbs.db
new file mode 100644
index 00000000..a043a3b6
Binary files /dev/null and b/doc/reference/src/images/Thumbs.db differ
diff --git a/doc/reference/src/images/aop-chain.png b/doc/reference/src/images/aop-chain.png
new file mode 100644
index 00000000..513e5167
Binary files /dev/null and b/doc/reference/src/images/aop-chain.png differ
diff --git a/doc/reference/src/images/aop-uml.gif b/doc/reference/src/images/aop-uml.gif
new file mode 100644
index 00000000..09bde26c
Binary files /dev/null and b/doc/reference/src/images/aop-uml.gif differ
diff --git a/doc/reference/src/images/bean-lifecycle-overview.gif b/doc/reference/src/images/bean-lifecycle-overview.gif
new file mode 100644
index 00000000..a9b21c64
Binary files /dev/null and b/doc/reference/src/images/bean-lifecycle-overview.gif differ
diff --git a/doc/reference/src/images/container-in-action.gif b/doc/reference/src/images/container-in-action.gif
new file mode 100644
index 00000000..3629f132
Binary files /dev/null and b/doc/reference/src/images/container-in-action.gif differ
diff --git a/doc/reference/src/images/i21-banner-rhs.jpg b/doc/reference/src/images/i21-banner-rhs.jpg
new file mode 100644
index 00000000..8b24a773
Binary files /dev/null and b/doc/reference/src/images/i21-banner-rhs.jpg differ
diff --git a/doc/reference/src/images/link.png b/doc/reference/src/images/link.png
new file mode 100644
index 00000000..a0dd87e6
Binary files /dev/null and b/doc/reference/src/images/link.png differ
diff --git a/doc/reference/src/images/logo.gif b/doc/reference/src/images/logo.gif
new file mode 100644
index 00000000..0f243086
Binary files /dev/null and b/doc/reference/src/images/logo.gif differ
diff --git a/doc/reference/src/images/logo.jpg b/doc/reference/src/images/logo.jpg
new file mode 100644
index 00000000..d1242364
Binary files /dev/null and b/doc/reference/src/images/logo.jpg differ
diff --git a/doc/reference/src/images/logo.png b/doc/reference/src/images/logo.png
new file mode 100644
index 00000000..54ffa3eb
Binary files /dev/null and b/doc/reference/src/images/logo.png differ
diff --git a/doc/reference/src/images/logo.psd b/doc/reference/src/images/logo.psd
new file mode 100644
index 00000000..d1f337ee
Binary files /dev/null and b/doc/reference/src/images/logo.psd differ
diff --git a/doc/reference/src/images/logo.xcf b/doc/reference/src/images/logo.xcf
new file mode 100644
index 00000000..3cc4933d
Binary files /dev/null and b/doc/reference/src/images/logo.xcf differ
diff --git a/doc/reference/src/images/movie-finder.gif b/doc/reference/src/images/movie-finder.gif
new file mode 100644
index 00000000..34280865
Binary files /dev/null and b/doc/reference/src/images/movie-finder.gif differ
diff --git a/doc/reference/src/images/overview.gif b/doc/reference/src/images/overview.gif
new file mode 100644
index 00000000..073655e5
Binary files /dev/null and b/doc/reference/src/images/overview.gif differ
diff --git a/doc/reference/src/images/remoting-solution.gif b/doc/reference/src/images/remoting-solution.gif
new file mode 100644
index 00000000..fb1f5ef8
Binary files /dev/null and b/doc/reference/src/images/remoting-solution.gif differ
diff --git a/doc/reference/src/images/remoting-startup.gif b/doc/reference/src/images/remoting-startup.gif
new file mode 100644
index 00000000..45af17e5
Binary files /dev/null and b/doc/reference/src/images/remoting-startup.gif differ
diff --git a/doc/reference/src/images/spring-triangle.png b/doc/reference/src/images/spring-triangle.png
new file mode 100644
index 00000000..d9a8eb66
Binary files /dev/null and b/doc/reference/src/images/spring-triangle.png differ
diff --git a/doc/reference/src/images/spring.sxd b/doc/reference/src/images/spring.sxd
new file mode 100644
index 00000000..40c1a9e4
Binary files /dev/null and b/doc/reference/src/images/spring.sxd differ
diff --git a/doc/reference/src/images/spring.vsd b/doc/reference/src/images/spring.vsd
new file mode 100644
index 00000000..9b210b40
Binary files /dev/null and b/doc/reference/src/images/spring.vsd differ
diff --git a/doc/reference/src/images/spring.windows-service.png b/doc/reference/src/images/spring.windows-service.png
new file mode 100644
index 00000000..89538257
Binary files /dev/null and b/doc/reference/src/images/spring.windows-service.png differ
diff --git a/doc/reference/src/images/spring.windows-service.vsd b/doc/reference/src/images/spring.windows-service.vsd
new file mode 100644
index 00000000..0bc43d9e
Binary files /dev/null and b/doc/reference/src/images/spring.windows-service.vsd differ
diff --git a/doc/reference/src/images/tx.png b/doc/reference/src/images/tx.png
new file mode 100644
index 00000000..06f2e77c
Binary files /dev/null and b/doc/reference/src/images/tx.png differ
diff --git a/doc/reference/src/images/web-exporter-calc-svc-aop-add.jpg b/doc/reference/src/images/web-exporter-calc-svc-aop-add.jpg
new file mode 100644
index 00000000..969c766c
Binary files /dev/null and b/doc/reference/src/images/web-exporter-calc-svc-aop-add.jpg differ
diff --git a/doc/reference/src/images/web-exporter-calc-svc-aop-add001.jpg b/doc/reference/src/images/web-exporter-calc-svc-aop-add001.jpg
new file mode 100644
index 00000000..cdda6781
Binary files /dev/null and b/doc/reference/src/images/web-exporter-calc-svc-aop-add001.jpg differ
diff --git a/doc/reference/src/images/web-exporter-calc-svc-aop.jpg b/doc/reference/src/images/web-exporter-calc-svc-aop.jpg
new file mode 100644
index 00000000..ecbeb6d1
Binary files /dev/null and b/doc/reference/src/images/web-exporter-calc-svc-aop.jpg differ
diff --git a/doc/reference/src/images/web-exporter-calc-svc-main.jpg b/doc/reference/src/images/web-exporter-calc-svc-main.jpg
new file mode 100644
index 00000000..8def29da
Binary files /dev/null and b/doc/reference/src/images/web-exporter-calc-svc-main.jpg differ
diff --git a/doc/reference/src/images/web-exporter-calc-svc.jpg b/doc/reference/src/images/web-exporter-calc-svc.jpg
new file mode 100644
index 00000000..ca460ed8
Binary files /dev/null and b/doc/reference/src/images/web-exporter-calc-svc.jpg differ
diff --git a/doc/reference/src/images/xdev-spring_logo.jpg b/doc/reference/src/images/xdev-spring_logo.jpg
new file mode 100644
index 00000000..622962ee
Binary files /dev/null and b/doc/reference/src/images/xdev-spring_logo.jpg differ
diff --git a/doc/reference/src/index.xml b/doc/reference/src/index.xml
new file mode 100644
index 00000000..eb35ae45
--- /dev/null
+++ b/doc/reference/src/index.xml
@@ -0,0 +1,383 @@
+<?xml version='1.0' encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+                      "../../reference/lib/docbook-dtd/docbookx.dtd"
+[
+<!ENTITY aop          SYSTEM "aop.xml">
+<!ENTITY aop-aspect-library  SYSTEM "aop-aspect-library.xml">
+<!ENTITY background   SYSTEM "background.xml">
+<!ENTITY objects      SYSTEM "objects.xml">
+<!ENTITY resources    SYSTEM "resources.xml">
+<!ENTITY objects-misc SYSTEM "objects-misc.xml">
+<!ENTITY expressions  SYSTEM "expressions.xml">
+<!ENTITY validation   SYSTEM "validation.xml">
+<!ENTITY logging      SYSTEM "logging.xml">
+<!ENTITY testing      SYSTEM "testing.xml">
+
+<!ENTITY overview     SYSTEM "overview.xml">
+<!ENTITY psa-intro    SYSTEM "psa-intro.xml">
+<!ENTITY remoting     SYSTEM "remoting.xml">
+<!ENTITY web          SYSTEM "web.xml">
+<!ENTITY ajax         SYSTEM "ajax.xml">
+<!ENTITY services     SYSTEM "services.xml">
+<!ENTITY webservices  SYSTEM "webservices.xml">
+<!ENTITY threading    SYSTEM "threading.xml">
+<!ENTITY pool         SYSTEM "pool.xml">
+<!ENTITY preface      SYSTEM "preface.xml">
+
+<!ENTITY transaction  SYSTEM "transaction.xml">
+<!ENTITY dbprovider   SYSTEM "dbprovider.xml">
+<!ENTITY dao          SYSTEM "dao.xml">
+<!ENTITY ado          SYSTEM "ado.xml">
+<!ENTITY orm          SYSTEM "orm.xml">
+
+<!ENTITY vsnet        SYSTEM "vsnet.xml">
+<!ENTITY migration    SYSTEM "migration.xml">
+<!ENTITY quickstarts  SYSTEM "quickstarts.xml">
+<!ENTITY aop-quickstart  SYSTEM "aop-quickstart.xml">
+<!ENTITY remoting-quickstart  SYSTEM "remoting-quickstart.xml">
+<!ENTITY springair          SYSTEM "springair.xml">
+<!ENTITY web-quickstart     SYSTEM "web-quickstart.xml">
+<!ENTITY data-quickstart    SYSTEM "data-quickstart.xml">
+<!ENTITY tx-quickstart      SYSTEM "tx-quickstart.xml">
+<!ENTITY javadevelopers     SYSTEM "javadevelopers.xml">
+<!ENTITY misc               SYSTEM "misc.xml">
+<!ENTITY pooling-example    SYSTEM "pooling-example.xml">
+<!ENTITY xsd-configuration  SYSTEM "xsd-configuration.xml">
+<!ENTITY xml-custom         SYSTEM "xml-custom.xml">
+<!ENTITY xsd	            SYSTEM "xsd.xml">
+
+
+]>
+<book>
+  <bookinfo>
+    <title>The Spring.NET Framework</title>
+    <subtitle>Reference Documentation</subtitle>
+    <releaseinfo>Version 1.1.2</releaseinfo>
+    <pubdate>Last Updated May 6, 2008</pubdate>
+    <authorgroup>
+      <author>
+        <firstname>Mark</firstname>
+        <surname>Pollack</surname>
+      </author>
+      <author>
+        <firstname>Rick</firstname>
+        <surname>Evans</surname>
+      </author>
+      <author>
+        <firstname>Aleksandar</firstname>
+        <surname>Seovic</surname>
+      </author>
+      <author>
+        <firstname>Bruno</firstname>
+        <surname>Baia</surname>
+      </author>
+      <author>
+        <firstname>Federico</firstname>
+	    <surname>Spinazzi</surname>
+      </author>
+      <author>
+        <firstname>Rob</firstname>
+        <surname>Harrop</surname>
+      </author>
+      <author>
+        <firstname>Griffin</firstname>
+        <surname>Caprio</surname>
+      </author>
+      <author>
+        <firstname>Ruben</firstname>
+        <surname>Bartelink</surname>
+      </author>
+      <author>
+        <firstname>Choy</firstname>
+        <surname>Rim</surname>
+      </author>
+      <author>
+        <firstname>The Spring</firstname>
+        <surname>Java Team</surname>
+      </author>
+    </authorgroup>
+    <legalnotice>
+      <para>
+        Copies of this document may be made for your own use and for
+        distribution to others, provided that you do not charge any fee for such
+        copies and further provided that each copy contains this Copyright
+        Notice, whether distributed in print or electronically.
+        </para>
+    </legalnotice>
+  </bookinfo>
+  <toc/>
+      &preface;
+      &overview;
+      &background;
+      &migration;
+	<part id="index-core">
+		<title>Core Technologies</title>
+		<partintro>
+			<para>
+				This initial part of the reference documentation covers
+				all of those technologies that are absolutely integral
+				to the Spring Framework.
+			</para>
+			<para>
+				Foremost amongst these is the Spring Framework's
+				Inversion of Control (IoC) container. A thorough treatment
+				of the Spring Framework's IoC container is closely followed
+				by comprehensive coverage of Spring's Aspect-Oriented
+				Programming (AOP) technologies. The Spring Framework has
+				its own AOP framework, which is conceptually easy to understand,
+				and which successfully addresses the 80% sweet spot of AOP
+				requirements in enterprise programming.
+			</para>
+			<para>
+			        The core functionality also includes an expression language
+				for lightweight scripting and a ui-agnostic validation framework.
+			</para>
+			<para>
+			    Finally, the adoption of the test-driven-development (TDD)
+			    approach to software development is certainly advocated by
+			    the Spring team, and so coverage of Spring's support for
+			    integration testing is covered (alongside best practices for
+			    unit testing). The Spring team have found that the correct
+			    use of IoC certainly does make both unit and integration
+			    testing easier (in that the presence of properties and
+			    appropriate constructors on classes makes them
+			    easier to wire together on a test without having to set up
+			    service locator registries and suchlike)... the chapter
+			    dedicated solely to testing will hopefully convince you of
+			    this as well.
+			</para>
+			<itemizedlist>
+				<listitem>
+					<xref linkend="objects" />
+				</listitem>
+				<listitem>
+					<xref linkend="objects-misc" />
+				</listitem>
+				<listitem>
+					<xref linkend="resources" />
+				</listitem>
+				<listitem>
+					<xref linkend="threading" />
+				</listitem>
+				<listitem>
+					<xref linkend="pool" />
+				</listitem>
+				<listitem>
+					<xref linkend="expressions" />
+				</listitem>
+				<listitem>
+					<xref linkend="misc" />
+				</listitem>
+				<listitem>
+					<xref linkend="validation" />
+				</listitem>
+				<listitem>
+					<xref linkend="aop" />
+				</listitem>
+				<listitem>
+					<xref linkend="aop-aspect-library" />
+				</listitem>
+				<listitem>
+					<xref linkend="logging" />
+				</listitem>
+				<listitem>
+					<xref linkend="testing" />
+				</listitem>
+			</itemizedlist>
+		</partintro>
+      &objects;
+      &objects-misc;
+      &resources;
+      &threading;
+      &pool;
+      &misc;
+      &expressions;
+      &validation;
+      <!-- &util; -->
+      &aop;
+      &aop-aspect-library;
+      &logging;
+      &testing;
+      </part>
+      <part id="index-middle-tier">
+		<title>Middle Tier Data Access</title>
+		<partintro id="index-middle-tier-intro">
+			<para>
+				This part of the reference documentation is concerned
+				with the middle tier, and specifically the data access
+				responsibilities of said tier.
+			</para>
+			<para>
+				Spring's comprehensive transaction management support is
+				covered in some detail, followed by thorough coverage of
+				the various middle tier data access frameworks and
+				technologies that the Spring Framework integrates with.
+			</para>
+			<itemizedlist>
+				<listitem>
+					<xref linkend="transaction" />
+				</listitem>
+				<listitem>
+					<xref linkend="dao" />
+				</listitem>
+				<listitem>
+					<xref linkend="dbprovider" />
+				</listitem>
+				<listitem>
+					<xref linkend="ado" />
+				</listitem>
+				<listitem>
+					<xref linkend="orm" />
+				</listitem>
+			</itemizedlist>
+		</partintro>
+		&transaction;
+		&dao;
+		&dbprovider;
+		&ado;
+		&orm;
+	</part>
+	<part>
+		<title>The Web</title>
+		<partintro>
+			<para>
+				This part of the reference documentation covers the
+				Spring Framework's support for the presentation tier,
+				specifically web-based presentation tiers.
+			</para>
+			<itemizedlist>
+				<listitem>
+					<xref linkend="web" />
+				</listitem>
+				<listitem>
+					<xref linkend="ajax" />
+				</listitem>
+			</itemizedlist>
+		</partintro>
+		&web;
+		&ajax;
+	</part>
+	<part id="index-services">
+		<title>Services</title>
+		<partintro>
+			<para>
+				This part of the reference documentation covers
+				the Spring Framework's integration with .NET distributed 
+				technologies such as .NET Remoting, Enterprise Services, 
+				Web Services.  Integration with WCF Services is forthcoming.
+				Please refer to the introduction chapter for more details.
+			</para>
+			<itemizedlist>
+				<listitem>
+					<xref linkend="psa-intro" />
+				</listitem>
+				<listitem>
+					<xref linkend="remoting" />
+				</listitem>
+				<listitem>
+					<xref linkend="services" />
+				</listitem>
+				<listitem>
+					<xref linkend="webservices" />
+				</listitem>
+			</itemizedlist>
+		</partintro>
+		&psa-intro;
+		&remoting;
+		&services;
+		&webservices;
+	</part>      
+	<part id="index-vsnet">
+		<title>VS.NET Integration</title>
+		<partintro>
+			<para>
+				This part of the reference documentation covers
+				the Spring Framework's integration with VS.NET
+			</para>
+			<itemizedlist>
+				<listitem>
+					<xref linkend="vsnet" />
+				</listitem>
+			</itemizedlist>
+		</partintro>
+		&vsnet;      
+	</part>      
+	<part id="index-quickstarts">
+		<title>Quickstart applications</title>
+		<partintro>
+			<para>
+				This part of the reference documentation covers
+				the quickstart applications included with
+				Spring that demonstrate features in a code centric
+				manner.
+			</para>
+			<itemizedlist>
+				<listitem>
+					<xref linkend="quickstarts" />
+				</listitem>
+				<listitem>
+					<xref linkend="aop-quickstart" />
+				</listitem>
+				<listitem>
+					<xref linkend="remoting-quickstart" />
+				</listitem>
+				<listitem>
+					<xref linkend="web-quickstart" />
+				</listitem>
+				<listitem>
+					<xref linkend="springair" />
+				</listitem>
+				<listitem>
+					<xref linkend="data-quickstart" />
+				</listitem>
+				<listitem>
+					<xref linkend="tx-quickstart" />
+				</listitem>
+			</itemizedlist>
+		</partintro>
+		&quickstarts;
+		&aop-quickstart;
+		&remoting-quickstart;
+		&web-quickstart;
+		&springair;
+		&data-quickstart;
+		&tx-quickstart;
+	</part>      
+	<part id="index-javadevelopers">
+		<title>Spring.NET for Java developers</title>
+		<partintro>
+			<para>
+				This part of the reference documentation 
+				is for Java developers who would like a quick
+				orientation to what is different between
+				the Java and .NET versions of the framework.
+			</para>
+			<itemizedlist>
+				<listitem>
+					<xref linkend="javadevelopers" />
+				</listitem>
+			</itemizedlist>
+		</partintro>
+		&javadevelopers;
+	</part>      
+	
+	<!-- back matter -->
+	&xsd-configuration;
+	&xml-custom;
+        &xsd;
+
+</book>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/reference/src/javadevelopers.xml b/doc/reference/src/javadevelopers.xml
new file mode 100644
index 00000000..dd570464
--- /dev/null
+++ b/doc/reference/src/javadevelopers.xml
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="javadevelopers">
+  <title>Spring.NET for Java Developers</title>
+
+  <sect1 id="jd-introduction">
+    <title>Introduction</title>
+
+    <para>This chapter is to help Java developers get their sea legs using
+    Spring.NET. It is not intended to be a comprehensive comparison between
+    .NET and Java. Rather, it highlights the day-to-day differences you will
+    experience when you start to use Spring.NET.</para>
+  </sect1>
+
+  <sect1 id="jd-beans-objects">
+    <title>Beans to Objects</title>
+
+    <para>There are some simple name changes, basically everywhere you saw the
+    word 'bean' you will now see the word 'object'. A comparison of a simple
+    Spring configuration file highlights these small name changes. Here is the
+    application.xml file for the sample MovieFinder application in Spring.Java
+    <programlisting>&lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"&gt;
+&lt;beans&gt;
+   &lt;bean id="MyMovieLister" class="MovieFinder.MovieLister"&gt;
+       &lt;property name="finder" ref="MyMovieFinder"/&gt;
+   &lt;/bean&gt;
+   &lt;bean id="MyMovieFinder" class="MovieFinder.SimpleMovieFinder"/&gt;
+&lt;/beans&gt;</programlisting> Here is the corresponding file in Spring.NET
+    <programlisting>&lt;objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects-1.1.xsd"&gt;
+  &lt;object name="MyMovieLister" 
+          type="Spring.Examples.MovieFinder.MovieLister, Spring.Examples.MovieFinder"&gt;
+        &lt;property name="movieFinder" ref="MyMovieFinder"/&gt;
+  &lt;/object&gt;
+  &lt;object name="MyMovieFinder" 
+          type="Spring.Examples.MovieFinder.SimpleMovieFinder, Spring.Examples.MovieFinder"/&gt;
+&lt;/objects&gt;</programlisting> As you can easily see the &lt;beans&gt; and
+    &lt;bean&gt; elements are replaced by &lt;objects&gt; and &lt;object&gt;
+    elements. The class definition in Spring.Java contains the fully qualified
+    class name. The Spring.NET version also contains the fully qualified
+    classname but in addition specifies the name of the assembly where that
+    type is located. This is necessary since .NET does not have a 'classpath'
+    concept. Assembly names in .NET can have up to four parts to describe the
+    exact version.</para>
+
+    <para>The other XML Schema elements in Spring.NET are the same as in
+    Spring.Java's DTD except for specifying string based key value pairs. In
+    Java this is represented by the java.util.Properties class and the xml
+    element is name &lt;props&gt; as shown below <programlisting
+    format="linespecific" xml:space="preserve">
+&lt;property name="people"&gt;
+  &lt;props&gt;
+    &lt;prop key="PennAndTeller"&gt;The magic property&lt;/prop&gt;
+    &lt;prop key="GeorgeCarlin"&gt;The funny property&lt;/prop&gt;
+  &lt;/props&gt;
+&lt;/property&gt;</programlisting> In .NET the analogous class is
+    System.Collections.Specialized.NameValueCollection and is represented by
+    the xml element &lt;name-values&gt;. The listing of the elements also
+    follows the .NET convention of application configuration files using the
+    &lt;add&gt; element with 'key' and 'value' attributes. This is show below
+    <programlisting format="linespecific" xml:space="preserve">
+&lt;property name="people"&gt;
+  &lt;name-values&gt;
+    &lt;add key="PennAndTeller" value="The magic property"/&gt;
+    &lt;add key="GeorgeCarlin" value="The funny property"/&gt;
+  &lt;/name-values&gt;
+&lt;/property&gt;</programlisting></para>
+  </sect1>
+
+  <sect1 id="jd-propertyeditor-typeconverter">
+    <title>PropertyEditors to TypeConverters</title>
+
+    <para>PropertyEditors from the java.beans package provide the ability to
+    convert from a string to an instance of a Java class and vice-versa. For
+    example, to set a string array property, a comma delimited string can be
+    used. The Java class that provides this functionality is the appropriately
+    named StringArrayPropertyEditor. In .NET, TypeConverters from the
+    System.ComponentModel namespace provide the same functionality. The type
+    conversion functionality in .NET also allows for TypeConverters to be
+    explicitly registered with a data type. This allows for transparent
+    setting of complex object properties. However, some classes in the .NET
+    framework do not support the style of conversion we are used to from
+    Spring.Java, such as setting of a string[] with a comma delimited string.
+    The type converter, StringArrayConverter in the
+    Spring.Objects.TypeConverters namespace is therefore explicitly registered
+    with Spring.NET in order to provide this functionality. As in the case of
+    Spring.Java, Spring.NET allows user defined type converters to be
+    registered. However, if you are creating a custom type in .NET, using the
+    standard .NET mechanisms for type conversion is the preferred
+    approach.</para>
+  </sect1>
+
+  <sect1 id="jd-ResourceBundle-ResourceManager">
+    <title>ResourceBundle-ResourceManager</title>
+  </sect1>
+
+  <sect1 id="jd-exceptions">
+    <title>Exceptions</title>
+
+    <para>Exceptions in Java can either be checked or unchecked. .NET supports
+    only unchecked exceptions. Spring.Java prefers the use of unchecked
+    exceptions, frequently making conversions from checked to unchecked
+    exceptions. In this respect Spring.Java is similar to the default behavior
+    of .NET</para>
+  </sect1>
+
+  <sect1 id="jd-app-config">
+    <title>Application Configuration</title>
+
+    <para>In Spring.Java it is very common to create an ObjectFactory or
+    ApplicationContext from an external XML configuration file This
+    functionality is also provided in Spring.NET. However, in .NET the
+    System.Configuration namespace provides support for managing application
+    configuration information. The functionality in this namespace depends on
+    the availability of specially named files: Web.config for ASP.NET
+    applications and &lt;MyExe&gt;.exe.config for WinForms and console
+    applications. &lt;MyExe&gt; is the name of your executable. As part of the
+    compilation process, if you have a file name App.config in the root of
+    your project, the compiler will rename the file to
+    &lt;MyExe&gt;.exe.config and place it into the runtime executable
+    folder.</para>
+
+    <para>These application configuration files are XML based and contain
+    configuration sections that can be referenced by name to retrieve custom
+    configuration objects. In order to inform the .NET configuration system
+    how to create a custom configuration object from one of these sections, an
+    implementation of the interface, IConfigurationSectionHandler, needs to be
+    registered. Spring.NET provides two implementations, one to create an
+    IApplicationContext from a <literal>&lt;context&gt;</literal> section and
+    another to configure the context with object definitions contained in an
+    <literal>&lt;objects&gt;</literal> section. The
+    <literal>&lt;context&gt;</literal> section is very powerful and
+    expressive. It provides full support for locating all
+    <literal>IResource</literal> via Uri syntax and hierarchical contexts
+    without coding or using more verbose XML as would be required in the
+    current version of Spring.Java</para>
+
+    <programlisting>&lt;?xml version="1.0" encoding="utf-8" ?&gt;
+&lt;configuration&gt;
+
+    &lt;configSections&gt;
+        &lt;sectionGroup name="spring"&gt;
+            &lt;section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/&gt;
+            &lt;section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" /&gt;
+        &lt;/sectionGroup&gt;
+    &lt;/configSections&gt;
+ 
+    &lt;spring&gt;
+    
+        &lt;context&gt;
+            &lt;resource uri="config://spring/objects"/&gt;
+        &lt;/context&gt;
+        
+        &lt;objects&gt;
+            &lt;description&gt;An  example that demonstrates simple IoC features.&lt;/description&gt;
+            &lt;object name="MyMovieLister" type="Spring.Examples.MovieFinder.MovieLister, MovieFinder"&gt;
+                &lt;property name="movieFinder" ref="AnotherMovieFinder"/&gt;
+            &lt;/object&gt;
+            &lt;object name="MyMovieFinder" type="Spring.Examples.MovieFinder.SimpleMovieFinder, MovieFinder"/&gt;
+            &lt;!--
+            An IMovieFinder implementation that uses a text file as it's movie source...
+            --&gt;
+            &lt;object name="AnotherMovieFinder" type="Spring.Examples.MovieFinder.ColonDelimitedMovieFinder, MovieFinder"&gt;
+                &lt;constructor-arg index="0" value="movies.txt"/&gt;
+            &lt;/object&gt;
+        &lt;/objects&gt;
+
+    &lt;/spring&gt;
+    
+&lt;/configuration&gt;</programlisting>
+
+    <para>The &lt;configSections&gt; and &lt;section&gt; elements are a
+    standard part of the .NET application configuration file. These elements
+    are used to register an instance of IConfigurationSectionHandler and
+    associate it with another xml element in the file, in this case the
+    &lt;context&gt; and &lt;objects&gt; elements.</para>
+
+    <para>The following code segment is used to retrieve the
+    IApplicationContext from the .NET application configuration file.
+    <programlisting>IApplicationContext ctx
+          = ConfigurationUtils.GetSection("spring/context") as IApplicationContext;</programlisting></para>
+
+    <para>In order to enforce the usage of the named configuration section
+    <literal>spring/context</literal> the preferred instantiation mechanism is
+    via the use of the registry class ContextRegistry as shown below
+    <programlisting>IApplicationContext ctx = ContextRegistry.GetContext();</programlisting></para>
+  </sect1>
+
+  <sect1 id="jd-aop-framework">
+    <title>AOP Framework</title>
+
+    <sect2 id="NoTargetInInterceptorNames">
+      <title>Cannot specify target name at the end of interceptorNames for
+      ProxyFactoryObject</title>
+
+      <para>When configuring the list of interceptor names on a
+      <classname>ProxyFactoryObject</classname> instance (or object
+      definition), one <emphasis>cannot</emphasis> specify the name of the
+      target (i.e. the object being proxied) at the end of the list of
+      interceptor names. This shortcut <emphasis>is</emphasis> valid in Spring
+      Java, where the <classname>ProxyFactoryBean</classname> will
+      automatically detect this, and use the last name in the interceptor
+      names list as the target of the <classname>ProxyFactoryBean</classname>.
+      The following configuration, which would be valid in Spring Java
+      (barring the obvious element name changes), is <emphasis
+      role="bold">not</emphasis> valid in Spring.NET (so don't do it).</para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="utf-8" ?&gt;
+    &lt;objects xmlns="http://www.springframework.net"&gt;
+        &lt;object id="target" type="Spring.Objects.TestObject"&gt;
+            &lt;property name="name" value="Bingo"/&gt;
+        &lt;/object&gt;
+
+        &lt;object id="nopInterceptor" type="Spring.Aop.Interceptor.NopInterceptor"/&gt;
+
+        &lt;object id="prototypeTarget" type="Spring.Aop.Framework.ProxyFactoryObject"&gt;
+            &lt;property name="interceptorNames" value="nopInterceptor,target"/&gt; &lt;!-- not valid! --&gt;
+        &lt;/object&gt;
+    &lt;/objects&gt;</programlisting>
+
+      <para>In Spring.NET, the <literal>InterceptorNames</literal> property of
+      the <classname>ProxyFactoryObject</classname> can
+      <emphasis>only</emphasis> be used to specify the names of interceptors.
+      Use the <literal>TargetName</literal> property to specify the name of
+      the target object that is to be proxied.</para>
+
+      <para>The main reason for not supporting exactly the same style of
+      configuration as Spring Java is because this 'feature' is regarded as a
+      legacy holdover from Rod Johnson's initial Spring AOP implementation,
+      and is currently only kept as-is (in Spring Java) for reasons of
+      backward compatibility.</para>
+    </sect2>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/logging.xml b/doc/reference/src/logging.xml
new file mode 100644
index 00000000..8c67db25
--- /dev/null
+++ b/doc/reference/src/logging.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="logging">
+  <title>Common Logging</title>
+
+  <section id="logging-abstract">
+    <title>Introduction</title>
+
+    <para>Spring uses a simple logging abstraction in order to provide a layer
+    of indirection between logging calls made by Spring and the specific
+    logging library used in your application (log4net, EntLib logging, NLog).
+    The library is available for .NET 1.0, 1.1, and 2.0 with both debug and
+    strongly signed assemblies. Since this need is not specific to Spring, the
+    logging library was moved out of the Spring project and into a more
+    general open source project called <ulink
+    url="http://netcommon.sourceforge.net/">Common Infrastructure Libraries
+    for .NET</ulink>. The logging abstraction within the project is known as
+    Common.Logging. Note that it is not the intention of this library to be a
+    replacement for the many fine logging libraries that are out there. The
+    API is incredibly minimal and will very likely stay that way. Please note
+    that this library is intended only for use where the paramount requirement
+    is portability and you will generally be better served by using a specific
+    logging implementation so that you can leverage its advanced features and
+    extended APIs to your advantage.</para>
+
+    <para>You can find online documentation on how to configure Common.Logging
+    is available in <ulink
+    url="http://netcommon.sourceforge.net/doc-latest/reference/html/index.html">HTML</ulink>
+    , <ulink
+    url="http://netcommon.sourceforge.net/doc-latest/reference/pdf/commong-logging-reference.pdf">PDF</ulink>,
+    and <ulink
+    url="http://netcommon.sourceforge.net/doc-latest/reference/htmlhelp/htmlhelp.chm">HTML
+    Help</ulink> formats.</para>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/migration.xml b/doc/reference/src/migration.xml
new file mode 100644
index 00000000..15e714bf
--- /dev/null
+++ b/doc/reference/src/migration.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="migration">
+  <title>Migrating from 1.1 M2</title>
+
+  <sect1 id="M2RC1-introduction">
+    <title>Introduction</title>
+
+    <para>Several API changes were made after 1.1 M2 (before 1.1 RC1)due
+    primarily by the need to refactor the code base to remove circular
+    dependency cycles, which are now all removed. Class and schema name
+    changes were also made to provide a more consistent naming convention
+    across the codebase. As a result of these changes, you can not simply drop
+    in the new .dlls as you may have done in previous release. This document
+    serves as a high level guide to the most likely areas where you will need
+    to make changes to either your configuration or your code.</para>
+
+    <para>The file, BreakingChanges-1.1.txt, in the root directory of the
+    distribution contains the full listing of breaking changes made for RC1
+    and higher</para>
+  </sect1>
+
+  <sect1 id="migration-changes">
+    <title>Important Changes</title>
+
+    <para>This section covers the common areas were you will need to make
+    changes in code/configuration when migration from M2 to RC1or
+    higher.</para>
+
+    <sect2>
+      <title>Namespaces</title>
+
+      <para>Note: If you previously installed Spring .xsd files to your VS.NET
+      installation directory, remove them manually, and copy over the new
+      ones, which have the -1.1.xsd suffix.</para>
+
+      <para>The names of the section handlers to register custom schemas has
+      changed, from ConfigParsersSectionHandler to
+      <classname>NamespaceParsersSectionHandler</classname>.</para>
+
+      <para>The target namespaces have changed, the 'directory' named /schema/
+      has been removed. For example, the target schema changed from
+      http://www.springframework.net/schema/tx to
+      <classname>http://www.springframework.net/tx.</classname></para>
+
+      <para>A typical declaration to use custom schemas within your
+      configuration file looks like this</para>
+
+      <programlisting>&lt;objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database"
+         xmlns:tx="http://www.springframework.net/tx"
+         xmlns:aop="http://www.springframework.net/aop"&gt;</programlisting>
+
+      <para>The class <classname>XmlParserRegistry</classname> was renamed to
+      <classname>NamespaceParserRegistry</classname>.</para>
+
+      <para>Renamed
+      <classname>Spring.Validation.ValidationConfigParser</classname> to
+      <classname>Spring.Validation.Config.ValidationNamespaceParser</classname></para>
+
+      <para>Renamed from <classname>DatabaseConfigParser</classname> to
+      <classname>DatabaseNamespaceParser</classname></para>
+
+      <para>Renamed/Moved <classname>Remoting.RemotingConfigParser</classname>
+      to
+      <classname>Remoting.Config.RemotingNamespaceParser</classname><parameter></parameter></para>
+
+      <para>A typical registration of custom parsers within your configuration
+      file looks like this</para>
+
+      <programlisting>&lt;configuration&gt;
+
+  &lt;configSections&gt;
+    &lt;sectionGroup name="spring"&gt;
+      &lt;section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/&gt;         
+     &lt;/sectionGroup&gt;
+  &lt;/configSections&gt;
+
+  &lt;spring&gt;
+    &lt;parsers&gt; 
+      &lt;parser type="Spring.Aop.Config.AopNamespaceParser, Spring.Aop" /&gt; 
+      &lt;parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" /&gt; 
+      &lt;parser type="Spring.Transaction.Config.TxNamespaceParser, Spring.Data" /&gt; 
+    &lt;/parsers&gt; 
+  &lt;/spring&gt;</programlisting>
+
+      <para>A manual registration would look like this</para>
+
+      <programlisting>NamespaceParserRegistry.RegisterParser(typeof(AopNamespaceParser));
+NamespaceParserRegistry.RegisterParser(typeof(DatabaseNamespaceParser));
+NamespaceParserRegistry.RegisterParser(typeof(TxNamespaceParser));
+</programlisting>
+    </sect2>
+
+    <sect2>
+      <title>Core</title>
+
+      <para>Moved Spring.Util.DynamicReflection to
+      Spring.Reflection.Dynamic</para>
+
+      <para>Moved TypeRegistry and related classes from Spring.Context.Support
+      to Spring.Core.TypeResolution</para>
+
+      <para>Moved Spring.Objects.TypeConverters to
+      Spring.Core.TypeConvesion</para>
+    </sect2>
+
+    <sect2>
+      <title>Web</title>
+
+      <para>Moved Spring.Web.Validation to Spring.Web.UI.Validation</para>
+    </sect2>
+
+    <sect2>
+      <title>Data</title>
+
+      <para>Changed schema to use 'provider' instead of 'dbProvider' element,
+      usage is now &lt;db:provider ... /&gt; and not &lt;db:dbProvider
+      .../&gt;</para>
+
+      <para>Moved TransactionTemplate, TransactionDelegate and
+      ITransactionCallback from Spring.Data to Spring.Data.Support</para>
+
+      <para>Moved AdoTemplate, AdoAccessor, AdoDaoSupport,
+      RowMapperResultSetExtractor from Spring.Data to Spring.Data.Core</para>
+
+      <para>Moved AdoPlatformTransactionManager,
+      ServiceDomainPlatformTransactionManager, and TxScopeTransactionManager
+      from Spring.Data to Spring.Data.Core</para>
+    </sect2>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/misc.xml b/doc/reference/src/misc.xml
new file mode 100644
index 00000000..2dd0779a
--- /dev/null
+++ b/doc/reference/src/misc.xml
@@ -0,0 +1,186 @@
+<chapter id="misc">
+  <title>Spring.NET miscellanea</title>
+  <sect1>
+    <title>Introduction</title>
+    <para>
+    This chapter contains miscellanea information on features, goodies, caveats 
+    that does not belong to any paricular area.  
+    </para>
+  </sect1>
+  <sect1>
+	<title>PathMatcher</title>
+	<para>
+	<emphasis>Note, Spring.Util.PathMatcher is 
+  currently only available in CVS, not the RC3 release.  If you want to use these feature
+  please get the code from CVS 
+  <ulink url="http://opensource.atlassian.com/confluence/spring/display/NET/Project+Structure">(instructions)</ulink> 
+  or from the download section of the 
+  Spring.NET website that contains an .zip with the full CVS tree.
+  </emphasis>
+  </para>	
+	<para>
+	<literal>Spring.Util.PathMatcher</literal> provides <literal>Ant/NAnt</literal>-like path name matching 
+	features.
+	</para>
+	<para>To do the match, you use the method:
+	<programlisting format='linespecific' xml:space='preserve'>
+tatic bool Match(string pattern, string path)</programlisting>	
+	</para>
+	<para>If you want to decide if case is important or not use the method:
+	<programlisting format='linespecific' xml:space='preserve'>
+tatic bool Match(string pattern, string path, bool ignoreCase)</programlisting>	
+	</para>
+	<sect2>
+  <title>General rules</title>
+	<para>
+	To build your pattern, you use the <literal>*</literal>, <literal>?</literal>
+	and <literal>**</literal> building blocks:
+  <itemizedlist spacing="compact">
+  <listitem>
+	  <para><literal>*</literal>: matches any number of non slash 
+	  characters;
+	  </para>
+	</listitem>
+  <listitem>
+	  <para><literal>?</literal>: matches exactly 1 (one) non slash/dot
+	  character;
+	  </para>
+	</listitem>
+	<listitem>
+	  <para><literal>**</literal>: matches any subdirectory, without 
+	  taking care of the depth;
+	  </para>
+	</listitem>
+  </itemizedlist>
+	</para>
+	</sect2>
+	
+  <sect2>
+	<title>Matching filenames</title>
+	<para>
+  A file name can be matched using the following 
+  notation:
+	<programlisting format='linespecific' xml:space='preserve'>
+foo?bar.*</programlisting>
+	matches:
+	<programlisting format='linespecific' xml:space='preserve'>
+fooAbar.txt
+foo1bar.txt
+foo_bar.txt
+foo-bar.txt</programlisting>
+	does not match:
+	<programlisting format='linespecific' xml:space='preserve'>
+foo.bar.txt
+foo/bar.txt
+foo\bar.txt</programlisting>
+	</para>
+	<para>
+	The classical all files pattern:
+	<programlisting format='linespecific' xml:space='preserve'>
+*.*</programlisting>
+	matches:
+	<programlisting format='linespecific' xml:space='preserve'>
+foo.db
+.db
+foo
+foo.bar.db
+foo.db.db
+db.db.db</programlisting>
+	does not match:
+	<programlisting format='linespecific' xml:space='preserve'>
+c:/
+c:/foo.db
+c:/foo
+c:/.db
+c:/foo.foo.db
+//server/foo</programlisting>
+	</para>
+	</sect2>
+
+	<sect2>
+	<title>Matching subdirectories</title>
+	<para>
+  A directory name can be matched at any depth level using the following 
+  notation:
+	<programlisting format='linespecific' xml:space='preserve'>
+**/db/**</programlisting>
+	That pattern matches the following paths:
+	<programlisting format='linespecific' xml:space='preserve'>
+/db
+//server/db
+c:/db
+c:/spring/app/db/foo.db
+//Program Files/App/spaced dir/db/foo.db
+/home/spring/spaced dir/db/v1/foo.db</programlisting>
+	but does not match these:
+	<programlisting format='linespecific' xml:space='preserve'>
+c:/spring/app/db-v1/foo.db
+/home/spring/spaced dir/db-v1/foo.db</programlisting>
+	</para>
+	<para>
+	You can compose subdirectories to match like this:
+	<programlisting format='linespecific' xml:space='preserve'>
+**/bin/**/tmp/**</programlisting>
+	That pattern matches the following paths:
+	<programlisting format='linespecific' xml:space='preserve'>
+c:/spring/foo/bin/bar/tmp/a
+c:/spring/foo/bin/tmp/a/b.c</programlisting>
+	but does not match these:
+	<programlisting format='linespecific' xml:space='preserve'>
+c:/spring/foo/bin/bar/temp/a
+c:/tmp/foo/bin/bar/a/b.c</programlisting>
+	</para>
+	<para>
+	You can use more advanced patterns:
+	<programlisting format='linespecific' xml:space='preserve'>
+**/.spring-assemblies*/**</programlisting>
+	matches:
+	<programlisting format='linespecific' xml:space='preserve'>
+c:/.spring-assemblies
+c:/.spring-assembliesabcd73xs
+c:/app/.spring-assembliesabcd73xs
+c:/app/.spring-assembliesabcd73xs/foo.dll
+//server/app/.spring-assembliesabcd73xs</programlisting>
+	does not match:
+	<programlisting format='linespecific' xml:space='preserve'>
+c:/app/.spring-assemblie</programlisting>
+	</para>
+	</sect2>
+			
+	<sect2>
+	<title>Case does matter, slashes don't</title>
+	<para>
+	.NET is expected to be a cross-platform development ... platform. So,
+	<literal>PathMatcher</literal> will match taking care of the case of the pattern
+	and the case of the path. For example:
+	<programlisting format='linespecific' xml:space='preserve'>
+**/db/**/*.DB</programlisting>
+	matches:
+	<programlisting format='linespecific' xml:space='preserve'>
+c:/spring/service/deploy/app/db/foo.DB</programlisting>
+	but does not match:
+	<programlisting format='linespecific' xml:space='preserve'>
+c:/spring/service/deploy/app/DB/foo.DB
+c:spring/service/deploy/app/spaced dir/DB/foo.DB
+//server/share/service/deploy/app/DB/backup/foo.db</programlisting>
+	</para>
+	<para>If you do not matter about case, you should explicitly tell the 	
+	<literal>Pathmatcher</literal>.</para>
+	<para>
+  Back and forward slashes, in the very same cross-platform spirit, are 
+  not important:
+	<programlisting format='linespecific' xml:space='preserve'>
+spring/foo.bar</programlisting>
+	matches all the following paths:
+	<programlisting format='linespecific' xml:space='preserve'>
+c:\spring\foo.bar
+c:/spring\foo.bar
+c:/spring/foo.bar
+/spring/foo.bar
+\spring\foo.bar</programlisting>
+	</para>
+	</sect2>
+	
+  </sect1>
+
+</chapter>
diff --git a/doc/reference/src/navigation.xml b/doc/reference/src/navigation.xml
new file mode 100644
index 00000000..391d9f9c
--- /dev/null
+++ b/doc/reference/src/navigation.xml
@@ -0,0 +1,75 @@
+<chapter id="navigation">
+  <title>Object Navigation</title>
+  <sect1 id="navigation-introduction">
+    <title>Introduction</title>
+    <para><emphasis>(Available in 1.0)</emphasis></para>
+    <para>Spring provides an expression language that allows for the easy setting 
+    or getting of an object's properties and the invoking of its methods.  
+    The simple syntax of this expression language allows one to to easily express the
+    properties or methods to invoke 
+    in order to retrieve or set a value on an object.  For example to
+    get the name property of an object, the required expression to
+    evaluate this is simply "Name". The chaining of properties is also supported... 
+    for example, if a person object contains a date of birth property (DOB) 
+    that returns a <literal>DateTime</literal>, the year may be retrieved with
+    the expression "DOB.Year".  This generic reflection-like functionality 
+    has many uses but is often found as the foundation to support 
+    a data binding language between GUI elements and model 
+    objects.  As such, the data binding support for ASP.NET web pages
+    contained in the <literal>Spring.Web</literal> library uses this expression language.
+    </para>
+  </sect1>
+  <sect1 id="navigation-simpleexprssions">
+    <title>Simple Expressions</title>
+    <para>        
+    Consider the simple class shown below with the 
+    public field <literal>Name</literal><programlisting>
+public class Inventor
+{
+    public string Name;
+    private DateTime dob;
+
+    public DateTime DOB
+    {
+      get { return dob; }
+      set { dob = value; }
+    }
+}
+</programlisting>
+    which may have been instantiated in code somewhere and had its Name
+    and DOB set to particular values<programlisting>Inventor inventor = new Inventor();
+inventor.Name = "Nikola Tesla";
+inventor.DOB = new DateTime(1854, 10, 9);
+</programlisting>
+    The <classname>ObjectNavigator</classname> is the central
+    class used to set or retrieve the value of an object, and contains
+    the following static methods
+<programlisting>
+object GetValue(object root, string expression)
+object GetValue(object root, NavigationExpression expression)
+
+void SetValue(object root, string expression, object newValue)
+void SetValue(object root, NavigationExpression expression, object newValue)
+</programlisting>
+    To retrieve the name and year of birth we can use the following code<programlisting>
+string name = (string) ObjectNavigator.GetValue(inventor, "Name");    
+int year = (int) ObjectNavigator.GetValue(inventor, "DOB.Year");
+    </programlisting>
+    The string "DOB.Year" is used to create a 
+    <literal>NavigationExpression</literal> object that forms the basis 
+    for the parsing of the string.  If you need to
+    evaluate a complex expression frequently, creating a 
+    <literal>NavigationExpression</literal>
+    and reusing it will increase performance.  To set the property values of this
+    object instance to that of another famous inventor we would write<programlisting>
+ObjectNavigator.SetValue(inventor, "Name", "Michael Pupin");
+ObjectNavigator.SetValue(inventor, "DOB", new DateTime(1854, 10, 9));
+    </programlisting>
+    </para>
+  </sect1>
+  <sect1 id="navigation-collections">
+    <title>Navigating Collections</title>
+    <para>TODO.  TestCase shows some example usage.  Please check the Spring.NET <ulink url="http://www.springframework.net/doc/reference/navigation.html">website</ulink> for the latest updates to this document.
+    </para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/objects-misc.xml b/doc/reference/src/objects-misc.xml
new file mode 100644
index 00000000..00a357ee
--- /dev/null
+++ b/doc/reference/src/objects-misc.xml
@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="objects-misc">
+  <title>The IObjectWrapper and Type conversion</title>
+
+  <sect1 id="objects-misc-introduction">
+    <title>Introduction</title>
+    <para>The concepts encapsulated by the
+    <classname>IObjectWrapper</classname> interface are fundamental to the
+    workings of the core Spring.NET libraries The typical application
+    developer most probably will not ever have the need to use the
+    <classname>IObjectWrapper</classname> directly... because this is
+    reference documentation however, we felt that some explanation of this
+    core interface might be right. The <classname>IObjectWrapper</classname>
+    is explained in this chapter since if you were going to use it at all, you
+    would probably do that when trying to bind data to objects, which, nicely
+    enough, is precisely the area that the
+    <classname>IObjectWrapper</classname> addresses.</para>
+  </sect1>
+
+  <sect1 id="objects-objects">
+    <title>Manipulating objects using the IObjectWrapper</title>
+
+    <para>One quite important concept of the <literal>Spring.Objects</literal>
+    namespace is encapsulated in the definition
+    <classname>IObjectWrapper</classname> interface and its corresponding
+    implementation, the <classname>ObjectWrapper</classname> class. The
+    functionality offered by the <classname>IObjectWrapper</classname>
+    includes methods to set and get property values (either individually or in
+    bulk), get property descriptors (instances of the
+    <classname>System.Reflection.PropertyInfo</classname> class), and to query
+    the readability and writability of properties. The
+    <classname>IObjectWrapper</classname> also offers support for nested
+    properties, enabling the setting of properties on subproperties to an
+    unlimited depth. The <classname>IObjectWrapper</classname> usually isn't
+    used by application code directly, but by framework classes such as the
+    various <classname>IObjectFactory</classname> implementations.</para>
+
+    <para>The way the <classname>IObjectWrapper</classname> works is partly
+    indicated by its name: <emphasis>it wraps an object</emphasis> to perform
+    actions on a wrapped object instance... such actions would include the
+    setting and getting of properties exposed on the wrapped object.</para>
+
+    <para><emphasis>Note: the concepts explained in this section are not
+    important to you if you're not planning to work with the
+    <classname>IObjectWrapper</classname> directly.</emphasis></para>
+
+    <sect2 id="objects-objects-conventions">
+      <title>Setting and getting basic and nested properties</title>
+
+      <para>Setting and getting properties is done using the
+      <methodname>SetPropertyValue()</methodname> and
+      <methodname>GetPropertyValue()</methodname> methods, for which there are
+      a couple of overloaded variants. The details of the various overloads
+      (including return values and method parameters) are all described in the
+      extensive API documentation supplied as a part of the Spring.NET
+      distribution.</para>
+
+      <para>The aforementioned <methodname>SetPropertyValue()</methodname> and
+      <methodname>GetPropertyValue()</methodname> methods have a number of
+      conventions for indicating the path of a property. A property path is an
+      expression that implementations of the
+      <classname>IObjectWrapper</classname> interface can use to look up the
+      properties of the wrapped object; some examples of property paths
+      include...</para>
+
+      <para><table frame="all">
+          <title>Examples of property paths</title>
+
+          <tgroup cols="2">
+            <colspec colname="c1" colwidth="2*" />
+
+            <colspec colname="c2" colwidth="4*" />
+
+            <thead>
+              <row>
+                <entry>Path</entry>
+
+                <entry>Explanation</entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>name</entry>
+
+                <entry>Indicates the <literal>name</literal> property of the
+                wrapped object.</entry>
+              </row>
+
+              <row>
+                <entry>account.name</entry>
+
+                <entry>Indicates the nested property <literal>name</literal>
+                of the <literal>account</literal> property of the wrapped
+                object.</entry>
+              </row>
+
+              <row>
+                <entry>account[2]</entry>
+
+                <entry>Indicates the <emphasis>third</emphasis> element of the
+                <literal>account</literal> property of the wrapped object.
+                Indexed properties are typically collections such as
+                <literal>lists</literal> and <literal>dictionaries</literal>,
+                but can be any class that exposes an indexer.</entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table></para>
+
+      <para>Below you'll find some examples of working with the
+      <classname>IObjectWrapper</classname> to get and set properties.
+      Consider the following two classes: <programlisting>[C#]
+public class Company
+  {
+    private string name;
+    private Employee managingDirector;
+
+    public string Name
+    {
+      get { return this.name; }
+      set { this.name = value; }
+    }
+    
+    public Employee ManagingDirector
+    {
+      get { return this.managingDirector; }
+      set { this.managingDirector = value; }
+    }
+}</programlisting> <programlisting>[C#]
+public class Employee
+{
+    private string name;
+    private float salary;
+    
+    public string Name
+    {
+      get { return this.name; }
+      set { this.name = value; }
+    }
+
+    public float Salary
+    {
+      get { return salary; }
+      set { this.salary = value; }
+    }
+}</programlisting></para>
+
+      <para>The following code snippets show some examples of how to retrieve
+      and manipulate some of the properties of
+      <classname>IObjectWrapper</classname>-wrapped <literal>Company</literal>
+      and <literal>Employee</literal> instances. <programlisting>[C#]
+Company c = new Company();
+IObjectWrapper owComp = new ObjectWrapper(c);
+// setting the company name...
+owComp.SetPropertyValue("name", "Salina Inc.");
+// can also be done like this...
+PropertyValue v = new PropertyValue("name", "Salina Inc.");
+owComp.SetPropertyValue(v);
+
+// ok, let's create the director and bind it to the company...
+Employee don = new Employee();
+IObjectWrapper owDon = new ObjectWrapper(don);
+owDon.SetPropertyValue("name", "Don Fabrizio");
+owComp.SetPropertyValue("managingDirector", don);
+
+// retrieving the salary of the ManagingDirector through the company
+float salary = (float)owComp.GetPropertyValue("managingDirector.salary");</programlisting></para>
+
+      <para>Note that since the various Spring.NET libraries are compliant
+      with the Common Language Specification (CLS), the resolution of
+      arbitrary strings to properties, events, classes and such is performed
+      in a case-insensitive fashion. The previous examples were all written in
+      the C# language, which is a case-sensitive language, and yet the
+      <literal>Name</literal> property of the <literal>Employee</literal>
+      class was set using the all-lowercase <literal>'name'</literal> string
+      identifier. The following example (using the classes defined previously)
+      should serve to illustrate this...</para>
+
+      <programlisting>[C#]
+// ok, let's create the director and bind it to the company...
+Employee don = new Employee();
+IObjectWrapper owDon = new ObjectWrapper(don);
+owDon.SetPropertyValue("naMe", "Don Fabrizio");
+owDon.GetPropertyValue("nAmE"); // gets "Don Fabrizio"
+
+IObjectWrapper owComp = new ObjectWrapper(new Company());
+owComp.SetPropertyValue("ManaGINGdirecToR", don);
+owComp.SetPropertyValue("mANaGiNgdirector.salARY", 80000);
+Console.WriteLine(don.Salary); // puts 80000</programlisting>
+
+      <para>The case-insensitivity of the various Spring.NET libraries
+      (dictated by the CLS) is not usually an issue... if you happen to have a
+      class that has a number of properties, events, or methods that differ
+      only by their case, then you might want to consider refactoring your
+      code, since this is generally regarded as poor programming
+      practice.</para>
+    </sect2>
+
+    <sect2 id="objects-objects-other">
+      <title>Other features worth mentioning</title>
+
+      <para>In addition to the features described in the preceding sections
+      there a number of features that might be interesting to you, though not
+      worth an entire section. <itemizedlist spacing="compact">
+          <listitem>
+            <para><emphasis>determining readability and
+            writability</emphasis>: using the <literal>IsReadable()</literal>
+            and <literal>IsWritable()</literal> methods, you can determine
+            whether or not a property is readable or writable.</para>
+          </listitem>
+
+          <listitem>
+            <para><emphasis>retrieving PropertyInfo instances</emphasis>:
+            using <literal>GetPropertyInfo(string)</literal> and
+            <literal>GetPropertyInfos()</literal> you can retrieve instances
+            of the <classname>System.Reflection.PropertyInfo</classname>
+            class, that might come in handy sometimes when you need access to
+            the property metadata specific to the object being wrapped.</para>
+          </listitem>
+        </itemizedlist></para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="objects-objects-conversion">
+    <title>Type conversion</title>
+
+    <para>If you associate a <classname>TypeConverter</classname> with the
+    definition of a custom <classname>Type</classname> using the standard .NET
+    mechanism (see the example code below), Spring.NET will use the associated
+    <classname>TypeConverter</classname> to do the conversion.<programlisting>[C#]
+[TypeConverter (typeof (FooTypeConverter))]
+public class Foo
+{
+}</programlisting></para>
+
+    <para>The <classname>TypeConverter</classname> class from the
+    <literal>System.ComponentModel</literal> namespace of the .NET BCL is used
+    extensively by the various classes in the <literal>Spring.Core</literal>
+    library, as said class <quote>... provides a unified way of converting
+    types of values to other types, as well as for accessing standard values
+    and subproperties.</quote> <footnote>
+        <para>More information about creating custom
+        <literal>TypeConverter</literal> implementations can be found online
+        at Microsoft's MSDN website, by searching for <emphasis>Implementing a
+        Type Converter</emphasis>.</para>
+      </footnote></para>
+
+    <para>For example, a date can be represented in a human readable format
+    (such as <literal>30th August 1984</literal>), while we're still able to
+    convert the human readable form to the original date format or (even
+    better) to an instance of the <classname>System.DateTime</classname>
+    class. This behavior can be achieved by using the standard .NET idiom of
+    decorating a class with the <classname>TypeConverterAttribute</classname>.
+    Spring.NET also offers another means of associating a
+    <classname>TypeConverters</classname> with a class. You might want to do
+    this to achieve a conversion that is not possible using standard idiom...
+    for example, the <literal>Spring.Core</literal> library contains a custom
+    <classname>TypeConverter</classname> that converts comma-delimited strings
+    to String array instances. Registering custom converters on an
+    <classname>IObjectWrapper</classname> instance gives the wrapper the
+    knowledge of how to convert properties to the desired
+    <classname>Type</classname>.</para>
+
+    <para>An example of where property conversion is used in Spring.NET is the
+    setting of properties on objects, accomplished using the aforementioned
+    <literal>TypeConverters</literal>. When mentioning
+    <classname>System.String</classname> as the value of a property of some
+    object (declared in an XML file for instance), Spring.NET will (if the
+    type of the associated property is <classname>System.Type</classname>) use
+    the <classname>RuntimeTypeConverter</classname> class to try to resolve
+    the property value to a <classname>Type</classname> object. The example
+    below demonstrates this automatic conversion of the
+    <literal>Example.Xml.SAXParser</literal> (a string) into the corresponding
+    <classname>Type</classname> instance for use in this factory-style class.
+    <programlisting>&lt;objects xmlns="http://www.springframework.net"&gt;
+&lt;object id="parserFactory" type="Example.XmlParserFactory, ExamplesLibrary"
+destroy-method="Close"&gt;
+  &lt;property name="ParserClass" value="Example.Xml.SAXParser, ExamplesLibrary"/&gt;
+&lt;/object&gt;
+&lt;/objects&gt;</programlisting> <programlisting>[C#]
+public class XmlParserFactory
+{
+	private Type parserClass;
+	
+	public Type ParserClass
+	{
+	  get { return this.parserClass; }
+	  set { this.parserClass = value; }
+	}
+	
+	public XmlParser GetParser ()
+	{
+	  return Activator.CreateInstance (ParserClass);
+	}
+}</programlisting></para>
+
+    <sect2 id="objects-misc-enums">
+      <title>Type Conversion for Enumerations</title>
+
+      <para>The default type converter for enumerations is the
+      <classname>System.ComponentModel.EnumConverter</classname> class. To
+      specify the value for an enumerated property, simply use the name of the
+      property. For example the <classname>TestObject</classname> class has a
+      property of the enumerated type <classname>FileMode</classname>. One of
+      the values for this enumeration is named <literal>Create</literal>. The
+      following XML fragment shows how to configure this property</para>
+
+      <programlisting>&lt;object id="rod" type="Spring.Objects.TestObject, Spring.Core.Tests"&gt;
+  &lt;property name="name" value="Rod"/&gt;
+  &lt;property name="FileMode" value="Create"/&gt;
+&lt;/object&gt;</programlisting>
+    </sect2>
+  </sect1>
+
+  <sect1 id="object-objects-builtin-converters">
+    <title>Built-in TypeConverters</title>
+
+    <para>Spring.NET has a number of built-in
+    <classname>TypeConverters</classname> to make life easy. Each of those is
+    listed below and they are all located in the
+    <literal>Spring.Objects.TypeConverters</literal> namespace of the
+    <literal>Spring.Core</literal> library.</para>
+
+    <para><table frame="all">
+        <title>Built-in <classname>TypeConverters</classname></title>
+
+        <tgroup cols="2">
+          <colspec colname="c1" colwidth="3*" />
+
+          <colspec colname="c2" colwidth="5*" />
+
+          <thead>
+            <row>
+              <entry>Type</entry>
+
+              <entry>Explanation</entry>
+            </row>
+          </thead>
+
+          <tbody>
+            <row>
+              <entry><literal>RuntimeTypeConverter</literal></entry>
+
+              <entry>Parses strings representing
+              <classname>System.Types</classname> to actual
+              <classname>System.Types</classname> and the other way
+              around.</entry>
+            </row>
+
+            <row>
+              <entry><literal>FileInfoConverter</literal></entry>
+
+              <entry>Capable of resolving strings to a
+              <classname>System.IO.FileInfo</classname> object.</entry>
+            </row>
+
+            <row>
+              <entry><literal>StringArrayConverter</literal></entry>
+
+              <entry>Capable of resolving a comma-delimited list of strings to
+              a string-array and vice versa.</entry>
+            </row>
+
+            <row>
+              <entry><literal>UriConverter</literal></entry>
+
+              <entry>Capable of resolving a string representation of a URI to
+              an actual <literal>Uri</literal>-object.</entry>
+            </row>
+
+            <row>
+              <entry><literal>FileInfoConverter</literal></entry>
+
+              <entry>Capable of resolving a string representation of a
+              FileInfo to an actual
+              <literal>FileInfo</literal>-object.</entry>
+            </row>
+
+            <row>
+              <entry><literal>StreamConverter</literal></entry>
+
+              <entry>Capable of resolving Spring IResource URI (string) to its
+              corresponding <literal>InputStream</literal>-object.</entry>
+            </row>
+
+            <row>
+              <entry><literal>ResourceConverter</literal></entry>
+
+              <entry>Capable of resolving Spring IResource URI (string) to an
+              <literal>IResource</literal> object.</entry>
+            </row>
+
+            <row>
+              <entry><literal>ResourceManagerConverter</literal></entry>
+
+              <entry>Capable of resolving a two part string (resource name,
+              assembly name) to a
+              <classname>System.Resources.ResourceManager</classname>
+              object.</entry>
+            </row>
+
+            <row>
+              <entry><literal>RgbColorConverter</literal></entry>
+
+              <entry>Capable of resolving a comma separated list of Red,
+              Green, Blue integer values to a
+              <classname>System.Drawing.Color</classname> structure.</entry>
+            </row>
+
+            <row>
+              <entry>RegexConverter</entry>
+
+              <entry>Converts string representation of regular expression into
+              an instance of System.Text.RegularExpressions.Regex</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table></para>
+
+    <para>Spring.NET uses the standard .NET mechanisms for the resolution of
+    <classname>System.Types</classname>, including, but not limited to
+    checking any configuration files associated with your application,
+    checking the Global Assembly Cache (GAC), and assembly probing.</para>
+
+    <sect2>
+      <title>Custom type converters</title>
+
+      <para>You can register a custom type converter either Programatically
+      using the class TypeConverterRegistry or through configuration of
+      Spring's container and described in the section <link
+      linkend="context-type-converters">Registering Type
+      Converters</link>.</para>
+
+      <para></para>
+    </sect2>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/objects.xml b/doc/reference/src/objects.xml
new file mode 100644
index 00000000..9bc277a7
--- /dev/null
+++ b/doc/reference/src/objects.xml
@@ -0,0 +1,5786 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="objects">
+  <title>The IoC container</title>
+
+  <sect1 id="objects-introduction">
+    <title>Introduction</title>
+
+    <para>This chapter covers the Spring Framework's implementation of the
+    Inversion of Control (IoC) <footnote>
+        <para>See the section entitled <xref
+        linkend="background-ioc" /></para>
+      </footnote> principle</para>
+
+    <para>The <literal>Spring.Core</literal> assembly provides the basis for
+    the Spring.NET Inversion of Control container. The <classname><ulink
+    url="http://www.springframework.net/doc/api/html/Spring.Objects.Factory.IObjectFactory.html">IObjectFactory</ulink></classname>
+    interface provides an advanced configuration mechanism capable of managing
+    objects of any nature. The <classname><ulink
+    url="http://www.springframework.net/doc/api/html/Spring.Context.IApplicationContext.html">IApplicationContext</ulink></classname>
+    interface builds on top of the <classname>IObjectFactory</classname> (it
+    is a sub-interface) and adds other functionality such as easier
+    integration with Spring.NET's Aspect Oriented Programming (AOP) features,
+    message resource handling (for use in internationalization), event
+    propagation and application layer-specific context such as
+    <classname>WebApplicationContext</classname> for use in web
+    applications.</para>
+
+    <para>In short, the <classname>IObjectFactory</classname> provides the
+    configuration framework and basic functionality, while the
+    <classname>IApplicationContext</classname> adds more enterprise-centric
+    functionality to it. The <classname>IApplicationContext</classname> is a
+    complete superset of the <classname>IObjectFactory</classname>, and any
+    description of <classname>IObjectFactory</classname> capabilities and
+    behavior should be considered to apply to
+    <literal>IApplicationContext</literal>s as well.</para>
+
+    <para>This chapter is divided into two parts, with the <link
+    linkend="objects-basics">first part</link> covering the basic principles
+    that apply to both the <classname>IObjectFactory</classname> and
+    <classname>IApplicationContext</classname>, with the <link
+    linkend="context-introduction">second part</link> covering those features
+    that apply only to the <classname>IApplicationContext</classname>
+    interface.</para>
+
+    <para>If you are new to Spring.NET or IoC containers in general, you may
+    want to consider starting with <xref linkend="quickstarts" />, which
+    contains a number of introductory level examples that actually demonstrate
+    a lot of what is described in detail below. Don't worry if you don't
+    absorb everything at once... those examples serve only to paint a picture
+    of how Spring.NET hangs together in really broad brushstrokes. Once you
+    have finished with those examples, you can come back to this section which
+    will fill in all the fine detail.</para>
+  </sect1>
+
+  <sect1 id="objects-basics">
+    <title>Basics - containers and objects</title>
+
+    <sect2 id="objects-factory">
+      <title>The container</title>
+
+      <para>The <classname>IObjectFactory</classname> is the actual
+      representation of the Spring IoC container that is responsible for
+      instantiating, configuring, and managing a number of objects.</para>
+
+      <para>The <literal>IObjectFactory</literal> interface is the central IoC
+      container interface in Spring. Its responsibilities include
+      instantiating or sourcing application objects, configuring such objects,
+      and assembling the dependencies between these objects.</para>
+
+      <para>There are a number of implementations of the
+      <classname>IObjectFactory</classname> interface that come supplied
+      straight out-of-the-box with Spring. The most commonly used
+      <classname>IObjectFactory</classname> implementation is the
+      <classname>XmlObjectFactory</classname> class. This implementation
+      allows you to express the objects that compose your application, and the
+      doubtless rich interdependencies between such objects, in terms of XML.
+      The <classname>XmlObjectFactory</classname> takes this XML configuration
+      metadata and uses it to create a fully configured system or application.
+      Interaction with the <classname>IObjectFactory</classname> interface is
+      discussed in <xref linkend="objects-factory-client" />. Additional
+      features offered by another implementation of
+      <classname>IObjectFactory</classname>, the
+      <classname>IApplicationContext</classname>, are discussed in section
+      <xref linkend="context-introduction" />.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/container-in-action.gif" format="GIF" />
+        </imageobject>
+      </mediaobject>
+
+      <sect3 id="objects-configuration-metadata">
+        <title>Configuration metadata</title>
+
+        <para>As can be seen in the above image, the Spring IoC container
+        consumes some form of configuration metadata; this configuration
+        metadata is nothing more than how you (as an application developer)
+        inform the Spring container as to how to “instantiate, configure, and
+        assemble [the objects in your application]�. This configuration
+        metadata is typically supplied in a simple and intuitive XML format.
+        When using XML-based configuration metadata, you write object
+        definitions for those object that you want the Spring IoC container to
+        manage, and then let the container do it's stuff.</para>
+
+        <note>
+          <para>XML-based metadata is by far the most commonly used form of
+          configuration metadata. It is not however the only form of
+          configuration metadata that is allowed. The Spring IoC container
+          itself is totally decoupled from the format in which this
+          configuration metadata is actually written. Attribute based metadata
+          will be part of an upcoming release and it is already part of the
+          Spring Java framework.</para>
+        </note>
+
+        <para>Spring configuration consists of at least one object definition
+        that the container must manage, but typically there will be more than
+        one object definition. When using XML-based configuration metadata,
+        these object are configured as &lt;object/&gt; elements inside a
+        top-level &lt;objects/&gt; element.</para>
+
+        <para>These object definitions correspond to the actual objects that
+        make up your application. Typically you will have object definitions
+        for your service layer objects, your data access objects (DAOs),
+        presentation objects such as ASP.NET page instances, infrastructure
+        objects such as NHibernate SessionFactories, and so forth. Typically
+        one does not configure fine-grained domain objects in the container,
+        because it is usually the responsibility of DAOs and business logic to
+        create/load domain objects.</para>
+
+        <para>Find below an example of the basic structure of XML-based
+        configuration metadata.</para>
+
+        <programlisting>&lt;objects xmlns="http://www.springframework.net"&gt;
+
+  &lt;object id="..." type="..."&gt;
+    &lt;!-- collaborators and configuration for this object go here --&gt;
+  &lt;/object&gt;
+
+  &lt;object id="...." type="..."&gt;
+    &lt;!-- collaborators and configuration for this object go here --&gt;
+  &lt;/object&gt;
+ 
+  &lt;!-- more object definitions go here --&gt;
+
+&lt;/objects&gt;</programlisting>
+      </sect3>
+    </sect2>
+
+    <sect2 id="objects-factory-instantiation">
+      <title>Instantiating a container</title>
+
+      <para>Instantiating a Spring IoC container is straightforward.</para>
+
+      <programlisting>IApplicationContext context = new XmlApplicationContext(
+                 "file://services.xml",
+                 "assembly://MyAssembly/MyDataAccess/data-access.xml");
+
+// an IApplicationContext is also an IObjectFactory (via inheritance)
+IObjectFactory factory = context;</programlisting>
+
+      <para>You can also create an container by using a custom configuration
+      section in the standard .NET application (or web) configuration file.
+      Once the container has been created you may never need to explicitly
+      interact with it again in your code, for example when configuring
+      ASP.NET pages.</para>
+
+      <para>You may be wondering what the assembly URL is all about. The above
+      example uses Spring.NET's <classname> <ulink
+      url="http://www.springframework.net/doc/api/html/Spring.Core.IO.IResource.html">IResource</ulink>
+      </classname> abstraction. The <classname>IResource</classname> interface
+      provides a simple and uniform interface to a wide array of IO resources
+      that can represent themselves as
+      <classname>System.IO.Stream</classname>. An example for a file based
+      resource, not using the URL syntax but an implementation of the
+      IResource interface for file is shown below.<programlisting>[C#]
+IResource input = new FileSystemResource ("objects.xml");
+IObjectFactory factory = new XmlObjectFactory(input);</programlisting></para>
+
+      <para>These resources are most frequently files or URLs but can also be
+      resources that have been embedded inside a .NET assembly. A simple URI
+      syntax is used to describe the location of the resource, which follows
+      the standard conventions for files, i.e.
+      <literal>file://object.xml</literal> and other well known protocols such
+      as http.</para>
+
+      <para>The following snippet shows the use of the URI syntax for
+      referring to a resource that has been embedded inside a .NET assembly,
+      <literal>assembly://&lt;AssemblyName&gt;/&lt;NameSpace&gt;/&lt;ResourceName&gt;
+      </literal> <note>
+           To create an embedded resource using Visual Studio you must set the Build Action of the .xml configuration file to Embedded Resource in the file property editor. Also, you will need to explicitly rebuild the project containing the configuration file if it is the only change you make between successive builds. If using NAnt to build, add a &lt;resources&gt; section to the csc task. For example usage, look at the Spring.Core.Tests.build file included the distribution. 
+        </note> The <classname>IResource</classname> abstraction is explained
+      further in <xref linkend="objects-iresource" />.</para>
+
+      <para>The preferred way to create an
+      <classname>IApplicationContext</classname> or
+      <classname>IObjectFactory</classname> is to use a custom configuration
+      section in the standard .NET application configuration file (one of
+      <literal>App.config</literal> or <literal>Web.config</literal>). A
+      custom configuration section that creates the same
+      <classname>IApplicationContext</classname> as the previous example is
+      <programlisting>&lt;spring&gt;
+  &lt;context type="Spring.Context.Support.XmlApplicationContext, Spring.Core"&gt;
+    &lt;resource uri="file://services.xml"/&gt;
+    &lt;resource uri="assembly://MyAssembly/MyDataAccess/data-access.xml"/&gt;
+  &lt;/context&gt;
+&lt;/spring&gt;</programlisting> The context type (specified as the value of
+      the <literal>type</literal> attribute of the <literal>context</literal>
+      element) is wholly optional, and defaults to the
+      <classname>Spring.Context.Support.XmlApplicationContext</classname>
+      class, so the following XML snippet is functionally equivalent to the
+      first. <programlisting>&lt;spring&gt;
+  &lt;context&gt;
+    &lt;resource uri="file://services.xml"/&gt;
+    &lt;resource uri="assembly://MyAssembly/MyDataAccess/data-access.xml"/&gt;
+  &lt;/context&gt;
+&lt;/spring&gt; </programlisting></para>
+
+      <para>To acquire a reference to an
+      <classname>IApplicationContext</classname> using a custom configuration
+      section, one simply uses the following code; <programlisting>IApplicationContext ctx = ContextRegistry.GetContext();</programlisting>
+      The <classname>ContextRegistry</classname> is used to both instantiate
+      the application context and to perform service locator style access to
+      other objects. (See <xref linkend="objects-servicelocator" /> for more
+      information). The glue that makes this possible is an implementation of
+      the Base Class Library (BCL) provided
+      <classname>IConfigurationSectionHandler</classname> interface, namely
+      the <classname>Spring.Context.Support.ContextHandler</classname> class.
+      The handler class needs to be registered in the
+      <literal>configSections</literal> section of the .NET configuration file
+      as shown below. <programlisting>&lt;configSections&gt;
+  &lt;sectionGroup name="spring"&gt;
+    &lt;section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/&gt;
+  &lt;/sectionGroup&gt;
+&lt;/configSections&gt; </programlisting> This declaration now enables the use
+      of a custom context section starting at the <literal>spring</literal>
+      root element.</para>
+
+      <para>In some usage scenarios, user code will not have to explicitly
+      instantiate an appropriate implementation of the
+      <classname>IObjectFactory</classname> interface, since Spring.NET code
+      will do it. For example, the ASP.NET web layer provides support code to
+      load a Spring.NET <classname>IApplicationContext</classname>
+      automatically as part of the normal startup process of an ASP.NET web
+      application. Similar support for WinForms applications is being
+      investigated.</para>
+
+      <para>While programmatic manipulation of
+      <literal>IObjectFactory</literal> instances will be described later, the
+      following sections will concentrate on describing the configuration of
+      objects managed by <literal>IObjectFactory</literal> instances.</para>
+
+      <para>Spring.NET comes with an XSD schema to make the validation of the
+      XML object definitions a whole lot easier. The XSD document is
+      thoroughly documented so feel free to take a peek inside (see <xref
+      linkend="springobjectsxsd" />). The XSD is currently used in the
+      implementation code to validate the XML document. The XSD schema serves
+      a dual purpose in that it also facilitates the editing of XML object
+      definitions inside an XSD aware editor (typically Visual Studio) by
+      providing validation (and Intellisense support in the case of Visual
+      Studio). You may wish to refer to <xref linkend="vsnet" /> for more
+      information regarding such integration.</para>
+
+      <para>Your XML object definitions can also be defined within the
+      standard .NET application configuration file by registering the
+      <classname>Spring.Context.Support.DefaultSectionHandler</classname>
+      class as the configuration section handler for inline object
+      definitions. This allows you to completely configure one or more
+      <classname>IApplicationContext</classname> instances within a single
+      standard .NET application configuration file as shown in the following
+      example. <programlisting>&lt;configuration&gt;
+
+  &lt;configSections&gt;
+    &lt;sectionGroup name="spring"&gt;
+      &lt;section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/&gt;
+      &lt;section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" /&gt;
+    &lt;/sectionGroup&gt;
+  &lt;/configSections&gt;
+
+  &lt;spring&gt;
+
+    &lt;context&gt;
+      &lt;resource uri="config://spring/objects"/&gt;
+    &lt;/context&gt;
+       
+    &lt;objects xmlns="http://www.springframework.net"&gt;
+        ...
+    &lt;/objects&gt;
+
+  &lt;/spring&gt;
+
+&lt;/configuration&gt;</programlisting></para>
+
+      <para>Other options available to structure the configuration files are
+      described in <xref linkend="context-functionality-hierarchy" /> and
+      <xref linkend="context-import" />.</para>
+
+      <para>The <classname>IApplicationContext</classname> can be configured
+      to register other resource handlers, custom parsers to integrate
+      user-contributed XML schema into the object definitions section, type
+      converters, and define type aliases. These features are discussed in
+      section <xref linkend="context-configuration" /></para>
+
+      <sect3 id="objects-factoyr-xml-import">
+        <title>Composing XML-based configuration metadata</title>
+
+        <para>It is often useful to split up container definitions into
+        multiple XML files. One way to then load an application context which
+        is configured from all these XML fragments is to use the application
+        context constructor which takes multiple resource locations. With an
+        object factory, an object definition reader can be used multiple times
+        to read definitions from each file in turn.</para>
+
+        <para>Generally, the Spring.NET team prefers the above approach,
+        assembling individual files because it keeps container configuration
+        files unaware of the fact that they are being combined with others.
+        However, an alternate approach is to compose one XML object definition
+        file using one or more occurrences of the <literal>import</literal>
+        element to load definitions from other files. Any
+        <literal>import</literal> elements must be placed before
+        <literal>object</literal> elements in the file doing the importing.
+        Let's look at a sample:</para>
+
+        <para><programlisting>&lt;objects xmlns="http://www.springframework.net"&gt;
+
+  &lt;import resource="services.xml"/&gt;
+  &lt;import resource="resources/messageSource.xml"/&gt;
+  &lt;import resource="/resources/themeSource.xml"/&gt;
+
+  &lt;object id="object1" type="..."/&gt;
+  &lt;object id="object2" type="..."/&gt;
+
+&lt;/objects&gt;</programlisting></para>
+
+        <para>In this example, external object definitions are being loaded
+        from 3 files, <literal>services.xml</literal>,
+        <literal>messageSource.xml</literal>, and
+        <literal>themeSource.xml</literal>. All location paths are considered
+        relative to the definition file doing the importing, so
+        <literal>services.xml</literal> in this case must be in the same
+        directory as the file doing the importing, while
+        <literal>messageSource.xml</literal> and
+        <literal>themeSource.xml</literal> must be in a
+        <literal>resources</literal> location below the location of the
+        importing file. As you can see, a leading slash is actually ignored,
+        but given that these are considered relative paths, it is probably
+        better form not to use the slash at all. The contents of the files
+        being imported must be fully valid XML object definition files
+        according to the XSD, including the top level
+        <literal>objects</literal> element.</para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="objects-definition">
+      <title>The Objects</title>
+
+      <para>A Spring IoC container manages one or more objects. these objects
+      are created using the configuration metadata that has been supplied to
+      the container (typically in the form of XML &lt;object/&gt;
+      definitions).</para>
+
+      <para>Within the container itself, these object definitions are
+      represented as IObjectDefinition objects, which contain (among other
+      information) the following metadata: <itemizedlist spacing="compact">
+          <listitem>
+            <para><emphasis>A type name</emphasis>: typically this is the
+            actual implementation class of the object being defined..</para>
+          </listitem>
+
+          <listitem>
+            <para>Object behavioral configuration elements, which state how
+            the object should behave in the Spring.NET IoC container (i.e.
+            prototype or singleton, lifecycle callbacks, and so forth)</para>
+          </listitem>
+
+          <listitem>
+            <para>references to other objects which are needed for the object
+            to do its work: these references are also called
+            <emphasis>collaborators</emphasis> or
+            <emphasis>dependencies</emphasis>.</para>
+          </listitem>
+
+          <listitem>
+            <para>other configuration settings to set in the newly created
+            object. An example would be the number of threads to use in an
+            object that manages a worker thread pool, or the size limit of the
+            pool.</para>
+          </listitem>
+        </itemizedlist></para>
+
+      <para>The concepts listed above directly translate to a set of elements
+      the object definition consists of. These elements are listed below,
+      along with a link to further documentation about each of them. <table
+          frame="all">
+          <title>Object definition explanation</title>
+
+          <tgroup cols="2">
+            <colspec colname="c1" colwidth="2*" />
+
+            <colspec colname="c2" colwidth="4*" />
+
+            <thead>
+              <row>
+                <entry>Feature</entry>
+
+                <entry>More info</entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>type</entry>
+
+                <entry><xref linkend="objects-factory-class" /></entry>
+              </row>
+
+              <row>
+                <entry>id and name</entry>
+
+                <entry><xref linkend="objects-objectname" /></entry>
+              </row>
+
+              <row>
+                <entry>singleton or prototype</entry>
+
+                <entry><xref linkend="objects-factory-modes" /></entry>
+              </row>
+
+              <row>
+                <entry>object properties</entry>
+
+                <entry><xref
+                linkend="objects-factory-collaborators" /></entry>
+              </row>
+
+              <row>
+                <entry>constructor arguments</entry>
+
+                <entry><xref
+                linkend="objects-factory-collaborators" /></entry>
+              </row>
+
+              <row>
+                <entry>autowiring mode</entry>
+
+                <entry><xref linkend="objects-factory-autowire" /></entry>
+              </row>
+
+              <row>
+                <entry>dependency checking mode</entry>
+
+                <entry><xref linkend="objects-factory-dependencies" /></entry>
+              </row>
+
+              <row>
+                <entry>initialization method</entry>
+
+                <entry><xref linkend="objects-factory-lifecycle" /></entry>
+              </row>
+
+              <row>
+                <entry>destruction method</entry>
+
+                <entry><xref linkend="objects-factory-lifecycle" /></entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table></para>
+
+      <para>Besides object definitions which contain information on how to
+      create a specific object, certain <classname>IObjectFactory</classname>
+      implementations also permit the registration of existing objects that
+      have been created outside the factory (by user code). The
+      <classname>DefaultListableObjectFactory</classname> class supports this
+      through the <literal>RegisterSingleton(..)</literal> method. (Typical
+      applications solely work with objects defined through metadata object
+      definitions though.)</para>
+
+      <sect3>
+        <title>Naming objects</title>
+
+        <para>Every object has one or more <literal>id</literal>s (also called
+        identifiers, or names; these terms refer to the same thing). These
+        <literal>id</literal>s must be unique within the container the object
+        is hosted in. An object will almost always have only one id, but if an
+        object has more than one id, the extra ones can essentially be
+        considered aliases.</para>
+
+        <para>When using XML-based configuration metadata, you use the
+        <literal>'id'</literal> or <literal>'name'</literal>attributes to
+        specify the object identifier(s). The <literal>'id'</literal>
+        attribute allows you to specify exactly one id, and as it is a real
+        XML element ID attribute, the XML parser is able to do some extra
+        validation when other elements reference the id; as such, it is the
+        preferred way to specify an object id. However, the XML specification
+        does limit the characters which are legal in XML IDs. This is usually
+        not a constraint, but if you have a need to use one of these special
+        XML characters, or want to introduce other aliases to the object, you
+        may also or instead specify one or more object <literal>id</literal>s,
+        separated by a comma (<literal>,</literal>), semicolon
+        (<literal>;</literal>), or whitespace in the <literal>'name'</literal>
+        attribute.</para>
+
+        <para>Please note that you are not required to supply a name for a
+        object. If no name is supplied explicitly, the container will generate
+        a unique name for that object. The motivations for not supplying a
+        name for a object will be discussed later (one use case is inner
+        objects).</para>
+
+        <sect4>
+          <title>Aliasing objects</title>
+
+          <para>In an object definition itself, you may supply more than one
+          name for the object, by using a combination of the id and name
+          attributes as discussed in <xref linkend="objects-objectname" />.
+          This approach to aliasing objects has some limitations when you
+          would like to assemble the main application configuration file from
+          multiple files. See <xref linkend="context-import" /> for more
+          information. This usage pattern is common when each configuration
+          file represents a logical layer or component within the application.
+          In this case you may want to refer to a common object dependency
+          using a name that is specific to each file. If the common object
+          dependency is defined in the main application configuration file
+          itself, then one can use the name element as an alias mechanism.
+          However, if the main application configuration file should not be
+          responsible for defining the common object dependency, since it
+          logically 'belongs' to one of the other layers or components, you
+          can not use the name attribute to achieve this goal.</para>
+
+          <para>In this case, you can define an alias using an explicit
+          <literal>alias</literal> element contained in the main application
+          configuration file.</para>
+
+          <para><literal> &lt;alias name="fromName"
+          alias="toName"/&gt;</literal></para>
+
+          <para>This allows an object named <literal>fromName</literal> to be
+          referred to as <literal>toName</literal> across all application
+          configuration files.</para>
+
+          <para>As a concrete example, consider the case where the
+          configuration file 'a.xml' (representing component A) defines a
+          connection object called componentA-connection. In another file,
+          'b.xml' (representing component B) would like to refer to the
+          connection as componentB-connection. And the main application,
+          MyApp, defines its own XML fragment to assembles the final
+          application configuration from all three fragments and would like to
+          refer to the connection as myApp-connection. This scenario can be
+          easily handled by adding to the MyApp XML fragment the following
+          standalone aliases:</para>
+
+          <para><literal> </literal><literal>&lt;alias
+          name="componentA-connection"
+          alias="componentB-connection"/&gt;</literal></para>
+
+          <para><literal> &lt;alias name="componentA-connection"
+          alias="myApp-connection"/&gt;</literal></para>
+
+          <para>Now each component and the main app can refer to the
+          connection via a name that is unique and guaranteed not to clash
+          with any other definition (effectively there is a namespace), yet
+          they refer to the same object.</para>
+        </sect4>
+      </sect3>
+    </sect2>
+
+    <sect2 id="objects-factory-class">
+      <title>Object creation</title>
+
+      <para>An object definition essentially is a recipe for creating one or
+      more objects. The container looks at the recipe for a named object when
+      asked, and uses the configuration metadata encapsulated by that object
+      definition to create (or acquire) an actual object.</para>
+
+      <para>If you are using XML-based configuration metadata, you can specify
+      the type of object that is to be instantiated using the
+      <literal>'type'</literal> attribute of the
+      <literal>&lt;object/&gt;</literal> element. This
+      <literal>'type'</literal> attribute (which internally eventually boils
+      down to being a <literal>Type</literal> property on a
+      <literal>IObjectDefinition</literal> instance) is normally mandatory
+      (see XXX “Instantiation using an instance factory method� and XXX
+      “Object definition inheritance� for the two exceptions) and is used for
+      one of two purposes. The type property specifies the type of of the
+      object to be constructed in the common case where the container itself
+      directly creates the object by calling its constructor reflectively
+      (somewhat equivalent to C# code using the <emphasis>'new'
+      </emphasis>operator). In the less common case where the container
+      invokes a <literal>static</literal>, <emphasis>factory</emphasis> method
+      on a class to create the object, the type property specifies the actual
+      class containing the <literal>static</literal> factory method that is to
+      be invoked to create the object (the type of the object returned from
+      the invocation of the <literal>static</literal> factory method may be
+      the same type or another type entirely, it doesn't matter).</para>
+
+      <sect3 id="objects-factory-class-ctor">
+        <title>Object creation via constructor invocation</title>
+
+        <para>When creating an object using the constructor approach, all
+        normal classes are usable by and compatible with Spring. That is, the
+        type being created does not need to implement any specific interfaces
+        or be coded in a specific fashion. Just specifying the object type
+        should be enough. However, depending on what type of IoC you are going
+        to use for that specific object, you may need to create a default
+        constructor (i.e. a constructor that has no parameters) in the source
+        code definition of your class.</para>
+
+        <para>The <classname>XmlObjectFactory</classname> implementation of
+        the <classname>IObjectFactory</classname> interface can consume object
+        definitions that have been defined in XML, for example...
+        <programlisting>&lt;object id="exampleObject" type="Examples.ExampleObject, ExamplesLibrary"/&gt;</programlisting></para>
+
+        <para>The mechanism for supplying arguments to the constructor (if
+        required), or setting properties of the object instance after it has
+        been constructed, is described shortly.</para>
+
+        <para>This XML fragment describes an object definition that will be
+        identified by the <emphasis>exampleObject</emphasis> name, instances
+        of which will be of the <classname>Examples.ExampleObject</classname>
+        type that has been compiled into the
+        <literal>ExamplesLibrary</literal> assembly. Take special note of the
+        structure of the <literal>type</literal> attribute's value... the
+        namespace-qualified name of the class is specified, followed by a
+        comma, followed by (at a bare minimum) the name of the assembly that
+        contains the class. In the preceding example, the
+        <literal>ExampleObject</literal> class is defined in the
+        <literal>Examples</literal> namespace, and it has been compiled into
+        the <literal>ExamplesLibrary</literal> assembly.</para>
+
+        <para>The name of the assembly that contains the type
+        <emphasis>must</emphasis> be specified in the <literal>type</literal>
+        attribute. Furthermore, it is recommended that you specify the fully
+        qualified assembly name <footnote>
+            <para>More information about assembly names can be found in the
+            <emphasis>Assembly Names</emphasis> section of the .NET Framework
+            Developer's Guide (installed as part of the .NET SDK), or online
+            at Microsoft's MSDN website, by searching for <emphasis>Assembly
+            Names</emphasis>.</para>
+          </footnote> in order to guarantee that the type that Spring.NET uses
+        to instantiate your object (s) is indeed the one that you expect.
+        Usually this is only an issue if you are using classes from (strongly
+        named) assemblies that have been installed into the Global Assembly
+        Cache (GAC).</para>
+
+        <para>If you have defined nested classes use the addition symbol, +,
+        to reference the nested class. For example, if the class
+        <literal>Examples.ExampleObject</literal> had a nested class
+        <literal>Person</literal> the XML declaration would be
+        <programlisting>&lt;object id="exampleObject" type="Examples.ExampleObject+Person, ExamplesLibrary"/&gt;</programlisting></para>
+
+        <para>If you are defining classes that have been compiled into
+        assemblies that are available to your application (such as the
+        <literal>bin</literal> directory in the case of ASP.NET applications)
+        via the standard assembly probing mechanisms, then you can specify
+        simply the name of the assembly (e.g.
+        <literal>ExamplesLibrary.Data</literal>)... this way, when (or if) the
+        assemblies used by your application are updated, you won't have to
+        change the value of every <literal>&lt;object/&gt;</literal>
+        definition's <literal>type</literal> attribute to reflect the new
+        version number (if the version number has changed)... Spring.NET will
+        automatically locate and use the newer versions of your assemblies
+        (and their attendant classes) from that point forward.</para>
+      </sect3>
+
+      <sect3 id="objects-factory-class-static-factory-method">
+        <title>Object creation via a static factory method</title>
+
+        <para>When defining an object which is to be created using a static
+        factory method, along with the type attribute which specifies the type
+        containing the static factory method, another attribute named
+        factory-method is needed to specify the name of the factory method
+        itself. Spring.NET expects to be able to call this method (with an
+        optional list of arguments as described later) and get back a live
+        object, which from that point on is treated as if it had been created
+        normally via a constructor. One use for such an object definition is
+        to call static factories in legacy code.</para>
+
+        <para>Following is an example of an object definition which specifies
+        that the object is to be created by calling a factory-method. Note
+        that the definition does not specify the type (class) of the returned
+        object, only the type containing the factory method. In this example,
+        <literal>CreateInstance</literal> must be a static method.
+        <programlisting>&lt;object id="exampleObject"
+      type="Examples.ExampleObjectFactory, ExamplesLibrary"
+      factory-method="CreateInstance"/&gt;</programlisting></para>
+
+        <para>The mechanism for supplying (optional) arguments to the factory
+        method, or setting properties of the object instance after it has been
+        returned from the factory, will be described shortly.</para>
+      </sect3>
+
+      <sect3 id="objects-factory-class-instance-factory-method">
+        <title>Object creation via an instance factory method</title>
+
+        <para>In a fashion similar to instantiation using a static factory
+        method, instantiation using an instance factory method is where a
+        non-static method of an existing object from the container is invoked
+        to create the new object. To use this mechanism, the
+        <literal>'type'</literal> attribute must be left empty, and the
+        <literal>'factory-object'</literal> attribute must specify the name of
+        an object in the current (or parent/ancestor) container that contains
+        the instance method that is to be invoked to create the object. The
+        name of the factory method itself should still be set via the
+        <literal>'factory-method'</literal> attribute.<programlisting>&lt;!-- the factory object, which contains an instance method called 'CreateInstance' --&gt;
+&lt;object id="exampleFactory" type="..."&gt;
+  &lt;!-- inject any dependencies required by this object --&gt;
+&lt;/object&gt;
+
+&lt;!-- the object that is to be created by the factory object --&gt;
+&lt;object id="exampleObject"
+      factory-method="CreateInstance"
+      factory-object="exampleFactory"/&gt;</programlisting></para>
+
+        <para>Although the mechanisms for setting object properties are still
+        to be discussed, one implication of this approach is that the factory
+        object itself can be managed and configured via Dependency Injection,
+        by the container.<note>
+            <para>When the Spring documentation makes mention of a 'factory
+            object', this will be a reference to an object that is configured
+            in the Spring container that will create objects via an instance
+            or static factory method. When the documentation mentions a
+            <literal>IFactoryObject</literal> (notice the capitalization) this
+            is a reference to a Spring-specific
+            <literal>IFactoryObject</literal> .</para>
+          </note></para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="objects-creation-generic-types">
+      <title>Object creation of generic types</title>
+
+      <para>Generic types can also be created in much the same manner an
+      non-generic types.</para>
+
+      <sect3 id="objects-factory-generic-class-ctor">
+        <title>Object creation of generic types via constructor
+        invocation</title>
+
+        <para>The following examples shows the definition of simple generic
+        types and how they can be created in Spring's XML based configuration
+        file. <programlisting>namespace GenericsPlay
+{
+    public class FilterableList&lt;T&gt;
+    {
+        private List&lt;T&gt; list;
+        
+        private String name;
+
+        public List&lt;T&gt; Contents
+        {
+            get { return list; }
+            set { list = value; }
+        }
+
+        public String Name
+        {
+            get { return name; }
+            set { name = value; }
+        }
+        
+        public List&lt;T&gt; ApplyFilter(string filterExpression)
+        {
+            /// should really apply filter to list ;)
+            return new List&lt;T&gt;();
+        }
+
+    }
+}</programlisting> The XML configuration to create and configure this object
+        is shown below <programlisting>&lt;object id="myFilteredIntList" type="GenericsPlay.FilterableList&amp;lt;int&gt;, GenericsPlay"&gt;
+  &lt;property name="Name" value="My Integer List"/&gt;
+&lt;/object&gt;</programlisting> There are a few items to note in terms how to
+        specify a generic type. First, the left bracket that specifies the
+        generic type, i.e. <literal>&lt;</literal>, is replaced with the
+        string &amp;lt; due to XML escape syntax for the less than symbol.
+        Yes, we all realize this is less than ideal from the readability point
+        of view. Second, the generic type arguments can not be fully assembly
+        qualified as the comma is used to separate generic type arguments.
+        Alternative characters used to overcome the two quirks can be
+        implemented in the future but so far, all proposals don't seem to help
+        clarify the text. The suggested solution to improve readability is to
+        use type aliases as shown below <programlisting>
+&lt;typeAliases&gt;
+ &lt;alias name="GenericDictionary" type=" System.Collections.Generic.Dictionary&amp;lt;,&gt;" /&gt;
+ &lt;alias name="myDictionary" type="System.Collections.Generic.Dictionary&amp;lt;int,string&gt;" /&gt;
+&lt;/typeAliases&gt;
+</programlisting> So that instead of something like this <programlisting>&lt;object id="myGenericObject" 
+        type="GenericsPlay.ExampleGenericObject&amp;lt;System.Collections.Generic.Dictionary&amp;lt;int , string&gt;&gt;, GenericsPlay" /&gt;</programlisting>
+        It can be shortened to <programlisting>&lt;object id="myOtherGenericObject" 
+        type="GenericsPlay.ExampleGenericObject&amp;lt;GenericDictionary&amp;lt;int , string&gt;&gt;, GenericsPlay" /&gt;</programlisting>
+        or even shorter <programlisting>&lt;object id="myOtherOtherGenericObject" 
+        type="GenericsPlay.ExampleGenericObject&amp;lt;MyIntStringDictionary&gt;, GenericsPlay" /&gt;
+</programlisting> Refer to <xref linkend="context-configuration" /> for
+        additional information on using type aliases.</para>
+      </sect3>
+
+      <sect3 id="objects-factory-generic-static-factory">
+        <title>Object creation of generic types via static factory
+        method</title>
+
+        <para>The following classes are used to demonstrate the ability to
+        create instances of generic types that themselves are created via a
+        static generic factory method. <programlisting>public class TestGenericObject&lt;T, U&gt;
+{
+    public TestGenericObject()
+    {
+    }
+
+    private IList&lt;T&gt; someGenericList = new List&lt;T&gt;();
+    
+    private IDictionary&lt;string, U&gt; someStringKeyedDictionary =
+        new Dictionary&lt;string, U&gt;();
+
+    public IList&lt;T&gt; SomeGenericList
+    {
+        get { return someGenericList; }
+        set { someGenericList = value; }
+    }
+
+    public IDictionary&lt;string, U&gt; SomeStringKeyedDictionary
+    {
+        get { return someStringKeyedDictionary; }
+        set { someStringKeyedDictionary = value; }
+    }
+
+}</programlisting> The accompanying factory class is <programlisting>
+public class TestGenericObjectFactory
+{
+    public static TestGenericObject&lt;V, W&gt; StaticCreateInstance&lt;V, W&gt;()
+    {
+        return new TestGenericObject&lt;V, W&gt;();
+    }
+
+    public TestGenericObject&lt;V, W&gt; CreateInstance&lt;V, W&gt;()
+    {
+        return new TestGenericObject&lt;V, W&gt;();
+    }
+}
+</programlisting> The XML snippet to create an instance of TestGenericObject
+        where <literal>V</literal> is a List of integers and
+        <literal>W</literal> is an integer is shown below <programlisting>&lt;object id="myTestGenericObject"
+        type="GenericsPlay.TestGenericObjectFactory, GenericsPlay"
+        factory-method="StaticCreateInstance&amp;lt;System.Collections.Generic.List&amp;lt;int&gt;,int&gt;"
+/&gt;</programlisting> The StaticCreateInstance method is responsible for
+        instantiating the object that will be associated with the id
+        'myTestGenericObject'.</para>
+      </sect3>
+
+      <sect3 id="objects-factory-generic-instance-factory">
+        <title>Object creation of generic types via instance factory
+        method</title>
+
+        <para>Using the class from the previous example the XML snippet to
+        create an instance of a generic type via an instance factory method is
+        shown below <programlisting>&lt;object id="exampleFactory" type="GenericsPlay.TestGenericObject&amp;lt;int,string&gt;, GenericsPlay"/&gt;
+
+&lt;object id="anotherTestGenericObject"
+        factory-object="exampleFactory" 
+        factory-method="CreateInstance&amp;lt;System.Collections.Generic.List&amp;lt;int&gt;,int&gt;"/&gt;
+</programlisting> This creates an instance of
+        <literal>TestGenericObject&lt;List&lt;int&gt;,int&gt;</literal></para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="objects-factory-client">
+      <title>Using the container</title>
+
+      <para>An <classname>IApplicationContext</classname> is essentially
+      nothing more than the interface for an advanced factory capable of
+      maintaining a registry of different objects and their dependencies. The
+      <classname>IApplicationContext</classname> enables you to read object
+      definitions and access them. You create one and read in some object
+      definition in the XML format as follows:</para>
+
+      <programlisting>IApplicationContext context = new XmlApplicationContext("file://objects.xml");
+</programlisting>
+
+      <para>Basically that is all there is to it. Using
+      <literal>GetObject(string)</literal> or the indexer
+      <literal>[string]</literal>, you can retrieve instances of your object;
+      the client-side view of the <classname>IApplicationContext</classname>
+      is simple. The <classname>IApplicationContext</classname> interface has
+      just a few other methods related to finding objects in the contianer,
+      but ideally your application code should never use them... indeed, your
+      application code should have no calls to the
+      <literal>GetObject(string)</literal> method at all, and thus no
+      dependency on Spring APIs at all.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="objects-dependencies">
+    <title>Dependencies</title>
+
+    <para>Your typical enterprise application is not made up of a single
+    object. Even the simplest of applications will no doubt have at least a
+    handful of objects that work together to present what the end-user sees as
+    a coherent application. This next section explains how you go from
+    defining a number of object definitions that stand-alone, each to
+    themselves, to a fully realized application where objects work (or
+    collaborate) together to achieve some goal (usually an application that
+    does what the end-user wants).</para>
+
+    <sect2 id="objects-factory-collaborators">
+      <title>Injecting dependencies</title>
+
+      <para>The basic principle behind Dependency Injection (DI) is that
+      objects define their dependencies (that is to say the other objects they
+      work with) only through constructor arguments, arguments to a factory
+      method, or properties which are set on the object instance after it has
+      been constructed or returned from a factory method. Then, it is the job
+      of the container to actually inject those dependencies when it creates
+      the object. This is fundamentally the inverse, hence the name Inversion
+      of Control (IoC), of the object itself being in control of instantiating
+      or locating its dependencies on its own using direct construction of
+      classes, or something like the Service Locator pattern.</para>
+
+      <para>It becomes evident upon usage that code gets much cleaner when the
+      DI principle is applied, and reaching a higher grade of decoupling is
+      much easier when objects do not look up their dependencies, but are
+      provided with them (and additionally do not even know where the
+      dependencies are located and of what concrete class they are). DI exists
+      in two major variants, namely Constructor Injection and Setter
+      Injection.</para>
+
+      <sect3 id="objects-ctor-injection">
+        <title>Constructor Injection</title>
+
+        <para>Constructor-based DI is effected by invoking a constructor with
+        a number of arguments, each representing a dependency. Additionally,
+        calling a static factory method with specific arguments to construct
+        the object, can be considered almost equivalent, and the rest of this
+        text will consider arguments to a constructor and arguments to a
+        static factory method similarly. Find below an example of a class that
+        could only be dependency injected using constructor injection. Notice
+        that there is nothing special about this class.</para>
+
+        <programlisting>public class SimpleMovieLister
+{
+  // the SimpleMovieLister has a dependency on a MovieFinder
+  private IMovieFinder movieFinder;
+
+  // a constructor so that the Spring container can 'inject' a MovieFinder
+  public MovieLister(IMovieFinder movieFinder)
+  {
+    this.movieFinder = movieFinder;
+  }
+
+  // business logic that actually 'uses' the injected IMovieFinder is omitted...
+
+}</programlisting>
+
+        <sect4 id="objects-ctor-arg-resolution">
+          <title>Constructor Argument Resolution</title>
+
+          <para>Constructor argument resolution matching occurs using the
+          argument's type. If there is no potential for ambiguity in the
+          constructor arguments of a object definition, then the order in
+          which the constructor arguments are defined in a object definition
+          is the order in which those arguments will be supplied to the
+          appropriate constructor when it is being instantiated. Consider the
+          following class:</para>
+
+          <programlisting>namespace X.Y
+{
+    public class Foo
+    {
+        public Foo(Bar bar, Baz baz)
+        {
+           // ...
+        }
+    }
+}</programlisting>
+
+          <para>There is no potential for ambiguity here (assuming of course
+          that Bar and Baz classes are not related in an inheritance
+          hierarchy). Thus the following configuration will work just fine,
+          and you do not need to specify the constructor argument indexes and
+          / or types explicitly.</para>
+
+          <programlisting>&lt;object name="Foo" type="X.Y.Foo, Example"&gt;
+        &lt;constructor-arg&gt;
+          &lt;object type="X.Y.Bar, Example"/&gt;
+        &lt;/constructor-arg&gt;
+        &lt;constructor-arg&gt;
+          &lt;object type="X.Y.Baz, Example"/&gt;
+        &lt;/constructor-arg&gt;
+      &lt;/object&gt;</programlisting>
+
+          <para>When another object is referenced, the type is known, and
+          matching can occur (as was the case with the preceding example).
+          When a simple type is used, such as
+          <literal>&lt;value&gt;true&lt;value&gt;</literal>, Spring cannot
+          determine the type of the value, and so cannot match by type without
+          help. Consider the following class:</para>
+
+          <programlisting>using System;
+
+namespace SimpleApp
+{
+  public class ExampleObject
+  {
+    private int years;              //No. of years to the calculate the Ultimate Answer
+
+    private string ultimateAnswer;  //The Answer to Life, the Universe, and Everything
+
+    public ExampleObject(int years, string ultimateAnswer)
+    {
+       this.years = years;
+       this.ultimateAnswer = ultimateAnswer;
+    }
+
+}</programlisting>
+
+          <sect5 id="objects-ctor-arg-type-matching">
+            <title>Constructor Argument Type Matching</title>
+
+            <para>The above scenario <emphasis>can</emphasis> use type
+            matching with simple types by explicitly specifying the type of
+            the constructor argument using the <literal>type</literal>
+            attribute. For example: <programlisting>&lt;object name="exampleObject" type="SimpleApp.ExampleObject, SimpleApp"&gt;
+  &lt;constructor-arg type="int" value="7500000"/&gt;
+  &lt;constructor-arg type="string" value="42"/&gt;
+&lt;/object&gt;</programlisting></para>
+
+            <para>The type attribute specifies the
+            <literal>System.Type</literal> of the constructor argument, such
+            as System.Int32. Alias' are available to for common simple types
+            (and their array equivalents). These alias' are... <table
+                frame="all">
+                <title>Type aliases</title>
+
+                <tgroup cols="3">
+                  <colspec colname="c1" colwidth="1*" />
+
+                  <colspec colname="c2" colwidth="5*" />
+
+                  <colspec colname="c3" colwidth="5*" />
+
+                  <thead>
+                    <row>
+                      <entry>Type</entry>
+
+                      <entry>Alias'</entry>
+
+                      <entry>Array Alias'</entry>
+                    </row>
+                  </thead>
+
+                  <tbody>
+                    <row>
+                      <entry>System.Char</entry>
+
+                      <entry>char, Char</entry>
+
+                      <entry>char[], Char()</entry>
+                    </row>
+
+                    <row>
+                      <entry>System.Int16</entry>
+
+                      <entry>short, Short</entry>
+
+                      <entry>short[], Short()</entry>
+                    </row>
+
+                    <row>
+                      <entry>System.Int32</entry>
+
+                      <entry>int, Integer</entry>
+
+                      <entry>int[], Integer()</entry>
+                    </row>
+
+                    <row>
+                      <entry>System.Int64</entry>
+
+                      <entry>long, Long</entry>
+
+                      <entry>long[], Long()</entry>
+                    </row>
+
+                    <row>
+                      <entry>System.UInt16</entry>
+
+                      <entry>ushort</entry>
+
+                      <entry>ushort[]</entry>
+                    </row>
+
+                    <row>
+                      <entry>System.UInt32</entry>
+
+                      <entry>uint</entry>
+
+                      <entry>uint[]</entry>
+                    </row>
+
+                    <row>
+                      <entry>System.UInt64</entry>
+
+                      <entry>ulong</entry>
+
+                      <entry>ulong[]</entry>
+                    </row>
+
+                    <row>
+                      <entry>System.Float</entry>
+
+                      <entry>float, Single</entry>
+
+                      <entry>float[], Single()</entry>
+                    </row>
+
+                    <row>
+                      <entry>System.Double</entry>
+
+                      <entry>double, Double</entry>
+
+                      <entry>double[], Double()</entry>
+                    </row>
+
+                    <row>
+                      <entry>System.Date</entry>
+
+                      <entry>date, Date</entry>
+
+                      <entry>date[], Date()</entry>
+                    </row>
+
+                    <row>
+                      <entry>System.Decimal</entry>
+
+                      <entry>decimal, Decimal</entry>
+
+                      <entry>decimal[], Decimal()</entry>
+                    </row>
+
+                    <row>
+                      <entry>System.Bool</entry>
+
+                      <entry>bool, Boolean</entry>
+
+                      <entry>bool[], Boolean()</entry>
+                    </row>
+
+                    <row>
+                      <entry>System.String</entry>
+
+                      <entry>string, String</entry>
+
+                      <entry>string[], String()</entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </table></para>
+          </sect5>
+
+          <sect5 id="objects-ctor-arg-index">
+            <title>Constructor Argument Index</title>
+
+            <para>Constructor arguments can have their index specified
+            explicitly by use of the <literal>index</literal> attribute. For
+            example: <programlisting>&lt;object name="exampleObject" type="SimpleApp.ExampleObject, SimpleApp"&gt;
+  &lt;constructor-arg index="0" value="7500000"/&gt;
+  &lt;constructor-arg index="1" value="42"/&gt;
+&lt;/object&gt;</programlisting>As well as solving the ambiguity problem of
+            multiple simple values, specifying an index also solves the
+            problem of ambiguity where a constructor may have two arguments of
+            the same type. Note that the <emphasis>index is 0
+            based</emphasis>.</para>
+          </sect5>
+
+          <sect5 id="objects-ctor-arg-by-name">
+            <title>Constructor Arguments by Name</title>
+
+            <para>Constructor arguments can also be specified by name by using
+            the <literal>name</literal> attribute of the
+            <literal>&lt;constructor-arg&gt;</literal> element.</para>
+
+            <programlisting>&lt;object name="exampleObject" type="SimpleApp.ExampleObject, SimpleApp"&gt;
+  &lt;constructor-arg name="years" value="7500000"/&gt;
+  &lt;constructor-arg name="ultimateAnswer" value="42"/&gt;
+&lt;/object&gt;</programlisting>
+          </sect5>
+        </sect4>
+      </sect3>
+
+      <sect3 id="objects-setter-injection">
+        <title>Setter Injection</title>
+
+        <para>Setter-based DI is realized by calling setter methods on your
+        objects after invoking a no-argument constructor or no-argument static
+        factory method to instantiate your object.</para>
+
+        <para>Find below an example of a class that can only be dependency
+        injected using pure setter injection.</para>
+
+        <programlisting>public class MovieLister
+{
+  private IMovieFinder movieFinder;
+
+  public IMovieFinder MovieFinder
+  {
+      set
+      {
+          movieFinder = value;
+      }
+  }
+
+  // business logic that actually 'uses' the injected IMovieFinder is omitted...
+}</programlisting>
+
+        <sidebar>
+          <title>Constructor- or Setter-based DI?</title>
+
+          <para>The Spring team generally advocates the usage of setter
+          injection, since a large number of constructor arguments can get
+          unwieldy, especially when some properties are optional. The presence
+          of setter methods also makes objects of that class amenable to being
+          re-configured (or re-injected) at some later time (for management
+          purposes).</para>
+
+          <para>Constructor-injection is favored by some purists though and
+          with good reason. Supplying all of an object's dependencies means
+          that that object is never returned to client (calling) code in a
+          less than totally initialized state. The flip side is that the
+          object becomes less amenable to re-configuration (or
+          re-injection).</para>
+
+          <para>There is no hard and fast rule here. Use whatever type of DI
+          makes the most sense for a particular class; sometimes, when dealing
+          with third party classes to which you do not have the source, the
+          choice will already have been made for you - a legacy class may not
+          expose any setter methods, and so constructor injection will be the
+          only type of DI available to you.</para>
+        </sidebar>
+
+        <para>The <classname>IObjectFactory</classname> supports both of these
+        variants for injecting dependencies into objects it manages. (It in
+        fact also supports injecting setter-based dependencies after some
+        dependencies have already been supplied via the constructor approach.)
+        The configuration for the dependencies comes in the form of the
+        <classname>IObjectDefinition</classname> class, which is used together
+        with <literal>TypeConverters</literal> to know how to convert
+        properties from one format to another. However, most users of
+        Spring.NET will not be dealing with these classes directly (that is
+        programatically), but rather with an XML definition file which will be
+        converted internally into instances of these classes, and used to load
+        an entire Spring IoC container instance.</para>
+
+        <para>Object dependency resolution generally happens as follows:
+        <orderedlist spacing="compact">
+            <listitem>
+              <para>The <classname>IObjectFactory</classname> is created and
+              initialized with a configuration which describes all the
+              objects. Most Spring.NET users use an
+              <classname>IObjectFactory</classname> or
+              <classname>IApplicationContext</classname> variant that supports
+              XML format configuration files.</para>
+
+              <para></para>
+            </listitem>
+
+            <listitem>
+              <para>Each object has dependencies expressed in the form of
+              properties, constructor arguments, or arguments to the
+              static-factory method when that is used instead of a normal
+              constructor. These dependencies will be provided to the object,
+              <emphasis>when the object is actually created</emphasis>.</para>
+
+              <para></para>
+            </listitem>
+
+            <listitem>
+              <para>Each property or constructor argument is either an actual
+              definition of the value to set, or a reference to another object
+              in the container.</para>
+
+              <para></para>
+            </listitem>
+
+            <listitem>
+              <para><anchor
+              id="object-factory-collaborators-typeconverter" />Each property
+              or constructor argument which is a value must be able to be
+              converted from whatever format it was specified in, to the
+              actual <classname>System.Type</classname> of that property or
+              constructor argument. By default Spring.NET can convert a value
+              supplied in string format to all built-in types, such as
+              <literal>int</literal>, <literal>long</literal>,
+              <literal>string</literal>, <literal>bool</literal>, etc.
+              Spring.NET uses <classname>TypeConverter</classname> definitions
+              to be able to convert string values to other, arbitrary types.
+              Refer to <xref linkend="objects-objects-conversion" /> for more
+              information regarding type conversion, and how you can design
+              your classes to be convertible by Spring.NET.</para>
+            </listitem>
+          </orderedlist></para>
+
+        <para>The Spring container validates the configuration of each object
+        as the container is created, including the validation that properties
+        which are object references are actually referring to valid object.
+        However, the object properties themselves are not set until the object
+        is actually created. For those object that defined as singletons and
+        set to be pre-instantiated (such as singleton object in an
+        <classname>IApplicationContext</classname>), creation happens at the
+        time that the container is created, but otherwise this is only when
+        the object is requested. When an object actually has to be created,
+        this will potentially cause a graph of other objects to be created, as
+        its dependencies and its dependencies' dependencies (and so on) are
+        created and assigned.</para>
+
+        <sidebar>
+          <title>Circular Dependencies</title>
+
+          <para>If you are using predominantly constructor injection it is
+          possible to write and configure your classes and objects such that
+          an unresolvable circular dependency scenario is created.</para>
+
+          <para>Consider the scenario where you have class A, which requires
+          an instance of class B to be provided via constructor injection, and
+          class B, which requires an instance of class A to be provided via
+          constructor injection. If you configure object for classes A and B
+          to be injected into each other, the Spring IoC container will detect
+          this circular reference at runtime, and throw a
+          <classname>ObjectCurrentlyInCreationException</classname>.</para>
+
+          <para>One possible solution to this issue is to edit the source code
+          of some of your classes to be configured via setters instead of via
+          constructors. Another solution is not to use constructor injection
+          and stick to setter injection only. In other words, while it should
+          generally be avoided in all but the rarest of circumstances, it is
+          possible to configure circular dependencies with setter
+          injection.</para>
+
+          <para>Unlike the typical case (with no circular dependencies), a
+          circular dependency between object A and object B will force one of
+          the objects to be injected into the other prior to being fully
+          initialized itself (a classic chicken/egg scenario).</para>
+        </sidebar>
+
+        <para>You can generally trust Spring.NET to do the right thing. It
+        will detect configuration issues, such as references to non-existent
+        object definitions and circular dependencies, at container load-time.
+        It will actually set properties and resolve dependencies as late as
+        possible, which is when the object is actually created. This means
+        that a Spring container which has loaded correctly can later generate
+        an exception when you request an object if there is a problem creating
+        that object or one of its dependencies. This could happen if the
+        object throws an exception as a result of a missing or invalid
+        property, for example. This potentially delayed visibility of some
+        configuration issues is why <classname>IApplicationContext</classname>
+        by default pre-instantiates singleton objects. At the cost of some
+        upfront time and memory to create these objects before they are
+        actually needed, you find out about configuration issues when the
+        <classname>IApplicationContext</classname> is created, not later. If
+        you wish, you can still override this default behavior and set any of
+        these singleton objects to lazy-load (not be preinstantiated)</para>
+
+        <para>If no circular dependencies are involved (see sidebar for a
+        discussion of circular dependencies), when one or more collaborating
+        objects are being injected into a dependent object, each collaborating
+        object is totally configured prior to being passed (via one of the DI
+        flavors) to the dependent object. This means that if object A has a
+        dependency on object B, the Spring IoC container will
+        <emphasis>totally</emphasis> configure object B prior to invoking the
+        setter method on object A; you can read<emphasis> 'totally
+        configure'</emphasis> to mean that the object will be instantiated (if
+        not a pre-instantiated singleton), all of its dependencies will be
+        set, and the relevant lifecycle methods (such as a configured init
+        method or the <classname>IIntializingObject</classname> callback
+        method) will all be invoked.</para>
+      </sect3>
+
+      <sect3 id="objects-di-examples">
+        <title>Some examples</title>
+
+        <para>First, an example of using XML-based configuration metadata for
+        setter-based DI. Find below a smallpart of a Spring XML configuration
+        file specifying some object definitions. <programlisting>&lt;object id="exampleObject" type="Examples.ExampleObject, ExamplesLibrary"&gt;
+
+    &lt;!-- setter injection using the ref attribute --&gt;
+    &lt;property name="objectOne" ref="anotherExampleObject"/&gt;    
+    &lt;property name="objectTwo" ref="yetAnotherObject"/&gt;
+    &lt;property name="IntegerProperty" value="1"/&gt;
+&lt;/object&gt;
+
+&lt;object id="anotherExampleObject" type="Examples.AnotherObject, ExamplesLibrary"/&gt;
+&lt;object id="yetAnotherObject" type="Examples.YetAnotherObject, ExamplesLibrary"/&gt;</programlisting>
+        <programlisting>[C#]
+public class ExampleObject
+{
+  private AnotherObject objectOne;
+  private YetAnotherObject objectTwo;
+  private int i;
+  
+  public AnotherObject ObjectOne
+  {
+    set { this.objectOne = value; }
+  }
+  
+  public YetAnotherObject ObjectTwo
+  {
+    set { this.objectTwo = value; }
+  }
+  
+  public int IntegerProperty
+  {
+    set { this.i = value; }
+  }  
+}</programlisting></para>
+
+        <para>As you can see, setters have been declared to match against the
+        properties specified in the XML file. Find below an example of using
+        constructor-based DI.<programlisting>&lt;object id="exampleObject" type="Examples.ExampleObject, ExamplesLibrary"&gt;
+    &lt;constructor-arg name="objectOne" ref="anotherExampleObject"/&gt;
+    &lt;constructor-arg name="objectTwo" ref="yetAnotherObject"/&gt;
+    &lt;constructor-arg name="IntegerProperty" value="1"/&gt;
+&lt;/object&gt;
+
+&lt;object id="anotherExampleObject" type="Examples.AnotherObject, ExamplesLibrary"/&gt;
+&lt;object id="yetAnotherObject" type="Examples.YetAnotherObject, ExamplesLibrary"/&gt;</programlisting>
+        <programlisting>[Visual Basic.NET]
+Public Class ExampleObject
+
+    Private myObjectOne As AnotherObject
+    Private myObjectTwo As YetAnotherObject
+    Private i As Integer
+    
+    Public Sub New (
+        anotherObject as AnotherObject,
+        yetAnotherObject as YetAnotherObject,
+        i as Integer)
+        
+        myObjectOne = anotherObject
+        myObjectTwo = yetAnotherObject
+        Me.i = i
+    End Sub
+End Class</programlisting>As you can see, the constructor arguments specified
+        in the object definition will be used to pass in as arguments to the
+        constructor of the <classname>ExampleObject</classname>.</para>
+
+        <para>Now consider a variant of this where instead of using a
+        constructor, Spring is told to call a static factory method to return
+        an instance of the object <programlisting>&lt;object id="exampleObject" type="Examples.ExampleFactoryMethodObject, ExamplesLibrary"
+     factory-method="CreateInstance"&gt;
+    &lt;constructor-arg name="objectOne" ref="anotherExampleObject"/&gt;
+    &lt;constructor-arg name="objectTwo" ref="yetAnotherObject"/&gt;
+    &lt;constructor-arg name="intProp" value="1"/&gt;
+&lt;/object&gt;
+
+&lt;object id="anotherExampleObject" type="Examples.AnotherObject, ExamplesLibrary"/&gt;
+&lt;object id="yetAnotherObject" type="Examples.YetAnotherObject, ExamplesLibrary"/&gt;</programlisting>
+        <programlisting>[C#]
+public class ExampleFactoryMethodObject
+{
+  private AnotherObject objectOne;
+  private YetAnotherObject objectTwo;
+  private int i;
+  
+  // a private constructor
+  private ExampleFactoryMethodObject()
+  {
+  }
+
+  public static ExampleFactoryMethodObject CreateInstance(AnotherObject objectOne,
+                               YetAnotherObject objectTwo,
+                               int intProp)
+  {
+    ExampleFactoryMethodObject fmo = new ExampleFactoryMethodObject();
+    fmo.AnotherObject = objectOne;
+    fmo.YetAnotherObject = objectTwo;
+    fmo.IntegerProperty = intProp;
+    return fmo;
+  }
+
+  // Property definitions
+
+}</programlisting> Note that arguments to the static factory method are
+        supplied via constructor-arg elements, exactly the same as if a
+        constructor had actually been used. These arguments are optional.
+        Also, it is important to realize that the type of the class being
+        returned by the factory method does not have to be of the same type as
+        the class which contains the static factory method, although in this
+        example it is. An instance (non-static) factory method, mentioned
+        previously, would be used in an essentially identical fashion (aside
+        from the use of the factory-object attribute instead of the type
+        attribute), so will not be detailed here.</para>
+
+        <para>Note that Setter Injection and Constructor Injectionare not
+        mutually exclusive. It is perfectly reasonable to use both for a
+        single object definition, as can be seen in the following example:
+        <programlisting>&lt;object id="exampleObject" type="Examples.MixedIocObject, ExamplesLibrary"&gt;
+    &lt;constructor-arg name="objectOne" ref="anotherExampleObject"/&gt;
+    &lt;property name="objectTwo" ref="yetAnotherObject"/&gt;
+    &lt;property name="IntegerProperty" value="1"/&gt;
+&lt;/object&gt;
+
+&lt;object id="anotherExampleObject" type="Examples.AnotherObject, ExamplesLibrary"/&gt;
+&lt;object id="yetAnotherObject" type="Examples.YetAnotherObject, ExamplesLibrary"/&gt;</programlisting>
+        <programlisting>[C#]
+public class MixedIocObject
+{
+  private AnotherObject objectOne;
+  private YetAnotherObject objectTwo;
+  private int i;
+  
+  public MixedIocObject (AnotherObject obj)
+  {
+    this.objectOne = obj;
+  }
+  
+  public YetAnotherObject ObjectTwo
+  {
+    set { this.objectTwo = value; }
+  }
+  
+  public int IntegerProperty
+  {
+    set { this.i = value; }
+  }  
+}</programlisting></para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="object-factory-properties-detailed">
+      <title>Dependencies and configuration in detail</title>
+
+      <para>As mentioned in the previous section, object properties and
+      constructor arguments can be defined as either references to other
+      managed objects (collaborators), or values defined inline. Spring's
+      XML-based configuration metadata supports a number of sub-element types
+      within its <literal>&lt;property/&gt;</literal> and
+      &lt;<literal>constructor-arg/&gt;</literal> elements for this
+      purpose.a</para>
+
+      <sect3>
+        <title>Straight values (primitives, <literal>strings</literal>,
+        etc.)</title>
+
+        <para>The <literal>&lt;value/&gt;</literal> element specifies a
+        property or constructor argument as a human-readable string
+        representation. As mentioned previously,
+        <classname>TypeConverter</classname> instances are used to convert
+        these string values from a <classname>System.String</classname> to the
+        actual property or argument type. Custom
+        <classname>TypeConverter</classname> implementations in the
+        <literal>Spring.Objects.TypeConverters</literal> namespace are used to
+        augment the functionality offered by the .NET BCL's default
+        <classname>TypeConverter</classname> implementations.</para>
+
+        <para>In the following example, we use a
+        <classname>SqlConnection</classname> from the
+        <literal>System.Data.SqlClient</literal> namespace of the BCL. This
+        class (like many other existing classes) can easily be used in a
+        Spring.NET object factory, as it offers a convenient public property
+        for configuration of its <literal>ConnectionString</literal>
+        property.</para>
+
+        <para>
+          <programlisting format="linespecific" xml:space="preserve">objects xmlns="http://www.springframework.net"&gt;
+  &lt;object id="myConnection" type="System.Data.SqlClient.SqlConnection"&gt;
+      &lt;!-- results in a call to the setter of the ConnectionString property --&gt;
+      &lt;property
+          name="ConnectionString"
+          value="Integrated Security=SSPI;database=northwind;server=mySQLServer"/&gt;
+  &lt;/object&gt;
+&lt;/objects&gt;</programlisting>
+        </para>
+
+        <sect4>
+          <title>The idref element</title>
+
+          <para>An idref element is simply a shorthand and error-proof way to
+          set a property to the String <emphasis>id</emphasis> or
+          <emphasis>name</emphasis> of another object in the
+          container.<programlisting>&lt;object id="theTargetObject" type="..."&gt; 
+   . . .
+&lt;/object&gt;
+
+&lt;object id="theClientObject" type="..."&gt;
+  &lt;property name="targetName"&gt; 
+    &lt;idref object="theTargetObject"/&gt; 
+  &lt;/property&gt;
+&lt;/object&gt;</programlisting>This is exactly equivalent at runtime to the
+          following fragment:<programlisting>&lt;object id="theTargetObject" type="..."&gt; 
+  . . .
+&lt;/object&gt;
+
+&lt;object id="theClientObject" type="..."&gt;
+  &lt;property name="targetName" value="theTargetObject"/&gt; 
+&lt;/object&gt;</programlisting>The main reason the first form is preferable
+          to the second is that using the <literal>idref</literal> tag will
+          allow Spring.NET to validate at deployment time that the other
+          object actually exists. In the second variation, the class that is
+          having its <emphasis>targetName</emphasis> property injected is
+          forced to do its own validation, and that will only happen when that
+          class is actually instantiated by the container, possibly long after
+          the container is actually up and running.</para>
+
+          <para>Additionally, if the object being referred to is in the same
+          actual XML file, and the object name is the object
+          <emphasis>id</emphasis>, the <literal>local</literal> attribute may
+          be used, which will allow the XML parser itself to validate the
+          object name even earlier, at parse time. <programlisting>&lt;property name="targetName"&gt;
+  &lt;idref local="theTargetObject"/&gt; 
+&lt;/property&gt;</programlisting></para>
+        </sect4>
+      </sect3>
+
+      <sect3 id="objects-ref-element">
+        <title>Referring to collaborating objects</title>
+
+        <para>The <literal>ref</literal> element is the final element allowed
+        inside a <literal>property</literal> definition element. It is used to
+        set the value of the specified property to be a reference to another
+        object managed by the container, a collaborator, so to speak. As you
+        saw in the previous example to set collection properties, we used the
+        <classname>SqlConnection</classname> instance from the initial example
+        as a collaborator and specified it using a &lt;ref object/&gt;
+        element. As mentioned in a previous section, the referred-to object is
+        considered to be a dependency of the object who's property is being
+        set, and will be initialized on demand as needed (if it is a singleton
+        object it may have already been initialized by the container) before
+        the property is set. All references are ultimately just a reference to
+        another object, but there are 3 variations on how the id/name of the
+        other object may be specified, which determines how scoping and
+        validation is handled.</para>
+
+        <para>Specifying the target object by using the
+        <literal>object</literal> attribute of the <literal>ref</literal> tag
+        is the most general form, and will allow creating a reference to any
+        object in the same <classname>IObjectFactory</classname> /
+        <classname>IApplicationContext</classname> (whether or not in the same
+        XML file), or parent <classname>IObjectFactory</classname> /
+        <classname>IApplicationContext</classname>. The value of the
+        <literal>object</literal> attribute may be the same as either the
+        <literal>id</literal> attribute of the target object, or one of the
+        values in the <literal>name</literal> attribute of the target
+        object.<programlisting>&lt;ref object="someObject"/&gt;</programlisting></para>
+
+        <para>Specifying the target object by using the
+        <literal>local</literal> attribute leverages the ability of the XML
+        parser to validate XML id references within the same file. The value
+        of the <literal>local</literal> attribute must be the same as the
+        <literal>id</literal> attribute of the target object. The XML parser
+        will issue an error if no matching element is found in the same file.
+        As such, using the local variant is the best choice (in order to know
+        about errors are early as possible) if the target object is in the
+        same XML file.<programlisting>&lt;ref local="someObject"/&gt;</programlisting></para>
+
+        <para>Specifying the target object by using the
+        <literal>parent</literal> attribute allows a reference to be created
+        to an object that is in a parent <classname>IObjectFactory</classname>
+        (or<classname>IApplicationContext</classname>) of the current
+        <classname>IObjectFactory</classname> (or
+        <classname>IApplicationContext</classname>). The value of the
+        <literal>parent</literal> attribute may be the same as either the
+        <literal>id</literal> attribute of the target object, or one of the
+        values in the <literal>name</literal> attribute of the target object,
+        and the target object <emphasis role="bold">must</emphasis> be in a
+        parent <classname>IObjectFactory</classname> or
+        <classname>IApplicationContext</classname> of the current one. The
+        main use of this object reference variant is when there is a need to
+        wrap an existing object in a parent context with some sort of proxy
+        (which may have the same name as the parent), and needs the original
+        object so it may wrap it.</para>
+
+        <para>
+          <programlisting>&lt;ref parent="someObject"/&gt;</programlisting>
+        </para>
+      </sect3>
+
+      <sect3 id="objects-inline-object">
+        <title>Inline objects</title>
+
+        <para>An <literal>object</literal> element inside the
+        <literal>property</literal> element is used to define an object value
+        inline, instead of referring to an object defined elsewhere in the
+        container. The inline object definition does not need to have any id
+        or name defined (indeed, if any are defined, they will be ignored).
+        <programlisting>&lt;object id="outer" type="..."&gt;
+
+  &lt;!-- Instead of using a reference to target, just use an inner object --&gt; 
+
+  &lt;property name="target"&gt; 
+    &lt;object type="ExampleApp.Person, ExampleApp"&gt; 
+      &lt;property name="name" value="Tony"/&gt; 
+      &lt;property name="age" value="51"/&gt; 
+    &lt;/object&gt;
+  &lt;/property&gt;
+&lt;/object&gt;</programlisting></para>
+      </sect3>
+
+      <sect3 id="objects-collections-values">
+        <title>Setting collection values</title>
+
+        <para>The <literal>list</literal>, <literal>set</literal>,
+        <literal>name-values</literal> and <literal>dictionary</literal>
+        elements allow properties and arguments of the type
+        <literal>IList</literal>, <literal>ISet</literal>,
+        <literal>NameValueCollection</literal> and
+        <literal>IDictionary</literal>, respectively, to be defined and set.
+        <programlisting format="linespecific" xml:space="preserve">&lt;objects xmlns="http://www.springframework.net"&gt;
+  &lt;object id="moreComplexObject" type="Example.ComplexObject"&gt;
+      &lt;!--
+      results in a call to the setter of the SomeList (System.Collections.IList) property
+      --&gt;
+      &lt;property name="SomeList"&gt;
+          &lt;list&gt;
+              &lt;value&gt;a list element followed by a reference&lt;/value&gt;
+              &lt;ref object="myConnection"/&gt;
+          &lt;/list&gt;
+      &lt;/property&gt;
+      &lt;!--
+      results in a call to the setter of the SomeDictionary (System.Collections.IDictionary) property
+      --&gt;
+      &lt;property name="SomeDictionary"&gt;
+          &lt;dictionary&gt;
+              &lt;entry key="a string =&gt; string entry" value="just some string"/&gt;
+              &lt;entry key-ref="myKeyObject" value-ref="myConnection"/&gt;
+          &lt;/dictionary&gt;
+      &lt;/property&gt;
+      &lt;!--
+      results in a call to the setter of the SomeNameValue (System.Collections.NameValueCollection) property
+      --&gt;
+      &lt;property name="SomeNameValue"&gt;
+          &lt;name-values&gt;
+              &lt;add key="HarryPotter" value="The magic property"/&gt;
+              &lt;add key="JerrySeinfeld" value="The funny (to Americans) property"/&gt;
+          &lt;/name-values&gt;
+      &lt;/property&gt;
+      &lt;!-- 
+      results in a call to the setter of the SomeSet (Spring.Collections.ISet) property 
+      --&gt;
+      &lt;property name="someSet"&gt;
+          &lt;set&gt;
+              &lt;value&gt;just some string&lt;/value&gt;
+              &lt;ref object="myConnection"/&gt;
+          &lt;/set&gt;
+      &lt;/property&gt;
+  &lt;/object&gt;
+&lt;/objects&gt;</programlisting></para>
+
+        <para>Many classes in the BCL expose only read-only properties for
+        collection classes. When Spring.NET encounters a read-only collection,
+        it will configure the collection by using the getter property to
+        obtain a reference to the collection class and then proceed to add the
+        additional elements to the existing collection. This results in an
+        additive behavior for collection properties that are exposed in this
+        manner.</para>
+
+        <para>
+          <emphasis>Note that the value of a Dictionary entry, or a set value,
+          can also again be any of the elements:</emphasis>
+
+          <programlisting>(object | ref | idref | expression | list | set | dictionary |
+      name-values | value | null)</programlisting>
+        </para>
+
+        <para>The shortcut forms for value and references are useful to reduce
+        XML verbosity when setting collection properties. See <xref
+        linkend="objects-shortcutforms" /> for more information.</para>
+      </sect3>
+
+      <sect3 id="objects-generic-collections-values">
+        <title>Setting generic collection values</title>
+
+        <para>Spring supports setting values for classes that expose
+        properties based on the generic collection interfaces
+        <classname>IList&lt;T&gt;</classname> and
+        <classname>IDictionary&lt;TKey, TValue&gt;</classname>. The type
+        parameter for these collections is specified by using the XML
+        attribute <literal>element-type</literal> for
+        <classname>IList&lt;T&gt;</classname> and the XML attributes
+        <literal>key-type</literal> and <literal>value-type</literal> for
+        <classname>IDictionary&lt;TKey, TValue&gt;</classname>. The values of
+        the collection are automaticaly converted from a string to the
+        appropriate type. If you are using your own user-defined type as a
+        generic type parameter you will likely need to register a custom type
+        converter. Refer to <xref linkend="objects-type-conversion" /> for
+        more information. The implementations of
+        <classname>IList&lt;T&gt;</classname> and
+        <classname>IDictionary&lt;TKey, TValue&gt;</classname> that is created
+        are <classname>System.Collections.Generic.List</classname> and
+        <classname>System.Collections.Generic.Dictionary</classname>.</para>
+
+        <para>The following class represents a lottery ticket and demonstrates
+        how to set the values of a generic IList. <programlisting>public class LotteryTicket { 
+
+  List&lt;int&gt; list;
+
+  DateTime date; 
+
+  public List&lt;int&gt; Numbers { 
+    set { list = value; }
+    get { return list; } 
+  }
+
+  public DateTime Date { 
+    get { return date; } 
+    set { date = value; } 
+  } 
+}</programlisting> The XML fragment that can be used to configure this class
+        is shown below <programlisting>&lt;object id="MyLotteryTicket" type="GenericsPlay.Lottery.LotteryTicket, GenericsPlay"&gt;
+  &lt;property name="Numbers"&gt; 
+    &lt;list element-type="int"&gt; 
+      &lt;value&gt;11&lt;/value&gt;
+      &lt;value&gt;21&lt;/value&gt; 
+      &lt;value&gt;23&lt;/value&gt;
+      &lt;value&gt;34&lt;/value&gt; 
+      &lt;value&gt;36&lt;/value&gt;
+      &lt;value&gt;38&lt;/value&gt; 
+    &lt;/list&gt; 
+  &lt;/property&gt;
+  &lt;property name="Date" value="4/16/2006"/&gt;
+&lt;/object&gt;</programlisting></para>
+
+        <para>The following shows the definition of a more complex class that
+        demonstrates the use of generics using the
+        <classname>Spring.Expressions.IExpression</classname> interface as the
+        generic type parameter for the IList element-type and the value-type
+        for IDictionary. <classname>Spring.Expressions.IExpression</classname>
+        has an associated type converter,
+        <classname>Spring.Objects.TypeConverters.ExpressionConverter</classname>
+        that is already pre-registered with Spring. <programlisting>    public class GenericExpressionHolder
+    {
+        private System.Collections.Generic.IList&lt;IExpression&gt; expressionsList;
+
+        private System.Collections.Generic.IDictionary&lt;string,IExpression&gt; expressionsDictionary;
+
+        public System.Collections.Generic.IList&lt;IExpression&gt; ExpressionsList
+        {
+            set { this.expressionsList = value; }
+        }
+
+        public System.Collections.Generic.IDictionary&lt;string, IExpression&gt; ExpressionsDictionary
+        {
+            set { this.expressionsDictionary = value; }
+        }
+
+        public IExpression this[int index]
+        {
+            get
+            {
+                return this.expressionsList[index];
+            }
+        }
+
+        public IExpression this[string key]
+        {
+            get { return this.expressionsDictionary[key]; }
+        }
+    }</programlisting> An example XML configuration of this class is shown
+        below <programlisting>&lt;object id="genericExpressionHolder"
+    type="Spring.Objects.Factory.Xml.GenericExpressionHolder,
+    Spring.Core.Tests"&gt;
+    &lt;property name="ExpressionsList"&gt;
+        &lt;list element-type="Spring.Expressions.IExpression, Spring.Core"&gt;
+            &lt;value&gt;1 + 1&lt;/value&gt;
+            &lt;value&gt;date('1856-7-9').Month&lt;/value&gt;
+            &lt;value&gt;'Nikola Tesla'.ToUpper()&lt;/value&gt;
+            &lt;value&gt;DateTime.Today &gt; date('1856-7-9')&lt;/value&gt;
+        &lt;/list&gt;
+    &lt;/property&gt;
+    &lt;property name="ExpressionsDictionary"&gt;
+        &lt;dictionary key-type="string" value-type="Spring.Expressions.IExpression, Spring.Core"&gt;
+            &lt;entry key="zero"&gt;
+                &lt;value&gt;1 + 1&lt;/value&gt;
+            &lt;/entry&gt;
+            &lt;entry key="one"&gt;
+                &lt;value&gt;date('1856-7-9').Month&lt;/value&gt;
+            &lt;/entry&gt;
+            &lt;entry key="two"&gt;
+                &lt;value&gt;'Nikola Tesla'.ToUpper()&lt;/value&gt;
+            &lt;/entry&gt;
+            &lt;entry key="three"&gt;
+                &lt;value&gt;DateTime.Today &gt; date('1856-7-9')&lt;/value&gt;
+            &lt;/entry&gt;
+        &lt;/dictionary&gt;
+    &lt;/property&gt;
+&lt;/object&gt;</programlisting></para>
+      </sect3>
+
+      <sect3 id="objects-null-values">
+        <title>Setting null values</title>
+
+        <para>The <literal>&lt;null&gt;</literal> element is used to handle
+        <literal>null</literal> values. Spring.NET treats empty arguments for
+        properties and constructor arguments as empty
+        <classname>string</classname> instances. The following configuration
+        demonstrates this behaviour...</para>
+
+        <programlisting>&lt;object type="Examples.ExampleObject, ExamplesLibrary"&gt; 
+  &lt;property name="email"&gt;&lt;value&gt;&lt;/value&gt;&lt;/property&gt;
+
+  &lt;!-- equivalent, using value attribute as opposed to nested &lt;value/&gt; element... 
+  &lt;property name="email" value=""/&gt; 
+&lt;/object&gt;</programlisting>
+
+        <para>This results in the email property being set to the empty string
+        value (<literal>""</literal>), in much the same way as can be seen in
+        the following snippet of C# code... <programlisting>exampleObject.Email = "";</programlisting>
+        The special <literal>&lt;null/&gt;</literal> element may be used to
+        indicate a <literal>null</literal> value; to wit...</para>
+
+        <programlisting>&lt;object type="Examples.ExampleObject, ExamplesLibrary"&gt; 
+  &lt;property name="email"&gt;&lt;null/&gt;&lt;/property&gt;
+&lt;/object&gt;</programlisting>
+
+        <para>This results in the email property being set to
+        <literal>null</literal>, again in much the same way as can be seen in
+        the following snippet of C# code... <programlisting>exampleObject.Email = null;</programlisting></para>
+      </sect3>
+
+      <sect3>
+        <title>Setting indexer properties</title>
+
+        <para>An indexer lets you set and get values from a collection using a
+        familiar bracket <literal>[]</literal> notation. Spring's XML
+        configuration supports the setting of indexer properties. Overloaded
+        indexers as well as multiparameter indexers are also supported. The
+        property expression parser described in <xref linkend="expressions" />
+        is used to perform the type conversion of the indexer name argument
+        from a string in the XML file to a matching target type. As an example
+        consider the following class <programlisting>public class Person
+{
+    private IList favoriteNames = new ArrayList();
+
+    private IDictionary properties = new Hashtable();
+
+    public Person()
+    {
+        favoriteNames.Add("p1");
+        favoriteNames.Add("p2");
+    }
+
+    public string this[int index]
+    {
+        get { return (string) favoriteNames[index]; }
+        set { favoriteNames[index] = value; }
+    }
+
+    public string this[string keyName]
+    {
+        get { return (string) properties[keyName]; }
+        set { properties.Add(keyName, value); }
+    }
+}</programlisting> The XML configuration snippet to populate this object with
+        data is shown below <programlisting>&lt;object id="person" type="Test.Objects.Person, Test.Objects"&gt;
+    &lt;property name="[0]" value="Master Shake"/&gt;
+    &lt;property name="['one']" value="uno"/&gt;
+&lt;/object&gt;</programlisting></para>
+
+        <note>The use of the property expression parser in Release 1.0.2
+        changed how you configure indexer properties. The following section
+        describes this usage. <para> The older style configuration uses the
+        following syntax <programlisting>&lt;object id="objectWithIndexer" type="Spring.Objects.TestObject, Spring.Core.Tests"&gt;
+    &lt;property name="Item[0]" value="my string value"/&gt;
+&lt;/object&gt;</programlisting> You can also change the name used to identify
+        the indexer by adorning your indexer method declaration with the
+        attribute <literal>[IndexerName("MyItemName")]</literal>. You would
+        then use the string <literal>MyItemName[0]</literal> to configure the
+        first element of that indexer. </para> <para>There are some
+        limitations to be aware in the older indexer configuration. The
+        indexer can only be of a single parameter that is convertible from a
+        string to the indexer parameter type. Also, multiple indexers are not
+        supported. You can get around that last limitation currently if you
+        use the IndexerName attribute. </para></note>
+      </sect3>
+
+      <sect3 id="objects-shortcutforms">
+        <title>Value and ref shortcut forms</title>
+
+        <para>There are also some shortcut forms that are less verbose than
+        using the full <literal>value</literal> and <literal>ref</literal>
+        elements. The <literal>property</literal>,
+        <literal>constructor-arg</literal>, and <literal>entry</literal>
+        elements all support a <literal>value</literal> attribute which may be
+        used instead of embedding a full <literal>value</literal> element.
+        Therefore, the following: <programlisting>&lt;property name="myProperty"&gt;
+      &lt;value&gt;hello&lt;/value&gt;
+&lt;/property&gt;
+
+&lt;constructor-arg&gt; 
+  &lt;value&gt;hello&lt;/value&gt;
+&lt;/constructor-arg&gt; 
+
+&lt;entry key="myKey"&gt;
+  &lt;value&gt;hello&lt;/value&gt;
+&lt;/entry&gt;</programlisting> are equivalent to:<programlisting>&lt;property name="myProperty" value="hello"/&gt;
+
+&lt;constructor-arg value="hello"/&gt; 
+
+&lt;entry key="myKey" value="hello"/&gt;</programlisting> In general, when
+        typing definitions by hand, you will probably prefer to use the less
+        verbose shortcut form.</para>
+
+        <para>The <literal>property</literal> and
+        <literal>constructor-arg</literal> elements support a similar shortcut
+        <literal>ref</literal> attribute which may be used instead of a full
+        nested <literal>ref</literal> element. Therefore, the following...
+        <programlisting>&lt;property name="myProperty"&gt; 
+  &lt;ref object="anotherObject"/&gt;
+&lt;/property&gt;
+
+&lt;constructor-arg index="0"&gt; 
+  &lt;ref object="anotherObject"/&gt; 
+&lt;/constructor-arg&gt;</programlisting> is equivalent to... <programlisting>&lt;property name="myProperty" ref="anotherObject"/&gt;
+
+&lt;constructor-arg index="0" ref="anotherObject"/&gt;</programlisting></para>
+
+        <note>The shortcut form is equivalent to a <literal>&lt;ref
+        object="xxx"&gt;</literal> element; there is no shortcut for either
+        the <literal>&lt;ref local="xxx"&gt;</literal> or <literal>&lt;ref
+        parent="xxx"&gt;</literal> elements. For a local or parent
+        <literal>ref</literal>, you must still use the long form.</note>
+
+        <para>Finally, the entry element allows a shortcut form the specify
+        the key and/or value of a dictionary, in the form of key/key-ref and
+        value/value-ref attributes. Therefore, the following <programlisting>&lt;entry&gt; 
+  &lt;key&gt;
+     &lt;ref object="MyKeyObject"/&gt;
+  &lt;/key&gt; 
+  &lt;ref object="MyValueObject"/&gt; 
+&lt;/entry&gt;</programlisting> Is equivalent to: <programlisting>&lt;entry key-ref="MyKeyObject" value-ref="MyValueObject"/&gt;</programlisting>
+        As mentioned previously, the equivalence is to <literal>&lt;ref
+        object="xxx"&gt;</literal> and not the local or parent forms of object
+        references.</para>
+      </sect3>
+
+      <sect3 id="objects-referencing-compound-properties">
+        <title>Compound property names and Spring expression
+        references</title>
+      </sect3>
+
+      <para>Note that compound or nested property names are perfectly legal
+      when setting object properties. Property names are interpreted using the
+      <link linkend="expressions">Spring Expression Language</link> (SpEL) and
+      therefore can leverage its many features to set property names. For
+      example, in this object definition a simple nested property name is
+      configured</para>
+
+      <programlisting>&lt;object id="foo" type="Spring.Foo, Spring.Foo"&gt; 
+  &lt;property name="bar.baz.name" value="Bingo"/&gt; 
+&lt;/object&gt;</programlisting>
+
+      <para>As an example of some alternative ways to declare the property
+      name, you can use SpEL's support for indexers to configure a Dictionary
+      key value pair as an alternative to the nested
+      <literal>&lt;dictionary&gt;</literal> element. More importantly, you can
+      use the 'expression' element to refer to a Spring expression as the
+      value of the property. Simple examples of this are shown below</para>
+
+      <programlisting>&lt;property name=“minValue� expression=“int.MinValue� /&gt;
+
+&lt;property name=“weekFromToday� expression="DateTime.Today + 7"/&gt;</programlisting>
+
+      <para>Using SpEL's support for method evaluation, you can easily call
+      static method on various helper classes in your XML
+      configuraiton.</para>
+    </sect2>
+
+    <sect2 id="objects-factory-dependson">
+      <title>Using <literal>depends-on</literal></title>
+
+      <para>For most situations, the fact that an object is a dependency of
+      another is expressed by the fact that one object is set as a property of
+      another. This is typically accomploished with the
+      <literal>&lt;ref/&gt;</literal> element in XML-based configuration
+      metadata. For the relatively infrequent situations where dependencies
+      between objects are less direct (for example, when a static initializer
+      in a class needs to be triggered) the '<literal>depends-on</literal>'
+      attribute may be used to explicitly force one or more objects to be
+      initialized before the object using this element is initialized. Find
+      below an example of using the '<literal>depends-on</literal>' attribute
+      to express a dependency on a single object.. <programlisting>&lt;object id="objectOne" type="Examples.ExampleObject, ExamplesLibrary" depends-on="manager"&gt;
+  &lt;property name="manager" ref="manager"/&gt;
+&lt;/object&gt;
+
+&lt;object id="manager" type="Examples.ManagerObject, ExamplesLibrary"/&gt;</programlisting></para>
+
+      <para>If you need to express a dependency on multiple objects, you can
+      supply a list of object names as the value of the
+      '<literal>depends-on</literal>' attribute, with commas, whitespace and
+      semicolons all valid delimiters, like so:</para>
+
+      <programlisting>&lt;object id="objectOne" type="Examples.ExampleObject, ExamplesLibrary" depends-on="manager,accountDao"&gt;
+  &lt;property name="manager" ref="manager" /&gt;
+&lt;/object&gt;
+
+&lt;object id="manager" type="Examples.ManagerObject, ExamplesLibrary" /&gt;
+&lt;object id="accountDao" type="Examples.AdoAccountDao, ExamplesLibrary" /&gt;</programlisting>
+
+      <para><note>
+          <para>The '<literal>depends-on</literal>' attribute and property is
+          used not only to specify an initialization time dependency, but also
+          to specify the corresponding destroy time dependency (in the case of
+          singleton objects only). Dependent objects that are defined in the
+          'depends-on' attribute will be destroyed after the relevant object
+          itself is destroyed. This thus allows you to control shutdown order
+          too</para>
+        </note></para>
+    </sect2>
+
+    <sect2>
+      <title>Lazily-instantiated objects</title>
+
+      <para>The default behavior for
+      <classname>IApplicationContext</classname> implementations is to eagerly
+      pre-instantiate all singleton objects at startup. Pre-instantiation
+      means that an <classname>IApplicationContext</classname> will eagerly
+      create and configure all of its singleton objects as part of its
+      initialization process. Generally this is a good thing, because it means
+      that any errors in the configuration or in the surrounding environment
+      will be discovered immediately (as opposed to possibly hours or even
+      days down the line).</para>
+
+      <para>However, there are times when this behavior is not what is wanted.
+      If you do not want a singleton object to be pre-instantiated when using
+      an <classname>IApplicationContext</classname>, you can selectively
+      control this by marking an object definition as lazy-initialized. A
+      lazily-initialized object indicates to the IoC container whether or not
+      an object instance should be created at startup or when it is first
+      requested.</para>
+
+      <para>When configuring objects via XML, this lazy loading is controlled
+      by the <literal>'lazy-init'</literal>attribute on the
+      <literal>&lt;object/&gt;</literal> element; for example:</para>
+
+      <programlisting>&lt;object id="lazy" type="MyCompany.ExpensiveToCreateObject, MyApp" lazy-init="true"/&gt;
+
+&lt;object name="not.lazy" type="MyCompany.AnotherObject, MyApp"/&gt;</programlisting>
+
+      <para>When the above configuration is consumed by an
+      <classname>IApplicationContext</classname>, the object named
+      <literal>'lazy'</literal> will not be eagerly pre-instantiated when the
+      <classname>IApplicationContext</classname> is starting up, whereas the
+      'not.lazy' object will be eagerly pre-instantiated.</para>
+
+      <para>One thing to understand about lazy-initialization is that even
+      though an object definition may be marked up as being lazy-initialized,
+      if the lazy-initialized object is the dependency of a singleton object
+      that is not lazy-initialized, when the
+      <classname>IApplicationContext</classname> is eagerly pre-instantiating
+      the singleton, it will have to satisfy all of the singletons
+      dependencies, one of which will be the lazy-initialized object! So don't
+      be confused if the IoC container creates one of the objects that you
+      have explicitly configured as lazy-initialized at startup; all that
+      means is that the lazy-initialized object is being injected into a
+      non-lazy-initialized singleton object elsewhere.</para>
+
+      <para>It is also possible to control lazy-initialization at the
+      container level by using the
+      <literal>'default-lazy-init'</literal>attribute on the &lt;objects/&gt;
+      element; for example:</para>
+
+      <programlisting>&lt;objects default-lazy-init="true"&gt;
+  &lt;!-- no objects will be pre-instantiated... --&gt;
+&lt;/objects&gt;</programlisting>
+    </sect2>
+
+    <sect2 id="objects-factory-autowire">
+      <title>Autowiring collaborators</title>
+
+      <para>The Spring container is able to autowire relationships between
+      collaborating objects. This means that it is possible to automatically
+      let Spring resolve collaborators (other objects) for your object by
+      inspecting the contents of the IoC container.. The autowiring
+      functionality has five modes. Autowiring is specified per object and can
+      thus be enabled for some object, while other objects will not be
+      autowired. Using autowiring, it is possible to reduce or eliminate the
+      need to specify properties or constructor arguments, thus saving a
+      significant amount of typing. When using XML-based configuration
+      metadata, the autowire mode for an object definition is specified by
+      using the autowire attribute of the &lt;object/&gt; element. The
+      following values are allowed:</para>
+
+      <para><table frame="all">
+          <title>Autowiring modes</title>
+
+          <tgroup cols="2">
+            <colspec colname="c1" colwidth="1*" />
+
+            <colspec colname="c2" colwidth="5*" />
+
+            <thead>
+              <row>
+                <entry>Mode</entry>
+
+                <entry>Explanation</entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>no</entry>
+
+                <entry>No autowiring at all. This is the default value and you
+                are encouraged not to change this for large applications,
+                since specifying your collaborators explicitly gives you a
+                feeling for what you're actually doing (always a bonus) and is
+                a great way of somewhat documenting the structure of your
+                system.</entry>
+              </row>
+
+              <row>
+                <entry>byName</entry>
+
+                <entry>This option will inspect the objects within the
+                container, and look for an object named exactly the same as
+                the property which needs to be autowired. For example, if you
+                have an object definition that is set to autowire by name, and
+                it contains a <literal>Master</literal> property, Spring.NET
+                will look for an object definition named
+                <literal>Master</literal>, and use it as the value of the
+                <literal>Master</literal> property on your object
+                definition.</entry>
+              </row>
+
+              <row>
+                <entry>byType</entry>
+
+                <entry>This option gives you the ability to resolve
+                collaborators by type instead of by name. Supposing you have
+                an <classname>IObjectDefinition</classname> with a
+                collaborator typed <classname>SqlConnection</classname>,
+                Spring.NET will search the entire object factory for an object
+                definition of type <classname>SqlConnection</classname> and
+                use it as the collaborator. <emphasis>If 0 (zero) or more than
+                1 (one) object definitions of the desired type exist in the
+                container, a failure will be reported and you won't be able to
+                use autowiring for that specific object.</emphasis></entry>
+              </row>
+
+              <row>
+                <entry>constructor</entry>
+
+                <entry>This is analogous to <emphasis>byType</emphasis>, but
+                applies to constructor arguments. If there isn't exactly one
+                object of the constructor argument type in the object factory,
+                a fatal error is raised.</entry>
+              </row>
+
+              <row>
+                <entry>autodetect</entry>
+
+                <entry>Chooses <emphasis>constructor</emphasis> or
+                <emphasis>byType</emphasis> through introspection of the
+                object class. If a default constructor is found,
+                <emphasis>byType</emphasis> gets applied.</entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table></para>
+
+      <para>Note that explicit dependencies in property and constructor-arg
+      settings always override autowiring. Please also note that it is not
+      currently possible to autowire so-called simple properties such as
+      primitives, Strings, and Types (and arrays of such simple properties).
+      (This is by-design and should be considered a feature.) When using
+      either the byType or constructor autowiring mode, it is possible to wire
+      arrays and typed-collections. In such cases all autowire candidates
+      within the container that match the expected type will be provided to
+      satisfy the dependency. Strongly-typed IDictionaries can even be
+      autowired if the expected key type is string. An autowired IDictionary
+      values will consist of all object instances that match the expected
+      type, and the IDictionary's keys will contain the corresponding object
+      names.</para>
+
+      <para>Autowire behavior can be combined with dependency checking, which
+      will be performed after all autowiring has been completed. It is
+      important to understand the various advantages and disadvantages of
+      autowiring. Some advantages of autowiring include:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Autowiring can significantly reduce the volume of
+          configuration required. However, mechanisms such as the use of a
+          object template (discussed elsewhere in this chapter) are also
+          valuable in this regard.</para>
+        </listitem>
+
+        <listitem>
+          <para>Autowiring can cause configuration to keep itself up to date
+          as your objects evolve. For example, if you need to add an
+          additional dependency to a class, that dependency can be satisfied
+          automatically without the need to modify configuration. Thus there
+          may be a strong case for autowiring during development, without
+          ruling out the option of switching to explicit wiring when the code
+          base becomes more stable.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Some disadvantages of autowiring:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Autowiring is more magical than explicit wiring. Although, as
+          noted in the above table, Spring is careful to avoid guessing in
+          case of ambiguity which might have unexpected results, the
+          relationships between your Spring-managed objects are no longer
+          documented explicitly.</para>
+        </listitem>
+
+        <listitem>
+          <para>Wiring information may not be available to tools that may
+          generate documentation from a Spring container.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Another issue to consider when autowiring by type is that multiple
+      object definitions within the container may match the type specified by
+      the setter method or constructor argument to be autowired. For arrays,
+      collections, or IDictionary, this is not necessarily a problem. However
+      for dependencies that expect a single value, this ambiguity will not be
+      arbitrarily resolved. Instead, if no unique object definition is
+      available, an Exception will be thrown.</para>
+
+      <para>When deciding whether to use autowiring, there is no wrong or
+      right answer in all cases. A degree of consistency across a project is
+      best though; for example, if autowiring is not used in general, it might
+      be confusing to developers to use it just to wire one or two object
+      definitions.</para>
+    </sect2>
+
+    <sect2 id="objects-factory-dependencies">
+      <title>Checking for dependencies</title>
+
+      <para>Spring.NET has the ability to try to check for the existence of
+      unresolved dependencies of an object deployed into the container. These
+      are properties of the object, which do not have actual values set for
+      them in the object definition, or alternately provided automatically by
+      the autowiring feature.</para>
+
+      <para>This feature is sometimes useful when you want to ensure that all
+      properties (or all properties of a certain type) are set on an object.
+      Of course, in many cases an object class will have default values for
+      many properties, or some properties do not apply to all usage scenarios,
+      so this feature is of limited use. Dependency checking can also be
+      enabled and disabled per object, just as with the autowiring
+      functionality. The default dependency checking mode is to
+      <emphasis>not</emphasis> check dependencies. Dependency checking can be
+      handled in several different modes. In XML-based configuration, this is
+      specified via the <literal>dependency-check</literal> attribute in an
+      object definition, which may have the following values. <table
+          frame="all">
+          <title>Dependency checking modes</title>
+
+          <tgroup cols="2">
+            <colspec colname="c1" colwidth="1*" />
+
+            <colspec colname="c2" colwidth="5*" />
+
+            <thead>
+              <row>
+                <entry>Mode</entry>
+
+                <entry>Explanation</entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>none</entry>
+
+                <entry>No dependency checking. Properties of the object which
+                have no value specified for them are simply not set.</entry>
+              </row>
+
+              <row>
+                <entry>simple</entry>
+
+                <entry>Dependency checking is done for primitive types and
+                collections (this means everything except
+                collaborators).</entry>
+              </row>
+
+              <row>
+                <entry>object</entry>
+
+                <entry>Dependency checking is done for collaborators
+                only.</entry>
+              </row>
+
+              <row>
+                <entry>all</entry>
+
+                <entry>Dependency checking is done for collaborators,
+                primitive types and collections.</entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table></para>
+    </sect2>
+
+    <sect2 id="objects-method-injection">
+      <title>Method Injection</title>
+
+      <para>For most users, the majority of the objects in the container will
+      be singletons. When a singleton object needs to collaborate with (use)
+      another singleton object, or a non-singleton object needs to collaborate
+      with another non-singleton object, the typical and common approach of
+      handling this dependency (by defining one object to be a property of the
+      other) is quite adequate. There is however a problem when the object
+      lifecycles are different. Consider a singleton object A which needs to
+      use a non-singleton (prototype) object B, perhaps on each method
+      invocation on A. The container will only create the singleton object A
+      once, and thus only get the opportunity to set its properties once.
+      There is no opportunity for the container to provide object A with a new
+      instance of object B every time one is needed.</para>
+
+      <para>One solution to this problem is to forego some inversion of
+      control. Object A can be <link lang=""
+      linkend="objects-factory-aware-objectfactoryaware">made aware of the
+      container</link> by implementing the
+      <classname>IObjectFactoryAware</classname> interface, and <link
+      linkend="objects-factory-client">use programmatic means</link> to ask
+      the container via a <literal>GetObject("B")</literal> call for (a
+      typically new) object B every time it needs it. Find below an admittedly
+      somewhat contrived example of this approach</para>
+
+      <programlisting>using System.Collections;
+using Spring.Objects.Factory;
+
+namespace Fiona.Apple
+{
+    public class CommandManager : IObjectFactoryAware
+    {
+        private IObjectFactory objectFactory;
+
+        public object Process(IDictionary commandState)
+        {
+            // grab a new instance of the appropriate Command
+            Command command = CreateCommand();
+            // set the state on the (hopefully brand new) Command instance
+            command.State = commandState;
+            return command.Execute();
+        }
+
+        // the Command returned here could be an implementation that executes asynchronously, or whatever
+        protected Command CreateCommand()
+        {
+            return (Command) objectFactory.GetObject("command");  // notice the Spring API dependency 
+        }
+
+        public IObjectFactory ObjectFactory
+        {
+            set { objectFactory = value; }
+        }
+    }
+}</programlisting>
+
+      <para>The above example is generally not a desirable solution since the
+      business code is then aware of and coupled to the Spring Framework.
+      Method Injection, a somewhat advanced feature of the Spring IoC
+      container, allows this use case to be handled in a clean fashion.</para>
+
+      <sect3 id="objects-method-injection-lookup">
+        <title>Lookup Method Injection</title>
+
+        <para>Lookup method injection refers to the ability of the container
+        to override <literal>abstract</literal> or concrete methods on
+        <emphasis>container managed objects</emphasis>, to return the result
+        of looking up another named object in the container. The lookup will
+        typically be of a prototype object as in the scenario described above.
+        The Spring framework implements this method injection by a dynamically
+        generating a subclass overriding the method using the classes in the
+        <literal>System.Reflection.Emit</literal> namespace. You can read more
+        about the motivation for Method Injection in <ulink
+        url="http://blog.springframework.com/rod/?p=1">this blog
+        entry</ulink>.</para>
+
+        <para>So if you look at the code from the previous code snipped (the
+        <literal>CommandManager</literal> class), the Spring container is
+        going to dynamically override the implementation of the
+        <literal>CreateCommand()</literal> method. Your
+        <classname>CommandManager</classname> class is not going to have any
+        Spring dependencies, as can be seen in this reworked example
+        below:</para>
+
+        <programlisting>using System.Collections;
+
+namespace Fiona.Apple
+{
+    public abstract class CommandManager
+    {
+
+        public object Process(IDictionary commandState)
+        {
+            Command command = CreateCommand();
+            command.State = commandState;
+            return command.Execute();
+        }
+
+        // okay... but where is the implementation of this method?
+        protected abstract Command CreateCommand();
+    }
+}</programlisting>
+
+        <para>In the client class containing the method to be injected (the
+        CommandManager in this case) the method definition must observe the
+        following form:</para>
+
+        <programlisting>&lt;public|protected&gt; [abstract] &lt;return-type&gt; TheMethodName(no-arguments);</programlisting>
+
+        <para>If the method is <literal>abstract</literal>, the
+        dynamically-generated subclass will implement the method. Otherwise,
+        the dynamically-generated subclass will override the concrete method
+        defined in the original class. Let's look at an example:</para>
+
+        <programlisting>&lt;!-- a stateful object deployed as a prototype (non-singleton) --&gt;
+&lt;object id="command" class="Fiona.Apple.AsyncCommand, Fiona" singleton="false"&gt;
+  &lt;!-- inject dependencies here as required --&gt;
+&lt;/object&gt;
+
+&lt;!-- commandProcessor uses a statefulCommandHelpder --&gt;
+&lt;object id="commandManager" type="Fiona.Apple.CommandManager, Fiona"&gt;
+  &lt;lookup-method name="CreateCommand" object="command"/&gt;
+&lt;/object&gt;</programlisting>
+
+        <para>The object identified as <literal>commandManager</literal> will
+        call its own method <literal>CreateCommand</literal> whenever it needs
+        a new instance of the <literal>command</literal> object. It is
+        important to note that the person deploying the objects must be
+        careful to deploy the <literal>command</literal> object as prototype
+        (if that is actually what is needed). If it is deployed as a <link
+        linkend="objects-factory-scopes-singleton">singleton</link> the same
+        instance of <literal>singleShotHelper</literal> will be returned each
+        time!</para>
+
+        <para>Note that lookup method injection can be combined with
+        Constructor Injection (supplying optional constructor arguments to the
+        object being constructed), and also with Setter Injection (settings
+        properties on the object being constructed).</para>
+      </sect3>
+
+      <sect3 id="objects-method-injection-replacement">
+        <title>Arbitrary method replacement</title>
+
+        <para>A less commonly useful form of method injection than Lookup
+        Method Injection is the ability to replace arbitrary methods in a
+        managed object with another method implementation. Users may safely
+        skip the rest of this section (which describes this somewhat advanced
+        feature), until this functionality is actually needed.</para>
+
+        <para>In an <classname>XmlObjectFactory</classname>, the
+        <literal>replaced-method</literal> element may be used to replace an
+        existing method implementation with another. Consider the following
+        class, with a method <literal>ComputeValue</literal>, which we want to
+        override:</para>
+
+        <programlisting>public class MyValueCalculator {
+
+  public virtual string ComputeValue(string input) {
+    // ... some real code
+  }
+
+  // ... some other methods
+}</programlisting>
+
+        <para>A class implementing the
+        <classname>Spring.Objects.Factory.Support.IMethodReplacer</classname>
+        interface is needed to provide the new (injected) method
+        definition.</para>
+
+        <programlisting>/// &lt;summary&gt;
+/// Meant to be used to override the existing ComputeValue(string)
+/// implementation in MyValueCalculator.
+/// &lt;/summary&gt;
+public class ReplacementComputeValue : IMethodReplacer 
+{
+	public object Implement(object target, MethodInfo method, object[] arguments)
+	{
+		// get the input value, work with it, and return a computed result...
+		string value = (string) arguments[0];
+		// compute...
+		return result;
+	}
+}</programlisting>
+
+        <para>The object definition to deploy the original class and specify
+        the method override would look like this:</para>
+
+        <programlisting>&lt;object id="myValueCalculator" type="Examples.MyValueCalculator, ExampleAssembly"&gt;
+  &lt;!-- arbitrary method replacement --&gt;
+  &lt;replaced-method name="ComputeValue" replacer="replacementComputeValue"&gt;
+    &lt;arg-type match="String"/&gt;
+  &lt;/replaced-method&gt;
+&lt;/object&gt;
+
+&lt;object id="replacementComputeValue" type="Examples.ReplacementComputeValue, ExampleAssembly"/&gt;</programlisting>
+
+        <para>One or more contained <literal>arg-type</literal> elements
+        within the <literal>replaced-method</literal> element may be used to
+        indicate the method signature of the method being overridden. Note
+        that the signature for the arguments is actually only needed in the
+        case that the method is actually overloaded and there are multiple
+        variants within the class. For convenience, the type string for an
+        argument may be a substring of the fully qualified type name. For
+        example, all the following would match
+        <classname>System.String</classname>.</para>
+
+        <programlisting>    System.String
+    String
+    Str</programlisting>
+
+        <para>Since the number of arguments is often enough to distinguish
+        between each possible choice, this shortcut can save a lot of typing,
+        by just using the shortest string which will match an argument.</para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="objects-advancedproperty-setting">
+      <title>Setting a reference using the members of other objects and
+      classes.</title>
+
+      <para>This section details those configuration scenarios that involve
+      the setting of properties and constructor arguments using the members of
+      other objects and classes. This kind of scenario is quite common,
+      especially when dealing with legacy classes that you cannot (or won't)
+      change to accommodate some of Spring.NET's conventions... consider the
+      case of a class that has a constructor argument that can only be
+      calculated by going to say, a database. The
+      <classname>MethodInvokingFactoryObject</classname> handles exactly this
+      scenario ... it will allow you to inject the result of an arbitrary
+      method invocation into a constructor (as an argument) or as the value of
+      a property setter. Similarly,
+      <classname>PropertyRetrievingFactoryObject</classname> and
+      <classname>FieldRetrievingFactoryObject</classname> allow you to
+      retrieve values from another object's property or field value. These
+      classes implement the <classname>IFactoryObject</classname> interface
+      which indicates to Spring.NET that this object is itself a factory and
+      the factories product, not the factory itself, is what will be
+      associated with the object id. Factory objects are discussed further in
+      <xref linkend="objects-factory-lifecycle-factoryobject" /></para>
+
+      <sect3>
+        <title>Setting a reference to the value of property.</title>
+
+        <para>The <classname>PropertyRetrievingFactoryObject</classname> is an
+        <classname>IFactoryObject</classname> that addresses the scenario of
+        setting one of the properties and / or constructor arguments of an
+        object to the value of a property exposed on another object or class.
+        One can use it to get the value of any <emphasis
+        role="bold">public</emphasis> property exposed on either an instance
+        or a class (in the case of a property exposed on a class, the property
+        must obviously be static).</para>
+
+        <para>In the case of a property exposed on an instance, the target
+        object that a <classname>PropertyRetrievingFactoryObject</classname>
+        will evaluate can be either an object instance specified directly
+        inline or a reference to another arbitrary object. In the case of a
+        static property exposed on a class, the target object will be the
+        class (the .NET <classname>System.Type</classname>) exposing the
+        property.</para>
+
+        <para>The result of evaluating the property lookup may then be used in
+        another object definition as a property value or constructor argument.
+        Note that nested properties are supported for both instance and class
+        property lookups. The <classname>IFactoryObject</classname> is
+        discussed more generally in <xref
+        linkend="objects-factory-lifecycle-factoryobject" />.</para>
+
+        <para>Here's an example where a property path is used against another
+        object instance. In this case, an inner object definition is used and
+        the property path is nested, i.e. spouse.age. <programlisting>&lt;object name="person" type="Spring.Objects.TestObject, Spring.Core.Tests"&gt;
+  &lt;property name="age" value="20"/&gt;
+  &lt;property name="spouse"&gt;
+    &lt;object type="Spring.Objects.TestObject, Spring.Core.Tests"&gt;                      
+      &lt;property name="age" value="21"/&gt;
+    &lt;/object&gt;
+  &lt;/property&gt;          
+&lt;/object&gt;
+        
+// will result in 21, which is the value of property 'spouse.age' of object 'person'        
+&lt;object name="theAge" type="Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject, Spring.Core"&gt;
+  &lt;property name="TargetObject" ref="person"/&gt;
+  &lt;property name="TargetProperty" value="spouse.age"/&gt;
+&lt;/object&gt;</programlisting></para>
+
+        <para>An example of using a
+        <classname>PropertyRetrievingFactoryObject</classname> to evaluate a
+        <literal>static</literal> property is shown below.</para>
+
+        <programlisting>&lt;object id="cultureAware" 
+        type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests"&gt;
+  &lt;property name="culture" ref="cultureFactory"/&gt;
+&lt;/object&gt;
+
+&lt;object id="cultureFactory" 
+        type="Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject, Spring.Core"&gt;
+  &lt;property name="StaticProperty"&gt;
+      &lt;value&gt;System.Globalization.CultureInfo.CurrentUICulture, Mscorlib&lt;/value&gt;
+  &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+
+        <para>Similarly, an example showing the use of an instance property is
+        shown below.</para>
+
+        <programlisting>&lt;object id="instancePropertyCultureAware" 
+        type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests"&gt;
+  &lt;property name="Culture" ref="instancePropertyCultureFactory"/&gt;
+&lt;/object&gt;
+
+&lt;object id="instancePropertyCultureFactory" 
+        type="Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject, Spring.Core"&gt;
+  &lt;property name="TargetObject" ref="instancePropertyCultureAwareSource"/&gt;
+  &lt;property name="TargetProperty" value="MyDefaultCulture"/&gt;
+&lt;/object&gt;
+
+&lt;object id="instancePropertyCultureAwareSource" 
+        type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests"/&gt;
+    </programlisting>
+      </sect3>
+
+      <sect3>
+        <title>Setting a reference to the value of field.</title>
+
+        <para>The <classname>FieldRetrievingFactoryObject</classname> class
+        addresses much the same area of concern as the
+        <classname>PropertyRetrievingFactoryObject</classname> described in
+        the previous section. However, as its name might suggest, the
+        <classname>FieldRetrievingFactoryObject</classname> class is concerned
+        with looking up the value of a <emphasis role="bold">public</emphasis>
+        field exposed on either an instance or a class (and similarly, in the
+        case of a field exposed on a class, the field must obviously be
+        static).</para>
+
+        <para>The following example demonstrates using a
+        <classname>FieldRetrievingFactoryObject</classname> to look up the
+        value of a (public, static) field exposed on a class</para>
+
+        <para><programlisting>&lt;object id="withTypesField" 
+        type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests"&gt;
+  &lt;property name="Types" ref="emptyTypesFactory"/&gt;
+&lt;/object&gt;
+
+&lt;object id="emptyTypesFactory" 
+        type="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject, Spring.Core"&gt;
+  &lt;property name="TargetType" value="System.Type, Mscorlib"/&gt;
+    &lt;property name="TargetField" value="EmPTytypeS"/&gt;
+&lt;/object&gt;
+      </programlisting></para>
+
+        <para>The example in the next section demonstrates the look up of a
+        (public) field exposed on an object instance.</para>
+
+        <programlisting>&lt;object id="instanceCultureAware" 
+        type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests"&gt;
+  &lt;property name="Culture" ref="instanceCultureFactory"/&gt;
+&lt;/object&gt;
+
+&lt;object id="instanceCultureFactory"
+  type="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject, Spring.Core"&gt;
+  &lt;property name="TargetObject" ref="instanceCultureAwareSource"/&gt;
+  &lt;property name="TargetField" value="Default"/&gt;
+&lt;/object&gt;
+
+&lt;object id="instanceCultureAwareSource" 
+         type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests"/&gt;
+    </programlisting>
+      </sect3>
+
+      <sect3 id="objects-methodfactory">
+        <title>Setting a property or constructor argument to the return value
+        of a method invocation.</title>
+
+        <para>The <classname>MethodInvokingFactoryObject</classname> rounds
+        out the trio of classes that permit the setting of properties and
+        constructor arguments using the members of other objects and classes.
+        Whereas the <classname>PropertyRetrievingFactoryObject</classname> and
+        <classname>FieldRetrievingFactoryObject</classname> classes dealt with
+        simply looking up and returning the value of property or field on an
+        object or class, the
+        <classname>MethodInvokingFactoryObject</classname> allows one to set a
+        constructor or property to the return value of an arbitrary method
+        invocation,</para>
+
+        <para>The <classname>MethodInvokingFactoryObject</classname> class
+        handles both the case of invoking an (instance) method on another
+        object in the container, and the case of a static method call on an
+        arbitrary class. Additionally, it is sometimes necessary to invoke a
+        method just to perform some sort of initialization.... while the
+        mechanisms for handling object initialization have yet to be
+        introduced (see <xref
+        linkend="objects-factory-lifecycle-initializingobject" />), these
+        mechanisms do not permit any arguments to be passed to any
+        initialization method, and are confined to invoking an initialization
+        method on the object that has just been instantiated by the container.
+        The <classname>MethodInvokingFactoryObject</classname> allows one to
+        invoke pretty much <emphasis role="bold">any</emphasis> method on any
+        object (or class in the case of a static method).</para>
+
+        <para>The following example (in an XML based
+        <classname>IObjectFactory</classname> definition) uses the
+        <classname>MethodInvokingFactoryObject</classname> class to force a
+        call to a static factory method prior to the instantiation of the
+        object...</para>
+
+        <para><programlisting>&lt;object id="force-init"
+  type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core"&gt;
+  &lt;property name="StaticMethod"&gt;
+    &lt;value&gt;ExampleNamespace.ExampleInitializerClass.Initialize&lt;/value&gt;
+  &lt;/property&gt;
+&lt;/object&gt;
+&lt;object id="myService" depends-on="force-init"/&gt;</programlisting> Note
+        that the definition for the <literal>myService</literal> object has
+        used the <literal>depends-on</literal> attribute to refer to the
+        <literal>force-init</literal> object, which will force the
+        initialization of the <literal>force-init</literal> object first (and
+        thus the calling of its configured <literal>StaticMethod</literal>
+        static initializer method, when <literal>myService</literal> is first
+        initialized. Please note that in order to effect this initialization,
+        the <classname>MethodInvokingFactoryObject</classname> object
+        <emphasis role="bold">must</emphasis> be operating in
+        <literal>singleton</literal> mode (the default.. see the next
+        paragraph).</para>
+
+        <para>Note that since this class is expected to be used primarily for
+        accessing factory methods, this factory defaults to operating in
+        <literal>singleton</literal> mode. As such, as soon as all of the
+        properties for a <classname>MethodInvokingFactoryObject</classname>
+        object have been set, and if the
+        <classname>MethodInvokingFactoryObject</classname> object is still in
+        <literal>singleton</literal> mode, the method will be invoked
+        immediately and the return value cached for later access. The first
+        request by the container for the factory to produce an object will
+        cause the factory to return the cached return value for the current
+        request (and all subsequent requests). The
+        <methodname>IsSingleton</methodname> property may be set to false, to
+        cause this factory to invoke the target method each time it is asked
+        for an object (in this case there is obviously no caching of the
+        return value).</para>
+
+        <para>A static target method may be specified by setting the
+        <methodname>targetMethod</methodname> property to a string
+        representing the static method name, with
+        <methodname>TargetType</methodname> specifying the
+        <classname>Type</classname> that the static method is defined on.
+        Alternatively, a target instance method may be specified, by setting
+        the <methodname>TargetObject</methodname> property to the name of
+        another Spring.NET managed object definition (the target object), and
+        the <methodname>TargetMethod</methodname> property to the name of the
+        method to call on that target object.</para>
+
+        <para>Arguments for the method invocation may be specified in two ways
+        (or even a mixture of both)... the first involves setting the
+        <methodname>Arguments</methodname> property to the list of arguments
+        for the method that is to be invoked. Note that the ordering of these
+        arguments is significant... the order of the values passed to the
+        <methodname>Arguments</methodname> property must be the same as the
+        order of the arguments defined on the method signature, including the
+        argument <classname>Type</classname>. This is shown in the example
+        below <programlisting>&lt;object id="myObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core"&gt;
+  &lt;property name="TargetType" value="Whatever.MyClassFactory, MyAssembly"/&gt;
+  &lt;property name="TargetMethod" value="GetInstance"/&gt;
+  
+  &lt;!-- the ordering of arguments is significant --&gt;
+  &lt;property name="Arguments"&gt;
+    &lt;list&gt;
+      &lt;value&gt;1st&lt;/value&gt;
+      &lt;value&gt;2nd&lt;/value&gt;
+      &lt;value&gt;and 3rd arguments&lt;/value&gt;
+      &lt;!-- automatic Type-conversion will be performed prior to invoking the method --&gt;
+    &lt;/list&gt;
+  &lt;/property&gt;
+&lt;/object&gt;</programlisting></para>
+
+        <para>The second way involves passing an arguments dictionary to the
+        <methodname>NamedArguments</methodname> property... this dictionary
+        maps argument names (<classname>String</classname>s) to argument
+        values (any object). The argument names are not case-sensitive, and
+        order is (obviously) not significant (since dictionaries by definition
+        do not have an order). This is shown in the example below
+        <programlisting>&lt;object id="myObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core"&gt;
+  &lt;property name="TargetObject"&gt;
+    &lt;object type="Whatever.MyClassFactory, MyAssembly"/&gt;
+  &lt;/property&gt;
+  &lt;property name="TargetMethod" value="Execute"/&gt;
+  
+  &lt;!-- the ordering of named arguments is not significant --&gt;
+  &lt;property name="NamedArguments"&gt;
+    &lt;dictionary&gt;
+      &lt;entry key="argumentName"&gt;&lt;value&gt;1st&lt;/value&gt;&lt;/entry&gt;
+      &lt;entry key="finalArgumentName"&gt;&lt;value&gt;and 3rd arguments&lt;/value&gt;&lt;/entry&gt;
+      &lt;entry key="anotherArgumentName"&gt;&lt;value&gt;2nd&lt;/value&gt;&lt;/entry&gt;
+    &lt;/dictionary&gt;
+  &lt;/property&gt;
+&lt;/object&gt;</programlisting></para>
+
+        <para>The following example shows how use
+        <classname>MethodInvokingFactoryObject</classname> to call an instance
+        method.<programlisting>&lt;object id="myMethodObject" type="Whatever.MyClassFactory, MyAssembly" /&gt;
+
+&lt;object id="myObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core"&gt;
+  &lt;property name="TargetObject" ref="myMethodObject"/&gt;
+  &lt;property name="TargetMethod" value="Execute"/&gt;
+&lt;/object&gt;</programlisting> The above example could also have been
+        written using an anonymous inner object definition... if the object on
+        which the method is to be invoked is not going to be used outside of
+        the factory object definition, then this is the preferred idiom
+        because it limits the scope of the object on which the method is to be
+        invoked to the surrounding factory object.</para>
+
+        <para>Finally, if you want to use
+        <classname>MethodInvokingFactoryObject</classname> in conjunction with
+        a method that has a variable length argument list, then please note
+        that the variable arguments need to be passed (and configured) as a
+        <emphasis>list</emphasis>. Let us consider the following method
+        definition that uses the <classname>params</classname> keyword (in
+        C#), and its attendant (XML) configuration... <programlisting>[C#]
+public class MyClassFactory
+{
+    public object CreateObject(Type objectType, params string[] arguments)
+    {
+        return ... // implementation elided for clarity...
+    }
+}</programlisting> <programlisting>&lt;object id="myMethodObject" type="Whatever.MyClassFactory, MyAssembly" /&gt;
+				
+&lt;object id="paramsMethodObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core"&gt;
+  &lt;property name="TargetObject" ref="myMethodObject"/&gt;
+  &lt;property name="TargetMethod" value="CreateObject"/&gt;
+  &lt;property name="Arguments"&gt;
+    &lt;list&gt;
+      &lt;value&gt;System.String&lt;/value&gt;
+      &lt;!-- here is the 'params string[] arguments' --&gt;
+      &lt;list&gt;
+        &lt;value&gt;1st&lt;/value&gt;
+        &lt;value&gt;2nd&lt;/value&gt;
+      &lt;/list&gt;
+    &lt;/list&gt;
+&lt;/object&gt;</programlisting></para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="objects-objectfactories">
+      <title>Provided IFactoryObject implementations</title>
+
+      <para>In addition to
+      <classname>PropertyRetrievingFactoryObject</classname>,
+      <classname>MethodInvokingFactoryObject</classname>, and
+      <classname>FieldRetrievingFactoryObject </classname> Spring.NET comes
+      with other useful implementations of the
+      <classname>IFactoryObject</classname> interface. These are discussed
+      below.</para>
+
+      <sect3 id="objects-objectfactories-log4net">
+        <title>Common logging</title>
+
+        <para>The <classname>LogFactoryObject</classname> is useful when you
+        would like to share a Common.Logging log object across a number of
+        classes instead of creating a logging instance per class or class
+        hierarchy. Information on the Common.Logging project can be found
+        <ulink url="http://netcommon.sourceforge.net/">here</ulink>. In the
+        example shown below the same logging instance, with a logging category
+        name of "DAOLogger", is used in both the SimpleAccountDao and
+        SimpleProductDao data access objects. <programlisting>&lt;objects xmlns="http://www.springframework.net" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://www.springframework.net
+         http://www.springframework.net/xsd/spring-objects.xsd" &gt;
+
+    &lt;object name="daoLogger" type="Spring.Objects.Factory.Config.LogFactoryObject, Spring.Core"&gt;
+      &lt;property name="logName" value="DAOLogger"/&gt;
+    &lt;/object&gt;
+        
+    &lt;object name="productDao" type="PropPlayApp.SimpleProductDao, PropPlayApp "&gt;
+      &lt;property name="maxResults" value="100"/&gt;
+      &lt;property name="dbConnection" ref="myConnection"/&gt;
+      &lt;property name="log" ref="daoLogger"/&gt;
+    &lt;/object&gt;
+
+    &lt;object name="accountDao" type="PropPlayApp.SimpleAccountDao, PropPlayApp "&gt;
+      &lt;property name="maxResults" value="100"/&gt;
+      &lt;property name="dbConnection" ref="myConnection"/&gt;
+      &lt;property name="log" ref="daoLogger"/&gt;
+    &lt;/object&gt;
+    
+    &lt;object name="myConnection" type="System.Data.Odbc.OdbcConnection, System.Data"&gt; 
+      &lt;property name="connectionstring" value="dsn=MyDSN;uid=sa;pwd=myPassword;"/&gt; 
+    &lt;/object&gt; 
+    
+&lt;/objects&gt;</programlisting></para>
+      </sect3>
+    </sect2>
+  </sect1>
+
+  <sect1>
+    <title>Object Scopes</title>
+
+    <para>When you create a object definition what you are actually creating
+    is a recipe for creating actual instances of the class defined by that
+    object definition. The idea that a object definition is a recipe is
+    important, because it means that, just like a class, you can potentially
+    have many object instances created from a single recipe.</para>
+
+    <para>You can control not only the various dependencies and configuration
+    values that are to be plugged into an object that is created from a
+    particular object definition, but also the scope of the objects created
+    from a particular object definition. This approach is very powerful and
+    gives you the flexibility to choose the scope of the objects you create
+    through configuration instead of having to 'bake in' the scope of an
+    object at the .NET class level. Objects can be defined to be deployed in
+    one of a number of scopes: out of the box, the Spring Framework supports
+    exactly five scopes (of which three are available only if you are using a
+    web-aware ApplicationContext).</para>
+
+    <para>The scopes supported out of the box are listed below:</para>
+
+    <table frame="all">
+      <title>Object Scopes</title>
+
+      <tgroup cols="2">
+        <colspec colname="c1" colwidth="2*" />
+
+        <colspec colname="c2" colwidth="4*" />
+
+        <thead>
+          <row>
+            <entry>Scope</entry>
+
+            <entry>Description</entry>
+          </row>
+        </thead>
+
+        <tbody>
+          <row>
+            <entry>singleton</entry>
+
+            <entry>Scopes a single object definition to a single object
+            instance per Spring IoC container.</entry>
+          </row>
+
+          <row>
+            <entry>prototype</entry>
+
+            <entry>Scopes a single object definition to any number of object
+            instances.</entry>
+          </row>
+
+          <row>
+            <entry>request</entry>
+
+            <entry>Scopes a single object definition to the lifecycle of a
+            single HTTP request; that is each and every HTTP request will have
+            its own instance of an object created off the back of a single
+            object definition. Only valid in the context of a web-aware Spring
+            ApplicationContext.</entry>
+          </row>
+
+          <row>
+            <entry>session</entry>
+
+            <entry>Scopes a single object definition to the lifecycle of a
+            HTTP Session. Only valid in the context of a web-aware Spring
+            ApplicationContext.</entry>
+          </row>
+
+          <row>
+            <entry>application</entry>
+
+            <entry>Scopes a single object definition to the lifecycle of a web
+            application. Only valid in the context of a web-aware Spring
+            ApplicationContext.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+    <sect2 id="objects-factory-scopes-singleton">
+      <title>The singleton scope</title>
+
+      <para>When an object is a singleton, only one shared instance of the
+      object will be managed, and all requests for objects with an id or ids
+      matching that object definition will result in that one specific object
+      instance being returned by the Spring container.</para>
+
+      <para>To put it another way, when you define an object definition and it
+      is scoped as a singleton, then the Spring IoC container will create
+      exactly one instance of the object defined by that object definition.
+      This single instance will be stored in a cache of such singleton object,
+      and all subsequent requests and references for that named object will
+      result in the cached object being returned.</para>
+
+      <para>Please be aware that Spring's concept of a singleton object is
+      quite different from the Singleton pattern as defined in the seminal
+      Gang of Four (GoF) patterns book. The GoF Singleton hard codes the scope
+      of an object such that one and only one instance of a particular class
+      will ever be created per ApplicationDomain. The scope of the Spring
+      singleton is best described as per container and per object. This means
+      that if you define one object for a particular class in a single Spring
+      container, then the Spring container will create one and only one
+      instance of the class defined by that object definition. The singleton
+      scope is the default scope in Spring. To define an object as a singleton
+      in XML, you would write configuration like so:</para>
+
+      <programlisting>&lt;object id="accountService" type="MyApp.DefaultAccountService, MyApp"/&gt;
+
+&lt;!-- the following is equivalent, though redundant (singleton scope is the default) --&gt;
+&lt;object id="accountService" type="MyApp.DefaultAccountService, MyApp" singleton="true"/&gt;
+
+</programlisting>
+    </sect2>
+
+    <sect2 id="objects-factory-scopes-prototype">
+      <title>The prototype scope</title>
+
+      <para>The non-singleton, prototype scope of object deployment results in
+      the creation of a new object instance every time a request for that
+      specific object is made (that is, it is injected into another object or
+      it is requested via a programmatic GetObject() method call on the
+      container). As a rule of thumb, you should use the prototype scope for
+      all objects that are stateful, while the singleton scope should be used
+      for stateless objects.</para>
+
+      <para>To define an object as a prototype in XML, you would write
+      configuration like so:</para>
+
+      <programlisting>&lt;object id="exampleObject" type="Examples.ExampleObject, ExamplesLibrary" singleton="false"/&gt;</programlisting>
+
+      <para>There is one quite important thing to be aware of when deploying
+      an object in the prototype scope, in that the lifecycle of the object
+      changes slightly. Spring does not manage the complete lifecycle of a
+      prototype object: the container instantiates, configures, decorates and
+      otherwise assembles a prototype object, hands it to the client and then
+      has no further knowledge of that prototype instance. This means that
+      while <emphasis>initialization</emphasis> lifecycle callback methods
+      will be called on all objects regardless of scope, in the case of
+      prototypes, any configured <emphasis>destruction</emphasis> lifecycle
+      callbacks will <emphasis>not</emphasis> be called. It is the
+      responsibility of the client code to clean up prototype scoped objects
+      and release any expensive resources that the prototype object(s) are
+      holding onto. (One possible way to get the Spring container to release
+      resources used by singleton-scoped objects is through the use of a
+      custom object post processor which would hold a reference to the objects
+      that need to be cleaned up.)</para>
+
+      <para>In some respects, you can think of the Spring containers role when
+      talking about a prototype-scoped object as somewhat of a replacement for
+      the C# 'new' operator. All lifecycle aspects past that point have to be
+      handled by the client. (The lifecycle of a object in the Spring
+      container is further described in the section entitled “Lifecycle
+      callbacks�.)</para>
+    </sect2>
+
+    <sect2 id="objects-factory-scopes-sing-prot-interaction">
+      <title>Singleton objecgts with prototype-object dependencies</title>
+
+      <para>When using singleton-scoped objects that have dependencies on
+      objects that are scoped as prototypes, please be aware that dependencies
+      are resolved at instantiation time. This means that if you dependency
+      inject a prototype-scoped object into a singleton-scoped object, a brand
+      new prototype object will be instantiated and then dependency injected
+      into the singleton object... but that is all. That exact same prototype
+      instance will be the sole instance that is ever supplied to the
+      singleton-scoped object, which is fine if that is what you want.</para>
+
+      <para>However, sometimes what you actually want is for the
+      singleton-scoped object to be able to acquire a brand new instance of
+      the prototype-scoped object again and again and again at runtime. In
+      that case it is no use just dependency injecting a prototype-scoped
+      object into your singleton object, because as explained above, that only
+      happens once when the Spring container is instantiating the singleton
+      object and resolving and injecting its dependencies. If you are in the
+      scenario where you need to get a brand new instance of a (prototype)
+      object again and again and again at runtime, you are referred to the
+      section entitled “Method Injection�.</para>
+    </sect2>
+
+    <sect2>
+      <title>The other scopes</title>
+
+      <para>The other scopes, namely request, session, and application are for
+      use only in web-based applications. Please refer to the <link
+      linkend="web-objectscope">web documentation on object scopes</link> for
+      more information.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="objects-type-conversion">
+    <title>Type conversion</title>
+
+    <para>Type converters are responsible for converting objects from one type
+    to another. When using the XML based file to configure the IoC container,
+    string based property values are converted to the target property type.
+    Spring will rely on the standard .NET support for type conversion unless
+    an alternative <classname>TypeConverter</classname> is registered for a
+    given type. How to register custom TypeConverters will be described
+    shortly. As a reminder, the standard .NET type converter support works by
+    associating a <classname>TypeConverter</classname> attribute with the
+    class definition by passing the type of the converter as an attribute
+    argument. <footnote>
+        <para>More information about creating custom
+        <literal>TypeConverter</literal> implementations can be found online
+        at Microsoft's MSDN website, by searching for <emphasis>Implementing a
+        Type Converter</emphasis>.</para>
+      </footnote> For example, an abbreviated class definition for the BCL
+    type <classname>Font</classname> is shown below. <programlisting>[Serializable, TypeConverter(typeof(FontConverter)), ...]
+public sealed class Font : MarshalByRefObject, ICloneable, ISerializable, IDisposable
+{
+  // Methods
+  
+  ... etc ..
+}</programlisting></para>
+
+    <sect2 id="objects-type-conversion-enums">
+      <title>Type Conversion for Enumerations</title>
+
+      <para>The default type converter for enumerations is the
+      <classname>System.ComponentModel.EnumConverter</classname> class. To
+      specify the value for an enumerated property, simply use the name of the
+      property. For example the <classname>TestObject</classname> class has a
+      property of the enumerated type <classname>FileMode</classname>. One of
+      the values for this enumeration is named <literal>Create</literal>. The
+      following XML fragment shows how to configure this property</para>
+
+      <programlisting>&lt;object id="rod" type="Spring.Objects.TestObject, Spring.Core.Tests"&gt;
+  &lt;property name="name" value="Rod"/&gt;
+  &lt;property name="FileMode" value="Create"/&gt;
+&lt;/object&gt;</programlisting>
+    </sect2>
+
+    <sect2 id="objects-type-conversion-builtin">
+      <title>Built-in TypeConverters</title>
+
+      <para>Spring.NET pre-registers a number of custom
+      <classname>TypeConverter</classname> instances (for example, to convert
+      a type expressed as a string into a real
+      <classname>System.Type</classname> object). Each of those is listed
+      below and they are all located in the
+      <literal>Spring.Objects.TypeConverters</literal> namespace of the
+      <literal>Spring.Core</literal> library.</para>
+
+      <para><table frame="all">
+          <title>Built-in <classname>TypeConverters</classname></title>
+
+          <tgroup cols="2">
+            <colspec colname="c1" colwidth="3*" />
+
+            <colspec colname="c2" colwidth="5*" />
+
+            <thead>
+              <row>
+                <entry>Type</entry>
+
+                <entry>Explanation</entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry><literal>RuntimeTypeConverter</literal></entry>
+
+                <entry>Parses strings representing
+                <classname>System.Types</classname> to actual
+                <classname>System.Types</classname> and the other way
+                around.</entry>
+              </row>
+
+              <row>
+                <entry><literal>FileInfoConverter</literal></entry>
+
+                <entry>Capable of resolving strings to a
+                <classname>System.IO.FileInfo</classname> object.</entry>
+              </row>
+
+              <row>
+                <entry><literal>StringArrayConverter</literal></entry>
+
+                <entry>Capable of resolving a comma-delimited list of strings
+                to a string-array and vice versa.</entry>
+              </row>
+
+              <row>
+                <entry><literal>UriConverter</literal></entry>
+
+                <entry>Capable of resolving a string representation of a Uri
+                to an actual <literal>Uri</literal>-object.</entry>
+              </row>
+
+              <row>
+                <entry><literal>CredentialConverter</literal></entry>
+
+                <entry>Capable of resolving a string representation of a
+                credential for Web client authentication into an instance of
+                <literal>System.Net.ICredentials</literal></entry>
+              </row>
+
+              <row>
+                <entry><literal>StreamConverter</literal></entry>
+
+                <entry>Capable of resolving Spring IResource Uri (string) to
+                its corresponding
+                <literal>InputStream</literal>-object.</entry>
+              </row>
+
+              <row>
+                <entry><literal>ResourceConverter</literal></entry>
+
+                <entry>Capable of resolving Spring IResource Uri (string) to
+                an <literal>IResource</literal> object.</entry>
+              </row>
+
+              <row>
+                <entry><literal>ResourceManagerConverter</literal></entry>
+
+                <entry>Capable of resolving a two part string (resource name,
+                assembly name) to a
+                <classname>System.Resources.ResourceManager</classname>
+                object.</entry>
+              </row>
+
+              <row>
+                <entry><literal>RgbColorConverter</literal></entry>
+
+                <entry>Capable of resolving a comma separated list of Red,
+                Green, Blue integer values to a
+                <classname>System.Drawing.Color</classname> structure.</entry>
+              </row>
+
+              <row>
+                <entry><literal>ExpressionConverter</literal></entry>
+
+                <entry>Capable of resolving a string into an instance of an
+                object that implements the <classname>IExpression</classname>
+                interface.</entry>
+              </row>
+
+              <row>
+                <entry><literal>NameValueConverter</literal></entry>
+
+                <entry>Capable of resolving an XML formatted string to a
+                <literal>Specialized.NameValueCollection</literal></entry>
+              </row>
+
+              <row>
+                <entry><literal>RegexConverter</literal></entry>
+
+                <entry>Capable of resolving a string into an instance of
+                <literal>Regex</literal></entry>
+              </row>
+
+              <row>
+                <entry><literal>RegistryKeyConverter</literal></entry>
+
+                <entry>Capable of resolving a string into a
+                <literal>Microsoft.Win32.RegistryKey</literal> object.</entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table></para>
+
+      <para>Spring.NET uses the standard .NET mechanisms for the resolution of
+      <classname>System.Types</classname>, including, but not limited to
+      checking any configuration files associated with your application,
+      checking the Global Assembly Cache (GAC), and assembly probing.</para>
+    </sect2>
+
+    <sect2 id="objects-type-conversion-custom-overview">
+      <title>Custom Type Conversion</title>
+
+      <para>There are a few ways to register custom type converters. The
+      fundamental storage area in Spring for custom type converters is the
+      <classname>TypeConverterRegistry</classname> class. The <emphasis>most
+      convenient way</emphasis> if using an XML based implementation of
+      <classname>IObjectFactory</classname> or
+      <classname>IApplicationContext</classname> is to use the custom
+      configuration section handler
+      <classname>TypeConverterSectionHandler</classname> This is demonstrated
+      in section <xref linkend="context-configuration" /></para>
+
+      <para>An alternate approach, present for legacy reasons in the port of
+      Spring.NET from the Java code base, is to use the object factory
+      post-processor
+      <classname>Spring.Objects.Factory.Config.CustomConverterConfigurer</classname>.
+      This is described in the next section.</para>
+
+      <para>If you are constructing your IoC container Programatically then
+      you should use the <literal>RegisterCustomConverter(Type requiredType,
+      TypeConverter converter)</literal> method of the
+      <literal>ConfigurableObjectFactory</literal> interface.</para>
+
+      <sect3 id="objects-type-conversion-customconverter">
+        <title>Using CustomConverterConfigurer</title>
+
+        <para>This section shows in detail how to define a custom type
+        converter that does not use the .NET
+        <classname>TypeConverter</classname> attribute. The type converter
+        class is standalone and inherits from the
+        <classname>TypeConverter</classname> class. It uses the legacy factory
+        post-processor approach.</para>
+
+        <para>Consider a user class <emphasis>ExoticType</emphasis>, and
+        another class <emphasis>DependsOnExoticType</emphasis> which needs
+        ExoticType set as a property:<programlisting>public class ExoticType
+{
+    private string name;
+        
+    public ExoticType(string name)
+    {
+        this.name = name;
+    }
+
+    public string Name
+    {
+        get { return this.name; }
+    }
+}</programlisting> and <programlisting>public class DependsOnExoticType
+{
+    public DependsOnExoticType() {}
+    
+    private ExoticType exoticType;
+        
+    public ExoticType ExoticType
+    {
+        get { return this.exoticType; }
+        set { this.exoticType = value; }
+    }
+    
+    public override string ToString()
+    {
+        return exoticType.Name;
+    }
+}</programlisting> When things are properly set up, we want to be able to
+        assign the type property as a string, which a TypeConverter will
+        convert into a real ExoticType object behind the scenes:
+        <programlisting>&lt;object name="sample" type="SimpleApp.DependsOnExoticType, SimpleApp"&gt;
+  &lt;property name="exoticType" value="aNameForExoticType"/&gt;
+&lt;/object&gt;</programlisting> The TypeConverter looks like this:
+        <programlisting>public class ExoticTypeConverter : TypeConverter
+{
+	public ExoticTypeConverter()
+	{
+	}
+
+	public override bool CanConvertFrom (
+		ITypeDescriptorContext context, 
+		Type sourceType) 
+	{
+		if (sourceType == typeof (string)) 
+		{
+			return true;
+		}
+		return base.CanConvertFrom (context, sourceType);
+	}
+
+	public override object ConvertFrom (
+		ITypeDescriptorContext context, 
+		CultureInfo culture, object value) 
+	{
+		string s = value as string;
+		if (s != null) 
+		{          
+			return new ExoticType(s.ToUpper());
+		}
+		return base.ConvertFrom (context, culture, value);
+	}
+}</programlisting> Finally, we use the
+        <classname>CustomConverterConfigurer</classname> to register the new
+        <classname>TypeConverter</classname> with the
+        <classname>IApplicationContext</classname>, which will then be able to
+        use it as needed: <programlisting>&lt;object id="customConverterConfigurer" 
+	type="Spring.Objects.Factory.Config.CustomConverterConfigurer, Spring.Core"&gt;
+  &lt;property name="CustomConverters"&gt;
+    &lt;dictionary&gt;
+      &lt;entry key="SimpleApp.ExoticType"&gt;
+        &lt;object type="SimpleApp.ExoticTypeConverter"/&gt;
+      &lt;/entry&gt;
+    &lt;/dictionary&gt;
+  &lt;/property&gt;
+&lt;/object&gt;</programlisting></para>
+      </sect3>
+    </sect2>
+  </sect1>
+
+  <sect1 id="objects-factory-nature">
+    <title>Customizing the nature of an object</title>
+
+    <sect2 id="objects-factory-lifecycle">
+      <title>Lifecycle interfaces</title>
+
+      <para>Spring.NET uses several marker interfaces to change the behaviour
+      of your object in the container, namely the Spring.NET specific
+      <literal>IInitializingObject</literal> interface and the standard
+      <literal>System.IDisposable</literal> interfaces. Implementing either of
+      the aforementioned interfaces will result in the container calling the
+      <literal>AfterPropertiesSet()</literal> method for the former and the
+      <literal>Dispose()</literal> method for the latter, thus allowing you to
+      do things upon the initialization and destruction of your
+      objects.</para>
+
+      <para>Internally, Spring.NET uses implementations of the
+      <classname>IObjectPostProcessor</classname> interface to process any
+      marker interfaces it can find and call the appropriate methods. If you
+      need custom features or other lifecycle behavior Spring.NET doesn't
+      offer out-of-the-box, you can implement an
+      <classname>IObjectPostProcessor</classname> yourself. More information
+      about this can be found in <xref
+      linkend="objects-factory-customizing" />.</para>
+
+      <para>All the different lifecycle marker interfaces are described
+      below.</para>
+
+      <sect3 id="objects-factory-lifecycle-initializingobject">
+        <title>IInitializingObject / <literal>init-method</literal></title>
+
+        <para>The
+        <classname>Spring.Objects.Factory.IInitializingObject</classname>
+        interface gives you the ability to perform initialization work after
+        all the necessary properties on an object are set by the container.
+        The <classname>IInitializingObject</classname> interface specifies
+        exactly one method: <itemizedlist spacing="compact">
+            <listitem>
+              <para><methodname>void AfterPropertiesSet()</methodname>: called
+              after all properties have been set by the container. This method
+              enables you to do checking to see if all necessary properties
+              have been set correctly, or to perform further initialization
+              work. You can throw <emphasis>any</emphasis>
+              <classname>Exception</classname> to indicate misconfiguration,
+              initialization failures, etc.</para>
+            </listitem>
+          </itemizedlist></para>
+
+        <note>
+           Generally, the use of the 
+
+          <classname>IInitializingObject</classname>
+
+           can be avoided. The 
+
+          <literal>Spring.Core</literal>
+
+           library provides support for a generic init-method, given to the object definition in the object configuration store (be it XML, or a database, etc). 
+        </note>
+
+        <para><programlisting>&lt;object id="exampleInitObject" type="Examples.ExampleObject" init-method="init"/&gt;
+[C#]
+public class ExampleObject
+{
+    public void Init()
+    {
+        // do some initialization work
+    }
+}</programlisting> Is exactly the same as... <programlisting>&lt;object id="exampleInitObject" type="Examples.AnotherExampleObject"/&gt;
+[C#]
+public class AnotherExampleObject : IInitializingObject
+{
+    public void AfterPropertiesSet()
+    {
+        // do some initialization work
+    }
+}</programlisting> but does not couple the code to Spring.NET.</para>
+
+        <note>
+           When deploying an object in 
+
+          <literal>prototype</literal>
+
+           mode, the lifecycle of the object changes slightly. By definition, Spring.NET cannot manage the complete lifecycle of a non-singleton / 
+
+          <literal>prototype</literal>
+
+           object, since after it is created, it is given to the client and the container no longer keeps a reference to the object. You can think of Spring.NET's role when talking about a non-singleton ( 
+
+          <literal>prototype</literal>
+
+           ) object as a replacement for the 
+
+          <literal>new</literal>
+
+           operator. Any lifecycle aspects past that point have to be handled by the client. 
+        </note>
+      </sect3>
+
+      <sect3 id="objects-factory-lifecycle-disposableobject">
+        <title>IDisposable / <literal>destroy-method</literal></title>
+
+        <para>The <classname>System.IDisposable</classname> interface provides
+        you with the ability to get a callback when an
+        <classname>IObjectFactory</classname> is destroyed. The
+        <classname>IDisposable</classname> interface specifies exactly one
+        method: <itemizedlist spacing="compact">
+            <listitem>
+              <para><literal>void Dispose()</literal>: and is called on
+              destruction of the container. This allows you to release any
+              resources you are keeping in this object (such as database
+              connections). You can throw <emphasis>any</emphasis>
+              <classname>Exception</classname> here... however, any such
+              <classname>Exception</classname> will not stop the destruction
+              of the container - it will only get logged.</para>
+            </listitem>
+          </itemizedlist></para>
+
+        <note>
+          <emphasis>Note: If you choose you can avoid having your class
+          implement <classname>IDisposable</classname> since the
+          <literal>Spring.Core</literal> library provides support for a
+          generic destroy-method, given to the object definition in the object
+          configuration store (be it XML, or a database, etc).</emphasis>
+        </note>
+
+        <para><programlisting>&lt;object id="exampleInitObject" type="Examples.ExampleObject" destroy-method="cleanup"/&gt;
+[C#]
+public class ExampleObject
+{
+    public void cleanup()
+    {
+        // do some destruction work (such as closing any open connection (s))
+    }
+}</programlisting> is exactly the same as: <programlisting>&lt;object id="exampleInitObject" type="Examples.AnotherExampleObject"/&gt;
+[C#]
+public class AnotherExampleObject : IDisposable
+{
+    public void Dispose()
+    {
+        // do some destruction work
+    }
+}</programlisting></para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="objects-factory-aware">
+      <title>Knowing who you are</title>
+
+      <sect3 id="objects-factory-aware-objectfactoryaware">
+        <title>IObjectFactoryAware</title>
+
+        <para>A class which implements the
+        <classname>Spring.Objects.Factory.IObjectFactoryAware</classname>
+        interface is provided with a reference to the
+        <classname>IObjectFactory</classname> that created it. The interface
+        specifies one (write-only) property: <itemizedlist spacing="compact">
+            <listitem>
+              <para><literal>IObjectFactory ObjectFactory</literal>: the
+              property that will be set <emphasis>after the initialization
+              methods</emphasis> (<literal>AfterPropertiesSet</literal> and
+              the init-method).</para>
+            </listitem>
+          </itemizedlist></para>
+
+        <para>This allows objects to manipulate the
+        <classname>IObjectFactory</classname> that created them
+        Programatically, through the <classname>IObjectFactory</classname>
+        interface, or by casting the reference to a known subclass of this
+        which exposes additional functionality. Primarily this would consist
+        of programmatic retrieval of other objects. While there are cases when
+        this capability is useful, it should generally be avoided, since it
+        couples the code to Spring.NET, and does not follow the Inversion of
+        Control style, where collaborators are provided to objects as
+        properties.</para>
+      </sect3>
+
+      <sect3 id="objects-factory-aware-objectnameaware">
+        <title>IObjectNameAware</title>
+
+        <para>The
+        <classname>Spring.Objects.Factory.IObjectNameAware</classname>
+        interface gives you the ability to let the container set the name of
+        the object definition on the object instance itself. In those cases
+        where your object needs to know what its name is, implement this
+        interface. <itemizedlist spacing="compact">
+            <listitem>
+              <para><literal>string ObjectName</literal>: the property that
+              will be set to let the object know what its name is.</para>
+            </listitem>
+          </itemizedlist></para>
+      </sect3>
+    </sect2>
+  </sect1>
+
+  <sect1 id="objects-childobjects">
+    <title>Object definition inheritance</title>
+
+    <para>An object definition potentially contains a large amount of
+    configuration information, including container specific information (i.e.
+    initialization method, static factory method name, etc.) and constructor
+    arguments and property values. A child object definition is an object
+    definition that inherits configuration data from a parent definition. It
+    is then able to override some values, or add others, as needed. Using
+    parent and child object definitions can potentially save a lot of typing.
+    Effectively, this is a form of templating.</para>
+
+    <para>When working with an <classname>IObjectFactory</classname>
+    Programatically, child object definitions are represented by the
+    <classname>ChildObjectDefinition</classname> class. Most users will never
+    work with them on this level, instead configuring object definitions
+    declaratively in something like the
+    <classname>XmlObjectFactory</classname>. In an
+    <classname>XmlObjectFactory</classname> object definition, a child object
+    definition is indicated simply by using the parent attribute, specifying
+    the parent object definition as the value of this attribute.</para>
+
+    <para><programlisting>&lt;object id="inheritedTestObject" type="Spring.Objects.TestObject, Spring.Core.Tests"&gt;
+  &lt;property name="name" value="parent"/&gt;
+  &lt;property name="age" value="1"/&gt;
+&lt;/object&gt;
+&lt;object id="inheritsWithDifferentClass" type="Spring.Objects.DerivedTestObject, Spring.Core.Tests"
+  parent="inheritedTestObject" init-method="Initialize"&gt;
+  &lt;property name="name" value="override"/&gt;
+  &lt;!-- age will inherit value of 1 from parent --&gt;
+&lt;/object&gt;</programlisting></para>
+
+    <para>A child object definition will use the object class from the parent
+    definition if none is specified, but can also override it. In the latter
+    case, the child object class must be compatible with the parent, i.e. it
+    must accept the parent's property values.</para>
+
+    <para>A child object definition will inherit constructor argument values,
+    property values and method overrides from the parent, with the option to
+    add new values. If init method, destroy method and/or static factory
+    method are specified, they will override the corresponding parent
+    settings.</para>
+
+    <para>The remaining settings will always be taken from the child
+    definition: <literal>depends on</literal>, <literal>autowire
+    mode</literal>, <literal>dependency check</literal>,
+    <literal>singleton</literal>, <literal>lazy init</literal>.</para>
+
+    <para>In the case where the parent definition does not specify a
+    class...</para>
+
+    <para><programlisting>&lt;object id="inheritedTestObjectWithoutClass" abstract="true"&gt;
+  &lt;property name="name" value="parent"/&gt;
+  &lt;property name="age" value="1"/&gt;
+&lt;/object&gt;
+&lt;object id="inheritsWithClass" type="Spring.Objects.DerivedTestObject, Spring.Core.Tests"
+  parent="inheritedTestObjectWithoutClass" init-method="Initialize"&gt;
+  &lt;property name="name" value="override"/&gt;
+  &lt;!-- age will inherit value of 1 from parent --&gt;
+&lt;/object&gt;</programlisting></para>
+
+    <para>... the parent object cannot be instantiated on its own since it
+    incomplete, and it is also explicitly marked as abstract.
+    When a definition is defined to be abstract like this, it is usable only
+    as a pure template object definition that will serve as a parent
+    definition for child definitions.  Trying to use such an abstract parent
+    object on its own (by referring to it as a ref property of another object, or
+    doing an explicit <methodname>GetObject()</methodname> with the parent
+    object id), will result in an error. The container's internal
+    <methodname>PreInstantiateSingletons</methodname> method will completely
+    ignore object definitions that are considered abstract.</para>
+
+    <note>
+       Application contexts (but not simple object factories) will by default pre-instantiate all singletons. Therefore it is important (at least for singleton objects) that if you have a (parent) object definition which you intend to use only as a template, and this definition specifies a class, you must make sure to set the 
+
+      <emphasis>abstract</emphasis>
+
+       attribute to 
+
+      <emphasis>true</emphasis>
+
+       , otherwise the application context will actually (attempt to) pre-instantiate the abstract object.
+    </note>
+
+  </sect1>
+
+  <sect1 id="objects-factory-extension">
+    <title>Interacting with the container</title>
+
+    <para>The Spring container is essentially nothing more than an advanced
+    factory capable of maintaining a registry of different objects and their
+    dependencies. The <classname>IObjectFactory</classname> enables you to
+    read object definitions and access them using the object factory. When
+    using just the <classname>IObjectFactory</classname> you would create an
+    instance of one and then read in some object definitions in the XML format
+    as follows: <programlisting>[C#]
+IResource input = new FileSystemResource ("objects.xml");
+XmlObjectFactory factory = new XmlObjectFactory(input);</programlisting></para>
+
+    <para>That is pretty much it. Using <literal>GetObject(string)</literal>
+    (or the more concise indexer method <literal>factory ["string"]</literal>)
+    you can retrieve instances of your objects... <programlisting>[C#]
+object foo = factory.GetObject ("foo"); // gets the object defined as 'foo'
+object bar = factory ["bar"];           // same thing, just using the indexer
+</programlisting></para>
+
+    <para>You'll get a reference to the same object if you defined it as a
+    singleton (the default) or you'll get a new instance each time if you set
+    the <literal>singleton</literal> property of your object definition to
+    <emphasis>false</emphasis>. <programlisting>&lt;object id="exampleObject" type="Examples.ExampleObject, ExamplesLibrary"/&gt;
+&lt;object id="anotherObject" type="Examples.ExampleObject, ExamplesLibrary" singleton="false"/&gt;</programlisting>
+    <programlisting>[C#]
+object one = factory ["exampleObject"];   // gets the object defined as 'exampleObject'
+object two = factory ["exampleObject"];
+Console.WriteLine (one == two)            // prints 'true'
+object three = factory ["anotherObject"]; // gets the object defined as 'anotherObject'
+object four = factory ["anotherObject"];
+Console.WriteLine (three == four);        // prints 'false'
+</programlisting></para>
+
+    <para>The client-side view of the <classname>IObjectFactory</classname> is
+    surprisingly simple. The <classname>IObjectFactory</classname> interface
+    has only seven methods (and the aforementioned indexer) for clients to
+    call: <itemizedlist spacing="compact">
+        <listitem>
+          <para><literal>bool ContainsObject(string)</literal>: returns true
+          if the <classname>IObjectFactory</classname> contains an object
+          definition that matches the given name.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>object GetObject(string)</literal>: returns an
+          instance of the object registered under the given name. Depending on
+          how the object was configured by the
+          <classname>IObjectFactory</classname> configuration, either a
+          singleton (and thus shared) instance or a newly created object will
+          be returned. An <literal>ObjectsException</literal> will be thrown
+          when either the object could not be found (in which case it'll be a
+          <literal>NoSuchObjectDefinitionException</literal>), or an exception
+          occurred while instantiated and preparing the object.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>Object this [string]</literal>: this is the indexer
+          for the <classname>IObjectFactory</classname> interface. It
+          functions in all other respects in exactly the same way as the
+          <literal>GetObject(string)</literal> method. The rest of this
+          documentation will always refer to the
+          <literal>GetObject(string)</literal> method, but be aware that you
+          can use the indexer anywhere that you can use the
+          <literal>GetObject(string)</literal> method.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>Object GetObject(string, Type)</literal>: returns an
+          object, registered under the given name. The object returned will be
+          cast to the given <classname>Type</classname>. If the object could
+          not be cast, corresponding exceptions will be thrown
+          (<literal>ObjectNotOfRequiredTypeException</literal>). Furthermore,
+          all rules of the <literal>GetObject(string)</literal> method apply
+          (see above).</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>bool IsSingleton(string)</literal>: determines
+          whether or not the object definition registered under the given name
+          is a singleton or a prototype. If the object definition
+          corresponding to the given name could not be found, an exception
+          will be thrown
+          (<literal>NoSuchObjectDefinitionException</literal>)</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>string[] GetAliases(string)</literal>: returns the
+          aliases for the given object name, if any were defined in the
+          <classname>IObjectDefinition</classname>.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>void ConfigureObject(object target):</literal>
+          Injects dependencies into the supplied target instance. The name of
+          the abstract object definition is the
+          <literal>System.Type.FullName</literal> of the target instance. This
+          method is typically used when objects are instantiated outside the
+          control of a developer, for example when ASP.NET instantiates web
+          controls and when a WinForms application creates
+          UserControls.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>void ConfigureObject(object target, string
+          name):</literal> Offers the same functionality as the previously
+          listed Configure method but uses a named object definition instead
+          of using the type's full name.</para>
+        </listitem>
+      </itemizedlist></para>
+
+    <para>A sub-interface of <classname>IObjectFactory</classname>,
+    <classname>IConfigurableObjectFactory</classname> adds some convenient
+    methods such as</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><literal>void RegisterSingleton(string name, object
+        objectInstance)</literal> : Register the given existing object as
+        singleton in the object factory under the given object name.</para>
+      </listitem>
+
+      <listitem>
+        <para><literal>void RegisterAlias(string name, string
+        theAlias)</literal>; Given an object name, create an alias.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Check the SDK docs for additional details on
+    IConfigurableObjectFactory methods and properties and the full
+    <classname>IObjectFactory</classname> class hierarchy.</para>
+
+    <sect2>
+      <title>Obtaining an <classname>IFactoryObject</classname>, not its
+      product</title>
+
+      <para>Sometimes there is a need to ask an
+      <classname>IObjectFactory</classname> for an actual
+      <classname>IFactoryObject</classname> instance itself, not the object it
+      produces. This may be done by prepending the object id with
+      <literal>&amp;</literal> when calling the
+      <methodname>GetObject</methodname> method of the
+      <classname>IObjectFactory</classname> and
+      <classname>IApplicationContext</classname> interfaces. So for a given
+      <classname>IFactoryObject</classname> with an id
+      <literal>myObject</literal>, invoking
+      <literal>GetObject("myObject")</literal> on the
+      <classname>IObjectFactory</classname> will return the product of the
+      <classname>IFactoryObject</classname>, but invoking
+      <literal>GetObject("&amp;myObject")</literal> will return the
+      <classname>IFactoryObject</classname> instance itself.</para>
+    </sect2>
+  </sect1>
+
+  <sect1>
+    <title>Container extension points</title>
+
+    <para>The IoC component of the Spring Framework has been designed for
+    extension. There is typically no need for an application developer to
+    subclass any of the various <classname>IObjectFactory</classname> or
+    <classname>IApplicationContext</classname> implementation classes. The
+    Spring IoC container can be infinitely extended by plugging in
+    implementations of special integration interfaces. The next few sections
+    are devoted to detailing all of these various integration
+    interfaces.</para>
+
+    <sect2 id="objects-factory-customizing">
+      <title>Customizing objects with
+      <literal>IObjectPostProcessors</literal></title>
+
+      <para>The first extension point that we will look at is the
+      <classname>Spring.Objects.Factory.Config.IObjectPostProcessor</classname>
+      interface. This interface defines a number of callback methods that you
+      as an application developer can implement in order to provide your own
+      (or override the containers default) instantiation logic,
+      dependency-resolution logic, and so forth. If you want to do some custom
+      logic after the Spring container has finished instantiating, configuring
+      and otherwise initializing an object, you can plug in one or more
+      <classname>IObjectPostProcessor</classname> implementations.</para>
+
+      <para>You can configure multiple
+      <classname>IObjectPostProcessors</classname> if you wish. You can
+      control the order in which these
+      <classname>IObjectPostProcessor</classname> execute by setting the
+      'Order' property (you can only set this property if the
+      <classname>IObjectPostProcessor</classname> implements the
+      <classname>IOrdered</classname> interface; if you write your own
+      <classname>IObjectPostProcessor</classname> you should consider
+      implementing the <classname>IOrdered</classname> interface too); consult
+      the SDK docs for the <classname>IObjectPostProcessor</classname> and
+      <classname>IOrdered</classname> interfaces for more details.</para>
+
+      <note>
+        <para><classname>IObjectPostProcessor</classname> operate on object
+        instances; that is to say, the Spring IoC container will have
+        instantiated a object instance for you, and then
+        <classname>IObjectPostProcessors</classname> get a chance to do their
+        stuff. If you want to change the actual object definition (that is the
+        recipe that defines the object), then you rather need to use a
+        <classname>IObjectFactoryPostProcessor</classname> (described below in
+        the section entitled <link
+        linkend="objects-factory-customizing-factory-postprocessors">Customizing
+        configuration metadata with
+        IObjectFactoryPostProcessors.</link></para>
+
+        <para>Also, <classname>IObjectPostProcessors</classname> are scoped
+        per-container. This is only relevant if you are using container
+        hierarchies. If you define a
+        <classname>IObjectPostProcessor</classname> in one container, it will
+        only do its stuff on the objects in that container. Objects that are
+        defined in another container will not be post-processed by
+        <classname>IObjectPostProcessors</classname> in another container,
+        even if both containers are part of the same hierarchy.</para>
+      </note>
+
+      <para>The
+      <classname>Spring.Objects.Factory.Config.IObjectPostProcessor</classname>
+      interface, which consists of two callback methods shown below.
+      <programlisting>object PostProcessBeforeInitialization(object instance, string name);
+
+object PostProcessAfterInitialization(object instance, string name);</programlisting>When
+      such a class is registered as a post-processor with the container, for
+      each object instance that is created by the container,(see below for how
+      this registration is effected), for each object instance that is created
+      by the container, the post-processor will get a callback from the
+      container both <emphasis>before</emphasis> any initialization methods
+      (such as the <methodname>AfterPropertiesSet</methodname> method of the
+      <classname>IInitializingObject</classname> interface and any declared
+      init method) are called, and also afterwards. The post-processor is free
+      to do what it wishes with the object, including ignoring the callback
+      completely. An object post-processor will typically check for marker
+      interfaces, or do something such as wrap an object with a proxy. Some
+      Spring.NET AOP infrastructure classes are implemented as object
+      post-processors as they do this proxy-wrapping logic.</para>
+
+      <para>Other extensions to the <literal>IObjectPostProcessors</literal>
+      interface are
+      <classname>IInstantiationAwareObjectPostProcessor</classname> and
+      <classname>IDestructionAwareObjectPostProcessor</classname> defined
+      below <programlisting>public interface IInstantiationAwareObjectPostProcessor : IObjectPostProcessor
+{
+     object PostProcessBeforeInstantiation(Type objectType, string objectName);
+
+     bool PostProcessAfterInstantiation(object objectInstance, string objectName);
+
+     IPropertyValues PostProcessPropertyValues(IPropertyValues pvs, PropertyInfo[] pis, object objectInstance, string objectName);
+}
+
+public interface IDestructionAwareObjectPostProcessor : IObjectPostProcessor
+{
+     void PostProcessBeforeDestruction (object instance, string name);
+}</programlisting> The <classname>PostProcessBeforeInstantiation</classname>
+      callback method is called right before the container creates the object.
+      If the object returned by this method is not null then the default
+      instantiation behavior of the container is short circuited. The returned
+      object is the one registered with the container and no other
+      <literal>IObjectPostProcessor</literal> callbacks will be invoked on it.
+      This mechanism is useful if you would like to expose a proxy to the
+      object instead of the actual target object. The
+      <classname>PostProcessAfterInstantiation</classname> callback method is
+      called after the object has been instantiated but before Spring performs
+      property population based on explicit properties or autowiring. A return
+      value of false would short circuit the standard Spring based property
+      population. The callback method
+      <classname>PostProcessPropertyValues</classname> is called after Spring
+      collects all the property values to apply to the object, but before they
+      are applied. This gives you the opportunity to perform additional
+      processing such as making sure that a property is set to a value if it
+      contains a <classname>[Required]</classname> attribute or to perform
+      attribute based wiring, i.e. adding the attribute
+      <classname>[Inject("objectName")]</classname> on a property. Both of
+      these features are scheduled to be included in Spring .12.</para>
+
+      <para>The <classname>IDestructionAwareObjectPostProcessor</classname>
+      callback contains a single method,
+      <classname>PostProcessBeforeDestruction</classname>, which is called
+      before a singleton's destroy method is invoked.</para>
+
+      <para>It is important to know that the
+      <classname>IObjectFactory</classname> treats object post-processors
+      slightly differently than the
+      <classname>IApplicationContext</classname>. An
+      <classname>IApplicationContext</classname> will automatically detect any
+      objects which are deployed into it that implement the
+      <classname>IObjectPostProcessor</classname> interface, and register them
+      as post-processors, to be then called appropriately by the factory on
+      object creation. Nothing else needs to be done other than deploying the
+      post-processor in a similar fashion to any other object. On the other
+      hand, when using plain <literal>IObjectFactories</literal>, object
+      post-processors have to manually be explicitly registered, with a code
+      sequence such as... <programlisting>ConfigurableObjectFactory factory = new .....; // create an IObjectFactory
+... // now register some objects
+// now register any needed IObjectPostProcessors
+MyObjectPostProcessor pp = new MyObjectPostProcessor();
+factory.AddObjectPostProcessor(pp);
+// now start using the factory
+...</programlisting></para>
+
+      <para>This explicit registration step is not convenient, and this is one
+      of the reasons why the various
+      <classname>IApplicationContext</classname> implementations are preferred
+      above plain <classname>IObjectFactory</classname> implementations in the
+      vast majority of Spring-backed applications, especially when using
+      IObjectPostProcessors.</para>
+
+      <note>
+        <para>IObjectPostProcessors and AOP auto-proxying</para>
+
+        <para>Classes that implement the
+        <classname>IObjectPostProcessor</classname> interface are special, and
+        so they are treated differently by the container. All
+        <classname>IObjectPostProcessors</classname> and their directly
+        referenced object will be instantiated on startup, as part of the
+        special startup phase of the IApplicationContext, then all those
+        <classname>IObjectPostProcessors</classname> will be registered in a
+        sorted fashion - and applied to all further objects. Since AOP
+        auto-proxying is implemented as a
+        <classname>IObjectPostProcessor</classname> itself, no
+        <classname>IObjectPostProcessors</classname> or directly referenced
+        objects are eligible for auto-proxying (and thus will not have aspects
+        'woven' into them). For any such object, you should see an info log
+        message: “Object 'foo' is not eligible for getting processed by all
+        <classname>IObjectPostProcessors</classname> (for example: not
+        eligible for auto-proxying)�.</para>
+      </note>
+
+      <para></para>
+
+      <sect3 id="object-factory-extension-opp-examples-hw">
+        <title>Example: Hello World, IObjectPostProcessor-style</title>
+
+        <para>This first example is hardly compelling, but serves to
+        illustrate basic usage. All we are going to do is code a custom
+        IObjectPostProcessor implementation that simply invokes the ToString()
+        method of each object as it is created by the container and prints the
+        resulting string to the system console. Yes, it is not hugely useful,
+        but serves to get the basic concepts across before we move into the
+        second example which is actually useful. The basis of the example is
+        the MovieFinder quickstart that is included with the Spring.NET
+        distribution.</para>
+
+        <para>Find below the custom IObjectPostProcessor implementation class
+        definition</para>
+
+        <para><programlisting>using System;
+using Spring.Objects.Factory.Config;
+
+namespace Spring.IocQuickStart.MovieFinder
+{
+    public class TracingObjectPostProcessor : IObjectPostProcessor
+    {
+        public object PostProcessBeforeInitialization(object instance, string name)
+        {
+            return instance;
+        }
+
+        public object PostProcessAfterInitialization(object instance, string name)
+        {
+            Console.WriteLine("Object '" + name + "' created : " + instance.ToString());
+            return instance;
+        }
+    }
+}</programlisting>And the following configuration</para>
+
+        <programlisting>&lt;?xml version="1.0" encoding="utf-8" ?&gt;
+&lt;objects xmlns="http://www.springframework.net" &gt;
+  &lt;description&gt;An example that demonstrates simple IoC features.&lt;/description&gt;
+
+  &lt;object id="MyMovieLister" 
+          type="Spring.IocQuickStart.MovieFinder.MovieLister, Spring.IocQuickStart.MovieFinder"&gt;
+    &lt;property name="movieFinder" ref="MyMovieFinder"/&gt;
+  &lt;/object&gt;
+
+  &lt;object id="MyMovieFinder" 
+          type="Spring.IocQuickStart.MovieFinder.SimpleMovieFinder, Spring.IocQuickStart.MovieFinder"/&gt;
+
+  &lt;!-- when the above objects are instantiated, this custom IObjectPostProcessor implementation 
+       will output the fact to the system console --&gt;
+  <emphasis role="bold">&lt;object type="Spring.IocQuickStart.MovieFinder.TracingObjectPostProcessor, Spring.IocQuickStart.MovieFinder"/&gt;</emphasis>
+&lt;/objects&gt;</programlisting>
+
+        <para>Notice how the TracingObjectPostProcessor is simply defined; it
+        doesn't even have a name, and because it is a object it can be
+        dependency injected just like any other object.</para>
+
+        <para>Find below a small driver script to exercise the above code and
+        configuration;</para>
+
+        <para><programlisting>IApplicationContext ctx =
+        new XmlApplicationContext(
+            "assembly://Spring.IocQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder/AppContext.xml");
+
+MovieLister lister = (MovieLister) ctx.GetObject("MyMovieLister");
+Movie[] movies = lister.MoviesDirectedBy("Roberto Benigni");
+LOG.Debug("Searching for movie...");
+foreach (Movie movie in movies)
+{
+  LOG.Debug(string.Format("Movie Title = '{0}', Director = '{1}'.", movie.Title, movie.Director));
+}
+LOG.Debug("MovieApp Done.");</programlisting>The output of executing the above
+        program will be:</para>
+
+        <programlisting>INFO  - Object 'Spring.IocQuickStart.MovieFinder.TracingObjectPostProcessor' is not eligible for being processed by all IObjectPostProcessors 
+       (for example: not eligible for auto-proxying).
+Object 'MyMovieFinder' created : Spring.IocQuickStart.MovieFinder.SimpleMovieFinder
+Object 'MyMovieLister' created : Spring.IocQuickStart.MovieFinder.MovieLister
+DEBUG - Searching for movie...
+DEBUG - Movie Title = 'La vita e bella', Director = 'Roberto Benigni'.
+DEBUG - MovieApp Done.</programlisting>
+      </sect3>
+
+      <sect3 id="object-factory-extension-opp-examplesrapp">
+        <title>Example: the RequiredAttributeObjectPostProcessor</title>
+
+        <para>Using callback interfaces or annotations in conjunction with a
+        custom IObjectPostProcessor implementation is a common means of
+        extending the Spring IoC container. The <literal>[Required]</literal>
+        attribute in the <literal>Spring.Objects.Factory.Attributes</literal>
+        namespace can be used to <emphasis>mark</emphasis> a property as
+        being<emphasis> 'required-to-be-set' </emphasis>(i.e. an setter
+        property with this attribute applied must be configured to be
+        dependency injected with a value), else an
+        <classname>ObjectInitializationException</classname> will be thrown by
+        the container at runtime.</para>
+
+        <para>The best way to illustrate the usage of this attribute is with
+        an example.</para>
+
+        <programlisting>public class MovieLister
+{
+  // the MovieLister has a dependency on the MovieFinder
+  private IMovieFinder _movieFinder;
+
+  // a setter property so that the Spring container can 'inject' a MovieFinder
+  [Required]
+  public IMovieFinder MovieFinder
+  {
+    set { _movieFinder = value; }  
+  }
+
+  // business logic that actually 'uses' the injected MovieFinder is omitted...
+
+}</programlisting>
+
+        <para>Hopefully the above class definition reads easy on the eye. Any
+        and all <literal>IObjectDefinitions</literal> for the
+        <classname>MovieLister</classname> class must be provided with a
+        value.</para>
+
+        <para>Let's look at an example of some XML configuraiton that will not
+        pass validation.</para>
+
+        <programlisting>  &lt;object id="MyMovieLister" 
+          type="Spring.IocQuickStart.MovieFinder.MovieLister, Spring.IocQuickStart.MovieFinder"&gt;
+      &lt;!-- whoops, no MovieFinder is set (and this property is [Required]) --&gt;
+  &lt;/object&gt;</programlisting>
+
+        <para>At runtime the following message will be generated by the Spring
+        container</para>
+
+        <programlisting>Error creating context 'spring.root': Property 'MovieFinder' required for object 'MyMovieLister'</programlisting>
+
+        <para>There is one last little piece of Spring configuration that is
+        required to actually 'switch on' this behavior. Simply annotating the
+        'setter' properties of your classes is not enough to get this
+        behavior. You need to enable a component that is aware of the
+        <literal>[Required]</literal> attribute and that can process it
+        appropriately.</para>
+
+        <para>This component is the
+        <classname>RequiredAttributeObjectPostProcessor</classname> class.
+        This is a special <literal>IObjectPostProcessor</literal>
+        implementation that is <literal>[Required]</literal>-aware and
+        actually provides the 'blow up if this required property has not been
+        set' logic. It is very easy to configure; simply drop the following
+        object definition into your Spring XML configuration.</para>
+
+        <programlisting>&lt;object type="Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor, Spring.Core"/&gt;</programlisting>
+
+        <para>Finally, one can configure an instance of the
+        <classname>RequiredAttributeObjectPostProcessor</classname> class to
+        look for another <literal>Attribute</literal> type. This is great if
+        you already have your own <literal>[Required]</literal>-style
+        attribute. Simply plug it into the definition of a
+        <classname>RequiredAttributeObjectPostProcessor</classname> and you
+        are good to go. By way of an example, let's suppose you (or your
+        organization / team) have defined an attribute called [Mandatory]. You
+        can make a <classname>RequiredAttributeObjectPostProcessor</classname>
+        instance <literal>[Mandatory]</literal>-aware like so:</para>
+
+        <programlisting>&lt;object type="Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor, Spring.Core"&gt;
+  &lt;property name="RequiredAttributeType" value="MyApp.Attributes.MandatoryAttribute, MyApp"/&gt;
+&lt;/object&gt;</programlisting>
+      </sect3>
+    </sect2>
+
+    <sect2 id="objects-factory-customizing-factory-postprocessors">
+      <title>Customizing configuration metadata with
+      ObjectFactoryPostProcessors</title>
+
+      <para>The next extension point that we will look at is the
+      <classname>Spring.Objects.Factory.Config.IObjectFactoryPostProcessor</classname>.
+      The semantics of this interface are similar to the
+      <classname>IObjectPostProcessor</classname>, with one major difference.
+      <classname>IObjectFactoryPostProcessors</classname> operate on; that is
+      to say, the Spring IoC container will allow
+      <classname>IObjectFactoryPostProcessors</classname> to read the
+      configuration metadata and potentially change it before the container
+      has actually instantiated any other objects. By implementing this
+      interface, you will receive a callback after the all the object
+      definitions have been loaded into the IoC container but before they have
+      been instantiated. The signature of the interface is shown below
+      <programlisting>public interface IObjectFactoryPostProcessor 
+{
+  void PostProcessObjectFactory (IConfigurableListableObjectFactory factory);
+}
+</programlisting></para>
+
+      <para>You can configure multiple
+      <classname>IObjectFactoryPostProcessors</classname> if you wish. You can
+      control the order in which these
+      <classname>IObjectFactoryPostProcessors</classname> execute by setting
+      the 'Order' property (you can only set this property if the
+      <classname>IObjectFactoryPostProcessors</classname> implements the
+      <classname>IOrdered</classname> interface; if you write your own
+      <classname>IObjectFactoryPostProcessors</classname> you should consider
+      implementing the <classname>IOrdered</classname> interface too); consult
+      the SDK docs for the <classname>IObjectFactoryPostProcessors</classname>
+      and <classname>IOrdered</classname> interfaces for more details.</para>
+
+      <note>
+        <para>If you want to change the actual object instances (the objects
+        that are created from the configuration metadata), then you rather
+        need to use a <classname>IObjectObjectPostProcessor</classname>
+        (described above in the section entitled <link
+        linkend="objects-factory-customizing">Customizing objects with
+        <literal>IObjectPostProcessors</literal></link>.</para>
+
+        <para>Also, <classname>IObjectFactoryPostProcessors</classname> are
+        scoped per-container. This is only relevant if you are using container
+        hierarchies. If you define a
+        <classname>IObjectFactoryPostProcessors</classname> in one container,
+        it will only do its stuff on the object definitions in that container.
+        Object definitions in another container will not be post-processed by
+        <classname>IObjectFactoryPostProcessors</classname> in another
+        container, even if both containers are part of the same
+        hierarchy.</para>
+      </note>
+
+      <para>An object factory post-processor is executed manually (in the case
+      of a IObjectFactory) or automatically (in the case of an
+      IApplicationContext) to apply changes of some sort to the configuration
+      metadata that defines a container. Spring.NET includes a number of
+      pre-existing object factory post-processors, such as
+      <literal>PropertyResourceConfigurer</literal> and
+      <literal>PropertyPlaceHolderConfigurer</literal>, both described below
+      and ObjectNameAutoProxyCreator, which is very useful for wrapping other
+      objects transactionally or with any other kind of proxy, as described
+      later in this manual.</para>
+
+      <para>In an <classname>IObjectFactory</classname>, the process of
+      applying an <classname>IObjectFactoryPostProcessor</classname> is
+      manual, and will be similar to this:</para>
+
+      <para><programlisting>XmlObjectFactory factory = new XmlObjectFactory(new FileSystemResource("objects.xml"));
+<lineannotation>// create placeholderconfigurer to bring in some property
+// values from a Properties file</lineannotation>
+PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
+cfg.setLocation(new FileSystemResource("ado.properties"));
+<lineannotation>// now actually do the replacement</lineannotation>
+cfg.PostProcessObjectFactory(factory);</programlisting></para>
+
+      <para><anchor
+      id="objects-factory-autodetect-objectfactorypostprocessors" />This
+      explicit registration step is not convenient, and this is one of the
+      reasons why the various <classname>IApplicationContext</classname>
+      implementations are preferred above plain
+      <classname>IObjectFactory</classname> implementations in the vast
+      majority of Spring-backed applications, especially when using
+      <classname>IObjectFactoryPostProcessors</classname>.</para>
+
+      <para>An <classname>IApplicationContext</classname> will detect any
+      objects which are deployed into it that implement the
+      <literal>ObjectFactoryPostProcessor</literal> interface, and
+      automatically use them as object factory post-processors, at the
+      appropriate time. Nothing else needs to be done other than deploying
+      these post-processor in a similar fashion to any other object.</para>
+
+      <note>
+        <para>Just as in the case of
+        <classname>IObjectPostProcessors</classname>, you typically don't want
+        to have <classname>IObjectFactoryPostProcessors</classname> marked as
+        being lazily-initialized. If they are marked as such, then the Spring
+        container will never instantiate them, and thus they won't get a
+        chance to apply their custom logic. If you are using the
+        'default-lazy-init' attribute on the declaration of your
+        &lt;objects/&gt; element, be sure to mark your various
+        <classname>IObjectFactoryPostProcessor</classname> object definitions
+        with 'lazy-init="false"'.</para>
+      </note>
+
+      <sect3 id="objects-factory-placeholderconfigurer">
+        <title>Example: The
+        <classname>PropertyPlaceholderConfigurer</classname></title>
+
+        <para>The <classname>PropertyPlaceholderConfigurer</classname> is an
+        excellent solution when you want to externalize a few properties from
+        a file containing object definitions. This is useful to allow the
+        person deploying an application to customize environment specific
+        properties (for example database configuration strings, usernames, and
+        passwords), without the complexity or risk of modifying the main XML
+        definition file or files for the container.</para>
+
+        <para>Variable substitution is performed on simple property values,
+        lists, dictionaries, sets, constructor values, object type name, and
+        object names in runtime object references. Furthermore, placeholder
+        values can also cross-reference other placeholders.</para>
+
+        <para>Note that <literal>IApplicationContext</literal>s are able to
+        automatically recognize and apply objects deployed in them that
+        implement the <classname>IObjectFactoryPostProcessor</classname>
+        interface. This means that as described here, applying a
+        <classname>PropertyPlaceholderConfigurer</classname> is much more
+        convenient when using an <classname>IApplicationContext</classname>.
+        For this reason, it is recommended that users wishing to use this or
+        other object factory postprocessors use an
+        <classname>IApplicationContext</classname> instead of an
+        <classname>IObjectFactory</classname>.</para>
+
+        <para>In the example below a data access object needs to be configured
+        with a database connection and also a value for the maximum number of
+        results to return in a query. Instead of hard coding the values into
+        the main Spring.NET configuration file we use place holders, in the
+        NAnt style of ${variableName}, and obtain their values from
+        NameValueSections in the standard .NET application configuration file.
+        The Spring.NET configuration file looks like: <programlisting>&lt;configuration&gt;
+
+  &lt;configSections&gt;
+    &lt;sectionGroup name="spring"&gt;
+      &lt;section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/&gt;
+    &lt;/sectionGroup&gt;
+    &lt;section name="DaoConfiguration" type="System.Configuration.NameValueSectionHandler"/&gt;
+    &lt;section name="DatabaseConfiguration" type="System.Configuration.NameValueSectionHandler"/&gt;
+  &lt;/configSections&gt;
+
+  &lt;DaoConfiguration&gt;
+    &lt;add key="maxResults" value="1000"/&gt;
+  &lt;/DaoConfiguration&gt;
+  
+  &lt;DatabaseConfiguration&gt;
+    &lt;add key="connection.string" value="dsn=MyDSN;uid=sa;pwd=myPassword;"/&gt;
+  &lt;/DatabaseConfiguration&gt;
+  
+  &lt;spring&gt;
+    &lt;context&gt;
+      &lt;resource uri="assembly://DaoApp/DaoApp/objects.xml"/&gt;
+    &lt;/context&gt;
+  &lt;/spring&gt;
+
+&lt;/configuration&gt;</programlisting></para>
+
+        <para>Notice the presence of two NameValueSections in the
+        configuration file. These name value pairs will be referred to in the
+        Spring.NET configuration file. In this example we are using an
+        embedded assembly resource for the location of the Spring.NET
+        configuration file so as to reduce the chance of accidental tampering
+        in deployment. This Spring.NET configuration file is shown
+        below.</para>
+
+        <programlisting>&lt;objects xmlns="http://www.springframework.net" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://www.springframework.net
+         http://www.springframework.net/xsd/spring-objects.xsd" &gt;
+    
+    &lt;object name="productDao" type="DaoApp.SimpleProductDao, DaoApp "&gt;
+      &lt;property name="maxResults" value="<emphasis role="bold">${maxResults}</emphasis>"/&gt;
+      &lt;property name="dbConnection" ref="myConnection"/&gt;
+    &lt;/object&gt;
+    
+    &lt;object name="myConnection" type="System.Data.Odbc.OdbcConnection, System.Data"&gt; 
+      &lt;property name="connectionstring" value="<emphasis role="bold">${connection.string}</emphasis>"/&gt; 
+    &lt;/object&gt;
+
+    &lt;object name="appConfigPropertyHolder" 
+            type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core"&gt;
+
+        &lt;property name="configSections"&gt;          
+          &lt;value&gt;DaoConfiguration,DatabaseConfiguration&lt;/value&gt;                              
+        &lt;/property&gt;              
+       
+    &lt;/object&gt;
+&lt;/objects&gt;</programlisting>
+
+        <para>The values of <literal>${maxResults}</literal> and
+        <literal>${connection.string}</literal> match the key names used in
+        the two NameValueSectionHandlers <literal>DaoConfiguration</literal>
+        and <literal>DatabaseConfiguration</literal>. The
+        <classname>PropertyPlaceholderConfigurer</classname> refers to these
+        two sections via a comma delimited list of section names in the
+        <literal>configSections</literal> property. If you are using section
+        groups, prefix the section group name, for example
+        myConfigSection/DaoConfiguraiton.</para>
+
+        <para>The <classname>PropertyPlaceholderConfigurer</classname> class
+        also supports retrieving name value pairs from other
+        <classname>IResource</classname> locations. These can be specified
+        using the <literal>Location</literal> and <literal>Locations</literal>
+        properties of the <classname>PropertyPlaceHolderConfigurer</classname>
+        class.</para>
+
+        <para>If there are properties with the same name in different resource
+        locations the default behavior is that the last property processed
+        overrides the previous values. This is behavior is controlled by the
+        <literal>LastLocationOverrides</literal> property. True enables
+        overriding while false will append the values as one would normally
+        expect using <literal>NameValueCollection.Add</literal>.</para>
+
+        <note>
+           In an ASP.NET environment you must specify the full, four-part name of the assembly when using a 
+
+          <classname>NameValueFileSectionHandler</classname>
+
+           
+
+          <programlisting>
+            &lt;section name="hibernateConfiguration"
+            type="System.Configuration.NameValueFileSectionHandler, System,
+            Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/&gt;
+          </programlisting>
+
+           
+        </note>
+
+        <sect4>
+          <title>Type, Ref, and Expression substitution</title>
+
+          <para>The PropertyPlaceholderConfigurer can be used to substitute
+          type names, which is sometimes useful when you have to pick a
+          particular implementation class at runtime. For example:</para>
+
+          <programlisting>  &lt;object id="MyMovieFinder" type="${custom.moviefinder.type}"/&gt;</programlisting>
+
+          <para>If the class is unable to be resolved at runtime to a valid
+          type, resolution of the object will fail once it is about to be
+          created (which is during the PreInstantiateSingletons() phase of an
+          ApplicationContext for a non-lazy-init object.)</para>
+
+          <para>Similarly you can replace 'ref' and 'expression' metadata, as
+          shown below</para>
+
+          <programlisting>&lt;object id="TestObject" type="Simple.TestObject, MyAssembly"&gt;
+  &lt;property name="age" expression="${ageExpression}"/&gt;
+  &lt;property name="spouse" ref="${spouse-ref}"/&gt;
+&lt;/object&gt;</programlisting>
+        </sect4>
+
+        <sect4 id="objects-factory-placeholderconfigurer-envvars">
+          <title>Replacement with Environment Variables</title>
+
+          <para>You may also use the value environment variables to replace
+          property placeholders. The use of environment variables is
+          controlled via the property
+          <literal>EnvironmentVariableMode</literal>. This property is an
+          enumeration of the type
+          <classname>EnvironmentVariablesMode</classname> and has three
+          values, Never, Fallback, and Override. <literal>Fallback</literal>
+          is the default value and will resolve a property placeholder if it
+          was not already done so via a value from a resource location.
+          <literal>Override</literal> will apply environment variables before
+          applying values defined from a resource location.
+          <literal>Never</literal> will, quite appropriately, disable
+          environment variable substitution. An example of how the
+          <classname>PropertyPlaceholderConfigurer</classname> XML is modified
+          to enable override usage is shown below <programlisting>&lt;object name="appConfigPropertyHolder" 
+        type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core"&gt;
+        &lt;property name="configSections" value="DaoConfiguration,DatabaseConfiguration"/&gt;
+        &lt;property name="EnvironmentVariableMode" value="Override"/&gt;
+    &lt;/object&gt;
+&lt;/objects&gt;</programlisting></para>
+        </sect4>
+      </sect3>
+
+      <sect3 id="objects-factory-overrideconfigurer">
+        <title>Example: The
+        <classname>PropertyOverrideConfigurer</classname></title>
+
+        <para>The <classname>PropertyOverrideConfigurer</classname>, another
+        object factory post-processor, is similar to the
+        <classname>PropertyPlaceholderConfigurer</classname>, but in contrast
+        to the latter, the original definitions can have default values or no
+        values at all for object properties. If an overriding configuration
+        file does not have an entry for a certain object property, the default
+        context definition is used.</para>
+
+        <para>Note that the object factory definition is
+        <emphasis>not</emphasis> aware of being overridden, so it is not
+        immediately obvious when looking at the XML definition file that the
+        override configurer is being used. In case that there are multiple
+        <classname>PropertyOverrideConfigurer</classname> instances that
+        define different values for the same object property, the last one
+        will win (due to the overriding mechanism).</para>
+
+        <para>The example usage is similar to when using
+        <classname>PropertyPlaceHolderConfigurer</classname> except that the
+        key name refers to the name given to the object in the Spring.NET
+        configuration file and is suffixed via 'dot' notation with the name of
+        the property For example, if the application configuration file is
+        <programlisting>&lt;configuration&gt;
+  &lt;configSections&gt;
+    &lt;sectionGroup name="spring"&gt;
+      &lt;section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/&gt;
+    &lt;/sectionGroup&gt;
+    &lt;section name="DaoConfigurationOverride" type="System.Configuration.NameValueSectionHandler"/&gt;
+  &lt;/configSections&gt;
+
+  &lt;DaoConfigurationOverride&gt;
+    &lt;add key="productDao.maxResults" value="1000"/&gt;
+  &lt;/DaoConfigurationOverride&gt;
+  
+  &lt;spring&gt;
+    &lt;context&gt;
+      &lt;resource uri="assembly://DaoApp/DaoApp/objects.xml"/&gt;
+    &lt;/context&gt;
+  &lt;/spring&gt;
+
+&lt;/configuration&gt;</programlisting> Then the value of 1000 will be used to
+        overlay the value of 2000 set in the Spring.NET configuration file
+        shown below <programlisting>&lt;objects xmlns="http://www.springframework.net" 
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd" &gt;
+
+    &lt;object name="productDao" type="PropPlayApp.SimpleProductDao, PropPlayApp " &gt;
+      &lt;property name="maxResults" value="2000"/&gt;
+      &lt;property name="dbConnection" ref="myConnection"/&gt;
+      &lt;property name="log" ref="daoLog"/&gt;
+    &lt;/object&gt;
+    
+    &lt;object name="daoLog" type="Spring.Objects.Factory.Config.LogFactoryObject, Spring.Core"&gt;
+      &lt;property name="logName" value="DAOLogger"/&gt;
+    &lt;/object&gt;
+    
+    &lt;object name="myConnection" type="System.Data.Odbc.OdbcConnection, System.Data"&gt; 
+      &lt;property name="connectionstring"&gt; 
+        &lt;value&gt;dsn=MyDSN;uid=sa;pwd=myPassword;&lt;/value&gt;
+      &lt;/property&gt; 
+    &lt;/object&gt; 
+
+    &lt;object name="appConfigPropertyOverride" type="Spring.Objects.Factory.Config.PropertyOverrideConfigurer, Spring.Core"&gt;
+      &lt;property name="configSections"&gt;          
+        &lt;value&gt;DaoConfigurationOverride&lt;/value&gt;                              
+      &lt;/property&gt; 
+    &lt;/object&gt;
+
+&lt;/objects&gt;</programlisting></para>
+      </sect3>
+
+      <sect3 id="objects-variablesource">
+        <title>IVariableSource</title>
+
+        <para>The IVariableSource is the base interface for providing the
+        ability to get the value of property placeholders (name-value) pairs
+        from a variety of sources. Out of the box, Spring.NET supports a
+        number of variable sources that allow users to obtain variable values
+        from .NET config files, java-style property files, environment
+        variables, command line arguments and the registry and the new
+        connection strings configuration section in .NET 2.0. The list of
+        implementing classes is listed below. Please refer to the SDK
+        documentation for more information.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><classname>ConfigSectionVariableSource</classname></para>
+          </listitem>
+
+          <listitem>
+            <para><classname>PropertyFileVariableSource</classname></para>
+          </listitem>
+
+          <listitem>
+            <para><classname>EnvironmentVariableSource</classname></para>
+          </listitem>
+
+          <listitem>
+            <para><classname>CommandLineArgsVariableSource</classname></para>
+          </listitem>
+
+          <listitem>
+            <para><classname>RegistryVariableSource</classname></para>
+          </listitem>
+
+          <listitem>
+            <para><classname>SpecialFolderVariableSource</classname></para>
+          </listitem>
+
+          <listitem>
+            <para><classname>ConnectionStringsVariableSource</classname></para>
+          </listitem>
+        </itemizedlist>
+
+        <para>You use this by defining an instance of
+        <classname>Spring.Objects.Factory.Config.VariablePlaceholderConfigurer</classname>
+        in your configuration and set the property
+        <literal>VariableSource</literal> to a single
+        <classname>IVariableSource</classname> instance or the list property
+        <literal>VariableSources</literal> to a list of
+        <classname>IVariableSource</classname> instances. In the case of the
+        same property defined in multiple
+        <classname>IVariableSource</classname> implementations, the first one
+        in the list that contains the property value will be used.
+        <programlisting>&lt;object type="Spring.Objects.Factory.Config.VariablePlaceholderConfigurer, Spring.Core"&gt;
+   &lt;property name="VariableSources"&gt;
+      &lt;list&gt;
+         &lt;object type="Spring.Objects.Factory.Config.ConfigSectionVariableSource, Spring.Core"&gt;
+            &lt;property name="SectionNames" value="CryptedConfiguration" /&gt;
+         &lt;/object&gt;
+      &lt;/list&gt;
+   &lt;/property&gt;
+&lt;/object&gt;
+        </programlisting>The IVariableSource interface is shown below</para>
+
+        <programlisting>public interface IVariableSource
+{
+  string ResolveVariable(string name);
+}</programlisting>
+
+        <para>This is a simple contract to implement if you should decide to
+        create your own custom implemention. Look at the source code of the
+        current implementations for some inspiration if you go that route. To
+        register your own custom implemenation, simply configure
+        VariablePlaceholderConfigurer to refer to your class.</para>
+      </sect3>
+    </sect2>
+
+    <sect2>
+      <title>Customizing instantiation logic using
+      <literal>IFactoryObjects</literal></title>
+
+      <para>The <classname>Spring.Objects.Factory.IFactoryObject</classname>
+      interface is to be implemented by objects that <emphasis>are themselves
+      factories</emphasis>.</para>
+
+      <para>The <literal>IFactoryObject</literal> interface is a point of
+      pluggability into the Spring IoC containers instantiation logic. If you
+      have some complex initialization code that is better expressed in C# as
+      opposed to a (potentially) verbose amount of XML, you can create your
+      own <literal>IFactoryObject</literal>, write the complex initialization
+      inside that class, and then plug your custom
+      <literal>IFactoryObject</literal> into the container.</para>
+
+      <para>The <classname>IFactoryObject</classname> interface provides one
+      method and two (read-only) properties: <itemizedlist spacing="compact">
+          <listitem>
+            <para><literal>object GetObject()</literal>: has to return an
+            instance of the object this factory creates. The instance can
+            possibly be shared (depending on whether this factory provides
+            singletons or prototypes).</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>bool IsSingleton</literal>: has to return
+            <literal>true</literal> if this IFactoryObject returns singletons,
+            <literal>false</literal> otherwise.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>Type ObjectType</literal>: has to return either the
+            object type returned by the <methodname>GetObject()</methodname>
+            method or <literal>null</literal> if the type isn't known in
+            advance.</para>
+          </listitem>
+        </itemizedlist></para>
+
+      <para><classname>IFactoryObject</classname></para>
+
+      <para>The IFactoryObject concept and interface is used in a number of
+      places within the Spring Framework. Some examples of its use is
+      described in <xref linkend="objects-advancedproperty-setting" /> for the
+      <classname>PropertyRetrievingFactoryObject</classname> and
+      <classname>FieldRetrievingFactoryObject</classname>. An additional use
+      of creating an custom IFactoryObject implementation is to retrieve an
+      object from an embedded resource file and use it to set another objects
+      dependency. An example of this is provided <ulink
+      url="http://jira.springframework.org/browse/SPRNET-133#action_19743">here</ulink>.</para>
+
+      <para>Finally, there is sometimes a need to ask a container for an
+      actual <classname>IFactoryObject</classname> instance itself, not the
+      object it produces. This may be achieved by prepending the object id
+      with '<literal>&amp;</literal>' (sans quotes) when calling the
+      <literal>GetObject</literal> method of the
+      <classname>IObjectFactory</classname> (including
+      <classname>IApplicationContext</classname>). So for a given
+      <classname>IFactoryObject</classname> with an id of
+      '<literal>myObject</literal>', invoking
+      <literal>GetObject("myObject")</literal> on the container will return
+      the product of the <classname>IFactoryObject</classname>, but invoking
+      <literal>GetObject("&amp;myObject")</literal> will return the
+      <classname>IFactoryObject</classname> instance itself.</para>
+
+      <sect3>
+        <title>IConfigurableFactoryObject</title>
+
+        <para>The
+        <classname>Spring.Objects.Factory.IConfigurableFactoryObject</classname>
+        interface inherits from <classname>IFactoryObject</classname>
+        interface and adds the following property.<itemizedlist
+            spacing="compact">
+            <listitem>
+              <para><literal> IObjectDefinition ProductTemplate </literal>:
+              Gets the template object definition that should be used to
+              configure the instance of the object managed by this
+              factory.</para>
+            </listitem>
+          </itemizedlist></para>
+
+        <para><classname>IConfigurableFactoryObject</classname> implementions
+        you already have examples of in <xref linkend="client-side" /> are
+        <classname>WebServiceProxyFactory</classname>.</para>
+      </sect3>
+    </sect2>
+  </sect1>
+
+  <sect1 id="context-introduction">
+    <title>The <classname>IApplicationContext</classname></title>
+
+    <para>While the <literal>Spring.Objects</literal> namespace provides basic
+    functionality for managing and manipulating objects, often in a
+    programmatic way, the <literal>Spring.Context</literal> namespace
+    introduces the <classname>IApplicationContext</classname> interface, which
+    enhances the functionality provided by the
+    <classname>IObjectFactory</classname> interface in a more
+    <emphasis>framework-oriented style</emphasis>. Many users will use
+    ApplicationContext in a completely declarative fashion, not even having to
+    create it manually, but instead relying on support classes such as the
+    .NET configuration section handlers such as ContextHandler and
+    WebContextHandler together to declaratively define the ApplicationContext
+    and retrieve it though a ContextRegistry. (Of course it is still possible
+    to create an <classname>IApplicationContext</classname>
+    Programatically).</para>
+
+    <para>The basis for the context module is the
+    <classname>IApplicationContext</classname> interface, located in the
+    <literal>Spring.Context</literal> namespace. Deriving from the
+    <classname>IObjectFactory</classname> interface, it provides all the
+    functionality of the <classname>IObjectFactory</classname>. To be able to
+    work in a more framework-oriented fashion, using layering and hierarchical
+    contexts, the <literal>Spring.Context</literal> namespace also provides
+    the following functionality<itemizedlist spacing="compact">
+        <listitem>
+          <para><emphasis>Loading of multiple (hierarchical)
+          contexts</emphasis>, allowing some of them to be focused and used on
+          one particular layer, for example the web layer of an
+          application.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>Access to localized resources</emphasis> at the
+          application level by implementing
+          <classname>IMessageSource</classname>.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>Uniform access to resources</emphasis> that can be
+          read in as an InputStream, such as URLs and files by implementing
+          <classname>IResourceLoader</classname></para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>Loosely Coupled Event Propagation</emphasis>.
+          Publishers and subscribers of events do not have to be directly
+          aware of each other as they register their interest indirectly
+          through the application context.</para>
+        </listitem>
+      </itemizedlist></para>
+
+    <sect2>
+      <title>IObjectFactory or IApplicationContext?</title>
+
+      <para>Short version: use an
+      <emphasis><classname>IApplicationContext</classname></emphasis> unless
+      you have a really good reason for not doing so. For those of you that
+      are looking for slightly more depth as to the 'but why' of the above
+      recommendation, keep reading.</para>
+
+      <para>As the <classname>IApplicationContext</classname> includes all the
+      functionality the object factory via its inheritance of the
+      <classname>IObjectFactory</classname> interface, it is generally
+      recommended to be used over the <classname>IObjectFactory</classname>
+      except for a few limited situations where memory consumption might be
+      critical. This may become more important if the .NET Compact Framework
+      is supported. The history of <classname>IObjectFactory</classname> comes
+      from the Spring Java framework, where the use of Spring in Applets was a
+      concern to reduce memory consumption. However, for most 'typical'
+      enterprise applications and systems, the
+      <classname>IApplicationContext</classname> is what you will want to use.
+      Spring generally makes heavy use of the
+      <classname>IObjectPostProcessor</classname> extension point (to effect
+      proxying and suchlike), and if you are using just a plain
+      <classname>IObjectFactory</classname> then a fair amount of support such
+      as transactions and AOP will not take effect (at least not without some
+      extra steps on your part), which could be confusing because nothing will
+      actually be wrong with the configuration.</para>
+
+      <para>Find below a feature matrix that lists what features are provided
+      by the <classname>IObjectFactory</classname> and
+      <classname>IApplicationContext</classname> interfaces (and attendant
+      implementations). The following sections describe functionality that
+      <classname>IApplicationContext</classname> adds to the basic
+      <classname>IObjectFactory</classname> capabilities in a lot more depth
+      than the said feature matrix.)</para>
+
+      <table id="context-introduction-ctx-vs-beanfactory-feature-matrix"
+             pgwide="1">
+        <title>Feature Matrix</title>
+
+        <tgroup cols="3">
+          <colspec align="left" />
+
+          <thead>
+            <row>
+              <entry align="center">Feature</entry>
+
+              <entry
+              align="center"><interfacename>IObjectFactory</interfacename></entry>
+
+              <entry
+              align="center"><interfacename>IApplicationContext</interfacename></entry>
+            </row>
+          </thead>
+
+          <tbody>
+            <row>
+              <entry><para>Object instantiation/wiring</para></entry>
+
+              <entry align="center"><para>Yes</para></entry>
+
+              <entry align="center"><para>Yes</para></entry>
+            </row>
+
+            <row>
+              <entry><para>Automatic
+              <interfacename>IObjectPostProcessor</interfacename>
+              registration</para></entry>
+
+              <entry align="center"><para>No</para></entry>
+
+              <entry align="center"><para>Yes</para></entry>
+            </row>
+
+            <row>
+              <entry><para>Automatic
+              <interfacename>IObjectFactoryPostProcessor</interfacename>
+              registration</para></entry>
+
+              <entry align="center"><para>No</para></entry>
+
+              <entry align="center"><para>Yes</para></entry>
+            </row>
+
+            <row>
+              <entry><para>Convenient
+              <interfacename>IMessageSource</interfacename>
+              access</para></entry>
+
+              <entry align="center"><para>No</para></entry>
+
+              <entry align="center"><para>Yes</para></entry>
+            </row>
+
+            <row>
+              <entry><para><interfacename>ApplicationEvent</interfacename>
+              publication</para></entry>
+
+              <entry align="center"><para>No</para></entry>
+
+              <entry align="center"><para>Yes</para></entry>
+            </row>
+
+            <row>
+              <entry>Singleton service locator style access</entry>
+
+              <entry align="center">No</entry>
+
+              <entry align="center">Yes</entry>
+            </row>
+
+            <row>
+              <entry>Declarative registration of custom resource protocol
+              handler, XML Parsers for object definitions, and type
+              aliases</entry>
+
+              <entry align="center">No</entry>
+
+              <entry align="center">Yes</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+    </sect2>
+  </sect1>
+
+  <sect1 id="context-configuration">
+    <title>Configuration of IApplicationContext</title>
+
+    <para>Well known locations in the .NET application configuration file are
+    used to register resource handlers, custom parsers, type alias, and custom
+    type converts in addition to the context and objects sections mentioned
+    previously. A sample .NET application configuration file showing all these
+    features is shown below. Each section requires the use of a custom
+    configuration section handler. Note that the types shown for resource
+    handlers and parsers are fictional. <programlisting>&lt;configuration&gt;
+
+  &lt;configSections&gt;
+    &lt;sectionGroup name="spring"&gt;
+
+      &lt;section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/&gt;
+      &lt;section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" /&gt;
+        
+      &lt;section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/&gt; 
+      &lt;section name="resources" type="Spring.Context.Support.<classname>ResourceHandlersSectionHandler</classname>, Spring.Core"/&gt;         
+      &lt;section name="typeAliases" type="Spring.Context.Support.TypeAliasesSectionHandler, Spring.Core"/&gt;
+      &lt;section name="typeConverters" type="Spring.Context.Support.TypeConvertersSectionHandler, Spring.Core"/&gt;
+        
+     &lt;/sectionGroup&gt;
+  &lt;/configSections&gt;
+
+  &lt;spring&gt;
+    &lt;parsers&gt; 
+      &lt;parser type="Spring.Aop.Config.AopNamespaceParser, Spring.Aop" /&gt; 
+      &lt;parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" /&gt; 
+    &lt;/parsers&gt; 
+                                            
+    &lt;resources&gt; 
+      &lt;handler protocol="db" type="MyCompany.MyApp.Resources.MyDbResource"/&gt; 
+    &lt;/resources&gt; 
+        
+    &lt;context caseSensitive="false"&gt;
+      &lt;resource uri="config://spring/objects"/&gt;
+      &lt;resource uri="db://user:pass@dbName/MyDefinitionsTable"/&gt;         
+    &lt;/context&gt;
+        
+    &lt;typeAliases&gt;
+       &lt;alias name="WebServiceExporter" type="Spring.Web.Services.WebServiceExporter, Spring.Web"/&gt;
+       &lt;alias name="DefaultPointcutAdvisor" type="Spring.Aop.Support.DefaultPointcutAdvisor, Spring.Aop"/&gt;
+       &lt;alias name="AttributePointcut" type="Spring.Aop.Support.AttributeMatchMethodPointcut, Spring.Aop"/&gt;
+       &lt;alias name="CacheAttribute" type="Spring.Attributes.CacheAttribute, Spring.Core"/&gt;
+       &lt;alias name="MyType" type="MyCompany.MyProject.MyNamespace.MyType, MyAssembly"/&gt;
+     &lt;/typeAliases&gt;
+        
+    &lt;typeConverters&gt;
+      &lt;converter for="Spring.Expressions.IExpression, Spring.Core" type="Spring.Objects.TypeConverters.ExpressionConverter, Spring.Core"/&gt;
+      &lt;converter for="MyTypeAlias" type="MyCompany.MyProject.Converters.MyTypeConverter, MyAssembly"/&gt;
+    &lt;/typeConverters&gt;       
+
+    &lt;objects xmlns="http://www.springframework.net"&gt;
+        ...
+    &lt;/objects&gt;
+
+  &lt;/spring&gt;
+
+&lt;/configuration&gt;
+        </programlisting> The new sections are described below. The attribute
+    <literal>caseSensitive</literal> allows the for both
+    <classname>IObjectFactory</classname> and
+    <classname>IApplicationContext</classname> implementations to not pay
+    attention to the case of the object names. This is important in web
+    applications so that ASP.NET pages can be resolved in a case independent
+    manner. The default value is true.</para>
+
+    <sect2 id="context-custom-parsers">
+      <title>Registering custom parsers</title>
+
+      <para>Instead of using the default XML schema that is generic in nature
+      to define an object's properties and dependencies, you can create your
+      own XML schema specific to an application domain. This has the benefit
+      of being easier to type and getting XML intellisense for the schema
+      being used. The downside is that you need to write code that will
+      transform this XML into Spring object definitions. One would typically
+      implement a custom parser by deriving from the class
+      <classname>ObjectsNamespaceParser</classname> and overriding the methods
+      <literal> int ParseRootElement(XmlElement root, XmlResourceReader
+      reader)</literal> and <literal>int ParseElement(XmlElement element,
+      XmlResourceReader reader)</literal>. Registering custom parsers outside
+      of App.config will be addressed in a future release.</para>
+    </sect2>
+
+    <sect2 id="context-custom-resourcehandler">
+      <title>Registering custom resource handlers</title>
+
+      <para>Creating a custom resource handler means implementing the
+      <classname>IResource</classname> interface. The base class
+      <classname>AbstractResource</classname> is a useful starting point. Look
+      at the Spring source for classes such as
+      <classname>FileSystemResource</classname> or
+      <classname>AssemblyResource</classname> for implementation tips. You can
+      register your custom resource handler either within App.config, as shown
+      above using a .<classname>ResourceHandlersSectionHandler</classname> or
+      define an object of the type
+      <classname>Spring.Objects.Factory.Config.ResourceHandlerConfigurer</classname>.
+      An example of the latter is shown below:</para>
+
+      <programlisting>&lt;object id="myResourceHandlers" type="Spring.Objects.Factory.Config.<classname>ResourceHandlersSectionHandler</classname>, Spring.Core"&gt;
+      &lt;property name="ResourceHandlers"&gt;
+          &lt;dictionary&gt;
+              &lt;entry key="db" value="MyCompany.MyApp.Resources.MyDbResource, MyAssembly"/&gt;
+          &lt;/dictionary&gt;
+      &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+    </sect2>
+
+    <sect2 id="context-type-alias">
+      <title>Registering Type Aliases</title>
+
+      <para>Type aliases allow you to simplify Spring configuration file by
+      replacing fully qualified type name with an alias for frequently used
+      types. Aliases can be registered both within a config file and
+      programatically and can be used anywhere in the context config file
+      where a fully qualified type name is expected. Type aliases can also be
+      defined for generic types.</para>
+
+      <para>One way to configure a type alias is to define them in a custom
+      config section in the Web/App.config file for your application, as well
+      as the custom configuration section handler. See the previous XML
+      configuration listing for an example that makes an alias for the
+      WebServiceExporter type. Once you have aliases defined, you can simply
+      use them anywhere where you would normally specify a fully qualified
+      type name:<programlisting>
+&lt;object id="MyWebService" type="WebServiceExporter"&gt;
+    ...
+&lt;/object&gt;
+
+&lt;object id="cacheAspect" type="DefaultPointcutAdvisor"&gt;
+    &lt;property name="Pointcut"&gt;
+        &lt;object type="AttributePointcut"&gt;
+            &lt;property name="Attribute" value="CacheAttribute"/&gt;       
+        &lt;/object&gt;
+    &lt;/property&gt;
+    &lt;property name="Advice" ref="aspNetCacheAdvice"/&gt;
+&lt;/object&gt;</programlisting> For an example showing type aliases for
+      generic types see <xref
+      linkend="objects-creation-generic-types" />.</para>
+
+      <para>Another way is to define an object of the type
+      <classname>Spring.Objects.Factory.Config.TypeAliasConfigurer</classname>
+      within the regular &lt;objects&gt; section of any standard Spring
+      configuration file. This approach allows for more modularity in defining
+      type aliases, for example if you can't access App.config/Web.config. An
+      example of registration using a
+      <classname>TypeAliasConfigurer</classname> is shown below</para>
+
+      <programlisting>&lt;object id="myTypeAlias" type="Spring.Objects.Factory.Config.TypeAliasConfigurer, Spring.Core"&gt;
+      &lt;property name="TypeAliases"&gt;
+          &lt;dictionary&gt;
+              &lt;entry key="WebServiceExporter" value="Spring.Web.Services.WebServiceExporter, Spring.Web"/&gt;
+              &lt;entry key="DefaultPointcutAdvisor" value="Spring.Aop.Support.DefaultPointcutAdvisor, Spring.Aop"/&gt;
+              &lt;entry key="MyType" value="MyCompany.MyProject.MyNamespace.MyType, MyAssembly"/&gt;
+          &lt;/dictionary&gt;
+      &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+    </sect2>
+
+    <sect2 id="context-type-converters">
+      <title>Registering Type Converters</title>
+
+      <para>The standard .NET mechanism for specifying a type converter is to
+      add a <classname>TypeConverter</classname> attribute to a type
+      definition to specify the type of the Converter. This is the preferred
+      way of defining type converters if you control the source code for the
+      type that you want to define a converter for. However, this
+      configuration section allows you to specify converters for the types
+      that you don't control, and it also allows you to override some of the
+      standard type converters, such as the ones that are defined for some of
+      the types in the .NET Base Class Library.</para>
+
+      <para>You can specify the type converters in App.config by using
+      Spring.Context.Support.TypeConvertersSectionHandler as shown before or
+      define an object of the type
+      <classname>Spring.Objects.Factory.Config.</classname><classname>CustomConverterConfigurer</classname>.
+      An example of registration using a
+      <classname>CustomConverterConfigurer</classname> is shown below</para>
+
+      <programlisting>&lt;object id="myTypeConverters" type="Spring.Objects.Factory.Config.CustomConverterConfigurer, Spring.Core"&gt;
+      &lt;property name="CustomConverters"&gt;
+          &lt;dictionary&gt;
+              &lt;entry key="System.Date" value="MyCompany.MyProject.MyNamespace.MyCustomDateConverter, MyAssembly"/&gt;
+          &lt;/dictionary&gt;
+      &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+    </sect2>
+  </sect1>
+
+  <sect1 id="context-functionality">
+    <title>Added functionality of the
+    <classname>IApplicationContext</classname></title>
+
+    <para>As already stated in the previous section, the
+    <classname>IApplicationContext</classname> has a couple of features that
+    distinguish it from the <classname>IObjectFactory</classname>. Let us
+    review them one-by-one.</para>
+
+    <sect2 id="context-functionality-hierarchy">
+      <title>Context Hierarchies</title>
+
+      <para>You can structure the configuration information of application
+      context into hierarchies that naturally reflect the internal layering of
+      your application. As an example, abstract object definitions may appear
+      in a parent application context configuration file, possibly as an
+      embedded assembly resource so as not to invite accidental changes.
+      <programlisting>&lt;spring&gt;
+  &lt;context&gt;
+    &lt;resource uri="assembly://MyAssembly/MyProject/root-objects.xml"/&gt;
+    &lt;context name="mySubContext"&gt;
+      &lt;resource uri="file://objects.xml"/&gt;	
+    &lt;/context&gt;
+  &lt;/context&gt;
+&lt;/spring&gt;</programlisting> The nesting of <literal>context</literal>
+      elements reflects the parent-child hierarchy you are creating. The
+      nesting can be to any level though it is unlikely one would need a deep
+      application hierarchy. The xml file must contain the
+      <literal>&lt;objects&gt;</literal> as the root name. Another example of
+      a hierarchy, but using sections in the application configuration file is
+      shown below. <programlisting>&lt;configSections&gt;
+  &lt;sectionGroup name="spring"&gt;
+    &lt;section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/&gt;
+    &lt;section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" /&gt;
+    &lt;sectionGroup name="child"&gt;
+      &lt;section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" /&gt;
+    &lt;/sectionGroup&gt;
+  &lt;/sectionGroup&gt;
+&lt;/configSections&gt;
+
+&lt;spring&gt;
+
+  &lt;context name="ParentContext"&gt;
+    &lt;resource uri="config://spring/objects"/&gt;
+    &lt;context name="ChildContext"&gt;
+      &lt;resource uri="config://spring/child/objects"/&gt;
+    &lt;/context&gt;
+  &lt;/context&gt;
+
+  &lt;objects xmlns="http://www.springframework.net"&gt;
+
+    ...
+
+  &lt;/objects&gt;
+
+  &lt;child&gt;
+    &lt;objects xmlns="http://www.springframework.net"&gt;
+
+      ...
+
+    &lt;/objects&gt;
+  &lt;/child&gt;
+
+&lt;/spring&gt;</programlisting></para>
+
+      <para>As a reminder, the <literal>type</literal> attribute of the
+      context tag is optional and defaults to
+      <classname>Spring.Context.Support.XmlApplicationContext</classname>. The
+      name of the context can be used in conjunction with the service locator
+      class, <classname>ContextRegistry</classname>, discussed in <xref
+      linkend="objects-servicelocator" /></para>
+    </sect2>
+
+    <sect2 id="context-functionality-messagesource">
+      <title>Using <literal>IMessageSource</literal></title>
+
+      <para>The <classname>IApplicationContext</classname> interface extends
+      an interface called <classname>IMessageSource</classname> and provides
+      localization (i18n or internationalization) services for text messages
+      and other resource data types such as images. This functionality makes
+      it easier to use .NET's localization features at an application level
+      and also offers some performance enhancements due to caching of
+      retrieved resources. Together with the
+      <literal>NestingMessageSource</literal>, capable of hierarchical message
+      resolving, these are the basic interfaces Spring.NET provides for
+      localization. Let's quickly review the methods defined there:
+      <itemizedlist spacing="compact">
+          <listitem>
+            <para><literal>string GetMessage(string name)</literal>: retrieves
+            a message from the <classname>IMessageSource</classname> and using
+            CurrentUICulture.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>string GetMessage(string name, CultureInfo
+            cultureInfo)</literal>: retrieves a message from the
+            <classname>IMessageSource</classname> using a specified
+            culture.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>string GetMessage(string name, params object[]
+            args)</literal>: retrieves a message from the
+            <classname>IMessageSource</classname> using a variable list of
+            arguments as replacement values in the message. The
+            CurrentUICulture is used to resolve the message.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>string GetMessage(string name, CultureInfo
+            cultureInfo, params object[] args)</literal>: retrieves a message
+            from the <classname>IMessageSource</classname> using a variable
+            list of arguments as replacement values in the message. The
+            specified culture is used to resolve the message.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>string GetMessage(string name, string
+            defaultMessage, CultureInfo culture, params object[]
+            arguments)</literal>: retrieves a message from the
+            <classname>IMessageSource</classname> using a variable list of
+            arguments as replacement values in the message. The specified
+            culture is used to resolve the message. If no message can be
+            resolved, the default message is used.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>string GetMessage(IMessageSourceResolvable
+            resolvable, <classname>CultureInfo</classname> culture)
+            </literal>: all properties used in the methods above are also
+            wrapped in a class - the
+            <literal>MessageSourceResolvable</literal>, which you can use in
+            this method.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>object GetResourceObject(string name)</literal>:Get
+            a localized resource object, i.e. Icon, Image, etc. given the
+            resource name. The CurrentUICulture is used to resolve the
+            resource object.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>object GetResourceObject(string name, CultureInfo
+            cultureInfo)</literal>:Get a localized resource object, i.e. Icon,
+            Image, etc. given the resource name. The specified culture is used
+            to resolve the resource object.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>void ApplyResources(object value, string
+            objectName, CultureInfo cultureInfo)</literal>: Uses a
+            ComponentResourceManager to apply resources to all object
+            properties that have a matching key name. Resource key names are
+            of the form objectName.propertyName</para>
+          </listitem>
+        </itemizedlist></para>
+
+      <para>When an <classname>IApplicationContext</classname> gets loaded, it
+      automatically searches for an <classname>IMessageSource</classname>
+      object defined in the context. The object has to have the name
+      <literal>messageSource</literal>. If such an object is found, all calls
+      to the methods described above will be delegated to the message source
+      that was found. If no message source was found, the
+      <classname>IApplicationContext</classname> checks to see if it has a
+      parent containing a similar object, with a similar name. If so, it uses
+      that object as the <classname>IMessageSource</classname>. If it can't
+      find any source for messages, an empty
+      <literal>StaticMessageSource</literal> will be instantiated in order to
+      be able to accept calls to the methods defined above.</para>
+
+      <warning>
+         
+
+        <title>Fallback behavior</title>
+
+         The fallback rules for localized resources seem to have a bug that is fixed by applying Service Pack 1 for .NET 1.1. This affects the use of IMessageSource.GetMessage methods that specify CultureInfo. The core of the issue in the .NET BCL is the method ResourceManager.GetObject that accepts CultureInfo. . 
+      </warning>
+
+      <para>Spring.NET provides two <classname>IMessageSource</classname>
+      implementations. These are
+      <classname>ResourceSetMessageSource</classname> and
+      <classname>StaticMessageSource</classname>. Both implement
+      <classname>IHierarchicalMessageSource</classname> to resolve messages
+      hierarchically. The <classname>StaticMessageSource</classname> is hardly
+      ever used but provides programmatic ways to add messages to the source.
+      The <classname>ResourceSetMessageSource</classname> is more interesting
+      and an example is provided for in the distribution and discussed more
+      extensively in the <xref linkend="quickstarts" /> section. The
+      <classname>ResourceSetMessageSource</classname> is configured by
+      providing a list of <classname>ResourceManager</classname>s. When a
+      message code is to be resolved, the list of ResourceManagers is searched
+      to resolve the code. For each <classname>ResourceManager</classname> a
+      <classname>ResourceSet</classname> is retrieved and asked to resolve the
+      code. Note that this search does not replace the standard hub-and-spoke
+      search for localized resources. The ResourceManagers list specifies the
+      multiple 'hubs' where the standard search starts. <programlisting>&lt;object name="messageSource" type="Spring.Context.Support.ResourceSetMessageSource, Spring.Core"&gt;
+  &lt;property name="resourceManagers"&gt;
+    &lt;list&gt;
+       &lt;value&gt;Spring.Examples.AppContext.MyResource, Spring.Examples.AppContext&lt;/value&gt;
+    &lt;/list&gt;
+  &lt;/property&gt;
+&lt;/object&gt;</programlisting></para>
+
+      <para>You can specify the arguments to construct a ResourceManager as a
+      two part string value containing the base name of the resource and the
+      assembly name. This will be converted to a ResourceManager via the
+      <classname>ResourceManagerConverter</classname> TypeConverter. This
+      converter can be similarly used to set a property on any object that is
+      of the type <classname>ResourceManager.</classname> You may also specify
+      an instance of the <classname>ResourceManager</classname> to use via an
+      object reference. The convenience class
+      <classname>Spring.Objects.Factory.Config.ResourceManagerFactoryObject</classname>
+      can be used to conveniently create an instance of a ResourceManager.
+      <programlisting>&lt;object name="myResourceManager" type="Spring.Objects.Factory.Config.ResourceManagerFactoryObject, Spring.Core"&gt;
+  &lt;property name="baseName"&gt;
+    &lt;value&gt;Spring.Examples.AppContext.MyResource&lt;/value&gt;
+  &lt;/property&gt;
+  &lt;property name="assemblyName"&gt;
+    &lt;value&gt;Spring.Examples.AppContext&lt;/value&gt;
+  &lt;/property&gt;    
+&lt;/object&gt;</programlisting></para>
+
+      <para>In application code, a call to <literal>GetMessage</literal> will
+      retrieve a properly localized message string based on a code value. Any
+      arguments present in the retrieved string are replaced using
+      <classname>String.Format</classname> semantics. The ResourceManagers,
+      ResourceSets and retrieved strings are cached to provide quicker lookup
+      performance. The key 'HelloMessage' is contained in the resource file
+      with a value of <literal>Hello {0} {1}</literal>. The following call on
+      the application context will return the string <literal>Hello Mr.
+      Anderson</literal>. <emphasis>Note</emphasis> that the caching of
+      ResourceSets is via the concatenation of the ResourceManager base name
+      and the CultureInfo string. This combination must be unique.
+      <programlisting>string msg = ctx.GetMessage("HelloMessage", 
+                            new object[] {"Mr.", "Anderson"}, 
+                            CultureInfo.CurrentCulture );
+</programlisting></para>
+
+      <para>It is possible to chain the resolution of messages by passing
+      arguments that are themselves messages to be resolved giving you greater
+      flexibility in how you can structure your message resolution. This is
+      achieved by passing as an argument a class that implements
+      <literal>IMessageResolvable</literal> instead of a string literal. The
+      convenience class <classname>DefaultMessageResolvable</classname> is
+      available for this purpose. As an example if the resource file contains
+      a key name <literal>error.required</literal> that has the value
+      '<literal>{0} is required {1}</literal>' and another key name
+      <literal>field.firstname</literal> with the value '<literal>First
+      name</literal>'. The following code will create the string
+      '<literal>First name is required dude!</literal>' <programlisting>string[] codes = {"field.firstname"};
+DefaultMessageResolvable dmr = new DefaultMessageResolvable(codes, null);
+ctx.GetMessage("error.required", 
+		new object[] { dmr, "dude!" }, 
+                CultureInfo.CurrentCulture ));
+</programlisting></para>
+
+      <para>The examples directory in the distribution contains an example
+      program, <literal>Spring.Examples.AppContext</literal>, that
+      demonstrates usage of these features.</para>
+
+      <para>The <classname>IMessageSourceAware</classname> interface can also
+      be used to acquire a reference to any
+      <classname>IMessageSource</classname> that has been defined. Any object
+      that is defined in an <classname>IApplicationContext</classname> that
+      implements the <classname>IMessageSourceAware</classname> interface will
+      be injected with the application context's
+      <classname>IMessageSource</classname> when it (the object) is being
+      created and configured.</para>
+    </sect2>
+
+    <sect2 id="context-functionality-resources">
+      <title>Using resources within Spring.NET</title>
+
+      <para>A lot of applications need to access resources. Resources here,
+      might mean files, but also news feeds from the Internet or normal web
+      pages. Spring.NET provides a clean and transparent way of accessing
+      resources in a protocol independent way. The
+      <classname>IApplicationContext</classname> has a method
+      (<literal>GetResource(string)</literal>) to take care of this. Refer to
+      <xref linkend="objects-iresource" /> for more information on the string
+      format to use and the <classname>IResource</classname> abstraction in
+      general.</para>
+    </sect2>
+
+    <sect2 id="context-functionality-pubsub">
+      <title>Loosely coupled events</title>
+
+      <para>The Eventing Registry allows developers to utilize a loosely
+      coupled event wiring mechanism. By decoupling the event publication and
+      the event subscription, most of the mundane event wiring is handled by
+      the IoC container. Event publishers can publish their event to a central
+      registry, either all of their events or a subset based on criteria such
+      as delegate type, name, return value, etc... Event subscribers can
+      choose to subscribe to any number of published events. Subscribers can
+      subscriber to events based on the type of object exposing them, allowing
+      one subscriber to handle all events of a certain type without regards to
+      how many different instances of that type are created.</para>
+
+      <para>The <classname>Spring.Objects.Events.IEventRegistry</classname>
+      interface represents the central registry and defines publish and
+      subscribe methods. <itemizedlist spacing="compact">
+          <listitem>
+            <para><literal>void PublishEvents( object sourceObject
+            )</literal>: publishes all events of the source object to
+            subscribers that implement the correct handler methods.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>void Subscribe(object subscriber )</literal>: The
+            subscriber receives all events from the source object for which it
+            has matching handler methods.</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>void Subscribe(object subscriber, Type
+            targetSourceType )</literal>: The subscriber receives all events
+            from a source object of a particular type for which it has
+            matching handler methods.</para>
+          </listitem>
+        </itemizedlist> <classname>IApplicationContext</classname> implements
+      this interface and delegates the implementation to an instance of
+      <classname>Spring.Objects.Events.Support.EventRegistry</classname>. You
+      are free to create and use as many EventRegistries as you like but since
+      it is common to use only one in an application,
+      <classname>IApplicationContext</classname> provides convenient access to
+      a single instance.</para>
+
+      <para>Within the
+      <literal>example/Spring/Spring.Examples.EventRegistry</literal>
+      directory you will find an example on how to use this functionality.
+      When you open up the project, the most interesting file is the
+      EventRegistryApp.cs file. This application loads a set of object
+      definitions from the application configuration file into an
+      <classname>IApplicationContext</classname> instance. From there, three
+      objects are loaded up: one publisher and two subscribers. The publisher
+      publishes its events to the <classname>IApplicationContext</classname>
+      instance: <programlisting>// Create the Application context using configuration file
+IApplicationContext ctx = ContextRegistry.GetContext();
+
+// Gets the publisher from the application context
+MyEventPublisher publisher = (MyEventPublisher)ctx.GetObject("MyEventPublisher");
+
+// Publishes events to the context.
+ctx.PublishEvents( publisher );
+</programlisting> One of the two subscribers subscribes to all events
+      published to the <classname>IApplicationContext</classname> instance,
+      using the publisher type as the filter criteria.<programlisting>// Gets first instance of subscriber
+MyEventSubscriber subscriber = (MyEventSubscriber)ctx.GetObject("MyEventSubscriber");
+
+// Gets second instance of subscriber
+MyEventSubscriber subscriber2 = (MyEventSubscriber)ctx.GetObject("MyEventSubscriber");
+
+// Subscribes the first instance to the any events published by the type MyEventPublisher
+ctx.Subscribe( subscriber, typeof(MyEventPublisher) );</programlisting> This
+      will wire the first subscriber to the original event publisher. Anytime
+      the event publisher fires an event,
+      (<literal>publisher.ClientMethodThatTriggersEvent1();</literal>) the
+      first subscriber will handle the event, but the second subscriber will
+      not. This allows for selective subscription, regardless of the original
+      prototype definition.</para>
+    </sect2>
+
+    <sect2 id="context-functionality-events">
+      <title>Event notification from
+      <classname>IApplicationContext</classname></title>
+
+      <para>Event handling in the <classname>IApplicationContext</classname>
+      is provided through the <classname>IApplicationListener</classname>
+      interface that contains the single method <literal>void
+      OnApplicationEvent( object source, ApplicationEventArgs
+      applicationEventArgs )</literal>. Classes that implement the
+      <classname>IApplicationListener</classname> interface are automatically
+      registered as a listener with the
+      <classname>IApplicationContext</classname>. Publishing an event is done
+      via the context's <literal>PublishEvent( ApplicationEventArgs eventArgs
+      )</literal> method. This implementation is based on the traditional
+      <emphasis>Observer</emphasis> design pattern.</para>
+
+      <para>The event argument type,
+      <classname>ApplicationEventArgs</classname>, adds the time of the event
+      firing as a property. The derived class
+      <classname>ContextEventArgs</classname> is used to notify observers on
+      the lifecycle events of the application context. It contains a property
+      <literal>ContextEvent Event</literal> that returns the enumeration
+      <literal>Refreshed</literal> or <literal>Closed.</literal>. The
+      <literal>Refreshed</literal> enumeration value indicated that the
+      <classname>IApplicationContext</classname> was either initialized or
+      refreshed. Initialized here means that all objects are loaded,
+      singletons are pre-instantiated and the
+      <classname>IApplicationContext</classname> is ready for use. The
+      <literal>Closed</literal> is published when the
+      <classname>IApplicationContext</classname> is closed using the
+      <literal>Dispose()</literal> method on the
+      <classname>IConfigurableApplicationContext</classname> interface. Closed
+      here means that singletons are destroyed.</para>
+
+      <para>Implementing custom events can be done as well. Simply call the
+      <literal>PublishEvent</literal> method on the
+      <classname>IApplicationContext</classname>, specifying a parameter which
+      is an instance of your custom event argument subclass.</para>
+
+      <para>Let's have a look at an example. First, the
+      <classname>IApplicationContext</classname>: <programlisting>&lt;object id="emailer" type="Example.EmailObject"&gt;
+    &lt;property name="blackList"&gt;
+        &lt;list&gt;
+            &lt;value&gt;black@list.org&lt;/value&gt;
+            &lt;value&gt;white@list.org&lt;/value&gt;
+            &lt;value&gt;john@doe.org&lt;/value&gt;
+        &lt;/list&gt;
+    &lt;/property&gt;
+&lt;/object&gt;
+
+&lt;object id="blackListListener" type="Example.BlackListNotifier"&gt;
+    &lt;property name="notificationAddress"&gt;
+        &lt;value&gt;spam@list.org&lt;/value&gt;
+    &lt;/property&gt;
+&lt;/object&gt;</programlisting> and then, the actual objects:
+      <programlisting>public class EmailObject : IApplicationContextAware {
+
+    // the blacklist
+    private IList blackList;
+    
+    public IList BlackList
+    {
+      set { this.blackList = value; }
+    }
+    
+    public IApplicationContext ApplicationContext
+    {
+      set { this.ctx = value; }
+    }
+    
+    public void SendEmail(string address, string text) {
+        if (blackList.contains(address))
+        {
+            BlackListEvent evt = new BlackListEvent(address, text);
+            ctx.publishEvent(evt);
+            return;
+        }
+        // send email...
+    }
+}
+
+public class BlackListNotifier : IApplicationListener
+{
+
+    // notification address
+    private string notificationAddress;
+    
+    public string NotificationAddress
+    {
+      set { this.notificationAddress = value; }
+    }
+
+    public void OnApplicationEvent(ApplicationEvent evt)
+    {
+        if (evt instanceof BlackListEvent)
+        {
+            // notify appropriate person
+        }
+    }
+}</programlisting></para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="objects-context-customization">
+    <title>Customized behavior in the ApplicationContext</title>
+
+    <para>The <classname>IObjectFactory</classname> already offers a number of
+    mechanisms to control the lifecycle of objects deployed in it (such as
+    marker interfaces like <classname>IInitializingObject</classname> and
+    <classname>System.IDisposable</classname>, their configuration only
+    equivalents such as <literal>init-method</literal> and
+    <literal>destroy-method</literal>) attributes in an XmlObjectFactory
+    configuration, and object post-processors. In an
+    <classname>IApplicationContext</classname>, all of these still work, but
+    additional mechanisms are added for customizing behavior of objects and
+    the container.</para>
+
+    <sect2 id="objects-context-applicationcontextaware">
+      <title>The <literal>IApplicationContextAware</literal> marker
+      interface</title>
+
+      <para>All marker interfaces available with ObjectFactories still work.
+      The <classname>IApplicationContext</classname> does add one extra marker
+      interface which objects may implement,
+      <literal>IApplicationContextAware</literal>. An object which implements
+      this interface and is deployed into the context will be called back on
+      creation of the object, using the interface's
+      <literal>ApplicationContext</literal> property, and provided with a
+      reference to the context, which may be stored for later interaction with
+      the context.</para>
+    </sect2>
+
+    <sect2 id="objects-context-objectpostprocessor">
+      <title>The <literal>IObjectPostProcessor</literal></title>
+
+      <para>Object post-processors are classes which implement the
+      <classname>Spring.Objects.Factory.Config.IObjectPostProcessor</classname>
+      interface, have <link
+      linkend="objects-factory-customizing">already</link> been mentioned. It
+      is worth mentioning again here though, that post-processors are much
+      more convenient to use in <classname>IApplicationContext</classname>s
+      than in plain <classname>IObjectFactory</classname> instances. In an
+      <classname>IApplicationContext</classname>, any deployed object which
+      implements the above marker interface is automatically detected and
+      registered as an object post-processor, to be called appropriately at
+      creation time for each object in the factory.</para>
+    </sect2>
+
+    <sect2 id="objects-context-objectfactorypostprocessor">
+      <title>The <literal>IObjectFactoryPostProcessor</literal></title>
+
+      <para>Object factory post-processors are classes which implement the
+      <classname>Spring.Objects.Factory.Config.IObjectFactoryPostProcessor</classname>
+      interface, have <link
+      linkend="objects-factory-customizing-factory-postprocessors">already</link>
+      been mentioned. It is worth mentioning again here though, that object
+      factory post-processors are much more convenient to use in
+      <classname>IApplicationContext</classname>s. In an
+      <classname>IApplicationContext</classname>, any deployed object which
+      implements the above marker interface is automatically detected as an
+      object factory post-processor, to be called at the appropriate
+      time.</para>
+    </sect2>
+
+    <sect2 id="objects-context-placeholderconfigurer">
+      <title>The <literal>PropertyPlaceholderConfigurer</literal></title>
+
+      <para>The <literal>PropertyPlaceholderConfigurer</literal> has <link
+      linkend="objects-factory-placeholderconfigurer">already</link> been
+      described in the context of its use within an
+      <classname>IObjectFactory</classname>. It is worth mentioning here
+      though, that it is generally more convenient to use it with an
+      <classname>IApplicationContext</classname>, since the context will
+      automatically recognize and apply any object factory post-processors,
+      such as this one, when they are simply deployed into it like any other
+      object. There is no need for a manual step to execute it.</para>
+    </sect2>
+  </sect1>
+
+  <sect1>
+    <title>Configuration of ApplicationContext without using XML</title>
+
+    <para>The class GenericApplicationContext can be used as a basis for
+    creating an IApplicationContext implementation that read the container
+    metadata from sources other than XML. This could be by scanning objects in
+    a .DLL for known attributes or a scripting language that leverages a DSL
+    to create terse IObjectDefinitions. There is a class,
+    Spring.Objects.Factory.Support.ObjectDefinitionBuilder offers some
+    convenience methods for creating an IObjectDefinition in a less verbose
+    manner than using the RootObjectDefinition API. The following shows how to
+    configure the GenericApplicationContext to read from XML, just so show
+    familiar API usage</para>
+
+    <programlisting>GenericApplicationContext ctx = new GenericApplicationContext();
+XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(ctx);
+reader.LoadObjectDefinitions("assembly://Spring.Core.Tests/Spring.Context.Support/contextB.xml");
+reader.LoadObjectDefinitions("assembly://Spring.Core.Tests/Spring.Context.Support/contextC.xml");
+reader.LoadObjectDefinitions("assembly://Spring.Core.Tests/Spring.Context.Support/contextA.xml");
+ctx.Refresh();</programlisting>
+
+    <para>The implementation of IObjectDefinitionReader is responsible for
+    creating the configuration metadata, i.e., implementations of
+    RootObjectDefinition, etc. Note a web version of this application class
+    has not yet been implemented.</para>
+
+    <para>An example, with a<emphasis> yet to be created</emphasis> DLL
+    scanner, that would get configuration metadata from the .dll named
+    MyAssembly.dll located in the runtime path, would look something like
+    this</para>
+
+    <programlisting>GenericApplicationContext ctx = new GenericApplicationContext();
+ObjectDefinitionScanner scanner = new ObjectDefinitionScanner(ctx);
+scanner.scan("MyAssembly.dll");
+ctx.refresh();</programlisting>
+
+    <para>Refer to the Spring API documentation for more information.</para>
+  </sect1>
+
+  <sect1 id="objects-servicelocator">
+    <title>Service Locator access</title>
+
+    <para>The majority of the code inside an application is best written in a
+    Dependency Injection (Inversion of Control) style, where that code is
+    served out of an <classname>IObjectFactory</classname> or
+    <classname>IApplicationContext</classname> container, has its own
+    dependencies supplied by the container when it is created, and is
+    completely unaware of the container. However, there is sometimes a need
+    for singleton (or quasi-singleton) style access to an
+    <classname>IObjectFactory</classname> or
+    <classname>IApplicationContext</classname>. For example, third party code
+    may try to construct a new object directly without the ability to force it
+    to get these objects out of the IObjectFactory. Similarly, nested user
+    control components in a WinForms application are created inside the
+    generated code in InitializeComponent. If this user control would like to
+    obtain references to objects contained in the container it can use the
+    service locator style approach and 'reach out' from inside the code to
+    obtain the object it requires. (Note support for DI in WinForms is under
+    development.)</para>
+
+    <para>The <classname>Spring.Context.Support.ContextRegistry</classname>
+    class allows you to obtain a reference to an
+    <classname>IApplicationContext</classname> via a static locator method.
+    The <classname>ContextRegistry</classname> is initialized when creating an
+    <classname>IApplicationContext</classname> through use of the
+    <classname>ContextHandler</classname> discussed previously. The simple
+    static method <literal>GetContext()</literal> can then be used to retrieve
+    the context. Alternatively, if you create an
+    <classname>IApplicationContext</classname> though other means you can
+    register it with the <classname>ContextRegistry</classname> via the method
+    <literal>void RegisterContext(IApplicationContext context)</literal> in
+    the start-up code of your application. Hierarchical context retrieval is
+    also supported though the use of the <literal>GetContext(string
+    name)</literal> method, for example:<programlisting>IApplicationContex ctx = ContextRegistry.GetContext("mySubContext");</programlisting>
+    This would retrieve the nested context for the context configuration shown
+    previously.<programlisting>&lt;spring&gt;
+  &lt;context&gt;
+    &lt;resource uri="assembly://MyAssembly/MyProject/root-objects.xml"/&gt;
+	&lt;context name="mySubContext"&gt;
+	    &lt;resource uri="file://objects.xml"/&gt;	
+        &lt;/context&gt;
+  &lt;/context&gt;
+&lt;/spring&gt;</programlisting></para>
+
+    <para>Do not call ContextRegistry.GetContext within a constructor as it
+    will result in and endless recursion. (This is scheduled to be fixed in
+    1.1.1) In this case it is quite likely you can use the
+    IApplicationContextAware interface and then retrieve other objects in a
+    service locator style inside an initialization method.</para>
+
+    <para>The <literal>ContextRegistry.Clear()</literal> method will remove
+    all contexts. On .NET 2.0, this will also call the ConfigurationManager's
+    RefreshSection method so that the Spring context configuration section
+    will be reread from disk when it is retrieved again. Note that in a web
+    application RefeshSection will not work as advertised and you will need to
+    touch the web.config files to reload a configuration.</para>
+
+    <para></para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/orm.xml b/doc/reference/src/orm.xml
new file mode 100644
index 00000000..05840e75
--- /dev/null
+++ b/doc/reference/src/orm.xml
@@ -0,0 +1,948 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="orm">
+  <title>Object Relational Mapping (ORM) data access</title>
+
+  <section id="orm-introduction">
+    <title>Introduction</title>
+
+    <para>The Spring Framework provides integration with <emphasis>NHibernate
+    </emphasis> in terms of resource management, DAO implementation support,
+    and transaction strategies. For example for NHibernate, there is
+    first-class support with lots of IoC convenience features, addressing many
+    typical NHibernate integration issues. All of these support packages for
+    O/R (Object Relational) mappers comply with Spring's generic transaction
+    and DAO exception hierarchies. There are usually two integration styles:
+    either using Spring's DAO 'templates' or coding DAOs against the 'plain'
+    NHibernate APIs. In both cases, DAOs can be configured through Dependency
+    Injection and participate in Spring's resource and transaction
+    management.</para>
+
+    <para>You can use Spring's support for NHibernate without needing to use
+    Spring IoC or transaction management functionality. The NHibernate support
+    classes can be used in typical 3rd party library style. However, usage
+    inside a Spring IoC container does provide additional benefits in terms of
+    ease of configuration and deployment; as such, most examples in this
+    section show configuration inside a Spring container.</para>
+
+    <para>Some of the benefits of using the Spring Framework to create your
+    ORM DAOs include:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Ease of testing.</emphasis> Spring's IoC approach
+        makes it easy to swap the implementations and config locations of
+        Hibernate <interfacename>SessionFactory</interfacename> instances,
+        ADO.NET <interfacename>DbProvider</interfacename> instances,
+        transaction managers, and mapper object implementations (if needed).
+        This makes it much easier to isolate and test each piece of
+        persistence-related code in isolation.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Common data access exceptions.</emphasis> Spring can
+        wrap exceptions from your O/R mapping tool of choice, converting them
+        from proprietary exceptions to a common runtime DataAccessException
+        hierarchy. You can still trap and handle exceptions anywhere you need
+        to. Remember that ADO.NET exceptions (including DB specific dialects)
+        are also converted to the same hierarchy, meaning that you can perform
+        some operations with ADO.NET within a consistent programming
+        model.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>General resource management.</emphasis> Spring
+        application contexts can handle the location and configuration of
+        Hibernate <interfacename>ISessionFactory</interfacename> instances,
+        ADO.NET <interfacename>DbProvider</interfacename> instances and other
+        related resources. This makes these values easy to manage and change.
+        Spring offers efficient, easy and safe handling of persistence
+        resources. For example: related code using NHibernate generally needs
+        to use the same NHibernate <interfacename>Session</interfacename> for
+        efficiency and proper transaction handling. Spring makes it easy to
+        transparently create and bind a <interfacename>Session</interfacename>
+        to the current thread, either by using an explicit 'template' wrapper
+        class at the code level or by exposing a current
+        <interfacename>Session</interfacename> through the Hibernate
+        <interfacename>SessionFactory</interfacename> (for DAOs based on plain
+        Hibernate 1.2 API). Thus Spring solves many of the issues that
+        repeatedly arise from typical NHibernate usage, for any transaction
+        environment (local or distributed).</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Integrated transaction management.</emphasis> Spring
+        allows you to wrap your O/R mapping code with either a declarative,
+        AOP style method interceptor, or an explicit 'template' wrapper class
+        at the code level. In either case, transaction semantics are handled
+        for you, and proper transaction handling (rollback, etc) in case of
+        exceptions is taken care of. As discussed below, you also get the
+        benefit of being able to use and swap various transaction managers,
+        without your Hibernate/ADO.NET related code being affected: for
+        example, between local transactions and distributed, with the same
+        full services (such as declarative transactions) available in both
+        scenarios. As an additional benefit, ADO.NET-related code can fully
+        integrate transactionally with the code you use to do O/R mapping.
+        This is useful for data access that's not suitable for O/R mapping
+        which still needs to share common transactions with ORM
+        operations.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>The NHibernate Northwind example in the Spring distribution shows a
+    NHibernate implementation of a persistence-technology agnostic DAO
+    interfaces. (In the upcoming RC1 release the SpringAir example will
+    demonstrate an ADO.NET and NHibernate based implementation of technology
+    agnostic DAO interfaces.) The NHibernate Northwind example serves as a
+    working sample application that illustrates the use of NHibernate in a
+    Spring web application. It also leverages declarative transaction
+    demarcation with different transaction strategies.</para>
+
+    <para>Both NHibernate 1.0 and NHibernate 1.2 are supported. Differences
+    relate to the use of generics and new features such as contextual
+    sessions. For information on the latter, refer to the section <link
+    linkend="orm-hibernate-straight">Implementing DAOs based on the plain
+    NHibernate API</link>. The NHibernate 1.0 support is in the assembly
+    Spring.Data.NHibernate and the 1.2 support is in the assembly
+    Spring.Data.NHibernate12</para>
+
+    <para>At the moment the only ORM supported in NHibernate, but others can
+    be integrated with Spring (in as much as makes sense) to offer the same
+    value proposition.</para>
+  </section>
+
+  <section id="orm-hibernate">
+    <title>NHibernate</title>
+
+    <para>We will start with a coverage of <ulink
+    url="http://www.hibernate.org/">NHibernate</ulink> in a Spring
+    environment, using it to demonstrate the approach that Spring takes
+    towards integrating O/R mappers. This section will cover many issues in
+    detail and show different variations of DAO implementations and
+    transaction demarcations. Most of these patterns can be directly
+    translated to all other supported O/R mapping tools.</para>
+
+    <para>The following discussion focuses on Hibernate 1.0.4, the major
+    differences with NHibernate 1.2 being the ability to participate in Spring
+    transaction/session management via the normal NHibernate API instead of
+    the 'template' approach. Spring supports both NHibernate 1.0 and
+    NHibernate 1.2 via separate .dlls with the same internal namespace.</para>
+
+    <section id="orm-resource-mngmnt">
+      <title>Resource management</title>
+
+      <para>Typical business applications are often cluttered with repetitive
+      resource management code. Many projects try to invent their own
+      solutions for this issue, sometimes sacrificing proper handling of
+      failures for programming convenience. Spring advocates strikingly simple
+      solutions for proper resource handling, namely IoC via templating; for
+      example infrastructure classes with callback interfaces, or applying AOP
+      interceptors. The infrastructure cares for proper resource handling, and
+      for appropriate conversion of specific API exceptions to a common
+      infrastructure exception hierarchy. Spring introduces a DAO exception
+      hierarchy, applicable to any data access strategy. For direct ADO.NET,
+      the <classname>AdoTemplate</classname> class mentioned in a previous
+      section cares for connection handling, and for proper conversion of
+      ADO.NET data access exceptions (not even singly rooted in .NET 1.1) to
+      Spring's <classname>DataAccessException</classname> hierarchy, including
+      translation of database-specific SQL error codes to meaningful exception
+      classes. It supports both distributed and local transactions, via
+      respective Spring transaction managers.</para>
+
+      <para>Spring also offers Hibernate support, consisting of a
+      <classname>HibernateTemplate</classname> analogous to
+      <classname>AdoTemplate</classname>, a
+      <classname>HibernateInterceptor</classname>, and a Hibernate transaction
+      manager. The major goal is to allow for clear application layering, with
+      any data access and transaction technology, and for loose coupling of
+      application objects. No more business service dependencies on the data
+      access or transaction strategy, no more hard-coded resource lookups, no
+      more hard-to-replace singletons, no more custom service registries. One
+      simple and consistent approach to wiring up application objects, keeping
+      them as reusable as possible. All the individual data access features
+      are usable on their own but integrate nicely with Spring's application
+      context concept, providing XML-based configuration and cross-referencing
+      of plain object instances that don't need to be Spring-aware. In a
+      typical Spring application, many important objects are plain .NET
+      objects: data access templates, data access objects (that use the
+      templates), transaction managers, business services (that use the data
+      access objects and transaction managers), ASP.NET web pages (that use
+      the business services),and so on.</para>
+    </section>
+
+    <section id="orm-tx-mgmt">
+      <title>Transaction Management</title>
+
+      <para>While NHibernate offers an API for transaction management you will
+      quite likely find the benefits of using Spring's generic transaction
+      management features to be more compelling to use, typically for use of a
+      declarative programming model for transaction demarcation and easily
+      mixing ADO.NET and NHibernate operations within a single transaction.
+      See the chapter on transaction management for more information on
+      Spring's transaction management features. There are two choices for
+      transaction management strategies, one based on the NHibernate API and
+      the other the .NET 2.0 TransactionScope API.</para>
+
+      <para>The first strategy is encapsulated in the class
+      <classname>Spring.Data.NHibernate.HibernateTransactionManager
+      </classname>in both the <literal>Spring.Data.NHibernate
+      </literal>namespace. This strategy is preferred when you are using a
+      single database. ADO.NET operations can also participate in the same
+      transaction, either by using AdoTemplate or by retrieving the ADO.NET
+      connection/transaction object pair stored in thread local storage when
+      the transaction begins. Refer to the documentation of Spring's ADO.NET
+      framework for more information on retrieving and using the
+      connection/transaction pair without using AdoTemplate. You can use the
+      HibernateTransactionManager and associated classes such as
+      SessionFactory, HibernateTemplate directly as you would any third party
+      API, however they are most commonly used through Spring's XML
+      configuration file to gain the benefits of easy configuration for a
+      particular runtime environment and as the basis for the configuration of
+      a data access layer also configured using XML. An XML fragment showing
+      the declaration of <classname>HibernateTransactionManager</classname> is
+      shown below.</para>
+
+      <programlisting>  &lt;object id="HibernateTransactionManager"
+        type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate"&gt;
+
+    &lt;property name="DbProvider" ref="DbProvider"/&gt;
+    &lt;property name="SessionFactory" ref="MySessionFactory"/&gt;
+
+  &lt;/object&gt;</programlisting>
+
+      <para>The important property of
+      <classname>HibernateTransactionManager</classname> are the references to
+      the DbProvider and the Hibernate ISessionFactory. For more information
+      on the DbProvider, refer to the chapter <link
+      linkend="dbprovider">DbProvider</link> and the following section on
+      SessionFactory set up.</para>
+
+      <para>The second strategy is to use the class
+      <classname>Sping.Data.TxScopeTransactionManager</classname> that uses
+      .NET 2.0 System.Transaction namespace and its corresponding
+      TransactionScope API. This is preferred when you are using multiple
+      transactional resources, such as multiple databases.</para>
+
+      <para>Both strategies associate one Hibernate Session for the scope of
+      the transaction (scope in the general demarcation sense, not
+      System.Transaction sense). If there is no transaction then a new Session
+      will be opened for each operation. The exception to this rule is when
+      using the <classname>OpenSessionInViewModule</classname> in a web
+      application in single session mode (see <xref
+      linkend="orm-hibernate-web" />). In this case the session will be
+      created on the start of the web request and closed on the end of the
+      request. Note that the session's flush mode will be set to
+      <literal>FlushMode.NEVER</literal> at the start of the request. If a
+      non-readonly transaction is performed, then during the scope of that
+      transaction processing the flush mode will be changed to AUTO, and then
+      set back to NEVER at the end of the transaction scope so that any
+      changes to objects associated with the session during rendering will not
+      be persisted back to the database when the session is closed at the end
+      of the web request.</para>
+    </section>
+
+    <section id="orm-session-factory-setup">
+      <title><interfacename>SessionFactory</interfacename> set up in a Spring
+      container</title>
+
+      <para>To avoid tying application objects to hard-coded resource lookups,
+      Spring allows you to define resources like a
+      <interfacename>DbProvider</interfacename> or a Hibernate
+      <interfacename>SessionFactory</interfacename> as objects in an
+      application context. Application objects that need to access resources
+      just receive references to such pre-defined instances via object
+      references (the DAO definition in the next section illustrates this).
+      The following excerpt from an XML application context definition shows
+      how to set up Spring's ADO.NET DbProvider and a Hibernate
+      <interfacename>SessionFactory</interfacename> on top of it:</para>
+
+      <programlisting>&lt;objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database"&gt;
+
+
+  &lt;!-- Property placeholder configurer for database settings --&gt;
+
+  &lt;object type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core"&gt;
+    &lt;property name="ConfigSections" value="databaseSettings"/&gt;
+  &lt;/object&gt;
+
+  &lt;!-- Database and NHibernate Configuration --&gt;
+
+  &lt;db:provider id="DbProvider"
+                   provider="SqlServer-1.1"
+                   connectionString="Integrated Security=false; Data Source=(local);Integrated Security=true;Database=Northwin;User ID=springqa;Password=springqa;"/&gt;
+
+
+
+  &lt;object id="MySessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate"&gt;
+    &lt;property name="DbProvider" ref="DbProvider"/&gt;
+    &lt;property name="MappingAssemblies"&gt;
+      &lt;list&gt;
+        &lt;value&gt;Spring.Northwind.Dao.NHibernate&lt;/value&gt;
+      &lt;/list&gt;
+    &lt;/property&gt;
+    &lt;property name="HibernateProperties"&gt;
+      &lt;dictionary&gt;
+
+        &lt;entry key="hibernate.connection.provider"
+               value="NHibernate.Connection.DriverConnectionProvider"/&gt;
+
+        &lt;entry key="hibernate.dialect"
+               value="NHibernate.Dialect.MsSql2000Dialect"/&gt;
+
+        &lt;entry key="hibernate.connection.driver_class"
+               value="NHibernate.Driver.SqlClientDriver"/&gt;
+
+      &lt;/dictionary&gt;
+    &lt;/property&gt;
+
+  &lt;/object&gt;
+
+&lt;/objects&gt;</programlisting>
+
+      <para>Many of the properties on
+      <literal>LocalSessionFactoryObject</literal> are those you will commonly
+      configure, for example the property <literal>MappingAssemblies</literal>
+      specifies a list of assemblies to seach for hibernate mapping files. The
+      property <literal>HibernateProperies</literal> are the familiar
+      NHibernate properties used to set typical options such as dialect and
+      driver class. The location of NHibernate mapping information can also be
+      specified using Spring's <link linkend="resources">IResource
+      abstraction</link> via the property <literal>MappingResources</literal>.
+      The IResource abstraction supports opening an input stream from
+      assemblies, file system, and http(s) based on a Uri syntax. You can also
+      leverage the extensibility of IResource and thereby allow NHibernate to
+      obtain its configuration information from locations such as a database
+      or LDAP.For other properties you can configure them as you normal using
+      the file <literal>hibernate.cfg.xml</literal> and refer to it via the
+      property <literal>ConfigFileNames</literal>. This property is a string
+      array so multiple configuration files are supported.</para>
+
+      <para>There are other properties in
+      <classname>LocalSessionFactoryObject</classname> that relate to the
+      integration of Spring with NHibernate. The property
+      <literal>ExposeTransactionAwareSessionFactory</literal> is discussed
+      below and allows you to use Spring's declarative transaction demarcation
+      functionality with the standard NHibernate API (as compared to using
+      HibernateTemplate).</para>
+
+      <para>The property <literal>DbProvider</literal> is used to infer two
+      NHibernate configurations options.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Infer the connection string, typically done via the hibernate
+          property "hibernate.connection.connection_string".</para>
+        </listitem>
+
+        <listitem>
+          <para>Delegate to the <classname>DbProvider</classname> itself as
+          the NHibernate connection provider instead of listing it via
+          property hibernate.connection.provider via
+          <literal>HibernateProperties</literal>.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you specify both the property hibernate.connection.provider and
+      DbProvider (as shown above) the configuration of the property
+      hibernate.connection.provider is used and a warning level message is
+      logged. If you use Spring's <classname>DbProvider</classname> as the
+      NHibernate connection provider then you can take advantage of
+      <classname>IDbProvider</classname> implementations that will let you
+      change the connection string at runtime such as <link lang=""
+      linkend="dbprovider-usercredentials">UserCredentialsDbProvider</link>
+      and <link
+      linkend="dbprovider-multidelegating">MultiDelegatingDbProvider</link>.</para>
+
+      <note>
+        <para><link lang=""
+        linkend="dbprovider-usercredentials">UserCredentialsDbProvider</link>
+        and <link
+        linkend="dbprovider-multidelegating">MultiDelegatingDbProvider</link>
+        only change the connection string at runtime based on values in thread
+        local storage and do not clear out the Hibernate cache that is unique
+        to each <classname>ISessionFactory</classname> instance. As such, they
+        are only useful for selecting at runtime a single database instance.
+        Cleaning up an existing session factory when switching to a new
+        database is left to user code. Creating a new session factory per
+        connection string (assuming the same mapping files can be used across
+        all databases connections) is not currently supported. To support this
+        functionality, you can subclass
+        <classname>LocalSessionFactoryObject</classname> and override the
+        method <literal>ISessionFactory NewSessionFactory(Configuration
+        config)</literal> so that it returns an implementation of
+        <classname>ISessionFactory</classname> that selects among multiple
+        instances based on values in thread local storage, much like the
+        implementation of
+        <classname>MultiDelegatingDbProvider</classname>.</para>
+      </note>
+    </section>
+
+    <section id="orm-hibernate-template">
+      <title>The <classname>HibernateTemplate</classname></title>
+
+      <para>The basic programming model for templating looks as follows for
+      methods that can be part of any custom data access object or business
+      service. There are no restrictions on the implementation of the
+      surrounding object at all, it just needs to provide a Hibernate
+      <interfacename>SessionFactory</interfacename>. It can get the latter
+      from anywhere, but preferably as an object reference from a Spring IoC
+      container - via a simple <methodname>SessionFactory</methodname>
+      property setter. The following snippets show a DAO definition in a
+      Spring container, referencing the above defined
+      <interfacename>SessionFactory</interfacename>, and an example for a DAO
+      method implementation.</para>
+
+      <programlisting>&lt;objects&gt;
+
+  &lt;object id="CustomerDao" type="Spring.Northwind.Dao.NHibernate.HibernateCustomerDao, Spring.Northwind.Dao.NHibernate"&gt;
+    &lt;property name="SessionFactory" ref="MySessionFactory"/&gt;
+  &lt;/object&gt;
+
+&lt;/objects&gt;</programlisting>
+
+      <para></para>
+
+      <programlisting>public class HibernateCustomerDao : ICustomerDao {
+
+  private HibernateTemplate hibernateTemplate;
+
+  public ISessionFactory SessionFactory
+  {
+      set { hibernateTemplate = new HibernateTemplate(value); }
+  }
+
+  public Customer SaveOrUpdate(Customer customer)
+  {
+      hibernateTemplate.SaveOrUpdate(customer);
+      return customer;
+  }
+}</programlisting>
+
+      <para>The <classname>HibernateTemplate</classname> class provides many
+      methods that mirror the methods exposed on the Hibernate
+      <interfacename>Session</interfacename> interface, in addition to a
+      number of convenience methods such as the one shown above. If you need
+      access to the <interfacename>Session</interfacename> to invoke methods
+      that are not exposed on the <classname>HibernateTemplate</classname>,
+      you can always drop down to a callback-based approach like so.</para>
+
+      <programlisting>public class HibernateCustomerDao : ICustomerDao {
+
+  private HibernateTemplate hibernateTemplate;
+
+  public ISessionFactory SessionFactory
+  {
+      set { hibernateTemplate = new HibernateTemplate(value); }
+  }
+
+  public Customer SaveOrUpdate(Customer customer)
+  {
+      return HibernateTemplate.Execute(
+                 delegate(ISession session)
+                     {
+                         // do whatever you want with the session....
+                         session.SaveOrUpdate(customer);
+                         return customer;
+                     }) as Customer;
+  }
+
+}</programlisting>
+
+      <para>Using the anonymous delegate is particularly convenient when you
+      would otherwise be passing various method parameter calls to the
+      interface based version of this callback. Furthermore, when using
+      generics, you can avoid the typecast and write code like the
+      following</para>
+
+      <programlisting>IList&lt;Supplier&gt; suppliers = HibernateTemplate.ExecuteFind&lt;Supplier&gt;(
+   delegate(ISession session)
+   {
+      return session.CreateQuery("from Supplier s were s.Code = ?")
+                    .SetParameter(0, code)
+                    .List&lt;Supplier&gt;();
+    });</programlisting>
+
+      <para>where code is a variable in the surrounding block, accessible
+      inside the anonymous delegate implementation.</para>
+
+      <para>A callback implementation effectively can be used for any
+      Hibernate data access. <classname>HibernateTemplate</classname> will
+      ensure that <interfacename>Session</interfacename> instances are
+      properly opened and closed, and automatically participate in
+      transactions. The template instances are thread-safe and reusable, they
+      can thus be kept as instance variables of the surrounding class. For
+      simple single step actions like a single Find, Load, SaveOrUpdate, or
+      Delete call, <classname>HibernateTemplate</classname> offers alternative
+      convenience methods that can replace such one line callback
+      implementations. Furthermore, Spring provides a convenient
+      <classname>HibernateDaoSupport</classname> base class that provides a
+      <methodname>SessionFactory</methodname> property for receiving a
+      <interfacename>SessionFactory</interfacename> and for use by subclasses.
+      In combination, this allows for very simple DAO implementations for
+      typical requirements:</para>
+
+      <programlisting>public class HibernateCustomerDao : HibernateDaoSupport, ICustomerDao
+{
+    public Customer SaveOrUpdate(Customer customer)
+    {
+        HibernateTemplate.SaveOrUpdate(customer);
+        return customer;
+    }
+}</programlisting>
+    </section>
+
+    <section id="orm-hibernate-daos">
+      <title>Implementing Spring-based DAOs without callbacks</title>
+
+      <para>As an alternative to using Spring's
+      <classname>HibernateTemplate</classname> to implement DAOs, data access
+      code can also be written in a more traditional fashion, without wrapping
+      the Hibernate access code in a callback, while still respecting and
+      participating in Spring's generic
+      <classname>DataAccessException</classname> hierarchy. The
+      <classname>HibernateDaoSupport</classname> base class offers methods to
+      access the current transactional <interfacename>Session</interfacename>
+      and to convert exceptions in such a scenario; similar methods are also
+      available as static helpers on the
+      <classname>SessionFactoryUtils</classname> class. Note that such code
+      will usually pass '<literal>false</literal>' as the value of the
+      <methodname>DoGetSession(..)</methodname> method's
+      '<literal>allowCreate</literal>' argument, to enforce running within a
+      transaction (which avoids the need to close the returned
+      <interfacename>Session</interfacename>, as its lifecycle is managed by
+      the transaction). Asking for the</para>
+
+      <programlisting>public class HibernateProductDao extends HibernateDaoSupport implements ProductDao {
+
+        public Customer SaveOrUpdate(Customer customer)
+        {
+            ISession session = DoGetSession(false);
+            session.SaveOrUpdate(customer);
+            return customer;
+        }
+    }
+}</programlisting>
+
+      <para>This code will not translate the Hibernate exception to a generic
+      DataAccessException.</para>
+    </section>
+
+    <section id="orm-hibernate-straight">
+      <title>Implementing DAOs based on plain Hibernate 1.2 API</title>
+
+      <para>Hibernate 1.2 introduced a feature called "contextual Sessions",
+      where Hibernate itself manages one current
+      <interfacename>ISession</interfacename> per transaction. This is roughly
+      equivalent to Spring's synchronization of one Hibernate
+      <interfacename>Session</interfacename> per transaction. A corresponding
+      DAO implementation looks like as follows, based on the plain Hibernate
+      API:</para>
+
+      <programlisting>public class ProductDaoImpl implements IProductDao {
+
+    private SessionFactory sessionFactory;
+
+    public ISessionFactory SessionFactory
+    {
+        get { return sessionFactory; }
+        set { sessionFactory = value; }
+    }
+
+    public IList&lt;Product&gt; LoadProductsByCategory(String category) {
+        return SessionFactory.GetCurrentSession()
+                .CreateQuery("from test.Product product where product.category=?")
+                .SetParameter(0, category)
+                .List&lt;Product&gt;();
+    }
+}
+
+
+public class HibernateCustomerDao : ICustomerDao {
+
+  private ISessionFactory sessionFactory;
+
+  public ISessionFactory SessionFactory
+  {
+      set { sessionFactory = value; }
+  }
+
+  public Customer SaveOrUpdate(Customer customer)
+  {
+      sessionFactory.GetCurrentSession().SaveOrUpdate(customer);
+      return customer;
+  }
+}</programlisting>
+
+      <para>The above DAO follows the Dependency Injection pattern: it fits
+      nicely into a Spring IoC container, just like it would if coded against
+      Spring's <classname>HibernateTemplate</classname>. Of course, such a DAO
+      can also be set up in plain C# (for example, in unit tests): simply
+      instantiate it and call <methodname>SessionFactory</methodname> property
+      with the desired factory reference. As a Spring object definition, it
+      would look as follows:</para>
+
+      <programlisting>
+&lt;objects&gt;
+
+  &lt;object id="CustomerDao" type="Spring.Northwind.Dao.NHibernate.HibernateCustomerDao, Spring.Northwind.Dao.NHibernate"&gt;
+    &lt;property name="sessionFactory" ref="MySessionFactory"/&gt;
+  &lt;/object&gt;
+
+&lt;/objects&gt;</programlisting>
+
+      <para>The SessionFactory configuration to support this programming model
+      can be done two ways, both via configuration of Spring's
+      LocalSessionFactoryObject. You can enable the use of Spring's
+      implementation of the NHibernate extension interface,
+      ICurrentSessionContext, by setting the property
+      'ExposeTransactionAwareSessionFactory' to true on
+      LocalSessionFactoryObject. This is just a short-cut for setting the
+      NHibernate property current_session_context_class with the name of the
+      implementation class to use.</para>
+
+      <para>The first way is shown below</para>
+
+      <programlisting>&lt;object id="sessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate12"&gt;
+
+  <emphasis role="bold">&lt;property name="ExposeTransactionAwareSessionFactory" value="true" /&gt;</emphasis>
+
+   &lt;!-- other configuration settings omitted --&gt;
+
+&lt;/object&gt;</programlisting>
+
+      <para>Which is simply a shortcut for the following configuration</para>
+
+      <programlisting>&lt;object id="sessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate12"&gt;
+
+   &lt;!-- other configuration settings omitted --&gt;
+
+   &lt;property name="HibernateProperties"&gt;
+     &lt;dictionary&gt;
+
+       &lt;!-- other dictionary entries omitted --&gt;
+
+       <emphasis role="bold">&lt;entry key="hibernate.current_session_context_class"
+              value="Spring.Data.NHibernate.SpringSessionContext, Spring.Data.NHibernate12"/&gt;</emphasis>
+
+    &lt;/dictionary&gt;
+   &lt;/property&gt;
+
+&lt;/object&gt;</programlisting>
+
+      <para>The main advantage of this DAO style is that it depends on the
+      Hibernate API only; no import of any Spring class is required. This is
+      of course appealing from a non-invasiveness perspective, and will no
+      doubt feel more natural to Hibernate developers.</para>
+
+      <para>However, the DAO throws plain
+      <classname>HibernateException</classname> which means that callers can
+      only treat exceptions as generally fatal - unless they want to depend on
+      Hibernate's own exception hierarchy. Catching specific causes such as an
+      optimistic locking failure is not possible without tying the caller to
+      the implementation strategy. This trade off might be acceptable to
+      applications that are strongly Hibernate-based and/or do not need any
+      special exception treatment.</para>
+
+      <para>Fortunately, Spring's
+      <classname>LocalSessionFactoryObject</classname> supports Hibernate's
+      <methodname>SessionFactory.GetCurrentSession()</methodname> method for
+      any Spring transaction strategy, returning the current Spring-managed
+      transactional <interfacename>Session</interfacename> even with
+      <classname>HibernateTransactionManager</classname>.</para>
+
+      <para>In summary: DAOs can be implemented based on the plain Hibernate
+      1.2 API, while still being able to participate in Spring-managed
+      transactions. In this approach there is one session associated with the
+      transaction.</para>
+    </section>
+
+    <section id="orm-hibernate-tx-programmatic">
+      <title>Programmatic transaction demarcation</title>
+
+      <para>Transactions can be demarcated in a higher level of the
+      application, on top of such lower-level data access services spanning
+      any number of operations. There are no restrictions on the
+      implementation of the surrounding business service here as well, it just
+      needs a Spring <classname>PlatformTransactionManager</classname>. Again,
+      the latter can come from anywhere, but preferably as an object reference
+      via a <methodname>TransactionManager</methodname> property - just like
+      the <classname>productDAO</classname> should be set via a
+      <methodname>setProductDao(..)</methodname> method. The following
+      snippets show a transaction manager and a business service definition in
+      a Spring application context, and an example for a business method
+      implementation.</para>
+
+      <programlisting>&lt;objects&gt;
+
+TO BE DONE
+
+&lt;/objects&gt;</programlisting>
+
+      <programlisting>public class FulfillmentService : IFulfillmentService
+
+    private TransactionTemplate transactionTemplate;
+
+    private IProductDao productDao;
+
+    private ICustomerDao customerDao;
+
+    private IOrderDao orderDao;
+
+    private IShippingService shippingService;
+
+    public void ProcessCustomer(string customerId)
+    {
+           TO BE DONE
+    }
+}</programlisting>
+    </section>
+
+    <section id="orm-hibernate-tx-declarative">
+      <title>Declarative transaction demarcation</title>
+
+      <para>Alternatively, one can use Spring's declarative transaction
+      support, which essentially enables you to replace explicit transaction
+      demarcation API calls in your C# code with an AOP transaction
+      interceptor configured in a Spring container. You can either externalize
+      the transaction semantics (like propagation behavior and isolation level
+      ) in a configuration file or use the Transaction attribute on the
+      service method to set the transaction semantics.</para>
+
+      <para>An example showing attribute driven transaction is shown
+      below</para>
+
+      <programlisting>&lt;objects&gt;
+
+  &lt;object id="HibernateTransactionManager"
+        type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate"&gt;
+
+    &lt;property name="DbProvider" ref="DbProvider"/&gt;
+    &lt;property name="SessionFactory" ref="MySessionFactory"/&gt;
+
+  &lt;/object&gt;
+
+  &lt;!-- DAO definition not listed, see above for an example. --&gt;
+
+  &lt;object id="FulfillmentService" type="Spring.Northwind.Service.FulfillmentService, Spring.Northwind.Service"&gt;
+    &lt;property name="CustomerDao" ref="CustomerDao"/&gt;
+    &lt;property name="OrderDao" ref="OrderDao"/&gt;
+    &lt;property name="ShippingService" ref="ShippingService"/&gt;
+  &lt;/object&gt;
+
+  &lt;!-- Import 'standard xml' configuration for attribute driven declarative tx management --&gt;
+  &lt;import resource="DeclarativeServicesAttributeDriven.xml"/&gt;
+
+&lt;/objects&gt;</programlisting>
+
+      <para>Note that with the new transaction namespace, you can replace the
+      importing of DeclarativeServicesAttributeDriven.xml with the following
+      single line, <code>&lt;tx:attribute-driven/&gt;</code> that more clearly
+      expresses the intent as compared to the contents of
+      DeclarativeServicesAttributeDriven.xml.</para>
+
+      <programlisting>&lt;objects xmlns="http://www.springframework.net"
+	       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns:tx="http://www.springframework.net/schema/tx"
+         xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/schema/objects/spring-objects.xsd
+         http://www.springframework.net/schema/tx http://www.springframework.net/schema/tx/spring-tx-1.1.xsd"&gt;
+
+
+  &lt;object id="HibernateTransactionManager"
+        type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate"&gt;
+
+    &lt;property name="DbProvider" ref="DbProvider"/&gt;
+    &lt;property name="SessionFactory" ref="MySessionFactory"/&gt;
+
+  &lt;/object&gt;
+
+  &lt;!-- DAO definition not listed, see above for an example. --&gt;
+
+  &lt;object id="FulfillmentService" type="Spring.Northwind.Service.FulfillmentService, Spring.Northwind.Service"&gt;
+    &lt;property name="CustomerDao" ref="CustomerDao"/&gt;
+    &lt;property name="OrderDao" ref="OrderDao"/&gt;
+    &lt;property name="ShippingService" ref="ShippingService"/&gt;
+  &lt;/object&gt;
+
+
+  <emphasis>&lt;tx:attribute-driven/&gt;</emphasis>
+
+
+&lt;/objects&gt;</programlisting>
+
+      <para>The placement of the transaction attribute in the service layer
+      method is shown below.</para>
+
+      <programlisting>public class FulfillmentService : IFulfillmentService
+{
+  // fields and properties for dao object omitted, see above
+
+
+    [Transaction(ReadOnly=false)]
+    public void ProcessCustomer(string customerId)
+    {
+
+            //Find all orders for customer
+            Customer customer = CustomerDao.FindById(customerId);
+
+            foreach (Order order in customer.Orders)
+            {
+                //Validate Order
+                Validate(order);
+
+                //Ship with external shipping service
+                ShippingService.ShipOrder(order);
+
+                //Update shipping date
+                order.ShippedDate = DateTime.Now;
+
+                //Update shipment date
+                OrderDao.SaveOrUpdate(order);
+
+                //Other operations...Decrease product quantity... etc
+            }
+
+    }
+}</programlisting>
+
+      <para>If you prefer to not use attribute to demarcate your transaction
+      boundaries, you can import a configuration file with the following XML
+      instead of using &lt;tx:attribute-driven/&gt;</para>
+
+      <programlisting>  &lt;object id="TxProxyConfigurationTemplate" abstract="true"
+          type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data"&gt;
+
+    &lt;property name="PlatformTransactionManager" ref="HibernateTransactionManager"/&gt;
+
+    &lt;property name="TransactionAttributes"&gt;
+      &lt;name-values&gt;
+        &lt;!-- Add common methods across your services here --&gt;
+        &lt;add key="Process*" value="PROPAGATION_REQUIRED"/&gt;
+      &lt;/name-values&gt;
+    &lt;/property&gt;
+  &lt;/object&gt;</programlisting>
+
+      <para>Refer to the documentation on Spring Transaction management for
+      configuration of other features, such as rollback rules.</para>
+    </section>
+
+    <section id="orm-hibernate-tx-strategies">
+      <title>Transaction management strategies</title>
+
+      <para>Both <classname>TransactionTemplate</classname> and
+      <classname>TransactionInterceptor</classname> (not yet seen explicitly
+      in above configuration, TransactionProxyFactoryObject uses a
+      TransactionInterceptor, you would have to specify it explicitly if you
+      were using an ordinary ProxyFactoryObject.) delegate the actual
+      transaction handling to a
+      <classname>PlatformTransactionManager</classname> instance, which can be
+      a <classname>HibernateTransactionManager</classname> (for a single
+      Hibernate <interfacename>SessionFactory</interfacename>, using a
+      <classname>ThreadLocal</classname>
+      <interfacename>Session</interfacename> under the hood) or a
+      <classname>TxScopeTransactionManager</classname> (delegating to MS-DTC
+      for distributed transaction) for Hibernate applications. You could even
+      use a custom <classname>PlatformTransactionManager</classname>
+      implementation. So switching from native Hibernate transaction
+      management to TxScopeTransactionManager, such as when facing distributed
+      transaction requirements for certain deployments of your application, is
+      just a matter of configuration. Simply replace the Hibernate transaction
+      manager with Spring's TxScopeTransactionManager implementation. Both
+      transaction demarcation and data access code will work without changes,
+      as they just use the generic transaction management APIs.</para>
+
+      <para>For distributed transactions across multiple Hibernate session
+      factories, simply combine
+      <classname>TxScopeTransactionManager</classname> as a transaction
+      strategy with multiple <classname>LocalSessionFactoryObject</classname>
+      definitions. Each of your DAOs then gets one specific
+      <interfacename>SessionFactory</interfacename> reference passed into it's
+      respective object property.</para>
+
+      <programlisting>TO BE DONE
+     </programlisting>
+
+      <para><classname>HibernateTransactionManager</classname> can export the
+      ADO.NET <interfacename>Transaction</interfacename> used by Hibernate to
+      plain ADO.NET access code, for a specific
+      <interfacename>DbProvider</interfacename>. (matching connection string).
+      This allows for high-level transaction demarcation with mixed
+      Hibernate/ADO.NET data access!</para>
+    </section>
+
+    <section id="orm-hibernate-web">
+      <title>Web Session Management</title>
+
+      <para>The open session in view pattern keeps the hibernate session open
+      during page rendering so lazily loaded hibernate objects can be
+      displayed. You configure its use by adding an additional custom HTTP
+      module declaration as shown below</para>
+
+      <programlisting>  &lt;system.web&gt;
+    &lt;httpModules&gt;
+      &lt;add name="OpenSessionInView" type="Spring.Data.NHibernate.Support.OpenSessionInViewModule, Spring.Data.NHibernate"/&gt;
+    &lt;/httpModules&gt;
+
+...
+
+  &lt;/system.web&gt;</programlisting>
+
+      <para>You can configure which SessionFactory the OpenSessionInViewModule
+      will use by setting 'global' application key-value pairs as shown below.
+      (this will change in future releases)</para>
+
+      <programlisting>  &lt;appSettings&gt;
+    &lt;add key="Spring.Data.NHibernate.Support.OpenSessionInViewModule.SessionFactoryObjectName" value="SessionFactory"/&gt;
+  &lt;/appSettings&gt;</programlisting>
+
+      <para>The default behavior of the module is that a single session is
+      currently used for the life of the request. Refer to the earlier section
+      on Transaction Management in this chapter for more information on how
+      sessions are managed in the OpenSessionInViewModule. You can also
+      configure in the application setting the EntityInterceptorObjectName
+      using the key
+      <literal>Spring.Data.NHibernate.Support.OpenSessionInViewModule.EntityInterceptorObjectName</literal>
+      and if SingleSession mode is used via the key
+      <literal>Spring.Data.NHibernate.Support.OpenSessionInViewModule.SingleSession</literal>.
+      If SingleSession is set to false, referred to as 'deferred close mode',
+      then each transaction scope will use a new Session and kept open until
+      the end of the web request. This has the drawback that the first level
+      cache is not reused across transactions and that objects are required to
+      be unique across all sessions. Problems can arise if the same object is
+      associated with more than one hibernate session.</para>
+
+      <important>
+        <para>By default, OSIV applies <literal>FlushMode.NEVER</literal> on
+        every session it creates. This is because if OSIV flushed pending
+        changes during "EndRequest" and an error occurs, all response has
+        already been sent to the client. There would be no way of telling the
+        client about the error.</para>
+
+        <para>By default this means you MUST explicitly demarcate transaction
+        boundaries around non-readonly statements when using OSIV. For
+        configuring transactions see <xref
+        linkend="orm-hibernate-tx-declarative" /> or the
+        <command>Spring.Data.NHibernate.Northwind</command> example
+        application.</para>
+      </important>
+    </section>
+
+    <section>
+      <title>Session Scope</title>
+
+      <para>The class Spring.Data.NHibernate.Support.SessionScope allows for
+      you to use a single NHibernate session across multiple transactions. The
+      usage is shown below</para>
+
+      <programlisting>using (new SessionScope())
+{
+    ... do multiple operations with a single session, possibly in multiple transactions.
+}</programlisting>
+
+      <para>At the end of the using block the session is automatically closed.
+      All transactions within the scope use the same session, if you are using
+      Spring's HibernateTemplate or using Spring's implementation of
+      NHibernate 1.2's ICurrentSessionContext interface. See other sections in
+      this chapter for further information on those usage scenarios.</para>
+    </section>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/overview.xml b/doc/reference/src/overview.xml
new file mode 100644
index 00000000..348b0bf0
--- /dev/null
+++ b/doc/reference/src/overview.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="introduction">
+  <title>Introduction</title>
+
+  <sect1 id="introduction-overview">
+    <title>Overview</title>
+
+    <para>Spring.NET is an application framework that provides comprehensive
+    infrastructural support for developing enterprise .NET applications. It
+    allows you to remove incidental complexity when using the base class
+    libraries makes best practices, such as test driven development, easy
+    practices. Spring.NET is created, supported and sustained by <ulink
+    url="http://www.springsource.com">SpringSource</ulink>.</para>
+
+    <para>The design of Spring.NET is based on the Java version of the Spring
+    Framework, which has shown real-world benefits and is used in thousands of
+    enterprise applications world wide. Spring .NET is not a quick port from
+    the Java version, but rather a 'spiritual port' based on following proven
+    architectural and design patterns in that are not tied to a particular
+    platform. The breadth of functionality in Spring .NET spans application
+    tiers which allows you to treat it as a ‘one stop shop’ but that is not
+    required. Spring .NET is not an all-or-nothing solution. You can use the
+    functionality in its modules independently. These <link
+    linkend="intro-modules">modules</link> are described below.</para>
+
+    <para>Enterprise applications typically are composed of a number of a
+    variety of physical tiers and within each tier functionality is often
+    split into functional layers. The business service layer for example
+    typically uses a objects in the data access layer to fulfill a use-case.
+    No matter how your application is architected, at the end of the day there
+    are a variety of objects that collaborate with one another to form the
+    application proper. The objects in an application can thus be said to have
+    dependencies between themselves.</para>
+
+    <para>The .NET platform provides a wealth of functionality for
+    architecting and building applications, ranging all the way from the very
+    basic building blocks of primitive types and classes (and the means to
+    define new classes), to rich full-featured application servers and web
+    frameworks. One area that is decidedly conspicuous by its absence is any
+    means of taking the basic building blocks and composing them into a
+    coherent whole; this area has typically been left to the purvey of the
+    architects and developers tasked with building an application (or
+    applications). Now to be fair, there are a number of design patterns
+    devoted to the business of composing the various classes and object
+    instances that makeup an all-singing, all-dancing application. Design
+    patterns such as Factory, Abstract Factory, Builder, Decorator, and
+    Service Locator (to name but a few) have widespread recognition and
+    acceptance within the software development industry (presumably that is
+    why these patterns have been formalized as patterns in the first place).
+    This is all very well, but these patterns are just that: best practices
+    given a name, typically together with a description of what the pattern
+    does, where the pattern is typically best applied, the problems that the
+    application of the pattern addresses, and so forth. Notice that the last
+    paragraph used the phrase “... a description of what the pattern does...�;
+    pattern books and wikis are typically listings of such formalized best
+    practice that you can certainly take away, mull over, and then implement
+    yourself in your application.</para>
+
+    <para>The Spring Framework takes best practices that have been proven over
+    the years in numerous applications and formalized as design patterns, and
+    actually codifies these patterns as first class objects that you as an
+    architect and developer can take away and integrate into your own
+    application(s). This is a Very Good Thing Indeed as attested to by the
+    numerous organizations and institutions that have used the Spring
+    Framework to engineer robust, maintainable applications. For example, the
+    IoC component of the Spring Framework addresses the enterprise concern of
+    taking the classes, objects, and services that are to compose an
+    application, by providing a formalized means of composing these various
+    disparate components into a fully working application ready for use</para>
+  </sect1>
+
+  <sect1>
+    <title>Background</title>
+
+    <para>In early 2004, Martin Fowler asked the readers of his site: when
+    talking about Inversion of Control: “the question is, what aspect of
+    control are [they] inverting?�. Fowler then suggested renaming the
+    principle (or at least giving it a more self-explanatory name), and
+    started to use the term Dependency Injection. His article then continued
+    to explain the ideas underpinning the Inversion of Control (IoC) and
+    Dependency Injection (DI) principle. If you need a decent insight into IoC
+    and DI, please do refer to the article :
+    http://martinfowler.com/articles/injection.html.</para>
+  </sect1>
+
+  <sect1 id="intro-modules">
+    <title>Modules</title>
+
+    <para>The Spring Framework contains a lot of features, which are
+    well-organized into modules shown in the diagram below. The diagram below
+    shows the various core modules of Spring.NET.</para>
+
+    <para><mediaobject>
+        <imageobject>
+          <imagedata fileref="images/overview.gif" format="GIF" />
+        </imageobject>
+      </mediaobject></para>
+
+    <para>Click on the module name for more information.</para>
+
+    <para><link lang="" linkend="objects">Spring.Core</link> is the most
+    fundamental part of the framework allowing you to configure your
+    application using Dependency Injection. Other supporting functionality,
+    listed below, is located in Spring.Core</para>
+
+    <para><link linkend="aop">Spring.Aop</link> - Use this module to perform
+    Aspect-Oriented Programming (AOP). AOP centralizes common functionality
+    that can then be declaratively applied across your application in a
+    targeted manner. Spring's <link linkend="aop-aspect-library">aspect
+    library</link> provides predefined easy to use aspects for transactions,
+    logging, performance monitoring, caching, method retry, and exception
+    handling.</para>
+
+    <para><link linkend="index-middle-tier">Spring.Data</link> - Use this
+    module to achieve greater efficiency and consistency in writing data
+    access functionality in ADO.NET and to perform declarative transaction
+    management.</para>
+
+    <para><link linkend="orm">Spring.Data.NHibernate</link> - Use this module
+    to integrate NHibernate with Spring’s declarative transaction management
+    functionality allowing easy mixing of ADO.NET and NHibernate operations
+    within the same transaction. NHibernate 1.0 users will benefit from ease
+    of use APIs to perform data access operations.</para>
+
+    <para><link linkend="web">Spring.Web</link> - Use this module to raise the
+    level of abstraction when writing ASP.NET web applications allowing you to
+    effectively address common pain-points in ASP.NET such as data binding,
+    validation, and ASP.NET page/control/module/provider configuration.</para>
+
+    <para><link linkend="ajax">Spring.Web.Extensions</link> - Use this module
+    to raise the level of abstraction when writing ASP.NET web applications
+    allowing you to effectively address common pain-points in ASP.NET such as
+    data binding, validation, and ASP.NET page/control/module/provider
+    configuration.</para>
+
+    <para><link linkend="index-services">Spring.Services</link> - Use this
+    module to adapt plain .NET objects so they can be used with a specific
+    distributed communication technology, such as .NET Remoting, Enterprise
+    Services, and ASMX Web Services. These services can be configured via
+    dependency injection and ‘decorated’ by applying AOP.</para>
+
+    <para><link linkend="testing">Spring.Testing.NUnit</link> - Use this
+    module to perform integration testing with NUnit.</para>
+
+    <para>The Spring.Core module also includes the following additional
+    features</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><link linkend="expressions">Expression Language</link> -
+        provides efficient querying and manipulation of an object graphs at
+        runtime.</para>
+      </listitem>
+
+      <listitem>
+        <para><link linkend="validation">Validation Framework</link> - a
+        robust UI agnostic framework for creating complex validation rules for
+        business objects either programatically or declaratively.</para>
+      </listitem>
+
+      <listitem>
+        <para>Data binding Framework - a UI agnostic framework for performing
+        data binding.</para>
+      </listitem>
+
+      <listitem>
+        <para>Dynamic Reflection - provides a high performance reflection
+        API</para>
+      </listitem>
+
+      <listitem>
+        <para><link linkend="threading">Threading</link> - provides additional
+        concurrency abstractions such as Latch, Semaphore and Thread Local
+        Storage.</para>
+      </listitem>
+
+      <listitem>
+        <para><link lang="" linkend="resources">Resource abstraction</link> -
+        provides a common interface to treat the InputStream from a file and
+        from a URL in a polymorphic and protocol-independent manner.</para>
+      </listitem>
+    </itemizedlist>
+  </sect1>
+
+  <sect1>
+    <title>Usage Scenarios</title>
+
+    <para>With the building blocks described above you can use Spring in all
+    sorts of scenarios, from simple stand alone console applications to
+    fully-fledged enterprise applications using Spring's transaction
+    management functionality and web framework integration. </para>
+
+    <para>It is important to note that the Spring Framework <emphasis>does
+    not</emphasis> force you to use everything within it; it is not an
+    <emphasis>all-or-nothing</emphasis> solution. Existing front-ends built
+    using standard ASP.NET can be integrated perfectly well with a
+    Spring-based middle-tier, allowing you to use the transaction and/or data
+    access features that Spring offers. The only things you need to do is wire
+    up your business logic using Spring's IoC container and integrate it into
+    your web layer using WebApplicationContext to locate middle tier services
+    and/or configure your standard ASP.NET pages with depdenency injection.
+    </para>
+
+    <para>While the Spring framework does not force any particular application
+    architecure it encourages the use of a well layered application
+    architecture with distinct tiers for the presentation, service, data
+    access, and database. </para>
+  </sect1>
+
+  <sect1>
+    <title>Quickstart applications</title>
+
+    <para>There are several sample applications that showcase individual
+    features. If you are already familiar with the concepts of dependency
+    injection, AOP, or have experience using the Java version of the Spring
+    framework you may find jumping into the examples a better way to bootstrap
+    the learning processing process. The following quickstart applications are
+    available and can be found in the examples directory in the distribution.
+    Click on the links for additional information.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><link linkend="qs-moviefinder">Movie Finder</link> - A simple
+        demonstration of Dependency Injection (DI) techniques using Spring's
+        Inversion of Control (IoC) container.</para>
+      </listitem>
+
+      <listitem>
+        <para><link linkend="qs-appcontext-messagesource">Application
+        Context</link> - Demonstrates IoC container features such as
+        localization, accessing of ResourceSet objects, and applying resources
+        to object properties.</para>
+      </listitem>
+
+      <listitem>
+        <para><link linkend="aop-quickstart">Aspect Oriented
+        Programming</link> - Demonstrates use of the AOP framework to add
+        additional behavior to your existing objects. Examples of programmatic
+        and declarative AOP configuration are shown.</para>
+      </listitem>
+
+      <listitem>
+        <para><link linkend="remoting-quickstart">Distributed Computing</link>
+        - A calculator demonstrating remote service abstractions that let you
+        'export' a plain .NET object (PONO) via .NET Remoting, Web Services,
+        or an EnterpriseService ServiceComponent. Corresponding client side
+        proxies are also demonstrated. .</para>
+      </listitem>
+
+      <listitem>
+        <para><link linkend="springair">Web Application - SpringAir</link> -A
+        ticket booking application that demonstrates the ASP.NET framework
+        showing features such as DI for ASP.NET pages, data binding,
+        validation, and localization.</para>
+      </listitem>
+
+      <listitem>
+        <para>Web Development - Introductory examples showing use of
+        dependency injection and Spring's bi-directional data binding in
+        ASP.NET.</para>
+      </listitem>
+
+      <listitem>
+        <para><link linkend="data-quickstart">Data Access</link> -
+        Demonstrates the ADO.NET framework showing how to simplify developing
+        ADO.NET based data access layers.</para>
+      </listitem>
+
+      <listitem>
+        <para><link linkend="tx-quickstart">Transaction Management</link> :
+        Demonstrates the use of declarative transaction management for both
+        local and distributed transaction in both .NET 1.1 and 2.0.</para>
+      </listitem>
+
+      <listitem>
+        <para>AJAX : Demonstrates how to access a plain .NET object as a
+        webservice in client side JavaScript</para>
+      </listitem>
+
+      <listitem>
+        <para>NHibernate Northwind: Demonstrates use of Spring's NHibernate
+        integration to simplify the use of NHibernate. Web tier is also
+        included showing how to use the Open-Session In View approach to
+        session management in the web tier.</para>
+      </listitem>
+    </itemizedlist>
+  </sect1>
+
+  <sect1>
+    <title>License Information</title>
+
+    <para>Spring.NET is licensed according to the terms of the Apache License,
+    Version 2.0. The full text of this license are available online at <ulink
+    url="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</ulink>
+    . You can also view the full text of the license in the license.txt file
+    located in the root installation directory.</para>
+  </sect1>
+
+  <sect1>
+    <title>Support</title>
+
+    <para>Training and support are available through <ulink
+    url="http://www.springsource.com">SpringSource</ulink> in addition to the
+    mailing lists and forums you can find on the main <ulink
+    url="http://www.springframework.net">Spring.NET</ulink> website.</para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/pool.xml b/doc/reference/src/pool.xml
new file mode 100644
index 00000000..cd363449
--- /dev/null
+++ b/doc/reference/src/pool.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="pool">
+  <title>Object Pooling</title>
+
+  <sect1 id="pool-introduction">
+    <title>Introduction</title>
+
+    <para>The Spring.Pool namespace contains a generic API for implementing
+    pools of objects. Object pooling is a well known technique to minimize the
+    creation of objects that can take a significant amount of time. Common
+    examples are to create a pool of database connections such that each
+    request to the database can reuse an existing connection instead of
+    creating one per client request. Threads are also another common candidate
+    for pooling in order to increase responsiveness of an application to
+    multiple concurrent client requests.</para>
+
+    <para>.NET contains support for object pooling in these common scenarios.
+    Support for database connection pools is directly supported by ADO.NET
+    data providers as a configuration option. Similarly, thread pooling is
+    supported via the System.ThreadPool class. Support for pooling of other
+    objects can be done using the CLR managed API to COM+ found in the
+    System.EnterpriseServices namespace.</para>
+
+    <para>Despite this built-in support there are scenarios where you would
+    like to use alternative pool implementations. This may be because the
+    default implementations, such as System.ThreadPool, do not meet your
+    requirements. (For a discussion on advanced ThreadPool usage see <ulink
+    url="http://www.codeproject.com/csharp/SmartThreadPool.asp"> Smart Thread
+    Pool</ulink> by Ami Bar.) Alternatively, you may want to pool classes that
+    do not inherit from
+    <literal>System.EnterpriseServices.ServicedComponent</literal>. Instead of
+    making changes to the object model to meet this inheritance requirement,
+    Spring .NET provides similar support for pooling, but for any object, by
+    using AOP proxies and a generic pool API for managing object
+    instances.</para>
+
+    <para>Note, that if you are concerned only with applying pooling to an
+    existing object, the pooling APIs discussed here are not very important.
+    Instead the use and configuration of
+    <classname>Spring.Aop.Target.SimplePoolTargetSource</classname> is more
+    relevant. Pooling of objects can either be done Programatically or through
+    the XML configuration of the Spring .NET container. Attribute support for
+    pooling, similar to the ServicedComponent approach, will be available in a
+    future release of Spring.NET.</para>
+
+    <para><xref linkend="quickstarts" /> contains an example that shows the
+    use of the pooling API independent of AOP functionality.</para>
+  </sect1>
+
+  <sect1 id="pool-api">
+    <title>Interfaces and Implementations</title>
+
+    <para>The <literal>Spring.Pool</literal> namespace provides two simple
+    interfaces to manage pools of objects. The first interface,
+    <classname>IObjectPool</classname> describes how to take and put back an
+    object from the pool. The second interface
+    <classname>IPoolableObjectFactory</classname> is meant to be used in
+    conjunction with implementations of the <classname>IObjectPool</classname>
+    to provide guidance in calling various lifecycle events on the objects
+    managed by the pool. These interfaces are based on the Jakarta Commons
+    Pool API. <classname>Spring.Pool.Support.SimplePool</classname> is a
+    default implementation of <classname>IObjectPool</classname> and
+    <classname>Spring.Aop.Target.SimplePoolTargetSource</classname> is the
+    implementation of <classname>IPoolableObjectFactory</classname> for use
+    with AOP. The current goal of the Spring.Pool namespace is not to provide
+    a one-for-one replacement of the Jakarta Commons Pool API, but rather to
+    support basic object pooling needs for common AOP scenarios. Consequently,
+    other interfaces and base classes available in the Jakarta package are not
+    available.</para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/pooling-example.xml b/doc/reference/src/pooling-example.xml
new file mode 100644
index 00000000..c4a093f6
--- /dev/null
+++ b/doc/reference/src/pooling-example.xml
@@ -0,0 +1,279 @@
+  <sect1>
+    <title>Pooling example</title>
+    <para>
+    The idea is to build an executor backed by a pool of 
+    <literal>QueuedExecutor</literal>: this will show how Spring.NET 
+    provides some useful low-level/high-quality reusable threading and 
+    pooling abstractions.
+    This executor will provide parallel executions (in our case 
+    <literal>grep</literal>-like file scans).  <emphasis>Note: This example
+    is not in the 1.0.0 release to its use of classes in the Spring.Threading
+    namespace scheduled for release in Spring 1.1. To access ths example 
+    please get the code from CVS <ulink url="http://opensource.atlassian.com/confluence/spring/display/NET/Project+Structure">(instructions)</ulink> or from the download section of the 
+    Spring.NET website that contains an .zip with the full CVS tree.</emphasis>
+    </para>
+    <para>
+    Some information on <literal>QueuedExecutor</literal> is helpful to 
+    better understand the implementation and to possibly disagree with it.
+    Keep in mind that the point is to show how to develop your own 
+    object-pool.
+    </para>
+    <para>
+    A <literal>QueuedExecutor</literal> is an executor where 
+    <literal>IRunnable</literal> instances are run serialy by a worker 
+    thread. When you <literal>Execute</literal> with a 
+    <literal>QueuedExecutor</literal>, your request is queued; at some 
+    point in the future your request will be taken and executed by the 
+    worker thread: in case of error the thread is terminated. 
+    However
+    this executor recreates its worker thread as needed.
+    </para>
+    <para>Last but not least, this executor can be shut down in 
+    a few different ways (please refer to the Spring.NET SDK documentation).    
+    Given its simplicity, it is very powerful.
+    </para>
+    <para>
+    The example project <literal>Spring.Examples.Pool</literal> provides 
+    an implementation of a pooled executor, backed by n instances of 
+    <literal>Spring.Threading.QueuedExecutor</literal>: please ignore 
+    the fact that <literal>Spring.Threading</literal> includes already a
+    very different implementation of a <literal>PooledExecutor</literal>:
+    here we wanto to use a pool of <literal>QueuedExecutor</literal>s.
+    </para>
+    <para>
+    This executor will be used to implement a parallel 
+    recursive <literal>grep</literal>-like console executable.
+    </para>
+    <sect2>
+    <title>Implementing <literal>Spring.Pool.IPoolableObjectFactory</literal></title>
+    <para>
+    In order to use the <literal>SimplePool</literal> implementation,
+    the first thing to do is to implement the <literal>IPoolableObjectFactory</literal>
+    interface. This interface is intended to be implemented by objects 
+    that can create the type of objects that should be pooled.
+    The <literal>SimplePool</literal>
+    will call the lifecycle methods on <literal>IPoolableObjectFactory</literal> interface
+    (<literal>MakeObject, ActivateObject, ValidateObject, PassivateObject, and DestroyObject</literal>)
+    as appropriate when the pool is created, objects are borrowed and returned to the pool, and when
+    the pool is destroyed.
+    </para>    
+    <para>
+    In our case, as already said, we want to to implement a pool 
+    of <literal>QueuedExecutor</literal>. Ok, here the declaration:   
+    <programlisting format='linespecific' xml:space='preserve'>
+public class QueuedExecutorPoolableFactory : IPoolableObjectFactory
+{</programlisting>
+    the first task a factory should do is to create objects:
+    <programlisting format='linespecific' xml:space='preserve'>
+object IPoolableObjectFactory.MakeObject()
+{            
+    // to actually make this work as a pooled executor
+    // use a bounded queue of capacity 1.
+    // If we don't do this one of the queued executors
+    // will accept all the queued IRunnables as, by default
+    // its queue is unbounded, and the PooledExecutor
+    // will happen to always run only one thread ...
+    return new QueuedExecutor(new BoundedBuffer(1));
+}</programlisting>
+    and should be also able to destroy them:
+    <programlisting format='linespecific' xml:space='preserve'>
+void IPoolableObjectFactory.DestroyObject(object o)
+{
+    // ah, self documenting code:
+    // Here you can see that we decided to let the 
+    // executor process all the currently queued tasks.
+    QueuedExecutor executor = o as QueuedExecutor;
+    executor.ShutdownAfterProcessingCurrentlyQueuedTasks();
+}</programlisting>
+    </para>
+    <para>
+    When an object is taken from the pool, to satisfy a client request,
+    may be the object should be activated. We can possibly implement the
+    activation like this:
+    <programlisting format='linespecific' xml:space='preserve'>
+void IPoolableObjectFactory.ActivateObject(object o)
+{
+    QueuedExecutor executor = o as QueuedExecutor;
+    executor.Restart();
+}</programlisting>
+    even if a <literal>QueuedExecutor</literal> restarts itself as 
+    needed and so a valid implementation could leave this method empty.
+    </para>
+    <para>
+    After activation, and before the pooled object can be succesfully 
+    returned to the client, it is validated (should the object be 
+    invalid, it will be discarded: this can lead to an empty unusable
+    pool
+    <footnote>
+    <para>You may think that we can provide a smarter 
+    implementation and you are probably right. However, it is not so 
+    difficult to create a new pool in case the old one became unusable.
+    It could not be your preferred choice but surely it leverages 
+    simplicity and object immutability
+    </para>
+    </footnote>).
+    Here we check that the worker thread exists:
+    <programlisting format='linespecific' xml:space='preserve'>
+bool IPoolableObjectFactory.ValidateObject(object o)
+{
+    QueuedExecutor executor = o as QueuedExecutor;
+    return executor.Thread != null;
+}</programlisting>
+    </para>
+    <para>
+    Passivation, symmetrical to activation, is the process a pooled 
+    object is subject to when the object is returned to the pool. In our 
+    case we simply do nothing:
+    <programlisting format='linespecific' xml:space='preserve'>
+void IPoolableObjectFactory.PassivateObject(object o)
+{
+}</programlisting>
+    </para>
+    <para>
+    At this point, creating a pool is simply a matter of creating an 
+    <literal>SimplePool</literal> as in:
+    <programlisting format='linespecific' xml:space='preserve'>
+pool = new SimplePool(new QueuedExecutorPoolableFactory(), size);</programlisting>
+    </para>
+    </sect2>
+    <sect2>
+    <title>Being smart using pooled objects</title>
+    <para>
+    Taking advantage of the <literal>using</literal> keyword seems
+    to be very important in these <literal>c#</literal> days, so we 
+    implement a very simple helper (<literal>PooledObjectHolder</literal>)
+    that can allow us to do things like:
+    <programlisting format='linespecific' xml:space='preserve'>
+using (PooledObjectHolder holder = PooledObjectHolder.UseFrom(pool))
+{
+    QueuedExecutor executor = (QueuedExecutor) holder.Pooled;
+    executor.Execute(runnable);
+}</programlisting>
+    without worrying about obtaining and returning an object from/to the 
+    pool.
+    </para>
+    <para>
+    Here is the implementation:
+    <programlisting format='linespecific' xml:space='preserve'>
+public class PooledObjectHolder : IDisposable
+{
+    IObjectPool pool;
+    object pooled;
+
+    /// &lt;summary&gt;
+    /// Builds a new &lt;see cref=&quot;PooledObjectHolder&quot;/&gt;
+    /// trying to borrow an object form it
+    /// &lt;/summary&gt;
+    /// &lt;param name=&quot;pool&quot;&gt;&lt;/param&gt;
+    private PooledObjectHolder(IObjectPool pool)
+    {
+        this.pool = pool;
+        this.pooled = pool.BorrowObject();
+    }
+
+    /// &lt;summary&gt;
+    /// Allow to access the borrowed pooled object
+    /// &lt;/summary&gt;
+    public object Pooled
+    {
+        get
+        {
+            return pooled;
+        }
+    }
+
+    /// &lt;summary&gt;
+    /// Returns the borrowed object to the pool
+    /// &lt;/summary&gt;
+    public void Dispose()
+    {
+        pool.ReturnObject(pooled);
+    }
+
+    /// &lt;summary&gt;
+    /// Creates a new &lt;see cref=&quot;PooledObjectHolder&quot;/&gt; for the 
+    /// given pool.
+    /// &lt;/summary&gt;
+    public static PooledObjectHolder UseFrom(IObjectPool pool)
+    {
+        return new PooledObjectHolder(pool);
+    }
+}</programlisting>
+    </para>
+    <para>
+    Please don't forget to destroy all the pooled istances once you have 
+    finished! How? Well using something like this in 
+    <literal>PooledQueuedExecutor</literal>:
+    <programlisting format='linespecific' xml:space='preserve'>
+public void Stop ()
+{
+    // waits for all the grep-task to have been queued ...
+    foreach (ISync sync in syncs)
+    {
+        sync.Acquire();
+    }
+    pool.Close();
+}</programlisting>
+    </para>
+    </sect2>
+    <sect2>
+    <title>Using the executor to do a parallel <literal>grep</literal></title>
+    <para>
+    The use of the just built executor is quite straigtforward but a 
+    little tricky if we want to really exploit the pool.
+    <programlisting format='linespecific' xml:space='preserve'>
+private PooledQueuedExecutor executor;
+
+public ParallelGrep(int size)
+{
+    executor = new PooledQueuedExecutor(size);
+}
+
+public void Recurse(string startPath, string filePattern, string regexPattern)
+{            
+    foreach (string file in Directory.GetFiles(startPath, filePattern))
+    {
+        executor.Execute(new Grep(file, regexPattern));
+    }
+    foreach (string directory in Directory.GetDirectories(startPath))
+    {
+        Recurse(directory, filePattern, regexPattern);
+    }
+}
+
+public void Stop()
+{
+    executor.Stop();
+}</programlisting>
+    </para>
+    <para>    
+    <programlisting format='linespecific' xml:space='preserve'>
+public static void Main(string[] args)
+{
+    if (args.Length &lt; 3)
+    {
+        Console.Out.WriteLine(&quot;usage: {0} regex directory file-pattern [pool-size]&quot;, Assembly.GetEntryAssembly().CodeBase);
+        Environment.Exit(1);
+    }
+
+    string regexPattern = args[0];
+    string startPath = args[1];
+    string filePattern = args[2];
+    int size = 10;
+    try
+    {
+        size = Int32.Parse(args[3]);
+    }
+    catch
+    {
+    }
+    Console.Out.WriteLine (&quot;pool size {0}&quot;, size);
+
+    ParallelGrep grep = new ParallelGrep(size);
+    grep.Recurse(startPath, filePattern, regexPattern);
+    grep.Stop();
+}</programlisting>
+    </para>
+    </sect2>
+  </sect1>
+
diff --git a/doc/reference/src/preface.xml b/doc/reference/src/preface.xml
new file mode 100644
index 00000000..67102bfa
--- /dev/null
+++ b/doc/reference/src/preface.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="preface">
+  <title>Preface</title>
+
+  <para>Developing software applications is hard enough even with good tools
+  and technologies. Spring provides a light-weight solution for building
+  enterprise-ready applications. Spring provides a consistent and transparent
+  means to configure your application and integrate <link
+  linkend="aop-introduction-concepts">AOP</link> into your software. Highlights of
+  Spring's functionality are providing declarative transaction management for
+  your middle tier as well as a full-featured ASP.NET framework.</para>
+
+  <para>Spring could potentially be a one-stop-shop for many areas of
+  enterprise application development; however, Spring is modular, allowing you
+  to use just those parts of it that you need, without having to bring in the
+  rest. You can use just the IoC container to configure your application and
+  use traditional ADO.NET based data access code, but you could also choose to
+  use just the <link linkend="orm">Hibernate integration code</link>
+  or the <link linkend="ado-introduction">ADO.NET abstraction layer</link>.
+  Spring has been (and continues to be) designed to be non-intrusive, meaning
+  dependencies on the framework itself are generally none (or absolutely
+  minimal, depending on the area of use).</para>
+
+  <para>This document provides a reference guide to Spring's features. Since
+  this document is still to be considered very much work-in-progress, if you
+  have any requests or comments, please post them on the user mailing list or
+  on the support forums at <ulink
+  url="http://forum.springframework.net">forum.springframework.net</ulink>.</para>
+
+  <para>Before we go on, a few words of gratitude are due to Christian Bauer
+  (of the <ulink url="http://www.hibernate.org/">Hibernate</ulink> team), who
+  prepared and adapted the DocBook-XSL software in order to be able to create
+  Hibernate's reference guide, thus also allowing us to create this one. Also
+  thanks to Russell Healy for doing an extensive and valuable review of some
+  of the material.</para>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/psa-intro.xml b/doc/reference/src/psa-intro.xml
new file mode 100644
index 00000000..3793850b
--- /dev/null
+++ b/doc/reference/src/psa-intro.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="psa-intro">
+  <title>Introduction to Spring Services</title>
+
+  <sect1>
+    <title>Introduction</title>
+
+    <para>The goal of Spring's integration with distributed technologies is to
+    adapt plain .NET objects so they can be used with a specific distributed
+    technology. This integration is designed to be as non-intrusive as
+    possible. If you need to expose an object to a remote process then you can
+    define an exporter for that object. Similarly, on the client side you
+    define an corresponding endpoint accessor. Of course, the object's methods
+    still need to be suitable for remoting, i.e. coarse grained, to avoid
+    making unnecessary and expensive remote calls.</para>
+
+    <para>Since these exporters and client side endpoint accessors are defined
+    using meta data for Spring IoC container, you can easily use dependency
+    injection on them to set initial state and to 'wire up' the presentation
+    tier, such as web forms, to the service layer. In addition, you may apply
+    AOP aspects to the exported classes and/or service endpoints to apply
+    behavior such as logging, security, or other custom behavior that may not
+    be provided by the target distributed technology. The Spring specific
+    terminology for this approach to object distribution is known as Portable
+    Service Abstractions (PSA). As a result of this approach, you can decide
+    much later in the development process the technical details of how you
+    will distribute your objects as compared to traditional code centric
+    approaches. Changing of the implementation is done though configuration of
+    the IoC container and not by recompilation. Of course, you may choose to
+    not use the IoC container to manage these objects and use the exporter and
+    service endpoints programatically.</para>
+
+    <para>The diagram shown below is a useful way to demonstrate the key
+    abstractions in the Spring tool chest and their interrelationships. The
+    four key concepts are; plain .NET objects, Dependency Injection, AOP, and
+    Portable Service Abstractions. At the heart sits the plain .NET object
+    that can be instantiated and configured using dependency injection. Then,
+    optionally, the plain object can be adapted to a specific distributed
+    technology. Lastly, additional behavior can be applied to objects. This
+    behavior is typically that which can not be easily address by traditional
+    OO approaches such as inheritance. In the case of service layer, common
+    requirements such as 'the service layer must be transactional' are
+    implemented in a manner that naturally expresses that intention in a
+    single place, as compared to scattered code across the service
+    layer.</para>
+
+    <para><mediaobject>
+        <imageobject>
+          <imagedata fileref="images/spring-triangle.png" format="PNG"
+                     scale="50" />
+        </imageobject>
+      </mediaobject>Spring implements this exporter functionality by creating
+    a proxy at runtime that meets the implementation requirements of a
+    specific distributed technology. In the case of .NET Remoting the proxy
+    will inherit from MarshalByRef, for EnterpriseServices it will inherit
+    from ServicedComponent and for aspx web services, WebMethod attributes
+    will be added to methods. Client side functionality is often implemented
+    by a thin layer over the client access mechanism of the underlying
+    distributed technology, though in some cases such as client side access to
+    web services, you have the option to create a proxy on the fly from the
+    .wsdl definition, much like you would have done using the command line
+    tools.</para>
+
+    <para>The common implementation theme for you as a provider of these
+    service objects is to implement an interface. This is generally considered
+    a best practice in its own right, you will see most pure WCF examples
+    following this practice, and also lends itself to a straightforward
+    approach to unit testing business functionality as stub or mock
+    implementations may be defined for testing purposes.</para>
+
+    <para>The assembly <literal>Spring.Services.dll</literal> contains support
+    for <link linkend="remoting">.NET Remoting</link>, <link
+    linkend="services">Enterprise Services</link> and <link
+    linkend="webservices">ASMX Web Services</link>. Support for WCF services
+    is planned for Spring 1.2 and is currently in the CVS repository if you
+    care to take an early look.</para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/quickstarts.xml b/doc/reference/src/quickstarts.xml
new file mode 100644
index 00000000..475ef060
--- /dev/null
+++ b/doc/reference/src/quickstarts.xml
@@ -0,0 +1,646 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2002-2005 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.
+ */
+-->
+<chapter id="quickstarts">
+  <title>IoC Quickstarts</title>
+
+  <sect1>
+    <title>Introduction</title>
+
+    <para>This chapter includes a grab bag of quickstart examples for using
+    the Spring.NET framework.</para>
+  </sect1>
+
+  <sect1 id="qs-moviefinder">
+    <title>Movie Finder</title>
+
+    <para>The source material for this simple demonstration of Spring.NET's
+    IoC features is lifted straight from Martin Fowler's article that
+    discussed the ideas underpinning the IoC pattern. See <ulink
+    url="http://martinfowler.com/articles/injection.html">Inversion of Control
+    Containers and the Dependency Injection pattern</ulink> for more
+    information. The motivation for basing this quickstart example on said
+    article is because the article is pretty widely known, and most people who
+    are looking at IoC for the first time typically will have read the article
+    (at the time of writing a <ulink
+    url="http://www.google.co.uk/search?q=ioc">simple Google search for
+    'IoC'</ulink> yields the article in the first five results).</para>
+
+    <para>Fowler's article used the example of a search facility for movies to
+    illustrate IoC and Dependency Injection (DI). The article described how a
+    <literal>MovieLister</literal> object might receive a reference to an
+    implementation of the <literal>IMovieFinder</literal> interface (using
+    DI).</para>
+
+    <para>The <literal>IMovieFinder</literal> returns a list of all movies and
+    the <literal>MovieLister</literal> filters this list to return an array of
+    <literal>Movie</literal>objects that match a specified directors name.
+    This example demonstrates how the Spring.NET IoC container can be used to
+    supply an appropriate <literal>IMovieFinder</literal> implementation to an
+    arbitrary <literal>MovieLister</literal> instance.</para>
+
+    <para>The C# code listings for the MovieFinder application can be found in
+    the <literal>examples/Spring/Spring.Examples.MovieFinder</literal>
+    directory off the top level directory of the Spring.NET
+    distribution.</para>
+
+    <para><mediaobject>
+        <imageobject>
+          <imagedata fileref="images/movie-finder.gif" format="GIF" />
+        </imageobject>
+      </mediaobject></para>
+
+    <sect2 id="qs-mf-gettingstarted">
+      <title>Getting Started - Movie Finder</title>
+
+      <para>The startup class for the MovieFinder example is the
+      <literal>MovieApp</literal> class, which is an ordinary .NET class with
+      a single application entry point... <programlisting>using System;
+namespace Spring.Examples.MovieFinder
+{
+  public class MovieApp
+  {
+    public static void Main ()
+    {
+    }
+  }
+}</programlisting></para>
+
+      <para>What we want to do is get a reference to an instance of the
+      <literal>MovieLister</literal> class... since this is a Spring.NET
+      example we'll get this reference from Spring.NET's IoC container, the
+      <literal>IApplicationContext</literal>. There are a number of ways to
+      get a reference to an <literal>IApplicationContext</literal> instance,
+      but for this example we'll be using an
+      <literal>IApplicationContext</literal> that is instantiated from a
+      custom configuration section in a standard .NET application config
+      file...</para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="utf-8" ?&gt;
+&lt;configuration&gt;
+    &lt;configSections&gt;
+        &lt;sectionGroup name="spring"&gt;
+            &lt;section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/&gt;
+            &lt;section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" /&gt;
+        &lt;/sectionGroup&gt;
+    &lt;/configSections&gt;
+    &lt;spring&gt;
+        &lt;context&gt;
+            &lt;resource uri="config://spring/objects"/&gt;
+        &lt;/context&gt;
+        &lt;objects xmlns="http://www.springframework.net"&gt;
+            &lt;description&gt;An  example that demonstrates simple IoC features.&lt;/description&gt;
+        &lt;/objects&gt;
+    &lt;/spring&gt;
+&lt;/configuration&gt;</programlisting>
+
+      <para>The objects that will be used in the example application will be
+      configured as XML <literal>&lt;object/&gt;</literal> elements nested
+      inside the <literal>&lt;objects/&gt;</literal> element.</para>
+
+      <para>The body of the <literal>Main</literal> method in the
+      <literal>MovieApp</literal> class can now be fleshed out a little
+      further... <programlisting>
+using System;
+using Spring.Context;
+...
+    public static void Main ()
+    {
+      IApplicationContext ctx = ContextRegistry.GetContext();
+    }
+...</programlisting>As can be seen in the above C# snippet, a
+      <literal>using</literal> statement has been added to the
+      <literal>MovieApp</literal> source. The
+      <literal>Spring.Context</literal> namespace gives the application access
+      to the <literal>IApplicationContext</literal> class that will serve as
+      the primary means for the application to access the IoC container. The
+      line of code... <programlisting>IApplicationContext ctx = ContextRegistry.GetContext();</programlisting>
+      ... retrieves a fully configured <literal>IApplicationContext</literal>
+      implementation that has been configured using the named
+      <literal>&lt;objects/&gt;</literal> section from the application config
+      file.</para>
+    </sect2>
+
+    <sect2 id="qs-mf-firstobject">
+      <title>First Object Definition</title>
+
+      <para>As yet, no objects have been defined in the application config
+      file, so let's do that now. The very miminal XML definition for the
+      <literal>MovieLister</literal> instance that we are going to use in the
+      application can be seen in the following XML snippet...</para>
+
+      <programlisting>&lt;objects xmlns="http://www.springframework.net"&gt;
+    &lt;object name="MyMovieLister"
+      type="Spring.Examples.MovieFinder.MovieLister, Spring.Examples.MovieFinder"&gt;
+    &lt;/object&gt;
+  &lt;/objects&gt;</programlisting>
+
+      <para>Notice that the full, assembly-qualified name of the
+      <literal>MovieLister</literal> class has been specified in the
+      <literal>type</literal> attribute of the object definition, and that the
+      definition has been assigned the (unique) id of
+      <literal>MyMovieLister</literal>. Using this id, an instance of the
+      object so defined can be retrieved from the
+      <literal>IApplicationContext</literal> reference like so...</para>
+
+      <programlisting>...
+    public static void Main ()
+    {
+      IApplicationContext ctx = ContextRegistry.GetContext();
+      MovieLister lister = (MovieLister) ctx.GetObject ("MyMovieLister");
+    }
+...</programlisting>
+
+      <para>The <literal>lister</literal> instance has not yet had an
+      appropriate implementation of the <literal>IMovieFinder</literal>
+      interface injected into it. Attempting to use the
+      <literal>MoviesDirectedBy</literal> method will most probably result in
+      a nasty <literal>NullReferenceException</literal> since the
+      <literal>lister</literal> instance does not yet have a reference to an
+      <literal>IMovieFinder</literal>. The XML configuration for the
+      <literal>IMovieFinder</literal> implementation that is going to be
+      injected into the <literal>lister</literal> instance looks like
+      this...</para>
+
+      <programlisting>&lt;objects xmlns="http://www.springframework.net"&gt;
+    &lt;object name="MyMovieFinder"
+        type="Spring.Examples.MovieFinder.SimpleMovieFinder, Spring.Examples.MovieFinder"/&gt;
+    &lt;/object&gt;
+&lt;/objects&gt;</programlisting>
+    </sect2>
+
+    <sect2 id="qs-mf-setterinjection">
+      <title>Setter Injection</title>
+
+      <para>What we want to do is inject the <literal>IMovieFinder</literal>
+      instance identified by the <literal>MyMovieFinder</literal> id into the
+      <literal>MovieLister</literal> instance identified by the
+      <literal>MyMovieLister</literal> id, which can be accomplished using
+      Setter Injection and the following XML... <programlisting>&lt;objects xmlns="http://www.springframework.net"&gt;
+    &lt;object name="MyMovieLister"
+      type="Spring.Examples.MovieFinder.MovieLister, Spring.Examples.MovieFinder"&gt;
+        &lt;!-- using setter injection... --&gt;
+        &lt;property name="movieFinder" ref="MyMovieFinder"/&gt;
+    &lt;/object&gt;
+    &lt;object name="MyMovieFinder"
+        type="Spring.Examples.MovieFinder.SimpleMovieFinder, Spring.Examples.MovieFinder"/&gt;
+    &lt;/object&gt;
+&lt;/objects&gt;</programlisting>When the <literal>MyMovieLister</literal>
+      object is retrieved from (i.e. instantiated by) the
+      <literal>IApplicationContext</literal> in the application, the
+      Spring.NET IoC container will inject the reference to the
+      <literal>MyMovieFinder</literal> object into the
+      <literal>MovieFinder</literal> property of the
+      <literal>MyMovieLister</literal> object. The
+      <literal>MovieLister</literal> object that is referenced in the
+      application is then fully configured and ready to be used in the
+      application to do what is does best... list movies by director.
+      <programlisting>...
+    public static void Main ()
+    {
+      IApplicationContext ctx = ContextRegistry.GetContext();
+      MovieLister lister = (MovieLister) ctx.GetObject ("MyMovieLister");
+      Movie[] movies = lister.MoviesDirectedBy("Roberto Benigni");
+      Console.WriteLine ("\nSearching for movie...\n");
+      foreach (Movie movie in movies)
+      {
+          Console.WriteLine (
+              string.Format ("Movie Title = '{0}', Director = '{1}'.",
+              movie.Title, movie.Director));
+      }
+      Console.WriteLine ("\nMovieApp Done.\n\n");
+    }
+...</programlisting>To help ensure that the XML configuration of the
+      MovieLister class must specify a value for the MovieFinder property, you
+      can add the [Required] attribute to the MovieLister's MovieFinder
+      property. The example code shows uses this attribute. For more
+      information on using and configuring the [Required] attribute, refer to
+      this <link
+      linkend="object-factory-extension-opp-examplesrapp">section</link> of
+      the reference documentation.</para>
+    </sect2>
+
+    <sect2 id="qs-mf-constructorinjection">
+      <title>Constructor Injection</title>
+
+      <para>Let's define another implementation of the
+      <literal>IMovieFinder</literal> interface in the application config
+      file...<programlisting>...
+  &lt;object name="AnotherMovieFinder"
+      type="Spring.Examples.MovieFinder.ColonDelimitedMovieFinder, Spring.Examples.MovieFinder"&gt;
+  &lt;/object&gt;
+...</programlisting>This XML snippet describes an
+      <literal>IMovieFinder</literal> implementation that uses a colon
+      delimited text file as it's movie source. The C# source code for this
+      class defines a single constructor that takes a
+      <classname>System.IO.FileInfo</classname> as it's single constructor
+      argument. As this object definition currently stands, attempting to get
+      this object out of the <literal>IApplicationContext</literal> in the
+      application with a line of code like so... <programlisting>IMovieFinder finder = (IMovieFinder) ctx.GetObject ("AnotherMovieFinder");</programlisting>
+      will result in a fatal
+      <classname>Spring.Objects.Factory.ObjectCreationException</classname>,
+      because the
+      <classname>Spring.Examples.MovieFinder.ColonDelimitedMovieFinder</classname>
+      class does not have a default constructor that takes no arguments. If we
+      want to use this implementation of the <literal>IMovieFinder</literal>
+      interface, we will have to supply an appropriate constructor
+      argument...<programlisting>...
+  &lt;object name="AnotherMovieFinder"
+      type="Spring.Examples.MovieFinder.ColonDelimitedMovieFinder, Spring.Examples.MovieFinder"&gt;
+      &lt;constructor-arg index="0" value="movies.txt"/&gt;
+  &lt;/object&gt;
+...</programlisting></para>
+
+      <para>Unsurprisingly, the &lt;constructor-arg/&gt; element is used to
+      supply constructor arguments to the constructors of managed objects. The
+      Spring.NET IoC container uses the functionality offered by
+      <classname>System.ComponentModel.TypeConverter</classname>
+      specializations to convert the <literal>movies.txt</literal> string into
+      an instance of the <classname>System.IO.FileInfo</classname> that is
+      required by the single constructor of the
+      <classname>Spring.Examples.MovieFinder.ColonDelimitedMovieFinder</classname>
+      (see <xref linkend="objects-objects-conversion" /> for a more in depth
+      treatment concerning the automatic type conversion functionality offered
+      by Spring.NET).</para>
+
+      <para>So now we have two implementations of the
+      <literal>IMovieFinder</literal> interface that have been defined as
+      distinct object definitions in the config file of the example
+      application; if we wanted to, we could switch the implementation that
+      the <literal>MyMovieLister</literal> object uses like
+      so...<programlisting>...
+  &lt;object name="MyMovieLister"
+    type="Spring.Examples.MovieFinder.MovieLister, Spring.Examples.MovieFinder"&gt;
+      &lt;!-- lets use the colon delimited implementation instead --&gt;
+      &lt;property name="movieFinder" ref="AnotherMovieFinder"/&gt;
+  &lt;/object&gt;
+  &lt;object name="MyMovieFinder"
+      type="Spring.Examples.MovieFinder.SimpleMovieFinder, Spring.Examples.MovieFinder"/&gt;
+  &lt;/object&gt;
+  &lt;object name="AnotherMovieFinder"
+      type="Spring.Examples.MovieFinder.ColonDelimitedMovieFinder, Spring.Examples.MovieFinder"&gt;
+      &lt;constructor-arg index="0" value="movies.txt"/&gt;
+  &lt;/object&gt;
+...</programlisting></para>
+
+      <para>Note that there is no need to recompile the application to effect
+      this change of implementation... simply changing the application config
+      file and then restarting the application will result in the Spring.NET
+      IoC container injecting the colon delimited implementation of the
+      <literal>IMovieFinder</literal> interface into the
+      <literal>MyMovieLister</literal> object.</para>
+    </sect2>
+
+    <sect2 id="qs-mf-summary">
+      <title>Summary</title>
+
+      <para>This example application is quite simple, and admittedly it
+      doesn't do a whole lot. It does however demonstrate the basics of wiring
+      together an object graph using an intuitive XML format. These simple
+      features will get you through pretty much 80% of your object wiring
+      needs. The remaining 20% of the available configuration options are
+      there to cover corner cases such as factory methods, lazy
+      initialization, and suchlike (all of the configuration options are
+      described in detail in the <xref linkend="objects" />).</para>
+    </sect2>
+
+    <sect2>
+      <title>Logging</title>
+
+      <para>Often enough the first use of Spring.NET is also a first
+      introduction to log4net. To kick start your understanding of log4net
+      this section gives a quick overview. The authoritative place for
+      information on log4net is the <ulink
+      url="http://logging.apache.org/log4net/">log4net website</ulink>. Other
+      good online tutorials are <ulink
+      url="http://www.ondotnet.com/pub/a/dotnet/2003/06/16/log4net.html?page=1">Using
+      log4net (OnDotNet article)</ulink> and <ulink
+      url="http://haacked.com/archive/2005/03/07/2317.aspx">Quick and Dirty
+      Guide to Configuring Log4Net For Web Applications</ulink>. Spring.NET is
+      using version 1.2.9 whereas most of the documentation out there is for
+      version 1.2.0. There have been some changes between the two so always
+      double check at the log4net web site for definitive information. Also
+      note that we are investigating using a "commons" logging library so that
+      Spring.NET will not be explicity tied to log4net but will be able to use
+      other logging packages such as NLog and Microsoft enterprise logging
+      application block.</para>
+
+      <para>The general usage pattern for log4net is to configure your
+      loggers, (either in App/Web.config or a seperate file), initialize
+      log4net in your main application, declare some loggers in code, and then
+      log log log. (Sing along...) We are using App.config to configure the
+      loggers. As such, we declare the log4net configuration section handler
+      as shown below <programlisting>&lt;section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /&gt;</programlisting>
+      The corresponding configuration section looks like this <programlisting>
+&lt;log4net&gt; 
+  &lt;appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender"&gt; 
+     &lt;layout type="log4net.Layout.PatternLayout"&gt; 
+        &lt;conversionPattern value="%date [%thread] %-5level %logger - %message%newline" /&gt; 
+     &lt;/layout&gt; 
+  &lt;/appender&gt; 
+
+  &lt;!-- Set default logging level to DEBUG --&gt;
+  &lt;root&gt; 
+     &lt;level value="DEBUG" /&gt; 
+     &lt;appender-ref ref="ConsoleAppender" /&gt; 
+  &lt;/root&gt; 
+  
+  &lt;!-- Set logging for Spring to INFO.  Logger names in Spring correspond to the namespace --&gt;
+  &lt;logger name="Spring"&gt; 
+     &lt;level value="INFO" /&gt; 
+  &lt;/logger&gt; 
+&lt;/log4net&gt; 
+      </programlisting> The appender is the output sink - in this case the
+      console. There are a large variety of output sinks such as files,
+      databases, etc. Refer to the log4net <ulink
+      url="http://logging.apache.org/log4net/release/config-examples.html">Config
+      Examples</ulink> for more information. Of interest as well is the
+      PatternLayout which defines exactly the information and format of what
+      gets logged. Usually this is the date, thread, logging level, logger
+      name, and then finally the log message. Refer to <ulink
+      url="http://logging.apache.org/log4net/release/sdk/log4net.Layout.PatternLayout.html">PatternLayout
+      Documentation</ulink> for information on how to customize.</para>
+
+      <para>The logging name is up to you to decide when you declare the
+      logger in code. In the case of this example we used the convention of
+      giving the logging name the name of the fully qualified class name.
+      <programlisting>private static readonly ILog LOG = LogManager.GetLogger(typeof (MovieApp));</programlisting>
+      Other conventions are to give the same logger name across multiple
+      classes that constitute a logical component or subsystem within the
+      application, for example a data access layer. One tip in selecting the
+      pattern layout is to shorten the logging name to only the last 2 parts
+      of the fully qualified name to avoid the message sneaking off to the
+      right too much (where can't see it) because of all the other information
+      logged that precedes it. Shortening the logging name is done using the
+      format %logger{2}.</para>
+
+      <para>To initialize the logging system add the following to the start of
+      your application <programlisting>XmlConfigurator.Configure();</programlisting>
+      Note that if you are using or reading information on version 1.2.0 this
+      used to be called DOMConfigurator.Configure();</para>
+
+      <para>The logger sections associate logger names with logging levels and
+      appenders. You have great flexibility to mix and match names, levels,
+      and appenders. In this case we have defined the root logger (using the
+      special tag root) to be at the debug level and have an console sink. We
+      can then specialize other loggers with different setting. In this case,
+      loggers that start with "Spring" in their name are logged at the info
+      level and also sent to the console. Setting the value of this logger
+      from INFO to DEBUG will show you detailed logging information as the
+      Spring container goes about its job of creating and configuring your
+      objects. Coincidentally, the example code itself uses Spring in the
+      logger name, so this logger also controls the output level you see from
+      running MainApp. Finally, you are ready to use the simple logger api to
+      log, i.e. <programlisting>LOG.Info("Searching for movie...");</programlisting>
+      Logging exceptions is another common task, which can be done using the
+      error level <programlisting>try {
+   //do work
+{
+catch (Exception e)
+{
+  LOG.Error("Movie Finder is broken.", e);
+}</programlisting></para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="qs-appcontext-messagesource">
+    <title>ApplicationContext and IMessageSource</title>
+
+    <sect2>
+      <title>Introduction</title>
+
+      <para>The example program <literal>Spring.Examples.AppContext</literal>
+      shows the use of the application context for text localization,
+      retrieving objects contained in ResourceSets, and applying the values of
+      embedded resource properties to an object. The values that are retrieved
+      are displayed in a window.</para>
+
+      <para>The application context configuration file contains an object
+      definition with the name <literal>messageSource</literal> of the type
+      <literal>Spring.Context.Support.ResourceSetMessageSource</literal> which
+      implements the interface <literal>IMessageSource</literal>. This
+      interface provides various methods for retrieving localized resources
+      such as text and images as described in <xref
+      linkend="context-functionality-messagesource" />. When creating an
+      instance of IApplicationContext, an object with the name 'messageSource'
+      is searched for and used as the implementation for the context's
+      IMessageSource functionality.</para>
+
+      <para>The <literal>ResourceSetMessageSource</literal> takes a list of
+      ResourceManagers to define the collection of culture-specific resources.
+      The ResourceManager can be contructed in two ways. The first way is to
+      specifying a two part string consisting of the base resource name and
+      the containing assembly. In this example there is an embedded resource
+      file, Images.resx in the project. The second way is to use helper
+      factory class <literal>ResourceManagerFactoryObject</literal> that takes
+      a resource base name and assembly name as properties. This second way of
+      specifying a ResourceManager is useful if you would like direct access
+      to the ResourceManager in other parts of your application. In the
+      example program an embedded resource file, MyResource.resx and a Spanish
+      specific resource file, MyResources.es.resx are declared in this manner.
+      The corresponding XML fragment is shown below <programlisting>...
+        &lt;object name="messageSource" type="Spring.Context.Support.ResourceSetMessageSource, Spring.Core"&gt;
+          &lt;property name="resourceManagers"&gt;
+            &lt;list&gt;
+              &lt;value&gt;Spring.Examples.AppContext.Images, Spring.Examples.AppContext&lt;/value&gt;
+              &lt;ref object="myResourceManager"/&gt;
+            &lt;/list&gt;
+          &lt;/property&gt;
+        &lt;/object&gt;
+  
+        &lt;object name="myResourceManager" type="Spring.Objects.Factory.Config.ResourceManagerFactoryObject, Spring.Core"&gt;
+          &lt;property name="baseName"&gt;
+            &lt;value&gt;Spring.Examples.AppContext.MyResource&lt;/value&gt;
+          &lt;/property&gt;
+          &lt;property name="assemblyName"&gt;
+            &lt;value&gt;Spring.Examples.AppContext&lt;/value&gt;
+          &lt;/property&gt;    
+        &lt;/object&gt;
+...</programlisting></para>
+
+      <para>The main application creates the application context and then
+      retrieves various resources via their key names. In the code all the key
+      names are declared as static fields in the class
+      <literal>Keys.</literal> The resource file Images.resx contains image
+      data under the key name <literal>bubblechamber</literal> (aka
+      Keys.BUBBLECHAMBER). The code <literal>Image image =
+      (Image)ctx.GetResourceObject(Keys.BUBBLECHAMBER);</literal> is used to
+      retrieve the image from the context. The resource files MyResource.resx
+      contains a text resource, <literal>Hello {0} {1}</literal> under the key
+      name <literal>HelloMessage</literal> (aka Keys.HELLO_MESSAGE) that can
+      be used for string text formatting purposes. The example code
+      <programlisting>
+string msg = ctx.GetMessage(Keys.HELLO_MESSAGE,
+                            CultureInfo.CurrentCulture,
+                            "Mr.", "Anderson");
+</programlisting> retrieves the text string and replaces the placeholders in
+      the string with the passed argument values resulting in the text, "Hello
+      Mr. Anderson". The current culture is used to select the resource file
+      MyResource.resx. If instead the Spanish culture is specified
+      <programlisting>
+CultureInfo spanishCultureInfo = new CultureInfo("es");
+string esMsg = ctx.GetMessage(Keys.HELLO_MESSAGE,
+                              spanishCultureInfo,
+                              "Mr.", "Anderson");
+</programlisting> Then the resource file MyResource.es.resx is used instead as
+      in standard .NET localization. Spring is simply delegating to .NET
+      ResourceManager to select the appropriate localized resource. The
+      Spanish version of the resource differs from the English one in that the
+      text under the key <literal>HelloMessage</literal> is <literal>Hola {0}
+      {1}</literal> resulting in the text <literal>"Hola Mr.
+      Anderson"</literal>.</para>
+
+      <para>As you can see in this example, the title "Mr." should not be used
+      in the case of the spanish localization. The title can be abstracted out
+      into a key of its own, called <literal>FemaleGreeting</literal> (aka
+      Keys.FEMALE_GREETING). The replacement value for the message argument
+      {0} can then be made localization aware by wrapping the key in a
+      convenience class DefaultMessageResolvable. The code <programlisting>
+string[] codes = {Keys.FEMALE_GREETING};
+DefaultMessageResolvable dmr = new DefaultMessageResolvable(codes, null);
+
+msg = ctx.GetMessage(Keys.HELLO_MESSAGE,
+                     CultureInfo.CurrentCulture,
+                     dmr, "Anderson");
+</programlisting> will assign msg the value, Hello Mrs. Anderson, since the
+      value for the key <literal>FemaleGreeting</literal> in MyResource.resx
+      is 'Mrs.' Similarly, the code <programlisting>
+esMsg = ctx.GetMessage(Keys.HELLO_MESSAGE,
+                       spanishCultureInfo,
+                       dmr, "Anderson");
+</programlisting> will assign esMsg the value, Hola Senora Anderson, since the
+      value for the key <literal>FemaleGreeting</literal> in
+      MyResource.es.resx is 'Senora'.</para>
+
+      <para>Localization can also apply to objects and not just strings. The
+      .NET 1.1 framework provides the utility class ComponentResourceManager
+      that can apply multiple resource values to object properties in a
+      performant manner. (VS.NET 2005 makes heavy use of this class in the
+      code it generates for winform applications.) The example program has a
+      simple class, Person, that has an integer property Age and a string
+      property Name. The resource file, Person.resx contains key names that
+      follow the pattern, person.&lt;PropertyName&gt;. In this case it
+      contains person.Name and person.Age. The code to assign these resource
+      values to an object is shown below <programlisting>
+Person p = new Person();
+ctx.ApplyResources(p, "person", CultureInfo.CurrentUICulture);
+</programlisting> While you could also use the Spring itself to set the
+      properties of these objects, the configuration of simple properties
+      using Spring will not take into account localization. It may be
+      convenient to combine approaches and use Spring to configure the
+      Person's object references while using IApplicationContext inside an
+      AfterPropertiesSet callback (see IInitializingObject) to set the
+      Person's culture aware properties.</para>
+    </sect2>
+  </sect1>
+
+  <sect1>
+    <title>ApplicationContext and IEventRegistry</title>
+
+    <sect2>
+      <title>Introduction</title>
+
+      <para>The example program
+      <literal>Spring.Examples.EventRegistry</literal> shows how to use the
+      application context to wire .NET events in a loosely coupled
+      manner.</para>
+
+      <para>Loosely coupled eventing is normally associated with Message
+      Oriented Middleware (MOM) where a daemon process acts as a message
+      broker between other independent processes. Processes communicate
+      indirectly with each other by sending messages though the message
+      broker. The process that initiates the communication is known as a
+      publisher and the process that receives the message is known as the
+      subscriber. By using an API specific to the middleware these processes
+      register themselves as either publishers or subscribers with the message
+      broker. The communication between the publisher and subscriber is
+      considered loosely coupled because neither the publisher nor subscriber
+      has a direct reference to each other, the messages broker acts as an
+      intermediary between the two processes. The
+      <literal>IEventRegistry</literal> is the analogue of the message broker
+      as applied to .NET events. Publishers are classes that invoke a .NET
+      event, subscribers are the classes that register interest in these
+      events, and the messages sent between them are instances of
+      System.EventArgs. The implementation of
+      <literal>IEventRegistry</literal> determines the exact semantics of the
+      notification style and coupling between subscribers and
+      publishers.</para>
+
+      <para>The <literal>IApplicationContext</literal> interface extends the
+      <literal>IEventRegistry</literal> interface and implementations of
+      <literal>IApplicationContext</literal> delegate the event registry
+      functionality to an instance of
+      <literal>Spring.Objects.Events.Support.EventRegistry</literal>.
+      <literal>IEventRegistry</literal> is a simple inteface with one publish
+      method and two subscribe methods. Refer to <xref
+      linkend="context-functionality-pubsub" /> for a reminder of their
+      signatures. The
+      <literal>Spring.Objects.Events.Support.EventRegistry</literal>
+      implementation is essentially a convenience to decouple the event wiring
+      process between publisher and subscribers. In this implementation, after
+      the event wiring is finished, publishers are directly coupled to the
+      subscribers via the standard .NET eventing mechanisms. Alternate
+      implementations could increase the decoupling further by having the
+      event registry subscribe to the events and be responsible for then
+      notifying the subscribers.</para>
+
+      <para>In this example the class <literal>MyClientEventArgs</literal> is
+      a subclass of <literal>System.EventArgs</literal> that defines a string
+      property EventMessage. The class <literal>MyEventPublisher</literal>
+      defines a public event with the delegate signature <literal>void
+      SimpleClientEvent( object sender, MyClientEventArgs args )</literal> The
+      method <literal>void ClientMethodThatTriggersEvent1()</literal> fires
+      this event. On the subscribing side, the class
+      <literal>MyEventSubscriber</literal> contains a method,
+      <literal>HandleClientEvents</literal> that matches the delegate
+      signature and has a boolean property which is set to true if this method
+      is called.</para>
+
+      <para>The publisher and subscriber classes are defined in an application
+      context configuration file but that is not required in order to
+      participate with the event registry. The main program,
+      <literal>EventRegistryApp</literal> creates the application context and
+      asks it for an instance of <literal>MyEventPublisher</literal> The
+      publisher is registered with the event registry via the call,
+      <literal>ctx.PublishEvents( publisher )</literal>. The event registry
+      keeps a reference to this publisher for later use to register any
+      subscribers that match its event signature. Two subscribers are then
+      created and one of them is wired to the publisher by calling the method
+      <literal>ctx.Subscribe( subscriber, typeof(MyEventPublisher) )</literal>
+      Specifying the type indicates that the subscriber should be registered
+      only to events from objects of the type
+      <literal>MyEventPublisher</literal>. This acts as a simple filtering
+      mechanism on the subscriber.</para>
+
+      <para>The publisher then fires the event using normal .NET eventing
+      semantics and the subscriber is called. The subscriber prints a message
+      to the console and sets a state variable to indicate it has been called.
+      The program then simply prints the state variable of the two
+      subscribers, showing that only one of them (the one that registered with
+      the event registry) was called.</para>
+    </sect2>
+  </sect1>
+
+  &pooling-example;
+
+  <sect1>
+    <title>AOP</title>
+
+    <para>Refer to <xref linkend="aop-quickstart" />.</para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/remoting-quickstart.xml b/doc/reference/src/remoting-quickstart.xml
new file mode 100644
index 00000000..b47565e4
--- /dev/null
+++ b/doc/reference/src/remoting-quickstart.xml
@@ -0,0 +1,817 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="remoting-quickstart">
+  <title>Portable Service Abstraction Quick Start</title>
+
+  <sect1 id="qs-remoting-introduction">
+    <title>Introduction</title>
+
+    <para>This quickstart demonstrates the basic usage of Spring.NET's
+    portable service abstraction functionality. Sections 2-5 demonstrate the
+    use of .NET Remoting, Section 6 shows the use of the
+    ServicedComponentExporter for .NET Enterprise Services, and Section 7
+    shows the use of the WebServiceExporter.</para>
+  </sect1>
+
+  <sect1 id="qs-remoting-projectstructure">
+    <title>.NET Remoting Example</title>
+
+    <para>The infrastructure classes are located in the
+    <literal>Spring.Services</literal> assembly under the
+    <literal>Spring.Services.Remoting</literal> namespace. The overall
+    strategy is to export .NET objects on the server side as either CAO or SAO
+    objects using <classname>CaoExporter</classname> or
+    <classname>SaoExporter</classname> and obtain references to these objects
+    on the client side using <classname>CaoFactoryObject</classname> and
+    <classname>SaoFactoryObject</classname>. This quickstart does assume
+    familiarity with .NET Remoting on the part of the reader. If you are new
+    to .NET remoting you may find the links to introductory remoting material
+    presented at the conclusion of this quickstart of some help.</para>
+
+    <para>As usual with quick start examples in Spring.NET, the classes used
+    in the quickstart are intentionally simple. In the specific case of this
+    remoting quickstart we are going to make a simple calculator that can be
+    accessed remotely. The same calculator class will be exported in multiple
+    ways reflecting the variety of .NET remoting options available (CAO,
+    SAO-SingleCall, SAO-Singleton) and also the use of adding AOP advice to
+    SAO hosted objects.</para>
+
+    <para>The example solution is located in the
+    <literal>examples\Spring\Spring.Calculator</literal> directory and
+    contains multiple projects.</para>
+
+    <para><mediaobject>
+        <imageobject>
+          <imagedata fileref="images/remoting-solution.gif" format="GIF" />
+        </imageobject>
+      </mediaobject></para>
+
+    <para>The <literal>Spring.Calculator.Contract</literal> project contains
+    the interface <classname>ICalculator</classname> that defines the basic
+    operations of a calculator and another interface
+    <classname>IAdvancedCalculator</classname> that adds support for memory
+    storage for results. (woo hoo - big feature - HP-12C beware!) These
+    interfaces are shown below. The
+    <literal>Spring.Calculator.Services</literal> project contains an
+    implementation of the these interfaces, namely the classes
+    <classname>Calculator</classname> and
+    <classname>AdvancedCalculator</classname>. The purpose of the
+    <classname>AdvancedCalculator</classname> implementation is to demonstrate
+    the configuration of object state for SAO-singleton objects. Note that the
+    calculator implementations <emphasis>do not</emphasis> inherit from the
+    <classname>MarshalByRefObject</classname> class. The
+    <literal>Spring.Calculator.ClientApp</literal> project contains the client
+    application and the <literal>Spring.Calculator.RemoteApp</literal> project
+    contains a console application that will host a Remoted instance of the
+    <classname>AdvancedCalculator</classname> class. The
+    <literal>Spring.Aspects</literal> project contains some logging advice
+    that will be used to demonstrate the application of aspects to remoted
+    objects. <literal>Spring.Calculator.RegisterComponentServices</literal> is
+    related to enterprise service exporters and is not relevant for this
+    quickstart. <literal>Spring.Calculator.Web</literal> is related to web
+    services exporters and is not relevant for this quickstart.</para>
+
+    <programlisting>public interface ICalculator
+{
+    int Add(int n1, int n2);
+
+    int Subtract(int n1, int n2);
+
+    DivisionResult Divide(int n1, int n2);
+
+    int Multiply(int n1, int n2);
+}
+
+[Serializable]
+public class DivisionResult
+{
+	  private int _quotient = 0;
+	  private int _rest = 0;
+
+	  public int Quotient
+	  {
+		  get { return _quotient; }
+		  set { _quotient = value; }
+	  }
+
+	  public int Rest
+	  {
+		  get { return _rest; }
+		  set { _rest = value; }
+	  }
+}</programlisting>
+
+    <para>An extension of this interface that supports having a slot for
+    calculator memory is shown below</para>
+
+    <programlisting>public interface IAdvancedCalculator : ICalculator
+{
+	int GetMemory();
+
+	void SetMemory(int memoryValue);
+
+	void MemoryClear();
+
+	void MemoryAdd(int num);
+}</programlisting>
+
+    <para>The structure of the VS.NET solution is a consequence of following
+    the best practice of using interfaces to share type information between a
+    .NET remoting client and server. The benefits of this approach are that
+    the client does not need a reference to the assembly that contains the
+    implementation class. Having the client reference the implementation
+    assembly is undesirable for a variety of reasons. One reason being
+    security since an untrusted client could potentially obtain the source
+    code to the implementation since Intermediate Language (IL) code is easily
+    reverse engineered. Another, more compelling, reason is to provide a
+    greater decoupling between the client and server so the server can update
+    its implementation of the interface in a manner that is quite transparent
+    to the client; i.e. the client code need not change. Independent of .NET
+    remoting best practices, using an interface to provide a service contract
+    is just good object-oriented design. This lets the client choose another
+    implementation unrelated to .NET Remoting, for example a local, test-stub
+    or a web services implementation. One of the major benefits of using
+    Spring.NET is that it reduces the cost of doing 'interface based
+    programming' to almost nothing. As such, this best practice approach to
+    .NET remoting fits naturally into the general approach to application
+    development that Spring.NET encourages you to follow. Ok, with that
+    barrage of OO design ranting finished, on to the implementation!</para>
+  </sect1>
+
+  <sect1 id="qs-remoting-implementation">
+    <title>Implementation</title>
+
+    <para>The implementation of the calculators contained in the
+    <literal>Spring.Calculator.Servies</literal> project is quite
+    straightforward. The only interesting methods are those that deal with the
+    memory storage, which is the state that we will be configuring explicitly
+    using constructor injection. A subset of the implementation is shown
+    below.</para>
+
+    <programlisting>public class Calculator : ICalculator
+{
+
+    public int Add(int n1, int n2)
+    {
+        return n1 + n2;
+    }
+
+    public int Substract(int n1, int n2)
+    {
+        return n1 - n2;
+    }
+
+    public DivisionResult Divide(int n1, int n2)
+    {
+        DivisionResult result = new DivisionResult();
+        result.Quotient = n1 / n2;
+        result.Rest = n1 % n2;
+        return result;
+    }
+
+    public int Multiply(int n1, int n2)
+    {
+        return n1 * n2;
+    }
+
+}
+
+public class AdvancedCalculator : Calculator, IAdvancedCalculator
+{
+
+  private int memoryStore = 0;
+
+  public AdvancedCalculator()
+  {}
+
+  public AdvancedCalculator(int initialMemory)
+  {
+    memoryStore = initialMemory;
+  }
+
+  public int GetMemory()
+  {
+    return memoryStore;
+  }
+
+  // other methods omitted in this listing...
+
+}</programlisting>
+
+    <para>The <classname>Spring.Calculator.RemotedApp</classname> project
+    hosts remoted objects inside a console application. The code is also quite
+    simple and shown below</para>
+
+    <programlisting>public static void Main(string[] args)
+{
+    try 
+    { 
+        // initialization of Spring.NET's IoC container
+        IApplicationContext ctx = ContextRegistry.GetContext();
+
+        Console.Out.WriteLine("Server listening...");
+    }   
+    catch (Exception e)
+    {
+	Console.Out.WriteLine(e);
+    }
+    finally
+    {
+	Console.Out.WriteLine("--- Press &lt;return&gt; to quit ---");
+	Console.ReadLine();
+    }
+}</programlisting>
+
+    <para>The configuration of the .NET remoting channels is done using the
+    standard <literal>system.runtime.remoting</literal> configuration section
+    inside the .NET configuration file of the application
+    (<literal>App.config</literal>). In this case we are using the
+    <literal>tcp</literal> channel on port <literal>8005</literal>.</para>
+
+    <programlisting>&lt;system.runtime.remoting&gt;
+  &lt;application&gt;
+    &lt;channels&gt;
+      &lt;channel ref="tcp" port="8005" /&gt;
+    &lt;/channels&gt;
+  &lt;/application&gt;
+&lt;/system.runtime.remoting&gt;</programlisting>
+
+    <para>The objects created in Spring's application context are shown below.
+    Multiple resource files are used to export these objects under various
+    remoting configurations. The AOP advice used in this example is a simple
+    Log4Net based around advice.</para>
+
+    <programlisting>	&lt;configSections&gt;
+		&lt;sectionGroup name="spring"&gt;
+			&lt;section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core" /&gt;
+			&lt;section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" /&gt;
+			&lt;section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" /&gt;
+		&lt;/sectionGroup&gt;
+		&lt;section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /&gt;
+	&lt;/configSections&gt;
+
+&lt;spring&gt;
+		&lt;parsers&gt;
+			&lt;parser type="Spring.Remoting.Config.RemotingNamespaceParser, Spring.Services" /&gt;
+		&lt;/parsers&gt;
+	&lt;context&gt;
+		&lt;resource uri="config://spring/objects" /&gt;
+		&lt;resource uri="assembly://RemoteServer/RemoteServer.Config/cao.xml" /&gt;
+		&lt;resource uri="assembly://RemoteServer/RemoteServer.Config/saoSingleCall.xml" /&gt;
+		&lt;resource uri="assembly://RemoteServer/RemoteServer.Config/saoSingleCall-aop.xml" /&gt;
+		&lt;resource uri="assembly://RemoteServer/RemoteServer.Config/saoSingleton.xml" /&gt;
+		&lt;resource uri="assembly://RemoteServer/RemoteServer.Config/saoSingleton-aop.xml" /&gt;
+	&lt;/context&gt;
+	&lt;objects xmlns="http://www.springframework.net"&gt;
+		&lt;description&gt;Definitions of objects to be exported.&lt;/description&gt;
+
+    &lt;object type="Spring.Remoting.RemotingConfigurer, Spring.Services"&gt;
+      &lt;property name="Filename" value="Spring.Calculator.RemoteApp.exe.config" /&gt;
+    &lt;/object&gt;
+      
+		&lt;object id="Log4NetLoggingAroundAdvice" type="Spring.Aspects.Logging.Log4NetLoggingAroundAdvice, Spring.Aspects"&gt;
+			&lt;property name="Level" value="Debug" /&gt;
+		&lt;/object&gt;
+
+		&lt;object id="singletonCalculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services"&gt;
+			&lt;constructor-arg type="int" value="217"/&gt;
+		&lt;/object&gt;
+		
+		&lt;object id="singletonCalculatorWeaved" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop"&gt;
+			&lt;property name="target" ref="singletonCalculator"/&gt;
+			&lt;property name="interceptorNames"&gt;
+				&lt;list&gt;
+					&lt;value&gt;Log4NetLoggingAroundAdvice&lt;/value&gt;
+				&lt;/list&gt;
+			&lt;/property&gt;
+		&lt;/object&gt;
+		
+		&lt;object id="prototypeCalculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services" singleton="false"&gt;
+			&lt;constructor-arg type="int" value="217"/&gt;
+		&lt;/object&gt;
+		
+		&lt;object id="prototypeCalculatorWeaved" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop"&gt;
+			&lt;property name="targetSource"&gt;
+				&lt;object type="Spring.Aop.Target.PrototypeTargetSource, Spring.Aop"&gt;
+					&lt;property name="TargetObjectName" value="prototypeCalculator"/&gt;
+				&lt;/object&gt;
+			&lt;/property&gt;
+			&lt;property name="interceptorNames"&gt;
+				&lt;list&gt;
+					&lt;value&gt;Log4NetLoggingAroundAdvice&lt;/value&gt;
+				&lt;/list&gt;
+			&lt;/property&gt;
+		&lt;/object&gt;
+		
+	&lt;/objects&gt;
+&lt;/spring&gt;</programlisting>
+
+    <para>The declaration of the calculator instance,
+    <literal>singletonCalculator</literal> for example, and the setting of any
+    property values and / or object references is done as you would normally
+    do for any object declared in the Spring.NET configuration file. To expose
+    the calculator objects as .NET remoted objects the exporter
+    <classname>Spring.Remoting.CaoExporter</classname> is used for CAO objects
+    and <classname>Spring.Remoting.SaoExporter</classname> is used for SAO
+    objects. Both exporters require the setting of a
+    <literal>TargetName</literal> property that refers to the name of the
+    object in Spring's IoC container that will be remoted. The semantics of
+    SAO-SingleCall and CAO behavior are achieved by exporting a target object
+    that is declared as a "prototype" (i.e. singleton=false). For SAO objects,
+    the <literal>ServiceName</literal> property defines the name of the
+    service as it will appear in the URL that clients use to locate the remote
+    object. To set the remoting lifetime of the objects to be infinite, the
+    property <literal>Infinite</literal> is set to true.</para>
+
+    <para>The configuration for the exporting a SAO-Singleton is shown
+    below.<programlisting>&lt;objects	
+	xmlns="http://www.springframework.net" 
+	xmlns:r="http://www.springframework.net/remoting"&gt;
+	
+	&lt;description&gt;Registers the calculator service as a SAO in 'Singleton' mode.&lt;/description&gt;
+	
+	&lt;r:saoExporter 
+		targetName="singletonCalculator" 
+		serviceName="RemotedSaoSingletonCalculator" /&gt;
+&lt;/objects&gt;</programlisting>The configuration shown above uses the Spring
+    Remoting schema but you can also choose to use the standard 'generic' XML
+    configuration shown below.<programlisting>&lt;object name="saoSingletonCalculator" type="Spring.Remoting.SaoExporter, Spring.Services"&gt;
+  &lt;property name="TargetName" value="singletonCalculator" /&gt;
+  &lt;property name="ServiceName" value="RemotedSaoSingletonCalculator" /&gt;
+&lt;/object&gt;</programlisting> This will result in the remote object being
+    identified by the URL
+    <literal>tcp://localhost:8005/RemotedSaoSingletonCalculator</literal>. The
+    use of <classname>SaoExporter</classname> and
+    <classname>CaoExporter</classname> for other configuration are similar,
+    look at the configuration files in the
+    <classname>Spring.Calculator.RemotedApp</classname> project files for more
+    information.</para>
+
+    <para>On the client side, the client application will connect a specific
+    type of remote calculator service, object, ask it for it's current memory
+    value, which is pre-configured to <literal>217</literal>, then perform a
+    simple addition. As in the case of the server, the channel configuration
+    is done using the standard .NET Remoting configuration section of the .NET
+    application configuration file (<literal>App.config</literal>), as can
+    been seen below.</para>
+
+    <programlisting>&lt;system.runtime.remoting&gt;
+    &lt;application&gt;
+    	&lt;channels&gt;
+    		&lt;channel ref="tcp"/&gt;
+    	&lt;/channels&gt;
+    &lt;/application&gt;
+&lt;/system.runtime.remoting&gt;</programlisting>
+
+    <para>The client implementation code is shown below.</para>
+
+    <programlisting>public static void Main(string[] args)
+{
+	try
+	{
+	        Pause();
+
+		IApplicationContext ctx = ContextRegistry.GetContext();
+
+		Console.Out.WriteLine("Get Calculator...");
+		IAdvancedCalculator firstCalc = (IAdvancedCalculator) ctx.GetObject("calculatorService");
+    Console.WriteLine("Divide(11, 2) : " + firstCalc.Divide(11, 2));
+		Console.Out.WriteLine("Memory = " + firstCalc.GetMemory());
+		firstCalc.MemoryAdd(2);
+		Console.Out.WriteLine("Memory + 2 = " + firstCalc.GetMemory());
+
+		Console.Out.WriteLine("Get Calculator...");
+		IAdvancedCalculator secondCalc = (IAdvancedCalculator) ctx.GetObject("calculatorService");
+		Console.Out.WriteLine("Memory = " + secondCalc.GetMemory());
+	}
+	catch (Exception e)
+	{
+		Console.Out.WriteLine(e);
+	}
+	finally
+	{
+		Pause();
+	}
+}</programlisting>
+
+    <para>Note that the client application code is not aware that it is using
+    a remote object. The <literal>Pause()</literal> method simply waits until
+    the <literal>Return</literal> key is pressed on the console so that the
+    client doesn't make a request to the server before the server has had a
+    chance to start. The standard configuration and initialization of the .NET
+    remoting infrastructure is done before the creation of the Spring.NET IoC
+    container. The configuration of the client application is constructed in
+    such a way that one can easily switch implementations of the
+    <literal>calculatorService</literal> retrieved from the application
+    context. In more complex applications the calculator service would be a
+    dependency on another object in your application, say in a workflow
+    processing layer. The following listing shows a configuration for use of a
+    local implementation and then several remote implementations. The same
+    Exporter approach can be used to create Web Services and Serviced
+    Components (Enterprise Services) of the calculator object but are not
+    discussed in this QuickStart.</para>
+
+    <programlisting>
+&lt;spring&gt;
+  &lt;context&gt;
+    &lt;resource uri="config://spring/objects" /&gt;
+      
+    &lt;!-- Only one at a time ! --&gt;
+
+    &lt;!-- ================================== --&gt;
+    &lt;!-- In process (local) implementations --&gt;
+    &lt;!-- ================================== --&gt;
+    &lt;resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.InProcess/inProcess.xml" /&gt;
+
+    &lt;!-- ======================== --&gt;
+    &lt;!-- Remoting implementations --&gt;
+    &lt;!-- ======================== --&gt;
+    &lt;!-- Make sure 'RemoteApp' console application is running and listening. --&gt;
+    &lt;!-- &lt;resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.Remoting/cao.xml" /&gt; --&gt;
+    &lt;!-- &lt;resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.Remoting/cao-ctor.xml" /&gt; --&gt;
+    &lt;!-- &lt;resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.Remoting/saoSingleton.xml" /&gt; --&gt;
+    &lt;!-- &lt;resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.Remoting/saoSingleton-aop.xml" /&gt; --&gt;
+    &lt;!-- &lt;resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.Remoting/saoSingleCall.xml" /&gt; --&gt;
+    &lt;!-- &lt;resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.Remoting/saoSingleCall-aop.xml" /&gt; --&gt;
+
+    &lt;!-- =========================== --&gt;
+    &lt;!-- Web Service implementations --&gt;
+    &lt;!-- =========================== --&gt;
+    &lt;!-- Make sure 'http://localhost/SpringCalculator/' web application is running --&gt;
+    &lt;!-- &lt;resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.WebServices/webServices.xml" /&gt; --&gt;
+    &lt;!-- &lt;resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.WebServices/webServices-aop.xml" /&gt; --&gt;
+
+    &lt;!-- ================================= --&gt;
+    &lt;!-- EnterpriseService implementations --&gt;
+    &lt;!-- ================================= --&gt;
+    &lt;!-- Make sure you register components with 'RegisterComponentServices' console application.  --&gt;
+    &lt;!-- &lt;resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.EnterpriseServices/enterpriseServices.xml" /&gt; --&gt;
+  &lt;/context&gt;
+&lt;/spring&gt;
+</programlisting>
+
+    <para>The inProcess.xml configuration file creates an instance of
+    AdvancedCalculator directly <programlisting>
+&lt;objects xmlns="http://www.springframework.net"&gt;
+	
+  &lt;description&gt;inProcess&lt;/description&gt;
+	
+  &lt;object id="calculatorService" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services" /&gt;
+	
+&lt;/objects&gt;
+</programlisting></para>
+
+    <para>Factory classes are used to create a client side reference to the
+    .NET remoting implementations. For SAO objects use the
+    <classname>SaoFactoryObject</classname> class and for CAO objects use the
+    <classname>CaoFactoryObject</classname> class. The configuration for
+    obtaining a reference to the previously exported SAO singleton
+    implementation is shown below <programlisting>&lt;objects xmlns="http://www.springframework.net"&gt;
+	
+	&lt;description&gt;saoSingleton&lt;/description&gt;
+	
+	&lt;object id="calculatorService" type="Spring.Remoting.SaoFactoryObject, Spring.Services"&gt;
+		&lt;property name="ServiceInterface" value="Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract" /&gt;
+		&lt;property name="ServiceUrl" value="tcp://localhost:8005/RemotedSaoSingletonCalculator" /&gt;
+	&lt;/object&gt;
+	
+&lt;/objects&gt;
+</programlisting></para>
+
+    <para>You must specify the property <literal>ServiceInterface</literal> as
+    well as the location of the remote object via the
+    <literal>ServiceUrl</literal> property. The property replacement
+    facilities of Spring.NET can be leveraged here to make it easy to
+    configure the URL value based on environment variable settings, a standard
+    .NET configuration section, or an external property file. This is useful
+    to easily switch between test, QA, and production (yea baby!)
+    environments. An example of how this would be expressed is...</para>
+
+    <programlisting>&lt;property name="ServiceUrl" value="${protocol}://${host}:${port}/RemotedSaoSingletonCalculator" /&gt;</programlisting>
+
+    <para>The property values in this example are defined elsewhere; refer to
+    <xref linkend="objects-factory-placeholderconfigurer" /> for additional
+    information. As mentioned previously, more important in terms of
+    configuration flexibility is the fact that now you can swap out different
+    implementations (.NET remoting based or otherwise) of this interface by
+    making a simple change to the configuration file.</para>
+
+    <para>The configuration for obtaining a reference to the previously
+    exported CAO implementation is shown below <programlisting>&lt;objects xmlns="http://www.springframework.net"&gt;
+	
+	&lt;description&gt;cao&lt;/description&gt;
+	
+	&lt;object id="calculatorService" type="Spring.Remoting.CaoFactoryObject, Spring.Services"&gt;
+		&lt;property name="RemoteTargetName" value="prototypeCalculator" /&gt;
+		&lt;property name="ServiceUrl" value="tcp://localhost:8005" /&gt;
+	&lt;/object&gt;
+	
+&lt;/objects&gt;
+</programlisting></para>
+  </sect1>
+
+  <sect1>
+    <title>Running the application</title>
+
+    <para>Now that we have had a walk though of the implementation and
+    configuration it is finally time to run the application (if you haven't
+    yet pulled the trigger). Be sure to set up VS.NET to run multiple
+    applications on startup as shown below.</para>
+
+    <para><mediaobject>
+        <imageobject>
+          <imagedata fileref="images/remoting-startup.gif" format="GIF" />
+        </imageobject>
+      </mediaobject></para>
+
+    <para>Running the solution yields the following output in the server and
+    client window</para>
+
+    <para><programlisting>  SERVER WINDOW
+
+Server listening...
+--- Press &lt;return&gt; to quit ---
+
+
+   CLIENT WINDOW
+
+--- Press &lt;return&gt; to continue ---     (hit return...)
+Get Calculator...
+Divide(11, 2) : Quotient: '5'; Rest: '1'
+Memory = 0
+Memory + 2 = 2
+Get Calculator...
+Memory = 2
+--- Press &lt;return&gt; to continue ---</programlisting></para>
+  </sect1>
+
+  <sect1>
+    <title>Remoting Schema</title>
+
+    <para>The spring-remoting.xsd file in the doc directory provides a short
+    syntax to configure Spring.NET remoting features. To install the schema in
+    the VS.NET environment run the install-schema NAnt script in the doc
+    directory. Refer to the Chapter on VS.NET integration for more
+    details.</para>
+
+    <para>The various configuration files in the RemoteServer and Client
+    projects show the schema in action. Here is a condensed listing of those
+    definitions which should give you a good feel for how to use the
+    schema.</para>
+
+    <programlisting>&lt;!-- Calculator definitions --&gt;
+&lt;object id="singletonCalculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services"&gt;
+	&lt;constructor-arg type="int" value="217" /&gt;
+&lt;/object&gt;
+
+&lt;object id="prototypeCalculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services" singleton="false"&gt;
+	&lt;constructor-arg type="int" value="217" /&gt;
+&lt;/object&gt;
+
+&lt;!-- CAO object --&gt;
+&lt;r:caoExporter targetName="prototypeCalculator" infinite="false"&gt;
+  &lt;r:lifeTime initialLeaseTime="2m" renewOnCallTime="1m"/&gt;
+&lt;/r:caoExporter&gt;
+
+&lt;!-- SAO Single Call --&gt;
+&lt;r:saoExporter 
+  targetName="prototypeCalculator" 
+  serviceName="RemotedSaoSingleCallCalculator"/&gt;
+
+&lt;!-- SAO Singleton --&gt;
+&lt;r:saoExporter 
+  targetName="singletonCalculator" 
+  serviceName="RemotedSaoSingletonCalculator" /&gt;</programlisting>
+
+    <para>Note that the singleton nature of the remoted object is based on the
+    Spring object definition. The "PrototypeCalculator" has its singleton
+    property set to false to that a new one will be created every time a
+    method on the remoted object is invoked for the SAO case.</para>
+  </sect1>
+
+  <sect1>
+    <title id="entsvc-example">.NET Enterprise Services Example</title>
+
+    <para>The .NET Enterprise Services example is located in the project
+    Spring.Calculator.RegisterComponentServices.2005.csproj or
+    Spring.Calculator.RegisterComponentServices.2003.csproj, depending on the
+    use of .NET 1.1 or 2.0. The example uses the previous AdvancedCalculator
+    implementation and then imports the embedded configuration file
+    'enterpriseServices.xml' from the namespace
+    Spring.Calculator.RegisterComponentServices.Config. The top level
+    configuration is shown below</para>
+
+    <programlisting>	&lt;spring&gt;
+	
+		&lt;context&gt;
+			&lt;resource uri="config://spring/objects" /&gt;
+			&lt;resource uri="assembly://Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.Config/enterpriseServices.xml" /&gt;
+		&lt;/context&gt;
+		
+		&lt;objects xmlns="http://www.springframework.net"&gt;
+			&lt;description&gt;Definitions of objects to be registered.&lt;/description&gt;
+			
+			&lt;object id="calculatorService" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services" /&gt;
+			
+		&lt;/objects&gt;
+		
+	&lt;/spring&gt;</programlisting>
+
+    <para>The exporter that adapts the AdvancedCalculator for use as an
+    Enterprise Service component is defined first in enterpriseServices.xml.
+    Second is defined an exporter that will host the exported Enterprise
+    Services component application by signing the assembly, registering it
+    with the specified COM+ application name. If application does not exist it
+    will create it and configure it using values specified for Description,
+    AccessControl and Roles properties. The configuration file for
+    enterpriseServices.xml is shown below</para>
+
+    <para><programlisting>&lt;objects xmlns="http://www.springframework.net"&gt;
+
+	&lt;description&gt;enterpriseService&lt;/description&gt;
+	
+	&lt;object id="calculatorComponent" type="Spring.EnterpriseServices.ServicedComponentExporter, Spring.Services"&gt;
+		&lt;property name="TargetName" value="calculatorService" /&gt;
+		&lt;property name="TypeAttributes"&gt;
+			&lt;list&gt;
+				&lt;object type="System.EnterpriseServices.TransactionAttribute, System.EnterpriseServices" /&gt;
+			&lt;/list&gt;
+		&lt;/property&gt;
+		&lt;property name="MemberAttributes"&gt;
+			&lt;dictionary&gt;
+				&lt;entry key="*"&gt;
+					&lt;list&gt;
+						&lt;object type="System.EnterpriseServices.AutoCompleteAttribute, System.EnterpriseServices" /&gt;
+					&lt;/list&gt;
+				&lt;/entry&gt;
+			&lt;/dictionary&gt;
+		&lt;/property&gt;
+	&lt;/object&gt;
+	
+	&lt;object type="Spring.EnterpriseServices.EnterpriseServicesExporter, Spring.Services"&gt;
+		&lt;property name="ApplicationName"&gt;
+			&lt;value&gt;Spring Calculator Application&lt;/value&gt;
+		&lt;/property&gt;
+		&lt;property name="Description"&gt;
+			&lt;value&gt;Spring Calculator application.&lt;/value&gt;
+		&lt;/property&gt;
+		&lt;property name="AccessControl"&gt;
+			&lt;object type="System.EnterpriseServices.ApplicationAccessControlAttribute, System.EnterpriseServices"&gt;
+				&lt;property name="AccessChecksLevel"&gt;
+					&lt;value&gt;ApplicationComponent&lt;/value&gt;
+				&lt;/property&gt;
+			&lt;/object&gt;
+		&lt;/property&gt;
+		&lt;property name="Roles"&gt;
+			&lt;list&gt;
+				&lt;value&gt;Admin : Administrator role&lt;/value&gt;
+				&lt;value&gt;User : User role&lt;/value&gt;
+				&lt;value&gt;Manager : Administrator role&lt;/value&gt;
+			&lt;/list&gt;
+		&lt;/property&gt;
+		&lt;property name="Components"&gt;
+			&lt;list&gt;
+				&lt;ref object="calculatorComponent" /&gt;
+			&lt;/list&gt;
+		&lt;/property&gt;
+		&lt;property name="Assembly"&gt;
+			&lt;value&gt;Spring.Calculator.EnterpriseServices&lt;/value&gt;
+		&lt;/property&gt;
+	&lt;/object&gt;
+	
+&lt;/objects&gt;</programlisting></para>
+  </sect1>
+
+  <sect1 id="websvc-example">
+    <title>Web Services Example</title>
+
+    <para>The WebServices example shows how to export the AdvancedCalculator
+    as a web service that is an AOP proxy of AdvancedCalculator that has
+    logging advice applied to it. The main configuration file, Web.config,
+    includes information from three locations as shown below</para>
+
+    <programlisting>		&lt;context&gt;
+			&lt;resource uri="config://spring/objects"/&gt;
+			&lt;resource uri="~/Config/webServices.xml"/&gt;
+			&lt;resource uri="~/Config/webServices-aop.xml"/&gt;
+		&lt;/context&gt;</programlisting>
+
+    <para>The config section 'spring/objects' in Web.config contains the
+    definition for the 'plain' Advanced calculator, as well as the definitions
+    to create an AOP proxy of an AdvancedCalculator that adds logging advice.
+    These definitions are shown below<programlisting>		&lt;objects xmlns="http://www.springframework.net"&gt;
+			
+      &lt;!-- Aspect --&gt;
+      
+      &lt;object id="CommonLoggingAroundAdvice" type="Spring.Aspects.Logging.CommonLoggingAroundAdvice, Spring.Aspects"&gt;
+        &lt;property name="Level" value="Debug"/&gt;
+      &lt;/object&gt;
+      
+      &lt;!-- Service --&gt;
+			
+      &lt;!-- 'plain object' for AdvancedCalculator --&gt;
+      &lt;object id="calculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services"/&gt;
+			
+      &lt;!-- AdvancedCalculator object with AOP logging advice applied. --&gt;
+      &lt;object id="calculatorWeaved" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop"&gt;
+				    &lt;property name="target" ref="calculator"/&gt;
+				    &lt;property name="interceptorNames"&gt;
+					     &lt;list&gt;
+						      &lt;value&gt;CommonLoggingAroundAdvice&lt;/value&gt;
+					     &lt;/list&gt;
+				    &lt;/property&gt;
+			    &lt;/object&gt;
+		
+    &lt;/objects&gt;</programlisting>The configuration file webService.xml
+    simply exports the named calculator object</para>
+
+    <programlisting>	&lt;object id="calculatorService" type="Spring.Web.Services.WebServiceExporter, Spring.Web"&gt;
+		&lt;property name="TargetName" value="calculator" /&gt;
+		&lt;property name="Namespace" value="http://SpringCalculator/WebServices" /&gt;
+		&lt;property name="Description" value="Spring Calculator Web Services" /&gt;
+	&lt;/object&gt;</programlisting>
+
+    <para>Whereas the webService-aop.xml exports the calculator instance that
+    has AOP advice applied to it.</para>
+
+    <programlisting>	&lt;object id="calculatorServiceWeaved" type="Spring.Web.Services.WebServiceExporter, Spring.Web"&gt;
+		&lt;property name="TargetName" value="calculatorWeaved" /&gt;
+		&lt;property name="Namespace" value="http://SpringCalculator/WebServices" /&gt;
+		&lt;property name="Description" value="Spring Calculator Web Services" /&gt;
+	&lt;/object&gt;
+	</programlisting>
+
+    <para>Setting the solution to run the web project as the startup, you will
+    be presented with a screen as shown below</para>
+
+    <para><mediaobject>
+        <imageobject>
+          <imagedata fileref="images/web-exporter-calc-svc-main.jpg"
+                     format="JPG" />
+        </imageobject>
+      </mediaobject>Selecting the CalculatorService and
+    CalculatorServiceWeaved links will bring you to the standard user
+    interface generated for browsing a web service, as shown below<mediaobject>
+        <imageobject>
+          <imagedata fileref="images/web-exporter-calc-svc.jpg" />
+        </imageobject>
+      </mediaobject></para>
+
+    <para>And similarly for the calculator service with AOP applied</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="images/web-exporter-calc-svc-aop.jpg" />
+      </imageobject>
+    </mediaobject>
+
+    <para>Invoking the Add method for calculatorServiceWeaved shows the
+    screen</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="images/web-exporter-calc-svc-aop-add.jpg" />
+      </imageobject>
+    </mediaobject>
+
+    <para>Invoking add will then show the result '4' in a new browser instance
+    and the log file log.txt will contain the following entires</para>
+
+    <programlisting>2007-10-15 17:59:47,375 [DEBUG] Spring.Aspects.Logging.CommonLoggingAroundAdvice - Intercepted call : about to invoke method 'Add'
+2007-10-15 17:59:47,421 [DEBUG] Spring.Aspects.Logging.CommonLoggingAroundAdvice - Intercepted call : returned '4'</programlisting>
+  </sect1>
+
+  <sect1 id="qs-remoting-additional">
+    <title>Additional Resources</title>
+
+    <para>Some introductory articles on .NET remoting can be found online at
+    MSDN. Ingo Rammer is also a very good authority on .NET remoting, and the
+    .NET Remoting FAQ (link below) which is maintained by Ingo is chock full
+    of useful information.</para>
+
+    <para><itemizedlist>
+        <listitem>
+          <para><ulink
+          url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dndotnet/html/introremoting.asp">An
+          Introduction to Microsoft .NET Remoting Framework</ulink></para>
+        </listitem>
+
+        <listitem>
+          <para><ulink
+          url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dndotnet/html/hawkremoting.asp">Microsoft
+          .NET Remoting: A Technical Overview</ulink></para>
+        </listitem>
+
+        <listitem>
+          <para><ulink
+          url="http://www.apress.com/book/bookDisplay.html?bID=374">Advanced
+          .NET Remoting</ulink> (authored by Ingo Rammer)</para>
+        </listitem>
+
+        <listitem>
+          <para><ulink
+          url="http://www.thinktecture.com/resources/remotingfaq/default.html">.NET
+          Remoting FAQ</ulink></para>
+        </listitem>
+      </itemizedlist></para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/remoting.xml b/doc/reference/src/remoting.xml
new file mode 100644
index 00000000..ee81e7fa
--- /dev/null
+++ b/doc/reference/src/remoting.xml
@@ -0,0 +1,470 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="remoting">
+  <title>.NET Remoting</title>
+
+  <section id="remoting-introduction">
+    <title>Introduction</title>
+
+    <para>Spring's .NET Remoting support allows you to export a 'plain .NET
+    object' as a .NET Remoted object. By "plain .NET object" we mean classes
+    that do not inherit from a specific infrastructure base class such as
+    MarshalByRefObject. On the server side, Spring's .NET Remoting exporters
+    will automatically create a proxy that implements MarshalByRefObject. You
+    register SAO types as either SingleCall or Singleton and also configure on
+    a per-object basis lifetime and leasing parameters. On the client side you
+    can obtain CAO references to server proxy objects in a manner that
+    promotes interface based design best practices when developing .NET
+    remoting applications. The current implementation requires that your plain
+    .NET objects implements a business service interface. Additionally you can
+    add AOP advice to both SAO and CAO objects.</para>
+
+    <para>You can leverage the IoC container to configure the exporter and
+    service endpoints. A remoting specific xml-schema is provided to simplify
+    the remoting configuration but you can still use the standard
+    reflection-like property based configuration schema. You may also opt to
+    not use the IoC container to configure the objects and use Spring's .NET
+    Remoting classes Programatically, as you would with any third party
+    library.</para>
+
+    <para>A sample application, often referred to in this documentation, is in
+    the distribution under the directory "examples\Spring\Spring.Calculator"
+    and may also be found via the start menu by selecting the 'Calculator'
+    item.</para>
+  </section>
+
+  <section id="remoting-publishsao">
+    <title>Publishing SAOs on the Server</title>
+
+    <para>Exposing a Singleton SAO service can be done in two ways. The first
+    is through programmatic or administrative type registration that makes
+    calls to
+    <literal>RemotingConfiguration.RegisterWellKnownServiceType</literal>.
+    This method has the limitation that you must use a default constructor and
+    you can not easily configure the singleton state at runtime since it is
+    created on demand. The second way is to publish an object instance using
+    <literal>RemotingServices.Marshal</literal>. This method overcomes the
+    limitations of the first method. Example server side code for publishing
+    an SAO singleton object with a predefined state is shown below
+    <programlisting>AdvancedMBRCalculator calc = new AdvancedMBRCalculator(217);
+RemotingServices.Marshal(calc, "MyRemotedCalculator");</programlisting></para>
+
+    <para>The class AdvancedMBRCalculator used above inherits from
+    MarshalByRefObject.</para>
+
+    <para>If your design calls for configuring a singleton SAO, or using a
+    non-default constructor, you can use the Spring IoC container to create
+    the SAO instance, configure it, and register it with the .NET remoting
+    infrastructure. The <classname>SaoExporter</classname> class performs this
+    task and most importantly, will automatically create a proxy class that
+    inherits from MarshalbyRefObject if your business object does not already
+    do so. The following XML taken from the <link
+    linkend="remoting-quickstart">Remoting QuickStart</link> demonstrates its
+    usage to an SAO Singleton object</para>
+
+    <section id="sao-singleton">
+      <title>SAO Singleton</title>
+    </section>
+
+    <programlisting>&lt;object id="singletonCalculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services"&gt;
+  &lt;constructor-arg type="int" value="217"/&gt;
+&lt;/object&gt;
+
+&lt;!-- Registers the calculator service as a SAO in 'Singleton' mode. --&gt;
+&lt;object name="saoSingletonCalculator" type="Spring.Remoting.SaoExporter, Spring.Services"&gt;
+  &lt;property name="TargetName" value="singletonCalculator" /&gt;
+  &lt;property name="ServiceName" value="RemotedSaoSingletonCalculator" /&gt;
+&lt;/object&gt;</programlisting>
+
+    <para>This XML fragment shows how an existing object "singletonCalculator"
+    defined in the Spring context is exposed under the url-path name
+    "RemotedSaoSingletonCalculator". (The fully qualified url is
+    tcp://localhost:8005/RemotedSaoSingleCallCalculator using the standard
+    .NET channel configuration shown further below.)
+    <classname>AdvancedCalculator</classname> class implements the business
+    interface <classname>IAdvancedCalculator</classname>. The current proxy
+    implementation requires that your business objects implement an interface.
+    The interfaces' methods will be the ones exposed in the generated .NET
+    remoting proxy. The initial memory of the calculator is set to 217 via the
+    constructor. The class <classname>AdvancedCalculator</classname>
+    <emphasis>does not</emphasis> inherit from
+    <classname>MarshalByRefObject</classname>. Also note that the exporter
+    sets the lifetime of the SAO Singleton to infinite so that the singleton
+    will not be garbage collected after 5 minutes (the .NET default lease
+    time). If you would like to vary the lifetime properties, they are
+    InitialLeaseTime, RenewOnCallTime, and SponsorshipTimeout.</para>
+
+    <para>A custom schema is provided to make the object declaration even
+    easier and with intellisense support for the attributes. This is shown
+    below<programlisting>&lt;objects xmlns="http://www.springframework.net" 
+         xmlns:r="http://www.springframework.net/remoting"&gt;
+
+  &lt;r:saoExporter targetName="singletonCalculator" 
+                 serviceName="RemotedSaoSingletonCalculator" /&gt;
+
+  ... other object definitions
+
+&lt;/objects&gt;</programlisting>Refer to the end of this chapter for more
+    information on Spring's .NET custom schema.</para>
+
+    <section id="sao-singlecall">
+      <title>SAO SingleCall</title>
+    </section>
+
+    <para>The following XML fragment shows how to expose the calculator
+    service in SAO 'SingleCall' mode. <programlisting>&lt;object id="prototypeCalculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services" 
+        singleton="false"&gt;
+  &lt;constructor-arg type="int" value="217"/&gt;
+&lt;/object&gt;
+
+&lt;object name="saoSingleCallCalculator" type="Spring.Remoting.SaoExporter, Spring.Services"&gt;
+  &lt;property name="TargetName" value="prototypeCalculator" /&gt;
+  &lt;property name="ServiceName" value="RemotedSaoSingleCallCalculator" /&gt;
+&lt;/object&gt;</programlisting></para>
+
+    <para>Note that we change the singleton attribute of the plain .NET object
+    as configured by Spring in the &lt;object&gt; definition and not an
+    attribute on the SaoExporter. The object referred to in the
+    <literal>TargetName</literal> parameter can be an AOP proxy to a business
+    object. For example, if we were to apply some simple logging advice to the
+    singleton calculator, the following standard AOP configuration is used to
+    create the target for the SaoExporter</para>
+
+    <programlisting>&lt;object id="singletonCalculatorWeaved" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop"&gt;
+  &lt;property name="target" ref="singletonCalculator"/&gt;
+  &lt;property name="interceptorNames"&gt;
+    &lt;list&gt;
+      &lt;value&gt;Log4NetLoggingAroundAdvice&lt;/value&gt;
+    &lt;/list&gt;
+  &lt;/property&gt;
+&lt;/object&gt;
+
+&lt;object name="saoSingletonCalculatorWeaved" type="Spring.Remoting.SaoExporter, Spring.Services"&gt;
+  &lt;property name="TargetName" value="singletonCalculatorWeaved" /&gt;
+  &lt;property name="ServiceName" value="RemotedSaoSingletonCalculatorWeaved" /&gt;
+&lt;/object&gt;</programlisting>
+
+    <note>As generally required with a .NET Remoting application, the
+    arguments to your service methods should be Serializable.</note>
+
+    <sect2 id="remoting-configuration">
+      <title>Console Application Configuration</title>
+
+      <para>When using <classname>SaoExporter</classname> you can still use
+      the standard remoting administration section in the application
+      configuration file to register the channel.
+      <classname>ChannelServices</classname> as shown below</para>
+
+      <programlisting>&lt;system.runtime.remoting&gt;
+  &lt;application&gt;
+    &lt;channels&gt;
+      &lt;channel ref="tcp" port="8005" /&gt;
+    &lt;/channels&gt;
+  &lt;/application&gt;
+&lt;/system.runtime.remoting&gt;</programlisting>
+
+      <para>A console application that will host this Remoted object needs to
+      initialize the .NET Remoting infrastructure with a call to
+      RemotingConfiguration (since we are using the .config file for channel
+      registration) and then start the Spring application context. This is
+      shown below <programlisting>RemotingConfiguration.Configure("RemoteApp.exe.config");
+
+IApplicationContext ctx = ContextRegistry.GetContext();
+
+Console.Out.WriteLine("Server listening...");
+
+Console.ReadLine(); 
+    </programlisting></para>
+
+      <para>You can also put in the configuration file an instance of the
+      object <classname>Spring.Remoting.RemotingConfigurer</classname> to make
+      the RemotingConfiguration call show above on your behalf during
+      initialization of the IoC container. The
+      <classname>RemotingConfigurer</classname> implements the
+      <interfacename>IObjectFactoryPostProcessor</interfacename> interface,
+      which gets called after all object definitions have been loaded but
+      before they have been instantiated, (See<xref
+      linkend="objects-factory-customizing-factory-postprocessors" /> for more
+      information). The RemotingConfigurer has two properties you can
+      configure. <classname>Filename</classname>, that specifies the filename
+      to load the .NET remoting configuration from (if null the default file
+      name is used) and <classname>EnsureSecurity</classname> which makes sure
+      the channel in encrypted (available only on .NET 2.0). As a convenience,
+      the custom Spring remoting schema can be used to define an instance of
+      this class as shown below, taken from the <link
+      linkend="remoting-quickstart">Remoting QuickStart</link>
+      <programlisting>&lt;objects xmlns="http://www.springframework.net"
+         xmlns:r="http://www.springframework.net/remoting"&gt;
+
+  &lt;r:configurer filename="Spring.Calculator.RemoteApp.exe.config" /&gt;
+
+&lt;/objects&gt;</programlisting></para>
+
+      <para>The ReadLine prevents the console application from exiting. You
+      can refer to the code in RemoteApp in the <link
+      linkend="remoting-quickstart">Remoting QuickStart</link> to see this
+      code in action.</para>
+    </sect2>
+
+    <section id="iis-application">
+      <title>IIS Application Configuration</title>
+
+      <para>If you are deploying a .NET remoting application inside IIS there
+      is a <ulink
+      url="http://forum.springframework.net/showthread.php?t=469">sample
+      project </ulink> that demonstrates the necessary configuration using
+      Spring.Web.</para>
+
+      <para>Spring.Web ensures the application context is initialized, but if
+      you don't use Spring.Web the idea is to start the initialization of the
+      Spring IoC container inside the application start method defined in
+      Global.asax, as shown below</para>
+
+      <programlisting> void Application_Start(object sender, EventArgs e) 
+ {
+     // Code that runs on application startup
+
+     // Ensure Spring has loaded configuration registering context
+     Spring.Context.IApplicationContext ctx = new Spring.Context.Support.XmlApplicationContext(
+                                                  HttpContext.Current.Server.MapPath("Spring.Config"));
+     Spring.Context.Support.ContextRegistry.RegisterContext(ctx); 
+ }</programlisting>
+
+      <para>In this example, the Spring configuration file is named
+      Spring.Config. Inside Web.config you add a standard
+      &lt;system.runtime.remoting&gt; section. Note that you do not need to
+      specify the port number of your channels as they will use the port
+      number of your web site. Ambiguous results have been reported if you do
+      specify the port number. Also, in order for IIS to recognize the
+      remoting request, you should add the suffix '.rem' or '.soap' to the
+      target name of your exported remote object so that the correct IIS
+      handler can be invoked.</para>
+    </section>
+  </section>
+
+  <section id="remoting-clientsao">
+    <title>Accessing a SAO on the Client</title>
+
+    <para>Administrative type registration on the client side lets you easily
+    obtain a reference to a SAO object. When a type is registered on the
+    client, using the new operator or using the reflection API will return a
+    proxy to the remote object instead of a local reference. Administrative
+    type registration on the client for a SAO object is performed using the
+    <literal>wellknown</literal> element in the client configuration section.
+    However, this approach requires that you expose the implementation of the
+    class on the client side. Practically speaking this would mean linking in
+    the server assembly to the client application, a generally recognized bad
+    practice. This dependency can be removed by developing remote services
+    based on a business interface. Aside from remoting considerations, the
+    separation of interface and implementation is considered a good practice
+    when designing OO systems. In the context of remoting, this means that the
+    client can obtain a proxy to a specific implementation with
+    <emphasis>only</emphasis> a reference to the interface assembly. To
+    achieve the decoupling of client and server, a separate assembly
+    containing the interface definitions is created and shared between the
+    client and server applications.</para>
+
+    <para>There is a simple means for following this design when the remote
+    object is a SAO object. A call to <literal>Activator.GetObject</literal>
+    will instantiate a SAO proxy on the client. For CAO objects another
+    mechanism is used and is discussed later. The code to obtain the SAO proxy
+    is shown below <programlisting>ICalculator calc = (ICalculator)Activator.GetObject (
+  typeof (ICalculator),
+  "tcp://localhost:8005/MyRemotedCalculator");</programlisting></para>
+
+    <para>To obtain a reference to a SAO proxy within the IoC container, you
+    can use the object factory <classname>SaoFactoryObject</classname> in the
+    Spring configuration file. The following XML taken from the <link
+    linkend="remoting-quickstart"> Remoting QuickStart</link> demonstrates its
+    usage.</para>
+
+    <programlisting>&lt;object id="calculatorService" type="Spring.Remoting.SaoFactoryObject, Spring.Services"&gt;
+  &lt;property name="ServiceInterface" value="Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract" /&gt;
+  &lt;property name="ServiceUrl" value="tcp://localhost:8005/RemotedSaoSingletonCalculator" /&gt;
+&lt;/object&gt;</programlisting>
+
+    <para>The ServiceInterface property specifies the type of proxy to create
+    while the ServiceUrl property creates a proxy bound to the specified
+    server and published object name.</para>
+
+    <para>Other objects in the IoC container that depend on an implementation
+    of the interface <classname>ICalculator</classname> can now refer to the
+    object "calculatorService", thereby using a remote implementation of this
+    interface. The exposure of dependencies among objects within the IoC
+    container lets you easily switch the implementation of
+    <classname>ICalculator</classname>. By using the IoC container changing
+    the application to use a local instead of remote implementation is a
+    configuration file change, not a code change. By promoting interface based
+    programing, the ability to switch implementation makes it easier to unit
+    test the client application, since unit testing can be done with a mock
+    implementation of the interface. Similarly, development of the client can
+    proceed independent of the server implementation. This increases
+    productivity when there are separate client and server development teams.
+    The two teams agree on interfaces before starting development. The client
+    team can quickly create a simple, but functional implementation and then
+    integrate with the server implementation when it is ready.</para>
+  </section>
+
+  <section id="remoting-cao-introduction">
+    <title>CAO best practices</title>
+
+    <para>Creating a client activated object (CAO) is typically done by
+    administrative type registration, either Programatically or via the
+    standard .NET remoting configuration section. The registration process
+    allows you to use the 'new' operator to create the remote object and
+    requires that the implementation of the object be distributed to the
+    client. As mentioned before, this is not a desirable approach to
+    developing distributed systems. The best practice approach that avoids
+    this problem is to create an SAO based factory class on the server that
+    will return CAO references to the client. In a manner similar to how
+    Spring's generic object factory can be used as a replacement creating a
+    factory per class, we can create a generic SAO object factory to return
+    CAO references to objects defined in Spring's application context. This
+    functionality is encapsulated in Spring's
+    <classname>CaoExporter</classname> class. On the client side a reference
+    is obtained using <literal>CaoFactoryObject</literal>. The client side
+    factory object supports creation of the CAO object using constructor
+    arguments. In addition to reducing the clutter and tedium around creating
+    factory classes specific to each object type you wish to expose in this
+    manner, this approach has the additional benefit of not requiring any type
+    registration on the client or server side. This is because the act of
+    returning an instance of a class that inherits from MarshalByRefObject
+    across a remoting boundary automatically returns a CAO object reference.
+    For more information on this best-practice, refer to the last section,
+    <xref linkend="remoting-additional" />, for some links to additional
+    resources.</para>
+  </section>
+
+  <section id="remoting-publishcao">
+    <title>Registering a CAO object on the Server</title>
+
+    <para>To expose an object as a CAO on the server you should declare an
+    object in the standard Spring configuration that is a 'prototype', that is
+    the singleton property is set to false. This results in a new object being
+    created each time it is retrieved from Spring's IoC container. An
+    implementation of <interfacename>ICaoRemoteFactory</interfacename> is what
+    is exported via a call to RemotingServices.Marshal. This implementation
+    uses Spring's IoC container to create objects and then dynamically create
+    a .NET remoting proxy for the retrieved object. Note that the default
+    lifetime of the remote object is set to infinite (null is returned from
+    the implementation of InitializeLifetimeService()).</para>
+
+    <para>This is best shown using an example from the Remoting Quickstart
+    application. Here is the definition of a simple calculator object,</para>
+
+    <para><programlisting>&lt;object id="prototypeCalculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services" 
+        singleton="false"&gt;
+  &lt;constructor-arg type="int" value="217" /&gt;
+&lt;/object&gt;</programlisting>To export this as a CAO object we can declare
+    the <classname>CaoExporter</classname> object directly in the server's XML
+    configuration file, as shown below</para>
+
+    <programlisting>&lt;object id="caoCalculator" type="Spring.Remoting.CaoExporter, Spring.Services"&gt;
+  &lt;property name="TargetName" value="prototypeCalculator" /&gt;
+  &lt;property name="Infinite" value="false" /&gt;
+  &lt;property name="InitialLeaseTime" value="2m" /&gt;
+  &lt;property name="RenewOnCallTime" value="1m" /&gt;
+&lt;/object&gt;</programlisting>
+
+    <para>Note the property 'TargetName' is set to the name, not the
+    reference, of the non-singleton declaration of the 'AdvancedCalculator'
+    class.</para>
+
+    <para>Alternatively, you can use the remoting schema and declare the CAO
+    object as shown below</para>
+
+    <programlisting>&lt;r:caoExporter targetName="prototypeCalculator" infinite="false"&gt;
+  &lt;r:lifeTime initialLeaseTime="2m" renewOnCallTime="1m" /&gt;
+&lt;/r:caoExporter&gt;</programlisting>
+
+    <para></para>
+
+    <section>
+      <title>Applying AOP advice to exported CAO objects</title>
+
+      <para>Applying AOP advice to exported CAO objects is done by referencing
+      the adviced object name to the CAO exporter. Again, taking an example
+      from the Remoting QuickStart, a calculator with logging around advice is
+      defined as shown below.</para>
+
+      <programlisting>&lt;object id="prototypeCalculatorWeaved" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop"&gt;
+  &lt;property name="targetSource"&gt;
+    &lt;object type="Spring.Aop.Target.PrototypeTargetSource, Spring.Aop"&gt;
+      &lt;property name="TargetObjectName" value="prototypeCalculator" /&gt;
+    &lt;/object&gt;
+  &lt;/property&gt;
+  &lt;property name="interceptorNames"&gt;
+    &lt;list&gt;
+      &lt;value&gt;ConsoleLoggingAroundAdvice&lt;/value&gt;
+    &lt;/list&gt;
+  &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+
+      <para>If this declaration is unfamiliar to you, please refer to <xref
+      linkend="aop" /> for more information. The CAO exporter then references
+      with the name 'prototypeCalculatorWeaved' as shown below.</para>
+
+      <programlisting>&lt;r:caoExporter targetName="prototypeCalculatorWeaved" infinite="false"&gt;
+  &lt;r:lifeTime initialLeaseTime="2m" renewOnCallTime="1m" /&gt;
+&lt;/r:caoExporter&gt;</programlisting>
+    </section>
+  </section>
+
+  <section id="remoting-clientcao">
+    <title>Accessing a CAO on the Client</title>
+
+    <para>On the client side a CAO reference is obtained by using the
+    <classname>CaoFactoryObject</classname> as shown below</para>
+
+    <programlisting>&lt;object id="calculatorService" type="Spring.Remoting.CaoFactoryObject, Spring.Services"&gt;
+  &lt;property name="RemoteTargetName" value="prototypeCalculator" /&gt;
+  &lt;property name="ServiceUrl" value="tcp://localhost:8005" /&gt;
+&lt;/object&gt;</programlisting>
+
+    <para>This definition corresponds to the exported calculator from the
+    previous section. The property 'RemoteTargetName' identifies the object on
+    the server side. Using this approach the client can obtain an reference
+    though standard DI techniques to a remote object that implements the
+    <interfacename>IAdvancedCalculator</interfacename> interface. (As always,
+    that doesn't mean the client should treat the object as if it was an
+    in-process object).</para>
+
+    <para>Alternatively, you can use the Remoting schema to shorten this
+    definition and provide intellisense code completion</para>
+
+    <programlisting>&lt;r:caoFactory id="calculatorService" 
+              remoteTargetName="prototypeCalculator" 
+              serviceUrl="tcp://localhost:8005" /&gt;</programlisting>
+
+    <section>
+      <title>Applying AOP advice to client side CAO objects.</title>
+
+      <para>Applying AOP advice to a client side CAO object is done just like
+      any other object. Simply use the id of the object created by the
+      <classname>CaoFactoryObject</classname> as the AOP target, i.e.
+      'calculatorService' in the previous example.</para>
+    </section>
+  </section>
+
+  <section id="remoting-schema">
+    <title>XML Schema for configuration</title>
+
+    <para>Please install the XSD schemas into VS.NET as described in <xref
+    linkend="vsnet" />. XML intellisense for the attributes of the
+    saoExporter, caoExporter and caoFactory should be self explanatory as they
+    mimic the standard property names used to configure .NET remote
+    objects.</para>
+  </section>
+
+  <section id="remoting-additional">
+    <title>Additional Resources</title>
+
+    <para>Two articles that describe the process of creating a standard SAO
+    factory for returning CAO objects are <ulink
+    url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnpatterns/html/ImpBrokerClient.asp">Implementing
+    Broker with .NET Remoting Using Client-Activated Objects</ulink> on MSDN
+    and <ulink
+    url="http://www.glacialcomponents.com/ArticleDetail/CAOGuide.aspx">Step by
+    Step guide to CAO creation through SAO class factories</ulink> on Glacial
+    Components website.</para>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/resources.xml b/doc/reference/src/resources.xml
new file mode 100644
index 00000000..9d1b34cc
--- /dev/null
+++ b/doc/reference/src/resources.xml
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="resources">
+  <title>Resources</title>
+
+  <section id="objects-iresource">
+    <title>Introduction</title>
+
+    <para>The <literal>IResource</literal> interface contained in the
+    <literal>Spring.Core.IO</literal> namespace provides a common interface to
+    describe and access data from diverse resource locations. This abstraction
+    lets you treat the <classname>InputStream</classname> from a file and from
+    a URL in a polymorphic and protocol-independent manner... the .NET BCL
+    does not provide such an abstraction. The <literal>IResource</literal>
+    interface inherits from <literal>IInputStream</literal> that provides a
+    single property <literal>Stream InputStream</literal>. The
+    <literal>IResource</literal> interface adds descriptive information about
+    the resource via a number of additional properties. Several
+    implementations for common resource locations, i.e. file, assembly, uri,
+    are provided and you may also register custom IResource
+    implementations.</para>
+  </section>
+
+  <section>
+    <title>The <interfacename>IResource</interfacename> interface</title>
+
+    <para>The IResource interface is shown below</para>
+
+    <programlisting>public interface IResource : IInputStreamSource
+{
+  bool IsOpen { get; }
+
+  Uri Uri { get; }
+
+  FileInfo File { get; }
+
+  string Description { get; }
+
+  bool Exists { get; }
+
+  IResource CreateRelative(string relativePath);
+}</programlisting>
+
+    <table frame="all">
+      <title>IResource Properties</title>
+
+      <tgroup cols="2">
+        <colspec colname="c1" colwidth="2*" />
+
+        <colspec colname="c2" colwidth="5*" />
+
+        <thead>
+          <row>
+            <entry>Property</entry>
+
+            <entry>Explanation</entry>
+          </row>
+        </thead>
+
+        <tbody>
+          <row>
+            <entry><literal>InputStream</literal></entry>
+
+            <entry>Inherited from IInputStream. Opens and returns a
+            <classname>System.IO.Stream</classname>. It is expected that each
+            invocation returns a fresh Stream. It is the responsibility of the
+            caller to close the stream.</entry>
+          </row>
+
+          <row>
+            <entry><literal>Exists</literal></entry>
+
+            <entry>returns a boolean indicating whether this resource actually
+            exists in physical form.</entry>
+          </row>
+
+          <row>
+            <entry><literal>IsOpen</literal></entry>
+
+            <entry>returns a boolean indicating whether this resource
+            represents a handle with an open stream. If true, the InputStream
+            cannot be read multiple times, and must be read once only and then
+            closed to avoid resource leaks. Will be false for all usual
+            resource implementations, with the exception of
+            <interfacename>InputStreamResource</interfacename>.</entry>
+          </row>
+
+          <row>
+            <entry><literal>Description</literal></entry>
+
+            <entry>Returns a description of the resource, such as the fully
+            qualified file name or the actual URL.</entry>
+          </row>
+
+          <row>
+            <entry><literal>Uri</literal></entry>
+
+            <entry>The Uri representation of the resource.</entry>
+          </row>
+
+          <row>
+            <entry><literal>File</literal></entry>
+
+            <entry>Returns a <classname>System.IO.FileInfo</classname> for
+            this resource if it can be resolved to an absolute file
+            path.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+    <para>and the methods</para>
+
+    <table frame="all">
+      <title>IResource Methods</title>
+
+      <tgroup cols="2">
+        <colspec colname="c1" colwidth="2*" />
+
+        <colspec colname="c2" colwidth="5*" />
+
+        <thead>
+          <row>
+            <entry>Method</entry>
+
+            <entry>Explanation</entry>
+          </row>
+        </thead>
+
+        <tbody>
+          <row>
+            <entry><literal>IResource CreateRelative (string
+            relativePath)</literal></entry>
+
+            <entry>Creates a resource relative to this resource using relative
+            path like notation (./ and ../).</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+    <para>You can obtain an actual URL or File object representing the
+    resource if the underlying implementation is compatible and supports that
+    functionality.</para>
+
+    <para>The Resource abstraction is used extensively in Spring itself, as an
+    argument type in many method signatures when a resource is needed. Other
+    methods in some Spring APIs (such as the constructors to various
+    <interfacename>IApplicationContext</interfacename> implementations), take
+    a String which is used to create a Resource appropriate to that context
+    implementation</para>
+
+    <para>While the Resource interface is used a lot with Spring and by
+    Spring, it's actually very useful to use as a general utility class by
+    itself in your own code, for access to resources, even when your code
+    doesn't know or care about any other parts of Spring. While this couples
+    your code to Spring, it really only couples it to this small set of
+    utility classes and can be considered equivalent to any other library you
+    would use for this purpose</para>
+  </section>
+
+  <section>
+    <title>Built-in IResource implementations</title>
+
+    <para>The resource implementations provided are <itemizedlist
+        spacing="compact">
+        <listitem>
+           
+
+          <literal>AssemblyResource</literal>
+
+           accesses data stored as .NET resources inside an assembly. Uri syntax is 
+
+          <literal>assembly://&lt;AssemblyName&gt;/&lt;NameSpace&gt;/&lt;ResourceName&gt;</literal>
+
+           
+        </listitem>
+
+        <listitem>
+           
+
+          <literal>ConfigSectionResource</literal>
+
+           accesses Spring.NET configuration data stored in a custom configuration section in the .NET application configuration file (i.e. App.config). Uri syntax is 
+
+          <literal>config://&lt;path to section&gt;</literal>
+
+           
+        </listitem>
+
+        <listitem>
+           
+
+          <literal>FileSystemResource</literal>
+
+           accesses file system data. Uri syntax is 
+
+          <literal>file://&lt;filename&gt;</literal>
+
+           
+        </listitem>
+
+        <listitem>
+           
+
+          <literal>InputStreamResource</literal>
+
+           a wrapper around a raw 
+
+          <classname>System.IO.Stream</classname>
+
+           . Uri syntax is not supported. 
+        </listitem>
+
+        <listitem>
+           
+
+          <literal>UriResource</literal>
+
+           accesses data from the standard System.Uri protocols such as http and https. In .NET 2.0 you can use this also for the ftp protocol. Standard Uri syntax is supported. 
+        </listitem>
+      </itemizedlist> Refer to the MSDN documentation for more information on
+    <ulink
+    url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfsystemurimemberstopic.asp">supported
+    Uri scheme types</ulink>.</para>
+
+    <section>
+      <title>Registering custom IResource implementations</title>
+
+      <para>The configuration section handler,
+      <classname>ResourceHandlersSectionHandler</classname>, is used to
+      register any custom <interfacename>IResource</interfacename>
+      implementations you have created. In the configuration section you list
+      the type of <interfacename>IResource</interfacename> implementation and
+      the protocol prefix. Your custom
+      <interfacename>IResource</interfacename> implementation must provide a
+      constructor that takes a string as it's sole argument that represents
+      the URI string. Refer to the SDK documentation for
+      <classname>ResourceHandlersSectionHandler</classname> for more
+      information. An example of the
+      <classname>ResourceHandlersSectionHandler</classname> is shown below for
+      a fictional <interfacename>IResource</interfacename> implementation that
+      interfaces with a database.</para>
+
+      <programlisting>&lt;configuration&gt;
+  &lt;configSections&gt;
+    &lt;sectionGroup name="spring"&gt;
+
+      &lt;section name='context' type='Spring.Context.Support.ContextHandler, Spring.Core'/&gt;
+
+<emphasis role="bold">      &lt;section name="resourceHandlers" 
+               type="Spring.Context.Support.ResourceHandlersSectionHandler, Spring.Core"/&gt;</emphasis>
+
+    &lt;/sectionGroup&gt;
+  &lt;/configSections&gt;
+
+  &lt;spring&gt;
+
+<emphasis role="bold">    &lt;resourceHandlers&gt;
+      &lt;handler protocol="db" type="MyCompany.MyApp.Resources.MyDbResource, MyAssembly"/&gt;
+    &lt;/resourceHandlers&gt;</emphasis>
+
+    &lt;context&gt;
+      &lt;resource uri="db://user:pass@dbName/MyDefinitionsTable"/&gt;
+    &lt;/context&gt;
+
+  &lt;/spring&gt;
+&lt;/configuration&gt;</programlisting>
+    </section>
+  </section>
+
+  <section>
+    <title>The <interfacename>IResourceLoader</interfacename></title>
+
+    <para>To load resources given their Uri syntax, an implementation of the
+    <classname>IResourceLoader</classname> is used. The default implementation
+    is <classname>ConfigurableResourceLoader</classname>. Typically you will
+    not need to access this class directly since the
+    <classname>IApplicationContext</classname> implements the
+    <classname>IResourceLoader</classname> interface that contains the single
+    method <literal>IResource GetResource(string location)</literal>. The
+    provided implementations of <literal>IApplicationContext</literal>
+    delegate this method to an instance of
+    <classname>ConfigurableResourceLoader</classname> which supports the Uri
+    protocols/schemes listed previously. If you do not specify a protocol then
+    the file protocol is used. The following shows some sample
+    usage.<programlisting>IResource resource = appContext.GetResource("http://www.springframework.net/license.html");
+resource = appContext.GetResource("assembly://Spring.Core.Tests/Spring/TestResource.txt");
+resource = appContext.GetResource("https://sourceforge.net/");
+resource = appContext.GetResource("file:///C:/WINDOWS/ODBC.INI");
+
+StreamReader reader = new StreamReader(resource.InputStream);
+Console.WriteLine(reader.ReadToEnd());</programlisting> Other protocols can be
+    registered along with a new implementations of an IResource that must
+    correctly parse a Uri string in its constructor. An example of this can be
+    seen in the <literal>Spring.Web</literal> namespace that uses
+    <literal>Server.MapPath</literal> to resolve the filename of a
+    resource.</para>
+
+    <para>The <literal>CreateRelative</literal> method allows you to easily
+    load resources based on a relative path name. In the case of relative
+    assembly resources, the relative path navigates the namespace within an
+    assembly. For example: <programlisting>IResource res = new AssemblyResource("assembly://Spring.Core.Tests/Spring/TestResource.txt");
+IResource res2 = res.CreateRelative("./IO/TestIOResource.txt");</programlisting>
+    This loads the resource <literal>TestResource.txt</literal> and then
+    navigates to the <literal>Spring.Core.IO</literal> namespace and loads the
+    resource <literal>TestIOResource.txt</literal></para>
+  </section>
+
+  <section>
+    <title>The <interfacename>IResourceLoaderAware</interfacename>
+    interface</title>
+
+    <para>The <interfacename>IResourceLoaderAware</interfacename> interface is
+    a special marker interface, identifying objects that expect to be provided
+    with a <interfacename>IResourceLoader</interfacename> reference.</para>
+
+    <programlisting>public interface IResourceLoaderAware
+{
+  IResourceLoader ResourceLoader
+  {
+    set;
+    get;
+  }
+}</programlisting>
+
+    <para>When a class implements
+    <interfacename>IResourceLoaderAware</interfacename> and is deployed into
+    an application context (as a Spring-managed object), it is recognized as
+    <interfacename>IResourceLoaderAware</interfacename> by the application
+    context. The application context will then invoke the ResourceLoader
+    property, supplying itself as the argument (remember, all application
+    contexts in Spring implement the
+    <interfacename>IResourceLoader</interfacename> interface).</para>
+
+    <para>Of course, since an
+    <interfacename>IApplicationContext</interfacename> is a
+    <interfacename>IResourceLoader</interfacename>, the object could also
+    implement the <interfacename>IApplicationContextAware</interfacename>
+    interface and use the supplied application context directly to load
+    resources, but in general, it's better to use the specialized
+    <interfacename>IResourceLoader</interfacename> interface if that's all
+    that's needed. The code would just be coupled to the resource loading
+    interface, which can be considered a utility interface, and not the whole
+    Spring <interfacename>IApplicationContext</interfacename>
+    interface.</para>
+  </section>
+
+  <section>
+    <title>Application contexts and <interfacename>IResource</interfacename>
+    paths</title>
+
+    <para>An application context constructor (for a specific application
+    context type) generally takes a string or array of strings as the location
+    path(s) of the resource(s) such as XML files that make up the definition
+    of the context. For example, you can create an XmlApplicationContext from
+    two resources as follows:</para>
+
+    <programlisting>IApplicationContext context = new XmlApplicationContext(
+	"file://objects.xml", "assembly://MyAssembly/MyProject/objects-dal-layer.xml");
+</programlisting>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/services.xml b/doc/reference/src/services.xml
new file mode 100644
index 00000000..2e2a6642
--- /dev/null
+++ b/doc/reference/src/services.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="services">
+  <title>.NET Enterprise Services</title>
+
+  <sect1 id="services-introduction">
+    <title>Introduction</title>
+
+    <para>Spring's .NET Enterprise Services support allows you to export a
+    'plain .NET object' as a .NET Remoted object. By "plain .NET object" we
+    mean classes that do not inherit from a specific infrastructure base class
+    such as ServicedComponent..</para>
+
+    <para>You can leverage the IoC container to configure the exporter and
+    service endpoints. You may also opt to not use the IoC container to
+    configure the objects and use Spring's .NET Enterprise Services classes
+    Programatically, as you would with any third party library.</para>
+  </sect1>
+
+  <sect1 id="services-servicedcomponents">
+    <title>Serviced Components</title>
+
+    <para>Services components in .NET are able to use COM+ services such as
+    declarative and distributed transactions, role based security, object
+    pooling messaging. To access these services your class needs to derive
+    from the class
+    <classname>System.EnterpriseServices.ServicedComponent</classname>, adorn
+    your class and assemblies with relevant attributes, and configure your
+    application by registering your serviced components with the COM+ catalog.
+    The overall landscape of accessing and using COM+ services within .NET
+    goes by the name .NET Enterprise Services.</para>
+
+    <para>Many of these services can be provided without the need to derive
+    from a ServicedComponent though the use of Spring's Aspect-Oriented
+    Programming functionality. Nevertheless, you may be interested in
+    exporting your class as a serviced component and having client access that
+    component in a location transparent manner. By using Spring's
+    <literal>ServicedComponentExporter</literal>,
+    <literal>EnterpriseServicesExporter</literal> and
+    <literal>ServicedComponentFactory</literal> you can easily create and
+    consume serviced components without having your class inherit from
+    <literal>ServicedComponent</literal> and automate the manual deployment
+    process that involves strongly signing your assembly and using the
+    <literal>regsvcs</literal> utility.</para>
+
+    <para>Note that the following sections do not delve into the details of
+    programming .NET Enterprise Services. An excellent reference for such
+    information is Christian Nagel's "Enterprise Services with the .NET
+    Framework" Spring.NET includes an example of using these classes, the
+    'calculator' example. More information can be found in the section, .<link
+    linkend="entsvc-example">NET Enterprise Services example.</link></para>
+  </sect1>
+
+  <sect1 id="services-serverside">
+    <title>Server Side</title>
+
+    <para>One of the main challenges for the exporting of a serviced component
+    to the host is the need for them to be contained within a physical
+    assembly on the file system in order to be registered with the COM+
+    Services. To make things more complicated, this assembly has to be
+    strongly named before it can be successfully registered.</para>
+
+    <para>Spring provides two classes that allow all of this to happen.
+    <itemizedlist>
+        <listitem>
+           
+
+          <classname>Spring.Enterprise.ServicedComponentExporter</classname>
+
+           is responsible for exporting a single component and making sure that it derives from ServicedComponent class. It also allows you to specify class-level and method-level attributes for the component in order to define things such as transactional behavior, queuing, etc. 
+        </listitem>
+
+        <listitem>
+           
+
+          <classname>Spring.Enterprise.EnterpriseServicesExporter</classname>
+
+           corresponds to a COM+ application, and it allows you to specify list of components that should be included in the application, as well as the application name and other assembly-level attributes 
+        </listitem>
+      </itemizedlist></para>
+
+    <para>Let's say that we have a simple service interface and implementation
+    class, such as these:</para>
+
+    <programlisting>namespace MyApp.Services
+{
+    public interface IUserManager
+    {
+        User GetUser(int userId);
+        void SaveUser(User user);
+    }
+
+    public class SimpleUserManager : IUserManager
+    {
+        private IUserDao userDao;
+        public IUserDao UserDao
+        {
+            get { return userDao; }
+            set { userDao = value; }
+        }
+
+        public User GetUser(int userId)
+        {
+            return UserDao.FindUser(userId);
+        }
+
+        public void SaveUser(User user)
+        {
+            if (user.IsValid)
+            {
+                UserDao.SaveUser(user);
+            }
+        }
+    }
+} </programlisting>
+
+    <para>And the corresponding object definition for it in the application
+    context config file:</para>
+
+    <programlisting>&lt;object id="userManager" type="MyApp.Services.SimpleUserManager"&gt;
+    &lt;property name="UserDao" ref="userDao"/&gt;
+&lt;/object&gt;</programlisting>
+
+    <para>Let's say that we want to expose user manager as a serviced
+    component so we can leverage its support for transactions. First we need
+    to export our service using the exporter
+    <literal>ServicedComponentExporter</literal> as shown below</para>
+
+    <programlisting>&lt;object id="MyApp.EnterpriseServices.UserManager" type="Spring.Enterprise.ServicedComponentExporter, Spring.Services"&gt;
+    &lt;property name="TargetName" value="userManager"/&gt;
+    &lt;property name="TypeAttributes"&gt;
+        &lt;list&gt;
+            &lt;object type="System.EnterpriseServices.TransactionAttribute, System.EnterpriseServices"/&gt;
+        &lt;/list&gt;
+    &lt;/property&gt;
+    &lt;property name="MemberAttributes"&gt;
+        &lt;dictionary&gt;
+            &lt;entry key="*"&gt;
+                &lt;list&gt;
+                    &lt;object type="System.EnterpriseServices.AutoCompleteAttribute, System.EnterpriseServices"/&gt;
+                &lt;/list&gt;
+            &lt;/entry&gt;
+        &lt;/dictionary&gt;
+    &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+
+    <para>The exporter defined above will create a composition proxy for our
+    SimpleUserManager class that extends <literal>ServicedComponent</literal>
+    and delegates method calls to SimpleUserManager instance. It will also
+    adorn the proxy class with a <literal>TransactionAtribute</literal> and
+    all methods with an <literal>AutoCompleteAttribute</literal>.</para>
+
+    <para>The next thing we need to do is configure an exporter for the COM+
+    application that will host our new component:</para>
+
+    <programlisting>&lt;object id="MyComponentExporter" type="Spring.Enterprise.EnterpriseServicesExporter, Spring.Services"&gt;
+    &lt;property name="ApplicationName" value="My COM+ Application"/&gt;
+    &lt;property name="Description" value="My enterprise services application."/&gt;
+    &lt;property name="AccessControl"&gt;
+        &lt;object type="System.EnterpriseServices.ApplicationAccessControlAttribute, System.EnterpriseServices"&gt;
+            &lt;property name="AccessChecksLevel" value="ApplicationComponent"/&gt;
+        &lt;/object&gt;
+    &lt;/property&gt;
+    &lt;property name="Roles"&gt;
+        &lt;list&gt;
+            &lt;value&gt;Admin : Administrator role&lt;/value&gt;
+            &lt;value&gt;User : User role&lt;/value&gt;
+            &lt;value&gt;Manager : Administrator role&lt;/value&gt;
+        &lt;/list&gt;
+    &lt;/property&gt;
+    &lt;property name="Components"&gt;
+        &lt;list&gt;
+            &lt;ref object="MyApp.EnterpriseServices.UserManager"/&gt;
+        &lt;/list&gt;
+    &lt;/property&gt;
+    &lt;property name="Assembly" value="MyComPlusApp"/&gt;
+&lt;/object&gt;</programlisting>
+
+    <para>This exporter will put all proxy classes for the specified list of
+    components into the specified assembly, sign the assembly, and register it
+    with the specified COM+ application name. If application does not exist it
+    will create it and configure it using values specified for Description,
+    AccessControl and Roles properties.</para>
+  </sect1>
+
+  <sect1 id="services-clientside">
+    <title>Client Side</title>
+
+    <para>Because serviced component classes are dynamically generated and
+    registered, you cannot instantiate them in your code using the new
+    operator. Instead, you need to use
+    <classname>Spring.Enterprise.ServicedComponentFactory</classname>
+    definition, which also allows you to specify the configuration template
+    for the component as well as the name of the remote server the component
+    is running on, if necessary. An example is shown below</para>
+
+    <programlisting>&lt;object id="enterpriseUserManager" type="Spring.Enterprise.ServicedComponentFactory, Spring.Services"&gt;
+    &lt;property name="Name" value="MyApp.EnterpriseServices.UserManager"/&gt;
+    &lt;property name="Template" value="userManager"/&gt;
+&lt;/object&gt;</programlisting>
+
+    <para>You can then inject this instance of the IUserManager into a client
+    class and use it just like you would use original SimpleUserManager
+    implementation. As you can see, by coding your services as plain .Net
+    objects, against well defined service interfaces, you gain easy
+    pluggability for your service implementation though this configuration,
+    while keeping the core business logic in a technology agnostic PONO, i.e.
+    Plain Ordinary .Net Object.</para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/springair.xml b/doc/reference/src/springair.xml
new file mode 100644
index 00000000..5e456834
--- /dev/null
+++ b/doc/reference/src/springair.xml
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="springair">
+  <title>SpringAir - Reference Application</title>
+
+  <sect1>
+    <title>Introduction</title>
+
+    <para>The SpringAir sample application demonstrates a selection of
+    Spring.NET's powerful features making a .NET programmer's life easier. It
+    demonstrates the following features of Spring.Web</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Spring.NET IoC container configuration</para>
+      </listitem>
+
+      <listitem>
+        <para>Dependency Injection as applied to ASP.NET pages</para>
+      </listitem>
+
+      <listitem>
+        <para>Master Page support</para>
+      </listitem>
+
+      <listitem>
+        <para>Web Service support</para>
+      </listitem>
+
+      <listitem>
+        <para>Bi-directional data binding</para>
+      </listitem>
+
+      <listitem>
+        <para>Declarative validation of domain objects</para>
+      </listitem>
+
+      <listitem>
+        <para>Internationalization</para>
+      </listitem>
+
+      <listitem>
+        <para>Result mapping to better encapsulate page navigation
+        flows</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>The application models a flight reservation system where you can
+    browse flights, book a trip and even attach your own clients by leveraging
+    the web services exposed by the SpringAir application.</para>
+
+    <para>All pages within the application are fully Spring managed.
+    Dependencies get injected as configured within a Spring Application
+    Context. For NET 1.1 it shows how to apply centrally managed layouts to
+    all pages in an application by using master pages - a well-known feature
+    from NET 2.0.</para>
+
+    <para>When selecting your flights, you are already experiencing a fully
+    localized form. Select your preferred language from the bottom of the form
+    and see, how the new language is immediately applied. As soon as you
+    submit your desired flight, the submitted values are automatically unbound
+    from the form onto the application's data model by leveraging Spring.Web's
+    support for Data Binding. With Data Binding you can easily associate
+    properties on your PONO model with elements on your ASP.NET form.</para>
+  </sect1>
+
+  <sect1>
+    <title>Getting Started</title>
+
+    <para>The application is located in the installation directory under
+    'examples/SpringAir. The directory 'SpringAir.Web.2003' contains the .NET
+    1.1 version of the application and the directory 'SpringAir.Web.2005'
+    contains the .NET 2.0 version. For .NET 1.1 you will need to create a
+    virtual directory named 'SpringAir.2003' using IIS Administrator and point
+    it to the following directory
+    examples\Spring\SpringAir\src\SpringAir.Web.2003. The solution file for
+    .NET 1.1 is examples\Spring\SpringAir\SpringAir.2003.sln. For .NET 2.0
+    simply open the solution examples\Spring\SpringAir\SpringAir.2005.sln. Set
+    your startup project to be SpringAir.Web and the startpage to
+    .\Web\Home.aspx</para>
+  </sect1>
+
+  <sect1>
+    <title>Container configuration</title>
+
+    <para>The web project's top level Web.config configures the IoC container
+    that is used within the web application. You do not need to explicitly
+    instantiate the IoC container. The important parts of that configuration
+    are shown below</para>
+
+    <programlisting>&lt;spring&gt;
+    &lt;parsers&gt;
+        &lt;parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" /&gt;
+    &lt;/parsers&gt;
+
+    &lt;context&gt;
+        &lt;resource uri="~/Config/Aspects.xml"/&gt;
+        &lt;resource uri="~/Config/Web.xml"/&gt;
+        &lt;resource uri="~/Config/Services.xml"/&gt;
+      
+        &lt;!-- TEST CONFIGURATION --&gt;
+
+       &lt;resource uri="~/Config/Test/Services.xml"/&gt;
+       &lt;resource uri="~/Config/Test/Dao.xml"/&gt;
+      
+       &lt;!-- PRODUCTION CONFIGURATION --&gt;
+
+       &lt;!--
+       &lt;resource uri="~/Config/Production/Services.xml"/&gt;
+       &lt;resource uri="~/Config/Production/Dao.xml"/&gt;
+       --&gt;
+    &lt;/context&gt;
+&lt;/spring&gt;</programlisting>
+
+    <para>In this example there are separate configuration files for test and
+    production configuration. The Services.xml file is in fact the same
+    between the two, and the example will be refactored in future to remove
+    that duplication. The Dao layer in the test configuration is an in-memory
+    version, faking database access, whereas the production version uses an
+    ADO.NET based solution.</para>
+
+    <para>The pages that comprise the application are located in the directory
+    'Web/BookTrip'. In that directory is another Web.config that is
+    responsible for configuring that directory's .aspx pages. There are three
+    main pages in the flow of the application.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>TripForm - form to enter in airports, times, round-trip or
+        one-way</para>
+      </listitem>
+
+      <listitem>
+        <para>Suggested Flights - form to select flights</para>
+      </listitem>
+
+      <listitem>
+        <para>ReservationConfirmationPage - your confirmation ID from the
+        booking process.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>The XML configuration to configure the TripForm form is shown
+    below</para>
+
+    <programlisting>      &lt;object type="TripForm.aspx" parent="standardPage"&gt;
+        &lt;property name="BookingAgent" ref="bookingAgent" /&gt;
+        &lt;property name="AirportDao" ref="airportDao" /&gt;
+        &lt;property name="TripValidator" ref="tripValidator" /&gt;
+        &lt;property name="Results"&gt;
+          &lt;dictionary&gt;
+            &lt;entry key="displaySuggestedFlights" value="redirect:SuggestedFlights.aspx" /&gt;
+          &lt;/dictionary&gt;
+        &lt;/property&gt;
+      &lt;/object&gt;</programlisting>
+
+    <para>As you can see the various services it needs are set using standard
+    DI techniques. The Results property externalizes the page flow,
+    redirecting to the next page in the flow, SuggestedFlights. The 'parent'
+    attribute lets this page inherit properties from a template. The is
+    located in the top level Web.config file, packaged under the Config
+    directory. The standardPage sets up properties of Spring's base page
+    class, from which all the pages in this application inherit from. (Note
+    that to perform only dependency injection on pages you do not need to
+    inherit from Spring's Page class).</para>
+  </sect1>
+
+  <sect1>
+    <title>Bi-directional data binding</title>
+
+    <para>The TripForm page demonstrates the bi-directional data binding
+    features. A Trip object is used to back the information of the form. The
+    family of methods that are overridden to support the bi-directional data
+    binding are listed below.</para>
+
+    <programlisting>    protected override void InitializeModel()
+    {
+        trip = new Trip();
+        trip.Mode = TripMode.RoundTrip;
+        trip.StartingFrom.Date = DateTime.Today;
+        trip.ReturningFrom.Date = DateTime.Today.AddDays(1);
+    }
+
+    protected override void LoadModel(object savedModel)
+    {
+        trip = (Trip)savedModel;
+    }
+
+    protected override object SaveModel()
+    {
+        return trip;
+    }
+
+    protected override void InitializeDataBindings()
+    {
+        BindingManager.AddBinding("tripMode.Value", "Trip.Mode");
+        BindingManager.AddBinding("leavingFromAirportCode.SelectedValue", "Trip.StartingFrom.AirportCode");
+        BindingManager.AddBinding("goingToAirportCode.SelectedValue", "Trip.ReturningFrom.AirportCode");
+        BindingManager.AddBinding("leavingFromDate.SelectedDate", "Trip.StartingFrom.Date");
+        BindingManager.AddBinding("returningOnDate.SelectedDate", "Trip.ReturningFrom.Date");
+    }</programlisting>
+
+    <para>This is all you need to set up in order to have values from the Trip
+    object 'marshaled' to and from the web controls. The
+    InitializeDataBindings method set this up, using the Spring Expression
+    Language to define the UI element property that is associate with the
+    model (Trip) property.</para>
+  </sect1>
+
+  <sect1>
+    <title>Declarative Validation</title>
+
+    <para>The method called when the Search button is clicked will perform
+    validation. If validation succeeds as well as additional business logic
+    checks, the next page in the flow is loaded. This is shown in the code
+    below. Notice how much cleaner and more business focused the code reads
+    than if you were using standard ASP.NET APIs.</para>
+
+    <programlisting>    protected void SearchForFlights(object sender, EventArgs e)
+    {
+        if (Validate(trip, tripValidator))
+        {
+            FlightSuggestions suggestions = this.bookingAgent.SuggestFlights(Trip);
+            if (suggestions.HasOutboundFlights)
+            {
+                Session[Constants.SuggestedFlightsKey] = suggestions;
+                SetResult(DisplaySuggestedFlights);
+            }
+        }
+    }</programlisting>
+
+    <para>The 'Validate' method of the page takes as arguments the object to
+    validate and a IValidator instance. The TripForm property TripValidator is
+    set via dependency injection (as shown above). The validation logic is
+    defined declaratively in the XML configuration file and is shown
+    below.</para>
+
+    <programlisting>   &lt;v:group id="tripValidator"&gt;
+
+    &lt;v:required id="departureAirportValidator" test="StartingFrom.AirportCode"&gt;
+				  &lt;v:message id="error.departureAirport.required" providers="departureAirportErrors, validationSummary"/&gt;
+				&lt;/v:required&gt;
+
+			  &lt;v:group id="destinationAirportValidator"&gt;
+				  &lt;v:required test="ReturningFrom.AirportCode"&gt;
+				    &lt;v:message id="error.destinationAirport.required" providers="destinationAirportErrors, validationSummary"/&gt;
+				  &lt;/v:required&gt;
+				  &lt;v:condition test="ReturningFrom.AirportCode != StartingFrom.AirportCode" when="ReturningFrom.AirportCode != ''"&gt;
+				    &lt;v:message id="error.destinationAirport.sameAsDeparture" providers="destinationAirportErrors, validationSummary"/&gt;
+				  &lt;/v:condition&gt;
+			  &lt;/v:group&gt;
+
+				&lt;v:group id="departureDateValidator"&gt;
+					&lt;v:required test="StartingFrom.Date"&gt;
+				    &lt;v:message id="error.departureDate.required" providers="departureDateErrors, validationSummary"/&gt;
+				  &lt;/v:required&gt;
+					&lt;v:condition test="StartingFrom.Date &gt;= DateTime.Today" when="StartingFrom.Date != DateTime.MinValue"&gt;
+				    &lt;v:message id="error.departureDate.inThePast" providers="departureDateErrors, validationSummary"/&gt;
+					&lt;/v:condition&gt;
+				&lt;/v:group&gt;
+
+				&lt;v:group id="returnDateValidator" when="Mode == 'RoundTrip'"&gt;
+					&lt;v:required test="ReturningFrom.Date"&gt;
+				    &lt;v:message id="error.returnDate.required" providers="returnDateErrors, validationSummary"/&gt;
+				  &lt;/v:required&gt;
+					&lt;v:condition test="ReturningFrom.Date &gt;= StartingFrom.Date" when="ReturningFrom.Date != DateTime.MinValue"&gt;
+				    &lt;v:message id="error.returnDate.beforeDeparture" providers="returnDateErrors, validationSummary"/&gt;
+				  &lt;/v:condition&gt;
+				&lt;/v:group&gt;
+
+			&lt;/v:group&gt;</programlisting>
+
+    <para>The validation logic has 'when' clauses so that return dates can be
+    ignored if the Mode property of the Trip object is set to
+    'RoundTrip'.</para>
+  </sect1>
+
+  <sect1>
+    <title>Internationalization</title>
+
+    <para>Both image and text based internationalization are supported. You
+    can see this in action by clicking on the English, Srpski, or Срп�ки links
+    on the bottom of the page.</para>
+  </sect1>
+
+  <sect1>
+    <title>Web Services</title>
+
+    <para>The class BookingAgent that was used by the TripForm class is a
+    standard .NET class, i.e no WebMethod attributes are on any of its
+    methods. Spring can expose this object as a web service by declaring the
+    following XML defined in the top level Config/Services.xml file</para>
+
+    <programlisting>  &lt;object id="bookingAgentWebService" type="Spring.Web.Services.WebServiceExporter, Spring.Web"&gt;
+    &lt;property name="TargetName" value="bookingAgent"/&gt;
+    &lt;property name="Name" value="BookingAgent"/&gt;
+    &lt;property name="Namespace" value="http://SpringAir/WebServices"/&gt;
+    &lt;property name="Description" value="SpringAir Booking Agent Web Service"/&gt;
+    &lt;property name="MemberAttributes"&gt;
+      &lt;dictionary&gt;
+        &lt;entry key="SuggestFlights"&gt;
+          &lt;object type="System.Web.Services.WebMethodAttribute, System.Web.Services"&gt;
+            &lt;property name="Description" value="Gets those flight suggestions that are applicable for the supplied trip."/&gt;
+          &lt;/object&gt;
+        &lt;/entry&gt;
+        &lt;entry key="Book"&gt;
+          &lt;object type="System.Web.Services.WebMethodAttribute, System.Web.Services"&gt;
+            &lt;property name="Description" value="Goes ahead and actually books what up until this point has been a transient reservation."/&gt;
+          &lt;/object&gt;
+        &lt;/entry&gt;
+        &lt;entry key="GetAirportList"&gt;
+          &lt;object type="System.Web.Services.WebMethodAttribute, System.Web.Services"&gt;
+            &lt;property name="Description" value="Return a collection of all those airports that can be used for the purposes of booking."/&gt;
+          &lt;/object&gt;
+        &lt;/entry&gt;
+      &lt;/dictionary&gt;
+    &lt;/property&gt;
+  &lt;/object&gt;</programlisting>
+
+    <para></para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/templated/AgileDocs.Core.dll b/doc/reference/src/templated/AgileDocs.Core.dll
new file mode 100644
index 00000000..b30f2f2a
Binary files /dev/null and b/doc/reference/src/templated/AgileDocs.Core.dll differ
diff --git a/doc/reference/src/templated/misc.xml b/doc/reference/src/templated/misc.xml
new file mode 100644
index 00000000..f29ce0f8
--- /dev/null
+++ b/doc/reference/src/templated/misc.xml
@@ -0,0 +1,162 @@
+<%@ CodeTemplate %>
+<%@ Import Namespace="System.IO" %>
+<%@ Assembly Name="AgileDocs.Core" %>
+<%@ Import Namespace="AgileDocs.Core" %>
+
+<script runat="template">
+
+	string Example(string example, string what) 
+	{
+		return "<programlisting format='linespecific' xml:space='preserve'>"
+      + XmlPeek.HtmlEncode (
+			XmlPeek.ExtractAndQueryXPath(			
+				Path.Combine("test/Spring/Spring.Core.Tests/Data/PathMatcher", "Examples.test"), 
+				String.Format("examples/example[@name='{0}']/{1}", example, what), 
+				new ExtractXml("#", null)))
+      + "</programlisting>";		
+	}
+
+</script>
+
+
+<chapter id="misc">
+  <title>Spring.NET miscellanea</title>
+  <sect1>
+    <title>Introduction</title>
+    <para>
+    This chapter contains miscellanea information on features, goodies, caveats 
+    that does not belong to any paricular area.  
+    </para>
+  </sect1>
+  <sect1>
+	<title>PathMatcher</title>
+	<para>
+	<emphasis>Note, Spring.Util.PathMatcher is 
+  currently only available in CVS, not the RC3 release.  If you want to use these feature
+  please get the code from CVS 
+  <ulink url="http://opensource.atlassian.com/confluence/spring/display/NET/Project+Structure">(instructions)</ulink> 
+  or from the download section of the 
+  Spring.NET website that contains an .zip with the full CVS tree.
+  </emphasis>
+  </para>	
+	<para>
+	<literal>Spring.Util.PathMatcher</literal> provides <literal>Ant/NAnt</literal>-like path name matching 
+	features.
+	</para>
+	<para>To do the match, you use the method:
+	<programlisting format='linespecific' xml:space='preserve'><%= 
+	  XmlPeek.HtmlEncode (
+			XmlPeek.ExtractAndQueryXPath(			
+				"src/Spring/Spring.Core/Util/PathMatcher.cs", 
+				"fragments/fragment[@name='match-method']"))
+   %></programlisting>	
+	</para>
+	<para>If you want to decide if case is important or not use the method:
+	<programlisting format='linespecific' xml:space='preserve'><%= 
+	  XmlPeek.HtmlEncode (
+			XmlPeek.ExtractAndQueryXPath(			
+				"src/Spring/Spring.Core/Util/PathMatcher.cs", 
+				"fragments/fragment[@name='match-method-nocase']"))
+   %></programlisting>	
+	</para>
+	<sect2>
+  <title>General rules</title>
+	<para>
+	To build your pattern, you use the <literal>*</literal>, <literal>?</literal>
+	and <literal>**</literal> building blocks:
+  <itemizedlist spacing="compact">
+  <listitem>
+	  <para><literal>*</literal>: matches any number of non slash 
+	  characters;
+	  </para>
+	</listitem>
+  <listitem>
+	  <para><literal>?</literal>: matches exactly 1 (one) non slash/dot
+	  character;
+	  </para>
+	</listitem>
+	<listitem>
+	  <para><literal>**</literal>: matches any subdirectory, without 
+	  taking care of the depth;
+	  </para>
+	</listitem>
+  </itemizedlist>
+	</para>
+	</sect2>
+	
+  <sect2>
+	<title>Matching filenames</title>
+	<para>
+  A file name can be matched using the following 
+  notation:
+	<%= Example("filename", "pattern") %>
+	matches:
+	<%= Example("filename", "match") %>
+	does not match:
+	<%= Example("filename", "dont.match") %>
+	</para>
+	<para>
+	The classical all files pattern:
+	<%= Example("filename-all", "pattern") %>
+	matches:
+	<%= Example("filename-all", "match") %>
+	does not match:
+	<%= Example("filename-all", "dont.match") %>
+	</para>
+	</sect2>
+
+	<sect2>
+	<title>Matching subdirectories</title>
+	<para>
+  A directory name can be matched at any depth level using the following 
+  notation:
+	<%= Example("subdir", "pattern") %>
+	That pattern matches the following paths:
+	<%= Example("subdir", "match") %>
+	but does not match these:
+	<%= Example("subdir", "dont.match") %>
+	</para>
+	<para>
+	You can compose subdirectories to match like this:
+	<%= Example("double-subdir", "pattern") %>
+	That pattern matches the following paths:
+	<%= Example("double-subdir", "match") %>
+	but does not match these:
+	<%= Example("double-subdir", "dont.match") %>
+	</para>
+	<para>
+	You can use more advanced patterns:
+	<%= Example("subdir-2", "pattern") %>
+	matches:
+	<%= Example("subdir-2", "match") %>
+	does not match:
+	<%= Example("subdir-2", "dont.match") %>
+	</para>
+	</sect2>
+			
+	<sect2>
+	<title>Case does matter, slashes don't</title>
+	<para>
+	.NET is expected to be a cross-platform development ... platform. So,
+	<literal>PathMatcher</literal> will match taking care of the case of the pattern
+	and the case of the path. For example:
+	<%= Example("case-sensitive", "pattern") %>
+	matches:
+	<%= Example("case-sensitive", "match") %>
+	but does not match:
+	<%= Example("case-sensitive", "dont.match") %>
+	</para>
+	<para>If you do not matter about case, you should explicitly tell the 	
+	<literal>Pathmatcher</literal>.</para>
+	<para>
+  Back and forward slashes, in the very same cross-platform spirit, are 
+  not important:
+	<%= Example("slashes", "pattern") %>
+	matches all the following paths:
+	<%= Example("slashes", "match") %>
+	</para>
+	</sect2>
+	
+  </sect1>
+
+</chapter>
diff --git a/doc/reference/src/templated/pooling-example.xml b/doc/reference/src/templated/pooling-example.xml
new file mode 100644
index 00000000..4a114b43
--- /dev/null
+++ b/doc/reference/src/templated/pooling-example.xml
@@ -0,0 +1,158 @@
+<%@ CodeTemplate %>
+<%@ Import Namespace="System.IO" %>
+<%@ Assembly Name="AgileDocs.Core" %>
+<%@ Import Namespace="AgileDocs.Core" %>
+
+<script runat="template">
+
+  string PoolExample (string fileName, string xpath)
+  {
+    return "<programlisting format='linespecific' xml:space='preserve'>"
+      + XmlPeek.HtmlEncode (
+          XmlPeek.ExtractAndQueryXPath(			
+            Path.Combine("examples/Spring/Spring.Examples.Pool/Examples/Pool", fileName), 
+            String.Format("examples/example[@name='{0}']", xpath)))
+      + "</programlisting>";
+  }
+
+</script>
+
+  <sect1>
+    <title>Pooling example</title>
+    <para>
+    The idea is to build an executor backed by a pool of 
+    <literal>QueuedExecutor</literal>: this will show how Spring.NET 
+    provides some useful low-level/high-quality reusable threading and 
+    pooling abstractions.
+    This executor will provide parallel executions (in our case 
+    <literal>grep</literal>-like file scans).  <emphasis>Note: This example
+    is not in the 1.0.0 release to its use of classes in the Spring.Threading
+    namespace scheduled for release in Spring 1.1. To access ths example 
+    please get the code from CVS <ulink url="http://opensource.atlassian.com/confluence/spring/display/NET/Project+Structure">(instructions)</ulink> or from the download section of the 
+    Spring.NET website that contains an .zip with the full CVS tree.</emphasis>
+    </para>
+    <para>
+    Some information on <literal>QueuedExecutor</literal> is helpful to 
+    better understand the implementation and to possibly disagree with it.
+    Keep in mind that the point is to show how to develop your own 
+    object-pool.
+    </para>
+    <para>
+    A <literal>QueuedExecutor</literal> is an executor where 
+    <literal>IRunnable</literal> instances are run serialy by a worker 
+    thread. When you <literal>Execute</literal> with a 
+    <literal>QueuedExecutor</literal>, your request is queued; at some 
+    point in the future your request will be taken and executed by the 
+    worker thread: in case of error the thread is terminated. 
+    However
+    this executor recreates its worker thread as needed.
+    </para>
+    <para>Last but not least, this executor can be shut down in 
+    a few different ways (please refer to the Spring.NET SDK documentation).    
+    Given its simplicity, it is very powerful.
+    </para>
+    <para>
+    The example project <literal>Spring.Examples.Pool</literal> provides 
+    an implementation of a pooled executor, backed by n instances of 
+    <literal>Spring.Threading.QueuedExecutor</literal>: please ignore 
+    the fact that <literal>Spring.Threading</literal> includes already a
+    very different implementation of a <literal>PooledExecutor</literal>:
+    here we wanto to use a pool of <literal>QueuedExecutor</literal>s.
+    </para>
+    <para>
+    This executor will be used to implement a parallel 
+    recursive <literal>grep</literal>-like console executable.
+    </para>
+    <sect2>
+    <title>Implementing <literal>Spring.Pool.IPoolableObjectFactory</literal></title>
+    <para>
+    In order to use the <literal>SimplePool</literal> implementation,
+    the first thing to do is to implement the <literal>IPoolableObjectFactory</literal>
+    interface. This interface is intended to be implemented by objects 
+    that can create the type of objects that should be pooled.
+    The <literal>SimplePool</literal>
+    will call the lifecycle methods on <literal>IPoolableObjectFactory</literal> interface
+    (<literal>MakeObject, ActivateObject, ValidateObject, PassivateObject, and DestroyObject</literal>)
+    as appropriate when the pool is created, objects are borrowed and returned to the pool, and when
+    the pool is destroyed.
+    </para>    
+    <para>
+    In our case, as already said, we want to to implement a pool 
+    of <literal>QueuedExecutor</literal>. Ok, here the declaration:   
+    <%= PoolExample("PooledQueuedExecutor.cs", "factory-declaration") %>
+    the first task a factory should do is to create objects:
+    <%= PoolExample("PooledQueuedExecutor.cs", "make") %>
+    and should be also able to destroy them:
+    <%= PoolExample("PooledQueuedExecutor.cs", "destroy") %>
+    </para>
+    <para>
+    When an object is taken from the pool, to satisfy a client request,
+    may be the object should be activated. We can possibly implement the
+    activation like this:
+    <%= PoolExample("PooledQueuedExecutor.cs", "activate") %>
+    even if a <literal>QueuedExecutor</literal> restarts itself as 
+    needed and so a valid implementation could leave this method empty.
+    </para>
+    <para>
+    After activation, and before the pooled object can be succesfully 
+    returned to the client, it is validated (should the object be 
+    invalid, it will be discarded: this can lead to an empty unusable
+    pool
+    <footnote>
+    <para>You may think that we can provide a smarter 
+    implementation and you are probably right. However, it is not so 
+    difficult to create a new pool in case the old one became unusable.
+    It could not be your preferred choice but surely it leverages 
+    simplicity and object immutability
+    </para>
+    </footnote>).
+    Here we check that the worker thread exists:
+    <%= PoolExample("PooledQueuedExecutor.cs", "validate") %>
+    </para>
+    <para>
+    Passivation, symmetrical to activation, is the process a pooled 
+    object is subject to when the object is returned to the pool. In our 
+    case we simply do nothing:
+    <%= PoolExample("PooledQueuedExecutor.cs", "passivate") %>
+    </para>
+    <para>
+    At this point, creating a pool is simply a matter of creating an 
+    <literal>SimplePool</literal> as in:
+    <%= PoolExample("PooledQueuedExecutor.cs", "create-pool") %>
+    </para>
+    </sect2>
+    <sect2>
+    <title>Being smart using pooled objects</title>
+    <para>
+    Taking advantage of the <literal>using</literal> keyword seems
+    to be very important in these <literal>c#</literal> days, so we 
+    implement a very simple helper (<literal>PooledObjectHolder</literal>)
+    that can allow us to do things like:
+    <%= PoolExample("PooledQueuedExecutor.cs", "execute") %>
+    without worrying about obtaining and returning an object from/to the 
+    pool.
+    </para>
+    <para>
+    Here is the implementation:
+    <%= PoolExample("PooledQueuedExecutor.cs", "holder") %>
+    </para>
+    <para>
+    Please don't forget to destroy all the pooled istances once you have 
+    finished! How? Well using something like this in 
+    <literal>PooledQueuedExecutor</literal>:
+    <%= PoolExample("PooledQueuedExecutor.cs", "stop") %>
+    </para>
+    </sect2>
+    <sect2>
+    <title>Using the executor to do a parallel <literal>grep</literal></title>
+    <para>
+    The use of the just built executor is quite straigtforward but a 
+    little tricky if we want to really exploit the pool.
+    <%= PoolExample("Grep.cs", "parallel-grep-class") %>
+    </para>
+    <para>    
+    <%= PoolExample("Grep.cs", "parallel-grep-main") %>
+    </para>
+    </sect2>
+  </sect1>
+
diff --git a/doc/reference/src/templated/properties.props b/doc/reference/src/templated/properties.props
new file mode 100644
index 00000000..41071e75
--- /dev/null
+++ b/doc/reference/src/templated/properties.props
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="us-ascii"?>
+<codeSmith>
+	<propertySet>
+	<!--
+		<property name="MyPurchaseOrder">
+			<PurchaseOrder xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.ericjsmith.net">
+				<ShipTo Name="Eric J. Smith">
+					<Line1>123 Test Dr.</Line1>
+					<City>Dallas</City>
+					<State>TX</State>
+					<Zip>75075</Zip>
+				</ShipTo>
+				<OrderDate>05-01-2003</OrderDate>
+				<Items>
+					<OrderedItem>
+						<ItemName>Item #1</ItemName>
+						<Description>Item #1 Description</Description>
+						<UnitPrice>5.45</UnitPrice>
+						<Quantity>3</Quantity>
+						<LineTotal>16.35</LineTotal>
+					</OrderedItem>
+					<OrderedItem>
+						<ItemName>Item #2</ItemName>
+						<Description>Item #2 Description</Description>
+						<UnitPrice>12.75</UnitPrice>
+						<Quantity>8</Quantity>
+						<LineTotal>102.00</LineTotal>
+					</OrderedItem>
+				</Items>
+				<SubTotal>45.23</SubTotal>
+				<ShipCost>5.23</ShipCost>
+				<TotalCost>50.46</TotalCost>
+			</PurchaseOrder>
+		</property>
+	-->
+	</propertySet>
+</codeSmith>
\ No newline at end of file
diff --git a/doc/reference/src/templated/windows-service.xml b/doc/reference/src/templated/windows-service.xml
new file mode 100644
index 00000000..6830dd73
--- /dev/null
+++ b/doc/reference/src/templated/windows-service.xml
@@ -0,0 +1,441 @@
+<%@ CodeTemplate %>
+<%@ Assembly Name="System.Web" %>
+<%@ Import Namespace="System.IO" %>
+<%@ Import Namespace="System.Xml" %>
+<%@ Import Namespace="System.Web" %>
+<%@ Import Namespace="System.Text" %>
+
+<%@ Assembly Name="AgileDocs.Core" %>
+<%@ Import Namespace="AgileDocs.Core" %>
+
+
+<script runat="template">
+
+  string XmlExample (string fileName, string xpath)
+  {
+    return "<programlisting format='linespecific'>"
+      + XmlPeek.HtmlEncode (
+          XmlPeek.ExtractAndQueryXPath(fileName, xpath, 
+          new ExtractXml("<!--@", "@-->")))
+      + "</programlisting>";
+  }
+
+  string CsExample (string fileName, string xpath)
+  {
+    return "<programlisting format='linespecific'>"
+      + XmlPeek.HtmlEncode (
+          XmlPeek.ExtractAndQueryXPath(fileName, xpath, 
+          new ExtractXml("////", null)))
+      + "</programlisting>";
+  }
+  
+  string EntireFile (string fileName)
+  {
+    return "<programlisting format='linespecific'>"
+      + XmlPeek.HtmlEncode (
+          XmlPeek.GetFileContent(fileName))
+      + "</programlisting>";
+  }
+
+</script>
+
+
+<chapter id="windows-service">
+  <title>Windows Services</title>
+
+  <sect1>
+    <title>Remarks</title>
+    <para>
+    This is functionality that will be included after the 
+    1.0 release.  If you want to use these features please get the 
+    code from CVS <ulink url="http://opensource.atlassian.com/confluence/spring/display/NET/Project+Structure"></ulink>
+    (instructions) or from the download section of the Spring.NET website that contains an
+    .zip with the full CVS tree.
+    In addition to this documentation
+    you can refer to the example program located at
+    <literal>examples\Spring\Spring.Examples.WindowsService</literal>
+    to better understand the package.  Please check the Spring.NET 
+    <ulink url="http://www.springframework.net/doc/reference/windows-service.html">website</ulink> 
+    for the latest updates to this document.
+    </para>
+  </sect1>
+  <sect1>
+    <title>Introduction</title>
+    <para>
+    Developers usually create Windows Services using the 
+    Visual Studio .NET wizard.  While not difficult to do, this
+    procedure is repetative and does not encourage separation between 
+    infrastructure code (windows service) and application code.  This is
+    generally considered a "bad thing" but you can certainly disagree.
+    </para>
+    <para>    
+    As Spring.NET can provide an explicitly managed
+    initialize/destroy lifecycle for singleton objects, there is
+    a natural synergy with the lifecycle of a Windows service.
+    As such, it could be very convenient to expose a Spring application 
+    context as a Windows service. Starting and stopping the service corresponds
+    to creating and destroying an application context and its
+    contained objects.  This approach provides a high level means to
+    declare what objects are created and destroyed when developing
+    a Windows service. 
+    </para>
+    <para>
+    To do that, Spring.NET requires the installation of one physical 
+    service able to run as services as many applications as you want - each a 
+    logical independent service in their own application domain.  
+    By default, the deployment and updating of the service can also
+    be done by copying the relevant executables to a special directory.
+    </para>
+    <para>
+    The executable that at present provides these features is the
+    <literal>Spring.Services.WindowsService.Process.exe</literal>
+    assembly. It makes heavy use of classes and interfaces definde in 
+    the <literal>Spring.Services.WindowsService.Common.dll</literal>
+    assembly.  You should reference the common assembly it if you want to 
+    follow the advice on customization contained in the following sections 
+    </para>
+    <para>
+    The benefits of this approach, a part from those given by separating
+    infrastructure code and application code (a field where Spring.NET
+    tries hard to succeed) is that you can think about installing a new 
+    service at client site by simply dropping a new application assembly
+    in a remote directory<footnote></footnote>.
+    </para>
+  </sect1>
+  
+  <sect1>
+    <title>The <literal>Spring.Services.WindowsService.Process.exe</literal> application</title>
+    <sect2>
+      <title>Installing</title>
+    <para>
+    The installation can be done in two ways, using the .NET SDK
+    <literal>installutil.exe</literal> tool or using the more mundane
+    <literal>Spring.Services.WindowsService.Installer.exe</literal>;
+    while the former is the standard, the latter is probably  
+    more flexible. It allows you to customize the name/display name of the 
+    service and has the ability to install multiple times the same assembly
+    with different names.  This can be useful in a 
+    number of scenarios, especially where you don't like, for some 
+    reasons, to run several different logical services under the 
+    same physical windows service.
+    </para>
+    <para><emphasis>
+    Be aware of the fact that the service will be installed as
+    running with the system account (installing with a specific
+    user account seems a bit buggy on Windows XP)
+    </emphasis></para>
+    <para>
+    That said, while <literal>installutil</literal> 
+    <ulink url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cptools/html/cpconinstallerutilityinstallutilexe.asp">
+    <citetitle>is documented on its own </citetitle></ulink>, 
+    the command line for 
+    <literal>Spring.Services.WindowsService.Installer.exe</literal>
+    is as follow:    
+      <programlisting format='linespecific'>Spring.Services.WindowsService.Installer.exe
+
+usage: 
+ install service-exe-path service-display-name service-name
+ uninstall service-name      [i|u] service-exe-path service-display-name service-name</programlisting>
+      for example, to install, you can invoke it with the following:
+      <programlisting format='linespecific'>... install  Spring.Services.WindowsService.Process.exe "Spring.Service Support" spring-service</programlisting>
+      and to uninstall it: 
+      <programlisting format='linespecific'>... uninstall  spring-service</programlisting>
+    </para>
+    </sect2>
+    <sect2>
+      <title>Configuration</title>
+    <para>
+    The standard .NET <literal>.config</literal> file 
+    can be used to tune some parameters of 
+    <literal>Spring.Services.WindowsService.Process.exe</literal>, 
+    (including log4net settings, for which it is recomended to consult 
+    the log4net documentation).
+    </para>
+    <para>
+    This file also define the context run by this process; here the file in its current beauty:
+      <%= XmlExample("src/Spring/Spring.Services/App.config", "code") %>
+    </para>
+    <para>
+    As you see, the context is defined in another file: let's review the objects it defines.
+    </para>
+    <para>
+    Firstly, it is worth notice that in order to 'localize' the service (i.e. to know where it is installed to use that directory as
+    base for the deploy dir as in the above file) you should define an object like this: the name is not 
+    very important, it is important that it is an <classname>IObjectFactoryPostProcessor</classname> and so will be 
+    automatically applied to this application context:
+      <%= XmlExample("src/Spring/Spring.Services/WindowsService/Process/service-process-definition.xml", "code/localizer") %>
+    </para>
+    <para>
+    In that object definition you can customize the prefix for the following string
+      <%= CsExample("src/Spring/Spring.Services/WindowsService/Common/Localizer.cs", "code/process.format") %>    
+    but you usually won't need it; the default value is 
+      <%= CsExample("src/Spring/Spring.Services/WindowsService/Common/Localizer.cs", "code/localizer.def.prefix") %>    
+    </para>
+    <para>
+    The sole important object defined by this context, i.e. the main object run by the service.
+    The thing you can (and should) configure is the path to the folder you will use as the deploy location;
+    the current definition, to avoid the need for a fully qualified path (e.g.: <literal>c:\spring\services</literal>) uses 
+    the properties made available by the <literal>localizer</literal> above:
+      <%= XmlExample("src/Spring/Spring.Services/WindowsService/Process/service-process-definition.xml", "code/service") %>
+    </para>
+    <para>
+    The above object is then easily remoted using spring remoting utilities (please notice you should tune the remoting configuration 
+    listed in the standard .NET <literal>.config</literal> file, listed above):   
+      <%= XmlExample("src/Spring/Spring.Services/WindowsService/Process/service-process-definition.xml", "code/remoted.service") %>
+    </para>
+    </sect2>
+  </sect1>
+  
+  <sect1>
+    <title>Running an application context as a windows service</title>
+    <para>    
+    If you package an application using the layout and 
+    conventions described here, you'll be able to run an
+    application context as a Windows Service.
+    The conventions used are modeled after those used by ASP.NET
+    and are very easy to follow.
+    </para>
+    <para>
+    As already said, you'll have a Spring.NET application context running in 
+    a dedicated <literal>AppDomain</literal> hosted in a process running
+    as a windows service: that process is able to run many application contexts
+    simultaneously.
+    </para>
+    <para>A complete application runable as service consists of a 
+    directory containing: 
+    <itemizedlist spacing="compact">
+
+          <listitem>
+            <para>The .NET configuration file 
+            <literal>service.config</literal>: 
+			this file should define your application context.
+			Moreover this files will be used 
+            by the CLR to configure the application domain 
+            your application will run in, exactly as you expect.
+            This file has the same role of ASP.NET <literal>Web.config</literal>
+            file.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>Optional: an xml context file (<literal>watcher.xml</literal>)
+            defining the watcher for your application.</para>
+            <para>The watcher controls the automatic redeployment of the 
+            service and is discussed more in the following section.</para>
+          </listitem>
+
+          <listitem>
+            <para>Recomended: along the lines of ASP.NET convention, a <literal>bin</literal> 
+            subdirectory containing all 
+            the assemblies your application needs; you can of course put
+            your assemblies in the same directory where you put
+            <literal>service.config</literal> but this is not encouraged ...
+            </para>
+          </listitem>
+        </itemizedlist>
+    </para>
+	<sect2>
+    <title><literal>service.config</literal></title>
+    <para>
+    This is the standard .NET configuration file for the 
+    <literal>AppDomain</literal> that will host your application. It is 
+    semantically equivalent to the ASP.NET <literal>Web.config</literal>
+    file.
+    <footnote>
+		<para>
+		<literal>log4net</literal> users please notice that (as 
+		of 1.2 beta 9) file appenders, when dealing with a relative 
+		file name, assume it is relative to the application 
+		domain code base. If you use log4net, it is very handy with the mechanics used by 
+		Spring Windows Service as every log file you will specify will
+		be relative the directory containing the service application.
+		</para>
+	</footnote>
+    </para>
+    <para>
+    This file should also define your application context.  When the 
+    service is started and stopped, the corresponding lifecycle methods 
+    are called on all the singletons defined. Of course, singletons are 
+    automatically instantiated by the application context when the 
+    service starts. For more information on lifecycles in Spring.NET see 
+    <xref linkend="objects-factory-lifecycle"/>
+	Here an example taken from the tests:
+	<%= XmlExample("test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Echo/service.config", "code") %>
+    </para>
+    <para>
+    In this case the context is (again!) defined in another file (author's personal taste...) and the only 'service' is the
+    <literal>echo</literal> object (there is also a <literal>PropertyPlaceholderConfigurer</literal> just to make the example
+    more realistic):
+	<%= XmlExample("test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Echo/service.xml", "code") %>
+    </para>
+	<sect3>
+	<title>Let the application know where it is</title>
+	<para>
+	There are some properties you may need at runtime, when your services
+	will run, and you cannot know in advance. Hopefully, your xml 
+	definition file will allow to find the information it needs using some
+	predefined variables you can use inside the service definition file 
+	with the standard 
+	NAnt style <literal>${property name}</literal> syntax.</para>
+	<para>These properies are:
+    <itemizedlist spacing="compact">
+          <listitem>
+              <para><literal>spring.services.application.fullpath</literal>
+              that will be replaced with the full path of the application's
+              <literal>AppDomain.BaseDirectory</literal>, i.e., where your
+              application has been deployed;</para>
+          </listitem>
+          <listitem>
+              <para><literal>spring.services.application.name</literal> that 
+              will be replaced with the name of the subdirectory where the
+              application has been deployed. Each application is deployed in
+              its own directory, of course;</para>
+          </listitem>
+    </itemizedlist>
+	</para>
+	<para>
+	These properties are accessible only if one defines a localizer in the 
+	context like this (the localizer is a special <literal>IObjectFactoryPostProcessor</literal>:
+    <%= XmlExample("test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Simple/service.xml",  "code/localizer") %>
+	</para>
+	<para>
+	As you can see above, one can easily change the prefix used by that localizer and then write someting like:
+    <%= XmlExample("test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Simple/service.xml",  "code/simple") %>
+	</para>
+	</sect3>
+	</sect2>
+  
+	<sect2>
+	<title><literal>watcher.xml</literal> - optional</title>
+	<para>
+	This file allows you to optionally define a watcher for your application
+	that can automatically redeploy it when needed.
+	</para>
+	<para>
+	The important thing to notice is that you can define your own 
+	application watcher, named <literal>watcher</literal>. Here it is used
+	a watcher that listen for changes on the filesystem, configured to 
+	listen for some changes and to ignore others.
+	</para>
+	<para>
+	You can provide your own implementation defining an object named 
+	<literal>watcher</literal> that implements 
+	<literal>Spring.Services.WindowsService.Common.Deploy.IApplicationWatcher</literal>:
+        <%= CsExample("src/Spring/Spring.Services/WindowsService/Common/Deploy/IApplicationWatcher.cs", "code/interface") %>	
+	</para>
+	<para>
+	Please notice that this interface is currently a movable target and 
+	will probably change before the first official release (this will probably 
+	affect also the way a watcher will know about the application it should
+	monitor, as shown in a few lines).
+	</para>
+	<para>A tipical example of this file is give here:
+    <%= XmlExample("test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/watcher.xml",  "code") %>
+	</para>
+	<para>
+	As you can see, if you need it, you can reference the 
+	<literal>Spring.Services.WindowsService.Common.IApplication</literal>
+	object that your watcher should watch using the name 
+	<literal>.injected.application</literal>.</para>
+  </sect2>
+  
+  <sect2>
+	<title><literal>bin</literal> directory - optional</title>
+    <para>
+    This is, by default, the folder where your assemblies are placed
+    in the same way they are in an ASP.NET application.
+	</para>
+	<para>
+	Putting assemblies there is more a convention and maybe a good 
+	practice (they are isolated from other artifacts, but maybe you will 
+	prefer to use another directory (modify the 
+	<literal>service.config</literal> file accordingly) or the application
+	directory directly (= <literal>bin</literal> parent).
+	</para>
+	<para>		
+    Be aware of the fact that the process in which your application will 
+    run will have its own PATH environmental variable. As such
+    don't expect to be successfull using dlls imported
+    with [DllImport] if they are not in the system PATH of the 
+    hosting machine: while it is well known that the CLR fusion
+    algorithm will not consider the PATH variable, you may be biten 
+    by assemblies using non-system dlls (SQLite and Firebird ADO.NET 
+    providers are good examples).
+    </para>           
+    <para>Reiterating, one can put assemblies in another directory
+    under the application directory tree, and write 
+    the .NET configuration file (<literal>service.config</literal>)
+    accordingly: .NET probing algorithm is always in place.
+    </para>
+    <para>
+    Please notice that it is not required that 
+    your application uses or include any of the Spring.NET assemblies: 
+    any object in any assembly, given it has lifecycle methods, can 
+    be run as a service: non invasive infrastructure support courtesy
+    of Spring.NET!
+    </para>
+	</sect2>
+  </sect1>
+  
+  <sect1>
+    <title>Customizing or extending</title>
+    <para>
+    It should be said that support for windows service has been initially 
+    developed with a clear but limited set of 'extension points' in mind, 
+    mainly related to the way you can deploy your services: 
+    deploy location (filesystem, zip archives, mailbox, urls, ...), 
+    (auto-)updating features, and so on.
+    </para>
+    <para>
+    To better understand the following discussion, the following figure 
+    depicts some of the inner details of 
+    <literal>Spring.Services.WindowsService.Process.exe</literal>
+    at run-time:
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center"
+          fileref="images/spring.windows-service.png" format="png"/>
+      </imageobject>
+      <textobject>
+        <phrase>Spring.Services.WindowsService.Process.exe run-time details</phrase>
+      </textobject>
+    </mediaobject>    
+    </para>
+    <sect2>
+      <title>The <literal>.config</literal> file</title>
+    </sect2>
+    <para>
+    The executable <literal>Spring.Services.WindowsService.Process.exe</literal>
+    is somewhat configured by the corresponding 
+    <literal>.config</literal> file.    
+    Please notice that this file is the most important extension point 
+    for windows service support, and it will probably be made more powerful 
+    and flexible in the future.    
+    </para>
+    <para>
+    For applications deployed in the standard way (i.e. on the filesystem 
+    as explained above) the updating features are configured by the 
+    <literal>watcher.xml</literal> file, <emphasis>if present</emphasis>,
+    as already seen.
+    </para>
+    <para>
+    There should be however, other ways to deploy your applications, 
+    maybe just as zip files dropped somewhere on the web or sent via 
+    e-mail.
+    </para>
+    <para>
+    For these scenarios, your deploy location will be something that
+    implements 
+    <literal>Spring.Services.WindowsService.Common.Deploy.IDeployLocation</literal>.
+    <para>
+    Please notice that, while questionable, it actually entends 
+    <literal>IDisposable</literal> <footnote><para>this has been done 
+    as it is possible that a deploy location holds resources that should be 
+    released, for example network connections, lock files or the like</para></footnote>:
+    </para>
+        <%= CsExample("src/Spring/Spring.Services/WindowsService/Common/Deploy/IDeployLocation.cs", "code/interface") %>
+        <%= CsExample("src/Spring/Spring.Services/WindowsService/Common/Deploy/IDeployEventSource.cs", "code/interface") %>
+    </para>
+  </sect1>
+
+</chapter>
diff --git a/doc/reference/src/testing.xml b/doc/reference/src/testing.xml
new file mode 100644
index 00000000..6c8fcd0a
--- /dev/null
+++ b/doc/reference/src/testing.xml
@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="testing">
+  <title>Testing</title>
+
+  <section id="testing-introduction">
+    <title>Introduction</title>
+
+    <para>The Spring team considers developer testing to be an absolutely
+    integral part of enterprise software development. A thorough treatment of
+    testing in the enterprise is beyond the scope of this chapter; rather, the
+    focus here is on the value add that the adoption of the IoC principle can
+    bring to <link linkend="unit-testing">unit testing</link>; and on the
+    benefits that the Spring Framework provides in <link
+    linkend="integration-testing">integration testing</link>.</para>
+  </section>
+
+  <section id="unit-testing">
+    <title>Unit testing</title>
+
+    <para>One of the main benefits of Dependency Injection is that your code
+    is much less likely to have any hidden dependencies on the runtime
+    environment or other configuration subsystems. This allows for unit tests
+    to be written in a manner such that the object under test can be simply
+    instantiated with the <literal>new</literal> operator and have its
+    dependences set in the unit test code. You can use mock objects (in
+    conjunction with many other valuable testing techniques) to test your code
+    in isolation. If you follow the architecture recommendations around Spring
+    you will find that the resulting clean layering and componentization of
+    your codebase will naturally faciliate <emphasis>easier</emphasis> unit
+    testing. For example, you will be able to test service layer objects by
+    stubbing or mocking DAO interfaces, without any need to access persistent
+    data while running unit tests.</para>
+
+    <para>True unit tests typically will run extremely quickly, as there is no
+    runtime infrastructure to set up, i.e., database, ORM tool, or whatever.
+    Thus emphasizing true unit tests as part of your development methodology
+    will boost your productivity. The upshot of this is that you do not need
+    this section of the testing chapter to help you write effective
+    <emphasis>unit</emphasis> tests for your IoC-based applications.</para>
+  </section>
+
+  <section id="integration-testing">
+    <title>Integration testing</title>
+
+    <para>However, it is also important to be able to perform some integration
+    testing enabling you to test things such as:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>The correct wiring of your Spring IoC container contexts.</para>
+      </listitem>
+
+      <listitem>
+        <para>Data access using ADO.NET or an ORM tool. This would include
+        such things such as the correctness of SQL statements / or NHibernate
+        XML mapping files.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>The Spring Framework provides first class support for integration
+    testing in the form of the classes that are packaged in the <filename
+    class="libraryfile">Spring.Testing.NUnit.dll</filename> library.
+    <emphasis>Please note that these test classes are NUnit-specific. Support
+    for mbUnit and VSTS are under consideration for future
+    versions.</emphasis></para>
+
+    <note>
+      <para>The Spring.Testing.NUnit.dll library is compiled against NUnit
+      2.4.1. At the time of this writing the latest version of NUnit is 2.4.6.
+      Note that add-in have their own versions of NUnit they use. For example,
+      ReSharper 3.0 uses 2.2.8. If you are using the GUI-runner that comes
+      with NUnit then you should add the following to your .config file, (in
+      the form of MyAssembly.dll.config)</para>
+
+      <programlisting>&lt;runtime&gt;
+
+  &lt;assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"&gt;
+
+    &lt;dependentAssembly&gt;
+      &lt;assemblyIdentity name="nunit.framework" 
+                        publicKeyToken="96d09a1eb7f44a77" 
+                        culture="neutral"/&gt;
+      &lt;bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535
+                       newVersion="2.4.6.0"/&gt;
+
+    &lt;/dependentAssembly&gt;
+
+  &lt;/assemblyBinding&gt;
+
+&lt;/runtime&gt;</programlisting>
+    </note>
+
+    <para>The <literal>Spring.Testing.NUnit</literal> namespace provides
+    valuable NUnit <classname>TestCase</classname> superclasses for
+    integration testing using a Spring container. Note that as of NUnit 2.4
+    these can be rewritten in terms of custom attributes via NUnit's new
+    extensibility mechanism. This will be an additional option in an upcoming
+    release of Spring.NET and is already present in the Java version of the
+    Spring framework.</para>
+
+    <para>These superclasses provide the following functionality:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><link linkend="testing-ctx-management">Spring IoC container
+        caching</link> between test case execution.</para>
+      </listitem>
+
+      <listitem>
+        <para>The pretty-much-transparent <link
+        linkend="testing-fixture-di">Dependency Injection of test fixture
+        instances</link> (this is nice).</para>
+      </listitem>
+
+      <listitem>
+        <para><link linkend="testing-tx">Transaction management</link>
+        appropriate to integration testing (this is even nicer).</para>
+      </listitem>
+
+      <listitem>
+        <para>A number of Spring-specific <link
+        linkend="testing-superclasses">inherited instance variables</link>
+        that are really useful when integration testing.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section id="testing-ctx-management">
+      <title>Context management and caching</title>
+
+      <para>The <literal><literal>Spring.Testing.NUnit</literal></literal>
+      package provides support for consistent loading of Spring contexts, and
+      caching of loaded contexts. Support for the caching of loaded contexts
+      is important, because if you are working on a large project, startup
+      time may become an issue - not because of the overhead of Spring itself,
+      but because the objects instantiated by the Spring container will
+      themselves take time to instantiate. For example, a project with 50-100
+      NHibernate mapping files might take 10-20 seconds to load the mapping
+      files, and incurring that cost before running every single test case in
+      every single test fixture will lead to slower overall test runs that
+      could reduce productivity.</para>
+
+      <para>To address this issue, the
+      <classname>AbstractDependencyInjectionSpringContextTests</classname> has
+      an <literal>protected</literal> property that subclasses must implement
+      to provide the location of context definition files:</para>
+
+      <programlisting>protected abstract string[] ConfigLocations { get; }</programlisting>
+
+      <para>Implementations of this method must provide an array containing
+      the IResource locations of XML configuration metadata used to configure
+      the application. This will be the same, or nearly the same, as the list
+      of configuration locations specified in
+      <literal>App.config/Web.config</literal> or other deployment
+      configuration.</para>
+
+      <para>By default, once loaded, the configuration file set will be reused
+      for each test case. Thus the setup cost will be incurred only once (per
+      test fixture), and subsequent test execution will be much faster. In the
+      unlikely case that a test may 'dirty' the config location, requiring
+      reloading - for example, by changing an object definition or the state
+      of an application object - you can call the
+      <methodname>SetDirty()</methodname> method on
+      <classname>AbstractDependencyInjectionSpringContextTests</classname> to
+      cause the test fixture to reload the configurations and rebuild the
+      application context before executing the next test case.</para>
+    </section>
+
+    <section id="testing-fixture-di">
+      <title>Dependency Injection of test fixtures</title>
+
+      <para>When
+      <classname>AbstractDependencyInjectionSpringContextTests</classname>
+      (and subclasses) load your application context, they can optionally
+      configure instances of your test classes by Setter Injection. All you
+      need to do is to define instance variables and the corresponding
+      setters.
+      <classname>AbstractDependencyInjectionSpringContextTests</classname>
+      will automatically locate the corresponding object in the set of
+      configuration files specified in the
+      <methodname>ConfigLocations</methodname> property.</para>
+
+      <para>Consider the scenario where we have a class,
+      <classname>HibernateTitleDao</classname>, that performs data access
+      logic for say, the <classname>Title</classname> domain object. We want
+      to write integration tests that test all of the following areas:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>The Spring configuration; basically, is everything related to
+          the configuration of the <classname>HibernateTitleDao</classname>
+          object correct and present?</para>
+        </listitem>
+
+        <listitem>
+          <para>The Hibernate mapping file configuration; is everything mapped
+          correctly and are the correct lazy-loading settings in place?</para>
+        </listitem>
+
+        <listitem>
+          <para>The logic of the <classname>HibernateTitleDao</classname>;
+          does the configured instance of this class perform as
+          anticipated?</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Let's look at the test class itself (we will look at the
+      configuration immediately afterwards).</para>
+
+      <programlisting>[TestFixture]
+public class HibernateTitleDaoTests <emphasis role="bold">: AbstractDependencyInjectionSpringContextTests</emphasis>  {
+
+    <lineannotation>// this instance will be (automatically) dependency injected</lineannotation>    
+    private HibernateTitleDao titleDao;
+
+    <lineannotation>// a setter method to enable DI of the 'titleDao' instance variable</lineannotation>
+    public HibernateTitleDao HibernateTitleDao {
+        set { titleDao = value; }
+    }
+
+    [Test]
+    public void LoadTitle() {
+        Title title = this.titleDao.LoadTitle(10);
+        Assert.IsNotNull(title);
+    }
+
+    <lineannotation>// specifies the Spring configuration to load for this test fixture</lineannotation>
+    protected override string[] ConfigLocations {
+        return new String[] { "assembly://MyAssembly/MyNamespace/daos.xml" };
+    }
+
+}</programlisting>
+
+      <para>The file referenced by the ConfigLocations method
+      (<literal>'classpath:com/foo/daos.xml'</literal>) looks like
+      this:</para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="utf-8" ?&gt;
+&lt;objects  xmlns="http://www.springframework.net"&gt;
+
+    <lineannotation>&lt;!-- this object will be injected into the <classname>HibernateTitleDaoTests</classname> class --&gt;</lineannotation>
+    &lt;object id="titleDao" type="Spring.Samples.HibernateTitleDao, Spring.Samples"&gt;
+        &lt;property name="sessionFactory" ref="sessionFactory"/&gt;
+    &lt;/object&gt;
+    
+    &lt;object id="sessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate"&gt;
+        <lineannotation>&lt;!-- dependencies elided for clarity --&gt;</lineannotation>
+    &lt;/object&gt;
+
+&lt;/objects&gt;</programlisting>
+
+      <para>The
+      <classname>AbstractDependencyInjectionSpringContextTests</classname>
+      classes uses <link linkend="objects-factory-autowire"><emphasis>autowire
+      by type</emphasis></link>. Thus if you have multiple object definitions
+      of the same type, you cannot rely on this approach for those particular
+      object. In that case, you can use the inherited
+      <literal>applicationContext</literal> instance variable, and explicit
+      lookup using (for example) an explicit call to
+      <methodname>applicationContext.GetObject("titleDao")</methodname>.</para>
+
+      <para>If you don't want dependency injection applied to your test cases,
+      simply don't declare any set properties. Alternatively, you can extend
+      the <classname>AbstractSpringContextTests</classname> - the root of the
+      class hierarchy in the <literal>Spring.Testing.NUnit</literal>
+      namespace. It merely contains convenience methods to load Spring
+      contexts, and performs no Dependency Injection of the test
+      fixture.</para>
+
+      <section id="testing-fixture-di-field">
+        <title>Field level injection</title>
+
+        <para>If, for whatever reason, you don't fancy having setter
+        properties in your test fixtures, Spring can (in this one case) inject
+        dependencies into <literal>protected</literal> fields. Find below a
+        reworking of the previous example to use field level injection (the
+        Spring XML configuration does not need to change, merely the test
+        fixture).</para>
+
+        <programlisting>[TestFixture]
+public class HibernateTitleDaoTests <emphasis role="bold">: AbstractDependencyInjectionSpringContextTests</emphasis>  {
+
+    public HibernateTitleDaoTests() {
+    	<lineannotation>   // switch on field level injection</lineannotation>
+        PopulateProtectedVariables = true;
+    }
+
+    <lineannotation>// this instance will be (automatically) dependency injected</lineannotation>
+    <lineannotation><emphasis>protected</emphasis></lineannotation> HibernateTitleDao <lineannotation><emphasis>titleDao</emphasis></lineannotation>;
+
+    [Test]
+    public void LoadTitle() {
+        Title title = this.titleDao.LoadTitle(10);
+        Assert.IsNotNull(title);
+    }
+
+    <lineannotation>// specifies the Spring configuration to load for this test fixture</lineannotation>
+    protected override string[] ConfigLocations {
+        return new String[] { "assembly://MyAssembly/MyNamespace/daos.xml" };
+    }
+
+}</programlisting>
+
+        <para>In the case of field injection, there is no autowiring going on:
+        the name of your <literal>protected</literal> instances variable(s)
+        are used as the lookup object name in the configured Spring
+        container.</para>
+      </section>
+    </section>
+
+    <section id="testing-tx">
+      <title>Transaction management</title>
+
+      <para>One common issue in tests that access a real database is their
+      effect on the state of the persistence store. Even when you're using a
+      development database, changes to the state may affect future tests.
+      Also, many operations - such as inserting to or modifying persistent
+      data - cannot be done (or verified) outside a transaction.</para>
+
+      <para>The
+      <classname>AbstractTransactionalDbProviderSpringContextTests</classname>
+      superclass (and subclasses) exist to meet this need. By default, they
+      create and roll back a transaction for each test. You simply write code
+      that can assume the existence of a transaction. If you call
+      transactionally proxied objects in your tests, they will behave
+      correctly, according to their transactional semantics.</para>
+
+      <para><classname>AbstractTransactionalSpringContextTests</classname>
+      depends on a <classname>IPlatformTransactionManager</classname> object
+      being defined in the application context. The name doesn't matter, due
+      to the use of autowire by type.</para>
+
+      <para>Typically you will extend the subclass,
+      <classname>AbstractTransactionalDbProviderSpringContextTests</classname>.
+      This also requires that a <classname>DbProvider</classname> object
+      definition - again, with any name - be present in the configurations. It
+      creates an <classname>AdoTemplate</classname> instance variable that is
+      useful for convenient querying, and provides handy methods to delete the
+      contents of selected tables (remember that the transaction will roll
+      back by default, so this is safe to do).</para>
+
+      <para>If you want a transaction to commit - unusual, but occasionally
+      useful when you want a particular test to populate the database - you
+      can call the <methodname>SetComplete()</methodname> method inherited
+      from <classname>AbstractTransactionalSpringContextTests</classname>.
+      This will cause the transaction to commit instead of roll back.</para>
+
+      <para>There is also convenient ability to end a transaction before the
+      test case ends, through calling the
+      <methodname>EndTransaction()</methodname> method. This will roll back
+      the transaction by default, and commit it only if
+      <methodname>SetComplete()</methodname> had previously been called. This
+      functionality is useful if you want to test the behavior of
+      'disconnected' data objects, such as Hibernate-mapped objects that will
+      be used in a web or remoting tier outside a transaction. Often, lazy
+      loading errors are discovered only through UI testing; if you call
+      <methodname>EndTransaction()</methodname> you can ensure correct
+      operation of the UI through your NUnit test suite.</para>
+    </section>
+
+    <section id="testing-superclasses">
+      <title>Convenience variables</title>
+
+      <para>When you extend the
+      <classname>AbstractTransactionalDbProviderSpringContextTests</classname>
+      class you will have access to the following <literal>protected</literal>
+      instance variables:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>applicationContext</literal> (a
+          <interfacename>IConfigurableApplicationContext</interfacename>):
+          inherited from the
+          <classname>AbstractDependencyInjectionSpringContextTests</classname>
+          superclass. Use this to perform explicit object lookup, or test the
+          state of the context as a whole.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>adoTemplate</literal>: inherited from
+          <classname>AbstractTransactionalDbProviderSpringContextTests</classname>.
+          Useful for querying to confirm state. For example, you might query
+          before and after testing application code that creates an object and
+          persists it using an ORM tool, to verify that the data appears in
+          the database. (Spring will ensure that the query runs in the scope
+          of the same transaction.) You will need to tell your ORM tool to
+          'flush' its changes for this to work correctly, for example using
+          the <methodname>Flush()</methodname> method on NHibernate's
+          <classname>ISession</classname> interface.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Often you will provide an application-wide superclass for
+      integration tests that provides further useful instance variables used
+      in many tests</para>
+    </section>
+
+    <section id="testing-examples-petclinic"></section>
+  </section>
+
+  <section id="testing-resources">
+    <title>Further Resources</title>
+
+    <para>This section contains links to further resources about testing in
+    general.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>The <ulink url="http://www.nunit.org/index.htm">NUnit
+        homepage</ulink>. The Spring Framework's unit test suite is written
+        using NUnit as the testing framework.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/threading.xml b/doc/reference/src/threading.xml
new file mode 100644
index 00000000..7eb3df3c
--- /dev/null
+++ b/doc/reference/src/threading.xml
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="threading">
+  <title>Threading and Concurrency Support</title>
+
+  <sect1 id="threading-introduction">
+    <title>Introduction</title>
+
+    <para>The purpose of the <classname>Spring.Threading</classname> namespace
+    is to provide a place to keep useful concurrency abstractions that augment
+    those in the BCL. Since Doug Lea has provided a wealth of mature public
+    domain concurrency abstractions in his Java based
+    'EDU.oswego.cs.dl.util.concurrent' libraries we decided to port a few of
+    his abstractions to .NET. So far, we've only ported three classes, the
+    minimum necessary to provide basic object pooling functionality to support
+    an AOP based pooling aspect and to provide a Semaphore class that was
+    mistakenly not included in .NET 1.0/1.1.</para>
+
+    <para>There is also an important abstraction, IThreadStorage, for
+    performing thread local storage.</para>
+  </sect1>
+
+  <sect1>
+    <title>Thread Local Storage</title>
+
+    <para>Depending on your runtime environment there are different strategies
+    to use for storing objects in thread local storage. If you are in web
+    applications a single Request may be executed on different threads. As
+    such, the location to store thread local objects is in
+    <classname>HttpContext.Current</classname>. For other environments
+    <classname>System.Runtime.Remoting.Messaging.CallContext</classname> is
+    used. For more background information on the motivation behind these
+    choices, say as compared to the attribute [ThreadStatic] refer to
+    "Piers7"'s <ulink
+    url="http://piers7.blogspot.com/2005/11/threadstatic-callcontext-and_02.html">blog</ulink>
+    and this <ulink
+    url="http://forum.springframework.net/showthread.php?t=572&amp;highlight=LogicalThreadContext">forum
+    post</ulink>. The interface IThreadStorage serves as the basis for the
+    thread local storage abstraction and various implementations can be
+    selected from depending on your runtime requirements. Configuring the
+    implementation of IThreadStorage makes it easier to have more portability
+    across runtime environments.</para>
+
+    <para>The API is quite simple and shown below<programlisting>public interface IThreadStorage
+{
+  object GetData(string name)
+
+  void SetData(string name, object value)
+
+  void FreeNamedDataSlot(string name)
+
+}
+</programlisting></para>
+
+    <para>The methods <methodname>GetData</methodname> and
+    <methodname>SetData</methodname> are responsible for retrieving and
+    setting the object that is to be bound to thread local storage and
+    associating it with a name. Clearing the thread local storage is done via
+    the method <methodname>FreeNamedDataSlot</methodname>.</para>
+
+    <para>In <literal>Spring.Core</literal> is the implementation,
+    <classname>CallContextStorage</classname>, that directly uses
+    <classname>CallContext</classname> and also the implementation
+    <classname>LogicalThreadContext</classname> which by default uses
+    <classname>CallContextStorage</classname> but can be configured via the
+    static method <methodname>SetStorage(IThreadStorage)</methodname>. The
+    methods on CallContextStorage and LogicalThreadContext are static.</para>
+
+    <para>In <literal>Spring.Web</literal> is the implementation
+    <classname>HttpContextStorage</classname> which uses the
+    <classname>HttpContext</classname> to store thread local data and
+    <classname>HybridContextStorage</classname> that uses
+    <classname>HttpContext</classname> if within a web environment, i.e.
+    <literal>HttpContext.Current != null</literal>, and
+    <classname>CallContext</classname> otherwise.</para>
+
+    <para>Spring internally uses <classname>LogicalThreadContext</classname>
+    as this doesn't require a coupling to the <package>System.Web</package>
+    namespace. In the case of Spring based web applications, Spring's
+    <classname>WebSupportModule</classname> sets the storage strategy of
+    <classname>LogicalThreadContext</classname> to be
+    <classname>HybridContextStorage</classname>.</para>
+  </sect1>
+
+  <sect1>
+    <title>Synchronization Primitives</title>
+
+    <para>When you take a look at these synchronization classes, you'll wonder
+    why it's even necessary when <literal>System.Threading</literal> provides
+    plenty of synchronization options. Although
+    <literal>System.Threading</literal> provides great synchronization
+    classes, it doesn't provide well-factored abstractions and interfaces for
+    us. Without these abstractions, we will tend to code at a low-level. With
+    enough experience, you'll eventually come up with some abstractions that
+    work well. Doug Lea has already done a lot of that research and has a
+    class library that we can take advantage of.</para>
+
+    <sect2>
+      <title>ISync</title>
+
+      <para><literal>ISync</literal> is the central interface for all classes
+      that control access to resources from multiple threads. It's a simple
+      interface which has two basic use cases. The first case is to block
+      indefinitely until a condition is met:</para>
+
+      <programlisting>void ConcurrentRun(ISync lock) {
+  lock.Acquire(); // block until condition met
+  try {
+    // ... access shared resources
+  }
+  finally {
+    lock.Release();
+  }
+}
+</programlisting>
+
+      <para>The other case is to specify a maximum amount of time to block
+      before the condition is met:</para>
+
+      <programlisting>void ImpatientConcurrentRun(ISync lock) {
+  // block for at most 10 milliseconds for condition
+  if ( lock.Attempt(10) ) {
+    try {
+      // ... access shared resources
+    }
+    finally {
+      lock.Release();
+    }
+  } else {
+    // complain of time out
+  }
+}
+</programlisting>
+    </sect2>
+
+    <sect2>
+      <title>SyncHolder</title>
+
+      <para>The <literal>SyncHolder</literal> class implements the
+      <literal>System.IDisposable</literal> interface and so provides a way to
+      use an <literal>ISync</literal> with the <literal>using</literal> C#
+      keyword: the <literal>ISync</literal> will be automatically
+      <literal>Acquire</literal>d and then <literal>Release</literal>d on
+      exiting from the block.</para>
+
+      <para>This should simplify the programming model for code using (!) an
+      <literal>ISync</literal>: <programlisting>
+ISync sync = ...
+...
+using (new SyncHolder(sync))
+  {
+    // ... code to be executed
+    // holding the ISync lock
+  }
+      </programlisting> There is also the timed version, a little more
+      cumbersome as you must deal with timeouts: <programlisting>
+ISync sync = ...
+long msecs = 100;
+...
+// try to acquire the ISync for msecs milliseconds
+try 
+{
+  using (new SyncHolder(sync, msecs))
+  {
+    // ... code to be executed
+    // holding the ISync lock
+  }
+}    
+catch (TimeoutException)
+{
+  // deal with failed lock acquisition
+}
+
+      </programlisting></para>
+    </sect2>
+
+    <sect2>
+      <title>Latch</title>
+
+      <para>The <literal>Latch</literal> class implements the
+      <literal>ISync</literal> interface and provides an implementation of a
+      <emphasis>latch</emphasis>. A latch is a boolean condition that is set
+      at most once, ever. Once a single release is issued, all acquires will
+      pass. It is similar to a <literal>ManualResetEvent</literal> initialized
+      unsignalled (Reset) and can only be <literal>Set()</literal>. A typical
+      use is to act as a start signal for a group of worker threads.</para>
+
+      <programlisting>class Boss {
+  Latch _startPermit;
+
+  void Worker() {
+    // very slow worker initialization ...
+    // ... attach to messaging system
+    // ... connect to database
+    _startPermit.Acquire();
+    // ... use resources initialized in Mush
+    // ... do real work
+  }
+
+  void Mush() {
+    _startPermit = new Latch();
+    for (int i=0; i&lt;10; ++i) {
+      new Thread(new ThreadStart(Worker)).Start();
+    }
+    // very slow main initialization ...
+    // ... parse configuration
+    // ... initialize other resources used by workers
+    _startPermit.Release();
+  }
+
+}</programlisting>
+    </sect2>
+
+    <sect2>
+      <title>Semaphore</title>
+
+      <para>The <literal>Semaphore</literal> class implements the
+      <literal>ISync</literal> interface and provides an implementation of a
+      semaphore. Conceptually, a semaphore maintains a set of permits. Each
+      <literal>Acquire()</literal> blocks if necessary until a permit is
+      available, and then takes it. Each <literal>Release()</literal> adds a
+      permit. However, no actual permit objects are used; the Semaphore just
+      keeps a count of the number available and acts accordingly. A typical
+      use is to control access to a pool of shared objects.</para>
+
+      <programlisting>class LimitedConcurrentUploader {
+  // ensure we don't exceed maxUpload simultaneous uploads
+  Semaphore _available;
+  public LimitedConcurrentUploader(maxUploads) {
+    _available = new Semaphore(maxUploads);
+  }
+  // no matter how many threads call this method no more
+  // than maxUploads concurrent uploads will occur.
+  public Upload(IDataTransfer upload) {
+    _available.Acquire();
+    try {
+      upload.TransferData();
+    }
+    finally {
+      _available.Release();
+    }
+  }
+}
+
+</programlisting>
+    </sect2>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/transaction.xml b/doc/reference/src/transaction.xml
new file mode 100644
index 00000000..1d567dd3
--- /dev/null
+++ b/doc/reference/src/transaction.xml
@@ -0,0 +1,2006 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="transaction">
+  <title>Transaction management</title>
+
+  <sect1 id="tx-introduction">
+    <title>Introduction</title>
+
+    <para>Spring.NET provides a consistent abstraction for transaction
+    management that provides the following benefits</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Provides a consistent programming model across different
+        transaction APIs such as ADO.NET, Enterprise Services,
+        System.Transactions, and NHibernate.</para>
+      </listitem>
+
+      <listitem>
+        <para>Support for <link linkend="dtm">declarative transaction
+        management</link> with any of the above data access
+        technologies</para>
+      </listitem>
+
+      <listitem>
+        <para>Provides a simple API for <link
+        linkend="ptm">programmatic</link> transaction management</para>
+      </listitem>
+
+      <listitem>
+        <para>Integrates with Spring's high level persistence integration APIs
+        such as AdoTemplate.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>This chapter is divided up into a number of sections, each detailing
+    one of the value-adds or technologies of the Spring Framework's
+    transaction support. The chapter closes with some discussion of best
+    practices surrounding transaction management.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>The first section, entitled <link
+        linkend="motivations">Motivations</link> describes why one would want
+        to use the Spring Framework's transaction abstraction as opposed to
+        using System.Transactions or a specific data access technology
+        transaction API.</para>
+      </listitem>
+
+      <listitem>
+        <para>The second section, entitled <link
+        linkend="key-abstractions">Key Abstractions</link> outline the core
+        classes as well as how to configure them.</para>
+      </listitem>
+
+      <listitem>
+        <para>Th third section, entitled <link linkend="dtm">Declarative
+        transaction management</link>, covers support for declarative
+        transaction management.</para>
+      </listitem>
+
+      <listitem>
+        <para>The fourth section, entitled <link linkend="ptm">Programmatic
+        transaction management</link>, covers support for programmatic
+        transaction management.</para>
+      </listitem>
+    </itemizedlist>
+  </sect1>
+
+  <sect1 id="motivations">
+    <title>Motivations</title>
+
+    <para>The data access technology landscape is a broad one, within the .NET
+    BCL there are three APIs for performing transaction management, namely
+    ADO.NET, Enterprise Services, and System.Transactions. Other data access
+    technologies such as object relational mappers and result-set mapping
+    libraries are also gaining in popularity and each come with their own APIs
+    for transaction management. As such, code is often directly tied to a
+    particular transaction API which means you must make an up-front decision
+    which API to use in your application. Furthermore, if the need arises to
+    change your approach, it quite often will not be a simple refactoring.
+    Using Spring's transaction API you can keep the same API across different
+    data access technologies. Changing the underlying transaction
+    implementation that is used is a simple matter of configuration or a
+    centralized programmatic change as compared to a major overhauling.</para>
+
+    <para>Hand in hand with the variety of options available is the
+    establishment generally agreed upon best practices for data access. Martin
+    Fowler's book, Patterns of Enterprise Application Architecture, is an
+    excellent source of approaches to data access that have been successful in
+    the real world. One approach that is quite common is to introduce a data
+    access layer into your architecture. The data access layer is concerned
+    not only with providing some portability between different data access
+    technologies and databases but its scope is strictly related to data
+    access. A simple data access layer would be not much more than data access
+    objects (DAOs) with 'Create/Retrieve/Update/Delete' (CRUD) methods devoid
+    of any business logic. Business logic resides in another application
+    layer, the business service layer, in which business logic will call one
+    or more DAOs to fulfill a higher level end-user function.</para>
+
+    <para>In order to perform this end-user function with all-or-nothing
+    transactional semantics, the transaction context is controlled by the
+    business service layer (or other 'higher' layers). In such a common
+    scenario, an important implementation detail is how to make the DAO
+    objects aware of the 'outer' transaction started in another layer. A
+    simplistic implementation of a DAO would perform its own connection and
+    transaction management, but this would not allow grouping of DAO
+    operations with the same transaction as the DAO is doing its own
+    transaction/resource management. As such there needs to be a means to
+    transfer the connection/transaction pair managed in the business service
+    layer to the DAOs. There are a variety of ways to do this, the most
+    invasive being the explicitly pass a connection/transaction object as
+    method arguments to your DAOs. Another way is to store the
+    connection/transaction pair in thread local storage. In either case, if
+    you are using ADO.NET you must invent some infrastructure code to perform
+    this task.</para>
+
+    <para>But wait, doesn't Enterprise Services solve this problem - and what
+    about the functionality in the System.Transactions namespace? The answer
+    is yes...and no. Enterprise Services lets you use the 'raw' ADO.NET API
+    within a transaction context such that multiple DAO operations are grouped
+    within the same transaction. The downside to Enterprise Services is that
+    it always uses distributed (global) transactions via the Microsoft
+    Distributed Transaction Coordinator (MS-DTC). For most applications this
+    is overkill just to get this functionality as global transactions are
+    significantly less performant than local ADO.NET transactions.</para>
+
+    <para>There are similar issues with using the 'using TransactionScope'
+    construct within the new System.Transactions namespace. The goal with
+    TransactionScope is to define a, well - transaction scope - within a using
+    statement. Plain ADO.NET code within that using block will then be a local
+    ADO.NET based transaction if only a single transactional resource is
+    accessed. However, the 'magic' of System.Transactions (and the database)
+    is that local transactions will be promoted to distributed transactions
+    when a second transaction resource is detected. The name that this goes by
+    is Promotable Single Phase Enlistment (PSPE). However, there is a big
+    caveat - opening up a second IDbConnection object to the same database
+    with the same database string will trigger promotion from local to global
+    transactions. As such, if your DAOs are performing their own connection
+    management you will end up being bumped up to a distributed transaction.
+    In order to avoid this situation for the common case of an application
+    using a single database, you must pass around a connection object to your
+    DAOs. It is also worth to note that many database providers (Oracle for
+    sure) do not yet support PSPE and as such will always use a distributed
+    transaction even if there is only a single database.</para>
+
+    <para>Last but not least is the ability to use declarative transaction
+    management. Not many topics in database transaction-land give developers
+    as much 'bang-for-the-buck' as declarative transactions since the noisy
+    tedious bits of transactional API code in your application are pushed to
+    the edges, usually in the form of class/method attributes. Only Enterprise
+    Services offers this feature in the BCL. Spring fills the gap - it
+    provides declarative transaction management if you are using local ADO.NET
+    or System.Transactions (the most popular) or other data access
+    technologies. Enterprise Services is not without it small warts as well,
+    such as the need to separate your query/retrieve operations from your
+    create/update/delete operations if you want to use different isolation
+    levels since declarative transaction metadata can only be applied at the
+    class level. Nevertheless, all in all, Enterprise Services, in particular
+    with the new 'Services Without Components' implementation for XP
+    SP2/Server 2003, and hosted within the same process as your application
+    code is as good as it gets out of the .NET box. Despite these positive
+    points, it hasn't gained a significant mindshare in the development
+    community.</para>
+
+    <para>Spring's transaction support aims to relieve these 'pain-points'
+    using the data access technologies within the BCL - and for other third
+    party data access technologies as well. It provides declarative
+    transaction management with a configurable means to obtain transaction
+    option metadata - out of the box attributes and XML within Spring's IoC
+    configuration file are supported.</para>
+
+    <para>Finally, Spring's transaction support lets you mix data access
+    technologies within a single transaction - for example ADO.NET and
+    NHibernate operations.</para>
+
+    <para>With this long winded touchy/feely motivational section behind us,
+    lets move on to see the code.</para>
+  </sect1>
+
+  <sect1 id="key-abstractions">
+    <title>Key Abstractions</title>
+
+    <para>The key to the Spring transaction management abstraction is the
+    notion of a <emphasis>transaction strategy</emphasis>. A transaction
+    strategy is defined by the
+    <interfacename>Spring.Transaction.IPlatformTransactionManager</interfacename>
+    interface, shown below:</para>
+
+    <programlisting>public interface IPlatformTransactionManager {
+
+  ITransactionStatus GetTransaction( ITransactionDefinition definition );
+
+  void Commit( ITransactionStatus transactionStatus );
+
+  void Rollback( ITransactionStatus transactionStatus );
+
+}</programlisting>
+
+    <para>This is primarily a 'SPI' (Service Provider Interface), although it
+    can be used Programatically. Note that in keeping with the Spring
+    Framework's philosophy, <classname>IPlatformTransactionManager</classname>
+    is an interface, and can thus be easily mocked or stubbed as necessary.
+    <interfacename>IPlatformTransactionManager</interfacename> implementations
+    are defined like any other object in the IoC container. The following
+    implementations are provided</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><classname>AdoPlatformTransactionManager</classname> - local
+        ADO.NET based transactions</para>
+      </listitem>
+
+      <listitem>
+        <para><classname>ServiceDomainPlatformTransactionManager</classname> -
+        distributed transaction manager from Enterprise Services</para>
+      </listitem>
+
+      <listitem>
+        <para><classname>TxScopePlatformTransactionManager</classname> -
+        local/distributed transaction manager from System.Transactions.</para>
+      </listitem>
+
+      <listitem>
+        <para><classname>HibernatePlatformTransactionManager</classname> -
+        local transaction manager for use with NHibernate or mixed
+        ADO.NET/NHibernate data access operations.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Under the covers, the following API calls are made. For the
+    AdoPlatformTransactionManager, Transaction.Begin(), Commit(), Rollback().
+    ServiceDomainPlatformTransactionManager uses the 'Services without
+    Components' update so that your objects do not need to inherit from
+    ServicedComponent or directly call the Enterprise Services API
+    ServiceDomain.Enter(), Leave; ContextUtil.SetAbort().
+    TxScopePlatformTransactionManager calls; new TransactionScope();
+    .Complete(), Dispose(), Transaction.Current.Rollback(). Configuration
+    properties for each transaction manager are specific to the data access
+    technology used. Refer to the API docs for comprehensive information but
+    the examples should give you a good basis for getting started. The
+    HibernatePlatformTransactionManager is described more in the following
+    <link lang="" linkend="orm-tx-mgmt">section</link> .</para>
+
+    <para>The <literal>GetTransaction(..)</literal> method returns a
+    <classname>ITransactionStatus</classname> object, depending on a
+    <classname>ITransactionDefinition</classname> parameters. The returned
+    <classname>ITransactionStatus</classname> might represent a new or
+    existing transaction (if there was a matching transaction in the current
+    call stack - with the implication being that a
+    <classname>ITransactionStatus</classname> is associated with a logical
+    thread of execution.</para>
+
+    <para>The <interfacename>ITransactionDefinition</interfacename> interface
+    specified</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Isolation: the degree of isolation this transaction has from the
+        work of other transactions. For example, can this transaction see
+        uncommitted writes from other transactions?</para>
+      </listitem>
+
+      <listitem>
+        <para>Propagation: normally all code executed within a transaction
+        scope will run in that transaction. However, there are several options
+        specifying behavior if a transactional method is executed when a
+        transaction context already exists: for example, simply continue
+        running in the existing transaction (the common case); or suspending
+        the existing transaction and creating a new transaction.</para>
+      </listitem>
+
+      <listitem>
+        <para>Timeout: how long this transaction may run before timing out
+        (and automatically being rolled back by the underlying transaction
+        infrastructure).</para>
+      </listitem>
+
+      <listitem>
+        <para>Read-only status: a read-only transaction does not modify any
+        data. Read-only transactions can be a useful optimization in some
+        cases (such as when using NHibernate).</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>These settings reflect standard transactional concepts. If
+    necessary, please refer to a resource discussing transaction isolation
+    levels and other core transaction concepts because understanding such core
+    concepts is essential to using the Spring Framework or indeed any other
+    transaction management solution.</para>
+
+    <para>The <interfacename>ITransactionStatus</interfacename> interface
+    provides a simple way for transactional code to control transaction
+    execution and query transaction status.</para>
+
+    <para>Regardless of whether you opt for declarative or programmatic
+    transaction management in Spring, defining the correct
+    <interfacename>IPlatformTransactionManager</interfacename> implementation
+    is absolutely essential. In good Spring fashion, this important definition
+    typically is made using via Dependency Injection.</para>
+
+    <para><interfacename>IPlatformTransactionManager</interfacename>
+    implementations normally require knowledge of the environment in which
+    they work, ADO.NET, NHibernate, etc. The following example shows how a
+    standard ADO.NET based
+    <interfacename>IPlatformTransactionManager</interfacename> can be
+    defined.</para>
+
+    <para>We must define a Spring <interfacename>IDbProvider</interfacename>
+    and then use Spring's
+    <classname>AdoPlatformTransactionManager</classname>, giving it a
+    reference to the <classname>IDbProvider</classname>. For more information
+    on the <classname>IDbProvider</classname> abstraction refer to the next
+    chapter.</para>
+
+    <programlisting>&lt;objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database"&gt;
+
+    &lt;db:provider id="DbProvider" 
+                provider="SqlServer-1.1" 
+                connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/&gt;
+
+    &lt;object id="TransactionManager" 
+            type="Spring.Data.AdoPlatformTransactionManager, Spring.Data"&gt;            
+        &lt;property name="DbProvider" ref="DbProvider"/&gt;
+    &lt;/object&gt;
+
+    . . . other object definitions . . .
+
+&lt;/objects&gt;
+ </programlisting>
+
+    <para>We can also use a transaction manager based on System.Transactions
+    just as easily, as shown in the following example</para>
+
+    <programlisting>    &lt;object id="TransactionManager"
+            type="Spring.Data.TxScopeTransactionManager, Spring.Data"&gt;
+    &lt;/object&gt;</programlisting>
+
+    <para>Similarly for the HibernateTransactionManager as shown in the
+    section on <link linkend="orm-tx-mgmt">ORM transaction
+    management</link>.</para>
+
+    <para>Note that in all these cases, application code will not need to
+    change at all since, dependency injection is a perfect companion to using
+    the strategy pattern. We can now change how transactions are managed
+    merely by changing configuration, even if that change means moving from
+    local to global transactions or vice versa.</para>
+  </sect1>
+
+  <sect1 id="resource-sync">
+    <title>Resource synchronization with transactions</title>
+
+    <para>How does application code participate with the resources (i.e.
+    Connection/Transactions/Sessions) that are created/reused/cleanedup via
+    the different transaction managers? There are two approaches - a
+    high-level and a low-level approach</para>
+
+    <sect2 id="tx-highlevel">
+      <title>High-level approach</title>
+
+      <para>The preferred approach is to use Spring's high level persistence
+      integration APIs. These do not replace native APIs, but internally
+      handle resource creation/reuse, cleanup, and optional transaction
+      synchronization (i.e. event notification) of the resources and exception
+      mapping so that user data access code doesn't have to worry about these
+      concerns at all, but can concentrate purely on non-boilerplate
+      persistence logic. Generally, the same inversion of control approach is
+      used for all persistence APIs. In this approach the API has a callback
+      method or delegate that presents the user code with the relevant
+      resource ready to use - i.e. a DbCommand with its Connection and
+      Transaction properties set based on the transaction option metadata.
+      These classes go by the naming scheme 'template', examples of which are
+      AdoTemplate and HibernateTemplate. Convenient 'one-liner' helper methods
+      in these template classes build upon the core callback/IoC design by
+      providing specific implementations of the callback interface.</para>
+    </sect2>
+
+    <sect2 id="tx-lowlevel">
+      <title>Low-level approach</title>
+
+      <para>A utility class can be used to directly obtain a
+      connection/transaction pair that is aware of the transactional calling
+      context and returns a pair suitable for that context. The class
+      <classname>ConnectionUtils</classname> contains the static method
+      <literal>ConnectionTxPair GetConnectionTxPair(IDbProvider provider)
+      </literal>which serves this purpose.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="dtm">
+    <title>Declarative transaction management</title>
+
+    <remark>Most Spring users choose declarative transaction management. It is
+    the option with the least impact on application code, and hence is most
+    consistent with the ideals of a <emphasis>non-invasive
+    </emphasis>lightweight container.</remark>
+
+    <para>Spring's declarative transaction management is made possible with
+    Spring AOP, although, as the transactional aspects code comes with Spring
+    and may be used in a boilerplate fashion, AOP concepts do not generally
+    have to be understood to make effective use of this code.</para>
+
+    <para>The basic approach is to specify transaction behavior (or lack of
+    it) down to the individual method level. It is also possible to mark a
+    transaction for rollback by setting the 'RollbackOnly' property on the
+    ITransactionStatus object returned from the IPlatformTransactionManager
+    within a transaction context if necessary. Some of the highlights of
+    Spring's declarative transaction management are:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Declarative Transaction management works in any environment. It
+        can work with ADO.NET, System.Transactions, NHibernate etc, with
+        configuration changes only.</para>
+      </listitem>
+
+      <listitem>
+        <para>Enables declarative transaction management to be applied to any
+        class, not merely special classes such as those that inherit from
+        ServicedComponent or other infrastructure related base classes.</para>
+      </listitem>
+
+      <listitem>
+        <para>Declarative rollback rules. Rollback rules can be control
+        declaratively and allow for only specified exceptions thrown within a
+        transactional context to trigger a rollback</para>
+      </listitem>
+
+      <listitem>
+        <para>Spring gives you an opportunity to customize transactional
+        behavior, using AOP. For example if you want to insert custom behavior
+        in the case of a transaction rollback, you can. You can also add
+        arbitrary advice, along with the transactional advice.</para>
+      </listitem>
+
+      <listitem>
+        <para>Spring does not support propagation of transaction context
+        across remote calls.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Note rollback rules as configured from XML are still under
+    development.</para>
+
+    <para>The concept of rollback rules is important: they enable us to
+    specify which exceptions should cause automatic roll back. We specify this
+    declaratively, in configuration, not in code. So, while we can still set
+    <literal>RollbackOnly</literal> on the
+    <interfacename>ITransactionStatus</interfacename> object to roll the
+    current transaction back Programatically, most often we can specify a rule
+    that MyApplicationException must always result in rollback. This has the
+    significant advantage that business objects don't need to depend on the
+    transaction infrastructure. For example, they typically don't need to
+    import any Spring APIs, transaction or other. If you would like to
+    rollback the transaction programmatically and you are using declarative
+    transaction management, use the utility method</para>
+
+    <programlisting>TransactionInterceptor.CurrentTransactionStatus.RollbackOnly = true;</programlisting>
+
+    <sect2 id="tx-understandingimpl">
+      <title id="beannameautoproxycreator-for-transactions">Understanding
+      Spring's declarative transaction implementation</title>
+
+      <para>The aim of this section is to dispel the mystique that is
+      sometimes associated with the use of declarative transactions. It is all
+      very well for this reference documentation to simply tell you to
+      annotate your classes with the Transaction attribute and add some
+      boilerplate XML to your IoC configuration, and then expect you to
+      understand how it all works. This section will explain the inner
+      workings of Spring's declarative transaction infrastructure to help you
+      navigate your way back upstream to calmer waters in the event of
+      transaction-related issues.</para>
+
+      <note>
+        <para>Looking at the Spring source code is a good way to get a real
+        understanding of Spring's transaction support. You should find the API
+        documentation informative and complete. We suggest turning the logging
+        level to 'DEBUG' in your Spring-enabled application(s) during
+        development to better see what goes on under the hood.</para>
+      </note>
+
+      <para>The most important concepts to grasp with regard to Spring's
+      declarative transaction support are that this support is enabled via AOP
+      proxies, and that the transactional advice is driven by metadata
+      (currently XML- or attribute-based). The combination of a proxy with
+      transactional metadata yields an AOP proxy that uses a
+      <classname>TransactionInterceptor</classname> in conjunction with an
+      appropriate <interfacename>IPlatformTransactionManager</interfacename>
+      implementation to drive transactions around method invocations.</para>
+
+      <note>
+        <para>Although knowledge of AOP (and specifically Spring AOP) is not
+        required in order to use Spring's declarative transaction support, it
+        can help. Spring AOP is thoroughly covered in the AOP chapter.</para>
+      </note>
+
+      <para>Conceptually, calling a method on a transactional proxy looks like
+      this.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/tx.png" />
+        </imageobject>
+      </mediaobject>
+
+      <para>The flow of events is the following. First the set of objects you
+      would like to apply AOP transactional advice to are identified. There
+      are a variety of ways to configure the Spring IoC container to create
+      proxies for the defined object definitions. The standard Spring AOP
+      based options are</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><classname>ProxyFactoryObject</classname>. The common
+          properties to set are the reference to the object to proxy (the
+          target object) and a reference to the transaction advice. See <xref
+          linkend="aop-proxyfactoryobject" /> for more details.</para>
+        </listitem>
+
+        <listitem>
+          <para>AutoProxy - Defines criteria to select a collection of objects
+          to create a transactional AOP proxy.</para>
+
+          <para>The AutoProxy options are</para>
+
+          <itemizedlist>
+            <listitem>
+              <para><classname>ObjectNameAutoProxyCreator</classname> which
+              specifies a collection of object names based on wildcard
+              matching of object names. See <xref
+              linkend="aop-nameautoproxy" /></para>
+            </listitem>
+
+            <listitem>
+              <para><classname>DefaultAdvisorAutoProxyCreator</classname>
+              which specifies one or more "advisors" i.e an object
+              representing an aspect, including both an advice and a pointcut
+              targeting it to specific joinpoints. See <xref
+              linkend="aop-advisorautoproxy" /></para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+      </itemizedlist>
+
+      <para>There is also a convenience subclass of
+      <classname>ProxyFactoryObject</classname>, namely
+      <classname>TransactionProxyFactoryObject</classname>, that sets some
+      common default values for the specific case of applying transactional
+      advice.</para>
+
+      <para>The <classname>DefaultAdvisorAutoProxyCreator</classname> is very
+      powerful and is the means by which Spring can be configured to use
+      attributes to identify the pointcuts where transaction advice should be
+      applied. The advisor that performs that task is
+      TransactionAttributeSourceAdvisor.<note>
+          <para>Note, think of the word 'Attribute' in this class name not as
+          the .NET attribute but as the transaction 'options' you want to
+          specify. This name is inherited from the Java version and the name
+          will be changed in the RC1 release to avoid confusion since a common
+          naming convention when creating classes are .NET attributes is to
+          put the word 'Attribute' in the name.</para>
+        </note></para>
+
+      <para>Which one of the many options available should you choose for your
+      development? That depends, each one has it own set of pro's and con's
+      which will be discussed in turn in the following sections.</para>
+
+      <para>With the transactional AOP proxy now created we can discuss the
+      flow of events in the code as proxied methods are invoked. When the
+      method is invoked, before calling the target object's method, a
+      transaction is created if one hasn't already been created. Then the
+      target method is invoked. If there was an exception throw, the
+      transaction is typically rolled back, but it can also be committed if
+      the exception type specified in the transaction option, NoRollbackFor,
+      matches the thrown exception. If no exception was thrown, that is taken
+      as a sign of success and the transaction is committed.</para>
+
+      <para>When using other AOP advice with the transactional advice you can
+      set the order of the 'interceptor chain' so that, for example,
+      performance monitoring advice always precede the transactional
+      advice.</para>
+    </sect2>
+
+    <sect2 id="tx-firstexample">
+      <title>A First Example</title>
+
+      <para>Consider the following interface. The intent is to convey the
+      concepts to you so you can concentrate on the transaction usage and not
+      have to worry about domain specific details. The
+      <interfacename>ITestObjectManager</interfacename> is a poor-mans
+      business service layer - the implementation of which will make two DAO
+      calls. Clearly this example is overly simplistic from the service layer
+      perspective as there isn't any business logic at all!. The 'service'
+      interface is shown below.</para>
+
+      <programlisting>public interface ITestObjectManager 
+{
+  void SaveTwoTestObjects(TestObject to1, TestObject to2);
+
+  void DeleteTwoTestObjects(string name1, string name2);
+}</programlisting>
+
+      <para>The implementation of
+      <interfacename>ITestObjectManager</interfacename> is shown below</para>
+
+      <programlisting>public class TestObjectManager : ITestObjectManager 
+{
+
+   // Fields/Properties ommited
+
+   [Transaction()]
+   public void SaveTwoTestObjects(TestObject to1, TestObject to2)
+   {
+     TestObjectDao.Create(to1.Name, to1.Age);
+     TestObjectDao.Create(to2.Name, to1.Age);
+   }
+
+   [Transaction()]
+   public void DeleteTwoTestObjects(string name1, string name2)
+   {
+     TestObjectDao.Delete(name1);
+     TestObjectDao.Delete(name2);
+   }
+}</programlisting>
+
+      <para>Note the Transaction attribute on the methods. Other options such
+      as isolation level can also be specified but in this example the default
+      settings are used. However, please note that the mere presence of the
+      Transaction attribute is not enough to actually turn on the
+      transactional behavior - the Transaction attribute is simply metadata
+      that can be consumed by something that is Transaction attribute-aware
+      and that can use the said metadata to configure the appropriate objects
+      with transactional behavior.</para>
+
+      <para>The <literal>TestObjectDao</literal> property has basic create
+      update delete and find method for the 'domain' object TestObject.
+      TestObject in turn has simple properties like name and age.</para>
+
+      <programlisting>public interface ITestObjectDao
+{
+  void Create(string name, int age);
+  void Update(TestObject to);
+  void Delete(string name);
+  TestObject FindByName(string name);
+  IList FindAll();
+}</programlisting>
+
+      <para>The Create and Delete method implementation is shown below. Note
+      that this uses the <classname>AdoTemplate</classname> class discussed in
+      the following chapter. Refer to <xref linkend="resource-sync" /> for
+      information on the interaction between Spring's high level persistence
+      integration APIs and transaction management features.</para>
+
+      <programlisting>public class TestObjectDao : AdoDaoSupport, ITestObjectDao
+{
+   public void Create(string name, int age)
+   {
+       AdoTemplate.ExecuteNonQuery(CommandType.Text,
+           String.Format("insert into TestObjects(Age, Name) VALUES ({0}, '{1}')", 
+           age, name));
+   }
+
+   public void Delete(string name)
+   {
+       AdoTemplate.ExecuteNonQuery(CommandType.Text,
+           String.Format("delete from TestObjects where Name = '{0}'",
+           name));
+   }
+}</programlisting>
+
+      <para>The <classname>TestObjectManager</classname> is configured with
+      the DAO objects by standard dependency injection techniques. The client
+      code, which in this case directly asks the Spring IoC container for an
+      instance of <interfacename>ITestObjectManager</interfacename>, will
+      receive a transaction proxy with transaction options based on the
+      attribute metadata. Note that typically the
+      <interfacename>ITestObjectManager</interfacename> would be set on yet
+      another higher level object via dependency injection, for example a web
+      service.</para>
+
+      <para>The client calling code is shown below</para>
+
+      <programlisting>IApplicationContext ctx =
+   new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/autoDeclarativeServices.xml");
+
+ITestObjectManager mgr = ctx["testObjectManager"] as ITestObjectManager; 
+
+TestObject to1 = new TestObject();
+to1.Name = "Jack";
+to1.Age = 7;
+
+TestObject to2 = new TestObject();
+to2.Name = "Jill";
+to2.Age = 8;
+
+mgr.SaveTwoTestObjects(to1, to2);
+
+mgr.DeleteTwoTestObjects("Jack", "Jill");
+
+            </programlisting>
+
+      <para>The configuration of the object definitions of the DAO and manager
+      classes is shown below.</para>
+
+      <programlisting>&lt;objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database"&gt;
+
+    &lt;db:provider id="DbProvider" 
+                  provider="SqlServer-1.1" 
+                  connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/&gt;
+
+    &lt;object id="transactionManager" 
+            type="Spring.Data.AdoPlatformTransactionManager, Spring.Data"&gt;
+            
+        &lt;property name="DbProvider" ref="DbProvider"/&gt;
+    &lt;/object&gt;
+        
+    &lt;object id="adoTemplate" type="Spring.Data.AdoTemplate, Spring.Data"&gt;
+        &lt;property name="DbProvider" ref="DbProvider"/&gt;                
+    &lt;/object&gt;
+
+    &lt;object id="testObjectDao" type="Spring.Data.TestObjectDao, Spring.Data.Integration.Tests"&gt;
+        &lt;property name="AdoTemplate" ref="adoTemplate"/&gt;
+    &lt;/object&gt;
+            
+    
+    &lt;!-- The object that performs multiple data access operations --&gt;
+    &lt;object id="testObjectManager" 
+            type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests"&gt;
+        &lt;property name="TestObjectDao" ref="testObjectDao"/&gt;
+    &lt;/object&gt;
+ 
+    
+&lt;/objects&gt;</programlisting>
+
+      <para>This is standard Spring configuration and as such provides you
+      with the flexibility to parameterize your connection string and to
+      easily switch implementations of your DAO objects. The configuration to
+      create a transactional proxy for the manager class is shown
+      below.</para>
+
+      <programlisting>    &lt;!-- The rest of the config file is common no matter how many objects you add --&gt;
+    &lt;!-- that you would like to have declarative tx management applied to --&gt;    
+    
+    &lt;object id="autoProxyCreator" 
+            type="Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator, Spring.Aop"&gt;
+    &lt;/object&gt;
+    
+    &lt;object id="transactionAdvisor"
+            type="Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor, Spring.Data"&gt;
+        &lt;property name="TransactionInterceptor" ref="transactionInterceptor"/&gt;
+    &lt;/object&gt;
+    
+    
+    &lt;!-- Transaction Interceptor --&gt;
+    &lt;object id="transactionInterceptor" 
+            type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data"&gt;
+        &lt;property name="TransactionManager" ref="transactionManager"/&gt;
+        &lt;property name="TransactionAttributeSource" ref="attributeTransactionAttributeSource"/&gt;        
+    &lt;/object&gt;
+    
+    &lt;object id="attributeTransactionAttributeSource"
+            type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data"&gt;    
+    &lt;/object&gt;
+</programlisting>
+
+      <para>Granted this is a bit verbose and hard to grok at first sight -
+      however you only need to grok this once as it is 'boiler plate' XML you
+      can reuse across multiple projects. What these object definitions are
+      doing is to instruct Spring's to look for all objects within the IoC
+      configuration that have the [Transaction] attribute and then apply the
+      AOP transaction interceptor to them based on the transaction options
+      contained in the attribute. The attribute serves both as a pointcut and
+      as the declaration of transactional option information.</para>
+
+      <para>Since this XML fragment is not tied to any specific object
+      references it can be included in its own file and then imported via the
+      &lt;import&gt; element. In examples and test code this XML configuration
+      fragment is named autoDeclarativeServices.xml See <xref
+      linkend="objects-import" /> for more information.</para>
+
+      <para>The classes and their roles in this configuration fragment are
+      listed below</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><classname>TransactionInterceptor</classname> is the AOP
+          advice responsible for performing transaction management
+          functionality.</para>
+        </listitem>
+
+        <listitem>
+          <para><classname>TransactionAttributeSourceAdvisor</classname> is an
+          AOP Advisor that holds the TransactionInterceptor, which is the
+          advice, and a pointcut (where to apply the advice), in the form of a
+          TransactionAttributeSource.</para>
+        </listitem>
+
+        <listitem>
+          <para><classname>AttributesTransactionAttributeSource</classname> is
+          an implementation of the
+          <classname>ITransactionAttributeSource</classname> interface that
+          defines where to get the transaction metadata defining the
+          transaction semantics (isolation level, propagation behavior, etc)
+          that should be applied to specific methods of specific classes. The
+          transaction metadata is specified via implementations of the
+          <classname>ITransactionAttributeSource</classname> interface. This
+          example shows the use of the implementation
+          <classname>Spring.Transaction.Interceptor.AttributesTransactionAttributeSource</classname>
+          to obtain that information from standard .NET attributes. By the
+          very nature of using standard .NET attributes, the attribute serves
+          double duty in identifying the methods where the transaction
+          semantics apply. Alternative implementations of
+          <classname>ITransactionAttributeSource</classname> available are
+          <classname>MatchAlwaysTransactionAttributeSource</classname>,
+          <classname>NameMatchTransactionAttributeSource</classname>, or
+          <classname>MethodMapTransactionAttributeSource</classname>.</para>
+
+          <itemizedlist>
+            <listitem>
+              <para><classname>MatchAlwaysTransactionAttributeSource</classname>
+              is configured with a ITransactionAttribute instance that is
+              applied to all methods. The shorthand string representation,
+              i.e. PROPAGATION_REQUIRED can be used</para>
+            </listitem>
+
+            <listitem>
+              <para><classname>AttributesTransactionAttributeSource</classname>
+              : Use a standard. .NET attributes to specify the transactional
+              information. See <literal>TransactionAttribute</literal> class
+              for more information.</para>
+            </listitem>
+
+            <listitem>
+              <para><classname>NameMatchTransactionAttributeSource</classname>
+              allows ITransactionAttributes to be matched by method name. The
+              NameMap IDictionary property is used to specify the mapping. For
+              example</para>
+
+              <programlisting>&lt;object name="nameMatchTxAttributeSource" type="Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource, Spring.Data"
+      &lt;property name="NameMap"&gt;
+          &lt;dictionary&gt;
+              &lt;entry key="Execute" value="PROPAGATION_REQUIRES_NEW, -ApplicationException"/&gt;
+              &lt;entry key="HandleData" value="PROPAGATION_REQUIRED, -DataHandlerException"/&gt;
+              &lt;entry key="Find*" value="ISOLATION_READUNCOMMITTED, -DataHandlerException"/&gt;
+          &lt;/dictionary&gt;
+      &lt;/property&gt;
+
+&lt;/object&gt;</programlisting>
+
+              <para>Key values can be prefixed and/or suffixed with wildcards
+              as well as include the full namespace of the containing
+              class.</para>
+            </listitem>
+
+            <listitem>
+              <para><classname>MethodMapTransactionAttributeSource</classname>
+              : Similar to NameMatchTransactionAttributeSource but specifies
+              that only fully qualified method names (i.e. type.method,
+              assembly) and wildcards can be used at the start or end of the
+              method name for matching multiple methods.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para><classname>DefaultAdvisorAutoProxyCreator</classname>: looks
+          for Advisors in the context, and automatically creates proxy objects
+          which are the transactional wrappers</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Refer to the following section for a more convenient way to
+      achieve the same goal of declarative transaction management using
+      attributes.</para>
+    </sect2>
+
+    <sect2 id="tx-namespace">
+      <title>Declarative transactions using the transaction namespace</title>
+
+      <para>Spring provides a custom XML schema to simplify the configuration
+      of declarative transaction management. If you would like to perform
+      attribute driven transaction management you first need to register the
+      custom namespace parser for the transaction namespace. This can be done
+      in the application configuration file as shown below</para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="utf-8" ?&gt;
+&lt;configuration&gt;
+
+  &lt;configSections&gt;
+
+    &lt;sectionGroup name="spring"&gt;
+      &lt;section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" /&gt;
+      
+      &lt;!-- other spring config sections like context, typeAliases, etc not shown for brevity --&gt;
+
+    &lt;/sectionGroup&gt;
+  &lt;/configSections&gt;
+
+  &lt;spring&gt;
+    
+    &lt;parsers&gt;
+      &lt;parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" /&gt;
+      &lt;parser type="Spring.Transaction.Config.TxNamespaceParser, Spring.Data" /&gt;
+      &lt;parser type="Spring.Aop.Config.AopNamespaceParser, Spring.Aop" /&gt;
+    &lt;/parsers&gt;
+
+   &lt;/spring&gt;
+
+  &lt;/configSections&gt;</programlisting>
+
+      <para>Instead of using the XML configuration listed at the end of the
+      previous section (declarativeServices.xml you can use the following.
+      Note that the schemaLocation in the objects element is needed only if
+      you have not installed Spring's schema into the proper VS.NET 2005
+      location. See the chapter on VS.NET integration for more details.</para>
+
+      <programlisting>&lt;objects xmlns="http://www.springframework.net"
+	        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns:tx="http://www.springframework.net/schema/tx"
+         xmlns:db="http://www.springframework.net/database"
+         xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/schema/objects/spring-objects.xsd
+         http://www.springframework.net/schema/tx http://www.springframework.net/schema/tx/spring-tx-1.1.xsd"
+         http://www.springframework.net/schema/tx http://www.springframework.net/schema/tx/spring-database.xsd"&gt; 
+
+    &lt;db:provider id="DbProvider" 
+                  provider="SqlServer-1.1" 
+                  connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/&gt;
+
+    &lt;object id="transactionManager" 
+            type="Spring.Data.AdoPlatformTransactionManager, Spring.Data"&gt;
+            
+        &lt;property name="DbProvider" ref="DbProvider"/&gt;
+    &lt;/object&gt;
+        
+    &lt;object id="adoTemplate" type="Spring.Data.AdoTemplate, Spring.Data"&gt;
+        &lt;property name="DbProvider" ref="DbProvider"/&gt;                
+    &lt;/object&gt;
+
+    &lt;object id="testObjectDao" type="Spring.Data.TestObjectDao, Spring.Data.Integration.Tests"&gt;
+        &lt;property name="AdoTemplate" ref="adoTemplate"/&gt;
+    &lt;/object&gt;
+            
+    
+    &lt;!-- The object that performs multiple data access operations --&gt;
+    &lt;object id="testObjectManager" 
+            type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests"&gt;
+        &lt;property name="TestObjectDao" ref="testObjectDao"/&gt;
+    &lt;/object&gt;
+
+   
+    <emphasis role="bold">&lt;tx:attribute-driven transaction-manager="transactionManager"/&gt;</emphasis>
+
+&lt;/objects&gt;</programlisting>
+
+      <para><tip>
+          <para>You can actually omit the
+          <literal>'transaction-manager'</literal> attribute in the
+          <literal>&lt;tx:attribute-driven/&gt;</literal> tag if the object
+          name of the
+          <interfacename>IPlatformTransactionManager</interfacename> that you
+          want to wire in has the name
+          <literal>'transactionManager'</literal>. If the
+          <interfacename>PlatformTransactionManager</interfacename> object
+          that you want to dependency inject has any other name, then you have
+          to be explicit and use the <literal>'transaction-manager'</literal>
+          attribute as in the example above.</para>
+        </tip>The various optional elements of the
+      &lt;tx:attribute-driven/&gt; tag are summarised in the following
+      table</para>
+
+      <para><table id="tx-annotation-driven-settings">
+          <title><literal>&lt;tx:annotation-driven/&gt;</literal>
+          settings</title>
+
+          <tgroup cols="4">
+            <thead>
+              <row>
+                <entry>Attribute</entry>
+
+                <entry>Required?</entry>
+
+                <entry>Default</entry>
+
+                <entry>Description</entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry><literal>transaction-manager</literal></entry>
+
+                <entry>No</entry>
+
+                <entry>transactionManager</entry>
+
+                <entry><para>The name of transaction manager to use. Only
+                required if the name of the transaction manager is not
+                <literal>transactionManager</literal>, as in the example
+                above.</para></entry>
+              </row>
+
+              <row>
+                <entry><literal>proxy-target-type</literal></entry>
+
+                <entry>No</entry>
+
+                <entry></entry>
+
+                <entry><para>Controls what type of transactional proxies are
+                created for classes annotated with the
+                <interfacename>[Transaction]</interfacename> attribute. If
+                "<literal>proxy-target-type</literal>" attribute is set to
+                "<literal>true</literal>", then class-based proxies will be
+                created (proxy inherits from target class, however calls are
+                still delegated to target object via composition. This allows
+                for casting to base class. If
+                "<literal>proxy-target-type</literal>" is
+                "<literal>false</literal>" or if the attribute is omitted,
+                then a pure composition based proxy is created and you can
+                only cast the proxy to implemented interfaces. (See the
+                section entitled <xref linkend="aop-proxy-mechanism" /> for a
+                detailed examination of the different proxy
+                types.)</para></entry>
+              </row>
+
+              <row>
+                <entry><literal>order</literal></entry>
+
+                <entry>No</entry>
+
+                <entry></entry>
+
+                <entry><para>Defines the order of the transaction advice that
+                will be applied to objects annotated with
+                <code>[Transaction]</code>. More on the rules related to
+                ordering of AOP advice can be found in the AOP chapter (see
+                section <xref lang="" linkend="aop-advice-ordering" />). Note
+                that not specifying any ordering will leave the decision as to
+                what order advice is run in to the AOP
+                subsystem.</para></entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table></para>
+
+      <note>
+        <para>The "<literal>proxy-target-type</literal>" attribute on the
+        <literal>&lt;tx:attribute-driven/&gt;</literal> element controls what
+        type of transactional proxies are created for classes annotated with
+        the <interfacename>Transaction</interfacename> attribute. If
+        "<literal>proxy-target-type</literal>" attribute is set to
+        "<literal>true</literal>", then inheritance-based proxies will be
+        created. If "<literal>proxy-target-type</literal>" is
+        "<literal>false</literal>" or if the attribute is omitted, then
+        composition based proxies will be created. (See the section entitled
+        <xref linkend="aop-proxy-mechanism" /> for a detailed examination of
+        the different proxy types.)</para>
+      </note>
+
+      <para>You can also define the transactional semantics you want to apply
+      through the use of a &lt;tx:advice&gt; definition. This lets you define
+      the transaction metadata such as propagation and isolation level as well
+      as the methods for which that metadata applies external to the code
+      unlike the case of using the transaction attribute. The
+      &lt;tx:advice&gt; definition creates an instance of a
+      ITransactionAttributeSource during parsing time. Switching to use
+      &lt;tx:advice&gt; instead of &lt;tx:attribute-driven/&gt; in the example
+      would look like the following</para>
+
+      <programlisting>&lt;tx:advice id="txAdvice" transaction-manager="transactionManager"&gt;
+  &lt;tx:attributes&gt;
+    &lt;tx:method name="Save*"/&gt;   
+    &lt;tx:method name="Delete*"/&gt;  
+  &lt;/tx:attributes&gt;
+&lt;/tx:advice&gt;
+</programlisting>
+
+      <para>This says that all methods that start with Save and Delete would
+      have associated with them the default settings of transaction metadata.
+      These default values are listed below..</para>
+
+      <para>Here is an example using other elements of the &lt;tx:method/&gt;
+      definition</para>
+
+      <programlisting>  &lt;!-- the transactional advice (i.e. what 'happens'; see the &lt;aop:advisor/&gt; object below) --&gt;
+  &lt;tx:advice id="txAdvice" transaction-manager="transactionManager"&gt;
+    &lt;!-- the transactional semantics... --&gt;
+    &lt;tx:attributes&gt;
+      &lt;!-- all methods starting with 'get' are read-only --&gt;
+      &lt;tx:method name="Get*" read-only="true"/&gt;
+      &lt;!-- other methods use the default transaction settings (see below) --&gt;
+      &lt;tx:method name="*"/&gt;
+    &lt;/tx:attributes&gt;
+  &lt;/tx:advice&gt;
+</programlisting>
+
+      <para>The &lt;tx:advice/&gt; definition reads as “... all methods on
+      starting with 'Get' are to execute in the context of a read-only
+      transaction, and all other methods are to execute with the default
+      transaction semantics�. The 'transaction-manager' attribute of the
+      &lt;tx:advice/&gt; tag is set to the name of the
+      PlatformTransactionManager object that is going to actually drive the
+      transactions (in this case the 'transactionManager' object).</para>
+
+      <para>You can also use the AOP namespace &lt;aop:advisor&gt; element to
+      tie together a pointcut and the above defined advice as shown
+      below.</para>
+
+      <programlisting>&lt;object id="serviceOperation" type="Spring.Aop.Support.SdkRegularExpressionMethodPointcut, Spring.Aop"&gt;
+    &lt;property name="pattern" value="Spring.TxQuickStart.Services.*"/&gt;
+&lt;/object&gt;
+
+&lt;aop:config&gt;
+     
+    &lt;aop:advisor pointcut-ref="serviceOperation" advice-ref="txAdvice"/&gt;
+
+&lt;/aop:config&gt;</programlisting>
+
+      <para>This is assuming that the service layer class, TestObjectManager,
+      in the namespace Spring.TxQuickStart.Services. The &lt;aop:config/&gt;
+      definition ensures that the transactional advice defined by the
+      'txAdvice' object actually executes at the appropriate points in the
+      program. First we define a pointcut that matches any operation defined
+      on classes in the Spring.TxQuickStart.Services (you can be more
+      selective in your regular expression). Then we associate the pointcut
+      with the 'txAdvice' using an advisor. In the example, the result
+      indicates that at the execution of a 'SaveTwoTestObjects' and
+      'DeleteTwoTestObject', the advice defined by 'txAdvice' will be
+      run.</para>
+
+      <para>The various transactional settings that can be specified using the
+      &lt;tx:advice/&gt; tag. The default &lt;tx:advice/&gt; settings are
+      listed below and are the same as when you use the Transaction
+      attribute.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>The propagation setting is
+          <literal>TransactionPropagation.Required</literal></para>
+        </listitem>
+
+        <listitem>
+          <para>The isolation level is
+          <literal>IsolationLevel.ReadCommitted</literal></para>
+        </listitem>
+
+        <listitem>
+          <para>The transaction is read/write</para>
+        </listitem>
+
+        <listitem>
+          <para>The transaction timeout defaults to the default timeout of the
+          underlying transaction system, or none if timeouts are not
+          supported</para>
+        </listitem>
+
+        <listitem>
+          <para>EnterpriseServicesInteropOption (.NET 2.0 only with
+          TxScopeTransactionManager) - options between transaction created
+          with System.Transactions and transactions created through
+          COM+</para>
+        </listitem>
+
+        <listitem>
+          <para>Any exception will trigger rollback.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>These default settings can be changed; the various attributes of
+      the <literal>&lt;tx:method/&gt;</literal> tags that are nested within
+      <literal>&lt;tx:advice/&gt;</literal> and
+      <literal>&lt;tx:attributes/&gt;</literal> tags are summarized
+      below:</para>
+
+      <para><table id="tx-method-settings">
+          <title><literal>&lt;tx:method/&gt;</literal> settings</title>
+
+          <tgroup cols="4">
+            <thead>
+              <row>
+                <entry>Attribute</entry>
+
+                <entry>Required?</entry>
+
+                <entry>Default</entry>
+
+                <entry>Description</entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry><literal>name</literal></entry>
+
+                <entry>Yes</entry>
+
+                <entry></entry>
+
+                <entry><para>The method name(s) with which the transaction
+                attributes are to be associated. The wildcard (*) character
+                can be used to associate the same transaction attribute
+                settings with a number of methods; for example,
+                <literal>'Get*'</literal>,
+                <literal>'Handle*'</literal>,<literal> 'On*Event'</literal>,
+                and so forth.</para></entry>
+              </row>
+
+              <row>
+                <entry><literal>propagation</literal></entry>
+
+                <entry>No</entry>
+
+                <entry>Required</entry>
+
+                <entry>The transaction propagation behavior</entry>
+              </row>
+
+              <row>
+                <entry><literal>isolation</literal></entry>
+
+                <entry>No</entry>
+
+                <entry>ReadCommitted</entry>
+
+                <entry>The transaction isolation level</entry>
+              </row>
+
+              <row>
+                <entry><literal>timeout</literal></entry>
+
+                <entry>No</entry>
+
+                <entry>-1</entry>
+
+                <entry>The transaction timeout value (in seconds)</entry>
+              </row>
+
+              <row>
+                <entry><literal>read-only</literal></entry>
+
+                <entry>No</entry>
+
+                <entry>false</entry>
+
+                <entry>Is this transaction read-only?</entry>
+              </row>
+
+              <row>
+                <entry><literal>EnterpriseServicesInteropOption</literal></entry>
+
+                <entry>No</entry>
+
+                <entry>None</entry>
+
+                <entry>Interoperability options with COM+ transactions. (.NET
+                2.0 and TxScopeTransactionManager only)</entry>
+              </row>
+
+              <row>
+                <entry><literal>rollback-for</literal></entry>
+
+                <entry>No</entry>
+
+                <entry></entry>
+
+                <entry><para>The <literal>Exception(s)</literal> that will
+                trigger rollback; comma-delimited. For example,
+                <literal>'MyProduct.MyBusinessException,ValidationException'</literal></para></entry>
+              </row>
+
+              <row>
+                <entry><literal>no-rollback-for</literal></entry>
+
+                <entry>No</entry>
+
+                <entry></entry>
+
+                <entry><para>The <literal>Exception(s)</literal> that will
+                <emphasis>not</emphasis> trigger rollback; comma-delimited.
+                For example,
+                <literal>'MyProduct.MyBusinessException,ValidationException'</literal></para></entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table></para>
+    </sect2>
+
+    <sect2 id="tx-attributes-settings">
+      <title>Transaction attribute settings</title>
+
+      <para>The Transaction attribute is metadata that specifies that a class
+      or method must have transactional semantics. The default Transaction
+      attribute settings are</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>The propagation setting is
+          <literal>TransactionPropagation.Required</literal></para>
+        </listitem>
+
+        <listitem>
+          <para>The isolation level is
+          <literal>IsolationLevel.ReadCommitted</literal></para>
+        </listitem>
+
+        <listitem>
+          <para>The transaction is read/write</para>
+        </listitem>
+
+        <listitem>
+          <para>The transaction timeout defaults to the default timeout of the
+          underlying transaction system, or none if timeouts are not
+          supported</para>
+        </listitem>
+
+        <listitem>
+          <para>EnterpriseServicesInteropOption (.NET 2.0 only with
+          TxScopeTransactionManager) - options between transaction created
+          with System.Transactions and transactions created through
+          COM+</para>
+        </listitem>
+
+        <listitem>
+          <para>Any exception will trigger rollback.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The default settings can, of course, be changed; the various
+      properties of the Transaction attribute are summarised in the following
+      table</para>
+
+      <table id="tx-attribute-properties">
+        <title>Transaction attribute properties</title>
+
+        <tgroup cols="3">
+          <colspec align="left" colnum="1" colwidth="" />
+
+          <colspec colnum="2" />
+
+          <colspec colnum="3" colwidth="200" />
+
+          <tbody>
+            <row>
+              <entry align="center"><emphasis
+              role="bold">Property</emphasis></entry>
+
+              <entry align="center"><emphasis
+              role="bold">Type</emphasis></entry>
+
+              <entry align="center"><emphasis
+              role="bold">Description</emphasis></entry>
+            </row>
+
+            <row>
+              <entry>TransactionPropagation</entry>
+
+              <entry>enumeration,
+              <classname>Spring.Transaction.TransactionPropagation</classname></entry>
+
+              <entry>optional propagation setting. Required, Supports,
+              Mandatory, RequiresNew, NotSupported, Never, Nested</entry>
+            </row>
+
+            <row>
+              <entry>Isolation</entry>
+
+              <entry><classname>System.Data.IsolationLevel</classname></entry>
+
+              <entry>optional isolation level</entry>
+            </row>
+
+            <row>
+              <entry>ReadOnly</entry>
+
+              <entry>boolean</entry>
+
+              <entrytbl cols="1">
+                <tbody>
+                  <row>
+                    <entry>read/write vs. read-only transaction</entry>
+                  </row>
+                </tbody>
+              </entrytbl>
+            </row>
+
+            <row>
+              <entry>EnterpriseServicesInteropOption</entry>
+
+              <entry>enumeration
+              System.Transactions.EnterpriseServicesInteropOption</entry>
+
+              <entry>Options for interoperability with COM+ transactions (.NET
+              2.0 and TxScopeTransactionManager only)</entry>
+            </row>
+
+            <row>
+              <entry>Timeout</entry>
+
+              <entry>int (in seconds granularity)</entry>
+
+              <entry>the transaction timeout</entry>
+            </row>
+
+            <row>
+              <entry>RollbackFor</entry>
+
+              <entry>an array of <classname>Type</classname> objects</entry>
+
+              <entry>an optional array of exception classes that <emphasis
+              role="bold">must cause</emphasis> rollback</entry>
+            </row>
+
+            <row>
+              <entry>NoRollbackFor</entry>
+
+              <entry>an array of <classname>Type</classname> objects</entry>
+
+              <entry>an optional array of exception classes that <emphasis
+              role="bold">must not </emphasis>cause rollback</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <para>Note that setting the TransactionPropagation to Nested will throw
+      a NestedTransactionNotSupportedException in a case where an actual
+      nested transaction occurs, i.e. not in the case of applying the Nested
+      propagation but in fact no nested calls are made. This will be fixed for
+      the Spring 1.2 release for SqlServer and Oracle which support nested
+      transactions. Also note, that changing of isolation levels on a
+      per-method basis is also scheduled for the Spring 1.2 release since it
+      requires detailed command text metadata for each dbprovider. Please
+      check the forums for news on when this feature will be introduced into
+      the nightly builds.</para>
+
+      <para>If you specify an exception type for 'NoRollbackFor' the action
+      taken is to commit the work that has been done in the database up to the
+      point where the exception occurred. The exception is still propagated
+      out to the calling code.</para>
+
+      <para>The ReadOnly boolean is a hint to the data access technology to
+      enable read-only optimizations. This currently has no effect in Spring's
+      ADO.NET framework. If you would like to enable read-only optimizations
+      in ADO.NET this is generally done via the 'Mode=Read' or
+      'Mode=Read-Only" options in the connection string. Check your database
+      provider for more information. In the case of NHibernate the flush mode
+      is set to Never when a new Session is created for the
+      transaction.</para>
+
+      <para>Throwing exceptions to indicate failure and assuming success is an
+      easier and less invasive programming model than performing the same task
+      Programatically - ContextUtil.MyTransactionVote or
+      TransactionScope.Complete. The rollback options are a means to influence
+      the outcome of the transaction based on the exception type which adds an
+      extra degree of flexibility.</para>
+
+      <para>Having any exception trigger a rollback has similar behavior as
+      applying the AutoComplete attribute available when using .NET Enterprise
+      Services. The difference with AutoComplete is that using AutoComplete is
+      also coupled to the lifetime of the ServicedComponent since it sets
+      ContextUtil.DeactivateOnReturn to true. For a stateless DAO layer this
+      is not an issue but it could be in other scenarios. Spring's
+      transactional aspect does not affect the lifetime of your object.</para>
+    </sect2>
+
+    <sect2 id="tx-autoproxy">
+      <title>Declarative Transactions using AutoProxy</title>
+
+      <para>if you choose not to use the transaction namespace for declarative
+      transaction management then you can use 'lower level' object definitions
+      to configure declarative transactions. This approach was shown in the
+      <link linkend="tx-firstexample">first example</link>. The use of
+      Spring's autoproxy functionality defines criteria to select a collection
+      of objects to create a transactional AOP proxy. There are two AutoProxy
+      classes that you can use,
+      <classname>ObjectNameAutoProxyCreator</classname> and
+      <classname>DefaultAdvisorAutoProxyCreator</classname>. If you are using
+      the new transaction namespace support you do not need to configure these
+      objects as a DefaultAdvisorAutoProxyCreator is created 'under the
+      covers' while parsing the transaction namespace elements</para>
+
+      <sect3 id="tx-creating-using-objectnameautoproxycreator">
+        <title>Creating transactional proxies with
+        ObjectNameAutoProxyCreator</title>
+
+        <para>The ObjectNameAutoProxyCreator is useful when you would like to
+        create transactional proxies for many objects. The definitions for the
+        TransactionInterceptor and associated attributes is done once. When
+        you add new objects to your configuration file that need to be proxies
+        you only need to add them to the list of object referenced in the
+        ObjectNameAutoProxyCreator. Here is an example showing its use. Look
+        in the section that use ProxyFactoryObject for the declaration of the
+        transactionInterceptor.</para>
+
+        <programlisting>    &lt;object name="autoProxyCreator"
+            type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop"&gt;
+            
+        &lt;property name="InterceptorNames" value="transactionInterceptor"/&gt;
+        &lt;property name="ObjectNames"&gt;
+            &lt;list&gt;
+                &lt;idref local="testObjectManager"/&gt;
+            &lt;/list&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;</programlisting>
+      </sect3>
+
+      <sect3 id="tx-creating-using-defaultadvisorautoproxycreator">
+        <title>Creating transactional proxies with
+        DefaultAdvisorAutoProxyCreator</title>
+
+        <para>This is a commonly used way to configure declarative
+        transactions since it enables you to refer to the transaction
+        attribute as the pointcut to use for the transactional advice for any
+        object definition defined in the IoC container. An example of this
+        configuration approach was shown in Chapter 5.</para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="tx-txproxyfactoryobject">
+      <title>Declarative Transactions using
+      TransactionProxyFactoryObject</title>
+
+      <para>The TransactionProxyFactoryObject is easier to use than a
+      ProxyFactoryObject for most cases since the transaction interceptor and
+      transaction attributes are properties of this object. This removes the
+      need to declare them as separate objects. Also, unlike the case with the
+      ProxyFactoryObject, you do not have to give fully qualified method
+      names, just the normal 'short' method name. Wild card matching on the
+      method name is also allowed, which in practice helps to enforce a common
+      naming convention for the methods of your DAOs. The example from chapter
+      5 is shown here using a TransactionProxyFactoryObject.</para>
+
+      <programlisting>
+    &lt;object id="testObjectManager" 
+            type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data"&gt;
+        
+        &lt;property name="PlatformTransactionManager" ref="adoTransactionManager"/&gt;
+        &lt;property name="Target"&gt;
+            &lt;object type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests"&gt;
+                &lt;property name="TestObjectDao" ref="testObjectDao"/&gt;
+            &lt;/object&gt;
+        &lt;/property&gt; 
+        &lt;property name="TransactionAttributes"&gt;
+            &lt;name-values&gt;
+                &lt;add key="Save*" value="PROPAGATION_REQUIRED"/&gt;
+                &lt;add key="Delete*" value="PROPAGATION_REQUIRED"/&gt;
+            &lt;/name-values&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;
+    
+</programlisting>
+
+      <para>Note the use of an inner object definition for the target which
+      will make it impossible to obtain an unproxied reference to the
+      TestObjectManager.</para>
+
+      <para>As can be seen in the above definition, the TransactionAttributes
+      property holds a collection of name/value pairs. The key of each pair is
+      a method or methods (a * wildcard ending is optional) to apply
+      transactional semantics to. Note that the method name is not qualified
+      with a package name, but rather is considered relative to the class of
+      the target object being wrapped. The value portion of the name/value
+      pair is the TransactionAttribute itself that needs to be applied. When
+      specifying it as a string value as in this example, it's in String
+      format as defined by TransactionAttributeConverter. This format
+      is:</para>
+
+      <para><literal>PROPAGATION_NAME,ISOLATION_NAME,readOnly,timeout_NNNN,+Exception1,-Exception2</literal></para>
+
+      <para>Note that the only mandatory portion of the string is the
+      propagation setting. The default transactions semantics which apply are
+      as follows:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Exception Handling: All exceptions thrown trigger a
+          rollback.</para>
+        </listitem>
+
+        <listitem>
+          <para>Transactions are read/write</para>
+        </listitem>
+
+        <listitem>
+          <para>Isolation Level:
+          TransactionDefinition.ISOLATION_DEFAULT</para>
+        </listitem>
+
+        <listitem>
+          <para>Timeout: TransactionDefinition.TIMEOUT_DEFAULT</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Multiple rollback rules can be specified here, comma-separated. A
+      - prefix forces rollback; a + prefix specifies commit. Under the covers
+      the IDictionary of name value pairs will be converted to an instance of
+      <classname>NameMatchTransactionAttributeSource</classname></para>
+
+      <para>The string used for PROPAGATION_NAME are those defined on the
+      Spring.Transaction.TransactionPropagation enumeration, namely Required,
+      Supports, Mandatory, RequiresNew, NotSupported, Never, Nested. The
+      string used for ISOLATION_NAME are those defined on the
+      System.Data.IsolationLevel enumberateion, namely ReadCommitted,
+      ReadUncommitted, RepeatableRead, Serializable.</para>
+
+      <para>The TransactionProxyFactoryObject allows you to set optional "pre"
+      and "post" advice, for additional interception behavior, using the
+      "PreInterceptors" and "PostInterceptors" properties. Any number of pre
+      and post advices can be set, and their type may be Advisor (in which
+      case they can contain a pointcut), MethodInterceptor or any advice type
+      supported by the current Spring configuration (such as ThrowsAdvice,
+      AfterReturningAdvice or BeforeAdvice, which are supported by default.)
+      These advices must support a shared-instance model. If you need
+      transactional proxying with advanced AOP features such as stateful
+      mixins, it's normally best to use the generic ProxyFactoryObject, rather
+      than the TransactionProxyFactoryObject convenience proxy creator.</para>
+    </sect2>
+
+    <sect2 id="tx-using-abstract-objectdefs">
+      <title>Concise proxy definitions</title>
+
+      <para>Using abstract object definitions in conjunction with a
+      TransactionProxyFactoryObject provides you a more concise means to reuse
+      common configuration information instead of duplicating it over and over
+      again with a definition of a TransactionProxyFactoryObject per object.
+      Objects that are to be proxied typically have the same pattern of method
+      names, Save*, Find*, etc. This commonality can be placed in an abstract
+      object definition, which other object definitions refer to and change
+      only the configuration information that is different. An abstract object
+      definition is shown below</para>
+
+      <programlisting>   &lt;object id="txProxyTemplate" abstract="true"
+            type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data"&gt;
+        
+        &lt;property name="PlatformTransactionManager" ref="adoTransactionManager"/&gt;
+
+        &lt;property name="TransactionAttributes"&gt;
+            &lt;name-values&gt;
+                &lt;add key="Save*" value="PROPAGATION_REQUIRED"/&gt;
+                &lt;add key="Delete*" value="PROPAGATION_REQUIRED"/&gt;
+            &lt;/name-values&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;</programlisting>
+
+      <para>Subsequent definitions can refer to this 'base' configuration as
+      shown below</para>
+
+      <programlisting>&lt;object id="testObjectManager" parent="txProxyTemplate"&gt;
+    &lt;property name="Target"&gt;
+            &lt;object type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests"&gt;
+                &lt;property name="TestObjectDao" ref="testObjectDao"/&gt;
+            &lt;/object&gt;
+    &lt;/property&gt; 
+&lt;/object&gt;</programlisting>
+    </sect2>
+
+    <sect2 id="tx-proxyfactoryobject">
+      <title>Declarative Transactions using ProxyFactoryObject</title>
+
+      <para>Using the general ProxyFactoryObject to declare transactions gives
+      you a great deal of control over the proxy created since you can specify
+      additional advice, such as for logging or performance. Based on the
+      example shown previously a sample configuration using ProxyFactoryObject
+      is shown below</para>
+
+      <programlisting>    &lt;object id="testObjectManagerTarget" type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests"&gt;
+        &lt;property name="TestObjectDao" ref="testObjectDao"/&gt;
+    &lt;/object&gt;
+
+    &lt;object id="testObjectManager" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop"&gt;
+        
+        &lt;property name="Target" ref="testObjectManagerTarget"/&gt;
+        &lt;property name="ProxyInterfaces"&gt;
+            &lt;value&gt;Spring.Data.ITestObjectManager&lt;/value&gt;
+        &lt;/property&gt;
+        &lt;property name="InterceptorNames"&gt;
+            &lt;value&gt;transactionInterceptor&lt;/value&gt;
+        &lt;/property&gt;      
+        
+    &lt;/object&gt;</programlisting>
+
+      <para>The ProxyFactoryObject will create a proxy for the Target, i.e. a
+      TestObjectManager instance. An inner object definition could also have
+      been used such that it would make it impossible to obtain an unproxied
+      object from the container. The interceptor name refers to the following
+      definition.</para>
+
+      <programlisting>    &lt;object id="transactionInterceptor" type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data"&gt;
+
+        &lt;property name="TransactionManager" ref="adoTransactionManager"/&gt;
+
+        &lt;!-- note do not have converter from string to this property type registered --&gt;
+        &lt;property name="TransactionAttributeSource" ref="methodMapTransactionAttributeSource"/&gt;        
+    &lt;/object&gt;
+    
+    &lt;object name="methodMapTransactionAttributeSource" 
+            type="Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource, Spring.Data"&gt;
+        &lt;property name="MethodMap"&gt;
+           &lt;dictionary&gt;           
+              &lt;entry key="Spring.Data.TestObjectManager.SaveTwoTestObjects, Spring.Data.Integration.Tests" 
+                     value="PROPAGATION_REQUIRED"/&gt;
+              &lt;entry key="Spring.Data.TestObjectManager.DeleteTwoTestObjects, Spring.Data.Integration.Tests" 
+                     value="PROPAGATION_REQUIRED"/&gt;                     
+           &lt;/dictionary&gt;        
+        &lt;/property&gt;     
+    &lt;/object&gt;</programlisting>
+
+      <para>The transaction options for each method are specified using a
+      dictionary containing the class name + method name, assembly as the key
+      and the value is of the form</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>&lt;Propagation Behavior&gt;, &lt;Isolation Level&gt;,
+          &lt;ReadOnly&gt;, -Exception, +Exception</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>All but the propagation behavior are optional. The + and - are
+      used in front of the name of an exception. Minus indicates to rollback
+      if the exception is thrown, the Plus indicates to commit if the
+      exception is thrown.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="transaction-programmatic">
+    <title>Programmatic transaction management</title>
+
+    <para>Spring provides two means of programmatic transaction
+    management:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Using the <classname>TransactionTemplate</classname></para>
+      </listitem>
+
+      <listitem>
+        <para>Using a
+        <interfacename>IPlatformTransactionManager</interfacename>
+        implementation directly</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>These are located in the Spring.Transaction.Support namespace. If
+    you are going to use programmatic transaction management, the Spring team
+    generally recommends the first approach (i.e. Using the
+    <classname>TransactionTemplate</classname>)</para>
+
+    <sect2 id="tx-prog-template">
+      <title>Using the <classname>TransactionTemplate</classname></title>
+
+      <para>The TransactionTemplate adopts the same approach as other Spring
+      templates such as <classname>AdoTemplate</classname> and
+      <classname>HibernateTemplate</classname>. It uses a callback approach,
+      to free application code from having to do the boilerplate acquisition
+      and release of resources, and results in code that is intention driven,
+      in that the code that is written focuses solely on what the developer
+      wants to do. Granted that the using construct of System.Transaction
+      alleviates much of this. One key difference with the approach taken with
+      the TransactionTemplate is that a commit is assumed - throwing an
+      exception triggers a rollback instead of using the TransactionScope API
+      to commit or rollback. This also allows for the use of rollback rules,
+      that is a commit can still occur for exceptions of certain types. <note>
+          <para>As you will immediately see in the examples that follow, using
+          the <literal>TransactionTemplate</literal> absolutely couples you to
+          Spring's transaction infrastructure and APIs. Whether or not
+          programmatic transaction management is suitable for your development
+          needs is a decision that you will have to make yourself.</para>
+        </note></para>
+
+      <para>Application code that must execute in a transaction context looks
+      like this. You, as an application developer, will write a
+      ITransactionCallback implementation (typically expressed as an anonymous
+      delegate) that will contain all of the code that you need to have
+      execute in the context of a transaction. You will then pass an instance
+      of your custom ITransactionCallback to the Execute(..) method exposed on
+      the TransactionTemplate. Note that the
+      <interfacename>ITransactionCallback</interfacename> can be used to
+      return a value:</para>
+
+      <programlisting>public class SimpleService : IService
+{
+  private TransactionTemplate transactionTemplate;
+
+  public SimpleService(IPlatformTransactionManager transactionManager)
+  {
+     AssertUtils.ArgumentNotNull(transactionManager, "transactionManager");
+     transactionTemplate = new TransactionTemplate(transactionManager);
+  }
+
+  public object SomeServiceMethod()
+  {
+     return tt.Execute(delegate {
+                             UpdateOperation(userId);
+                             return ResultOfUpdateOperation2();
+                       });
+  }
+}
+</programlisting>
+
+      <para>This code example is specific to .NET 2.0 since it uses anonymous
+      delegates, which provides a particularly elegant means to invoke a
+      callback function as local variables can be referred to inside the
+      delegate, i.e. userId. In this case the
+      <interfacename>ITransactionStatus</interfacename> was not exposed in the
+      delegate (delegate can infer the signature to use), but one could also
+      obtain a reference to the
+      <interfacename>ITransactionStatus</interfacename> instance and set the
+      <literal>RollbackOnly</literal> property to trigger a rollback - or
+      alternatively throw an exception. This is shown below</para>
+
+      <programlisting>tt.Execute(delegate(ITransactionStatus status)
+           {
+             try {
+               UpdateOperation1();
+               UpdateOperation2();
+             } catch (SomeBusinessException ex) {
+               status.RollbackOnly = true;
+             }           
+             return null;
+           });</programlisting>
+
+      <para>If you are using .NET 1.1 then you should provide a normal
+      delegate reference or an instance of a class that implements the
+      <interfacename>ITransactionCallback</interfacename> interface. This is
+      shown below</para>
+
+      <programlisting>tt.Execute(new TransactionRollbackTxCallback(amount));
+
+
+    public class TransactionRollbackTxCallback : ITransactionCallback
+    {
+        private decimal amount;
+
+        public TransactionRollbackTxCallback(decimal amount)
+        {
+            this.amount = amount
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+             adoTemplate.ExecuteNonQuery(CommandType.Text, "insert into dbo.Debits (DebitAmount) VALUES (@amount)", "amount", DbType.Decimal, 0,555);
+             // decide you need to rollback...
+             status.RollbackOnly = true;
+             return null;
+        }
+    }</programlisting>
+
+      <para>Application classes wishing to use the
+      <classname>TransactionTemplate</classname> must have access to a
+      <interfacename>IPlatformTransactionManager</interfacename> (which will
+      typically be supplied to the class via dependency injection). It is easy
+      to unit test such classes with a mock or stub
+      <interfacename>IPlatformTransactionManager</interfacename>.</para>
+
+      <sect3>
+        <title>Specifying transaction settings</title>
+
+        <para>Transaction settings such as the propagation mode, the isolation
+        level, the timeout, and so forth can be set on the
+        <classname>TransactionTemplate</classname> either programmatically or
+        in configuration. <classname>TransactionTemplate</classname> instances
+        by default have the default transactional settings. Find below an
+        example of programmatically customizing the transactional settings for
+        a specific <classname>TransactionTemplate</classname>.</para>
+
+        <programlisting>public class SimpleService : IService
+{
+  private TransactionTemplate transactionTemplate;
+
+  public SimpleService(IPlatformTransactionManager transactionManager)
+  {
+     AssertUtils.ArgumentNotNull(transactionManager, "transactionManager");
+     transactionTemplate = new TransactionTemplate(transactionManager);
+
+     // the transaction settings can be set here explicitly if so desired
+
+     transactionTemplate.TransactionIsolationLevel = IsolationLevel.ReadUncommitted;
+     transactionTemplate.TransactionTimeout = 30;
+
+     // and so forth...
+  }
+
+  . . .
+
+}
+
+</programlisting>
+
+        <para>Find below an example of defining a
+        <classname>TransactionTemplate</classname> with some custom
+        transactional settings, using Spring XML configuration. The
+        '<literal>sharedTransactionTemplate</literal>' can then be injected
+        into as many services as are required.</para>
+
+        <programlisting>&lt;object id="sharedTransactionTemplate"
+        type="Spring.Transaction.Support.TransactionTemplate, Sprng.Data"&gt;
+  &lt;property name="TransactionIsolationLevel" value="IsolationLevel.ReadUncommitted"/&gt;
+  &lt;property name="TransactionTimeout" value="30"/&gt;
+&lt;/object&gt;</programlisting>
+
+        <para>Finally, instances of the
+        <classname>TransactionTemplate</classname> class are threadsafe, in
+        that instances do not maintain any conversational state.
+        <classname>TransactionTemplate</classname> instances do however
+        maintain configuration state, so while a number of classes may choose
+        to share a single instance of a
+        <classname>TransactionTemplate</classname>, if a class needed to use a
+        <classname>TransactionTemplate</classname> with different settings
+        (for example, a different isolation level), then two distinct
+        <classname>TransactionTemplate</classname> instances would need to be
+        created and used.</para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="transaction-programmatic-ptm">
+      <title>Using the PlatformTransactionManager</title>
+
+      <para>You can also use the PlatformTransactionManager directly to manage
+      your transaction. Simply pass the implementation of the
+      PlatformTransactionManager you're using to your object via a object
+      reference through standard Dependency Injection techniques. Then, using
+      the TransactionDefinition and ITransactionStatus objects, you can
+      initiate transactions, rollback and commit.</para>
+
+      <programlisting>DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+def.PropagationBehavior = TransactionPropagation.Required;
+
+ITransactionStatus status = transactionManager.GetTransaction(def);
+
+try
+{
+  // execute your business logic here
+} catch (Exception e)
+{
+  transactionManager.Rollback(status);
+  throw;
+}
+transactionManager.Commit(status);</programlisting>
+
+      <para>Note that a corresponding 'using TransactionManagerScope' class
+      can be modeled to get similar API usage to System.Transactions
+      TransactionScope.</para>
+    </sect2>
+  </sect1>
+
+  <sect1>
+    <title>Choosing between programmatic and declarative transaction
+    management</title>
+
+    <para>Programmatic transaction management is usually a good idea only if
+    you have a small number of transactional operations. For example, if you
+    have a web application that require transactions only for certain update
+    operations, you may not want to set up transactional proxies using Spring
+    or any other technology. In this case, using the TransactionTemplate may
+    be a good approach. On the other hand, if your application has numerous
+    transactional operations, declarative transaction management is usually
+    worthwhile. It keeps transaction management out of business logic, and is
+    not difficult to configure in Spring.</para>
+  </sect1>
+
+  <sect1>
+    <title>Transaction lifecycle and status information</title>
+
+    <para>You can query the status of the current Spring managed transaction
+    with the class <classname>TransactionSynchronizationManager</classname>.
+    Typical application code should not need to rely on using this class but
+    in some cases it is convenient to receive events around the lifecycle of
+    the transaction, i.e. before committing, after committing.
+    <classname>TransactionSynchronizationManager</classname> provides a method
+    to register a callback object that is informed on all significant stages
+    in the transaction lifecycle. Note that you can register for lifecycle
+    call back information for any of the transaction managers you use, be it
+    NHibernate or local ADO.NET transactions.</para>
+
+    <para>The method to register a callback with the
+    <classname>TransactionSynchronizationManager</classname> is</para>
+
+    <programlisting>public static void RegisterSynchronization( ITransactionSynchronization synchronization ) </programlisting>
+
+    <para>Please refer to the SDK docs for information on other methods in
+    this class.</para>
+
+    <para>The <classname>ITransactionSynchronization</classname> interface
+    is</para>
+
+    <programlisting>public interface ITransactionSynchronization
+{
+
+  // Typically used by Spring resource management code
+  void Suspend();
+  void Resume();
+
+  // Transaction lifeycyle callback methods
+  // Typically used by Spring resource management code but maybe useful in certain cases to application code
+  void BeforeCommit( bool readOnly );
+  void AfterCommit();
+  void BeforeCompletion();
+  void AfterCompletion( TransactionSynchronizationStatus status );
+}</programlisting>
+
+    <para>The <classname>TransactionSynchronizationStatus</classname> is an
+    enum with the values Committed, Rolledback, and Unknown.</para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/tx-quickstart.xml b/doc/reference/src/tx-quickstart.xml
new file mode 100644
index 00000000..c2955d5b
--- /dev/null
+++ b/doc/reference/src/tx-quickstart.xml
@@ -0,0 +1,553 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="tx-quickstart">
+  <title>Transactions QuickStart</title>
+
+  <section>
+    <title>Introduction</title>
+
+    <para>The Transaction Quickstart demonstrates Spring's transaction
+    management features. The database schema are two simple tables, credit and
+    debit, which contain an Identifier and an Amount. The quick start shows
+    the use of declarative transactions using attributes and also the ability
+    to change the transaction manager (local or distributed) via changes to
+    only the configuration files - no code changes are required. It also
+    demonstrates some techniques for unit and integration testing an
+    application as well as separating Spring's configuration files so that one
+    is responsible for describing how the core business classes are configured
+    and others that are responsible for the database environment and
+    application of AOP.</para>
+
+    <para>This quickstart assumes you have installed a way to run NUnit tests
+    within your IDE. Some excellent tools that let you do this are <ulink
+    url="http://www.testdriven.net/">TestDriven.NET</ulink> and <ulink
+    url="http://www.jetbrains.com/resharper/">ReSharper</ulink>.</para>
+  </section>
+
+  <section>
+    <title>Application Overview</title>
+
+    <para>The design of the application is very simple and consists of two
+    logical layers, a business service layer in the namespace
+    <package>Spring.TxQuickStart.Services</package> and a DAO layer in the
+    namespace <package>Spring.TxQuickStart.Dao</package>. As this is just a
+    toy example the business service layer does nothing more than call two DAO
+    objects. The business service is to transfer money in a bank account and
+    is blatantly taken from the book <ulink
+    url="http://www.apress.com/book/bookDisplay.html?bID=10002">Pro
+    ADO.NET</ulink> by Sahil Malik. The transfer service is defined by the
+    interface <interfacename>IAccountManager</interfacename> with the
+    implementation <classname>AccountManager</classname> located in the
+    namespace <classname>Spring.TxQuickStart.Services</classname>. The money
+    is recorded in a credit and debit table in the database. The SQL Server
+    schema for the tables is located in the file CreditsDebitsSchema.sql.
+    Transferring the money requires an ACID operation on these two tables. The
+    credit operation is defined via a
+    <interfacename>IAccountCreditDao</interfacename> interface and the debit
+    operation via an <interfacename>IAccountDebitDao</interfacename>
+    interface. Implementations of these interfaces using
+    <classname>AdoTemplate</classname> are in the namespace
+    <package>Spring.TxQuickStart.Dao.Ado</package>.</para>
+
+    <section>
+      <title>Interfaces</title>
+
+      <para>The Manager and DAO interfaces are shown below</para>
+
+      <programlisting>    public interface IAccountManager
+    {
+        void DoTransfer(float creditAmount, float debitAmount);
+    }
+
+
+    public interface IAccountCreditDao
+    {
+        void CreateCredit(float creditAmount);
+    }
+
+    public interface IAccountDebitDao
+    {
+        void DebitAccount(float debitAmount);
+    }</programlisting>
+    </section>
+  </section>
+
+  <section>
+    <title>Implementation</title>
+
+    <para>The implementation of the Account Credit DAO is shown below</para>
+
+    <programlisting>    public class AccountCreditDao : AdoDaoSupport, IAccountCreditDao
+    {
+        public void CreateCredit(float creditAmount)
+        {
+            AdoTemplate.ExecuteNonQuery(CommandType.Text,
+                                        "insert into Credits (CreditAmount) VALUES (@amount)", "amount", DbType.Decimal, 0,
+                                        creditAmount);
+        }
+    }</programlisting>
+
+    <para>and for the Debit DAO</para>
+
+    <programlisting>    public class AccountDebitDao : AdoDaoSupport, IAccountDebitDao
+    {
+        public void DebitAccount(float debitAmount)
+        {
+            AdoTemplate.ExecuteNonQuery(CommandType.Text,
+                                       "insert into dbo.Debits (DebitAmount) VALUES (@amount)", "amount", DbType.Decimal, 0,
+                                       debitAmount);
+        }
+    }</programlisting>
+
+    <para>Both of these DAO implementations inherit from Spring's
+    <classname>AdoDaoSupport</classname> class that provides convenient access
+    to an <classname>AdoTemplate</classname> for performing data access
+    operations. With no other properties that can be configured in these
+    implementations, the only configuration required is setting of
+    AdoDaoSupport's <classname>DbProvider</classname> property representing
+    the connection to the database.</para>
+
+    <para>The implementation of the service layer interface,
+    <classname>IAccountManager</classname>, is shown below.</para>
+
+    <programlisting>    public class AccountManager : IAccountManager
+    {
+
+        private IAccountCreditDao accountCreditDao;
+        private IAccountDebitDao accountDebitDao;
+
+        private float maxTransferAmount = 1000000;
+
+        public AccountManager(IAccountCreditDao accountCreditDao, IAccountDebitDao accountDebitDao)
+        {
+            this.accountCreditDao = accountCreditDao;
+            this.accountDebitDao = accountDebitDao;
+        }
+
+        public float MaxTransferAmount
+        {
+            get { return maxTransferAmount; }
+            set { maxTransferAmount = value; }
+        }
+
+        
+        [Transaction]
+        public void DoTransfer(float creditAmount, float debitAmount)
+        {
+            accountCreditDao.CreateCredit(creditAmount);
+
+            if (creditAmount &gt; maxTransferAmount || debitAmount &gt; maxTransferAmount)
+            {
+                throw new ArithmeticException("see a teller big spender...");
+            }
+           
+            accountDebitDao.DebitAccount(debitAmount);
+        }
+
+    }</programlisting>
+
+    <para>The if statement is a poor-mans representation of business logic,
+    namely that there is a policy that does not allow the use of this service
+    for amounts larger than $1,000,000. If the credit or debit amount is
+    larger than 1,000,000 then and exception will be thrown. We can write a
+    unit test that will test for this business logic and provide stub
+    implementations of the DAO objects so that our tests are not only
+    independent of the database but will also execute very quickly.<note>
+        <para>Notice the Transaction attribute on the
+        <literal>DoTransfer</literal> method. This attribute can be read by
+        Spring and used to create a transactional proxy to AccountManager in
+        order to perform declarative transaction management.</para>
+      </note></para>
+
+    <para>The NUnit unit test for AccountManager is shown below</para>
+
+    <programlisting>    public class AccountManagerUnitTests
+    {
+        private IAccountManager accountManager;
+
+        [SetUp]
+        public void Setup()
+        {
+            IAccountCreditDao stubCreditDao = new StubAccountCreditDao();
+            IAccountDebitDao stubDebitDao = new StubAccountDebitDao();
+            accountManager = new AccountManager(stubCreditDao, stubDebitDao);            
+        }
+
+        [Test]
+        public void TransferBelowMaxAmount()
+        {
+            accountManager.DoTransfer(217, 217);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArithmeticException))]
+        public void TransferAboveMaxAmount()
+        {
+            accountManager.DoTransfer(2000000, 200000);
+        }       
+    }</programlisting>
+
+    <para>Running these tests we exercise both code pathways through the
+    method <literal>DoTransfer</literal>. Nothing we have done so far is
+    Spring specific (aside from the presence of the [Transaction] attribute.
+    Now that we know the class works in isolation, we can now 'wire' up the
+    application for use in production by specifying how the service and DAO
+    layers are related. This configuration file is shown below and can loosely
+    be referred to as your 'application blueprint'. This configuration file is
+    named application-config.xml and is an embedded resource inside the 'main'
+    project, Spring.TxQuickStart.</para>
+
+    <programlisting>&lt;objects xmlns='http://www.springframework.net'&gt;
+
+  &lt;!-- DAO Implementations --&gt;
+  &lt;object id="accountCreditDao" type="Spring.TxQuickStart.Dao.Ado.AccountCreditDao, Spring.TxQuickStart"&gt;
+    &lt;property name="DbProvider" ref="CreditDbProvider"/&gt;
+  &lt;/object&gt;
+
+  &lt;object id="accountDebitDao" type="Spring.TxQuickStart.Dao.Ado.AccountDebitDao, Spring.TxQuickStart"&gt;
+    &lt;property name="DbProvider" ref="DebitDbProvider"/&gt;
+  &lt;/object&gt;
+
+
+  &lt;!-- The service that performs multiple data access operations --&gt;
+  &lt;object id="accountManager"
+          type="Spring.TxQuickStart.Services.AccountManager, Spring.TxQuickStart"&gt;
+    &lt;constructor-arg name="accountCreditDao" ref="accountCreditDao"/&gt;
+    &lt;constructor-arg name="accountDebitDao" ref="accountDebitDao"/&gt;
+  &lt;/object&gt;
+
+&lt;/objects&gt;</programlisting>
+
+    <para>This configuration is selecting the real ADO.NET implementations
+    that will insert records into the database. We can now write a NUnit
+    integration test that will test the service and DAO layers. To do this we
+    add on configuration information specific to our test environment. This
+    extra configuration information will determine what databases we speak to
+    and what transaction manager (local or distribute) to use. The code for
+    this integration style NUnit test is shown below</para>
+
+    <programlisting>    [TestFixture]
+    public class AccountManagerTests 
+    {
+        private AdoTemplate adoTemplateCredit;
+        private AdoTemplate adoTemplateDebit;
+
+        private IAccountManager accountManager;
+
+        [SetUp]
+        public void SetUp()
+        {
+            // Configure Spring programmatically
+            NamespaceParserRegistry.RegisterParser(typeof(DatabaseNamespaceParser));
+            NamespaceParserRegistry.RegisterParser(typeof(TxNamespaceParser));
+            NamespaceParserRegistry.RegisterParser(typeof(AopNamespaceParser));
+            IApplicationContext context = new XmlApplicationContext(
+                "assembly://Spring.TxQuickStart.Tests/Spring.TxQuickStart/system-test-local-config.xml" 
+                );
+            accountManager = context["accountManager"] as IAccountManager;
+            CleanDb(context);
+        }
+
+        [Test]
+        public void TransferBelowMaxAmount()
+        {
+            accountManager.DoTransfer(217, 217);
+
+            int numCreditRecords = (int)adoTemplateCredit.ExecuteScalar(CommandType.Text, "select count(*) from Credits");
+            int numDebitRecords =  (int)adoTemplateDebit.ExecuteScalar(CommandType.Text, "select count(*) from Debits");
+            Assert.AreEqual(1, numCreditRecords);
+            Assert.AreEqual(1, numDebitRecords);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArithmeticException))]
+        public void TransferAboveMaxAmount()
+        {
+            accountManager.DoTransfer(2000000, 200000);
+        }
+
+
+        private void CleanDb(IApplicationContext context)
+        {
+            IDbProvider dbProvider = (IDbProvider)context["DebitDbProvider"];
+            adoTemplateDebit = new AdoTemplate(dbProvider);
+            adoTemplateDebit.ExecuteNonQuery(CommandType.Text, "truncate table Debits");
+
+            dbProvider = (IDbProvider)context["CreditDbProvider"];
+            adoTemplateCredit = new AdoTemplate(dbProvider);
+            adoTemplateCredit.ExecuteNonQuery(CommandType.Text, "truncate table Credits");
+
+        }
+    }</programlisting>
+
+    <para>The essential element is to create an instance of Spring's
+    application context where the relevant layers of the application are
+    'wired' together. The <classname>IAccountManager</classname>
+    implementation is retrieved from the IoC container and stored as a field
+    of the test class. The basic logic of the test is the same as in the unit
+    test but in addition there is the verification of actions performed in the
+    database. The set up method puts the database tables into a known state
+    before running the tests. Other techniques for performing integration
+    testing that can alleviate the need to do extensive database state
+    management for integration tests is described in the <link
+    linkend="testing">testing</link> section.</para>
+  </section>
+
+  <section>
+    <title>Configuration</title>
+
+    <para>The configuration file system-test-local-config.xml shown in the
+    previous program listing includes application-config.xml and specifies the
+    database to use and the local (not distributed) transaction manager
+    AdoPlatformTransactionManager. This configuration file is shown
+    below</para>
+
+    <programlisting>&lt;objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database"
+         xmlns:tx="http://www.springframework.net/tx"&gt;
+
+
+  &lt;!-- Imports application configuration --&gt;
+  &lt;import resource="assembly://Spring.TxQuickStart/Spring.TxQuickStart/application-config.xml"/&gt;
+  
+  &lt;!-- Imports additional aspects --&gt;
+  &lt;!--
+  &lt;import resource="assembly://Spring.TxQuickStart.Tests/Spring.TxQuickStart/aspects-config.xml"/&gt;
+  --&gt;
+  
+  
+  &lt;!-- Database Providers --&gt;
+  
+  &lt;db:provider id="DebitDbProvider"
+               provider="System.Data.SqlClient"
+               connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"/&gt;
+
+  &lt;db:provider id="CreditDbProvider"
+               provider="System.Data.SqlClient"
+               connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"/&gt;
+                  
+  &lt;alias name="DebitDbProvider" alias="CreditDbProvider"/&gt;
+
+  &lt;!-- Transaction Manager if using a single database that contain both credit and debit tables --&gt;
+  &lt;object id="transactionManager" 
+          type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data"&gt;
+    &lt;property name="DbProvider" ref="DebitDbProvider"/&gt;
+  &lt;/object&gt;
+
+  &lt;!-- Transaction aspect --&gt;
+  
+  &lt;tx:attribute-driven/&gt;
+
+&lt;/objects&gt;</programlisting>
+
+    <para>Moving from top to bottom in the configuration file, the
+    'application-blueprint' configuration file is included. Then the database
+    type and connection parameters are specified for the two databases. The
+    names of these providers must match those specific in
+    application-config.xml. Since the two names point to the same database, an
+    alias configuration element is used to have them point to the same
+    dbProvider under different names. The type of transaction manager is then
+    selected, in this case we are showing the use of local transactions with
+    AdoPlatformTransactionManager. Running the tests will result in 217 being
+    entered into the Credits and Debits table of each database. You can fire
+    up SQL Server Management Studio or equivalent to verify this.</para>
+
+    <para>To switch to a distributed transaction you can refer to the
+    configuration file system-test-dtc-config.xml, which is shown below</para>
+
+    <programlisting>objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database"
+         xmlns:tx="http://www.springframework.net/tx"&gt;
+
+
+  &lt;!-- Imports application configuration --&gt;
+  &lt;import resource="assembly://Spring.TxQuickStart/Spring.TxQuickStart/application-config.xml"/&gt;
+  
+  &lt;!-- Imports additional aspects --&gt;
+  &lt;!--
+  &lt;import resource="assembly://Spring.TxQuickStart.Tests/Spring.TxQuickStart/aspects-config.xml"/&gt;
+  --&gt;
+   
+  &lt;db:provider id="DebitDbProvider"
+                 provider="System.Data.SqlClient"
+                 connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Debits;User ID=springqa; Password=springqa"/&gt;
+
+
+  &lt;db:provider id="CreditDbProvider"
+                 provider="System.Data.SqlClient"
+                 connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Credits;User ID=springqa; Password=springqa"/&gt;
+                  
+ 
+  &lt;!-- Transaction Manager if using two databases, one containing the credit table and the other a debit table --&gt;
+
+  &lt;object id="transactionManager"
+          type="Spring.Data.Core.TxScopeTransactionManager, Spring.Data"&gt;
+  &lt;/object&gt;
+
+  
+  &lt;!-- Transaction aspect --&gt;
+  &lt;tx:attribute-driven/&gt;
+
+&lt;/objects&gt;</programlisting>
+
+    <para>TxScopeTransactionManager uses .NET 2.0 System.Transactions as the
+    implementation, allowing for distributed transactions between the two
+    different databases listed. In a larger application the different layers
+    would typically be broken up into individual configuration files and
+    imported into the main configuration file. This allows your configuration
+    to mirror your architecture.</para>
+
+    <para>You can also use the configuration file
+    system-test-dtc-es-config.xml that will use EnterpriseServices to perform
+    transaction management.</para>
+
+    <section>
+      <title>Rollback Rules</title>
+
+      <para>Using Rollback rules allows you to specify which exceptions will
+      not cause a rollback and instead only stop execution flow, committing
+      the work done up to the exception. An alternative implementation of
+      AccountManager's DoTransfer method (included in the sample code) is
+      shown below.</para>
+
+      <programlisting>        [Transaction(NoRollbackFor = new Type[] { typeof(ArithmeticException) })]
+        public void DoTransfer(float creditAmount, float debitAmount)
+        {
+            accountCreditDao.CreateCredit(creditAmount);
+
+            if (creditAmount &gt; maxTransferAmount || debitAmount &gt; maxTransferAmount)
+            {
+                throw new ArithmeticException("see a teller big spender...");
+            }                     
+         
+            accountDebitDao.DebitAccount(debitAmount);
+        }  </programlisting>
+
+      <para>All that has changed is the use of the NoRollbackFor property on
+      the transaction attribute.</para>
+
+      <para>The expected behavior is that the credit table will be updated
+      even though the exception is thrown. This is due to specifying that
+      exceptions of the type ArithmethicException should not rollback the
+      database transaction. Running the test code below verifies that the
+      exception still propagates out of the method.</para>
+
+      <programlisting>        [Test]   
+        public void DeclarativeWithAttributesNoRollbackFor()
+        {
+            try
+            {
+                accountManager.DoTransfer(2000000, 2000000);
+                Assert.Fail("Should have thrown Arithmetic Exception");
+            } catch (ArithmeticException) {
+                int numCreditRecords = (int)adoTemplateCredit.ExecuteScalar(CommandType.Text, "select count(*) from Credits");
+                int numDebitRecords = (int)adoTemplateDebit.ExecuteScalar(CommandType.Text, "select count(*) from Debits");
+                Assert.AreEqual(1, numCreditRecords);
+                Assert.AreEqual(0, numDebitRecords);
+            }
+        }</programlisting>
+    </section>
+  </section>
+
+  <section>
+    <title>Adding additional Aspects</title>
+
+    <para>Transactional advice is just one type of advice that can be applied
+    to the service layer. You can also configure other pieces of advice to be
+    executed as part of the general advice chain that is associated with
+    methods that have the Transaction attribute applied. In this example we
+    will add logging of thrown exceptions using Spring's
+    ExceptionHandlerAdvice as well as logging of the service layer method
+    invocation. No code is required to be changed in order to have this
+    additional functionality. Instead all you have to do is uncomment the
+    line</para>
+
+    <programlisting>  &lt;import resource="assembly://Spring.TxQuickStart.Tests/Spring.TxQuickStart/aspects-config.xml"/&gt;</programlisting>
+
+    <para>in either system-test-dtc-config.xml or system-test-local-config.xml
+    The aspect configuration file is shown below</para>
+
+    <programlisting>&lt;objects xmlns='http://www.springframework.net'
+         xmlns:aop="http://www.springframework.net/aop"&gt;
+
+
+
+  &lt;object name="exceptionAdvice" type="Spring.Aspects.Exceptions.ExceptionHandlerAdvice, Spring.Aop"&gt;
+    &lt;property name="exceptionHandlers"&gt;
+      &lt;list&gt;
+        &lt;value&gt;on exception name ArithmeticException log 'Logging an exception thrown from method ' + #method.Name &lt;/value&gt;
+      &lt;/list&gt;
+    &lt;/property&gt;
+  &lt;/object&gt;
+
+  &lt;object name="loggingAdvice" type="Spring.Aspects.Logging.SimpleLoggingAdvice, Spring.Aop"&gt;
+    &lt;property name="logUniqueIdentifier" value="true"/&gt;
+    &lt;property name="logExecutionTime"    value="true"/&gt;
+    &lt;property name="logMethodArguments"  value="true"/&gt;
+    &lt;property name="Separator"           value=";"/&gt;
+
+    &lt;property name="HideProxyTypeNames"  value="true"/&gt;
+    &lt;property name="UseDynamicLogger"    value="true"/&gt;
+
+    &lt;property name="LogLevel"            value="Info"/&gt;
+  &lt;/object&gt;
+
+
+  &lt;object id="txAttributePointcut" type="Spring.Aop.Support.AttributeMatchMethodPointcut, Spring.Aop"&gt;
+    &lt;property name="Attribute" value="Spring.Transaction.Interceptor.TransactionAttribute, Spring.Data"/&gt;
+  &lt;/object&gt;
+
+  &lt;aop:config&gt;
+
+    &lt;aop:advisor id="exceptionProcessAdvisor" order="1"
+               advice-ref="exceptionAdvice"
+               pointcut-ref="txAttributePointcut"/&gt;
+
+    &lt;aop:advisor id="loggingAdvisor" order="2"
+                 advice-ref="loggingAdvice"
+                 pointcut-ref="txAttributePointcut"/&gt;
+
+  &lt;/aop:config&gt;
+  
+&lt;/objects&gt;</programlisting>
+
+    <para>The transaction aspect is now additionally configured with an order
+    value of "10", which will place it after the execution of the exception
+    aspect, which is configured to use an order value of 1. The behavior for
+    logging the exception is specified by creating and configuring an instance
+    of
+    <classname>Spring.Aspects.Exceptions.ExceptionHandlerAdvice</classname>.
+    The location where that behavior is applied, the pointcut, is the
+    Transaction attribute. The logging of method arguments and execution time
+    is specified by configuring an instance of
+    <classname>Spring.Aspects.Logging.SimpleLoggingAdvice</classname>.</para>
+
+    <para>The AOP configuration section on the bottom is what ties together
+    the behavior and where it will take place in the program flow. Under the
+    covers the transaction configuration, &lt;tx:attribute-driven/&gt; creates
+    similar advice and pointcut definitions. Running the test
+    TransferBelowMaxAmount will then log the following messages</para>
+
+    <programlisting>INFO  - Entering DoTransfer;45b6af04-b736-4efa-a489-45462726ddf2;creditAmount=217; debitAmount=217
+INFO  - Exiting DoTransfer;45b6af04-b736-4efa-a489-45462726ddf2;1328.125 ms;return=
+</programlisting>
+
+    <para>When the test case of the test TransferAboveMaxAmount is run the
+    following messages are logged</para>
+
+    <programlisting>INFO  - Entering DoTransfer;d94bc81b-a4ff-4ca1-9aaa-f2834f262307;creditAmount=2000000; debitAmount=200000
+INFO  - Exception thrown in DoTransferDoTransfer;d94bc81b-a4ff-4ca1-9aaa-f2834f262307;1140.625
+System.ArithmeticException: see a teller big spender...
+   at Spring.TxQuickStart.Services.AccountManager.DoTransfer(Single creditAmount, Single debitAmount) in L:\projects\Spring.Net\examples\Spring\Spring.TxQuickStart\src\Spring\Spring.TxQuickStart\TxQuickStart\Services\AccountManager.cs:line 36
+   at Spring.DynamicReflection.Method_DoTransfer_ec48557f22b149958fd2243413136600.Invoke(Object target, Object[] args)
+   at Spring.Reflection.Dynamic.SafeMethod.Invoke(Object target, Object[] arguments) in l:\projects\Spring.Net\src\Spring\Spring.Core\Reflection\Dynamic\DynamicMethod.cs:line 108
+   at Spring.Aop.Framework.DynamicMethodInvocation.InvokeJoinpoint() in l:\projects\Spring.Net\src\Spring\Spring.Aop\Aop\Framework\DynamicMethodInvocation.cs:line 89
+   at Spring.Aop.Framework.AbstractMethodInvocation.Proceed() in l:\projects\Spring.Net\src\Spring\Spring.Aop\Aop\Framework\AbstractMethodInvocation.cs:line 257
+   at Spring.Transaction.Interceptor.TransactionInterceptor.Invoke(IMethodInvocation invocation) in l:\projects\Spring.Net\src\Spring\Spring.Data\Transaction\Interceptor\TransactionInterceptor.cs:line 80
+   at Spring.Aop.Framework.AbstractMethodInvocation.Proceed() in l:\projects\Spring.Net\src\Spring\Spring.Aop\Aop\Framework\AbstractMethodInvocation.cs:line 282
+   at Spring.Aspects.Logging.SimpleLoggingAdvice.InvokeUnderLog(IMethodInvocation invocation, ILog log) in l:\projects\Spring.Net\src\Spring\Spring.Aop\Aspects\Logging\SimpleLoggingAdvice.cs:line 185
+TRACE - Logging an exception thrown from method DoTransfer
+</programlisting>
+
+    <para></para>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/validation.xml b/doc/reference/src/validation.xml
new file mode 100644
index 00000000..acd957b6
--- /dev/null
+++ b/doc/reference/src/validation.xml
@@ -0,0 +1,866 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="validation">
+  <title id="val-title">Validation Framework</title>
+
+  <section>
+    <title>Introduction</title>
+
+    <para>Data validation is a very important part of any enterprise
+    application. ASP.NET has a validation framework but it is very limited in
+    scope and starts falling apart as soon as you need to perform more complex
+    validations. Problems with the out of the box ASP.NET validation framework
+    are well <ulink
+    url="http://www.peterblum.com/VAM/ValMain.aspx">documented</ulink> by
+    Peter Blum on his web site, so we are not going to repeat them here. Peter
+    has also built a nice replacement for the standard ASP.NET validation
+    framework, which is worth looking into if you prefer the standard ASP.NET
+    validation mechanism to the one offered by Spring.NET for some reason.
+    Both frameworks will allow you to perform very complex validations but we
+    designed the Spring.NET validation framework differently for the reasons
+    described below.</para>
+
+    <para>On the Windows Forms side the situation is even worse. Out of the
+    box data validation features are completely inadequate as pointed out by
+    Ian Griffiths in this <ulink
+    url="http://pluralsight.com/wiki/default.aspx/Craig/WinFormsValidationBroken.html">article</ulink>.
+    One of the major problems we saw in most validation frameworks available
+    today, both open source and commercial, is that they are tied to a
+    specific presentation technology. The ASP.NET validation framework uses
+    ASP.NET controls to define validation rules, so these rules end up in the
+    HTML markup of your pages. Peter Blum's framework uses the same approach.
+    In our opinion, validation is not applicable only to the presentation
+    layer so there is no reason to tie it to any particular technology. As
+    such, the Spring.NET Validation Framework is designed in a way that
+    enables data validation in different application layers using the same
+    validation rules.</para>
+
+    <para>The goals of the validation framework are the following:</para>
+
+    <orderedlist>
+      <listitem>
+        <para>Allow for the validation of any object, whether it is a UI
+        control or a domain object.</para>
+      </listitem>
+
+      <listitem>
+        <para>Allow the same validation framework to be used in both Windows
+        Forms and ASP.NET applications, as well as in the service layer (to
+        validate parameters passed to the service, for example).</para>
+      </listitem>
+
+      <listitem>
+        <para>Allow composition of the validation rules so arbitrarily complex
+        validation rule sets can be constructed.</para>
+      </listitem>
+
+      <listitem>
+        <para>Allow validators to be conditional so they only execute if a
+        specific condition is met.</para>
+      </listitem>
+    </orderedlist>
+
+    <para>The following sections will describe in more detail how these goals
+    were achieved and show you how to use the Spring.NET Validation Framework
+    in your applications.</para>
+  </section>
+
+  <section>
+    <title>Example Usage</title>
+
+    <para>Decoupling validation from presentation was the major goal that
+    significantly influenced design of the validation framework. We wanted to
+    be able to define a set of validation rules that are completely
+    independent from the presentation so we can reuse them (or at least have
+    the ability to reuse them) in different application layers. This meant
+    that the approach taken by Microsoft ASP.NET team would not work and
+    custom validation controls were not an option. The approach taken was to
+    configure validation rules just like any other object managed by Spring -
+    within the application context. However, due to possible complexity of the
+    validation rules we decided not to use the standard Spring.NET
+    configuration schema for validator definitions but to instead provide a
+    more specific and easier to use custom configuration schema for
+    validation. Note that the validation framework is not tied to the use of
+    XML, you can use its API Programatically. The following example shows
+    validation rules defined for the Trip object in the SpringAir sample
+    application:</para>
+
+    <para><programlisting>&lt;objects xmlns="http://www.springframework.net" xmlns:v="http://www.springframework.net/validation"&gt;
+
+  &lt;object type="TripForm.aspx" parent="standardPage"&gt;
+     &lt;property name="TripValidator" ref="tripValidator" /&gt;
+  &lt;/object&gt;
+
+  &lt;v:group id="tripValidator"&gt;
+
+     &lt;v:required id="departureAirportValidator" test="StartingFrom.AirportCode"&gt;
+        &lt;v:message id="error.departureAirport.required" providers="departureAirportErrors, validationSummary"/&gt;
+     &lt;/v:required&gt;
+
+     &lt;v:group id="destinationAirportValidator"&gt;
+        &lt;v:required test="ReturningFrom.AirportCode"&gt;
+           &lt;v:message id="error.destinationAirport.required" providers="destinationAirportErrors, validationSummary"/&gt;
+        &lt;/v:required&gt;
+        &lt;v:condition test="ReturningFrom.AirportCode != StartingFrom.AirportCode" when="ReturningFrom.AirportCode != ''"&gt;
+           &lt;v:message id="error.destinationAirport.sameAsDeparture" providers="destinationAirportErrors, validationSummary"/&gt;
+        &lt;/v:condition&gt;
+     &lt;/v:group&gt;
+
+     &lt;v:group id="departureDateValidator"&gt;
+        &lt;v:required test="StartingFrom.Date"&gt;
+           &lt;v:message id="error.departureDate.required" providers="departureDateErrors, validationSummary"/&gt;
+        &lt;/v:required&gt;
+        &lt;v:condition test="StartingFrom.Date &gt;= DateTime.Today" when="StartingFrom.Date != DateTime.MinValue"&gt;
+           &lt;v:message id="error.departureDate.inThePast" providers="departureDateErrors, validationSummary"/&gt;
+        &lt;/v:condition&gt;
+     &lt;/v:group&gt;
+
+     &lt;v:group id="returnDateValidator" when="Mode == 'RoundTrip'"&gt;
+        &lt;v:required test="ReturningFrom.Date"&gt;
+           &lt;v:message id="error.returnDate.required" providers="returnDateErrors, validationSummary"/&gt;
+        &lt;/v:required&gt;
+        &lt;v:condition test="ReturningFrom.Date &gt;= StartingFrom.Date" when="ReturningFrom.Date != DateTime.MinValue"&gt;
+           &lt;v:message id="error.returnDate.beforeDeparture" providers="returnDateErrors, validationSummary"/&gt;
+        &lt;/v:condition&gt;
+     &lt;/v:group&gt;
+
+  &lt;/v:group&gt;
+
+&lt;/objects&gt;</programlisting>There are a few things to note in the example
+    above:<itemizedlist>
+        <listitem>
+          <para>You need to reference the validation schema by adding a
+          <literal>xmlns:v="http://www.springframework.net/validation"</literal>
+          namespace declaration to the root element.</para>
+        </listitem>
+
+        <listitem>
+          <para>You can mix standard object definitions and validator
+          definitions in the same configuration file as long as both schemas
+          are referenced.</para>
+        </listitem>
+
+        <listitem>
+          <para>The Validator defined in the configuration file is identified
+          by and id attribute and can be referenced in the standard Spring
+          way, i.e. the injection of tripValidator into TripForm.aspx page
+          definition in the first &lt;object&gt; tag above.</para>
+        </listitem>
+
+        <listitem>
+          <para>The validation framework uses Spring's powerful expression
+          evaluation engine to evaluate both validation rules and
+          applicability conditions for the validator. As such, any valid
+          Spring expression can be specified within the test and when
+          attributes of any validator.</para>
+        </listitem>
+      </itemizedlist></para>
+
+    <para>The example above shows many of the features of the framework, so
+    let's discuss them one by one in the following sections.</para>
+  </section>
+
+  <section>
+    <title>Validator Groups</title>
+
+    <para>Validators can be grouped together. This is important for many
+    reasons but the most typical usage scenario is to group multiple
+    validation rules that apply to the same value. In the example above there
+    is a validator group for almost every property of the Trip instance. There
+    is also a top-level group for the Trip object itself that groups all other
+    validators.</para>
+
+    <para>There are three types of validator groups each with a different
+    behavior:</para>
+
+    <para>While the first type (AND) is definitely the most useful, the other
+    two allow you to implement some specific validation scenarios in a very
+    simple way, so you should keep them in mind when designing your validation
+    rules.</para>
+
+    <table>
+      <title>Validator Groups</title>
+
+      <tgroup cols="3">
+        <colspec align="left" colname="c1" colwidth="1*" />
+
+        <colspec colname="c2" colwidth="5*" />
+
+        <colspec colname="c3" colwidth="18*" />
+
+        <thead>
+          <row>
+            <entry>Type</entry>
+
+            <entry>XML Tag</entry>
+
+            <entry>Behavior</entry>
+          </row>
+        </thead>
+
+        <tbody>
+          <row>
+            <entry>AND</entry>
+
+            <entry><literal>group</literal></entry>
+
+            <entry>Returns <emphasis role="bold"><emphasis
+            role="bold"><emphasis>true</emphasis></emphasis></emphasis> only
+            if all contained validators return <emphasis
+            role="bold"><emphasis>true</emphasis></emphasis>. This is the most
+            commonly used validator group.</entry>
+          </row>
+
+          <row>
+            <entry>OR</entry>
+
+            <entry><literal>any</literal></entry>
+
+            <entry>Returns <emphasis
+            role="bold"><emphasis>true</emphasis></emphasis> if one or more of
+            the contained validators return <emphasis
+            role="bold"><emphasis>true</emphasis></emphasis>.</entry>
+          </row>
+
+          <row>
+            <entry>XOR</entry>
+
+            <entry><literal>exclusive</literal></entry>
+
+            <entry>Returns true if only one of the contained validators return
+            true.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+    <para>One thing to remember is that a validator group is a validator like
+    any other and can be used anywhere validator is expected. You can nest
+    groups within other groups and reference them using validator reference
+    syntax (described later), so they really allow you to structure your
+    validation rules in the most reusable way.</para>
+  </section>
+
+  <section>
+    <title>Validators</title>
+
+    <para>Ultimately, you will have one or more validator definitions for each
+    piece of data that you want to validate. Spring.NET has several built-in
+    validators that are sufficient for most validations, even fairly complex
+    ones. The framework is extensible so you can write your own custom
+    validators and use them in the same way as the built-in ones.</para>
+
+    <section>
+      <title>Condition Validator</title>
+
+      <para>The condition validator evaluates any logical expression that is
+      supported by Spring's evaluation engine. The syntax is</para>
+
+      <programlisting>&lt;v:<emphasis role="bold">condition</emphasis> id="id" test="testCondition" when="applicabilityCondition" parent="parentValidator"&gt;
+  actions
+&lt;/v:<emphasis role="bold">condition</emphasis>&gt;</programlisting>
+
+      <para>An example is shown below</para>
+
+      <programlisting>&lt;v:condition test="StartingFrom.Date &gt;= DateTime.Today" when="StartingFrom.Date != DateTime.MinValue"&gt;
+   &lt;v:message id="error.departureDate.inThePast" providers="departureDateErrors, validationSummary"/&gt;
+&lt;/v:condition&gt;</programlisting>
+
+      <para>In this example the StartingFrom property of the Trip object is
+      compared to see if it is later than the current date, i.e. DateTime but
+      only when the date has been set (the initial value of StartingFrom.Date
+      was set to DateTime.MinValue).</para>
+
+      <para>The condition validator could be considered "the mother of all
+      validators". You can use it to achieve almost anything that can be
+      achieved by using other validator types, but in some cases the test
+      expression might be very complex, which is why you should use more
+      specific validator type if possible. However, condition validator is
+      still your best bet if you need to check whether particular value
+      belongs to a particular range, or perform a similar test, as those
+      conditions are fairly easy to write.</para>
+
+      <para><note>
+          <para>Keep in mind that Spring.NET Validation Framework typically
+          works with domain objects. This is after data binding from the
+          controls has been performed so that the object being validated is
+          strongly typed. This means that you can easily compare numbers and
+          dates without having to worry if the string representation is
+          comparable.</para>
+        </note></para>
+    </section>
+
+    <section>
+      <title>Required Validator</title>
+
+      <para>This validator ensures that the specified test value is not empty.
+      The syntax is</para>
+
+      <programlisting>&lt;v:<emphasis role="bold">required</emphasis> id="id" test="requiredValue" when="applicabilityCondition" parent="parentValidator"&gt;
+  actions
+&lt;/v:<emphasis role="bold">required</emphasis>&gt;</programlisting>
+
+      <para>An example is shown below</para>
+
+      <programlisting>&lt;v:required test="ReturningFrom.AirportCode"&gt;
+   &lt;v:message id="error.destinationAirport.required" providers="destinationAirportErrors, validationSummary"/&gt;
+&lt;/v:required&gt;</programlisting>
+
+      <para>The specific tests done to determine if the required value is set
+      is listed below</para>
+
+      <table>
+        <title>Rules to determine if required value is valid</title>
+
+        <tgroup cols="2">
+          <colspec align="center" />
+
+          <thead>
+            <row>
+              <entry>System.Type</entry>
+
+              <entry>Test</entry>
+            </row>
+          </thead>
+
+          <tbody>
+            <row>
+              <entry>System.Type</entry>
+
+              <entry>Type exists</entry>
+            </row>
+
+            <row>
+              <entry>System.String</entry>
+
+              <entry>not null or an empty string</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <para></para>
+
+      <para>Required validator is also one of the most commonly used ones, and
+      it is much more powerful than the ASP.NET Required validator, because it
+      works with many other data types other than strings. For example, it
+      will allow you to validate <literal>DateTime</literal> instances (both
+      <literal>MinValue</literal> and <literal>MaxValue</literal> return
+      <literal>false</literal>), integer and decimal numbers, as well as any
+      reference type, in which case it returns <literal>true</literal> for a
+      non-null value and <literal>false</literal> for
+      <literal>{{null}}</literal>s.</para>
+
+      <para>The test attribute for the required validator will typically
+      specify an expression that resolves to a property of a domain object,
+      but it could be any valid expression that returns a value, including a
+      method call.</para>
+    </section>
+
+    <section>
+      <title>Regular Expression Validator</title>
+
+      <para>The syntax is</para>
+
+      <programlisting>&lt;v:<emphasis role="bold">regex</emphasis> id="id" test="valueToEvaluate" when="applicabilityCondition" parent="parentValidator"&gt;
+  &lt;<emphasis role="bold">v:property name="Expression" value="regularExpressionToMatch"</emphasis>/&gt;
+  &lt;v:property name="Options" value="regexOptions"/&gt;
+  actions
+&lt;/v:<emphasis role="bold">regex</emphasis>&gt;</programlisting>
+
+      <para>An example is shown below</para>
+
+      <programlisting>&lt;v:regex test="ReturningFrom.AirportCode"&gt;
+   &lt;v:property name="Expression" value="[A-Z][A-Z][A-Z]"/&gt;
+   &lt;v:message id="error.destinationAirport.threeCharacters" providers="destinationAirportErrors, validationSummary"/&gt;
+&lt;/v:regex&gt;</programlisting>
+
+      <para>Regular expression validator is very useful when validating values
+      that need to conform to some predefined format, such as telephone
+      numbers, email addresses, URLs, etc.</para>
+
+      <para>One major difference of the regular expression validator compared
+      to other built-in validator types is that you need to set a required
+      <literal>Expression</literal> property to a regular expression to match
+      against.</para>
+    </section>
+
+    <section>
+      <title>Generic Validator</title>
+
+      <para>The syntax is</para>
+
+      <programlisting>&lt;v:<emphasis role="bold">validator</emphasis> id="id" test="requiredValue" when="applicabilityCondition" type="validatorType" parent="parentValidator"&gt;
+  actions
+&lt;/v:<emphasis role="bold">validator</emphasis>&gt;</programlisting>
+
+      <para>An example is shown below</para>
+
+      <programlisting>&lt;v:validator test="ReturningFrom.AirportCode" type="MyNamespace.MyAirportCodeValidator, MyAssembly"&gt;
+   &lt;v:message id="error.destinationAirport.invalid" providers="destinationAirportErrors, validationSummary"/&gt;
+&lt;/v:required&gt;</programlisting>
+
+      <para>Generic validator allows you to plug in your custom validator by
+      specifying its type name. Custom validators are very simple to
+      implement, because all you need to do is extend
+      <literal>BaseValidator</literal> class and implement abstract
+      <literal>bool Validate(object objectToValidate)</literal> method. Your
+      implementation simply needs to return <literal>true</literal> if it
+      determines that object is valid, or <literal>false</literal>
+      otherwise</para>
+    </section>
+
+    <section>
+      <title>Conditional Validator Execution</title>
+
+      <para>As you can see from the examples above, each validator (and
+      validator group) allows you to define its applicability condition by
+      specifying a logical expression as the value of the when attribute. This
+      feature is very useful and is one of the major deficiencies in the
+      standard ASP.NET validation framework, because in many cases specific
+      validators need to be turned on or off based on the values of the object
+      being validated.</para>
+
+      <para>For example, when validating a Trip object we need to validate
+      return date only if the Trip.Mode property is set to the
+      TripMode.RoundTrip enum value. In order to achieve that we created
+      following validator definition:</para>
+
+      <programlisting>&lt;v:group id="returnDateValidator" when="Mode == 'RoundTrip'"&gt;
+      // nested validators
+&lt;/v:group&gt;</programlisting>
+
+      <para>Validators within this group will only be evaluated for round
+      trips.</para>
+
+      <note>
+        <para>You should also note that you can compare enums using the string
+        value of the enumeration. You can also use fully qualified enum name,
+        such as:</para>
+
+        <para><literal>Mode == TripMode.RoundTrip</literal></para>
+
+        <para>However, in this case you need to make sure that alias for the
+        TripMode enum type is registered using Spring's standard type aliasing
+        mechanism.</para>
+      </note>
+    </section>
+  </section>
+
+  <section>
+    <title>Validator Actions</title>
+
+    <para>Validation actions are executed every time the containing validator
+    is executed. They allow you to do anything you want based on the result of
+    the validation. By far the most common use of the validation action is to
+    add validation error message to the errors collection, but theoretically
+    you could do anything you want. Because adding validation error messages
+    to the errors collection is such a common scenario, Spring.NET validation
+    schema defines a separate XML tag for this type of validation
+    action.</para>
+
+    <section>
+      <title>Error Message Action</title>
+
+      <para>The syntax is</para>
+
+      <programlisting>&lt;v:message id="messageId" providers="errorProviderList" when="messageApplicabilityCondition"&gt;
+  &lt;v:param value="paramExpression"/&gt;
+&lt;/v:message&gt;</programlisting>
+
+      <para>An example is shown below</para>
+
+      <programlisting>&lt;v:message id="error.departureDate.inThePast" providers="departureDateErrors, validationSummary"&gt;
+   &lt;v:param value="StartingFrom.Date.ToString('D')"/&gt;
+   &lt;v:param value="DateTime.Today.ToString('D')"/&gt;
+&lt;/v:message&gt;</programlisting>
+
+      <para>There are several things that you have to be aware of when dealing
+      with error messages:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><literal>id</literal> is used to look up the error message in
+          the appropriate Spring.NET message source.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>providers</literal> specifies a comma separated list
+          of "error buckets" particular error message should be added to.
+          These "buckets" will later be used by the particular presentation
+          technology in order to display error messages as necessary.</para>
+        </listitem>
+
+        <listitem>
+          <para>a message can have zero or more parameters. Each parameter is
+          an expression that will be resolved using current validation context
+          and the resolved values will be passed as parameters to
+          <literal>IMessageSource.GetMessage</literal> method, which will
+          return the fully resolved message.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section>
+      <title>Generic Actions</title>
+
+      <para>The syntax is</para>
+
+      <programlisting>&lt;v:action type="actionType" when="actionApplicabilityCondition"&gt;
+  properties
+&lt;/v:action&gt;</programlisting>
+
+      <para>An example is shown below</para>
+
+      <programlisting>&lt;v:action type="Spring.Validation.Actions.ExpressionAction, Spring.Core" when="#page != null"&gt;
+   &lt;v:property name="Valid" value="#page.myPanel.Visible = true"/&gt;
+   &lt;v:property name="Invalid" value="#page.myPanel.Visible = false"/&gt;
+&lt;/v:action&gt;</programlisting>
+
+      <para>Generic actions can be used to perform all kinds of validation
+      actions. In simple cases, such as in the example above where we turn
+      control's visibility on or off depending on the validation result, you
+      can use the built-in <literal>ExpressionAction</literal> class and
+      simply specify expressions to be evaluated based on the validator
+      result.</para>
+
+      <para>In other situations you may want to create your own action
+      implementation, which is fairly simple thing to do – all you need to do
+      is implement <literal>IValidationAction</literal> interface:</para>
+
+      <programlisting>public interface IValidationAction
+{
+    /// &lt;summary&gt;
+    /// Executes the action.
+    /// &lt;/summary&gt;
+    /// &lt;param name="isValid"&gt;Whether associated validator is valid or not.&lt;/param&gt;
+    /// &lt;param name="validationContext"&gt;Validation context.&lt;/param&gt;
+    /// &lt;param name="contextParams"&gt;Additional context parameters.&lt;/param&gt;
+    /// &lt;param name="errors"&gt;Validation errors container.&lt;/param&gt;
+    void Execute(bool isValid, object validationContext, IDictionary contextParams, ValidationErrors errors);
+}</programlisting>
+    </section>
+  </section>
+
+  <section>
+    <title>Validator References</title>
+
+    <para>Sometimes it is not possible (or desirable) to nest all the
+    validation rules within a single top-level validator group. For example,
+    if you have an object graph where both ObjectA and ObjectB have a
+    reference to ObjectC, you might want to set up validation rules for
+    ObjectC only once and reference them from the validation rules for both
+    ObjectA and ObjectB, instead of duplicating them within both
+    definitions.</para>
+
+    <para>The syntax is shown below</para>
+
+    <programlisting>&lt;v:ref name="referencedValidatorId" context="validationContextForTheReferencedValidator"/&gt;</programlisting>
+
+    <para>An example is shown below</para>
+
+    <programlisting>&lt;v:group id="objectA.validator"&gt;
+   &lt;v:ref name="objectC.validator" context="MyObjectC"/&gt;
+   // other validators for ObjectA
+&lt;/v:group&gt;
+
+&lt;v:group id="objectB.validator"&gt;
+   &lt;v:ref name="objectC.validator" context="ObjectCProperty"/&gt;
+   // other validators for ObjectB
+&lt;/v:group&gt;
+
+&lt;v:group id="objectC.Validator"&gt;
+   // validators for ObjectC
+&lt;/v:group&gt;</programlisting>
+
+    <para>It is as simple as that — you define validation rules for ObjectC
+    separately and reference them from within other validation groups.
+    Important thing to realize that in most cases you will also want to
+    "narrow" the context for the referenced validator, typically by specifying
+    the name of the property that holds referenced object. In the example
+    above, ObjectA.MyObjectC and ObjectB.ObjectCProperty are both of type
+    ObjectC, which objectC.validator expects to receive as the validation
+    context.</para>
+  </section>
+
+  <section>
+    <title>Progammatic usage</title>
+
+    <para>You can also create Validators programmatically using the API. An
+    example is shown below</para>
+
+    <programlisting>UserInfo userInfo = new UserInfo();  // has Name and Password props
+
+ValidatorGroup userInfoValidator = new ValidatorGroup();
+
+userInfoValidator.Validators
+                 .Add(new RequiredValidator("Name", null));
+
+userInfoValidator.Validators
+                 .Add(new RequiredValidator("Password", null));
+
+ValidationErrors errors = new ValidationErrors();
+bool userInfoIsValid = userInfoValidator.Validate(userInfo, errors);
+</programlisting>
+
+    <para>No matter if you create your validators programmatically or
+    declaratively, you can invoke them in service side code via the 'Validate'
+    method shown above and then handle error conditions. Spring provides AOP
+    parameter validation advice as part of ithe <link
+    linkend="aop-aspect-library">aspect library</link> which may also be
+    useful for performing server-side validation.</para>
+  </section>
+
+  <section id="validation-aspnet-usage">
+    <title>Usage tips within ASP.NET</title>
+
+    <para>Now that you know how to configure validation rules, let's see what
+    it takes to evaluate those rules within your typical ASP.NET application
+    and to display error messages.</para>
+
+    <para>The first thing you need to do is inject validators you want to use
+    into your ASP.NET page, as shown in the example below:</para>
+
+    <programlisting>&lt;objects xmlns="http://www.springframework.net" xmlns:v="http://www.springframework.net/validation"&gt;
+
+  &lt;object type="TripForm.aspx" parent="standardPage"&gt;
+     &lt;property name="TripValidator" ref="tripValidator" /&gt;
+  &lt;/object&gt;
+
+  &lt;v:group id="tripValidator"&gt;
+     // our validation rules
+  &lt;/v:group&gt;
+
+&lt;/objects&gt;</programlisting>
+
+    <para>Once that's done, you need to perform validation in one or more of
+    the page event handlers, which typically looks similar to this:</para>
+
+    <programlisting>public void SearchForFlights(object sender, EventArgs e)
+{
+    if (Validate(Controller.Trip, tripValidator))
+    {
+        Process.SetView(Controller.SearchForFlights());
+    }
+}</programlisting>
+
+    <note>
+      <para>Keep in mind that your ASP.NET page needs to extend
+      Spring.Web.UI.Page in order for the code above to work.</para>
+    </note>
+
+    <para>Finally, you need to define where validation errors should be
+    displayed by adding one or more
+    <literal>&lt;spring:validationError/&gt;</literal> and
+    <literal>&lt;spring:validationSummary/&gt;</literal> controls to the
+    ASP.NET form:</para>
+
+    <programlisting>&lt;%@ Page Language="c#" MasterPageFile="~/Web/StandardTemplate.master" Inherits="TripForm" CodeFile="TripForm.aspx.cs" %&gt;
+&lt;%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %&gt;
+
+&lt;asp:Content ID="head" ContentPlaceHolderID="head" runat="server"&gt;
+
+    &lt;script language="javascript" type="text/javascript"&gt;
+      &lt;!--
+      function showReturnCalendar(isVisible)
+      {
+          document.getElementById('&lt;%= returningOnDate.ClientID %&gt;').style.visibility = isVisible? '': 'hidden';
+          document.getElementById('returningOnCalendar').style.visibility = isVisible? '': 'hidden';
+      }
+      --&gt;
+    &lt;/script&gt;
+
+&lt;/asp:Content&gt;
+
+&lt;asp:Content ID="body" ContentPlaceHolderID="body" runat="server"&gt;
+    &lt;div style="text-align: center"&gt;
+        &lt;h4&gt;&lt;asp:Label ID="caption" runat="server"&gt;&lt;/asp:Label&gt;&lt;/h4&gt;
+        <emphasis role="bold">&lt;spring:ValidationSummary ID="validationSummary" runat="server" /&gt;</emphasis>
+        &lt;table&gt;
+            &lt;tr class="formLabel"&gt;
+                &lt;td&gt;&amp;nbsp;&lt;/td&gt;
+                &lt;td colspan="3"&gt;
+                    &lt;spring:RadioButtonGroup ID="tripMode" runat="server"&gt;
+                        &lt;asp:RadioButton ID="OneWay" onclick="showReturnCalendar(false);" runat="server" /&gt;
+                        &lt;asp:RadioButton ID="RoundTrip" onclick="showReturnCalendar(true);" runat="server" /&gt;
+                    &lt;/spring:RadioButtonGroup&gt;
+                &lt;/td&gt;
+            &lt;/tr&gt;
+            &lt;tr&gt;
+                &lt;td class="formLabel" align="right"&gt;
+                    &lt;asp:Label ID="leavingFrom" runat="server" /&gt;&lt;/td&gt;
+                &lt;td nowrap="nowrap"&gt;
+                    &lt;asp:DropDownList ID="leavingFromAirportCode" AutoCallBack="true" runat="server" /&gt;
+                    <emphasis role="bold">&lt;spring:ValidationError id="departureAirportErrors" runat="server" /&gt;</emphasis>
+                &lt;/td&gt;
+                &lt;td class="formLabel" align="right"&gt;
+                    &lt;asp:Label ID="goingTo" runat="server" /&gt;&lt;/td&gt;
+                &lt;td nowrap="nowrap"&gt;
+                    &lt;asp:DropDownList ID="goingToAirportCode" AutoCallBack="true" runat="server" /&gt;
+                    <emphasis role="bold">&lt;spring:ValidationError id="destinationAirportErrors" runat="server" /&gt;</emphasis>
+                &lt;/td&gt;
+            &lt;/tr&gt;
+            &lt;tr&gt;
+                &lt;td class="formLabel" align="right"&gt;
+                    &lt;asp:Label ID="leavingOn" runat="server" /&gt;&lt;/td&gt;
+                &lt;td nowrap="nowrap"&gt;
+                    &lt;spring:Calendar ID="leavingFromDate" runat="server" Width="75px" AllowEditing="true" Skin="system" /&gt;
+                    <emphasis role="bold">&lt;spring:ValidationError id="departureDateErrors" runat="server" /&gt;</emphasis>
+                &lt;/td&gt;
+                &lt;td class="formLabel" align="right"&gt;
+                    &lt;asp:Label ID="returningOn" runat="server" /&gt;&lt;/td&gt;
+                &lt;td nowrap="nowrap"&gt;
+                    &lt;div id="returningOnCalendar"&gt;
+                        &lt;spring:Calendar ID="returningOnDate" runat="server" Width="75px" AllowEditing="true" Skin="system" /&gt;
+                        <emphasis role="bold">&lt;spring:ValidationError id="returnDateErrors" runat="server" /&gt;</emphasis>
+                    &lt;/div&gt;
+                &lt;/td&gt;
+            &lt;/tr&gt;
+            &lt;tr&gt;
+                &lt;td class="buttonBar" colspan="4"&gt;
+                    &lt;br/&gt;
+                    &lt;asp:Button ID="findFlights" runat="server"/&gt;&lt;/td&gt;
+            &lt;/tr&gt;
+        &lt;/table&gt;
+    &lt;/div&gt;
+
+    &lt;script language="javascript" type="text/javascript"&gt;
+          if (document.getElementById('&lt;%= tripMode.ClientID %&gt;').value == 'OneWay')
+              showReturnCalendar(false);
+          else
+              showReturnCalendar(true);
+    &lt;/script&gt;
+
+&lt;/asp:Content&gt;</programlisting>
+
+    <section>
+      <title>Rendering Validation Errors</title>
+
+      <para>Spring.NET allows you to render validation errors within the page
+      in several different ways, and if none of them suits your needs you can
+      implement your own validation errors renderer. Implementations of the
+      <literal>Spring.Web.Validation.IValidationErrorsRenderer</literal> that
+      ship with the framework are:</para>
+
+      <table>
+        <title>Validation Renderers</title>
+
+        <tgroup cols="3">
+          <colspec colname="c1" colwidth="1*" />
+
+          <colspec colname="c2" colwidth="5*" />
+
+          <colspec colname="c3" colwidth="10*" />
+
+          <thead>
+            <row>
+              <entry align="left">Name</entry>
+
+              <entry align="center">Class</entry>
+
+              <entry>Description</entry>
+            </row>
+          </thead>
+
+          <tbody>
+            <row>
+              <entry>Block</entry>
+
+              <entry><literal>Spring.Web.Validation.DivValidationErrorsRenderer
+              </literal></entry>
+
+              <entry>Renders validation errors as list items within a
+              <literal>&lt;div&gt;</literal> tag. Default renderer for
+              <literal>&lt;spring:validationSummary&gt;</literal>
+              control.</entry>
+            </row>
+
+            <row>
+              <entry>Inline</entry>
+
+              <entry><literal>Spring.Web.Validation.SpanValidationErrorsRenderer
+              </literal></entry>
+
+              <entry>Renders validation errors within a
+              <literal>&lt;span&gt;</literal> tag. Default renderer for
+              <literal>&lt;spring:validationError&gt;</literal>
+              control.</entry>
+            </row>
+
+            <row>
+              <entry>Icon</entry>
+
+              <entry><literal>Spring.Web.Validation.IconValidationErrorsRenderer</literal></entry>
+
+              <entry>Renders validation errors as error icon, with error
+              messages displayed in a tooltip. Best option when saving screen
+              real estate is important.</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <para>These three error renderers should be sufficient for most
+      applications, but in case you want to display errors in some other way
+      you can write your own renderer by implementing
+      <literal>Spring.Web.Validation.IValidationErrorsRenderer</literal>
+      interface:</para>
+
+      <programlisting>namespace Spring.Web.Validation
+{
+    /// &lt;summary&gt;
+    /// This interface should be implemented by all validation errors renderers.
+    /// &lt;/summary&gt;
+    /// &lt;remarks&gt;
+    /// &lt;para&gt;
+    /// Validation errors renderers are used to decouple rendering behavior from the
+    /// validation errors controls such as &lt;see cref="ValidationError"/&gt; and
+    /// &lt;see cref="ValidationSummary"/&gt;.
+    /// &lt;/para&gt;
+    /// &lt;para&gt;
+    /// This allows users to change how validation errors are rendered by simply plugging in
+    /// appropriate renderer implementation into the validation errors controls using
+    /// Spring.NET dependency injection.
+    /// &lt;/para&gt;
+    /// &lt;/remarks&gt;
+    public interface IValidationErrorsRenderer
+    {
+        /// &lt;summary&gt;
+        /// Renders validation errors using specified &lt;see cref="HtmlTextWriter"/&gt;.
+        /// &lt;/summary&gt;
+        /// &lt;param name="page"&gt;Web form instance.&lt;/param&gt;
+        /// &lt;param name="writer"&gt;An HTML writer to use.&lt;/param&gt;
+        /// &lt;param name="errors"&gt;The list of validation errors.&lt;/param&gt;
+        void RenderErrors(Page page, HtmlTextWriter writer, IList errors);
+    }
+}</programlisting>
+
+      <section>
+        <title>Configuring which Error Renderer to use.</title>
+
+        <para>The best part of the errors renderer mechanism is that you can
+        easily change it across the application by modifying configuration
+        templates for <literal>&lt;spring:validationSummary&gt;</literal> and
+        <literal>&lt;spring:validationError&gt;</literal> controls:</para>
+
+        <programlisting>&lt;!-- Validation errors renderer configuration --&gt;
+&lt;object id="Spring.Web.UI.Controls.ValidationError" abstract="true"&gt;
+  &lt;property name="Renderer"&gt;
+    &lt;object type="Spring.Web.Validation.IconValidationErrorsRenderer, Spring.Web"&gt;
+      &lt;property name="IconSrc" value="validation-error.gif"/&gt;
+    &lt;/object&gt;
+  &lt;/property&gt;
+&lt;/object&gt;
+
+&lt;object id="Spring.Web.UI.Controls.ValidationSummary" abstract="true"&gt;
+  &lt;property name="Renderer"&gt;
+    &lt;object type="Spring.Web.Validation.DivValidationErrorsRenderer, Spring.Web"&gt;
+      &lt;property name="CssClass" value="validationError"/&gt;
+    &lt;/object&gt;
+  &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+
+        <para>It's as simple as that!</para>
+      </section>
+    </section>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/vsnet.xml b/doc/reference/src/vsnet.xml
new file mode 100644
index 00000000..3d5597d6
--- /dev/null
+++ b/doc/reference/src/vsnet.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="vsnet">
+  <title>Visual Studio.NET Integration</title>
+
+  <sect1 id="vsnet-config-section">
+     
+
+    <title>XML Editing and Validation</title>
+
+     
+
+    <para>Most of this section is well travelled territory for those familiar
+    with editing XML files in their favorite XML editor. The XML configuration
+    data that defines the objects that Spring will manage for you are
+    validated against the Spring.NET XML Schema at runtime. The location of
+    the XML configuration data to create an
+    <literal>IApplicationContext</literal> can be any of the resource
+    locations supported by Spring's <classname>IResource</classname>
+    abstraction. (See <xref linkend="objects-iresource" /> for more
+    information.) To create an <classname>IApplicationContext</classname>
+    using a "standalone" XML configuration file the custom configuration
+    section in the standard .NET application configuration would read:</para>
+
+     
+
+    <programlisting>&lt;spring&gt;
+
+  &lt;context&gt;
+    &lt;resource uri="file://objects.xml"/&gt;
+  &lt;/context&gt;
+
+&lt;/spring&gt;</programlisting>
+
+    The VS.NET 2005 XML editor can use the attribute 
+
+    <literal>xsi:schemaLocation</literal>
+
+     as a hint to associate the physical location of a schema file with the XML document being edited. VS.NET 2002/2003 do not recognize the 
+
+    <literal>xsi:schemaLocation</literal>
+
+     element. If you reference the Spring.NET XML schema as shown below, you can get intellisense and validation support while editing a Spring configuration file in VS.NET 2005. In order to get this functionality in VS.NET 2002/2003 you will need to register the schema with VS.NET or include the schema as part of your application project. 
+
+    <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd"&gt;
+  &lt;object id="..." type="..."&gt;
+  ...
+  &lt;/object&gt;
+  &lt;object id="..." type="..."&gt;
+  ...
+  &lt;/object&gt;
+  ...
+&lt;/objects&gt;</programlisting>
+
+     
+
+    <para>It is typically more convenient to install the schema in VS.NET,
+    even for VS.NET 2005, as it makes the xml a little less verbose and you
+    don't need to keep copying the XSD file for each project you create. For
+    VS.NET 2003 the schema directory will be either</para>
+
+     
+
+    <para><literal>C:\Program Files\Microsoft Visual Studio .NET
+    2003\Common7\Packages\schemas\xml</literal> for VS 2003</para>
+
+     
+
+    <para>or</para>
+
+     
+
+    <para><literal>C:\Program Files\Microsoft Visual Studio
+    .NET\Common7\Packages\schemas\xml</literal> for VS.NET 2002</para>
+
+     
+
+    <para>The VS.NET 2005 directory for XML schemas is</para>
+
+     
+
+    <para>
+      <literal>C:\Program Files\Microsoft Visual Studio
+      8\Xml\Schemas</literal>
+    </para>
+
+     
+
+    <para>Spring's .xsd schemas are located in the directory doc/schema. In
+    that directory is also a NAnt build file to help copy over the .xsd files
+    to the appropriate VS.NET locations. To execute this script simply type
+    '<literal>nant</literal>' in the doc/schema directory.</para>
+
+     
+
+    <para>Once you have registered the schema with VS.NET you can adding only
+    the namespace declaration to the objects element,</para>
+
+     
+
+    <para>
+      <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;objects xmlns="http://www.springframework.net"&gt;
+  &lt;object id="..." type="..."&gt;
+  ...
+  &lt;/object&gt;
+  &lt;object id="..." type="..."&gt;
+  ...
+  &lt;/object&gt;
+  ...
+&lt;/objects&gt;</programlisting>
+    </para>
+
+     
+
+    <para>Once registered, the namespace declaration alone is sufficient to
+    get intellisense and validation of the configuration file from within
+    VS.NET. Alternatively, you can select the .xsd file to use by setting the
+    targetSchema property in the Property Sheet for the configuration
+    file.</para>
+
+     
+
+    <para>As shown in the section <xref linkend="objects-factory-client" />
+    Spring.NET supports using .NET's application configuration file as the
+    location to store the object definitions that will be managed by the
+    object factory.</para>
+
+     
+
+    <programlisting>
+&lt;configuration&gt;
+
+  &lt;configSections&gt;
+    &lt;sectionGroup name="spring"&gt;
+      &lt;section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/&gt;
+      &lt;section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" /&gt;
+    &lt;/sectionGroup&gt;
+  &lt;/configSections&gt;
+
+  &lt;spring&gt;
+
+    &lt;context&gt;
+      &lt;resource uri="config://spring/objects"/&gt;
+    &lt;/context&gt;
+       
+    &lt;objects xmlns="http://www.springframework.net"&gt;
+        ...
+    &lt;/objects&gt;
+
+  &lt;/spring&gt;
+
+&lt;/configuration&gt;
+    </programlisting>
+
+     
+
+    <para>In this case VS.NET 2002/2003 will still provide you with
+    intellisense help but you will not be able to fully validate the document
+    as the entire schema for App.config is not known. To be able to validate
+    this document one would need to install the <ulink
+    url="http://www.radsoftware.com.au/articles/intellisensewebconfig.aspx">.NET
+    Configuration File schema</ulink> and an additional schema that
+    incorporates the <literal>&lt;spring&gt;</literal> and
+    <literal>&lt;context&gt;</literal> section in addition to the
+    <literal>&lt;objects&gt;</literal> would need to be created.</para>
+
+     
+
+    <para>Validating schema is a new feature in VS 2005 it is validating all
+    the time while you edit, you will see any errors that it finds in the
+    Error List window.</para>
+
+     
+
+    <para>Keep these trade offs in mind as you decide where to place the bulk
+    of your configuration information. Conventional wisdom is do quick
+    prototyping with App.config and use another IResource location, file or
+    embedded assembly resource, for serious development.</para>
+
+     
+  </sect1>
+
+  <sect1 id="vsnet-schema-versions">
+    <title>Versions of XML Schema</title>
+
+    <para>The schema was updated from Spring 1.0.1 to 1.0.2 in order to
+    support generics. The schema for version 1.0.1 is located under
+    <literal>http://www.springframework.net/xsd/1.0.1/</literal> The schema
+    for the latest version will always be located under
+    <literal>http://www.springframework.net/xsd/</literal></para>
+  </sect1>
+
+  <sect1 id="vsnet-api-help">
+    <title>Integrated API help</title>
+
+    <para>Spring provides API documentation that can be integrated within
+    Visual Studio. There are two versions of the documentation, one for VS.NET
+    2002/2003 and the other for VS 2005. They differ only in the format
+    applied, VS 2005 using the sexy new format. Enjoy!</para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/web-quickstart.xml b/doc/reference/src/web-quickstart.xml
new file mode 100644
index 00000000..69ddd3c3
--- /dev/null
+++ b/doc/reference/src/web-quickstart.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="web-quickstart">
+  <title>Web Quickstarts</title>
+
+  <section>
+    <title>Introduction</title>
+
+    <para>The Web Quickstart solution provides basic 'Hello World' examples
+    for using Spring.Web features. You can use this solution as a starting
+    point and then move on to the SpringAir application that uses a wider
+    range of Spring.Web features. </para>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/web.xml b/doc/reference/src/web.xml
new file mode 100644
index 00000000..a861b91b
--- /dev/null
+++ b/doc/reference/src/web.xml
@@ -0,0 +1,2474 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="web">
+  <title>Spring.NET Web Framework</title>
+
+  <sect1 id="web-introduction">
+    <title>Introduction</title>
+
+    <para>One of the objections many developers have to the ASP.NET
+    programming model is that it is not a "true MVC" (Model-View-Controller)
+    implementation, because controller-type logic within the page is too
+    tightly coupled to the view. A good example of this are event handlers
+    within the page class, which typically have references to view elements,
+    such as input controls, all over the place. Without getting into academic
+    discussion of what "true MVC" is, and whether it is even appropriate to
+    try to fit form-based technology such as ASP.NET into traditionally
+    request-based MVC pattern when MVP (Model-View-Presenter) or Presentation
+    Model might be more appropriate, we'd like to agree with the critics on
+    the most important point they are making: controller-type logic, such as
+    the code within page event handlers in ASP.NET, should not depend on the
+    view elements.</para>
+
+    <para>Having said that, there <emphasis>are</emphasis> good things about
+    ASP.NET. Server-side forms and controls make developers significantly more
+    productive and allow us to significantly simplify page markup. They also
+    make cross-browser issues easier to deal with, as each control can make
+    sure that it renders correct markup based on the user's browser. The
+    ability to hook custom logic into the lifecycle of the page, as well as to
+    customize HTTP processing pipeline are also very powerful features.
+    Finally, being able to interact with the strongly typed server-side
+    controls instead of manipulating string-based HTTP request collections,
+    such as Form and QueryString, is a much needed layer of abstraction in web
+    development.</para>
+
+    <para>For these reasons, we decided that instead of developing a new,
+    "pure and true MVC" web framework as part of Spring.NET, we should take a
+    more pragmatic approach and extend ASP.NET in such a way that most, if not
+    all of its shortcomings are eliminated. It should be noted that with the
+    introduction of a 'true MVC framework' being added to .NET, with extension
+    points for IoC containers such as Spring, Spring will continue to play a
+    role within a MVC based model once that functionality is available from
+    Microsoft. It is worth noting that Spring Java has a very popular MVC
+    framework and much of that experience and added value can be
+    transliterated to help developers be more productive when using the
+    upcoming ASP.NET MVC support.</para>
+
+    <para></para>
+
+    <para>Spring.Web also adds support for applying the dependency injection
+    principle to one's ASP.NET <classname>Pages</classname> and
+    <classname>Controls</classname> as well as http modules and custom
+    provider modules. This means that application developers can easily inject
+    service dependencies into web controllers by leveraging the power of the
+    Spring.NET IoC container. See <link linkend="web-di">Dependency Injection
+    for ASP.NET Pages</link> for more information.</para>
+
+    <para>As we said earlier, event handlers in code-behind classes really
+    should not have to deal with ASP.NET UI controls directly. Such event
+    handlers should rather work with the presentation model of the page,
+    represented either as a hierarchy of domain objects or an ADO.NET
+    <classname>DataSet</classname>. It is for that reason that the Spring.NET
+    team implemented bidirectional data binding framework to handle the
+    mapping of values to and from the controls on a page to the underlying
+    data model. The data binding framework also transparently takes care of
+    data type conversion and formatting, enabling application developers to
+    work with fully typed data (domain) objects in the event handlers of
+    code-behind files. See <link linkend="web-databinding">Bidirectional Data
+    Binding and Model Management</link> for more information.</para>
+
+    <para>The flow of control through an application is another area of
+    concern that is addressed by Spring.NET Web Framework. Typical ASP.NET
+    applications will use <literal>Response.Redirect</literal> or
+    <literal>Server.Transfer</literal> calls within
+    <classname>Page</classname> logic to navigate to an appropriate page after
+    an action is executed. This typically leads to hard-coded target URLs in
+    the <classname>Page</classname>, which is never a good thing. Result
+    mapping solves this problem by allowing application developers to specify
+    aliases for action results that map to target URLs based on information in
+    an external configuration file that can easily be edited. Under
+    consideration for future releases of Spring.NET is a process management
+    framework, which will take this approach to another level, allowing you to
+    control complex page flows in a very simple way. See <link
+    linkend="web-resultmapping">Result Mapping</link> for more
+    information.</para>
+
+    <para>Standard localization support is also limited in versions of ASP.NET
+    prior to ASP.NET 2.0. Even though Visual Studio 2003 generates a local
+    resource file for each ASP.NET <classname>Page</classname> and user
+    control, those resources are never used by the ASP.NET infrastructure.
+    This means that application developers have to deal directly with resource
+    managers whenever they need access to localized resources, which in the
+    opinion of the Spring.NET team should not be the case. Spring.NET's Web
+    Framework (hereafter referred to as Spring.Web) adds comprehensive support
+    for localization using both local resource files and global resources that
+    are configured within and for a Spring.NET container. See <link
+    linkend="web-localization">Localization and Message Sources</link> for
+    more information.</para>
+
+    <para>In addition to the aforementioned features that can be considered to
+    be the <emphasis>'core'</emphasis> features of the Spring.Web framework,
+    Spring.Web also ships with a number of other lesser features that might be
+    useful to a large number of application developers. Some of these
+    additional features include back-ports of ASP.NET 2.0 features that can be
+    used with ASP.NET 1.1, such as Master Page support. See <link lang=""
+    linkend="web-masterpages">Master Pages in ASP.NET 1.1</link> for more
+    information.</para>
+
+    <para>In order to implement some of the above mentioned features the
+    Spring.NET team had to extend (as in the object-oriented sense) the
+    standard ASP.NET <classname>Page</classname> and
+    <classname>UserControl</classname> classes. This means that in order to
+    take advantage of the <emphasis>full</emphasis> feature stack of
+    Spring.Web (most notably bidirectional data binding, localization and
+    result mapping), your code-behind classes will have to extend Spring.Web
+    specific base classes such as <classname>Spring.Web.UI.Page</classname>;
+    however, some very powerful features such as dependency injection for
+    ASP.NET Pages, Controls, and providers can be leveraged without having to
+    extend Spring.Web-specific base classes. It is worth stating that by
+    taking advantage of <emphasis>some</emphasis> of the more useful features
+    offered by Spring.Web you will be coupling the presentation tier of your
+    application(s) to Spring.Web. The choice of whether or not this is
+    appropriate is, of course, left to you.</para>
+
+    <para>Finally, please be aware that the standard Spring.NET distribution
+    (as of v1.1) ships with a number of Web QuickStarts and a complete
+    reference application, SpringAir. Web QuickStarts are the best way to
+    learn each Spring.Web feature by following simple examples, and the
+    SpringAir reference application has a Spring.Web-enabled frontend which
+    uses many best practices for Spring.NET web applications, so please do
+    refer to it as you are reading this (reference) material (see <xref
+    linkend="springair" />).</para>
+  </sect1>
+
+  <sect1 id="web-contexts">
+    <title>Automatic context loading and hierarchical contexts</title>
+
+    <sect2 id="web-configuration">
+      <title>Configuration</title>
+
+      <para>Unsurprisingly, Spring.Web builds on top of the Spring.NET IoC
+      container, and makes heavy use (internally) of the easy pluggability and
+      standardized configuration afforded by the IoC container. This also
+      means that all of the controllers (ASP.NET <classname>Page</classname>s)
+      that make up a typical Spring.Web enabled application will be configured
+      using the same standard Spring.NET XML configuration syntax. Spring.Web
+      uses a custom <classname>PageHandlerFactory</classname> implementation
+      to load and configure a Spring.NET IoC container, which is in turn used
+      to locate an appropriate <classname>Page</classname> to handle a HTTP
+      request. The <classname>WebSupportModule</classname> configures
+      miscellaneous Spring infrastructure classes for use in a web
+      environment, for example setting the storage strategy of
+      <classname>LogicalThreadContext</classname> to be
+      <classname>HybridContextStorage</classname>.</para>
+
+      <para>The instantiation and configuration of the Spring.NET IoC
+      container by the Spring.Web infrastructure is wholly transparent to
+      application developers, who will typically never have to explicitly
+      instantiate and configure an IoC container manually (by for example
+      using the <literal>new</literal> operator in C#). In order to effect the
+      transparent bootstrapping of the IoC container, the Spring.Web
+      infrastructure requires the insertion of the following configuration
+      snippet into each and every Spring.Web-enabled web application's root
+      <literal>Web.config</literal> file (the <literal>verb</literal> and
+      <literal>path</literal> properties can of course be changed from the
+      values that are shown below):</para>
+
+      <programlisting>&lt;system.web&gt;
+    &lt;httpHandlers&gt;
+        &lt;add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/&gt;
+    &lt;/httpHandlers&gt;
+    &lt;httpModules&gt;
+        &lt;add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/&gt;
+    &lt;/httpModules&gt;
+    ...
+&lt;/system.web&gt;
+
+</programlisting>
+
+      <para>Please note that this snippet of standard ASP.NET configuration is
+      only required to be present in the <emphasis>root</emphasis> directory
+      of each Spring.Web web application (i.e. in the
+      <literal>web.config</literal> file present in the top level virtual
+      directory of an ASP.NET web application).</para>
+
+      <para>The above XML configuration snippet will direct the ASP.NET
+      infrastructure to use Spring.NET's page factory, which will in turn
+      create instances of the appropriate <literal>.aspx</literal>
+      <classname>Page</classname>, (possibly) inject dependencies into said
+      <classname>Page</classname> (as required), and then forward the handling
+      of the request to said <classname>Page</classname>.</para>
+
+      <para>After the Spring.Web page factory is configured, you will also
+      need to define a root application context by adding a Spring.NET
+      configuration section to that same <literal>web.config</literal> file.
+      The final configuration file should look a little like this (your exact
+      configuration will no doubt vary in particulars)...</para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;configuration&gt;
+
+    &lt;configSections&gt;
+        &lt;sectionGroup name="spring"&gt;
+          &lt;section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/&gt;
+        &lt;/sectionGroup&gt;
+    &lt;/configSections&gt;
+
+    &lt;spring&gt;
+        &lt;context&gt;
+            &lt;resource uri="~/Config/CommonObjects.xml"/&gt;
+            &lt;resource uri="~/Config/CommonPages.xml"/&gt;
+
+            &lt;!-- TEST CONFIGURATION --&gt;
+            &lt;!--
+            &lt;resource uri="~/Config/Test/Services.xml"/&gt;
+            &lt;resource uri="~/Config/Test/Dao.xml"/&gt;
+            --&gt;
+
+            &lt;!-- PRODUCTION CONFIGURATION --&gt;
+
+            &lt;resource uri="~/Config/Production/Services.xml"/&gt;
+            &lt;resource uri="~/Config/Production/Dao.xml"/&gt;
+
+        &lt;/context&gt;
+    &lt;/spring&gt;
+
+    &lt;system.web&gt;
+        &lt;httpHandlers&gt;
+            &lt;add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/&gt;
+        &lt;/httpHandlers&gt;
+        &lt;httpModules&gt;
+            &lt;add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/&gt;
+        &lt;/httpModules&gt;
+    &lt;/system.web&gt;
+
+&lt;/configuration&gt;
+</programlisting>
+
+      <para>There are a few important points that need to be noted with regard
+      to the above configuration:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>You must define a custom configuration section handler for the
+          <literal>spring/context</literal> element. If you use Spring.NET for
+          many applications on the same web server, it might be easier to move
+          the whole definition of the Spring.NET section group to your
+          <literal>machine.config</literal> file.</para>
+        </listitem>
+
+        <listitem>
+          <para>The custom configuration section handler is of the type
+          <classname>Spring.Context.Support.WebContextHandler</classname>
+          which will in turn instantiate an IoC container of the type
+          <classname>Spring.Context.Support.WebApplicationContext</classname>.
+          This will ensure that all of the features provided by Spring.Web are
+          handled properly (such as request and session-scoped object
+          definitions).</para>
+        </listitem>
+
+        <listitem>
+          <para>Within the &lt;spring&gt; element you need to define a root
+          context, and resource locations that contain the object definitions
+          that will be used within the web application (such as service or
+          business tier objects) then need to be specified as child elements
+          within the &lt;context&gt; element. Object definition resources can
+          be fully-qualified paths or URLs, or non-qualified, as in the
+          example above. Non-qualified resources will be loaded using the
+          default resource type for the context, which for the
+          <classname>WebApplicationContext</classname> is the
+          <classname>WebResource</classname> type.</para>
+        </listitem>
+
+        <listitem>
+          <para>Please note that the object definition resources do not all
+          have to be the same resource type (e.g. all
+          <literal>file://</literal>, all <literal>http://</literal>, all
+          <literal>assembly://</literal>, etc). This means that you can load
+          some object definitions from resources embedded directly within
+          application assemblies (<literal>assembly://</literal>), while
+          continuing to load other object definitions from web resources that
+          can be more easily edited.</para>
+        </listitem>
+      </orderedlist>
+
+      <sect3>
+        <title>Configuration for IIS7</title>
+
+        <para>The configuration for IIS7 is shown below</para>
+
+        <programlisting>&lt;system.webServer&gt;
+  &lt;validation validateIntegratedModeConfiguration="false"/&gt;
+  &lt;modules&gt;
+    &lt;add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/&gt;
+  &lt;/modules&gt;
+  &lt;handlers&gt;
+    &lt;add name="SpringPageHandler" verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/&gt;
+    &lt;add name="SpringContextMonitor" verb="*" path="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web"/&gt;
+  &lt;/handlers&gt;
+&lt;/system.webServer&gt;</programlisting>
+      </sect3>
+    </sect2>
+
+    <sect2 id="web-context-hierarchy">
+      <title>Context Hierarchy</title>
+
+      <para>ASP.NET provides a hierarchical configuration mechanism by
+      allowing application developers to override configuration settings
+      specified at a higher level in the web application directory hierarchy
+      with configuration settings specified at the lower level.</para>
+
+      <para>For example, a web application's root
+      <literal>Web.config</literal> file overrides settings from the (lower
+      level) <literal>machine.config</literal> file. In the same fashion,
+      settings specified within the <literal>web.config</literal> file within
+      a subdirectory of a web application will override settings from the root
+      <literal>Web.config</literal> and so on. Lower level
+      <literal>Web.config</literal> files can also add settings of their own
+      that were not previously defined anywhere.</para>
+
+      <para>Spring.Web leverages this ASP.NET feature to provide support for a
+      context hierarchy. Your lower level <literal>Web.config</literal> files
+      can be used to add new object definitions or to override existing ones
+      per virtual directory.</para>
+
+      <para>What this means to application developers is that one can easily
+      componentize an application by creating a virtual directory per
+      component and creating a custom context for each component that contains
+      the necessary configuration info for that particular context. The
+      configuration for a lower level component will generally contain only
+      those definitions for the pages that the component consists of and
+      (possibly) overrides for some of the definitions from the root context
+      (for example, menus).</para>
+
+      <para>Because each such lower level component will usually contain only
+      a few object definitions, application developers are encouraged to embed
+      those object definitions directly into the <literal>Web.config</literal>
+      for the lower level context instead of relying on an external resource
+      containing object definitions. This is easily accomplished by creating a
+      component <literal>Web.config</literal> similar to the following
+      one:</para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;configuration&gt;
+
+  &lt;configSections&gt;
+    &lt;sectionGroup name="spring"&gt;
+       &lt;section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/&gt;
+    &lt;/sectionGroup&gt;
+  &lt;/configSections&gt;
+
+  &lt;spring&gt;
+    &lt;context type="Spring.Context.Support.WebApplicationContext, Spring.Web"&gt;
+        &lt;resource uri="config://spring/objects"/&gt;
+    &lt;/context&gt;
+
+    &lt;objects xmlns="http://www.springframework.net"&gt;
+        &lt;object type="MyPage.aspx" parent="basePage"&gt;
+              &lt;property name="MyRootService" ref="myServiceDefinedInRootContext"/&gt;
+              &lt;property name="MyLocalService" ref="myServiceDefinedLocally"/&gt;
+              &lt;property name="Results"&gt;
+                 &lt;!-- ... --&gt;
+              &lt;/property&gt;
+        &lt;/object&gt;
+        &lt;object id="myServiceDefinedLocally" type="MyCompany.MyProject.Services.MyServiceImpl, MyAssembly"/&gt;
+    &lt;/objects&gt;
+  &lt;/spring&gt;
+&lt;/configuration&gt;</programlisting>
+
+      <para>The <literal>&lt;context/&gt;</literal> element seen above
+      (contained within the <literal>&lt;spring/&gt;</literal> element) simply
+      tells the Spring.NET infrastructure code to load (its) object
+      definitions from the <literal>spring/objects</literal> section of the
+      configuration file.</para>
+
+      <para>You can (and should) avoid the need to specify
+      <literal>&lt;configSections/&gt;</literal> element by moving the
+      configuration handler definition for the
+      <literal>&lt;objects&gt;</literal> element to a higher level (root)
+      <literal>Web.config</literal> file, or even to the level of the
+      <literal>machine.config</literal> file if Spring.NET is to be used for
+      multiple applications on the same server.</para>
+
+      <para>A very important point to be aware of is that this component-level
+      context can reference definitions from its parent context(s). Basically,
+      if a referenced object definition is not found in the current context,
+      Spring.NET will search all the ancestor contexts in the context
+      hierarchy until it finds said object definition (or ultimately fails and
+      throws an exception).</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="web-di">
+    <title>Dependency Injection for ASP.NET Pages</title>
+
+    <para>Spring.Web builds on top of the feature set and capabilities of
+    ASP.NET; one example of this can be seen the way that Spring.Web has used
+    the code-behind class of the <classname>Page</classname> mechanism to
+    satisfy the <literal>Controller</literal> portion of the MVC architectural
+    pattern. In MVC-based (web) applications, the
+    <literal>Controller</literal> is typically a thin wrapper around one or
+    more service objects. In the specific case of Spring.Web, the Spring.NET
+    team realized that it was very important that service object dependencies
+    be easily injected into <classname>Page</classname>
+    <literal>Controller</literal>s. Accordingly, Spring.Web provides first
+    class support for dependency injection in ASP.NET
+    <classname>Page</classname>s. This allows application developers to inject
+    any required service object dependencies (and indeed any other
+    dependencies) into their <classname>Page</classname>s using standard
+    Spring.NET configuration instead of having to rely on custom service
+    locators or manual object lookups in a Spring.NET application
+    context.</para>
+
+    <para>Once an application developer has <link
+    linkend="web-configuration">configured</link> the Spring.NET web
+    application context, said developer can easily create object definitions
+    for the pages that compose that web application:</para>
+
+    <programlisting>&lt;objects xmlns="http://www.springframework.net"&gt;
+
+  &lt;object name="basePage" abstract="true"&gt;
+    &lt;property name="MasterPageFile" value="~/Web/StandardTemplate.master"/&gt;
+  &lt;/object&gt;
+
+  &lt;object type="Login.aspx"&gt;
+      &lt;property name="Authenticator" ref="authenticationService"/&gt;
+  &lt;/object&gt;
+
+  &lt;object type="Default.aspx" parent="basePage"/&gt;
+
+&lt;/objects&gt;</programlisting>
+
+    <para>This example contains three definitions:</para>
+
+    <orderedlist>
+      <listitem>
+        <para>The first definition is an abstract definition for the base page
+        that many other pages in the application will inherit from. In this
+        case, the definition simply specifies which page is to be referenced
+        as the master page, but it will typically also configure
+        localization-related dependencies and root folders for images, scripts
+        and CSS stylesheets.</para>
+      </listitem>
+
+      <listitem>
+        <para>The second definition defines a login page that neither inherits
+        from the base page nor references the master page. What it does show
+        is how to inject a service object dependency into a page instance (the
+        <literal>authenticationService</literal> is defined elsewhere).</para>
+      </listitem>
+
+      <listitem>
+        <para>The final definition defines a default application page. In this
+        case it simply inherits from the base page in order to inherit the
+        master page dependency, but apart from that it doesn't need any
+        additional dependency injection configuration.</para>
+      </listitem>
+    </orderedlist>
+
+    <para>One thing that slightly differentiates the configuration of ASP.NET
+    pages from the configuration of other .NET classes is in the value passed
+    to the <literal>type</literal> attribute. As can be seen in the above
+    configuration snippet the <literal>type</literal> name is actually the
+    path to the <literal>.aspx</literal> file for the
+    <classname>Page</classname>, relative to the directory context it is
+    defined in. In the case of the above example, those definitions are in the
+    root context so <literal>Login.aspx</literal> and
+    <literal>Default.aspx</literal> also must be in the root of the web
+    application's virtual directory. The master page is defined using an
+    absolute path because it could conceivably be referenced from child
+    contexts that are defined within subdirectories of the web
+    application.</para>
+
+    <para>The astute reader may have noticed that the definitions for the
+    <literal>Login</literal> and <literal>Default</literal> pages don't
+    specify either of the <literal>id</literal> and <literal>name</literal>
+    attributes. This is in marked contrast to typical object definitions in
+    Spring.NET, where the <literal>id</literal> or <literal>name</literal>
+    attributes are typically mandatory (although not always, as in the case of
+    inner object definitions). This is actually intentional, because in the
+    case of Spring.Web <classname>Page</classname>
+    <literal>Controller</literal> instances one typically wants to use the
+    name of the <literal>.aspx</literal> file name as the identifier. If an
+    <literal>id</literal> is not specified, the Spring.Web infrastructure will
+    simply use the name of the <literal>.aspx</literal> file as the object
+    identifier (minus any leading path information, and minus the file
+    extension too). </para>
+
+    <para>Nothing prevents an application developer from specifying an
+    <literal>id</literal> or <literal>name</literal> value explicitly; one use
+    case when the explicit naming might be useful is when one wants to expose
+    the same page multiple times using a slightly different configuration (Add
+    / Edit pages for example). If you would like to use abstract object
+    definitions and have your page inherit from them, the use of the name
+    attribute should be used instead of the id attribute on the abstract
+    object definition.</para>
+
+    <sect2 id="web-di-controls">
+      <title>Injecting Dependencies into Controls</title>
+
+      <para>Spring.Web also allows application developers to inject
+      dependencies into controls (both user controls and standard controls)
+      that are contained within a page. This can be accomplished globally for
+      all controls of a particular <literal>Type</literal> by using the
+      location of the <literal>.ascx</literal> as the object type identifier.
+      This is similar to injecting into <literal>.aspx </literal>pages shown
+      above.</para>
+
+      <programlisting>&lt;object type="~/controls/MyControl.ascx" abstract="true"&gt;
+   &lt;!-- inject dependencies here... --&gt;
+&lt;/object&gt;</programlisting>
+
+      <para>In either case, be sure to mark the object definition as
+      <literal>abstract</literal> (by adding
+      <literal>abstract="true"</literal> to the attribute list of the
+      <literal>&lt;object/&gt;</literal> element).</para>
+    </sect2>
+
+    <sect2>
+      <title>Injecting dependencies into custom HTTP modules</title>
+
+      <para>You can perform dependency injection on custom HTTP modules
+      through the use of the class
+      <classname>Spring.Context.Support.HttpApplicationConfigurer</classname>.
+      You register your custom HTTP module as you would normally, for example
+      a module of the type <classname>HtmlCommentAppenderModule</classname>,
+      taken from the Web Quickstart, appends additional comments into the http
+      response. It is registered as shown below</para>
+
+      <programlisting>&lt;httpModules&gt;
+  &lt;add name="HtmlCommentAppender" type="HtmlCommentAppenderModule"/&gt;
+&lt;/httpModules&gt;</programlisting>
+
+      <para>To configure this module, naming conventions are used to identify
+      the module name with configuration instructions in the Spring
+      configuration file. The ModuleTemplates property of
+      HttpApplicationConfigurer is a dictionary that takes as a key the name
+      of the HTTP module, HtmlCommentAppender, and as a value the
+      configuration instructions as you would normally use for configuring an
+      object with Spring. An example is shown below.
+      HttpApplicationConfigurer' ModuleTemplates property.</para>
+
+      <programlisting>&lt;object name="HttpApplicationConfigurer" type="Spring.Context.Support.HttpApplicationConfigurer, Spring.Web"&gt;
+  &lt;property name="ModuleTemplates"&gt;
+     &lt;dictionary&gt;
+       &lt;entry key="HtmlCommentAppender"&gt; &lt;!-- this name must match the module name --&gt;
+         &lt;object&gt;
+           &lt;!-- select "view source" in your browser on any page to see the appended html comment --&gt;
+           &lt;property name="AppendText" value="My configured comment!" /&gt;
+         &lt;/object&gt;
+       &lt;/entry&gt;
+     &lt;/dictionary&gt;
+  &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+
+      <para>You can see this example in action in the Web Quickstart.</para>
+    </sect2>
+
+    <sect2>
+      <title>Injecting dependencies into custom providers</title>
+
+      <para>Custom providers can be configured with Spring. The approach to
+      configuration is a family of adapters that correspond 1-to-1 with the
+      standard ASP.NET providers that are registered using the standard
+      ASP.NET mechanism. The adapters inherit from their correspondingly named
+      provider class in the BCL.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>MembershipProviderAdapter</para>
+        </listitem>
+
+        <listitem>
+          <para>ProfileProviderAdapter</para>
+        </listitem>
+
+        <listitem>
+          <para>RoleProviderAdapter</para>
+        </listitem>
+
+        <listitem>
+          <para>SiteMapProviderAdapter</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Here is an example of how to register the adapter for membership
+      providers.</para>
+
+      <programlisting>        &lt;membership defaultProvider="mySqlMembershipProvider"&gt;
+            &lt;providers&gt;
+                &lt;clear/&gt;
+                &lt;add connectionStringName="" name="mySqlMembershipProvider" type="Spring.Web.Providers.MembershipProviderAdapter, Spring.Web"/&gt;
+            &lt;/providers&gt;
+        &lt;/membership&gt;</programlisting>
+
+      <para>The name of the provider must match the name of the object in the
+      spring configuration that will serve as the actual provider
+      implementation. For convenience there are configurable versions of the
+      providers found in ASP.NET so that you can use the full functionality of
+      spring to configure these standard provider implementations, for example
+      using property place holders, etc. These are</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>ConfigurableActiveDirectoryMembershipProvider</para>
+        </listitem>
+
+        <listitem>
+          <para>ConfigurableSqlMembershipProvider</para>
+        </listitem>
+
+        <listitem>
+          <para>ConfigurableSqlProfileProvider</para>
+        </listitem>
+
+        <listitem>
+          <para>ConfigurableSqlRoleProvider</para>
+        </listitem>
+
+        <listitem>
+          <para>ConfigurableXmlSiteMapProvider</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Here is an example configuration taken from the Web Quickstart
+      that simply sets the description property and connection string.</para>
+
+      <programlisting>    &lt;object id="mySqlMembershipProvider" type="Spring.Web.Providers.ConfigurableSqlMembershipProvider"&gt;
+        &lt;property name="connectionStringName" value="MyLocalSQLServer" /&gt;
+        &lt;property name="parameters"&gt;
+            &lt;name-values&gt;
+                &lt;add key="description" value="membershipprovider description" /&gt;
+            &lt;/name-values&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;</programlisting>
+
+      <para>Your own custom providers of course will contain additional
+      configuration specific to your implementation.</para>
+    </sect2>
+
+    <sect2 id="web-controlling-di">
+      <title>Customizing control dependency injection</title>
+
+      <para>There might be situations where it is necessary to customize
+      Spring.Web's dependency injection processing. In particular when using
+      GridViews, which create a large number of child controls, dependency
+      injection can slow down your page. To overcome this problem, you may
+      tell Spring to handle the dependency injection process yourself by
+      implementing the interface ISupportsWebDependencyInjection as shown
+      below:</para>
+
+      <programlisting>[C#]
+class MyControl : Control, ISupportsWebDependencyInjection
+{
+  private IApplicationContext _defaultApplicationContext;
+
+  public IApplicationContext DefaultApplicationContext
+  {
+    get { return _defaultApplicationContext; }
+    set { _defaultApplicationContext = value; }
+  }
+
+  override protected AddedControl( Control control, int index )
+  {
+    // handle DI for children ourselves -
+    // defaults to a call to InjectDependenciesRecursive
+    WebUtils.InjectDependenciesRecursive( _defaultApplicationContext, control );
+    base.AddedControl( control, index );
+  }
+}</programlisting>
+
+      <para>There is a Spring server control, Panel, that provides an easier
+      way to turn of dependency injection for parts of your page. Example use
+      is shown below</para>
+
+      <programlisting>&lt;spring:Panel runat="server"
+   suppressDependencyInjection="true"  
+   renderContainerTag="false"&gt;
+
+   .. put your heavy controls here - they won't be touched by DI
+
+&lt;/spring:Panel&gt;</programlisting>
+
+      <para>By wrapping the performance sensitive parts of your page within
+      this panel, you can easily turn off DI using the attribute
+      suppressDependencyInjection. By default &lt;spring:Panel/&gt; won't
+      render a container tag (&lt;div&gt;, &lt;span&gt;, etc.). You can modify
+      this behavior by setting the attribute "renderContainerTag"
+      accordingly.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="web-objectscope">
+    <title>Object Scope</title>
+
+    <para>Spring.NET web applications support an additional attribute within
+    object definition elements that allows you to control the scope of an
+    object: <programlisting>&lt;object id="myObject" type="MyType, MyAssembly" scope="application | session | request"/&gt;</programlisting>As
+    you can see, there are three possible values for the scope attribute --
+    application, session or request. Application scope is the default, and
+    will be used for all objects that don't have scope attribute defined. As
+    its name says, it will result in a single instance of an object being
+    created for the duration of the application, so it works exactly like the
+    standard singleton objects in non-web applications. Session scope allows
+    you to define objects in such a way that an instance is created for each
+    HttpSession. This is the ideal scope for objects that you want bound to a
+    single user such as user profile, shopping cart, etc. Request scope will
+    result in a creation of an instance per HTTP request.</para>
+
+    <para>Unlike with prototype objects, calls to
+    <literal>IApplicationContext.GetObject</literal> will return the same
+    instance of the request-scoped object during a single HTTP request. This
+    allows you, for example, to inject the same request-scoped object into
+    multiple pages and then use server-side transfer to move from one page to
+    another. As all the pages are executed within the single HTTP request in
+    this case, they will share the same instance of the injected
+    object.</para>
+
+    <para>One thing to keep in mind is that objects can only reference other
+    objects that are in the same or broader scope. This means that
+    application-scoped objects can only reference other application-scoped,
+    session-scoped objects can reference both session and application-scoped
+    objects, and finally, request-scoped objects can reference other request,
+    session or application-scoped objects. Also, prototype objects (and that
+    includes all ASP.NET web pages defined within Spring.NET context) can
+    reference singleton objects from any scope, as well as other prototype
+    objects.</para>
+  </sect1>
+
+  <sect1 id="web-masterpages">
+    <title>Master Pages in ASP.NET 1.1</title>
+
+    <para>Support for ASP.NET 1.1 master pages in Spring.Web is very similar
+    to the support for master pages in ASP.NET 2.0.</para>
+
+    <para>The idea is that a web developer can define a layout template for
+    the site as a master page and specify content place holders that other
+    pages can then reference and populate. A sample master page
+    (<literal>MasterLayout.ascx</literal>) could look like this:</para>
+
+    <programlisting>&lt;%@ Control language="c#" Codebehind="MasterLayout.ascx.cs" AutoEventWireup="false" Inherits="MyApp.Web.UI.MasterLyout" %&gt;
+&lt;%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %&gt;
+&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" &gt;
+&lt;html&gt;
+    &lt;head&gt;
+        &lt;title&gt;Master Page&lt;/title&gt;
+        &lt;link rel="stylesheet" type="text/css" href="&lt;%= Context.Request.ApplicationPath %&gt;/css/styles.css"&gt;
+        &lt;spring:ContentPlaceHolder id="head" runat="server"/&gt;
+    &lt;/head&gt;
+    &lt;body&gt;
+        &lt;form runat="server"&gt;
+            &lt;table cellPadding="3" width="100%" border="1"&gt;
+                &lt;tr&gt;
+                    &lt;td colspan="2"&gt;
+                        &lt;spring:ContentPlaceHolder id="title" runat="server"&gt;
+                            &lt;!-- default title content --&gt;
+                        &lt;/spring:ContentPlaceHolder&gt;
+                    &lt;/td&gt;
+                &lt;/tr&gt;
+                &lt;tr&gt;
+                    &lt;td&gt;
+                        &lt;spring:ContentPlaceHolder id="leftSidebar" runat="server"&gt;
+                            &lt;!-- default left side content --&gt;
+                        &lt;/spring:ContentPlaceHolder&gt;
+                    &lt;/td&gt;
+                    &lt;td&gt;
+                        &lt;spring:ContentPlaceHolder id="main" runat="server"&gt;
+                            &lt;!-- default main area content --&gt;
+                        &lt;/spring:ContentPlaceHolder&gt;
+                    &lt;/td&gt;
+                &lt;/tr&gt;
+            &lt;/table&gt;
+        &lt;/form&gt;
+    &lt;/body&gt;
+&lt;/html&gt;</programlisting>
+
+    <para>As you can see from the above code, the master page defines the
+    overall layout for the page, in addition to four content placeholders that
+    other pages can override. The master page can also include default content
+    within the placeholder that will be displayed if a derived page does not
+    override the placeholder.</para>
+
+    <para>A page (Child.aspx) that uses this master page might look like
+    this:</para>
+
+    <programlisting>&lt;%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %&gt;
+&lt;%@ Page language="c#" Codebehind="Child.aspx.cs" AutoEventWireup="false" Inherits="ArtFair.Web.UI.Forms.Child" %&gt;
+&lt;html&gt;
+    &lt;body&gt;
+
+        &lt;spring:Content id="leftSidebarContent" contentPlaceholderId="leftSidebar" runat="server"&gt;
+            &lt;!-- left sidebar content --&gt;
+        &lt;/spring:Content&gt;
+
+        &lt;spring:Content id="mainContent" contentPlaceholderId="main" runat="server"&gt;
+            &lt;!-- main area content --&gt;
+        &lt;/spring:Content&gt;
+
+    &lt;/body&gt;
+&lt;/html&gt;</programlisting>
+
+    <para>The <literal>&lt;spring:Content/&gt;</literal> control in the above
+    example uses the <literal>contentPlaceholderId</literal> attribute
+    (property) to specify exactly which placeholder from the master page is to
+    be overridden. Because this particular page does not define content
+    elements for the head and title place holders, they will be displayed
+    using the default content supplied in the master page.</para>
+
+    <para>Both the <classname>ContentPlaceHolder</classname> and
+    <classname>Content</classname> controls can contain any valid ASP.NET
+    markup: HTML, standard ASP.NET controls, user controls, etc.</para>
+
+    <tip>
+      <title>VS.NET 2003 issue</title>
+
+      <para>Technically, the <literal>&lt;html&gt;</literal> and
+      <literal>&lt;body&gt;</literal> tags from the previous example are not
+      strictly necessary because they are already defined in the master page.
+      However, if these tags are omitted, then Visual Studio 2003 will
+      complain about a schema and intellisense won't work, so it's much easier
+      to work in the HTML view if those tags are included. They will be
+      ignored when the page is rendered.</para>
+    </tip>
+
+    <sect2 id="web-childpage-linking">
+      <title>Linking child pages to their master</title>
+
+      <para>The <classname>Spring.Web.UI.Page</classname> class exposes a
+      property called <literal>MasterPageFile</literal>, which can be used to
+      specify the master page.</para>
+
+      <para>The recommended way to do this is by leveraging the Spring.NET IoC
+      container and creating definitions similar to the following:</para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="utf-8" ?&gt;
+&lt;objects xmlns="http://www.springframework.net"&gt;
+
+  &lt;object name="basePage" abstract="true"&gt;
+      &lt;property name="MasterPageFile" value="~/MasterLayout.ascx"/&gt;
+  &lt;/object&gt;
+
+  &lt;object type="Child.aspx" parent="basePage"&gt;
+      &lt;!-- inject other objects that page needs --&gt;
+  &lt;/object&gt;
+
+&lt;/objects&gt;</programlisting>
+
+      <para>This approach allows application developers to change the master
+      page being used for a number of pages within a web application. Of
+      course, the master page can still be overridden on a per context or per
+      page basis by creating a new abstract page definition within a child
+      context, or by specifying the <literal>MasterPageFile</literal> property
+      directly.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="web-databinding">
+    <title>Bidirectional Data Binding and Model Management</title>
+
+    <para>A problem with the existing data binding support in ASP.NET is that
+    it is one-way only. It allows application developers to bind page controls
+    to the data model and display information from said data model, but it
+    doesn't allow for the extraction of values from the controls when the form
+    is submitted. Spring.Web adds such bidirectional data binding to ASP.NET
+    by allowing developers to specify data binding rules for their page, and
+    by automatically evaluating configured data binding rules at the
+    appropriate time in the page's lifecycle.</para>
+
+    <para>ASP.NET also doesn't provide any support for model management within
+    the postbacks. Sure, it has a ViewState management, but that takes care of
+    the control state only and not of the state of any presentation model
+    objects these controls might be bound to. In order to manage model within
+    ASP.NET, developers will typically use HTTP Session object to store the
+    model between the postbacks. This results in a decent amount of
+    boilerplate code that can and should be eliminated, which is exactly what
+    Spring.Web does by providing a simple set of model management
+    methods.</para>
+
+    <para>Please note that in order to take advantage of the bidirectional
+    data binding and model management support provided by Spring.Web, you
+    <emphasis>will</emphasis> have to couple your presentation layer to
+    Spring.Web; this is because features <emphasis>requires</emphasis> you to
+    extend a <classname>Spring.Web.UI.Page</classname> instead of the usual
+    <classname>System.Web.UI.Page</classname> class.</para>
+
+    <para>Spring.Web data binding is very easy to use. Application developers
+    simply need to override the protected
+    <literal>InitializeDataBindings</literal> method and configure data
+    binding rules for the page. They also need to override three model
+    management methods: <literal>InitializeModel</literal>,
+    <literal>LoadModel</literal> and <literal>SaveModel</literal>. This is
+    perhaps best illustrated by an example from the SpringAir reference
+    application. First, let's take a look at the page markup:<programlisting>&lt;%@ Page Language="c#" Inherits="TripForm" CodeFile="TripForm.aspx.cs" %&gt;
+
+&lt;asp:Content ID="body" ContentPlaceHolderID="body" runat="server"&gt;
+    &lt;div style="text-align: center"&gt;
+        &lt;h4&gt;&lt;asp:Label ID="caption" runat="server"&gt;&lt;/asp:Label&gt;&lt;/h4&gt;
+        &lt;table&gt;
+            &lt;tr class="formLabel"&gt;
+                &lt;td&gt;&amp;nbsp;&lt;/td&gt;
+                &lt;td colspan="3"&gt;
+                    &lt;spring:RadioButtonGroup ID="tripMode" runat="server"&gt;
+                        &lt;asp:RadioButton ID="OneWay" runat="server" /&gt;
+                        &lt;asp:RadioButton ID="RoundTrip" runat="server" /&gt;
+                    &lt;/spring:RadioButtonGroup&gt;
+                &lt;/td&gt;
+            &lt;/tr&gt;
+            &lt;tr&gt;
+                &lt;td class="formLabel" align="right"&gt;
+                    &lt;asp:Label ID="leavingFrom" runat="server" /&gt;&lt;/td&gt;
+                &lt;td nowrap="nowrap"&gt;
+                    &lt;asp:DropDownList ID="leavingFromAirportCode" runat="server" /&gt;
+                &lt;/td&gt;
+                &lt;td class="formLabel" align="right"&gt;
+                    &lt;asp:Label ID="goingTo" runat="server" /&gt;&lt;/td&gt;
+                &lt;td nowrap="nowrap"&gt;
+                    &lt;asp:DropDownList ID="goingToAirportCode" runat="server" /&gt;
+                &lt;/td&gt;
+            &lt;/tr&gt;
+            &lt;tr&gt;
+                &lt;td class="formLabel" align="right"&gt;
+                    &lt;asp:Label ID="leavingOn" runat="server" /&gt;&lt;/td&gt;
+                &lt;td nowrap="nowrap"&gt;
+                    &lt;spring:Calendar ID="departureDate" runat="server" Width="75px" AllowEditing="true" Skin="system" /&gt;
+                &lt;/td&gt;
+                &lt;td class="formLabel" align="right"&gt;
+                    &lt;asp:Label ID="returningOn" runat="server" /&gt;&lt;/td&gt;
+                &lt;td nowrap="nowrap"&gt;
+                    &lt;div id="returningOnCalendar"&gt;
+                        &lt;spring:Calendar ID="returnDate" runat="server" Width="75px" AllowEditing="true" Skin="system" /&gt;
+                    &lt;/div&gt;
+                &lt;/td&gt;
+            &lt;/tr&gt;
+            &lt;tr&gt;
+                &lt;td class="buttonBar" colspan="4"&gt;
+                    &lt;br/&gt;
+                    &lt;asp:Button ID="findFlights" runat="server"/&gt;&lt;/td&gt;
+            &lt;/tr&gt;
+        &lt;/table&gt;
+    &lt;/div&gt;
+
+ &lt;/asp:Content&gt;
+
+</programlisting>Ignore for the moment the fact that none of the label
+    controls have text defined, which will be described later when we discuss
+    localization in Spring.NET. What is important for the purposes of our
+    current discussion, is that we have a number of input controls defined:
+    <literal>tripMode</literal> radio group,
+    <literal>leavingFromAirportCode</literal> and
+    <literal>goingToAirportCode</literal> dropdowns, as well as two Spring.NET
+    Calendar controls, <literal>departureDate</literal> and
+    <literal>returnDate</literal>.</para>
+
+    <para>Next, let's take a look at the model we will be binding this form
+    to:<programlisting>namespace SpringAir.Domain
+{
+    [Serializable]
+    public class Trip
+    {
+        // fields
+        private TripMode mode;
+        private TripPoint startingFrom;
+        private TripPoint returningFrom;
+
+        // constructors
+        public Trip()
+        {
+            this.mode = TripMode.RoundTrip;
+            this.startingFrom = new TripPoint();
+            this.returningFrom = new TripPoint();
+        }
+
+        public Trip(TripMode mode, TripPoint startingFrom, TripPoint returningFrom)
+        {
+            this.mode = mode;
+            this.startingFrom = startingFrom;
+            this.returningFrom = returningFrom;
+        }
+
+        // properties
+        public TripMode Mode
+        {
+            get { return this.mode; }
+            set { this.mode = value; }
+        }
+
+        public TripPoint StartingFrom
+        {
+            get { return this.startingFrom; }
+            set { this.startingFrom = value; }
+        }
+
+        public TripPoint ReturningFrom
+        {
+            get { return this.returningFrom; }
+            set { this.returningFrom = value; }
+        }
+    }
+
+    [Serializable]
+    public class TripPoint
+    {
+        // fields
+        private string airportCode;
+        private DateTime date;
+
+        // constructors
+        public TripPoint()
+        {}
+
+        public TripPoint(string airportCode, DateTime date)
+        {
+            this.airportCode = airportCode;
+            this.date = date;
+        }
+
+        // properties
+        public string AirportCode
+        {
+            get { return this.airportCode; }
+            set { this.airportCode = value; }
+        }
+
+        public DateTime Date
+        {
+            get { return this.date; }
+            set { this.date = value; }
+        }
+    }
+
+    [Serializable]
+    public enum TripMode
+    {
+        OneWay,
+        RoundTrip
+    }
+}</programlisting>As you can see, <classname>Trip</classname> class uses the
+    <classname>TripPoint</classname> class to represent departure and return,
+    which are exposed as <literal>StartingFrom</literal> and
+    <literal>ReturningFrom</literal> properties. It also uses
+    <classname>TripMode</classname> enumeration to specify whether the trip is
+    one way or return trip, which is exposed as <literal>Mode</literal>
+    property.</para>
+
+    <para>Finally, let's see the code-behind class that ties everything
+    together:<programlisting>public class TripForm : Spring.Web.UI.Page
+{
+    // model
+    private Trip trip;
+    public Trip Trip
+    {
+        get { return trip; }
+        set { trip = value; }
+    }
+
+    // service dependency, injected by Spring IoC container
+    private IBookingAgent bookingAgent;
+    public IBookingAgent BookingAgent
+    {
+        set { bookingAgent = value; }
+    }
+
+    // model management methods
+    protected override void InitializeModel()
+    {
+        trip = new Trip();
+        trip.Mode = TripMode.RoundTrip;
+        trip.StartingFrom.Date = DateTime.Today;
+        trip.ReturningFrom.Date = DateTime.Today.AddDays(1);
+    }
+
+    protected override void LoadModel(object savedModel)
+    {
+        trip = (Trip) savedModel;
+    }
+
+    protected override object SaveModel()
+    {
+        return trip;
+    }
+
+    // data binding rules
+    protected override void InitializeDataBindings()
+    {
+        BindingManager.AddBinding("tripMode.Value", "Trip.Mode");
+        BindingManager.AddBinding("leavingFromAirportCode.SelectedValue", "Trip.StartingFrom.AirportCode");
+        BindingManager.AddBinding("goingToAirportCode.SelectedValue", "Trip.ReturningFrom.AirportCode");
+        BindingManager.AddBinding("departureDate.SelectedDate", "Trip.StartingFrom.Date");
+        BindingManager.AddBinding("returnDate.SelectedDate", "Trip.ReturningFrom.Date");
+    }
+
+    // event handler for findFlights button, uses injected 'bookingAgent'
+    // service and model 'trip' object to find flights
+    private void SearchForFlights(object sender, EventArgs e)
+    {
+        FlightSuggestions suggestions = bookingAgent.SuggestFlights(trip);
+        if (suggestions.HasOutboundFlights)
+        {
+            // redirect to SuggestedFlights page
+        }
+    }
+}</programlisting>There are quite a few things that are happening in this
+    relatively simple piece of code, so it's worth that we spend some time on
+    each one:<orderedlist>
+        <listitem>
+          <para>When the page is initially loaded (<literal>IsPostback ==
+          false</literal>), the <literal>InitializeModel</literal> method is
+          called which initializes the trip object by creating a new instance
+          and setting its properties to desired values. Right before the page
+          is rendered, <literal>the SaveModel</literal> method will be invoked
+          and whatever the value it returns will be stored within the HTTP
+          Session. Finally, on each postback, <literal>the LoadModel</literal>
+          method will be called and the value returned by the previous call to
+          <literal>SaveModel</literal> will be passed to it as an
+          argument.</para>
+
+          <para>In this particular case the implementation is very simple
+          because our whole model is just the <literal>trip</literal> object.
+          As such, <literal>SaveModel</literal> simply returns the
+          <literal>trip</literal> object and <literal>LoadModel</literal>
+          casts the <literal>savedModel</literal> argument to
+          <classname>Trip</classname> and assigns it to the
+          <literal>trip</literal> field within the page. In the more complex
+          scenarios, you will typically return a dictionary containing your
+          model objects from the <literal>SaveModel</literal> method, and read
+          the values from that dictionary within the
+          <literal>LoadModel</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>InitializeDataBindings</literal> method defines the
+          binding rules for all five input controls on our form. It does so by
+          invoking <literal>AddBinding</literal> method on the
+          <literal>BindingManager</literal> exposed by the page.
+          <literal>AddBinding</literal> method is heavily overloaded and it
+          allows you to specify a <emphasis>binding direction</emphasis> and a
+          <emphasis>formatter</emphasis> to use in addition to the
+          <emphasis>source and target binding expressions</emphasis> that are
+          used above. We'll discuss these optional parameters shortly, but for
+          now let's focus on the source and target expressions.</para>
+
+          <para>The Data Binding framework uses Spring.NET Expression Language
+          to define binding expressions. In most cases, like in the example
+          above, both source and target expression will evaluate to a property
+          or a field within one of the controls or a data model. This is
+          always the case when you are setting a bi-directional binding, as
+          both binding expressions need to be "settable". What is important to
+          remember about <literal>InitializeDataBindings</literal> method is
+          that it is executed only once <emphasis>per page type</emphasis>.
+          Basically, all of the binding expressions are parsed the first time
+          the page is instantiated, and are the cached and used by all
+          instances of that same page type that are created at a later time.
+          This is done for performance reasons, as data binding expression
+          parsing on every postback is unnecessary and would add a significant
+          overhead to the overall page processing time.</para>
+        </listitem>
+
+        <listitem>
+          <para>If you look at the SearchForFlights event handler, you will
+          notice that it has no dependencies on the view elements. It simply
+          uses the injected bookingAgent service and a trip object that in
+          order to obtain a list of suggested flights. Furthermore, if you
+          make any modifications to the trip object within your event handler,
+          bound controls will be updated accordingly just before the page is
+          rendered.</para>
+
+          <para>This accomplishes one of the major goals we set out to
+          achieve, allowing developers to remove view element references from
+          the page event handlers and decouple controller-type methods from
+          the view.</para>
+        </listitem>
+      </orderedlist></para>
+
+    <para>Now that you have a solid high-level picture of how Spring.NET data
+    binding and model management are typically used in web applications, let's
+    take a look at the details and see how data binding is actually
+    implemented under the hood, what the extension points are, and what are
+    some additional features that make data binding framework usable in
+    real-world applications.</para>
+
+    <sect2 id="web-binding-detail">
+      <title>Data Binding Under the Hood</title>
+
+      <para>Spring.NET Data Binding framework revolves around two main
+      interfaces: <literal>IBinding</literal> and
+      <literal>IBindingContainer</literal>. The <literal>IBinding</literal>
+      interface is definitely the more important one of the two, as it has to
+      be implemented by all binding types. This interface defines several
+      methods, with some of them being overloaded for
+      convenience:<programlisting>public interface IBinding
+{
+    void BindSourceToTarget(object source, object target, ValidationErrors validationErrors);
+
+    void BindSourceToTarget(object source, object target, ValidationErrors validationErrors, 
+                            IDictionary variables);
+
+    void BindTargetToSource(object source, object target, ValidationErrors validationErrors);
+
+    void BindTargetToSource(object source, object target, ValidationErrors validationErrors, 
+                            IDictionary variables);
+
+    void SetErrorMessage(string messageId, params string[] errorProviders);
+}</programlisting>As their names imply, <literal>BindSourceToTarget</literal>
+      method is used to extract and copy bound values from the source object
+      to the target object, while <literal>BindTargetToSource</literal> does
+      the opposite. Both method names and parameter types are very generic for
+      a good reason -- data binding framework can indeed be used to bind any
+      two objects. Using it to bind web forms to model objects is just one of
+      its possible uses, although a very common one and tightly integrated
+      into the Spring.NET Web Framework.</para>
+
+      <para>The <literal>validationErrors</literal> parameter requires further
+      explanation. While the data binding framework is not in any way coupled
+      to the data validation framework, they are in some ways related. For
+      example, while the data validation framework is best suited to validate
+      the populated model according to the business rules, the data binding
+      framework is in a better position to validate data types during the
+      binding process. However, regardless of where specific validation is
+      performed, all error messages should be presented to the user in a
+      consistent manner. In order to accomplish this, Spring.NET Web Framework
+      passes the same ValidationErrors instance to binding methods and to any
+      validators that might be executed within your event handlers. This
+      ensures that all error messages are stored together and are displayed
+      consistently to the end user, using Spring.NET validation error
+      controls.</para>
+
+      <para>The last method in the <literal>IBinding</literal> interface,
+      <literal>SetErrorMessage</literal>, enables this by allowing you to
+      specify the resource id of the error message to be displayed in the case
+      of binding error, as well as the list of error providers that messages
+      should be displayed in. We will see an example of the
+      <literal>SetErrorMessage</literal> usage shortly.</para>
+
+      <para>The <literal>IBindingContainer</literal> interface extends the
+      <literal>IBinding</literal> interface and adds the following
+      members:<programlisting>public interface IBindingContainer : IBinding
+{
+  bool HasBindings { get; }
+
+  IBinding AddBinding(IBinding binding);
+  IBinding AddBinding(string sourceExpression, string targetExpression);
+  IBinding AddBinding(string sourceExpression, string targetExpression, BindingDirection direction);
+  IBinding AddBinding(string sourceExpression, string targetExpression, IFormatter formatter);
+  IBinding AddBinding(string sourceExpression, string targetExpression, BindingDirection direction, 
+                      IFormatter formatter);
+}</programlisting>As you can see, this interface has a number of overloaded
+      <literal>AddBinding</literal> methods. The first one,
+      <literal>AddBinding(IBinding binding)</literal> is the most generic one,
+      as it can be used to add any binding type to the container. The other
+      four are convenience methods that provide a simple way to add the most
+      commonly used binding type, <literal>SimpleExpressionBinding</literal>.
+      The <literal>SimpleExpressionBinding</literal> is what we used in the
+      example at the beginning of this section to bind our web form to a
+      <classname>Trip</classname> instance. It uses Spring.NET Expression
+      Language to extract and to set values within source and target objects.
+      We discussed <literal>sourceExpression</literal> and
+      <literal>targetExpression</literal> arguments earlier, so let's focus on
+      the remaining ones.</para>
+
+      <sect3 id="web-binding-direction">
+        <title>Binding Direction</title>
+
+        <para>The direction argument determines whether the binding is
+        bidirectional or unidirectional. By default, all data bindings are
+        bidirectional unless the direction argument is set to either
+        <literal>BindingDirection.SourceToTarget</literal> or
+        <literal>BindingDirection.TargetToSource</literal>. If one of these
+        two values is specified, binding will be evaluated only when the
+        appropriate <literal>Bind</literal><emphasis>Direction</emphasis>
+        method is invoked, and will be completely ignored in the other
+        direction. This is very useful when you want to bind some information
+        from the model into non-input controls, such as labels.</para>
+
+        <para>However, unidirectional data bindings are also useful when your
+        form doesn't have a simple one-to-one mapping to presentation model.
+        In our earlier trip form example, the presentation model was
+        intentionally designed to allow for simple one-to-one mappings. For
+        the sake of discussion, let's add the <classname>Airport</classname>
+        class and modify our <classname>TripPoint</classname> class like
+        this:<programlisting>namespace SpringAir.Domain
+{
+    [Serializable]
+    public class TripPoint
+    {
+        // fields
+        private Airport airport;
+        private DateTime date;
+
+        // constructors
+        public TripPoint()
+        {}
+
+        public TripPoint(Airport airport, DateTime date)
+        {
+            this.airport = airport;
+            this.date = date;
+        }
+
+        // properties
+        public Airport Airport
+        {
+            get { return this.airport; }
+            set { this.airport = value; }
+        }
+
+        public DateTime Date
+        {
+            get { return this.date; }
+            set { this.date = value; }
+        }
+    }
+
+    [Serializable]
+    public class Airport
+    {
+        // fields
+        private string code;
+        private string name;
+
+       // properties
+        public string Code
+        {
+            get { return this.code; }
+            set { this.code = value; }
+        }
+
+        public string Name
+        {
+            get { return this.name; }
+            set { this.name = value; }
+        }
+    }
+}</programlisting>Instead of the string property
+        <literal>AirportCode</literal>, our <classname>TripPoint</classname>
+        class now exposes an <literal>Airport</literal> property of type
+        <classname>Airport</classname>, which is defined above. Now we have a
+        problem: what used to be a simple string to string binding, with the
+        airport code selected in a dropdown being copied directly into the
+        TripPoint.AirportCode property and vice versa, now becomes a not so
+        simple string to <classname>Airport</classname> binding, so let's see
+        how we can solve this mismatch problem.</para>
+
+        <para>First of all, binding from the model to the control is still
+        very straight forward. We just need to set up one-way bindings from
+        the model to controls:<programlisting>protected override void InitializeDataBindings()
+    {
+        BindingManager.AddBinding("leavingFromAirportCode.SelectedValue", "Trip.StartingFrom.Airport.Code", BindingDirection.TargetToSource);
+        BindingManager.AddBinding("goingToAirportCode.SelectedValue", "Trip.ReturningFrom.Airport.Code", BindingDirection.TargetToSource);
+        ...
+    }</programlisting>All we need to do is extract airport code value from the
+        <literal>Trip.StartingFrom.Airport.Code</literal> instead of
+        <literal>Trip.StartingFrom.AirportCode</literal>. Unfortunately,
+        binding from the control to the model the same way won't work: we
+        might be able to set <literal>Code</literal> property of the
+        <classname>Airport</classname> object, but that will likely make the
+        <literal>Airport.Name</literal> property invalid. What we really want
+        do is find an instance of the <classname>Airport</classname> class
+        based on the airport code and set the
+        <literal>TripPoint.Airport</literal> property to it. Fortunately, this
+        is very simple to do with Spring.NET data binding, especially because
+        we already have <literal>airportDao</literal> object defined in the
+        Spring context, which has <literal>GetAirport(string
+        airportCode)</literal> finder method. All we need to do is set up data
+        bindings from source to target that will invoke this finder method
+        when evaluating the source expression. Our complete set of bindings
+        for these two drop down lists will then look like
+        this:<programlisting>protected override void InitializeDataBindings()
+    {
+        BindingManager.AddBinding("@(airportDao).GetAirport(leavingFromAirportCode.SelectedValue)", "Trip.StartingFrom.Airport", BindingDirection.SourceToTarget);
+        BindingManager.AddBinding("leavingFromAirportCode.SelectedValue", "Trip.StartingFrom.Airport.Code", BindingDirection.TargetToSource);
+
+        BindingManager.AddBinding("@(airportDao).GetAirport(goingToAirportCode.SelectedValue)", "Trip.ReturningFrom.Airport", BindingDirection.SourceToTarget);
+        BindingManager.AddBinding("goingToAirportCode.SelectedValue", "Trip.ReturningFrom.Airport.Code", BindingDirection.TargetToSource);
+        ...
+    }</programlisting>That's it -- by using two unidirectional bindings with
+        different expressions and by leveraging the fact that expressions can
+        reference objects defined in the Spring context, we were able to solve
+        this non-trivial data binding problem.</para>
+      </sect3>
+
+      <sect3 id="web-binding-formatters">
+        <title>Formatters</title>
+
+        <para>The last argument to <literal>AddBinding</literal> method that
+        we need to discuss is a <literal>formatter</literal> argument. This
+        argument allows you to specify a formatter that should be used to
+        parse string value from the typical input control before it is bound
+        to the model, and to format strongly typed model value before it is
+        bound to the control.</para>
+
+        <para>You will typically use one of the formatters provided in the
+        Spring.Globalization.Formatters namespace, but if you have
+        requirements that cannot be satisfied by one of the standard
+        formatters it is easy enough to write your own -- all you need to do
+        is implement a very simple IFormatter interface:<programlisting>public interface IFormatter
+{
+    string Format(object value);
+    object Parse(string value);
+}</programlisting></para>
+
+        <para>Standard formatters provided with Spring.NET are:
+        <literal>CurrencyFormatter</literal>,
+        <literal>DateTimeFormatter</literal>,
+        <literal>FloatFormatter</literal>,
+        <literal>IntegerFormatter</literal>,
+        <literal>NumberFormatter</literal> and
+        <literal>PercentFormatter</literal>, which should be sufficient for
+        most usage scenarios.</para>
+      </sect3>
+
+      <sect3 id="web-id-typeconversion">
+        <title>Type Conversion</title>
+
+        <para>Because the data binding framework uses the same expression
+        evaluation engine as the Spring.NET IoC container, it will use any
+        registered type converters to perform data binding. Many type
+        converters are included with Spring.NET (take a look at the classes in
+        Spring.Objects.TypeConverters namespace) and automatically registered
+        for you, but you can implement your own custom converters and register
+        them using standard Spring.NET type converter registration
+        mechanisms.</para>
+      </sect3>
+
+      <sect3 id="web-binding-events">
+        <title>Data Binding Events</title>
+
+        <para>Spring.Web's base <classname>Page</classname> class adds two
+        events to the standard .NET page lifecycle -
+        <literal>DataBound</literal> and
+        <literal>DataUnbound</literal>.</para>
+
+        <para>The <literal>DataUnbound</literal> event is fired after the data
+        model has been updated using values from the controls. It is fired
+        right after the <literal>Load</literal> event and only on postbacks,
+        because it doesn't make sense to update the data model using the
+        controls' initial values.</para>
+
+        <para>The <literal>DataBound</literal> is fired after controls have
+        been updated using values from the data model. This happens right
+        before the <literal>PreRender</literal> event.</para>
+
+        <para>The fact that data model is updated immediately after the
+        <literal>Load</literal> event and that controls are updated right
+        before the <literal>PreRender</literal> event means that your event
+        handlers will be able to work with a correctly updated data model, as
+        they execute after the <literal>Load</literal> event, and that any
+        changes you make to the data model within event handlers will be
+        reflected in the controls immediately afterwards, as they (the
+        controls) are updated prior to the actual rendering.</para>
+      </sect3>
+
+      <sect3 id="web-binding-errors">
+        <title>Rendering Binding Errors</title>
+
+        <para>If there are errors in the databinding, for example, trying to
+        bind a string 'hello' to an integer property on the model, you can
+        specify how those fundamental binding errors should be rendered. An
+        example of this shown below taken from the WebQuickStart
+        'RobustEmployeeInfo' example.</para>
+
+        <programlisting>[Default.aspx.cs]
+
+protected override void InitializeDataBindings()
+{
+  // collect txtId.Text binding errors in "id.errors" collection
+  BindingManager.AddBinding("txtId.Text", "Employee.Id").SetErrorMessage("ID has to be an integer", "id.errors");
+  ...
+
+[Default.aspx]
+...
+&lt;asp:TextBox ID="txtId" runat="server" /&gt;
+&lt;!-- output validation errors from "id.errors" collection --&gt;
+&lt;spring:ValidationError Provider="id.errors" runat="server" /&gt;
+...</programlisting>
+
+        <para>The SetErrorMessage specifies the message text or resource id of
+        the error message to be displayed followed by a variable length list
+        of strings that specify the collection of error providers message
+        where the message should be displayed. In the above case the error
+        provider will be rendered in Spring's ValidationError User Control.
+        See</para>
+      </sect3>
+
+      <sect3 id="web-binding-list">
+        <title>HttpRequestListBindingContainer</title>
+
+        <para>HttpRequestListBindingContainer extracts posted raw values from
+        the request and populates the specified IList by creating objects of
+        the type specified and populating each of these objects according to
+        the requestBindings collection.</para>
+
+        <para>Please checkout the WebQuickStart sample's demo of
+        HttpRequestListBindingContainer. Below</para>
+
+        <para><programlisting>protected override void InitializeDataBindings()
+{
+  // HttpRequestListBindingContainer unbinds specified values from Request -&gt; Productlist
+  HttpRequestListBindingContainer requestBindings =
+      new HttpRequestListBindingContainer("sku,name,quantity,price", "Products", typeof(ProductInfo));
+  requestBindings.AddBinding("sku", "Sku");
+  requestBindings.AddBinding("name", "Name");
+  requestBindings.AddBinding("quantity", "Quantity", quantityFormatter);
+  requestBindings.AddBinding("price", "Price", priceFormatter);
+
+  BindingManager.AddBinding(requestBindings);
+}</programlisting></para>
+
+        <note>
+           Due to the fact, that browsers don't send the values of unchecked checkboxes, you can't use HttpRequestListBindingContainer with &lt;input type="checkbox" &gt; html controls. 
+        </note>
+      </sect3>
+    </sect2>
+
+    <sect2 id="web-databindingpanel">
+      <title>Using DataBindingPanel</title>
+
+      <para>To simplify use of Spring's Data Binding feature on web pages and
+      controls, Spring.Web provides a special DataBindingPanel container
+      control. A DataBindingPanel does not render any html code itself, but
+      allows for specifying additional, data binding related attributes to its
+      child controls:</para>
+
+      <para><programlisting>&lt;%@ Page Language="C#" CodeFile="Default.aspx.cs" Inherits="DataBinding_EasyEmployeeInfo_Default" %&gt;
+&lt;%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %&gt;
+&lt;html&gt;
+&lt;body&gt;
+&lt;spring:DataBindingPanel ID="ctlDataBindingPanel" runat="server"&gt;
+    &lt;table cellpadding="3" cellspacing="3" border="0"&gt;
+        &lt;tr&gt;
+            &lt;td&gt;Employee ID:&lt;/td&gt;
+            &lt;td&gt;
+                &lt;asp:TextBox ID="txtId" runat="server" BindingTarget="Employee.Id" /&gt;
+            &lt;/td&gt;
+        &lt;/tr&gt;
+        &lt;tr&gt;
+            &lt;td&gt;First Name:&lt;/td&gt;
+            &lt;td&gt;&lt;asp:TextBox ID="txtFirstName" runat="server" BindingTarget="Employee.FirstName" /&gt;&lt;/td&gt;
+        &lt;/tr&gt;
+    &lt;/table&gt;
+&lt;/spring.DataBindingPanel&gt;
+&lt;/body&gt;
+&lt;/html&gt;</programlisting></para>
+
+      <para>Using DataBindingPanel the binding information can be specified
+      directly on the control declaration. The following attributes are
+      recognized by a DataBindingPanel:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>BindingTarget</para>
+
+          <para>corresponds to the target expression used in
+          IBindingContainer.AddBinding()</para>
+        </listitem>
+
+        <listitem>
+          <para>BindingSource</para>
+
+          <para>corresponds to the source expression used in
+          IBindingContainer.AddBinding(). For standard controls you don't need
+          to specify the source expression. If you are binding to some custom
+          control, of course you must specific this attribute.</para>
+        </listitem>
+
+        <listitem>
+          <para>BindingDirection</para>
+
+          <para>one of the values of the BindingDirection enumeration</para>
+        </listitem>
+
+        <listitem>
+          <para>BindingFormatter</para>
+
+          <para>if you need a custom formatter, you can specific the object
+          name of a formatter here. The formatter instance will be obtained by
+          a call to IApplicationContext.GetObject() each time it is
+          needed.</para>
+        </listitem>
+
+        <listitem>
+          <para>BindingType</para>
+
+          <para>In case you need a completely customized binding, specify its
+          type here. Note that a custom binding type must implement the
+          following constructor signature:</para>
+
+          <para><literal>ctor(string source,string target, BindingDirection,
+          IFormatter)</literal></para>
+        </listitem>
+      </itemizedlist>
+
+      <note>
+         The Visual Studio Web Form Editor will of course complain about binding attributes because it doesn't know them. You can safely ignore those warnings. 
+      </note>
+    </sect2>
+  </sect1>
+
+  <sect1 id="web-localization">
+    <title>Localization and Message Sources</title>
+
+    <para>While recognizing that the .NET framework has excellent support for
+    localization, the support within ASP.NET 1.x is somewhat
+    incomplete.</para>
+
+    <para>Every <literal>.aspx</literal> page in an ASP.NET project has a
+    resource file associated with it, but those resources are never used (by
+    the current ASP.NET infrastructure). ASP.NET 2.0 will change that and
+    allow application developers to use local resources for pages. In the
+    meantime, the Spring.NET team built support for using local pages
+    resources into Spring.Web thus allowing application developers to start
+    using ASP.NET 2.0-like page resources immediately.</para>
+
+    <para>Spring.Web supports several different approaches to localization
+    within a web application, which can be mixed and matched as appropriate.
+    Both push and pull mechanisms are supported, as well as the fallback to
+    globally defined resources when a local resource cannot be found.
+    Spring.Web also provides support for user culture management and image
+    localization, which are described in the later sections.</para>
+
+    <tip>
+      <para>Introductory material covering ASP.NET Globalization and
+      Localization can be found at the following URLs; <ulink
+      url="http://msdn.microsoft.com/asp.net/community/authors/mlb/default.aspx?pull=/library/en-us/dnaspp/html/aspnet-globalarchi.asp">Globalization
+      Architecture for ASP.NET</ulink> and <ulink
+      url="http://www.theserverside.net/articles/showarticle.tss?id=LocalizationPractices">Localization
+      Practices for ASP.NET 2.0</ulink> by Michele Leroux Bustamante.</para>
+    </tip>
+
+    <sect2 id="web-localization-push">
+      <title>Automatic Localization Using Localizers ("Push"
+      Localization)</title>
+
+      <para>The central idea behind 'push' localization is that an application
+      developer should be able to specify localization resources in the
+      resource file for the page and have those resources automatically
+      applied to the user controls on the page by the framework. For example,
+      an application developer could define a page such as
+      <literal>UserRegistration.aspx</literal>...</para>
+
+      <programlisting>&lt;%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %&gt;
+&lt;%@ Page language="c#" Codebehind="UserRegistration.aspx.cs"
+    AutoEventWireup="false" Inherits="ArtFair.Web.UI.Forms.UserRegistration" %&gt;
+&lt;html&gt;
+    &lt;body&gt;
+        &lt;spring:Content id="mainContent" contentPlaceholderId="main" runat="server"&gt;
+            &lt;div align="right"&gt;
+                &lt;asp:LinkButton ID="english" Runat="server" CommandArgument="en-US"&gt;English&lt;/asp:LinkButton&gt;&amp;nbsp;
+                &lt;asp:LinkButton ID="serbian" Runat="server" CommandArgument="sr-SP-Latn"&gt;Srpski&lt;/asp:LinkButton&gt;
+            &lt;/div&gt;
+            &lt;table&gt;
+                &lt;tr&gt;
+                    &lt;td&gt;&lt;asp:Label id="emailLabel" Runat="server"/&gt;&lt;/td&gt;
+                    &lt;td&gt;&lt;asp:TextBox id="email" Runat="server" Width="150px"/&gt;&lt;/td&gt;
+                &lt;/tr&gt;
+                &lt;tr&gt;
+                    &lt;td&gt;&lt;asp:Label id="passwordLabel" Runat="server"/&gt;&lt;/td&gt;
+                    &lt;td&gt;&lt;asp:TextBox id="password" Runat="server" Width="150px"/&gt;&lt;/td&gt;
+                &lt;/tr&gt;
+                &lt;tr&gt;
+                    &lt;td&gt;&lt;asp:Label id="passwordConfirmationLabel" Runat="server"/&gt;&lt;/td&gt;
+                    &lt;td&gt;&lt;asp:TextBox id="passwordConfirmation" Runat="server" Width="150px"/&gt;&lt;/td&gt;
+                &lt;/tr&gt;
+                &lt;tr&gt;
+                    &lt;td&gt;&lt;asp:Label id="nameLabel" Runat="server"/&gt;&lt;/td&gt;
+                    &lt;td&gt;&lt;asp:TextBox id="name" Runat="server" Width="150px"/&gt;&lt;/td&gt;
+                &lt;/tr&gt;
+...
+
+                &lt;tr&gt;
+                    &lt;td colspan="2"&gt;
+                        &lt;asp:Button id="saveButton" Runat="server"/&gt;&amp;nbsp;
+                        &lt;asp:Button id="cancelButton" Runat="server"/&gt;
+                    &lt;/td&gt;
+                &lt;/tr&gt;
+            &lt;/table&gt;
+        &lt;/spring:Content&gt;
+    &lt;/body&gt;
+&lt;/html&gt;</programlisting>
+
+      <para>A close inspection of the above <literal>.aspx</literal> code
+      reveals that none of the <classname>Label</classname> or
+      <classname>Button</classname> controls have had a value assigned to the
+      <literal>Text</literal> property. The values of the
+      <literal>Text</literal> property for these controls are stored in the
+      local resource file (of the page) using the following convention to
+      identify the resource (string).</para>
+
+      <programlisting>$this.controlId.propertyName</programlisting>
+
+      <para>The corresponding local resource file,
+      <literal>UserRegistration.aspx.resx</literal>, is shown below.</para>
+
+      <programlisting>&lt;root&gt;
+  &lt;data name="$this.emailLabel.Text"&gt;
+    &lt;value&gt;Email:&lt;/value&gt;
+  &lt;/data&gt;
+  &lt;data name="$this.passwordLabel.Text"&gt;
+    &lt;value&gt;Password:&lt;/value&gt;
+  &lt;/data&gt;
+  &lt;data name="$this.passwordConfirmationLabel.Text"&gt;
+    &lt;value&gt;Confirm password:&lt;/value&gt;
+  &lt;/data&gt;
+  &lt;data name="$this.nameLabel.Text"&gt;
+    &lt;value&gt;Full name:&lt;/value&gt;
+  &lt;/data&gt;
+
+...
+
+  &lt;data name="$this.countryLabel.Text"&gt;
+    &lt;value&gt;Country:&lt;/value&gt;
+  &lt;/data&gt;
+  &lt;data name="$this.saveButton.Text"&gt;
+    &lt;value&gt;$messageSource.save&lt;/value&gt;
+  &lt;/data&gt;
+  &lt;data name="$this.cancelButton.Text"&gt;
+    &lt;value&gt;$messageSource.cancel&lt;/value&gt;
+  &lt;/data&gt;
+&lt;/root&gt;</programlisting>
+
+      <tip>
+        <title>VS2003</title>
+
+        <para>To view the .resx file for a page, you may need to enable
+        "Project/Show All Files" in Visual Studio. When "Show All Files" is
+        enabled, the .resx file appears like a "child" of the code-behind
+        page.</para>
+
+        <para>When Visual Studio creates the .resx file, it will include a
+        <literal>xds:schema</literal> element and several
+        <literal>reshead</literal> elements. Your data elements will follow
+        the <literal>reshead</literal> elements. When working with the .resx
+        files, you may want to choose "Open With" from the context menu and
+        select the "Source Code" text editor.</para>
+      </tip>
+
+      <tip>
+        <title>VS2005</title>
+
+        <para>To create a resource file in VS2005, open your control or page
+        in design mode and select "Tools/Generate local resource" from the
+        menu</para>
+      </tip>
+
+      <para>Finally a localizer must be configured for the page to enable
+      automatic localization:</para>
+
+      <programlisting>&lt;object id="localizer" type="Spring.Globalization.Localizers.ResourceSetLocalizer, Spring.Core"/&gt;
+
+&lt;object type="UserRegistration.aspx"&gt;
+    &lt;property name="Localizer" ref="localizer"/&gt;
+&lt;/object&gt;</programlisting>
+
+      <para>For more information on configuring localizers see <xref
+      linkend="web-localizers" /></para>
+    </sect2>
+
+    <sect2 id="web-globalresources">
+      <title>Global Message Sources</title>
+
+      <para>The last two resource definitions from the previous section
+      require some additional explanation:</para>
+
+      <programlisting>&lt;data name="$this.saveButton.Text"&gt;
+    &lt;value&gt;$messageSource.save&lt;/value&gt;
+  &lt;/data&gt;
+  &lt;data name="$this.cancelButton.Text"&gt;
+    &lt;value&gt;$messageSource.cancel&lt;/value&gt;
+  &lt;/data&gt;</programlisting>
+
+      <para>In some cases it makes sense to apply a resource that is defined
+      <emphasis>globally</emphasis> as opposed to locally. In this example, it
+      makes better sense to define values for the <literal>Save</literal> and
+      <literal>Cancel</literal> buttons globally as they will probably be used
+      throughout the application.</para>
+
+      <para>The above example demonstrates how one can achieve that by
+      defining a <emphasis>resource redirection</emphasis> expression as the
+      value of a local resource by prefixing a global resource name with the
+      following string.</para>
+
+      <programlisting>$messageSource.</programlisting>
+
+      <para>Taking the case of the above example, this will tell the localizer
+      to use the <literal>save</literal> and <literal>cancel</literal>
+      portions of the resource key as lookup keys to retrieve the actual
+      values from a global message source. The important thing to remember is
+      that one need only define a resource redirect once, typically in the
+      invariant resource file – any lookup for a resource redirect will simply
+      fall back to the invariant culture, and result in a global message
+      source lookup using the correct culture.</para>
+
+      <para>Global resources are (on a per-context basis) defined as a plain
+      vanilla object definition using the reserved name of
+      <literal>'messageSource'</literal>, which one can add to one's
+      Spring.NET configuration file as shown below.</para>
+
+      <programlisting>&lt;object id="messageSource" type="Spring.Context.Support.ResourceSetMessageSource, Spring.Core"&gt;
+    &lt;property name="ResourceManagers"&gt;
+        &lt;list&gt;
+            &lt;value&gt;MyApp.Web.Resources.Strings, MyApp.Web&lt;/value&gt;
+        &lt;/list&gt;
+    &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+
+      <important>
+        <title>NET 2.0</title>
+
+        <para>To use resources from your App_GlobalResources folder, specify
+        <literal>App_GlobalResources</literal> as assembly name (see the
+        SpringAir example application for more):</para>
+
+        <literal>&lt;value&gt;Resources.Strings,
+        App_GlobalResources&lt;/value&gt;</literal>
+      </important>
+
+      <para>The global resources are cached within the Spring.NET
+      <classname>IApplicationContext</classname> and are accessible through
+      the Spring.NET <literal>IMessageSource</literal> interface.</para>
+
+      <para>The Spring.Web <literal>Page</literal> and
+      <literal>UserControl</literal> classes have a reference to their owning
+      <classname>IApplicationContext</classname> and it's associated
+      <literal>IMessageSource</literal>. As such, they will automatically
+      redirect resource lookups to a global message source if a local resource
+      cannot be found.</para>
+
+      <para>Currently, the <literal>ResourceSetMessageSource</literal> is the
+      only message source implementation that ships with Spring.NET.</para>
+    </sect2>
+
+    <sect2 id="web-localizers">
+      <title>Working with Localizers</title>
+
+      <para>In order to apply resources automatically, a localizer needs to be
+      injected into all pages requiring this feature (typically accomplished
+      using a base page definition that other pages will inherit from). The
+      injected localizer will inspect the resource file when the page is first
+      requested, cache the resources that start with the
+      <literal>'$this'</literal> marker string value, and apply the values to
+      the controls that populate the page prior to the page being
+      rendered.</para>
+
+      <para>A localizer is simply an object that implements the
+      <classname>Spring.Globalization.ILocalizer</classname> interface.
+      <classname>Spring.Globalization.AbstractLocalizer</classname> is
+      provided as a convenient base class for localization: this class has one
+      abstract method, <literal>LoadResources</literal>. This method must load
+      and return a list of all the resources that must be automatically
+      applied from the resource store.</para>
+
+      <para>Spring.NET ships with one concrete implementation of a localizer,
+      <classname>Spring.Globalization.Localizers.ResourceSetLocalizer</classname>,
+      that retrieves a list of resources to apply from the local resource
+      file. Future releases of Spring.NET may provide other localizers that
+      read resources from an XML file or even a flat text file that contains
+      resource name-value pairs which will allow application developers to
+      store resources within the files in a web application instead of as
+      embedded resources in an assembly. Of course, if an application
+      developer would rather store such resources in a database, he or she can
+      write their own <classname>ILocalizer</classname> implementation that
+      will load a list of resources to apply from a database.</para>
+
+      <para>As mentioned previously, one would typically configure the
+      localizer to be used within an abstract base definition for those pages
+      that require localization as shown below.</para>
+
+      <programlisting>&lt;object id="localizer" type="Spring.Globalization.Localizers.ResourceSetLocalizer, Spring.Core"/&gt;
+
+&lt;object name="basePage" abstract="true"&gt;
+    &lt;description&gt;
+        Pages that reference this definition as their parent
+        (see examples below) will automatically inherit following properties.
+    &lt;/description&gt;
+    &lt;property name="Localizer" ref="localizer"/&gt;
+&lt;/object&gt;</programlisting>
+
+      <para>Of course, nothing prevents an application developer from defining
+      a different localizer for each page in the application; in any case, one
+      can always override the localizer defined in a base (page) definition.
+      Alternatively, if one does want any resources to be applied
+      automatically one can completely omit the localizer definition.</para>
+
+      <para>One last thing to note is that Spring.NET
+      <classname>UserControl</classname> instances will (by default) inherit
+      the localizer and other localization settings from the page that they
+      are contained within, but one can similarly also override that behavior
+      using explicit dependency injection.</para>
+    </sect2>
+
+    <sect2 id="web-pull-localization">
+      <title>Applying Resources Manually ("Pull" Localization)</title>
+
+      <para>While automatic localization as described above works great for
+      many form-like pages, it doesn't work nearly as well for the controls
+      defined within any iterative controls because the IDs for such iterative
+      controls are not fixed. It also doesn't work well in those cases where
+      one needs to display the same resource multiple times within the same
+      page. For example, think of the header columns for outgoing and return
+      flights tables within the SpringAir application (see <xref
+      linkend="springair" />).</para>
+
+      <para>In these situations, one should use a pull-style mechanism for
+      localization, which boils down to a simple <literal>GetMessage</literal>
+      call as shown below.</para>
+
+      <programlisting>&lt;asp:Repeater id="outboundFlightList" Runat="server"&gt;
+  &lt;HeaderTemplate&gt;
+    &lt;table border="0" width="90%" cellpadding="0" cellspacing="0" align="center" class="suggestedTable"&gt;
+      &lt;thead&gt;
+        &lt;tr class="suggestedTableCaption"&gt;
+          &lt;th colspan="6"&gt;
+            &lt;%= GetMessage("outboundFlights") %&gt;
+          &lt;/th&gt;
+        &lt;/tr&gt;
+        &lt;tr class="suggestedTableColnames"&gt;
+          &lt;th&gt;&lt;%= GetMessage("flightNumber") %&gt;&lt;/th&gt;
+          &lt;th&gt;&lt;%= GetMessage("departureDate") %&gt;&lt;/th&gt;
+          &lt;th&gt;&lt;%= GetMessage("departureAirport") %&gt;&lt;/th&gt;
+          &lt;th&gt;&lt;%= GetMessage("destinationAirport") %&gt;&lt;/th&gt;
+          &lt;th&gt;&lt;%= GetMessage("aircraft") %&gt;&lt;/th&gt;
+          &lt;th&gt;&lt;%= GetMessage("seatPlan") %&gt;&lt;/th&gt;
+        &lt;/tr&gt;
+      &lt;/thead&gt;
+      &lt;tbody&gt;
+  &lt;/HeaderTemplate&gt;</programlisting>
+
+      <para>The <literal>GetMessage</literal> method is available within both
+      the <classname>Spring.Web.UI.Page </classname> and
+      <classname>Spring.Web.UI.UserControl</classname> classes, and it will
+      automatically fall back to a global message source lookup if a local
+      resource is not found.</para>
+    </sect2>
+
+    <sect2 id="web-localizing-images">
+      <title>Localizing Images within a Web Application</title>
+
+      <para>Spring.Web provides an easy (and consistent) way to localize
+      images within a web application. Unlike text resources, which can be
+      stored within embedded resource files, XML files, or even a database,
+      images in a typical web application are usually stored as files on the
+      file system. Using a combination of directory naming conventions and a
+      custom ASP.NET control, Spring.Web allows application developers to
+      localize images within the page as easily as text resources.</para>
+
+      <para>The Spring.Web <literal>Page</literal> class exposes the
+      <literal>ImagesRoot</literal> property, which is used to define the root
+      directory where images are stored. The default value is 'Images', which
+      means that the localizer expects to find an 'Images' directory within
+      the application root, but one can set it to any value in the definition
+      of the page.</para>
+
+      <para>In order to localize images, one needs to create a directory for
+      each localized culture under the <literal>ImagesRoot</literal> directory
+      as shown below.</para>
+
+      <programlisting>/MyApp
+   /Images
+      /en
+      /en-US
+      /fr
+      /fr-CA
+      /sr-SP-Cyrl
+      /sr-SP-Latn
+      ...</programlisting>
+
+      <para>Once an appropriate folder hierarchy is in place all one need do
+      is put the localized images in the appropriate directories and make sure
+      that different translations of the same image are named the same. In
+      order to place a localized image on a page, one needs to use the
+      <literal>&lt;spring:LocalizedImage&gt;</literal> as shown below.</para>
+
+      <programlisting>&lt;%@ Page language="c#" Codebehind="StandardTemplate.aspx.cs"
+                AutoEventWireup="false" Inherits="SpringAir.Web.StandardTemplate" %&gt;
+&lt;%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %&gt;
+&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" &gt;
+&lt;html&gt;
+  &lt;body&gt;
+    &lt;spring:LocalizedImage id="logoImage" imageName="spring-air-logo.jpg" borderWidth="0" runat="server" /&gt;
+  &lt;/body&gt;
+&lt;/html&gt;</programlisting>
+
+      <para>This control will find the most specific directory that contains
+      an image with the specified name using standard localization fallback
+      rules and the user's culture. For example, if the user's culture is
+      <literal>'en-US'</literal>, the localizer will look for the
+      <literal>spring-air-logo.jpg</literal> file in
+      <literal>Images/en-US</literal>, then in <literal>Images/en</literal>
+      and finally, if the image file has still not been found, in the root
+      <literal>Images</literal> directory (which for all practical purposes
+      serves as an invariant culture folder).</para>
+    </sect2>
+
+    <sect2 id="web-culture">
+      <title>User Culture Management</title>
+
+      <para>In addition to global and local resource management, Spring.Web
+      also adds support for user culture management by exposing the current
+      <classname>CultureInfo</classname> through the
+      <literal>UserCulture</literal> property on the
+      <classname>Page</classname> and <classname>UserControl</classname>
+      classes.</para>
+
+      <para>The <literal>UserCulture</literal> property will simply delegate
+      culture resolution to an implementation of
+      <classname>Spring.Globalization.ICultureResolver</classname> interface.
+      One can specify exactly which culture resolver to use by configuring the
+      <literal>CultureResolver</literal> property of the
+      <classname>Page</classname> class in the relevant object definition as
+      shown below.</para>
+
+      <programlisting>&lt;object name="BasePage" abstract="true"&gt;
+    &lt;property name="CultureResolver"&gt;
+        &lt;object type="Spring.Globalization.Resolvers.CookieCultureResolver, Spring.Web"/&gt;
+    &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+
+      <para>Several useful implementations of
+      <classname>ICultureResolver</classname> ship as part of Spring.Web, so
+      it is unlikely that application developers will have to implement their
+      own culture resolver. However, if one does have such a requirement, the
+      resulting implementation should be fairly straightforward as there are
+      only two methods that one need implement. The following sections discuss
+      each available implementation of the
+      <classname>ICultureResolver</classname> interface.</para>
+
+      <sect3>
+        <title>DefaultWebCultureResolver</title>
+
+        <para>This is default culture resolver implementation. It will be used
+        if one does not specify a culture resolver for a page, or if one
+        explicitly injects a <classname>DefaultWebCultureResolver</classname>
+        into a page definition explicitly. The latter case (explicit
+        injection) is sometimes useful because it allows one to specify a
+        culture that should always be used by providing a value to the
+        <literal>DefaultCulture</literal> property on the resolver.</para>
+
+        <para>The <classname>DefaultWebCultureResolver</classname> will first
+        look at the <literal>DefaultCulture</literal> property and return its
+        value if said property value is not null. If it is null, the
+        <classname>DefaultWebCultureResolver</classname> will fall back to
+        request header inspection, and finally, if no
+        <literal>'Accept-Lang'</literal> request headers are present it will
+        return the UI culture of the currently executing thread.</para>
+      </sect3>
+
+      <sect3>
+        <title>RequestCultureResolver</title>
+
+        <para>This resolver works in a similar way to the
+        <classname>DefaultWebCultureResolver</classname> with the exception
+        that it always checks request headers <emphasis>first</emphasis>, and
+        only then falls back to the value of the
+        <literal>DefaultCulture</literal> property or the culture code of the
+        current thread.</para>
+      </sect3>
+
+      <sect3>
+        <title>SessionCultureResolver</title>
+
+        <para>This resolver will look for culture information in the user's
+        session and return it if it finds one. If not, it will fall back to
+        the behavior of the
+        <classname>DefaultWebCultureResolver</classname>.</para>
+      </sect3>
+
+      <sect3>
+        <title>CookieCultureResolver</title>
+
+        <para>This resolver will look for culture information in a cookie, and
+        return it if it finds one. If not, it will fall back to the behavior
+        of the <classname>DefaultWebCultureResolver</classname>.</para>
+
+        <warning>
+          <para><classname>CookieCultureResolver</classname> will not work if
+          your application uses <literal>localhost</literal> as the server
+          URL, which is a typical setting in a development environment.</para>
+
+          <para>In order to work around this limitation you should use
+          <classname>SessionCultureResolver</classname> during development and
+          switch to <classname>CookieCultureResolver</classname> before you
+          deploy the application in a production. This is easily accomplished
+          in Spring.Web (simply change the config file) but is something that
+          you should be aware of.</para>
+        </warning>
+      </sect3>
+    </sect2>
+
+    <sect2 id="web-culture-changing">
+      <title>Changing Cultures</title>
+
+      <para>In order to be able to change the culture application developers
+      will need to use one of the culture resolvers that support culture
+      changes, such as <classname>SessionCultureResolver</classname> or
+      <classname>CookieCultureResolver</classname>. One could also write a
+      custom <classname>ICultureResolver</classname> that will persist culture
+      information in a database, as part of a user's profile.</para>
+
+      <para>Once that requirement is satisfied, all that one need do is to set
+      the <literal>UserCulture</literal> property to a new
+      <classname>CultureInfo</classname> object before the page is rendered.
+      In the following <literal>.aspx</literal> example, there are two link
+      buttons that can be used to change the user's culture. In the
+      code-behind, this is all one need do to set the new culture. A code
+      snippet for the code-behind file
+      (<literal>UserRegistration.aspx.cs</literal>) is shown below.</para>
+
+      <programlisting>protected override void OnInit(EventArgs e)
+{
+    InitializeComponent();
+
+    this.english.Command += new CommandEventHandler(this.SetLanguage);
+    this.serbian.Command += new CommandEventHandler(this.SetLanguage);
+
+    base.OnInit(e);
+}
+
+private void SetLanguage(object sender, CommandEventArgs e)
+{
+    this.UserCulture = new CultureInfo((string) e.CommandArgument);
+}</programlisting>
+    </sect2>
+  </sect1>
+
+  <sect1 id="web-resultmapping">
+    <title>Result Mapping</title>
+
+    <para>One of the problems evident in many ASP.NET applications is that
+    there is no built-in way to externalize the flow of an application. The
+    most common way of defining application flow is by hardcoding calls to the
+    <literal>Response.Redirect</literal> and
+    <literal>Server.Transfer</literal> methods within event handlers.</para>
+
+    <para>This approach is problematic because any changes to the flow of an
+    application necessitates code changes (with the attendant recompilation,
+    testing, redeployment, etc). A much better way, and one that has been
+    proven to work successfully in many MVC ( <ulink
+    url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnpatterns/html/DesMVC.asp">Model-View-Controller</ulink>)
+    web frameworks is to provide the means to externalize the mapping of
+    action results to target pages.</para>
+
+    <para>Spring.Web adds this functionality to ASP.NET by allowing one to
+    define result mappings within the definition of a page, and to then simply
+    use logical result names within event handlers to control application
+    flow.</para>
+
+    <para>In Spring.Web, a logical result is encapsulated and defined by the
+    <classname>Result</classname> class; because of this one can configure
+    results just like any other object:</para>
+
+    <programlisting>
+&lt;objects xmlns="http://www.springframework.net"&gt;
+
+    &lt;object id="homePageResult" type="Spring.Web.Support.Result, Spring.Web"&gt;
+        &lt;property name="TargetPage" value="~/Default.aspx"/&gt;
+        &lt;property name="Mode" value="Transfer"/&gt;
+        &lt;property name="Parameters"&gt;
+            &lt;dictionary&gt;
+                &lt;entry key="literal" value="My Text"/&gt;
+                &lt;entry key="name" value="%{UserInfo.FullName}"/&gt;
+                &lt;entry key="host" value="%{Request.UserHostName}"/&gt;
+            &lt;/dictionary&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;
+
+    &lt;object id="loginPageResult" type="Spring.Web.Support.Result, Spring.Web"&gt;
+        &lt;property name="TargetPage" value="Login.aspx"/&gt;
+        &lt;property name="Mode" value="Redirect"/&gt;
+    &lt;/object&gt;
+
+    &lt;object type="UserRegistration.aspx" parent="basePage"&gt;
+        &lt;property name="UserManager" ref="userManager"/&gt;
+        &lt;property name="Results"&gt;
+            &lt;dictionary&gt;
+                &lt;entry key="userSaved" value-ref="homePageResult"/&gt;
+                &lt;entry key="cancel" value-ref="loginPageResult"/&gt;
+            &lt;/dictionary&gt;
+        &lt;/property&gt;
+    &lt;/object&gt;
+
+&lt;/objects&gt;
+</programlisting>
+
+    <para>The only property that you <emphasis>must</emphasis> supply a value
+    for each and every result is the <literal>TargetPage</literal> property.
+    The value of the <literal>Mode</literal> property can be either
+    <literal>Transfer</literal>, <literal>TransferNoPreserve</literal>,
+    <literal>Redirect</literal>, and defaults to <literal>Transfer</literal>
+    if none is specified. TransferNoPreserve issues a server-side transfer
+    with 'preserveForm=false', so that QueryString and Form data are not
+    preserved.</para>
+
+    <para>If one's target page requires parameters, one can define them using
+    the <literal>Parameters</literal> dictionary property. One simply
+    specifies either literal values or <link linkend="navigation">object
+    navigation expressions</link> for such parameter values; if one specifies
+    an expression, this expression will be evaluated in the context of the
+    page in which the result is being referenced... in the specific case of
+    the above example, this means that any page that uses the
+    <literal>homePageResult</literal> needs to expose a
+    <classname>UserInfo</classname> property on the page class itself.<note>
+        <para>In Spring 1.1.0 and before the prefix used to indicate an object
+        navigation expression in the <literal>Parameters</literal> dictionary
+        property was the dollar sign, i.e.
+        <literal>${UserInfo.FullName}.</literal>This conflicted with the
+        prefix used to perform property replacement, the dollar sign, as
+        described in the section <link
+        linkend="objects-factory-placeholderconfigurer">PropertyPlaceholderConfigurer</link>.
+        As a workaround you can change the prefix and suffix used in
+        PropertyPlaceholderConfigurer to be different, for example prefix =
+        $${ and suffix = }. In Spring 1.1.1 a new prefix character, the
+        percent sign (i.e.<literal>%{UserInfo.FullName}</literal>.) can be
+        used in the <literal>Parameters</literal> dictionary to avoid this
+        conflict so you can keep the familiar NAnt style
+        PropertyPlaceholderConfigurer defaults.</para>
+      </note></para>
+
+    <para>Parameters will be handled differently depending on the result mode.
+    For redirect results, every parameter will be converted to a string, then
+    URL encoded, and finally appended to a redirect query string. On the other
+    hand, parameters for transfer results will be added to the
+    <literal>HttpContext.Items</literal> collection before the request is
+    transferred to the target page. This means that transfers are more
+    flexible because any object can be passed as a parameter between pages.
+    They are also more efficient because they don't require a round-trip to
+    the client and back to the server, so transfer mode is recommended as the
+    preferred result mode (it is also the current default).</para>
+
+    <para>The above example shows independent result object definitions, which
+    are useful for global results such as a home- and login- page.
+    <classname>Result</classname> definitions that are only going to be used
+    by one page should be simply embedded within the definition of a page,
+    either as inner object definitions or using a special shortcut notation
+    for defining a result definition:</para>
+
+    <programlisting>
+&lt;object type="~/UI/Forms/UserRegistration.aspx" parent="basePage"&gt;
+  &lt;property name="UserManager"&gt;
+    &lt;ref object="userManager"/&gt;
+  &lt;/property&gt;
+  
+  &lt;property name="Results"&gt;
+    &lt;dictionary&gt;
+      &lt;entry key="userSaved" value="redirect:UserRegistered.aspx?status=Registration Successful,user=${UserInfo}"/&gt;
+      &lt;entry key="cancel" value-ref="homePageResult"/&gt;
+    &lt;/dictionary&gt;
+  &lt;/property&gt;
+&lt;/object&gt;
+</programlisting>
+
+    <para>The short notation for the result must adhere to the following
+    format...</para>
+
+    <programlisting>[&lt;mode&gt;:]&lt;targetPage&gt;[?param1,param2,...,paramN]</programlisting>
+
+    <para>There are three possible values for the <literal>mode</literal>
+    value referred to in the above notation snippet; they are:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>redirect</para>
+      </listitem>
+
+      <listitem>
+        <para>transfer</para>
+      </listitem>
+
+      <listitem>
+        <para>TransferNoPreserve</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>They correspond to the values of the ResultMode enumeration. One
+    thing to notice is that a comma is used instead of an ampersand to
+    separate parameters; this is done so as to avoid the need for laborious
+    ampersand escaping within an XML object definition. The use of the
+    ampersand character is still supported if required, but one will then have
+    to specify it using the well known &amp; entity reference.</para>
+
+    <para>Once one has defined one's results, it is very simple to use them
+    within the event handlers of one's pages
+    (<literal>UserRegistration.apsx.cs</literal>)...</para>
+
+    <programlisting>private void SaveUser(object sender, EventArgs e)
+{
+    UserManager.SaveUser(UserInfo);
+    SetResult("userSaved");
+}
+
+public void Cancel(object sender, EventArgs e)
+{
+    SetResult("cancel");
+}
+
+protected override void OnInit(EventArgs e)
+{
+    InitializeComponent();
+
+    this.saveButton.Click += new EventHandler(this.SaveUser);
+    this.cancelButton.Click += new EventHandler(this.Cancel);
+
+    base.OnInit(e);
+}</programlisting>
+
+    <para>One could of course further refactor the above example and use
+    defined constants. This would be a good thing to do in the case of a
+    logical result name such as "home" that is likely to be referenced by many
+    pages.</para>
+  </sect1>
+
+  <sect1 id="web-clientscripting">
+    <title>Client-Side Scripting</title>
+
+    <para>ASP.NET has decent support for client-side scripting through the use
+    of the <literal>Page.RegisterClientScriptBlock</literal> and
+    <literal>Page.RegisterStartupScript</literal> methods.</para>
+
+    <para>However, neither of these two methods allows you to output a
+    registered script markup within a <literal>&lt;head&gt;</literal> section
+    of a page, which is (in many cases) exactly what you would like to
+    do.</para>
+
+    <sect2 id="web-scripthead">
+      <title>Registering Scripts within the head HTML section</title>
+
+      <para>Spring.Web adds several methods to enhance client-side scripting
+      to the base <classname>Spring.Web.UI.Page</classname> class:
+      <literal>RegisterHeadScriptBlock</literal> and
+      <literal>RegisterHeadScriptFile</literal>, each with a few overrides.
+      You can call these methods from your custom pages and controls in order
+      to register script blocks and script files that must be included in the
+      <literal>&lt;head&gt;</literal> section of the final HTML page.</para>
+
+      <para>The only additional thing that is required to make this work is
+      that you use the <literal>&lt;spring:Head&gt;</literal> server-side
+      control to define your <literal>&lt;head&gt;</literal> section instead
+      of using the standard HTML <literal>&lt;head&gt;</literal> element. This
+      is shown below.</para>
+
+      <programlisting>&lt;%@ Page language="c#" Codebehind="StandardTemplate.aspx.cs"
+                AutoEventWireup="false" Inherits="SpringAir.Web.StandardTemplate" %&gt;
+&lt;%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %&gt;
+&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" &gt;
+&lt;html&gt;
+  &lt;spring:Head runat="server" id="Head1"&gt;
+    &lt;title&gt;
+      &lt;spring:ContentPlaceHolder id="title" runat="server"&gt;
+        &lt;%= GetMessage("default.title") %&gt;
+      &lt;/spring:ContentPlaceHolder&gt;
+    &lt;/title&gt;
+    &lt;LINK href="&lt;%= CssRoot %&gt;/default.css" type="text/css" rel="stylesheet"&gt;
+    &lt;spring:ContentPlaceHolder id="head" runat="server"&gt;&lt;/spring:ContentPlaceHolder&gt;
+  &lt;/spring:Head&gt;
+  &lt;body&gt;
+  ...
+  &lt;/body&gt;
+&lt;/html&gt;</programlisting>
+
+      <para>The example above shows you how you would typically set-up a
+      <literal>&lt;head&gt;</literal> section within a master page template in
+      order to be able to change the title value and to add additional
+      elements to the <literal>&lt;head&gt;</literal> section from the child
+      pages using <literal>&lt;spring:ContentPlaceholder&gt;</literal>
+      controls. However, only the <literal>&lt;spring:Head&gt;</literal>
+      declaration is required in order for Spring.NET
+      <literal>Register*</literal> scripts to work properly.</para>
+    </sect2>
+
+    <sect2 id="web-scriptcss">
+      <title>Adding CSS Definitions to the head Section</title>
+
+      <para>In a similar fashion, you can add references to CSS files, or even
+      specific styles, directly to the <literal>&lt;head&gt;</literal> HTML
+      section using <literal>Page.RegisterStyle</literal> and
+      <literal>Page.RegisterStyleFile</literal> methods. The latter one simply
+      allows you to include a reference to an external CSS file, while the
+      former one allows you to define embedded style definitions by specifying
+      the style name and definition as the parameters. The final list of style
+      definitions registered this way will be rendered within the single
+      embedded <literal>style</literal> section of the final HTML
+      document.</para>
+    </sect2>
+
+    <sect2 id="web-wellknowdirectory">
+      <title>Well-Known Directories</title>
+
+      <para>In order to make the manual inclusion of client-side scripts, CSS
+      files and images easier, the Spring.Web <literal>Page</literal> class
+      exposes several properties that help you reference such artifacts using
+      absolute paths. This affords web application developers a great deal of
+      convenience functionality straight out of the box if they stick to
+      common conventions such as a web application (directory)
+      structure..</para>
+
+      <para>These properties are <literal>ScriptsRoot</literal>,
+      <literal>CssRoot</literal> and <literal>ImagesRoot</literal>. They have
+      default values of <literal>Scripts</literal>, <literal>CSS</literal> and
+      <literal>Images</literal>, which will work just fine if you create and
+      use these directories in your web application root. However, if you
+      prefer to place them somewhere else, you can always override default
+      values by injecting new values into your page definitions (you will
+      typically inject these values only in the base page definition, as they
+      are normally shared by all the pages in the application). An example of
+      such configuration is shown below:</para>
+
+      <programlisting>&lt;object name="basePage" abstract="true"&gt;
+    &lt;description&gt;
+        Convenience base page definition for all the pages.
+
+        Pages that reference this definition as their parent (see the examples below)
+        will automatically inherit the following properties....
+
+    &lt;/description&gt;
+    &lt;property name="CssRoot" value="Web/CSS"/&gt;
+    &lt;property name="ImagesRoot" value="Web/Images"/&gt;
+&lt;/object&gt;
+</programlisting>
+    </sect2>
+  </sect1>
+
+  <sect1>
+    <title>Spring User Controls</title>
+
+    <para>Spring provides several custom user controls that are located in the
+    <literal>Spring.Web.UI.Controls</literal> namespace. This section
+    primarily lists the controls and points to other documentation to provide
+    additional information. There are a few other controls not documented
+    here, please check the SDK docs for their descriptions.</para>
+
+    <sect2>
+      <title>Validation Controls</title>
+
+      <para>The location in the web page where validation errors are to be
+      rendered can be specifies by using the
+      <classname>ValidationSummary</classname> and
+      <classname>ValidationError</classname> controls. There are two controls
+      since they have different defaults for how errors are rendered.
+      <classname>ValidationSummary</classname> is used to display potentially
+      multiple errors identified by the validation framework.
+      <classname>ValidationError</classname> is used to display field-level
+      validation errors. Please refer to the section <link
+      linkend="validation-aspnet-usage">ASP.NET usage tips</link> in the
+      chapter on the <link linkend="validation">Validation Framework</link>
+      more information.</para>
+    </sect2>
+
+    <sect2>
+      <title>Databinding Controls</title>
+
+      <para>Some standard controls are not easy to use with Spring's
+      databinding support. Examples are check boxes and ratio button groups.
+      In this case you should use the <classname>CheckBoxList</classname> and
+      <classname>RadioButtonGroup</classname> controls. Databinding itself can
+      be done using the <link
+      linkend="web-databindingpanel">DataBindingPanel</link> instead of the
+      using the BindingManager API within the code behind page.</para>
+    </sect2>
+
+    <sect2>
+      <title>Calendar Control</title>
+
+      <para>A pop-up DHTML calendar control is provided. It is a slightly
+      modified version of the <ulink
+      url="http://www.dynarch.com/projects/calendar">Dynarch.com DHTML
+      Calendar</ulink> control written by Mihai Bazon.</para>
+    </sect2>
+
+    <sect2>
+      <title>Panel Control</title>
+
+      <para>You can suppress dependency injection for controls inside your
+      ASP.NET by using the Panel control. See the section <link
+      linkend="web-panel-control-di">Customizing control dependency
+      injection</link> for more information.</para>
+    </sect2>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/webservices.xml b/doc/reference/src/webservices.xml
new file mode 100644
index 00000000..6d4255cc
--- /dev/null
+++ b/doc/reference/src/webservices.xml
@@ -0,0 +1,536 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="webservices">
+  <title>Web Services</title>
+
+  <sect1>
+    <title>Introduction</title>
+
+    <para>While the out-of-the-box support for web services in .NET is
+    excellent, there are a few areas that the Spring.NET thought could use
+    some improvement. Spring adds the ability to perform dependency injection
+    on standard asmx web services. Spring's .NET Web Services support also
+    allows you to export a 'plain .NET object' as a .NET web service By "plain
+    .NET object" we mean classes that do not contain infrastructure specific
+    attributes, such as WebMethod. On the server side, Spring's .NET web
+    service exporters will automatically create a proxy that adds web service
+    attributes. On the client side you can use Spring IoC container to
+    configure a client side proxy that you generated with standard command
+    line tools. Additionally, Spring provides the functionality to create the
+    web service proxy dynamically at runtime (much like running the command
+    line tools but at runtime and without some of the tools quirks) and use
+    dependency injection to configure the resulting proxy class. On both the
+    server and client side, you can apply AOP advice to add behavior such as
+    logging, exception handling, etc. that is not easily encapsulated within
+    an inheritance hierarchy across the application.</para>
+  </sect1>
+
+  <sect1 id="server-side">
+    <title>Server-side</title>
+
+    <para>One thing that the Spring.NET team didn't like much is that we had
+    to have all these .asmx files lying around when all said files did was
+    specify which class to instantiate to handle web service requests.</para>
+
+    <para>Second, the Spring.NET team also wanted to be able to use the
+    Spring.NET IoC container to inject dependencies into our web service
+    instances. Typically, a web service will rely on other objects, service
+    objects for example, so being able to configure which service object
+    implementation to use is very useful.</para>
+
+    <para>Last, but not least, the Spring.NET team did not like the fact that
+    creating a web service is an implementation task. Most (although not all)
+    services are best implemented as normal classes that use coarse-grained
+    service interfaces, and the decision as to whether a particular service
+    should be exposed as a remote object, web service, or even an enterprise
+    (COM+) component, should only be a matter of configuration, and not
+    implementation.</para>
+
+    <para>An example using the web service exporter can be found in quickstart
+    example named 'calculator'. More information can be found here '<link
+    linkend="websvc-example">Web Services example</link>'.</para>
+
+    <sect2>
+      <title>Removing the need for .asmx files</title>
+
+      <para>Unlike web pages, which use <literal>.aspx</literal> files to
+      store presentation code, and code-behind classes for the logic, web
+      services are completely implemented within the code-behind class. This
+      means that .asmx files serve no useful purpose, and as such they should
+      neither be necessary nor indeed required at all.</para>
+
+      <para>Spring.NET allows application developers to expose existing web
+      services easily by registering a custom implementation of the
+      <classname>WebServiceHandlerFactory</classname> class and by creating a
+      standard Spring.NET object definition for the service.</para>
+
+      <para>By way of an example, consider the following web service...</para>
+
+      <programlisting>
+namespace MyComany.MyApp.Services
+{
+    [WebService(Namespace="http://myCompany/services")]
+    public class HelloWorldService
+    {
+        [WebMethod]
+        public string HelloWorld()
+        {
+            return "Hello World!";
+        }
+    }
+}
+      </programlisting>
+
+      <para>This is just a standard class that has methods decorated with the
+      <classname>WebMethod</classname> attribute and (at the class-level) the
+      <classname>WebService</classname> attribute. Application developers can
+      create this web service within Visual Studio just like any other
+      class.</para>
+
+      <para>All that one need to do in order to publish this web service
+      is:</para>
+
+      <para><emphasis> 1. Register the
+      <classname>Spring.Web.Services.WebServiceFactoryHandler</classname> as
+      the HTTP handler for <literal>*.asmx</literal> requests within one's
+      <literal>web.config</literal> file. </emphasis></para>
+
+      <programlisting>
+&lt;system.web&gt;
+    &lt;httpHandlers&gt;
+        &lt;add verb="*" path="*.asmx" type="Spring.Web.Services.WebServiceHandlerFactory, Spring.Web"/&gt;
+    &lt;/httpHandlers&gt;
+&lt;/system.web&gt;
+      </programlisting>
+
+      <para>Of course, one can register any other extension as well, but
+      typically there is no need as Spring.NET's handler factory will behave
+      exactly the same as a standard handler factory if said handler factory
+      cannot find the object definition for the specified service name. In
+      that case the handler factory will simply look for an .asmx file.</para>
+
+      <para>If you are using IIS7 the following configuration is needed</para>
+
+      <programlisting>&lt;system.webServer&gt;
+  &lt;validation validateIntegratedModeConfiguration="false"/&gt;
+  &lt;handlers&gt;
+    &lt;add name="SpringWebServiceSupport" verb="*" path="*.asmx" type="Spring.Web.Services.WebServiceHandlerFactory, Spring.Web"/&gt;
+  &lt;/handlers&gt;
+&lt;/system.webServer&gt;</programlisting>
+
+      <para><emphasis>2. Create an object definition for one's web
+      service.</emphasis></para>
+
+      <programlisting>&lt;object name="HelloWorld" type="MyComany.MyApp.Services.HelloWorldService, MyAssembly" abstract="true"/&gt;</programlisting>
+
+      <para>Note that one is not absolutely required to make the web service
+      object definition <literal>abstract</literal> (via the
+      <literal>abstract="true"</literal> attribute), but this is a recommended
+      best practice in order to avoid creating an unnecessary instance of the
+      service. Because the .NET infrastructure creates instances of the target
+      service object internally for each request, all Spring.NET needs to
+      provide is the <classname>System.Type</classname> of the service class,
+      which can be retrieved from the object definition even if it is marked
+      as <literal>abstract</literal>.</para>
+
+      <para>That's pretty much it as we can access this web service using the
+      value specified for the <literal>name</literal> attribute of the object
+      definition as the service name:</para>
+
+      <programlisting>http://localhost/MyWebApp/HelloWorld.asmx</programlisting>
+    </sect2>
+
+    <sect2>
+      <title>Injecting dependencies into web services</title>
+
+      <para>For arguments sake, let's say that we want to change the
+      implementation of the <literal>HelloWorld</literal> method to make the
+      returned message configurable.</para>
+
+      <para>One way to do it would be to use some kind of message locator to
+      retrieve an appropriate message, but that locator needs to implemented.
+      Also, it would certainly be an odd architecture that used dependency
+      injection throughout the application to configure objects, but that
+      resorted to the service locator approach when dealing with web
+      services.</para>
+
+      <para>Ideally, one should be able to define a property for the message
+      within one's web service class and have Spring.NET inject the message
+      value into it:</para>
+
+      <programlisting>
+namespace MyApp.Services
+{
+    public interface IHelloWorld
+    {
+        string HelloWorld();
+    }
+
+    [WebService(Namespace="http://myCompany/services")]
+    public class HelloWorldService : IHelloWorld
+    {
+        private string message;
+        public string Message
+        {
+            set { message = value; }
+        }
+    
+        [WebMethod]
+        public string HelloWorld()
+        {
+            return this.message;
+        }
+    }
+}
+      </programlisting>
+
+      <para>The problem with standard Spring.NET DI usage in this case is that
+      Spring.NET does not control the instantiation of the web service. This
+      happens deep in the internals of the .NET framework, thus making it
+      quite difficult to plug in the code that will perform the
+      configuration.</para>
+
+      <para>The solution is to create a dynamic server-side proxy that will
+      wrap the web service and configure it. That way, the .NET framework gets
+      a reference to a proxy type from Spring.NET and instantiates it. The
+      proxy then asks a Spring.NET application context for the actual web
+      service instance that will process requests.</para>
+
+      <para>This proxying requires that one export the web service explicitly
+      using the <classname>Spring.Web.Services.WebServiceExporter</classname>
+      class; in the specific case of this example, one must also not forget to
+      configure the <literal>Message</literal> property for said
+      service:</para>
+
+      <programlisting>
+&lt;object id="HelloWorld" type="MyApp.Services.HelloWorldService, MyApp"&gt;
+    &lt;property name="Message" value="Hello, World!"/&gt;
+&lt;/object&gt;
+
+&lt;object id="HelloWorldExporter" type="Spring.Web.Services.WebServiceExporter, Spring.Web"&gt;
+    &lt;property name="TargetName" value="HelloWorld"/&gt;
+&lt;/object&gt;
+      </programlisting>
+
+      <para>The <classname>WebServiceExporter</classname> copies the existing
+      web service and method attribute values to the proxy implementation (if
+      indeed any are defined). Please note however that existing values can be
+      overridden by setting properties on the
+      <classname>WebServiceExporter</classname>.</para>
+
+      <tip>
+        <title>Interface Requirements</title>
+
+        <para>In order to support some advanced usage scenarios, such as the
+        ability to expose an AOP proxy as a web service (allowing the addition
+        of AOP advices to web service methods), Spring.NET requires those
+        objects that need to be exported as web services to implement a
+        (service) interface.</para>
+
+        <para>Only methods that belong to an interface will be exported by the
+        <classname>WebServiceExporter</classname>.</para>
+      </tip>
+    </sect2>
+
+    <sect2>
+      <title>Exposing PONOs as Web Services</title>
+
+      <para>Now that we are generating a server-side proxy for the service,
+      there is really no need for it to have all the attributes that web
+      services need to have, such as <classname>WebMethod</classname>. Because
+      .NET infrastructure code never really sees the "real" service, those
+      attributes are redundant as the proxy needs to have them on its methods,
+      because that's what .NET deals with, but they are not necessary on the
+      target service's methods.</para>
+
+      <para>This means that we can safely remove the
+      <classname>WebService</classname> and <classname>WebMethod</classname>
+      attribute declarations from the service implementation, and what we are
+      left with is a plain old .NET object (a PONO). The example above would
+      still work, because the proxy generator will automatically add
+      <classname>WebMethod</classname> attributes to all methods of the
+      exported interfaces.</para>
+
+      <para>However, that is still not the ideal solution. You would lose
+      information that the optional <classname>WebService</classname> and
+      <classname>WebMethod</classname> attributes provide, such as service
+      namespace, description, transaction mode, etc. One way to keep those
+      values is to leave them within the service class and the proxy generator
+      will simply copy them to the proxy class instead of creating empty ones,
+      but that really does defeat the purpose.</para>
+
+      <para>To add specific attributes to the exported web service, you can
+      set all the necessary values within the definition of the service
+      exporter, like so...</para>
+
+      <programlisting>
+&lt;object id="HelloWorldExporter" type="Spring.Web.Services.WebServiceExporter, Spring.Web"&gt;
+    &lt;property name="TargetName" value="HelloWorld"/&gt;
+    &lt;property name="Namespace" value="http://myCompany/services"/&gt;
+    &lt;property name="Description" value="My exported HelloWorld web service"/&gt;
+    &lt;property name="MemberAttributes"&gt;
+        &lt;dictionary&gt;
+            &lt;entry key="HelloWorld"&gt;
+                &lt;object type="System.Web.Services.WebMethodAttribute, System.Web.Services"&gt;
+                    &lt;property name="Description" value="My Spring-configured HelloWorld method."/&gt;
+                    &lt;property name="MessageName" value="ZdravoSvete"/&gt;
+                &lt;/object&gt;
+            &lt;/entry&gt;
+        &lt;/dictionary&gt;
+    &lt;/property&gt;
+&lt;/object&gt;
+
+// or, once configuration improvements are implemented...
+&lt;web:service targetName="HelloWorld" namespace="http://myCompany/services"&gt;
+    &lt;description&gt;My exported HelloWorld web service.&lt;/description&gt;
+    &lt;methods&gt;
+        &lt;method name="HelloWorld" messageName="ZdravoSvete"&gt;
+            &lt;description&gt;My Spring-configured HelloWorld method.&lt;/description&gt;
+        &lt;/method&gt;
+    &lt;/methods&gt;
+&lt;/web:service&gt;
+      </programlisting>
+
+      <para>Based on the configuration above, Spring.NET will generate a web
+      service proxy for all the interfaces implemented by a target and add
+      attributes as necessary. This accomplishes the same goal while at the
+      same time moving web service metadata from implementation class to
+      configuration, which allows one to export pretty much
+      <emphasis>any</emphasis> class as a web service.</para>
+
+      <para>The WebServiceExporter also has a
+      <literal>TypeAttributes</literal> IList property for applying attributes
+      at the type level.<note>
+          <para>The attribute to confirms to the WSI basic profile 1.1 is not
+          added by default. This will be added in a future release. In the
+          meantime use the TypeAttributes IList property to add
+          <literal>[WebServiceBinding(ConformsTo=WsiProfiles.BasicProfile1_1)]</literal>
+          to the generated proxy.</para>
+        </note></para>
+
+      <para>One can also export only certain interfaces that a service class
+      implements by setting the <literal>Interfaces</literal> property of the
+      <classname>WebServiceExporter</classname>.</para>
+
+      <warning>
+        <title>Distributed Objects Warning</title>
+
+        <para>Distributed Objects Warning</para>
+
+        <para>Just because you <emphasis>can</emphasis> export any object as a
+        web service, doesn't mean that you <emphasis>should</emphasis>.
+        Distributed computing principles still apply and you need to make sure
+        that your services are not chatty and that arguments and return values
+        are Serializable.</para>
+
+        <para>You still need to exercise common sense when deciding whether to
+        use web services (or remoting in general) at all, or if local service
+        objects are all you need.</para>
+      </warning>
+    </sect2>
+
+    <sect2>
+      <title>Exporting an AOP Proxy as a Web Service</title>
+
+      <para>It is often useful to be able to export an AOP proxy as a web
+      service. For example, consider the case where you have a service that is
+      wrapped with an AOP proxy that you want to access both locally and
+      remotely (as a web service). The local client would simply obtain a
+      reference to an AOP proxy directly, but any remote client needs to
+      obtain a reference to an exported web service proxy, that delegates
+      calls to an AOP proxy, that in turn delegates them to a target object
+      while applying any configured AOP advice.</para>
+
+      <para>Effecting this setup is actually fairly straightforward; because
+      an AOP proxy is an object just like any other object, all you need to do
+      is set the <classname>WebServiceExporter</classname>'s
+      <literal>TargetName</literal> property to the <literal>id</literal> (or
+      indeed the <literal>name</literal> or <literal>alias</literal>) of the
+      AOP proxy. The following code snippets show how to do this...</para>
+
+      <programlisting>
+&lt;object id="DebugAdvice" type="MyApp.AOP.DebugAdvice, MyApp"/&gt;
+
+&lt;object id="TimerAdvice" type="MyApp.AOP.TimerAdvice, MyApp"/&gt;
+
+&lt;object id="MyService" type="MyApp.Services.MyService, MyApp"/&gt;
+
+&lt;object id="MyServiceProxy" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop"&gt;
+    &lt;property name="TargetName" value="MyService"/&gt; 
+    &lt;property name="IsSingleton" value="true"/&gt;
+    &lt;property name="InterceptorNames"&gt;
+        &lt;list&gt;
+            &lt;value&gt;DebugAdvice&lt;/value&gt;
+            &lt;value&gt;TimerAdvice&lt;/value&gt;
+       &lt;/list&gt;
+    &lt;/property&gt;
+&lt;/object&gt;
+
+&lt;object id="MyServiceExporter" type="Spring.Web.Services.WebServiceExporter, Spring.Web"&gt;
+    &lt;property name="TargetName" value="MyServiceProxy"/&gt;
+    &lt;property name="Name" value="MyService"/&gt;
+    &lt;property name="Namespace" value="http://myApp/webservices"/&gt;
+    &lt;property name="Description" value="My web service"/&gt;
+&lt;/object&gt; 
+      </programlisting>
+
+      <para>That's it as every call to the methods of the exported web service
+      will be intercepted by the target AOP proxy, which in turn will apply
+      the configured debugging and timing advice to it.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="client-side">
+    <title>Client-side</title>
+
+    <para>On the client side, the main objection the Spring.NET team has is
+    that client code becomes tied to a proxy <emphasis>class</emphasis>, and
+    not to a service <emphasis>interface</emphasis>. Unless you make the proxy
+    class implement the service interface manually, as described by Juval Lowy
+    in his book "Programming .NET Components", application code will be less
+    flexible and it becomes very difficult to plug in different service
+    implementation in the case when one decides to use a new and improved web
+    service implementation or a local service instead of a web service.</para>
+
+    <para>The goal for Spring.NET's web services support is to enable the easy
+    generation of client-side proxies that implement a specific service
+    interface.</para>
+
+    <sect2>
+      <title>Using VS.NET generated proxy</title>
+
+      <para>The problem with the web-service proxy classes that are generated
+      by VS.NET or the WSDL command line utility is that they don't implement
+      a service interface. This tightly couples client code with web services
+      and makes it impossible to change the implementation at a later date
+      without modifying and recompiling the client.</para>
+
+      <para>Spring.NET provides a simple <classname>IFactoryObject</classname>
+      implementation that will generate a <emphasis>"proxy for
+      proxy"</emphasis> (however obtuse that may sound). Basically, the
+      <classname>Spring.Web.Services.WebServiceProxyFactory</classname> class
+      will create a proxy for the VS.NET- / WSDL-generated proxy that
+      implements a specified service interface (thus solving the problem with
+      the web-service proxy classes mentioned in the preceding
+      paragraph).</para>
+
+      <para>At this point, an example may well be more illustrative in
+      conveying what is happening; consider the following interface definition
+      that we wish to expose as a web service...</para>
+
+      <programlisting>
+namespace MyCompany.Services
+{
+    public interface IHelloWorld 
+    {
+        string HelloWorld();
+    }
+} 
+      </programlisting>
+
+      <para>In order to be able to reference a web service endpoint through
+      this interface, you need to add a definition similar to the example
+      shown below to your client's application context:</para>
+
+      <programlisting>
+&lt;object id="HelloWorld" type="Spring.Web.Services.WebServiceProxyFactory, Spring.Services"&gt;
+    &lt;property name="ProxyType" value="MyCompany.WebServices.HelloWorld, MyClientApp"/&gt;
+    &lt;property name="ServiceInterface" value="MyCompany.Services.IHelloWorld, MyServices"/&gt;
+&lt;/object&gt;
+      </programlisting>
+
+      <para>What is important to notice is that the underlying implementation
+      class for the web service does not have to implement the same
+      <classname>IHelloWorld</classname> service interface... so long as
+      matching methods with compliant signatures exist (a kind of duck
+      typing), Spring.NET will be able to create a proxy and delegate method
+      calls appropriately. If a matching method cannot be found, the
+      Spring.NET infrastructure code will throw an exception.</para>
+
+      <para>That said, if you control both the client and the server it is
+      probably a good idea to make sure that the web service class on the
+      server implements the service interface, especially if you plan on
+      exporting it using Spring.NET's
+      <classname>WebServiceExporter</classname>, which requires an interface
+      in order to work.</para>
+    </sect2>
+
+    <sect2>
+      <title>Generating proxies dynamically</title>
+
+      <para>The <classname>WebServiceProxyFactory</classname> can also
+      dynamically generate a web-service proxy. The XML object definition for
+      this factory object is shown below</para>
+
+      <programlisting>
+        &lt;object id="calculatorService" type="Spring.Web.Services.WebServiceProxyFactory, Spring.Services"&gt;
+          &lt;property name="ServiceUri" value="http://myServer/Calculator/calculatorService.asmx"/&gt;
+          &lt;!--&lt;property name="ServiceUri" value="file://~/calculatorService.wsdl"/&gt;--&gt;
+          &lt;property name="ServiceInterface" value="Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract"/&gt;
+          &lt;!-- Dependency injection on Factory's product : the proxy instance of type SoapHttpClientProtocol --&gt;
+          &lt;property name="ProductTemplate"&gt;
+            &lt;object&gt;
+              &lt;property name="Timeout" value="10000" /&gt; &lt;!-- 10s --&gt;
+            &lt;/object&gt;
+          &lt;/property&gt;
+        &lt;/object&gt;
+        
+      </programlisting>
+
+      <para>One use-case where this proxy is very useful is when dealing with
+      typed data sets through a web service. Leaving the pros and cons of this
+      approach aside, the current behavior of the proxy generator in .NET is
+      to create wrapper types for the typed dataset. This not only pollutes
+      the solution with extraneous classes but also results in multiple
+      wrapper types being created, one for each web service that uses the
+      typed dataset. This can quickly get confusing. The proxy created by
+      Spring allows you to reference you typed datasets directly, avoiding the
+      above mentioned issues.</para>
+    </sect2>
+
+    <sect2>
+      <title>Configuring the proxy instance</title>
+
+      <para>The <classname>WebServiceProxyFactory</classname> also implements
+      the interface,
+      <classname>Spring.Objects.Factory.IConfigurableFactoryObject</classname>,
+      allowing to specify configuration for the product that the
+      <classname>WebServiceProxyFactory</classname> creates. This is done by
+      specifying the ProductTemplate property. This is particularly useful for
+      securing the web service. An example is shown below.</para>
+
+      <programlisting>
+ &lt;object id="PublicarAltasWebService" type="Spring.Web.Services.WebServiceProxyFactory, Spring.Services"&gt;
+    &lt;property name="ProxyType" value="My.WebService" /&gt;
+    &lt;property name="ServiceInterface" value="My.IWebServiceInterface" /&gt;
+    <emphasis role="bold">&lt;property name="ProductTemplate"&gt; </emphasis>
+      &lt;object&gt;
+        &lt;!-- Configure the web service URL --&gt;
+        &lt;property name="Url" value="https://localhost/MyApp/webservice.jws" /&gt;
+        <emphasis role="bold"> &lt;!-- Configure the Username and password for the web service --&gt; </emphasis>
+        &lt;property name="Credentials"&gt;
+          &lt;object type="System.Net.NetworkCredential, System"&gt;
+            &lt;property name="UserName" value="user"/&gt;
+            &lt;property name="Password" value="password"/&gt;
+          &lt;/object&gt;
+        &lt;/property&gt;
+        <emphasis role="bold">&lt;!-- Configure client certificate for the web service --&gt; </emphasis>
+        &lt;property name="ClientCertificates"&gt;
+          &lt;list&gt;
+            &lt;object id="MyCertificate" type="System.Security.Cryptography.X509Certificates.X509Certificate2, System"&gt;
+              &lt;constructor-arg name="fileName" value="Certificate.p12" /&gt;
+              &lt;constructor-arg name="password" value="notgoingtotellyou" /&gt;
+            &lt;/object&gt;
+          &lt;/list&gt;
+        &lt;/property&gt;
+      &lt;/object&gt;
+    &lt;/property&gt;
+&lt;/object&gt;
+      </programlisting>
+
+      <para>For an example of how using SOAP headers for authentication using
+      the WebServiceExporter and WebServiceProxyFactory, refer to this <ulink
+      url="http://opensource.atlassian.com/confluence/spring/download/attachments/708/Spring.Examples.SoapHeader.rar?version=1">solution</ulink>
+      on our wiki.</para>
+    </sect2>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/windows-service.xml b/doc/reference/src/windows-service.xml
new file mode 100644
index 00000000..470b2acf
--- /dev/null
+++ b/doc/reference/src/windows-service.xml
@@ -0,0 +1,643 @@
+<chapter id="windows-service">
+  <title>Windows Services</title>
+
+  <sect1>
+    <title>Remarks</title>
+    <para>
+    This is functionality that will be included after the 
+    1.0 release.  If you want to use these features please get the 
+    code from CVS <ulink url="http://opensource.atlassian.com/confluence/spring/display/NET/Project+Structure"></ulink>
+    (instructions) or from the download section of the Spring.NET website that contains an
+    .zip with the full CVS tree.
+    In addition to this documentation
+    you can refer to the example program located at
+    <literal>examples\Spring\Spring.Examples.WindowsService</literal>
+    to better understand the package.  Please check the Spring.NET 
+    <ulink url="http://www.springframework.net/doc/reference/windows-service.html">website</ulink> 
+    for the latest updates to this document.
+    </para>
+  </sect1>
+  <sect1>
+    <title>Introduction</title>
+    <para>
+    Developers usually create Windows Services using the 
+    Visual Studio .NET wizard.  While not difficult to do, this
+    procedure is repetative and does not encourage separation between 
+    infrastructure code (windows service) and application code.  This is
+    generally considered a "bad thing" but you can certainly disagree.
+    </para>
+    <para>    
+    As Spring.NET can provide an explicitly managed
+    initialize/destroy lifecycle for singleton objects, there is
+    a natural synergy with the lifecycle of a Windows service.
+    As such, it could be very convenient to expose a Spring application 
+    context as a Windows service. Starting and stopping the service corresponds
+    to creating and destroying an application context and its
+    contained objects.  This approach provides a high level means to
+    declare what objects are created and destroyed when developing
+    a Windows service. 
+    </para>
+    <para>
+    To do that, Spring.NET requires the installation of one physical 
+    service able to run as services as many applications as you want - each a 
+    logical independent service in their own application domain.  
+    By default, the deployment and updating of the service can also
+    be done by copying the relevant executables to a special directory.
+    </para>
+    <para>
+    The executable that at present provides these features is the
+    <literal>Spring.Services.WindowsService.Process.exe</literal>
+    assembly. It makes heavy use of classes and interfaces definde in 
+    the <literal>Spring.Services.WindowsService.Common.dll</literal>
+    assembly.  You should reference the common assembly it if you want to 
+    follow the advice on customization contained in the following sections 
+    </para>
+    <para>
+    The benefits of this approach, a part from those given by separating
+    infrastructure code and application code (a field where Spring.NET
+    tries hard to succeed) is that you can think about installing a new 
+    service at client site by simply dropping a new application assembly
+    in a remote directory<footnote></footnote>.
+    </para>
+  </sect1>
+  
+  <sect1>
+    <title>The <literal>Spring.Services.WindowsService.Process.exe</literal> application</title>
+    <sect2>
+      <title>Installing</title>
+    <para>
+    The installation can be done in two ways, using the .NET SDK
+    <literal>installutil.exe</literal> tool or using the more mundane
+    <literal>Spring.Services.WindowsService.Installer.exe</literal>;
+    while the former is the standard, the latter is probably  
+    more flexible. It allows you to customize the name/display name of the 
+    service and has the ability to install multiple times the same assembly
+    with different names.  This can be useful in a 
+    number of scenarios, especially where you don't like, for some 
+    reasons, to run several different logical services under the 
+    same physical windows service.
+    </para>
+    <para><emphasis>
+    Be aware of the fact that the service will be installed as
+    running with the system account (installing with a specific
+    user account seems a bit buggy on Windows XP)
+    </emphasis></para>
+    <para>
+    That said, while <literal>installutil</literal> 
+    <ulink url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cptools/html/cpconinstallerutilityinstallutilexe.asp">
+    <citetitle>is documented on its own </citetitle></ulink>, 
+    the command line for 
+    <literal>Spring.Services.WindowsService.Installer.exe</literal>
+    is as follow:    
+      <programlisting format='linespecific'>Spring.Services.WindowsService.Installer.exe
+
+usage: 
+ install service-exe-path service-display-name service-name
+ uninstall service-name      [i|u] service-exe-path service-display-name service-name</programlisting>
+      for example, to install, you can invoke it with the following:
+      <programlisting format='linespecific'>... install  Spring.Services.WindowsService.Process.exe "Spring.Service Support" spring-service</programlisting>
+      and to uninstall it: 
+      <programlisting format='linespecific'>... uninstall  spring-service</programlisting>
+    </para>
+    </sect2>
+    <sect2>
+      <title>Configuration</title>
+    <para>
+    The standard .NET <literal>.config</literal> file 
+    can be used to tune some parameters of 
+    <literal>Spring.Services.WindowsService.Process.exe</literal>, 
+    (including log4net settings, for which it is recomended to consult 
+    the log4net documentation).
+    </para>
+    <para>
+    This file also define the context run by this process; here the file in its current beauty:
+      <programlisting format='linespecific'>
+&lt;configuration&gt;
+
+    &lt;configSections&gt;
+        &lt;section name=&quot;log4net&quot; type=&quot;System.Configuration.IgnoreSectionHandler&quot; /&gt;
+        &lt;sectionGroup name=&quot;spring&quot;&gt;
+            &lt;section name=&quot;context&quot; type=&quot;Spring.Context.Support.ContextHandler, Spring.Core&quot; /&gt;
+            &lt;section name=&quot;objects&quot; type=&quot;Spring.Context.Support.DefaultSectionHandler, Spring.Core&quot; /&gt;
+        &lt;/sectionGroup&gt;
+    &lt;/configSections&gt;
+      
+    &lt;spring&gt;
+        &lt;context type=&quot;Spring.Context.Support.XmlApplicationContext, Spring.Core&quot;&gt;
+            &lt;resource uri=&quot;file://~/service-process-definition.xml&quot; /&gt;
+        &lt;/context&gt;        
+    &lt;/spring&gt;
+
+    &lt;system.runtime.remoting&gt;
+    &lt;application&gt;
+        &lt;channels&gt;
+        &lt;channel ref=&quot;http&quot; port=&quot;1234&quot; /&gt;        
+        &lt;/channels&gt;
+    &lt;/application&gt;
+    &lt;/system.runtime.remoting&gt;
+ 
+  &lt;log4net&gt;
+    &lt;!-- see http://logging.apache.org/log4net/release/manual/introduction.html --&gt;
+    &lt;appender name=&quot;RollingFile&quot; type=&quot;log4net.Appender.RollingFileAppender&quot;&gt;
+      &lt;layout type=&quot;log4net.Layout.PatternLayout&quot;&gt;
+        &lt;conversionPattern value=&quot;%d [%t] %-5p %c{1} - %m%n&quot; /&gt;
+      &lt;/layout&gt;
+      &lt;file value=&quot;logs/Spring.Service.Process.log&quot; /&gt;
+      &lt;appendToFile value=&quot;true&quot; /&gt;
+      &lt;maximumFileSize value=&quot;500KB&quot; /&gt;
+      &lt;maxSizeRollBackups value=&quot;5&quot; /&gt;
+    &lt;/appender&gt;
+    &lt;appender name=&quot;OutputDebugString&quot; type=&quot;log4net.Appender.OutputDebugStringAppender&quot;&gt;
+      &lt;layout type=&quot;log4net.Layout.PatternLayout&quot;&gt;
+        &lt;conversionPattern value=&quot;%d{HH:mm:ss,fff} %-5p %c{2}(line:%L) - %m%n&quot; /&gt;
+      &lt;/layout&gt;
+    &lt;/appender&gt;
+    &lt;root&gt;
+      &lt;level value=&quot;OFF&quot; /&gt;
+    &lt;/root&gt;
+      &lt;logger name=&quot;Spring.Services&quot;&gt;
+          &lt;level value=&quot;ALL&quot; /&gt;
+      &lt;appender-ref ref=&quot;RollingFile&quot; /&gt;
+      &lt;appender-ref ref=&quot;OutputDebugString&quot; /&gt;
+      &lt;/logger&gt;      
+  &lt;/log4net&gt;
+
+&lt;/configuration&gt;</programlisting>
+    </para>
+    <para>
+    As you see, the context is defined in another file: let's review the objects it defines.
+    </para>
+    <para>
+    Firstly, it is worth notice that in order to 'localize' the service (i.e. to know where it is installed to use that directory as
+    base for the deploy dir as in the above file) you should define an object like this: the name is not 
+    very important, it is important that it is an <classname>IObjectFactoryPostProcessor</classname> and so will be 
+    automatically applied to this application context:
+      <programlisting format='linespecific'>
+&lt;!-- provides access to the ${spring.services.process.base.dir} property --&gt;
+&lt;object 
+    name=&quot;localizer&quot;
+    type=&quot;Spring.Services.WindowsService.Common.Localizer+ForProcess, Spring.Services.WindowsService.Common&quot;&gt;
+    &lt;!-- change this to access the property with another prefix, for example ${foo.process.base.dir}
+    &lt;property name=&quot;prefix&quot; value=&quot;foo&quot;/&gt;
+    --&gt;
+&lt;/object&gt;</programlisting>
+    </para>
+    <para>
+    In that object definition you can customize the prefix for the following string
+      <programlisting format='linespecific'>
+public static readonly string SpringServicesProcessBaseDirFormat = &quot;{0}.process.base.dir&quot;;</programlisting>    
+    but you usually won't need it; the default value is 
+      <programlisting format='linespecific'>
+public static readonly string DefaultPrefix = &quot;spring.services&quot;;</programlisting>    
+    </para>
+    <para>
+    The sole important object defined by this context, i.e. the main object run by the service.
+    The thing you can (and should) configure is the path to the folder you will use as the deploy location;
+    the current definition, to avoid the need for a fully qualified path (e.g.: <literal>c:\spring\services</literal>) uses 
+    the properties made available by the <literal>localizer</literal> above:
+      <programlisting format='linespecific'>
+&lt;object 
+    name=&quot;service&quot;
+    type=&quot;Spring.Services.WindowsService.Common.DefaultService, Spring.Services.WindowsService.Common&quot;
+    init-method=&quot;Start&quot;
+    destroy-method=&quot;Stop&quot;&gt;
+    &lt;property name=&quot;DeployPath&quot; value=&quot;${spring.services.process.base.dir}/deploy&quot;/&gt;
+&lt;/object&gt;</programlisting>
+    </para>
+    <para>
+    The above object is then easily remoted using spring remoting utilities (please notice you should tune the remoting configuration 
+    listed in the standard .NET <literal>.config</literal> file, listed above):   
+      <programlisting format='linespecific'>
+&lt;object name=&quot;remoted.service&quot; type=&quot;Spring.Remoting.SaoExporter, Spring.Services&quot;&gt;
+    &lt;property name=&quot;TargetName&quot; value=&quot;service&quot;/&gt;
+    &lt;property name=&quot;ServiceName&quot; value=&quot;SpringWindowsService.rem&quot;/&gt;
+&lt;/object&gt;</programlisting>
+    </para>
+    </sect2>
+  </sect1>
+  
+  <sect1>
+    <title>Running an application context as a windows service</title>
+    <para>    
+    If you package an application using the layout and 
+    conventions described here, you'll be able to run an
+    application context as a Windows Service.
+    The conventions used are modeled after those used by ASP.NET
+    and are very easy to follow.
+    </para>
+    <para>
+    As already said, you'll have a Spring.NET application context running in 
+    a dedicated <literal>AppDomain</literal> hosted in a process running
+    as a windows service: that process is able to run many application contexts
+    simultaneously.
+    </para>
+    <para>A complete application runable as service consists of a 
+    directory containing: 
+    <itemizedlist spacing="compact">
+
+          <listitem>
+            <para>The .NET configuration file 
+            <literal>service.config</literal>: 
+			this file should define your application context.
+			Moreover this files will be used 
+            by the CLR to configure the application domain 
+            your application will run in, exactly as you expect.
+            This file has the same role of ASP.NET <literal>Web.config</literal>
+            file.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>Optional: an xml context file (<literal>watcher.xml</literal>)
+            defining the watcher for your application.</para>
+            <para>The watcher controls the automatic redeployment of the 
+            service and is discussed more in the following section.</para>
+          </listitem>
+
+          <listitem>
+            <para>Recomended: along the lines of ASP.NET convention, a <literal>bin</literal> 
+            subdirectory containing all 
+            the assemblies your application needs; you can of course put
+            your assemblies in the same directory where you put
+            <literal>service.config</literal> but this is not encouraged ...
+            </para>
+          </listitem>
+        </itemizedlist>
+    </para>
+	<sect2>
+    <title><literal>service.config</literal></title>
+    <para>
+    This is the standard .NET configuration file for the 
+    <literal>AppDomain</literal> that will host your application. It is 
+    semantically equivalent to the ASP.NET <literal>Web.config</literal>
+    file.
+    <footnote>
+		<para>
+		<literal>log4net</literal> users please notice that (as 
+		of 1.2 beta 9) file appenders, when dealing with a relative 
+		file name, assume it is relative to the application 
+		domain code base. If you use log4net, it is very handy with the mechanics used by 
+		Spring Windows Service as every log file you will specify will
+		be relative the directory containing the service application.
+		</para>
+	</footnote>
+    </para>
+    <para>
+    This file should also define your application context.  When the 
+    service is started and stopped, the corresponding lifecycle methods 
+    are called on all the singletons defined. Of course, singletons are 
+    automatically instantiated by the application context when the 
+    service starts. For more information on lifecycles in Spring.NET see 
+    <xref linkend="objects-factory-lifecycle"/>
+	Here an example taken from the tests:
+	<programlisting format='linespecific'>
+&lt;configuration&gt;
+
+    &lt;configSections&gt;
+        &lt;sectionGroup name=&quot;spring&quot;&gt;
+            &lt;section name=&quot;context&quot; type=&quot;Spring.Context.Support.ContextHandler, Spring.Core&quot; /&gt;
+            &lt;section name=&quot;objects&quot; type=&quot;Spring.Context.Support.DefaultSectionHandler, Spring.Core&quot; /&gt;
+        &lt;/sectionGroup&gt;
+    &lt;/configSections&gt;
+      
+    &lt;appSettings&gt;
+        &lt;add key=&quot;port&quot; value=&quot;10&quot;/&gt;
+    &lt;/appSettings&gt;  
+
+    &lt;spring&gt;
+        &lt;context type=&quot;Spring.Context.Support.XmlApplicationContext, Spring.Core&quot;&gt;
+            &lt;resource uri=&quot;file://~/service.xml&quot; /&gt;
+        &lt;/context&gt;
+    &lt;/spring&gt;
+ 
+&lt;/configuration&gt;</programlisting>
+    </para>
+    <para>
+    In this case the context is (again!) defined in another file (author's personal taste...) and the only 'service' is the
+    <literal>echo</literal> object (there is also a <literal>PropertyPlaceholderConfigurer</literal> just to make the example
+    more realistic):
+	<programlisting format='linespecific'>
+&lt;objects xmlns=&quot;http://www.springframework.net&quot; 
+    xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; 
+    xsi:schemaLocation=&quot;http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd&quot;&gt;
+    
+    &lt;object name=&quot;echo&quot; 
+      type=&quot;Spring.Services.WindowsService.Samples.Echo, Spring.Services.WindowsService.Tests&quot; 
+      init-method=&quot;Start&quot; destroy-method=&quot;Stop&quot;&gt;
+      &lt;property name=&quot;port&quot;&gt;&lt;value&gt;${port}&lt;/value&gt;&lt;/property&gt;
+    &lt;/object&gt;
+
+    &lt;object id=&quot;configurer&quot; type=&quot;Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core&quot;&gt;
+      &lt;property name=&quot;locations&quot;&gt;
+         &lt;list&gt;
+            &lt;value&gt;file://~/service.config&lt;/value&gt;
+         &lt;/list&gt;
+      &lt;/property&gt;
+      &lt;property name=&quot;configSections&quot;&gt;
+         &lt;list&gt;
+            &lt;value&gt;appSettings&lt;/value&gt;
+         &lt;/list&gt;
+      &lt;/property&gt;
+    &lt;/object&gt;
+
+&lt;/objects&gt;</programlisting>
+    </para>
+	<sect3>
+	<title>Let the application know where it is</title>
+	<para>
+	There are some properties you may need at runtime, when your services
+	will run, and you cannot know in advance. Hopefully, your xml 
+	definition file will allow to find the information it needs using some
+	predefined variables you can use inside the service definition file 
+	with the standard 
+	NAnt style <literal>${property name}</literal> syntax.</para>
+	<para>These properies are:
+    <itemizedlist spacing="compact">
+          <listitem>
+              <para><literal>spring.services.application.fullpath</literal>
+              that will be replaced with the full path of the application's
+              <literal>AppDomain.BaseDirectory</literal>, i.e., where your
+              application has been deployed;</para>
+          </listitem>
+          <listitem>
+              <para><literal>spring.services.application.name</literal> that 
+              will be replaced with the name of the subdirectory where the
+              application has been deployed. Each application is deployed in
+              its own directory, of course;</para>
+          </listitem>
+    </itemizedlist>
+	</para>
+	<para>
+	These properties are accessible only if one defines a localizer in the 
+	context like this (the localizer is a special <literal>IObjectFactoryPostProcessor</literal>:
+    <programlisting format='linespecific'>
+&lt;!-- provides access to the ${spring.services.application.*} properties --&gt;
+&lt;object 
+    name=&quot;localizer&quot;
+    type=&quot;Spring.Services.WindowsService.Common.Localizer+ForApplication, Spring.Services.WindowsService.Common&quot;&gt;
+    &lt;!-- change this to access the property with another prefix, for example ${foo.application.base.dir}
+    --&gt;
+    &lt;property name=&quot;prefix&quot; value=&quot;myPrefix&quot;/&gt;
+&lt;/object&gt;</programlisting>
+	</para>
+	<para>
+	As you can see above, one can easily change the prefix used by that localizer and then write someting like:
+    <programlisting format='linespecific'>
+&lt;object name=&quot;simple&quot; 
+  type=&quot;Spring.Services.WindowsService.Samples.Simple, Spring.Services.WindowsService.Tests&quot; 
+  init-method=&quot;Start&quot; destroy-method=&quot;Stop&quot;&gt;
+  &lt;constructor-arg index=&quot;0&quot; value=&quot;${myPrefix.application.name},${myPrefix.application.fullPath}&quot;/&gt;
+  &lt;property name=&quot;AppName&quot;&gt;
+    &lt;value&gt;${myPrefix.application.name}&lt;/value&gt;
+  &lt;/property&gt;
+  &lt;property name=&quot;AppFullPath&quot;&gt;
+    &lt;value&gt;${myPrefix.application.fullpath}&lt;/value&gt;
+  &lt;/property&gt;
+&lt;/object&gt;</programlisting>
+	</para>
+	</sect3>
+	</sect2>
+  
+	<sect2>
+	<title><literal>watcher.xml</literal> - optional</title>
+	<para>
+	This file allows you to optionally define a watcher for your application
+	that can automatically redeploy it when needed.
+	</para>
+	<para>
+	The important thing to notice is that you can define your own 
+	application watcher, named <literal>watcher</literal>. Here it is used
+	a watcher that listen for changes on the filesystem, configured to 
+	listen for some changes and to ignore others.
+	</para>
+	<para>
+	You can provide your own implementation defining an object named 
+	<literal>watcher</literal> that implements 
+	<literal>Spring.Services.WindowsService.Common.Deploy.IApplicationWatcher</literal>:
+        <programlisting format='linespecific'>
+/// &lt;summary&gt;
+Interface defining the contract for an application watcher.
+&lt;p&gt;An application watcher is responsible to dispatch an 
+&lt;see cref=&quot;IApplicationWatcherFactory&quot;&gt;event&lt;/see&gt; whenever it thinks the 
+application has been updated.&lt;/p&gt;
+&lt;p&gt;Usually it should not raise other kind of events
+as they are usually raised by the &lt;see cref=&quot;FileSystemApplicationWatcher&quot;/&gt; 
+that creates the watcher itself&lt;/p&gt;
+&lt;/summary&gt;
+&lt;remarks&gt;Usually instances of this interface need to be disposed&lt;/remarks&gt;
+&lt;seealso cref=&quot;DeployEventArgs&quot;/&gt;
+&lt;seealso cref=&quot;IDeployLocation&quot;/&gt;
+&lt;seealso cref=&quot;DeployEventType.ApplicationUpdated&quot;/&gt;
+&lt;seealso cref=&quot;DeployEventAggregator&quot;/&gt;
+&lt;seealso cref=&quot;IDeployLocation&quot;/&gt;
+&lt;seealso cref=&quot;DeployEventType&quot;/&gt;
+public interface IApplicationWatcher : IDisposable
+{
+    /// &lt;summary&gt;
+    /// The watched application
+    /// &lt;/summary&gt;
+    IApplication Application {get; }
+
+    /// &lt;summary&gt;
+    /// Start to watch the application, using the given dispatcher to 
+    /// dispatch deply events
+    /// &lt;/summary&gt;
+    /// &lt;param name=&quot;dispatcher&quot;&gt;the dispatcher used to raise deploy events&lt;/param&gt;
+    void StartWatching (IDeployEventDispatcher dispatcher);
+
+    /// &lt;summary&gt;
+    /// Stop to watch the application.
+    /// &lt;/summary&gt;
+    void StopWatching ();
+
+    /// &lt;summary&gt;
+    /// If physical events watched by this watcher should be filtered, this methods
+    /// will allow to set filters that allows and disallows the event to be raised
+    /// by the watcher.
+    /// &lt;/summary&gt;
+    /// &lt;param name=&quot;allows&quot;&gt;the list of allowing filters&lt;/param&gt;
+    /// &lt;param name=&quot;disallows&quot;&gt;the list of disallowing filters&lt;/param&gt;
+    /// &lt;seealso cref=&quot;FilteringSupport&quot;/&gt;
+    /// &lt;seealso cref=&quot;RegularExpressionFilter&quot;/&gt;
+    void SetFilters (IList allows, IList disallows);
+}</programlisting>	
+	</para>
+	<para>
+	Please notice that this interface is currently a movable target and 
+	will probably change before the first official release (this will probably 
+	affect also the way a watcher will know about the application it should
+	monitor, as shown in a few lines).
+	</para>
+	<para>A tipical example of this file is give here:
+    <programlisting format='linespecific'>
+&lt;objects&gt;
+
+    &lt;object name='watcher' 
+      type='Spring.Services.WindowsService.Common.Deploy.FileSystem.FileSystemApplicationWatcher'&gt;
+      &lt;!-- 
+      we can get access to the IApplication we are asked to monitor 
+      using a reference like the following
+      --&gt;
+      &lt;constructor-arg ref='.injected.application'/&gt;
+
+      &lt;!-- sometimes the windows OS will decide to not give you the same case you see in explorer:
+           in fact one should consider this OS case-insensitive with regard to file names ...
+           The following property, true by default can however be tuned
+      &lt;property name=&quot;ignoreCase&quot; value=&quot;false&quot;/&gt;
+      --&gt;
+
+      &lt;property name=&quot;includes&quot;&gt;
+        &lt;list&gt;
+          &lt;value&gt;wwwroot/bin/*.*&lt;/value&gt; 
+          &lt;value&gt;service.config&lt;/value&gt; 
+          &lt;value&gt;service.xml&lt;/value&gt; 
+        &lt;/list&gt;
+      &lt;/property&gt;      
+      
+      &lt;!--
+      &lt;property name=&quot;excludes&quot;&gt;
+        &lt;list&gt;
+          &lt;value&gt;Db/**/*.*&lt;/value&gt; 
+          &lt;value&gt;Jobs&lt;/value&gt;
+          &lt;value&gt;Jobs&lt;/value&gt;
+          &lt;value&gt;**/*.log&lt;/value&gt;
+        &lt;/list&gt;
+      &lt;/property&gt;
+      --&gt;
+      
+    &lt;/object&gt;
+    
+&lt;/objects&gt;</programlisting>
+	</para>
+	<para>
+	As you can see, if you need it, you can reference the 
+	<literal>Spring.Services.WindowsService.Common.IApplication</literal>
+	object that your watcher should watch using the name 
+	<literal>.injected.application</literal>.</para>
+  </sect2>
+  
+  <sect2>
+	<title><literal>bin</literal> directory - optional</title>
+    <para>
+    This is, by default, the folder where your assemblies are placed
+    in the same way they are in an ASP.NET application.
+	</para>
+	<para>
+	Putting assemblies there is more a convention and maybe a good 
+	practice (they are isolated from other artifacts, but maybe you will 
+	prefer to use another directory (modify the 
+	<literal>service.config</literal> file accordingly) or the application
+	directory directly (= <literal>bin</literal> parent).
+	</para>
+	<para>		
+    Be aware of the fact that the process in which your application will 
+    run will have its own PATH environmental variable. As such
+    don't expect to be successfull using dlls imported
+    with [DllImport] if they are not in the system PATH of the 
+    hosting machine: while it is well known that the CLR fusion
+    algorithm will not consider the PATH variable, you may be biten 
+    by assemblies using non-system dlls (SQLite and Firebird ADO.NET 
+    providers are good examples).
+    </para>           
+    <para>Reiterating, one can put assemblies in another directory
+    under the application directory tree, and write 
+    the .NET configuration file (<literal>service.config</literal>)
+    accordingly: .NET probing algorithm is always in place.
+    </para>
+    <para>
+    Please notice that it is not required that 
+    your application uses or include any of the Spring.NET assemblies: 
+    any object in any assembly, given it has lifecycle methods, can 
+    be run as a service: non invasive infrastructure support courtesy
+    of Spring.NET!
+    </para>
+	</sect2>
+  </sect1>
+  
+  <sect1>
+    <title>Customizing or extending</title>
+    <para>
+    It should be said that support for windows service has been initially 
+    developed with a clear but limited set of 'extension points' in mind, 
+    mainly related to the way you can deploy your services: 
+    deploy location (filesystem, zip archives, mailbox, urls, ...), 
+    (auto-)updating features, and so on.
+    </para>
+    <para>
+    To better understand the following discussion, the following figure 
+    depicts some of the inner details of 
+    <literal>Spring.Services.WindowsService.Process.exe</literal>
+    at run-time:
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center"
+          fileref="images/spring.windows-service.png" format="png"/>
+      </imageobject>
+      <textobject>
+        <phrase>Spring.Services.WindowsService.Process.exe run-time details</phrase>
+      </textobject>
+    </mediaobject>    
+    </para>
+    <sect2>
+      <title>The <literal>.config</literal> file</title>
+    </sect2>
+    <para>
+    The executable <literal>Spring.Services.WindowsService.Process.exe</literal>
+    is somewhat configured by the corresponding 
+    <literal>.config</literal> file.    
+    Please notice that this file is the most important extension point 
+    for windows service support, and it will probably be made more powerful 
+    and flexible in the future.    
+    </para>
+    <para>
+    For applications deployed in the standard way (i.e. on the filesystem 
+    as explained above) the updating features are configured by the 
+    <literal>watcher.xml</literal> file, <emphasis>if present</emphasis>,
+    as already seen.
+    </para>
+    <para>
+    There should be however, other ways to deploy your applications, 
+    maybe just as zip files dropped somewhere on the web or sent via 
+    e-mail.
+    </para>
+    <para>
+    For these scenarios, your deploy location will be something that
+    implements 
+    <literal>Spring.Services.WindowsService.Common.Deploy.IDeployLocation</literal>.
+    <para>
+    Please notice that, while questionable, it actually entends 
+    <literal>IDisposable</literal> <footnote><para>this has been done 
+    as it is possible that a deploy location holds resources that should be 
+    released, for example network connections, lock files or the like</para></footnote>:
+    </para>
+        <programlisting format='linespecific'>
+/// &lt;summary&gt;
+/// Interface defining how a deploy location should look like
+/// &lt;/summary&gt;
+public interface IDeployLocation : IDeployEventSource, IDisposable
+{
+    /// &lt;summary&gt;
+    /// The list of applications deployed at this location
+    /// Usually non-valid applications are not listed
+    /// &lt;/summary&gt;
+    /// &lt;seealso cref=&quot;Application&quot;/&gt;
+    IList Applications { get; }
+}</programlisting>
+        <programlisting format='linespecific'>
+/// &lt;summary&gt;
+/// Interface defining the contract for an object acting as the source of
+/// deploy events (application added, removed, updated)
+/// &lt;/summary&gt;
+/// &lt;seealso cref=&quot;DeployEventArgs&quot;/&gt;
+/// &lt;seealso cref=&quot;DeployEventHandler&quot;/&gt;
+public interface IDeployEventSource
+{
+    /// &lt;summary&gt;
+    /// The multicaster for deploy events
+    /// &lt;/summary&gt;
+    event DeployEventHandler DeployEvent;        
+}</programlisting>
+    </para>
+  </sect1>
+
+</chapter>
diff --git a/doc/reference/src/xml-config-reference.xml b/doc/reference/src/xml-config-reference.xml
new file mode 100644
index 00000000..480fe28b
--- /dev/null
+++ b/doc/reference/src/xml-config-reference.xml
@@ -0,0 +1,609 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="xml-config-reference">
+  <title>XML Configuration Reference</title>
+
+  <sect1>
+    <title>Introduction</title>
+
+    <para>This chapter contains an exhaustive listing for pretty much every
+    possible XML configuration scenario for Spring.NET's XML based
+    configuration. If you need to configure an object in a Spring.NET IoC
+    container, and you are using Spring.NET's XML configuration option to do
+    so (which, short of programmatic configuration, is pretty much all you can
+    use for configuration right now), then this chapter will most probably
+    have an example XML fragment that can illustrate what you need to
+    do.</para>
+
+    <para>Please note that this chapter is not a knee-jerk or belated response
+    to addressing any perceived complexity in the Spring.NET XML
+    configuration. Spring.NET's XML configuration syntax is, in the opinion of
+    the developers (for what that's worth), eminently readable... one has
+    <literal>&lt;objects/&gt;</literal>, these objects have zero or more
+    <literal>&lt;constructor-arg/&gt;</literal> or
+    <literal>&lt;property/&gt;</literal> elements that are generally
+    <literal>&lt;ref/&gt;erences</literal> to other
+    <literal>&lt;object/&gt;s</literal>. To use an analogy, Spring.NET's XML
+    configuration reads like a William Weaver translation of an Umberto Eco
+    novel... the words (the XML elements) are easy, but the devil (and
+    salvation) is in the detail.</para>
+  </sect1>
+
+  <sect1>
+    <title>Object Configuration</title>
+
+    <para>This section details the configuration of one's object definitions.
+    It contains fragments of XML that illustrate the absolute basics, such as
+    how to create a simple object with no dependencies, all the way through to
+    often overlooked features such as instantiating an object from of a method
+    call to another object.</para>
+
+    <sect2>
+      <title>Objects</title>
+
+      <para>This section details how to define an object in Spring.NET XML. If
+      you need somewhere to start, this is the place.</para>
+
+      <para>The section starts off with the absolute basics of defining an
+      object (the &lt;object/&gt; element), and then describes the setting of
+      constructor arguments and properties. Once you are down with those three
+      cornerstones of configuration (yes, that is really it), the rest of the
+      text in this reference is spent describing the values that one can
+      supply to those constructor arguments and property values.</para>
+
+      <sect3>
+        <title>Plain Object Definition</title>
+
+        <para>Find below an example of defining an object that has no
+        dependencies.</para>
+
+        <programlisting>&lt;object name="service" <co
+            id="xcf-plain-vanilla-object-name" />
+        type="Example.Foo, FooAssembly"/&gt; <co
+            id="xcf-plain-vanilla-object-type" /> <co
+            id="xcf-plain-vanilla-object-scope" /></programlisting>
+
+        <calloutlist>
+          <callout arearefs="xcf-plain-vanilla-object-name">
+             This is the name of the object (
+
+            <xref linkend="objects-objectname" />
+
+            ). 
+          </callout>
+
+          <callout arearefs="xcf-plain-vanilla-object-type">
+             This is the assembly qualified name of the object's Type or class (
+
+            <xref linkend="objects-factory-class" />
+
+            ). 
+          </callout>
+
+          <callout arearefs="xcf-plain-vanilla-object-scope">
+             Please note that the 
+
+            <literal>scope</literal>
+
+             of the object is implicitly 
+
+            <literal>singleton</literal>
+
+             (see 
+
+            <xref linkend="xcf-singleton" />
+
+             of this chapter and 
+
+            <xref linkend="objects-factory-modes" />
+
+             in the reference documentation). 
+          </callout>
+        </calloutlist>
+
+        <para>Defining this object in one's context and then retrieving said
+        object from said context will result in the creation of an instance of
+        the <classname>Foo</classname> class. The default constructor of the
+        <classname>Foo</classname> class will be invoked, and since no
+        properties and other other configuration elementts are present, the
+        resulting object will be returned as is. The simple case really is as
+        simple as that.</para>
+
+        <para>Further (un-annotated) examples of defining an object that has
+        no dependencies can be found below...</para>
+
+        <programlisting>&lt;object id="anException" type="System.ArgumentException, Mscorlib"/&gt;</programlisting>
+
+        <programlisting>&lt;object id="anEmptyList" type="System.Collections.ArrayList, Mscorlib"/&gt;</programlisting>
+
+        <programlisting>&lt;object id="anSqlCommand" type="System.Data.SqlClient.SqlCommand, System.Data"/&gt;</programlisting>
+      </sect3>
+
+      <sect3>
+        <title>Constructor Arguments</title>
+
+        <para></para>
+
+        <programlisting></programlisting>
+      </sect3>
+
+      <sect3>
+        <title>Properties</title>
+
+        <para></para>
+
+        <programlisting></programlisting>
+      </sect3>
+    </sect2>
+
+    <sect2>
+      <title>Object Types</title>
+
+      <para></para>
+
+      <sect3 id="xcf-primitives">
+        <title>Primitives</title>
+
+        <para>This section details the various configuration options available
+        for injecting, handoing, and otherwise defining the classic primitive
+        types. The <classname>string</classname> and
+        <classname>date</classname> types are not primitives, but they are
+        described here nevertheless.</para>
+
+        <para>Spring.NET uses the <classname>TypeConverter</classname>
+        mechanism that is part of the SDK to handle the conversion from string
+        values in one's XML configuration to the appropriate type. This
+        reference does not go into detail about this mechanism, so you may
+        wish to consult the attendant section of the reference material proper
+        if you are having type conversion issues... <xref
+        linkend="objects-objects-conversion" /></para>
+
+        <sect4 id="xcf-numbers">
+          <title>Numbers</title>
+
+          <para>This section describes configuring the various numeric types
+          supported by the CLR. Any numeric type can be injected into an
+          object, or made available as an object definition in its own
+          right.</para>
+
+          <para>Find below the class definition that is used to illustrate
+          configuring numeric values in the following examples.</para>
+
+          <programlisting>[C#]
+namespace Example
+{
+    public class Gauge
+    {
+        private int setting;
+        private float sensitivity;
+        
+        public int Setting 
+        {
+            set { this.setting = value; }
+        }
+        
+        public float Sensitivity 
+        {
+            set { this.sensitivity = value; }
+        }
+    }    
+}</programlisting>
+
+          <programlisting>&lt;object id="aGauge" type="Example.Gauge, FooAssembly"&gt;
+    &lt;property name="setting" value="213"/&gt;
+&lt;/object&gt;</programlisting>
+
+          <para>We can also use any of the normal supported conventions (such
+          as hexadecimal) to set values, as shown below.</para>
+
+          <programlisting>&lt;object id="aGauge" type="Example.Gauge, FooAssembly"&gt;
+    &lt;property name="setting" value="0x10"/&gt;
+&lt;/object&gt;</programlisting>
+
+          <programlisting>&lt;object id="aGauge" type="Example.Gauge, FooAssembly"&gt;
+    &lt;property name="sensitivity" value="31000.00"/&gt;
+&lt;/object&gt;</programlisting>
+
+          <para>Given the above examples, it is trivial to extrapolate the
+          configuration of longs and the various unsigned variants of the
+          numeric types, so no examples of such configuration will be
+          given.</para>
+        </sect4>
+
+        <sect4>
+          <title>Dates</title>
+
+          <para></para>
+
+          <para>Find below the class definition that is used to illustrate
+          configuring date values in the following examples.</para>
+
+          <programlisting>[C#]
+namespace Example
+{
+    public class Gauge
+    {
+        private DateTime lastChecked;
+        
+        public DateTime LastChecked 
+        {
+            set { this.lastChecked = value; }
+        }
+    }    
+}</programlisting>
+
+          <programlisting>&lt;object id="aGauge" type="Example.Gauge, FooAssembly"&gt;
+    &lt;property name="lastChecked" value=""/&gt;
+&lt;/object&gt;</programlisting>
+
+          <programlisting>&lt;object id="aGauge" type="Example.Gauge, FooAssembly"&gt;
+    &lt;property name="lastChecked" value=""/&gt;
+&lt;/object&gt;</programlisting>
+
+          <programlisting>&lt;object id="aGauge" type="Example.Gauge, FooAssembly"&gt;
+    &lt;property name="lastChecked" value=""/&gt;
+&lt;/object&gt;</programlisting>
+        </sect4>
+
+        <sect4 id="xcf-booleans">
+          <title>Booleans</title>
+
+          <para>Configuring boolean values in one's configuration file (s) is
+          pretty much the same as configuring numeric and date values... one
+          simply uses the <literal>value</literal> attribute or
+          <literal>&lt;value/&gt;</literal> element (as appropriate). The only
+          caveat (if indeed it can be considered to be a caveat) is that the
+          value <emphasis role="bold">must</emphasis> be one of the following
+          two values... <itemizedlist>
+              <listitem>
+                <para><emphasis role="bold">true</emphasis></para>
+              </listitem>
+
+              <listitem>
+                <para><emphasis role="bold">false</emphasis></para>
+              </listitem>
+            </itemizedlist></para>
+
+          <para>Find below the class definition that is used to illustrate
+          configuring boolean values in the following examples.</para>
+
+          <programlisting>[C#]
+namespace Example
+{
+    public class Gauge
+    {
+        private bool isSwitchedOn;
+        
+        public bool IsSwitchedOn 
+        {
+            set { this.isSwitchedOn = value; }
+        }
+    }    
+}</programlisting>
+
+          <programlisting>&lt;object id="aGauge" type="Example.Gauge, FooAssembly"&gt;
+    &lt;property name="IsSwitchedOn" value="true"/&gt;
+&lt;/object&gt;</programlisting>
+
+          <programlisting>&lt;object id="aGauge" type="Example.Gauge, FooAssembly"&gt;
+    &lt;property name="IsSwitchedOn" value="false"/&gt;
+&lt;/object&gt;</programlisting>
+
+          <para>Please note that as with pretty much everything in Spring.NET,
+          the <literal>true</literal> and <literal>false</literal> string
+          values are not case sensitive. The string values
+          <literal>TRUE</literal>, <literal>FALSE</literal>,
+          <literal>True</literal>, etc. are all valid.</para>
+
+          <para>If you wanted to use different values for the
+          <literal>true</literal> and <literal>false</literal> string values
+          (perhaps <literal>on</literal> and <literal>off</literal> values in
+          the case of the preceding <classname>Gauge</classname> example), you
+          would need to register a custom <classname>TypeConverter</classname>
+          implementation (see <xref
+          linkend="objects-objects-conversion" />).</para>
+        </sect4>
+
+        <sect4 id="xcf-strings">
+          <title>Strings</title>
+
+          <para>Unsurprisingly, <classname>String</classname> values are the
+          easiest to configure. Consider the following example of strings that
+          are defined as top level objects...</para>
+
+          <programlisting>&lt;object id="supportTeamEmail" type="string"&gt;
+    &lt;constructor-arg index="0" value="support@my.company.com"/&gt;
+&lt;/object&gt;</programlisting>
+
+          <programlisting>&lt;object id="projectManagerEmail" type="string"&gt;
+    &lt;constructor-arg index="0" value="projectManager@my.company.com"/&gt;
+&lt;/object&gt;</programlisting>
+
+          <para>The <literal>index="0"</literal> attribute value pair of the
+          <literal>constructor-arg</literal> element is required so that the
+          correct constructor of the <classname>String</classname> class can
+          be invoked... don't forget to put it in. (If you do forget to put it
+          in, then a not-very-helpful
+          <classname>UnsatisfiedDependencyException</classname> will be thrown
+          by the Spring.NET container).</para>
+        </sect4>
+
+        <sect4 id="xcf-enums">
+          <title>Enumerations</title>
+
+          <para>Find below the class definition and XML snippets that
+          illustrate the configuration of enumerations.</para>
+
+          <programlisting>[C#]
+namespace Example
+{
+    public enum RunningMode
+    {
+        Off,
+        Starting,
+        Started,
+        SwitchingOff,
+        Off
+    }
+
+    public class Gauge
+    {
+        private RunningMode runMode;
+        
+        public RunningMode RunMode 
+        {
+            set { this.runMode = value; }
+        }
+    }    
+}</programlisting>
+
+          <programlisting>&lt;object id="aGauge" type="Example.Gauge, FooAssembly"&gt;
+    &lt;property name="RunMode" value="Starting"/&gt;
+&lt;/object&gt;</programlisting>
+
+          <programlisting>&lt;object id="aGauge" type="Example.Gauge, FooAssembly"&gt;
+    &lt;property name="RunMode" value="SwitchingOff"/&gt;
+&lt;/object&gt;</programlisting>
+
+          <para>Please note that as with pretty much everything in Spring.NET,
+          the string passed to the value of the <literal>value</literal>
+          attribute is not case sensitive. In the case of this specific
+          example, the string values <literal>starting</literal> and
+          <literal>SWITCHINGOFF</literal> are both valid (though not
+          recommended; it's always best to stick to the casing of the original
+          enum, to aid in refactorings).</para>
+
+          <para>See also <xref
+          linkend="objects-type-conversion-enums" />.</para>
+        </sect4>
+      </sect3>
+
+      <sect3>
+        <title>Collections</title>
+
+        <para></para>
+
+        <sect4>
+          <title>Arrays</title>
+
+          <para></para>
+        </sect4>
+
+        <sect4>
+          <title>Lists</title>
+
+          <para></para>
+        </sect4>
+
+        <sect4>
+          <title>Dictionaries</title>
+
+          <para></para>
+        </sect4>
+
+        <sect4>
+          <title>Sets</title>
+
+          <para></para>
+        </sect4>
+
+        <sect4>
+          <title>Custom Collection Types</title>
+
+          <para></para>
+        </sect4>
+
+        <sect4>
+          <title>Everything Else</title>
+
+          <para></para>
+        </sect4>
+      </sect3>
+
+      <sect3>
+        <title>Nulls</title>
+
+        <para></para>
+      </sect3>
+    </sect2>
+
+    <sect2>
+      <title>Scope</title>
+
+      <para></para>
+
+      <sect3 id="xcf-singleton">
+        <title>Singleton</title>
+
+        <para></para>
+      </sect3>
+
+      <sect3 id="xcf-prototype">
+        <title>Prototype</title>
+
+        <para></para>
+      </sect3>
+
+      <sect3>
+        <title>Everything Else Scope Related</title>
+
+        <para></para>
+      </sect3>
+    </sect2>
+
+    <sect2>
+      <title>Factories</title>
+
+      <para>Perhaps unsurprisingly, implementations of the classic Factory
+      pattern can be found all over the Spring.NET codebase... indeed, the
+      core <classname>IApplicationContext</classname> class is a compelling
+      example of a factory implementation (albeit a very sophisticated
+      example). Spring.NET's support for the factory pattern extends into two
+      distinct areas... supporting factories that are external to the
+      framework, and factories that are internal to the framework.</para>
+
+      <para>External factory classes would include any factory classes that
+      you may have written: examples of this would include (perhaps)
+      <classname>IWiGFactory</classname> (to create
+      <classname>IWiG</classname> implementations), etc. You can integrate any
+      such existing factory classes directly into the Spring.NET container
+      using the factory method support provided by the Spring IoC container.
+      Examples of such integration are are provided below, but do see <xref
+      linkend="objects-factory-class-static-factory-method" /> and <xref
+      linkend="objects-factory-class-instance-factory-method" /> for the full
+      lowdown.</para>
+
+      <para>Spring.NET also has the notion of a special <emphasis>Factory
+      Object</emphasis> (and this notion is encapsulated by the
+      <classname>IFactoryObject</classname> interface). The
+      <classname>IFactoryObject</classname> interface is (unsurprisingly) a
+      factory for creating one or more objects. Please do read <xref
+      linkend="objects-factory-class-instance-factory-method" /> for a
+      comprehensive explanation of the <classname>IFactoryObject</classname>
+      interface and the Spring.NET container's special treatment of objects
+      that implement said interface. This section of the documentation will
+      show some example configuration for all (well, most) of the
+      <classname>IFactoryObject</classname> implementations that come provided
+      out of the box with every Spring.NET release.</para>
+
+      <sect3>
+        <title>Factory Methods</title>
+
+        <para></para>
+      </sect3>
+
+      <sect3>
+        <title>Factory Objects</title>
+
+        <para>This section of the documentation presents examples for most of
+        the <classname>IFactoryObject</classname> implementations that come
+        out of the box with every Spring.NET release. A notable exception to
+        this catalogue of <classname>IFactoryObject</classname> configuration
+        examples is the AOP-specific
+        <classname>ProxyFactoryObject</classname>... see <xref
+        linkend="aop-quickstart" /> for more details regarding that particular
+        <classname>IFactoryObject</classname> implementation.</para>
+
+        <para>Most (if not all) of the <classname>IFactoryObject</classname>
+        implementations referenced in the following configuration examples can
+        be found in the <literal>Spring.Objects.Factory.Config</literal>
+        namespace; do also consult the attendant API documentation (because
+        most of the <classname>IFactoryObject</classname> implementations
+        carry configuration examples specific to the objects that they
+        create).</para>
+
+        <sect4>
+          <title>DelegateFactoryObject</title>
+
+          <para>One can use the <classname>DelegateFactoryObject</classname>
+          to (unsurprisingly) create and configure
+          <classname>Delegate</classname> objects. One trenchant use case for
+          this <classname>IFactoryObject</classname> (and indeed the very
+          reason that prompted it's creation) is to create declaratively a
+          <classname>ConfigListener</classname> delegate for use with the
+          IBatis.NET project's <classname>SqlMapper</classname> class. This
+          approach (of using the <classname>DelegateFactoryObject</classname>)
+          allows one to keep all of one's <classname>SqlMapper</classname>
+          configuration together, nice and tidy, in the one place.</para>
+
+          <para>So lets say we have a service object that we need to inject
+          with a delegate; class definitions for the class that has the
+          dependency on the delegate, the delegate class itself, and a class
+          that supplies the method that will be passed to the delegate when it
+          is created can be found below.</para>
+
+          <programlisting>[C#]
+namespace Example		
+{
+    public delegate void GaugeCallback (object sender, GuageEventArgs e);
+
+    public class Gauge
+    {
+        private GaugeCallback callback;
+        
+        public GaugeCallback Callback 
+        {
+            set { this.callback = value; }
+        }
+        
+        public void SomeOperation() {
+			// some logic...
+			callback(this, new GaugeEventArgs());
+        }
+    }
+    
+    public class MyGaugeListener() {
+    
+		public void HandleGaugeOperation(object sender, GuageEventArgs e) {
+			// do something...
+		}
+    }
+}</programlisting>
+
+          <para>The attendant configuration to supply an instance of the
+          <classname>Gauge</classname> class with a configured
+          <classname>GuageCallback</classname> delegate would look like
+          so...</para>
+
+          <programlisting>&lt;objects xmlns="http://www.springframework.net"&gt;
+    &lt;object id="gauge" type="Example.Gauge, FooAssembly"&gt;
+		&lt;property name="callback"&gt;
+			&lt;object type="Spring.Objects.Factory.Config.DelegateFactoryObject"&gt;
+				&lt;property name="delegateType" value="Example.GaugeCallback, FooAssembly"/&gt;
+				&lt;property name="targetObject"&gt;
+					&lt;object type="Example.MyGaugeCallback, FooAssembly"/&gt;
+				&lt;/property&gt;
+			&lt;/object&gt;
+		&lt;/property&gt;
+    &lt;/object&gt;
+&lt;/objects&gt;</programlisting>
+        </sect4>
+
+        <sect4>
+          <title>DictionaryFactoryObject</title>
+
+          <para></para>
+        </sect4>
+
+        <sect4>
+          <title>Log4NetFactoryObject</title>
+
+          <para></para>
+        </sect4>
+      </sect3>
+    </sect2>
+
+    <sect2>
+      <title></title>
+
+      <para></para>
+    </sect2>
+  </sect1>
+
+  <sect1>
+    <title>Context Configuration</title>
+
+    <para>This section details the configuration of one or more contexts...
+    i.e. not the objects themselves, but rather of the hierarchy of contexts
+    in which one's object definitions are contained.</para>
+  </sect1>
+</chapter>
\ No newline at end of file
diff --git a/doc/reference/src/xml-custom.xml b/doc/reference/src/xml-custom.xml
new file mode 100644
index 00000000..803f9916
--- /dev/null
+++ b/doc/reference/src/xml-custom.xml
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<appendix id="extensible-xml">
+  <title>Extensible XML authoring</title>
+
+  <section id="extensible-xml-introduction">
+    <title>Introduction</title>
+
+    <para>Spring supports adding custom schema-based extensions to the basic
+    Spring XML format for defining and configuring objects. This section is
+    devoted to detailing how you would go about writing your own custom XML
+    object definition parsers and integrating such parsers into the Spring IoC
+    container.</para>
+
+    <para>To facilitate the authoring of configuration files using a
+    schema-aware XML editor, Spring's extensible XML configuration mechanism
+    is based on XML Schema. If you are not familiar with Spring's current XML
+    configuration extensions that come with the standard Spring distribution,
+    please first read the appendix entitled <xref
+    linkend="xsd-config" />.</para>
+
+    <para>Creating new XML configuration extensions can be done by following
+    these (relatively) simple steps:</para>
+
+    <para><orderedlist numeration="arabic">
+        <listitem>
+          <para><link linkend="extensible-xml-schema">Authoring</link> an XML
+          schema to describe your custom element(s).</para>
+        </listitem>
+
+        <listitem>
+          <para><link linkend="extensible-xml-namespaceparser">Coding</link>
+          a custom <interfacename>INamespaceParser</interfacename>
+          implementation (this is an easy step, don't worry).</para>
+        </listitem>
+
+        <listitem>
+          <para><link linkend="extensible-xml-parser">Coding</link> one or
+          more <interfacename>IObjectDefinitionParser</interfacename>
+          implementations (this is where the real work is done).</para>
+        </listitem>
+
+        <listitem>
+          <para><link linkend="extensible-xml-registration">Registering</link>
+          the above artifacts with Spring (this too is an easy step).</para>
+        </listitem>
+      </orderedlist></para>
+
+    <para>What follows is a description of each of these steps. For the
+    example, we will create an XML extension (a custom XML element) that
+    allows us to configure objects of the type <classname>Regex</classname>
+    (from the <literal>System.Text.RegularExpressions</literal> namespace) in
+    an easy manner. When we are done, we will be able to define object
+    definitions of type <classname>Regex</classname> like this:</para>
+
+    <programlisting>&lt;myns:regex id="regex" 
+            pattern="(^\d{5}$)|(^\d{5}-\d{4}$)"
+            options="Compiled"/&gt;
+</programlisting>
+  </section>
+
+  <section id="extensible-xml-schema">
+    <title>Authoring the schema</title>
+
+    <para>Creating an XML configuration extension for use with Spring's IoC
+    container starts with authoring an XML Schema to describe the extension.
+    What follows is the schema we'll use to configure
+    <classname>Regex</classname> objects.</para>
+
+    <programlisting>&lt;?xml version="1.0" encoding="utf-8" ?&gt;
+&lt;xsd:schema id="myns"
+           xmlns="http://www.mycompany.com/schema/myns"
+           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+           xmlns:objects="http://www.springframework.net"
+           xmlns:vs="http://schemas.microsoft.com/Visual-Studio-Intellisense"
+           targetNamespace="http://www.mycompany.com/schema/myns"           
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified"
+           vs:friendlyname="Spring Regex Configuration" vs:ishtmlschema="false" 
+           vs:iscasesensitive="true" vs:requireattributequotes="true" 
+           vs:defaultnamespacequalifier="" vs:defaultnsprefix=""
+           &gt;
+
+  &lt;xsd:import namespace="http://www.springframework.net"/&gt;
+
+  &lt;xsd:element name="regex"&gt;
+    &lt;xsd:complexType&gt;
+      &lt;xsd:complexContent&gt;
+        <emphasis role="bold">&lt;xsd:extension base="objects:identifiedType"&gt;</emphasis>
+          &lt;xsd:attribute name="pattern" type="xsd:string" use="required"/&gt;
+          &lt;xsd:attribute name="options" type="xsd:string" use="optional"/&gt;
+        &lt;/xsd:extension&gt;
+      &lt;/xsd:complexContent&gt;
+    &lt;/xsd:complexType&gt;
+  &lt;/xsd:element&gt;
+  
+&lt;/xsd:schema&gt;    </programlisting>
+
+    <para>The emphasized line contains an extension base for all tags that
+    will be identifiable (meaning they have an <literal>id</literal> attribute
+    that will be used as the object identifier in the container). We are able
+    to use this attribute because we imported the Spring-provided
+    <literal>'objects'</literal> namespace. The <literal>vs:</literal>
+    prefixed elements are for better integration with intellisense in
+    VS.NET.</para>
+
+    <para>The above schema will be used to configure
+    <classname>Regex</classname> objects, directly in an XML application
+    context file using the <literal>&lt;myns:regex/&gt;</literal>
+    element.</para>
+
+    <programlisting>&lt;myns:regex id="usZipCodeRegex"
+            pattern="(^\d{5}$)|(^\d{5}-\d{4}$)"
+            options="Compiled"/&gt;</programlisting>
+
+    <para>Note that after we've created the infrastructure classes, the above
+    snippet of XML will essentially be exactly the same as the following XML
+    snippet. In other words, we're just creating an object in the container,
+    identified by the name <literal>'usZipCodeRegex'</literal> of type
+    <classname>Regex</classname>, with a couple of constructor arguments
+    set.</para>
+
+    <programlisting>  &lt;object id="usZipCodeRegex" type="System.Text.RegularExpressions.Regex, System"&gt;
+    &lt;constructor-arg name="pattern" value="(^\d{5}$)|(^\d{5}-\d{4}$)"/&gt;
+    &lt;constructor-arg name="options" value="Compiled"/&gt;
+  &lt;/object&gt;</programlisting>
+
+    <note>
+      <para>The schema-based approach to creating configuration format allows
+      for tight integration with an IDE that has a schema-aware XML editor.
+      Using a properly authored schema, you can use intellisense to have a
+      user choose between several configuration options defined in the
+      enumeration. The schema for creating IDbProvider instances shows the use
+      of XSD enumerations.</para>
+    </note>
+  </section>
+
+  <section id="extensible-xml-namespaceparser">
+    <title>Coding a <interfacename>INamespaceParser</interfacename></title>
+
+    <para>In addition to the schema, we need an
+    <interfacename>INamespaceParser</interfacename> that will parse all
+    elements of this specific namespace Spring encounters while parsing
+    configuration files. The <interfacename>INamespaceParser</interfacename>
+    should in our case take care of the parsing of the
+    <literal>myns:regex</literal> element.</para>
+
+    <para>The <interfacename>INamespaceParser</interfacename> interface is
+    pretty simple in that it features just two methods:</para>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para><methodname>Init()</methodname> - allows for initialization of
+        the <interfacename>INamespaceParser</interfacename> and will be
+        called by Spring before the handler is used</para>
+      </listitem>
+
+      <listitem>
+        <para><methodname>IObjectDefinition Parse(Element,
+        ParserContext)</methodname> - called when Spring encounters a
+        top-level element (not nested inside a object definition or a
+        different namespace). This method can register object definitions
+        itself and/or return a object definition.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Although it is perfectly possible to code your own
+    <interfacename>INamespaceParser</interfacename> for the entire namespace
+    (and hence provide code that parses each and every element in the
+    namespace), it is often the case that each top-level XML element in a
+    Spring XML configuration file results in a single object definition (as in
+    our case, where a single <literal>&lt;myns:regex/&gt;</literal> element
+    results in a single <classname>Regex</classname> object definition).
+    Spring features a number of convenience classes that support this
+    scenario. In this example, we'll make use the
+    <classname>NamespaceParserSupport</classname> class:</para>
+
+    <programlisting>using Spring.Objects.Factory.Xml;
+
+namespace CustomNamespace
+{
+    [NamespaceParser(
+        Namespace = "http://www.mycompany.com/schema/myns",
+        SchemaLocationAssemblyHint = typeof(MyNamespaceParser),
+        SchemaLocation = "/CustomNamespace/myns.xsd"
+        )
+    ]
+    public class MyNamespaceParser : NamespaceParserSupport
+    {
+        public override void Init()
+        {
+            <emphasis role="bold">RegisterObjectDefinitionParser</emphasis>("regex", new RegexObjectDefinitionParser());
+        }
+    }
+}</programlisting>
+
+    <para>Notice that there isn't actually a whole lot of parsing logic in
+    this class. Indeed... the <classname>NamespaceParserSupport</classname>
+    class has a built in notion of delegation. It supports the registration of
+    any number of <interfacename>IObjectDefinitionParser</interfacename>
+    instances, to which it will delegate to when it needs to parse an element
+    in it's namespace. This clean separation of concerns allows an
+    <interfacename>INamespaceParser</interfacename> to handle the
+    orchestration of the parsing of <emphasis>all</emphasis> of the custom
+    elements in it's namespace, while delegating to
+    <literal>IObjectDefinitionParsers</literal> to do the grunt work of the
+    XML parsing; this means that each
+    <interfacename>IObjectDefinitionParser</interfacename> will contain just
+    the logic for parsing a single custom element, as we can see in the next
+    step.</para>
+
+    <para>To help in the registration of the parser for this namespace, the
+    <literal>NamespaceParser</literal> attribute is used to map the XML
+    namespace string, i.e.
+    <literal>http://www.mycompany.com/schema/myns</literal>, to the location
+    of the XML Schema file as an embedded assembly resource.</para>
+  </section>
+
+  <section id="extensible-xml-parser">
+    <title>Coding an
+    <interfacename>IObjectDefinitionParser</interfacename></title>
+
+    <para>A <interfacename>IObjectDefinitionParser</interfacename> will be
+    used if the <interfacename>INamespaceParser</interfacename> encounters an
+    XML element of the type that has been mapped to the specific object
+    definition parser (which is <literal>'regex'</literal> in this case). In
+    other words, the <interfacename>IObjectDefinitionParser</interfacename> is
+    responsible for parsing <emphasis>one</emphasis> distinct top-level XML
+    element defined in the schema. In the parser, we'll have access to the XML
+    element (and thus it's subelements too) so that we can parse our custom
+    XML content, as can be seen in the following example:</para>
+
+    <programlisting>using System;
+using System.Text.RegularExpressions;
+using System.Xml;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+using Spring.Util;
+
+namespace CustomNamespace
+{
+   public class RegexObjectDefinitionParser : AbstractSimpleObjectDefinitionParser { <co
+        id="extensible-xml-parser-simpledateformat-co-1" />
+
+   protected override Type GetObjectType(XmlElement element)
+   {
+     return typeof (Regex); <co
+        id="extensible-xml-parser-simpledateformat-co-2" />
+   }
+
+   protected override void DoParse(XmlElement element, ObjectDefinitionBuilder builder)
+   {
+<lineannotation>       // this will never be null since the schema explicitly requires that a value be supplied</lineannotation>
+       string pattern = element.GetAttribute("pattern");
+       builder.AddConstructorArg(pattern);
+
+<lineannotation>       // this however is an optional property</lineannotation>
+       string options = element.GetAttribute("options");            
+       if (StringUtils.HasText(options))
+       {
+          RegexOptions regexOptions = (RegexOptions)Enum.Parse(typeof (RegexOptions), options);
+          builder.AddConstructorArg(regexOptions);
+       }
+   }
+
+   protected override bool ShouldGenerateIdAsFallback
+   {
+      get { return true; }
+   }
+}
+</programlisting>
+
+    <calloutlist>
+      <callout arearefs="extensible-xml-parser-simpledateformat-co-1">
+        <para>We use the Spring-provided
+        <classname>AbstractSingleObjectDefinitionParser</classname> to handle
+        a lot of the basic grunt work of creating a
+        <emphasis>single</emphasis>
+        <interfacename>IObjectDefinition</interfacename>.</para>
+      </callout>
+
+      <callout arearefs="extensible-xml-parser-simpledateformat-co-2">
+        <para>We supply the
+        <classname>AbstractSingleObjectDefinitionParser</classname> superclass
+        with the type that our single
+        <interfacename>IObjectDefinition</interfacename> will
+        represent.</para>
+      </callout>
+    </calloutlist>
+
+    <para>In this simple case, this is all that we need to do. The creation of
+    our single <interfacename>IObjectDefinition</interfacename> is handled by
+    the <classname>AbstractSingleObjectDefinitionParser</classname>
+    superclass, as is the extraction and setting of the object definition's
+    unique identifier. The property
+    <literal>ShouldGenerateIdAsFallback</literal> will generate a throw-away
+    object id incase one is not specified, this is useful when nesting object
+    definitions.</para>
+  </section>
+
+  <section id="extensible-xml-registration">
+    <title>Registering the handler and the schema</title>
+
+    <para>The coding is finished! All that remains to be done is to somehow
+    make the Spring XML parsing infrastructure aware of our custom element; we
+    do this by registering our custom
+    <interfacename>INamespaceParser</interfacename> using a special
+    configuration section handler. The location of the XML Schema in this
+    example has been directly assoicated with the parser though the use of the
+    <literal>Namespace</literal> attribute.</para>
+
+    <section id="extensible-xml-registration-spring-handlers">
+      <title><filename>NamespaceParsersSectionHandler</filename></title>
+
+      <para>The custom configuration section handler is of the type
+      <classname>Spring.Context.Support.NamespaceParsersSectionHandler</classname>
+      and is registered with .NET in the normal manner. The custom
+      configuration section will simply point to the
+      <classname>INamespaceParser</classname> implementation that has the
+      <classname>Namespace</classname> attribute. For our example, we need to
+      write the following:</para>
+
+      <programlisting>&lt;configuration&gt;
+
+  &lt;configSections&gt;
+    &lt;sectionGroup name="spring"&gt;       
+      &lt;section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/&gt; 
+     &lt;/sectionGroup&gt;
+  &lt;/configSections&gt;
+
+  &lt;spring&gt;
+    &lt;parsers&gt;
+      &lt;parser type="CustomNamespace.MyNamespaceParser, CustomNamespace" /&gt;
+    &lt;/parsers&gt;
+  &lt;/spring&gt;
+
+&lt;/configuration&gt;</programlisting>
+    </section>
+  </section>
+
+  <section id="extensible-xml-using">
+    <title>Using a custom extension in your Spring XML configuration</title>
+
+    <para>Using a custom extension that you yourself have implemented is no
+    different from using one of the 'custom' extensions that Spring provides
+    straight out of the box. Find below an example of using the custom
+    <literal>&lt;regex/&gt;</literal> element developed in the previous steps
+    in a Spring XML configuration file.</para>
+
+    <programlisting>&lt;?xml version="1.0" encoding="utf-8" ?&gt;
+&lt;objects xmlns="http://www.springframework.net"
+         xmlns:myns="http://www.mycompany.com/schema/myns"&gt;
+
+  &lt;!-- as a top level object definition --&gt;
+  &lt;myns:regex id="usZipCodeRegex"
+              pattern="(^\d{5}$)|(^\d{5}-\d{4}$)"/&gt;
+
+  &lt;object id="jobDetailTemplate" abstract="true"&gt;
+    &lt;property name="regex"&gt;
+      &lt;!-- as an inner object definition --&gt;
+       &lt;myns:regex pattern="(^\d{5}$)|(^\d{5}-\d{4}$)"
+                   options="Compiled"/&gt;
+    &lt;/property&gt;
+  &lt;/object&gt;
+
+&lt;/objects&gt;</programlisting>
+  </section>
+
+  <section id="extensible-xml-resources">
+    <title>Further Resources</title>
+
+    <para>Find below links to further resources concerning XML Schema and the
+    extensible XML support described in this chapter.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>The <ulink
+        url="http://www.w3.org/TR/2004/REC-xmlschema-1-20041028/">XML Schema
+        Part 1: Structures Second Edition</ulink></para>
+      </listitem>
+
+      <listitem>
+        <para>The <ulink
+        url="http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/">XML Schema
+        Part 2: Datatypes Second Edition</ulink></para>
+      </listitem>
+    </itemizedlist>
+  </section>
+</appendix>
\ No newline at end of file
diff --git a/doc/reference/src/xsd-configuration.xml b/doc/reference/src/xsd-configuration.xml
new file mode 100644
index 00000000..4f3c7be0
--- /dev/null
+++ b/doc/reference/src/xsd-configuration.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<appendix id="xsd-config">
+  <title>XML Schema-based configuration</title>
+
+  <section id="xsd-config-introduction">
+    <title>Introduction</title>
+
+    <para>This appendix details the use of XML Schema-based configuration in
+    Spring.</para>
+
+    <para> The <emphasis>'classic' </emphasis>
+    <literal>&lt;object/&gt;</literal>-based schema is good, but its
+    generic-nature comes with a price in terms of configuration overhead.
+    Creating a custom XML Schema-based configuration makes Spring XML
+    configuration files substantially clearer to read. In addition, it allows
+    you to express the intent of an object definition.</para>
+
+    <para>The key thing to remember is that creating custom schema tags work
+    best for infrastructure or integration objects: for example, AOP,
+    collections, transactions, integration with 3rd-party frameworks, etc.,
+    while the existing object tags are best suited to application-specific
+    objects, such as DAOs, service layer objects, etc.</para>
+
+    <para>Please note the fact that the XML configuration mechanism is totally
+    customisable and extensible. This means you can write your own
+    domain-specific configuration tags that would better represent your
+    application's domain; the process involved in doing so is covered in the
+    appendix entitled <xref linkend="extensible-xml" />.</para>
+  </section>
+
+  <section id="xsd-config-body">
+    <title>XML Schema-based configuration</title>
+
+    <section id="xsd-config-body-referencing">
+      <title>Referencing the schemas</title>
+
+      <para>As a reminder, you reference the standard objects schema as shown
+      below</para>
+
+      <programlisting>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;objects xmlns="http://www.springframework.net"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/schema/objects/spring-objects-1.1.xsd"&gt;
+
+<lineannotation> &lt;!-- <literal>&lt;object/&gt;</literal> definitions here --&gt;</lineannotation>
+
+&lt;/objects&gt;</programlisting>
+
+      <note>
+        <para>The <literal>'xsi:schemaLocation'</literal> fragment is not
+        actually required, but can be included to reference a local copy of a
+        schema (which can be useful during development) and assumes the XML
+        editor will look to that location and load the schema.</para>
+      </note>
+
+      <para>The above Spring XML configuration fragment is boilerplate that
+      you can copy and paste (!) and then plug
+      <literal>&lt;object/&gt;</literal> definitions into like you have always
+      done. However, the entire point of using custom schema tags is to make
+      configuration easier. </para>
+    </section>
+
+    <para>The rest of this chapter gives an overview of custom XML Schema
+    based configuration that are included with the release.</para>
+
+    <section id="xsd-config-body-schemas-tx">
+      <title>The <literal>tx</literal> (transaction) schema</title>
+
+      <para>The <literal>tx</literal> tags deal with configuring objects in
+      Spring's comprehensive support for transactions. These tags are covered
+      in the chapter entitled <xref linkend="transaction" />.</para>
+
+      <tip>
+        <para>You are strongly encouraged to look at the
+        <filename>'spring-tx-1.1.xsd'</filename> file that ships with the
+        Spring distribution. This file is (of course), the XML Schema for
+        Spring's transaction configuration, and covers all of the various tags
+        in the <literal>tx</literal> namespace, including attribute defaults
+        and suchlike. This file is documented inline, and thus the information
+        is not repeated here in the interests of adhering to the DRY (Don't
+        Repeat Yourself) principle.</para>
+      </tip>
+
+      <para>In the interest of completeness, to use the tags in the
+      <literal>tx</literal> schema, you need to have the following preamble at
+      the top of your Spring XML configuration file; the emboldened text in
+      the following snippet references the correct schema so that the tags in
+      the <literal>tx</literal> namespace are available to you.</para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;object xmlns="http://www.springframework.net"
+      xmlns:aop="http://www.springframework.org/schema/aop"
+   <emphasis role="bold">   xmlns:tx="http://www.springframework.org/schema/tx"</emphasis>&gt;
+  
+<lineannotation>&lt;!-- <literal>&lt;object/&gt;</literal> definitions here --&gt;</lineannotation>
+
+&lt;/object&gt;</programlisting>
+
+      <note>
+        <para>Often when using the tags in the <literal>tx</literal> namespace
+        you will also be using the tags from the <literal>aop</literal>
+        namespace (since the declarative transaction support in Spring is
+        implemented using AOP). The above XML snippet contains the relevant
+        lines needed to reference the <literal>aop</literal> schema so that
+        the tags in the <literal>aop</literal> namespace are available to
+        you.</para>
+      </note>
+    </section>
+
+    <section id="xsd-config-body-schemas-aop">
+      <title>The <literal>aop</literal> schema</title>
+
+      <para>The <literal>aop</literal> tags deal with configuring all things
+      AOP in Spring. These tags are comprehensively covered in the chapter
+      entitled <xref linkend="aop" />.</para>
+
+      <para>In the interest of completeness, to use the tags in the
+      <literal>aop</literal> schema, you need to have the following preamble
+      at the top of your Spring XML configuration file; the emboldened text in
+      the following snippet references the correct schema so that the tags in
+      the <literal>aop</literal> namespace are available to you.</para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;objects xmlns="http://www.springframework.net"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   <emphasis role="bold">xmlns:aop="http://www.springframework.org/schema/aop"</emphasis>&gt;
+
+<lineannotation>&lt;!-- <literal>&lt;object/&gt;</literal> definitions here --&gt;</lineannotation>
+
+&lt;/objects&gt;</programlisting>
+    </section>
+
+    <section id="xsd-config-body-schemas-db">
+      <title>The <literal>db</literal> schema</title>
+
+      <para>The <literal>db</literal> tags deal with creating
+      <classname>IDbProvider</classname> instances for a given database client
+      library. The following snippet references the correct schema so that the
+      tags in the <literal>db</literal> namespace are available to you. The
+      tags are comprehensively covered in the chapter entitled <xref
+      linkend="dbprovider" />.</para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;objects xmlns="http://www.springframework.net"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   <emphasis role="bold">xmlns:db="http://www.springframework.org/schema/db"</emphasis>&gt;
+
+<lineannotation>&lt;!-- <literal>&lt;object/&gt;</literal> definitions here --&gt;</lineannotation>
+
+&lt;/objects&gt;</programlisting>
+    </section>
+
+    <section id="xsd-config-body-schemas-remoting">
+      <title>The <literal>remoting</literal> schema</title>
+
+      <para>The <literal>remoting</literal> tags are for use when you want to
+      export an existing POCO object as a .NET remoted object or to create a
+      client side .NET remoting proxy. The tags are comprehensively covered in
+      the chapter <xref linkend="remoting" /></para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;objects xmlns="http://www.springframework.org/schema/objects"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   <emphasis role="bold">xmlns:r="http://www.springframework.org/schema/remoting"</emphasis>&gt;
+
+<lineannotation>&lt;!-- <literal>&lt;object/&gt;</literal> definitions here --&gt;</lineannotation>
+
+&lt;/objects&gt;</programlisting>
+    </section>
+
+    <section id="xsd-config-body-schemas-validation">
+      <title>The <literal>validation</literal> schema</title>
+
+      <para>The <literal>validation</literal> tags are for use when you want
+      definte <literal>IValidator</literal> object instances. The tags are
+      comprehensively covered in the chapter <xref
+      linkend="validation" /></para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;objects xmlns="http://www.springframework.net"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   <emphasis role="bold">xmlns:v="http://www.springframework.org/schema/validation"</emphasis>&gt;
+
+<lineannotation>&lt;!-- <literal>&lt;object/&gt;</literal> definitions here --&gt;</lineannotation>
+
+&lt;/objects&gt;</programlisting>
+    </section>
+
+    <section id="xsd-config-body-schemas-objects">
+      <title>The <literal>objects</literal> schema</title>
+
+      <para>Last but not least we have the tags in the
+      <literal>objects</literal> schema. Examples of the various tags in the
+      <literal>objects</literal> schema are not shown here because they are
+      quite comprehensively covered in the section entitled <xref
+      linkend="object-factory-properties-detailed" /> (and indeed in that
+      entire <link linkend="objects">chapter</link>).</para>
+
+      <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;objects xmlns="http://www.springframework.net"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/schema/objects/spring-objects-1.1.xsd"&gt;
+
+    &lt;object id="foo" class="X.Y.Foo, X"&gt;
+        &lt;property name="name" value="Rick"/&gt;
+    &lt;/object&gt;
+
+&lt;/objects&gt;</programlisting>
+    </section>
+  </section>
+
+  <section id="xsd-config-setup">
+    <title>Setting up your IDE</title>
+
+    <para>To setup VS.NET to provide intellisence while editing XML file for
+    your custom XML schemas you will need to copy your XSD files to an
+    appropriate VS.NET directory. Refer to the following chapter for details,
+    <xref linkend="vsnet" /></para>
+
+    <para>For SharpDevelop, follow the directions on the "<ulink
+    url="http://community.sharpdevelop.net/blogs/mattward/articles/FeatureTourEditingXml.aspx">Editing
+    XML</ulink>" product documentation.</para>
+  </section>
+</appendix>
\ No newline at end of file
diff --git a/doc/reference/src/xsd-template.xml b/doc/reference/src/xsd-template.xml
new file mode 100644
index 00000000..7ab52c33
--- /dev/null
+++ b/doc/reference/src/xsd-template.xml
@@ -0,0 +1,4 @@
+<appendix id="springobjectsxsd">
+  <title>Spring.NET's <literal>spring-objects.xsd</literal></title>
+  <programlisting><![CDATA[@xsd-include@]]></programlisting>
+</appendix>
diff --git a/doc/reference/src/xsd.xml b/doc/reference/src/xsd.xml
new file mode 100644
index 00000000..944d63a2
--- /dev/null
+++ b/doc/reference/src/xsd.xml
@@ -0,0 +1,524 @@
+<appendix id="springobjectsxsd">
+  <title>Spring.NET's <literal>spring-objects.xsd</literal></title>
+  <programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema xmlns="http://www.springframework.net" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vs="http://schemas.microsoft.com/Visual-Studio-Intellisense" targetNamespace="http://www.springframework.net" elementFormDefault="qualified" attributeFormDefault="unqualified" vs:friendlyname="Spring.NET Configuration" vs:ishtmlschema="false" vs:iscasesensitive="true" vs:requireattributequotes="true" vs:defaultnamespacequalifier="" vs:defaultnsprefix="">
+    <xs:annotation>
+        <xs:documentation>
+            Spring Objects XML Schema Definition
+            Based on Spring Beans DTD, authored by Rod Johnson &amp; Juergen Hoeller
+            
+            Author: Griffin Caprio
+            
+            This defines a simple and consistent way of creating a namespace
+            of managed objects configured by a Spring XmlObjectFactory.
+            This document type is used by most Spring functionality, including
+            web application contexts, which are based on object factories.
+            
+            Each object element in this document defines an object.
+            Typically the object type (System.Type is specified, along with plain vanilla
+            object properties.
+            
+            Object instances can be "singletons" (shared instances) or "prototypes"
+            (independent instances).
+            
+            References among objects are supported, i.e. setting an object property
+            to refer to another object in the same factory or an ancestor factory.
+            
+            As alternative to object references, "inner object definitions" can be used.
+            Singleton flags and names of such "inner object" are always ignored:
+            Inner object are anonymous prototypes.
+            
+            There is also support for lists, dictionaries, and sets.
+        </xs:documentation>
+    </xs:annotation>
+    <xs:annotation>
+        <xs:documentation>Defines a base type for any required string.  Defines a string with a minimum length of 0</xs:documentation>
+    </xs:annotation>
+    <xs:simpleType name="nonNullString">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="0"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:annotation>
+        <xs:documentation>
+            Element containing informative text describing the purpose of the enclosing
+            element. Always optional.
+            Used primarily for user documentation of XML object definition documents.
+        </xs:documentation>
+    </xs:annotation>
+    <xs:simpleType name="description">
+        <xs:restriction base="nonNullString"/>
+    </xs:simpleType>
+    <xs:complexType name="valueObject">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="type" type="nonNullString" use="optional"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="expression">
+      <xs:sequence>
+        <xs:element name="property" type="property" minOccurs="0" maxOccurs="2"/>
+      </xs:sequence>
+      <xs:attribute name="value" type="nonNullString" use="required"/>
+    </xs:complexType>
+    <!--
+         Defines a reference to another object in this factory or an external
+         factory (parent or included factory).
+    -->
+    <xs:complexType name="objectReference">
+        <xs:attribute name="object" type="nonNullString" use="optional"/>
+        <xs:attribute name="local" type="xs:IDREF" use="optional"/>
+        <xs:attribute name="parent" type="nonNullString" use="optional"/>
+        <!--
+             References must specify a name of the target object.
+             The "object" attribute can reference any name from any object in the context,
+             to be checked at runtime.
+             Local references, using the "local" attribute, have to use object ids;
+             they can be checked by this DTD, thus should be preferred for references
+             within the same object factory XML file.
+        -->
+    </xs:complexType>
+    <!-- Defines a reference to another object or a type. -->
+    <xs:complexType name="objectOrClassReference">
+        <xs:attribute name="object" type="nonNullString" use="optional"/>
+        <xs:attribute name="local" type="xs:IDREF" use="optional"/>
+        <xs:attribute name="type" type="nonNullString" use="optional"/>
+    </xs:complexType>
+    <xs:group name="objectList">
+        <xs:sequence>
+            <xs:element name="description" type="description" minOccurs="0"/>
+            <xs:choice>
+                <xs:element name="object" type="vanillaObject"/>
+                <!--
+                     Defines a reference to another object in this factory or an external
+                     factory (parent or included factory).
+                -->
+                <xs:element name="ref" type="objectReference"/>
+                <!--
+                     Defines a string property value, which must also be the id of another
+                     object in this factory or an external factory (parent or included factory).
+                     While a regular 'value' element could instead be used for the same effect,
+                     using idref in this case allows validation of local object ids by the xml
+                     parser, and name completion by helper tools.
+                -->
+                <xs:element name="idref" type="objectReference"/>
+                <!--
+                     A objectList can contain multiple inner object, ref, collection, or value elements.
+                     Lists are untyped, pending generics support, although references will be
+                     strongly typed.
+                     A objectList can also map to an array type. The necessary conversion
+                     is automatically performed by AbstractObjectFactory.
+                -->
+                <xs:element name="list">
+                    <xs:complexType>
+                        <xs:group ref="objectList" minOccurs="0" maxOccurs="unbounded"/>
+                        <xs:attribute name="element-type" type="nonNullString" use="optional"/>
+                    </xs:complexType>
+                </xs:element>
+                <!--
+                     A set can contain multiple inner object, ref, collection, or value elements.
+                     Sets are untyped, pending generics support, although references will be
+                     strongly typed.
+                -->
+                <xs:element name="set">
+                    <xs:complexType>
+                        <xs:group ref="objectList" minOccurs="0" maxOccurs="unbounded"/>
+                    </xs:complexType>
+                </xs:element>
+                <!--
+                     A Spring map is a mapping from a string key to object (a .NET IDictionary).
+                     Maps may be empty.
+                -->
+                <xs:element name="dictionary" type="objectMap"/>
+                <!--
+                     Name-values elements differ from map elements in that values must be strings.
+                     Name-values may be empty.
+                -->
+                <xs:element name="name-values" type="objectNameValues"/>
+                <!--
+                     Contains a string representation of a property value.
+                     The property may be a string, or may be converted to the
+                     required type using the System.ComponentModel.TypeConverter
+                     machinery. This makes it possible for application developers
+                     to write custom TypeConverter implementations that can
+                     convert strings to objects.
+                     
+                     Note that this is recommended for simple objects only.
+                     Configure more complex objects by setting properties to references
+                     to other objects.
+                -->
+                <xs:element name="value" type="valueObject"/>
+                <!--
+                     Contains a string representation of an expression.
+                -->
+                <xs:element name="expression" type="expression"/>
+                <!--
+                     Denotes a .NET null value. Necessary because an empty "value" tag
+                     will resolve to an empty String, which will not be resolved to a
+                     null value unless a special TypeConverter does so.
+                -->
+                <xs:element name="null"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="objectNameValues">
+        <xs:sequence>
+            <!--
+                 The "value" attribute is the string value of the property. The "key"
+                 attribute is the name of the property.
+            -->
+            <xs:element name="add" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType mixed="true">
+                    <xs:attribute name="key" type="nonNullString" use="required"/>
+                    <xs:attribute name="value" use="required" type="xs:string"/>
+                    <xs:attribute name="delimiters" use="optional" type="xs:string"/>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="importElement">
+        <xs:attribute name="resource" type="nonNullString" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="aliasElement">
+        <xs:attribute name="name" type="nonNullString" use="required"/>
+        <xs:attribute name="alias" type="nonNullString" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="objectMap">
+        <xs:sequence>
+            <xs:element type="mapEntryElement" name="entry" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="key-type" type="nonNullString" use="optional"/>
+        <xs:attribute name="value-type" type="nonNullString" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="mapEntryElement">
+        <xs:sequence>
+            <xs:element type="mapKeyElement" name="key" minOccurs="0" maxOccurs="1"/>
+            <xs:group ref="objectList" minOccurs="0" maxOccurs="1"/>
+        </xs:sequence>
+        <xs:attribute name="key" type="nonNullString" use="optional"/>
+        <xs:attribute name="value" type="nonNullString" use="optional"/>
+        <xs:attribute name="expression" type="nonNullString" use="optional"/>
+        <xs:attribute name="key-ref" type="nonNullString" use="optional"/>
+        <xs:attribute name="value-ref" type="nonNullString" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="mapKeyElement">
+        <xs:group ref="objectList" minOccurs="1"/>
+    </xs:complexType>
+    <xs:annotation>
+        <xs:documentation>Defines constructor argument.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType name="lookupMethod">
+        <xs:attribute name="name" type="nonNullString" use="required"/>
+        <xs:attribute name="object" type="nonNullString" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="constructorArgument">
+        <xs:group ref="objectList" minOccurs="0"/>
+        <!--
+              The constructor-arg tag can have an optional named parameter attribute,
+              to specify a named parameter in the constructor argument list.
+        -->
+        <xs:attribute name="name" type="nonNullString" use="optional"/>
+        <!--
+              The constructor-arg tag can have an optional index attribute,
+              to specify the exact index in the constructor argument list. Only needed
+              to avoid ambiguities, e.g. in case of 2 arguments of the same type.
+        -->
+        <xs:attribute name="index" type="nonNullString" use="optional"/>
+       <!--
+              The constructor-arg tag can have an optional type attribute,
+              to specify the exact type of the constructor argument. Only needed
+              to avoid ambiguities, e.g. in case of 2 single argument constructors
+              that can both be converted from a String.
+        -->
+        <xs:attribute name="type" type="nonNullString" use="optional"/>
+        <xs:attribute name="value" type="nonNullString" use="optional"/>
+        <xs:attribute name="expression" type="nonNullString" use="optional"/>
+        <xs:attribute name="ref" type="nonNullString" use="optional"/>
+    </xs:complexType>
+    <xs:annotation>
+        <xs:documentation>Defines property.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType name="property">
+        <xs:group ref="objectList" minOccurs="0"/>
+        <!-- The property name attribute is the name of the objects property. -->
+        <xs:attribute name="name" type="nonNullString" use="required"/>
+        <xs:attribute name="value" type="nonNullString" use="optional"/>
+        <xs:attribute name="expression" type="nonNullString" use="optional"/>
+        <xs:attribute name="ref" type="nonNullString" use="optional"/>
+    </xs:complexType>
+    <xs:annotation>
+        <xs:documentation>Defines a single named object.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType name="vanillaObject">
+        <xs:sequence>
+            <xs:element name="description" type="description" minOccurs="0" maxOccurs="1"/>
+            <!--
+                 Object definitions can specify zero or more constructor arguments.
+                 They correspond to either a specific index of the constructor argument list
+                 or are supposed to be matched generically by type.
+                 This is an alternative to "autowire constructor".
+            -->
+            <xs:element name="constructor-arg" type="constructorArgument" minOccurs="0" maxOccurs="unbounded"/>
+            <!--
+                 Object definitions can have zero or more properties.
+                 Spring supports primitives, references to other objects in the same or
+                 related factories, lists, dictionaries and properties.
+            -->
+            <xs:element name="property" type="property" minOccurs="0" maxOccurs="unbounded"/>
+            <!--
+                 Object definitions can specify zero or more lookup-methods.
+            -->
+            <xs:element name="lookup-method" type="lookupMethod" minOccurs="0" maxOccurs="unbounded"/>
+            <!-- Object definitions can have zero or more replaced-methods. -->
+            <xs:element name="replaced-method" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="arg-type" minOccurs="0" maxOccurs="unbounded">
+                             <xs:complexType>
+                                  <xs:attribute name="match" type="nonNullString" use="required"/>
+                             </xs:complexType>
+                        </xs:element>
+                    </xs:sequence>
+                    <xs:attribute name="name" type="nonNullString" use="required"/>
+                    <xs:attribute name="replacer" type="nonNullString" use="required"/>
+                </xs:complexType>
+            </xs:element>
+            <!-- Object definitions can have zero or more subscriptions. -->
+            <xs:element name="listener" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="ref" type="objectOrClassReference" minOccurs="0" maxOccurs="unbounded"/>
+                    </xs:sequence>
+                    <!-- The event(s) the object is interested in. -->
+                    <xs:attribute name="event" type="nonNullString" use="optional"/>
+                    <!-- The name or name pattern of the method that will handle the event(s). -->
+                    <xs:attribute name="method" type="nonNullString" use="required"/>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <!--
+             Objects can be identified by an id, to enable reference checking.
+             There are constraints on a valid XML id: if you want to reference your object
+             in .NET code using a name that's illegal as an XML id, use the optional
+             "name" attribute. If neither given, the object type name is used as id.
+        -->
+        <xs:attribute name="id" type="xs:ID" use="optional"/>
+        <!--
+             Optional. Can be used to create one or more aliases illegal in an id.
+             Multiple aliases can be separated by any number of spaces or commas.
+        -->
+        <xs:attribute name="name" type="nonNullString" use="optional"/>
+        <!--
+             Each object definition must specify the full, assembly qualified of the type,
+             or the name of the parent object from which the type can be worked out.
+             
+             Note that a child object definition that references a parent will just
+             add respectively override property values and be able to change the
+             singleton status. It will inherit all of the parent's other parameters
+             like lazy initialization or autowire settings.
+        -->
+        <xs:attribute name="type" type="nonNullString" use="optional"/>
+        <xs:attribute name="parent" type="nonNullString" use="optional"/>
+        <!--
+             Is this object "abstract", i.e. not meant to be instantiated itself but
+             rather just serving as parent for concrete child object definitions?
+             Default is false. Specify true to tell the object factory to not try to
+             instantiate that particular object in any case.
+        -->
+        <xs:attribute name="abstract" type="xs:boolean" use="optional" default="false"/>
+        <!--
+             Is this object a "singleton" (one shared instance, which will
+             be returned by all calls to GetObject() with the id),
+             or a "prototype" (independent instance resulting from each call to
+             getObject(). Default is singleton.
+             
+             Singletons are most commonly used, and are ideal for multi-threaded
+             service objects.
+        -->
+        <xs:attribute name="singleton" type="xs:boolean" use="optional" default="true"/>
+        <!--
+             Optional attribute controlling the scope of singleton instances. It is
+             only applicable to ASP.Net web applications and it has no effect on prototype
+             objects. Applications other than ASP.Net web applications simply ignore this attribute.
+             It has 3 possible values:
+             1. "application"
+             Default object scope. Objects defined with application scope will behave like
+             traditional singleton objects. Same instance will be returned from every call
+             to IApplicationContext.GetObject()
+             
+             2. "session"
+             Objects with this scope will be stored within user's HTTP session. Session scope
+             is typically used for objects such as shopping cart, user profile, etc.
+             
+             3. "request"
+             Object with this scope will be initialized for each HTTP request, but unlike with prototype
+             objects, same instance will be returned from all calls to IApplicationContext.GetObject()
+             within the same HTTP request. For example, if one ASP page forwards request to another using
+             Server.Transfer method, they can easily share the state by configuring dependency to the same
+             request-scoped object.
+        -->
+        <xs:attribute name="scope" use="optional" default="application">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="application"/>
+                    <xs:enumeration value="session"/>
+                    <xs:enumeration value="request"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <!--
+             Is this object to be lazily initialized?
+             If false, it will get instantiated on startup by object factories
+             that perform eager initialization of singletons.
+        -->
+        <xs:attribute name="lazy-init" use="optional" default="default">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                    <xs:enumeration value="default"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <!--
+             Optional attribute controlling whether to "autowire" object properties.
+             This is an automagical process in which object references don't need to be coded
+             explicitly in the XML object definition file, but Spring works out dependencies.
+             
+             There are 5 modes:
+             
+             1. "no"
+             The traditional Spring default. No automagical wiring. Object references
+             must be defined in the XML file via the <ref> element. We recommend this
+             in most cases as it makes documentation more explicit.
+             
+             2. "byName"
+             Autowiring by property name. If a object of class Cat exposes a dog property,
+             Spring will try to set this to the value of the object "dog" in the current factory.
+             
+             3. "byType"
+             Autowiring if there is exactly one object of the property type in the object factory.
+             If there is more than one, a fatal error is raised, and you can't use byType
+             autowiring for that object. If there is none, nothing special happens - use
+             dependency-check="objects" to raise an error in that case.
+             
+             4. "constructor"
+             Analogous to "byType" for constructor arguments. If there isn't exactly one object
+             of the constructor argument type in the object factory, a fatal error is raised.
+             
+             5. "autodetect"
+             Chooses "constructor" or "byType" through introspection of the object class.
+             If a default constructor is found, "byType" gets applied.
+             
+             The latter two are similar to PicoContainer and make object factories simple to
+             configure for small namespaces, but doesn't work as well as standard Spring
+             behaviour for bigger applications.
+             
+             Note that explicit dependencies, i.e. "property" and "constructor-arg" elements,
+             always override autowiring. Autowire behaviour can be combined with dependency
+             checking, which will be performed after all autowiring has been completed.
+        -->
+        <xs:attribute name="autowire" use="optional" default="default">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="no"/>
+                    <xs:enumeration value="byName"/>
+                    <xs:enumeration value="byType"/>
+                    <xs:enumeration value="constructor"/>
+                    <xs:enumeration value="autodetect"/>
+                    <xs:enumeration value="default"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <!--
+             Optional attribute controlling whether to check whether all this
+             objects dependencies, expressed in its properties, are satisfied.
+             Default is no dependency checking.
+             
+             "simple" type dependency checking includes primitives and String
+             "object" includes collaborators (other objects in the factory)
+             "all" includes both types of dependency checking
+        -->
+        <xs:attribute name="dependency-check" use="optional" default="default">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="none"/>
+                    <xs:enumeration value="objects"/>
+                    <xs:enumeration value="simple"/>
+                    <xs:enumeration value="all"/>
+                    <xs:enumeration value="default"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <!--
+             The names of the objects that this object depends on being initialized.
+             The object factory will guarantee that these objects get initialized before.
+             
+             Note that dependencies are normally expressed through object properties or
+             constructor arguments. This property should just be necessary for other kinds
+             of dependencies like statics (*ugh*) or database preparation on startup.
+        -->
+        <xs:attribute name="depends-on" type="nonNullString" use="optional"/>
+        <!--
+             Optional attribute for the name of the custom initialization method
+             to invoke after setting object properties. The method must have no arguments,
+             but may throw any exception.
+        -->
+        <xs:attribute name="init-method" type="nonNullString" use="optional"/>
+        <!--
+             Optional attribute for the name of the custom destroy method to invoke
+             on object factory shutdown. The method must have no arguments,
+             but may throw any exception. Note: Only invoked on singleton objects!
+        -->
+        <xs:attribute name="destroy-method" type="nonNullString" use="optional"/>
+        <xs:attribute name="factory-method" type="nonNullString" use="optional"/>
+        <xs:attribute name="factory-object" type="nonNullString" use="optional"/>
+    </xs:complexType>
+    
+    <xs:annotation>
+        <xs:documentation>The document root.  At least one object definition is required.</xs:documentation>
+    </xs:annotation>
+    <xs:element name="objects">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="description" type="description" minOccurs="0" maxOccurs="1"/>
+                <xs:choice minOccurs="0" maxOccurs="unbounded">
+                    <xs:element name="import" type="importElement"/>
+                    <xs:element name="alias" type="aliasElement"/>
+                    <xs:element name="object" type="vanillaObject"/>
+                    <xs:any namespace="##other" processContents="strict"/>
+                </xs:choice>
+            </xs:sequence>
+            <!--
+                 Default values for all object definitions. Can be overridden at
+                 the "object" level. See those attribute definitions for details.
+            -->
+            <xs:attribute name="default-lazy-init" type="xs:boolean" use="optional" default="false"/>
+            <xs:attribute name="default-dependency-check" use="optional" default="none">
+                <xs:simpleType>
+                    <xs:restriction base="xs:string">
+                        <xs:enumeration value="none"/>
+                        <xs:enumeration value="objects"/>
+                        <xs:enumeration value="simple"/>
+                        <xs:enumeration value="all"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="default-autowire" use="optional" default="no">
+                <xs:simpleType>
+                    <xs:restriction base="xs:string">
+                        <xs:enumeration value="no"/>
+                        <xs:enumeration value="byName"/>
+                        <xs:enumeration value="byType"/>
+                        <xs:enumeration value="constructor"/>
+                        <xs:enumeration value="autodetect"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    
+</xs:schema>
+]]></programlisting>
+</appendix>
diff --git a/doc/reference/styles/fopdf.xsl b/doc/reference/styles/fopdf.xsl
new file mode 100644
index 00000000..bb9020ca
--- /dev/null
+++ b/doc/reference/styles/fopdf.xsl
@@ -0,0 +1,475 @@
+<?xml version="1.0"?>
+
+<!--
+
+    This is the XSL FO (PDF) stylesheet for the Spring reference
+    documentation.
+
+    Thanks are due to Christian Bauer of the Hibernate project
+    team for writing the original stylesheet upon which this one
+    is based.
+-->
+
+<!DOCTYPE xsl:stylesheet [
+    <!ENTITY db_xsl_path        "../lib/docbook-xsl/">
+    <!ENTITY admon_gfx_path     "./images/admons/">
+    <!ENTITY copyright "&#xA9;">
+]>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0"
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                exclude-result-prefixes="#default">
+
+<xsl:import href="&db_xsl_path;/fo/docbook.xsl"/>
+
+<!--###################################################
+                   Custom Title Page
+    ################################################### -->
+
+    <xsl:template name="book.titlepage.recto">
+        <fo:block>
+            <fo:table table-layout="fixed" width="175mm">
+                <fo:table-column column-width="175mm"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell text-align="center">
+                            <fo:block>
+                                <fo:external-graphic src="file:images/logo.png"/>
+                            </fo:block>
+                            <fo:block font-family="Helvetica" font-size="22pt" padding-before="10mm">
+                                <xsl:value-of select="bookinfo/subtitle"/>
+                            </fo:block>
+                            <fo:block font-family="Helvetica" font-size="12pt" padding="10mm">
+                                <xsl:value-of select="bookinfo/releaseinfo"/>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                    <fo:table-row>
+                        <fo:table-cell text-align="center">
+                            <fo:block font-family="Helvetica" font-size="14pt" padding="10mm">
+                                <xsl:value-of select="bookinfo/pubdate"/>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                    <fo:table-row>
+                        <fo:table-cell text-align="center">
+                            <fo:block font-family="Helvetica" font-size="12pt" padding="10mm">
+                                <xsl:text>Copyright &copyright; 2004-2006 </xsl:text>
+                                <xsl:for-each select="bookinfo/authorgroup/author">
+                                    <xsl:if test="position() > 1">
+                                        <xsl:text>, </xsl:text>
+                                    </xsl:if>
+                                    <xsl:value-of select="firstname"/>
+                                    <xsl:text> </xsl:text>
+                                    <xsl:value-of select="surname"/>
+                                </xsl:for-each>
+                            </fo:block>
+                            <fo:block font-family="Helvetica" font-size="10pt" padding="1mm">
+                                <xsl:value-of select="bookinfo/legalnotice"/>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+        </fo:block>
+    </xsl:template>
+
+    <!-- Prevent blank pages in output -->
+    <xsl:template name="book.titlepage.before.verso">
+    </xsl:template>
+    <xsl:template name="book.titlepage.verso">
+    </xsl:template>
+    <xsl:template name="book.titlepage.separator">
+    </xsl:template>
+
+<!--###################################################
+                      Header
+    ################################################### -->
+
+    <!-- More space in the center header for long text -->
+    <xsl:attribute-set name="header.content.properties">
+        <xsl:attribute name="font-family">
+            <xsl:value-of select="$body.font.family"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-left">-5em</xsl:attribute>
+        <xsl:attribute name="margin-right">-5em</xsl:attribute>
+    </xsl:attribute-set>
+
+<!--###################################################
+                      Custom Footer
+    ################################################### -->
+	<xsl:template name="footer.content">
+		<xsl:param name="pageclass" select="''" />
+		<xsl:param name="sequence" select="''" />
+		<xsl:param name="position" select="''" />
+		<xsl:param name="gentext-key" select="''" />
+		<xsl:variable name="Version">
+			<xsl:if test="//releaseinfo">
+				<xsl:text>Spring Framework (</xsl:text><xsl:value-of select="//releaseinfo" /><xsl:text>)</xsl:text>
+			</xsl:if>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$sequence='blank'">
+				<xsl:if test="$position = 'center'">
+					<xsl:value-of select="$Version" />
+				</xsl:if>
+			</xsl:when>
+			<!-- for double sided printing, print page numbers on alternating sides (of the page) -->
+			<xsl:when test="$double.sided != 0">
+				<xsl:choose>
+					<xsl:when test="$sequence = 'even' and $position='left'">
+						<fo:page-number />
+					</xsl:when>
+					<xsl:when test="$sequence = 'odd' and $position='right'">
+						<fo:page-number />
+					</xsl:when>
+					<xsl:when test="$position='center'">
+						<xsl:value-of select="$Version" />
+					</xsl:when>
+				</xsl:choose>
+			</xsl:when>
+			<!-- for single sided printing, print all page numbers on the right (of the page) -->
+			<xsl:when test="$double.sided = 0">
+				<xsl:choose>
+					<xsl:when test="$position='center'">
+						<xsl:value-of select="$Version" />
+					</xsl:when>
+					<xsl:when test="$position='right'">
+						<fo:page-number />
+					</xsl:when>
+				</xsl:choose>
+			</xsl:when>
+		</xsl:choose>
+	</xsl:template>
+
+<!--###################################################
+                   Custom Toc Line
+    ################################################### -->
+
+    <!-- The default DocBook XSL TOC printing is seriously broken... -->
+    <xsl:template name="toc.line">
+        <xsl:variable name="id">
+            <xsl:call-template name="object.id"/>
+        </xsl:variable>
+
+        <xsl:variable name="label">
+            <xsl:apply-templates select="." mode="label.markup"/>
+        </xsl:variable>
+
+        <!-- justify-end removed from block attributes (space problem in title.markup) -->
+        <fo:block  end-indent="{$toc.indent.width}pt"
+                   last-line-end-indent="-{$toc.indent.width}pt"
+                   white-space-treatment="preserve"
+                   text-align="left"
+                   white-space-collapse="false">
+            <fo:inline keep-with-next.within-line="always">
+                <!-- print Chapters in bold style -->
+                <xsl:choose>
+                    <xsl:when test="local-name(.) = 'chapter'">
+                        <xsl:attribute name="font-weight">bold</xsl:attribute>
+                    </xsl:when>
+                </xsl:choose>
+                <fo:basic-link internal-destination="{$id}">
+                    <xsl:if test="$label != ''">
+                        <xsl:copy-of select="$label"/>
+                        <fo:inline white-space-treatment="preserve"
+                                    white-space-collapse="false">
+                            <xsl:value-of select="$autotoc.label.separator"/>
+                        </fo:inline>
+                    </xsl:if>
+                    <xsl:apply-templates select="." mode="title.markup"/>
+                </fo:basic-link>
+            </fo:inline>
+            <fo:inline keep-together.within-line="always">
+            <xsl:text> </xsl:text>
+            <fo:leader leader-pattern="dots"
+                        leader-pattern-width="3pt"
+                        leader-alignment="reference-area"
+                        keep-with-next.within-line="always"/>
+            <xsl:text> </xsl:text>
+            <fo:basic-link internal-destination="{$id}">
+                <fo:page-number-citation ref-id="{$id}"/>
+            </fo:basic-link>
+            </fo:inline>
+        </fo:block>
+    </xsl:template>
+
+<!--###################################################
+                      Extensions
+    ################################################### -->
+
+    <!-- These extensions are required for table printing and other stuff -->
+    <xsl:param name="use.extensions">1</xsl:param>
+    <xsl:param name="tablecolumns.extension">0</xsl:param>
+    <xsl:param name="callout.extensions">1</xsl:param>
+    <!-- FOP provide only PDF Bookmarks at the moment -->
+    <xsl:param name="fop.extensions">1</xsl:param>
+
+<!--###################################################
+                      Table Of Contents
+    ################################################### -->
+
+    <!-- Generate the TOCs for named components only -->
+    <xsl:param name="generate.toc">
+        book   toc
+    </xsl:param>
+
+    <!-- Show only Sections up to level 3 in the TOCs -->
+    <xsl:param name="toc.section.depth">2</xsl:param>
+
+    <!-- Dot and Whitespace as separator in TOC between Label and Title-->
+    <xsl:param name="autotoc.label.separator" select="'.  '"/>
+
+
+<!--###################################################
+                   Paper & Page Size
+    ################################################### -->
+
+    <!-- Paper type, no headers on blank pages, no double sided printing -->
+    <xsl:param name="paper.type" select="'A4'"/>
+    <xsl:param name="double.sided">0</xsl:param>
+    <xsl:param name="headers.on.blank.pages">0</xsl:param>
+    <xsl:param name="footers.on.blank.pages">0</xsl:param>
+
+    <!-- Space between paper border and content (chaotic stuff, don't touch) -->
+    <xsl:param name="page.margin.top">5mm</xsl:param>
+    <xsl:param name="region.before.extent">10mm</xsl:param>
+    <xsl:param name="body.margin.top">10mm</xsl:param>
+
+    <xsl:param name="body.margin.bottom">15mm</xsl:param>
+    <xsl:param name="region.after.extent">10mm</xsl:param>
+    <xsl:param name="page.margin.bottom">0mm</xsl:param>
+
+    <xsl:param name="page.margin.outer">18mm</xsl:param>
+    <xsl:param name="page.margin.inner">18mm</xsl:param>
+
+    <!-- No intendation of Titles -->
+    <xsl:param name="title.margin.left">0pc</xsl:param>
+
+<!--###################################################
+                   Fonts & Styles
+    ################################################### -->
+
+    <!-- Left aligned text and no hyphenation -->
+    <xsl:param name="alignment">justify</xsl:param>
+    <xsl:param name="hyphenate">false</xsl:param>
+
+    <!-- Default Font size -->
+    <xsl:param name="body.font.master">11</xsl:param>
+    <xsl:param name="body.font.small">8</xsl:param>
+
+    <!-- Line height in body text -->
+    <xsl:param name="line-height">1.4</xsl:param>
+
+    <!-- Monospaced fonts are smaller than regular text -->
+    <xsl:attribute-set name="monospace.properties">
+        <xsl:attribute name="font-family">
+            <xsl:value-of select="$monospace.font.family"/>
+        </xsl:attribute>
+        <xsl:attribute name="font-size">0.8em</xsl:attribute>
+    </xsl:attribute-set>
+
+<!--###################################################
+                   Tables
+    ################################################### -->
+
+    <!-- The table width should be adapted to the paper size -->
+    <xsl:param name="default.table.width">17.4cm</xsl:param>
+
+    <!-- Some padding inside tables -->
+    <xsl:attribute-set name="table.cell.padding">
+        <xsl:attribute name="padding-left">4pt</xsl:attribute>
+        <xsl:attribute name="padding-right">4pt</xsl:attribute>
+        <xsl:attribute name="padding-top">4pt</xsl:attribute>
+        <xsl:attribute name="padding-bottom">4pt</xsl:attribute>
+    </xsl:attribute-set>
+
+    <!-- Only hairlines as frame and cell borders in tables -->
+    <xsl:param name="table.frame.border.thickness">0.1pt</xsl:param>
+    <xsl:param name="table.cell.border.thickness">0.1pt</xsl:param>
+
+<!--###################################################
+                         Labels
+    ################################################### -->
+
+    <!-- Label Chapters and Sections (numbering) -->
+    <xsl:param name="chapter.autolabel">1</xsl:param>
+    <xsl:param name="section.autolabel" select="1"/>
+    <xsl:param name="section.label.includes.component.label" select="1"/>
+
+<!--###################################################
+                         Titles
+    ################################################### -->
+
+    <!-- Chapter title size -->
+    <xsl:attribute-set name="chapter.titlepage.recto.style">
+        <xsl:attribute name="text-align">left</xsl:attribute>
+        <xsl:attribute name="font-weight">bold</xsl:attribute>
+        <xsl:attribute name="font-size">
+            <xsl:value-of select="$body.font.master * 1.8"/>
+            <xsl:text>pt</xsl:text>
+        </xsl:attribute>
+    </xsl:attribute-set>
+
+    <!-- Why is the font-size for chapters hardcoded in the XSL FO templates?
+        Let's remove it, so this sucker can use our attribute-set only... -->
+    <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
+        <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                  xsl:use-attribute-sets="chapter.titlepage.recto.style">
+            <xsl:call-template name="component.title">
+                <xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/>
+            </xsl:call-template>
+            </fo:block>
+    </xsl:template>
+
+    <!-- Sections 1, 2 and 3 titles have a small bump factor and padding -->
+    <xsl:attribute-set name="section.title.level1.properties">
+        <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
+        <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
+        <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
+        <xsl:attribute name="font-size">
+            <xsl:value-of select="$body.font.master * 1.5"/>
+            <xsl:text>pt</xsl:text>
+        </xsl:attribute>
+        <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+    </xsl:attribute-set>
+    <xsl:attribute-set name="section.title.level2.properties">
+        <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
+        <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
+        <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
+        <xsl:attribute name="font-size">
+            <xsl:value-of select="$body.font.master * 1.25"/>
+            <xsl:text>pt</xsl:text>
+        </xsl:attribute>
+        <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+    </xsl:attribute-set>
+    <xsl:attribute-set name="section.title.level3.properties">
+        <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
+        <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
+        <xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
+        <xsl:attribute name="font-size">
+            <xsl:value-of select="$body.font.master * 1.0"/>
+            <xsl:text>pt</xsl:text>
+        </xsl:attribute>
+        <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+    </xsl:attribute-set>
+
+    <!-- Titles of formal objects (tables, examples, ...) -->
+    <xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing">
+        <xsl:attribute name="font-weight">bold</xsl:attribute>
+        <xsl:attribute name="font-size">
+            <xsl:value-of select="$body.font.master"/>
+            <xsl:text>pt</xsl:text>
+        </xsl:attribute>
+        <xsl:attribute name="hyphenate">false</xsl:attribute>
+        <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
+        <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
+        <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
+    </xsl:attribute-set>
+
+<!--###################################################
+                      Programlistings
+    ################################################### -->
+
+    <!-- Verbatim text formatting (programlistings) -->
+    <xsl:attribute-set name="monospace.verbatim.properties">
+        <xsl:attribute name="font-size">
+            <xsl:value-of select="$body.font.small * 1.0"/>
+            <xsl:text>pt</xsl:text>
+        </xsl:attribute>
+    </xsl:attribute-set>
+
+    <xsl:attribute-set name="verbatim.properties">
+        <xsl:attribute name="space-before.minimum">1em</xsl:attribute>
+        <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+        <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
+        <xsl:attribute name="border-color">#444444</xsl:attribute>
+        <xsl:attribute name="border-style">solid</xsl:attribute>
+        <xsl:attribute name="border-width">0.1pt</xsl:attribute>
+        <xsl:attribute name="padding-top">0.5em</xsl:attribute>
+        <xsl:attribute name="padding-left">0.5em</xsl:attribute>
+        <xsl:attribute name="padding-right">0.5em</xsl:attribute>
+        <xsl:attribute name="padding-bottom">0.5em</xsl:attribute>
+        <xsl:attribute name="margin-left">0.5em</xsl:attribute>
+        <xsl:attribute name="margin-right">0.5em</xsl:attribute>
+    </xsl:attribute-set>
+
+    <!-- Shade (background) programlistings -->
+    <xsl:param name="shade.verbatim">1</xsl:param>
+    <xsl:attribute-set name="shade.verbatim.style">
+        <xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
+    </xsl:attribute-set>
+
+<!--###################################################
+                         Callouts
+    ################################################### -->
+
+    <!-- Use images for callouts instead of (1) (2) (3) -->
+    <xsl:param name="callout.graphics">0</xsl:param>
+    <xsl:param name="callout.unicode">1</xsl:param>
+
+    <!-- Place callout marks at this column in annotated areas -->
+    <xsl:param name="callout.defaultcolumn">90</xsl:param>
+
+<!--###################################################
+                       Admonitions
+    ################################################### -->
+
+    <!-- Use nice graphics for admonitions -->
+    <xsl:param name="admon.graphics">'1'</xsl:param>
+    <xsl:param name="admon.graphics.path">&admon_gfx_path;</xsl:param>
+
+<!--###################################################
+                          Misc
+    ################################################### -->
+
+    <!-- Placement of titles -->
+    <xsl:param name="formal.title.placement">
+        figure after
+        example before
+        equation before
+        table before
+        procedure before
+    </xsl:param>
+
+    <!-- Format Variable Lists as Blocks (prevents horizontal overflow) -->
+    <xsl:param name="variablelist.as.blocks">1</xsl:param>
+
+    <!-- The horrible list spacing problems -->
+    <xsl:attribute-set name="list.block.spacing">
+        <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
+        <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
+        <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
+        <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+        <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+    </xsl:attribute-set>
+
+<!--###################################################
+              colored and hyphenated links
+    ################################################### -->
+	<xsl:template match="ulink">
+	<fo:basic-link external-destination="{@url}"
+			xsl:use-attribute-sets="xref.properties"
+			text-decoration="underline"
+			color="blue">
+			<xsl:choose>
+			<xsl:when test="count(child::node())=0">
+			<xsl:value-of select="@url"/>
+			</xsl:when>
+			<xsl:otherwise>
+			<xsl:apply-templates/>
+			</xsl:otherwise>
+			</xsl:choose>
+			</fo:basic-link>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/doc/reference/styles/html.css b/doc/reference/styles/html.css
new file mode 100644
index 00000000..c9ccb50b
--- /dev/null
+++ b/doc/reference/styles/html.css
@@ -0,0 +1,277 @@
+body {
+   text-align: justify;
+   margin-right: 2em;
+   margin-left: 2em;
+}
+
+a,
+a[accesskey^="h"],
+a[accesskey^="n"],
+a[accesskey^="u"],
+a[accesskey^="p"] {
+    font-family: Verdana, Arial, helvetica, sans-serif;
+    font-size: 12px;
+	color: #003399;
+}
+
+a:active {
+    color: #003399;
+}
+
+a:visited {
+    color: #888888;
+}
+
+p {
+	font-family: Verdana, Arial;
+}
+
+dt {
+	font-family: Verdana, Arial;
+	font-size: 12px;
+}
+
+p, dl, dt, dd, blockquote {
+    color: #000000;
+    margin-bottom: 3px;
+    margin-top: 3px;
+    padding-top: 0px;
+}
+
+ol, ul, p {
+    margin-top: 6px;
+    margin-bottom: 6px;
+}
+
+p, blockquote {
+    font-size: 90%;
+}
+
+p.releaseinfo {
+    font-size: 100%;
+    font-weight: bold;
+    font-family: Verdana, Arial, helvetica, sans-serif;
+    padding-top: 10px;
+}
+
+p.pubdate {
+    font-size: 120%;
+    font-weight: bold; 
+    font-family: Verdana, Arial, helvetica, sans-serif;
+}
+
+td {
+    font-size: 80%;
+}
+
+td, th, span {
+    color: #000000;
+}
+
+td[width^="40%"] {
+    font-family: Verdana, Arial, helvetica, sans-serif;
+    font-size: 12px;
+	color: #003399;
+}
+
+table[summary^="Navigation header"] tbody tr th[colspan^="3"] {
+    font-family: Verdana, Arial, helvetica, sans-serif;
+}
+
+blockquote {
+    margin-right: 0px;
+}
+
+h1, h2, h3, h4, h6, H6    {
+    color: #000000;
+    font-weight: 500;
+    margin-top: 0px;
+    padding-top: 14px;
+    font-family: Verdana, Arial, helvetica, sans-serif;
+    margin-bottom: 0px;
+}
+
+h2.title {
+    font-weight: 800;
+    margin-bottom: 8px;
+}
+
+h2.subtitle {
+    font-weight: 800;
+    margin-bottom: 20px;
+}
+
+.firstname, .surname {
+	font-size: 12px;
+    font-family: Verdana, Arial, helvetica, sans-serif;
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    border: 1px black;
+    empty-cells: hide;
+    margin: 10px 0px 30px 50px;
+    width: 90%;
+}
+
+div.table {
+	margin: 30px 0px 30px 0px;
+	border: 1px dashed gray;
+	padding: 10px;
+}
+
+div.table > p.title {
+	padding-left: 10px;
+}
+
+table[summary^="Navigation footer"] {
+    border-collapse: collapse;
+    border-spacing: 0;
+    border: 1px black;
+    empty-cells: hide;    
+    margin: 0px;
+    width: 100%;
+}
+
+table[summary^="Note"], table[summary^="Warning"], table[summary^="Tip"] {
+    border-collapse: collapse;
+    border-spacing: 0;
+    border: 1px black;
+    empty-cells: hide;    
+    margin: 10px 0px 10px -20px;
+    width: 100%;
+}
+
+td {
+    padding: 4pt;
+    font-family: Verdana, Arial, helvetica, sans-serif;
+}
+
+div.warning TD {
+	text-align: justify;
+}
+
+h1 { 
+    font-size: 150%; 
+}
+
+h2 { 
+    font-size: 110%; 
+}
+
+h3 {
+    font-size: 100%; font-weight: bold; 
+}
+
+h4 { 
+    font-size: 90%; font-weight: bold;
+}
+
+h5 {
+    font-size: 90%; font-style: italic; 
+}
+
+h6 { 
+    font-size: 100%; font-style: italic; 
+}
+
+tt {
+    font-size: 110%;
+    font-family: "Courier New", Courier, monospace;
+    color: #000000;
+}
+
+.navheader, .navfooter {
+	border: none;
+}
+
+div.navfooter table {
+	border: dashed gray;
+	border-width: 1px 1px 1px 1px;
+	background-color: #cde48d;
+}
+
+pre {
+    font-size: 110%;
+    padding: 5px;
+    border-style: solid;
+    border-width: 1px;
+    border-color: #CCCCCC;
+    background-color: #F4F4F4;
+}
+
+ul, ol, li {
+    list-style: disc;
+}
+
+hr {
+    width: 100%;
+    height: 1px;
+    background-color: #CCCCCC;
+    border-width: 0px;
+    padding: 0px;
+}
+
+.variablelist { 
+    padding-top: 10px; 
+    padding-bottom: 10px; 
+    margin: 0;
+}
+
+.term { 
+    font-weight:bold;
+}
+
+.mediaobject {
+    padding-top: 30px; 
+    padding-bottom: 30px; 
+}
+
+.legalnotice {
+    font-family: Verdana, Arial, helvetica, sans-serif;
+    font-size: 12px;
+    font-style: italic;
+}
+
+.sidebar {
+    float: right;
+    margin: 10px 0px 10px 30px;
+    padding: 10px 20px 20px 20px;
+    width: 33%;
+    border: 1px solid black;
+    background-color: #F4F4F4;
+    font-size: 14px;
+}
+
+.property {
+	font-family: "Courier New", Courier, monospace;
+}
+
+a code {
+	font-family: Verdana, Arial;
+	font-size: 12px;
+}
+
+td code {
+    font-size: 110%;
+}
+
+div.note * td,
+div.tip * td,
+div.warning * td {
+	text-align: justify;
+	font-size: 100%;
+}
+
+.programlisting .interfacename,
+.programlisting .literal,
+.programlisting .classname {
+    font-size: 95%;
+}
+
+/* everything in a <lineannotation/> is displayed in a nice green, comment-like color */
+.programlisting * .lineannotation,
+.programlisting * .lineannotation * {
+	color: green;
+}
diff --git a/doc/reference/styles/html.xsl b/doc/reference/styles/html.xsl
new file mode 100644
index 00000000..7bcd1582
--- /dev/null
+++ b/doc/reference/styles/html.xsl
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<!--
+    This is the XSL HTML configuration file for the Spring
+    Reference Documentation.
+-->
+<!DOCTYPE xsl:stylesheet [
+    <!ENTITY db_xsl_path        "../lib/docbook-xsl/">
+    <!ENTITY callout_gfx_path   "./images/callouts/">
+    <!ENTITY admon_gfx_path     "./images/admons/">
+]>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0"
+                xmlns="http://www.w3.org/TR/xhtml1/transitional"
+                exclude-result-prefixes="#default">
+
+<xsl:import href="&db_xsl_path;/html/docbook.xsl"/>
+
+<!--###################################################
+                     HTML Settings
+    ################################################### -->
+
+    <xsl:param name="html.stylesheet">../styles/html.css</xsl:param>
+
+    <!-- These extensions are required for table printing and other stuff -->
+    <xsl:param name="use.extensions">1</xsl:param>
+    <xsl:param name="tablecolumns.extension">0</xsl:param>
+    <xsl:param name="callout.extensions">1</xsl:param>
+    <xsl:param name="graphicsize.extension">0</xsl:param>
+
+<!--###################################################
+                      Table Of Contents
+    ################################################### -->
+
+    <!-- Generate the TOCs for named components only -->
+    <xsl:param name="generate.toc">
+        book   toc
+    </xsl:param>
+
+    <!-- Show only Sections up to level 3 in the TOCs -->
+    <xsl:param name="toc.section.depth">3</xsl:param>
+
+<!--###################################################
+                         Labels
+    ################################################### -->
+
+    <!-- Label Chapters and Sections (numbering) -->
+    <xsl:param name="chapter.autolabel">1</xsl:param>
+    <xsl:param name="section.autolabel" select="1"/>
+    <xsl:param name="section.label.includes.component.label" select="1"/>
+
+<!--###################################################
+                         Callouts
+    ################################################### -->
+
+    <!-- Use images for callouts instead of (1) (2) (3) -->
+    <xsl:param name="callout.graphics">1</xsl:param>
+    <xsl:param name="callout.graphics.path">&callout_gfx_path;</xsl:param>
+
+    <!-- Place callout marks at this column in annotated areas -->
+    <xsl:param name="callout.defaultcolumn">90</xsl:param>
+
+<!--###################################################
+                       Admonitions
+    ################################################### -->
+
+    <!-- Use nice graphics for admonitions -->
+    <xsl:param name="admon.graphics">'1'</xsl:param>
+    <xsl:param name="admon.graphics.path">&admon_gfx_path;</xsl:param>
+
+	<!--###################################################
+                          Misc
+    ################################################### -->
+	<!-- Placement of titles -->
+	<xsl:param name="formal.title.placement">
+        figure after
+        example before
+        equation before
+        table before
+        procedure before
+    </xsl:param>
+	<xsl:template match="author" mode="titlepage.mode">
+		<xsl:if test="name(preceding-sibling::*[1]) = 'author'">
+			<xsl:text>, </xsl:text>
+		</xsl:if>
+		<span class="{name(.)}">
+			<xsl:call-template name="person.name" />
+			<xsl:apply-templates mode="titlepage.mode" select="./contrib" />
+			<xsl:apply-templates mode="titlepage.mode" select="./affiliation" />
+		</span>
+	</xsl:template>
+	<xsl:template match="authorgroup" mode="titlepage.mode">
+		<div class="{name(.)}">
+			<h2>Authors</h2>
+			<p/>
+			<xsl:apply-templates mode="titlepage.mode" />
+		</div>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/doc/reference/styles/html_chunk.xsl b/doc/reference/styles/html_chunk.xsl
new file mode 100644
index 00000000..7a978158
--- /dev/null
+++ b/doc/reference/styles/html_chunk.xsl
@@ -0,0 +1,217 @@
+<?xml version="1.0" ?>
+<!--
+    This is the XSL HTML configuration file for the Spring Reference Documentation.
+-->
+<!DOCTYPE xsl:stylesheet [
+    <!ENTITY db_xsl_path        "../lib/docbook-xsl/">
+    <!ENTITY callout_gfx_path   "./images/callouts/">
+    <!ENTITY admon_gfx_path     "./images/admons/">
+]>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns="http://www.w3.org/TR/xhtml1/transitional"
+    exclude-result-prefixes="#default">
+    <xsl:import href="&db_xsl_path;/html/chunk.xsl" />
+    <!--###################################################
+                     HTML Settings
+    ################################################### -->
+    <xsl:param name="chunk.section.depth">'5'</xsl:param>
+    <xsl:param name="use.id.as.filename">'1'</xsl:param>
+    <xsl:param name="html.stylesheet">../styles/html.css</xsl:param>
+    <!-- These extensions are required for table printing and other stuff -->
+    <xsl:param name="use.extensions">1</xsl:param>
+    <xsl:param name="tablecolumns.extension">0</xsl:param>
+    <xsl:param name="callout.extensions">1</xsl:param>
+    <xsl:param name="graphicsize.extension">0</xsl:param>
+    <!--###################################################
+                      Table Of Contents
+    ################################################### -->
+    <!-- Generate the TOCs for named components only -->
+    <xsl:param name="generate.toc">
+        book   toc
+    </xsl:param>
+    <!-- Show only Sections up to level 3 in the TOCs -->
+    <xsl:param name="toc.section.depth">3</xsl:param>
+    <!--###################################################
+                         Labels
+    ################################################### -->
+    <!-- Label Chapters and Sections (numbering) -->
+    <xsl:param name="chapter.autolabel">1</xsl:param>
+    <xsl:param name="section.autolabel" select="1" />
+    <xsl:param name="section.label.includes.component.label" select="1" />
+    <!--###################################################
+                         Callouts
+    ################################################### -->
+    <!-- Use images for callouts instead of (1) (2) (3) -->
+    <xsl:param name="callout.graphics">1</xsl:param>
+    <xsl:param name="callout.graphics.path">&callout_gfx_path;</xsl:param>
+    <!-- Place callout marks at this column in annotated areas -->
+    <xsl:param name="callout.defaultcolumn">90</xsl:param>
+    <!--###################################################
+                       Admonitions
+    ################################################### -->
+    <!-- Use nice graphics for admonitions -->
+    <xsl:param name="admon.graphics">'1'</xsl:param>
+    <xsl:param name="admon.graphics.path">&admon_gfx_path;</xsl:param>
+    <!--###################################################
+                          Misc
+    ################################################### -->
+    <!-- Placement of titles -->
+    <xsl:param name="formal.title.placement">
+        figure after
+        example before
+        equation before
+        table before
+        procedure before
+    </xsl:param>
+    <xsl:template match="author" mode="titlepage.mode">
+        <xsl:if test="name(preceding-sibling::*[1]) = 'author'">
+            <xsl:text>, </xsl:text>
+        </xsl:if>
+        <span class="{name(.)}">
+            <xsl:call-template name="person.name" />
+            <xsl:apply-templates mode="titlepage.mode" select="./contrib" />
+            <xsl:apply-templates mode="titlepage.mode" select="./affiliation" />
+        </span>
+    </xsl:template>
+    <xsl:template match="authorgroup" mode="titlepage.mode">
+        <div class="{name(.)}">
+            <h2>Authors</h2>
+            <p />
+            <xsl:apply-templates mode="titlepage.mode" />
+        </div>
+    </xsl:template>
+    <!--###################################################
+                     Headers and Footers
+    ################################################### -->
+    <!-- let's have a Spring and I21 banner across the top of each page -->
+    <xsl:template name="user.header.navigation">
+        <div style="background-color:white;border:none;height:73px;border:1px solid black;">
+            <a style="border:none;" href="http://www.springframework.net/" title="The Spring Framework">
+                <img style="border:none;" src="images/xdev-spring_logo.jpg" />
+            </a>
+            <a style="border:none;" href="http://www.springsource.com/" title="SpringSource">
+                <img style="border:none;position:absolute;padding-top:5px;right:42px;" src="images/S2-banner-rhs.png" />
+            </a>
+        </div>
+    </xsl:template>
+    <!-- no other header navigation (prev, next, etc.) -->
+    <xsl:template name="header.navigation" />
+    <xsl:param name="navig.showtitles">1</xsl:param>
+    <!-- let's have a 'Sponsored by Interface21' strapline (or somesuch) across the bottom of each page -->
+    <xsl:template name="footer.navigation">
+        <xsl:param name="prev" select="/foo" />
+        <xsl:param name="next" select="/foo" />
+        <xsl:param name="nav.context" />
+        <xsl:variable name="home" select="/*[1]" />
+        <xsl:variable name="up" select="parent::*" />
+        <xsl:variable name="row1" select="count($prev) &gt; 0
+                                        or count($up) &gt; 0
+                                        or count($next) &gt; 0" />
+        <xsl:variable name="row2" select="($prev and $navig.showtitles != 0)
+                                        or (generate-id($home) != generate-id(.)
+                                            or $nav.context = 'toc')
+                                        or ($chunk.tocs.and.lots != 0
+                                            and $nav.context != 'toc')
+                                        or ($next and $navig.showtitles != 0)" />
+        <xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'">
+            <div class="navfooter">
+                <xsl:if test="$footer.rule != 0">
+                    <hr />
+                </xsl:if>
+                <xsl:if test="$row1 or $row2">
+                    <table width="100%" summary="Navigation footer">
+                        <xsl:if test="$row1">
+                            <tr>
+                                <td width="40%" align="left">
+                                    <xsl:if test="count($prev)>0">
+                                        <a accesskey="p">
+                                            <xsl:attribute name="href">
+                                                <xsl:call-template name="href.target">
+                                                    <xsl:with-param name="object" select="$prev" />
+                                                </xsl:call-template>
+                                            </xsl:attribute>
+                                            <xsl:call-template name="navig.content">
+                                                <xsl:with-param name="direction" select="'prev'" />
+                                            </xsl:call-template>
+                                        </a>
+                                    </xsl:if>
+                                    <xsl:text>&#160;</xsl:text>
+                                </td>
+
+                                <td width="20%" align="center">
+                                    <xsl:choose>
+                                        <xsl:when test="$home != . or $nav.context = 'toc'">
+                                            <a accesskey="h">
+                                                <xsl:attribute name="href">
+                                                    <xsl:call-template name="href.target">
+                                                        <xsl:with-param name="object" select="$home" />
+                                                    </xsl:call-template>
+                                                </xsl:attribute>
+                                                <xsl:call-template name="navig.content">
+                                                    <xsl:with-param name="direction" select="'home'" />
+                                                </xsl:call-template>
+                                            </a>
+                                            <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
+                                                <xsl:text>&#160;|&#160;</xsl:text>
+                                            </xsl:if>
+                                        </xsl:when>
+                                        <xsl:otherwise>&#160;</xsl:otherwise>
+                                    </xsl:choose>
+                                    <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
+                                        <a accesskey="t">
+                                            <xsl:attribute name="href">
+                                                <xsl:apply-templates select="/*[1]" mode="recursive-chunk-filename">
+                                                    <xsl:with-param name="recursive" select="true()" />
+                                                </xsl:apply-templates>
+                                                <xsl:text>-toc</xsl:text>
+                                                <xsl:value-of select="$html.ext" />
+                                            </xsl:attribute>
+                                            <xsl:call-template name="gentext">
+                                                <xsl:with-param name="key" select="'nav-toc'" />
+                                            </xsl:call-template>
+                                        </a>
+                                    </xsl:if>
+                                </td>
+                                <td width="40%" align="right">
+                                    <xsl:text>&#160;</xsl:text>
+                                    <xsl:if test="count($next)>0">
+                                        <a accesskey="n">
+                                            <xsl:attribute name="href">
+                                                <xsl:call-template name="href.target">
+                                                    <xsl:with-param name="object" select="$next" />
+                                                </xsl:call-template>
+                                            </xsl:attribute>
+                                            <xsl:call-template name="navig.content">
+                                                <xsl:with-param name="direction" select="'next'" />
+                                            </xsl:call-template>
+                                        </a>
+                                    </xsl:if>
+                                </td>
+                            </tr>
+                        </xsl:if>
+                        <xsl:if test="$row2">
+                            <tr>
+                                <td width="40%" align="left" valign="top">
+                                    <xsl:if test="$navig.showtitles != 0">
+                                        <xsl:apply-templates select="$prev" mode="object.title.markup" />
+                                    </xsl:if>
+                                    <xsl:text>&#160;</xsl:text>
+                                </td>
+                                <td width="20%" align="center">
+                                    <span style="color:white;font-size:90%;">
+                                        <a href="http://www.interface21.com/" title="Interface21 - Spring from the Source">Sponsored by Interface21</a>
+                                    </span>
+                                </td>
+                                <td width="40%" align="right" valign="top">
+                                    <xsl:text>&#160;</xsl:text>
+                                    <xsl:if test="$navig.showtitles != 0">
+                                        <xsl:apply-templates select="$next" mode="object.title.markup" />
+                                    </xsl:if>
+                                </td>
+                            </tr>
+                        </xsl:if>
+                    </table>
+                </xsl:if>
+            </div>
+        </xsl:if>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/doc/reference/styles/htmlhelp-common.xsl b/doc/reference/styles/htmlhelp-common.xsl
new file mode 100644
index 00000000..9f8fd0ff
--- /dev/null
+++ b/doc/reference/styles/htmlhelp-common.xsl
@@ -0,0 +1,1230 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+                xmlns:exsl="http://exslt.org/common"
+                xmlns:set="http://exslt.org/sets"
+                xmlns:h="urn:x-hex"
+		version="1.0"
+                exclude-result-prefixes="doc exsl set h">
+
+<!-- ********************************************************************
+     $Id: htmlhelp-common.xsl,v 1.1 2005/08/28 03:49:20 markpollack Exp $
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+<!-- Customizations of standard HTML stylesheet parameters -->
+
+<xsl:param name="suppress.navigation" select="1"/>
+
+<!-- ==================================================================== -->
+
+<xsl:variable name="htmlhelp.generate.index" select="//indexterm[1]"/>
+
+<xsl:variable name="raw.help.title">
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.title = ''">
+      <xsl:choose>
+        <xsl:when test="$rootid != ''">
+          <xsl:apply-templates select="key('id',$rootid)" mode="title.markup"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="/*" mode="title.markup"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$htmlhelp.title"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:variable>
+
+<xsl:variable name="help.title" select="normalize-space($raw.help.title)"/>
+  
+<!-- ==================================================================== -->
+
+<xsl:template match="/">
+  <xsl:if test="$htmlhelp.only != 1">
+    <xsl:choose>
+      <xsl:when test="$rootid != ''">
+        <xsl:choose>
+          <xsl:when test="count(key('id',$rootid)) = 0">
+            <xsl:message terminate="yes">
+              <xsl:text>ID '</xsl:text>
+              <xsl:value-of select="$rootid"/>
+              <xsl:text>' not found in document.</xsl:text>
+            </xsl:message>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:message>Formatting from <xsl:value-of select="$rootid"/></xsl:message>
+            <xsl:apply-templates select="key('id',$rootid)" mode="process.root"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="/" mode="process.root"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:if>
+
+  <xsl:call-template name="hhp"/>
+  <xsl:call-template name="hhc"/>
+  <xsl:if test="($rootid = '' and //processing-instruction('dbhh')) or
+                ($rootid != '' and key('id',$rootid)//processing-instruction('dbhh'))">
+    <xsl:call-template name="hh-map"/>
+    <xsl:call-template name="hh-alias"/>
+  </xsl:if>
+  <xsl:if test="$htmlhelp.generate.index">
+    <xsl:call-template name="hhk"/>
+  </xsl:if>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template name="hhp">
+  <xsl:call-template name="write.text.chunk">
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.hhp"/>
+    </xsl:with-param>
+    <xsl:with-param name="method" select="'text'"/>
+    <xsl:with-param name="content">
+      <xsl:call-template name="hhp-main"/>
+    </xsl:with-param>
+    <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- ==================================================================== -->
+<xsl:template name="hhp-main">
+<xsl:variable name="default.topic">
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.default.topic != ''">
+      <xsl:value-of select="$htmlhelp.default.topic"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name="make-relative-filename">
+        <xsl:with-param name="base.dir">
+          <xsl:if test="$manifest.in.base.dir = 0">
+            <xsl:value-of select="$base.dir"/>
+          </xsl:if>
+        </xsl:with-param>
+        <xsl:with-param name="base.name">
+          <xsl:choose>
+            <xsl:when test="$rootid != ''">
+              <xsl:apply-templates select="key('id',$rootid)" mode="chunk-filename"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:apply-templates select="/" mode="chunk-filename"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:with-param>
+      </xsl:call-template>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:variable>
+<xsl:variable name="xnavigation">
+  <xsl:text>0x</xsl:text>
+  <xsl:call-template name="toHex">
+    <xsl:with-param name="n" select="9504 + $htmlhelp.show.menu * 65536
+                                          + $htmlhelp.show.advanced.search * 131072
+                                          + $htmlhelp.show.favorities * 4096
+                                          + (1 - $htmlhelp.show.toolbar.text) * 64
+                                          + $htmlhelp.remember.window.position * 262144"/>
+  </xsl:call-template>
+</xsl:variable>
+<xsl:variable name="xbuttons">
+  <xsl:text>0x</xsl:text>
+  <xsl:call-template name="toHex">
+    <xsl:with-param name="n" select="0 + $htmlhelp.button.hideshow * 2
+                                       + $htmlhelp.button.back * 4
+                                       + $htmlhelp.button.forward * 8
+                                       + $htmlhelp.button.stop * 16
+                                       + $htmlhelp.button.refresh * 32
+                                       + $htmlhelp.button.home * 64
+                                       + $htmlhelp.button.options * 4096
+                                       + $htmlhelp.button.print * 8192
+                                       + $htmlhelp.button.locate * 2048
+                                       + $htmlhelp.button.jump1 * 262144
+                                       + $htmlhelp.button.jump2 * 524288
+                                       + $htmlhelp.button.next * 2097152
+                                       + $htmlhelp.button.prev * 4194304
+                                       + $htmlhelp.button.zoom * 1048576"/>
+  </xsl:call-template>
+</xsl:variable>
+<xsl:text>[OPTIONS]
+</xsl:text>
+<xsl:if test="$htmlhelp.generate.index">
+<xsl:text>Auto Index=Yes
+</xsl:text></xsl:if>
+<xsl:if test="$htmlhelp.hhc.binary != 0">
+<xsl:text>Binary TOC=Yes
+</xsl:text></xsl:if>
+<xsl:text>Compatibility=1.1 or later
+Compiled file=</xsl:text><xsl:value-of select="$htmlhelp.chm"/><xsl:text>
+Contents file=</xsl:text><xsl:value-of select="$htmlhelp.hhc"/><xsl:text>
+</xsl:text>
+<xsl:if test="$htmlhelp.hhp.window != ''">
+<xsl:text>Default Window=</xsl:text><xsl:value-of select="$htmlhelp.hhp.window"/><xsl:text>
+</xsl:text></xsl:if>
+<xsl:text>Default topic=</xsl:text><xsl:value-of select="$default.topic"/>
+<xsl:text>
+Display compile progress=</xsl:text>
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.display.progress != 1">
+      <xsl:text>No</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>Yes</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+<xsl:text>
+Full-text search=Yes
+</xsl:text>
+<xsl:if test="$htmlhelp.generate.index">
+<xsl:text>Index file=</xsl:text><xsl:value-of select="$htmlhelp.hhk"/><xsl:text>
+</xsl:text></xsl:if>
+<xsl:text>Language=</xsl:text>
+<xsl:for-each select="*">   <!-- Change context from / to root element -->
+  <xsl:call-template name="gentext.template">
+    <xsl:with-param name="context" select="'htmlhelp'"/>
+    <xsl:with-param name="name" select="'langcode'"/>
+  </xsl:call-template>
+</xsl:for-each>
+<xsl:text>
+Title=</xsl:text>
+  <xsl:value-of select="$help.title"/>
+<xsl:text>
+Enhanced decompilation=</xsl:text>
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.enhanced.decompilation != 0">
+      <xsl:text>Yes</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>No</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+
+<xsl:if test="$htmlhelp.hhp.window != ''">
+  <xsl:text>
+
+[WINDOWS]
+</xsl:text>
+<xsl:value-of select="$htmlhelp.hhp.window"/>
+<xsl:text>="</xsl:text>
+<xsl:value-of select="$help.title"/>
+<xsl:text>","</xsl:text><xsl:value-of select="$htmlhelp.hhc"/>
+<xsl:text>",</xsl:text>
+<xsl:if test="$htmlhelp.generate.index">
+  <xsl:text>"</xsl:text>
+  <xsl:value-of select="$htmlhelp.hhk"/>
+  <xsl:text>"</xsl:text>
+</xsl:if>
+<xsl:text>,"</xsl:text>
+<xsl:value-of select="$default.topic"/>
+<xsl:text>",</xsl:text>
+<xsl:text>"</xsl:text>
+<xsl:choose>
+  <xsl:when test="$htmlhelp.button.home != 0">
+    <xsl:value-of select="$htmlhelp.button.home.url"/>
+  </xsl:when>
+  <xsl:otherwise>
+    <xsl:value-of select="$default.topic"/>
+  </xsl:otherwise>
+</xsl:choose>
+<xsl:text>"</xsl:text>
+<xsl:text>,</xsl:text>
+<xsl:if test="$htmlhelp.button.jump1 != 0">
+  <xsl:text>"</xsl:text>
+  <xsl:value-of select="$htmlhelp.button.jump1.url"/>
+  <xsl:text>"</xsl:text>
+</xsl:if>
+<xsl:text>,</xsl:text>
+<xsl:if test="$htmlhelp.button.jump1 != 0">
+  <xsl:text>"</xsl:text>
+  <xsl:value-of select="$htmlhelp.button.jump1.title"/>
+  <xsl:text>"</xsl:text>
+</xsl:if>
+<xsl:text>,</xsl:text>
+<xsl:if test="$htmlhelp.button.jump2 != 0">
+  <xsl:text>"</xsl:text>
+  <xsl:value-of select="$htmlhelp.button.jump2.url"/>
+  <xsl:text>"</xsl:text>
+</xsl:if>
+<xsl:text>,</xsl:text>
+<xsl:if test="$htmlhelp.button.jump2 != 0">
+  <xsl:text>"</xsl:text>
+  <xsl:value-of select="$htmlhelp.button.jump2.title"/>
+  <xsl:text>"</xsl:text>
+</xsl:if>
+<xsl:text>,</xsl:text>
+<xsl:value-of select="$xnavigation"/>
+<xsl:text>,</xsl:text><xsl:value-of select="$htmlhelp.hhc.width"/><xsl:text>,</xsl:text>
+<xsl:value-of select="$xbuttons"/>
+<xsl:text>,</xsl:text><xsl:value-of select="$htmlhelp.window.geometry"/><xsl:text>,,,,,,,0
+</xsl:text>
+</xsl:if>
+
+<!-- 
+  Needs more investigation to generate propetly all fields 
+<xsl:text>search="</xsl:text>
+<xsl:value-of select="normalize-space(//title[1])"/>
+<xsl:text>","toc.hhc","index.hhk","</xsl:text>
+<xsl:value-of select="$root.filename"/>
+<xsl:text>.html","</xsl:text>
+<xsl:value-of select="$root.filename"/>
+<xsl:text>.html",,,,,</xsl:text>
+<xsl:value-of select="$xnavigation"/>
+<xsl:text>,</xsl:text>
+<xsl:value-of select="$htmlhelp.hhc.width"/>
+<xsl:text>,</xsl:text>
+<xsl:value-of select="$xbuttons"/>
+<xsl:text>,</xsl:text>
+<xsl:value-of select="$htmlhelp.window.geometry"/>
+<xsl:text>,,,,,2,,0
+</xsl:text>
+-->
+
+<xsl:if test="$htmlhelp.hhp.windows">
+  <xsl:value-of select="$htmlhelp.hhp.windows"/>
+</xsl:if>
+<xsl:text>
+
+[FILES]
+</xsl:text>
+
+<xsl:choose>
+  <xsl:when test="$rootid != ''">
+    <xsl:apply-templates select="key('id',$rootid)" mode="enumerate-files"/>
+  </xsl:when>
+  <xsl:otherwise>
+    <xsl:apply-templates select="/" mode="enumerate-files"/>
+  </xsl:otherwise>
+</xsl:choose>
+
+<xsl:if test="$htmlhelp.enumerate.images">
+  <xsl:variable name="imagelist">
+    <xsl:choose>
+      <xsl:when test="$rootid != ''">
+        <xsl:apply-templates select="key('id',$rootid)" mode="enumerate-images"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="/" mode="enumerate-images"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <xsl:choose>
+    <xsl:when test="function-available('exsl:node-set') and function-available('set:distinct')">
+      <xsl:for-each select="set:distinct(exsl:node-set($imagelist)/filename)">
+        <xsl:value-of select="."/>
+        <xsl:text>&#10;</xsl:text>
+      </xsl:for-each>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$imagelist"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:if>
+
+<xsl:if test="($htmlhelp.force.map.and.alias != 0) or 
+              ($rootid = '' and //processing-instruction('dbhh')) or
+              ($rootid != '' and key('id',$rootid)//processing-instruction('dbhh'))">
+  <xsl:text>
+[ALIAS]
+#include </xsl:text><xsl:value-of select="$htmlhelp.alias.file"/><xsl:text>
+
+[MAP]
+#include </xsl:text><xsl:value-of select="$htmlhelp.map.file"/><xsl:text>
+</xsl:text>
+</xsl:if>
+
+<xsl:value-of select="$htmlhelp.hhp.tail"/>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template match="graphic|inlinegraphic[@format!='linespecific']" mode="enumerate-images">
+  <xsl:call-template name="write.filename.enumerate-images">
+    <xsl:with-param name="filename">
+      <xsl:call-template name="mediaobject.filename.enumerate-images">
+        <xsl:with-param name="object" select="."/>
+      </xsl:call-template>  
+    </xsl:with-param>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="mediaobject|inlinemediaobject" mode="enumerate-images">
+  <xsl:call-template name="select.mediaobject.enumerate-images"/>
+</xsl:template>
+
+<xsl:template name="select.mediaobject.enumerate-images" mode="enumerate-images">
+  <xsl:param name="olist"
+             select="imageobject|imageobjectco
+                     |videoobject|audioobject|textobject"/>
+  <xsl:param name="count">1</xsl:param>
+
+  <xsl:if test="$count &lt;= count($olist)">
+    <xsl:variable name="object" select="$olist[position()=$count]"/>
+
+    <xsl:variable name="useobject">
+      <xsl:choose>
+	<!-- The phrase is never used -->
+        <xsl:when test="name($object)='textobject' and $object/phrase">
+          <xsl:text>0</xsl:text>
+        </xsl:when>
+	<!-- The first textobject is a reasonable fallback (but not for image in HH) -->
+        <xsl:when test="name($object)='textobject'">
+          <xsl:text>0</xsl:text>
+        </xsl:when>
+	<!-- If there's only one object, use it -->
+	<xsl:when test="$count = 1 and count($olist) = 1">
+	  <xsl:text>1</xsl:text>
+	</xsl:when>
+	<!-- Otherwise, see if this one is a useable graphic -->
+        <xsl:otherwise>
+          <xsl:choose>
+            <!-- peek inside imageobjectco to simplify the test -->
+            <xsl:when test="local-name($object) = 'imageobjectco'">
+              <xsl:call-template name="is.acceptable.mediaobject">
+                <xsl:with-param name="object" select="$object/imageobject"/>
+              </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:call-template name="is.acceptable.mediaobject">
+                <xsl:with-param name="object" select="$object"/>
+              </xsl:call-template>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test="$useobject='1' and $object[not(*/@format='linespecific')]">
+        <xsl:call-template name="write.filename.enumerate-images">
+          <xsl:with-param name="filename">
+            <xsl:call-template name="mediaobject.filename.enumerate-images">
+              <xsl:with-param name="object" select="$object"/>
+            </xsl:call-template>
+          </xsl:with-param>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="select.mediaobject.enumerate-images">
+          <xsl:with-param name="olist" select="$olist"/>
+          <xsl:with-param name="count" select="$count + 1"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="mediaobject.filename.enumerate-images" mode="enumerate-images">
+  <xsl:param name="object"/>
+
+  <xsl:variable name="urifilename">
+    <xsl:call-template name="mediaobject.filename">
+      <xsl:with-param name="object" select="$object"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="filename">
+    <xsl:choose>
+      <xsl:when test="starts-with($urifilename, 'file:/')">
+	<xsl:value-of select="substring-after($urifilename, 'file:/')"/>
+      </xsl:when>
+      <xsl:otherwise>
+	<xsl:value-of select="$urifilename"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:value-of select="translate($filename, '/', '\')"/>
+
+</xsl:template>
+
+<xsl:template match="text()" mode="enumerate-images">
+</xsl:template>
+
+<xsl:template name="write.filename.enumerate-images" mode="enumerate-images">
+  <xsl:param name="filename"/>
+  <xsl:choose>
+    <xsl:when test="function-available('exsl:node-set') and function-available('set:distinct')">
+      <filename><xsl:value-of select="$filename"/></filename>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$filename"/>
+      <xsl:text>&#10;</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<!-- Following templates are not nice. It is because MS help compiler is unable
+     to process correct HTML files. We must generate following weird
+     stuff instead. -->
+
+<xsl:template name="hhc">
+  <xsl:call-template name="write.text.chunk">
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.hhc"/>
+    </xsl:with-param>
+    <xsl:with-param name="method" select="'text'"/>
+    <xsl:with-param name="content">
+      <xsl:call-template name="hhc-main"/>
+    </xsl:with-param>
+    <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template name="hhc-main">
+  <xsl:text disable-output-escaping="yes">&lt;HTML&gt;
+&lt;HEAD&gt;
+&lt;/HEAD&gt;
+  &lt;BODY&gt;
+</xsl:text>
+  <xsl:if test="$htmlhelp.hhc.folders.instead.books != 0">
+    <xsl:text disable-output-escaping="yes">&lt;OBJECT type="text/site properties"&gt;
+	&lt;param name="ImageType" value="Folder"&gt;
+&lt;/OBJECT&gt;
+</xsl:text>
+  </xsl:if>
+  <xsl:if test="$htmlhelp.hhc.show.root != 0">
+<xsl:text disable-output-escaping="yes">&lt;UL&gt;
+</xsl:text>
+  </xsl:if>
+
+  <xsl:choose>
+    <xsl:when test="$rootid != ''">
+      <xsl:apply-templates select="key('id',$rootid)" mode="hhc"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates select="/" mode="hhc"/>
+    </xsl:otherwise>
+  </xsl:choose>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0">
+  <xsl:text disable-output-escaping="yes">&lt;/UL&gt;
+</xsl:text>
+  </xsl:if>
+  <xsl:text disable-output-escaping="yes">&lt;/BODY&gt;
+&lt;/HTML&gt;</xsl:text>
+</xsl:template>
+
+<xsl:template match="set" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="book">
+    <xsl:variable name="toc.params">
+      <xsl:call-template name="find.path.params">
+        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:if test="contains($toc.params, 'toc') and $htmlhelp.hhc.show.root = 0">
+        <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+          &lt;param name="Name" value="</xsl:text>
+            <xsl:call-template name="gentext">
+              <xsl:with-param name="key" select="'TableofContents'"/>
+            </xsl:call-template>
+          <xsl:text disable-output-escaping="yes">"&gt;
+          &lt;param name="Local" value="</xsl:text>
+              <xsl:call-template name="href.target.with.base.dir"/>
+          <xsl:text disable-output-escaping="yes">"&gt;
+        &lt;/OBJECT&gt;</xsl:text>
+      </xsl:if>
+      <xsl:apply-templates select="book" mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="book" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="part|reference|preface|chapter|appendix|bibliography|article|colophon|glossary">
+    <xsl:variable name="toc.params">
+      <xsl:call-template name="find.path.params">
+        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:if test="contains($toc.params, 'toc') and $htmlhelp.hhc.show.root = 0 and not(parent::*)">
+        <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+          &lt;param name="Name" value="</xsl:text>
+            <xsl:call-template name="gentext">
+              <xsl:with-param name="key" select="'TableofContents'"/>
+            </xsl:call-template>
+          <xsl:text disable-output-escaping="yes">"&gt;
+          &lt;param name="Local" value="</xsl:text>
+              <xsl:call-template name="href.target.with.base.dir"/>
+          <xsl:text disable-output-escaping="yes">"&gt;
+        &lt;/OBJECT&gt;</xsl:text>
+      </xsl:if>
+      <xsl:apply-templates select="part|reference|preface|chapter|bibliography|appendix|article|colophon|glossary"
+			   mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="part|reference|preface|chapter|bibliography|appendix|article|glossary"
+              mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="reference|preface|chapter|appendix|refentry|section|sect1|bibliodiv">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates
+	select="reference|preface|chapter|appendix|refentry|section|sect1|bibliodiv"
+	mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="section" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="section[count(ancestor::section) &lt; $htmlhelp.hhc.section.depth]|refentry">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates select="section|refentry" mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect1" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="sect2[$htmlhelp.hhc.section.depth > 1]|refentry">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates select="sect2|refentry"
+			   mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect2" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="sect3[$htmlhelp.hhc.section.depth > 2]|refentry">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates select="sect3|refentry"
+			   mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect3" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="sect4[$htmlhelp.hhc.section.depth > 3]|refentry">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates select="sect4|refentry"
+			   mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect4" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="sect5[$htmlhelp.hhc.section.depth > 4]|refentry">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates select="sect5|refentry"
+			   mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect5|refentry|colophon|bibliodiv" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="refentry">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates select="refentry"
+			   mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<!-- no separate HTML page with index -->
+<xsl:template match="index"/>   
+<xsl:template match="setindex"/>   
+<xsl:template match="index" mode="toc"/>
+<xsl:template match="setindex" mode="toc"/>
+
+<xsl:template match="indexterm">
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.use.hhk = 0">
+  
+      <xsl:variable name="primary" select="normalize-space(primary)"/>
+      <xsl:variable name="secondary" select="normalize-space(secondary)"/>
+      <xsl:variable name="tertiary" select="normalize-space(tertiary)"/>
+      
+      <xsl:variable name="text">
+        <xsl:value-of select="$primary"/>
+        <xsl:if test="secondary">
+          <xsl:text>, </xsl:text>
+          <xsl:value-of select="$secondary"/>
+        </xsl:if>
+        <xsl:if test="tertiary">
+          <xsl:text>, </xsl:text>
+          <xsl:value-of select="$tertiary"/>
+        </xsl:if>
+      </xsl:variable>
+      
+      <xsl:if test="secondary">
+        <xsl:if test="not(//indexterm[normalize-space(primary)=$primary and not(secondary)])">
+          <xsl:call-template name="write.indexterm">
+            <xsl:with-param name="text" select="$primary"/>
+          </xsl:call-template>
+        </xsl:if>
+      </xsl:if>
+      
+      <xsl:call-template name="write.indexterm">
+        <xsl:with-param name="text" select="$text"/>
+      </xsl:call-template>
+      
+    </xsl:when>
+    <xsl:otherwise>
+      <a>
+        <xsl:attribute name="name">
+          <xsl:call-template name="object.id"/>
+        </xsl:attribute>
+      </a>
+    </xsl:otherwise>
+    
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="write.indexterm">
+  <xsl:param name="text"/>
+  <OBJECT type="application/x-oleobject"
+          classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+    <param name="Keyword" value="{$text}"/>
+  </OBJECT>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template name="hhk">
+  <xsl:call-template name="write.text.chunk">
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.hhk"/>
+    </xsl:with-param>
+    <xsl:with-param name="method" select="'text'"/>
+    <xsl:with-param name="content"><xsl:text disable-output-escaping="yes"><![CDATA[<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<HTML>
+<HEAD>
+<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
+<!-- Sitemap 1.0 -->
+</HEAD><BODY>
+<OBJECT type="text/site properties">
+</OBJECT>
+<UL>]]>
+</xsl:text>
+<xsl:if test="($htmlhelp.use.hhk != 0) and $htmlhelp.generate.index">
+  <xsl:choose>
+    <xsl:when test="$rootid != ''">
+      <xsl:apply-templates select="key('id',$rootid)" mode="hhk"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates select="/" mode="hhk"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:if>
+<xsl:text disable-output-escaping="yes"><![CDATA[</UL>
+</BODY></HTML>]]>
+</xsl:text></xsl:with-param>
+    <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="indexterm[@class='endofrange']" mode="hhk"/>
+
+<xsl:template match="indexterm" mode="hhk">
+  <xsl:variable name="primary" select="normalize-space(primary)"/>
+  <xsl:variable name="secondary" select="normalize-space(secondary)"/>
+  <xsl:variable name="tertiary" select="normalize-space(tertiary)"/>
+
+  <xsl:call-template name="write.indexterm.hhk">
+    <xsl:with-param name="text" select="$primary"/>
+    <xsl:with-param name="seealso" select="seealso"/>
+  </xsl:call-template>
+
+  <xsl:if test="secondary">
+    <xsl:if test="not(//indexterm[normalize-space(primary)=$primary and not(secondary)])">
+      <xsl:call-template name="write.indexterm.hhk">
+        <!-- We must create fake entry when there is secondary without primary --> 
+        <xsl:with-param name="text" select="$primary"/>
+        <xsl:with-param name="seealso" select="$primary"/>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:text disable-output-escaping="yes"><![CDATA[<UL>]]>&#10;</xsl:text>
+    <xsl:call-template name="write.indexterm.hhk">
+      <xsl:with-param name="text" select="$secondary"/>
+      <xsl:with-param name="seealso" select="secondary/seealso"/>
+    </xsl:call-template>
+    <xsl:if test="tertiary">
+      <xsl:text disable-output-escaping="yes"><![CDATA[<UL>]]>&#10;</xsl:text>
+      <xsl:call-template name="write.indexterm.hhk">
+        <xsl:with-param name="text" select="$tertiary"/>
+        <xsl:with-param name="seealso" select="tertiary/seealso"/>
+      </xsl:call-template>
+      <xsl:text disable-output-escaping="yes"><![CDATA[</UL>]]>&#10;</xsl:text>
+    </xsl:if>
+    <xsl:text disable-output-escaping="yes"><![CDATA[</UL>]]>&#10;</xsl:text>
+  </xsl:if>
+
+</xsl:template>
+
+<xsl:template name="write.indexterm.hhk">
+  <xsl:param name="text"/>
+  <xsl:param name="seealso"/>
+  <xsl:variable name="text.escaped">
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value" select="$text"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:text disable-output-escaping="yes"><![CDATA[<LI> <OBJECT type="text/sitemap">
+    <param name="Name" value="]]></xsl:text><xsl:value-of select="$text.escaped"/><xsl:text disable-output-escaping="yes"><![CDATA[">]]></xsl:text>
+      <xsl:if test="not(seealso)">
+        <xsl:variable name="href">
+          <xsl:call-template name="href.target.with.base.dir"/>
+        </xsl:variable>
+        <xsl:variable name="title">
+          <xsl:call-template name="escape-attr">
+            <xsl:with-param name="value">
+              <xsl:call-template name="nearest.title">
+                <xsl:with-param name="object" select=".."/>
+              </xsl:call-template>
+            </xsl:with-param>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:text disable-output-escaping="yes"><![CDATA[<param name="Name" value="]]></xsl:text>
+          <xsl:value-of select="$title"/>
+        <xsl:text disable-output-escaping="yes"><![CDATA[">]]></xsl:text>
+        <xsl:text disable-output-escaping="yes"><![CDATA[<param name="Local" value="]]></xsl:text>
+          <xsl:value-of select="$href"/>
+        <xsl:text disable-output-escaping="yes"><![CDATA[">]]></xsl:text>
+      </xsl:if>
+      <xsl:if test="seealso">
+        <xsl:text disable-output-escaping="yes"><![CDATA[<param name="See Also" value="]]></xsl:text>
+          <xsl:value-of select="$seealso"/>
+        <xsl:text disable-output-escaping="yes"><![CDATA[">]]></xsl:text>
+      </xsl:if>
+      <xsl:text disable-output-escaping="yes"><![CDATA[ </OBJECT>]]></xsl:text>
+</xsl:template>
+
+<xsl:template match="text()" mode="hhk"/>
+
+<xsl:template name="nearest.title">
+  <xsl:param name="object"/>
+  <xsl:apply-templates select="$object/ancestor-or-self::*[title][1]" mode="title.markup"/>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template name="hh-map">
+  <xsl:call-template name="write.text.chunk">
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.map.file"/>
+    </xsl:with-param>
+    <xsl:with-param name="method" select="'text'"/>
+    <xsl:with-param name="content">
+     <xsl:choose>
+       <xsl:when test="$rootid != ''">
+         <xsl:apply-templates select="key('id',$rootid)" mode="hh-map"/>
+       </xsl:when>
+       <xsl:otherwise>
+         <xsl:apply-templates select="/" mode="hh-map"/>
+       </xsl:otherwise>
+     </xsl:choose>
+    </xsl:with-param>
+    <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="processing-instruction('dbhh')" mode="hh-map">
+  <xsl:variable name="topicname">
+    <xsl:call-template name="pi-attribute">
+      <xsl:with-param name="pis"
+                      select="."/>
+      <xsl:with-param name="attribute" select="'topicname'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:variable name="topicid">
+    <xsl:call-template name="pi-attribute">
+      <xsl:with-param name="pis"
+                      select="."/>
+      <xsl:with-param name="attribute" select="'topicid'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:text>#define </xsl:text>
+  <xsl:value-of select="$topicname"/>
+  <xsl:text>&#9;</xsl:text>
+  <xsl:value-of select="$topicid"/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="text()" mode="hh-map"/>
+
+<!-- ==================================================================== -->
+
+<xsl:template name="hh-alias">
+  <xsl:call-template name="write.text.chunk">
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.alias.file"/>
+    </xsl:with-param>
+    <xsl:with-param name="method" select="'text'"/>
+    <xsl:with-param name="content">
+     <xsl:choose>
+       <xsl:when test="$rootid != ''">
+         <xsl:apply-templates select="key('id',$rootid)" mode="hh-alias"/>
+       </xsl:when>
+       <xsl:otherwise>
+         <xsl:apply-templates select="/" mode="hh-alias"/>
+       </xsl:otherwise>
+     </xsl:choose>
+    </xsl:with-param>
+    <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="processing-instruction('dbhh')" mode="hh-alias">
+  <xsl:variable name="topicname">
+    <xsl:call-template name="pi-attribute">
+      <xsl:with-param name="pis"
+                      select="."/>
+      <xsl:with-param name="attribute" select="'topicname'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:variable name="href">
+    <xsl:call-template name="href.target.with.base.dir">
+      <xsl:with-param name="object" select=".."/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:value-of select="$topicname"/>
+  <xsl:text>=</xsl:text>
+  <!-- Some versions of HH doesn't like fragment identifires, but some does. -->
+  <!-- <xsl:value-of select="substring-before(concat($href, '#'), '#')"/> -->
+  <xsl:value-of select="$href"/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="text()" mode="hh-alias"/>
+
+<!-- ==================================================================== -->
+<!-- This code can be used to convert any number to hexadecimal format -->
+
+  <h:hex>
+    <d>0</d>
+    <d>1</d>
+    <d>2</d>
+    <d>3</d>
+    <d>4</d>
+    <d>5</d>
+    <d>6</d>
+    <d>7</d>
+    <d>8</d>
+    <d>9</d>
+    <d>A</d>
+    <d>B</d>
+    <d>C</d>
+    <d>D</d>
+    <d>E</d>
+    <d>F</d>
+  </h:hex>
+
+  <xsl:template name="toHex">
+    <xsl:param name="n" select="0"/>
+    <xsl:param name="digit" select="$n mod 16"/>
+    <xsl:param name="rest" select="floor($n div 16)"/>
+    <xsl:if test="$rest > 0">
+      <xsl:call-template name="toHex">
+        <xsl:with-param name="n" select="$rest"/>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:value-of select="document('')//h:hex/d[$digit+1]"/>
+  </xsl:template>
+
+<!-- ==================================================================== -->
+<!-- Template for escaping <, & and " in attribute values. 
+     We aren't using HTML output method, so we must do this job ourselves -->
+
+<xsl:template name="escape-attr">
+  <xsl:param name="value"/>
+
+  <xsl:variable name="amp.escaped">
+    <xsl:call-template name="string.subst">
+      <xsl:with-param name="string" select="$value"/>
+      <xsl:with-param name="target" select="'&amp;'"/>
+      <xsl:with-param name="replacement" select="'&amp;amp;'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="quot.escaped">
+    <xsl:call-template name="string.subst">
+      <xsl:with-param name="string" select="$amp.escaped"/>
+      <xsl:with-param name="target" select="'&quot;'"/>
+      <xsl:with-param name="replacement" select="'&amp;quot;'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="angle.escaped">
+    <xsl:call-template name="string.subst">
+      <xsl:with-param name="string" select="$quot.escaped"/>
+      <xsl:with-param name="target" select="'&lt;'"/>
+      <xsl:with-param name="replacement" select="'&amp;lt;'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:value-of select="$angle.escaped"/>
+
+</xsl:template>
+
+<!-- ==================================================================== -->
+<!-- Modification to standard HTML stylesheets -->
+
+<!-- There are links from ToC pane to bibliodivs, so there must be anchor -->
+<xsl:template match="bibliodiv/title">
+  <h3 class="{name(.)}">
+    <xsl:call-template name="anchor">
+      <xsl:with-param name="node" select=".."/>
+      <xsl:with-param name="conditional" select="0"/>
+    </xsl:call-template>
+    <xsl:apply-templates/>
+  </h3>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/doc/reference/styles/htmlhelp.xsl b/doc/reference/styles/htmlhelp.xsl
new file mode 100644
index 00000000..f9e6e21a
--- /dev/null
+++ b/doc/reference/styles/htmlhelp.xsl
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+                xmlns:exsl="http://exslt.org/common"
+                xmlns:set="http://exslt.org/sets"
+		version="1.0"
+                exclude-result-prefixes="doc exsl set">
+
+<!-- ********************************************************************
+     $Id: htmlhelp.xsl,v 1.1 2005/08/28 03:49:20 markpollack Exp $
+     ******************************************************************** 
+
+     This file is used by htmlhelp.xsl if you want to generate source
+     files for HTML Help.  It is based on the XSL DocBook Stylesheet
+     distribution (especially on JavaHelp code) from Norman Walsh.
+
+     ******************************************************************** -->
+<!--
+<xsl:import href="../html/chunk.xsl"/>
+-->
+
+<xsl:import href="html_chunk.xsl"/>
+
+<xsl:param name="shade.verbatim" select="1"></xsl:param>
+<xsl:attribute-set name="shade.verbatim.style">
+  <xsl:attribute name="border">1</xsl:attribute>
+  <xsl:attribute name="bgcolor">#F4F4F4</xsl:attribute>
+</xsl:attribute-set>
+
+
+<xsl:param name="manifest.in.base.dir" select="0"/>
+<xsl:param name="htmlhelp.alias.file" select="'alias.h'"/>
+<xsl:param name="htmlhelp.autolabel" select="0"/>
+<xsl:param name="htmlhelp.button.back" select="1"/>
+<xsl:param name="htmlhelp.button.forward" select="0"/>
+<xsl:param name="htmlhelp.button.hideshow" select="1"/>
+<xsl:param name="htmlhelp.button.home" select="0"/>
+<xsl:param name="htmlhelp.button.home.url"/>
+<xsl:param name="htmlhelp.button.jump1" select="0"/>
+<xsl:param name="htmlhelp.button.jump1.title" select="'User1'"/>
+<xsl:param name="htmlhelp.button.jump1.url"/>
+<xsl:param name="htmlhelp.button.jump2" select="0"/>
+<xsl:param name="htmlhelp.button.jump2.title" select="'User2'"/>
+<xsl:param name="htmlhelp.button.jump2.url"/>
+<xsl:param name="htmlhelp.button.locate" select="0"/>
+<xsl:param name="htmlhelp.button.next" select="1"/>
+<xsl:param name="htmlhelp.button.options" select="1"/>
+<xsl:param name="htmlhelp.button.prev" select="1"/>
+<xsl:param name="htmlhelp.button.print" select="1"/>
+<xsl:param name="htmlhelp.button.refresh" select="0"/>
+<xsl:param name="htmlhelp.button.stop" select="0"/>
+<xsl:param name="htmlhelp.button.zoom" select="0"/>
+<xsl:param name="htmlhelp.chm" select="'htmlhelp.chm'"/>
+<xsl:param name="htmlhelp.default.topic" select="''"/>
+<xsl:param name="htmlhelp.display.progress" select="1"/>
+<xsl:param name="htmlhelp.encoding" select="'iso-8859-1'"/>
+<xsl:param name="htmlhelp.enhanced.decompilation" select="0"/>
+<xsl:param name="htmlhelp.enumerate.images" select="0"/>
+<xsl:param name="htmlhelp.force.map.and.alias" select="0"/>
+<xsl:param name="htmlhelp.hhc.binary" select="1"/>
+<xsl:param name="htmlhelp.hhc.folders.instead.books" select="1"/>
+<xsl:param name="htmlhelp.hhc" select="'toc.hhc'"/>
+<xsl:param name="htmlhelp.hhc.section.depth" select="5"/>
+<xsl:param name="htmlhelp.hhc.show.root" select="1"/>
+<xsl:param name="htmlhelp.hhc.width"/>
+<xsl:param name="htmlhelp.hhk" select="'index.hhk'"/>
+<xsl:param name="htmlhelp.hhp" select="'htmlhelp.hhp'"/>
+<xsl:param name="htmlhelp.hhp.tail"/>
+<xsl:param name="htmlhelp.hhp.window" select="'Main'"/>
+<xsl:param name="htmlhelp.hhp.windows"/>
+<xsl:param name="htmlhelp.map.file" select="'context.h'"/>
+<xsl:param name="htmlhelp.only" select="0"/>
+<xsl:param name="htmlhelp.remember.window.position" select="0"/>
+<xsl:param name="htmlhelp.show.advanced.search" select="0"/>
+<xsl:param name="htmlhelp.show.favorities" select="0"/>
+<xsl:param name="htmlhelp.show.menu" select="0"/>
+<xsl:param name="htmlhelp.show.toolbar.text" select="1"/>
+<xsl:param name="htmlhelp.title" select="''"/>
+<xsl:param name="htmlhelp.use.hhk" select="0"/>
+<xsl:param name="htmlhelp.window.geometry"/>
+
+<xsl:template name="href.target.with.base.dir">
+  <xsl:param name="object" select="."/>
+  <xsl:if test="$manifest.in.base.dir = 0">
+    <xsl:value-of select="$base.dir"/>
+  </xsl:if>
+  <xsl:call-template name="href.target">
+    <xsl:with-param name="object" select="$object"/>
+  </xsl:call-template>
+</xsl:template>
+    
+
+<xsl:include href="htmlhelp-common.xsl"/>
+
+</xsl:stylesheet>
diff --git a/doc/reference/styles/profile-htmlhelp-common.xsl b/doc/reference/styles/profile-htmlhelp-common.xsl
new file mode 100644
index 00000000..41981669
--- /dev/null
+++ b/doc/reference/styles/profile-htmlhelp-common.xsl
@@ -0,0 +1,1199 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<!--This file was created automatically by xsl2profile-->
+<!--from the DocBook XSL stylesheets. Do not edit this file.-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:exsl="http://exslt.org/common" xmlns:set="http://exslt.org/sets" xmlns:h="urn:x-hex" xmlns:exslt="http://exslt.org/common" exslt:dummy="dummy" extension-element-prefixes="exslt" version="1.0" exclude-result-prefixes="doc exsl set h exslt">
+
+<!-- ********************************************************************
+     $Id: profile-htmlhelp-common.xsl,v 1.1 2005/08/28 03:49:20 markpollack Exp $
+     ******************************************************************** -->
+
+<!-- ==================================================================== -->
+<!-- Customizations of standard HTML stylesheet parameters -->
+
+<xsl:param name="suppress.navigation" select="1"/>
+
+<!-- ==================================================================== -->
+
+<xsl:variable name="htmlhelp.generate.index" select="//indexterm[1]"/>
+
+<xsl:variable name="raw.help.title">
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.title = ''">
+      <xsl:choose>
+        <xsl:when test="$rootid != ''">
+          <xsl:apply-templates select="key('id',$rootid)" mode="title.markup"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="/*" mode="title.markup"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$htmlhelp.title"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:variable>
+
+<xsl:variable name="help.title" select="normalize-space($raw.help.title)"/>
+  
+<!-- ==================================================================== -->
+
+<xslo:include xmlns:xslo="http://www.w3.org/1999/XSL/Transform" href="../profiling/profile-mode.xsl"/><xsl:template match="/"><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:apply-templates select="." mode="profile"/></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/>
+  <xsl:if test="$htmlhelp.only != 1">
+    <xsl:choose>
+      <xsl:when test="$rootid != ''">
+        <xsl:choose>
+          <xsl:when test="count($profiled-nodes//*[@id=$rootid]) = 0">
+            <xsl:message terminate="yes">
+              <xsl:text>ID '</xsl:text>
+              <xsl:value-of select="$rootid"/>
+              <xsl:text>' not found in document.</xsl:text>
+            </xsl:message>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:message>Formatting from <xsl:value-of select="$rootid"/></xsl:message>
+            <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="process.root"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="$profiled-nodes" mode="process.root"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:if>
+
+  <xsl:call-template name="hhp"/>
+  <xsl:call-template name="hhc"/>
+  <xsl:if test="($rootid = '' and //processing-instruction('dbhh')) or                 ($rootid != '' and $profiled-nodes//*[@id=$rootid]//processing-instruction('dbhh'))">
+    <xsl:call-template name="hh-map"/>
+    <xsl:call-template name="hh-alias"/>
+  </xsl:if>
+  <xsl:if test="$htmlhelp.generate.index">
+    <xsl:call-template name="hhk"/>
+  </xsl:if>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template name="hhp">
+  <xsl:call-template name="write.text.chunk">
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.hhp"/>
+    </xsl:with-param>
+    <xsl:with-param name="method" select="'text'"/>
+    <xsl:with-param name="content">
+      <xsl:call-template name="hhp-main"/>
+    </xsl:with-param>
+    <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- ==================================================================== -->
+<xsl:template name="hhp-main"><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:apply-templates select="." mode="profile"/></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/>
+<xsl:variable name="default.topic">
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.default.topic != ''">
+      <xsl:value-of select="$htmlhelp.default.topic"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name="make-relative-filename">
+        <xsl:with-param name="base.dir">
+          <xsl:if test="$manifest.in.base.dir = 0">
+            <xsl:value-of select="$base.dir"/>
+          </xsl:if>
+        </xsl:with-param>
+        <xsl:with-param name="base.name">
+          <xsl:choose>
+            <xsl:when test="$rootid != ''">
+              <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="chunk-filename"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:apply-templates select="$profiled-nodes" mode="chunk-filename"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:with-param>
+      </xsl:call-template>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:variable>
+<xsl:variable name="xnavigation">
+  <xsl:text>0x</xsl:text>
+  <xsl:call-template name="toHex">
+    <xsl:with-param name="n" select="9504 + $htmlhelp.show.menu * 65536                                           + $htmlhelp.show.advanced.search * 131072                                           + $htmlhelp.show.favorities * 4096                                           + (1 - $htmlhelp.show.toolbar.text) * 64                                           + $htmlhelp.remember.window.position * 262144"/>
+  </xsl:call-template>
+</xsl:variable>
+<xsl:variable name="xbuttons">
+  <xsl:text>0x</xsl:text>
+  <xsl:call-template name="toHex">
+    <xsl:with-param name="n" select="0 + $htmlhelp.button.hideshow * 2                                        + $htmlhelp.button.back * 4                                        + $htmlhelp.button.forward * 8                                        + $htmlhelp.button.stop * 16                                        + $htmlhelp.button.refresh * 32                                        + $htmlhelp.button.home * 64                                        + $htmlhelp.button.options * 4096                                        + $htmlhelp.button.print * 8192                                        + $htmlhelp.button.locate * 2048                                        + $htmlhelp.button.jump1 * 262144                                        + $htmlhelp.button.jump2 * 524288                                        + $htmlhelp.button.next * 2097152                                        + $htmlhelp.button.prev * 4194304                                        + $htmlhelp.button.zoom * 1048576"/>
+  </xsl:call-template>
+</xsl:variable>
+<xsl:text>[OPTIONS]
+</xsl:text>
+<xsl:if test="$htmlhelp.generate.index">
+<xsl:text>Auto Index=Yes
+</xsl:text></xsl:if>
+<xsl:if test="$htmlhelp.hhc.binary != 0">
+<xsl:text>Binary TOC=Yes
+</xsl:text></xsl:if>
+<xsl:text>Compatibility=1.1 or later
+Compiled file=</xsl:text><xsl:value-of select="$htmlhelp.chm"/><xsl:text>
+Contents file=</xsl:text><xsl:value-of select="$htmlhelp.hhc"/><xsl:text>
+</xsl:text>
+<xsl:if test="$htmlhelp.hhp.window != ''">
+<xsl:text>Default Window=</xsl:text><xsl:value-of select="$htmlhelp.hhp.window"/><xsl:text>
+</xsl:text></xsl:if>
+<xsl:text>Default topic=</xsl:text><xsl:value-of select="$default.topic"/>
+<xsl:text>
+Display compile progress=</xsl:text>
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.display.progress != 1">
+      <xsl:text>No</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>Yes</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+<xsl:text>
+Full-text search=Yes
+</xsl:text>
+<xsl:if test="$htmlhelp.generate.index">
+<xsl:text>Index file=</xsl:text><xsl:value-of select="$htmlhelp.hhk"/><xsl:text>
+</xsl:text></xsl:if>
+<xsl:text>Language=</xsl:text>
+<xsl:for-each select="*">   <!-- Change context from / to root element -->
+  <xsl:call-template name="gentext.template">
+    <xsl:with-param name="context" select="'htmlhelp'"/>
+    <xsl:with-param name="name" select="'langcode'"/>
+  </xsl:call-template>
+</xsl:for-each>
+<xsl:text>
+Title=</xsl:text>
+  <xsl:value-of select="$help.title"/>
+<xsl:text>
+Enhanced decompilation=</xsl:text>
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.enhanced.decompilation != 0">
+      <xsl:text>Yes</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>No</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+
+<xsl:if test="$htmlhelp.hhp.window != ''">
+  <xsl:text>
+
+[WINDOWS]
+</xsl:text>
+<xsl:value-of select="$htmlhelp.hhp.window"/>
+<xsl:text>="</xsl:text>
+<xsl:value-of select="$help.title"/>
+<xsl:text>","</xsl:text><xsl:value-of select="$htmlhelp.hhc"/>
+<xsl:text>",</xsl:text>
+<xsl:if test="$htmlhelp.generate.index">
+  <xsl:text>"</xsl:text>
+  <xsl:value-of select="$htmlhelp.hhk"/>
+  <xsl:text>"</xsl:text>
+</xsl:if>
+<xsl:text>,"</xsl:text>
+<xsl:value-of select="$default.topic"/>
+<xsl:text>",</xsl:text>
+<xsl:text>"</xsl:text>
+<xsl:choose>
+  <xsl:when test="$htmlhelp.button.home != 0">
+    <xsl:value-of select="$htmlhelp.button.home.url"/>
+  </xsl:when>
+  <xsl:otherwise>
+    <xsl:value-of select="$default.topic"/>
+  </xsl:otherwise>
+</xsl:choose>
+<xsl:text>"</xsl:text>
+<xsl:text>,</xsl:text>
+<xsl:if test="$htmlhelp.button.jump1 != 0">
+  <xsl:text>"</xsl:text>
+  <xsl:value-of select="$htmlhelp.button.jump1.url"/>
+  <xsl:text>"</xsl:text>
+</xsl:if>
+<xsl:text>,</xsl:text>
+<xsl:if test="$htmlhelp.button.jump1 != 0">
+  <xsl:text>"</xsl:text>
+  <xsl:value-of select="$htmlhelp.button.jump1.title"/>
+  <xsl:text>"</xsl:text>
+</xsl:if>
+<xsl:text>,</xsl:text>
+<xsl:if test="$htmlhelp.button.jump2 != 0">
+  <xsl:text>"</xsl:text>
+  <xsl:value-of select="$htmlhelp.button.jump2.url"/>
+  <xsl:text>"</xsl:text>
+</xsl:if>
+<xsl:text>,</xsl:text>
+<xsl:if test="$htmlhelp.button.jump2 != 0">
+  <xsl:text>"</xsl:text>
+  <xsl:value-of select="$htmlhelp.button.jump2.title"/>
+  <xsl:text>"</xsl:text>
+</xsl:if>
+<xsl:text>,</xsl:text>
+<xsl:value-of select="$xnavigation"/>
+<xsl:text>,</xsl:text><xsl:value-of select="$htmlhelp.hhc.width"/><xsl:text>,</xsl:text>
+<xsl:value-of select="$xbuttons"/>
+<xsl:text>,</xsl:text><xsl:value-of select="$htmlhelp.window.geometry"/><xsl:text>,,,,,,,0
+</xsl:text>
+</xsl:if>
+
+<!-- 
+  Needs more investigation to generate propetly all fields 
+<xsl:text>search="</xsl:text>
+<xsl:value-of select="normalize-space(//title[1])"/>
+<xsl:text>","toc.hhc","index.hhk","</xsl:text>
+<xsl:value-of select="$root.filename"/>
+<xsl:text>.html","</xsl:text>
+<xsl:value-of select="$root.filename"/>
+<xsl:text>.html",,,,,</xsl:text>
+<xsl:value-of select="$xnavigation"/>
+<xsl:text>,</xsl:text>
+<xsl:value-of select="$htmlhelp.hhc.width"/>
+<xsl:text>,</xsl:text>
+<xsl:value-of select="$xbuttons"/>
+<xsl:text>,</xsl:text>
+<xsl:value-of select="$htmlhelp.window.geometry"/>
+<xsl:text>,,,,,2,,0
+</xsl:text>
+-->
+
+<xsl:if test="$htmlhelp.hhp.windows">
+  <xsl:value-of select="$htmlhelp.hhp.windows"/>
+</xsl:if>
+<xsl:text>
+
+[FILES]
+</xsl:text>
+
+<xsl:choose>
+  <xsl:when test="$rootid != ''">
+    <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="enumerate-files"/>
+  </xsl:when>
+  <xsl:otherwise>
+    <xsl:apply-templates select="$profiled-nodes" mode="enumerate-files"/>
+  </xsl:otherwise>
+</xsl:choose>
+
+<xsl:if test="$htmlhelp.enumerate.images">
+  <xsl:variable name="imagelist">
+    <xsl:choose>
+      <xsl:when test="$rootid != ''">
+        <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="enumerate-images"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="$profiled-nodes" mode="enumerate-images"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <xsl:choose>
+    <xsl:when test="function-available('exsl:node-set') and function-available('set:distinct')">
+      <xsl:for-each select="set:distinct(exsl:node-set($imagelist)/filename)">
+        <xsl:value-of select="."/>
+        <xsl:text>
+</xsl:text>
+      </xsl:for-each>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$imagelist"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:if>
+
+<xsl:if test="($htmlhelp.force.map.and.alias != 0) or                ($rootid = '' and //processing-instruction('dbhh')) or               ($rootid != '' and $profiled-nodes//*[@id=$rootid]//processing-instruction('dbhh'))">
+  <xsl:text>
+[ALIAS]
+#include </xsl:text><xsl:value-of select="$htmlhelp.alias.file"/><xsl:text>
+
+[MAP]
+#include </xsl:text><xsl:value-of select="$htmlhelp.map.file"/><xsl:text>
+</xsl:text>
+</xsl:if>
+
+<xsl:value-of select="$htmlhelp.hhp.tail"/>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template match="graphic|inlinegraphic[@format!='linespecific']" mode="enumerate-images">
+  <xsl:call-template name="write.filename.enumerate-images">
+    <xsl:with-param name="filename">
+      <xsl:call-template name="mediaobject.filename.enumerate-images">
+        <xsl:with-param name="object" select="."/>
+      </xsl:call-template>  
+    </xsl:with-param>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="mediaobject|inlinemediaobject" mode="enumerate-images">
+  <xsl:call-template name="select.mediaobject.enumerate-images"/>
+</xsl:template>
+
+<xsl:template name="select.mediaobject.enumerate-images" mode="enumerate-images">
+  <xsl:param name="olist" select="imageobject|imageobjectco                      |videoobject|audioobject|textobject"/>
+  <xsl:param name="count">1</xsl:param>
+
+  <xsl:if test="$count &lt;= count($olist)">
+    <xsl:variable name="object" select="$olist[position()=$count]"/>
+
+    <xsl:variable name="useobject">
+      <xsl:choose>
+	<!-- The phrase is never used -->
+        <xsl:when test="name($object)='textobject' and $object/phrase">
+          <xsl:text>0</xsl:text>
+        </xsl:when>
+	<!-- The first textobject is a reasonable fallback (but not for image in HH) -->
+        <xsl:when test="name($object)='textobject'">
+          <xsl:text>0</xsl:text>
+        </xsl:when>
+	<!-- If there's only one object, use it -->
+	<xsl:when test="$count = 1 and count($olist) = 1">
+	  <xsl:text>1</xsl:text>
+	</xsl:when>
+	<!-- Otherwise, see if this one is a useable graphic -->
+        <xsl:otherwise>
+          <xsl:choose>
+            <!-- peek inside imageobjectco to simplify the test -->
+            <xsl:when test="local-name($object) = 'imageobjectco'">
+              <xsl:call-template name="is.acceptable.mediaobject">
+                <xsl:with-param name="object" select="$object/imageobject"/>
+              </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:call-template name="is.acceptable.mediaobject">
+                <xsl:with-param name="object" select="$object"/>
+              </xsl:call-template>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test="$useobject='1' and $object[not(*/@format='linespecific')]">
+        <xsl:call-template name="write.filename.enumerate-images">
+          <xsl:with-param name="filename">
+            <xsl:call-template name="mediaobject.filename.enumerate-images">
+              <xsl:with-param name="object" select="$object"/>
+            </xsl:call-template>
+          </xsl:with-param>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="select.mediaobject.enumerate-images">
+          <xsl:with-param name="olist" select="$olist"/>
+          <xsl:with-param name="count" select="$count + 1"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="mediaobject.filename.enumerate-images" mode="enumerate-images">
+  <xsl:param name="object"/>
+
+  <xsl:variable name="urifilename">
+    <xsl:call-template name="mediaobject.filename">
+      <xsl:with-param name="object" select="$object"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="filename">
+    <xsl:choose>
+      <xsl:when test="starts-with($urifilename, 'file:/')">
+	<xsl:value-of select="substring-after($urifilename, 'file:/')"/>
+      </xsl:when>
+      <xsl:otherwise>
+	<xsl:value-of select="$urifilename"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:value-of select="translate($filename, '/', '\')"/>
+
+</xsl:template>
+
+<xsl:template match="text()" mode="enumerate-images">
+</xsl:template>
+
+<xsl:template name="write.filename.enumerate-images" mode="enumerate-images">
+  <xsl:param name="filename"/>
+  <xsl:choose>
+    <xsl:when test="function-available('exsl:node-set') and function-available('set:distinct')">
+      <filename><xsl:value-of select="$filename"/></filename>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$filename"/>
+      <xsl:text>
+</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<!-- Following templates are not nice. It is because MS help compiler is unable
+     to process correct HTML files. We must generate following weird
+     stuff instead. -->
+
+<xsl:template name="hhc">
+  <xsl:call-template name="write.text.chunk">
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.hhc"/>
+    </xsl:with-param>
+    <xsl:with-param name="method" select="'text'"/>
+    <xsl:with-param name="content">
+      <xsl:call-template name="hhc-main"/>
+    </xsl:with-param>
+    <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template name="hhc-main"><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:apply-templates select="." mode="profile"/></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/>
+  <xsl:text disable-output-escaping="yes">&lt;HTML&gt;
+&lt;HEAD&gt;
+&lt;/HEAD&gt;
+  &lt;BODY&gt;
+</xsl:text>
+  <xsl:if test="$htmlhelp.hhc.folders.instead.books != 0">
+    <xsl:text disable-output-escaping="yes">&lt;OBJECT type="text/site properties"&gt;
+	&lt;param name="ImageType" value="Folder"&gt;
+&lt;/OBJECT&gt;
+</xsl:text>
+  </xsl:if>
+  <xsl:if test="$htmlhelp.hhc.show.root != 0">
+<xsl:text disable-output-escaping="yes">&lt;UL&gt;
+</xsl:text>
+  </xsl:if>
+
+  <xsl:choose>
+    <xsl:when test="$rootid != ''">
+      <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="hhc"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates select="$profiled-nodes" mode="hhc"/>
+    </xsl:otherwise>
+  </xsl:choose>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0">
+  <xsl:text disable-output-escaping="yes">&lt;/UL&gt;
+</xsl:text>
+  </xsl:if>
+  <xsl:text disable-output-escaping="yes">&lt;/BODY&gt;
+&lt;/HTML&gt;</xsl:text>
+</xsl:template>
+
+<xsl:template match="set" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="book">
+    <xsl:variable name="toc.params">
+      <xsl:call-template name="find.path.params">
+        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:if test="contains($toc.params, 'toc') and $htmlhelp.hhc.show.root = 0">
+        <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+          &lt;param name="Name" value="</xsl:text>
+            <xsl:call-template name="gentext">
+              <xsl:with-param name="key" select="'TableofContents'"/>
+            </xsl:call-template>
+          <xsl:text disable-output-escaping="yes">"&gt;
+          &lt;param name="Local" value="</xsl:text>
+              <xsl:call-template name="href.target.with.base.dir"/>
+          <xsl:text disable-output-escaping="yes">"&gt;
+        &lt;/OBJECT&gt;</xsl:text>
+      </xsl:if>
+      <xsl:apply-templates select="book" mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="book" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="part|reference|preface|chapter|appendix|bibliography|article|colophon|glossary">
+    <xsl:variable name="toc.params">
+      <xsl:call-template name="find.path.params">
+        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:if test="contains($toc.params, 'toc') and $htmlhelp.hhc.show.root = 0 and not(parent::*)">
+        <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+          &lt;param name="Name" value="</xsl:text>
+            <xsl:call-template name="gentext">
+              <xsl:with-param name="key" select="'TableofContents'"/>
+            </xsl:call-template>
+          <xsl:text disable-output-escaping="yes">"&gt;
+          &lt;param name="Local" value="</xsl:text>
+              <xsl:call-template name="href.target.with.base.dir"/>
+          <xsl:text disable-output-escaping="yes">"&gt;
+        &lt;/OBJECT&gt;</xsl:text>
+      </xsl:if>
+      <xsl:apply-templates select="part|reference|preface|chapter|bibliography|appendix|article|colophon|glossary" mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="part|reference|preface|chapter|bibliography|appendix|article|glossary" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="reference|preface|chapter|appendix|refentry|section|sect1|bibliodiv">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates select="reference|preface|chapter|appendix|refentry|section|sect1|bibliodiv" mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="section" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="section[count(ancestor::section) &lt; $htmlhelp.hhc.section.depth]|refentry">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates select="section|refentry" mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect1" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="sect2[$htmlhelp.hhc.section.depth &gt; 1]|refentry">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates select="sect2|refentry" mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect2" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="sect3[$htmlhelp.hhc.section.depth &gt; 2]|refentry">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates select="sect3|refentry" mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect3" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="sect4[$htmlhelp.hhc.section.depth &gt; 3]|refentry">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates select="sect4|refentry" mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect4" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="sect5[$htmlhelp.hhc.section.depth &gt; 4]|refentry">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates select="sect5|refentry" mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="sect5|refentry|colophon|bibliodiv" mode="hhc">
+  <xsl:variable name="title">
+    <xsl:if test="$htmlhelp.autolabel=1">
+      <xsl:variable name="label.markup">
+        <xsl:apply-templates select="." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="normalize-space($label.markup)">
+        <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/>
+      </xsl:if>
+    </xsl:if>
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value">
+        <xsl:apply-templates select="." mode="title.markup"/>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*">
+    <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+      &lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="normalize-space($title)"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+      &lt;param name="Local" value="</xsl:text>
+          <xsl:call-template name="href.target.with.base.dir"/>
+      <xsl:text disable-output-escaping="yes">"&gt;
+    &lt;/OBJECT&gt;</xsl:text>
+  </xsl:if>
+  <xsl:if test="refentry">
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;</xsl:text>
+      <xsl:apply-templates select="refentry" mode="hhc"/>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<!-- no separate HTML page with index -->
+<xsl:template match="index"/>   
+<xsl:template match="setindex"/>   
+<xsl:template match="index" mode="toc"/>
+<xsl:template match="setindex" mode="toc"/>
+
+<xsl:template match="indexterm">
+  <xsl:choose>
+    <xsl:when test="$htmlhelp.use.hhk = 0">
+  
+      <xsl:variable name="primary" select="normalize-space(primary)"/>
+      <xsl:variable name="secondary" select="normalize-space(secondary)"/>
+      <xsl:variable name="tertiary" select="normalize-space(tertiary)"/>
+      
+      <xsl:variable name="text">
+        <xsl:value-of select="$primary"/>
+        <xsl:if test="secondary">
+          <xsl:text>, </xsl:text>
+          <xsl:value-of select="$secondary"/>
+        </xsl:if>
+        <xsl:if test="tertiary">
+          <xsl:text>, </xsl:text>
+          <xsl:value-of select="$tertiary"/>
+        </xsl:if>
+      </xsl:variable>
+      
+      <xsl:if test="secondary">
+        <xsl:if test="not(//indexterm[normalize-space(primary)=$primary and not(secondary)])">
+          <xsl:call-template name="write.indexterm">
+            <xsl:with-param name="text" select="$primary"/>
+          </xsl:call-template>
+        </xsl:if>
+      </xsl:if>
+      
+      <xsl:call-template name="write.indexterm">
+        <xsl:with-param name="text" select="$text"/>
+      </xsl:call-template>
+      
+    </xsl:when>
+    <xsl:otherwise>
+      <a>
+        <xsl:attribute name="name">
+          <xsl:call-template name="object.id"/>
+        </xsl:attribute>
+      </a>
+    </xsl:otherwise>
+    
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="write.indexterm">
+  <xsl:param name="text"/>
+  <OBJECT type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+    <param name="Keyword" value="{$text}"/>
+  </OBJECT>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template name="hhk">
+  <xsl:call-template name="write.text.chunk">
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.hhk"/>
+    </xsl:with-param>
+    <xsl:with-param name="method" select="'text'"/>
+    <xsl:with-param name="content"><xsl:text disable-output-escaping="yes">&lt;!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"&gt;
+&lt;HTML&gt;
+&lt;HEAD&gt;
+&lt;meta name="GENERATOR" content="Microsoft&amp;reg; HTML Help Workshop 4.1"&gt;
+&lt;!-- Sitemap 1.0 --&gt;
+&lt;/HEAD&gt;&lt;BODY&gt;
+&lt;OBJECT type="text/site properties"&gt;
+&lt;/OBJECT&gt;
+&lt;UL&gt;
+</xsl:text>
+<xsl:if test="($htmlhelp.use.hhk != 0) and $htmlhelp.generate.index">
+  <xsl:choose>
+    <xsl:when test="$rootid != ''">
+      <xsl:apply-templates select="key('id',$rootid)" mode="hhk"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates select="/" mode="hhk"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:if>
+<xsl:text disable-output-escaping="yes">&lt;/UL&gt;
+&lt;/BODY&gt;&lt;/HTML&gt;
+</xsl:text></xsl:with-param>
+    <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="indexterm[@class='endofrange']" mode="hhk"/>
+
+<xsl:template match="indexterm" mode="hhk">
+  <xsl:variable name="primary" select="normalize-space(primary)"/>
+  <xsl:variable name="secondary" select="normalize-space(secondary)"/>
+  <xsl:variable name="tertiary" select="normalize-space(tertiary)"/>
+
+  <xsl:call-template name="write.indexterm.hhk">
+    <xsl:with-param name="text" select="$primary"/>
+    <xsl:with-param name="seealso" select="seealso"/>
+  </xsl:call-template>
+
+  <xsl:if test="secondary">
+    <xsl:if test="not(//indexterm[normalize-space(primary)=$primary and not(secondary)])">
+      <xsl:call-template name="write.indexterm.hhk">
+        <!-- We must create fake entry when there is secondary without primary --> 
+        <xsl:with-param name="text" select="$primary"/>
+        <xsl:with-param name="seealso" select="$primary"/>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:text disable-output-escaping="yes">&lt;UL&gt;
+</xsl:text>
+    <xsl:call-template name="write.indexterm.hhk">
+      <xsl:with-param name="text" select="$secondary"/>
+      <xsl:with-param name="seealso" select="secondary/seealso"/>
+    </xsl:call-template>
+    <xsl:if test="tertiary">
+      <xsl:text disable-output-escaping="yes">&lt;UL&gt;
+</xsl:text>
+      <xsl:call-template name="write.indexterm.hhk">
+        <xsl:with-param name="text" select="$tertiary"/>
+        <xsl:with-param name="seealso" select="tertiary/seealso"/>
+      </xsl:call-template>
+      <xsl:text disable-output-escaping="yes">&lt;/UL&gt;
+</xsl:text>
+    </xsl:if>
+    <xsl:text disable-output-escaping="yes">&lt;/UL&gt;
+</xsl:text>
+  </xsl:if>
+
+</xsl:template>
+
+<xsl:template name="write.indexterm.hhk">
+  <xsl:param name="text"/>
+  <xsl:param name="seealso"/>
+  <xsl:variable name="text.escaped">
+    <xsl:call-template name="escape-attr">
+      <xsl:with-param name="value" select="$text"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:text disable-output-escaping="yes">&lt;LI&gt; &lt;OBJECT type="text/sitemap"&gt;
+    &lt;param name="Name" value="</xsl:text><xsl:value-of select="$text.escaped"/><xsl:text disable-output-escaping="yes">"&gt;</xsl:text>
+      <xsl:if test="not(seealso)">
+        <xsl:variable name="href">
+          <xsl:call-template name="href.target.with.base.dir"/>
+        </xsl:variable>
+        <xsl:variable name="title">
+          <xsl:call-template name="escape-attr">
+            <xsl:with-param name="value">
+              <xsl:call-template name="nearest.title">
+                <xsl:with-param name="object" select=".."/>
+              </xsl:call-template>
+            </xsl:with-param>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:text disable-output-escaping="yes">&lt;param name="Name" value="</xsl:text>
+          <xsl:value-of select="$title"/>
+        <xsl:text disable-output-escaping="yes">"&gt;</xsl:text>
+        <xsl:text disable-output-escaping="yes">&lt;param name="Local" value="</xsl:text>
+          <xsl:value-of select="$href"/>
+        <xsl:text disable-output-escaping="yes">"&gt;</xsl:text>
+      </xsl:if>
+      <xsl:if test="seealso">
+        <xsl:text disable-output-escaping="yes">&lt;param name="See Also" value="</xsl:text>
+          <xsl:value-of select="$seealso"/>
+        <xsl:text disable-output-escaping="yes">"&gt;</xsl:text>
+      </xsl:if>
+      <xsl:text disable-output-escaping="yes"> &lt;/OBJECT&gt;</xsl:text>
+</xsl:template>
+
+<xsl:template match="text()" mode="hhk"/>
+
+<xsl:template name="nearest.title">
+  <xsl:param name="object"/>
+  <xsl:apply-templates select="$object/ancestor-or-self::*[title][1]" mode="title.markup"/>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template name="hh-map">
+  <xsl:call-template name="write.text.chunk">
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.map.file"/>
+    </xsl:with-param>
+    <xsl:with-param name="method" select="'text'"/>
+    <xsl:with-param name="content">
+     <xsl:choose>
+       <xsl:when test="$rootid != ''">
+         <xsl:apply-templates select="key('id',$rootid)" mode="hh-map"/>
+       </xsl:when>
+       <xsl:otherwise>
+         <xsl:apply-templates select="/" mode="hh-map"/>
+       </xsl:otherwise>
+     </xsl:choose>
+    </xsl:with-param>
+    <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="processing-instruction('dbhh')" mode="hh-map">
+  <xsl:variable name="topicname">
+    <xsl:call-template name="pi-attribute">
+      <xsl:with-param name="pis" select="."/>
+      <xsl:with-param name="attribute" select="'topicname'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:variable name="topicid">
+    <xsl:call-template name="pi-attribute">
+      <xsl:with-param name="pis" select="."/>
+      <xsl:with-param name="attribute" select="'topicid'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:text>#define </xsl:text>
+  <xsl:value-of select="$topicname"/>
+  <xsl:text>	</xsl:text>
+  <xsl:value-of select="$topicid"/>
+  <xsl:text>
+</xsl:text>
+</xsl:template>
+
+<xsl:template match="text()" mode="hh-map"/>
+
+<!-- ==================================================================== -->
+
+<xsl:template name="hh-alias">
+  <xsl:call-template name="write.text.chunk">
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.alias.file"/>
+    </xsl:with-param>
+    <xsl:with-param name="method" select="'text'"/>
+    <xsl:with-param name="content">
+     <xsl:choose>
+       <xsl:when test="$rootid != ''">
+         <xsl:apply-templates select="key('id',$rootid)" mode="hh-alias"/>
+       </xsl:when>
+       <xsl:otherwise>
+         <xsl:apply-templates select="/" mode="hh-alias"/>
+       </xsl:otherwise>
+     </xsl:choose>
+    </xsl:with-param>
+    <xsl:with-param name="encoding" select="$htmlhelp.encoding"/>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="processing-instruction('dbhh')" mode="hh-alias">
+  <xsl:variable name="topicname">
+    <xsl:call-template name="pi-attribute">
+      <xsl:with-param name="pis" select="."/>
+      <xsl:with-param name="attribute" select="'topicname'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:variable name="href">
+    <xsl:call-template name="href.target.with.base.dir">
+      <xsl:with-param name="object" select=".."/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:value-of select="$topicname"/>
+  <xsl:text>=</xsl:text>
+  <!-- Some versions of HH doesn't like fragment identifires, but some does. -->
+  <!-- <xsl:value-of select="substring-before(concat($href, '#'), '#')"/> -->
+  <xsl:value-of select="$href"/>
+  <xsl:text>
+</xsl:text>
+</xsl:template>
+
+<xsl:template match="text()" mode="hh-alias"/>
+
+<!-- ==================================================================== -->
+<!-- This code can be used to convert any number to hexadecimal format -->
+
+  <h:hex>
+    <d>0</d>
+    <d>1</d>
+    <d>2</d>
+    <d>3</d>
+    <d>4</d>
+    <d>5</d>
+    <d>6</d>
+    <d>7</d>
+    <d>8</d>
+    <d>9</d>
+    <d>A</d>
+    <d>B</d>
+    <d>C</d>
+    <d>D</d>
+    <d>E</d>
+    <d>F</d>
+  </h:hex>
+
+  <xsl:template name="toHex">
+    <xsl:param name="n" select="0"/>
+    <xsl:param name="digit" select="$n mod 16"/>
+    <xsl:param name="rest" select="floor($n div 16)"/>
+    <xsl:if test="$rest &gt; 0">
+      <xsl:call-template name="toHex">
+        <xsl:with-param name="n" select="$rest"/>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:value-of select="document('')//h:hex/d[$digit+1]"/>
+  </xsl:template>
+
+<!-- ==================================================================== -->
+<!-- Template for escaping <, & and " in attribute values. 
+     We aren't using HTML output method, so we must do this job ourselves -->
+
+<xsl:template name="escape-attr">
+  <xsl:param name="value"/>
+
+  <xsl:variable name="amp.escaped">
+    <xsl:call-template name="string.subst">
+      <xsl:with-param name="string" select="$value"/>
+      <xsl:with-param name="target" select="'&amp;'"/>
+      <xsl:with-param name="replacement" select="'&amp;amp;'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="quot.escaped">
+    <xsl:call-template name="string.subst">
+      <xsl:with-param name="string" select="$amp.escaped"/>
+      <xsl:with-param name="target" select="'&#34;'"/>
+      <xsl:with-param name="replacement" select="'&amp;quot;'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="angle.escaped">
+    <xsl:call-template name="string.subst">
+      <xsl:with-param name="string" select="$quot.escaped"/>
+      <xsl:with-param name="target" select="'&lt;'"/>
+      <xsl:with-param name="replacement" select="'&amp;lt;'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:value-of select="$angle.escaped"/>
+
+</xsl:template>
+
+<!-- ==================================================================== -->
+<!-- Modification to standard HTML stylesheets -->
+
+<!-- There are links from ToC pane to bibliodivs, so there must be anchor -->
+<xsl:template match="bibliodiv/title">
+  <h3 class="{name(.)}">
+    <xsl:call-template name="anchor">
+      <xsl:with-param name="node" select=".."/>
+      <xsl:with-param name="conditional" select="0"/>
+    </xsl:call-template>
+    <xsl:apply-templates/>
+  </h3>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/doc/reference/styles/profile-htmlhelp.xsl b/doc/reference/styles/profile-htmlhelp.xsl
new file mode 100644
index 00000000..3d245370
--- /dev/null
+++ b/doc/reference/styles/profile-htmlhelp.xsl
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+                xmlns:exsl="http://exslt.org/common"
+                xmlns:set="http://exslt.org/sets"
+		version="1.0"
+                exclude-result-prefixes="doc exsl set">
+
+<!-- ********************************************************************
+     $Id: profile-htmlhelp.xsl,v 1.1 2005/08/28 03:49:20 markpollack Exp $
+     ******************************************************************** 
+
+     This file is used by htmlhelp.xsl if you want to generate source
+     files for HTML Help.  It is based on the XSL DocBook Stylesheet
+     distribution (especially on JavaHelp code) from Norman Walsh.
+
+     ******************************************************************** -->
+
+<xsl:import href="../html/chunk.xsl"/>
+<xsl:include href="profile-htmlhelp-common.xsl"/>
+
+</xsl:stylesheet>
diff --git a/doc/reference/styles/tld.to.docbook.xsl b/doc/reference/styles/tld.to.docbook.xsl
new file mode 100644
index 00000000..139a3529
--- /dev/null
+++ b/doc/reference/styles/tld.to.docbook.xsl
@@ -0,0 +1,245 @@
+<?xml version="1.0"?>
+<!--
+   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.
+-->
+
+<!--
+   Effects the transformation of taglib XML to DocBook XML.
+
+   Author: Rick Evans (based on Tim 'katentim' Nolan's original stylesheet)
+-->
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xalan="http://xml.apache.org/xalan">
+
+    <xsl:output
+            method="xml"
+            indent="yes"
+            xalan:indent-amount="3"
+            omit-xml-declaration="no"/>
+
+    <xsl:param name="title"/>
+
+    <xsl:template match="taglib">
+        <xsl:element name="appendix">
+            <xsl:attribute name="id">
+                <xsl:value-of select="$title"/>
+            </xsl:attribute>
+            <xsl:element name="title"><xsl:value-of select="$title"/></xsl:element>
+
+            <xsl:element name="section">
+                <xsl:attribute name="id">
+                    <xsl:value-of select="$title"/>
+                    <xsl:text>-intro</xsl:text>
+                </xsl:attribute>
+                <xsl:element name="title"><xsl:text>Introduction</xsl:text></xsl:element>
+            </xsl:element>
+
+            <xsl:element name="para">
+                <xsl:text>One of the view technologies you can use with the Spring Framework
+			    is Java Server Pages (JSPs). To help you implement views using Java Server Pages
+			    the Spring Framework provides you with some tags for evaluating errors, setting
+			    themes and outputting internationalized messages.</xsl:text>
+            </xsl:element>
+
+            <xsl:element name="para">
+                <xsl:text>This appendix describes the </xsl:text>
+                <xsl:element name="literal">
+                    <xsl:value-of select="$title"/>
+                </xsl:element>
+                <xsl:text> tag library.</xsl:text>
+            </xsl:element>
+
+            <xsl:element name="itemizedlist">
+                <xsl:apply-templates select="tag" mode="mini-toc">
+                    <xsl:sort select="name" order="ascending"/>
+                </xsl:apply-templates>
+            </xsl:element>
+            <xsl:apply-templates select="tag">
+                <xsl:sort select="name" order="ascending"/>
+            </xsl:apply-templates>
+        </xsl:element>
+    </xsl:template>
+
+    <xsl:template match="tag" mode="mini-toc">
+        <xsl:element name="listitem">
+            <xsl:element name="xref">
+                <xsl:attribute name="linkend">
+                    <xsl:call-template name="generate.id">
+                        <xsl:with-param name="id">
+                            <xsl:value-of select="./name"/>
+                        </xsl:with-param>
+                    </xsl:call-template>
+                </xsl:attribute>
+            </xsl:element>
+        </xsl:element>
+    </xsl:template>
+
+    <xsl:template match="tag">
+        <xsl:element name="section">
+            <xsl:attribute name="id">
+                <xsl:call-template name="generate.id">
+                    <xsl:with-param name="id">
+                        <xsl:value-of select="./name"/>
+                    </xsl:with-param>
+                </xsl:call-template>
+            </xsl:attribute>
+            <xsl:element name="title">
+                <xsl:text>The </xsl:text>
+                <xsl:element name="literal">
+                    <xsl:value-of select="./name"/>
+                </xsl:element>
+                <xsl:text> tag</xsl:text>
+            </xsl:element>
+            <xsl:element name="para">
+                <xsl:value-of select="./description"/>
+            </xsl:element>
+            <xsl:element name="table">
+                <xsl:attribute name="id">
+                    <xsl:call-template name="generate.id">
+                        <xsl:with-param name="id">
+                            <xsl:value-of select="./name"/>
+                        </xsl:with-param>
+                    </xsl:call-template>
+                    <xsl:text>.table</xsl:text>
+                </xsl:attribute>
+                <xsl:element name="title">
+                    <xsl:text>Attributes</xsl:text>
+                </xsl:element>
+                <xsl:element name="tgroup">
+                    <xsl:attribute name="cols">
+                        <xsl:text>3</xsl:text>
+                    </xsl:attribute>
+                    <xsl:element name="spanspec">
+                        <xsl:attribute name="spanname">
+                            <xsl:text>description.span</xsl:text>
+                        </xsl:attribute>
+                        <xsl:attribute name="namest">
+                            <xsl:text>Attribute</xsl:text>
+                        </xsl:attribute>
+                        <xsl:attribute name="nameend">
+                            <xsl:text>Runtime.Expression</xsl:text>
+                        </xsl:attribute>
+                        <xsl:attribute name="align">
+                            <xsl:text>left</xsl:text>
+                        </xsl:attribute>
+                    </xsl:element>
+                    <xsl:element name="colspec">
+                        <xsl:attribute name="align">
+                            <xsl:text>center</xsl:text>
+                        </xsl:attribute>
+                        <xsl:attribute name="colname">
+                            <xsl:text>Attribute</xsl:text>
+                        </xsl:attribute>
+                    </xsl:element>
+                    <xsl:element name="colspec">
+                        <xsl:attribute name="align">
+                            <xsl:text>center</xsl:text>
+                        </xsl:attribute>
+                        <xsl:attribute name="colname">
+                            <xsl:text>Required</xsl:text>
+                        </xsl:attribute>
+                    </xsl:element>
+                    <xsl:element name="colspec">
+                        <xsl:attribute name="align">
+                            <xsl:text>center</xsl:text>
+                        </xsl:attribute>
+                        <xsl:attribute name="colname">
+                            <xsl:text>Runtime.Expression</xsl:text>
+                        </xsl:attribute>
+                    </xsl:element>
+
+                    <xsl:element name="thead">
+                        <xsl:element name="row">
+                            <xsl:element name="entry">
+                                <xsl:attribute name="align">
+                                    <xsl:text>center</xsl:text>
+                                </xsl:attribute>
+                                <xsl:text>Attribute</xsl:text>
+                            </xsl:element>
+                            <xsl:element name="entry">
+                                <xsl:attribute name="align">
+                                    <xsl:text>center</xsl:text>
+                                </xsl:attribute>
+                                <xsl:text>Required?</xsl:text>
+                            </xsl:element>
+                            <xsl:element name="entry">
+                                <xsl:attribute name="align">
+                                    <xsl:text>center</xsl:text>
+                                </xsl:attribute>
+                                <xsl:text>Runtime Expression?</xsl:text>
+                            </xsl:element>
+                        </xsl:element>
+
+                    </xsl:element>
+                    <xsl:element name="tbody">
+                        <xsl:apply-templates select="attribute">
+                            <xsl:sort select="name" order="ascending"/>
+                        </xsl:apply-templates>
+                    </xsl:element>
+                </xsl:element>
+            </xsl:element>
+        </xsl:element>
+    </xsl:template>
+
+    <xsl:template match="attribute">
+        <xsl:element name="row">
+            <xsl:element name="entry">
+                <xsl:element name="para">
+                    <xsl:value-of select="name"/>
+                </xsl:element>
+            </xsl:element>
+            <xsl:element name="entry">
+                <xsl:element name="para">
+                    <xsl:value-of select="required"/>
+                </xsl:element>
+            </xsl:element>
+            <xsl:element name="entry">
+                <xsl:element name="para">
+                    <xsl:value-of select="rtexprvalue"/>
+                </xsl:element>
+            </xsl:element>
+        </xsl:element>
+        <xsl:element name="row">
+            <xsl:element name="entry">
+                <xsl:attribute name="spanname">
+                    <xsl:text>description.span</xsl:text>
+                </xsl:attribute>
+                <xsl:element name="para">
+                    <xsl:value-of select="description"/>
+                </xsl:element>
+            </xsl:element>
+        </xsl:element>
+    </xsl:template>
+
+    <xsl:template match="attribute/description">
+        <xsl:element name="row">
+            <xsl:element name="entry">
+                <xsl:attribute name="spanname">
+                    <xsl:text>description.span</xsl:text>
+                </xsl:attribute>
+                <xsl:element name="para">
+                    <xsl:value-of select="description"/>
+                </xsl:element>
+            </xsl:element>
+        </xsl:element>
+    </xsl:template>
+
+    <xsl:template name="generate.id">
+        <xsl:param name="id"/>
+        <xsl:value-of select="$title"/>.<xsl:value-of select="$id"/>
+    </xsl:template>
+    
+</xsl:stylesheet>
diff --git a/doc/reference/styles/xsd.to.docbook.xsl b/doc/reference/styles/xsd.to.docbook.xsl
new file mode 100644
index 00000000..4a9bb86d
--- /dev/null
+++ b/doc/reference/styles/xsd.to.docbook.xsl
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<!--
+   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.
+-->
+
+<!--
+   Effects the transformation of the various Spring schema definitions to DocBook XML.
+
+   Author: Rick Evans
+-->
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                xmlns:xalan="http://xml.apache.org/xalan">
+
+    <xsl:output
+            method="xml"
+            indent="yes"
+            xalan:indent-amount="3"
+            omit-xml-declaration="no"/>
+
+    <xsl:param name="title"/>
+
+    <xsl:template match="xsd:schema">
+        <xsl:element name="appendix">
+            <xsl:attribute name="id">
+                <xsl:value-of select="$title"/>
+            </xsl:attribute>
+            <xsl:element name="title">
+                <xsl:element name="literal">
+                    <xsl:value-of select="$title"/>
+                </xsl:element>
+            </xsl:element>
+
+            <xsl:element name="section">
+                <xsl:attribute name="id">
+                    <xsl:value-of select="$title"/>
+                    <xsl:text>-intro</xsl:text>
+                </xsl:attribute>
+                <xsl:element name="title">
+                    <xsl:text>Introduction</xsl:text>
+                </xsl:element>
+            </xsl:element>
+
+            <xsl:element name="para">
+                <xsl:text>This appendix describes the </xsl:text>
+                <xsl:element name="literal">
+                    <xsl:value-of select="$title"/>
+                </xsl:element>
+                <xsl:text> schema.</xsl:text>
+            </xsl:element>
+
+            <xsl:element name="itemizedlist">
+                <xsl:apply-templates select="xsd:element" mode="mini-toc">
+                    <xsl:sort select="name" order="ascending"/>
+                </xsl:apply-templates>
+            </xsl:element>
+
+            <xsl:apply-templates select="xsd:element">
+                <xsl:sort select="name" order="ascending"/>
+            </xsl:apply-templates>
+
+        </xsl:element>
+    </xsl:template>
+
+    <!--
+    creates the elements of an <itemizedlist/> containing (hyper)links
+    to the actual content
+    -->
+    <xsl:template match="xsd:element" mode="mini-toc">
+        <xsl:element name="listitem">
+            <xsl:element name="xref">
+                <xsl:attribute name="linkend">
+                    <xsl:call-template name="generate.id">
+                        <xsl:with-param name="id">
+                            <xsl:value-of select="@name"/>
+                        </xsl:with-param>
+                    </xsl:call-template>
+                </xsl:attribute>
+            </xsl:element>
+        </xsl:element>
+    </xsl:template>
+
+    <xsl:template match="xsd:element">
+        <xsl:element name="section">
+            <xsl:attribute name="id">
+                <xsl:call-template name="generate.id">
+                    <xsl:with-param name="id">
+                        <xsl:value-of select="@name"/>
+                    </xsl:with-param>
+                </xsl:call-template>
+            </xsl:attribute>
+            <xsl:element name="title">
+                <xsl:text>The </xsl:text>
+                <xsl:element name="literal">
+                    <xsl:value-of select="@name"/>
+                </xsl:element>
+                <xsl:text> element</xsl:text>
+            </xsl:element>
+            <xsl:element name="para">
+                <xsl:text>[TODO : insert the description of the element here]</xsl:text>
+            </xsl:element>
+        </xsl:element>
+    </xsl:template>
+
+    <xsl:template name="generate.id">
+        <xsl:param name="id"/>
+        <xsl:value-of select="$title"/>.<xsl:value-of select="$id"/>
+    </xsl:template>
+
+</xsl:stylesheet>
diff --git a/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.2003.sln b/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.2003.sln
new file mode 100644
index 00000000..8528e9fd
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.2003.sln
@@ -0,0 +1,80 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Common.2003", "src\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2003.csproj", "{C707543A-8F0E-4483-AECC-BC6EE14C3A29}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step1.2003", "src\Spring.AopQuickStart.Step1\Spring.AopQuickStart.Step1.2003.csproj", "{72D32026-23F5-4C62-8E6C-BFB30210BFD3}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step2.2003", "src\Spring.AopQuickStart.Step2\Spring.AopQuickStart.Step2.2003.csproj", "{202672D3-F523-4C62-8E6C-BFB30210BFD3}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step3.2003", "src\Spring.AopQuickStart.Step3\Spring.AopQuickStart.Step3.2003.csproj", "{BFB30210-4C62-F523-8E6C-202672D3BFD3}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step4.2003", "src\Spring.AopQuickStart.Step4\Spring.AopQuickStart.Step4.2003.csproj", "{672D3BFD-4C62-F523-8E6C-20BFB3021023}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step5.2003", "src\Spring.AopQuickStart.Step5\Spring.AopQuickStart.Step5.2003.csproj", "{F5233BFD-8E6C-FB30-4C62-20BFB3021023}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step6.2003", "src\Spring.AopQuickStart.Step6\Spring.AopQuickStart.Step6.2003.csproj", "{8E620210-4D33-F523-BF6C-202672CBBFD3}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step7.2003", "src\Spring.AopQuickStart.Step7\Spring.AopQuickStart.Step7.2003.csproj", "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Debug.ActiveCfg = Debug|.NET
+		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Debug.Build.0 = Debug|.NET
+		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Release.ActiveCfg = Release|.NET
+		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Release.Build.0 = Release|.NET
+		{72D32026-23F5-4C62-8E6C-BFB30210BFD3}.Debug.ActiveCfg = Debug|.NET
+		{72D32026-23F5-4C62-8E6C-BFB30210BFD3}.Debug.Build.0 = Debug|.NET
+		{72D32026-23F5-4C62-8E6C-BFB30210BFD3}.Release.ActiveCfg = Release|.NET
+		{72D32026-23F5-4C62-8E6C-BFB30210BFD3}.Release.Build.0 = Release|.NET
+		{202672D3-F523-4C62-8E6C-BFB30210BFD3}.Debug.ActiveCfg = Debug|.NET
+		{202672D3-F523-4C62-8E6C-BFB30210BFD3}.Debug.Build.0 = Debug|.NET
+		{202672D3-F523-4C62-8E6C-BFB30210BFD3}.Release.ActiveCfg = Release|.NET
+		{202672D3-F523-4C62-8E6C-BFB30210BFD3}.Release.Build.0 = Release|.NET
+		{BFB30210-4C62-F523-8E6C-202672D3BFD3}.Debug.ActiveCfg = Debug|.NET
+		{BFB30210-4C62-F523-8E6C-202672D3BFD3}.Debug.Build.0 = Debug|.NET
+		{BFB30210-4C62-F523-8E6C-202672D3BFD3}.Release.ActiveCfg = Release|.NET
+		{BFB30210-4C62-F523-8E6C-202672D3BFD3}.Release.Build.0 = Release|.NET
+		{672D3BFD-4C62-F523-8E6C-20BFB3021023}.Debug.ActiveCfg = Debug|.NET
+		{672D3BFD-4C62-F523-8E6C-20BFB3021023}.Debug.Build.0 = Debug|.NET
+		{672D3BFD-4C62-F523-8E6C-20BFB3021023}.Release.ActiveCfg = Release|.NET
+		{672D3BFD-4C62-F523-8E6C-20BFB3021023}.Release.Build.0 = Release|.NET
+		{F5233BFD-8E6C-FB30-4C62-20BFB3021023}.Debug.ActiveCfg = Debug|.NET
+		{F5233BFD-8E6C-FB30-4C62-20BFB3021023}.Debug.Build.0 = Debug|.NET
+		{F5233BFD-8E6C-FB30-4C62-20BFB3021023}.Release.ActiveCfg = Release|.NET
+		{F5233BFD-8E6C-FB30-4C62-20BFB3021023}.Release.Build.0 = Release|.NET
+		{8E620210-4D33-F523-BF6C-202672CBBFD3}.Debug.ActiveCfg = Debug|.NET
+		{8E620210-4D33-F523-BF6C-202672CBBFD3}.Debug.Build.0 = Debug|.NET
+		{8E620210-4D33-F523-BF6C-202672CBBFD3}.Release.ActiveCfg = Release|.NET
+		{8E620210-4D33-F523-BF6C-202672CBBFD3}.Release.Build.0 = Release|.NET
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug.ActiveCfg = Debug|.NET
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Debug.Build.0 = Debug|.NET
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release.ActiveCfg = Release|.NET
+		{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}.Release.Build.0 = Release|.NET
+	EndGlobalSection
+	GlobalSection(SolutionItems) = postSolution
+		readme.txt = readme.txt
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.2005.sln b/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.2005.sln
new file mode 100644
index 00000000..9e053726
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.2005.sln
@@ -0,0 +1,66 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Common.2005", "src\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2005.csproj", "{C707543A-8F0E-4483-AECC-BC6EE14C3A29}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step1.2005", "src\Spring.AopQuickStart.Step1\Spring.AopQuickStart.Step1.2005.csproj", "{1B3559A0-5274-4968-A628-77F036984F02}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step2.2005", "src\Spring.AopQuickStart.Step2\Spring.AopQuickStart.Step2.2005.csproj", "{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step3.2005", "src\Spring.AopQuickStart.Step3\Spring.AopQuickStart.Step3.2005.csproj", "{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step4.2005", "src\Spring.AopQuickStart.Step4\Spring.AopQuickStart.Step4.2005.csproj", "{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step5.2005", "src\Spring.AopQuickStart.Step5\Spring.AopQuickStart.Step5.2005.csproj", "{61086108-3EB7-4ACE-B4B6-B4B60AB76108}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step6.2005", "src\Spring.AopQuickStart.Step6\Spring.AopQuickStart.Step6.2005.csproj", "{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.AopQuickStart.Step7.2005", "src\Spring.AopQuickStart.Step7\Spring.AopQuickStart.Step7.2005.csproj", "{0077A8CA-4C09-42B1-B227-91095CE4CCA2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{919AF8FE-423F-4A8C-BDA4-CB8B39D64780}"
+	ProjectSection(SolutionItems) = preProject
+		readme.txt = readme.txt
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C707543A-8F0E-4483-AECC-BC6EE14C3A29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B3559A0-5274-4968-A628-77F036984F02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B3559A0-5274-4968-A628-77F036984F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B3559A0-5274-4968-A628-77F036984F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B3559A0-5274-4968-A628-77F036984F02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61086108-3EB7-4ACE-B4B6-B4B60AB76108}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0077A8CA-4C09-42B1-B227-91095CE4CCA2}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.build b/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.build
new file mode 100644
index 00000000..41200407
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/Spring.AopQuickStart.build
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<project name="Spring.AopQuickStart" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+
+  <target name="build">
+    <nant buildfile="src\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.build" target="build" />
+    <nant buildfile="src\Spring.AopQuickStart.Step1\Spring.AopQuickStart.Step1.build" target="build"/>
+    <nant buildfile="src\Spring.AopQuickStart.Step2\Spring.AopQuickStart.Step2.build" target="build" />
+    <nant buildfile="src\Spring.AopQuickStart.Step3\Spring.AopQuickStart.Step3.build" target="build" />
+    <nant buildfile="src\Spring.AopQuickStart.Step4\Spring.AopQuickStart.Step4.build" target="build" />
+    <nant buildfile="src\Spring.AopQuickStart.Step5\Spring.AopQuickStart.Step5.build" target="build" />
+    <nant buildfile="src\Spring.AopQuickStart.Step6\Spring.AopQuickStart.Step6.build" target="build" />
+    <nant buildfile="src\Spring.AopQuickStart.Step7\Spring.AopQuickStart.Step7.build" target="build" />
+  </target>
+
+</project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/readme.txt b/examples/Spring/Spring.AopQuickStart/readme.txt
new file mode 100644
index 00000000..d5516cc7
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/readme.txt
@@ -0,0 +1,20 @@
+Step1 :
+Use Spring.Aop programmatically
+
+Step2 :
+Use Spring.Aop within IoC container
+
+Step3 :
+Use Spring.NET convenience pointcuts (Match by method name)
+
+Step4 :
+Use Spring.NET convenience pointcuts (Match by attribute)
+
+Step5 :
+Create and use custom pointcuts
+
+Step6 :
+Use Introductions (mixins)
+
+Step7 :
+Use AutoProxy functionality
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Aspects/ConsoleLoggingAfterAdvice.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Aspects/ConsoleLoggingAfterAdvice.cs
new file mode 100644
index 00000000..57dee8f0
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Aspects/ConsoleLoggingAfterAdvice.cs
@@ -0,0 +1,56 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using Spring.Aop;
+
+#endregion
+
+namespace Spring.AopQuickStart.Aspects
+{
+    /// <summary>
+    /// Simple implementation of the <see cref="Spring.Aop.IAfterReturningAdvice"/> interface 
+    /// for a logging aspect using <see cref="System.Console"/>.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ConsoleLoggingAfterAdvice.cs,v 1.1 2006/11/26 18:57:59 bbaia Exp $</version>
+    public class ConsoleLoggingAfterAdvice : IAfterReturningAdvice
+    {
+        public void AfterReturning(
+            object returnValue, MethodInfo method, object[] args, object target)
+        {
+            Console.Out.WriteLine("This method call returned successfully : " + method.Name);
+            Console.Out.WriteLine("    The target was      : " + target);
+            Console.Out.WriteLine("    The arguments were  : ");
+            if (args != null)
+            {
+                foreach (object arg in args)
+                {
+                    Console.Out.WriteLine("\t: " + arg);
+                }
+            }
+            Console.Out.WriteLine("    The return value is : " + returnValue);
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Aspects/ConsoleLoggingAroundAdvice.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Aspects/ConsoleLoggingAroundAdvice.cs
new file mode 100644
index 00000000..61328076
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Aspects/ConsoleLoggingAroundAdvice.cs
@@ -0,0 +1,52 @@
+#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
+
+#region Imports
+
+using System;
+
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.AopQuickStart.Aspects
+{
+    /// <summary>
+    /// Simple implementation of the <see cref="AopAlliance.Intercept.IMethodInterceptor"/> interface 
+    /// for a logging aspect using <see cref="System.Console"/>.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ConsoleLoggingAroundAdvice.cs,v 1.2 2006/12/03 23:56:17 bbaia Exp $</version>
+	public class ConsoleLoggingAroundAdvice : IMethodInterceptor
+	{
+		public object Invoke(IMethodInvocation invocation)
+		{
+            Console.Out.WriteLine(String.Format(
+                "Intercepted call : about to invoke method '{0}'", invocation.Method.Name));
+
+			object returnValue = invocation.Proceed();
+
+			Console.Out.WriteLine(String.Format(
+                "Intercepted call : returned '{0}'", returnValue));
+
+			return returnValue;
+		}
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Aspects/ConsoleLoggingBeforeAdvice.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Aspects/ConsoleLoggingBeforeAdvice.cs
new file mode 100644
index 00000000..dd33a9fe
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Aspects/ConsoleLoggingBeforeAdvice.cs
@@ -0,0 +1,54 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using Spring.Aop;
+
+#endregion
+
+namespace Spring.AopQuickStart.Aspects
+{
+    /// <summary>
+    /// Simple implementation of the <see cref="Spring.Aop.IMethodBeforeAdvice"/> interface 
+    /// for a logging aspect using <see cref="System.Console"/>.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ConsoleLoggingBeforeAdvice.cs,v 1.1 2006/11/26 18:57:59 bbaia Exp $</version>
+	public class ConsoleLoggingBeforeAdvice : IMethodBeforeAdvice
+	{
+		public void Before(MethodInfo method, object[] args, object target)
+		{
+			Console.Out.WriteLine("Intercepted call to this method : " + method.Name);
+			Console.Out.WriteLine("    The target is       : " + target);
+			Console.Out.WriteLine("    The arguments are   : ");
+			if(args != null)
+			{
+				foreach (object arg in args)
+				{
+					Console.Out.WriteLine("\t: " + arg);
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Aspects/ConsoleLoggingThrowsAdvice.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Aspects/ConsoleLoggingThrowsAdvice.cs
new file mode 100644
index 00000000..74055284
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Aspects/ConsoleLoggingThrowsAdvice.cs
@@ -0,0 +1,46 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using Spring.Aop;
+
+#endregion
+
+namespace Spring.AopQuickStart.Aspects
+{
+    /// <summary>
+    /// Simple implementation of the <see cref="Spring.Aop.IThrowsAdvice"/> interface 
+    /// for a logging aspect using <see cref="System.Console"/>.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ConsoleLoggingThrowsAdvice.cs,v 1.2 2006/12/02 13:30:00 bbaia Exp $</version>
+    public class ConsoleLoggingThrowsAdvice : IThrowsAdvice
+    {
+        public void AfterThrowing(Exception ex)
+        {
+            Console.Error.WriteLine(
+                String.Format("Advised method threw this exception : {0}", ex.Message));
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Commands/ICommand.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Commands/ICommand.cs
new file mode 100644
index 00000000..d876f01a
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Commands/ICommand.cs
@@ -0,0 +1,49 @@
+#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
+
+#region Imports
+
+
+#endregion
+
+namespace Spring.AopQuickStart.Commands
+{
+	/// <summary>
+	/// A simple interface for Command pattern style usage.
+    /// </summary>
+	/// <remarks>
+	/// <p>
+	/// Does not strictly adhere to the common conventions of the
+	/// Command patten, due to the fact that the remit of this interface
+	/// (and of it's attendant implementations) is to serve as the
+	/// basis for illustrating AOP advice.
+	/// </p>
+	/// </remarks>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ICommand.cs,v 1.1 2006/11/26 18:58:00 bbaia Exp $</version>
+	public interface ICommand 
+    {
+        bool IsUndoCapable { get; }
+
+		void Execute();
+
+        void UnExecute();
+	}
+}
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Commands/ServiceCommand.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Commands/ServiceCommand.cs
new file mode 100644
index 00000000..cfab060d
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Commands/ServiceCommand.cs
@@ -0,0 +1,59 @@
+#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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.AopQuickStart.Commands
+{
+    /// <summary>
+    /// Simple implementation of the
+    /// <see cref="Spring.AopQuickStart.Commands.ICommand"/> interface.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ServiceCommand.cs,v 1.3 2007/02/06 17:40:52 aseovic Exp $</version>
+    public class ServiceCommand : ICommand
+    {
+        #region ICommand Members
+
+        public bool IsUndoCapable
+        {
+            get { return true; }
+        }
+
+        public void Execute()
+        {
+            Console.Out.WriteLine("--- ServiceCommand implementation : Execute()... ---");
+        }
+
+        public void UnExecute()
+        {
+            Console.Out.WriteLine("--- ServiceCommand implementation : UnExecute()... ---");
+
+            // Uncomment to see IThrowAdvice implementation in action
+            //throw new Exception("The method or operation is not supported.");
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2003.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2003.csproj
new file mode 100644
index 00000000..8829a55e
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2003.csproj
@@ -0,0 +1,120 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{C707543A-8F0E-4483-AECC-BC6EE14C3A29}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.AopQuickStart.Common"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.AopQuickStart"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = "Spring.Examples.AopQuickStart.Application"
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Aop.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "Aspects\ConsoleLoggingAfterAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\ConsoleLoggingAroundAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\ConsoleLoggingBeforeAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\ConsoleLoggingThrowsAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Commands\ICommand.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Commands\ServiceCommand.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2005.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2005.csproj
new file mode 100644
index 00000000..fb49b0ee
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.2005.csproj
@@ -0,0 +1,104 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.AopQuickStart.Common</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Aspects\ConsoleLoggingAroundAdvice.cs" />
+    <Compile Include="Aspects\ConsoleLoggingBeforeAdvice.cs" />
+    <Compile Include="Aspects\ConsoleLoggingAfterAdvice.cs" />
+    <Compile Include="Aspects\ConsoleLoggingThrowsAdvice.cs" />
+    <Compile Include="Commands\ICommand.cs" />
+    <Compile Include="Commands\ServiceCommand.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.build b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.build
new file mode 100644
index 00000000..6013e06a
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Common/Spring.AopQuickStart.Common.build
@@ -0,0 +1,29 @@
+<?xml version="1.0" ?>
+<project name="Spring.AopQuickStart.Common" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+  <!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+  -->
+
+  <target name="build">
+    <csc target="library" 
+         define="${current.build.defines.csc}" 
+         warnaserror="true" 
+         debug="${current.build.debug}" 
+         output="${current.bin.dir}/${project::get-name()}.dll">
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+      </sources>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+      <references basedir="${current.bin.dir}">
+        <include name="Spring.Core.dll" />
+        <include name="Spring.Aop.dll" />
+      </references>
+    </csc>
+  </target>
+
+</project>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Program.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Program.cs
new file mode 100644
index 00000000..37e49539
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Program.cs
@@ -0,0 +1,73 @@
+#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
+
+#region Imports
+
+using System;
+
+using Spring.Aop.Framework;
+
+using Spring.AopQuickStart.Aspects;
+using Spring.AopQuickStart.Commands;
+
+#endregion
+
+namespace Spring.AopQuickStart
+{
+    /// <summary>
+    /// A simple application that demonstrates the AOP functionality of Spring.NET.
+    /// </summary>
+    /// <version>$Id: Program.cs,v 1.2 2006/12/02 13:30:00 bbaia Exp $</version>
+    public class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        public static void Main(string[] args)
+        {
+            try
+            {
+                // Create AOP proxy programmatically.
+                ProxyFactory factory = new ProxyFactory(new ServiceCommand());
+                factory.AddAdvice(new ConsoleLoggingBeforeAdvice());
+                factory.AddAdvice(new ConsoleLoggingAfterAdvice());
+                factory.AddAdvice(new ConsoleLoggingThrowsAdvice());
+                ICommand command = (ICommand)factory.GetProxy();
+
+                command.Execute();
+                if (command.IsUndoCapable)
+                {
+                    command.UnExecute();
+                }
+            }
+            catch (Exception ex)
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine(ex);
+            }
+            finally
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine("--- hit <return> to quit ---");
+                Console.ReadLine();
+            }
+        }
+    }
+}
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2003.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2003.csproj
new file mode 100644
index 00000000..d3dd6b46
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2003.csproj
@@ -0,0 +1,100 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{72D32026-23F5-4C62-8E6C-BFB30210BFD3}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.AopQuickStart.Step1"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.AopQuickStart"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = "Spring.AopQuickStart.Program"
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "Spring.AopQuickStart.Common.2003"
+                    Project = "{C707543A-8F0E-4483-AECC-BC6EE14C3A29}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Aop.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "Program.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2005.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2005.csproj
new file mode 100644
index 00000000..6b496048
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.2005.csproj
@@ -0,0 +1,59 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{1B3559A0-5274-4968-A628-77F036984F02}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <AssemblyName>Spring.AopQuickStart.Step1</AssemblyName>
+    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2005.csproj">
+      <Project>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</Project>
+      <Name>Spring.AopQuickStart.Common.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.build b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.build
new file mode 100644
index 00000000..e1475775
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step1/Spring.AopQuickStart.Step1.build
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<project name="Spring.AopQuickStart.Step1" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+  <!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+
+  <target name="build">
+    <csc target="exe" 
+         define="${current.build.defines.csc}" 
+         warnaserror="true"
+         debug="${current.build.debug}" 
+         output="${current.bin.dir}/${project::get-name()}.exe">
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+      </sources>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+      <references basedir="${current.bin.dir}">
+        <include name="Spring.AopQuickStart.Common.dll" />
+        <include name="Spring.Core.dll" />
+        <include name="Spring.Aop.dll" />
+      </references>
+    </csc>
+  </target>
+  
+</project>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/App.config b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/App.config
new file mode 100644
index 00000000..3f53fd8a
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/App.config
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<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" />
+    </sectionGroup>
+  </configSections>
+
+  <spring>
+    
+    <context>
+      <resource uri="config://spring/objects" />
+    </context>
+
+    <objects xmlns="http://www.springframework.net">
+      <description>An example that demonstrates simple AOP functionality.</description>
+
+      <object id="aroundAdvice" 
+              type="Spring.AopQuickStart.Aspects.ConsoleLoggingAroundAdvice, Spring.AopQuickStart.Common" />
+      <object id="throwsAdvice" 
+              type="Spring.AopQuickStart.Aspects.ConsoleLoggingThrowsAdvice, Spring.AopQuickStart.Common" />
+
+      <object id="myServiceCommand" type="Spring.Aop.Framework.ProxyFactoryObject">
+        <property name="Target">
+          <object type="Spring.AopQuickStart.Commands.ServiceCommand, Spring.AopQuickStart.Common" />
+        </property>
+        <property name="InterceptorNames">
+          <list>
+            <value>aroundAdvice</value>
+            <value>throwsAdvice</value>
+          </list>
+        </property>
+      </object>
+
+    </objects>
+    
+  </spring>
+  
+</configuration>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Program.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Program.cs
new file mode 100644
index 00000000..77e3ed77
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Program.cs
@@ -0,0 +1,70 @@
+#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
+
+#region Imports
+
+using System;
+
+using Spring.Context;
+using Spring.Context.Support;
+
+using Spring.AopQuickStart.Commands;
+
+#endregion
+
+namespace Spring.AopQuickStart
+{
+    /// <summary>
+    /// A simple application that demonstrates the AOP functionality of Spring.NET.
+    /// </summary>
+    /// <version>$Id: Program.cs,v 1.2 2006/12/02 13:30:00 bbaia Exp $</version>
+    public class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        public static void Main(string[] args)
+        {
+            try
+            {
+                // Create AOP proxy using Spring.NET IoC container.
+                IApplicationContext ctx = ContextRegistry.GetContext();
+                ICommand command = (ICommand)ctx["myServiceCommand"];
+
+                command.Execute();
+                if (command.IsUndoCapable)
+                {
+                    command.UnExecute();
+                }
+            }
+            catch (Exception ex)
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine(ex);
+            }
+            finally
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine("--- hit <return> to quit ---");
+                Console.ReadLine();
+            }
+        }
+    }
+}
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2003.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2003.csproj
new file mode 100644
index 00000000..03438e1d
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2003.csproj
@@ -0,0 +1,104 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{202672D3-F523-4C62-8E6C-BFB30210BFD3}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.AopQuickStart.Step2"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.AopQuickStart"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = "Spring.AopQuickStart.Program"
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "Spring.AopQuickStart.Common.2003"
+                    Project = "{C707543A-8F0E-4483-AECC-BC6EE14C3A29}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Aop.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Program.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2005.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2005.csproj
new file mode 100644
index 00000000..0f7903fc
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.2005.csproj
@@ -0,0 +1,62 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4ACE3EB7-B60A-4ACE-B4BB-2C33494D6108}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <AssemblyName>Spring.AopQuickStart.Step2</AssemblyName>
+    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2005.csproj">
+      <Project>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</Project>
+      <Name>Spring.AopQuickStart.Common.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.build b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.build
new file mode 100644
index 00000000..fd3f2e20
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step2/Spring.AopQuickStart.Step2.build
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<project name="Spring.AopQuickStart.Step2" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+  <!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+
+  <target name="build">
+    <csc target="exe" 
+         define="${current.build.defines.csc}" 
+         warnaserror="true"
+         debug="${current.build.debug}" 
+         output="${current.bin.dir}/${project::get-name()}.exe">
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+      </sources>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+      <references basedir="${current.bin.dir}">
+        <include name="Spring.AopQuickStart.Common.dll" />
+        <include name="Spring.Core.dll" />
+        <include name="Spring.Aop.dll" />
+      </references>
+    </csc>
+    <copy tofile="${current.bin.dir}/${project::get-name()}.exe.config" 
+          file="App.config" overwrite="true">
+    </copy>
+  </target>
+</project>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/App.config b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/App.config
new file mode 100644
index 00000000..1ce90fc5
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/App.config
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<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" />
+    </sectionGroup>
+  </configSections>
+
+  <spring>
+    
+    <context>
+      <resource uri="config://spring/objects" />
+    </context>
+
+    <objects xmlns="http://www.springframework.net">
+      <description>An example that demonstrates use of a poincut.</description>
+
+      <object id="aroundAdvisor" type="Spring.Aop.Support.NameMatchMethodPointcutAdvisor, Spring.Aop">
+        <property name="Advice">
+          <object type="Spring.AopQuickStart.Aspects.ConsoleLoggingAroundAdvice, Spring.AopQuickStart.Common" />
+        </property>
+        <property name="MappedNames">
+          <list>
+            <value>*Execute</value>
+          </list>
+        </property>
+      </object>
+
+      <object id="throwsAdvice" 
+              type="Spring.AopQuickStart.Aspects.ConsoleLoggingThrowsAdvice, Spring.AopQuickStart.Common" />
+
+      <object id="myServiceCommand" type="Spring.Aop.Framework.ProxyFactoryObject">
+        <property name="Target">
+          <object type="Spring.AopQuickStart.Commands.ServiceCommand, Spring.AopQuickStart.Common" />
+        </property>
+        <property name="InterceptorNames">
+          <list>
+            <value>aroundAdvisor</value>
+            <value>throwsAdvice</value>
+          </list>
+        </property>
+      </object>
+
+    </objects>
+    
+  </spring>
+  
+</configuration>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Program.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Program.cs
new file mode 100644
index 00000000..52b28e38
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Program.cs
@@ -0,0 +1,70 @@
+#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
+
+#region Imports
+
+using System;
+
+using Spring.Context;
+using Spring.Context.Support;
+
+using Spring.AopQuickStart.Commands;
+
+#endregion
+
+namespace Spring.AopQuickStart
+{
+    /// <summary>
+    /// A simple application that uses a pointcut.
+    /// </summary>
+    /// <version>$Id: Program.cs,v 1.2 2007/07/26 00:50:11 bbaia Exp $</version>
+    public class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        public static void Main(string[] args)
+        {
+            try
+            {
+                // Create AOP proxy using Spring.NET IoC container.
+                IApplicationContext ctx = ContextRegistry.GetContext();
+                ICommand command = (ICommand)ctx["myServiceCommand"];
+
+                command.Execute();
+                if (command.IsUndoCapable)
+                {
+                    command.UnExecute();
+                }
+            }
+            catch (Exception ex)
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine(ex);
+            }
+            finally
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine("--- hit <return> to quit ---");
+                Console.ReadLine();
+            }
+        }
+    }
+}
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2003.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2003.csproj
new file mode 100644
index 00000000..10ca9e74
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2003.csproj
@@ -0,0 +1,104 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{BFB30210-4C62-F523-8E6C-202672D3BFD3}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.AopQuickStart.Step3"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.AopQuickStart"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "Spring.AopQuickStart.Common.2003"
+                    Project = "{C707543A-8F0E-4483-AECC-BC6EE14C3A29}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Aop.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Program.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2005.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2005.csproj
new file mode 100644
index 00000000..4d59121f
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.2005.csproj
@@ -0,0 +1,62 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2C33494D-B4BB-4ACE-B60A-4ACE3EB76108}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <AssemblyName>Spring.AopQuickStart.Step3</AssemblyName>
+    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2005.csproj">
+      <Project>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</Project>
+      <Name>Spring.AopQuickStart.Common.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.build b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.build
new file mode 100644
index 00000000..ca230966
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step3/Spring.AopQuickStart.Step3.build
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<project name="Spring.AopQuickStart.Step3" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+  <!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+
+  <target name="build">
+    <csc target="exe" 
+         define="${current.build.defines.csc}" 
+         warnaserror="true"
+         debug="${current.build.debug}" 
+         output="${current.bin.dir}/${project::get-name()}.exe">
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+      </sources>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+      <references basedir="${current.bin.dir}">
+        <include name="Spring.AopQuickStart.Common.dll" />
+        <include name="Spring.Core.dll" />
+        <include name="Spring.Aop.dll" />
+      </references>
+    </csc>
+    <copy tofile="${current.bin.dir}/${project::get-name()}.exe.config" 
+          file="App.config" overwrite="true">
+    </copy>
+  </target>
+</project>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/App.config b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/App.config
new file mode 100644
index 00000000..dca08b3a
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/App.config
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<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" />
+    </sectionGroup>
+  </configSections>
+
+  <spring>
+    
+    <context>
+      <resource uri="config://spring/objects" />
+    </context>
+
+    <objects xmlns="http://www.springframework.net">
+      <description>An example that demonstrates use of a poincut.</description>
+      
+      <object id="aroundAdvisor" type="Spring.Aop.Support.AttributeMatchMethodPointcutAdvisor, Spring.Aop">
+        <property name="Advice">
+          <object type="Spring.AopQuickStart.Aspects.ConsoleLoggingAdvice, Spring.AopQuickStart.Step4" />
+        </property>
+        <property name="Attribute" 
+                  value="Spring.AopQuickStart.Attributes.ConsoleLoggingAttribute, Spring.AopQuickStart.Step4" />
+      </object>
+
+      <object id="throwsAdvice" 
+              type="Spring.AopQuickStart.Aspects.ConsoleLoggingThrowsAdvice, Spring.AopQuickStart.Common" />
+
+      <object id="myServiceCommand" type="Spring.Aop.Framework.ProxyFactoryObject">
+        <property name="Target">
+          <object type="Spring.AopQuickStart.Commands.AnotherServiceCommand, Spring.AopQuickStart.Step4" />
+        </property>
+        <property name="InterceptorNames">
+          <list>
+            <value>aroundAdvisor</value>
+            <value>throwsAdvice</value>
+          </list>
+        </property>
+      </object>
+
+    </objects>
+    
+  </spring>
+  
+</configuration>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Aspects/ConsoleLoggingAdvice.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Aspects/ConsoleLoggingAdvice.cs
new file mode 100644
index 00000000..5c7401b1
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Aspects/ConsoleLoggingAdvice.cs
@@ -0,0 +1,90 @@
+#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
+
+#region Imports
+
+using System;
+
+using AopAlliance.Intercept;
+
+using Spring.AopQuickStart.Attributes;
+
+#endregion
+
+namespace Spring.AopQuickStart.Aspects
+{
+    /// <summary>
+    /// Simple implementation of the <see cref="AopAlliance.Intercept.IMethodInterceptor"/> interface 
+    /// for a logging aspect using <see cref="System.Console"/> and informations from the 
+    /// <see cref="Spring.AopQuickStart.Attributes.ConsoleLoggingAttribute" /> attribute.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: ConsoleLoggingAdvice.cs,v 1.2 2006/12/03 23:56:28 bbaia Exp $</version>
+	public class ConsoleLoggingAdvice : IMethodInterceptor
+	{
+#if NET_2_0
+        private ConsoleColor _color = ConsoleColor.Gray;
+        public ConsoleColor Color
+        {
+            get { return _color; }
+            set { _color = value; }
+        }
+
+		public object Invoke(IMethodInvocation invocation)
+		{
+            ConsoleLoggingAttribute[] consoleLoggingInfo =
+                (ConsoleLoggingAttribute[])invocation.Method.GetCustomAttributes(typeof(ConsoleLoggingAttribute), false);
+
+            if (consoleLoggingInfo.Length > 0)
+            {
+                Color = consoleLoggingInfo[0].Color;
+            }
+
+            ConsoleColor currentColor = Console.ForegroundColor;
+
+            Console.ForegroundColor = Color;
+
+            Console.Out.WriteLine(String.Format(
+                "Intercepted call : about to invoke method '{0}'", invocation.Method.Name));
+
+            Console.ForegroundColor = currentColor;
+
+            object returnValue = invocation.Proceed();
+
+            Console.ForegroundColor = Color;
+
+            Console.Out.WriteLine(String.Format(
+                "Intercepted call : returned '{0}'", returnValue));
+
+            Console.ForegroundColor = currentColor;
+
+			return returnValue;
+		}
+#else
+        public object Invoke(IMethodInvocation invocation)
+        {
+            Console.Out.WriteLine("Intercepted call : about to invoke next item in chain...");
+            object returnValue = invocation.Proceed();
+            Console.Out.WriteLine("Intercepted call : returned " + returnValue);
+            return returnValue;
+        }
+#endif
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Attributes/ConsoleLoggingAttribute.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Attributes/ConsoleLoggingAttribute.cs
new file mode 100644
index 00000000..eba26086
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Attributes/ConsoleLoggingAttribute.cs
@@ -0,0 +1,70 @@
+#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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.AopQuickStart.Attributes
+{
+    /// <summary>
+    /// This attribute can be used to mark properties and methods 
+    /// on which each call should be logged.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: ConsoleLoggingAttribute.cs,v 1.1 2006/12/02 13:30:02 bbaia Exp $</version>
+    public class ConsoleLoggingAttribute : Attribute
+    {
+#if NET_2_0
+        private ConsoleColor _color = ConsoleColor.Gray;
+
+        /// <summary>
+        /// Gets or sets the foreground color of the console.
+        /// </summary>
+        public ConsoleColor Color
+        {
+            get { return _color; }
+            set { _color = value; }
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.AopQuickStart.Attributes.ConsoleLoggingAttribute"/> class.
+        /// </summary>
+        /// <param name="level">
+        /// The foreground color of the console.
+        /// </param>
+        public ConsoleLoggingAttribute(ConsoleColor color)
+        {
+            _color = color;
+        }
+#endif
+
+        /// <summary>
+		/// Creates a new instance of the
+        /// <see cref="Spring.AopQuickStart.Attributes.ConsoleLoggingAttribute"/> class.
+		/// </summary>
+		public ConsoleLoggingAttribute()
+		{
+		}
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Commands/AnotherServiceCommand.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Commands/AnotherServiceCommand.cs
new file mode 100644
index 00000000..67243acb
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Commands/AnotherServiceCommand.cs
@@ -0,0 +1,66 @@
+#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
+
+#region Imports
+
+using System;
+
+using Spring.AopQuickStart.Attributes;
+
+#endregion
+
+namespace Spring.AopQuickStart.Commands
+{
+    /// <summary>
+    /// Another simple implementation of the
+    /// <see cref="Spring.Examples.AopQuickStart.ICommand"/> interface.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: AnotherServiceCommand.cs,v 1.1 2006/12/02 13:30:02 bbaia Exp $</version>
+    public class AnotherServiceCommand : ICommand
+    {
+        #region ICommand Members
+
+        public bool IsUndoCapable
+        {
+            get { return true; }
+        }
+
+#if NET_2_0
+        [ConsoleLogging(Color = ConsoleColor.Red)]
+#else
+        [ConsoleLogging]
+#endif
+        public void Execute()
+        {
+            Console.Out.WriteLine("--- AnotherServiceCommand implementation : Execute()... ---");
+        }
+
+        public void UnExecute()
+        {
+            Console.Out.WriteLine("--- AnotherServiceCommand implementation : UnExecute()... ---");
+
+            // Uncomment to see IThrowAdvice implementation in action
+            //throw new Exception("The method or operation is not supported.");
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Program.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Program.cs
new file mode 100644
index 00000000..52b28e38
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Program.cs
@@ -0,0 +1,70 @@
+#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
+
+#region Imports
+
+using System;
+
+using Spring.Context;
+using Spring.Context.Support;
+
+using Spring.AopQuickStart.Commands;
+
+#endregion
+
+namespace Spring.AopQuickStart
+{
+    /// <summary>
+    /// A simple application that uses a pointcut.
+    /// </summary>
+    /// <version>$Id: Program.cs,v 1.2 2007/07/26 00:50:11 bbaia Exp $</version>
+    public class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        public static void Main(string[] args)
+        {
+            try
+            {
+                // Create AOP proxy using Spring.NET IoC container.
+                IApplicationContext ctx = ContextRegistry.GetContext();
+                ICommand command = (ICommand)ctx["myServiceCommand"];
+
+                command.Execute();
+                if (command.IsUndoCapable)
+                {
+                    command.UnExecute();
+                }
+            }
+            catch (Exception ex)
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine(ex);
+            }
+            finally
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine("--- hit <return> to quit ---");
+                Console.ReadLine();
+            }
+        }
+    }
+}
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2003.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2003.csproj
new file mode 100644
index 00000000..2a50e3d7
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2003.csproj
@@ -0,0 +1,119 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{672D3BFD-4C62-F523-8E6C-20BFB3021023}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.AopQuickStart.Step4"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.AopQuickStart"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "Spring.AopQuickStart.Common.2003"
+                    Project = "{C707543A-8F0E-4483-AECC-BC6EE14C3A29}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Aop.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Program.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\ConsoleLoggingAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Attributes\ConsoleLoggingAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Commands\AnotherServiceCommand.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2005.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2005.csproj
new file mode 100644
index 00000000..ba66573f
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.2005.csproj
@@ -0,0 +1,67 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{3EB76108-4ACE-4ACE-B60A-B4BB3EB76108}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <AssemblyName>Spring.AopQuickStart.Step4</AssemblyName>
+    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Aspects\ConsoleLoggingAdvice.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Attributes\ConsoleLoggingAttribute.cs" />
+    <Compile Include="Commands\AnotherServiceCommand.cs" />
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2005.csproj">
+      <Project>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</Project>
+      <Name>Spring.AopQuickStart.Common.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.build b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.build
new file mode 100644
index 00000000..017635b8
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step4/Spring.AopQuickStart.Step4.build
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<project name="Spring.AopQuickStart.Step4" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+  <!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+
+  <target name="build">
+    <csc target="exe" 
+         define="${current.build.defines.csc}" 
+         warnaserror="true"
+         debug="${current.build.debug}" 
+         output="${current.bin.dir}/${project::get-name()}.exe">
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+      </sources>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+      <references basedir="${current.bin.dir}">
+        <include name="Spring.AopQuickStart.Common.dll" />
+        <include name="Spring.Core.dll" />
+        <include name="Spring.Aop.dll" />
+      </references>
+    </csc>
+    <copy tofile="${current.bin.dir}/${project::get-name()}.exe.config" 
+          file="App.config" overwrite="true">
+    </copy>
+  </target>
+</project>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/App.config b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/App.config
new file mode 100644
index 00000000..70392667
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/App.config
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<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" />
+    </sectionGroup>
+  </configSections>
+
+  <spring>
+    
+    <context>
+      <resource uri="config://spring/objects" />
+    </context>
+
+    <objects xmlns="http://www.springframework.net">
+      <description>An example that demonstrates use of a custom poincut.</description>
+      
+      <object id="aroundAdvisor" 
+              type="Spring.AopQuickStart.Aspects.ExpressionDynamicPointcutAdvisor, Spring.AopQuickStart.Step5">
+        <property name="Advice">
+          <object type="Spring.AopQuickStart.Aspects.ConsoleLoggingAroundAdvice, Spring.AopQuickStart.Common" />
+        </property>
+        <property name="Expression" value="MethodInfo.ReturnType == T(System.Void) and Args == null" />
+      </object>
+
+      <object id="throwsAdvice" 
+              type="Spring.AopQuickStart.Aspects.ConsoleLoggingThrowsAdvice, Spring.AopQuickStart.Common" />
+
+      <object id="myServiceCommand" type="Spring.Aop.Framework.ProxyFactoryObject">
+        <property name="Target">
+          <object type="Spring.AopQuickStart.Commands.ServiceCommand, Spring.AopQuickStart.Common" />
+        </property>
+        <property name="InterceptorNames">
+          <list>
+            <value>aroundAdvisor</value>
+            <value>throwsAdvice</value>
+          </list>
+        </property>
+      </object>
+
+    </objects>
+    
+  </spring>
+  
+</configuration>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Aspects/ExpressionDynamicPointcutAdvisor.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Aspects/ExpressionDynamicPointcutAdvisor.cs
new file mode 100644
index 00000000..b4d88b40
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Aspects/ExpressionDynamicPointcutAdvisor.cs
@@ -0,0 +1,136 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using Spring.Expressions;
+using Spring.Aop.Support;
+
+#endregion
+
+namespace Spring.AopQuickStart.Aspects
+{
+    /// <summary>
+    /// Dynamic pointcut using Spring expressions.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: ExpressionDynamicPointcutAdvisor.cs,v 1.1 2007/07/26 00:50:11 bbaia Exp $</version>
+    public class ExpressionDynamicPointcutAdvisor : DynamicMethodMatcherPointcutAdvisor
+    {
+        private string expression;
+        public string Expression
+        {
+            get { return expression; }
+            set { expression = value; }
+        }
+
+        /// <summary>
+        /// Is there a runtime (dynamic) match for the supplied method ?
+        /// </summary>
+        public override bool Matches(MethodInfo method, Type targetType, object[] args)
+        {
+            IExpression expr = Spring.Expressions.Expression.Parse(Expression);
+            MatchingInfoHolder infoHolder = new MatchingInfoHolder(method, targetType, args);
+
+            try
+            {
+                // Evaluate the expression using the current matching info as current context
+                return (bool)expr.GetValue(infoHolder);
+            }
+            catch (Exception e)
+            {
+                throw new ArgumentException(
+                    "Expression cannot be evaluate or not return a boolean.", "Expression", e);
+            }
+        }
+
+        #region MatchingInfoHolder inner class definition
+
+        public class MatchingInfoHolder
+        {
+            #region Fields
+
+            private MethodInfo _methodInfo;
+            private Type _targetType;
+            private object[] _args;
+
+            #endregion
+
+            #region Properties
+
+            /// <summary>
+            /// Get or sets the candidate method.
+            /// </summary>
+            public MethodInfo MethodInfo
+            {
+                get { return _methodInfo; }
+                set { _methodInfo = value; }
+            }
+
+            /// <summary>
+            /// Gets or sets the target type.
+            /// </summary>
+            public Type TargetType
+            {
+                get { return _targetType; }
+                set { _targetType = value; }
+            }
+
+            /// <summary>
+            /// Gets or sets the arguments to the method.
+            /// </summary>
+            public object[] Args
+            {
+                get { return _args; }
+                set { _args = value; }
+            }
+
+            #endregion
+
+            #region Constructor(s) / Destructor
+
+            /// <summary>
+            /// Creates a new instance of the
+            /// <see cref="Spring.AopQuickStart.Aspects.ExpressionDynamicPoincutAdvisor+MatchingInfoHolder"/> class.
+            /// </summary>
+            public MatchingInfoHolder()
+            {
+            }
+
+            /// <summary>
+            /// Creates a new instance of the
+            /// <see cref="Spring.AopQuickStart.Aspects.ExpressionDynamicPoincutAdvisor+MatchingInfoHolder"/> class.
+            /// </summary>
+            public MatchingInfoHolder(MethodInfo methodInfo, Type targetType, object[] args)
+            {
+                _methodInfo = methodInfo;
+                _targetType = targetType;
+                _args = args;
+            }
+
+            #endregion
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Program.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Program.cs
new file mode 100644
index 00000000..6ee8e6b7
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Program.cs
@@ -0,0 +1,70 @@
+#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
+
+#region Imports
+
+using System;
+
+using Spring.Context;
+using Spring.Context.Support;
+
+using Spring.AopQuickStart.Commands;
+
+#endregion
+
+namespace Spring.AopQuickStart
+{
+    /// <summary>
+    /// A simple application that uses a custom pointcut.
+    /// </summary>
+    /// <version>$Id: Program.cs,v 1.2 2007/07/26 00:50:11 bbaia Exp $</version>
+    public class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        public static void Main(string[] args)
+        {
+            try
+            {
+                // Create AOP proxy using Spring.NET IoC container.
+                IApplicationContext ctx = ContextRegistry.GetContext();
+                ICommand command = (ICommand)ctx["myServiceCommand"];
+
+                command.Execute();
+                if (command.IsUndoCapable)
+                {
+                    command.UnExecute();
+                }
+            }
+            catch (Exception ex)
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine(ex);
+            }
+            finally
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine("--- hit <return> to quit ---");
+                Console.ReadLine();
+            }
+        }
+    }
+}
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2003.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2003.csproj
new file mode 100644
index 00000000..d75c19e1
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2003.csproj
@@ -0,0 +1,114 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{F5233BFD-8E6C-FB30-4C62-20BFB3021023}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.AopQuickStart.Step5"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.AopQuickStart"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "Spring.AopQuickStart.Common.2003"
+                    Project = "{C707543A-8F0E-4483-AECC-BC6EE14C3A29}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Aop.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+                <Reference
+                    Name = "antlr.runtime"
+                    AssemblyName = "antlr.runtime"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\antlr.runtime.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Program.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\ExpressionDynamicPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2005.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2005.csproj
new file mode 100644
index 00000000..5ac3ec26
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.2005.csproj
@@ -0,0 +1,67 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{61086108-3EB7-4ACE-B4B6-B4B60AB76108}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <AssemblyName>Spring.AopQuickStart.Step5</AssemblyName>
+    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Aspects\ExpressionDynamicPointcutAdvisor.cs" />
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2005.csproj">
+      <Project>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</Project>
+      <Name>Spring.AopQuickStart.Common.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.build b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.build
new file mode 100644
index 00000000..efd249ba
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step5/Spring.AopQuickStart.Step5.build
@@ -0,0 +1,33 @@
+<?xml version="1.0" ?>
+<project name="Spring.AopQuickStart.Step5" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+  <!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+
+  <target name="build">
+    <csc target="exe" 
+         define="${current.build.defines.csc}" 
+         warnaserror="true"
+         debug="${current.build.debug}" 
+         output="${current.bin.dir}/${project::get-name()}.exe">
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+      </sources>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+      <references basedir="${current.bin.dir}">
+        <include name="Spring.AopQuickStart.Common.dll" />
+        <include name="antlr.runtime.dll" />
+        <include name="Spring.Core.dll" />
+        <include name="Spring.Aop.dll" />
+      </references>
+    </csc>
+    <copy tofile="${current.bin.dir}/${project::get-name()}.exe.config" 
+          file="App.config" overwrite="true">
+    </copy>
+  </target>
+</project>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/App.config b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/App.config
new file mode 100644
index 00000000..09eefc74
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/App.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+
+  <configSections>
+  
+  </configSections>
+    
+</configuration>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Contact.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Contact.cs
new file mode 100644
index 00000000..13d4af0d
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Contact.cs
@@ -0,0 +1,26 @@
+namespace Spring.AopQuickStart
+{
+	public class Contact
+	{
+        private string firstName;
+        public virtual string FirstName
+		{
+            get { return firstName; }
+		    set { firstName = value; }
+		}
+
+        private string lastName;
+        public virtual string LastName
+	    {
+	        get { return lastName; }
+	        set { lastName = value; }
+	    }
+
+        private string emailAddress;
+        public virtual string EmailAddress
+	    {
+	        get { return emailAddress; }
+	        set { emailAddress = value; }
+	    }
+	}
+}
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/IIsModified.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/IIsModified.cs
new file mode 100644
index 00000000..4b93046f
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/IIsModified.cs
@@ -0,0 +1,7 @@
+namespace Spring.AopQuickStart
+{
+	public interface IIsModified
+	{
+        bool IsModified { get; set; }
+	}
+}
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/IsModifiedMixin.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/IsModifiedMixin.cs
new file mode 100644
index 00000000..e0a34234
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/IsModifiedMixin.cs
@@ -0,0 +1,23 @@
+using AopAlliance.Aop;
+using Spring.Aop.Support;
+
+namespace Spring.AopQuickStart
+{
+    public class IsModifiedMixin : IIsModified, IAdvice
+    {
+        private bool isModified = false;
+
+        public virtual bool IsModified
+        {
+            get { return isModified; }
+            set { isModified = value; }
+        }
+    }
+
+    public class IsModifiedAdvisor : DefaultIntroductionAdvisor
+    {
+        public IsModifiedAdvisor()
+            : base(new IsModifiedMixin())
+        {}
+    }
+}
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/ModificationAdvice.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/ModificationAdvice.cs
new file mode 100644
index 00000000..2a89f9f1
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/ModificationAdvice.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Reflection;
+using AopAlliance.Intercept;
+using Spring.Aop.Framework;
+
+namespace Spring.AopQuickStart
+{
+    public class ModificationAdvice : IMethodInterceptor
+    {
+        public virtual Object Invoke(IMethodInvocation invocation)
+        {
+            MethodInfo method = invocation.Method;
+            object proxy = invocation.Proxy;
+
+            if (proxy is IIsModified)
+            {
+                IIsModified obj = (IIsModified) proxy;
+                if (IsSetter(method))
+                {
+                    obj.IsModified = HasModificationOccured(method, invocation.This, invocation.Arguments);
+                }
+            }
+            return invocation.Proceed();
+        }
+
+        private bool HasModificationOccured(MethodInfo setter, Object target, Object[] args)
+        {
+            PropertyInfo property = target.GetType().GetProperty(setter.Name.Substring(4));
+
+            if (property != null)
+            {
+                // modification check is unimportant
+                // for write only methods
+                Object newVal = args[0];
+                Object oldVal = property.GetValue(target, null);
+
+                if ((newVal == null) && (oldVal == null))
+                {
+                    return false;
+                }
+                else if ((newVal == null) && (oldVal != null))
+                {
+                    return true;
+                }
+                else if ((newVal != null) && (oldVal == null))
+                {
+                    return true;
+                }
+                else
+                {
+                    return (!newVal.Equals(oldVal));
+                }
+            }
+
+            return false;
+        }
+
+        private bool IsSetter(MethodInfo method)
+        {
+            return (method.Name.StartsWith("set_")) && (method.GetParameters().Length == 1);
+        }
+        
+    }
+}
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/ModificationAdvisor.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/ModificationAdvisor.cs
new file mode 100644
index 00000000..6036183c
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/ModificationAdvisor.cs
@@ -0,0 +1,34 @@
+using System;
+using Spring.Aop;
+using Spring.Aop.Support;
+
+namespace Spring.AopQuickStart
+{
+    public class ModificationAdvisor : DefaultPointcutAdvisor
+    {
+        public ModificationAdvisor(Type type) 
+            : base(new SetterPointcut(type), new ModificationAdvice())
+        {}
+
+        private class SetterPointcut : IPointcut
+        {
+            private IMethodMatcher methodMatcher = TrueMethodMatcher.True;
+            private ITypeFilter typeFilter;
+
+            public SetterPointcut(Type type)
+            {
+                typeFilter = new RootTypeFilter(type);
+            }
+
+            public ITypeFilter TypeFilter
+            {
+                get { return typeFilter; }
+            }
+
+            public IMethodMatcher MethodMatcher
+            {
+                get { return methodMatcher; }
+            }
+        }
+    }
+}
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Program.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Program.cs
new file mode 100644
index 00000000..94a6da4f
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Program.cs
@@ -0,0 +1,83 @@
+#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
+
+#region Imports
+
+using System;
+using Spring.Aop.Framework;
+
+#endregion
+
+namespace Spring.AopQuickStart
+{
+    /// <summary>
+    /// A simple application that uses an introduction.
+    /// </summary>
+    /// <version>$Id: Program.cs,v 1.4 2007/07/26 00:50:11 bbaia Exp $</version>
+
+    public class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        public static void Main(string[] args)
+        {
+            try
+            {
+                Contact contact = GetProxy();
+                IIsModified modificationWatcher = (IIsModified)contact;
+
+                contact.FirstName = "Aleksandar";
+                if (modificationWatcher.IsModified)
+                    Console.WriteLine("Should not flag as modification");
+                
+                contact.FirstName = "Goran";
+
+                if (modificationWatcher.IsModified)
+                    Console.WriteLine("Should flag as modification");
+               
+            }
+            catch (Exception ex)
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine(ex);
+            }
+            finally
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine("--- hit <return> to quit ---");
+                Console.ReadLine();
+            }
+        }
+        private static Contact GetProxy()
+        {
+            Contact target = new Contact();
+            target.FirstName = "Aleksandar";
+            target.LastName = "Seovic";
+
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.AddAdvisor(new ModificationAdvisor(target.GetType()));
+            pf.AddIntroduction(new IsModifiedAdvisor());
+            pf.ProxyTargetType = true;
+
+            return (Contact)pf.GetProxy();
+        }
+    }
+}
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2003.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2003.csproj
new file mode 100644
index 00000000..bbf08146
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2003.csproj
@@ -0,0 +1,124 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{8E620210-4D33-F523-BF6C-202672CBBFD3}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.AopQuickStart.Step6"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.AopQuickStart"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Aop.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Contact.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "IIsModified.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "IsModifiedMixin.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "ModificationAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "ModificationAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Program.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2005.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2005.csproj
new file mode 100644
index 00000000..404df50f
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.2005.csproj
@@ -0,0 +1,61 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{AB33BB4D-B449-4AC1-760A-4ACE3EA56108}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <AssemblyName>Spring.AopQuickStart.Step6</AssemblyName>
+    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Contact.cs" />
+    <Compile Include="IIsModified.cs" />
+    <Compile Include="IsModifiedMixin.cs" />
+    <Compile Include="ModificationAdvice.cs" />
+    <Compile Include="ModificationAdvisor.cs" />
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.build b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.build
new file mode 100644
index 00000000..5e4e8896
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step6/Spring.AopQuickStart.Step6.build
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<project name="Spring.AopQuickStart.Step6" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+  <!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+
+  <target name="build">
+    <csc target="exe" 
+         define="${current.build.defines.csc}" 
+         warnaserror="true"
+         debug="${current.build.debug}" 
+         output="${current.bin.dir}/${project::get-name()}.exe">
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+      </sources>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+      <references basedir="${current.bin.dir}">
+        <include name="Spring.AopQuickStart.Common.dll" />
+        <include name="Spring.Core.dll" />
+        <include name="Spring.Aop.dll" />
+      </references>
+    </csc>
+    <copy tofile="${current.bin.dir}/${project::get-name()}.exe.config" 
+          file="App.config" overwrite="true">
+    </copy>
+  </target>
+</project>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/App.config b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/App.config
new file mode 100644
index 00000000..9aae4511
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/App.config
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<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" />
+    </sectionGroup>
+  </configSections>
+
+  <spring>
+
+    <context>
+      <resource uri="config://spring/objects" />
+    </context>
+
+    <objects xmlns="http://www.springframework.net">
+      <description>An example that demonstrates use of AutoProxy functionality.</description>
+
+      <!-- Services definitions -->
+      
+      <object id="myServiceCommand" 
+              type="Spring.AopQuickStart.Commands.ServiceCommand, Spring.AopQuickStart.Common" />
+
+      <object id="myAnotherServiceCommand" 
+              type="Spring.AopQuickStart.Commands.AnotherServiceCommand, Spring.AopQuickStart.Step7" />
+
+      
+      <!-- The rest of the config file is common no matter how many objects you add -->
+
+      <object id="aroundAdvisor" type="Spring.Aop.Support.NameMatchMethodPointcutAdvisor, Spring.Aop">
+        <property name="Advice">
+          <object type="Spring.AopQuickStart.Aspects.ConsoleLoggingAroundAdvice, Spring.AopQuickStart.Common" />
+        </property>
+        <property name="MappedNames">
+          <list>
+            <value>*Execute</value>
+          </list>
+        </property>
+      </object>
+
+      <!-- Using ObjectNameAutoProxyCreator -->
+      <!-- Apply 'aroundAdvisor' on all objects with id that ends by 'Command' -->
+      <object type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+        <property name="ObjectNames">
+          <list>
+            <value>*Command</value>
+          </list>
+        </property>
+        <property name="InterceptorNames">
+          <list>
+            <value>aroundAdvisor</value>
+          </list>
+        </property>
+      </object>
+
+      <!-- Or Using DefaultAdvisorAutoProxyCreator -->
+      <!-- Apply all avalaible IAdvisors to all objects -->
+      <!--<object type="Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator, Spring.Aop" />-->
+
+    </objects>
+
+  </spring>
+
+</configuration>
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Commands/AnotherServiceCommand.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Commands/AnotherServiceCommand.cs
new file mode 100644
index 00000000..724f88ba
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Commands/AnotherServiceCommand.cs
@@ -0,0 +1,59 @@
+#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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.AopQuickStart.Commands
+{
+    /// <summary>
+    /// Another simple implementation of the
+    /// <see cref="Spring.Examples.AopQuickStart.ICommand"/> interface.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: AnotherServiceCommand.cs,v 1.1 2006/12/02 13:30:03 bbaia Exp $</version>
+    public class AnotherServiceCommand : ICommand
+    {
+        #region ICommand Members
+
+        public bool IsUndoCapable
+        {
+            get { return true; }
+        }
+
+        public void Execute()
+        {
+            Console.Out.WriteLine("--- AnotherServiceCommand implementation : Execute()... ---");
+        }
+
+        public void UnExecute()
+        {
+            Console.Out.WriteLine("--- AnotherServiceCommand implementation : UnExecute()... ---");
+
+            // Uncomment to see IThrowAdvice implementation in action
+            //throw new Exception("The method or operation is not supported.");
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Program.cs b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Program.cs
new file mode 100644
index 00000000..d3743d27
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Program.cs
@@ -0,0 +1,70 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using Spring.Context;
+using Spring.Context.Support;
+
+using Spring.AopQuickStart.Commands;
+
+#endregion
+
+namespace Spring.AopQuickStart
+{
+    /// <summary>
+    /// A simple application that uses AutoProxy functionality.
+    /// </summary>
+    /// <version>$Id: Program.cs,v 1.1 2006/12/02 13:30:03 bbaia Exp $</version>
+    public class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        public static void Main(string[] args)
+        {
+            try
+            {
+                // Create AOP proxy using Spring.NET IoC container.
+                IApplicationContext ctx = ContextRegistry.GetContext();
+                IDictionary commands = ctx.GetObjectsOfType(typeof(ICommand));
+
+                foreach (ICommand command in commands.Values)
+                {
+                    command.Execute();
+                }
+            }
+            catch (Exception ex)
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine(ex);
+            }
+            finally
+            {
+				Console.Out.WriteLine();
+                Console.Out.WriteLine("--- hit <return> to quit ---");
+                Console.ReadLine();
+            }
+        }
+    }
+}
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2003.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2003.csproj
new file mode 100644
index 00000000..7f1235e9
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2003.csproj
@@ -0,0 +1,109 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.AopQuickStart.Step7"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.AopQuickStart"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "Spring.AopQuickStart.Common.2003"
+                    Project = "{C707543A-8F0E-4483-AECC-BC6EE14C3A29}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Aop.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Program.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Commands\AnotherServiceCommand.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2005.csproj b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2005.csproj
new file mode 100644
index 00000000..88361c2a
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.2005.csproj
@@ -0,0 +1,63 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0077A8CA-4C09-42B1-B227-91095CE4CCA2}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.AopQuickStart</RootNamespace>
+    <AssemblyName>Spring.AopQuickStart.Step7</AssemblyName>
+    <StartupObject>Spring.AopQuickStart.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Commands\AnotherServiceCommand.cs" />
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.AopQuickStart.Common\Spring.AopQuickStart.Common.2005.csproj">
+      <Project>{C707543A-8F0E-4483-AECC-BC6EE14C3A29}</Project>
+      <Name>Spring.AopQuickStart.Common.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.build b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.build
new file mode 100644
index 00000000..c348d5ec
--- /dev/null
+++ b/examples/Spring/Spring.AopQuickStart/src/Spring.AopQuickStart.Step7/Spring.AopQuickStart.Step7.build
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<project name="Spring.AopQuickStart.Step7" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+  <!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+
+  <target name="build">
+    <csc target="exe" 
+         define="${current.build.defines.csc}" 
+         warnaserror="true"
+         debug="${current.build.debug}" 
+         output="${current.bin.dir}/${project::get-name()}.exe">
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+      </sources>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+      <references basedir="${current.bin.dir}">
+        <include name="Spring.AopQuickStart.Common.dll" />
+        <include name="Spring.Core.dll" />
+        <include name="Spring.Aop.dll" />
+      </references>
+    </csc>
+    <copy tofile="${current.bin.dir}/${project::get-name()}.exe.config" 
+          file="App.config" overwrite="true">
+    </copy>
+  </target>
+</project>
diff --git a/examples/Spring/Spring.Calculator/Spring.Calculator.2003.sln b/examples/Spring/Spring.Calculator/Spring.Calculator.2003.sln
new file mode 100644
index 00000000..625b28b3
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/Spring.Calculator.2003.sln
@@ -0,0 +1,73 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Services.2003", "src\Spring.Calculator.Services\Spring.Calculator.Services.2003.csproj", "{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Contract.2003", "src\Spring.Calculator.Contract\Spring.Calculator.Contract.2003.csproj", "{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.RemoteApp.2003", "src\Spring.Calculator.RemoteApp\Spring.Calculator.RemoteApp.2003.csproj", "{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.ClientApp.2003", "src\Spring.Calculator.ClientApp\Spring.Calculator.ClientApp.2003.csproj", "{F202BB75-CEFD-400B-9CD3-0914F466EBF5}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Web.2003", "http://localhost/Spring.Calculator.2003/Spring.Calculator.Web.2003.csproj", "{1AA797F9-51F7-43FE-BDFE-6AC8C1CACC0B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aspects.2003", "src\Spring.Aspects\Spring.Aspects.2003.csproj", "{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.RegisterComponentServices.2003", "src\Spring.Calculator.RegisterComponentServices\Spring.Calculator.RegisterComponentServices.2003.csproj", "{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug.ActiveCfg = Debug|.NET
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug.Build.0 = Debug|.NET
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release.ActiveCfg = Release|.NET
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release.Build.0 = Release|.NET
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug.ActiveCfg = Debug|.NET
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug.Build.0 = Debug|.NET
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release.ActiveCfg = Release|.NET
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release.Build.0 = Release|.NET
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug.ActiveCfg = Debug|.NET
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug.Build.0 = Debug|.NET
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release.ActiveCfg = Release|.NET
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release.Build.0 = Release|.NET
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug.ActiveCfg = Debug|.NET
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug.Build.0 = Debug|.NET
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release.ActiveCfg = Release|.NET
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release.Build.0 = Release|.NET
+		{1AA797F9-51F7-43FE-BDFE-6AC8C1CACC0B}.Debug.ActiveCfg = Debug|.NET
+		{1AA797F9-51F7-43FE-BDFE-6AC8C1CACC0B}.Debug.Build.0 = Debug|.NET
+		{1AA797F9-51F7-43FE-BDFE-6AC8C1CACC0B}.Release.ActiveCfg = Release|.NET
+		{1AA797F9-51F7-43FE-BDFE-6AC8C1CACC0B}.Release.Build.0 = Release|.NET
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug.ActiveCfg = Debug|.NET
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug.Build.0 = Debug|.NET
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release.ActiveCfg = Release|.NET
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release.Build.0 = Release|.NET
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug.ActiveCfg = Debug|.NET
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug.Build.0 = Debug|.NET
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release.ActiveCfg = Release|.NET
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release.Build.0 = Release|.NET
+	EndGlobalSection
+	GlobalSection(SolutionItems) = postSolution
+		readme.txt = readme.txt
+		SpringCalculator.snk = SpringCalculator.snk
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.Calculator/Spring.Calculator.2005.sln b/examples/Spring/Spring.Calculator/Spring.Calculator.2005.sln
new file mode 100644
index 00000000..d3f429a8
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/Spring.Calculator.2005.sln
@@ -0,0 +1,125 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Services.2005", "src\Spring.Calculator.Services\Spring.Calculator.Services.2005.csproj", "{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.Contract.2005", "src\Spring.Calculator.Contract\Spring.Calculator.Contract.2005.csproj", "{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.RemoteApp.2005", "src\Spring.Calculator.RemoteApp\Spring.Calculator.RemoteApp.2005.csproj", "{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.ClientApp.2005", "src\Spring.Calculator.ClientApp\Spring.Calculator.ClientApp.2005.csproj", "{F202BB75-CEFD-400B-9CD3-0914F466EBF5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aspects.2005", "src\Spring.Aspects\Spring.Aspects.2005.csproj", "{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Calculator.RegisterComponentServices.2005", "src\Spring.Calculator.RegisterComponentServices\Spring.Calculator.RegisterComponentServices.2005.csproj", "{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B1FF7E1F-9BF9-4EB3-B38C-39A0E3EA4D0A}"
+	ProjectSection(SolutionItems) = preProject
+		readme.txt = readme.txt
+		SpringCalculator.snk = SpringCalculator.snk
+	EndProjectSection
+EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "D:\...\Spring.Calculator.Web.2005\", "src\Spring.Calculator.Web.2005", "{9697F719-BA0B-492E-ABAE-6132A8FCEC45}"
+	ProjectSection(WebsiteProperties) = preProject
+		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
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|.NET.ActiveCfg = Release|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|.NET.ActiveCfg = Release|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|.NET.ActiveCfg = Release|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|.NET.ActiveCfg = Release|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F202BB75-CEFD-400B-9CD3-0914F466EBF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|.NET.ActiveCfg = Release|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|.NET.ActiveCfg = Release|Any CPU
+		{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.Calculator/Spring.Calculator.build b/examples/Spring/Spring.Calculator/Spring.Calculator.build
new file mode 100644
index 00000000..676a14b2
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/Spring.Calculator.build
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<project name="Spring.Calculator" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+
+  <target name="build">
+    <nant buildfile="src\Spring.Aspects\Spring.Aspects.build" target="build" />
+    <nant buildfile="src\Spring.Calculator.Contract\Spring.Calculator.Contract.build" target="build"/>
+    <nant buildfile="src\Spring.Calculator.Services\Spring.Calculator.Services.build" target="build" />
+    <nant buildfile="src\Spring.Calculator.RemoteApp\Spring.Calculator.RemoteApp.build" target="build" />
+    <nant buildfile="src\Spring.Calculator.RegisterComponentServices\Spring.Calculator.RegisterComponentServices.build" target="build" />
+    <nant buildfile="src\Spring.Calculator.ClientApp\Spring.Calculator.ClientApp.build" target="build"/>
+  </target>
+  
+</project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/Spring.Calculator.snk b/examples/Spring/Spring.Calculator/Spring.Calculator.snk
new file mode 100644
index 00000000..a1ab9f35
Binary files /dev/null and b/examples/Spring/Spring.Calculator/Spring.Calculator.snk differ
diff --git a/examples/Spring/Spring.Calculator/lib/net/1.1/Common.Logging.Log4Net.dll b/examples/Spring/Spring.Calculator/lib/net/1.1/Common.Logging.Log4Net.dll
new file mode 100644
index 00000000..f334f6de
Binary files /dev/null and b/examples/Spring/Spring.Calculator/lib/net/1.1/Common.Logging.Log4Net.dll differ
diff --git a/examples/Spring/Spring.Calculator/lib/net/1.1/log4net.dll b/examples/Spring/Spring.Calculator/lib/net/1.1/log4net.dll
new file mode 100644
index 00000000..995816f2
Binary files /dev/null and b/examples/Spring/Spring.Calculator/lib/net/1.1/log4net.dll differ
diff --git a/examples/Spring/Spring.Calculator/lib/net/2.0/Common.Logging.Log4Net.dll b/examples/Spring/Spring.Calculator/lib/net/2.0/Common.Logging.Log4Net.dll
new file mode 100644
index 00000000..3900bb87
Binary files /dev/null and b/examples/Spring/Spring.Calculator/lib/net/2.0/Common.Logging.Log4Net.dll differ
diff --git a/examples/Spring/Spring.Calculator/lib/net/2.0/log4net.dll b/examples/Spring/Spring.Calculator/lib/net/2.0/log4net.dll
new file mode 100644
index 00000000..ffc57e11
Binary files /dev/null and b/examples/Spring/Spring.Calculator/lib/net/2.0/log4net.dll differ
diff --git a/examples/Spring/Spring.Calculator/readme.txt b/examples/Spring/Spring.Calculator/readme.txt
new file mode 100644
index 00000000..710b56f5
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/readme.txt
@@ -0,0 +1,13 @@
+In order to be able to run the Calculator example with VS2003 you will need 
+to create 'Spring.Calculator.2003' virtual directory using IIS Administrator and point it to :
+ "examples\Spring\Spring.Calculator\Spring.Calculator.Web.2003"
+
+
+Documentation related to this example :
+http://www.springframework.net/doc-latest/reference/html/remoting-quickstart.html
+
+
+
+
+
+
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/AssemblyInfo.cs b/examples/Spring/Spring.Calculator/src/Spring.Aspects/AssemblyInfo.cs
new file mode 100644
index 00000000..8e304fc5
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+#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
new file mode 100644
index 00000000..02f2bc30
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/CommonLoggingAroundAdvice.cs
@@ -0,0 +1,103 @@
+#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
+
+#region Imports
+
+using System;
+
+using AopAlliance.Intercept;
+using Common.Logging;
+
+#endregion
+
+namespace Spring.Aspects.Logging
+{
+    /// <summary>
+    /// Basic implementation of a logging aspect using Common.Logging library.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: CommonLoggingAroundAdvice.cs,v 1.2 2007/06/27 16:00:42 bbaia Exp $</version>
+	public class CommonLoggingAroundAdvice : IMethodInterceptor
+	{
+		#region Logging
+
+        private static readonly ILog LOG = LogManager.GetLogger(typeof(CommonLoggingAroundAdvice));
+
+		#endregion
+
+		#region Fields
+
+        private LogLevel _level = LogLevel.All;
+
+		#endregion
+
+		#region Properties
+
+        public LogLevel Level
+		{
+			get { return _level; }	
+			set { _level = value; }
+		}
+
+		#endregion
+
+		#region IMethodInterceptor Members
+
+		public object Invoke(IMethodInvocation invocation)
+		{
+			Log("Intercepted call : about to invoke method '{0}'", invocation.Method.Name);
+			object returnValue = invocation.Proceed();
+			Log("Intercepted call : returned '{0}'", returnValue);
+			return returnValue;
+		}
+
+		#endregion
+
+		#region Private Methods
+
+		private void Log(string text, params object[] args)
+		{
+			switch(Level)
+			{
+                case LogLevel.All :
+				case LogLevel.Debug :
+					if (LOG.IsDebugEnabled) LOG.Debug(String.Format(text, args));
+					break;
+				case LogLevel.Error :
+                    if (LOG.IsErrorEnabled) LOG.Error(String.Format(text, args));
+					break;
+				case LogLevel.Fatal :
+                    if (LOG.IsFatalEnabled) LOG.Fatal(String.Format(text, args));
+					break;
+				case LogLevel.Info :
+                    if (LOG.IsInfoEnabled) LOG.Info(String.Format(text, args));
+					break;
+				case LogLevel.Warn :
+                    if (LOG.IsWarnEnabled) LOG.Warn(String.Format(text, args));
+					break;
+                case LogLevel.Off:
+				default :
+                    break;
+			}
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/ConsoleLoggingAroundAdvice.cs b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/ConsoleLoggingAroundAdvice.cs
new file mode 100644
index 00000000..0e7b60ff
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/ConsoleLoggingAroundAdvice.cs
@@ -0,0 +1,93 @@
+#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
+
+#region Imports
+
+using System;
+using System.IO;
+
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.Aspects.Logging
+{
+    /// <summary>
+    /// Basic implementation of a logging aspect using <see cref="System.Console"/>.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: ConsoleLoggingAroundAdvice.cs,v 1.1 2006/11/26 12:26:34 bbaia Exp $</version>
+	public class ConsoleLoggingAroundAdvice : IMethodInterceptor
+	{
+		#region Fields
+
+#if NET_2_0
+        private ConsoleColor _foregroundColor = ConsoleColor.Gray;
+#endif
+
+		#endregion
+
+		#region Properties
+
+#if NET_2_0
+        /// <summary>
+        /// Gets or sets the foreground color of the console.
+        /// </summary>
+        public ConsoleColor ForegroundColor
+		{
+            get { return _foregroundColor; }
+            set { _foregroundColor = value; }
+		}
+#else
+        /// <summary>
+        /// The ConsoleColor is only avalaible since 2.0 only.
+        /// </summary>
+        /// <remarks>
+        /// Avoid dependency injection errors.
+        /// </remarks>
+        public string ForegroundColor
+        {
+            get { throw new Exception("The method or operation is not supported."); }
+            set { }
+        }
+#endif
+
+        #endregion
+
+        #region IMethodInterceptor Members
+
+        public object Invoke(IMethodInvocation invocation)
+		{
+#if NET_2_0
+            ConsoleColor previousColor = Console.ForegroundColor;
+            Console.ForegroundColor = _foregroundColor;
+#endif
+			Console.Out.WriteLine(String.Format("Intercepted call : about to invoke method '{0}'", invocation.Method.Name));
+			object returnValue = invocation.Proceed();
+            Console.Out.WriteLine(String.Format("Intercepted call : returned '{0}'", returnValue));
+#if NET_2_0
+            Console.ForegroundColor = previousColor;
+#endif
+			return returnValue;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..94f457ff
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2003.csproj
@@ -0,0 +1,105 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Aspects"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.Aspects"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\system.dll"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Aop.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Common.Logging.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Logging\CommonLoggingAroundAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Logging\ConsoleLoggingAroundAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
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
new file mode 100644
index 00000000..794d235a
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.2005.csproj
@@ -0,0 +1,104 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Aspects</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring.Aspects</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0,STRONG</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.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>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.build b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.build
new file mode 100644
index 00000000..c43aa4bf
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Spring.Aspects.build
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<project name="Spring.Aspects" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+	<!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+	<target name="build">
+		<csc target="library" define="${current.build.defines.csc}" 
+			warnaserror="false" debug="${current.build.debug}"
+			output="${current.bin.dir}/${project::get-name()}.dll">
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+			</sources>
+			<nowarn>
+				<warning number="${nowarn.numbers}" />
+			</nowarn>
+			<references basedir="${current.bin.dir}">
+				<include name="log4net.dll" />
+			        <include name="Common.Logging.dll"/>
+				<include name="Spring.Aop.dll" />
+			</references>
+		</csc>
+	</target>
+</project>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/App.config b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/App.config
new file mode 100644
index 00000000..a6b8fefc
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/App.config
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<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" />
+    </sectionGroup>
+  </configSections>
+
+  <spring>
+
+    <parsers>
+      <parser type="Spring.Remoting.Config.RemotingNamespaceParser, Spring.Services" />
+    </parsers>
+
+    <context>
+      <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" />
+
+      <!-- ======================== -->
+      <!-- Remoting implementations -->
+      <!-- ======================== -->
+      <!-- Make sure 'RemoteApp' console application is running and listening. -->
+      <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.Remoting/cao.xml" />-->
+      <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.Remoting/cao-aop.xml" />-->
+      <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.Remoting/cao-ctor.xml" />-->
+      <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.Remoting/saoSingleton.xml" />-->
+      <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.Remoting/saoSingleton-aop.xml" />-->
+      <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.Remoting/saoSingleCall.xml" />-->
+      <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.Remoting/saoSingleCall-aop.xml" />-->
+
+      <!-- =========================== -->
+      <!-- Web Service implementations -->
+      <!-- =========================== -->
+      <!-- Web.Services VS2003 -->
+      <!-- Make sure 'http://localhost/SpringCalculator/' web application is running -->
+      <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.WebServices2003/webServices.xml" />-->
+      <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.WebServices2003/webServices-aop.xml" />-->
+      <!-- Web.Services VS2005 -->
+      <!-- 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" />-->
+
+      <!-- ================================= -->
+      <!-- EnterpriseService implementations -->
+      <!-- ================================= -->
+      <!-- Make sure you register components with 'RegisterComponentServices' console application. -->
+      <!--<resource uri="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.EnterpriseServices/enterpriseServices.xml" />-->
+
+    </context>
+
+    <objects xmlns="http://www.springframework.net">
+      <description>Definitions of objects to be exported.</description>
+
+      <object id="ConsoleLoggingAroundAdvice" type="Spring.Aspects.Logging.ConsoleLoggingAroundAdvice, Spring.Aspects">
+        <property name="ForegroundColor" value="Red" />
+      </object>
+
+    </objects>
+
+  </spring>
+
+</configuration>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/AssemblyInfo.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/AssemblyInfo.cs
new file mode 100644
index 00000000..8975f419
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+#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/EnterpriseServices/enterpriseServices.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/EnterpriseServices/enterpriseServices.xml
new file mode 100644
index 00000000..5f78ab38
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/EnterpriseServices/enterpriseServices.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+	
+	<description>enterpriseServices</description>
+
+  <object id="calculatorService" type="Spring.EnterpriseServices.ServicedComponentFactory, Spring.Services">
+    <property name="Name" value="calculatorComponent" />
+    <!-- To allow dependency injection (Optional)
+    <property name="ProductTemplate">
+      <object>
+        <property name="MyProperty" value="MyValue" />
+      </object>
+    </property>
+    -->
+  </object>
+            
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/InProcess/inProcess.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/InProcess/inProcess.xml
new file mode 100644
index 00000000..d223e748
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/InProcess/inProcess.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+	
+	<description>inProcess</description>
+	
+	<object id="calculatorService" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services" />
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/cao-aop.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/cao-aop.xml
new file mode 100644
index 00000000..58a89a26
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/cao-aop.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:r="http://www.springframework.net/remoting">
+
+  <description>cao</description>
+
+  <r:caoFactory id="remoteCalculatorService" remoteTargetName="prototypeCalculatorWeaved"
+                serviceUrl="tcp://localhost:8005" />
+  
+  <!--
+		Old fashion way without remoting config parser...
+  <object id="remoteCalculatorService" type="Spring.Remoting.CaoFactoryObject, Spring.Services">
+    <property name="RemoteTargetName" value="prototypeCalculatorWeaved" />
+    <property name="ServiceUrl" value="tcp://localhost:8005" />
+  </object>
+  -->
+
+  <object id="calculatorService" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+    <property name="target" ref="remoteCalculatorService"/>
+    <property name="interceptorNames">
+      <list>
+        <value>ConsoleLoggingAroundAdvice</value>
+      </list>
+    </property>
+    <property name="ProxyInterfaces">
+      <list>
+        <value>Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract</value>
+      </list>
+    </property>
+  </object>
+
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/cao-ctor-aop.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/cao-ctor-aop.xml
new file mode 100644
index 00000000..4fe61209
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/cao-ctor-aop.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:r="http://www.springframework.net/remoting">
+	
+	<description>Not supported</description>
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/cao-ctor.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/cao-ctor.xml
new file mode 100644
index 00000000..323f9646
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/cao-ctor.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:r="http://www.springframework.net/remoting">
+
+  <description>cao</description>
+
+  <r:caoFactory id="calculatorService" remoteTargetName="prototypeCalculator" 
+                serviceUrl="tcp://localhost:8005">
+    <r:constructor-args>
+      <value type="int">3</value>
+    </r:constructor-args>
+  </r:caoFactory>
+
+  <!--
+		Old fashion way without remoting config parser...
+	<object id="calculatorService" type="Spring.Remoting.CaoFactoryObject, Spring.Services">
+		<property name="RemoteTargetName" value="prototypeCalculator" />
+		<property name="ServiceUrl" value="tcp://localhost:8005" />
+		<property name="constructorArguments">
+			<list>
+				<value type="int">3</value>
+			</list>
+		</property>
+	</object>
+  -->
+
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/cao.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/cao.xml
new file mode 100644
index 00000000..fa7db589
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/cao.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:r="http://www.springframework.net/remoting">
+	
+	<description>cao</description>
+
+  <r:caoFactory id="calculatorService" remoteTargetName="prototypeCalculator" 
+                serviceUrl="tcp://localhost:8005" />
+  
+  <!--
+		Old fashion way without remoting config parser...
+	<object id="calculatorService" type="Spring.Remoting.CaoFactoryObject, Spring.Services">
+		<property name="RemoteTargetName" value="prototypeCalculator" />
+		<property name="ServiceUrl" value="tcp://localhost:8005" />
+	</object>
+  -->
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/saoSingleCall-aop.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/saoSingleCall-aop.xml
new file mode 100644
index 00000000..97299e2f
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/saoSingleCall-aop.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:r="http://www.springframework.net/remoting">
+	
+	<description>saoSingleCall-aop</description>
+
+  <r:saoFactory id="remoteCalculatorService" 
+                serviceInterface="Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract"
+                serviceUrl="tcp://localhost:8005/RemotedSaoSingleCallCalculatorWeaved"/>
+  
+  <!--
+		Old fashion way without remoting config parser...
+	<object id="remoteCalculatorService" type="Spring.Remoting.SaoFactoryObject, Spring.Services">
+		<property name="ServiceInterface" value="Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract" />
+		<property name="ServiceUrl" value="tcp://localhost:8005/RemotedSaoSingleCallCalculatorWeaved" />
+	</object>
+  -->
+	
+	<object id="calculatorService" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+		<property name="target" ref="remoteCalculatorService"/>
+		<property name="interceptorNames">
+			<list>
+				<value>ConsoleLoggingAroundAdvice</value>
+			</list>
+		</property>
+		<property name="ProxyInterfaces">
+			<list>
+				<value>Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract</value>
+			</list>
+		</property>
+	</object>
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/saoSingleCall.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/saoSingleCall.xml
new file mode 100644
index 00000000..664de664
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/saoSingleCall.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:r="http://www.springframework.net/remoting">
+	
+	<description>saoSingleCall</description>
+
+  <r:saoFactory id="calculatorService" 
+              serviceInterface="Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract"
+              serviceUrl="tcp://localhost:8005/RemotedSaoSingleCallCalculator"/>
+
+  <!--
+		Old fashion way without remoting config parser...
+	<object id="calculatorService" type="Spring.Remoting.SaoFactoryObject, Spring.Services">
+		<property name="ServiceInterface" value="Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract" />
+		<property name="ServiceUrl" value="tcp://localhost:8005/RemotedSaoSingleCallCalculator" />
+	</object>
+  -->
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/saoSingleton-aop.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/saoSingleton-aop.xml
new file mode 100644
index 00000000..a0f1408d
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/saoSingleton-aop.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:r="http://www.springframework.net/remoting">
+
+	<description>saoSingleton-aop</description>
+
+  <r:saoFactory id="remoteCalculatorService" 
+                serviceInterface="Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract" 
+                serviceUrl="tcp://localhost:8005/RemotedSaoSingletonCalculatorWeaved"/>
+
+  <!--
+		Old fashion way without remoting config parser...
+	<object id="remoteCalculatorService" type="Spring.Remoting.SaoFactoryObject, Spring.Services">
+		<property name="ServiceInterface" value="Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract" />
+		<property name="ServiceUrl" value="tcp://localhost:8005/RemotedSaoSingletonCalculatorWeaved" />
+	</object>
+  -->
+	
+	<object id="calculatorService" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+		<property name="target" ref="remoteCalculatorService"/>
+		<property name="interceptorNames">
+			<list>
+				<value>ConsoleLoggingAroundAdvice</value>
+			</list>
+		</property>
+		<property name="ProxyInterfaces">
+			<list>
+				<value>Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract</value>
+			</list>
+		</property>
+	</object>
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/saoSingleton.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/saoSingleton.xml
new file mode 100644
index 00000000..790eea5a
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/Remoting/saoSingleton.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:r="http://www.springframework.net/remoting">
+	
+	<description>saoSingleton</description>
+
+  <r:saoFactory id="calculatorService" 
+              serviceInterface="Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract" 
+              serviceUrl="tcp://localhost:8005/RemotedSaoSingletonCalculator"/>
+
+  <!--
+		Old fashion way without remoting config parser...
+	<object id="calculatorService" type="Spring.Remoting.SaoFactoryObject, Spring.Services">
+		<property name="ServiceInterface" value="Spring.Calculator.Interfaces.IAdvancedCalculator, Spring.Calculator.Contract" />
+		<property name="ServiceUrl" value="tcp://localhost:8005/RemotedSaoSingletonCalculator" />
+	</object>
+  -->
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices2003/calculatorService.wsdl b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices2003/calculatorService.wsdl
new file mode 100644
index 00000000..38f1f927
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices2003/calculatorService.wsdl
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://SpringCalculator/WebServices" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://SpringCalculator/WebServices" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+    <s:schema elementFormDefault="qualified" targetNamespace="http://SpringCalculator/WebServices">
+      <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:element name="MemoryClear">
+        <s:complexType />
+      </s:element>
+      <s:element name="MemoryClearResponse">
+        <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="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="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="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="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="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:schema>
+  </wsdl:types>
+  <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: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="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="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="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="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="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="AddSoapIn">
+    <wsdl:part name="parameters" element="tns:Add" />
+  </wsdl:message>
+  <wsdl:message name="AddSoapOut">
+    <wsdl:part name="parameters" element="tns:AddResponse" />
+  </wsdl:message>
+  <wsdl:portType name="calculatorServiceSoap">
+    <wsdl:operation name="MemoryAdd">
+      <wsdl:input message="tns:MemoryAddSoapIn" />
+      <wsdl:output message="tns:MemoryAddSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="MemoryClear">
+      <wsdl:input message="tns:MemoryClearSoapIn" />
+      <wsdl:output message="tns:MemoryClearSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="SetMemory">
+      <wsdl:input message="tns:SetMemorySoapIn" />
+      <wsdl:output message="tns:SetMemorySoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="GetMemory">
+      <wsdl:input message="tns:GetMemorySoapIn" />
+      <wsdl:output message="tns:GetMemorySoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="Multiply">
+      <wsdl:input message="tns:MultiplySoapIn" />
+      <wsdl:output message="tns:MultiplySoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="Divide">
+      <wsdl:input message="tns:DivideSoapIn" />
+      <wsdl:output message="tns:DivideSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="Substract">
+      <wsdl:input message="tns:SubstractSoapIn" />
+      <wsdl:output message="tns:SubstractSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="Add">
+      <wsdl:input message="tns:AddSoapIn" />
+      <wsdl:output message="tns:AddSoapOut" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="calculatorServiceSoap" type="tns:calculatorServiceSoap">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
+    <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: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="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="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="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="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="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="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:binding>
+  <wsdl:service name="calculatorService">
+    <documentation xmlns="http://schemas.xmlsoap.org/wsdl/">Spring Calculator Web Services</documentation>
+    <wsdl:port name="calculatorServiceSoap" binding="tns:calculatorServiceSoap">
+      <soap:address location="http://localhost/Spring.Calculator.2003/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/WebServices2003/webServices-aop.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices2003/webServices-aop.xml
new file mode 100644
index 00000000..c630ee9e
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices2003/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/Spring.Calculator.2003/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/WebServices2003/webServices.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices2003/webServices.xml
new file mode 100644
index 00000000..57dae60b
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices2003/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/Spring.Calculator.2003/calculatorService.asmx"/>-->
+    <property name="ServiceUri" value="assembly://Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.Config.WebServices2003/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/Config/WebServices2005/calculatorService.wsdl b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices2005/calculatorService.wsdl
new file mode 100644
index 00000000..be2fb66a
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices2005/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/WebServices2005/webServices-aop.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices2005/webServices-aop.xml
new file mode 100644
index 00000000..d0c8e048
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices2005/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:1643/Spring.Calculator.Web.2005/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/WebServices2005/webServices.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices2005/webServices.xml
new file mode 100644
index 00000000..5d441725
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Config/WebServices2005/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:1643/Spring.Calculator.Web.2005/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
new file mode 100644
index 00000000..5c338c69
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Program.cs
@@ -0,0 +1,72 @@
+#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
+
+#region Imports
+
+using System;
+
+using Spring.Context;
+using Spring.Context.Support;
+
+using Spring.Calculator.Interfaces;
+
+#endregion
+
+namespace Spring.Calculator.ClientApp
+{
+	class Program
+	{
+		[STAThread]
+		static void Main()
+		{
+			try
+			{
+                Pause();
+
+				IApplicationContext ctx = ContextRegistry.GetContext();
+
+                Console.WriteLine("Get Calculator...");
+				IAdvancedCalculator firstCalc = (IAdvancedCalculator) ctx.GetObject("calculatorService");
+                Console.WriteLine("Divide(11, 2) : " + firstCalc.Divide(11, 2));
+                Console.WriteLine("Memory = " + firstCalc.GetMemory());
+				firstCalc.MemoryAdd(2);
+                Console.WriteLine("Memory + 2 = " + firstCalc.GetMemory());
+
+                Console.WriteLine("Get Calculator...");
+				IAdvancedCalculator secondCalc = (IAdvancedCalculator) ctx.GetObject("calculatorService");
+                Console.WriteLine("Memory = " + secondCalc.GetMemory());
+			}
+			catch (Exception e)
+			{
+                Console.WriteLine(e);
+			}
+			finally
+			{
+                Pause();
+			}
+		}
+
+        public static void Pause()
+        {
+            Console.Write("--- Press <return> to continue ---");
+            Console.ReadLine();
+        }
+	}
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..1aaa6131
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2003.csproj
@@ -0,0 +1,181 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{F202BB75-CEFD-400B-9CD3-0914F466EBF5}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Calculator.ClientApp"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.Calculator.ClientApp"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "system.web.services"
+                    AssemblyName = "System.Web.Services"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\system.web.services.dll"
+                />
+                <Reference
+                    Name = "system"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\system.dll"
+                />
+                <Reference
+                    Name = "Spring.Aspects.2003"
+                    Project = "{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Calculator.Contract.2003"
+                    Project = "{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Calculator.Services.2003"
+                    Project = "{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Services"
+                    AssemblyName = "Spring.Services"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Services.dll"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Aop.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Program.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Config\EnterpriseServices\enterpriseServices.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\InProcess\inProcess.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\Remoting\cao.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\Remoting\cao-aop.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\Remoting\cao-ctor.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\Remoting\cao-ctor-aop.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\Remoting\saoSingleCall.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\Remoting\saoSingleCall-aop.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\Remoting\saoSingleton.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\Remoting\saoSingleton-aop.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\WebServices2003\calculatorService.wsdl"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\WebServices2003\webServices.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\WebServices2003\webServices-aop.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
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
new file mode 100644
index 00000000..96700c02
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2005.csproj
@@ -0,0 +1,142 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F202BB75-CEFD-400B-9CD3-0914F466EBF5}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Calculator.ClientApp</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Spring.Calculator.ClientApp</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aspects\Spring.Aspects.2005.csproj">
+      <Name>Spring.Aspects.2003</Name>
+      <Project>{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2005.csproj">
+      <Name>Spring.Calculator.Contract.2003</Name>
+      <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.2005.csproj">
+      <Name>Spring.Calculator.Services.2003</Name>
+      <Project>{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+    </ProjectReference>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <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">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Services.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>system</Name>
+    </Reference>
+    <Reference Include="System.Web.Services">
+      <Name>system.web.services</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Program.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <EmbeddedResource Include="Config\EnterpriseServices\enterpriseServices.xml" />
+    <EmbeddedResource Include="Config\InProcess\inProcess.xml" />
+    <EmbeddedResource Include="Config\Remoting\cao-aop.xml" />
+    <EmbeddedResource Include="Config\Remoting\cao-ctor-aop.xml" />
+    <EmbeddedResource Include="Config\Remoting\cao-ctor.xml" />
+    <EmbeddedResource Include="Config\Remoting\cao.xml" />
+    <EmbeddedResource Include="Config\Remoting\saoSingleCall-aop.xml" />
+    <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" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.build b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.build
new file mode 100644
index 00000000..488a8032
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.build
@@ -0,0 +1,38 @@
+<?xml version="1.0" ?>
+<project name="Spring.Calculator.ClientApp" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+	<!--
+		Required properties:
+		* current.bin.dir           - (path) root level to build to
+		* current.build.debug       - (true|false) debug build?
+		* current.build.defines.csc - framework-specific build defines for C# compiler
+	-->
+	<target name="build">
+		<csc target="exe" define="${current.build.defines.csc}" 
+			warnaserror="true" debug="${current.build.debug}"
+			output="${current.bin.dir}/${project::get-name()}.exe">
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+			</sources>
+			<nowarn>
+				<warning number="${nowarn.numbers}" />
+			</nowarn>
+			<resources prefix="Spring.Calculator.ClientApp" dynamicprefix="true" failonempty="true">
+				<include name="**/*.xml" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+				<include name="log4net.dll" />
+			        <include name="Common.Logging.dll"/>
+				<include name="Spring.Core.dll" />
+				<include name="Spring.Aop.dll" />
+				<include name="Spring.Services.dll" />
+				<include name="Spring.Aspects.dll" />
+				<include name="Spring.Calculator.Contract.dll" />
+				<include name="Spring.Calculator.Services.dll" />
+			</references>
+		</csc>
+		<copy tofile="${current.bin.dir}/${project::get-name()}.exe.config" 
+			file="App.config"
+			overwrite="true">
+		</copy>
+	</target>
+</project>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/AssemblyInfo.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/AssemblyInfo.cs
new file mode 100644
index 00000000..2aaea54d
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/AssemblyInfo.cs
@@ -0,0 +1,43 @@
+#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-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.Contract/Domain/DivisionResult.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Domain/DivisionResult.cs
new file mode 100644
index 00000000..36f1ebbd
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Domain/DivisionResult.cs
@@ -0,0 +1,67 @@
+#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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Calculator.Domain
+{
+    [Serializable]
+	public class DivisionResult
+	{
+		private int _quotient = 0;
+		private int _rest = 0;
+
+		/// <summary>
+		/// Gets or sets the quotient of the division.
+		/// </summary>
+		public int Quotient
+		{
+			get { return _quotient; }
+			set { _quotient = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the rest of the division.
+		/// </summary>
+		public int Rest
+		{
+			get { return _rest; }
+			set { _rest = value; }
+		}
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="DivisionResult"/> class.
+		/// </summary>
+		public DivisionResult() {}
+
+		/// <summary>
+		/// Rrturns a string represantation of a division's result.
+		/// </summary>
+		/// <returns></returns>
+		public override string ToString()
+		{
+			return String.Format("Quotient: '{0}'; Rest: '{1}'", _quotient, _rest);
+		}
+	}
+}
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
new file mode 100644
index 00000000..3d7b0474
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Interfaces/IAdvancedCalculator.cs
@@ -0,0 +1,42 @@
+#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
+
+#region Imports
+
+#endregion
+
+namespace Spring.Calculator.Interfaces
+{
+	/// <summary>
+	/// An advanced calculator service interface.
+	/// </summary>
+    /// <author>Bruno Baia</author>
+	/// <version>$Id: IAdvancedCalculator.cs,v 1.1 2006/10/29 18:39:04 bbaia Exp $</version>
+    public interface IAdvancedCalculator : ICalculator
+    {
+		int GetMemory();
+
+		void SetMemory(int memoryValue);
+
+		void MemoryClear();
+
+		void MemoryAdd(int num);
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..eb1305a8
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Interfaces/ICalculator.cs
@@ -0,0 +1,44 @@
+#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
+
+#region Imports
+
+using Spring.Calculator.Domain;
+
+#endregion
+
+namespace Spring.Calculator.Interfaces
+{
+	/// <summary>
+	/// A simple calculator service interface.
+	/// </summary>
+    /// <author>Bruno Baia</author>
+	/// <version>$Id: ICalculator.cs,v 1.1 2006/10/29 18:39:04 bbaia Exp $</version>
+    public interface ICalculator
+    {
+        int Add(int n1, int n2);
+
+        int Substract(int n1, int n2);
+
+        DivisionResult Divide(int n1, int n2);
+
+        int Multiply(int n1, int n2);
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..78edd915
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2003.csproj
@@ -0,0 +1,94 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Calculator.Contract"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.Calculator"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;STRONG"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;STRONG"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References/>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\DivisionResult.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Interfaces\IAdvancedCalculator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Interfaces\ICalculator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
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
new file mode 100644
index 00000000..99898121
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.2005.csproj
@@ -0,0 +1,95 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Calculator.Contract</AssemblyName>
+    <AssemblyOriginatorKeyFile>../../Spring.Calculator.snk</AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring.Calculator</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0;STRONG</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0;STRONG</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <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>
+    </Compile>
+    <Compile Include="Interfaces\ICalculator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.build b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.build
new file mode 100644
index 00000000..01bf5481
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.Contract.build
@@ -0,0 +1,22 @@
+<?xml version="1.0" ?>
+<project name="Spring.Calculator.Contract" default="build" xmlns="http://nant.sf.net/release/0.85/nant.xsd">
+  <!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+  <target name="build">
+    <copy file="../../Spring.Calculator.snk" todir="." />
+    <csc target="library" define="${current.build.defines.csc}"
+			warnaserror="false" debug="${current.build.debug}"
+			output="${current.bin.dir}/${project::get-name()}.dll">
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+      </sources>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+    </csc>
+  </target>
+</project>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.snk b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.snk
new file mode 100644
index 00000000..a1ab9f35
Binary files /dev/null and b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Contract/Spring.Calculator.snk differ
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/App.config b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/App.config
new file mode 100644
index 00000000..890db9c6
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/App.config
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<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" />
+		</sectionGroup>
+	</configSections>
+
+	<spring>
+	
+		<context>
+			<resource uri="config://spring/objects" />
+			<resource uri="assembly://Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.Config/enterpriseServices.xml" />
+		</context>
+		
+		<objects xmlns="http://www.springframework.net">
+			<description>Definitions of objects to be registered.</description>
+			
+			<object id="calculatorService" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services" />
+			
+		</objects>
+		
+	</spring>
+	
+</configuration>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/AssemblyInfo.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/AssemblyInfo.cs
new file mode 100644
index 00000000..87cf23ea
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+#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/enterpriseServices.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Config/enterpriseServices.xml
new file mode 100644
index 00000000..74f6f0f0
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Config/enterpriseServices.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+	<description>enterpriseService</description>
+	
+	<object id="calculatorComponent" type="Spring.EnterpriseServices.ServicedComponentExporter, Spring.Services">
+		<property name="TargetName" value="calculatorService" />
+		<property name="TypeAttributes">
+			<list>
+				<object type="System.EnterpriseServices.TransactionAttribute, System.EnterpriseServices" />
+			</list>
+		</property>
+		<property name="MemberAttributes">
+			<dictionary>
+				<entry key="*">
+					<list>
+						<object type="System.EnterpriseServices.AutoCompleteAttribute, System.EnterpriseServices" />
+					</list>
+				</entry>
+			</dictionary>
+		</property>
+	</object>
+	
+	<object type="Spring.EnterpriseServices.EnterpriseServicesExporter, Spring.Services">
+		<property name="ApplicationName">
+			<value>Spring Calculator Application</value>
+		</property>
+		<property name="Description">
+			<value>Spring Calculator application.</value>
+		</property>
+		<property name="AccessControl">
+			<object type="System.EnterpriseServices.ApplicationAccessControlAttribute, System.EnterpriseServices">
+				<property name="AccessChecksLevel">
+					<value>ApplicationComponent</value>
+				</property>
+			</object>
+		</property>
+		<property name="Roles">
+			<list>
+				<value>Admin : Administrator role</value>
+				<value>User : User role</value>
+				<value>Manager : Administrator role</value>
+			</list>
+		</property>
+		<property name="Components">
+			<list>
+				<ref object="calculatorComponent" />
+			</list>
+		</property>
+		<property name="Assembly">
+			<value>Spring.Calculator.EnterpriseServices</value>
+		</property>
+	</object>
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Program.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Program.cs
new file mode 100644
index 00000000..2d207fe0
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Program.cs
@@ -0,0 +1,55 @@
+#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
+
+#region Imports
+
+using System;
+
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Calculator.RegisterComponentServices
+{
+	class Program
+	{
+		[STAThread]
+		static void Main()
+		{
+			try
+			{
+				Console.Out.WriteLine("Registering Component Services...");
+
+				ContextRegistry.GetContext(); 
+
+				Console.Out.WriteLine("Component Services registered.");
+			}
+			catch (Exception e)
+			{
+				Console.Out.WriteLine(e);
+			}
+			finally
+			{
+				Console.Out.WriteLine("--- Press <return> to quit ---");
+				Console.ReadLine();
+			}
+		}
+	}
+}
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
new file mode 100644
index 00000000..472dfb1f
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2003.csproj
@@ -0,0 +1,113 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Calculator.RegisterComponentServices"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.Calculator.RegisterComponentServices"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "Spring.Calculator.Contract"
+                    Project = "{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Calculator.Services"
+                    Project = "{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Services"
+                    AssemblyName = "Spring.Services"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Services.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Program.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Config\enterpriseServices.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
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
new file mode 100644
index 00000000..45ec517d
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2005.csproj
@@ -0,0 +1,113 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{75E2042D-1FCF-42F1-8FB9-0C6C40AE4ACD}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Calculator.RegisterComponentServices</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Spring.Calculator.RegisterComponentServices</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Program.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <EmbeddedResource Include="Config\enterpriseServices.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2005.csproj">
+      <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
+      <Name>Spring.Calculator.Contract.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.2005.csproj">
+      <Project>{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}</Project>
+      <Name>Spring.Calculator.Services.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <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">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Services.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.build b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.build
new file mode 100644
index 00000000..f3662f9a
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.build
@@ -0,0 +1,37 @@
+<?xml version="1.0" ?>
+<project name="Spring.Calculator.RegisterComponentServices" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+	<!--
+		Required properties:
+		* current.bin.dir           - (path) root level to build to
+		* current.build.debug       - (true|false) debug build?
+		* current.build.defines.csc - framework-specific build defines for C# compiler
+	-->
+	<target name="build">
+		<csc target="exe" define="${current.build.defines.csc}" 
+			warnaserror="true" debug="${current.build.debug}"
+			output="${current.bin.dir}/${project::get-name()}.exe">
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+			</sources>
+			<nowarn>
+				<warning number="${nowarn.numbers}" />
+			</nowarn>
+			<resources prefix="Spring.Calculator.RegisterComponentServices" dynamicprefix="true" failonempty="true">
+				<include name="**/*.xml" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+				<include name="log4net.dll" />
+			        <include name="Common.Logging.dll"/>
+				<include name="Spring.Core.dll" />
+				<include name="Spring.Services.dll" />
+				<include name="Spring.Calculator.Contract.dll" />
+				<include name="Spring.Calculator.Services.dll" />
+			</references>
+		</csc>
+		<copy tofile="${current.bin.dir}/${project::get-name()}.exe.config" 
+			file="App.config"
+			overwrite="true">
+		</copy>
+	</target>
+</project>
+
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/App.config b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/App.config
new file mode 100644
index 00000000..3d9b3652
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/App.config
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<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" />
+    </sectionGroup>
+  </configSections>
+
+  <spring>
+
+    <parsers>
+      <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" />
+    </context>
+
+    <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" />
+
+      <!--
+				Old fashion way without remoting config parser...
+			<object type="Spring.Remoting.RemotingConfigurer, Spring.Services">
+				<property name="Filename" value="Spring.Calculator.RemoteApp.exe.config" />
+			</object>
+			-->
+
+      <!-- Aspect -->
+
+      <object id="ConsoleLoggingAroundAdvice" type="Spring.Aspects.Logging.ConsoleLoggingAroundAdvice, Spring.Aspects">
+        <property name="ForegroundColor" value="Red" />
+      </object>
+
+      <!-- Singleton -->
+
+      <object id="singletonCalculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services">
+        <constructor-arg type="int" value="217" />
+      </object>
+
+      <object id="singletonCalculatorWeaved" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+        <property name="target" ref="singletonCalculator" />
+        <property name="interceptorNames">
+          <list>
+            <value>ConsoleLoggingAroundAdvice</value>
+          </list>
+        </property>
+      </object>
+
+      <!-- Prototype -->
+
+      <object id="prototypeCalculator" type="Spring.Calculator.Services.AdvancedCalculator, Spring.Calculator.Services" singleton="false">
+        <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" />
+          </object>
+        </property>
+        <property name="interceptorNames">
+          <list>
+            <value>ConsoleLoggingAroundAdvice</value>
+          </list>
+        </property>
+      </object>
+
+    </objects>
+
+  </spring>
+
+  <system.runtime.remoting>
+    <application>
+      <channels>
+        <channel ref="tcp" port="8005" />
+      </channels>
+    </application>
+  </system.runtime.remoting>
+
+</configuration>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/AssemblyInfo.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/AssemblyInfo.cs
new file mode 100644
index 00000000..6b1e3d0a
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+#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/Config/cao-aop.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/cao-aop.xml
new file mode 100644
index 00000000..459e350e
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/cao-aop.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects	
+	xmlns="http://www.springframework.net" 
+	xmlns:r="http://www.springframework.net/remoting">
+	
+	<description>Registers the calculator service as a CAO.</description>
+	
+	<r:caoExporter targetName="prototypeCalculatorWeaved" infinite="false">
+		<r:lifeTime initialLeaseTime="2m" renewOnCallTime="1m" />
+	</r:caoExporter>
+	
+	<!--
+		Old fashion way without remoting config parser...
+	<object id="caoCalculator" type="Spring.Remoting.CaoExporter, Spring.Services">
+		<property name="TargetName" value="prototypeCalculatorWeaved" />
+		<property name="Infinite" value="false" />
+		<property name="InitialLeaseTime" value="2m" />
+		<property name="RenewOnCallTime" value="1m" />
+	</object>
+	-->
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/cao.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/cao.xml
new file mode 100644
index 00000000..e87e69c2
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/cao.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects	
+	xmlns="http://www.springframework.net" 
+	xmlns:r="http://www.springframework.net/remoting">
+	
+	<description>Registers the calculator service as a CAO.</description>
+	
+	<r:caoExporter targetName="prototypeCalculator" infinite="false">
+		<r:lifeTime initialLeaseTime="2m" renewOnCallTime="1m" />
+	</r:caoExporter>
+	
+	<!--
+		Old fashion way without remoting config parser...
+	<object id="caoCalculator" type="Spring.Remoting.CaoExporter, Spring.Services">
+		<property name="TargetName" value="prototypeCalculator" />
+		<property name="Infinite" value="false" />
+		<property name="InitialLeaseTime" value="2m" />
+		<property name="RenewOnCallTime" value="1m" />
+	</object>
+	-->
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/saoSingleCall-aop.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/saoSingleCall-aop.xml
new file mode 100644
index 00000000..b8dcbc04
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/saoSingleCall-aop.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects	
+	xmlns="http://www.springframework.net" 
+	xmlns:r="http://www.springframework.net/remoting">
+	
+	<description>Registers the calculator service proxied as a SAO in 'SingleCall' mode.</description>
+	
+	<r:saoExporter 
+		targetName="prototypeCalculatorWeaved" 
+		serviceName="RemotedSaoSingleCallCalculatorWeaved" />
+		
+	<!--
+		Old fashion way without remoting config parser...
+	<object name="saoSingleCallCalculatorWeaved" type="Spring.Remoting.SaoExporter, Spring.Services">
+		<property name="TargetName" value="prototypeCalculatorWeaved" />
+		<property name="ServiceName" value="RemotedSaoSingleCallCalculatorWeaved" />
+	</object>
+	-->
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/saoSingleCall.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/saoSingleCall.xml
new file mode 100644
index 00000000..763c496e
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/saoSingleCall.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects	
+	xmlns="http://www.springframework.net" 
+	xmlns:r="http://www.springframework.net/remoting">
+	
+	<description>Registers the calculator service as a SAO in 'SingleCall' mode.</description>
+	
+	<r:saoExporter 
+		targetName="prototypeCalculator" 
+		serviceName="RemotedSaoSingleCallCalculator" />
+		
+	<!--
+		Old fashion way without remoting config parser...
+	<object name="saoSingleCallCalculator" type="Spring.Remoting.SaoExporter, Spring.Services">
+		<property name="TargetName" value="prototypeCalculator" />
+		<property name="ServiceName" value="RemotedSaoSingleCallCalculator" />
+	</object>
+	-->
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/saoSingleton-aop.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/saoSingleton-aop.xml
new file mode 100644
index 00000000..4fb69006
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/saoSingleton-aop.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects	
+	xmlns="http://www.springframework.net" 
+	xmlns:r="http://www.springframework.net/remoting">
+	
+	<description>Registers the calculator service proxied as a SAO in 'Singleton' mode.</description>
+	
+	<r:saoExporter 
+		targetName="singletonCalculatorWeaved" 
+		serviceName="RemotedSaoSingletonCalculatorWeaved" />
+	
+	<!--
+		Old fashion way without remoting config parser...
+	<object name="saoSingletonCalculatorWeaved" type="Spring.Remoting.SaoExporter, Spring.Services">
+		<property name="TargetName" value="singletonCalculatorWeaved" />
+		<property name="ServiceName" value="RemotedSaoSingletonCalculatorWeaved" />
+	</object>
+	-->
+	
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/saoSingleton.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/saoSingleton.xml
new file mode 100644
index 00000000..88b0e694
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Config/saoSingleton.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects	
+	xmlns="http://www.springframework.net" 
+	xmlns:r="http://www.springframework.net/remoting">
+	
+	<description>Registers the calculator service as a SAO in 'Singleton' mode.</description>
+	
+	<r:saoExporter 
+		targetName="singletonCalculator" 
+		serviceName="RemotedSaoSingletonCalculator" />
+	
+	<!--
+		Old fashion way without remoting config parser...
+	<object name="saoSingletonCalculator" type="Spring.Remoting.SaoExporter, Spring.Services">
+		<property name="TargetName" value="singletonCalculator" />
+		<property name="ServiceName" value="RemotedSaoSingletonCalculator" />
+	</object>
+	-->
+	
+</objects>
\ 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
new file mode 100644
index 00000000..4bc4ebda
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Program.cs
@@ -0,0 +1,55 @@
+#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
+
+#region Imports
+
+using System;
+using System.Runtime.Remoting;
+
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Calculator.RemoteApp
+{
+	class Program
+	{
+		[STAThread]
+		static void Main()
+		{
+			try
+			{
+                // Force Spring to load configuration
+				ContextRegistry.GetContext();
+
+				Console.Out.WriteLine("Server listening...");
+			}
+			catch (Exception e)
+			{
+				Console.Out.WriteLine(e);
+			}
+			finally
+			{
+                Console.Out.WriteLine("--- Press <return> to quit ---");
+				Console.ReadLine();
+			}
+		}
+	}
+}
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
new file mode 100644
index 00000000..daf94820
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2003.csproj
@@ -0,0 +1,148 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Calculator.RemoteApp"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.Calculator.RemoteApp"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "Spring.Calculator.Contract"
+                    Project = "{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Calculator.Services"
+                    Project = "{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Aspects.2003"
+                    Project = "{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Aop.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+                <Reference
+                    Name = "Spring.Services"
+                    AssemblyName = "Spring.Services"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Services.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Program.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Config\cao.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\cao-aop.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\saoSingleCall.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\saoSingleCall-aop.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\saoSingleton.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Config\saoSingleton-aop.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
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
new file mode 100644
index 00000000..2ba72477
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.2005.csproj
@@ -0,0 +1,129 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{78B542F5-0CE3-4EDD-ACF7-3B2C619ADFC1}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Calculator.RemoteApp</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Spring.Calculator.RemoteApp</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <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">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Services.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Program.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <EmbeddedResource Include="Config\cao-aop.xml" />
+    <EmbeddedResource Include="Config\cao.xml" />
+    <EmbeddedResource Include="Config\saoSingleCall-aop.xml" />
+    <EmbeddedResource Include="Config\saoSingleCall.xml" />
+    <EmbeddedResource Include="Config\saoSingleton-aop.xml" />
+    <EmbeddedResource Include="Config\saoSingleton.xml" />
+  </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>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Calculator.Services\Spring.Calculator.Services.2005.csproj">
+      <Project>{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}</Project>
+      <Name>Spring.Calculator.Services.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.build b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.build
new file mode 100644
index 00000000..19b822b4
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RemoteApp/Spring.Calculator.RemoteApp.build
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<project name="Spring.Calculator.RemoteApp" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+	<!--
+		Required properties:
+		* current.bin.dir           - (path) root level to build to
+		* current.build.debug       - (true|false) debug build?
+		* current.build.defines.csc - framework-specific build defines for C# compiler
+	-->
+	<target name="build">
+		<csc target="exe" define="${current.build.defines.csc}" 
+			warnaserror="true" debug="${current.build.debug}"
+			output="${current.bin.dir}/${project::get-name()}.exe">
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+			</sources>
+			<nowarn>
+				<warning number="${nowarn.numbers}" />
+			</nowarn>
+			<resources prefix="Spring.Calculator.RemoteApp" dynamicprefix="true" failonempty="true">
+				<include name="**/*.xml" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+				<include name="log4net.dll" />
+			        <include name="Common.Logging.dll"/>
+				<include name="Spring.Core.dll" />
+				<include name="Spring.Aop.dll" />
+				<include name="Spring.Services.dll" />
+				<include name="Spring.Aspects.dll" />
+				<include name="Spring.Calculator.Contract.dll" />
+				<include name="Spring.Calculator.Services.dll" />
+			</references>
+		</csc>
+		<copy tofile="${current.bin.dir}/${project::get-name()}.exe.config" 
+			file="App.config"
+			overwrite="true">
+		</copy>
+	</target>
+</project>
+
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/AssemblyInfo.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/AssemblyInfo.cs
new file mode 100644
index 00000000..e556b1d8
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/AssemblyInfo.cs
@@ -0,0 +1,43 @@
+#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
new file mode 100644
index 00000000..0fe3687b
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/AdvancedCalculator.cs
@@ -0,0 +1,78 @@
+#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
+
+#region Imports
+
+using Spring.Calculator.Interfaces;
+
+#endregion
+
+namespace Spring.Calculator.Services
+{
+	/// <summary>
+	/// An advanced calculator service.
+	/// </summary>
+    /// <author>Bruno Baia</author>
+	/// <version>$Id: AdvancedCalculator.cs,v 1.2 2006/12/04 01:38:42 bbaia Exp $</version>
+    public class AdvancedCalculator : Calculator, IAdvancedCalculator
+    {
+		#region Fields
+
+		private int memoryStore = 0;
+
+		#endregion
+
+		#region Constructor(s) / Destructor
+
+		public AdvancedCalculator()
+		{}
+
+		public AdvancedCalculator(int initialMemory)
+		{
+			memoryStore = initialMemory;
+		}
+
+		#endregion
+
+		#region IAdvancedCalculator Members
+
+		public int GetMemory()
+		{
+			return memoryStore;
+		}
+
+		public void SetMemory(int memoryValue)
+		{
+			memoryStore = memoryValue;	
+		}
+
+		public void MemoryClear()
+		{
+			memoryStore = 0;
+		}
+
+		public void MemoryAdd(int num)
+		{
+			memoryStore += num;
+		}
+
+		#endregion
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..36c84a7a
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/Calculator.cs
@@ -0,0 +1,64 @@
+#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
+
+#region Imports
+
+using Spring.Calculator.Domain;
+using Spring.Calculator.Interfaces;
+
+#endregion
+
+namespace Spring.Calculator.Services
+{
+	/// <summary>
+	/// A calculator service.
+	/// </summary>
+    /// <author>Bruno Baia</author>
+	/// <version>$Id: Calculator.cs,v 1.1 2006/10/29 18:39:13 bbaia Exp $</version>
+    public class Calculator : ICalculator
+    {
+		#region ICalculator Members
+
+        public int Add(int n1, int n2)
+        {
+            return n1 + n2;
+        }
+
+        public int Substract(int n1, int n2)
+        {
+            return n1 - n2;
+        }
+
+        public DivisionResult Divide(int n1, int n2)
+        {
+            DivisionResult result = new DivisionResult();
+            result.Quotient = n1 / n2;
+            result.Rest = n1 % n2;
+            return result;
+        }
+
+        public int Multiply(int n1, int n2)
+        {
+            return n1 * n2;
+        }
+
+		#endregion
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..50341278
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2003.csproj
@@ -0,0 +1,95 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Calculator.Services"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.Calculator"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;STRONG"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;STRONG"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "Spring.Calculator.Contract"
+                    Project = "{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Services\AdvancedCalculator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Services\Calculator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
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
new file mode 100644
index 00000000..383959b6
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2005.csproj
@@ -0,0 +1,100 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Calculator.Services</AssemblyName>
+    <AssemblyOriginatorKeyFile>../../Spring.Calculator.snk</AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring.Calculator</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0;STRONG</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0;STRONG</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Services\AdvancedCalculator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Services\Calculator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Calculator.Contract\Spring.Calculator.Contract.2005.csproj">
+      <Project>{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}</Project>
+      <Name>Spring.Calculator.Contract.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.build b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.build
new file mode 100644
index 00000000..c8b9a8ed
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.build
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+<project name="Spring.Calculator.Services" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+	<!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+	<target name="build">
+    <copy file="../../Spring.Calculator.snk" todir="." />
+		<csc target="library" define="${current.build.defines.csc}" 
+			warnaserror="false" debug="${current.build.debug}"
+			output="${current.bin.dir}/${project::get-name()}.dll">
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+			</sources>
+			<nowarn>
+				<warning number="${nowarn.numbers}" />
+			</nowarn>
+			<references basedir="${current.bin.dir}">
+				<include name="Spring.Calculator.Contract.dll" />
+			</references>
+		</csc>
+	</target>
+</project>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.snk b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.snk
new file mode 100644
index 00000000..a1ab9f35
Binary files /dev/null and b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.snk differ
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
new file mode 100644
index 00000000..383a480c
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+#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/Config/webServices-aop.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Config/webServices-aop.xml
new file mode 100644
index 00000000..22617648
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/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.2003/Config/webServices.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Config/webServices.xml
new file mode 100644
index 00000000..a9306898
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/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.2003/Default.aspx b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Default.aspx
new file mode 100644
index 00000000..ba146152
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/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.2003/Spring.Calculator.Web.2003.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Spring.Calculator.Web.2003.csproj
new file mode 100644
index 00000000..37087a4e
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Spring.Calculator.Web.2003.csproj
@@ -0,0 +1,151 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Web"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{1AA797F9-51F7-43FE-BDFE-6AC8C1CACC0B}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Calculator.Web"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.Calculator.Web"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Web"
+                    AssemblyName = "System.Web"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
+                />
+                <Reference
+                    Name = "Spring.Aspects.2003"
+                    Project = "{6B34626E-8D2A-4387-BBB6-CB352D4DBDEC}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Calculator.Contract.2003"
+                    Project = "{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Calculator.Services.2003"
+                    Project = "{D9FB04E5-D636-4EC2-A3AB-FAB1C4F37827}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Common.Logging.Log4Net"
+                    AssemblyName = "Common.Logging.Log4Net"
+                    HintPath = "..\..\lib\net\1.1\Common.Logging.Log4Net.dll"
+                />
+                <Reference
+                    Name = "log4net"
+                    AssemblyName = "log4net"
+                    HintPath = "..\..\lib\net\1.1\log4net.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Aop.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+                <Reference
+                    Name = "Spring.Web"
+                    AssemblyName = "Spring.Web"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Web.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Default.aspx"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web.config"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Config\webServices.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Config\webServices-aop.xml"
+                    BuildAction = "Content"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Spring.Calculator.Web.2003.csproj.webinfo b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Spring.Calculator.Web.2003.csproj.webinfo
new file mode 100644
index 00000000..501f95dd
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Spring.Calculator.Web.2003.csproj.webinfo
@@ -0,0 +1,4 @@
+<VisualStudioUNCWeb>
+    <Web URLPath = "http://localhost/Spring.Calculator.2003/Spring.Calculator.Web.2003.csproj" />
+</VisualStudioUNCWeb>
+
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Web.config b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Web.config
new file mode 100644
index 00000000..660ae6ac
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2003/Web.config
@@ -0,0 +1,111 @@
+<?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 defaultLanguage="c#" 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>
+	
+	<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>
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Common.Logging.Log4Net.dll.refresh b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Common.Logging.Log4Net.dll.refresh
new file mode 100644
index 00000000..752c9cd6
Binary files /dev/null and b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Common.Logging.Log4Net.dll.refresh differ
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Common.Logging.dll.refresh b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Common.Logging.dll.refresh
new file mode 100644
index 00000000..7ae4334d
Binary files /dev/null and b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Common.Logging.dll.refresh differ
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Spring.Aop.dll.refresh b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Spring.Aop.dll.refresh
new file mode 100644
index 00000000..cc858ae7
Binary files /dev/null and b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Spring.Aop.dll.refresh differ
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Spring.Core.dll.refresh b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Spring.Core.dll.refresh
new file mode 100644
index 00000000..d6773450
Binary files /dev/null and b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Spring.Core.dll.refresh differ
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Spring.Services.dll.refresh b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Spring.Services.dll.refresh
new file mode 100644
index 00000000..a87a804e
Binary files /dev/null and b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Spring.Services.dll.refresh differ
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Spring.Web.dll.refresh b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Spring.Web.dll.refresh
new file mode 100644
index 00000000..b31d8acc
Binary files /dev/null and b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/Spring.Web.dll.refresh differ
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
new file mode 100644
index 00000000..cdcfe328
Binary files /dev/null and b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/antlr.runtime.dll.refresh differ
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/log4net.dll.refresh b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/log4net.dll.refresh
new file mode 100644
index 00000000..a0e5896a
Binary files /dev/null and b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Bin/log4net.dll.refresh differ
diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Config/webServices-aop.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Config/webServices-aop.xml
new file mode 100644
index 00000000..22617648
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/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.2005/Config/webServices.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Config/webServices.xml
new file mode 100644
index 00000000..a9306898
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/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.2005/Default.aspx b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Default.aspx
new file mode 100644
index 00000000..ba146152
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/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.2005/Web.config b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Web.config
new file mode 100644
index 00000000..8422cda5
--- /dev/null
+++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Web.2005/Web.config
@@ -0,0 +1,111 @@
+<?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"/>
+    <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"/>
+			<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>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/Debug.Spring.Northwind.sln b/examples/Spring/Spring.Data.NHibernate.Northwind/Debug.Spring.Northwind.sln
new file mode 100644
index 00000000..fa5a7288
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/Debug.Spring.Northwind.sln
@@ -0,0 +1,184 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Service", "src\Spring.Northwind.Service\Spring.Northwind.Service.csproj", "{9E15876F-E9E0-43B7-9874-B54F163757D6}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Dao", "src\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj", "{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Dao.NHibernate", "src\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.csproj", "{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.IntegrationTests", "test\Spring.Northwind.IntegrationTests\Spring.Northwind.IntegrationTests.csproj", "{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aspects", "src\Spring.Aspects\Spring.Aspects.csproj", "{53B04C54-63EA-45AA-BB83-8950AF3C5D68}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2005", "..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6F8CFB7E-8CC9-477B-83D1-2FADD070EEE0}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aop.2005", "..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj", "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.2005", "..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj", "{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.2005", "..\..\..\src\Spring\Spring.Data.NHibernate\Spring.Data.NHibernate.2005.csproj", "{130E1609-45A7-4F65-B112-105F2DD3E2CE}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.2005", "..\..\..\src\Spring\Spring.Web\Spring.Web.2005.csproj", "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|.NET.ActiveCfg = Release|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|.NET.ActiveCfg = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|.NET.ActiveCfg = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|.NET.ActiveCfg = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Release|.NET.ActiveCfg = Release|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{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
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|.NET.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|.NET.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|.NET.ActiveCfg = Release|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{130E1609-45A7-4F65-B112-105F2DD3E2CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.sln b/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.sln
new file mode 100644
index 00000000..8ddd320b
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/Spring.Northwind.sln
@@ -0,0 +1,148 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "L:\...\Spring.Northwind.Web\", "src\Spring.Northwind.Web\", "{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}"
+	ProjectSection(WebsiteProperties) = preProject
+		ProjectReferences = "{53B04C54-63EA-45AA-BB83-8950AF3C5D68}|Spring.Aspects.dll;{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}|Spring.Northwind.Dao.dll;{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}|Spring.Northwind.Dao.NHibernate.dll;{9E15876F-E9E0-43B7-9874-B54F163757D6}|Spring.Northwind.Service.dll;{FD89FEBE-4914-45F3-9123-B2CB954810DD}|Spring.Northwind.Web.References.dll;"
+		Debug.AspNetCompiler.VirtualPath = "/Spring.Northwind.Web"
+		Debug.AspNetCompiler.PhysicalPath = "src\Spring.Northwind.Web\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Northwind.Web\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/Spring.Northwind.Web"
+		Release.AspNetCompiler.PhysicalPath = "src\Spring.Northwind.Web\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Northwind.Web\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "17866"
+		DefaultWebSiteLanguage = "Visual C#"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Service", "src\Spring.Northwind.Service\Spring.Northwind.Service.csproj", "{9E15876F-E9E0-43B7-9874-B54F163757D6}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Dao", "src\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj", "{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Dao.NHibernate", "src\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.csproj", "{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.IntegrationTests", "test\Spring.Northwind.IntegrationTests\Spring.Northwind.IntegrationTests.csproj", "{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Aspects", "src\Spring.Aspects\Spring.Aspects.csproj", "{53B04C54-63EA-45AA-BB83-8950AF3C5D68}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Northwind.Web.References", "src\Spring.Northwind.Web.References\Spring.Northwind.Web.References.csproj", "{FD89FEBE-4914-45F3-9123-B2CB954810DD}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|.NET.ActiveCfg = Debug|.NET
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|.NET.Build.0 = Debug|.NET
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Debug|Mixed Platforms.Build.0 = Debug|.NET
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|.NET.ActiveCfg = Debug|.NET
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|.NET.Build.0 = Debug|.NET
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|Any CPU.ActiveCfg = Debug|.NET
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
+		{3E321CBC-75B0-45C4-AFEF-7CEED28368AE}.Release|Mixed Platforms.Build.0 = Debug|.NET
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|.NET.ActiveCfg = Release|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9E15876F-E9E0-43B7-9874-B54F163757D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|.NET.ActiveCfg = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|.NET.ActiveCfg = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|.NET.ActiveCfg = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Release|.NET.ActiveCfg = Release|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{53B04C54-63EA-45AA-BB83-8950AF3C5D68}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{FD89FEBE-4914-45F3-9123-B2CB954810DD}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{FD89FEBE-4914-45F3-9123-B2CB954810DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD89FEBE-4914-45F3-9123-B2CB954810DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD89FEBE-4914-45F3-9123-B2CB954810DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FD89FEBE-4914-45F3-9123-B2CB954810DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FD89FEBE-4914-45F3-9123-B2CB954810DD}.Release|.NET.ActiveCfg = Release|Any CPU
+		{FD89FEBE-4914-45F3-9123-B2CB954810DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD89FEBE-4914-45F3-9123-B2CB954810DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD89FEBE-4914-45F3-9123-B2CB954810DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{FD89FEBE-4914-45F3-9123-B2CB954810DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		NAntAddinLastFileName = 
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/readme.txt b/examples/Spring/Spring.Data.NHibernate.Northwind/readme.txt
new file mode 100644
index 00000000..4b5fb71c
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/readme.txt
@@ -0,0 +1,17 @@
+
+Database configuration
+======================
+
+A database file containing the Northwind database schema and data is located in the 
+directory src\Spring.Northwind.Web\App_Data named NORTHWND.MDF.  This file can me mounted explicitly using SQL Server 2005 or
+SQL Server Express.  The web project's <db:provider> configuration is
+setup to point to this database file.  
+
+The integratation tests point to a copy of that database located in the
+directory \test\Spring.Northwind.IntegrationTests\bin\Debug.  You will need to copy the .mdf file to the bin\Debug
+directory to run the integration test.
+
+SQL Server Express or 2005 will need to running before the web application or integration test is launched.
+
+If you prefer to run against your own database, the schema is located in the test_northwind.sql and you will need to
+modify your connection string accordingly.
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Aspects/Aspects/Logging/CommonLoggingAroundAdvice.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Aspects/Aspects/Logging/CommonLoggingAroundAdvice.cs
new file mode 100644
index 00000000..d0e149d5
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Aspects/Aspects/Logging/CommonLoggingAroundAdvice.cs
@@ -0,0 +1,103 @@
+#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
+
+#region Imports
+
+using System;
+
+using AopAlliance.Intercept;
+using Common.Logging;
+
+#endregion
+
+namespace Spring.Aspects.Logging
+{
+    /// <summary>
+    /// Basic implementation of a logging aspect using Common.Logging library.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: CommonLoggingAroundAdvice.cs,v 1.2 2007/06/27 16:10:59 bbaia Exp $</version>
+    public class CommonLoggingAroundAdvice : IMethodInterceptor
+    {
+        #region Logging
+
+        private static readonly ILog LOG = LogManager.GetLogger(typeof(CommonLoggingAroundAdvice));
+
+        #endregion
+
+        #region Fields
+
+        private LogLevel _level = LogLevel.All;
+
+        #endregion
+
+        #region Properties
+
+        public LogLevel Level
+        {
+            get { return _level; }
+            set { _level = value; }
+        }
+
+        #endregion
+
+        #region IMethodInterceptor Members
+
+        public object Invoke(IMethodInvocation invocation)
+        {
+            Log("Intercepted call : about to invoke method '{0}'", invocation.Method.Name);
+            object returnValue = invocation.Proceed();
+            Log("Intercepted call : returned '{0}'", returnValue);
+            return returnValue;
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private void Log(string text, params object[] args)
+        {
+            switch (Level)
+            {
+                case LogLevel.All:
+                case LogLevel.Debug:
+                    if (LOG.IsDebugEnabled) LOG.Debug(String.Format(text, args));
+                    break;
+                case LogLevel.Error:
+                    if (LOG.IsErrorEnabled) LOG.Error(String.Format(text, args));
+                    break;
+                case LogLevel.Fatal:
+                    if (LOG.IsFatalEnabled) LOG.Fatal(String.Format(text, args));
+                    break;
+                case LogLevel.Info:
+                    if (LOG.IsInfoEnabled) LOG.Info(String.Format(text, args));
+                    break;
+                case LogLevel.Warn:
+                    if (LOG.IsWarnEnabled) LOG.Warn(String.Format(text, args));
+                    break;
+                case LogLevel.Off:
+                default:
+                    break;
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Aspects/Properties/AssemblyInfo.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Aspects/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..993267c9
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Aspects/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Spring.Aspects")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Spring.Aspects")]
+[assembly: AssemblyCopyright("Copyright ©  2006")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("a308abe4-e623-4315-aa51-13b52a9324d8")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Aspects/Spring.Aspects.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Aspects/Spring.Aspects.csproj
new file mode 100644
index 00000000..dd224740
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Aspects/Spring.Aspects.csproj
@@ -0,0 +1,55 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{53B04C54-63EA-45AA-BB83-8950AF3C5D68}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Aspects</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</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\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Aspects\Logging\CommonLoggingAroundAdvice.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Dao/NHibernate/HibernateCustomerDao.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Dao/NHibernate/HibernateCustomerDao.cs
new file mode 100644
index 00000000..98df1d85
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Dao/NHibernate/HibernateCustomerDao.cs
@@ -0,0 +1,67 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+
+using System.Collections;
+
+using Spring.Data.NHibernate.Support;
+using Spring.Transaction.Interceptor;
+
+using Spring.Northwind.Domain;
+
+#endregion
+
+namespace Spring.Northwind.Dao.NHibernate
+{
+    public class HibernateCustomerDao : HibernateDaoSupport, ICustomerDao
+    {
+        public Customer FindById(string customerId)
+        {
+            return HibernateTemplate.Load(typeof (Customer), customerId) as Customer;
+        }
+
+        public IList FindAll()
+        {
+            return HibernateTemplate.LoadAll(typeof (Customer));
+        }
+
+        [Transaction(ReadOnly = false)]
+        public Customer Save(Customer customer)
+        {
+            HibernateTemplate.Save(customer);
+            return customer;
+        }
+
+        [Transaction(ReadOnly = false)]
+        public Customer SaveOrUpdate(Customer customer)
+        {
+            HibernateTemplate.SaveOrUpdate(customer);
+            return customer;
+        }
+
+        [Transaction(ReadOnly = false)]
+        public void Delete(Customer customer)
+        {
+            HibernateTemplate.Delete(customer);
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Dao/NHibernate/HibernateOrderDao.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Dao/NHibernate/HibernateOrderDao.cs
new file mode 100644
index 00000000..9917ce0c
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Dao/NHibernate/HibernateOrderDao.cs
@@ -0,0 +1,63 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System.Collections;
+
+using Spring.Data.NHibernate.Support;
+
+using Spring.Northwind.Domain;
+
+#endregion
+
+namespace Spring.Northwind.Dao.NHibernate
+{
+    public class HibernateOrderDao : HibernateDaoSupport, IOrderDao
+    {
+        public Order FindById(long orderId)
+        {
+            return HibernateTemplate.Load(typeof(Order), orderId) as Order;
+   
+        }
+
+        public IList FindAll()
+        {
+            return HibernateTemplate.LoadAll(typeof(Order));
+        }
+
+        public Order Save(Order order)
+        {
+            HibernateTemplate.Save(order);
+            return order;
+        }
+
+        public Order SaveOrUpdate(Order order)
+        {
+            HibernateTemplate.SaveOrUpdate(order);
+            return order;
+        }
+
+        public void Delete(Order order)
+        {
+            HibernateTemplate.Delete(order);
+        }
+    }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Dao/NHibernate/HibernateProductDao.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Dao/NHibernate/HibernateProductDao.cs
new file mode 100644
index 00000000..a51a2631
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Dao/NHibernate/HibernateProductDao.cs
@@ -0,0 +1,63 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System.Collections;
+
+using Spring.Data.NHibernate.Support;
+
+using Spring.Northwind.Domain;
+
+#endregion
+
+namespace Spring.Northwind.Dao.NHibernate
+{
+    public class HibernateProductDao : HibernateDaoSupport, IProductDao
+    {
+        public Product FindById(int productId)
+        {
+            return HibernateTemplate.Load(typeof(Product), productId) as Product;
+     
+        }
+
+        public IList FindAll()
+        {
+            return HibernateTemplate.LoadAll(typeof(Product));
+        }
+
+        public Product Save(Product product)
+        {
+            HibernateTemplate.Save(product);
+            return product;
+        }
+
+        public Product SaveOrUpdate(Product product)
+        {
+            HibernateTemplate.SaveOrUpdate(product);
+            return product;
+        }
+
+        public void Delete(Product product)
+        {
+            HibernateTemplate.Delete(product);
+        }
+    }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Mappings/Customer.hbm.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Mappings/Customer.hbm.xml
new file mode 100644
index 00000000..6d93b162
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Mappings/Customer.hbm.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+  <class name="Spring.Northwind.Domain.Customer, Spring.Northwind.Dao" table="Customers" lazy="false">
+    <id name="Id" type="String" unsaved-value="null">
+      <column name="CustomerID" length="5" sql-type="nchar" not-null="true" unique="true" index="PK_Customers"/>
+      <generator class="native" />
+    </id>
+    <property name="CompanyName" type="String">
+      <column name="CompanyName" length="40" sql-type="nvarchar" not-null="true" index="CompanyName"/>
+    </property>
+    <property name="ContactName" type="String">
+      <column name="ContactName" length="30" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="ContactTitle" type="String">
+      <column name="ContactTitle" length="30" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="Address" type="String">
+      <column name="Address" length="60" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="City" type="String">
+      <column name="City" length="15" sql-type="nvarchar" not-null="false" index="City"/>
+    </property>
+    <property name="Region" type="String">
+      <column name="Region" length="15" sql-type="nvarchar" not-null="false" index="Region"/>
+    </property>
+    <property name="PostalCode" type="String">
+      <column name="PostalCode" length="10" sql-type="nvarchar" not-null="false" index="PostalCode"/>
+    </property>
+    <property name="Country" type="String">
+      <column name="Country" length="15" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="Phone" type="String">
+      <column name="Phone" length="24" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="Fax" type="String">
+      <column name="Fax" length="24" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <bag name="Orders" inverse="true" lazy="true" cascade="all">
+      <key column="CustomerID"/>
+      <one-to-many class="Spring.Northwind.Domain.Order, Spring.Northwind.Dao"/>
+    </bag>
+  </class>
+</hibernate-mapping>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Mappings/Oracle/Customer.hbm.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Mappings/Oracle/Customer.hbm.xml
new file mode 100644
index 00000000..6d93b162
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Mappings/Oracle/Customer.hbm.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+  <class name="Spring.Northwind.Domain.Customer, Spring.Northwind.Dao" table="Customers" lazy="false">
+    <id name="Id" type="String" unsaved-value="null">
+      <column name="CustomerID" length="5" sql-type="nchar" not-null="true" unique="true" index="PK_Customers"/>
+      <generator class="native" />
+    </id>
+    <property name="CompanyName" type="String">
+      <column name="CompanyName" length="40" sql-type="nvarchar" not-null="true" index="CompanyName"/>
+    </property>
+    <property name="ContactName" type="String">
+      <column name="ContactName" length="30" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="ContactTitle" type="String">
+      <column name="ContactTitle" length="30" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="Address" type="String">
+      <column name="Address" length="60" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="City" type="String">
+      <column name="City" length="15" sql-type="nvarchar" not-null="false" index="City"/>
+    </property>
+    <property name="Region" type="String">
+      <column name="Region" length="15" sql-type="nvarchar" not-null="false" index="Region"/>
+    </property>
+    <property name="PostalCode" type="String">
+      <column name="PostalCode" length="10" sql-type="nvarchar" not-null="false" index="PostalCode"/>
+    </property>
+    <property name="Country" type="String">
+      <column name="Country" length="15" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="Phone" type="String">
+      <column name="Phone" length="24" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="Fax" type="String">
+      <column name="Fax" length="24" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <bag name="Orders" inverse="true" lazy="true" cascade="all">
+      <key column="CustomerID"/>
+      <one-to-many class="Spring.Northwind.Domain.Order, Spring.Northwind.Dao"/>
+    </bag>
+  </class>
+</hibernate-mapping>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Mappings/Order.hbm.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Mappings/Order.hbm.xml
new file mode 100644
index 00000000..a37c304e
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Mappings/Order.hbm.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+  <class name="Spring.Northwind.Domain.Order, Spring.Northwind.Dao" table="Orders" lazy="false">
+    <id name="Id" type="Int32" unsaved-value="0">
+      <column name="OrderID" sql-type="int" not-null="true" unique="true" index="PK_Orders"/>
+      <generator class="native" />
+    </id>
+    <property name="OrderDate" type="DateTime">
+      <column name="OrderDate" sql-type="datetime" not-null="false" index="OrderDate"/>
+    </property>
+    <property name="RequiredDate" type="DateTime">
+      <column name="RequiredDate" sql-type="datetime" not-null="false"/>
+    </property>
+    <property name="ShippedDate" type="DateTime">
+      <column name="ShippedDate" sql-type="datetime" not-null="false" index="ShippedDate"/>
+    </property>
+    <!--
+    <property name="Freight" type="Decimal">
+      <column name="Freight" sql-type="money" not-null="false"/>
+    </property>
+    -->
+    <property name="ShipName" type="String">
+      <column name="ShipName" length="40" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="ShipAddress" type="String">
+      <column name="ShipAddress" length="60" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="ShipCity" type="String">
+      <column name="ShipCity" length="15" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="ShipRegion" type="String">
+      <column name="ShipRegion" length="15" sql-type="nvarchar" not-null="false"/>
+    </property>
+    <property name="ShipPostalCode" type="String">
+      <column name="ShipPostalCode" length="10" sql-type="nvarchar" not-null="false" index="ShipPostalCode"/>
+    </property>
+    <property name="ShipCountry" type="String">
+      <column name="ShipCountry" length="15" sql-type="nvarchar" not-null="false"/>
+    </property>
+      
+    <bag name="OrderDetails" inverse="true" lazy="true" cascade="all">
+      <key column="OrderID"/>
+      <one-to-many class="Spring.Northwind.Domain.OrderDetail, Spring.Northwind.Dao"/>
+    </bag>
+      
+    <!--
+    <many-to-one name="Customer" class="Spring.Northwind.Domain.Order, Spring.Northwind.Dao">
+      <column name="CustomerID" length="5" sql-type="nchar" not-null="false" index="CustomerID"/>
+    </many-to-one>
+    -->
+  </class>
+</hibernate-mapping>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Mappings/OrderDetail.hbm.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Mappings/OrderDetail.hbm.xml
new file mode 100644
index 00000000..31c7f11d
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Mappings/OrderDetail.hbm.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+  <class name="Spring.Northwind.Domain.OrderDetail, Spring.Northwind.Dao" table="[Order Details]" lazy="false">
+    <composite-id>
+        <key-many-to-one name="Order" class="Spring.Northwind.Domain.Order, Spring.Northwind.Dao" column="OrderID"/>
+        <key-property name="ProductId" column="ProductID" />
+    </composite-id> 
+    <property name="UnitPrice" type="double">
+      <column name="UnitPrice" sql-type="money" not-null="false" />
+    </property>
+    <property name="Quantity" type="int">
+      <column name="Quantity" sql-type="int" not-null="false" />
+    </property>
+    <property name="Discount" type="double">
+      <column name="Discount" sql-type="real" not-null="false" />
+    </property>
+  </class>
+</hibernate-mapping>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Properties/AssemblyInfo.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..677e039e
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Spring.Northwind.Dao.NHibernate")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Spring.Northwind.Dao.NHibernate")]
+[assembly: AssemblyCopyright("Copyright ©  2006")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("3cb95513-bb8f-4426-bc10-c4c1cae81853")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.csproj
new file mode 100644
index 00000000..f951b6a0
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Spring.Northwind.Dao.NHibernate.csproj
@@ -0,0 +1,108 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.Northwind</RootNamespace>
+    <AssemblyName>Spring.Northwind.Dao.NHibernate</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</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\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\net\2.0\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\Castle.DynamicProxy.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.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>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.Log4Net.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\Iesi.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=1.2.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data.NHibernate12, Version=1.1.1.20093, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate12.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Dao\NHibernate\HibernateCustomerDao.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Dao\NHibernate\HibernateOrderDao.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Dao\NHibernate\HibernateProductDao.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Mappings\Customer.hbm.xml" />
+    <EmbeddedResource Include="Mappings\Order.hbm.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj">
+      <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
+      <Name>Spring.Northwind.Dao</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Mappings\OrderDetail.hbm.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Dao/ICustomerDao.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Dao/ICustomerDao.cs
new file mode 100644
index 00000000..020ae10e
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Dao/ICustomerDao.cs
@@ -0,0 +1,39 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System.Collections;
+
+using Spring.Northwind.Domain;
+
+#endregion
+
+namespace Spring.Northwind.Dao
+{
+    public interface ICustomerDao
+    {
+        Customer FindById(string customerId);
+        IList FindAll();
+        Customer Save(Customer customer);
+        Customer SaveOrUpdate(Customer customer);
+        void Delete(Customer customer);                
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Dao/IOrderDao.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Dao/IOrderDao.cs
new file mode 100644
index 00000000..6c1bf29b
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Dao/IOrderDao.cs
@@ -0,0 +1,39 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System.Collections;
+
+using Spring.Northwind.Domain;
+
+#endregion
+
+namespace Spring.Northwind.Dao
+{
+    public interface IOrderDao
+    {
+        Order FindById(long orderId);
+        IList FindAll();
+        Order Save(Order order);
+        Order SaveOrUpdate(Order order);
+        void Delete(Order order);  
+    }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Dao/IProductDao.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Dao/IProductDao.cs
new file mode 100644
index 00000000..7a830e57
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Dao/IProductDao.cs
@@ -0,0 +1,39 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System.Collections;
+
+using Spring.Northwind.Domain;
+
+#endregion
+
+namespace Spring.Northwind.Dao
+{
+    public interface IProductDao
+    {
+        Product FindById(int productId);
+        IList FindAll();
+        Product Save(Product product);
+        Product SaveOrUpdate(Product product);
+        void Delete(Product product);  
+    }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Domain/Customer.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Domain/Customer.cs
new file mode 100644
index 00000000..89970834
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Domain/Customer.cs
@@ -0,0 +1,150 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+
+namespace Spring.Northwind.Domain
+{
+    public class Customer
+    {
+        #region Fields
+
+        protected string id;
+        protected string companyName;
+        protected string contactName;
+        protected string contactTitle;
+        protected string address;
+        protected string city;
+        protected string region;
+        protected string postalCode;
+        protected string country;
+        protected string phone;
+        protected string fax;
+        protected IList orders;
+
+        #endregion
+
+        #region Properties
+
+        public string Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
+
+        public string CompanyName
+        {
+            get { return companyName; }
+            set { companyName = value; }
+        }
+
+        public string ContactName
+        {
+            get { return contactName; }
+            set { contactName = value; }
+        }
+
+        public string ContactTitle
+        {
+            get { return contactTitle; }
+            set { contactTitle = value; }
+        }
+
+        public string Address
+        {
+            get { return address; }
+            set { address = value; }
+        }
+
+        public string City
+        {
+            get { return city; }
+            set { city = value; }
+        }
+
+        public string Region
+        {
+            get { return region; }
+            set { region = value; }
+        }
+
+        public string PostalCode
+        {
+            get { return postalCode; }
+            set { postalCode = value; }
+        }
+
+        public string Country
+        {
+            get { return country; }
+            set { country = value; }
+        }
+
+        public string Phone
+        {
+            get { return phone; }
+            set { phone = value; }
+        }
+
+        public string Fax
+        {
+            get { return fax; }
+            set { fax = value; }
+        }
+
+        public IList Orders
+        {
+            get
+            {
+                if (orders == null)
+                {
+                    orders = new ArrayList();
+                }
+                return orders;
+            }
+            set { orders = value; }
+        }
+
+        #endregion
+
+        #region Constructor (s)
+
+        public Customer()
+        {
+        }
+
+        public Customer(string companyName, string contactName, string contactTitle, string address, string city,
+                        string region, string postalCode, string country, string phone, string fax)
+        {
+            this.companyName = companyName;
+            this.contactName = contactName;
+            this.contactTitle = contactTitle;
+            this.address = address;
+            this.city = city;
+            this.region = region;
+            this.postalCode = postalCode;
+            this.country = country;
+            this.phone = phone;
+            this.fax = fax;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Domain/Order.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Domain/Order.cs
new file mode 100644
index 00000000..e46d9ad8
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Domain/Order.cs
@@ -0,0 +1,165 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+
+namespace Spring.Northwind.Domain
+{
+    public class Order
+    {
+        #region Fields
+
+        protected int id;
+        protected DateTime orderDate;
+        protected DateTime requiredDate;
+        protected DateTime shippedDate;
+        protected decimal freight;
+        protected string shipName;
+        protected string shipAddress;
+        protected string shipCity;
+        protected string shipRegion;
+        protected string shipPostalCode;
+        protected string shipCountry;
+        protected Customer customer;
+
+        //protected Employee _employee;
+        //protected Shipper _shipVia;
+        protected IList orderDetails;
+
+        #endregion
+
+        #region Constructor (s)
+
+        public Order()
+        {
+        }
+
+        public Order(DateTime orderDate, DateTime requiredDate, DateTime shippedDate, decimal freight, string shipName,
+                     string shipAddress, string shipCity, string shipRegion, string shipPostalCode, string shipCountry,
+                     Customer customer)
+        {
+            this.orderDate = orderDate;
+            this.requiredDate = requiredDate;
+            this.shippedDate = shippedDate;
+            this.freight = freight;
+            this.shipName = shipName;
+            this.shipAddress = shipAddress;
+            this.shipCity = shipCity;
+            this.shipRegion = shipRegion;
+            this.shipPostalCode = shipPostalCode;
+            this.shipCountry = shipCountry;
+            this.customer = customer;
+        }
+
+        #endregion
+
+
+        #region Properties
+
+        public int Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
+
+        public DateTime OrderDate
+        {
+            get { return orderDate; }
+            set { orderDate = value; }
+        }
+
+        public DateTime RequiredDate
+        {
+            get { return requiredDate; }
+            set { requiredDate = value; }
+        }
+
+        public DateTime ShippedDate
+        {
+            get { return shippedDate; }
+            set { shippedDate = value; }
+        }
+
+        public decimal Freight
+        {
+            get { return freight; }
+            set { freight = value; }
+        }
+
+        public string ShipName
+        {
+            get { return shipName; }
+            set { shipName = value; }
+        }
+
+        public string ShipAddress
+        {
+            get { return shipAddress; }
+            set { shipAddress = value; }
+        }
+
+        public string ShipCity
+        {
+            get { return shipCity; }
+            set { shipCity = value; }
+        }
+
+        public string ShipRegion
+        {
+            get { return shipRegion; }
+            set { shipRegion = value; }
+        }
+
+        public string ShipPostalCode
+        {
+            get { return shipPostalCode; }
+            set { shipPostalCode = value; }
+        }
+
+        public string ShipCountry
+        {
+            get { return shipCountry; }
+            set { shipCountry = value; }
+        }
+
+        public Customer Customer
+        {
+            get { return customer; }
+            set { customer = value; }
+        }
+
+
+        public IList OrderDetails
+        {
+            get
+            {
+                if(orderDetails == null)
+                {
+                    orderDetails = new ArrayList();
+                }
+                return orderDetails;
+            }
+            set { orderDetails = value; }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Domain/OrderDetail.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Domain/OrderDetail.cs
new file mode 100644
index 00000000..0c0617bc
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Domain/OrderDetail.cs
@@ -0,0 +1,77 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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;
+
+namespace Spring.Northwind.Domain
+{
+    public class OrderDetail
+    {
+        protected double unitPrice;
+        protected int quantity;
+        protected double discount;
+        protected Order order;
+        protected int productId;
+        //protected Product product;
+
+        public override bool Equals(object obj)
+        {
+            if (this == obj) return true;
+            OrderDetail orderDetail = obj as OrderDetail;
+            if (orderDetail == null) return false;
+            return Equals(order.Id, orderDetail.order.Id) && Equals(productId, orderDetail.productId);
+        }
+
+        public override int GetHashCode()
+        {
+            return order.Id.GetHashCode() + 29*productId.GetHashCode();
+        }
+
+        public double UnitPrice
+        {
+            get { return this.unitPrice; }
+            set { this.unitPrice = value; }
+        }
+
+        public int Quantity
+        {
+            get { return this.quantity; }
+            set { this.quantity = value; }
+        }
+
+        public double Discount
+        {
+            get { return this.discount; }
+            set { this.discount = value; }
+        }
+
+        public Order Order
+        {
+            get { return this.order; }
+            set { this.order = value; }
+        }
+
+        public int ProductId
+        {
+            get { return this.productId; }
+            set { this.productId = value; }
+        }
+    }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Domain/Product.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Domain/Product.cs
new file mode 100644
index 00000000..da254592
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Domain/Product.cs
@@ -0,0 +1,37 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+namespace Spring.Northwind.Domain
+{
+    public class Product
+    {
+        protected int _id;
+        protected string _productName;
+        protected string _quantityPerUnit;
+        protected decimal _unitPrice;
+        protected short _unitsInStock;
+        protected short _unitsOnOrder;
+        protected short _reorderLevel;
+        protected bool _discontinued;
+        //protected Category _category;
+        //protected Supplier _supplier;
+        protected OrderDetail _orderDetail;
+    }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Properties/AssemblyInfo.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..b77696ab
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Spring.Northwind.Dao")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Spring.Northwind.Dao")]
+[assembly: AssemblyCopyright("Copyright ©  2006")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("bff73ba6-baef-446a-aad4-99cc7b55fcb3")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.csproj
new file mode 100644
index 00000000..89089ccb
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao/Spring.Northwind.Dao.csproj
@@ -0,0 +1,51 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.Northwind</RootNamespace>
+    <AssemblyName>Spring.Northwind.Dao</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</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\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Dao\ICustomerDao.cs" />
+    <Compile Include="Dao\IOrderDao.cs" />
+    <Compile Include="Dao\IProductDao.cs" />
+    <Compile Include="Domain\Customer.cs" />
+    <Compile Include="Domain\Order.cs" />
+    <Compile Include="Domain\OrderDetail.cs" />
+    <Compile Include="Domain\Product.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Properties/AssemblyInfo.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..8411c2ee
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Spring.Northwind.Service")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Spring.Northwind.Service")]
+[assembly: AssemblyCopyright("Copyright ©  2006")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("200c1a2d-2866-43eb-b5ff-04e67855ea7d")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/FedExShippingService.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/FedExShippingService.cs
new file mode 100644
index 00000000..2de081e1
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/FedExShippingService.cs
@@ -0,0 +1,42 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+
+using Common.Logging;
+
+using Spring.Northwind.Domain;
+
+#endregion
+
+namespace Spring.Northwind.Service
+{
+    public class FedExShippingService : IShippingService
+    {
+        protected static readonly ILog log = LogManager.GetLogger(typeof (FedExShippingService));
+
+        public void ShipOrder(Order order)
+        {
+            log.Info("Shipping order id = " + order.Id);
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/FulfillmentService.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/FulfillmentService.cs
new file mode 100644
index 00000000..fc81bbae
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/FulfillmentService.cs
@@ -0,0 +1,115 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using Spring.Transaction.Interceptor;
+
+using Spring.Northwind.Dao;
+using Spring.Northwind.Domain;
+
+#endregion
+
+namespace Spring.Northwind.Service
+{
+    public class FulfillmentService : IFulfillmentService
+    {
+        #region Fields
+        
+        private IProductDao productDao;
+
+        private ICustomerDao customerDao;
+
+        private IOrderDao orderDao;
+
+        private IShippingService shippingService;
+
+        #endregion
+
+        #region Properties
+
+        public IProductDao ProductDao
+        {
+            get { return productDao; }
+            set { productDao = value; }
+        }
+
+        public IOrderDao OrderDao
+        {
+            get { return orderDao; }
+            set { orderDao = value; }
+        }
+
+        public ICustomerDao CustomerDao
+        {
+            get { return customerDao; }
+            set { customerDao = value; }
+        }
+
+        public IShippingService ShippingService
+        {
+            get { return shippingService; }
+            set { shippingService = value; }
+        }
+
+        #endregion
+        
+        #region Methods
+
+
+
+        [Transaction(ReadOnly=false)]
+        public void ProcessCustomer(string customerId)
+        {
+            //Find all orders for customer
+            Customer customer = CustomerDao.FindById(customerId);
+                 
+            foreach (Order order in customer.Orders)
+            {
+                //Validate Order
+                Validate(order);
+                
+                //Ship with external shipping service
+                ShippingService.ShipOrder(order);
+                
+                //Update shipping date
+                order.ShippedDate = DateTime.Now;
+                
+                //Update shipment date
+                OrderDao.SaveOrUpdate(order);
+                
+                //Other operations...Decrease product quantity... etc
+            }             
+            
+        }
+
+        private void Validate(Order order)
+        {
+            
+            //TODO throw exception on error.
+
+        }
+
+        #endregion
+    }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/IFulfillmentService.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/IFulfillmentService.cs
new file mode 100644
index 00000000..6ba8cae9
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/IFulfillmentService.cs
@@ -0,0 +1,33 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using Spring.Northwind.Domain;
+
+#endregion
+
+namespace Spring.Northwind.Service
+{
+    public interface IFulfillmentService
+    {
+        void ProcessCustomer(string customerId);
+    }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/IShippingService.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/IShippingService.cs
new file mode 100644
index 00000000..0e488175
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/IShippingService.cs
@@ -0,0 +1,33 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using Spring.Northwind.Domain;
+
+#endregion
+
+namespace Spring.Northwind.Service
+{
+    public interface IShippingService
+    {
+        void ShipOrder(Order order);
+    }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.csproj
new file mode 100644
index 00000000..1ef9dd85
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Spring.Northwind.Service.csproj
@@ -0,0 +1,67 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9E15876F-E9E0-43B7-9874-B54F163757D6}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.Northwind</RootNamespace>
+    <AssemblyName>Spring.Northwind.Service</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</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\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Service\FedExShippingService.cs" />
+    <Compile Include="Service\IFulfillmentService.cs" />
+    <Compile Include="Service\IShippingService.cs" />
+    <Compile Include="Service\FulfillmentService.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.csproj">
+      <Project>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</Project>
+      <Name>Spring.Northwind.Dao.NHibernate</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj">
+      <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
+      <Name>Spring.Northwind.Dao</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.csproj
new file mode 100644
index 00000000..53f857c0
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.References/Spring.Northwind.Web.References.csproj
@@ -0,0 +1,87 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{FD89FEBE-4914-45F3-9123-B2CB954810DD}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.Northwind.Web.References</RootNamespace>
+    <AssemblyName>Spring.Northwind.Web.References</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>.</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>.</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\Castle.DynamicProxy.dll</HintPath>
+    </Reference>
+    <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>
+    </Reference>
+    <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.Log4Net.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\Iesi.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=1.2.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data.NHibernate12, Version=1.1.1.20093, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.NHibernate12.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/App_Code/ICustomerEditController.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/App_Code/ICustomerEditController.cs
new file mode 100644
index 00000000..ef71ca72
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/App_Code/ICustomerEditController.cs
@@ -0,0 +1,8 @@
+using Spring.Northwind.Domain;
+
+public interface ICustomerEditController
+{
+  void EditCustomer(Customer customer);
+  void Clear();
+  Customer CurrentCustomer { get; }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/App_Code/NHibernateCustomerEditController.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/App_Code/NHibernateCustomerEditController.cs
new file mode 100644
index 00000000..3eb95704
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/App_Code/NHibernateCustomerEditController.cs
@@ -0,0 +1,48 @@
+
+using System.Web;
+using NHibernate;
+using Spring.Data.NHibernate;
+using Spring.Northwind.Domain;
+
+/// <summary>
+/// </summary>
+/// <author>erich.eichinger</author>
+/// <version>$Id: NHibernateCustomerEditController.cs,v 1.1 2007/09/29 21:32:09 oakinger Exp $</version>
+public class NHibernateCustomerEditController:ICustomerEditController
+{
+  private readonly ISessionFactory sessionFactory;
+  private Customer currentCustomer;
+
+  public NHibernateCustomerEditController(ISessionFactory sessionFactory)
+  {
+    this.sessionFactory = sessionFactory;
+  }
+
+  private ISession Session
+  {
+    get
+    {
+        return SessionFactoryUtils.GetSession( sessionFactory,false );
+    }
+  }
+
+  public void EditCustomer(Customer customer)
+  {
+    currentCustomer = customer;
+  }
+
+  public void Clear()
+  {
+    currentCustomer = null;
+  }
+
+  public Customer CurrentCustomer
+  {
+    get
+    {
+      Customer customer = currentCustomer;
+      Session.Lock(customer, LockMode.None);
+      return customer;
+    }
+  }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/App_Data/NORTHWND.MDF b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/App_Data/NORTHWND.MDF
new file mode 100644
index 00000000..e021679d
Binary files /dev/null and b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/App_Data/NORTHWND.MDF differ
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/App_Data/NORTHWND_log.ldf b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/App_Data/NORTHWND_log.ldf
new file mode 100644
index 00000000..c8a53a48
Binary files /dev/null and b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/App_Data/NORTHWND_log.ldf differ
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Aspects.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Aspects.xml
new file mode 100644
index 00000000..b50ad156
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Aspects.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<objects xmlns="http://www.springframework.net">
+  
+  <object id="CommonLoggingAroundAdvice" type="Spring.Aspects.Logging.CommonLoggingAroundAdvice, Spring.Aspects">
+    <property name="Level" value="Info" />
+  </object>
+  
+</objects>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerEditor.aspx b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerEditor.aspx
new file mode 100644
index 00000000..2fd7b637
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerEditor.aspx
@@ -0,0 +1,21 @@
+<%@ Page Language="C#" CodeFile="CustomerEditor.aspx.cs" Inherits="CustomerEditor" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Untitled Page</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div>
+<spring:DataBindingPanel runat="server">
+    <table>
+      <tr><td>ID:</td><td><asp:TextBox runat="server" BindingTarget="CurrentCustomer.Id" BindingDirection="TargetToSource" readonly="true" /></td></tr>
+      <tr><td>Contact:</td><td><asp:TextBox runat="server" BindingTarget="CurrentCustomer.ContactName" /></td></tr>
+    </table>
+</spring:DataBindingPanel>
+    </div>
+    <asp:Button runat="server" id="btnSave" Text="Save" />
+    </form>
+</body>
+</html>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerEditor.aspx.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerEditor.aspx.cs
new file mode 100644
index 00000000..6920e3de
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerEditor.aspx.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Web;
+using Spring.Northwind.Dao;
+using Spring.Northwind.Domain;
+using Spring.Web.UI;
+
+public partial class CustomerEditor : Page
+{
+  private ICustomerEditController customerEditController;
+  private ICustomerDao customerDao;
+
+  public ICustomerDao CustomerDao
+  {
+    set { this.customerDao = value; }
+  }
+
+  public ICustomerEditController CustomerEditController
+  {
+    set { this.customerEditController = value; }
+  }
+
+  public Customer CurrentCustomer
+  {
+    get
+    {
+      //return (Customer) Session[typeof(CustomerEditor).FullName + ".Customer"];
+      return customerEditController.CurrentCustomer;
+    }
+  }
+
+//  public static void Edit( Customer customer )
+//  {
+//    HttpContext.Current.Session[typeof(CustomerEditor).FullName + ".Customer"] = customer;
+//  }
+
+  public CustomerEditor()
+  {
+    this.InitializeControls+=new EventHandler(Page_InitializeControls);
+    this.DataBound+=new EventHandler(Page_DataBound);
+    this.DataUnbound+=new EventHandler(Page_DataUnbound);
+  }
+
+  override protected void InitializeDataBindings()
+  {
+    base.InitializeDataBindings();
+
+    // do the "one time" setup for databinding
+  }
+
+  private void Page_DataBound(object sender, EventArgs e)
+  {
+    // perform custom tasks for binding data from model to the form
+  }
+
+  private void Page_DataUnbound(object sender, EventArgs e)
+  {
+    // perform custom tasks for unbinding data from form to the model
+  }
+
+  private void Page_InitializeControls(object sender, EventArgs e)
+  {
+    btnSave.Click += new EventHandler(BtnSave_Click);
+  }
+
+  private void BtnSave_Click(object sender, EventArgs e)
+  {
+    customerDao.SaveOrUpdate(CurrentCustomer);
+  }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerList.aspx b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerList.aspx
new file mode 100644
index 00000000..9ac91a23
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerList.aspx
@@ -0,0 +1,34 @@
+<%@ Page Language="C#" CodeFile="CustomerList.aspx.cs" Inherits="CustomerList" %>
+<%@ Reference page="CustomerEditor.aspx" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Untitled Page</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div>
+      <asp:DataGrid id="customerList" runat="server"
+           AllowPaging="true"
+           AllowSorting="false"
+           BorderColor="black"
+           BorderWidth="1"
+           CellPadding="3"
+           AutoGenerateColumns="false"
+           ShowFooter="true"
+      >
+         <Columns>
+
+            <asp:BoundColumn HeaderText="Id" DataField="ID" />
+            <asp:BoundColumn HeaderText="Name" DataField="ContactName" />
+            <asp:BoundColumn HeaderText="Company" DataField="CompanyName"/>
+            <asp:ButtonColumn CommandName="EditCustomer" Text="Edit" />
+            <asp:ButtonColumn CommandName="ViewOrders" Text="Orders" />
+
+         </Columns>
+      </asp:DataGrid>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerList.aspx.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerList.aspx.cs
new file mode 100644
index 00000000..80bddf85
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerList.aspx.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections;
+using System.Web.UI.WebControls;
+using Spring.Northwind.Dao;
+using Spring.Northwind.Domain;
+
+public partial class CustomerList : Spring.Web.UI.Page
+{
+  private ICustomerEditController customerEditController;
+  private ICustomerDao customerDao;
+
+  public ICustomerDao CustomerDao
+  {
+    set { this.customerDao = value; }
+  }
+
+  public ICustomerEditController CustomerEditController
+  {
+    set { this.customerEditController = value; }
+  }
+
+  public Customer SelectedCustomer
+  {
+    get
+    {
+      return (Customer) this.customerList.SelectedItem.DataItem;
+    }
+  }
+
+  public CustomerList()
+  {
+    this.InitializeControls+=new EventHandler(Page_InitializeControls);
+    this.DataBound+=new EventHandler(Page_DataBound);
+    this.DataUnbound+=new EventHandler(Page_DataUnbound);
+  }
+
+  override protected void InitializeDataBindings()
+  {
+    base.InitializeDataBindings();
+
+    // do the "one time" setup for databinding
+  }
+
+  private void Page_DataBound(object sender, EventArgs e)
+  {
+    // perform custom tasks for binding data from model to the form
+  }
+
+  private void Page_DataUnbound(object sender, EventArgs e)
+  {
+    // perform custom tasks for unbinding data from form to the model
+  }
+
+  private void Page_InitializeControls(object sender, EventArgs e)
+  {
+    // create/initialize controls here
+    customerList.DataSource = customerDao.FindAll();
+    customerList.ItemCommand+=new DataGridCommandEventHandler(CustomerList_ItemCommand);
+    customerList.PageIndexChanged+=new DataGridPageChangedEventHandler(CustomerList_PageIndexChanged);
+    if (!IsPostBack)
+    {
+      customerList.DataBind();
+    }
+    else
+    {
+      customerList.ItemCreated+=new DataGridItemEventHandler(this.CustomerList_ItemCreated);
+    }
+  }
+
+  private void CustomerList_PageIndexChanged(object source, DataGridPageChangedEventArgs e)
+  {
+    customerList.CurrentPageIndex = e.NewPageIndex;
+    customerList.DataBind();
+  }
+
+  private void CustomerList_ItemCommand(object source, DataGridCommandEventArgs e)
+  {
+    switch(e.CommandName)
+    {
+      case "ViewOrders":
+      case "EditCustomer":
+        customerList.SelectedIndex = e.Item.ItemIndex;
+        customerEditController.EditCustomer(this.SelectedCustomer);
+        SetResult(e.CommandName);
+        break;
+    }
+  }
+
+  private void CustomerList_ItemCreated(object sender, DataGridItemEventArgs e)
+  {
+    if(e.Item.DataSetIndex > -1)
+    {
+      e.Item.DataItem = ((IList) customerList.DataSource)[e.Item.DataSetIndex];
+    }
+  }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerOrders.aspx b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerOrders.aspx
new file mode 100644
index 00000000..68c91bc3
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerOrders.aspx
@@ -0,0 +1,32 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="CustomerOrders.aspx.cs" Inherits="CustomerOrders" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Untitled Page</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div>
+      <asp:DataGrid id="customerOrders" runat="server"
+           AllowPaging="false"
+           AllowSorting="false"
+           BorderColor="black"
+           BorderWidth="1"
+           CellPadding="3"
+           AutoGenerateColumns="false"
+           ShowFooter="true"
+      >
+         <Columns>
+
+            <asp:BoundColumn HeaderText="OrderID" DataField="ID" />
+            <asp:BoundColumn HeaderText="OrderDate" DataField="OrderDate" />
+            <asp:BoundColumn HeaderText="ShippedDate" DataField="ShippedDate"/>
+
+         </Columns>
+      </asp:DataGrid>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerOrders.aspx.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerOrders.aspx.cs
new file mode 100644
index 00000000..b65bfc77
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/CustomerOrders.aspx.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections;
+using System.Web.UI.WebControls;
+using Spring.Northwind.Domain;
+
+public partial class CustomerOrders:Spring.Web.UI.Page
+{
+  private ICustomerEditController customerEditController;
+
+  public ICustomerEditController CustomerEditController
+  {
+    set { this.customerEditController = value; }
+  }
+
+  public Customer SelectedCustomer
+  {
+    get
+    {
+      return this.customerEditController.CurrentCustomer;
+    }
+  }
+
+  public CustomerOrders()
+  {
+    this.InitializeControls+=new EventHandler(Page_InitializeControls);
+    this.DataBound+=new EventHandler(Page_DataBound);
+    this.DataUnbound+=new EventHandler(Page_DataUnbound);
+  }
+
+  override protected void InitializeDataBindings()
+  {
+    base.InitializeDataBindings();
+
+    // do the "one time" setup for databinding
+  }
+
+  private void Page_DataBound(object sender, EventArgs e)
+  {
+    // perform custom tasks for binding data from model to the form
+  }
+
+  private void Page_DataUnbound(object sender, EventArgs e)
+  {
+    // perform custom tasks for unbinding data from form to the model
+  }
+
+  private void Page_InitializeControls(object sender, EventArgs e)
+  {
+    // create/initialize controls here
+    customerOrders.DataSource = SelectedCustomer.Orders;
+    if (!IsPostBack)
+    {
+      customerOrders.DataBind();
+    }
+    else
+    {
+      customerOrders.ItemCreated+=new DataGridItemEventHandler( this.CustomerList_ItemCreated );
+    }
+  }
+
+  private void CustomerList_ItemCreated(object sender, DataGridItemEventArgs e)
+  {
+    if(e.Item.DataSetIndex > -1)
+    {
+      e.Item.DataItem = ((IList)customerOrders.DataSource)[e.Item.DataSetIndex];
+    }
+  }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Dao.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Dao.xml
new file mode 100644
index 00000000..e09ac262
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Dao.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database">
+
+  <!-- Referenced by main application context configuration file -->
+  <description>
+    The Northwind object definitions for the Data Access Objects.
+  </description>
+
+  <!-- Property placeholder configurer for database settings -->
+  <object type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core">
+    <property name="ConfigSections" value="databaseSettings"/>
+  </object>
+
+  <!-- Database and NHibernate Configuration -->
+  <db:provider id="DbProvider"
+                   provider="SqlServer-2.0"
+                   connectionString="Data Source=.\SQLExpress;Integrated Security=true;User Instance=true;AttachDBFilename=|DataDirectory|\Northwnd.mdf"/>
+
+  <object id="NHibernateSessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate12">
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="MappingAssemblies">
+      <list>
+        <value>Spring.Northwind.Dao.NHibernate</value>
+      </list>
+    </property>
+    <property name="HibernateProperties">
+      <dictionary>
+
+        <entry key="hibernate.connection.provider"
+               value="NHibernate.Connection.DriverConnectionProvider"/>
+
+        <entry key="hibernate.dialect"
+               value="NHibernate.Dialect.MsSql2000Dialect"/>
+
+        <entry key="hibernate.connection.driver_class"
+               value="NHibernate.Driver.SqlClientDriver"/>
+
+      </dictionary>
+    </property>
+
+  </object>
+
+
+  <object id="HibernateTransactionManager"
+        type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate12">
+
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="SessionFactory" ref="NHibernateSessionFactory"/>
+
+  </object>
+
+  <object id="HibernateTemplate" type="Spring.Data.NHibernate.HibernateTemplate">
+    <property name="SessionFactory" ref="NHibernateSessionFactory" />
+    <property name="TemplateFlushMode" value="Auto" />
+    <property name="CacheQueries" value="true" />
+  </object>
+
+  <!-- Data Access Objects -->
+  <object id="CustomerDao" type="Spring.Northwind.Dao.NHibernate.HibernateCustomerDao, Spring.Northwind.Dao.NHibernate">
+    <property name="HibernateTemplate" ref="HibernateTemplate"/>
+  </object>
+
+  <object id="OrderDao" type="Spring.Northwind.Dao.NHibernate.HibernateOrderDao, Spring.Northwind.Dao.NHibernate">
+    <property name="HibernateTemplate" ref="HibernateTemplate"/>
+  </object>
+
+
+</objects>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/DeclarativeServicesAttributeDriven.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/DeclarativeServicesAttributeDriven.xml
new file mode 100644
index 00000000..64687470
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/DeclarativeServicesAttributeDriven.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+  <!-- The rest of the config file is common no matter how many objects you add -->
+  <!-- that you would like to have declarative tx management applied to -->
+  <object id="autoProxyCreator" 
+          type="Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator, Spring.Aop">
+  </object>
+
+  <object id="transactionAdvisor"
+          type="Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor, Spring.Data">
+    <property name="TransactionInterceptor" ref="transactionInterceptor"/>
+  </object>
+
+  <!-- Transaction Interceptor -->
+  <object id="transactionInterceptor" 
+          type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data">
+    <property name="TransactionManager" ref="HibernateTransactionManager"/>
+    <!-- note do not have converter from string to this property type registered -->
+    <property name="TransactionAttributeSource" ref="attributeTransactionAttributeSource"/>
+  </object>
+
+  <object id="attributeTransactionAttributeSource"
+          type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data">
+  </object>
+</objects>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/DeclarativeServicesObjectNameDriven.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/DeclarativeServicesObjectNameDriven.xml
new file mode 100644
index 00000000..de08c228
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/DeclarativeServicesObjectNameDriven.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <object name="autoProxyCreator"
+         type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+
+    <property name="InterceptorNames" value="transactionInterceptor"/>
+    <property name="ObjectNames">
+      <list>
+        <ref object="FulfillmentService"/>
+      </list>
+    </property>
+  </object>
+
+  <object id="transactionInterceptor" 
+        type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data">
+    <property name="TransactionManager" ref="HibernateTransactionManager"/>
+    <!-- note do not have converter from string to this property type registered -->
+    <!-- so useing a ref to the source of transaction options                    -->
+    <property name="TransactionAttributeSource" ref="attributeTransactionAttributeSource"/>
+  </object>
+
+  <object id="attributeTransactionAttributeSource"
+          type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data">
+  </object>
+  
+  <!--
+  <object name="methodMapTransactionAttributeSource" 
+          type="Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource, Spring.Data">
+    <property name="MethodMap">
+      <dictionary>
+        <entry key="Spring.Northwind.Service.FulfillmentService.ProcessCustomer, Spring.Northwind.Service" 
+               value="PROPAGATION_REQUIRED"/>
+      </dictionary>
+    </property>
+  </object>
+  -->
+</objects>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/DeclarativeServicesTxProxyFactoryDriven.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/DeclarativeServicesTxProxyFactoryDriven.xml
new file mode 100644
index 00000000..9655231b
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/DeclarativeServicesTxProxyFactoryDriven.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <description>
+    Transactional Proxy for FulfillmentService using the TransactionProxyFactory
+  </description>
+  
+  
+  <!-- Note if you have many of these objects with similar configuration use -->
+  <!-- an abstract parent object to encapsulate common settings              -->
+
+  <object id="TxProxyConfigurationTemplate" abstract="true"
+          type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data">
+    
+    <property name="PlatformTransactionManager" ref="HibernateTransactionManager"/>
+
+    <property name="TransactionAttributes">
+      <name-values>
+        <!-- Add common methods across your services here -->
+        <add key="Process*" value="PROPAGATION_REQUIRED"/>
+        <!--
+        <add key="Delete*" value="PROPAGATION_REQUIRED"/>
+        -->
+      </name-values>
+    </property>
+    <!-- note you can use alias names so that this configuration file is -->
+    <!-- not dependent on the precise object name of the logging advice  -->
+    <!-- defined in Aspects.xml                                          -->
+    <property name="PreInterceptors" ref="CommonLoggingAroundAdvice"/>
+  </object>
+
+
+  <object id="FulfillmentServiceUsingTxPFO" parent="TxProxyConfigurationTemplate">
+
+    <!-- Note: would likely use an anonymous inner object instead of a reference -->
+    <!-- to ensure that no one can access an unadvised object -->
+    <property name="Target" ref="FulfillmentService"/>
+
+  </object>
+</objects>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Default.aspx b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Default.aspx
new file mode 100644
index 00000000..9943ba9d
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Default.aspx
@@ -0,0 +1,2 @@
+<%@ Page Language="C#" AutoEventWireup="true"  CodeFile="Default.aspx.cs" Inherits="_Default" %>
+<%Response.Redirect("CustomerList.aspx");%>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Default.aspx.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Default.aspx.cs
new file mode 100644
index 00000000..efeb8c9a
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Default.aspx.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Diagnostics;
+using Spring.Northwind.Dao;
+using Spring.Northwind.Domain;
+using Spring.Northwind.Service;
+
+public partial class _Default : Spring.Web.UI.Page
+{
+    private ICustomerDao customerDao;
+    private IFulfillmentService fulfillmentService;
+
+    public IFulfillmentService FulfillmentService
+    {
+        set { this.fulfillmentService = value; }
+    }
+
+    public ICustomerDao CustomerDao
+    {
+        set { this.customerDao = value; }
+    }
+
+    protected void Button1_Click(object sender, EventArgs e)
+    {
+        ProcessCustomer();
+    }
+
+    public void ProcessCustomer()
+    {
+        string customerId = "ERNSH";
+
+        // check, if exists
+        Customer customer = customerDao.FindById(customerId);
+
+        //Find all orders for customer and ship them
+        this.fulfillmentService.ProcessCustomer(customer.Id);
+        //assertions....
+
+        // prepare for display - note that OrderDetails are loaded lazy here!
+        foreach (Order order in customer.Orders)
+        {
+            Debug.Assert(order.OrderDetails.Count > 0);
+            foreach(OrderDetail details in order.OrderDetails)
+            {
+                details.Quantity = details.Quantity - 1;
+                // do something here
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Global.asax b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Global.asax
new file mode 100644
index 00000000..56861e19
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Global.asax
@@ -0,0 +1,38 @@
+<%@ Import namespace="log4net"%>
+<%@ Import namespace="log4net.Config"%>
+<%@ Application Language="C#" %>
+
+<script runat="server">
+
+    void Application_Start(object sender, EventArgs e) 
+    {
+        // Code that runs on application startup
+    }
+    
+    void Application_End(object sender, EventArgs e) 
+    {
+        //  Code that runs on application shutdown
+    }
+        
+    void Application_Error(object sender, EventArgs e) 
+    { 
+        // Code that runs when an unhandled error occurs
+
+    }
+
+    void Session_Start(object sender, EventArgs e) 
+    {
+        // Code that runs when a new session is started
+
+    }
+
+    void Session_End(object sender, EventArgs e) 
+    {
+        // Code that runs when a session ends. 
+        // Note: The Session_End event is raised only when the sessionstate mode
+        // is set to InProc in the Web.config file. If session mode is set to StateServer 
+        // or SQLServer, the event is not raised.
+
+    }
+       
+</script>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Log4Net.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Log4Net.xml
new file mode 100644
index 00000000..2420455b
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Log4Net.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<log4net debug="false">
+  
+  <appender name="AspNetTraceAppender" type="log4net.Appender.AspNetTraceAppender">
+    <layout type="log4net.Layout.PatternLayout">
+      <conversionPattern value="[%thread] %-5level - %message" />
+    </layout>
+  </appender>
+  
+  <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" />
+    <layout type="log4net.Layout.PatternLayout">
+      <conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline" />
+    </layout>
+  </appender>
+
+  <appender name="TraceAppender" type="log4net.Appender.TraceAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%-5level %M - %message%newline" />
+      </layout>
+  </appender>
+
+  <!-- Set default logging level to DEBUG -->
+  <root>
+    <level value="DEBUG" />
+    <!--<appender-ref ref="AspNetTraceAppender" />-->
+    <!--<appender-ref ref="TraceAppender" />-->
+    <appender-ref ref="RollingFileAppender" />
+  </root>
+  <!--
+    In Spring.NET there is a 1-1 correspondence between the logger name and
+    the namespace of the class doing the logging...
+  -->
+  <logger name="Spring">
+    <level value="DEBUG" />
+  </logger>
+  <logger name="NHibernate">
+    <level value="INFO" />
+  </logger>
+</log4net>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Logs/log.txt b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Logs/log.txt
new file mode 100644
index 00000000..10e51644
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Logs/log.txt
@@ -0,0 +1,186 @@
+2008-04-04 17:21:13,343 [8] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Not closing pre-bound Hibernate Session after HibernateTemplate
+2008-04-04 17:21:13,390 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - disposing 'request'-scoped item cache
+2008-04-04 17:21:13,390 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Trying to close SessionScope
+2008-04-04 17:21:13,390 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Closing single Hibernate Session in SessionScope
+2008-04-04 17:21:13,390 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Removed value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@F15783] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] from thread [8]
+2008-04-04 17:21:13,390 [8] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Closing Hibernate Session
+2008-04-04 17:21:13,390 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Closed LazySessionHolder
+2008-04-04 17:21:13,390 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Opening single Hibernate Session in SessionScope
+2008-04-04 17:21:13,390 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Created LazySessionHolder
+2008-04-04 17:21:13,390 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Bound value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@1EA711C] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] to thread [4]
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolving url '/Spring.Northwind.Web/CustomerOrders.aspx'
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolved url '/Spring.Northwind.Web/CustomerOrders.aspx' from reusable handler cache
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object '/CustomerOrders.aspx' with merged definition [Root web object with class [/Spring.Northwind.Web/CustomerOrders.aspx] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Web.xml]].
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of '/CustomerOrders.aspx'.
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance '/Spring.Northwind.Web/CustomerOrders.aspx'
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerOrders.aspx
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'ASP.customerorders_aspx' using definition '/CustomerOrders.aspx'
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerEditController' in object '/CustomerOrders.aspx' to object 'CustomerEditController'.
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerEditController'.
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object '/CustomerOrders.aspx'
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object '/CustomerOrders.aspx'
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@1EA711C] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - session instance requested - opening new session
+2008-04-04 17:21:13,406 [4] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Opening Hibernate Session
+2008-04-04 17:21:13,406 [4] INFO  NHibernate.Loader.Loader [(null)] - SELECT orders0_.CustomerID as CustomerID__1_, orders0_.OrderID as OrderID1_, orders0_.OrderID as OrderID0_0_, orders0_.OrderDate as OrderDate0_0_, orders0_.RequiredDate as Required3_0_0_, orders0_.ShippedDate as ShippedD4_0_0_, orders0_.ShipName as ShipName0_0_, orders0_.ShipAddress as ShipAddr6_0_0_, orders0_.ShipCity as ShipCity0_0_, orders0_.ShipRegion as ShipRegion0_0_, orders0_.ShipPostalCode as ShipPost9_0_0_, orders0_.ShipCountry as ShipCou10_0_0_ FROM Orders orders0_ WHERE orders0_.CustomerID=@p0
+2008-04-04 17:21:13,453 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - disposing 'request'-scoped item cache
+2008-04-04 17:21:13,453 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Trying to close SessionScope
+2008-04-04 17:21:13,453 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Closing single Hibernate Session in SessionScope
+2008-04-04 17:21:13,453 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Removed value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@1EA711C] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] from thread [4]
+2008-04-04 17:21:13,453 [4] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Closing Hibernate Session
+2008-04-04 17:21:13,453 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Closed LazySessionHolder
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Opening single Hibernate Session in SessionScope
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Created LazySessionHolder
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Bound value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@30FCBCE] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] to thread [4]
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolving url '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolved url '/Spring.Northwind.Web/CustomerList.aspx' from reusable handler cache
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object '/CustomerList.aspx' with merged definition [Root web object with class [/Spring.Northwind.Web/CustomerList.aspx] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Web.xml]].
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of '/CustomerList.aspx'.
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerList.aspx
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'ASP.customerlist_aspx' using definition '/CustomerList.aspx'
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerEditController' in object '/CustomerList.aspx' to object 'CustomerEditController'.
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerEditController'.
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerDao' in object '/CustomerList.aspx' to object 'CustomerDao'.
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerDao'.
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@30FCBCE] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - session instance requested - opening new session
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Opening Hibernate Session
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@30FCBCE] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Found thread-bound Session for HibernateTemplate
+2008-04-04 17:21:14,703 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@30FCBCE] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:14,703 [4] INFO  NHibernate.Loader.Loader [(null)] - SELECT this_.CustomerID as CustomerID1_0_, this_.CompanyName as CompanyN2_1_0_, this_.ContactName as ContactN3_1_0_, this_.ContactTitle as ContactT4_1_0_, this_.Address as Address1_0_, this_.City as City1_0_, this_.Region as Region1_0_, this_.PostalCode as PostalCode1_0_, this_.Country as Country1_0_, this_.Phone as Phone1_0_, this_.Fax as Fax1_0_ FROM Customers this_
+2008-04-04 17:21:14,718 [4] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Not closing pre-bound Hibernate Session after HibernateTemplate
+2008-04-04 17:21:14,734 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - disposing 'request'-scoped item cache
+2008-04-04 17:21:14,734 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Trying to close SessionScope
+2008-04-04 17:21:14,734 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Closing single Hibernate Session in SessionScope
+2008-04-04 17:21:14,734 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Removed value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@30FCBCE] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] from thread [4]
+2008-04-04 17:21:14,734 [4] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Closing Hibernate Session
+2008-04-04 17:21:14,734 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Closed LazySessionHolder
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Opening single Hibernate Session in SessionScope
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Created LazySessionHolder
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Bound value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@16799F8] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] to thread [8]
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolving url '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolved url '/Spring.Northwind.Web/CustomerList.aspx' from reusable handler cache
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object '/CustomerList.aspx' with merged definition [Root web object with class [/Spring.Northwind.Web/CustomerList.aspx] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Web.xml]].
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of '/CustomerList.aspx'.
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerList.aspx
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'ASP.customerlist_aspx' using definition '/CustomerList.aspx'
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerEditController' in object '/CustomerList.aspx' to object 'CustomerEditController'.
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerEditController'.
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerDao' in object '/CustomerList.aspx' to object 'CustomerDao'.
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerDao'.
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@16799F8] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [8]
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - session instance requested - opening new session
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Opening Hibernate Session
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@16799F8] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [8]
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Found thread-bound Session for HibernateTemplate
+2008-04-04 17:21:16,062 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@16799F8] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [8]
+2008-04-04 17:21:16,062 [8] INFO  NHibernate.Loader.Loader [(null)] - SELECT this_.CustomerID as CustomerID1_0_, this_.CompanyName as CompanyN2_1_0_, this_.ContactName as ContactN3_1_0_, this_.ContactTitle as ContactT4_1_0_, this_.Address as Address1_0_, this_.City as City1_0_, this_.Region as Region1_0_, this_.PostalCode as PostalCode1_0_, this_.Country as Country1_0_, this_.Phone as Phone1_0_, this_.Fax as Fax1_0_ FROM Customers this_
+2008-04-04 17:21:16,078 [8] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Not closing pre-bound Hibernate Session after HibernateTemplate
+2008-04-04 17:21:16,125 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - disposing 'request'-scoped item cache
+2008-04-04 17:21:16,125 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Trying to close SessionScope
+2008-04-04 17:21:16,125 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Closing single Hibernate Session in SessionScope
+2008-04-04 17:21:16,125 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Removed value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@16799F8] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] from thread [8]
+2008-04-04 17:21:16,125 [8] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Closing Hibernate Session
+2008-04-04 17:21:16,125 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Closed LazySessionHolder
+2008-04-04 17:21:16,125 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Opening single Hibernate Session in SessionScope
+2008-04-04 17:21:16,125 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Created LazySessionHolder
+2008-04-04 17:21:16,125 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Bound value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@3154901] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] to thread [4]
+2008-04-04 17:21:16,125 [4] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolving url '/Spring.Northwind.Web/CustomerEditor.aspx'
+2008-04-04 17:21:16,125 [4] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - looking up web context 'spring.root' in WebContextCache
+2008-04-04 17:21:16,125 [4] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - returning WebContextCache hit '[/spring.northwind.web]:WebApplicationContext(35298535)' for vpath 'spring.root' 
+2008-04-04 17:21:16,125 [4] DEBUG Spring.Web.Support.AbstractHandlerFactory [(null)] - GetHandler():looking up definition for app-relative url '/CustomerEditor.aspx'
+2008-04-04 17:21:16,125 [4] DEBUG Spring.Web.Support.AbstractHandlerFactory [(null)] - GetHandler():found definition for page-url '/CustomerEditor.aspx'
+2008-04-04 17:21:16,125 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object '/CustomerEditor.aspx' with merged definition [Root web object with class [/Spring.Northwind.Web/CustomerEditor.aspx] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Web.xml]].
+2008-04-04 17:21:16,125 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of '/CustomerEditor.aspx'.
+2008-04-04 17:21:16,125 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance '/Spring.Northwind.Web/CustomerEditor.aspx'
+2008-04-04 17:21:16,125 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerEditor.aspx
+2008-04-04 17:21:16,125 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'ASP.customereditor_aspx' using definition '/CustomerEditor.aspx'
+2008-04-04 17:21:16,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerEditController' in object '/CustomerEditor.aspx' to object 'CustomerEditController'.
+2008-04-04 17:21:16,140 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerEditController'.
+2008-04-04 17:21:16,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerDao' in object '/CustomerEditor.aspx' to object 'CustomerDao'.
+2008-04-04 17:21:16,140 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerDao'.
+2008-04-04 17:21:16,156 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object '/CustomerEditor.aspx'
+2008-04-04 17:21:16,156 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object '/CustomerEditor.aspx'
+2008-04-04 17:21:16,156 [4] DEBUG Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - returning available advisors
+2008-04-04 17:21:16,468 [4] INFO  Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - Candidate advisor [Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor] rejected for type [ASP.customereditor_aspx]
+2008-04-04 17:21:16,546 [4] DEBUG Spring.Web.UI.Controls.DataBindingPanel [(null)] - binding control 'ctl03' relative to '__Page' using expression 'FindControl('ctl03').Text'
+2008-04-04 17:21:16,640 [4] DEBUG Spring.Web.UI.Controls.DataBindingPanel [(null)] - binding control 'ctl04' relative to '__Page' using expression 'FindControl('ctl04').Text'
+2008-04-04 17:21:16,656 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@3154901] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:16,656 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - session instance requested - opening new session
+2008-04-04 17:21:16,656 [4] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Opening Hibernate Session
+2008-04-04 17:21:16,703 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@3154901] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:16,734 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - disposing 'request'-scoped item cache
+2008-04-04 17:21:16,734 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Trying to close SessionScope
+2008-04-04 17:21:16,734 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Closing single Hibernate Session in SessionScope
+2008-04-04 17:21:16,734 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Removed value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@3154901] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] from thread [4]
+2008-04-04 17:21:16,734 [4] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Closing Hibernate Session
+2008-04-04 17:21:16,734 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Closed LazySessionHolder
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Opening single Hibernate Session in SessionScope
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Created LazySessionHolder
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Bound value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@62A49D] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] to thread [4]
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolving url '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolved url '/Spring.Northwind.Web/CustomerList.aspx' from reusable handler cache
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object '/CustomerList.aspx' with merged definition [Root web object with class [/Spring.Northwind.Web/CustomerList.aspx] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Web.xml]].
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of '/CustomerList.aspx'.
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerList.aspx
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'ASP.customerlist_aspx' using definition '/CustomerList.aspx'
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerEditController' in object '/CustomerList.aspx' to object 'CustomerEditController'.
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerEditController'.
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerDao' in object '/CustomerList.aspx' to object 'CustomerDao'.
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerDao'.
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@62A49D] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - session instance requested - opening new session
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Opening Hibernate Session
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@62A49D] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Found thread-bound Session for HibernateTemplate
+2008-04-04 17:21:18,734 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@62A49D] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:18,734 [4] INFO  NHibernate.Loader.Loader [(null)] - SELECT this_.CustomerID as CustomerID1_0_, this_.CompanyName as CompanyN2_1_0_, this_.ContactName as ContactN3_1_0_, this_.ContactTitle as ContactT4_1_0_, this_.Address as Address1_0_, this_.City as City1_0_, this_.Region as Region1_0_, this_.PostalCode as PostalCode1_0_, this_.Country as Country1_0_, this_.Phone as Phone1_0_, this_.Fax as Fax1_0_ FROM Customers this_
+2008-04-04 17:21:18,750 [4] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Not closing pre-bound Hibernate Session after HibernateTemplate
+2008-04-04 17:21:18,765 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - disposing 'request'-scoped item cache
+2008-04-04 17:21:18,765 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Trying to close SessionScope
+2008-04-04 17:21:18,765 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Closing single Hibernate Session in SessionScope
+2008-04-04 17:21:18,765 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Removed value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@62A49D] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] from thread [4]
+2008-04-04 17:21:18,765 [4] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Closing Hibernate Session
+2008-04-04 17:21:18,765 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Closed LazySessionHolder
+2008-04-04 17:21:21,609 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Opening single Hibernate Session in SessionScope
+2008-04-04 17:21:21,609 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Created LazySessionHolder
+2008-04-04 17:21:21,609 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Bound value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@1648030] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] to thread [8]
+2008-04-04 17:21:21,609 [8] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolving url '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:21,609 [8] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolved url '/Spring.Northwind.Web/CustomerList.aspx' from reusable handler cache
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object '/CustomerList.aspx' with merged definition [Root web object with class [/Spring.Northwind.Web/CustomerList.aspx] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Web.xml]].
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of '/CustomerList.aspx'.
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerList.aspx
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'ASP.customerlist_aspx' using definition '/CustomerList.aspx'
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerEditController' in object '/CustomerList.aspx' to object 'CustomerEditController'.
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerEditController'.
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerDao' in object '/CustomerList.aspx' to object 'CustomerDao'.
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerDao'.
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@1648030] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [8]
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - session instance requested - opening new session
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Opening Hibernate Session
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@1648030] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [8]
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Found thread-bound Session for HibernateTemplate
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@1648030] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [8]
+2008-04-04 17:21:21,625 [8] INFO  NHibernate.Loader.Loader [(null)] - SELECT this_.CustomerID as CustomerID1_0_, this_.CompanyName as CompanyN2_1_0_, this_.ContactName as ContactN3_1_0_, this_.ContactTitle as ContactT4_1_0_, this_.Address as Address1_0_, this_.City as City1_0_, this_.Region as Region1_0_, this_.PostalCode as PostalCode1_0_, this_.Country as Country1_0_, this_.Phone as Phone1_0_, this_.Fax as Fax1_0_ FROM Customers this_
+2008-04-04 17:21:21,625 [8] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Not closing pre-bound Hibernate Session after HibernateTemplate
+2008-04-04 17:21:21,687 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - disposing 'request'-scoped item cache
+2008-04-04 17:21:21,687 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Trying to close SessionScope
+2008-04-04 17:21:21,687 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Closing single Hibernate Session in SessionScope
+2008-04-04 17:21:21,687 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Removed value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@1648030] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] from thread [8]
+2008-04-04 17:21:21,687 [8] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Closing Hibernate Session
+2008-04-04 17:21:21,687 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Closed LazySessionHolder
+2008-04-04 17:24:18,796 [4] DEBUG Spring.Context.Support.WebSupportModule [(null)] - end session jffsz0255kqrjrgqyardrgs55 because of Removed
+2008-04-04 17:24:18,812 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - disposing 'session'-scoped item cache
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Logs/log.txt.1 b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Logs/log.txt.1
new file mode 100644
index 00000000..cd7c2205
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Logs/log.txt.1
@@ -0,0 +1,536 @@
+2008-04-04 17:19:12,203 [4] DEBUG Spring.Context.Support.WebSupportModule [(null)] - Set default resource protocol to 'web' and installed HttpContext-aware HybridContextStorage
+2008-04-04 17:20:59,156 [4] DEBUG Spring.Context.Support.WebSupportModule [(null)] - Set default resource protocol to 'web' and installed HttpContext-aware HybridContextStorage
+2008-04-04 17:20:59,312 [4] DEBUG Spring.Context.Support.WebSupportModule [(null)] - Initializing Application instance
+2008-04-04 17:20:59,562 [4] DEBUG Spring.Context.Support.WebSupportModule [(null)] - attaching to InProcSessionStateStore
+2008-04-04 17:20:59,578 [4] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - BeforeFirstRequest:False
+2008-04-04 17:20:59,593 [4] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - looking up web context 'spring.root' in WebContextCache
+2008-04-04 17:20:59,593 [4] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - looking up web context 'spring.root' in ContextRegistry
+2008-04-04 17:20:59,593 [4] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - web context for vpath 'spring.root' not found. Force creation using filepath '/Spring.Northwind.Web/dummy.context'
+2008-04-04 17:20:59,593 [4] DEBUG Spring.Context.Support.ContextHandler [(null)] - creating context '/spring.northwind.web'
+2008-04-04 17:20:59,625 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - hooking up event handlers
+2008-04-04 17:20:59,859 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Loading XML object definitions from file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Aspects.xml]
+2008-04-04 17:20:59,875 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Using the following XmlReader implementation : System.Xml.XsdValidatingReader
+2008-04-04 17:20:59,875 [4] DEBUG Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader [(null)] - Loading object definitions.
+2008-04-04 17:20:59,890 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Loading object definitions...
+2008-04-04 17:20:59,890 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default lazy init 'false'.
+2008-04-04 17:20:59,890 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default dependency check 'none'.
+2008-04-04 17:20:59,890 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default autowire 'no'.
+2008-04-04 17:21:00,109 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'CommonLoggingAroundAdvice'.
+2008-04-04 17:21:00,109 [4] DEBUG Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader [(null)] - Found 1 <object> elements defining objects.
+2008-04-04 17:21:00,109 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Loaded 1 bean definitions from location [~/Aspects.xml]
+2008-04-04 17:21:00,109 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Loading XML object definitions from file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Dao.xml]
+2008-04-04 17:21:00,125 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Using the following XmlReader implementation : System.Xml.XsdValidatingReader
+2008-04-04 17:21:00,125 [4] DEBUG Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader [(null)] - Loading object definitions.
+2008-04-04 17:21:00,125 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Loading object definitions...
+2008-04-04 17:21:00,125 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default lazy init 'false'.
+2008-04-04 17:21:00,125 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default dependency check 'none'.
+2008-04-04 17:21:00,125 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default autowire 'no'.
+2008-04-04 17:21:00,125 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - No XML 'id' specified - using '' as the id and '' as aliases.
+2008-04-04 17:21:00,125 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Neither XML 'Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer' nor 'id' specified - using object class name [name] as the id.
+2008-04-04 17:21:00,125 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer'.
+2008-04-04 17:21:00,140 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'DbProvider'.
+2008-04-04 17:21:00,156 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'NHibernateSessionFactory'.
+2008-04-04 17:21:00,156 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'HibernateTransactionManager'.
+2008-04-04 17:21:00,156 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'HibernateTemplate'.
+2008-04-04 17:21:00,203 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'CustomerDao'.
+2008-04-04 17:21:00,203 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'OrderDao'.
+2008-04-04 17:21:00,203 [4] DEBUG Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader [(null)] - Found 8 <object> elements defining objects.
+2008-04-04 17:21:00,203 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Loaded 7 bean definitions from location [~/Dao.xml]
+2008-04-04 17:21:00,203 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Loading XML object definitions from file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Services.xml]
+2008-04-04 17:21:00,203 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Using the following XmlReader implementation : System.Xml.XsdValidatingReader
+2008-04-04 17:21:00,203 [4] DEBUG Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader [(null)] - Loading object definitions.
+2008-04-04 17:21:00,203 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Loading object definitions...
+2008-04-04 17:21:00,203 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default lazy init 'false'.
+2008-04-04 17:21:00,203 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default dependency check 'none'.
+2008-04-04 17:21:00,203 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default autowire 'no'.
+2008-04-04 17:21:00,265 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'FulfillmentService'.
+2008-04-04 17:21:00,265 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'ShippingService'.
+2008-04-04 17:21:00,265 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Attempting to import object definitions from 'DeclarativeServicesAttributeDriven.xml'.
+2008-04-04 17:21:00,281 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Loading XML object definitions from file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\DeclarativeServicesAttributeDriven.xml]
+2008-04-04 17:21:00,281 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Using the following XmlReader implementation : System.Xml.XsdValidatingReader
+2008-04-04 17:21:00,281 [4] DEBUG Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader [(null)] - Loading object definitions.
+2008-04-04 17:21:00,281 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Loading object definitions...
+2008-04-04 17:21:00,281 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default lazy init 'false'.
+2008-04-04 17:21:00,281 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default dependency check 'none'.
+2008-04-04 17:21:00,281 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default autowire 'no'.
+2008-04-04 17:21:00,312 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'autoProxyCreator'.
+2008-04-04 17:21:00,312 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'transactionAdvisor'.
+2008-04-04 17:21:00,312 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'transactionInterceptor'.
+2008-04-04 17:21:00,312 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'attributeTransactionAttributeSource'.
+2008-04-04 17:21:00,312 [4] DEBUG Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader [(null)] - Found 14 <object> elements defining objects.
+2008-04-04 17:21:00,312 [4] DEBUG Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader [(null)] - Found 14 <object> elements defining objects.
+2008-04-04 17:21:00,312 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Loaded 6 bean definitions from location [~/Services.xml]
+2008-04-04 17:21:00,312 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Loading XML object definitions from file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Web.xml]
+2008-04-04 17:21:00,328 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Using the following XmlReader implementation : System.Xml.XsdValidatingReader
+2008-04-04 17:21:00,328 [4] DEBUG Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader [(null)] - Loading object definitions.
+2008-04-04 17:21:00,328 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Loading object definitions...
+2008-04-04 17:21:00,328 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default lazy init 'false'.
+2008-04-04 17:21:00,328 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default dependency check 'none'.
+2008-04-04 17:21:00,328 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default autowire 'no'.
+2008-04-04 17:21:00,328 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - No XML 'id' specified - using 'CustomerEditController' as the id and '' as aliases.
+2008-04-04 17:21:00,328 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'CustomerEditController'.
+2008-04-04 17:21:00,328 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance 'Default.aspx'
+2008-04-04 17:21:00,328 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/Default.aspx
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - getting page type for Default.aspx
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/Default.aspx
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - got page type 'ASP.default_aspx' for vpath '/Spring.Northwind.Web/Default.aspx'
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id '/Default.aspx'.
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - No XML 'id' specified - using 'CustomerEditPage' as the id and '' as aliases.
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'CustomerEditPage'.
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance 'CustomerList.aspx'
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerList.aspx
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - getting page type for CustomerList.aspx
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerList.aspx
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - got page type 'ASP.customerlist_aspx' for vpath '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id '/CustomerList.aspx'.
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance 'CustomerEditor.aspx'
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerEditor.aspx
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - getting page type for CustomerEditor.aspx
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerEditor.aspx
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - got page type 'ASP.customereditor_aspx' for vpath '/Spring.Northwind.Web/CustomerEditor.aspx'
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id '/CustomerEditor.aspx'.
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance 'CustomerOrders.aspx'
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerOrders.aspx
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - getting page type for CustomerOrders.aspx
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerOrders.aspx
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - got page type 'ASP.customerorders_aspx' for vpath '/Spring.Northwind.Web/CustomerOrders.aspx'
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id '/CustomerOrders.aspx'.
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader [(null)] - Found 20 <object> elements defining objects.
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Loaded 6 bean definitions from location [~/Web.xml]
+2008-04-04 17:21:02,718 [4] DEBUG Spring.Context.Support.AbstractXmlApplicationContext [(null)] - Refreshed ObjectFactory for application context '/spring.northwind.web'.
+2008-04-04 17:21:02,734 [4] DEBUG Spring.Context.Support.AbstractApplicationContext [(null)] - 20 objects defined in application context [/spring.northwind.web].
+2008-04-04 17:21:02,765 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer'
+2008-04-04 17:21:02,765 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer' with merged definition [Root web object with class [Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Dao.xml]].
+2008-04-04 17:21:02,781 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer'.
+2008-04-04 17:21:02,781 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer' to allow for resolving potential circular references
+2008-04-04 17:21:02,781 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer' using definition 'Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer'
+2008-04-04 17:21:02,828 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer'
+2008-04-04 17:21:02,828 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer'
+2008-04-04 17:21:02,859 [4] DEBUG Spring.Context.Support.AbstractApplicationContext [(null)] - processed 1 IFactoryObjectPostProcessors defined in application context [/spring.northwind.web].
+2008-04-04 17:21:02,859 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'autoProxyCreator'
+2008-04-04 17:21:02,859 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'autoProxyCreator' with merged definition [Root web object with class [Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\DeclarativeServicesAttributeDriven.xml]].
+2008-04-04 17:21:02,859 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'autoProxyCreator'.
+2008-04-04 17:21:02,875 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'autoProxyCreator' to allow for resolving potential circular references
+2008-04-04 17:21:02,875 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'proxyTargetType=False; proxyTargetAttributes=True; exposeProxy=False; isFrozen=False; optimize=False; aopProxyFactory=Spring.Aop.Framework.DynamicProxy.CachedAopProxyFactory; ' using definition 'autoProxyCreator'
+2008-04-04 17:21:02,875 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Setting the name property on the IObjectNameAware object 'autoProxyCreator'.
+2008-04-04 17:21:02,875 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Setting the ObjectFactory property on the IObjectFactoryAware object 'autoProxyCreator'.
+2008-04-04 17:21:02,875 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'autoProxyCreator'
+2008-04-04 17:21:02,875 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Calling AfterPropertiesSet() on object with name 'autoProxyCreator'.
+2008-04-04 17:21:02,875 [4] DEBUG Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - instantiating available advisors
+2008-04-04 17:21:02,875 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'transactionAdvisor'
+2008-04-04 17:21:02,875 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'transactionAdvisor' with merged definition [Root web object with class [Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\DeclarativeServicesAttributeDriven.xml]].
+2008-04-04 17:21:02,875 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'transactionAdvisor'.
+2008-04-04 17:21:02,937 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'transactionAdvisor' to allow for resolving potential circular references
+2008-04-04 17:21:02,937 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor' using definition 'transactionAdvisor'
+2008-04-04 17:21:02,937 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'TransactionInterceptor' in object 'transactionAdvisor' to object 'transactionInterceptor'.
+2008-04-04 17:21:02,937 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'transactionInterceptor'
+2008-04-04 17:21:02,937 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'transactionInterceptor' with merged definition [Root web object with class [Spring.Transaction.Interceptor.TransactionInterceptor] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\DeclarativeServicesAttributeDriven.xml]].
+2008-04-04 17:21:02,937 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'transactionInterceptor'.
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'transactionInterceptor' to allow for resolving potential circular references
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Transaction.Interceptor.TransactionInterceptor' using definition 'transactionInterceptor'
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'TransactionManager' in object 'transactionInterceptor' to object 'HibernateTransactionManager'.
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'HibernateTransactionManager'
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'HibernateTransactionManager' with merged definition [Root web object with class [Spring.Data.NHibernate.HibernateTransactionManager] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Dao.xml]].
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'HibernateTransactionManager'.
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'HibernateTransactionManager' to allow for resolving potential circular references
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Data.NHibernate.HibernateTransactionManager' using definition 'HibernateTransactionManager'
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'DbProvider' in object 'HibernateTransactionManager' to object 'DbProvider'.
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'DbProvider'
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'DbProvider' with merged definition [Root web object with class [Spring.Data.Common.DbProviderFactoryObject] defined in ].
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'DbProvider'.
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'DbProvider' to allow for resolving potential circular references
+2008-04-04 17:21:02,953 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Data.Common.DbProviderFactoryObject' using definition 'DbProvider'
+2008-04-04 17:21:02,984 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'DbProvider'
+2008-04-04 17:21:02,984 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Calling AfterPropertiesSet() on object with name 'DbProvider'.
+2008-04-04 17:21:02,984 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'DbProvider'
+2008-04-04 17:21:02,984 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Object with name 'DbProvider' is a factory object.
+2008-04-04 17:21:03,000 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Loading XML object definitions from assembly [Spring.Data, Version=1.1.1.20093, Culture=neutral, PublicKeyToken=null], resource [Spring.Data.Common.dbproviders.xml]
+2008-04-04 17:21:03,000 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Using the following XmlReader implementation : System.Xml.XsdValidatingReader
+2008-04-04 17:21:03,015 [4] DEBUG Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader [(null)] - Loading object definitions.
+2008-04-04 17:21:03,015 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Loading object definitions...
+2008-04-04 17:21:03,015 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default lazy init 'false'.
+2008-04-04 17:21:03,015 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default dependency check 'none'.
+2008-04-04 17:21:03,015 [4] DEBUG Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper [(null)] - Default autowire 'no'.
+2008-04-04 17:21:03,015 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'SqlServer-1.1'.
+2008-04-04 17:21:03,015 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'SqlServer-2.0'.
+2008-04-04 17:21:03,015 [4] DEBUG Spring.Objects.Factory.Support.DefaultListableObjectFactory [(null)] - Registering alias 'System.Data.SqlClient' for object with name 'SqlServer-2.0'.
+2008-04-04 17:21:03,015 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'SqlServerCe-3.1'.
+2008-04-04 17:21:03,015 [4] DEBUG Spring.Objects.Factory.Support.DefaultListableObjectFactory [(null)] - Registering alias 'System.Data.SqlServerCe' for object with name 'SqlServerCe-3.1'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'OleDb-1.1'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'OleDb-2.0'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Support.DefaultListableObjectFactory [(null)] - Registering alias 'System.Data.OleDb' for object with name 'OleDb-2.0'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'OracleClient-2.0'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Support.DefaultListableObjectFactory [(null)] - Registering alias 'System.Data.OracleClient' for object with name 'OracleClient-2.0'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'OracleODP-2.0'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Support.DefaultListableObjectFactory [(null)] - Registering alias 'Oracle.DataAccess.Client' for object with name 'OracleODP-2.0'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'MySql'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'MySql-1.0.9'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'MySql-5.0'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'MySql-5.0.8.1'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'MySql-5.1'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'MySql-5.1.4'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Support.DefaultListableObjectFactory [(null)] - Registering alias 'MySql.Data.MySqlClient' for object with name 'MySql-5.1.4'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'Npgsql-1.0'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'Npgsql-2.0-beta1'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'DB2-9.0.0-1.1'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'DB2-9.0.0-2.0'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Support.DefaultListableObjectFactory [(null)] - Registering alias 'IBM.Data.DB2' for object with name 'DB2-9.0.0-2.0'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'DB2-9.1.0-1.1'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'DB2-9.1.0.2'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Support.DefaultListableObjectFactory [(null)] - Registering alias 'IBM.Data.DB2.9.1.0' for object with name 'DB2-9.1.0.2'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'iDB2-10.0.0.0'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'SQLite-1.0.43'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'SQLite-1.0.44'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'SQLite-1.0.47'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Support.DefaultListableObjectFactory [(null)] - Registering alias 'System.Data.SQLite' for object with name 'SQLite-1.0.47'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'SybaseAse-12'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'SybaseAse-15'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'Odbc-1.1'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.ObjectsNamespaceParser [(null)] - Registering object definition with id 'Odbc-2.0'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Support.DefaultListableObjectFactory [(null)] - Registering alias 'System.Data.Odbc' for object with name 'Odbc-2.0'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader [(null)] - Found 27 <object> elements defining objects.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Objects.Factory.Support.AbstractObjectDefinitionReader [(null)] - Loaded 27 bean definitions from location [assembly://Spring.Data, Version=1.1.1.20093, Culture=neutral, PublicKeyToken=null/Spring.Data.Common/dbproviders.xml]
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Context.Support.AbstractXmlApplicationContext [(null)] - Refreshed ObjectFactory for application context 'DBPROVIDERFACTORY_CONTEXT'.
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Context.Support.AbstractApplicationContext [(null)] - 27 objects defined in application context [DBPROVIDERFACTORY_CONTEXT].
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Context.Support.AbstractApplicationContext [(null)] - processed 0 IFactoryObjectPostProcessors defined in application context [DBPROVIDERFACTORY_CONTEXT].
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Context.Support.AbstractApplicationContext [(null)] - processed 0 IObjectPostProcessors defined in application context [DBPROVIDERFACTORY_CONTEXT].
+2008-04-04 17:21:03,031 [4] DEBUG Spring.Context.Support.AbstractApplicationContext [(null)] - No IEventRegistry found with name 'eventRegistry' : using default 'Spring.Objects.Events.Support.EventRegistry'.
+2008-04-04 17:21:03,046 [4] DEBUG Spring.Context.Support.AbstractApplicationContext [(null)] - No IMessageSource found with name 'messageSource' : using default 'StaticMessageSource : '.
+2008-04-04 17:21:03,046 [4] DEBUG Spring.Objects.Factory.Support.DefaultListableObjectFactory [(null)] - Pre-instantiating singletons in factory [Spring.Objects.Factory.Support.DefaultListableObjectFactory]
+2008-04-04 17:21:03,046 [4] INFO  Spring.Data.Common.DbProviderFactory [(null)] - 27 DbProviders Available. [SqlServer-1.1,SqlServer-2.0,SqlServerCe-3.1,OleDb-1.1,OleDb-2.0,OracleClient-2.0,OracleODP-2.0,MySql,MySql-1.0.9,MySql-5.0,MySql-5.0.8.1,MySql-5.1,MySql-5.1.4,Npgsql-1.0,Npgsql-2.0-beta1,DB2-9.0.0-1.1,DB2-9.0.0-2.0,DB2-9.1.0-1.1,DB2-9.1.0.2,iDB2-10.0.0.0,SQLite-1.0.43,SQLite-1.0.44,SQLite-1.0.47,SybaseAse-12,SybaseAse-15,Odbc-1.1,Odbc-2.0]
+2008-04-04 17:21:03,046 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'SqlServer-2.0' with merged definition [Root web object with class [Spring.Data.Common.DbProvider] defined in assembly [Spring.Data, Version=1.1.1.20093, Culture=neutral, PublicKeyToken=null], resource [Spring.Data.Common.dbproviders.xml]].
+2008-04-04 17:21:03,046 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'SqlServer-2.0'.
+2008-04-04 17:21:03,062 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object '(inner object)' with merged definition [Root web object with class [Spring.Data.Common.DbMetadata] defined in assembly [Spring.Data, Version=1.1.1.20093, Culture=neutral, PublicKeyToken=null], resource [Spring.Data.Common.dbproviders.xml]].
+2008-04-04 17:21:03,062 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of '(inner object)'.
+2008-04-04 17:21:03,078 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Object '(inner object)' instantiated via constructor [Void .ctor(System.String, System.String, System.Type, System.Type, System.Type, System.Type, System.Type, System.String, System.Type, System.String, System.String, System.String, System.Type, Boolean, Boolean, Boolean, System.String)].
+2008-04-04 17:21:03,078 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Data.Common.DbMetadata' using definition '(inner object)'
+2008-04-04 17:21:03,125 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object '(inner object)'
+2008-04-04 17:21:03,125 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object '(inner object)'
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Object 'SqlServer-2.0' instantiated via constructor [Void .ctor(Spring.Data.Common.IDbMetadata)].
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Data.Common.DbProvider' using definition 'SqlServer-2.0'
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'SqlServer-2.0'
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'SqlServer-2.0'
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'DbProvider'
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'SessionFactory' in object 'HibernateTransactionManager' to object 'NHibernateSessionFactory'.
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'NHibernateSessionFactory'
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'NHibernateSessionFactory' with merged definition [Root web object with class [Spring.Data.NHibernate.LocalSessionFactoryObject] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Dao.xml]].
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'NHibernateSessionFactory'.
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'NHibernateSessionFactory' to allow for resolving potential circular references
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Data.NHibernate.LocalSessionFactoryObject' using definition 'NHibernateSessionFactory'
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'DbProvider' in object 'NHibernateSessionFactory' to object 'DbProvider'.
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'DbProvider'.
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Object with name 'DbProvider' is a factory object.
+2008-04-04 17:21:03,140 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'DbProvider'
+2008-04-04 17:21:03,171 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'NHibernateSessionFactory'
+2008-04-04 17:21:03,171 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Calling AfterPropertiesSet() on object with name 'NHibernateSessionFactory'.
+2008-04-04 17:21:03,250 [4] INFO  NHibernate.Cfg.Environment [(null)] - NHibernate 1.2.1.4000 (1.2.1.4000)
+2008-04-04 17:21:03,250 [4] INFO  NHibernate.Cfg.Environment [(null)] - nhibernate section not found in application configuration file
+2008-04-04 17:21:03,265 [4] INFO  NHibernate.Cfg.Environment [(null)] - Bytecode provider name : lcg
+2008-04-04 17:21:03,265 [4] INFO  NHibernate.Cfg.Environment [(null)] - Using reflection optimizer
+2008-04-04 17:21:03,296 [4] WARN  Spring.Data.NHibernate.LocalSessionFactoryObject [(null)] - Overriding use of Spring's Hibernate Connection Provider with [NHibernate.Connection.DriverConnectionProvider]
+2008-04-04 17:21:03,296 [4] INFO  NHibernate.Cfg.Configuration [(null)] - Searching for mapped documents in assembly: Spring.Northwind.Dao.NHibernate
+2008-04-04 17:21:03,296 [4] INFO  NHibernate.Cfg.Configuration [(null)] - Mapping resource: Spring.Northwind.Mappings.Order.hbm.xml
+2008-04-04 17:21:03,406 [4] INFO  NHibernate.Dialect.Dialect [(null)] - Using dialect: NHibernate.Dialect.MsSql2000Dialect
+2008-04-04 17:21:03,484 [4] INFO  NHibernate.Cfg.HbmBinder [(null)] - Mapping class: Spring.Northwind.Domain.Order -> Orders
+2008-04-04 17:21:03,609 [4] INFO  NHibernate.Cfg.Configuration [(null)] - Mapping resource: Spring.Northwind.Mappings.Customer.hbm.xml
+2008-04-04 17:21:03,609 [4] INFO  NHibernate.Dialect.Dialect [(null)] - Using dialect: NHibernate.Dialect.MsSql2000Dialect
+2008-04-04 17:21:03,609 [4] INFO  NHibernate.Cfg.HbmBinder [(null)] - Mapping class: Spring.Northwind.Domain.Customer -> Customers
+2008-04-04 17:21:03,609 [4] INFO  NHibernate.Cfg.Configuration [(null)] - Mapping resource: Spring.Northwind.Mappings.OrderDetail.hbm.xml
+2008-04-04 17:21:03,609 [4] INFO  NHibernate.Dialect.Dialect [(null)] - Using dialect: NHibernate.Dialect.MsSql2000Dialect
+2008-04-04 17:21:03,609 [4] INFO  NHibernate.Cfg.HbmBinder [(null)] - Mapping class: Spring.Northwind.Domain.OrderDetail -> [Order Details]
+2008-04-04 17:21:03,734 [4] INFO  Spring.Data.NHibernate.LocalSessionFactoryObject [(null)] - Building new Hibernate SessionFactory
+2008-04-04 17:21:03,734 [4] INFO  NHibernate.Cfg.Configuration [(null)] - checking mappings queue
+2008-04-04 17:21:03,734 [4] INFO  NHibernate.Cfg.Configuration [(null)] - processing one-to-many association mappings
+2008-04-04 17:21:03,734 [4] INFO  NHibernate.Cfg.HbmBinder [(null)] - mapping collection: Spring.Northwind.Domain.Order.OrderDetails -> [Order Details]
+2008-04-04 17:21:03,734 [4] INFO  NHibernate.Cfg.HbmBinder [(null)] - mapping collection: Spring.Northwind.Domain.Customer.Orders -> Orders
+2008-04-04 17:21:03,734 [4] INFO  NHibernate.Cfg.Configuration [(null)] - processing one-to-one association property references
+2008-04-04 17:21:03,734 [4] INFO  NHibernate.Cfg.Configuration [(null)] - processing foreign key constraints
+2008-04-04 17:21:03,765 [4] INFO  NHibernate.Dialect.Dialect [(null)] - Using dialect: NHibernate.Dialect.MsSql2000Dialect
+2008-04-04 17:21:03,765 [4] INFO  NHibernate.Connection.ConnectionProviderFactory [(null)] - Initializing connection provider: NHibernate.Connection.DriverConnectionProvider
+2008-04-04 17:21:03,765 [4] INFO  NHibernate.Connection.ConnectionProvider [(null)] - Configuring ConnectionProvider
+2008-04-04 17:21:03,765 [4] INFO  NHibernate.Cfg.SettingsFactory [(null)] - Transaction factory: NHibernate.Transaction.AdoNetTransactionFactory
+2008-04-04 17:21:03,765 [4] INFO  NHibernate.Cfg.SettingsFactory [(null)] - Optimize cache for minimal puts: False
+2008-04-04 17:21:03,765 [4] INFO  NHibernate.Cfg.SettingsFactory [(null)] - Connection release mode: auto
+2008-04-04 17:21:03,765 [4] INFO  NHibernate.Cfg.SettingsFactory [(null)] - Query translator: NHibernate.Hql.Classic.ClassicQueryTranslatorFactory
+2008-04-04 17:21:03,781 [4] INFO  NHibernate.Cfg.SettingsFactory [(null)] - Query language substitutions: {}
+2008-04-04 17:21:03,781 [4] INFO  NHibernate.Cfg.SettingsFactory [(null)] - cache provider: NHibernate.Cache.NoCacheProvider, NHibernate, Version=1.2.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4
+2008-04-04 17:21:03,828 [4] INFO  NHibernate.Impl.SessionFactoryImpl [(null)] - building session factory
+2008-04-04 17:21:04,000 [4] INFO  NHibernate.Impl.SessionFactoryObjectFactory [(null)] - no name configured
+2008-04-04 17:21:04,203 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'NHibernateSessionFactory'
+2008-04-04 17:21:04,203 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Object with name 'NHibernateSessionFactory' is a factory object.
+2008-04-04 17:21:04,203 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'NHibernateSessionFactory'
+2008-04-04 17:21:04,218 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Setting the ObjectFactory property on the IObjectFactoryAware object 'HibernateTransactionManager'.
+2008-04-04 17:21:04,218 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'HibernateTransactionManager'
+2008-04-04 17:21:04,218 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Calling AfterPropertiesSet() on object with name 'HibernateTransactionManager'.
+2008-04-04 17:21:04,218 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'HibernateTransactionManager'
+2008-04-04 17:21:04,218 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'TransactionAttributeSource' in object 'transactionInterceptor' to object 'attributeTransactionAttributeSource'.
+2008-04-04 17:21:04,218 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'attributeTransactionAttributeSource'
+2008-04-04 17:21:04,218 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'attributeTransactionAttributeSource' with merged definition [Root web object with class [Spring.Transaction.Interceptor.AttributesTransactionAttributeSource] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\DeclarativeServicesAttributeDriven.xml]].
+2008-04-04 17:21:04,218 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'attributeTransactionAttributeSource'.
+2008-04-04 17:21:04,218 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'attributeTransactionAttributeSource' to allow for resolving potential circular references
+2008-04-04 17:21:04,218 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Transaction.Interceptor.AttributesTransactionAttributeSource' using definition 'attributeTransactionAttributeSource'
+2008-04-04 17:21:04,218 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'attributeTransactionAttributeSource'
+2008-04-04 17:21:04,218 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'attributeTransactionAttributeSource'
+2008-04-04 17:21:04,234 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'transactionInterceptor'
+2008-04-04 17:21:04,234 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Calling AfterPropertiesSet() on object with name 'transactionInterceptor'.
+2008-04-04 17:21:04,234 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'transactionInterceptor'
+2008-04-04 17:21:04,234 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'transactionAdvisor'
+2008-04-04 17:21:04,234 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'transactionAdvisor'
+2008-04-04 17:21:04,234 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'autoProxyCreator'
+2008-04-04 17:21:04,234 [4] DEBUG Spring.Context.Support.AbstractApplicationContext [(null)] - processed 1 IObjectPostProcessors defined in application context [/spring.northwind.web].
+2008-04-04 17:21:04,234 [4] DEBUG Spring.Context.Support.AbstractApplicationContext [(null)] - No IEventRegistry found with name 'eventRegistry' : using default 'Spring.Objects.Events.Support.EventRegistry'.
+2008-04-04 17:21:04,234 [4] DEBUG Spring.Context.Support.AbstractApplicationContext [(null)] - No IMessageSource found with name 'messageSource' : using default 'StaticMessageSource : '.
+2008-04-04 17:21:04,234 [4] DEBUG Spring.Objects.Factory.Support.DefaultListableObjectFactory [(null)] - Pre-instantiating singletons in factory [Spring.Objects.Factory.Support.WebObjectFactory]
+2008-04-04 17:21:04,234 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'CommonLoggingAroundAdvice'
+2008-04-04 17:21:04,234 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'CommonLoggingAroundAdvice' with merged definition [Root web object with class [Spring.Aspects.Logging.CommonLoggingAroundAdvice] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Aspects.xml]].
+2008-04-04 17:21:04,234 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'CommonLoggingAroundAdvice'.
+2008-04-04 17:21:04,250 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'CommonLoggingAroundAdvice' to allow for resolving potential circular references
+2008-04-04 17:21:04,250 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Aspects.Logging.CommonLoggingAroundAdvice' using definition 'CommonLoggingAroundAdvice'
+2008-04-04 17:21:04,250 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'CommonLoggingAroundAdvice'
+2008-04-04 17:21:04,250 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'CommonLoggingAroundAdvice'
+2008-04-04 17:21:04,250 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'HibernateTemplate'
+2008-04-04 17:21:04,250 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'HibernateTemplate' with merged definition [Root web object with class [Spring.Data.NHibernate.HibernateTemplate] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Dao.xml]].
+2008-04-04 17:21:04,250 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'HibernateTemplate'.
+2008-04-04 17:21:04,250 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'HibernateTemplate' to allow for resolving potential circular references
+2008-04-04 17:21:04,250 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Data.NHibernate.HibernateTemplate' using definition 'HibernateTemplate'
+2008-04-04 17:21:04,265 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'SessionFactory' in object 'HibernateTemplate' to object 'NHibernateSessionFactory'.
+2008-04-04 17:21:04,265 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'NHibernateSessionFactory'.
+2008-04-04 17:21:04,265 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Object with name 'NHibernateSessionFactory' is a factory object.
+2008-04-04 17:21:04,265 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'NHibernateSessionFactory'
+2008-04-04 17:21:04,265 [4] DEBUG Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - returning available advisors
+2008-04-04 17:21:04,359 [4] INFO  Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - Candidate advisor [Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor] rejected for type [NHibernate.Impl.SessionFactoryImpl]
+2008-04-04 17:21:04,375 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Setting the ObjectFactory property on the IObjectFactoryAware object 'HibernateTemplate'.
+2008-04-04 17:21:04,390 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'HibernateTemplate'
+2008-04-04 17:21:04,390 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Calling AfterPropertiesSet() on object with name 'HibernateTemplate'.
+2008-04-04 17:21:04,390 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'HibernateTemplate'
+2008-04-04 17:21:04,390 [4] DEBUG Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - returning available advisors
+2008-04-04 17:21:04,421 [4] INFO  Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - Candidate advisor [Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor] rejected for type [Spring.Data.NHibernate.HibernateTemplate]
+2008-04-04 17:21:04,421 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'CustomerDao'
+2008-04-04 17:21:04,421 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'CustomerDao' with merged definition [Root web object with class [Spring.Northwind.Dao.NHibernate.HibernateCustomerDao] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Dao.xml]].
+2008-04-04 17:21:04,421 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'CustomerDao'.
+2008-04-04 17:21:04,421 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'CustomerDao' to allow for resolving potential circular references
+2008-04-04 17:21:04,421 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Northwind.Dao.NHibernate.HibernateCustomerDao' using definition 'CustomerDao'
+2008-04-04 17:21:04,421 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'HibernateTemplate' in object 'CustomerDao' to object 'HibernateTemplate'.
+2008-04-04 17:21:04,421 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'HibernateTemplate'.
+2008-04-04 17:21:04,437 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'CustomerDao'
+2008-04-04 17:21:04,437 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Calling AfterPropertiesSet() on object with name 'CustomerDao'.
+2008-04-04 17:21:04,437 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'CustomerDao'
+2008-04-04 17:21:04,437 [4] DEBUG Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - returning available advisors
+2008-04-04 17:21:04,437 [4] INFO  Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - Candidate advisor [Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor] accepted for type [Spring.Northwind.Dao.NHibernate.HibernateCustomerDao]
+2008-04-04 17:21:04,453 [4] INFO  Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - Creating implicit proxy for object 'CustomerDao' with 0 common interceptors and 1 specific interceptors
+2008-04-04 17:21:04,578 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'OrderDao'
+2008-04-04 17:21:04,578 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'OrderDao' with merged definition [Root web object with class [Spring.Northwind.Dao.NHibernate.HibernateOrderDao] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Dao.xml]].
+2008-04-04 17:21:04,578 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'OrderDao'.
+2008-04-04 17:21:04,578 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'OrderDao' to allow for resolving potential circular references
+2008-04-04 17:21:04,578 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Northwind.Dao.NHibernate.HibernateOrderDao' using definition 'OrderDao'
+2008-04-04 17:21:04,578 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'HibernateTemplate' in object 'OrderDao' to object 'HibernateTemplate'.
+2008-04-04 17:21:04,578 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'HibernateTemplate'.
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'OrderDao'
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Calling AfterPropertiesSet() on object with name 'OrderDao'.
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'OrderDao'
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - returning available advisors
+2008-04-04 17:21:04,593 [4] INFO  Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - Candidate advisor [Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor] rejected for type [Spring.Northwind.Dao.NHibernate.HibernateOrderDao]
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'FulfillmentService'
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'FulfillmentService' with merged definition [Root web object with class [Spring.Northwind.Service.FulfillmentService] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Services.xml]].
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'FulfillmentService'.
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'FulfillmentService' to allow for resolving potential circular references
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Northwind.Service.FulfillmentService' using definition 'FulfillmentService'
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerDao' in object 'FulfillmentService' to object 'CustomerDao'.
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerDao'.
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'OrderDao' in object 'FulfillmentService' to object 'OrderDao'.
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'OrderDao'.
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'ShippingService' in object 'FulfillmentService' to object 'ShippingService'.
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Creating shared instance of singleton object 'ShippingService'
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'ShippingService' with merged definition [Root web object with class [Spring.Northwind.Service.FedExShippingService] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Services.xml]].
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'ShippingService'.
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Eagerly caching object 'ShippingService' to allow for resolving potential circular references
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Northwind.Service.FedExShippingService' using definition 'ShippingService'
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'ShippingService'
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'ShippingService'
+2008-04-04 17:21:04,593 [4] DEBUG Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - returning available advisors
+2008-04-04 17:21:04,593 [4] INFO  Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - Candidate advisor [Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor] rejected for type [Spring.Northwind.Service.FedExShippingService]
+2008-04-04 17:21:04,609 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'FulfillmentService'
+2008-04-04 17:21:04,609 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'FulfillmentService'
+2008-04-04 17:21:04,609 [4] DEBUG Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - returning available advisors
+2008-04-04 17:21:04,609 [4] INFO  Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - Candidate advisor [Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor] accepted for type [Spring.Northwind.Service.FulfillmentService]
+2008-04-04 17:21:04,609 [4] INFO  Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - Creating implicit proxy for object 'FulfillmentService' with 0 common interceptors and 1 specific interceptors
+2008-04-04 17:21:04,625 [4] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - created instance [/spring.northwind.web]:WebApplicationContext(35298535)
+2008-04-04 17:21:04,625 [4] DEBUG Spring.Context.Support.ContextRegistry [(null)] - Registering context '[/spring.northwind.web]:WebApplicationContext(35298535)' under name '/spring.northwind.web'.
+2008-04-04 17:21:04,625 [4] DEBUG Spring.Context.Support.ContextHandler [(null)] - context '[/spring.northwind.web]:WebApplicationContext(35298535)' created for name '/spring.northwind.web'
+2008-04-04 17:21:04,625 [4] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - got context '[/spring.northwind.web]:WebApplicationContext(35298535)' for vpath 'spring.root'
+2008-04-04 17:21:04,625 [4] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - added context '[/spring.northwind.web]:WebApplicationContext(35298535)' to WebContextCache for vpath 'spring.root'
+2008-04-04 17:21:04,625 [4] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - added parent context '[/spring.northwind.web]:WebApplicationContext(35298535)' to WebContextCache for vpath '/spring.northwind.web'
+2008-04-04 17:21:04,640 [4] DEBUG Spring.Context.Support.ContextRegistry [(null)] - Returning context '[/spring.northwind.web]:WebApplicationContext(35298535)' registered under name '/spring.northwind.web'.
+2008-04-04 17:21:04,640 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'NHibernateSessionFactory'.
+2008-04-04 17:21:04,640 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Object with name 'NHibernateSessionFactory' is a factory object.
+2008-04-04 17:21:04,640 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'NHibernateSessionFactory'
+2008-04-04 17:21:04,640 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Opening single Hibernate Session in SessionScope
+2008-04-04 17:21:04,640 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Created LazySessionHolder
+2008-04-04 17:21:04,640 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Bound value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@3864659] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] to thread [4]
+2008-04-04 17:21:04,718 [4] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolving url '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:04,718 [4] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - looking up web context 'spring.root' in WebContextCache
+2008-04-04 17:21:04,718 [4] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - returning WebContextCache hit '[/spring.northwind.web]:WebApplicationContext(35298535)' for vpath 'spring.root' 
+2008-04-04 17:21:04,718 [4] DEBUG Spring.Web.Support.AbstractHandlerFactory [(null)] - GetHandler():looking up definition for app-relative url '/CustomerList.aspx'
+2008-04-04 17:21:04,718 [4] DEBUG Spring.Web.Support.AbstractHandlerFactory [(null)] - GetHandler():found definition for page-url '/CustomerList.aspx'
+2008-04-04 17:21:04,718 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object '/CustomerList.aspx' with merged definition [Root web object with class [/Spring.Northwind.Web/CustomerList.aspx] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Web.xml]].
+2008-04-04 17:21:04,718 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of '/CustomerList.aspx'.
+2008-04-04 17:21:04,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:04,718 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerList.aspx
+2008-04-04 17:21:04,718 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'ASP.customerlist_aspx' using definition '/CustomerList.aspx'
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerEditController' in object '/CustomerList.aspx' to object 'CustomerEditController'.
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'CustomerEditController' with merged definition [Root web object with class [NHibernateCustomerEditController] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Web.xml]].
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'CustomerEditController'.
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'constructor argument with name sessionfactory' in object 'CustomerEditController' to object 'NHibernateSessionFactory'.
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'NHibernateSessionFactory'.
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Object with name 'NHibernateSessionFactory' is a factory object.
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'NHibernateSessionFactory'
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Object 'CustomerEditController' instantiated via constructor [Void .ctor(NHibernate.ISessionFactory)].
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'NHibernateCustomerEditController' using definition 'CustomerEditController'
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'CustomerEditController'
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'CustomerEditController'
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - returning available advisors
+2008-04-04 17:21:04,734 [4] INFO  Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - Candidate advisor [Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor] rejected for type [NHibernateCustomerEditController]
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerDao' in object '/CustomerList.aspx' to object 'CustomerDao'.
+2008-04-04 17:21:04,734 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerDao'.
+2008-04-04 17:21:04,765 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:04,765 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:04,765 [4] DEBUG Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - returning available advisors
+2008-04-04 17:21:05,156 [4] INFO  Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - Candidate advisor [Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor] rejected for type [ASP.customerlist_aspx]
+2008-04-04 17:21:05,296 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object 'SqlServer-2.0' with merged definition [Root web object with class [Spring.Data.Common.DbProvider] defined in assembly [Spring.Data, Version=1.1.1.20093, Culture=neutral, PublicKeyToken=null], resource [Spring.Data.Common.dbproviders.xml]].
+2008-04-04 17:21:05,296 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of 'SqlServer-2.0'.
+2008-04-04 17:21:05,296 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object '(inner object)' with merged definition [Root web object with class [Spring.Data.Common.DbMetadata] defined in assembly [Spring.Data, Version=1.1.1.20093, Culture=neutral, PublicKeyToken=null], resource [Spring.Data.Common.dbproviders.xml]].
+2008-04-04 17:21:05,296 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of '(inner object)'.
+2008-04-04 17:21:05,296 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Object '(inner object)' instantiated via constructor [Void .ctor(System.String, System.String, System.Type, System.Type, System.Type, System.Type, System.Type, System.String, System.Type, System.String, System.String, System.String, System.Type, Boolean, Boolean, Boolean, System.String)].
+2008-04-04 17:21:05,296 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Data.Common.DbMetadata' using definition '(inner object)'
+2008-04-04 17:21:05,296 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object '(inner object)'
+2008-04-04 17:21:05,296 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object '(inner object)'
+2008-04-04 17:21:05,296 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Object 'SqlServer-2.0' instantiated via constructor [Void .ctor(Spring.Data.Common.IDbMetadata)].
+2008-04-04 17:21:05,296 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'Spring.Data.Common.DbProvider' using definition 'SqlServer-2.0'
+2008-04-04 17:21:05,296 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object 'SqlServer-2.0'
+2008-04-04 17:21:05,296 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object 'SqlServer-2.0'
+2008-04-04 17:21:05,312 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@3864659] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:05,312 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - session instance requested - opening new session
+2008-04-04 17:21:05,312 [4] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Opening Hibernate Session
+2008-04-04 17:21:05,328 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@3864659] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:05,328 [4] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Found thread-bound Session for HibernateTemplate
+2008-04-04 17:21:05,343 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@3864659] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:05,406 [4] INFO  NHibernate.Loader.Loader [(null)] - SELECT this_.CustomerID as CustomerID1_0_, this_.CompanyName as CompanyN2_1_0_, this_.ContactName as ContactN3_1_0_, this_.ContactTitle as ContactT4_1_0_, this_.Address as Address1_0_, this_.City as City1_0_, this_.Region as Region1_0_, this_.PostalCode as PostalCode1_0_, this_.Country as Country1_0_, this_.Phone as Phone1_0_, this_.Fax as Fax1_0_ FROM Customers this_
+2008-04-04 17:21:06,000 [4] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Not closing pre-bound Hibernate Session after HibernateTemplate
+2008-04-04 17:21:06,046 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - disposing 'request'-scoped item cache
+2008-04-04 17:21:06,046 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Trying to close SessionScope
+2008-04-04 17:21:06,046 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Closing single Hibernate Session in SessionScope
+2008-04-04 17:21:06,046 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Removed value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@3864659] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] from thread [4]
+2008-04-04 17:21:06,046 [4] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Closing Hibernate Session
+2008-04-04 17:21:06,046 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Closed LazySessionHolder
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Opening single Hibernate Session in SessionScope
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Created LazySessionHolder
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Bound value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@23404EE] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] to thread [8]
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolving url '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolved url '/Spring.Northwind.Web/CustomerList.aspx' from reusable handler cache
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object '/CustomerList.aspx' with merged definition [Root web object with class [/Spring.Northwind.Web/CustomerList.aspx] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Web.xml]].
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of '/CustomerList.aspx'.
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerList.aspx
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'ASP.customerlist_aspx' using definition '/CustomerList.aspx'
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerEditController' in object '/CustomerList.aspx' to object 'CustomerEditController'.
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerEditController'.
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerDao' in object '/CustomerList.aspx' to object 'CustomerDao'.
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerDao'.
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@23404EE] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [8]
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - session instance requested - opening new session
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Opening Hibernate Session
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@23404EE] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [8]
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Found thread-bound Session for HibernateTemplate
+2008-04-04 17:21:08,921 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@23404EE] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [8]
+2008-04-04 17:21:08,921 [8] INFO  NHibernate.Loader.Loader [(null)] - SELECT this_.CustomerID as CustomerID1_0_, this_.CompanyName as CompanyN2_1_0_, this_.ContactName as ContactN3_1_0_, this_.ContactTitle as ContactT4_1_0_, this_.Address as Address1_0_, this_.City as City1_0_, this_.Region as Region1_0_, this_.PostalCode as PostalCode1_0_, this_.Country as Country1_0_, this_.Phone as Phone1_0_, this_.Fax as Fax1_0_ FROM Customers this_
+2008-04-04 17:21:08,937 [8] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Not closing pre-bound Hibernate Session after HibernateTemplate
+2008-04-04 17:21:09,062 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - disposing 'request'-scoped item cache
+2008-04-04 17:21:09,062 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Trying to close SessionScope
+2008-04-04 17:21:09,062 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Closing single Hibernate Session in SessionScope
+2008-04-04 17:21:09,062 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Removed value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@23404EE] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] from thread [8]
+2008-04-04 17:21:09,062 [8] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Closing Hibernate Session
+2008-04-04 17:21:09,062 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Closed LazySessionHolder
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Opening single Hibernate Session in SessionScope
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Created LazySessionHolder
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Bound value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@15CF103] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] to thread [8]
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolving url '/Spring.Northwind.Web/CustomerOrders.aspx'
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - looking up web context 'spring.root' in WebContextCache
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Context.Support.WebApplicationContext [(null)] - returning WebContextCache hit '[/spring.northwind.web]:WebApplicationContext(35298535)' for vpath 'spring.root' 
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Web.Support.AbstractHandlerFactory [(null)] - GetHandler():looking up definition for app-relative url '/CustomerOrders.aspx'
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Web.Support.AbstractHandlerFactory [(null)] - GetHandler():found definition for page-url '/CustomerOrders.aspx'
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object '/CustomerOrders.aspx' with merged definition [Root web object with class [/Spring.Northwind.Web/CustomerOrders.aspx] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Web.xml]].
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of '/CustomerOrders.aspx'.
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance '/Spring.Northwind.Web/CustomerOrders.aspx'
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerOrders.aspx
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'ASP.customerorders_aspx' using definition '/CustomerOrders.aspx'
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerEditController' in object '/CustomerOrders.aspx' to object 'CustomerEditController'.
+2008-04-04 17:21:09,078 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerEditController'.
+2008-04-04 17:21:09,093 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object '/CustomerOrders.aspx'
+2008-04-04 17:21:09,093 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object '/CustomerOrders.aspx'
+2008-04-04 17:21:09,093 [8] DEBUG Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - returning available advisors
+2008-04-04 17:21:09,437 [8] INFO  Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator [(null)] - Candidate advisor [Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor] rejected for type [ASP.customerorders_aspx]
+2008-04-04 17:21:09,500 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@15CF103] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [8]
+2008-04-04 17:21:09,500 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - session instance requested - opening new session
+2008-04-04 17:21:09,500 [8] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Opening Hibernate Session
+2008-04-04 17:21:09,546 [8] INFO  NHibernate.Loader.Loader [(null)] - SELECT orders0_.CustomerID as CustomerID__1_, orders0_.OrderID as OrderID1_, orders0_.OrderID as OrderID0_0_, orders0_.OrderDate as OrderDate0_0_, orders0_.RequiredDate as Required3_0_0_, orders0_.ShippedDate as ShippedD4_0_0_, orders0_.ShipName as ShipName0_0_, orders0_.ShipAddress as ShipAddr6_0_0_, orders0_.ShipCity as ShipCity0_0_, orders0_.ShipRegion as ShipRegion0_0_, orders0_.ShipPostalCode as ShipPost9_0_0_, orders0_.ShipCountry as ShipCou10_0_0_ FROM Orders orders0_ WHERE orders0_.CustomerID=@p0
+2008-04-04 17:21:09,703 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - disposing 'request'-scoped item cache
+2008-04-04 17:21:09,703 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Trying to close SessionScope
+2008-04-04 17:21:09,703 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Closing single Hibernate Session in SessionScope
+2008-04-04 17:21:09,703 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Removed value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@15CF103] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] from thread [8]
+2008-04-04 17:21:09,703 [8] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Closing Hibernate Session
+2008-04-04 17:21:09,703 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Closed LazySessionHolder
+2008-04-04 17:21:11,359 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Opening single Hibernate Session in SessionScope
+2008-04-04 17:21:11,359 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Created LazySessionHolder
+2008-04-04 17:21:11,359 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Bound value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@4BC5D9] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] to thread [4]
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolving url '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolved url '/Spring.Northwind.Web/CustomerList.aspx' from reusable handler cache
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object '/CustomerList.aspx' with merged definition [Root web object with class [/Spring.Northwind.Web/CustomerList.aspx] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Web.xml]].
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of '/CustomerList.aspx'.
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerList.aspx
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'ASP.customerlist_aspx' using definition '/CustomerList.aspx'
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerEditController' in object '/CustomerList.aspx' to object 'CustomerEditController'.
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerEditController'.
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerDao' in object '/CustomerList.aspx' to object 'CustomerDao'.
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerDao'.
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@4BC5D9] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - session instance requested - opening new session
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Opening Hibernate Session
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@4BC5D9] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Found thread-bound Session for HibernateTemplate
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@4BC5D9] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [4]
+2008-04-04 17:21:11,375 [4] INFO  NHibernate.Loader.Loader [(null)] - SELECT this_.CustomerID as CustomerID1_0_, this_.CompanyName as CompanyN2_1_0_, this_.ContactName as ContactN3_1_0_, this_.ContactTitle as ContactT4_1_0_, this_.Address as Address1_0_, this_.City as City1_0_, this_.Region as Region1_0_, this_.PostalCode as PostalCode1_0_, this_.Country as Country1_0_, this_.Phone as Phone1_0_, this_.Fax as Fax1_0_ FROM Customers this_
+2008-04-04 17:21:11,375 [4] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Not closing pre-bound Hibernate Session after HibernateTemplate
+2008-04-04 17:21:11,406 [4] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - disposing 'request'-scoped item cache
+2008-04-04 17:21:11,406 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Trying to close SessionScope
+2008-04-04 17:21:11,406 [4] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Closing single Hibernate Session in SessionScope
+2008-04-04 17:21:11,406 [4] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Removed value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@4BC5D9] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] from thread [4]
+2008-04-04 17:21:11,406 [4] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Closing Hibernate Session
+2008-04-04 17:21:11,406 [4] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Closed LazySessionHolder
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Data.NHibernate.Support.OpenSessionInViewModule [(null)] - Opening single Hibernate Session in SessionScope
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - Created LazySessionHolder
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Bound value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@F15783] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] to thread [8]
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolving url '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Web.Support.PageHandlerFactory [(null)] - GetHandler():resolved url '/Spring.Northwind.Web/CustomerList.aspx' from reusable handler cache
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Creating instance of Object '/CustomerList.aspx' with merged definition [Root web object with class [/Spring.Northwind.Web/CustomerList.aspx] defined in file [L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\Web.xml]].
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IInstantiationAwareObjectPostProcessors before the instantiation of '/CustomerList.aspx'.
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - creating page instance '/Spring.Northwind.Web/CustomerList.aspx'
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Objects.Factory.Support.WebObjectUtils [(null)] - page vpath is /Spring.Northwind.Web/CustomerList.aspx
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - configuring object 'ASP.customerlist_aspx' using definition '/CustomerList.aspx'
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerEditController' in object '/CustomerList.aspx' to object 'CustomerEditController'.
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerEditController'.
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Resolving reference from property 'CustomerDao' in object '/CustomerList.aspx' to object 'CustomerDao'.
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Objects.Factory.Support.WebObjectFactory [(null)] - Returning cached instance of singleton object 'CustomerDao'.
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors before initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory [(null)] - Invoking IObjectPostProcessors after initialization of object '/CustomerList.aspx'
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@F15783] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [8]
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder [(null)] - session instance requested - opening new session
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Data.NHibernate.SessionFactoryUtils [(null)] - Opening Hibernate Session
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@F15783] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [8]
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Data.NHibernate.HibernateTemplate [(null)] - Found thread-bound Session for HibernateTemplate
+2008-04-04 17:21:13,328 [8] DEBUG Spring.Transaction.Support.TransactionSynchronizationManager [(null)] - Retrieved value [Spring.Data.NHibernate.Support.SessionScope+LazySessionHolder@F15783] for key [NHibernate.Impl.SessionFactoryImpl@294C2AB] bound to thread [8]
+2008-04-04 17:21:13,328 [8] INFO  NHibernate.Loader.Loader [(null)] - SELECT this_.CustomerID as CustomerID1_0_, this_.CompanyName as CompanyN2_1_0_, this_.ContactName as ContactN3_1_0_, this_.ContactTitle as ContactT4_1_0_, this_.Address as Address1_0_, this_.City as City1_0_, this_.Region as Region1_0_, this_.PostalCode as PostalCode1_0_, this_.Country as Country1_0_, this_.Phone as Phone1_0_, this_.Fax as Fax1_0_ FROM Customers this_
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Services.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Services.xml
new file mode 100644
index 00000000..a2669b97
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Services.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <!-- Referenced by main application context configuration file -->
+  
+  <description>
+    The Northwind service layer definitions
+  </description>
+
+  <!-- Property placeholder configurer for database settings -->
+  <object id="FulfillmentService" type="Spring.Northwind.Service.FulfillmentService, Spring.Northwind.Service">
+    <property name="CustomerDao" ref="CustomerDao"/>
+    <property name="OrderDao" ref="OrderDao"/>
+    <property name="ShippingService" ref="ShippingService"/>
+  </object>
+
+  <object id="ShippingService" type="Spring.Northwind.Service.FedExShippingService, Spring.Northwind.Service">
+    
+  </object>
+
+  <import resource="DeclarativeServicesAttributeDriven.xml"/>
+  
+  <!-- didn't configure correctly yet - don't use
+  <import resource="DeclarativeServicesObjectNameDriven.xml"/>  
+  -->
+
+  <!--
+  <import resource="DeclarativeServicesTxProxyFactoryDriven.xml"/>
+  -->
+</objects>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Web.config b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Web.config
new file mode 100644
index 00000000..e8b2b4b5
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Web.config
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<!--
+    Note: As an alternative to hand editing this file you can use the
+    web admin tool to configure settings for your application. Use
+    the Website->Asp.Net Configuration option in Visual Studio.
+    A full list of settings and comments can be found in
+    machine.config.comments usually located in
+    \Windows\Microsoft.Net\Framework\v2.x\Config
+-->
+<configuration>
+	<configSections>
+		<sectionGroup name="common">
+			<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging"/>
+		</sectionGroup>
+		<sectionGroup name="spring">
+			<section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/>
+			<section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
+		</sectionGroup>
+		<section name="databaseSettings" type="System.Configuration.NameValueSectionHandler"/>
+	</configSections>
+	<common>
+		<logging>
+			<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.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="FILE-WATCH"/>
+				<arg key="configFile" value="~/Log4Net.xml"/>
+			</factoryAdapter>
+		</logging>
+	</common>
+	<spring>
+		<parsers>
+			<parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>
+		</parsers>
+		<context>
+			<resource uri="~/Aspects.xml"/>
+			<resource uri="~/Dao.xml"/>
+			<resource uri="~/Services.xml"/>
+			<resource uri="~/Web.xml"/>
+		</context>
+	</spring>
+	<!-- These properties are referenced in Dao.xml -->
+	<databaseSettings>
+		<add key="db.datasource" value=".\SQLEXPRESS; Integrated Security=true; AttachDbFilename=|DataDirectory|northwnd.mdf; User Instance=true;"/>
+		<add key="db.user" value="springqa"/>
+		<add key="db.password" value="springqa"/>
+		<add key="db.database" value="Northwind"/>
+	</databaseSettings>
+	<appSettings>
+		<add key="Spring.Data.NHibernate.Support.OpenSessionInViewModule.SessionFactoryObjectName" value="NHibernateSessionFactory"/>
+	</appSettings>
+	<connectionStrings/>
+	<system.web>
+		<httpModules>
+			<add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+			<add name="OpenSessionInView" type="Spring.Data.NHibernate.Support.OpenSessionInViewModule, Spring.Data.NHibernate12"/>
+		</httpModules>
+		<httpHandlers>
+			<add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
+			<add verb="*" path="*.asmx" type="Spring.Web.Services.WebServiceHandlerFactory, Spring.Web"/>
+			<add verb="*" path="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web"/>
+		</httpHandlers>
+		<compilation debug="true">
+			<assemblies>
+				<add assembly="System.Transactions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+				<add assembly="System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+				<add assembly="System.Drawing, 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.OracleClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/></assemblies>
+		</compilation>
+		<pages>
+			<controls>
+				<add tagPrefix="spring" namespace="Spring.Web.UI.Controls" assembly="Spring.Web"/>
+			</controls>
+		</pages>
+	</system.web>
+</configuration>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Web.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Web.xml
new file mode 100644
index 00000000..7883e61d
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Web.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+    <!-- Referenced by main application context configuration file -->
+
+    <description>
+        The Northwind web layer definitions
+    </description>
+
+    <object name="CustomerEditController" type="NHibernateCustomerEditController" scope="session">
+      <constructor-arg name="sessionFactory" ref="NHibernateSessionFactory"/>
+    </object>
+  
+    <object type="Default.aspx">
+        <property name="FulfillmentService" ref="FulfillmentService" />
+        <property name="CustomerDao" ref="CustomerDao" />
+    </object>
+
+    <object name="CustomerEditPage" abstract="true">
+        <property name="CustomerEditController" ref="CustomerEditController" />
+    </object>
+  
+    <object type="CustomerList.aspx" parent="CustomerEditPage">
+        <property name="CustomerDao" ref="CustomerDao" />
+        <property name="Results">
+            <dictionary>
+                <entry key="EditCustomer" value="redirect:CustomerEditor.aspx" />
+              <entry key="ViewOrders" value="redirect:CustomerOrders.aspx" />
+            </dictionary>
+        </property>
+    </object>
+
+    <object type="CustomerEditor.aspx" parent="CustomerEditPage">
+        <property name="CustomerDao" ref="CustomerDao" />
+    </object>
+
+    <object type="CustomerOrders.aspx" parent="CustomerEditPage" />
+  
+</objects>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/App.config b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/App.config
new file mode 100644
index 00000000..d778b07f
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/App.config
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <sectionGroup name="spring">
+      <section name='context' type='Spring.Context.Support.ContextHandler, Spring.Core'/>
+      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
+    </sectionGroup>
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+    </sectionGroup>
+    <section name="databaseSettings" type="System.Configuration.NameValueSectionHandler, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
+  </configSections>
+
+  <spring>
+    <parsers>
+      <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" />
+    </parsers>
+    
+    <context>      
+      <resource uri="Aspects.xml" />
+      <resource uri="Services.xml" />
+      <resource uri="Dao.xml" />
+    </context>
+  </spring>
+
+  <!-- These properties are referenced in Dao.xml -->
+  <databaseSettings>
+    <add key="db.datasource" value="(local);Integrated Security=true" />
+    <add key="db.user" value="springqa" />
+    <add key="db.password" value="springqa" />
+    <add key="db.database" value="Northwind" />
+  </databaseSettings>
+
+  <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"/>
+            <arg key="configFile" value="filename"/>
+        </factoryAdapter>
+    </logging>
+  </common>
+  
+  <log4net>
+    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%-5level %logger - %message%newline" />
+      </layout>
+    </appender>
+
+    <!-- Set default logging level to DEBUG -->
+    <root>
+      <level value="DEBUG" />
+      <appender-ref ref="ConsoleAppender" />
+    </root>
+
+    <!-- Set logging for Spring.  Logger names in Spring correspond to the namespace -->
+    <logger name="Spring">
+      <level value="INFO" />
+    </logger>
+    
+    <logger name="Spring.Data">
+      <level value="DEBUG" />
+    </logger>
+
+    <logger name="NHibernate">
+      <level value="INFO" />
+    </logger>
+
+
+  </log4net>
+</configuration>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Aspects.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Aspects.xml
new file mode 100644
index 00000000..b50ad156
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Aspects.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<objects xmlns="http://www.springframework.net">
+  
+  <object id="CommonLoggingAroundAdvice" type="Spring.Aspects.Logging.CommonLoggingAroundAdvice, Spring.Aspects">
+    <property name="Level" value="Info" />
+  </object>
+  
+</objects>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Dao.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Dao.xml
new file mode 100644
index 00000000..47191809
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Dao.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database">
+
+  <!-- Referenced by main application context configuration file -->
+  <description>
+    The Northwind object definitions for the Data Access Objects.
+  </description>
+
+  <!-- Property placeholder configurer for database settings -->
+  <object type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core">
+    <property name="ConfigSections" value="databaseSettings"/>
+  </object>
+
+  <!-- Database and NHibernate Configuration -->
+  <db:provider id="DbProvider"
+                   provider="SqlServer-2.0"
+                   connectionString="Data Source=.\SQLExpress;Integrated Security=true;User Instance=true;AttachDBFilename=L:\projects\Spring.Net\examples\Spring\Spring.Data.NHibernate.Northwind\src\Spring.Northwind.Web\App_Data\Northwnd.mdf"/>
+  <!--
+  <object id="DbProvider" type="Spring.Data.Support.SqlProvider, Spring.Data">
+    <property name="ConnectionString"
+                value="Data Source=${db.datasource};Database=${db.database};User ID=${db.user};Password=${db.password};Trusted_Connection=False"/>
+  </object>
+  -->
+
+  <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate12">
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="MappingAssemblies">
+      <list>
+        <value>Spring.Northwind.Dao.NHibernate</value>
+      </list>
+    </property>
+    <property name="HibernateProperties">
+      <dictionary>
+
+        <entry key="hibernate.connection.provider"
+               value="NHibernate.Connection.DriverConnectionProvider"/>
+
+        <entry key="hibernate.dialect"
+               value="NHibernate.Dialect.MsSql2000Dialect"/>
+
+        <entry key="hibernate.connection.driver_class"
+               value="NHibernate.Driver.SqlClientDriver"/>
+
+      </dictionary>
+    </property>
+
+  </object>
+
+
+  <object id="HibernateTransactionManager"
+        type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate12">
+
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="SessionFactory" ref="SessionFactory"/>
+
+  </object>
+
+  <object id="HibernateTemplate" type="Spring.Data.NHibernate.HibernateTemplate">
+    <property name="SessionFactory" ref="SessionFactory" />
+    <property name="TemplateFlushMode" value="Auto" />
+    <property name="CacheQueries" value="true" />
+  </object>
+
+  <!-- Data Access Objects -->
+  <object id="CustomerDao" type="Spring.Northwind.Dao.NHibernate.HibernateCustomerDao, Spring.Northwind.Dao.NHibernate">
+    <property name="HibernateTemplate" ref="HibernateTemplate"/>
+  </object>
+
+  <object id="OrderDao" type="Spring.Northwind.Dao.NHibernate.HibernateOrderDao, Spring.Northwind.Dao.NHibernate">
+    <property name="HibernateTemplate" ref="HibernateTemplate"/>
+  </object>
+
+
+</objects>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/DeclarativeServicesAttributeDriven.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/DeclarativeServicesAttributeDriven.xml
new file mode 100644
index 00000000..64687470
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/DeclarativeServicesAttributeDriven.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+  <!-- The rest of the config file is common no matter how many objects you add -->
+  <!-- that you would like to have declarative tx management applied to -->
+  <object id="autoProxyCreator" 
+          type="Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator, Spring.Aop">
+  </object>
+
+  <object id="transactionAdvisor"
+          type="Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor, Spring.Data">
+    <property name="TransactionInterceptor" ref="transactionInterceptor"/>
+  </object>
+
+  <!-- Transaction Interceptor -->
+  <object id="transactionInterceptor" 
+          type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data">
+    <property name="TransactionManager" ref="HibernateTransactionManager"/>
+    <!-- note do not have converter from string to this property type registered -->
+    <property name="TransactionAttributeSource" ref="attributeTransactionAttributeSource"/>
+  </object>
+
+  <object id="attributeTransactionAttributeSource"
+          type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data">
+  </object>
+</objects>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/DeclarativeServicesObjectNameDriven.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/DeclarativeServicesObjectNameDriven.xml
new file mode 100644
index 00000000..de08c228
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/DeclarativeServicesObjectNameDriven.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <object name="autoProxyCreator"
+         type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+
+    <property name="InterceptorNames" value="transactionInterceptor"/>
+    <property name="ObjectNames">
+      <list>
+        <ref object="FulfillmentService"/>
+      </list>
+    </property>
+  </object>
+
+  <object id="transactionInterceptor" 
+        type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data">
+    <property name="TransactionManager" ref="HibernateTransactionManager"/>
+    <!-- note do not have converter from string to this property type registered -->
+    <!-- so useing a ref to the source of transaction options                    -->
+    <property name="TransactionAttributeSource" ref="attributeTransactionAttributeSource"/>
+  </object>
+
+  <object id="attributeTransactionAttributeSource"
+          type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data">
+  </object>
+  
+  <!--
+  <object name="methodMapTransactionAttributeSource" 
+          type="Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource, Spring.Data">
+    <property name="MethodMap">
+      <dictionary>
+        <entry key="Spring.Northwind.Service.FulfillmentService.ProcessCustomer, Spring.Northwind.Service" 
+               value="PROPAGATION_REQUIRED"/>
+      </dictionary>
+    </property>
+  </object>
+  -->
+</objects>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/DeclarativeServicesTxProxyFactoryDriven.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/DeclarativeServicesTxProxyFactoryDriven.xml
new file mode 100644
index 00000000..9655231b
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/DeclarativeServicesTxProxyFactoryDriven.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <description>
+    Transactional Proxy for FulfillmentService using the TransactionProxyFactory
+  </description>
+  
+  
+  <!-- Note if you have many of these objects with similar configuration use -->
+  <!-- an abstract parent object to encapsulate common settings              -->
+
+  <object id="TxProxyConfigurationTemplate" abstract="true"
+          type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data">
+    
+    <property name="PlatformTransactionManager" ref="HibernateTransactionManager"/>
+
+    <property name="TransactionAttributes">
+      <name-values>
+        <!-- Add common methods across your services here -->
+        <add key="Process*" value="PROPAGATION_REQUIRED"/>
+        <!--
+        <add key="Delete*" value="PROPAGATION_REQUIRED"/>
+        -->
+      </name-values>
+    </property>
+    <!-- note you can use alias names so that this configuration file is -->
+    <!-- not dependent on the precise object name of the logging advice  -->
+    <!-- defined in Aspects.xml                                          -->
+    <property name="PreInterceptors" ref="CommonLoggingAroundAdvice"/>
+  </object>
+
+
+  <object id="FulfillmentServiceUsingTxPFO" parent="TxProxyConfigurationTemplate">
+
+    <!-- Note: would likely use an anonymous inner object instead of a reference -->
+    <!-- to ensure that no one can access an unadvised object -->
+    <property name="Target" ref="FulfillmentService"/>
+
+  </object>
+</objects>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/IntegrationTests/FulfillmentServiceTests.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/IntegrationTests/FulfillmentServiceTests.cs
new file mode 100644
index 00000000..696b6a1b
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/IntegrationTests/FulfillmentServiceTests.cs
@@ -0,0 +1,70 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using NUnit.Framework;
+
+using Spring.Context;
+using Spring.Context.Support;
+
+using Spring.Northwind.Service;
+
+#endregion
+
+namespace Spring.Northwind.IntegrationTests
+{
+    [TestFixture]
+    public class FulfillmentServiceTests
+    {
+        private IApplicationContext ctx;
+        
+        [SetUp]
+        public void SetUp()
+        {
+            ctx = ContextRegistry.GetContext();
+        }
+
+        /// <summary>
+        /// The transaction proxy is created by direct
+        /// configuration of a TransactionProxyFactoryObject
+        /// </summary>
+        [Test,Explicit( "choose DeclarativeServicesTxProxyFactoryDriven.xml in Services.xml before running this test" )]
+        public void ProcessCustomerViaTxProxyFactoryObject()
+        {
+            IFulfillmentService s = ctx["FulfillmentServiceUsingTxPFO"] as IFulfillmentService;
+            s.ProcessCustomer("BERGS");
+            //assertions....
+        }
+        
+        /// <summary>
+        /// The transaction proxy is created through use of TransactionAttributeSourceAdvisor
+        /// that identified classes/methods that have the [Transaction] attribute
+        /// </summary>
+        [Test]
+        //[Explicit( "choose DeclarativeServicesAttributeDriven.xml in Services.xml before running this test" )]
+        public void ProcessCustomer()
+        {
+            IFulfillmentService s = ctx["FulfillmentService"] as IFulfillmentService;
+            s.ProcessCustomer("BERGS");
+            //assertions....
+        }
+    }
+}
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Properties/AssemblyInfo.cs b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..79ca11f6
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Spring.Northwind.IntegrationTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Spring.Northwind.IntegrationTests")]
+[assembly: AssemblyCopyright("Copyright ©  2006")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("8825faf6-aad5-48c4-9319-2d1a5e7f0264")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Services.xml b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Services.xml
new file mode 100644
index 00000000..7dca0866
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Services.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <!-- Referenced by main application context configuration file -->
+  
+  <description>
+    The Northwind service layer definitions
+  </description>
+
+  <!-- Property placeholder configurer for database settings -->
+  <object id="FulfillmentService" type="Spring.Northwind.Service.FulfillmentService, Spring.Northwind.Service">
+    <property name="CustomerDao" ref="CustomerDao"/>
+    <property name="OrderDao" ref="OrderDao"/>
+    <property name="ShippingService" ref="ShippingService"/>
+  </object>
+
+  <object id="ShippingService" type="Spring.Northwind.Service.FedExShippingService, Spring.Northwind.Service">
+    
+  </object>
+
+  <import resource="DeclarativeServicesAttributeDriven.xml"/>
+  
+  <!-- didn't configure correctly yet - don't use
+  <import resource="DeclarativeServicesObjectNameDriven.xml"/>  
+  -->
+<!--
+  <import resource="DeclarativeServicesTxProxyFactoryDriven.xml"/>
+-->
+</objects>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj
new file mode 100644
index 00000000..8a4c78b7
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test/Spring.Northwind.IntegrationTests/Spring.Northwind.IntegrationTests.csproj
@@ -0,0 +1,136 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2D0C5DF7-3BDB-44FB-BC1B-58E60B170BAD}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring.Northwind</RootNamespace>
+    <AssemblyName>Spring.Northwind.IntegrationTests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</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\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\Net\2.0\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\Castle.DynamicProxy.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\Net\2.0\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>..\..\..\..\..\bin\net\2.0\debug\Common.Logging.Log4Net.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\Iesi.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=1.2.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\NHibernate12\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="IntegrationTests\FulfillmentServiceTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Spring.Aspects\Spring.Aspects.csproj">
+      <Project>{53B04C54-63EA-45AA-BB83-8950AF3C5D68}</Project>
+      <Name>Spring.Aspects</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Spring.Northwind.Dao.NHibernate\Spring.Northwind.Dao.NHibernate.csproj">
+      <Project>{6E4F55A0-C281-4706-A08B-BDEC2D2FBDA4}</Project>
+      <Name>Spring.Northwind.Dao.NHibernate</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Spring.Northwind.Dao\Spring.Northwind.Dao.csproj">
+      <Project>{7F45EEA2-50AC-44E2-85A6-2FFB02E38C44}</Project>
+      <Name>Spring.Northwind.Dao</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Spring.Northwind.Service\Spring.Northwind.Service.csproj">
+      <Project>{9E15876F-E9E0-43B7-9874-B54F163757D6}</Project>
+      <Name>Spring.Northwind.Service</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Aspects.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Dao.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="DeclarativeServicesAttributeDriven.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="DeclarativeServicesObjectNameDriven.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="DeclarativeServicesTxProxyFactoryDriven.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Services.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+  <PropertyGroup>
+    <PostBuildEvent>rem echo "Copying .xml files for tests"
+rem xcopy  "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Northwind.IntegrationTests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/test_northwind.sql b/examples/Spring/Spring.Data.NHibernate.Northwind/test_northwind.sql
new file mode 100644
index 00000000..3ef85aa9
--- /dev/null
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/test_northwind.sql
@@ -0,0 +1,64 @@
+/*
+This script installs 2 procedures 'BackupNorthwind' and 'RestoreNorthwind'
+
+These procedures allow for easy backup and restore the Northwind Database during testing.
+The backup is done to C:\northwind.bak and also takes care to kill existing connections before doing a restore.
+
+NOTE: You must ensure, that your MSSQL-Server process has write access to C:\ (or change directory below)
+*/
+
+USE [master]
+GO
+
+/****** Object:  StoredProcedure [dbo].[spdd_DropDatabaseConnections] *****/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[sp_DropDatabaseConnections]') AND type in (N'P', N'PC'))
+DROP PROCEDURE [dbo].[sp_DropDatabaseConnections]
+GO
+CREATE proc [dbo].[sp_DropDatabaseConnections]
+	@dbname sysname
+as
+begin
+	declare @spid int
+	declare @killCmd nvarchar(50)
+	declare processes cursor for
+		select spid from master..sysprocesses
+		where dbid = DB_ID(@dbname)
+
+	OPEN processes
+	FETCH processes into @spid
+	WHILE(@@fetch_status=0) BEGIN
+		set @killCmd = N'KILL '+CAST(@spid as nvarchar(10))
+		print N'Executing ''' + @killCmd + ''''
+		exec sp_executesql @killCmd
+		FETCH processes into @spid
+	END
+
+	CLOSE processes
+	DEALLOCATE processes
+end
+GO
+
+/****** Object:  StoredProcedure [dbo].[BackupNorthwind]    Script Date: 05/25/2007 13:34:44 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[BackupNorthwind]') AND type in (N'P', N'PC'))
+DROP PROCEDURE [dbo].[BackupNorthwind]
+GO
+create proc [dbo].[BackupNorthwind]
+as
+begin
+BACKUP DATABASE [northwind]
+	TO DISK = N'C:\northwind.bak'
+	WITH NAME = N'Northwind Full Database Backup', FORMAT, INIT, SKIP
+end
+GO
+
+/****** Object:  StoredProcedure [dbo].[RestoreNorthwind]    Script Date: 05/25/2007 13:34:44 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[RestoreNorthwind]') AND type in (N'P', N'PC'))
+DROP PROCEDURE [dbo].[RestoreNorthwind]
+GO
+CREATE proc [dbo].[RestoreNorthwind]
+as
+begin
+exec dbo.sp_DropDatabaseConnections N'northwind'
+RESTORE DATABASE [northwind] FROM  DISK = N'C:\northwind.bak' WITH  FILE = 1,  REPLACE
+end
+GO
diff --git a/examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2003.sln b/examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2003.sln
new file mode 100644
index 00000000..6d4e45a8
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2003.sln
@@ -0,0 +1,29 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.DataQuickStart.2003", "src\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2003.csproj", "{4599FD80-29F6-4542-8945-F93F709DFD3F}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.DataQuickStart.Tests.2003", "test\Spring\Spring.DataQuickStart.Tests\Spring.DataQuickStart.Tests.2003.csproj", "{9989A239-3406-4E67-B2B5-C8CF78E2311B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{4599FD80-29F6-4542-8945-F93F709DFD3F}.Debug.ActiveCfg = Debug|.NET
+		{4599FD80-29F6-4542-8945-F93F709DFD3F}.Debug.Build.0 = Debug|.NET
+		{4599FD80-29F6-4542-8945-F93F709DFD3F}.Release.ActiveCfg = Release|.NET
+		{4599FD80-29F6-4542-8945-F93F709DFD3F}.Release.Build.0 = Release|.NET
+		{9989A239-3406-4E67-B2B5-C8CF78E2311B}.Debug.ActiveCfg = Debug|.NET
+		{9989A239-3406-4E67-B2B5-C8CF78E2311B}.Debug.Build.0 = Debug|.NET
+		{9989A239-3406-4E67-B2B5-C8CF78E2311B}.Release.ActiveCfg = Release|.NET
+		{9989A239-3406-4E67-B2B5-C8CF78E2311B}.Release.Build.0 = Release|.NET
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2005.sln b/examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2005.sln
new file mode 100644
index 00000000..d9929cab
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2005.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.DataQuickStart.2005", "src\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2005.csproj", "{92B2A60E-D3B9-4647-8CFE-AC19611869F6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.DataQuickStart.Tests.2005", "test\Spring\Spring.DataQuickStart.Tests\Spring.DataQuickStart.Tests.2005.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92B2A60E-D3B9-4647-8CFE-AC19611869F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/CommonAssemblyInfo.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/CommonAssemblyInfo.cs
new file mode 100644
index 00000000..faffa87e
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/CommonAssemblyInfo.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Reflection;
+[assembly: CLSCompliant(false)]
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+
+#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")]
+[assembly: AssemblyCulture("")]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      .NET Framework Version
+//      Major Version
+//      Minor Version 
+//      Revision
+//
+// This is as good a convention as any for supporting side-by-side deployment of 
+// .NET 1.1 and .NET 2.0 versions of the assembly.
+
+#if !NET_2_0
+[assembly: AssemblyVersion("1.1.0.0")]
+#else
+[assembly: AssemblyVersion("2.1.0.0")]
+#endif
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+#if STRONG
+[assembly: AssemblyDelaySign(false)]
+#if !NET_2_0
+[assembly: AssemblyKeyFile("Spring.Net.snk")]
+#endif
+#endif
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/CommandCallbackDao.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/CommandCallbackDao.cs
new file mode 100644
index 00000000..1f1f8696
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/CommandCallbackDao.cs
@@ -0,0 +1,111 @@
+#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.Data.Common;
+using Spring.Data.Generic;
+
+namespace Spring.DataQuickStart.Dao.GenericTemplate
+{
+    /// <summary>
+    /// A simple DAO that uses Generic.AdoTemplate CommandCallback functionality
+    /// </summary>
+    public class CommandCallbackDao : AdoDaoSupport
+    {
+
+        private string cmdText = "select count(*) from Customers where PostalCode = @PostalCode";
+
+        /// <summary>
+        /// Finds the number of customers with the given postal code.
+        /// </summary>
+        /// <param name="postalCode">The postal code.</param>
+        /// <returns>Number of customers with the given postal code.</returns>
+        public virtual int FindCountWithPostalCodeWithDelegate(string postalCode)
+        {
+            // Using anonymous delegates allows you to easily reference the
+            // surrounding parameters for use with the DbCommand processing.
+
+            return AdoTemplate.Execute<int>(delegate(DbCommand command)
+                   {
+                       // Do whatever you like with the DbCommand... downcast to get 
+                       // provider specific funtionality if necesary.
+                                                    
+                       command.CommandText = cmdText;
+                         
+                       DbParameter p = command.CreateParameter();
+                       p.ParameterName = "@PostalCode";
+                       p.Value = postalCode;
+                       command.Parameters.Add(p);
+
+                       return (int)command.ExecuteScalar();
+
+                   });
+
+        }
+
+        
+       
+        public virtual int FindCountWithPostalCode(string postalCode)
+        {
+            // Type inference allows you not to explicitly write .Execute<ResultObject>
+            
+            return AdoTemplate.Execute(new PostalCodeCommandCallback<ResultObject>(postalCode)).count;
+        }
+        
+        // Note that you can not use System.Array, System.Delegate, System.Enum,
+        // System.ValueType or object in the constraint.  for this example that returns just
+        // an integer, a simple 'ResultObject' type is used.  
+        // You code would generally have a return object more complex than an 'int'.
+        
+        /// <summary>
+        /// A callback implementation that returns a 'ResultObject' containing a the count
+        /// of customers with a specific zip code. 
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        private class PostalCodeCommandCallback<T> : ICommandCallback<T> where T : ResultObject, new()
+        {
+            private string postalCode;
+            public PostalCodeCommandCallback(string postalCode)
+            {
+                this.postalCode = postalCode;
+            }
+
+            public T DoInCommand(DbCommand command)
+            {
+                T resultObject = new T();
+                DbParameter p = command.CreateParameter();
+                p.ParameterName = "@PostalCode";
+                p.Value = postalCode;
+                command.Parameters.Add(p);
+                
+                resultObject.count = (int)command.ExecuteScalar();
+                return resultObject;
+            }
+        }
+
+    }
+
+    /// <summary>
+    /// Helper class for returning simple integer value via generic class.
+    /// </summary>
+    public class ResultObject
+    {
+        public int count;
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/CustOrdersDetailStoredProc.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/CustOrdersDetailStoredProc.cs
new file mode 100644
index 00000000..97ccd064
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/CustOrdersDetailStoredProc.cs
@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using Spring.Data.Common;
+using Spring.Data.Objects.Generic;
+using Spring.DataQuickStart.Domain;
+
+namespace Spring.DataQuickStart.Dao.GenericTemplate
+{
+    public class CustOrdersDetailStoredProc : StoredProcedure
+    {
+        private static string procedureName = "CustOrdersDetail";
+
+        public CustOrdersDetailStoredProc(IDbProvider dbProvider) : base(dbProvider, procedureName)
+        {           
+            DeriveParameters();
+            AddRowMapper("orderDetailRowMapper", new OrderDetailRowMapper<OrderDetails>() );
+            Compile();
+        }
+        
+        public virtual List<OrderDetails> GetOrderDetails(int orderid)
+        {
+            
+            IDictionary outParams = Query<OrderDetails>(orderid);
+            return outParams["orderDetailRowMapper"] as List<OrderDetails>;
+        }
+
+    }
+}
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/CustomerRowMapper.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/CustomerRowMapper.cs
new file mode 100644
index 00000000..c4dee18e
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/CustomerRowMapper.cs
@@ -0,0 +1,55 @@
+#region Licence
+
+/*
+ * 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.Data;
+using Spring.Data.Generic;
+using Spring.DataQuickStart.Domain;
+
+namespace Spring.DataQuickStart.Dao.GenericTemplate
+{
+    public class CustomerRowMapper<T> : IRowMapper<T> where T : Customer, new()
+    {
+        /// <summary>
+        /// Map a row of data to a Customer object.
+        /// </summary>
+        /// <remarks>This method should not call Next() on the 
+        /// DataReader; it should only extract the values of the current row.
+        /// </remarks>
+        /// <param name="dataReader">The IDataReader to map</param>
+        /// <param name="rowNum">the number of the current row.</param>
+        /// <returns>A Customer object.</returns>
+        public T MapRow(IDataReader dataReader, int rowNum)
+        {
+            T customer = new T();
+            customer.Address = dataReader.GetString(0);
+            customer.City = dataReader.GetString(1);
+            customer.CompanyName = dataReader.GetString(2);
+            customer.ContactName = dataReader.GetString(3);
+            customer.ContactTitle = dataReader.GetString(4);
+            customer.Country = dataReader.GetString(5);
+            customer.Fax = dataReader.GetString(6);
+            customer.Id = dataReader.GetString(7);
+            customer.Phone = dataReader.GetString(8);
+            customer.PostalCode = dataReader.GetString(9);
+            customer.Region = dataReader.GetString(10);
+            return customer;
+        }
+    }
+}
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/OrderDetailRowMapper.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/OrderDetailRowMapper.cs
new file mode 100644
index 00000000..a57b9e8c
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/OrderDetailRowMapper.cs
@@ -0,0 +1,54 @@
+#region Licence
+
+/*
+ * 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.Data;
+using System.Data.SqlClient;
+using Spring.Data.Generic;
+using Spring.DataQuickStart.Domain;
+
+namespace Spring.DataQuickStart.Dao.GenericTemplate
+{
+    public class OrderDetailRowMapper<T> : IRowMapper<T> where T : OrderDetails, new()
+    {
+        /// <summary>
+        /// Map a row of data to a OrderDetails object.
+        /// </summary>
+        /// <remarks>This method should not call Next() on the 
+        /// DataReader; it should only extract the values of the current row.
+        /// </remarks>
+        /// <param name="dataReader">The IDataReader to map</param>
+        /// <param name="rowNum">the number of the current row.</param>
+        /// <returns>A Customer object.</returns>
+        public T MapRow(IDataReader dataReader, int rowNum)
+        {
+            SqlDataReader dr = dataReader as SqlDataReader;
+            
+            T ods = new T();
+            
+            ods.ProductName = dr.GetString(0);
+            ods.UnitPrice = dr.GetSqlMoney(1).ToDouble();
+            ods.Quantity = dr.GetInt16(2);
+            ods.Discount = dr.GetInt32(3);
+            ods.ExtendedPrice = dr.GetSqlMoney(4).ToDouble();
+            
+            return ods;
+        }
+    }
+}
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/QueryForObjectDao.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/QueryForObjectDao.cs
new file mode 100644
index 00000000..953fe06a
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/QueryForObjectDao.cs
@@ -0,0 +1,20 @@
+using System.Data;
+using Spring.Data.Generic;
+using Spring.DataQuickStart.Domain;
+
+namespace Spring.DataQuickStart.Dao.GenericTemplate
+{
+    public class QueryForObjectDao : AdoDaoSupport
+    {
+        private string cmdText = "select Address, City, CompanyName, ContactName, " +
+                     "ContactTitle, Country, Fax, CustomerID, Phone, PostalCode, " +
+                     "Region from Customers where ContactName = @ContactName";
+        
+        public Customer GetCustomer(string contactName)
+        {
+            return AdoTemplate.QueryForObject(CommandType.Text, cmdText, 
+                                              new CustomerRowMapper<Customer>(),
+                                              "ContactName", DbType.String, 30, contactName);
+        }
+    }
+}
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/ResultSetExtractorDao.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/ResultSetExtractorDao.cs
new file mode 100644
index 00000000..3244e6c1
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/ResultSetExtractorDao.cs
@@ -0,0 +1,280 @@
+#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.Collections.Generic;
+using System.Data;
+using Spring.Data;
+using Spring.Data.Common;
+using Spring.Data.Generic;
+
+namespace Spring.DataQuickStart.Dao.GenericTemplate
+{
+    /// <summary>
+    /// A simple DAO that uses Generic.AdoTemplate ResultSetExtractor functionality
+    /// </summary>
+    public class ResultSetExtractorDao : AdoDaoSupport
+    {
+        
+        private string postalCodeCustomerMappingCommandText = "select ContactName, PostalCode from Customers";
+
+        private string customerByCountry =
+            @"select ContactName from Customers where Country = @Country";
+        
+        private string customerByCountryAndCityCommandText = 
+                @"select ContactName from Customers where City = @City and Country = @Country";
+        
+        
+
+        /// <summary>
+        /// Gets a 'multi-map' of postal code, customer names.
+        /// </summary>
+        /// <returns>A multi-map of where the key is a postal code and the 
+        /// value a list of customer names</returns>
+        public virtual IDictionary<string, IList<string>> GetPostalCodeCustomerMapping()
+        {
+            return AdoTemplate.QueryWithResultSetExtractor(CommandType.Text, postalCodeCustomerMappingCommandText,
+                          new PostalDictionaryResultSetExtractor<Dictionary<string, IList<string>>>()
+                );
+        }
+
+        
+        public virtual IList<string> GetCustomerNameByCountry(string country)
+        {
+            return AdoTemplate.QueryWithResultSetExtractor(CommandType.Text,
+                                                           customerByCountry,
+                                                           new CustomerNameResultSetExtractor<List<string>>(),
+                                                           "Country", DbType.String, 15, "Brazil");
+                                                                       
+        }
+        
+        public virtual IList<string> GetCustomerNameByCountryAndCity(string country, string city)
+        {
+            // note no need to use parameter prefix.
+            
+            // This allows the SQL to be changed via external configuration but the parameter setting code 
+            // can remain the same if no provider specific DbType enumerations are used.
+            
+            IDbParameters parameters = CreateDbParameters();
+            parameters.AddWithValue("Country", country).DbType = DbType.String;
+            parameters.Add("City", DbType.String).Value = city;
+            return AdoTemplate.QueryWithResultSetExtractor(CommandType.Text,
+                                                           customerByCountryAndCityCommandText,
+                                                           new CustomerNameResultSetExtractor<List<string>>(),
+                                                           parameters);
+        }
+
+        public virtual IList<string> GetCustomerNameByCountryAndCityWithParamsBuilder(string country, string city)
+        {
+            // note no need to use parameter prefix.
+
+            // This allows the SQL to be changed via external configuration but the parameter setting code 
+            // can remain the same if no provider specific DbType enumerations are used.
+
+
+            IDbParametersBuilder builder = CreateDbParametersBuilder();
+            builder.Create().Name("Country").Type(DbType.String).Size(15).Value(country);
+            builder.Create().Name("City").Type(DbType.String).Size(15).Value(city);
+            return AdoTemplate.QueryWithResultSetExtractor(CommandType.Text,
+                                                           customerByCountryAndCityCommandText,
+                                                           new CustomerNameResultSetExtractor<List<string>>(),
+                                                           builder.GetParameters());
+        }
+        
+        public virtual IList<string> GetCustomerNameByCountryAndCityWithCommandSetterDelegate(string country, string city)
+        {
+            //using anonymous delegate allows for easy access to 'outer' calling parameter values.
+            //but is not reusable across objects/methods as with the interface based ICommandSetter alternative.
+            
+            return AdoTemplate.QueryWithResultSetExtractor(CommandType.Text,
+                                                           customerByCountryAndCityCommandText,
+                                                           new CustomerNameResultSetExtractor<List<string>>(),
+                                                           delegate(IDbCommand dbCommand)
+                                                               {
+                                                                   //Down cast to SqlCommand or other provider to access provider specific functionality....
+                                                                   //In this case just use the general IDbCommand API.
+                                                                   IDbDataParameter countryParameter = dbCommand.CreateParameter();
+                                                                   countryParameter.ParameterName = "@Country";
+                                                                   countryParameter.DbType = DbType.String;
+                                                                   countryParameter.Value = country;
+
+                                                                   IDbDataParameter cityParameter = dbCommand.CreateParameter();
+                                                                   cityParameter.ParameterName = "@City";
+                                                                   cityParameter.DbType = DbType.String;
+                                                                   cityParameter.Value = city;
+
+                                                                   dbCommand.Parameters.Add(countryParameter);
+                                                                   dbCommand.Parameters.Add(cityParameter);
+                                                               });
+        }
+
+        public virtual IList<string> GetCustomerNameByCountryAndCityWithAllDelegates(string country, string city)
+        {
+            IDbParametersBuilder builder = CreateDbParametersBuilder();
+            builder.Create().Name("Country").Type(DbType.String).Size(15).Value(country);
+            builder.Create().Name("City").Type(DbType.String).Size(15).Value(city);
+
+            ResultSetExtractorDelegate<IList<string>> extractorDelegate = delegate(IDataReader reader)
+                                                                {
+                                                                    IList<string> customerList = new List<string>();
+                                                                    while (reader.Read())
+                                                                    {
+                                                                        string contactName = reader.GetString(0);
+                                                                        customerList.Add(contactName);
+                                                                    }
+                                                                    return customerList;
+                                                                };
+            CommandSetterDelegate commandSetterDelegate = delegate(IDbCommand dbCommand)
+                                                              {
+                                                                  //Down cast to SqlCommand or other provider to access provider specific functionality....
+                                                                  //In this case just use the general IDbCommand API.
+                                                                  IDbDataParameter countryParameter =
+                                                                      dbCommand.CreateParameter();
+                                                                  countryParameter.ParameterName = "@Country";
+                                                                  countryParameter.DbType = DbType.String;
+                                                                  countryParameter.Value = country;
+
+                                                                  IDbDataParameter cityParameter =
+                                                                      dbCommand.CreateParameter();
+                                                                  cityParameter.ParameterName = "@City";
+                                                                  cityParameter.DbType = DbType.String;
+                                                                  cityParameter.Value = city;
+
+                                                                  dbCommand.Parameters.Add(countryParameter);
+                                                                  dbCommand.Parameters.Add(cityParameter);
+                                                              };
+            
+            
+            //TODO compiler can't determine matching method if two anonymous methods are used within method parameters.
+            //     how to 'cast' the anonymous delegate?
+            return AdoTemplate.QueryWithResultSetExtractorDelegate(CommandType.Text,
+                                               customerByCountryAndCityCommandText,
+                                               extractorDelegate,
+                                               commandSetterDelegate);
+        }
+        
+        
+        public virtual IList<string> GetCustomerNameByCountryAndCityWithCommandSetter(string country, string city)
+        {
+            return AdoTemplate.QueryWithResultSetExtractor(CommandType.Text,
+                                                           customerByCountryAndCityCommandText,
+                                                           new CustomerNameResultSetExtractor<List<string>>(),
+                                                           new CustomerByCountryCityCommandSetter(country, city));
+        }
+        
+        /// <summary>
+        /// Gets or sets the command text used to get a multi-map of postal codes/customer names.
+        /// </summary>
+        /// <remarks>Can be set in configuration to use vendor specific SQL.</remarks>
+        /// <value>The command text.</value>
+        public string PostalCodeCustomerMappingCommandText
+        {
+            get { return postalCodeCustomerMappingCommandText; }
+            set { postalCodeCustomerMappingCommandText = value; }
+        }
+    }
+
+    internal class CustomerByCountryCityCommandSetter : ICommandSetter
+    {
+        private string country, city;
+        
+        public CustomerByCountryCityCommandSetter(string country, string city)
+        {
+            this.country = country;
+            this.city = city;
+        }
+
+        public void SetValues(IDbCommand dbCommand)
+        {
+            
+            //Down cast to SqlCommand or other provider to access provider specific functionality....
+            //In this case just use the general IDbCommand API.
+            IDbDataParameter countryParameter = dbCommand.CreateParameter();
+            countryParameter.ParameterName = "@Country";
+            countryParameter.DbType = DbType.String;
+            countryParameter.Value = country;
+            
+            IDbDataParameter cityParameter = dbCommand.CreateParameter();
+            cityParameter.ParameterName = "@City";
+            cityParameter.DbType = DbType.String;
+            cityParameter.Value = city;
+
+            dbCommand.Parameters.Add(countryParameter);
+            dbCommand.Parameters.Add(cityParameter);
+        }
+    }
+
+    internal class CustomerNameResultSetExtractor<T> : IResultSetExtractor<T> where T : IList<string>, new()
+    {
+        /// <summary>
+        /// Implementations must implement this method to process all
+        /// result set and rows in the IDataReader.
+        /// </summary>
+        /// <param name="reader">The IDataReader to extract data from.
+        /// Implementations should not close this: it will be closed
+        /// by the AdoTemplate.</param>
+        /// <returns>An arbitrary result object or null if none.  The
+        /// extractor will typically be stateful in the latter case.</returns>
+        public T ExtractData(IDataReader reader)
+        {
+            T customerList = new T();
+            while (reader.Read())
+            {
+                string contactName = reader.GetString(0);
+                customerList.Add(contactName);
+            }
+            return customerList;
+        }
+    }
+
+    internal class PostalDictionaryResultSetExtractor<T> : IResultSetExtractor<T> where T : IDictionary<string, IList<string>>, new()
+    {
+        
+        /// <summary>
+        /// Implementations must implement this method to process all
+        /// result set and rows in the IDataReader.
+        /// </summary>
+        /// <param name="reader">The IDataReader to extract data from.
+        /// Implementations should not close this: it will be closed
+        /// by the AdoTemplate.</param>
+        /// <returns>An arbitrary result object or null if none.  The
+        /// xtractor will typically be stateful in the latter case.</returns>
+        public T ExtractData(IDataReader reader)
+        {
+                T resultDictionary = new T();
+                while(reader.Read())
+                {   
+                    string contactName = reader.GetString(0);
+                    string postalCode = reader.GetString(1);
+                    IList<string> contactNameList;
+                    if (resultDictionary.ContainsKey(postalCode))
+                    {
+                        contactNameList = resultDictionary[postalCode];
+                    }
+                    else
+                    {
+                        resultDictionary.Add(postalCode, contactNameList = new List<string>());                    
+                    }
+                    contactNameList.Add(contactName);
+                }	                
+                return resultDictionary;
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/RowCallbackDao.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/RowCallbackDao.cs
new file mode 100644
index 00000000..5f95d607
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/RowCallbackDao.cs
@@ -0,0 +1,64 @@
+using System.Collections.Generic;
+using System.Data;
+using Spring.Data;
+using Spring.Data.Generic;
+
+namespace Spring.DataQuickStart.Dao.GenericTemplate
+{
+    public class RowCallbackDao : AdoDaoSupport
+    {
+        private string cmdText = "select ContactName, PostalCode from Customers";
+
+        public virtual IDictionary<string, IList<string>> GetPostalCodeCustomerMapping()
+        {
+            PostalCodeRowCallback statefullCallback = new PostalCodeRowCallback();
+            AdoTemplate.QueryWithRowCallback(CommandType.Text, cmdText,
+                                             statefullCallback);
+
+            // Do something with results in stateful callback...
+            return statefullCallback.PostalCodeMultimap;
+        }
+      
+        
+    }
+
+    internal class PostalCodeRowCallback : IRowCallback
+    {
+        private IDictionary<string, IList<string>> postalCodeMultimap =
+            new Dictionary<string, IList<string>>();
+
+        public IDictionary<string, IList<string>> PostalCodeMultimap
+        {
+            get { return postalCodeMultimap; }
+        }
+
+        /// <summary>
+        /// Implementations must implement this method to process each row of data
+        /// in the data reader.
+        /// </summary>
+        /// <remarks>
+        /// This method should not advance the cursor by calling Read()
+        /// on IDataReader but only extract the current values.  The
+        /// caller does not need to care about closing the reader, command, connection, or
+        /// about handling transactions:  this will all be handled by 
+        /// Spring's AdoTemplate
+        /// </remarks>
+        /// <param name="reader">An active IDataReader instance</param>
+        /// <returns>The result object</returns>
+        public void ProcessRow(IDataReader reader)
+        {
+            string contactName = reader.GetString(0);
+            string postalCode = reader.GetString(1);
+            IList<string> contactNameList;
+            if (postalCodeMultimap.ContainsKey(postalCode))
+            {
+                contactNameList = postalCodeMultimap[postalCode];
+            }
+            else
+            {
+                postalCodeMultimap.Add(postalCode, contactNameList = new List<string>());
+            }
+            contactNameList.Add(contactName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/RowMapperDao.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/RowMapperDao.cs
new file mode 100644
index 00000000..ccbad871
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/GenericTemplate/RowMapperDao.cs
@@ -0,0 +1,55 @@
+using System.Collections.Generic;
+using System.Data;
+using Spring.Data.Generic;
+using Spring.DataQuickStart.Domain;
+//TODO move 'classic' AdoDaoSupport under Spring.Data to avoid clashes...
+
+namespace Spring.DataQuickStart.Dao.GenericTemplate
+{
+    /// <summary>
+    /// A simple DAO that uses Generic.AdoTemplate RowMapper functionality
+    /// </summary>
+    public class RowMapperDao : AdoDaoSupport
+    {
+        private string cmdText = "select Address, City, CompanyName, ContactName, " +
+                             "ContactTitle, Country, Fax, CustomerID, Phone, PostalCode, " +
+                             "Region from Customers";
+
+
+        /// <summary>
+        /// Gets the customers.
+        /// </summary>
+        /// <returns>A list of customers</returns>
+
+
+        /// <summary>
+        /// Gets the customers using a row mapper delegate.
+        /// </summary>
+        /// <remarks>Note that a NullMappingDataReader is used to convert
+        /// DbNull values to simple defaults (i.e. empty string)
+        /// when getting data from the DataReader.  You can provide AdoTemplate
+        /// with your own version or not use a dataReader 'wrapper' entirely.
+        /// </remarks>
+        /// <returns>A list of customers</returns>
+        public virtual IList<Customer> GetCustomersWithDelegate()
+        {
+            return AdoTemplate.QueryWithRowMapperDelegate<Customer>(CommandType.Text, cmdText,
+                        delegate(IDataReader dataReader, int rowNum)
+                            {
+                                Customer customer = new Customer();
+                                customer.Address = dataReader.GetString(0);
+                                customer.City = dataReader.GetString(1);
+                                customer.CompanyName = dataReader.GetString(2);
+                                customer.ContactName = dataReader.GetString(3);
+                                customer.ContactTitle = dataReader.GetString(4);
+                                customer.Country = dataReader.GetString(5);
+                                customer.Fax = dataReader.GetString(6);
+                                customer.Id = dataReader.GetString(7);
+                                customer.Phone = dataReader.GetString(8);
+                                customer.PostalCode = dataReader.GetString(9);
+                                customer.Region = dataReader.GetString(10);
+                                return customer;
+                            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/CommandCallbackDao.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/CommandCallbackDao.cs
new file mode 100644
index 00000000..899dae0e
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/CommandCallbackDao.cs
@@ -0,0 +1,83 @@
+#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.Data;
+using Spring.Data;
+using Spring.Data.Core;
+
+namespace Spring.DataQuickStart.Dao.Template
+{
+    /// <summary>
+    /// A simple DAO that uses Generic.AdoTemplate CommandCallback functionality
+    /// </summary>
+    public class CommandCallbackDao : AdoDaoSupport
+    {
+
+       
+        /// <summary>
+        /// Finds the number of customers with the given postal code.
+        /// </summary>
+        /// <param name="postalCode">The postal code.</param>
+        /// <returns>Number of customers with the given postal code.</returns>       
+        public virtual int FindCountWithPostalCode(string postalCode)
+        {
+            return (int) AdoTemplate.Execute(new PostalCodeCommandCallback(postalCode));
+        }
+        
+        // Note that you can not use System.Array, System.Delegate, System.Enum,
+        // System.ValueType or object in the constraint.  for this example that returns just
+        // an integer, a simple 'ResultObject' type is used.  
+        // You code would generally have a return object more complex than an 'int'.
+        
+        /// <summary>
+        /// A callback implementation that returns a 'ResultObject' containing a the count
+        /// of customers with a specific zip code. 
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        public class PostalCodeCommandCallback : ICommandCallback
+        {
+            private string cmdText = "select count(*) from Customers where PostalCode = @PostalCode";
+
+            private string postalCode;
+            
+            public PostalCodeCommandCallback(string postalCode)
+            {
+                this.postalCode = postalCode;
+            }
+
+            public object DoInCommand(IDbCommand command)
+            {
+                command.CommandText = cmdText;
+                
+                IDbDataParameter p = command.CreateParameter();
+                p.ParameterName = "@PostalCode";
+                p.Value = postalCode;
+                command.Parameters.Add(p);
+                
+                return command.ExecuteScalar();
+
+            }
+
+
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/CustOrdersDetailStoredProc.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/CustOrdersDetailStoredProc.cs
new file mode 100644
index 00000000..ce585c63
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/CustOrdersDetailStoredProc.cs
@@ -0,0 +1,26 @@
+using System.Collections;
+using Spring.Data.Common;
+using Spring.Data.Objects;
+
+namespace Spring.DataQuickStart.Dao.Template
+{
+    public class CustOrdersDetailStoredProc : StoredProcedure
+    {
+        private static string procedureName = "CustOrdersDetail";
+
+        public CustOrdersDetailStoredProc(IDbProvider dbProvider) : base(dbProvider, procedureName)
+        {           
+            DeriveParameters();
+            AddRowMapper("orderDetailRowMapper", new OrderDetailRowMapper() );
+            Compile();
+        }
+        
+        public virtual IList GetOrderDetails(int orderid)
+        {
+            
+            IDictionary outParams = Query(orderid);
+            return outParams["orderDetailRowMapper"] as IList;
+        }
+
+    }
+}
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/CustomerDataSetDao.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/CustomerDataSetDao.cs
new file mode 100644
index 00000000..b2f30305
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/CustomerDataSetDao.cs
@@ -0,0 +1,68 @@
+
+
+using System;
+using System.Data;
+using Spring.Data.Common;
+using Spring.Data.Core;
+
+namespace Spring.DataQuickStart.Dao.Template
+{
+    public class CustomerDataSetDao : AdoDaoSupport
+    {
+        private string selectAll = @"select Address, City, CompanyName, ContactName, " +
+             "ContactTitle, Country, Fax, CustomerID, Phone, PostalCode, " +
+             "Region from Customers";
+
+        private string selectLike = @"select Address, City, CompanyName, ContactName, " +
+             "ContactTitle, Country, Fax, CustomerID, Phone, PostalCode, " +
+             "Region from Customers where ContactName like @ContactName";
+
+        public DataSet GetCustomers()
+        {
+            return AdoTemplate.DataSetCreate(CommandType.Text, selectAll);
+        }
+
+        public DataSet GetCustomers(string dataSetName)
+        {
+            return AdoTemplate.DataSetCreate(CommandType.Text, selectAll, new string[] { dataSetName });
+        }
+
+        public DataSet GetCustomersLike(string contactName)
+        {
+
+            IDbParameters dbParameters = CreateDbParameters();
+            dbParameters.Add("ContactName", DbType.String).Value = contactName;
+            return AdoTemplate.DataSetCreateWithParams(CommandType.Text, selectLike, dbParameters);
+        }
+
+        public void FillCustomers(DataSet dataSet)
+        {
+            AdoTemplate.DataSetFill(dataSet, CommandType.Text, selectAll, new string[] { "Customers"} );
+        }
+
+        public void UpdateWithCommandBuilder(DataSet dataSet)
+        {
+            AdoTemplate.DataSetUpdateWithCommandBuilder(dataSet, CommandType.Text, selectAll, null, "Customers");
+        }
+
+
+        public void Update(DataSet dataSet)
+        {
+            string insertSql = @"INSERT Customers (CustomerID, CompanyName) VALUES (@CustomerId, @CompanyName)";
+            IDbParameters insertParams = CreateDbParameters();
+            insertParams.Add("CustomerId", DbType.String, 0, "CustomerId");   //.Value = "NewID";
+            insertParams.Add("CompanyName", DbType.String, 0, "CompanyName"); //.Value = "New Company Name";
+
+            string updateSql = @"update Customers SET Phone=@Phone where CustomerId = @CustomerId";                
+            IDbParameters updateParams = CreateDbParameters();
+            updateParams.Add("Phone", DbType.String, 0, "Phone");//.Value = "030-0074322"; // simple change, last digit changed from 1 to 2.
+            updateParams.Add("CustomerId", DbType.String, 0, "CustomerId");//.Value = "ALFKI";
+
+            AdoTemplate.DataSetUpdate(dataSet, "Customers",
+                                      CommandType.Text, insertSql, insertParams,
+                                      CommandType.Text, updateSql, updateParams,
+                                      CommandType.Text, null , null);
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/CustomerRowMapper.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/CustomerRowMapper.cs
new file mode 100644
index 00000000..e905ca3f
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/CustomerRowMapper.cs
@@ -0,0 +1,55 @@
+#region Licence
+
+/*
+ * 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.Data;
+using Spring.Data;
+using Spring.DataQuickStart.Domain;
+
+namespace Spring.DataQuickStart.Dao.Template
+{
+    public class CustomerRowMapper : IRowMapper
+    {
+        /// <summary>
+        /// Map a row of data to a Customer object.
+        /// </summary>
+        /// <remarks>This method should not call Next() on the 
+        /// DataReader; it should only extract the values of the current row.
+        /// </remarks>
+        /// <param name="dataReader">The IDataReader to map</param>
+        /// <param name="rowNum">the number of the current row.</param>
+        /// <returns>A Customer object.</returns>
+        public object MapRow(IDataReader dataReader, int rowNum)
+        {
+            Customer customer = new Customer();
+            customer.Address = dataReader.GetString(0);
+            customer.City = dataReader.GetString(1);
+            customer.CompanyName = dataReader.GetString(2);
+            customer.ContactName = dataReader.GetString(3);
+            customer.ContactTitle = dataReader.GetString(4);
+            customer.Country = dataReader.GetString(5);
+            customer.Fax = dataReader.GetString(6);
+            customer.Id = dataReader.GetString(7);
+            customer.Phone = dataReader.GetString(8);
+            customer.PostalCode = dataReader.GetString(9);
+            customer.Region = dataReader.GetString(10);
+            return customer;
+        }
+    }
+}
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/OrderDetailRowMapper.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/OrderDetailRowMapper.cs
new file mode 100644
index 00000000..059f62c5
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/OrderDetailRowMapper.cs
@@ -0,0 +1,54 @@
+#region Licence
+
+/*
+ * 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.Data;
+using System.Data.SqlClient;
+using Spring.Data;
+using Spring.DataQuickStart.Domain;
+
+namespace Spring.DataQuickStart.Dao.Template
+{
+    public class OrderDetailRowMapper : IRowMapper
+    {
+        /// <summary>
+        /// Map a row of data to a OrderDetails object.
+        /// </summary>
+        /// <remarks>This method should not call Next() on the 
+        /// DataReader; it should only extract the values of the current row.
+        /// </remarks>
+        /// <param name="dataReader">The IDataReader to map</param>
+        /// <param name="rowNum">the number of the current row.</param>
+        /// <returns>A Customer object.</returns>
+        public object MapRow(IDataReader dataReader, int rowNum)
+        {
+            SqlDataReader dr = dataReader as SqlDataReader;
+            
+            OrderDetails ods = new OrderDetails();
+            
+            ods.ProductName = dr.GetString(0);
+            ods.UnitPrice = dr.GetSqlMoney(1).ToDouble();
+            ods.Quantity = dr.GetInt16(2);
+            ods.Discount = dr.GetInt32(3);
+            ods.ExtendedPrice = dr.GetSqlMoney(4).ToDouble();
+            
+            return ods;
+        }
+    }
+}
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/QueryForObjectDao.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/QueryForObjectDao.cs
new file mode 100644
index 00000000..8f6b4efe
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/QueryForObjectDao.cs
@@ -0,0 +1,19 @@
+using System.Data;
+using Spring.Data.Core;
+using Spring.DataQuickStart.Domain;
+
+namespace Spring.DataQuickStart.Dao.Template
+{
+    public class QueryForObjectDao : AdoDaoSupport
+    {
+        private string cmdText = @"select Address, City, CompanyName, ContactName, " +
+                     "ContactTitle, Country, Fax, CustomerID, Phone, PostalCode, " +
+                     "Region from Customers where ContactName = @ContactName";
+        
+        public Customer GetCustomer(string contactName)
+        {
+            return (Customer)AdoTemplate.QueryForObject(CommandType.Text, cmdText, new CustomerRowMapper(),
+                                 "ContactName", DbType.String, 30, contactName);
+        }
+    }
+}
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/ResultSetExtractorDao.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/ResultSetExtractorDao.cs
new file mode 100644
index 00000000..fe509db5
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/ResultSetExtractorDao.cs
@@ -0,0 +1,209 @@
+#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.Collections;
+using System.Data;
+using Spring.Data;
+using Spring.Data.Common;
+using Spring.Data.Core;
+
+namespace Spring.DataQuickStart.Dao.Template
+{
+    /// <summary>
+    /// A simple DAO that uses Generic.AdoTemplate ResultSetExtractor functionality
+    /// </summary>
+    public class ResultSetExtractorDao : AdoDaoSupport
+    {
+        
+        private string postalCodeCustomerMappingCommandText = "select ContactName, PostalCode from Customers";
+
+        private string customerByCountry =
+            @"select ContactName from Customers where Country = @Country";
+        
+        private string customerByCountryAndCityCommandText = 
+                @"select ContactName from Customers where City = @City and Country = @Country";
+        
+        
+
+        /// <summary>
+        /// Gets a 'multi-map' of postal code, customer names.
+        /// </summary>
+        /// <returns>A multi-map of where the key is a postal code and the 
+        /// value a list of customer names</returns>
+        public virtual IDictionary GetPostalCodeCustomerMapping()
+        {
+            return (IDictionary)AdoTemplate.QueryWithResultSetExtractor(CommandType.Text, postalCodeCustomerMappingCommandText,
+                          new PostalDictionaryResultSetExtractor()
+                );
+        }
+
+        
+        public virtual IList GetCustomerNameByCountry(string country)
+        {
+            return (IList)AdoTemplate.QueryWithResultSetExtractor(CommandType.Text,
+                                                           customerByCountry,
+                                                           new CustomerNameResultSetExtractor(),
+                                                           "Country", DbType.String, 15, "Brazil");
+                                                                       
+        }
+        
+        public virtual IList GetCustomerNameByCountryAndCity(string country, string city)
+        {
+            // note no need to use parameter prefix.
+            
+            // This allows the SQL to be changed via external configuration but the parameter setting code 
+            // can remain the same if no provider specific DbType enumerations are used.
+            
+            IDbParameters parameters = CreateDbParameters();
+            parameters.AddWithValue("Country", country).DbType = DbType.String;
+            parameters.Add("City", DbType.String).Value = city;
+            return (IList)AdoTemplate.QueryWithResultSetExtractor(CommandType.Text,
+                                                           customerByCountryAndCityCommandText,
+                                                           new CustomerNameResultSetExtractor(),
+                                                           parameters);
+        }
+
+        public virtual IList GetCustomerNameByCountryAndCityWithParamsBuilder(string country, string city)
+        {
+            // note no need to use parameter prefix.
+
+            // This allows the SQL to be changed via external configuration but the parameter setting code 
+            // can remain the same if no provider specific DbType enumerations are used.
+
+
+            IDbParametersBuilder builder = CreateDbParametersBuilder();
+            builder.Create().Name("Country").Type(DbType.String).Size(15).Value(country);
+            builder.Create().Name("City").Type(DbType.String).Size(15).Value(city);
+            return (IList)AdoTemplate.QueryWithResultSetExtractor(CommandType.Text,
+                                                           customerByCountryAndCityCommandText,
+                                                           new CustomerNameResultSetExtractor(),
+                                                           builder.GetParameters());
+        }
+        
+       
+
+        public virtual IList GetCustomerNameByCountryAndCityWithCommandSetter(string country, string city)
+        {
+            return (IList)AdoTemplate.QueryWithResultSetExtractor(CommandType.Text,
+                                                           customerByCountryAndCityCommandText,
+                                                           new CustomerNameResultSetExtractor(),
+                                                           new CustomerByCountryCityCommandSetter(country, city));
+        }
+        
+        /// <summary>
+        /// Gets or sets the command text used to get a multi-map of postal codes/customer names.
+        /// </summary>
+        /// <remarks>Can be set in configuration to use vendor specific SQL.</remarks>
+        /// <value>The command text.</value>
+        public string PostalCodeCustomerMappingCommandText
+        {
+            get { return postalCodeCustomerMappingCommandText; }
+            set { postalCodeCustomerMappingCommandText = value; }
+        }
+    }
+
+    internal class CustomerByCountryCityCommandSetter : ICommandSetter
+    {
+        private string country, city;
+        
+        public CustomerByCountryCityCommandSetter(string country, string city)
+        {
+            this.country = country;
+            this.city = city;
+        }
+
+        public void SetValues(IDbCommand dbCommand)
+        {
+            
+            //Down cast to SqlCommand or other provider to access provider specific functionality....
+            //In this case just use the general IDbCommand API.
+            IDbDataParameter countryParameter = dbCommand.CreateParameter();
+            countryParameter.ParameterName = "@Country";
+            countryParameter.DbType = DbType.String;
+            countryParameter.Value = country;
+            
+            IDbDataParameter cityParameter = dbCommand.CreateParameter();
+            cityParameter.ParameterName = "@City";
+            cityParameter.DbType = DbType.String;
+            cityParameter.Value = city;
+
+            dbCommand.Parameters.Add(countryParameter);
+            dbCommand.Parameters.Add(cityParameter);
+        }
+    }
+
+    internal class CustomerNameResultSetExtractor : IResultSetExtractor
+    {
+        /// <summary>
+        /// Implementations must implement this method to process all
+        /// result set and rows in the IDataReader.
+        /// </summary>
+        /// <param name="reader">The IDataReader to extract data from.
+        /// Implementations should not close this: it will be closed
+        /// by the AdoTemplate.</param>
+        /// <returns>An arbitrary result object or null if none.  The
+        /// extractor will typically be stateful in the latter case.</returns>
+        public object ExtractData(IDataReader reader)
+        {
+            ArrayList customerList = new ArrayList();
+            while (reader.Read())
+            {
+                string contactName = reader.GetString(0);
+                customerList.Add(contactName);
+            }
+            return customerList;
+        }
+    }
+
+    internal class PostalDictionaryResultSetExtractor : IResultSetExtractor
+    {
+        
+        /// <summary>
+        /// Implementations must implement this method to process all
+        /// result set and rows in the IDataReader.
+        /// </summary>
+        /// <param name="reader">The IDataReader to extract data from.
+        /// Implementations should not close this: it will be closed
+        /// by the AdoTemplate.</param>
+        /// <returns>An arbitrary result object or null if none.  The
+        /// xtractor will typically be stateful in the latter case.</returns>
+        public object ExtractData(IDataReader reader)
+        {
+            IDictionary resultDictionary = new Hashtable();
+                while(reader.Read())
+                {   
+                    string contactName = reader.GetString(0);
+                    string postalCode = reader.GetString(1);
+                    IList contactNameList;
+                    if (resultDictionary.Contains(postalCode))
+                    {
+                        contactNameList = resultDictionary[postalCode] as IList;
+                    }
+                    else
+                    {
+                        resultDictionary.Add(postalCode, contactNameList = new ArrayList());                    
+                    }
+                    contactNameList.Add(contactName);
+                }	                
+                return resultDictionary;
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/RowCallbackDao.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/RowCallbackDao.cs
new file mode 100644
index 00000000..39cc131a
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/RowCallbackDao.cs
@@ -0,0 +1,63 @@
+using System.Collections;
+using System.Data;
+using Spring.Data;
+using Spring.Data.Core;
+
+namespace Spring.DataQuickStart.Dao.Template
+{
+    public class RowCallbackDao : AdoDaoSupport
+    {
+        private string cmdText = "select ContactName, PostalCode from Customers";
+
+        public virtual IDictionary GetPostalCodeCustomerMapping()
+        {
+            PostalCodeRowCallback statefullCallback = new PostalCodeRowCallback();
+            AdoTemplate.QueryWithRowCallback(CommandType.Text, cmdText,
+                                             statefullCallback);
+
+            // Do something with results in stateful callback...
+            return statefullCallback.PostalCodeMultimap;
+        }
+      
+        
+    }
+
+    internal class PostalCodeRowCallback : IRowCallback
+    {
+        private IDictionary postalCodeMultimap = new Hashtable();
+
+        public IDictionary PostalCodeMultimap
+        {
+            get { return postalCodeMultimap; }
+        }
+
+        /// <summary>
+        /// Implementations must implement this method to process each row of data
+        /// in the data reader.
+        /// </summary>
+        /// <remarks>
+        /// This method should not advance the cursor by calling Read()
+        /// on IDataReader but only extract the current values.  The
+        /// caller does not need to care about closing the reader, command, connection, or
+        /// about handling transactions:  this will all be handled by 
+        /// Spring's AdoTemplate
+        /// </remarks>
+        /// <param name="reader">An active IDataReader instance</param>
+        /// <returns>The result object</returns>
+        public void ProcessRow(IDataReader reader)
+        {
+            string contactName = reader.GetString(0);
+            string postalCode = reader.GetString(1);
+            IList contactNameList;
+            if (postalCodeMultimap.Contains(postalCode))
+            {
+                contactNameList = postalCodeMultimap[postalCode] as IList;
+            }
+            else
+            {
+                postalCodeMultimap.Add(postalCode, contactNameList = new ArrayList());
+            }
+            contactNameList.Add(contactName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/RowMapperDao.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/RowMapperDao.cs
new file mode 100644
index 00000000..5ccd7848
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Dao/Template/RowMapperDao.cs
@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Data;
+using Spring.Data.Core;
+
+namespace Spring.DataQuickStart.Dao.Template
+{
+    /// <summary>
+    /// A simple DAO that uses Generic.AdoTemplate RowMapper functionality
+    /// </summary>
+    public class RowMapperDao : AdoDaoSupport
+    {
+        private string cmdText = "select Address, City, CompanyName, ContactName, " +
+                             "ContactTitle, Country, Fax, CustomerID, Phone, PostalCode, " +
+                             "Region from Customers";
+
+
+        /// <summary>
+        /// Gets the customers.
+        /// </summary>
+        /// <returns>A list of customers</returns>
+        public virtual IList GetCustomers()
+        {
+            return AdoTemplate.QueryWithRowMapper(CommandType.Text, cmdText,
+                                                  new CustomerRowMapper());
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Domain/Customer.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Domain/Customer.cs
new file mode 100644
index 00000000..ba92cb52
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Domain/Customer.cs
@@ -0,0 +1,150 @@
+#region Licence
+
+/*
+ * 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.Collections;
+
+namespace Spring.DataQuickStart.Domain
+{
+    public class Customer
+    {
+        #region Fields
+
+        protected string id;
+        protected string companyName;
+        protected string contactName;
+        protected string contactTitle;
+        protected string address;
+        protected string city;
+        protected string region;
+        protected string postalCode;
+        protected string country;
+        protected string phone;
+        protected string fax;
+        protected IList orders;
+
+        #endregion
+
+        #region Properties
+
+        public string Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
+
+        public string CompanyName
+        {
+            get { return companyName; }
+            set { companyName = value; }
+        }
+
+        public string ContactName
+        {
+            get { return contactName; }
+            set { contactName = value; }
+        }
+
+        public string ContactTitle
+        {
+            get { return contactTitle; }
+            set { contactTitle = value; }
+        }
+
+        public string Address
+        {
+            get { return address; }
+            set { address = value; }
+        }
+
+        public string City
+        {
+            get { return city; }
+            set { city = value; }
+        }
+
+        public string Region
+        {
+            get { return region; }
+            set { region = value; }
+        }
+
+        public string PostalCode
+        {
+            get { return postalCode; }
+            set { postalCode = value; }
+        }
+
+        public string Country
+        {
+            get { return country; }
+            set { country = value; }
+        }
+
+        public string Phone
+        {
+            get { return phone; }
+            set { phone = value; }
+        }
+
+        public string Fax
+        {
+            get { return fax; }
+            set { fax = value; }
+        }
+
+        public IList Orders
+        {
+            get
+            {
+                if (orders == null)
+                {
+                    orders = new ArrayList();
+                }
+                return orders;
+            }
+            set { orders = value; }
+        }
+
+        #endregion
+
+        #region Constructor (s)
+
+        public Customer()
+        {
+        }
+
+        public Customer(string companyName, string contactName, string contactTitle, string address, string city,
+                        string region, string postalCode, string country, string phone, string fax)
+        {
+            this.companyName = companyName;
+            this.contactName = contactName;
+            this.contactTitle = contactTitle;
+            this.address = address;
+            this.city = city;
+            this.region = region;
+            this.postalCode = postalCode;
+            this.country = country;
+            this.phone = phone;
+            this.fax = fax;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Domain/OrderDetails.cs b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Domain/OrderDetails.cs
new file mode 100644
index 00000000..11197bb2
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/DataQuickStart/Domain/OrderDetails.cs
@@ -0,0 +1,46 @@
+
+namespace Spring.DataQuickStart.Domain
+{
+    /// <summary>
+    /// Class encapsulating OrderDetail information suitable for
+    /// use with the stored procedure CustOrdersDetail
+    /// </summary>
+    public class OrderDetails
+    {
+        private string productName;
+        private double unitPrice;
+        private int quantity;
+        private int discount;
+        private double extendedPrice;
+
+        public string ProductName
+        {
+            get { return productName; }
+            set { productName = value; }
+        }
+
+        public double UnitPrice
+        {
+            get { return unitPrice; }
+            set { unitPrice = value; }
+        }
+
+        public int Quantity
+        {
+            get { return quantity; }
+            set { quantity = value; }
+        }
+
+        public int Discount
+        {
+            get { return discount; }
+            set { discount = value; }
+        }
+
+        public double ExtendedPrice
+        {
+            get { return extendedPrice; }
+            set { extendedPrice = value; }
+        }
+    }
+}
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2003.csproj b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2003.csproj
new file mode 100644
index 00000000..b9bc3476
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2003.csproj
@@ -0,0 +1,155 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{4599FD80-29F6-4542-8945-F93F709DFD3F}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.DataQuickStart"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "Spring.Data"
+                    AssemblyName = "Spring.Data"
+                    HintPath = "..\..\..\..\..\..\bin\net\1.1\debug\Spring.Data.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "DataQuickStart\Dao\Template\CommandCallbackDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataQuickStart\Dao\Template\CustomerDataSetDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataQuickStart\Dao\Template\CustomerRowMapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataQuickStart\Dao\Template\CustOrdersDetailStoredProc.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataQuickStart\Dao\Template\OrderDetailRowMapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataQuickStart\Dao\Template\QueryForObjectDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataQuickStart\Dao\Template\ResultSetExtractorDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataQuickStart\Dao\Template\RowCallbackDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataQuickStart\Dao\Template\RowMapperDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataQuickStart\Domain\Customer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataQuickStart\Domain\OrderDetails.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2005.csproj b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2005.csproj
new file mode 100644
index 00000000..fe3cc1fc
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/src/Spring/Spring.DataQuickStart/Spring.DataQuickStart.2005.csproj
@@ -0,0 +1,78 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{92B2A60E-D3B9-4647-8CFE-AC19611869F6}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.DataQuickStart</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>
+    </DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="DataQuickStart\Dao\GenericTemplate\CommandCallbackDao.cs" />
+    <Compile Include="DataQuickStart\Dao\GenericTemplate\CustOrdersDetailStoredProc.cs" />
+    <Compile Include="DataQuickStart\Dao\GenericTemplate\OrderDetailRowMapper.cs" />
+    <Compile Include="DataQuickStart\Dao\Template\OrderDetailRowMapper.cs" />
+    <Compile Include="DataQuickStart\Dao\Template\CustOrdersDetailStoredProc.cs" />
+    <Compile Include="DataQuickStart\Dao\GenericTemplate\QueryForObjectDao.cs" />
+    <Compile Include="DataQuickStart\Dao\GenericTemplate\RowCallbackDao.cs" />
+    <Compile Include="DataQuickStart\Dao\Template\CommandCallbackDao.cs" />
+    <Compile Include="DataQuickStart\Dao\Template\CustomerRowMapper.cs" />
+    <Compile Include="DataQuickStart\Dao\Template\CustomerDataSetDao.cs" />
+    <Compile Include="DataQuickStart\Dao\Template\QueryForObjectDao.cs" />
+    <Compile Include="DataQuickStart\Dao\Template\ResultSetExtractorDao.cs" />
+    <Compile Include="DataQuickStart\Dao\Template\RowCallbackDao.cs" />
+    <Compile Include="DataQuickStart\Dao\Template\RowMapperDao.cs" />
+    <Compile Include="DataQuickStart\Domain\Customer.cs" />
+    <Compile Include="DataQuickStart\Dao\GenericTemplate\CustomerRowMapper.cs" />
+    <Compile Include="DataQuickStart\Dao\GenericTemplate\ResultSetExtractorDao.cs" />
+    <Compile Include="DataQuickStart\Dao\GenericTemplate\RowMapperDao.cs" />
+    <Compile Include="DataQuickStart\Domain\OrderDetails.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/AssemblyInfo.cs b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..177a4f0e
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]		
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/DataQuickStart/GenericTemplate/ExampleTests.cs b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/DataQuickStart/GenericTemplate/ExampleTests.cs
new file mode 100644
index 00000000..7f2acdb8
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/DataQuickStart/GenericTemplate/ExampleTests.cs
@@ -0,0 +1,110 @@
+using System.Collections.Generic;
+
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Config;
+using Spring.Objects.Factory.Xml;
+
+using Spring.DataQuickStart.Dao.GenericTemplate;
+using Spring.DataQuickStart.Domain;
+
+namespace Spring.DataQuickStart.GenericTemplate
+{
+    [TestFixture]
+    public class ExampleTests
+    {
+        private IApplicationContext ctx;
+
+        [SetUp]
+        public void InitContext()
+        {
+            // Configure Spring programmatically
+            NamespaceParserRegistry.RegisterParser(typeof(DatabaseNamespaceParser));
+            ctx = new XmlApplicationContext(
+                "assembly://Spring.DataQuickStart.Tests/Spring.DataQuickStart.GenericTemplate/ExampleTests.xml");
+        }
+        
+        
+        [Test]
+        public void CallbackDaoTest()
+        {
+            CommandCallbackDao commandCallbackDao = ctx["commandCallbackDao"] as CommandCallbackDao;
+            int count = commandCallbackDao.FindCountWithPostalCodeWithDelegate("1010");
+            Assert.AreEqual(3, count);
+        }
+        
+        [Test]
+        public void ResultSetExtractorDaoTest()
+        {
+            ResultSetExtractorDao dao = ctx["resultSetExtractorDao"] as ResultSetExtractorDao;
+            IDictionary<string, IList<string>> postalCodeDictionary = dao.GetPostalCodeCustomerMapping();
+            Assert.IsNotNull(postalCodeDictionary);
+            Assert.AreEqual(87, postalCodeDictionary.Count);
+
+            IList<string> contactNameList = dao.GetCustomerNameByCountryAndCity("Brazil", "Sao Paulo");
+            Assert.AreEqual(4, contactNameList.Count);
+
+            contactNameList = dao.GetCustomerNameByCountryAndCityWithParamsBuilder("Brazil", "Sao Paulo");
+            Assert.AreEqual(4, contactNameList.Count);
+
+            contactNameList = dao.GetCustomerNameByCountryAndCityWithCommandSetterDelegate("Brazil", "Sao Paulo");
+            Assert.AreEqual(4, contactNameList.Count);
+
+            contactNameList = dao.GetCustomerNameByCountryAndCityWithAllDelegates("Brazil", "Sao Paulo");
+            Assert.AreEqual(4, contactNameList.Count);
+
+            contactNameList = dao.GetCustomerNameByCountryAndCityWithCommandSetter("Brazil", "Sao Paulo");
+            Assert.AreEqual(4, contactNameList.Count);
+
+            contactNameList = dao.GetCustomerNameByCountry("Brazil");
+            Assert.AreEqual(9, contactNameList.Count);
+        }
+        
+        [Test]
+        public void RowMapperDaoTest()
+        {
+            RowMapperDao dao = ctx["rowMapperDao"] as RowMapperDao;
+            
+            IList<Customer> customerList = dao.GetCustomersWithDelegate();
+            
+            AssertsOnCustomerList(customerList);
+
+            customerList = dao.GetCustomersWithDelegate();
+            
+            AssertsOnCustomerList(customerList);
+                        
+        }
+        
+        [Test]
+        public void RowCallbackDaoTest()
+        {
+            RowCallbackDao dao = ctx["rowCallbackDao"] as RowCallbackDao;
+            IDictionary<string, IList<string>> postalCodeDictionary = dao.GetPostalCodeCustomerMapping();
+            Assert.IsNotNull(postalCodeDictionary);
+            Assert.AreEqual(87, postalCodeDictionary.Count);
+        }
+
+        [Test]
+        public void QueryForObjectDaoTest()
+        {
+            QueryForObjectDao dao = ctx["queryForObjectDao"] as QueryForObjectDao;
+            Customer customer = dao.GetCustomer("Hanna Moos");
+            Assert.AreEqual(customer.ContactName, "Hanna Moos");
+        }
+
+        [Test]
+        public void QueryForDetailsUsingStoredProcObject()
+        {
+            CustOrdersDetailStoredProc storedProc = ctx["custOrdersDetailStoredProc"] as CustOrdersDetailStoredProc;
+            List<OrderDetails> details = storedProc.GetOrderDetails(10278);
+            Assert.AreEqual(4, details.Count);
+        }
+
+        private static void AssertsOnCustomerList(IList<Customer> customerList)
+        {
+            Assert.IsNotNull(customerList);
+            Assert.AreEqual(91, customerList.Count);
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/DataQuickStart/GenericTemplate/ExampleTests.xml b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/DataQuickStart/GenericTemplate/ExampleTests.xml
new file mode 100644
index 00000000..554cad24
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/DataQuickStart/GenericTemplate/ExampleTests.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database">
+
+  <db:provider id="dbProvider" 
+                provider="SqlServer-2.0" 
+                connectionString="Data Source=.\SQL2005;Initial Catalog=Northwind;Persist Security Info=True;User ID=springqa;Password=springqa"/>
+
+  <object id="adoTemplate" type="Spring.Data.Generic.AdoTemplate, Spring.Data">
+    <property name="DbProvider" ref="dbProvider"/>
+    <property name="DataReaderWrapperType" value="Spring.Data.Support.NullMappingDataReader, Spring.Data"/>
+  </object>
+
+  <object id="commandCallbackDao" type="Spring.DataQuickStart.Dao.GenericTemplate.CommandCallbackDao, Spring.DataQuickStart">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+  
+  <object id="resultSetExtractorDao" type="Spring.DataQuickStart.Dao.GenericTemplate.ResultSetExtractorDao, Spring.DataQuickStart">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="rowMapperDao" type="Spring.DataQuickStart.Dao.GenericTemplate.RowMapperDao, Spring.DataQuickStart">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="rowCallbackDao" type="Spring.DataQuickStart.Dao.GenericTemplate.RowCallbackDao, Spring.DataQuickStart">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="queryForObjectDao" type="Spring.DataQuickStart.Dao.GenericTemplate.QueryforObjectDao, Spring.DataQuickStart">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+
+  <object id="custOrdersDetailStoredProc" type="Spring.DataQuickStart.Dao.GenericTemplate.CustOrdersDetailStoredProc, Spring.DataQuickStart">
+    <constructor-arg index="0" ref="dbProvider"/>
+  </object>
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/DataQuickStart/Template/ExampleTests.cs b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/DataQuickStart/Template/ExampleTests.cs
new file mode 100644
index 00000000..1ae698d0
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/DataQuickStart/Template/ExampleTests.cs
@@ -0,0 +1,203 @@
+using System.Collections;
+using System.Data;
+using System.Globalization;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Config;
+using Spring.Data.Core;
+using Spring.Objects.Factory.Xml;
+
+using Spring.DataQuickStart.Dao.Template;
+using Spring.DataQuickStart.Domain;
+
+namespace Spring.DataQuickStart.Template
+{
+    [TestFixture]
+    public class ExampleTests
+    {
+        private IApplicationContext ctx;
+        private AdoTemplate adoTemplate;
+
+        [SetUp]
+        public void InitContext()
+        {
+            // Configure Spring programmatically
+            NamespaceParserRegistry.RegisterParser(typeof(DatabaseNamespaceParser));
+            ctx = new XmlApplicationContext(
+                "assembly://Spring.DataQuickStart.Tests/Spring.DataQuickStart.Template/ExampleTests.xml");
+            adoTemplate = ctx["adoTemplate"] as AdoTemplate;
+        }
+        
+        
+        [Test]
+        public void CallbackDaoTest()
+        {
+            CommandCallbackDao commandCallbackDao = ctx["commandCallbackDao"] as CommandCallbackDao;
+            int count = commandCallbackDao.FindCountWithPostalCode("1010");
+            Assert.AreEqual(3, count);
+        }
+        
+        [Test]
+        public void ResultSetExtractorDaoTest()
+        {
+            ResultSetExtractorDao dao = ctx["resultSetExtractorDao"] as ResultSetExtractorDao;
+            IDictionary postalCodeDictionary = dao.GetPostalCodeCustomerMapping();
+            Assert.IsNotNull(postalCodeDictionary);
+            Assert.AreEqual(87, postalCodeDictionary.Count);
+
+            IList contactNameList = dao.GetCustomerNameByCountryAndCity("Brazil", "Sao Paulo");
+            Assert.AreEqual(4, contactNameList.Count);
+
+            contactNameList = dao.GetCustomerNameByCountryAndCityWithParamsBuilder("Brazil", "Sao Paulo");
+            Assert.AreEqual(4, contactNameList.Count);
+
+
+            contactNameList = dao.GetCustomerNameByCountryAndCityWithCommandSetter("Brazil", "Sao Paulo");
+            Assert.AreEqual(4, contactNameList.Count);
+
+            contactNameList = dao.GetCustomerNameByCountry("Brazil");
+            Assert.AreEqual(9, contactNameList.Count);
+        }
+        
+        [Test]
+        public void RowMapperDaoTest()
+        {
+            RowMapperDao dao = ctx["rowMapperDao"] as RowMapperDao;
+            
+            IList customerList = dao.GetCustomers();
+            
+            AssertsOnCustomerList(customerList);
+
+
+        }
+        
+        [Test]
+        public void RowCallbackDaoTest()
+        {
+            RowCallbackDao dao = ctx["rowCallbackDao"] as RowCallbackDao;
+            IDictionary postalCodeDictionary = dao.GetPostalCodeCustomerMapping();
+            Assert.IsNotNull(postalCodeDictionary);
+            Assert.AreEqual(87, postalCodeDictionary.Count);
+        }
+        
+        [Test]
+        public void QueryForObjectDaoTest()
+        {
+            QueryForObjectDao dao = ctx["queryForObjectDao"] as QueryForObjectDao;
+            Customer customer = dao.GetCustomer("Hanna Moos");
+            Assert.AreEqual(customer.ContactName, "Hanna Moos");            
+        }
+        
+        [Test]
+        public void QueryForDetailsUsingStoredProcObject()
+        {
+            CustOrdersDetailStoredProc storedProc = ctx["custOrdersDetailStoredProc"] as CustOrdersDetailStoredProc;
+            IList details = storedProc.GetOrderDetails(10278);
+            Assert.AreEqual(4, details.Count);
+        }
+
+        [Test]
+        public void DataSetDemo()
+        {
+            CustomerDataSetDao customerDataSetDao = ctx["customerDataSetDao"] as CustomerDataSetDao;
+            DataSet dataSet = customerDataSetDao.GetCustomers();
+            Assert.AreEqual(91, dataSet.Tables["Table"].Rows.Count);
+
+            dataSet = customerDataSetDao.GetCustomers("Customers");
+            Assert.AreEqual(91, dataSet.Tables["Customers"].Rows.Count);
+
+            dataSet = customerDataSetDao.GetCustomersLike("M%");
+            Assert.AreEqual(12, dataSet.Tables["Table"].Rows.Count);
+
+            dataSet = new DataSet();
+            dataSet.Locale = CultureInfo.InvariantCulture;
+
+
+            customerDataSetDao.FillCustomers(dataSet);
+            Assert.AreEqual(91, dataSet.Tables["Customers"].Rows.Count);
+
+
+            AddAndEditRow(dataSet);
+
+
+            try
+            {
+                customerDataSetDao.UpdateWithCommandBuilder(dataSet);
+
+                int count =
+                    (int)adoTemplate.ExecuteScalar(CommandType.Text, "select count(*) from Customers where CustomerId = 'NewID'");
+                Assert.AreEqual(1, count);
+
+                count = (int)adoTemplate.ExecuteScalar(CommandType.Text, "select count(*) from Customers where CustomerId = 'ALFKI' and Phone = '030-0074322'");
+                Assert.AreEqual(1, count);
+
+            }
+            finally
+            {
+                //revert changes
+                adoTemplate.ExecuteNonQuery(CommandType.Text, "delete from Customers where CustomerId = 'NewID'");
+                adoTemplate.ExecuteNonQuery(CommandType.Text,
+                                            "update Customers SET Phone='030-0074321' where CustomerId = 'ALFKI'");
+            }
+
+
+        }
+
+        private static void AddAndEditRow(DataSet dataSet)
+        {
+            DataRow dataRow = dataSet.Tables["Customers"].NewRow();
+            dataRow["CustomerId"] = "NewID";
+            dataRow["CompanyName"] = "New Company Name";
+            dataRow["ContactName"] = "New Name";
+            dataRow["ContactTitle"] = "New Contact Title";
+            dataRow["Address"] = "New Address";
+            dataRow["City"] = "New City";
+            dataRow["Region"] = "NR";
+            dataRow["PostalCode"] = "New Code";
+            dataRow["Country"] = "New Country";
+            dataRow["Phone"] = "New Phone";
+            dataRow["Fax"] = "New Fax";
+            dataSet.Tables["Customers"].Rows.Add(dataRow);
+
+            DataRow alfkiDataRow = dataSet.Tables["Customers"].Rows[0];
+            alfkiDataRow["Phone"] = "030-0074322"; // simple change, last digit changed from 1 to 2.
+        }
+
+        [Test]
+        public void UpdateWithoutCommandBuilder()
+        {
+            CustomerDataSetDao customerDataSetDao = ctx["customerDataSetDao"] as CustomerDataSetDao;
+            try
+            {
+                DataSet dataSet = new DataSet();
+                dataSet.Locale = CultureInfo.InvariantCulture;
+                customerDataSetDao.FillCustomers(dataSet);
+                Assert.AreEqual(91, dataSet.Tables["Customers"].Rows.Count);
+
+                AddAndEditRow(dataSet);
+
+                customerDataSetDao.Update(dataSet);
+
+                int count = (int)adoTemplate.ExecuteScalar(CommandType.Text, "select count(*) from Customers where CustomerId = 'NewID'");
+                Assert.AreEqual(1, count);
+
+                count = (int)adoTemplate.ExecuteScalar(CommandType.Text, "select count(*) from Customers where CustomerId = 'ALFKI' and Phone = '030-0074322'");
+                Assert.AreEqual(1, count);
+
+            } finally
+            {
+                //revert changes
+                adoTemplate.ExecuteNonQuery(CommandType.Text, "delete from Customers where CustomerId = 'NewID'");
+                adoTemplate.ExecuteNonQuery(CommandType.Text,
+                                            "update Customers SET Phone='030-0074321' where CustomerId = 'ALFKI'");
+            }
+        }
+
+        private static void AssertsOnCustomerList(IList customerList)
+        {
+            Assert.IsNotNull(customerList);
+            Assert.AreEqual(91, customerList.Count);
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/DataQuickStart/Template/ExampleTests.xml b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/DataQuickStart/Template/ExampleTests.xml
new file mode 100644
index 00000000..c6d198e7
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/DataQuickStart/Template/ExampleTests.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database">
+
+  <db:provider id="dbProvider" 
+                provider="System.Data.SqlClient" 
+                connectionString="Data Source=.\SQL2005;Initial Catalog=Northwind;Persist Security Info=True;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+
+  <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
+    <property name="DbProvider" ref="dbProvider"/>
+    <property name="DataReaderWrapperType" value="Spring.Data.Support.NullMappingDataReader, Spring.Data"/>
+  </object>
+
+  <object id="commandCallbackDao" type="Spring.DataQuickStart.Dao.Template.CommandCallbackDao, Spring.DataQuickStart">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+  
+  <object id="resultSetExtractorDao" type="Spring.DataQuickStart.Dao.Template.ResultSetExtractorDao, Spring.DataQuickStart">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="rowMapperDao" type="Spring.DataQuickStart.Dao.Template.RowMapperDao, Spring.DataQuickStart">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="rowCallbackDao" type="Spring.DataQuickStart.Dao.Template.RowCallbackDao, Spring.DataQuickStart">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="queryForObjectDao" type="Spring.DataQuickStart.Dao.Template.QueryforObjectDao, Spring.DataQuickStart">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="custOrdersDetailStoredProc" type="Spring.DataQuickStart.Dao.Template.CustOrdersDetailStoredProc, Spring.DataQuickStart">
+    <constructor-arg index="0" ref="dbProvider"/>
+  </object>
+
+  <object id="customerDataSetDao" type="Spring.DataQuickStart.Dao.Template.CustomerDataSetDao, Spring.DataQuickStart">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+  
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2003.csproj b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2003.csproj
new file mode 100644
index 00000000..76c8b0c2
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2003.csproj
@@ -0,0 +1,128 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{9989A239-3406-4E67-B2B5-C8CF78E2311B}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.DataQuickStart.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = 'copy /y "$(ProjectDir)Spring.DataQuickStart.Tests.dll.config"  "$(TargetDir)Spring.DataQuickStart.Tests.dll.config"'
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "0"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "Spring.DataQuickStart.2003"
+                    Project = "{4599FD80-29F6-4542-8945-F93F709DFD3F}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Data"
+                    AssemblyName = "Spring.Data"
+                    HintPath = "..\..\..\..\..\..\bin\net\1.1\debug\Spring.Data.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\..\..\..\lib\Net\1.1\nunit.framework.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.DataQuickStart.Tests.dll.config"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "DataQuickStart\Template\ExampleTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataQuickStart\Template\ExampleTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2005.csproj b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2005.csproj
new file mode 100644
index 00000000..9a048506
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.2005.csproj
@@ -0,0 +1,82 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.DataQuickStart.Tests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\lib\Net\2.0\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.DataQuickStart\Spring.DataQuickStart.2005.csproj">
+      <Project>{92B2A60E-D3B9-4647-8CFE-AC19611869F6}</Project>
+      <Name>Spring.DataQuickStart.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="DataQuickStart\GenericTemplate\ExampleTests.cs" />
+    <Compile Include="DataQuickStart\Template\ExampleTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DataQuickStart\GenericTemplate\ExampleTests.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DataQuickStart\Template\ExampleTests.xml" />
+    <Content Include="Spring.DataQuickStart.Tests.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.dll.config b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.dll.config
new file mode 100644
index 00000000..060e2594
--- /dev/null
+++ b/examples/Spring/Spring.DataQuickStart/test/Spring/Spring.DataQuickStart.Tests/Spring.DataQuickStart.Tests.dll.config
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  
+  <configSections>
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+    </sectionGroup>
+  </configSections>
+
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Simple.ConsoleOutLoggerFactoryAdapter, Common.Logging">
+        <arg key="showLogName" value="true" />
+        <arg key="showDataTime" value="true" />
+        <arg key="level" value="INFO" />
+        <arg key="dateTimeFormat" value="yyyy/MM/dd HH:mm:ss:fff" />
+      </factoryAdapter>
+    </logging>
+  </common>
+
+</configuration>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Examples.build b/examples/Spring/Spring.Examples.build
new file mode 100644
index 00000000..6c9bfc03
--- /dev/null
+++ b/examples/Spring/Spring.Examples.build
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<project name="Spring.Examples" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+
+  <target name="build">
+    <nant buildfile=".\Spring.IocQuickStart.MovieFinder\Spring.IocQuickStart.MovieFinder.build" target="build" />
+    <nant buildfile=".\Spring.IocQuickStart.AppContext\Spring.IocQuickStart.AppContext.build" target="build" />
+    <nant buildfile=".\Spring.IocQuickStart.EventRegistry\Spring.IocQuickStart.EventRegistry.build" target="build" />
+    <nant buildfile=".\Spring.AopQuickStart\Spring.AopQuickStart.build" target="build" />
+    <nant buildfile=".\Spring.Calculator\Spring.Calculator.build" target="build" />
+
+
+    <nant buildfile=".\SpringAir\SpringAir.build" target="test" if="${build-web}"/>
+
+
+  </target>
+
+</project>
+
+
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.2003.sln b/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.2003.sln
new file mode 100644
index 00000000..5d123b75
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.2003.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.AppContext.2003", "src/Spring.IocQuickStart.AppContext.2003.csproj", "{880EA873-E951-465A-AC5B-BA899A2C744E}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{880EA873-E951-465A-AC5B-BA899A2C744E}.Debug.ActiveCfg = Debug|.NET
+		{880EA873-E951-465A-AC5B-BA899A2C744E}.Debug.Build.0 = Debug|.NET
+		{880EA873-E951-465A-AC5B-BA899A2C744E}.Release.ActiveCfg = Release|.NET
+		{880EA873-E951-465A-AC5B-BA899A2C744E}.Release.Build.0 = Release|.NET
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.2005.sln b/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.2005.sln
new file mode 100644
index 00000000..7a7cfc8b
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.2005.sln
@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.AppContext.2005", "src/Spring.IocQuickStart.AppContext.2005.csproj", "{880EA873-E951-465A-AC5B-BA899A2C744E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{880EA873-E951-465A-AC5B-BA899A2C744E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{880EA873-E951-465A-AC5B-BA899A2C744E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{880EA873-E951-465A-AC5B-BA899A2C744E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{880EA873-E951-465A-AC5B-BA899A2C744E}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.build b/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.build
new file mode 100644
index 00000000..dfca8bfb
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/Spring.IocQuickStart.AppContext.build
@@ -0,0 +1,34 @@
+<?xml version="1.0" ?>
+<project name="Spring.IocQuickStart.AppContext" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+-->
+  <target name="build">
+    <!-- build AppContext example -->
+    <csc target="winexe"
+         define="${current.build.defines.csc}"
+	 warnaserror="true"
+         debug="${current.build.debug}"
+         output="${current.bin.dir}/${project::get-name()}.exe">
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+      </sources>
+      <resources prefix="Spring.IocQuickStart.AppContext" dynamicprefix="false" failonempty="true">
+        <include name="**/*.resx" />
+      </resources>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+      <references basedir="${current.bin.dir}">
+         <include name="System.Drawing.dll" />
+         <include name="Spring.Core.dll" />
+      </references>
+    </csc>
+    <copy tofile="${current.bin.dir}/${project::get-name()}.exe.config"
+          file="src/App.config" overwrite="true">
+    </copy>
+  </target>
+</project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/App.config b/examples/Spring/Spring.IoCQuickStart.AppContext/src/App.config
new file mode 100644
index 00000000..ca7b74a8
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/App.config
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<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" />
+    </sectionGroup>
+  </configSections>
+
+  <spring>
+
+    <context>
+      <resource uri="config://spring/objects" />
+    </context>
+
+    <objects xmlns="http://www.springframework.net">
+
+      <object name="messageSource" type="Spring.Context.Support.ResourceSetMessageSource, Spring.Core">
+        <property name="resourceManagers">
+          <list>
+            <value>Spring.IocQuickStart.AppContext.Images, Spring.IocQuickStart.AppContext</value>
+            <ref object="myResourceManager" />
+          </list>
+        </property>
+      </object>
+
+      <object name="myResourceManager" 
+              type="Spring.Objects.Factory.Config.ResourceManagerFactoryObject, Spring.Core">
+        <property name="baseName" value="Spring.IocQuickStart.AppContext.MyResource" />
+        <property name="assemblyName" value="Spring.IocQuickStart.AppContext" />
+      </object>
+
+    </objects>
+  
+  </spring>
+
+</configuration>
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Images.resx b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Images.resx
new file mode 100644
index 00000000..b725b654
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Images.resx
@@ -0,0 +1,430 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="bubblechamber" type="System.Drawing.Bitmap, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhkgB3APcAAP///zk5OUJCQjkxMXNaWlpCQoxaWoQ5OaVrY4RSSqVjWueUhNaEc5RaSs6Ea3NC
+        Ma1jSmMxIbVzWloxId6Ma0o5MTkYCIRSOUIhENaMY6VrSu+ca8Z7Uq1jObVzSlIpEIRrWlpCMe+lc86E
+        UkIpGIxSKVopCGsxCIRjSu+cWpxjOWM5GK1jKXtCGIxKGIRCEJRrSpRjOWtCIcZ7OaVaGHNaQko5KSEY
+        EPelWueUSr1rIcZrGJxSEFJKQmtSOWNKMVpCKXNSMb2ESu+cSnNKIZxjKZRaIb1zKc57Ka1jGKVzObV7
+        OfelSq1zMb17MeeUOa1rIcZzGNZ7GIRjOXtaMeecQs6MOZRrMb2EOYxjKe+lQpxrKeecOdaMKeeUKYxr
+        OXtaKfetQv+1Qt6cOe+lOeecMbV7IZRrKfetOf+1Od6cMe+lMfetMf+1MVpKKUo5GEpCMZRrEFJKEFpS
+        ECEhGEpKMUJKCEJKGCk5EDE5KSE5GBgxEBAhEEJSSilCORgxKUJKSggQEBAhISlaYylKUilCSkJaY1LG
+        90JSWiExOTlaa0paY0qt51Jre1Kt5yFKYzlSY0JjeyE5Skql50qt7zlacylKY0Kc3kpzlDlrlEKEvUqc
+        3kKU1jlCSkpjezmM1ikxOSEpMUJac0JjhDFKYzFSc0qMzjmEzlJaY1KEvTlrpTlztTl7xlJznEpzpTla
+        hEJrnDFajDFzxjFCWjlScyE5WjljnDFrvSljtSlrxjlKYzFShDFKcyFSpSFatRghMSlKhDFapSFKlEJS
+        czlShDFSlDFKhAgQITlKcyE5czlCWjFCcxg5lCExYzlKjBAxpRAxrTE5WiEpShghShAYOQgQMSExhBAh
+        hAgYlBAYawgQYwgQezk5QlJSYyEhKUJCjDk5ewgIOQgIUggIYwgIazEpe1JKe0I5c0pCazkxWjkpczEh
+        Y1JCcwgAGEIpa0oxY1o5a2tCe0pCSiEYIQgACJRSjEoxQnNKY6VrjJRSc4xKY61re3NCSqVrc6VjawAA
+        ACwAAAAAkgB3AAAI/wCPUcvW69MkRpdOCatFLdC8WRhMWDjxgkQFF0ky0uDh4kSeWnz4/CJlidq0aeGq
+        Cbt06dMnSr6ukdNWLOY1a9vUwbPmK5s+CSPilfOQIoeCR8D8JAJV5IiOHUlexCkzg4OBBCO8aHnihc0T
+        NmDDejEjqVizFWvWeJHSwo+qab2SYeARwk+tdv/y0vtHTxi1vIAB79VbzRKrSwhxMatFxwKGEzwyRoni
+        Y0kSH1CkSOnihbPmLIX84OE2LVQgPokSHavW61oza7k+YdOWTdatW8KYXdvmLp6zePr83TPGrsqCFAYe
+        PUrWLBSJAKD++PEzjceMGQg8gH3SZk0XK2zSqv8FC+aRpUcuvB4RUEpSqWaWLHHjscLPr7+D957ky3dv
+        fv/TaEIJLrUkQsIKLkCBhBReNOhgF0iE4ESDZXTWoBpqVLEFIQO4QEURNLjwwgp6CDLPL8cE0k4zp/RS
+        0Cm44NILLrcks44/FPSjDjm98MNABimwkxQvuyQSQgxFBFBKLXlwI4AAD5TRRlhrjFFGeFWsEZ4XVxix
+        AjArNNjHI534UYwwGCDRRB15/BFINMf0N1gtcebXH3//TGNJIhaY8EIUXYyRQw6CquFgZz8EceihapTR
+        RQ5UcEMDGw46oYMUNMyBx4kpJkPJJqx8csotpzhyim7p6MNPNrcAo88CDBj/8I4vwDQzACgRrPGEAYi4
+        IAULuijDzQM6PPGVsZSm9URaXXkRRylAIOGFAVQc0QIvyfCwVgR/EEIIKNLgxR898yQTyJ149nfMHzfw
+        8N0MagQ6hhVWzIuhF030gEWjDXJRRpVWdNGFFDoAMUAUT1ToAQwOYqqpN95M08xKlFAyCSef3NLLOOKI
+        k8wtteRTjzvZxGgLKB2w4MMMWjhx5RMzLCGFEZKAIkMXU4ZXxrK6iscGC8CkJwUSLMxQRhAyQOFCHoTE
+        EskfqE1DDz3n5iXNL3pNLSdgz1VgRBdqWFHF2DlUUUajVTjhgxNqVchFFVz5e0YFAXAzgCQhWFmhrl4w
+        /+tFFHPQ8Ys37YQTzCeXVHwKK8KsEowswYjzzjqwCSNMMOlQMEQZOYzgwRNacGAFGmwgUQghtUzQFc9a
+        6JpD32qxUMoJD/RBSA9sr6EDIKXYgswPYPjghzTNiBPI1HsFAk6cgo079QAT3ApEB2dbkUO9ZhvqAxV9
+        l1GFlV78W0YZR/jxRyneTFBLEQnDneUTZISv1hzU/JKINMckk401lFwSzC2mYAQjrGENcVxDIdsQxi2k
+        oY8MPGFsIBiB6JZFhjU0AQo+mIYRwoMGY+XgCWOYwVe8IINIJIIUtQACg9TyA1tYwgZJcFAS7qALa4Qj
+        RVRrx36Qd6fByKMbdRhAIv+4UQIkPCEFVvDeGNZggAKoIS3eW9b4uMCVKNQhPgE4QhAGwAKxJWwNVuAK
+        s8DghxPgIRGWwB89gDGJU5yCEoy4jTCsMarLCaMXwAiAP1KQAgZIwAES6GAH16AFLSChD9KAwhMgBDsZ
+        umEQsUhEIbzBAi2VAQylIOIS/5UWM+AhGtsQRzvaQbVj1CJ5gzlef8zAggbUIBqJIIQNSjACPuYAQj0I
+        5Bp2Nr4p/ssLIQhiKSLgBSREQwY7e0K8RMisQxrhbyu4gSQsIZDEtYQVt4gRLjJWjGI4Yx3LsEQB8iGB
+        cnKADEMgw1a8spUokMIGO+hBDcCyli3UgRCACIAl9BD/vQcgAQsPAIQlXLCGD5KBC32Tgh0CUQ5yiOMY
+        pKRHM5rxn+YFDwtI0AAB+lAKS1RAAVUoWw2UoLPx7XJ8DVKLE7qQhEU0wQtP6EAhXKCFMdj0gVxBQh3g
+        kFIv6EAOdOCFJWohDFMEgxWcuEUuEjKJTzAjG/l4xzKyUYtslMMHutIC3NAQBq8sqwa1MMKEvMCCIBRi
+        FkFggRSyQIgkGOERtfhBA5CQgFJEYQ1DqAIXyBAeGvyBGPoTxw1JeQxwHM8/yDuXH3ogBUOVQW2xkA8N
+        pFCEC/xyDRXsGxk4ucuUcsYLZHhCDaQxg11qNUtk8EAhiiCetHSBB3iQxDJ+UY1q/3Cif5fgxCUOwYhe
+        WCMf+khGMK7BClukqWxP6OBW1MmGIljiAzsogg860Y0rMKhBNQBEFPjBiwlgQVcw0AXC1MCFsmE2DpZw
+        BiHWwbFqQLQdtZjGPw6LJ0HMghtBAFujuuCEBnSDQwGAQt/Cg9n4VWmEV1pDFfiqlkX2IARlSMGyvrIG
+        JLihCwkLLfzKEAU7hIIXhKBHMJJ6i9syYhPDXUcBssGKU9iiFNOYwBMGlYOtVGErXnDBI0DhrUQIuG+k
+        80EhuMGCLxwhimRYgi6gADd/fREJcviDN6hxDcG24xj0yB9eksefagBhC1M4wqG8N4MSDKISASjCZ8NT
+        wWSp5f/N8NOssY7AjQ3+a1leMIIPvBJaMtTYWEbwAx9IwQtq3KIY08DFJg5hCoUkw4CX0BhzKgA3Gmvh
+        OpUdgCVIEQIo2KMIOatQCIoBCCRsR6sVRgQQQMsFLXCBC2qJQh8EvQ6HVmOUEpWa1gYzjySwQQ1jcJBa
+        blwEOIABEJIIABWc8EQthCdZlAoPQilVyIKCgRs6IDCl6tAAPpMhpN9+AhHgANtEZKIZwKBGMQKIC1ko
+        RBinCIYqTmGNaYhDHzMYwQdncIFZJOMRQPBDCLoSA1OTga8RisQEylDBKkHgSgYgRCVbDTe+JmEQc7BD
+        IkJ5a4hWIxnIC3kgJiS68FHIC0f/mAULiumDmskTBXNtVmuz+m3vdWGuP6gATLXghTMUAgloQMPBh5CD
+        IYygCoC4QOlIVApp0GMawTiEqC4hC0rcwhrCwCYzhJGNCPCDHz3gxSwI0AAPJGEWJWBDGYQ+7OucQREV
+        kAIZUrAVepWOGBVAQl71qgUp9KATSTDDDdwxjnCE48rtqDfVdv0PLFTobJCvUBCcUVrvqWARAXBBE7oB
+        iBqMVTxqGNTY4FaGMJouPWjwQh184IWVku7gKRjCDKJRhDAk7AV02IUl/kENTbAkjrLoBdevQapc9MIX
+        vhBGMvhxBC15IQuziMIgd0mAz7HhCoooRLYPrqWaskHJFeiA/5aegIQelIIGDZLDL0Jp+JRMQxhbvpMV
+        1tCos8mvCX4ogVrajIQKdMIISBADtcANgPAFC9IgT5BXE6YWV4AERcANUMAGNEAIS9AGVPADCBhSndMD
+        SFBxakADe0Bo4uAMweBGj5MLisEMvXAJmoALvsAMpAUzVtAGOoBWBDYEHDACEqAGYEEFflAI/MA6HQQ3
+        bKACpUAIIUAEQTAIpMBaahEHeNBQHdN+wKBr5zI1XdBZasBsahF2NeAFaNAFL3UEbmAE3RACNkAIoZAO
+        DdADcFABRFACLGBqbLAVY3ABPmAEdRAAL1AHU+AVgSYDP6AEYsAAQ+AEPTAG8FM2ZWAEev8wCrswDdaQ
+        DMBgCi0Rb7KQC7nACqwQDNYgDfxgAEhSArPQB05wh1hQFFqiK2zAD27gBlgFP1riVWiwBt2gC92ACItQ
+        AzrQN80iB9JQQIJleNkADDx0LmzjKD6ACEhgQT7gAVYAWl3gA28wAEUwBl1QAaXgCaEQJmAgCYRQCZYQ
+        DZ3wATTQBUPAFU4gD3+gCKEACjrQBvZECokgA03gARDgBEAACgJmLGGwFhPgB5UQC/TQDsBgKpeAYrKA
+        CyjIDNYADOdgCc2gDITADVQwAxKQAUCxBkJXi5TSA1BwBgNgalrikT1jBSJkKFDEV10RB3wghVMYDsxQ
+        DSH3D0/kHaj/IABm0AVfAB7aBgWFIAAsYCxdQAWLEAnc8AIvQAiNMAqqoAq2EE6dpwRbUARpWAiiAAqz
+        5AM+UAegMAUwUABXMwukAAoBUAAJUAMXIA+gUAiJMAyWUA3TYAq3wAqUoFu3MFzMgQASAAEaoAJYoIhW
+        oAAZ8EGYJXRgwQKzcARI0AlQ0B0cWUHhxlUcpGDz1yxdYAe6cA3Z0DEdUw7AEAiHRQ+cYQZmEAd1IAUw
+        wDYGRilTsAVSUAP04mdQ0AOv8AfcIAqYMAu1IA4SEyPJUAukMAuIcEKzQAgkgARhEIZfUAZDEAN+EAmD
+        EAAPUAIR4A2EYAuqUAy7QAu/8AuZIBB5/xkMk3AIl7AQ2vANGSACTDAEQ8AEscIBQ6AF6ISYOOYDBbAG
+        UtAHMsAGQyB0fFWYXYEEl4Usz+YsoNBQ5DAOnakNwUANIXcGXrAFcMANQKADE7IGrQZF4NEG3ZECaXF9
+        i9AH7hgJkQAK8jALnQAI6NANVBADVBACiDAKsUAKhfABpuYFaTAGI9ACkfAKfEACB1ADPVAIuxALu5AM
+        klAIihANurAL/1ALpxB8kzAJveCQ2bAPDnAP7AAPEsABVUB06nRwQRd0VtAJoIYEiKAMIxAGZEA6bIAG
+        MEAFPAAHSNAF8uADJtUVlBIHfwAKMkEO2eBQwGANi0cPcOADDTAHff8gAHXAGfvHfdrGBgsWFjTADXCQ
+        B4kQYGpwAaHwA0hgKF7QBlLgBp2gDKMwCrMwADIABC1ABGh4nKHQCbPQDQkgAKCAFMBACpIQCoXQLfI1
+        EMLwCZzgiQ4pDenADMVwDg3QnoU0nx1JOmmwBAIwA6lXAPJQmAAKFvnyB3kgBU3gC52ABNx3JV1QB7PA
+        UNtADuzKoMGAZaLpBFYwBYUACiswBZzBWQcHFqsYFmzQBkiACjQQAvIQAGqlAgJwD3wKFucaQ0VAq96Q
+        CLGgC4RQCqQgDd5QBNeBBBdwK4OwC7xADEvyC0phC1hTDa/BCqbgW8HADKtgDM3ADhLQAFaQTgf/R6Zv
+        2gY+ME+u2QNesJxxGrRQ0Afz0QVgkAQFNn8sVAh8UAsyMagcYxa4loUTWgN18AUUYlJpIakElhYzgARI
+        UAI1EAXFJgAtEKoDphZBwA1NgAX80AmKAAmgEAtnlQmFUAgBEAI1IF2gIAAEUADKYAnf8gNF6pYESQ3B
+        sAyaoAmr4BL0lg3XAA/6IA9OgAZDsAZhkAN8RTpqIA/M1AYq0AdgWEFBh1nPRwh5cARt0AVl0Do64wU+
+        EAB2MA84sa4cIwy2MEqBQLXecQRXUANNwIMhGh7p5K//ugRTMAV9UAAo8AVAoAjKQARf0ABKoAExEAKD
+        0ANfoAEz4AFUgAh0/xABLEAE3DAPihAJpAAIpOAtE+AE+FgL76ACI5ABD9AJoTALpfAPzQBAq3AN89ay
+        2ZAN7oAOCCACNzafN8aRbbAErJcG3OEBBMCnm8sGZNAGVxACJcA9MzAGXbsGSdAHd0AEeKAO27CuDpUN
+        b9EOu4tQahC83nEFQVACXaBtNeavaqAEjvUFZrAEM9ABcCAAhTAAwUsvOyUFbYByUeACAUAKJDADXlAC
+        3sAN8vABP2APhPAFU8CV8tAMF+ABI6AC3RAKkJAIryAN/wAMc8QKjPAJ2uki+qMO+CACfHRj7MQGBXAF
+        bSB0WmAGoqtMpAOgXvAFrFcGSwCpmIVQ2OsrwP+IDdsAteIQDM0wSp+1wz11BIAgAGJmvJsLwVWABlWg
+        AVxAL11cAyXgA0FgamqACCzQBkczC7gaH9JQCyzgBBdBBPYABLP0r54DAvegCz3QA6FACInwB6IQCplA
+        StbACYfAWy7RaLggDNfADwtAAZ1sBUD3BJbcBWlAOm2gBH3ABlaABWDBzVVgBdDYBjAgAyHwADO8bW1V
+        Bi5Zuws6gsHgXobSwiqZUlZQBPJwBV0xi2HhBFgwJWugBFpSA6TwNQzjA3UmA3XQFU1QADJwOvJABIrA
+        Cy1gx0BAAAnQCT0wA2WjBUyQAwywD/zQNJBACqVQCJVACLsQCPzjCIfgCJ//4G6rsArFmg0JYACoYAQt
+        QAVpwAY/sGdl2s0+O851+G2zWGNRoAjBUAs8UEQlRAjyegUjvBvtmg2rMA3tkIVdsARv1lps0AVTYGwL
+        qyXMBhYLPIMqEAuesANKUAUe0AdwQAhAgDNXgLVO0AROTAXPFQU1oAyfI7bWkwJhGgawAge8WgqxEAu8
+        UAmFQAsmISDLzAic0CLkYA3B8Myg0CTzYARt4AQCoM2bi86xGLQHNzr7SgYdsAjEEAAXUANXoNiTQilz
+        kAiMzK7ZMA6qkAzVwBlcOHMhOqHyAAZdIZkoAHQCUwbVkgQ2UAQxQFJpQQSEYAnGLdrZVotaUAY+wMR9
+        /xsF3P0FmSsC/QADTzAC91AJgvAIkWCxpZAMyMANr3A806AKmyDTh9AinAkM3ZQIeyAJJCAFMnABefym
+        YJHFcRp0ecwEN/ttZNAALJAER6DNUoAIAyAFadEGZjAP5YDV7FoMwBAOYPN5ws2nXpC8zciRMGCAPjAA
+        J1DX8qBqX7AsaLCfcEAFAmCABcANP1BJa5AGH1wJN0BkVpDj/rkB8cALF4AFClAK5hZZszANpTAMJ2TG
+        x5ANwlAM9404n1gAHeADu0AIuDkP3AB0r4cGZdADVPBs9CIEGTACQYdOdBUEQECdSQAEjyAJGT0lXXDV
+        jcyu1qAK4vAdYJNSz3boYf9xBWsDFliwBFiAvaPADZ0ACvMwAF/IkVfgs0igAl9QAC6gjZ0gBTVeAISQ
+        fXxQADlwAVMQBlowBPgAzQYwA+hgC7OwC4/gBwMgDZFACHwQDcdTDcBQDqbAC8UQI7XyAOpTseB44X9M
+        OkgwDICQAAmgAkIgNitJKTXQByGgCKoACt4ACXkwC0ZgQdIyB7/AyCa8DaqQDUewBLAj1j4TbWqABK/J
+        BmOgBBZGCJhQCJW+CKIwCxegFj6wBWwwA0Jg1Ez6hV0gAIrwy6MwRDOABfOkBTmQAv0ADuBwAX1QJO6h
+        DAOgDcOJGrvXDiq4CuAADC5iDZbwb5kgCX5QCrQwDTb/AAYzEAZVUGa60JNWwFfbjAahTDpUgCs7oAM2
+        UAqu4A1JEAVZ4QNgEAV3QAe1a8KrAAzM9u7CPR7+WtAGbQUhAAckoAuGMACEUAiRAAQ+0ARbwHqkU0hp
+        YAUtrkhClpzlFwmrNQMFgATt2QHdIA3AsAyFUAGVkAmvUAuSAAyPQAiSIAjDQEqqQAmmACrPUA7ZEA6+
+        qQrAIPiZoArBIA104AJEsAJNQgMeGsoMV9RHQAh64FF9qAiWMAskMH+LJAV18Ad6YA27UcLkIG9j1Ugd
+        TCXGi7xeMAM1MAUxYA+hwA3eMAtF4AUFIMRhEecdFAMCAAcRYAjcAAZk4HeQEABS/6ACPtAFTPADmLAI
+        ESAPBDADAvALTfcItvAKxjALf3A/9JAMjOsINC0Lll8MmtAMyWAJg5AIANFnFq9avxJJevRrRZs2bITA
+        QBMRDRswlmDtUvSL1KM9iqa5YOMhhhcwhbhJw7ZN5TZrwbp4KbNG5ho2NNnUvIkz5xolNdS0QdPmSggq
+        PmB4QSKvhxc2EclMfLqmQKcXA1QtQpImySJFLZAI6HHERSFENC40kCBPWqRXllTtSkaIDh9ego5NK8bJ
+        0aZLnIrFsiWpmR8/fw4CW7ZMWiFz024YeTlkHxmgaLygIARs1qhK836VyqTIAg83hXa8IKRHkLWV264F
+        21Jzpv/NnFrI5GzjRU1OJ1nKeCHTpQYLpl6uENrSMOIaLmnSrFHhwUOdPyRm5MhRhUgkUCWQ9FDWB1Kn
+        JA2+OAFF6NUrar5KlZJEAo+kZfToHUt2ixWuYtmaJUvGklJqSSQPG95Y4Y5ODEvGG1AK8MGHK5p4aQ0v
+        lCCFFFVSIaQTbgYhZZRYBOEGiBf68OONPcpJaSVnBDBDtzXUUEO3I7roQogqvLACCSSaKKIJIZsIwQcn
+        ZkDiixqKmEEFbpZqao2omkAiBizS0KIOSEJpoYwqUuiih1FIKEOKPhAhhBsZSoBDB36A6COWSGzZpRRS
+        5sFgD1rauS8WTljpRRhhbOGFlEr/fjFhhwpromGRWZqhBoMorOgJBXkEIGqFUkZxxZIBbCgqAFFWsSQR
+        DOoghIYj8JgGm2tUuuaaPlBowgo1rHBCDSUUqcGJI67I4ocQ4LAhAFBIsKHYRAohgkrhlDiijiYqa6qN
+        LgQYQIk0gushkkWUsQGKESgAAxJSJpBijS368GGKEGYJIQgjCrBllUxGmYYQQiTxg5Bp/plmlVNYOeWT
+        XHKJJRFu4AiiDDTIgJiMMuq4I5plQnEhDTbaWMOJWVFAoQdACElkggeKYIGHPCCZp49BBsFACi/mkAYa
+        bFpkRo0ylvDCC5u8cGGFHvr4IYYtzMDRCSTOUAKpJqgAJAAf/8AoQoogfPBioqbKuKIHQwb4AQs0ZnCj
+        ElEgiYSQASJIpw9Mvi4hiQK6qMmKC8YLIJNdSMnkF0JmKeECPqShJ5BegjHFFFk+ueSWWci8gAqJ0Hji
+        ih+isMOaWEDh4YkwtNCaizG8KAKIOiIpBRRuOvEDkxv6DWCQN3aIgw5hnrkZm5zZuNWmLraoow8wYmSo
+        qY23oIKmoNo4gxAbhgXCj+SaeqoMovsIwgku0AgDilAK8QYTNGcphBBEIlHEjwrAiEiL5/owBA5CRrmI
+        ml0qKCOBPWY5hp5qbgmGI1hxCVMEIxMkQAIHBtCFMDTFCz2Y1hyasQxJcIMI1GtfRGagA/8wlIIbPDhD
+        EOogCj9AwgUvqIQlTJAEPCTDZjd7xhWcYIUrXCEKcaiDH84gM4bQhAtVYIMSvuCwNaQgDBqbQgWkcAQf
+        EAIISOAYG8bgAQv94AhAIYMWhECABhTBG25rRCckoQhFLAIUeehDVrQwhDAgoQ8zmMEAIlGIAVgiAilg
+        gR9CQThvMKMXq1iFJjhxCWeEYgINEAALnhAUJRRCCm2Iwy+KQYcARAMIUQAKG8iwBi3kgHdJmMET1iAF
+        O+zCEhOIQhJWkL4T2EEavmDGzZhxBSUs4Qp9KMQjSlaEJVDIZ2t4wgxioAQ2NLCIDrBCGh5oAyOYAQk+
+        SOQTKFUGNqT/YQlWeBgabJMDCnSgEJAwBCjgwA1CYEIRnrDAA9I4BC1oYQ0NmMEFuDEKbsijFBPAI/hm
+        cR9rrKIYmggGLj4RDGnIAAICuAAZntAFblzADCXIgh6M4Y0kNAERATCCJp8gTcqoawZDmIEM6gCLX5Dg
+        DRWYABBKkYc9zAN3uMOGGmQyM0vAAQpNoOUXUFCDKfygAIjgBpPU0AUt3AMbxfDHE2oQiVA4gQ1eyEIA
+        6nCFbGohDBG5KveGUIUeQOIC/oiHPy7Alj+QEQMhCIEVhkCGMDzgAdyoRCICYI9X/EEFD5AEJF5xjGOU
+        AxebuIUsmKE5SfDAm254AhsusBQoECEJ/3pQRyB20AYePOKUWSvD6KRQgln8IKSDsMQuSDCBQZnGCGnq
+        QzBe2IsuyOQM3AADU3LSszIgoQ6l8AEKCDAFGFwgBujAxS26EYNCvIIWRvBCGpAQhE6EAAnaHAI7bdPO
+        ITDhCp2tAgP0UYAS2MMTiOADJpRhggr4wAoKRUEiFJG6aMwCl9KYhh9mMQxp/IManODEKXBxDWk0YxDe
+        IAEhrvAEDxSiCF6IgQzAoIdaTIMHbNgCLyxRiydqcgouU8RoZ1GKP8TCGy4IwC9c0LM59GERznhhTL0Q
+        Bz9AQTa/tEwXroACLOSADFWISRWsAAJwEAMdInsPQmNQgB/wIABtev8CE7Io3SGgIQ0XqIUPimAPQijC
+        EnQYQCYQ4YdWgGIes2CBczSQiO8mohaE8MQs/qYISSSCcMcIxiZMgYtsaEMYcpJEKKDgBXl0IitdCAAh
+        8GBmEzTFDDSggiIGkAQvfKEPnSBEKQoRghcIIBYBcAEUzuAFLrCBCH/oRDRsdg1sdMEM0pPNbC6DiCZo
+        8zbUqwIXcECBfUhACzFIgAoKkAhC1CAL0BxZDWKwBCxYYQxPqEIVnuCDQoCiFrEQRSpSgQo6IKIZJsbE
+        L2pRgCdk4B6lgMQ0AKQIvY5CbSvYQyH6lx/F9QIXrFAFKXhRiBM8oBMqyI4X3DAIPeghGxZIrhj/lKkB
+        RBRiAkXYgUpn4YIumIkXBZhhz3pWh0qAIhTPIPU1Th3b2cikC1SARA2Y4k5NZpELt0mBCJgwBghUtwGE
+        KIEHxJADNUChD9z4gRJggAIYwKAGNfABN0BRCUy0AhOYaMTX7FELahCiFaKoxSwO0IBkYAJtmcgEJiKR
+        jFhA4gNQIIEiEvGParQjGaaYBCecEQxgGIMXgcB5G27shR/UoQ56iIYgSoClpzzhCItIXQUE8IMklOEJ
+        KugGGJBQhjI4AQwvOYMfEkGHWJLaD0GQSUxosoYm1EAJL5FNNrO4yXZWYQ3GZoMTelKBDmhyDWnQASEK
+        QE3mVGEGQlBCDwhh/whPuMIViBAFmhJBimY8ohSp8EQlquENZBw9M8VYxShEISAu5cHN9JCGKZIRjFOs
+        whrCAEfUJfEDYKrBjaFYAQ3u0IxskEAKEZuRCxSBiUSswAsce0IMOhEFNGzvCITAPDYwAznYA3BwFWao
+        g3Qpg01agy5QAhSwgoZ4tc2TEikpOTYYASzwAixQgTWoAn5wAtsYAhwQglHgBSNAthvrpDDQgEMhBFcw
+        Olown0hwBUVQhVJwhVRoBWngBVgYhU7gBVXIhKebk4oLBULgg0SgB2E4hE04hVMQBlwQBlMqhQE4gjby
+        ARdYhDSxATtIBGEAhgBogSVIgAIYgD4gBEsghP95OAEjOAIpKIAe6IIxiAkv8DWcMIMWwh1mMIMZmREz
+        mIIasIKbAI6a2KSTyyIpuTEySAEYGAEl+Dw0QIJZ4DYyyIEMoBQ36AQnEAOIsQ2IUQJAWJaTmIZOkIGf
+        moVpiAVX0ARTWIRRuJdGkMVWWIRCkARbeIVK8INA4ANvaIdq0IRNmARKCIZeKAboIwVvmAEPQIcCmIEm
+        8gZC2INQAAZakIbRSgQ7UQRAGIBWcAVRKIVo8IZdcC4rmBErmIFfWgMkeINowLhS44IGLIkQoJHZuAmZ
+        4KYFRAMpWSMJoIIawAI1KAAiCIIQ6AErCANMrK5l8wE2+MSHYasZQAEBqID/PiCAJRiDNZCBSJAGScCE
+        V0iFRoCLXZiGZsiETRkF0MCEUSgVwxCEfwAGUzgERrgEX8AFVegFaZiHGcCCTOiGDJCAApAEYIiFQrAG
+        asgDoQMCKNgBKHCB6CmFSEgEs6kEAWgADZgBCNAAK7CCCokDPKAFmKKRJXgXN4DAzbsNm+CkBrqJfXQI
+        QKgBGFgkKCCEAJACfiCA6BqCHNgANOgCOGgC21iD9iGD53iCEaA5hXoCJyAASyiEQSiFoquFUhiGNuMG
+        SVAGcQANYAgGYXiFRAgFJawGVTCFTcgvWVgFXOgFtXkAI3CCEeAAboCE6JOGZFiGWRAAUKgAGoCJHsiD
+        /w+wgD8ohUQYhURwg1wZAzVwgiWoJSW4AgHoA2WIpVmagi+goRhwAs1jwHskg06TCZzwgm6Qh+ciA+MI
+        gR+4Ag6QB3OEmCrQgjb4gh4YTIiMiKbgHtuIiCpIgysohV14hVZIhmKwhVh4BURgSVKgA0KABGMAhlvo
+        BVHYBUEgHGnghFvQBE1ghVW4BVwIBl5IBmlIB2WQh3R4hEGQSj5ohmkIBBPAAD8oERoIgADIA0S4AVDI
+        ulk4gTXILGpig5goAyjIg1kAhVjChitoLd6Zgc2Lx3uUDe+EGJmgAmXAAg1ILCuYgpdQgjGoAQ0QTES8
+        lsCciIdZgy/AAogJgzC4sf+tCoFRKDpFCIdrOMlSaARboBNnm79S8IViGIZY+IVfoIdawC/TVAWBksLh
+        DAV+iEN2AAREKAVC8AOL8YM8KAVF+B5v4AYrg4VQoANlwIRMoIMoGAOurEMvcIIVQJF5IFIzKDYrWIKZ
+        eFLZuIlNipjbcAIf4IAqQIGY0IJFuo0qaAAfsI0q2KQRYIMsuAD7rB4f0JZg8oAl6IAcKII+GAVP6IQ+
+        UMVVeIVMiAVVaIVGCAB+4Ib+FMJXKAQ+ULds0As5G5hPkAVhaIZgMIboSAEDOAAb4IYWkIMvPEJIkEE6
+        6IRHeAVbqIQ/4IZlwYRoOAE1kKYZwCkzIAJ9wQM+sIb/m+HKGJiCgJSpnNAJRRw9NlgCAVACHOACURJW
+        djq9IRACeVCAZOs7MkACODgC0QuDJkMC3aoBkZEHboiEUWiElTSETLiFWMCEWtgFWBgGb+AHzrSGXAgG
+        WqiFZsMPR+AE0pSFW7iFU5CFYpAGeEAAD9AHc7CHWRgAGcgDP2iGULABDFAEUggEQlgFZCCF8oEDIuiD
+        9ZqGEzgCIiCBX6gAIhgAQgiFOdgDYLiZKViCGSoDNZgBYrMCLqCmhojViBiDGAgBAaiCtaoJ01PEThoC
+        AtCAvWQnYZUKH+Ck9swBLY2BKvAAGyiFV4AERUAG6XubWPAFVkQHS/gPXZjKa4AG/4RxBmCYhlCghmko
+        TYKRhWC42oESh3V4h3TIBmEIhqQEN2+wBUKwgBWwBENIhFlIBVrY3gfoGa/Bg0iohRv4g32hgxsYBDjg
+        gRbQg2XAnRqpkTKwgsRlVQ+oJRgISM9hgxlogALoBgfQJojUghRIgehag+rSAALQgg3IAC0QVjZogh5Q
+        g/q0ghr4gQvggHuoBDb1BE8YBljQhFFAh0fIBFcYhVbIhGSohWYghUigBeR1BVWIhVgoBWTwU2CAPk1w
+        UGdQBTAsBWDYBaJUBVvQBUAoBMJwBmIABWVwhVKYhkdwhUywhDzgPyRABUBIAhnoF1zQBF5AnT/AgB+4
+        gz+ohf/4hQkKTEvGG4PF3Tmg44cDmIVuSIFLzIFdrYIMWIDsGIPLHYECyIAU2IAmgxgn6IHn4p7FLAAg
+        CNesgwVRaAVLCFBYiAVgUAVn4AVYdAViiARDqBNYgAUh1IVR6GQlHN5qCKRjxAViiAVeKAZFeIQG04aC
+        MgIZ+ANrUAVRkARYCAZYoAVXCAZnkIYJcAG6mocPyAM+sIRcAAZQcIVXCIREUMNAkIZYqhEuiMfM+04p
+        0ZpnWoQAmIXHYQE0GIFAFoIZGAEhEALYvA4rEAAFcIAUcE+rChMlYAKrcrILSIRIiIRWIAVQPsleKIVW
+        SAVe9j1NwATfE4WDiIViUAVYcIb/ZJgFP5BQmHSEVQiGVTCFT9gEW5iFeXiAHuApAjCEZcAU6kgGZKAF
+        XVAGWqAFUsCEZRAQyVOEUZCEMcoEEWY7byCFadgFM/uFQrBmzftOWI3cGagBDygBgDWlAAibIpIAH3CA
+        DbCxNcqADlCGAqAABsiBIUgBd5qCGEiBfWACJCgBEoiERvC9FD46b/Q9TAiGXFAFTWiFWEgFTaCFRRAF
+        UciE1AQGZqCGP+CDUAAYSriET8BoQOoFamiB7BiCJ8gBJGkCH+iDAACHZBAEYygFYlAFYOAFzSCBFvAD
+        QqEFHpaFqvUF4B0FVigGDdGFUIglGNCZbabtTaqSJbAetWkB/xkIgFrgBqPgh1pQAQcYgTXCjtSqBX4Y
+        BXbohwxwMiqQhxmQALDLBEKIBFE4OmJAOlEYhZqmQXgjhlFg02FI6FlosyAWBgEVBD3gg3+ZBkdwBJrM
+        hWJwBk1IhgBwAAcQAibgAMQsAxqQBEJABmEQBVpoBVXIPrZLhHmoNkuQhH/2hV6wBWlYBlpYBV/Ym1gI
+        hmmoZmxwgib4JdpLNTa4AkW4gjYogvKxgd0GgyCoBW/4W0uoJ0RIALWaAV0IBkvwhnWIFRQQAzHIAl6w
+        hwBQhp5VBKIbhWGY62HwhGUABmD4PlWYa2lT69glhVoABmFQw1bmhUQwCHpoB2C4hJnMUP9bUIViSG4F
+        YIEYOIAvMEM92JQB9wRB4INZIAVNKIZmkAbrTgRp5mVfWAVVWIZXmBNosIZd6IVnwAUpjKlrqoklnQ0n
+        uAACcIInIIBHCIUbKAZEiAIv8IFSkAZLKAADOIdhKIQEGIEhaIEBaQZruIRcgAfncANLqIT0ecxB8IRG
+        2JCVTIWsiwRnqARY8L09R4VOAIVY5gwB0YWSKtuEEIRAaIc4uwRWiEJfKMoWhnJmSAZh6AVgeA9SiIXV
+        TIQ/4BtWuAVuP22COQVN8IXT7uVkwAtNUE1ocLdgsOYLkSkdpUDm7BkdrexC+AOTYAExaIBBkYYOwAEH
+        QAB/QAACSID/HsiEdUiGa6hadSgBMJCvPzAINGuESlgGYgBhdBiFQhBvSNAFQ5AGVagLwjCEZqiFUaAF
+        8klGBXACKpADPyCcdtCEvfgEXGj3YXjaQtgFeV8Fc78FVygGTCAGayCFVxCFWCBhYWAFW1i7iHYGTLgF
+        Db0FZwguYUAGXshoZEgGWyiGmJoRJ6DAHl2CGRBTNpgCfpiBL4CEyQuAIhgGj06GHyhgEeD7DEAAFECH
+        WbCEYrCGbn8EYMBupJPFmoY6Z5iFTgWGRrDpR6CvaZhrWuCGcP4DYBgFUIgEWJCGCIAADgiDLtADP9X5
+        TXCEgjl3UvADSQgAbtCF1xkFHhYGXUKH/2II+IBPhBsggUIoBFKYhU4ohD5vYV0w81tQheIXBG8ABnBY
+        N7M/vYy8CTVYgowdzO/gACYYgiWoAW7gBnFLUTVsgAUQgQXAgQJ2AGRIgAYwh1IoBldAupW8bkjoYE/A
+        hFRAYbW+F12ISm8ACG/JSu1SxE0UolKSgCmKNiqUEyY5qni5I+hYLVWbHK3q1UtYgBvc8qjogKTICRKE
+        LMUitAxYIW6JIM0acIJGkRrd/BAiRUjSH2lCecFyVQsUN26xMnmThk3NmjJsrKhho2bJmDVr2Gj14WQI
+        GTIpylhR8kVdL2vSLKWjsGFDFSspHETzwICCglncIFUiBMlns1qEBv8t8iQq2ShCw2YhghRp1iBXihSR
+        ChVNEQkV92K1BMViiBYtXfB4o1YsmMZVwJgFQ0RIkbQHT9KQ6VJHkZ9SjTJlm/cAzqBQoGaFkOIlSh9R
+        pCpVmpVJGilSiWYREyTITyVXr5A9japVyRIrWtmQYcPmyhQ2aMKCZoIDxz1ouFq4ISQhRQoJGnIg2FWD
+        AwMbMHAPP7pgkskorvg0GSKKlFJLDywowcIFhBCCCCiQLNKKKLrMokgeByhgTzK1JJOOFWFogYQev/zT
+        jCmrmOLLNdbEYhAJkIByxBNjPDEFKZAMw0001pAghRvcFOEDILUA8gASOizCkyR9uKLJjYLsQYr/JYTw
+        MUsikjjTnRfmKQGCeVxtZUUNa6ChHhparDfEBvyccosLUUjCTwpvibABCKTAwIQDOeTAgAMEkBJNAPz4
+        EIA0s+QBiSeIADFDGvDFUosloBRSCCmNKDLIMIRI00kt1jzYTARTBaEHNYG0UwwrmnTUSymlkJCEAIT0
+        YAUaaHghAyl+/EGLkTwg8oMXT3QRAzqxBOBCC7uQAoogiSyTCSl8SFJJKLS8UgodfPByDVRrXKWGFVhU
+        sRUaXfhQFRtahBHselqk4E8xvhhQBiCFWLEBfhR0IwEOQxg6xBA4xGBhARzMwI8klvwxkg0h+FBDBwFE
+        UsoslujyQA+qhALJ/yCGCEcEOtaSIskELqwgyC/L7EJNRo7YYkkhA/SARDezFMKCGFqo6wYkecxizTw2
+        wHEEV2l4oYMPBQhAgq72DNPCAIrckkklfyTyhy7SCVIINmN4sS4bbYQXxhpe+DAFaOSRsV4OczKRzzf4
+        LECAJFAoPBcBDKuIn8I+JDZNAyN0o8gohdjwBQpUPBAAN4Q0MgwgBRTxxAy6+NDAA4QAkg4QD0TziDQg
+        j/2HQIfcQs00MRJTiwtNePEDKdJUYEVYM7hQx8XWJBJAEWx4gQQLPvTAjwsyFDJIHqC8w08RRCBCDCKz
+        /CHJKNwoIohTaqjhRBlbqbdEGW004UOZcb6Jxv8YwJs3hAgivHfFIxcwofAoEICDMJCBCSJIwRC4UINo
+        jG4JLOBGKVChiAi4KS5K8AE3XDMPommBBRWogQSQIAADjCAGPQCGMB7xB0sARRHtmIYjNnGLWkxDFauI
+        BQl0YIQAjIIUtfjBGrSgBDjIIA+ECEYijICEI4QgAIWAAxAKQQgbvEAUtJBEKZqRAC/EoQ88EUUmamGs
+        QiQCG0rAQlTSxIYxKMEMP+hCG8yDhjWQgQtkiOObyCCCAKHBCYqQhxVygAJP5IAJZAjDvbSQBjX0oQRu
+        GUEfStGHTxXAC4YTAxmaMAUCKEMAJZABInrwgxFwABAcCINVvlCJUiTjEYT/uFg72qGJU+TCF8BoBmqk
+        YQFuWGIUlrCEPVxghS70oQ96kISRvOAFOJTiFYlgQRcmMAtCYKATrhgFKOAAAySsAQlUgINrQuENDPgh
+        GthwgprUZ54aEOINV1AjGqrABTXebQbKEEIYkNAHUmDABoqAgIpUxAQ0hCENW+hBDhaQghEUQBQ8EcAR
+        8NUGNLQhDW0oAxIeILRhCMAGF4iBPEaQA0RWoQM9KMUjWvKLQNBjFZuQBS5ukQxixKJihEjGK4BhDUI0
+        QwVS6AM37DCLbLSgDBUKRiwKgZMBjKISgRBfJkBRghJAgQ1l8MIRdtACbsxCS7pgBlTStxX1gYEQ3GjC
+        /0TbRh45qsc8ORBCBsKghh7EhBRUwIGc7nVIYfVgCmGwwghwYIUmHAEGRXDCE9iwhAQkYApOSAMTxDCG
+        I1DBENwARSdAUQEpkFQLTMCCMniBjGKAgh7tUMUhGCGLUxTDFqUQBCFoUYxM8OJB3EDCF+DgBzxYYhou
+        aEMRFMGK25VAHp/CxDQiUYlEIOMYpeCGC6DQBSRk4QUfwEQpgvIUNa21DUfIQx76sIU4qrGt5TFPGPDz
+        hDKEYBBALQETmKCiOJFBDGYQwAys8AM1ILKgYrAC/L5QgG16oAc1SIFnxeCFAsABFH1ABCBqoIQyPCFY
+        WqhBMkAxjF8cwxqpcAQjLv9BS1yUYh6/mIUzVLEMUnDjAsP0whT0kIxpJCENZhgGLTrxgCt0IhGIwIQN
+        k0EEfhDiF8EARiJIgIdH+OEGpWDFMmqBjRaoYQxc2EobtlAAM1BFCWpoA3mDBSc1aoEMZcgCBH3QhUAa
+        Mlj3IuYWxJCDBlhBvha+1xXUrEkjEKEQHEhDQasAgzLAIBK1+MADJDHVuRVBHsmwxC/acQxTUGITm+BE
+        MHAhC174pBKZCEYxptGCQIohDU+YQzNCAbUnhEAGTvACFvKQiOduJwIj6AIqLOGNRSjDEqWIBhwgWIpR
+        2OIaAzADWbAwhiv0AY5xLEuaxNzWN7GBC0tQQg1qEID/WUihovG9V7B2VwM2hGGgEikoZBXZACKwAFS7
+        mIANsIBJNHgABUxgwS5swQ06cOMNfggADGoggNxEIxDL0IQpEr4JVtxCFoQohChiAQtiSEMSF9CCwuaJ
+        6nl04U01+IF5rACIPlTAG7OggwqGgIQIZCIULiiBo6DQgRAA4hGCQMY16hCC8XihB18YTxnYOYX2sSEN
+        FDWP0a0NAiFU4QluAIQayhxfOVF0C5JoQtHslYMRABrQcprBAAKQhwGQgt8zYEIa2EAAGLTBB8nIxKd4
+        AgQk0AYJK+AJPSy9Clbg4hSm4Lsl8nA2XhhkHi6OSxgq0gwSdDwMM1CqGpBAhA/A/6ETHyhECSbmKVLM
+        AwlW8LwVZgCEQSQiGtuwDRjahh7zzLMN7foCFsAs7TfFEcwDXUMPAIGEu8nXAVqwbx+ywIYhxBc/aRCD
+        hdGQBi4U4Chjh8MXhJCDIYTBByUIQg2KMMlCzEISK6gwRcHwB2okwxmr0ASoccFwVQzABcEGgjx0UYgf
+        zIAMVYhXHpphAvWA+QoCGAAQKIJZEUIEFIAN/Eb2LBcJyIAPmEQL+EExCAU2rIEZSEIWdMHPcVfbxBEW
+        cEFardW0DcEatIEXyIM8eEFoTMQaSA03PEAbhAGd7AMmcB0ikYGcaAEXNIEAeIMPzEDRSV8aIEEncEMB
+        wJE+yf8AFPRANOjAvayBHPxCLZiCK1iDahCDLfTCKjgDCbhABZSAF4zB+xDCD5RBnJhBKDTDCRQdF8Te
+        EfSBPKBCAbwBdPWAH9RCEHiBC4yCKvxCInzAB8jajAlCM1xD+5iB2CFBG6hTmlzUEpgHHqlRGoAFGkhB
+        IRTAE9xNFVRBGtjGuNVLBowAOJhDQSGS0a3HenTBFPTAFRzB+fwAGAiAMhQBf4WBGDRABTjBERRAHvgA
+        FkCBHnhDFCLcKqxCM4ADLvRCUkWDDZRAESZWCRRCADTAGsRBISTDCdwNWbyJsxiHD7gBDfiBKCRCC3QB
+        FPjBKtyOIPhEMaiCWmTCNkBFzxH/AhiUifqQV9vUT9qNGbXBjdvMQgGMwAhk4hggQQ/Aj9GFgRDcgzUg
+        AKANgfLhy92A2QzUQAH4gA/IQw+EgBKIwRN4VhgEwSPYwxNUwQ8kwgpMwEUAwyaoAivIwiasQjIIg6oU
+        AijYgDKUgqutwRg4Qc21gAxIgjDYgBrcTR6hUhyxAAsQASEowyx4wxfsQB5UQi1I0TTMgjGYCC2Awzuy
+        QRYEQRQEgBt4gT2qketZQSLKCf/p1RqgADCcARlMBBpcgR8EAZyIRT4wgzngTbC0gUM6AT8AARV0gUXR
+        kRaAIQwAS7lJARRwQzCEAgtkwAz8QB7sQShUAytQgiwIQy+w/8JLAoPrEMIEzEAHxMAUNAAWqMEF+MQe
+        lINmaQAd2ZFOksEabIEN+JsrOAcwAEEScMMqWAIkwMKn0IIzNANPvaMhdgEbyEsebAFywlPbYAWYOWK9
+        mGIREMIRpMEadAEVFEIWlEkOkEEa+MMzOAOmyM96oFINtMQrFEAZdJ3yeYAPjEGcWIEueEMe7MIskABA
+        FgE3hMIvxMIhmIIsBIMwJEMxmIIteI8UeYYmkoEVLIEKXEEIeBE40MEOVAHTmVlYcIEhqgIi0MEiDMAA
+        cAMcSAERVMIyCAIv8MEehMwshEIyXAOboJN5rEEW+EEngIGzTRSYkcESuImbtE1YtE0WnP9gF/yAF7FA
+        RcVJGozANwADFqRBKeILGqgBIIzCKCCEEgAaG5TaRJaiEiRVBJRCMdRCAYgBEtyBJCxDgJ4CK/QCMPzC
+        OiSDK+wC933MADhBE8hnRa2BFYBBIQDDPLgAVwgBB1iBVHABFHSCJgQADSRBor0BEnCBbSzXLMQCNZQC
+        L0hDNMRoD8TAeHAFG5hBH+RBBQRBF4wgj47BErTBHQ1p28hNABhBHRTCz0wUGlAfB5iDMBhAHSFSsBid
+        GGBBCCBCH3glFqjAVCjBGqhADahBFTieIthDB6ACLxTDbbHAHlDDKhxCpjFcMSSDPbiDL7yCJAgAHABC
+        CawBFlwiUbb/gRkkAjBAAjf4gBIgwRgMAQeggBp0gRtUAihIwRLIgw8oa9vEgSUMgB7EFi1MQyyQQjZc
+        Q5toBbVlpwAAARRkgShdgRlUhes5QUVdVSKqQRYITRAgwRa4gatqgaEaADgwAwG0DcOIWbAuWxGwQIq0
+        QR/oaABEACIUQQcQlBUcVhgYgCTwAigkARAExSaYAjNcQzDcgjAUA/mtQve4QBkIpvKFQRUQJRrMgVD8
+        Qc9QQcBdWwHMwBr4gF5owGCdJheYBBTMAqL5AR9YQi2gAyZswzWkKlTMk7qAgQ0UwKtJQQsAAQBOQRCA
+        QQ9QwRVcwRdMwRd8Ux9EAZjJzRXYkQKg/0MyWIM/oF1/4UsppsESWKQmtoESCID0+IElFMESTF8hhUEO
+        OAAcmIoF6IE0UMMmFEM5ZIM6MAMzbEoz2AIi/MEPIAEBhUVo4AsXzEEyJEIJOAEcPIAXPCgVXIABFEEF
+        0MEE2IPaXNURdMIWQAEhrMAPKIMMMBMpiILedkEXmIGEzRE7/UANTAEKJAAikGgFLKMN/IFZDcAUbMER
+        6AAcoAL7WsEYqAAc8FcK7IMz9MNfSV+9GB1tEGUaWEG0NuEkTdI8VoGyEVScjAAzWcwsJAMwAAMuAMM0
+        6EM8WIONCIMAggIoFEGwkAH15ZHU3EEzzMMRVEEXCAARiGUTdAEW/P8AJCjCi/LDESwJEBRBF9AAIcwd
+        jxyAK0kDC/dBN4BBDTRi2k7BVlyVGjSBE7QL+3TBFQSBKq5ZL85CDZRB+oAZFRQBnTBAP+RAG2jAIpTB
+        3RRUsAZLqYVuGyBBCZQVIqKBu4CbGMzASZFCJDRDMphCMchCmfIDA+yDNRRDLGACKQABHGDeDKDBBjik
+        etgYKNRCC4xkGswAIKSeGswRjClCc4wyN/yCEmGBDVjCCkzvGCRABdguM1iDGbCv+nTBHZJXj6pqHMnm
+        VIxB7R0BIJjBkrZNGfQAB4hABkSrwlTYlN6LHk+pBKPBF7iAQcYTPnEBIqUADPgBJESDNKhCMDj/Ayfk
+        AjAMgAeIgDkAAyyMgjQkQQdIxxUYHVGGRhzQUBKgARfc3xF4EpxwgRckQQtgECYk7I5hbylMALTCpxHg
+        wTpYA7qwrxdsBceOlXnI01hSxZtgwQYGwQ8k4nl53A8YSnr9D0UFKy1SKaA9JKBFcyLUwAsSEApoIhqI
+        wQggQR0kQiiQwiH0wjQ8gikkQzRAQRgowDuUwjAUggusQQxYQgvU5d2wAfPSgRRwQTyFhQp0QhF4ARcw
+        ABZEgRR0ARDEAiioQBZYjR9UBgt4wQUMgBzsQYxmg/lUgVTIC1TUKBmMQexZFEURsxWYJRIsyw4EQfuI
+        2RVwwxHgqnoQkPJJ/ykfby24Bas+ucLcKUEBIMESLIG9QNYRBMAveIMwUMIqiAM1KIItTAMcgA4gYAcd
+        hMIFHEEN1EIJiIFlb2IdZMMKkNsYTARZNEGOKoECAEIpAIIUYJs8NAAZSN4sPEQhhMAApCgfZAMzkIP5
+        BPYPXEEcjUd5vMv8pF1FgZlfGwEgAMFcRidFrcEUqOxESbC9BKuUdp3X5rcZVMIrcEMFhMAjXEEZfEEp
+        hoER+MEvJMMmUMIpWAM/TACxSUIL/MAr9IWHsMAc9UAi6IDRHawkTEMc0EbXagF5eAEIAIMMWMFJRUMD
+        5IAXdAEKLAGMPcIyfEARgAIvyFQisDA5UMVWyP+L+mgFkRd00eHRHH14E0CCEcSBALgByIpZHAXBeGH2
+        QYaule+x8rUBGERCIeRBAUhBE6hBBd8LmupBIjC4I/BdMkDAGADBp3kDU1mCHsxCJ3QymgJCJ0RBGsDA
+        GchBMnTeh9vg/HRBDfSAEyABFBgBOijBu1zUGjQBi0XBEZSk3RLD05LDlVlFCCCnOoF0FbTNQ4JuG1wB
+        IZTAFpTJl4UyRcmL1oKunKgBCrSnlk/pFwjAGZG5GJSaFTwWV5NPg8sQMLxDBoigDGRCJhACHLjBAJTC
+        jsiJGDjBLADCEViBEeSfDLiqDVabSd+REIKCDnQBGQiBFTwBFsDAUIqvDHj/QQ0kQDpIAx9IQzGQwziY
+        T6lTQY2C9HjYkRzFkdG1gRrIgxGEAKouaX4HqxlQQUV9eNpFex+oAfLVNPIFqxNsqW8TVKApAxScwLFE
+        4UcEQzbEwwbEFxIEgCZwAw2wgVBbQgyUYhsQgSKEwg4wL421AdUNNgdcGQYKACl4QycYwXqsAQTMixeE
+        gCWwQBGsQzOoxR64wzXQe/10QQjQy1gRuVaEheyR+hXUwA70gSXIgKqOWXr7gBl089GpACLAkQd3s9Ed
+        ppTetxhEhQ/QwR5gginASC9oQywIwzvs0QhEdiSAAhIoHwvkQQh0ZNGZwcPpgYyBAlqFBUEHURVkQQAc
+        /4EUEMBK8IO466QPRoE/PkEMAMOR/cIfAMM1jIM4VIEZgIF4i+qQT4V4gGeS86gZkHU5KkIhdJvyFV0p
+        ioG8FN1lv8kXEAIK7DSWE7QS7LSbiYFZlIAfSMM7N4MNlTAwuMM6oIPQ2ACoJAHy5aBnMIGzuIAf6AIh
+        gMI0fMCL1+VWkEERPEDsdUE3hAIUdC0dkQEW+AAhfE4NDAAtuILYOANAZBsnTg0YH13YrGGTcE1DNmXK
+        sKmChg2ZhWjQoOhWxguQUrbOtGGTZuRFLWyuXGmDxmIbNU1CzDqShiYammw81JiRJoxNNGHCkEHy5k8z
+        SsGELftUq1msXsCWGZiBxf+IJRtltKBZg8rejCs9/BDSE2DZsSRcOOSw2aaJDx8PwDRZ6IFWCS9rtJBp
+        Q8NSIShrLjxIB8gPKWbkBirJc2WhQoaPF1Zhg6YKGZtdAJlxWeBECBVjVqbhIqTNSjFqejhJY3NMDScx
+        ABWA0WY1zzRH/HQBGiZrzzQ0BCXTdOrar0SssmFYZslevgVDmCDpU8tIGjJhCCSiY2kAjRB6/gCjg2T1
+        CCtgHgAqJI8QoR9e1HhB0QlJm6xl4Fia8Jafgn0H8NjFGsTEAeMNLyBzSCE1sGgjh4QWamONOqYozYsl
+        4FtjiTVKI4OM1TBq44waaEtDiRrU0ACLNZRAoQwQ25j/YhYpQOypjS9swEMVSjjpRRt78sjklgEOsOSe
+        DfBJYQgygvCDGzNWm4KQRCTBAIkr9CCkFmlaoK2NC2Lh5oy7nvhiFh8S6qKPHxTqgohBImiiiGhqcMCB
+        OOgghhxyBJIjCwgBXQOLLlxasTKG2sjCEitKY6O00sbY8NHS0ihtjSC6WE2NBFDA4qYCetBBQjD6IEWG
+        JjBCQ4s0iOBjFkpWwQWXbOApQRJNpKEBkQJyYEJJiszooQLdSiBkFEkkecEMPbKhY5ZOjrDJiEda8KKN
+        I2IAYpACrFDIiVmM8IKHUjqRYgwrEHCAgirmCKUYxAbiJg4IFdLqWjfAUIkNIdSQ/3CNJAqhIkKKFlKj
+        C1KPGEMNhdvgwlEz3HC0Q+toyiIWQGSgwYbCBgDjidrK+EAQVYIRp5dTeoEngwl2uWWCCzpxwteeuGiD
+        CEKAmKGOXSzhxRI98OBmGgssmIUEHXRQpgIPhmAhHUIUiYUIIThAwgtUAjBhkFlYQKMLCRgIO4o3FBkw
+        G3LEsWELkRZqmw0z/KgDITasAM0LIrgRgAdCuVhDjSWscKKOAAppQg01rFADDSsYP4ObJkpL1aY0WCgl
+        kl0GiMCPR4xow7c1TPCjlGCasUcdWazJBwcdBnBEmhJ6qIEJJrQACokA7iAkAh94ISYTYpThoxlBEilk
+        Ozq4Kf+GhC6q6KaUf14p5UA0OFDhBUIemYWGh8pgwAF8GGABj2W2gVccN8xwiGCXYDAjCC8wqqIhN0qp
+        hBtQGlyjjIZKM+N+OMoQOUc1pgk2OIITuDC51bABDISohCX01oNM2QR0v3DEKoohDn+4QxjCgEcKmPCC
+        0ZngHsuAQK9sIh0eBKEQESjFKjJhiSk14xftIcQsSrGLTCTDBV4gwC7ygAlgzIMFXnBCBeiQCWCcwAtk
+        qIIVGLAAc3QgDnoYEIHC0S2HuE1iTkDIGqxQhi5wIxZ0cBKhLDIwJWTBDFOIAYdGQhGaxAgMXdgf40Kz
+        Bh8QAQ4FGAH8LOMFE/zBEZwARjD/1tGBfbAjGODgAA6sQIJVTGMChehBDoZgBSw0qQVE8AMJClEMYkjD
+        GzQsxA+gMIMLKIMUlkjGBNSAhCz0oRSlSAQGgICB9rgyAl6wQhVyEEUKsMAOidjGQMQhjmrcZQ1eiEhj
+        GuM3NThBCWswAyHc4IYzQEEJXCwYh9pgBSWshCJsS0MX6uAFklgBBliI4wVYcIExeGAiaPACBn6xiUNY
+        gxqZsMYBcDCCWFijAUNIAQ8iYQo6dMINToyJHwYhiTq4IA+CsEQikJGIZoCiWk8QwxBqMItazKIQD/CC
+        F+ZACF7wghC1JMUHeFCHRLxgDcBcAAPIYIY9SCMbyQxHONrR/4WTNoSoHFFCE7qghoZYIQqdqAF8oNk2
+        trmtDViwglSlSgUqrCQMbFDDDDCEty+0gQwjeEIULEAIfcqCGvMY3QRyUAV+MIMf+RhBF0jgiGV4AxBI
+        eEIQBnFDIkhBCn2QBDfykIhlRIMOEXiAD3QyBCMMIiyzEEABAuAHYqhiF9KwZbXeYAlBfAAJKcCHP7zg
+        gj1YYyA/bccxknoXZyokcU5g5v6K0INuWCshWgkgoCCzEMCJhCQsaYMXgqCQnqBhDE4oQiFq4U6KuOAG
+        paAEK07BDGnwYxa44MYYxmAAYEwjAVoYwgsMYYoalsBrRahDIZJQBETkoRB6uMMfjOGN6v8OghrTEMAT
+        9PiIw3YiGbGAhCpmoYtalOIRJ6DBH2JRjLY6wXtS0AMotuHTY7SDHkk9XHycUIb4KKgMSehEN5DABi5w
+        AQtLKAMXwPvMNThsDVppyBLU4M00ZKEJxUWDGLxQh0jkKg1eOAEfrJsLpDCjHPrghiZAcQQyPKEbwajF
+        BTLwhA+sYh0kgIMXqtCGGHCjBCpQAhHAMIs/SCOjhChEIUgRilrQQAxI6EGykLCFCZSCFn/QBSxWsQwS
+        YEARrgCGM5ZBh7vSYA/LQFs4qtGOQNAjDmowwxac6WGHQAQKgCjFX/S3BoUtZMUyJipRvaqCernNClfR
+        ihaqQIM8RGL/GidIAgb8YItg5CIWybCGNeLBgBJgIhkskAwMhAGMaORADDrogTO8UQgjoKENS3gfRjjS
+        wHIUAnvzCEUnQsE1jByBFDYoQg4uEAlYlEISs6AFKOggCVcUAxwC8obV5PCHcogD0hymBz2YaAYPHy4L
+        W0DcvwphifedWpoDdJtjtki3blIkjWyoAxxyrIUSPKIUU+JDIBQxCVyoQhjTkEQyshEPCsyAG6voSho6
+        UIpm8EMCHvDCBKyRjEjYAH5reMASQFTkmxVjS9woRCikEQIEaWEGYEjGAGbgBEQ84qIkaAEPJvCIaQCj
+        FJagxgHUEAU8SGMckebwpAMhgDN40WBC/wUDKGyQhSRwgxADcEIz8d7M9CWoYCe9wlXZsIQlRMZhbTDD
+        NKAgoR+0RxCFSEQxKCEMaqzCGhNogDLWkY8MpOADrshGByhXCGtsFxEVmEABgJGIWiS+DF5M1Ui8AAaZ
+        R0MQ0ljGk8jKBSt0oQe1aEEVCJAMS0TjBDxwwyPcYIQKgMISobDtC/bgDrNPmh6TrsADlLCwpJpBBoXI
+        wwm4IQ8enEENHBmqGnQABjMwBOJvC8IcBiAFojbBCQvJgQTIsAYwAMGOLQgLIVzBFByhF0DBAjKhF06A
+        CSCAFNhhBMLABUpBFSZACoKAEGJBGB4BEBogPrrhacCADbSACSojVTsqxQtkgBaIQYYEgAbaYH+eYAye
+        oAkAQRpcQDp4ARgegRtm4QWkoAsewB4KgRuSQAqKSRyq79+QkB4CAgA7
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Keys.cs b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Keys.cs
new file mode 100644
index 00000000..44ef3d38
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Keys.cs
@@ -0,0 +1,38 @@
+#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
+
+namespace Spring.IocQuickStart.AppContext
+{
+	/// <summary>
+	/// Contain keys for localization
+	/// </summary>
+	public class Keys
+	{
+        public static string HELLO_MESSAGE = "HelloMessage";
+
+        public static string FEMALE_GREETING = "FemaleGreeting";
+
+        public static string BUBBLECHAMBER = "bubblechamber";
+            
+		public Keys()
+		{
+		}
+	}
+}
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/MyResource.es.resx b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/MyResource.es.resx
new file mode 100644
index 00000000..08a6686b
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/MyResource.es.resx
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" />
+                            <xsd:attribute name="type" type="xsd:string" />
+                            <xsd:attribute name="mimetype" type="xsd:string" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="ResMimeType">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="Version">
+        <value>1.0.0.0</value>
+    </resheader>
+    <resheader name="Reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="Writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="HelloMessage">
+        <value>Hola {0} {1}</value>
+    </data>
+    <data name="FemaleGreeting">
+        <value>Senora</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/MyResource.resx b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/MyResource.resx
new file mode 100644
index 00000000..4ca5b295
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/MyResource.resx
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" />
+                            <xsd:attribute name="type" type="xsd:string" />
+                            <xsd:attribute name="mimetype" type="xsd:string" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="ResMimeType">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="Version">
+        <value>1.0.0.0</value>
+    </resheader>
+    <resheader name="Reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="Writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="HelloMessage">
+        <value>Hello {0} {1}</value>
+    </data>
+    <data name="FemaleGreeting">
+        <value>Mrs.</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Person.cs b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Person.cs
new file mode 100644
index 00000000..dc095987
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Person.cs
@@ -0,0 +1,58 @@
+#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
+
+namespace Spring.IocQuickStart.AppContext
+{
+	/// <summary>
+	/// Summary description for Person.
+	/// </summary>
+	public class Person
+	{
+        private int age;
+        private string name;
+        
+        /// <summary>
+        /// Property Name (string)
+        /// </summary>
+        public string Name
+        {
+            get { return this.name; }
+            set { this.name = value; }
+        }
+        
+        /// <summary>
+        /// Property Age (int)
+        /// </summary>
+        public int Age
+        {
+            get { return this.age; }
+            set { this.age = value; }
+        }
+
+        public Person()
+        {
+        }
+
+        public override string ToString()
+        {
+            return "Person = [Name=" + Name + ", Age="+ Age + "]";
+        }
+	}
+}
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Person.resx b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Person.resx
new file mode 100644
index 00000000..d9784e16
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Person.resx
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" />
+                            <xsd:attribute name="type" type="xsd:string" />
+                            <xsd:attribute name="mimetype" type="xsd:string" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="ResMimeType">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="Version">
+        <value>1.0.0.0</value>
+    </resheader>
+    <resheader name="Reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="Writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="person.Name">
+        <value>John</value>
+    </data>
+    <data name="person.Age" type="System.Int32, mscorlib">
+        <value>35</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Program.cs b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Program.cs
new file mode 100644
index 00000000..cd7e490e
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/Program.cs
@@ -0,0 +1,136 @@
+#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
+
+#region Imports
+
+using System;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+
+using Spring.Context;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.IocQuickStart.AppContext
+{
+    /// <summary>
+    /// Sample application showing use of IApplicationContext
+    /// </summary>
+    internal class MainApp
+    {
+        private static ResourcesDisplayForm form;
+
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        private static void Main()
+        {
+            try
+            {
+                IApplicationContext ctx = ContextRegistry.GetContext();                   
+                form = new ResourcesDisplayForm();
+
+                DemoMessageLocalization(ctx);
+                DemoImageResource(ctx);
+                Application.Run(form);
+            }
+            catch (Exception e)
+            {
+                write(e.Message);
+                write(e.StackTrace);
+                if (e.InnerException != null)
+                {
+                    write(e.InnerException.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Retrieve the image from the application context.
+        /// </summary>
+        /// <param name="ctx">An instance of the Spring application context</param>
+        public static void DemoImageResource(IApplicationContext ctx)
+        {
+            Image image = ctx.GetResourceObject(Keys.BUBBLECHAMBER) as Image;
+            write("------------");
+            write("Loaded image");
+            write("Width = " + image.Size.Width + ", Height = " + image.Size.Height);
+
+            form.Image = image;
+        }
+
+        /// <summary>
+        /// Retrieve various localized messages from the application context.
+        /// </summary>
+        /// <param name="ctx"></param>
+        public static void DemoMessageLocalization(IApplicationContext ctx)
+        {
+            CultureInfo spanishCultureInfo = new CultureInfo("es");
+
+            write("----------------------------------");
+            write("Resolve message key 'HelloMessage'");
+            write("----------------------------------");
+            string msg = ctx.GetMessage(Keys.HELLO_MESSAGE,
+                                        CultureInfo.CurrentCulture,
+                                        "Mr.", "Anderson");
+
+            write("Current culture resolved message = " + msg);
+
+            string esMsg = ctx.GetMessage(Keys.HELLO_MESSAGE,
+                                          spanishCultureInfo,
+                                          "Mr.", "Anderson");
+            write("Spanish culture resolved message = " + esMsg);
+
+
+            write("--------------------------------------------------------------------------");
+            write("Now using message argument that itself implements IMessageSourceResolvable");
+            write("--------------------------------------------------------------------------");
+
+            string[] codes = {Keys.FEMALE_GREETING};
+            DefaultMessageSourceResolvable dmr = new DefaultMessageSourceResolvable(codes, null);
+
+            msg = ctx.GetMessage(Keys.HELLO_MESSAGE,
+                                 CultureInfo.CurrentCulture,
+                                 dmr, "Anderson");
+            write("Current culture resolved message = " + msg);
+
+            esMsg = ctx.GetMessage(Keys.HELLO_MESSAGE,
+                                   spanishCultureInfo,
+                                   dmr, "Anderson");
+            write("Spanish culture resolved message = " + esMsg);
+
+            Person p = new Person();
+            write("------------------------");
+            write("Appling Person resources");
+            write("------------------------");
+            ctx.ApplyResources(p, "person", CultureInfo.CurrentUICulture);
+            write(p.ToString());
+        }
+
+        public static void write(string text)
+        {
+            Console.WriteLine(text);
+            form.AppendText(text + "\n");
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/ResourcesDisplayForm.cs b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/ResourcesDisplayForm.cs
new file mode 100644
index 00000000..ea90f4c9
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/ResourcesDisplayForm.cs
@@ -0,0 +1,128 @@
+#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
+
+#region Imports
+
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+#endregion
+
+namespace Spring.IocQuickStart.AppContext
+{
+	/// <summary>
+	/// Summary description for ShowImageForm.
+	/// </summary>
+	public class ResourcesDisplayForm : Form
+	{
+        private PictureBox pictureBox1;
+        private RichTextBox richTextBox1;
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private Container components = null;
+
+        /// <summary>
+        /// Property Image (Image)
+        /// </summary>
+        public Image Image
+        {
+            set
+            {
+                this.pictureBox1.Image = value;
+            }
+        }
+
+        public void AppendText(string text)
+        {
+            richTextBox1.AppendText(text);
+        }
+        
+		public ResourcesDisplayForm()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+       
+
+			//
+			// TODO: Add any constructor code after InitializeComponent call
+			//
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#region Windows Form Designer generated code
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+            this.SuspendLayout();
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Location = new System.Drawing.Point(208, 328);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(146, 119);
+            this.pictureBox1.TabIndex = 0;
+            this.pictureBox1.TabStop = false;
+            // 
+            // richTextBox1
+            // 
+            this.richTextBox1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
+            this.richTextBox1.Location = new System.Drawing.Point(16, 16);
+            this.richTextBox1.Name = "richTextBox1";
+            this.richTextBox1.Size = new System.Drawing.Size(536, 288);
+            this.richTextBox1.TabIndex = 1;
+            this.richTextBox1.Text = "";
+            // 
+            // ResourcesDisplayForm
+            // 
+            this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+            this.ClientSize = new System.Drawing.Size(568, 470);
+            this.Controls.Add(this.richTextBox1);
+            this.Controls.Add(this.pictureBox1);
+            this.Name = "ResourcesDisplayForm";
+            this.Text = "ResourcesDisplayForm";
+            this.ResumeLayout(false);
+
+        }
+		#endregion
+	}
+}
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/ResourcesDisplayForm.resx b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/ResourcesDisplayForm.resx
new file mode 100644
index 00000000..90b59526
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/AppContext/ResourcesDisplayForm.resx
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="pictureBox1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="pictureBox1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="pictureBox1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="richTextBox1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="richTextBox1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="richTextBox1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>(Default)</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Name">
+    <value>ResourcesDisplayForm</value>
+  </data>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>80</value>
+  </data>
+  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2003.csproj b/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2003.csproj
new file mode 100644
index 00000000..f671c81a
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2003.csproj
@@ -0,0 +1,151 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{880EA873-E951-465A-AC5B-BA899A2C744E}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.IocQuickStart.AppContext"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "WinExe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.IocQuickStart"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "System.Windows.Forms"
+                    AssemblyName = "System.Windows.Forms"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "AppContext\Images.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "AppContext\Keys.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AppContext\MyResource.es.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "AppContext\MyResource.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "AppContext\Person.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AppContext\Person.resx"
+                    DependentUpon = "Person.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "AppContext\Program.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AppContext\ResourcesDisplayForm.cs"
+                    SubType = "Form"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AppContext\ResourcesDisplayForm.resx"
+                    DependentUpon = "ResourcesDisplayForm.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2005.csproj b/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2005.csproj
new file mode 100644
index 00000000..a77ff771
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.AppContext/src/Spring.IocQuickStart.AppContext.2005.csproj
@@ -0,0 +1,130 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{880EA873-E951-465A-AC5B-BA899A2C744E}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.IocQuickStart.AppContext</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>Spring.IocQuickStart</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.Windows.Forms">
+      <Name>System.Windows.Forms</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <EmbeddedResource Include="AppContext\Images.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="AppContext\MyResource.es.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="AppContext\MyResource.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="AppContext\Person.resx">
+      <DependentUpon>Person.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="AppContext\ResourcesDisplayForm.resx">
+      <DependentUpon>ResourcesDisplayForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="AppContext\Keys.cs" />
+    <Compile Include="AppContext\Program.cs" />
+    <Compile Include="AppContext\Person.cs" />
+    <Compile Include="AppContext\ResourcesDisplayForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.2003.sln b/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.2003.sln
new file mode 100644
index 00000000..5ac2b6d3
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.2003.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.EventRegistry.2003", "src/Spring.IocQuickStart.EventRegistry.2003.csproj", "{0D35F19E-308E-4A0B-88B1-7E7C2D665053}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Debug.ActiveCfg = Debug|.NET
+		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Debug.Build.0 = Debug|.NET
+		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Release.ActiveCfg = Release|.NET
+		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Release.Build.0 = Release|.NET
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.2005.sln b/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.2005.sln
new file mode 100644
index 00000000..0eeb8bc6
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.2005.sln
@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.EventRegistry.2005", "src/Spring.IocQuickStart.EventRegistry.2005.csproj", "{0D35F19E-308E-4A0B-88B1-7E7C2D665053}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D35F19E-308E-4A0B-88B1-7E7C2D665053}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.build b/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.build
new file mode 100644
index 00000000..08058fe5
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/Spring.IocQuickStart.EventRegistry.build
@@ -0,0 +1,31 @@
+<?xml version="1.0" ?>
+<project name="Spring.IocQuickStart.EventRegistry" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+
+  <target name="build">
+    <!-- build EventRegistry example -->
+    <csc target="exe" 
+         define="${current.build.defines.csc}" 
+	 warnaserror="true"
+         debug="${current.build.debug}" 
+         output="${current.bin.dir}/${project::get-name()}.exe">
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+      </sources>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+      <references basedir="${current.bin.dir}">
+	<include name="Spring.Core.dll" />
+      </references>
+    </csc>
+    <copy tofile="${current.bin.dir}/${project::get-name()}.exe.config" 
+          file="src/App.config" overwrite="true">
+    </copy>	
+  </target>
+</project>
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/App.config b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/App.config
new file mode 100644
index 00000000..250f3eee
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/App.config
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<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" />
+    </sectionGroup>
+  </configSections>
+
+  <spring>
+
+    <context>
+      <resource uri="config://spring/objects" />
+    </context>
+
+    <objects xmlns="http://www.springframework.net">
+      <description>An example demonstrating the event registry.</description>
+
+      <object name="MyEventPublisher" 
+              type="Spring.IocQuickStart.EventRegistry.MyEventPublisher, Spring.IocQuickStart.EventRegistry" 
+              singleton="false">
+        <property name="PublisherName" value="My event publisher" />
+      </object>
+
+      <object name="MyEventSubscriber" 
+              type="Spring.IocQuickStart.EventRegistry.MyEventSubscriber, Spring.IocQuickStart.EventRegistry" 
+              singleton="false" />
+
+    </objects>
+
+  </spring>
+
+</configuration>
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/EventRegistry/MyClientEventArgs.cs b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/EventRegistry/MyClientEventArgs.cs
new file mode 100644
index 00000000..3f337294
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/EventRegistry/MyClientEventArgs.cs
@@ -0,0 +1,43 @@
+#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 
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.IocQuickStart.EventRegistry
+{
+	public class MyClientEventArgs : EventArgs
+	{
+		private string _eventMessage;
+
+		public MyClientEventArgs(string eventMessage)
+		{
+			_eventMessage = eventMessage;
+		}
+
+		public string EventMessage
+		{
+			get { return _eventMessage; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/EventRegistry/MyEventPublisher.cs b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/EventRegistry/MyEventPublisher.cs
new file mode 100644
index 00000000..07d7af9c
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/EventRegistry/MyEventPublisher.cs
@@ -0,0 +1,49 @@
+#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
+
+namespace Spring.IocQuickStart.EventRegistry
+{
+	public delegate void SimpleClientEvent(object sender, MyClientEventArgs args);
+
+	public class MyEventPublisher
+	{
+		private string _publisherName;
+
+		public event SimpleClientEvent MyClientEvent1;
+
+		public MyEventPublisher()
+		{
+		}
+
+		public string PublisherName
+		{
+			get { return _publisherName; }
+			set { _publisherName = value; }
+		}
+
+		public void ClientMethodThatTriggersEvent1()
+		{
+			if (MyClientEvent1 != null)
+			{
+				MyClientEvent1(this, new MyClientEventArgs("Event 1 raised from " + _publisherName));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/EventRegistry/MyEventSubscriber.cs b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/EventRegistry/MyEventSubscriber.cs
new file mode 100644
index 00000000..9a7fefb6
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/EventRegistry/MyEventSubscriber.cs
@@ -0,0 +1,58 @@
+#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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.IocQuickStart.EventRegistry
+{
+	public class MyEventSubscriber
+	{
+		private bool _eventHandled = false;
+
+		public MyEventSubscriber()
+		{
+		}
+
+		public void HandleClientEvents(object sender, MyClientEventArgs args)
+		{
+			Console.WriteLine("HandleClientEvents handler in subscriber handled event with args: " + args.EventMessage);
+			_eventHandled = true;
+		}
+
+		public bool EventHandled
+		{
+			get { return _eventHandled; }
+		}
+
+		public void NeverCall()
+		{
+			throw new Exception();
+		}
+
+		public string FakeEventHandler(object sender, MyClientEventArgs args)
+		{
+			throw new Exception();
+		}
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/EventRegistry/Program.cs b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/EventRegistry/Program.cs
new file mode 100644
index 00000000..c34bf560
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/EventRegistry/Program.cs
@@ -0,0 +1,96 @@
+#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 
+
+#region Imports
+
+using System;
+
+using Spring.Context;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.IocQuickStart.EventRegistry
+{
+	/// <summary>
+	/// Small example application showing how objects can publish their events
+	/// to an IApplicationContex.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The example then goes on to illustrate how subscribers can subscribe to
+	/// any events by notifying an IApplicationContext instance. The context
+	/// will only wire events and event handlers if they have compatible
+	/// signatures.
+	/// </p>
+	/// </remarks>
+	public sealed class Program
+	{
+		/// <summary>
+		/// In this example, the subscriber is subscribing by publisher type. 
+		/// </summary>
+		[STAThread]
+		public static void Main()
+		{
+			try
+			{
+                // Retrieve context defined in the spring/context section of 
+                // the standard .NET configuration file.
+				using (IApplicationContext ctx = ContextRegistry.GetContext())
+				{
+					// gets the publisher from the application context...
+					MyEventPublisher publisher = (MyEventPublisher) ctx.GetObject("MyEventPublisher");
+					// publishes events to the context...
+					ctx.PublishEvents(publisher);
+
+					// gets first instance of subscriber...
+					MyEventSubscriber subscriber = (MyEventSubscriber) ctx.GetObject("MyEventSubscriber");
+					// gets second instance of subscriber...
+					MyEventSubscriber subscriber2 = (MyEventSubscriber) ctx.GetObject("MyEventSubscriber");
+					// subscribes the first instance to any events published by the MyEventPublisher type...
+					ctx.Subscribe(subscriber, typeof (MyEventPublisher));
+
+					Console.WriteLine("Publisher name: " + publisher.PublisherName);
+					// must be false for both subscribers as no event has yet been raised...
+					Console.WriteLine("Subscriber 1 Event Handled: " + subscriber.EventHandled);
+					Console.WriteLine("Subscriber 2 Event Handled: " + subscriber2.EventHandled);
+
+					// raises a publisher event...
+					publisher.ClientMethodThatTriggersEvent1();
+
+					// must be true (subscribed to any events)...
+					Console.WriteLine("Subscriber 1 Event Handled: " + subscriber.EventHandled);
+					// must be false (did not subscribe to any events)...
+					Console.WriteLine("Subscriber 2 Event Handled: " + subscriber2.EventHandled);
+				}
+			}
+			catch (Exception ex)
+			{
+				Console.WriteLine(ex);
+			}
+			finally
+			{
+                Console.WriteLine();
+				Console.WriteLine("--- hit <return> to quit ---");
+				Console.ReadLine();	
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2003.csproj b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2003.csproj
new file mode 100644
index 00000000..044e447d
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2003.csproj
@@ -0,0 +1,109 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{0D35F19E-308E-4A0B-88B1-7E7C2D665053}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.IocQuickStart.EventRegistry"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.IocQuickStart"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "EventRegistry\MyClientEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "EventRegistry\MyEventPublisher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "EventRegistry\MyEventSubscriber.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "EventRegistry\Program.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2005.csproj b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2005.csproj
new file mode 100644
index 00000000..e9400aed
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.EventRegistry/src/Spring.IocQuickStart.EventRegistry.2005.csproj
@@ -0,0 +1,100 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0D35F19E-308E-4A0B-88B1-7E7C2D665053}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.IocQuickStart.EventRegistry</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Spring.IocQuickStart</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>Spring.IocQuickStart.EventRegistry.Program</StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="EventRegistry\MyClientEventArgs.cs" />
+    <Compile Include="EventRegistry\MyEventPublisher.cs" />
+    <Compile Include="EventRegistry\MyEventSubscriber.cs" />
+    <Compile Include="EventRegistry\Program.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.2003.sln b/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.2003.sln
new file mode 100644
index 00000000..c686ef4b
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.2003.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.MovieFinder.2003", "src/Spring.IocQuickStart.MovieFinder.2003.csproj", "{C261D9ED-85C3-4B35-BE48-7156F5B17430}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug.ActiveCfg = Debug|.NET
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug.Build.0 = Debug|.NET
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release.ActiveCfg = Release|.NET
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release.Build.0 = Release|.NET
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.2005.sln b/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.2005.sln
new file mode 100644
index 00000000..42faff40
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.2005.sln
@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.IocQuickStart.MovieFinder.2005", "src/Spring.IocQuickStart.MovieFinder.2005.csproj", "{C261D9ED-85C3-4B35-BE48-7156F5B17430}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C261D9ED-85C3-4B35-BE48-7156F5B17430}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.build b/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.build
new file mode 100644
index 00000000..e32df937
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder.build
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<project name="Spring.IocQuickStart.MovieFinder" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+
+  <target name="build">
+    <!-- build MovieFinder -->
+    <csc target="exe" 
+         define="${current.build.defines.csc}" 
+	 warnaserror="true"
+         debug="${current.build.debug}" 
+         output="${current.bin.dir}/${project::get-name()}.exe">
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+      </sources>
+      <resources prefix="Spring.IocQuickStart.MovieFinder" dynamicprefix="false" failonempty="true">
+        <include name="**/*.xml" />
+      </resources>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+      <references basedir="${current.bin.dir}">
+        <include name="log4net.dll" />
+        <include name="Common.Logging.dll"/>
+	<include name="Common.Logging.Log4Net.dll"/>
+	<include name="Spring.Core.dll" />
+      </references>
+    </csc>
+    <copy tofile="${current.bin.dir}/${project::get-name()}.exe.config" 
+          file="src/App.config" overwrite="true">
+    </copy>
+    <copy todir="${current.bin.dir}"
+          overwrite="true"
+	  flatten="true">
+      <fileset basedir=".">
+        <include name="**/movies.txt"/>	
+      </fileset>
+    </copy>
+  </target>
+</project>
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/lib/net/1.1/Common.Logging.Log4Net.dll b/examples/Spring/Spring.IoCQuickStart.MovieFinder/lib/net/1.1/Common.Logging.Log4Net.dll
new file mode 100644
index 00000000..f334f6de
Binary files /dev/null and b/examples/Spring/Spring.IoCQuickStart.MovieFinder/lib/net/1.1/Common.Logging.Log4Net.dll differ
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/lib/net/1.1/log4net.dll b/examples/Spring/Spring.IoCQuickStart.MovieFinder/lib/net/1.1/log4net.dll
new file mode 100644
index 00000000..995816f2
Binary files /dev/null and b/examples/Spring/Spring.IoCQuickStart.MovieFinder/lib/net/1.1/log4net.dll differ
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/lib/net/2.0/Common.Logging.Log4Net.dll b/examples/Spring/Spring.IoCQuickStart.MovieFinder/lib/net/2.0/Common.Logging.Log4Net.dll
new file mode 100644
index 00000000..3900bb87
Binary files /dev/null and b/examples/Spring/Spring.IoCQuickStart.MovieFinder/lib/net/2.0/Common.Logging.Log4Net.dll differ
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/lib/net/2.0/log4net.dll b/examples/Spring/Spring.IoCQuickStart.MovieFinder/lib/net/2.0/log4net.dll
new file mode 100644
index 00000000..ffc57e11
Binary files /dev/null and b/examples/Spring/Spring.IoCQuickStart.MovieFinder/lib/net/2.0/log4net.dll differ
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/App.config b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/App.config
new file mode 100644
index 00000000..42438f9d
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/App.config
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<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.ContextHandler, Spring.Core"/>
+      <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>
+      <!-- using embedded assembly configuration file
+      <resource uri="assembly://Spring.IocQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder/AppContext.xml"/>
+      -->
+      
+      <!-- using section in App.config -->
+      <resource uri="config://spring/objects"/>
+
+    </context>
+
+    <objects xmlns="http://www.springframework.net" >
+      <description>An example that demonstrates simple IoC features.</description>
+
+      <object id="MyMovieLister" 
+              type="Spring.IocQuickStart.MovieFinder.MovieLister, Spring.IocQuickStart.MovieFinder">
+        <property name="MovieFinder" ref="AnotherMovieFinder"/>
+      </object>
+      
+      <!-- An IMovieFinder implementation that uses harcoded values as it's movie source... -->
+      <object id="MyMovieFinder" 
+              type="Spring.IocQuickStart.MovieFinder.SimpleMovieFinder, Spring.IocQuickStart.MovieFinder"/>
+      
+      <!-- An IMovieFinder implementation that uses a text file as it's movie source...     -->
+      <object id="AnotherMovieFinder" 
+              type="Spring.IocQuickStart.MovieFinder.ColonDelimitedMovieFinder, Spring.IocQuickStart.MovieFinder">
+        <constructor-arg index="0" value="movies.txt"/>
+      </object>
+
+      <object type="Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor, Spring.Core"/>
+      
+    </objects>
+
+  </spring>
+
+  <log4net>
+    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%-5level - %message%newline" />
+      </layout>
+    </appender>
+
+    <!-- Set default logging level to DEBUG -->
+    <root>
+      <level value="DEBUG" />
+      <appender-ref ref="ConsoleAppender" />
+    </root>
+
+    <!-- Set logging for MovieFinder to DEBUG -->
+    <logger name="Spring.IocQuickStart.MovieFinder">
+      <level value="DEBUG" />
+    </logger>
+
+    <!-- Set logging for Spring to INFO.  
+         Logger names in Spring correspond to the namespace -->
+    <logger name="Spring">
+      <level value="INFO" />
+    </logger>
+
+  </log4net>
+
+</configuration>
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/AppContext.xml b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/AppContext.xml
new file mode 100644
index 00000000..a923d1d0
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/AppContext.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net" >
+  <description>An example that demonstrates simple IoC features.</description>
+
+  <object id="MyMovieLister" 
+          type="Spring.IocQuickStart.MovieFinder.MovieLister, Spring.IocQuickStart.MovieFinder">
+    <property name="MovieFinder" ref="AnotherMovieFinder"/>
+  </object>
+  
+  
+  <!-- An IMovieFinder implementation that uses harcoded values as it's movie source... -->
+  <!--
+  <object id="MyMovieFinder" 
+          type="Spring.IocQuickStart.MovieFinder.SimpleMovieFinder, Spring.IocQuickStart.MovieFinder"/>    
+  -->
+  
+    
+  <!--An IMovieFinder implementation that uses a text file as it's movie source...  -->
+
+  <object id="AnotherMovieFinder" 
+          type="Spring.IocQuickStart.MovieFinder.ColonDelimitedMovieFinder, Spring.IocQuickStart.MovieFinder">
+    <constructor-arg index="0" value="movies.txt"/>
+  </object>
+
+  <object type="Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor, Spring.Core"/>
+
+</objects>
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/AppContextContribution.xml b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/AppContextContribution.xml
new file mode 100644
index 00000000..0939737e
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/AppContextContribution.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net" >
+  <description>An example that demonstrates contributing on implementation of MovieFinder progammatically.</description>
+
+
+  <object id="MyMovieLister"
+        type="Spring.IocQuickStart.MovieFinder.MovieLister, Spring.IocQuickStart.MovieFinder">
+    <property name="movieFinder" ref="AnotherMovieFinder"/>
+  </object>
+
+
+</objects>
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/ColonDelimitedMovieFinder.cs b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/ColonDelimitedMovieFinder.cs
new file mode 100644
index 00000000..4c491c10
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/ColonDelimitedMovieFinder.cs
@@ -0,0 +1,107 @@
+#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
+
+#region Imports
+
+using System.IO;
+using System.Collections;
+
+#endregion
+
+namespace Spring.IocQuickStart.MovieFinder
+{
+	/// <summary>
+    /// An <see cref="Spring.IocQuickStart.MovieFinder.IMovieFinder"/> implementation
+	/// that uses a colon delimited text file as it's backing data store.
+    /// </summary>
+    public class ColonDelimitedMovieFinder : IMovieFinder
+    {
+        private static readonly char [] Delimeter = new char [] {':'};
+
+        private FileInfo _movieFile;
+        private IList _movies;
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.IocQuickStart.MovieFinder.ColonDelimitedMovieFinder"/> class.
+        /// </summary>
+        /// <param name="file">
+        /// The file containing colon delimited movies.
+        /// </param>
+        public ColonDelimitedMovieFinder (FileInfo file)
+        {
+            MovieFile = file;
+        }
+
+        /// <summary>
+        /// The file containing colon delimited movies.
+        /// </summary>
+        /// <value>
+        /// A <see cref="System.IO.FileInfo"/> pointing to the file containing
+        /// colon delimited movies.
+        /// </value>
+        public FileInfo MovieFile 
+        {
+            get 
+            {
+                return _movieFile;
+            }
+            set 
+            {
+                _movieFile = value;
+                if (_movieFile != null && _movieFile.Exists) 
+                {
+                    InitList ();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Finds all of the movies stored in this
+        /// <see cref="Spring.IocQuickStart.MovieFinder.IMovieFinder"/> implementation.
+        /// </summary>
+        /// <returns>
+        /// All of the movies stored in this
+        /// <see cref="Spring.IocQuickStart.MovieFinder.IMovieFinder"/> implementation.
+        /// </returns>
+        public IList FindAll ()
+        {
+            return _movies;
+        }
+
+        /// <summary>
+        /// Loads all of the movies in the file referred to by <c>MovieFile</c>.
+        /// </summary>
+        private void InitList ()
+        {
+            _movies = new ArrayList ();
+            using (StreamReader reader = MovieFile.OpenText ()) 
+            {
+                string line = null;
+                while ((line = reader.ReadLine ()) != null) 
+                {
+                    string [] tuple = line.Split (Delimeter);
+                    Movie movie = new Movie (tuple [0], tuple [1]);
+                    _movies.Add (movie);
+                }
+            }
+        }
+    }
+}
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/IMovieFinder.cs b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/IMovieFinder.cs
new file mode 100644
index 00000000..f8a513f3
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/IMovieFinder.cs
@@ -0,0 +1,39 @@
+#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
+
+#region Imports
+
+using System.Collections;
+
+#endregion
+
+namespace Spring.IocQuickStart.MovieFinder
+{
+	/// <summary>
+	/// Describes the interface for finding a list of movies independent of <i>how</i>
+	/// said movies are actually stored (text file, database, etc).
+	/// </summary>
+	public interface IMovieFinder
+	{
+        /// <summary>Finds all of the stored movies.</summary>
+        /// <returns>All of the stored movies.</returns>
+		IList FindAll ();
+	}
+}
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/Movie.cs b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/Movie.cs
new file mode 100644
index 00000000..f98b93b8
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/Movie.cs
@@ -0,0 +1,73 @@
+#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
+
+namespace Spring.IocQuickStart.MovieFinder
+{
+	/// <summary>
+	/// An object that describes a movie.
+	/// </summary>
+	public class Movie
+	{
+        private string _title;
+        private string _director;
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.IocQuickStart.MovieFinder.Movie"/> class.
+        /// </summary>
+        /// <param name="title">The title of the movie.</param>
+        /// <param name="director">The director of the movie.</param>
+		public Movie (string title, string director)
+		{
+            _title = title;
+            _director = director;
+		}
+
+        /// <summary>
+        /// Property Title (string).
+        /// </summary>
+        public string Title
+        {
+            get
+            {
+                return _title;
+            }
+            set
+            {
+                _title = value;
+            }
+        }
+
+        /// <summary>
+        /// Property Director (string).
+        /// </summary>
+        public string Director
+        {
+            get
+            {
+                return _director;
+            }
+            set
+            {
+                _director = value;
+            }
+        }
+	}
+}
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/MovieLister.cs b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/MovieLister.cs
new file mode 100644
index 00000000..b67b2029
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/MovieLister.cs
@@ -0,0 +1,82 @@
+#region Licence
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using Spring.Objects.Factory.Attributes;
+
+namespace Spring.IocQuickStart.MovieFinder
+{
+	/// <summary>
+	/// A class that provides a list of movies directed by a particular director.
+    /// </summary>
+	public class MovieLister
+	{
+        private IMovieFinder _movieFinder;
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.IocQuickStart.MovieFinder.MovieLister"/> class.
+        /// </summary>
+		public MovieLister ()
+		{
+		}
+
+        /// <summary>
+        /// Property MovieFinder (IMovieFinder).
+        /// </summary>
+        [Required]
+        public IMovieFinder MovieFinder
+        {
+            get
+            {
+                return _movieFinder;
+            }
+            set
+            {
+                _movieFinder = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns a list of those movies directed by the supplied
+        /// <paramref name="director"/>
+        /// </summary>
+        /// <param name="director">
+        /// The name of the director whose movies we are to return.
+        /// </param>
+        /// <returns>
+        /// A list of those movies directed by the supplied
+        /// <paramref name="director"/>.
+        /// </returns>
+        public Movie [] MoviesDirectedBy (string director)
+        {
+            IList allMovies = _movieFinder.FindAll ();
+            IList movies = new ArrayList ();
+            foreach (Movie m in allMovies)
+            {
+                if (director.Equals (m.Director))
+                {
+                    movies.Add (m);
+                }
+            }
+            return (Movie []) ArrayList.Adapter (movies).ToArray (typeof (Movie));
+        }
+	}
+}
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/Program.cs b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/Program.cs
new file mode 100644
index 00000000..dec3ca8e
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/Program.cs
@@ -0,0 +1,179 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using Common.Logging;
+using Common.Logging.Log4Net;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.IocQuickStart.MovieFinder
+{
+	/// <summary>
+	/// A simple application that demonstrates the IoC functionality of Spring.NET.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// See <a href="http://martinfowler.com/articles/injection.html"/> for the background
+	/// article on which this example application is based.
+	/// </p>
+	/// </remarks>
+	public sealed class Program
+	{
+	    #region Logging Definition
+
+	    private static readonly ILog LOG = LogManager.GetLogger(typeof(Program));
+
+	    #endregion
+
+	    /// <summary>
+		/// The main entry point for the application.
+		/// </summary>
+		[STAThread]
+		public static void Main()
+		{
+			try
+			{
+                IApplicationContext ctx = ContextRegistry.GetContext();
+
+                #region Advanced: Call alternative ways to create application context
+                //CreateContextMixXmlAndProgrammatic();               
+                //CreateContextProgrammatically();                    
+                //CreateContextProgrammaticallyWithAutoWire();     
+                #endregion
+
+                MovieLister lister = (MovieLister) ctx.GetObject("MyMovieLister");
+				Movie[] movies = lister.MoviesDirectedBy("Roberto Benigni");
+				LOG.Debug("Searching for movie...");
+				foreach (Movie movie in movies)
+				{
+                    LOG.Debug(
+						string.Format("Movie Title = '{0}', Director = '{1}'.",
+						              movie.Title, movie.Director));
+				}
+                LOG.Debug("MovieApp Done.");
+			}
+			catch (Exception e)
+			{
+				LOG.Error("Movie Finder is broken.", e);
+			}
+			finally
+			{
+                Console.WriteLine();
+				Console.WriteLine("--- hit <return> to quit ---");
+				Console.ReadLine();
+			}
+		}
+
+
+        #region Implementation of alternative ways to create application context
+
+        private static IApplicationContext CreateContextProgrammatically()
+	    {
+            InitializeCommonLogging();
+	        GenericApplicationContext ctx = new GenericApplicationContext();
+            
+            IObjectDefinitionFactory objectDefinitionFactory = new DefaultObjectDefinitionFactory();
+            
+            
+            //Create MovieLister and dependency on 
+            ObjectDefinitionBuilder builder = 
+                ObjectDefinitionBuilder.RootObjectDefinition(objectDefinitionFactory, typeof(MovieLister));
+	        builder.AddPropertyReference("MovieFinder", "AnotherMovieFinder");   
+
+	        ctx.RegisterObjectDefinition("MyMovieLister", builder.ObjectDefinition);
+
+            builder = ObjectDefinitionBuilder.RootObjectDefinition(objectDefinitionFactory, typeof(ColonDelimitedMovieFinder));
+	        builder.AddConstructorArg("movies.txt");
+	        ctx.RegisterObjectDefinition("AnotherMovieFinder", builder.ObjectDefinition);
+
+            ctx.Refresh();
+
+	        return ctx;
+
+	    }
+
+        private static IApplicationContext CreateContextProgrammaticallyWithAutoWire()
+        {
+            InitializeCommonLogging();
+            GenericApplicationContext ctx = new GenericApplicationContext();
+           
+            IObjectDefinitionFactory objectDefinitionFactory = new DefaultObjectDefinitionFactory();
+
+
+            //Create MovieLister and dependency on 
+            ObjectDefinitionBuilder builder =
+                ObjectDefinitionBuilder.RootObjectDefinition(objectDefinitionFactory, typeof(MovieLister));
+            builder.AddPropertyReference("MovieFinder", "BogusNameOfDependency")                
+                .SetAutowireMode(AutoWiringMode.ByType);
+
+            ctx.RegisterObjectDefinition("MyMovieLister", builder.ObjectDefinition);
+
+            builder = ObjectDefinitionBuilder.RootObjectDefinition(objectDefinitionFactory, typeof(ColonDelimitedMovieFinder));
+            builder.AddConstructorArg("movies.txt")
+                .SetAutowireMode(AutoWiringMode.ByType);
+
+            ctx.RegisterObjectDefinition("AnotherMovieFinder", builder.ObjectDefinition);
+
+            ctx.Refresh();
+
+            return ctx;
+
+        }
+
+        private static IApplicationContext CreateContextMixXmlAndProgrammatic()
+        {
+
+            GenericApplicationContext ctx = new GenericApplicationContext();
+
+            IObjectDefinitionReader objectDefinitionReader = new XmlObjectDefinitionReader(ctx);
+            objectDefinitionReader.LoadObjectDefinitions("assembly://Spring.IocQuickStart.MovieFinder/Spring.IocQuickStart.MovieFinder/AppContextContribution.xml");
+
+            IObjectDefinitionFactory objectDefinitionFactory = new DefaultObjectDefinitionFactory();
+            ObjectDefinitionBuilder builder = 
+                ObjectDefinitionBuilder.RootObjectDefinition(objectDefinitionFactory, typeof(ColonDelimitedMovieFinder));
+            builder.AddConstructorArg("movies.txt");
+            ctx.RegisterObjectDefinition("AnotherMovieFinder", builder.ObjectDefinition);
+            
+
+            ctx.Refresh();
+            
+            return ctx;
+        }
+
+        private static void InitializeCommonLogging()
+        {
+            NameValueCollection properties = new NameValueCollection();
+            properties["configType"] = "INLINE";
+            LogManager.Adapter = new Log4NetLoggerFactoryAdapter(properties);
+        }
+        #endregion
+
+
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/SimpleMovieFinder.cs b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/SimpleMovieFinder.cs
new file mode 100644
index 00000000..1e2ebec8
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/SimpleMovieFinder.cs
@@ -0,0 +1,76 @@
+#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
+
+#region Imports
+
+using System.Collections;
+
+#endregion
+
+namespace Spring.IocQuickStart.MovieFinder
+{
+	/// <summary>
+	/// Simple in-memory storage implementation of the
+    /// <see cref="Spring.IocQuickStart.MovieFinder.IMovieFinder"/> interface.
+	/// </summary>
+	public class SimpleMovieFinder : IMovieFinder
+	{
+        private ArrayList _list = new ArrayList();
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.IocQuickStart.MovieFinder.SimpleMovieFinder"/> class.
+        /// </summary>
+        public SimpleMovieFinder()
+        {
+            InitList();
+        }
+
+        /// <summary>
+        /// Add a movie to the list.
+        /// </summary>
+        /// <param name="m">The movie.</param>
+        public void AddMovie (Movie m)
+        {
+            _list.Add(m);
+        }
+
+        /// <summary>
+        /// Finds all of the movies stored in this
+        /// <see cref="Spring.IocQuickStart.MovieFinder.IMovieFinder"/> implementation.
+        /// </summary>
+        /// <returns>
+        /// All of the movies stored in this
+        /// <see cref="Spring.IocQuickStart.MovieFinder.IMovieFinder"/> implementation.
+        /// </returns>
+        public IList FindAll()
+        {
+            return new ArrayList (_list);
+        }
+
+        /// <summary>
+        /// Initialises the in-mememory list of stored movies.
+        /// </summary>
+        private void InitList ()
+        {
+            _list.Add (new Movie ("La vita e bella", "Roberto Benigni"));
+        }
+	}
+}
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/movies.txt b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/movies.txt
new file mode 100644
index 00000000..f1160dc7
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/movies.txt
@@ -0,0 +1,7 @@
+Blue Velvet:David Lynch
+Magnolia:Paul T Anderson
+Cabin Fever:Eli Roth
+In The Company Of Men:Neil Labute
+Naked:Mike Leigh
+La vita e bella:Roberto Benigni
+La vita e bella 2:Roberto Benigni
\ No newline at end of file
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2003.csproj b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2003.csproj
new file mode 100644
index 00000000..ee640811
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2003.csproj
@@ -0,0 +1,142 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{C261D9ED-85C3-4B35-BE48-7156F5B17430}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.IocQuickStart.MovieFinder"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = 'echo "Copying movies.txt file for MovieFinder"&#xd;&#xa;copy "$(ProjectDir)MovieFinder\movies.txt" "$(TargetDir)" /y '
+                RootNamespace = "Spring.IocQuickStart"
+                RunPostBuildEvent = "OnOutputUpdated"
+                StartupObject = "Spring.IocQuickStart.MovieFinder.Program"
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\..\bin\net\1.1\debug\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "log4net"
+                    AssemblyName = "log4net"
+                    HintPath = "..\lib\net\1.1\log4net.dll"
+                />
+                <Reference
+                    Name = "Common.Logging.Log4Net"
+                    AssemblyName = "Common.Logging.Log4Net"
+                    HintPath = "..\lib\net\1.1\Common.Logging.Log4Net.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "MovieFinder\AppContext.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "MovieFinder\ColonDelimitedMovieFinder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "MovieFinder\IMovieFinder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "MovieFinder\Movie.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "MovieFinder\MovieLister.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "MovieFinder\movies.txt"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "MovieFinder\Program.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "MovieFinder\SimpleMovieFinder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2005.csproj b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2005.csproj
new file mode 100644
index 00000000..16137bd7
--- /dev/null
+++ b/examples/Spring/Spring.IoCQuickStart.MovieFinder/src/Spring.IocQuickStart.MovieFinder.2005.csproj
@@ -0,0 +1,119 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C261D9ED-85C3-4B35-BE48-7156F5B17430}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.IocQuickStart.MovieFinder</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Spring.IocQuickStart</RootNamespace>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+    <StartupObject>Spring.IocQuickStart.MovieFinder.Program</StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging.Log4Net, Version=0.0.0.0, Culture=neutral, 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.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MovieFinder\AppContext.xml" />
+    <EmbeddedResource Include="MovieFinder\AppContextContribution.xml" />
+    <Content Include="MovieFinder\movies.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MovieFinder\ColonDelimitedMovieFinder.cs" />
+    <Compile Include="MovieFinder\IMovieFinder.cs" />
+    <Compile Include="MovieFinder\Movie.cs" />
+    <Compile Include="MovieFinder\Program.cs" />
+    <Compile Include="MovieFinder\MovieLister.cs" />
+    <Compile Include="MovieFinder\SimpleMovieFinder.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>echo "Copying movies.txt file for MovieFinder"
+copy "$(ProjectDir)MovieFinder\movies.txt" "$(TargetDir)" /y </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2003.sln b/examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2003.sln
new file mode 100644
index 00000000..c6153c7c
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2003.sln
@@ -0,0 +1,41 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.TxQuickStart.2003", "src\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2003.csproj", "{B3C676F7-52DA-41D7-953C-38C9E62FFDF6}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.TxQuickStart.Tests.2003", "test\Spring\Spring.TxQuickStart.Tests\Spring.TxQuickStart.Tests.2003.csproj", "{026EED0B-267B-4518-AD3B-B3D4291CC2F8}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Debug-1.1 = Debug-1.1
+		Release = Release
+		Release-1.1 = Release-1.1
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{B3C676F7-52DA-41D7-953C-38C9E62FFDF6}.Debug.ActiveCfg = Debug|.NET
+		{B3C676F7-52DA-41D7-953C-38C9E62FFDF6}.Debug.Build.0 = Debug|.NET
+		{B3C676F7-52DA-41D7-953C-38C9E62FFDF6}.Debug-1.1.ActiveCfg = Debug|.NET
+		{B3C676F7-52DA-41D7-953C-38C9E62FFDF6}.Debug-1.1.Build.0 = Debug|.NET
+		{B3C676F7-52DA-41D7-953C-38C9E62FFDF6}.Release.ActiveCfg = Release|.NET
+		{B3C676F7-52DA-41D7-953C-38C9E62FFDF6}.Release.Build.0 = Release|.NET
+		{B3C676F7-52DA-41D7-953C-38C9E62FFDF6}.Release-1.1.ActiveCfg = Release|.NET
+		{B3C676F7-52DA-41D7-953C-38C9E62FFDF6}.Release-1.1.Build.0 = Release|.NET
+		{026EED0B-267B-4518-AD3B-B3D4291CC2F8}.Debug.ActiveCfg = Debug|.NET
+		{026EED0B-267B-4518-AD3B-B3D4291CC2F8}.Debug.Build.0 = Debug|.NET
+		{026EED0B-267B-4518-AD3B-B3D4291CC2F8}.Debug-1.1.ActiveCfg = Debug|.NET
+		{026EED0B-267B-4518-AD3B-B3D4291CC2F8}.Debug-1.1.Build.0 = Debug|.NET
+		{026EED0B-267B-4518-AD3B-B3D4291CC2F8}.Release.ActiveCfg = Release|.NET
+		{026EED0B-267B-4518-AD3B-B3D4291CC2F8}.Release.Build.0 = Release|.NET
+		{026EED0B-267B-4518-AD3B-B3D4291CC2F8}.Release-1.1.ActiveCfg = Release|.NET
+		{026EED0B-267B-4518-AD3B-B3D4291CC2F8}.Release-1.1.Build.0 = Release|.NET
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2005.sln b/examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2005.sln
new file mode 100644
index 00000000..82fa5f6d
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2005.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.TxQuickStart.2005", "src\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2005.csproj", "{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.TxQuickStart.Tests.2005", "test\Spring\Spring.TxQuickStart.Tests\Spring.TxQuickStart.Tests.2005.csproj", "{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/CommonAssemblyInfo.cs b/examples/Spring/Spring.TxQuickStart/src/Spring/CommonAssemblyInfo.cs
new file mode 100644
index 00000000..faffa87e
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/CommonAssemblyInfo.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Reflection;
+[assembly: CLSCompliant(false)]
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+
+#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")]
+[assembly: AssemblyCulture("")]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      .NET Framework Version
+//      Major Version
+//      Minor Version 
+//      Revision
+//
+// This is as good a convention as any for supporting side-by-side deployment of 
+// .NET 1.1 and .NET 2.0 versions of the assembly.
+
+#if !NET_2_0
+[assembly: AssemblyVersion("1.1.0.0")]
+#else
+[assembly: AssemblyVersion("2.1.0.0")]
+#endif
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+#if STRONG
+[assembly: AssemblyDelaySign(false)]
+#if !NET_2_0
+[assembly: AssemblyKeyFile("Spring.Net.snk")]
+#endif
+#endif
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2003.csproj b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2003.csproj
new file mode 100644
index 00000000..7d21df98
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2003.csproj
@@ -0,0 +1,138 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{B3C676F7-52DA-41D7-953C-38C9E62FFDF6}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.TxQuickStart"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = "Spring.TxQuickStart.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "1"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "Spring.Data"
+                    AssemblyName = "Spring.Data"
+                    HintPath = "..\..\..\..\..\..\bin\net\1.1\debug\Spring.Data.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "TxQuickStart\application-config.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "TxQuickStart\CreditsDebitsSchema.sql"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "TxQuickStart\Dao\IAccountCreditDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TxQuickStart\Dao\IAccountDebitDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TxQuickStart\Dao\Ado\AccountCreditDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TxQuickStart\Dao\Ado\AccountDebitDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TxQuickStart\Services\AccountManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TxQuickStart\Services\IAccountManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2005.csproj b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2005.csproj
new file mode 100644
index 00000000..f57f59bb
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.2005.csproj
@@ -0,0 +1,73 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.TxQuickStart</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>
+    </DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TxQuickStart\Dao\Ado\AccountCreditDao.cs" />
+    <Compile Include="TxQuickStart\Dao\Ado\AccountDebitDao.cs" />
+    <Compile Include="TxQuickStart\Services\AccountManager.cs" />
+    <Compile Include="TxQuickStart\Dao\IAccountCreditDao.cs" />
+    <Compile Include="TxQuickStart\Dao\IAccountDebitDao.cs" />
+    <Compile Include="TxQuickStart\Services\IAccountManager.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TxQuickStart\application-config.xml" />
+    <Content Include="TxQuickStart\CreditsDebitsSchema.sql" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.xml b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.xml
new file mode 100644
index 00000000..99ed7b92
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/Spring.TxQuickStart.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Spring.TxQuickStart</name>
+    </assembly>
+    <members>
+    </members>
+</doc>
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/CreditsDebitsSchema.sql b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/CreditsDebitsSchema.sql
new file mode 100644
index 00000000..6566603a
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/CreditsDebitsSchema.sql
@@ -0,0 +1,51 @@
+USE [CreditsAndDebits]
+CREATE TABLE [Credits](
+	[CreditID] [int] IDENTITY NOT NULL,
+	[CreditAmount] [float] NOT NULL,
+ CONSTRAINT [PK_CreditID] PRIMARY KEY CLUSTERED 
+(
+	[CreditID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+
+USE [CreditsAndDebits]
+GO
+CREATE TABLE [Debits](
+	[DebitID] [int] IDENTITY NOT NULL,
+	[DebitAmount] [float] NOT NULL,
+ CONSTRAINT [PK_DebitID] PRIMARY KEY CLUSTERED 
+(
+	[DebitID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+
+
+USE [Credits]
+GO
+CREATE TABLE [Credits](
+	[CreditID] [int] IDENTITY NOT NULL,
+	[CreditAmount] [float] NOT NULL,
+ CONSTRAINT [PK_CreditID] PRIMARY KEY CLUSTERED 
+(
+	[CreditID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+
+USE [Debits]
+GO
+CREATE TABLE [Debits](
+	[DebitID] [int] IDENTITY NOT NULL,
+	[DebitAmount] [float] NOT NULL,
+ CONSTRAINT [PK_DebitID] PRIMARY KEY CLUSTERED 
+(
+	[DebitID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Dao/Ado/AccountCreditDao.cs b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Dao/Ado/AccountCreditDao.cs
new file mode 100644
index 00000000..8b52cac4
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Dao/Ado/AccountCreditDao.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Data;
+using Spring.Data.Core;
+
+namespace Spring.TxQuickStart.Dao.Ado
+{
+
+    public class AccountCreditDao : AdoDaoSupport, IAccountCreditDao
+    {
+        public void CreateCredit(float creditAmount)
+        {
+            AdoTemplate.ExecuteNonQuery(CommandType.Text,
+                                        "insert into Credits (CreditAmount) VALUES (@amount)", "amount", DbType.Decimal, 0,
+                                        creditAmount);
+        }
+    }
+}
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Dao/Ado/AccountDebitDao.cs b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Dao/Ado/AccountDebitDao.cs
new file mode 100644
index 00000000..b2f4df07
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Dao/Ado/AccountDebitDao.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Data;
+using Spring.Data.Core;
+
+namespace Spring.TxQuickStart.Dao.Ado
+{
+    public class AccountDebitDao : AdoDaoSupport, IAccountDebitDao
+    {
+        public void DebitAccount(float debitAmount)
+        {
+            AdoTemplate.ExecuteNonQuery(CommandType.Text,
+                                       "insert into dbo.Debits (DebitAmount) VALUES (@amount)", "amount", DbType.Decimal, 0,
+                                       debitAmount);
+        }
+    }
+}
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Dao/IAccountCreditDao.cs b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Dao/IAccountCreditDao.cs
new file mode 100644
index 00000000..4f0ccfa8
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Dao/IAccountCreditDao.cs
@@ -0,0 +1,9 @@
+
+
+namespace Spring.TxQuickStart.Dao
+{
+    public interface IAccountCreditDao
+    {
+        void CreateCredit(float creditAmount);
+    }
+}
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Dao/IAccountDebitDao.cs b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Dao/IAccountDebitDao.cs
new file mode 100644
index 00000000..4520cc26
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Dao/IAccountDebitDao.cs
@@ -0,0 +1,8 @@
+
+namespace Spring.TxQuickStart.Dao
+{
+    public interface IAccountDebitDao
+    {
+        void DebitAccount(float debitAmount);
+    }
+}
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Services/AccountManager.cs b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Services/AccountManager.cs
new file mode 100644
index 00000000..9ebfae0a
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Services/AccountManager.cs
@@ -0,0 +1,53 @@
+
+using System;
+using System.Data;
+using Spring.Transaction;
+using Spring.Transaction.Interceptor;
+using Spring.TxQuickStart.Dao;
+
+namespace Spring.TxQuickStart.Services
+{
+    public class AccountManager : IAccountManager
+    {
+        
+        private IAccountCreditDao accountCreditDao;
+        private IAccountDebitDao accountDebitDao;
+
+        private float maxTransferAmount = 1000000;
+
+        public AccountManager(IAccountCreditDao accountCreditDao, IAccountDebitDao accountDebitDao)
+        {
+            this.accountCreditDao = accountCreditDao;
+            this.accountDebitDao = accountDebitDao;
+        }
+
+        public float MaxTransferAmount
+        {
+            get { return maxTransferAmount; }
+            set { maxTransferAmount = value; }
+        }
+
+
+        // The following rollback rule will result in commiting of only work done
+        // by the CreateCreate DAO method.  The exception is still propagated out to the
+        // calling code.
+
+        // [Transaction(NoRollbackFor = new Type[] { typeof(ArithmeticException) })]
+
+        [Transaction(TransactionPropagation.Required)]
+        public void DoTransfer(float creditAmount, float debitAmount)
+        {
+            accountCreditDao.CreateCredit(creditAmount);
+
+            if (creditAmount > maxTransferAmount || debitAmount > maxTransferAmount)
+            {
+                throw new ArithmeticException("see a teller big spender...");
+            }
+           
+            accountDebitDao.DebitAccount(debitAmount);
+        }
+        
+    }
+
+
+}
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Services/IAccountManager.cs b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Services/IAccountManager.cs
new file mode 100644
index 00000000..1bff3cf8
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/Services/IAccountManager.cs
@@ -0,0 +1,9 @@
+
+namespace Spring.TxQuickStart.Services
+{
+    public interface IAccountManager
+    {
+
+        void DoTransfer(float creditAmount, float debitAmount);
+    }
+}
diff --git a/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/application-config.xml b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/application-config.xml
new file mode 100644
index 00000000..fc34c0d2
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/src/Spring/Spring.TxQuickStart/TxQuickStart/application-config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns='http://www.springframework.net'>
+
+  <!-- DAO Implementations -->
+  <object id="accountCreditDao" type="Spring.TxQuickStart.Dao.Ado.AccountCreditDao, Spring.TxQuickStart">
+    <property name="DbProvider" ref="CreditDbProvider"/>
+  </object>
+
+  <object id="accountDebitDao" type="Spring.TxQuickStart.Dao.Ado.AccountDebitDao, Spring.TxQuickStart">
+    <property name="DbProvider" ref="DebitDbProvider"/>
+  </object>
+
+
+  <!-- The service that performs multiple data access operations -->
+  <object id="accountManager"
+          type="Spring.TxQuickStart.Services.AccountManager, Spring.TxQuickStart">
+    <constructor-arg name="accountCreditDao" ref="accountCreditDao"/>
+    <constructor-arg name="accountDebitDao" ref="accountDebitDao"/>
+  </object>
+
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/AssemblyInfo.cs b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..177a4f0e
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]		
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2003.csproj b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2003.csproj
new file mode 100644
index 00000000..f8874be9
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2003.csproj
@@ -0,0 +1,166 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{026EED0B-267B-4518-AD3B-B3D4291CC2F8}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.TxQuickStart.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = 'echo copy /y  "$(ProjectDir)Spring.TxQuickStart.Tests.dll.config" "$(TargetDir)Spring.TxQuickStart.Tests.dll.config"&#xd;&#xa;copy /y  "$(ProjectDir)Spring.TxQuickStart.Tests.dll.config" "$(TargetDir)Spring.TxQuickStart.Tests.dll.config"'
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "Spring.TxQuickStart.2003"
+                    Project = "{B3C676F7-52DA-41D7-953C-38C9E62FFDF6}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\..\..\..\lib\Net\1.1\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "Common.Logging.Log4Net"
+                    AssemblyName = "Common.Logging.Log4Net"
+                    HintPath = "..\..\..\..\..\..\lib\Net\1.1\Common.Logging.Log4Net.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "Spring.Data"
+                    AssemblyName = "Spring.Data"
+                    HintPath = "..\..\..\..\..\..\bin\net\1.1\debug\Spring.Data.dll"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\..\..\..\bin\net\1.1\debug\Spring.Aop.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.TxQuickStart.Tests.dll.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "TxQuickStart\AccountManagerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TxQuickStart\aspects-config.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "TxQuickStart\system-test-dtc-es-config.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "TxQuickStart\system-test-local-config.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "TxQuickStart\Services\AccountManagerUnitTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TxQuickStart\Services\StubAccountCreditDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TxQuickStart\Services\StubAccountDebitDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2005.csproj b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2005.csproj
new file mode 100644
index 00000000..64c2a242
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.2005.csproj
@@ -0,0 +1,98 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.TxQuickStart.Tests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</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\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\bin\net\2.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>..\..\..\..\..\..\bin\net\2.0\debug\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="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.TxQuickStart\Spring.TxQuickStart.2005.csproj">
+      <Project>{EDDC48D5-4F25-4476-9BA3-12F2E8BB5A8C}</Project>
+      <Name>Spring.TxQuickStart.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TxQuickStart\system-test-local-config.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TxQuickStart\AccountManagerTests.cs" />
+    <Compile Include="TxQuickStart\Services\AccountManagerUnitTests.cs" />
+    <Compile Include="TxQuickStart\Services\StubAccountCreditDao.cs" />
+    <Compile Include="TxQuickStart\Services\StubAccountDebitDao.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.TxQuickStart.Tests.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TxQuickStart\aspects-config.xml" />
+    <EmbeddedResource Include="TxQuickStart\system-test-dtc-config.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TxQuickStart\system-test-dtc-es-config.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.build b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.build
new file mode 100644
index 00000000..c7213ddd
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.build
@@ -0,0 +1,60 @@
+<?xml version="1.0" ?>
+<project name="Spring.TxQuickStart.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+	<!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+	<target name="build">
+
+		<csc target="library" define="${current.build.defines.csc}"
+		     warnaserror="true"
+		     debug="${current.build.debug}"
+      		     output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml">
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+			</sources>
+			<references basedir="${current.bin.dir}">
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+			</references>
+		</csc>
+		<copy todir="${current.bin.dir}">
+			<fileset basedir="${project::get-name()}/Data">
+				<include name="**/*.xml" />
+			        <include name="**/*.test" />
+			</fileset>
+		</copy>
+		<copy todir="${current.bin.dir}">
+			<fileset basedir="${project::get-name()}">
+				<include name="**/*.config" />
+			</fileset>
+		</copy>
+	</target>
+	<target name="test" depends="build">
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
+			      appconfig="${current.bin.dir}/${project::get-name()}.dll.config" />
+		</nunit2outproc>
+	</target>
+
+	<target name="test-mono-1.0" >
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll"
+			      appconfig="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll.config" />
+		</nunit2outproc>
+	</target>
+
+</project>
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.dll.config b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.dll.config
new file mode 100644
index 00000000..e7787480
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/Spring.TxQuickStart.Tests.dll.config
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+    </sectionGroup>
+
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
+    
+  </configSections>
+
+  <!--
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Simple.ConsoleOutLoggerFactoryAdapter, Common.Logging">
+        <arg key="showLogName" value="true" />
+        <arg key="showDataTime" value="true" />
+        <arg key="level" value="TRACE" />
+        <arg key="dateTimeFormat" value="yyyy/MM/dd HH:mm:ss:fff" />
+      </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>
+
+
+    <log4net>
+      <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+        <layout type="log4net.Layout.PatternLayout">
+          <conversionPattern value="%-5level - %message%newline" />
+        </layout>
+      </appender>
+
+      <!-- Set default logging level to DEBUG -->
+      <root>
+        <level value="TRACE" />
+        <appender-ref ref="ConsoleAppender" />
+      </root>
+
+
+      <!-- Set logging for Spring to INFO.  
+         Logger names in Spring correspond to the namespace -->
+      
+      <logger name="Spring">
+        <level value="INFO" />
+      </logger>
+      
+      <!--
+      <logger name="Spring.Data">
+        <level value="DEBUG" />
+      </logger>
+      -->
+
+      <logger name="Spring.Transaction">
+        <level value="DEBUG" />
+      </logger>
+
+
+    </log4net>
+
+</configuration>
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/AccountManagerTests.cs b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/AccountManagerTests.cs
new file mode 100644
index 00000000..45d0b019
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/AccountManagerTests.cs
@@ -0,0 +1,132 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using NUnit.Framework;
+using Spring.Aop.Config;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Common;
+using Spring.Data.Config;
+using Spring.Data.Core;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+using Spring.Transaction.Config;
+using Spring.TxQuickStart.Services;
+
+#endregion
+
+namespace Spring.TxQuickStart
+{
+    [TestFixture]
+	public class AccountManagerTests 
+	{
+        private AdoTemplate adoTemplateCredit;
+        private AdoTemplate adoTemplateDebit;
+
+        private IAccountManager accountManager;
+
+        [SetUp]
+        public void SetUp()
+        {
+            // Configure Spring programmatically
+            NamespaceParserRegistry.RegisterParser(typeof(DatabaseNamespaceParser));
+            NamespaceParserRegistry.RegisterParser(typeof(TxNamespaceParser));
+            NamespaceParserRegistry.RegisterParser(typeof(AopNamespaceParser));
+            IApplicationContext context = CreateContextFromXml();
+            IDictionary dict = context.GetObjectsOfType(typeof (IAccountManager));
+            accountManager = context["accountManager"] as IAccountManager;
+            CleanDb(context);
+        }
+
+        private static IApplicationContext CreateContextFromXml()
+        {
+            return new XmlApplicationContext(
+                "assembly://Spring.TxQuickStart.Tests/Spring.TxQuickStart/system-test-local-config.xml" 
+                );
+        }
+
+        [Test]
+        public void TransferBelowMaxAmount()
+        {
+            accountManager.DoTransfer(217, 217);
+
+            //asserts to read from db...
+
+            int numCreditRecords = (int)adoTemplateCredit.ExecuteScalar(CommandType.Text, "select count(*) from Credits");
+            int numDebitRecords =  (int)adoTemplateDebit.ExecuteScalar(CommandType.Text, "select count(*) from Debits");
+            Assert.AreEqual(1, numCreditRecords);
+            Assert.AreEqual(1, numDebitRecords);
+        }
+
+        [Test]
+        public void TransferAboveMaxAmount()
+        {
+            try
+            {
+                accountManager.DoTransfer(2000000, 200000);
+                Assert.Fail("Should have thrown Arithmethic Exception");
+            } catch (ArithmeticException)
+            {
+                int numCreditRecords = (int)adoTemplateCredit.ExecuteScalar(CommandType.Text, "select count(*) from Credits");
+                int numDebitRecords = (int)adoTemplateDebit.ExecuteScalar(CommandType.Text, "select count(*) from Debits");
+                Assert.AreEqual(0, numCreditRecords);
+                Assert.AreEqual(0, numDebitRecords);
+            }
+            
+        }
+
+
+        // Run the following test only if you have changed to the alternate implementation
+        // of the method DoTransfer in AccountManager that specifies the NoRollbackFor property.
+        [Test]   
+        [Ignore("Change impl of AccountManager as shown before running this test")]
+        public void TransferAboveMaxAmountNoRollbackFor()
+        {
+            try
+            {
+                accountManager.DoTransfer(2000000, 2000000);
+                Assert.Fail("Should have thrown Arithmethic Exception");
+            } catch (ArithmeticException) {
+                int numCreditRecords = (int)adoTemplateCredit.ExecuteScalar(CommandType.Text, "select count(*) from Credits");
+                int numDebitRecords = (int)adoTemplateDebit.ExecuteScalar(CommandType.Text, "select count(*) from Debits");
+                Assert.AreEqual(1, numCreditRecords);
+                Assert.AreEqual(0, numDebitRecords);
+            }
+        }
+
+
+        private void CleanDb(IApplicationContext context)
+        {
+            IDbProvider dbProvider = (IDbProvider)context["DebitDbProvider"];
+            adoTemplateDebit = new AdoTemplate(dbProvider);
+            adoTemplateDebit.ExecuteNonQuery(CommandType.Text, "truncate table Debits");
+
+            dbProvider = (IDbProvider)context["CreditDbProvider"];
+            adoTemplateCredit = new AdoTemplate(dbProvider);
+            adoTemplateCredit.ExecuteNonQuery(CommandType.Text, "truncate table Credits");
+
+        }
+	}
+}
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/CreditsDebitsSchema.sql b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/CreditsDebitsSchema.sql
new file mode 100644
index 00000000..6566603a
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/CreditsDebitsSchema.sql
@@ -0,0 +1,51 @@
+USE [CreditsAndDebits]
+CREATE TABLE [Credits](
+	[CreditID] [int] IDENTITY NOT NULL,
+	[CreditAmount] [float] NOT NULL,
+ CONSTRAINT [PK_CreditID] PRIMARY KEY CLUSTERED 
+(
+	[CreditID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+
+USE [CreditsAndDebits]
+GO
+CREATE TABLE [Debits](
+	[DebitID] [int] IDENTITY NOT NULL,
+	[DebitAmount] [float] NOT NULL,
+ CONSTRAINT [PK_DebitID] PRIMARY KEY CLUSTERED 
+(
+	[DebitID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+
+
+USE [Credits]
+GO
+CREATE TABLE [Credits](
+	[CreditID] [int] IDENTITY NOT NULL,
+	[CreditAmount] [float] NOT NULL,
+ CONSTRAINT [PK_CreditID] PRIMARY KEY CLUSTERED 
+(
+	[CreditID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+
+USE [Debits]
+GO
+CREATE TABLE [Debits](
+	[DebitID] [int] IDENTITY NOT NULL,
+	[DebitAmount] [float] NOT NULL,
+ CONSTRAINT [PK_DebitID] PRIMARY KEY CLUSTERED 
+(
+	[DebitID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/Services/AccountManagerUnitTests.cs b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/Services/AccountManagerUnitTests.cs
new file mode 100644
index 00000000..8b5c5f46
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/Services/AccountManagerUnitTests.cs
@@ -0,0 +1,62 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.TxQuickStart.Dao;
+
+#endregion
+
+namespace Spring.TxQuickStart.Services
+{
+    /// <summary>
+    /// This class contains unit tests for IAccountManager
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AccountManagerUnitTests.cs,v 1.1 2007/12/07 02:36:20 markpollack Exp $</version>
+    [TestFixture]
+    public class AccountManagerUnitTests
+    {
+        private IAccountManager accountManager;
+
+        [SetUp]
+        public void Setup()
+        {
+            IAccountCreditDao stubCreditDao = new StubAccountCreditDao();
+            IAccountDebitDao stubDebitDao = new StubAccountDebitDao();
+            accountManager = new AccountManager(stubCreditDao, stubDebitDao);            
+        }
+
+        [Test]
+        public void TransferBelowMaxAmount()
+        {
+            accountManager.DoTransfer(217, 217);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArithmeticException))]
+        public void TransferAboveMaxAmount()
+        {
+            accountManager.DoTransfer(2000000, 200000);
+        }       
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/Services/StubAccountCreditDao.cs b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/Services/StubAccountCreditDao.cs
new file mode 100644
index 00000000..addb0cc3
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/Services/StubAccountCreditDao.cs
@@ -0,0 +1,12 @@
+using Spring.TxQuickStart.Dao;
+
+namespace Spring.TxQuickStart.Services
+{
+    public class StubAccountCreditDao : IAccountCreditDao
+    {
+        public void CreateCredit(float creditAmount)
+        {
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/Services/StubAccountDebitDao.cs b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/Services/StubAccountDebitDao.cs
new file mode 100644
index 00000000..d85a4b02
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/Services/StubAccountDebitDao.cs
@@ -0,0 +1,12 @@
+using Spring.TxQuickStart.Dao;
+
+namespace Spring.TxQuickStart.Services
+{
+    public class StubAccountDebitDao : IAccountDebitDao
+    {
+        public void DebitAccount(float debitAmount)
+        {
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/aspects-config.xml b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/aspects-config.xml
new file mode 100644
index 00000000..8c36f04f
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/aspects-config.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns='http://www.springframework.net'
+         xmlns:aop="http://www.springframework.net/aop">
+
+
+
+  <object name="exceptionAdvice" type="Spring.Aspects.Exceptions.ExceptionHandlerAdvice, Spring.Aop">
+    <property name="exceptionHandlers">
+      <list>
+        <value>on exception name ArithmeticException log 'Logging an exception thrown from method ' + #method.Name </value>
+      </list>
+    </property>
+  </object>
+
+  <object name="loggingAdvice" type="Spring.Aspects.Logging.SimpleLoggingAdvice, Spring.Aop">
+    <property name="logUniqueIdentifier" value="true"/>
+    <property name="logExecutionTime"    value="true"/>
+    <property name="logMethodArguments"  value="true"/>
+    <property name="Separator"           value=";"/>
+
+    <property name="HideProxyTypeNames"  value="true"/>
+    <property name="UseDynamicLogger"    value="true"/>
+
+    <property name="LogLevel"            value="Info"/>
+  </object>
+
+
+  <object id="txAttributePointcut" type="Spring.Aop.Support.AttributeMatchMethodPointcut, Spring.Aop">
+    <property name="Attribute" value="Spring.Transaction.Interceptor.TransactionAttribute, Spring.Data"/>
+  </object>
+
+  <aop:config>
+
+    <aop:advisor id="exceptionProcessAdvisor" order="1"
+               advice-ref="exceptionAdvice"
+               pointcut-ref="txAttributePointcut"/>
+
+    <aop:advisor id="loggingAdvisor" order="2"
+                 advice-ref="loggingAdvice"
+                 pointcut-ref="txAttributePointcut"/>
+
+  </aop:config>
+  
+</objects>
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-dtc-config.xml b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-dtc-config.xml
new file mode 100644
index 00000000..e42321fe
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-dtc-config.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database"
+         xmlns:tx="http://www.springframework.net/tx">
+
+
+  <!-- Imports application configuration -->
+  <import resource="assembly://Spring.TxQuickStart/Spring.TxQuickStart/application-config.xml"/>
+  
+  <!-- Imports additional aspects -->
+  <!--
+  <import resource="assembly://Spring.TxQuickStart.Tests/Spring.TxQuickStart/aspects-config.xml"/>
+  -->
+   
+  <db:provider id="DebitDbProvider"
+                 provider="System.Data.SqlClient"
+                 connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Debits;User ID=springqa; Password=springqa"/>
+
+
+  <db:provider id="CreditDbProvider"
+                 provider="System.Data.SqlClient"
+                 connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Credits;User ID=springqa; Password=springqa"/>
+                  
+  
+
+ 
+  <!-- Transaction Manager if using two databases, one containing the credit table and the other a debit table -->
+
+  <object id="transactionManager"
+          type="Spring.Data.Core.TxScopeTransactionManager, Spring.Data">
+  </object>
+
+  
+  <!-- Transaction aspect -->
+  <tx:attribute-driven/>
+
+  
+ 
+ 
+  
+
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-dtc-es-config.xml b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-dtc-es-config.xml
new file mode 100644
index 00000000..a89d7535
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-dtc-es-config.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database"
+         xmlns:tx="http://www.springframework.net/tx">
+
+
+  <!-- Imports application configuration -->
+  <import resource="assembly://Spring.TxQuickStart/Spring.TxQuickStart/application-config.xml"/>
+  
+  <!-- Imports additional aspects -->
+  <!--
+  <import resource="assembly://Spring.TxQuickStart.Tests/Spring.TxQuickStart/aspects-config.xml"/>
+  -->
+   
+  <db:provider id="DebitDbProvider"
+                 provider="SqlServer-1.1"
+                 connectionString="Data Source=MARKT60\SQL2005;Database=Debits;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+
+
+  <db:provider id="CreditDbProvider"
+                 provider="SqlServer-1.1"
+                 connectionString="Data Source=MARKT60\SQL2005;Database=Credits;User ID=springqa; Password=springqa;Trusted_Connection=False"/>
+                  
+  
+
+ 
+  <!-- Transaction Manager if using two databases, one containing the credit table and the other a debit table -->
+
+  <object id="transactionManager"
+          type="Spring.Data.Core.ServiceDomainPlatformTransactionManager, Spring.Data">
+  </object>
+
+  
+  <!-- Transaction aspect -->
+  <tx:attribute-driven/>
+
+  
+ 
+ 
+  
+
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-local-config.xml b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-local-config.xml
new file mode 100644
index 00000000..e87089ad
--- /dev/null
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-local-config.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database"
+         xmlns:tx="http://www.springframework.net/tx">
+
+
+  <!-- Imports application configuration -->
+  <import resource="assembly://Spring.TxQuickStart/Spring.TxQuickStart/application-config.xml"/>
+  
+  <!-- Imports additional aspects -->
+  <!--
+  <import resource="assembly://Spring.TxQuickStart.Tests/Spring.TxQuickStart/aspects-config.xml"/>
+  -->
+  
+  
+  <!-- Database Providers -->
+  <db:provider id="DebitDbProvider"
+               provider="System.Data.SqlClient"
+               connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"/>
+
+  <db:provider id="CreditDbProvider"
+               provider="System.Data.SqlClient"
+               connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"/>
+  
+  <!-- for .NET 1.1
+  <db:provider id="DebitDbProvider"
+               provider="SqlServer-1.1"
+               connectionString="Data Source=MARKT60\SQL2005;Database=CreditsAndDebits;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+
+  <db:provider id="CreditDbProvider"
+               provider="SqlServer-1.1"
+               connectionString="Data Source=MARKT60\SQL2005;Database=CreditsAndDebits;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+  -->
+               
+  <alias name="DebitDbProvider" alias="CreditDbProvider"/>
+
+  <!-- Transaction Manager if using a single database that contain both credit and debit tables -->
+  <object id="transactionManager" 
+          type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data">
+    <property name="DbProvider" ref="DebitDbProvider"/>
+  </object>
+
+  <!-- Transaction aspect -->
+  
+  <tx:attribute-driven/>
+
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.2005.sln b/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.2005.sln
new file mode 100644
index 00000000..dd4c233e
--- /dev/null
+++ b/examples/Spring/Spring.Web.Extensions.Example/Spring.Web.Extensions.Example.2005.sln
@@ -0,0 +1,48 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "L:\...\Spring.Web.Extensions.Example.2005\", "src\Spring.Web.Extensions.Example.2005\", "{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}"
+	ProjectSection(WebsiteProperties) = preProject
+		ProjectReferences = ""
+		Debug.AspNetCompiler.VirtualPath = "/Spring.Web.Extensions.Example.2005"
+		Debug.AspNetCompiler.PhysicalPath = "src\Spring.Web.Extensions.Example.2005\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Web.Extensions.Example.2005\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/Spring.Web.Extensions.Example.2005"
+		Release.AspNetCompiler.PhysicalPath = "src\Spring.Web.Extensions.Example.2005\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.Web.Extensions.Example.2005\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "3792"
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|.NET.ActiveCfg = Debug|.NET
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|.NET.Build.0 = Debug|.NET
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Debug|Mixed Platforms.Build.0 = Debug|.NET
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|.NET.ActiveCfg = Debug|.NET
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|.NET.Build.0 = Debug|.NET
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Any CPU.ActiveCfg = Debug|.NET
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
+		{DE2A587C-01A4-49E2-A3CD-664B293A8A6F}.Release|Mixed Platforms.Build.0 = Debug|.NET
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/App_Code/ContactService.cs b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/App_Code/ContactService.cs
new file mode 100644
index 00000000..a0687b33
--- /dev/null
+++ b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/App_Code/ContactService.cs
@@ -0,0 +1,77 @@
+#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
+
+
+#region Imports
+
+using System;
+using System.Collections.Generic;
+
+#endregion
+
+/// <summary>
+/// Default implementation of the <see cref="IContactService"/>
+/// service interface.
+/// </summary>
+/// <author>Bruno Baia</author>
+/// <version>$Id: ContactService.cs,v 1.1 2007/05/31 18:34:54 markpollack Exp $</version>
+public class ContactService : IContactService
+{
+    private List<string> _emails;
+
+    /// <summary>
+    /// List of emails addresses for all contacts.
+    /// </summary>
+    public List<string> Emails
+    {
+        get { return _emails; }
+        set { _emails = value; }
+    }
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="ContactService"/> class.
+    /// </summary>
+    public ContactService()
+    {
+    }
+
+    /// <summary>
+    /// Returns an array of emails, with a maximum of <paramref name="count"/> 
+    /// values, that complete the given <paramref name="prefixText"/>.
+    /// </summary>
+    /// <param name="prefixText">Text entered by the user.</param>
+    /// <param name="count">Maximum number of possible values.</param>
+    /// <returns>The array of emails for completing the text.</returns>
+    public string[] GetEmails(string prefixText, int count)
+    {
+        List<String> emails = new List<string>();
+        int i = 0;
+        foreach (string email in _emails)
+        {
+            if (email.ToLower().StartsWith(prefixText.ToLower()))
+            {
+                emails.Add(email);
+                if (++i == count) break;
+            }
+        }
+
+        return emails.ToArray();
+    }
+}
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/App_Code/IContactService.cs b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/App_Code/IContactService.cs
new file mode 100644
index 00000000..7c83f77d
--- /dev/null
+++ b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/App_Code/IContactService.cs
@@ -0,0 +1,40 @@
+#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
+
+/// <summary>
+/// Service interface for contact management.
+/// </summary>
+/// <author>Bruno Baia</author>
+/// <version>$Id: IContactService.cs,v 1.1 2007/05/31 18:34:54 markpollack Exp $</version>
+public interface IContactService
+{
+    /// <summary>
+    /// Returns an array of emails, with a maximum of <paramref name="count"/> 
+    /// values, that complete the given <paramref name="prefixText"/>.
+    /// </summary>
+    /// <remarks>
+    /// This signature method is required 
+    /// to apply the auto-completion behavior.
+    /// </remarks>
+    /// <param name="prefixText">Text entered by the user.</param>
+    /// <param name="count">Maximum number of possible values.</param>
+    /// <returns>The array of emails for completing the text.</returns>
+    string[] GetEmails(string prefixText, int count);
+}
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/App_Code/StringArrayFilterAdvice.cs b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/App_Code/StringArrayFilterAdvice.cs
new file mode 100644
index 00000000..4f925150
--- /dev/null
+++ b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/App_Code/StringArrayFilterAdvice.cs
@@ -0,0 +1,86 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections.Generic;
+
+using AopAlliance.Intercept;
+using Spring.Util;
+
+#endregion
+
+/// <summary>
+/// A simple interception around advice that filters 
+/// a string array matching a given pattern.
+/// </summary>
+/// <author>Bruno Baia</author>
+/// <version>$Id: StringArrayFilterAdvice.cs,v 1.1 2007/05/31 18:34:54 markpollack Exp $</version>
+public class StringArrayFilterAdvice : IMethodInterceptor
+{
+    private string _pattern = string.Empty;
+
+    /// <summary>
+    /// A pattern to be used for filtering a string array.
+    /// </summary>
+    public string Pattern
+    {
+        get { return _pattern; }
+        set { _pattern = value; }
+    }
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="StringArrayFilterAdvice"/> class.
+    /// </summary>
+    public StringArrayFilterAdvice()
+    {
+    }
+
+    #region IMethodInterceptor Members
+
+    public object Invoke(IMethodInvocation invocation)
+    {
+        if (invocation.Method.ReturnType != typeof(string[]))
+            throw new NotSupportedException(
+                "StringArrayFilterAdvice must be applied on methods " +
+                "that return an array of string.");
+
+        string[] stringArray = (string[])invocation.Proceed();
+
+        if (_pattern.Length > 0)
+        {
+            List<string> strings = new List<string>();
+            foreach (string item in stringArray)
+            {
+                if (PatternMatchUtils.SimpleMatch(_pattern, item))
+                {
+                    strings.Add(item);
+                }
+            }
+
+            return strings.ToArray();
+        }
+
+        return stringArray;
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Common.Logging.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Common.Logging.dll.refresh
new file mode 100644
index 00000000..7ae4334d
Binary files /dev/null and b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Common.Logging.dll.refresh differ
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Spring.Aop.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Spring.Aop.dll.refresh
new file mode 100644
index 00000000..cc858ae7
Binary files /dev/null and b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Spring.Aop.dll.refresh differ
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Spring.Core.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Spring.Core.dll.refresh
new file mode 100644
index 00000000..d6773450
Binary files /dev/null and b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Spring.Core.dll.refresh differ
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Spring.Web.Extensions.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Spring.Web.Extensions.dll.refresh
new file mode 100644
index 00000000..f0151820
Binary files /dev/null and b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Spring.Web.Extensions.dll.refresh differ
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Spring.Web.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Spring.Web.dll.refresh
new file mode 100644
index 00000000..b31d8acc
Binary files /dev/null and b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/Spring.Web.dll.refresh differ
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/System.Web.Extensions.dll.refresh b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/System.Web.Extensions.dll.refresh
new file mode 100644
index 00000000..8cf56909
Binary files /dev/null and b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/System.Web.Extensions.dll.refresh differ
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/ContactWebServiceMethods.js b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/ContactWebServiceMethods.js
new file mode 100644
index 00000000..8029c670
--- /dev/null
+++ b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/ContactWebServiceMethods.js
@@ -0,0 +1,23 @@
+// JScript File
+
+// This function calls the Contact Web service method 
+// passing simple type parameters and the callback function  
+function GetEmails(prefix, count)
+{
+    ContactWebService.GetEmails(prefix, count, GetEmailsOnSucceeded);
+}
+
+// This is the callback function invoked if the Web service succeeded.
+// It accepts the result object as a parameter.
+function GetEmailsOnSucceeded(result, eventArgs)
+{
+    // Page element to display feedback.
+    var ResultSpan = document.getElementById("ResultSpan");
+    ResultSpan.innerHTML = '';
+    var i = 0;
+    for(email in result)
+    {
+        ResultSpan.innerHTML += (result[i] + '<br />');
+        i++;
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Default.aspx b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Default.aspx
new file mode 100644
index 00000000..598134d9
--- /dev/null
+++ b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Default.aspx
@@ -0,0 +1,46 @@
+<%@ Page Language="C#" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>ASP.NET AJAX 1.0 integration with Spring.NET</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <asp:ScriptManager runat="server" ID="scriptManager">
+            <Scripts>
+                <asp:ScriptReference Path="ContactWebServiceMethods.js" />
+            </Scripts>
+            <Services>
+                <asp:ServiceReference Path="ContactWebService.asmx" />
+            </Services>
+        </asp:ScriptManager>
+        <div>
+            <p>
+                Web Service available at this url : <a href="ContactWebService.asmx">ContactWebService.asmx</a>
+                <br />
+                <br />
+                Client scripts generated at this url : <a href="ContactWebService.asmx/js">ContactWebService.asmx/js</a>
+                & <a href="ContactWebService.asmx/jsdebug">ContactWebService.asmx/jsdebug</a>
+            </p>
+            <hr />
+            <p>
+                This sample demonstrates the use of client script with a web service created by
+                Spring.NET's WebServiceExporter.
+            </p>
+            <p>
+                Email :
+                <input id="emailInput" name="emailInput" type="text" />
+                <button onclick="GetEmails(emailInput.value, 10); return false;">
+                    Search</button>
+                (Hint : type the letter 'b' or 'm')
+            </p>
+            <p>
+                Results :
+                <br />
+                <span id="ResultSpan" />
+            </p>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Spring.config b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Spring.config
new file mode 100644
index 00000000..95c90614
--- /dev/null
+++ b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Spring.config
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+  <description>Object definitions.</description>
+
+  <!-- Creates an advisor (advice + pointcut). -->
+  <object id="StringArrayFilterAspect" type="Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor, Spring.Aop">
+    <property name="advice">
+      <object type="StringArrayFilterAdvice">
+        <property name="Pattern" value="*spring.net"/>
+      </object>
+    </property>
+    <property name="patterns">
+      <list>
+        <value>GetEmails</value>
+      </list>
+    </property>
+  </object>
+
+  <!-- Defines the contact service. -->
+  <object id="ContactService" type="ContactService">
+    <property name="Emails">
+      <list element-type="string">
+        <value>manuel@spring.pt</value>
+        <value>bruno@spring.net</value>
+        <value>marie@spring.net</value>
+        <value>brice@spring.net</value>
+        <value>bertrand@spring.net</value>
+        <value>marcel@spring.net</value>
+        <value>bernadette@spring.net</value>
+        <value>bruno@spring.pt</value>
+        <value>baptiste@spring.net</value>
+        <value>brad@spring.net</value>
+        <value>marc@spring.net</value>
+        <value>barbie@spring.net</value>
+        <value>bernie@spring.net</value>
+        <value>betty@spring.net</value>
+        <value>maria@spring.pt</value>
+      </list>
+    </property>
+  </object>
+
+  <!-- Applies AOP on the contact service. -->
+  <object id="ContactServiceWeaved" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+    <property name="target" ref="ContactService"/>
+    <property name="interceptorNames">
+      <list>
+        <value>StringArrayFilterAspect</value>
+      </list>
+    </property>
+  </object>
+
+  <!-- Exports contact service (weaved or not) as a web service. -->
+  <object id="ContactWebService" type="Spring.Web.Services.WebServiceExporter, Spring.Web">
+    <!--<property name="TargetName" value="ContactService"/>-->
+    <property name="TargetName" value="ContactServiceWeaved"/>
+    <property name="Namespace" value="http://Spring.Examples.Atlas/ContactService"/>
+    <property name="Description" value="Contact Web Services"/>
+    <property name="TypeAttributes">
+      <list>
+        <object type="System.Web.Script.Services.ScriptServiceAttribute, System.Web.Extensions"/>
+      </list>
+    </property>
+  </object>
+
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Web.config b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Web.config
new file mode 100644
index 00000000..ffbbeaf0
--- /dev/null
+++ b/examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Web.config
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<configuration>
+	<configSections>
+		<sectionGroup name="spring">
+			<section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/>
+		</sectionGroup>
+		<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+			<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+				<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
+				<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+					<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="Everywhere"/>
+					<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
+					<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
+				</sectionGroup>
+			</sectionGroup>
+		</sectionGroup>
+	</configSections>
+	<spring>
+		<context>
+			<resource uri="~/Spring.config"/>
+		</context>
+	</spring>
+	<system.web>
+		<pages>
+			<controls>
+				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+			</controls>
+		</pages>
+		<!--
+          Set compilation debug="true" to insert debugging
+          symbols into the compiled page. Because this
+          affects performance, set this value to true only
+          during development.
+    -->
+		<compilation debug="true">
+		</compilation>
+		<httpHandlers>
+			<remove verb="*" path="*.asmx"/>
+			<!--<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>-->
+			<add verb="*" path="*.asmx" validate="false" type="Spring.Web.Script.Services.ScriptHandlerFactory, Spring.Web.Extensions"/>
+			<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+			<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
+		</httpHandlers>
+		<httpModules>
+			<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+			<add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+		</httpModules>
+	</system.web>
+	<system.web.extensions>
+		<scripting>
+			<webServices>
+				<!-- Uncomment this line to customize maxJsonLength and add a custom converter -->
+				<!--
+      <jsonSerialization maxJsonLength="500">
+        <converters>
+          <add name="ConvertMe" type="Acme.SubAcme.ConvertMeTypeConverter"/>
+        </converters>
+      </jsonSerialization>
+      -->
+				<!-- Uncomment this line to enable the authentication service. Include requireSSL="true" if appropriate. -->
+				<!--
+        <authenticationService enabled="true" requireSSL = "true|false"/>
+      -->
+				<!-- Uncomment these lines to enable the profile service. To allow profile properties to be retrieved
+           and modified in ASP.NET AJAX applications, you need to add each property name to the readAccessProperties and
+           writeAccessProperties attributes. -->
+				<!--
+      <profileService enabled="true"
+                      readAccessProperties="propertyname1,propertyname2"
+                      writeAccessProperties="propertyname1,propertyname2" />
+      -->
+			</webServices>
+			<!--
+      <scriptResourceHandler enableCompression="true" enableCaching="true" />
+      -->
+		</scripting>
+	</system.web.extensions>
+	<system.webServer>
+		<validation validateIntegratedModeConfiguration="false"/>
+		<modules>
+			<add name="ScriptModule" preCondition="integratedMode" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+			<add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+		</modules>
+		<handlers>
+			<remove name="WebServiceHandlerFactory-Integrated"/>
+			<!--<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode"
+          type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>-->
+			<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="Spring.Web.Script.Services.ScriptHandlerFactory, Spring.Web.Extensions"/>
+			<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+			<add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+		</handlers>
+	</system.webServer>
+</configuration>
diff --git a/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2005.sln b/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2005.sln
new file mode 100644
index 00000000..1c27262a
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/Spring.WebQuickStart.2005.sln
@@ -0,0 +1,143 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "D:\...\Spring.WebQuickStart.2005\", "src\Spring.WebQuickStart.2005\", "{B4F56253-6425-4065-8A93-EF88F8730E57}"
+	ProjectSection(WebsiteProperties) = preProject
+		ProjectReferences = "{BA4789EB-281A-48EA-8763-28B9F0596A18}|Spring.Web.dll;"
+		Debug.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.2005"
+		Debug.AspNetCompiler.PhysicalPath = "Spring.WebQuickStart.2005\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.2005\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.2005"
+		Release.AspNetCompiler.PhysicalPath = "Spring.WebQuickStart.2005\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.2005\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "4112"
+		DefaultWebSiteLanguage = "Visual C#"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.2005", "..\..\..\src\Spring\Spring.Web\Spring.Web.2005.csproj", "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.2005", "..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj", "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Core.Tests.2005", "..\..\..\test\Spring\Spring.Core.Tests\Spring.Core.Tests.2005.csproj", "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "D:\...\Spring.WebQuickStart.Providers\", "src\Spring.WebQuickStart.Providers\", "{F42A333D-D305-4649-8B5A-6F5862F0F62A}"
+	ProjectSection(WebsiteProperties) = preProject
+		ProjectReferences = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}|Spring.Core.dll;{BA4789EB-281A-48EA-8763-28B9F0596A18}|Spring.Web.dll;"
+		Debug.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.Providers"
+		Debug.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.Providers\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.Providers\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/Spring.WebQuickStart.Providers"
+		Release.AspNetCompiler.PhysicalPath = "src\Spring.WebQuickStart.Providers\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Spring.WebQuickStart.Providers\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "4828"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Tests.2005", "..\..\..\test\Spring\Spring.Web.Tests\Spring.Web.Tests.2005.csproj", "{C67E47AA-1ACD-41B4-A465-4D336A2319CA}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|.NET.ActiveCfg = Debug|.NET
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|.NET.Build.0 = Debug|.NET
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Debug|Mixed Platforms.Build.0 = Debug|.NET
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|.NET.ActiveCfg = Debug|.NET
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|.NET.Build.0 = Debug|.NET
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Any CPU.ActiveCfg = Debug|.NET
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
+		{B4F56253-6425-4065-8A93-EF88F8730E57}.Release|Mixed Platforms.Build.0 = Debug|.NET
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BA4789EB-281A-48EA-8763-28B9F0596A18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{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
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|.NET.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|.NET.ActiveCfg = Debug|.NET
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|.NET.Build.0 = Debug|.NET
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Debug|Mixed Platforms.Build.0 = Debug|.NET
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|.NET.ActiveCfg = Debug|.NET
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|.NET.Build.0 = Debug|.NET
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Any CPU.ActiveCfg = Debug|.NET
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
+		{F42A333D-D305-4649-8B5A-6F5862F0F62A}.Release|Mixed Platforms.Build.0 = Debug|.NET
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|.NET.ActiveCfg = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C67E47AA-1ACD-41B4-A465-4D336A2319CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/App_Code/EmployeeInfo.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/App_Code/EmployeeInfo.cs
new file mode 100644
index 00000000..79039bd1
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/App_Code/EmployeeInfo.cs
@@ -0,0 +1,167 @@
+using System;
+using System.Collections;
+
+/// <summary>
+/// EmployeeInfo domain class
+/// </summary>
+public class EmployeeInfo
+{
+    private int id;
+    private string firstName;
+    private string lastName;
+    private DateTime dateOfBirth;
+    private Gender gender = Gender.Male;
+    private AddressInfo mailingAddress = new AddressInfo();
+    private double salary;
+    private ArrayList _hobbies = new ArrayList();
+    private ArrayList _favoriteFood = new ArrayList();
+
+    public EmployeeInfo()
+    {}
+
+    public int Id
+    {
+        get { return id; }
+        set { id = value; }
+    }
+
+    public string FirstName
+    {
+        get { return firstName; }
+        set { firstName = value; }
+    }
+
+    public string LastName
+    {
+        get { return lastName; }
+        set { lastName = value; }
+    }
+
+    public DateTime DateOfBirth
+    {
+        get { return dateOfBirth; }
+        set { dateOfBirth = value; }
+    }
+
+    public Gender Gender
+    {
+        get { return gender; }
+        set { gender = value; }
+    }
+
+    public AddressInfo MailingAddress
+    {
+        get { return mailingAddress; }
+        set { mailingAddress = value; }
+    }
+
+    public double Salary
+    {
+        get { return salary; }
+        set { salary = value; }
+    }
+
+    public IList Hobbies
+    {
+        get { return this._hobbies; }
+        set { this._hobbies = (value != null) ? new ArrayList(value) : null; }
+    }
+
+    public IList FavoriteFood
+    {
+        get { return this._favoriteFood; }
+        set { this._favoriteFood = (value != null) ? new ArrayList(value) : null; }
+    }
+}
+
+public enum Gender
+{
+    Male,
+    Female
+}
+
+public class AddressInfo
+{
+    private AddressType addressType;
+    private string street1;
+    private string street2;
+    private string city;
+    private string state;
+    private string postalCode;
+    private string country;
+
+    public AddressType AddressType
+    {
+        get { return addressType; }
+        set { addressType = value; }
+    }
+
+    public string Street1
+    {
+        get { return street1; }
+        set { street1 = value; }
+    }
+
+    public string Street2
+    {
+        get { return street2; }
+        set { street2 = value; }
+    }
+
+    public string City
+    {
+        get { return city; }
+        set { city = value; }
+    }
+
+    public string State
+    {
+        get { return state; }
+        set { state = value; }
+    }
+
+    public string PostalCode
+    {
+        get { return postalCode; }
+        set { postalCode = value; }
+    }
+
+    public string Country
+    {
+        get { return country; }
+        set { country = value; }
+    }
+}
+
+public enum AddressType
+{
+    Home,
+    Office
+}
+
+public class Hobby
+{
+    private string _uniqueKey;
+    private string _title;
+
+    public Hobby(string uniqueKey, string title)
+    {
+        this._uniqueKey = uniqueKey;
+        this._title = title;
+    }
+
+    public string UniqueKey
+    {
+        get { return this._uniqueKey; }
+    }
+
+    public string Title
+    {
+        get { return this._title; }
+    }
+
+    public override string ToString()
+    {
+        return this._uniqueKey;
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/App_Code/HtmlCommentAppenderModule.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/App_Code/HtmlCommentAppenderModule.cs
new file mode 100644
index 00000000..83de2091
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/App_Code/HtmlCommentAppenderModule.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Web;
+
+/// <summary>
+/// Summary description for CustomModule
+/// </summary>
+public class HtmlCommentAppenderModule : IHttpModule
+{
+    private string appendText;
+
+    public HtmlCommentAppenderModule()
+    {
+    }
+
+    public string AppendText
+    {
+        get { return this.appendText; }
+        set { this.appendText = value; }
+    }
+
+    public void Init(HttpApplication application)
+    {
+        application.PostRequestHandlerExecute += new System.EventHandler(application_PostRequestHandlerExecute);
+    }
+
+    void application_PostRequestHandlerExecute(object sender, System.EventArgs e)
+    {
+        ((HttpApplication)sender).Context.Response.Write( string.Format( "{0}<!-- {1} -->", Environment.NewLine, appendText ) );
+    }
+
+    public void Dispose()
+    {
+    }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/App_Code/ProductInfo.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/App_Code/ProductInfo.cs
new file mode 100644
index 00000000..682749ff
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/App_Code/ProductInfo.cs
@@ -0,0 +1,37 @@
+/// <summary>
+/// Summary description for ProductInfo
+/// </summary>
+public class ProductInfo
+{
+    private string sku;
+    private string name;
+    private int quantity;
+    private double price;
+    
+    public ProductInfo()
+    {}
+
+    public string Sku
+    {
+        get { return sku; }
+        set { sku = value; }
+    }
+
+    public string Name
+    {
+        get { return name; }
+        set { name = value; }
+    }
+
+    public int Quantity
+    {
+        get { return quantity; }
+        set { quantity = value; }
+    }
+
+    public double Price
+    {
+        get { return price; }
+        set { price = value; }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/Default.aspx
new file mode 100644
index 00000000..16361140
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/Default.aspx
@@ -0,0 +1,22 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="DI_Default" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Spring.NET Web Framework Quick Start Guide - Dependency Injection</title>
+</head>
+<body>
+    <h2><a href="../Default.aspx">Welcome to Spring.NET Web Framework Quick Start Guide</a></h2>
+    <div>
+    <h2>Dependency Injection</h2>
+    <p>
+    Samples in this section demonstrate, how dependency injection is done in web projects.
+    </p>
+    <h3><a href="HelloWorld/Default.aspx">Hello World!</a></h3>
+    <p>The inevitable "Hello World!" example demonstrates DI for pages, usercontrols and webcontrols</p>
+    <h3><a href="NestedContexts/Default.aspx">Nested Contexts</a></h3>
+    <p>This sample shows, how contexts are nested in webapplications</p>
+    </div>
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/Default.aspx.cs
new file mode 100644
index 00000000..57766cc5
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/Default.aspx.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class DI_Default : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/CustomControl.ascx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/CustomControl.ascx
new file mode 100644
index 00000000..b5abc9f4
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/CustomControl.ascx
@@ -0,0 +1,19 @@
+<%@ Control Language="C#" EnableViewState="false" AutoEventWireup="false" CodeFile="CustomControl.ascx.cs" Inherits="DI_HelloWorld_CustomControl" %>
+
+    <p>
+    The message you can see below has been injected by &lt;object type="CustomControl.ascx"&gt; object definition:
+    </p>
+    <p>
+    '<%=AnotherMessage%>'
+    </p>
+    <p>
+    The TextBox below has been filled in by typename using the &lt;object name="System.Web.UI.WebControls.TextBox"&gt; object definition:
+    </p>    
+    <p><asp:TextBox runat="server" id="myTextBox"/></p>
+
+    <p>
+    Use a spring:Panel to selectively enable/disable automatic dependency injection:
+    </p>    
+    <spring:Panel runat="server" ID="diContainer" suppressDependencyInjection="true" renderContainerTag="false">
+        <asp:TextBox runat="server" id="TextBox2"/>
+    </spring:Panel>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/CustomControl.ascx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/CustomControl.ascx.cs
new file mode 100644
index 00000000..02948c29
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/CustomControl.ascx.cs
@@ -0,0 +1,29 @@
+using System;
+
+/// <summary>
+/// Notice that you don't need to extend Spring.Web.UI.UserControl for DI features!
+/// </summary>
+public partial class DI_HelloWorld_CustomControl : System.Web.UI.UserControl
+{
+  private string anotherMessage;
+
+  public string AnotherMessage
+  {
+    get { return this.anotherMessage; }
+    set { this.anotherMessage = value; }
+  }
+
+  /// <summary>
+  /// Values are injected right before OnInit() is called.
+  /// </summary>
+  /// <param name="e"></param>
+  protected override void OnInit(EventArgs e)
+  {
+    if (this.AnotherMessage == null)
+    {
+      throw new ArgumentNullException("AnotherMessage");
+    }
+
+    base.OnInit(e);
+  }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/Default.aspx
new file mode 100644
index 00000000..0513813c
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/Default.aspx
@@ -0,0 +1,30 @@
+<%@ Page Language="C#" EnableViewState="false" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="DI_HelloWorld_Default" %>
+<%@ Register TagPrefix="ctl" TagName="CustomControl" src="CustomControl.ascx" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title><%=Title%></title>
+</head>
+<body>
+    <h2><a href="../../Default.aspx">Welcome to Spring.NET Web Framework Quick Start Guide</a></h2>
+    <h2><a href="../Default.aspx">Dependency Injection</a></h2>
+    <div>
+    <h2>Hello World example</h2>    
+    <form id="form1" runat="server">
+    <p>
+    This very simple web form demonstrates dependency injection on pages and controls.
+    </p>
+    <p>
+    The message you can see below has been injected by &lt;object type="Default.aspx"&gt; object definition:
+    </p>
+    <p>
+    '<%=Message%>'
+    </p>
+    <p>
+    <ctl:CustomControl runat="server" ID="myCustomControl" />
+    </p>
+    </form>
+    </div>
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/Default.aspx.cs
new file mode 100644
index 00000000..771c1f70
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/Default.aspx.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Web.UI;
+
+/// <summary>
+/// Notice that you don't need to extend Spring.Web.UI.Page for DI features!
+/// </summary>
+public partial class DI_HelloWorld_Default : System.Web.UI.Page
+{
+  private string message;
+
+  public string Message
+  {
+    get { return this.message; }
+    set { this.message = value; }
+  }
+
+  /// <summary>
+  /// Values are injected right before OnInit() is called.
+  /// </summary>
+  /// <param name="e"></param>
+  protected override void OnInit(EventArgs e)
+  {
+    if(this.Message == null)
+    {
+      throw new ArgumentNullException("Message");
+    }
+
+    base.OnInit(e);
+  }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/Web.config b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/Web.config
new file mode 100644
index 00000000..514c74ce
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/Web.config
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<configuration>
+  <spring>
+    <context>
+      <resource uri="config://spring/objects"/>
+    </context>
+    <objects xmlns="http://www.springframework.net">
+      
+      <!-- use the filename of your Page for the 'type' attribute to configure DI for a Page -->
+      <object type="Default.aspx">
+        <property name="Title" value="Dependency Injection - Hello World Sample"/>
+        <property name="Message">
+          <value>This very simple page demonstrates how to inject dependencies into a Page.</value>
+        </property>
+      </object>
+
+      <!-- use the filename of your UserControl for the 'type' attribute to configure DI for a UserControl -->
+      <object type="CustomControl.ascx">
+        <property name="AnotherMessage" value="This very simple control demonstrates how to inject dependencies into a UserControl."/>
+      </object>
+
+      <!-- use the typename as name to configure DI for any non-UserControl (Note: this will configure *all* TextBoxes!) -->
+      <object name="System.Web.UI.WebControls.TextBox" abstract="true">
+        <property name="Text" value="initial text" />
+      </object>
+
+    </objects>
+  </spring>
+  <system.web>
+
+  </system.web>
+</configuration>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextA/CustomControl.ascx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextA/CustomControl.ascx
new file mode 100644
index 00000000..f18b3729
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextA/CustomControl.ascx
@@ -0,0 +1,3 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeFile="CustomControl.ascx.cs" Inherits="DI_NestedContexts_ContextA_CustomControl" %>
+
+<p><i><%=Message%></i></p>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextA/CustomControl.ascx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextA/CustomControl.ascx.cs
new file mode 100644
index 00000000..573eafa5
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextA/CustomControl.ascx.cs
@@ -0,0 +1,12 @@
+using System;
+
+public partial class DI_NestedContexts_ContextA_CustomControl : System.Web.UI.UserControl
+{
+  private string _message;
+
+  public string Message
+  {
+    get { return this._message; }
+    set { this._message = value; }
+  }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/CustomControl.ascx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/CustomControl.ascx
new file mode 100644
index 00000000..82fff365
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/CustomControl.ascx
@@ -0,0 +1,3 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeFile="CustomControl.ascx.cs" Inherits="DI_NestedContexts_ContextB_CustomControlB" %>
+
+<p><i><%=Message%></i></p>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/CustomControl.ascx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/CustomControl.ascx.cs
new file mode 100644
index 00000000..bcbcf41f
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/CustomControl.ascx.cs
@@ -0,0 +1,11 @@
+
+public partial class DI_NestedContexts_ContextB_CustomControlB : System.Web.UI.UserControl
+{
+  private string _message;
+
+  public string Message
+  {
+    get { return this._message; }
+    set { this._message = value; }
+  }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/Default.aspx
new file mode 100644
index 00000000..55f47da7
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/Default.aspx
@@ -0,0 +1,22 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="DI_NestedContexts_ContextB_Default" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Object definition inheritance example</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <p>
+    <i><%=Message%></i>
+    </p>
+    <p>
+    Below you can see the message from the definition 'GlobalMessage' that is inherited within this child context:
+    </p>
+    <p>
+    <i><%=GlobalMessage%></i>
+    </p>
+    </form>
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/Default.aspx.cs
new file mode 100644
index 00000000..5b4e26b1
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/Default.aspx.cs
@@ -0,0 +1,18 @@
+
+public partial class DI_NestedContexts_ContextB_Default : System.Web.UI.Page
+{
+    private string _message;
+    private string _globalMessage;
+
+    public string Message
+    {
+        get { return this._message; }
+        set { this._message = value; }
+    }
+
+    public string GlobalMessage
+    {
+        get { return this._globalMessage; }
+        set { this._globalMessage = value; }
+    }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/Web.config b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/Web.config
new file mode 100644
index 00000000..f4d2157e
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/ContextB/Web.config
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<configuration>
+    <spring>
+        <context>
+            <resource uri="config://spring/objects"/>
+        </context>
+        <objects xmlns="http://www.springframework.net">
+
+            <!-- "local" object definition of a control - overrides definition from the page's context! -->
+            <object type="CustomControl.ascx">
+                <property name="Message" value="This is the overridden message from ControlB"/>
+            </object>
+
+            <!-- 
+            Note that the definition below does *not* hide "Default.aspx" from the parent context because
+            internally page definitions are stored by their virtual path
+            -->
+            <object type="Default.aspx">
+                <property name="Message" value="This is ContextB's page message!" />
+                <property name="GlobalMessage" ref="GlobalMessage" /> <!-- 'GlobalMessage' is inherited from the parent context -->
+            </object>
+        </objects>
+    </spring>
+</configuration>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/Default.aspx
new file mode 100644
index 00000000..97315e93
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/Default.aspx
@@ -0,0 +1,36 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="DI_NestedContexts_Default" %>
+<%@ Register TagPrefix="ctl" TagName="ControlA" src="ContextA/CustomControl.ascx" %>
+<%@ Register TagPrefix="ctl" TagName="ControlB" src="ContextB/CustomControl.ascx" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Dependency Injection - Nested Contexts example</title>
+</head>
+<body>
+    <h2><a href="../../Default.aspx">Welcome to Spring.NET Web Framework Quick Start Guide</a></h2>
+    <h2><a href="../Default.aspx">Dependency Injection</a></h2>
+    <div>
+    <h2>Nested Contexts example</h2>    
+    <form id="form1" runat="server">
+    <p>
+    This sample illustrates nesting of contexts.
+    </p>
+    <p>
+    Control "A" below demonstrates configuring a control within the page's context:
+    </p>
+    <p>
+    <ctl:ControlA runat="server" />
+    </p>
+    <p>
+    Control "B" below demonstrates configuring a control within the page's context, 
+    but overriding the definition in the control's context.
+    </p>
+    <p>
+    <ctl:ControlB runat="server" />
+    </p>
+    </form>
+    </div>
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/Default.aspx.cs
new file mode 100644
index 00000000..d7be9768
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/Default.aspx.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class DI_NestedContexts_Default : System.Web.UI.Page
+{
+  protected void Page_Load(object sender, EventArgs e)
+  {
+
+  }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/Web.config b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/Web.config
new file mode 100644
index 00000000..ec902eec
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/NestedContexts/Web.config
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<configuration>
+    <spring>
+        <context>
+            <resource uri="config://spring/objects"/>
+        </context>
+        <objects xmlns="http://www.springframework.net">
+
+            <object id="GlobalMessage" type="string">
+                <constructor-arg index="0" value="The GlobalMessage's content" />
+            </object>
+            
+            <!-- Define control "A" in the page's context (the context that is effectively used to configure the .aspx) -->
+            <object type="ContextA/CustomControl.ascx">
+                <property name="Message" value="This is the original message from ControlA"/>
+            </object>
+
+            <!-- 
+            Note that the effective definition for ControlB is *not* defined here 
+            because it is overridden in the web.config next to the control! 
+            -->
+            <object type="ContextB/CustomControl.ascx">
+                <property name="Message" value="This is the original message from ControlB"/>
+            </object>
+
+        </objects>
+    </spring>
+</configuration>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Collections/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Collections/Default.aspx
new file mode 100644
index 00000000..656f991f
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Collections/Default.aspx
@@ -0,0 +1,69 @@
+<%@ Page Language="C#" EnableViewState="false" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="DataBinding_Collections_Default" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Data Binding - HttpRequestListBindingContainer example</title>
+    <script>
+        function addRow() {
+            var src = document.getElementById('itemTemplate');
+            var dst = document.getElementById('products');
+            dst.innerHTML += '<div>' + src.innerHTML + '</div>';
+        }
+    </script>
+</head>
+<body>
+    <h2><a href="../../Default.aspx">Welcome to Spring.NET Web Framework Quick Start Guide</a></h2>
+    <h2><a href="../Default.aspx">Bi-directional DataBinding</a></h2>
+    <form id="form1" runat="server">
+    <div>
+    <h2>HttpRequestListBindingContainer example</h2>
+    <p>
+    This form demonstrates unbinding data from HttpRequest.Form collection into a list model using HttpRequestListBindingContainer.
+    </p>
+    <p>
+    HttpRequestListBindingContainer extracts posted values from the request and populates the specified IList by creating objects 
+    of the type specified and populating each of these objects according to the requestBindings collection.
+    </p>
+    <pre>
+        HttpRequestListBindingContainer requestBindings =
+            new HttpRequestListBindingContainer("sku,name,quantity,price", "Products", typeof(ProductInfo));
+        requestBindings.AddBinding("sku", "Sku");
+        requestBindings.AddBinding("name", "Name");
+        requestBindings.AddBinding("quantity", "Quantity", quantityFormatter);
+        requestBindings.AddBinding("price", "Price", priceFormatter);
+    </pre>
+    Edit List: <br />
+    <div id="products">
+        <table>
+            <tr><td>Firstname</td><td>Lastname</td><td>Quantity</td><td>Price/Item</td></tr>
+    <% 
+    foreach (ProductInfo p in Products) 
+    {
+    %>
+            <tr>
+                <td><input name="sku" type="text" value="<%= p.Sku %>" style="width: 50px;" /></td>
+                <td><input name="name" type="text" value="<%= p.Name %>" style="width: 150px;" /></td>
+                <td><input name="quantity" type="text" value="<%= QuantityFormatter.Format(p.Quantity) %>" style="width: 30px;" /></td>
+                <td><input name="price" type="text" value="<%= PriceFormatter.Format(p.Price) %>" style="width: 50px;" /></td>
+            </tr>
+    <%
+    } 
+    %>
+        </table>
+    </div>
+    <asp:Button ID="btnAdd" Text="Add" runat="server" OnClick="btnAdd_Click" />
+    <asp:Button ID="btnSave" Text="Save" runat="server" OnClick="btnSave_Click" />
+    <button onclick="addRow();">Add row using javascript</button>
+    </div>
+    </form>
+      <div id="itemTemplate" style="display: none">
+        <input name="sku" type="text" value="" style="width: 50px;" />
+        <input name="name" type="text" value="" style="width: 150px;" />
+        <input name="quantity" type="text" value="0" style="width: 30px;" />
+        <input name="price" type="text" value="<%= PriceFormatter.Format(0) %>" style="width: 50px;" />
+        <br />
+      </div>  
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Collections/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Collections/Default.aspx.cs
new file mode 100644
index 00000000..11f7a150
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Collections/Default.aspx.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections;
+using Spring.DataBinding;
+using Spring.Globalization.Formatters;
+
+/// <summary>
+/// Notice that your web page has to extend Spring.Web.UI.Page class
+/// in order to enable data binding and many other features.
+/// </summary>
+public partial class DataBinding_Collections_Default : Spring.Web.UI.Page
+{
+    #region Fields
+
+    private IList products;
+    private readonly IntegerFormatter quantityFormatter = new IntegerFormatter();
+    private readonly CurrencyFormatter priceFormatter = new CurrencyFormatter();
+
+    #endregion
+
+    #region Properties
+
+    public IList Products
+    {
+        get { return products; }
+    }
+
+    public IntegerFormatter QuantityFormatter
+    {
+        get { return quantityFormatter; }
+    }
+
+    public CurrencyFormatter PriceFormatter
+    {
+        get { return priceFormatter; }
+    }
+
+    #endregion
+
+    /// <summary>
+    /// In order to declare data bindings, all you need to do is
+    /// override InitializeDataBindings method and add all necessary
+    /// data bindings to the BindingManager.
+    /// </summary>
+    protected override void InitializeDataBindings()
+    {
+        // HttpRequestListBindingContainer unbinds specified values from Request -> Productlist
+        HttpRequestListBindingContainer requestBindings =
+            new HttpRequestListBindingContainer("sku,name,quantity,price", "Products", typeof(ProductInfo));
+        requestBindings.AddBinding("sku", "Sku");
+        requestBindings.AddBinding("name", "Name");
+        requestBindings.AddBinding("quantity", "Quantity", quantityFormatter);
+        requestBindings.AddBinding("price", "Price", priceFormatter);
+
+        BindingManager.AddBinding(requestBindings);
+    }
+
+    #region Model Management
+
+    protected override void InitializeModel()
+    {
+        products = new ArrayList();
+    }
+
+    protected override void LoadModel(object savedModel)
+    {
+        products = (IList) savedModel;
+    }
+
+    protected override object SaveModel()
+    {
+        return products;
+    }
+
+    #endregion
+    
+    protected void btnAdd_Click(object sender, EventArgs e)
+    {
+        products.Add(new ProductInfo());
+    }
+
+    protected void btnSave_Click(object sender, EventArgs e)
+    {
+        // do something with products...
+    }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Default.aspx
new file mode 100644
index 00000000..1bf778b9
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Default.aspx
@@ -0,0 +1,48 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="DataBinding_Default" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Spring.NET Web Framework Quick Start Guide - Bi-directional DataBinding</title>
+</head>
+<body>
+    <h2><a href="../Default.aspx">Welcome to Spring.NET Web Framework Quick Start Guide</a></h2>
+    <div>
+    <h2>Bi-directional DataBinding</h2>
+    <p>
+    Samples in this section demonstrate Spring.NET's capabilities of bi-directional 
+    binding data between your model and form.
+    </p>
+    <h3><a href="HelloWorld/Default.aspx">Hello World</a></h3>
+    <p>
+    This very simple web form demonstrates basic bi-directional data binding.
+    </p>
+    <h3><a href="EventHandling/Default.aspx">Event Handling</a></h3>
+    <p>
+    This example builds on the previous one by adding postback event handler
+    that will convert the name to uppercase.
+    </p>
+    <h3><a href="Collections/Default.aspx">HttpRequestListBindingContainer</a></h3>
+    <p>
+    This example demonstrates unbinding data from request into a list using a HttpRequestListBindingContainer.
+    </p>
+    <h3><a href="EmployeeInfo/Default.aspx">Employee Info</a></h3>
+    <p>
+    Shows basics of bi-directional databinding with simple webcontrols (TextBox etc.)
+    </p>
+    <h3><a href="RobustEmployeeInfo/Default.aspx">Robust Employee Info</a></h3>
+    <p>
+    Demonstrates basic model validation capabilities
+    </p>
+    <h3><a href="Lists/Default.aspx">Lists</a></h3>
+    <p>
+    Demonstrates bi-directional binding of multi-selection listboxes
+    </p>
+    <h3><a href="EasyEmployeeInfo/Default.aspx">Easy Employee Info</a></h3>
+    <p>
+    Finally shows, how easy life can be when using a DataBindingPanel
+    </p>
+    </div>
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Default.aspx.cs
new file mode 100644
index 00000000..140ae053
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Default.aspx.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class DataBinding_Default : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EasyEmployeeInfo/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EasyEmployeeInfo/Default.aspx
new file mode 100644
index 00000000..370b69ad
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EasyEmployeeInfo/Default.aspx
@@ -0,0 +1,130 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="DataBinding_EasyEmployeeInfo_Default" %>
+<%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Data Binding - Easy Employee Info example</title>
+</head>
+<body>
+    <h2><a href="../../Default.aspx">Welcome to Spring.NET Web Framework Quick Start Guide</a></h2>
+    <h2><a href="../Default.aspx">Bi-directional DataBinding</a></h2>
+    <form id="form1" runat="server">
+    <div>
+    <h2>Easy Employee Info example</h2>
+    <p>
+    Now that you have an idea of how databinding works, here's the easy way using a DataBindingPanel.
+    </p>
+    <p>
+    By placing your controls within a DataBindingPanel, you can use additional attributes 
+    to specify binding information on your server controls.
+    </p>
+    <spring:ValidationSummary ID="ctlErrorList" Provider="errors.summary" runat="server" />
+
+<spring:DataBindingPanel ID="ctlDataBindingPanel" runat="server">
+    <table cellpadding="3" cellspacing="3" border="0">
+        <tr>
+            <td>Employee ID:</td>
+            <td>
+                <asp:TextBox ID="txtId" runat="server" BindingTarget="Employee.Id" MessageId="ID has to be an integer" ErrorProviders="id.errors,errors.summary" />
+                <spring:ValidationError ID="ctlIdErrors" Provider="id.errors" runat="server" />
+            </td>
+        </tr>
+        <tr>
+            <td>First Name:</td>
+            <td><asp:TextBox ID="txtFirstName" runat="server" BindingTarget="Employee.FirstName" /></td>
+        </tr>
+        <tr>
+            <td>Last Name:</td>
+            <td><asp:TextBox ID="txtLastName" runat="server" BindingTarget="Employee.LastName" /></td>
+        </tr>
+        <tr>
+            <td>Date of Birth:</td>
+            <td>
+                <asp:TextBox ID="txtDOB" runat="server" BindingTarget="Employee.DateOfBirth" MessageId="Invalid date value" ErrorProviders="errors.summary,dob.errors"/>
+                <spring:ValidationError ID="ctlDOBErrors" Provider="dob.errors" runat="server" />
+            </td>
+        </tr>
+        <tr>
+            <td>Gender:</td>
+            <td>
+                <!-- 
+                  RadioButtonGroup control exposes Value property which is set
+                  to the value of the ID property of the selected radio button
+                  -->
+                <spring:RadioButtonGroup ID="rbgGender" runat="server" BindingTarget="Employee.Gender">
+                    <asp:RadioButton ID="Male" Text="Male" runat="server" />
+                    <asp:RadioButton ID="Female" Text="Female" runat="server" />
+                </spring:RadioButtonGroup>
+            </td>
+        </tr>
+        <tr>
+            <td>Salary:</td>
+            <td>
+                <asp:TextBox ID="txtSalary" runat="server" BindingTarget="Employee.Salary" BindingFormatter="theCurrencyFormatter" MessageId="Salary must be a valid currency value." ErrorProviders="errors.summary,salary.errors" />
+                <spring:ValidationError ID="ctlSalaryErrors" Provider="salary.errors" runat="server" />
+            </td>
+        </tr>
+        <tr>
+            <td>Address Type:</td>
+            <td>
+                <!-- 
+                  Another way to select one of the predefined values, which is
+                  how enum values should always be entered
+                  -->
+                <asp:DropDownList ID="ddlAddressType" runat="server" BindingTarget="Employee.MailingAddress.AddressType">
+                    <asp:ListItem Value="Home" Text="Home" Selected="True" />
+                    <asp:ListItem Value="Office" Text="Office" />
+                </asp:DropDownList>
+            </td>
+        </tr>
+        <tr>
+            <td>Street 1:</td>
+            <td><asp:TextBox ID="txtStreet1" runat="server" BindingTarget="Employee.MailingAddress.Street1" /></td>
+        </tr>
+        <tr>
+            <td>Street 2:</td>
+            <td><asp:TextBox ID="txtStreet2" runat="server" BindingTarget="Employee.MailingAddress.Street2" /></td>
+        </tr>
+        <tr>
+            <td>City:</td>
+            <td><asp:TextBox ID="txtCity" runat="server" BindingTarget="Employee.MailingAddress.City" /></td>
+        </tr>
+        <tr>
+            <td>State:</td>
+            <td><asp:TextBox ID="txtState" runat="server" BindingTarget="Employee.MailingAddress.State" /></td>
+        </tr>
+        <tr>
+            <td>Postal Code/ZIP:</td>
+            <td><asp:TextBox ID="txtPostalCode" runat="server" BindingTarget="Employee.MailingAddress.PostalCode" /></td>
+        </tr>
+        <tr>
+            <td>Country:</td>
+            <td><asp:TextBox ID="txtCountry" runat="server" BindingTarget="Employee.MailingAddress.Country" /></td>
+        </tr>
+        <tr>
+            <td>Hobbies:</td>
+            <td><asp:ListBox id="lstHobbies" runat="server" SelectionMode="Multiple" BindingTarget="Employee.Hobbies" /></td>
+        </tr>
+        <tr>
+            <td>Favorite Food:</td>
+            <td>   
+                <spring:CheckBoxList id="lstFavoriteFood" runat="server" BindingTarget="Employee.FavoriteFood">
+                    <asp:ListItem value="0">Cheese</asp:ListItem>
+                    <asp:ListItem value="1">Noodles</asp:ListItem>
+                    <asp:ListItem value="2">Fruits</asp:ListItem>
+                    <asp:ListItem value="3">Vegetables</asp:ListItem>
+                </spring:CheckBoxList>
+            </td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td><asp:Button ID="btnSave" runat="server" Text="Save" OnClick="btnSave_Click" /></td>
+        </tr>
+    </table>
+</spring:DataBindingPanel>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EasyEmployeeInfo/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EasyEmployeeInfo/Default.aspx.cs
new file mode 100644
index 00000000..3708c4b3
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EasyEmployeeInfo/Default.aspx.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Diagnostics;
+using System.Web.UI.WebControls;
+
+/// <summary>
+/// Notice that your web page has to extend Spring.Web.UI.Page class
+/// in order to enable data binding and many other features.
+/// </summary>
+public partial class DataBinding_EasyEmployeeInfo_Default : Spring.Web.UI.Page
+{
+    private EmployeeInfo employee = new EmployeeInfo();
+
+    public EmployeeInfo Employee
+    {
+        get { return employee; }
+    }
+
+    protected override void OnInitializeControls(EventArgs e)
+    {
+        base.OnInitializeControls(e);
+
+        InitializeHobbiesList();
+    }
+
+    private void InitializeHobbiesList()
+    {
+        // fill lstHobbies with 'Hobby' items
+        Hobby[] hobbies = {
+                  new Hobby("1", "Tennis"),
+                  new Hobby("2", "Climbing"),
+                  new Hobby("3", "Sailing"),
+                  new Hobby("4", "Reading")
+              };
+
+        this.lstHobbies.SelectionMode = ListSelectionMode.Multiple;
+
+        // assign the list in any case - this is required for DataSourceItemFormatter to be able
+        // to access Hobby objects
+        this.lstHobbies.DataSource = hobbies;
+        this.lstHobbies.DataTextField = "Title";
+        this.lstHobbies.DataValueField = "UniqueKey";
+        if (!IsPostBack)
+        {
+            this.lstHobbies.DataBind();
+        }
+    }
+
+    protected void btnSave_Click(object sender, EventArgs e)
+    {
+        // do something with employee such as:
+        // employeeDao.Save(Employee);
+
+        Debug.Write(Employee);
+    }
+}
+
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EasyEmployeeInfo/Web.Config b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EasyEmployeeInfo/Web.Config
new file mode 100644
index 00000000..dea69150
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EasyEmployeeInfo/Web.Config
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<configuration>
+	<spring>
+		<context>
+			<resource uri="config://spring/objects"/>
+		</context>
+
+		<objects xmlns="http://www.springframework.net">
+<!-- define the currencyFormatter used for formatting the salary -->
+			<object name="theCurrencyFormatter" type="Spring.Globalization.Formatters.CurrencyFormatter" />
+		</objects>
+	</spring>
+
+</configuration>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EmployeeInfo/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EmployeeInfo/Default.aspx
new file mode 100644
index 00000000..d60d220a
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EmployeeInfo/Default.aspx
@@ -0,0 +1,113 @@
+<%@ Page Language="C#" EnableViewState="false" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="DataBinding_EmployeeInfo_Default" %>
+<%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Data Binding - Employee Info example</title>
+</head>
+<body>
+    <h2><a href="../../Default.aspx">Welcome to Spring.NET Web Framework Quick Start Guide</a></h2>
+    <h2><a href="../Default.aspx">Bi-directional DataBinding</a></h2>
+    <form id="form1" runat="server">
+    <div>
+    <h2>Employee Info example</h2>
+    <p>
+    Now we are getting into more interesting stuff :-).
+    </p>
+    <p>
+    This form allows you to enter employee information and it updates properties
+    of the Employee property based on the entered values. You should put a breakpoint
+    on the Debug.Write(Employee) statement in the event handler for the Save button, 
+    so you can see how Employee object was populated by the framework.
+    </p>
+    <p>
+    You should note that there a number of type conversions are performed quietly
+    behind the scenes, such as string to int, double, DateTime, and even enum values.
+    Please also keep in mind that this form is very fragile and it will throw
+    an exception if you enter a value that cannot be converted using standard type
+    conversion mechanism, so make sure that you enter valid values for the ID, Date of Birth,
+    and Salary fields. In the next example we will show you how to make it more robust
+    using formatters and built-in data type validation.
+    </p>
+    <table cellpadding="3" cellspacing="3" border="0">
+        <tr>
+            <td>Employee ID:</td>
+            <td><asp:TextBox ID="txtId" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>First Name:</td>
+            <td><asp:TextBox ID="txtFirstName" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Last Name:</td>
+            <td><asp:TextBox ID="txtLastName" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Date of Birth:</td>
+            <td><asp:TextBox ID="txtDOB" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Gender:</td>
+            <td>
+                <!-- 
+                  RadioButtonGroup control exposes Value property which is set
+                  to the value of the ID property of the selected radio button
+                  -->
+                <spring:RadioButtonGroup ID="rbgGender" runat="server" EnableViewState="false">
+                    <asp:RadioButton ID="Male" Text="Male" runat="server" EnableViewState="false" />
+                    <asp:RadioButton ID="Female" Text="Female" runat="server" EnableViewState="false" />
+                </spring:RadioButtonGroup>
+            </td>
+        </tr>
+        <tr>
+            <td>Salary:</td>
+            <td><asp:TextBox ID="txtSalary" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Address Type:</td>
+            <td>
+                <!-- 
+                  Another way to select one of the predefined values, which is
+                  how enum values should always be entered
+                  -->
+                <asp:DropDownList ID="ddlAddressType" runat="server" EnableViewState="false">
+                    <asp:ListItem Value="Home" Text="Home" Selected="True" />
+                    <asp:ListItem Value="Office" Text="Office" />
+                </asp:DropDownList>
+            </td>
+        </tr>
+        <tr>
+            <td>Street 1:</td>
+            <td><asp:TextBox ID="txtStreet1" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Street 2:</td>
+            <td><asp:TextBox ID="txtStreet2" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>City:</td>
+            <td><asp:TextBox ID="txtCity" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>State:</td>
+            <td><asp:TextBox ID="txtState" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Postal Code/ZIP:</td>
+            <td><asp:TextBox ID="txtPostalCode" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Country:</td>
+            <td><asp:TextBox ID="txtCountry" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td><asp:Button ID="btnSave" runat="server" Text="Save" OnClick="btnSave_Click" /></td>
+        </tr>
+    </table>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EmployeeInfo/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EmployeeInfo/Default.aspx.cs
new file mode 100644
index 00000000..d54b3009
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EmployeeInfo/Default.aspx.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Diagnostics;
+
+/// <summary>
+/// Notice that your web page has to extend Spring.Web.UI.Page class
+/// in order to enable data binding and many other features.
+/// </summary>
+public partial class DataBinding_EmployeeInfo_Default : Spring.Web.UI.Page
+{
+    private EmployeeInfo employee = new EmployeeInfo();
+
+    public EmployeeInfo Employee
+    {
+        get { return employee; }
+    }
+
+    /// <summary>
+    /// In order to declare data bindings, all you need to do is
+    /// override InitializeDataBindings method and add all necessary
+    /// data bindings to the BindingManager.
+    /// </summary>
+    protected override void InitializeDataBindings()
+    {
+        BindingManager.AddBinding("txtId.Text",                     "Employee.Id");
+        BindingManager.AddBinding("txtFirstName.Text",              "Employee.FirstName");
+        BindingManager.AddBinding("txtLastName.Text",               "Employee.LastName");
+        BindingManager.AddBinding("txtDOB.Text",                    "Employee.DateOfBirth");
+        BindingManager.AddBinding("txtSalary.Text",                 "Employee.Salary");
+        BindingManager.AddBinding("rbgGender.Value",                "Employee.Gender");
+        BindingManager.AddBinding("ddlAddressType.SelectedValue",   "Employee.MailingAddress.AddressType");
+        BindingManager.AddBinding("txtStreet1.Text",                "Employee.MailingAddress.Street1");
+        BindingManager.AddBinding("txtStreet2.Text",                "Employee.MailingAddress.Street2");
+        BindingManager.AddBinding("txtCity.Text",                   "Employee.MailingAddress.City");
+        BindingManager.AddBinding("txtState.Text",                  "Employee.MailingAddress.State");
+        BindingManager.AddBinding("txtPostalCode.Text",             "Employee.MailingAddress.PostalCode");
+        BindingManager.AddBinding("txtCountry.Text",                "Employee.MailingAddress.Country");
+    }
+    
+    protected void Page_Load(object sender, EventArgs e)
+    {}
+
+
+    protected void btnSave_Click(object sender, EventArgs e)
+    {
+        // do something with employee such as:
+        // employeeDao.Save(Employee);
+        
+        Debug.Write(Employee);
+    }
+}
+
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EventHandling/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EventHandling/Default.aspx
new file mode 100644
index 00000000..b513448c
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EventHandling/Default.aspx
@@ -0,0 +1,42 @@
+<%@ Page Language="C#" EnableViewState="false" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="DataBinding_EventHandling_Default" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Data Binding - Event Handling example</title>
+</head>
+<body>
+    <h2><a href="../../Default.aspx">Welcome to Spring.NET Web Framework Quick Start Guide</a></h2>
+    <h2><a href="../Default.aspx">Bi-directional DataBinding</a></h2>
+    <form id="form1" runat="server">
+    <div>
+    <h2>Event Handling example</h2>
+    <p>
+    This example builds on the previous one by adding postback event handler
+    that will convert the name to uppercase.
+    </p>
+    <p>
+    This particular example shows the main reason data binding framework was developed
+    in a first place. The idea is that developer should almost never have to access
+    controls directly within postback event handlers. Instead, controls should
+    automatically populate data model on postback and they should be refreshed
+    from the data model just before the page is rendered again.
+    </p>
+    <p>
+    As you can see, developer can modify data model directly within postback event handler 
+    and all the changes will be reflected on the controls when the page is rendered. In 
+    this particular example we use properties within the Page class to hold data model,
+    but there are other alternatives as well, that we'll show you in the later examples.
+    </p>
+    <p>
+    Enter Your Name: <asp:TextBox ID="txtName" runat="server" AutoPostBack="false" Width="150" EnableViewState="False" /> 
+                     <asp:Button ID="btnCapitalize" text="Capitalize" runat="server" OnClick="btnCapitalize_Click" />
+    </p>
+    <div id="divGreeting" runat="server">
+    <b>Hello, <asp:Label ID="lblName" runat="server" /></b>
+    </div>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EventHandling/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EventHandling/Default.aspx.cs
new file mode 100644
index 00000000..18614799
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/EventHandling/Default.aspx.cs
@@ -0,0 +1,42 @@
+using System;
+using Spring.DataBinding;
+
+/// <summary>
+/// Notice that your web page has to extend Spring.Web.UI.Page class
+/// in order to enable data binding and many other features.
+/// </summary>
+public partial class DataBinding_EventHandling_Default : Spring.Web.UI.Page
+{
+    private string name;
+
+    public string Name
+    {
+        get { return name; }
+        set { name = value; }
+    }
+
+    /// <summary>
+    /// In order to declare data bindings, all you need to do is
+    /// override InitializeDataBindings method and add all necessary
+    /// data bindings to the BindingManager.
+    /// </summary>
+    protected override void InitializeDataBindings()
+    {
+        BindingManager.AddBinding("txtName.Text", "Name");
+        BindingManager.AddBinding("lblName.Text", "Name", BindingDirection.TargetToSource);
+    }
+    
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        divGreeting.Visible = !string.IsNullOrEmpty(Name);
+    }
+    
+    /// <summary>
+    /// Event handler simply manipulates data model directly and
+    /// changes are immediately reflected on the page.
+    /// </summary>
+    protected void btnCapitalize_Click(object sender, EventArgs e)
+    {
+        Name = Name.ToUpper();
+    }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/HelloWorld/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/HelloWorld/Default.aspx
new file mode 100644
index 00000000..51b7ad63
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/HelloWorld/Default.aspx
@@ -0,0 +1,38 @@
+<%@ Page Language="C#" EnableViewState="false" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="DataBinding_HelloWorld_Default" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Data Binding - Hello World example</title>
+</head>
+<body>
+    <h2><a href="../../Default.aspx">Welcome to Spring.NET Web Framework Quick Start Guide</a></h2>
+    <h2><a href="../Default.aspx">Bi-directional DataBinding</a></h2>
+    <form id="form1" runat="server">
+    <div>
+    <h2>Hello World example</h2>
+    <p>
+    This very simple web form demonstrates basic bi-directional data binding.
+    </p>
+    <p>
+    Once you enter your name into the text box and submit the form (by hitting Enter), 
+    Spring.NET will evaluate data binding rules configured in the code-behind file and 
+    set the Name property of the page to the value of txtName.Text property.
+    </p>
+    <p>
+    After that, page will be rendered again and Name property will be bound both
+    to the text box, so you can change the value, and to the label below the text
+    box, in order to show you how you can use one-way bindings to set non-writable
+    properties.
+    </p>
+    <p>
+    Enter Your Name: <asp:TextBox ID="txtName" runat="server" Width="150" EnableViewState="False"/>
+    </p>
+    <div id="divGreeting" runat="server">
+    <b>Hello, <asp:Label ID="lblName" runat="server" /></b>
+    </div>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/HelloWorld/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/HelloWorld/Default.aspx.cs
new file mode 100644
index 00000000..b53707b3
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/HelloWorld/Default.aspx.cs
@@ -0,0 +1,33 @@
+using System;
+using Spring.DataBinding;
+
+/// <summary>
+/// Notice that your web page has to extend Spring.Web.UI.Page class
+/// in order to enable data binding and many other features.
+/// </summary>
+public partial class DataBinding_HelloWorld_Default : Spring.Web.UI.Page
+{
+    private string name;
+
+    public string Name
+    {
+        get { return name; }
+        set { name = value; }
+    }
+
+    /// <summary>
+    /// In order to declare data bindings, all you need to do is
+    /// override InitializeDataBindings method and add all necessary
+    /// data bindings to the BindingManager.
+    /// </summary>
+    protected override void InitializeDataBindings()
+    {
+        BindingManager.AddBinding("txtName.Text", "Name");
+        BindingManager.AddBinding("lblName.Text", "Name", BindingDirection.TargetToSource);
+    }
+    
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        divGreeting.Visible = !string.IsNullOrEmpty(Name);
+    }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Lists/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Lists/Default.aspx
new file mode 100644
index 00000000..6b6b1411
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Lists/Default.aspx
@@ -0,0 +1,57 @@
+<%@ Page Language="C#" EnableViewState="true" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="DataBinding_Lists_Default" %>
+<%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Data Binding - Multi-Selection Lists Example</title>
+</head>
+<body>
+    <h2><a href="../../Default.aspx">Welcome to Spring.NET Web Framework Quick Start Guide</a></h2>
+    <h2><a href="../Default.aspx">Bi-directional DataBinding</a></h2>
+    <form id="form1" runat="server">
+    <div>
+    <h2>Multi-Selection Lists example</h2>
+    <p>
+    Life is not 1-dimensional ;-). This sample demonstrates binding of multiple selection lists.
+    </p>
+    <p>
+    This form allows you to enter employee information and it updates properties
+    of the Employee property based on the entered values. You should put a breakpoint
+    on the Debug.Write(Employee) statement in the event handler for the Save button, 
+    so you can see how Employee object was populated by the framework.
+    </p>
+    <table cellpadding="3" cellspacing="3" border="0">
+        <tr>
+            <td>Employee ID:</td>
+            <td><asp:TextBox ID="txtId" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>First Name:</td>
+            <td><asp:TextBox ID="txtFirstName" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Hobbies:</td>
+            <td><asp:ListBox id="lstHobbies" runat="server" SelectionMode="Multiple" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Favorite Food:</td>
+            <td>   
+                <asp:CheckBoxList id="lstFavoriteFood" runat="server" EnableViewState="false">
+                    <asp:ListItem value="0">Cheese</asp:ListItem>
+                    <asp:ListItem value="1">Noodles</asp:ListItem>
+                    <asp:ListItem value="2">Fruits</asp:ListItem>
+                    <asp:ListItem value="3">Vegetables</asp:ListItem>
+                </asp:CheckBoxList>
+            </td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td><asp:Button ID="btnSave" runat="server" Text="Save" OnClick="btnSave_Click" /></td>
+        </tr>
+    </table>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Lists/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Lists/Default.aspx.cs
new file mode 100644
index 00000000..ea80d961
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/Lists/Default.aspx.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Diagnostics;
+using System.Web.UI.WebControls;
+using Spring.DataBinding;
+using Spring.Globalization;
+using Spring.Globalization.Formatters;
+using Spring.Web.UI;
+
+/// <summary>
+/// Notice that your web page has to extend Spring.Web.UI.Page class
+/// in order to enable data binding and many other features.
+/// </summary>
+public partial class DataBinding_Lists_Default : Page
+{
+    private EmployeeInfo employee = new EmployeeInfo();
+
+    public EmployeeInfo Employee
+    {
+        get { return employee; }
+    }
+
+    /// <summary>
+    /// In order to declare data bindings, all you need to do is
+    /// override InitializeDataBindings method and add all necessary
+    /// data bindings to the BindingManager.
+    /// </summary>
+    protected override void InitializeDataBindings()
+    {
+        BindingManager.AddBinding("txtId.Text", "Employee.Id");
+        BindingManager.AddBinding("txtFirstName.Text", "Employee.FirstName");
+
+        // this is rather verbose to show how it works
+
+        // the formatter must convert between ListControl values and domain objects identified by these values (e.g. a key)
+        IFormatter dsFormatter = new DataSourceItemFormatter("DataSource", "DataValueField");
+        // bind the lstHobbies control to Employee.Hobbies IList
+        MultipleSelectionListControlBinding listBinding = new MultipleSelectionListControlBinding("lstHobbies", "Employee.Hobbies", BindingDirection.Bidirectional, dsFormatter);
+        BindingManager.AddBinding(listBinding);
+
+        // use simple name=value binding
+        BindingManager.AddBinding(new MultipleSelectionListControlBinding("lstFavoriteFood", "Employee.FavoriteFood", BindingDirection.Bidirectional, new NullFormatter()));
+    }
+
+    protected override void OnInitializeControls(EventArgs e)
+    {
+        base.OnInitializeControls(e);
+
+        InitializeHobbiesList();
+    }
+
+    private void InitializeHobbiesList()
+    {
+        Hobby[] hobbies = {
+			                  	new Hobby("1", "Tennis"),
+			                  	new Hobby("2", "Climbing"),
+			                  	new Hobby("3", "Sailing"),
+			                  	new Hobby("4", "Reading")
+			                  };
+
+        this.lstHobbies.SelectionMode = ListSelectionMode.Multiple;
+
+        // assign the list in any case - this is required for DataSourceItemFormatter to be able
+        // to access Hobby objects
+        this.lstHobbies.DataSource = hobbies;
+        this.lstHobbies.DataTextField = "Title";
+        this.lstHobbies.DataValueField = "UniqueKey";
+        if (!IsPostBack)
+        {
+            this.lstHobbies.DataBind();
+        }
+    }
+
+    protected void Page_Load(object sender, EventArgs e)
+    {
+    }
+
+
+    protected void btnSave_Click(object sender, EventArgs e)
+    {
+        // do something with employee such as:
+        // employeeDao.Save(Employee);
+
+        Debug.Write(Employee);
+    }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/RobustEmployeeInfo/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/RobustEmployeeInfo/Default.aspx
new file mode 100644
index 00000000..c26beaf9
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/RobustEmployeeInfo/Default.aspx
@@ -0,0 +1,124 @@
+<%@ Page Language="C#" EnableViewState="false" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="DataBinding_RobustEmployeeInfo_Default" %>
+<%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Data Binding - Robust Employee Info example</title>
+</head>
+<body>
+    <h2><a href="../../Default.aspx">Welcome to Spring.NET Web Framework Quick Start Guide</a></h2>
+    <h2><a href="../Default.aspx">Bi-directional DataBinding</a></h2>
+    <form id="form1" runat="server">
+    <div>
+    <h2>Robust Employee Info example</h2>
+    <p>
+    Now that we have basic data binding rules configured, let's make it more robust.
+    </p>
+    <p>
+    In general, you should specify data-type conversion error handlers for every
+    data binding that converts values from one type to another. Optionally, you can
+    also specify a formatter if you need to format and/or parse the value during data
+    binding process, which is exactly what we did for the Salary field. Now you can 
+    enter its value using currency symbol and thousands separator, but entering plain
+    number will still work (and it will be properly formatted after the postback).
+    </p>
+    <p>
+    Control definitions below are almost the same as in the previous example. The only 
+    difference is that we added controls that will be used to display validation errors.
+    </p>
+    <p>
+    Just like in the previous example, you should put a breakpoint
+    on the Debug.Write(Employee) statement in the event handler for the Save button, 
+    so you can see how Employee object was populated by the framework.
+    </p>
+    <table cellpadding="3" cellspacing="3" border="0">
+        <tr>
+            <td>Employee ID:</td>
+            <td>
+                <asp:TextBox ID="txtId" runat="server" EnableViewState="false" />
+                <spring:ValidationError ID="errId" Provider="id.errors" runat="server" />
+            </td>
+        </tr>
+        <tr>
+            <td>First Name:</td>
+            <td><asp:TextBox ID="txtFirstName" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Last Name:</td>
+            <td><asp:TextBox ID="txtLastName" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Date of Birth:</td>
+            <td>
+                <asp:TextBox ID="txtDOB" runat="server" EnableViewState="false" />
+                <spring:ValidationError ID="errDOB" Provider="dob.errors" runat="server" />
+            </td>
+        </tr>
+        <tr>
+            <td>Gender:</td>
+            <td>
+                <!-- 
+                  RadioButtonGroup control exposes Value property which is set
+                  to the value of the ID property of the selected radio button
+                  -->
+                <spring:RadioButtonGroup ID="rbgGender" runat="server" EnableViewState="false">
+                    <asp:RadioButton ID="Male" Text="Male" runat="server" EnableViewState="false" />
+                    <asp:RadioButton ID="Female" Text="Female" runat="server" EnableViewState="false" />
+                </spring:RadioButtonGroup>
+            </td>
+        </tr>
+        <tr>
+            <td>Salary:</td>
+            <td>
+                <asp:TextBox ID="txtSalary" runat="server" EnableViewState="false" />
+                <spring:ValidationError ID="errSalary" Provider="salary.errors" runat="server" />
+            </td>
+        </tr>
+        <tr>
+            <td>Address Type:</td>
+            <td>
+                <!-- 
+                  Another way to select one of the predefined values, which is
+                  how enum values should always be entered
+                  -->
+                <asp:DropDownList ID="ddlAddressType" runat="server" EnableViewState="false">
+                    <asp:ListItem Value="Home" Text="Home" Selected="True" />
+                    <asp:ListItem Value="Office" Text="Office" />
+                </asp:DropDownList>
+            </td>
+        </tr>
+        <tr>
+            <td>Street 1:</td>
+            <td><asp:TextBox ID="txtStreet1" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Street 2:</td>
+            <td><asp:TextBox ID="txtStreet2" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>City:</td>
+            <td><asp:TextBox ID="txtCity" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>State:</td>
+            <td><asp:TextBox ID="txtState" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Postal Code/ZIP:</td>
+            <td><asp:TextBox ID="txtPostalCode" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>Country:</td>
+            <td><asp:TextBox ID="txtCountry" runat="server" EnableViewState="false" /></td>
+        </tr>
+        <tr>
+            <td>&nbsp;</td>
+            <td><asp:Button ID="btnSave" runat="server" Text="Save" OnClick="btnSave_Click" /></td>
+        </tr>
+    </table>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/RobustEmployeeInfo/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/RobustEmployeeInfo/Default.aspx.cs
new file mode 100644
index 00000000..662961fb
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DataBinding/RobustEmployeeInfo/Default.aspx.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Diagnostics;
+using Spring.Globalization.Formatters;
+
+/// <summary>
+/// Notice that your web page has to extend Spring.Web.UI.Page class
+/// in order to enable data binding and many other features.
+/// </summary>
+public partial class DataBinding_RobustEmployeeInfo_Default : Spring.Web.UI.Page
+{
+    private EmployeeInfo employee = new EmployeeInfo();
+
+    public EmployeeInfo Employee
+    {
+        get { return employee; }
+    }
+
+    /// <summary>
+    /// In order to declare data bindings, all you need to do is
+    /// override InitializeDataBindings method and add all necessary
+    /// data bindings to the BindingManager.
+    /// </summary>
+    protected override void InitializeDataBindings()
+    {
+        BindingManager.AddBinding("txtId.Text", "Employee.Id")
+            .SetErrorMessage("ID has to be an integer", "id.errors");
+        BindingManager.AddBinding("txtFirstName.Text", "Employee.FirstName");
+        BindingManager.AddBinding("txtLastName.Text", "Employee.LastName");
+        BindingManager.AddBinding("txtDOB.Text", "Employee.DateOfBirth")
+            .SetErrorMessage("Invalid date value", "dob.errors");
+        BindingManager.AddBinding("txtSalary.Text", "Employee.Salary", new CurrencyFormatter())
+            .SetErrorMessage("Salary must be a valid currency value.", "salary.errors");
+        BindingManager.AddBinding("rbgGender.Value", "Employee.Gender");
+        BindingManager.AddBinding("ddlAddressType.SelectedValue", "Employee.MailingAddress.AddressType");
+        BindingManager.AddBinding("txtStreet1.Text", "Employee.MailingAddress.Street1");
+        BindingManager.AddBinding("txtStreet2.Text", "Employee.MailingAddress.Street2");
+        BindingManager.AddBinding("txtCity.Text", "Employee.MailingAddress.City");
+        BindingManager.AddBinding("txtState.Text", "Employee.MailingAddress.State");
+        BindingManager.AddBinding("txtPostalCode.Text", "Employee.MailingAddress.PostalCode");
+        BindingManager.AddBinding("txtCountry.Text", "Employee.MailingAddress.Country");
+    }
+    
+    protected void Page_Load(object sender, EventArgs e)
+    {}
+
+
+    protected void btnSave_Click(object sender, EventArgs e)
+    {
+        // do something with employee such as:
+        // employeeDao.Save(Employee);
+        
+        Debug.Write(Employee);
+    }
+}
+
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Default.aspx
new file mode 100644
index 00000000..460b5055
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Default.aspx
@@ -0,0 +1,73 @@
+<%@ Page Language="C#" AutoEventWireup="true"  CodeFile="Default.aspx.cs" Inherits="_Default" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Spring.NET Web Framework Quick Start Guide</title>
+</head>
+<body>
+    <h2>Welcome to Spring.NET Web Framework Quick Start Guide</h2>
+    <div>
+    <p>
+    This sample application provides a number of small Quick Starts
+    that demonstrate various features of the Spring.NET Web Framework.
+    </p>
+    <p>
+    Spring.NET Web Framework is an extension to ASP.NET that adds many
+    powerful features, such as Dependency Injection for web pages and
+    controls, bi-directional data binding, localization support, etc.
+    </p>
+    <p>
+    It also integrates extremely well with Spring.NET Data Validation Framework
+    and allows you to declaratively configure very complex and sophisticated
+    data validation rules.
+    </p>
+    <p>
+    Once you become acquainted with all the individual features of Spring.NET 
+    Web Framework by studying this application, you should take a look at SpringAir
+    sample application for a more integrated view, in order to see how many of these
+    features are combined into an application.
+    </p>
+    <h2>Feature Categories</h2>
+    <p>
+    Following sections provide a brief overview of different Spring.NET Web Framework
+    feature catagories. Within each category you will find small examples that clearly 
+    demonstrate various features within that category, which will be very beneficial 
+    to everyone who prefers to learn by example.
+    </p>
+    <h3><a href="DI/Default.aspx">Dependency Injection</a></h3>
+    <p>
+    Samples in this category show you how to inject dependencies into your web pages
+    and controls using Spring.NET DI Container. You will learn about different 
+    configuration options, basic steps you need to take in order to enable DI in your
+    pages, and then move on to more complex examples that will show you how to separate
+    your application into components using hierarchical web contexts.
+    </p>
+    <h3><a href="DataBinding/Default.aspx">Bi-directional Data Binding</a></h3>
+    <p>
+    By studying samples in this category, you will learn how to declaratively define
+    data binding rules that will save you a ton of time and many lines of code when
+    developing Spring.NET-powered web applications. We will start with basic examples 
+    and then move on to using more advanced features, such as type conversion, formatting,
+    automatic validation and binding to complex iterative structures.
+    </p>
+    <h3>Localization</h3>
+    <p>
+    In this section you will learn how to properly localize your web applications. We will
+    start with very simple automatic localization, and then move on to demonstrate different
+    user culture management strategies, explicit localization options, and localization of
+    images within your application.
+    </p>
+    <h3>Data Validation</h3>
+    <p>
+    Spring.NET includes a very powerful, generic Data Validation Framework. This framework is 
+    very tightly integrated with Spring.NET Web Framework, and it allows you to configure 
+    sophisticated validation rules and execute them as necessary. In this section we will
+    start with a Hello World! validation example and then move on to show you how you can 
+    compose advanced validation rules that leverage validation groups, conditional validation,
+    validator composition, as well as how to create and use your custom validators.
+    </p>
+    </div>
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Default.aspx.cs
new file mode 100644
index 00000000..e4822622
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Default.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class _Default : System.Web.UI.Page 
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Web.Config b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Web.Config
new file mode 100644
index 00000000..bf3acac1
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/Web.Config
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<configuration>
+	<configSections>
+		<sectionGroup name="spring">
+			<section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/>
+			<section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
+		</sectionGroup>
+		<sectionGroup name="common">
+			<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging"/>
+		</sectionGroup>
+	</configSections>
+	<!-- to see logging output in the attached debugger -->
+	<common>
+		<logging>
+			<factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
+				<arg key="Level" value="ALL"/>
+			</factoryAdapter>
+		</logging>
+	</common>
+	<system.web>
+		<compilation debug="true">
+			<assemblies>
+				<add assembly="System.DirectoryServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/></assemblies></compilation>
+		<pages>
+			<controls>
+				<add tagPrefix="spring" namespace="Spring.Web.UI.Controls" assembly="Spring.Web"/>
+			</controls>
+		</pages>
+		<!--
+    The following needs to be configured in order to enable Spring.NET Web Framework features
+    -->
+		<httpModules>
+			<add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+			<add name="HtmlCommentAppender" type="HtmlCommentAppenderModule"/>
+			<!-- this custom module is only for DI demonstration purposes -->
+		</httpModules>
+		<httpHandlers>
+			<add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
+		</httpHandlers>
+	</system.web>
+	<!-- demonstrates how to configure IHttpModule instances -->
+	<spring>
+		<context>
+			<resource uri="config://spring/objects"/>
+		</context>
+		<objects xmlns="http://www.springframework.net">
+			<!-- configure our custom HttpModule -->
+			<object name="HttpApplicationConfigurer" type="Spring.Context.Support.HttpApplicationConfigurer, Spring.Web">
+				<property name="ModuleTemplates">
+					<dictionary>
+						<entry key="HtmlCommentAppender">
+							<!-- this name must match the module name -->
+							<object>
+								<!-- select "view source" in your browser on any page to see the appended html comment -->
+								<property name="AppendText" value="My configured comment!"/>
+							</object>
+						</entry>
+					</dictionary>
+				</property>
+			</object>
+		</objects>
+	</spring>
+</configuration>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/App_Code/TextFileWebEventProvider.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/App_Code/TextFileWebEventProvider.cs
new file mode 100644
index 00000000..6a25359f
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/App_Code/TextFileWebEventProvider.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Web.Management;
+using System.Configuration.Provider;
+using System.Collections.Specialized;
+using System.Web.Hosting;
+using System.IO;
+using System.Security.Permissions;
+using System.Web;
+
+
+public class TextFileWebEventProvider : WebEventProvider
+{
+    private string _LogFileName;
+
+    public override void Initialize(string name,
+                                    NameValueCollection config)
+    {
+// Verify that config isn't null
+        if (config == null)
+            throw new ArgumentNullException("config");
+// Assign the provider a default name if it doesn't have one
+        if (String.IsNullOrEmpty(name))
+            name = "TextFileWebEventProvider";
+// Add a default "description" attribute to config if the
+// attribute doesn't exist or is empty
+        if (string.IsNullOrEmpty(config["description"]))
+        {
+            config.Remove("description");
+            config.Add("description", "Text file Web event provider");
+        }
+// Call the base class's Initialize method
+        base.Initialize(name, config);
+// Initialize _LogFileName and make sure the path
+// is app-relative
+        string path = config["logFileName"];
+        if (String.IsNullOrEmpty(path))
+            throw new ProviderException
+                ("Missing logFileName attribute");
+        if (!VirtualPathUtility.IsAppRelative(path))
+            throw new ArgumentException
+                ("logFileName must be app-relative");
+        string fullyQualifiedPath = VirtualPathUtility.Combine
+            (VirtualPathUtility.AppendTrailingSlash
+                 (HttpRuntime.AppDomainAppVirtualPath), path);
+        _LogFileName = HostingEnvironment.MapPath(fullyQualifiedPath);
+        config.Remove("logFileName");
+// Make sure we have permission to write to the log file
+// throw an exception if we don't
+        FileIOPermission permission =
+            new FileIOPermission(FileIOPermissionAccess.Write |
+                                 FileIOPermissionAccess.Append, _LogFileName);
+        permission.Demand();
+// Throw an exception if unrecognized attributes remain
+        if (config.Count > 0)
+        {
+            string attr = config.GetKey(0);
+            if (!String.IsNullOrEmpty(attr))
+                throw new ProviderException
+                    ("Unrecognized attribute: " + attr);
+        }
+    }
+
+    public override void ProcessEvent(WebBaseEvent raisedEvent)
+    {
+// Write an entry to the log file
+        LogEntry(FormatEntry(raisedEvent));
+    }
+
+    public override void Flush()
+    {
+    }
+
+    public override void Shutdown()
+    {
+    }
+
+// Helper methods
+    private string FormatEntry(WebBaseEvent e)
+    {
+        return String.Format("{0}\t{1}\t{2} (Event Code: {3})",
+                             e.EventTime, e.GetType().ToString(), e.Message,
+                             e.EventCode);
+    }
+
+    private void LogEntry(string entry)
+    {
+        StreamWriter writer = null;
+        try
+        {
+            writer = new StreamWriter(_LogFileName, true);
+            writer.WriteLine(entry);
+        }
+        finally
+        {
+            if (writer != null)
+                writer.Close();
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/App_Data/ASPNETDB.MDF b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/App_Data/ASPNETDB.MDF
new file mode 100644
index 00000000..5ecfc728
Binary files /dev/null and b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/App_Data/ASPNETDB.MDF differ
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/App_Data/aspnetdb_log.ldf b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/App_Data/aspnetdb_log.ldf
new file mode 100644
index 00000000..8134239e
Binary files /dev/null and b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/App_Data/aspnetdb_log.ldf differ
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Config/Web.xml b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Config/Web.xml
new file mode 100644
index 00000000..749fdda8
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Config/Web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+    <object id="mySqlMembershipProvider" type="Spring.Web.Providers.ConfigurableSqlMembershipProvider">
+        <property name="connectionStringName" value="MyLocalSQLServer" />
+        <property name="parameters">
+            <name-values>
+                <add key="description" value="membershipprovider description" />
+            </name-values>
+        </property>
+    </object>
+
+    <object id="mySqlRoleProvider" type="Spring.Web.Providers.ConfigurableSqlRoleProvider">
+        <property name="connectionStringName" value="MyLocalSQLServer" />
+        <property name="parameters">
+            <name-values>
+                <add key="description" value="roleprovider description" />
+            </name-values>
+        </property>
+    </object>
+
+    <object id="mySqlProfileProvider" type="Spring.Web.Providers.ConfigurableSqlProfileProvider">
+        <property name="connectionStringName" value="MyLocalSQLServer" />
+        <property name="parameters">
+            <name-values>
+                <add key="description" value="profileprovider description" />
+            </name-values>
+        </property>
+    </object>
+
+    <object id="myXmlSiteMapProvider" type="Spring.Web.Providers.ConfigurableXmlSiteMapProvider">
+        <property name="siteMapFile" value="Web.sitemap" />
+        <property name="parameters">
+            <name-values>
+                <add key="description" value="profileprovider description" />
+            </name-values>
+        </property>
+    </object>
+    
+</objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Default.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Default.aspx
new file mode 100644
index 00000000..b20df1fb
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Default.aspx
@@ -0,0 +1,24 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="_Default" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Untitled Page</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div>
+    <h1><asp:Label ID="LblTest" runat="server" Text="Welcome to Provider Test"></asp:Label></h1>
+     <a id="SitemapTestLink" href="SitemapTest.aspx"> test sitemap provider</a>
+    <br />
+    <a id="MembershipTestLink" href="TestProviders/MembershipTest.aspx"> test membership provider </a>    
+    <br />
+    <a id="ProfileTestLink" href="TestProviders/ProfileTest.aspx"> test profile provider </a>
+    <br />
+    <a id="RoleProviderLink" href="TestProviders/RolesTest.aspx"> test role provider<br /></a>
+    <br />
+        </div>
+    </form>
+</body>
+</html>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Default.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Default.aspx.cs
new file mode 100644
index 00000000..0d49e900
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Default.aspx.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class _Default : System.Web.UI.Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+
+    }
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Global.asax b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Global.asax
new file mode 100644
index 00000000..72a11eeb
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Global.asax
@@ -0,0 +1,35 @@
+<%@ Application Language="C#" %>
+
+<script runat="server">
+    void Application_Start(object sender, EventArgs e) 
+    {
+    }
+    
+    void Application_End(object sender, EventArgs e) 
+    {
+        //  Code that runs on application shutdown
+
+    }
+        
+    void Application_Error(object sender, EventArgs e) 
+    { 
+        // Code that runs when an unhandled error occurs
+
+    }
+
+    void Session_Start(object sender, EventArgs e) 
+    {
+        // Code that runs when a new session is started
+
+    }
+
+    void Session_End(object sender, EventArgs e) 
+    {
+        // Code that runs when a session ends. 
+        // Note: The Session_End event is raised only when the sessionstate mode
+        // is set to InProc in the Web.config file. If session mode is set to StateServer 
+        // or SQLServer, the event is not raised.
+
+    }
+       
+</script>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/SitemapTest.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/SitemapTest.aspx
new file mode 100644
index 00000000..9e1ef2ed
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/SitemapTest.aspx
@@ -0,0 +1,38 @@
+<%@ Page Language="C#" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+<title>Profile Provider Test</title>
+<SCRIPT runat="server">
+private void Page_Load(object sender, System.EventArgs e)
+{
+    SiteMapProvider defaultProvider = SiteMap.Provider;
+    this.TxtDescription.Text = defaultProvider.Description;
+    this.TxtName.Text = defaultProvider.Name;
+    this.TxtType.Text = defaultProvider.GetType().ToString();
+    
+    this.LstAllNodes.Items.Add(SiteMap.RootNode.Url);
+    foreach (SiteMapNode sitemapnode in SiteMap.RootNode.ChildNodes)
+    {
+        this.LstAllNodes.Items.Add(sitemapnode.Url);        
+    }        
+}
+</SCRIPT>
+</head>
+<body>
+    <form id="form1" runat="server">
+                    
+            <asp:Label ID="LblName" runat="server" Text="Provider Name:"></asp:Label>
+            <asp:TextBox ID="TxtName" runat="server"></asp:TextBox>
+            <br />
+            <asp:Label ID="LblDescription" runat="server" Text="Provider Description:"></asp:Label>
+            <asp:TextBox ID="TxtDescription" runat="server"></asp:TextBox><br />
+            <br />
+            <asp:Label ID="Label1" runat="server" Text="Provider Type:"></asp:Label>
+            <asp:TextBox ID="TxtType" runat="server"></asp:TextBox>
+            <br />
+            <asp:Label ID="LblAllNodes" runat="server" Text="All members:"></asp:Label><br />
+            <asp:ListBox ID="LstAllNodes" runat="server" Height="149px" Width="219px"></asp:ListBox>        
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/SitemapTest.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/SitemapTest.aspx.cs
new file mode 100644
index 00000000..489fcea2
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/SitemapTest.aspx.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class Test1 : Spring.Web.UI.Page
+{
+
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/MembershipTest.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/MembershipTest.aspx
new file mode 100644
index 00000000..2f9aa1e6
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/MembershipTest.aspx
@@ -0,0 +1,38 @@
+<%@ Page Language="C#" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+<title>Profile Provider Test</title>
+<SCRIPT runat="server">
+private void Page_Load(object sender, System.EventArgs e)
+{
+    MembershipProvider defaultProvider = Membership.Provider;
+    this.TxtDescription.Text = defaultProvider.Description;
+    this.TxtName.Text = defaultProvider.Name;
+    this.TxtType.Text = defaultProvider.GetType().ToString();
+    
+    LstAllMembers.Items.Clear();
+    foreach (MembershipUser user in Membership.GetAllUsers())
+    {
+        LstAllMembers.Items.Add(user.UserName);
+    }
+}
+</SCRIPT>
+</head>
+<body>
+    <form id="form1" runat="server">
+                    
+            <asp:Label ID="LblName" runat="server" Text="Provider Name:"></asp:Label>
+            <asp:TextBox ID="TxtName" runat="server"></asp:TextBox>
+            <br />
+            <asp:Label ID="LblDescription" runat="server" Text="Provider Description:"></asp:Label>
+            <asp:TextBox ID="TxtDescription" runat="server"></asp:TextBox><br />
+            <br />
+            <asp:Label ID="Label1" runat="server" Text="Provider Type:"></asp:Label>
+            <asp:TextBox ID="TxtType" runat="server"></asp:TextBox>
+            <br />
+            <asp:Label ID="LblAllMembers" runat="server" Text="All members:"></asp:Label><br />
+            <asp:ListBox ID="LstAllMembers" runat="server" Height="149px" Width="219px"></asp:ListBox>        
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/MembershipTest.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/MembershipTest.aspx.cs
new file mode 100644
index 00000000..ea56cee7
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/MembershipTest.aspx.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class MembershipTest : Spring.Web.UI.Page
+{
+
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/ProfileTest.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/ProfileTest.aspx
new file mode 100644
index 00000000..ab472564
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/ProfileTest.aspx
@@ -0,0 +1,27 @@
+<%@ Page Language="C#" EnableViewState="true" %>
+<%@ Import namespace="System.Web.Profile"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+<title>Profile Provider Test</title>
+<SCRIPT runat="server">
+private void Page_Load(object sender, System.EventArgs e)
+{ 
+       
+    this.TxtGreeting.Text = Profile.Greeting;
+    this.TxtUsername.Text = Profile.UserName;
+    
+}
+</SCRIPT>
+</head>
+<body>
+    <form id="form1" runat="server">
+                    
+            <asp:Label ID="LblUsername" runat="server" Text="Logged Username:"></asp:Label>
+            <asp:TextBox ID="TxtUsername" runat="server"></asp:TextBox>
+            <br />
+            <asp:Label ID="Lblgreeting" runat="server" Text="User's Greeting:"></asp:Label>
+            <asp:TextBox ID="TxtGreeting" runat="server"></asp:TextBox><br />    
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/ProfileTest.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/ProfileTest.aspx.cs
new file mode 100644
index 00000000..e9c7ae97
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/ProfileTest.aspx.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class ProfileTest : Spring.Web.UI.Page
+{
+
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/RolesTest.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/RolesTest.aspx
new file mode 100644
index 00000000..dcca615b
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/RolesTest.aspx
@@ -0,0 +1,39 @@
+<%@ Page Language="C#" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+<title>Profile Provider Test</title>
+<SCRIPT runat="server">
+private void Page_Load(object sender, System.EventArgs e)
+{
+    
+        
+    RoleProvider defaultProvider = Roles.Provider;    
+    this.TxtDescription.Text = defaultProvider.Description;
+    this.TxtName.Text = defaultProvider.Name;
+    this.TxtType.Text = defaultProvider.GetType().ToString();   
+    
+    foreach (string role in Roles.GetAllRoles())
+    {
+        LstAllRoles.Items.Add(role);
+    }
+}
+</SCRIPT>
+</head>
+<body>
+    <form id="form1" runat="server">
+                    
+            <asp:Label ID="LblName" runat="server" Text="Provider Name:"></asp:Label>
+            <asp:TextBox ID="TxtName" runat="server"></asp:TextBox>
+            <br />
+            <asp:Label ID="LblDescription" runat="server" Text="Provider Description:"></asp:Label>
+            <asp:TextBox ID="TxtDescription" runat="server"></asp:TextBox><br />
+            <br />
+            <asp:Label ID="Label1" runat="server" Text="Provider Type:"></asp:Label>
+            <asp:TextBox ID="TxtType" runat="server"></asp:TextBox>
+            <br />
+            <asp:Label ID="LblAllRoles" runat="server" Text="All roles:"></asp:Label><br />
+            <asp:ListBox ID="LstAllRoles" runat="server" Height="149px" Width="219px"></asp:ListBox>        
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/RolesTest.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/RolesTest.aspx.cs
new file mode 100644
index 00000000..755d54f0
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/RolesTest.aspx.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class RolesTest : Spring.Web.UI.Page
+{
+
+}
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/Web.config b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/Web.config
new file mode 100644
index 00000000..d772f475
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/TestProviders/Web.config
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<configuration>
+  <location>
+    <system.web>
+      <authorization>        
+        <deny users="?" />
+        <allow users="Damjan" />
+      </authorization>
+    </system.web>
+  </location>
+</configuration>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/UserLogin.aspx b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/UserLogin.aspx
new file mode 100644
index 00000000..96366dfb
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/UserLogin.aspx
@@ -0,0 +1,33 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="UserLogin.aspx.cs" Inherits="Admin_Login" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>login</title>
+</head>
+<body>
+    <form id="LoginForm" runat="server">
+        <div align="center">
+            Please enter your login information:<br />
+                <br />
+                <table width="450px" border="0" cellpadding="0" cellspacing="0">
+                    <tr>
+                        <td align="left" >Username:</td>
+                        <td align="left">
+                            <asp:TextBox ID="UsernameText" runat="server" />                            
+                        </td>
+                    </tr>                    
+                    <tr>
+                        <td align="left">Password:</td>
+                        <td align="left">
+                            <asp:TextBox ID="PasswordText" runat="server" TextMode="Password" />                            
+                        </td>
+                    </tr>
+                </table>
+                <br />
+                <asp:Button ID="LoginAction" runat="server" OnClick="LoginAction_Click" Text="Login" /><br />
+                <asp:Label ID="LegendStatus" runat="server" EnableViewState="false" Text="" />
+        </div>
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/UserLogin.aspx.cs b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/UserLogin.aspx.cs
new file mode 100644
index 00000000..5296cb96
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/UserLogin.aspx.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Web.Security;
+using Spring.Web.UI;
+
+public partial class Admin_Login : Page
+{
+    protected void Page_Load(object sender, EventArgs e)
+    {
+    }
+
+    protected void LoginAction_Click(object sender, EventArgs e)
+    {        
+        string user = UsernameText.Text;
+        string pass = PasswordText.Text;
+
+            if (Membership.ValidateUser(user, pass))
+            {
+                FormsAuthentication.RedirectFromLoginPage(user, false);
+            }
+            else
+            {
+                LegendStatus.Text = "Error!";
+            }        
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Web.config b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Web.config
new file mode 100644
index 00000000..fab1e14f
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Web.config
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<configuration xmlns="http://schemas.microsoft.com/.NetConfiguration/v2.0">
+    <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>
+    </configSections>
+    <common>
+        <logging>
+            <factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
+                <arg key="level" value="ALL"/>
+            </factoryAdapter>
+        </logging>
+    </common>
+    <spring>
+        <context>
+            <resource uri="~/Config/Web.xml"/>
+            <resource uri="config://spring/objects"/>
+        </context>
+        <objects xmlns="http://www.springframework.net">
+            <object type="~/UserLogin.aspx" />
+        </objects>
+    </spring>
+    <appSettings>
+        <add key="Name" value="SpringNetProvidersTest"/>
+    </appSettings>
+    <connectionStrings>
+        <add name="MyLocalSQLServer"
+             connectionString="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|ASPNETDB.MDF;Integrated Security=SSPI;User Instance=True"
+             providerName="System.Data.SqlClient"
+        />
+    </connectionStrings>
+    <system.web>
+        <httpModules>
+            <add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+        </httpModules>
+        <httpHandlers>
+            <add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
+            <add verb="*" path="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web"/>
+        </httpHandlers>
+        <compilation debug="true">
+            <assemblies>
+                <add assembly="System.DirectoryServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
+            </assemblies>
+        </compilation>
+        <authentication mode="Forms">
+            <forms name="Login" loginUrl="UserLogin.aspx" timeout="20" protection="All"/>
+        </authentication>
+        <membership defaultProvider="mySqlMembershipProvider">
+            <providers>
+                <clear/>
+                <add connectionStringName="" name="mySqlMembershipProvider" type="Spring.Web.Providers.MembershipProviderAdapter, Spring.Web"/>
+            </providers>
+        </membership>
+        <roleManager enabled="true" defaultProvider="mySqlRoleProvider">
+            <providers>
+                <clear/>
+                <add connectionStringName="" name="mySqlRoleProvider" type="Spring.Web.Providers.RoleProviderAdapter, Spring.Web"/>
+            </providers>
+        </roleManager>
+        <profile defaultProvider="mySqlProfileProvider">
+            <providers>
+                <clear/>
+                <add name="mySqlProfileProvider" type="Spring.Web.Providers.ProfileProviderAdapter, Spring.Web" connectionStringName=""/>
+            </providers>
+            <properties>
+                <add name="Greeting" type="String"/>
+            </properties>
+        </profile>
+        <siteMap defaultProvider="myXmlSiteMapProvider">
+            <providers>
+                <clear/>
+                <add name="myXmlSiteMapProvider" type="Spring.Web.Providers.SiteMapProviderAdapter, Spring.Web" siteMapFile=""/>
+            </providers>
+        </siteMap>
+        <!---->
+        <!--
+    <healthMonitoring enabled="true">
+      <providers>
+        <add name="AspNetTextFileWebEventProvider" type="TextFileWebEventProvider" logFileName="~/App_Data/MyTest.txt"/>
+
+      </providers>
+      <rules>
+        <add name="TestWS Application Lifetime Events"  eventName="All Events" provider="AspNetTextFileWebEventProvider" minInterval="00:00:01" minInstances="1" maxLimit="Infinite"/>
+      </rules>
+    </healthMonitoring>
+-->
+    </system.web>
+</configuration>
diff --git a/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Web.sitemap b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Web.sitemap
new file mode 100644
index 00000000..71175a12
--- /dev/null
+++ b/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.Providers/Web.sitemap
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<siteMap xmlns="http://schemas.microsoft.com/AspNet/SiteMap-File-1.0">
+  <siteMapNode url="~/Default.aspx" title="Home" roles="*">
+    <siteMapNode url="~/SitemapTest.aspx" title="Site Map" />
+    
+    <siteMapNode url="~/TestProviders/MembershipTest.aspx" title="Site Map" />
+    <siteMapNode url="~/TestProviders/ProfileTest.aspx" title="Site Map" />  
+  </siteMapNode>
+</siteMap>
diff --git a/examples/Spring/SpringAir/SpringAir.2003.sln b/examples/Spring/SpringAir/SpringAir.2003.sln
new file mode 100644
index 00000000..f3681514
--- /dev/null
+++ b/examples/Spring/SpringAir/SpringAir.2003.sln
@@ -0,0 +1,53 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Core.2003", "src\SpringAir.Core\SpringAir.Core.2003.csproj", "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Core.Tests.2003", "test\SpringAir.Core.Tests\SpringAir.Core.Tests.2003.csproj", "{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Data.Ado.2003", "src\SpringAir.Data.Ado\SpringAir.Data.Ado.2003.csproj", "{78B285FE-27F3-44F4-84B1-7A589AB48EF3}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Web.2003", "http://localhost/SpringAir.2003/SpringAir.Web.2003.csproj", "{B29E702D-DC32-42B4-8A15-AC7C07CFC48D}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Data.Ado.Tests.2003", "test\SpringAir.Data.Ado.Tests\SpringAir.Data.Ado.Tests.2003.csproj", "{B0A6F98E-5363-4575-BB6B-A84E91895468}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug.ActiveCfg = Debug|.NET
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug.Build.0 = Debug|.NET
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release.ActiveCfg = Release|.NET
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release.Build.0 = Release|.NET
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug.ActiveCfg = Debug|.NET
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug.Build.0 = Debug|.NET
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release.ActiveCfg = Release|.NET
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release.Build.0 = Release|.NET
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug.ActiveCfg = Debug|.NET
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug.Build.0 = Debug|.NET
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release.ActiveCfg = Release|.NET
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release.Build.0 = Release|.NET
+		{B29E702D-DC32-42B4-8A15-AC7C07CFC48D}.Debug.ActiveCfg = Debug|.NET
+		{B29E702D-DC32-42B4-8A15-AC7C07CFC48D}.Debug.Build.0 = Debug|.NET
+		{B29E702D-DC32-42B4-8A15-AC7C07CFC48D}.Release.ActiveCfg = Release|.NET
+		{B29E702D-DC32-42B4-8A15-AC7C07CFC48D}.Release.Build.0 = Release|.NET
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug.ActiveCfg = Debug|.NET
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug.Build.0 = Debug|.NET
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release.ActiveCfg = Release|.NET
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release.Build.0 = Release|.NET
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/SpringAir/SpringAir.2005.sln b/examples/Spring/SpringAir/SpringAir.2005.sln
new file mode 100644
index 00000000..7e02c9af
--- /dev/null
+++ b/examples/Spring/SpringAir/SpringAir.2005.sln
@@ -0,0 +1,129 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "D:\...\SpringAir.Web.2005\", "src\SpringAir.Web.2005\", "{839602F5-8077-497D-9CCB-C9F02741CA55}"
+	ProjectSection(WebsiteProperties) = preProject
+		ProjectReferences = "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}|SpringAir.Core.dll;{78B285FE-27F3-44F4-84B1-7A589AB48EF3}|SpringAir.Data.Ado.dll;{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}|SpringAir.Web.2005.References.dll;"
+		Debug.AspNetCompiler.VirtualPath = "/SpringAir.Web.2005"
+		Debug.AspNetCompiler.PhysicalPath = "src\SpringAir.Web.2005\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\SpringAir.Web.2005\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/SpringAir.Web.2005"
+		Release.AspNetCompiler.PhysicalPath = "src\SpringAir.Web.2005\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\SpringAir.Web.2005\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "4816"
+		DefaultWebSiteLanguage = "Visual C#"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Core.2005", "src\SpringAir.Core\SpringAir.Core.2005.csproj", "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Core.Tests.2005", "test\SpringAir.Core.Tests\SpringAir.Core.Tests.2005.csproj", "{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Data.Ado.2005", "src\SpringAir.Data.Ado\SpringAir.Data.Ado.2005.csproj", "{78B285FE-27F3-44F4-84B1-7A589AB48EF3}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Data.Ado.Tests.2005", "test\SpringAir.Data.Ado.Tests\SpringAir.Data.Ado.Tests.2005.csproj", "{B0A6F98E-5363-4575-BB6B-A84E91895468}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpringAir.Web.2005.References", "src\SpringAir.Web.2005.References\SpringAir.Web.2005.References.csproj", "{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|.NET = Debug|.NET
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|.NET = Release|.NET
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|.NET.ActiveCfg = Debug|.NET
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|.NET.Build.0 = Debug|.NET
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Any CPU.ActiveCfg = Debug|.NET
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Debug|Mixed Platforms.Build.0 = Debug|.NET
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|.NET.ActiveCfg = Debug|.NET
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|.NET.Build.0 = Debug|.NET
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Any CPU.ActiveCfg = Debug|.NET
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Mixed Platforms.ActiveCfg = Debug|.NET
+		{839602F5-8077-497D-9CCB-C9F02741CA55}.Release|Mixed Platforms.Build.0 = Debug|.NET
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|.NET.ActiveCfg = Release|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5E3427D8-62FC-483F-A86B-B44A79A46BCC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|.NET.ActiveCfg = Release|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{78B285FE-27F3-44F4-84B1-7A589AB48EF3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|.NET.ActiveCfg = Release|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B0A6F98E-5363-4575-BB6B-A84E91895468}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|.NET.ActiveCfg = Release|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/examples/Spring/SpringAir/SpringAir.build b/examples/Spring/SpringAir/SpringAir.build
new file mode 100644
index 00000000..a498a6c0
--- /dev/null
+++ b/examples/Spring/SpringAir/SpringAir.build
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<project name="SpringAir" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+
+  <target name="test">
+    <nant buildfile="src\SpringAir.Core\SpringAir.Core.build" target="build" />
+    <nant buildfile="test\SpringAir.Core.Tests\SpringAir.Core.Tests.build" target="test" />
+    <!--
+    <nant buildfile="src\SpringAir.Data.Ado\SpringAir.Data.Ado.build" target="build" />
+    -->
+    <nant buildfile="src\SpringAir.Web.2003\SpringAir.Web.build" target="build" if="${ 'net-1.1' == '${framework::get-family(framework::get-target-framework())}-${framework::get-version(framework::get-target-framework())}' }" />
+    <nant buildfile="src\SpringAir.Web.2005\SpringAir.Web.build" target="build" if="${ 'net-2.0' == '${framework::get-family(framework::get-target-framework())}-${framework::get-version(framework::get-target-framework())}' }" />
+  </target>
+
+
+  <target name="clean-obj">
+	<delete dir="src\SpringAir.Data.Ado\obj" failonerror="false"/>
+	<delete dir="src\SpringAir.Data.Ado\bin" failonerror="false"/>
+	<delete dir="src\SpringAir.Core\obj" failonerror="false"/>
+	<delete dir="src\SpringAir.Core\bin" failonerror="false"/>
+	<delete dir="test\SpringAir.Core.Tests\obj" failonerror="false"/>
+	<delete dir="test\SpringAir.Core.Tests\bin" failonerror="false"/>
+	<delete dir="test\SpringAir.Data.Ado.Tests\obj" failonerror="false"/>
+	<delete dir="test\SpringAir.Data.Ado.Tests\bin" failonerror="false"/>
+
+  </target>
+  <target name="sqlcreate">
+    <exec program="isql" commandline="-U ${sql.username}
+                       -P ${sql.password} -i ${sql.load_file}"/>
+  </target>
+</project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/data/access/readme.txt b/examples/Spring/SpringAir/data/access/readme.txt
new file mode 100644
index 00000000..77791c6b
--- /dev/null
+++ b/examples/Spring/SpringAir/data/access/readme.txt
@@ -0,0 +1 @@
+Contains a Microsoft Access (2003) database for use with the SpringAir reference application.
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/data/msde/create.sql b/examples/Spring/SpringAir/data/msde/create.sql
new file mode 100644
index 00000000..735a6c81
--- /dev/null
+++ b/examples/Spring/SpringAir/data/msde/create.sql
@@ -0,0 +1,121 @@
+--
+-- Copyright © 2002-2005 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.
+--
+--
+-- MSDE schema creation script for the SpringAir reference application
+--
+-- $Id: create.sql,v 1.2 2005/10/02 00:04:01 springboy Exp $
+--
+
+USE MASTER  
+GO
+
+IF EXISTS(SELECT * FROM sysdatabases WHERE name='SpringAir')
+    DROP DATABASE SpringAir  
+GO
+
+
+CREATE DATABASE SpringAir
+GO
+
+USE SpringAir
+GO
+
+CREATE TABLE cabin_class
+(
+    id INT PRIMARY KEY NOT NULL,
+    description VARCHAR(20)
+)
+GO
+
+CREATE TABLE passenger
+(
+    id INT PRIMARY KEY NOT NULL,
+    first_name VARCHAR(30),
+    surname VARCHAR(30)
+    -- I'll create a proper relation later, this stub is sufficient for now...
+)
+GO
+
+CREATE TABLE airport
+(
+    id INT PRIMARY KEY NOT NULL,
+    code CHAR(3) NOT NULL,
+    city VARCHAR(50),
+    description VARCHAR(100)
+)
+GO
+
+CREATE TABLE aircraft
+(
+	id INT PRIMARY KEY NOT NULL,
+	model VARCHAR(50) NOT NULL,
+	row_count INT NOT NULL,
+	seats_per_row INT NOT NULL
+)
+GO
+
+-- an aircraft may have many cabins; this relation models how many seats there are per cabin per aircraft...
+CREATE TABLE aircraft_cabin_seat
+(
+	aircraft_id INT NOT NULL FOREIGN KEY REFERENCES aircraft(id),
+	cabin_class_id  INT  NOT NULL FOREIGN KEY REFERENCES cabin_class(id),
+	seat_count INT NOT NULL DEFAULT 0
+)
+GO
+
+CREATE TABLE flight
+(
+	id INT PRIMARY KEY NOT NULL,
+	flight_number VARCHAR(20) NOT NULL UNIQUE,
+	aircraft_id INT NOT NULL FOREIGN KEY REFERENCES aircraft(id),
+	departure_airport_id INT NOT NULL FOREIGN KEY REFERENCES airport(id),
+	destination_airport_id INT NOT NULL FOREIGN KEY REFERENCES airport(id),
+	departure_date DATETIME NOT NULL
+)
+GO
+
+-- if a seat is in this relation, then it is reserved for that flight...
+CREATE TABLE reserved_seat
+(
+	flight_id int NOT NULL FOREIGN KEY REFERENCES flight(id),
+	seat_number VARCHAR(20) NOT NULL
+)
+GO
+
+CREATE TABLE reservation
+(
+	id INT PRIMARY KEY NOT NULL,
+	passenger_id INT NOT NULL UNIQUE FOREIGN KEY REFERENCES passenger(id),
+	price MONEY NOT NULL DEFAULT 0
+)
+GO
+
+CREATE TABLE leg
+(
+	id INT PRIMARY KEY NOT NULL,
+	reservation_id INT NOT NULL UNIQUE FOREIGN KEY REFERENCES reservation(id),
+	flight_id INT NOT NULL UNIQUE FOREIGN KEY REFERENCES flight(id),
+	cabin_class_id  INT  NOT NULL FOREIGN KEY REFERENCES cabin_class(id)
+)
+GO
+
+CREATE TABLE leg_seat 
+(
+	leg_id INT NOT NULL UNIQUE FOREIGN KEY REFERENCES leg(id),
+	reservation_id INT NOT NULL UNIQUE FOREIGN KEY REFERENCES reservation(id),
+	seat_number VARCHAR(200) NOT NULL
+)
+GO
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/data/msde/populate.sql b/examples/Spring/SpringAir/data/msde/populate.sql
new file mode 100644
index 00000000..c9a75e96
--- /dev/null
+++ b/examples/Spring/SpringAir/data/msde/populate.sql
@@ -0,0 +1,94 @@
+--
+-- Copyright © 2002-2005 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.
+--
+--
+-- MSDE schema population script for the SpringAir reference application
+--
+-- $Id: populate.sql,v 1.1 2005/10/01 22:57:09 springboy Exp $
+--
+
+USE SpringAir
+GO
+
+INSERT INTO cabin_class(id, description) VALUES(0, "Coach")
+INSERT INTO cabin_class(id, description) VALUES(1, "Business")
+INSERT INTO cabin_class(id, description) VALUES(2, "First")
+
+GO
+
+INSERT INTO airport(id, code, city, description) VALUES(0, "MCO", "Orlando", "Orlando International Airport")
+INSERT INTO airport(id, code, city, description) VALUES(1, "SFO", "San Francisco", "San Francisco International Airport")
+INSERT INTO airport(id, code, city, description) VALUES(2, "LHR", "Heathrow", "London Heathrow International Airport")
+INSERT INTO airport(id, code, city, description) VALUES(3, "ANC", "Anchorage", "Anchorage International Airport")
+
+GO
+
+INSERT INTO passenger(id, first_name, surname) VALUES(0, "Ivan", "Goncharov")
+INSERT INTO passenger(id, first_name, surname) VALUES(1, "Harriet", "Wheeler")
+INSERT INTO passenger(id, first_name, surname) VALUES(3, "Rose", "Kane")
+INSERT INTO passenger(id, first_name, surname) VALUES(5, "Leonardo", "Medici")
+INSERT INTO passenger(id, first_name, surname) VALUES(6, "Enrico", "Dandolo")
+
+GO
+
+INSERT INTO aircraft(id, model, row_count, seats_per_row) VALUES(0, "Boeing 747", 240, 8)
+INSERT INTO aircraft(id, model, row_count, seats_per_row) VALUES(1, "Little Nellie", 1, 1)
+INSERT INTO aircraft(id, model, row_count, seats_per_row) VALUES(2, "The Fast Lady", 2, 2)
+INSERT INTO aircraft(id, model, row_count, seats_per_row) VALUES(3, "Sopwith Camel", 10, 4)
+INSERT INTO aircraft(id, model, row_count, seats_per_row) VALUES(4, "Boeing 747", 240, 8)
+
+GO
+
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(0, 0, 180)
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(0, 1, 40)
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(0, 2, 20)
+-- Little Nellie defended her honour... admirably.
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(1, 2, 1)
+-- I've taken your advice... I've bought the Fast Lady!
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(2, 2, 4)
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(3, 0, 30)
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(3, 2, 10)
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(4, 0, 180)
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(4, 1, 40)
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(4, 2, 20)
+
+GO
+
+-- uses British date format for the insert...
+INSERT INTO flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(0, "S87r17688972", 0, 0, 1, CONVERT(DATETIME, '09-11-2005 12:50:00', 103))
+INSERT INTO flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(1, "Mjhgsdjhds", 4, 0, 1, CONVERT(DATETIME, '10-11-2005 12:50:00', 103))
+INSERT INTO flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(2, "kbfbxsKLJ34GW", 0, 0, 1, CONVERT(DATETIME, '11-11-2005 12:50:00', 103))
+INSERT INTO flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(3, "KJ2BF3JH", 4, 0, 1, CONVERT(DATETIME, '12-11-2005 12:50:00', 103))
+
+INSERT INTO flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(4, "jh34jhdsf", 4, 1, 0, CONVERT(DATETIME, '09-11-2005 13:50:00', 103))
+INSERT INTO flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(5, "kbwdjnkdvb", 0, 1, 0, CONVERT(DATETIME, '10-11-2005 13:50:00', 103))
+INSERT INTO flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(6, "hb3hjwfhjdvs", 4, 1, 0, CONVERT(DATETIME, '11-11-2005 13:50:00', 103))
+INSERT INTO flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(7, "782876bjk", 0, 1, 0, CONVERT(DATETIME, '12-11-2005 13:50:00', 103))
+
+GO
+
+-- reserve a coupla seats on the first flight out of Orlando; I'm off to GatorJUG and Macy is coming wit' me, yeehar...
+INSERT INTO reserved_seat(flight_id, seat_number) VALUES(0, "A21")
+INSERT INTO reserved_seat(flight_id, seat_number) VALUES(0, "A22")
+
+GO
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/data/mysql/create.sql b/examples/Spring/SpringAir/data/mysql/create.sql
new file mode 100644
index 00000000..f82a1557
--- /dev/null
+++ b/examples/Spring/SpringAir/data/mysql/create.sql
@@ -0,0 +1,76 @@
+CREATE TABLE cabin_class
+(
+    id integer NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    description VARCHAR(16)
+);
+
+CREATE TABLE passenger
+(
+    id integer NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    first_name VARCHAR(64),
+    surname VARCHAR(64)
+    -- I'll create a proper relation later, this stub is sufficient for now...
+);
+
+CREATE TABLE airport
+(
+    id integer NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    code CHAR(3) NOT NULL,
+    city VARCHAR(64),
+    description VARCHAR(64)
+);
+
+CREATE TABLE aircraft
+(
+	id integer NOT NULL PRIMARY KEY AUTO_INCREMENT,
+	model VARCHAR(50) NOT NULL,
+	row_count integer NOT NULL,
+	seats_per_row integer NOT NULL
+);
+
+-- an aircraft may have many cabins; this relation models how many seats there are per cabin per aircraft...
+CREATE TABLE aircraft_cabin_seat
+(
+	aircraft_id integer NOT NULL,
+	cabin_class_id  integer  NOT NULL,
+	seat_count integer DEFAULT 0 NOT NULL
+);
+
+CREATE TABLE flight
+(
+	id integer NOT NULL PRIMARY KEY AUTO_INCREMENT,
+	flight_number VARCHAR(256) NOT NULL,
+	aircraft_id integer NOT NULL,
+	departure_airport_id integer NOT NULL,
+	destination_airport_id integer NOT NULL,
+	departure_date date NOT NULL
+);
+
+-- if a seat is in this relation, then it is reserved for that flight...
+CREATE TABLE reserved_seat
+(
+	flight_id integer NOT NULL,
+	seat_number VARCHAR(20) NOT NULL
+);
+
+CREATE TABLE reservation
+(
+	id integer NOT NULL PRIMARY KEY AUTO_INCREMENT,
+	passenger_id integer NOT NULL UNIQUE,
+	price decimal(8, 2) DEFAULT 0 NOT NULL
+);
+
+CREATE TABLE leg
+(
+	id integer NOT NULL PRIMARY KEY AUTO_INCREMENT,
+	reservation_id integer NOT NULL UNIQUE,
+	flight_id integer NOT NULL,
+	cabin_class_id  integer  NOT NULL
+);
+
+CREATE TABLE leg_seat 
+(
+	leg_id integer NOT NULL UNIQUE,
+	reservation_id integer NOT NULL UNIQUE,
+	seat_number VARCHAR(24) NOT NULL
+);
diff --git a/examples/Spring/SpringAir/data/mysql/drop.sql b/examples/Spring/SpringAir/data/mysql/drop.sql
new file mode 100644
index 00000000..8226f562
--- /dev/null
+++ b/examples/Spring/SpringAir/data/mysql/drop.sql
@@ -0,0 +1,13 @@
+drop table reserved_seat;
+drop table leg_seat;
+
+drop table leg;
+drop table reservation;
+drop table flight;
+
+drop table airport;
+drop table aircraft_cabin_seat;
+drop table aircraft;
+
+drop table cabin_class;
+drop table passenger;
diff --git a/examples/Spring/SpringAir/data/mysql/populate.sql b/examples/Spring/SpringAir/data/mysql/populate.sql
new file mode 100644
index 00000000..f8910580
--- /dev/null
+++ b/examples/Spring/SpringAir/data/mysql/populate.sql
@@ -0,0 +1,58 @@
+INSERT INTO cabin_class(description) VALUES('Coach');
+INSERT INTO cabin_class(description) VALUES('Business');
+INSERT INTO cabin_class(description) VALUES('First');
+
+INSERT INTO airport(code, city, description) VALUES('MCO', 'Orlando', 'Orlando International Airport');
+INSERT INTO airport(code, city, description) VALUES('SFO', 'San Francisco', 'San Francisco International Airport');
+INSERT INTO airport(code, city, description) VALUES('LHR', 'Heathrow', 'London Heathrow International Airport');
+INSERT INTO airport(code, city, description) VALUES('ANC', 'Anchorage', 'Anchorage International Airport');
+
+INSERT INTO passenger(first_name, surname) VALUES('Ivan', 'Goncharov');
+INSERT INTO passenger(first_name, surname) VALUES('Harriet', 'Wheeler');
+INSERT INTO passenger(first_name, surname) VALUES('Rose', 'Kane');
+INSERT INTO passenger(first_name, surname) VALUES('Leonardo', 'Medici');
+INSERT INTO passenger(first_name, surname) VALUES('Enrico', 'Dandolo');
+
+INSERT INTO aircraft(model, row_count, seats_per_row) VALUES('Boeing 747', 240, 8);
+INSERT INTO aircraft(model, row_count, seats_per_row) VALUES('Little Nellie', 1, 1);
+INSERT INTO aircraft(model, row_count, seats_per_row) VALUES('The Fast Lady', 2, 2);
+INSERT INTO aircraft(model, row_count, seats_per_row) VALUES('Sopwith Camel', 10, 4);
+INSERT INTO aircraft(model, row_count, seats_per_row) VALUES('Boeing 747', 240, 8);
+
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(1, 0, 180);
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(1, 1, 40);
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(1, 2, 20);
+-- Little Nellie defended her honour... admirably.
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(2, 2, 1);
+-- I've taken your advice... I've bought the Fast Lady!
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(3, 2, 4);
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(4, 0, 30);
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(4, 2, 10);
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(5, 0, 180);
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(5, 1, 40);
+INSERT INTO aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(5, 2, 20);
+
+-- uses Universal date format for the insert...
+INSERT INTO flight(flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES('S87r17688972', 1, 1, 2, DATE('2005-11-09 12:50'));
+INSERT INTO flight(flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES('Mjhgsdjhds', 5, 1, 2, DATE('2005-11-10 12:50'));
+INSERT INTO flight(flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES('kbfbxsKLJ34GW', 1, 1, 2, DATE('2005-11-11 12:50'));
+INSERT INTO flight(flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES('KJ2BF3JH', 5, 1, 2, DATE('2005-11-12 12:50'));
+
+INSERT INTO flight(flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES('jh34jhdsf', 5, 2, 1, DATE('2005-11-09 13:50'));
+INSERT INTO flight(flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES('kbwdjnkdvb', 1, 2, 1, DATE('2005-11-10 13:50'));
+INSERT INTO flight(flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES('hb3hjwfhjdvs', 5, 2, 1, DATE('2005-11-11 13:50'));
+INSERT INTO flight(flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES('782876bjk', 1, 2, 1, DATE('2005-11-12 13:50'));
+
+-- reserve a coupla seats on the first flight out of Orlando; I'm off to GatorJUG and Macy is coming wit' me, yeehar...
+INSERT INTO reserved_seat(flight_id, seat_number) VALUES(1, 'A21');
+INSERT INTO reserved_seat(flight_id, seat_number) VALUES(1, 'A22');
+
+commit;
diff --git a/examples/Spring/SpringAir/data/mysql/readme.txt b/examples/Spring/SpringAir/data/mysql/readme.txt
new file mode 100644
index 00000000..9494347a
--- /dev/null
+++ b/examples/Spring/SpringAir/data/mysql/readme.txt
@@ -0,0 +1,5 @@
+This directory contains scripts for creating and populating the SpringAir database on MySQL.
+
+MySQL - http://www.mysql.com/
+
+Note: the MySQL version that I (the author) used to write and tests these scripts against was 5.0.16 (Win32). It has not been tested against any other version (or indeed on any other operating system).
diff --git a/examples/Spring/SpringAir/data/mysql/refresh.sql b/examples/Spring/SpringAir/data/mysql/refresh.sql
new file mode 100644
index 00000000..f58544eb
--- /dev/null
+++ b/examples/Spring/SpringAir/data/mysql/refresh.sql
@@ -0,0 +1,5 @@
+use springair;
+source drop.sql
+source create.sql
+source populate.sql
+commit;
diff --git a/examples/Spring/SpringAir/data/mysql/schema.sql b/examples/Spring/SpringAir/data/mysql/schema.sql
new file mode 100644
index 00000000..31f17a43
--- /dev/null
+++ b/examples/Spring/SpringAir/data/mysql/schema.sql
@@ -0,0 +1,7 @@
+drop database springair;
+create database springair;
+use mysql;
+grant all privileges on *.* to 'spring'@'localhost' identified by 'spring';
+grant all privileges on *.* to 'spring'@'%' identified by 'spring';
+commit;
+use springair;
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/data/oracle/create.sql b/examples/Spring/SpringAir/data/oracle/create.sql
new file mode 100644
index 00000000..de550c05
--- /dev/null
+++ b/examples/Spring/SpringAir/data/oracle/create.sql
@@ -0,0 +1,106 @@
+CREATE TABLE t_cabin_class
+(
+    id integer NOT NULL PRIMARY KEY,
+    description VARCHAR(16)
+);
+
+CREATE TABLE t_passenger
+(
+    id integer NOT NULL PRIMARY KEY,
+    first_name VARCHAR(64),
+    surname VARCHAR(64)
+    -- I'll create a proper relation later, this stub is sufficient for now...
+);
+
+CREATE TABLE t_airport
+(
+    id integer NOT NULL PRIMARY KEY,
+    code CHAR(3) NOT NULL,
+    city VARCHAR(64),
+    description VARCHAR(64)
+);
+
+CREATE TABLE t_aircraft
+(
+	id integer NOT NULL PRIMARY KEY,
+	model VARCHAR(50) NOT NULL,
+	row_count integer NOT NULL,
+	seats_per_row integer NOT NULL
+);
+
+-- an aircraft may have many cabins; this relation models how many seats there are per cabin per aircraft...
+CREATE TABLE t_aircraft_cabin_seat
+(
+	aircraft_id integer NOT NULL,
+	cabin_class_id  integer  NOT NULL,
+	seat_count integer DEFAULT(0) NOT NULL
+);
+
+alter table t_aircraft_cabin_seat add (
+	constraint fk_cabin_seat_to_aircraft foreign key(aircraft_id) references t_aircraft(id),
+	constraint fk_cabin_seat_to_cabin foreign key(cabin_class_id) references t_cabin_class(id)
+);
+
+CREATE TABLE t_flight
+(
+	id integer NOT NULL PRIMARY KEY,
+	flight_number VARCHAR(256) NOT NULL UNIQUE,
+	aircraft_id integer NOT NULL,
+	departure_airport_id integer NOT NULL,
+	destination_airport_id integer NOT NULL,
+	departure_date date NOT NULL
+);
+
+alter table t_flight add (
+	constraint fk_flight_to_aircraft foreign key(aircraft_id) references t_aircraft(id),
+	constraint fk_flight_to_dep_airport foreign key(departure_airport_id) references t_airport(id),
+	constraint fk_flight_to_dest_airport foreign key(destination_airport_id) references t_airport(id)
+);
+
+-- if a seat is in this relation, then it is reserved for that flight...
+CREATE TABLE t_reserved_seat
+(
+	flight_id integer NOT NULL,
+	seat_number VARCHAR(20) NOT NULL
+);
+
+alter table t_reserved_seat add (
+	constraint fk_reserved_seat_to_flight foreign key(flight_id) references t_flight(id)
+);
+
+CREATE TABLE t_reservation
+(
+	id integer NOT NULL PRIMARY KEY,
+	passenger_id integer NOT NULL UNIQUE,
+	price number(8, 2) DEFAULT(0) NOT NULL
+);
+
+alter table t_reservation add (
+	constraint fk_reservation_to_flight foreign key(passenger_id) references t_passenger(id)
+);
+
+CREATE TABLE t_leg
+(
+	id integer NOT NULL PRIMARY KEY,
+	reservation_id integer NOT NULL UNIQUE,
+	flight_id integer NOT NULL,
+	cabin_class_id  integer  NOT NULL
+);
+
+alter table t_leg add (
+	constraint fk_leg_to_reservation foreign key(reservation_id) references t_reservation(id),
+	constraint fk_leg_to_flight foreign key(flight_id) references t_flight(id),
+	constraint fk_leg_to_cabin_class foreign key(cabin_class_id) references t_cabin_class(id)
+);
+
+CREATE TABLE t_leg_seat 
+(
+	leg_id integer NOT NULL UNIQUE,
+	reservation_id integer NOT NULL UNIQUE,
+	seat_number VARCHAR(24) NOT NULL
+);
+
+alter table t_leg_seat add (
+	constraint fk_leg_seat_to_leg foreign key(leg_id) references t_leg(id),
+	constraint fk_leg_seat_to_reservation foreign key(reservation_id) references t_reservation(id)
+);
diff --git a/examples/Spring/SpringAir/data/oracle/drop.sql b/examples/Spring/SpringAir/data/oracle/drop.sql
new file mode 100644
index 00000000..70767723
--- /dev/null
+++ b/examples/Spring/SpringAir/data/oracle/drop.sql
@@ -0,0 +1,13 @@
+drop table t_reserved_seat;
+drop table t_leg_seat;
+
+drop table t_leg;
+drop table t_reservation;
+drop table t_flight;
+
+drop table t_airport;
+drop table t_aircraft_cabin_seat;
+drop table t_aircraft;
+
+drop table t_cabin_class;
+drop table t_passenger;
diff --git a/examples/Spring/SpringAir/data/oracle/populate.sql b/examples/Spring/SpringAir/data/oracle/populate.sql
new file mode 100644
index 00000000..dc21a153
--- /dev/null
+++ b/examples/Spring/SpringAir/data/oracle/populate.sql
@@ -0,0 +1,79 @@
+--
+-- Copyright © 2002-2005 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.
+--
+--
+-- Oracle schema population script for the SpringAir reference application
+--
+-- $Id: populate.sql,v 1.1 2005/12/26 12:29:30 springboy Exp $
+--
+
+INSERT INTO t_cabin_class(id, description) VALUES(0, 'Coach');
+INSERT INTO t_cabin_class(id, description) VALUES(1, 'Business');
+INSERT INTO t_cabin_class(id, description) VALUES(2, 'First');
+
+INSERT INTO t_airport(id, code, city, description) VALUES(0, 'MCO', 'Orlando', 'Orlando International Airport');
+INSERT INTO t_airport(id, code, city, description) VALUES(1, 'SFO', 'San Francisco', 'San Francisco International Airport');
+INSERT INTO t_airport(id, code, city, description) VALUES(2, 'LHR', 'Heathrow', 'London Heathrow International Airport');
+INSERT INTO t_airport(id, code, city, description) VALUES(3, 'ANC', 'Anchorage', 'Anchorage International Airport');
+
+INSERT INTO t_passenger(id, first_name, surname) VALUES(0, 'Ivan', 'Goncharov');
+INSERT INTO t_passenger(id, first_name, surname) VALUES(1, 'Harriet', 'Wheeler');
+INSERT INTO t_passenger(id, first_name, surname) VALUES(3, 'Rose', 'Kane');
+INSERT INTO t_passenger(id, first_name, surname) VALUES(5, 'Leonardo', 'Medici');
+INSERT INTO t_passenger(id, first_name, surname) VALUES(6, 'Enrico', 'Dandolo');
+
+INSERT INTO t_aircraft(id, model, row_count, seats_per_row) VALUES(0, 'Boeing 747', 240, 8);
+INSERT INTO t_aircraft(id, model, row_count, seats_per_row) VALUES(1, 'Little Nellie', 1, 1);
+INSERT INTO t_aircraft(id, model, row_count, seats_per_row) VALUES(2, 'The Fast Lady', 2, 2);
+INSERT INTO t_aircraft(id, model, row_count, seats_per_row) VALUES(3, 'Sopwith Camel', 10, 4);
+INSERT INTO t_aircraft(id, model, row_count, seats_per_row) VALUES(4, 'Boeing 747', 240, 8);
+
+INSERT INTO t_aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(0, 0, 180);
+INSERT INTO t_aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(0, 1, 40);
+INSERT INTO t_aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(0, 2, 20);
+-- Little Nellie defended her honour... admirably.
+INSERT INTO t_aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(1, 2, 1);
+-- I've taken your advice... I've bought the Fast Lady!
+INSERT INTO t_aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(2, 2, 4);
+INSERT INTO t_aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(3, 0, 30);
+INSERT INTO t_aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(3, 2, 10);
+INSERT INTO t_aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(4, 0, 180);
+INSERT INTO t_aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(4, 1, 40);
+INSERT INTO t_aircraft_cabin_seat(aircraft_id, cabin_class_id, seat_count) VALUES(4, 2, 20);
+
+-- uses British date format for the insert...
+INSERT INTO t_flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(0, 'S87r17688972', 0, 0, 1, TO_DATE('09-11-2005 12:50','DD-MM-YYYY HH24:MI'));
+INSERT INTO t_flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(1, 'Mjhgsdjhds', 4, 0, 1, TO_DATE('10-11-2005 12:50','DD-MM-YYYY HH24:MI'));
+INSERT INTO t_flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(2, 'kbfbxsKLJ34GW', 0, 0, 1, TO_DATE('11-11-2005 12:50','DD-MM-YYYY HH24:MI'));
+INSERT INTO t_flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(3, 'KJ2BF3JH', 4, 0, 1, TO_DATE('12-11-2005 12:50','DD-MM-YYYY HH24:MI'));
+
+INSERT INTO t_flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(4, 'jh34jhdsf', 4, 1, 0, TO_DATE('09-11-2005 13:50','DD-MM-YYYY HH24:MI'));
+INSERT INTO t_flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(5, 'kbwdjnkdvb', 0, 1, 0, TO_DATE('10-11-2005 13:50','DD-MM-YYYY HH24:MI'));
+INSERT INTO t_flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(6, 'hb3hjwfhjdvs', 4, 1, 0, TO_DATE('11-11-2005 13:50','DD-MM-YYYY HH24:MI'));
+INSERT INTO t_flight(id, flight_number, aircraft_id, departure_airport_id, destination_airport_id, departure_date)
+	VALUES(7, '782876bjk', 0, 1, 0, TO_DATE('12-11-2005 13:50','DD-MM-YYYY HH24:MI'));
+
+-- reserve a coupla seats on the first flight out of Orlando; I'm off to GatorJUG and Macy is coming wit' me, yeehar...
+INSERT INTO t_reserved_seat(flight_id, seat_number) VALUES(0, 'A21');
+INSERT INTO t_reserved_seat(flight_id, seat_number) VALUES(0, 'A22');
+
+commit;
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/data/oracle/readme.txt b/examples/Spring/SpringAir/data/oracle/readme.txt
new file mode 100644
index 00000000..2c261210
--- /dev/null
+++ b/examples/Spring/SpringAir/data/oracle/readme.txt
@@ -0,0 +1,3 @@
+This directory contains scripts for creating and populating the SpringAir database on Oracle.
+
+Note: the Oracle version that I (the author) used to write and tests these scripts against was Oracle9i Enterprise Edition Release 9.2.0.1.0 (Win32). It has not been tested against any other version (or indeed on any other operating system).
diff --git a/examples/Spring/SpringAir/data/oracle/refresh.sql b/examples/Spring/SpringAir/data/oracle/refresh.sql
new file mode 100644
index 00000000..fe94a8ee
--- /dev/null
+++ b/examples/Spring/SpringAir/data/oracle/refresh.sql
@@ -0,0 +1,5 @@
+connect springair/spring
+@drop.sql
+@create.sql
+@populate.sql
+commit;
diff --git a/examples/Spring/SpringAir/data/oracle/schema.sql b/examples/Spring/SpringAir/data/oracle/schema.sql
new file mode 100644
index 00000000..5a052dac
--- /dev/null
+++ b/examples/Spring/SpringAir/data/oracle/schema.sql
@@ -0,0 +1,4 @@
+drop user springair cascade;
+create user springair identified by spring;
+grant create procedure, create session, resource, create table, create view, create synonym to springair;
+commit;
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/data/readme.txt b/examples/Spring/SpringAir/data/readme.txt
new file mode 100644
index 00000000..1453d5de
--- /dev/null
+++ b/examples/Spring/SpringAir/data/readme.txt
@@ -0,0 +1,13 @@
+This directory contains scripts for creating and populating the SpringAir database.
+
+Scripts are provided for a number of popular commercial and open source databases. Hopefully you will be able to find one set of scripts to match your current environment, and if not, well... at least you have some choice in the matter of which database to download and experiment with. Remember, Spring.NET is all about choice :)
+
+Marketing over, the scripts for each supported database are in subdirectories of the directory in which this current file resides, in subdirectories named after the particular database. (For example, Oracle scripts are in the 'oracle' subdirectory). All of the scripts follow a standard format...
+
+The 'schema' script creates users / schemas (as appropriate) for the 'springair' database.
+The 'drop' script drops all of the *relations* (note that it does not drop users / schemas).
+The 'create' script creates all of the required relations.
+The 'populate' script adds some reference and test data to the various relations created by the 'create' script.
+The 'refresh' script just encapsulates all of the above scripts into one convenient script. You can use it to teardown, create, and populate the 'springair' database in one convenient script execution.
+
+As with all scripts, *please* do open them up and have a quick shuftie at the contents. They are just simple 'create some relations, bung some data in' scripts, but you run them at your own risk. No really, please look inside the scripts before running them... remember, safety first :)
diff --git a/examples/Spring/SpringAir/readme.txt b/examples/Spring/SpringAir/readme.txt
new file mode 100644
index 00000000..b581269d
--- /dev/null
+++ b/examples/Spring/SpringAir/readme.txt
@@ -0,0 +1,16 @@
+For .NET 1.1,
+The VS.NET solution is SpringAir.2003.sln
+In order to be able to run SpringAir you will need to create 'SpringAir.2003' 
+virtual directory using IIS Administrator and point it to the following directory :
+ examples\Spring\SpringAir\src\SpringAir.Web.2003 
+
+For .NET 2.0, 
+The VS.NET solution is SpringAir.2005.sln
+
+
+
+Set your startup project as SpringAir.Web  
+and the start page to .\Web\Home.aspx
+
+If you run .NET 2.0 first and then .NET 1.1, run the nant target 'clean-objs' to remove the object files before starting vs.net 2003
+Or do a clean build from vs.net 2005 before starting vs.net 2003.
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/AssemblyInfo.cs b/examples/Spring/SpringAir/src/SpringAir.Core/AssemblyInfo.cs
new file mode 100644
index 00000000..1595cd41
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/AssemblyInfo.cs
@@ -0,0 +1,40 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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;
+using System.Runtime.InteropServices;
+using System.Security.Permissions;
+
+[assembly: AssemblyTitle("SpringAir core functionality")]
+[assembly: AssemblyDescription("Core functionality for SpringAir")]
+[assembly: AssemblyVersion("1.0.0.0")]
+
+[assembly: AssemblyConfiguration("net-1.1.win32; Release")]
+[assembly: AssemblyCompany("http://www.springframework.net/")]
+[assembly: AssemblyProduct("Spring.NET")]
+[assembly: AssemblyCopyright("Copyright © 2002-2005. Licensed under the Apache License, Version 2.0")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]	
+
+[assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)]
+
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Data/IAircraftDao.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Data/IAircraftDao.cs
new file mode 100644
index 00000000..fd85d64e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Data/IAircraftDao.cs
@@ -0,0 +1,66 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Data
+{
+	/// <summary>
+	/// DAO interface for the <see cref="SpringAir.Domain.Aircraft"/>
+	/// domain class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: IAircraftDao.cs,v 1.3 2005/12/21 14:36:12 springboy Exp $</version>
+	public interface IAircraftDao
+	{
+		/// <summary>
+		/// Gets all of the <see cref="SpringAir.Domain.Aircraft"/> instances
+		/// that exist in the system.
+		/// </summary>
+		/// <returns>
+		/// All of the <see cref="SpringAir.Domain.Aircraft"/> instances
+		/// that exist in the system; if no
+		/// <see cref="SpringAir.Domain.Aircraft"/> can be found an empty
+		/// <see cref="System.Collections.IList"/> will be returned (but never
+		/// <cref lang="null"/>).
+		/// </returns>
+		IList GetAllAircraft();
+
+		/// <summary>
+		/// Gets the <see cref="SpringAir.Domain.Aircraft"/> uniquely
+		/// identified by the supplied <paramref name="id"/>.
+		/// </summary>
+		/// <param name="id">
+		/// The id that uniquely identifies an <see cref="SpringAir.Domain.Aircraft"/>.
+		/// </param>
+		/// <returns>
+		/// The <see cref="SpringAir.Domain.Aircraft"/> uniquely
+		/// identified by the supplied <paramref name="id"/>; or <cref lang="null"/>
+		/// if no such <see cref="SpringAir.Domain.Aircraft"/> can be found.
+		/// </returns>
+		Aircraft GetAircraft(long id);
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Data/IAirportDao.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Data/IAirportDao.cs
new file mode 100644
index 00000000..d161d321
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Data/IAirportDao.cs
@@ -0,0 +1,78 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Data
+{
+	/// <summary>
+	/// DAO interface for the <see cref="SpringAir.Domain.Airport"/>
+	/// domain class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: IAirportDao.cs,v 1.6 2005/12/21 14:36:32 springboy Exp $</version>
+	public interface IAirportDao
+	{
+		/// <summary>
+		/// Gets all of the <see cref="SpringAir.Domain.Airport"/> instances
+		/// that exist in the system.
+		/// </summary>
+		/// <returns>
+		/// All of the <see cref="SpringAir.Domain.Airport"/> instances
+		/// that exist in the system; if no <see cref="SpringAir.Domain.Airport"/>
+		/// instances can be found will return an empty
+		/// <see cref="SpringAir.Domain.AirportCollection"/> (but never <cref lang="null"/>).
+		/// </returns>
+		AirportCollection GetAllAirports();
+
+		/// <summary>
+		/// Gets the <see cref="SpringAir.Domain.Airport"/> uniquely
+		/// identified by the supplied <paramref name="id"/>.
+		/// </summary>
+		/// <param name="id">
+		/// The id that uniquely identifies an <see cref="SpringAir.Domain.Airport"/>.
+		/// </param>
+		/// <returns>
+		/// The <see cref="SpringAir.Domain.Airport"/> uniquely
+		/// identified by the supplied <paramref name="id"/>; or <cref lang="null"/>
+		/// if no such <see cref="SpringAir.Domain.Airport"/> can be found.
+		/// </returns>
+		Airport GetAirport(long id);
+
+		/// <summary>
+		/// Gets the <see cref="SpringAir.Domain.Airport"/> uniquely
+		/// identified by the supplied <paramref name="code"/>.
+		/// </summary>
+		/// <param name="code">
+		/// The code that uniquely identifies an <see cref="SpringAir.Domain.Airport"/>.
+		/// </param>
+		/// <returns>
+		/// The <see cref="SpringAir.Domain.Airport"/> uniquely
+		/// identified by the supplied <paramref name="code"/>; or <cref lang="null"/>
+		/// if no such <see cref="SpringAir.Domain.Airport"/> can be found.
+		/// </returns>
+		Airport GetAirport(string code);
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Data/IFlightDao.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Data/IFlightDao.cs
new file mode 100644
index 00000000..d6ef95f5
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Data/IFlightDao.cs
@@ -0,0 +1,61 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Data
+{
+	/// <summary>
+	/// DAO interface for the <see cref="SpringAir.Domain.Flight"/>
+	/// domain class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: IFlightDao.cs,v 1.4 2005/12/21 14:37:02 springboy Exp $</version>
+	public interface IFlightDao
+	{
+		/// <summary>
+		/// Gets a list of all of those <see cref="SpringAir.Domain.Flight"/>s
+		/// departing from the supplied <paramref name="origin"/> on the supplied
+		/// <paramref name="departureDate"/> and going to the supplied
+		/// <paramref name="destination"/>.
+		/// </summary>
+		/// <param name="origin">
+		/// The departure airport.
+		/// </param>
+		/// <param name="destination">
+		/// The destination airport.
+		/// </param>
+		/// <param name="departureDate">
+		/// The desired departure date from the supplied <paramref name="origin"/> airport.
+		/// </param>
+		/// <returns>
+		/// A list of all of those <see cref="SpringAir.Domain.Flight"/>s
+		/// departing from the supplied <paramref name="origin"/> on the supplied
+		/// <paramref name="departureDate"/> and going to the supplied
+		/// <paramref name="destination"/>.
+		/// </returns>
+		FlightCollection GetFlights(Airport origin, Airport destination, DateTime departureDate);
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Aircraft.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Aircraft.cs
new file mode 100644
index 00000000..8776d176
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Aircraft.cs
@@ -0,0 +1,104 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Text;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+    /// <summary>
+    /// An aircraft.
+    /// </summary>
+    /// <author>Keith Donald</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: Aircraft.cs,v 1.6 2007/03/16 13:14:10 bbaia Exp $</version>
+    [Serializable]
+    public class Aircraft : Entity
+    {
+        private string model;
+        private IDictionary cabins = new ListDictionary();
+
+        #region Constructor (s) / Destructor
+
+        public Aircraft()
+        {
+        }
+
+        public Aircraft(string model, params Cabin[] cabins)
+            : this(Transient, model, cabins)
+        {
+        }
+
+        public Aircraft(long id, string model, params Cabin[] cabins) : base(id)
+        {
+            this.model = model;
+            foreach (Cabin cabin in cabins)
+            {
+                this.cabins.Add(cabin.CabinClass, cabin);
+            }
+        }
+
+        #endregion
+
+        #region Properties
+
+        public string Model
+        {
+            get { return this.model; }
+			set { this.model = value; }
+        }
+
+        public Cabin[] Cabins
+        {
+            get { return (Cabin[]) new ArrayList(cabins.Values).ToArray(typeof(Cabin)); }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> representation of this
+        /// <see cref="SpringAir.Domain.Aircraft"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> representation of this
+        /// <see cref="SpringAir.Domain.Aircraft"/>.
+        /// </returns>
+        public override string ToString()
+        {
+            StringBuilder buffer = new StringBuilder();
+            buffer.Append(Model).Append(" [");
+            
+            string separator = "";
+            foreach (Cabin cabin in cabins.Values)
+            {
+                buffer.Append(separator).Append(cabin);
+                separator = ", ";
+            }
+            buffer.Append("]");
+            return buffer.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Airport.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Airport.cs
new file mode 100644
index 00000000..fc028066
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Airport.cs
@@ -0,0 +1,153 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Text;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+    /// <summary>
+    /// Models an airport.
+    /// </summary>
+    /// <author>Keith Donald</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: Airport.cs,v 1.7 2005/12/13 00:42:50 bbaia Exp $</version>
+    [Serializable]
+    public class Airport : Entity
+    {
+        private string code;
+        private string city;
+        private string name;
+
+        #region Constructors
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="SpringAir.Domain.Airport"/> class.
+		/// </summary>
+		public Airport()
+		{
+		}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="SpringAir.Domain.Airport"/> class.
+        /// </summary>
+        /// <param name="code">
+        /// The short code uniquely identifying this airport.
+        /// </param>
+        /// <param name="city">
+        /// The city in which this airport is based.
+        /// </param>
+        /// <param name="name">
+        /// A full name of this airport.
+        /// </param>
+        public Airport(string code, string city, string name)
+            : this (Transient, code, city, name)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="SpringAir.Domain.Airport"/> class.
+        /// </summary>
+        /// <param name="id">
+        /// The number that uniquely identifies this airport.
+        /// </param>
+        /// <param name="code">
+        /// The short code uniquely identifying this airport.
+        /// </param>
+        /// <param name="city">
+        /// The city in which this airport is based.
+        /// </param>
+        /// <param name="name">
+        /// A full name of this airport.
+        /// </param>
+        public Airport(long id, string code, string city, string name) : base(id)
+        {
+            this.code = code;
+            this.city = city;
+            this.name = name;
+        }
+        
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or Sets the short code uniquely identifying this airport.
+        /// </summary>
+        public string Code
+        {
+            get { return this.code; }
+			set { this.code = value; }
+        }
+
+        /// <summary>
+        /// Gets or Sets the city in which this airport is based.
+        /// </summary>
+        public string City
+        {
+            get { return this.city; }
+			set { this.city = value; }
+        }
+
+        /// <summary>
+        /// Gets or Sets the full name of this airport.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get { return this.name; }
+			set { this.name = value; }
+        }
+
+        /// <summary>
+        /// A description of this airport; concatenation of the full
+        /// name of this airport and airport code.
+        /// </summary>
+        public string Description
+        {
+            get { return this.name + (this.Code.Length > 0 ? " (" + this.Code + ")" : ""); }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> representation of this
+        /// <see cref="SpringAir.Domain.Airport"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> representation of this
+        /// <see cref="SpringAir.Domain.Airport"/>.
+        /// </returns>
+        public override string ToString()
+        {
+            StringBuilder buffer = new StringBuilder();
+            buffer.Append(Name).Append(", ")
+                .Append(City).Append(" (").Append(Code).Append(")");
+            return buffer.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/AirportCollection.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/AirportCollection.cs
new file mode 100644
index 00000000..85d6bd40
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/AirportCollection.cs
@@ -0,0 +1,65 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+	/// <summary>
+	/// Provides a strongly typed collection for
+	/// <see cref="SpringAir.Domain.Airport"/> objects.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: AirportCollection.cs,v 1.2 2005/12/21 14:43:47 springboy Exp $</version>
+	[Serializable]
+	public class AirportCollection : CollectionBase
+	{
+		/// <summary>
+		/// Adds an <see cref="SpringAir.Domain.Airport"/> to the end of this collection.
+		/// </summary>
+		/// <param name="value">
+		/// The <see cref="SpringAir.Domain.Airport"/> to be added to the end of the collection.
+		/// </param>
+		/// <returns>
+		/// The index at which the <see cref="SpringAir.Domain.Airport"/> has been added.
+		/// </returns>
+		public int Add(Airport value)
+		{
+			return base.List.Add(value);
+		}
+
+		/// <summary>
+		/// Gets or sets the <see cref="SpringAir.Domain.Airport"/> at the specified index.
+		/// </summary>
+		/// <param name="index">
+		/// The zero-based index of the <see cref="SpringAir.Domain.Airport"/> to get or set.
+		/// </param>
+		public Airport this[int index]
+		{
+			get { return (Airport) base.List[index]; }
+			set { base.List[index] = value; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Cabin.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Cabin.cs
new file mode 100644
index 00000000..b8d8cc17
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Cabin.cs
@@ -0,0 +1,157 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+    /// <summary>
+    /// An aircraft cabin. Models seat map for the cabin. 
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: Cabin.cs,v 1.2 2005/12/13 00:42:50 bbaia Exp $</version>
+    [Serializable]
+    public sealed class Cabin
+    {
+        private CabinClass cabinClass;
+        private int startRow, endRow;
+        private string seatLetters;
+        private IDictionary seats = new Hashtable();
+        private int availableSeats = 0;
+
+        #region Constructors
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="SpringAir.Domain.Cabin"/> class.
+		public Cabin()
+		{}
+		
+        public Cabin(Cabin cabin)
+            : this(cabin.cabinClass, cabin.startRow, cabin.endRow, cabin.seatLetters, new ArrayList())
+        {}
+
+        public Cabin(CabinClass cabinClass, int startRow, int endRow, string seatLetters)
+            : this(cabinClass, startRow, endRow, seatLetters, new ArrayList())
+        {}
+
+        public Cabin(CabinClass cabinClass, int startRow, int endRow, string seatLetters, IList reservedSeats)
+        {
+            this.cabinClass = cabinClass;
+            this.startRow = startRow;
+            this.endRow = endRow;
+            this.seatLetters = seatLetters;
+
+            for (int i = startRow; i <= endRow; i++)
+            {
+                foreach (char c in seatLetters)
+                {
+                    string seatNumber = i.ToString() + c;
+                    bool isReserved = reservedSeats.Contains(seatNumber);
+                    seats.Add(seatNumber, new Seat(seatNumber, cabinClass, isReserved));
+
+                    if (!isReserved)
+                    {
+                        availableSeats++;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Properties
+
+        public CabinClass CabinClass
+        {
+            get { return cabinClass; }
+        }
+
+        public int SeatCount
+        {
+            get { return seats.Count; }
+        }
+
+        public int AvailableSeats
+        {
+            get { return availableSeats; }
+        }
+
+        public string SeatPlan
+        {
+            get { return "(" + AvailableSeats + "/" + SeatCount + ")"; }
+        }
+
+        #endregion
+
+        public bool IsReserved(string seatNumber)
+        {
+            Seat seat = (Seat) seats[seatNumber];
+            if (seat != null)
+            {
+                return seat.IsReserved;
+            }
+            throw new ArgumentException("Specified seat does not exist in this cabin.", "seatNumber");
+        }
+
+        public string ReserveSeat(string seatNumber)
+        {
+            Seat seat = (Seat) seats[seatNumber];
+
+            if (seat == null)
+            {
+                throw new ArgumentException("Specified seat does not exist in this cabin.", "seatNumber");
+            }
+            if (seat.IsReserved)
+            {
+                return ReserveSeat();
+            }
+
+            seat.IsReserved = true;
+            availableSeats--;
+            return seat.Number;
+        }
+
+        public string ReserveSeat()
+        {
+            foreach (Seat seat in seats)
+            {
+                if (!seat.IsReserved)
+                {
+                    seat.IsReserved = true;
+                    availableSeats--;
+                    return seat.Number;
+                }
+            }
+            return null;
+        }
+
+        public override string ToString()
+        {
+            return cabinClass.ToString() + " " + SeatPlan;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/CabinClass.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/CabinClass.cs
new file mode 100644
index 00000000..9db51b97
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/CabinClass.cs
@@ -0,0 +1,42 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+	/// <summary>
+	/// ...
+	/// </summary>
+	/// <author>Keith Donald</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: CabinClass.cs,v 1.4 2005/10/08 07:21:15 aseovic Exp $</version>
+    [Serializable]
+    public enum CabinClass 
+    {
+        Coach,
+		Business,
+		First
+	}
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Entity.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Entity.cs
new file mode 100644
index 00000000..163a92b4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Entity.cs
@@ -0,0 +1,110 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace SpringAir.Domain
+{
+	/// <summary>
+	/// Base class for those domain objects that are persistent.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This is a pragmatic concession to the persistence layer. This base
+	/// class and its single property are not part of the 'pure' domain
+	/// but it just makes persistence so much easier if each persistable class
+	/// has a unique identifier (especially on a greenfield project such as
+	/// this).
+	/// </p>
+	/// </remarks>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: Entity.cs,v 1.3 2005/12/21 16:06:35 springboy Exp $</version>
+	[Serializable]
+	public abstract class Entity
+	{
+		/// <summary>
+		/// Identifies an <see cref="SpringAir.Domain.Entity"/> that is 'new'.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// A 'new' <see cref="SpringAir.Domain.Entity"/> is one that has not
+		/// yet been persisted.
+		/// </p>
+		/// </remarks>
+		public const long Transient = long.MinValue;
+
+		private long id = Transient;
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="Entity"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an <see langword="abstract"/> class, and as such exposes
+		/// no publicly visible constructors.
+		/// </p>
+		/// </remarks>
+		protected Entity()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="Entity"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an <see langword="abstract"/> class, and as such exposes
+		/// no publicly visible constructors.
+		/// </p>
+		/// </remarks>
+		/// <param name="id">
+		/// The number that uniquely identifies this instance.
+		/// </param>
+		protected Entity(long id)
+		{
+			this.id = id;
+		}
+
+		/// <summary>
+		/// The number that uniquely identifies this instance.
+		/// </summary>
+		public long Id
+		{
+			get { return id; }
+			set { id = value; }
+		}
+
+		/// <summary>
+		/// Is this instance transient?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// That is, does it exist in permanent storage?
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// <see lang="true"/> if this instance is transient.
+		/// </value>
+		public bool IsTransient
+		{
+			get { return id == Transient; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Flight.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Flight.cs
new file mode 100644
index 00000000..b95855b5
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Flight.cs
@@ -0,0 +1,170 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Text;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+	/// <summary>
+	/// A flight.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// An aircraft may have many flights, but a particular flight is for just one
+	/// aircraft. When a flight is created, there are as many unreserved seats
+	/// for that flight as the aircraft model that is servicing the flight has seats.
+	/// </p>
+	/// </remarks>
+	/// <author>Keith Donald</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: Flight.cs,v 1.6 2006/01/08 00:48:10 bbaia Exp $</version>
+	[Serializable]
+	public class Flight : Entity
+	{
+		private string flightNumber;
+		private Airport departureAirport;
+		private Airport destinationAirport;
+        private Aircraft aircraft;
+		private IDictionary cabins = new ListDictionary();
+        private DateTime departureTime;
+		private string seatPlan;
+
+        #region Constructors
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="SpringAir.Domain.Flight"/> class.
+		public Flight()
+		{}
+
+		public Flight(
+            string flightNumber, Airport departureAirport, Airport destinationAirport, Aircraft aircraft, DateTime departureTime)
+            : this (Transient, flightNumber, departureAirport, destinationAirport, aircraft, departureTime, new Cabin[] {})
+		{
+            foreach (Cabin cabin in aircraft.Cabins)
+            {
+                this.cabins.Add(cabin.CabinClass, new Cabin(cabin));
+            }
+			CalculateSeatPlan();
+        }
+
+        public Flight(
+            long id, string flightNumber, Airport departureAirport, Airport destinationAirport, Aircraft aircraft, DateTime departureTime, params Cabin[] cabins) : base(id)
+        {
+            this.flightNumber = flightNumber;
+            this.departureAirport = departureAirport;
+            this.destinationAirport = destinationAirport;
+            this.aircraft = aircraft;
+            this.departureTime = departureTime;
+            foreach (Cabin cabin in cabins)
+            {
+                this.cabins.Add(cabin.CabinClass, cabin);
+            }
+            CalculateSeatPlan();
+        }
+        #endregion
+
+        #region Properties
+
+		public string FlightNumber
+		{
+			get { return this.flightNumber; }
+			set { this.flightNumber = value; }
+		}
+
+		public Airport DepartureAirport
+		{
+			get { return this.departureAirport; }
+			set { this.departureAirport = value; }
+		}
+
+		public Airport DestinationAirport
+		{
+			get { return this.destinationAirport; }
+			set { this.destinationAirport = value; }
+		}
+
+		public Aircraft Aircraft
+		{
+			get { return this.aircraft; }
+			set { this.aircraft = value; }
+		}
+
+	    public DateTime DepartureTime
+	    {
+	        get { return this.departureTime; }
+			set { this.departureTime = value; }
+	    }
+
+        public string SeatPlan
+        {
+			get { return this.seatPlan; }
+			set { this.seatPlan = value; }
+        }
+
+        public Cabin[] Cabins
+        {
+            get { return (Cabin[]) new ArrayList(cabins.Values).ToArray(typeof(Cabin)); }
+        }
+
+        #endregion
+
+        public string ReserveSeat(CabinClass cabinClass)
+        {
+            if (cabins.Contains(cabinClass))
+            {
+                return ((Cabin) cabins[cabinClass]).ReserveSeat();
+            }
+			CalculateSeatPlan();
+            throw new ArgumentException("Specified cabin class does not exist on this flight.", "cabinClass");
+        }
+    
+        public string ReserveSeat(CabinClass cabinClass, string seatNumber)
+        {
+            if (cabins.Contains(cabinClass))
+            {
+                return ((Cabin) cabins[cabinClass]).ReserveSeat(seatNumber);
+            }
+			CalculateSeatPlan();
+            throw new ArgumentException("Specified cabin class does not exist on this flight.", "cabinClass");
+        }
+
+		private void CalculateSeatPlan()
+		{
+			StringBuilder sb = new StringBuilder();
+			string separator = "";
+			foreach (Cabin cabin in this.cabins.Values)
+			{
+				sb.Append(separator)
+					.Append(cabin.CabinClass).Append(' ')
+					.Append(cabin.SeatPlan);
+				separator = ", ";
+			}
+			this.seatPlan = sb.ToString();
+		}
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/FlightCollection.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/FlightCollection.cs
new file mode 100644
index 00000000..a4dcc214
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/FlightCollection.cs
@@ -0,0 +1,65 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+	/// <summary>
+	/// Provides a strongly typed collection for
+	/// <see cref="SpringAir.Domain.Flight"/> objects.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: FlightCollection.cs,v 1.3 2006/01/08 00:49:09 bbaia Exp $</version>
+	[Serializable]
+	public class FlightCollection : CollectionBase
+	{
+		/// <summary>
+		/// Adds an <see cref="SpringAir.Domain.Flight"/> to the end of this collection.
+		/// </summary>
+		/// <param name="value">
+		/// The <see cref="SpringAir.Domain.Flight"/> to be added to the end of the collection.
+		/// </param>
+		/// <returns>
+		/// The index at which the <see cref="SpringAir.Domain.Flight"/> has been added.
+		/// </returns>
+		public int Add(Flight value)
+		{
+			return base.List.Add(value);
+		}
+
+		/// <summary>
+		/// Gets or sets the <see cref="SpringAir.Domain.Flight"/> at the specified index.
+		/// </summary>
+		/// <param name="index">
+		/// The zero-based index of the <see cref="SpringAir.Domain.Flight"/> to get or set.
+		/// </param>
+		public Flight this[int index]
+		{
+			get { return (Flight) base.List[index]; }
+			set { base.List[index] = value; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/FlightSuggestions.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/FlightSuggestions.cs
new file mode 100644
index 00000000..b10a6178
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/FlightSuggestions.cs
@@ -0,0 +1,183 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace SpringAir.Domain
+{
+	/// <summary>
+	/// Flight suggestions.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Maintains two lists... the first is a list of outbound flight legs, the
+	/// second a list of return flight legs (only applicable on a round trip journey).
+	/// </p>
+	/// </remarks>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: FlightSuggestions.cs,v 1.8 2006/03/13 11:57:44 aseovic Exp $</version>
+	[Serializable]
+	public class FlightSuggestions
+	{
+		private FlightCollection outboundFlights;
+		private FlightCollection returnFlights;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="SpringAir.Domain.FlightSuggestions"/> class.
+		public FlightSuggestions()
+		{
+			this.outboundFlights = new FlightCollection();
+			this.returnFlights = new FlightCollection();
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="SpringAir.Domain.FlightSuggestions"/> class.
+		/// </summary>
+		/// <param name="outboundFlights">
+		/// The collection of outbound <see cref="SpringAir.Domain.Flight"/> objects.
+		/// </param>
+		public FlightSuggestions(FlightCollection outboundFlights)
+			: this(outboundFlights, new FlightCollection())
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="SpringAir.Domain.FlightSuggestions"/> class.
+		/// </summary>
+		/// <param name="outboundFlights">
+		/// The collection of outbound <see cref="SpringAir.Domain.Flight"/> objects.
+		/// </param>
+		/// <param name="returnFlights">
+		/// The collection of return <see cref="SpringAir.Domain.Flight"/> objects.
+		/// </param>
+		public FlightSuggestions(FlightCollection outboundFlights, FlightCollection returnFlights)
+		{
+			this.outboundFlights = FlightsNotNull(outboundFlights);
+			this.returnFlights = FlightsNotNull(returnFlights);
+		}
+
+		/// <summary>
+		/// The collection of outbound <see cref="SpringAir.Domain.Flight"/> objects.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Guaranteed to not be <see lang="null"/>.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The collection of outbound <see cref="SpringAir.Domain.Flight"/> objects.
+		/// </value>
+		public FlightCollection OutboundFlights
+		{
+			get { return outboundFlights; }
+			set { outboundFlights = FlightsNotNull(value); }
+		}
+
+		/// <summary>
+		/// The collection of return <see cref="SpringAir.Domain.Flight"/> objects.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Guaranteed to not be <see lang="null"/>.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The collection of return <see cref="SpringAir.Domain.Flight"/> objects.
+		/// </value>
+		public FlightCollection ReturnFlights
+		{
+			get { return returnFlights; }
+			set { returnFlights = FlightsNotNull(value); }
+		}
+
+	    /// <summary>
+	    /// Does this <see cref="SpringAir.Domain.FlightSuggestions"/> instance
+	    /// contain any outbound <see cref="SpringAir.Domain.Flight"/>s?
+	    /// </summary>
+	    /// <returns>
+	    /// <see lang="true"/> if this <see cref="SpringAir.Domain.FlightSuggestions"/>
+	    /// instance contains any outbound <see cref="SpringAir.Domain.Flight"/>s.
+	    /// </returns>
+	    public bool HasOutboundFlights
+	    {
+	        get { return this.outboundFlights.Count > 0; }
+	    }
+
+	    /// <summary>
+	    /// Does this <see cref="SpringAir.Domain.FlightSuggestions"/> instance
+	    /// contain any return <see cref="SpringAir.Domain.Flight"/>s?
+	    /// </summary>
+	    /// <returns>
+	    /// <see lang="true"/> if this <see cref="SpringAir.Domain.FlightSuggestions"/>
+	    /// instance contains any return <see cref="SpringAir.Domain.Flight"/>s.
+	    /// </returns>
+	    public bool HasReturnFlights
+	    {
+	        get { return this.returnFlights.Count > 0; }
+	    }
+
+	    /// <summary>
+		/// Gets the <see cref="SpringAir.Domain.Flight"/> specified at the
+		/// supplied <paramref name="flightIndex"/> in this
+		/// <see cref="SpringAir.Domain.FlightSuggestions"/> instances collection
+		/// of <see cref="SpringAir.Domain.FlightSuggestions.OutboundFlights"/>.
+		/// </summary>
+		/// <param name="flightIndex">
+		/// The index of the desired <see cref="SpringAir.Domain.Flight"/>.
+		/// </param>
+		/// <returns>
+		/// The <see cref="SpringAir.Domain.Flight"/>.
+		/// </returns>
+		public Flight GetOutboundFlight(int flightIndex) 
+		{
+			return GetFlight(this.outboundFlights, flightIndex);
+		}
+
+		/// <summary>
+		/// Gets the <see cref="SpringAir.Domain.Flight"/> specified at the
+		/// supplied <paramref name="flightIndex"/> in this
+		/// <see cref="SpringAir.Domain.FlightSuggestions"/> instances collection
+		/// of <see cref="SpringAir.Domain.FlightSuggestions.ReturnFlights"/>.
+		/// </summary>
+		/// <param name="flightIndex">
+		/// The index of the desired <see cref="SpringAir.Domain.Flight"/>.
+		/// </param>
+		/// <returns>
+		/// The <see cref="SpringAir.Domain.Flight"/>.
+		/// </returns>
+		public Flight GetReturnFlight(int flightIndex) 
+		{
+			return GetFlight(this.returnFlights, flightIndex);
+		}
+
+		private Flight GetFlight(FlightCollection flights, int flightIndex) 
+		{
+			return flights[flightIndex];
+		}
+
+		private static FlightCollection FlightsNotNull(FlightCollection flights)
+		{
+			return flights == null ? new FlightCollection() : flights;
+		}
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Itinerary.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Itinerary.cs
new file mode 100644
index 00000000..59156032
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Itinerary.cs
@@ -0,0 +1,114 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+    /// <summary>
+    /// Holds information about a flight reservation, such as the flights and the cost.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// In this cut of the application, we do not persist these objects to
+    /// persistant storage.
+    /// </p>
+    /// </remarks>
+    /// <author>Keith Donald</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: Itinerary.cs,v 1.8 2005/12/13 00:42:50 bbaia Exp $</version>
+    [Serializable]
+    public class Itinerary : Entity
+    {
+        private decimal price;
+        private FlightCollection flights;
+
+        #region Constructors
+
+		/// <summary>
+		/// Creates a new instance of the 
+		/// <see cref="SpringAir.Domain.Itinerary"/> class.
+		/// </summary>
+        public Itinerary()
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="SpringAir.Domain.Itinerary"/>
+        /// class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Use this constructor for a one way journey.
+        /// </p>
+        /// </remarks>
+        /// <param name="flights">
+        /// Flights for this itinerary.
+        /// </param>
+        public Itinerary(FlightCollection flights)
+            : this(Transient, 0.0M, flights)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="SpringAir.Domain.Itinerary"/>
+        /// class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Use this constructor for a one way journey.
+        /// </p>
+        /// </remarks>
+        /// <param name="id">
+        /// The number that uniquely identifies this instance.
+        /// </param>
+        /// <param name="price">Price for this itinerary.</param>
+        /// <param name="flights">
+        /// Flights for this itinerary.
+        /// </param>
+        public Itinerary(long id, decimal price, FlightCollection flights) : base(id)
+        {
+            this.price = price;
+            this.flights = flights;
+        }
+        
+        #endregion
+
+        #region Properties
+        
+        public decimal Price
+        {
+            get { return price; }
+            set { price = value; }
+        }
+
+        public FlightCollection Flights
+        {
+            get { return flights; }
+			set { flights = value; }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Passenger.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Passenger.cs
new file mode 100644
index 00000000..a2c468c9
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Passenger.cs
@@ -0,0 +1,63 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace SpringAir.Domain
+{
+    /// <summary>
+    /// A person having a (flight) reservation.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: Passenger.cs,v 1.1 2005/10/01 22:52:57 springboy Exp $</version>
+    [Serializable]
+    public class Passenger : Entity
+    {
+        private string firstName;
+        private string surname;
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="SpringAir.Domain.Passenger"/> class.
+        /// </summary>
+        public Passenger()
+        {
+        }
+
+
+        public Passenger(long id, string firstName, string surname) : base(id)
+        {
+            this.firstName = firstName;
+            this.surname = surname;
+        }
+
+        public string FirstName
+        {
+            get { return firstName; }
+            set { firstName = value; }
+        }
+
+        public string Surname
+        {
+            get { return surname; }
+            set { surname = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Reservation.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Reservation.cs
new file mode 100644
index 00000000..719d8f10
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Reservation.cs
@@ -0,0 +1,109 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+    /// <summary>
+    /// A flight reservation for a single <see cref="SpringAir.Domain.Passenger"/>.
+    /// </summary>
+    /// <author>Keith Donald</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: Reservation.cs,v 1.5 2005/10/09 06:18:45 aseovic Exp $</version>
+    [Serializable]
+    public class Reservation : Entity
+    {
+        /// <summary>
+        /// Holds information about a flight reservation, such as the legs and the cost.
+        /// </summary>
+        private Itinerary itinerary;
+
+        /// <summary>
+        /// The <see cref="SpringAir.Domain.Passenger"/> for whom this reservation
+        /// is made.
+        /// </summary>
+        private Passenger passenger;
+
+        /// <summary>
+        /// The mapping between the <see cref="SpringAir.Domain.Flight"/> of a journey
+        /// to the seat (number, a <see cref="System.String"/>) that is reserved for
+        /// that particular <see cref="SpringAir.Domain.Flight"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// More clearly, which seat a passenger is going to plonk their bum into for
+        /// each leg of a journey.
+        /// </p>
+        /// </remarks>
+        //private IDictionary flightSeats;
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="SpringAir.Domain.Reservation"/> class.
+        /// </summary>
+        public Reservation()
+        {
+        }
+
+        public Reservation(Passenger passenger, Itinerary itinerary)//, IDictionary flightSeats)
+        {
+            this.passenger = passenger;
+            this.itinerary = itinerary;
+            //this.flightSeats = flightSeats;
+        }
+
+        public Itinerary Itinerary
+        {
+            get { return this.itinerary; }
+            set { this.itinerary = value; }
+        }
+
+//        public IDictionary FlightSeats
+//        {
+//            get { return this.flightSeats; }
+//            set { this.flightSeats = value; }
+//        }
+
+        public Passenger Passenger
+        {
+            get { return passenger; }
+            set { passenger = value; }
+        }
+
+        public override bool Equals(object obj)
+        {
+            Reservation rhs = obj as Reservation;
+            return rhs != null
+                   && this.passenger.Id.Equals(rhs.passenger.Id)
+                   && this.itinerary == rhs.itinerary;
+        }
+
+        public override int GetHashCode()
+        {
+            return this.passenger.Id.GetHashCode() + this.itinerary.GetHashCode();
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/ReservationConfirmation.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/ReservationConfirmation.cs
new file mode 100644
index 00000000..f94bfd25
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/ReservationConfirmation.cs
@@ -0,0 +1,91 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+	/// <summary>
+	/// ...
+	/// </summary>
+	/// <author>Keith Donald</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: ReservationConfirmation.cs,v 1.4 2005/12/13 00:42:50 bbaia Exp $</version>
+	[Serializable]
+	public class ReservationConfirmation
+	{
+		#region Fields
+
+		private string confirmationNumber;
+		private Reservation reservation;
+
+		#endregion
+
+		#region Constructor (s) / Destructor
+
+	    public ReservationConfirmation()
+	    {}
+
+	    public ReservationConfirmation(
+			string confirmationNumber, Reservation reservation)
+		{
+			this.confirmationNumber = confirmationNumber;
+			this.reservation = reservation;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public string ConfirmationNumber
+		{
+			get { return this.confirmationNumber; }
+			set { this.confirmationNumber = value; }
+		}
+
+		public Reservation Reservation
+		{
+			get { return this.reservation; }
+			set { this.reservation = value; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		public override bool Equals(object obj)
+		{
+			ReservationConfirmation rhs = obj as ReservationConfirmation;
+			return rhs != null &&
+				this.confirmationNumber.Equals(rhs.confirmationNumber);
+		}
+
+		public override int GetHashCode()
+		{
+			return this.confirmationNumber.GetHashCode();
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Seat.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Seat.cs
new file mode 100644
index 00000000..207a63ec
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Seat.cs
@@ -0,0 +1,74 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+    /// <summary>
+    /// A seat 
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: Seat.cs,v 1.3 2005/10/08 07:21:15 aseovic Exp $</version>
+    [Serializable]
+    public sealed class Seat
+    {
+        private string seatNumber;
+        private bool isReserved;
+        private CabinClass cabinClass;
+
+        public Seat(string seatNumber, CabinClass cabinClass, bool isReserved)
+        {
+            #region Sanity Check
+
+            if (seatNumber == null || seatNumber.Trim().Length == 0)
+            {
+                throw new ArgumentNullException("seatNumber", "The 'seatNumber' argument is required.");
+            }
+
+            #endregion
+
+            this.seatNumber = seatNumber;
+            this.cabinClass = cabinClass;
+            this.isReserved = isReserved;
+        }
+
+        public string Number
+        {
+            get { return seatNumber; }
+        }
+
+        public bool IsReserved
+        {
+            get { return isReserved; }
+            set { isReserved = value; }
+        }
+
+        public CabinClass CabinClass
+        {
+            get { return cabinClass; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/TimeRange.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/TimeRange.cs
new file mode 100644
index 00000000..2825d700
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/TimeRange.cs
@@ -0,0 +1,160 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+	/// <summary>
+	/// ...
+	/// </summary>
+	/// <author>Keith Donald</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: TimeRange.cs,v 1.3 2005/10/09 06:18:45 aseovic Exp $</version>
+	[Serializable]
+    [TypeConverter(typeof(TimeRange.TimeRangeTypeConverter))]
+	public class TimeRange
+	{
+		private short minHour;
+		private short maxHour;
+
+	    public TimeRange()
+	    {}
+
+	    public TimeRange(short minHour, short maxHour)
+		{
+			this.minHour = minHour;
+			this.maxHour = maxHour;
+		}
+
+		public short MinHour
+		{
+			get { return this.minHour; }
+		}
+
+		public short MaxHour
+		{
+			get { return this.maxHour; }
+		}
+
+		public override bool Equals(Object obj)
+		{
+			TimeRange rhs = obj as TimeRange;
+			return rhs != null
+				&& this.minHour == rhs.minHour
+				&& this.maxHour == rhs.maxHour;
+		}
+
+		public override int GetHashCode()
+		{
+			return this.minHour.GetHashCode() + this.maxHour.GetHashCode() * 29;
+		}
+
+		public override string ToString()
+		{
+			return string.Format(CultureInfo.InvariantCulture,
+			                     "[{0} - {1}]", this.minHour, this.maxHour);
+        }
+
+        #region Inner Class : TimeRangeTypeConverter
+
+        /// <summary>
+        /// The default <see cref="SpringAir.Domain.TimeRange"/>
+        ///  <see cref="System.ComponentModel.TypeConverter"/> implementation.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Seems reasonable to supply this here, as the
+        /// <see cref="SpringAir.Domain.TimeRange"/> class is pretty vanilla, and
+        /// one can't see anyone wanting to do a different
+        /// <see cref="System.ComponentModel.TypeConverter"/> implementation. This
+        /// is, at the very least, a reasonable default.
+        /// </p>
+        /// </remarks>
+        [Serializable]
+        public sealed class TimeRangeTypeConverter : TypeConverter
+        {
+            public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+            {
+                if (sourceType == typeof (string))
+                {
+                    return true;
+                }
+                return base.CanConvertFrom(context, sourceType);
+            }
+
+            public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+            {
+                string text = value as string;
+                if (text != null)
+                {
+                    text = text.Trim().Trim(new char[] {'[', ']'}).Trim();
+                    string[] minMax = text.Split('-');
+                    if(minMax.Length != 2)
+                    {
+                        throw new FormatException();
+                    }
+                    try
+                    {
+                        short minHours = short.Parse(minMax[0].Trim());
+                        short maxHours = short.Parse(minMax[1].Trim());
+                        return new TimeRange(minHours, maxHours);
+                    }
+                    catch (OverflowException ex)
+                    {
+                        throw new FormatException("Values out of range.", ex);
+                    }
+                }
+                return base.ConvertFrom(context, culture, value);
+            }
+
+            public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+            {
+                if (destinationType == typeof (string))
+                {
+                    return true;
+                }
+                return base.CanConvertFrom(context, destinationType);
+            }
+
+            public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value,
+                Type destinationType)
+            {
+                if (destinationType == typeof(string))
+                {
+                    TimeRange range = (TimeRange) value;
+                    // don't want to rely on TimeRange.ToString implementation (even though its the same)...
+                    return string.Format(
+                        CultureInfo.InvariantCulture,
+                        "[{0} - {1}]", range.MinHour, range.MaxHour);
+                }
+                return base.ConvertTo(context, culture, value, destinationType);
+            }
+        }
+
+        #endregion
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Trip.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Trip.cs
new file mode 100644
index 00000000..67bab423
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/Trip.cs
@@ -0,0 +1,119 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Text;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+    /// <summary>
+    /// ...
+    /// </summary>
+    /// <author>Keith Donald</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: Trip.cs,v 1.2 2005/09/27 21:14:28 springboy Exp $</version>
+    [Serializable]
+    public class Trip
+    {
+        #region Fields
+
+        private TripMode mode = TripMode.RoundTrip;
+        private TripPoint startingFrom = new TripPoint();
+        private TripPoint returningFrom = new TripPoint();
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="SpringAir.Domain.Trip"/> class.
+        /// </summary>
+        public Trip()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="SpringAir.Domain.Trip"/> class.
+        /// </summary>
+        /// <param name="mode">
+        /// The desired trip mode (one way or return).
+        /// </param>
+        /// <param name="startingFrom">
+        /// The airport, date and time from where and when the journey is to start.
+        /// </param>
+        /// <param name="returningFrom">
+        /// The airport, date and time from where and when the return journey is to start.
+        /// </param>
+        public Trip(TripMode mode, TripPoint startingFrom, TripPoint returningFrom)
+        {
+            this.mode = mode;
+            this.startingFrom = startingFrom;
+            this.returningFrom = returningFrom;
+        }
+
+        #endregion
+
+        #region Properties
+
+        public TripMode Mode
+        {
+            get { return this.mode; }
+            set { this.mode = value; }
+        }
+
+        public TripPoint StartingFrom
+        {
+            get { return this.startingFrom; }
+            set { this.startingFrom = value; }
+        }
+
+        public TripPoint ReturningFrom
+        {
+            get { return this.returningFrom; }
+            set { this.returningFrom = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> representation of this
+        /// <see cref="SpringAir.Domain.Trip"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> representation of this
+        /// <see cref="SpringAir.Domain.Trip"/>.
+        /// </returns>
+        public override string ToString()
+        {
+            StringBuilder buffer = new StringBuilder();
+            buffer
+                .Append(Mode).Append(", from ")
+                .Append(StartingFrom).Append(" to ")
+                .Append(ReturningFrom);
+            return buffer.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/TripMode.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/TripMode.cs
new file mode 100644
index 00000000..213a3d44
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/TripMode.cs
@@ -0,0 +1,41 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+	/// <summary>
+	/// ...
+	/// </summary>
+	/// <author>Keith Donald</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: TripMode.cs,v 1.2 2005/10/05 05:06:49 aseovic Exp $</version>
+    [Serializable]
+    public enum TripMode 
+    {
+		OneWay,
+		RoundTrip
+	}
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Domain/TripPoint.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/TripPoint.cs
new file mode 100644
index 00000000..f5fd0ff4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Domain/TripPoint.cs
@@ -0,0 +1,101 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Text;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+	/// <summary>
+	/// ...
+	/// </summary>
+	/// <author>Keith Donald</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: TripPoint.cs,v 1.3 2005/10/08 07:21:15 aseovic Exp $</version>
+	[Serializable]
+	public class TripPoint
+	{
+		private string airportCode;
+		private DateTime date;
+		private TimeRange timeRange = new TimeRange(0, 24);
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="SpringAir.Domain.TripPoint"/> class.
+		/// </summary>
+		public TripPoint()
+		{
+		}
+
+		public TripPoint(string airportCode, DateTime date)
+		{
+			this.airportCode = airportCode;
+			this.date = date;
+		}
+
+		public TripPoint(string airportCode, DateTime date, TimeRange timeRange)
+		{
+			this.airportCode = airportCode;
+			this.date = date;
+			this.timeRange = timeRange;
+		}
+
+		public string AirportCode
+		{
+			get { return this.airportCode; }
+			set { this.airportCode = value; }
+		}
+
+		public DateTime Date
+		{
+			get { return this.date; }
+			set { this.date = value; }
+		}
+
+		public TimeRange TimeRange
+		{
+			get { return this.timeRange; }
+			set { this.timeRange = value; }
+		}
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> representation of this
+        /// <see cref="SpringAir.Domain.TripPoint"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> representation of this
+        /// <see cref="SpringAir.Domain.TripPoint"/>.
+        /// </returns>
+	    public override string ToString()
+	    {
+            StringBuilder buffer = new StringBuilder();
+            buffer
+                .Append("[")
+                .Append(AirportCode).Append(" : ")
+                .Append(Date).Append(" (")
+                .Append(TimeRange).Append(")]");
+            return buffer.ToString();
+	    }
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Service/CannotConfirmReservationException.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Service/CannotConfirmReservationException.cs
new file mode 100644
index 00000000..269d2326
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Service/CannotConfirmReservationException.cs
@@ -0,0 +1,97 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace SpringAir.Service
+{
+    /// <summary>
+    /// Thrown in response to a failure to confirm a
+    /// <see cref="SpringAir.Domain.Reservation"/>.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This could be for any number of reasons: the backend database is down, the
+    /// reservation has been rejected, etc.
+    /// </p>
+    /// </remarks>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: CannotConfirmReservationException.cs,v 1.1 2005/10/02 00:06:29 springboy Exp $</version>
+    [Serializable]
+    public class CannotConfirmReservationException : ApplicationException
+    {
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="SpringAir.Service.CannotConfirmReservationException"/> class.
+        /// </summary>
+        public CannotConfirmReservationException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="SpringAir.Service.CannotConfirmReservationException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public CannotConfirmReservationException(string message)
+            : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="SpringAir.Service.CannotConfirmReservationException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public CannotConfirmReservationException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="SpringAir.Service.CannotConfirmReservationException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected CannotConfirmReservationException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Service/DefaultBookingAgent.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Service/DefaultBookingAgent.cs
new file mode 100644
index 00000000..1c0112dd
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Service/DefaultBookingAgent.cs
@@ -0,0 +1,243 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Validation;
+using SpringAir.Data;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Service
+{
+	#region Production Booking Agent implementation
+
+	/// <summary>
+	/// Default implementation of the <see cref="SpringAir.Service.IBookingAgent"/>
+	/// service interface.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: DefaultBookingAgent.cs,v 1.9 2008/04/02 23:00:00 markpollack Exp $</version>
+	public class DefaultBookingAgent : IBookingAgent
+	{
+		private IAirportDao airportDao;
+		private IFlightDao flightDao;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="SpringAir.Service.DefaultBookingAgent"/> class.
+		/// </summary>
+		/// <param name="airportDao">
+		/// An appropriate implementation of the
+		/// <see cref="SpringAir.Data.IAirportDao"/> that this DAO
+		/// can use to find <see cref="SpringAir.Domain.Airport"/>
+		/// instances with.
+		/// </param>
+		/// <param name="flightDao">
+		/// An appropriate implementation of the
+		/// <see cref="SpringAir.Data.IFlightDao"/> that this DAO
+		/// can use to find <see cref="SpringAir.Domain.Flight"/>
+		/// instances with.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If either of the supplied arguments is <cref lang="null"/>.
+		/// </exception>
+		public DefaultBookingAgent(IAirportDao airportDao, IFlightDao flightDao)
+		{
+			#region Sanity Checks
+
+			if (airportDao == null)
+			{
+				throw new ArgumentNullException("airportDao", "The 'airportDao' argument is required.");
+			}
+			if (flightDao == null)
+			{
+				throw new ArgumentNullException("legDao", "The 'legDao' argument is required.");
+			}
+
+			#endregion
+
+			this.airportDao = airportDao;
+			this.flightDao = flightDao;
+		}
+
+		/// <summary>
+		/// Gets those <see cref="SpringAir.Domain.FlightSuggestions"/>
+		/// that are applicable for the supplied <see cref="SpringAir.Domain.Trip"/>.
+		/// </summary>
+		/// <param name="trip">
+		/// The <see cref="SpringAir.Domain.Trip"/> that contains the criteria
+		/// that are to be used to select the flight suggestions.
+		/// </param>
+		/// <returns>
+		/// A <see cref="SpringAir.Domain.FlightSuggestions"/> comprised of all
+		/// those <see cref="SpringAir.Domain.Flight"/> instances that
+		/// are applicable for the supplied <see cref="SpringAir.Domain.Trip"/>.
+		/// </returns>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="trip"/> is <cref lang="null"/>.
+		/// </exception>
+		public FlightSuggestions SuggestFlights(Trip trip)
+		{
+			#region Sanity Check
+
+			if (trip == null)
+			{
+				throw new ArgumentNullException("trip", "The 'trip' argument is required.");
+			}
+
+			#endregion
+
+			Airport origin = this.airportDao.GetAirport(trip.StartingFrom.AirportCode);
+			Airport destination = this.airportDao.GetAirport(trip.ReturningFrom.AirportCode);
+
+			FlightCollection outboundLegs = GetFlights(origin, destination, trip.StartingFrom.Date);
+			FlightCollection returnLegs = null;
+			if (trip.Mode == TripMode.RoundTrip)
+			{
+				// swap 'em round, and get the legs for the way back...
+				returnLegs = GetFlights(destination, origin, trip.ReturningFrom.Date);
+			}
+			return new FlightSuggestions(outboundLegs, returnLegs);
+		}
+
+		/// <summary>
+		/// Goes ahead and actually books what up until this point has been a
+		/// transient <paramref name="reservation"/>.
+		/// </summary>
+		/// <param name="reservation">
+		/// The <see cref="SpringAir.Domain.Reservation"/> that is to be confirmed.
+		/// </param>
+		/// <returns>
+		/// A confirmation that the supplied <paramref name="reservation"/>
+		/// has been accepted by the system.
+		/// </returns>
+		/// <exception cref="SpringAir.Service.CannotConfirmReservationException">
+		/// If the supplied <paramref name="reservation"/> cannot be confirmed
+		/// (for whatever reason).
+		/// </exception>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="reservation"/> is <cref lang="null"/>.
+		/// </exception>
+		/// <seealso cref="SpringAir.Service.IBookingAgent.Book"/>
+		public ReservationConfirmation Book(Reservation reservation)
+		{
+			if (reservation == null)
+			{
+				throw new ArgumentNullException("reservation", "The 'reservation' argument is required.");
+			}
+		    //TODO do something in the db...
+            return new ReservationConfirmation(Guid.NewGuid().ToString("N").Substring(17, 5).ToUpper(), reservation);
+		}
+
+		private FlightCollection GetFlights(Airport origin, Airport destination, DateTime departureDate)
+		{
+			return this.flightDao.GetFlights(origin, destination, departureDate);
+		}
+
+		public AirportCollection GetAirportList()
+		{
+			return airportDao.GetAllAirports();
+		}
+	}
+
+	#endregion
+
+	#region Booking Agent Stub
+
+	public class BookingAgentStub : IBookingAgent
+	{
+		private static readonly FlightCollection NoSuggestions = new FlightCollection();
+
+		private IAirportDao airportDao;
+		private IAircraftDao aircraftDao;
+
+		public BookingAgentStub(IAirportDao airportDao, IAircraftDao aircraftDao)
+		{
+			this.airportDao = airportDao;
+			this.aircraftDao = aircraftDao;
+		}
+
+		public FlightSuggestions SuggestFlights([Validated("tripValidator")] Trip trip)
+		{
+			#region Sanity Check
+
+			if (trip == null)
+			{
+				throw new ArgumentNullException("trip", "The 'trip' argument is required.");
+			}
+
+			#endregion
+
+			Aircraft outboundAircraft, returnAircraft;
+			bool transAtlantic = trip.StartingFrom.AirportCode == "LHR" || trip.ReturningFrom.AirportCode == "LHR";
+			if (transAtlantic)
+			{
+				outboundAircraft = aircraftDao.GetAircraft(2);
+				returnAircraft = aircraftDao.GetAircraft(2);
+			}
+			else
+			{
+				outboundAircraft = aircraftDao.GetAircraft(1);
+				returnAircraft = aircraftDao.GetAircraft(3);
+			}
+			Airport from = airportDao.GetAirport(trip.StartingFrom.AirportCode);
+			Airport to = airportDao.GetAirport(trip.ReturningFrom.AirportCode);
+
+			FlightCollection outboundFlights = new FlightCollection();
+			outboundFlights.Add(new Flight("UA 0123", from, to, outboundAircraft, trip.StartingFrom.Date.AddHours(6.5)));
+			outboundFlights.Add(new Flight("AA 2367", from, to, outboundAircraft, trip.StartingFrom.Date.AddHours(10)));
+			outboundFlights.Add(new Flight("SW 6534", from, to, outboundAircraft, trip.StartingFrom.Date.AddHours(15.75)));
+			outboundFlights.Add(new Flight("CO 0054", from, to, outboundAircraft, trip.StartingFrom.Date.AddHours(19.25)));
+
+			FlightCollection returnFlights = new FlightCollection();
+			returnFlights.Add(new Flight("CO 0112", to, from, returnAircraft, trip.ReturningFrom.Date.AddHours(9)));
+			returnFlights.Add(new Flight("UA 0230", to, from, returnAircraft, trip.ReturningFrom.Date.AddHours(12.3)));
+			returnFlights.Add(new Flight("AA 2234", to, from, returnAircraft, trip.ReturningFrom.Date.AddHours(21.5)));
+
+			if (trip.Mode == TripMode.RoundTrip)
+			{
+				return new FlightSuggestions(outboundFlights, returnFlights);
+			}
+			else
+			{
+				return new FlightSuggestions(outboundFlights, NoSuggestions);
+			}
+		}
+
+		public ReservationConfirmation Book(Reservation reservation)
+		{
+			if (reservation == null)
+			{
+				throw new ArgumentNullException("reservation", "The 'reservation' argument is required.");
+			}
+			return new ReservationConfirmation(Guid.NewGuid().ToString("N").Substring(17, 5).ToUpper(), reservation);
+		}
+
+		public AirportCollection GetAirportList()
+		{
+			return airportDao.GetAllAirports();
+		}
+	}
+
+	#endregion
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/Service/IBookingAgent.cs b/examples/Spring/SpringAir/src/SpringAir.Core/Service/IBookingAgent.cs
new file mode 100644
index 00000000..28185703
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/Service/IBookingAgent.cs
@@ -0,0 +1,102 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Service
+{
+	/// <summary>
+	/// Central service interface for the trip booking use cases of the
+	/// SpringAir application.
+	/// </summary>
+	/// <author>Keith Donald</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: IBookingAgent.cs,v 1.7 2005/12/21 14:38:19 springboy Exp $</version>
+	public interface IBookingAgent
+	{
+		/// <summary>
+		/// Gets those <see cref="SpringAir.Domain.FlightSuggestions"/>
+		/// that are applicable for the supplied <see cref="SpringAir.Domain.Trip"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Guaranteed to not be <see lang="null"/>, although there may not be any
+		/// actual suggested <see cref="SpringAir.Domain.Flight"/>s for either the
+		/// outbound (or return) legs.
+		/// </p>
+		/// </remarks>
+		/// <param name="trip">
+		/// The <see cref="SpringAir.Domain.Trip"/> that contains the criteria
+		/// that are to be used to select the flight suggestions.
+		/// </param>
+		/// <returns>
+		/// A <see cref="SpringAir.Domain.FlightSuggestions"/> comprised of all
+		/// those <see cref="SpringAir.Domain.Flight"/> instances that
+		/// are applicable for the supplied <see cref="SpringAir.Domain.Trip"/>.
+		/// </returns>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="trip"/> is <cref lang="null"/>.
+		/// </exception>
+		FlightSuggestions SuggestFlights(Trip trip);
+
+		/// <summary>
+		/// Goes ahead and actually books what up until this point has been a
+		/// transient <paramref name="reservation"/>.
+		/// </summary>
+		/// <param name="reservation">
+		/// The <see cref="SpringAir.Domain.Reservation"/> that is to be confirmed.
+		/// </param>
+		/// <returns>
+		/// A confirmation that the supplied <paramref name="reservation"/>
+		/// has been accepted by the system.
+		/// </returns>
+		/// <exception cref="SpringAir.Service.CannotConfirmReservationException">
+		/// If the supplied <paramref name="reservation"/> cannot be confirmed
+		/// (for whatever reason).
+		/// </exception>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="reservation"/> is <cref lang="null"/>.
+		/// </exception>
+		ReservationConfirmation Book(Reservation reservation);
+
+		/// <summary>
+		/// Returns a collection of all of those
+		/// <see cref="SpringAir.Domain.Airport"/> instances that can be used for
+		/// the purposes of booking.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Guaranteed to not be <see lang="null"/>, although the collection
+		/// may well be empty (in the unlikely event that every
+		/// <see cref="SpringAir.Domain.Airport"/> has been purged from the system).
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// A collection of all of those <see cref="SpringAir.Domain.Airport"/>
+		/// instances that can be used for the purposes of booking.
+		/// </returns>
+		AirportCollection GetAirportList();
+	}
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2003.csproj b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2003.csproj
new file mode 100644
index 00000000..8228a2a2
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2003.csproj
@@ -0,0 +1,224 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "SpringAir.Core"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "SpringAir"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "SpringAir.Core.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\IAircraftDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IAirportDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IFlightDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\Aircraft.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\Airport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\AirportCollection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\Cabin.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\CabinClass.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\Entity.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\Flight.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\FlightCollection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\FlightSuggestions.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\Itinerary.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\Passenger.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\Reservation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\ReservationConfirmation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\Seat.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\TimeRange.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\Trip.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\TripMode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\TripPoint.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Service\CannotConfirmReservationException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Service\DefaultBookingAgent.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Service\IBookingAgent.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2005.csproj b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2005.csproj
new file mode 100644
index 00000000..e5430cbc
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.2005.csproj
@@ -0,0 +1,170 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{5E3427D8-62FC-483F-A86B-B44A79A46BCC}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>SpringAir.Core</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>SpringAir</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core, Version=1.1.1.20001, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Data\IAircraftDao.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Data\IAirportDao.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Data\IFlightDao.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\Aircraft.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\Airport.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\AirportCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\Cabin.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\CabinClass.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\Entity.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\Flight.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\FlightCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\FlightSuggestions.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\Itinerary.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\Passenger.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\Reservation.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\ReservationConfirmation.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\Seat.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\TimeRange.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\Trip.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\TripMode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\TripPoint.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Service\CannotConfirmReservationException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Service\DefaultBookingAgent.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Service\IBookingAgent.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <None Include="SpringAir.Core.build" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.build b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.build
new file mode 100644
index 00000000..9daddefa
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Core/SpringAir.Core.build
@@ -0,0 +1,27 @@
+<?xml version="1.0" ?>
+<project name="SpringAir.Core" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+    <!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+    <target name="build">
+        <csc
+            target="library"
+            define="${current.build.defines.csc}" warnaserror="false" debug="${current.build.debug}"
+            output="${current.bin.dir}/${project::get-name()}.dll">
+            <sources failonempty="true">
+                <include name="**/*.cs" />
+            </sources>
+            <nowarn>
+                <warning number="${nowarn.numbers}" />
+            </nowarn>
+            <references basedir="${current.bin.dir}">
+                <include name="log4net.dll" />
+	        <include name="Common.Logging.dll"/>
+                <include name="Spring.Core.dll" />
+            </references>
+        </csc>
+    </target>
+</project>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/AssemblyInfo.cs b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/AssemblyInfo.cs
new file mode 100644
index 00000000..0507bd8f
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/AssemblyInfo.cs
@@ -0,0 +1,40 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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;
+using System.Runtime.InteropServices;
+using System.Security.Permissions;
+
+[assembly: AssemblyTitle("SpringAir ADO.NET DAO functionality")]
+[assembly: AssemblyDescription("ADO.NET DAO functionality for SpringAir")]
+[assembly: AssemblyVersion("1.0.0.0")]
+
+[assembly: AssemblyConfiguration("net-1.1.win32; Release")]
+[assembly: AssemblyCompany("http://www.springframework.net/")]
+[assembly: AssemblyProduct("Spring.NET")]
+[assembly: AssemblyCopyright("Copyright © 2002-2005. Licensed under the Apache License, Version 2.0")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]	
+
+[assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)]
+
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(false)]
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/AircraftDao.cs b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/AircraftDao.cs
new file mode 100644
index 00000000..2ed2ce31
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/AircraftDao.cs
@@ -0,0 +1,140 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+using System.Data;
+
+using Spring.Data;
+using Spring.Data.Core;
+using Spring.Data.Support;
+using Spring.Caching;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Data.Ado
+{
+    /// <summary>
+    /// AdoTemplate based backed implementation of the
+    /// <see cref="SpringAir.Data.IAircraftDao"/> interface.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AircraftDao.cs,v 1.10 2007/10/11 17:59:21 markpollack Exp $</version>
+    public class AircraftDao : AdoDaoSupport, IAircraftDao
+    {
+        #region Queries
+
+        private const string AllAircraft =
+            "SELECT id, model, row_count, seats_per_row," +
+                "(SELECT seat_count FROM aircraft_cabin_seat WHERE cabin_class_id = 0 AND aircraft_id = id) coach_seats," +
+                "(SELECT seat_count FROM aircraft_cabin_seat WHERE cabin_class_id = 1 AND aircraft_id = id) business_seats," +
+                "(SELECT seat_count FROM aircraft_cabin_seat WHERE cabin_class_id = 2 AND aircraft_id = id) first_class_seats " +
+                "FROM aircraft";
+
+        private const string SingleAircraftById = AllAircraft + " WHERE id = @id";
+
+        #endregion
+
+        private IRowMapper aircraftMapper = new AircraftMapper();
+
+        /// <summary>
+        /// Gets all of the <see cref="SpringAir.Domain.Aircraft"/> instances
+        /// that exist in the system.
+        /// </summary>
+        /// <returns>
+        /// All of the <see cref="SpringAir.Domain.Aircraft"/> instances
+        /// that exist in the system; if no <see cref="SpringAir.Domain.Aircraft"/>
+        /// instances can be found will return an empty
+        /// <see cref="System.Collections.IList"/> (but never <cref lang="null"/>).
+        /// </returns>
+        [CacheResult("AspNetCache", "'Aircrafts'", TimeToLive = "0:1:0")]
+        [CacheResultItems("AspNetCache", "'Aircraft.Id=' + Id", TimeToLive = "0:1:0")]
+        public IList GetAllAircraft()
+        {
+            return AdoTemplate.QueryWithRowMapper(CommandType.Text, AllAircraft, aircraftMapper);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="SpringAir.Domain.Aircraft"/> uniquely
+        /// identified by the supplied <paramref name="id"/>.
+        /// </summary>
+        /// <param name="id">
+        /// The id that uniquely identifies an <see cref="SpringAir.Domain.Aircraft"/>.
+        /// </param>
+        /// <returns>
+        /// The <see cref="SpringAir.Domain.Aircraft"/> uniquely
+        /// identified by the supplied <paramref name="id"/>; or <cref lang="null"/>
+        /// if no such <see cref="SpringAir.Domain.Airport"/> can be found.
+        /// </returns>
+        [CacheResult("AspNetCache", "'Aircraft.Id=' + #id", TimeToLive = "0:1:0")]
+        public Aircraft GetAircraft(long id)
+        {
+            return (Aircraft) AdoTemplate.QueryForObject(CommandType.Text, SingleAircraftById, aircraftMapper,
+                                                         "id", DbType.Int32, 0, id);
+        }
+
+        public IRowMapper AircraftMapper
+        {
+            set { aircraftMapper = value; }
+        }
+    }
+
+    #region AircraftDao Stub
+
+    public class AircraftDaoStub : IAircraftDao
+    {
+        private IList aircraftList = new ArrayList();
+
+        public AircraftDaoStub()
+        {
+            // create stub aircraft
+            aircraftList.Add(new Aircraft(1, "Boeing 737",
+                                          new Cabin(CabinClass.Business, 1, 4, "ABCD"),
+                                          new Cabin(CabinClass.Coach, 5, 29, "ABCDEF")
+                ));
+            aircraftList.Add(new Aircraft(2, "Boeing 747",
+                                          new Cabin(CabinClass.First, 1, 15, "ABCD"),
+                                          new Cabin(CabinClass.Business, 16, 30, "ABCDEF"),
+                                          new Cabin(CabinClass.Coach, 31, 85, "ABCDEFGHI")
+                ));
+            aircraftList.Add(new Aircraft(3, "Airbus 320",
+                                          new Cabin(CabinClass.Business, 1, 6, "ABCD"),
+                                          new Cabin(CabinClass.Coach, 7, 32, "ABCDEF")
+                ));
+        }
+
+        [CacheResult("AspNetCache", "'Aircrafts'", TimeToLive = "0:1:0")]
+        [CacheResultItems("AspNetCache", "'Aircraft.Id=' + Id", TimeToLive = "0:1:0")]
+        public IList GetAllAircraft()
+        {
+            return aircraftList;
+        }
+
+        [CacheResult("AspNetCache", "'Aircraft.Id=' + #id", TimeToLive = "0:1:0")]
+        public Aircraft GetAircraft(long id)
+        {
+            return (Aircraft) aircraftList[(int) (id - 1)];
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/AircraftMapper.cs b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/AircraftMapper.cs
new file mode 100644
index 00000000..a474150d
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/AircraftMapper.cs
@@ -0,0 +1,61 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using Spring.Data;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Data.Ado
+{
+	/// <summary>
+	/// Maps a single row from <see cref="System.Data.SqlClient.SqlDataReader"/>
+	/// to an <see cref="SpringAir.Domain.Aircraft"/> instance.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: AircraftMapper.cs,v 1.1 2006/11/28 06:42:26 markpollack Exp $</version>
+	public class AircraftMapper : IRowMapper
+	{
+		/// <summary>
+		/// Maps values stripped from the supplied <paramref name="results"/>
+		/// object into an <see cref="SpringAir.Domain.Aircraft"/> instance.
+		/// </summary>
+		/// <param name="results">
+		/// The <see cref="System.Data.IDataReader"/> containing the result values.
+		/// </param>
+		/// <param name="rowNumber">
+		/// The number of the current row.
+		/// </param>
+		/// <returns>
+		/// An <see cref="SpringAir.Domain.Aircraft"/> instance containing the results
+		/// of the mapping.
+		/// </returns>
+		public object MapRow(IDataReader results, int rowNumber)
+		{
+			long id = results.GetInt32(0);
+			string model = results.GetString(1);
+			return new Aircraft(id, model, new Cabin[] {});
+		}
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/AirportDao.cs b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/AirportDao.cs
new file mode 100644
index 00000000..781bcc5b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/AirportDao.cs
@@ -0,0 +1,212 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Import
+
+using System.Collections;
+using System.Data;
+
+using Spring.Caching;
+using Spring.Data;
+using Spring.Data.Core;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Data.Ado
+{
+    /// <summary>
+    /// AdoTemplate backed implementation of the
+    /// <see cref="SpringAir.Data.IAirportDao"/> interface.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AirportDao.cs,v 1.13 2007/10/11 17:59:21 markpollack Exp $</version>
+    public class AirportDao : AdoDaoSupport, IAirportDao
+    {
+        private IRowMapper airportMapper = new AirportMapper();
+
+        /// <summary>
+        /// Gets all of the <see cref="SpringAir.Domain.Airport"/> instances
+        /// that exist in the system.
+        /// </summary>
+        /// <returns>
+        /// All of the <see cref="SpringAir.Domain.Airport"/> instances
+        /// that exist in the system; if no <see cref="SpringAir.Domain.Airport"/>
+        /// instances can be found will return an empty
+        /// <see cref="SpringAir.Domain.AirportCollection"/> (but never <cref lang="null"/>).
+        /// </returns>
+        [CacheResult("AspNetCache", "'Airports'", TimeToLive = "0:1:0")]
+        [CacheResultItems("AspNetCache", "'Airport.Id=' + Id", TimeToLive = "0:1:0")]
+        [CacheResultItems("AspNetCache", "'Airport.Code=' + Code", TimeToLive = "0:1:0")]
+        public AirportCollection GetAllAirports()
+        {
+			AirportCollection results = new AirportCollection();
+            IList list = AdoTemplate.QueryWithRowMapper(CommandType.Text,
+                                                        "SELECT * FROM airport", airportMapper);
+            
+            //TODO - add support to queries for supplying own collection implementation?   
+            // Why not using IResultSetExtrator ?
+            foreach (Airport airport in list)
+            {
+                results.Add(airport);
+            }
+			return results;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="SpringAir.Domain.Airport"/> uniquely
+        /// identified by the supplied <paramref name="id"/>.
+        /// </summary>
+        /// <param name="id">
+        /// The id that uniquely identifies an <see cref="SpringAir.Domain.Airport"/>.
+        /// </param>
+        /// <returns>
+        /// The <see cref="SpringAir.Domain.Airport"/> uniquely
+        /// identified by the supplied <paramref name="id"/>; or <cref lang="null"/>
+        /// if no such <see cref="SpringAir.Domain.Airport"/> can be found.
+        /// </returns>
+        [CacheResult("AspNetCache", "'Airport.Id=' + #id", TimeToLive = "0:1:0")]
+        public Airport GetAirport(long id)
+        {
+            return (Airport) AdoTemplate.QueryForObject(CommandType.Text,
+                                                        "SELECT * FROM airport WHERE id = @id",
+                                                        airportMapper, "id", DbType.Int32, 0, id);
+            //
+            //return (Airport) QueryForEntity("SELECT * FROM airport WHERE id = @id", id, this.airportMapper);
+        }
+
+        /// <summary>
+        /// Gets the <see cref="SpringAir.Domain.Airport"/> uniquely
+        /// identified by the supplied <paramref name="code"/>.
+        /// </summary>
+        /// <param name="code">
+        /// The code that uniquely identifies an <see cref="SpringAir.Domain.Airport"/>.
+        /// </param>
+        /// <returns>
+        /// The <see cref="SpringAir.Domain.Airport"/> uniquely
+        /// identified by the supplied <paramref name="code"/>; or <cref lang="null"/>
+        /// if no such <see cref="SpringAir.Domain.Airport"/> can be found.
+        /// </returns>
+        [CacheResult("AspNetCache", "'Airport.Code=' + #code", TimeToLive = "0:1:0")]
+        public Airport GetAirport(string code)
+        {
+            return (Airport) AdoTemplate.QueryForObject(CommandType.Text,
+                                                        "SELECT * FROM airport WHERE code = @code",
+                                                        airportMapper, "code", DbType.String, 0, code);
+            /*
+            IDbCommand command = GetCommand("SELECT * FROM airport WHERE code = @code");
+            IDbDataParameter parameter = command.CreateParameter();
+            parameter.ParameterName = "@code";
+            parameter.DbType = DbType.String;
+            parameter.Value = code;
+            command.Parameters.Add(parameter);
+            return (Airport) QueryForEntity(command, this.airportMapper);
+             */
+        }
+
+        public IRowMapper AirportMapper
+        {
+            set { airportMapper = value; }
+        }
+    }
+
+    #region AirportDao Stub
+
+    /// <summary>
+    /// Stub implementation of the <see cref="SpringAir.Data.IAirportDao"/> interface.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AirportDao.cs,v 1.13 2007/10/11 17:59:21 markpollack Exp $</version>
+    public class AirportDaoStub : IAirportDao
+    {
+        private AirportCollection airports = new AirportCollection();
+
+        public AirportDaoStub()
+        {
+            airports.Add(new Airport(1, "TPA", "Tampa", "Tampa International Airport"));
+            airports.Add(new Airport(2, "MCO", "Orlando", "Orlando International Airport"));
+            airports.Add(new Airport(3, "SFO", "San Francisco", "San Francisco International Airport"));
+            airports.Add(new Airport(4, "ORD", "Chicago", "O'Hare International Airport"));
+            airports.Add(new Airport(5, "LGA", "New York", "La Guardia International Airport"));
+            airports.Add(new Airport(6, "LHR", "London", "London Heathrow"));
+        }
+
+        /// <summary>
+        /// Gets all of the <see cref="SpringAir.Domain.Airport"/> instances
+        /// that exist in the system.
+        /// </summary>
+        /// <returns>
+        /// All of the <see cref="SpringAir.Domain.Airport"/> instances
+        /// that exist in the system; if no <see cref="SpringAir.Domain.Airport"/>
+        /// instances can be found will return an empty
+        /// <see cref="SpringAir.Domain.AirportCollection"/> (but never <cref lang="null"/>).
+        /// </returns>
+        [CacheResult("AspNetCache", "'Airports'", TimeToLive = "0:1:0")]
+        [CacheResultItems("AspNetCache", "'Airport.Id=' + Id", TimeToLive = "0:1:0")]
+        [CacheResultItems("AspNetCache", "'Airport.Code=' + Code", TimeToLive = "0:1:0")]
+        public AirportCollection GetAllAirports()
+        {
+			return airports;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="SpringAir.Domain.Airport"/> uniquely
+        /// identified by the supplied <paramref name="id"/>.
+        /// </summary>
+        /// <param name="id">
+        /// The id that uniquely identifies an <see cref="SpringAir.Domain.Airport"/>.
+        /// </param>
+        /// <returns>
+        /// The <see cref="SpringAir.Domain.Airport"/> uniquely
+        /// identified by the supplied <paramref name="id"/>; or <cref lang="null"/>
+        /// if no such <see cref="SpringAir.Domain.Airport"/> can be found.
+        /// </returns>
+        [CacheResult("AspNetCache", "'Airport.Id=' +#id", TimeToLive = "0:1:0")]
+        public Airport GetAirport(long id)
+        {
+            return airports[(int) id - 1];
+        }
+
+        /// <summary>
+        /// Gets the <see cref="SpringAir.Domain.Airport"/> uniquely
+        /// identified by the supplied <paramref name="code"/>.
+        /// </summary>
+        /// <param name="code">
+        /// The code that uniquely identifies an <see cref="SpringAir.Domain.Airport"/>.
+        /// </param>
+        /// <returns>
+        /// The <see cref="SpringAir.Domain.Airport"/> uniquely
+        /// identified by the supplied <paramref name="code"/>; or <cref lang="null"/>
+        /// if no such <see cref="SpringAir.Domain.Airport"/> can be found.
+        /// </returns>
+        [CacheResult("AspNetCache", "'Airport.Code=' +#code", TimeToLive = "0:1:0")]
+        public Airport GetAirport(string code)
+        {
+			foreach(Airport airport in airports)
+			{
+				if (airport.Code == code)
+					return airport;
+			}
+            return null;
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/AirportMapper.cs b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/AirportMapper.cs
new file mode 100644
index 00000000..2e2b872e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/AirportMapper.cs
@@ -0,0 +1,63 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using Spring.Data;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Data.Ado
+{
+	/// <summary>
+	/// Maps a single row from an <see cref="System.Data.SqlClient.SqlDataReader"/>
+	/// to an <see cref="SpringAir.Domain.Airport"/> instance.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: AirportMapper.cs,v 1.1 2006/11/28 06:42:26 markpollack Exp $</version>
+	public class AirportMapper : IRowMapper
+	{
+		/// <summary>
+		/// Maps values stripped from the supplied <paramref name="results"/>
+		/// object into an <see cref="SpringAir.Domain.Airport"/> instance.
+		/// </summary>
+		/// <param name="results">
+		/// The <see cref="System.Data.IDataReader"/> containing the result values.
+		/// </param>
+		/// <param name="rowNumber">
+		/// The number of the current row.
+		/// </param>
+		/// <returns>
+		/// An <see cref="SpringAir.Domain.Airport"/> instance containing the results
+		/// of the mapping.
+		/// </returns>
+		public object MapRow(IDataReader results, int rowNumber)
+		{
+			long id = results.GetInt32(0);
+			string code = results.GetString(1);
+			string city = results.GetString(2);
+			string description = results.GetString(3);
+			return new Airport(id, code, city, description);
+		}
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/FlightDao.cs b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/FlightDao.cs
new file mode 100644
index 00000000..c2ff6d17
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/FlightDao.cs
@@ -0,0 +1,220 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using Spring.Data;
+using Spring.Data.Core;
+using Spring.Data.Common;
+using Spring.Util;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Data.Ado
+{
+    /// <summary>
+    /// Spring AdoTemlate backed implementation of the
+    /// <see cref="SpringAir.Data.IFlightDao"/> interface.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: FlightDao.cs,v 1.6 2007/08/03 20:28:47 markpollack Exp $</version>
+    public class FlightDao : AdoDaoSupport, IFlightDao
+    {
+        #region Queries
+
+        private const string FlightsQuery =
+            "SELECT flight.id, flight.flight_number, flight.aircraft_id " +
+            "FROM flight INNER JOIN ( " +
+            "SELECT total_seats.id flight_id, (total_seats.tot_seats - reserved_seats.rsrvd_seats) free_seats " +
+            "FROM " +
+            "(SELECT flight.id, (row_count * seats_per_row) tot_seats " +
+            "FROM aircraft INNER JOIN flight ON flight.aircraft_id = aircraft.id " +
+            "GROUP BY flight.id, row_count, seats_per_row) total_seats " +
+            "INNER JOIN " +
+            "(SELECT flight.id, count(flight_id) rsrvd_seats " +
+            "FROM flight LEFT JOIN reserved_seat ON flight.id = reserved_seat.flight_id " +
+            "GROUP BY flight.id, flight_id) reserved_seats " +
+            "ON total_seats.id = reserved_seats.id) available_flights " +
+            "ON flight.id = available_flights.flight_id " +
+            "WHERE available_flights.free_seats > 0 " +
+            //"AND DATEADD(dd, DATEDIFF(dd, 0, flight.departure_date), 0) = DATEADD(dd, DATEDIFF(dd, 0, @departureDate), 0) " +
+            "AND flight.departure_airport_id = @departureAirport " +
+            "AND flight.destination_airport_id = @destinationAirport";
+
+        #endregion
+
+        private IAircraftDao aircraftDao;
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="SpringAir.Data.Ado.FlightDao"/> class.
+        /// </summary>
+        /// <param name="aircraftDao">
+        /// The DAO used to retrieve information about the <see cref="SpringAir.Domain.Aircraft"/>
+        /// associated with a <see cref="SpringAir.Domain.Flight"/>.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="aircraftDao"/> is <see lang="null"/>.
+        /// </exception>
+        public FlightDao(IAircraftDao aircraftDao)
+        {
+			if(aircraftDao == null) 
+			{
+				throw new ArgumentNullException("aircraftDao");
+			}
+            this.aircraftDao = aircraftDao;
+        }
+
+        #endregion
+
+        #region Methods
+
+        public FlightCollection GetFlights(Airport origin, Airport destination, DateTime departureDate)
+        {
+            #region Sanity Checks
+            AssertUtils.ArgumentNotNull(origin, "origin");
+            AssertUtils.ArgumentNotNull(destination, "destination");
+            #endregion
+
+            FlightCollection flights = new FlightCollection();
+            
+            
+            IDbParametersBuilder builder = new DbParametersBuilder(DbProvider);
+            builder.Create().Name("departureDate").Type(DbType.Date).Value(departureDate);
+            builder.Create().Name("departureAirport").Type(DbType.Int32).Value(origin.Id);
+            builder.Create().Name("destinationAirport").Type(DbType.Int32).Value(destination.Id);
+
+#if NET_2_0            
+            AdoTemplate.QueryWithRowCallbackDelegate(CommandType.Text, FlightsQuery, 
+                                                 delegate(IDataReader dataReader)
+                                                 {
+                                                     int flightId = dataReader.GetInt32(0);
+                                                     string flightNumber = dataReader.GetString(1);
+                                                     Aircraft aircraft = aircraftDao.GetAircraft(dataReader.GetInt32(2));
+
+                                                     //TODO: Load cabins from the database
+                                                     Cabin[] cabins = aircraft.Cabins;
+
+                                                     Flight flight = new Flight(flightId, flightNumber, origin, destination, aircraft, departureDate, cabins);
+                                                     flights.Add(flight); 
+                                                 }, 
+                                             
+                                             
+                                             builder.GetParameters());
+#else
+      AdoTemplate.QueryWithRowCallback(CommandType.Text, FlightsQuery,
+                                        new FlightRowCallback(flights, aircraftDao, origin,destination,departureDate ),
+                                        builder.GetParameters());      
+#endif
+            
+            
+            /*
+            IDbCommand command = GetCommand(FlightsQuery);
+            using(new ConnectionManager(command.Connection))
+            {
+                SetFlightQueryParameters(command, departureDate, origin.Id, destination.Id);
+                using (SqlDataReader reader = (SqlDataReader) command.ExecuteReader())
+                {
+                    while(reader.Read())
+                    {
+                        int flightId = reader.GetInt32(0);
+                        string flightNumber = reader.GetString(1);
+                        Aircraft aircraft = aircraftDao.GetAircraft(reader.GetInt32(2));
+
+                        //TODO: Load cabins from the database
+                        Cabin[] cabins = aircraft.Cabins;
+
+                        Flight flight = new Flight(flightId, flightNumber, origin, destination, aircraft, departureDate, cabins);
+                        flights.Add(flight);
+                    }
+                }
+            }
+             */
+            return flights;
+        }
+
+        private static void SetFlightQueryParameters(
+            IDbCommand command, DateTime departureDate, long departureAirportsId, long destinationAirportsId)
+        {
+            IDbDataParameter pDepartureDate = command.CreateParameter();
+            pDepartureDate.ParameterName = "@departureDate";
+            pDepartureDate.DbType = DbType.Date;
+            pDepartureDate.Value = departureDate;
+
+            IDbDataParameter pDepartureAirport = command.CreateParameter();
+            pDepartureAirport.ParameterName = "@departureAirport";
+            pDepartureAirport.DbType = DbType.Int32;
+            pDepartureAirport.Value = departureAirportsId;
+
+            IDbDataParameter pDestinationAirport = command.CreateParameter();
+            pDestinationAirport.ParameterName = "@destinationAirport";
+            pDestinationAirport.DbType = DbType.Int32;
+            pDestinationAirport.Value = destinationAirportsId;
+
+            command.Parameters.Add(pDepartureDate);
+            command.Parameters.Add(pDepartureAirport);
+            command.Parameters.Add(pDestinationAirport);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Without anonymous delegates this type of callback can be tedious if it is not reused.
+    /// An alternative is to use a transaction aware IDbProvider and do you own
+    /// resource management in order to avoid the back-forth-copying.
+    /// </summary>
+    internal class FlightRowCallback : IRowCallback
+    {
+        FlightCollection flights;
+        IAircraftDao aircraftDao;
+        Airport origin, destination;
+        DateTime departureDate;
+        public FlightRowCallback(FlightCollection flights, IAircraftDao aircraftDao, 
+                                 Airport origin, Airport destination, DateTime departureDate)
+        {
+            this.flights = flights;
+            this.aircraftDao = aircraftDao;
+            this.origin = origin;
+            this.destination = destination;
+            this.departureDate = departureDate;
+        }
+
+        public void ProcessRow(IDataReader dataReader)
+        {
+            int flightId = dataReader.GetInt32(0);
+            string flightNumber = dataReader.GetString(1);
+            Aircraft aircraft = aircraftDao.GetAircraft(dataReader.GetInt32(2));
+
+            //TODO: Load cabins from the database
+            Cabin[] cabins = aircraft.Cabins;
+
+            Flight flight = new Flight(flightId, flightNumber, origin, destination, aircraft, departureDate, cabins);
+            flights.Add(flight); 
+        }
+        
+        
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/ItineraryDao.cs b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/ItineraryDao.cs
new file mode 100644
index 00000000..6cfdad06
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/Data/Ado/ItineraryDao.cs
@@ -0,0 +1,113 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Data.Ado
+{
+    /// <summary>
+    /// ADO.NET backed implementation of the
+    /// <see cref="SpringAir.Data.IItineraryDao"/> interface.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ItineraryDao.cs,v 1.3 2005/10/02 14:06:50 springboy Exp $</version>
+    public class ItineraryDao : AbstractDao, IItineraryDao
+    {
+        private IAircraftDao aircraftDao;
+        private IAirportDao airportDao;
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="SpringAir.Data.Ado.ItineraryDao"/> class.
+        /// </summary>
+        /// <param name="aircraftDao">
+        /// An appropriate implementation of the
+        /// <see cref="SpringAir.Data.IAircraftDao"/> that this DAO
+        /// can use to find <see cref="SpringAir.Domain.Aircraft"/> with.
+        /// </param>
+        /// <param name="airportDao">
+        /// An appropriate implementation of the
+        /// <see cref="SpringAir.Data.IAirportDao"/> that this DAO
+        /// can use to find <see cref="SpringAir.Domain.Airport"/>
+        /// instances with.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If either of the supplied arguments is <cref lang="null"/>.
+        /// </exception>
+        public ItineraryDao(IAircraftDao aircraftDao, IAirportDao airportDao)
+        {
+            #region Sanity Checks
+
+            if (aircraftDao == null)
+            {
+                throw new ArgumentNullException("aircraftDao", "The 'aircraftDao' argument is required.");
+            }
+            if (airportDao == null)
+            {
+                throw new ArgumentNullException("airportDao", "The 'airportDao' argument is required.");
+            }
+
+            #endregion
+
+            this.aircraftDao = aircraftDao;
+            this.airportDao = airportDao;
+        }
+
+        /// <summary>
+        /// Gets a <see cref="System.Collections.IList"/> comprised of all
+        /// those <see cref="SpringAir.Domain.Itinerary"/> instances that
+        /// are applicable for the supplied <see cref="SpringAir.Domain.Trip"/>.
+        /// </summary>
+        /// <param name="trip">
+        /// The <see cref="SpringAir.Domain.Trip"/> that contains the criteria
+        /// that are to be used to select a list of applicable
+        /// <see cref="SpringAir.Domain.Itinerary"/> instances.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.Collections.IList"/> comprised of all
+        /// those <see cref="SpringAir.Domain.Itinerary"/> instances that
+        /// are applicable for the supplied <see cref="SpringAir.Domain.Trip"/>.
+        /// </returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="trip"/> is <cref lang="null"/>.
+        /// </exception>
+        public IList GetItinerariesFor(Trip trip)
+        {
+            #region Sanity Check
+
+            if (trip == null)
+            {
+                throw new ArgumentNullException("trip", "The 'trip' argument is required.");
+            }
+
+            #endregion
+
+            IList itineraries = new ArrayList();
+
+            return itineraries;
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2003.csproj b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2003.csproj
new file mode 100644
index 00000000..1e435b9b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2003.csproj
@@ -0,0 +1,139 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{78B285FE-27F3-44F4-84B1-7A589AB48EF3}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "SpringAir.Data.Ado"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "SpringAir"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "SpringAir.Core.2003"
+                    Project = "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Data"
+                    AssemblyName = "Spring.Data"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Data.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "SpringAir.Data.Ado.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\Ado\AircraftDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Ado\AircraftMapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Ado\AirportDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Ado\AirportMapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Ado\FlightDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2005.csproj b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2005.csproj
new file mode 100644
index 00000000..5a8e881b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.2005.csproj
@@ -0,0 +1,129 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{78B285FE-27F3-44F4-84B1-7A589AB48EF3}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>SpringAir.Data.Ado</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>SpringAir</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Data\Ado\AircraftDao.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Data\Ado\AircraftMapper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Data\Ado\AirportDao.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Data\Ado\AirportMapper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Data\Ado\FlightDao.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <None Include="SpringAir.Data.Ado.build" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SpringAir.Core\SpringAir.Core.2005.csproj">
+      <Project>{5E3427D8-62FC-483F-A86B-B44A79A46BCC}</Project>
+      <Name>SpringAir.Core.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.build b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.build
new file mode 100644
index 00000000..25fd46c6
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Data.Ado/SpringAir.Data.Ado.build
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+<project name="SpringAir.Data.Ado" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+    <!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+    <target name="build">
+        <csc
+            target="library"
+            define="${current.build.defines.csc}" warnaserror="false" debug="${current.build.debug}"
+            output="${current.bin.dir}/${project::get-name()}.dll">
+            <sources failonempty="true">
+                <include name="**/*.cs" />
+            </sources>
+            <nowarn>
+                <warning number="${nowarn.numbers}" />
+            </nowarn>
+            <references basedir="${current.bin.dir}">
+                <include name="SpringAir.Core.dll" />
+            </references>
+        </csc>
+    </target>
+</project>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/AssemblyInfo.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2003/AssemblyInfo.cs
new file mode 100644
index 00000000..5309b1f7
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/AssemblyInfo.cs
@@ -0,0 +1,40 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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;
+using System.Runtime.InteropServices;
+using System.Security.Permissions;
+
+[assembly: AssemblyTitle("SpringAir ASP.NET frontend")]
+[assembly: AssemblyDescription("SpringAir ASP.NET frontend")]
+[assembly: AssemblyVersion("1.0.0.0")]
+
+[assembly: AssemblyConfiguration("net-1.1.win32; Release")]
+[assembly: AssemblyCompany("http://www.springframework.net/")]
+[assembly: AssemblyProduct("Spring.NET")]
+[assembly: AssemblyCopyright("Copyright © 2002-2005. Licensed under the Apache License, Version 2.0")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]	
+
+[assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)]
+
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(false)]
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Aspects.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Aspects.xml
new file mode 100644
index 00000000..c831f2c4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Aspects.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<objects xmlns="http://www.springframework.net">
+
+  <!-- Cache aspect -->
+  <object id="CacheAspect" type="Spring.Aspects.Cache.CacheAspect, Spring.Aop"/>
+  <object id="AspNetCache" type="Spring.Caching.AspNetCache, Spring.Web"/>
+  
+  
+  <!-- Apply aspects to DAOs -->
+  <object type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+    <property name="ObjectNames">
+      <list>
+        <value>*Dao</value>
+      </list>
+    </property>
+    <property name="InterceptorNames">
+      <list>
+        <value>CacheAspect</value>
+      </list>
+    </property>
+  </object>
+
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Log4Net.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Log4Net.xml
new file mode 100644
index 00000000..b566a056
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Log4Net.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<log4net>
+	<appender name="AspNetTraceAppender" type="log4net.Appender.AspNetTraceAppender">
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="[%thread] %-5level - %message%newline" />
+		</layout>
+	</appender>
+	<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" />
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline" />
+		</layout>
+	</appender>
+
+    <appender name="TraceAppender" type="log4net.Appender.TraceAppender">
+        <layout type="log4net.Layout.PatternLayout">
+            <conversionPattern value="%-5p: %m" />
+        </layout>
+    </appender>
+
+	<!-- Set default logging level to DEBUG -->
+	<root>
+		<level value="DEBUG" />
+		<appender-ref ref="AspNetTraceAppender" />
+		<appender-ref ref="TraceAppender" />
+		<appender-ref ref="RollingFileAppender" />
+	</root>
+	<!--
+		In Spring.NET there is a 1-1 correspondence between the logger name and
+		the namespace of the class doing the logging...
+	-->
+	<logger name="Spring">
+		<level value="DEBUG" />
+	</logger>
+</log4net>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Production/Dao.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Production/Dao.xml
new file mode 100644
index 00000000..d83aeb59
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Production/Dao.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database">
+
+    <description>
+        The SpringAir object definitions for the Data Access Objects.
+    </description>
+
+    <!-- Property placeholder configurer for database settings -->
+    <object type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core">
+        <property name="ConfigSections" value="databaseSettings"/>
+    </object>
+
+    <!-- Production Data Access Objects -->
+  <!-- Production Data Access Objects -->
+  <db:provider id="dbProvider" 
+                 provider="SqlServer-1.1" 
+                 connectionString="Server=${db.server};Integrated Security=no;User ID=${db.user};PWD=${db.password};initial catalog=${db.schema};"/>
+
+  <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
+    <property name="DbProvider" ref="dbProvider"/>
+  </object>
+
+  <object id="aircraftDao" type="SpringAir.Data.Ado.AircraftDao, SpringAir.Data.Ado">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="airportDao" type="SpringAir.Data.Ado.AirportDao, SpringAir.Data.Ado">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="flightDao" type="SpringAir.Data.Ado.FlightDao, SpringAir.Data.Ado">
+    <constructor-arg index="0" ref="aircraftDao"/>
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Production/Services.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Production/Services.xml
new file mode 100644
index 00000000..17dc3109
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Production/Services.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+    <description>
+        The SpringAir object definitions for the middle (service) tier.
+    </description>
+
+    <!-- Production service definitions -->
+    <object id="bookingAgent" type="SpringAir.Service.DefaultBookingAgent, SpringAir.Core">
+        <description>
+            The main service interface for the SpringAir application.
+        </description>
+        <constructor-arg name="airportDao" ref="airportDao" />
+        <constructor-arg name="flightDao" ref="flightDao" />
+    </object>
+
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Services.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Services.xml
new file mode 100644
index 00000000..3b1adb00
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Services.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+    <description>
+        The SpringAir object definitions for the middle (service) tier.
+    </description>
+
+    <!-- Web service definitions -->
+    <object id="bookingAgentWebService" type="Spring.Web.Services.WebServiceExporter, Spring.Web">
+        <property name="TargetName" value="bookingAgent"/>
+        <property name="Name" value="BookingAgent"/>
+        <property name="Namespace" value="http://SpringAir/WebServices"/>
+        <property name="Description" value="SpringAir Booking Agent Web Service"/>
+        <property name="MemberAttributes">
+            <dictionary>
+                <entry key="SuggestFlights">
+                    <object type="System.Web.Services.WebMethodAttribute, System.Web.Services">
+                        <property name="Description" value="Gets those flight suggestions that are applicable for the supplied trip."/>
+                    </object>
+                </entry>
+                <entry key="Book">
+                    <object type="System.Web.Services.WebMethodAttribute, System.Web.Services">
+                        <property name="Description" value="Goes ahead and actually books what up until this point has been a transient reservation."/>
+                    </object>
+                </entry>
+                <entry key="GetAirportList">
+                    <object type="System.Web.Services.WebMethodAttribute, System.Web.Services">
+                        <property name="Description" value="Return a collection of all those airports that can be used for the purposes of booking."/>
+                    </object>
+                </entry>
+            </dictionary>
+        </property>
+    </object>
+    
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Test/Dao.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Test/Dao.xml
new file mode 100644
index 00000000..1359996c
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Test/Dao.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+    <description>
+        The SpringAir object definitions for the Data Access Objects.
+    </description>
+
+    <!-- Test stubs for Data Access Objects -->
+    <object id="aircraftDao" type="SpringAir.Data.Ado.AircraftDaoStub"/>
+    
+    <object id="airportDao" type="SpringAir.Data.Ado.AirportDaoStub"/>
+    
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Test/Services.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Test/Services.xml
new file mode 100644
index 00000000..711c783b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Test/Services.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+    <description>
+        The SpringAir object definitions for the middle (service) tier.
+    </description>
+
+    <!-- Service stubs that can be used for testing without the database -->
+    <object id="bookingAgent" type="SpringAir.Service.BookingAgentStub">
+        <constructor-arg name="airportDao" ref="airportDao" />
+        <constructor-arg name="aircraftDao" ref="aircraftDao" />
+    </object>
+    
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Web.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Web.xml
new file mode 100644
index 00000000..2edbe7dd
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Config/Web.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <!-- Localization-related config objects -->
+  <object id="cultureResolver" type="Spring.Globalization.Resolvers.SessionCultureResolver, Spring.Web" />
+  <object id="localizer" type="Spring.Globalization.Localizers.ResourceSetLocalizer, Spring.Core" />
+  <object id="messageSource" type="Spring.Context.Support.ResourceSetMessageSource, Spring.Core">
+    <property name="ResourceManagers">
+      <list>
+        <value>SpringAir.Resources.Strings, SpringAir.Web</value>
+      </list>
+    </property>
+    <property name="UseCodeAsDefaultMessage" value="true" />
+  </object>
+ 
+  <!-- Validation errors renderers -->
+  <object id="iconRenderer" type="Spring.Web.UI.Validation.IconValidationErrorsRenderer, Spring.Web">
+    <property name="IconSrc" value="validation-error.gif" />
+  </object>
+  <object id="divRenderer" type="Spring.Web.UI.Validation.DivValidationErrorsRenderer, Spring.Web">
+    <property name="CssClass" value="validationError" />
+  </object>
+
+  <!-- Validation error controls injection templates -->
+  <object id="Spring.Web.UI.Controls.ValidationError" abstract="true">
+    <property name="Renderer" ref="iconRenderer"/>
+  </object>
+  <object id="Spring.Web.UI.Controls.ValidationSummary" abstract="true">
+    <property name="Renderer" ref="divRenderer"/>
+  </object>
+ 
+  <!-- Base page definition. All other pages inherit these settings -->
+  <object id="standardPage" abstract="true">
+    <property name="MasterPageFile" value="~/Web/StandardTemplate.ascx" />
+    <property name="CultureResolver" ref="cultureResolver" />
+    <property name="Localizer" ref="localizer" />
+    <property name="CssRoot" value="Web/CSS" />
+    <property name="ImagesRoot" value="Web/Images" />
+  </object>
+ 
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Constants.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Constants.cs
new file mode 100644
index 00000000..65577ebb
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Constants.cs
@@ -0,0 +1,74 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace SpringAir
+{
+	/// <summary>
+	/// Constants for all of the various lookup keys used throughout the
+	/// application (to pull objects from the session, request, etc).
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Values could be injected into pages that needed them using the
+	/// <see cref="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject"/>
+	/// (if one wanted to go there).
+	/// </p>
+	/// </remarks>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: Constants.cs,v 1.1 2006/11/01 01:14:04 bbaia Exp $</version>
+	public sealed class Constants
+	{
+		/// <summary>
+		/// The key used to index into the AppSettings dictionary containing
+		/// the path to the Log4Net configuration file.
+		/// </summary>
+		public const string Log4NetConfigFile = "Log4NetConfigFile";
+
+		/// <summary>
+		/// The key under which the suggested flights for a user's trip
+		/// search are stored.
+		/// </summary>
+		public const string SuggestedFlightsKey = "suggestedFlights";
+
+		/// <summary>
+		/// The key under which the reservation confirmation for a user's trip
+		/// search are stored.
+		/// </summary>
+		public const string ReservationConfirmationKey = "reservationConfirmation";
+
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="SpringAir.Constants"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such exposes no public constructors.
+		/// </p>
+		/// </remarks>
+		private Constants()
+		{
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Global.asax b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Global.asax
new file mode 100644
index 00000000..0532acc4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Global.asax
@@ -0,0 +1 @@
+<%@ Application Inherits="SpringAir.Global" Language="C#" %>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Global.asax.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Global.asax.cs
new file mode 100644
index 00000000..93572385
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Global.asax.cs
@@ -0,0 +1,83 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Configuration;
+using System.IO;
+using System.Web;
+
+#endregion
+
+namespace SpringAir
+{
+    public class Global : HttpApplication
+    {
+        private IContainer components = null;
+
+        public Global()
+        {
+            InitializeComponent();
+        }
+
+        protected void Application_Start(Object sender, EventArgs e)
+        {
+        }
+
+        protected void Session_Start(Object sender, EventArgs e)
+        {
+        }
+
+        protected void Application_BeginRequest(Object sender, EventArgs e)
+        {
+        }
+
+        protected void Application_EndRequest(Object sender, EventArgs e)
+        {
+        }
+
+        protected void Application_AuthenticateRequest(Object sender, EventArgs e)
+        {
+        }
+
+        protected void Application_Error(Object sender, EventArgs e)
+        {
+        }
+
+        protected void Session_End(Object sender, EventArgs e)
+        {
+        }
+
+        protected void Application_End(Object sender, EventArgs e)
+        {
+        }
+
+        #region Web Form Designer generated code
+
+        private void InitializeComponent()
+        {
+            this.components = new Container();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Global.asax.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Global.asax.resx
new file mode 100644
index 00000000..dd0ea4d8
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Global.asax.resx
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Resources/Strings.en.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Resources/Strings.en.resx
new file mode 100644
index 00000000..9488c89c
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Resources/Strings.en.resx
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="default.title">
+    <value>SpringAir - Spring.NET Reference Application</value>
+  </data>
+  <data name="flightNumber" type="System.String">
+    <value>Flight #</value>
+  </data>
+  <data name="departureDate" type="System.String">
+    <value>Departure Time</value>
+  </data>
+  <data name="departureAirport" type="System.String">
+    <value>Departure Airport</value>
+  </data>
+  <data name="destinationAirport" type="System.String">
+    <value>Destination Airport</value>
+  </data>
+  <data name="aircraft" type="System.String">
+    <value>Aircraft Type</value>
+  </data>
+  <data name="seatPlan" type="System.String">
+    <value>Seat Plan</value>
+  </data>
+  <data name="outboundFlights" type="System.String">
+    <value>Outbound Flights</value>
+  </data>
+  <data name="returnFlights" type="System.String">
+    <value>Return Flights</value>
+  </data>
+  <data name="itinerary" type="System.String">
+    <value>Itinerary</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Resources/Strings.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Resources/Strings.resx
new file mode 100644
index 00000000..9488c89c
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Resources/Strings.resx
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="default.title">
+    <value>SpringAir - Spring.NET Reference Application</value>
+  </data>
+  <data name="flightNumber" type="System.String">
+    <value>Flight #</value>
+  </data>
+  <data name="departureDate" type="System.String">
+    <value>Departure Time</value>
+  </data>
+  <data name="departureAirport" type="System.String">
+    <value>Departure Airport</value>
+  </data>
+  <data name="destinationAirport" type="System.String">
+    <value>Destination Airport</value>
+  </data>
+  <data name="aircraft" type="System.String">
+    <value>Aircraft Type</value>
+  </data>
+  <data name="seatPlan" type="System.String">
+    <value>Seat Plan</value>
+  </data>
+  <data name="outboundFlights" type="System.String">
+    <value>Outbound Flights</value>
+  </data>
+  <data name="returnFlights" type="System.String">
+    <value>Return Flights</value>
+  </data>
+  <data name="itinerary" type="System.String">
+    <value>Itinerary</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Resources/Strings.sr-SP-Cyrl.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Resources/Strings.sr-SP-Cyrl.resx
new file mode 100644
index 00000000..49fcdac9
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Resources/Strings.sr-SP-Cyrl.resx
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="default.title">
+    <value>SpringAir - Референтна апликација за Spring.NET</value>
+  </data>
+  <data name="flightNumber" type="System.String">
+    <value>Лет #</value>
+  </data>
+  <data name="departureDate" type="System.String">
+    <value>Време полетања</value>
+  </data>
+  <data name="departureAirport" type="System.String">
+    <value>�еродром одла�ка</value>
+  </data>
+  <data name="destinationAirport" type="System.String">
+    <value>�еродром дола�ка</value>
+  </data>
+  <data name="aircraft" type="System.String">
+    <value>Тип авиона</value>
+  </data>
+  <data name="seatPlan" type="System.String">
+    <value>План �едишта</value>
+  </data>
+  <data name="outboundFlights" type="System.String">
+    <value>Одлазни летови</value>
+  </data>
+  <data name="returnFlights" type="System.String">
+    <value>Повратни летови</value>
+  </data>
+  <data name="itinerary" type="System.String">
+    <value>Резерви�ани летови</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Resources/Strings.sr-SP-Latn.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Resources/Strings.sr-SP-Latn.resx
new file mode 100644
index 00000000..3a381575
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Resources/Strings.sr-SP-Latn.resx
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="default.title">
+    <value>SpringAir - Referentna aplikacija za Spring.NET</value>
+  </data>
+  <data name="flightNumber" type="System.String">
+    <value>Let #</value>
+  </data>
+  <data name="departureDate" type="System.String">
+    <value>Vreme poletanja</value>
+  </data>
+  <data name="departureAirport" type="System.String">
+    <value>Aerodrom odlaska</value>
+  </data>
+  <data name="destinationAirport" type="System.String">
+    <value>Aerodrom dolaska</value>
+  </data>
+  <data name="aircraft" type="System.String">
+    <value>Tip aviona</value>
+  </data>
+  <data name="seatPlan" type="System.String">
+    <value>Plan sedišta</value>
+  </data>
+  <data name="outboundFlights" type="System.String">
+    <value>Odlazni letovi</value>
+  </data>
+  <data name="returnFlights" type="System.String">
+    <value>Povratni letovi</value>
+  </data>
+  <data name="itinerary" type="System.String">
+    <value>Rezervisani letovi</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-blue.css b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-blue.css
new file mode 100644
index 00000000..62ecf99e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-blue.css
@@ -0,0 +1,232 @@
+/* The main calendar widget.  DIV containing a table. */
+
+div.calendar { position: relative; }
+
+.calendar, .calendar table {
+  border: 1px solid #556;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #eef;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;    /* They are the navigation buttons */
+  padding: 2px;          /* Make the buttons seem like they're pressing */
+}
+
+.calendar .nav {
+  background: #778 url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;      /* Pressing it will take you to the current date */
+  text-align: center;
+  background: #fff;
+  color: #000;
+  padding: 2px;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+  background: #778;
+  color: #fff;
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+  background: #bdf;
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #556;
+  padding: 2px;
+  text-align: center;
+  color: #000;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #a66;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  background-color: #aaf;
+  color: #000;
+  border: 1px solid #04f;
+  padding: 1px;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  background-color: #77c;
+  padding: 2px 0px 0px 2px;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  color: #456;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #bbb;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #fbb;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #bdf;
+}
+
+.calendar tbody .rowhilite td {
+  background: #def;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #eef;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  background: #def;
+  padding: 1px 3px 1px 1px;
+  border: 1px solid #bbb;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  background: #cde;
+  padding: 2px 2px 0px 2px;
+}
+
+.calendar tbody td.selected { /* Cell showing today date */
+  font-weight: bold;
+  border: 1px solid #000;
+  padding: 1px 3px 1px 1px;
+  background: #fff;
+  color: #000;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #a66;
+}
+
+.calendar tbody td.today { /* Cell showing selected date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+  text-align: center;
+  background: #556;
+  color: #fff;
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: #fff;
+  color: #445;
+  border-top: 1px solid #556;
+  padding: 1px;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  background: #aaf;
+  border: 1px solid #04f;
+  color: #000;
+  padding: 1px;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  background: #77c;
+  padding: 2px 0px 0px 2px;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  top: 0px;
+  left: 0px;
+  width: 4em;
+  cursor: default;
+  border: 1px solid #655;
+  background: #def;
+  color: #000;
+  font-size: 90%;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .hilite {
+  background: #acf;
+}
+
+.calendar .combo .active {
+  border-top: 1px solid #46a;
+  border-bottom: 1px solid #46a;
+  background: #eef;
+  font-weight: bold;
+}
+
+.calendar td.time {
+  border-top: 1px solid #000;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #f4f0e8;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #667;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-blue2.css b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-blue2.css
new file mode 100644
index 00000000..8570affc
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-blue2.css
@@ -0,0 +1,236 @@
+/* The main calendar widget.  DIV containing a table. */
+
+div.calendar { position: relative; }
+
+.calendar, .calendar table {
+  border: 1px solid #206A9B;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #F1F8FC;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;    /* They are the navigation buttons */
+  padding: 2px;          /* Make the buttons seem like they're pressing */
+}
+
+.calendar .nav {
+  background: #007ED1 url(menuarrow2.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;      /* Pressing it will take you to the current date */
+  text-align: center;
+  background: #000;
+  color: #fff;
+  padding: 2px;
+}
+
+.calendar thead tr { /* Row <TR> containing navigation buttons */
+  background: #007ED1;
+  color: #fff;
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+  background: #C7E1F3;
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #206A9B;
+  padding: 2px;
+  text-align: center;
+  color: #000;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #a66;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  background-color: #34ABFA;
+  color: #000;
+  border: 1px solid #016DC5;
+  padding: 1px;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  background-color: #006AA9;
+  border: 1px solid #008AFF;
+  padding: 2px 0px 0px 2px;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  color: #456;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #bbb;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #fbb;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #C7E1F3;
+}
+
+.calendar tbody .rowhilite td {
+  background: #def;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #F1F8FC;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  background: #def;
+  padding: 1px 3px 1px 1px;
+  border: 1px solid #8FC4E8;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  background: #cde;
+  padding: 2px 2px 0px 2px;
+}
+
+.calendar tbody td.selected { /* Cell showing today date */
+  font-weight: bold;
+  border: 1px solid #000;
+  padding: 1px 3px 1px 1px;
+  background: #fff;
+  color: #000;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #a66;
+}
+
+.calendar tbody td.today { /* Cell showing selected date */
+  font-weight: bold;
+  color: #D50000;
+}
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+  text-align: center;
+  background: #206A9B;
+  color: #fff;
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: #000;
+  color: #fff;
+  border-top: 1px solid #206A9B;
+  padding: 1px;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  background: #B8DAF0;
+  border: 1px solid #178AEB;
+  color: #000;
+  padding: 1px;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  background: #006AA9;
+  padding: 2px 0px 0px 2px;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  top: 0px;
+  left: 0px;
+  width: 4em;
+  cursor: default;
+  border: 1px solid #655;
+  background: #def;
+  color: #000;
+  font-size: 90%;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .hilite {
+  background: #34ABFA;
+  border-top: 1px solid #46a;
+  border-bottom: 1px solid #46a;
+  font-weight: bold;
+}
+
+.calendar .combo .active {
+  border-top: 1px solid #46a;
+  border-bottom: 1px solid #46a;
+  background: #F1F8FC;
+  font-weight: bold;
+}
+
+.calendar td.time {
+  border-top: 1px solid #000;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #E3F0F9;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: #F1F8FC;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #267DB7;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: red;
+  background-color: #000;
+  color: #A5FF00;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-brown.css b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-brown.css
new file mode 100644
index 00000000..e7b6285b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-brown.css
@@ -0,0 +1,225 @@
+/* The main calendar widget.  DIV containing a table. */
+
+div.calendar { position: relative; }
+
+.calendar, .calendar table {
+  border: 1px solid #655;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #ffd;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;    /* They are the navigation buttons */
+  padding: 2px;          /* Make the buttons seem like they're pressing */
+}
+
+.calendar .nav {
+  background: #edc url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;      /* Pressing it will take you to the current date */
+  text-align: center;
+  background: #654;
+  color: #fed;
+  padding: 2px;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+  background: #edc;
+  color: #000;
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #655;
+  padding: 2px;
+  text-align: center;
+  color: #000;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  background-color: #faa;
+  color: #000;
+  border: 1px solid #f40;
+  padding: 1px;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  background-color: #c77;
+  padding: 2px 0px 0px 2px;
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+  background: #fed;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #bbb;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #fbb;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #fed;
+}
+
+.calendar tbody .rowhilite td {
+  background: #ddf;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #efe;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  background: #ffe;
+  padding: 1px 3px 1px 1px;
+  border: 1px solid #bbb;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  background: #ddc;
+  padding: 2px 2px 0px 2px;
+}
+
+.calendar tbody td.selected { /* Cell showing today date */
+  font-weight: bold;
+  border: 1px solid #000;
+  padding: 1px 3px 1px 1px;
+  background: #fea;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { font-weight: bold; }
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+  text-align: center;
+  background: #988;
+  color: #000;
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  border-top: 1px solid #655;
+  background: #dcb;
+  color: #840;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  background: #faa;
+  border: 1px solid #f40;
+  padding: 1px;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  background: #c77;
+  padding: 2px 0px 0px 2px;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  top: 0px;
+  left: 0px;
+  width: 4em;
+  cursor: default;
+  border: 1px solid #655;
+  background: #ffe;
+  color: #000;
+  font-size: 90%;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .hilite {
+  background: #fc8;
+}
+
+.calendar .combo .active {
+  border-top: 1px solid #a64;
+  border-bottom: 1px solid #a64;
+  background: #fee;
+  font-weight: bold;
+}
+
+.calendar td.time {
+  border-top: 1px solid #a88;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #fed;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #988;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #866;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-green.css b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-green.css
new file mode 100644
index 00000000..564666d4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-green.css
@@ -0,0 +1,229 @@
+/* The main calendar widget.  DIV containing a table. */
+
+div.calendar { position: relative; }
+
+.calendar, .calendar table {
+  border: 1px solid #565;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #efe;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;    /* They are the navigation buttons */
+  padding: 2px;          /* Make the buttons seem like they're pressing */
+  background: #676;
+  color: #fff;
+  font-size: 90%;
+}
+
+.calendar .nav {
+  background: #676 url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;      /* Pressing it will take you to the current date */
+  text-align: center;
+  padding: 2px;
+  background: #250;
+  color: #efa;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #565;
+  padding: 2px;
+  text-align: center;
+  color: #000;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #a66;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  background-color: #afa;
+  color: #000;
+  border: 1px solid #084;
+  padding: 1px;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  background-color: #7c7;
+  padding: 2px 0px 0px 2px;
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+  background: #dfb;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  color: #564;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #bbb;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #fbb;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #8a8;
+  background: #dfb;
+}
+
+.calendar tbody .rowhilite td {
+  background: #dfd;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #efe;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  background: #efd;
+  padding: 1px 3px 1px 1px;
+  border: 1px solid #bbb;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  background: #dec;
+  padding: 2px 2px 0px 2px;
+}
+
+.calendar tbody td.selected { /* Cell showing today date */
+  font-weight: bold;
+  border: 1px solid #000;
+  padding: 1px 3px 1px 1px;
+  background: #f8fff8;
+  color: #000;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #a66;
+}
+
+.calendar tbody td.today { font-weight: bold; color: #0a0; }
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+  text-align: center;
+  background: #565;
+  color: #fff;
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  padding: 2px;
+  background: #250;
+  color: #efa;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  background: #afa;
+  border: 1px solid #084;
+  color: #000;
+  padding: 1px;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  background: #7c7;
+  padding: 2px 0px 0px 2px;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  top: 0px;
+  left: 0px;
+  width: 4em;
+  cursor: default;
+  border: 1px solid #565;
+  background: #efd;
+  color: #000;
+  font-size: 90%;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .hilite {
+  background: #af8;
+}
+
+.calendar .combo .active {
+  border-top: 1px solid #6a4;
+  border-bottom: 1px solid #6a4;
+  background: #efe;
+  font-weight: bold;
+}
+
+.calendar td.time {
+  border-top: 1px solid #8a8;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #dfb;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #898;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #686;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-setup.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-setup.js
new file mode 100644
index 00000000..038bc3c5
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-setup.js
@@ -0,0 +1,200 @@
+/*  Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
+ * ---------------------------------------------------------------------------
+ *
+ * The DHTML Calendar
+ *
+ * Details and latest version at:
+ * http://dynarch.com/mishoo/calendar.epl
+ *
+ * This script is distributed under the GNU Lesser General Public License.
+ * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
+ *
+ * This file defines helper functions for setting up the calendar.  They are
+ * intended to help non-programmers get a working calendar on their site
+ * quickly.  This script should not be seen as part of the calendar.  It just
+ * shows you what one can do with the calendar, while in the same time
+ * providing a quick and simple method for setting it up.  If you need
+ * exhaustive customization of the calendar creation process feel free to
+ * modify this code to suit your needs (this is recommended and much better
+ * than modifying calendar.js itself).
+ */
+
+// $Id: calendar-setup.js,v 1.1 2006/11/01 01:14:06 bbaia Exp $
+
+/**
+ *  This function "patches" an input field (or other element) to use a calendar
+ *  widget for date selection.
+ *
+ *  The "params" is a single object that can have the following properties:
+ *
+ *    prop. name   | description
+ *  -------------------------------------------------------------------------------------------------
+ *   inputField    | the ID of an input field to store the date
+ *   displayArea   | the ID of a DIV or other element to show the date
+ *   button        | ID of a button or other element that will trigger the calendar
+ *   eventName     | event that will trigger the calendar, without the "on" prefix (default: "click")
+ *   ifFormat      | date format that will be stored in the input field
+ *   daFormat      | the date format that will be used to display the date in displayArea
+ *   singleClick   | (true/false) wether the calendar is in single click mode or not (default: true)
+ *   firstDay      | numeric: 0 to 6.  "0" means display Sunday first, "1" means display Monday first, etc.
+ *   align         | alignment (default: "Br"); if you don't know what's this see the calendar documentation
+ *   range         | array with 2 elements.  Default: [1900, 2999] -- the range of years available
+ *   weekNumbers   | (true/false) if it's true (default) the calendar will display week numbers
+ *   flat          | null or element ID; if not null the calendar will be a flat calendar having the parent with the given ID
+ *   flatCallback  | function that receives a JS Date object and returns an URL to point the browser to (for flat calendar)
+ *   disableFunc   | function that receives a JS Date object and should return true if that date has to be disabled in the calendar
+ *   onSelect      | function that gets called when a date is selected.  You don't _have_ to supply this (the default is generally okay)
+ *   onClose       | function that gets called when the calendar is closed.  [default]
+ *   onUpdate      | function that gets called after the date is updated in the input field.  Receives a reference to the calendar.
+ *   date          | the date that the calendar will be initially displayed to
+ *   showsTime     | default: false; if true the calendar will include a time selector
+ *   timeFormat    | the time format; can be "12" or "24", default is "12"
+ *   electric      | if true (default) then given fields/date areas are updated for each move; otherwise they're updated only on close
+ *   step          | configures the step of the years in drop-down boxes; default: 2
+ *   position      | configures the calendar absolute position; default: null
+ *   cache         | if "true" (but default: "false") it will reuse the same calendar object, where possible
+ *   showOthers    | if "true" (but default: "false") it will show days from other months too
+ *
+ *  None of them is required, they all have default values.  However, if you
+ *  pass none of "inputField", "displayArea" or "button" you'll get a warning
+ *  saying "nothing to setup".
+ */
+Calendar.setup = function (params) {
+	function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
+
+	param_default("inputField",     null);
+	param_default("displayArea",    null);
+	param_default("button",         null);
+	param_default("eventName",      "click");
+	param_default("ifFormat",       Calendar._TT["DEF_DATE_FORMAT"]);
+	param_default("daFormat",       Calendar._TT["DEF_DATE_FORMAT"]);
+	param_default("singleClick",    true);
+	param_default("disableFunc",    null);
+	param_default("dateStatusFunc", params["disableFunc"]);	// takes precedence if both are defined
+	param_default("dateText",       null);
+	param_default("firstDay",       null);
+	param_default("align",          "Bl");
+	param_default("range",          [1900, 2999]);
+	param_default("weekNumbers",    true);
+	param_default("flat",           null);
+	param_default("flatCallback",   null);
+	param_default("onSelect",       null);
+	param_default("onClose",        null);
+	param_default("onUpdate",       null);
+	param_default("date",           null);
+	param_default("showsTime",      false);
+	param_default("timeFormat",     "24");
+	param_default("electric",       true);
+	param_default("step",           1);
+	param_default("position",       null);
+	param_default("cache",          false);
+	param_default("showOthers",     false);
+	param_default("multiple",       null);
+
+	var tmp = ["inputField", "displayArea", "button"];
+	for (var i in tmp) {
+		if (typeof params[tmp[i]] == "string") {
+			params[tmp[i]] = document.getElementById(params[tmp[i]]);
+		}
+	}
+	if (!(params.flat || params.multiple || params.inputField || params.displayArea || params.button)) {
+		alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");
+		return false;
+	}
+
+	function onSelect(cal) {
+		var p = cal.params;
+		var update = (cal.dateClicked || p.electric);
+		if (update && p.inputField) {
+			p.inputField.value = cal.date.print(p.ifFormat);
+			if (typeof p.inputField.onchange == "function")
+				p.inputField.onchange();
+		}
+		if (update && p.displayArea)
+			p.displayArea.innerHTML = cal.date.print(p.daFormat);
+		if (update && typeof p.onUpdate == "function")
+			p.onUpdate(cal);
+		if (update && p.flat) {
+			if (typeof p.flatCallback == "function")
+				p.flatCallback(cal);
+		}
+		if (update && p.singleClick && cal.dateClicked)
+			cal.callCloseHandler();
+	};
+
+	if (params.flat != null) {
+		if (typeof params.flat == "string")
+			params.flat = document.getElementById(params.flat);
+		if (!params.flat) {
+			alert("Calendar.setup:\n  Flat specified but can't find parent.");
+			return false;
+		}
+		var cal = new Calendar(params.firstDay, params.date, params.onSelect || onSelect);
+		cal.showsOtherMonths = params.showOthers;
+		cal.showsTime = params.showsTime;
+		cal.time24 = (params.timeFormat == "24");
+		cal.params = params;
+		cal.weekNumbers = params.weekNumbers;
+		cal.setRange(params.range[0], params.range[1]);
+		cal.setDateStatusHandler(params.dateStatusFunc);
+		cal.getDateText = params.dateText;
+		if (params.ifFormat) {
+			cal.setDateFormat(params.ifFormat);
+		}
+		if (params.inputField && typeof params.inputField.value == "string") {
+			cal.parseDate(params.inputField.value);
+		}
+		cal.create(params.flat);
+		cal.show();
+		return false;
+	}
+
+	var triggerEl = params.button || params.displayArea || params.inputField;
+	triggerEl["on" + params.eventName] = function() {
+		var dateEl = params.inputField || params.displayArea;
+		var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
+		var mustCreate = false;
+		var cal = window.calendar;
+		if (dateEl)
+			params.date = Date.parseDate(dateEl.value || dateEl.innerHTML, dateFmt);
+		if (!(cal && params.cache)) {
+			window.calendar = cal = new Calendar(params.firstDay,
+							     params.date,
+							     params.onSelect || onSelect,
+							     params.onClose || function(cal) { cal.hide(); });
+			cal.showsTime = params.showsTime;
+			cal.time24 = (params.timeFormat == "24");
+			cal.weekNumbers = params.weekNumbers;
+			mustCreate = true;
+		} else {
+			if (params.date)
+				cal.setDate(params.date);
+			cal.hide();
+		}
+		if (params.multiple) {
+			cal.multiple = {};
+			for (var i = params.multiple.length; --i >= 0;) {
+				var d = params.multiple[i];
+				var ds = d.print("%Y%m%d");
+				cal.multiple[ds] = d;
+			}
+		}
+		cal.showsOtherMonths = params.showOthers;
+		cal.yearStep = params.step;
+		cal.setRange(params.range[0], params.range[1]);
+		cal.params = params;
+		cal.setDateStatusHandler(params.dateStatusFunc);
+		cal.getDateText = params.dateText;
+		cal.setDateFormat(dateFmt);
+		if (mustCreate)
+			cal.create();
+		cal.refresh();
+		if (!params.position)
+			cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
+		else
+			cal.showAt(params.position[0], params.position[1]);
+		return false;
+	};
+
+	return cal;
+};
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-system.css b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-system.css
new file mode 100644
index 00000000..f64493b4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-system.css
@@ -0,0 +1,251 @@
+/* The main calendar widget.  DIV containing a table. */
+
+.calendar {
+  position: relative;
+  display: none;
+  border: 1px solid;
+  border-color: #fff #000 #000 #fff;
+  font-size: 11px;
+  cursor: default;
+  background: Window;
+  color: WindowText;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+.calendar table {
+  border: 1px solid;
+  border-color: #fff #000 #000 #fff;
+  font-size: 11px;
+  cursor: default;
+  background: Window;
+  color: WindowText;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;
+  padding: 1px;
+  border: 1px solid;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+  background: ButtonFace;
+}
+
+.calendar .nav {
+  background: ButtonFace url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;
+  padding: 1px;
+  border: 1px solid #000;
+  background: ActiveCaption;
+  color: CaptionText;
+  text-align: center;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid ButtonShadow;
+  padding: 2px;
+  text-align: center;
+  background: ButtonFace;
+  color: ButtonText;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  border: 2px solid;
+  padding: 0px;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  border-width: 1px;
+  padding: 2px 0px 0px 2px;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid ButtonShadow;
+  background: ButtonFace;
+  color: ButtonText;
+}
+
+.calendar tbody .rowhilite td {
+  background: Highlight;
+  color: HighlightText;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  padding: 1px 3px 1px 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  padding: 2px 2px 0px 2px;
+  border: 1px solid;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+}
+
+.calendar tbody td.selected { /* Cell showing selected date */
+  font-weight: bold;
+  border: 1px solid;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+  padding: 2px 2px 0px 2px;
+  background: ButtonFace;
+  color: ButtonText;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { /* Cell showing today date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody td.disabled { color: GrayText; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: ButtonFace;
+  padding: 1px;
+  border: 1px solid;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+  color: ButtonText;
+  text-align: center;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  padding: 1px;
+  background: #e4e0d8;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  width: 4em;
+  top: 0px;
+  left: 0px;
+  cursor: default;
+  border: 1px solid;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+  background: Menu;
+  color: MenuText;
+  font-size: 90%;
+  padding: 1px;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .active {
+  padding: 0px;
+  border: 1px solid #000;
+}
+
+.calendar .combo .hilite {
+  background: Highlight;
+  color: HighlightText;
+}
+
+.calendar td.time {
+  border-top: 1px solid ButtonShadow;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: ButtonFace;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: Menu;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-tas.css b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-tas.css
new file mode 100644
index 00000000..a0c9c9d1
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-tas.css
@@ -0,0 +1,239 @@
+/* The main calendar widget.  DIV containing a table. */
+
+div.calendar { position: relative; }
+
+.calendar, .calendar table {
+  border: 1px solid #655;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #ffd;
+  font-family: tahoma,verdana,sans-serif;
+  filter:
+progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#DDDCCC,EndColorStr=#FFFFFF);
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;    /* They are the navigation buttons */
+  padding: 2px;          /* Make the buttons seem like they're pressing */
+  color:#363636;
+}
+
+.calendar .nav {
+  background: #edc url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;      /* Pressing it will take you to the current date */
+  text-align: center;
+  background: #654;
+  color: #363636;
+  padding: 2px;
+  filter:
+progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#ffffff,EndColorStr=#dddccc);
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+  /*background: #3B86A0;*/
+  color: #363636;
+  font-weight: bold; 	
+filter:
+progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#ffffff,EndColorStr=#3b86a0);
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #655;
+  padding: 2px;
+  text-align: center;
+  color: #363636;
+    filter:
+progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#DDDCCC,EndColorStr=#FFFFFF);
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  background-color: #ffcc86;
+  color: #000;
+  border: 1px solid #b59345;
+  padding: 1px;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  background-color: #c77;
+  padding: 2px 0px 0px 2px;
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+  background: #fed;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #fed;
+}
+
+.calendar tbody .rowhilite td {
+ background: #ddf;
+  
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #efe;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  background: #ffe;
+  padding: 1px 3px 1px 1px;
+  border: 1px solid #bbb;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  background: #ddc;
+  padding: 2px 2px 0px 2px;
+}
+
+.calendar tbody td.selected { /* Cell showing today date */
+  font-weight: bold;
+  border: 1px solid #000;
+  padding: 1px 3px 1px 1px;
+  background: #fea;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { font-weight: bold; }
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+  text-align: center;
+  background: #988;
+  color: #000;
+  
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  border-top: 1px solid #655;
+  background: #dcb;
+  color: #363636;
+  font-weight: bold;
+	filter:
+progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#FFFFFF,EndColorStr=#DDDCCC);
+}
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  background: #faa;
+  border: 1px solid #f40;
+  padding: 1px;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  background: #c77;
+  padding: 2px 0px 0px 2px;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.combo {
+  position: absolute;
+  display: none;
+  top: 0px;
+  left: 0px;
+  width: 4em;
+  cursor: default;
+  border: 1px solid #655;
+  background: #ffe;
+  color: #000;
+  font-size: smaller;
+  z-index: 100;
+}
+
+.combo .label,
+.combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.combo .label-IEfix {
+  width: 4em;
+}
+
+.combo .hilite {
+  background: #fc8;
+}
+
+.combo .active {
+  border-top: 1px solid #a64;
+  border-bottom: 1px solid #a64;
+  background: #fee;
+  font-weight: bold;
+}
+
+.calendar td.time {
+  border-top: 1px solid #a88;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #fed;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #988;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #866;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-win2k-1.css b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-win2k-1.css
new file mode 100644
index 00000000..56ffdf2e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-win2k-1.css
@@ -0,0 +1,271 @@
+/* The main calendar widget.  DIV containing a table. */
+
+.calendar {
+  position: relative;
+  display: none;
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #d4d0c8;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+.calendar table {
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #d4d0c8;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;
+  padding: 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar .nav {
+  background: transparent url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #848078;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #000;
+  padding: 2px;
+  text-align: center;
+  background: #f4f0e8;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  padding: 0px;
+  background-color: #e4e0d8;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  background-color: #c4c0b8;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #f4f0e8;
+}
+
+.calendar tbody .rowhilite td {
+  background: #e4e0d8;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #d4d0c8;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  padding: 1px 3px 1px 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  padding: 2px 2px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar tbody td.selected { /* Cell showing selected date */
+  font-weight: bold;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  padding: 2px 2px 0px 2px;
+  background: #e4e0d8;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { /* Cell showing today date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: #f4f0e8;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #848078;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  padding: 1px;
+  background: #e4e0d8;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  width: 4em;
+  top: 0px;
+  left: 0px;
+  cursor: default;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  background: #e4e0d8;
+  font-size: 90%;
+  padding: 1px;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .active {
+  background: #c4c0b8;
+  padding: 0px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar .combo .hilite {
+  background: #048;
+  color: #fea;
+}
+
+.calendar td.time {
+  border-top: 1px solid #000;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #f4f0e8;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #766;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-win2k-2.css b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-win2k-2.css
new file mode 100644
index 00000000..ccb85a01
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-win2k-2.css
@@ -0,0 +1,271 @@
+/* The main calendar widget.  DIV containing a table. */
+
+.calendar {
+  position: relative;
+  display: none;
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #d4c8d0;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+.calendar table {
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #d4c8d0;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;
+  padding: 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar .nav {
+  background: transparent url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #847880;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #000;
+  padding: 2px;
+  text-align: center;
+  background: #f4e8f0;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  padding: 0px;
+  background-color: #e4d8e0;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  background-color: #c4b8c0;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #f4e8f0;
+}
+
+.calendar tbody .rowhilite td {
+  background: #e4d8e0;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #d4c8d0;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  padding: 1px 3px 1px 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  padding: 2px 2px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar tbody td.selected { /* Cell showing selected date */
+  font-weight: bold;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  padding: 2px 2px 0px 2px;
+  background: #e4d8e0;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { /* Cell showing today date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: #f4e8f0;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #847880;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  padding: 1px;
+  background: #e4d8e0;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  width: 4em;
+  top: 0px;
+  left: 0px;
+  cursor: default;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  background: #e4d8e0;
+  font-size: 90%;
+  padding: 1px;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .active {
+  background: #d4c8d0;
+  padding: 0px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar .combo .hilite {
+  background: #408;
+  color: #fea;
+}
+
+.calendar td.time {
+  border-top: 1px solid #000;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #f4f0e8;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #766;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-win2k-cold-1.css b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-win2k-cold-1.css
new file mode 100644
index 00000000..09a1a806
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-win2k-cold-1.css
@@ -0,0 +1,265 @@
+/* The main calendar widget.  DIV containing a table. */
+
+.calendar {
+  position: relative;
+  display: none;
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #c8d0d4;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+.calendar table {
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #c8d0d4;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;
+  padding: 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar .nav {
+  background: transparent url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #788084;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #000;
+  padding: 2px;
+  text-align: center;
+  background: #e8f0f4;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  padding: 0px;
+  background-color: #d8e0e4;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  background-color: #b8c0c4;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #e8f4f0;
+}
+
+.calendar tbody .rowhilite td {
+  background: #d8e4e0;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #c8d4d0;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  padding: 1px 3px 1px 1px;
+  border: 1px solid;
+  border-color: #fff #000 #000 #fff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  padding: 2px 2px 0px 2px;
+  border: 1px solid;
+  border-color: #000 #fff #fff #000;
+}
+
+.calendar tbody td.selected { /* Cell showing selected date */
+  font-weight: bold;
+  padding: 2px 2px 0px 2px;
+  border: 1px solid;
+  border-color: #000 #fff #fff #000;
+  background: #d8e0e4;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { /* Cell showing today date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: #e8f0f4;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #788084;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  padding: 1px;
+  background: #d8e0e4;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  width: 4em;
+  top: 0px;
+  left: 0px;
+  cursor: default;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  background: #d8e0e4;
+  font-size: 90%;
+  padding: 1px;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .active {
+  background: #c8d0d4;
+  padding: 0px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar .combo .hilite {
+  background: #048;
+  color: #aef;
+}
+
+.calendar td.time {
+  border-top: 1px solid #000;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #e8f0f4;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #667;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-win2k-cold-2.css b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-win2k-cold-2.css
new file mode 100644
index 00000000..0ae6b08e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar-win2k-cold-2.css
@@ -0,0 +1,271 @@
+/* The main calendar widget.  DIV containing a table. */
+
+.calendar {
+  position: relative;
+  display: none;
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #c8d4d0;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+.calendar table {
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #c8d4d0;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;
+  padding: 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar .nav {
+  background: transparent url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #788480;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #000;
+  padding: 2px;
+  text-align: center;
+  background: #e8f4f0;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  padding: 0px;
+  background-color: #d8e4e0;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  background-color: #b8c4c0;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #e8f4f0;
+}
+
+.calendar tbody .rowhilite td {
+  background: #d8e4e0;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #c8d4d0;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  padding: 1px 3px 1px 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  padding: 2px 2px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar tbody td.selected { /* Cell showing selected date */
+  font-weight: bold;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  padding: 2px 2px 0px 2px;
+  background: #d8e4e0;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { /* Cell showing today date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: #e8f4f0;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #788480;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  padding: 1px;
+  background: #d8e4e0;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  width: 4em;
+  top: 0px;
+  left: 0px;
+  cursor: default;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  background: #d8e4e0;
+  font-size: 90%;
+  padding: 1px;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .active {
+  background: #c8d4d0;
+  padding: 0px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar .combo .hilite {
+  background: #048;
+  color: #aef;
+}
+
+.calendar td.time {
+  border-top: 1px solid #000;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #e8f0f4;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #667;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar.js
new file mode 100644
index 00000000..1967a310
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/calendar.js
@@ -0,0 +1,1806 @@
+/*  Copyright Mihai Bazon, 2002-2005  |  www.bazon.net/mishoo
+ * -----------------------------------------------------------
+ *
+ * The DHTML Calendar, version 1.0 "It is happening again"
+ *
+ * Details and latest version at:
+ * www.dynarch.com/projects/calendar
+ *
+ * This script is developed by Dynarch.com.  Visit us at www.dynarch.com.
+ *
+ * This script is distributed under the GNU Lesser General Public License.
+ * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
+ */
+
+// $Id: calendar.js,v 1.1 2006/11/01 01:14:06 bbaia Exp $
+
+/** The Calendar object constructor. */
+Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
+	// member variables
+	this.activeDiv = null;
+	this.currentDateEl = null;
+	this.getDateStatus = null;
+	this.getDateToolTip = null;
+	this.getDateText = null;
+	this.timeout = null;
+	this.onSelected = onSelected || null;
+	this.onClose = onClose || null;
+	this.dragging = false;
+	this.hidden = false;
+	this.minYear = 1970;
+	this.maxYear = 2050;
+	this.dateFormat = Calendar._TT["DEF_DATE_FORMAT"];
+	this.ttDateFormat = Calendar._TT["TT_DATE_FORMAT"];
+	this.isPopup = true;
+	this.weekNumbers = true;
+	this.firstDayOfWeek = typeof firstDayOfWeek == "number" ? firstDayOfWeek : Calendar._FD; // 0 for Sunday, 1 for Monday, etc.
+	this.showsOtherMonths = false;
+	this.dateStr = dateStr;
+	this.ar_days = null;
+	this.showsTime = false;
+	this.time24 = true;
+	this.yearStep = 2;
+	this.hiliteToday = true;
+	this.multiple = null;
+	// HTML elements
+	this.table = null;
+	this.element = null;
+	this.tbody = null;
+	this.firstdayname = null;
+	// Combo boxes
+	this.monthsCombo = null;
+	this.yearsCombo = null;
+	this.hilitedMonth = null;
+	this.activeMonth = null;
+	this.hilitedYear = null;
+	this.activeYear = null;
+	// Information
+	this.dateClicked = false;
+
+	// one-time initializations
+	if (typeof Calendar._SDN == "undefined") {
+		// table of short day names
+		if (typeof Calendar._SDN_len == "undefined")
+			Calendar._SDN_len = 3;
+		var ar = new Array();
+		for (var i = 8; i > 0;) {
+			ar[--i] = Calendar._DN[i].substr(0, Calendar._SDN_len);
+		}
+		Calendar._SDN = ar;
+		// table of short month names
+		if (typeof Calendar._SMN_len == "undefined")
+			Calendar._SMN_len = 3;
+		ar = new Array();
+		for (var i = 12; i > 0;) {
+			ar[--i] = Calendar._MN[i].substr(0, Calendar._SMN_len);
+		}
+		Calendar._SMN = ar;
+	}
+};
+
+// ** constants
+
+/// "static", needed for event handlers.
+Calendar._C = null;
+
+/// detect a special case of "web browser"
+Calendar.is_ie = ( /msie/i.test(navigator.userAgent) &&
+		   !/opera/i.test(navigator.userAgent) );
+
+Calendar.is_ie5 = ( Calendar.is_ie && /msie 5\.0/i.test(navigator.userAgent) );
+
+/// detect Opera browser
+Calendar.is_opera = /opera/i.test(navigator.userAgent);
+
+/// detect KHTML-based browsers
+Calendar.is_khtml = /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
+
+// BEGIN: UTILITY FUNCTIONS; beware that these might be moved into a separate
+//        library, at some point.
+
+Calendar.getAbsolutePos = function(el) {
+	var SL = 0, ST = 0;
+	var is_div = /^div$/i.test(el.tagName);
+	if (is_div && el.scrollLeft)
+		SL = el.scrollLeft;
+	if (is_div && el.scrollTop)
+		ST = el.scrollTop;
+	var r = { x: el.offsetLeft - SL, y: el.offsetTop - ST };
+	if (el.offsetParent) {
+		var tmp = this.getAbsolutePos(el.offsetParent);
+		r.x += tmp.x;
+		r.y += tmp.y;
+	}
+	return r;
+};
+
+Calendar.isRelated = function (el, evt) {
+	var related = evt.relatedTarget;
+	if (!related) {
+		var type = evt.type;
+		if (type == "mouseover") {
+			related = evt.fromElement;
+		} else if (type == "mouseout") {
+			related = evt.toElement;
+		}
+	}
+	while (related) {
+		if (related == el) {
+			return true;
+		}
+		related = related.parentNode;
+	}
+	return false;
+};
+
+Calendar.removeClass = function(el, className) {
+	if (!(el && el.className)) {
+		return;
+	}
+	var cls = el.className.split(" ");
+	var ar = new Array();
+	for (var i = cls.length; i > 0;) {
+		if (cls[--i] != className) {
+			ar[ar.length] = cls[i];
+		}
+	}
+	el.className = ar.join(" ");
+};
+
+Calendar.addClass = function(el, className) {
+	Calendar.removeClass(el, className);
+	el.className += " " + className;
+};
+
+// FIXME: the following 2 functions totally suck, are useless and should be replaced immediately.
+Calendar.getElement = function(ev) {
+	var f = Calendar.is_ie ? window.event.srcElement : ev.currentTarget;
+	while (f.nodeType != 1 || /^div$/i.test(f.tagName))
+		f = f.parentNode;
+	return f;
+};
+
+Calendar.getTargetElement = function(ev) {
+	var f = Calendar.is_ie ? window.event.srcElement : ev.target;
+	while (f.nodeType != 1)
+		f = f.parentNode;
+	return f;
+};
+
+Calendar.stopEvent = function(ev) {
+	ev || (ev = window.event);
+	if (Calendar.is_ie) {
+		ev.cancelBubble = true;
+		ev.returnValue = false;
+	} else {
+		ev.preventDefault();
+		ev.stopPropagation();
+	}
+	return false;
+};
+
+Calendar.addEvent = function(el, evname, func) {
+	if (el.attachEvent) { // IE
+		el.attachEvent("on" + evname, func);
+	} else if (el.addEventListener) { // Gecko / W3C
+		el.addEventListener(evname, func, true);
+	} else {
+		el["on" + evname] = func;
+	}
+};
+
+Calendar.removeEvent = function(el, evname, func) {
+	if (el.detachEvent) { // IE
+		el.detachEvent("on" + evname, func);
+	} else if (el.removeEventListener) { // Gecko / W3C
+		el.removeEventListener(evname, func, true);
+	} else {
+		el["on" + evname] = null;
+	}
+};
+
+Calendar.createElement = function(type, parent) {
+	var el = null;
+	if (document.createElementNS) {
+		// use the XHTML namespace; IE won't normally get here unless
+		// _they_ "fix" the DOM2 implementation.
+		el = document.createElementNS("http://www.w3.org/1999/xhtml", type);
+	} else {
+		el = document.createElement(type);
+	}
+	if (typeof parent != "undefined") {
+		parent.appendChild(el);
+	}
+	return el;
+};
+
+// END: UTILITY FUNCTIONS
+
+// BEGIN: CALENDAR STATIC FUNCTIONS
+
+/** Internal -- adds a set of events to make some element behave like a button. */
+Calendar._add_evs = function(el) {
+	with (Calendar) {
+		addEvent(el, "mouseover", dayMouseOver);
+		addEvent(el, "mousedown", dayMouseDown);
+		addEvent(el, "mouseout", dayMouseOut);
+		if (is_ie) {
+			addEvent(el, "dblclick", dayMouseDblClick);
+			el.setAttribute("unselectable", true);
+		}
+	}
+};
+
+Calendar.findMonth = function(el) {
+	if (typeof el.month != "undefined") {
+		return el;
+	} else if (typeof el.parentNode.month != "undefined") {
+		return el.parentNode;
+	}
+	return null;
+};
+
+Calendar.findYear = function(el) {
+	if (typeof el.year != "undefined") {
+		return el;
+	} else if (typeof el.parentNode.year != "undefined") {
+		return el.parentNode;
+	}
+	return null;
+};
+
+Calendar.showMonthsCombo = function () {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	var cal = cal;
+	var cd = cal.activeDiv;
+	var mc = cal.monthsCombo;
+	if (cal.hilitedMonth) {
+		Calendar.removeClass(cal.hilitedMonth, "hilite");
+	}
+	if (cal.activeMonth) {
+		Calendar.removeClass(cal.activeMonth, "active");
+	}
+	var mon = cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];
+	Calendar.addClass(mon, "active");
+	cal.activeMonth = mon;
+	var s = mc.style;
+	s.display = "block";
+	if (cd.navtype < 0)
+		s.left = cd.offsetLeft + "px";
+	else {
+		var mcw = mc.offsetWidth;
+		if (typeof mcw == "undefined")
+			// Konqueror brain-dead techniques
+			mcw = 50;
+		s.left = (cd.offsetLeft + cd.offsetWidth - mcw) + "px";
+	}
+	s.top = (cd.offsetTop + cd.offsetHeight) + "px";
+};
+
+Calendar.showYearsCombo = function (fwd) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	var cal = cal;
+	var cd = cal.activeDiv;
+	var yc = cal.yearsCombo;
+	if (cal.hilitedYear) {
+		Calendar.removeClass(cal.hilitedYear, "hilite");
+	}
+	if (cal.activeYear) {
+		Calendar.removeClass(cal.activeYear, "active");
+	}
+	cal.activeYear = null;
+	var Y = cal.date.getFullYear() + (fwd ? 1 : -1);
+	var yr = yc.firstChild;
+	var show = false;
+	for (var i = 12; i > 0; --i) {
+		if (Y >= cal.minYear && Y <= cal.maxYear) {
+			yr.innerHTML = Y;
+			yr.year = Y;
+			yr.style.display = "block";
+			show = true;
+		} else {
+			yr.style.display = "none";
+		}
+		yr = yr.nextSibling;
+		Y += fwd ? cal.yearStep : -cal.yearStep;
+	}
+	if (show) {
+		var s = yc.style;
+		s.display = "block";
+		if (cd.navtype < 0)
+			s.left = cd.offsetLeft + "px";
+		else {
+			var ycw = yc.offsetWidth;
+			if (typeof ycw == "undefined")
+				// Konqueror brain-dead techniques
+				ycw = 50;
+			s.left = (cd.offsetLeft + cd.offsetWidth - ycw) + "px";
+		}
+		s.top = (cd.offsetTop + cd.offsetHeight) + "px";
+	}
+};
+
+// event handlers
+
+Calendar.tableMouseUp = function(ev) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	if (cal.timeout) {
+		clearTimeout(cal.timeout);
+	}
+	var el = cal.activeDiv;
+	if (!el) {
+		return false;
+	}
+	var target = Calendar.getTargetElement(ev);
+	ev || (ev = window.event);
+	Calendar.removeClass(el, "active");
+	if (target == el || target.parentNode == el) {
+		Calendar.cellClick(el, ev);
+	}
+	var mon = Calendar.findMonth(target);
+	var date = null;
+	if (mon) {
+		date = new Date(cal.date);
+		if (mon.month != date.getMonth()) {
+			date.setMonth(mon.month);
+			cal.setDate(date);
+			cal.dateClicked = false;
+			cal.callHandler();
+		}
+	} else {
+		var year = Calendar.findYear(target);
+		if (year) {
+			date = new Date(cal.date);
+			if (year.year != date.getFullYear()) {
+				date.setFullYear(year.year);
+				cal.setDate(date);
+				cal.dateClicked = false;
+				cal.callHandler();
+			}
+		}
+	}
+	with (Calendar) {
+		removeEvent(document, "mouseup", tableMouseUp);
+		removeEvent(document, "mouseover", tableMouseOver);
+		removeEvent(document, "mousemove", tableMouseOver);
+		cal._hideCombos();
+		_C = null;
+		return stopEvent(ev);
+	}
+};
+
+Calendar.tableMouseOver = function (ev) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return;
+	}
+	var el = cal.activeDiv;
+	var target = Calendar.getTargetElement(ev);
+	if (target == el || target.parentNode == el) {
+		Calendar.addClass(el, "hilite active");
+		Calendar.addClass(el.parentNode, "rowhilite");
+	} else {
+		if (typeof el.navtype == "undefined" || (el.navtype != 50 && (el.navtype == 0 || Math.abs(el.navtype) > 2)))
+			Calendar.removeClass(el, "active");
+		Calendar.removeClass(el, "hilite");
+		Calendar.removeClass(el.parentNode, "rowhilite");
+	}
+	ev || (ev = window.event);
+	if (el.navtype == 50 && target != el) {
+		var pos = Calendar.getAbsolutePos(el);
+		var w = el.offsetWidth;
+		var x = ev.clientX;
+		var dx;
+		var decrease = true;
+		if (x > pos.x + w) {
+			dx = x - pos.x - w;
+			decrease = false;
+		} else
+			dx = pos.x - x;
+
+		if (dx < 0) dx = 0;
+		var range = el._range;
+		var current = el._current;
+		var count = Math.floor(dx / 10) % range.length;
+		for (var i = range.length; --i >= 0;)
+			if (range[i] == current)
+				break;
+		while (count-- > 0)
+			if (decrease) {
+				if (--i < 0)
+					i = range.length - 1;
+			} else if ( ++i >= range.length )
+				i = 0;
+		var newval = range[i];
+		el.innerHTML = newval;
+
+		cal.onUpdateTime();
+	}
+	var mon = Calendar.findMonth(target);
+	if (mon) {
+		if (mon.month != cal.date.getMonth()) {
+			if (cal.hilitedMonth) {
+				Calendar.removeClass(cal.hilitedMonth, "hilite");
+			}
+			Calendar.addClass(mon, "hilite");
+			cal.hilitedMonth = mon;
+		} else if (cal.hilitedMonth) {
+			Calendar.removeClass(cal.hilitedMonth, "hilite");
+		}
+	} else {
+		if (cal.hilitedMonth) {
+			Calendar.removeClass(cal.hilitedMonth, "hilite");
+		}
+		var year = Calendar.findYear(target);
+		if (year) {
+			if (year.year != cal.date.getFullYear()) {
+				if (cal.hilitedYear) {
+					Calendar.removeClass(cal.hilitedYear, "hilite");
+				}
+				Calendar.addClass(year, "hilite");
+				cal.hilitedYear = year;
+			} else if (cal.hilitedYear) {
+				Calendar.removeClass(cal.hilitedYear, "hilite");
+			}
+		} else if (cal.hilitedYear) {
+			Calendar.removeClass(cal.hilitedYear, "hilite");
+		}
+	}
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.tableMouseDown = function (ev) {
+	if (Calendar.getTargetElement(ev) == Calendar.getElement(ev)) {
+		return Calendar.stopEvent(ev);
+	}
+};
+
+Calendar.calDragIt = function (ev) {
+	var cal = Calendar._C;
+	if (!(cal && cal.dragging)) {
+		return false;
+	}
+	var posX;
+	var posY;
+	if (Calendar.is_ie) {
+		posY = window.event.clientY + document.body.scrollTop;
+		posX = window.event.clientX + document.body.scrollLeft;
+	} else {
+		posX = ev.pageX;
+		posY = ev.pageY;
+	}
+	cal.hideShowCovered();
+	var st = cal.element.style;
+	st.left = (posX - cal.xOffs) + "px";
+	st.top = (posY - cal.yOffs) + "px";
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.calDragEnd = function (ev) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	cal.dragging = false;
+	with (Calendar) {
+		removeEvent(document, "mousemove", calDragIt);
+		removeEvent(document, "mouseup", calDragEnd);
+		tableMouseUp(ev);
+	}
+	cal.hideShowCovered();
+};
+
+Calendar.dayMouseDown = function(ev) {
+	var el = Calendar.getElement(ev);
+	if (el.disabled) {
+		return false;
+	}
+	var cal = el.calendar;
+	cal.activeDiv = el;
+	Calendar._C = cal;
+	if (el.navtype != 300) with (Calendar) {
+		if (el.navtype == 50) {
+			el._current = el.innerHTML;
+			addEvent(document, "mousemove", tableMouseOver);
+		} else
+			addEvent(document, Calendar.is_ie5 ? "mousemove" : "mouseover", tableMouseOver);
+		addClass(el, "hilite active");
+		addEvent(document, "mouseup", tableMouseUp);
+	} else if (cal.isPopup) {
+		cal._dragStart(ev);
+	}
+	if (el.navtype == -1 || el.navtype == 1) {
+		if (cal.timeout) clearTimeout(cal.timeout);
+		cal.timeout = setTimeout("Calendar.showMonthsCombo()", 250);
+	} else if (el.navtype == -2 || el.navtype == 2) {
+		if (cal.timeout) clearTimeout(cal.timeout);
+		cal.timeout = setTimeout((el.navtype > 0) ? "Calendar.showYearsCombo(true)" : "Calendar.showYearsCombo(false)", 250);
+	} else {
+		cal.timeout = null;
+	}
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.dayMouseDblClick = function(ev) {
+	Calendar.cellClick(Calendar.getElement(ev), ev || window.event);
+	if (Calendar.is_ie) {
+		document.selection.empty();
+	}
+};
+
+Calendar.dayMouseOver = function(ev) {
+	var el = Calendar.getElement(ev);
+	if (Calendar.isRelated(el, ev) || Calendar._C || el.disabled) {
+		return false;
+	}
+	if (el.ttip) {
+		if (el.ttip.substr(0, 1) == "_") {
+			el.ttip = el.caldate.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
+		}
+		el.calendar.tooltips.innerHTML = el.ttip;
+	}
+	if (el.navtype != 300) {
+		Calendar.addClass(el, "hilite");
+		if (el.caldate) {
+			Calendar.addClass(el.parentNode, "rowhilite");
+		}
+	}
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.dayMouseOut = function(ev) {
+	with (Calendar) {
+		var el = getElement(ev);
+		if (isRelated(el, ev) || _C || el.disabled)
+			return false;
+		removeClass(el, "hilite");
+		if (el.caldate)
+			removeClass(el.parentNode, "rowhilite");
+		if (el.calendar)
+			el.calendar.tooltips.innerHTML = _TT["SEL_DATE"];
+		return stopEvent(ev);
+	}
+};
+
+/**
+ *  A generic "click" handler :) handles all types of buttons defined in this
+ *  calendar.
+ */
+Calendar.cellClick = function(el, ev) {
+	var cal = el.calendar;
+	var closing = false;
+	var newdate = false;
+	var date = null;
+	if (typeof el.navtype == "undefined") {
+		if (cal.currentDateEl) {
+			Calendar.removeClass(cal.currentDateEl, "selected");
+			Calendar.addClass(el, "selected");
+			closing = (cal.currentDateEl == el);
+			if (!closing) {
+				cal.currentDateEl = el;
+			}
+		}
+		cal.date.setDateOnly(el.caldate);
+		date = cal.date;
+		var other_month = !(cal.dateClicked = !el.otherMonth);
+		if (!other_month && !cal.currentDateEl)
+			cal._toggleMultipleDate(new Date(date));
+		else
+			newdate = !el.disabled;
+		// a date was clicked
+		if (other_month)
+			cal._init(cal.firstDayOfWeek, date);
+	} else {
+		if (el.navtype == 200) {
+			Calendar.removeClass(el, "hilite");
+			cal.callCloseHandler();
+			return;
+		}
+		date = new Date(cal.date);
+		if (el.navtype == 0)
+			date.setDateOnly(new Date()); // TODAY
+		// unless "today" was clicked, we assume no date was clicked so
+		// the selected handler will know not to close the calenar when
+		// in single-click mode.
+		// cal.dateClicked = (el.navtype == 0);
+		cal.dateClicked = false;
+		var year = date.getFullYear();
+		var mon = date.getMonth();
+		function setMonth(m) {
+			var day = date.getDate();
+			var max = date.getMonthDays(m);
+			if (day > max) {
+				date.setDate(max);
+			}
+			date.setMonth(m);
+		};
+		switch (el.navtype) {
+		    case 400:
+			Calendar.removeClass(el, "hilite");
+			var text = Calendar._TT["ABOUT"];
+			if (typeof text != "undefined") {
+				text += cal.showsTime ? Calendar._TT["ABOUT_TIME"] : "";
+			} else {
+				// FIXME: this should be removed as soon as lang files get updated!
+				text = "Help and about box text is not translated into this language.\n" +
+					"If you know this language and you feel generous please update\n" +
+					"the corresponding file in \"lang\" subdir to match calendar-en.js\n" +
+					"and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n" +
+					"Thank you!\n" +
+					"http://dynarch.com/mishoo/calendar.epl\n";
+			}
+			alert(text);
+			return;
+		    case -2:
+			if (year > cal.minYear) {
+				date.setFullYear(year - 1);
+			}
+			break;
+		    case -1:
+			if (mon > 0) {
+				setMonth(mon - 1);
+			} else if (year-- > cal.minYear) {
+				date.setFullYear(year);
+				setMonth(11);
+			}
+			break;
+		    case 1:
+			if (mon < 11) {
+				setMonth(mon + 1);
+			} else if (year < cal.maxYear) {
+				date.setFullYear(year + 1);
+				setMonth(0);
+			}
+			break;
+		    case 2:
+			if (year < cal.maxYear) {
+				date.setFullYear(year + 1);
+			}
+			break;
+		    case 100:
+			cal.setFirstDayOfWeek(el.fdow);
+			return;
+		    case 50:
+			var range = el._range;
+			var current = el.innerHTML;
+			for (var i = range.length; --i >= 0;)
+				if (range[i] == current)
+					break;
+			if (ev && ev.shiftKey) {
+				if (--i < 0)
+					i = range.length - 1;
+			} else if ( ++i >= range.length )
+				i = 0;
+			var newval = range[i];
+			el.innerHTML = newval;
+			cal.onUpdateTime();
+			return;
+		    case 0:
+			// TODAY will bring us here
+			if ((typeof cal.getDateStatus == "function") &&
+			    cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
+				return false;
+			}
+			break;
+		}
+		if (!date.equalsTo(cal.date)) {
+			cal.setDate(date);
+			newdate = true;
+		} else if (el.navtype == 0)
+			newdate = closing = true;
+	}
+	if (newdate) {
+		ev && cal.callHandler();
+	}
+	if (closing) {
+		Calendar.removeClass(el, "hilite");
+		ev && cal.callCloseHandler();
+	}
+};
+
+// END: CALENDAR STATIC FUNCTIONS
+
+// BEGIN: CALENDAR OBJECT FUNCTIONS
+
+/**
+ *  This function creates the calendar inside the given parent.  If _par is
+ *  null than it creates a popup calendar inside the BODY element.  If _par is
+ *  an element, be it BODY, then it creates a non-popup calendar (still
+ *  hidden).  Some properties need to be set before calling this function.
+ */
+Calendar.prototype.create = function (_par) {
+	var parent = null;
+	if (! _par) {
+		// default parent is the document body, in which case we create
+		// a popup calendar.
+		parent = document.getElementsByTagName("body")[0];
+		this.isPopup = true;
+	} else {
+		parent = _par;
+		this.isPopup = false;
+	}
+	this.date = this.dateStr ? new Date(this.dateStr) : new Date();
+
+	var table = Calendar.createElement("table");
+	this.table = table;
+	table.cellSpacing = 0;
+	table.cellPadding = 0;
+	table.calendar = this;
+	Calendar.addEvent(table, "mousedown", Calendar.tableMouseDown);
+
+	var div = Calendar.createElement("div");
+	this.element = div;
+	div.className = "calendar";
+	if (this.isPopup) {
+		div.style.position = "absolute";
+		div.style.display = "none";
+	}
+	div.appendChild(table);
+
+	var thead = Calendar.createElement("thead", table);
+	var cell = null;
+	var row = null;
+
+	var cal = this;
+	var hh = function (text, cs, navtype) {
+		cell = Calendar.createElement("td", row);
+		cell.colSpan = cs;
+		cell.className = "button";
+		if (navtype != 0 && Math.abs(navtype) <= 2)
+			cell.className += " nav";
+		Calendar._add_evs(cell);
+		cell.calendar = cal;
+		cell.navtype = navtype;
+		cell.innerHTML = "<div unselectable='on'>" + text + "</div>";
+		return cell;
+	};
+
+	row = Calendar.createElement("tr", thead);
+	var title_length = 6;
+	(this.isPopup) && --title_length;
+	(this.weekNumbers) && ++title_length;
+
+	hh("?", 1, 400).ttip = Calendar._TT["INFO"];
+	this.title = hh("", title_length, 300);
+	this.title.className = "title";
+	if (this.isPopup) {
+		this.title.ttip = Calendar._TT["DRAG_TO_MOVE"];
+		this.title.style.cursor = "move";
+		hh("&#x00d7;", 1, 200).ttip = Calendar._TT["CLOSE"];
+	}
+
+	row = Calendar.createElement("tr", thead);
+	row.className = "headrow";
+
+	this._nav_py = hh("&#x00ab;", 1, -2);
+	this._nav_py.ttip = Calendar._TT["PREV_YEAR"];
+
+	this._nav_pm = hh("&#x2039;", 1, -1);
+	this._nav_pm.ttip = Calendar._TT["PREV_MONTH"];
+
+	this._nav_now = hh(Calendar._TT["TODAY"], this.weekNumbers ? 4 : 3, 0);
+	this._nav_now.ttip = Calendar._TT["GO_TODAY"];
+
+	this._nav_nm = hh("&#x203a;", 1, 1);
+	this._nav_nm.ttip = Calendar._TT["NEXT_MONTH"];
+
+	this._nav_ny = hh("&#x00bb;", 1, 2);
+	this._nav_ny.ttip = Calendar._TT["NEXT_YEAR"];
+
+	// day names
+	row = Calendar.createElement("tr", thead);
+	row.className = "daynames";
+	if (this.weekNumbers) {
+		cell = Calendar.createElement("td", row);
+		cell.className = "name wn";
+		cell.innerHTML = Calendar._TT["WK"];
+	}
+	for (var i = 7; i > 0; --i) {
+		cell = Calendar.createElement("td", row);
+		if (!i) {
+			cell.navtype = 100;
+			cell.calendar = this;
+			Calendar._add_evs(cell);
+		}
+	}
+	this.firstdayname = (this.weekNumbers) ? row.firstChild.nextSibling : row.firstChild;
+	this._displayWeekdays();
+
+	var tbody = Calendar.createElement("tbody", table);
+	this.tbody = tbody;
+
+	for (i = 6; i > 0; --i) {
+		row = Calendar.createElement("tr", tbody);
+		if (this.weekNumbers) {
+			cell = Calendar.createElement("td", row);
+		}
+		for (var j = 7; j > 0; --j) {
+			cell = Calendar.createElement("td", row);
+			cell.calendar = this;
+			Calendar._add_evs(cell);
+		}
+	}
+
+	if (this.showsTime) {
+		row = Calendar.createElement("tr", tbody);
+		row.className = "time";
+
+		cell = Calendar.createElement("td", row);
+		cell.className = "time";
+		cell.colSpan = 2;
+		cell.innerHTML = Calendar._TT["TIME"] || "&nbsp;";
+
+		cell = Calendar.createElement("td", row);
+		cell.className = "time";
+		cell.colSpan = this.weekNumbers ? 4 : 3;
+
+		(function(){
+			function makeTimePart(className, init, range_start, range_end) {
+				var part = Calendar.createElement("span", cell);
+				part.className = className;
+				part.innerHTML = init;
+				part.calendar = cal;
+				part.ttip = Calendar._TT["TIME_PART"];
+				part.navtype = 50;
+				part._range = [];
+				if (typeof range_start != "number")
+					part._range = range_start;
+				else {
+					for (var i = range_start; i <= range_end; ++i) {
+						var txt;
+						if (i < 10 && range_end >= 10) txt = '0' + i;
+						else txt = '' + i;
+						part._range[part._range.length] = txt;
+					}
+				}
+				Calendar._add_evs(part);
+				return part;
+			};
+			var hrs = cal.date.getHours();
+			var mins = cal.date.getMinutes();
+			var t12 = !cal.time24;
+			var pm = (hrs > 12);
+			if (t12 && pm) hrs -= 12;
+			var H = makeTimePart("hour", hrs, t12 ? 1 : 0, t12 ? 12 : 23);
+			var span = Calendar.createElement("span", cell);
+			span.innerHTML = ":";
+			span.className = "colon";
+			var M = makeTimePart("minute", mins, 0, 59);
+			var AP = null;
+			cell = Calendar.createElement("td", row);
+			cell.className = "time";
+			cell.colSpan = 2;
+			if (t12)
+				AP = makeTimePart("ampm", pm ? "pm" : "am", ["am", "pm"]);
+			else
+				cell.innerHTML = "&nbsp;";
+
+			cal.onSetTime = function() {
+				var pm, hrs = this.date.getHours(),
+					mins = this.date.getMinutes();
+				if (t12) {
+					pm = (hrs >= 12);
+					if (pm) hrs -= 12;
+					if (hrs == 0) hrs = 12;
+					AP.innerHTML = pm ? "pm" : "am";
+				}
+				H.innerHTML = (hrs < 10) ? ("0" + hrs) : hrs;
+				M.innerHTML = (mins < 10) ? ("0" + mins) : mins;
+			};
+
+			cal.onUpdateTime = function() {
+				var date = this.date;
+				var h = parseInt(H.innerHTML, 10);
+				if (t12) {
+					if (/pm/i.test(AP.innerHTML) && h < 12)
+						h += 12;
+					else if (/am/i.test(AP.innerHTML) && h == 12)
+						h = 0;
+				}
+				var d = date.getDate();
+				var m = date.getMonth();
+				var y = date.getFullYear();
+				date.setHours(h);
+				date.setMinutes(parseInt(M.innerHTML, 10));
+				date.setFullYear(y);
+				date.setMonth(m);
+				date.setDate(d);
+				this.dateClicked = false;
+				this.callHandler();
+			};
+		})();
+	} else {
+		this.onSetTime = this.onUpdateTime = function() {};
+	}
+
+	var tfoot = Calendar.createElement("tfoot", table);
+
+	row = Calendar.createElement("tr", tfoot);
+	row.className = "footrow";
+
+	cell = hh(Calendar._TT["SEL_DATE"], this.weekNumbers ? 8 : 7, 300);
+	cell.className = "ttip";
+	if (this.isPopup) {
+		cell.ttip = Calendar._TT["DRAG_TO_MOVE"];
+		cell.style.cursor = "move";
+	}
+	this.tooltips = cell;
+
+	div = Calendar.createElement("div", this.element);
+	this.monthsCombo = div;
+	div.className = "combo";
+	for (i = 0; i < Calendar._MN.length; ++i) {
+		var mn = Calendar.createElement("div");
+		mn.className = Calendar.is_ie ? "label-IEfix" : "label";
+		mn.month = i;
+		mn.innerHTML = Calendar._SMN[i];
+		div.appendChild(mn);
+	}
+
+	div = Calendar.createElement("div", this.element);
+	this.yearsCombo = div;
+	div.className = "combo";
+	for (i = 12; i > 0; --i) {
+		var yr = Calendar.createElement("div");
+		yr.className = Calendar.is_ie ? "label-IEfix" : "label";
+		div.appendChild(yr);
+	}
+
+	this._init(this.firstDayOfWeek, this.date);
+	parent.appendChild(this.element);
+};
+
+/** keyboard navigation, only for popup calendars */
+Calendar._keyEvent = function(ev) {
+	var cal = window._dynarch_popupCalendar;
+	if (!cal || cal.multiple)
+		return false;
+	(Calendar.is_ie) && (ev = window.event);
+	var act = (Calendar.is_ie || ev.type == "keypress"),
+		K = ev.keyCode;
+	if (ev.ctrlKey) {
+		switch (K) {
+		    case 37: // KEY left
+			act && Calendar.cellClick(cal._nav_pm);
+			break;
+		    case 38: // KEY up
+			act && Calendar.cellClick(cal._nav_py);
+			break;
+		    case 39: // KEY right
+			act && Calendar.cellClick(cal._nav_nm);
+			break;
+		    case 40: // KEY down
+			act && Calendar.cellClick(cal._nav_ny);
+			break;
+		    default:
+			return false;
+		}
+	} else switch (K) {
+	    case 32: // KEY space (now)
+		Calendar.cellClick(cal._nav_now);
+		break;
+	    case 27: // KEY esc
+		act && cal.callCloseHandler();
+		break;
+	    case 37: // KEY left
+	    case 38: // KEY up
+	    case 39: // KEY right
+	    case 40: // KEY down
+		if (act) {
+			var prev, x, y, ne, el, step;
+			prev = K == 37 || K == 38;
+			step = (K == 37 || K == 39) ? 1 : 7;
+			function setVars() {
+				el = cal.currentDateEl;
+				var p = el.pos;
+				x = p & 15;
+				y = p >> 4;
+				ne = cal.ar_days[y][x];
+			};setVars();
+			function prevMonth() {
+				var date = new Date(cal.date);
+				date.setDate(date.getDate() - step);
+				cal.setDate(date);
+			};
+			function nextMonth() {
+				var date = new Date(cal.date);
+				date.setDate(date.getDate() + step);
+				cal.setDate(date);
+			};
+			while (1) {
+				switch (K) {
+				    case 37: // KEY left
+					if (--x >= 0)
+						ne = cal.ar_days[y][x];
+					else {
+						x = 6;
+						K = 38;
+						continue;
+					}
+					break;
+				    case 38: // KEY up
+					if (--y >= 0)
+						ne = cal.ar_days[y][x];
+					else {
+						prevMonth();
+						setVars();
+					}
+					break;
+				    case 39: // KEY right
+					if (++x < 7)
+						ne = cal.ar_days[y][x];
+					else {
+						x = 0;
+						K = 40;
+						continue;
+					}
+					break;
+				    case 40: // KEY down
+					if (++y < cal.ar_days.length)
+						ne = cal.ar_days[y][x];
+					else {
+						nextMonth();
+						setVars();
+					}
+					break;
+				}
+				break;
+			}
+			if (ne) {
+				if (!ne.disabled)
+					Calendar.cellClick(ne);
+				else if (prev)
+					prevMonth();
+				else
+					nextMonth();
+			}
+		}
+		break;
+	    case 13: // KEY enter
+		if (act)
+			Calendar.cellClick(cal.currentDateEl, ev);
+		break;
+	    default:
+		return false;
+	}
+	return Calendar.stopEvent(ev);
+};
+
+/**
+ *  (RE)Initializes the calendar to the given date and firstDayOfWeek
+ */
+Calendar.prototype._init = function (firstDayOfWeek, date) {
+	var today = new Date(),
+		TY = today.getFullYear(),
+		TM = today.getMonth(),
+		TD = today.getDate();
+	this.table.style.visibility = "hidden";
+	var year = date.getFullYear();
+	if (year < this.minYear) {
+		year = this.minYear;
+		date.setFullYear(year);
+	} else if (year > this.maxYear) {
+		year = this.maxYear;
+		date.setFullYear(year);
+	}
+	this.firstDayOfWeek = firstDayOfWeek;
+	this.date = new Date(date);
+	var month = date.getMonth();
+	var mday = date.getDate();
+	var no_days = date.getMonthDays();
+
+	// calendar voodoo for computing the first day that would actually be
+	// displayed in the calendar, even if it's from the previous month.
+	// WARNING: this is magic. ;-)
+	date.setDate(1);
+	var day1 = (date.getDay() - this.firstDayOfWeek) % 7;
+	if (day1 < 0)
+		day1 += 7;
+	date.setDate(-day1);
+	date.setDate(date.getDate() + 1);
+
+	var row = this.tbody.firstChild;
+	var MN = Calendar._SMN[month];
+	var ar_days = this.ar_days = new Array();
+	var weekend = Calendar._TT["WEEKEND"];
+	var dates = this.multiple ? (this.datesCells = {}) : null;
+	for (var i = 0; i < 6; ++i, row = row.nextSibling) {
+		var cell = row.firstChild;
+		if (this.weekNumbers) {
+			cell.className = "day wn";
+			cell.innerHTML = date.getWeekNumber();
+			cell = cell.nextSibling;
+		}
+		row.className = "daysrow";
+		var hasdays = false, iday, dpos = ar_days[i] = [];
+		for (var j = 0; j < 7; ++j, cell = cell.nextSibling, date.setDate(iday + 1)) {
+			iday = date.getDate();
+			var wday = date.getDay();
+			cell.className = "day";
+			cell.pos = i << 4 | j;
+			dpos[j] = cell;
+			var current_month = (date.getMonth() == month);
+			if (!current_month) {
+				if (this.showsOtherMonths) {
+					cell.className += " othermonth";
+					cell.otherMonth = true;
+				} else {
+					cell.className = "emptycell";
+					cell.innerHTML = "&nbsp;";
+					cell.disabled = true;
+					continue;
+				}
+			} else {
+				cell.otherMonth = false;
+				hasdays = true;
+			}
+			cell.disabled = false;
+			cell.innerHTML = this.getDateText ? this.getDateText(date, iday) : iday;
+			if (dates)
+				dates[date.print("%Y%m%d")] = cell;
+			if (this.getDateStatus) {
+				var status = this.getDateStatus(date, year, month, iday);
+				if (this.getDateToolTip) {
+					var toolTip = this.getDateToolTip(date, year, month, iday);
+					if (toolTip)
+						cell.title = toolTip;
+				}
+				if (status === true) {
+					cell.className += " disabled";
+					cell.disabled = true;
+				} else {
+					if (/disabled/i.test(status))
+						cell.disabled = true;
+					cell.className += " " + status;
+				}
+			}
+			if (!cell.disabled) {
+				cell.caldate = new Date(date);
+				cell.ttip = "_";
+				if (!this.multiple && current_month
+				    && iday == mday && this.hiliteToday) {
+					cell.className += " selected";
+					this.currentDateEl = cell;
+				}
+				if (date.getFullYear() == TY &&
+				    date.getMonth() == TM &&
+				    iday == TD) {
+					cell.className += " today";
+					cell.ttip += Calendar._TT["PART_TODAY"];
+				}
+				if (weekend.indexOf(wday.toString()) != -1)
+					cell.className += cell.otherMonth ? " oweekend" : " weekend";
+			}
+		}
+		if (!(hasdays || this.showsOtherMonths))
+			row.className = "emptyrow";
+	}
+	this.title.innerHTML = Calendar._MN[month] + ", " + year;
+	this.onSetTime();
+	this.table.style.visibility = "visible";
+	this._initMultipleDates();
+	// PROFILE
+	// this.tooltips.innerHTML = "Generated in " + ((new Date()) - today) + " ms";
+};
+
+Calendar.prototype._initMultipleDates = function() {
+	if (this.multiple) {
+		for (var i in this.multiple) {
+			var cell = this.datesCells[i];
+			var d = this.multiple[i];
+			if (!d)
+				continue;
+			if (cell)
+				cell.className += " selected";
+		}
+	}
+};
+
+Calendar.prototype._toggleMultipleDate = function(date) {
+	if (this.multiple) {
+		var ds = date.print("%Y%m%d");
+		var cell = this.datesCells[ds];
+		if (cell) {
+			var d = this.multiple[ds];
+			if (!d) {
+				Calendar.addClass(cell, "selected");
+				this.multiple[ds] = date;
+			} else {
+				Calendar.removeClass(cell, "selected");
+				delete this.multiple[ds];
+			}
+		}
+	}
+};
+
+Calendar.prototype.setDateToolTipHandler = function (unaryFunction) {
+	this.getDateToolTip = unaryFunction;
+};
+
+/**
+ *  Calls _init function above for going to a certain date (but only if the
+ *  date is different than the currently selected one).
+ */
+Calendar.prototype.setDate = function (date) {
+	if (!date.equalsTo(this.date)) {
+		this._init(this.firstDayOfWeek, date);
+	}
+};
+
+/**
+ *  Refreshes the calendar.  Useful if the "disabledHandler" function is
+ *  dynamic, meaning that the list of disabled date can change at runtime.
+ *  Just * call this function if you think that the list of disabled dates
+ *  should * change.
+ */
+Calendar.prototype.refresh = function () {
+	this._init(this.firstDayOfWeek, this.date);
+};
+
+/** Modifies the "firstDayOfWeek" parameter (pass 0 for Synday, 1 for Monday, etc.). */
+Calendar.prototype.setFirstDayOfWeek = function (firstDayOfWeek) {
+	this._init(firstDayOfWeek, this.date);
+	this._displayWeekdays();
+};
+
+/**
+ *  Allows customization of what dates are enabled.  The "unaryFunction"
+ *  parameter must be a function object that receives the date (as a JS Date
+ *  object) and returns a boolean value.  If the returned value is true then
+ *  the passed date will be marked as disabled.
+ */
+Calendar.prototype.setDateStatusHandler = Calendar.prototype.setDisabledHandler = function (unaryFunction) {
+	this.getDateStatus = unaryFunction;
+};
+
+/** Customization of allowed year range for the calendar. */
+Calendar.prototype.setRange = function (a, z) {
+	this.minYear = a;
+	this.maxYear = z;
+};
+
+/** Calls the first user handler (selectedHandler). */
+Calendar.prototype.callHandler = function () {
+	if (this.onSelected) {
+		this.onSelected(this, this.date.print(this.dateFormat));
+	}
+};
+
+/** Calls the second user handler (closeHandler). */
+Calendar.prototype.callCloseHandler = function () {
+	if (this.onClose) {
+		this.onClose(this);
+	}
+	this.hideShowCovered();
+};
+
+/** Removes the calendar object from the DOM tree and destroys it. */
+Calendar.prototype.destroy = function () {
+	var el = this.element.parentNode;
+	el.removeChild(this.element);
+	Calendar._C = null;
+	window._dynarch_popupCalendar = null;
+};
+
+/**
+ *  Moves the calendar element to a different section in the DOM tree (changes
+ *  its parent).
+ */
+Calendar.prototype.reparent = function (new_parent) {
+	var el = this.element;
+	el.parentNode.removeChild(el);
+	new_parent.appendChild(el);
+};
+
+// This gets called when the user presses a mouse button anywhere in the
+// document, if the calendar is shown.  If the click was outside the open
+// calendar this function closes it.
+Calendar._checkCalendar = function(ev) {
+	var calendar = window._dynarch_popupCalendar;
+	if (!calendar) {
+		return false;
+	}
+	var el = Calendar.is_ie ? Calendar.getElement(ev) : Calendar.getTargetElement(ev);
+	for (; el != null && el != calendar.element; el = el.parentNode);
+	if (el == null) {
+		// calls closeHandler which should hide the calendar.
+		window._dynarch_popupCalendar.callCloseHandler();
+		return Calendar.stopEvent(ev);
+	}
+};
+
+/** Shows the calendar. */
+Calendar.prototype.show = function () {
+	var rows = this.table.getElementsByTagName("tr");
+	for (var i = rows.length; i > 0;) {
+		var row = rows[--i];
+		Calendar.removeClass(row, "rowhilite");
+		var cells = row.getElementsByTagName("td");
+		for (var j = cells.length; j > 0;) {
+			var cell = cells[--j];
+			Calendar.removeClass(cell, "hilite");
+			Calendar.removeClass(cell, "active");
+		}
+	}
+	this.element.style.display = "block";
+	this.hidden = false;
+	if (this.isPopup) {
+		window._dynarch_popupCalendar = this;
+		Calendar.addEvent(document, "keydown", Calendar._keyEvent);
+		Calendar.addEvent(document, "keypress", Calendar._keyEvent);
+		Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
+	}
+	this.hideShowCovered();
+};
+
+/**
+ *  Hides the calendar.  Also removes any "hilite" from the class of any TD
+ *  element.
+ */
+Calendar.prototype.hide = function () {
+	if (this.isPopup) {
+		Calendar.removeEvent(document, "keydown", Calendar._keyEvent);
+		Calendar.removeEvent(document, "keypress", Calendar._keyEvent);
+		Calendar.removeEvent(document, "mousedown", Calendar._checkCalendar);
+	}
+	this.element.style.display = "none";
+	this.hidden = true;
+	this.hideShowCovered();
+};
+
+/**
+ *  Shows the calendar at a given absolute position (beware that, depending on
+ *  the calendar element style -- position property -- this might be relative
+ *  to the parent's containing rectangle).
+ */
+Calendar.prototype.showAt = function (x, y) {
+	var s = this.element.style;
+	s.left = x + "px";
+	s.top = y + "px";
+	this.show();
+};
+
+/** Shows the calendar near a given element. */
+Calendar.prototype.showAtElement = function (el, opts) {
+	var self = this;
+	var p = Calendar.getAbsolutePos(el);
+	if (!opts || typeof opts != "string") {
+		this.showAt(p.x, p.y + el.offsetHeight);
+		return true;
+	}
+	function fixPosition(box) {
+		if (box.x < 0)
+			box.x = 0;
+		if (box.y < 0)
+			box.y = 0;
+		var cp = document.createElement("div");
+		var s = cp.style;
+		s.position = "absolute";
+		s.right = s.bottom = s.width = s.height = "0px";
+		document.body.appendChild(cp);
+		var br = Calendar.getAbsolutePos(cp);
+		document.body.removeChild(cp);
+		if (Calendar.is_ie) {
+			br.y += document.body.scrollTop;
+			br.x += document.body.scrollLeft;
+		} else {
+			br.y += window.scrollY;
+			br.x += window.scrollX;
+		}
+		var tmp = box.x + box.width - br.x;
+		if (tmp > 0) box.x -= tmp;
+		tmp = box.y + box.height - br.y;
+		if (tmp > 0) box.y -= tmp;
+	};
+	this.element.style.display = "block";
+	Calendar.continuation_for_the_fucking_khtml_browser = function() {
+		var w = self.element.offsetWidth;
+		var h = self.element.offsetHeight;
+		self.element.style.display = "none";
+		var valign = opts.substr(0, 1);
+		var halign = "l";
+		if (opts.length > 1) {
+			halign = opts.substr(1, 1);
+		}
+		// vertical alignment
+		switch (valign) {
+		    case "T": p.y -= h; break;
+		    case "B": p.y += el.offsetHeight; break;
+		    case "C": p.y += (el.offsetHeight - h) / 2; break;
+		    case "t": p.y += el.offsetHeight - h; break;
+		    case "b": break; // already there
+		}
+		// horizontal alignment
+		switch (halign) {
+		    case "L": p.x -= w; break;
+		    case "R": p.x += el.offsetWidth; break;
+		    case "C": p.x += (el.offsetWidth - w) / 2; break;
+		    case "l": p.x += el.offsetWidth - w; break;
+		    case "r": break; // already there
+		}
+		p.width = w;
+		p.height = h + 40;
+		self.monthsCombo.style.display = "none";
+		fixPosition(p);
+		self.showAt(p.x, p.y);
+	};
+	if (Calendar.is_khtml)
+		setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
+	else
+		Calendar.continuation_for_the_fucking_khtml_browser();
+};
+
+/** Customizes the date format. */
+Calendar.prototype.setDateFormat = function (str) {
+	this.dateFormat = str;
+};
+
+/** Customizes the tooltip date format. */
+Calendar.prototype.setTtDateFormat = function (str) {
+	this.ttDateFormat = str;
+};
+
+/**
+ *  Tries to identify the date represented in a string.  If successful it also
+ *  calls this.setDate which moves the calendar to the given date.
+ */
+Calendar.prototype.parseDate = function(str, fmt) {
+	if (!fmt)
+		fmt = this.dateFormat;
+	this.setDate(Date.parseDate(str, fmt));
+};
+
+Calendar.prototype.hideShowCovered = function () {
+	if (!Calendar.is_ie && !Calendar.is_opera)
+		return;
+	function getVisib(obj){
+		var value = obj.style.visibility;
+		if (!value) {
+			if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
+				if (!Calendar.is_khtml)
+					value = document.defaultView.
+						getComputedStyle(obj, "").getPropertyValue("visibility");
+				else
+					value = '';
+			} else if (obj.currentStyle) { // IE
+				value = obj.currentStyle.visibility;
+			} else
+				value = '';
+		}
+		return value;
+	};
+
+	var tags = new Array("applet", "iframe", "select");
+	var el = this.element;
+
+	var p = Calendar.getAbsolutePos(el);
+	var EX1 = p.x;
+	var EX2 = el.offsetWidth + EX1;
+	var EY1 = p.y;
+	var EY2 = el.offsetHeight + EY1;
+
+	for (var k = tags.length; k > 0; ) {
+		var ar = document.getElementsByTagName(tags[--k]);
+		var cc = null;
+
+		for (var i = ar.length; i > 0;) {
+			cc = ar[--i];
+
+			p = Calendar.getAbsolutePos(cc);
+			var CX1 = p.x;
+			var CX2 = cc.offsetWidth + CX1;
+			var CY1 = p.y;
+			var CY2 = cc.offsetHeight + CY1;
+
+			if (this.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
+				if (!cc.__msh_save_visibility) {
+					cc.__msh_save_visibility = getVisib(cc);
+				}
+				cc.style.visibility = cc.__msh_save_visibility;
+			} else {
+				if (!cc.__msh_save_visibility) {
+					cc.__msh_save_visibility = getVisib(cc);
+				}
+				cc.style.visibility = "hidden";
+			}
+		}
+	}
+};
+
+/** Internal function; it displays the bar with the names of the weekday. */
+Calendar.prototype._displayWeekdays = function () {
+	var fdow = this.firstDayOfWeek;
+	var cell = this.firstdayname;
+	var weekend = Calendar._TT["WEEKEND"];
+	for (var i = 0; i < 7; ++i) {
+		cell.className = "day name";
+		var realday = (i + fdow) % 7;
+		if (i) {
+			cell.ttip = Calendar._TT["DAY_FIRST"].replace("%s", Calendar._DN[realday]);
+			cell.navtype = 100;
+			cell.calendar = this;
+			cell.fdow = realday;
+			Calendar._add_evs(cell);
+		}
+		if (weekend.indexOf(realday.toString()) != -1) {
+			Calendar.addClass(cell, "weekend");
+		}
+		cell.innerHTML = Calendar._SDN[(i + fdow) % 7];
+		cell = cell.nextSibling;
+	}
+};
+
+/** Internal function.  Hides all combo boxes that might be displayed. */
+Calendar.prototype._hideCombos = function () {
+	this.monthsCombo.style.display = "none";
+	this.yearsCombo.style.display = "none";
+};
+
+/** Internal function.  Starts dragging the element. */
+Calendar.prototype._dragStart = function (ev) {
+	if (this.dragging) {
+		return;
+	}
+	this.dragging = true;
+	var posX;
+	var posY;
+	if (Calendar.is_ie) {
+		posY = window.event.clientY + document.body.scrollTop;
+		posX = window.event.clientX + document.body.scrollLeft;
+	} else {
+		posY = ev.clientY + window.scrollY;
+		posX = ev.clientX + window.scrollX;
+	}
+	var st = this.element.style;
+	this.xOffs = posX - parseInt(st.left);
+	this.yOffs = posY - parseInt(st.top);
+	with (Calendar) {
+		addEvent(document, "mousemove", calDragIt);
+		addEvent(document, "mouseup", calDragEnd);
+	}
+};
+
+// BEGIN: DATE OBJECT PATCHES
+
+/** Adds the number of days array to the Date object. */
+Date._MD = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
+
+/** Constants used for time computations */
+Date.SECOND = 1000 /* milliseconds */;
+Date.MINUTE = 60 * Date.SECOND;
+Date.HOUR   = 60 * Date.MINUTE;
+Date.DAY    = 24 * Date.HOUR;
+Date.WEEK   =  7 * Date.DAY;
+
+Date.parseDate = function(str, fmt) {
+	var today = new Date();
+	var y = 0;
+	var m = -1;
+	var d = 0;
+	var a = str.split(/\W+/);
+	var b = fmt.match(/%./g);
+	var i = 0, j = 0;
+	var hr = 0;
+	var min = 0;
+	for (i = 0; i < a.length; ++i) {
+		if (!a[i])
+			continue;
+		switch (b[i]) {
+		    case "%d":
+		    case "%e":
+			d = parseInt(a[i], 10);
+			break;
+
+		    case "%m":
+			m = parseInt(a[i], 10) - 1;
+			break;
+
+		    case "%Y":
+		    case "%y":
+			y = parseInt(a[i], 10);
+			(y < 100) && (y += (y > 29) ? 1900 : 2000);
+			break;
+
+		    case "%b":
+		    case "%B":
+			for (j = 0; j < 12; ++j) {
+				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
+			}
+			break;
+
+		    case "%H":
+		    case "%I":
+		    case "%k":
+		    case "%l":
+			hr = parseInt(a[i], 10);
+			break;
+
+		    case "%P":
+		    case "%p":
+			if (/pm/i.test(a[i]) && hr < 12)
+				hr += 12;
+			else if (/am/i.test(a[i]) && hr >= 12)
+				hr -= 12;
+			break;
+
+		    case "%M":
+			min = parseInt(a[i], 10);
+			break;
+		}
+	}
+	if (isNaN(y)) y = today.getFullYear();
+	if (isNaN(m)) m = today.getMonth();
+	if (isNaN(d)) d = today.getDate();
+	if (isNaN(hr)) hr = today.getHours();
+	if (isNaN(min)) min = today.getMinutes();
+	if (y != 0 && m != -1 && d != 0)
+		return new Date(y, m, d, hr, min, 0);
+	y = 0; m = -1; d = 0;
+	for (i = 0; i < a.length; ++i) {
+		if (a[i].search(/[a-zA-Z]+/) != -1) {
+			var t = -1;
+			for (j = 0; j < 12; ++j) {
+				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
+			}
+			if (t != -1) {
+				if (m != -1) {
+					d = m+1;
+				}
+				m = t;
+			}
+		} else if (parseInt(a[i], 10) <= 12 && m == -1) {
+			m = a[i]-1;
+		} else if (parseInt(a[i], 10) > 31 && y == 0) {
+			y = parseInt(a[i], 10);
+			(y < 100) && (y += (y > 29) ? 1900 : 2000);
+		} else if (d == 0) {
+			d = a[i];
+		}
+	}
+	if (y == 0)
+		y = today.getFullYear();
+	if (m != -1 && d != 0)
+		return new Date(y, m, d, hr, min, 0);
+	return today;
+};
+
+/** Returns the number of days in the current month */
+Date.prototype.getMonthDays = function(month) {
+	var year = this.getFullYear();
+	if (typeof month == "undefined") {
+		month = this.getMonth();
+	}
+	if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
+		return 29;
+	} else {
+		return Date._MD[month];
+	}
+};
+
+/** Returns the number of day in the year. */
+Date.prototype.getDayOfYear = function() {
+	var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+	var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
+	var time = now - then;
+	return Math.floor(time / Date.DAY);
+};
+
+/** Returns the number of the week in year, as defined in ISO 8601. */
+Date.prototype.getWeekNumber = function() {
+	var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+	var DoW = d.getDay();
+	d.setDate(d.getDate() - (DoW + 6) % 7 + 3); // Nearest Thu
+	var ms = d.valueOf(); // GMT
+	d.setMonth(0);
+	d.setDate(4); // Thu in Week 1
+	return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
+};
+
+/** Checks date and time equality */
+Date.prototype.equalsTo = function(date) {
+	return ((this.getFullYear() == date.getFullYear()) &&
+		(this.getMonth() == date.getMonth()) &&
+		(this.getDate() == date.getDate()) &&
+		(this.getHours() == date.getHours()) &&
+		(this.getMinutes() == date.getMinutes()));
+};
+
+/** Set only the year, month, date parts (keep existing time) */
+Date.prototype.setDateOnly = function(date) {
+	var tmp = new Date(date);
+	this.setDate(1);
+	this.setFullYear(tmp.getFullYear());
+	this.setMonth(tmp.getMonth());
+	this.setDate(tmp.getDate());
+};
+
+/** Prints the date in a string according to the given format. */
+Date.prototype.print = function (str) {
+	var m = this.getMonth();
+	var d = this.getDate();
+	var y = this.getFullYear();
+	var wn = this.getWeekNumber();
+	var w = this.getDay();
+	var s = {};
+	var hr = this.getHours();
+	var pm = (hr >= 12);
+	var ir = (pm) ? (hr - 12) : hr;
+	var dy = this.getDayOfYear();
+	if (ir == 0)
+		ir = 12;
+	var min = this.getMinutes();
+	var sec = this.getSeconds();
+	s["%a"] = Calendar._SDN[w]; // abbreviated weekday name [FIXME: I18N]
+	s["%A"] = Calendar._DN[w]; // full weekday name
+	s["%b"] = Calendar._SMN[m]; // abbreviated month name [FIXME: I18N]
+	s["%B"] = Calendar._MN[m]; // full month name
+	// FIXME: %c : preferred date and time representation for the current locale
+	s["%C"] = 1 + Math.floor(y / 100); // the century number
+	s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
+	s["%e"] = d; // the day of the month (range 1 to 31)
+	// FIXME: %D : american date style: %m/%d/%y
+	// FIXME: %E, %F, %G, %g, %h (man strftime)
+	s["%H"] = (hr < 10) ? ("0" + hr) : hr; // hour, range 00 to 23 (24h format)
+	s["%I"] = (ir < 10) ? ("0" + ir) : ir; // hour, range 01 to 12 (12h format)
+	s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy; // day of the year (range 001 to 366)
+	s["%k"] = hr;		// hour, range 0 to 23 (24h format)
+	s["%l"] = ir;		// hour, range 1 to 12 (12h format)
+	s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12
+	s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59
+	s["%n"] = "\n";		// a newline character
+	s["%p"] = pm ? "PM" : "AM";
+	s["%P"] = pm ? "pm" : "am";
+	// FIXME: %r : the time in am/pm notation %I:%M:%S %p
+	// FIXME: %R : the time in 24-hour notation %H:%M
+	s["%s"] = Math.floor(this.getTime() / 1000);
+	s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
+	s["%t"] = "\t";		// a tab character
+	// FIXME: %T : the time in 24-hour notation (%H:%M:%S)
+	s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
+	s["%u"] = w + 1;	// the day of the week (range 1 to 7, 1 = MON)
+	s["%w"] = w;		// the day of the week (range 0 to 6, 0 = SUN)
+	// FIXME: %x : preferred date representation for the current locale without the time
+	// FIXME: %X : preferred time representation for the current locale without the date
+	s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
+	s["%Y"] = y;		// year with the century
+	s["%%"] = "%";		// a literal '%' character
+
+	var re = /%./g;
+	if (!Calendar.is_ie5 && !Calendar.is_khtml)
+		return str.replace(re, function (par) { return s[par] || par; });
+
+	var a = str.match(re);
+	for (var i = 0; i < a.length; i++) {
+		var tmp = s[a[i]];
+		if (tmp) {
+			re = new RegExp(a[i], 'g');
+			str = str.replace(re, tmp);
+		}
+	}
+
+	return str;
+};
+
+Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
+Date.prototype.setFullYear = function(y) {
+	var d = new Date(this);
+	d.__msh_oldSetFullYear(y);
+	if (d.getMonth() != this.getMonth())
+		this.setDate(28);
+	this.__msh_oldSetFullYear(y);
+};
+
+// END: DATE OBJECT PATCHES
+
+
+// global object that remembers the calendar
+window._dynarch_popupCalendar = null;
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/img.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/img.gif
new file mode 100644
index 00000000..6774ca5c
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/img.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-af.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-af.js
new file mode 100644
index 00000000..ace710e6
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-af.js
@@ -0,0 +1,39 @@
+// ** I18N Afrikaans
+Calendar._DN = new Array
+("Sondag",
+ "Maandag",
+ "Dinsdag",
+ "Woensdag",
+ "Donderdag",
+ "Vrydag",
+ "Saterdag",
+ "Sondag");
+Calendar._MN = new Array
+("Januarie",
+ "Februarie",
+ "Maart",
+ "April",
+ "Mei",
+ "Junie",
+ "Julie",
+ "Augustus",
+ "September",
+ "Oktober",
+ "November",
+ "Desember");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["TOGGLE"] = "Verander eerste dag van die week";
+Calendar._TT["PREV_YEAR"] = "Vorige jaar (hou vir keuselys)";
+Calendar._TT["PREV_MONTH"] = "Vorige maand (hou vir keuselys)";
+Calendar._TT["GO_TODAY"] = "Gaan na vandag";
+Calendar._TT["NEXT_MONTH"] = "Volgende maand (hou vir keuselys)";
+Calendar._TT["NEXT_YEAR"] = "Volgende jaar (hou vir keuselys)";
+Calendar._TT["SEL_DATE"] = "Kies datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Sleep om te skuif";
+Calendar._TT["PART_TODAY"] = " (vandag)";
+Calendar._TT["MON_FIRST"] = "Vertoon Maandag eerste";
+Calendar._TT["SUN_FIRST"] = "Display Sunday first";
+Calendar._TT["CLOSE"] = "Close";
+Calendar._TT["TODAY"] = "Today";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-al.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-al.js
new file mode 100644
index 00000000..f9cfe8f5
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-al.js
@@ -0,0 +1,101 @@
+// Calendar ALBANIAN language
+//author Rigels Gordani rige@hotmail.com
+
+// ditet
+Calendar._DN = new Array
+("E Diele",
+"E Hene",
+"E Marte",
+"E Merkure",
+"E Enjte",
+"E Premte",
+"E Shtune",
+"E Diele");
+
+//ditet shkurt
+Calendar._SDN = new Array
+("Die",
+"Hen",
+"Mar",
+"Mer",
+"Enj",
+"Pre",
+"Sht",
+"Die");
+
+// muajt
+Calendar._MN = new Array
+("Janar",
+"Shkurt",
+"Mars",
+"Prill",
+"Maj",
+"Qeshor",
+"Korrik",
+"Gusht",
+"Shtator",
+"Tetor",
+"Nentor",
+"Dhjetor");
+
+// muajte shkurt
+Calendar._SMN = new Array
+("Jan",
+"Shk",
+"Mar",
+"Pri",
+"Maj",
+"Qes",
+"Kor",
+"Gus",
+"Sht",
+"Tet",
+"Nen",
+"Dhj");
+
+// ndihmesa
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Per kalendarin";
+
+Calendar._TT["ABOUT"] =
+"Zgjedhes i ores/dates ne DHTML \n" +
+"\n\n" +"Zgjedhja e Dates:\n" +
+"- Perdor butonat \xab, \xbb per te zgjedhur vitin\n" +
+"- Perdor  butonat" + String.fromCharCode(0x2039) + ", " + 
+String.fromCharCode(0x203a) +
+" per te  zgjedhur muajin\n" +
+"- Mbani shtypur butonin e mousit per nje zgjedje me te shpejte.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Zgjedhja e kohes:\n" +
+"- Kliko tek ndonje nga pjeset e ores per ta rritur ate\n" +
+"- ose kliko me Shift per ta zvogeluar ate\n" +
+"- ose cliko dhe terhiq per zgjedhje me te shpejte.";
+
+Calendar._TT["PREV_YEAR"] = "Viti i shkuar (prit per menune)";
+Calendar._TT["PREV_MONTH"] = "Muaji i shkuar (prit per menune)";
+Calendar._TT["GO_TODAY"] = "Sot";
+Calendar._TT["NEXT_MONTH"] = "Muaji i ardhshem (prit per menune)";
+Calendar._TT["NEXT_YEAR"] = "Viti i ardhshem (prit per menune)";
+Calendar._TT["SEL_DATE"] = "Zgjidh daten";
+Calendar._TT["DRAG_TO_MOVE"] = "Terhiqe per te levizur";
+Calendar._TT["PART_TODAY"] = " (sot)";
+
+// "%s" eshte dita e pare e javes
+// %s do te zevendesohet me emrin e dite
+Calendar._TT["DAY_FIRST"] = "Trego te %s te paren";
+
+
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Mbyll";
+Calendar._TT["TODAY"] = "Sot";
+Calendar._TT["TIME_PART"] = "Kliko me (Shift-)ose terhiqe per te ndryshuar 
+vleren";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "Java";
+Calendar._TT["TIME"] = "Koha:";
+
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-bg.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-bg.js
new file mode 100644
index 00000000..5eb73ec6
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-bg.js
@@ -0,0 +1,124 @@
+// ** I18N
+
+// Calendar BG language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Translator: Valentin Sheiretsky, <valio@valio.eu.org>
+// Encoding: Windows-1251
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Íåäåëÿ",
+ "Ïîíåäåëíèê",
+ "Âòîðíèê",
+ "Ñðÿäà",
+ "×åòâúðòúê",
+ "Ïåòúê",
+ "Ñúáîòà",
+ "Íåäåëÿ");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Íåä",
+ "Ïîí",
+ "Âòî",
+ "Ñðÿ",
+ "×åò",
+ "Ïåò",
+ "Ñúá",
+ "Íåä");
+
+// full month names
+Calendar._MN = new Array
+("ßíóàðè",
+ "Ôåâðóàðè",
+ "Ìàðò",
+ "Àïðèë",
+ "Ìàé",
+ "Þíè",
+ "Þëè",
+ "Àâãóñò",
+ "Ñåïòåìâðè",
+ "Îêòîìâðè",
+ "Íîåìâðè",
+ "Äåêåìâðè");
+
+// short month names
+Calendar._SMN = new Array
+("ßíó",
+ "Ôåâ",
+ "Ìàð",
+ "Àïð",
+ "Ìàé",
+ "Þíè",
+ "Þëè",
+ "Àâã",
+ "Ñåï",
+ "Îêò",
+ "Íîå",
+ "Äåê");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Èíôîðìàöèÿ çà êàëåíäàðà";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+Calendar._TT["PREV_YEAR"] = "Ïðåäíà ãîäèíà (çàäðúæòå çà ìåíþ)";
+Calendar._TT["PREV_MONTH"] = "Ïðåäåí ìåñåö (çàäðúæòå çà ìåíþ)";
+Calendar._TT["GO_TODAY"] = "Èçáåðåòå äíåñ";
+Calendar._TT["NEXT_MONTH"] = "Ñëåäâàù ìåñåö (çàäðúæòå çà ìåíþ)";
+Calendar._TT["NEXT_YEAR"] = "Ñëåäâàùà ãîäèíà (çàäðúæòå çà ìåíþ)";
+Calendar._TT["SEL_DATE"] = "Èçáåðåòå äàòà";
+Calendar._TT["DRAG_TO_MOVE"] = "Ïðåìåñòâàíå";
+Calendar._TT["PART_TODAY"] = " (äíåñ)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "%s êàòî ïúðâè äåí";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Çàòâîðåòå";
+Calendar._TT["TODAY"] = "Äíåñ";
+Calendar._TT["TIME_PART"] = "(Shift-)Click èëè drag çà äà ïðîìåíèòå ñòîéíîñòòà";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%A - %e %B %Y";
+
+Calendar._TT["WK"] = "Ñåäì";
+Calendar._TT["TIME"] = "×àñ:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-big5-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-big5-utf8.js
new file mode 100644
index 00000000..3b6df42a
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-big5-utf8.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar big5-utf8 language
+// Author: Gary Fu, <gary@garyfu.idv.tw>
+// Encoding: utf8
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+	
+// full day names
+Calendar._DN = new Array
+("星期日",
+ "星期一",
+ "星期二",
+ "星期三",
+ "星期四",
+ "星期五",
+ "星期六",
+ "星期日");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("æ—¥",
+ "一",
+ "二",
+ "三",
+ "å››",
+ "五",
+ "å…­",
+ "æ—¥");
+
+// full month names
+Calendar._MN = new Array
+("一月",
+ "二月",
+ "三月",
+ "四月",
+ "五月",
+ "六月",
+ "七月",
+ "八月",
+ "�月",
+ "�月",
+ "�一月",
+ "�二月");
+
+// short month names
+Calendar._SMN = new Array
+("一月",
+ "二月",
+ "三月",
+ "四月",
+ "五月",
+ "六月",
+ "七月",
+ "八月",
+ "�月",
+ "�月",
+ "�一月",
+ "�二月");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "關於";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"日期�擇方法:\n" +
+"- 使用 \xab, \xbb 按鈕��擇年份\n" +
+"- 使用 " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " 按鈕��擇月份\n" +
+"- 按�上�的按鈕�以加快��";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"時間�擇方法:\n" +
+"- 點擊任何的時間部份�增加其值\n" +
+"- �時按Shift��點擊�減少其值\n" +
+"- 點擊並拖曳�加快改變的值";
+
+Calendar._TT["PREV_YEAR"] = "上一年 (按��單)";
+Calendar._TT["PREV_MONTH"] = "下一年 (按��單)";
+Calendar._TT["GO_TODAY"] = "到今日";
+Calendar._TT["NEXT_MONTH"] = "上一月 (按��單)";
+Calendar._TT["NEXT_YEAR"] = "下一月 (按��單)";
+Calendar._TT["SEL_DATE"] = "�擇日期";
+Calendar._TT["DRAG_TO_MOVE"] = "拖曳";
+Calendar._TT["PART_TODAY"] = " (今日)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "將 %s 顯示在�";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "關閉";
+Calendar._TT["TODAY"] = "今日";
+Calendar._TT["TIME_PART"] = "點擊or拖曳�改變時間(�時按Shift為減)";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "週";
+Calendar._TT["TIME"] = "Time:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-big5.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-big5.js
new file mode 100644
index 00000000..b14335ef
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-big5.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar big5 language
+// Author: Gary Fu, <gary@garyfu.idv.tw>
+// Encoding: big5
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+	
+// full day names
+Calendar._DN = new Array
+("¬P´Á¤é",
+ "¬P´Á¤@",
+ "¬P´Á¤G",
+ "¬P´Á¤T",
+ "¬P´Á¥|",
+ "¬P´Á¤­",
+ "¬P´Á¤»",
+ "¬P´Á¤é");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("¤é",
+ "¤@",
+ "¤G",
+ "¤T",
+ "¥|",
+ "¤­",
+ "¤»",
+ "¤é");
+
+// full month names
+Calendar._MN = new Array
+("¤@¤ë",
+ "¤G¤ë",
+ "¤T¤ë",
+ "¥|¤ë",
+ "¤­¤ë",
+ "¤»¤ë",
+ "¤C¤ë",
+ "¤K¤ë",
+ "¤E¤ë",
+ "¤Q¤ë",
+ "¤Q¤@¤ë",
+ "¤Q¤G¤ë");
+
+// short month names
+Calendar._SMN = new Array
+("¤@¤ë",
+ "¤G¤ë",
+ "¤T¤ë",
+ "¥|¤ë",
+ "¤­¤ë",
+ "¤»¤ë",
+ "¤C¤ë",
+ "¤K¤ë",
+ "¤E¤ë",
+ "¤Q¤ë",
+ "¤Q¤@¤ë",
+ "¤Q¤G¤ë");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Ãö©ó";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"¤é´Á¿ï¾Ü¤èªk:\n" +
+"- ¨Ï¥Î \xab, \xbb «ö¶s¥i¿ï¾Ü¦~¥÷\n" +
+"- ¨Ï¥Î " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " «ö¶s¥i¿ï¾Ü¤ë¥÷\n" +
+"- «ö¦í¤W­±ªº«ö¶s¥i¥H¥[§Ö¿ï¨ú";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"®É¶¡¿ï¾Ü¤èªk:\n" +
+"- ÂIÀ»¥ô¦óªº®É¶¡³¡¥÷¥i¼W¥[¨ä­È\n" +
+"- ¦P®É«öShiftÁä¦AÂIÀ»¥i´î¤Ö¨ä­È\n" +
+"- ÂIÀ»¨Ã©ì¦²¥i¥[§Ö§ïÅܪº­È";
+
+Calendar._TT["PREV_YEAR"] = "¤W¤@¦~ («ö¦í¿ï³æ)";
+Calendar._TT["PREV_MONTH"] = "¤U¤@¦~ («ö¦í¿ï³æ)";
+Calendar._TT["GO_TODAY"] = "¨ì¤µ¤é";
+Calendar._TT["NEXT_MONTH"] = "¤W¤@¤ë («ö¦í¿ï³æ)";
+Calendar._TT["NEXT_YEAR"] = "¤U¤@¤ë («ö¦í¿ï³æ)";
+Calendar._TT["SEL_DATE"] = "¿ï¾Ü¤é´Á";
+Calendar._TT["DRAG_TO_MOVE"] = "©ì¦²";
+Calendar._TT["PART_TODAY"] = " (¤µ¤é)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "±N %s Åã¥Ü¦b«e";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Ãö³¬";
+Calendar._TT["TODAY"] = "¤µ¤é";
+Calendar._TT["TIME_PART"] = "ÂIÀ»or©ì¦²¥i§ïÅܮɶ¡(¦P®É«öShift¬°´î)";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "¶g";
+Calendar._TT["TIME"] = "Time:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-br.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-br.js
new file mode 100644
index 00000000..8cdf5014
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-br.js
@@ -0,0 +1,108 @@
+// ** I18N
+
+// Calendar pt-BR language
+// Author: Fernando Dourado, <fernando.dourado@ig.com.br>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Domingo",
+ "Segunda",
+ "Terça",
+ "Quarta",
+ "Quinta",
+ "Sexta",
+ "Sabádo",
+ "Domingo");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+// [No changes using default values]
+
+// full month names
+Calendar._MN = new Array
+("Janeiro",
+ "Fevereiro",
+ "Março",
+ "Abril",
+ "Maio",
+ "Junho",
+ "Julho",
+ "Agosto",
+ "Setembro",
+ "Outubro",
+ "Novembro",
+ "Dezembro");
+
+// short month names
+// [No changes using default values]
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Sobre o calendário";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Translate to portuguese Brazil (pt-BR) by Fernando Dourado (fernando.dourado@ig.com.br)\n" +
+"Tradução para o português Brasil (pt-BR) por Fernando Dourado (fernando.dourado@ig.com.br)" +
+"\n\n" +
+"Selecionar data:\n" +
+"- Use as teclas \xab, \xbb para selecionar o ano\n" +
+"- Use as teclas " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " para selecionar o mês\n" +
+"- Clique e segure com o mouse em qualquer botão para selecionar rapidamente.";
+
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selecionar hora:\n" +
+"- Clique em qualquer uma das partes da hora para aumentar\n" +
+"- ou Shift-clique para diminuir\n" +
+"- ou clique e arraste para selecionar rapidamente.";
+
+Calendar._TT["PREV_YEAR"] = "Ano anterior (clique e segure para menu)";
+Calendar._TT["PREV_MONTH"] = "Mês anterior (clique e segure para menu)";
+Calendar._TT["GO_TODAY"] = "Ir para a data atual";
+Calendar._TT["NEXT_MONTH"] = "Próximo mês (clique e segure para menu)";
+Calendar._TT["NEXT_YEAR"] = "Próximo ano (clique e segure para menu)";
+Calendar._TT["SEL_DATE"] = "Selecione uma data";
+Calendar._TT["DRAG_TO_MOVE"] = "Clique e segure para mover";
+Calendar._TT["PART_TODAY"] = " (hoje)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Exibir %s primeiro";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Fechar";
+Calendar._TT["TODAY"] = "Hoje";
+Calendar._TT["TIME_PART"] = "(Shift-)Clique ou arraste para mudar o valor";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d/%m/%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%d de %B de %Y";
+
+Calendar._TT["WK"] = "sem";
+Calendar._TT["TIME"] = "Hora:";
+
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ca.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ca.js
new file mode 100644
index 00000000..bd2e7ba3
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ca.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar CA language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Diumenge",
+ "Dilluns",
+ "Dimarts",
+ "Dimecres",
+ "Dijous",
+ "Divendres",
+ "Dissabte",
+ "Diumenge");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Diu",
+ "Dil",
+ "Dmt",
+ "Dmc",
+ "Dij",
+ "Div",
+ "Dis",
+ "Diu");
+
+// full month names
+Calendar._MN = new Array
+("Gener",
+ "Febrer",
+ "Març",
+ "Abril",
+ "Maig",
+ "Juny",
+ "Juliol",
+ "Agost",
+ "Setembre",
+ "Octubre",
+ "Novembre",
+ "Desembre");
+
+// short month names
+Calendar._SMN = new Array
+("Gen",
+ "Feb",
+ "Mar",
+ "Abr",
+ "Mai",
+ "Jun",
+ "Jul",
+ "Ago",
+ "Set",
+ "Oct",
+ "Nov",
+ "Des");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Sobre el calendari";
+
+Calendar._TT["ABOUT"] =
+"DHTML Selector de Data/Hora\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Sel.lecció de Dates:\n" +
+"- Fes servir els botons \xab, \xbb per sel.leccionar l'any\n" +
+"- Fes servir els botons " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " per se.lecciconar el mes\n" +
+"- Manté el ratolí apretat en qualsevol dels anteriors per sel.lecció ràpida.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- claca en qualsevol de les parts de la hora per augmentar-les\n" +
+"- o Shift-click per decrementar-la\n" +
+"- or click and arrastra per sel.lecció ràpida.";
+
+Calendar._TT["PREV_YEAR"] = "Any anterior (Mantenir per menu)";
+Calendar._TT["PREV_MONTH"] = "Mes anterior (Mantenir per menu)";
+Calendar._TT["GO_TODAY"] = "Anar a avui";
+Calendar._TT["NEXT_MONTH"] = "Mes següent (Mantenir per menu)";
+Calendar._TT["NEXT_YEAR"] = "Any següent (Mantenir per menu)";
+Calendar._TT["SEL_DATE"] = "Sel.leccionar data";
+Calendar._TT["DRAG_TO_MOVE"] = "Arrastrar per moure";
+Calendar._TT["PART_TODAY"] = " (avui)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Mostra %s primer";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Tanca";
+Calendar._TT["TODAY"] = "Avui";
+Calendar._TT["TIME_PART"] = "(Shift-)Click a arrastra per canviar el valor";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "st";
+Calendar._TT["TIME"] = "Hora:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-cs-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-cs-utf8.js
new file mode 100644
index 00000000..fd0c0602
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-cs-utf8.js
@@ -0,0 +1,65 @@
+/* 
+	calendar-cs-win.js
+	language: Czech
+	encoding: windows-1250
+	author: Lubos Jerabek (xnet@seznam.cz)
+	        Jan Uhlir (espinosa@centrum.cz)
+*/
+
+// ** I18N
+Calendar._DN  = new Array('Neděle','Pondělí','Úterý','Středa','Čtvrtek','Pátek','Sobota','Neděle');
+Calendar._SDN = new Array('Ne','Po','Út','St','Čt','Pá','So','Ne');
+Calendar._MN  = new Array('Leden','Únor','Březen','Duben','Květen','Červen','Červenec','Srpen','Září','Říjen','Listopad','Prosinec');
+Calendar._SMN = new Array('Led','Úno','Bře','Dub','Kvě','Črv','Čvc','Srp','Zář','Říj','Lis','Pro');
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O komponentě kalendář";
+Calendar._TT["TOGGLE"] = "Změna prvního dne v týdnu";
+Calendar._TT["PREV_YEAR"] = "Předchozí rok (přidrž pro menu)";
+Calendar._TT["PREV_MONTH"] = "Předchozí měsíc (přidrž pro menu)";
+Calendar._TT["GO_TODAY"] = "Dnešní datum";
+Calendar._TT["NEXT_MONTH"] = "Další měsíc (přidrž pro menu)";
+Calendar._TT["NEXT_YEAR"] = "Další rok (přidrž pro menu)";
+Calendar._TT["SEL_DATE"] = "Vyber datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Chyť a táhni, pro přesun";
+Calendar._TT["PART_TODAY"] = " (dnes)";
+Calendar._TT["MON_FIRST"] = "Ukaž jako první Pondělí";
+//Calendar._TT["SUN_FIRST"] = "Ukaž jako první Neděli";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Výběr datumu:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Použijte tla�ítka " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " k výběru měsíce\n" +
+"- Podržte tla�ítko myši na jakémkoliv z těch tla�ítek pro rychlejší výběr.";
+
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Výběr �asu:\n" +
+"- Klikněte na jakoukoliv z �ástí výběru �asu pro zvýšení.\n" +
+"- nebo Shift-click pro snížení\n" +
+"- nebo klikněte a táhněte pro rychlejší výběr.";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Zobraz %s první";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Zavřít";
+Calendar._TT["TODAY"] = "Dnes";
+Calendar._TT["TIME_PART"] = "(Shift-)Klikni nebo táhni pro změnu hodnoty";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "d.m.yy";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "ÄŒas:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-cs-win.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-cs-win.js
new file mode 100644
index 00000000..bd96c521
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-cs-win.js
@@ -0,0 +1,65 @@
+/* 
+	calendar-cs-win.js
+	language: Czech
+	encoding: windows-1250
+	author: Lubos Jerabek (xnet@seznam.cz)
+	        Jan Uhlir (espinosa@centrum.cz)
+*/
+
+// ** I18N
+Calendar._DN  = new Array('Nedìle','Pondìlí','Úterý','Støeda','Ètvrtek','Pátek','Sobota','Nedìle');
+Calendar._SDN = new Array('Ne','Po','Út','St','Èt','Pá','So','Ne');
+Calendar._MN  = new Array('Leden','Únor','Bøezen','Duben','Kvìten','Èerven','Èervenec','Srpen','Záøí','Øíjen','Listopad','Prosinec');
+Calendar._SMN = new Array('Led','Úno','Bøe','Dub','Kvì','Èrv','Èvc','Srp','Záø','Øíj','Lis','Pro');
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O komponentì kalendáø";
+Calendar._TT["TOGGLE"] = "Zmìna prvního dne v týdnu";
+Calendar._TT["PREV_YEAR"] = "Pøedchozí rok (pøidrž pro menu)";
+Calendar._TT["PREV_MONTH"] = "Pøedchozí mìsíc (pøidrž pro menu)";
+Calendar._TT["GO_TODAY"] = "Dnešní datum";
+Calendar._TT["NEXT_MONTH"] = "Další mìsíc (pøidrž pro menu)";
+Calendar._TT["NEXT_YEAR"] = "Další rok (pøidrž pro menu)";
+Calendar._TT["SEL_DATE"] = "Vyber datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Chy� a táhni, pro pøesun";
+Calendar._TT["PART_TODAY"] = " (dnes)";
+Calendar._TT["MON_FIRST"] = "Ukaž jako první Pondìlí";
+//Calendar._TT["SUN_FIRST"] = "Ukaž jako první Nedìli";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Výbìr datumu:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Použijte tlaèítka " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " k výbìru mìsíce\n" +
+"- Podržte tlaèítko myši na jakémkoliv z tìch tlaèítek pro rychlejší výbìr.";
+
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Výbìr èasu:\n" +
+"- Kliknìte na jakoukoliv z èástí výbìru èasu pro zvýšení.\n" +
+"- nebo Shift-click pro snížení\n" +
+"- nebo kliknìte a táhnìte pro rychlejší výbìr.";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Zobraz %s první";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Zavøít";
+Calendar._TT["TODAY"] = "Dnes";
+Calendar._TT["TIME_PART"] = "(Shift-)Klikni nebo táhni pro zmìnu hodnoty";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "d.m.yy";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Èas:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-da.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-da.js
new file mode 100644
index 00000000..2e156570
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-da.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar DA language
+// Author: Michael Thingmand Henriksen, <michael (a) thingmand dot dk>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible. We strongly believe that
+// Unicode is the answer to a real internationalized world. Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Søndag",
+"Mandag",
+"Tirsdag",
+"Onsdag",
+"Torsdag",
+"Fredag",
+"Lørdag",
+"Søndag");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary. We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+// Calendar._SDN_len = N; // short day name length
+// Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Søn",
+"Man",
+"Tir",
+"Ons",
+"Tor",
+"Fre",
+"Lør",
+"Søn");
+
+// full month names
+Calendar._MN = new Array
+("Januar",
+"Februar",
+"Marts",
+"April",
+"Maj",
+"Juni",
+"Juli",
+"August",
+"September",
+"Oktober",
+"November",
+"December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+"Feb",
+"Mar",
+"Apr",
+"Maj",
+"Jun",
+"Jul",
+"Aug",
+"Sep",
+"Okt",
+"Nov",
+"Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Om Kalenderen";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For den seneste version besøg: http://www.dynarch.com/projects/calendar/\n"; +
+"Distribueret under GNU LGPL. Se http://gnu.org/licenses/lgpl.html for detajler." +
+"\n\n" +
+"Valg af dato:\n" +
+"- Brug \xab, \xbb knapperne for at vælge år\n" +
+"- Brug " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " knapperne for at vælge måned\n" +
+"- Hold knappen på musen nede på knapperne ovenfor for hurtigere valg.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Valg af tid:\n" +
+"- Klik på en vilkårlig del for større værdi\n" +
+"- eller Shift-klik for for mindre værdi\n" +
+"- eller klik og træk for hurtigere valg.";
+
+Calendar._TT["PREV_YEAR"] = "Ét år tilbage (hold for menu)";
+Calendar._TT["PREV_MONTH"] = "Én måned tilbage (hold for menu)";
+Calendar._TT["GO_TODAY"] = "GÃ¥ til i dag";
+Calendar._TT["NEXT_MONTH"] = "Én måned frem (hold for menu)";
+Calendar._TT["NEXT_YEAR"] = "Ét år frem (hold for menu)";
+Calendar._TT["SEL_DATE"] = "Vælg dag";
+Calendar._TT["DRAG_TO_MOVE"] = "Træk vinduet";
+Calendar._TT["PART_TODAY"] = " (i dag)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Vis %s først";
+
+// This may be locale-dependent. It specifies the week-end days, as an array
+// of comma-separated numbers. The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Luk";
+Calendar._TT["TODAY"] = "I dag";
+Calendar._TT["TIME_PART"] = "(Shift-)klik eller træk for at ændre værdi";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d-%m-%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "Uge";
+Calendar._TT["TIME"] = "Tid:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-de.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-de.js
new file mode 100644
index 00000000..6e9e7054
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-de.js
@@ -0,0 +1,124 @@
+// ** I18N
+
+// Calendar DE language
+// Author: Jack (tR), <jack@jtr.de>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sonntag",
+ "Montag",
+ "Dienstag",
+ "Mittwoch",
+ "Donnerstag",
+ "Freitag",
+ "Samstag",
+ "Sonntag");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("So",
+ "Mo",
+ "Di",
+ "Mi",
+ "Do",
+ "Fr",
+ "Sa",
+ "So");
+
+// full month names
+Calendar._MN = new Array
+("Januar",
+ "Februar",
+ "M\u00e4rz",
+ "April",
+ "Mai",
+ "Juni",
+ "Juli",
+ "August",
+ "September",
+ "Oktober",
+ "November",
+ "Dezember");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "M\u00e4r",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Okt",
+ "Nov",
+ "Dez");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "\u00DCber dieses Kalendarmodul";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Datum ausw\u00e4hlen:\n" +
+"- Benutzen Sie die \xab, \xbb Buttons um das Jahr zu w\u00e4hlen\n" +
+"- Benutzen Sie die " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " Buttons um den Monat zu w\u00e4hlen\n" +
+"- F\u00fcr eine Schnellauswahl halten Sie die Maustaste \u00fcber diesen Buttons fest.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Zeit ausw\u00e4hlen:\n" +
+"- Klicken Sie auf die Teile der Uhrzeit, um diese zu erh\u00F6hen\n" +
+"- oder klicken Sie mit festgehaltener Shift-Taste um diese zu verringern\n" +
+"- oder klicken und festhalten f\u00fcr Schnellauswahl.";
+
+Calendar._TT["TOGGLE"] = "Ersten Tag der Woche w\u00e4hlen";
+Calendar._TT["PREV_YEAR"] = "Voriges Jahr (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["PREV_MONTH"] = "Voriger Monat (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["GO_TODAY"] = "Heute ausw\u00e4hlen";
+Calendar._TT["NEXT_MONTH"] = "N\u00e4chst. Monat (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["NEXT_YEAR"] = "N\u00e4chst. Jahr (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["SEL_DATE"] = "Datum ausw\u00e4hlen";
+Calendar._TT["DRAG_TO_MOVE"] = "Zum Bewegen festhalten";
+Calendar._TT["PART_TODAY"] = " (Heute)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Woche beginnt mit %s ";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Schlie\u00dfen";
+Calendar._TT["TODAY"] = "Heute";
+Calendar._TT["TIME_PART"] = "(Shift-)Klick oder Festhalten und Ziehen um den Wert zu \u00e4ndern";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Zeit:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-du.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-du.js
new file mode 100644
index 00000000..9c9051fd
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-du.js
@@ -0,0 +1,45 @@
+// ** I18N
+Calendar._DN = new Array
+("Zondag",
+ "Maandag",
+ "Dinsdag",
+ "Woensdag",
+ "Donderdag",
+ "Vrijdag",
+ "Zaterdag",
+ "Zondag");
+Calendar._MN = new Array
+("Januari",
+ "Februari",
+ "Maart",
+ "April",
+ "Mei",
+ "Juni",
+ "Juli",
+ "Augustus",
+ "September",
+ "Oktober",
+ "November",
+ "December");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["TOGGLE"] = "Toggle startdag van de week";
+Calendar._TT["PREV_YEAR"] = "Vorig jaar (indrukken voor menu)";
+Calendar._TT["PREV_MONTH"] = "Vorige month (indrukken voor menu)";
+Calendar._TT["GO_TODAY"] = "Naar Vandaag";
+Calendar._TT["NEXT_MONTH"] = "Volgende Maand (indrukken voor menu)";
+Calendar._TT["NEXT_YEAR"] = "Volgend jaar (indrukken voor menu)";
+Calendar._TT["SEL_DATE"] = "Selecteer datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Sleep om te verplaatsen";
+Calendar._TT["PART_TODAY"] = " (vandaag)";
+Calendar._TT["MON_FIRST"] = "Toon Maandag eerst";
+Calendar._TT["SUN_FIRST"] = "Toon Zondag eerst";
+Calendar._TT["CLOSE"] = "Sluiten";
+Calendar._TT["TODAY"] = "Vandaag";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "y-mm-dd";
+Calendar._TT["TT_DATE_FORMAT"] = "D, M d";
+
+Calendar._TT["WK"] = "wk";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-el.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-el.js
new file mode 100644
index 00000000..43a9b2ce
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-el.js
@@ -0,0 +1,89 @@
+// ** I18N
+Calendar._DN = new Array
+("Κυ�ιακή",
+ "Δευτέ�α",
+ "Τ�ίτη",
+ "Τετά�τη",
+ "Πέμπτη",
+ "Πα�ασκευή",
+ "Σάββατο",
+ "Κυ�ιακή");
+
+Calendar._SDN = new Array
+("Κυ",
+ "Δε",
+ "T�",
+ "Τε",
+ "Πε",
+ "Πα",
+ "Σα",
+ "Κυ");
+
+Calendar._MN = new Array
+("Ιανουά�ιος",
+ "Φεβ�ουά�ιος",
+ "Μά�τιος",
+ "Απ�ίλιος",
+ "Μάϊος",
+ "Ιο�νιος",
+ "Ιο�λιος",
+ "Α�γουστος",
+ "Σεπτέμβ�ιος",
+ "Οκτώβ�ιος",
+ "�οέμβ�ιος",
+ "Δεκέμβ�ιος");
+
+Calendar._SMN = new Array
+("Ιαν",
+ "Φεβ",
+ "Μα�",
+ "Απ�",
+ "Μαι",
+ "Ιουν",
+ "Ιουλ",
+ "Αυγ",
+ "Σεπ",
+ "Οκτ",
+ "�οε",
+ "Δεκ");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Για το ημε�ολόγιο";
+
+Calendar._TT["ABOUT"] =
+"Επιλογέας ημε�ομηνίας/ώ�ας σε DHTML\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Για τελευταία έκδοση: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Επιλογή ημε�ομηνίας:\n" +
+"- Χ�ησιμοποιείστε τα κουμπιά \xab, \xbb για επιλογή έτους\n" +
+"- Χ�ησιμοποιείστε τα κουμπιά " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " για επιλογή μήνα\n" +
+"- Κ�ατήστε κουμπί ποντικο� πατημένο στα πα�απάνω κουμπιά για πιο γ�ήγο�η επιλογή.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Επιλογή ώ�ας:\n" +
+"- Κάντε κλικ σε ένα από τα μέ�η της ώ�ας για α�ξηση\n" +
+"- ή Shift-κλικ για μείωση\n" +
+"- ή κλικ και μετακίνηση για πιο γ�ήγο�η επιλογή.";
+Calendar._TT["TOGGLE"] = "Μπά�α π�ώτης ημέ�ας της εβδομάδας";
+Calendar._TT["PREV_YEAR"] = "Π�οηγ. έτος (κ�ατήστε για το μενο�)";
+Calendar._TT["PREV_MONTH"] = "Π�οηγ. μήνας (κ�ατήστε για το μενο�)";
+Calendar._TT["GO_TODAY"] = "Σήμε�α";
+Calendar._TT["NEXT_MONTH"] = "Επόμενος μήνας (κ�ατήστε για το μενο�)";
+Calendar._TT["NEXT_YEAR"] = "Επόμενο έτος (κ�ατήστε για το μενο�)";
+Calendar._TT["SEL_DATE"] = "Επιλέξτε ημε�ομηνία";
+Calendar._TT["DRAG_TO_MOVE"] = "Σ��τε για να μετακινήσετε";
+Calendar._TT["PART_TODAY"] = " (σήμε�α)";
+Calendar._TT["MON_FIRST"] = "Εμφάνιση Δευτέ�ας π�ώτα";
+Calendar._TT["SUN_FIRST"] = "Εμφάνιση Κυ�ιακής π�ώτα";
+Calendar._TT["CLOSE"] = "Κλείσιμο";
+Calendar._TT["TODAY"] = "Σήμε�α";
+Calendar._TT["TIME_PART"] = "(Shift-)κλικ ή μετακίνηση για αλλαγή";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "dd-mm-y";
+Calendar._TT["TT_DATE_FORMAT"] = "D, d M";
+
+Calendar._TT["WK"] = "εβδ";
+
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-en-US.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-en-US.js
new file mode 100644
index 00000000..f079c3f1
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-en-US.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sunday",
+ "Monday",
+ "Tuesday",
+ "Wednesday",
+ "Thursday",
+ "Friday",
+ "Saturday",
+ "Sunday");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sun",
+ "Mon",
+ "Tue",
+ "Wed",
+ "Thu",
+ "Fri",
+ "Sat",
+ "Sun");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 0;
+
+// full month names
+Calendar._MN = new Array
+("January",
+ "February",
+ "March",
+ "April",
+ "May",
+ "June",
+ "July",
+ "August",
+ "September",
+ "October",
+ "November",
+ "December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "About the calendar";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
+Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
+Calendar._TT["GO_TODAY"] = "Go Today";
+Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
+Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
+Calendar._TT["SEL_DATE"] = "Select date";
+Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
+Calendar._TT["PART_TODAY"] = " (today)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Display %s first";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Close";
+Calendar._TT["TODAY"] = "Today";
+Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%m/%d/%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Time:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-en-gb.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-en-gb.js
new file mode 100644
index 00000000..d69406f3
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-en-gb.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar EN-GB language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sunday",
+ "Monday",
+ "Tuesday",
+ "Wednesday",
+ "Thursday",
+ "Friday",
+ "Saturday",
+ "Sunday");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sun",
+ "Mon",
+ "Tue",
+ "Wed",
+ "Thu",
+ "Fri",
+ "Sat",
+ "Sun");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 0;
+
+// full month names
+Calendar._MN = new Array
+("January",
+ "February",
+ "March",
+ "April",
+ "May",
+ "June",
+ "July",
+ "August",
+ "September",
+ "October",
+ "November",
+ "December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "About the calendar";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
+Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
+Calendar._TT["GO_TODAY"] = "Go Today";
+Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
+Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
+Calendar._TT["SEL_DATE"] = "Select date";
+Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
+Calendar._TT["PART_TODAY"] = " (today)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Display %s first";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Close";
+Calendar._TT["TODAY"] = "Today";
+Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d/%m/%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Time:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-en.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-en.js
new file mode 100644
index 00000000..d6f0909b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-en.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sunday",
+ "Monday",
+ "Tuesday",
+ "Wednesday",
+ "Thursday",
+ "Friday",
+ "Saturday",
+ "Sunday");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sun",
+ "Mon",
+ "Tue",
+ "Wed",
+ "Thu",
+ "Fri",
+ "Sat",
+ "Sun");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 0;
+
+// full month names
+Calendar._MN = new Array
+("January",
+ "February",
+ "March",
+ "April",
+ "May",
+ "June",
+ "July",
+ "August",
+ "September",
+ "October",
+ "November",
+ "December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "About the calendar";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
+Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
+Calendar._TT["GO_TODAY"] = "Go Today";
+Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
+Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
+Calendar._TT["SEL_DATE"] = "Select date";
+Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
+Calendar._TT["PART_TODAY"] = " (today)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Display %s first";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Close";
+Calendar._TT["TODAY"] = "Today";
+Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Time:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-es.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-es.js
new file mode 100644
index 00000000..b9b1843f
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-es.js
@@ -0,0 +1,129 @@
+// ** I18N
+
+// Calendar ES (spanish) language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Updater: Servilio Afre Puentes <servilios@yahoo.com>
+// Updated: 2004-06-03
+// Encoding: utf-8
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Domingo",
+ "Lunes",
+ "Martes",
+ "Miércoles",
+ "Jueves",
+ "Viernes",
+ "Sábado",
+ "Domingo");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Dom",
+ "Lun",
+ "Mar",
+ "Mié",
+ "Jue",
+ "Vie",
+ "Sáb",
+ "Dom");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("Enero",
+ "Febrero",
+ "Marzo",
+ "Abril",
+ "Mayo",
+ "Junio",
+ "Julio",
+ "Agosto",
+ "Septiembre",
+ "Octubre",
+ "Noviembre",
+ "Diciembre");
+
+// short month names
+Calendar._SMN = new Array
+("Ene",
+ "Feb",
+ "Mar",
+ "Abr",
+ "May",
+ "Jun",
+ "Jul",
+ "Ago",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dic");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Acerca del calendario";
+
+Calendar._TT["ABOUT"] =
+"Selector DHTML de Fecha/Hora\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Para conseguir la última versión visite: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuido bajo licencia GNU LGPL. Visite http://gnu.org/licenses/lgpl.html para más detalles." +
+"\n\n" +
+"Selección de fecha:\n" +
+"- Use los botones \xab, \xbb para seleccionar el año\n" +
+"- Use los botones " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " para seleccionar el mes\n" +
+"- Mantenga pulsado el ratón en cualquiera de estos botones para una selección rápida.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selección de hora:\n" +
+"- Pulse en cualquiera de las partes de la hora para incrementarla\n" +
+"- o pulse las mayúsculas mientras hace clic para decrementarla\n" +
+"- o haga clic y arrastre el ratón para una selección más rápida.";
+
+Calendar._TT["PREV_YEAR"] = "Año anterior (mantener para menú)";
+Calendar._TT["PREV_MONTH"] = "Mes anterior (mantener para menú)";
+Calendar._TT["GO_TODAY"] = "Ir a hoy";
+Calendar._TT["NEXT_MONTH"] = "Mes siguiente (mantener para menú)";
+Calendar._TT["NEXT_YEAR"] = "Año siguiente (mantener para menú)";
+Calendar._TT["SEL_DATE"] = "Seleccionar fecha";
+Calendar._TT["DRAG_TO_MOVE"] = "Arrastrar para mover";
+Calendar._TT["PART_TODAY"] = " (hoy)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Hacer %s primer día de la semana";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Cerrar";
+Calendar._TT["TODAY"] = "Hoy";
+Calendar._TT["TIME_PART"] = "(Mayúscula-)Clic o arrastre para cambiar valor";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d/%m/%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%A, %e de %B de %Y";
+
+Calendar._TT["WK"] = "sem";
+Calendar._TT["TIME"] = "Hora:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-fi.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-fi.js
new file mode 100644
index 00000000..eae2032b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-fi.js
@@ -0,0 +1,98 @@
+// ** I18N
+
+// Calendar FI language (Finnish, Suomi)
+// Author: Jarno Käyhkö, <gambler@phnet.fi>
+// Encoding: UTF-8
+// Distributed under the same terms as the calendar itself.
+
+// full day names
+Calendar._DN = new Array
+("Sunnuntai",
+ "Maanantai",
+ "Tiistai",
+ "Keskiviikko",
+ "Torstai",
+ "Perjantai",
+ "Lauantai",
+ "Sunnuntai");
+
+// short day names
+Calendar._SDN = new Array
+("Su",
+ "Ma",
+ "Ti",
+ "Ke",
+ "To",
+ "Pe",
+ "La",
+ "Su");
+
+// full month names
+Calendar._MN = new Array
+("Tammikuu",
+ "Helmikuu",
+ "Maaliskuu",
+ "Huhtikuu",
+ "Toukokuu",
+ "Kesäkuu",
+ "Heinäkuu",
+ "Elokuu",
+ "Syyskuu",
+ "Lokakuu",
+ "Marraskuu",
+ "Joulukuu");
+
+// short month names
+Calendar._SMN = new Array
+("Tam",
+ "Hel",
+ "Maa",
+ "Huh",
+ "Tou",
+ "Kes",
+ "Hei",
+ "Elo",
+ "Syy",
+ "Lok",
+ "Mar",
+ "Jou");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Tietoja kalenterista";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Uusin versio osoitteessa: http://www.dynarch.com/projects/calendar/\n" +
+"Julkaistu GNU LGPL lisenssin alaisuudessa. Lisätietoja osoitteessa http://gnu.org/licenses/lgpl.html" +
+"\n\n" +
+"Päivämäärä valinta:\n" +
+"- Käytä \xab, \xbb painikkeita valitaksesi vuosi\n" +
+"- Käytä " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " painikkeita valitaksesi kuukausi\n" +
+"- Pitämällä hiiren painiketta minkä tahansa yllä olevan painikkeen kohdalla, saat näkyviin valikon nopeampaan siirtymiseen.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Ajan valinta:\n" +
+"- Klikkaa kellonajan numeroita lisätäksesi aikaa\n" +
+"- tai pitämällä Shift-näppäintä pohjassa saat aikaa taaksepäin\n" +
+"- tai klikkaa ja pidä hiiren painike pohjassa sekä liikuta hiirtä muuttaaksesi aikaa nopeasti eteen- ja taaksepäin.";
+
+Calendar._TT["PREV_YEAR"] = "Edell. vuosi (paina hetki, näet valikon)";
+Calendar._TT["PREV_MONTH"] = "Edell. kuukausi (paina hetki, näet valikon)";
+Calendar._TT["GO_TODAY"] = "Siirry tähän päivään";
+Calendar._TT["NEXT_MONTH"] = "Seur. kuukausi (paina hetki, näet valikon)";
+Calendar._TT["NEXT_YEAR"] = "Seur. vuosi (paina hetki, näet valikon)";
+Calendar._TT["SEL_DATE"] = "Valitse päivämäärä";
+Calendar._TT["DRAG_TO_MOVE"] = "Siirrä kalenterin paikkaa";
+Calendar._TT["PART_TODAY"] = " (tänään)";
+Calendar._TT["MON_FIRST"] = "Näytä maanantai ensimmäisenä";
+Calendar._TT["SUN_FIRST"] = "Näytä sunnuntai ensimmäisenä";
+Calendar._TT["CLOSE"] = "Sulje";
+Calendar._TT["TODAY"] = "Tänään";
+Calendar._TT["TIME_PART"] = "(Shift-) Klikkaa tai liikuta muuttaaksesi aikaa";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%d.%m.%Y";
+
+Calendar._TT["WK"] = "Vko";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-fr.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-fr.js
new file mode 100644
index 00000000..6e011b2e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-fr.js
@@ -0,0 +1,125 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// Translator: David Duret, <pilgrim@mala-template.net> from previous french version
+
+// full day names
+Calendar._DN = new Array
+("Dimanche",
+ "Lundi",
+ "Mardi",
+ "Mercredi",
+ "Jeudi",
+ "Vendredi",
+ "Samedi",
+ "Dimanche");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Dim",
+ "Lun",
+ "Mar",
+ "Mar",
+ "Jeu",
+ "Ven",
+ "Sam",
+ "Dim");
+
+// full month names
+Calendar._MN = new Array
+("Janvier",
+ "Février",
+ "Mars",
+ "Avril",
+ "Mai",
+ "Juin",
+ "Juillet",
+ "Août",
+ "Septembre",
+ "Octobre",
+ "Novembre",
+ "Décembre");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Fev",
+ "Mar",
+ "Avr",
+ "Mai",
+ "Juin",
+ "Juil",
+ "Aout",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "A propos du calendrier";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Heure Selecteur\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Pour la derniere version visitez : http://www.dynarch.com/projects/calendar/\n" +
+"Distribué par GNU LGPL.  Voir http://gnu.org/licenses/lgpl.html pour les details." +
+"\n\n" +
+"Selection de la date :\n" +
+"- Utiliser les bouttons \xab, \xbb  pour selectionner l\'annee\n" +
+"- Utiliser les bouttons " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " pour selectionner les mois\n" +
+"- Garder la souris sur n'importe quels boutons pour une selection plus rapide";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selection de l\'heure :\n" +
+"- Cliquer sur heures ou minutes pour incrementer\n" +
+"- ou Maj-clic pour decrementer\n" +
+"- ou clic et glisser-deplacer pour une selection plus rapide";
+
+Calendar._TT["PREV_YEAR"] = "Année préc. (maintenir pour menu)";
+Calendar._TT["PREV_MONTH"] = "Mois préc. (maintenir pour menu)";
+Calendar._TT["GO_TODAY"] = "Atteindre la date du jour";
+Calendar._TT["NEXT_MONTH"] = "Mois suiv. (maintenir pour menu)";
+Calendar._TT["NEXT_YEAR"] = "Année suiv. (maintenir pour menu)";
+Calendar._TT["SEL_DATE"] = "Sélectionner une date";
+Calendar._TT["DRAG_TO_MOVE"] = "Déplacer";
+Calendar._TT["PART_TODAY"] = " (Aujourd'hui)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Afficher %s en premier";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Fermer";
+Calendar._TT["TODAY"] = "Aujourd'hui";
+Calendar._TT["TIME_PART"] = "(Maj-)Clic ou glisser pour modifier la valeur";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d/%m/%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "Sem.";
+Calendar._TT["TIME"] = "Heure :";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-he-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-he-utf8.js
new file mode 100644
index 00000000..5fb7dd56
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-he-utf8.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Idan Sofer, <idan@idanso.dyndns.org>
+// Encoding: UTF-8
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("ר�שון",
+ "שני",
+ "שלישי",
+ "רביעי",
+ "חמישי",
+ "שישי",
+ "שבת",
+ "ר�שון");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("�",
+ "ב",
+ "×’",
+ "ד",
+ "×”",
+ "ו",
+ "ש",
+ "�");
+
+// full month names
+Calendar._MN = new Array
+("ינו�ר",
+ "פברו�ר",
+ "מרץ",
+ "�פריל",
+ "מ�י",
+ "יוני",
+ "יולי",
+ "�וגוסט",
+ "ספטמבר",
+ "�וקטובר",
+ "נובמבר",
+ "דצמבר");
+
+// short month names
+Calendar._SMN = new Array
+("ינ�",
+ "פבר",
+ "מרץ",
+ "�פר",
+ "מ�י",
+ "יונ",
+ "יול",
+ "�וג",
+ "ספט",
+ "�וק",
+ "נוב",
+ "דצמ");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "�ודות השנתון";
+
+Calendar._TT["ABOUT"] =
+"בחרן ת�ריך/שעה DHTML\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"הגירס� ה�חרונה זמינה ב: http://www.dynarch.com/projects/calendar/\n" +
+"מופץ תחת זיכיון ה GNU LGPL.  עיין ב http://gnu.org/licenses/lgpl.html לפרטי� נוספי�." +
+"\n\n" +
+בחירת ת�ריך:\n" +
+"- השתמש בכפתורי� \xab, \xbb לבחירת שנה\n" +
+"- השתמש בכפתורי� " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " לבחירת חודש\n" +
+"- החזק העכבר לחוץ מעל הכפתורי� המוזכרי� לעיל לבחירה מהירה יותר.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"בחירת זמן:\n" +
+"- לחץ על כל �חד מחלקי הזמן כדי להוסיף\n" +
+"- �ו shift בשילוב ע� לחיצה כדי להחסיר\n" +
+"- �ו לחץ וגרור לפעולה מהירה יותר.";
+
+Calendar._TT["PREV_YEAR"] = "שנה קודמת - החזק לקבלת תפריט";
+Calendar._TT["PREV_MONTH"] = "חודש קוד� - החזק לקבלת תפריט";
+Calendar._TT["GO_TODAY"] = "עבור להיו�";
+Calendar._TT["NEXT_MONTH"] = "חודש הב� - החזק לתפריט";
+Calendar._TT["NEXT_YEAR"] = "שנה הב�ה - החזק לתפריט";
+Calendar._TT["SEL_DATE"] = "בחר ת�ריך";
+Calendar._TT["DRAG_TO_MOVE"] = "גרור להזזה";
+Calendar._TT["PART_TODAY"] = " )היו�(";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "הצג %s קוד�";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "6";
+
+Calendar._TT["CLOSE"] = "סגור";
+Calendar._TT["TODAY"] = "היו�";
+Calendar._TT["TIME_PART"] = "(שיפט-)לחץ וגרור כדי לשנות ערך";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "שעה::";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-hr-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-hr-utf8.js
new file mode 100644
index 00000000..d569cfd9
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-hr-utf8.js
@@ -0,0 +1,49 @@
+/* Croatian language file for the DHTML Calendar version 0.9.2 
+* Author Krunoslav Zubrinic <krunoslav.zubrinic@vip.hr>, June 2003.
+* Feel free to use this script under the terms of the GNU Lesser General
+* Public License, as long as you do not remove or alter this notice.
+*/
+Calendar._DN = new Array
+("Nedjelja",
+ "Ponedjeljak",
+ "Utorak",
+ "Srijeda",
+ "ÄŒetvrtak",
+ "Petak",
+ "Subota",
+ "Nedjelja");
+Calendar._MN = new Array
+("Sije�anj",
+ "Velja�a",
+ "Ožujak",
+ "Travanj",
+ "Svibanj",
+ "Lipanj",
+ "Srpanj",
+ "Kolovoz",
+ "Rujan",
+ "Listopad",
+ "Studeni",
+ "Prosinac");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["TOGGLE"] = "Promjeni dan s kojim po�inje tjedan";
+Calendar._TT["PREV_YEAR"] = "Prethodna godina (dugi pritisak za meni)";
+Calendar._TT["PREV_MONTH"] = "Prethodni mjesec (dugi pritisak za meni)";
+Calendar._TT["GO_TODAY"] = "Idi na tekući dan";
+Calendar._TT["NEXT_MONTH"] = "Slijedeći mjesec (dugi pritisak za meni)";
+Calendar._TT["NEXT_YEAR"] = "Slijedeća godina (dugi pritisak za meni)";
+Calendar._TT["SEL_DATE"] = "Izaberite datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Pritisni i povuci za promjenu pozicije";
+Calendar._TT["PART_TODAY"] = " (today)";
+Calendar._TT["MON_FIRST"] = "Prikaži ponedjeljak kao prvi dan";
+Calendar._TT["SUN_FIRST"] = "Prikaži nedjelju kao prvi dan";
+Calendar._TT["CLOSE"] = "Zatvori";
+Calendar._TT["TODAY"] = "Danas";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "dd-mm-y";
+Calendar._TT["TT_DATE_FORMAT"] = "DD, dd.mm.y";
+
+Calendar._TT["WK"] = "Tje";
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-hr.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-hr.js
new file mode 100644
index 00000000..88d4238b
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-hr.js differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-hu.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-hu.js
new file mode 100644
index 00000000..8c70b7b0
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-hu.js
@@ -0,0 +1,124 @@
+// ** I18N
+
+// Calendar HU language
+// Author: ???
+// Modifier: KARASZI Istvan, <jscalendar@spam.raszi.hu>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Vasárnap",
+ "Hétfõ",
+ "Kedd",
+ "Szerda",
+ "Csütörtök",
+ "Péntek",
+ "Szombat",
+ "Vasárnap");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("v",
+ "h",
+ "k",
+ "sze",
+ "cs",
+ "p",
+ "szo",
+ "v");
+
+// full month names
+Calendar._MN = new Array
+("január",
+ "február",
+ "március",
+ "április",
+ "május",
+ "június",
+ "július",
+ "augusztus",
+ "szeptember",
+ "október",
+ "november",
+ "december");
+
+// short month names
+Calendar._SMN = new Array
+("jan",
+ "feb",
+ "már",
+ "ápr",
+ "máj",
+ "jún",
+ "júl",
+ "aug",
+ "sze",
+ "okt",
+ "nov",
+ "dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "A kalendáriumról";
+
+Calendar._TT["ABOUT"] =
+"DHTML dátum/idõ kiválasztó\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"a legfrissebb verzió megtalálható: http://www.dynarch.com/projects/calendar/\n" +
+"GNU LGPL alatt terjesztve.  Lásd a http://gnu.org/licenses/lgpl.html oldalt a részletekhez." +
+"\n\n" +
+"Dátum választás:\n" +
+"- használja a \xab, \xbb gombokat az év kiválasztásához\n" +
+"- használja a " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " gombokat a hónap kiválasztásához\n" +
+"- tartsa lenyomva az egérgombot a gyors választáshoz.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Idõ választás:\n" +
+"- kattintva növelheti az idõt\n" +
+"- shift-tel kattintva csökkentheti\n" +
+"- lenyomva tartva és húzva gyorsabban kiválaszthatja.";
+
+Calendar._TT["PREV_YEAR"] = "Elõzõ év (tartsa nyomva a menühöz)";
+Calendar._TT["PREV_MONTH"] = "Elõzõ hónap (tartsa nyomva a menühöz)";
+Calendar._TT["GO_TODAY"] = "Mai napra ugrás";
+Calendar._TT["NEXT_MONTH"] = "Köv. hónap (tartsa nyomva a menühöz)";
+Calendar._TT["NEXT_YEAR"] = "Köv. év (tartsa nyomva a menühöz)";
+Calendar._TT["SEL_DATE"] = "Válasszon dátumot";
+Calendar._TT["DRAG_TO_MOVE"] = "Húzza a mozgatáshoz";
+Calendar._TT["PART_TODAY"] = " (ma)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "%s legyen a hét elsõ napja";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Bezár";
+Calendar._TT["TODAY"] = "Ma";
+Calendar._TT["TIME_PART"] = "(Shift-)Klikk vagy húzás az érték változtatásához";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%b %e, %a";
+
+Calendar._TT["WK"] = "hét";
+Calendar._TT["TIME"] = "idõ:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-it.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-it.js
new file mode 100644
index 00000000..f622c1d3
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-it.js
@@ -0,0 +1,124 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Translator: Fabio Di Bernardini, <altraqua@email.it>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Domenica",
+ "Lunedì",
+ "Martedì",
+ "Mercoledì",
+ "Giovedì",
+ "Venerdì",
+ "Sabato",
+ "Domenica");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Dom",
+ "Lun",
+ "Mar",
+ "Mer",
+ "Gio",
+ "Ven",
+ "Sab",
+ "Dom");
+
+// full month names
+Calendar._MN = new Array
+("Gennaio",
+ "Febbraio",
+ "Marzo",
+ "Aprile",
+ "Maggio",
+ "Giugno",
+ "Luglio",
+ "Augosto",
+ "Settembre",
+ "Ottobre",
+ "Novembre",
+ "Dicembre");
+
+// short month names
+Calendar._SMN = new Array
+("Gen",
+ "Feb",
+ "Mar",
+ "Apr",
+ "Mag",
+ "Giu",
+ "Lug",
+ "Ago",
+ "Set",
+ "Ott",
+ "Nov",
+ "Dic");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Informazioni sul calendario";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Per gli aggiornamenti: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuito sotto licenza GNU LGPL.  Vedi http://gnu.org/licenses/lgpl.html per i dettagli." +
+"\n\n" +
+"Selezione data:\n" +
+"- Usa \xab, \xbb per selezionare l'anno\n" +
+"- Usa  " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " per i mesi\n" +
+"- Tieni premuto a lungo il mouse per accedere alle funzioni di selezione veloce.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selezione orario:\n" +
+"- Clicca sul numero per incrementarlo\n" +
+"- o Shift+click per decrementarlo\n" +
+"- o click e sinistra o destra per variarlo.";
+
+Calendar._TT["PREV_YEAR"] = "Anno prec.(clicca a lungo per il menù)";
+Calendar._TT["PREV_MONTH"] = "Mese prec. (clicca a lungo per il menù)";
+Calendar._TT["GO_TODAY"] = "Oggi";
+Calendar._TT["NEXT_MONTH"] = "Pross. mese (clicca a lungo per il menù)";
+Calendar._TT["NEXT_YEAR"] = "Pross. anno (clicca a lungo per il menù)";
+Calendar._TT["SEL_DATE"] = "Seleziona data";
+Calendar._TT["DRAG_TO_MOVE"] = "Trascina per spostarlo";
+Calendar._TT["PART_TODAY"] = " (oggi)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Mostra prima %s";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Chiudi";
+Calendar._TT["TODAY"] = "Oggi";
+Calendar._TT["TIME_PART"] = "(Shift-)Click o trascina per cambiare il valore";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d-%m-%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a:%b:%e";
+
+Calendar._TT["WK"] = "set";
+Calendar._TT["TIME"] = "Ora:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-jp.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-jp.js
new file mode 100644
index 00000000..b86f0da3
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-jp.js
@@ -0,0 +1,45 @@
+// ** I18N
+Calendar._DN = new Array
+("“ú",
+ "ŒŽ",
+ "‰Î",
+ "�…",
+ "–Ø",
+ "‹à",
+ "“y",
+ "“ú");
+Calendar._MN = new Array
+("1ŒŽ",
+ "2ŒŽ",
+ "3ŒŽ",
+ "4ŒŽ",
+ "5ŒŽ",
+ "6ŒŽ",
+ "7ŒŽ",
+ "8ŒŽ",
+ "9ŒŽ",
+ "10ŒŽ",
+ "11ŒŽ",
+ "12ŒŽ");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["TOGGLE"] = "�T‚Ì�Å�‰‚Ì—j“ú‚ð�Ø‚è‘Ö‚¦";
+Calendar._TT["PREV_YEAR"] = "‘O”N";
+Calendar._TT["PREV_MONTH"] = "‘OŒŽ";
+Calendar._TT["GO_TODAY"] = "�¡“ú";
+Calendar._TT["NEXT_MONTH"] = "—‚ŒŽ";
+Calendar._TT["NEXT_YEAR"] = "—‚”N";
+Calendar._TT["SEL_DATE"] = "“ú•t‘I‘ð";
+Calendar._TT["DRAG_TO_MOVE"] = "ƒEƒBƒ“ƒhƒE‚̈ړ®";
+Calendar._TT["PART_TODAY"] = " (�¡“ú)";
+Calendar._TT["MON_FIRST"] = "ŒŽ—j“ú‚ð�擪‚É";
+Calendar._TT["SUN_FIRST"] = "“ú—j“ú‚ð�擪‚É";
+Calendar._TT["CLOSE"] = "•Â‚¶‚é";
+Calendar._TT["TODAY"] = "�¡“ú";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "y-mm-dd";
+Calendar._TT["TT_DATE_FORMAT"] = "%mŒŽ %d“ú (%a)";
+
+Calendar._TT["WK"] = "�T";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ko-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ko-utf8.js
new file mode 100644
index 00000000..cdbc1caf
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ko-utf8.js
@@ -0,0 +1,120 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Translation: Yourim Yi <yyi@yourim.net>
+// Encoding: EUC-KR
+// lang : ko
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+
+Calendar._DN = new Array
+("�요�",
+ "월요�",
+ "화요�",
+ "수요�",
+ "목요�",
+ "금요�",
+ "토요�",
+ "�요�");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("�",
+ "ì›”",
+ "í™”",
+ "수",
+ "목",
+ "금",
+ "토",
+ "�");
+
+// full month names
+Calendar._MN = new Array
+("1ì›”",
+ "2ì›”",
+ "3ì›”",
+ "4ì›”",
+ "5ì›”",
+ "6ì›”",
+ "7ì›”",
+ "8ì›”",
+ "9ì›”",
+ "10ì›”",
+ "11ì›”",
+ "12ì›”");
+
+// short month names
+Calendar._SMN = new Array
+("1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "calendar � 대해서";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"\n"+
+"최신 버전� 받으시려면 http://www.dynarch.com/projects/calendar/ � 방문하세요\n" +
+"\n"+
+"GNU LGPL ��센스로 배��니다. \n"+
+"��센스� 대한 �세한 내용� http://gnu.org/licenses/lgpl.html � �으세요." +
+"\n\n" +
+"날짜 선�:\n" +
+"- 연�를 선�하려면 \xab, \xbb 버튼� 사용합니다\n" +
+"- 달� 선�하려면 " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " 버튼� 누르세요\n" +
+"- 계� 누르고 있으면 위 값들� 빠르게 선�하실 수 있습니다.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"시간 선�:\n" +
+"- 마우스로 누르면 시간� �가합니다\n" +
+"- Shift 키와 함께 누르면 �소합니다\n" +
+"- 누른 �태�서 마우스를 움��면 좀 � 빠르게 값� 변합니다.\n";
+
+Calendar._TT["PREV_YEAR"] = "지난 해 (길게 누르면 목�)";
+Calendar._TT["PREV_MONTH"] = "지난 달 (길게 누르면 목�)";
+Calendar._TT["GO_TODAY"] = "오늘 날짜로";
+Calendar._TT["NEXT_MONTH"] = "다� 달 (길게 누르면 목�)";
+Calendar._TT["NEXT_YEAR"] = "다� 해 (길게 누르면 목�)";
+Calendar._TT["SEL_DATE"] = "날짜를 선�하세요";
+Calendar._TT["DRAG_TO_MOVE"] = "마우스 드래그로 �� 하세요";
+Calendar._TT["PART_TODAY"] = " (오늘)";
+Calendar._TT["MON_FIRST"] = "월요�� 한 주� 시작 요�로";
+Calendar._TT["SUN_FIRST"] = "�요�� 한 주� 시작 요�로";
+Calendar._TT["CLOSE"] = "닫기";
+Calendar._TT["TODAY"] = "오늘";
+Calendar._TT["TIME_PART"] = "(Shift-)�릭 �는 드래그 하세요";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%b/%e [%a]";
+
+Calendar._TT["WK"] = "주";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ko.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ko.js
new file mode 100644
index 00000000..dc1da4bb
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ko.js
@@ -0,0 +1,120 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Translation: Yourim Yi <yyi@yourim.net>
+// Encoding: EUC-KR
+// lang : ko
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+
+Calendar._DN = new Array
+("ÀÏ¿äÀÏ",
+ "¿ù¿äÀÏ",
+ "È­¿äÀÏ",
+ "¼ö¿äÀÏ",
+ "¸ñ¿äÀÏ",
+ "±Ý¿äÀÏ",
+ "Åä¿äÀÏ",
+ "ÀÏ¿äÀÏ");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("ÀÏ",
+ "¿ù",
+ "È­",
+ "¼ö",
+ "¸ñ",
+ "±Ý",
+ "Åä",
+ "ÀÏ");
+
+// full month names
+Calendar._MN = new Array
+("1¿ù",
+ "2¿ù",
+ "3¿ù",
+ "4¿ù",
+ "5¿ù",
+ "6¿ù",
+ "7¿ù",
+ "8¿ù",
+ "9¿ù",
+ "10¿ù",
+ "11¿ù",
+ "12¿ù");
+
+// short month names
+Calendar._SMN = new Array
+("1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "calendar ¿¡ ´ëÇؼ­";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"\n"+
+"ÃֽŠ¹öÀüÀ» ¹ÞÀ¸½Ã·Á¸é http://www.dynarch.com/projects/calendar/ ¿¡ ¹æ¹®Çϼ¼¿ä\n" +
+"\n"+
+"GNU LGPL ¶óÀ̼¾½º·Î ¹èÆ÷µË´Ï´Ù. \n"+
+"¶óÀ̼¾½º¿¡ ´ëÇÑ ÀÚ¼¼ÇÑ ³»¿ëÀº http://gnu.org/licenses/lgpl.html À» ÀÐÀ¸¼¼¿ä." +
+"\n\n" +
+"³¯Â¥ ¼±ÅÃ:\n" +
+"- ¿¬µµ¸¦ ¼±ÅÃÇÏ·Á¸é \xab, \xbb ¹öÆ°À» »ç¿ëÇÕ´Ï´Ù\n" +
+"- ´ÞÀ» ¼±ÅÃÇÏ·Á¸é " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " ¹öÆ°À» ´©¸£¼¼¿ä\n" +
+"- °è¼Ó ´©¸£°í ÀÖÀ¸¸é À§ °ªµéÀ» ºü¸£°Ô ¼±ÅÃÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"½Ã°£ ¼±ÅÃ:\n" +
+"- ¸¶¿ì½º·Î ´©¸£¸é ½Ã°£ÀÌ Áõ°¡ÇÕ´Ï´Ù\n" +
+"- Shift Å°¿Í ÇÔ²² ´©¸£¸é °¨¼ÒÇÕ´Ï´Ù\n" +
+"- ´©¸¥ »óÅ¿¡¼­ ¸¶¿ì½º¸¦ ¿òÁ÷À̸é Á» ´õ ºü¸£°Ô °ªÀÌ º¯ÇÕ´Ï´Ù.\n";
+
+Calendar._TT["PREV_YEAR"] = "Áö³­ ÇØ (±æ°Ô ´©¸£¸é ¸ñ·Ï)";
+Calendar._TT["PREV_MONTH"] = "Áö³­ ´Þ (±æ°Ô ´©¸£¸é ¸ñ·Ï)";
+Calendar._TT["GO_TODAY"] = "¿À´Ã ³¯Â¥·Î";
+Calendar._TT["NEXT_MONTH"] = "´ÙÀ½ ´Þ (±æ°Ô ´©¸£¸é ¸ñ·Ï)";
+Calendar._TT["NEXT_YEAR"] = "´ÙÀ½ ÇØ (±æ°Ô ´©¸£¸é ¸ñ·Ï)";
+Calendar._TT["SEL_DATE"] = "³¯Â¥¸¦ ¼±ÅÃÇϼ¼¿ä";
+Calendar._TT["DRAG_TO_MOVE"] = "¸¶¿ì½º µå·¡±×·Î À̵¿ Çϼ¼¿ä";
+Calendar._TT["PART_TODAY"] = " (¿À´Ã)";
+Calendar._TT["MON_FIRST"] = "¿ù¿äÀÏÀ» ÇÑ ÁÖÀÇ ½ÃÀÛ ¿äÀÏ·Î";
+Calendar._TT["SUN_FIRST"] = "ÀÏ¿äÀÏÀ» ÇÑ ÁÖÀÇ ½ÃÀÛ ¿äÀÏ·Î";
+Calendar._TT["CLOSE"] = "´Ý±â";
+Calendar._TT["TODAY"] = "¿À´Ã";
+Calendar._TT["TIME_PART"] = "(Shift-)Ŭ¸¯ ¶Ç´Â µå·¡±× Çϼ¼¿ä";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%b/%e [%a]";
+
+Calendar._TT["WK"] = "ÁÖ";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-lt-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-lt-utf8.js
new file mode 100644
index 00000000..964865de
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-lt-utf8.js
@@ -0,0 +1,114 @@
+// ** I18N
+
+// Calendar LT language
+// Author: Martynas Majeris, <martynas@solmetra.lt>
+// Encoding: UTF-8
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sekmadienis",
+ "Pirmadienis",
+ "Antradienis",
+ "Tre�iadienis",
+ "Ketvirtadienis",
+ "Pentadienis",
+ "Šeštadienis",
+ "Sekmadienis");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sek",
+ "Pir",
+ "Ant",
+ "Tre",
+ "Ket",
+ "Pen",
+ "Šeš",
+ "Sek");
+
+// full month names
+Calendar._MN = new Array
+("Sausis",
+ "Vasaris",
+ "Kovas",
+ "Balandis",
+ "Gegužė",
+ "Birželis",
+ "Liepa",
+ "Rugpjūtis",
+ "RugsÄ—jis",
+ "Spalis",
+ "Lapkritis",
+ "Gruodis");
+
+// short month names
+Calendar._SMN = new Array
+("Sau",
+ "Vas",
+ "Kov",
+ "Bal",
+ "Geg",
+ "Bir",
+ "Lie",
+ "Rgp",
+ "Rgs",
+ "Spa",
+ "Lap",
+ "Gru");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Apie kalendorių";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"NaujausiÄ… versijÄ… rasite: http://www.dynarch.com/projects/calendar/\n" +
+"Platinamas pagal GNU LGPL licencijÄ…. Aplankykite http://gnu.org/licenses/lgpl.html" +
+"\n\n" +
+"Datos pasirinkimas:\n" +
+"- Metų pasirinkimas: \xab, \xbb\n" +
+"- MÄ—nesio pasirinkimas: " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + "\n" +
+"- Nuspauskite ir laikykite pelės klavišą greitesniam pasirinkimui.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Laiko pasirinkimas:\n" +
+"- Spustelkite ant valandų arba minu�ių - skai�ius padidės vienetu.\n" +
+"- Jei spausite kartu su Shift, skai�ius sumažės.\n" +
+"- Greitam pasirinkimui spustelkite ir pajudinkite pelÄ™.";
+
+Calendar._TT["PREV_YEAR"] = "Ankstesni metai (laikykite, jei norite meniu)";
+Calendar._TT["PREV_MONTH"] = "Ankstesnis mÄ—nuo (laikykite, jei norite meniu)";
+Calendar._TT["GO_TODAY"] = "Pasirinkti Å¡iandienÄ…";
+Calendar._TT["NEXT_MONTH"] = "Kitas mÄ—nuo (laikykite, jei norite meniu)";
+Calendar._TT["NEXT_YEAR"] = "Kiti metai (laikykite, jei norite meniu)";
+Calendar._TT["SEL_DATE"] = "Pasirinkite datÄ…";
+Calendar._TT["DRAG_TO_MOVE"] = "Tempkite";
+Calendar._TT["PART_TODAY"] = " (Å¡iandien)";
+Calendar._TT["MON_FIRST"] = "Pirma savaitÄ—s diena - pirmadienis";
+Calendar._TT["SUN_FIRST"] = "Pirma savaitÄ—s diena - sekmadienis";
+Calendar._TT["CLOSE"] = "Uždaryti";
+Calendar._TT["TODAY"] = "Å iandien";
+Calendar._TT["TIME_PART"] = "Spustelkite arba tempkite jei norite pakeisti";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%A, %Y-%m-%d";
+
+Calendar._TT["WK"] = "sav";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-lt.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-lt.js
new file mode 100644
index 00000000..059cdf4f
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-lt.js
@@ -0,0 +1,114 @@
+// ** I18N
+
+// Calendar LT language
+// Author: Martynas Majeris, <martynas@solmetra.lt>
+// Encoding: Windows-1257
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sekmadienis",
+ "Pirmadienis",
+ "Antradienis",
+ "Treèiadienis",
+ "Ketvirtadienis",
+ "Pentadienis",
+ "Ðeðtadienis",
+ "Sekmadienis");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sek",
+ "Pir",
+ "Ant",
+ "Tre",
+ "Ket",
+ "Pen",
+ "Ðeð",
+ "Sek");
+
+// full month names
+Calendar._MN = new Array
+("Sausis",
+ "Vasaris",
+ "Kovas",
+ "Balandis",
+ "Geguþë",
+ "Birþelis",
+ "Liepa",
+ "Rugpjûtis",
+ "Rugsëjis",
+ "Spalis",
+ "Lapkritis",
+ "Gruodis");
+
+// short month names
+Calendar._SMN = new Array
+("Sau",
+ "Vas",
+ "Kov",
+ "Bal",
+ "Geg",
+ "Bir",
+ "Lie",
+ "Rgp",
+ "Rgs",
+ "Spa",
+ "Lap",
+ "Gru");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Apie kalendoriø";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Naujausià versijà rasite: http://www.dynarch.com/projects/calendar/\n" +
+"Platinamas pagal GNU LGPL licencijà. Aplankykite http://gnu.org/licenses/lgpl.html" +
+"\n\n" +
+"Datos pasirinkimas:\n" +
+"- Metø pasirinkimas: \xab, \xbb\n" +
+"- Mënesio pasirinkimas: " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + "\n" +
+"- Nuspauskite ir laikykite pelës klaviðà greitesniam pasirinkimui.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Laiko pasirinkimas:\n" +
+"- Spustelkite ant valandø arba minuèiø - skaièus padidës vienetu.\n" +
+"- Jei spausite kartu su Shift, skaièius sumaþës.\n" +
+"- Greitam pasirinkimui spustelkite ir pajudinkite pelæ.";
+
+Calendar._TT["PREV_YEAR"] = "Ankstesni metai (laikykite, jei norite meniu)";
+Calendar._TT["PREV_MONTH"] = "Ankstesnis mënuo (laikykite, jei norite meniu)";
+Calendar._TT["GO_TODAY"] = "Pasirinkti ðiandienà";
+Calendar._TT["NEXT_MONTH"] = "Kitas mënuo (laikykite, jei norite meniu)";
+Calendar._TT["NEXT_YEAR"] = "Kiti metai (laikykite, jei norite meniu)";
+Calendar._TT["SEL_DATE"] = "Pasirinkite datà";
+Calendar._TT["DRAG_TO_MOVE"] = "Tempkite";
+Calendar._TT["PART_TODAY"] = " (ðiandien)";
+Calendar._TT["MON_FIRST"] = "Pirma savaitës diena - pirmadienis";
+Calendar._TT["SUN_FIRST"] = "Pirma savaitës diena - sekmadienis";
+Calendar._TT["CLOSE"] = "Uþdaryti";
+Calendar._TT["TODAY"] = "Ðiandien";
+Calendar._TT["TIME_PART"] = "Spustelkite arba tempkite jei norite pakeisti";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%A, %Y-%m-%d";
+
+Calendar._TT["WK"] = "sav";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-lv.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-lv.js
new file mode 100644
index 00000000..4cb5a138
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-lv.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar LV language
+// Author: Juris Valdovskis, <juris@dc.lv>
+// Encoding: cp1257
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Svçtdiena",
+ "Pirmdiena",
+ "Otrdiena",
+ "Treðdiena",
+ "Ceturdiena",
+ "Piektdiena",
+ "Sestdiena",
+ "Svçtdiena");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sv",
+ "Pr",
+ "Ot",
+ "Tr",
+ "Ce",
+ "Pk",
+ "Se",
+ "Sv");
+
+// full month names
+Calendar._MN = new Array
+("Janvâris",
+ "Februâris",
+ "Marts",
+ "Aprîlis",
+ "Maijs",
+ "Jûnijs",
+ "Jûlijs",
+ "Augusts",
+ "Septembris",
+ "Oktobris",
+ "Novembris",
+ "Decembris");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "Mai",
+ "Jûn",
+ "Jûl",
+ "Aug",
+ "Sep",
+ "Okt",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Par kalendâru";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Datuma izvçle:\n" +
+"- Izmanto \xab, \xbb pogas, lai izvçlçtos gadu\n" +
+"- Izmanto " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + "pogas, lai izvçlçtos mçnesi\n" +
+"- Turi nospiestu peles pogu uz jebkuru no augstâk minçtajâm pogâm, lai paâtrinâtu izvçli.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Laika izvçle:\n" +
+"- Uzklikðíini uz jebkuru no laika daïâm, lai palielinâtu to\n" +
+"- vai Shift-klikðíis, lai samazinâtu to\n" +
+"- vai noklikðíini un velc uz attiecîgo virzienu lai mainîtu âtrâk.";
+
+Calendar._TT["PREV_YEAR"] = "Iepr. gads (turi izvçlnei)";
+Calendar._TT["PREV_MONTH"] = "Iepr. mçnesis (turi izvçlnei)";
+Calendar._TT["GO_TODAY"] = "Ðodien";
+Calendar._TT["NEXT_MONTH"] = "Nâkoðais mçnesis (turi izvçlnei)";
+Calendar._TT["NEXT_YEAR"] = "Nâkoðais gads (turi izvçlnei)";
+Calendar._TT["SEL_DATE"] = "Izvçlies datumu";
+Calendar._TT["DRAG_TO_MOVE"] = "Velc, lai pârvietotu";
+Calendar._TT["PART_TODAY"] = " (ðodien)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Attçlot %s kâ pirmo";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "1,7";
+
+Calendar._TT["CLOSE"] = "Aizvçrt";
+Calendar._TT["TODAY"] = "Ðodien";
+Calendar._TT["TIME_PART"] = "(Shift-)Klikðíis vai pârvieto, lai mainîtu";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d-%m-%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %e %b";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Laiks:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-nl.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-nl.js
new file mode 100644
index 00000000..9915f6a7
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-nl.js
@@ -0,0 +1,73 @@
+// ** I18N
+Calendar._DN = new Array
+("Zondag",
+ "Maandag",
+ "Dinsdag",
+ "Woensdag",
+ "Donderdag",
+ "Vrijdag",
+ "Zaterdag",
+ "Zondag");
+
+Calendar._SDN_len = 2;
+
+Calendar._MN = new Array
+("Januari",
+ "Februari",
+ "Maart",
+ "April",
+ "Mei",
+ "Juni",
+ "Juli",
+ "Augustus",
+ "September",
+ "Oktober",
+ "November",
+ "December");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Info";
+
+Calendar._TT["ABOUT"] =
+"DHTML Datum/Tijd Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" +
+"Ga voor de meest recente versie naar: http://www.dynarch.com/projects/calendar/\n" +
+"Verspreid onder de GNU LGPL. Zie http://gnu.org/licenses/lgpl.html voor details." +
+"\n\n" +
+"Datum selectie:\n" +
+"- Gebruik de \xab \xbb knoppen om een jaar te selecteren\n" +
+"- Gebruik de " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " knoppen om een maand te selecteren\n" +
+"- Houd de muis ingedrukt op de genoemde knoppen voor een snellere selectie.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Tijd selectie:\n" +
+"- Klik op een willekeurig onderdeel van het tijd gedeelte om het te verhogen\n" +
+"- of Shift-klik om het te verlagen\n" +
+"- of klik en sleep voor een snellere selectie.";
+
+//Calendar._TT["TOGGLE"] = "Selecteer de eerste week-dag";
+Calendar._TT["PREV_YEAR"] = "Vorig jaar (ingedrukt voor menu)";
+Calendar._TT["PREV_MONTH"] = "Vorige maand (ingedrukt voor menu)";
+Calendar._TT["GO_TODAY"] = "Ga naar Vandaag";
+Calendar._TT["NEXT_MONTH"] = "Volgende maand (ingedrukt voor menu)";
+Calendar._TT["NEXT_YEAR"] = "Volgend jaar (ingedrukt voor menu)";
+Calendar._TT["SEL_DATE"] = "Selecteer datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Klik en sleep om te verplaatsen";
+Calendar._TT["PART_TODAY"] = " (vandaag)";
+//Calendar._TT["MON_FIRST"] = "Toon Maandag eerst";
+//Calendar._TT["SUN_FIRST"] = "Toon Zondag eerst";
+
+Calendar._TT["DAY_FIRST"] = "Toon %s eerst";
+
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Sluiten";
+Calendar._TT["TODAY"] = "(vandaag)";
+Calendar._TT["TIME_PART"] = "(Shift-)Klik of sleep om de waarde te veranderen";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d-%m-%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %e %b %Y";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Tijd:";
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-no.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-no.js
new file mode 100644
index 00000000..0bb97d73
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-no.js
@@ -0,0 +1,114 @@
+// ** I18N
+
+// Calendar NO language
+// Author: Daniel Holmen, <daniel.holmen@ciber.no>
+// Encoding: UTF-8
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Søndag",
+ "Mandag",
+ "Tirsdag",
+ "Onsdag",
+ "Torsdag",
+ "Fredag",
+ "Lørdag",
+ "Søndag");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Søn",
+ "Man",
+ "Tir",
+ "Ons",
+ "Tor",
+ "Fre",
+ "Lør",
+ "Søn");
+
+// full month names
+Calendar._MN = new Array
+("Januar",
+ "Februar",
+ "Mars",
+ "April",
+ "Mai",
+ "Juni",
+ "Juli",
+ "August",
+ "September",
+ "Oktober",
+ "November",
+ "Desember");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "Mai",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Okt",
+ "Nov",
+ "Des");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Om kalenderen";
+
+Calendar._TT["ABOUT"] =
+"DHTML Dato-/Tidsvelger\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For nyeste versjon, gå til: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuert under GNU LGPL.  Se http://gnu.org/licenses/lgpl.html for detaljer." +
+"\n\n" +
+"Datovalg:\n" +
+"- Bruk knappene \xab og \xbb for å velge år\n" +
+"- Bruk knappene " + String.fromCharCode(0x2039) + " og " + String.fromCharCode(0x203a) + " for å velge måned\n" +
+"- Hold inne musknappen eller knappene over for raskere valg.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Tidsvalg:\n" +
+"- Klikk på en av tidsdelene for å øke den\n" +
+"- eller Shift-klikk for å senke verdien\n" +
+"- eller klikk-og-dra for raskere valg..";
+
+Calendar._TT["PREV_YEAR"] = "Forrige. år (hold for meny)";
+Calendar._TT["PREV_MONTH"] = "Forrige. måned (hold for meny)";
+Calendar._TT["GO_TODAY"] = "GÃ¥ til idag";
+Calendar._TT["NEXT_MONTH"] = "Neste måned (hold for meny)";
+Calendar._TT["NEXT_YEAR"] = "Neste år (hold for meny)";
+Calendar._TT["SEL_DATE"] = "Velg dato";
+Calendar._TT["DRAG_TO_MOVE"] = "Dra for å flytte";
+Calendar._TT["PART_TODAY"] = " (idag)";
+Calendar._TT["MON_FIRST"] = "Vis mandag først";
+Calendar._TT["SUN_FIRST"] = "Vis søndag først";
+Calendar._TT["CLOSE"] = "Lukk";
+Calendar._TT["TODAY"] = "Idag";
+Calendar._TT["TIME_PART"] = "(Shift-)Klikk eller dra for å endre verdi";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "uke";
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-pl-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-pl-utf8.js
new file mode 100644
index 00000000..b438a175
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-pl-utf8.js
@@ -0,0 +1,93 @@
+// ** I18N
+
+// Calendar PL language
+// Author: Dariusz Pietrzak, <eyck@ghost.anime.pl>
+// Author: Janusz Piwowarski, <jpiw@go2.pl>
+// Encoding: utf-8
+// Distributed under the same terms as the calendar itself.
+
+Calendar._DN = new Array
+("Niedziela",
+ "Poniedziałek",
+ "Wtorek",
+ "Åšroda",
+ "Czwartek",
+ "PiÄ…tek",
+ "Sobota",
+ "Niedziela");
+Calendar._SDN = new Array
+("Nie",
+ "Pn",
+ "Wt",
+ "Åšr",
+ "Cz",
+ "Pt",
+ "So",
+ "Nie");
+Calendar._MN = new Array
+("Styczeń",
+ "Luty",
+ "Marzec",
+ "Kwiecień",
+ "Maj",
+ "Czerwiec",
+ "Lipiec",
+ "Sierpień",
+ "Wrzesień",
+ "Październik",
+ "Listopad",
+ "Grudzień");
+Calendar._SMN = new Array
+("Sty",
+ "Lut",
+ "Mar",
+ "Kwi",
+ "Maj",
+ "Cze",
+ "Lip",
+ "Sie",
+ "Wrz",
+ "Paź",
+ "Lis",
+ "Gru");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O kalendarzu";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Aby pobrać najnowszą wersję, odwiedź: http://www.dynarch.com/projects/calendar/\n" +
+"Dostępny na licencji GNU LGPL. Zobacz szczegóły na http://gnu.org/licenses/lgpl.html." +
+"\n\n" +
+"Wybór daty:\n" +
+"- Użyj przycisków \xab, \xbb by wybrać rok\n" +
+"- Użyj przycisków " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " by wybrać miesiąc\n" +
+"- Przytrzymaj klawisz myszy nad jednym z powyższych przycisków dla szybszego wyboru.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Wybór czasu:\n" +
+"- Kliknij na jednym z pól czasu by zwiększyć jego wartość\n" +
+"- lub kliknij trzymając Shift by zmiejszyć jego wartość\n" +
+"- lub kliknij i przeciÄ…gnij dla szybszego wyboru.";
+
+//Calendar._TT["TOGGLE"] = "Zmień pierwszy dzień tygodnia";
+Calendar._TT["PREV_YEAR"] = "Poprzedni rok (przytrzymaj dla menu)";
+Calendar._TT["PREV_MONTH"] = "Poprzedni miesiÄ…c (przytrzymaj dla menu)";
+Calendar._TT["GO_TODAY"] = "Idź do dzisiaj";
+Calendar._TT["NEXT_MONTH"] = "Następny miesiąc (przytrzymaj dla menu)";
+Calendar._TT["NEXT_YEAR"] = "Następny rok (przytrzymaj dla menu)";
+Calendar._TT["SEL_DATE"] = "Wybierz datÄ™";
+Calendar._TT["DRAG_TO_MOVE"] = "Przeciągnij by przesunąć";
+Calendar._TT["PART_TODAY"] = " (dzisiaj)";
+Calendar._TT["MON_FIRST"] = "Wyświetl poniedziałek jako pierwszy";
+Calendar._TT["SUN_FIRST"] = "Wyświetl niedzielę jako pierwszą";
+Calendar._TT["CLOSE"] = "Zamknij";
+Calendar._TT["TODAY"] = "Dzisiaj";
+Calendar._TT["TIME_PART"] = "(Shift-)Kliknij lub przeciągnij by zmienić wartość";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%e %B, %A";
+
+Calendar._TT["WK"] = "ty";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-pl.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-pl.js
new file mode 100644
index 00000000..86c7b39e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-pl.js
@@ -0,0 +1,56 @@
+// ** I18N
+// Calendar PL language
+// Author: Artur Filipiak, <imagen@poczta.fm>
+// January, 2004
+// Encoding: UTF-8
+Calendar._DN = new Array
+("Niedziela", "Poniedziałek", "Wtorek", "Środa", "Czwartek", "Piątek", "Sobota", "Niedziela");
+
+Calendar._SDN = new Array
+("N", "Pn", "Wt", "Åšr", "Cz", "Pt", "So", "N");
+
+Calendar._MN = new Array
+("Styczeń", "Luty", "Marzec", "Kwiecień", "Maj", "Czerwiec", "Lipiec", "Sierpień", "Wrzesień", "Październik", "Listopad", "Grudzień");
+
+Calendar._SMN = new Array
+("Sty", "Lut", "Mar", "Kwi", "Maj", "Cze", "Lip", "Sie", "Wrz", "Paź", "Lis", "Gru");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O kalendarzu";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Wybór daty:\n" +
+"- aby wybrać rok użyj przycisków \xab, \xbb\n" +
+"- aby wybrać miesiąc użyj przycisków " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + "\n" +
+"- aby przyspieszyć wybór przytrzymaj wciśnięty przycisk myszy nad ww. przyciskami.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Wybór czasu:\n" +
+"- aby zwiększyć wartość kliknij na dowolnym elemencie selekcji czasu\n" +
+"- aby zmniejszyć wartość użyj dodatkowo klawisza Shift\n" +
+"- możesz również poruszać myszkę w lewo i prawo wraz z wciśniętym lewym klawiszem.";
+
+Calendar._TT["PREV_YEAR"] = "Poprz. rok (przytrzymaj dla menu)";
+Calendar._TT["PREV_MONTH"] = "Poprz. miesiÄ…c (przytrzymaj dla menu)";
+Calendar._TT["GO_TODAY"] = "Pokaż dziś";
+Calendar._TT["NEXT_MONTH"] = "Nast. miesiÄ…c (przytrzymaj dla menu)";
+Calendar._TT["NEXT_YEAR"] = "Nast. rok (przytrzymaj dla menu)";
+Calendar._TT["SEL_DATE"] = "Wybierz datÄ™";
+Calendar._TT["DRAG_TO_MOVE"] = "Przesuń okienko";
+Calendar._TT["PART_TODAY"] = " (dziÅ›)";
+Calendar._TT["MON_FIRST"] = "Pokaż Poniedziałek jako pierwszy";
+Calendar._TT["SUN_FIRST"] = "Pokaż Niedzielę jako pierwszą";
+Calendar._TT["CLOSE"] = "Zamknij";
+Calendar._TT["TODAY"] = "DziÅ›";
+Calendar._TT["TIME_PART"] = "(Shift-)klik | drag, aby zmienić wartość";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y.%m.%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-pt.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-pt.js
new file mode 100644
index 00000000..f7dfbfff
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-pt.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar pt_BR language
+// Author: Adalberto Machado, <betosm@terra.com.br>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Domingo",
+ "Segunda",
+ "Terca",
+ "Quarta",
+ "Quinta",
+ "Sexta",
+ "Sabado",
+ "Domingo");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Dom",
+ "Seg",
+ "Ter",
+ "Qua",
+ "Qui",
+ "Sex",
+ "Sab",
+ "Dom");
+
+// full month names
+Calendar._MN = new Array
+("Janeiro",
+ "Fevereiro",
+ "Marco",
+ "Abril",
+ "Maio",
+ "Junho",
+ "Julho",
+ "Agosto",
+ "Setembro",
+ "Outubro",
+ "Novembro",
+ "Dezembro");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Fev",
+ "Mar",
+ "Abr",
+ "Mai",
+ "Jun",
+ "Jul",
+ "Ago",
+ "Set",
+ "Out",
+ "Nov",
+ "Dez");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Sobre o calendario";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Ultima versao visite: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuido sobre GNU LGPL.  Veja http://gnu.org/licenses/lgpl.html para detalhes." +
+"\n\n" +
+"Selecao de data:\n" +
+"- Use os botoes \xab, \xbb para selecionar o ano\n" +
+"- Use os botoes " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " para selecionar o mes\n" +
+"- Segure o botao do mouse em qualquer um desses botoes para selecao rapida.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selecao de hora:\n" +
+"- Clique em qualquer parte da hora para incrementar\n" +
+"- ou Shift-click para decrementar\n" +
+"- ou clique e segure para selecao rapida.";
+
+Calendar._TT["PREV_YEAR"] = "Ant. ano (segure para menu)";
+Calendar._TT["PREV_MONTH"] = "Ant. mes (segure para menu)";
+Calendar._TT["GO_TODAY"] = "Hoje";
+Calendar._TT["NEXT_MONTH"] = "Prox. mes (segure para menu)";
+Calendar._TT["NEXT_YEAR"] = "Prox. ano (segure para menu)";
+Calendar._TT["SEL_DATE"] = "Selecione a data";
+Calendar._TT["DRAG_TO_MOVE"] = "Arraste para mover";
+Calendar._TT["PART_TODAY"] = " (hoje)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Mostre %s primeiro";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Fechar";
+Calendar._TT["TODAY"] = "Hoje";
+Calendar._TT["TIME_PART"] = "(Shift-)Click ou arraste para mudar valor";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d/%m/%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %e %b";
+
+Calendar._TT["WK"] = "sm";
+Calendar._TT["TIME"] = "Hora:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ro.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ro.js
new file mode 100644
index 00000000..6c45eab2
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ro.js
@@ -0,0 +1,66 @@
+// ** I18N
+Calendar._DN = new Array
+("Duminică",
+ "Luni",
+ "Marţi",
+ "Miercuri",
+ "Joi",
+ "Vineri",
+ "Sâmbătă",
+ "Duminică");
+Calendar._SDN_len = 2;
+Calendar._MN = new Array
+("Ianuarie",
+ "Februarie",
+ "Martie",
+ "Aprilie",
+ "Mai",
+ "Iunie",
+ "Iulie",
+ "August",
+ "Septembrie",
+ "Octombrie",
+ "Noiembrie",
+ "Decembrie");
+
+// tooltips
+Calendar._TT = {};
+
+Calendar._TT["INFO"] = "Despre calendar";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Pentru ultima versiune vizitaţi: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuit sub GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Selecţia datei:\n" +
+"- Folosiţi butoanele \xab, \xbb pentru a selecta anul\n" +
+"- Folosiţi butoanele " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " pentru a selecta luna\n" +
+"- Tineţi butonul mouse-ului apăsat pentru selecţie mai rapidă.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selecţia orei:\n" +
+"- Click pe ora sau minut pentru a mări valoarea cu 1\n" +
+"- Sau Shift-Click pentru a micÅŸora valoarea cu 1\n" +
+"- Sau Click ÅŸi drag pentru a selecta mai repede.";
+
+Calendar._TT["PREV_YEAR"] = "Anul precedent (lung pt menu)";
+Calendar._TT["PREV_MONTH"] = "Luna precedentă (lung pt menu)";
+Calendar._TT["GO_TODAY"] = "Data de azi";
+Calendar._TT["NEXT_MONTH"] = "Luna următoare (lung pt menu)";
+Calendar._TT["NEXT_YEAR"] = "Anul următor (lung pt menu)";
+Calendar._TT["SEL_DATE"] = "Selectează data";
+Calendar._TT["DRAG_TO_MOVE"] = "Trage pentru a miÅŸca";
+Calendar._TT["PART_TODAY"] = " (astăzi)";
+Calendar._TT["DAY_FIRST"] = "Afişează %s prima zi";
+Calendar._TT["WEEKEND"] = "0,6";
+Calendar._TT["CLOSE"] = "ÃŽnchide";
+Calendar._TT["TODAY"] = "Astăzi";
+Calendar._TT["TIME_PART"] = "(Shift-)Click sau drag pentru a selecta";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d-%m-%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%A, %d %B";
+
+Calendar._TT["WK"] = "spt";
+Calendar._TT["TIME"] = "Ora:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ru.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ru.js
new file mode 100644
index 00000000..4e23e386
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ru.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar RU language
+// Translation: Sly Golovanov, http://golovanov.net, <sly@golovanov.net>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("во�кре�енье",
+ "понедельник",
+ "вторник",
+ "�реда",
+ "четверг",
+ "п�тница",
+ "�уббота",
+ "во�кре�енье");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("в�к",
+ "пон",
+ "втр",
+ "�рд",
+ "чет",
+ "п�т",
+ "�уб",
+ "в�к");
+
+// full month names
+Calendar._MN = new Array
+("�нварь",
+ "февраль",
+ "март",
+ "апрель",
+ "май",
+ "июнь",
+ "июль",
+ "авгу�т",
+ "�ент�брь",
+ "окт�брь",
+ "но�брь",
+ "декабрь");
+
+// short month names
+Calendar._SMN = new Array
+("�нв",
+ "фев",
+ "мар",
+ "апр",
+ "май",
+ "июн",
+ "июл",
+ "авг",
+ "�ен",
+ "окт",
+ "но�",
+ "дек");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "О календаре...";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Как выбрать дату:\n" +
+"- При помощи кнопок \xab, \xbb можно выбрать год\n" +
+"- При помощи кнопок " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " можно выбрать ме��ц\n" +
+"- Подержите �ти кнопки нажатыми, чтобы по�вило�ь меню бы�трого выбора.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Как выбрать врем�:\n" +
+"- При клике на ча�ах или минутах они увеличивают��\n" +
+"- при клике � нажатой клавишей Shift они уменьшают��\n" +
+"- е�ли нажать и двигать мышкой влево/вправо, они будут мен�ть�� бы�трее.";
+
+Calendar._TT["PREV_YEAR"] = "�а год назад (удерживать дл� меню)";
+Calendar._TT["PREV_MONTH"] = "�а ме��ц назад (удерживать дл� меню)";
+Calendar._TT["GO_TODAY"] = "Сегодн�";
+Calendar._TT["NEXT_MONTH"] = "�а ме��ц вперед (удерживать дл� меню)";
+Calendar._TT["NEXT_YEAR"] = "�а год вперед (удерживать дл� меню)";
+Calendar._TT["SEL_DATE"] = "Выберите дату";
+Calendar._TT["DRAG_TO_MOVE"] = "Перета�кивайте мышкой";
+Calendar._TT["PART_TODAY"] = " (�егодн�)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Первый день недели будет %s";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Закрыть";
+Calendar._TT["TODAY"] = "Сегодн�";
+Calendar._TT["TIME_PART"] = "(Shift-)клик или нажать и двигать";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%e %b, %a";
+
+Calendar._TT["WK"] = "нед";
+Calendar._TT["TIME"] = "Врем�:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ru_win_.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ru_win_.js
new file mode 100644
index 00000000..4d8501d7
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-ru_win_.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar RU language
+// Translation: Sly Golovanov, http://golovanov.net, <sly@golovanov.net>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("âîñêðåñåíüå",
+ "ïîíåäåëüíèê",
+ "âòîðíèê",
+ "ñðåäà",
+ "÷åòâåðã",
+ "ïÿòíèöà",
+ "ñóááîòà",
+ "âîñêðåñåíüå");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("âñê",
+ "ïîí",
+ "âòð",
+ "ñðä",
+ "÷åò",
+ "ïÿò",
+ "ñóá",
+ "âñê");
+
+// full month names
+Calendar._MN = new Array
+("ÿíâàðü",
+ "ôåâðàëü",
+ "ìàðò",
+ "àïðåëü",
+ "ìàé",
+ "èþíü",
+ "èþëü",
+ "àâãóñò",
+ "ñåíòÿáðü",
+ "îêòÿáðü",
+ "íîÿáðü",
+ "äåêàáðü");
+
+// short month names
+Calendar._SMN = new Array
+("ÿíâ",
+ "ôåâ",
+ "ìàð",
+ "àïð",
+ "ìàé",
+ "èþí",
+ "èþë",
+ "àâã",
+ "ñåí",
+ "îêò",
+ "íîÿ",
+ "äåê");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Î êàëåíäàðå...";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Êàê âûáðàòü äàòó:\n" +
+"- Ïðè ïîìîùè êíîïîê \xab, \xbb ìîæíî âûáðàòü ãîä\n" +
+"- Ïðè ïîìîùè êíîïîê " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " ìîæíî âûáðàòü ìåñÿö\n" +
+"- Ïîäåðæèòå ýòè êíîïêè íàæàòûìè, ÷òîáû ïîÿâèëîñü ìåíþ áûñòðîãî âûáîðà.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Êàê âûáðàòü âðåìÿ:\n" +
+"- Ïðè êëèêå íà ÷àñàõ èëè ìèíóòàõ îíè óâåëè÷èâàþòñÿ\n" +
+"- ïðè êëèêå ñ íàæàòîé êëàâèøåé Shift îíè óìåíüøàþòñÿ\n" +
+"- åñëè íàæàòü è äâèãàòü ìûøêîé âëåâî/âïðàâî, îíè áóäóò ìåíÿòüñÿ áûñòðåå.";
+
+Calendar._TT["PREV_YEAR"] = "Íà ãîä íàçàä (óäåðæèâàòü äëÿ ìåíþ)";
+Calendar._TT["PREV_MONTH"] = "Íà ìåñÿö íàçàä (óäåðæèâàòü äëÿ ìåíþ)";
+Calendar._TT["GO_TODAY"] = "Ñåãîäíÿ";
+Calendar._TT["NEXT_MONTH"] = "Íà ìåñÿö âïåðåä (óäåðæèâàòü äëÿ ìåíþ)";
+Calendar._TT["NEXT_YEAR"] = "Íà ãîä âïåðåä (óäåðæèâàòü äëÿ ìåíþ)";
+Calendar._TT["SEL_DATE"] = "Âûáåðèòå äàòó";
+Calendar._TT["DRAG_TO_MOVE"] = "Ïåðåòàñêèâàéòå ìûøêîé";
+Calendar._TT["PART_TODAY"] = " (ñåãîäíÿ)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Ïåðâûé äåíü íåäåëè áóäåò %s";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Çàêðûòü";
+Calendar._TT["TODAY"] = "Ñåãîäíÿ";
+Calendar._TT["TIME_PART"] = "(Shift-)êëèê èëè íàæàòü è äâèãàòü";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%e %b, %a";
+
+Calendar._TT["WK"] = "íåä";
+Calendar._TT["TIME"] = "Âðåìÿ:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-si.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-si.js
new file mode 100644
index 00000000..cb3dfb9f
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-si.js
@@ -0,0 +1,94 @@
+/* Slovenian language file for the DHTML Calendar version 0.9.2 
+* Author David Milost <mercy@volja.net>, January 2004.
+* Feel free to use this script under the terms of the GNU Lesser General
+* Public License, as long as you do not remove or alter this notice.
+*/
+ // full day names
+Calendar._DN = new Array
+("Nedelja",
+ "Ponedeljek",
+ "Torek",
+ "Sreda",
+ "ÄŒetrtek",
+ "Petek",
+ "Sobota",
+ "Nedelja");
+ // short day names
+ Calendar._SDN = new Array
+("Ned",
+ "Pon",
+ "Tor",
+ "Sre",
+ "ÄŒet",
+ "Pet",
+ "Sob",
+ "Ned");
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "Maj",
+ "Jun",
+ "Jul",
+ "Avg",
+ "Sep",
+ "Okt",
+ "Nov",
+ "Dec");
+  // full month names
+Calendar._MN = new Array
+("Januar",
+ "Februar",
+ "Marec",
+ "April",
+ "Maj",
+ "Junij",
+ "Julij",
+ "Avgust",
+ "September",
+ "Oktober",
+ "November",
+ "December");
+
+// tooltips
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O koledarju";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Za zadnjo verzijo pojdine na naslov: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuirano pod GNU LGPL.  Poglejte http://gnu.org/licenses/lgpl.html za podrobnosti." +
+"\n\n" +
+"Izbor datuma:\n" +
+"- Uporabite \xab, \xbb gumbe za izbor leta\n" +
+"- Uporabite " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " gumbe za izbor meseca\n" +
+"- Zadržite klik na kateremkoli od zgornjih gumbov za hiter izbor.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Izbor ćasa:\n" +
+"- Kliknite na katerikoli del ćasa za poveć. le-tega\n" +
+"- ali Shift-click za zmanj. le-tega\n" +
+"- ali kliknite in povlecite za hiter izbor.";
+
+Calendar._TT["TOGGLE"] = "Spremeni dan s katerim se prićne teden";
+Calendar._TT["PREV_YEAR"] = "Predhodnje leto (dolg klik za meni)";
+Calendar._TT["PREV_MONTH"] = "Predhodnji mesec (dolg klik za meni)";
+Calendar._TT["GO_TODAY"] = "Pojdi na tekoći dan";
+Calendar._TT["NEXT_MONTH"] = "Naslednji mesec (dolg klik za meni)";
+Calendar._TT["NEXT_YEAR"] = "Naslednje leto (dolg klik za meni)";
+Calendar._TT["SEL_DATE"] = "Izberite datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Pritisni in povleci za spremembo pozicije";
+Calendar._TT["PART_TODAY"] = " (danes)";
+Calendar._TT["MON_FIRST"] = "Prikaži ponedeljek kot prvi dan";
+Calendar._TT["SUN_FIRST"] = "Prikaži nedeljo kot prvi dan";
+Calendar._TT["CLOSE"] = "Zapri";
+Calendar._TT["TODAY"] = "Danes";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "Ted";
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sk.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sk.js
new file mode 100644
index 00000000..2ecfc3c4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sk.js
@@ -0,0 +1,99 @@
+// ** I18N
+
+// Calendar SK language
+// Author: Peter Valach (pvalach@gmx.net)
+// Encoding: utf-8
+// Last update: 2003/10/29
+// Distributed under the same terms as the calendar itself.
+
+// full day names
+Calendar._DN = new Array
+("NedeÄľa",
+ "Pondelok",
+ "Utorok",
+ "Streda",
+ "Ĺ tvrtok",
+ "Piatok",
+ "Sobota",
+ "NedeÄľa");
+
+// short day names
+Calendar._SDN = new Array
+("Ned",
+ "Pon",
+ "Uto",
+ "Str",
+ "Ĺ tv",
+ "Pia",
+ "Sob",
+ "Ned");
+
+// full month names
+Calendar._MN = new Array
+("Január",
+ "Február",
+ "Marec",
+ "AprĂ­l",
+ "Máj",
+ "JÄ‚ÅŸn",
+ "JÄ‚ÅŸl",
+ "August",
+ "September",
+ "OktĂłber",
+ "November",
+ "December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "Máj",
+ "JÄ‚ÅŸn",
+ "JÄ‚ÅŸl",
+ "Aug",
+ "Sep",
+ "Okt",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O kalendári";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" +
+"Poslednú verziu nájdete na: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuované pod GNU LGPL.  Viď http://gnu.org/licenses/lgpl.html pre detaily." +
+"\n\n" +
+"V�ber dátumu:\n" +
+"- Použite tlačidlá \xab, \xbb pre v�ber roku\n" +
+"- Použite tlačidlá " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " pre v�ber mesiaca\n" +
+"- Ak ktorékoľvek z t�chto tlačidiel podržíte dlhšie, zobrazí sa r�chly v�ber.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"V�ber času:\n" +
+"- Kliknutie na niektorú položku času ju zv�ši\n" +
+"- Shift-klik ju znĂ­Ĺľi\n" +
+"- Ak podržíte tlačítko stlačené, posúvaním meníte hodnotu.";
+
+Calendar._TT["PREV_YEAR"] = "Predošl� rok (podržte pre menu)";
+Calendar._TT["PREV_MONTH"] = "Predošl� mesiac (podržte pre menu)";
+Calendar._TT["GO_TODAY"] = "Prejsť na dnešok";
+Calendar._TT["NEXT_MONTH"] = "Nasl. mesiac (podrĹľte pre menu)";
+Calendar._TT["NEXT_YEAR"] = "Nasl. rok (podrĹľte pre menu)";
+Calendar._TT["SEL_DATE"] = "Zvoľte dátum";
+Calendar._TT["DRAG_TO_MOVE"] = "PodrĹľanĂ­m tlaÄŤĂ­tka zmenĂ­te polohu";
+Calendar._TT["PART_TODAY"] = " (dnes)";
+Calendar._TT["MON_FIRST"] = "Zobraziť pondelok ako prv�";
+Calendar._TT["SUN_FIRST"] = "ZobraziĹĄ nedeÄľu ako prvĂş";
+Calendar._TT["CLOSE"] = "ZavrieĹĄ";
+Calendar._TT["TODAY"] = "Dnes";
+Calendar._TT["TIME_PART"] = "(Shift-)klik/ĹĄahanie zmenĂ­ hodnotu";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "$d. %m. %Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %e. %b";
+
+Calendar._TT["WK"] = "t�ž";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sp.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sp.js
new file mode 100644
index 00000000..bbacd216
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sp.js
@@ -0,0 +1,110 @@
+// ** I18N
+
+// Calendar SP language
+// Author: Rafael Velasco <rvu_at_idecnet_dot_com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Domingo",
+ "Lunes",
+ "Martes",
+ "Miercoles",
+ "Jueves",
+ "Viernes",
+ "Sabado",
+ "Domingo");
+
+Calendar._SDN = new Array
+("Dom",
+ "Lun",
+ "Mar",
+ "Mie",
+ "Jue",
+ "Vie",
+ "Sab",
+ "Dom");
+
+// full month names
+Calendar._MN = new Array
+("Enero",
+ "Febrero",
+ "Marzo",
+ "Abril",
+ "Mayo",
+ "Junio",
+ "Julio",
+ "Agosto",
+ "Septiembre",
+ "Octubre",
+ "Noviembre",
+ "Diciembre");
+
+// short month names
+Calendar._SMN = new Array
+("Ene",
+ "Feb",
+ "Mar",
+ "Abr",
+ "May",
+ "Jun",
+ "Jul",
+ "Ago",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dic");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Información del Calendario";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Nuevas versiones en: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuida bajo licencia GNU LGPL.  Para detalles vea http://gnu.org/licenses/lgpl.html ." +
+"\n\n" +
+"Selección de Fechas:\n" +
+"- Use  \xab, \xbb para seleccionar el año\n" +
+"- Use " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " para seleccionar el mes\n" +
+"- Mantenga presionado el botón del ratón en cualquiera de las opciones superiores para un acceso rapido .";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selección del Reloj:\n" +
+"- Seleccione la hora para cambiar el reloj\n" +
+"- o presione  Shift-click para disminuirlo\n" +
+"- o presione click y arrastre del ratón para una selección rapida.";
+
+Calendar._TT["PREV_YEAR"] = "Año anterior (Presione para menu)";
+Calendar._TT["PREV_MONTH"] = "Mes Anterior (Presione para menu)";
+Calendar._TT["GO_TODAY"] = "Ir a Hoy";
+Calendar._TT["NEXT_MONTH"] = "Mes Siguiente (Presione para menu)";
+Calendar._TT["NEXT_YEAR"] = "Año Siguiente (Presione para menu)";
+Calendar._TT["SEL_DATE"] = "Seleccione fecha";
+Calendar._TT["DRAG_TO_MOVE"] = "Arrastre y mueva";
+Calendar._TT["PART_TODAY"] = " (Hoy)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Mostrar %s primero";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Cerrar";
+Calendar._TT["TODAY"] = "Hoy";
+Calendar._TT["TIME_PART"] = "(Shift-)Click o arrastra para cambar el valor";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%dd-%mm-%yy";
+Calendar._TT["TT_DATE_FORMAT"] = "%A, %e de %B de %Y";
+
+Calendar._TT["WK"] = "Sm";
+Calendar._TT["TIME"] = "Hora:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sr-SP-Cyrl.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sr-SP-Cyrl.js
new file mode 100644
index 00000000..9a66d6c8
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sr-SP-Cyrl.js
@@ -0,0 +1,104 @@
+// ** I18N
+
+// Calendar - Serbian language (Cyrillic)
+// Author: Aleksandar Seovic (aleks@seovic.com)
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("недеља",
+ "понедељак",
+ "уторак",
+ "�реда",
+ "четвртак",
+ "петак",
+ "�убота",
+ "недеља");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("јануар",
+ "фебруар",
+ "март",
+ "април",
+ "мај",
+ "јун",
+ "јул",
+ "авгу�т",
+ "�ептембар",
+ "октобар",
+ "новембар",
+ "децембар");
+
+// short month names
+Calendar._SMN = new Array
+("јан",
+ "феб",
+ "мар",
+ "апр",
+ "мaj",
+ "јун",
+ "јул",
+ "авг",
+ "�еп",
+ "окт",
+ "нов",
+ "дец");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O календару";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Избор датума:\n" +
+"- Уз помоћ та�тера \xab, \xbb можете изабрати годину\n" +
+"- Уз помоћ та�тера " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " можете изабрати ме�ец\n" +
+"- Држите лево дугме миша прити�нуто за бржу �елекцију.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Избор времена:\n" +
+"- Кликните на �ат или минут да га увећате\n" +
+"- или Shift-click да га умањите\n" +
+"- или прити�ните лево дугме миша и повуците за бржу �елекцију.";
+
+Calendar._TT["PREV_YEAR"] = "Претходна година";
+Calendar._TT["PREV_MONTH"] = "Претходни ме�ец";
+Calendar._TT["GO_TODAY"] = "Дана�";
+Calendar._TT["NEXT_MONTH"] = "Следећи ме�ец";
+Calendar._TT["NEXT_YEAR"] = "Следећа година";
+Calendar._TT["SEL_DATE"] = "Изабери датум";
+Calendar._TT["DRAG_TO_MOVE"] = "Повуци за промену";
+Calendar._TT["PART_TODAY"] = " (дана�)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Прво прикажи %s";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Затвори";
+Calendar._TT["TODAY"] = "Дана�";
+Calendar._TT["TIME_PART"] = "(Shift-)Click или повуци да промениш вредно�т";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "нед";
+Calendar._TT["TIME"] = "Време:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sr-SP-Latn.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sr-SP-Latn.js
new file mode 100644
index 00000000..5ec66f1b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sr-SP-Latn.js
@@ -0,0 +1,104 @@
+// ** I18N
+
+// Calendar - Serbian language (Latin)
+// Author: Aleksandar Seovic (aleks@seovic.com)
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("nedelja",
+ "ponedeljak",
+ "utorak",
+ "sreda",
+ "�etvrtak",
+ "petak",
+ "subota",
+ "nedelja");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("januar",
+ "februar",
+ "mart",
+ "april",
+ "maj",
+ "jun",
+ "jul",
+ "avgust",
+ "septembar",
+ "oktobar",
+ "novembar",
+ "decembar");
+
+// short month names
+Calendar._SMN = new Array
+("jan",
+ "feb",
+ "mar",
+ "apr",
+ "maj",
+ "jun",
+ "jul",
+ "avg",
+ "sep",
+ "okt",
+ "nov",
+ "dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O kalendaru";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Izbor datuma:\n" +
+"- Uz pomoć tastera \xab, \xbb možete izabrati godinu\n" +
+"- Uz pomoć tastera " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " možete izabrati mesec\n" +
+"- Držite levo dugme miša pritisnuto za bržu selekciju.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Izbor vremena:\n" +
+"- Kliknite na sat ili minut da ga uvećate\n" +
+"- ili Shift-click da ga umanjite\n" +
+"- ili pritisnite levo dugme miša i povucite za bržu selekciju.";
+
+Calendar._TT["PREV_YEAR"] = "Prethodna godina";
+Calendar._TT["PREV_MONTH"] = "Prethodni mesec";
+Calendar._TT["GO_TODAY"] = "Danas";
+Calendar._TT["NEXT_MONTH"] = "Sledeći mesec";
+Calendar._TT["NEXT_YEAR"] = "Sledeća godina";
+Calendar._TT["SEL_DATE"] = "Izaberi datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Povuci za promenu";
+Calendar._TT["PART_TODAY"] = " (danas)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Prvo prikaži %s";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Zatvori";
+Calendar._TT["TODAY"] = "Danas";
+Calendar._TT["TIME_PART"] = "(Shift-)Click ili povuci da promeniš vrednost";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "ned";
+Calendar._TT["TIME"] = "Vreme:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sv.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sv.js
new file mode 100644
index 00000000..b62df3e1
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-sv.js
@@ -0,0 +1,93 @@
+// ** I18N
+
+// Calendar SV language (Swedish, svenska)
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Translation team: <sv@li.org>
+// Translator: Leonard Norrgård <leonard.norrgard@refactor.fi>
+// Last translator: Leonard Norrgård <leonard.norrgard@refactor.fi>
+// Encoding: iso-latin-1
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("söndag",
+ "måndag",
+ "tisdag",
+ "onsdag",
+ "torsdag",
+ "fredag",
+ "lördag",
+ "söndag");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+Calendar._SDN_len = 2;
+Calendar._SMN_len = 3;
+
+// full month names
+Calendar._MN = new Array
+("januari",
+ "februari",
+ "mars",
+ "april",
+ "maj",
+ "juni",
+ "juli",
+ "augusti",
+ "september",
+ "oktober",
+ "november",
+ "december");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Om kalendern";
+
+Calendar._TT["ABOUT"] =
+"DHTML Datum/tid-väljare\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"För senaste version gå till: http://www.dynarch.com/projects/calendar/\n" +
+"Distribueras under GNU LGPL.  Se http://gnu.org/licenses/lgpl.html för detaljer." +
+"\n\n" +
+"Val av datum:\n" +
+"- Använd knapparna \xab, \xbb för att välja år\n" +
+"- Använd knapparna " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " för att välja månad\n" +
+"- Håll musknappen nedtryckt på någon av ovanstående knappar för snabbare val.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Val av tid:\n" +
+"- Klicka på en del av tiden för att öka den delen\n" +
+"- eller skift-klicka för att minska den\n" +
+"- eller klicka och drag för snabbare val.";
+
+Calendar._TT["PREV_YEAR"] = "Föregående år (håll för menu)";
+Calendar._TT["PREV_MONTH"] = "Föregående månad (håll för menu)";
+Calendar._TT["GO_TODAY"] = "Gå till dagens datum";
+Calendar._TT["NEXT_MONTH"] = "Följande månad (håll för menu)";
+Calendar._TT["NEXT_YEAR"] = "Följande år (håll för menu)";
+Calendar._TT["SEL_DATE"] = "Välj datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Drag för att flytta";
+Calendar._TT["PART_TODAY"] = " (idag)";
+Calendar._TT["MON_FIRST"] = "Visa måndag först";
+Calendar._TT["SUN_FIRST"] = "Visa söndag först";
+Calendar._TT["CLOSE"] = "Stäng";
+Calendar._TT["TODAY"] = "Idag";
+Calendar._TT["TIME_PART"] = "(Skift-)klicka eller drag för att ändra tid";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%A %d %b %Y";
+
+Calendar._TT["WK"] = "vecka";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-tr.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-tr.js
new file mode 100644
index 00000000..2164687f
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-tr.js
@@ -0,0 +1,58 @@
+//////////////////////////////////////////////////////////////////////////////////////////////
+//	Turkish Translation by Nuri AKMAN
+//	Location: Ankara/TURKEY
+//	e-mail	: nuriakman@hotmail.com
+//	Date	: April, 9 2003
+//
+//	Note: if Turkish Characters does not shown on you screen
+//		  please include falowing line your html code:
+//
+//		  <meta http-equiv="Content-Type" content="text/html; charset=windows-1254">
+//
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+// ** I18N
+Calendar._DN = new Array
+("Pazar",
+ "Pazartesi",
+ "Salý",
+ "Çarþamba",
+ "Perþembe",
+ "Cuma",
+ "Cumartesi",
+ "Pazar");
+Calendar._MN = new Array
+("Ocak",
+ "Þubat",
+ "Mart",
+ "Nisan",
+ "Mayýs",
+ "Haziran",
+ "Temmuz",
+ "Aðustos",
+ "Eylül",
+ "Ekim",
+ "Kasým",
+ "Aralýk");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["TOGGLE"] = "Haftanýn ilk gününü kaydýr";
+Calendar._TT["PREV_YEAR"] = "Önceki Yýl (Menü için basýlý tutunuz)";
+Calendar._TT["PREV_MONTH"] = "Önceki Ay (Menü için basýlý tutunuz)";
+Calendar._TT["GO_TODAY"] = "Bugün'e git";
+Calendar._TT["NEXT_MONTH"] = "Sonraki Ay (Menü için basýlý tutunuz)";
+Calendar._TT["NEXT_YEAR"] = "Sonraki Yýl (Menü için basýlý tutunuz)";
+Calendar._TT["SEL_DATE"] = "Tarih seçiniz";
+Calendar._TT["DRAG_TO_MOVE"] = "Taþýmak için sürükleyiniz";
+Calendar._TT["PART_TODAY"] = " (bugün)";
+Calendar._TT["MON_FIRST"] = "Takvim Pazartesi gününden baþlasýn";
+Calendar._TT["SUN_FIRST"] = "Takvim Pazar gününden baþlasýn";
+Calendar._TT["CLOSE"] = "Kapat";
+Calendar._TT["TODAY"] = "Bugün";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "dd-mm-y";
+Calendar._TT["TT_DATE_FORMAT"] = "d MM y, DD";
+
+Calendar._TT["WK"] = "Hafta";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-zh.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-zh.js
new file mode 100644
index 00000000..42f0b107
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/calendar-zh.js
@@ -0,0 +1,119 @@
+// ** I18N
+
+// Calendar ZH language
+// Author: muziq, <muziq@sina.com>
+// Encoding: GB2312 or GBK
+// Distributed under the same terms as the calendar itself.
+
+// full day names
+Calendar._DN = new Array
+("ÐÇÆÚÈÕ",
+ "ÐÇÆÚÒ»",
+ "ÐÇÆÚ¶þ",
+ "ÐÇÆÚÈý",
+ "ÐÇÆÚËÄ",
+ "ÐÇÆÚÎå",
+ "ÐÇÆÚÁù",
+ "ÐÇÆÚÈÕ");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("ÈÕ",
+ "Ò»",
+ "¶þ",
+ "Èý",
+ "ËÄ",
+ "Îå",
+ "Áù",
+ "ÈÕ");
+
+// full month names
+Calendar._MN = new Array
+("Ò»ÔÂ",
+ "¶þÔÂ",
+ "ÈýÔÂ",
+ "ËÄÔÂ",
+ "ÎåÔÂ",
+ "ÁùÔÂ",
+ "ÆßÔÂ",
+ "°ËÔÂ",
+ "¾ÅÔÂ",
+ "Ê®ÔÂ",
+ "ʮһÔÂ",
+ "Ê®¶þÔÂ");
+
+// short month names
+Calendar._SMN = new Array
+("Ò»ÔÂ",
+ "¶þÔÂ",
+ "ÈýÔÂ",
+ "ËÄÔÂ",
+ "ÎåÔÂ",
+ "ÁùÔÂ",
+ "ÆßÔÂ",
+ "°ËÔÂ",
+ "¾ÅÔÂ",
+ "Ê®ÔÂ",
+ "ʮһÔÂ",
+ "Ê®¶þÔÂ");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "°ïÖú";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Ñ¡ÔñÈÕÆÚ:\n" +
+"- µã»÷ \xab, \xbb °´Å¥Ñ¡ÔñÄê·Ý\n" +
+"- µã»÷ " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " °´Å¥Ñ¡ÔñÔ·Ý\n" +
+"- ³¤°´ÒÔÉÏ°´Å¥¿É´Ó²Ëµ¥ÖпìËÙÑ¡ÔñÄê·Ý»òÔ·Ý";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Ñ¡Ôñʱ¼ä:\n" +
+"- µã»÷Сʱ»ò·ÖÖÓ¿Éʹ¸ÄÊýÖµ¼ÓÒ»\n" +
+"- °´×¡Shift¼üµã»÷Сʱ»ò·ÖÖÓ¿Éʹ¸ÄÊýÖµ¼õÒ»\n" +
+"- µã»÷Í϶¯Êó±ê¿É½øÐпìËÙÑ¡Ôñ";
+
+Calendar._TT["PREV_YEAR"] = "ÉÏÒ»Äê (°´×¡³ö²Ëµ¥)";
+Calendar._TT["PREV_MONTH"] = "ÉÏÒ»Ô (°´×¡³ö²Ëµ¥)";
+Calendar._TT["GO_TODAY"] = "תµ½½ñÈÕ";
+Calendar._TT["NEXT_MONTH"] = "ÏÂÒ»Ô (°´×¡³ö²Ëµ¥)";
+Calendar._TT["NEXT_YEAR"] = "ÏÂÒ»Äê (°´×¡³ö²Ëµ¥)";
+Calendar._TT["SEL_DATE"] = "Ñ¡ÔñÈÕÆÚ";
+Calendar._TT["DRAG_TO_MOVE"] = "Í϶¯";
+Calendar._TT["PART_TODAY"] = " (½ñÈÕ)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "×î×ó±ßÏÔʾ%s";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "¹Ø±Õ";
+Calendar._TT["TODAY"] = "½ñÈÕ";
+Calendar._TT["TIME_PART"] = "(Shift-)µã»÷Êó±ê»òÍ϶¯¸Ä±äÖµ";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%A, %b %eÈÕ";
+
+Calendar._TT["WK"] = "ÖÜ";
+Calendar._TT["TIME"] = "ʱ¼ä:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/cn_utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/cn_utf8.js
new file mode 100644
index 00000000..a0ef7c6b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Scripts/Calendar/lang/cn_utf8.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mishoo@infoiasi.ro>
+// Encoding: any
+// Translator : Niko <nikoused@gmail.com>
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("\u5468\u65e5",//\u5468\u65e5
+ "\u5468\u4e00",//\u5468\u4e00
+ "\u5468\u4e8c",//\u5468\u4e8c
+ "\u5468\u4e09",//\u5468\u4e09
+ "\u5468\u56db",//\u5468\u56db
+ "\u5468\u4e94",//\u5468\u4e94
+ "\u5468\u516d",//\u5468\u516d
+ "\u5468\u65e5");//\u5468\u65e5
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("\u5468\u65e5",
+ "\u5468\u4e00",
+ "\u5468\u4e8c",
+ "\u5468\u4e09",
+ "\u5468\u56db",
+ "\u5468\u4e94",
+ "\u5468\u516d",
+ "\u5468\u65e5");
+
+// full month names
+Calendar._MN = new Array
+("\u4e00\u6708",
+ "\u4e8c\u6708",
+ "\u4e09\u6708",
+ "\u56db\u6708",
+ "\u4e94\u6708",
+ "\u516d\u6708",
+ "\u4e03\u6708",
+ "\u516b\u6708",
+ "\u4e5d\u6708",
+ "\u5341\u6708",
+ "\u5341\u4e00\u6708",
+ "\u5341\u4e8c\u6708");
+
+// short month names
+Calendar._SMN = new Array
+("\u4e00\u6708",
+ "\u4e8c\u6708",
+ "\u4e09\u6708",
+ "\u56db\u6708",
+ "\u4e94\u6708",
+ "\u516d\u6708",
+ "\u4e03\u6708",
+ "\u516b\u6708",
+ "\u4e5d\u6708",
+ "\u5341\u6708",
+ "\u5341\u4e00\u6708",
+ "\u5341\u4e8c\u6708");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "\u5173\u4e8e";
+
+Calendar._TT["ABOUT"] =
+"   DHTML \u65e5\u8d77/\u65f6\u95f4\u9009\u62e9\u63a7\u4ef6\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: \u6700\u65b0\u7248\u672c\u8bf7\u767b\u9646http://www.dynarch.com/projects/calendar/\u5bdf\u770b\n" +
+"\u9075\u5faaGNU LGPL.  \u7ec6\u8282\u53c2\u9605 http://gnu.org/licenses/lgpl.html" +
+"\n\n" +
+"\u65e5\u671f\u9009\u62e9:\n" +
+"- \u70b9\u51fb\xab(\xbb)\u6309\u94ae\u9009\u62e9\u4e0a(\u4e0b)\u4e00\u5e74\u5ea6.\n" +
+"- \u70b9\u51fb" + String.fromCharCode(0x2039) + "(" + String.fromCharCode(0x203a) + ")\u6309\u94ae\u9009\u62e9\u4e0a(\u4e0b)\u4e2a\u6708\u4efd.\n" +
+"- \u957f\u65f6\u95f4\u6309\u7740\u6309\u94ae\u5c06\u51fa\u73b0\u66f4\u591a\u9009\u62e9\u9879.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"\u65f6\u95f4\u9009\u62e9:\n" +
+"-\u5728\u65f6\u95f4\u90e8\u5206(\u5206\u6216\u8005\u79d2)\u4e0a\u5355\u51fb\u9f20\u6807\u5de6\u952e\u6765\u589e\u52a0\u5f53\u524d\u65f6\u95f4\u90e8\u5206(\u5206\u6216\u8005\u79d2)\n" +
+"-\u5728\u65f6\u95f4\u90e8\u5206(\u5206\u6216\u8005\u79d2)\u4e0a\u6309\u4f4fShift\u952e\u540e\u5355\u51fb\u9f20\u6807\u5de6\u952e\u6765\u51cf\u5c11\u5f53\u524d\u65f6\u95f4\u90e8\u5206(\u5206\u6216\u8005\u79d2).";
+
+Calendar._TT["PREV_YEAR"] = "\u4e0a\u4e00\u5e74";
+Calendar._TT["PREV_MONTH"] = "\u4e0a\u4e2a\u6708";
+Calendar._TT["GO_TODAY"] = "\u5230\u4eca\u5929";
+Calendar._TT["NEXT_MONTH"] = "\u4e0b\u4e2a\u6708";
+Calendar._TT["NEXT_YEAR"] = "\u4e0b\u4e00\u5e74";
+Calendar._TT["SEL_DATE"] = "\u9009\u62e9\u65e5\u671f";
+Calendar._TT["DRAG_TO_MOVE"] = "\u62d6\u52a8";
+Calendar._TT["PART_TODAY"] = " (\u4eca\u5929)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "%s\u4e3a\u8fd9\u5468\u7684\u7b2c\u4e00\u5929";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "\u5173\u95ed";
+Calendar._TT["TODAY"] = "\u4eca\u5929";
+Calendar._TT["TIME_PART"] = "(\u6309\u7740Shift\u952e)\u5355\u51fb\u6216\u62d6\u52a8\u6539\u53d8\u503c";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e\u65e5";
+
+Calendar._TT["WK"] = "\u5468";
+Calendar._TT["TIME"] = "\u65f6\u95f4:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/SpringAir.Web.2003.csproj b/examples/Spring/SpringAir/src/SpringAir.Web.2003/SpringAir.Web.2003.csproj
new file mode 100644
index 00000000..7ea0e450
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/SpringAir.Web.2003.csproj
@@ -0,0 +1,636 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Web"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{B29E702D-DC32-42B4-8A15-AC7C07CFC48D}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "SpringAir.Web"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "SpringAir"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.Web"
+                    AssemblyName = "System.Web"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "SpringAir.Core.2003"
+                    Project = "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "SpringAir.Data.Ado.2003"
+                    Project = "{78B285FE-27F3-44F4-84B1-7A589AB48EF3}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "Spring.Web"
+                    AssemblyName = "Spring.Web"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Web.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Constants.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Global.asax"
+                    SubType = "Component"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Global.asax.cs"
+                    DependentUpon = "Global.asax"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Global.asax.resx"
+                    DependentUpon = "Global.asax.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "SpringAir.Web.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Web.config"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Config\Aspects.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Config\Log4Net.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Config\Services.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Config\Web.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Config\Production\Dao.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Config\Production\Services.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Config\Test\Dao.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Config\Test\Services.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Resources\Strings.en.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Strings.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Strings.sr-SP-Cyrl.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Strings.sr-SP-Latn.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\calendar.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\calendar-blue.css"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\calendar-blue2.css"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\calendar-brown.css"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\calendar-green.css"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\calendar-setup.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\calendar-system.css"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\calendar-tas.css"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\calendar-win2k-1.css"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\calendar-win2k-2.css"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\calendar-win2k-cold-1.css"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\calendar-win2k-cold-2.css"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\img.gif"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-af.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-al.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-bg.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-big5.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-big5-utf8.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-br.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-ca.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-cs-utf8.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-cs-win.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-da.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-de.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-du.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-el.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-en.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-en-US.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-es.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-fi.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-fr.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-he-utf8.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-hr.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-hr-utf8.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-hu.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-it.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-jp.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-ko.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-ko-utf8.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-lt.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-lt-utf8.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-lv.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-nl.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-no.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-pl.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-pl-utf8.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-pt.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-ro.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-ru.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-ru_win_.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-si.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-sk.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-sp.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-sr-SP-Cyrl.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-sr-SP-Latn.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-sv.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-tr.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\calendar-zh.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Scripts\Calendar\lang\cn_utf8.js"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Home.aspx"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Home.aspx.cs"
+                    DependentUpon = "Home.aspx"
+                    SubType = "ASPXCodeBehind"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Home.aspx.resx"
+                    DependentUpon = "Home.aspx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\StandardTemplate.ascx"
+                    SubType = "Form"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\StandardTemplate.ascx.cs"
+                    DependentUpon = "StandardTemplate.ascx"
+                    SubType = "ASPXCodeBehind"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\StandardTemplate.ascx.resx"
+                    DependentUpon = "StandardTemplate.ascx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\Web.config"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\BookTrip\ReservationConfirmationPage.aspx"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\BookTrip\ReservationConfirmationPage.aspx.cs"
+                    DependentUpon = "ReservationConfirmationPage.aspx"
+                    SubType = "ASPXCodeBehind"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\BookTrip\ReservationConfirmationPage.aspx.resx"
+                    DependentUpon = "ReservationConfirmationPage.aspx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\BookTrip\ReservationConfirmationPage.en.resx"
+                    DependentUpon = "ReservationConfirmationPage.aspx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\BookTrip\ReservationConfirmationPage.sr-SP-Cyrl.resx"
+                    DependentUpon = "ReservationConfirmationPage.aspx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\BookTrip\ReservationConfirmationPage.sr-SP-Latn.resx"
+                    DependentUpon = "ReservationConfirmationPage.aspx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\BookTrip\SuggestedFlights.aspx"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\BookTrip\SuggestedFlights.aspx.cs"
+                    DependentUpon = "SuggestedFlights.aspx"
+                    SubType = "ASPXCodeBehind"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\BookTrip\SuggestedFlights.aspx.resx"
+                    DependentUpon = "SuggestedFlights.aspx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\BookTrip\SuggestedFlights.en.resx"
+                    DependentUpon = "SuggestedFlights.aspx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\BookTrip\SuggestedFlights.sr-SP-Cyrl.resx"
+                    DependentUpon = "SuggestedFlights.aspx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\BookTrip\SuggestedFlights.sr-SP-Latn.resx"
+                    DependentUpon = "SuggestedFlights.aspx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\BookTrip\TripForm.aspx"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\BookTrip\TripForm.aspx.cs"
+                    DependentUpon = "TripForm.aspx"
+                    SubType = "ASPXCodeBehind"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\BookTrip\TripForm.aspx.resx"
+                    DependentUpon = "TripForm.aspx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\BookTrip\TripForm.en.resx"
+                    DependentUpon = "TripForm.aspx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\BookTrip\TripForm.sr-SP-Cyrl.resx"
+                    DependentUpon = "TripForm.aspx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\BookTrip\TripForm.sr-SP-Latn.resx"
+                    DependentUpon = "TripForm.aspx.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Web\BookTrip\Web.config"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\CSS\default.css"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\calendar-1.gif"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\calendar-2.gif"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\line.jpg"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\panel-bottom-left.gif"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\panel-bottom-middle.gif"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\panel-bottom-right.gif"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\panel-left-middle.gif"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\panel-right-middle.gif"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\panel-top-left.gif"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\panel-top-middle.gif"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\panel-top-right.gif"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\spring-air-logo.jpg"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\en\spring-air-logo.jpg"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\sr-SP-Cyrl\spring-air-logo.jpg"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Web\Images\sr-SP-Latn\spring-air-logo.jpg"
+                    BuildAction = "Content"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/SpringAir.Web.2003.csproj.webinfo b/examples/Spring/SpringAir/src/SpringAir.Web.2003/SpringAir.Web.2003.csproj.webinfo
new file mode 100644
index 00000000..c3f64c41
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/SpringAir.Web.2003.csproj.webinfo
@@ -0,0 +1,4 @@
+<VisualStudioUNCWeb>
+    <Web URLPath = "http://localhost/SpringAir.2003/SpringAir.Web.2003.csproj" />
+</VisualStudioUNCWeb>
+
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/SpringAir.Web.build b/examples/Spring/SpringAir/src/SpringAir.Web.2003/SpringAir.Web.build
new file mode 100644
index 00000000..9456679b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/SpringAir.Web.build
@@ -0,0 +1,38 @@
+<?xml version="1.0" ?>
+<project name="SpringAir.Web" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+    <!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+    <target name="build">
+        <csc
+            target="library" define="${current.build.defines.csc}" debug="${build.debug}"
+            output="${current.bin.dir}/${project::get-name()}.dll">
+            <sources failonempty="true">
+                <include name="**/*.cs" />
+            </sources>
+            <nowarn>
+                <warning number="${nowarn.numbers}" />
+            </nowarn>
+            <references basedir="${current.bin.dir}">
+                <include name="log4net.dll" />
+	        <include name="Common.Logging.dll"/>
+                <include name="Spring.Core.dll" />
+                <include name="Spring.Web.dll" />
+                <include name="SpringAir.Core.dll" />
+                <include name="System.Web.dll" />
+            </references>
+        </csc>
+        <copy todir="bin">
+            <fileset basedir="${current.bin.dir}">
+                <include name="log4net.dll" />
+	        <include name="Common.Logging.dll"/>
+                <include name="Spring.Core.dll" />
+                <include name="Spring.Web.dll" />
+                <include name="SpringAir.Core.dll" />
+            </fileset>
+        </copy>
+    </target>
+</project>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web.config b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web.config
new file mode 100644
index 00000000..b6d91b81
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web.config
@@ -0,0 +1,80 @@
+<configuration>
+	<configSections>
+		<sectionGroup name="common">
+			<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+		</sectionGroup>
+		<sectionGroup name="spring">
+			<section name="typeAliases" type="Spring.Context.Support.TypeAliasesSectionHandler, Spring.Core" />
+			<section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
+			<section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web" />
+			<section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" />
+		</sectionGroup>
+		<section name="databaseSettings" type="System.Configuration.NameValueSectionHandler, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+	</configSections>
+
+	<common>
+		<logging>
+			<!--
+			You may use http://www.microsoft.com/technet/sysinternals/Miscellaneous/DebugView.mspx
+			for viewing TraceLogger output
+			-->
+			<factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
+				<arg key="Level" value="ALL" /> <!-- Possible values are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF -->
+			</factoryAdapter>
+		</logging>
+	</common>
+
+	<spring>
+		<typeAliases>
+			<!-- Web services aliases -->
+			<alias name="WebServiceExporter" type="Spring.Web.Services.WebServiceExporter, Spring.Web" />
+		</typeAliases>
+		<parsers>
+			<parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" />
+		</parsers>
+		<context>
+			<resource uri="~/Config/Aspects.xml" />
+			<resource uri="~/Config/Web.xml" />
+			<resource uri="~/Config/Services.xml" />
+
+			<!-- TEST CONFIGURATION -->
+			<resource uri="~/Config/Test/Services.xml" />
+			<resource uri="~/Config/Test/Dao.xml" />
+
+			<!-- PRODUCTION CONFIGURATION -->
+			<!--
+			<resource uri="~/Config/Production/Services.xml"/>
+			<resource uri="~/Config/Production/Dao.xml"/>
+			-->
+		</context>
+	</spring>
+
+	<system.web>
+		<httpModules>
+			<add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web" />
+		</httpModules>
+		<httpHandlers>
+			<add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web" />
+			<add verb="*" path="*.asmx" type="Spring.Web.Services.WebServiceHandlerFactory, Spring.Web" />
+			<add verb="*" path="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web" />
+		</httpHandlers>
+		<compilation defaultLanguage="c#" debug="true" />
+		<customErrors mode="RemoteOnly" />
+		<authentication mode="Windows" />
+		<authorization>
+			<allow users="*" />
+		</authorization>
+		<trace enabled="false" requestLimit="20" 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>
+
+	<databaseSettings>
+		<add key="db.server" value="(local)" />
+		<add key="db.user" value="springqa" />
+		<add key="db.password" value="springqa" />
+		<add key="db.schema" value="SpringAir" />
+	</databaseSettings>
+
+</configuration>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.aspx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.aspx
new file mode 100644
index 00000000..bd9e674c
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.aspx
@@ -0,0 +1,58 @@
+<%@ Page language="c#" Inherits="SpringAir.Web.ReservationConfirmationPage" CodeBehind="ReservationConfirmationPage.aspx.cs" %>
+<%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %>
+<%@ Import Namespace="SpringAir.Domain" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<html>
+  <body>
+    <spring:Content id="body" contentPlaceholderId="body" runat="server">
+      <h4 align="center"><asp:Label id="caption" Runat="server" /></h4>
+      <p align="center">
+        <asp:Label id="confirmationLabel" Runat="server" />
+      </p>
+      <br />
+      <br />
+      <asp:Repeater id="itinerary" Runat="server">
+        <HeaderTemplate>
+          <table border="0" width="90%" cellpadding="0" cellspacing="0" align="center" class="suggestedTable">
+            <thead>
+              <tr class="suggestedTableCaption">
+                <th colspan="5">
+                  <%= GetMessage("itinerary") %>
+                </th>
+              </tr>
+              <tr class="suggestedTableColnames">
+                <th>
+                  <%= GetMessage("flightNumber") %>
+                </th>
+                <th>
+                  <%= GetMessage("departureDate") %>
+                </th>
+                <th>
+                  <%= GetMessage("departureAirport") %>
+                </th>
+                <th>
+                  <%= GetMessage("destinationAirport") %>
+                </th>
+                <th>
+                  <%= GetMessage("aircraft") %>
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+        </HeaderTemplate>
+        <ItemTemplate>
+          <tr class="suggestedTableRow">
+            <td><%# ((Flight) Container.DataItem).FlightNumber %></td>
+            <td><%# ((Flight) Container.DataItem).DepartureTime.ToString() %></td>
+            <td><%# ((Flight) Container.DataItem).DepartureAirport.Description %></td>
+            <td><%# ((Flight) Container.DataItem).DestinationAirport.Description %></td>
+            <td><%# ((Flight) Container.DataItem).Aircraft.Model %></td>
+          </tr>
+        </ItemTemplate>
+        <FooterTemplate>
+          </tbody></table>
+        </FooterTemplate>
+      </asp:Repeater>
+    </spring:Content>
+  </body>
+</html>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.aspx.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.aspx.cs
new file mode 100644
index 00000000..d9079672
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.aspx.cs
@@ -0,0 +1,99 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Web.UI.WebControls;
+using Spring.Web.UI;
+using Spring.Web.UI.Controls;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Web
+{
+    /// <summary>
+    /// The SpringAir reservation confirmation page.
+    /// </summary>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: ReservationConfirmationPage.aspx.cs,v 1.2 2006/12/07 04:22:00 aseovic Exp $</version>
+    public class ReservationConfirmationPage : Page
+    {
+        #region Fields
+
+        protected ReservationConfirmation confirmation;
+
+        #endregion
+
+        #region Controls
+
+        protected Content body;
+        protected Label caption;
+        protected Label confirmationLabel;
+        protected Repeater itinerary;
+
+        #endregion
+
+        #region Model Management and Data Binding Methods
+
+        protected override void InitializeModel()
+        {
+            confirmation = (ReservationConfirmation) Session[Constants.ReservationConfirmationKey];
+        }
+
+        protected override void LoadModel(object savedModel)
+        {
+            confirmation = (ReservationConfirmation) savedModel;
+        }
+
+        protected override object SaveModel()
+        {
+            return confirmation;
+        }
+
+        #endregion
+
+        #region Page Lifecycle Methods
+
+        protected override void OnInitializeControls(EventArgs e)
+        {
+            base.OnInitializeControls(e);
+
+            if (!IsPostBack)
+            {
+                itinerary.DataSource = confirmation.Reservation.Itinerary.Flights;
+                itinerary.DataBind();
+
+                Session.Remove(Constants.ReservationConfirmationKey);
+                Session.Remove(Constants.SuggestedFlightsKey);
+            }
+        }
+
+        protected override void OnPreRender(EventArgs e)
+        {
+            base.OnPreRender(e);
+            confirmationLabel.Text = GetMessage("confirmation", confirmation.ConfirmationNumber);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.aspx.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.aspx.resx
new file mode 100644
index 00000000..ed0ad7ac
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.aspx.resx
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</data>
+	<data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>False</value>
+	</data>
+	<data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>Private</value>
+	</data>
+	<data name="$this.caption.Text" type="System.String">
+		<value>Thank You!</value>
+	</data>
+	<data name="confirmation" type="System.String">
+		<value>Your reservation confirmation number is {0}.</value>
+	</data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.en.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.en.resx
new file mode 100644
index 00000000..ed0ad7ac
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.en.resx
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</data>
+	<data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>False</value>
+	</data>
+	<data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>Private</value>
+	</data>
+	<data name="$this.caption.Text" type="System.String">
+		<value>Thank You!</value>
+	</data>
+	<data name="confirmation" type="System.String">
+		<value>Your reservation confirmation number is {0}.</value>
+	</data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.sr-SP-Cyrl.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.sr-SP-Cyrl.resx
new file mode 100644
index 00000000..7cf65849
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.sr-SP-Cyrl.resx
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>True</value>
+    </data>
+    <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>False</value>
+    </data>
+    <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>Private</value>
+    </data>
+    <data name="$this.caption.Text" type="System.String">
+        <value>Хвала Вам!</value>
+    </data>
+    <data name="confirmation" type="System.String">
+        <value>Ваш број резервације је {0}</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.sr-SP-Latn.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.sr-SP-Latn.resx
new file mode 100644
index 00000000..326baad8
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/ReservationConfirmationPage.sr-SP-Latn.resx
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>True</value>
+    </data>
+    <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>False</value>
+    </data>
+    <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>Private</value>
+    </data>
+    <data name="$this.caption.Text" type="System.String">
+        <value>Hvala Vam!</value>
+    </data>
+    <data name="confirmation" type="System.String">
+        <value>Vaš broj rezervacije je {0}</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.aspx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.aspx
new file mode 100644
index 00000000..799b9c36
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.aspx
@@ -0,0 +1,130 @@
+<%@ Import Namespace="SpringAir.Domain" %>
+<%@ Page language="c#" Inherits="SpringAir.Web.SuggestedFlights" CodeBehind="SuggestedFlights.aspx.cs" %>
+<%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<HTML>
+  <body>
+    <spring:Content id="body" contentPlaceholderId="body" runat="server">
+      <H4 align="center">
+        <asp:Label id="caption" runat="server"></asp:Label></H4>
+        <spring:ValidationSummary id="validationSummary" provider="summary" runat="server"></spring:ValidationSummary><BR>
+        <TABLE cellSpacing="0" cellPadding="0" width="90%" align="center" border="0">
+        <TR>
+          <TD><INPUT id="outboundFlight" type="hidden" name="outboundFlight" runat="server">
+            <asp:Repeater id="outboundFlightList" Runat="server">
+              <HeaderTemplate>
+                <table border="0" width="100%" cellpadding="0" cellspacing="0" class="suggestedTable">
+                  <thead>
+                    <tr class="suggestedTableCaption">
+                      <th colspan="7">
+                        <%= GetMessage("outboundFlights") %>
+                      </th>
+                    </tr>
+                    <tr class="suggestedTableColnames">
+                      <th>
+                        &nbsp;
+                      </th>
+                      <th>
+                        <%= GetMessage("flightNumber") %>
+                      </th>
+                      <th>
+                        <%= GetMessage("departureDate") %>
+                      </th>
+                      <th>
+                        <%= GetMessage("departureAirport") %>
+                      </th>
+                      <th>
+                        <%= GetMessage("destinationAirport") %>
+                      </th>
+                      <th>
+                        <%= GetMessage("aircraft") %>
+                      </th>
+                      <th>
+                        <%= GetMessage("seatPlan") %>
+                      </th>
+                    </tr>
+                  </thead>
+                  <tbody>
+              </HeaderTemplate>
+              <ItemTemplate>
+                <tr class="suggestedTableRow">
+                  <td>
+                    <input name="outboundFlightSelection" type="radio"
+					        onclick="outboundFlight.value = '<%# Container.ItemIndex %>';"/></td>
+                  <td><%# ((Flight) Container.DataItem).FlightNumber %></td>
+                  <td><%# ((Flight) Container.DataItem).DepartureTime.ToString() %></td>
+                  <td><%# ((Flight) Container.DataItem).DepartureAirport.Description %></td>
+                  <td><%# ((Flight) Container.DataItem).DestinationAirport.Description %></td>
+                  <td><%# ((Flight) Container.DataItem).Aircraft.Model %></td>
+                  <td><%# ((Flight) Container.DataItem).SeatPlan %></td>
+                </tr>
+              </ItemTemplate>
+              <FooterTemplate>
+      </TABLE>
+              </FooterTemplate>
+            </asp:Repeater></TD></TR>
+  <TR>
+        <TD>&nbsp;<BR>
+        </TD>
+      </TR>
+  <TR>
+        <TD><INPUT id="returnFlight" type="hidden" name="returnFlight" runat="server">
+          <asp:Repeater id="returnFlightList" Runat="server">
+            <HeaderTemplate>
+              <table border="0" width="100%" cellpadding="0" cellspacing="0" class="suggestedTable">
+                <thead>
+                  <tr class="suggestedTableCaption">
+                    <th colspan="7">
+                      <%= GetMessage("returnFlights") %>
+                    </th>
+                  </tr>
+                  <tr class="suggestedTableColnames">
+                    <th>
+                      &nbsp;</th>
+                    <th>
+                      <%= GetMessage("flightNumber") %>
+                    </th>
+                    <th>
+                      <%= GetMessage("departureDate") %>
+                    </th>
+                    <th>
+                      <%= GetMessage("departureAirport") %>
+                    </th>
+                    <th>
+                      <%= GetMessage("destinationAirport") %>
+                    </th>
+                    <th>
+                      <%= GetMessage("aircraft") %>
+                    </th>
+                    <th>
+                      <%= GetMessage("seatPlan") %>
+                    </th>
+                  </tr>
+                </thead>
+                <tbody>
+            </HeaderTemplate>
+            <ItemTemplate>
+              <tr class="suggestedTableRow">
+                <td>
+                  <input id="returnFlightSelection" name="returnFlightSelection" type="radio" 
+						          onclick="returnFlight.value = '<%# Container.ItemIndex %>';"/></td>
+                <td><%# ((Flight) Container.DataItem).FlightNumber %></td>
+                <td><%# ((Flight) Container.DataItem).DepartureTime.ToString() %></td>
+                <td><%# ((Flight) Container.DataItem).DepartureAirport.Description %></td>
+                <td><%# ((Flight) Container.DataItem).DestinationAirport.Description %></td>
+                <td><%# ((Flight) Container.DataItem).Aircraft.Model %></td>
+                <td><%# ((Flight) Container.DataItem).SeatPlan %></td>
+              </tr>
+            </ItemTemplate>
+            <FooterTemplate>
+              </tbody></table>
+            </FooterTemplate>
+          </asp:Repeater></TD>
+      </TR>
+  <TR>
+        <TD class="buttonBar"><BR>
+          <asp:Button id="bookFlights" runat="server"></asp:Button></TD>
+      </TR></TBODY></TABLE>
+    </spring:Content>
+  </body>
+</HTML>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.aspx.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.aspx.cs
new file mode 100644
index 00000000..9426fe1b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.aspx.cs
@@ -0,0 +1,215 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using Spring.Validation;
+using Spring.Web.UI;
+using SpringAir.Domain;
+using SpringAir.Service;
+
+#endregion
+
+namespace SpringAir.Web
+{
+	/// <summary>
+	/// Displays a list of suggested flights.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <author>Aleksandar Seovic</author>
+	/// <author>Marko Dumic</author>
+	/// <version>$Id: SuggestedFlights.aspx.cs,v 1.2 2006/12/07 04:22:00 aseovic Exp $</version>
+	public class SuggestedFlights : Page
+	{
+		#region Fields
+
+		private const string ReservationConfirmed = "reservationConfirmed";
+		private const int NoFlightSelected = -1;
+
+		protected FlightSuggestions flights;
+		private IBookingAgent bookingAgent;
+
+		protected int outboundFlightIndex;
+		protected int returnFlightIndex;
+
+		private IValidator flightsValidator;
+
+		#endregion
+
+		#region Controls
+
+		protected Label caption;
+		protected Button bookFlights;
+
+		protected Repeater outboundFlightList;
+		protected Repeater returnFlightList;
+
+		protected HtmlInputHidden outboundFlight;
+		protected Spring.Web.UI.Controls.Content body;
+        protected Spring.Web.UI.Controls.ValidationSummary validationSummary;
+
+		protected HtmlInputHidden returnFlight;
+
+		#endregion
+
+		#region Properties
+
+		public IBookingAgent BookingAgent
+		{
+			set { this.bookingAgent = value; }
+		}
+
+		public IValidator FlightsValidator
+		{
+			set { flightsValidator = value; }
+		}
+
+		#endregion
+
+        #region Model Management and Data Binding Methods
+
+        protected override void InitializeModel()
+        {
+            flights = (FlightSuggestions) Session[Constants.SuggestedFlightsKey];
+            outboundFlightIndex = NoFlightSelected;
+            returnFlightIndex = NoFlightSelected;
+        }
+
+        protected override void LoadModel(object savedModel)
+        {
+            IDictionary model = (IDictionary) savedModel;
+            flights = (FlightSuggestions) model["flights"];
+            outboundFlightIndex = (int) model["outboundFlightIndex"];
+            returnFlightIndex = (int) model["returnFlightIndex"];
+        }
+
+        protected override object SaveModel()
+        {
+            IDictionary model = new Hashtable();
+            model.Add("flights", flights);
+            model.Add("outboundFlightIndex", outboundFlightIndex);
+            model.Add("returnFlightIndex", returnFlightIndex);
+            return model;
+        }
+
+        protected override void InitializeDataBindings()
+        {
+            BindingManager.AddBinding("outboundFlight.Value", "outboundFlightIndex");
+            BindingManager.AddBinding("returnFlight.Value", "returnFlightIndex");
+        }
+
+        #endregion
+
+	    #region Page Lifecycle Methods
+
+		protected override void OnInit(EventArgs e)
+		{
+			InitializeComponent();
+			base.OnInit(e);
+		}
+
+		protected override void OnInitializeControls(EventArgs e)
+		{
+			base.OnInitializeControls(e);
+
+			if (!IsPostBack)
+			{
+				outboundFlightList.DataSource = flights.OutboundFlights;
+				outboundFlightList.DataBind();
+				if (flights.HasReturnFlights)
+				{
+					caption.Text = GetMessage("selectFlights");
+					returnFlightList.DataSource = flights.ReturnFlights;
+					returnFlightList.DataBind();
+				}
+				else
+				{
+					caption.Text = GetMessage("selectFlight");
+					returnFlightList.Visible = false;
+				}
+			}
+		}
+
+		protected override void OnPreRender(EventArgs e)
+		{
+			base.OnPreRender(e);
+			caption.Text = flights.HasReturnFlights
+				? GetMessage("selectFlights")
+				: GetMessage("selectFlight");
+		}
+
+		#endregion
+
+		#region Controller Methods
+
+		private void BookFlights(object sender, EventArgs e)
+		{
+//			if(Validate(this, flightsValidator)) 
+//			{
+				FlightCollection flightsToBook = GetFlightsToBook();
+				Itinerary itinerary = new Itinerary(flightsToBook);
+				// TODO: forward to next logical page and get user details...
+				ReservationConfirmation confirmation = bookingAgent.Book(
+					new Reservation(new Passenger(1, "Aleksandar", "Seovic"), itinerary));
+				Session[Constants.ReservationConfirmationKey] = confirmation;
+				SetResult(ReservationConfirmed);
+//			} 
+//			else 
+//			{
+//				this.outboundFlightIndex = NoFlightSelected;
+//				this.returnFlightIndex = NoFlightSelected;
+//			}
+		}
+
+		private FlightCollection GetFlightsToBook()
+		{
+			FlightCollection flightsToBook = new FlightCollection();
+			Flight outboundFlight = this.flights.GetOutboundFlight(outboundFlightIndex);
+			flightsToBook.Add(outboundFlight);
+			if (HasReturnFlight)
+			{
+				Flight returnFlight = this.flights.GetReturnFlight(returnFlightIndex);
+				flightsToBook.Add(returnFlight);
+			}
+			return flightsToBook;
+		}
+
+		private bool HasReturnFlight
+		{
+			get { return this.returnFlightIndex != NoFlightSelected; }
+		}
+
+		#endregion
+
+		#region Web Form Designer generated code
+
+		private void InitializeComponent()
+		{
+            this.bookFlights.Click += new System.EventHandler(this.BookFlights);
+
+        }
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.aspx.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.aspx.resx
new file mode 100644
index 00000000..af2b0121
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.aspx.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+	<data name="selectFlight" type="System.String">
+		<value>Please select flight</value>
+	</data>
+	<data name="selectFlights" type="System.String">
+		<value>Please select flights</value>
+	</data>
+	<data name="$this.bookFlights.Text">
+		<value>Book Flights</value>
+	</data>
+	<data name="error.outboundFlight.required">
+		<value>Please select an outbound flight.</value>
+	</data>
+	<data name="error.returnFlight.required">
+		<value>Please select a return flight.</value>
+	</data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.en.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.en.resx
new file mode 100644
index 00000000..523f12f8
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.en.resx
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</data>
+	<data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>False</value>
+	</data>
+	<data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>Private</value>
+	</data>
+	<data name="selectFlight" type="System.String">
+		<value>Please select flight</value>
+	</data>
+	<data name="selectFlights" type="System.String">
+		<value>Please select flights</value>
+	</data>
+	<data name="$this.bookFlights.Text">
+		<value>Book Flights</value>
+	</data>
+	<data name="error.outboundFlight.required">
+		<value>Please select an outbound flight.</value>
+	</data>
+	<data name="error.returnFlight.required">
+		<value>Please select a return flight.</value>
+	</data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.sr-SP-Cyrl.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.sr-SP-Cyrl.resx
new file mode 100644
index 00000000..1782f06e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.sr-SP-Cyrl.resx
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>True</value>
+    </data>
+    <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>False</value>
+    </data>
+    <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>Private</value>
+    </data>
+    <data name="selectFlight" type="System.String">
+        <value>Изаберите лет</value>
+    </data>
+    <data name="selectFlights" type="System.String">
+        <value>Изаберите летове</value>
+    </data>
+    <data name="$this.bookFlights.Text" type="System.String">
+        <value>Резервиши лет</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.sr-SP-Latn.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.sr-SP-Latn.resx
new file mode 100644
index 00000000..9a7194a4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/SuggestedFlights.sr-SP-Latn.resx
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>True</value>
+    </data>
+    <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>False</value>
+    </data>
+    <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>Private</value>
+    </data>
+    <data name="selectFlight" type="System.String">
+        <value>Izaberite let</value>
+    </data>
+    <data name="selectFlights" type="System.String">
+        <value>Izaberite letove</value>
+    </data>
+    <data name="$this.bookFlights.Text" type="System.String">
+        <value>Rezerviši let</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.aspx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.aspx
new file mode 100644
index 00000000..c050fe8f
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.aspx
@@ -0,0 +1,70 @@
+<%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %>
+<%@ Page language="c#" Inherits="SpringAir.Web.TripForm" CodeBehind="TripForm.aspx.cs" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<HTML>
+  <spring:Content id="head" contentPlaceholderId="head" runat="server">
+    <SCRIPT language="javascript">
+      function showReturnCalendar(isVisible)
+      {
+          document.getElementById('returningOn').style.visibility = isVisible? '': 'hidden';
+          document.getElementById('returningOnCalendar').style.visibility = isVisible? '': 'hidden';
+      }
+    </SCRIPT>
+  </spring:Content>
+  <body>
+    <spring:Content id="body" contentPlaceholderId="body" runat="server">
+      <DIV style="TEXT-ALIGN: center">
+        <H4>
+          <asp:Label id="caption" runat="server"></asp:Label></H4>
+          <spring:ValidationSummary id="validationSummary" runat="server"></spring:ValidationSummary>
+        <TABLE>
+          <TR>
+          <TR class="formLabel">
+            <TD>&nbsp;</TD>
+            <TD colSpan="3">
+              <spring:RadioButtonGroup id="tripMode" runat="server">
+                <asp:RadioButton id="OneWay" onclick="showReturnCalendar(false);" runat="server"></asp:RadioButton>
+                <asp:RadioButton id="RoundTrip" onclick="showReturnCalendar(true);" runat="server"></asp:RadioButton>
+              </spring:RadioButtonGroup></TD>
+          </TR>
+          <TR>
+            <TD class="formLabel" align="right">
+              <asp:Label id="leavingFrom" Runat="server"></asp:Label></TD>
+            <TD nowrap="true">
+              <asp:DropDownList id="leavingFromAirportCode" runat="server"></asp:DropDownList>
+              <spring:ValidationError id="departureAirportErrors" runat="server"></spring:ValidationError></TD>
+            <TD class="formLabel" align="right">
+              <asp:Label id="goingTo" Runat="server"></asp:Label></TD>
+            <TD nowrap="true">
+              <asp:DropDownList id="goingToAirportCode" runat="server"></asp:DropDownList>
+              <spring:ValidationError id="destinationAirportErrors" runat="server"></spring:ValidationError></TD>
+          </TR>
+          <TR>
+            <TD class="formLabel" align="right">
+              <asp:Label id="leavingOn" Runat="server"></asp:Label></TD>
+            <TD nowrap="true">
+              <spring:Calendar id="leavingFromDate" runat="server" width="75px" allowEditing="true" skin="system"></spring:Calendar>
+              <spring:ValidationError id="departureDateErrors" runat="server"></spring:ValidationError></TD>
+            <TD class="formLabel" align="right">
+              <asp:Label id="returningOn" Runat="server"></asp:Label></TD>
+            <TD nowrap="true">
+              <DIV id="returningOnCalendar">
+                <spring:Calendar id="returningOnDate" runat="server" width="75px" allowEditing="true" skin="system"></spring:Calendar>
+                <spring:ValidationError id="returnDateErrors" runat="server"></spring:ValidationError></DIV>
+            </TD>
+          </TR>
+          <TR>
+            <TD class="buttonBar" colSpan="4"><BR>
+              <asp:Button id="findFlights" runat="server"></asp:Button></TD>
+          </TR>
+        </TABLE>
+      </DIV>
+      <SCRIPT language="javascript">
+          if (document.getElementById('tripMode').value == 'OneWay')
+              showReturnCalendar(false);
+          else
+              showReturnCalendar(true);
+      </SCRIPT>
+    </spring:Content>
+  </body>
+</HTML>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.aspx.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.aspx.cs
new file mode 100644
index 00000000..c1ec6e43
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.aspx.cs
@@ -0,0 +1,275 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Web.UI.WebControls;
+
+using Spring.Validation;
+using Spring.Web.UI;
+using Spring.Web.UI.Controls;
+
+using SpringAir.Data;
+using SpringAir.Domain;
+using SpringAir.Service;
+
+using Calendar = Spring.Web.UI.Controls.Calendar;
+using ValidationSummary = Spring.Web.UI.Controls.ValidationSummary;
+
+#endregion
+
+namespace SpringAir.Web
+{
+    /// <summary>
+    /// Handles the 'type in your trip details and we'll see what we can find
+    /// for you' use case.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Marko Dumic</author>
+    /// <version>$Id: TripForm.aspx.cs,v 1.2 2006/12/07 04:22:00 aseovic Exp $</version>
+    public class TripForm : Page
+    {
+        #region Fields
+
+        private const string DisplaySuggestedFlights = "displaySuggestedFlights";
+
+        private IBookingAgent bookingAgent;
+        private IAirportDao airportDao;
+        private Trip trip;
+        private IValidator tripValidator;
+
+        #endregion
+
+        #region Controls
+
+        protected RadioButton OneWay;
+        protected RadioButton RoundTrip;
+        protected Label tripType;
+        protected Label caption;
+        protected Label leavingFrom;
+        protected Label leavingOn;
+        protected Label goingTo;
+        protected Label returningOn;
+        protected Button findFlights;
+
+        protected RadioButtonGroup tripMode;
+        protected DropDownList leavingFromAirportCode;
+        protected Calendar leavingFromDate;
+        protected DropDownList goingToAirportCode;
+        protected Calendar returningOnDate;
+
+        protected ValidationSummary validationSummary;
+        protected Content head;
+        protected Content body;
+        protected ValidationError firstNameValidator;
+        protected TextBox firstName;
+        protected TextBox lastName;
+        protected ValidationError lastNameValidator;
+        protected ValidationError departureAirportErrors;
+        protected ValidationError destinationAirportErrors;
+        protected ValidationError departureDateErrors;
+        protected ValidationError returnDateErrors;
+        private Airport nothingAirport;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The service interface that will handle the business logic of
+        /// booking trips and suggesting itineraries.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Is injected into this page by the Spring IoC container. You might
+        /// want to look at the definition of this page in the ~/Config/Web.xml
+        /// file to confirm exactly which implementation of the
+        /// <see cref="SpringAir.Service.IBookingAgent"/> is being injected,
+        /// and to see how this is wired together.
+        /// </p>
+        /// </remarks>
+        public IBookingAgent BookingAgent
+        {
+            set { bookingAgent = value; }
+        }
+
+        /// <summary>
+        /// This DAO object is used to retrieve a list of airports in order
+        /// to populate airport drop-down lists.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Is injected into this page by the Spring IoC container. You might
+        /// want to look at the definition of this page in the ~/Config/Web.xml
+        /// file to confirm exactly which implementation of the
+        /// <see cref="IAirportDao"/> is being injected,
+        /// and to see how this is wired together.
+        /// </p>
+        /// </remarks>
+        public IAirportDao AirportDao
+        {
+            set { airportDao = value; }
+        }
+
+        /// <summary>
+        /// The user's desired <see cref="SpringAir.Domain.Trip"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The properties of this domain object are populated from the
+        /// values present in the controls on this page, according to the
+        /// data binding definitions.
+        /// </p>
+        /// </remarks>
+        public Trip Trip
+        {
+            get { return trip; }
+            set { trip = value; }
+        }
+
+        /// <summary>
+        /// Sets the trip validator.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Unsurprisingly, this <see cref="Spring.Validation.IValidator"/>
+        /// instance will be used to validate the associated
+        /// <see cref="SpringAir.Web.TripForm.Trip"/> on a form submission. 
+        /// </p>
+        /// </remarks>
+        /// <value>The trip validator.</value>
+        public IValidator TripValidator
+        {
+            set { tripValidator = value; }
+        }
+
+        #endregion
+
+        #region Model Management and Data Binding Methods
+
+        protected override void InitializeModel()
+        {
+            trip = new Trip();
+            trip.Mode = TripMode.RoundTrip;
+            trip.StartingFrom.Date = DateTime.Today;
+            trip.ReturningFrom.Date = DateTime.Today.AddDays(1);
+        }
+
+        protected override void LoadModel(object savedModel)
+        {
+            trip = (Trip)savedModel;
+        }
+
+        protected override object SaveModel()
+        {
+            return trip;
+        }
+
+        protected override void InitializeDataBindings()
+        {
+            BindingManager.AddBinding("tripMode.Value", "Trip.Mode");
+            BindingManager.AddBinding("leavingFromAirportCode.SelectedValue", "Trip.StartingFrom.AirportCode");
+            BindingManager.AddBinding("goingToAirportCode.SelectedValue", "Trip.ReturningFrom.AirportCode");
+            BindingManager.AddBinding("leavingFromDate.SelectedDate", "Trip.StartingFrom.Date");
+            BindingManager.AddBinding("returningOnDate.SelectedDate", "Trip.ReturningFrom.Date");
+        }
+
+        #endregion
+
+        #region Page Lifecycle Methods
+
+        protected override void OnInitializeControls(EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindAirportDropdowns();
+            }
+        }
+
+        protected override void OnUserCultureChanged(EventArgs e)
+        {
+            BindAirportDropdowns();
+        }
+
+        private void BindAirportDropdowns()
+        {
+            ArrayList airportList = new ArrayList();
+            airportList.Add(GetNothingAirport());
+            airportList.AddRange(airportDao.GetAllAirports());
+
+            leavingFromAirportCode.DataSource = airportList;
+            leavingFromAirportCode.DataTextField = "Description";
+            leavingFromAirportCode.DataValueField = "Code";
+            leavingFromAirportCode.DataBind();
+
+            goingToAirportCode.DataSource = airportList;
+            goingToAirportCode.DataTextField = "Description";
+            goingToAirportCode.DataValueField = "Code";
+            goingToAirportCode.DataBind();
+        }
+
+        private Airport GetNothingAirport()
+        {
+            if (this.nothingAirport == null)
+            {
+                this.nothingAirport = new Airport(0, string.Empty, string.Empty, "-- " + GetMessage("selectAirport") + " --");
+            }
+            return this.nothingAirport;
+        }
+
+        #endregion
+
+        #region Controller Methods
+
+        private void SearchForFlights(object sender, EventArgs e)
+        {
+            if (Validate(trip, tripValidator))
+            {
+                FlightSuggestions suggestions = this.bookingAgent.SuggestFlights(Trip);
+                if (suggestions.HasOutboundFlights)
+                {
+                    Session[Constants.SuggestedFlightsKey] = suggestions;
+                    SetResult(DisplaySuggestedFlights);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Web Form Designer generated code
+
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeComponent();
+            base.OnInit(e);
+        }
+
+        private void InitializeComponent()
+        {
+            this.findFlights.Click += new EventHandler(this.SearchForFlights);
+
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.aspx.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.aspx.resx
new file mode 100644
index 00000000..78bdcce5
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.aspx.resx
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.oneWay.Text" type="System.String">
+    <value>One Way</value>
+  </data>
+  <data name="$this.roundTrip.Text" type="System.String">
+    <value>Round Trip</value>
+  </data>
+  <data name="$this.findFlights.Text" type="System.String">
+    <value>Find Flights</value>
+  </data>
+  <data name="$this.leavingFrom.Text" type="System.String">
+    <value>Leaving from:</value>
+  </data>
+  <data name="$this.leavingOn.Text" type="System.String">
+    <value>Departing on:</value>
+  </data>
+  <data name="$this.goingTo.Text" type="System.String">
+    <value>Going to:</value>
+  </data>
+  <data name="$this.returningOn.Text" type="System.String">
+    <value>Returning on:</value>
+  </data>
+  <data name="$this.caption.Text" type="System.String">
+    <value>Please enter flight information</value>
+  </data>
+  <data name="selectAirport" type="System.String">
+    <value>select airport</value>
+  </data>
+  <data name="error.firstName.required" type="System.String">
+    <value>First name is a required field</value>
+  </data>
+  <data name="error.lastName.required" type="System.String">
+    <value>Last name is a required field</value>
+  </data>
+  <data name="error.departureAirport.required" type="System.String">
+    <value>Please select departure airport</value>
+  </data>
+  <data name="error.destinationAirport.required" type="System.String">
+    <value>Please select destination airport</value>
+  </data>
+  <data name="error.departureDate.required" type="System.String">
+    <value>Departure date is required</value>
+  </data>
+  <data name="error.returnDate.required" type="System.String">
+    <value>Return date is required</value>
+  </data>
+  <data name="error.departureDate.inThePast" type="System.String">
+    <value>Departure date cannot be in the past</value>
+  </data>
+  <data name="error.returnDate.beforeDeparture" type="System.String">
+    <value>Return date cannot be before departure date</value>
+  </data>
+  <data name="error.destinationAirport.sameAsDeparture" type="System.String">
+    <value>Destination airport cannot be the same as departure airport</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.en.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.en.resx
new file mode 100644
index 00000000..ecd95a64
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.en.resx
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.oneWay.Text" type="System.String">
+    <value>One Way</value>
+  </data>
+  <data name="$this.roundTrip.Text" type="System.String">
+    <value>Round Trip</value>
+  </data>
+  <data name="$this.findFlights.Text" type="System.String">
+    <value>Find Flights</value>
+  </data>
+  <data name="$this.leavingFrom.Text" type="System.String">
+    <value>Leaving from:</value>
+  </data>
+  <data name="$this.leavingOn.Text" type="System.String">
+    <value>Departing on:</value>
+  </data>
+  <data name="$this.goingTo.Text" type="System.String">
+    <value>Going to:</value>
+  </data>
+  <data name="$this.returningOn.Text" type="System.String">
+    <value>Returning on:</value>
+  </data>
+  <data name="$this.caption.Text" type="System.String">
+    <value>Please enter flight information</value>
+  </data>
+  <data name="selectAirport" type="System.String">
+    <value>select airport</value>
+  </data>
+  <data name="error.firstName.required" type="System.String">
+    <value>First name is a required field</value>
+  </data>
+  <data name="error.lastName.required" type="System.String">
+    <value>Last name is a required field</value>
+  </data>
+  <data name="error.departureAirport.required" type="System.String">
+    <value>Please select departure airport</value>
+  </data>
+  <data name="error.destinationAirport.required" type="System.String">
+    <value>Please select destination airport</value>
+  </data>
+  <data name="error.departureDate.required" type="System.String">
+    <value>Departure date is required</value>
+  </data>
+  <data name="error.returnDate.required" type="System.String">
+    <value>Return date is required</value>
+  </data>
+  <data name="error.departureDate.inThePast" type="System.String">
+    <value>Departure date cannot be in the past</value>
+  </data>
+  <data name="error.returnDate.beforeDeparture" type="System.String">
+    <value>Return date cannot be before departure date</value>
+  </data>
+  <data name="error.destinationAirport.sameAsDeparture" type="System.String">
+    <value>Destination airport cannot be the same as departure airport</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.sr-SP-Cyrl.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.sr-SP-Cyrl.resx
new file mode 100644
index 00000000..5f77dd3a
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.sr-SP-Cyrl.resx
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.oneWay.Text" type="System.String">
+    <value>Једно�мерни лет</value>
+  </data>
+  <data name="$this.roundTrip.Text" type="System.String">
+    <value>Повратни лет</value>
+  </data>
+  <data name="$this.findFlights.Text" type="System.String">
+    <value>Пронађи лет</value>
+  </data>
+  <data name="$this.leavingFrom.Text" type="System.String">
+    <value>Полазак из:</value>
+  </data>
+  <data name="$this.leavingOn.Text" type="System.String">
+    <value>Датум пола�ка:</value>
+  </data>
+  <data name="$this.goingTo.Text" type="System.String">
+    <value>Слетање на:</value>
+  </data>
+  <data name="$this.returningOn.Text" type="System.String">
+    <value>Датум повратка:</value>
+  </data>
+  <data name="$this.caption.Text" type="System.String">
+    <value>Уне�ите податке о лету</value>
+  </data>
+  <data name="selectAirport" type="System.String">
+    <value>изаберите аеродром</value>
+  </data>
+  <data name="error.firstName.required" type="System.String">
+    <value>Име је обавезно поље</value>
+  </data>
+  <data name="error.lastName.required" type="System.String">
+    <value>Презиме је обавезно поље</value>
+  </data>
+  <data name="error.departureAirport.required" type="System.String">
+    <value>Молимо ва� изаберите полазни аеродром</value>
+  </data>
+  <data name="error.destinationAirport.required" type="System.String">
+    <value>Молимо ва� изаберите одредишни аеродром</value>
+  </data>
+  <data name="error.departureDate.required" type="System.String">
+    <value>Датум пола�ка је обавезан</value>
+  </data>
+  <data name="error.returnDate.required" type="System.String">
+    <value>Датум повратка је обавезан</value>
+  </data>
+  <data name="error.departureDate.inThePast" type="System.String">
+    <value>Датум пола�ка не може бити у прошло�ти</value>
+  </data>
+  <data name="error.returnDate.beforeDeparture" type="System.String">
+    <value>Датум повратка не може бити пре датума пола�ка</value>
+  </data>
+  <data name="error.destinationAirport.sameAsDeparture" type="System.String">
+    <value>Одредишни аеродром не може бити и�ти као полазни аеродром</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.sr-SP-Latn.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.sr-SP-Latn.resx
new file mode 100644
index 00000000..25b9eb60
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/TripForm.sr-SP-Latn.resx
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.oneWay.Text" type="System.String">
+    <value>Jednosmerni let</value>
+  </data>
+  <data name="$this.roundTrip.Text" type="System.String">
+    <value>Povratni let</value>
+  </data>
+  <data name="$this.findFlights.Text" type="System.String">
+    <value>Pronadji let</value>
+  </data>
+  <data name="$this.leavingFrom.Text" type="System.String">
+    <value>Polazak iz:</value>
+  </data>
+  <data name="$this.leavingOn.Text" type="System.String">
+    <value>Datum polaska:</value>
+  </data>
+  <data name="$this.goingTo.Text" type="System.String">
+    <value>Sletanje na:</value>
+  </data>
+  <data name="$this.returningOn.Text" type="System.String">
+    <value>Datum povratka:</value>
+  </data>
+  <data name="$this.caption.Text" type="System.String">
+    <value>Unesite podatke o letu</value>
+  </data>
+  <data name="selectAirport" type="System.String">
+    <value>izaberite aerodrom</value>
+  </data>
+  <data name="error.firstName.required" type="System.String">
+    <value>Ime je obavezno polje</value>
+  </data>
+  <data name="error.lastName.required" type="System.String">
+    <value>Prezime je obavezno polje</value>
+  </data>
+  <data name="error.departureAirport.required" type="System.String">
+    <value>Molimo vas izaberite polazni aerodrom</value>
+  </data>
+  <data name="error.destinationAirport.required" type="System.String">
+    <value>Molimo vas izaberite odredišni aerodrom</value>
+  </data>
+  <data name="error.departureDate.required" type="System.String">
+    <value>Datum polaska je obavezan</value>
+  </data>
+  <data name="error.returnDate.required" type="System.String">
+    <value>Datum povratka je obavezan</value>
+  </data>
+  <data name="error.departureDate.inThePast" type="System.String">
+    <value>Datum polaska ne može biti u prošlosti</value>
+  </data>
+  <data name="error.returnDate.beforeDeparture" type="System.String">
+    <value>Datum povratka ne može biti pre datuma polaska</value>
+  </data>
+  <data name="error.destinationAirport.sameAsDeparture" type="System.String">
+    <value>Odredišni aerodrom ne može biti isti kao polazni aerodrom</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/Web.config b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/Web.config
new file mode 100644
index 00000000..889c860d
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/BookTrip/Web.config
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<spring>
+	
+		<context>
+			<resource uri="config://spring/objects" />
+		</context>
+	
+		<objects xmlns="http://www.springframework.net" xmlns:v="http://www.springframework.net/validation">
+
+			<object type="TripForm.aspx" parent="standardPage">
+				<property name="BookingAgent" ref="bookingAgent" />
+				<property name="AirportDao" ref="airportDao" />
+				<property name="TripValidator" ref="tripValidator" />
+				<property name="Results">
+					<dictionary>
+						<entry key="displaySuggestedFlights" value="redirect:SuggestedFlights.aspx" />
+					</dictionary>
+				</property>
+			</object>
+	
+			<object type="SuggestedFlights.aspx" parent="standardPage">
+				<property name="BookingAgent" ref="bookingAgent" />
+				<property name="Results">
+					<dictionary>
+						<entry key="reservationConfirmed" value="redirect:ReservationConfirmationPage.aspx" />
+					</dictionary>
+				</property>
+			</object>
+	
+			<object type="ReservationConfirmationPage.aspx" parent="standardPage" />
+
+			<v:group id="tripValidator">
+
+				<v:required id="departureAirportValidator" test="StartingFrom.AirportCode">
+				  <v:message id="error.departureAirport.required" providers="departureAirportErrors, validationSummary"/>
+				</v:required>
+
+			  <v:group id="destinationAirportValidator">
+				  <v:required test="ReturningFrom.AirportCode">
+				    <v:message id="error.destinationAirport.required" providers="destinationAirportErrors, validationSummary"/>
+				  </v:required>
+				  <v:condition test="ReturningFrom.AirportCode != StartingFrom.AirportCode" when="ReturningFrom.AirportCode != ''">
+				    <v:message id="error.destinationAirport.sameAsDeparture" providers="destinationAirportErrors, validationSummary"/>
+				  </v:condition>
+			  </v:group>
+
+				<v:group id="departureDateValidator">
+					<v:required test="StartingFrom.Date">
+				    <v:message id="error.departureDate.required" providers="departureDateErrors, validationSummary"/>
+				  </v:required>
+					<v:condition test="StartingFrom.Date >= DateTime.Today" when="StartingFrom.Date != DateTime.MinValue">
+				    <v:message id="error.departureDate.inThePast" providers="departureDateErrors, validationSummary"/>
+					</v:condition>
+				</v:group>
+			
+				<v:group id="returnDateValidator" when="Mode == 'RoundTrip'">
+					<v:required test="ReturningFrom.Date">
+				    <v:message id="error.returnDate.required" providers="returnDateErrors, validationSummary"/>
+				  </v:required>
+					<v:condition test="ReturningFrom.Date >= StartingFrom.Date" when="ReturningFrom.Date != DateTime.MinValue">
+				    <v:message id="error.returnDate.beforeDeparture" providers="returnDateErrors, validationSummary"/>
+				  </v:condition>
+				</v:group>
+			
+			</v:group>
+
+		</objects>
+	</spring>
+</configuration>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/CSS/default.css b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/CSS/default.css
new file mode 100644
index 00000000..efd0119b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/CSS/default.css
@@ -0,0 +1,348 @@
+body
+{
+	padding: 0;
+	margin: 0;
+	width: 720px;
+	text-align: center;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+}
+
+body, table
+{
+	font-size: 12px;
+}
+
+form
+{
+	margin: 0;
+}
+
+td.formLabel
+{
+	font-weight: bold;
+	text-align: right;
+	vertical-align: baseline;
+	padding: 0 4px 0 16px;
+}
+
+.validationError
+{
+	font-size: 80%;
+	color: #c50;
+}
+
+input, select
+{
+	font-family: Tahoma, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+}
+
+/* main container box */
+#container
+{
+	width: 800px;
+	position: relative;
+	padding: 0 15px 15px;
+	margin: 5 auto;
+	text-align: left;
+}
+
+div#logo
+{
+	width: 794px;
+	height: 119px;
+}
+
+div#navigation
+{
+	width: 720px;
+	height: 20px;
+	background: #E2F3B8;
+	text-align: right;
+}
+
+#container div#content
+{
+	position: relative;
+	width: 800px;
+	height: 100%;
+	overflow: hidden;
+	background-color: #ecf1f3;
+	padding: 0;
+	margin: 0;
+}
+
+.panel11, .panel12, .panel13, .panel21, .panel23, .panel31, .panel32, .panel33
+{
+	position: absolute;
+	overflow: hidden;
+	padding: 0;
+	margin: 0;
+}
+
+.panel11
+{
+	top: 0;
+	left: 0;
+	width: 16px;
+	height: 16px;
+	z-index: 2;
+}
+.panel12
+{
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 16px;
+	z-index: 1;
+}
+.panel13
+{
+	top: 0;
+	right: 0;
+	width: 16px;
+	height: 16px;
+	z-index: 2;
+}
+
+.panel21
+{
+	top: 0;
+	left: 0;
+	width: 16px;
+	height: 100%;
+	z-index: 1;
+}
+.panel23
+{
+	top: 0;
+	right: 0;
+	width: 16px;
+	height: 100%;
+	z-index: 1;
+}
+
+.panel31
+{
+	bottom: -1px;
+	left: 0;
+	width: 16px;
+	height: 16px;
+	z-index: 2;
+}
+.panel32
+{
+	bottom: -1px;
+	left: 0;
+	width: 100%;
+	height: 16px;
+	z-index: 1;
+}
+.panel33
+{
+	bottom: -1px;
+	right: 0;
+	width: 16px;
+	height: 16px;
+	z-index: 2;
+}
+
+.panelContent
+{
+	position: relative;
+	overflow: hidden;
+	padding: 18px;
+	margin: 0;
+	z-index: 3;
+}
+
+div#insert
+{
+	width: 120;
+	float: right;
+	text-align: right;
+}
+
+.buttonBar
+{
+	height: 1.5em;
+	text-align: right;
+}
+
+#copyright
+{
+	width: 800px;
+	text-align: center;
+	font: bold 90% Tahoma, sans-serif;
+	color: div#336633;
+}
+
+#copyright img.divider
+{
+	margin: 4px 0;
+}
+
+#copyright a:link, #copyright a:visited, #copyright a:active
+{
+	text-decoration: none;
+	color: #c50;
+}
+
+#copyright a:hover
+{
+	color: #f60;
+	text-decoration: underline;
+}
+
+img.imageButton
+{
+	padding-left: 4px;
+	padding-right: 4px;
+}
+
+.readOnly
+{
+	color: #c0c0c0;
+}
+
+.error
+{
+	color: red;
+	font-weight: bold;
+	font-family: Arial, sans-serif;
+	font-size: 90%;
+}
+
+/* Table */
+.suggestedTable
+{
+	border: 1px solid #006;
+}
+.suggestedTableCaption th
+{
+	padding: 4px 2px;
+	margin: 4px;
+	line-height: 18px;
+	vertical-align: middle;
+	background-color: #006;
+	color: #fff;
+	font-size: 120%;
+}
+.suggestedTableColnames th
+{
+	text-align: left;
+	line-height: 16px;
+	padding: 4px 2px;
+	background-color: #159;
+	color: #fff;
+}
+.suggestedTableRow td
+{
+	text-align: left;
+	border-bottom: 1px solid #006;
+	padding: 4px 2px;
+}
+
+
+/* Text styles */
+content a
+{
+	text-decoration: none;
+	font-weight: bold;
+	color: #000;
+}
+content a:link
+{
+}
+content a:visited
+{
+}
+content a:active
+{
+}
+content a:hover
+{
+	text-decoration: underline;
+}
+
+content h1
+{
+	font-size: 2.0em;
+	font-weight: normal;
+	margin-top: 0em;
+	margin-bottom: 0em;
+}
+
+content h2
+{
+	font-size: 1.7em;
+	margin: 1.2em 0em 1.2em 0em;
+	font-weight: normal;
+}
+
+content h3
+{
+	font-size: 1.4em;
+	margin: 1.2em 0em 1.2em 0em;
+	font-weight: normal;
+}
+
+content h4
+{
+	font-size: 1.2em;
+	margin: 1.2em 0em 1.2em 0em;
+	font-weight: bold;
+}
+
+content h5
+{
+	font-size: 1.0em;
+	margin: 1.2em 0em 1.2em 0em;
+	font-weight: bold;
+}
+
+content h6
+{
+	font-size: 0.8em;
+	margin: 1.2em 0em 1.2em 0em;
+	font-weight: bold;
+}
+
+content img
+{
+	border: 0;
+}
+
+content ol, content ul, content li
+{
+	font-size: 1.0em;
+	line-height: 1.8em;
+	margin-top: 0.2em;
+	margin-bottom: 0.1em;
+}
+
+content p
+{
+	font-size: 1.0em;
+	line-height: 1.8em;
+	margin: 1.2em 0em 1.2em 0em;
+}
+
+content li > p
+{
+	margin-top: 0.2em;
+}
+
+content pre
+{
+	font-family: monospace;
+	font-size: 1.0em;
+}
+
+content strong, content b
+{
+	font-weight: bold;
+}
+
+
+
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Home.aspx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Home.aspx
new file mode 100644
index 00000000..b7d06249
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Home.aspx
@@ -0,0 +1,27 @@
+<%@ Page language="c#" Inherits="SpringAir.Web.Home" CodeBehind="Home.aspx.cs" %>
+<%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<html>
+	<body>
+		<spring:Content id="body" contentPlaceholderId="body" runat="server">
+			<p>
+	            SpringAir models a flight reservation system.
+                <br />
+	            Using SpringAir, you can browse flights, <a href="BookTrip/TripForm.aspx">book a trip</a> and use <a href="../BookingAgentWebService.asmx">Booking Agent Web Service</a>.
+            </p>
+			<p>
+				SpringAir demonstrates the following features of Spring.NET's web support...
+			</p>
+			<ul>
+				<li>Spring.NET IoC container configuration</li>
+				<li>Dependency Injection as applied to ASP.NET pages</li>
+				<li>Master Page support in ASP.NET 1.1</li>
+				<li>Bi-directional databinding</li>
+				<li>Web Service support</li>
+				<li>Declarative validation of domain objects</li>
+				<li>Internationalization</li>
+				<li>Result mapping to better encapsulate page navigation flows</li>
+			</ul>
+		</spring:Content>
+	</body>
+</html>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Home.aspx.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Home.aspx.cs
new file mode 100644
index 00000000..ef1db38b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Home.aspx.cs
@@ -0,0 +1,66 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using Common.Logging;
+using System;
+using Spring.Web.UI;
+using Spring.Web.UI.Controls;
+
+#endregion
+
+namespace SpringAir.Web
+{
+	/// <summary>
+	/// The SpringAir home page.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: Home.aspx.cs,v 1.2 2006/11/15 20:30:52 aseovic Exp $</version>
+	public class Home : Page
+	{
+		protected Content body;
+		private static readonly ILog logger = LogManager.GetLogger(typeof (Home));
+
+		private void Page_Load(object sender, EventArgs e)
+		{
+			if (logger.IsDebugEnabled)
+			{
+				logger.Debug(string.Format(this.CultureResolver.ResolveCulture(),
+				                           "The [{0}] page is being loaded...", GetType().Name));
+			}
+		}
+
+		#region Web Form Designer generated code
+
+		protected override void OnInit(EventArgs e)
+		{
+			InitializeComponent();
+			base.OnInit(e);
+		}
+
+		private void InitializeComponent()
+		{
+			this.Load += new EventHandler(this.Page_Load);
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Home.aspx.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Home.aspx.resx
new file mode 100644
index 00000000..f0e11baa
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Home.aspx.resx
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/calendar-1.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/calendar-1.gif
new file mode 100644
index 00000000..6774ca5c
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/calendar-1.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/calendar-2.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/calendar-2.gif
new file mode 100644
index 00000000..9d5d666d
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/calendar-2.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/en/spring-air-logo.jpg b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/en/spring-air-logo.jpg
new file mode 100644
index 00000000..21e6c575
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/en/spring-air-logo.jpg differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/line.jpg b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/line.jpg
new file mode 100644
index 00000000..fedb4290
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/line.jpg differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-bottom-left.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-bottom-left.gif
new file mode 100644
index 00000000..1323ec04
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-bottom-left.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-bottom-middle.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-bottom-middle.gif
new file mode 100644
index 00000000..38aa28ea
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-bottom-middle.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-bottom-right.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-bottom-right.gif
new file mode 100644
index 00000000..9815bced
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-bottom-right.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-left-middle.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-left-middle.gif
new file mode 100644
index 00000000..76133d5e
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-left-middle.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-right-middle.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-right-middle.gif
new file mode 100644
index 00000000..9b1140ef
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-right-middle.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-top-left.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-top-left.gif
new file mode 100644
index 00000000..fade635c
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-top-left.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-top-middle.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-top-middle.gif
new file mode 100644
index 00000000..f982015e
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-top-middle.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-top-right.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-top-right.gif
new file mode 100644
index 00000000..bafcbecb
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/panel-top-right.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/spring-air-logo.jpg b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/spring-air-logo.jpg
new file mode 100644
index 00000000..21e6c575
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/spring-air-logo.jpg differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/sr-SP-Cyrl/spring-air-logo.jpg b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/sr-SP-Cyrl/spring-air-logo.jpg
new file mode 100644
index 00000000..bfeb3609
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/sr-SP-Cyrl/spring-air-logo.jpg differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/sr-SP-Latn/spring-air-logo.jpg b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/sr-SP-Latn/spring-air-logo.jpg
new file mode 100644
index 00000000..36c8b822
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/sr-SP-Latn/spring-air-logo.jpg differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/validation-error.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/validation-error.gif
new file mode 100644
index 00000000..0bf0858b
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Images/validation-error.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/StandardTemplate.ascx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/StandardTemplate.ascx
new file mode 100644
index 00000000..9c205fe3
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/StandardTemplate.ascx
@@ -0,0 +1,49 @@
+<%@ Control language="c#" AutoEventWireup="false" inherits="SpringAir.Web.StandardTemplate" codebehind="StandardTemplate.ascx.cs" %>
+<%@ Register TagPrefix="spring" Namespace="Spring.Web.UI.Controls" Assembly="Spring.Web" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<html>
+  <spring:Head runat="server">
+    <title>
+      <spring:ContentPlaceHolder id="title" runat="server">
+            <%= GetMessage("default.title") %>  
+      </spring:ContentPlaceHolder>
+    </title>
+    <link href="<%= Page.CssRoot %>/default.css" type="text/css" rel="stylesheet">
+    <spring:ContentPlaceHolder id="head" runat="server"></spring:ContentPlaceHolder>
+  </spring:Head>
+  <body>
+    <form id="form" method="post" runat="server">
+      <div id="container">
+        <div id="logo">
+          <spring:LocalizedImage id="logoImage" imageName="spring-air-logo.jpg" borderWidth="0" runat="server" />
+        </div>
+        <div id="content">
+          <div class="panel11" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-top-left.gif)"></div>
+          <div class="panel12" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-top-middle.gif)"></div>
+          <div class="panel13" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-top-right.gif)"></div>
+          <div class="panel21" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-left-middle.gif)"></div>
+          <div class="panel23" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-right-middle.gif)"></div>
+          <div class="panel31" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-bottom-left.gif)"></div>
+          <div class="panel32" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-bottom-middle.gif)"></div>
+          <div class="panel33" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-bottom-right.gif)"></div>
+          <div class="panelContent">
+            <spring:ContentPlaceHolder id="body" runat="server" />
+            <br>
+            <br>
+          </div>
+        </div>
+        <div id="copyright">
+          <img class="divider" src="<%= Page.ImagesRoot %>/line.jpg" alt="" width="500" height="1">
+          <br>
+          © Copyright 2005-2006, <a href="http://www.springframework.net/" title="Spring.NET Framework">
+            Spring.NET</a>, under the terms of the Apache 2.0 software license
+          license.
+          <br>
+          <asp:LinkButton ID="english" Runat="server" CommandArgument="en-US" CausesValidation="False">English</asp:LinkButton>&nbsp;
+          <asp:LinkButton ID="serbianLatin" Runat="server" CommandArgument="sr-SP-Latn" CausesValidation="False">Srpski</asp:LinkButton>&nbsp;
+          <asp:LinkButton ID="serbianCyrillic" Runat="server" CommandArgument="sr-SP-Cyrl" CausesValidation="False">Срп�ки</asp:LinkButton>
+        </div>
+      </div>
+    </form>
+  </body>
+</html>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/StandardTemplate.ascx.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/StandardTemplate.ascx.cs
new file mode 100644
index 00000000..00ce2df4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/StandardTemplate.ascx.cs
@@ -0,0 +1,74 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Web.UI.WebControls;
+using Spring.Web.UI;
+using Spring.Web.UI.Controls;
+
+#endregion
+
+namespace SpringAir.Web
+{
+    /// <summary>
+    /// SpringAir master page.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    public class StandardTemplate : MasterPage
+    {
+        protected ContentPlaceHolder head;
+        protected System.Web.UI.WebControls.Button submit;
+        protected Spring.Web.UI.Controls.Head Head1;
+        protected Spring.Web.UI.Controls.LocalizedImage logoImage;
+        protected System.Web.UI.HtmlControls.HtmlForm form;
+        protected ContentPlaceHolder body;
+
+        protected LinkButton english;
+        protected LinkButton serbianLatin;
+        protected LinkButton serbianCyrillic;
+
+        private void SetLanguage(object sender, CommandEventArgs e)
+        {
+            UserCulture = new CultureInfo((string) e.CommandArgument);
+        }
+
+
+        #region Web Form Designer generated code
+
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeComponent();
+            base.OnInit(e);
+        }
+
+        private void InitializeComponent()
+        {
+            this.english.Command += new CommandEventHandler(this.SetLanguage);
+            this.serbianLatin.Command += new CommandEventHandler(this.SetLanguage);
+            this.serbianCyrillic.Command += new CommandEventHandler(this.SetLanguage);
+        }
+
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/StandardTemplate.ascx.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/StandardTemplate.ascx.resx
new file mode 100644
index 00000000..b1fe6ff3
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/StandardTemplate.ascx.resx
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Web.config b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Web.config
new file mode 100644
index 00000000..c3a1dd4a
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2003/Web/Web.config
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<spring>
+		<context>
+			<resource uri="config://spring/objects" />
+		</context>
+		<objects xmlns="http://www.springframework.net">
+
+			<!-- Page definitions -->
+			<object type="Home.aspx" parent="standardPage" />
+		  
+		</objects>
+	</spring>
+</configuration>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/AssemblyInfo.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/AssemblyInfo.cs
new file mode 100644
index 00000000..723658af
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/AssemblyInfo.cs
@@ -0,0 +1,50 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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;
+using System.Runtime.InteropServices;
+using System.Security.Permissions;
+using Spring.Context.Support;
+
+[assembly: AssemblyTitle("SpringAir Web References")]
+[assembly: AssemblyDescription("SpringAir Web References Only")]
+[assembly: AssemblyVersion("1.0.0.0")]
+
+[assembly: AssemblyConfiguration("net-1.1.win32; Release")]
+[assembly: AssemblyCompany("http://www.springframework.net/")]
+[assembly: AssemblyProduct("Spring.NET")]
+[assembly: AssemblyCopyright("Copyright © 2002-2005. Licensed under the Apache License, Version 2.0")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)]
+
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
+
+namespace SpringAir
+{
+    // this is a "trick" to force csc to copy over referenced assemblies
+    internal class AssemblyReferences
+    {
+        private static Type SpringWeb = typeof(WebApplicationContext);
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2005.References.csproj b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2005.References.csproj
new file mode 100644
index 00000000..ad039549
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005.References/SpringAir.Web.2005.References.csproj
@@ -0,0 +1,81 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0925F8C7-B2AB-4DD7-AF6D-10DD028C5910}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>SpringAir</RootNamespace>
+    <AssemblyName>SpringAir.Web.2005.References</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>.</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>.</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\Net\2.0\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Aop, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Web, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SpringAir.Core\SpringAir.Core.2005.csproj">
+      <Project>{5E3427D8-62FC-483F-A86B-B44A79A46BCC}</Project>
+      <Name>SpringAir.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\SpringAir.Data.Ado\SpringAir.Data.Ado.2005.csproj">
+      <Project>{78B285FE-27F3-44F4-84B1-7A589AB48EF3}</Project>
+      <Name>SpringAir.Data.Ado.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_Code/Constants.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_Code/Constants.cs
new file mode 100644
index 00000000..2ddd82b9
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_Code/Constants.cs
@@ -0,0 +1,75 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+/// <summary>
+/// Constants for all of the various lookup keys used throughout the
+/// application (to pull objects from the session, request, etc).
+/// </summary>
+/// <remarks>
+/// <p>
+/// Values could be injected into pages that needed them using the
+/// <see cref="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject"/>
+/// (if one wanted to go there).
+/// </p>
+/// </remarks>
+/// <author>Rick Evans</author>
+/// <version>$Id: Constants.cs,v 1.1 2006/11/01 02:44:33 bbaia Exp $</version>
+public sealed class Constants
+{
+    /// <summary>
+    /// The key used to index into the AppSettings dictionary containing
+    /// the path to the Log4Net configuration file.
+    /// </summary>
+    public const string Log4NetConfigFile = "Log4NetConfigFile";
+
+    /// <summary>
+    /// The key under which the suggested flights for a user's trip
+    /// search are stored.
+    /// </summary>
+    public const string SuggestedFlightsKey = "suggestedFlights";
+
+    /// <summary>
+    /// The key under which the reservation confirmation for a user's trip
+    /// search are stored.
+    /// </summary>
+    public const string ReservationConfirmationKey = "reservationConfirmation";
+
+    #region Constructor (s) / Destructor
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="SpringAir.Constants"/> class.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This is a utility class, and as such exposes no public constructors.
+    /// </p>
+    /// </remarks>
+    private Constants()
+    {
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.en.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.en.resx
new file mode 100644
index 00000000..9488c89c
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.en.resx
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="default.title">
+    <value>SpringAir - Spring.NET Reference Application</value>
+  </data>
+  <data name="flightNumber" type="System.String">
+    <value>Flight #</value>
+  </data>
+  <data name="departureDate" type="System.String">
+    <value>Departure Time</value>
+  </data>
+  <data name="departureAirport" type="System.String">
+    <value>Departure Airport</value>
+  </data>
+  <data name="destinationAirport" type="System.String">
+    <value>Destination Airport</value>
+  </data>
+  <data name="aircraft" type="System.String">
+    <value>Aircraft Type</value>
+  </data>
+  <data name="seatPlan" type="System.String">
+    <value>Seat Plan</value>
+  </data>
+  <data name="outboundFlights" type="System.String">
+    <value>Outbound Flights</value>
+  </data>
+  <data name="returnFlights" type="System.String">
+    <value>Return Flights</value>
+  </data>
+  <data name="itinerary" type="System.String">
+    <value>Itinerary</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.resx
new file mode 100644
index 00000000..9488c89c
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.resx
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="default.title">
+    <value>SpringAir - Spring.NET Reference Application</value>
+  </data>
+  <data name="flightNumber" type="System.String">
+    <value>Flight #</value>
+  </data>
+  <data name="departureDate" type="System.String">
+    <value>Departure Time</value>
+  </data>
+  <data name="departureAirport" type="System.String">
+    <value>Departure Airport</value>
+  </data>
+  <data name="destinationAirport" type="System.String">
+    <value>Destination Airport</value>
+  </data>
+  <data name="aircraft" type="System.String">
+    <value>Aircraft Type</value>
+  </data>
+  <data name="seatPlan" type="System.String">
+    <value>Seat Plan</value>
+  </data>
+  <data name="outboundFlights" type="System.String">
+    <value>Outbound Flights</value>
+  </data>
+  <data name="returnFlights" type="System.String">
+    <value>Return Flights</value>
+  </data>
+  <data name="itinerary" type="System.String">
+    <value>Itinerary</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.sr-Cyrl-CS.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.sr-Cyrl-CS.resx
new file mode 100644
index 00000000..49fcdac9
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.sr-Cyrl-CS.resx
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="default.title">
+    <value>SpringAir - Референтна апликација за Spring.NET</value>
+  </data>
+  <data name="flightNumber" type="System.String">
+    <value>Лет #</value>
+  </data>
+  <data name="departureDate" type="System.String">
+    <value>Време полетања</value>
+  </data>
+  <data name="departureAirport" type="System.String">
+    <value>�еродром одла�ка</value>
+  </data>
+  <data name="destinationAirport" type="System.String">
+    <value>�еродром дола�ка</value>
+  </data>
+  <data name="aircraft" type="System.String">
+    <value>Тип авиона</value>
+  </data>
+  <data name="seatPlan" type="System.String">
+    <value>План �едишта</value>
+  </data>
+  <data name="outboundFlights" type="System.String">
+    <value>Одлазни летови</value>
+  </data>
+  <data name="returnFlights" type="System.String">
+    <value>Повратни летови</value>
+  </data>
+  <data name="itinerary" type="System.String">
+    <value>Резерви�ани летови</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.sr-Latn-CS.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.sr-Latn-CS.resx
new file mode 100644
index 00000000..3a381575
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.sr-Latn-CS.resx
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="default.title">
+    <value>SpringAir - Referentna aplikacija za Spring.NET</value>
+  </data>
+  <data name="flightNumber" type="System.String">
+    <value>Let #</value>
+  </data>
+  <data name="departureDate" type="System.String">
+    <value>Vreme poletanja</value>
+  </data>
+  <data name="departureAirport" type="System.String">
+    <value>Aerodrom odlaska</value>
+  </data>
+  <data name="destinationAirport" type="System.String">
+    <value>Aerodrom dolaska</value>
+  </data>
+  <data name="aircraft" type="System.String">
+    <value>Tip aviona</value>
+  </data>
+  <data name="seatPlan" type="System.String">
+    <value>Plan sedišta</value>
+  </data>
+  <data name="outboundFlights" type="System.String">
+    <value>Odlazni letovi</value>
+  </data>
+  <data name="returnFlights" type="System.String">
+    <value>Povratni letovi</value>
+  </data>
+  <data name="itinerary" type="System.String">
+    <value>Rezervisani letovi</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.sr-SP-Cyrl.resx.exclude b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.sr-SP-Cyrl.resx.exclude
new file mode 100644
index 00000000..49fcdac9
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.sr-SP-Cyrl.resx.exclude
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="default.title">
+    <value>SpringAir - Референтна апликација за Spring.NET</value>
+  </data>
+  <data name="flightNumber" type="System.String">
+    <value>Лет #</value>
+  </data>
+  <data name="departureDate" type="System.String">
+    <value>Време полетања</value>
+  </data>
+  <data name="departureAirport" type="System.String">
+    <value>�еродром одла�ка</value>
+  </data>
+  <data name="destinationAirport" type="System.String">
+    <value>�еродром дола�ка</value>
+  </data>
+  <data name="aircraft" type="System.String">
+    <value>Тип авиона</value>
+  </data>
+  <data name="seatPlan" type="System.String">
+    <value>План �едишта</value>
+  </data>
+  <data name="outboundFlights" type="System.String">
+    <value>Одлазни летови</value>
+  </data>
+  <data name="returnFlights" type="System.String">
+    <value>Повратни летови</value>
+  </data>
+  <data name="itinerary" type="System.String">
+    <value>Резерви�ани летови</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.sr-SP-Latn.resx.exclude b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.sr-SP-Latn.resx.exclude
new file mode 100644
index 00000000..3a381575
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/App_GlobalResources/Strings.sr-SP-Latn.resx.exclude
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="default.title">
+    <value>SpringAir - Referentna aplikacija za Spring.NET</value>
+  </data>
+  <data name="flightNumber" type="System.String">
+    <value>Let #</value>
+  </data>
+  <data name="departureDate" type="System.String">
+    <value>Vreme poletanja</value>
+  </data>
+  <data name="departureAirport" type="System.String">
+    <value>Aerodrom odlaska</value>
+  </data>
+  <data name="destinationAirport" type="System.String">
+    <value>Aerodrom dolaska</value>
+  </data>
+  <data name="aircraft" type="System.String">
+    <value>Tip aviona</value>
+  </data>
+  <data name="seatPlan" type="System.String">
+    <value>Plan sedišta</value>
+  </data>
+  <data name="outboundFlights" type="System.String">
+    <value>Odlazni letovi</value>
+  </data>
+  <data name="returnFlights" type="System.String">
+    <value>Povratni letovi</value>
+  </data>
+  <data name="itinerary" type="System.String">
+    <value>Rezervisani letovi</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Aspects.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Aspects.xml
new file mode 100644
index 00000000..63fd8d3f
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Aspects.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<objects xmlns="http://www.springframework.net">
+
+  <!-- Cache aspect -->
+  <object id="CacheAspect" type="Spring.Aspects.Cache.CacheAspect, Spring.Aop"/>
+  <object id="AspNetCache" type="Spring.Caching.AspNetCache, Spring.Web"/>
+  
+  
+  <!-- Apply aspects to DAOs -->
+  <object type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+    <property name="ObjectNames">
+      <list>
+        <value>*Dao</value>
+      </list>
+    </property>
+    <property name="InterceptorNames">
+      <list>
+        <value>CacheAspect</value>
+      </list>
+    </property>
+  </object>
+
+  <object id="validationAdvice" type="Spring.Aspects.Validation.ParameterValidationAdvice, Spring.Aop"/>
+
+  <object type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+    <property name="ObjectNames">
+      <list>
+        <value>bookingAgent</value>
+      </list>
+    </property>
+    <property name="InterceptorNames">
+      <list>
+        <value>validationAdvice</value>
+      </list>
+    </property>
+  </object>
+
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Log4Net.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Log4Net.xml
new file mode 100644
index 00000000..8441780e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Log4Net.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<log4net debug="true">
+	<appender name="AspNetTraceAppender" type="log4net.Appender.AspNetTraceAppender">
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="[%thread] %-5level - %message" />
+		</layout>
+	</appender>
+	<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" />
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline" />
+		</layout>
+	</appender>
+
+    <appender name="TraceAppender" type="log4net.Appender.TraceAppender">
+        <layout type="log4net.Layout.PatternLayout">
+            <conversionPattern value="%-5p: %m" />
+        </layout>
+    </appender>
+
+	<!-- Set default logging level to DEBUG -->
+	<root>
+		<level value="DEBUG" />
+		<appender-ref ref="AspNetTraceAppender" />
+		<appender-ref ref="TraceAppender" />
+		<appender-ref ref="RollingFileAppender" />
+	</root>
+	<!--
+		In Spring.NET there is a 1-1 correspondence between the logger name and
+		the namespace of the class doing the logging...
+	-->
+	<logger name="Spring">
+		<level value="DEBUG" />
+	</logger>
+</log4net>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Production/Dao.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Production/Dao.xml
new file mode 100644
index 00000000..b587b497
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Production/Dao.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database">
+
+  <description>
+    The SpringAir object definitions for the Data Access Objects.
+  </description>
+
+  <!-- Property placeholder configurer for database settings -->
+  <object type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core">
+    <property name="ConfigSections" value="databaseSettings"/>
+  </object>
+
+  <!-- Production Data Access Objects -->
+  <db:provider id="dbProvider" 
+                 provider="SqlServer-1.1" 
+                 connectionString="Server=${db.server};Integrated Security=no;User ID=${db.user};PWD=${db.password};initial catalog=${db.schema};"/>
+
+  <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
+    <property name="DbProvider" ref="dbProvider"/>
+  </object>
+
+  <object id="aircraftDao" type="SpringAir.Data.Ado.AircraftDao, SpringAir.Data.Ado">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="airportDao" type="SpringAir.Data.Ado.AirportDao, SpringAir.Data.Ado">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="flightDao" type="SpringAir.Data.Ado.FlightDao, SpringAir.Data.Ado">
+    <constructor-arg index="0" ref="aircraftDao"/>
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Production/Services.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Production/Services.xml
new file mode 100644
index 00000000..17dc3109
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Production/Services.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+    <description>
+        The SpringAir object definitions for the middle (service) tier.
+    </description>
+
+    <!-- Production service definitions -->
+    <object id="bookingAgent" type="SpringAir.Service.DefaultBookingAgent, SpringAir.Core">
+        <description>
+            The main service interface for the SpringAir application.
+        </description>
+        <constructor-arg name="airportDao" ref="airportDao" />
+        <constructor-arg name="flightDao" ref="flightDao" />
+    </object>
+
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Services.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Services.xml
new file mode 100644
index 00000000..ca2763fb
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Services.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <description>
+    The SpringAir object definitions for the middle (service) tier.
+  </description>
+
+  <!-- Web service definitions -->
+  <object id="bookingAgentWebService" name="/BookingAgent.asmx" type="Spring.Web.Services.WebServiceExporter, Spring.Web">
+    <property name="TargetName" value="bookingAgent"/>
+    <property name="Name" value="BookingAgent"/>
+    <property name="Namespace" value="http://SpringAir/WebServices"/>
+    <property name="Description" value="SpringAir Booking Agent Web Service"/>
+    <property name="MemberAttributes">
+      <dictionary>
+        <entry key="SuggestFlights">
+          <object type="System.Web.Services.WebMethodAttribute, System.Web.Services">
+            <property name="Description" value="Gets those flight suggestions that are applicable for the supplied trip."/>
+          </object>
+        </entry>
+        <entry key="Book">
+          <object type="System.Web.Services.WebMethodAttribute, System.Web.Services">
+            <property name="Description" value="Goes ahead and actually books what up until this point has been a transient reservation."/>
+          </object>
+        </entry>
+        <entry key="GetAirportList">
+          <object type="System.Web.Services.WebMethodAttribute, System.Web.Services">
+            <property name="Description" value="Return a collection of all those airports that can be used for the purposes of booking."/>
+          </object>
+        </entry>
+      </dictionary>
+    </property>
+  </object>
+
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Test/Dao.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Test/Dao.xml
new file mode 100644
index 00000000..484d71b8
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Test/Dao.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+    <description>
+        The SpringAir object definitions for the Data Access Objects.
+    </description>
+
+    <!-- Test stubs for Data Access Objects -->
+    <object id="aircraftDao" type="SpringAir.Data.Ado.AircraftDaoStub, SpringAir.Data.Ado"/>
+    
+    <object id="airportDao" type="SpringAir.Data.Ado.AirportDaoStub, SpringAir.Data.Ado"/>
+    
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Test/Services.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Test/Services.xml
new file mode 100644
index 00000000..bd2a6f89
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Test/Services.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+    <description>
+        The SpringAir object definitions for the middle (service) tier.
+    </description>
+
+    <!-- Service stubs that can be used for testing without the database -->
+    <object id="bookingAgent" type="SpringAir.Service.BookingAgentStub, SpringAir.Core">
+        <constructor-arg name="airportDao" ref="airportDao" />
+        <constructor-arg name="aircraftDao" ref="aircraftDao" />
+    </object>
+    
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Validation.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Validation.xml
new file mode 100644
index 00000000..4816dc0e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Validation.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<objects xmlns="http://www.springframework.net" xmlns:v="http://www.springframework.net/validation">
+
+  <v:group id="tripValidator">
+
+    <v:required id="departureAirportValidator" test="StartingFrom.AirportCode">
+      <v:message id="error.departureAirport.required" providers="departureAirportErrors, validationSummary"/>
+    </v:required>
+
+    <v:group id="destinationAirportValidator">
+      <v:required test="ReturningFrom.AirportCode">
+        <v:message id="error.destinationAirport.required" providers="destinationAirportErrors, validationSummary"/>
+      </v:required>
+      <v:condition test="ReturningFrom.AirportCode != StartingFrom.AirportCode" when="ReturningFrom.AirportCode != ''">
+        <v:message id="error.destinationAirport.sameAsDeparture" providers="destinationAirportErrors, validationSummary"/>
+      </v:condition>
+    </v:group>
+
+    <v:group id="departureDateValidator">
+      <v:required test="StartingFrom.Date">
+        <v:message id="error.departureDate.required" providers="departureDateErrors, validationSummary"/>
+      </v:required>
+      <v:condition test="StartingFrom.Date >= DateTime.Today" when="StartingFrom.Date != DateTime.MinValue">
+        <v:message id="error.departureDate.inThePast" providers="departureDateErrors, validationSummary"/>
+      </v:condition>
+    </v:group>
+
+    <v:group id="returnDateValidator" when="Mode == 'RoundTrip'">
+      <v:required test="ReturningFrom.Date">
+        <v:message id="error.returnDate.required" providers="returnDateErrors, validationSummary"/>
+      </v:required>
+      <v:condition test="ReturningFrom.Date >= StartingFrom.Date" when="ReturningFrom.Date != DateTime.MinValue">
+        <v:message id="error.returnDate.beforeDeparture" providers="returnDateErrors, validationSummary"/>
+      </v:condition>
+    </v:group>
+
+  </v:group>
+
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Web.xml b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Web.xml
new file mode 100644
index 00000000..16e71ef8
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Config/Web.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <!-- Localization-related config objects -->
+  <object id="cultureResolver" type="Spring.Globalization.Resolvers.SessionCultureResolver, Spring.Web" />
+  
+  <object id="localizer" type="Spring.Globalization.Localizers.ResourceSetLocalizer, Spring.Core" />
+  
+  <object id="messageSource" type="Spring.Context.Support.ResourceSetMessageSource, Spring.Core">
+    <property name="ResourceManagers">
+      <list>
+        <value>Resources.Strings, App_GlobalResources</value>
+      </list>
+    </property>
+    <property name="UseCodeAsDefaultMessage" value="true" />
+  </object>
+
+  <!-- Validation errors renderer configuration -->
+  <object id="Spring.Web.UI.Controls.ValidationError" abstract="true">
+    <property name="Renderer">
+      <object type="Spring.Web.UI.Validation.IconValidationErrorsRenderer, Spring.Web">
+        <property name="IconSrc" value="validation-error.gif"/>
+      </object>
+    </property>
+  </object>
+
+  <object id="Spring.Web.UI.Controls.ValidationSummary" abstract="true">
+    <property name="Renderer">
+      <object type="Spring.Web.UI.Validation.DivValidationErrorsRenderer, Spring.Web">
+        <property name="CssClass" value="validationError"/>
+      </object>
+    </property>
+  </object>
+
+  <!-- Base page definition. All other pages inherit these settings -->
+  <object id="standardPage" abstract="true">
+    <property name="MasterPageFile" value="~/Web/StandardTemplate.master"/>
+    <property name="CultureResolver" ref="cultureResolver"/>
+    <property name="Localizer" ref="localizer"/>
+    <property name="ScriptsRoot" value="~/Scripts" />
+    <property name="CssRoot" value="~/Web/CSS"/>
+    <property name="ImagesRoot" value="~/Web/Images"/>
+  </object>
+
+</objects>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Global.asax b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Global.asax
new file mode 100644
index 00000000..f859930c
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Global.asax
@@ -0,0 +1,32 @@
+<%@ Application Language="C#" %>
+
+<script runat="server">
+
+    void Application_Start(object sender, EventArgs e) 
+    {}
+    
+    void Application_End(object sender, EventArgs e) 
+    {}
+        
+    void Application_Error(object sender, EventArgs e) 
+    { 
+        // Code that runs when an unhandled error occurs
+
+    }
+
+    void Session_Start(object sender, EventArgs e) 
+    {
+        // Code that runs when a new session is started
+
+    }
+
+    void Session_End(object sender, EventArgs e) 
+    {
+        // Code that runs when a session ends. 
+        // Note: The Session_End event is raised only when the sessionstate mode
+        // is set to InProc in the Web.config file. If session mode is set to StateServer 
+        // or SQLServer, the event is not raised.
+
+    }
+       
+</script>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-blue.css b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-blue.css
new file mode 100644
index 00000000..62ecf99e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-blue.css
@@ -0,0 +1,232 @@
+/* The main calendar widget.  DIV containing a table. */
+
+div.calendar { position: relative; }
+
+.calendar, .calendar table {
+  border: 1px solid #556;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #eef;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;    /* They are the navigation buttons */
+  padding: 2px;          /* Make the buttons seem like they're pressing */
+}
+
+.calendar .nav {
+  background: #778 url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;      /* Pressing it will take you to the current date */
+  text-align: center;
+  background: #fff;
+  color: #000;
+  padding: 2px;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+  background: #778;
+  color: #fff;
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+  background: #bdf;
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #556;
+  padding: 2px;
+  text-align: center;
+  color: #000;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #a66;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  background-color: #aaf;
+  color: #000;
+  border: 1px solid #04f;
+  padding: 1px;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  background-color: #77c;
+  padding: 2px 0px 0px 2px;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  color: #456;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #bbb;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #fbb;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #bdf;
+}
+
+.calendar tbody .rowhilite td {
+  background: #def;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #eef;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  background: #def;
+  padding: 1px 3px 1px 1px;
+  border: 1px solid #bbb;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  background: #cde;
+  padding: 2px 2px 0px 2px;
+}
+
+.calendar tbody td.selected { /* Cell showing today date */
+  font-weight: bold;
+  border: 1px solid #000;
+  padding: 1px 3px 1px 1px;
+  background: #fff;
+  color: #000;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #a66;
+}
+
+.calendar tbody td.today { /* Cell showing selected date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+  text-align: center;
+  background: #556;
+  color: #fff;
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: #fff;
+  color: #445;
+  border-top: 1px solid #556;
+  padding: 1px;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  background: #aaf;
+  border: 1px solid #04f;
+  color: #000;
+  padding: 1px;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  background: #77c;
+  padding: 2px 0px 0px 2px;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  top: 0px;
+  left: 0px;
+  width: 4em;
+  cursor: default;
+  border: 1px solid #655;
+  background: #def;
+  color: #000;
+  font-size: 90%;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .hilite {
+  background: #acf;
+}
+
+.calendar .combo .active {
+  border-top: 1px solid #46a;
+  border-bottom: 1px solid #46a;
+  background: #eef;
+  font-weight: bold;
+}
+
+.calendar td.time {
+  border-top: 1px solid #000;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #f4f0e8;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #667;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-blue2.css b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-blue2.css
new file mode 100644
index 00000000..8570affc
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-blue2.css
@@ -0,0 +1,236 @@
+/* The main calendar widget.  DIV containing a table. */
+
+div.calendar { position: relative; }
+
+.calendar, .calendar table {
+  border: 1px solid #206A9B;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #F1F8FC;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;    /* They are the navigation buttons */
+  padding: 2px;          /* Make the buttons seem like they're pressing */
+}
+
+.calendar .nav {
+  background: #007ED1 url(menuarrow2.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;      /* Pressing it will take you to the current date */
+  text-align: center;
+  background: #000;
+  color: #fff;
+  padding: 2px;
+}
+
+.calendar thead tr { /* Row <TR> containing navigation buttons */
+  background: #007ED1;
+  color: #fff;
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+  background: #C7E1F3;
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #206A9B;
+  padding: 2px;
+  text-align: center;
+  color: #000;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #a66;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  background-color: #34ABFA;
+  color: #000;
+  border: 1px solid #016DC5;
+  padding: 1px;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  background-color: #006AA9;
+  border: 1px solid #008AFF;
+  padding: 2px 0px 0px 2px;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  color: #456;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #bbb;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #fbb;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #C7E1F3;
+}
+
+.calendar tbody .rowhilite td {
+  background: #def;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #F1F8FC;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  background: #def;
+  padding: 1px 3px 1px 1px;
+  border: 1px solid #8FC4E8;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  background: #cde;
+  padding: 2px 2px 0px 2px;
+}
+
+.calendar tbody td.selected { /* Cell showing today date */
+  font-weight: bold;
+  border: 1px solid #000;
+  padding: 1px 3px 1px 1px;
+  background: #fff;
+  color: #000;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #a66;
+}
+
+.calendar tbody td.today { /* Cell showing selected date */
+  font-weight: bold;
+  color: #D50000;
+}
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+  text-align: center;
+  background: #206A9B;
+  color: #fff;
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: #000;
+  color: #fff;
+  border-top: 1px solid #206A9B;
+  padding: 1px;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  background: #B8DAF0;
+  border: 1px solid #178AEB;
+  color: #000;
+  padding: 1px;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  background: #006AA9;
+  padding: 2px 0px 0px 2px;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  top: 0px;
+  left: 0px;
+  width: 4em;
+  cursor: default;
+  border: 1px solid #655;
+  background: #def;
+  color: #000;
+  font-size: 90%;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .hilite {
+  background: #34ABFA;
+  border-top: 1px solid #46a;
+  border-bottom: 1px solid #46a;
+  font-weight: bold;
+}
+
+.calendar .combo .active {
+  border-top: 1px solid #46a;
+  border-bottom: 1px solid #46a;
+  background: #F1F8FC;
+  font-weight: bold;
+}
+
+.calendar td.time {
+  border-top: 1px solid #000;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #E3F0F9;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: #F1F8FC;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #267DB7;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: red;
+  background-color: #000;
+  color: #A5FF00;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-brown.css b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-brown.css
new file mode 100644
index 00000000..e7b6285b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-brown.css
@@ -0,0 +1,225 @@
+/* The main calendar widget.  DIV containing a table. */
+
+div.calendar { position: relative; }
+
+.calendar, .calendar table {
+  border: 1px solid #655;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #ffd;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;    /* They are the navigation buttons */
+  padding: 2px;          /* Make the buttons seem like they're pressing */
+}
+
+.calendar .nav {
+  background: #edc url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;      /* Pressing it will take you to the current date */
+  text-align: center;
+  background: #654;
+  color: #fed;
+  padding: 2px;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+  background: #edc;
+  color: #000;
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #655;
+  padding: 2px;
+  text-align: center;
+  color: #000;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  background-color: #faa;
+  color: #000;
+  border: 1px solid #f40;
+  padding: 1px;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  background-color: #c77;
+  padding: 2px 0px 0px 2px;
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+  background: #fed;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #bbb;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #fbb;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #fed;
+}
+
+.calendar tbody .rowhilite td {
+  background: #ddf;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #efe;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  background: #ffe;
+  padding: 1px 3px 1px 1px;
+  border: 1px solid #bbb;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  background: #ddc;
+  padding: 2px 2px 0px 2px;
+}
+
+.calendar tbody td.selected { /* Cell showing today date */
+  font-weight: bold;
+  border: 1px solid #000;
+  padding: 1px 3px 1px 1px;
+  background: #fea;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { font-weight: bold; }
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+  text-align: center;
+  background: #988;
+  color: #000;
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  border-top: 1px solid #655;
+  background: #dcb;
+  color: #840;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  background: #faa;
+  border: 1px solid #f40;
+  padding: 1px;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  background: #c77;
+  padding: 2px 0px 0px 2px;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  top: 0px;
+  left: 0px;
+  width: 4em;
+  cursor: default;
+  border: 1px solid #655;
+  background: #ffe;
+  color: #000;
+  font-size: 90%;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .hilite {
+  background: #fc8;
+}
+
+.calendar .combo .active {
+  border-top: 1px solid #a64;
+  border-bottom: 1px solid #a64;
+  background: #fee;
+  font-weight: bold;
+}
+
+.calendar td.time {
+  border-top: 1px solid #a88;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #fed;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #988;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #866;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-green.css b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-green.css
new file mode 100644
index 00000000..564666d4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-green.css
@@ -0,0 +1,229 @@
+/* The main calendar widget.  DIV containing a table. */
+
+div.calendar { position: relative; }
+
+.calendar, .calendar table {
+  border: 1px solid #565;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #efe;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;    /* They are the navigation buttons */
+  padding: 2px;          /* Make the buttons seem like they're pressing */
+  background: #676;
+  color: #fff;
+  font-size: 90%;
+}
+
+.calendar .nav {
+  background: #676 url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;      /* Pressing it will take you to the current date */
+  text-align: center;
+  padding: 2px;
+  background: #250;
+  color: #efa;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #565;
+  padding: 2px;
+  text-align: center;
+  color: #000;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #a66;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  background-color: #afa;
+  color: #000;
+  border: 1px solid #084;
+  padding: 1px;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  background-color: #7c7;
+  padding: 2px 0px 0px 2px;
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+  background: #dfb;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  color: #564;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #bbb;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #fbb;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #8a8;
+  background: #dfb;
+}
+
+.calendar tbody .rowhilite td {
+  background: #dfd;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #efe;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  background: #efd;
+  padding: 1px 3px 1px 1px;
+  border: 1px solid #bbb;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  background: #dec;
+  padding: 2px 2px 0px 2px;
+}
+
+.calendar tbody td.selected { /* Cell showing today date */
+  font-weight: bold;
+  border: 1px solid #000;
+  padding: 1px 3px 1px 1px;
+  background: #f8fff8;
+  color: #000;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #a66;
+}
+
+.calendar tbody td.today { font-weight: bold; color: #0a0; }
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+  text-align: center;
+  background: #565;
+  color: #fff;
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  padding: 2px;
+  background: #250;
+  color: #efa;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  background: #afa;
+  border: 1px solid #084;
+  color: #000;
+  padding: 1px;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  background: #7c7;
+  padding: 2px 0px 0px 2px;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  top: 0px;
+  left: 0px;
+  width: 4em;
+  cursor: default;
+  border: 1px solid #565;
+  background: #efd;
+  color: #000;
+  font-size: 90%;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .hilite {
+  background: #af8;
+}
+
+.calendar .combo .active {
+  border-top: 1px solid #6a4;
+  border-bottom: 1px solid #6a4;
+  background: #efe;
+  font-weight: bold;
+}
+
+.calendar td.time {
+  border-top: 1px solid #8a8;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #dfb;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #898;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #686;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-setup.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-setup.js
new file mode 100644
index 00000000..36697064
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-setup.js
@@ -0,0 +1,200 @@
+/*  Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
+ * ---------------------------------------------------------------------------
+ *
+ * The DHTML Calendar
+ *
+ * Details and latest version at:
+ * http://dynarch.com/mishoo/calendar.epl
+ *
+ * This script is distributed under the GNU Lesser General Public License.
+ * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
+ *
+ * This file defines helper functions for setting up the calendar.  They are
+ * intended to help non-programmers get a working calendar on their site
+ * quickly.  This script should not be seen as part of the calendar.  It just
+ * shows you what one can do with the calendar, while in the same time
+ * providing a quick and simple method for setting it up.  If you need
+ * exhaustive customization of the calendar creation process feel free to
+ * modify this code to suit your needs (this is recommended and much better
+ * than modifying calendar.js itself).
+ */
+
+// $Id: calendar-setup.js,v 1.1 2006/11/01 02:44:35 bbaia Exp $
+
+/**
+ *  This function "patches" an input field (or other element) to use a calendar
+ *  widget for date selection.
+ *
+ *  The "params" is a single object that can have the following properties:
+ *
+ *    prop. name   | description
+ *  -------------------------------------------------------------------------------------------------
+ *   inputField    | the ID of an input field to store the date
+ *   displayArea   | the ID of a DIV or other element to show the date
+ *   button        | ID of a button or other element that will trigger the calendar
+ *   eventName     | event that will trigger the calendar, without the "on" prefix (default: "click")
+ *   ifFormat      | date format that will be stored in the input field
+ *   daFormat      | the date format that will be used to display the date in displayArea
+ *   singleClick   | (true/false) wether the calendar is in single click mode or not (default: true)
+ *   firstDay      | numeric: 0 to 6.  "0" means display Sunday first, "1" means display Monday first, etc.
+ *   align         | alignment (default: "Br"); if you don't know what's this see the calendar documentation
+ *   range         | array with 2 elements.  Default: [1900, 2999] -- the range of years available
+ *   weekNumbers   | (true/false) if it's true (default) the calendar will display week numbers
+ *   flat          | null or element ID; if not null the calendar will be a flat calendar having the parent with the given ID
+ *   flatCallback  | function that receives a JS Date object and returns an URL to point the browser to (for flat calendar)
+ *   disableFunc   | function that receives a JS Date object and should return true if that date has to be disabled in the calendar
+ *   onSelect      | function that gets called when a date is selected.  You don't _have_ to supply this (the default is generally okay)
+ *   onClose       | function that gets called when the calendar is closed.  [default]
+ *   onUpdate      | function that gets called after the date is updated in the input field.  Receives a reference to the calendar.
+ *   date          | the date that the calendar will be initially displayed to
+ *   showsTime     | default: false; if true the calendar will include a time selector
+ *   timeFormat    | the time format; can be "12" or "24", default is "12"
+ *   electric      | if true (default) then given fields/date areas are updated for each move; otherwise they're updated only on close
+ *   step          | configures the step of the years in drop-down boxes; default: 2
+ *   position      | configures the calendar absolute position; default: null
+ *   cache         | if "true" (but default: "false") it will reuse the same calendar object, where possible
+ *   showOthers    | if "true" (but default: "false") it will show days from other months too
+ *
+ *  None of them is required, they all have default values.  However, if you
+ *  pass none of "inputField", "displayArea" or "button" you'll get a warning
+ *  saying "nothing to setup".
+ */
+Calendar.setup = function (params) {
+	function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
+
+	param_default("inputField",     null);
+	param_default("displayArea",    null);
+	param_default("button",         null);
+	param_default("eventName",      "click");
+	param_default("ifFormat",       Calendar._TT["DEF_DATE_FORMAT"]);
+	param_default("daFormat",       Calendar._TT["DEF_DATE_FORMAT"]);
+	param_default("singleClick",    true);
+	param_default("disableFunc",    null);
+	param_default("dateStatusFunc", params["disableFunc"]);	// takes precedence if both are defined
+	param_default("dateText",       null);
+	param_default("firstDay",       null);
+	param_default("align",          "Bl");
+	param_default("range",          [1900, 2999]);
+	param_default("weekNumbers",    true);
+	param_default("flat",           null);
+	param_default("flatCallback",   null);
+	param_default("onSelect",       null);
+	param_default("onClose",        null);
+	param_default("onUpdate",       null);
+	param_default("date",           null);
+	param_default("showsTime",      false);
+	param_default("timeFormat",     "24");
+	param_default("electric",       true);
+	param_default("step",           1);
+	param_default("position",       null);
+	param_default("cache",          false);
+	param_default("showOthers",     false);
+	param_default("multiple",       null);
+
+	var tmp = ["inputField", "displayArea", "button"];
+	for (var i in tmp) {
+		if (typeof params[tmp[i]] == "string") {
+			params[tmp[i]] = document.getElementById(params[tmp[i]]);
+		}
+	}
+	if (!(params.flat || params.multiple || params.inputField || params.displayArea || params.button)) {
+		alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");
+		return false;
+	}
+
+	function onSelect(cal) {
+		var p = cal.params;
+		var update = (cal.dateClicked || p.electric);
+		if (update && p.inputField) {
+			p.inputField.value = cal.date.print(p.ifFormat);
+			if (typeof p.inputField.onchange == "function")
+				p.inputField.onchange();
+		}
+		if (update && p.displayArea)
+			p.displayArea.innerHTML = cal.date.print(p.daFormat);
+		if (update && typeof p.onUpdate == "function")
+			p.onUpdate(cal);
+		if (update && p.flat) {
+			if (typeof p.flatCallback == "function")
+				p.flatCallback(cal);
+		}
+		if (update && p.singleClick && cal.dateClicked)
+			cal.callCloseHandler();
+	};
+
+	if (params.flat != null) {
+		if (typeof params.flat == "string")
+			params.flat = document.getElementById(params.flat);
+		if (!params.flat) {
+			alert("Calendar.setup:\n  Flat specified but can't find parent.");
+			return false;
+		}
+		var cal = new Calendar(params.firstDay, params.date, params.onSelect || onSelect);
+		cal.showsOtherMonths = params.showOthers;
+		cal.showsTime = params.showsTime;
+		cal.time24 = (params.timeFormat == "24");
+		cal.params = params;
+		cal.weekNumbers = params.weekNumbers;
+		cal.setRange(params.range[0], params.range[1]);
+		cal.setDateStatusHandler(params.dateStatusFunc);
+		cal.getDateText = params.dateText;
+		if (params.ifFormat) {
+			cal.setDateFormat(params.ifFormat);
+		}
+		if (params.inputField && typeof params.inputField.value == "string") {
+			cal.parseDate(params.inputField.value);
+		}
+		cal.create(params.flat);
+		cal.show();
+		return false;
+	}
+
+	var triggerEl = params.button || params.displayArea || params.inputField;
+	triggerEl["on" + params.eventName] = function() {
+		var dateEl = params.inputField || params.displayArea;
+		var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
+		var mustCreate = false;
+		var cal = window.calendar;
+		if (dateEl)
+			params.date = Date.parseDate(dateEl.value || dateEl.innerHTML, dateFmt);
+		if (!(cal && params.cache)) {
+			window.calendar = cal = new Calendar(params.firstDay,
+							     params.date,
+							     params.onSelect || onSelect,
+							     params.onClose || function(cal) { cal.hide(); });
+			cal.showsTime = params.showsTime;
+			cal.time24 = (params.timeFormat == "24");
+			cal.weekNumbers = params.weekNumbers;
+			mustCreate = true;
+		} else {
+			if (params.date)
+				cal.setDate(params.date);
+			cal.hide();
+		}
+		if (params.multiple) {
+			cal.multiple = {};
+			for (var i = params.multiple.length; --i >= 0;) {
+				var d = params.multiple[i];
+				var ds = d.print("%Y%m%d");
+				cal.multiple[ds] = d;
+			}
+		}
+		cal.showsOtherMonths = params.showOthers;
+		cal.yearStep = params.step;
+		cal.setRange(params.range[0], params.range[1]);
+		cal.params = params;
+		cal.setDateStatusHandler(params.dateStatusFunc);
+		cal.getDateText = params.dateText;
+		cal.setDateFormat(dateFmt);
+		if (mustCreate)
+			cal.create();
+		cal.refresh();
+		if (!params.position)
+			cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
+		else
+			cal.showAt(params.position[0], params.position[1]);
+		return false;
+	};
+
+	return cal;
+};
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-system.css b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-system.css
new file mode 100644
index 00000000..f64493b4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-system.css
@@ -0,0 +1,251 @@
+/* The main calendar widget.  DIV containing a table. */
+
+.calendar {
+  position: relative;
+  display: none;
+  border: 1px solid;
+  border-color: #fff #000 #000 #fff;
+  font-size: 11px;
+  cursor: default;
+  background: Window;
+  color: WindowText;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+.calendar table {
+  border: 1px solid;
+  border-color: #fff #000 #000 #fff;
+  font-size: 11px;
+  cursor: default;
+  background: Window;
+  color: WindowText;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;
+  padding: 1px;
+  border: 1px solid;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+  background: ButtonFace;
+}
+
+.calendar .nav {
+  background: ButtonFace url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;
+  padding: 1px;
+  border: 1px solid #000;
+  background: ActiveCaption;
+  color: CaptionText;
+  text-align: center;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid ButtonShadow;
+  padding: 2px;
+  text-align: center;
+  background: ButtonFace;
+  color: ButtonText;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  border: 2px solid;
+  padding: 0px;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  border-width: 1px;
+  padding: 2px 0px 0px 2px;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid ButtonShadow;
+  background: ButtonFace;
+  color: ButtonText;
+}
+
+.calendar tbody .rowhilite td {
+  background: Highlight;
+  color: HighlightText;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  padding: 1px 3px 1px 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  padding: 2px 2px 0px 2px;
+  border: 1px solid;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+}
+
+.calendar tbody td.selected { /* Cell showing selected date */
+  font-weight: bold;
+  border: 1px solid;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+  padding: 2px 2px 0px 2px;
+  background: ButtonFace;
+  color: ButtonText;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { /* Cell showing today date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody td.disabled { color: GrayText; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: ButtonFace;
+  padding: 1px;
+  border: 1px solid;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+  color: ButtonText;
+  text-align: center;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  padding: 1px;
+  background: #e4e0d8;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  width: 4em;
+  top: 0px;
+  left: 0px;
+  cursor: default;
+  border: 1px solid;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+  background: Menu;
+  color: MenuText;
+  font-size: 90%;
+  padding: 1px;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .active {
+  padding: 0px;
+  border: 1px solid #000;
+}
+
+.calendar .combo .hilite {
+  background: Highlight;
+  color: HighlightText;
+}
+
+.calendar td.time {
+  border-top: 1px solid ButtonShadow;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: ButtonFace;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: Menu;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-tas.css b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-tas.css
new file mode 100644
index 00000000..a0c9c9d1
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-tas.css
@@ -0,0 +1,239 @@
+/* The main calendar widget.  DIV containing a table. */
+
+div.calendar { position: relative; }
+
+.calendar, .calendar table {
+  border: 1px solid #655;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #ffd;
+  font-family: tahoma,verdana,sans-serif;
+  filter:
+progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#DDDCCC,EndColorStr=#FFFFFF);
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;    /* They are the navigation buttons */
+  padding: 2px;          /* Make the buttons seem like they're pressing */
+  color:#363636;
+}
+
+.calendar .nav {
+  background: #edc url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;      /* Pressing it will take you to the current date */
+  text-align: center;
+  background: #654;
+  color: #363636;
+  padding: 2px;
+  filter:
+progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#ffffff,EndColorStr=#dddccc);
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+  /*background: #3B86A0;*/
+  color: #363636;
+  font-weight: bold; 	
+filter:
+progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#ffffff,EndColorStr=#3b86a0);
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #655;
+  padding: 2px;
+  text-align: center;
+  color: #363636;
+    filter:
+progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#DDDCCC,EndColorStr=#FFFFFF);
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  background-color: #ffcc86;
+  color: #000;
+  border: 1px solid #b59345;
+  padding: 1px;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  background-color: #c77;
+  padding: 2px 0px 0px 2px;
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+  background: #fed;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #fed;
+}
+
+.calendar tbody .rowhilite td {
+ background: #ddf;
+  
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #efe;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  background: #ffe;
+  padding: 1px 3px 1px 1px;
+  border: 1px solid #bbb;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  background: #ddc;
+  padding: 2px 2px 0px 2px;
+}
+
+.calendar tbody td.selected { /* Cell showing today date */
+  font-weight: bold;
+  border: 1px solid #000;
+  padding: 1px 3px 1px 1px;
+  background: #fea;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { font-weight: bold; }
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+  text-align: center;
+  background: #988;
+  color: #000;
+  
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  border-top: 1px solid #655;
+  background: #dcb;
+  color: #363636;
+  font-weight: bold;
+	filter:
+progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#FFFFFF,EndColorStr=#DDDCCC);
+}
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  background: #faa;
+  border: 1px solid #f40;
+  padding: 1px;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  background: #c77;
+  padding: 2px 0px 0px 2px;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.combo {
+  position: absolute;
+  display: none;
+  top: 0px;
+  left: 0px;
+  width: 4em;
+  cursor: default;
+  border: 1px solid #655;
+  background: #ffe;
+  color: #000;
+  font-size: smaller;
+  z-index: 100;
+}
+
+.combo .label,
+.combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.combo .label-IEfix {
+  width: 4em;
+}
+
+.combo .hilite {
+  background: #fc8;
+}
+
+.combo .active {
+  border-top: 1px solid #a64;
+  border-bottom: 1px solid #a64;
+  background: #fee;
+  font-weight: bold;
+}
+
+.calendar td.time {
+  border-top: 1px solid #a88;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #fed;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #988;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #866;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-win2k-1.css b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-win2k-1.css
new file mode 100644
index 00000000..56ffdf2e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-win2k-1.css
@@ -0,0 +1,271 @@
+/* The main calendar widget.  DIV containing a table. */
+
+.calendar {
+  position: relative;
+  display: none;
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #d4d0c8;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+.calendar table {
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #d4d0c8;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;
+  padding: 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar .nav {
+  background: transparent url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #848078;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #000;
+  padding: 2px;
+  text-align: center;
+  background: #f4f0e8;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  padding: 0px;
+  background-color: #e4e0d8;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  background-color: #c4c0b8;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #f4f0e8;
+}
+
+.calendar tbody .rowhilite td {
+  background: #e4e0d8;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #d4d0c8;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  padding: 1px 3px 1px 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  padding: 2px 2px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar tbody td.selected { /* Cell showing selected date */
+  font-weight: bold;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  padding: 2px 2px 0px 2px;
+  background: #e4e0d8;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { /* Cell showing today date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: #f4f0e8;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #848078;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  padding: 1px;
+  background: #e4e0d8;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  width: 4em;
+  top: 0px;
+  left: 0px;
+  cursor: default;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  background: #e4e0d8;
+  font-size: 90%;
+  padding: 1px;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .active {
+  background: #c4c0b8;
+  padding: 0px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar .combo .hilite {
+  background: #048;
+  color: #fea;
+}
+
+.calendar td.time {
+  border-top: 1px solid #000;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #f4f0e8;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #766;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-win2k-2.css b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-win2k-2.css
new file mode 100644
index 00000000..ccb85a01
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-win2k-2.css
@@ -0,0 +1,271 @@
+/* The main calendar widget.  DIV containing a table. */
+
+.calendar {
+  position: relative;
+  display: none;
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #d4c8d0;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+.calendar table {
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #d4c8d0;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;
+  padding: 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar .nav {
+  background: transparent url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #847880;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #000;
+  padding: 2px;
+  text-align: center;
+  background: #f4e8f0;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  padding: 0px;
+  background-color: #e4d8e0;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  background-color: #c4b8c0;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #f4e8f0;
+}
+
+.calendar tbody .rowhilite td {
+  background: #e4d8e0;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #d4c8d0;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  padding: 1px 3px 1px 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  padding: 2px 2px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar tbody td.selected { /* Cell showing selected date */
+  font-weight: bold;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  padding: 2px 2px 0px 2px;
+  background: #e4d8e0;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { /* Cell showing today date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: #f4e8f0;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #847880;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  padding: 1px;
+  background: #e4d8e0;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  width: 4em;
+  top: 0px;
+  left: 0px;
+  cursor: default;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  background: #e4d8e0;
+  font-size: 90%;
+  padding: 1px;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .active {
+  background: #d4c8d0;
+  padding: 0px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar .combo .hilite {
+  background: #408;
+  color: #fea;
+}
+
+.calendar td.time {
+  border-top: 1px solid #000;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #f4f0e8;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #766;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-win2k-cold-1.css b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-win2k-cold-1.css
new file mode 100644
index 00000000..09a1a806
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-win2k-cold-1.css
@@ -0,0 +1,265 @@
+/* The main calendar widget.  DIV containing a table. */
+
+.calendar {
+  position: relative;
+  display: none;
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #c8d0d4;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+.calendar table {
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #c8d0d4;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;
+  padding: 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar .nav {
+  background: transparent url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #788084;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #000;
+  padding: 2px;
+  text-align: center;
+  background: #e8f0f4;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  padding: 0px;
+  background-color: #d8e0e4;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  background-color: #b8c0c4;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #e8f4f0;
+}
+
+.calendar tbody .rowhilite td {
+  background: #d8e4e0;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #c8d4d0;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  padding: 1px 3px 1px 1px;
+  border: 1px solid;
+  border-color: #fff #000 #000 #fff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  padding: 2px 2px 0px 2px;
+  border: 1px solid;
+  border-color: #000 #fff #fff #000;
+}
+
+.calendar tbody td.selected { /* Cell showing selected date */
+  font-weight: bold;
+  padding: 2px 2px 0px 2px;
+  border: 1px solid;
+  border-color: #000 #fff #fff #000;
+  background: #d8e0e4;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { /* Cell showing today date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: #e8f0f4;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #788084;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  padding: 1px;
+  background: #d8e0e4;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  width: 4em;
+  top: 0px;
+  left: 0px;
+  cursor: default;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  background: #d8e0e4;
+  font-size: 90%;
+  padding: 1px;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .active {
+  background: #c8d0d4;
+  padding: 0px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar .combo .hilite {
+  background: #048;
+  color: #aef;
+}
+
+.calendar td.time {
+  border-top: 1px solid #000;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #e8f0f4;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #667;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-win2k-cold-2.css b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-win2k-cold-2.css
new file mode 100644
index 00000000..0ae6b08e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar-win2k-cold-2.css
@@ -0,0 +1,271 @@
+/* The main calendar widget.  DIV containing a table. */
+
+.calendar {
+  position: relative;
+  display: none;
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #c8d4d0;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+.calendar table {
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  font-size: 11px;
+  color: #000;
+  cursor: default;
+  background: #c8d4d0;
+  font-family: tahoma,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;
+  padding: 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar .nav {
+  background: transparent url(menuarrow.gif) no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #788480;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid #000;
+  padding: 2px;
+  text-align: center;
+  background: #e8f4f0;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  border-top: 2px solid #fff;
+  border-right: 2px solid #000;
+  border-bottom: 2px solid #000;
+  border-left: 2px solid #fff;
+  padding: 0px;
+  background-color: #d8e4e0;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  background-color: #b8c4c0;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid #000;
+  background: #e8f4f0;
+}
+
+.calendar tbody .rowhilite td {
+  background: #d8e4e0;
+}
+
+.calendar tbody .rowhilite td.wn {
+  background: #c8d4d0;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  padding: 1px 3px 1px 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+  padding: 2px 2px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar tbody td.selected { /* Cell showing selected date */
+  font-weight: bold;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+  padding: 2px 2px 0px 2px;
+  background: #d8e4e0;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+  color: #f00;
+}
+
+.calendar tbody td.today { /* Cell showing today date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody .disabled { color: #999; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: #e8f4f0;
+  padding: 1px;
+  border: 1px solid #000;
+  background: #788480;
+  color: #fff;
+  text-align: center;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  padding: 1px;
+  background: #d8e4e0;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  width: 4em;
+  top: 0px;
+  left: 0px;
+  cursor: default;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  background: #d8e4e0;
+  font-size: 90%;
+  padding: 1px;
+  z-index: 100;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .active {
+  background: #c8d4d0;
+  padding: 0px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+.calendar .combo .hilite {
+  background: #048;
+  color: #aef;
+}
+
+.calendar td.time {
+  border-top: 1px solid #000;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: #e8f0f4;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: #fff;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: #667;
+  color: #fff;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar.js
new file mode 100644
index 00000000..badc2ffd
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/calendar.js
@@ -0,0 +1,1806 @@
+/*  Copyright Mihai Bazon, 2002-2005  |  www.bazon.net/mishoo
+ * -----------------------------------------------------------
+ *
+ * The DHTML Calendar, version 1.0 "It is happening again"
+ *
+ * Details and latest version at:
+ * www.dynarch.com/projects/calendar
+ *
+ * This script is developed by Dynarch.com.  Visit us at www.dynarch.com.
+ *
+ * This script is distributed under the GNU Lesser General Public License.
+ * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
+ */
+
+// $Id: calendar.js,v 1.1 2006/11/01 02:44:36 bbaia Exp $
+
+/** The Calendar object constructor. */
+Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
+	// member variables
+	this.activeDiv = null;
+	this.currentDateEl = null;
+	this.getDateStatus = null;
+	this.getDateToolTip = null;
+	this.getDateText = null;
+	this.timeout = null;
+	this.onSelected = onSelected || null;
+	this.onClose = onClose || null;
+	this.dragging = false;
+	this.hidden = false;
+	this.minYear = 1970;
+	this.maxYear = 2050;
+	this.dateFormat = Calendar._TT["DEF_DATE_FORMAT"];
+	this.ttDateFormat = Calendar._TT["TT_DATE_FORMAT"];
+	this.isPopup = true;
+	this.weekNumbers = true;
+	this.firstDayOfWeek = typeof firstDayOfWeek == "number" ? firstDayOfWeek : Calendar._FD; // 0 for Sunday, 1 for Monday, etc.
+	this.showsOtherMonths = false;
+	this.dateStr = dateStr;
+	this.ar_days = null;
+	this.showsTime = false;
+	this.time24 = true;
+	this.yearStep = 2;
+	this.hiliteToday = true;
+	this.multiple = null;
+	// HTML elements
+	this.table = null;
+	this.element = null;
+	this.tbody = null;
+	this.firstdayname = null;
+	// Combo boxes
+	this.monthsCombo = null;
+	this.yearsCombo = null;
+	this.hilitedMonth = null;
+	this.activeMonth = null;
+	this.hilitedYear = null;
+	this.activeYear = null;
+	// Information
+	this.dateClicked = false;
+
+	// one-time initializations
+	if (typeof Calendar._SDN == "undefined") {
+		// table of short day names
+		if (typeof Calendar._SDN_len == "undefined")
+			Calendar._SDN_len = 3;
+		var ar = new Array();
+		for (var i = 8; i > 0;) {
+			ar[--i] = Calendar._DN[i].substr(0, Calendar._SDN_len);
+		}
+		Calendar._SDN = ar;
+		// table of short month names
+		if (typeof Calendar._SMN_len == "undefined")
+			Calendar._SMN_len = 3;
+		ar = new Array();
+		for (var i = 12; i > 0;) {
+			ar[--i] = Calendar._MN[i].substr(0, Calendar._SMN_len);
+		}
+		Calendar._SMN = ar;
+	}
+};
+
+// ** constants
+
+/// "static", needed for event handlers.
+Calendar._C = null;
+
+/// detect a special case of "web browser"
+Calendar.is_ie = ( /msie/i.test(navigator.userAgent) &&
+		   !/opera/i.test(navigator.userAgent) );
+
+Calendar.is_ie5 = ( Calendar.is_ie && /msie 5\.0/i.test(navigator.userAgent) );
+
+/// detect Opera browser
+Calendar.is_opera = /opera/i.test(navigator.userAgent);
+
+/// detect KHTML-based browsers
+Calendar.is_khtml = /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
+
+// BEGIN: UTILITY FUNCTIONS; beware that these might be moved into a separate
+//        library, at some point.
+
+Calendar.getAbsolutePos = function(el) {
+	var SL = 0, ST = 0;
+	var is_div = /^div$/i.test(el.tagName);
+	if (is_div && el.scrollLeft)
+		SL = el.scrollLeft;
+	if (is_div && el.scrollTop)
+		ST = el.scrollTop;
+	var r = { x: el.offsetLeft - SL, y: el.offsetTop - ST };
+	if (el.offsetParent) {
+		var tmp = this.getAbsolutePos(el.offsetParent);
+		r.x += tmp.x;
+		r.y += tmp.y;
+	}
+	return r;
+};
+
+Calendar.isRelated = function (el, evt) {
+	var related = evt.relatedTarget;
+	if (!related) {
+		var type = evt.type;
+		if (type == "mouseover") {
+			related = evt.fromElement;
+		} else if (type == "mouseout") {
+			related = evt.toElement;
+		}
+	}
+	while (related) {
+		if (related == el) {
+			return true;
+		}
+		related = related.parentNode;
+	}
+	return false;
+};
+
+Calendar.removeClass = function(el, className) {
+	if (!(el && el.className)) {
+		return;
+	}
+	var cls = el.className.split(" ");
+	var ar = new Array();
+	for (var i = cls.length; i > 0;) {
+		if (cls[--i] != className) {
+			ar[ar.length] = cls[i];
+		}
+	}
+	el.className = ar.join(" ");
+};
+
+Calendar.addClass = function(el, className) {
+	Calendar.removeClass(el, className);
+	el.className += " " + className;
+};
+
+// FIXME: the following 2 functions totally suck, are useless and should be replaced immediately.
+Calendar.getElement = function(ev) {
+	var f = Calendar.is_ie ? window.event.srcElement : ev.currentTarget;
+	while (f.nodeType != 1 || /^div$/i.test(f.tagName))
+		f = f.parentNode;
+	return f;
+};
+
+Calendar.getTargetElement = function(ev) {
+	var f = Calendar.is_ie ? window.event.srcElement : ev.target;
+	while (f.nodeType != 1)
+		f = f.parentNode;
+	return f;
+};
+
+Calendar.stopEvent = function(ev) {
+	ev || (ev = window.event);
+	if (Calendar.is_ie) {
+		ev.cancelBubble = true;
+		ev.returnValue = false;
+	} else {
+		ev.preventDefault();
+		ev.stopPropagation();
+	}
+	return false;
+};
+
+Calendar.addEvent = function(el, evname, func) {
+	if (el.attachEvent) { // IE
+		el.attachEvent("on" + evname, func);
+	} else if (el.addEventListener) { // Gecko / W3C
+		el.addEventListener(evname, func, true);
+	} else {
+		el["on" + evname] = func;
+	}
+};
+
+Calendar.removeEvent = function(el, evname, func) {
+	if (el.detachEvent) { // IE
+		el.detachEvent("on" + evname, func);
+	} else if (el.removeEventListener) { // Gecko / W3C
+		el.removeEventListener(evname, func, true);
+	} else {
+		el["on" + evname] = null;
+	}
+};
+
+Calendar.createElement = function(type, parent) {
+	var el = null;
+	if (document.createElementNS) {
+		// use the XHTML namespace; IE won't normally get here unless
+		// _they_ "fix" the DOM2 implementation.
+		el = document.createElementNS("http://www.w3.org/1999/xhtml", type);
+	} else {
+		el = document.createElement(type);
+	}
+	if (typeof parent != "undefined") {
+		parent.appendChild(el);
+	}
+	return el;
+};
+
+// END: UTILITY FUNCTIONS
+
+// BEGIN: CALENDAR STATIC FUNCTIONS
+
+/** Internal -- adds a set of events to make some element behave like a button. */
+Calendar._add_evs = function(el) {
+	with (Calendar) {
+		addEvent(el, "mouseover", dayMouseOver);
+		addEvent(el, "mousedown", dayMouseDown);
+		addEvent(el, "mouseout", dayMouseOut);
+		if (is_ie) {
+			addEvent(el, "dblclick", dayMouseDblClick);
+			el.setAttribute("unselectable", true);
+		}
+	}
+};
+
+Calendar.findMonth = function(el) {
+	if (typeof el.month != "undefined") {
+		return el;
+	} else if (typeof el.parentNode.month != "undefined") {
+		return el.parentNode;
+	}
+	return null;
+};
+
+Calendar.findYear = function(el) {
+	if (typeof el.year != "undefined") {
+		return el;
+	} else if (typeof el.parentNode.year != "undefined") {
+		return el.parentNode;
+	}
+	return null;
+};
+
+Calendar.showMonthsCombo = function () {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	var cal = cal;
+	var cd = cal.activeDiv;
+	var mc = cal.monthsCombo;
+	if (cal.hilitedMonth) {
+		Calendar.removeClass(cal.hilitedMonth, "hilite");
+	}
+	if (cal.activeMonth) {
+		Calendar.removeClass(cal.activeMonth, "active");
+	}
+	var mon = cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];
+	Calendar.addClass(mon, "active");
+	cal.activeMonth = mon;
+	var s = mc.style;
+	s.display = "block";
+	if (cd.navtype < 0)
+		s.left = cd.offsetLeft + "px";
+	else {
+		var mcw = mc.offsetWidth;
+		if (typeof mcw == "undefined")
+			// Konqueror brain-dead techniques
+			mcw = 50;
+		s.left = (cd.offsetLeft + cd.offsetWidth - mcw) + "px";
+	}
+	s.top = (cd.offsetTop + cd.offsetHeight) + "px";
+};
+
+Calendar.showYearsCombo = function (fwd) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	var cal = cal;
+	var cd = cal.activeDiv;
+	var yc = cal.yearsCombo;
+	if (cal.hilitedYear) {
+		Calendar.removeClass(cal.hilitedYear, "hilite");
+	}
+	if (cal.activeYear) {
+		Calendar.removeClass(cal.activeYear, "active");
+	}
+	cal.activeYear = null;
+	var Y = cal.date.getFullYear() + (fwd ? 1 : -1);
+	var yr = yc.firstChild;
+	var show = false;
+	for (var i = 12; i > 0; --i) {
+		if (Y >= cal.minYear && Y <= cal.maxYear) {
+			yr.innerHTML = Y;
+			yr.year = Y;
+			yr.style.display = "block";
+			show = true;
+		} else {
+			yr.style.display = "none";
+		}
+		yr = yr.nextSibling;
+		Y += fwd ? cal.yearStep : -cal.yearStep;
+	}
+	if (show) {
+		var s = yc.style;
+		s.display = "block";
+		if (cd.navtype < 0)
+			s.left = cd.offsetLeft + "px";
+		else {
+			var ycw = yc.offsetWidth;
+			if (typeof ycw == "undefined")
+				// Konqueror brain-dead techniques
+				ycw = 50;
+			s.left = (cd.offsetLeft + cd.offsetWidth - ycw) + "px";
+		}
+		s.top = (cd.offsetTop + cd.offsetHeight) + "px";
+	}
+};
+
+// event handlers
+
+Calendar.tableMouseUp = function(ev) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	if (cal.timeout) {
+		clearTimeout(cal.timeout);
+	}
+	var el = cal.activeDiv;
+	if (!el) {
+		return false;
+	}
+	var target = Calendar.getTargetElement(ev);
+	ev || (ev = window.event);
+	Calendar.removeClass(el, "active");
+	if (target == el || target.parentNode == el) {
+		Calendar.cellClick(el, ev);
+	}
+	var mon = Calendar.findMonth(target);
+	var date = null;
+	if (mon) {
+		date = new Date(cal.date);
+		if (mon.month != date.getMonth()) {
+			date.setMonth(mon.month);
+			cal.setDate(date);
+			cal.dateClicked = false;
+			cal.callHandler();
+		}
+	} else {
+		var year = Calendar.findYear(target);
+		if (year) {
+			date = new Date(cal.date);
+			if (year.year != date.getFullYear()) {
+				date.setFullYear(year.year);
+				cal.setDate(date);
+				cal.dateClicked = false;
+				cal.callHandler();
+			}
+		}
+	}
+	with (Calendar) {
+		removeEvent(document, "mouseup", tableMouseUp);
+		removeEvent(document, "mouseover", tableMouseOver);
+		removeEvent(document, "mousemove", tableMouseOver);
+		cal._hideCombos();
+		_C = null;
+		return stopEvent(ev);
+	}
+};
+
+Calendar.tableMouseOver = function (ev) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return;
+	}
+	var el = cal.activeDiv;
+	var target = Calendar.getTargetElement(ev);
+	if (target == el || target.parentNode == el) {
+		Calendar.addClass(el, "hilite active");
+		Calendar.addClass(el.parentNode, "rowhilite");
+	} else {
+		if (typeof el.navtype == "undefined" || (el.navtype != 50 && (el.navtype == 0 || Math.abs(el.navtype) > 2)))
+			Calendar.removeClass(el, "active");
+		Calendar.removeClass(el, "hilite");
+		Calendar.removeClass(el.parentNode, "rowhilite");
+	}
+	ev || (ev = window.event);
+	if (el.navtype == 50 && target != el) {
+		var pos = Calendar.getAbsolutePos(el);
+		var w = el.offsetWidth;
+		var x = ev.clientX;
+		var dx;
+		var decrease = true;
+		if (x > pos.x + w) {
+			dx = x - pos.x - w;
+			decrease = false;
+		} else
+			dx = pos.x - x;
+
+		if (dx < 0) dx = 0;
+		var range = el._range;
+		var current = el._current;
+		var count = Math.floor(dx / 10) % range.length;
+		for (var i = range.length; --i >= 0;)
+			if (range[i] == current)
+				break;
+		while (count-- > 0)
+			if (decrease) {
+				if (--i < 0)
+					i = range.length - 1;
+			} else if ( ++i >= range.length )
+				i = 0;
+		var newval = range[i];
+		el.innerHTML = newval;
+
+		cal.onUpdateTime();
+	}
+	var mon = Calendar.findMonth(target);
+	if (mon) {
+		if (mon.month != cal.date.getMonth()) {
+			if (cal.hilitedMonth) {
+				Calendar.removeClass(cal.hilitedMonth, "hilite");
+			}
+			Calendar.addClass(mon, "hilite");
+			cal.hilitedMonth = mon;
+		} else if (cal.hilitedMonth) {
+			Calendar.removeClass(cal.hilitedMonth, "hilite");
+		}
+	} else {
+		if (cal.hilitedMonth) {
+			Calendar.removeClass(cal.hilitedMonth, "hilite");
+		}
+		var year = Calendar.findYear(target);
+		if (year) {
+			if (year.year != cal.date.getFullYear()) {
+				if (cal.hilitedYear) {
+					Calendar.removeClass(cal.hilitedYear, "hilite");
+				}
+				Calendar.addClass(year, "hilite");
+				cal.hilitedYear = year;
+			} else if (cal.hilitedYear) {
+				Calendar.removeClass(cal.hilitedYear, "hilite");
+			}
+		} else if (cal.hilitedYear) {
+			Calendar.removeClass(cal.hilitedYear, "hilite");
+		}
+	}
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.tableMouseDown = function (ev) {
+	if (Calendar.getTargetElement(ev) == Calendar.getElement(ev)) {
+		return Calendar.stopEvent(ev);
+	}
+};
+
+Calendar.calDragIt = function (ev) {
+	var cal = Calendar._C;
+	if (!(cal && cal.dragging)) {
+		return false;
+	}
+	var posX;
+	var posY;
+	if (Calendar.is_ie) {
+		posY = window.event.clientY + document.body.scrollTop;
+		posX = window.event.clientX + document.body.scrollLeft;
+	} else {
+		posX = ev.pageX;
+		posY = ev.pageY;
+	}
+	cal.hideShowCovered();
+	var st = cal.element.style;
+	st.left = (posX - cal.xOffs) + "px";
+	st.top = (posY - cal.yOffs) + "px";
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.calDragEnd = function (ev) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	cal.dragging = false;
+	with (Calendar) {
+		removeEvent(document, "mousemove", calDragIt);
+		removeEvent(document, "mouseup", calDragEnd);
+		tableMouseUp(ev);
+	}
+	cal.hideShowCovered();
+};
+
+Calendar.dayMouseDown = function(ev) {
+	var el = Calendar.getElement(ev);
+	if (el.disabled) {
+		return false;
+	}
+	var cal = el.calendar;
+	cal.activeDiv = el;
+	Calendar._C = cal;
+	if (el.navtype != 300) with (Calendar) {
+		if (el.navtype == 50) {
+			el._current = el.innerHTML;
+			addEvent(document, "mousemove", tableMouseOver);
+		} else
+			addEvent(document, Calendar.is_ie5 ? "mousemove" : "mouseover", tableMouseOver);
+		addClass(el, "hilite active");
+		addEvent(document, "mouseup", tableMouseUp);
+	} else if (cal.isPopup) {
+		cal._dragStart(ev);
+	}
+	if (el.navtype == -1 || el.navtype == 1) {
+		if (cal.timeout) clearTimeout(cal.timeout);
+		cal.timeout = setTimeout("Calendar.showMonthsCombo()", 250);
+	} else if (el.navtype == -2 || el.navtype == 2) {
+		if (cal.timeout) clearTimeout(cal.timeout);
+		cal.timeout = setTimeout((el.navtype > 0) ? "Calendar.showYearsCombo(true)" : "Calendar.showYearsCombo(false)", 250);
+	} else {
+		cal.timeout = null;
+	}
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.dayMouseDblClick = function(ev) {
+	Calendar.cellClick(Calendar.getElement(ev), ev || window.event);
+	if (Calendar.is_ie) {
+		document.selection.empty();
+	}
+};
+
+Calendar.dayMouseOver = function(ev) {
+	var el = Calendar.getElement(ev);
+	if (Calendar.isRelated(el, ev) || Calendar._C || el.disabled) {
+		return false;
+	}
+	if (el.ttip) {
+		if (el.ttip.substr(0, 1) == "_") {
+			el.ttip = el.caldate.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
+		}
+		el.calendar.tooltips.innerHTML = el.ttip;
+	}
+	if (el.navtype != 300) {
+		Calendar.addClass(el, "hilite");
+		if (el.caldate) {
+			Calendar.addClass(el.parentNode, "rowhilite");
+		}
+	}
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.dayMouseOut = function(ev) {
+	with (Calendar) {
+		var el = getElement(ev);
+		if (isRelated(el, ev) || _C || el.disabled)
+			return false;
+		removeClass(el, "hilite");
+		if (el.caldate)
+			removeClass(el.parentNode, "rowhilite");
+		if (el.calendar)
+			el.calendar.tooltips.innerHTML = _TT["SEL_DATE"];
+		return stopEvent(ev);
+	}
+};
+
+/**
+ *  A generic "click" handler :) handles all types of buttons defined in this
+ *  calendar.
+ */
+Calendar.cellClick = function(el, ev) {
+	var cal = el.calendar;
+	var closing = false;
+	var newdate = false;
+	var date = null;
+	if (typeof el.navtype == "undefined") {
+		if (cal.currentDateEl) {
+			Calendar.removeClass(cal.currentDateEl, "selected");
+			Calendar.addClass(el, "selected");
+			closing = (cal.currentDateEl == el);
+			if (!closing) {
+				cal.currentDateEl = el;
+			}
+		}
+		cal.date.setDateOnly(el.caldate);
+		date = cal.date;
+		var other_month = !(cal.dateClicked = !el.otherMonth);
+		if (!other_month && !cal.currentDateEl)
+			cal._toggleMultipleDate(new Date(date));
+		else
+			newdate = !el.disabled;
+		// a date was clicked
+		if (other_month)
+			cal._init(cal.firstDayOfWeek, date);
+	} else {
+		if (el.navtype == 200) {
+			Calendar.removeClass(el, "hilite");
+			cal.callCloseHandler();
+			return;
+		}
+		date = new Date(cal.date);
+		if (el.navtype == 0)
+			date.setDateOnly(new Date()); // TODAY
+		// unless "today" was clicked, we assume no date was clicked so
+		// the selected handler will know not to close the calenar when
+		// in single-click mode.
+		// cal.dateClicked = (el.navtype == 0);
+		cal.dateClicked = false;
+		var year = date.getFullYear();
+		var mon = date.getMonth();
+		function setMonth(m) {
+			var day = date.getDate();
+			var max = date.getMonthDays(m);
+			if (day > max) {
+				date.setDate(max);
+			}
+			date.setMonth(m);
+		};
+		switch (el.navtype) {
+		    case 400:
+			Calendar.removeClass(el, "hilite");
+			var text = Calendar._TT["ABOUT"];
+			if (typeof text != "undefined") {
+				text += cal.showsTime ? Calendar._TT["ABOUT_TIME"] : "";
+			} else {
+				// FIXME: this should be removed as soon as lang files get updated!
+				text = "Help and about box text is not translated into this language.\n" +
+					"If you know this language and you feel generous please update\n" +
+					"the corresponding file in \"lang\" subdir to match calendar-en.js\n" +
+					"and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n" +
+					"Thank you!\n" +
+					"http://dynarch.com/mishoo/calendar.epl\n";
+			}
+			alert(text);
+			return;
+		    case -2:
+			if (year > cal.minYear) {
+				date.setFullYear(year - 1);
+			}
+			break;
+		    case -1:
+			if (mon > 0) {
+				setMonth(mon - 1);
+			} else if (year-- > cal.minYear) {
+				date.setFullYear(year);
+				setMonth(11);
+			}
+			break;
+		    case 1:
+			if (mon < 11) {
+				setMonth(mon + 1);
+			} else if (year < cal.maxYear) {
+				date.setFullYear(year + 1);
+				setMonth(0);
+			}
+			break;
+		    case 2:
+			if (year < cal.maxYear) {
+				date.setFullYear(year + 1);
+			}
+			break;
+		    case 100:
+			cal.setFirstDayOfWeek(el.fdow);
+			return;
+		    case 50:
+			var range = el._range;
+			var current = el.innerHTML;
+			for (var i = range.length; --i >= 0;)
+				if (range[i] == current)
+					break;
+			if (ev && ev.shiftKey) {
+				if (--i < 0)
+					i = range.length - 1;
+			} else if ( ++i >= range.length )
+				i = 0;
+			var newval = range[i];
+			el.innerHTML = newval;
+			cal.onUpdateTime();
+			return;
+		    case 0:
+			// TODAY will bring us here
+			if ((typeof cal.getDateStatus == "function") &&
+			    cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
+				return false;
+			}
+			break;
+		}
+		if (!date.equalsTo(cal.date)) {
+			cal.setDate(date);
+			newdate = true;
+		} else if (el.navtype == 0)
+			newdate = closing = true;
+	}
+	if (newdate) {
+		ev && cal.callHandler();
+	}
+	if (closing) {
+		Calendar.removeClass(el, "hilite");
+		ev && cal.callCloseHandler();
+	}
+};
+
+// END: CALENDAR STATIC FUNCTIONS
+
+// BEGIN: CALENDAR OBJECT FUNCTIONS
+
+/**
+ *  This function creates the calendar inside the given parent.  If _par is
+ *  null than it creates a popup calendar inside the BODY element.  If _par is
+ *  an element, be it BODY, then it creates a non-popup calendar (still
+ *  hidden).  Some properties need to be set before calling this function.
+ */
+Calendar.prototype.create = function (_par) {
+	var parent = null;
+	if (! _par) {
+		// default parent is the document body, in which case we create
+		// a popup calendar.
+		parent = document.getElementsByTagName("body")[0];
+		this.isPopup = true;
+	} else {
+		parent = _par;
+		this.isPopup = false;
+	}
+	this.date = this.dateStr ? new Date(this.dateStr) : new Date();
+
+	var table = Calendar.createElement("table");
+	this.table = table;
+	table.cellSpacing = 0;
+	table.cellPadding = 0;
+	table.calendar = this;
+	Calendar.addEvent(table, "mousedown", Calendar.tableMouseDown);
+
+	var div = Calendar.createElement("div");
+	this.element = div;
+	div.className = "calendar";
+	if (this.isPopup) {
+		div.style.position = "absolute";
+		div.style.display = "none";
+	}
+	div.appendChild(table);
+
+	var thead = Calendar.createElement("thead", table);
+	var cell = null;
+	var row = null;
+
+	var cal = this;
+	var hh = function (text, cs, navtype) {
+		cell = Calendar.createElement("td", row);
+		cell.colSpan = cs;
+		cell.className = "button";
+		if (navtype != 0 && Math.abs(navtype) <= 2)
+			cell.className += " nav";
+		Calendar._add_evs(cell);
+		cell.calendar = cal;
+		cell.navtype = navtype;
+		cell.innerHTML = "<div unselectable='on'>" + text + "</div>";
+		return cell;
+	};
+
+	row = Calendar.createElement("tr", thead);
+	var title_length = 6;
+	(this.isPopup) && --title_length;
+	(this.weekNumbers) && ++title_length;
+
+	hh("?", 1, 400).ttip = Calendar._TT["INFO"];
+	this.title = hh("", title_length, 300);
+	this.title.className = "title";
+	if (this.isPopup) {
+		this.title.ttip = Calendar._TT["DRAG_TO_MOVE"];
+		this.title.style.cursor = "move";
+		hh("&#x00d7;", 1, 200).ttip = Calendar._TT["CLOSE"];
+	}
+
+	row = Calendar.createElement("tr", thead);
+	row.className = "headrow";
+
+	this._nav_py = hh("&#x00ab;", 1, -2);
+	this._nav_py.ttip = Calendar._TT["PREV_YEAR"];
+
+	this._nav_pm = hh("&#x2039;", 1, -1);
+	this._nav_pm.ttip = Calendar._TT["PREV_MONTH"];
+
+	this._nav_now = hh(Calendar._TT["TODAY"], this.weekNumbers ? 4 : 3, 0);
+	this._nav_now.ttip = Calendar._TT["GO_TODAY"];
+
+	this._nav_nm = hh("&#x203a;", 1, 1);
+	this._nav_nm.ttip = Calendar._TT["NEXT_MONTH"];
+
+	this._nav_ny = hh("&#x00bb;", 1, 2);
+	this._nav_ny.ttip = Calendar._TT["NEXT_YEAR"];
+
+	// day names
+	row = Calendar.createElement("tr", thead);
+	row.className = "daynames";
+	if (this.weekNumbers) {
+		cell = Calendar.createElement("td", row);
+		cell.className = "name wn";
+		cell.innerHTML = Calendar._TT["WK"];
+	}
+	for (var i = 7; i > 0; --i) {
+		cell = Calendar.createElement("td", row);
+		if (!i) {
+			cell.navtype = 100;
+			cell.calendar = this;
+			Calendar._add_evs(cell);
+		}
+	}
+	this.firstdayname = (this.weekNumbers) ? row.firstChild.nextSibling : row.firstChild;
+	this._displayWeekdays();
+
+	var tbody = Calendar.createElement("tbody", table);
+	this.tbody = tbody;
+
+	for (i = 6; i > 0; --i) {
+		row = Calendar.createElement("tr", tbody);
+		if (this.weekNumbers) {
+			cell = Calendar.createElement("td", row);
+		}
+		for (var j = 7; j > 0; --j) {
+			cell = Calendar.createElement("td", row);
+			cell.calendar = this;
+			Calendar._add_evs(cell);
+		}
+	}
+
+	if (this.showsTime) {
+		row = Calendar.createElement("tr", tbody);
+		row.className = "time";
+
+		cell = Calendar.createElement("td", row);
+		cell.className = "time";
+		cell.colSpan = 2;
+		cell.innerHTML = Calendar._TT["TIME"] || "&nbsp;";
+
+		cell = Calendar.createElement("td", row);
+		cell.className = "time";
+		cell.colSpan = this.weekNumbers ? 4 : 3;
+
+		(function(){
+			function makeTimePart(className, init, range_start, range_end) {
+				var part = Calendar.createElement("span", cell);
+				part.className = className;
+				part.innerHTML = init;
+				part.calendar = cal;
+				part.ttip = Calendar._TT["TIME_PART"];
+				part.navtype = 50;
+				part._range = [];
+				if (typeof range_start != "number")
+					part._range = range_start;
+				else {
+					for (var i = range_start; i <= range_end; ++i) {
+						var txt;
+						if (i < 10 && range_end >= 10) txt = '0' + i;
+						else txt = '' + i;
+						part._range[part._range.length] = txt;
+					}
+				}
+				Calendar._add_evs(part);
+				return part;
+			};
+			var hrs = cal.date.getHours();
+			var mins = cal.date.getMinutes();
+			var t12 = !cal.time24;
+			var pm = (hrs > 12);
+			if (t12 && pm) hrs -= 12;
+			var H = makeTimePart("hour", hrs, t12 ? 1 : 0, t12 ? 12 : 23);
+			var span = Calendar.createElement("span", cell);
+			span.innerHTML = ":";
+			span.className = "colon";
+			var M = makeTimePart("minute", mins, 0, 59);
+			var AP = null;
+			cell = Calendar.createElement("td", row);
+			cell.className = "time";
+			cell.colSpan = 2;
+			if (t12)
+				AP = makeTimePart("ampm", pm ? "pm" : "am", ["am", "pm"]);
+			else
+				cell.innerHTML = "&nbsp;";
+
+			cal.onSetTime = function() {
+				var pm, hrs = this.date.getHours(),
+					mins = this.date.getMinutes();
+				if (t12) {
+					pm = (hrs >= 12);
+					if (pm) hrs -= 12;
+					if (hrs == 0) hrs = 12;
+					AP.innerHTML = pm ? "pm" : "am";
+				}
+				H.innerHTML = (hrs < 10) ? ("0" + hrs) : hrs;
+				M.innerHTML = (mins < 10) ? ("0" + mins) : mins;
+			};
+
+			cal.onUpdateTime = function() {
+				var date = this.date;
+				var h = parseInt(H.innerHTML, 10);
+				if (t12) {
+					if (/pm/i.test(AP.innerHTML) && h < 12)
+						h += 12;
+					else if (/am/i.test(AP.innerHTML) && h == 12)
+						h = 0;
+				}
+				var d = date.getDate();
+				var m = date.getMonth();
+				var y = date.getFullYear();
+				date.setHours(h);
+				date.setMinutes(parseInt(M.innerHTML, 10));
+				date.setFullYear(y);
+				date.setMonth(m);
+				date.setDate(d);
+				this.dateClicked = false;
+				this.callHandler();
+			};
+		})();
+	} else {
+		this.onSetTime = this.onUpdateTime = function() {};
+	}
+
+	var tfoot = Calendar.createElement("tfoot", table);
+
+	row = Calendar.createElement("tr", tfoot);
+	row.className = "footrow";
+
+	cell = hh(Calendar._TT["SEL_DATE"], this.weekNumbers ? 8 : 7, 300);
+	cell.className = "ttip";
+	if (this.isPopup) {
+		cell.ttip = Calendar._TT["DRAG_TO_MOVE"];
+		cell.style.cursor = "move";
+	}
+	this.tooltips = cell;
+
+	div = Calendar.createElement("div", this.element);
+	this.monthsCombo = div;
+	div.className = "combo";
+	for (i = 0; i < Calendar._MN.length; ++i) {
+		var mn = Calendar.createElement("div");
+		mn.className = Calendar.is_ie ? "label-IEfix" : "label";
+		mn.month = i;
+		mn.innerHTML = Calendar._SMN[i];
+		div.appendChild(mn);
+	}
+
+	div = Calendar.createElement("div", this.element);
+	this.yearsCombo = div;
+	div.className = "combo";
+	for (i = 12; i > 0; --i) {
+		var yr = Calendar.createElement("div");
+		yr.className = Calendar.is_ie ? "label-IEfix" : "label";
+		div.appendChild(yr);
+	}
+
+	this._init(this.firstDayOfWeek, this.date);
+	parent.appendChild(this.element);
+};
+
+/** keyboard navigation, only for popup calendars */
+Calendar._keyEvent = function(ev) {
+	var cal = window._dynarch_popupCalendar;
+	if (!cal || cal.multiple)
+		return false;
+	(Calendar.is_ie) && (ev = window.event);
+	var act = (Calendar.is_ie || ev.type == "keypress"),
+		K = ev.keyCode;
+	if (ev.ctrlKey) {
+		switch (K) {
+		    case 37: // KEY left
+			act && Calendar.cellClick(cal._nav_pm);
+			break;
+		    case 38: // KEY up
+			act && Calendar.cellClick(cal._nav_py);
+			break;
+		    case 39: // KEY right
+			act && Calendar.cellClick(cal._nav_nm);
+			break;
+		    case 40: // KEY down
+			act && Calendar.cellClick(cal._nav_ny);
+			break;
+		    default:
+			return false;
+		}
+	} else switch (K) {
+	    case 32: // KEY space (now)
+		Calendar.cellClick(cal._nav_now);
+		break;
+	    case 27: // KEY esc
+		act && cal.callCloseHandler();
+		break;
+	    case 37: // KEY left
+	    case 38: // KEY up
+	    case 39: // KEY right
+	    case 40: // KEY down
+		if (act) {
+			var prev, x, y, ne, el, step;
+			prev = K == 37 || K == 38;
+			step = (K == 37 || K == 39) ? 1 : 7;
+			function setVars() {
+				el = cal.currentDateEl;
+				var p = el.pos;
+				x = p & 15;
+				y = p >> 4;
+				ne = cal.ar_days[y][x];
+			};setVars();
+			function prevMonth() {
+				var date = new Date(cal.date);
+				date.setDate(date.getDate() - step);
+				cal.setDate(date);
+			};
+			function nextMonth() {
+				var date = new Date(cal.date);
+				date.setDate(date.getDate() + step);
+				cal.setDate(date);
+			};
+			while (1) {
+				switch (K) {
+				    case 37: // KEY left
+					if (--x >= 0)
+						ne = cal.ar_days[y][x];
+					else {
+						x = 6;
+						K = 38;
+						continue;
+					}
+					break;
+				    case 38: // KEY up
+					if (--y >= 0)
+						ne = cal.ar_days[y][x];
+					else {
+						prevMonth();
+						setVars();
+					}
+					break;
+				    case 39: // KEY right
+					if (++x < 7)
+						ne = cal.ar_days[y][x];
+					else {
+						x = 0;
+						K = 40;
+						continue;
+					}
+					break;
+				    case 40: // KEY down
+					if (++y < cal.ar_days.length)
+						ne = cal.ar_days[y][x];
+					else {
+						nextMonth();
+						setVars();
+					}
+					break;
+				}
+				break;
+			}
+			if (ne) {
+				if (!ne.disabled)
+					Calendar.cellClick(ne);
+				else if (prev)
+					prevMonth();
+				else
+					nextMonth();
+			}
+		}
+		break;
+	    case 13: // KEY enter
+		if (act)
+			Calendar.cellClick(cal.currentDateEl, ev);
+		break;
+	    default:
+		return false;
+	}
+	return Calendar.stopEvent(ev);
+};
+
+/**
+ *  (RE)Initializes the calendar to the given date and firstDayOfWeek
+ */
+Calendar.prototype._init = function (firstDayOfWeek, date) {
+	var today = new Date(),
+		TY = today.getFullYear(),
+		TM = today.getMonth(),
+		TD = today.getDate();
+	this.table.style.visibility = "hidden";
+	var year = date.getFullYear();
+	if (year < this.minYear) {
+		year = this.minYear;
+		date.setFullYear(year);
+	} else if (year > this.maxYear) {
+		year = this.maxYear;
+		date.setFullYear(year);
+	}
+	this.firstDayOfWeek = firstDayOfWeek;
+	this.date = new Date(date);
+	var month = date.getMonth();
+	var mday = date.getDate();
+	var no_days = date.getMonthDays();
+
+	// calendar voodoo for computing the first day that would actually be
+	// displayed in the calendar, even if it's from the previous month.
+	// WARNING: this is magic. ;-)
+	date.setDate(1);
+	var day1 = (date.getDay() - this.firstDayOfWeek) % 7;
+	if (day1 < 0)
+		day1 += 7;
+	date.setDate(-day1);
+	date.setDate(date.getDate() + 1);
+
+	var row = this.tbody.firstChild;
+	var MN = Calendar._SMN[month];
+	var ar_days = this.ar_days = new Array();
+	var weekend = Calendar._TT["WEEKEND"];
+	var dates = this.multiple ? (this.datesCells = {}) : null;
+	for (var i = 0; i < 6; ++i, row = row.nextSibling) {
+		var cell = row.firstChild;
+		if (this.weekNumbers) {
+			cell.className = "day wn";
+			cell.innerHTML = date.getWeekNumber();
+			cell = cell.nextSibling;
+		}
+		row.className = "daysrow";
+		var hasdays = false, iday, dpos = ar_days[i] = [];
+		for (var j = 0; j < 7; ++j, cell = cell.nextSibling, date.setDate(iday + 1)) {
+			iday = date.getDate();
+			var wday = date.getDay();
+			cell.className = "day";
+			cell.pos = i << 4 | j;
+			dpos[j] = cell;
+			var current_month = (date.getMonth() == month);
+			if (!current_month) {
+				if (this.showsOtherMonths) {
+					cell.className += " othermonth";
+					cell.otherMonth = true;
+				} else {
+					cell.className = "emptycell";
+					cell.innerHTML = "&nbsp;";
+					cell.disabled = true;
+					continue;
+				}
+			} else {
+				cell.otherMonth = false;
+				hasdays = true;
+			}
+			cell.disabled = false;
+			cell.innerHTML = this.getDateText ? this.getDateText(date, iday) : iday;
+			if (dates)
+				dates[date.print("%Y%m%d")] = cell;
+			if (this.getDateStatus) {
+				var status = this.getDateStatus(date, year, month, iday);
+				if (this.getDateToolTip) {
+					var toolTip = this.getDateToolTip(date, year, month, iday);
+					if (toolTip)
+						cell.title = toolTip;
+				}
+				if (status === true) {
+					cell.className += " disabled";
+					cell.disabled = true;
+				} else {
+					if (/disabled/i.test(status))
+						cell.disabled = true;
+					cell.className += " " + status;
+				}
+			}
+			if (!cell.disabled) {
+				cell.caldate = new Date(date);
+				cell.ttip = "_";
+				if (!this.multiple && current_month
+				    && iday == mday && this.hiliteToday) {
+					cell.className += " selected";
+					this.currentDateEl = cell;
+				}
+				if (date.getFullYear() == TY &&
+				    date.getMonth() == TM &&
+				    iday == TD) {
+					cell.className += " today";
+					cell.ttip += Calendar._TT["PART_TODAY"];
+				}
+				if (weekend.indexOf(wday.toString()) != -1)
+					cell.className += cell.otherMonth ? " oweekend" : " weekend";
+			}
+		}
+		if (!(hasdays || this.showsOtherMonths))
+			row.className = "emptyrow";
+	}
+	this.title.innerHTML = Calendar._MN[month] + ", " + year;
+	this.onSetTime();
+	this.table.style.visibility = "visible";
+	this._initMultipleDates();
+	// PROFILE
+	// this.tooltips.innerHTML = "Generated in " + ((new Date()) - today) + " ms";
+};
+
+Calendar.prototype._initMultipleDates = function() {
+	if (this.multiple) {
+		for (var i in this.multiple) {
+			var cell = this.datesCells[i];
+			var d = this.multiple[i];
+			if (!d)
+				continue;
+			if (cell)
+				cell.className += " selected";
+		}
+	}
+};
+
+Calendar.prototype._toggleMultipleDate = function(date) {
+	if (this.multiple) {
+		var ds = date.print("%Y%m%d");
+		var cell = this.datesCells[ds];
+		if (cell) {
+			var d = this.multiple[ds];
+			if (!d) {
+				Calendar.addClass(cell, "selected");
+				this.multiple[ds] = date;
+			} else {
+				Calendar.removeClass(cell, "selected");
+				delete this.multiple[ds];
+			}
+		}
+	}
+};
+
+Calendar.prototype.setDateToolTipHandler = function (unaryFunction) {
+	this.getDateToolTip = unaryFunction;
+};
+
+/**
+ *  Calls _init function above for going to a certain date (but only if the
+ *  date is different than the currently selected one).
+ */
+Calendar.prototype.setDate = function (date) {
+	if (!date.equalsTo(this.date)) {
+		this._init(this.firstDayOfWeek, date);
+	}
+};
+
+/**
+ *  Refreshes the calendar.  Useful if the "disabledHandler" function is
+ *  dynamic, meaning that the list of disabled date can change at runtime.
+ *  Just * call this function if you think that the list of disabled dates
+ *  should * change.
+ */
+Calendar.prototype.refresh = function () {
+	this._init(this.firstDayOfWeek, this.date);
+};
+
+/** Modifies the "firstDayOfWeek" parameter (pass 0 for Synday, 1 for Monday, etc.). */
+Calendar.prototype.setFirstDayOfWeek = function (firstDayOfWeek) {
+	this._init(firstDayOfWeek, this.date);
+	this._displayWeekdays();
+};
+
+/**
+ *  Allows customization of what dates are enabled.  The "unaryFunction"
+ *  parameter must be a function object that receives the date (as a JS Date
+ *  object) and returns a boolean value.  If the returned value is true then
+ *  the passed date will be marked as disabled.
+ */
+Calendar.prototype.setDateStatusHandler = Calendar.prototype.setDisabledHandler = function (unaryFunction) {
+	this.getDateStatus = unaryFunction;
+};
+
+/** Customization of allowed year range for the calendar. */
+Calendar.prototype.setRange = function (a, z) {
+	this.minYear = a;
+	this.maxYear = z;
+};
+
+/** Calls the first user handler (selectedHandler). */
+Calendar.prototype.callHandler = function () {
+	if (this.onSelected) {
+		this.onSelected(this, this.date.print(this.dateFormat));
+	}
+};
+
+/** Calls the second user handler (closeHandler). */
+Calendar.prototype.callCloseHandler = function () {
+	if (this.onClose) {
+		this.onClose(this);
+	}
+	this.hideShowCovered();
+};
+
+/** Removes the calendar object from the DOM tree and destroys it. */
+Calendar.prototype.destroy = function () {
+	var el = this.element.parentNode;
+	el.removeChild(this.element);
+	Calendar._C = null;
+	window._dynarch_popupCalendar = null;
+};
+
+/**
+ *  Moves the calendar element to a different section in the DOM tree (changes
+ *  its parent).
+ */
+Calendar.prototype.reparent = function (new_parent) {
+	var el = this.element;
+	el.parentNode.removeChild(el);
+	new_parent.appendChild(el);
+};
+
+// This gets called when the user presses a mouse button anywhere in the
+// document, if the calendar is shown.  If the click was outside the open
+// calendar this function closes it.
+Calendar._checkCalendar = function(ev) {
+	var calendar = window._dynarch_popupCalendar;
+	if (!calendar) {
+		return false;
+	}
+	var el = Calendar.is_ie ? Calendar.getElement(ev) : Calendar.getTargetElement(ev);
+	for (; el != null && el != calendar.element; el = el.parentNode);
+	if (el == null) {
+		// calls closeHandler which should hide the calendar.
+		window._dynarch_popupCalendar.callCloseHandler();
+		return Calendar.stopEvent(ev);
+	}
+};
+
+/** Shows the calendar. */
+Calendar.prototype.show = function () {
+	var rows = this.table.getElementsByTagName("tr");
+	for (var i = rows.length; i > 0;) {
+		var row = rows[--i];
+		Calendar.removeClass(row, "rowhilite");
+		var cells = row.getElementsByTagName("td");
+		for (var j = cells.length; j > 0;) {
+			var cell = cells[--j];
+			Calendar.removeClass(cell, "hilite");
+			Calendar.removeClass(cell, "active");
+		}
+	}
+	this.element.style.display = "block";
+	this.hidden = false;
+	if (this.isPopup) {
+		window._dynarch_popupCalendar = this;
+		Calendar.addEvent(document, "keydown", Calendar._keyEvent);
+		Calendar.addEvent(document, "keypress", Calendar._keyEvent);
+		Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
+	}
+	this.hideShowCovered();
+};
+
+/**
+ *  Hides the calendar.  Also removes any "hilite" from the class of any TD
+ *  element.
+ */
+Calendar.prototype.hide = function () {
+	if (this.isPopup) {
+		Calendar.removeEvent(document, "keydown", Calendar._keyEvent);
+		Calendar.removeEvent(document, "keypress", Calendar._keyEvent);
+		Calendar.removeEvent(document, "mousedown", Calendar._checkCalendar);
+	}
+	this.element.style.display = "none";
+	this.hidden = true;
+	this.hideShowCovered();
+};
+
+/**
+ *  Shows the calendar at a given absolute position (beware that, depending on
+ *  the calendar element style -- position property -- this might be relative
+ *  to the parent's containing rectangle).
+ */
+Calendar.prototype.showAt = function (x, y) {
+	var s = this.element.style;
+	s.left = x + "px";
+	s.top = y + "px";
+	this.show();
+};
+
+/** Shows the calendar near a given element. */
+Calendar.prototype.showAtElement = function (el, opts) {
+	var self = this;
+	var p = Calendar.getAbsolutePos(el);
+	if (!opts || typeof opts != "string") {
+		this.showAt(p.x, p.y + el.offsetHeight);
+		return true;
+	}
+	function fixPosition(box) {
+		if (box.x < 0)
+			box.x = 0;
+		if (box.y < 0)
+			box.y = 0;
+		var cp = document.createElement("div");
+		var s = cp.style;
+		s.position = "absolute";
+		s.right = s.bottom = s.width = s.height = "0px";
+		document.body.appendChild(cp);
+		var br = Calendar.getAbsolutePos(cp);
+		document.body.removeChild(cp);
+		if (Calendar.is_ie) {
+			br.y += document.body.scrollTop;
+			br.x += document.body.scrollLeft;
+		} else {
+			br.y += window.scrollY;
+			br.x += window.scrollX;
+		}
+		var tmp = box.x + box.width - br.x;
+		if (tmp > 0) box.x -= tmp;
+		tmp = box.y + box.height - br.y;
+		if (tmp > 0) box.y -= tmp;
+	};
+	this.element.style.display = "block";
+	Calendar.continuation_for_the_fucking_khtml_browser = function() {
+		var w = self.element.offsetWidth;
+		var h = self.element.offsetHeight;
+		self.element.style.display = "none";
+		var valign = opts.substr(0, 1);
+		var halign = "l";
+		if (opts.length > 1) {
+			halign = opts.substr(1, 1);
+		}
+		// vertical alignment
+		switch (valign) {
+		    case "T": p.y -= h; break;
+		    case "B": p.y += el.offsetHeight; break;
+		    case "C": p.y += (el.offsetHeight - h) / 2; break;
+		    case "t": p.y += el.offsetHeight - h; break;
+		    case "b": break; // already there
+		}
+		// horizontal alignment
+		switch (halign) {
+		    case "L": p.x -= w; break;
+		    case "R": p.x += el.offsetWidth; break;
+		    case "C": p.x += (el.offsetWidth - w) / 2; break;
+		    case "l": p.x += el.offsetWidth - w; break;
+		    case "r": break; // already there
+		}
+		p.width = w;
+		p.height = h + 40;
+		self.monthsCombo.style.display = "none";
+		fixPosition(p);
+		self.showAt(p.x, p.y);
+	};
+	if (Calendar.is_khtml)
+		setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
+	else
+		Calendar.continuation_for_the_fucking_khtml_browser();
+};
+
+/** Customizes the date format. */
+Calendar.prototype.setDateFormat = function (str) {
+	this.dateFormat = str;
+};
+
+/** Customizes the tooltip date format. */
+Calendar.prototype.setTtDateFormat = function (str) {
+	this.ttDateFormat = str;
+};
+
+/**
+ *  Tries to identify the date represented in a string.  If successful it also
+ *  calls this.setDate which moves the calendar to the given date.
+ */
+Calendar.prototype.parseDate = function(str, fmt) {
+	if (!fmt)
+		fmt = this.dateFormat;
+	this.setDate(Date.parseDate(str, fmt));
+};
+
+Calendar.prototype.hideShowCovered = function () {
+	if (!Calendar.is_ie && !Calendar.is_opera)
+		return;
+	function getVisib(obj){
+		var value = obj.style.visibility;
+		if (!value) {
+			if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
+				if (!Calendar.is_khtml)
+					value = document.defaultView.
+						getComputedStyle(obj, "").getPropertyValue("visibility");
+				else
+					value = '';
+			} else if (obj.currentStyle) { // IE
+				value = obj.currentStyle.visibility;
+			} else
+				value = '';
+		}
+		return value;
+	};
+
+	var tags = new Array("applet", "iframe", "select");
+	var el = this.element;
+
+	var p = Calendar.getAbsolutePos(el);
+	var EX1 = p.x;
+	var EX2 = el.offsetWidth + EX1;
+	var EY1 = p.y;
+	var EY2 = el.offsetHeight + EY1;
+
+	for (var k = tags.length; k > 0; ) {
+		var ar = document.getElementsByTagName(tags[--k]);
+		var cc = null;
+
+		for (var i = ar.length; i > 0;) {
+			cc = ar[--i];
+
+			p = Calendar.getAbsolutePos(cc);
+			var CX1 = p.x;
+			var CX2 = cc.offsetWidth + CX1;
+			var CY1 = p.y;
+			var CY2 = cc.offsetHeight + CY1;
+
+			if (this.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
+				if (!cc.__msh_save_visibility) {
+					cc.__msh_save_visibility = getVisib(cc);
+				}
+				cc.style.visibility = cc.__msh_save_visibility;
+			} else {
+				if (!cc.__msh_save_visibility) {
+					cc.__msh_save_visibility = getVisib(cc);
+				}
+				cc.style.visibility = "hidden";
+			}
+		}
+	}
+};
+
+/** Internal function; it displays the bar with the names of the weekday. */
+Calendar.prototype._displayWeekdays = function () {
+	var fdow = this.firstDayOfWeek;
+	var cell = this.firstdayname;
+	var weekend = Calendar._TT["WEEKEND"];
+	for (var i = 0; i < 7; ++i) {
+		cell.className = "day name";
+		var realday = (i + fdow) % 7;
+		if (i) {
+			cell.ttip = Calendar._TT["DAY_FIRST"].replace("%s", Calendar._DN[realday]);
+			cell.navtype = 100;
+			cell.calendar = this;
+			cell.fdow = realday;
+			Calendar._add_evs(cell);
+		}
+		if (weekend.indexOf(realday.toString()) != -1) {
+			Calendar.addClass(cell, "weekend");
+		}
+		cell.innerHTML = Calendar._SDN[(i + fdow) % 7];
+		cell = cell.nextSibling;
+	}
+};
+
+/** Internal function.  Hides all combo boxes that might be displayed. */
+Calendar.prototype._hideCombos = function () {
+	this.monthsCombo.style.display = "none";
+	this.yearsCombo.style.display = "none";
+};
+
+/** Internal function.  Starts dragging the element. */
+Calendar.prototype._dragStart = function (ev) {
+	if (this.dragging) {
+		return;
+	}
+	this.dragging = true;
+	var posX;
+	var posY;
+	if (Calendar.is_ie) {
+		posY = window.event.clientY + document.body.scrollTop;
+		posX = window.event.clientX + document.body.scrollLeft;
+	} else {
+		posY = ev.clientY + window.scrollY;
+		posX = ev.clientX + window.scrollX;
+	}
+	var st = this.element.style;
+	this.xOffs = posX - parseInt(st.left);
+	this.yOffs = posY - parseInt(st.top);
+	with (Calendar) {
+		addEvent(document, "mousemove", calDragIt);
+		addEvent(document, "mouseup", calDragEnd);
+	}
+};
+
+// BEGIN: DATE OBJECT PATCHES
+
+/** Adds the number of days array to the Date object. */
+Date._MD = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
+
+/** Constants used for time computations */
+Date.SECOND = 1000 /* milliseconds */;
+Date.MINUTE = 60 * Date.SECOND;
+Date.HOUR   = 60 * Date.MINUTE;
+Date.DAY    = 24 * Date.HOUR;
+Date.WEEK   =  7 * Date.DAY;
+
+Date.parseDate = function(str, fmt) {
+	var today = new Date();
+	var y = 0;
+	var m = -1;
+	var d = 0;
+	var a = str.split(/\W+/);
+	var b = fmt.match(/%./g);
+	var i = 0, j = 0;
+	var hr = 0;
+	var min = 0;
+	for (i = 0; i < a.length; ++i) {
+		if (!a[i])
+			continue;
+		switch (b[i]) {
+		    case "%d":
+		    case "%e":
+			d = parseInt(a[i], 10);
+			break;
+
+		    case "%m":
+			m = parseInt(a[i], 10) - 1;
+			break;
+
+		    case "%Y":
+		    case "%y":
+			y = parseInt(a[i], 10);
+			(y < 100) && (y += (y > 29) ? 1900 : 2000);
+			break;
+
+		    case "%b":
+		    case "%B":
+			for (j = 0; j < 12; ++j) {
+				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
+			}
+			break;
+
+		    case "%H":
+		    case "%I":
+		    case "%k":
+		    case "%l":
+			hr = parseInt(a[i], 10);
+			break;
+
+		    case "%P":
+		    case "%p":
+			if (/pm/i.test(a[i]) && hr < 12)
+				hr += 12;
+			else if (/am/i.test(a[i]) && hr >= 12)
+				hr -= 12;
+			break;
+
+		    case "%M":
+			min = parseInt(a[i], 10);
+			break;
+		}
+	}
+	if (isNaN(y)) y = today.getFullYear();
+	if (isNaN(m)) m = today.getMonth();
+	if (isNaN(d)) d = today.getDate();
+	if (isNaN(hr)) hr = today.getHours();
+	if (isNaN(min)) min = today.getMinutes();
+	if (y != 0 && m != -1 && d != 0)
+		return new Date(y, m, d, hr, min, 0);
+	y = 0; m = -1; d = 0;
+	for (i = 0; i < a.length; ++i) {
+		if (a[i].search(/[a-zA-Z]+/) != -1) {
+			var t = -1;
+			for (j = 0; j < 12; ++j) {
+				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
+			}
+			if (t != -1) {
+				if (m != -1) {
+					d = m+1;
+				}
+				m = t;
+			}
+		} else if (parseInt(a[i], 10) <= 12 && m == -1) {
+			m = a[i]-1;
+		} else if (parseInt(a[i], 10) > 31 && y == 0) {
+			y = parseInt(a[i], 10);
+			(y < 100) && (y += (y > 29) ? 1900 : 2000);
+		} else if (d == 0) {
+			d = a[i];
+		}
+	}
+	if (y == 0)
+		y = today.getFullYear();
+	if (m != -1 && d != 0)
+		return new Date(y, m, d, hr, min, 0);
+	return today;
+};
+
+/** Returns the number of days in the current month */
+Date.prototype.getMonthDays = function(month) {
+	var year = this.getFullYear();
+	if (typeof month == "undefined") {
+		month = this.getMonth();
+	}
+	if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
+		return 29;
+	} else {
+		return Date._MD[month];
+	}
+};
+
+/** Returns the number of day in the year. */
+Date.prototype.getDayOfYear = function() {
+	var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+	var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
+	var time = now - then;
+	return Math.floor(time / Date.DAY);
+};
+
+/** Returns the number of the week in year, as defined in ISO 8601. */
+Date.prototype.getWeekNumber = function() {
+	var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+	var DoW = d.getDay();
+	d.setDate(d.getDate() - (DoW + 6) % 7 + 3); // Nearest Thu
+	var ms = d.valueOf(); // GMT
+	d.setMonth(0);
+	d.setDate(4); // Thu in Week 1
+	return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
+};
+
+/** Checks date and time equality */
+Date.prototype.equalsTo = function(date) {
+	return ((this.getFullYear() == date.getFullYear()) &&
+		(this.getMonth() == date.getMonth()) &&
+		(this.getDate() == date.getDate()) &&
+		(this.getHours() == date.getHours()) &&
+		(this.getMinutes() == date.getMinutes()));
+};
+
+/** Set only the year, month, date parts (keep existing time) */
+Date.prototype.setDateOnly = function(date) {
+	var tmp = new Date(date);
+	this.setDate(1);
+	this.setFullYear(tmp.getFullYear());
+	this.setMonth(tmp.getMonth());
+	this.setDate(tmp.getDate());
+};
+
+/** Prints the date in a string according to the given format. */
+Date.prototype.print = function (str) {
+	var m = this.getMonth();
+	var d = this.getDate();
+	var y = this.getFullYear();
+	var wn = this.getWeekNumber();
+	var w = this.getDay();
+	var s = {};
+	var hr = this.getHours();
+	var pm = (hr >= 12);
+	var ir = (pm) ? (hr - 12) : hr;
+	var dy = this.getDayOfYear();
+	if (ir == 0)
+		ir = 12;
+	var min = this.getMinutes();
+	var sec = this.getSeconds();
+	s["%a"] = Calendar._SDN[w]; // abbreviated weekday name [FIXME: I18N]
+	s["%A"] = Calendar._DN[w]; // full weekday name
+	s["%b"] = Calendar._SMN[m]; // abbreviated month name [FIXME: I18N]
+	s["%B"] = Calendar._MN[m]; // full month name
+	// FIXME: %c : preferred date and time representation for the current locale
+	s["%C"] = 1 + Math.floor(y / 100); // the century number
+	s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
+	s["%e"] = d; // the day of the month (range 1 to 31)
+	// FIXME: %D : american date style: %m/%d/%y
+	// FIXME: %E, %F, %G, %g, %h (man strftime)
+	s["%H"] = (hr < 10) ? ("0" + hr) : hr; // hour, range 00 to 23 (24h format)
+	s["%I"] = (ir < 10) ? ("0" + ir) : ir; // hour, range 01 to 12 (12h format)
+	s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy; // day of the year (range 001 to 366)
+	s["%k"] = hr;		// hour, range 0 to 23 (24h format)
+	s["%l"] = ir;		// hour, range 1 to 12 (12h format)
+	s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12
+	s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59
+	s["%n"] = "\n";		// a newline character
+	s["%p"] = pm ? "PM" : "AM";
+	s["%P"] = pm ? "pm" : "am";
+	// FIXME: %r : the time in am/pm notation %I:%M:%S %p
+	// FIXME: %R : the time in 24-hour notation %H:%M
+	s["%s"] = Math.floor(this.getTime() / 1000);
+	s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
+	s["%t"] = "\t";		// a tab character
+	// FIXME: %T : the time in 24-hour notation (%H:%M:%S)
+	s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
+	s["%u"] = w + 1;	// the day of the week (range 1 to 7, 1 = MON)
+	s["%w"] = w;		// the day of the week (range 0 to 6, 0 = SUN)
+	// FIXME: %x : preferred date representation for the current locale without the time
+	// FIXME: %X : preferred time representation for the current locale without the date
+	s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
+	s["%Y"] = y;		// year with the century
+	s["%%"] = "%";		// a literal '%' character
+
+	var re = /%./g;
+	if (!Calendar.is_ie5 && !Calendar.is_khtml)
+		return str.replace(re, function (par) { return s[par] || par; });
+
+	var a = str.match(re);
+	for (var i = 0; i < a.length; i++) {
+		var tmp = s[a[i]];
+		if (tmp) {
+			re = new RegExp(a[i], 'g');
+			str = str.replace(re, tmp);
+		}
+	}
+
+	return str;
+};
+
+Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
+Date.prototype.setFullYear = function(y) {
+	var d = new Date(this);
+	d.__msh_oldSetFullYear(y);
+	if (d.getMonth() != this.getMonth())
+		this.setDate(28);
+	this.__msh_oldSetFullYear(y);
+};
+
+// END: DATE OBJECT PATCHES
+
+
+// global object that remembers the calendar
+window._dynarch_popupCalendar = null;
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/img.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/img.gif
new file mode 100644
index 00000000..6774ca5c
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/img.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-af.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-af.js
new file mode 100644
index 00000000..ace710e6
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-af.js
@@ -0,0 +1,39 @@
+// ** I18N Afrikaans
+Calendar._DN = new Array
+("Sondag",
+ "Maandag",
+ "Dinsdag",
+ "Woensdag",
+ "Donderdag",
+ "Vrydag",
+ "Saterdag",
+ "Sondag");
+Calendar._MN = new Array
+("Januarie",
+ "Februarie",
+ "Maart",
+ "April",
+ "Mei",
+ "Junie",
+ "Julie",
+ "Augustus",
+ "September",
+ "Oktober",
+ "November",
+ "Desember");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["TOGGLE"] = "Verander eerste dag van die week";
+Calendar._TT["PREV_YEAR"] = "Vorige jaar (hou vir keuselys)";
+Calendar._TT["PREV_MONTH"] = "Vorige maand (hou vir keuselys)";
+Calendar._TT["GO_TODAY"] = "Gaan na vandag";
+Calendar._TT["NEXT_MONTH"] = "Volgende maand (hou vir keuselys)";
+Calendar._TT["NEXT_YEAR"] = "Volgende jaar (hou vir keuselys)";
+Calendar._TT["SEL_DATE"] = "Kies datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Sleep om te skuif";
+Calendar._TT["PART_TODAY"] = " (vandag)";
+Calendar._TT["MON_FIRST"] = "Vertoon Maandag eerste";
+Calendar._TT["SUN_FIRST"] = "Display Sunday first";
+Calendar._TT["CLOSE"] = "Close";
+Calendar._TT["TODAY"] = "Today";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-al.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-al.js
new file mode 100644
index 00000000..f9cfe8f5
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-al.js
@@ -0,0 +1,101 @@
+// Calendar ALBANIAN language
+//author Rigels Gordani rige@hotmail.com
+
+// ditet
+Calendar._DN = new Array
+("E Diele",
+"E Hene",
+"E Marte",
+"E Merkure",
+"E Enjte",
+"E Premte",
+"E Shtune",
+"E Diele");
+
+//ditet shkurt
+Calendar._SDN = new Array
+("Die",
+"Hen",
+"Mar",
+"Mer",
+"Enj",
+"Pre",
+"Sht",
+"Die");
+
+// muajt
+Calendar._MN = new Array
+("Janar",
+"Shkurt",
+"Mars",
+"Prill",
+"Maj",
+"Qeshor",
+"Korrik",
+"Gusht",
+"Shtator",
+"Tetor",
+"Nentor",
+"Dhjetor");
+
+// muajte shkurt
+Calendar._SMN = new Array
+("Jan",
+"Shk",
+"Mar",
+"Pri",
+"Maj",
+"Qes",
+"Kor",
+"Gus",
+"Sht",
+"Tet",
+"Nen",
+"Dhj");
+
+// ndihmesa
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Per kalendarin";
+
+Calendar._TT["ABOUT"] =
+"Zgjedhes i ores/dates ne DHTML \n" +
+"\n\n" +"Zgjedhja e Dates:\n" +
+"- Perdor butonat \xab, \xbb per te zgjedhur vitin\n" +
+"- Perdor  butonat" + String.fromCharCode(0x2039) + ", " + 
+String.fromCharCode(0x203a) +
+" per te  zgjedhur muajin\n" +
+"- Mbani shtypur butonin e mousit per nje zgjedje me te shpejte.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Zgjedhja e kohes:\n" +
+"- Kliko tek ndonje nga pjeset e ores per ta rritur ate\n" +
+"- ose kliko me Shift per ta zvogeluar ate\n" +
+"- ose cliko dhe terhiq per zgjedhje me te shpejte.";
+
+Calendar._TT["PREV_YEAR"] = "Viti i shkuar (prit per menune)";
+Calendar._TT["PREV_MONTH"] = "Muaji i shkuar (prit per menune)";
+Calendar._TT["GO_TODAY"] = "Sot";
+Calendar._TT["NEXT_MONTH"] = "Muaji i ardhshem (prit per menune)";
+Calendar._TT["NEXT_YEAR"] = "Viti i ardhshem (prit per menune)";
+Calendar._TT["SEL_DATE"] = "Zgjidh daten";
+Calendar._TT["DRAG_TO_MOVE"] = "Terhiqe per te levizur";
+Calendar._TT["PART_TODAY"] = " (sot)";
+
+// "%s" eshte dita e pare e javes
+// %s do te zevendesohet me emrin e dite
+Calendar._TT["DAY_FIRST"] = "Trego te %s te paren";
+
+
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Mbyll";
+Calendar._TT["TODAY"] = "Sot";
+Calendar._TT["TIME_PART"] = "Kliko me (Shift-)ose terhiqe per te ndryshuar 
+vleren";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "Java";
+Calendar._TT["TIME"] = "Koha:";
+
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-bg.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-bg.js
new file mode 100644
index 00000000..5eb73ec6
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-bg.js
@@ -0,0 +1,124 @@
+// ** I18N
+
+// Calendar BG language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Translator: Valentin Sheiretsky, <valio@valio.eu.org>
+// Encoding: Windows-1251
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Íåäåëÿ",
+ "Ïîíåäåëíèê",
+ "Âòîðíèê",
+ "Ñðÿäà",
+ "×åòâúðòúê",
+ "Ïåòúê",
+ "Ñúáîòà",
+ "Íåäåëÿ");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Íåä",
+ "Ïîí",
+ "Âòî",
+ "Ñðÿ",
+ "×åò",
+ "Ïåò",
+ "Ñúá",
+ "Íåä");
+
+// full month names
+Calendar._MN = new Array
+("ßíóàðè",
+ "Ôåâðóàðè",
+ "Ìàðò",
+ "Àïðèë",
+ "Ìàé",
+ "Þíè",
+ "Þëè",
+ "Àâãóñò",
+ "Ñåïòåìâðè",
+ "Îêòîìâðè",
+ "Íîåìâðè",
+ "Äåêåìâðè");
+
+// short month names
+Calendar._SMN = new Array
+("ßíó",
+ "Ôåâ",
+ "Ìàð",
+ "Àïð",
+ "Ìàé",
+ "Þíè",
+ "Þëè",
+ "Àâã",
+ "Ñåï",
+ "Îêò",
+ "Íîå",
+ "Äåê");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Èíôîðìàöèÿ çà êàëåíäàðà";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+Calendar._TT["PREV_YEAR"] = "Ïðåäíà ãîäèíà (çàäðúæòå çà ìåíþ)";
+Calendar._TT["PREV_MONTH"] = "Ïðåäåí ìåñåö (çàäðúæòå çà ìåíþ)";
+Calendar._TT["GO_TODAY"] = "Èçáåðåòå äíåñ";
+Calendar._TT["NEXT_MONTH"] = "Ñëåäâàù ìåñåö (çàäðúæòå çà ìåíþ)";
+Calendar._TT["NEXT_YEAR"] = "Ñëåäâàùà ãîäèíà (çàäðúæòå çà ìåíþ)";
+Calendar._TT["SEL_DATE"] = "Èçáåðåòå äàòà";
+Calendar._TT["DRAG_TO_MOVE"] = "Ïðåìåñòâàíå";
+Calendar._TT["PART_TODAY"] = " (äíåñ)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "%s êàòî ïúðâè äåí";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Çàòâîðåòå";
+Calendar._TT["TODAY"] = "Äíåñ";
+Calendar._TT["TIME_PART"] = "(Shift-)Click èëè drag çà äà ïðîìåíèòå ñòîéíîñòòà";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%A - %e %B %Y";
+
+Calendar._TT["WK"] = "Ñåäì";
+Calendar._TT["TIME"] = "×àñ:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-big5-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-big5-utf8.js
new file mode 100644
index 00000000..3b6df42a
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-big5-utf8.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar big5-utf8 language
+// Author: Gary Fu, <gary@garyfu.idv.tw>
+// Encoding: utf8
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+	
+// full day names
+Calendar._DN = new Array
+("星期日",
+ "星期一",
+ "星期二",
+ "星期三",
+ "星期四",
+ "星期五",
+ "星期六",
+ "星期日");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("æ—¥",
+ "一",
+ "二",
+ "三",
+ "å››",
+ "五",
+ "å…­",
+ "æ—¥");
+
+// full month names
+Calendar._MN = new Array
+("一月",
+ "二月",
+ "三月",
+ "四月",
+ "五月",
+ "六月",
+ "七月",
+ "八月",
+ "�月",
+ "�月",
+ "�一月",
+ "�二月");
+
+// short month names
+Calendar._SMN = new Array
+("一月",
+ "二月",
+ "三月",
+ "四月",
+ "五月",
+ "六月",
+ "七月",
+ "八月",
+ "�月",
+ "�月",
+ "�一月",
+ "�二月");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "關於";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"日期�擇方法:\n" +
+"- 使用 \xab, \xbb 按鈕��擇年份\n" +
+"- 使用 " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " 按鈕��擇月份\n" +
+"- 按�上�的按鈕�以加快��";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"時間�擇方法:\n" +
+"- 點擊任何的時間部份�增加其值\n" +
+"- �時按Shift��點擊�減少其值\n" +
+"- 點擊並拖曳�加快改變的值";
+
+Calendar._TT["PREV_YEAR"] = "上一年 (按��單)";
+Calendar._TT["PREV_MONTH"] = "下一年 (按��單)";
+Calendar._TT["GO_TODAY"] = "到今日";
+Calendar._TT["NEXT_MONTH"] = "上一月 (按��單)";
+Calendar._TT["NEXT_YEAR"] = "下一月 (按��單)";
+Calendar._TT["SEL_DATE"] = "�擇日期";
+Calendar._TT["DRAG_TO_MOVE"] = "拖曳";
+Calendar._TT["PART_TODAY"] = " (今日)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "將 %s 顯示在�";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "關閉";
+Calendar._TT["TODAY"] = "今日";
+Calendar._TT["TIME_PART"] = "點擊or拖曳�改變時間(�時按Shift為減)";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "週";
+Calendar._TT["TIME"] = "Time:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-big5.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-big5.js
new file mode 100644
index 00000000..b14335ef
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-big5.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar big5 language
+// Author: Gary Fu, <gary@garyfu.idv.tw>
+// Encoding: big5
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+	
+// full day names
+Calendar._DN = new Array
+("¬P´Á¤é",
+ "¬P´Á¤@",
+ "¬P´Á¤G",
+ "¬P´Á¤T",
+ "¬P´Á¥|",
+ "¬P´Á¤­",
+ "¬P´Á¤»",
+ "¬P´Á¤é");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("¤é",
+ "¤@",
+ "¤G",
+ "¤T",
+ "¥|",
+ "¤­",
+ "¤»",
+ "¤é");
+
+// full month names
+Calendar._MN = new Array
+("¤@¤ë",
+ "¤G¤ë",
+ "¤T¤ë",
+ "¥|¤ë",
+ "¤­¤ë",
+ "¤»¤ë",
+ "¤C¤ë",
+ "¤K¤ë",
+ "¤E¤ë",
+ "¤Q¤ë",
+ "¤Q¤@¤ë",
+ "¤Q¤G¤ë");
+
+// short month names
+Calendar._SMN = new Array
+("¤@¤ë",
+ "¤G¤ë",
+ "¤T¤ë",
+ "¥|¤ë",
+ "¤­¤ë",
+ "¤»¤ë",
+ "¤C¤ë",
+ "¤K¤ë",
+ "¤E¤ë",
+ "¤Q¤ë",
+ "¤Q¤@¤ë",
+ "¤Q¤G¤ë");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Ãö©ó";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"¤é´Á¿ï¾Ü¤èªk:\n" +
+"- ¨Ï¥Î \xab, \xbb «ö¶s¥i¿ï¾Ü¦~¥÷\n" +
+"- ¨Ï¥Î " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " «ö¶s¥i¿ï¾Ü¤ë¥÷\n" +
+"- «ö¦í¤W­±ªº«ö¶s¥i¥H¥[§Ö¿ï¨ú";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"®É¶¡¿ï¾Ü¤èªk:\n" +
+"- ÂIÀ»¥ô¦óªº®É¶¡³¡¥÷¥i¼W¥[¨ä­È\n" +
+"- ¦P®É«öShiftÁä¦AÂIÀ»¥i´î¤Ö¨ä­È\n" +
+"- ÂIÀ»¨Ã©ì¦²¥i¥[§Ö§ïÅܪº­È";
+
+Calendar._TT["PREV_YEAR"] = "¤W¤@¦~ («ö¦í¿ï³æ)";
+Calendar._TT["PREV_MONTH"] = "¤U¤@¦~ («ö¦í¿ï³æ)";
+Calendar._TT["GO_TODAY"] = "¨ì¤µ¤é";
+Calendar._TT["NEXT_MONTH"] = "¤W¤@¤ë («ö¦í¿ï³æ)";
+Calendar._TT["NEXT_YEAR"] = "¤U¤@¤ë («ö¦í¿ï³æ)";
+Calendar._TT["SEL_DATE"] = "¿ï¾Ü¤é´Á";
+Calendar._TT["DRAG_TO_MOVE"] = "©ì¦²";
+Calendar._TT["PART_TODAY"] = " (¤µ¤é)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "±N %s Åã¥Ü¦b«e";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Ãö³¬";
+Calendar._TT["TODAY"] = "¤µ¤é";
+Calendar._TT["TIME_PART"] = "ÂIÀ»or©ì¦²¥i§ïÅܮɶ¡(¦P®É«öShift¬°´î)";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "¶g";
+Calendar._TT["TIME"] = "Time:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-br.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-br.js
new file mode 100644
index 00000000..8cdf5014
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-br.js
@@ -0,0 +1,108 @@
+// ** I18N
+
+// Calendar pt-BR language
+// Author: Fernando Dourado, <fernando.dourado@ig.com.br>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Domingo",
+ "Segunda",
+ "Terça",
+ "Quarta",
+ "Quinta",
+ "Sexta",
+ "Sabádo",
+ "Domingo");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+// [No changes using default values]
+
+// full month names
+Calendar._MN = new Array
+("Janeiro",
+ "Fevereiro",
+ "Março",
+ "Abril",
+ "Maio",
+ "Junho",
+ "Julho",
+ "Agosto",
+ "Setembro",
+ "Outubro",
+ "Novembro",
+ "Dezembro");
+
+// short month names
+// [No changes using default values]
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Sobre o calendário";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Translate to portuguese Brazil (pt-BR) by Fernando Dourado (fernando.dourado@ig.com.br)\n" +
+"Tradução para o português Brasil (pt-BR) por Fernando Dourado (fernando.dourado@ig.com.br)" +
+"\n\n" +
+"Selecionar data:\n" +
+"- Use as teclas \xab, \xbb para selecionar o ano\n" +
+"- Use as teclas " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " para selecionar o mês\n" +
+"- Clique e segure com o mouse em qualquer botão para selecionar rapidamente.";
+
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selecionar hora:\n" +
+"- Clique em qualquer uma das partes da hora para aumentar\n" +
+"- ou Shift-clique para diminuir\n" +
+"- ou clique e arraste para selecionar rapidamente.";
+
+Calendar._TT["PREV_YEAR"] = "Ano anterior (clique e segure para menu)";
+Calendar._TT["PREV_MONTH"] = "Mês anterior (clique e segure para menu)";
+Calendar._TT["GO_TODAY"] = "Ir para a data atual";
+Calendar._TT["NEXT_MONTH"] = "Próximo mês (clique e segure para menu)";
+Calendar._TT["NEXT_YEAR"] = "Próximo ano (clique e segure para menu)";
+Calendar._TT["SEL_DATE"] = "Selecione uma data";
+Calendar._TT["DRAG_TO_MOVE"] = "Clique e segure para mover";
+Calendar._TT["PART_TODAY"] = " (hoje)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Exibir %s primeiro";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Fechar";
+Calendar._TT["TODAY"] = "Hoje";
+Calendar._TT["TIME_PART"] = "(Shift-)Clique ou arraste para mudar o valor";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d/%m/%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%d de %B de %Y";
+
+Calendar._TT["WK"] = "sem";
+Calendar._TT["TIME"] = "Hora:";
+
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ca.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ca.js
new file mode 100644
index 00000000..bd2e7ba3
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ca.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar CA language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Diumenge",
+ "Dilluns",
+ "Dimarts",
+ "Dimecres",
+ "Dijous",
+ "Divendres",
+ "Dissabte",
+ "Diumenge");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Diu",
+ "Dil",
+ "Dmt",
+ "Dmc",
+ "Dij",
+ "Div",
+ "Dis",
+ "Diu");
+
+// full month names
+Calendar._MN = new Array
+("Gener",
+ "Febrer",
+ "Març",
+ "Abril",
+ "Maig",
+ "Juny",
+ "Juliol",
+ "Agost",
+ "Setembre",
+ "Octubre",
+ "Novembre",
+ "Desembre");
+
+// short month names
+Calendar._SMN = new Array
+("Gen",
+ "Feb",
+ "Mar",
+ "Abr",
+ "Mai",
+ "Jun",
+ "Jul",
+ "Ago",
+ "Set",
+ "Oct",
+ "Nov",
+ "Des");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Sobre el calendari";
+
+Calendar._TT["ABOUT"] =
+"DHTML Selector de Data/Hora\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Sel.lecció de Dates:\n" +
+"- Fes servir els botons \xab, \xbb per sel.leccionar l'any\n" +
+"- Fes servir els botons " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " per se.lecciconar el mes\n" +
+"- Manté el ratolí apretat en qualsevol dels anteriors per sel.lecció ràpida.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- claca en qualsevol de les parts de la hora per augmentar-les\n" +
+"- o Shift-click per decrementar-la\n" +
+"- or click and arrastra per sel.lecció ràpida.";
+
+Calendar._TT["PREV_YEAR"] = "Any anterior (Mantenir per menu)";
+Calendar._TT["PREV_MONTH"] = "Mes anterior (Mantenir per menu)";
+Calendar._TT["GO_TODAY"] = "Anar a avui";
+Calendar._TT["NEXT_MONTH"] = "Mes següent (Mantenir per menu)";
+Calendar._TT["NEXT_YEAR"] = "Any següent (Mantenir per menu)";
+Calendar._TT["SEL_DATE"] = "Sel.leccionar data";
+Calendar._TT["DRAG_TO_MOVE"] = "Arrastrar per moure";
+Calendar._TT["PART_TODAY"] = " (avui)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Mostra %s primer";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Tanca";
+Calendar._TT["TODAY"] = "Avui";
+Calendar._TT["TIME_PART"] = "(Shift-)Click a arrastra per canviar el valor";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "st";
+Calendar._TT["TIME"] = "Hora:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-cs-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-cs-utf8.js
new file mode 100644
index 00000000..fd0c0602
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-cs-utf8.js
@@ -0,0 +1,65 @@
+/* 
+	calendar-cs-win.js
+	language: Czech
+	encoding: windows-1250
+	author: Lubos Jerabek (xnet@seznam.cz)
+	        Jan Uhlir (espinosa@centrum.cz)
+*/
+
+// ** I18N
+Calendar._DN  = new Array('Neděle','Pondělí','Úterý','Středa','Čtvrtek','Pátek','Sobota','Neděle');
+Calendar._SDN = new Array('Ne','Po','Út','St','Čt','Pá','So','Ne');
+Calendar._MN  = new Array('Leden','Únor','Březen','Duben','Květen','Červen','Červenec','Srpen','Září','Říjen','Listopad','Prosinec');
+Calendar._SMN = new Array('Led','Úno','Bře','Dub','Kvě','Črv','Čvc','Srp','Zář','Říj','Lis','Pro');
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O komponentě kalendář";
+Calendar._TT["TOGGLE"] = "Změna prvního dne v týdnu";
+Calendar._TT["PREV_YEAR"] = "Předchozí rok (přidrž pro menu)";
+Calendar._TT["PREV_MONTH"] = "Předchozí měsíc (přidrž pro menu)";
+Calendar._TT["GO_TODAY"] = "Dnešní datum";
+Calendar._TT["NEXT_MONTH"] = "Další měsíc (přidrž pro menu)";
+Calendar._TT["NEXT_YEAR"] = "Další rok (přidrž pro menu)";
+Calendar._TT["SEL_DATE"] = "Vyber datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Chyť a táhni, pro přesun";
+Calendar._TT["PART_TODAY"] = " (dnes)";
+Calendar._TT["MON_FIRST"] = "Ukaž jako první Pondělí";
+//Calendar._TT["SUN_FIRST"] = "Ukaž jako první Neděli";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Výběr datumu:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Použijte tla�ítka " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " k výběru měsíce\n" +
+"- Podržte tla�ítko myši na jakémkoliv z těch tla�ítek pro rychlejší výběr.";
+
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Výběr �asu:\n" +
+"- Klikněte na jakoukoliv z �ástí výběru �asu pro zvýšení.\n" +
+"- nebo Shift-click pro snížení\n" +
+"- nebo klikněte a táhněte pro rychlejší výběr.";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Zobraz %s první";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Zavřít";
+Calendar._TT["TODAY"] = "Dnes";
+Calendar._TT["TIME_PART"] = "(Shift-)Klikni nebo táhni pro změnu hodnoty";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "d.m.yy";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "ÄŒas:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-cs-win.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-cs-win.js
new file mode 100644
index 00000000..bd96c521
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-cs-win.js
@@ -0,0 +1,65 @@
+/* 
+	calendar-cs-win.js
+	language: Czech
+	encoding: windows-1250
+	author: Lubos Jerabek (xnet@seznam.cz)
+	        Jan Uhlir (espinosa@centrum.cz)
+*/
+
+// ** I18N
+Calendar._DN  = new Array('Nedìle','Pondìlí','Úterý','Støeda','Ètvrtek','Pátek','Sobota','Nedìle');
+Calendar._SDN = new Array('Ne','Po','Út','St','Èt','Pá','So','Ne');
+Calendar._MN  = new Array('Leden','Únor','Bøezen','Duben','Kvìten','Èerven','Èervenec','Srpen','Záøí','Øíjen','Listopad','Prosinec');
+Calendar._SMN = new Array('Led','Úno','Bøe','Dub','Kvì','Èrv','Èvc','Srp','Záø','Øíj','Lis','Pro');
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O komponentì kalendáø";
+Calendar._TT["TOGGLE"] = "Zmìna prvního dne v týdnu";
+Calendar._TT["PREV_YEAR"] = "Pøedchozí rok (pøidrž pro menu)";
+Calendar._TT["PREV_MONTH"] = "Pøedchozí mìsíc (pøidrž pro menu)";
+Calendar._TT["GO_TODAY"] = "Dnešní datum";
+Calendar._TT["NEXT_MONTH"] = "Další mìsíc (pøidrž pro menu)";
+Calendar._TT["NEXT_YEAR"] = "Další rok (pøidrž pro menu)";
+Calendar._TT["SEL_DATE"] = "Vyber datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Chy� a táhni, pro pøesun";
+Calendar._TT["PART_TODAY"] = " (dnes)";
+Calendar._TT["MON_FIRST"] = "Ukaž jako první Pondìlí";
+//Calendar._TT["SUN_FIRST"] = "Ukaž jako první Nedìli";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Výbìr datumu:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Použijte tlaèítka " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " k výbìru mìsíce\n" +
+"- Podržte tlaèítko myši na jakémkoliv z tìch tlaèítek pro rychlejší výbìr.";
+
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Výbìr èasu:\n" +
+"- Kliknìte na jakoukoliv z èástí výbìru èasu pro zvýšení.\n" +
+"- nebo Shift-click pro snížení\n" +
+"- nebo kliknìte a táhnìte pro rychlejší výbìr.";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Zobraz %s první";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Zavøít";
+Calendar._TT["TODAY"] = "Dnes";
+Calendar._TT["TIME_PART"] = "(Shift-)Klikni nebo táhni pro zmìnu hodnoty";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "d.m.yy";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Èas:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-da.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-da.js
new file mode 100644
index 00000000..2e156570
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-da.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar DA language
+// Author: Michael Thingmand Henriksen, <michael (a) thingmand dot dk>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible. We strongly believe that
+// Unicode is the answer to a real internationalized world. Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Søndag",
+"Mandag",
+"Tirsdag",
+"Onsdag",
+"Torsdag",
+"Fredag",
+"Lørdag",
+"Søndag");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary. We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+// Calendar._SDN_len = N; // short day name length
+// Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Søn",
+"Man",
+"Tir",
+"Ons",
+"Tor",
+"Fre",
+"Lør",
+"Søn");
+
+// full month names
+Calendar._MN = new Array
+("Januar",
+"Februar",
+"Marts",
+"April",
+"Maj",
+"Juni",
+"Juli",
+"August",
+"September",
+"Oktober",
+"November",
+"December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+"Feb",
+"Mar",
+"Apr",
+"Maj",
+"Jun",
+"Jul",
+"Aug",
+"Sep",
+"Okt",
+"Nov",
+"Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Om Kalenderen";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For den seneste version besøg: http://www.dynarch.com/projects/calendar/\n"; +
+"Distribueret under GNU LGPL. Se http://gnu.org/licenses/lgpl.html for detajler." +
+"\n\n" +
+"Valg af dato:\n" +
+"- Brug \xab, \xbb knapperne for at vælge år\n" +
+"- Brug " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " knapperne for at vælge måned\n" +
+"- Hold knappen på musen nede på knapperne ovenfor for hurtigere valg.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Valg af tid:\n" +
+"- Klik på en vilkårlig del for større værdi\n" +
+"- eller Shift-klik for for mindre værdi\n" +
+"- eller klik og træk for hurtigere valg.";
+
+Calendar._TT["PREV_YEAR"] = "Ét år tilbage (hold for menu)";
+Calendar._TT["PREV_MONTH"] = "Én måned tilbage (hold for menu)";
+Calendar._TT["GO_TODAY"] = "GÃ¥ til i dag";
+Calendar._TT["NEXT_MONTH"] = "Én måned frem (hold for menu)";
+Calendar._TT["NEXT_YEAR"] = "Ét år frem (hold for menu)";
+Calendar._TT["SEL_DATE"] = "Vælg dag";
+Calendar._TT["DRAG_TO_MOVE"] = "Træk vinduet";
+Calendar._TT["PART_TODAY"] = " (i dag)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Vis %s først";
+
+// This may be locale-dependent. It specifies the week-end days, as an array
+// of comma-separated numbers. The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Luk";
+Calendar._TT["TODAY"] = "I dag";
+Calendar._TT["TIME_PART"] = "(Shift-)klik eller træk for at ændre værdi";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d-%m-%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "Uge";
+Calendar._TT["TIME"] = "Tid:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-de.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-de.js
new file mode 100644
index 00000000..6e9e7054
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-de.js
@@ -0,0 +1,124 @@
+// ** I18N
+
+// Calendar DE language
+// Author: Jack (tR), <jack@jtr.de>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sonntag",
+ "Montag",
+ "Dienstag",
+ "Mittwoch",
+ "Donnerstag",
+ "Freitag",
+ "Samstag",
+ "Sonntag");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("So",
+ "Mo",
+ "Di",
+ "Mi",
+ "Do",
+ "Fr",
+ "Sa",
+ "So");
+
+// full month names
+Calendar._MN = new Array
+("Januar",
+ "Februar",
+ "M\u00e4rz",
+ "April",
+ "Mai",
+ "Juni",
+ "Juli",
+ "August",
+ "September",
+ "Oktober",
+ "November",
+ "Dezember");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "M\u00e4r",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Okt",
+ "Nov",
+ "Dez");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "\u00DCber dieses Kalendarmodul";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Datum ausw\u00e4hlen:\n" +
+"- Benutzen Sie die \xab, \xbb Buttons um das Jahr zu w\u00e4hlen\n" +
+"- Benutzen Sie die " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " Buttons um den Monat zu w\u00e4hlen\n" +
+"- F\u00fcr eine Schnellauswahl halten Sie die Maustaste \u00fcber diesen Buttons fest.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Zeit ausw\u00e4hlen:\n" +
+"- Klicken Sie auf die Teile der Uhrzeit, um diese zu erh\u00F6hen\n" +
+"- oder klicken Sie mit festgehaltener Shift-Taste um diese zu verringern\n" +
+"- oder klicken und festhalten f\u00fcr Schnellauswahl.";
+
+Calendar._TT["TOGGLE"] = "Ersten Tag der Woche w\u00e4hlen";
+Calendar._TT["PREV_YEAR"] = "Voriges Jahr (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["PREV_MONTH"] = "Voriger Monat (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["GO_TODAY"] = "Heute ausw\u00e4hlen";
+Calendar._TT["NEXT_MONTH"] = "N\u00e4chst. Monat (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["NEXT_YEAR"] = "N\u00e4chst. Jahr (Festhalten f\u00fcr Schnellauswahl)";
+Calendar._TT["SEL_DATE"] = "Datum ausw\u00e4hlen";
+Calendar._TT["DRAG_TO_MOVE"] = "Zum Bewegen festhalten";
+Calendar._TT["PART_TODAY"] = " (Heute)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Woche beginnt mit %s ";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Schlie\u00dfen";
+Calendar._TT["TODAY"] = "Heute";
+Calendar._TT["TIME_PART"] = "(Shift-)Klick oder Festhalten und Ziehen um den Wert zu \u00e4ndern";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Zeit:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-du.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-du.js
new file mode 100644
index 00000000..9c9051fd
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-du.js
@@ -0,0 +1,45 @@
+// ** I18N
+Calendar._DN = new Array
+("Zondag",
+ "Maandag",
+ "Dinsdag",
+ "Woensdag",
+ "Donderdag",
+ "Vrijdag",
+ "Zaterdag",
+ "Zondag");
+Calendar._MN = new Array
+("Januari",
+ "Februari",
+ "Maart",
+ "April",
+ "Mei",
+ "Juni",
+ "Juli",
+ "Augustus",
+ "September",
+ "Oktober",
+ "November",
+ "December");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["TOGGLE"] = "Toggle startdag van de week";
+Calendar._TT["PREV_YEAR"] = "Vorig jaar (indrukken voor menu)";
+Calendar._TT["PREV_MONTH"] = "Vorige month (indrukken voor menu)";
+Calendar._TT["GO_TODAY"] = "Naar Vandaag";
+Calendar._TT["NEXT_MONTH"] = "Volgende Maand (indrukken voor menu)";
+Calendar._TT["NEXT_YEAR"] = "Volgend jaar (indrukken voor menu)";
+Calendar._TT["SEL_DATE"] = "Selecteer datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Sleep om te verplaatsen";
+Calendar._TT["PART_TODAY"] = " (vandaag)";
+Calendar._TT["MON_FIRST"] = "Toon Maandag eerst";
+Calendar._TT["SUN_FIRST"] = "Toon Zondag eerst";
+Calendar._TT["CLOSE"] = "Sluiten";
+Calendar._TT["TODAY"] = "Vandaag";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "y-mm-dd";
+Calendar._TT["TT_DATE_FORMAT"] = "D, M d";
+
+Calendar._TT["WK"] = "wk";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-el.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-el.js
new file mode 100644
index 00000000..43a9b2ce
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-el.js
@@ -0,0 +1,89 @@
+// ** I18N
+Calendar._DN = new Array
+("Κυ�ιακή",
+ "Δευτέ�α",
+ "Τ�ίτη",
+ "Τετά�τη",
+ "Πέμπτη",
+ "Πα�ασκευή",
+ "Σάββατο",
+ "Κυ�ιακή");
+
+Calendar._SDN = new Array
+("Κυ",
+ "Δε",
+ "T�",
+ "Τε",
+ "Πε",
+ "Πα",
+ "Σα",
+ "Κυ");
+
+Calendar._MN = new Array
+("Ιανουά�ιος",
+ "Φεβ�ουά�ιος",
+ "Μά�τιος",
+ "Απ�ίλιος",
+ "Μάϊος",
+ "Ιο�νιος",
+ "Ιο�λιος",
+ "Α�γουστος",
+ "Σεπτέμβ�ιος",
+ "Οκτώβ�ιος",
+ "�οέμβ�ιος",
+ "Δεκέμβ�ιος");
+
+Calendar._SMN = new Array
+("Ιαν",
+ "Φεβ",
+ "Μα�",
+ "Απ�",
+ "Μαι",
+ "Ιουν",
+ "Ιουλ",
+ "Αυγ",
+ "Σεπ",
+ "Οκτ",
+ "�οε",
+ "Δεκ");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Για το ημε�ολόγιο";
+
+Calendar._TT["ABOUT"] =
+"Επιλογέας ημε�ομηνίας/ώ�ας σε DHTML\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Για τελευταία έκδοση: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Επιλογή ημε�ομηνίας:\n" +
+"- Χ�ησιμοποιείστε τα κουμπιά \xab, \xbb για επιλογή έτους\n" +
+"- Χ�ησιμοποιείστε τα κουμπιά " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " για επιλογή μήνα\n" +
+"- Κ�ατήστε κουμπί ποντικο� πατημένο στα πα�απάνω κουμπιά για πιο γ�ήγο�η επιλογή.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Επιλογή ώ�ας:\n" +
+"- Κάντε κλικ σε ένα από τα μέ�η της ώ�ας για α�ξηση\n" +
+"- ή Shift-κλικ για μείωση\n" +
+"- ή κλικ και μετακίνηση για πιο γ�ήγο�η επιλογή.";
+Calendar._TT["TOGGLE"] = "Μπά�α π�ώτης ημέ�ας της εβδομάδας";
+Calendar._TT["PREV_YEAR"] = "Π�οηγ. έτος (κ�ατήστε για το μενο�)";
+Calendar._TT["PREV_MONTH"] = "Π�οηγ. μήνας (κ�ατήστε για το μενο�)";
+Calendar._TT["GO_TODAY"] = "Σήμε�α";
+Calendar._TT["NEXT_MONTH"] = "Επόμενος μήνας (κ�ατήστε για το μενο�)";
+Calendar._TT["NEXT_YEAR"] = "Επόμενο έτος (κ�ατήστε για το μενο�)";
+Calendar._TT["SEL_DATE"] = "Επιλέξτε ημε�ομηνία";
+Calendar._TT["DRAG_TO_MOVE"] = "Σ��τε για να μετακινήσετε";
+Calendar._TT["PART_TODAY"] = " (σήμε�α)";
+Calendar._TT["MON_FIRST"] = "Εμφάνιση Δευτέ�ας π�ώτα";
+Calendar._TT["SUN_FIRST"] = "Εμφάνιση Κυ�ιακής π�ώτα";
+Calendar._TT["CLOSE"] = "Κλείσιμο";
+Calendar._TT["TODAY"] = "Σήμε�α";
+Calendar._TT["TIME_PART"] = "(Shift-)κλικ ή μετακίνηση για αλλαγή";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "dd-mm-y";
+Calendar._TT["TT_DATE_FORMAT"] = "D, d M";
+
+Calendar._TT["WK"] = "εβδ";
+
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-en-US.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-en-US.js
new file mode 100644
index 00000000..f079c3f1
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-en-US.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sunday",
+ "Monday",
+ "Tuesday",
+ "Wednesday",
+ "Thursday",
+ "Friday",
+ "Saturday",
+ "Sunday");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sun",
+ "Mon",
+ "Tue",
+ "Wed",
+ "Thu",
+ "Fri",
+ "Sat",
+ "Sun");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 0;
+
+// full month names
+Calendar._MN = new Array
+("January",
+ "February",
+ "March",
+ "April",
+ "May",
+ "June",
+ "July",
+ "August",
+ "September",
+ "October",
+ "November",
+ "December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "About the calendar";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
+Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
+Calendar._TT["GO_TODAY"] = "Go Today";
+Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
+Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
+Calendar._TT["SEL_DATE"] = "Select date";
+Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
+Calendar._TT["PART_TODAY"] = " (today)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Display %s first";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Close";
+Calendar._TT["TODAY"] = "Today";
+Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%m/%d/%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Time:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-en-gb.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-en-gb.js
new file mode 100644
index 00000000..d69406f3
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-en-gb.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar EN-GB language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sunday",
+ "Monday",
+ "Tuesday",
+ "Wednesday",
+ "Thursday",
+ "Friday",
+ "Saturday",
+ "Sunday");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sun",
+ "Mon",
+ "Tue",
+ "Wed",
+ "Thu",
+ "Fri",
+ "Sat",
+ "Sun");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 0;
+
+// full month names
+Calendar._MN = new Array
+("January",
+ "February",
+ "March",
+ "April",
+ "May",
+ "June",
+ "July",
+ "August",
+ "September",
+ "October",
+ "November",
+ "December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "About the calendar";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
+Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
+Calendar._TT["GO_TODAY"] = "Go Today";
+Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
+Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
+Calendar._TT["SEL_DATE"] = "Select date";
+Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
+Calendar._TT["PART_TODAY"] = " (today)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Display %s first";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Close";
+Calendar._TT["TODAY"] = "Today";
+Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d/%m/%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Time:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-en.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-en.js
new file mode 100644
index 00000000..d6f0909b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-en.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sunday",
+ "Monday",
+ "Tuesday",
+ "Wednesday",
+ "Thursday",
+ "Friday",
+ "Saturday",
+ "Sunday");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sun",
+ "Mon",
+ "Tue",
+ "Wed",
+ "Thu",
+ "Fri",
+ "Sat",
+ "Sun");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 0;
+
+// full month names
+Calendar._MN = new Array
+("January",
+ "February",
+ "March",
+ "April",
+ "May",
+ "June",
+ "July",
+ "August",
+ "September",
+ "October",
+ "November",
+ "December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "About the calendar";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
+Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
+Calendar._TT["GO_TODAY"] = "Go Today";
+Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
+Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
+Calendar._TT["SEL_DATE"] = "Select date";
+Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
+Calendar._TT["PART_TODAY"] = " (today)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Display %s first";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Close";
+Calendar._TT["TODAY"] = "Today";
+Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Time:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-es.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-es.js
new file mode 100644
index 00000000..b9b1843f
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-es.js
@@ -0,0 +1,129 @@
+// ** I18N
+
+// Calendar ES (spanish) language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Updater: Servilio Afre Puentes <servilios@yahoo.com>
+// Updated: 2004-06-03
+// Encoding: utf-8
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Domingo",
+ "Lunes",
+ "Martes",
+ "Miércoles",
+ "Jueves",
+ "Viernes",
+ "Sábado",
+ "Domingo");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Dom",
+ "Lun",
+ "Mar",
+ "Mié",
+ "Jue",
+ "Vie",
+ "Sáb",
+ "Dom");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("Enero",
+ "Febrero",
+ "Marzo",
+ "Abril",
+ "Mayo",
+ "Junio",
+ "Julio",
+ "Agosto",
+ "Septiembre",
+ "Octubre",
+ "Noviembre",
+ "Diciembre");
+
+// short month names
+Calendar._SMN = new Array
+("Ene",
+ "Feb",
+ "Mar",
+ "Abr",
+ "May",
+ "Jun",
+ "Jul",
+ "Ago",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dic");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Acerca del calendario";
+
+Calendar._TT["ABOUT"] =
+"Selector DHTML de Fecha/Hora\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Para conseguir la última versión visite: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuido bajo licencia GNU LGPL. Visite http://gnu.org/licenses/lgpl.html para más detalles." +
+"\n\n" +
+"Selección de fecha:\n" +
+"- Use los botones \xab, \xbb para seleccionar el año\n" +
+"- Use los botones " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " para seleccionar el mes\n" +
+"- Mantenga pulsado el ratón en cualquiera de estos botones para una selección rápida.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selección de hora:\n" +
+"- Pulse en cualquiera de las partes de la hora para incrementarla\n" +
+"- o pulse las mayúsculas mientras hace clic para decrementarla\n" +
+"- o haga clic y arrastre el ratón para una selección más rápida.";
+
+Calendar._TT["PREV_YEAR"] = "Año anterior (mantener para menú)";
+Calendar._TT["PREV_MONTH"] = "Mes anterior (mantener para menú)";
+Calendar._TT["GO_TODAY"] = "Ir a hoy";
+Calendar._TT["NEXT_MONTH"] = "Mes siguiente (mantener para menú)";
+Calendar._TT["NEXT_YEAR"] = "Año siguiente (mantener para menú)";
+Calendar._TT["SEL_DATE"] = "Seleccionar fecha";
+Calendar._TT["DRAG_TO_MOVE"] = "Arrastrar para mover";
+Calendar._TT["PART_TODAY"] = " (hoy)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Hacer %s primer día de la semana";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Cerrar";
+Calendar._TT["TODAY"] = "Hoy";
+Calendar._TT["TIME_PART"] = "(Mayúscula-)Clic o arrastre para cambiar valor";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d/%m/%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%A, %e de %B de %Y";
+
+Calendar._TT["WK"] = "sem";
+Calendar._TT["TIME"] = "Hora:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-fi.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-fi.js
new file mode 100644
index 00000000..eae2032b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-fi.js
@@ -0,0 +1,98 @@
+// ** I18N
+
+// Calendar FI language (Finnish, Suomi)
+// Author: Jarno Käyhkö, <gambler@phnet.fi>
+// Encoding: UTF-8
+// Distributed under the same terms as the calendar itself.
+
+// full day names
+Calendar._DN = new Array
+("Sunnuntai",
+ "Maanantai",
+ "Tiistai",
+ "Keskiviikko",
+ "Torstai",
+ "Perjantai",
+ "Lauantai",
+ "Sunnuntai");
+
+// short day names
+Calendar._SDN = new Array
+("Su",
+ "Ma",
+ "Ti",
+ "Ke",
+ "To",
+ "Pe",
+ "La",
+ "Su");
+
+// full month names
+Calendar._MN = new Array
+("Tammikuu",
+ "Helmikuu",
+ "Maaliskuu",
+ "Huhtikuu",
+ "Toukokuu",
+ "Kesäkuu",
+ "Heinäkuu",
+ "Elokuu",
+ "Syyskuu",
+ "Lokakuu",
+ "Marraskuu",
+ "Joulukuu");
+
+// short month names
+Calendar._SMN = new Array
+("Tam",
+ "Hel",
+ "Maa",
+ "Huh",
+ "Tou",
+ "Kes",
+ "Hei",
+ "Elo",
+ "Syy",
+ "Lok",
+ "Mar",
+ "Jou");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Tietoja kalenterista";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Uusin versio osoitteessa: http://www.dynarch.com/projects/calendar/\n" +
+"Julkaistu GNU LGPL lisenssin alaisuudessa. Lisätietoja osoitteessa http://gnu.org/licenses/lgpl.html" +
+"\n\n" +
+"Päivämäärä valinta:\n" +
+"- Käytä \xab, \xbb painikkeita valitaksesi vuosi\n" +
+"- Käytä " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " painikkeita valitaksesi kuukausi\n" +
+"- Pitämällä hiiren painiketta minkä tahansa yllä olevan painikkeen kohdalla, saat näkyviin valikon nopeampaan siirtymiseen.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Ajan valinta:\n" +
+"- Klikkaa kellonajan numeroita lisätäksesi aikaa\n" +
+"- tai pitämällä Shift-näppäintä pohjassa saat aikaa taaksepäin\n" +
+"- tai klikkaa ja pidä hiiren painike pohjassa sekä liikuta hiirtä muuttaaksesi aikaa nopeasti eteen- ja taaksepäin.";
+
+Calendar._TT["PREV_YEAR"] = "Edell. vuosi (paina hetki, näet valikon)";
+Calendar._TT["PREV_MONTH"] = "Edell. kuukausi (paina hetki, näet valikon)";
+Calendar._TT["GO_TODAY"] = "Siirry tähän päivään";
+Calendar._TT["NEXT_MONTH"] = "Seur. kuukausi (paina hetki, näet valikon)";
+Calendar._TT["NEXT_YEAR"] = "Seur. vuosi (paina hetki, näet valikon)";
+Calendar._TT["SEL_DATE"] = "Valitse päivämäärä";
+Calendar._TT["DRAG_TO_MOVE"] = "Siirrä kalenterin paikkaa";
+Calendar._TT["PART_TODAY"] = " (tänään)";
+Calendar._TT["MON_FIRST"] = "Näytä maanantai ensimmäisenä";
+Calendar._TT["SUN_FIRST"] = "Näytä sunnuntai ensimmäisenä";
+Calendar._TT["CLOSE"] = "Sulje";
+Calendar._TT["TODAY"] = "Tänään";
+Calendar._TT["TIME_PART"] = "(Shift-) Klikkaa tai liikuta muuttaaksesi aikaa";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%d.%m.%Y";
+
+Calendar._TT["WK"] = "Vko";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-fr.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-fr.js
new file mode 100644
index 00000000..6e011b2e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-fr.js
@@ -0,0 +1,125 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// Translator: David Duret, <pilgrim@mala-template.net> from previous french version
+
+// full day names
+Calendar._DN = new Array
+("Dimanche",
+ "Lundi",
+ "Mardi",
+ "Mercredi",
+ "Jeudi",
+ "Vendredi",
+ "Samedi",
+ "Dimanche");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Dim",
+ "Lun",
+ "Mar",
+ "Mar",
+ "Jeu",
+ "Ven",
+ "Sam",
+ "Dim");
+
+// full month names
+Calendar._MN = new Array
+("Janvier",
+ "Février",
+ "Mars",
+ "Avril",
+ "Mai",
+ "Juin",
+ "Juillet",
+ "Août",
+ "Septembre",
+ "Octobre",
+ "Novembre",
+ "Décembre");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Fev",
+ "Mar",
+ "Avr",
+ "Mai",
+ "Juin",
+ "Juil",
+ "Aout",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "A propos du calendrier";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Heure Selecteur\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Pour la derniere version visitez : http://www.dynarch.com/projects/calendar/\n" +
+"Distribué par GNU LGPL.  Voir http://gnu.org/licenses/lgpl.html pour les details." +
+"\n\n" +
+"Selection de la date :\n" +
+"- Utiliser les bouttons \xab, \xbb  pour selectionner l\'annee\n" +
+"- Utiliser les bouttons " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " pour selectionner les mois\n" +
+"- Garder la souris sur n'importe quels boutons pour une selection plus rapide";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selection de l\'heure :\n" +
+"- Cliquer sur heures ou minutes pour incrementer\n" +
+"- ou Maj-clic pour decrementer\n" +
+"- ou clic et glisser-deplacer pour une selection plus rapide";
+
+Calendar._TT["PREV_YEAR"] = "Année préc. (maintenir pour menu)";
+Calendar._TT["PREV_MONTH"] = "Mois préc. (maintenir pour menu)";
+Calendar._TT["GO_TODAY"] = "Atteindre la date du jour";
+Calendar._TT["NEXT_MONTH"] = "Mois suiv. (maintenir pour menu)";
+Calendar._TT["NEXT_YEAR"] = "Année suiv. (maintenir pour menu)";
+Calendar._TT["SEL_DATE"] = "Sélectionner une date";
+Calendar._TT["DRAG_TO_MOVE"] = "Déplacer";
+Calendar._TT["PART_TODAY"] = " (Aujourd'hui)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Afficher %s en premier";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Fermer";
+Calendar._TT["TODAY"] = "Aujourd'hui";
+Calendar._TT["TIME_PART"] = "(Maj-)Clic ou glisser pour modifier la valeur";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d/%m/%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "Sem.";
+Calendar._TT["TIME"] = "Heure :";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-he-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-he-utf8.js
new file mode 100644
index 00000000..5fb7dd56
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-he-utf8.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Idan Sofer, <idan@idanso.dyndns.org>
+// Encoding: UTF-8
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("ר�שון",
+ "שני",
+ "שלישי",
+ "רביעי",
+ "חמישי",
+ "שישי",
+ "שבת",
+ "ר�שון");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("�",
+ "ב",
+ "×’",
+ "ד",
+ "×”",
+ "ו",
+ "ש",
+ "�");
+
+// full month names
+Calendar._MN = new Array
+("ינו�ר",
+ "פברו�ר",
+ "מרץ",
+ "�פריל",
+ "מ�י",
+ "יוני",
+ "יולי",
+ "�וגוסט",
+ "ספטמבר",
+ "�וקטובר",
+ "נובמבר",
+ "דצמבר");
+
+// short month names
+Calendar._SMN = new Array
+("ינ�",
+ "פבר",
+ "מרץ",
+ "�פר",
+ "מ�י",
+ "יונ",
+ "יול",
+ "�וג",
+ "ספט",
+ "�וק",
+ "נוב",
+ "דצמ");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "�ודות השנתון";
+
+Calendar._TT["ABOUT"] =
+"בחרן ת�ריך/שעה DHTML\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"הגירס� ה�חרונה זמינה ב: http://www.dynarch.com/projects/calendar/\n" +
+"מופץ תחת זיכיון ה GNU LGPL.  עיין ב http://gnu.org/licenses/lgpl.html לפרטי� נוספי�." +
+"\n\n" +
+בחירת ת�ריך:\n" +
+"- השתמש בכפתורי� \xab, \xbb לבחירת שנה\n" +
+"- השתמש בכפתורי� " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " לבחירת חודש\n" +
+"- החזק העכבר לחוץ מעל הכפתורי� המוזכרי� לעיל לבחירה מהירה יותר.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"בחירת זמן:\n" +
+"- לחץ על כל �חד מחלקי הזמן כדי להוסיף\n" +
+"- �ו shift בשילוב ע� לחיצה כדי להחסיר\n" +
+"- �ו לחץ וגרור לפעולה מהירה יותר.";
+
+Calendar._TT["PREV_YEAR"] = "שנה קודמת - החזק לקבלת תפריט";
+Calendar._TT["PREV_MONTH"] = "חודש קוד� - החזק לקבלת תפריט";
+Calendar._TT["GO_TODAY"] = "עבור להיו�";
+Calendar._TT["NEXT_MONTH"] = "חודש הב� - החזק לתפריט";
+Calendar._TT["NEXT_YEAR"] = "שנה הב�ה - החזק לתפריט";
+Calendar._TT["SEL_DATE"] = "בחר ת�ריך";
+Calendar._TT["DRAG_TO_MOVE"] = "גרור להזזה";
+Calendar._TT["PART_TODAY"] = " )היו�(";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "הצג %s קוד�";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "6";
+
+Calendar._TT["CLOSE"] = "סגור";
+Calendar._TT["TODAY"] = "היו�";
+Calendar._TT["TIME_PART"] = "(שיפט-)לחץ וגרור כדי לשנות ערך";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "שעה::";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-hr-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-hr-utf8.js
new file mode 100644
index 00000000..d569cfd9
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-hr-utf8.js
@@ -0,0 +1,49 @@
+/* Croatian language file for the DHTML Calendar version 0.9.2 
+* Author Krunoslav Zubrinic <krunoslav.zubrinic@vip.hr>, June 2003.
+* Feel free to use this script under the terms of the GNU Lesser General
+* Public License, as long as you do not remove or alter this notice.
+*/
+Calendar._DN = new Array
+("Nedjelja",
+ "Ponedjeljak",
+ "Utorak",
+ "Srijeda",
+ "ÄŒetvrtak",
+ "Petak",
+ "Subota",
+ "Nedjelja");
+Calendar._MN = new Array
+("Sije�anj",
+ "Velja�a",
+ "Ožujak",
+ "Travanj",
+ "Svibanj",
+ "Lipanj",
+ "Srpanj",
+ "Kolovoz",
+ "Rujan",
+ "Listopad",
+ "Studeni",
+ "Prosinac");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["TOGGLE"] = "Promjeni dan s kojim po�inje tjedan";
+Calendar._TT["PREV_YEAR"] = "Prethodna godina (dugi pritisak za meni)";
+Calendar._TT["PREV_MONTH"] = "Prethodni mjesec (dugi pritisak za meni)";
+Calendar._TT["GO_TODAY"] = "Idi na tekući dan";
+Calendar._TT["NEXT_MONTH"] = "Slijedeći mjesec (dugi pritisak za meni)";
+Calendar._TT["NEXT_YEAR"] = "Slijedeća godina (dugi pritisak za meni)";
+Calendar._TT["SEL_DATE"] = "Izaberite datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Pritisni i povuci za promjenu pozicije";
+Calendar._TT["PART_TODAY"] = " (today)";
+Calendar._TT["MON_FIRST"] = "Prikaži ponedjeljak kao prvi dan";
+Calendar._TT["SUN_FIRST"] = "Prikaži nedjelju kao prvi dan";
+Calendar._TT["CLOSE"] = "Zatvori";
+Calendar._TT["TODAY"] = "Danas";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "dd-mm-y";
+Calendar._TT["TT_DATE_FORMAT"] = "DD, dd.mm.y";
+
+Calendar._TT["WK"] = "Tje";
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-hr.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-hr.js
new file mode 100644
index 00000000..88d4238b
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-hr.js differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-hu.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-hu.js
new file mode 100644
index 00000000..8c70b7b0
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-hu.js
@@ -0,0 +1,124 @@
+// ** I18N
+
+// Calendar HU language
+// Author: ???
+// Modifier: KARASZI Istvan, <jscalendar@spam.raszi.hu>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Vasárnap",
+ "Hétfõ",
+ "Kedd",
+ "Szerda",
+ "Csütörtök",
+ "Péntek",
+ "Szombat",
+ "Vasárnap");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("v",
+ "h",
+ "k",
+ "sze",
+ "cs",
+ "p",
+ "szo",
+ "v");
+
+// full month names
+Calendar._MN = new Array
+("január",
+ "február",
+ "március",
+ "április",
+ "május",
+ "június",
+ "július",
+ "augusztus",
+ "szeptember",
+ "október",
+ "november",
+ "december");
+
+// short month names
+Calendar._SMN = new Array
+("jan",
+ "feb",
+ "már",
+ "ápr",
+ "máj",
+ "jún",
+ "júl",
+ "aug",
+ "sze",
+ "okt",
+ "nov",
+ "dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "A kalendáriumról";
+
+Calendar._TT["ABOUT"] =
+"DHTML dátum/idõ kiválasztó\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"a legfrissebb verzió megtalálható: http://www.dynarch.com/projects/calendar/\n" +
+"GNU LGPL alatt terjesztve.  Lásd a http://gnu.org/licenses/lgpl.html oldalt a részletekhez." +
+"\n\n" +
+"Dátum választás:\n" +
+"- használja a \xab, \xbb gombokat az év kiválasztásához\n" +
+"- használja a " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " gombokat a hónap kiválasztásához\n" +
+"- tartsa lenyomva az egérgombot a gyors választáshoz.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Idõ választás:\n" +
+"- kattintva növelheti az idõt\n" +
+"- shift-tel kattintva csökkentheti\n" +
+"- lenyomva tartva és húzva gyorsabban kiválaszthatja.";
+
+Calendar._TT["PREV_YEAR"] = "Elõzõ év (tartsa nyomva a menühöz)";
+Calendar._TT["PREV_MONTH"] = "Elõzõ hónap (tartsa nyomva a menühöz)";
+Calendar._TT["GO_TODAY"] = "Mai napra ugrás";
+Calendar._TT["NEXT_MONTH"] = "Köv. hónap (tartsa nyomva a menühöz)";
+Calendar._TT["NEXT_YEAR"] = "Köv. év (tartsa nyomva a menühöz)";
+Calendar._TT["SEL_DATE"] = "Válasszon dátumot";
+Calendar._TT["DRAG_TO_MOVE"] = "Húzza a mozgatáshoz";
+Calendar._TT["PART_TODAY"] = " (ma)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "%s legyen a hét elsõ napja";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Bezár";
+Calendar._TT["TODAY"] = "Ma";
+Calendar._TT["TIME_PART"] = "(Shift-)Klikk vagy húzás az érték változtatásához";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%b %e, %a";
+
+Calendar._TT["WK"] = "hét";
+Calendar._TT["TIME"] = "idõ:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-it.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-it.js
new file mode 100644
index 00000000..f622c1d3
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-it.js
@@ -0,0 +1,124 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Translator: Fabio Di Bernardini, <altraqua@email.it>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Domenica",
+ "Lunedì",
+ "Martedì",
+ "Mercoledì",
+ "Giovedì",
+ "Venerdì",
+ "Sabato",
+ "Domenica");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Dom",
+ "Lun",
+ "Mar",
+ "Mer",
+ "Gio",
+ "Ven",
+ "Sab",
+ "Dom");
+
+// full month names
+Calendar._MN = new Array
+("Gennaio",
+ "Febbraio",
+ "Marzo",
+ "Aprile",
+ "Maggio",
+ "Giugno",
+ "Luglio",
+ "Augosto",
+ "Settembre",
+ "Ottobre",
+ "Novembre",
+ "Dicembre");
+
+// short month names
+Calendar._SMN = new Array
+("Gen",
+ "Feb",
+ "Mar",
+ "Apr",
+ "Mag",
+ "Giu",
+ "Lug",
+ "Ago",
+ "Set",
+ "Ott",
+ "Nov",
+ "Dic");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Informazioni sul calendario";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Per gli aggiornamenti: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuito sotto licenza GNU LGPL.  Vedi http://gnu.org/licenses/lgpl.html per i dettagli." +
+"\n\n" +
+"Selezione data:\n" +
+"- Usa \xab, \xbb per selezionare l'anno\n" +
+"- Usa  " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " per i mesi\n" +
+"- Tieni premuto a lungo il mouse per accedere alle funzioni di selezione veloce.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selezione orario:\n" +
+"- Clicca sul numero per incrementarlo\n" +
+"- o Shift+click per decrementarlo\n" +
+"- o click e sinistra o destra per variarlo.";
+
+Calendar._TT["PREV_YEAR"] = "Anno prec.(clicca a lungo per il menù)";
+Calendar._TT["PREV_MONTH"] = "Mese prec. (clicca a lungo per il menù)";
+Calendar._TT["GO_TODAY"] = "Oggi";
+Calendar._TT["NEXT_MONTH"] = "Pross. mese (clicca a lungo per il menù)";
+Calendar._TT["NEXT_YEAR"] = "Pross. anno (clicca a lungo per il menù)";
+Calendar._TT["SEL_DATE"] = "Seleziona data";
+Calendar._TT["DRAG_TO_MOVE"] = "Trascina per spostarlo";
+Calendar._TT["PART_TODAY"] = " (oggi)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Mostra prima %s";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Chiudi";
+Calendar._TT["TODAY"] = "Oggi";
+Calendar._TT["TIME_PART"] = "(Shift-)Click o trascina per cambiare il valore";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d-%m-%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a:%b:%e";
+
+Calendar._TT["WK"] = "set";
+Calendar._TT["TIME"] = "Ora:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-jp.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-jp.js
new file mode 100644
index 00000000..b86f0da3
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-jp.js
@@ -0,0 +1,45 @@
+// ** I18N
+Calendar._DN = new Array
+("“ú",
+ "ŒŽ",
+ "‰Î",
+ "�…",
+ "–Ø",
+ "‹à",
+ "“y",
+ "“ú");
+Calendar._MN = new Array
+("1ŒŽ",
+ "2ŒŽ",
+ "3ŒŽ",
+ "4ŒŽ",
+ "5ŒŽ",
+ "6ŒŽ",
+ "7ŒŽ",
+ "8ŒŽ",
+ "9ŒŽ",
+ "10ŒŽ",
+ "11ŒŽ",
+ "12ŒŽ");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["TOGGLE"] = "�T‚Ì�Å�‰‚Ì—j“ú‚ð�Ø‚è‘Ö‚¦";
+Calendar._TT["PREV_YEAR"] = "‘O”N";
+Calendar._TT["PREV_MONTH"] = "‘OŒŽ";
+Calendar._TT["GO_TODAY"] = "�¡“ú";
+Calendar._TT["NEXT_MONTH"] = "—‚ŒŽ";
+Calendar._TT["NEXT_YEAR"] = "—‚”N";
+Calendar._TT["SEL_DATE"] = "“ú•t‘I‘ð";
+Calendar._TT["DRAG_TO_MOVE"] = "ƒEƒBƒ“ƒhƒE‚̈ړ®";
+Calendar._TT["PART_TODAY"] = " (�¡“ú)";
+Calendar._TT["MON_FIRST"] = "ŒŽ—j“ú‚ð�擪‚É";
+Calendar._TT["SUN_FIRST"] = "“ú—j“ú‚ð�擪‚É";
+Calendar._TT["CLOSE"] = "•Â‚¶‚é";
+Calendar._TT["TODAY"] = "�¡“ú";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "y-mm-dd";
+Calendar._TT["TT_DATE_FORMAT"] = "%mŒŽ %d“ú (%a)";
+
+Calendar._TT["WK"] = "�T";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ko-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ko-utf8.js
new file mode 100644
index 00000000..cdbc1caf
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ko-utf8.js
@@ -0,0 +1,120 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Translation: Yourim Yi <yyi@yourim.net>
+// Encoding: EUC-KR
+// lang : ko
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+
+Calendar._DN = new Array
+("�요�",
+ "월요�",
+ "화요�",
+ "수요�",
+ "목요�",
+ "금요�",
+ "토요�",
+ "�요�");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("�",
+ "ì›”",
+ "í™”",
+ "수",
+ "목",
+ "금",
+ "토",
+ "�");
+
+// full month names
+Calendar._MN = new Array
+("1ì›”",
+ "2ì›”",
+ "3ì›”",
+ "4ì›”",
+ "5ì›”",
+ "6ì›”",
+ "7ì›”",
+ "8ì›”",
+ "9ì›”",
+ "10ì›”",
+ "11ì›”",
+ "12ì›”");
+
+// short month names
+Calendar._SMN = new Array
+("1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "calendar � 대해서";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"\n"+
+"최신 버전� 받으시려면 http://www.dynarch.com/projects/calendar/ � 방문하세요\n" +
+"\n"+
+"GNU LGPL ��센스로 배��니다. \n"+
+"��센스� 대한 �세한 내용� http://gnu.org/licenses/lgpl.html � �으세요." +
+"\n\n" +
+"날짜 선�:\n" +
+"- 연�를 선�하려면 \xab, \xbb 버튼� 사용합니다\n" +
+"- 달� 선�하려면 " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " 버튼� 누르세요\n" +
+"- 계� 누르고 있으면 위 값들� 빠르게 선�하실 수 있습니다.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"시간 선�:\n" +
+"- 마우스로 누르면 시간� �가합니다\n" +
+"- Shift 키와 함께 누르면 �소합니다\n" +
+"- 누른 �태�서 마우스를 움��면 좀 � 빠르게 값� 변합니다.\n";
+
+Calendar._TT["PREV_YEAR"] = "지난 해 (길게 누르면 목�)";
+Calendar._TT["PREV_MONTH"] = "지난 달 (길게 누르면 목�)";
+Calendar._TT["GO_TODAY"] = "오늘 날짜로";
+Calendar._TT["NEXT_MONTH"] = "다� 달 (길게 누르면 목�)";
+Calendar._TT["NEXT_YEAR"] = "다� 해 (길게 누르면 목�)";
+Calendar._TT["SEL_DATE"] = "날짜를 선�하세요";
+Calendar._TT["DRAG_TO_MOVE"] = "마우스 드래그로 �� 하세요";
+Calendar._TT["PART_TODAY"] = " (오늘)";
+Calendar._TT["MON_FIRST"] = "월요�� 한 주� 시작 요�로";
+Calendar._TT["SUN_FIRST"] = "�요�� 한 주� 시작 요�로";
+Calendar._TT["CLOSE"] = "닫기";
+Calendar._TT["TODAY"] = "오늘";
+Calendar._TT["TIME_PART"] = "(Shift-)�릭 �는 드래그 하세요";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%b/%e [%a]";
+
+Calendar._TT["WK"] = "주";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ko.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ko.js
new file mode 100644
index 00000000..dc1da4bb
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ko.js
@@ -0,0 +1,120 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Translation: Yourim Yi <yyi@yourim.net>
+// Encoding: EUC-KR
+// lang : ko
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+
+Calendar._DN = new Array
+("ÀÏ¿äÀÏ",
+ "¿ù¿äÀÏ",
+ "È­¿äÀÏ",
+ "¼ö¿äÀÏ",
+ "¸ñ¿äÀÏ",
+ "±Ý¿äÀÏ",
+ "Åä¿äÀÏ",
+ "ÀÏ¿äÀÏ");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("ÀÏ",
+ "¿ù",
+ "È­",
+ "¼ö",
+ "¸ñ",
+ "±Ý",
+ "Åä",
+ "ÀÏ");
+
+// full month names
+Calendar._MN = new Array
+("1¿ù",
+ "2¿ù",
+ "3¿ù",
+ "4¿ù",
+ "5¿ù",
+ "6¿ù",
+ "7¿ù",
+ "8¿ù",
+ "9¿ù",
+ "10¿ù",
+ "11¿ù",
+ "12¿ù");
+
+// short month names
+Calendar._SMN = new Array
+("1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "calendar ¿¡ ´ëÇؼ­";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"\n"+
+"ÃֽŠ¹öÀüÀ» ¹ÞÀ¸½Ã·Á¸é http://www.dynarch.com/projects/calendar/ ¿¡ ¹æ¹®Çϼ¼¿ä\n" +
+"\n"+
+"GNU LGPL ¶óÀ̼¾½º·Î ¹èÆ÷µË´Ï´Ù. \n"+
+"¶óÀ̼¾½º¿¡ ´ëÇÑ ÀÚ¼¼ÇÑ ³»¿ëÀº http://gnu.org/licenses/lgpl.html À» ÀÐÀ¸¼¼¿ä." +
+"\n\n" +
+"³¯Â¥ ¼±ÅÃ:\n" +
+"- ¿¬µµ¸¦ ¼±ÅÃÇÏ·Á¸é \xab, \xbb ¹öÆ°À» »ç¿ëÇÕ´Ï´Ù\n" +
+"- ´ÞÀ» ¼±ÅÃÇÏ·Á¸é " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " ¹öÆ°À» ´©¸£¼¼¿ä\n" +
+"- °è¼Ó ´©¸£°í ÀÖÀ¸¸é À§ °ªµéÀ» ºü¸£°Ô ¼±ÅÃÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"½Ã°£ ¼±ÅÃ:\n" +
+"- ¸¶¿ì½º·Î ´©¸£¸é ½Ã°£ÀÌ Áõ°¡ÇÕ´Ï´Ù\n" +
+"- Shift Å°¿Í ÇÔ²² ´©¸£¸é °¨¼ÒÇÕ´Ï´Ù\n" +
+"- ´©¸¥ »óÅ¿¡¼­ ¸¶¿ì½º¸¦ ¿òÁ÷À̸é Á» ´õ ºü¸£°Ô °ªÀÌ º¯ÇÕ´Ï´Ù.\n";
+
+Calendar._TT["PREV_YEAR"] = "Áö³­ ÇØ (±æ°Ô ´©¸£¸é ¸ñ·Ï)";
+Calendar._TT["PREV_MONTH"] = "Áö³­ ´Þ (±æ°Ô ´©¸£¸é ¸ñ·Ï)";
+Calendar._TT["GO_TODAY"] = "¿À´Ã ³¯Â¥·Î";
+Calendar._TT["NEXT_MONTH"] = "´ÙÀ½ ´Þ (±æ°Ô ´©¸£¸é ¸ñ·Ï)";
+Calendar._TT["NEXT_YEAR"] = "´ÙÀ½ ÇØ (±æ°Ô ´©¸£¸é ¸ñ·Ï)";
+Calendar._TT["SEL_DATE"] = "³¯Â¥¸¦ ¼±ÅÃÇϼ¼¿ä";
+Calendar._TT["DRAG_TO_MOVE"] = "¸¶¿ì½º µå·¡±×·Î À̵¿ Çϼ¼¿ä";
+Calendar._TT["PART_TODAY"] = " (¿À´Ã)";
+Calendar._TT["MON_FIRST"] = "¿ù¿äÀÏÀ» ÇÑ ÁÖÀÇ ½ÃÀÛ ¿äÀÏ·Î";
+Calendar._TT["SUN_FIRST"] = "ÀÏ¿äÀÏÀ» ÇÑ ÁÖÀÇ ½ÃÀÛ ¿äÀÏ·Î";
+Calendar._TT["CLOSE"] = "´Ý±â";
+Calendar._TT["TODAY"] = "¿À´Ã";
+Calendar._TT["TIME_PART"] = "(Shift-)Ŭ¸¯ ¶Ç´Â µå·¡±× Çϼ¼¿ä";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%b/%e [%a]";
+
+Calendar._TT["WK"] = "ÁÖ";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-lt-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-lt-utf8.js
new file mode 100644
index 00000000..964865de
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-lt-utf8.js
@@ -0,0 +1,114 @@
+// ** I18N
+
+// Calendar LT language
+// Author: Martynas Majeris, <martynas@solmetra.lt>
+// Encoding: UTF-8
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sekmadienis",
+ "Pirmadienis",
+ "Antradienis",
+ "Tre�iadienis",
+ "Ketvirtadienis",
+ "Pentadienis",
+ "Šeštadienis",
+ "Sekmadienis");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sek",
+ "Pir",
+ "Ant",
+ "Tre",
+ "Ket",
+ "Pen",
+ "Šeš",
+ "Sek");
+
+// full month names
+Calendar._MN = new Array
+("Sausis",
+ "Vasaris",
+ "Kovas",
+ "Balandis",
+ "Gegužė",
+ "Birželis",
+ "Liepa",
+ "Rugpjūtis",
+ "RugsÄ—jis",
+ "Spalis",
+ "Lapkritis",
+ "Gruodis");
+
+// short month names
+Calendar._SMN = new Array
+("Sau",
+ "Vas",
+ "Kov",
+ "Bal",
+ "Geg",
+ "Bir",
+ "Lie",
+ "Rgp",
+ "Rgs",
+ "Spa",
+ "Lap",
+ "Gru");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Apie kalendorių";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"NaujausiÄ… versijÄ… rasite: http://www.dynarch.com/projects/calendar/\n" +
+"Platinamas pagal GNU LGPL licencijÄ…. Aplankykite http://gnu.org/licenses/lgpl.html" +
+"\n\n" +
+"Datos pasirinkimas:\n" +
+"- Metų pasirinkimas: \xab, \xbb\n" +
+"- MÄ—nesio pasirinkimas: " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + "\n" +
+"- Nuspauskite ir laikykite pelės klavišą greitesniam pasirinkimui.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Laiko pasirinkimas:\n" +
+"- Spustelkite ant valandų arba minu�ių - skai�ius padidės vienetu.\n" +
+"- Jei spausite kartu su Shift, skai�ius sumažės.\n" +
+"- Greitam pasirinkimui spustelkite ir pajudinkite pelÄ™.";
+
+Calendar._TT["PREV_YEAR"] = "Ankstesni metai (laikykite, jei norite meniu)";
+Calendar._TT["PREV_MONTH"] = "Ankstesnis mÄ—nuo (laikykite, jei norite meniu)";
+Calendar._TT["GO_TODAY"] = "Pasirinkti Å¡iandienÄ…";
+Calendar._TT["NEXT_MONTH"] = "Kitas mÄ—nuo (laikykite, jei norite meniu)";
+Calendar._TT["NEXT_YEAR"] = "Kiti metai (laikykite, jei norite meniu)";
+Calendar._TT["SEL_DATE"] = "Pasirinkite datÄ…";
+Calendar._TT["DRAG_TO_MOVE"] = "Tempkite";
+Calendar._TT["PART_TODAY"] = " (Å¡iandien)";
+Calendar._TT["MON_FIRST"] = "Pirma savaitÄ—s diena - pirmadienis";
+Calendar._TT["SUN_FIRST"] = "Pirma savaitÄ—s diena - sekmadienis";
+Calendar._TT["CLOSE"] = "Uždaryti";
+Calendar._TT["TODAY"] = "Å iandien";
+Calendar._TT["TIME_PART"] = "Spustelkite arba tempkite jei norite pakeisti";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%A, %Y-%m-%d";
+
+Calendar._TT["WK"] = "sav";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-lt.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-lt.js
new file mode 100644
index 00000000..059cdf4f
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-lt.js
@@ -0,0 +1,114 @@
+// ** I18N
+
+// Calendar LT language
+// Author: Martynas Majeris, <martynas@solmetra.lt>
+// Encoding: Windows-1257
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sekmadienis",
+ "Pirmadienis",
+ "Antradienis",
+ "Treèiadienis",
+ "Ketvirtadienis",
+ "Pentadienis",
+ "Ðeðtadienis",
+ "Sekmadienis");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sek",
+ "Pir",
+ "Ant",
+ "Tre",
+ "Ket",
+ "Pen",
+ "Ðeð",
+ "Sek");
+
+// full month names
+Calendar._MN = new Array
+("Sausis",
+ "Vasaris",
+ "Kovas",
+ "Balandis",
+ "Geguþë",
+ "Birþelis",
+ "Liepa",
+ "Rugpjûtis",
+ "Rugsëjis",
+ "Spalis",
+ "Lapkritis",
+ "Gruodis");
+
+// short month names
+Calendar._SMN = new Array
+("Sau",
+ "Vas",
+ "Kov",
+ "Bal",
+ "Geg",
+ "Bir",
+ "Lie",
+ "Rgp",
+ "Rgs",
+ "Spa",
+ "Lap",
+ "Gru");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Apie kalendoriø";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Naujausià versijà rasite: http://www.dynarch.com/projects/calendar/\n" +
+"Platinamas pagal GNU LGPL licencijà. Aplankykite http://gnu.org/licenses/lgpl.html" +
+"\n\n" +
+"Datos pasirinkimas:\n" +
+"- Metø pasirinkimas: \xab, \xbb\n" +
+"- Mënesio pasirinkimas: " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + "\n" +
+"- Nuspauskite ir laikykite pelës klaviðà greitesniam pasirinkimui.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Laiko pasirinkimas:\n" +
+"- Spustelkite ant valandø arba minuèiø - skaièus padidës vienetu.\n" +
+"- Jei spausite kartu su Shift, skaièius sumaþës.\n" +
+"- Greitam pasirinkimui spustelkite ir pajudinkite pelæ.";
+
+Calendar._TT["PREV_YEAR"] = "Ankstesni metai (laikykite, jei norite meniu)";
+Calendar._TT["PREV_MONTH"] = "Ankstesnis mënuo (laikykite, jei norite meniu)";
+Calendar._TT["GO_TODAY"] = "Pasirinkti ðiandienà";
+Calendar._TT["NEXT_MONTH"] = "Kitas mënuo (laikykite, jei norite meniu)";
+Calendar._TT["NEXT_YEAR"] = "Kiti metai (laikykite, jei norite meniu)";
+Calendar._TT["SEL_DATE"] = "Pasirinkite datà";
+Calendar._TT["DRAG_TO_MOVE"] = "Tempkite";
+Calendar._TT["PART_TODAY"] = " (ðiandien)";
+Calendar._TT["MON_FIRST"] = "Pirma savaitës diena - pirmadienis";
+Calendar._TT["SUN_FIRST"] = "Pirma savaitës diena - sekmadienis";
+Calendar._TT["CLOSE"] = "Uþdaryti";
+Calendar._TT["TODAY"] = "Ðiandien";
+Calendar._TT["TIME_PART"] = "Spustelkite arba tempkite jei norite pakeisti";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%A, %Y-%m-%d";
+
+Calendar._TT["WK"] = "sav";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-lv.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-lv.js
new file mode 100644
index 00000000..4cb5a138
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-lv.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar LV language
+// Author: Juris Valdovskis, <juris@dc.lv>
+// Encoding: cp1257
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Svçtdiena",
+ "Pirmdiena",
+ "Otrdiena",
+ "Treðdiena",
+ "Ceturdiena",
+ "Piektdiena",
+ "Sestdiena",
+ "Svçtdiena");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sv",
+ "Pr",
+ "Ot",
+ "Tr",
+ "Ce",
+ "Pk",
+ "Se",
+ "Sv");
+
+// full month names
+Calendar._MN = new Array
+("Janvâris",
+ "Februâris",
+ "Marts",
+ "Aprîlis",
+ "Maijs",
+ "Jûnijs",
+ "Jûlijs",
+ "Augusts",
+ "Septembris",
+ "Oktobris",
+ "Novembris",
+ "Decembris");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "Mai",
+ "Jûn",
+ "Jûl",
+ "Aug",
+ "Sep",
+ "Okt",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Par kalendâru";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Datuma izvçle:\n" +
+"- Izmanto \xab, \xbb pogas, lai izvçlçtos gadu\n" +
+"- Izmanto " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + "pogas, lai izvçlçtos mçnesi\n" +
+"- Turi nospiestu peles pogu uz jebkuru no augstâk minçtajâm pogâm, lai paâtrinâtu izvçli.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Laika izvçle:\n" +
+"- Uzklikðíini uz jebkuru no laika daïâm, lai palielinâtu to\n" +
+"- vai Shift-klikðíis, lai samazinâtu to\n" +
+"- vai noklikðíini un velc uz attiecîgo virzienu lai mainîtu âtrâk.";
+
+Calendar._TT["PREV_YEAR"] = "Iepr. gads (turi izvçlnei)";
+Calendar._TT["PREV_MONTH"] = "Iepr. mçnesis (turi izvçlnei)";
+Calendar._TT["GO_TODAY"] = "Ðodien";
+Calendar._TT["NEXT_MONTH"] = "Nâkoðais mçnesis (turi izvçlnei)";
+Calendar._TT["NEXT_YEAR"] = "Nâkoðais gads (turi izvçlnei)";
+Calendar._TT["SEL_DATE"] = "Izvçlies datumu";
+Calendar._TT["DRAG_TO_MOVE"] = "Velc, lai pârvietotu";
+Calendar._TT["PART_TODAY"] = " (ðodien)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Attçlot %s kâ pirmo";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "1,7";
+
+Calendar._TT["CLOSE"] = "Aizvçrt";
+Calendar._TT["TODAY"] = "Ðodien";
+Calendar._TT["TIME_PART"] = "(Shift-)Klikðíis vai pârvieto, lai mainîtu";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d-%m-%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %e %b";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Laiks:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-nl.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-nl.js
new file mode 100644
index 00000000..9915f6a7
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-nl.js
@@ -0,0 +1,73 @@
+// ** I18N
+Calendar._DN = new Array
+("Zondag",
+ "Maandag",
+ "Dinsdag",
+ "Woensdag",
+ "Donderdag",
+ "Vrijdag",
+ "Zaterdag",
+ "Zondag");
+
+Calendar._SDN_len = 2;
+
+Calendar._MN = new Array
+("Januari",
+ "Februari",
+ "Maart",
+ "April",
+ "Mei",
+ "Juni",
+ "Juli",
+ "Augustus",
+ "September",
+ "Oktober",
+ "November",
+ "December");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Info";
+
+Calendar._TT["ABOUT"] =
+"DHTML Datum/Tijd Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" +
+"Ga voor de meest recente versie naar: http://www.dynarch.com/projects/calendar/\n" +
+"Verspreid onder de GNU LGPL. Zie http://gnu.org/licenses/lgpl.html voor details." +
+"\n\n" +
+"Datum selectie:\n" +
+"- Gebruik de \xab \xbb knoppen om een jaar te selecteren\n" +
+"- Gebruik de " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " knoppen om een maand te selecteren\n" +
+"- Houd de muis ingedrukt op de genoemde knoppen voor een snellere selectie.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Tijd selectie:\n" +
+"- Klik op een willekeurig onderdeel van het tijd gedeelte om het te verhogen\n" +
+"- of Shift-klik om het te verlagen\n" +
+"- of klik en sleep voor een snellere selectie.";
+
+//Calendar._TT["TOGGLE"] = "Selecteer de eerste week-dag";
+Calendar._TT["PREV_YEAR"] = "Vorig jaar (ingedrukt voor menu)";
+Calendar._TT["PREV_MONTH"] = "Vorige maand (ingedrukt voor menu)";
+Calendar._TT["GO_TODAY"] = "Ga naar Vandaag";
+Calendar._TT["NEXT_MONTH"] = "Volgende maand (ingedrukt voor menu)";
+Calendar._TT["NEXT_YEAR"] = "Volgend jaar (ingedrukt voor menu)";
+Calendar._TT["SEL_DATE"] = "Selecteer datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Klik en sleep om te verplaatsen";
+Calendar._TT["PART_TODAY"] = " (vandaag)";
+//Calendar._TT["MON_FIRST"] = "Toon Maandag eerst";
+//Calendar._TT["SUN_FIRST"] = "Toon Zondag eerst";
+
+Calendar._TT["DAY_FIRST"] = "Toon %s eerst";
+
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Sluiten";
+Calendar._TT["TODAY"] = "(vandaag)";
+Calendar._TT["TIME_PART"] = "(Shift-)Klik of sleep om de waarde te veranderen";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d-%m-%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %e %b %Y";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Tijd:";
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-no.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-no.js
new file mode 100644
index 00000000..0bb97d73
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-no.js
@@ -0,0 +1,114 @@
+// ** I18N
+
+// Calendar NO language
+// Author: Daniel Holmen, <daniel.holmen@ciber.no>
+// Encoding: UTF-8
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Søndag",
+ "Mandag",
+ "Tirsdag",
+ "Onsdag",
+ "Torsdag",
+ "Fredag",
+ "Lørdag",
+ "Søndag");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Søn",
+ "Man",
+ "Tir",
+ "Ons",
+ "Tor",
+ "Fre",
+ "Lør",
+ "Søn");
+
+// full month names
+Calendar._MN = new Array
+("Januar",
+ "Februar",
+ "Mars",
+ "April",
+ "Mai",
+ "Juni",
+ "Juli",
+ "August",
+ "September",
+ "Oktober",
+ "November",
+ "Desember");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "Mai",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Okt",
+ "Nov",
+ "Des");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Om kalenderen";
+
+Calendar._TT["ABOUT"] =
+"DHTML Dato-/Tidsvelger\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For nyeste versjon, gå til: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuert under GNU LGPL.  Se http://gnu.org/licenses/lgpl.html for detaljer." +
+"\n\n" +
+"Datovalg:\n" +
+"- Bruk knappene \xab og \xbb for å velge år\n" +
+"- Bruk knappene " + String.fromCharCode(0x2039) + " og " + String.fromCharCode(0x203a) + " for å velge måned\n" +
+"- Hold inne musknappen eller knappene over for raskere valg.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Tidsvalg:\n" +
+"- Klikk på en av tidsdelene for å øke den\n" +
+"- eller Shift-klikk for å senke verdien\n" +
+"- eller klikk-og-dra for raskere valg..";
+
+Calendar._TT["PREV_YEAR"] = "Forrige. år (hold for meny)";
+Calendar._TT["PREV_MONTH"] = "Forrige. måned (hold for meny)";
+Calendar._TT["GO_TODAY"] = "GÃ¥ til idag";
+Calendar._TT["NEXT_MONTH"] = "Neste måned (hold for meny)";
+Calendar._TT["NEXT_YEAR"] = "Neste år (hold for meny)";
+Calendar._TT["SEL_DATE"] = "Velg dato";
+Calendar._TT["DRAG_TO_MOVE"] = "Dra for å flytte";
+Calendar._TT["PART_TODAY"] = " (idag)";
+Calendar._TT["MON_FIRST"] = "Vis mandag først";
+Calendar._TT["SUN_FIRST"] = "Vis søndag først";
+Calendar._TT["CLOSE"] = "Lukk";
+Calendar._TT["TODAY"] = "Idag";
+Calendar._TT["TIME_PART"] = "(Shift-)Klikk eller dra for å endre verdi";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "uke";
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-pl-utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-pl-utf8.js
new file mode 100644
index 00000000..b438a175
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-pl-utf8.js
@@ -0,0 +1,93 @@
+// ** I18N
+
+// Calendar PL language
+// Author: Dariusz Pietrzak, <eyck@ghost.anime.pl>
+// Author: Janusz Piwowarski, <jpiw@go2.pl>
+// Encoding: utf-8
+// Distributed under the same terms as the calendar itself.
+
+Calendar._DN = new Array
+("Niedziela",
+ "Poniedziałek",
+ "Wtorek",
+ "Åšroda",
+ "Czwartek",
+ "PiÄ…tek",
+ "Sobota",
+ "Niedziela");
+Calendar._SDN = new Array
+("Nie",
+ "Pn",
+ "Wt",
+ "Åšr",
+ "Cz",
+ "Pt",
+ "So",
+ "Nie");
+Calendar._MN = new Array
+("Styczeń",
+ "Luty",
+ "Marzec",
+ "Kwiecień",
+ "Maj",
+ "Czerwiec",
+ "Lipiec",
+ "Sierpień",
+ "Wrzesień",
+ "Październik",
+ "Listopad",
+ "Grudzień");
+Calendar._SMN = new Array
+("Sty",
+ "Lut",
+ "Mar",
+ "Kwi",
+ "Maj",
+ "Cze",
+ "Lip",
+ "Sie",
+ "Wrz",
+ "Paź",
+ "Lis",
+ "Gru");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O kalendarzu";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Aby pobrać najnowszą wersję, odwiedź: http://www.dynarch.com/projects/calendar/\n" +
+"Dostępny na licencji GNU LGPL. Zobacz szczegóły na http://gnu.org/licenses/lgpl.html." +
+"\n\n" +
+"Wybór daty:\n" +
+"- Użyj przycisków \xab, \xbb by wybrać rok\n" +
+"- Użyj przycisków " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " by wybrać miesiąc\n" +
+"- Przytrzymaj klawisz myszy nad jednym z powyższych przycisków dla szybszego wyboru.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Wybór czasu:\n" +
+"- Kliknij na jednym z pól czasu by zwiększyć jego wartość\n" +
+"- lub kliknij trzymając Shift by zmiejszyć jego wartość\n" +
+"- lub kliknij i przeciÄ…gnij dla szybszego wyboru.";
+
+//Calendar._TT["TOGGLE"] = "Zmień pierwszy dzień tygodnia";
+Calendar._TT["PREV_YEAR"] = "Poprzedni rok (przytrzymaj dla menu)";
+Calendar._TT["PREV_MONTH"] = "Poprzedni miesiÄ…c (przytrzymaj dla menu)";
+Calendar._TT["GO_TODAY"] = "Idź do dzisiaj";
+Calendar._TT["NEXT_MONTH"] = "Następny miesiąc (przytrzymaj dla menu)";
+Calendar._TT["NEXT_YEAR"] = "Następny rok (przytrzymaj dla menu)";
+Calendar._TT["SEL_DATE"] = "Wybierz datÄ™";
+Calendar._TT["DRAG_TO_MOVE"] = "Przeciągnij by przesunąć";
+Calendar._TT["PART_TODAY"] = " (dzisiaj)";
+Calendar._TT["MON_FIRST"] = "Wyświetl poniedziałek jako pierwszy";
+Calendar._TT["SUN_FIRST"] = "Wyświetl niedzielę jako pierwszą";
+Calendar._TT["CLOSE"] = "Zamknij";
+Calendar._TT["TODAY"] = "Dzisiaj";
+Calendar._TT["TIME_PART"] = "(Shift-)Kliknij lub przeciągnij by zmienić wartość";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%e %B, %A";
+
+Calendar._TT["WK"] = "ty";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-pl.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-pl.js
new file mode 100644
index 00000000..86c7b39e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-pl.js
@@ -0,0 +1,56 @@
+// ** I18N
+// Calendar PL language
+// Author: Artur Filipiak, <imagen@poczta.fm>
+// January, 2004
+// Encoding: UTF-8
+Calendar._DN = new Array
+("Niedziela", "Poniedziałek", "Wtorek", "Środa", "Czwartek", "Piątek", "Sobota", "Niedziela");
+
+Calendar._SDN = new Array
+("N", "Pn", "Wt", "Åšr", "Cz", "Pt", "So", "N");
+
+Calendar._MN = new Array
+("Styczeń", "Luty", "Marzec", "Kwiecień", "Maj", "Czerwiec", "Lipiec", "Sierpień", "Wrzesień", "Październik", "Listopad", "Grudzień");
+
+Calendar._SMN = new Array
+("Sty", "Lut", "Mar", "Kwi", "Maj", "Cze", "Lip", "Sie", "Wrz", "Paź", "Lis", "Gru");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O kalendarzu";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Wybór daty:\n" +
+"- aby wybrać rok użyj przycisków \xab, \xbb\n" +
+"- aby wybrać miesiąc użyj przycisków " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + "\n" +
+"- aby przyspieszyć wybór przytrzymaj wciśnięty przycisk myszy nad ww. przyciskami.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Wybór czasu:\n" +
+"- aby zwiększyć wartość kliknij na dowolnym elemencie selekcji czasu\n" +
+"- aby zmniejszyć wartość użyj dodatkowo klawisza Shift\n" +
+"- możesz również poruszać myszkę w lewo i prawo wraz z wciśniętym lewym klawiszem.";
+
+Calendar._TT["PREV_YEAR"] = "Poprz. rok (przytrzymaj dla menu)";
+Calendar._TT["PREV_MONTH"] = "Poprz. miesiÄ…c (przytrzymaj dla menu)";
+Calendar._TT["GO_TODAY"] = "Pokaż dziś";
+Calendar._TT["NEXT_MONTH"] = "Nast. miesiÄ…c (przytrzymaj dla menu)";
+Calendar._TT["NEXT_YEAR"] = "Nast. rok (przytrzymaj dla menu)";
+Calendar._TT["SEL_DATE"] = "Wybierz datÄ™";
+Calendar._TT["DRAG_TO_MOVE"] = "Przesuń okienko";
+Calendar._TT["PART_TODAY"] = " (dziÅ›)";
+Calendar._TT["MON_FIRST"] = "Pokaż Poniedziałek jako pierwszy";
+Calendar._TT["SUN_FIRST"] = "Pokaż Niedzielę jako pierwszą";
+Calendar._TT["CLOSE"] = "Zamknij";
+Calendar._TT["TODAY"] = "DziÅ›";
+Calendar._TT["TIME_PART"] = "(Shift-)klik | drag, aby zmienić wartość";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y.%m.%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-pt.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-pt.js
new file mode 100644
index 00000000..f7dfbfff
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-pt.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar pt_BR language
+// Author: Adalberto Machado, <betosm@terra.com.br>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Domingo",
+ "Segunda",
+ "Terca",
+ "Quarta",
+ "Quinta",
+ "Sexta",
+ "Sabado",
+ "Domingo");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Dom",
+ "Seg",
+ "Ter",
+ "Qua",
+ "Qui",
+ "Sex",
+ "Sab",
+ "Dom");
+
+// full month names
+Calendar._MN = new Array
+("Janeiro",
+ "Fevereiro",
+ "Marco",
+ "Abril",
+ "Maio",
+ "Junho",
+ "Julho",
+ "Agosto",
+ "Setembro",
+ "Outubro",
+ "Novembro",
+ "Dezembro");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Fev",
+ "Mar",
+ "Abr",
+ "Mai",
+ "Jun",
+ "Jul",
+ "Ago",
+ "Set",
+ "Out",
+ "Nov",
+ "Dez");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Sobre o calendario";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Ultima versao visite: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuido sobre GNU LGPL.  Veja http://gnu.org/licenses/lgpl.html para detalhes." +
+"\n\n" +
+"Selecao de data:\n" +
+"- Use os botoes \xab, \xbb para selecionar o ano\n" +
+"- Use os botoes " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " para selecionar o mes\n" +
+"- Segure o botao do mouse em qualquer um desses botoes para selecao rapida.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selecao de hora:\n" +
+"- Clique em qualquer parte da hora para incrementar\n" +
+"- ou Shift-click para decrementar\n" +
+"- ou clique e segure para selecao rapida.";
+
+Calendar._TT["PREV_YEAR"] = "Ant. ano (segure para menu)";
+Calendar._TT["PREV_MONTH"] = "Ant. mes (segure para menu)";
+Calendar._TT["GO_TODAY"] = "Hoje";
+Calendar._TT["NEXT_MONTH"] = "Prox. mes (segure para menu)";
+Calendar._TT["NEXT_YEAR"] = "Prox. ano (segure para menu)";
+Calendar._TT["SEL_DATE"] = "Selecione a data";
+Calendar._TT["DRAG_TO_MOVE"] = "Arraste para mover";
+Calendar._TT["PART_TODAY"] = " (hoje)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Mostre %s primeiro";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Fechar";
+Calendar._TT["TODAY"] = "Hoje";
+Calendar._TT["TIME_PART"] = "(Shift-)Click ou arraste para mudar valor";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d/%m/%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %e %b";
+
+Calendar._TT["WK"] = "sm";
+Calendar._TT["TIME"] = "Hora:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ro.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ro.js
new file mode 100644
index 00000000..6c45eab2
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ro.js
@@ -0,0 +1,66 @@
+// ** I18N
+Calendar._DN = new Array
+("Duminică",
+ "Luni",
+ "Marţi",
+ "Miercuri",
+ "Joi",
+ "Vineri",
+ "Sâmbătă",
+ "Duminică");
+Calendar._SDN_len = 2;
+Calendar._MN = new Array
+("Ianuarie",
+ "Februarie",
+ "Martie",
+ "Aprilie",
+ "Mai",
+ "Iunie",
+ "Iulie",
+ "August",
+ "Septembrie",
+ "Octombrie",
+ "Noiembrie",
+ "Decembrie");
+
+// tooltips
+Calendar._TT = {};
+
+Calendar._TT["INFO"] = "Despre calendar";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Pentru ultima versiune vizitaţi: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuit sub GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Selecţia datei:\n" +
+"- Folosiţi butoanele \xab, \xbb pentru a selecta anul\n" +
+"- Folosiţi butoanele " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " pentru a selecta luna\n" +
+"- Tineţi butonul mouse-ului apăsat pentru selecţie mai rapidă.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selecţia orei:\n" +
+"- Click pe ora sau minut pentru a mări valoarea cu 1\n" +
+"- Sau Shift-Click pentru a micÅŸora valoarea cu 1\n" +
+"- Sau Click ÅŸi drag pentru a selecta mai repede.";
+
+Calendar._TT["PREV_YEAR"] = "Anul precedent (lung pt menu)";
+Calendar._TT["PREV_MONTH"] = "Luna precedentă (lung pt menu)";
+Calendar._TT["GO_TODAY"] = "Data de azi";
+Calendar._TT["NEXT_MONTH"] = "Luna următoare (lung pt menu)";
+Calendar._TT["NEXT_YEAR"] = "Anul următor (lung pt menu)";
+Calendar._TT["SEL_DATE"] = "Selectează data";
+Calendar._TT["DRAG_TO_MOVE"] = "Trage pentru a miÅŸca";
+Calendar._TT["PART_TODAY"] = " (astăzi)";
+Calendar._TT["DAY_FIRST"] = "Afişează %s prima zi";
+Calendar._TT["WEEKEND"] = "0,6";
+Calendar._TT["CLOSE"] = "ÃŽnchide";
+Calendar._TT["TODAY"] = "Astăzi";
+Calendar._TT["TIME_PART"] = "(Shift-)Click sau drag pentru a selecta";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d-%m-%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%A, %d %B";
+
+Calendar._TT["WK"] = "spt";
+Calendar._TT["TIME"] = "Ora:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ru.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ru.js
new file mode 100644
index 00000000..4e23e386
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ru.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar RU language
+// Translation: Sly Golovanov, http://golovanov.net, <sly@golovanov.net>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("во�кре�енье",
+ "понедельник",
+ "вторник",
+ "�реда",
+ "четверг",
+ "п�тница",
+ "�уббота",
+ "во�кре�енье");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("в�к",
+ "пон",
+ "втр",
+ "�рд",
+ "чет",
+ "п�т",
+ "�уб",
+ "в�к");
+
+// full month names
+Calendar._MN = new Array
+("�нварь",
+ "февраль",
+ "март",
+ "апрель",
+ "май",
+ "июнь",
+ "июль",
+ "авгу�т",
+ "�ент�брь",
+ "окт�брь",
+ "но�брь",
+ "декабрь");
+
+// short month names
+Calendar._SMN = new Array
+("�нв",
+ "фев",
+ "мар",
+ "апр",
+ "май",
+ "июн",
+ "июл",
+ "авг",
+ "�ен",
+ "окт",
+ "но�",
+ "дек");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "О календаре...";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Как выбрать дату:\n" +
+"- При помощи кнопок \xab, \xbb можно выбрать год\n" +
+"- При помощи кнопок " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " можно выбрать ме��ц\n" +
+"- Подержите �ти кнопки нажатыми, чтобы по�вило�ь меню бы�трого выбора.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Как выбрать врем�:\n" +
+"- При клике на ча�ах или минутах они увеличивают��\n" +
+"- при клике � нажатой клавишей Shift они уменьшают��\n" +
+"- е�ли нажать и двигать мышкой влево/вправо, они будут мен�ть�� бы�трее.";
+
+Calendar._TT["PREV_YEAR"] = "�а год назад (удерживать дл� меню)";
+Calendar._TT["PREV_MONTH"] = "�а ме��ц назад (удерживать дл� меню)";
+Calendar._TT["GO_TODAY"] = "Сегодн�";
+Calendar._TT["NEXT_MONTH"] = "�а ме��ц вперед (удерживать дл� меню)";
+Calendar._TT["NEXT_YEAR"] = "�а год вперед (удерживать дл� меню)";
+Calendar._TT["SEL_DATE"] = "Выберите дату";
+Calendar._TT["DRAG_TO_MOVE"] = "Перета�кивайте мышкой";
+Calendar._TT["PART_TODAY"] = " (�егодн�)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Первый день недели будет %s";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Закрыть";
+Calendar._TT["TODAY"] = "Сегодн�";
+Calendar._TT["TIME_PART"] = "(Shift-)клик или нажать и двигать";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%e %b, %a";
+
+Calendar._TT["WK"] = "нед";
+Calendar._TT["TIME"] = "Врем�:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ru_win_.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ru_win_.js
new file mode 100644
index 00000000..4d8501d7
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-ru_win_.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar RU language
+// Translation: Sly Golovanov, http://golovanov.net, <sly@golovanov.net>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("âîñêðåñåíüå",
+ "ïîíåäåëüíèê",
+ "âòîðíèê",
+ "ñðåäà",
+ "÷åòâåðã",
+ "ïÿòíèöà",
+ "ñóááîòà",
+ "âîñêðåñåíüå");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("âñê",
+ "ïîí",
+ "âòð",
+ "ñðä",
+ "÷åò",
+ "ïÿò",
+ "ñóá",
+ "âñê");
+
+// full month names
+Calendar._MN = new Array
+("ÿíâàðü",
+ "ôåâðàëü",
+ "ìàðò",
+ "àïðåëü",
+ "ìàé",
+ "èþíü",
+ "èþëü",
+ "àâãóñò",
+ "ñåíòÿáðü",
+ "îêòÿáðü",
+ "íîÿáðü",
+ "äåêàáðü");
+
+// short month names
+Calendar._SMN = new Array
+("ÿíâ",
+ "ôåâ",
+ "ìàð",
+ "àïð",
+ "ìàé",
+ "èþí",
+ "èþë",
+ "àâã",
+ "ñåí",
+ "îêò",
+ "íîÿ",
+ "äåê");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Î êàëåíäàðå...";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Êàê âûáðàòü äàòó:\n" +
+"- Ïðè ïîìîùè êíîïîê \xab, \xbb ìîæíî âûáðàòü ãîä\n" +
+"- Ïðè ïîìîùè êíîïîê " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " ìîæíî âûáðàòü ìåñÿö\n" +
+"- Ïîäåðæèòå ýòè êíîïêè íàæàòûìè, ÷òîáû ïîÿâèëîñü ìåíþ áûñòðîãî âûáîðà.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Êàê âûáðàòü âðåìÿ:\n" +
+"- Ïðè êëèêå íà ÷àñàõ èëè ìèíóòàõ îíè óâåëè÷èâàþòñÿ\n" +
+"- ïðè êëèêå ñ íàæàòîé êëàâèøåé Shift îíè óìåíüøàþòñÿ\n" +
+"- åñëè íàæàòü è äâèãàòü ìûøêîé âëåâî/âïðàâî, îíè áóäóò ìåíÿòüñÿ áûñòðåå.";
+
+Calendar._TT["PREV_YEAR"] = "Íà ãîä íàçàä (óäåðæèâàòü äëÿ ìåíþ)";
+Calendar._TT["PREV_MONTH"] = "Íà ìåñÿö íàçàä (óäåðæèâàòü äëÿ ìåíþ)";
+Calendar._TT["GO_TODAY"] = "Ñåãîäíÿ";
+Calendar._TT["NEXT_MONTH"] = "Íà ìåñÿö âïåðåä (óäåðæèâàòü äëÿ ìåíþ)";
+Calendar._TT["NEXT_YEAR"] = "Íà ãîä âïåðåä (óäåðæèâàòü äëÿ ìåíþ)";
+Calendar._TT["SEL_DATE"] = "Âûáåðèòå äàòó";
+Calendar._TT["DRAG_TO_MOVE"] = "Ïåðåòàñêèâàéòå ìûøêîé";
+Calendar._TT["PART_TODAY"] = " (ñåãîäíÿ)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Ïåðâûé äåíü íåäåëè áóäåò %s";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Çàêðûòü";
+Calendar._TT["TODAY"] = "Ñåãîäíÿ";
+Calendar._TT["TIME_PART"] = "(Shift-)êëèê èëè íàæàòü è äâèãàòü";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%e %b, %a";
+
+Calendar._TT["WK"] = "íåä";
+Calendar._TT["TIME"] = "Âðåìÿ:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-si.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-si.js
new file mode 100644
index 00000000..cb3dfb9f
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-si.js
@@ -0,0 +1,94 @@
+/* Slovenian language file for the DHTML Calendar version 0.9.2 
+* Author David Milost <mercy@volja.net>, January 2004.
+* Feel free to use this script under the terms of the GNU Lesser General
+* Public License, as long as you do not remove or alter this notice.
+*/
+ // full day names
+Calendar._DN = new Array
+("Nedelja",
+ "Ponedeljek",
+ "Torek",
+ "Sreda",
+ "ÄŒetrtek",
+ "Petek",
+ "Sobota",
+ "Nedelja");
+ // short day names
+ Calendar._SDN = new Array
+("Ned",
+ "Pon",
+ "Tor",
+ "Sre",
+ "ÄŒet",
+ "Pet",
+ "Sob",
+ "Ned");
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "Maj",
+ "Jun",
+ "Jul",
+ "Avg",
+ "Sep",
+ "Okt",
+ "Nov",
+ "Dec");
+  // full month names
+Calendar._MN = new Array
+("Januar",
+ "Februar",
+ "Marec",
+ "April",
+ "Maj",
+ "Junij",
+ "Julij",
+ "Avgust",
+ "September",
+ "Oktober",
+ "November",
+ "December");
+
+// tooltips
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O koledarju";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Za zadnjo verzijo pojdine na naslov: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuirano pod GNU LGPL.  Poglejte http://gnu.org/licenses/lgpl.html za podrobnosti." +
+"\n\n" +
+"Izbor datuma:\n" +
+"- Uporabite \xab, \xbb gumbe za izbor leta\n" +
+"- Uporabite " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " gumbe za izbor meseca\n" +
+"- Zadržite klik na kateremkoli od zgornjih gumbov za hiter izbor.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Izbor ćasa:\n" +
+"- Kliknite na katerikoli del ćasa za poveć. le-tega\n" +
+"- ali Shift-click za zmanj. le-tega\n" +
+"- ali kliknite in povlecite za hiter izbor.";
+
+Calendar._TT["TOGGLE"] = "Spremeni dan s katerim se prićne teden";
+Calendar._TT["PREV_YEAR"] = "Predhodnje leto (dolg klik za meni)";
+Calendar._TT["PREV_MONTH"] = "Predhodnji mesec (dolg klik za meni)";
+Calendar._TT["GO_TODAY"] = "Pojdi na tekoći dan";
+Calendar._TT["NEXT_MONTH"] = "Naslednji mesec (dolg klik za meni)";
+Calendar._TT["NEXT_YEAR"] = "Naslednje leto (dolg klik za meni)";
+Calendar._TT["SEL_DATE"] = "Izberite datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Pritisni in povleci za spremembo pozicije";
+Calendar._TT["PART_TODAY"] = " (danes)";
+Calendar._TT["MON_FIRST"] = "Prikaži ponedeljek kot prvi dan";
+Calendar._TT["SUN_FIRST"] = "Prikaži nedeljo kot prvi dan";
+Calendar._TT["CLOSE"] = "Zapri";
+Calendar._TT["TODAY"] = "Danes";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "Ted";
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sk.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sk.js
new file mode 100644
index 00000000..2ecfc3c4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sk.js
@@ -0,0 +1,99 @@
+// ** I18N
+
+// Calendar SK language
+// Author: Peter Valach (pvalach@gmx.net)
+// Encoding: utf-8
+// Last update: 2003/10/29
+// Distributed under the same terms as the calendar itself.
+
+// full day names
+Calendar._DN = new Array
+("NedeÄľa",
+ "Pondelok",
+ "Utorok",
+ "Streda",
+ "Ĺ tvrtok",
+ "Piatok",
+ "Sobota",
+ "NedeÄľa");
+
+// short day names
+Calendar._SDN = new Array
+("Ned",
+ "Pon",
+ "Uto",
+ "Str",
+ "Ĺ tv",
+ "Pia",
+ "Sob",
+ "Ned");
+
+// full month names
+Calendar._MN = new Array
+("Január",
+ "Február",
+ "Marec",
+ "AprĂ­l",
+ "Máj",
+ "JÄ‚ÅŸn",
+ "JÄ‚ÅŸl",
+ "August",
+ "September",
+ "OktĂłber",
+ "November",
+ "December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "Máj",
+ "JÄ‚ÅŸn",
+ "JÄ‚ÅŸl",
+ "Aug",
+ "Sep",
+ "Okt",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O kalendári";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" +
+"Poslednú verziu nájdete na: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuované pod GNU LGPL.  Viď http://gnu.org/licenses/lgpl.html pre detaily." +
+"\n\n" +
+"V�ber dátumu:\n" +
+"- Použite tlačidlá \xab, \xbb pre v�ber roku\n" +
+"- Použite tlačidlá " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " pre v�ber mesiaca\n" +
+"- Ak ktorékoľvek z t�chto tlačidiel podržíte dlhšie, zobrazí sa r�chly v�ber.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"V�ber času:\n" +
+"- Kliknutie na niektorú položku času ju zv�ši\n" +
+"- Shift-klik ju znĂ­Ĺľi\n" +
+"- Ak podržíte tlačítko stlačené, posúvaním meníte hodnotu.";
+
+Calendar._TT["PREV_YEAR"] = "Predošl� rok (podržte pre menu)";
+Calendar._TT["PREV_MONTH"] = "Predošl� mesiac (podržte pre menu)";
+Calendar._TT["GO_TODAY"] = "Prejsť na dnešok";
+Calendar._TT["NEXT_MONTH"] = "Nasl. mesiac (podrĹľte pre menu)";
+Calendar._TT["NEXT_YEAR"] = "Nasl. rok (podrĹľte pre menu)";
+Calendar._TT["SEL_DATE"] = "Zvoľte dátum";
+Calendar._TT["DRAG_TO_MOVE"] = "PodrĹľanĂ­m tlaÄŤĂ­tka zmenĂ­te polohu";
+Calendar._TT["PART_TODAY"] = " (dnes)";
+Calendar._TT["MON_FIRST"] = "Zobraziť pondelok ako prv�";
+Calendar._TT["SUN_FIRST"] = "ZobraziĹĄ nedeÄľu ako prvĂş";
+Calendar._TT["CLOSE"] = "ZavrieĹĄ";
+Calendar._TT["TODAY"] = "Dnes";
+Calendar._TT["TIME_PART"] = "(Shift-)klik/ĹĄahanie zmenĂ­ hodnotu";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "$d. %m. %Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %e. %b";
+
+Calendar._TT["WK"] = "t�ž";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sp.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sp.js
new file mode 100644
index 00000000..bbacd216
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sp.js
@@ -0,0 +1,110 @@
+// ** I18N
+
+// Calendar SP language
+// Author: Rafael Velasco <rvu_at_idecnet_dot_com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Domingo",
+ "Lunes",
+ "Martes",
+ "Miercoles",
+ "Jueves",
+ "Viernes",
+ "Sabado",
+ "Domingo");
+
+Calendar._SDN = new Array
+("Dom",
+ "Lun",
+ "Mar",
+ "Mie",
+ "Jue",
+ "Vie",
+ "Sab",
+ "Dom");
+
+// full month names
+Calendar._MN = new Array
+("Enero",
+ "Febrero",
+ "Marzo",
+ "Abril",
+ "Mayo",
+ "Junio",
+ "Julio",
+ "Agosto",
+ "Septiembre",
+ "Octubre",
+ "Noviembre",
+ "Diciembre");
+
+// short month names
+Calendar._SMN = new Array
+("Ene",
+ "Feb",
+ "Mar",
+ "Abr",
+ "May",
+ "Jun",
+ "Jul",
+ "Ago",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dic");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Información del Calendario";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"Nuevas versiones en: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuida bajo licencia GNU LGPL.  Para detalles vea http://gnu.org/licenses/lgpl.html ." +
+"\n\n" +
+"Selección de Fechas:\n" +
+"- Use  \xab, \xbb para seleccionar el año\n" +
+"- Use " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " para seleccionar el mes\n" +
+"- Mantenga presionado el botón del ratón en cualquiera de las opciones superiores para un acceso rapido .";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Selección del Reloj:\n" +
+"- Seleccione la hora para cambiar el reloj\n" +
+"- o presione  Shift-click para disminuirlo\n" +
+"- o presione click y arrastre del ratón para una selección rapida.";
+
+Calendar._TT["PREV_YEAR"] = "Año anterior (Presione para menu)";
+Calendar._TT["PREV_MONTH"] = "Mes Anterior (Presione para menu)";
+Calendar._TT["GO_TODAY"] = "Ir a Hoy";
+Calendar._TT["NEXT_MONTH"] = "Mes Siguiente (Presione para menu)";
+Calendar._TT["NEXT_YEAR"] = "Año Siguiente (Presione para menu)";
+Calendar._TT["SEL_DATE"] = "Seleccione fecha";
+Calendar._TT["DRAG_TO_MOVE"] = "Arrastre y mueva";
+Calendar._TT["PART_TODAY"] = " (Hoy)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Mostrar %s primero";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Cerrar";
+Calendar._TT["TODAY"] = "Hoy";
+Calendar._TT["TIME_PART"] = "(Shift-)Click o arrastra para cambar el valor";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%dd-%mm-%yy";
+Calendar._TT["TT_DATE_FORMAT"] = "%A, %e de %B de %Y";
+
+Calendar._TT["WK"] = "Sm";
+Calendar._TT["TIME"] = "Hora:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sr-SP-Cyrl.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sr-SP-Cyrl.js
new file mode 100644
index 00000000..9a66d6c8
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sr-SP-Cyrl.js
@@ -0,0 +1,104 @@
+// ** I18N
+
+// Calendar - Serbian language (Cyrillic)
+// Author: Aleksandar Seovic (aleks@seovic.com)
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("недеља",
+ "понедељак",
+ "уторак",
+ "�реда",
+ "четвртак",
+ "петак",
+ "�убота",
+ "недеља");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("јануар",
+ "фебруар",
+ "март",
+ "април",
+ "мај",
+ "јун",
+ "јул",
+ "авгу�т",
+ "�ептембар",
+ "октобар",
+ "новембар",
+ "децембар");
+
+// short month names
+Calendar._SMN = new Array
+("јан",
+ "феб",
+ "мар",
+ "апр",
+ "мaj",
+ "јун",
+ "јул",
+ "авг",
+ "�еп",
+ "окт",
+ "нов",
+ "дец");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O календару";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Избор датума:\n" +
+"- Уз помоћ та�тера \xab, \xbb можете изабрати годину\n" +
+"- Уз помоћ та�тера " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " можете изабрати ме�ец\n" +
+"- Држите лево дугме миша прити�нуто за бржу �елекцију.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Избор времена:\n" +
+"- Кликните на �ат или минут да га увећате\n" +
+"- или Shift-click да га умањите\n" +
+"- или прити�ните лево дугме миша и повуците за бржу �елекцију.";
+
+Calendar._TT["PREV_YEAR"] = "Претходна година";
+Calendar._TT["PREV_MONTH"] = "Претходни ме�ец";
+Calendar._TT["GO_TODAY"] = "Дана�";
+Calendar._TT["NEXT_MONTH"] = "Следећи ме�ец";
+Calendar._TT["NEXT_YEAR"] = "Следећа година";
+Calendar._TT["SEL_DATE"] = "Изабери датум";
+Calendar._TT["DRAG_TO_MOVE"] = "Повуци за промену";
+Calendar._TT["PART_TODAY"] = " (дана�)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Прво прикажи %s";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Затвори";
+Calendar._TT["TODAY"] = "Дана�";
+Calendar._TT["TIME_PART"] = "(Shift-)Click или повуци да промениш вредно�т";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "нед";
+Calendar._TT["TIME"] = "Време:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sr-SP-Latn.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sr-SP-Latn.js
new file mode 100644
index 00000000..5ec66f1b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sr-SP-Latn.js
@@ -0,0 +1,104 @@
+// ** I18N
+
+// Calendar - Serbian language (Latin)
+// Author: Aleksandar Seovic (aleks@seovic.com)
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("nedelja",
+ "ponedeljak",
+ "utorak",
+ "sreda",
+ "�etvrtak",
+ "petak",
+ "subota",
+ "nedelja");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("januar",
+ "februar",
+ "mart",
+ "april",
+ "maj",
+ "jun",
+ "jul",
+ "avgust",
+ "septembar",
+ "oktobar",
+ "novembar",
+ "decembar");
+
+// short month names
+Calendar._SMN = new Array
+("jan",
+ "feb",
+ "mar",
+ "apr",
+ "maj",
+ "jun",
+ "jul",
+ "avg",
+ "sep",
+ "okt",
+ "nov",
+ "dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "O kalendaru";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Izbor datuma:\n" +
+"- Uz pomoć tastera \xab, \xbb možete izabrati godinu\n" +
+"- Uz pomoć tastera " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " možete izabrati mesec\n" +
+"- Držite levo dugme miša pritisnuto za bržu selekciju.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Izbor vremena:\n" +
+"- Kliknite na sat ili minut da ga uvećate\n" +
+"- ili Shift-click da ga umanjite\n" +
+"- ili pritisnite levo dugme miša i povucite za bržu selekciju.";
+
+Calendar._TT["PREV_YEAR"] = "Prethodna godina";
+Calendar._TT["PREV_MONTH"] = "Prethodni mesec";
+Calendar._TT["GO_TODAY"] = "Danas";
+Calendar._TT["NEXT_MONTH"] = "Sledeći mesec";
+Calendar._TT["NEXT_YEAR"] = "Sledeća godina";
+Calendar._TT["SEL_DATE"] = "Izaberi datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Povuci za promenu";
+Calendar._TT["PART_TODAY"] = " (danas)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Prvo prikaži %s";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Zatvori";
+Calendar._TT["TODAY"] = "Danas";
+Calendar._TT["TIME_PART"] = "(Shift-)Click ili povuci da promeniš vrednost";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "ned";
+Calendar._TT["TIME"] = "Vreme:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sv.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sv.js
new file mode 100644
index 00000000..b62df3e1
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-sv.js
@@ -0,0 +1,93 @@
+// ** I18N
+
+// Calendar SV language (Swedish, svenska)
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Translation team: <sv@li.org>
+// Translator: Leonard Norrgård <leonard.norrgard@refactor.fi>
+// Last translator: Leonard Norrgård <leonard.norrgard@refactor.fi>
+// Encoding: iso-latin-1
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("söndag",
+ "måndag",
+ "tisdag",
+ "onsdag",
+ "torsdag",
+ "fredag",
+ "lördag",
+ "söndag");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+Calendar._SDN_len = 2;
+Calendar._SMN_len = 3;
+
+// full month names
+Calendar._MN = new Array
+("januari",
+ "februari",
+ "mars",
+ "april",
+ "maj",
+ "juni",
+ "juli",
+ "augusti",
+ "september",
+ "oktober",
+ "november",
+ "december");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Om kalendern";
+
+Calendar._TT["ABOUT"] =
+"DHTML Datum/tid-väljare\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"För senaste version gå till: http://www.dynarch.com/projects/calendar/\n" +
+"Distribueras under GNU LGPL.  Se http://gnu.org/licenses/lgpl.html för detaljer." +
+"\n\n" +
+"Val av datum:\n" +
+"- Använd knapparna \xab, \xbb för att välja år\n" +
+"- Använd knapparna " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " för att välja månad\n" +
+"- Håll musknappen nedtryckt på någon av ovanstående knappar för snabbare val.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Val av tid:\n" +
+"- Klicka på en del av tiden för att öka den delen\n" +
+"- eller skift-klicka för att minska den\n" +
+"- eller klicka och drag för snabbare val.";
+
+Calendar._TT["PREV_YEAR"] = "Föregående år (håll för menu)";
+Calendar._TT["PREV_MONTH"] = "Föregående månad (håll för menu)";
+Calendar._TT["GO_TODAY"] = "Gå till dagens datum";
+Calendar._TT["NEXT_MONTH"] = "Följande månad (håll för menu)";
+Calendar._TT["NEXT_YEAR"] = "Följande år (håll för menu)";
+Calendar._TT["SEL_DATE"] = "Välj datum";
+Calendar._TT["DRAG_TO_MOVE"] = "Drag för att flytta";
+Calendar._TT["PART_TODAY"] = " (idag)";
+Calendar._TT["MON_FIRST"] = "Visa måndag först";
+Calendar._TT["SUN_FIRST"] = "Visa söndag först";
+Calendar._TT["CLOSE"] = "Stäng";
+Calendar._TT["TODAY"] = "Idag";
+Calendar._TT["TIME_PART"] = "(Skift-)klicka eller drag för att ändra tid";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%A %d %b %Y";
+
+Calendar._TT["WK"] = "vecka";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-tr.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-tr.js
new file mode 100644
index 00000000..2164687f
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-tr.js
@@ -0,0 +1,58 @@
+//////////////////////////////////////////////////////////////////////////////////////////////
+//	Turkish Translation by Nuri AKMAN
+//	Location: Ankara/TURKEY
+//	e-mail	: nuriakman@hotmail.com
+//	Date	: April, 9 2003
+//
+//	Note: if Turkish Characters does not shown on you screen
+//		  please include falowing line your html code:
+//
+//		  <meta http-equiv="Content-Type" content="text/html; charset=windows-1254">
+//
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+// ** I18N
+Calendar._DN = new Array
+("Pazar",
+ "Pazartesi",
+ "Salý",
+ "Çarþamba",
+ "Perþembe",
+ "Cuma",
+ "Cumartesi",
+ "Pazar");
+Calendar._MN = new Array
+("Ocak",
+ "Þubat",
+ "Mart",
+ "Nisan",
+ "Mayýs",
+ "Haziran",
+ "Temmuz",
+ "Aðustos",
+ "Eylül",
+ "Ekim",
+ "Kasým",
+ "Aralýk");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["TOGGLE"] = "Haftanýn ilk gününü kaydýr";
+Calendar._TT["PREV_YEAR"] = "Önceki Yýl (Menü için basýlý tutunuz)";
+Calendar._TT["PREV_MONTH"] = "Önceki Ay (Menü için basýlý tutunuz)";
+Calendar._TT["GO_TODAY"] = "Bugün'e git";
+Calendar._TT["NEXT_MONTH"] = "Sonraki Ay (Menü için basýlý tutunuz)";
+Calendar._TT["NEXT_YEAR"] = "Sonraki Yýl (Menü için basýlý tutunuz)";
+Calendar._TT["SEL_DATE"] = "Tarih seçiniz";
+Calendar._TT["DRAG_TO_MOVE"] = "Taþýmak için sürükleyiniz";
+Calendar._TT["PART_TODAY"] = " (bugün)";
+Calendar._TT["MON_FIRST"] = "Takvim Pazartesi gününden baþlasýn";
+Calendar._TT["SUN_FIRST"] = "Takvim Pazar gününden baþlasýn";
+Calendar._TT["CLOSE"] = "Kapat";
+Calendar._TT["TODAY"] = "Bugün";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "dd-mm-y";
+Calendar._TT["TT_DATE_FORMAT"] = "d MM y, DD";
+
+Calendar._TT["WK"] = "Hafta";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-zh.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-zh.js
new file mode 100644
index 00000000..42f0b107
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/calendar-zh.js
@@ -0,0 +1,119 @@
+// ** I18N
+
+// Calendar ZH language
+// Author: muziq, <muziq@sina.com>
+// Encoding: GB2312 or GBK
+// Distributed under the same terms as the calendar itself.
+
+// full day names
+Calendar._DN = new Array
+("ÐÇÆÚÈÕ",
+ "ÐÇÆÚÒ»",
+ "ÐÇÆÚ¶þ",
+ "ÐÇÆÚÈý",
+ "ÐÇÆÚËÄ",
+ "ÐÇÆÚÎå",
+ "ÐÇÆÚÁù",
+ "ÐÇÆÚÈÕ");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("ÈÕ",
+ "Ò»",
+ "¶þ",
+ "Èý",
+ "ËÄ",
+ "Îå",
+ "Áù",
+ "ÈÕ");
+
+// full month names
+Calendar._MN = new Array
+("Ò»ÔÂ",
+ "¶þÔÂ",
+ "ÈýÔÂ",
+ "ËÄÔÂ",
+ "ÎåÔÂ",
+ "ÁùÔÂ",
+ "ÆßÔÂ",
+ "°ËÔÂ",
+ "¾ÅÔÂ",
+ "Ê®ÔÂ",
+ "ʮһÔÂ",
+ "Ê®¶þÔÂ");
+
+// short month names
+Calendar._SMN = new Array
+("Ò»ÔÂ",
+ "¶þÔÂ",
+ "ÈýÔÂ",
+ "ËÄÔÂ",
+ "ÎåÔÂ",
+ "ÁùÔÂ",
+ "ÆßÔÂ",
+ "°ËÔÂ",
+ "¾ÅÔÂ",
+ "Ê®ÔÂ",
+ "ʮһÔÂ",
+ "Ê®¶þÔÂ");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "°ïÖú";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Ñ¡ÔñÈÕÆÚ:\n" +
+"- µã»÷ \xab, \xbb °´Å¥Ñ¡ÔñÄê·Ý\n" +
+"- µã»÷ " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " °´Å¥Ñ¡ÔñÔ·Ý\n" +
+"- ³¤°´ÒÔÉÏ°´Å¥¿É´Ó²Ëµ¥ÖпìËÙÑ¡ÔñÄê·Ý»òÔ·Ý";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Ñ¡Ôñʱ¼ä:\n" +
+"- µã»÷Сʱ»ò·ÖÖÓ¿Éʹ¸ÄÊýÖµ¼ÓÒ»\n" +
+"- °´×¡Shift¼üµã»÷Сʱ»ò·ÖÖÓ¿Éʹ¸ÄÊýÖµ¼õÒ»\n" +
+"- µã»÷Í϶¯Êó±ê¿É½øÐпìËÙÑ¡Ôñ";
+
+Calendar._TT["PREV_YEAR"] = "ÉÏÒ»Äê (°´×¡³ö²Ëµ¥)";
+Calendar._TT["PREV_MONTH"] = "ÉÏÒ»Ô (°´×¡³ö²Ëµ¥)";
+Calendar._TT["GO_TODAY"] = "תµ½½ñÈÕ";
+Calendar._TT["NEXT_MONTH"] = "ÏÂÒ»Ô (°´×¡³ö²Ëµ¥)";
+Calendar._TT["NEXT_YEAR"] = "ÏÂÒ»Äê (°´×¡³ö²Ëµ¥)";
+Calendar._TT["SEL_DATE"] = "Ñ¡ÔñÈÕÆÚ";
+Calendar._TT["DRAG_TO_MOVE"] = "Í϶¯";
+Calendar._TT["PART_TODAY"] = " (½ñÈÕ)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "×î×ó±ßÏÔʾ%s";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "¹Ø±Õ";
+Calendar._TT["TODAY"] = "½ñÈÕ";
+Calendar._TT["TIME_PART"] = "(Shift-)µã»÷Êó±ê»òÍ϶¯¸Ä±äÖµ";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%A, %b %eÈÕ";
+
+Calendar._TT["WK"] = "ÖÜ";
+Calendar._TT["TIME"] = "ʱ¼ä:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/cn_utf8.js b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/cn_utf8.js
new file mode 100644
index 00000000..a0ef7c6b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Scripts/Calendar/lang/cn_utf8.js
@@ -0,0 +1,123 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mishoo@infoiasi.ro>
+// Encoding: any
+// Translator : Niko <nikoused@gmail.com>
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("\u5468\u65e5",//\u5468\u65e5
+ "\u5468\u4e00",//\u5468\u4e00
+ "\u5468\u4e8c",//\u5468\u4e8c
+ "\u5468\u4e09",//\u5468\u4e09
+ "\u5468\u56db",//\u5468\u56db
+ "\u5468\u4e94",//\u5468\u4e94
+ "\u5468\u516d",//\u5468\u516d
+ "\u5468\u65e5");//\u5468\u65e5
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("\u5468\u65e5",
+ "\u5468\u4e00",
+ "\u5468\u4e8c",
+ "\u5468\u4e09",
+ "\u5468\u56db",
+ "\u5468\u4e94",
+ "\u5468\u516d",
+ "\u5468\u65e5");
+
+// full month names
+Calendar._MN = new Array
+("\u4e00\u6708",
+ "\u4e8c\u6708",
+ "\u4e09\u6708",
+ "\u56db\u6708",
+ "\u4e94\u6708",
+ "\u516d\u6708",
+ "\u4e03\u6708",
+ "\u516b\u6708",
+ "\u4e5d\u6708",
+ "\u5341\u6708",
+ "\u5341\u4e00\u6708",
+ "\u5341\u4e8c\u6708");
+
+// short month names
+Calendar._SMN = new Array
+("\u4e00\u6708",
+ "\u4e8c\u6708",
+ "\u4e09\u6708",
+ "\u56db\u6708",
+ "\u4e94\u6708",
+ "\u516d\u6708",
+ "\u4e03\u6708",
+ "\u516b\u6708",
+ "\u4e5d\u6708",
+ "\u5341\u6708",
+ "\u5341\u4e00\u6708",
+ "\u5341\u4e8c\u6708");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "\u5173\u4e8e";
+
+Calendar._TT["ABOUT"] =
+"   DHTML \u65e5\u8d77/\u65f6\u95f4\u9009\u62e9\u63a7\u4ef6\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: \u6700\u65b0\u7248\u672c\u8bf7\u767b\u9646http://www.dynarch.com/projects/calendar/\u5bdf\u770b\n" +
+"\u9075\u5faaGNU LGPL.  \u7ec6\u8282\u53c2\u9605 http://gnu.org/licenses/lgpl.html" +
+"\n\n" +
+"\u65e5\u671f\u9009\u62e9:\n" +
+"- \u70b9\u51fb\xab(\xbb)\u6309\u94ae\u9009\u62e9\u4e0a(\u4e0b)\u4e00\u5e74\u5ea6.\n" +
+"- \u70b9\u51fb" + String.fromCharCode(0x2039) + "(" + String.fromCharCode(0x203a) + ")\u6309\u94ae\u9009\u62e9\u4e0a(\u4e0b)\u4e2a\u6708\u4efd.\n" +
+"- \u957f\u65f6\u95f4\u6309\u7740\u6309\u94ae\u5c06\u51fa\u73b0\u66f4\u591a\u9009\u62e9\u9879.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"\u65f6\u95f4\u9009\u62e9:\n" +
+"-\u5728\u65f6\u95f4\u90e8\u5206(\u5206\u6216\u8005\u79d2)\u4e0a\u5355\u51fb\u9f20\u6807\u5de6\u952e\u6765\u589e\u52a0\u5f53\u524d\u65f6\u95f4\u90e8\u5206(\u5206\u6216\u8005\u79d2)\n" +
+"-\u5728\u65f6\u95f4\u90e8\u5206(\u5206\u6216\u8005\u79d2)\u4e0a\u6309\u4f4fShift\u952e\u540e\u5355\u51fb\u9f20\u6807\u5de6\u952e\u6765\u51cf\u5c11\u5f53\u524d\u65f6\u95f4\u90e8\u5206(\u5206\u6216\u8005\u79d2).";
+
+Calendar._TT["PREV_YEAR"] = "\u4e0a\u4e00\u5e74";
+Calendar._TT["PREV_MONTH"] = "\u4e0a\u4e2a\u6708";
+Calendar._TT["GO_TODAY"] = "\u5230\u4eca\u5929";
+Calendar._TT["NEXT_MONTH"] = "\u4e0b\u4e2a\u6708";
+Calendar._TT["NEXT_YEAR"] = "\u4e0b\u4e00\u5e74";
+Calendar._TT["SEL_DATE"] = "\u9009\u62e9\u65e5\u671f";
+Calendar._TT["DRAG_TO_MOVE"] = "\u62d6\u52a8";
+Calendar._TT["PART_TODAY"] = " (\u4eca\u5929)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "%s\u4e3a\u8fd9\u5468\u7684\u7b2c\u4e00\u5929";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "\u5173\u95ed";
+Calendar._TT["TODAY"] = "\u4eca\u5929";
+Calendar._TT["TIME_PART"] = "(\u6309\u7740Shift\u952e)\u5355\u51fb\u6216\u62d6\u52a8\u6539\u53d8\u503c";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e\u65e5";
+
+Calendar._TT["WK"] = "\u5468";
+Calendar._TT["TIME"] = "\u65f6\u95f4:";
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/SpringAir.Web.build b/examples/Spring/SpringAir/src/SpringAir.Web.2005/SpringAir.Web.build
new file mode 100644
index 00000000..9456679b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/SpringAir.Web.build
@@ -0,0 +1,38 @@
+<?xml version="1.0" ?>
+<project name="SpringAir.Web" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+    <!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+    <target name="build">
+        <csc
+            target="library" define="${current.build.defines.csc}" debug="${build.debug}"
+            output="${current.bin.dir}/${project::get-name()}.dll">
+            <sources failonempty="true">
+                <include name="**/*.cs" />
+            </sources>
+            <nowarn>
+                <warning number="${nowarn.numbers}" />
+            </nowarn>
+            <references basedir="${current.bin.dir}">
+                <include name="log4net.dll" />
+	        <include name="Common.Logging.dll"/>
+                <include name="Spring.Core.dll" />
+                <include name="Spring.Web.dll" />
+                <include name="SpringAir.Core.dll" />
+                <include name="System.Web.dll" />
+            </references>
+        </csc>
+        <copy todir="bin">
+            <fileset basedir="${current.bin.dir}">
+                <include name="log4net.dll" />
+	        <include name="Common.Logging.dll"/>
+                <include name="Spring.Core.dll" />
+                <include name="Spring.Web.dll" />
+                <include name="SpringAir.Core.dll" />
+            </fileset>
+        </copy>
+    </target>
+</project>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web.config b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web.config
new file mode 100644
index 00000000..1833cd9a
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web.config
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<configuration>
+	<configSections>
+		<sectionGroup name="common">
+			<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging"/>
+		</sectionGroup>
+		<sectionGroup name="spring">
+			<section name="typeAliases" type="Spring.Context.Support.TypeAliasesSectionHandler, Spring.Core"/>
+			<section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
+			<section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/>
+			<section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
+		</sectionGroup>
+		<section name="databaseSettings" type="System.Configuration.NameValueSectionHandler, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+	</configSections>
+	<common>
+		<logging>
+			<!-- 
+            You may use http://www.microsoft.com/technet/sysinternals/Miscellaneous/DebugView.mspx 
+            for viewing TraceLogger output 
+            -->
+			<factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
+				<arg key="Level" value="ALL"/>
+				<!-- Possible values are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF -->
+			</factoryAdapter>
+		</logging>
+	</common>
+	<spring>
+		<parsers>
+			<parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>
+		</parsers>
+		<context>
+			<resource uri="~/Config/Aspects.xml"/>
+			<resource uri="~/Config/Web.xml"/>
+			<resource uri="~/Config/Services.xml"/>
+      <resource uri="~/Config/Validation.xml"/>
+			<!-- TEST CONFIGURATION -->
+			<resource uri="~/Config/Test/Services.xml"/>
+			<resource uri="~/Config/Test/Dao.xml"/>
+			<!-- PRODUCTION CONFIGURATION -->
+			<!--
+			<resource uri="~/Config/Production/Services.xml"/>
+			<resource uri="~/Config/Production/Dao.xml"/>
+      -->
+		</context>
+	</spring>
+	<system.web>
+		<pages>
+			<controls>
+				<add tagPrefix="spring" namespace="Spring.Web.UI.Controls" assembly="Spring.Web"/>
+			</controls>
+		</pages>
+		<httpModules>
+			<add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+		</httpModules>
+		<httpHandlers>
+			<add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
+			<add verb="*" path="*.asmx" type="Spring.Web.Services.WebServiceHandlerFactory, Spring.Web"/>
+			<add verb="*" path="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web"/>
+		</httpHandlers>
+		<trace enabled="true" requestLimit="20" pageOutput="true" traceMode="SortByTime" localOnly="true" writeToDiagnosticsTrace="true"/>
+		<compilation debug="true">
+			<assemblies>
+				<add assembly="System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Transactions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.DirectoryServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/></assemblies>
+		</compilation>
+	</system.web>
+	<databaseSettings>
+		<add key="db.server" value="(local)"/>
+		<add key="db.user" value="springqa"/>
+		<add key="db.password" value="springqa"/>
+		<add key="db.schema" value="SpringAir"/>
+	</databaseSettings>
+</configuration>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/App_LocalResources/Home.aspx.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/App_LocalResources/Home.aspx.resx
new file mode 100644
index 00000000..4d6e768a
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/App_LocalResources/Home.aspx.resx
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/App_LocalResources/StandardTemplate.master.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/App_LocalResources/StandardTemplate.master.resx
new file mode 100644
index 00000000..b1fe6ff3
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/App_LocalResources/StandardTemplate.master.resx
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.en.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.en.resx
new file mode 100644
index 00000000..ed0ad7ac
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.en.resx
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</data>
+	<data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>False</value>
+	</data>
+	<data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>Private</value>
+	</data>
+	<data name="$this.caption.Text" type="System.String">
+		<value>Thank You!</value>
+	</data>
+	<data name="confirmation" type="System.String">
+		<value>Your reservation confirmation number is {0}.</value>
+	</data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.resx
new file mode 100644
index 00000000..ed0ad7ac
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.resx
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</data>
+	<data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>False</value>
+	</data>
+	<data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>Private</value>
+	</data>
+	<data name="$this.caption.Text" type="System.String">
+		<value>Thank You!</value>
+	</data>
+	<data name="confirmation" type="System.String">
+		<value>Your reservation confirmation number is {0}.</value>
+	</data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.sr-Cyrl-CS.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.sr-Cyrl-CS.resx
new file mode 100644
index 00000000..7cf65849
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.sr-Cyrl-CS.resx
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>True</value>
+    </data>
+    <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>False</value>
+    </data>
+    <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>Private</value>
+    </data>
+    <data name="$this.caption.Text" type="System.String">
+        <value>Хвала Вам!</value>
+    </data>
+    <data name="confirmation" type="System.String">
+        <value>Ваш број резервације је {0}</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.sr-Latn-CS.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.sr-Latn-CS.resx
new file mode 100644
index 00000000..326baad8
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.sr-Latn-CS.resx
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>True</value>
+    </data>
+    <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>False</value>
+    </data>
+    <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>Private</value>
+    </data>
+    <data name="$this.caption.Text" type="System.String">
+        <value>Hvala Vam!</value>
+    </data>
+    <data name="confirmation" type="System.String">
+        <value>Vaš broj rezervacije je {0}</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.sr-SP-Cyrl.resx.exclude b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.sr-SP-Cyrl.resx.exclude
new file mode 100644
index 00000000..7cf65849
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.sr-SP-Cyrl.resx.exclude
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>True</value>
+    </data>
+    <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>False</value>
+    </data>
+    <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>Private</value>
+    </data>
+    <data name="$this.caption.Text" type="System.String">
+        <value>Хвала Вам!</value>
+    </data>
+    <data name="confirmation" type="System.String">
+        <value>Ваш број резервације је {0}</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.sr-SP-Latn.resx.exclude b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.sr-SP-Latn.resx.exclude
new file mode 100644
index 00000000..326baad8
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/ReservationConfirmationPage.aspx.sr-SP-Latn.resx.exclude
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>True</value>
+    </data>
+    <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>False</value>
+    </data>
+    <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>Private</value>
+    </data>
+    <data name="$this.caption.Text" type="System.String">
+        <value>Hvala Vam!</value>
+    </data>
+    <data name="confirmation" type="System.String">
+        <value>Vaš broj rezervacije je {0}</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.en.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.en.resx
new file mode 100644
index 00000000..523f12f8
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.en.resx
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>True</value>
+	</data>
+	<data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>False</value>
+	</data>
+	<data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+		<value>Private</value>
+	</data>
+	<data name="selectFlight" type="System.String">
+		<value>Please select flight</value>
+	</data>
+	<data name="selectFlights" type="System.String">
+		<value>Please select flights</value>
+	</data>
+	<data name="$this.bookFlights.Text">
+		<value>Book Flights</value>
+	</data>
+	<data name="error.outboundFlight.required">
+		<value>Please select an outbound flight.</value>
+	</data>
+	<data name="error.returnFlight.required">
+		<value>Please select a return flight.</value>
+	</data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.resx
new file mode 100644
index 00000000..af2b0121
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+	<data name="selectFlight" type="System.String">
+		<value>Please select flight</value>
+	</data>
+	<data name="selectFlights" type="System.String">
+		<value>Please select flights</value>
+	</data>
+	<data name="$this.bookFlights.Text">
+		<value>Book Flights</value>
+	</data>
+	<data name="error.outboundFlight.required">
+		<value>Please select an outbound flight.</value>
+	</data>
+	<data name="error.returnFlight.required">
+		<value>Please select a return flight.</value>
+	</data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.sr-Cyrl-CS.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.sr-Cyrl-CS.resx
new file mode 100644
index 00000000..1782f06e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.sr-Cyrl-CS.resx
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>True</value>
+    </data>
+    <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>False</value>
+    </data>
+    <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>Private</value>
+    </data>
+    <data name="selectFlight" type="System.String">
+        <value>Изаберите лет</value>
+    </data>
+    <data name="selectFlights" type="System.String">
+        <value>Изаберите летове</value>
+    </data>
+    <data name="$this.bookFlights.Text" type="System.String">
+        <value>Резервиши лет</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.sr-Latn-CS.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.sr-Latn-CS.resx
new file mode 100644
index 00000000..9a7194a4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.sr-Latn-CS.resx
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>True</value>
+    </data>
+    <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>False</value>
+    </data>
+    <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>Private</value>
+    </data>
+    <data name="selectFlight" type="System.String">
+        <value>Izaberite let</value>
+    </data>
+    <data name="selectFlights" type="System.String">
+        <value>Izaberite letove</value>
+    </data>
+    <data name="$this.bookFlights.Text" type="System.String">
+        <value>Rezerviši let</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.sr-SP-Cyrl.resx.exclude b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.sr-SP-Cyrl.resx.exclude
new file mode 100644
index 00000000..1782f06e
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.sr-SP-Cyrl.resx.exclude
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>True</value>
+    </data>
+    <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>False</value>
+    </data>
+    <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>Private</value>
+    </data>
+    <data name="selectFlight" type="System.String">
+        <value>Изаберите лет</value>
+    </data>
+    <data name="selectFlights" type="System.String">
+        <value>Изаберите летове</value>
+    </data>
+    <data name="$this.bookFlights.Text" type="System.String">
+        <value>Резервиши лет</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.sr-SP-Latn.resx.exclude b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.sr-SP-Latn.resx.exclude
new file mode 100644
index 00000000..9a7194a4
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/SuggestedFlights.aspx.sr-SP-Latn.resx.exclude
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+                            <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+                            <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>True</value>
+    </data>
+    <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>False</value>
+    </data>
+    <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+        <value>Private</value>
+    </data>
+    <data name="selectFlight" type="System.String">
+        <value>Izaberite let</value>
+    </data>
+    <data name="selectFlights" type="System.String">
+        <value>Izaberite letove</value>
+    </data>
+    <data name="$this.bookFlights.Text" type="System.String">
+        <value>Rezerviši let</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.en.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.en.resx
new file mode 100644
index 00000000..ecd95a64
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.en.resx
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.oneWay.Text" type="System.String">
+    <value>One Way</value>
+  </data>
+  <data name="$this.roundTrip.Text" type="System.String">
+    <value>Round Trip</value>
+  </data>
+  <data name="$this.findFlights.Text" type="System.String">
+    <value>Find Flights</value>
+  </data>
+  <data name="$this.leavingFrom.Text" type="System.String">
+    <value>Leaving from:</value>
+  </data>
+  <data name="$this.leavingOn.Text" type="System.String">
+    <value>Departing on:</value>
+  </data>
+  <data name="$this.goingTo.Text" type="System.String">
+    <value>Going to:</value>
+  </data>
+  <data name="$this.returningOn.Text" type="System.String">
+    <value>Returning on:</value>
+  </data>
+  <data name="$this.caption.Text" type="System.String">
+    <value>Please enter flight information</value>
+  </data>
+  <data name="selectAirport" type="System.String">
+    <value>select airport</value>
+  </data>
+  <data name="error.firstName.required" type="System.String">
+    <value>First name is a required field</value>
+  </data>
+  <data name="error.lastName.required" type="System.String">
+    <value>Last name is a required field</value>
+  </data>
+  <data name="error.departureAirport.required" type="System.String">
+    <value>Please select departure airport</value>
+  </data>
+  <data name="error.destinationAirport.required" type="System.String">
+    <value>Please select destination airport</value>
+  </data>
+  <data name="error.departureDate.required" type="System.String">
+    <value>Departure date is required</value>
+  </data>
+  <data name="error.returnDate.required" type="System.String">
+    <value>Return date is required</value>
+  </data>
+  <data name="error.departureDate.inThePast" type="System.String">
+    <value>Departure date cannot be in the past</value>
+  </data>
+  <data name="error.returnDate.beforeDeparture" type="System.String">
+    <value>Return date cannot be before departure date</value>
+  </data>
+  <data name="error.destinationAirport.sameAsDeparture" type="System.String">
+    <value>Destination airport cannot be the same as departure airport</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.resx
new file mode 100644
index 00000000..78bdcce5
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.resx
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.oneWay.Text" type="System.String">
+    <value>One Way</value>
+  </data>
+  <data name="$this.roundTrip.Text" type="System.String">
+    <value>Round Trip</value>
+  </data>
+  <data name="$this.findFlights.Text" type="System.String">
+    <value>Find Flights</value>
+  </data>
+  <data name="$this.leavingFrom.Text" type="System.String">
+    <value>Leaving from:</value>
+  </data>
+  <data name="$this.leavingOn.Text" type="System.String">
+    <value>Departing on:</value>
+  </data>
+  <data name="$this.goingTo.Text" type="System.String">
+    <value>Going to:</value>
+  </data>
+  <data name="$this.returningOn.Text" type="System.String">
+    <value>Returning on:</value>
+  </data>
+  <data name="$this.caption.Text" type="System.String">
+    <value>Please enter flight information</value>
+  </data>
+  <data name="selectAirport" type="System.String">
+    <value>select airport</value>
+  </data>
+  <data name="error.firstName.required" type="System.String">
+    <value>First name is a required field</value>
+  </data>
+  <data name="error.lastName.required" type="System.String">
+    <value>Last name is a required field</value>
+  </data>
+  <data name="error.departureAirport.required" type="System.String">
+    <value>Please select departure airport</value>
+  </data>
+  <data name="error.destinationAirport.required" type="System.String">
+    <value>Please select destination airport</value>
+  </data>
+  <data name="error.departureDate.required" type="System.String">
+    <value>Departure date is required</value>
+  </data>
+  <data name="error.returnDate.required" type="System.String">
+    <value>Return date is required</value>
+  </data>
+  <data name="error.departureDate.inThePast" type="System.String">
+    <value>Departure date cannot be in the past</value>
+  </data>
+  <data name="error.returnDate.beforeDeparture" type="System.String">
+    <value>Return date cannot be before departure date</value>
+  </data>
+  <data name="error.destinationAirport.sameAsDeparture" type="System.String">
+    <value>Destination airport cannot be the same as departure airport</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.sr-Cyrl-CS.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.sr-Cyrl-CS.resx
new file mode 100644
index 00000000..5f77dd3a
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.sr-Cyrl-CS.resx
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.oneWay.Text" type="System.String">
+    <value>Једно�мерни лет</value>
+  </data>
+  <data name="$this.roundTrip.Text" type="System.String">
+    <value>Повратни лет</value>
+  </data>
+  <data name="$this.findFlights.Text" type="System.String">
+    <value>Пронађи лет</value>
+  </data>
+  <data name="$this.leavingFrom.Text" type="System.String">
+    <value>Полазак из:</value>
+  </data>
+  <data name="$this.leavingOn.Text" type="System.String">
+    <value>Датум пола�ка:</value>
+  </data>
+  <data name="$this.goingTo.Text" type="System.String">
+    <value>Слетање на:</value>
+  </data>
+  <data name="$this.returningOn.Text" type="System.String">
+    <value>Датум повратка:</value>
+  </data>
+  <data name="$this.caption.Text" type="System.String">
+    <value>Уне�ите податке о лету</value>
+  </data>
+  <data name="selectAirport" type="System.String">
+    <value>изаберите аеродром</value>
+  </data>
+  <data name="error.firstName.required" type="System.String">
+    <value>Име је обавезно поље</value>
+  </data>
+  <data name="error.lastName.required" type="System.String">
+    <value>Презиме је обавезно поље</value>
+  </data>
+  <data name="error.departureAirport.required" type="System.String">
+    <value>Молимо ва� изаберите полазни аеродром</value>
+  </data>
+  <data name="error.destinationAirport.required" type="System.String">
+    <value>Молимо ва� изаберите одредишни аеродром</value>
+  </data>
+  <data name="error.departureDate.required" type="System.String">
+    <value>Датум пола�ка је обавезан</value>
+  </data>
+  <data name="error.returnDate.required" type="System.String">
+    <value>Датум повратка је обавезан</value>
+  </data>
+  <data name="error.departureDate.inThePast" type="System.String">
+    <value>Датум пола�ка не може бити у прошло�ти</value>
+  </data>
+  <data name="error.returnDate.beforeDeparture" type="System.String">
+    <value>Датум повратка не може бити пре датума пола�ка</value>
+  </data>
+  <data name="error.destinationAirport.sameAsDeparture" type="System.String">
+    <value>Одредишни аеродром не може бити и�ти као полазни аеродром</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.sr-Latn-CS.resx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.sr-Latn-CS.resx
new file mode 100644
index 00000000..25b9eb60
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.sr-Latn-CS.resx
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.oneWay.Text" type="System.String">
+    <value>Jednosmerni let</value>
+  </data>
+  <data name="$this.roundTrip.Text" type="System.String">
+    <value>Povratni let</value>
+  </data>
+  <data name="$this.findFlights.Text" type="System.String">
+    <value>Pronadji let</value>
+  </data>
+  <data name="$this.leavingFrom.Text" type="System.String">
+    <value>Polazak iz:</value>
+  </data>
+  <data name="$this.leavingOn.Text" type="System.String">
+    <value>Datum polaska:</value>
+  </data>
+  <data name="$this.goingTo.Text" type="System.String">
+    <value>Sletanje na:</value>
+  </data>
+  <data name="$this.returningOn.Text" type="System.String">
+    <value>Datum povratka:</value>
+  </data>
+  <data name="$this.caption.Text" type="System.String">
+    <value>Unesite podatke o letu</value>
+  </data>
+  <data name="selectAirport" type="System.String">
+    <value>izaberite aerodrom</value>
+  </data>
+  <data name="error.firstName.required" type="System.String">
+    <value>Ime je obavezno polje</value>
+  </data>
+  <data name="error.lastName.required" type="System.String">
+    <value>Prezime je obavezno polje</value>
+  </data>
+  <data name="error.departureAirport.required" type="System.String">
+    <value>Molimo vas izaberite polazni aerodrom</value>
+  </data>
+  <data name="error.destinationAirport.required" type="System.String">
+    <value>Molimo vas izaberite odredišni aerodrom</value>
+  </data>
+  <data name="error.departureDate.required" type="System.String">
+    <value>Datum polaska je obavezan</value>
+  </data>
+  <data name="error.returnDate.required" type="System.String">
+    <value>Datum povratka je obavezan</value>
+  </data>
+  <data name="error.departureDate.inThePast" type="System.String">
+    <value>Datum polaska ne može biti u prošlosti</value>
+  </data>
+  <data name="error.returnDate.beforeDeparture" type="System.String">
+    <value>Datum povratka ne može biti pre datuma polaska</value>
+  </data>
+  <data name="error.destinationAirport.sameAsDeparture" type="System.String">
+    <value>Odredišni aerodrom ne može biti isti kao polazni aerodrom</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.sr-SP-Cyrl.resx.exclude b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.sr-SP-Cyrl.resx.exclude
new file mode 100644
index 00000000..5f77dd3a
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.sr-SP-Cyrl.resx.exclude
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.oneWay.Text" type="System.String">
+    <value>Једно�мерни лет</value>
+  </data>
+  <data name="$this.roundTrip.Text" type="System.String">
+    <value>Повратни лет</value>
+  </data>
+  <data name="$this.findFlights.Text" type="System.String">
+    <value>Пронађи лет</value>
+  </data>
+  <data name="$this.leavingFrom.Text" type="System.String">
+    <value>Полазак из:</value>
+  </data>
+  <data name="$this.leavingOn.Text" type="System.String">
+    <value>Датум пола�ка:</value>
+  </data>
+  <data name="$this.goingTo.Text" type="System.String">
+    <value>Слетање на:</value>
+  </data>
+  <data name="$this.returningOn.Text" type="System.String">
+    <value>Датум повратка:</value>
+  </data>
+  <data name="$this.caption.Text" type="System.String">
+    <value>Уне�ите податке о лету</value>
+  </data>
+  <data name="selectAirport" type="System.String">
+    <value>изаберите аеродром</value>
+  </data>
+  <data name="error.firstName.required" type="System.String">
+    <value>Име је обавезно поље</value>
+  </data>
+  <data name="error.lastName.required" type="System.String">
+    <value>Презиме је обавезно поље</value>
+  </data>
+  <data name="error.departureAirport.required" type="System.String">
+    <value>Молимо ва� изаберите полазни аеродром</value>
+  </data>
+  <data name="error.destinationAirport.required" type="System.String">
+    <value>Молимо ва� изаберите одредишни аеродром</value>
+  </data>
+  <data name="error.departureDate.required" type="System.String">
+    <value>Датум пола�ка је обавезан</value>
+  </data>
+  <data name="error.returnDate.required" type="System.String">
+    <value>Датум повратка је обавезан</value>
+  </data>
+  <data name="error.departureDate.inThePast" type="System.String">
+    <value>Датум пола�ка не може бити у прошло�ти</value>
+  </data>
+  <data name="error.returnDate.beforeDeparture" type="System.String">
+    <value>Датум повратка не може бити пре датума пола�ка</value>
+  </data>
+  <data name="error.destinationAirport.sameAsDeparture" type="System.String">
+    <value>Одредишни аеродром не може бити и�ти као полазни аеродром</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.sr-SP-Latn.resx.exclude b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.sr-SP-Latn.resx.exclude
new file mode 100644
index 00000000..25b9eb60
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/App_LocalResources/TripForm.aspx.sr-SP-Latn.resx.exclude
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.oneWay.Text" type="System.String">
+    <value>Jednosmerni let</value>
+  </data>
+  <data name="$this.roundTrip.Text" type="System.String">
+    <value>Povratni let</value>
+  </data>
+  <data name="$this.findFlights.Text" type="System.String">
+    <value>Pronadji let</value>
+  </data>
+  <data name="$this.leavingFrom.Text" type="System.String">
+    <value>Polazak iz:</value>
+  </data>
+  <data name="$this.leavingOn.Text" type="System.String">
+    <value>Datum polaska:</value>
+  </data>
+  <data name="$this.goingTo.Text" type="System.String">
+    <value>Sletanje na:</value>
+  </data>
+  <data name="$this.returningOn.Text" type="System.String">
+    <value>Datum povratka:</value>
+  </data>
+  <data name="$this.caption.Text" type="System.String">
+    <value>Unesite podatke o letu</value>
+  </data>
+  <data name="selectAirport" type="System.String">
+    <value>izaberite aerodrom</value>
+  </data>
+  <data name="error.firstName.required" type="System.String">
+    <value>Ime je obavezno polje</value>
+  </data>
+  <data name="error.lastName.required" type="System.String">
+    <value>Prezime je obavezno polje</value>
+  </data>
+  <data name="error.departureAirport.required" type="System.String">
+    <value>Molimo vas izaberite polazni aerodrom</value>
+  </data>
+  <data name="error.destinationAirport.required" type="System.String">
+    <value>Molimo vas izaberite odredišni aerodrom</value>
+  </data>
+  <data name="error.departureDate.required" type="System.String">
+    <value>Datum polaska je obavezan</value>
+  </data>
+  <data name="error.returnDate.required" type="System.String">
+    <value>Datum povratka je obavezan</value>
+  </data>
+  <data name="error.departureDate.inThePast" type="System.String">
+    <value>Datum polaska ne može biti u prošlosti</value>
+  </data>
+  <data name="error.returnDate.beforeDeparture" type="System.String">
+    <value>Datum povratka ne može biti pre datuma polaska</value>
+  </data>
+  <data name="error.destinationAirport.sameAsDeparture" type="System.String">
+    <value>Odredišni aerodrom ne može biti isti kao polazni aerodrom</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/BookTrip.aspx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/BookTrip.aspx
new file mode 100644
index 00000000..5044b2ec
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/BookTrip.aspx
@@ -0,0 +1,4 @@
+<%--
+// this is only a dummy placeholder
+// requesting this page will start the "booktrip"-Process
+--%>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/ReservationConfirmationPage.aspx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/ReservationConfirmationPage.aspx
new file mode 100644
index 00000000..7374dbfb
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/ReservationConfirmationPage.aspx
@@ -0,0 +1,53 @@
+<%@ Page language="c#" Inherits="ReservationConfirmationPage" CodeFile="ReservationConfirmationPage.aspx.cs" %>
+<%@ Import Namespace="SpringAir.Domain" %>
+
+<asp:Content id="body" contentPlaceholderId="body" runat="server">
+  <h4 align="center"><asp:Label id="caption" Runat="server" /></h4>
+  <p align="center">
+    <asp:Label id="confirmationLabel" Runat="server" />
+  </p>
+  <br />
+  <br />
+  <asp:Repeater id="itinerary" Runat="server">
+    <HeaderTemplate>
+      <table border="0" width="90%" cellpadding="0" cellspacing="0" align="center" class="suggestedTable">
+        <thead>
+          <tr class="suggestedTableCaption">
+            <th colspan="5">
+              <%= GetMessage("itinerary") %>
+            </th>
+          </tr>
+          <tr class="suggestedTableColnames">
+            <th>
+              <%= GetMessage("flightNumber") %>
+            </th>
+            <th>
+              <%= GetMessage("departureDate") %>
+            </th>
+            <th>
+              <%= GetMessage("departureAirport") %>
+            </th>
+            <th>
+              <%= GetMessage("destinationAirport") %>
+            </th>
+            <th>
+              <%= GetMessage("aircraft") %>
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+    </HeaderTemplate>
+    <ItemTemplate>
+      <tr class="suggestedTableRow">
+        <td><%# ((Flight) Container.DataItem).FlightNumber %></td>
+        <td><%# ((Flight) Container.DataItem).DepartureTime.ToString() %></td>
+        <td><%# ((Flight) Container.DataItem).DepartureAirport.Description %></td>
+        <td><%# ((Flight) Container.DataItem).DestinationAirport.Description %></td>
+        <td><%# ((Flight) Container.DataItem).Aircraft.Model %></td>
+      </tr>
+    </ItemTemplate>
+    <FooterTemplate>
+      </tbody></table>
+    </FooterTemplate>
+  </asp:Repeater>
+</asp:Content>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/ReservationConfirmationPage.aspx.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/ReservationConfirmationPage.aspx.cs
new file mode 100644
index 00000000..bcbc1246
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/ReservationConfirmationPage.aspx.cs
@@ -0,0 +1,87 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Web.UI.WebControls;
+
+using Spring.Web.UI;
+using Spring.Web.UI.Controls;
+using SpringAir.Domain;
+
+#endregion
+
+/// <summary>
+/// The SpringAir reservation confirmation page.
+/// </summary>
+/// <author>Aleksandar Seovic</author>
+/// <version>$Id: ReservationConfirmationPage.aspx.cs,v 1.2 2006/12/07 04:22:00 aseovic Exp $</version>
+public partial class ReservationConfirmationPage : Page
+{
+    #region Fields
+
+    protected ReservationConfirmation confirmation;
+
+    #endregion
+
+    #region Model Management and Data Binding Methods
+
+    protected override void InitializeModel()
+    {
+        confirmation = (ReservationConfirmation)Session[Constants.ReservationConfirmationKey];
+    }
+
+    protected override void LoadModel(object savedModel)
+    {
+        confirmation = (ReservationConfirmation)savedModel;
+    }
+
+    protected override object SaveModel()
+    {
+        return confirmation;
+    }
+
+    #endregion
+    
+    #region Page Lifecycle Methods
+
+    protected override void OnInitializeControls(EventArgs e)
+    {
+        base.OnInitializeControls(e);
+
+        if (!IsPostBack)
+        {
+            itinerary.DataSource = confirmation.Reservation.Itinerary.Flights;
+            itinerary.DataBind();
+
+            Session.Remove(Constants.ReservationConfirmationKey);
+            Session.Remove(Constants.SuggestedFlightsKey);
+        }
+    }
+
+    protected override void OnPreRender(EventArgs e)
+    {
+        base.OnPreRender(e);
+        confirmationLabel.Text = GetMessage("confirmation", confirmation.ConfirmationNumber);
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/SuggestedFlights.aspx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/SuggestedFlights.aspx
new file mode 100644
index 00000000..4e057dbc
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/SuggestedFlights.aspx
@@ -0,0 +1,156 @@
+<%@ Page Language="c#" Inherits="SuggestedFlights" CodeFile="SuggestedFlights.aspx.cs" %>
+<%@ Import Namespace="SpringAir.Domain" %>
+
+<asp:Content ID="body" ContentPlaceHolderID="body" runat="server">
+    <h4 align="center">
+        <asp:Label ID="caption" runat="server" /></h4>
+    <spring:ValidationSummary ID="validationSummary" Provider="summary" runat="server" />
+    <br />
+    <table cellspacing="0" cellpadding="0" width="90%" align="center" border="0">
+        <tr>
+            <td>
+                <input id="outboundFlight" type="hidden" name="outboundFlight" runat="server" />
+                <asp:Repeater ID="outboundFlightList" runat="server">
+                    <HeaderTemplate>
+                        <table border="0" width="100%" cellpadding="0" cellspacing="0" class="suggestedTable">
+                            <thead>
+                                <tr class="suggestedTableCaption">
+                                    <th colspan="7">
+                                        <%= GetMessage("outboundFlights") %>
+                                    </th>
+                                </tr>
+                                <tr class="suggestedTableColnames">
+                                    <th>
+                                        &nbsp;
+                                    </th>
+                                    <th>
+                                        <%= GetMessage("flightNumber") %>
+                                    </th>
+                                    <th>
+                                        <%= GetMessage("departureDate") %>
+                                    </th>
+                                    <th>
+                                        <%= GetMessage("departureAirport") %>
+                                    </th>
+                                    <th>
+                                        <%= GetMessage("destinationAirport") %>
+                                    </th>
+                                    <th>
+                                        <%= GetMessage("aircraft") %>
+                                    </th>
+                                    <th>
+                                        <%= GetMessage("seatPlan") %>
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                    </HeaderTemplate>
+                    <ItemTemplate>
+                        <tr class="suggestedTableRow">
+                            <td>
+                                <input name="outboundFlightSelection" type="radio" onclick="<%= outboundFlight.ClientID %>.value = '<%# Container.ItemIndex %>';" /></td>
+                            <td>
+                                <%# ((Flight) Container.DataItem).FlightNumber %>
+                            </td>
+                            <td>
+                                <%# ((Flight) Container.DataItem).DepartureTime.ToString() %>
+                            </td>
+                            <td>
+                                <%# ((Flight) Container.DataItem).DepartureAirport.Description %>
+                            </td>
+                            <td>
+                                <%# ((Flight) Container.DataItem).DestinationAirport.Description %>
+                            </td>
+                            <td>
+                                <%# ((Flight) Container.DataItem).Aircraft.Model %>
+                            </td>
+                            <td>
+                                <%# ((Flight) Container.DataItem).SeatPlan %>
+                            </td>
+                        </tr>
+                    </ItemTemplate>
+                    <FooterTemplate>
+                            </tbody></table>
+                    </FooterTemplate>
+                </asp:Repeater>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                &nbsp;<br/>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <input id="returnFlight" type="hidden" name="returnFlight" runat="server"/>
+                <asp:Repeater ID="returnFlightList" runat="server">
+                    <HeaderTemplate>
+                        <table border="0" width="100%" cellpadding="0" cellspacing="0" class="suggestedTable">
+                            <thead>
+                                <tr class="suggestedTableCaption">
+                                    <th colspan="7">
+                                        <%= GetMessage("returnFlights") %>
+                                    </th>
+                                </tr>
+                                <tr class="suggestedTableColnames">
+                                    <th>
+                                        &nbsp;</th>
+                                    <th>
+                                        <%= GetMessage("flightNumber") %>
+                                    </th>
+                                    <th>
+                                        <%= GetMessage("departureDate") %>
+                                    </th>
+                                    <th>
+                                        <%= GetMessage("departureAirport") %>
+                                    </th>
+                                    <th>
+                                        <%= GetMessage("destinationAirport") %>
+                                    </th>
+                                    <th>
+                                        <%= GetMessage("aircraft") %>
+                                    </th>
+                                    <th>
+                                        <%= GetMessage("seatPlan") %>
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                    </HeaderTemplate>
+                    <ItemTemplate>
+                        <tr class="suggestedTableRow">
+                            <td>
+                                <input id="returnFlightSelection" name="returnFlightSelection" type="radio" onclick="<%= returnFlight.ClientID %>.value = '<%# Container.ItemIndex %>';" /></td>
+                            <td>
+                                <%# ((Flight) Container.DataItem).FlightNumber %>
+                            </td>
+                            <td>
+                                <%# ((Flight) Container.DataItem).DepartureTime.ToString() %>
+                            </td>
+                            <td>
+                                <%# ((Flight) Container.DataItem).DepartureAirport.Description %>
+                            </td>
+                            <td>
+                                <%# ((Flight) Container.DataItem).DestinationAirport.Description %>
+                            </td>
+                            <td>
+                                <%# ((Flight) Container.DataItem).Aircraft.Model %>
+                            </td>
+                            <td>
+                                <%# ((Flight) Container.DataItem).SeatPlan %>
+                            </td>
+                        </tr>
+                    </ItemTemplate>
+                    <FooterTemplate>
+                        </tbody></table>
+                    </FooterTemplate>
+                </asp:Repeater>
+            </td>
+        </tr>
+        <tr>
+            <td class="buttonBar">
+                <br/>
+                <asp:Button ID="bookFlights" OnClick="BookFlights" runat="server"/></td>
+        </tr>
+    </table>
+</asp:Content>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/SuggestedFlights.aspx.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/SuggestedFlights.aspx.cs
new file mode 100644
index 00000000..5185d5a5
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/SuggestedFlights.aspx.cs
@@ -0,0 +1,173 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+
+using Spring.Validation;
+using Spring.Web.UI;
+using SpringAir.Domain;
+using SpringAir.Service;
+
+#endregion
+
+/// <summary>
+/// Displays a list of suggested flights.
+/// </summary>
+/// <author>Rick Evans</author>
+/// <author>Aleksandar Seovic</author>
+/// <author>Marko Dumic</author>
+/// <version>$Id: SuggestedFlights.aspx.cs,v 1.2 2006/12/07 04:22:00 aseovic Exp $</version>
+public partial class SuggestedFlights : Page
+{
+    #region Fields
+
+    private const string ReservationConfirmed = "reservationConfirmed";
+    private const int NoFlightSelected = -1;
+
+    protected FlightSuggestions flights;
+    private IBookingAgent bookingAgent;
+
+    protected int outboundFlightIndex = NoFlightSelected;
+    protected int returnFlightIndex = NoFlightSelected;
+
+    private IValidator flightsValidator;
+
+    #endregion
+
+    #region Properties
+
+    public IBookingAgent BookingAgent
+    {
+        set { this.bookingAgent = value; }
+    }
+
+    public IValidator FlightsValidator
+    {
+        set { flightsValidator = value; }
+    }
+
+    #endregion
+
+    #region Model Management and Data Binding Methods
+
+    protected override void InitializeModel()
+    {
+        flights = (FlightSuggestions)Session[Constants.SuggestedFlightsKey];
+        outboundFlightIndex = NoFlightSelected;
+        returnFlightIndex = NoFlightSelected;
+    }
+
+    protected override void LoadModel(object savedModel)
+    {
+        IDictionary model = (IDictionary)savedModel;
+        flights = (FlightSuggestions) model["flights"];
+        outboundFlightIndex = (int) model["outboundFlightIndex"];
+        returnFlightIndex = (int) model["returnFlightIndex"];
+    }
+
+    protected override object SaveModel()
+    {
+        IDictionary model = new Hashtable();
+        model.Add("flights", flights);
+        model.Add("outboundFlightIndex", outboundFlightIndex);
+        model.Add("returnFlightIndex", returnFlightIndex);
+        return model;
+    }
+
+    protected override void InitializeDataBindings()
+    {
+        BindingManager.AddBinding("outboundFlight.Value", "outboundFlightIndex");
+        BindingManager.AddBinding("returnFlight.Value", "returnFlightIndex");
+    }
+
+    #endregion
+    
+    #region Page Lifecycle Methods
+
+    protected override void OnInitializeControls(EventArgs e)
+    {
+        base.OnInitializeControls(e);
+
+        if (!IsPostBack)
+        {
+            outboundFlightList.DataSource = flights.OutboundFlights;
+            outboundFlightList.DataBind();
+            if (flights.HasReturnFlights)
+            {
+                caption.Text = GetMessage("selectFlights");
+                returnFlightList.DataSource = flights.ReturnFlights;
+                returnFlightList.DataBind();
+            }
+            else
+            {
+                caption.Text = GetMessage("selectFlight");
+                returnFlightList.Visible = false;
+            }
+        }
+    }
+
+    protected override void OnPreRender(EventArgs e)
+    {
+        base.OnPreRender(e);
+        caption.Text = flights.HasReturnFlights
+            ? GetMessage("selectFlights")
+            : GetMessage("selectFlight");
+    }
+
+    #endregion
+
+    #region Controller Methods
+
+    protected void BookFlights(object sender, EventArgs e)
+    {
+        FlightCollection flightsToBook = GetFlightsToBook();
+        Itinerary itinerary = new Itinerary(flightsToBook);
+        // TODO: forward to next logical page and get user details...
+        ReservationConfirmation confirmation = bookingAgent.Book(
+            new Reservation(new Passenger(1, "Aleksandar", "Seovic"), itinerary));
+        Session[Constants.ReservationConfirmationKey] = confirmation;
+        SetResult(ReservationConfirmed);
+    }
+
+    private FlightCollection GetFlightsToBook()
+    {
+        FlightCollection flightsToBook = new FlightCollection();
+        Flight outboundFlight = this.flights.GetOutboundFlight(outboundFlightIndex);
+        flightsToBook.Add(outboundFlight);
+        if (HasReturnFlight)
+        {
+            Flight returnFlight = this.flights.GetReturnFlight(returnFlightIndex);
+            flightsToBook.Add(returnFlight);
+        }
+        return flightsToBook;
+    }
+
+    private bool HasReturnFlight
+    {
+        get { return this.returnFlightIndex != NoFlightSelected; }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/TripForm.aspx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/TripForm.aspx
new file mode 100644
index 00000000..e4810071
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/TripForm.aspx
@@ -0,0 +1,76 @@
+<%@ Page Language="c#" Inherits="TripForm" CodeFile="TripForm.aspx.cs" %>
+
+<asp:Content ID="head" ContentPlaceHolderID="head" runat="server">
+
+    <script language="javascript" type="text/javascript">
+      <!--
+      function showReturnCalendar(isVisible)
+      {
+          document.getElementById('<%= returningOnDate.ClientID %>').style.visibility = isVisible? '': 'hidden';
+          document.getElementById('returningOnCalendar').style.visibility = isVisible? '': 'hidden';
+      }
+      -->
+    </script>
+
+</asp:Content>
+
+<asp:Content ID="body" ContentPlaceHolderID="body" runat="server">
+    <div style="text-align: center">
+        <h4><asp:Label ID="caption" runat="server"></asp:Label></h4>
+        <spring:ValidationSummary ID="validationSummary" runat="server" />
+        <table>
+            <tr class="formLabel">
+                <td>&nbsp;</td>
+                <td colspan="3">
+                    <spring:RadioButtonGroup ID="tripMode" runat="server">
+                        <asp:RadioButton ID="OneWay" onclick="showReturnCalendar(false);" runat="server" />
+                        <asp:RadioButton ID="RoundTrip" onclick="showReturnCalendar(true);" runat="server" />
+                    </spring:RadioButtonGroup>
+                </td>
+            </tr>
+            <tr>
+                <td class="formLabel" align="right">
+                    <asp:Label ID="leavingFrom" runat="server" /></td>
+                <td nowrap="nowrap">
+                    <asp:DropDownList ID="leavingFromAirportCode" runat="server" />
+                    <spring:ValidationError id="departureAirportErrors" runat="server" />
+                </td>
+                <td class="formLabel" align="right">
+                    <asp:Label ID="goingTo" runat="server" /></td>
+                <td nowrap="nowrap">
+                    <asp:DropDownList ID="goingToAirportCode" runat="server" />
+                    <spring:ValidationError id="destinationAirportErrors" runat="server" />
+                </td>
+            </tr>
+            <tr>
+                <td class="formLabel" align="right">
+                    <asp:Label ID="leavingOn" runat="server" /></td>
+                <td nowrap="nowrap">
+                    <spring:Calendar ID="leavingFromDate" runat="server" Width="75px" AllowEditing="true" Skin="system" />
+                    <spring:ValidationError id="departureDateErrors" runat="server" />
+                </td>
+                <td class="formLabel" align="right">
+                    <asp:Label ID="returningOn" runat="server" /></td>
+                <td nowrap="nowrap">
+                    <div id="returningOnCalendar">
+                        <spring:Calendar ID="returningOnDate" runat="server" Width="75px" AllowEditing="true" Skin="system" />
+                        <spring:ValidationError id="returnDateErrors" runat="server" />
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td class="buttonBar" colspan="4">
+                    <br/>
+                    <asp:Button ID="findFlights" OnClick="SearchForFlights" runat="server"/></td>
+            </tr>
+        </table>
+    </div>
+
+    <script language="javascript" type="text/javascript">
+          if (document.getElementById('<%= tripMode.ClientID %>').value == 'OneWay')
+              showReturnCalendar(false);
+          else
+              showReturnCalendar(true);
+    </script>
+
+</asp:Content>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/TripForm.aspx.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/TripForm.aspx.cs
new file mode 100644
index 00000000..4ac691d0
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/TripForm.aspx.cs
@@ -0,0 +1,214 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Web.UI.WebControls;
+
+using Spring.Validation;
+using Spring.Web.UI;
+using Spring.Web.UI.Controls;
+
+using SpringAir.Data;
+using SpringAir.Domain;
+using SpringAir.Service;
+
+using Calendar = Spring.Web.UI.Controls.Calendar;
+using ValidationSummary = Spring.Web.UI.Controls.ValidationSummary;
+
+#endregion
+
+/// <summary>
+/// Handles the 'type in your trip details and we'll see what we can find
+/// for you' use case.
+/// </summary>
+/// <author>Rick Evans</author>
+/// <author>Aleksandar Seovic</author>
+/// <author>Marko Dumic</author>
+/// <version>$Id: TripForm.aspx.cs,v 1.2 2006/12/07 04:22:01 aseovic Exp $</version>
+public partial class TripForm : Page
+{
+    #region Fields
+
+    private const string DisplaySuggestedFlights = "displaySuggestedFlights";
+
+    private IBookingAgent bookingAgent;
+    private IAirportDao airportDao;
+    private Trip trip;
+    private IValidator tripValidator;
+    
+    #endregion
+
+    #region Properties
+
+    /// <summary>
+    /// The service interface that will handle the business logic of
+    /// booking trips and suggesting itineraries.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Is injected into this page by the Spring IoC container. You might
+    /// want to look at the definition of this page in the ~/Config/Web.xml
+    /// file to confirm exactly which implementation of the
+    /// <see cref="SpringAir.Service.IBookingAgent"/> is being injected,
+    /// and to see how this is wired together.
+    /// </p>
+    /// </remarks>
+    public IBookingAgent BookingAgent
+    {
+        set { bookingAgent = value; }
+    }
+
+    /// <summary>
+    /// This DAO object is used to retrieve a list of airports in order
+    /// to populate airport drop-down lists.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Is injected into this page by the Spring IoC container. You might
+    /// want to look at the definition of this page in the ~/Config/Web.xml
+    /// file to confirm exactly which implementation of the
+    /// <see cref="IAirportDao"/> is being injected,
+    /// and to see how this is wired together.
+    /// </p>
+    /// </remarks>
+    public IAirportDao AirportDao
+    {
+        set { airportDao = value; }
+    }
+
+    /// <summary>
+    /// The user's desired <see cref="SpringAir.Domain.Trip"/>.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// The properties of this domain object are populated from the
+    /// values present in the controls on this page, according to the
+    /// data binding definitions.
+    /// </p>
+    /// </remarks>
+    public Trip Trip
+    {
+        get { return trip; }
+        set { trip = value; }
+    }
+
+    /// <summary>
+    /// Sets the trip validator.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Unsurprisingly, this <see cref="Spring.Validation.IValidator"/>
+    /// instance will be used to validate the associated
+    /// <see cref="SpringAir.Web.TripForm.Trip"/> on a form submission. 
+    /// </p>
+    /// </remarks>
+    /// <value>The trip validator.</value>
+    public IValidator TripValidator
+    {
+        set { tripValidator = value; }
+    }
+
+    #endregion
+
+    #region Model Management and Data Binding Methods
+
+    protected override void InitializeModel()
+    {
+        trip = new Trip();
+        trip.Mode = TripMode.RoundTrip;
+        trip.StartingFrom.Date = DateTime.Today;
+        trip.ReturningFrom.Date = DateTime.Today.AddDays(1);
+    }
+
+    protected override void LoadModel(object savedModel)
+    {
+        trip = (Trip)savedModel;
+    }
+
+    protected override object SaveModel()
+    {
+        return trip;
+    }
+
+    protected override void InitializeDataBindings()
+    {
+        BindingManager.AddBinding("tripMode.Value", "Trip.Mode");
+        BindingManager.AddBinding("leavingFromAirportCode.SelectedValue", "Trip.StartingFrom.AirportCode");
+        BindingManager.AddBinding("goingToAirportCode.SelectedValue", "Trip.ReturningFrom.AirportCode");
+        BindingManager.AddBinding("leavingFromDate.SelectedDate", "Trip.StartingFrom.Date");
+        BindingManager.AddBinding("returningOnDate.SelectedDate", "Trip.ReturningFrom.Date");
+    }
+
+    #endregion
+
+    #region Page Lifecycle Methods
+
+    protected override void OnInitializeControls(EventArgs e)
+    {
+        if (!IsPostBack)
+        {
+            BindAirportDropdowns();
+        }
+    }
+
+    protected override void OnUserCultureChanged(EventArgs e)
+    {
+        BindAirportDropdowns();
+    }
+
+    private void BindAirportDropdowns()
+    {
+        ArrayList airportList = new ArrayList();
+        airportList.Add(new Airport(0, string.Empty, string.Empty, "-- " + GetMessage("selectAirport") + " --"));
+        airportList.AddRange(airportDao.GetAllAirports());
+
+        leavingFromAirportCode.DataSource = airportList;
+        leavingFromAirportCode.DataTextField = "Description";
+        leavingFromAirportCode.DataValueField = "Code";
+        leavingFromAirportCode.DataBind();
+
+        goingToAirportCode.DataSource = airportList;
+        goingToAirportCode.DataTextField = "Description";
+        goingToAirportCode.DataValueField = "Code";
+        goingToAirportCode.DataBind();
+    }
+
+    #endregion
+
+    #region Controller Methods
+
+    protected void SearchForFlights(object sender, EventArgs e)
+    {
+        if (Validate(trip, tripValidator))
+        {
+            FlightSuggestions suggestions = this.bookingAgent.SuggestFlights(Trip);
+            if (suggestions.HasOutboundFlights)
+            {
+                Session[Constants.SuggestedFlightsKey] = suggestions;
+                SetResult(DisplaySuggestedFlights);
+            }
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/Web.config b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/Web.config
new file mode 100644
index 00000000..6bfd1343
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/BookTrip/Web.config
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<spring>
+    
+		<context>
+			<resource uri="config://spring/objects" />
+		</context>
+
+		<objects xmlns="http://www.springframework.net" xmlns:v="http://www.springframework.net/validation">
+
+      <object type="TripForm.aspx" parent="standardPage">
+        <property name="BookingAgent" ref="bookingAgent" />
+        <property name="AirportDao" ref="airportDao" />
+        <property name="TripValidator" ref="tripValidator" />
+        <property name="Results">
+          <dictionary>
+            <entry key="displaySuggestedFlights" value="redirect:SuggestedFlights.aspx" />
+          </dictionary>
+        </property>
+      </object>
+
+      <object type="SuggestedFlights.aspx" parent="standardPage">
+        <property name="BookingAgent" ref="bookingAgent" />
+        <property name="Results">
+          <dictionary>
+            <entry key="reservationConfirmed" value="redirect:ReservationConfirmationPage.aspx" />
+          </dictionary>
+        </property>
+      </object>
+
+      <object type="ReservationConfirmationPage.aspx" parent="standardPage" />
+
+		</objects>
+	</spring>
+</configuration>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/CSS/default.css b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/CSS/default.css
new file mode 100644
index 00000000..efd0119b
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/CSS/default.css
@@ -0,0 +1,348 @@
+body
+{
+	padding: 0;
+	margin: 0;
+	width: 720px;
+	text-align: center;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+}
+
+body, table
+{
+	font-size: 12px;
+}
+
+form
+{
+	margin: 0;
+}
+
+td.formLabel
+{
+	font-weight: bold;
+	text-align: right;
+	vertical-align: baseline;
+	padding: 0 4px 0 16px;
+}
+
+.validationError
+{
+	font-size: 80%;
+	color: #c50;
+}
+
+input, select
+{
+	font-family: Tahoma, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+}
+
+/* main container box */
+#container
+{
+	width: 800px;
+	position: relative;
+	padding: 0 15px 15px;
+	margin: 5 auto;
+	text-align: left;
+}
+
+div#logo
+{
+	width: 794px;
+	height: 119px;
+}
+
+div#navigation
+{
+	width: 720px;
+	height: 20px;
+	background: #E2F3B8;
+	text-align: right;
+}
+
+#container div#content
+{
+	position: relative;
+	width: 800px;
+	height: 100%;
+	overflow: hidden;
+	background-color: #ecf1f3;
+	padding: 0;
+	margin: 0;
+}
+
+.panel11, .panel12, .panel13, .panel21, .panel23, .panel31, .panel32, .panel33
+{
+	position: absolute;
+	overflow: hidden;
+	padding: 0;
+	margin: 0;
+}
+
+.panel11
+{
+	top: 0;
+	left: 0;
+	width: 16px;
+	height: 16px;
+	z-index: 2;
+}
+.panel12
+{
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 16px;
+	z-index: 1;
+}
+.panel13
+{
+	top: 0;
+	right: 0;
+	width: 16px;
+	height: 16px;
+	z-index: 2;
+}
+
+.panel21
+{
+	top: 0;
+	left: 0;
+	width: 16px;
+	height: 100%;
+	z-index: 1;
+}
+.panel23
+{
+	top: 0;
+	right: 0;
+	width: 16px;
+	height: 100%;
+	z-index: 1;
+}
+
+.panel31
+{
+	bottom: -1px;
+	left: 0;
+	width: 16px;
+	height: 16px;
+	z-index: 2;
+}
+.panel32
+{
+	bottom: -1px;
+	left: 0;
+	width: 100%;
+	height: 16px;
+	z-index: 1;
+}
+.panel33
+{
+	bottom: -1px;
+	right: 0;
+	width: 16px;
+	height: 16px;
+	z-index: 2;
+}
+
+.panelContent
+{
+	position: relative;
+	overflow: hidden;
+	padding: 18px;
+	margin: 0;
+	z-index: 3;
+}
+
+div#insert
+{
+	width: 120;
+	float: right;
+	text-align: right;
+}
+
+.buttonBar
+{
+	height: 1.5em;
+	text-align: right;
+}
+
+#copyright
+{
+	width: 800px;
+	text-align: center;
+	font: bold 90% Tahoma, sans-serif;
+	color: div#336633;
+}
+
+#copyright img.divider
+{
+	margin: 4px 0;
+}
+
+#copyright a:link, #copyright a:visited, #copyright a:active
+{
+	text-decoration: none;
+	color: #c50;
+}
+
+#copyright a:hover
+{
+	color: #f60;
+	text-decoration: underline;
+}
+
+img.imageButton
+{
+	padding-left: 4px;
+	padding-right: 4px;
+}
+
+.readOnly
+{
+	color: #c0c0c0;
+}
+
+.error
+{
+	color: red;
+	font-weight: bold;
+	font-family: Arial, sans-serif;
+	font-size: 90%;
+}
+
+/* Table */
+.suggestedTable
+{
+	border: 1px solid #006;
+}
+.suggestedTableCaption th
+{
+	padding: 4px 2px;
+	margin: 4px;
+	line-height: 18px;
+	vertical-align: middle;
+	background-color: #006;
+	color: #fff;
+	font-size: 120%;
+}
+.suggestedTableColnames th
+{
+	text-align: left;
+	line-height: 16px;
+	padding: 4px 2px;
+	background-color: #159;
+	color: #fff;
+}
+.suggestedTableRow td
+{
+	text-align: left;
+	border-bottom: 1px solid #006;
+	padding: 4px 2px;
+}
+
+
+/* Text styles */
+content a
+{
+	text-decoration: none;
+	font-weight: bold;
+	color: #000;
+}
+content a:link
+{
+}
+content a:visited
+{
+}
+content a:active
+{
+}
+content a:hover
+{
+	text-decoration: underline;
+}
+
+content h1
+{
+	font-size: 2.0em;
+	font-weight: normal;
+	margin-top: 0em;
+	margin-bottom: 0em;
+}
+
+content h2
+{
+	font-size: 1.7em;
+	margin: 1.2em 0em 1.2em 0em;
+	font-weight: normal;
+}
+
+content h3
+{
+	font-size: 1.4em;
+	margin: 1.2em 0em 1.2em 0em;
+	font-weight: normal;
+}
+
+content h4
+{
+	font-size: 1.2em;
+	margin: 1.2em 0em 1.2em 0em;
+	font-weight: bold;
+}
+
+content h5
+{
+	font-size: 1.0em;
+	margin: 1.2em 0em 1.2em 0em;
+	font-weight: bold;
+}
+
+content h6
+{
+	font-size: 0.8em;
+	margin: 1.2em 0em 1.2em 0em;
+	font-weight: bold;
+}
+
+content img
+{
+	border: 0;
+}
+
+content ol, content ul, content li
+{
+	font-size: 1.0em;
+	line-height: 1.8em;
+	margin-top: 0.2em;
+	margin-bottom: 0.1em;
+}
+
+content p
+{
+	font-size: 1.0em;
+	line-height: 1.8em;
+	margin: 1.2em 0em 1.2em 0em;
+}
+
+content li > p
+{
+	margin-top: 0.2em;
+}
+
+content pre
+{
+	font-family: monospace;
+	font-size: 1.0em;
+}
+
+content strong, content b
+{
+	font-weight: bold;
+}
+
+
+
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Home.aspx b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Home.aspx
new file mode 100644
index 00000000..03109cb9
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Home.aspx
@@ -0,0 +1,22 @@
+<%@ Page language="c#" Inherits="HomePage" CodeFile="Home.aspx.cs" %>
+
+<asp:Content id="body" contentPlaceholderId="body" runat="server">
+	<p>
+		SpringAir models a flight reservation system.
+	    <br />
+		Using SpringAir, you can browse flights, <a href="BookTrip/TripForm.aspx">book a trip</a> and use <a href="../BookingAgentWebService.asmx">Booking Agent Web Service</a>.
+	</p>
+	<p>
+		SpringAir demonstrates the following features of Spring.NET's web support...
+	</p>
+	<ul>
+		<li>Spring.NET IoC container configuration</li>
+		<li>Dependency Injection as applied to ASP.NET pages</li>
+		<li>Master Page support</li>
+		<li>Web Service support</li>
+		<li>Bi-directional databinding</li>
+		<li>Declarative validation of domain objects</li>
+		<li>Internationalization</li>
+		<li>Result mapping to better encapsulate page navigation flows</li>
+	</ul>
+</asp:Content>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Home.aspx.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Home.aspx.cs
new file mode 100644
index 00000000..6903c6aa
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Home.aspx.cs
@@ -0,0 +1,61 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Common.Logging;
+using Spring.Web.UI;
+
+#endregion
+
+/// <summary>
+/// The SpringAir home page.
+/// </summary>
+/// <author>Rick Evans</author>
+/// <version>$Id: Home.aspx.cs,v 1.2 2006/11/15 20:30:52 aseovic Exp $</version>
+public partial class HomePage : Page
+{
+	private static readonly ILog logger = LogManager.GetLogger(typeof(HomePage));
+
+	private void Page_Load(object sender, EventArgs e)
+	{
+		if (logger.IsDebugEnabled)
+		{
+			logger.Debug(string.Format(this.CultureResolver.ResolveCulture(),
+			                           "The [{0}] page is being loaded...", GetType().Name));
+		}
+	}
+
+	#region Web Form Designer generated code
+
+	protected override void OnInit(EventArgs e)
+	{
+		InitializeComponent();
+		base.OnInit(e);
+	}
+
+	private void InitializeComponent()
+	{
+		this.Load += new EventHandler(this.Page_Load);
+	}
+
+	#endregion
+}
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/Thumbs.db b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/Thumbs.db
new file mode 100644
index 00000000..715019bc
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/Thumbs.db differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/calendar-1.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/calendar-1.gif
new file mode 100644
index 00000000..6774ca5c
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/calendar-1.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/calendar-2.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/calendar-2.gif
new file mode 100644
index 00000000..9d5d666d
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/calendar-2.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/en/Thumbs.db b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/en/Thumbs.db
new file mode 100644
index 00000000..90ed854a
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/en/Thumbs.db differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/en/spring-air-logo.jpg b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/en/spring-air-logo.jpg
new file mode 100644
index 00000000..21e6c575
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/en/spring-air-logo.jpg differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/error.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/error.gif
new file mode 100644
index 00000000..2fccc977
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/error.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/line.jpg b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/line.jpg
new file mode 100644
index 00000000..fedb4290
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/line.jpg differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-bottom-left.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-bottom-left.gif
new file mode 100644
index 00000000..1323ec04
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-bottom-left.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-bottom-middle.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-bottom-middle.gif
new file mode 100644
index 00000000..38aa28ea
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-bottom-middle.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-bottom-right.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-bottom-right.gif
new file mode 100644
index 00000000..9815bced
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-bottom-right.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-left-middle.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-left-middle.gif
new file mode 100644
index 00000000..76133d5e
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-left-middle.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-right-middle.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-right-middle.gif
new file mode 100644
index 00000000..9b1140ef
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-right-middle.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-top-left.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-top-left.gif
new file mode 100644
index 00000000..fade635c
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-top-left.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-top-middle.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-top-middle.gif
new file mode 100644
index 00000000..f982015e
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-top-middle.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-top-right.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-top-right.gif
new file mode 100644
index 00000000..bafcbecb
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/panel-top-right.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/spring-air-logo.jpg b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/spring-air-logo.jpg
new file mode 100644
index 00000000..21e6c575
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/spring-air-logo.jpg differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-Cyrl-CS/Thumbs.db b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-Cyrl-CS/Thumbs.db
new file mode 100644
index 00000000..6b490432
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-Cyrl-CS/Thumbs.db differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-Cyrl-CS/spring-air-logo.jpg b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-Cyrl-CS/spring-air-logo.jpg
new file mode 100644
index 00000000..bfeb3609
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-Cyrl-CS/spring-air-logo.jpg differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-Latn-CS/Thumbs.db b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-Latn-CS/Thumbs.db
new file mode 100644
index 00000000..5ac9d1c9
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-Latn-CS/Thumbs.db differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-Latn-CS/spring-air-logo.jpg b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-Latn-CS/spring-air-logo.jpg
new file mode 100644
index 00000000..36c8b822
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-Latn-CS/spring-air-logo.jpg differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-SP-Cyrl/Thumbs.db b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-SP-Cyrl/Thumbs.db
new file mode 100644
index 00000000..0ce7072c
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-SP-Cyrl/Thumbs.db differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-SP-Cyrl/spring-air-logo.jpg b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-SP-Cyrl/spring-air-logo.jpg
new file mode 100644
index 00000000..bfeb3609
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-SP-Cyrl/spring-air-logo.jpg differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-SP-Latn/Thumbs.db b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-SP-Latn/Thumbs.db
new file mode 100644
index 00000000..b934bdcf
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-SP-Latn/Thumbs.db differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-SP-Latn/spring-air-logo.jpg b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-SP-Latn/spring-air-logo.jpg
new file mode 100644
index 00000000..36c8b822
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/sr-SP-Latn/spring-air-logo.jpg differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/validation-error.gif b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/validation-error.gif
new file mode 100644
index 00000000..0bf0858b
Binary files /dev/null and b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Images/validation-error.gif differ
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/StandardTemplate.master b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/StandardTemplate.master
new file mode 100644
index 00000000..de611850
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/StandardTemplate.master
@@ -0,0 +1,51 @@
+<%@ Master Language="C#" AutoEventWireup="false" CodeFile="StandardTemplate.master.cs" Inherits="StandardTemplate" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+       
+<html>
+  <spring:Head ID="Head2" runat="server">
+    <title>
+      <spring:ContentPlaceHolder id="title" runat="server">
+            <%= GetMessage("default.title") %>  
+      </spring:ContentPlaceHolder>
+    </title>
+    <link href="<%= Page.CssRoot %>/default.css" type="text/css" rel="stylesheet">
+    <spring:ContentPlaceHolder id="head" runat="server"></spring:ContentPlaceHolder>
+  </spring:Head>
+  <body>
+    <form id="form" method="post" runat="server">
+      <div id="container">
+        <div id="logo">
+          <spring:LocalizedImage id="logoImage" imageName="spring-air-logo.jpg" borderWidth="0" runat="server" />
+        </div>
+        <div id="content">
+          <div class="panel11" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-top-left.gif)"></div>
+          <div class="panel12" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-top-middle.gif)"></div>
+          <div class="panel13" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-top-right.gif)"></div>
+          <div class="panel21" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-left-middle.gif)"></div>
+          <div class="panel23" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-right-middle.gif)"></div>
+          <div class="panel31" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-bottom-left.gif)"></div>
+          <div class="panel32" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-bottom-middle.gif)"></div>
+          <div class="panel33" style="BACKGROUND: url(<%= Page.ImagesRoot %>/panel-bottom-right.gif)"></div>
+          <div class="panelContent">
+            <asp:ContentPlaceHolder id="body" runat="server" />
+            <br/>
+            <br/>
+          </div>
+        </div>
+        <div id="copyright">
+          <img class="divider" src="<%= Page.ImagesRoot %>/line.jpg" alt="" width="500" height="1"/>
+          <br/>
+          © Copyright 2005-2006, <a href="http://www.springframework.net/" title="Spring.NET Framework">
+            Spring.NET</a>, under the terms of the Apache 2.0 software license
+          license.
+          <br/>
+          
+          <asp:LinkButton ID="english" Runat="server" CommandArgument="en-US" CausesValidation="False">English</asp:LinkButton>&nbsp;
+          <asp:LinkButton ID="serbianLatin" Runat="server" CommandArgument="sr-SP-Latn" CausesValidation="False">Srpski</asp:LinkButton>&nbsp;
+          <asp:LinkButton ID="serbianCyrillic" Runat="server" CommandArgument="sr-SP-Cyrl" CausesValidation="False">Срп�ки</asp:LinkButton>
+        </div>
+      </div>
+    </form>
+  </body>
+</html>
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/StandardTemplate.master.cs b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/StandardTemplate.master.cs
new file mode 100644
index 00000000..412e9b57
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/StandardTemplate.master.cs
@@ -0,0 +1,113 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Web.UI.WebControls;
+
+using Spring.Web.UI;
+
+#endregion
+
+/// <summary>
+/// SpringAir2 master page.
+/// </summary>
+/// <author>Aleksandar Seovic</author>
+/// <version>$Id: StandardTemplate.master.cs,v 1.2 2007/05/28 19:07:12 markpollack Exp $</version>
+public partial class StandardTemplate : MasterPage
+{
+    private static bool lookupInitialized = false;
+    private static bool needsTranslaction = false;
+
+    private void SetLanguage(object sender, CommandEventArgs e)
+    {
+        string cultureString = e.CommandArgument as string;
+        if (cultureString != null)
+        {
+            UserCulture = new CultureInfo(TranslateCultureIfNecessary(cultureString));
+        }
+    }
+
+    /// <summary>
+    /// Translates the culture if necessary due to changes in Serbian culture for recent
+    /// .NET 2.0 releases.
+    /// </summary>
+    /// <remarks>If 'sr-Latn-CS' is a valid culture, then translate the following;
+    /// sr-SP-Latn->sr-Latn-CS and sr-SP-Cyrl->sr-Cyrl-CS.  See 
+    /// http://blogs.msdn.com/kierans/archive/2006/08/02/687267.aspx
+    /// and http://blogs.msdn.com/shawnste/archive/2006/11/14/problems-compiling-resources-in-net-2-0-apps-after-updates.aspx 
+    /// for additional information.</remarks>
+    /// <param name="cultureString">The culture string.</param>
+    /// <returns>Translated culture string if necessary.</returns>
+    private string TranslateCultureIfNecessary(string cultureString)
+    {
+        if (!lookupInitialized)
+        {
+            lock(typeof(StandardTemplate))
+            {
+                lookupInitialized = true;
+                //TODO maybe check .NET 2.0 build # instead.
+                foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.AllCultures))
+                {
+                    if (ci.Name.Equals("sr-Latn-CS"))
+                    {
+                        needsTranslaction = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (needsTranslaction)
+        {
+            if (cultureString.Equals("sr-SP-Latn"))
+            {
+                return "sr-Latn-CS";
+            }
+            else if (cultureString.Equals("sr-SP-Cyrl"))
+            {
+                return "sr-Cyrl-CS";
+            }
+        }
+
+        return cultureString;
+        
+
+    }
+
+    #region Web Form Designer generated code
+
+    protected override void OnInit(EventArgs e)
+    {
+        InitializeComponent();
+        base.OnInit(e);
+    }
+
+    private void InitializeComponent()
+    {
+        this.english.Command += new CommandEventHandler(this.SetLanguage);
+        this.serbianLatin.Command += new CommandEventHandler(this.SetLanguage);
+        this.serbianCyrillic.Command += new CommandEventHandler(this.SetLanguage);
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Web.config b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Web.config
new file mode 100644
index 00000000..5152fe1a
--- /dev/null
+++ b/examples/Spring/SpringAir/src/SpringAir.Web.2005/Web/Web.config
@@ -0,0 +1,12 @@
+<configuration>
+  <spring>
+    <context>
+      <resource uri="config://spring/objects"/>
+    </context>
+    <objects xmlns="http://www.springframework.net">
+
+      <object type="Home.aspx" parent="standardPage"/>
+
+    </objects>
+  </spring>
+</configuration>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/AssemblyInfo.cs b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..0c7fb32a
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/AssemblyInfo.cs
@@ -0,0 +1,27 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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;
+using System.Runtime.InteropServices;
+
+[assembly : ComVisible(false)]
+[assembly : AssemblyTitle("SpringAir core functionality tests")]
+[assembly : AssemblyDescription("Tests for the core functionality for SpringAir")]
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/FlightCollectionTests.cs b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/FlightCollectionTests.cs
new file mode 100644
index 00000000..7faebe12
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/FlightCollectionTests.cs
@@ -0,0 +1,63 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+	/// <summary>
+	/// Unit tests for the FlightCollection class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: FlightCollectionTests.cs,v 1.3 2006/01/14 08:37:45 aseovic Exp $</version>
+	[TestFixture]
+	public sealed class FlightCollectionTests
+	{
+
+		[Test]
+		public void TypeSafeAdd()
+		{
+			FlightCollection flights = new FlightCollection();
+			flights.Add(new Flight());
+			flights.Add(new Flight());
+            Assert.AreEqual(2, flights.Count);
+
+		}
+
+        [Test]
+        public void TypeSafeIndexer()
+        {
+            FlightCollection flights = new FlightCollection();
+            Flight firstFlight = new Flight();
+            firstFlight.FlightNumber = "1";
+            flights.Add(firstFlight);
+            flights.Add(new Flight());
+            Flight f1 = flights[0];
+            Assert.IsNotNull(f1);
+            Assert.AreEqual("1", f1.FlightNumber);
+        }
+
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/FlightSuggestionsTests.cs b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/FlightSuggestionsTests.cs
new file mode 100644
index 00000000..07229773
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/FlightSuggestionsTests.cs
@@ -0,0 +1,58 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Xml.Serialization;
+using NUnit.Framework;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+    /// <summary>
+    /// Unit tests for the FlightSuggestions class.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: FlightSuggestionsTests.cs,v 1.1 2006/01/08 00:38:38 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class FlightSuggestionsTests
+    {
+		[Test]
+		public void XmlSerialisationTest()
+		{
+			FlightSuggestions suggestionsBefore = new FlightSuggestions();
+			suggestionsBefore.OutboundFlights.Add(new Flight());
+			suggestionsBefore.OutboundFlights.Add(new Flight());
+			suggestionsBefore.ReturnFlights.Add(new Flight());
+
+			XmlSerializer s = new XmlSerializer(typeof(FlightSuggestions));
+			StringWriter sw = new StringWriter();
+			s.Serialize(sw, suggestionsBefore);
+			StringReader sr = new StringReader (sw.ToString());
+			FlightSuggestions suggestionsAfter = (FlightSuggestions) s.Deserialize (sr);
+
+			Assert.AreEqual(2, suggestionsAfter.OutboundFlights.Count);
+			Assert.AreEqual(1, suggestionsAfter.ReturnFlights.Count);
+		}
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/FlightTests.cs b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/FlightTests.cs
new file mode 100644
index 00000000..83fcf1e9
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/FlightTests.cs
@@ -0,0 +1,57 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Xml.Serialization;
+using NUnit.Framework;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+    /// <summary>
+    /// Unit tests for the Flight class.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: FlightTests.cs,v 1.1 2006/01/08 00:39:07 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class FlightTests
+    {
+		[Test]
+		public void XmlSerialisationTest()
+		{
+			Flight flightBefore = new Flight(1, "UA 0123", new Airport(), new Airport(), new Aircraft(), DateTime.MinValue, new Cabin[1] {new Cabin(CabinClass.Business, 2, 8, "A")});
+
+			XmlSerializer s = new XmlSerializer(typeof(Flight));
+			StringWriter sw = new StringWriter();
+			s.Serialize(sw, flightBefore);
+			StringReader sr = new StringReader (sw.ToString());
+			Flight flightAfter = (Flight) s.Deserialize (sr);
+
+			Assert.AreEqual(flightAfter.Id, 1);
+			Assert.AreEqual(flightAfter.FlightNumber, "UA 0123");
+			Assert.AreEqual(flightAfter.DepartureTime, DateTime.MinValue);
+			Assert.AreEqual(flightBefore.SeatPlan, flightAfter.SeatPlan);
+		}
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/ReservationConfirmationTests.cs b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/ReservationConfirmationTests.cs
new file mode 100644
index 00000000..7702b6b2
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/ReservationConfirmationTests.cs
@@ -0,0 +1,67 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+    /// <summary>
+    /// Unit tests for the ReservationConfirmation class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ReservationConfirmationTests.cs,v 1.7 2005/12/13 00:48:00 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class ReservationConfirmationTests
+    {
+        private const string reservationConfirmationNumber = "JX726617H";
+
+        [Test]
+        public void EqualsSunnyDay()
+        {
+            ReservationConfirmation lhs = new ReservationConfirmation(
+                reservationConfirmationNumber, new Reservation(null, new Itinerary(1, 1000.0m, null)));
+            ReservationConfirmation rhs = new ReservationConfirmation(
+                reservationConfirmationNumber, new Reservation(null, new Itinerary(1, 1000.0m, null)));
+            Assert.IsTrue(lhs.Equals(rhs));
+        }
+
+        [Test]
+        public void EqualsNull()
+        {
+            ReservationConfirmation lhs = new ReservationConfirmation(
+                reservationConfirmationNumber, new Reservation(null, new Itinerary(1, 1000.0m, null)));
+            Assert.IsFalse(lhs.Equals(null));
+        }
+
+        [Test]
+        public void EqualsAnotherTypeOfObject()
+        {
+            ReservationConfirmation lhs = new ReservationConfirmation(
+                reservationConfirmationNumber, new Reservation(null, new Itinerary(1, 1000.0m, null)));
+            Assert.IsFalse(lhs.Equals(12));
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/TimeRangeTests.cs b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/TimeRangeTests.cs
new file mode 100644
index 00000000..e83a2424
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Domain/TimeRangeTests.cs
@@ -0,0 +1,90 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using NUnit.Framework;
+
+#endregion
+
+namespace SpringAir.Domain
+{
+	/// <summary>
+	/// Unit tests for the TimeRange class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: TimeRangeTests.cs,v 1.1 2005/09/27 21:12:31 springboy Exp $</version>
+	[TestFixture]
+    public sealed class TimeRangeTests
+    {
+        [Test]
+        public void DefaultTypeConverterIsSet()
+        {
+            TypeConverter vrtr = TypeDescriptor.GetConverter(typeof(TimeRange));
+            Assert.IsNotNull(vrtr, "Must not be null, default converter must be returned.");
+            Assert.AreEqual(typeof(TimeRange.TimeRangeTypeConverter), vrtr.GetType(), "Wrong type of default converter returned.");
+        }
+	}
+
+    /// <summary>
+    /// Unit tests for the TimeRange.TimeRangeTypeConverter class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    [TestFixture]
+    public sealed class TimeRangeTimeRangeTypeConverterTests
+    {
+        [Test]
+        public void ConvertFromSunnyDay()
+        {
+            TimeRange expectedRange = new TimeRange(12, 9);
+            TimeRange.TimeRangeTypeConverter vrtr = new TimeRange.TimeRangeTypeConverter();
+            TimeRange range = (TimeRange) vrtr.ConvertFrom("[12-9]");
+            Assert.AreEqual(expectedRange, range);
+        }
+
+        [Test]
+        public void ConvertFromSunnyDayWithLotsOfExtraneousWhitespace()
+        {
+            TimeRange expectedRange = new TimeRange(12, 9);
+            TimeRange.TimeRangeTypeConverter vrtr = new TimeRange.TimeRangeTypeConverter();
+            TimeRange range = (TimeRange) vrtr.ConvertFrom("[ 12 - 9 ]");
+            Assert.AreEqual(expectedRange, range);
+        }
+
+        [Test]
+        [ExpectedException(typeof(FormatException))]
+        public void ConvertFromWithOutOfShortRangeException()
+        {
+            TimeRange.TimeRangeTypeConverter vrtr = new TimeRange.TimeRangeTypeConverter();
+            vrtr.ConvertFrom("[ 1287876 - 9 ]");
+        }
+
+        [Test]
+        public void ConvertToSunnyDay()
+        {
+            string expectedRange = "[12 - 9]";
+            TimeRange.TimeRangeTypeConverter vrtr = new TimeRange.TimeRangeTypeConverter();
+            string range = (string) vrtr.ConvertTo(new TimeRange(12, 9), typeof(string));
+            Assert.AreEqual(expectedRange, range);
+        }
+    }
+}
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Service/BookingAgentIntegrationTests.cs b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Service/BookingAgentIntegrationTests.cs
new file mode 100644
index 00000000..03a62677
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Service/BookingAgentIntegrationTests.cs
@@ -0,0 +1,90 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace SpringAir.Service
+{
+	/// <summary>
+	/// Integration tests for the IBookingAgent service.
+	/// </summary>
+	/// <author>Keith Donald</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: BookingAgentIntegrationTests.cs,v 1.1 2005/07/26 20:10:23 springboy Exp $</version>
+	[TestFixture]
+    public sealed class BookingAgentIntegrationTests
+    {
+        #region SetUp
+        
+        /// <summary>
+        /// The setup logic executed before the execution of this test fixture.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void FixtureSetUp()
+        {
+        }
+
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public void SetUp()
+        {
+        }
+        
+        #endregion
+
+        #region TearDown
+        
+        /// <summary>
+        /// The tear down logic executed after the execution of each individual test.
+        /// </summary>
+        [TearDown]
+        public void TearDown()
+        {
+        }
+
+        /// <summary>
+        /// The tear down logic executed after the entire test fixture has executed.
+        /// </summary>
+        [TestFixtureTearDown]
+        public void FixtureTearDown()
+        {
+        }
+        
+        #endregion
+
+        [Test]
+        public void SuggestItinerariesSuccess() {
+
+		}
+
+		[Test]
+		public void SuggestItinerariesWhenNoneExist() 
+		{
+
+		}
+	}
+}
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Service/DefaultBookingAgentIntegrationTests.cs b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Service/DefaultBookingAgentIntegrationTests.cs
new file mode 100644
index 00000000..b19b0d67
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/Service/DefaultBookingAgentIntegrationTests.cs
@@ -0,0 +1,39 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace SpringAir.Service
+{
+    /// <summary>
+    /// Integration tests for the DefaultBookingAgentTests class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: DefaultBookingAgentIntegrationTests.cs,v 1.1 2005/10/02 22:50:38 springboy Exp $</version>
+    [TestFixture]
+    public sealed class DefaultBookingAgentTests
+    {
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2003.csproj b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2003.csproj
new file mode 100644
index 00000000..33189840
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2003.csproj
@@ -0,0 +1,149 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "SpringAir.Core.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "SpringAir"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "DotNetMock"
+                    AssemblyName = "DotNetMock"
+                    HintPath = "..\..\..\..\..\lib\Net\1.1\DotNetMock.dll"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\..\..\lib\Net\1.1\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "SpringAir.Core.2003"
+                    Project = "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "SpringAir.Core.Tests.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Domain\FlightCollectionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\FlightSuggestionsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\FlightTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\ReservationConfirmationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Domain\TimeRangeTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Service\BookingAgentIntegrationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Service\DefaultBookingAgentIntegrationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2005.csproj b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2005.csproj
new file mode 100644
index 00000000..2b877fe7
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.2005.csproj
@@ -0,0 +1,130 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BB9AFE5E-7785-43AC-86ED-CF0A073F006E}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>SpringAir.Core.Tests</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>SpringAir</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DotNetMock, Version=0.7.4.0, Culture=neutral, PublicKeyToken=805ea88df19095f6">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\Net\2.0\DotNetMock.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\FlightCollectionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\FlightSuggestionsTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\FlightTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\ReservationConfirmationTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Domain\TimeRangeTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Service\BookingAgentIntegrationTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Service\DefaultBookingAgentIntegrationTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <None Include="SpringAir.Core.Tests.build" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\SpringAir.Core\SpringAir.Core.2005.csproj">
+      <Project>{5E3427D8-62FC-483F-A86B-B44A79A46BCC}</Project>
+      <Name>SpringAir.Core.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.build b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.build
new file mode 100644
index 00000000..68468eac
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Core.Tests/SpringAir.Core.Tests.build
@@ -0,0 +1,33 @@
+<?xml version="1.0" ?>
+<project name="SpringAir.Core.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+	<!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+	<target name="build">
+		<csc target="library" define="${current.build.defines.csc}" warnaserror="true"
+			debug="${build.debug}" output="${current.bin.dir}/${project::get-name()}.dll">
+			<nowarn>
+				<warning number="168" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+			</sources>
+			<references basedir="${current.bin.dir}">
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+			</references>
+		</csc>
+	</target>
+	<target name="test" depends="build">
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
+			      appconfig="${project::get-name()}.dll.config" />
+		</nunit2outproc>
+	</target>
+</project>
diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/AssemblyInfo.cs b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..c7884401
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/AssemblyInfo.cs
@@ -0,0 +1,27 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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;
+using System.Runtime.InteropServices;
+
+[assembly : ComVisible(false)]
+[assembly: AssemblyTitle("SpringAir ADO.NET DAO tests")]
+[assembly: AssemblyDescription("ADO.NET DAO tests for SpringAir")]
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/Data/Ado/AircraftDaoTests.cs b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/Data/Ado/AircraftDaoTests.cs
new file mode 100644
index 00000000..5f74a63e
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/Data/Ado/AircraftDaoTests.cs
@@ -0,0 +1,85 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+using Spring.Data.Common;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Data.Ado
+{
+    /// <summary>
+    /// Integration tests for the ADO.NET-backed AircraftDao class.
+    /// </summary>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: AircraftDaoTests.cs,v 1.3 2006/11/28 06:42:27 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class AircraftDaoTests
+    {
+        private AircraftDao dao;
+
+        [SetUp]
+        public void SetUp()
+        {
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SqlServer-1.1");
+            dbProvider.ConnectionString =
+                "Server=(local);Integrated Security=no;User ID=springqa;PWD=springqa;initial catalog=SpringAir;";
+            dao = new AircraftDao();
+            dao.DbProvider = dbProvider;
+            
+            /*
+			ReflectiveDbConnectionFactory connectionfactory = new ReflectiveDbConnectionFactory();
+			connectionfactory.ConnectionType = typeof (SqlConnection);
+			connectionfactory.ConnectionString =
+				"Server=(local)\\Spring;Integrated Security=no;User ID=sa;PWD=spring;initial catalog=SpringAir;";
+
+            dao = new AircraftDao();
+			dao.ConnectionFactory = connectionfactory;
+			dao.CommandType = typeof (SqlCommand);
+            dao.AircraftMapper = new AircraftMapper();
+             */
+        }
+
+        [Test]
+        public void GetAllAircraftSunnyDay()
+        {
+            IList aircraft = dao.GetAllAircraft();
+            Assert.IsNotNull(aircraft, "Must never return a null aircraft list.");
+            Assert.AreEqual(5, aircraft.Count);
+            foreach (Aircraft plane in aircraft)
+            {
+                Console.Out.WriteLine(plane);
+            }
+        }
+
+        [Test]
+        public void GetAircraftSunnyDay()
+        {
+            Aircraft plane = dao.GetAircraft(0);
+            Assert.IsNotNull(plane, "Failed to retrive an Aircraft that is definitely in the database.");
+            Console.Out.WriteLine(plane);
+        }
+    }
+}
diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/Data/Ado/AirportDaoTests.cs b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/Data/Ado/AirportDaoTests.cs
new file mode 100644
index 00000000..18530137
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/Data/Ado/AirportDaoTests.cs
@@ -0,0 +1,93 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+using NUnit.Framework;
+using Spring.Data.Common;
+using SpringAir.Domain;
+
+#endregion
+
+namespace SpringAir.Data.Ado
+{
+    /// <summary>
+    /// Integration tests for the ADO.NET-backed AirportDao class.
+    /// </summary>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: AirportDaoTests.cs,v 1.4 2006/11/28 06:42:27 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class AirportDaoTests
+    {
+        private AirportDao dao;
+
+        [SetUp]
+        public void SetUp()
+        {
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SqlServer-1.1");
+            dbProvider.ConnectionString =
+                "Server=(local);Integrated Security=no;User ID=springqa;PWD=springqa;initial catalog=SpringAir;";
+           
+            dao = new AirportDao();
+            dao.DbProvider = dbProvider;
+            /*
+			ReflectiveDbConnectionFactory connectionfactory = new ReflectiveDbConnectionFactory();
+			connectionfactory.ConnectionType = typeof (SqlConnection);
+			connectionfactory.ConnectionString =
+				"Server=(local)\\Spring;Integrated Security=no;User ID=sa;PWD=spring;initial catalog=SpringAir;";
+
+            dao = new AirportDao();
+            dao.CommandType = typeof (SqlCommand);
+			dao.ConnectionFactory = connectionfactory;
+            dao.AirportMapper = new AirportMapper();
+             */
+        }
+
+        [Test]
+        public void GetAllAirports()
+        {
+            IList airports = dao.GetAllAirports();
+            Assert.IsNotNull(airports, "Must never return a null airport list.");
+            Assert.AreEqual(4, airports.Count);
+        }
+
+        [Test]
+        public void GetAirportById()
+        {
+            Airport airport = dao.GetAirport(0);
+            Assert.IsNotNull(airport, "Failed to retrive an Airport that is definitely in the database.");
+        }
+
+        [Test]
+        public void GetAirportByCode()
+        {
+            Airport airport = dao.GetAirport("SFO");
+            Assert.IsNotNull(airport, "Failed to retrive an Airport that is definitely in the database.");
+        }
+
+        [Test]
+        [ExpectedException(typeof(Spring.Dao.EmptyResultDataAccessException))]
+        public void GetAirportByCodeNonExistent()
+        {
+            Airport airport = dao.GetAirport("FOO");
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/Data/Ado/FlightDaoTests.cs b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/Data/Ado/FlightDaoTests.cs
new file mode 100644
index 00000000..d4bf0c7d
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/Data/Ado/FlightDaoTests.cs
@@ -0,0 +1,45 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace SpringAir.Data.Ado
+{
+	/// <summary>
+	/// Integration tests for the ADO.NET-backed FlightDao class.
+	/// </summary>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: FlightDaoTests.cs,v 1.1 2005/10/30 09:06:40 springboy Exp $</version>
+	[TestFixture]
+	public sealed class FlightDaoTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void CtorWithNullAircraftDao()
+		{
+			new FlightDao(null);
+		}
+	}
+}
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/Data/Ado/ReflectiveDbConnectionFactoryTests.cs b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/Data/Ado/ReflectiveDbConnectionFactoryTests.cs
new file mode 100644
index 00000000..a802d363
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/Data/Ado/ReflectiveDbConnectionFactoryTests.cs
@@ -0,0 +1,81 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using NUnit.Framework;
+
+#endregion
+
+namespace SpringAir.Data.Ado
+{
+	/// <summary>
+	/// Unit tests for the ReflectiveDbConnectionFactory class.
+	/// </summary>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: ReflectiveDbConnectionFactoryTests.cs,v 1.1 2005/10/30 09:06:40 springboy Exp $</version>
+	[TestFixture]
+	public sealed class ReflectiveDbConnectionFactoryTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void CtorWithNullConnectionString()
+		{
+			new ReflectiveDbConnectionFactory(typeof(SqlConnection), null);
+		}
+		
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void CtorWithEmptyConnectionString()
+		{
+			new ReflectiveDbConnectionFactory(typeof(SqlConnection), string.Empty);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void CtorWithWhitespacedConnectionString()
+		{
+			new ReflectiveDbConnectionFactory(typeof(SqlConnection), "\n");
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void CtorWithNullConnectionType()
+		{
+			new ReflectiveDbConnectionFactory(null, "a.connection.string");
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void CtorWithBadConnectionType()
+		{
+			new ReflectiveDbConnectionFactory(typeof(string), "a.connection.string");
+		}
+
+		[Test]
+		public void CtorSunnyDay()
+		{
+			new ReflectiveDbConnectionFactory(typeof(SqlConnection), "a.connection.string");
+		}
+	}
+}
diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2003.csproj b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2003.csproj
new file mode 100644
index 00000000..ae26cc6f
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2003.csproj
@@ -0,0 +1,144 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{B0A6F98E-5363-4575-BB6B-A84E91895468}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "SpringAir.Data.Ado.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "SpringAir"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "SpringAir.Data.Ado.2003"
+                    Project = "{78B285FE-27F3-44F4-84B1-7A589AB48EF3}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "SpringAir.Core.2003"
+                    Project = "{5E3427D8-62FC-483F-A86B-B44A79A46BCC}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\..\..\lib\Net\1.1\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "DotNetMock"
+                    AssemblyName = "DotNetMock"
+                    HintPath = "..\..\..\..\..\lib\Net\1.1\DotNetMock.dll"
+                />
+                <Reference
+                    Name = "Spring.Data"
+                    AssemblyName = "Spring.Data"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Data.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "SpringAir.Data.Ado.Tests.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\Ado\AircraftDaoTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Ado\AirportDaoTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Ado\FlightDaoTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2005.csproj b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2005.csproj
new file mode 100644
index 00000000..4ba3e73e
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.2005.csproj
@@ -0,0 +1,135 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B0A6F98E-5363-4575-BB6B-A84E91895468}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>SpringAir.Data.Ado.Tests</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>SpringAir</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DotNetMock, Version=0.7.4.0, Culture=neutral, PublicKeyToken=805ea88df19095f6">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\Net\2.0\DotNetMock.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Spring.Data, Version=1.1.0.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\bin\net\2.0\debug\Spring.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Data\Ado\AircraftDaoTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Data\Ado\AirportDaoTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Data\Ado\FlightDaoTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <None Include="SpringAir.Data.Ado.Tests.build" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\SpringAir.Core\SpringAir.Core.2005.csproj">
+      <Project>{5E3427D8-62FC-483F-A86B-B44A79A46BCC}</Project>
+      <Name>SpringAir.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\SpringAir.Data.Ado\SpringAir.Data.Ado.2005.csproj">
+      <Project>{78B285FE-27F3-44F4-84B1-7A589AB48EF3}</Project>
+      <Name>SpringAir.Data.Ado.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.build b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.build
new file mode 100644
index 00000000..a6d41bb9
--- /dev/null
+++ b/examples/Spring/SpringAir/test/SpringAir.Data.Ado.Tests/SpringAir.Data.Ado.Tests.build
@@ -0,0 +1,33 @@
+<?xml version="1.0" ?>
+<project name="SpringAir.Data.Ado.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+	<!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+	<target name="build">
+		<csc target="library" define="${current.build.defines.csc}" warnaserror="true"
+			debug="${build.debug}" output="${current.bin.dir}/${project::get-name()}.dll">
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+			</sources>
+			<references basedir="${current.bin.dir}">
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+			</references>
+		</csc>
+	</target>
+	<target name="test" depends="build">
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
+			      appconfig="${project::get-name()}.dll.config" />
+		</nunit2outproc>
+	</target>
+</project>
diff --git a/lib/NHibernate10/net/1.1/Castle.DynamicProxy.dll b/lib/NHibernate10/net/1.1/Castle.DynamicProxy.dll
new file mode 100644
index 00000000..d95b1474
Binary files /dev/null and b/lib/NHibernate10/net/1.1/Castle.DynamicProxy.dll differ
diff --git a/lib/NHibernate10/net/1.1/Castle.DynamicProxy.license.txt b/lib/NHibernate10/net/1.1/Castle.DynamicProxy.license.txt
new file mode 100644
index 00000000..b7530910
--- /dev/null
+++ b/lib/NHibernate10/net/1.1/Castle.DynamicProxy.license.txt
@@ -0,0 +1,13 @@
+Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+ 
+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.
diff --git a/lib/NHibernate10/net/1.1/Iesi.Collections.dll b/lib/NHibernate10/net/1.1/Iesi.Collections.dll
new file mode 100644
index 00000000..a326a0a9
Binary files /dev/null and b/lib/NHibernate10/net/1.1/Iesi.Collections.dll differ
diff --git a/lib/NHibernate10/net/1.1/Iesi.Collections.license.txt b/lib/NHibernate10/net/1.1/Iesi.Collections.license.txt
new file mode 100644
index 00000000..66c4a8dc
--- /dev/null
+++ b/lib/NHibernate10/net/1.1/Iesi.Collections.license.txt
@@ -0,0 +1,9 @@
+Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith.
+
+Copied from http://www.codeproject.com/csharp/sets.asp#xx703510xx that was posted by JasonSmith 12:13 2 Jan '04
+
+Feel free to use this code any way you want to. As a favor to me, you can leave the copyright in there. You never know when someone might recognize your name! 
+
+If you do use the code in a commercial product, I would appreciate hearing about it. This message serves as legal notice that I won't be suing you for royalties!  The code is in the public domain.
+
+On the other hand, I don't provide support. The code is actually simple enough that it shouldn't need it. 
diff --git a/lib/NHibernate10/net/1.1/NHibernate.dll b/lib/NHibernate10/net/1.1/NHibernate.dll
new file mode 100644
index 00000000..127f1c9a
Binary files /dev/null and b/lib/NHibernate10/net/1.1/NHibernate.dll differ
diff --git a/lib/NHibernate10/net/1.1/NHibernate.license.txt b/lib/NHibernate10/net/1.1/NHibernate.license.txt
new file mode 100644
index 00000000..8a88d148
--- /dev/null
+++ b/lib/NHibernate10/net/1.1/NHibernate.license.txt
@@ -0,0 +1,460 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                     Version 2.1, February 1999
+
+       Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+     Everyone is permitted to copy and distribute verbatim copies
+       of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
diff --git a/lib/NHibernate10/net/1.1/log4net.dll b/lib/NHibernate10/net/1.1/log4net.dll
new file mode 100644
index 00000000..802b25af
Binary files /dev/null and b/lib/NHibernate10/net/1.1/log4net.dll differ
diff --git a/lib/NHibernate10/net/2.0/Castle.DynamicProxy.dll b/lib/NHibernate10/net/2.0/Castle.DynamicProxy.dll
new file mode 100644
index 00000000..d95b1474
Binary files /dev/null and b/lib/NHibernate10/net/2.0/Castle.DynamicProxy.dll differ
diff --git a/lib/NHibernate10/net/2.0/Castle.DynamicProxy.license.txt b/lib/NHibernate10/net/2.0/Castle.DynamicProxy.license.txt
new file mode 100644
index 00000000..b7530910
--- /dev/null
+++ b/lib/NHibernate10/net/2.0/Castle.DynamicProxy.license.txt
@@ -0,0 +1,13 @@
+Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+ 
+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.
diff --git a/lib/NHibernate10/net/2.0/Iesi.Collections.dll b/lib/NHibernate10/net/2.0/Iesi.Collections.dll
new file mode 100644
index 00000000..a326a0a9
Binary files /dev/null and b/lib/NHibernate10/net/2.0/Iesi.Collections.dll differ
diff --git a/lib/NHibernate10/net/2.0/Iesi.Collections.license.txt b/lib/NHibernate10/net/2.0/Iesi.Collections.license.txt
new file mode 100644
index 00000000..66c4a8dc
--- /dev/null
+++ b/lib/NHibernate10/net/2.0/Iesi.Collections.license.txt
@@ -0,0 +1,9 @@
+Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith.
+
+Copied from http://www.codeproject.com/csharp/sets.asp#xx703510xx that was posted by JasonSmith 12:13 2 Jan '04
+
+Feel free to use this code any way you want to. As a favor to me, you can leave the copyright in there. You never know when someone might recognize your name! 
+
+If you do use the code in a commercial product, I would appreciate hearing about it. This message serves as legal notice that I won't be suing you for royalties!  The code is in the public domain.
+
+On the other hand, I don't provide support. The code is actually simple enough that it shouldn't need it. 
diff --git a/lib/NHibernate10/net/2.0/NHibernate.dll b/lib/NHibernate10/net/2.0/NHibernate.dll
new file mode 100644
index 00000000..127f1c9a
Binary files /dev/null and b/lib/NHibernate10/net/2.0/NHibernate.dll differ
diff --git a/lib/NHibernate10/net/2.0/NHibernate.license.txt b/lib/NHibernate10/net/2.0/NHibernate.license.txt
new file mode 100644
index 00000000..8a88d148
--- /dev/null
+++ b/lib/NHibernate10/net/2.0/NHibernate.license.txt
@@ -0,0 +1,460 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                     Version 2.1, February 1999
+
+       Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+     Everyone is permitted to copy and distribute verbatim copies
+       of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
diff --git a/lib/NHibernate10/net/2.0/log4net.dll b/lib/NHibernate10/net/2.0/log4net.dll
new file mode 100644
index 00000000..802b25af
Binary files /dev/null and b/lib/NHibernate10/net/2.0/log4net.dll differ
diff --git a/lib/NHibernate12/net/1.1/Castle.DynamicProxy.dll b/lib/NHibernate12/net/1.1/Castle.DynamicProxy.dll
new file mode 100644
index 00000000..d95b1474
Binary files /dev/null and b/lib/NHibernate12/net/1.1/Castle.DynamicProxy.dll differ
diff --git a/lib/NHibernate12/net/1.1/HashCodeProvider.dll b/lib/NHibernate12/net/1.1/HashCodeProvider.dll
new file mode 100644
index 00000000..11a3a345
Binary files /dev/null and b/lib/NHibernate12/net/1.1/HashCodeProvider.dll differ
diff --git a/lib/NHibernate12/net/1.1/Iesi.Collections.dll b/lib/NHibernate12/net/1.1/Iesi.Collections.dll
new file mode 100644
index 00000000..9f7ce06b
Binary files /dev/null and b/lib/NHibernate12/net/1.1/Iesi.Collections.dll differ
diff --git a/lib/NHibernate12/net/1.1/NHibernate.dll b/lib/NHibernate12/net/1.1/NHibernate.dll
new file mode 100644
index 00000000..5a7ca201
Binary files /dev/null and b/lib/NHibernate12/net/1.1/NHibernate.dll differ
diff --git a/lib/NHibernate12/net/1.1/log4net.dll b/lib/NHibernate12/net/1.1/log4net.dll
new file mode 100644
index 00000000..995816f2
Binary files /dev/null and b/lib/NHibernate12/net/1.1/log4net.dll differ
diff --git a/lib/NHibernate12/net/2.0/Castle.DynamicProxy.dll b/lib/NHibernate12/net/2.0/Castle.DynamicProxy.dll
new file mode 100644
index 00000000..3feebda1
Binary files /dev/null and b/lib/NHibernate12/net/2.0/Castle.DynamicProxy.dll differ
diff --git a/lib/NHibernate12/net/2.0/Castle.DynamicProxy.license.txt b/lib/NHibernate12/net/2.0/Castle.DynamicProxy.license.txt
new file mode 100644
index 00000000..b7530910
--- /dev/null
+++ b/lib/NHibernate12/net/2.0/Castle.DynamicProxy.license.txt
@@ -0,0 +1,13 @@
+Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+ 
+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.
diff --git a/lib/NHibernate12/net/2.0/Iesi.Collections.dll b/lib/NHibernate12/net/2.0/Iesi.Collections.dll
new file mode 100644
index 00000000..c4cc0373
Binary files /dev/null and b/lib/NHibernate12/net/2.0/Iesi.Collections.dll differ
diff --git a/lib/NHibernate12/net/2.0/Iesi.Collections.license.txt b/lib/NHibernate12/net/2.0/Iesi.Collections.license.txt
new file mode 100644
index 00000000..66c4a8dc
--- /dev/null
+++ b/lib/NHibernate12/net/2.0/Iesi.Collections.license.txt
@@ -0,0 +1,9 @@
+Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith.
+
+Copied from http://www.codeproject.com/csharp/sets.asp#xx703510xx that was posted by JasonSmith 12:13 2 Jan '04
+
+Feel free to use this code any way you want to. As a favor to me, you can leave the copyright in there. You never know when someone might recognize your name! 
+
+If you do use the code in a commercial product, I would appreciate hearing about it. This message serves as legal notice that I won't be suing you for royalties!  The code is in the public domain.
+
+On the other hand, I don't provide support. The code is actually simple enough that it shouldn't need it. 
diff --git a/lib/NHibernate12/net/2.0/NHibernate.dll b/lib/NHibernate12/net/2.0/NHibernate.dll
new file mode 100644
index 00000000..19bc3f9e
Binary files /dev/null and b/lib/NHibernate12/net/2.0/NHibernate.dll differ
diff --git a/lib/NHibernate12/net/2.0/NHibernate.license.txt b/lib/NHibernate12/net/2.0/NHibernate.license.txt
new file mode 100644
index 00000000..8a88d148
--- /dev/null
+++ b/lib/NHibernate12/net/2.0/NHibernate.license.txt
@@ -0,0 +1,460 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                     Version 2.1, February 1999
+
+       Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+     Everyone is permitted to copy and distribute verbatim copies
+       of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
diff --git a/lib/NHibernate12/net/2.0/log4net.dll b/lib/NHibernate12/net/2.0/log4net.dll
new file mode 100644
index 00000000..ffc57e11
Binary files /dev/null and b/lib/NHibernate12/net/2.0/log4net.dll differ
diff --git a/lib/Net/1.0/Common.Logging.Log4Net.dll b/lib/Net/1.0/Common.Logging.Log4Net.dll
new file mode 100644
index 00000000..04f74816
Binary files /dev/null and b/lib/Net/1.0/Common.Logging.Log4Net.dll differ
diff --git a/lib/Net/1.0/Common.Logging.dll b/lib/Net/1.0/Common.Logging.dll
new file mode 100644
index 00000000..d7a8f158
Binary files /dev/null and b/lib/Net/1.0/Common.Logging.dll differ
diff --git a/lib/Net/1.0/DotNetMock.Framework.dll b/lib/Net/1.0/DotNetMock.Framework.dll
new file mode 100644
index 00000000..ed369b46
Binary files /dev/null and b/lib/Net/1.0/DotNetMock.Framework.dll differ
diff --git a/lib/Net/1.0/DotNetMock.dll b/lib/Net/1.0/DotNetMock.dll
new file mode 100644
index 00000000..0db31ce0
Binary files /dev/null and b/lib/Net/1.0/DotNetMock.dll differ
diff --git a/lib/Net/1.0/Rhino.Mocks.dll b/lib/Net/1.0/Rhino.Mocks.dll
new file mode 100644
index 00000000..bc98d2dc
Binary files /dev/null and b/lib/Net/1.0/Rhino.Mocks.dll differ
diff --git a/lib/Net/1.0/antlr.runtime.dll b/lib/Net/1.0/antlr.runtime.dll
new file mode 100644
index 00000000..9fdbe5a9
Binary files /dev/null and b/lib/Net/1.0/antlr.runtime.dll differ
diff --git a/lib/Net/1.0/nunit.framework.dll b/lib/Net/1.0/nunit.framework.dll
new file mode 100644
index 00000000..42cc12cf
Binary files /dev/null and b/lib/Net/1.0/nunit.framework.dll differ
diff --git a/lib/Net/1.1/Common.Logging.Log4Net.dll b/lib/Net/1.1/Common.Logging.Log4Net.dll
new file mode 100644
index 00000000..f334f6de
Binary files /dev/null and b/lib/Net/1.1/Common.Logging.Log4Net.dll differ
diff --git a/lib/Net/1.1/Common.Logging.dll b/lib/Net/1.1/Common.Logging.dll
new file mode 100644
index 00000000..d7a8f158
Binary files /dev/null and b/lib/Net/1.1/Common.Logging.dll differ
diff --git a/lib/Net/1.1/DotNetMock.Framework.dll b/lib/Net/1.1/DotNetMock.Framework.dll
new file mode 100644
index 00000000..f7024192
Binary files /dev/null and b/lib/Net/1.1/DotNetMock.Framework.dll differ
diff --git a/lib/Net/1.1/DotNetMock.dll b/lib/Net/1.1/DotNetMock.dll
new file mode 100644
index 00000000..b1a6da19
Binary files /dev/null and b/lib/Net/1.1/DotNetMock.dll differ
diff --git a/lib/Net/1.1/NMS.dll b/lib/Net/1.1/NMS.dll
new file mode 100644
index 00000000..7a8e73fe
Binary files /dev/null and b/lib/Net/1.1/NMS.dll differ
diff --git a/lib/Net/1.1/NUnitAsp.dll b/lib/Net/1.1/NUnitAsp.dll
new file mode 100644
index 00000000..9f45eff8
Binary files /dev/null and b/lib/Net/1.1/NUnitAsp.dll differ
diff --git a/lib/Net/1.1/NUnitAspEx.dll b/lib/Net/1.1/NUnitAspEx.dll
new file mode 100644
index 00000000..95c1eb4b
Binary files /dev/null and b/lib/Net/1.1/NUnitAspEx.dll differ
diff --git a/lib/Net/1.1/Nullables.dll b/lib/Net/1.1/Nullables.dll
new file mode 100644
index 00000000..8b7805a7
Binary files /dev/null and b/lib/Net/1.1/Nullables.dll differ
diff --git a/lib/Net/1.1/Quartz.dll b/lib/Net/1.1/Quartz.dll
new file mode 100644
index 00000000..8e0cb265
Binary files /dev/null and b/lib/Net/1.1/Quartz.dll differ
diff --git a/lib/Net/1.1/Rhino.Mocks.dll b/lib/Net/1.1/Rhino.Mocks.dll
new file mode 100644
index 00000000..bc98d2dc
Binary files /dev/null and b/lib/Net/1.1/Rhino.Mocks.dll differ
diff --git a/lib/Net/1.1/antlr.runtime.dll b/lib/Net/1.1/antlr.runtime.dll
new file mode 100644
index 00000000..0f2be9fd
Binary files /dev/null and b/lib/Net/1.1/antlr.runtime.dll differ
diff --git a/lib/Net/1.1/nunit.core.dll b/lib/Net/1.1/nunit.core.dll
new file mode 100644
index 00000000..3f06941f
Binary files /dev/null and b/lib/Net/1.1/nunit.core.dll differ
diff --git a/lib/Net/1.1/nunit.core.interfaces.dll b/lib/Net/1.1/nunit.core.interfaces.dll
new file mode 100644
index 00000000..aca4c6d5
Binary files /dev/null and b/lib/Net/1.1/nunit.core.interfaces.dll differ
diff --git a/lib/Net/1.1/nunit.framework.dll b/lib/Net/1.1/nunit.framework.dll
new file mode 100644
index 00000000..42cc12cf
Binary files /dev/null and b/lib/Net/1.1/nunit.framework.dll differ
diff --git a/lib/Net/2.0/Common.Logging.Log4Net.dll b/lib/Net/2.0/Common.Logging.Log4Net.dll
new file mode 100644
index 00000000..3900bb87
Binary files /dev/null and b/lib/Net/2.0/Common.Logging.Log4Net.dll differ
diff --git a/lib/Net/2.0/Common.Logging.dll b/lib/Net/2.0/Common.Logging.dll
new file mode 100644
index 00000000..d7a8f158
Binary files /dev/null and b/lib/Net/2.0/Common.Logging.dll differ
diff --git a/lib/Net/2.0/DotNetMock.Framework.dll b/lib/Net/2.0/DotNetMock.Framework.dll
new file mode 100644
index 00000000..f7024192
Binary files /dev/null and b/lib/Net/2.0/DotNetMock.Framework.dll differ
diff --git a/lib/Net/2.0/DotNetMock.dll b/lib/Net/2.0/DotNetMock.dll
new file mode 100644
index 00000000..b1a6da19
Binary files /dev/null and b/lib/Net/2.0/DotNetMock.dll differ
diff --git a/lib/Net/2.0/EULA.rtf b/lib/Net/2.0/EULA.rtf
new file mode 100644
index 00000000..1137bf3a
--- /dev/null
+++ b/lib/Net/2.0/EULA.rtf
@@ -0,0 +1,522 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff38\deff0\stshfdbch11\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};}
+{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New{\*\falt Arial};}{\f3\fbidi \froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol{\*\falt Bookshelf Symbol 3};}
+{\f10\fbidi \fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings{\*\falt Symbol};}{\f11\fbidi \fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}MS Mincho{\*\falt ?l?r ??\'81\'66c};}
+{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma{\*\falt ?l?r ???};}
+{\f51\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0603020202020204}Trebuchet MS{\*\falt Univers};}{\f167\fbidi \fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}@MS Mincho{\*\falt @MS Gothic};}
+{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};}{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};}
+{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};}
+{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};}{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};}
+{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times New Roman};}
+{\f183\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};}{\f184\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};}
+{\f186\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};}{\f187\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};}
+{\f188\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};}{\f189\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};}
+{\f190\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};}{\f191\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};}{\f203\fbidi \fmodern\fcharset238\fprq1 Courier New CE{\*\falt Arial};}
+{\f204\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr{\*\falt Arial};}{\f206\fbidi \fmodern\fcharset161\fprq1 Courier New Greek{\*\falt Arial};}{\f207\fbidi \fmodern\fcharset162\fprq1 Courier New Tur{\*\falt Arial};}
+{\f208\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew){\*\falt Arial};}{\f209\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic){\*\falt Arial};}{\f210\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic{\*\falt Arial};}
+{\f211\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese){\*\falt Arial};}{\f295\fbidi \fmodern\fcharset0\fprq1 MS Mincho Western{\*\falt ?l?r ??\'81\'66c};}{\f293\fbidi \fmodern\fcharset238\fprq1 MS Mincho CE{\*\falt ?l?r ??\'81\'66c};}
+{\f294\fbidi \fmodern\fcharset204\fprq1 MS Mincho Cyr{\*\falt ?l?r ??\'81\'66c};}{\f296\fbidi \fmodern\fcharset161\fprq1 MS Mincho Greek{\*\falt ?l?r ??\'81\'66c};}{\f297\fbidi \fmodern\fcharset162\fprq1 MS Mincho Tur{\*\falt ?l?r ??\'81\'66c};}
+{\f300\fbidi \fmodern\fcharset186\fprq1 MS Mincho Baltic{\*\falt ?l?r ??\'81\'66c};}{\f523\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f524\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}
+{\f526\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f527\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f530\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f563\fbidi \fswiss\fcharset238\fprq2 Tahoma CE{\*\falt ?l?r ???};}
+{\f564\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr{\*\falt ?l?r ???};}{\f566\fbidi \fswiss\fcharset161\fprq2 Tahoma Greek{\*\falt ?l?r ???};}{\f567\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur{\*\falt ?l?r ???};}
+{\f568\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew){\*\falt ?l?r ???};}{\f569\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic){\*\falt ?l?r ???};}{\f570\fbidi \fswiss\fcharset186\fprq2 Tahoma Baltic{\*\falt ?l?r ???};}
+{\f571\fbidi \fswiss\fcharset163\fprq2 Tahoma (Vietnamese){\*\falt ?l?r ???};}{\f572\fbidi \fswiss\fcharset222\fprq2 Tahoma (Thai){\*\falt ?l?r ???};}{\f693\fbidi \fswiss\fcharset238\fprq2 Trebuchet MS CE{\*\falt Univers};}
+{\f694\fbidi \fswiss\fcharset204\fprq2 Trebuchet MS Cyr{\*\falt Univers};}{\f696\fbidi \fswiss\fcharset161\fprq2 Trebuchet MS Greek{\*\falt Univers};}{\f697\fbidi \fswiss\fcharset162\fprq2 Trebuchet MS Tur{\*\falt Univers};}
+{\f700\fbidi \fswiss\fcharset186\fprq2 Trebuchet MS Baltic{\*\falt Univers};}{\f1855\fbidi \fmodern\fcharset0\fprq1 @MS Mincho Western{\*\falt @MS Gothic};}{\f1853\fbidi \fmodern\fcharset238\fprq1 @MS Mincho CE{\*\falt @MS Gothic};}
+{\f1854\fbidi \fmodern\fcharset204\fprq1 @MS Mincho Cyr{\*\falt @MS Gothic};}{\f1856\fbidi \fmodern\fcharset161\fprq1 @MS Mincho Greek{\*\falt @MS Gothic};}{\f1857\fbidi \fmodern\fcharset162\fprq1 @MS Mincho Tur{\*\falt @MS Gothic};}
+{\f1860\fbidi \fmodern\fcharset186\fprq1 @MS Mincho Baltic{\*\falt @MS Gothic};}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};}
+{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};}
+{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};}
+{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};}
+{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};}
+{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};}
+{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};}
+{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};}
+{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}
+{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}
+{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};}
+{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};}
+{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};}
+{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};}
+{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};}
+{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};}
+{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};}
+{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};}
+{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};}
+{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};}
+{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};}
+{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};}
+{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
+{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times New Roman};}
+{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times New Roman};}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times New Roman};}
+{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times New Roman};}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times New Roman};}
+{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times New Roman};}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times New Roman};}
+{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times New Roman};}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;
+\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\*\defchp 
+\fs22\dbch\af11 }{\*\defpap \ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{
+\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\snext0 \sautoupd \sqformat \spriority0 \styrsid2453294 Normal;}{\s1\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af38\afs20\alang1025 \ltrch\fcs0 
+\b\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext1 \slink15 \sqformat \styrsid2453294 heading 1;}{\s2\ql \fi-363\li720\ri0\sb120\sa120\widctlpar
+\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls10\ilvl1\outlinelevel1\adjustright\rin0\lin720\itap0 \rtlch\fcs1 \ab\af38\afs20\alang1025 \ltrch\fcs0 \b\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext2 \slink16 \sqformat \styrsid2453294 heading 2;}{\s3\ql \li0\ri0\sb120\sa120\widctlpar\tx1077\wrapdefault\aspalpha\aspnum\faauto\outlinelevel2\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext3 \slink17 \sqformat \styrsid2453294 heading 3;}{\s4\ql \fi-358\li1435\ri0\sb120\sa120\widctlpar
+\jclisttab\tx1437\wrapdefault\aspalpha\aspnum\faauto\ls10\ilvl3\outlinelevel3\adjustright\rin0\lin1435\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext4 \slink18 \sqformat \styrsid2453294 heading 4;}{\s5\ql \fi-357\li1792\ri0\sb120\sa120\widctlpar\tx1792\jclisttab\tx2155\wrapdefault\aspalpha\aspnum\faauto\ls10\ilvl4\outlinelevel4\adjustright\rin0\lin1792\itap0 \rtlch\fcs1 
+\af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext5 \slink19 \sqformat \styrsid2453294 heading 5;}{\s6\ql \fi-357\li2149\ri0\sb120\sa120\widctlpar
+\jclisttab\tx2152\wrapdefault\aspalpha\aspnum\faauto\ls10\ilvl5\outlinelevel5\adjustright\rin0\lin2149\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext6 \slink20 \sqformat \styrsid2453294 heading 6;}{\s7\ql \fi-357\li2506\ri0\sb120\sa120\widctlpar\jclisttab\tx2509\wrapdefault\aspalpha\aspnum\faauto\ls10\ilvl6\outlinelevel6\adjustright\rin0\lin2506\itap0 \rtlch\fcs1 
+\af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext7 \slink21 \sqformat \styrsid2453294 heading 7;}{\s8\ql \fi-357\li2863\ri0\sb120\sa120\widctlpar
+\jclisttab\tx2866\wrapdefault\aspalpha\aspnum\faauto\ls10\ilvl7\outlinelevel7\adjustright\rin0\lin2863\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext8 \slink22 \sqformat \styrsid2453294 heading 8;}{\s9\ql \fi-358\li3221\ri0\sb120\sa120\widctlpar\jclisttab\tx3223\wrapdefault\aspalpha\aspnum\faauto\ls10\ilvl8\outlinelevel8\adjustright\rin0\lin3221\itap0 \rtlch\fcs1 
+\af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext9 \slink23 \sqformat \styrsid2453294 heading 9;}{\*\cs10 \additive \slink51 \slocked \ssemihidden \styrsid2453294 
+Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
+\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1033 
+\snext11 \ssemihidden \sunhideused \sqformat Normal Table;}{\*\cs15 \additive \rtlch\fcs1 \ab\af38\afs20 \ltrch\fcs0 \b\f38\fs20 \sbasedon10 \slink1 \slocked \styrsid6178267 Heading 1 Char;}{\*\cs16 \additive \rtlch\fcs1 \ab\ai\af31503\afs28 \ltrch\fcs0 
+\b\i\fs28\loch\f31502\hich\af31502\dbch\af31501 \sbasedon10 \slink2 \slocked \spriority9 Heading 2 Char;}{\*\cs17 \additive \rtlch\fcs1 \ab\af31503\afs26 \ltrch\fcs0 \b\fs26\loch\f31502\hich\af31502\dbch\af31501 
+\sbasedon10 \slink3 \slocked \ssemihidden \spriority9 Heading 3 Char;}{\*\cs18 \additive \rtlch\fcs1 \ab\af31507\afs28 \ltrch\fcs0 \b\fs28\loch\f31506\hich\af31506\dbch\af31505 \sbasedon10 \slink4 \slocked \ssemihidden \spriority9 Heading 4 Char;}{\*
+\cs19 \additive \rtlch\fcs1 \ab\ai\af31507\afs26 \ltrch\fcs0 \b\i\fs26\loch\f31506\hich\af31506\dbch\af31505 \sbasedon10 \slink5 \slocked \ssemihidden \spriority9 Heading 5 Char;}{\*\cs20 \additive \rtlch\fcs1 \ab\af31507 \ltrch\fcs0 
+\b\loch\f31506\hich\af31506\dbch\af31505 \sbasedon10 \slink6 \slocked \ssemihidden \spriority9 Heading 6 Char;}{\*\cs21 \additive \rtlch\fcs1 \af31507\afs24 \ltrch\fcs0 \fs24\loch\f31506\hich\af31506\dbch\af31505 
+\sbasedon10 \slink7 \slocked \ssemihidden \spriority9 Heading 7 Char;}{\*\cs22 \additive \rtlch\fcs1 \ai\af31507\afs24 \ltrch\fcs0 \i\fs24\loch\f31506\hich\af31506\dbch\af31505 \sbasedon10 \slink8 \slocked \ssemihidden \spriority9 Heading 8 Char;}{\*
+\cs23 \additive \rtlch\fcs1 \af31503 \ltrch\fcs0 \loch\f31502\hich\af31502\dbch\af31501 \sbasedon10 \slink9 \slocked \ssemihidden \spriority9 Heading 9 Char;}{
+\s24\ql \li357\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin357\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext24 \styrsid2453294 Body 1;}{\s25\ql \li720\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext25 \styrsid2453294 Body 2;}{\s26\ql \li1077\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin1077\itap0 \rtlch\fcs1 
+\af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext26 \styrsid2453294 Body 3;}{
+\s27\ql \li1435\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin1435\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext27 \styrsid2453294 Body 4;}{\s28\ql \li1803\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin1803\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext28 \styrsid2453294 Body 5;}{\s29\ql \li2160\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2160\itap0 \rtlch\fcs1 
+\af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext29 \styrsid2453294 Body 6;}{
+\s30\ql \li2506\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2506\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext30 \styrsid2453294 Body 7;}{\s31\ql \li2863\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2863\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext31 \styrsid2453294 Body 8;}{\s32\ql \li3221\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin3221\itap0 \rtlch\fcs1 
+\af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext32 \styrsid2453294 Body 9;}{\s33\ql \fi-357\li357\ri0\sb120\sa120\widctlpar
+\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin357\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext33 \styrsid2453294 
+Bullet 1;}{\s34\ql \fi-363\li720\ri0\sb120\sa120\widctlpar\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls2\adjustright\rin0\lin720\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext34 \styrsid2453294 Bullet 2;}{\s35\ql \fi-357\li1077\ri0\sb120\sa120\widctlpar
+\jclisttab\tx1080\wrapdefault\aspalpha\aspnum\faauto\ls3\adjustright\rin0\lin1077\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext35 \styrsid2453294 
+Bullet 3;}{\s36\ql \fi-358\li1435\ri0\sb120\sa120\widctlpar\jclisttab\tx1437\wrapdefault\aspalpha\aspnum\faauto\ls4\adjustright\rin0\lin1435\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext36 \styrsid2453294 Bullet 4;}{\s37\ql \fi-357\li1792\ri0\sb120\sa120\widctlpar
+\jclisttab\tx1795\wrapdefault\aspalpha\aspnum\faauto\ls5\adjustright\rin0\lin1792\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext37 \styrsid2453294 
+Bullet 5;}{\s38\ql \fi-357\li2149\ri0\sb120\sa120\widctlpar\jclisttab\tx2152\wrapdefault\aspalpha\aspnum\faauto\ls6\adjustright\rin0\lin2149\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext38 \styrsid2453294 Bullet 6;}{\s39\ql \fi-357\li2506\ri0\sb120\sa120\widctlpar
+\jclisttab\tx2509\wrapdefault\aspalpha\aspnum\faauto\ls7\adjustright\rin0\lin2506\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext39 \styrsid2453294 
+Bullet 7;}{\s40\ql \fi-357\li2863\ri0\sb120\sa120\widctlpar\jclisttab\tx2866\wrapdefault\aspalpha\aspnum\faauto\ls8\adjustright\rin0\lin2863\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext40 \styrsid2453294 Bullet 8;}{\s41\ql \fi-358\li3221\ri0\sb120\sa120\widctlpar
+\jclisttab\tx3223\wrapdefault\aspalpha\aspnum\faauto\ls9\adjustright\rin0\lin3221\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon32 \snext41 \styrsid2453294 Bullet 9;}{\s42\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af38\afs28\alang1025 \ltrch\fcs0 
+\b\fs28\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \styrsid2453294 Heading EULA;}{\s43\ql \li0\ri0\sb120\sa120\widctlpar\brdrb\brdrs\brdrw10\brsp20 
+\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af38\afs28\alang1025 \ltrch\fcs0 \b\fs28\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \styrsid2453294 
+Heading Software Title;}{\s44\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af38\afs20\alang1025 \ltrch\fcs0 
+\b\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext44 \styrsid2453294 Preamble;}{\s45\ql \li0\ri0\sb120\sa120\widctlpar\brdrb\brdrs\brdrw10\brsp20 
+\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af38\afs20\alang1025 \ltrch\fcs0 \b\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext1 \styrsid2453294 Preamble Border;}{
+\s46\qc \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af38\afs20\alang1025 \ltrch\fcs0 \b\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext46 \styrsid2453294 Heading Warranty;}{\s47\ql \fi-360\li360\ri0\sb120\sa120\widctlpar\jclisttab\tx360\wrapdefault\aspalpha\aspnum\faauto\ls11\outlinelevel0\adjustright\rin0\lin360\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \styrsid2453294 Heading 1 Warranty;}{\s48\ql \fi-360\li720\ri0\sb120\sa120\widctlpar
+\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls11\ilvl1\outlinelevel1\adjustright\rin0\lin720\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext0 \styrsid2453294 Heading 2 Warranty;}{\*\cs49 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf2 \sbasedon10 \styrsid12483380 Hyperlink;}{\s50\ql \fi-357\li1077\ri0\sb120\sa120\widctlpar
+\jclisttab\tx1080\wrapdefault\aspalpha\aspnum\faauto\ls13\adjustright\rin0\lin1077\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\ul\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon35 \snext50 \sautoupd \styrsid2453294 Bullet 3 Underline;}{\s51\ql \li0\ri0\sa160\sl-240\slmult0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext51 \slink10 \styrsid11613206 Char;}{\s52\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 
+\af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext52 \slink53 \ssemihidden \styrsid16123551 footnote text;}{\*\cs53 \additive \rtlch\fcs1 \af38\afs20 \ltrch\fcs0 
+\f38\fs20 \sbasedon10 \slink52 \slocked \ssemihidden Footnote Text Char;}{\*\cs54 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \super \sbasedon10 \ssemihidden \styrsid16123551 footnote reference;}{
+\s55\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext55 \slink56 \ssemihidden \styrsid16123551 endnote text;}{\*\cs56 \additive \rtlch\fcs1 \af38\afs20 \ltrch\fcs0 \f38\fs20 \sbasedon10 \slink55 \slocked \ssemihidden Endnote Text Char;}{\*\cs57 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \super 
+\sbasedon10 \ssemihidden \styrsid16123551 endnote reference;}{\s58\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext58 \slink59 \ssemihidden \styrsid16123551 annotation text;}{\*\cs59 \additive \rtlch\fcs1 \af38\afs20 \ltrch\fcs0 \f38\fs20 
+\sbasedon10 \slink58 \slocked \ssemihidden Comment Text Char;}{\*\cs60 \additive \rtlch\fcs1 \af0\afs16 \ltrch\fcs0 \fs16 \sbasedon10 \ssemihidden \styrsid16123551 annotation reference;}{\s61\ql \li0\ri0\sa160\sl-240\slmult0
+\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext61 \styrsid8833 Char1;}{
+\s62\ql \fi-357\li1077\ri0\sb120\sa120\widctlpar\tx1077\jclisttab\tx1440\wrapdefault\aspalpha\aspnum\faauto\ls10\ilvl2\outlinelevel2\adjustright\rin0\lin1077\itap0 \rtlch\fcs1 \ab\af38\afs20\alang1025 \ltrch\fcs0 
+\b\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon3 \snext62 \styrsid2453294 Heading 3 Bold;}{\s63\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 
+\af38\afs20\alang1025 \ltrch\fcs0 \fs20\ul\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon36 \snext63 \styrsid2453294 Bullet 4 Underline;}{
+\s64\ql \li720\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\ul\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon25 \snext64 \styrsid2453294 Body 2 Underline;}{\s65\ql \li0\ri0\sb120\sa120\widctlpar\brdrt\brdrs\brdrw10\brsp20 \wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af38\afs20\alang1025 \ltrch\fcs0 
+\b\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon44 \snext65 \styrsid2453294 Preamble Border Above;}{\*\cs66 \additive \v\f2\cf12\sub \styrsid14319332 tw4winMark;}{
+\s67\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs16\alang1025 \ltrch\fcs0 \fs16\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext67 \slink68 \ssemihidden \styrsid6453702 Balloon Text;}{\*\cs68 \additive \rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16 \sbasedon10 \slink67 \slocked \ssemihidden Balloon Text Char;}{
+\s69\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af38\afs20\alang1025 \ltrch\fcs0 \b\fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon58 \snext58 \slink70 \ssemihidden \sunhideused \styrsid16201594 annotation subject;}{\*\cs70 \additive \rtlch\fcs1 \ab\af38\afs20 \ltrch\fcs0 \b\f38\fs20 \sbasedon59 \slink69 \slocked \ssemihidden \styrsid16201594 Comment Subject Char;}{
+\s71\ql \li0\ri0\sb120\sa120\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext71 \slink72 \ssemihidden \sunhideused \styrsid16473449 header;}{\*\cs72 \additive \rtlch\fcs1 \af38\afs20 \ltrch\fcs0 \f38\fs20 \sbasedon10 \slink71 \slocked \ssemihidden \styrsid16473449 Header Char;}{
+\s73\ql \li0\ri0\sb120\sa120\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\f38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext73 \slink74 \ssemihidden \sunhideused \styrsid16473449 footer;}{\*\cs74 \additive \rtlch\fcs1 \af38\afs20 \ltrch\fcs0 \f38\fs20 \sbasedon10 \slink73 \slocked \ssemihidden \styrsid16473449 Footer Char;}}{\*\listtable
+{\list\listtemplateid176468498\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid692200086\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s41
+\fi-358\li3221\jclisttab\tx3223\lin3221 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440
+\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160
+\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880
+\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 
+}{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel
+\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23
+\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0
+\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid196815738}
+{\list\listtemplateid-1085748990\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat600\levelspace0\levelindent0{\leveltext\leveltemplateid-21470828\'01\u-3913 ?;}{\levelnumbers;}
+\loch\af3\hich\af3\dbch\af11\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}
+\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}
+\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}
+\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 
+\fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 
+\fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 
+\fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }
+{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname 
+;}\listid325669543}{\list\listtemplateid-1793664660{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af0 \ltrch\fcs0 
+\b\i0\fbias0\hres0\chhres0 \s47\fi-360\li360\jclisttab\tx360\lin360 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af0 \ltrch\fcs0 
+\b\i0\fbias0\hres0\chhres0 \s48\fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02);}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\fbias0\hres0\chhres0 \fi-360\li1080\jclisttab\tx1080\lin1080 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'03);}{\levelnumbers\'02;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'04);}{\levelnumbers\'02;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\fbias0\hres0\chhres0 \fi-360\li1800\jclisttab\tx1800\lin1800 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'05);}{\levelnumbers\'02;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\fbias0\hres0\chhres0 \fi-360\li2520\jclisttab\tx2520\lin2520 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\fbias0\hres0\chhres0 \fi-360\li3240\jclisttab\tx3240\lin3240 }{\listname ;}\listid394402059}{\list\listtemplateid1470557282{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat600\levelspace360\levelindent0{\leveltext
+\'01\u-3913 ?;}{\levelnumbers;}\b\i0\fs20\loch\af3\hich\af3\dbch\af11\fbias0\hres0\chhres0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af51\afs20 \ltrch\fcs0 \b\i0\f51\fs20\fbias0\hres0\chhres0 \s2\fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab\ai0\af38\afs20 \ltrch\fcs0 \b\i0\f38\fs20\fbias0\hres0\chhres0 \s62\fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af51\afs20 \ltrch\fcs0 \b0\i0\strike0\f51\fs20\ulnone\fbias0\hres0\chhres0 \s4\fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1\levelnfcn1\leveljc0
+\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af51\afs20 \ltrch\fcs0 \b0\i0\strike0\f51\fs20\ulnone\fbias0\hres0\chhres0 \s5\fi-357\li1792\jclisttab\tx2155\lin1792 }{\listlevel
+\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af51\afs20 \ltrch\fcs0 \b0\i0\f51\fs20\fbias0\hres0\chhres0 \s6\fi-357\li2149
+\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \ab0\ai0\af51\afs20 \ltrch\fcs0 \b0\i0\f51\fs20\fbias0\hres0\chhres0 
+\s7\fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af51\afs20 \ltrch\fcs0 
+\b0\i0\f51\fs20\fbias0\hres0\chhres0 \s8\fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\rtlch\fcs1 \ab0\ai0\af51\afs20 
+\ltrch\fcs0 \b0\i0\f51\fs20\fbias0\hres0\chhres0 \s9\fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid398796681}{\list\listtemplateid789093748\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\leveltemplateid-317712510\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s34\fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid477573462}{\list\listtemplateid67698717{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\'02\'00);}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li360\jclisttab\tx360\lin360 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\'02\'01);}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02);}{\levelnumbers
+\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1080\jclisttab\tx1080\lin1080 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'03);}{\levelnumbers\'02;}\rtlch\fcs1 \af0 
+\ltrch\fcs0 \hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'04);}{\levelnumbers\'02;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\hres0\chhres0 \fi-360\li1800\jclisttab\tx1800\lin1800 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'05);}{\levelnumbers\'02;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 
+\fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2520
+\jclisttab\tx2520\lin2520 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2880
+\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3240
+\jclisttab\tx3240\lin3240 }{\listname ;}\listid700712945}{\list\listtemplateid-296591990\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid-48305026
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s40\fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid810947713}{\list\listtemplateid-258053656\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698703\'02\'00.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698713\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698715\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698703\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698713\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698715\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698703\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698713\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67698715\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 \ltrch\fcs0 \hres0\chhres0 \fi-180\li6480\lin6480 }{\listname ;}\listid988437699}{\list\listtemplateid285099256\listhybrid{\listlevel\levelnfc23
+\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace720\levelindent0{\leveltext\leveltemplateid-308626962\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s50\fi-357\li1077\jclisttab\tx1080\lin1077 }{\listlevel\levelnfc23
+\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace720\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0
+\leveljcn0\levelfollow0\levelstartat1\levelspace720\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace720\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace720\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace720\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace720
+\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace720\levelindent0
+{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace720\levelindent0{\leveltext
+\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1121073746}{\list\listtemplateid-1813845996\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid2033377338\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s39\fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1219436735}{\list\listtemplateid-41362566\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\leveltemplateid-1175557160\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s36\fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1559511898}{\list\listtemplateid-743794326\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\leveltemplateid1229593488\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s35\fi-357\li1077\jclisttab\tx1080\lin1077 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1567649130}{\list\listtemplateid1363474438\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace1077\levelindent0{\leveltext\leveltemplateid1637229796\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s37\fi-357\li1792\jclisttab\tx1795\lin1792 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace1077\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077
+\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0
+{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0{\leveltext
+\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0{\leveltext
+\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0{\leveltext
+\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1848404271}{\list\listtemplateid-1802592190\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
+\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid961321180\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s38\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0
+{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1877695764}{\list\listtemplateid1186249844\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelspace0\levelindent0{\leveltext\leveltemplateid1182702444\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \s33\fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
+\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
+\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid2054619191}}{\*\listoverridetable{\listoverride\listid2054619191\listoverridecount0\ls1}{\listoverride\listid477573462
+\listoverridecount0\ls2}{\listoverride\listid1567649130\listoverridecount0\ls3}{\listoverride\listid1559511898\listoverridecount0\ls4}{\listoverride\listid1848404271\listoverridecount0\ls5}{\listoverride\listid1877695764\listoverridecount0\ls6}
+{\listoverride\listid1219436735\listoverridecount0\ls7}{\listoverride\listid810947713\listoverridecount0\ls8}{\listoverride\listid196815738\listoverridecount0\ls9}{\listoverride\listid398796681\listoverridecount0\ls10}{\listoverride\listid394402059
+\listoverridecount0\ls11}{\listoverride\listid700712945\listoverridecount0\ls12}{\listoverride\listid1121073746\listoverridecount0\ls13}{\listoverride\listid325669543\listoverridecount0\ls14}{\listoverride\listid398796681\listoverridecount0\ls15}
+{\listoverride\listid988437699\listoverridecount0\ls16}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid8833\rsid25262\rsid149813\rsid202786\rsid224501\rsid336100\rsid619688\rsid687529\rsid993583
+\rsid1050666\rsid1063606\rsid1123747\rsid1247323\rsid1271240\rsid1314581\rsid1340611\rsid1396639\rsid1397504\rsid1445017\rsid1522967\rsid1660354\rsid1908946\rsid1967913\rsid1985256\rsid2040602\rsid2055273\rsid2169328\rsid2173862\rsid2294074\rsid2299921
+\rsid2303227\rsid2325299\rsid2325781\rsid2438325\rsid2443042\rsid2453294\rsid2631094\rsid2767599\rsid2837055\rsid2891929\rsid2908896\rsid3041681\rsid3084461\rsid3089876\rsid3090601\rsid3153954\rsid3176869\rsid3428779\rsid3494352\rsid3551572\rsid3565740
+\rsid3567813\rsid3607608\rsid3611273\rsid3737799\rsid3745708\rsid3805003\rsid3807310\rsid3893477\rsid3943274\rsid3952936\rsid4080061\rsid4130624\rsid4131293\rsid4151172\rsid4261399\rsid4285630\rsid4420257\rsid4538955\rsid4653850\rsid4657166\rsid4658437
+\rsid4665525\rsid4736258\rsid4927714\rsid5003640\rsid5009230\rsid5054803\rsid5055072\rsid5076588\rsid5077281\rsid5112338\rsid5140732\rsid5200145\rsid5252592\rsid5253692\rsid5272300\rsid5398118\rsid5575913\rsid5586591\rsid5660232\rsid5723753\rsid5733021
+\rsid5792090\rsid5839501\rsid5845217\rsid5848133\rsid5965347\rsid5969393\rsid5984178\rsid6178267\rsid6182090\rsid6306943\rsid6423491\rsid6423682\rsid6453702\rsid6499651\rsid6648707\rsid6692412\rsid6693430\rsid6759000\rsid6819414\rsid6952772\rsid6973360
+\rsid6976059\rsid7030393\rsid7091096\rsid7236981\rsid7293866\rsid7354836\rsid7481530\rsid7492415\rsid7627513\rsid7798874\rsid7951946\rsid7961682\rsid8137451\rsid8144333\rsid8264327\rsid8279245\rsid8333386\rsid8335631\rsid8349552\rsid8350558\rsid8392700
+\rsid8456026\rsid8457665\rsid8523053\rsid8532277\rsid8542814\rsid8586611\rsid8596935\rsid8602482\rsid8727711\rsid8938190\rsid9043979\rsid9069536\rsid9139129\rsid9196121\rsid9337714\rsid9378118\rsid9587393\rsid9587545\rsid9786004\rsid9857806\rsid9859629
+\rsid9989898\rsid10179210\rsid10289240\rsid10441824\rsid10565710\rsid10683655\rsid10705127\rsid10760272\rsid10951817\rsid11015424\rsid11095783\rsid11107534\rsid11224150\rsid11229606\rsid11230219\rsid11369554\rsid11613206\rsid11632249\rsid11676698
+\rsid11745537\rsid11936795\rsid11994093\rsid12016559\rsid12321879\rsid12483380\rsid12548342\rsid12613461\rsid12649626\rsid12791161\rsid12804081\rsid12870507\rsid12980889\rsid13004705\rsid13007617\rsid13110106\rsid13112801\rsid13240722\rsid13328841
+\rsid13336212\rsid13589070\rsid13637968\rsid13654305\rsid13783570\rsid14101503\rsid14107866\rsid14117292\rsid14240631\rsid14254048\rsid14299190\rsid14303978\rsid14311941\rsid14319332\rsid14352839\rsid14429059\rsid14434712\rsid14699709\rsid14749252
+\rsid14756287\rsid14825882\rsid15040283\rsid15142898\rsid15167476\rsid15231427\rsid15286622\rsid15290249\rsid15410853\rsid15491589\rsid15676556\rsid15825446\rsid15874102\rsid15946803\rsid16018894\rsid16069256\rsid16072846\rsid16078530\rsid16085697
+\rsid16123551\rsid16201594\rsid16340170\rsid16392012\rsid16451237\rsid16473449\rsid16524744\rsid16542872\rsid16543614\rsid16723387}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0
+\mnaryLim1}{\info{\creatim\yr2006\mo11\dy27\hr13\min3}{\revtim\yr2006\mo11\dy27\hr13\min3}{\version1}{\edmins0}{\nofpages1}{\nofwords169}{\nofchars1015}{\nofcharsws1182}{\vern32857}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordm
+l}{\xmlns2 urn:schemas-microsoft-com:office:smarttags}}\paperw12240\paperh15840\margl1152\margr1152\margt1152\margb1152\gutter0\ltrsect 
+\widowctrl\ftnbj\aenddoc\trackmoves1\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\noxlattoyen
+\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1152\dgvorigin1152\dghshow1\dgvshow1
+\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\rempersonalinfo\allowfieldendsel
+\wrppunct\asianbrkrule\rsidroot12483380\newtblstyruls\nogrowautofit\viewbksp1\remdttm\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \fet0{\*\wgrffmtfilter 013f}\ilfomacatclnup0
+{\*\docvar {db_xml}{<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>\'0d<!DOCTYPE Document SYSTEM "..\'5cDocument.DTD">\'0d<Document><Control NAME="db_base_url" TYPE="string"><Value>http://usetermassembly/dealbuilder_live/DealBuilderNET/dealbuilder.aspx</Value></Control><C
+ontrol NAME="db_folder_form" TYPE="string"><Value>microsoft</Value></Control><Control NAME="db_folder_stylesheet" TYPE="string"><Value>microsoft</Value></Control><Control NAME="db_folder_image" TYPE="string"><Value>microsoft</Value></Control><Control NAME
+="db_charger_dataset_reference" TYPE="numeric"><Value>9672</Value></Control><Control NAME="db_charger_document_reference" TYPE="numeric"><Value>9672</Value></Control><Control NAME="db_charger_client_name" TYPE="string"><Value>tbc</Value></Control><Control
+ NAME="db_charger_matter_number" TYPE="string"><Value>tbc</Value></Control><Control NAME="db_master_reference" TYPE="string"><Value>USETERMS_SUPPSUPER_ENGLISH</Value></Control><Control NAME="db_master_publish_build" TYPE="string"><Value>2.6</Value></Contr
+ol><Control NAME="db_master_name" TYPE="string"><Value>List of Supplement License Terms Languages</Value></Control><Control NAME="db_master_description" TYPE="string"><Value>\'0d</Value></Control><Control NAME="db_master_version" TYPE="string"><Value>2006032
+9</Value></Control><Control NAME="db_master_clock" TYPE="numeric"><Value>495</Value></Control><Control NAME="db_master_refresh" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_host_create_onload" TYPE="string"><Value></Value></Control><Contr
+ol NAME="db_host_input_onload" TYPE="string"><Value></Value></Control><Control NAME="db_host_output_onload" TYPE="string"><Value></Value></Control><Control NAME="db_host_exception_onload" TYPE="string"><Value></Value></Control><Control NAME="db_host_javas
+cript" TYPE="string"><Value></Value></Control><Control NAME="db_transaction_generator" TYPE="string"><Value>unique</Value></Control><Control NAME="db_transaction_prefix" TYPE="string"><Value></Value></Control><Control NAME="db_transaction_suffix" TYPE="st
+ring"><Value></Value></Control><Control NAME="db_evaluate" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_evaluate_logic" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_evaluate_repeat" TYPE="boolean"><Value>true</Value></Con
+trol><Control NAME="db_evaluate_cross_reference" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_evaluate_calculation" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_evaluate_variable" TYPE="boolean"><Value>true</Value></Contr
+ol><Control NAME="db_evaluate_include" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_codeload_include" TYPE="string"><Value>eager</Value></Control><Control NAME="db_locale_input_date_sequence" TYPE="string"><Value>day_month_year</Value></C
+ontrol><Control NAME="db_locale_input_thousands_char" TYPE="string"><Value>,</Value></Control><Control NAME="db_locale_input_decimalpoint_char" TYPE="string"><Value>.</Value></Control><Control NAME="db_locale_output_date_sequence" TYPE="string"><Value>day
+_month_year</Value></Control><Control NAME="db_locale_output_thousands_char" TYPE="string"><Value>,</Value></Control><Control NAME="db_locale_output_decimalpoint_char" TYPE="string"><Value>.</Value></Control><Control NAME="db_output_hyperlink_target" TYPE
+="string"><Value>_blank</Value></Control><Control NAME="db_output_document_format" TYPE="string"><Value>rtf</Value></Control><Control NAME="db_output_document_redline" TYPE="boolean"><Value>false</Value></Control><Control NAME="db_output_document_redline_
+cause" TYPE="string"><Value>drafting</Value></Control><Control NAME="db_output_document_drafting_notes" TYPE="string"><Value>indefinite</Value></Control><Control NAME="db_output_document_properties" TYPE="string"><Value>true</Value></Control><Control NAME
+="db_output_document_property" TYPE="string"><Value>autosave|text|false</Value><Value>owner|text|REDMOND\'5cmalinf</Value></Control><Control NAME="db_output_document_variable_xml" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_output_document_
+termsheet" TYPE="boolean"><Value>false</Value></Control><Control NAME="db_output_document_answers" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_output_document_answers_column" TYPE="string"><Value>prompt</Value><Value>value</Value></Contr
+ol><Control NAME="db_output_document_answers_row" TYPE="string"><Value>deferred</Value><Value>group</Value><Value>page</Value><Value>sure</Value><Value>unknown</Value><Value>unsure</Value></Control><Control NAME="db_output_document_answers_relaunch_transa
+ction_hyperlink" TYPE="boolean"><Value>false</Value></Control><Control NAME="db_output_document_answers_relaunch_transaction_url" TYPE="string"><Value></Value></Control><Control NAME="db_output_filter_reference" TYPE="string"><Value></Value></Control><Con
+trol NAME="db_output_variable_as" TYPE="string"><Value>alias</Value></Control><Control NAME="db_output_variable_highlights" TYPE="boolean"><Value>false</Value></Control><Control NAME="db_output_variable_sequence" TYPE="string"><Value>ascending</Value></Co
+ntrol><Control NAME="db_output_white_space" TYPE="boolean"><Value>false</Value></Control><Control NAME="db_output_line_breaks" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_input_show_column_headings" TYPE="boolean"><Value>false</Value></C
+ontrol><Control NAME="db_input_heading_repetition_column" TYPE="string"><Value>Repeat</Value></Control><Control NAME="db_input_heading_highlight_column" TYPE="string"><Value>Check</Value></Control><Control NAME="db_input_heading_prompt_column" TYPE="strin
+g"><Value>Prompt</Value></Control><Control NAME="db_input_heading_question_column" TYPE="string"><Value>Answer</Value></Control><Control NAME="db_input_heading_state_column" TYPE="string"><Value>Deferral</Value></Control><Control NAME="db_input_heading_gu
+idance_column" TYPE="string"><Value>Guidance</Value></Control><Control NAME="db_input_heading_comment_column" TYPE="string"><Value>Insert your comments below</Value></Control><Control NAME="db_input_heading_variable_name_column" TYPE="string"><Value>Varia
+ble</Value></Control><Control NAME="db_input_help_url" TYPE="string"><Value>/dealbuilder_live/help/dealbuilder/help.html</Value></Control><Control NAME="db_input_data_validation" TYPE="string"><Value>onsubmit</Value></Control><Control NAME="db_input_show_
+page_title" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_input_show_group_title" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_input_show_repetition_column" TYPE="boolean"><Value>false</Value></Control><Control NAME="db_in
+put_show_state_column" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_input_show_variable_name_column" TYPE="boolean"><Value>false</Value></Control><Control NAME="db_input_show_committed" TYPE="boolean"><Value>false</Value></Control><Contro
+l NAME="db_input_show_group_state" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_input_show_group_state_threshold" TYPE="numeric"><Value>2</Value></Control><Control NAME="db_input_state_display" TYPE="string"><Value>dropdown</Value></Contr
+ol><Control NAME="db_input_state_preselect" TYPE="string"><Value>sure</Value></Control><Control NAME="db_input_unknown_option" TYPE="string"><Value>Unknown</Value></Control><Control NAME="db_input_unknown_position" TYPE="string"><Value>first</Value></Cont
+rol><Control NAME="db_input_other_option" TYPE="string"><Value>Other</Value></Control><Control NAME="db_input_other_position" TYPE="string"><Value>last</Value></Control><Control NAME="db_input_other_width_single" TYPE="numeric"><Value>20</Value></Control>
+<Control NAME="db_input_other_width_multiple" TYPE="numeric"><Value>20</Value></Control><Control NAME="db_input_other_depth_multiple" TYPE="numeric"><Value>4</Value></Control><Control NAME="db_input_other_prompt_multiple" TYPE="string"><Value>Specify othe
+rs:</Value></Control><Control NAME="db_input_other_prompt_single" TYPE="string"><Value>Specify other:</Value></Control><Control NAME="db_input_other_prompt_break_before" TYPE="numeric"><Value>1</Value></Control><Control NAME="db_input_other_prompt_break_a
+fter" TYPE="numeric"><Value>1</Value></Control><Control NAME="db_input_active_separator_sure_multiline" TYPE="string"><Value>, </Value></Control><Control NAME="db_input_active_separator_sure_multiple" TYPE="string"><Value> and </Value></Control><Control N
+AME="db_input_active_separator_unsure_multiple" TYPE="string"><Value> and/or </Value></Control><Control NAME="db_input_active_separator_unsure_single" TYPE="string"><Value> or </Value></Control><Control NAME="db_input_active_boolean_true" TYPE="string"><V
+alue>Yes</Value></Control><Control NAME="db_input_active_boolean_false" TYPE="string"><Value>No</Value></Control><Control NAME="db_input_repeat_navigation_prefix" TYPE="string"><Value>(%1 of %2)&amp\'3bnbsp\'3b</Value></Control><Control NAME="db_input_repeat_na
+vigation_postfix" TYPE="string"><Value></Value></Control><Control NAME="db_input_repeat_navigation_portrayal" TYPE="string"><Value>visible</Value></Control><Control NAME="db_input_repeat_format" TYPE="string"><Value>digits</Value></Control><Control NAME="
+db_input_repeat_prev" TYPE="string"><Value>Prev</Value></Control><Control NAME="db_input_repeat_next" TYPE="string"><Value>Next</Value></Control><Control NAME="db_input_repeat_separator" TYPE="string"><Value>&amp\'3bnbsp\'3b|&amp\'3bnbsp\'3b</Value></Control><Control
+ NAME="db_input_prompt_compulsory_symbol" TYPE="string"><Value>*</Value></Control><Control NAME="db_input_prompt_compulsory_symbol_location" TYPE="string"><Value>after</Value></Control><Control NAME="db_input_question_compulsory_symbol" TYPE="string"><Val
+ue></Value></Control><Control NAME="db_input_question_compulsory_symbol_location" TYPE="string"><Value>after</Value></Control><Control NAME="db_input_disable_when_unknown_compulsory" TYPE="boolean"><Value>true</Value></Control><Control NAME="db_input_disa
+ble_when_unknown_non_compulsory" TYPE="boolean"><Value>false</Value></Control><Control NAME="db_input_simple_alert" TYPE="string"><Value>client_side</Value></Control><Control NAME="db_input_warning_irrelevant_page" TYPE="string"><Value>&lt\'3bU&gt\'3bWARNING:&l
+t\'3b/U&gt\'3b That page is no longer relevant because of answers given on this page or a previous page!</Value></Control><Control NAME="db_input_last_page_next_button" TYPE="string"><Value>enabled</Value></Control><Control NAME="db_input_page_goto_list_content
+" TYPE="string"><Value>relevant_pages</Value></Control><Variable NAME="AdditionalTerms" TYPE="boolean" STATUS="sure"><Value>1</Value></Variable><Variable NAME="CanadaAvail" TYPE="boolean" STATUS="sure"><Value>1</Value></Variable><Variable NAME="CanadaFren
+ch" TYPE="boolean" STATUS="sure"><Value>1</Value></Variable><Variable NAME="DistributableCode" TYPE="boolean" STATUS="sure"><Value>0</Value></Variable><Variable NAME="FileFormat" TYPE="boolean" STATUS="sure"><Value>0</Value></Variable><Variable NAME="Lang
+uage" TYPE="select" STATUS="sure"><Value>Chinese (Simplified)</Value><Value>Chinese (Traditional)</Value><Value>Czech</Value><Value>Danish</Value><Value>Dutch</Value><Value>English</Value><Value>Finnish</Value><Value>French</Value><Value>German</Value><Va
+lue>Greek</Value><Value>Hungarian</Value><Value>Italian</Value><Value>Japanese</Value><Value>Korean</Value><Value>Norwegian (Bokmal)</Value><Value>Polish</Value><Value>Portuguese (Brazil)</Value><Value>Portuguese (Portugal)</Value><Value>Russian</Value><V
+alue>Spanish</Value><Value>Swedish</Value><Value>Turkish</Value></Variable><Variable NAME="MScom" TYPE="boolean" STATUS="sure"><Value>1</Value></Variable><Variable NAME="MediaElementsTemplates" TYPE="boolean" STATUS="sure"><Value>0</Value></Variable><Vari
+able NAME="MultipleProducts" TYPE="boolean" STATUS="sure"><Value>1</Value></Variable><Variable NAME="ProductName" TYPE="string" STATUS="sure"><Value>Microsoft .NET Framework 3.0</Value></Variable><Variable NAME="ProductVersion" TYPE="string" STATUS="sure"
+><Value>0</Value></Variable><Variable NAME="PublishDate" TYPE="date" STATUS="sure"><Value>2006/11/01</Value></Variable><Variable NAME="RetirementDate" TYPE="date" STATUS="sure"><Value>2009/09/01</Value></Variable><Variable NAME="SoftwareType" TYPE="string
+" STATUS="sure"><Value>NA</Value></Variable><Variable NAME="TypeOfRights" TYPE="select" STATUS="sure"><Value>Additional terms for the supplement</Value></Variable><Variable NAME="UnderlyingSoftwareName" TYPE="string" STATUS="sure"><Value>Windows operating
+ system</Value></Variable></Document>}}{\*\ftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6952772 \chftnsep 
+\par }}{\*\ftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6952772 \chftnsepc 
+\par }}{\*\aftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6952772 \chftnsep 
+\par }}{\*\aftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6952772 \chftnsepc 
+\par }}\ltrpar \sectd \ltrsect\sbknone\linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid7030393\sftnbj {\headerl \ltrpar \pard\plain \ltrpar\s71\ql \li0\ri0\sb120\sa120\widctlpar
+\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 \fs20\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af38 \ltrch\fcs0 
+\insrsid16473449 
+\par }}{\headerr \ltrpar \pard\plain \ltrpar\s71\ql \li0\ri0\sb120\sa120\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af38 \ltrch\fcs0 \insrsid16473449 
+\par }}{\footerl \ltrpar \pard\plain \ltrpar\s73\ql \li0\ri0\sb120\sa120\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af38 \ltrch\fcs0 \insrsid16473449 
+\par }}{\footerr \ltrpar \pard\plain \ltrpar\s73\ql \li0\ri0\sb120\sa120\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af38 \ltrch\fcs0 \insrsid16473449 
+\par }}{\headerf \ltrpar \pard\plain \ltrpar\s71\ql \li0\ri0\sb120\sa120\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af38 \ltrch\fcs0 \insrsid16473449 
+\par }}{\footerf \ltrpar \pard\plain \ltrpar\s73\ql \li0\ri0\sb120\sa120\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs20\alang1025 \ltrch\fcs0 
+\fs20\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af38 \ltrch\fcs0 \insrsid16473449 
+\par }}{\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}
+{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8
+\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar
+\s42\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid6648707 \rtlch\fcs1 \ab\af38\afs28\alang1025 \ltrch\fcs0 \b\fs28\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 
+{\rtlch\fcs1 \af38 \ltrch\fcs0 \insrsid12483380\charrsid6952772 \hich\af38\dbch\af11\loch\f38 MICROSOFT SOFTWARE SUPPLEMENT LICENSE TERMS
+\par }\pard\plain \ltrpar\s43\ql \li0\ri0\sb120\sa120\widctlpar\brdrb\brdrs\brdrw10\brsp20 \wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid6648707 \rtlch\fcs1 \ab\af38\afs28\alang1025 \ltrch\fcs0 
+\b\fs28\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af38 \ltrch\fcs0 \insrsid6648707 \hich\af38\dbch\af11\loch\f38 MICROSOFT }{\rtlch\fcs1 \af38 \ltrch\fcs0 \insrsid6453702 \hich\af38\dbch\af11\loch\f38 
+ASP.NET 2.0 {\*\xmlopen\xmlns2{\factoidname City}}{\*\xmlopen\xmlns2{\factoidname place}}\hich\af38\dbch\af11\loch\f38 AJAX{\*\xmlclose}{\*\xmlclose} EXTENSIONS}{\rtlch\fcs1 \af38 \ltrch\fcs0 \insrsid12483380\charrsid6952772 
+\par }\pard\plain \ltrpar\s44\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid6648707 \rtlch\fcs1 \ab\af38\afs20\alang1025 \ltrch\fcs0 
+\b\fs20\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid12483380\charrsid6952772 \hich\af38\dbch\af11\loch\f38 
+Microsoft Corporation (or based on where you live, one of its affiliates) licenses this supplement to you.  If you are licensed to use }{\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid8532277\charrsid6952772 \hich\af38\dbch\af11\loch\f38 Microsoft }{
+\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid6648707 \hich\af38\dbch\af11\loch\f38 Windows operating system}{\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid12483380\charrsid6952772 \hich\af38\dbch\af11\loch\f38 \hich\f38  software (the \'93\loch\f38 
+\hich\f38 software\'94\loch\f38 ), you may use this supplement.  You may not use it if you do \hich\af38\dbch\af11\loch\f38 not have a license for the software.  You may use a copy of this supplement with each validly licensed copy of the software.
+\par \hich\af38\dbch\af11\loch\f38 The following license terms describe}{\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid3893477\charrsid6952772 \hich\af38\dbch\af11\loch\f38  }{\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid12483380\charrsid6952772 
+\hich\af38\dbch\af11\loch\f38 additional use }{\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid15410853\charrsid6952772 \hich\af38\dbch\af11\loch\f38 terms}{\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid12483380\charrsid6952772 \hich\af38\dbch\af11\loch\f38 
+ for this supplement. }{\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid6178267\charrsid6952772 \hich\af38\dbch\af11\loch\f38  }{\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid12483380\charrsid6952772 \hich\af38\dbch\af11\loch\f38 
+These terms and the license terms for the software \hich\af38\dbch\af11\loch\f38 apply to your use of the supplement.  If there is a conflict, these supplemental license terms apply.}{\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid2837055\charrsid6952772 
+
+\par }{\rtlch\fcs1 \af38 \ltrch\fcs0 \caps\insrsid12483380\charrsid6952772 \hich\af38\dbch\af11\loch\f38 By using this supplement, you accept these terms.  If you do not accept them, do not use this supplement.}{\rtlch\fcs1 \af38 \ltrch\fcs0 
+\insrsid12483380\charrsid6952772 
+\par }\pard\plain \ltrpar\s65\ql \li0\ri0\sb120\sa120\widctlpar\brdrt\brdrs\brdrw10\brsp20 \wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid6648707 \rtlch\fcs1 \ab\af38\afs20\alang1025 \ltrch\fcs0 
+\b\fs20\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af38 \ltrch\fcs0 \insrsid12483380\charrsid6952772 
+\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\f38\fs20\insrsid12483380\charrsid6952772 \hich\af38\dbch\af11\loch\f38 1.\tab}}\pard\plain \ltrpar
+\s1\ql \fi-360\li360\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls16\outlinelevel0
+\pnrdate-2035639326\pnrstart0\pnrxst2\pnrxst0\pnrxst0\pnrxst0\pnrxst46\pnrxst0\pnrstop6\pnrstart1\pnrrgb1\pnrrgb0\pnrrgb0\pnrrgb0\pnrrgb0\pnrrgb0\pnrrgb0\pnrrgb0\pnrrgb0\pnrstop9\pnrstart2\pnrnfc0\pnrnfc4\pnrnfc2\pnrnfc3\pnrnfc1\pnrnfc0\pnrnfc4
+\pnrnfc255\pnrnfc255\pnrnfc0\pnrnfc0\pnrnfc1\pnrnfc0\pnrnfc0\pnrnfc0\pnrnfc0\pnrnfc0\pnrnfc0\pnrstop18\pnrstart3\pnrpnbr1\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0
+\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrpnbr0\pnrstop36\adjustright\rin0\lin360\itap0\pararsid5200145 
+\rtlch\fcs1 \ab\af38\afs20\alang1025 \ltrch\fcs0 \b\fs20\lang1033\langfe1033\loch\af38\hich\af38\dbch\af11\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af38 \ltrch\fcs0 \insrsid12483380\charrsid6952772 \hich\af38\dbch\af11\loch\f38 
+SUPPORT SERVICES FOR SUPPLEMENT.  }{\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid12483380\charrsid6952772 \hich\af38\dbch\af11\loch\f38 Microsoft \hich\af38\dbch\af11\loch\f38 provides support services for }{\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 
+\b0\insrsid15410853\charrsid6952772 \hich\af38\dbch\af11\loch\f38 this software}{\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid12483380\charrsid6952772 \hich\af38\dbch\af11\loch\f38  as described at }{\field\flddirty{\*\fldinst {\rtlch\fcs1 \ab0\af38 
+\ltrch\fcs0 \cs49\b0\ul\cf2\insrsid10565710\charrsid10565710 \hich\af38\dbch\af11\loch\f38  HYPERLINK "http://www.support.microsoft.com/common/international.aspx" }{\rtlch\fcs1 \af38 \ltrch\fcs0 \b0\ul\cf2\insrsid10760272\charrsid10565710 {\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b0200000017000000340000007700770077002e0073007500700070006f00720074002e006d006900630072006f0073006f00660074002e0063006f006d002f0063006f006d006d006f006e002f0069006e007400650072006e006100740069006f006e0061006c002e0061007300
+700078000000e0c9ea79f9bace118c8200aa004ba90b7600000068007400740070003a002f002f007700770077002e0073007500700070006f00720074002e006d006900630072006f0073006f00660074002e0063006f006d002f0063006f006d006d006f006e002f0069006e007400650072006e006100740069006f006e
+0061006c002e0061007300700078000000002100000064}}}{\fldrslt {\rtlch\fcs1 \af38 \ltrch\fcs0 \cs49\b0\ul\cf2\insrsid10565710\charrsid10565710 \hich\af38\dbch\af11\loch\f38 www.support.microsoft.com/common/international.aspx}}}\sectd \ltrsect
+\sbknone\linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid7030393\sftnbj {\rtlch\fcs1 \ab0\af38 \ltrch\fcs0 \b0\insrsid12483380\charrsid10565710 .}{\rtlch\fcs1 \af38 \ltrch\fcs0 \insrsid11613206\charrsid10565710 
+\par {\listtext\pard\plain\ltrpar \s1 \rtlch\fcs1 \ab\af0\afs20 \ltrch\fcs0 \b\f38\fs20\insrsid9069536\charrsid9069536 \hich\af38\dbch\af11\loch\f38 2.\tab}}\pard \ltrpar
+\s1\ql \fi-360\li360\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls16\outlinelevel0\adjustright\rin0\lin360\itap0\pararsid14303978 {\rtlch\fcs1 \af38 \ltrch\fcs0 \insrsid9069536\charrsid9069536 \hich\af38\dbch\af11\loch\f38 
+MICROSOFT AJAX LIBRARY. }{\rtlch\fcs1 \af38 \ltrch\fcs0 \b0\insrsid9069536\charrsid9069536 \hich\af38\dbch\af11\loch\f38 This supplement }{\rtlch\fcs1 \af38 \ltrch\fcs0 \b0\insrsid9069536 \hich\af38\dbch\af11\loch\f38 includes the Microsoft AJAX Library}{
+\rtlch\fcs1 \af38 \ltrch\fcs0 \b0\insrsid5965347 .}{\rtlch\fcs1 \af38 \ltrch\fcs0 \b0\insrsid14825882 \hich\af38\dbch\af11\loch\f38  }{\rtlch\fcs1 \af38 \ltrch\fcs0 \b0\insrsid5965347 \hich\af38\dbch\af11\loch\f38 
+The license terms accompanying that additional}{\rtlch\fcs1 \af38 \ltrch\fcs0 \b0\insrsid6693430 \hich\af38\dbch\af11\loch\f38  }{\rtlch\fcs1 \af38 \ltrch\fcs0 \b0\insrsid5848133 \hich\af38\dbch\af11\loch\f38 software }{\rtlch\fcs1 \af38 \ltrch\fcs0 
+\b0\insrsid5965347 \hich\af38\dbch\af11\loch\f38 apply to it}{\rtlch\fcs1 \af38 \ltrch\fcs0 \b0\insrsid5848133 .}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid13004705\charrsid13004705 
+\par }\pard \ltrpar\s1\ql \li0\ri0\sb120\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0\pararsid13004705 {\rtlch\fcs1 \af38 \ltrch\fcs0 \b0\insrsid9069536\charrsid9069536 \hich\af38\dbch\af11\loch\f38  }{
+\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid3807310\charrsid9069536 
+\par }{\*\themedata 504b030414000600080000002100828abc13fa0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb6ac3301045f785fe83d0b6d8
+72ba28a5d8cea249777d2cd20f18e4b12d6a8f843409c9df77ecb850ba082d74231062ce997b55ae8fe3a00e1893f354e9555e6885647de3a8abf4fbee29bbd7
+2a3150038327acf409935ed7d757e5ee14302999a654e99e393c18936c8f23a4dc072479697d1c81e51a3b13c07e4087e6b628ee8cf5c4489cf1c4d075f92a0b
+44d7a07a83c82f308ac7b0a0f0fbf90c2480980b58abc733615aa2d210c2e02cb04430076a7ee833dfb6ce62e3ed7e14693e8317d8cd0433bf5c60f53fea2fe7
+065bd80facb647e9e25c7fc421fd2ddb526b2e9373fed4bb902e182e97b7b461e6bfad3f010000ffff0300504b030414000600080000002100a5d6a7e7c00000
+00360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4fc7060abb08
+84a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b63095120f88d94fbc
+52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462a1a82fe353
+bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f7468656d652f7468
+656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b4b0d592c9c
+070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b4757e8d3f7
+29e245eb2b260a0238fd010000ffff0300504b0304140006000800000021000bcba3ae95060000561b0000160000007468656d652f7468656d652f7468656d65
+312e786d6cec594d6f1b4518be23f11f467b6f6327b61b4775aad8b11b48d346b15bd4e37877bc3bcdecce6a669cd437d41e9190100571a012370e08a8d44a5c
+caaf09144191fa17786766d7dec96e48d24650417d48bcb3cfbcdfef331fbe7aed7eccd0011192f2a4e3d52fd73c44129f0734093bdeedd1e0d2aa87a4c24980
+194f48c79b11e95d5b7fffbdab784d45242608e627720d77bc48a9746d6949fa308ce5659e9204de4db888b18247112e05021f82dc982d2dd76aada518d3c443
+098e41ecadc984fa048db4486f3d17de67f09828a9077c26865a347166186cb05fd70839933d26d001661d0ff404fc7044ee2b0f312c15bce87835f3f196d6af
+2ee1b56c125327cc2dcc1b984f362f9b10ec2f1b9d221ccf95d6078df695cdb97c0360aa8cebf7fbbd7e7d2ecf00b0ef83a7d696a2ccc660b5decd651640f66b
+5976afd6ac355c7c41fe4ac9e676b7db6db6335bac5003b25f1b25fc6aadd5d85876f00664f1cd12bed1dde8f55a0ede802cbe55c20faeb45b0d176f4011a3c9
+7e09ad133a1864d2e79009675b95f05580afd632f80205d530af2ead62c2137552adc5f81e1703006820c38a2648cd5232c13e54710fc76341b15680d7082ebc
+b143be2c0d695d48fa82a6aae37d9862e88885bc57cfbf7ff5fc293a7af0ece8c14f470f1f1e3df8d10a72666de1242cce7af9ed677f3efe18fdf1f49b978fbe
+a8c6cb22fed71f3ef9e5e7cfab81d03e0b735e7cf9e4b7674f5e7cf5e9efdf3daa806f083c2ec247342612dd2487688fc7e098898a6b39198bf3cd1845981667
+6c24a1c409d65a2ae4f755e4a06fce30cbb2e3d8d1256e04ef08a08f2ae0f5e93dc7e06124a68a5668de8e6207b8c339eb725119856dadab10e6d13409ab958b
+6911b787f14195ee1e4e9cfcf6a729f0665e968ee3bd883866ee329c281c928428a4dff17d422abcbb4ba913d71dea0b2ef944a1bb147531ad0cc9888e9d6a5a
+4cdaa231e46556e533e4db89cdce1dd4e5accaeb4d72e022a12b30ab307e449813c6eb78aa705c25728463560cf80daca22a238733e117717da920d321611cf5
+032265d59c5b02fc2d247d1b036355a67d87cd62172914ddaf927903735e446ef2fd5e84e3b40a3ba44954c47e20f7a14431dae5aa0abec3dd0ed1cf90079c9c
+98ee3b9438e93e9d0d6ed3d031695120facd54e85c02553b0c1cd3e4efe89851e0635b031747c740802fbe7e5c51596f2b116fc09a54d5095bc7e8f724dc71d2
+ed7111d0b79f7337f134d92550e6e585e71de5bea35cef3f4fb927f5f3598976c1ad40bb7adf6037c5668b1c9fb8439e50c6866ac6c80d6936c912d689600083
+7a9e391d92f989298de06bc6eb0e2e14d8cc4182ab8fa88a86114e61835df7b4905066a24389522ee16067862b656b3c6cd2953d1636f581c1f281c46a870776
+78450fe7e782b918b3da84e6f0992b5ad102ceaa6ce54a2614dc7e1d65756dd499b5d58d6986ea1c6d7397218765d760701e4dd88020d8b640945b703ed7aae1
+6082190974dcedda9ba7c564e1225324231c902c47daef728eea264979ad989b00a89d8a1ce943de29512b686b6bb16fa0ed2c492aaa6b9ca02ecfde9b6429af
+e0459674df1e6b4796149b9325e8b0e3b59bcb4d0ff938ed781338d3c2d73885ac4bbde7c32c848b215f095bf6a736b3e9f24536dbb9636e13d4e19ac2c6bde4
+b0c303a9906a13cbc89686799595004bb4266bff7213c27a510ed84a7f0d2b5656a118fe352b208e6e6ac964427c554c766144c7ce3e6654caa78a8861141ca2
+319b8a3d0ce9d7a50afe0454c2d5846104fd00f7683adae6954bce59d3156faf0cce8e63964638a35bdda279275bb8e9e3b90de6a9601ef85669bb71eefcae98
+96bf20578a65fc3f7345af277053b012e80cf8708d2b30d2fddaf1b8501107164a23ea0f046c1c0c7740b5c05d2cbc86a282cb64f35f9003fddff69c9561da1a
+0e7c6a8f864850588f542408d9055a32d5778ab07ab67659912c13642aaa60ae4cadd9637240d84873604bafed1e8aa0d40d9b64346070c7ebcf7dce3a681cea
+4d4eb1df1c0e99afbdb607fee99d8f6d6670cae561b3a1c9e33f37b16255b5f3cdf47ced2d3aa25f2cb6598dbc2b4059612968676dff9a269c73a9b58c55f278
+b9991b07592c7b0c83f30d510af73d48ff81f58f0a9fd95f26f4823ae27bc0ad087e68c88c4250d6975a9aee3c040c998f8e33e2cc23ac85d9e0669b271db77c
+b9bee0bdaedd0795fc3ff35ef79ce19e6fcfdcec3add78a1e1ce63ec863b1bb5dd5b116ec8eff14685a1497e9c31c9313f6c157f7be2e37b90ee4db8e59f3225
+4d48e197258161033a34dd001460359aa9eb7f010000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d652f7468
+656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d363f2451
+eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e319872
+0e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d9850528a2
+c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100828abc13fa0000001c020000130000000000000000000000000000
+0000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000000000
+2b0100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000014020000746865
+6d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d00140006000800000021000bcba3ae95060000561b00001600000000000000000000
+000000d10200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000000000
+000000000000009a0900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000950a00000000}
+{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
+6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
+656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
+{\*\latentstyles\lsdstimax266\lsdlockeddef0\lsdsemihiddendef1\lsdunhideuseddef1\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdlocked0 heading 1;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;
+\lsdpriority39 \lsdlocked0 toc 1;\lsdpriority39 \lsdlocked0 toc 2;\lsdpriority39 \lsdlocked0 toc 3;\lsdpriority39 \lsdlocked0 toc 4;\lsdpriority39 \lsdlocked0 toc 5;\lsdpriority39 \lsdlocked0 toc 6;\lsdpriority39 \lsdlocked0 toc 7;
+\lsdpriority39 \lsdlocked0 toc 8;\lsdpriority39 \lsdlocked0 toc 9;\lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdpriority1 \lsdlocked0 Default Paragraph Font;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority59 \lsdlocked0 Table Grid;\lsdunhideused0 \lsdlocked0 Placeholder Text;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdunhideused0 \lsdlocked0 Revision;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 4;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdpriority37 \lsdlocked0 Bibliography;}}{\*\datastore 0105000002000000180000004d73786d6c322e534158584d4c5265616465722e352e3000000000000000000000060000
+d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffffec69d9888b8b3d4c859eaf6cd158be0f0000000000000000000000009011
+9a8b6712c701feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000105000000000000}}
\ No newline at end of file
diff --git a/lib/Net/2.0/NMS.dll b/lib/Net/2.0/NMS.dll
new file mode 100644
index 00000000..7a8e73fe
Binary files /dev/null and b/lib/Net/2.0/NMS.dll differ
diff --git a/lib/Net/2.0/NUnitAsp.dll b/lib/Net/2.0/NUnitAsp.dll
new file mode 100644
index 00000000..9f45eff8
Binary files /dev/null and b/lib/Net/2.0/NUnitAsp.dll differ
diff --git a/lib/Net/2.0/NUnitAspEx.dll b/lib/Net/2.0/NUnitAspEx.dll
new file mode 100644
index 00000000..95c1eb4b
Binary files /dev/null and b/lib/Net/2.0/NUnitAspEx.dll differ
diff --git a/lib/Net/2.0/Quartz.dll b/lib/Net/2.0/Quartz.dll
new file mode 100644
index 00000000..29196034
Binary files /dev/null and b/lib/Net/2.0/Quartz.dll differ
diff --git a/lib/Net/2.0/Rhino.Mocks.dll b/lib/Net/2.0/Rhino.Mocks.dll
new file mode 100644
index 00000000..2fe6ed8a
Binary files /dev/null and b/lib/Net/2.0/Rhino.Mocks.dll differ
diff --git a/lib/Net/2.0/System.Web.Extensions.dll b/lib/Net/2.0/System.Web.Extensions.dll
new file mode 100644
index 00000000..11fdd5c9
Binary files /dev/null and b/lib/Net/2.0/System.Web.Extensions.dll differ
diff --git a/lib/Net/2.0/antlr.runtime.dll b/lib/Net/2.0/antlr.runtime.dll
new file mode 100644
index 00000000..f242d024
Binary files /dev/null and b/lib/Net/2.0/antlr.runtime.dll differ
diff --git a/lib/Net/2.0/log4net.dll b/lib/Net/2.0/log4net.dll
new file mode 100644
index 00000000..ffc57e11
Binary files /dev/null and b/lib/Net/2.0/log4net.dll differ
diff --git a/lib/Net/2.0/log4net.license.txt b/lib/Net/2.0/log4net.license.txt
new file mode 100644
index 00000000..29f81d81
--- /dev/null
+++ b/lib/Net/2.0/log4net.license.txt
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/lib/Net/2.0/nunit.core.dll b/lib/Net/2.0/nunit.core.dll
new file mode 100644
index 00000000..3f06941f
Binary files /dev/null and b/lib/Net/2.0/nunit.core.dll differ
diff --git a/lib/Net/2.0/nunit.core.interfaces.dll b/lib/Net/2.0/nunit.core.interfaces.dll
new file mode 100644
index 00000000..aca4c6d5
Binary files /dev/null and b/lib/Net/2.0/nunit.core.interfaces.dll differ
diff --git a/lib/Net/2.0/nunit.framework.dll b/lib/Net/2.0/nunit.framework.dll
new file mode 100644
index 00000000..42cc12cf
Binary files /dev/null and b/lib/Net/2.0/nunit.framework.dll differ
diff --git a/license.txt b/license.txt
new file mode 100644
index 00000000..29f81d81
--- /dev/null
+++ b/license.txt
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/readme.txt b/readme.txt
new file mode 100644
index 00000000..827340f5
--- /dev/null
+++ b/readme.txt
@@ -0,0 +1,176 @@
+THE SPRING.NET FRAMEWORK, Release 1.1.2  (May 6, 2008)
+--------------------------------------------------------------------
+http://www.springframework.net/
+
+
+1. INTRODUCTION
+
+The 1.1 release of Spring.NET contains
+
+     * A full featured Inversion of Control container 
+     * An Aspect Oriented Programming framework
+     * Expression Language for lightweight scripting
+     * UI-agnostic validation framework
+     * ASP.NET Framework 
+       - Dependency Injection for pages and user controls, bi-directional data binding, and more.
+     * Declarative transaction management abstraction
+       - Declarative transaction management via use of common XML configuration and attributes across different transaction APIs
+     * ADO.NET framework
+       - Simplifies use of ADO.NET.  DAO support classes and integration with Spring's declarative transaction management functionality
+     * Portable Service Abstractions  
+       - Export plain .NET objects via .NET Remoting, Web Service or .NET Serviced Component and create client side proxies based on endpoint URL and service interface.
+     * NHibernate Integation
+       - NHibernate 1.0 and 1.2 integration to simplify use of NHibernate and participate in Spring's declarative transaction management functionality.
+     * ASP.NET AJAX Integration
+       - Exporter to expose plain object on which Dependency Injection and AOP have been applied to JavaScript.
+     * NUnit integration 
+       - Provides Dependency Injection of test cases and Spring container loading and caching. .  Data access and transaction management features aid with integration testing.
+
+Spring.NET is a port of the Java based Spring Framework. In turn, the Java/J2EE Spring Framework is based on code published in "Expert One-on-One J2EE Design and Development" by Rod Johnson (Wrox, 2002). 
+
+
+2. KNOWN ISSUES
+
+The fallback rules for localized resources seem to have a bug that is fixed by applying Service Pack 1 for .NET 1.1.  This affects the use of IMessageSource.GetMessage methods that specify CultureInfo.
+
+3. RELEASE INFO
+
+Release contents:
+
+* "src" contains the C# source files for the framework
+* "test" contains the C# source files for Spring.NET's test suite
+* "bin" contains various Spring.NET distribution dll files
+* "lib/Net" contains shared third-party libraries needed for building the framework
+* "lib/NHibernate10" contains NHibernate 1.0 dlls
+* "lib/NHibernate12" contains NHibernate 1.2 dlls
+* "doc" contains reference documentation, MSDN-style API help, and the Spring.NET xsd.
+* "examples" contains sample applications.
+
+debug build is done using /DEBUG:full and release build using /DEBUG:pdbonly flags.
+
+The VS.NET solution for the framework and examples are provided.  
+
+Latest info is available at the public website: http://www.springframework.net/
+
+Project info at the SourceForge site: http://sourceforge.net/projects/springnet/
+
+The Spring Framework is released under the terms of the Apache Software License (see license.txt).
+
+
+4. DISTRIBUTION DLLs
+
+The "bin" directory contains the following distinct dll files for use in applications. Dependencies are those other than on the .NET BCL.
+
+* "Spring.Core" (~596 KB)
+- Contents: Inversion of control container. Collection classes. 
+- Dependencies: antlr.runtime, Common.Logging
+
+* "Spring.Aop" (~144 KB)
+- Contents: Abstract Oriented Programming Framework.
+- Dependencies: Spring.Core, Common.Logging
+
+* "Spring.Data" (~312 KB)
+- Contents: Transaction and ADO.NET Framework.
+- Dependencies: Spring.Core, Spring.Aop
+
+* "Spring.Data.NHibernate" (~68 KB)
+- Contents: NHibernate 1.0 integration
+- Dependencies: Spring.Core, Spring.Aop, Spring.Data, NHibernate
+
+* "Spring.Data.NHibernate12" (~84 KB)
+- Contents: NHibernate 1.2 integration
+- Dependencies: Spring.Core, Spring.Aop, Spring.Data, NHibernate
+
+* "Spring.Services" (~72 KB)
+- Contents: Web Services, Remoting, and Enterprise Component based services.
+- Dependencies: Spring.Core, Spring.Aop
+
+* "Spring.Web" (~156 KB)
+- Contents: ASP.NET based Web Application Framework.
+- Dependencies: Spring.Core, Spring.Aop
+
+* "Spring.Web.Extensions" (~8 KB)
+- Contents: ASP.NET AJAX Integartion
+- Dependencies: Spring.Core, Spring.Aop, System.Web.Extensions
+
+* "Spring.Testing.NUnit" (~24 KB)
+- Contents: NUnit Integration
+- Dependencies: Spring.Core, Spring.Data, NUnit
+
+5. WHERE TO START?
+
+Documentation can be found in the "docs" directory:
+* The Spring reference documentation
+
+Documented sample applications can be found in "examples":
+* IoCQuickStart.MovieFinder - A simple example demonstrating basic IoC container behavior.
+* IoCQuickStart.AppContext - Show use of various IApplicationContext features.
+* IoCQuickStart.EventRegistry - Show use of loosely coupled eventing features.
+* AopQuickStart - Show use of AOP features.
+* SpringAir - Show use of Spring.Web features.
+* Calculator - Show use of Spring.Services features.
+* WebQuickStart - Show step by step usage of Spring.Web features.
+* Web.Extensions.Example - Show ASP.NET AJAX integartion.
+* DataQuickStart - Show use of Spring.Data data access features.
+* TxQuickStart - Show use of Spring's transaction features.
+* Data.NHibernate.Northwind - Show use of Spring's NHibernate features.
+
+6. How to build
+
+VS.NET
+------
+There are three solution file for different version of VS.NET
+
+* Spring.Net.1.0.2002.sln for use with VS.NET 2002
+* Spring.Net.1.1.2003.sln for use with VS.NET 2003
+* Spring.Net.1.1.2005.sln for use with VS.NET 2005
+
+NAnt
+----
+
+A NAnt build script can be obtained via CVS or nightly builds.   You will need to 
+get the supporting tools directory from CVS as well.
+
+To build the source and run the unit tests type
+
+nant test -D:project.build.sign=false
+
+NOTE!  You need to comment out the <startup> section of NAnt.exe.config in order to
+property run unit tests under different version of the .NET framework.
+
+Debug builds are strongly named using the Spring.Net.snk key file.  The ANTLR assemblies
+are signed with this key as well until such time as the ANTR distribution provides their
+own strongly signed assemblies.  If you want to run the build to creat strongly signed
+assebmlies you can generate a key file by executing the following commands
+
+sn -k Spring.Net.snk
+nant
+
+The installation of the docbook toolchain is required to generate the reference
+documentation and make a final release build. Refer to the Spring.NET Wiki at
+http://opensource.atlassian.com/confluence/spring/display/NET/Docbook+Reference
+for information on how to install the docbook toolchain.
+
+Innovasys Document X! is used to generate the SDK documentation.
+
+
+7. Support
+
+The user forms at http://forum.springframework.net/ are available for you to submit questions, support requests, and interact with other Spring.NET users.
+
+Bug and issue tracking can be found at http://opensource.atlassian.com/projects/spring/secure/BrowseProject.jspa?id=10020
+
+The Spring.NET wiki is located at http://opensource.atlassian.com/confluence/spring/display/NET/Home
+
+A Fisheye repository browser is located at http://fisheye1.cenqua.com/viewrep/springnet
+
+8. Acknowledgements
+
+InnovaSys Document X!
+---------------------
+InnovSys has kindly provided a license to generate the SDK documentation and supporting utilities for
+integration with Visual Studio. 
+
+
+
+
diff --git a/src/Spring/CommonAssemblyInfo.cs b/src/Spring/CommonAssemblyInfo.cs
new file mode 100644
index 00000000..3c7daf91
--- /dev/null
+++ b/src/Spring/CommonAssemblyInfo.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Reflection;
+[assembly: CLSCompliant(false)]
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+
+#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 1.1")]
+[assembly: AssemblyCopyright("Copyright 2002-2007 Spring.NET Framework Team.")]
+[assembly: AssemblyTrademark("Apache License, Version 2.0")]
+[assembly: AssemblyCulture("")]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      .NET Framework Version (RR)
+//      Revision = "1" for builds with VS.NET, nant build is # of days since 'project.year' 
+//      property
+//
+//
+// This is to support side-by-side deployment of .NET 1.1 and .NET 2.0 versions of the assembly.
+#if !NET_2_0
+[assembly: AssemblyVersion("1.1.1.11001")]
+#else
+[assembly: AssemblyVersion("1.1.1.20001")]
+#endif
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+#if STRONG
+[assembly: AssemblyDelaySign(false)]
+#if !NET_2_0
+[assembly: AssemblyKeyFile("Spring.Net.snk")]
+#endif
+#endif
diff --git a/src/Spring/GenCommonAssemblyInfo.cs b/src/Spring/GenCommonAssemblyInfo.cs
new file mode 100644
index 00000000..43cd3a2b
--- /dev/null
+++ b/src/Spring/GenCommonAssemblyInfo.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Reflection;
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.1433
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyConfigurationAttribute("net-2.0.win32; debug")]
+[assembly: AssemblyProductAttribute("Spring.NET Framework 1.1.2 for .NET 2.0")]
+[assembly: AssemblyCompanyAttribute("SpringSource")]
+[assembly: AssemblyCopyrightAttribute("Copyright 2002-2008 Spring.NET Framework Team.")]
+[assembly: AssemblyTrademarkAttribute("Apache License, Version 2.0")]
+[assembly: AssemblyCultureAttribute("")]
+[assembly: AssemblyVersionAttribute("1.1.2.20148")]
+[assembly: AssemblyDelaySignAttribute(false)]
+
diff --git a/src/Spring/Spring.Aop/Aop/Config/AopNamespaceParser.cs b/src/Spring/Spring.Aop/Aop/Config/AopNamespaceParser.cs
new file mode 100644
index 00000000..3a54a5ea
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Config/AopNamespaceParser.cs
@@ -0,0 +1,56 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 Spring.Objects.Factory.Xml;
+
+namespace Spring.Aop.Config
+{
+    /// <summary>
+    /// Namespace parser for the aop namespace.
+    /// </summary>
+    /// <remarks>
+    /// Using the <code>advisor</code> tag you can configure an <see cref="IAdvisor"/> and have it
+    /// applied to all the relevant objects in your application context automatically.  The
+    /// <code>advisor</code> tag supports only referenced <see cref="IPointcut"/>s.
+    /// </remarks>
+    /// <author>Rob harrop</author>
+    /// <author>Adrian Colyer</author>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AopNamespaceParser.cs,v 1.3 2007/08/09 02:42:35 markpollack Exp $</version>
+    [
+        NamespaceParser(
+            Namespace = "http://www.springframework.net/aop",
+            SchemaLocationAssemblyHint = typeof (AopNamespaceParser),
+            SchemaLocation = "/Spring.Aop.Config/spring-aop-1.1.xsd"
+            )
+    ]
+    public class AopNamespaceParser : NamespaceParserSupport
+    {
+        /// <summary>
+        /// Register the <see cref="IObjectDefinitionParser"/> for the '<code>config</code>' tag.
+        /// </summary>
+        public override void Init()
+        {
+            RegisterObjectDefinitionParser("config", new ConfigObjectDefinitionParser());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Config/AopNamespaceUtils.cs b/src/Spring/Spring.Aop/Aop/Config/AopNamespaceUtils.cs
new file mode 100644
index 00000000..63d44501
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Config/AopNamespaceUtils.cs
@@ -0,0 +1,99 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Xml;
+using Spring.Aop.Framework.AutoProxy;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+using Spring.Util;
+
+#endregion
+
+
+namespace Spring.Aop.Config
+{
+    /// <summary>
+    /// Utility class for handling registration of auto-proxy creators used internally by the
+    /// <code>aop</code> namespace tags.
+    /// </summary>
+    /// <author>Rob Harrop</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AopNamespaceUtils.cs,v 1.4 2007/05/26 19:25:48 markpollack Exp $</version>
+    public class AopNamespaceUtils
+    {
+
+        /// <summary>
+        ///  The object name of the internally managed auto-proxy creator.
+        /// </summary>
+        public const string AUTO_PROXY_CREATOR_OBJECT_NAME =
+                    "Spring.Aop.Config.InternalAutoProxyCreator";
+
+
+
+        /// <summary>
+        /// Registers the auto proxy creator if necessary.
+        /// </summary>
+        /// <param name="parserContext">The parser context.</param>
+        /// <param name="sourceElement">The source element.</param>
+        public static void RegisterAutoProxyCreatorIfNecessary(ParserContext parserContext, XmlElement sourceElement)
+        {
+            RegisterApcAsRequired(typeof(DefaultAdvisorAutoProxyCreator), parserContext);
+        }
+
+        /// <summary>
+        /// Registries the or escalate apc as required.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <param name="parserContext">The parser context.</param>
+        private static void RegisterApcAsRequired(Type type, ParserContext parserContext)
+        {
+            AssertUtils.ArgumentNotNull(parserContext, "parserContext");
+            IObjectDefinitionRegistry registry = parserContext.Registry;
+
+
+            if (!registry.ContainsObjectDefinition(AUTO_PROXY_CREATOR_OBJECT_NAME))
+            {
+                RootObjectDefinition objectDefinition = new RootObjectDefinition(type);
+                //TODO source/role not yet implemented in .NET
+                objectDefinition.PropertyValues.Add("order", int.MaxValue);
+                registry.RegisterObjectDefinition(AUTO_PROXY_CREATOR_OBJECT_NAME, objectDefinition);           
+            }
+
+        }
+
+        /// <summary>
+        /// Forces the auto proxy creator to use decorator proxy.
+        /// </summary>
+        /// <param name="registry">The registry.</param>
+        public static void ForceAutoProxyCreatorToUseDecoratorProxy(IObjectDefinitionRegistry registry)
+        {
+            if (registry.ContainsObjectDefinition(AUTO_PROXY_CREATOR_OBJECT_NAME))
+            {
+                IObjectDefinition definition = registry.GetObjectDefinition(AUTO_PROXY_CREATOR_OBJECT_NAME);
+                definition.PropertyValues.Add("ProxyTargetType", true);
+            }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Aop/Aop/Config/ConfigObjectDefinitionParser.cs b/src/Spring/Spring.Aop/Aop/Config/ConfigObjectDefinitionParser.cs
new file mode 100644
index 00000000..4767c280
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Config/ConfigObjectDefinitionParser.cs
@@ -0,0 +1,159 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Xml;
+using Spring.Aop.Support;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+using Spring.Util;
+
+namespace Spring.Aop.Config
+{
+    /// <summary>
+    /// The <see cref="IObjectDefinitionParser"/> for the <code>&lt;aop:config&gt;</code> tag.
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ConfigObjectDefinitionParser.cs,v 1.3 2008/02/20 14:29:13 bbaia Exp $</version>
+    public class ConfigObjectDefinitionParser : IObjectDefinitionParser
+    {
+        /// <summary>
+        /// The '<code>proxy-target-type</code>' attribute
+        /// </summary>
+        private static readonly string PROXY_TARGET_TYPE = "proxy-target-type";
+
+        private static readonly string ID = "id";
+
+        private static readonly string ORDER_PROPERTY = "order";
+
+        private static readonly string ADVICE_REF = "advice-ref";
+
+        private static readonly string ADVICE_OBJECT_NAME = "adviceObjectName";
+
+        private static readonly string POINTCUT_REF = "pointcut-ref";
+
+
+        #region IObjectDefinitionParser Members
+
+        /// <summary>
+        /// Parse the specified XmlElement and register the resulting
+        /// ObjectDefinitions with the <see cref="ParserContext.Registry"/> IObjectDefinitionRegistry
+        /// embedded in the supplied <see cref="ParserContext"/>
+        /// </summary>
+        /// <param name="element">The element to be parsed.</param>
+        /// <param name="parserContext">The object encapsulating the current state of the parsing process.
+        /// Provides access to a IObjectDefinitionRegistry</param>
+        /// <returns>The primary object definition.</returns>
+        /// <remarks>
+        /// 	<p>
+        /// This method is never invoked if the parser is namespace aware
+        /// and was called to process the root node.
+        /// </p>
+        /// </remarks>
+        public IObjectDefinition ParseElement(XmlElement element, ParserContext parserContext)
+        {
+            ConfigureAutoProxyCreator(parserContext, element);
+            XmlNodeList advisorNodes = element.GetElementsByTagName("advisor", element.NamespaceURI);
+
+            //XmlNodeList advisorNodes = element.SelectNodes("*[local-name()='advisor' and namespace-uri()='" + element.NamespaceURI + "']");
+            foreach (XmlElement advisorElement in advisorNodes)
+            {
+                ParseAdvisor(advisorElement, parserContext);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Parses the supplied advisor element and registers the resulting <see cref="IAdvisor"/> 
+        /// </summary>
+        /// <param name="advisorElement">The advisor element.</param>
+        /// <param name="parserContext">The parser context.</param>
+        private void ParseAdvisor(XmlElement advisorElement, ParserContext parserContext)
+        {
+            AbstractObjectDefinition advisorDef = CreateAdvisorObjectDefinition(advisorElement, parserContext);
+            string id = advisorElement.GetAttribute(ID);
+
+            string pointcutObjectName = ParsePointcutProperty(advisorElement, parserContext);
+            advisorDef.PropertyValues.Add(POINTCUT_REF, new RuntimeObjectReference(pointcutObjectName));
+            string advisorObjectName = id;
+            if (StringUtils.HasText(advisorObjectName))
+            {
+                parserContext.Registry.RegisterObjectDefinition(advisorObjectName, advisorDef);
+            }
+            else
+            {
+                parserContext.ReaderContext.RegisterWithGeneratedName(advisorDef);
+            }
+        }
+
+
+        private string ParsePointcutProperty(XmlElement element, ParserContext parserContext)
+        {
+            if (element.HasAttribute(POINTCUT_REF))
+            {
+                string pointcutRef = element.GetAttribute(POINTCUT_REF);
+                if (!StringUtils.HasText(pointcutRef))
+                {
+                    parserContext.ReaderContext.ReportException(element, "advisor", "'pointcut-ref' attribute contains empty value.");
+                }
+                return pointcutRef;
+            }
+            else
+            {
+                parserContext.ReaderContext.ReportException(element, "advisor", "'must define 'pointcut-ref' on <advisor> tag.");
+                return null;
+            }
+        }
+
+
+        private AbstractObjectDefinition CreateAdvisorObjectDefinition(XmlElement advisorElement, ParserContext parserContext)
+        {
+            ObjectDefinitionBuilder advisorDefinitionBuilder =
+                parserContext.ParserHelper.CreateRootObjectDefinitionBuilder(typeof(DefaultObjectFactoryPointcutAdvisor));
+
+            if (advisorElement.HasAttribute(ORDER_PROPERTY))
+            {
+                advisorDefinitionBuilder.AddPropertyValue(ORDER_PROPERTY, advisorElement.GetAttribute(ORDER_PROPERTY));
+            }
+
+            advisorDefinitionBuilder.AddPropertyValue(ADVICE_OBJECT_NAME, advisorElement.GetAttribute(ADVICE_REF));
+
+
+            return advisorDefinitionBuilder.ObjectDefinition;
+        }
+
+
+        private static void ConfigureAutoProxyCreator(ParserContext parserContext, XmlElement element)
+        {
+            AopNamespaceUtils.RegisterAutoProxyCreatorIfNecessary(parserContext, element);
+
+            bool proxyTargetClass =
+                parserContext.ParserHelper.IsTrueStringValue(element.GetAttribute(PROXY_TARGET_TYPE));
+            if (proxyTargetClass)
+            {
+                AopNamespaceUtils.ForceAutoProxyCreatorToUseDecoratorProxy(parserContext.Registry);
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Config/spring-aop-1.1.xsd b/src/Spring/Spring.Aop/Aop/Config/spring-aop-1.1.xsd
new file mode 100644
index 00000000..552faf60
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Config/spring-aop-1.1.xsd
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://www.springframework.net/aop"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:objects="http://www.springframework.net"
+		xmlns:tool="http://www.springframework.net/tool"
+		targetNamespace="http://www.springframework.net/aop"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.net"/>
+	<xsd:import namespace="http://www.springframework.net/tool"/>
+
+	<xsd:annotation>
+		<xsd:documentation><![CDATA[
+	Defines the configuration elements for the Spring Framework's AOP support.
+		]]></xsd:documentation>
+	</xsd:annotation>
+
+	<xsd:element name="config">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	A section (compartmentalization) of AOP-specific configuration (including
+	aspects, pointcuts, etc).
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="advisor" type="advisorType" minOccurs="0" maxOccurs="unbounded">
+					<xsd:annotation>
+						<xsd:documentation source="net:Spring.Aop.IAdvisor"><![CDATA[
+	A named advisor definition.
+						]]></xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+
+			</xsd:sequence>
+			<xsd:attribute name="proxy-target-type" type="xsd:boolean" default="false">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Are decorator-based (inheritance) proxies to be created? By default, composition-based proxies are created.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:complexType name="advisorType">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="Spring.Aop.IAdvisor"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<!-- Rick : ID type written explicitly as opposed to being imported (c.f. [SPR-2290] -->
+		<xsd:attribute name="id" type="xsd:ID"/>
+		<xsd:attribute name="advice-ref" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	A reference to an advice bean.
+				]]></xsd:documentation>
+				<xsd:appinfo>
+					<tool:annotation kind="ref">
+						<tool:expected-type type="org.springframework.aop.Advisor"/>
+					</tool:annotation>
+				</xsd:appinfo>
+			</xsd:annotation>
+		</xsd:attribute>
+		
+		<xsd:attribute name="pointcut-ref" type="pointcutRefType">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	A reference to a pointcut definition.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="order" type="xsd:int">
+			<xsd:annotation>
+				<xsd:documentation source="java:org.springframework.core.Ordered"><![CDATA[
+	Controls the ordering of the execution of this advice when multiple
+	advice executes at a specific joinpoint.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:simpleType name="pointcutRefType">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:expected-type type="org.springframework.aop.Pointcut"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+</xsd:schema>
diff --git a/src/Spring/Spring.Aop/Aop/Config/spring-aop-1.1.xsx b/src/Spring/Spring.Aop/Aop/Config/spring-aop-1.1.xsx
new file mode 100644
index 00000000..ff71343b
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Config/spring-aop-1.1.xsx
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.-->
+<XSDDesignerLayout Style="LeftRight" />
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/AbstractMethodInvocation.cs b/src/Spring/Spring.Aop/Aop/Framework/AbstractMethodInvocation.cs
new file mode 100644
index 00000000..ddb7dbf8
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/AbstractMethodInvocation.cs
@@ -0,0 +1,350 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Text;
+
+using AopAlliance.Intercept;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Convenience base class for <see cref="AopAlliance.Intercept.IMethodInvocation"/>
+	/// implementations.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Subclasses can override the
+	/// <see cref="Spring.Aop.Framework.AbstractMethodInvocation.InvokeJoinpoint()"/>
+	/// method to change this behavior, so this is a useful/ base class for
+	/// <see cref="AopAlliance.Intercept.IMethodInvocation"/> implementations.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <author>Rick Evans (.NET)</author>
+    /// <author>Bruno Baia (.NET)</author>
+	/// <version>$Id: AbstractMethodInvocation.cs,v 1.8 2007/07/05 20:29:21 bbaia Exp $</version>
+	[Serializable]
+    public abstract class AbstractMethodInvocation : IMethodInvocation
+	{
+		/// <summary>
+		/// The arguments (if any = may be <see lang="null"/>) to the method
+		/// that is to be invoked.
+		/// </summary>
+		protected object[] arguments;
+
+		/// <summary>
+		/// The target object that the method is to be invoked on.
+		/// </summary>
+        protected object target;
+
+		/// <summary>
+        /// The AOP proxy for the target object.
+        /// </summary>
+        protected object proxy;
+
+        /// <summary>
+        /// The method invocation that is to be invoked.
+        /// </summary>
+        protected MethodInfo method;
+
+		/// <summary>
+		/// The list of <see cref="AopAlliance.Intercept.IMethodInterceptor"/> and
+		/// <cref see="Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
+		/// that need dynamic checks.
+		/// </summary>
+        protected IList interceptors;
+
+        /// <summary>
+        /// The declaring type of the method that is to be invoked.
+        /// </summary>
+        protected Type targetType;
+
+        /// <summary>
+        /// The index from 0 of the current interceptor we're invoking.
+        /// </summary>
+        protected int currentInterceptorIndex;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Framework.AbstractMethodInvocation"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an abstract class, and as such exposes no publicly visible
+		/// constructors.
+		/// </p>
+		/// <p>
+		/// <note type="implementnotes">
+		/// The <paramref name="interceptors"/>	list can also contain any
+		/// <see cref="Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>s
+		/// that need evaluation at runtime.
+		/// <see cref="Spring.Aop.IMethodMatcher"/>s included in an
+		/// <see cref="Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
+		/// must already have been found to have matched as far as was possible
+		/// <b>statically</b>. Passing an array might be about 10% faster, but
+		/// would complicate the code, and it would work only for static
+		/// pointcuts.
+		/// </note>
+		/// </p>
+		/// </remarks>
+		/// <param name="proxy">The AOP proxy.</param>
+		/// <param name="target">The target object.</param>
+        /// <param name="method">the target method.</param>
+		/// <param name="arguments">The target method's arguments.</param>
+		/// <param name="targetType">
+		/// The <see cref="System.Type"/> of the target object.</param>
+		/// <param name="interceptors">
+		/// The list of interceptors that are to be applied. May be
+		/// <cref lang="null"/>.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the <paramref name="target"/> is <see lang="null"/>.
+		/// </exception>
+		protected AbstractMethodInvocation(object proxy, object target,
+            MethodInfo method, object[] arguments, Type targetType, IList interceptors)
+		{
+			#region Sanity Check
+
+			AssertUtils.ArgumentNotNull(target, "target");
+            AssertUtils.ArgumentNotNull(method, "method");
+
+			#endregion
+
+			this.proxy = proxy;
+			this.target = target;
+            this.method = method;
+			this.targetType = targetType;
+			this.arguments = arguments;
+			this.interceptors = interceptors;
+		}
+
+		/// <summary>
+		/// Gets the method invocation that is to be invoked.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// May or may not correspond with a method invoked on an underlying
+		/// implementation of that interface.
+		/// </p>
+		/// </remarks>
+		/// <see cref="AopAlliance.Intercept.IMethodInvocation.Method"/>
+		public virtual MethodInfo Method
+		{
+			get { return method; }
+        }
+
+		/// <summary>
+		/// Gets the static part of this joinpoint.
+		/// </summary>
+		/// <value>
+		/// The proxied member's information.
+		/// </value>
+		/// <see cref="AopAlliance.Intercept.IJoinpoint.StaticPart"/>
+		public virtual MemberInfo StaticPart
+		{
+			get { return Method; }
+		}
+
+		/// <summary>
+		/// Gets the proxy that this interception was made through.
+		/// </summary>
+		/// <value>
+		/// The proxy that this interception was made through.
+		/// </value>
+		public virtual object Proxy
+		{
+			get { return this.proxy; }
+		}
+	    /// <summary>
+	    /// Gets the target object for the invocation.
+	    /// </summary>
+	    /// <value>
+	    /// The target object for this method invocation.
+	    /// </value>
+	    public virtual object Target
+	    {
+            get { return this.target; }
+	    }
+	    /// <summary>
+	    /// Gets the type of the target object.
+	    /// </summary>
+	    /// <value>
+	    /// The type of the target object.
+	    /// </value>
+	    public virtual Type TargetType
+	    {
+            get { return this.targetType; }
+	    }
+
+	    /// <summary>
+		/// Gets and sets the arguments (if any - may be <cref lang="null"/>)
+		/// to the method that is to be invoked.
+		/// </summary>
+		/// <value>
+		/// The arguments (if any - may be <cref lang="null"/>) to the
+		/// method that is to be invoked.
+		/// </value>
+		/// <see cref="AopAlliance.Intercept.IInvocation.Arguments"/>
+		public virtual object[] Arguments
+		{
+			get { return this.arguments; }
+			set { this.arguments = value; }
+		}
+
+		/// <summary>
+		/// The list of method interceptors.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// May be <see lang="null"/>.
+		/// </p>
+		/// </remarks>
+		public virtual IList Interceptors
+		{
+			get { return this.interceptors; }
+			set { this.interceptors = value; }
+		}
+
+		/// <summary>
+		/// Gets the target object.
+		/// </summary>
+		public virtual object This
+		{
+			get { return this.target; }
+		}
+
+		/// <summary>
+		/// Proceeds to the next interceptor in the chain.
+		/// </summary>
+		/// <returns>
+		/// The return value of the method invocation.
+		/// </returns>
+		/// <exception cref="System.Exception">
+		/// If any of the interceptors at the joinpoint throws an exception.
+		/// </exception>
+		/// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/>
+		public virtual object Proceed()
+		{
+            if (this.interceptors == null ||
+                this.currentInterceptorIndex == this.interceptors.Count)
+            {
+                return InvokeJoinpoint();
+            }
+            object interceptor = this.interceptors[this.currentInterceptorIndex];
+            InterceptorAndDynamicMethodMatcher dynamicMatcher
+                = interceptor as InterceptorAndDynamicMethodMatcher;
+            IMethodInvocation nextInvocation = PrepareMethodInvocationForProceed(this);
+            if (dynamicMatcher != null)
+            {
+                // evaluate dynamic method matcher here: static part will already have
+                // been evaluated and found to match...
+                if (dynamicMatcher.MethodMatcher.Matches(
+                    nextInvocation.Method, nextInvocation.TargetType, nextInvocation.Arguments))
+                {
+                    return dynamicMatcher.Interceptor.Invoke(nextInvocation);
+                }
+                else
+                {
+                    // dynamic match failed; skip this interceptor and invoke the next in the chain...
+                    return nextInvocation.Proceed();
+                }
+            }
+            else
+            {
+                // it's an interceptor so we just invoke it: the pointcut will have
+                // been evaluated statically before this object was constructed...
+                return ((IMethodInterceptor)interceptor).Invoke(nextInvocation);
+            }
+		}
+
+        /// <summary>
+        /// Retrieves a new <see cref="AopAlliance.Intercept.IMethodInvocation"/> instance 
+        /// for the next Proceed method call.
+        /// </summary>
+        /// <param name="invocation">
+        /// The current <see cref="AopAlliance.Intercept.IMethodInvocation"/> instance.
+        /// </param>
+        /// <returns>
+        /// The new <see cref="AopAlliance.Intercept.IMethodInvocation"/> instance to use.
+        /// </returns>
+        /// <see cref="Spring.Aop.Framework.ReflectiveMethodInvocation.PrepareMethodInvocationForProceed"/>
+        protected abstract IMethodInvocation PrepareMethodInvocationForProceed(
+            IMethodInvocation invocation);
+
+		/// <summary>
+		/// Invokes the joinpoint.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Subclasses can override this to use custom invocation.
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// The return value of the invocation of the joinpoint.
+		/// </returns>
+		/// <exception cref="System.Exception">
+		/// If invoking the joinpoint resulted in an exception.
+		/// </exception>
+        /// <see cref="Spring.Aop.Framework.ReflectiveMethodInvocation.InvokeJoinpoint"/>
+        protected abstract object InvokeJoinpoint();
+
+		/// <summary>
+		/// A <see cref="System.String"/> that represents the current
+		/// invocation.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// <note type="implementnotes">
+		/// Does <b>not</b> invoke <see cref="System.Object.ToString()"/> on the 
+		/// <see cref="Spring.Aop.Framework.AbstractMethodInvocation.This"/> target
+		/// object, as that too may be proxied. 
+		/// </note>
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// A <see cref="System.String"/> that represents the current invocation.
+		/// </returns>
+		public override string ToString()
+		{
+			StringBuilder buffer = new StringBuilder("Invocation: method '");
+			buffer.Append(Method.Name).Append("', ").Append("arguments ");
+			buffer.Append(this.arguments != null ? StringUtils.ArrayToCommaDelimitedString(this.arguments) : "[none]");
+			buffer.Append("; ");
+			if (this.target == null)
+			{
+				buffer.Append("target is null.");
+			}
+			else
+			{
+				buffer.Append("target is of Type [").Append(this.targetType.FullName).Append(']');
+			}
+			return buffer.ToString();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AdvisorAdapterRegistrationManager.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AdvisorAdapterRegistrationManager.cs
new file mode 100644
index 00000000..943ec624
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AdvisorAdapterRegistrationManager.cs
@@ -0,0 +1,110 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+    /// <summary>
+    /// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/> implementation
+    /// that registers instances of any non-default
+    /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> instances with the
+    /// <see cref="Spring.Aop.Framework.Adapter.GlobalAdvisorAdapterRegistry"/>
+    /// singleton.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// The only requirement for it to work is that it needs to be defined
+    /// in an application context along with any arbitrary "non-native" Spring.NET
+    /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> instances that need
+    /// to be recognized by Spring.NET's AOP framework.
+    /// </p>
+    /// </remarks>
+    /// <author>Dmitriy Kopylenko</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: AdvisorAdapterRegistrationManager.cs,v 1.5 2007/08/22 08:49:08 markpollack Exp $</version>
+    public class AdvisorAdapterRegistrationManager : IObjectPostProcessor
+    {
+        /// <summary>
+        /// Apply this <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+        /// to the given new object instance <i>before</i> any object initialization callbacks.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Does nothing, simply returns the supplied <paramref name="instance"/> as is.
+        /// </p>
+        /// </remarks>
+        /// <param name="instance">
+        /// The new object instance.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object.
+        /// </param>
+        /// <returns>
+        /// The object instance to use, either the original or a wrapped one.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        public virtual object PostProcessBeforeInitialization(object instance, string name)
+        {
+            return instance;
+        }
+
+        /// <summary>
+        /// Apply this <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/> to the
+        /// given new object instance <i>after</i> any object initialization callbacks.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Registers the supplied <paramref name="instance"/> with the
+        /// <see cref="Spring.Aop.Framework.Adapter.GlobalAdvisorAdapterRegistry"/>
+        /// singleton if it is an <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/>
+        /// instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="instance">
+        /// The new object instance.
+        /// </param>
+        /// <param name="objectName">
+        /// The name of the object.
+        /// </param>
+        /// <returns>
+        /// The object instance to use, either the original or a wrapped one.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        public virtual object PostProcessAfterInitialization(object instance, string objectName)
+        {
+            IAdvisorAdapter adapter = instance as IAdvisorAdapter;
+            if (adapter != null)
+            {
+                GlobalAdvisorAdapterRegistry.Instance.RegisterAdvisorAdapter(adapter);
+            }
+            return instance;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceAdapter.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceAdapter.cs
new file mode 100644
index 00000000..ad2d38ff
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceAdapter.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+    /// <summary>
+    /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> implementation
+    /// to enable <see cref="Spring.Aop.IAfterReturningAdvice"/> to be used in the
+    /// Spring.NET AOP framework.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: AfterReturningAdviceAdapter.cs,v 1.5 2007/03/16 04:01:20 aseovic Exp $</version>
+    [Serializable]
+    internal class AfterReturningAdviceAdapter : IAdvisorAdapter
+    {
+        /// <summary>
+        /// Returns <see langword="true"/> if the supplied
+        /// <paramref name="advice"/> is an instance of the
+        /// <see cref="Spring.Aop.IAfterReturningAdvice"/> interface.
+        /// </summary>
+        /// <param name="advice">The advice to check.</param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="advice"/> is
+        /// an instance of the <see cref="Spring.Aop.IAfterReturningAdvice"/> interface;
+        /// <see langword="false"/> if not or if the supplied
+        /// <paramref name="advice"/> is <cref lang="null"/>.
+        /// </returns>
+        public virtual bool SupportsAdvice(IAdvice advice)
+        {
+            return advice is IAfterReturningAdvice;
+        }
+
+        /// <summary>
+        /// Wraps the supplied <paramref name="advisor"/>'s
+        /// <see cref="Spring.Aop.IAdvisor.Advice"/> within a
+        /// <see cref="Spring.Aop.Framework.Adapter.AfterReturningAdviceInterceptor"/>
+        /// instance.
+        /// </summary>
+        /// <param name="advisor">
+        /// The advisor exposing the <see cref="AopAlliance.Aop.IAdvice"/> that
+        /// is to be wrapped.
+        /// </param>
+        /// <returns>
+        /// The supplied <paramref name="advisor"/>'s
+        /// <see cref="Spring.Aop.IAdvisor.Advice"/> wrapped within a
+        /// <see cref="Spring.Aop.Framework.Adapter.AfterReturningAdviceInterceptor"/>
+        /// instance.
+        /// </returns>
+        public virtual IInterceptor GetInterceptor(IAdvisor advisor)
+        {
+            IAfterReturningAdvice advice = (IAfterReturningAdvice) advisor.Advice;
+            return new AfterReturningAdviceInterceptor(advice);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceInterceptor.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceInterceptor.cs
new file mode 100644
index 00000000..3288fcd9
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceInterceptor.cs
@@ -0,0 +1,97 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Intercept;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+	/// <summary>
+	/// Interceptor to wrap an <see cref="Spring.Aop.IAfterReturningAdvice"/>
+	/// instance.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// A more efficient alternative solution in cases where there is no
+	/// interception advice and therefore no need to create an
+	/// <see cref="AopAlliance.Intercept.IMethodInvocation"/> object may be
+	/// offered in future.
+	/// </p>
+	/// <p>
+	/// Used internally by the AOP framework: application developers should not need
+	/// to use this class directly.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: AfterReturningAdviceInterceptor.cs,v 1.8 2007/03/16 04:01:21 aseovic Exp $</version>
+    [Serializable]
+    public sealed class AfterReturningAdviceInterceptor : IMethodInterceptor
+	{
+		private IAfterReturningAdvice advice;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Framework.Adapter.AfterReturningAdviceInterceptor"/>
+		/// class.
+		/// </summary>
+		/// <param name="advice">
+		/// The advice to be applied after a target method successfully
+		/// returns.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="advice"/> is <see langword="null"/>.
+		/// </exception>
+		public AfterReturningAdviceInterceptor(IAfterReturningAdvice advice)
+		{
+			AssertUtils.ArgumentNotNull(advice, "advice");
+			this.advice = advice;
+		}
+
+		/// <summary>
+		/// Executes interceptor after the target method successfully returns.
+		/// </summary>
+		/// <param name="invocation">
+		/// The method invocation that is being intercepted.
+		/// </param>
+		/// <returns>
+		/// The result of the call to the
+		/// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+		/// the supplied <paramref name="invocation"/>; this return value may
+		/// well have been intercepted by the interceptor.
+		/// </returns>
+		/// <exception cref="System.Exception">
+		/// If any of the interceptors in the chain or the target object itself
+		/// throws an exception.
+		/// </exception>
+		public object Invoke(IMethodInvocation invocation)
+		{
+			object returnValue = invocation.Proceed();
+			advice.AfterReturning(
+				returnValue, invocation.Method, invocation.Arguments, invocation.This);
+			return returnValue;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/BeforeAdviceAdapter.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/BeforeAdviceAdapter.cs
new file mode 100644
index 00000000..4bff5394
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/BeforeAdviceAdapter.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+    /// <summary>
+    /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> implementation
+    /// to enable <see cref="Spring.Aop.IMethodBeforeAdvice"/> to be used in the
+    /// Spring.NET AOP framework.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: BeforeAdviceAdapter.cs,v 1.4 2007/03/16 04:01:21 aseovic Exp $</version>
+    [Serializable]
+    internal class BeforeAdviceAdapter : IAdvisorAdapter
+    {
+        /// <summary>
+        /// Returns <see langword="true"/> if the supplied
+        /// <paramref name="advice"/> is an instance of the
+        /// <see cref="Spring.Aop.IMethodBeforeAdvice"/> interface.
+        /// </summary>
+        /// <param name="advice">The advice to check.</param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="advice"/> is
+        /// an instance of the <see cref="Spring.Aop.IMethodBeforeAdvice"/> interface;
+        /// <see langword="false"/> if not or if the supplied
+        /// <paramref name="advice"/> is <cref lang="null"/>.
+        /// </returns>
+        public virtual bool SupportsAdvice(IAdvice advice)
+        {
+            return advice is IMethodBeforeAdvice;
+        }
+
+        /// <summary>
+        /// Wraps the supplied <paramref name="advisor"/>'s
+        /// <see cref="Spring.Aop.IAdvisor.Advice"/> within a
+        /// <see cref="Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor"/>
+        /// instance.
+        /// </summary>
+        /// <param name="advisor">
+        /// The advisor exposing the <see cref="AopAlliance.Aop.IAdvice"/> that
+        /// is to be wrapped.
+        /// </param>
+        /// <returns>
+        /// The supplied <paramref name="advisor"/>'s
+        /// <see cref="Spring.Aop.IAdvisor.Advice"/> wrapped within a
+        /// <see cref="Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor"/>
+        /// instance.
+        /// </returns>
+        public virtual IInterceptor GetInterceptor(IAdvisor advisor)
+        {
+            IMethodBeforeAdvice advice = (IMethodBeforeAdvice) advisor.Advice;
+            return new MethodBeforeAdviceInterceptor(advice);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/DefaultAdvisorAdapterRegistry.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/DefaultAdvisorAdapterRegistry.cs
new file mode 100644
index 00000000..432d4e8b
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/DefaultAdvisorAdapterRegistry.cs
@@ -0,0 +1,156 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using AopAlliance.Aop;
+using AopAlliance.Intercept;
+
+using Spring.Aop;
+using Spring.Aop.Support;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+	/// <summary>
+	/// Default implementation of the
+	/// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry"/>
+	/// interface.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: DefaultAdvisorAdapterRegistry.cs,v 1.5 2006/04/09 07:18:35 markpollack Exp $</version>
+	public class DefaultAdvisorAdapterRegistry : IAdvisorAdapterRegistry
+	{
+	    private IList adapters = new ArrayList();
+		
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.Adapter.DefaultAdvisorAdapterRegistry"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This constructor will also register the well-known
+        /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> types.
+        /// </p>
+        /// </remarks>
+        /// <seealso cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/>
+        public DefaultAdvisorAdapterRegistry()
+        {
+            // register well-known adapters...
+            RegisterAdvisorAdapter(new BeforeAdviceAdapter());
+            RegisterAdvisorAdapter(new AfterReturningAdviceAdapter());
+            RegisterAdvisorAdapter(new ThrowsAdviceAdapter());
+        }
+		
+        /// <summary>
+        /// Returns an <see cref="Spring.Aop.IAdvisor"/> wrapping the supplied
+        /// <paramref name="advice"/>.
+        /// </summary>
+        /// <param name="advice">
+        /// The object that should be an advice, such as
+        /// <see cref="Spring.Aop.IBeforeAdvice"/> or
+        /// <see cref="Spring.Aop.IThrowsAdvice"/>.
+        /// </param>
+        /// <returns> 
+        /// An <see cref="Spring.Aop.IAdvisor"/> wrapping the supplied
+        /// <paramref name="advice"/>. Never returns <cref lang="null"/>. If
+        /// the <paramref name="advice"/> parameter is an
+        /// <see cref="Spring.Aop.IAdvisor"/>, it will simply be returned.
+        /// </returns>
+        /// <exception cref="UnknownAdviceTypeException">
+        /// If no registered
+        /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> can wrap
+        /// the supplied <paramref name="advice"/>.
+        /// </exception>
+	    public virtual IAdvisor Wrap(object advice)
+	    {
+	        if (advice is IAdvisor)
+	        {
+	            return (IAdvisor) advice;
+	        }
+	        if (!(advice is IAdvice))
+	        {
+	            throw new UnknownAdviceTypeException(advice);
+	        }
+	        IAdvice adviceObject = (IAdvice) advice;
+	        if (adviceObject is IInterceptor)
+	        {
+	            // so well-known it doesn't even need an adapter...
+	            return new DefaultPointcutAdvisor(adviceObject);
+	        }
+            foreach (IAdvisorAdapter adapter in this.adapters)
+            {
+                // check that it is supported...
+                if (adapter.SupportsAdvice(adviceObject))
+                {
+                    return new DefaultPointcutAdvisor(adviceObject);
+                }
+            }
+	        throw new UnknownAdviceTypeException(advice);
+	    }
+
+        /// <summary>
+        /// Returns an <see cref="AopAlliance.Intercept.IInterceptor"/> to
+        /// allow the use of the supplied <paramref name="advisor"/> in an
+        /// interception-based framework.
+        /// </summary>
+        /// <param name="advisor">The advisor to find an interceptor for.</param>
+        /// <returns>
+        /// An interceptor to expose this advisor's behaviour.
+        /// </returns>
+        /// <exception cref="UnknownAdviceTypeException">
+        /// If the advisor type is not understood by any registered
+        /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/>.
+        /// </exception>
+	    public virtual IInterceptor GetInterceptor(IAdvisor advisor)
+	    {
+	        IAdvice advice = advisor.Advice;
+	        if (advice is IInterceptor)
+	        {
+	            return (IInterceptor) advice;
+	        }
+            foreach (IAdvisorAdapter adapter in this.adapters)
+            {
+                if (adapter.SupportsAdvice(advice))
+                {
+                    return adapter.GetInterceptor(advisor);
+                }
+            }
+	        throw new UnknownAdviceTypeException(advice);
+	    }
+
+        /// <summary>
+        /// Register the given <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/>.
+        /// </summary>
+        /// <param name="adapter">
+        /// An <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> that
+        /// understands the particular advisor and advice types.
+        /// </param>
+	    public virtual void RegisterAdvisorAdapter(IAdvisorAdapter adapter)
+	    {
+	        this.adapters.Add(adapter);
+	    }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/GlobalAdvisorAdapterRegistry.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/GlobalAdvisorAdapterRegistry.cs
new file mode 100644
index 00000000..8bb50524
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/GlobalAdvisorAdapterRegistry.cs
@@ -0,0 +1,67 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace Spring.Aop.Framework.Adapter
+{
+    /// <summary>
+    /// Provides Singleton-style access to the default
+    /// <see cref="IAdvisorAdapterRegistry"/> instance.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: GlobalAdvisorAdapterRegistry.cs,v 1.5 2006/04/09 07:18:35 markpollack Exp $</version>
+    public sealed class GlobalAdvisorAdapterRegistry : DefaultAdvisorAdapterRegistry
+    {
+        private static readonly GlobalAdvisorAdapterRegistry instance
+            = new GlobalAdvisorAdapterRegistry();
+
+        /// <summary>
+        /// The default <see cref="IAdvisorAdapterRegistry"/> instance.
+        /// </summary>
+        public static GlobalAdvisorAdapterRegistry Instance
+        {
+            get { return instance; }
+        }
+
+        #region Constructor (s) / Destructor
+
+        // CLOVER:OFF
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.Adapter.GlobalAdvisorAdapterRegistry"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This contructor is marked as <see langword="private"/> to enforce the
+        /// Singleton pattern
+        /// </p>
+        /// </remarks>
+        private GlobalAdvisorAdapterRegistry()
+        {
+        }
+
+        // CLOVER:ON
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapter.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapter.cs
new file mode 100644
index 00000000..ffbc16e2
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapter.cs
@@ -0,0 +1,100 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+	/// <summary>
+	/// Permits the handling of new advisors and advice types as extensions to
+	/// the Spring AOP framework.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Implementors can create AOP Alliance
+	/// <see cref="AopAlliance.Intercept.IInterceptor"/>s from custom advice
+	/// types, enabling these advice types to be used in the Spring.NET AOP
+	/// framework, which uses interception under the covers.
+	/// </p>
+	/// <p>
+	/// There is no need for most Spring.NET users to implement this interface;
+	/// do so only if you need to introduce more
+	/// <see cref="Spring.Aop.IAdvisor"/> or <see cref="AopAlliance.Aop.IAdvice"/>
+	/// types to Spring.NET.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: IAdvisorAdapter.cs,v 1.4 2006/04/09 07:18:35 markpollack Exp $</version>
+	public interface IAdvisorAdapter
+	{
+	    /// <summary>
+	    /// Does this adapter understand the supplied <paramref name="advice"/>?
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// Is it valid to invoke the
+	    /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry.Wrap"/>
+	    /// method with the given advice as an argument?
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="advice">
+	    /// <see cref="AopAlliance.Aop.IAdvice"/> such as
+	    /// <see cref="Spring.Aop.IBeforeAdvice"/>.
+	    /// </param>
+	    /// <returns><see langword="true"/> if this adapter understands the
+	    /// supplied <paramref name="advice"/>.
+	    /// </returns>
+	    bool SupportsAdvice(IAdvice advice);
+
+	    /// <summary>
+	    /// Return an AOP Alliance
+	    /// <see cref="AopAlliance.Intercept.IInterceptor"/> exposing the
+	    /// behaviour of the given advice to an interception-based AOP
+	    /// framework.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// Don't worry about any <see cref="Spring.Aop.IPointcut"/>
+	    /// contained in the supplied <see cref="Spring.Aop.IAdvisor"/>;
+	    /// the AOP framework will take care of checking the pointcut.
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="advisor">
+	    /// The advice. The
+	    /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter.SupportsAdvice"/>
+	    /// method must have previously returned <see langword="true"/> on the
+	    /// supplied <paramref name="advisor"/>.
+	    /// </param>
+	    /// <returns>
+	    /// An AOP Alliance
+	    /// <see cref="AopAlliance.Intercept.IInterceptor"/> exposing the
+	    /// behaviour of the given advice to an interception-based AOP
+	    /// framework.
+	    /// </returns>
+	    IInterceptor GetInterceptor(IAdvisor advisor);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapterRegistry.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapterRegistry.cs
new file mode 100644
index 00000000..125cd0a1
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapterRegistry.cs
@@ -0,0 +1,114 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+    /// <summary>
+    /// A registry of
+    /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> instances.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Implementations <b>must</b> also automatically register adapters for
+    /// <see cref="AopAlliance.Intercept.IInterceptor"/> types.
+    /// </p>
+    /// <note>
+    /// This is an SPI interface, that should not need to be implemented by any
+    /// Spring.NET user.
+    /// </note>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: IAdvisorAdapterRegistry.cs,v 1.3 2006/04/09 07:18:35 markpollack Exp $</version>
+    public interface IAdvisorAdapterRegistry
+    {
+        /// <summary>
+        /// Returns an <see cref="Spring.Aop.IAdvisor"/> wrapping the supplied
+        /// <paramref name="advice"/>.
+        /// </summary>
+        /// <param name="advice">
+        /// The object that should be an advice, such as
+        /// <see cref="Spring.Aop.IBeforeAdvice"/> or
+        /// <see cref="Spring.Aop.IThrowsAdvice"/>.
+        /// </param>
+        /// <returns> 
+        /// An <see cref="Spring.Aop.IAdvisor"/> wrapping the supplied
+        /// <paramref name="advice"/>. Never returns <cref lang="null"/>. If
+        /// the <paramref name="advice"/> parameter is an
+        /// <see cref="Spring.Aop.IAdvisor"/>, it will simply be returned.
+        /// </returns>
+        /// <exception cref="UnknownAdviceTypeException">
+        /// If no registered
+        /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> can wrap
+        /// the supplied <paramref name="advice"/>.
+        /// </exception>
+        IAdvisor Wrap(object advice);
+
+        /// <summary>
+        /// Returns an <see cref="AopAlliance.Intercept.IInterceptor"/> to
+        /// allow the use of the supplied <paramref name="advisor"/> in an
+        /// interception-based framework. 
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Don't worry about the pointcut associated with the
+        /// <see cref="Spring.Aop.IAdvisor"/>; if it's an
+        /// <see cref="Spring.Aop.IPointcutAdvisor"/>, just return an
+        /// interceptor.
+        /// </p>
+        /// </remarks>
+        /// <param name="advisor">
+        /// The advisor to find an interceptor for.
+        /// </param>
+        /// <returns>
+        /// An interceptor to expose this advisor's behaviour.
+        /// </returns>
+        /// <exception cref="UnknownAdviceTypeException">
+        /// If the advisor type is not understood by any registered
+        /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/>.
+        /// </exception>
+        IInterceptor GetInterceptor(IAdvisor advisor);
+
+        /// <summary>
+        /// Register the given <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Note that it is not necessary to register adapters for
+        /// <see cref="AopAlliance.Intercept.IInterceptor"/> instances: these
+        /// must be automatically recognized by an
+        /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry"/>
+        /// implementation.
+        /// </p>
+        /// </remarks>
+        /// <param name="adapter">
+        /// An <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> that
+        /// understands the particular advisor and advice types.
+        /// </param>
+        void RegisterAdvisorAdapter(IAdvisorAdapter adapter);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/MethodBeforeAdviceInterceptor.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/MethodBeforeAdviceInterceptor.cs
new file mode 100644
index 00000000..ad558e5a
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/MethodBeforeAdviceInterceptor.cs
@@ -0,0 +1,93 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Intercept;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+    /// <summary>
+    /// <see cref="AopAlliance.Intercept.IInterceptor"/> implementation that
+    /// wraps <see cref="Spring.Aop.IMethodBeforeAdvice"/> instances.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// In the future Spring.NET may also offer a more efficient alternative
+    /// solution in cases where there is no interception advice and therefore
+    /// no need to create an <see cref="AopAlliance.Intercept.IMethodInvocation"/>
+    /// object.
+    /// </p>
+    /// <p>
+    /// Used internally by the Spring.NET AOP framework: application developers
+    /// should not need to use this class directly.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: MethodBeforeAdviceInterceptor.cs,v 1.5 2007/03/16 04:01:21 aseovic Exp $</version>
+    [Serializable]
+    internal sealed class MethodBeforeAdviceInterceptor : IMethodInterceptor
+    {
+        private IMethodBeforeAdvice advice;
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor"/>
+        /// class.
+        /// </summary>
+        /// <param name="advice">
+        /// The <see cref="Spring.Aop.IMethodBeforeAdvice"/> that is to be wrapped.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="advice"/> is <see langword="null"/>.
+        /// </exception>
+        public MethodBeforeAdviceInterceptor(IMethodBeforeAdvice advice)
+        {
+            AssertUtils.ArgumentNotNull(advice, "advice");
+            this.advice = advice;
+        }
+
+        /// <summary>
+        /// Executes interceptor before the target method successfully returns.
+        /// </summary>
+        /// <param name="invocation">
+        /// The method invocation that is being intercepted.
+        /// </param>
+        /// <returns>
+        /// The result of the call to the
+        /// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+        /// the supplied <paramref name="invocation"/>.
+        /// </returns>
+        /// <exception cref="System.Exception">
+        /// If any of the interceptors in the chain or the target object itself
+        /// throws an exception.
+        /// </exception>
+        public object Invoke(IMethodInvocation invocation)
+        {
+            advice.Before(invocation.Method, invocation.Arguments, invocation.This);
+            return invocation.Proceed();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceAdapter.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceAdapter.cs
new file mode 100644
index 00000000..5730836a
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceAdapter.cs
@@ -0,0 +1,80 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+    /// <summary>
+    /// <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> implementation
+    /// to enable <see cref="Spring.Aop.IThrowsAdvice"/> to be used in the
+    /// Spring.NET AOP framework.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: ThrowsAdviceAdapter.cs,v 1.4 2007/03/16 04:01:21 aseovic Exp $</version>
+    [Serializable]
+    internal class ThrowsAdviceAdapter : IAdvisorAdapter
+    {
+        /// <summary>
+        /// Returns <see langword="true"/> if the supplied
+        /// <paramref name="advice"/> is an instance of the
+        /// <see cref="Spring.Aop.IThrowsAdvice"/> interface.
+        /// </summary>
+        /// <param name="advice">The advice to check.</param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="advice"/> is
+        /// an instance of the <see cref="Spring.Aop.IThrowsAdvice"/> interface;
+        /// <see langword="false"/> if not or if the supplied
+        /// <paramref name="advice"/> is <cref lang="null"/>.
+        /// </returns>
+        public virtual bool SupportsAdvice(IAdvice advice)
+        {
+            return advice is IThrowsAdvice;
+        }
+
+        /// <summary>
+        /// Wraps the supplied <paramref name="advisor"/>'s
+        /// <see cref="Spring.Aop.IAdvisor.Advice"/> within a
+        /// <see cref="Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor"/>
+        /// instance.
+        /// </summary>
+        /// <param name="advisor">
+        /// The advisor exposing the <see cref="AopAlliance.Aop.IAdvice"/> that
+        /// is to be wrapped.
+        /// </param>
+        /// <returns>
+        /// The supplied <paramref name="advisor"/>'s
+        /// <see cref="Spring.Aop.IAdvisor.Advice"/> wrapped within a
+        /// <see cref="Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor"/>
+        /// instance.
+        /// </returns>
+        public virtual IInterceptor GetInterceptor(IAdvisor advisor)
+        {
+            return new ThrowsAdviceInterceptor(advisor.Advice);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs
new file mode 100644
index 00000000..217a9c48
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs
@@ -0,0 +1,319 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using AopAlliance.Intercept;
+using Common.Logging;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+    /// <summary>Interceptor to wrap an after throwing advice.</summary>
+    /// <remarks>
+    /// <p>
+    /// Implementations of the <see cref="Spring.Aop.IThrowsAdvice"/> interface
+    /// <b>must</b> define methods of the form...
+    /// <code lang="C#">
+    /// AfterThrowing([MethodInfo method, Object[] args, Object target], Exception subclass); 
+    /// </code>
+    /// The method name is fixed (i.e. your methods <b>must</b> be named
+    /// <c>AfterThrowing</c>. The first three arguments (<i>as a whole</i>) are
+    /// optional, and only useful if futher information about the joinpoint is
+    /// required. The return type <i>can</i> be anything, but is almost always
+    /// <see langword="void"/> by convention.
+    /// </p>
+    /// <p>
+    /// Please note that the object encapsulating the throws advice does not
+    /// need to implement the <see cref="Spring.Aop.IThrowsAdvice"/> interface.
+    /// Throws advice methods are discovered via reflection... the
+    /// <see cref="Spring.Aop.IThrowsAdvice"/> interface serves merely to
+    /// <i>discover</i> objects that are to be considered as throws advice.
+    /// Other mechanisms for discovering throws advice such as attributes are
+    /// also equally valid... all that this class cares about is that a throws
+    /// advice object implement one or more methods with a valid throws advice
+    /// signature (see above, and the examples below).
+    /// </p>
+    /// <p>
+    /// This is a framework class that should not normally need to be used
+    /// directly by Spring.NET users.
+    /// </p>
+    /// </remarks>
+    /// <example>
+    /// <p>
+    /// Find below some examples of valid <see cref="Spring.Aop.IThrowsAdvice"/>
+    /// method signatures...
+    /// </p>
+    /// <code language="C#">
+    /// public class GlobalExceptionHandlingAdvice : IThrowsAdvice
+    /// {
+    ///     public void AfterThrowing(Exception ex) {
+    ///         // handles absolutely any and every Exception...
+    ///     }
+    /// }
+    /// </code>
+    /// <code language="C#">
+    /// public class RemotingExceptionHandlingAdvice : IThrowsAdvice
+    /// {
+    ///     public void AfterThrowing(RemotingException ex) {
+    ///         // handles any and every RemotingException (and subclasses of RemotingException)...
+    ///     }
+    /// }
+    /// </code>
+    /// <code language="C#">
+    /// using System.Data;
+    /// 
+    /// public class DataExceptionHandlingAdvice
+    /// {
+    ///     public void AfterThrowing(ConstraintException ex) {
+    ///         // specialised handling of ConstraintExceptions
+    ///     }
+    ///
+    ///     public void AfterThrowing(NoNullAllowedException ex) {
+    ///         // specialised handling of NoNullAllowedExceptions
+    ///     }
+    ///
+    ///     public void AfterThrowing(DataException ex) {
+    ///         // handles all other DataExceptions...
+    ///     }
+    /// }
+    /// </code>
+    /// </example>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: ThrowsAdviceInterceptor.cs,v 1.8 2007/05/04 13:16:44 bbaia Exp $</version>
+    /// <seealso cref="Spring.Aop.IThrowsAdvice"/>
+    [Serializable]
+    public sealed class ThrowsAdviceInterceptor : IMethodInterceptor
+    {
+        private static readonly ILog log = LogManager.GetLogger(typeof(ThrowsAdviceInterceptor));
+
+        private const string SpecialThrowingMethodName = "AfterThrowing";
+
+        private readonly object throwsAdvice;
+
+        /// <summary>
+        /// The mapping of exception Types to MethodInfo handlers.
+        /// </summary>
+        private readonly IDictionary exceptionHandlers;
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor"/> class.
+        /// </summary>
+        /// <remarks>
+        /// </remarks>
+        /// <param name="advice">
+        /// The throws advice to check for exception handler methods.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="advice"/> is <see langword="null"/>.
+        /// </exception>
+        /// <exception cref="System.ArgumentException">
+        /// If no (0) handler methods were discovered on the supplied <paramref name="advice"/>;
+        /// or if more than one handler method suitable for a particular
+        /// <see cref="System.Exception"/> type was discovered on the supplied
+        /// <paramref name="advice"/>.
+        /// </exception>
+        public ThrowsAdviceInterceptor(object advice)
+        {
+            AssertUtils.ArgumentNotNull(advice, "advice");
+            this.exceptionHandlers = new Hashtable();
+            this.throwsAdvice = advice;
+            MapAllExceptionHandlingMethods(advice);
+            if (exceptionHandlers.Count == 0)
+            {
+                throw new ArgumentException(
+                    "At least one handler method must be found in class ["
+                    + advice.GetType().FullName + "].");
+            }
+        }
+
+        private void MapAllExceptionHandlingMethods(object advice)
+        {
+            MethodInfo[] methods = advice.GetType().GetMethods();
+            foreach (MethodInfo method in methods)
+            {
+                int numParams = method.GetParameters().Length;
+                if (method.Name.Equals(SpecialThrowingMethodName)
+                    && (numParams == 1 || numParams == 4))
+                {
+                    Type lastParametersType = method.GetParameters()[numParams - 1].ParameterType;
+                    if (typeof (Exception).IsAssignableFrom(lastParametersType))
+                    {
+                        #region Instrumentation
+
+                        if(log.IsDebugEnabled)
+                        {
+                            log.Debug("Found exception handler method: " + method);
+                        }
+
+                        #endregion
+
+                        if(this.exceptionHandlers.Contains(lastParametersType))
+                        {
+                            throw new ArgumentException(
+                                "Throws advice handler method for the [" +
+                                lastParametersType + "] type already exists; don't define " +
+                                "both single and multiple argument methods for the same " +
+                                "Exception type in the same class.");
+                        }
+                        this.exceptionHandlers[lastParametersType] = method;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Convenience property that returns the number of exception handler
+        /// methods managed by this interceptor.
+        /// </summary>
+        /// <value>
+        /// The number of exception handler methods managed by this interceptor.
+        /// </value>
+        public int HandlerMethodCount
+        {
+            get { return exceptionHandlers.Count; }
+        }
+
+        /// <summary>
+        /// Executes interceptor if (and only if) the supplied
+        /// <paramref name="invocation"/> throws an exception that is mapped to
+        /// an appropriate exception handler.
+        /// </summary>
+        /// <param name="invocation">
+        /// The method invocation that is being intercepted.
+        /// </param>
+        /// <returns>
+        /// The result of the call to the
+        /// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+        /// the supplied <paramref name="invocation"/> (this assumes no
+        /// exception was thrown by the call to the supplied <paramref name="invocation"/>.
+        /// </returns>
+        /// <exception cref="System.Exception">
+        /// If any of the interceptors in the chain or the target object itself
+        /// throws an exception.
+        /// </exception>
+        /// <seealso cref="AopAlliance.Intercept.IMethodInterceptor.Invoke"/>
+        public object Invoke(IMethodInvocation invocation)
+        {
+            try
+            {
+                return invocation.Proceed();
+            }
+            catch (TargetInvocationException ex)
+            {
+                // bah, this is a tad gross...
+                Exception realException = ex.InnerException;
+                LookupAndInvokeAnyHandler(realException, invocation);
+                throw realException;
+            }
+            catch (Exception ex)
+            {
+                LookupAndInvokeAnyHandler(ex, invocation);
+                throw ex;
+            }
+        }
+
+        private void LookupAndInvokeAnyHandler(Exception ex, IMethodInvocation invocation)
+        {
+            MethodInfo handlerMethod = GetExceptionHandler(ex);
+            if (handlerMethod != null)
+            {
+                InvokeHandlerMethod(invocation, ex, handlerMethod);
+            }
+        }
+
+        /// <summary>
+        /// Gets the exception handler (if any) that has been mapped to the
+        /// supplied <paramref name="exception"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Will return <cref lang="null"/> if not found.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// The exception handler for the <see cref="System.Type"/> of the
+        /// supplied <paramref name="exception"/> given exception.
+        /// </returns>
+        /// <param name="exception">exception that was thrown</param>
+        private MethodInfo GetExceptionHandler(Exception exception)
+        {
+            Type exceptionClass = exception.GetType();
+
+            #region Instrumentation
+
+            if(log.IsDebugEnabled)
+            {
+                log.Debug("Trying to find handler for exception of type [" + exception.GetType().Name + "].");
+            }
+
+            #endregion
+
+            MethodInfo handler = (MethodInfo) this.exceptionHandlers[exceptionClass];
+            while (handler == null && !exceptionClass.Equals(typeof(Exception)))
+            {
+                exceptionClass = exceptionClass.BaseType;
+                handler = (MethodInfo) this.exceptionHandlers[exceptionClass];
+            }
+            return handler;
+        }
+
+        /// <summary>
+        /// Invokes handler method with appropriate number of parameters
+        /// </summary>
+        /// <param name="invocation">
+        /// The original method invocation that was intercepted.
+        /// </param>
+        /// <param name="triggeringException">
+        /// The exception that triggered this interceptor.
+        /// </param>
+        /// <param name="handlerMethod">
+        /// The exception handler method to invoke.
+        /// </param>
+        private void InvokeHandlerMethod(
+            IMethodInvocation invocation, Exception triggeringException, MethodInfo handlerMethod)
+        {
+            object[] handlerArgs;
+            if (handlerMethod.GetParameters().Length == 1)
+            {
+                handlerArgs = new object[] {triggeringException};
+            }
+            else
+            {
+                handlerArgs = new object[] {invocation.Method, invocation.Arguments, invocation.This, triggeringException};
+            }
+            try
+            {
+                handlerMethod.Invoke(this.throwsAdvice, handlerArgs);
+            }
+            catch (TargetInvocationException ex)
+            {
+                throw ex.InnerException;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/UnknownAdviceTypeException.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/UnknownAdviceTypeException.cs
new file mode 100644
index 00000000..9adf977b
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/UnknownAdviceTypeException.cs
@@ -0,0 +1,105 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+    /// <summary>
+    /// Exception thrown when an attempt is made to use an unsupported
+    /// <see cref="Spring.Aop.IAdvisor"/> or <see cref="AopAlliance.Aop.IAdvice"/>
+    /// type.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: UnknownAdviceTypeException.cs,v 1.4 2006/04/09 07:18:35 markpollack Exp $</version>
+    [Serializable]
+    public class UnknownAdviceTypeException : ArgumentException
+    {
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.Adapter.UnknownAdviceTypeException"/> class.
+        /// </summary>
+        /// <param name="advice">The advice that caused the exception.</param>
+        public UnknownAdviceTypeException(object advice)
+            : base("No adapter for IAdvice of type ["
+                   + (advice != null ? advice.GetType().FullName : "null") + "].")
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.Adapter.UnknownAdviceTypeException"/> class.
+        /// </summary>
+        public UnknownAdviceTypeException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.Adapter.UnknownAdviceTypeException"/> class with
+        /// the specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public UnknownAdviceTypeException(string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.Adapter.UnknownAdviceTypeException"/> class with
+        /// the specified message and root cause.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public UnknownAdviceTypeException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.Adapter.UnknownAdviceTypeException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected UnknownAdviceTypeException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/AdvisedSupport.cs b/src/Spring/Spring.Aop/Aop/Framework/AdvisedSupport.cs
new file mode 100644
index 00000000..056bfe46
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/AdvisedSupport.cs
@@ -0,0 +1,1563 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Reflection;
+using System.Text;
+
+using AopAlliance.Aop;
+using AopAlliance.Intercept;
+using Spring.Aop;
+using Spring.Aop.Support;
+using Spring.Aop.Target;
+using Spring.Util;
+using Spring.Proxy;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+    /// <summary>
+    /// Superclass for AOP proxy configuration managers.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Instances of this class are not themselves AOP proxies, but
+    /// subclasses of this class are normally factories from which AOP proxy
+    /// instances are obtained directly.
+    /// </p>
+    /// <p>
+    /// This class frees subclasses of the housekeeping of
+    /// <see cref="AopAlliance.Intercept.IInterceptor"/> and
+    /// <see cref="Spring.Aop.IAdvisor"/> instances, but doesn't actually
+    /// implement proxy creation methods, the functionality for which
+    /// is provided by subclasses.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: AdvisedSupport.cs,v 1.36 2008/01/14 20:49:47 oakinger Exp $</version>
+    /// <seealso cref="Spring.Aop.Framework.IAopProxy"/>
+    [Serializable]
+    public class AdvisedSupport : ProxyConfig, IAdvised
+    {
+        #region Fields
+
+        /// <summary>The list of advice.</summary>
+        /// <remarks>
+        /// <p>
+        /// If an <see cref="AopAlliance.Intercept.IInterceptor"/> is added, it
+        /// will be wrapped in an advice before being added to this list. 
+        /// </p>
+        /// </remarks>
+        private IList _advisors = new ArrayList();
+
+        /// <summary> 
+        /// Array updated on changes to the advisors list, which is easier to
+        /// manipulate internally
+        /// </summary>
+        private IAdvisor[] _advisorsArray = new IAdvisor[] {};
+
+        /// <summary> 
+        /// List of introductions. 
+        /// </summary>
+        private IList _introductions = new ArrayList();
+
+        /// <summary> 
+        /// Array updated on changes to the advisors list, which is easier to
+        /// manipulate internally
+        /// </summary>
+        private IIntroductionAdvisor[] _introductionsArray
+            = new IIntroductionAdvisor[] {};
+
+        /// <summary>
+        /// Interface map specifying which object should interface methods be
+        /// delegated to.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If entry value is <cref lang="null"/> methods should be delegated
+        /// to the target object.
+        /// </p>
+        /// </remarks>
+        private IDictionary interfaceMap = new ListDictionary();
+
+        /// <summary>
+        /// The <see cref="Spring.Aop.ITargetSource"/> for this instance.
+        /// </summary>
+        protected internal ITargetSource m_targetSource = EmptyTargetSource.Empty;
+
+        /// <summary>
+        /// Set to <see langword="true"/> when the first AOP proxy has been
+        /// created, meaning that we must track advice changes via the
+        /// OnAdviceChange() callback.
+        /// </summary>
+        private bool isActive;
+
+        private Type proxyType;
+        private ConstructorInfo proxyConstructor;
+
+        /// <summary>
+        /// The list of <see cref="Spring.Aop.Framework.AdvisedSupport"/> event listeners.
+        /// </summary>
+        private IList listeners = new ArrayList();
+
+        /// <summary>
+        /// The advisor chain factory.
+        /// </summary>
+        private IAdvisorChainFactory advisorChainFactory;
+
+        #endregion
+
+        #region Constructor(s)
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport"/> class using the
+        /// default advisor chain factory.
+        /// </summary>
+        public AdvisedSupport()
+        {
+            AdvisorChainFactory = new HashtableCachingAdvisorChainFactory();
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport"/> class.
+        /// </summary>
+        /// <param name="interfaces">The interfaces that are to be proxied.</param>
+        /// <exception cref="Spring.Aop.Framework.AopConfigException">
+        /// If this 
+        /// </exception>
+        public AdvisedSupport(Type[] interfaces) : this()
+        {
+            if (interfaces != null)
+            {
+                foreach (Type intf in interfaces)
+                {
+                    AddInterfaceInternal(intf);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IAdvised implementation
+
+        /// <summary>
+        /// Gets and sets the
+        /// <see cref="Spring.Aop.Framework.IAdvisorChainFactory"/>
+        /// implementation that will be used to get the interceptor
+        /// chains for the advised
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport.Target"/>.
+        /// </summary>
+        /// <value>
+        /// The <see cref="Spring.Aop.Framework.IAdvisorChainFactory"/>
+        /// implementation that will be used to get the interceptor
+        /// chains for the advised
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport.Target"/>.
+        /// </value>
+        public virtual IAdvisorChainFactory AdvisorChainFactory
+        {
+            get
+            {
+                lock(this.SyncRoot)
+                {
+                    return this.advisorChainFactory;
+                }
+            }
+            set
+            {
+                lock(this.SyncRoot)
+                {
+                    if (this.advisorChainFactory != null)
+                    {
+                        RemoveListener(this.advisorChainFactory);
+                    }
+                    this.advisorChainFactory = value;
+                    AddListener(this.advisorChainFactory);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the current <see cref="Spring.Aop.ITargetSource"/> used
+        /// by this <see cref="Spring.Aop.Framework.IAdvised"/> object.
+        /// </summary>
+        /// <value>
+        /// The <see cref="Spring.Aop.ITargetSource"/> used by this
+        /// <see cref="Spring.Aop.Framework.IAdvised"/> object.
+        /// </value>
+        /// <see cref="Spring.Aop.Framework.IAdvised.TargetSource"/>
+        public ITargetSource TargetSource
+        {
+            get { return this.m_targetSource; }
+            set
+            {
+                bool initialized = !(this.m_targetSource is EmptyTargetSource);
+                this.m_targetSource = value;
+                
+                if (this.m_targetSource != null && !initialized && interfaceMap.Count == 0)
+                {
+                    Type[] interfaces = ReflectionUtils.GetInterfaces(this.m_targetSource.TargetType);
+                    foreach (Type intf in interfaces)
+                    {    
+                        AddInterfaceInternal(intf);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a boolean specifying if this <see cref="IAdvised"/>
+        /// instance can be serialized.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if this instance can be serialized, <c>false</c> otherwise.
+        /// </value>
+        public bool IsSerializable
+        {
+            get
+            {
+                bool canBeSerialized = TargetSource.TargetType.IsSerializable;
+                if (canBeSerialized)
+                {
+                    for (int i = 0; canBeSerialized && i < _advisorsArray.Length; i++)
+                    {
+                        IAdvisor advisor = _advisorsArray[i];
+                        canBeSerialized = advisor.GetType().IsSerializable
+                                          && advisor.Advice.GetType().IsSerializable;
+                    }
+                    for (int i = 0; canBeSerialized && i < _introductionsArray.Length; i++)
+                    {
+                        IIntroductionAdvisor advisor = _introductionsArray[i];
+                        canBeSerialized = advisor.GetType().IsSerializable
+                                          && advisor.Advice.GetType().IsSerializable;
+                    }
+                }
+
+                return canBeSerialized;
+            }
+        }
+
+        /// <summary>
+        /// Returns the collection of interface <see cref="System.Type"/>s
+        /// to be (or that are being) proxied by this proxy.
+        /// </summary>
+        /// <value>
+        /// The collection of interface <see cref="System.Type"/>s
+        /// to be (or that are being) proxied by this proxy.
+        /// </value>
+        /// <seealso cref="Spring.Aop.Framework.IAdvised.Interfaces"/>
+        public virtual Type[] Interfaces
+        {
+            get
+            {
+                lock(this.SyncRoot)
+                {
+                    Type[] proxiedInterfaces = new Type[this.interfaceMap.Keys.Count];
+                    this.interfaceMap.Keys.CopyTo(proxiedInterfaces, 0);
+                    return proxiedInterfaces;
+                }
+            }
+            set
+            {
+                lock(this.SyncRoot)
+                {
+                    this.interfaceMap.Clear();
+                    for (int i = 0; i < value.Length; i++)
+                    {
+                        AddInterfaceInternal(value[i]);
+                    }
+                    InterfacesChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the mapping of the proxied interface
+        /// <see cref="System.Type"/>s to their delegates.
+        /// </summary>
+        /// <value>
+        /// The mapping of the proxied interface
+        /// <see cref="System.Type"/>s to their delegates.
+        /// </value>
+        /// <seealso cref="Spring.Aop.Framework.IAdvised.InterfaceMap"/>
+        public virtual IDictionary InterfaceMap
+        {
+            get
+            {
+                lock(this.SyncRoot)
+                {
+                    return new Hashtable(this.interfaceMap);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Is the supplied <paramref name="intf"/> (interface)
+        /// <see cref="System.Type"/> proxied?
+        /// </summary>
+        /// <param name="intf">
+        /// The interface <see cref="System.Type"/> to test.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="intf"/>
+        /// (interface) <see cref="System.Type"/> is proxied;
+        /// <see langword="false"/> if not or the supplied
+        /// <paramref name="intf"/> is <cref lang="null"/>.
+        /// </returns>
+        /// <seealso cref="Spring.Aop.Framework.IAdvised.IsInterfaceProxied"/>
+        public virtual bool IsInterfaceProxied(Type intf)
+        {
+            if (intf != null)
+            {
+                lock(this.SyncRoot)
+                {
+                    foreach (Type proxyInterface in this.interfaceMap.Keys)
+                    {
+                        if (intf.IsAssignableFrom(proxyInterface))
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns the collection of <see cref="Spring.Aop.IAdvisor"/>
+        /// instances that have been applied to this proxy.
+        /// </summary>
+        /// <value>
+        /// The collection of <see cref="Spring.Aop.IAdvisor"/>
+        /// instances that have been applied to this proxy.
+        /// </value>
+        /// <seealso cref="Spring.Aop.Framework.IAdvised.Advisors"/>
+        public virtual IAdvisor[] Advisors
+        {
+            get
+            {
+                lock(this.SyncRoot)
+                {
+                    return (IAdvisor[]) this._advisorsArray.Clone();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the collection of <see cref="Spring.Aop.IIntroductionAdvisor"/>
+        /// instances that have been applied to this proxy.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Will never return <cref lang="null"/>, but may return an
+        /// empty array (in the case where no
+        /// <see cref="Spring.Aop.IIntroductionAdvisor"/> instances have been
+        /// applied to this proxy).
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The collection of <see cref="Spring.Aop.IIntroductionAdvisor"/>
+        /// instances that have been applied to this proxy.
+        /// </value>
+        /// <seealso cref="Spring.Aop.Framework.IAdvised.Introductions"/>
+        public virtual IIntroductionAdvisor[] Introductions
+        {
+            get
+            {
+                lock(this.SyncRoot)
+                {
+                    return (IIntroductionAdvisor[]) this._introductionsArray.Clone();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds the supplied <paramref name="advice"/> to the end (or tail)
+        /// of the advice (interceptor) chain.
+        /// </summary>
+        /// <param name="advice">
+        /// The <see cref="AopAlliance.Aop.IAdvice"/> to be added.
+        /// </param>
+        /// <seealso cref="Spring.Aop.Support.DefaultPointcutAdvisor"/>
+        /// <seealso cref="Spring.Aop.Framework.IAdvised.AddAdvice(int,IAdvice)"/>
+        public void AddAdvice(IAdvice advice)
+        {
+            //int position = this._advisors != null ? this._advisors.Count : 0;
+            AddAdvice(-1, advice);
+        }
+
+        /// <summary>
+        /// Adds the supplied <paramref name="advice"/> to the supplied
+        /// <paramref name="position"/> in the advice (interceptor) chain.
+        /// </summary>
+        /// <param name="position">
+        /// The zero (0) indexed position (from the head) at which the
+        /// supplied <paramref name="advice"/> is to be inserted into the
+        /// advice (interceptor) chain.
+        /// </param>
+        /// <param name="advice">
+        /// The <see cref="AopAlliance.Aop.IAdvice"/> to be added.
+        /// </param>
+        /// <exception cref="Spring.Aop.Framework.AopConfigException">
+        /// If the supplied <paramref name="advice"/> is <cref lang="null"/>;
+        /// or is not an <see cref="AopAlliance.Intercept.IMethodInterceptor"/>
+        /// reference; or if the supplied <paramref name="advice"/> is a
+        /// <see cref="Spring.Aop.IIntroductionInterceptor"/>.
+        /// </exception>
+        /// <seealso cref="Spring.Aop.Support.DefaultPointcutAdvisor"/>
+        /// <seealso cref="IAdvised.AddAdvice(IAdvice)"/>
+        public void AddAdvice(int position, IAdvice advice)
+        {
+            if (advice is IInterceptor && !(advice is IMethodInterceptor))
+            {
+                throw new AopConfigException(
+                    GetType().FullName + " can only handle AOP Alliance IMethodInterceptor advice.");
+            }
+            if (advice is IIntroductionInterceptor)
+            {
+                throw
+                    new AopConfigException(
+                        "IIntroductionInterceptors may only be added as part of IIntroductionAdvisor.");
+            }
+
+            AddAdvisor(position, new DefaultPointcutAdvisor(advice));
+        }
+
+        /// <summary> 
+        /// Return the index (0 based) of the supplied
+        /// <see cref="Spring.Aop.IAdvisor"/> in the interceptor
+        /// (advice) chain for this proxy.
+        /// </summary>
+        /// <param name="advisor">
+        /// The <see cref="Spring.Aop.IAdvisor"/> to search for.
+        /// </param>
+        /// <returns>
+        /// The zero (0) based index of this advisor, or -1 if the
+        /// supplied <paramref name="advisor"/> is not an advisor for this
+        /// proxy.
+        /// </returns>
+        public virtual int IndexOf(IAdvisor advisor)
+        {
+            lock(this.SyncRoot)
+            {
+                return IndexOfInternal(advisor);
+            }
+        }
+
+        /// <summary> 
+        /// Return the index (0 based) of the supplied
+        /// <see cref="Spring.Aop.IIntroductionAdvisor"/> in the introductions
+        /// for this proxy.
+        /// </summary>
+        /// <param name="advisor">
+        /// The <see cref="Spring.Aop.IIntroductionAdvisor"/> to search for.
+        /// </param>
+        /// <returns>
+        /// The zero (0) based index of this advisor, or -1 if the
+        /// supplied <paramref name="advisor"/> is not an introduction advisor
+        /// for this proxy.
+        /// </returns>
+        public virtual int IndexOf(IIntroductionAdvisor advisor)
+        {
+            lock(this.SyncRoot)
+            {
+                return IndexOfInternal(advisor);
+            }
+        }
+
+        /// <summary>
+        /// Removes the supplied <paramref name="advisor"/> the list of advisors
+        /// for this proxy.
+        /// </summary>
+        /// <param name="advisor">The advisor to remove.</param>
+        /// <returns>
+        /// <see langword="true"/> if advisor was found in the list of
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport.Advisors"/> for this
+        /// proxy and was successfully removed; <see langword="false"/> if not
+        /// or if the supplied <paramref name="advisor"/> is <cref lang="null"/>.
+        /// </returns>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="advisor"/> cannot be removed.
+        /// </exception>
+        public bool RemoveAdvisor(IAdvisor advisor)
+        {
+            DieIfFrozen("Cannot remove advisor: config is frozen");
+            bool wasRemoved = false;
+            if (advisor != null)
+            {
+                lock(this.SyncRoot)
+                {
+                    int index = IndexOf(advisor);
+                    if (index == -1)
+                    {
+                        wasRemoved = false;
+                    }
+                    else
+                    {
+                        RemoveAdvisorInternal(index);
+                        wasRemoved = true;
+                    }
+                }
+            }
+            return wasRemoved;
+        }
+
+        /// <summary>
+        /// Removes the <see cref="Spring.Aop.IAdvisor"/> at the supplied
+        /// <paramref name="index"/> in the
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport.Advisors"/> list
+        /// from the list of
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport.Advisors"/> for this proxy.
+        /// </summary>
+        /// <param name="index">
+        /// The index of the <see cref="Spring.Aop.IAdvisor"/> to remove.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <see cref="Spring.Aop.IAdvisor"/> at the supplied <paramref name="index"/>
+        /// cannot be removed; or if the supplied <paramref name="index"/> is out of
+        /// range.
+        /// </exception>
+        public virtual void RemoveAdvisor(int index)
+        {
+            DieIfFrozen("Cannot remove advisor: config is frozen");
+            lock(this.SyncRoot)
+            {
+                RemoveAdvisorInternal(index);
+            }
+        }
+
+        /// <summary>
+        /// Removes the supplied <paramref name="advice"/> from the list
+        /// of <see cref="Spring.Aop.Framework.IAdvised.Advisors"/>.
+        /// </summary>
+        /// <param name="advice">
+        /// The <see cref="AopAlliance.Aop.IAdvice"/> to remove.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="advice"/> was
+        /// found in the list of <see cref="Spring.Aop.Framework.IAdvised.Advisors"/>
+        /// and successfully removed.
+        /// </returns>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <see cref="AopAlliance.Aop.IAdvice"/> cannot be removed.
+        /// </exception>
+        public bool RemoveAdvice(IAdvice advice)
+        {
+            lock(this.SyncRoot)
+            {
+                int index = IndexOf(advice);
+                if (index == -1)
+                {
+                    return false;
+                }
+                else
+                {
+                    RemoveAdvisorInternal(index);
+                    return true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Removes the supplied <paramref name="introduction"/> from the list
+        /// of <see cref="Spring.Aop.Framework.AdvisedSupport.Introductions"/>.
+        /// </summary>
+        /// <param name="introduction">
+        /// The <see cref="Spring.Aop.IIntroductionAdvisor"/> to remove.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="introduction"/> was
+        /// found in the list of <see cref="Spring.Aop.Framework.AdvisedSupport.Introductions"/>
+        /// and successfully removed.
+        /// </returns>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <see cref="Spring.Aop.IIntroductionAdvisor"/> cannot be removed.
+        /// </exception>
+        public bool RemoveIntroduction(IIntroductionAdvisor introduction)
+        {
+            DieIfFrozen("Cannot remove introduction: config is frozen");
+            bool wasRemoved = false;
+            if (introduction != null)
+            {
+                lock(this.SyncRoot)
+                {
+                    int index = IndexOf(introduction);
+                    if (index == -1)
+                    {
+                        wasRemoved = false;
+                    }
+                    else
+                    {
+                        RemoveIntroduction(index);
+                        wasRemoved = true;
+                    }
+                }
+            }
+            return wasRemoved;
+        }
+
+        /// <summary>
+        /// Removes the <see cref="Spring.Aop.IIntroductionAdvisor"/> at the supplied
+        /// <paramref name="index"/> in the list of
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport.Introductions"/> for this proxy.
+        /// </summary>
+        /// <param name="index">The index of the advisor to remove.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <see cref="Spring.Aop.IIntroductionAdvisor"/> at the supplied
+        /// <paramref name="index"/> cannot be removed; or if the supplied
+        /// <paramref name="index"/> is out of range.
+        /// </exception>
+        public virtual void RemoveIntroduction(int index)
+        {
+            DieIfFrozen("Cannot remove introduction: config is frozen");
+            lock(this.SyncRoot)
+            {
+                if (index < 0 || index >= _introductions.Count)
+                {
+                    throw new AopConfigException(
+                        "Introduction index " + index + " is out of bounds: Only have " + _introductions.Count +
+                        " introductions.");
+                }
+                IIntroductionAdvisor advisor = (IIntroductionAdvisor) _introductions[index];
+                // remove all interfaces introduced by the advisor...
+                foreach (Type intf in advisor.Interfaces)
+                {
+                    RemoveInterface(intf);
+                }
+                this._introductions.RemoveAt(index);
+                UpdateIntroductionsArray();
+            }
+        }
+
+//
+//        /// <summary>
+//        /// Removes the supplied <paramref name="interceptor"/> from the list of
+//        /// <see cref="Spring.Aop.Framework.AdvisedSupport.Advisors"/> for this
+//        /// proxy.
+//        /// </summary>
+//        /// <param name="interceptor">
+//        /// The <see cref="AopAlliance.Intercept.IInterceptor"/> to be removed.
+//        /// </param>
+//        /// <exception cref="AopConfigException">
+//        /// If this proxy configuration is frozen and the
+//        /// <paramref name="interceptor"/> cannot be added.
+//        /// </exception>
+//        public bool RemoveInterceptor(IInterceptor interceptor)
+//        {
+//            AssertFrozen("Cannot remove interceptor: config is frozen");
+//            int index = IndexOf(interceptor);
+//            if (index == -1)
+//            {
+//                return false;
+//            }
+//            else
+//            {
+//                RemoveAdvisor(index);
+//                return true;
+//            }
+//        }
+
+        /// <summary>
+        /// Adds the supplied <paramref name="advisor"/> to the list
+        /// of <see cref="Spring.Aop.Framework.AdvisedSupport.Advisors"/>.
+        /// </summary>
+        /// <param name="index">
+        /// The index in the <see cref="Spring.Aop.Framework.AdvisedSupport.Advisors"/>
+        /// list at which the supplied <paramref name="advisor"/>
+        /// is to be inserted. If -1, appends to the end of the list.
+        /// </param>
+        /// <param name="advisor">
+        /// The <see cref="Spring.Aop.IIntroductionAdvisor"/> to add.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="advisor"/> cannot be added.
+        /// </exception>
+        public virtual void AddAdvisor(int index, IAdvisor advisor)
+        {
+            DieIfFrozen("Cannot add advisor: config is frozen");
+            lock(this.SyncRoot)
+            {
+                // advisor already in list (SPRNET-846)
+                if (_advisors.Contains(advisor)) return;
+
+                if(index == -1)
+                {
+                    this._advisors.Add(advisor);
+                }
+                else
+                {
+                    this._advisors.Insert(index, advisor);
+                }
+                UpdateAdvisorsArray();
+                InterceptorsChanged();
+            }
+        }
+
+        /// <summary>
+        /// Adds the supplied <paramref name="advisor"/> to the list
+        /// of <see cref="Spring.Aop.Framework.AdvisedSupport.Advisors"/>.
+        /// </summary>
+        /// <param name="advisor">
+        /// The <see cref="Spring.Aop.IAdvisor"/> to add.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="advisor"/> cannot be added.
+        /// </exception>
+        public virtual void AddAdvisor(IAdvisor advisor)
+        {
+            AddAdvisor(this._advisors.Count, advisor);
+        }
+
+        /// <summary>
+        /// Adds the advisors from the supplied <paramref name="advisors"/> 
+        /// to the list of <see cref="Spring.Aop.Framework.IAdvised.Advisors"/>.
+        /// </summary>
+        /// <param name="advisors">
+        /// The <see cref="IAdvisors"/> to add advisors from.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="advisors"/> cannot be added.
+        /// </exception>
+        public void AddAdvisors(IAdvisors advisors)
+        {
+            foreach (IAdvisor advisor in advisors.Advisors)
+            {
+                if (advisor is IIntroductionAdvisor)
+                {
+                    AddIntroduction((IIntroductionAdvisor) advisor);
+                }
+                else
+                {
+                    AddAdvisor(advisor);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds the supplied <paramref name="introductionAdvisor"/> to the list
+        /// of <see cref="Spring.Aop.Framework.AdvisedSupport.Introductions"/>.
+        /// </summary>
+        /// <param name="index">
+        /// The index in the <see cref="Spring.Aop.Framework.AdvisedSupport.Introductions"/>
+        /// list at which the supplied <paramref name="introductionAdvisor"/>
+        /// is to be inserted.
+        /// </param>
+        /// <param name="introductionAdvisor">
+        /// The <see cref="Spring.Aop.IIntroductionAdvisor"/> to add.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="introductionAdvisor"/> cannot be added.
+        /// </exception>
+        public virtual void AddIntroduction(int index, IIntroductionAdvisor introductionAdvisor)
+        {
+            DieIfFrozen("Cannot add introduction: config is frozen");
+            introductionAdvisor.ValidateInterfaces();
+
+            lock(this.SyncRoot)
+            {
+                if (index < this._introductions.Count)
+                {
+                    this._introductions.RemoveAt(index);
+                }
+                this._introductions.Insert(index, introductionAdvisor);
+
+                int intfCount = this.interfaceMap.Count;
+                // If the advisor passed validation we can make the change
+                foreach (Type intf in introductionAdvisor.Interfaces)
+                {
+                    this.interfaceMap[intf] = introductionAdvisor;
+                }
+                UpdateIntroductionsArray();
+                if (this.interfaceMap.Count != intfCount)
+                {
+                    InterfacesChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds the supplied <paramref name="introductionAdvisor"/> to the list
+        /// of <see cref="Spring.Aop.Framework.AdvisedSupport.Introductions"/>.
+        /// </summary>
+        /// <param name="introductionAdvisor">
+        /// The <see cref="Spring.Aop.IIntroductionAdvisor"/> to add.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="introductionAdvisor"/> cannot be added.
+        /// </exception>
+        public virtual void AddIntroduction(IIntroductionAdvisor introductionAdvisor)
+        {
+            Type introductionType = introductionAdvisor.Advice.GetType();
+            lock(this.SyncRoot)
+            {
+                int pos = this._introductions.Count;
+                for (int i = 0; i < pos; i++)
+                {
+                    IIntroductionAdvisor introduction
+                        = (IIntroductionAdvisor) this._introductions[i];
+                    if (introduction.Advice.GetType() == introductionType)
+                    {
+                        pos = i;
+                    }
+                }
+                AddIntroduction(pos, introductionAdvisor);
+            }
+        }
+
+        /// <summary>
+        /// Replaces the <see cref="Spring.Aop.IIntroductionAdvisor"/> that
+        /// exists at the supplied <paramref name="index"/> in the list of
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport.Introductions"/>
+        /// with the supplied <paramref name="introduction"/>.
+        /// </summary>
+        /// <param name="index">
+        /// The index of the <see cref="Spring.Aop.IIntroductionAdvisor"/>
+        /// in the list of
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport.Introductions"/>
+        /// that is to be replaced.
+        /// </param>
+        /// <param name="introduction">
+        /// The new (replacement) <see cref="Spring.Aop.IIntroductionAdvisor"/>.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If the supplied <paramref name="index"/> is out of range.
+        /// </exception>
+        public virtual void ReplaceIntroduction(int index, IIntroductionAdvisor introduction)
+        {
+            lock(this.SyncRoot)
+            {
+                if(index < 0 || index >= _introductions.Count)
+                {
+                    throw new AopConfigException(
+                        "Introduction index " + index + " is out of bounds:" +
+                        " there are currently " + _introductions.Count +
+                        " introductions." );
+                }
+
+                _introductions[index] = introduction;
+            }
+        }
+
+        /// <summary> 
+        /// Replaces the <paramref name="oldAdvisor"/> with the
+        /// <paramref name="newAdvisor"/>.
+        /// </summary>
+        /// <param name="oldAdvisor">
+        /// The original (old) advisor to be replaced.
+        /// </param>
+        /// <param name="newAdvisor">
+        /// The new advisor to replace the <paramref name="oldAdvisor"/> with.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the <paramref name="oldAdvisor"/> was
+        /// replaced; if the <paramref name="oldAdvisor"/> was not found in the
+        /// advisors collection (or the <paramref name="newAdvisor"/> is
+        /// <see lang="null"/>, this method returns <see langword="false"/>
+        /// and (effectively) does nothing.
+        /// </returns>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="oldAdvisor"/> cannot be replaced.
+        /// </exception>
+        /// <seealso cref="Spring.Aop.Framework.ProxyConfig.IsFrozen"/>
+        public bool ReplaceAdvisor(IAdvisor oldAdvisor, IAdvisor newAdvisor)
+        {
+            DieIfFrozen("Cannot replace advisor: config is frozen.");
+            lock(this.SyncRoot)
+            {
+                int index = IndexOf(oldAdvisor);
+                if (index == -1 || newAdvisor == null)
+                {
+                    return false;
+                }
+                RemoveAdvisor(index);
+                AddAdvisor(index, newAdvisor);
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// As <see cref="System.Object.ToString()"/> will normally be passed straight through
+        /// to the advised target, this method returns the <see cref="System.Object.ToString()"/>
+        /// equivalent for the AOP proxy itself.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> description of the proxy configuration.
+        /// </returns>
+        public virtual string ToProxyConfigString()
+        {
+            lock(this.SyncRoot)
+            {
+                return ToStringInternal();
+            }
+        }
+
+        #endregion
+
+        #region ITargetTypeAware implementation
+
+        /// <summary>
+        /// Gets the target type behind the implementing object.
+        /// Ttypically a proxy configuration or an actual proxy.
+        /// </summary>
+        /// <value>The type of the target or null if not known.</value>
+        public Type TargetType
+        {
+            get { return TargetSource.TargetType; }
+        }
+
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Sets the target object that is to be advised.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is a convenience write-only property that allows client code
+        /// to set the target object... the target object will be implicitly
+        /// wrapped within a new
+        /// <see cref="Spring.Aop.Target.SingletonTargetSource"/> instance.
+        /// </p>
+        /// </remarks>
+        public virtual object Target
+        {
+            set { TargetSource = new SingletonTargetSource(value); }
+        }
+
+        /// <summary>
+        /// Called by subclasses to get a value indicating whether any AOP proxies have been created yet.
+        /// </summary>
+        /// <value><c>true</c> if this AOp proxies have been created; otherwise, <c>false</c>.</value>
+        protected bool IsActive
+        {
+            get { return isActive; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Specifies the <see cref="System.Type"/> of proxies that are to be
+        /// created for this instance of proxy config.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If this property value is <cref lang="null"/> it simply means that
+        /// no proxies have been created yet. Only when the first proxy is
+        /// created will this property value be set by the AOP framework.
+        /// </p>
+        /// <p>
+        /// Users will be able to add interceptors dynamically without proxy
+        /// regeneration, but if they add introductions the proxy
+        /// <see cref="System.Type"/> will have to be regenerated.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The <see cref="System.Type"/> of proxies that are to be
+        /// created for this instance of proxy config; <cref lang="null"/> if
+        /// no proxies have been created yet.
+        /// </value>
+        internal Type ProxyType
+        {
+            get { return this.proxyType; }
+            set { this.proxyType = value; }
+        }
+
+        /// <summary>
+        /// Caches proxy constructor for performance reasons.
+        /// </summary>
+        internal ConstructorInfo ProxyConstructor
+        {
+            get { return this.proxyConstructor; }
+            set { this.proxyConstructor = value; }
+        }
+
+        /// <summary>
+        /// Registers the supplied <paramref name="listener"/> as a listener for
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport"/> notifications.
+        /// </summary>
+        /// <param name="listener">
+        /// The <see cref="Spring.Aop.Framework.IAdvisedSupportListener"/> to
+        /// register.
+        /// </param>
+        public virtual void AddListener(IAdvisedSupportListener listener)
+        {
+            lock(this.SyncRoot)
+            {
+                this.listeners.Add(listener);
+            }
+        }
+
+        /// <summary>
+        /// Removes the supplied <paramref name="listener"/>.
+        /// </summary>
+        /// <param name="listener">
+        /// The <see cref="Spring.Aop.Framework.IAdvisedSupportListener"/> to
+        /// be removed.
+        /// </param>
+        public virtual void RemoveListener(IAdvisedSupportListener listener)
+        {
+            lock(this.SyncRoot)
+            {
+                this.listeners.Remove(listener);
+            }
+        }
+
+        /// <summary>
+        /// Adds a new interface to the list of interfaces that are proxied by this proxy.
+        /// </summary>
+        /// <param name="intf">
+        /// The interface to be proxied by this proxy.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen
+        /// (<see cref="Spring.Aop.Framework.ProxyConfig.IsFrozen"/>);
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="intf"/> is <see langword="null"/>.
+        /// </exception>
+        public virtual void AddInterface(Type intf)
+        {
+        	DieIfFrozen("Cannot add interface: configuration is frozen.");
+            AssertUtils.ArgumentNotNull(intf, "intf", "Cannot proxy a null interface.");
+
+            lock(this.SyncRoot)
+            {
+                AddInterfaceInternal(intf);
+                InterfacesChanged();
+            }
+        }
+
+        /// <summary>
+        /// Adds a new interface to the list of interfaces that are proxied by this proxy.
+        /// </summary>
+        /// <param name="intf">
+        /// The interface to be proxied by this proxy.
+        /// </param>
+        /// <remarks>
+        /// Access is not synchronized.
+        /// </remarks>
+        protected virtual void AddInterfaceInternal(Type intf)
+        {
+            this.interfaceMap[intf] = null;
+        }
+
+        /// <summary>
+        /// Removes the supplied (proxied) <paramref name="intf"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Does nothing if the supplied (proxied) <paramref name="intf"/>
+        /// isn't proxied.
+        /// </p>
+        /// </remarks>
+        /// <param name="intf">The interface to remove.</param>
+        /// <returns>
+        /// <see langword="true"/> if the interface was removed.</returns>
+        public virtual bool RemoveInterface(Type intf)
+        {
+        	DieIfFrozen("Cannot remove interface: configuration is frozen.");
+            lock(this.SyncRoot)
+            {
+                if (intf != null && this.interfaceMap.Contains(intf))
+                {
+                    this.interfaceMap.Remove(intf);
+                    InterfacesChanged();
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary> 
+        /// Return the index (0 based) of the supplied
+        /// <see cref="AopAlliance.Aop.IAdvice"/> in the interceptor
+        /// (advice) chain for this proxy.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The return value of this method can be used to index into
+        /// the <see cref="Spring.Aop.Framework.AdvisedSupport.Advisors"/>
+        /// list.
+        /// </p>
+        /// </remarks>
+        /// <param name="advice">
+        /// The <see cref="AopAlliance.Aop.IAdvice"/> to search for.
+        /// </param>
+        /// <returns>
+        /// The zero (0) based index of this interceptor, or -1 if the
+        /// supplied <paramref name="advice"/> is not an advice for this
+        /// proxy.
+        /// </returns>
+        public virtual int IndexOf(IAdvice advice)
+        {
+            lock(this.SyncRoot)
+            {
+                return IndexOfInternal(advice);
+            }
+        }
+
+        /// <summary> 
+        /// Return the index (0 based) of the supplied
+        /// <see cref="AopAlliance.Aop.IAdvice"/> in the interceptor
+        /// (advice) chain for this proxy.
+        /// </summary>
+        /// <remarks>
+        /// <p>Acces is not synchronized</p>
+        /// <p>
+        /// The return value of this method can be used to index into
+        /// the <see cref="Spring.Aop.Framework.AdvisedSupport.Advisors"/>
+        /// list.
+        /// </p>
+        /// </remarks>
+        /// <param name="advice">
+        /// The <see cref="AopAlliance.Aop.IAdvice"/> to search for.
+        /// </param>
+        /// <returns>
+        /// The zero (0) based index of this interceptor, or -1 if the
+        /// supplied <paramref name="advice"/> is not an advice for this
+        /// proxy.
+        /// </returns>
+        private int IndexOfInternal(IAdvice advice)
+        {
+            if (this._advisors != null)
+            {
+                for (int i = 0; i < this._advisors.Count; ++i)
+                {
+                    IAdvisor advisor = (IAdvisor) this._advisors[i];
+                    if (advisor.Advice == advice)
+                    {
+                        return i;
+                    }
+                }
+            }
+            return -1;
+        }
+
+        /// <summary> 
+        /// Return the index (0 based) of the supplied
+        /// <see cref="Spring.Aop.IAdvisor"/> in the interceptor
+        /// (advice) chain for this proxy.
+        /// </summary>
+        /// <param name="advisor">
+        /// The <see cref="Spring.Aop.IAdvisor"/> to search for.
+        /// </param>
+        /// <returns>
+        /// The zero (0) based index of this advisor, or -1 if the
+        /// supplied <paramref name="advisor"/> is not an advisor for this
+        /// proxy.
+        /// </returns>
+        /// <remarks>
+        /// Access is not synchronized.
+        /// </remarks>
+        private int IndexOfInternal(IAdvisor advisor)
+        {
+            return this._advisors != null ? this._advisors.IndexOf(advisor) : -1;
+        }
+
+        /// <summary> 
+        /// Return the index (0 based) of the supplied
+        /// <see cref="Spring.Aop.IIntroductionAdvisor"/> in the introductions
+        /// for this proxy.
+        /// </summary>
+        /// <param name="advisor">
+        /// The <see cref="Spring.Aop.IIntroductionAdvisor"/> to search for.
+        /// </param>
+        /// <returns>
+        /// The zero (0) based index of this advisor, or -1 if the
+        /// supplied <paramref name="advisor"/> is not an introduction advisor
+        /// for this proxy.
+        /// </returns>
+        /// <remarks>
+        /// Access is not synchronized
+        /// </remarks>
+        private int IndexOfInternal(IIntroductionAdvisor advisor)
+        {
+            return this._introductions.IndexOf(advisor);
+        }
+
+        /// <summary>
+        /// Removes the <see cref="Spring.Aop.IAdvisor"/> at the supplied
+        /// <paramref name="index"/> in the
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport.Advisors"/> list
+        /// from the list of
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport.Advisors"/> for this proxy.
+        /// </summary>
+        /// <param name="index">
+        /// The index of the <see cref="Spring.Aop.IAdvisor"/> to remove.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <see cref="Spring.Aop.IAdvisor"/> at the supplied <paramref name="index"/>
+        /// cannot be removed; or if the supplied <paramref name="index"/> is out of
+        /// range.
+        /// </exception>
+        /// <remarks>
+        /// Does not synchronize access.
+        /// </remarks>
+        private void RemoveAdvisorInternal(int index)
+        {
+            if (index < 0 || index >= this._advisors.Count)
+            {
+                throw
+                    new AopConfigException(
+                        "Advisor index " + index + " is out of bounds: Only have " + this._advisors.Count + " advisors");
+            }
+            this._advisors.RemoveAt(index);
+            this.UpdateAdvisorsArray();
+            this.InterceptorsChanged();
+        }
+
+        /// <summary>
+        /// Is the supplied <paramref name="advice"/> included in any
+        /// advisor?
+        /// </summary>
+        /// <param name="advice">
+        /// The <see cref="AopAlliance.Aop.IAdvice"/> to check for the
+        /// inclusion of.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="advice"/>
+        /// could be run in an invocation (this does not imply that said
+        /// <paramref name="advice"/> will be run).
+        /// </returns>
+        public bool AdviceIncluded(IAdvice advice)
+        {
+            return (IndexOf(advice) != -1);
+        }
+
+        /// <summary>
+        /// Returns a count of all of the <see cref="AopAlliance.Aop.IAdvice"/>
+        /// type-compatible with the supplied <see cref="System.Type"/>.
+        /// </summary>
+        /// <param name="interceptorType">
+        /// The <see cref="System.Type"/> of the
+        /// <see cref="AopAlliance.Aop.IAdvice"/> to check.
+        /// </param>
+        /// <returns>
+        /// A count of all of the <see cref="AopAlliance.Aop.IAdvice"/>
+        /// type-compatible with the supplied <see cref="System.Type"/>.
+        /// </returns>
+        public int CountAdviceOfType(Type interceptorType)
+        {
+            int count = 0;
+            lock(this.SyncRoot)
+            {
+                foreach (IAdvisor advisor in this._advisors)
+                {
+                    if (interceptorType.IsAssignableFrom(advisor.Advice.GetType()))
+                    {
+                        ++count;
+                    }
+                }
+            }
+            return count;
+        }
+
+        /// <summary>
+        /// Throws an <see cref="Spring.Aop.Framework.AopConfigException"/> if
+        /// this instances proxy configuration data is frozen.
+        /// </summary>
+        /// <param name="message">
+        /// The message that will be passed through to the constructor of any
+        /// thrown <see cref="Spring.Aop.Framework.AopConfigException"/>.
+        /// </param>
+        /// <exception cref="Spring.Aop.Framework.AopConfigException">
+        /// If the configuration for this proxy is frozen.
+        /// </exception>
+        /// <seealso cref="Spring.Aop.Framework.IAdvised.IsFrozen"/>
+        private void DieIfFrozen(string message)
+        {
+            if (IsFrozen)
+            {
+                throw new AopConfigException(message);
+            }
+        }
+
+        /// <summary>
+        /// Bring the advisors array up to date with the list.
+        /// </summary>
+        private void UpdateAdvisorsArray()
+        {
+            this._advisorsArray = new IAdvisor[this._advisors.Count];
+            this._advisors.CopyTo(this._advisorsArray, 0);
+        }
+
+        /// <summary>
+        /// Bring the introductions array up to date with the list.
+        /// </summary>
+        private void UpdateIntroductionsArray()
+        {
+            this._introductionsArray = new IIntroductionAdvisor[this._introductions.Count];
+            this._introductions.CopyTo(this._introductionsArray, 0);
+        }
+
+        /// <summary>
+        /// Callback method that is invoked when the list of proxied interfaces
+        /// has changed.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// An example of such a change would be when a new introduction is
+        /// added. Resetting
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport.ProxyType"/> to
+        /// <cref lang="null"/> will cause a new proxy <see cref="System.Type"/>
+        /// to be generated on the next call to get a proxy.
+        /// </p>
+        /// </remarks>
+        private void InterfacesChanged()
+        {
+            ProxyType = null;
+            if (this.isActive)
+            {
+                foreach (IAdvisedSupportListener listener in this.listeners)
+                {
+                    listener.InterfacesChanged(this);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Callback method that is invoked when the interceptor list has changed.
+        /// </summary>
+        private void InterceptorsChanged()
+        {
+            if (this.isActive)
+            {
+                foreach (IAdvisedSupportListener listener in this.listeners)
+                {
+                    listener.AdviceChanged(this);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Activates this instance.
+        /// </summary>
+        protected void Activate()
+        {
+            lock (this.SyncRoot)
+            {
+                this.isActive = true;
+                foreach (IAdvisedSupportListener listener in this.listeners)
+                {
+                    listener.Activated(this);
+                }
+            }
+        }
+
+        /// <summary> 
+        /// Creates an AOP proxy using this instance's configuration data.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Subclasses must not create a proxy by any other means (at least
+        /// without having a well thought out and cogent reason for doing so).
+        /// This is because the implementation of this method performs some
+        /// required housekeeping logic prior to creating an AOP proxy.
+        /// </p>
+        /// </remarks>
+        /// <seealso cref="Spring.Aop.Framework.IAopProxyFactory.CreateAopProxy"/>
+        protected internal virtual IAopProxy CreateAopProxy()
+        {
+            lock (this.SyncRoot)
+            {
+                if (!this.isActive)
+                {
+                    Activate();
+                }
+                return AopProxyFactory.CreateAopProxy(this);
+            }
+        }
+
+        /// <summary>
+        /// Copies the configuration from the supplied other
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport"/> into this instance.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Useful when this instance has been created using the no-argument
+        /// constructor, and needs to get all of its confiuration data from
+        /// another <see cref="Spring.Aop.Framework.AdvisedSupport"/> (most
+        /// usually to have an independant copy of said configuration data).
+        /// </p>
+        /// </remarks>
+        /// <param name="other">
+        /// The <see cref="Spring.Aop.Framework.AdvisedSupport"/> instance
+        /// containing the configiration data that is to be copied into this
+        /// instance.
+        /// </param>
+        protected internal virtual void CopyConfigurationFrom(AdvisedSupport other)
+        {
+            CopyFrom(other);
+            this.m_targetSource = other.m_targetSource;
+            this.proxyType = other.proxyType;
+            this.proxyConstructor = other.proxyConstructor;
+
+            foreach (Type intf in other.interfaceMap.Keys)
+            {
+                this.interfaceMap[intf] = other.interfaceMap[intf];
+            }
+            this._advisors = new ArrayList();
+            foreach (IAdvisor advisor in other._advisors)
+            {
+                AddAdvisor(advisor);
+            }
+            this._introductions = new ArrayList();
+            foreach (IIntroductionAdvisor advisor in other._introductions)
+            {
+                AddIntroduction(advisor);
+            }
+        }
+
+        /// <summary>
+        /// A <see cref="System.String"/> that represents the current
+        /// <see cref="Spring.Aop.Framework.ProxyConfig"/> configuration.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents the current
+        /// <see cref="Spring.Aop.Framework.ProxyConfig"/> configuration.
+        /// </returns>
+        public override string ToString()
+        {
+            lock(this.SyncRoot)
+            {
+                return ToStringInternal();
+            }
+        }
+
+        /// <summary>
+        /// A <see cref="System.String"/> that represents the current
+        /// <see cref="Spring.Aop.Framework.ProxyConfig"/> configuration.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents the current
+        /// <see cref="Spring.Aop.Framework.ProxyConfig"/> configuration.
+        /// </returns>
+        private string ToStringInternal()
+        {
+            StringBuilder buffer = new StringBuilder(this.GetType().FullName + ":\n");
+            buffer.Append(this.interfaceMap.Count + " interfaces=[");
+            this.InterfacesToString(buffer);
+            buffer.Append("];\n");
+            buffer.Append(this._advisors.Count + " pointcuts=[");
+            this.AdvisorsToString(buffer);
+            buffer.Append("];\n");
+            buffer.Append("targetSource=[" + this.m_targetSource + "];\n");
+            buffer.Append("advisorChainFactory=" + this.advisorChainFactory + ";\n");
+            buffer.Append(base.ToString());
+            return buffer.ToString();
+        }
+
+        /// <summary>
+        /// Helper method that adds the names of all of the proxied interfaces
+        /// to the buffer of the supplied <see cref="System.Text.StringBuilder"/>.
+        /// </summary>
+        /// <param name="buffer">
+        /// The <see cref="System.Text.StringBuilder"/> to append the proxied interface
+        /// names to.
+        /// </param>
+        private void InterfacesToString(StringBuilder buffer)
+        {
+            string separator = string.Empty;
+            foreach (Type intf in this.interfaceMap.Keys)
+            {
+                buffer.Append(separator).Append("[").Append(intf.FullName).Append("] -> ");
+                IIntroductionAdvisor advisor = this.interfaceMap[intf] as IIntroductionAdvisor;
+                if (advisor == null)
+                {
+                    if (TargetSource.TargetType != null)
+                    {
+                        buffer.Append("target[").Append(TargetSource.TargetType.FullName).Append("]");
+                    }
+                    else
+                    {
+                        buffer.Append("target[NOT SPECIFIED (=null)]");
+                    }
+                }
+                else
+                {
+                    buffer.Append("introduction[").Append(advisor.Advice.GetType().FullName).Append("]");
+                }
+                separator = ", ";
+            }
+        }
+
+        /// <summary>
+        /// Helper method that adds advisor's <see cref="System.Object.ToString"/>
+        /// to the buffer of the supplied <see cref="System.Text.StringBuilder"/>.
+        /// </summary>
+        /// <param name="buffer">
+        /// The <see cref="System.Text.StringBuilder"/> to append the advisor details to.
+        /// </param>
+        private void AdvisorsToString(StringBuilder buffer)
+        {
+            string separator = string.Empty;
+            foreach (IAdvisor advisor in this._advisors)
+            {
+                buffer.Append(separator).Append(advisor);
+                separator = ", ";
+            }
+        }
+
+        /// <summary>
+        /// Gets all of the interfaces implemented by the
+        /// <see cref="System.Type"/> of the supplied
+        /// <paramref name="target"/>.
+        /// </summary>
+        /// <param name="target">
+        /// The object to get the interfaces of.
+        /// </param>
+        /// <returns>
+        /// All of the interfaces implemented by the
+        /// <see cref="System.Type"/> of the supplied
+        /// <paramref name="target"/>.
+        /// </returns>
+        /// <exception cref="AopConfigException">
+        /// If the supplied <paramref name="target"/> is <see langword="null"/>.
+        /// </exception>
+        protected static Type[] GetInterfaces(object target)
+        {
+            if (target == null)
+            {
+                throw new AopConfigException("Can't proxy null object");
+            }
+            return ReflectionUtils.GetInterfaces(target.GetType());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/AdvisorChainFactoryUtils.cs b/src/Spring/Spring.Aop/Aop/Framework/AdvisorChainFactoryUtils.cs
new file mode 100644
index 00000000..ecb8821f
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/AdvisorChainFactoryUtils.cs
@@ -0,0 +1,122 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using AopAlliance.Intercept;
+using Spring.Aop.Framework.Adapter;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Utility methods for use by
+	/// <see cref="Spring.Aop.Framework.IAdvisorChainFactory"/> implementations.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Not intended to be used directly by applications.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: AdvisorChainFactoryUtils.cs,v 1.7 2006/04/09 07:18:35 markpollack Exp $</version>
+	public sealed class AdvisorChainFactoryUtils
+	{
+		/// <summary>
+		/// Gets the list of
+		/// <see langword="static"/> interceptors and dynamic interception
+		/// advice that may apply to the supplied <paramref name="method"/>
+		/// invocation.
+		/// </summary>
+		/// <param name="config">The proxy configuration.</param>
+		/// <param name="proxy">The object proxy.</param>
+		/// <param name="method">
+		/// The method to evaluate interceptors for.
+		/// </param>
+		/// <param name="targetType">
+		/// The <see cref="System.Type"/> of the target object.
+		/// </param>
+		/// <returns>
+		/// A <see cref="System.Collections.IList"/> of
+		/// <see cref="AopAlliance.Intercept.IMethodInterceptor"/> (if there's
+		/// a dynamic method matcher that needs evaluation at runtime).
+		/// </returns>
+		public static IList CalculateInterceptors(
+			IAdvised config, object proxy, MethodInfo method, Type targetType)
+		{
+			IList interceptors = new ArrayList(config.Advisors.Length);
+			foreach (IAdvisor advisor in config.Advisors)
+			{
+				if (advisor is IPointcutAdvisor)
+				{
+					IPointcutAdvisor pointcutAdvisor = (IPointcutAdvisor) advisor;
+					if (pointcutAdvisor.Pointcut.TypeFilter.Matches(targetType))
+					{
+						IMethodInterceptor interceptor =
+							(IMethodInterceptor) GlobalAdvisorAdapterRegistry.Instance.GetInterceptor(advisor);
+						IMethodMatcher mm = pointcutAdvisor.Pointcut.MethodMatcher;
+						if (mm.Matches(method, targetType))
+						{
+							if (mm.IsRuntime)
+							{
+								// Creating a new object instance in the GetInterceptor() method
+								// isn't a problem as we normally cache created chains...
+								interceptors.Add(new InterceptorAndDynamicMethodMatcher(interceptor, mm));
+							}
+							else
+							{
+								interceptors.Add(interceptor);
+							}
+						}
+					}
+				}
+			}
+			return interceptors;
+		}
+
+		#region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Framework.AdvisorChainFactoryUtils"/>
+		/// class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such has no publicly visible
+		/// constructors.
+		/// </p>
+		/// </remarks>
+		private AdvisorChainFactoryUtils()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/AopConfigException.cs b/src/Spring/Spring.Aop/Aop/Framework/AopConfigException.cs
new file mode 100644
index 00000000..e471ecc4
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/AopConfigException.cs
@@ -0,0 +1,93 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Thrown in response to the misconfiguration of an AOP proxy.
+	/// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: AopConfigException.cs,v 1.4 2006/04/09 07:18:35 markpollack Exp $</version>
+    [Serializable]
+	public class AopConfigException : ApplicationException
+	{
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.AopConfigException"/> class.
+        /// </summary>
+        public AopConfigException ()
+        {
+        }
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Framework.AopConfigException"/> class with
+		/// the specified message.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public AopConfigException (string message) : base(message)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Framework.AopConfigException"/> class with
+		/// the specified message and root cause.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public AopConfigException (string message, Exception rootCause)
+			: base(message, rootCause)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Framework.AopConfigException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected AopConfigException (
+			SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/AopContext.cs b/src/Spring/Spring.Aop/Aop/Framework/AopContext.cs
new file mode 100644
index 00000000..42e1e534
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/AopContext.cs
@@ -0,0 +1,172 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+using Spring.Threading;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// This class contains various <see langword="static"/> methods used to
+	/// obtain information about the current AOP invocation.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The <see langword="static"/>
+	/// <see cref="Spring.Aop.Framework.AopContext.CurrentProxy"/> property is
+	/// usable if the AOP framework is configured to expose the current proxy
+	/// (not the default)... it returns the AOP proxy in use. Target objects or
+	/// advice can use this to make advised calls. They can also use it to find
+	/// advice configuration.
+	/// </p>
+	/// <note>
+	/// The AOP framework does not expose proxies by default, as there is a
+	/// performance cost in doing so.
+	/// </note>
+	/// <p>
+	/// The functionality in this class might be used by a target object that
+	/// needed access to resources on the invocation. However, this approach
+	/// should not be used when there is a reasonable alternative, as it makes
+	/// application code dependent on usage under AOP and the Spring.NET AOP
+	/// framework.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: AopContext.cs,v 1.7 2006/09/15 21:25:16 markpollack Exp $</version>
+	public sealed class AopContext
+	{
+        private const string CURRENTPROXY_SLOTNAME = "AopContext.CurrentProxySlotName";
+
+		/// <summary>
+		/// The AOP proxy associated with this thread.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Will be <cref lang="null"/> unless the
+		/// <see cref="Spring.Aop.Framework.ProxyConfig.ExposeProxy"/> property
+		/// on the controlling proxy has been set to <see langword="true"/>.
+		/// </p>
+		/// <p>
+		/// The default value for the 
+		/// <see cref="Spring.Aop.Framework.ProxyConfig.ExposeProxy"/> property
+		/// is <see langword="false"/>, for performance reasons.
+		/// </p>
+		/// </remarks>
+		private static Stack ProxyStack
+        {
+            get 
+            {
+                Stack proxyStack = LogicalThreadContext.GetData(CURRENTPROXY_SLOTNAME) as Stack;
+                if (proxyStack == null)
+                {
+                    proxyStack = new Stack();
+                    LogicalThreadContext.SetData(CURRENTPROXY_SLOTNAME, proxyStack);
+                }
+                return proxyStack;
+            }
+        }
+
+		/// <summary>
+		/// Gets the current AOP proxy.
+		/// </summary>
+		/// <exception cref="AopConfigException">
+		/// If the proxy stack is empty.
+		/// </exception>
+		public static object CurrentProxy
+		{
+			get
+			{
+                if (ProxyStack.Count == 0)
+				{
+					throw new AopConfigException(
+						"Cannot find proxy: Set the 'ExposeProxy' property " +
+						"to 'true' on IAdvised to make it available.");
+				}
+                return ProxyStack.Peek();
+			}
+		}
+
+		/// <summary>
+		/// Sets the current proxy by pushing it to the proxy stack. 
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This method is for internal use only, and should never be called by
+		/// client code.
+		/// </p>
+		/// </remarks>
+		/// <param name="proxy">
+		/// The proxy to put on top of the proxy stack.
+		/// </param>
+		public static void PushProxy(object proxy)
+		{
+            ProxyStack.Push(proxy);
+		}
+
+		/// <summary>
+		/// Removes the current proxy from the proxy stack, making the previous
+		/// proxy (if any) the current proxy.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This method is for internal use only, and should never be called by
+		/// client code.
+		/// </p>
+		/// </remarks>
+		/// <exception cref="AopConfigException">
+		/// If the proxy stack is empty.
+		/// </exception>
+		public static void PopProxy()
+		{
+            if (ProxyStack.Count == 0)
+			{
+				throw new AopConfigException(
+					"Proxy stack empty. Always call 'PushProxy' before 'PopProxy'.");
+			}
+            ProxyStack.Pop();
+		}
+
+		#region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Framework.AopContext"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such exposes no public constructors.
+		/// </p>
+		/// </remarks>
+		private AopContext()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/AopUtils.cs b/src/Spring/Spring.Aop/Aop/Framework/AopUtils.cs
new file mode 100644
index 00000000..02d83063
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/AopUtils.cs
@@ -0,0 +1,272 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Collections;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+    /// <summary>
+    /// Utility methods used by the AOP framework.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Not intended to be used directly by applications.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: AopUtils.cs,v 1.4 2007/10/10 18:07:38 markpollack Exp $</version>
+    public sealed class AopUtils
+    {
+
+        // This is a leaky abstraction as we have hardcoded known IAopProxyFactory implementations.
+        private const string COMPOSITION_PROXY_TYPE_NAME = "CompositionAopProxy";
+
+        private const string DECORATOR_PROXY_TYPE_NAME = "DecoratorAopProxy";
+
+        /// <summary>
+        /// Is the supplied <paramref name="instance"/> an AOP proxy?
+        /// </summary>
+        /// <remarks>
+        /// Return whether the given object is either 
+        /// a composition-based proxy or a decorator-based proxy.
+        /// </remarks>
+        /// <param name="instance">The instance to be checked.</param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="instance"/> is
+        /// an AOP proxy.
+        /// </returns>
+        public static bool IsAopProxy(object instance)
+        {
+            return IsCompositionAopProxy(instance) || IsDecoratorAopProxy(instance);
+        }
+
+        /// <summary>
+        /// Is the supplied <paramref name="instance"/> a composition-based AOP proxy?
+        /// </summary>
+        /// <param name="instance">The instance to be checked.</param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="instance"/> is
+        /// an composition-based AOP proxy.
+        /// </returns>
+        public static bool IsCompositionAopProxy(Object instance)
+        {
+            return ((instance != null) && instance.GetType().FullName.StartsWith(COMPOSITION_PROXY_TYPE_NAME));
+        }
+
+        /// <summary>
+        /// Is the supplied <paramref name="instance"/> a decorator-based AOP proxy?
+        /// </summary>
+        /// <param name="instance">The instance to be checked.</param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="instance"/> is
+        /// an decorator-based AOP proxy.
+        /// </returns>
+        public static bool IsDecoratorAopProxy(Object instance)
+        {
+            return ((instance != null) && instance.GetType().FullName.StartsWith(DECORATOR_PROXY_TYPE_NAME));
+        }
+
+        /// <summary>
+        /// Gets all of the interfaces that the <see cref="System.Type"/> of the
+        /// supplied <paramref name="instance"/> implements.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This includes interfaces implemented by any superclasses.
+        /// </p>
+        /// </remarks>
+        /// <param name="instance">
+        /// The object to analyse for interfaces.
+        /// </param>
+        /// <returns>
+        /// All of the interfaces that the <see cref="System.Type"/> of the
+        /// supplied <paramref name="instance"/> implements; or an empty
+        /// array if the supplied <paramref name="instance"/> is
+        /// <see langword="null"/>.
+        /// </returns>
+        public static Type[] GetAllInterfaces(object instance)
+        {
+            if (instance != null)
+            {
+                ISet interfaces = new HybridSet();
+                Type type = instance.GetType();
+                do
+                {
+                    Type[] ifcs = type.GetInterfaces();
+                    foreach (Type ifc in ifcs)
+                    {
+                        interfaces.Add(ifc);
+                    }
+                    type = type.BaseType;
+                } while (type != null);
+                if (interfaces.Count > 0)
+                {
+                    Type[] types = new Type[interfaces.Count];
+                    interfaces.CopyTo(types, 0);
+                    return types;
+                }
+            }
+            return Type.EmptyTypes;
+        }
+
+        /// <summary> 
+        /// Can the supplied <paramref name="pointcut"/> apply at all on the
+        /// supplied <paramref name="targetType"/>?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an important test as it can be used to optimize out a
+        /// pointcut for a class.
+        /// </p>
+        /// <p>
+        /// Invoking this method with a <paramref name="targetType"/> that is
+        /// an interface type will always yield a <see langword="false"/>
+        /// return value.
+        /// </p>
+        /// </remarks>
+        /// <param name="pointcut">The pointcut being tested.</param>
+        /// <param name="targetType">The class being tested.</param>
+        /// <param name="proxyInterfaces">
+        /// The interfaces being proxied. If <see langword="null"/>, all
+        /// methods on a class may be proxied.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the pointcut can apply on any method.
+        /// </returns>
+        public static bool CanApply(
+            IPointcut pointcut, Type targetType, Type[] proxyInterfaces)
+        {
+            if (!pointcut.TypeFilter.Matches(targetType))
+            {
+                return false;
+            }
+
+            // It may apply to the class
+            // Check whether it can apply on any method
+            // Checks public methods, including inherited methods
+            MethodInfo[] methods = targetType.GetMethods();
+            for (int i = 0; i < methods.Length; ++i)
+            {
+                MethodInfo m = methods[i];
+                // If we're looking only at interfaces and this method
+                // isn't on any of them, skip it
+                if (proxyInterfaces != null
+                    && !ReflectionUtils.MethodIsOnOneOfTheseInterfaces(m, proxyInterfaces))
+                {
+                    continue;
+                }
+                if (pointcut.MethodMatcher.Matches(m, targetType))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary> 
+        /// Can the supplied <paramref name="advisor"/> apply at all on the
+        /// supplied <paramref name="targetType"/>?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an important test as it can be used to optimize out an
+        /// advisor for a class.
+        /// </p>
+        /// </remarks>
+        /// <param name="advisor">The advisor to check.</param>
+        /// <param name="targetType">The class being tested.</param>
+        /// <param name="proxyInterfaces">
+        /// The interfaces being proxied. If <see langword="null"/>, all
+        /// methods on a class may be proxied.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the advisor can apply on any method.
+        /// </returns>
+        public static bool CanApply(
+            IAdvisor advisor, Type targetType, Type[] proxyInterfaces)
+        {
+            if (advisor is IIntroductionAdvisor)
+            {
+                return ((IIntroductionAdvisor) advisor).TypeFilter.Matches(targetType);
+            }
+            else if (advisor is IPointcutAdvisor)
+            {
+                IPointcutAdvisor pca = (IPointcutAdvisor) advisor;
+                return CanApply(pca.Pointcut, targetType, proxyInterfaces);
+            }
+            // no pointcut specified so assume it applies...
+            return true;
+        }
+
+        #region Constructor (s) / Destructor
+
+        // CLOVER:OFF
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="AopUtils"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is a utility class, and as such has no publicly
+        /// visible constructors.
+        /// </p>
+        /// </remarks>
+        private AopUtils()
+        {
+        }
+
+        // CLOVER:ON
+
+        #endregion
+
+        /// <summary>
+        /// Gets the type of the target.
+        /// </summary>
+        /// <param name="candidate">The candidate.</param>
+        /// <returns></returns>
+        public static Type GetTargetType(object candidate)
+        {
+            AssertUtils.ArgumentNotNull(candidate,"candidate", "Candidate object must not be null");
+            if (candidate is ITargetSource)
+            {
+                return ((ITargetSource) candidate).TargetType;
+            }
+            if (candidate is IAdvised)
+            {
+                return ((IAdvised) candidate).TargetSource.TargetType;
+            }
+            if (IsDecoratorAopProxy(candidate))
+            {
+                return candidate.GetType().BaseType;
+            }
+            return candidate.GetType();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs
new file mode 100644
index 00000000..32c77446
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs
@@ -0,0 +1,166 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Aop.Framework.DynamicProxy;
+using Spring.Core;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Aop.Framework.AutoProxy
+{
+    /// <summary>
+    /// Abstract IOBjectPostProcessor implementation that creates AOP proxies.
+    /// This class is completely generic; it contains no special code to handle
+    /// any particular aspects, such as pooling aspects.
+    /// </summary>
+    /// <remarks>
+    /// <p>Subclasses must implement the abstract findCandidateAdvisors() method
+    /// to return a list of Advisors applying to any object. Subclasses can also
+    /// override the inherited shouldSkip() method to exclude certain objects
+    /// from autoproxying, but they must be careful to invoke the shouldSkip()
+    /// method of this class, which tries to avoid circular reference problems
+    /// and infinite loops.</p>
+    /// <p>Advisors or advices requiring ordering should implement the Ordered interface.
+    /// This class sorts advisors by Ordered order value. Advisors that don't implement
+    /// the Ordered interface will be considered to be unordered, and will appear
+    /// at the end of the advisor chain in undefined order.</p>
+    /// </remarks>
+    /// <seealso cref="Spring.Aop.Framework.AutoProxy.AbstractAdvisorAutoProxyCreator.FindCandidateAdvisors"/>
+    /// <author>Rod Johnson</author>
+    /// <author>Adhari C Mahendra (.NET)</author>
+    /// <version>$Id: AbstractAdvisorAutoProxyCreator.cs,v 1.5 2007/08/22 08:49:08 markpollack Exp $</version>
+    public abstract class AbstractAdvisorAutoProxyCreator : AbstractAutoProxyCreator
+    {
+        /// <summary>
+        /// We override this method to ensure that all candidate advisors are materialized
+        /// under a stack trace including this object. Otherwise, the dependencies won't
+        /// be apparent to the circular-reference prevention strategy in AbstractObjectFactory.
+        /// </summary>
+        public override IObjectFactory ObjectFactory
+        {
+            //TODO investigate override...
+            set
+            {
+                base.ObjectFactory = value;
+                if (!(value is IConfigurableListableObjectFactory))
+                {
+                    throw new InvalidOperationException(
+                        "Can not use AdvisorAutoProxyCreator without a ConfigurableListableObjectFactory");
+                }
+            }
+            get { return base.ObjectFactory; }
+        }
+
+        /// <summary>
+        /// Return whether the given object is to be proxied, what additional
+        /// advices (e.g. AOP Alliance interceptors) and advisors to apply.
+        /// </summary>
+        /// <param name="objType">the new object instance</param>
+        /// <param name="name">the name of the object</param>
+        /// <param name="customTargetSource">targetSource returned by TargetSource property:
+        /// may be ignored. Will be null unless a custom target source is in use.</param>
+        /// <returns>
+        /// an array of additional interceptors for the particular object;
+        /// or an empty array if no additional interceptors but just the common ones;
+        /// or null if no proxy at all, not even with the common interceptors.
+        /// </returns>
+        /// <remarks>
+        /// 	<p>The previous name of this method was "GetInterceptorAndAdvisorForObject".
+        /// It has been renamed in the course of general terminology clarification
+        /// in Spring 1.1. An AOP Alliance Interceptor is just a special form of
+        /// Advice, so the generic Advice term is preferred now.</p>
+        /// 	<p>The third parameter, customTargetSource, is new in Spring 1.1;
+        /// add it to existing implementations of this method.</p>
+        /// </remarks>
+        protected override object[] GetAdvicesAndAdvisorsForObject(Type objType, string name, ITargetSource customTargetSource)
+        {
+            IList advisors = FindEligibleAdvisors(objType);
+            if (advisors.Count == 0)
+            {
+                return DO_NOT_PROXY;
+            }
+            advisors = SortAdvisors(advisors);
+            if (advisors is ArrayList)
+                return ((ArrayList) advisors).ToArray();
+            else
+            {
+                return advisors as object[];
+            }
+        }
+
+        /// <summary>
+        /// Find all eligible advices and for autoproxying this class.
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns>the empty list, not null, if there are no pointcuts or interceptors</returns>
+        protected IList FindEligibleAdvisors(Type type)
+        {
+            IList candidateAdvisors = FindCandidateAdvisors();
+            IList eligibleAdvisors = new ArrayList();
+            for (int i = 0; i < candidateAdvisors.Count; i++)
+            {
+                IAdvisor candidate = (IAdvisor) candidateAdvisors[i];
+                if (AopUtils.CanApply(candidate, type, null))
+                {
+                    eligibleAdvisors.Add(candidate);
+                    if (logger.IsInfoEnabled)
+                    {
+                        logger.Info(string.Format("Candidate advisor [{0}] accepted for type [{1}]", candidate, type.ToString()));
+                    }
+                }
+                else
+                {
+                    if (logger.IsInfoEnabled)
+                    {
+                        logger.Info(string.Format("Candidate advisor [{0}] rejected for type [{1}]", candidate, type.ToString()));
+                    }
+                }
+            }
+            return eligibleAdvisors;
+        }
+
+
+        /// <summary>
+        /// Sorts the advisors.
+        /// </summary>
+        /// <param name="advisors">The advisors.</param>
+        /// <returns></returns>
+        protected IList SortAdvisors(IList advisors)
+        {
+            if (advisors is ArrayList)
+                ((ArrayList) advisors).Sort(new OrderComparator());
+            else if (advisors is Array)
+                Array.Sort((Array) advisors, new OrderComparator());
+            return advisors;
+        }
+
+        /// <summary>
+        /// Find all candidate advisors to use in auto-proxying.
+        /// </summary>
+        /// <returns>list of Advisors</returns>
+        protected abstract IList FindCandidateAdvisors();
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs
new file mode 100644
index 00000000..1334a10b
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs
@@ -0,0 +1,647 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Runtime.Remoting;
+using AopAlliance.Aop;
+using Common.Logging;
+using Spring.Aop.Framework.Adapter;
+using Spring.Aop.Target;
+using Spring.Collections;
+using Spring.Core;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework.AutoProxy
+{
+    /// <summary>
+    /// ObjectPostProcessor implementation that wraps a group of objects with AOP proxies
+    /// that delegate to the given interceptors before invoking the object itself.
+    /// </summary>
+    /// <remarks>
+    /// <p>This class distinguishes between "common" interceptors: shared for all proxies it
+    /// creates, and "specific" interceptors: unique per object instance. There need not
+    /// be any common interceptors. If there are, they are set using the interceptorNames
+    /// property. As with ProxyFactoryObject, interceptors names in the current factory
+    /// are used rather than object references to allow correct handling of prototype
+    /// advisors and interceptors: for example, to support stateful mixins.
+    /// Any advice type is supported for "interceptorNames" entries.</p>
+    /// <p>Such autoproxying is particularly useful if there's a large number of objects that need
+    /// to be wrapped with similar proxies, i.e. delegating to the same interceptors.
+    /// Instead of x repetitive proxy definitions for x target objects, you can register
+    /// one single such post processor with the object factory to achieve the same effect.</p>
+    /// <p>Subclasses can apply any strategy to decide if a object is to be proxied,
+    /// e.g. by type, by name, by definition details, etc. They can also return
+    /// additional interceptors that should just be applied to the specific object
+    /// instance. The default concrete implementation is ObjectNameAutoProxyCreator,
+    /// identifying the objects to be proxied via a list of object names.</p>
+    /// <p>Any number of TargetSourceCreator implementations can be used with any subclass,
+    /// to create a custom target source - for example, to pool prototype objects.
+    /// Autoproxying will occur even if there is no advice if a TargetSourceCreator specifies
+    /// a custom TargetSource. If there are no TargetSourceCreators set, or if none matches,
+    /// a SingletonTargetSource will be used by default to wrap the object to be autoproxied.</p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rod Johnson</author>
+    /// <author>Adhari C Mahendra (.NET)</author>
+    /// <seealso cref="Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.InterceptorNames"/>
+    /// <seealso cref="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator"/>
+    /// <version>$Id: AbstractAutoProxyCreator.cs,v 1.15 2008/03/03 09:28:49 bbaia Exp $</version>
+    public abstract class AbstractAutoProxyCreator : ProxyConfig, IInstantiationAwareObjectPostProcessor, IObjectFactoryAware, IOrdered
+    {
+        #region Protected Fields
+
+        /// <summary>
+        /// The logger for this class hierarchy.
+        /// </summary>
+        protected readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
+        /// <summary>
+        /// Convenience constant for subclasses: Return value for "do not proxy".
+        /// </summary>
+        protected static readonly object[] DO_NOT_PROXY = null;
+
+        /// <summary>
+        /// Convenience constant for subclasses: Return value for
+        /// "proxy without additional interceptors, just the common ones".
+        /// </summary>
+        protected static readonly object[] PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS = new object[0];
+
+        #endregion
+
+        #region Private Fields
+
+        /// <summary>
+        /// Default value is same as non-ordered
+        /// </summary>
+        private int order = int.MaxValue;
+
+        /// <summary>
+        /// Default is global AdvisorAdapterRegistry
+        /// </summary>
+        private IAdvisorAdapterRegistry advisorAdapterRegistry = GlobalAdvisorAdapterRegistry.Instance;
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private bool freezeProxy = false;
+
+        /// <summary>
+        /// Names of common interceptors. 
+        /// We must use object name rather than object references
+        /// to handle prototype advisors/interceptors.
+        /// Default is the empty array: no common interceptors.
+        /// </summary>
+        private string[] interceptorNames = new string[0];
+
+        private bool applyCommonInterceptorsFirst = true;
+        private IList customTargetSourceCreators = new ArrayList();
+        private IObjectFactory owningObjectFactory;
+
+        /// <summary>
+        /// Set of object type + name strings, referring to all objects that this auto-proxy
+        /// creator created a custom TargetSource for.  Used to detect own pre-built proxies
+        /// (from "PostProcessBeforeInstantiation") in the "PostProcessAfterInitialization" method.
+        /// </summary>
+        private ISet targetSourcedObjects = new SynchronizedSet(new HashedSet());
+
+        private ISet advisedObjects = new SynchronizedSet(new HashedSet());
+
+        private ISet nonAdvisedObjects = new SynchronizedSet(new HashedSet());
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Sets the AdvisorAdapterRegistry to use. 
+        /// </summary>
+        /// <remarks>
+        /// Default is the global AdvisorAdapterRegistry.
+        /// </remarks>
+        public IAdvisorAdapterRegistry AdvisorAdapterRegistry
+        {
+            set { advisorAdapterRegistry = value; }
+        }
+
+        /// <summary>
+        /// Sets custom TargetSourceCreators to be applied in this order.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// If the list is empty, or they all return null, a SingletonTargetSource
+        /// will be created.
+        /// </para>
+        /// <para>
+        /// TargetSourceCreators can only be invoked if this post processor is used
+        /// in a IObjectFactory, and its ObjectFactoryAware callback is used.
+        /// </para>
+        /// </remarks>
+        public IList CustomTargetSourceCreators
+        {
+            set { customTargetSourceCreators = value; }
+        }
+
+        /// <summary> 
+        /// Sets the common interceptors, a list of <see cref="AopAlliance.Aop.IAdvice"/>, 
+        /// <see cref="Spring.Aop.IAdvisor"/> and introduction object names.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// If this property isn't set, there will be zero common interceptors. 
+        /// This is perfectly valid, if "specific" interceptors such as
+        /// matching Advisors are all we want.
+        /// </para>
+        /// </remarks>
+        /// <value>
+        /// The list of <see cref="AopAlliance.Aop.IAdvice"/>, 
+        /// <see cref="Spring.Aop.IAdvisor"/> and introduction object names.
+        /// </value>
+        /// <seealso cref="AopAlliance.Aop.IAdvice"/>
+        /// <seealso cref="Spring.Aop.IAdvisor"/>
+        public string[] InterceptorNames
+        {
+            set { interceptorNames = value; }
+        }
+
+        /// <summary>
+        /// Sets whether the common interceptors should be applied before
+        /// object-specific ones. 
+        /// </summary>
+        /// <remarks>
+        /// Default is true; else, object-specific interceptors will get applied first.
+        /// </remarks>
+        public bool ApplyCommonInterceptorsFirst
+        {
+            set { applyCommonInterceptorsFirst = value; }
+        }
+
+        /// <summary>
+        /// Set whether or not the proxy should be frozen, preventing advice
+        /// from being added to it once it is created.
+        /// </summary>
+        /// <remarks>
+        /// 	<p>Overridden from the super class to prevent the proxy configuration
+        /// from being frozen before the proxy is created. The default is not frozen.
+        ///     </p>
+        /// </remarks>
+        public override bool IsFrozen
+        {
+            get { return freezeProxy; }
+            set { this.freezeProxy = value; }
+        }
+
+        #endregion
+
+        #region IObjectPostProcessor Members
+
+        /// <summary>
+        /// Create a proxy with the configured interceptors if the object is
+        /// identified as one to proxy by the subclass.
+        /// </summary>
+        public virtual object PostProcessAfterInitialization(object obj, string objectName)
+        {
+            if (targetSourcedObjects.Contains(objectName))
+            {
+                return obj;
+            }
+
+            object cacheKey = GetCacheKey(obj.GetType(), objectName);
+            if (nonAdvisedObjects.Contains(cacheKey))
+            {
+                return obj;
+            }
+            if (IsInfrastructureType(obj.GetType(), objectName) || ShouldSkip(obj.GetType(), objectName))
+            {
+                #region Instrumentation
+
+                if (logger.IsDebugEnabled)
+                {
+                    logger.Debug(string.Format("Did not attempt to autoproxy infrastructure type [{0}]", obj.GetType().ToString()));
+                }
+
+                #endregion
+
+                nonAdvisedObjects.Add(cacheKey);
+                return obj;
+            }
+
+            //ITargetSource targetSource = GetCustomTargetSource(obj.GetType(), objectName);
+            object[] specificInterceptors;
+            if (RemotingServices.IsTransparentProxy(obj))
+            {
+                specificInterceptors = GetAdvicesAndAdvisorsForObject(ObjectFactory.GetType(objectName), objectName, null);                
+            }
+            else
+            {
+                specificInterceptors = GetAdvicesAndAdvisorsForObject(obj.GetType(), objectName, null);
+            }
+            
+
+            // proxy if we have advice or if a TargetSourceCreator wants to do some
+            // fancy stuff such as pooling
+            if (specificInterceptors != DO_NOT_PROXY)
+            {
+                advisedObjects.Add(cacheKey);
+                return CreateProxy(obj.GetType(), objectName, specificInterceptors, new SingletonTargetSource(obj));
+            }
+            nonAdvisedObjects.Add(cacheKey);
+            return obj;
+        }
+
+        /// <summary>
+        /// No-op for before initialization.
+        /// </summary>
+        /// <param name="obj">The obj.</param>
+        /// <param name="name">The name.</param>
+        /// <returns></returns>
+        public virtual object PostProcessBeforeInitialization(object obj, string name)
+        {
+            return obj;
+        }
+
+        #endregion
+
+        #region IObjectFactoryAware Members
+
+        /// <summary>
+        /// Callback that supplies the owning factory to an object instance.
+        /// </summary>
+        /// <value>
+        /// Owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+        /// (may not be <see langword="null"/>). The object can immediately
+        /// call methods on the factory.
+        /// </value>
+        /// <remarks>
+        /// 	<p>
+        /// Invoked after population of normal object properties but before an init
+        /// callback like <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// method or a custom init-method.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="T:Spring.Objects.ObjectsException">
+        /// In case of initialization errors.
+        /// </exception>
+        public virtual IObjectFactory ObjectFactory
+        {
+            get { return owningObjectFactory; }
+            set { owningObjectFactory = value; }
+        }
+
+        #endregion
+
+        #region IOrdered Members
+
+        /// <summary>
+        /// Propery Order
+        /// </summary>
+        /// <remarks>
+        /// Ordering which will apply to this class's implementation
+        /// of Ordered, used when applying multiple ObjectPostProcessors.
+        /// Default value is int.MaxValue, meaning that it's non-ordered.
+        /// </remarks>
+        public virtual int Order
+        {
+            get { return order; }
+            set { order = value; }
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Subclasses should override this method to return true if this
+        /// object should not be considered for autoproxying by this post processor.
+        /// Sometimes we need to be able to avoid this happening if it will lead to
+        /// a circular reference. This implementation returns true.
+        /// </summary>
+        /// <param name="objectType">the type of the object</param>
+        /// <param name="objectName">the name of the object</param>
+        /// <returns>if remarkable to skip</returns>
+        protected virtual bool ShouldSkip(Type objectType, string objectName)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Subclasses may choose to implement this: for example,
+        /// to change the interfaces exposed
+        /// </summary>
+        /// <param name="pf">
+        /// ProxyFactory that will be used to create the proxy immediably after this method returns.
+        /// </param>
+        protected virtual void CustomizeProxyFactory(ProxyFactory pf)
+        {
+            // This implementation does nothing
+        }
+
+        /// <summary>
+        /// Determines whether the object is an infrastructure type,
+        /// IAdvisor, IAdvice, IAdvisors or AbstractAutoProxyCreator
+        /// </summary>
+        /// <param name="type">The object type to compare</param>
+        /// <param name="name">The name of the object</param>
+        /// <returns>
+        /// <c>true</c> if [is infrastructure type] [the specified obj]; otherwise, <c>false</c>.
+        /// </returns>
+        protected virtual bool IsInfrastructureType(Type type, String name)
+        {
+            return typeof (IAdvisor).IsAssignableFrom(type)
+                || typeof (IAdvice).IsAssignableFrom(type)
+                || typeof (IAdvisors).IsAssignableFrom(type)
+                || typeof (AbstractAutoProxyCreator).IsAssignableFrom(type);
+        }
+    
+
+        /// <summary>
+        /// Create a target source for object instances. Uses any
+        /// TargetSourceCreators if set. Returns null if no Custom TargetSource
+        /// should be used.
+        /// This implementation uses the customTargetSourceCreators property.
+        /// Subclasses can override this method to use a different mechanism.
+        /// </summary>
+        /// <param name="objectType">the type of the object to create a TargetSource for</param>
+        /// <param name="name">the name of the object</param>
+        /// <returns>a TargetSource for this object</returns>
+        protected virtual ITargetSource GetCustomTargetSource(Type objectType, string name)
+        {
+            // We can't create fancy target sources for directly registered singletons.
+            if (customTargetSourceCreators != null && 
+                owningObjectFactory != null && owningObjectFactory.ContainsObject(name))
+            {
+                for (int i = 0; i < customTargetSourceCreators.Count; i++)
+                {
+                    ITargetSourceCreator tsc = (ITargetSourceCreator) customTargetSourceCreators[i];
+                    ITargetSource ts = tsc.GetTargetSource(objectType, name, owningObjectFactory);
+                    if (ts != null)
+                    {
+                        // found a match
+                        if (logger.IsInfoEnabled)
+                        {
+                            logger.Info(string.Format("TargetSourceCreator [{0} found custom TargetSource for object with objectName '{1}'", tsc, name));
+                        }
+                        return ts;
+                    }
+                }
+            }
+
+            // no custom TargetSource found
+            return null;
+        }
+
+        /// <summary>
+        /// Return whether the given object is to be proxied, what additional
+        /// advices (e.g. AOP Alliance interceptors) and advisors to apply.
+        /// </summary>
+        /// <remarks>
+        /// <p>The previous name of this method was "GetInterceptorAndAdvisorForObject".
+        /// It has been renamed in the course of general terminology clarification
+        /// in Spring 1.1. An AOP Alliance Interceptor is just a special form of
+        /// Advice, so the generic Advice term is preferred now.</p>
+        /// <p>The third parameter, customTargetSource, is new in Spring 1.1;
+        /// add it to existing implementations of this method.</p>
+        /// </remarks>
+        /// <param name="objType">the new object instance</param>
+        /// <param name="name">the name of the object</param>
+        /// <param name="customTargetSource">targetSource returned by TargetSource property:
+        /// may be ignored. Will be null unless a custom target source is in use.</param>
+        /// <returns>an array of additional interceptors for the particular object;
+        /// or an empty array if no additional interceptors but just the common ones;
+        /// or null if no proxy at all, not even with the common interceptors.</returns>
+        protected abstract object[] GetAdvicesAndAdvisorsForObject(Type objType, string name, ITargetSource customTargetSource);
+
+        /// <summary>
+        /// Create an AOP proxy for the given object.
+        /// </summary>
+        /// <param name="objectType">Type of the object.</param>
+        /// <param name="objectName">The name of the object.</param>
+        /// <param name="specificInterceptors">The set of interceptors that is specific to this
+        /// object (may be empty but not null)</param>
+        /// <param name="targetSource">The target source for the proxy, already pre-configured to access the object.</param>
+        /// <returns>The AOP Proxy for the object.</returns>
+        protected virtual object CreateProxy(Type objectType, string objectName, object[] specificInterceptors, ITargetSource targetSource)
+        {
+            ProxyFactory proxyFactory = CreateProxyFactory();
+            // copy our properties (proxyTargetClass) inherited from ProxyConfig
+            proxyFactory.CopyFrom(this);
+
+            object target = targetSource.GetTarget();
+
+            
+            if(!ProxyTargetType)
+            {
+                // Must allow for introductions; can't just set interfaces to
+                // the target's interfaces only.
+                Type[] targetInterfaceTypes = AopUtils.GetAllInterfaces(target);
+                foreach (Type interfaceType in targetInterfaceTypes)
+                {
+                    proxyFactory.AddInterface(interfaceType);
+                }
+            }   
+            
+
+            IAdvisor[] advisors = BuildAdvisors(objectName, specificInterceptors);
+
+            foreach (IAdvisor advisor in advisors)
+            {
+                if (advisor is IIntroductionAdvisor)
+                {
+                    proxyFactory.AddIntroduction((IIntroductionAdvisor)advisor);
+                }
+                else
+                {
+                    proxyFactory.AddAdvisor(advisor);
+                }
+            }
+            proxyFactory.TargetSource = targetSource;
+            CustomizeProxyFactory(proxyFactory);
+
+            proxyFactory.IsFrozen = freezeProxy;
+            return proxyFactory.GetProxy();
+        }
+
+        /// <summary>
+        /// Obtain a new proxy factory instance to be used for proxying a particular object
+        /// </summary>
+        /// <returns>A proxy factory instance for proxying a particular object</returns>
+        protected virtual ProxyFactory CreateProxyFactory()
+        {
+            return new ProxyFactory();
+        }
+
+        /// <summary>
+        /// Determines the advisors for the given object, including the specific interceptors
+        /// as well as the common interceptor, all adapted to the Advisor interface.
+        /// </summary>
+        /// <param name="objectName">The name of the object.</param>
+        /// <param name="specificInterceptors">The set of interceptors that is specific to this
+        /// object (may be empty, but not null)</param>
+        /// <returns>The list of Advisors for the given object</returns>
+        protected virtual IAdvisor[] BuildAdvisors(string objectName, object[] specificInterceptors)
+        {
+            // handle prototypes correctly
+            IAdvisor[] commonInterceptors = ResolveInterceptorNames();
+
+            ArrayList allInterceptors = new ArrayList();
+            if (specificInterceptors != null)
+            {
+                allInterceptors.AddRange(specificInterceptors);
+                if (commonInterceptors != null)
+                {
+                    if (applyCommonInterceptorsFirst)
+                    {
+                        allInterceptors.InsertRange(0, commonInterceptors);
+                    }
+                    else
+                    {
+                        allInterceptors.AddRange(commonInterceptors);
+                    }
+                }
+            }
+            if (logger.IsInfoEnabled)
+            {
+                int nrOfCommonInterceptors = commonInterceptors != null ? commonInterceptors.Length : 0;
+                int nrOfSpecificInterceptors = specificInterceptors != null ? specificInterceptors.Length : 0;
+                logger.Info(string.Format("Creating implicit proxy for object '{0}' with {1} common interceptors and {2} specific interceptors", objectName, nrOfCommonInterceptors, nrOfSpecificInterceptors));
+            }
+
+
+            IAdvisor[] advisors = new IAdvisor[allInterceptors.Count];
+            for (int i = 0; i < allInterceptors.Count; i++)
+            {
+                advisors[i] = advisorAdapterRegistry.Wrap(allInterceptors[i]);
+            }
+            return advisors;
+        }
+
+        /// <summary>
+        /// Build a cache key for the given object type and object name
+        /// </summary>
+        /// <param name="objectType">The object type.</param>
+        /// <param name="objectName">The object name.</param>
+        /// <returns>The cache key for the given type and name</returns>
+        protected virtual object GetCacheKey(Type objectType, string objectName)
+        {
+            return objectType.FullName + "_" + objectName;
+        }
+
+
+        #endregion
+
+        #region Private Methods
+
+        private IAdvisor[] ResolveInterceptorNames()
+        {
+            ArrayList advisors = new ArrayList();
+            foreach(string name in interceptorNames)
+            {
+                object next = owningObjectFactory.GetObject(name);
+                if (next is IAdvisors)
+                {
+                    advisors.AddRange(((IAdvisors)next).Advisors);
+                }
+                else
+                {
+                    advisors.Add(advisorAdapterRegistry.Wrap(next));
+                }
+            }
+            return (IAdvisor[])advisors.ToArray(typeof(IAdvisor));
+        }
+
+        #endregion
+
+        #region IInstantiationAwareObjectPostProcessor Members
+
+        /// <summary>
+        /// Create the proxy if have a custom TargetSource
+        /// </summary>
+        /// <param name="objectType">The object type</param>
+        /// <param name="objectName">The object name</param>
+        /// <returns>null if not creating a proxy, otherwise return the proxy.</returns>
+        public object PostProcessBeforeInstantiation(Type objectType, string objectName)
+        {
+            object cacheKey = GetCacheKey(objectType, objectName);
+            if (!targetSourcedObjects.Contains(cacheKey))
+            {
+                if (advisedObjects.Contains(cacheKey) || nonAdvisedObjects.Contains(cacheKey))
+                {
+                    return null;
+                }
+                if (IsInfrastructureType(objectType, objectName) || ShouldSkip(objectType, objectName))
+                {
+                    nonAdvisedObjects.Add(cacheKey);
+                    return null;
+                }
+            }
+            // Create proxy here if we have a custom TargetSource.
+            // Suppresses unnecessary default instantiation of the target object:
+            // The TargetSource will handle target instances in a custom fashion.
+            ITargetSource targetSource = GetCustomTargetSource(objectType, objectName);
+            if (targetSource != null)
+            {
+                targetSourcedObjects.Add(objectName);
+                object[] specificInterceptors = GetAdvicesAndAdvisorsForObject(objectType, objectName, targetSource);
+                return CreateProxy(objectType, objectName, specificInterceptors, targetSource);
+            }
+            return null;
+        }
+
+
+        /// <summary>
+        /// Default behavior, return true and continue processing.
+        /// </summary>
+        /// <param name="objectInstance">The object instance</param>
+        /// <param name="objectName">The object name.</param>
+        /// <returns>true</returns>
+        public bool PostProcessAfterInstantiation(object objectInstance, string objectName)
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// Default behavior, return passed in PropertyValues
+        /// </summary>
+        /// <param name="pvs">The property values that the factory is about to apply (never <code>null</code>).</param>
+        /// <param name="pis">he relevant property infos for the target object (with ignored
+        /// dependency types - which the factory handles specifically - already filtered out)</param>
+        /// <param name="objectInstance">The object instance created, but whose properties have not yet 
+        /// been set.</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>The passed in PropertyValues</returns>
+        public IPropertyValues PostProcessPropertyValues(IPropertyValues pvs, PropertyInfo[] pis, object objectInstance,
+                                                         string objectName)
+        {
+            return pvs;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/DefaultAdvisorAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/DefaultAdvisorAutoProxyCreator.cs
new file mode 100644
index 00000000..dfc44061
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/DefaultAdvisorAutoProxyCreator.cs
@@ -0,0 +1,198 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Aop.Framework.AutoProxy
+{
+    /// <summary>
+    /// ObjectPostProcessor implementation that creates AOP proxies based on all candidate
+    /// Advisors in the current IObjectFactory. This class is completely generic; it contains
+    /// no special code to handle any particular aspects, such as pooling aspects.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Adhari C Mahendra (.NET)</author>
+    /// <version>$Id: DefaultAdvisorAutoProxyCreator.cs,v 1.9 2007/10/08 22:04:51 markpollack Exp $</version>
+    public class DefaultAdvisorAutoProxyCreator : AbstractAdvisorAutoProxyCreator, IObjectNameAware, IInitializingObject
+    {
+
+        /// <summary>
+        /// Separator between prefix and remainder of object name
+        /// </summary>
+        public static readonly string SEPARATOR = ".";
+        private bool usePrefix;
+        private string advisorObjectNamePrefix;
+        private IList advisors;
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to exclude
+        /// advisors with a certain prefix.
+        /// </summary>
+        /// <value><c>true</c> if [use prefix]; otherwise, <c>false</c>.</value>
+        public bool UsePrefix
+        {
+            get { return usePrefix; }
+            set { usePrefix = value; }
+        }
+
+        /// <summary>
+        /// Set the prefix for object names that will cause them to be included for
+        /// auto-proxying by this object. This prefix should be set to avoid circular
+        /// references. Default value is the object name of this object + a dot.
+        /// </summary>
+        /// <value>The advisor object name prefix.</value>
+        public string AdvisorObjectNamePrefix
+        {
+            get { return advisorObjectNamePrefix; }
+            set { advisorObjectNamePrefix = value; }
+        }
+
+        #endregion
+        /// <summary>
+        /// Find all candidate advices to use in auto proxying.
+        /// </summary>
+        /// <returns>list of Advice</returns>
+        protected override IList FindCandidateAdvisors()
+        {
+            if (advisors == null)
+            {
+                throw new InvalidOperationException("Must not be called before AfterPropertiesSet()");
+            }
+            if (logger.IsDebugEnabled)
+            {
+                logger.Debug(string.Format("returning available advisors"));
+            }
+            return advisors;
+        }
+
+        private IList InstantiateCandidateAdvisors()
+        {
+            if (logger.IsDebugEnabled)
+            {
+                logger.Debug(string.Format("instantiating available advisors"));
+            }
+
+            //This is ensured in AbstractAdvisorAutoProxyCreator.  Will be more type safe once sync with Spring Java 2.x
+            IConfigurableListableObjectFactory owningFactory = ObjectFactory as IConfigurableListableObjectFactory;
+            if (owningFactory == null)
+            {
+                throw new InvalidOperationException("Cannot use DefaultAdvisorAutoProxyCreator without a IListableObjectFactory");
+            }
+
+            ArrayList candidateAdvisors = new ArrayList();
+
+            string[] advisorNames = ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(
+                owningFactory, typeof(IAdvisor), true, false);
+            for (int i = 0; i < advisorNames.Length; i++)
+            {
+                string name = advisorNames[i];
+                if ( (!usePrefix || name.StartsWith(advisorObjectNamePrefix)) && !owningFactory.IsCurrentlyInCreation(name))
+                {
+                    try
+                    {
+                        IAdvisor advisor = (IAdvisor) owningFactory.GetObject(name);
+                        candidateAdvisors.Add(advisor);
+                    } catch (ObjectCreationException ex)
+                    {
+                        Exception rootEx = ex.GetBaseException();
+
+                        
+                        if (rootEx is ObjectCurrentlyInCreationException)
+                        {
+                            ObjectCurrentlyInCreationException oce = (ObjectCurrentlyInCreationException) rootEx;
+                            if (owningFactory.IsCurrentlyInCreation(oce.ObjectName))
+                            {
+                                if (logger.IsDebugEnabled)
+                                {
+                                    logger.Debug(string.Format("Ignoring currently created advisor '{0}': exception message = {1}",
+                                        name, ex.Message));
+                                }
+                                continue;
+                            }                                                      
+                        }
+                        throw;
+                    }
+                }
+            }
+
+            string[] aspectNames = ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(
+                owningFactory, typeof(IAdvisors), true, false);
+            for (int i = 0; i < aspectNames.Length; i++)
+            {
+                string name = aspectNames[i];
+                if (!usePrefix || name.StartsWith(advisorObjectNamePrefix))
+                {
+                    IAdvisors advisors = (IAdvisors)owningFactory.GetObject(name);
+                    candidateAdvisors.AddRange(advisors.Advisors);
+                }
+            }
+
+            return candidateAdvisors;
+        }
+
+
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        public void AfterPropertiesSet()
+        {
+            advisors = InstantiateCandidateAdvisors();
+        }
+
+        #region IObjectNameAware Members
+
+        /// <summary>
+        /// Set the name of the object in the object factory that created this object.
+        /// </summary>
+        /// <value>The name of the object in the factory.</value>
+        /// <remarks>
+        /// 	<p>
+        /// Invoked after population of normal object properties but before an init
+        /// callback like <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// method or a custom init-method.
+        /// </p>
+        /// </remarks>
+        public string ObjectName
+        {
+            set
+            {
+                // If no infrastructure object name prefix has been set, override it.
+                if (advisorObjectNamePrefix == null)
+                {
+                    advisorObjectNamePrefix = value + SEPARATOR;
+                }
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ITargetSourceCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ITargetSourceCreator.cs
new file mode 100644
index 00000000..dffa583a
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ITargetSourceCreator.cs
@@ -0,0 +1,53 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Objects.Factory;
+
+#endregion
+
+namespace Spring.Aop.Framework.AutoProxy
+{
+    /// <summary>
+    /// Implementations can create special target sources, such as pooling target
+    /// sources, for particular objects. For example, they may base their choice
+    /// on attributes, such as a pooling attribute, on the target type.
+    /// </summary>
+    /// <remarks><p>AbstractAutoProxyCreator can support a number of TargetSourceCreators,
+    /// which will be applied in order.</p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Adhari C Mahendra (.NET)</author>
+    /// <version>$Id: ITargetSourceCreator.cs,v 1.3 2007/08/22 08:49:08 markpollack Exp $</version>
+    public interface ITargetSourceCreator
+    {
+        /// <summary>
+        /// Create a special TargetSource for the given object, if any.
+        /// </summary>
+        /// <param name="objectType">The type of the object to create a TargetSource for</param>
+        /// <param name="objectName">the name of the object</param>
+        /// <param name="factory">the containing factory</param>
+        /// <returns>a special TargetSource or null if this TargetSourceCreator isn't
+        ///  interested in the particular object</returns>
+        ITargetSource GetTargetSource(Type objectType, string objectName, IObjectFactory factory);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreator.cs
new file mode 100644
index 00000000..37f16e67
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreator.cs
@@ -0,0 +1,112 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Objects.Factory;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework.AutoProxy
+{
+    /// <summary>
+    /// Object Auto Proxy Creator
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Auto proxy creator that identifies objects to proxy via a list of names.
+    ///	Checks for direct, "xxx*", "*xxx" and "*xxx*" matches.
+    /// </para>
+    /// <para>In case of a IFactoryObject, only the objects created by the
+    /// FactoryBean will get proxied.  If you intend to proxy a IFactoryObject instance itself
+    /// specify the object name of the IFactoryObject including 
+    /// the factory-object prefix "&amp;"  e.g. "&amp;MyFactoryObject".
+    /// </para>
+    /// </remarks>
+    /// <seealso cref="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator.IsMatch"/>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Adhari C Mahendra (.NET)</author>
+    /// <version>$Id: ObjectNameAutoProxyCreator.cs,v 1.8 2008/03/03 09:28:49 bbaia Exp $</version>
+    public class ObjectNameAutoProxyCreator : AbstractAutoProxyCreator
+    {
+        private IList objectNames;
+
+        /// <summary>
+        /// Set the names of the objects in IList fashioned way that should automatically 
+        /// get wrapped with proxies.
+        /// A name can specify a prefix to match by ending with "*", e.g. "myObject,tx*"
+        /// will match the object named "myObject" and all objects whose name start with "tx".
+        /// </summary>
+        public IList ObjectNames
+        {
+            set { objectNames = value; }
+        }
+
+        /// <summary>
+        /// Identify as object to proxy if the object name is in the configured list of names.
+        /// </summary>
+        protected override object[] GetAdvicesAndAdvisorsForObject(Type objType, string name, ITargetSource customTargetSource)
+        {
+            if (objectNames != null)
+            {
+                for (int i = 0; i < objectNames.Count; i++)
+                {
+                    string mappedName = String.Copy((string) objectNames[i]);
+                    if (typeof (IFactoryObject).IsAssignableFrom(objType))
+                    {
+                        if (!name.StartsWith(ObjectFactoryUtils.FactoryObjectPrefix))
+                        {
+                            continue;                           
+                        }
+                        mappedName = mappedName.Substring(ObjectFactoryUtils.FactoryObjectPrefix.Length);
+                    }
+                    if (IsMatch(name, mappedName))
+                    {
+                        return PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS;
+                    }
+                }
+            }
+            return DO_NOT_PROXY;
+
+        }
+
+        /// <summary>
+        /// Return if the given object name matches the mapped name.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The default implementation checks for "xxx*", "*xxx" and "*xxx*" matches,
+        /// as well as direct equality. Can be overridden in subclasses.
+        /// </p>
+        /// </remarks>
+        /// <param name="objectName">the object name to check</param>
+        /// <param name="mappedName">the name in the configured list of names</param>
+        /// <returns>if the names match</returns>
+        protected virtual bool IsMatch(string objectName, string mappedName)
+        {
+            return PatternMatchUtils.SimpleMatch(mappedName, objectName);          
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs
new file mode 100644
index 00000000..55af4478
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs
@@ -0,0 +1,107 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Common.Logging;
+using Spring.Aop.Target;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Aop.Framework.AutoProxy.Target
+{
+    /// <summary>
+    /// Summary description for AbstractPrototypeBasedTargetSourceCreator.
+    /// </summary>
+    public abstract class AbstractPrototypeTargetSourceCreator : ITargetSourceCreator
+    {
+        /// <summary>
+        /// The logger
+        /// </summary>
+        protected readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
+        #region ITargetSourceCreator Members
+
+        /// <summary>
+        /// Create a special TargetSource for the given object, if any.
+        /// </summary>
+        /// <param name="objectType">the type of the object to create a TargetSource for</param>
+        /// <param name="name">the name of the object</param>
+        /// <param name="factory">the containing factory</param>
+        /// <returns>
+        /// a special TargetSource or null if this TargetSourceCreator isn't
+        /// interested in the particular object
+        /// </returns>
+        public ITargetSource GetTargetSource(Type objectType, string name, IObjectFactory factory)
+        {
+            AbstractPrototypeTargetSource prototypeTargetSource = CreatePrototypeTargetSource(objectType, name, factory);
+            if (prototypeTargetSource == null)
+            {
+                return null;
+            }
+            else
+            {
+                if (!(factory is IObjectDefinitionRegistry))
+                {
+                    if (logger.IsWarnEnabled)
+                        logger.Warn("Cannot do autopooling with a IObjectFactory that doesn't implement IObjectDefinitionRegistry");
+                    return null;
+                }
+                IObjectDefinitionRegistry definitionRegistry = (IObjectDefinitionRegistry) factory;
+                RootObjectDefinition definition = (RootObjectDefinition) definitionRegistry.GetObjectDefinition(name);
+
+                if (logger.IsInfoEnabled)
+                    logger.Info("Configuring AbstractPrototypeBasedTargetSource...");
+
+                // Infinite cycle will result if we don't use a different factory,
+                // because a GetObject() call with this objectName will go through the autoproxy
+                // infrastructure again.
+                // We to override just this object definition, as it may reference other objects
+                // and we're happy to take the parent's definition for those.
+                DefaultListableObjectFactory objectFactory = new DefaultListableObjectFactory(factory);
+
+                // Override the prototype object
+                objectFactory.RegisterObjectDefinition(name, definition);
+
+                // Complete configuring the PrototypeTargetSource
+                prototypeTargetSource.TargetObjectName = name;
+                prototypeTargetSource.ObjectFactory = objectFactory;
+
+                return prototypeTargetSource;
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Creates the prototype target source.
+        /// </summary>
+        /// <param name="objectType">The type of the object to create a target source for.</param>
+        /// <param name="name">The name.</param>
+        /// <param name="factory">The factory.</param>
+        /// <returns></returns>
+        protected abstract AbstractPrototypeTargetSource CreatePrototypeTargetSource(Type objectType, string name,
+                                                                                     IObjectFactory factory);
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicMethodInvocation.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicMethodInvocation.cs
new file mode 100644
index 00000000..8ce1283b
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicMethodInvocation.cs
@@ -0,0 +1,126 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+using Spring.Util;
+using Spring.Reflection.Dynamic;
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Invokes a target method using dynamic reflection.
+	/// </summary>
+    /// <seealso cref="Spring.Reflection.Dynamic.DynamicMethod"/>
+	/// <author>Aleksandar Seovic</author>
+    /// <author>Bruno Baia</author>
+	/// <version>$Id: DynamicMethodInvocation.cs,v 1.3 2008/02/06 18:28:52 bbaia Exp $</version>
+	[Serializable]
+	public class DynamicMethodInvocation : AbstractMethodInvocation
+	{
+        /// <summary>
+        /// The method invocation that is to be invoked on the proxy.
+        /// </summary>
+        protected MethodInfo proxyMethod;
+
+		/// <summary>
+		/// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.DynamicMethodInvocation"/> class.
+		/// </summary>
+        /// <param name="proxy">The AOP proxy.</param>
+		/// <param name="target">The target object.</param>
+		/// <param name="method">The target method proxied.</param>
+        /// <param name="proxyMethod">The method to invoke on proxy.</param>
+		/// <param name="arguments">The target method's arguments.</param>
+		/// <param name="targetType">
+		/// The <see cref="System.Type"/> of the target object.</param>
+		/// <param name="interceptors">
+		/// The list of interceptors that are to be applied. May be
+		/// <cref lang="null"/>.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If any of the <paramref name="target"/> or <paramref name="method"/>
+		/// parameters is <see langword="null"/>.
+		/// </exception>
+        public DynamicMethodInvocation(
+            object proxy, object target, MethodInfo method, MethodInfo proxyMethod, 
+            object[] arguments, Type targetType, IList interceptors)
+            : base(proxy, target, method, arguments, targetType, interceptors)
+        {
+            this.proxyMethod = proxyMethod;
+        }
+
+		/// <summary>
+        /// Invokes the joinpoint using dynamic reflection.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Subclasses can override this to use custom invocation.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// The return value of the invocation of the joinpoint.
+        /// </returns>
+        /// <exception cref="System.Exception">
+        /// If invoking the joinpoint resulted in an exception.
+        /// </exception>
+        /// <see cref="Spring.Aop.Framework.AbstractMethodInvocation.InvokeJoinpoint"/>
+        protected override object InvokeJoinpoint()
+        {
+            IDynamicMethod targetMethod = (this.proxyMethod == null) ? new SafeMethod(method) : new SafeMethod(proxyMethod);
+            try
+            {
+                return targetMethod.Invoke(target, arguments);
+            }
+            // Only happens if fallback to standard reflection.
+            catch (TargetInvocationException ex)
+            {
+                throw ReflectionUtils.UnwrapTargetInvocationException(ex);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="Spring.Aop.Framework.DynamicMethodInvocation"/> instance 
+        /// from the specified <see cref="AopAlliance.Intercept.IMethodInvocation"/> and  
+        /// increments the interceptor index.
+        /// </summary>
+        /// <param name="invocation">
+        /// The current <see cref="AopAlliance.Intercept.IMethodInvocation"/> instance.
+        /// </param>
+        /// <returns>
+        /// The new <see cref="AopAlliance.Intercept.IMethodInvocation"/> instance to use.
+        /// </returns>
+        protected override IMethodInvocation PrepareMethodInvocationForProceed(IMethodInvocation invocation)
+        {
+            DynamicMethodInvocation rmi = new DynamicMethodInvocation(
+                this.proxy, this.target, this.method, this.proxyMethod, this.arguments, this.targetType, this.interceptors);
+            rmi.currentInterceptorIndex = this.currentInterceptorIndex + 1;
+
+            return rmi;
+        }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs
new file mode 100644
index 00000000..247ab977
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs
@@ -0,0 +1,788 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.Serialization;
+
+using Spring.Proxy;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// Base class for AOP method builders that contains common functionalities.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: AbstractAopProxyMethodBuilder.cs,v 1.10 2008/05/21 08:04:34 bbaia Exp $</version>
+    public abstract class AbstractAopProxyMethodBuilder : AbstractProxyMethodBuilder
+    {
+        #region Fields
+
+        /// <summary>
+        /// The <see cref="IAopProxyTypeGenerator"/> implementation to use.
+        /// </summary>
+        protected IAopProxyTypeGenerator aopProxyGenerator;
+
+        /// <summary>
+        /// The dictionary to cache the list of target  
+        /// <see cref="System.Reflection.MethodInfo"/>s.
+        /// </summary>
+        protected IDictionary targetMethods;
+
+        /// <summary>
+        /// The dictionary to cache the list of target  
+        /// <see cref="System.Reflection.MethodInfo"/>s defined on the proxy.
+        /// </summary>
+        protected IDictionary onProxyTargetMethods;
+
+        // variables
+
+        /// <summary>
+        /// The local variable to store the list of method interceptors.
+        /// </summary>
+        protected LocalBuilder interceptors;
+
+        /// <summary>
+        /// The local variable to store the target type being proxied.
+        /// </summary>
+        protected LocalBuilder targetType;
+
+        /// <summary>
+        /// The local variable to store method arguments.
+        /// </summary>
+        protected LocalBuilder arguments;
+
+        /// <summary>
+        /// The local variable to store the return value.
+        /// </summary>
+        protected LocalBuilder returnValue;
+
+#if NET_2_0
+        /// <summary>
+        /// The local variable to store the closed generic method 
+        /// when the target method is generic.
+        /// </summary>
+        protected LocalBuilder genericTargetMethod;
+
+        /// <summary>
+        /// The local variable to store the closed generic method 
+        /// when the target method defined on the proxy is generic.
+        /// </summary>
+        protected LocalBuilder genericOnProxyTargetMethod;
+#endif
+        /// <summary>
+        /// The field to cache the target <see cref="System.Reflection.MethodInfo"/>.
+        /// </summary>
+        protected FieldBuilder targetMethodCacheField;
+
+        /// <summary>
+        /// The field to cache the target <see cref="System.Reflection.MethodInfo"/> 
+        /// defined on the proxy.
+        /// </summary>
+        protected FieldBuilder onProxyTargetMethodCacheField;
+       
+        // convinience fields
+
+        /// <summary>
+        /// Indicates if the method returns a value.
+        /// </summary>
+        protected bool methodReturnsValue;
+
+        // private fields
+
+        private static IDictionary ldindOpCodes;
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        static AbstractAopProxyMethodBuilder()
+        {
+			ldindOpCodes = new Hashtable();
+            ldindOpCodes[typeof(sbyte)] = OpCodes.Ldind_I1;
+            ldindOpCodes[typeof(short)] = OpCodes.Ldind_I2;
+            ldindOpCodes[typeof(int)] = OpCodes.Ldind_I4;
+            ldindOpCodes[typeof(long)] = OpCodes.Ldind_I8;
+            ldindOpCodes[typeof(byte)] = OpCodes.Ldind_U1;
+            ldindOpCodes[typeof(ushort)] = OpCodes.Ldind_U2;
+            ldindOpCodes[typeof(uint)] = OpCodes.Ldind_U4;
+            ldindOpCodes[typeof(ulong)] = OpCodes.Ldind_I8;
+            ldindOpCodes[typeof(float)] = OpCodes.Ldind_R4;
+            ldindOpCodes[typeof(double)] = OpCodes.Ldind_R8;
+            ldindOpCodes[typeof(char)] = OpCodes.Ldind_U2;
+            ldindOpCodes[typeof(bool)] = OpCodes.Ldind_I1;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the method builder.
+        /// </summary>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        /// <param name="aopProxyGenerator">
+        /// The <see cref="IAopProxyTypeGenerator"/> implementation to use.
+        /// </param>
+        /// <param name="explicitImplementation">
+        /// <see langword="true"/> if the interface is to be
+        /// implemented explicitly; otherwise <see langword="false"/>.
+        /// </param>
+        /// <param name="targetMethods">
+        /// The dictionary to cache the list of target 
+        /// <see cref="System.Reflection.MethodInfo"/>s.
+        /// </param>
+        protected AbstractAopProxyMethodBuilder(
+            TypeBuilder typeBuilder, IAopProxyTypeGenerator aopProxyGenerator,
+            bool explicitImplementation, IDictionary targetMethods)
+            : this(typeBuilder, aopProxyGenerator, explicitImplementation, targetMethods, new Hashtable())
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the method builder.
+        /// </summary>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        /// <param name="aopProxyGenerator">
+        /// The <see cref="IAopProxyTypeGenerator"/> implementation to use.
+        /// </param>
+        /// <param name="explicitImplementation">
+        /// <see langword="true"/> if the interface is to be
+        /// implemented explicitly; otherwise <see langword="false"/>.
+        /// </param>
+        /// <param name="targetMethods">
+        /// The dictionary to cache the list of target 
+        /// <see cref="System.Reflection.MethodInfo"/>s.
+        /// </param>
+        /// <param name="onProxyTargetMethods">
+        /// The dictionary to cache the list of target  
+        /// <see cref="System.Reflection.MethodInfo"/>s defined on the proxy.
+        /// </param>
+        protected AbstractAopProxyMethodBuilder(
+            TypeBuilder typeBuilder, IAopProxyTypeGenerator aopProxyGenerator,
+            bool explicitImplementation, IDictionary targetMethods, IDictionary onProxyTargetMethods)
+            : base(typeBuilder, aopProxyGenerator, explicitImplementation)
+        {
+            this.aopProxyGenerator = aopProxyGenerator;
+            this.targetMethods = targetMethods;
+            this.onProxyTargetMethods = onProxyTargetMethods;
+        }
+
+        #endregion
+
+        #region Protected Members
+
+        /// <summary>
+        /// Generates the proxy method.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="interfaceMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        protected override void GenerateMethod(
+            ILGenerator il, MethodInfo method, MethodInfo interfaceMethod)
+        {
+            methodReturnsValue = (method.ReturnType != typeof(void));
+
+            DeclareLocals(il, method);
+
+            GenerateTargetMethodCacheField(il, method);
+            GenerateOnProxyTargetMethodCacheField(il, method);
+
+            BeginMethod(il, method);
+            GenerateMethodLogic(il, method, interfaceMethod);
+            EndMethod(il, method);
+        }
+
+        /// <summary>
+        /// Generates unique method id for the cache field.
+        /// </summary>
+        /// <param name="method">The target method.</param>
+        /// <returns>An unique method name.</returns>
+        protected virtual string GenerateMethodCacheFieldId(MethodInfo method)
+        {
+            return "_m" + Guid.NewGuid().ToString("N");
+        }
+
+        /// <summary>
+        /// Create static field that will cache target method.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The target method.</param>
+        protected virtual void GenerateTargetMethodCacheField(
+            ILGenerator il, MethodInfo method)
+        {
+            string methodId = GenerateMethodCacheFieldId(method);
+            targetMethods.Add(methodId, method);
+
+            targetMethodCacheField = typeBuilder.DefineField(methodId, typeof(MethodInfo), 
+                FieldAttributes.Private | FieldAttributes.Static | FieldAttributes.InitOnly);
+
+#if NET_2_0
+            MakeGenericMethod(il, method, targetMethodCacheField, genericTargetMethod);
+#endif
+        }
+
+        /// <summary>
+        /// Create static field that will cache target method when defined on the proxy.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The target method.</param>
+        protected virtual void GenerateOnProxyTargetMethodCacheField(
+            ILGenerator il, MethodInfo method)
+        {
+        }
+
+#if NET_2_0
+        /// <summary>
+        /// Create a closed generic method for the current call 
+        /// if target method is a generic definition.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The target method.</param>
+        /// <param name="methodCacheField">
+        /// The field that contains the method generic definition
+        /// </param>
+        /// <param name="localMethod">
+        /// The local variable to store the closed generic method.
+        /// </param>
+        protected void MakeGenericMethod(ILGenerator il, MethodInfo method,
+            FieldBuilder methodCacheField, LocalBuilder localMethod)
+        {
+            // if target method is a generic definition,
+            // create a closed generic method for the current call.
+            if (method.IsGenericMethodDefinition)
+            {
+                Type[] genericArgs = method.GetGenericArguments();
+
+                LocalBuilder typeArgs = il.DeclareLocal(typeof(Type[]));
+
+                il.Emit(OpCodes.Ldsfld, methodCacheField);
+
+                // specify array size and create an array
+                il.Emit(OpCodes.Ldc_I4, genericArgs.Length);
+                il.Emit(OpCodes.Newarr, typeof(Type));
+                il.Emit(OpCodes.Stloc, typeArgs);
+
+                // populate array with type arguments
+                for (int i = 0; i < genericArgs.Length; i++)
+                {
+                    il.Emit(OpCodes.Ldloc, typeArgs);
+                    il.Emit(OpCodes.Ldc_I4, i);
+                    il.Emit(OpCodes.Ldtoken, genericArgs[i]);
+                    il.EmitCall(OpCodes.Call, References.GetTypeFromHandle, null);
+                    il.Emit(OpCodes.Stelem_Ref);
+                }
+
+                il.Emit(OpCodes.Ldloc, typeArgs);
+                il.Emit(OpCodes.Callvirt, References.MakeGenericMethod);
+                il.Emit(OpCodes.Stloc, localMethod);
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the target type on stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        protected virtual void PushTargetType(ILGenerator il)
+        {
+            aopProxyGenerator.PushAdvisedProxy(il);
+            il.Emit(OpCodes.Ldfld, References.TargetTypeField);
+        }
+
+        /// <summary>
+        /// Generates the IL instructions that pushes  
+        /// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> 
+        /// instance on stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        protected virtual void PushAdvisedProxy(ILGenerator il)
+        {
+            aopProxyGenerator.PushAdvisedProxy(il);
+        }
+
+        /// <summary>
+        /// Pushes the target <see cref="System.Reflection.MethodInfo"/> to stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        protected virtual void PushTargetMethodInfo(ILGenerator il, MethodInfo method)
+        {
+#if NET_2_0
+            if (method.IsGenericMethodDefinition)
+            {
+                il.Emit(OpCodes.Ldloc, genericTargetMethod);
+                return;
+            }
+#endif
+            il.Emit(OpCodes.Ldsfld, targetMethodCacheField);
+        }
+
+        /// <summary>
+        /// Pushes the target <see cref="System.Reflection.MethodInfo"/> defined on the proxy to stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        protected virtual void PushOnProxyTargetMethodInfo(ILGenerator il, MethodInfo method)
+        {
+            if (onProxyTargetMethodCacheField != null)
+            {
+#if NET_2_0
+                if (method.IsGenericMethodDefinition)
+                {
+                    il.Emit(OpCodes.Ldloc, genericOnProxyTargetMethod);
+                    return;
+                }
+#endif
+                il.Emit(OpCodes.Ldsfld, onProxyTargetMethodCacheField);
+            }
+            else
+            {
+                il.Emit(OpCodes.Ldnull);
+            }
+        }
+
+        /// <summary>
+        /// Creates local variable declarations.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        protected virtual void DeclareLocals(ILGenerator il, MethodInfo method)
+        {
+            interceptors = il.DeclareLocal(typeof(IList));
+            targetType = il.DeclareLocal(typeof(Type));
+            arguments = il.DeclareLocal(typeof(Object[]));
+            
+#if NET_2_0
+            if (method.IsGenericMethodDefinition)
+            {
+                genericTargetMethod = il.DeclareLocal(typeof(MethodInfo));
+                genericOnProxyTargetMethod = il.DeclareLocal(typeof(MethodInfo));
+            }
+#endif
+            if (methodReturnsValue)
+            {
+                returnValue = il.DeclareLocal(method.ReturnType);
+            }
+
+#if DEBUG
+            interceptors.SetLocalSymInfo("interceptors");
+            targetType.SetLocalSymInfo("targetType");
+            arguments.SetLocalSymInfo("arguments");
+#if NET_2_0
+            if (method.IsGenericMethodDefinition)
+            {
+                genericTargetMethod.SetLocalSymInfo("genericTargetMethod");
+                genericOnProxyTargetMethod.SetLocalSymInfo("genericOnProxyTargetMethod");
+            }
+#endif
+            if (methodReturnsValue)
+            {
+                returnValue.SetLocalSymInfo("returnValue");
+            }
+#endif
+        }
+
+        /// <summary>
+        /// Initializes local variables
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        protected virtual void BeginMethod(ILGenerator il, MethodInfo method)
+        {
+            Label jmpProxyNotExposed = il.DefineLabel();
+
+            // set current proxy to this object
+            PushAdvisedProxy(il);
+            il.Emit(OpCodes.Ldfld, References.AdvisedField);
+            il.EmitCall(OpCodes.Callvirt, References.ExposeProxyProperty, null);
+            il.Emit(OpCodes.Brfalse_S, jmpProxyNotExposed);
+            il.Emit(OpCodes.Ldarg_0);
+            il.EmitCall(OpCodes.Call, References.PushProxyMethod, null);
+
+            il.MarkLabel(jmpProxyNotExposed);
+
+            // initialize targetType
+            PushTargetType(il);
+            il.Emit(OpCodes.Stloc, targetType);
+
+            // initialize interceptors
+            PushAdvisedProxy(il);
+            il.Emit(OpCodes.Ldloc, targetType);
+            PushTargetMethodInfo(il, method);
+            il.EmitCall(OpCodes.Call, References.GetInterceptorsMethod, null);
+            il.Emit(OpCodes.Stloc, interceptors);
+        }
+
+        /// <summary>
+        /// Generates method logic.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="interfaceMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        protected virtual void GenerateMethodLogic(
+            ILGenerator il, MethodInfo method, MethodInfo interfaceMethod)
+        {
+            Label jmpDirectCall = il.DefineLabel();
+            Label jmpEndIf = il.DefineLabel();
+
+            // check if there are any interceptors
+            il.Emit(OpCodes.Ldloc, interceptors);
+            il.EmitCall(OpCodes.Callvirt, References.CountProperty, null);
+            il.Emit(OpCodes.Ldc_I4_0);
+
+            // if not jump to direct call
+            il.Emit(OpCodes.Ble, jmpDirectCall);
+
+            // otherwise call Invoke and jump to method end
+            CallInvoke(il, method);
+            il.Emit(OpCodes.Br, jmpEndIf);
+
+            // call method directly
+            il.MarkLabel(jmpDirectCall);
+            CallDirectProxiedMethod(il, method, interfaceMethod);
+            if (methodReturnsValue)
+            {
+                // store return value, unboxing is not necessary because we called method directly
+                il.Emit(OpCodes.Stloc, returnValue);
+            }
+
+            il.MarkLabel(jmpEndIf);
+
+            if (methodReturnsValue)
+            {
+                if (!method.ReturnType.IsValueType)
+                {
+                    ProcessReturnValue(il, returnValue);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Calls method using Invoke
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        protected virtual void CallInvoke(ILGenerator il, MethodInfo method)
+        {
+            ParameterInfo[] parameters = method.GetParameters();
+
+            SetupMethodArguments(il, method, parameters);
+
+            PushAdvisedProxy(il);
+
+            // setup parameters for call
+            il.Emit(OpCodes.Ldarg_0);                       // proxy
+            PushTarget(il);                                 // target
+            il.Emit(OpCodes.Ldloc, targetType);             // target type
+            PushTargetMethodInfo(il, method);               // method
+            PushOnProxyTargetMethodInfo(il, method);        // method defined on proxy
+            il.Emit(OpCodes.Ldloc, arguments);              // args
+            il.Emit(OpCodes.Ldloc, interceptors);           // interceptors
+
+            // call Invoke
+            il.EmitCall(OpCodes.Call, References.InvokeMethod, null);
+
+            // process return value
+            if (methodReturnsValue)
+            {
+                EmitUnboxIfNeeded(il, method.ReturnType);
+                il.Emit(OpCodes.Stloc, returnValue);
+            }
+            else
+            {
+                il.Emit(OpCodes.Pop);
+            }
+
+            // process byRef arguments
+            for (int i = 0; i < parameters.Length; i++)
+            {
+                if (parameters[i].ParameterType.IsByRef)
+                {
+                    il.Emit(OpCodes.Ldarg_S, i + 1);
+                    il.Emit(OpCodes.Ldloc, arguments);
+                    il.Emit(OpCodes.Ldc_I4_S, i);
+                    il.Emit(OpCodes.Ldelem_Ref);
+                    Type type = parameters[i].ParameterType.GetElementType();
+                    EmitUnboxIfNeeded(il, type);
+                    EmitStoreValueIndirect(il, type);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Setup proxied method arguments.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="parameters">The method's parameters.</param>
+        protected void SetupMethodArguments(
+            ILGenerator il, MethodInfo method, ParameterInfo[] parameters)
+        {
+            if (parameters.Length > 0)
+            {
+                // specify array size and create an array
+                il.Emit(OpCodes.Ldc_I4, parameters.Length);
+                il.Emit(OpCodes.Newarr, typeof(Object));
+                il.Emit(OpCodes.Stloc, arguments);
+
+                // populate array with params
+                for (int i = 0; i < parameters.Length; i++)
+                {
+                    Type type = parameters[i].ParameterType;
+
+                    il.Emit(OpCodes.Ldloc, arguments);
+                    il.Emit(OpCodes.Ldc_I4, i);
+                    il.Emit(OpCodes.Ldarg_S, i + 1);
+
+                    // setup byRef arguments
+                    if (type.IsByRef)
+                    {
+                        type = type.GetElementType();
+                        EmitLoadValueIndirect(il, type);
+                    }
+
+#if NET_2_0
+                    if (type.IsValueType || type.IsGenericParameter)
+#else
+                    if (type.IsValueType)
+#endif
+                    {
+                        il.Emit(OpCodes.Box, type);
+                    }
+
+                    il.Emit(OpCodes.Stelem_Ref);
+                }
+            }
+            else
+            {
+                il.Emit(OpCodes.Ldnull);
+                il.Emit(OpCodes.Stloc, arguments);
+            }
+        }
+
+        /// <summary>
+        /// Calls proxied method directly.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="interfaceMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        protected abstract void CallDirectProxiedMethod(
+            ILGenerator il, MethodInfo method, MethodInfo interfaceMethod);
+
+        /// <summary>
+        /// Ends method by returning return value if appropriate.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        protected virtual void EndMethod(ILGenerator il, MethodInfo method)
+        {
+            Label jmpProxyNotExposed = il.DefineLabel();
+
+            // reset current proxy to old value
+            PushAdvisedProxy(il);
+            il.Emit(OpCodes.Ldfld, References.AdvisedField);
+            il.EmitCall(OpCodes.Callvirt, References.ExposeProxyProperty, null);
+            il.Emit(OpCodes.Brfalse_S, jmpProxyNotExposed);
+            il.EmitCall(OpCodes.Call, References.PopProxyMethod, null);
+
+            il.MarkLabel(jmpProxyNotExposed);
+
+            if (methodReturnsValue)
+            {
+                il.Emit(OpCodes.Ldloc, returnValue);
+            }
+        }
+        
+        #endregion
+
+        #region Reflection.Emit utility methods
+
+        /// <summary>
+        /// Emits MSIL instructions to load a value of the specified <paramref name="type"/> 
+        /// onto the evaluation stack indirectly.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="type">The type of the value.</param>
+        protected static void EmitLoadValueIndirect(ILGenerator il, Type type)
+        {
+            if (type.IsValueType)
+            {
+                if (type == typeof(int)) il.Emit(OpCodes.Ldind_I4);
+                else if (type == typeof(uint)) il.Emit(OpCodes.Ldind_U4);
+                else if (type == typeof(char)) il.Emit(OpCodes.Ldind_I2);
+                else if (type == typeof(bool)) il.Emit(OpCodes.Ldind_I1);
+                else if (type == typeof(float)) il.Emit(OpCodes.Ldind_R4);
+                else if (type == typeof(double)) il.Emit(OpCodes.Ldind_R8);
+                else if (type == typeof(short)) il.Emit(OpCodes.Ldind_I2);
+                else if (type == typeof(ushort)) il.Emit(OpCodes.Ldind_U2);
+                else if (type == typeof(long) || type == typeof(ulong)) il.Emit(OpCodes.Ldind_I8);
+                else il.Emit(OpCodes.Ldobj, type);
+            }
+            else
+            {
+                il.Emit(OpCodes.Ldind_Ref);
+            }
+        }
+
+        /// <summary>
+        /// Emit MSIL instructions to store a value of the specified <paramref name="type"/> 
+        /// at a supplied address.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="type">The type of the value.</param>
+        protected static void EmitStoreValueIndirect(ILGenerator il, Type type)
+        {
+            if (type.IsValueType)
+            {
+                if (type.IsEnum) EmitStoreValueIndirect(il, Enum.GetUnderlyingType(type));
+                else if (type == typeof(int)) il.Emit(OpCodes.Stind_I4);
+                else if (type == typeof(short)) il.Emit(OpCodes.Stind_I2);
+                else if (type == typeof(long) || type == typeof(ulong)) il.Emit(OpCodes.Stind_I8);
+                else if (type == typeof(char)) il.Emit(OpCodes.Stind_I2);
+                else if (type == typeof(bool)) il.Emit(OpCodes.Stind_I1);
+                else if (type == typeof(float)) il.Emit(OpCodes.Stind_R4);
+                else if (type == typeof(double)) il.Emit(OpCodes.Stind_R8);
+                else il.Emit(OpCodes.Stobj, type);
+            }
+            else
+            {
+                il.Emit(OpCodes.Stind_Ref);
+            }
+        }
+
+        /// <summary>
+        /// Emits MSIL instructions to convert the boxed representation 
+        /// of the supplied <paramref name="type"/> to its unboxed form.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="type">The type specified in the instruction.</param>
+        protected static void EmitUnboxIfNeeded(ILGenerator il, Type type)
+        {
+#if NET_2_0
+            if (type.IsValueType || type.IsGenericParameter)
+            {
+                il.Emit(OpCodes.Unbox_Any, type);
+            }
+#else
+            if (type.IsValueType)
+            {
+                il.Emit(OpCodes.Unbox, type);
+                il.Emit(OpCodes.Ldobj, type);
+            }
+#endif
+        }
+
+        #endregion
+    }
+
+    #region References helper class definition
+
+    internal struct References
+    {
+        // fields
+        public static readonly FieldInfo AdvisedField =
+            typeof(AdvisedProxy).GetField("m_advised", BindingFlags.Instance | BindingFlags.Public);
+
+        public static readonly FieldInfo TargetTypeField =
+            typeof(AdvisedProxy).GetField("m_targetType", BindingFlags.Instance | BindingFlags.Public);
+
+        public static readonly FieldInfo IntroductionsField =
+            typeof(AdvisedProxy).GetField("m_introductions", BindingFlags.Instance | BindingFlags.Public);
+
+        public static readonly FieldInfo TargetSourceWrapperField =
+            typeof(AdvisedProxy).GetField("m_targetSourceWrapper", BindingFlags.Instance | BindingFlags.Public);
+
+        // constructors
+        public static readonly ConstructorInfo BaseCompositionAopProxyConstructor =
+            typeof(BaseCompositionAopProxy).GetConstructor(new Type[] { typeof(IAdvised) });
+
+        public static readonly ConstructorInfo BaseCompositionAopProxySerializationConstructor =
+            typeof(BaseCompositionAopProxy).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null,
+                                                            new Type[] {typeof(SerializationInfo), typeof(StreamingContext)},
+                                                            null);
+
+        public static readonly ConstructorInfo AdvisedProxyConstructor =
+            typeof(AdvisedProxy).GetConstructor(new Type[] { typeof(IAdvised), typeof(IAopProxy) });
+
+        public static readonly ConstructorInfo AdvisedProxySerializationConstructor =
+            typeof(AdvisedProxy).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null,
+                                                 new Type[] {typeof (SerializationInfo), typeof (StreamingContext)},
+                                                 null);
+        public static readonly ConstructorInfo ObjectConstructor =
+            typeof(Object).GetConstructor(Type.EmptyTypes);
+
+        // methods
+        public static readonly MethodInfo PushProxyMethod =
+            typeof(AopContext).GetMethod("PushProxy", BindingFlags.Static | BindingFlags.Public, null, new Type[] { typeof(Object) }, null);
+
+        public static readonly MethodInfo PopProxyMethod =
+            typeof(AopContext).GetMethod("PopProxy", BindingFlags.Static | BindingFlags.Public, null, Type.EmptyTypes, null);
+
+        public static readonly MethodInfo InvokeMethod =
+            typeof(AdvisedProxy).GetMethod("Invoke", BindingFlags.Instance | BindingFlags.Public, null, new Type[] { typeof(Object), typeof(Object), typeof(Type), typeof(MethodInfo), typeof(MethodInfo), typeof(Object[]), typeof(IList) }, null);
+
+        public static readonly MethodInfo GetInterceptorsMethod =
+            typeof(AdvisedProxy).GetMethod("GetInterceptors", BindingFlags.Instance | BindingFlags.Public, null, new Type[] { typeof(Type), typeof(MethodInfo) }, null);
+
+        public static readonly MethodInfo GetTargetMethod =
+            typeof(ITargetSourceWrapper).GetMethod("GetTarget", Type.EmptyTypes);
+
+        public static readonly MethodInfo GetTypeMethod =
+            typeof(Object).GetMethod("GetType", Type.EmptyTypes);
+
+        public static readonly MethodInfo GetTypeFromHandle = 
+            typeof(Type).GetMethod("GetTypeFromHandle", new Type[] { typeof(RuntimeTypeHandle) });
+
+#if NET_2_0
+        public static readonly MethodInfo MakeGenericMethod =
+            typeof(MethodInfo).GetMethod("MakeGenericMethod", new Type[] { typeof(Type[]) });
+#endif
+
+        public static readonly MethodInfo DisposeMethod =
+            typeof(IDisposable).GetMethod("Dispose", Type.EmptyTypes);
+
+        public static readonly MethodInfo AddSerializationValue =
+            typeof(SerializationInfo).GetMethod("AddValue", new Type[] { typeof(string), typeof(object) });
+
+        public static readonly MethodInfo GetSerializationValue =
+            typeof(SerializationInfo).GetMethod("GetValue", new Type[] { typeof(string), typeof(Type) });
+
+        // properties
+        public static readonly MethodInfo ExposeProxyProperty =
+            typeof(IAdvised).GetProperty("ExposeProxy", typeof(Boolean)).GetGetMethod();
+
+        public static readonly MethodInfo CountProperty =
+            typeof(ICollection).GetProperty("Count", typeof(Int32)).GetGetMethod();
+    }
+
+    #endregion
+}
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyTypeBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyTypeBuilder.cs
new file mode 100644
index 00000000..785afe97
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyTypeBuilder.cs
@@ -0,0 +1,106 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection.Emit;
+
+using Spring.Proxy;
+
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+	/// <summary>
+	/// Base class for proxy builders that can be used 
+    /// to create an AOP proxy for any object.
+	/// </summary>
+    /// <author>Bruno Baia</author>
+	/// <version>$Id: AbstractAopProxyTypeBuilder.cs,v 1.5 2007/12/03 09:06:58 bbaia Exp $</version>
+    public abstract class AbstractAopProxyTypeBuilder : 
+        AbstractProxyTypeBuilder, IAopProxyTypeGenerator
+    {
+        #region IProxyTypeGenerator Members
+
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the target instance on which calls should be delegated to.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        public override void PushTarget(ILGenerator il)
+        {
+            PushAdvisedProxy(il);
+            il.Emit(OpCodes.Ldfld, References.TargetSourceWrapperField);
+            il.EmitCall(OpCodes.Callvirt, References.GetTargetMethod, null);
+        }
+
+        #endregion
+
+        #region IAopProxyTypeGenerator Members
+
+        /// <summary>
+        /// Generates the IL instructions that pushes  
+        /// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> 
+        /// instance on stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        public abstract void PushAdvisedProxy(ILGenerator il);
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Calculates and returns the list of attributes that apply to the
+        /// specified type.
+        /// </summary>
+        /// <remarks>
+        /// Removes <see cref="System.SerializableAttribute"/> from the list.
+        /// </remarks>
+        /// <param name="type">The type to find attributes for.</param>
+        /// <returns>
+        /// A list of custom attributes that should be applied to type.
+        /// </returns>
+        protected override IList GetTypeAttributes(Type type)
+        {
+            IList attrs = base.GetTypeAttributes(type);
+            int i = 0;
+            while (i < attrs.Count)
+            {
+                if (IsAttributeMatchingType(attrs[i], typeof(SerializableAttribute)))
+                {
+                    attrs.RemoveAt(i);
+                }
+                else
+                {
+                    i++;
+                }
+            }
+
+            return attrs;
+        }
+        
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AdvisedProxy.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AdvisedProxy.cs
new file mode 100644
index 00000000..af4d7e42
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AdvisedProxy.cs
@@ -0,0 +1,432 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+
+using AopAlliance.Aop;
+using AopAlliance.Intercept;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+	/// <summary>
+	/// Represents the AOP configuration data built-in with the proxy.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: AdvisedProxy.cs,v 1.10 2008/02/06 18:28:52 bbaia Exp $</version>
+    [Serializable]
+	public class AdvisedProxy : IAdvised //, ISerializable
+	{
+        #region Fields
+
+        /// <summary>
+        /// Should we use dynamic reflection for method invocation ?
+        /// </summary>
+        public static bool UseDynamicReflection;
+
+        /// <summary>
+        /// Optimization fields
+        /// </summary>
+        private static IList EmptyList = ArrayList.ReadOnly(new ArrayList());
+
+        /// <summary>
+		/// IAdvised delegate
+		/// </summary>
+		public IAdvised m_advised;
+
+		/// <summary>
+		/// Array of introduction delegates
+		/// </summary>
+        public IAdvice[] m_introductions;
+
+		/// <summary>
+		/// Target source wrapper
+		/// </summary>
+        public ITargetSourceWrapper m_targetSourceWrapper;
+
+		/// <summary>
+		/// Type of target object.
+		/// </summary>
+        public Type m_targetType;
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="AdvisedProxy"/> class.
+        /// </summary>
+        static AdvisedProxy()
+        {
+            string appSettingsKey = typeof(AdvisedProxy).FullName + ".UseDynamicReflection";
+            NameValueCollection appSettings =
+                ConfigurationUtils.GetSection("appSettings") as NameValueCollection;
+
+            if (appSettings != null && StringUtils.HasLength(appSettings[appSettingsKey]))
+            {
+                UseDynamicReflection = bool.Parse(appSettings[appSettingsKey]);
+            }
+            else
+            {
+                UseDynamicReflection = true;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="AdvisedProxy"/> class.
+        /// </summary>
+        public AdvisedProxy()
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="AdvisedProxy"/> class.
+        /// </summary>
+        /// <param name="advised">The proxy configuration.</param>
+        protected AdvisedProxy(IAdvised advised)
+        {
+            m_advised = advised;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> class.
+        /// </summary>
+		/// <param name="advised">The proxy configuration.</param>
+        /// <param name="proxy">The proxy.</param>
+        public AdvisedProxy(IAdvised advised, IAopProxy proxy)
+		{
+            Initialize(advised, proxy);
+        }
+
+        /// <summary>
+        /// Deserialization constructor.
+        /// </summary>
+        /// <param name="info">Serialization data.</param>
+        /// <param name="context">Serialization context.</param>
+        protected AdvisedProxy(SerializationInfo info, StreamingContext context)
+        {
+            m_advised = (IAdvised) info.GetValue("advised", typeof(IAdvised));
+            m_introductions = (IAdvice[]) info.GetValue("introductions", typeof(IAdvice[]));
+            m_targetSourceWrapper = (ITargetSourceWrapper) info.GetValue("tsWrapper", typeof(ITargetSourceWrapper));
+            m_targetType = (Type) info.GetValue("targetType", typeof(Type));
+        }
+
+        /// <summary>
+        /// Serializes this instance.
+        /// </summary>
+        /// <param name="info">Serialization data.</param>
+        /// <param name="context">Serialization context.</param>
+        [SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
+        public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            info.AddValue("advised", m_advised);
+            info.AddValue("introductions", m_introductions);
+            info.AddValue("tsWrapper", m_targetSourceWrapper);
+            info.AddValue("targetType", m_targetType);
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Initialization method.
+        /// </summary>
+        /// <param name="advised">The proxy configuration.</param>
+        /// <param name="proxy">
+        /// The current <see cref="Spring.Aop.Framework.IAopProxy"/> implementation.
+        /// </param>
+        protected void Initialize(IAdvised advised, IAopProxy proxy)
+        {
+			this.m_advised = advised;
+			this.m_targetType = advised.TargetSource.TargetType;
+
+			// initialize target
+			if (advised.TargetSource.IsStatic)
+			{
+                this.m_targetSourceWrapper = new StaticTargetSourceWrapper(advised.TargetSource);
+			}
+			else
+			{
+                this.m_targetSourceWrapper = new DynamicTargetSourceWrapper(advised.TargetSource);
+			}
+
+			// initialize introduction advice
+			this.m_introductions = new IAdvice[advised.Introductions.Length];
+			for (int i = 0; i < advised.Introductions.Length; i++)
+			{
+				this.m_introductions[i] = advised.Introductions[i].Advice;
+
+				// set target proxy on introduction instance if it implements ITargetAware
+				if (this.m_introductions[i] is ITargetAware)
+				{
+					((ITargetAware) this.m_introductions[i]).TargetProxy = proxy;
+				}
+			}
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Invokes intercepted methods using reflection
+        /// </summary>
+        /// <param name="proxy">proxy object</param>
+        /// <param name="target">target object to invoke method on</param>
+        /// <param name="targetType">target type</param>
+        /// <param name="targetMethod">taget method to invoke</param>
+        /// <param name="proxyMethod">The method to invoke on proxy.</param>
+        /// <param name="args">method arguments</param>
+        /// <param name="interceptors">interceptor chain</param>
+        /// <returns>value returned by invocation chain</returns>
+        public object Invoke(object proxy, object target, Type targetType,
+            MethodInfo targetMethod, MethodInfo proxyMethod, object[] args, IList interceptors)
+        {
+            IMethodInvocation invocation = null;
+            if (UseDynamicReflection)
+            {
+                invocation = new DynamicMethodInvocation(
+                    proxy, target, targetMethod, proxyMethod, args, targetType, interceptors);
+            }
+            else
+            {
+                invocation = new ReflectiveMethodInvocation(
+                    proxy, target, targetMethod, proxyMethod, args, targetType, interceptors);
+            }
+            return invocation.Proceed();
+        }
+
+        /// <summary>
+        /// Returns a list of method interceptors
+        /// </summary>
+        /// <param name="targetType">target type</param>
+        /// <param name="method">target method</param>
+        /// <returns>list of inteceptors for the specified method</returns>
+        public IList GetInterceptors(Type targetType, MethodInfo method)
+        {
+            if (m_advised.Advisors.Length == 0)
+            {
+                return EmptyList;
+            }
+            else
+            {
+                return m_advised.AdvisorChainFactory.GetInterceptors(m_advised, this, method, targetType);
+            }
+        }
+
+        #endregion
+
+        #region IAdvised Members
+
+        bool IAdvised.ExposeProxy
+		{
+			get { return m_advised.ExposeProxy; }
+		}
+
+		IAdvisorChainFactory IAdvised.AdvisorChainFactory
+		{
+			get { return m_advised.AdvisorChainFactory; }
+		}
+
+		bool IAdvised.ProxyTargetType
+		{
+			get { return m_advised.ProxyTargetType; }
+		}
+
+        bool IAdvised.ProxyTargetAttributes
+        {
+            get { return m_advised.ProxyTargetAttributes; }
+        }
+
+		IAdvisor[] IAdvised.Advisors
+		{
+			get { return m_advised.Advisors; }
+		}
+
+		IIntroductionAdvisor[] IAdvised.Introductions
+		{
+			get { return m_advised.Introductions; }
+		}
+
+		Type[] IAdvised.Interfaces
+		{
+			get { return m_advised.Interfaces; }
+		}
+
+		IDictionary IAdvised.InterfaceMap
+		{
+			get { return m_advised.InterfaceMap; }
+		}
+
+		bool IAdvised.IsFrozen
+		{
+			get { return m_advised.IsFrozen; }
+		}
+
+		ITargetSource IAdvised.TargetSource
+		{
+			get { return m_advised.TargetSource; }
+		}
+
+	    bool IAdvised.IsSerializable
+	    {
+            get { return m_advised.IsSerializable; }
+	    }
+
+	    /// <summary>
+		/// Adds the supplied <paramref name="advice"/> to the end (or tail)
+		/// of the advice (interceptor) chain.
+		/// </summary>
+		/// <param name="advice">
+		/// The <see cref="AopAlliance.Aop.IAdvice"/> to be added.
+		/// </param>
+		/// <seealso cref="Spring.Aop.Support.DefaultPointcutAdvisor"/>
+		/// <seealso cref="Spring.Aop.Framework.IAdvised.AddAdvice(int,IAdvice)"/>
+		public void AddAdvice(IAdvice advice)
+		{
+			this.m_advised.AddAdvice(advice);
+		}
+
+		/// <summary>
+		/// Adds the supplied <paramref name="advice"/> to the supplied
+		/// <paramref name="position"/> in the advice (interceptor) chain.
+		/// </summary>
+		/// <param name="position">
+		/// The zero (0) indexed position (from the head) at which the
+		/// supplied <paramref name="advice"/> is to be inserted into the
+		/// advice (interceptor) chain.
+		/// </param>
+		/// <param name="advice">
+		/// The <see cref="AopAlliance.Aop.IAdvice"/> to be added.
+		/// </param>
+		/// <seealso cref="Spring.Aop.Support.DefaultPointcutAdvisor"/>
+		/// <seealso cref="Spring.Aop.Framework.IAdvised.AddAdvice(IAdvice)"/>
+		public void AddAdvice(int position, IAdvice advice)
+		{
+			this.m_advised.AddAdvice(position, advice);
+		}
+
+		bool IAdvised.IsInterfaceProxied(Type intf)
+		{
+			return m_advised.IsInterfaceProxied(intf);
+		}
+
+        void IAdvised.AddAdvisors(IAdvisors advisors)
+	    {
+	        m_advised.AddAdvisors(advisors);
+	    }
+
+	    void IAdvised.AddAdvisor(IAdvisor advisor)
+		{
+			m_advised.AddAdvisor(advisor);
+		}
+
+		void IAdvised.AddAdvisor(int pos, IAdvisor advisor)
+		{
+			m_advised.AddAdvisor(pos, advisor);
+		}
+
+		void IAdvised.AddIntroduction(IIntroductionAdvisor advisor)
+		{
+			m_advised.AddIntroduction(advisor);
+		}
+
+		void IAdvised.AddIntroduction(int pos, IIntroductionAdvisor advisor)
+		{
+			m_advised.AddIntroduction(pos, advisor);
+		}
+
+		int IAdvised.IndexOf(IAdvisor advisor)
+		{
+			return m_advised.IndexOf(advisor);
+		}
+
+		int IAdvised.IndexOf(IIntroductionAdvisor advisor)
+		{
+			return m_advised.IndexOf(advisor);
+		}
+
+		bool IAdvised.RemoveAdvisor(IAdvisor advisor)
+		{
+			return m_advised.RemoveAdvisor(advisor);
+		}
+
+		void IAdvised.RemoveAdvisor(int index)
+		{
+			m_advised.RemoveAdvisor(index);
+		}
+
+		bool IAdvised.RemoveAdvice(IAdvice advice)
+		{
+			return m_advised.RemoveAdvice(advice);
+		}
+
+		bool IAdvised.RemoveIntroduction(IIntroductionAdvisor advisor)
+		{
+			return m_advised.RemoveIntroduction(advisor);
+		}
+
+		void IAdvised.RemoveIntroduction(int index)
+		{
+			m_advised.RemoveIntroduction(index);
+		}
+
+		void IAdvised.ReplaceIntroduction(int index, IIntroductionAdvisor advisor)
+		{
+			m_advised.ReplaceIntroduction(index, advisor);
+		}
+
+		bool IAdvised.ReplaceAdvisor(IAdvisor a, IAdvisor b)
+		{
+			return m_advised.ReplaceAdvisor(a, b);
+		}
+
+		string IAdvised.ToProxyConfigString()
+		{
+			return m_advised.ToProxyConfigString();
+		}
+
+		#endregion
+
+        #region ITargetTypeAware implementation
+
+        /// <summary>
+        /// Gets the target type behind the implementing object.
+        /// Ttypically a proxy configuration or an actual proxy.
+        /// </summary>
+        /// <value>The type of the target or null if not known.</value>
+        public Type TargetType
+        {
+            get { return m_targetType; }
+        }
+
+        #endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs
new file mode 100644
index 00000000..99234cfa
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs
@@ -0,0 +1,131 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// <see cref="Spring.Proxy.IProxyMethodBuilder"/> implementation 
+    /// that delegates method calls to the base method.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: BaseAopProxyMethodBuilder.cs,v 1.1 2008/02/06 18:28:52 bbaia Exp $</version>
+    public class BaseAopProxyMethodBuilder : AbstractAopProxyMethodBuilder
+    {
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the method builder.
+        /// </summary>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        /// <param name="aopProxyGenerator">
+        /// The <see cref="IAopProxyTypeGenerator"/> implementation to use.
+        /// </param>
+        /// <param name="targetMethods">
+        /// The dictionary to cache the list of target 
+        /// <see cref="System.Reflection.MethodInfo"/>s.
+        /// </param>
+        /// <param name="onProxyTargetMethods">
+        /// The dictionary to cache the list of target  
+        /// <see cref="System.Reflection.MethodInfo"/>s defined on the proxy.
+        /// </param>
+        public BaseAopProxyMethodBuilder(
+            TypeBuilder typeBuilder, IAopProxyTypeGenerator aopProxyGenerator, 
+            IDictionary targetMethods, IDictionary onProxyTargetMethods)
+            : base(typeBuilder, aopProxyGenerator, false, targetMethods, onProxyTargetMethods)
+        {
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Create static field that will cache target method when defined on the proxy.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The target method.</param>
+        protected override void GenerateOnProxyTargetMethodCacheField(
+            ILGenerator il, MethodInfo method)
+        {
+            if (method.IsVirtual && !method.IsFinal)
+            {
+                // generate proxy method
+                MethodBuilder baseMethod = typeBuilder.DefineMethod("proxy_" + method.Name,
+                    MethodAttributes.Public | MethodAttributes.HideBySig,
+                    CallingConventions.Standard,
+                    method.ReturnType, ReflectionUtils.GetParameterTypes(method));
+
+#if NET_2_0
+                DefineGenericParameters(baseMethod, method);
+#endif
+                DefineParameters(baseMethod, method);
+
+                ILGenerator localIL = baseMethod.GetILGenerator();
+
+                localIL.Emit(OpCodes.Ldarg_0);
+                // setup parameters for call
+                for (int i = 0; i < method.GetParameters().Length; i++)
+                {
+                    localIL.Emit(OpCodes.Ldarg_S, i + 1);
+                }
+                localIL.EmitCall(OpCodes.Call, method, null);
+                localIL.Emit(OpCodes.Ret);
+
+                // create static field that will cache proxy method
+                string methodId = GenerateMethodCacheFieldId(method);
+                onProxyTargetMethods.Add(methodId, method);
+
+                onProxyTargetMethodCacheField = typeBuilder.DefineField(
+                    methodId, typeof(MethodInfo), FieldAttributes.Private | FieldAttributes.Static | FieldAttributes.InitOnly);
+
+#if NET_2_0
+                MakeGenericMethod(il, method, onProxyTargetMethodCacheField, genericOnProxyTargetMethod);
+#endif
+            }
+        }
+
+        /// <summary>
+        /// Calls target method directly.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="interfaceMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        protected override void CallDirectProxiedMethod(
+            ILGenerator il, MethodInfo method, MethodInfo interfaceMethod)
+        {
+            CallDirectBaseMethod(il, method);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseCompositionAopProxy.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseCompositionAopProxy.cs
new file mode 100644
index 00000000..5ebe7421
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseCompositionAopProxy.cs
@@ -0,0 +1,122 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+	/// <summary>
+	/// Base class that each dynamic composition proxy has to extend.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+    /// <author>Bruno Baia</author>
+	/// <version>$Id: BaseCompositionAopProxy.cs,v 1.2 2007/03/16 04:01:22 aseovic Exp $</version>
+    [Serializable]
+    public abstract class BaseCompositionAopProxy : AdvisedProxy, IAopProxy, ISerializable
+    {
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public BaseCompositionAopProxy()
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.DynamicProxy.BaseCompositionAopProxy"/> class.
+        /// </summary>
+        /// <param name="advised">The proxy configuration.</param>
+        public BaseCompositionAopProxy(IAdvised advised) : base(advised)
+		{
+            base.Initialize(advised, this);
+        }
+
+        /// <summary>
+        /// Deserialization constructor.
+        /// </summary>
+        /// <param name="info">Serialization data.</param>
+        /// <param name="context">Serialization context.</param>
+        protected BaseCompositionAopProxy(SerializationInfo info, StreamingContext context) : base(info, context)
+        {}
+
+        #endregion
+
+		#region IAopProxy Members
+
+		/// <summary>
+		/// Returns this proxy instance
+		/// </summary>
+		/// <returns></returns>
+		object IAopProxy.GetProxy()
+		{
+			return this;
+		}
+
+		#endregion
+
+		#region Equal, HashCode and ToString overrides
+
+		/// <summary>
+		/// Delegate to target object handling of equals method.
+		/// </summary>
+		/// <param name="obj">The object to compare with the current target object</param>
+		/// <returns>true if the specified Object is equal to the current target object; otherwise, false</returns>
+		public override bool Equals(object obj)
+		{
+            using (m_targetSourceWrapper)
+			{
+                return m_targetSourceWrapper.GetTarget().Equals(obj);
+			}
+		}
+
+		/// <summary>
+		/// Delgate to the target object generation of the hash code.
+		/// </summary>
+		/// <returns>A hash code for the target object.</returns>
+		public override int GetHashCode()
+		{
+            using (m_targetSourceWrapper)
+			{
+                return m_targetSourceWrapper.GetTarget().GetHashCode();
+			}
+		}
+
+		/// <summary>
+		/// Returns a String the represents the target object.
+		/// </summary>
+		/// <returns>A String that represents the target object</returns>
+		public override string ToString()
+		{
+            using (m_targetSourceWrapper)
+			{
+                return m_targetSourceWrapper.GetTarget().ToString();
+			}
+		}
+
+		#endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs
new file mode 100644
index 00000000..aa5e6a86
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs
@@ -0,0 +1,184 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Text;
+using System.Collections;
+
+using Common.Logging;
+using Spring.Proxy;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// Implementation of the <see cref="Spring.Aop.Framework.IAopProxyFactory"/> 
+    /// interface that caches the AOP proxy <see cref="System.Type"/> instance.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Caches against a key based on :
+    /// - the base type
+    /// - the target type
+    /// - the interfaces to proxy
+    /// </p>
+    /// </remarks>
+    /// <author>Bruno Baia</author>
+    /// <author>Erich Eichinger</author>
+    /// <seealso cref="Spring.Aop.Framework.DynamicProxy.DefaultAopProxyFactory"/>
+    /// <seealso cref="Spring.Aop.Framework.IAopProxyFactory"/>
+    /// <version>$Id: CachedAopProxyFactory.cs,v 1.1 2007/08/02 04:15:21 markpollack Exp $</version>
+    [Serializable]
+    public class CachedAopProxyFactory : DefaultAopProxyFactory
+    {
+        /// <summary>
+        /// The shared <see cref="Common.Logging.ILog"/> instance for this class.
+        /// </summary>
+        private static readonly ILog logger = LogManager.GetLogger(typeof(CachedAopProxyFactory));
+
+        private static Hashtable typeCache = new Hashtable();
+
+        /// <summary>
+        /// Generates the proxy type and caches the <see cref="System.Type"/>
+        /// instance against the base type and the interfaces to proxy.
+        /// </summary>
+        /// <param name="typeBuilder">
+        /// The <see cref="Spring.Proxy.IProxyTypeBuilder"/> to use
+        /// </param>
+        /// <returns>The generated or cached proxy class.</returns>
+        protected override Type BuildProxyType(IProxyTypeBuilder typeBuilder)
+        {
+            ProxyTypeCacheKey cacheKey = new ProxyTypeCacheKey(
+                typeBuilder.BaseType, typeBuilder.TargetType, typeBuilder.Interfaces);
+            Type proxyType = null;
+            lock (typeCache)
+            {
+                proxyType = typeCache[cacheKey] as Type;
+                if (proxyType == null)
+                {
+                    proxyType = typeBuilder.BuildProxyType();
+                    typeCache[cacheKey] = proxyType;
+                }
+                else
+                {
+                    #region Instrumentation
+
+                    if (logger.IsInfoEnabled)
+                    {
+                        logger.Info(String.Format(
+                                        "AOP proxy type found in cache for '{0}'.", cacheKey));
+                    }
+
+                    #endregion
+                }
+            }
+            return proxyType;
+        }
+
+        #region ProxyTypeCacheKey inner class implementation
+
+        /// <summary>
+        /// Uniquely identifies a proxytype in the cache
+        /// </summary>
+        private sealed class ProxyTypeCacheKey
+        {
+            private sealed class HashCodeComparer : IComparer
+            {
+                public int Compare(object x, object y)
+                {
+                    return x.GetHashCode().CompareTo(y.GetHashCode());
+                }
+            }
+
+            private static IComparer interfaceComparer = new HashCodeComparer();
+
+            private Type baseType;
+            private Type targetType;
+            private Type[] interfaceTypes;
+
+            public ProxyTypeCacheKey(Type baseType, Type targetType, Type[] interfaceTypes)
+            {
+                this.baseType = baseType;
+                this.targetType = targetType;
+                Array.Sort(interfaceTypes, interfaceComparer); // sort by GetHashcode()? to have a defined order
+                this.interfaceTypes = interfaceTypes;
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (this == obj)
+                {
+                    return true;
+                }
+                ProxyTypeCacheKey proxyTypeCacheKey = obj as ProxyTypeCacheKey;
+                if (proxyTypeCacheKey == null)
+                {
+                    return false;
+                }
+                if (!Equals(targetType, proxyTypeCacheKey.targetType))
+                {
+                    return false;
+                }
+                if (!Equals(baseType, proxyTypeCacheKey.baseType))
+                {
+                    return false;
+                }
+                for (int i = 0; i < interfaceTypes.Length; i++)
+                {
+                    if (!Equals(interfaceTypes[i], proxyTypeCacheKey.interfaceTypes[i]))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
+
+            public override int GetHashCode()
+            {
+                int result = baseType.GetHashCode();
+                result = 29*result + targetType.GetHashCode();
+                for (int i = 0; i < interfaceTypes.Length; i++)
+                {
+                    result = 29 * result + interfaceTypes[i].GetHashCode();
+                }
+                return result;
+            }
+
+            public override string ToString()
+            {
+                StringBuilder buffer = new StringBuilder();
+                buffer.Append("baseType=" + baseType + "; ");
+                buffer.Append("targetType=" + targetType + "; ");
+                buffer.Append("interfaceTypes=[");
+                foreach (Type intf in interfaceTypes)
+                {
+                    buffer.Append(intf + ";");
+                }
+                buffer.Append("]; ");
+                return buffer.ToString();
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CompositionAopProxyTypeBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CompositionAopProxyTypeBuilder.cs
new file mode 100644
index 00000000..2f2256f8
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CompositionAopProxyTypeBuilder.cs
@@ -0,0 +1,213 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.Serialization;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+	/// <summary>
+    /// Builds an AOP proxy type using composition.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+    /// <author>Bruno Baia</author>
+	/// <version>$Id: CompositionAopProxyTypeBuilder.cs,v 1.15 2007/12/07 17:58:56 bbaia Exp $</version>
+	public class CompositionAopProxyTypeBuilder : AbstractAopProxyTypeBuilder
+    {
+        #region Fields
+
+        private const string PROXY_TYPE_NAME = "CompositionAopProxy";
+
+        private IAdvised advised;
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="CompositionAopProxyTypeBuilder"/> class.
+        /// </summary>
+        /// <param name="advised">The proxy configuration.</param>
+        public CompositionAopProxyTypeBuilder(IAdvised advised)
+        {
+            this.advised = advised;
+            
+            Name = PROXY_TYPE_NAME;
+            BaseType = typeof(BaseCompositionAopProxy);
+            TargetType = advised.TargetSource.TargetType.IsInterface ? typeof(object) : advised.TargetSource.TargetType;
+            Interfaces = GetProxiableInterfaces(advised.Interfaces);
+            ProxyTargetAttributes = advised.ProxyTargetAttributes;
+        }
+
+        #endregion
+
+        #region IProxyTypeBuilder Members
+
+        /// <summary>
+        /// Creates the proxy type.
+        /// </summary>
+        /// <returns>The generated proxy type.</returns>
+        public override Type BuildProxyType()
+		{
+            IDictionary targetMethods = new Hashtable();
+
+            TypeBuilder typeBuilder = CreateTypeBuilder(Name, BaseType);
+
+            // apply custom attributes to the proxy type.
+            ApplyTypeAttributes(typeBuilder, TargetType);
+
+            if (advised.IsSerializable)
+            {
+                typeBuilder.SetCustomAttribute(
+                    ReflectionUtils.CreateCustomAttribute(typeof(SerializableAttribute)));
+                ImplementSerializationConstructor(typeBuilder);
+            }
+
+			// create constructors
+			ImplementConstructors(typeBuilder);
+
+			// implement interfaces
+            IDictionary interfaceMap = advised.InterfaceMap;
+			foreach (Type intf in Interfaces)
+			{
+				object target = interfaceMap[intf];
+				if (target == null)
+				{
+                    // implement interface
+					ImplementInterface(typeBuilder, 
+                        new TargetAopProxyMethodBuilder(typeBuilder, this, false, targetMethods), 
+                        intf, TargetType);
+				}
+				else if (target is IIntroductionAdvisor)
+				{
+                    // implement introduction
+					ImplementInterface(typeBuilder,
+                        new IntroductionProxyMethodBuilder(typeBuilder, this, targetMethods, advised.IndexOf((IIntroductionAdvisor) target)),
+                        intf, TargetType);
+				}
+			}
+			
+			Type proxyType;
+            proxyType = typeBuilder.CreateType();
+
+            // set target method references
+            foreach (DictionaryEntry entry in targetMethods)
+			{
+				FieldInfo field = proxyType.GetField((string) entry.Key, BindingFlags.NonPublic | BindingFlags.Static);
+				field.SetValue(proxyType, (MethodInfo) entry.Value);
+			}
+
+			return proxyType;
+		}
+
+		#endregion
+
+        #region IAopProxyTypeGenerator Members
+
+        /// <summary>
+        /// Generates the IL instructions that pushes  
+        /// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> 
+        /// instance on stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        public override void PushAdvisedProxy(ILGenerator il)
+        {
+            il.Emit(OpCodes.Ldarg_0);
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Implements serialization constructor.
+        /// </summary>
+        /// <param name="typeBuilder">Type builder to use.</param>
+        private void ImplementSerializationConstructor(TypeBuilder typeBuilder)
+        {
+            ConstructorBuilder cb =
+                typeBuilder.DefineConstructor(MethodAttributes.Family,
+                                              CallingConventions.Standard,
+                                              new Type[] { typeof(SerializationInfo), typeof(StreamingContext) });
+
+            ILGenerator il = cb.GetILGenerator();
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldarg_1);
+            il.Emit(OpCodes.Ldarg_2);
+            il.Emit(OpCodes.Call, References.BaseCompositionAopProxySerializationConstructor);
+            il.Emit(OpCodes.Ret);
+        }
+
+        /// <summary>
+        /// Implements constructors for the proxy class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation calls the base constructor.
+        /// </p>
+        /// </remarks>
+        /// <param name="typeBuilder">
+        /// The <see cref="System.Type"/> builder to use.
+        /// </param>
+        protected override void ImplementConstructors(TypeBuilder typeBuilder)
+        {
+            ConstructorBuilder cb =
+                typeBuilder.DefineConstructor(References.BaseCompositionAopProxyConstructor.Attributes,
+                                              References.BaseCompositionAopProxyConstructor.CallingConvention,
+                                              new Type[] { typeof(IAdvised) });
+
+            ILGenerator il = cb.GetILGenerator();
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldarg_1);
+            il.Emit(OpCodes.Call, References.BaseCompositionAopProxyConstructor);
+            il.Emit(OpCodes.Ret);
+        }
+
+		#endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Determines if the specified <paramref name="type"/> 
+        /// is one of those generated by this builder.
+        /// </summary>
+        /// <param name="type">The type to check.</param>
+        /// <returns>
+        /// <see langword="true"/> if the type is a composition-based proxy;
+        /// otherwise <see langword="false"/>.
+        /// </returns>
+        public static bool IsCompositionProxy(Type type)
+        {
+            return type.FullName.StartsWith(PROXY_TYPE_NAME);
+        }
+
+        #endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DecoratorAopProxyTypeBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DecoratorAopProxyTypeBuilder.cs
new file mode 100644
index 00000000..1f76c7f5
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DecoratorAopProxyTypeBuilder.cs
@@ -0,0 +1,317 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.Serialization;
+
+using Spring.Util;
+using Spring.Proxy;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// Builds an AOP proxy type using the decorator pattern.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: DecoratorAopProxyTypeBuilder.cs,v 1.17 2007/12/07 17:58:56 bbaia Exp $</version>
+    public class DecoratorAopProxyTypeBuilder : AbstractAopProxyTypeBuilder
+    {
+        #region Fields
+
+        private const string PROXY_TYPE_NAME = "DecoratorAopProxy";
+
+        private IAdvised advised;
+
+        /// <summary>
+        /// AdvisedProxy instance calls should be delegated to.
+        /// </summary>
+        protected FieldBuilder advisedProxyField;
+        
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="DecoratorAopProxyTypeBuilder"/> class.
+        /// </summary>
+        /// <param name="advised">The proxy configuration.</param>
+        public DecoratorAopProxyTypeBuilder(IAdvised advised)
+        {
+            if (!ReflectionUtils.IsTypeVisible(advised.TargetSource.TargetType, DynamicProxyManager.ASSEMBLY_NAME))
+            {
+                throw new AopConfigException(String.Format(
+                    "Cannot create decorator-based IAopProxy for a non visible class [{0}]",
+                    advised.TargetSource.TargetType.FullName));
+            }
+            if (advised.TargetSource.TargetType.IsSealed)
+            {
+                throw new AopConfigException(String.Format(
+                    "Cannot create decorator-based IAopProxy for a sealed class [{0}]",
+                    advised.TargetSource.TargetType.FullName));
+            }
+            this.advised = advised;
+
+            Name = PROXY_TYPE_NAME;
+            TargetType = advised.TargetSource.TargetType.IsInterface ? typeof(object) : advised.TargetSource.TargetType;
+            BaseType = TargetType;
+            Interfaces = GetProxiableInterfaces(advised.Interfaces);
+            ProxyTargetAttributes = advised.ProxyTargetAttributes;
+        }
+
+        #endregion
+
+        #region IProxyTypeBuilder Members
+
+        /// <summary>
+        /// Creates the proxy type.
+        /// </summary>
+        /// <returns>The generated proxy class.</returns>
+        public override Type BuildProxyType()
+        {
+            IDictionary targetMethods = new Hashtable();
+
+            TypeBuilder typeBuilder = CreateTypeBuilder(Name, BaseType);
+
+            // apply custom attributes to the proxy type.
+            ApplyTypeAttributes(typeBuilder, TargetType);
+
+            // declare fields
+            DeclareAdvisedProxyInstanceField(typeBuilder);
+
+            // implement ISerializable if possible
+            if (advised.IsSerializable)
+            {
+                typeBuilder.SetCustomAttribute(
+                    ReflectionUtils.CreateCustomAttribute(typeof(SerializableAttribute)));
+                ImplementSerializationConstructor(typeBuilder);
+                ImplementGetObjectDataMethod(typeBuilder);
+            }
+
+            // create constructors
+            ImplementConstructors(typeBuilder);
+
+            // implement interfaces
+            IDictionary interfaceMap = advised.InterfaceMap;
+            foreach (Type intf in Interfaces)
+            {
+                object target = interfaceMap[intf];
+                if (target == null)
+                {
+                    // implement interface (proxy only final methods)
+                    ImplementInterface(typeBuilder,
+                        new TargetAopProxyMethodBuilder(typeBuilder, this, true, targetMethods),
+                        intf, TargetType, false);
+                }
+                else if (target is IIntroductionAdvisor)
+                {
+                    // implement introduction
+                    ImplementInterface(typeBuilder,
+                        new IntroductionProxyMethodBuilder(typeBuilder, this, targetMethods, advised.IndexOf((IIntroductionAdvisor)target)),
+                        intf, TargetType);
+                }
+            }
+
+            // inherit from target type
+            InheritType(typeBuilder, 
+                new TargetAopProxyMethodBuilder(typeBuilder, this, false, targetMethods), 
+                TargetType);
+
+            // implement IAdvised interface
+            ImplementInterface(typeBuilder,
+                new IAdvisedProxyMethodBuilder(typeBuilder, this),
+                typeof(IAdvised), TargetType);
+
+            // implement IAopProxy interface
+            ImplementIAopProxy(typeBuilder);
+
+            Type proxyType;
+            proxyType = typeBuilder.CreateType();
+
+            // set target method references
+            foreach (DictionaryEntry entry in targetMethods)
+            {
+                FieldInfo field = proxyType.GetField((string)entry.Key, BindingFlags.NonPublic | BindingFlags.Static);
+                field.SetValue(proxyType, (MethodInfo)entry.Value);
+            }
+
+            return proxyType;
+        }
+
+        #endregion
+
+        #region IAopProxyTypeGenerator Members
+
+        /// <summary>
+        /// Generates the IL instructions that pushes  
+        /// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> 
+        /// instance on stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        public override void PushAdvisedProxy(ILGenerator il)
+        {
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldfld, advisedProxyField);
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Declares field that holds the <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
+        /// instance used by the proxy.
+        /// </summary>
+        /// <param name="builder">
+        /// The <see cref="System.Type"/> builder to use for code generation.
+        /// </param>
+        protected virtual void DeclareAdvisedProxyInstanceField(TypeBuilder builder)
+        {
+            advisedProxyField = builder.DefineField("__advisedProxy", typeof(AdvisedProxy), FieldAttributes.Private);
+        }
+
+        /// <summary>
+        /// Implements serialization method.
+        /// </summary>
+        /// <param name="typeBuilder"></param>
+        private void ImplementGetObjectDataMethod(TypeBuilder typeBuilder)
+        {
+            typeBuilder.AddInterfaceImplementation(typeof(ISerializable));
+
+            MethodBuilder mb =
+                typeBuilder.DefineMethod("GetObjectData",
+                                         MethodAttributes.Public | MethodAttributes.HideBySig | 
+                                         MethodAttributes.NewSlot | MethodAttributes.Virtual,
+                                         typeof (void),
+                                         new Type[] {typeof (SerializationInfo), typeof (StreamingContext)});
+
+            ILGenerator il = mb.GetILGenerator();
+            il.Emit(OpCodes.Ldarg_1);
+            il.Emit(OpCodes.Ldstr, "advisedProxy");
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldfld, advisedProxyField);
+            il.EmitCall(OpCodes.Callvirt, References.AddSerializationValue, null);
+            il.Emit(OpCodes.Ret);
+
+            typeBuilder.DefineMethodOverride(mb, typeof(ISerializable).GetMethod("GetObjectData"));
+        }
+
+
+        /// <summary>
+        /// Implements serialization constructor.
+        /// </summary>
+        /// <param name="typeBuilder">Type builder to use.</param>
+        private void ImplementSerializationConstructor(TypeBuilder typeBuilder)
+        {
+            ConstructorBuilder cb =
+                typeBuilder.DefineConstructor(MethodAttributes.Family,
+                                              CallingConventions.Standard,
+                                              new Type[] { typeof(SerializationInfo), typeof(StreamingContext) });
+
+            ILGenerator il = cb.GetILGenerator();
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldarg_1);
+            il.Emit(OpCodes.Ldstr, "advisedProxy");
+            il.Emit(OpCodes.Ldtoken, typeof(AdvisedProxy));
+            il.EmitCall(OpCodes.Call, References.GetTypeFromHandle, null);
+            il.EmitCall(OpCodes.Callvirt, References.GetSerializationValue, null);
+            il.Emit(OpCodes.Castclass, typeof(AdvisedProxy));
+            il.Emit(OpCodes.Stfld, advisedProxyField);
+            il.Emit(OpCodes.Ret);
+        }
+
+        /// <summary>
+        /// Implements constructors for the proxy class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation creates a new instance 
+        /// of the <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> class.
+        /// </p>
+        /// </remarks>
+        /// <param name="typeBuilder">
+        /// The <see cref="System.Type"/> builder to use.
+        /// </param>
+        protected override void ImplementConstructors(TypeBuilder typeBuilder)
+        {
+            ConstructorBuilder cb =
+                typeBuilder.DefineConstructor(References.ObjectConstructor.Attributes,
+                                              References.ObjectConstructor.CallingConvention,
+                                              new Type[] { typeof(IAdvised) });
+
+            ILGenerator il = cb.GetILGenerator();
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldarg_1);
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Newobj, References.AdvisedProxyConstructor);
+            il.Emit(OpCodes.Stfld, advisedProxyField);
+            il.Emit(OpCodes.Ret);
+        }
+
+        /// <summary>
+        /// Implements <see cref="Spring.Aop.Framework.IAopProxy"/> interface.
+        /// </summary>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        protected virtual void ImplementIAopProxy(TypeBuilder typeBuilder)
+        {
+            Type intf = typeof(IAopProxy);
+            MethodInfo getProxyMethod = intf.GetMethod("GetProxy", Type.EmptyTypes);
+
+            typeBuilder.AddInterfaceImplementation(intf);
+
+            MethodBuilder mb = typeBuilder.DefineMethod(typeof(IAdvised).FullName + "." + getProxyMethod.Name,
+                MethodAttributes.Private | MethodAttributes.HideBySig | MethodAttributes.NewSlot | MethodAttributes.Virtual | MethodAttributes.Final,
+                getProxyMethod.CallingConvention, getProxyMethod.ReturnType, Type.EmptyTypes);
+
+            ILGenerator il = mb.GetILGenerator();
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ret);
+
+            typeBuilder.DefineMethodOverride(mb, getProxyMethod);
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Determines if the specified <paramref name="type"/> 
+        /// is one of those generated by this builder.
+        /// </summary>
+        /// <param name="type">The type to check.</param>
+        /// <returns>
+        /// <see langword="true"/> if the type is a decorator-based proxy;
+        /// otherwise <see langword="false"/>.
+        /// </returns>
+        public static bool IsDecoratorProxy(Type type)
+        {
+            return type.FullName.StartsWith(PROXY_TYPE_NAME);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DefaultAopProxyFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DefaultAopProxyFactory.cs
new file mode 100644
index 00000000..8f509519
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DefaultAopProxyFactory.cs
@@ -0,0 +1,110 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+
+using Spring.Proxy;
+using Spring.Aop.Target;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// Default implementation of the
+    /// <see cref="Spring.Aop.Framework.IAopProxyFactory"/> interface,
+    /// either creating a decorator-based dynamic proxy or 
+    /// a composition-based dynamic proxy.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Creates a decorator-base proxy if one the following is true :
+    /// - the "ProxyTargetType" property is set
+    /// - no interfaces have been specified
+    /// </p>
+    /// <p>
+    /// In general, specify "ProxyTargetType" to enforce a decorator-based proxy,
+    /// or specify one or more interfaces to use a composition-based proxy.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <author>Bruno Baia (.NET)</author>
+    /// <seealso cref="Spring.Aop.Framework.IAopProxyFactory"/>
+    /// <version>$Id: DefaultAopProxyFactory.cs,v 1.2 2007/08/02 16:28:29 bbaia Exp $</version>
+    [Serializable]
+    public class DefaultAopProxyFactory : IAopProxyFactory
+    {
+
+        /// <summary>
+        /// Creates an <see cref="Spring.Aop.Framework.IAopProxy"/> for the
+        /// supplied <paramref name="advisedSupport"/> configuration.
+        /// </summary>
+        /// <param name="advisedSupport">The AOP configuration.</param>
+        /// <returns>An <see cref="Spring.Aop.Framework.IAopProxy"/>.</returns>
+        /// <exception cref="AopConfigException">
+        /// If the supplied <paramref name="advisedSupport"/> configuration is
+        /// invalid.
+        /// </exception>
+        /// <seealso cref="Spring.Aop.Framework.IAopProxyFactory.CreateAopProxy"/>
+        public virtual IAopProxy CreateAopProxy(AdvisedSupport advisedSupport)
+        {
+            if (advisedSupport == null)
+            {
+                throw new AopConfigException("Cannot create IAopProxy with null ProxyConfig");
+            }
+            if (advisedSupport.Advisors.Length == 0 && advisedSupport.TargetSource == EmptyTargetSource.Empty)
+            {
+                throw new AopConfigException("Cannot create IAopProxy with no advisors and no target source");
+            }
+            if (advisedSupport.ProxyType == null)
+            {
+                IProxyTypeBuilder typeBuilder;
+                if ((advisedSupport.ProxyTargetType) ||
+                    (advisedSupport.Interfaces.Length == 0))
+                {
+                    typeBuilder = new DecoratorAopProxyTypeBuilder(advisedSupport);
+                }
+                else
+                {
+                    typeBuilder = new CompositionAopProxyTypeBuilder(advisedSupport);
+                }
+                advisedSupport.ProxyType = BuildProxyType(typeBuilder);
+                advisedSupport.ProxyConstructor = advisedSupport.ProxyType.GetConstructor(new Type[] { typeof(IAdvised) });
+            }
+
+            return (IAopProxy)advisedSupport.ProxyConstructor.Invoke(new object[] { advisedSupport });
+        }
+
+        /// <summary>
+        /// Generates the proxy type.
+        /// </summary>
+        /// <param name="typeBuilder">
+        /// The <see cref="Spring.Proxy.IProxyTypeBuilder"/> to use
+        /// </param>
+        /// <returns>The generated proxy class.</returns>
+        protected virtual Type BuildProxyType(IProxyTypeBuilder typeBuilder)
+        {
+            return typeBuilder.BuildProxyType();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAdvisedProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAdvisedProxyMethodBuilder.cs
new file mode 100644
index 00000000..5c21830b
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAdvisedProxyMethodBuilder.cs
@@ -0,0 +1,83 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Util;
+using Spring.Proxy;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// <see cref="Spring.Proxy.IProxyMethodBuilder"/> implementation that delegates 
+    /// method calls to an <see cref="Spring.Aop.Framework.IAdvised"/> instance.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: IAdvisedProxyMethodBuilder.cs,v 1.3 2006/11/12 01:37:47 bbaia Exp $</version>
+    public class IAdvisedProxyMethodBuilder : TargetProxyMethodBuilder
+    {
+        #region Fields
+
+        /// <summary>
+        /// The <see cref="IAopProxyTypeGenerator"/> implementation to use.
+        /// </summary>
+        private IAopProxyTypeGenerator _aopProxyGenerator;
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the method builder.
+        /// </summary>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        /// <param name="aopProxyGenerator">
+        /// The <see cref="IAopProxyTypeGenerator"/> implementation to use.
+        /// </param>
+        public IAdvisedProxyMethodBuilder(
+            TypeBuilder typeBuilder, IAopProxyTypeGenerator aopProxyGenerator)
+            : base(typeBuilder, aopProxyGenerator, true)
+        {
+            this._aopProxyGenerator = aopProxyGenerator;
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the target instance on which calls should be delegated to.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        protected override void PushTarget(ILGenerator il)
+        {
+            _aopProxyGenerator.PushAdvisedProxy(il);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAopProxyTypeGenerator.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAopProxyTypeGenerator.cs
new file mode 100644
index 00000000..5aaa2eb8
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAopProxyTypeGenerator.cs
@@ -0,0 +1,48 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection.Emit;
+
+using Spring.Proxy;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+	/// <summary>
+    /// Describes the operations that generates IL instructions 
+    /// used to build the Aop proxy type.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: IAopProxyTypeGenerator.cs,v 1.2 2006/11/05 20:36:59 bbaia Exp $</version>
+    public interface IAopProxyTypeGenerator : IProxyTypeGenerator
+	{
+        /// <summary>
+        /// Generates the IL instructions that pushes  
+        /// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> 
+        /// instance on stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        void PushAdvisedProxy(ILGenerator il);        
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs
new file mode 100644
index 00000000..b1fc1654
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs
@@ -0,0 +1,397 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Runtime.Serialization;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Core;
+using Spring.Proxy;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// Builds an AOP proxy type using inheritance.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: InheritanceAopProxyTypeBuilder.cs,v 1.2 2008/03/03 09:28:50 bbaia Exp $</version>
+    public class InheritanceAopProxyTypeBuilder : AbstractAopProxyTypeBuilder
+    {
+        #region Fields
+
+        private const string PROXY_TYPE_NAME = "InheritanceAopProxy";
+
+        private IAdvised advised;
+        private bool proxyDeclaredMembersOnly = true;
+
+        /// <summary>
+        /// AdvisedProxy instance calls should be delegated to.
+        /// </summary>
+        protected FieldBuilder advisedProxyField;       
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a value indicating whether inherited members should be proxied.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if inherited members should be proxied; 
+        /// otherwise, <see langword="false"/>.
+        /// </value>
+        public bool ProxyDeclaredMembersOnly
+        {
+            get { return proxyDeclaredMembersOnly; }
+            set { proxyDeclaredMembersOnly = value; }
+        }
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="CompositionAopProxyTypeBuilder"/> class.
+        /// </summary>
+        /// <param name="advised">The proxy configuration.</param>
+        public InheritanceAopProxyTypeBuilder(IAdvised advised)
+        {
+            if (!ReflectionUtils.IsTypeVisible(advised.TargetSource.TargetType, DynamicProxyManager.ASSEMBLY_NAME))
+            {
+                throw new AopConfigException(String.Format(
+                    "Cannot create inheritance-based IAopProxy for a non visible class [{0}]",
+                    advised.TargetSource.TargetType.FullName));
+            }
+            if (advised.TargetSource.TargetType.IsSealed)
+            {
+                throw new AopConfigException(String.Format(
+                    "Cannot create inheritance-based IAopProxy for a sealed class [{0}]",
+                    advised.TargetSource.TargetType.FullName));
+            }
+            this.advised = advised;
+            
+            Name = PROXY_TYPE_NAME;
+            TargetType = advised.TargetSource.TargetType;
+            BaseType = TargetType;
+            Interfaces = GetProxiableInterfaces(advised.Interfaces);
+            ProxyTargetAttributes = advised.ProxyTargetAttributes;
+        }
+
+        #endregion
+
+        #region IProxyTypeBuilder Members
+
+        /// <summary>
+        /// Creates the proxy type.
+        /// </summary>
+        /// <returns>The generated proxy class.</returns>
+        public override Type BuildProxyType()
+        {
+            IDictionary targetMethods = new Hashtable();
+            IDictionary proxyMethods = new Hashtable();
+
+            TypeBuilder typeBuilder = CreateTypeBuilder(Name, BaseType);
+
+            // apply custom attributes to the proxy type.
+            ApplyTypeAttributes(typeBuilder, TargetType);
+
+            // declare fields
+            DeclareAdvisedProxyInstanceField(typeBuilder);
+
+            // implement ISerializable if possible
+            if (advised.IsSerializable)
+            {
+                typeBuilder.SetCustomAttribute(
+                    ReflectionUtils.CreateCustomAttribute(typeof(SerializableAttribute)));
+                ImplementSerializationConstructor(typeBuilder);
+                ImplementGetObjectDataMethod(typeBuilder);
+            }
+
+            // create constructors
+            ImplementConstructors(typeBuilder);
+
+            // implement interfaces
+            IDictionary interfaceMap = advised.InterfaceMap;
+            foreach (Type intf in Interfaces)
+            {
+                object target = interfaceMap[intf];
+                if (target == null)
+                {
+                    // implement interface (proxy only final methods)
+                    ImplementInterface(typeBuilder,
+                        new BaseAopProxyMethodBuilder(typeBuilder, this, targetMethods, proxyMethods),
+                        intf, TargetType, false);
+                }
+                else if (target is IIntroductionAdvisor)
+                {
+                    // implement introduction
+                    ImplementInterface(typeBuilder,
+                        new IntroductionProxyMethodBuilder(typeBuilder, this, targetMethods, advised.IndexOf((IIntroductionAdvisor)target)),
+                        intf, TargetType);
+                }
+            }
+
+            // inherit from target type
+            InheritType(typeBuilder,
+                new BaseAopProxyMethodBuilder(typeBuilder, this, targetMethods, proxyMethods),
+                TargetType, ProxyDeclaredMembersOnly);
+
+            // implement IAdvised interface
+            ImplementInterface(typeBuilder,
+                new IAdvisedProxyMethodBuilder(typeBuilder, this),
+                typeof(IAdvised), TargetType);
+
+            // implement IAopProxy interface
+            ImplementIAopProxy(typeBuilder);
+
+            Type proxyType;
+            proxyType = typeBuilder.CreateType();
+
+            // set target method references
+            foreach (DictionaryEntry entry in targetMethods)
+            {
+                FieldInfo field = proxyType.GetField((string)entry.Key, BindingFlags.NonPublic | BindingFlags.Static);
+                field.SetValue(proxyType, (MethodInfo)entry.Value);
+            }
+
+            // set proxy method references
+            foreach (DictionaryEntry entry in proxyMethods)
+            {
+                FieldInfo field = proxyType.GetField((string)entry.Key, BindingFlags.NonPublic | BindingFlags.Static);
+                field.SetValue(proxyType, FindProxyMethod(proxyType, (MethodInfo)entry.Value));
+            }
+
+            return proxyType;
+        }
+
+        private MethodInfo FindProxyMethod(Type targetType, MethodInfo method)
+        {
+            ComposedCriteria searchCriteria = new ComposedCriteria();
+            searchCriteria.Add(new MethodNameMatchCriteria("proxy_" + method.Name));
+            searchCriteria.Add(new MethodParametersCountCriteria(method.GetParameters().Length));
+#if NET_2_0
+            searchCriteria.Add(new MethodGenericArgumentsCountCriteria(
+                method.GetGenericArguments().Length));
+#endif
+            searchCriteria.Add(new MethodParametersCriteria(ReflectionUtils.GetParameterTypes(method)));
+
+            MemberInfo[] matchingMethods = targetType.FindMembers(
+                MemberTypes.Method,
+                BindingFlags.Instance | BindingFlags.Public,
+                new MemberFilter(new CriteriaMemberFilter().FilterMemberByCriteria),
+                searchCriteria);
+
+            if (matchingMethods != null && matchingMethods.Length == 1)
+            {
+                return matchingMethods[0] as MethodInfo;
+            }
+            else
+            {
+                throw new AmbiguousMatchException();
+            }
+        }
+
+        #endregion
+
+        #region IAopProxyTypeGenerator Members
+
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the target instance on which calls should be delegated to.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        public override void PushTarget(ILGenerator il)
+        {
+            il.Emit(OpCodes.Ldarg_0);
+        }
+
+        /// <summary>
+        /// Generates the IL instructions that pushes  
+        /// the current <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> 
+        /// instance on stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        public override void PushAdvisedProxy(ILGenerator il)
+        {
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldfld, advisedProxyField);
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Declares field that holds the <see cref="Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
+        /// instance used by the proxy.
+        /// </summary>
+        /// <param name="builder">
+        /// The <see cref="System.Type"/> builder to use for code generation.
+        /// </param>
+        protected virtual void DeclareAdvisedProxyInstanceField(TypeBuilder builder)
+        {
+            advisedProxyField = builder.DefineField("__advisedProxy", typeof(AdvisedProxy), FieldAttributes.Private);
+        }
+
+        /// <summary>
+        /// Implements serialization method.
+        /// </summary>
+        /// <param name="typeBuilder"></param>
+        private void ImplementGetObjectDataMethod(TypeBuilder typeBuilder)
+        {
+            typeBuilder.AddInterfaceImplementation(typeof(ISerializable));
+
+            MethodBuilder mb =
+                typeBuilder.DefineMethod("GetObjectData",
+                                         MethodAttributes.Public | MethodAttributes.HideBySig |
+                                         MethodAttributes.NewSlot | MethodAttributes.Virtual,
+                                         typeof(void),
+                                         new Type[] { typeof(SerializationInfo), typeof(StreamingContext) });
+
+            ILGenerator il = mb.GetILGenerator();
+            il.Emit(OpCodes.Ldarg_1);
+            il.Emit(OpCodes.Ldstr, "advisedProxy");
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldfld, advisedProxyField);
+            il.EmitCall(OpCodes.Callvirt, References.AddSerializationValue, null);
+            il.Emit(OpCodes.Ret);
+
+            typeBuilder.DefineMethodOverride(mb, typeof(ISerializable).GetMethod("GetObjectData"));
+        }
+
+        /// <summary>
+        /// Implements serialization constructor.
+        /// </summary>
+        /// <param name="typeBuilder">Type builder to use.</param>
+        private void ImplementSerializationConstructor(TypeBuilder typeBuilder)
+        {
+            ConstructorBuilder cb =
+                typeBuilder.DefineConstructor(MethodAttributes.Family,
+                                              CallingConventions.Standard,
+                                              new Type[] { typeof(SerializationInfo), typeof(StreamingContext) });
+
+            ILGenerator il = cb.GetILGenerator();
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldarg_1);
+            il.Emit(OpCodes.Ldstr, "advisedProxy");
+            il.Emit(OpCodes.Ldtoken, typeof(AdvisedProxy));
+            il.EmitCall(OpCodes.Call, References.GetTypeFromHandle, null);
+            il.EmitCall(OpCodes.Callvirt, References.GetSerializationValue, null);
+            il.Emit(OpCodes.Castclass, typeof(AdvisedProxy));
+            il.Emit(OpCodes.Stfld, advisedProxyField);
+            il.Emit(OpCodes.Ret);
+        }
+
+        /// <summary>
+        /// Defines the types of the parameters for the specified constructor.
+        /// </summary>
+        /// <param name="constructor">The constructor to use.</param>
+        /// <returns>The types for constructor's parameters.</returns>
+        protected override Type[] DefineConstructorParameters(ConstructorInfo constructor)
+        {
+            Type[] currentParams = ReflectionUtils.GetParameterTypes(constructor.GetParameters());
+            Type[] newParams = new Type[currentParams.Length + 1];
+
+            newParams[currentParams.Length] = typeof(IAdvised);
+            currentParams.CopyTo(newParams, 0);
+
+            return newParams;
+        }
+
+        /// <summary>
+        /// Generates the proxy constructor.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation creates instance of the AdvisedProxy object.
+        /// </p>
+        /// </remarks>
+        /// <param name="builder">The constructor builder to use.</param>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="constructor">The constructor to delegate the creation to.</param>
+        protected override void GenerateConstructor(
+            ConstructorBuilder builder, ILGenerator il, ConstructorInfo constructor)
+        {
+            int paramCount = constructor.GetParameters().Length;
+            il.Emit(OpCodes.Ldarg_0);
+            for (int i = 0; i < paramCount; i++)
+            {
+                il.Emit(OpCodes.Ldarg_S, i + 1);
+            }
+            il.Emit(OpCodes.Call, constructor);
+
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldarg_S, paramCount + 1);
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Newobj, References.AdvisedProxyConstructor);
+            il.Emit(OpCodes.Stfld, advisedProxyField);
+        }
+
+        /// <summary>
+        /// Implements <see cref="Spring.Aop.Framework.IAopProxy"/> interface.
+        /// </summary>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        protected virtual void ImplementIAopProxy(TypeBuilder typeBuilder)
+        {
+            Type intf = typeof(IAopProxy);
+            MethodInfo getProxyMethod = intf.GetMethod("GetProxy", Type.EmptyTypes);
+
+            typeBuilder.AddInterfaceImplementation(intf);
+
+            MethodBuilder mb = typeBuilder.DefineMethod(typeof(IAdvised).FullName + "." + getProxyMethod.Name,
+                MethodAttributes.Private | MethodAttributes.HideBySig | MethodAttributes.NewSlot | MethodAttributes.Virtual | MethodAttributes.Final,
+                getProxyMethod.CallingConvention, getProxyMethod.ReturnType, Type.EmptyTypes);
+
+            ILGenerator il = mb.GetILGenerator();
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ret);
+
+            typeBuilder.DefineMethodOverride(mb, getProxyMethod);
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Determines if the specified <paramref name="type"/> 
+        /// is one of those generated by this builder.
+        /// </summary>
+        /// <param name="type">The type to check.</param>
+        /// <returns>
+        /// <see langword="true"/> if the type is a inheritance-based proxy;
+        /// otherwise <see langword="false"/>.
+        /// </returns>
+        public static bool IsInheritanceProxy(Type type)
+        {
+            return type.FullName.StartsWith(PROXY_TYPE_NAME);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IntroductionProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IntroductionProxyMethodBuilder.cs
new file mode 100644
index 00000000..b58f1829
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IntroductionProxyMethodBuilder.cs
@@ -0,0 +1,117 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// <see cref="Spring.Proxy.IProxyMethodBuilder"/> implementation 
+    /// that delegates method calls to introduction object.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: IntroductionProxyMethodBuilder.cs,v 1.5 2006/11/05 20:36:59 bbaia Exp $</version>
+    public class IntroductionProxyMethodBuilder : AbstractAopProxyMethodBuilder
+    {
+        #region Fields
+
+        /// <summary>
+        /// The index of the introduction to delegate call to.
+        /// </summary>
+        protected int index;
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the method builder.
+        /// </summary>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        /// <param name="aopProxyGenerator">
+        /// The <see cref="IAopProxyTypeGenerator"/> implementation to use.
+        /// </param>
+        /// <param name="targetMethods">
+        /// 
+        /// </param>
+        /// <param name="index">index of the introduction to delegate call to</param>
+        public IntroductionProxyMethodBuilder(
+            TypeBuilder typeBuilder, IAopProxyTypeGenerator aopProxyGenerator,
+            IDictionary targetMethods, int index)
+            : base(typeBuilder, aopProxyGenerator, true, targetMethods)
+        {
+            this.index = index;
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the introduction type on stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        protected override void PushTargetType(ILGenerator il)
+        {
+            PushTarget(il);
+            il.EmitCall(OpCodes.Call, References.GetTypeMethod, null);
+        }
+
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the introduction instance on stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        protected override void PushTarget(ILGenerator il)
+        {
+            PushAdvisedProxy(il);
+            il.Emit(OpCodes.Ldfld, References.IntroductionsField);
+            il.Emit(OpCodes.Ldc_I4, index);
+            il.Emit(OpCodes.Ldelem_Ref);
+        }
+
+        /// <summary>
+        /// Calls proxied method directly.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="interfaceMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        protected override void CallDirectProxiedMethod(
+            ILGenerator il, MethodInfo method, MethodInfo interfaceMethod)
+        {
+            CallDirectTargetMethod(il, interfaceMethod);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/TargetAopProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/TargetAopProxyMethodBuilder.cs
new file mode 100644
index 00000000..ac3190dc
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/TargetAopProxyMethodBuilder.cs
@@ -0,0 +1,152 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// <see cref="Spring.Proxy.IProxyMethodBuilder"/> implementation 
+    /// that delegates method calls to target object.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: TargetAopProxyMethodBuilder.cs,v 1.3 2008/01/29 18:24:50 markpollack Exp $</version>
+    public class TargetAopProxyMethodBuilder : AbstractAopProxyMethodBuilder
+    {
+        #region Fields
+
+        /// <summary>
+        /// The local variable to store
+        /// the <see cref="Spring.Aop.Framework.ITargetSourceWrapper"/> instance.
+        /// </summary>
+        protected LocalBuilder targetSource;
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the method builder.
+        /// </summary>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        /// <param name="aopProxyGenerator">
+        /// The <see cref="IAopProxyTypeGenerator"/> implementation to use.
+        /// </param>
+        /// <param name="explicitImplementation">
+        /// <see langword="true"/> if the interface is to be
+        /// implemented explicitly; otherwise <see langword="false"/>.
+        /// </param>
+        /// <param name="targetMethods">
+        /// The dictionary to cache the list of target 
+        /// <see cref="System.Reflection.MethodInfo"/>s.
+        /// </param>
+        public TargetAopProxyMethodBuilder(TypeBuilder typeBuilder, 
+            IAopProxyTypeGenerator aopProxyGenerator, bool explicitImplementation, IDictionary targetMethods)
+            : base(typeBuilder, aopProxyGenerator, explicitImplementation, targetMethods)
+        {
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Creates local variable declarations.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        protected override void DeclareLocals(ILGenerator il, MethodInfo method)
+        {
+            base.DeclareLocals(il, method);
+            targetSource = il.DeclareLocal(typeof(ITargetSourceWrapper));
+
+#if DEBUG
+            targetSource.SetLocalSymInfo("targetSource");
+#endif
+        }
+
+        /// <summary>
+        /// Generates method logic.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="interfaceMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        protected override void GenerateMethodLogic(
+            ILGenerator il, MethodInfo method, MethodInfo interfaceMethod)
+        {
+            Label jmpEndFinally = il.DefineLabel();
+
+            // save target source so we can call Dispose later
+            PushAdvisedProxy(il);
+            il.Emit(OpCodes.Ldfld, References.TargetSourceWrapperField);
+            il.Emit(OpCodes.Stloc, targetSource);
+
+            // open try/finally block
+            il.BeginExceptionBlock();
+
+            base.GenerateMethodLogic(il, method, interfaceMethod);
+
+            // open finally block
+            il.BeginFinallyBlock();
+
+            // call Dispose on target source
+            il.Emit(OpCodes.Ldloc, targetSource);
+            il.Emit(OpCodes.Brfalse, jmpEndFinally);
+            il.Emit(OpCodes.Ldloc, targetSource);
+            il.EmitCall(OpCodes.Callvirt, References.DisposeMethod, null);
+            
+            il.MarkLabel(jmpEndFinally);
+
+            // close try/finally block
+            il.EndExceptionBlock();
+        }
+
+        /// <summary>
+        /// Calls proxied method directly.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="interfaceMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        protected override void CallDirectProxiedMethod(
+            ILGenerator il, MethodInfo method, MethodInfo interfaceMethod)
+        {
+            if (interfaceMethod != null)
+                CallDirectTargetMethod(il, interfaceMethod);
+            else
+                CallDirectTargetMethod(il, method);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicTargetSourceWrapper.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicTargetSourceWrapper.cs
new file mode 100644
index 00000000..d7f51989
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicTargetSourceWrapper.cs
@@ -0,0 +1,98 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Decorates a target source with the <see cref="System.IDisposable"/>
+	/// interface.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This implementation will release the target object when said object
+	/// is disposed.
+	/// </p>
+	/// </remarks>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: DynamicTargetSourceWrapper.cs,v 1.4 2007/03/16 04:01:17 aseovic Exp $</version>
+	[Serializable]
+    public sealed class DynamicTargetSourceWrapper : ITargetSourceWrapper
+	{
+		private ITargetSource targetSource;
+		private object target;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Framework.DynamicTargetSourceWrapper"/>
+		/// class.
+		/// </summary>
+		/// <param name="targetSource">
+		/// The target object that proxy methods will be delegated to.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="targetSource"/> is
+		/// <see langword="null"/>.
+		/// </exception>
+		internal DynamicTargetSourceWrapper(ITargetSource targetSource)
+		{
+			AssertUtils.ArgumentNotNull(targetSource, "targetSource");
+			this.targetSource = targetSource;
+		}
+
+		/// <summary>
+		/// Returns the target object that proxy methods will be delegated to.
+		/// </summary>
+		/// <returns>The target object.</returns>
+		public object GetTarget()
+		{
+            if (this.target == null)
+            {
+                this.target = targetSource.GetTarget();
+            }
+
+			return this.target;
+		}
+		
+		/// <summary>
+		/// Releases the dynamic target when this object is disposed.
+		/// </summary>
+		public void Dispose()
+		{
+			GC.SuppressFinalize(this);
+			Dispose(true);
+		}
+
+		private void Dispose(bool disposing)
+		{
+			if (disposing && this.target != null)
+			{
+				this.targetSource.ReleaseTarget(this.target);
+				this.target = null;
+			}
+		}
+	}
+}
diff --git a/src/Spring/Spring.Aop/Aop/Framework/HashtableCachingAdvisorChainFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/HashtableCachingAdvisorChainFactory.cs
new file mode 100644
index 00000000..ca75241a
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/HashtableCachingAdvisorChainFactory.cs
@@ -0,0 +1,104 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary> 
+	/// <see cref="Spring.Aop.Framework.IAdvisorChainFactory"/> implementation
+	/// that caches advisor chains on a per-advised-method basis.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: HashtableCachingAdvisorChainFactory.cs,v 1.9 2007/03/16 04:01:18 aseovic Exp $</version>
+	[Serializable]
+	public sealed class HashtableCachingAdvisorChainFactory : IAdvisorChainFactory
+	{
+		private IDictionary methodCache = new Hashtable();
+
+		/// <summary>
+		/// Gets the list of <see cref="AopAlliance.Intercept.IInterceptor"/> and
+		/// <see cref="Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
+		/// instances for the supplied <paramref name="proxy"/>.
+		/// </summary>
+		/// <param name="advised">The proxy configuration object.</param>
+		/// <param name="proxy">The object proxy.</param>
+		/// <param name="method">
+		/// The method for which the interceptors are to be evaluated.
+		/// </param>
+		/// <param name="targetType">
+		/// The <see cref="System.Type"/> of the target object.
+		/// </param>
+		/// <returns> 
+		/// The list of <see cref="AopAlliance.Intercept.IInterceptor"/> and
+		/// <see cref="Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
+		/// instances for the supplied <paramref name="proxy"/>.
+		/// </returns>
+		public IList GetInterceptors(IAdvised advised, object proxy, MethodInfo method, Type targetType)
+		{
+            IList cached = (IList) this.methodCache[method];
+			if (cached == null)
+			{
+				// recalculate...
+				cached = AdvisorChainFactoryUtils.CalculateInterceptors(advised, proxy, method, targetType);
+                this.methodCache[method] = cached;
+			}
+			return cached;
+		}
+
+		/// <summary>
+		/// Invoked when the first proxy is created.
+		/// </summary>
+		/// <param name="source">
+		/// The relevant <see cref="Spring.Aop.Framework.AdvisedSupport"/> source.
+		/// </param>
+		public void Activated(AdvisedSupport source)
+		{
+		}
+
+		/// <summary>
+		/// Invoked when advice is changed after a proxy is created.
+		/// </summary>
+		/// <param name="source">
+		/// The relevant <see cref="Spring.Aop.Framework.AdvisedSupport"/> source.
+		/// </param>
+		public void AdviceChanged(AdvisedSupport source)
+		{
+			methodCache.Clear();
+		}
+
+		/// <summary>
+		/// Invoked when interfaces are changed after a proxy is created.
+		/// </summary>
+		/// <param name="source">
+		/// The relevant <see cref="Spring.Aop.Framework.AdvisedSupport"/> source.
+		/// </param>
+		public void InterfacesChanged(AdvisedSupport source)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAdvised.cs b/src/Spring/Spring.Aop/Aop/Framework/IAdvised.cs
new file mode 100644
index 00000000..7fe13cfa
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/IAdvised.cs
@@ -0,0 +1,500 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using AopAlliance.Aop;
+using Spring.Aop;
+using Spring.Proxy;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+    /// <summary>
+    /// Configuration data for an AOP proxy factory.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This configuration includes the
+    /// <see cref="AopAlliance.Intercept.IInterceptor"/>s,
+    /// <see cref="Spring.Aop.IAdvisor"/>s, and (any) proxied interfaces.
+    /// </p>
+    /// <p>
+    /// Any AOP proxy obtained from Spring.NET can be cast to this interface to
+    /// allow the manipulation of said proxy's AOP advice.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: IAdvised.cs,v 1.15 2007/10/10 18:07:38 markpollack Exp $</version>
+    /// <seealso cref="Spring.Aop.Framework.AdvisedSupport"/>
+    [ProxyIgnore]
+    public interface IAdvised
+    {
+        /// <summary>
+        /// Should proxies obtained from this configuration expose
+        /// the AOP proxy to the
+        /// <see cref="Spring.Aop.Framework.AopContext"/> class?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is useful if an advised object needs to call another advised
+        /// method on itself. (If it uses the <c>this</c> reference (<c>Me</c>
+        /// in Visual Basic.NET), the invocation will <b>not</b> be advised).
+        /// </p>
+        /// </remarks>
+        bool ExposeProxy { get; }
+
+        /// <summary>
+        /// Gets the
+        /// <see cref="Spring.Aop.Framework.IAdvisorChainFactory"/>
+        /// implementation that will be used to get the interceptor
+        /// chains for the advised
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport.Target"/>.
+        /// </summary>
+        /// <value>
+        /// The <see cref="Spring.Aop.Framework.IAdvisorChainFactory"/>
+        /// implementation that will be used to get the interceptor
+        /// chains for the advised
+        /// <see cref="Spring.Aop.Framework.AdvisedSupport.Target"/>.
+        /// </value>
+        IAdvisorChainFactory AdvisorChainFactory { get; }
+
+        /// <summary>
+        /// Is the target <see cref="System.Type"/> to be proxied in addition
+        /// to any interfaces declared on the proxied <see cref="System.Type"/>?
+        /// </summary>
+        bool ProxyTargetType { get; }
+
+        /// <summary>
+        /// Is target type attributes, method attributes, method's return type attributes 
+        /// and method's parameter attributes to be proxied in addition
+        /// to any interfaces declared on the proxied <see cref="System.Type"/>?
+        /// </summary>
+        bool ProxyTargetAttributes { get; }
+
+        /// <summary>
+        /// Returns the collection of <see cref="Spring.Aop.IAdvisor"/>
+        /// instances that have been applied to this proxy.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Will never return <cref lang="null"/>, but may return an
+        /// empty array (in the case where no
+        /// <see cref="Spring.Aop.IAdvisor"/> instances have been applied to
+        /// this proxy).
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The collection of <see cref="Spring.Aop.IAdvisor"/>
+        /// instances that have been applied to this proxy.
+        /// </value>
+        IAdvisor[] Advisors { get; }
+
+        /// <summary>
+        /// Returns the collection of <see cref="Spring.Aop.IIntroductionAdvisor"/>
+        /// instances that have been applied to this proxy.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Will never return <cref lang="null"/>, but may return an
+        /// empty array (in the case where no
+        /// <see cref="Spring.Aop.IIntroductionAdvisor"/> instances have been
+        /// applied to this proxy).
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The collection of <see cref="Spring.Aop.IIntroductionAdvisor"/>
+        /// instances that have been applied to this proxy.
+        /// </value>
+        IIntroductionAdvisor[] Introductions { get; }
+
+        /// <summary>
+        /// Returns the collection of interface <see cref="System.Type"/>s
+        /// to be (or that are being) proxied by this proxy.
+        /// </summary>
+        /// <value>
+        /// The collection of interface <see cref="System.Type"/>s
+        /// to be (or that are being) proxied by this proxy.
+        /// </value>
+        Type[] Interfaces { get; }
+
+        /// <summary>
+        /// Returns the mapping of the proxied interface
+        /// <see cref="System.Type"/>s to their delegates.
+        /// </summary>
+        /// <value>
+        /// The mapping of the proxied interface
+        /// <see cref="System.Type"/>s to their delegates.
+        /// </value>
+        IDictionary InterfaceMap { get; }
+
+        /// <summary>
+        /// Is this configuration frozen?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// When a config is frozen, no advice changes can be made. This is
+        /// useful for optimization, and useful when we don't want callers
+        /// to be able to manipulate configuration after casting to
+        /// <see cref="Spring.Aop.Framework.IAdvised"/>.
+        /// </p>
+        /// </remarks>
+        bool IsFrozen { get; }
+
+        /// <summary>
+        /// Returns the <see cref="Spring.Aop.ITargetSource"/> used by this
+        /// <see cref="Spring.Aop.Framework.IAdvised"/> object.
+        /// </summary>
+        /// <value>
+        /// The <see cref="Spring.Aop.ITargetSource"/> used by this
+        /// <see cref="Spring.Aop.Framework.IAdvised"/> object.
+        /// </value>
+        ITargetSource TargetSource { get; }
+
+        /// <summary>
+        /// Returns a boolean specifying if this <see cref="IAdvised"/>
+        /// instance can be serialized.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if this instance can be serialized, <c>false</c> otherwise.
+        /// </value>
+        bool IsSerializable { get; }
+
+        /// <summary>
+        /// Adds the supplied <paramref name="advice"/> to the end (or tail)
+        /// of the advice (interceptor) chain.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Please be aware that Spring.NET's AOP implementation only supports
+        /// method advice (as encapsulated by the 
+        /// <see cref="AopAlliance.Intercept.IMethodInterceptor"/> interface).
+        /// </p>
+        /// </remarks>
+        /// <param name="advice">
+        /// The <see cref="AopAlliance.Aop.IAdvice"/> to be added.
+        /// </param>
+        /// <seealso cref="Spring.Aop.Support.DefaultPointcutAdvisor"/>
+        /// <seealso cref="Spring.Aop.Framework.IAdvised.AddAdvice(int,IAdvice)"/>
+        void AddAdvice(IAdvice advice);
+
+        /// <summary>
+        /// Adds the supplied <paramref name="advice"/> to the supplied
+        /// <paramref name="position"/> in the advice (interceptor) chain.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Please be aware that Spring.NET's AOP implementation only supports
+        /// method advice (as encapsulated by the 
+        /// <see cref="AopAlliance.Intercept.IMethodInterceptor"/> interface).
+        /// </p>
+        /// </remarks>
+        /// <param name="position">
+        /// The zero (0) indexed position (from the head) at which the
+        /// supplied <paramref name="advice"/> is to be inserted into the
+        /// advice (interceptor) chain.
+        /// </param>
+        /// <param name="advice">
+        /// The <see cref="AopAlliance.Aop.IAdvice"/> to be added.
+        /// </param>
+        /// <seealso cref="Spring.Aop.Support.DefaultPointcutAdvisor"/>
+        /// <seealso cref="Spring.Aop.Framework.IAdvised.AddAdvice(IAdvice)"/>
+        void AddAdvice(int position, IAdvice advice);
+
+        /// <summary>
+        /// Is the supplied <paramref name="intf"/> (interface)
+        /// <see cref="System.Type"/> proxied?
+        /// </summary>
+        /// <param name="intf">
+        /// The interface <see cref="System.Type"/> to test.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="intf"/>
+        /// (interface) <see cref="System.Type"/> is proxied;
+        /// <see langword="false"/> if not or the supplied
+        /// <paramref name="intf"/> is <cref lang="null"/>.
+        /// </returns>
+        bool IsInterfaceProxied(Type intf);
+
+        /// <summary>
+        /// Adds the advisors from the supplied <paramref name="advisors"/> 
+        /// to the list of <see cref="Spring.Aop.Framework.IAdvised.Advisors"/>.
+        /// </summary>
+        /// <param name="advisors">
+        /// The <see cref="IAdvisors"/> to add advisors from.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="advisors"/> cannot be added.
+        /// </exception>
+        void AddAdvisors(IAdvisors advisors);
+
+        /// <summary>
+        /// Adds the supplied <paramref name="advisor"/> to the list
+        /// of <see cref="Spring.Aop.Framework.IAdvised.Advisors"/>.
+        /// </summary>
+        /// <param name="advisor">
+        /// The <see cref="Spring.Aop.IAdvisor"/> to add.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="advisor"/> cannot be added.
+        /// </exception>
+        void AddAdvisor(IAdvisor advisor);
+
+        /// <summary>
+        /// Adds the supplied <paramref name="advisor"/> to the list
+        /// of <see cref="Spring.Aop.Framework.IAdvised.Advisors"/>.
+        /// </summary>
+        /// <param name="index">
+        /// The index in the <see cref="Spring.Aop.Framework.IAdvised.Advisors"/>
+        /// list at which the supplied <paramref name="advisor"/>
+        /// is to be inserted.
+        /// </param>
+        /// <param name="advisor">
+        /// The <see cref="Spring.Aop.IIntroductionAdvisor"/> to add.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="advisor"/> cannot be added.
+        /// </exception>
+        void AddAdvisor(int index, IAdvisor advisor);
+
+        /// <summary>
+        /// Adds the supplied <paramref name="introductionAdvisor"/> to the list
+        /// of <see cref="Spring.Aop.Framework.IAdvised.Introductions"/>.
+        /// </summary>
+        /// <param name="introductionAdvisor">
+        /// The <see cref="Spring.Aop.IIntroductionAdvisor"/> to add.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="introductionAdvisor"/> cannot be added.
+        /// </exception>
+        void AddIntroduction(IIntroductionAdvisor introductionAdvisor);
+
+        /// <summary>
+        /// Adds the supplied <paramref name="introductionAdvisor"/> to the list
+        /// of <see cref="Spring.Aop.Framework.IAdvised.Introductions"/>.
+        /// </summary>
+        /// <param name="index">
+        /// The index in the <see cref="Spring.Aop.Framework.IAdvised.Introductions"/>
+        /// list at which the supplied <paramref name="introductionAdvisor"/>
+        /// is to be inserted.
+        /// </param>
+        /// <param name="introductionAdvisor">
+        /// The <see cref="Spring.Aop.IIntroductionAdvisor"/> to add.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="introductionAdvisor"/> cannot be added.
+        /// </exception>
+        void AddIntroduction(int index, IIntroductionAdvisor introductionAdvisor);
+
+        /// <summary> 
+        /// Return the index (0 based) of the supplied
+        /// <see cref="Spring.Aop.IAdvisor"/> in the interceptor
+        /// (advice) chain for this proxy.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The return value of this method can be used to index into
+        /// the <see cref="Spring.Aop.Framework.IAdvised.Advisors"/>
+        /// list.
+        /// </p>
+        /// </remarks>
+        /// <param name="advisor">
+        /// The <see cref="Spring.Aop.IAdvisor"/> to search for.
+        /// </param>
+        /// <returns>
+        /// The zero (0) based index of this advisor, or -1 if the
+        /// supplied <paramref name="advisor"/> is not an advisor for this
+        /// proxy.
+        /// </returns>
+        int IndexOf(IAdvisor advisor);
+
+        /// <summary> 
+        /// Return the index (0 based) of the supplied
+        /// <see cref="Spring.Aop.IIntroductionAdvisor"/> in the introductions
+        /// for this proxy.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The return value of this method can be used to index into
+        /// the <see cref="Spring.Aop.Framework.IAdvised.Introductions"/>
+        /// list.
+        /// </p>
+        /// </remarks>
+        /// <param name="advisor">
+        /// The <see cref="Spring.Aop.IIntroductionAdvisor"/> to search for.
+        /// </param>
+        /// <returns>
+        /// The zero (0) based index of this advisor, or -1 if the
+        /// supplied <paramref name="advisor"/> is not an introduction advisor
+        /// for this proxy.
+        /// </returns>
+        int IndexOf(IIntroductionAdvisor advisor);
+
+        /// <summary>
+        /// Removes the supplied <paramref name="advisor"/> the list of advisors
+        /// for this proxy.
+        /// </summary>
+        /// <param name="advisor">The advisor to remove.</param>
+        /// <returns>
+        /// <see langword="true"/> if advisor was found in the list of
+        /// <see cref="Spring.Aop.Framework.IAdvised.Advisors"/> for this
+        /// proxy and was successfully removed; <see langword="false"/> if not
+        /// or if the supplied <paramref name="advisor"/> is <cref lang="null"/>.
+        /// </returns>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="advisor"/> cannot be removed.
+        /// </exception>
+        bool RemoveAdvisor(IAdvisor advisor);
+
+        /// <summary>
+        /// Removes the <see cref="Spring.Aop.IAdvisor"/> at the supplied
+        /// <paramref name="index"/> in the
+        /// <see cref="Spring.Aop.Framework.IAdvised.Advisors"/> list
+        /// from the list of
+        /// <see cref="Spring.Aop.Framework.IAdvised.Advisors"/> for this proxy.
+        /// </summary>
+        /// <param name="index">
+        /// The index of the <see cref="Spring.Aop.IAdvisor"/> to remove.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <see cref="Spring.Aop.IAdvisor"/> at the supplied <paramref name="index"/>
+        /// cannot be removed; or if the supplied <paramref name="index"/> is out of
+        /// range.
+        /// </exception>
+        void RemoveAdvisor(int index);
+
+        /// <summary>
+        /// Removes the supplied <paramref name="advice"/> from the list
+        /// of <see cref="Spring.Aop.Framework.IAdvised.Advisors"/>.
+        /// </summary>
+        /// <param name="advice">
+        /// The <see cref="AopAlliance.Aop.IAdvice"/> to remove.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="advice"/> was
+        /// found in the list of <see cref="Spring.Aop.Framework.IAdvised.Advisors"/>
+        /// and successfully removed.
+        /// </returns>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <see cref="AopAlliance.Aop.IAdvice"/> cannot be removed.
+        /// </exception>
+        bool RemoveAdvice(IAdvice advice);
+
+        /// <summary>
+        /// Removes the supplied <paramref name="introduction"/> from the list
+        /// of <see cref="Spring.Aop.Framework.IAdvised.Introductions"/>.
+        /// </summary>
+        /// <param name="introduction">
+        /// The <see cref="Spring.Aop.IIntroductionAdvisor"/> to remove.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="introduction"/> was
+        /// found in the list of <see cref="Spring.Aop.Framework.IAdvised.Introductions"/>
+        /// and successfully removed.
+        /// </returns>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <see cref="Spring.Aop.IIntroductionAdvisor"/> cannot be removed.
+        /// </exception>
+        bool RemoveIntroduction(IIntroductionAdvisor introduction);
+
+        /// <summary>
+        /// Removes the <see cref="Spring.Aop.IIntroductionAdvisor"/> at the supplied
+        /// <paramref name="index"/> in the list of
+        /// <see cref="Spring.Aop.Framework.IAdvised.Introductions"/> for this proxy.
+        /// </summary>
+        /// <param name="index">The index of the advisor to remove.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <see cref="Spring.Aop.IIntroductionAdvisor"/> at the supplied
+        /// <paramref name="index"/> cannot be removed; or if the supplied
+        /// <paramref name="index"/> is out of range.
+        /// </exception>
+        void RemoveIntroduction(int index);
+
+        /// <summary>
+        /// Replaces the <see cref="Spring.Aop.IIntroductionAdvisor"/> that
+        /// exists at the supplied <paramref name="index"/> in the list of
+        /// <see cref="Spring.Aop.Framework.IAdvised.Introductions"/>
+        /// with the supplied <paramref name="introduction"/>.
+        /// </summary>
+        /// <param name="index">
+        /// The index of the <see cref="Spring.Aop.IIntroductionAdvisor"/>
+        /// in the list of
+        /// <see cref="Spring.Aop.Framework.IAdvised.Introductions"/>
+        /// that is to be replaced.
+        /// </param>
+        /// <param name="introduction">
+        /// The new (replacement) <see cref="Spring.Aop.IIntroductionAdvisor"/>.
+        /// </param>
+        /// <exception cref="AopConfigException">
+        /// If the supplied <paramref name="index"/> is out of range.
+        /// </exception>
+        void ReplaceIntroduction(int index, IIntroductionAdvisor introduction);
+
+        /// <summary> 
+        /// Replaces the <paramref name="oldAdvisor"/> with the
+        /// <paramref name="newAdvisor"/>.
+        /// </summary>
+        /// <param name="oldAdvisor">
+        /// The original (old) advisor to be replaced.
+        /// </param>
+        /// <param name="newAdvisor">
+        /// The new advisor to replace the <paramref name="oldAdvisor"/> with.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the <paramref name="oldAdvisor"/> was
+        /// replaced; if the <paramref name="oldAdvisor"/> was not found in the
+        /// advisors collection, this method returns <see langword="false"/>
+        /// and (effectively) does nothing.
+        /// </returns>
+        /// <exception cref="AopConfigException">
+        /// If this proxy configuration is frozen and the
+        /// <paramref name="oldAdvisor"/> cannot be replaced.
+        /// </exception>
+        /// <seealso cref="Spring.Aop.Framework.ProxyConfig.IsFrozen"/>
+        bool ReplaceAdvisor(IAdvisor oldAdvisor, IAdvisor newAdvisor);
+
+        /// <summary>
+        /// As <see cref="System.Object.ToString()"/> will normally be passed
+        /// straight through to the advised target, this method returns the
+        /// <see cref="System.Object.ToString()"/> equivalent for the AOP
+        /// proxy itself.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> description of the proxy configuration.
+        /// </returns>
+        string ToProxyConfigString();
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAdvisedSupportListener.cs b/src/Spring/Spring.Aop/Aop/Framework/IAdvisedSupportListener.cs
new file mode 100644
index 00000000..4085ceba
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/IAdvisedSupportListener.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Callback interface for
+	/// <see cref="Spring.Aop.Framework.AdvisedSupport"/> listeners.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Allows <see cref="Spring.Aop.Framework.IAdvisedSupportListener"/>
+	/// implementations to be notified of notable lifecycle events relating
+	/// to the creation of a proxy, and changes to the configuration data of a
+	/// proxy.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: IAdvisedSupportListener.cs,v 1.5 2006/04/09 07:18:35 markpollack Exp $</version>
+	public interface IAdvisedSupportListener
+	{
+	    /// <summary>
+	    /// Invoked when the first proxy is created.
+	    /// </summary>
+	    /// <param name="source">
+	    /// The relevant <see cref="Spring.Aop.Framework.AdvisedSupport"/> source.
+	    /// </param>
+	    void Activated(AdvisedSupport source);
+
+	    /// <summary>
+	    /// Invoked when advice is changed after a proxy is created.
+	    /// </summary>
+	    /// <param name="source">
+	    /// The relevant <see cref="Spring.Aop.Framework.AdvisedSupport"/> source.
+	    /// </param>
+	    void AdviceChanged(AdvisedSupport source);
+
+	    /// <summary>
+	    /// Invoked when interfaces are changed after a proxy is created.
+	    /// </summary>
+	    /// <param name="source">
+	    /// The relevant <see cref="Spring.Aop.Framework.AdvisedSupport"/> source.
+	    /// </param>
+	    void InterfacesChanged(AdvisedSupport source);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAdvisorChainFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/IAdvisorChainFactory.cs
new file mode 100644
index 00000000..f1965d4d
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/IAdvisorChainFactory.cs
@@ -0,0 +1,60 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Factory interface for advisor chains.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: IAdvisorChainFactory.cs,v 1.8 2006/09/14 21:05:23 bbaia Exp $</version>
+	public interface IAdvisorChainFactory : IAdvisedSupportListener
+	{
+		/// <summary>
+		/// Gets the list of <see cref="AopAlliance.Intercept.IInterceptor"/> and
+		/// <see cref="Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
+		/// instances for the supplied <paramref name="proxy"/>.
+		/// </summary>
+		/// <param name="advised">The proxy configuration object.</param>
+		/// <param name="proxy">The object proxy.</param>
+		/// <param name="method">
+		/// The method for which the interceptors are to be evaluated.
+		/// </param>
+		/// <param name="targetType">
+		/// The <see cref="System.Type"/> of the target object.
+		/// </param>
+		/// <returns> 
+		/// The list of <see cref="AopAlliance.Intercept.IInterceptor"/> and
+		/// <see cref="Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
+		/// instances for the supplied <paramref name="proxy"/>.
+		/// </returns>
+		IList GetInterceptors(
+			IAdvised advised, object proxy, MethodInfo method, Type targetType);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAopProxy.cs b/src/Spring/Spring.Aop/Aop/Framework/IAopProxy.cs
new file mode 100644
index 00000000..55238299
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/IAopProxy.cs
@@ -0,0 +1,45 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using Spring.Proxy;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// The central interface for Spring.NET based AOP proxies. 
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: IAopProxy.cs,v 1.4 2006/11/16 02:30:49 bbaia Exp $</version>
+	[ProxyIgnore]
+    public interface IAopProxy
+	{
+		/// <summary>
+		/// Creates a new proxy object.
+		/// </summary>
+		object GetProxy();
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAopProxyFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/IAopProxyFactory.cs
new file mode 100644
index 00000000..e03900e9
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/IAopProxyFactory.cs
@@ -0,0 +1,47 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace Spring.Aop.Framework
+{
+	/// <summary> 
+	/// Factory interface for the creation of AOP proxies based on
+	/// <see cref="Spring.Aop.Framework.AdvisedSupport"/> configuration
+	/// objects.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: IAopProxyFactory.cs,v 1.3 2006/04/09 07:18:35 markpollack Exp $</version>
+	public interface IAopProxyFactory
+	{
+		/// <summary>
+		/// Creates an <see cref="Spring.Aop.Framework.IAopProxy"/> for the
+		/// supplied <paramref name="advisedSupport"/> configuration.
+		/// </summary>
+		/// <param name="advisedSupport">The AOP configuration.</param>
+		/// <returns>An <see cref="Spring.Aop.Framework.IAopProxy"/>.</returns>
+		/// <exception cref="AopConfigException">
+		/// If the supplied <paramref name="advisedSupport"/> configuration is
+		/// invalid.
+		/// </exception>
+		IAopProxy CreateAopProxy(AdvisedSupport advisedSupport);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/ITargetAware.cs b/src/Spring/Spring.Aop/Aop/Framework/ITargetAware.cs
new file mode 100644
index 00000000..864345cc
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/ITargetAware.cs
@@ -0,0 +1,46 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace Spring.Aop.Framework
+{
+    /// <summary>
+    /// Provides access to the target object of an AOP proxy.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// To be implemented by introduction aspects in order to obtain access to
+    /// the target object.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ITargetAware.cs,v 1.3 2006/04/09 07:18:35 markpollack Exp $</version>
+    public interface ITargetAware
+    {
+        /// <summary>
+        /// Sets the <see cref="Spring.Aop.Framework.IAopProxy"/> target object.
+        /// </summary>
+        IAopProxy TargetProxy
+        {
+        	set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/ITargetSourceWrapper.cs b/src/Spring/Spring.Aop/Aop/Framework/ITargetSourceWrapper.cs
new file mode 100644
index 00000000..373cdb98
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/ITargetSourceWrapper.cs
@@ -0,0 +1,39 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Decorates a target source with the <see cref="System.IDisposable"/>
+	/// interface.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: ITargetSourceWrapper.cs,v 1.1 2006/08/10 18:45:52 bbaia Exp $</version>
+	public interface ITargetSourceWrapper : IDisposable
+	{
+		/// <summary>
+		/// Returns the target object that proxy methods will be delegated to.
+		/// </summary>
+		/// <returns>The target object.</returns>
+		object GetTarget();
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/InterceptorAndDynamicMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/Framework/InterceptorAndDynamicMethodMatcher.cs
new file mode 100644
index 00000000..73853ce5
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/InterceptorAndDynamicMethodMatcher.cs
@@ -0,0 +1,48 @@
+#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 AopAlliance.Intercept;
+using Spring.Aop;
+
+namespace Spring.Aop.Framework
+{
+	
+	/// <summary> Internal framework class.
+	/// This class is required because if we put an interceptor that implements IInterceptionAdvice
+	/// in the interceptor list passed to MethodInvocation, it may be mistaken for an
+	/// advice that requires dynamic method matching.
+	/// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.Net)</author>
+    /// <version>$Id: InterceptorAndDynamicMethodMatcher.cs,v 1.3 2007/03/16 04:01:18 aseovic Exp $</version>
+    [Serializable]
+    internal class InterceptorAndDynamicMethodMatcher
+	{
+		internal IMethodMatcher MethodMatcher;
+		internal IMethodInterceptor Interceptor;
+		
+		public InterceptorAndDynamicMethodMatcher(IMethodInterceptor interceptor, IMethodMatcher methodMatcher)
+		{
+			this.Interceptor = interceptor;
+			this.MethodMatcher = methodMatcher;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/ProxyConfig.cs b/src/Spring/Spring.Aop/Aop/Framework/ProxyConfig.cs
new file mode 100644
index 00000000..c019aef6
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/ProxyConfig.cs
@@ -0,0 +1,222 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Text;
+using Spring.Aop.Framework.DynamicProxy;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Convenience superclass for configuration used in creating proxies,
+	/// to ensure that all proxy creators have consistent properties.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Note that it is no longer possible to configure subclasses to 
+	/// expose the <see cref="AopAlliance.Intercept.IMethodInvocation"/>.
+	/// Interceptors should normally manage their own thread locals if they
+	/// need to make resources available to advised objects. If it is
+	/// absolutely necessary to expose the
+	/// <see cref="AopAlliance.Intercept.IMethodInvocation"/>, use an
+	/// interceptor to do so.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: ProxyConfig.cs,v 1.13 2007/09/07 01:51:49 markpollack Exp $</version>
+	[Serializable]
+    public class ProxyConfig
+    {
+        #region Fields
+        private bool proxyTargetType;
+	    private bool proxyTargetAttributes = true;
+		private bool optimize;
+		private bool frozen;
+
+	    private IAopProxyFactory aopProxyFactory =
+	        ObjectUtils.InstantiateType( typeof(ProxyConfig).Assembly, "Spring.Aop.Framework.DynamicProxy.CachedAopProxyFactory") as IAopProxyFactory;
+		private bool exposeProxy;
+        private object syncRoot = new object();
+        #endregion
+
+        #region Properites
+
+        /// <summary>
+        /// Use to synchronize access to this ProxyConfig instance
+        /// </summary>
+	    public object SyncRoot
+	    {
+            get { return syncRoot; }
+	    }
+
+		/// <summary>
+		/// Is the target <see cref="System.Type"/> to be proxied in addition
+		/// to any interfaces declared on the proxied <see cref="System.Type"/>?
+		/// </summary>
+		public virtual bool ProxyTargetType
+		{
+			get { return this.proxyTargetType; }
+			set { this.proxyTargetType = value; }
+		}
+
+        /// <summary>
+        /// Is target type attributes, method attributes, method's return type attributes 
+        /// and method's parameter attributes to be proxied in addition
+        /// to any interfaces declared on the proxied <see cref="System.Type"/>?
+        /// </summary>
+        public virtual bool ProxyTargetAttributes
+        {
+            get { return this.proxyTargetAttributes; }
+            set { this.proxyTargetAttributes = value; }
+        }
+
+		/// <summary>
+		/// Are any <i>agressive optimizations</i> to be performed?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The exact meaning of <i>agressive optimizations</i> will differ
+		/// between proxies, but there is usually some tradeoff.
+		/// </p>
+		/// <p>
+		/// For example, optimization will usually mean that advice changes
+		/// won't take effect after a proxy has been created. For this reason,
+		/// optimization is disabled by default. An optimize value of
+		/// <see langword="true"/> may be ignored if other settings preclude
+		/// optimization: for example, if the
+		/// <see cref="Spring.Aop.Framework.ProxyConfig.ExposeProxy"/> property
+		/// is set to <see langword="true"/> and such a value is not compatible
+		/// with the optimization.
+		/// </p>
+		/// <p>
+		/// The default is <see langword="false"/>.
+		/// </p>
+		/// </remarks>
+		public virtual bool Optimize
+		{
+			get { return this.optimize; }
+			set { this.optimize = value; }
+		}
+
+		/// <summary>
+		/// Should proxies obtained from this configuration expose
+		/// the AOP proxy to the
+		/// <see cref="Spring.Aop.Framework.AopContext"/> class?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The default is <see langword="false"/>, as enabling this property
+		/// may impair performance.
+		/// </p>
+		/// </remarks>
+		public bool ExposeProxy
+		{
+			get { return this.exposeProxy; }
+			set { this.exposeProxy = value; }
+		}
+
+		/// <summary>
+		/// Gets and set the factory to be used to create AOP proxies.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This obviously allows one to customise the
+		/// <see cref="Spring.Aop.Framework.IAopProxyFactory"/> implementation,
+		/// allowing different strategies to be dropped in without changing the
+		/// core framework. For example, an
+		/// <see cref="Spring.Aop.Framework.IAopProxyFactory"/> implementation
+		/// could return an <see cref="Spring.Aop.Framework.IAopProxy"/>
+		/// using remoting proxies, <c>Reflection.Emit</c> or a code generation
+		/// strategy. 
+		/// </p>
+		/// </remarks>
+		public virtual IAopProxyFactory AopProxyFactory
+		{
+			get { return this.aopProxyFactory; }
+			set { this.aopProxyFactory = value; }
+		}
+
+		/// <summary>
+		/// Is this configuration frozen?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The default is not frozen.
+		/// </p>
+		/// </remarks>
+		public virtual bool IsFrozen
+		{
+			get { return frozen; }
+			set { this.frozen = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+		/// Copies the configuration from the supplied
+		/// <paramref name="otherConfiguration"/> into this instance.
+		/// </summary>
+		/// <param name="otherConfiguration">
+		/// The configuration to be copied.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="otherConfiguration"/> is
+		/// <see langword="null"/>.
+		/// </exception>
+		public virtual void CopyFrom(ProxyConfig otherConfiguration)
+		{
+			AssertUtils.ArgumentNotNull(otherConfiguration, "otherConfiguration");
+
+			this.optimize = otherConfiguration.optimize;
+			this.proxyTargetType = otherConfiguration.proxyTargetType;
+            this.proxyTargetAttributes = otherConfiguration.proxyTargetAttributes;
+			this.exposeProxy = otherConfiguration.exposeProxy;
+			this.frozen = otherConfiguration.frozen;
+			this.aopProxyFactory = otherConfiguration.aopProxyFactory;
+		}
+
+		/// <summary>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="Spring.Aop.Framework.ProxyConfig"/> configuration.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="Spring.Aop.Framework.ProxyConfig"/> configuration.
+		/// </returns>
+		public override string ToString()
+		{
+			StringBuilder buffer = new StringBuilder();
+            buffer.Append("proxyTargetType=" + ProxyTargetType + "; ");
+            buffer.Append("proxyTargetAttributes=" + ProxyTargetAttributes + "; ");
+			buffer.Append("exposeProxy=" + ExposeProxy + "; ");
+			buffer.Append("isFrozen=" + IsFrozen + "; ");
+			buffer.Append("optimize=" + Optimize + "; ");
+			buffer.Append("aopProxyFactory=" + AopProxyFactory.GetType().FullName + "; ");
+			return buffer.ToString();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/ProxyFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/ProxyFactory.cs
new file mode 100644
index 00000000..e562143a
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/ProxyFactory.cs
@@ -0,0 +1,129 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Factory for AOP proxies for programmatic use, rather than via a
+	/// Spring.NET IoC container.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This class provides a simple way of obtaining and configuring AOP
+	/// proxies in code.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: ProxyFactory.cs,v 1.8 2007/03/16 04:01:19 aseovic Exp $</version>
+	[Serializable]
+    public class ProxyFactory : AdvisedSupport
+	{
+		/// <summary>
+		/// Creates a new instance of the <see cref="Spring.Aop.Framework.ProxyFactory"/>
+		/// class.
+		/// </summary>
+		public ProxyFactory()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="Spring.Aop.Framework.ProxyFactory"/>
+		/// class that proxys all of the interfaces exposed by the supplied
+		/// <paramref name="target"/>.
+		/// </summary>
+		/// <param name="target">The object to proxy.</param>
+		/// <exception cref="AopConfigException">
+		/// If the <paramref name="target"/> is <cref lang="null"/>.
+		/// </exception>
+		public ProxyFactory(object target) : base(GetInterfaces(target))
+		{
+		    Target = target;
+		}
+
+	    /// <summary>
+	    /// Creates a new instance of the <see cref="Spring.Aop.Framework.ProxyFactory"/>
+	    /// class that has no target object, only interfaces.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// Interceptors must be added if this factory is to do anything useful.
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="interfaces">The interfaces to implement.</param>
+	    public ProxyFactory(Type[] interfaces) : base(interfaces) {}
+
+	    /// <summary>
+	    /// Creates a new proxy according to the settings in this factory.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// Can be called repeatedly; the effect of repeated invocations will
+	    /// (of course) vary if interfaces have been added or removed.
+	    /// </p>
+	    /// </remarks>
+	    /// <returns>An AOP proxy for target object.</returns>
+	    public virtual object GetProxy()
+	    {
+	        IAopProxy proxy = CreateAopProxy();
+	        return proxy.GetProxy();
+	    }
+
+        #region Convenience Methods (Static) For Proxy Creation
+
+	    /// <summary>
+	    /// Creates a new proxy for the supplied <paramref name="proxyInterface"/>
+	    /// and <paramref name="interceptor"/>.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// This is a convenience method for creating a proxy for a single
+	    /// interceptor.
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="proxyInterface">
+	    /// The interface that the proxy must implement.
+	    /// </param>
+	    /// <param name="interceptor">
+	    /// The interceptor that the proxy must invoke.
+	    /// </param>
+	    /// <returns>
+	    /// A new AOP proxy for the supplied <paramref name="proxyInterface"/>
+	    /// and <paramref name="interceptor"/>.
+	    /// </returns>
+	    public static object GetProxy(Type proxyInterface, IInterceptor interceptor)
+	    {
+	        ProxyFactory proxyFactory = new ProxyFactory();
+	        proxyFactory.AddInterface(proxyInterface);
+	        proxyFactory.AddAdvice(interceptor);
+	        return proxyFactory.GetProxy();
+	    }
+
+	    #endregion
+
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/ProxyFactoryObject.cs b/src/Spring/Spring.Aop/Aop/Framework/ProxyFactoryObject.cs
new file mode 100644
index 00000000..a45de17a
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/ProxyFactoryObject.cs
@@ -0,0 +1,918 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using AopAlliance.Aop;
+using AopAlliance.Intercept;
+using Common.Logging;
+using Spring.Aop.Framework.Adapter;
+using Spring.Aop.Support;
+using Spring.Aop.Target;
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Objects.Factory;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// <see cref="Spring.Objects.Factory.IFactoryObject"/> implementation to
+	/// source AOP proxies from a Spring.NET IoC container (an
+	/// <see cref="Spring.Objects.Factory.IObjectFactory"/>).
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// <see cref="AopAlliance.Intercept.IInterceptor"/>s and
+	/// <see cref="Spring.Aop.IAdvisor"/>s are identified by a list of object
+	/// names in the current container.</p>
+	/// <p>
+	/// Global interceptors and advisors can be added at the factory level
+	/// (that is, outside the context of a
+	/// <see cref="Spring.Aop.Framework.ProxyFactoryObject"/> definition). The
+	/// specified interceptors and advisors are expanded in an interceptor list
+	/// (see
+	/// <see cref="Spring.Aop.Framework.ProxyFactoryObject.InterceptorNames"/>)
+	/// where an <c>'xxx*'</c> wildcard-style entry is included in the list,
+	/// matching the given prefix with the object names. For example,
+	/// <c>'global*'</c> would match both <c>'globalObject1'</c> and
+	/// <c>'globalObjectBar'</c>, and <c>'*'</c> would match all defined
+	/// interceptors. The matching interceptors get applied according to their
+	/// returned order value, if they implement the
+	/// <see cref="Spring.Core.IOrdered"/> interface. An interceptor name list
+	/// may not conclude with a global <c>'xxx*'</c> pattern, as global
+	/// interceptors cannot invoke targets.
+	/// </p>
+	/// <p>
+	/// It is possible to cast a proxy obtained from this factory to an
+	/// <see cref="Spring.Aop.Framework.IAdvised"/> reference, or to obtain the
+	/// <see cref="Spring.Aop.Framework.ProxyFactoryObject"/> reference and
+	/// programmatically manipulate it. This won't work for existing prototype
+	/// references, which are independent... however, it will work for prototypes
+	/// subsequently obtained from the factory. Changes to interception will
+	/// work immediately on singletons (including existing references).
+	/// However, to change interfaces or the target it is necessary to obtain a
+	/// new instance from the surrounding container. This means that singleton
+	/// instances obtained from the factory do not have the same object
+	/// identity... however, they do have the same interceptors and target, and
+	/// changing any reference will change all objects.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Federico Spinazzi (.NET)</author>
+	/// <author>Choy Rim (.NET)</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: ProxyFactoryObject.cs,v 1.26 2007/08/03 14:38:30 markpollack Exp $</version>
+	/// <seealso cref="Spring.Aop.Framework.ProxyFactoryObject.InterceptorNames"/>
+	/// <seealso cref="Spring.Aop.Framework.ProxyFactoryObject.ProxyInterfaces"/>
+	/// <seealso cref="AopAlliance.Intercept.IMethodInterceptor"/>
+	/// <seealso cref="Spring.Aop.IAdvisor"/>
+	/// <seealso cref="Spring.Aop.Target.SingletonTargetSource"/>
+    [Serializable]
+    public class ProxyFactoryObject
+		: AdvisedSupport, IFactoryObject, IObjectFactoryAware, IAdvisedSupportListener
+	{
+		#region Fields
+
+		/// <summary>
+		/// The shared <see cref="Common.Logging.ILog"/> instance for this class.
+		/// </summary>
+		private static readonly ILog logger = LogManager.GetLogger(typeof (ProxyFactoryObject));
+
+	    /// <summary>
+		/// Is the object managed by this factory a singleton or a prototype?
+		/// </summary>
+		private bool singleton = true;
+
+	    /// <summary>
+	    /// This suffix in a value in an interceptor list indicates to expand globals.
+	    /// </summary>
+	    public const string GlobalInterceptorSuffix = "*";
+
+	    /// <summary>
+		/// The cached instance if this proxy factory object is a singleton.
+		/// </summary>
+		private object singletonInstance;
+
+		/// <summary>
+		/// The owning object factory (which cannot be changed after this object is initialized).
+		/// </summary>
+		private IObjectFactory objectFactory;
+
+		/// <summary> 
+		/// The mapping from an <see cref="Spring.Aop.IPointcut"/> or interceptor
+		/// to an object name (or <see lang="null"/>), depending on where it was
+		/// sourced from.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If it's sourced from object name, it will need to be
+		/// refreshed each time a new prototype instance is created.
+		/// </p>
+		/// </remarks>
+		private IDictionary sourceDictionary = new Hashtable();
+
+		/// <summary>
+		/// Names of interceptors and pointcut objects in the factory.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Default is for globals expansion only.
+		/// </p>
+		/// </remarks>
+		private string[] interceptorNames = null;
+
+		/// <summary>
+		/// Names of introductions and pointcut objects in the factory.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Default is for globals expansion only.
+		/// </p>
+		/// </remarks>
+		private string[] introductionNames = null;
+
+		/// <summary>
+		/// The name of the target object(in the enclosing
+		/// <see cref="Spring.Objects.Factory.IObjectFactory"/>).
+		/// </summary>
+		private string targetName = null;
+
+		#endregion
+
+        #region Properties
+
+        /// <summary>
+		/// Sets the names of the interfaces that are to be implemented by the proxy.
+		/// </summary>
+		/// <value>
+		/// The names of the interfaces that are to be implemented by the proxy.
+		/// </value>
+		/// <exception cref="Spring.Aop.Framework.AopConfigException">
+		/// If the supplied value (or any of its elements) is <see langword="null"/>;
+		/// or if any of the element values is not the (assembly qualified) name of
+		/// an interface type.
+		/// </exception>
+		public virtual string[] ProxyInterfaces
+		{
+            set
+            {
+                try
+                {
+                    Interfaces = TypeResolutionUtils.ResolveInterfaceArray(value);
+                }
+                catch (Exception ex)
+                {
+                    throw new AopConfigException("Bad value passed to the ProxyInterfaces property (see inner exception).", ex);
+                }
+            }
+		}
+
+		/// <summary>
+		/// Sets the name of the target object being proxied.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Only works when the
+		/// <see cref="Spring.Aop.Framework.ProxyFactoryObject.ObjectFactory"/>
+		/// property is set; it is a logic error on the part of the programmer
+		/// if this value is set and the accompanying
+		/// <see cref="Spring.Objects.Factory.IObjectFactory"/> is not also set.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The name of the target object being proxied.
+		/// </value>
+		public virtual string TargetName
+		{
+			set { this.targetName = value; }
+		}
+
+		/// <summary> 
+		/// Sets the list of <see cref="AopAlliance.Intercept.IMethodInterceptor"/> and
+		/// <see cref="Spring.Aop.IAdvisor"/> object names.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This property must always be set (configured) when using a
+		/// <see cref="Spring.Aop.Framework.ProxyFactoryObject"/> in an
+		/// <see cref="Spring.Objects.Factory.IObjectFactory"/> context.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The list of <see cref="AopAlliance.Intercept.IMethodInterceptor"/> and
+		/// <see cref="Spring.Aop.IAdvisor"/> object names.
+		/// </value>
+		/// <seealso cref="AopAlliance.Intercept.IInterceptor"/>
+		/// <seealso cref="Spring.Aop.IAdvisor"/>
+		/// <seealso cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// <seealso cref="Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/>
+		public virtual string[] InterceptorNames
+		{
+			set { this.interceptorNames = value; }
+		}
+
+		/// <summary> 
+		/// Sets the list of introduction object names. 
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Only works when the
+		/// <see cref="Spring.Aop.Framework.ProxyFactoryObject.ObjectFactory"/>
+		/// property is set; it is a logic error on the part of the programmer
+		/// if this value is set and the accompanying
+		/// <see cref="Spring.Objects.Factory.IObjectFactory"/> is not supplied.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The list of introduction object names. .
+		/// </value>
+		public virtual string[] IntroductionNames
+		{
+			set { this.introductionNames = value; }
+        }
+
+        #endregion
+
+        #region IFactoryObjectAware implementation
+
+        /// <summary>
+		/// Callback that supplies the owning factory to an object instance.
+		/// </summary>
+		/// <value>
+		/// Owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// (may not be <see langword="null"/>). The object can immediately
+		/// call methods on the factory.
+		/// </value>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In case of initialization errors.
+		/// </exception>
+		/// <seealso cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// <seealso cref="Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/>
+		public virtual IObjectFactory ObjectFactory
+		{
+			set
+			{
+				this.objectFactory = value;
+
+				#region Instrumentation
+
+				if (logger.IsDebugEnabled)
+				{
+					logger.Debug("Setting IObjectFactory. Will configure target, interceptors and introductions...");
+				}
+
+				#endregion
+
+				ConfigureAdvisorChain();
+				ConfigureIntroductions();
+
+				#region Instrumentation
+
+				if (logger.IsDebugEnabled)
+				{
+					logger.Debug("ProxyFactoryObject config: " + this);
+				}
+
+				#endregion
+
+				if (IsSingleton)
+				{
+					if (this.targetName != null)
+					{
+						TargetSource = NamedObjectToTargetSource(this.objectFactory.GetObject(this.targetName));
+					}
+
+					// eagerly initialize the shared singleton instance...
+					this.singletonInstance = CreateAopProxy().GetProxy();
+
+					// must listen to superclass advice and interface change
+					// events to recache singleton instance if necessary...
+					AddListener(this);
+				}
+			}
+        }
+
+        #endregion
+
+        #region IFactoryObject implementation
+
+        /// <summary> 
+		/// Creates an instance of the AOP proxy to be returned by this factory
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Invoked when clients obtain objects from this factory object. The
+		/// (proxy) instance will be cached for a singleton, and created on each
+		/// call to <see cref="Spring.Aop.Framework.ProxyFactoryObject.GetObject"/>
+		/// for a prototype.
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// A fresh AOP proxy reflecting the current state of this factory.
+		/// </returns>
+		/// <seealso cref="Spring.Objects.Factory.IFactoryObject.GetObject()"/>
+		public virtual object GetObject()
+		{
+		    lock(this.SyncRoot)
+		    {
+		        return (this.IsSingleton ? GetSingletonInstance() : NewPrototypeInstance());
+		    }
+		}
+
+		/// <summary>
+		/// Return the <see cref="System.Type"/> of the proxy. 
+		/// </summary>
+		/// <remarks>
+		/// Will check the singleton instance if already created, 
+		/// else fall back to the proxy interface (if a single one),
+		/// the target bean type, or the TargetSource's target class.
+		/// </remarks>
+		/// Return the <see cref="System.Type"/> of object that this
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/> creates, or
+		/// <see langword="null"/> if not known in advance.
+		public virtual Type ObjectType
+		{
+			get 
+			{ 
+				if (this.singletonInstance != null) 
+				{
+					return this.singletonInstance.GetType();
+				}
+				else if (Interfaces.Length == 1) 
+				{
+					return Interfaces[0];
+				}
+				else if (this.targetName != null && this.objectFactory != null) 
+				{
+					return this.objectFactory.GetType(this.targetName);
+				}
+				else 
+				{
+					return TargetSource.TargetType;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Is the object managed by this factory a singleton or a prototype?
+		/// </summary>
+		public virtual bool IsSingleton
+		{
+			get { return this.singleton; }
+			set { this.singleton = value; }
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private object NewPrototypeInstance()
+		{
+			RefreshAdvisorChain();
+			RefreshTarget();
+			RefreshIntroductions();
+
+			// in the case of a prototype, we need to give the proxy
+			// an independent instance of the configuration...
+
+			#region Instrumentation
+
+			if (logger.IsDebugEnabled)
+			{
+				logger.Debug("Creating copy of prototype ProxyFactoryObject config: " + this);
+			}
+
+			#endregion
+
+			AdvisedSupport copy = new AdvisedSupport();
+			copy.CopyConfigurationFrom(this);
+
+			#region Instrumentation
+
+			if (logger.IsDebugEnabled)
+			{
+				logger.Debug("Copy has config: " + copy);
+			}
+
+			#endregion
+
+			object generatedProxy = copy.CreateAopProxy().GetProxy();
+		    this.ProxyType = copy.ProxyType;
+		    this.ProxyConstructor = copy.ProxyConstructor;
+		    return generatedProxy;
+		}
+
+		/// <summary>Create the advisor (interceptor) chain.</summary>
+		/// <remarks>
+		/// The advisors that are sourced from an ObjectFactory will be refreshed each time
+		/// a new prototype instance is added. Interceptors added programmatically through 
+		/// the factory API are unaffected by such changes.
+		/// </remarks>
+		private void ConfigureAdvisorChain()
+		{
+			if (this.interceptorNames == null || this.interceptorNames.Length == 0)
+			{
+				return;
+			}
+
+			// materialize interceptor chain from object names...
+			for (int i = 0; i < this.interceptorNames.Length; ++i)
+			{
+				string name = this.interceptorNames[i];
+
+				if(name == null) 
+				{
+					throw new AopConfigException("Found null interceptor name value in the InterceptorNames list; check your configuration.");
+				}
+
+				#region Instrumentation
+
+				if (logger.IsDebugEnabled)
+				{
+					logger.Debug("Configuring interceptor '" + name + "'");
+				}
+
+				#endregion
+
+				if (name.EndsWith(GlobalInterceptorSuffix))
+				{
+					IListableObjectFactory lof = this.objectFactory as IListableObjectFactory;
+					if (lof == null)
+					{
+						// TODO : test this...
+						throw new AopConfigException(
+							"Can only use global advisors or interceptors in conjunction with an IListableObjectFactory.");
+					}
+					else
+					{
+						AddGlobalAdvisor((IListableObjectFactory) this.objectFactory,
+						                 name.Substring(0, (name.Length - GlobalInterceptorSuffix.Length)));
+						continue;
+					}
+				}
+                
+				else if (i == this.interceptorNames.Length - 1 &&
+					this.targetName == null &&
+					this.m_targetSource == EmptyTargetSource.Empty)
+				{
+					// the last name in the chain may be an IAdvisor/IAdvice or a target/ITargetSource;
+					// unfortunately we don't know; we must look at type of the object...
+					if (!IsNamedObjectAnAdvisorOrAdvice(name))
+					{
+						this.targetName = name;
+						continue;
+					}
+				}
+                
+				object advice = null;
+				if(this.IsSingleton ||
+					this.objectFactory.IsSingleton(name)) 
+				{
+					advice = this.objectFactory.GetObject(name);
+				}
+				else
+				{
+					advice = this.objectFactory.GetObject(name);
+				}
+                if (advice is IAdvisors)
+                {
+                    IAdvisors advisors = (IAdvisors)advice;
+                    foreach (object advisor in advisors.Advisors)
+                    {
+                        AddAdvisor(advisor, name);
+                    }
+                }
+                else
+                {
+                    AddAdvisor(advice, name);
+                }
+			}
+		}
+
+        
+		private bool IsNamedObjectAnAdvisorOrAdvice(string name)
+		{
+			Type namedObjectType = this.objectFactory.GetType(name);
+			if (namedObjectType != null)
+			{
+				return typeof(IAdvisors).IsAssignableFrom(namedObjectType)
+                    || typeof(IAdvisor).IsAssignableFrom(namedObjectType)
+                    || typeof(IAdvice).IsAssignableFrom(namedObjectType);
+			}
+			// treat it as an IAdvisor if we can't tell...
+			return true;
+		}
+        
+
+		/// <summary>
+		/// Configures introductions for this proxy.
+		/// </summary>
+		private void ConfigureIntroductions()
+		{
+			if (this.introductionNames == null || this.introductionNames.Length == 0)
+			{
+				return;
+			}
+
+			// Materialize introductions from object names...
+			for (int i = 0; i < this.introductionNames.Length; ++i)
+			{
+				string name = this.introductionNames[i];
+
+				#region Instrumentation
+
+				if (logger.IsDebugEnabled)
+				{
+					logger.Debug("Configuring introduction '" + name + "'");
+				}
+
+				#endregion
+
+				if (name.EndsWith(GlobalInterceptorSuffix))
+				{
+					if (!(this.objectFactory is IListableObjectFactory))
+					{
+						throw new AopConfigException("Can only use global introductions with a ListableObjectFactory");
+					}
+					else
+					{
+						AddGlobalIntroduction((IListableObjectFactory) this.objectFactory,
+						                      name.Substring(0, (name.Length - GlobalInterceptorSuffix.Length)));
+					}
+				}
+				else
+				{
+					// add a named introduction
+					object introduction = this.objectFactory.GetObject(this.introductionNames[i]);
+					AddIntroduction(introduction, this.introductionNames[i]);
+				}
+			}
+		}
+
+		/// <summary> Add all global interceptors and pointcuts.</summary>
+		private void AddGlobalAdvisor(IListableObjectFactory objectFactory, string prefix)
+		{
+            string[] globalAspectNames =
+                ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(objectFactory, typeof(IAdvisors));
+            string[] globalAdvisorNames =
+				ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(objectFactory, typeof(IAdvisor));
+			string[] globalInterceptorNames =
+				ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(objectFactory, typeof(IInterceptor));
+            IList objects = new ArrayList();
+			IDictionary names = new Hashtable();
+
+            for (int i = 0; i < globalAspectNames.Length; i++)
+            {
+                string name = globalAspectNames[i];
+                if (name.StartsWith(prefix))
+                {
+                    IAdvisors advisors = (IAdvisors) objectFactory.GetObject(name);
+                    foreach (object advisor in advisors.Advisors)
+                    {
+                        // exclude introduction advisors from interceptor list
+                        if (!(advisor is IIntroductionAdvisor))
+                        {
+                            objects.Add(advisor);
+                            names[advisor] = name;
+                        }
+                    }
+                }
+            }
+            for (int i = 0; i < globalAdvisorNames.Length; i++)
+			{
+				string name = globalAdvisorNames[i];
+				if (name.StartsWith(prefix))
+				{
+					object obj = objectFactory.GetObject(name);
+					// exclude introduction advisors from interceptor list
+					if (!(obj is IIntroductionAdvisor))
+					{
+						objects.Add(obj);
+						names[obj] = name;
+					}
+				}
+			}
+			for (int i = 0; i < globalInterceptorNames.Length; i++)
+			{
+				string name = globalInterceptorNames[i];
+				if (name.StartsWith(prefix))
+				{
+					object obj = objectFactory.GetObject(name);
+					objects.Add(obj);
+					names[obj] = name;
+				}
+			}
+			((ArrayList) objects).Sort(new OrderComparator());
+			foreach (object obj in objects)
+			{
+				string name = (string) names[obj];
+				AddAdvisor(obj, name);
+			}
+		}
+
+		/// <summary> Add all global introductions.</summary>
+		private void AddGlobalIntroduction(IListableObjectFactory objectFactory, string prefix)
+		{
+            string[] globalAspectNames =
+                ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(objectFactory, typeof(IAdvisors));
+            string[] globalAdvisorNames =
+				ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(objectFactory, typeof (IAdvisor));
+			string[] globalIntroductionNames =
+				ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(objectFactory, typeof (IAdvice));
+			IList objects = new ArrayList();
+			IDictionary names = new Hashtable();
+
+            for (int i = 0; i < globalAspectNames.Length; i++)
+            {
+                string name = globalAspectNames[i];
+                if (name.StartsWith(prefix))
+                {
+                    IAdvisors advisors = (IAdvisors)objectFactory.GetObject(name);
+                    foreach (object advisor in advisors.Advisors)
+                    {
+                        // only include introduction advisors
+                        if (advisor is IIntroductionAdvisor)
+                        {
+                            objects.Add(advisor);
+                            names[advisor] = name;
+                        }
+                    }
+                }
+            }
+            for (int i = 0; i < globalAdvisorNames.Length; i++)
+			{
+				string name = globalAdvisorNames[i];
+				if (name.StartsWith(prefix))
+				{
+					object obj = objectFactory.GetObject(name);
+					// only include introduction advisors
+					if (obj is IIntroductionAdvisor)
+					{
+						objects.Add(obj);
+						names[obj] = name;
+					}
+				}
+			}
+			for (int i = 0; i < globalIntroductionNames.Length; i++)
+			{
+				string name = globalIntroductionNames[i];
+				if (name.StartsWith(prefix))
+				{
+					object obj = objectFactory.GetObject(name);
+					// exclude other advice types
+					if (!(obj is IInterceptor || obj is IBeforeAdvice || obj is IAfterReturningAdvice))
+					{
+						objects.Add(obj);
+						names[obj] = name;
+					}
+				}
+			}
+			((ArrayList) objects).Sort(new OrderComparator());
+			foreach (object obj in objects)
+			{
+				string name = (string) names[obj];
+				AddIntroduction(obj, name);
+			}
+		}
+
+		/// <summary> Add the given interceptor or pointcut to the interceptor list.</summary>
+		/// <param name="next">interceptor or pointcut to add</param>
+		/// <param name="name">object name from which we obtained this object in our owning object factory</param>
+		private void AddAdvisor(object next, string name)
+		{
+			#region Instrumentation
+
+			if (logger.IsDebugEnabled)
+			{
+				logger.Debug("Adding advisor with name '" + name + "'.");
+			}
+
+			#endregion
+
+			IAdvisor advisor = NamedObjectToAdvisor(next);
+			AddAdvisor(advisor);
+
+			// Record the pointcut as descended from the given object name.
+			// This allows us to refresh the interceptor list, which we'll need to
+			// do if we have to create a new prototype instance. Otherwise the new
+			// prototype instance wouldn't be truly independent, because it might
+			// reference the original instances of prototype interceptors.
+			this.sourceDictionary[advisor] = name;
+		}
+
+		/// <summary>Add the introduction to the introduction list.</summary>
+		/// <remarks>
+		/// If specified parameter is IIntroducionAdvisor it is added directly, otherwise it is wrapped
+		/// with DefaultIntroductionAdvisor first.
+		/// </remarks>
+		/// <param name="introduction">introducion to add</param>
+		/// <param name="name">object name from which we obtained this object in our owning object factory</param>
+		private void AddIntroduction(object introduction, string name)
+		{
+			logger.Debug("Adding introduction with name [" + name + "]");
+			IIntroductionAdvisor advisor = NamedObjectToIntroduction(introduction);
+			AddIntroduction(advisor);
+
+			// Record the introduction as descended from the given object name.
+			// This allows us to refresh the introduction list, which we'll need to
+			// do if we have to create a new prototype instance. Otherwise the new
+			// prototype instance wouldn't be truly independent, because it might
+			// reference the original instances of prototype introductions.
+			this.sourceDictionary[advisor] = name;
+		}
+
+		/// <summary> Refresh named objects from the interceptor chain.
+		/// We need to do this every time a new prototype instance is returned,
+		/// to return distinct instances of prototype interfaces and pointcuts.
+		/// </summary>
+		private void RefreshAdvisorChain()
+		{
+			IAdvisor[] advisors = Advisors;
+			for (int i = 0; i < advisors.Length; ++i)
+			{
+				string objectName = (string) this.sourceDictionary[advisors[i]];
+				if (objectName != null)
+				{
+					#region Instrumentation
+
+					if (logger.IsDebugEnabled)
+					{
+						logger.Debug("Refreshing object named '" + objectName + "'");
+					}
+
+					#endregion
+
+					IAdvisor refreshedAdvisor
+						= NamedObjectToAdvisor(this.objectFactory.GetObject(objectName));
+					ReplaceAdvisor(advisors[i], refreshedAdvisor);
+					this.sourceDictionary.Remove(advisors[i]);
+					// keep name mapping up to date...
+					this.sourceDictionary[refreshedAdvisor] = objectName;
+				}
+				else
+				{
+					// We can't throw an exception here, as the user may have added additional
+					// pointcuts programmatically we don't know about
+					logger.Info(
+						"Cannot find object name for Advisor [" + advisors[i] + "] when refreshing advisor chain");
+				}
+			}
+		}
+
+		/// <summary>
+		/// Refreshes target object for prototype instances.
+		/// </summary>
+		private void RefreshTarget()
+		{
+			#region Instrumentation
+
+			if (logger.IsDebugEnabled)
+			{
+				logger.Debug("Refreshing target with name '" + this.targetName + "'");
+			}
+
+			#endregion
+
+			if (StringUtils.IsNullOrEmpty(this.targetName))
+			{
+				// TODO test...
+				throw new AopConfigException("Target name cannot be null (or composed wholly of whitespace) for prototype factory.");
+			}
+			object target = this.objectFactory.GetObject(this.targetName);
+			TargetSource = NamedObjectToTargetSource(target);
+		}
+
+		/// <summary> Refresh named objects from the interceptor chain.
+		/// We need to do this every time a new prototype instance is returned,
+		/// to return distinct instances of prototype interfaces and pointcuts.
+		/// </summary>
+		private void RefreshIntroductions()
+		{
+			IIntroductionAdvisor[] introductions = Introductions;
+			for (int i = 0; i < introductions.Length; i++)
+			{
+				string objectName = (string) this.sourceDictionary[introductions[i]];
+				if (objectName != null)
+				{
+					logger.Info("Refreshing introduction named '" + objectName + "'");
+					object obj = this.objectFactory.GetObject(objectName);
+					IIntroductionAdvisor refreshedIntroduction = NamedObjectToIntroduction(obj);
+
+					ReplaceIntroduction(i, refreshedIntroduction);
+					this.sourceDictionary.Remove(introductions[i]);
+					this.sourceDictionary[refreshedIntroduction] = objectName;
+				}
+				else
+				{
+					// We can't throw an exception here, as the user may have added additional
+					// introductions programmatically we don't know about
+					logger.Info(
+						"Cannot find object name for Introduction [" + introductions[i] +
+							"] when refreshing introduction list");
+				}
+			}
+		}
+
+		/// <summary>Wraps pointcut or interceptor with appropriate advisor</summary>
+		/// <param name="next">pointcut or interceptor that needs to be wrapped with advisor</param>
+		/// <returns>Advisor</returns>
+		private IAdvisor NamedObjectToAdvisor(object next)
+		{
+			return GlobalAdvisorAdapterRegistry.Instance.Wrap(next);
+		}
+
+		/// <summary>Wraps target with SingletonTargetSource if necessary</summary>
+		/// <param name="target">target or target source object</param>
+		/// <returns>target source passed or target wrapped with SingletonTargetSource</returns>
+		private ITargetSource NamedObjectToTargetSource(object target)
+		{
+			if (target is ITargetSource)
+			{
+				return (ITargetSource) target;
+			}
+			else
+			{
+				// It's an object that needs target source around it.
+				return new SingletonTargetSource(target);
+			}
+		}
+
+		/// <summary>Wraps introduction with IIntroductionAdvisor if necessary</summary>
+		/// <param name="introduction">object to wrap</param>
+		/// <returns>Introduction advisor</returns>
+		private IIntroductionAdvisor NamedObjectToIntroduction(object introduction)
+		{
+			if (introduction is IIntroductionAdvisor)
+			{
+				return (IIntroductionAdvisor) introduction;
+			}
+			else
+			{
+				return new DefaultIntroductionAdvisor((IAdvice) introduction);
+			}
+		}
+
+		private object GetSingletonInstance()
+		{
+			if (this.singletonInstance == null)
+			{
+				this.singletonInstance = CreateAopProxy().GetProxy();
+			}
+			return this.singletonInstance;
+        }
+
+        #endregion
+
+        #region IAdvisedSupportListener implementation
+
+        /// <seealso cref="Spring.Aop.Framework.IAdvisedSupportListener.Activated(Spring.Aop.Framework.AdvisedSupport)">
+		/// </seealso>
+		public virtual void Activated(AdvisedSupport advisedSupport)
+		{
+		}
+
+		/// <summary> No need to do anything when advice change, proxy can handle those changes by itself.</summary>
+		/// <seealso cref="Spring.Aop.Framework.IAdvisedSupportListener.AdviceChanged(Spring.Aop.Framework.AdvisedSupport)">
+		/// </seealso>
+		public virtual void AdviceChanged(AdvisedSupport advisedSupport)
+		{
+		}
+
+		/// <summary>Implementation of listener for AdvisedSupport.InterfacesChanged event</summary>
+		/// <param name="advisedSupport">event source</param>
+		public virtual void InterfacesChanged(AdvisedSupport advisedSupport)
+		{
+			logger.Info("Implemented interfaces have changed; reseting singleton instance");
+			this.singletonInstance = null;
+		    this.ProxyType = null;
+		    this.ProxyConstructor = null;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/ReflectiveMethodInvocation.cs b/src/Spring/Spring.Aop/Aop/Framework/ReflectiveMethodInvocation.cs
new file mode 100644
index 00000000..0901bbc0
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/ReflectiveMethodInvocation.cs
@@ -0,0 +1,131 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+using Spring.Util;
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Invokes a target method using standard reflection.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <author>Rick Evans (.NET)</author>
+    /// <author>Bruno Baia (.NET)</author>
+	/// <version>$Id: ReflectiveMethodInvocation.cs,v 1.18 2008/02/06 18:28:52 bbaia Exp $</version>
+	[Serializable]
+	public class ReflectiveMethodInvocation : AbstractMethodInvocation
+	{
+        /// <summary>
+        /// The method invocation that is to be invoked on the proxy.
+        /// </summary>
+        protected MethodInfo proxyMethod;
+
+		/// <summary>
+		/// Creates a new instance of the
+        /// <see cref="Spring.Aop.Framework.ReflectiveMethodInvocation"/> class.
+		/// </summary>
+        /// <param name="proxy">The AOP proxy.</param>
+		/// <param name="target">The target object.</param>
+		/// <param name="method">The target method proxied.</param>
+        /// <param name="proxyMethod">The method to invoke on proxy.</param>
+		/// <param name="arguments">The target method's arguments.</param>
+		/// <param name="targetType">
+		/// The <see cref="System.Type"/> of the target object.</param>
+		/// <param name="interceptors">
+		/// The list of interceptors that are to be applied. May be
+		/// <cref lang="null"/>.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If any of the <paramref name="target"/> or <paramref name="method"/>
+		/// parameters is <see langword="null"/>.
+		/// </exception>
+        public ReflectiveMethodInvocation(
+            object proxy, object target, MethodInfo method, MethodInfo proxyMethod, 
+            object[] arguments, Type targetType, IList interceptors)
+            : base(proxy, target, method, arguments, targetType, interceptors)
+        {
+            this.proxyMethod = proxyMethod;
+        }
+
+		/// <summary>
+        /// Invokes the joinpoint using standard reflection.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Subclasses can override this to use custom invocation.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// The return value of the invocation of the joinpoint.
+        /// </returns>
+        /// <exception cref="System.Exception">
+        /// If invoking the joinpoint resulted in an exception.
+        /// </exception>
+        /// <see cref="Spring.Aop.Framework.AbstractMethodInvocation.InvokeJoinpoint"/>
+        protected override object InvokeJoinpoint()
+        {
+            try
+            {
+                if (proxyMethod == null)
+                {
+                    return method.Invoke(target, arguments);
+                }
+                else
+                {
+                    return proxyMethod.Invoke(target, arguments);
+                }
+            }
+            catch (TargetInvocationException ex)
+            {
+                throw ReflectionUtils.UnwrapTargetInvocationException(ex);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="Spring.Aop.Framework.ReflectiveMethodInvocation"/> instance 
+        /// from the specified <see cref="AopAlliance.Intercept.IMethodInvocation"/> and  
+        /// increments the interceptor index.
+        /// </summary>
+        /// <param name="invocation">
+        /// The current <see cref="AopAlliance.Intercept.IMethodInvocation"/> instance.
+        /// </param>
+        /// <returns>
+        /// The new <see cref="AopAlliance.Intercept.IMethodInvocation"/> instance to use.
+        /// </returns>
+        protected override IMethodInvocation PrepareMethodInvocationForProceed(IMethodInvocation invocation)
+        {
+            ReflectiveMethodInvocation rmi = new ReflectiveMethodInvocation(
+                this.proxy, this.target, this.method, this.proxyMethod, this.arguments, this.targetType, this.interceptors);
+            rmi.currentInterceptorIndex = this.currentInterceptorIndex + 1;
+
+            return rmi;
+        }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Framework/StaticTargetSourceWrapper.cs b/src/Spring/Spring.Aop/Aop/Framework/StaticTargetSourceWrapper.cs
new file mode 100644
index 00000000..8ee45180
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Framework/StaticTargetSourceWrapper.cs
@@ -0,0 +1,88 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Decorates a target source with the <see cref="System.IDisposable"/>
+	/// interface.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Because the target source is static, the target object can be cached
+	/// and simply returned as is.
+	/// </p>
+	/// </remarks>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: StaticTargetSourceWrapper.cs,v 1.3 2007/03/16 04:01:20 aseovic Exp $</version>
+	[Serializable]
+    public sealed class StaticTargetSourceWrapper : ITargetSourceWrapper
+	{
+		private object target;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Framework.StaticTargetSourceWrapper"/>
+		/// class.
+		/// </summary>
+		/// <param name="targetSource">
+		/// The target object that proxy methods will be delegated to.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="targetSource"/> is
+		/// <see langword="null"/>.
+		/// </exception>
+		internal StaticTargetSourceWrapper(ITargetSource targetSource)
+		{
+			AssertUtils.ArgumentNotNull(targetSource, "targetSource");
+			this.target = targetSource.GetTarget();
+		}
+
+		/// <summary>
+		/// Returns the target object that proxy methods will be delegated to.
+		/// </summary>
+		/// <returns>The target object.</returns>
+		public object GetTarget()
+		{
+			return this.target;
+		}
+
+		/// <summary>
+		/// Performs application-defined tasks associated with freeing,
+		/// releasing, or resetting unmanaged resources.
+		/// </summary>
+		/// <remarks>
+		/// <note type="implementnotes">
+		/// This is a no-op operation in this implementation.
+		/// </note>
+		/// </remarks>
+		public void Dispose()
+		{
+			// do nothing, this is static target source wrapper...
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/IAdvisor.cs b/src/Spring/Spring.Aop/Aop/IAdvisor.cs
new file mode 100644
index 00000000..c28b0294
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/IAdvisor.cs
@@ -0,0 +1,96 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Base interface holding AOP advice and a filter determining the
+	/// applicability of the advice (such as a pointcut).
+	/// </summary>
+	/// <remarks>
+	/// <note>
+	/// This interface is not for use by Spring.NET users, but exists rather to
+	/// allow for commonality in the support for different types of advice
+	/// within the framework.
+	/// </note>
+	/// <p>
+	/// Spring.NET AOP is centered on <b>around advice</b> delivered via method
+	/// <b>interception</b>, compliant with the AOP Alliance interception API. 
+	/// The <see cref="Spring.Aop.IAdvisor"/> interface allows support for
+	/// different types of advice, such as <b>before</b> and <b>after</b>
+	/// advice, which need not be implemented using interception.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <seealso cref="Spring.Aop.IMethodBeforeAdvice"/>
+	/// <seealso cref="Spring.Aop.IAfterReturningAdvice"/>
+	/// <seealso cref="Spring.Aop.IThrowsAdvice"/>
+	/// <seealso cref="AopAlliance.Intercept.IMethodInterceptor"/>
+	/// <version>$Id: IAdvisor.cs,v 1.7 2006/04/09 07:18:36 markpollack Exp $</version>
+	public interface IAdvisor
+	{
+		/// <summary>
+		/// Is this advice associated with a particular instance?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// An advisor that was creating a mixin would be a per instance
+		/// operation and would thus return <see langword="true"/>. If the
+		/// advisor is not per instance, it is shared with all instances of the
+		/// advised class obtained from the same Spring.NET IoC container.
+		/// </p>
+		/// <p>
+		/// Use <c>singleton</c> and <c>prototype</c> object definitions or
+		/// appropriate programmatic proxy creation to ensure that
+		/// <see cref="Spring.Aop.IAdvisor"/>s have the correct lifecycle model. 
+		/// </p>
+		/// <note>
+		/// This method is not currently used by the framework.
+		/// </note>
+		/// </remarks>
+		/// <value>
+		/// <see langword="true"/> if this advice is associated with a
+		/// particular instance.
+		/// </value>
+		bool IsPerInstance { get; }
+
+		/// <summary>
+		/// Return the advice part of this aspect.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// An advice may be an interceptor, a throws advice, before advice,
+		/// introduction etc.
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// The advice that should apply if the pointcut matches.
+		/// </returns>
+		IAdvice Advice { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/IAdvisors.cs b/src/Spring/Spring.Aop/Aop/IAdvisors.cs
new file mode 100644
index 00000000..530f85a8
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/IAdvisors.cs
@@ -0,0 +1,47 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using AopAlliance.Aop;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// AOP Aspect abstraction, holding a list of <see cref="Spring.Aop.IAdvisor"/>s
+	/// </summary>
+    /// <seealso cref="IAdvisor"/>
+    /// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: IAdvisors.cs,v 1.1 2007/08/03 14:38:30 markpollack Exp $</version>
+	public interface IAdvisors
+	{
+        /// <summary>
+        /// Gets or sets a list of advisors.
+        /// </summary>
+        /// <value>
+        /// A list of advisors.
+        /// </value>
+		IList Advisors { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/IAfterReturningAdvice.cs b/src/Spring/Spring.Aop/Aop/IAfterReturningAdvice.cs
new file mode 100644
index 00000000..f2fc9cfd
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/IAfterReturningAdvice.cs
@@ -0,0 +1,78 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using AopAlliance.Aop;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Advice that executes after a method returns <b>successfully</b>.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// <i>After</i> returning advice is invoked only on a normal method
+	/// return, but <b>not</b> if an exception is thrown. Such advice can see
+	/// the return value of the advised method invocation, but cannot change it.
+	/// </p>
+	/// <p>
+	/// Possible uses for this type of advice would include performing access
+	/// control checks on the return value of an advised method invocation, the
+	/// ubiquitous logging of method invocation return values (useful during
+	/// development), etc.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <seealso cref="Spring.Aop.IMethodBeforeAdvice"/>
+	/// <seealso cref="Spring.Aop.IThrowsAdvice"/>
+	/// <seealso cref="AopAlliance.Intercept.IMethodInterceptor"/>
+    /// <version>$Id: IAfterReturningAdvice.cs,v 1.6 2006/04/09 07:18:36 markpollack Exp $</version>
+	public interface IAfterReturningAdvice : IAdvice
+	{
+		/// <summary>
+		/// Executes after <paramref name="target"/> <paramref name="method"/>
+		/// returns <b>successfully</b>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Note that the supplied <paramref name="returnValue"/> <b>cannot</b>
+		/// be changed by this type of advice... use the around advice type
+		/// (<see cref="AopAlliance.Intercept.IMethodInterceptor"/>) if you
+		/// need to change the return value of an advised method invocation.
+		/// The data encapsulated by the supplied <paramref name="returnValue"/>
+		/// can of course be modified though.
+		/// </p>
+		/// </remarks>
+		/// <param name="returnValue">
+		/// The value returned by the <paramref name="target"/>.
+		/// </param>
+		/// <param name="method">The intecepted method.</param>
+		/// <param name="args">The intercepted method's arguments.</param>
+		/// <param name="target">The target object.</param>
+		/// <seealso cref="AopAlliance.Intercept.IMethodInterceptor.Invoke"/>
+		void AfterReturning(object returnValue, MethodInfo method, object[] args, object target);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/IBeforeAdvice.cs b/src/Spring/Spring.Aop/Aop/IBeforeAdvice.cs
new file mode 100644
index 00000000..70d84389
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/IBeforeAdvice.cs
@@ -0,0 +1,55 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Superinterface for all before advice.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// <i>Before</i> advice is advice that executes before a joinpoint, but
+	/// which does not have the ability to prevent execution flow proceeding to
+	/// the joinpoint (unless it throws an <see cref="System.Exception"/>).
+	/// </p>
+	/// <p>
+	/// Spring.NET only supports <i>method</i> before advice. Although this
+	/// is unlikely to change, this API is designed to allow <i>field</i>
+	/// before advice in future if desired.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <seealso cref="Spring.Aop.IMethodBeforeAdvice"/>
+	/// <seealso cref="Spring.Aop.IAfterReturningAdvice"/>
+	/// <seealso cref="Spring.Aop.IThrowsAdvice"/>
+	/// <seealso cref="AopAlliance.Intercept.IMethodInterceptor"/>
+	/// <version>$Id: IBeforeAdvice.cs,v 1.4 2006/04/09 07:18:36 markpollack Exp $</version>
+	public interface IBeforeAdvice : IAdvice
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/IIntroductionAdvisor.cs b/src/Spring/Spring.Aop/Aop/IIntroductionAdvisor.cs
new file mode 100644
index 00000000..0c238edc
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/IIntroductionAdvisor.cs
@@ -0,0 +1,93 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Superinterface for advisors that perform one or more AOP
+	/// <b>introductions</b>.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This interface cannot be implemented directly; subinterfaces must
+	/// provide the advice type implementing the introduction.
+	/// </p>
+	/// <p>
+	/// Introduction is the implementation of additional interfaces (not
+	/// implemented by a target) via AOP advice.
+	/// </p>
+	/// </remarks>
+	/// <seealso cref="Spring.Aop.IIntroductionInterceptor"/>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: IIntroductionAdvisor.cs,v 1.8 2006/04/09 07:18:36 markpollack Exp $</version>
+	public interface IIntroductionAdvisor : IAdvisor
+	{
+		/// <summary>
+		/// Returns the filter determining which target classes this
+		/// introduction should apply to. 
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is the <see cref="System.Type"/> part of a pointcut.
+		/// Be advised that method matching doesn't make sense in the context
+		/// of introductions.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The filter determining which target classes this introduction
+		/// should apply to. 
+		/// </value>
+		ITypeFilter TypeFilter { get; }
+
+		/// <summary>
+		/// Gets the interfaces introduced by this
+		/// <see cref="Spring.Aop.IAdvisor"/>.
+		/// </summary>
+		/// <value>
+		/// The interfaces introduced by this
+		/// <see cref="Spring.Aop.IAdvisor"/>.
+		/// </value>
+		Type[] Interfaces { get; }
+
+		/// <summary>
+		/// Can the advised interfaces be implemented by the introduction
+		/// advice?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Invoked <b>before</b> adding an
+		/// <seealso cref="Spring.Aop.IIntroductionAdvisor"/>.
+		/// </p>
+		/// </remarks>
+		/// <exception cref="System.ArgumentException">
+		/// If the advised interfaces cannot be implemented by the introduction
+		/// advice.
+		/// </exception>
+		/// <seealso cref="Spring.Aop.IIntroductionAdvisor.Interfaces"/>
+		void ValidateInterfaces();
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/IIntroductionInterceptor.cs b/src/Spring/Spring.Aop/Aop/IIntroductionInterceptor.cs
new file mode 100644
index 00000000..c7d00885
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/IIntroductionInterceptor.cs
@@ -0,0 +1,62 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary> 
+	/// Subinterface of the AOP Alliance
+	/// <see cref="AopAlliance.Intercept.IMethodInterceptor"/> interface that
+	/// allows additional interfaces to be implemented by the interceptor, and
+	/// available via a proxy using that interceptor.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This is a fundamental AOP concept called <b>introduction</b>.
+	/// </p>
+	/// <p>
+	/// Introductions are often <b>mixins</b>, enabling the building of composite
+	/// objects that can achieve many of the goals of multiple inheritance.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: IIntroductionInterceptor.cs,v 1.3 2006/04/09 07:18:36 markpollack Exp $</version>
+	public interface IIntroductionInterceptor : IMethodInterceptor
+	{
+		/// <summary>
+		/// Does this <see cref="Spring.Aop.IIntroductionInterceptor"/>
+		/// implement the given interface?
+		/// </summary>
+		/// <param name="intf">The interface to check.</param>
+		/// <returns>
+		/// <see langword="true"/> if this
+		/// <see cref="Spring.Aop.IIntroductionInterceptor"/>
+		/// implements the given interface.
+		/// </returns>
+		bool ImplementsInterface(Type intf);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/IMethodBeforeAdvice.cs b/src/Spring/Spring.Aop/Aop/IMethodBeforeAdvice.cs
new file mode 100644
index 00000000..171ac9a8
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/IMethodBeforeAdvice.cs
@@ -0,0 +1,73 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Advice executed before a method is invoked.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Such advice cannot prevent the method call proceeding, short of
+	/// throwing an <see cref="System.Exception"/>.
+	/// </p>
+	/// <p>
+	/// The main advantage of <c>before</c> advice is that there is no
+	/// possibility of inadvertently failing to proceed down the interceptor
+	/// chain, since there is no need (and indeed means) to invoke the next
+	/// interceptor in the call chain.
+	/// </p>
+	/// <p>
+	/// Possible uses for this type of advice would include performing class
+	/// invariant checks prior to the actual method invocation, the ubiquitous
+	/// logging of method invocations (useful during development), etc.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <seealso cref="Spring.Aop.IBeforeAdvice"/>
+	/// <seealso cref="Spring.Aop.IAfterReturningAdvice"/>
+	/// <seealso cref="Spring.Aop.IThrowsAdvice"/>
+	/// <seealso cref="AopAlliance.Intercept.IMethodInterceptor"/>
+	/// <version>$Id: IMethodBeforeAdvice.cs,v 1.6 2006/04/09 07:18:36 markpollack Exp $</version>
+	public interface IMethodBeforeAdvice : IBeforeAdvice
+	{
+		/// <summary>
+		/// The callback before a given method is invoked.
+		/// </summary>
+		/// <param name="method">The method being invoked.</param>
+		/// <param name="args">The arguments to the method.</param>
+		/// <param name="target">
+		/// The target of the method invocation. May be <see langword="null"/>.
+		/// </param>
+		/// <exception cref="System.Exception">
+		/// Thrown when and if this object wishes to abort the call. Any
+		/// exception so thrown will be propagated to the caller.
+		/// </exception>
+		void Before(MethodInfo method, object[] args, object target);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/IMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/IMethodMatcher.cs
new file mode 100644
index 00000000..9383073a
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/IMethodMatcher.cs
@@ -0,0 +1,151 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// That part of an <see cref="Spring.Aop.IPointcut"/> that checks whether a
+	/// target method is eligible for advice.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// An <see cref="Spring.Aop.IMethodMatcher"/> may be evaluated
+	/// <b>statically</b> or at runtime (<b>dynamically</b>). Static
+	/// matching involves only the method signature and (possibly) any
+	/// <see cref="System.Attribute"/>s that have been applied to a method.
+	/// Dynamic matching additionally takes into account the actual argument
+	/// values passed to a method invocation.
+	/// </p>
+	/// <p>
+	/// If the value of the <see cref="Spring.Aop.IMethodMatcher.IsRuntime"/>
+	/// property of an implementation instance returns <see langword="false"/>,
+	/// evaluation can be performed statically, and the result will be the same
+	/// for all invocations of this method, whatever their arguments. This
+	/// means that if the value of the
+	/// <see cref="Spring.Aop.IMethodMatcher.IsRuntime"/> is
+	/// <see langword="false"/>, the three argument
+	/// <see cref="Spring.Aop.IMethodMatcher.Matches(MethodInfo, Type, object[])"/>
+	/// method will never be invoked for the lifetime of the
+	/// <see cref="Spring.Aop.IMethodMatcher"/>.
+	/// </p>
+	/// <p>
+	/// If an implementation returns <see langword="true"/> in its two argument
+	/// <see cref="Spring.Aop.IMethodMatcher.Matches(MethodInfo, Type)"/>
+	/// method, and the value of it's
+	/// <see cref="Spring.Aop.IMethodMatcher.IsRuntime"/> property is
+	/// <see langword="true"/>, the three argument
+	/// <see cref="Spring.Aop.IMethodMatcher.Matches(MethodInfo, Type, object[])"/>
+	/// method will be invoked <i>immediately before each and every potential
+	/// execution of the related advice</i>, to decide whether the advice
+	/// should run. All previous advice, such as earlier interceptors in an
+	/// interceptor chain, will have run, so any state changes they have
+	/// produced in parameters or thread local storage, will be available at
+	/// the time of evaluation.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: IMethodMatcher.cs,v 1.9 2006/04/09 07:18:36 markpollack Exp $</version>
+	/// <seealso cref="TrueMethodMatcher"/>
+	public interface IMethodMatcher
+	{
+		/// <summary>
+		/// Is this <see cref="Spring.Aop.IMethodMatcher"/> dynamic?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If <see langword="true"/>, the three argument
+		/// <see cref="Spring.Aop.IMethodMatcher.Matches(MethodInfo, Type, object[])"/>
+		/// method will be invoked if the two argument
+		/// <see cref="Spring.Aop.IMethodMatcher.Matches(MethodInfo, Type)"/>
+		/// method returns <see langword="true"/>.
+		/// </p>
+		/// <p>
+		/// Note that this property can be checked when an AOP proxy is created,
+		/// and implementations need not check the value of this property again
+		/// before each method invocation.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// <see langword="true"/> if this
+		/// <see cref="Spring.Aop.IMethodMatcher"/> is dynamic.
+		/// </value>
+		bool IsRuntime { get; }
+
+		/// <summary>
+		/// Does the supplied <paramref name="method"/> satisfy this matcher?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a static check. If this method invocation returns
+		/// <see langword="false"/>,or if the
+		/// <see cref="Spring.Aop.IMethodMatcher.IsRuntime"/> property is
+		/// <see langword="false"/>, then no runtime check will be made.
+		/// </p>
+		/// </remarks>
+		/// <param name="method">The candidate method.</param>
+		/// <param name="targetType">
+		/// The target <see cref="System.Type"/> (may be <see langword="null"/>,
+		/// in which case the candidate <see cref="System.Type"/> must be taken
+		/// to be the <paramref name="method"/>'s declaring class).
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if this this method matches statically.
+		/// </returns>
+		bool Matches(MethodInfo method, Type targetType);
+
+		/// <summary>
+		/// Is there a runtime (dynamic) match for the supplied
+		/// <paramref name="method"/>?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// In order for this method to have even been invoked, the supplied
+		/// <paramref name="method"/> must have matched
+		/// statically. This method is invoked only if the two argument
+		/// <see cref="Spring.Aop.IMethodMatcher.Matches(MethodInfo, Type)"/>
+		/// method returns <see langword="true"/> for the supplied
+		/// <paramref name="method"/> and <paramref name="targetType"/>, and
+		/// if the <see cref="Spring.Aop.IMethodMatcher.IsRuntime"/> property
+		/// is <see langword="true"/>.
+		/// </p>
+		/// <p>
+		/// Invoked immediately <b>before</b> any potential running of the
+		/// advice, and <b>after</b> any advice earlier in the advice chain has
+		/// run.
+		/// </p>
+		/// </remarks>
+		/// <param name="method">The candidate method.</param>
+		/// <param name="targetType">
+		/// The target <see cref="System.Type"/>.
+		/// </param>
+		/// <param name="args">The arguments to the method</param>
+		/// <returns>
+		/// <see langword="true"/> if there is a runtime match.</returns>
+		bool Matches(MethodInfo method, Type targetType, object[] args);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/IPointcut.cs b/src/Spring/Spring.Aop/Aop/IPointcut.cs
new file mode 100644
index 00000000..362b8550
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/IPointcut.cs
@@ -0,0 +1,61 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Spring.NET's core pointcut abstraction.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// A pointcut is composed of <see cref="Spring.Aop.ITypeFilter"/>s and
+	/// <see cref="Spring.Aop.IMethodMatcher"/>s. Both these basic terms and an
+	/// <see cref="Spring.Aop.IPointcut"/> itself can be combined to build up
+	/// sophisticated combinations.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: IPointcut.cs,v 1.9 2006/04/09 07:18:36 markpollack Exp $</version>
+	public interface IPointcut
+	{
+		/// <summary>
+		/// The <see cref="Spring.Aop.ITypeFilter"/> for this pointcut.
+		/// </summary>
+		/// <value>
+		/// The current <see cref="Spring.Aop.ITypeFilter"/>.
+		/// </value>
+		ITypeFilter TypeFilter { get; }
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.IMethodMatcher"/> for this pointcut.
+		/// </summary>
+		/// <value>
+		/// The current <see cref="Spring.Aop.IMethodMatcher"/>.
+		/// </value>
+		IMethodMatcher MethodMatcher { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/IPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/IPointcutAdvisor.cs
new file mode 100644
index 00000000..13418271
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/IPointcutAdvisor.cs
@@ -0,0 +1,50 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Superinterface for all <see cref="Spring.Aop.IAdvisor"/>s that are
+	/// driven by a pointcut.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This covers nearly all advisors except introduction advisors, for which
+	/// method-level matching does not apply.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <seealso cref="Spring.Aop.IIntroductionAdvisor"/>
+	/// <version>$Id: IPointcutAdvisor.cs,v 1.3 2006/04/09 07:18:36 markpollack Exp $</version>
+	public interface IPointcutAdvisor : IAdvisor
+	{
+		/// <summary>
+		/// The <see cref="Spring.Aop.IPointcut"/> that drives this advisor.
+		/// </summary>
+		IPointcut Pointcut { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/ITargetSource.cs b/src/Spring/Spring.Aop/Aop/ITargetSource.cs
new file mode 100644
index 00000000..2a50f8c8
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/ITargetSource.cs
@@ -0,0 +1,80 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Used to obtain the current "target" of an AOP invocation
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This target will be invoked via reflection if no around advice chooses
+	/// to end the interceptor chain itself.
+	/// </p>
+	/// <p>
+	/// If an <see cref="Spring.Aop.ITargetSource"/> is <c>"static"</c>, it
+	/// will always return the same target, allowing optimizations in the AOP
+	/// framework. Dynamic target sources can support pooling, hot swapping etc.
+	/// </p>
+	/// <p>
+	/// Application developers don't usually need to work with target sources
+	/// directly: this is an AOP framework interface.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: ITargetSource.cs,v 1.9 2007/10/10 18:07:38 markpollack Exp $</version>
+	public interface ITargetSource
+	{
+        /// <summary>
+        /// The <see cref="System.Type"/> of the target object.
+        /// </summary>
+        Type TargetType { get; }
+
+		/// <summary>
+		/// Is the target source static?
+		/// </summary>
+		/// <value>
+		/// <see langword="true"/> if the target source is static.
+		/// </value>
+		bool IsStatic { get; }
+
+		/// <summary>
+		/// Returns the target object.
+		/// </summary>
+		/// <returns>The target object.</returns>
+		/// <exception cref="System.Exception">
+		/// If unable to obtain the target object.
+		/// </exception>
+		object GetTarget();
+
+		/// <summary>
+		/// Releases the target object.
+		/// </summary>
+		/// <param name="target">The target object to release.</param>
+		void ReleaseTarget(object target);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/IThrowsAdvice.cs b/src/Spring/Spring.Aop/Aop/IThrowsAdvice.cs
new file mode 100644
index 00000000..dde6e761
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/IThrowsAdvice.cs
@@ -0,0 +1,61 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary> 
+	/// Simple marker interface for throws advice.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// There are no methods on this interface, as methods are discovered and
+    /// invoked via reflection. Please do see read the API documentation for the
+    /// <see cref="Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor"/> class;
+    /// said documention describes in detail the signature of the methods that
+    /// implementations of the <see cref="Spring.Aop.IThrowsAdvice"/> interface
+    /// must adhere to in the specific case of Spring.NET's implementation of
+    /// throws advice.
+	/// </p>
+	/// <p>
+	/// There are any number of possible uses for this type of advice. Some
+	/// examples would include the ubiquitous logging of any such exceptions,
+	/// monitoring the number and type of exceptions and sending emails to
+	/// a support desk once certain criteria have been met, wrapping generic
+	/// exceptions such as <see cref="System.Data.SqlClient.SqlException"/> in
+	/// exceptions that are more meaningful to your business logic, etc.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <seealso cref="Spring.Aop.IMethodBeforeAdvice"/>
+	/// <seealso cref="Spring.Aop.IAfterReturningAdvice"/>
+	/// <seealso cref="AopAlliance.Intercept.IMethodInterceptor"/>
+	/// <version>$Id: IThrowsAdvice.cs,v 1.5 2006/04/09 07:18:36 markpollack Exp $</version>
+	public interface IThrowsAdvice : IAdvice
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/ITypeFilter.cs b/src/Spring/Spring.Aop/Aop/ITypeFilter.cs
new file mode 100644
index 00000000..6ca69514
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/ITypeFilter.cs
@@ -0,0 +1,59 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// A filter that restricts the matching of a pointcut or introduction to
+	/// a given set of target types.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Can be used as part of a pointcut, or for the entire targeting of an
+	/// introduction.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <seealso cref="Spring.Aop.IPointcut"/>
+	/// <seealso cref="TrueTypeFilter.True"/>
+	/// <version>$Id: ITypeFilter.cs,v 1.2 2006/04/09 07:18:36 markpollack Exp $</version>
+	public interface ITypeFilter
+	{
+		/// <summary>
+		/// Should the pointcut apply to the supplied
+		/// <see cref="System.Type"/>?
+		/// </summary>
+		/// <param name="type">
+		/// The candidate <see cref="System.Type"/>.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if the advice should apply to the supplied
+		/// <paramref name="type"/>
+		/// </returns>
+		bool Matches(Type type);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/AbstractGenericPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/AbstractGenericPointcutAdvisor.cs
new file mode 100644
index 00000000..3b7a1905
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/AbstractGenericPointcutAdvisor.cs
@@ -0,0 +1,64 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 AopAlliance.Aop;
+
+namespace Spring.Aop.Support
+{
+    /// <summary>
+    /// Abstract PointcutAdvisor that allows for any Advice to be configured.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AbstractGenericPointcutAdvisor.cs,v 1.2 2007/08/10 17:39:44 bbaia Exp $</version>
+    [Serializable]
+    public abstract class AbstractGenericPointcutAdvisor : AbstractPointcutAdvisor
+    {
+        private IAdvice advice;
+
+
+        /// <summary>
+        /// Return the advice part of this advisor.
+        /// </summary>
+        /// <returns>
+        /// The advice that should apply if the pointcut matches.
+        /// </returns>
+        /// <see cref="Spring.Aop.IAdvisor.Advice"/>
+        public override IAdvice Advice
+        {
+            get { return this.advice; }
+            set { this.advice = value; }
+        }
+
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> that represents the current
+        /// <see cref="System.Object"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> representation of this advisor.
+        /// </returns>
+        public override string ToString()
+        {
+            return GetType().Name + ": advice=[" + Advice + "]";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/AbstractObjectFactoryPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/AbstractObjectFactoryPointcutAdvisor.cs
new file mode 100644
index 00000000..f4805a8b
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/AbstractObjectFactoryPointcutAdvisor.cs
@@ -0,0 +1,137 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 AopAlliance.Aop;
+using Spring.Objects.Factory;
+using Spring.Util;
+
+namespace Spring.Aop.Support
+{
+    /// <summary>
+    /// Abstract ObjectFactory-based IPointcutAdvisor that allows for any Advice to be
+    /// configured as reference to an Advice object in an ObjectFactory.
+    /// </summary>
+    /// <remarks>
+    /// specifying the name of an advice object instead of the advice object itself
+    /// (if running within an ObjectFactory/ApplicationContext increses loose coupling
+    /// at initialization time, in order not to initialize the advice object until the
+    /// pointcut actually matches.
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AbstractObjectFactoryPointcutAdvisor.cs,v 1.2 2007/08/10 17:39:44 bbaia Exp $</version>
+    public abstract class AbstractObjectFactoryPointcutAdvisor : AbstractPointcutAdvisor, IObjectFactoryAware
+    {
+        private string adviceObjectName;
+
+        private IObjectFactory objectFactory;
+
+        private IAdvice advice;
+
+        private object adviceMonitor = new object();
+
+
+        /// <summary>
+        /// Gets or sets the name of the advice object that this advisor should refer to.
+        /// </summary>
+        /// <remarks>An instance of the specified object will be obtained on first access of
+        /// this advisor's advice.  This advisor will only ever obtain at most one
+        /// single instance of the advice object, caching the instance for the lifetime of
+        /// the advisor.</remarks>
+        /// <value>The name of the advice object.</value>
+        public string AdviceObjectName
+        {
+            get { return adviceObjectName; }
+            set { adviceObjectName = value; }
+        }
+
+        #region IObjectFactoryAware Members
+
+        /// <summary>
+        /// Callback that supplies the owning factory to an object instance.
+        /// </summary>
+        /// <value>
+        /// Owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// (may not be <see langword="null"/>). The object can immediately
+        /// call methods on the factory.
+        /// </value>
+        /// <remarks>
+        /// <p>
+        /// Invoked after population of normal object properties but before an init
+        /// callback like <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// method or a custom init-method.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of initialization errors.
+        /// </exception>
+        public IObjectFactory ObjectFactory
+        {
+            set { objectFactory = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Return the advice part of this aspect.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// An advice may be an interceptor, a throws advice, before advice,
+        /// introduction etc.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// The advice that should apply if the pointcut matches.
+        /// </returns>
+        public override IAdvice Advice
+        {
+            get
+            {
+                lock (adviceMonitor)
+                {
+                    if (advice == null && adviceObjectName != null)
+                    {
+                        AssertUtils.State(objectFactory != null,
+                                          "ObjectFactory must be set to resolve 'adviceObjectName'");
+                        advice = objectFactory.GetObject(adviceObjectName, typeof (IAdvice)) as IAdvice;                        
+                    }
+                }
+                return advice;
+            }
+            set
+            {
+                advice = value;
+            }
+        }
+
+        /// <summary>
+        /// Describe this Advisor, showing name of advice object.
+        /// </summary>
+        /// <returns>
+        /// Type name and advice object name.
+        /// </returns>
+        public override string ToString()
+        {
+            return GetType().Name + ": advice object '" + AdviceObjectName + "'";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/AbstractPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/AbstractPointcutAdvisor.cs
new file mode 100644
index 00000000..2c90ff85
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/AbstractPointcutAdvisor.cs
@@ -0,0 +1,166 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 AopAlliance.Aop;
+using Spring.Core;
+
+namespace Spring.Aop.Support
+{
+    /// <summary>
+    /// Abstract base class for <see cref="IPointcutAdvisor"/> implementations.  
+    /// </summary>
+    /// <remarks>
+    /// Can be subclassed for returning a specific pointcut/advice or a freely configurable pointcut/advice.
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AbstractPointcutAdvisor.cs,v 1.2 2008/01/14 20:49:47 oakinger Exp $</version>
+    [Serializable]
+    public abstract class AbstractPointcutAdvisor : IPointcutAdvisor, IOrdered
+    {
+        #region Fields
+
+        private int _order = Int32.MaxValue;
+
+        #endregion
+
+        #region IOrdered Members
+
+        /// <summary>
+        /// Returns this <see cref="Spring.Aop.IAdvisor"/>s order in the
+        /// interception chain.
+        /// </summary>
+        /// <returns>
+        /// This <see cref="Spring.Aop.IAdvisor"/>s order in the
+        /// interception chain.
+        /// </returns>
+        public virtual int Order
+        {
+            get { return this._order; }
+            set { this._order = value; }
+        }
+
+        #endregion
+
+        #region IAdvisor Members
+
+        /// <summary>
+        /// Return the advice part of this aspect.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// An advice may be an interceptor, a throws advice, before advice,
+        /// introduction etc.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// The advice that should apply if the pointcut matches.
+        /// </returns>
+        public abstract IAdvice Advice { get; set; }
+
+        /// <summary>
+        /// Is this advice associated with a particular instance?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Not supported for dynamic advisors.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// <see langword="true"/> if this advice is associated with a
+        /// particular instance.
+        /// </value>
+        /// <exception cref="System.NotSupportedException">Always.</exception>
+        /// <see cref="Spring.Aop.IAdvisor.IsPerInstance"/>
+        public virtual bool IsPerInstance
+        {
+            get
+            {
+                throw new NotSupportedException(
+                    "The 'IsPerInstance' property of the IAdvisor interface " +
+                        "is not yet supported in Spring.NET.");
+            }
+        }
+
+        #endregion
+
+        #region IPointcutAdvisor Members
+
+        /// <summary>
+        /// The <see cref="Spring.Aop.IPointcut"/> that drives this advisor.
+        /// </summary>
+        public abstract IPointcut Pointcut { get; set; }
+
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/>
+        /// is equal to the current <see cref="System.Object"/>.  
+        /// </summary>
+        /// <param name="o">The advisor to compare with.</param>
+        /// <returns>
+        /// <see langword="true"/> if this instance is equal to the
+        /// specified <see cref="System.Object"/>.
+        /// </returns>
+        public override bool Equals(object o)
+        {
+            if (!(o is AbstractPointcutAdvisor))
+            {
+                return false;
+            }
+            IPointcutAdvisor otherAdvisor = (IPointcutAdvisor)o;
+            if (otherAdvisor.Advice == null && otherAdvisor.Pointcut == null)
+            {
+                return (this.Advice == null && this.Pointcut == null);
+            }
+            else if (otherAdvisor.Advice == null)
+            {
+                return (Advice == null && otherAdvisor.Pointcut.Equals(this.Pointcut));
+            }
+            else if (otherAdvisor.Pointcut == null)
+            {
+                return (this.Pointcut == null && otherAdvisor.Advice.Equals(this.Advice));
+            }
+            else
+            {
+                return otherAdvisor.Advice.Equals(this.Advice) && otherAdvisor.Pointcut.Equals(this.Pointcut);
+            }
+        }
+
+        /// <summary>
+        /// Serves as a hash function for a particular type, suitable for use
+        /// in hashing algorithms and data structures like a hash table.
+        /// </summary>
+        /// <returns>
+        /// A hash code for the current <see cref="System.Object"/>.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            return 0 // (SPRNET-847) base.GetHashCode()
+                + 13 * (Pointcut == null ? 0 : Pointcut.GetHashCode())
+                + 27 * (Advice == null ? 0 : Advice.GetHashCode());
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/AbstractRegularExpressionMethodPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/AbstractRegularExpressionMethodPointcut.cs
new file mode 100644
index 00000000..b6840af2
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/AbstractRegularExpressionMethodPointcut.cs
@@ -0,0 +1,275 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+using AopAlliance.Aop;
+using Spring.Core;
+using Spring.Objects;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Abstract base regular expression pointcut object.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The regular expressions must be a match. For example, the
+	/// <code>.*Get.*</code> pattern will match <c>Com.Mycom.Foo.GetBar()</c>, and
+	/// <code>Get.*</code> will not.
+	/// </p>
+	/// <p>
+	/// This base class is serializable. Subclasses should decorate all
+	/// fields with the <see cref="System.NonSerializedAttribute"/> - the
+	/// <see cref="AbstractRegularExpressionMethodPointcut.InitPatternRepresentation"/>
+	/// method in this class will be invoked again on the client side on deserialization.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	[Serializable]
+	public abstract class AbstractRegularExpressionMethodPointcut
+		: StaticMethodMatcherPointcut, ITypeFilter, ISerializable
+	{
+		[NonSerialized]
+		private object[] _patterns = ObjectUtils.EmptyObjects;
+
+		#region Constructors
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="AbstractRegularExpressionMethodPointcut"/>
+		/// class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an abstract class, and as such has no publicly
+		/// visible constructors.
+		/// </p>
+		/// </remarks>
+		protected AbstractRegularExpressionMethodPointcut()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="AbstractRegularExpressionMethodPointcut"/>
+		/// class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		/// <exception cref="AopAlliance.Aop.AspectException">
+		/// If an error was encountered during the deserialization process.
+		/// </exception>
+		protected AbstractRegularExpressionMethodPointcut(
+			SerializationInfo info, StreamingContext context)
+		{
+			_patterns = (object[]) info.GetValue("Patterns", typeof(object[]));
+			try
+			{
+				InitPatternRepresentation(_patterns);
+			}
+			catch (Exception ex)
+			{
+				throw new AspectException(
+					"Failed to deserialize AOP regular expression pointcut: " + ex.Message);
+			}
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.ITypeFilter"/> for this pointcut.
+		/// </summary>
+		/// <value>
+		/// The current <see cref="Spring.Aop.ITypeFilter"/>.
+		/// </value>
+		public override ITypeFilter TypeFilter
+		{
+			get { return this; }
+		}
+
+		/// <summary>
+		/// Convenience property for setting a single pattern.
+		/// </summary>
+		/// <remarks>
+		/// Use this property or Patterns, not both.
+		/// </remarks>
+		public virtual object Pattern
+		{
+			get { return (_patterns.Length > 0 ? _patterns[0] : null); }
+			set
+			{
+			    AssertUtils.ArgumentNotNull(value, "Pattern");
+			    this.Patterns = new object[] {value};
+			}
+		}
+
+		/// <summary>
+		/// The regular expressions defining methods to match.
+		/// </summary>
+		/// <remarks>
+		/// Matching will be the union of all these; if any match,
+		/// the pointcut matches.
+		/// </remarks>
+		public virtual object[] Patterns
+		{
+			get { return _patterns; }
+			set
+			{
+                AssertUtils.ArgumentNotNull(value, "Patterns");
+                this._patterns = value;
+				InitPatternRepresentation(this.Patterns);
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+		/// the data needed to serialize the target object.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+		/// with data.
+		/// </param>
+		/// <param name="context">
+		/// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+		/// for this serialization.
+		/// </param>
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter=true)]
+		public void GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+			info.AddValue("Patterns", _patterns);
+		}
+
+		/// <summary>
+		/// Subclasses must implement this to initialize regular expression pointcuts.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Can be invoked multiple times.
+		/// </p>
+		/// <p>
+		/// This method will be invoked from the <see cref="Patterns"/> property,
+		/// and also on deserialization.
+		/// </p>
+		/// </remarks>
+		/// <param name="patterns">
+		/// The patterns to initialize.
+		/// </param>
+		/// <exception cref="System.ArgumentException">
+		/// In the case of an invalid pattern.
+		/// </exception>
+		protected abstract void InitPatternRepresentation(object[] patterns);
+
+		/// <summary>
+		/// Does the pattern at the supplied <paramref name="patternIndex"/>
+		/// match this <paramref name="pattern"/>?
+		/// </summary>
+		/// <param name="pattern">The pattern to match</param>
+		/// <param name="patternIndex">The index of pattern.</param>
+		/// <returns>
+		/// <see langword="true"/> if there is a match.
+		/// </returns>
+		protected abstract bool Matches(string pattern, int patternIndex);
+
+		/// <summary>
+		/// Does the supplied <paramref name="method"/> satisfy this matcher?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Try to match the regular expression against the fully qualified name
+		/// of the method's declaring <see cref="System.Type"/>, plus the name of
+		/// the supplied <paramref name="method"/>.
+		/// </p>
+		/// <p>
+		/// Note that the declaring <see cref="System.Type"/> is that
+		/// <see cref="System.Type"/> that originally declared
+		/// the method, not necessarily the <see cref="System.Type"/> that is
+		/// currently exposing it. For example, <see cref="System.Object.Equals(object)"/>
+		/// matches any subclass of <see cref="System.Object"/>'s
+		/// <see cref="System.Object.Equals(object)"/> method.
+		/// </p>
+		/// </remarks>
+		/// <param name="method">The candidate method.</param>
+		/// <param name="targetType">
+		/// The target <see cref="System.Type"/> (may be <see langword="null"/>,
+		/// in which case the candidate <see cref="System.Type"/> must be taken
+		/// to be the <paramref name="method"/>'s declaring class).
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if this this method matches statically.
+		/// </returns>
+		public override bool Matches(MethodInfo method, Type targetType)
+		{
+			string patt = method.DeclaringType.FullName + "." + method.Name;
+			for (int i = 0; i < this.Patterns.Length; ++i)
+			{
+				bool matched = Matches(patt, i);
+				if (matched)
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/// <summary>
+		/// Should the pointcut apply to the supplied
+		/// <see cref="System.Type"/>?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// In this instance, simply returns <see langword="true"/>.
+		/// </p>
+		/// </remarks>
+		/// <param name="type">
+		/// The candidate <see cref="System.Type"/>.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if the advice should apply to the supplied
+		/// <paramref name="type"/>
+		/// </returns>
+		public bool Matches(Type type)
+		{
+			return true;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcut.cs
new file mode 100644
index 00000000..70decf3e
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcut.cs
@@ -0,0 +1,204 @@
+#region License
+
+/*
+* Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary> 
+	/// <see cref="Spring.Aop.IPointcut"/> implementation that matches methods
+	/// that have been decorated with a specified <see cref="System.Attribute"/>.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+    /// <author>Ronald Wildenberg</author>
+	/// <version>$Id: AttributeMatchMethodPointcut.cs,v 1.8 2007/05/21 16:43:45 bbaia Exp $</version>
+	[Serializable]
+    public class AttributeMatchMethodPointcut : StaticMethodMatcherPointcut
+	{
+		private Type _attribute;
+		private bool _inherit = true;
+        private bool _checkInterfaces = false;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.AttributeMatchMethodPointcut"/> class.
+		/// </summary>
+		public AttributeMatchMethodPointcut()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.AttributeMatchMethodPointcut"/> class.
+		/// </summary>
+		/// <param name="attribute">
+		/// The <see cref="System.Attribute"/> to match.
+		/// </param>
+        public AttributeMatchMethodPointcut(Type attribute)
+            : this(attribute, true, false)
+        {
+        }
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.AttributeMatchMethodPointcut"/>
+		/// class.
+		/// </summary>
+		/// <param name="attribute">
+		/// The <see cref="System.Attribute"/> to match.
+		/// </param>
+		/// <param name="inherit">
+		/// Flag that controls whether or not the inheritance tree of the
+		/// method to be included in the search for the <see cref="Attribute"/>?
+		/// </param>
+		public AttributeMatchMethodPointcut(Type attribute, bool inherit)
+            : this(attribute, inherit, false)
+		{
+		}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Aop.Support.AttributeMatchMethodPointcut"/>
+        /// class.
+        /// </summary>
+        /// <param name="attribute">
+        /// The <see cref="System.Attribute"/> to match.
+        /// </param>
+        /// <param name="inherit">
+        /// Flag that controls whether or not the inheritance tree of the
+        /// method to be included in the search for the <see cref="Attribute"/>?
+        /// </param>
+        /// <param name="checkInterfaces">
+        /// Flag that controls whether or not interfaces attributes of the
+        /// method to be included in the search for the <see cref="Attribute"/>?
+        /// </param>
+        public AttributeMatchMethodPointcut(Type attribute, bool inherit, bool checkInterfaces)
+        {
+            Attribute = attribute;
+            Inherit = inherit;
+            CheckInterfaces = checkInterfaces;
+        }
+
+		/// <summary>
+		/// The <see cref="System.Attribute"/> to match.
+		/// </summary>
+		/// <exception cref="System.ArgumentException">
+		/// If the supplied value is not a <see cref="System.Type"/> that
+		/// derives from the <see cref="System.Attribute"/> class.
+		/// </exception>
+		public virtual Type Attribute
+		{
+            get { return _attribute; }
+			set
+			{
+				if (value != null)
+				{
+					if (!typeof (Attribute).IsAssignableFrom(value))
+					{
+						throw new ArgumentException(
+							string.Format(
+								"The [{0}] Type must be derived from the [System.Attribute] class.",
+								value));
+					}
+				}
+				_attribute = value;
+			}
+		}
+
+		/// <summary>
+		/// Is the inheritance tree of the method to be included in the search for the
+		/// <see cref="Attribute"/>?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The default is <see langword="true"/>.
+		/// </p>
+		/// </remarks>
+		public virtual bool Inherit
+		{
+			get { return _inherit; }
+			set { _inherit = value; }
+		}
+
+        /// <summary>
+        /// Is the interfaces attributes of the method to be included in the search for the
+        /// <see cref="Attribute"/>?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The default is <see langword="false"/>.
+        /// </p>
+        /// </remarks>
+        public virtual bool CheckInterfaces
+        {
+            get { return _checkInterfaces; }
+            set { _checkInterfaces = value; }
+        }
+
+		/// <summary>
+		/// Does the supplied <paramref name="method"/> satisfy this matcher?
+		/// </summary>
+		/// <param name="method">The candidate method.</param>
+		/// <param name="targetType">
+		/// The target <see cref="System.Type"/> (may be <see langword="null"/>,
+		/// in which case the candidate <see cref="System.Type"/> must be taken
+		/// to be the <paramref name="method"/>'s declaring class).
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if this this method matches statically.
+		/// </returns>
+		public override bool Matches(MethodInfo method, Type targetType)
+		{
+            if (method.IsDefined(Attribute, Inherit))
+            {
+                // Checks whether the attribute is defined on the method or a super definition of the method
+                // but does not check attributes on implemented interfaces.
+                return true;
+            }
+            else
+            {
+                if (CheckInterfaces)
+                {
+                    Type[] parameterTypes = ReflectionUtils.GetParameterTypes(method);
+
+                    // Also check whether the attribute is defined on a method implemented from an interface.
+                    // First find all interfaces for the type that contains the method.
+                    // Next, check each interface for the presence of the attribute on the corresponding
+                    // method from the interface.
+                    foreach (Type interfaceType in method.DeclaringType.GetInterfaces())
+                    {
+                        MethodInfo intfMethod = interfaceType.GetMethod(method.Name, parameterTypes);
+                        if (intfMethod != null && intfMethod.IsDefined(Attribute, Inherit))
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcutAdvisor.cs
new file mode 100644
index 00000000..3e1d80d4
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcutAdvisor.cs
@@ -0,0 +1,118 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary> 
+	/// Convenient class for attribute-match method pointcuts that hold an Interceptor,
+	/// making them an Advisor.
+	/// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: AttributeMatchMethodPointcutAdvisor.cs,v 1.3 2007/03/16 04:01:23 aseovic Exp $</version>
+    [Serializable]
+    public class AttributeMatchMethodPointcutAdvisor
+		: AttributeMatchMethodPointcut, IPointcutAdvisor, IOrdered
+	{
+		private int _order = Int32.MaxValue;
+		private IAdvice _advice;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="AttributeMatchMethodPointcutAdvisor"/> class.
+		/// </summary>
+		public AttributeMatchMethodPointcutAdvisor()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="AttributeMatchMethodPointcutAdvisor"/> class
+		/// for the supplied <paramref name="advice"/>.
+		/// </summary>
+		/// <param name="advice"></param>
+		public AttributeMatchMethodPointcutAdvisor(IAdvice advice)
+		{
+			this._advice = advice;
+		}
+
+		/// <summary>
+		/// Is this advice associated with a particular instance?
+		/// </summary>
+		/// <value>
+		/// <see langword="true"/> if this advice is associated with a
+		/// particular instance.
+		/// </value>
+		/// <exception cref="System.NotSupportedException">
+		/// Always; this property is not yet supported.
+		/// </exception>
+		public virtual bool IsPerInstance
+		{
+			get
+			{
+				throw new NotSupportedException(
+					"The 'IsPerInstance' property of the IAdvisor interface is " +
+					"not yet supported in Spring.NET.");
+			}
+		}
+
+		/// <summary>
+		/// Returns this <see cref="Spring.Aop.IAdvisor"/>s order in the
+		/// interception chain.
+		/// </summary>
+		/// <returns>
+		/// This <see cref="Spring.Aop.IAdvisor"/>s order in the
+		/// interception chain.
+		/// </returns>
+		public virtual int Order
+		{
+			get { return this._order; }
+			set { this._order = value; }
+		}
+
+		/// <summary>
+		/// Return the advice part of this advisor.
+		/// </summary>
+		/// <returns>
+		/// The advice that should apply if the pointcut matches.
+		/// </returns>
+		/// <see cref="Spring.Aop.IAdvisor.Advice"/>
+		public virtual IAdvice Advice
+		{
+			get { return this._advice; }
+			set { this._advice = value; }
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.IPointcut"/> that drives this advisor.
+		/// </summary>
+		public virtual IPointcut Pointcut
+		{
+			get { return this; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/ComposablePointcut.cs b/src/Spring/Spring.Aop/Aop/Support/ComposablePointcut.cs
new file mode 100644
index 00000000..c8f7d885
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/ComposablePointcut.cs
@@ -0,0 +1,176 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Convenient class for building up pointcuts.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// All methods return a <see cref="Spring.Aop.Support.ComposablePointcut"/>
+	/// instance, which facilitates the following concise usage pattern...
+	/// </p>
+	/// <code language="C#">
+	/// IPointcut pointcut = new ComposablePointcut()
+	///			.Union(typeFilter)
+	///				.Intersection(methodMatcher)
+	///					.Intersection(pointcut);
+	/// </code>
+	/// <p>
+	/// There is no <c>Union()</c> method on this class. Use the
+	/// <see cref="Spring.Aop.Support.Pointcuts.Union"/> method for such functionality.
+	/// </p>
+	/// </remarks> 
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: ComposablePointcut.cs,v 1.7 2007/03/16 04:01:23 aseovic Exp $</version>
+	[Serializable]
+    public class ComposablePointcut : IPointcut
+	{
+		private ITypeFilter _typeFilter;
+		private IMethodMatcher _methodMatcher;
+
+		/// <summary>
+		/// Creates a new instance of the 
+		/// <see cref="Spring.Aop.Support.ComposablePointcut"/> class
+		/// that matches all the methods on all <see cref="System.Type"/>s.
+		/// </summary>
+		public ComposablePointcut()
+		{
+			_typeFilter = TrueTypeFilter.True;
+			_methodMatcher = TrueMethodMatcher.True;
+		}
+
+		/// <summary>
+		/// Creates a new instance of the 
+		/// <see cref="Spring.Aop.Support.ComposablePointcut"/> class
+		/// that uses the supplied <paramref name="typeFilter"/> and
+		/// <paramref name="methodMatcher"/>.
+		/// </summary>
+		/// <param name="typeFilter">
+		/// The type filter to use.
+		/// </param>
+		/// <param name="methodMatcher">
+		/// The method matcher to use.
+		/// </param>
+		public ComposablePointcut(ITypeFilter typeFilter, IMethodMatcher methodMatcher)
+		{
+			_typeFilter = typeFilter;
+			_methodMatcher = methodMatcher;
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.ITypeFilter"/> for this pointcut.
+		/// </summary>
+		/// <value>
+		/// The current <see cref="Spring.Aop.ITypeFilter"/>.
+		/// </value>
+		public virtual ITypeFilter TypeFilter
+		{
+			get { return _typeFilter; }
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.IMethodMatcher"/> for this pointcut.
+		/// </summary>
+		/// <value>
+		/// The current <see cref="Spring.Aop.IMethodMatcher"/>.
+		/// </value>
+		public virtual IMethodMatcher MethodMatcher
+		{
+			get { return _methodMatcher; }
+		}
+
+		/// <summary>
+		/// Changes the current type filter to be the union of the existing filter and the
+		/// supplied <paramref name="filter"/>.
+		/// </summary>
+		/// <param name="filter">The filter to union with.</param>
+		/// <returns>
+		/// The union of the existing filter and the supplied <paramref name="filter"/>.
+		/// </returns>
+		public virtual ComposablePointcut Union(ITypeFilter filter)
+		{
+			_typeFilter = TypeFilters.Union(_typeFilter, filter);
+			return this;
+		}
+
+		/// <summary>
+		/// Changes the current type filter to be the intersection of the existing filter
+		/// and the supplied <paramref name="filter"/>.
+		/// </summary>
+		/// <param name="filter">The filter to diff against.</param>
+		/// <returns>
+		/// The intersection of the existing filter and the supplied <paramref name="filter"/>.
+		/// </returns>
+		public virtual ComposablePointcut Intersection(ITypeFilter filter)
+		{
+			_typeFilter = TypeFilters.Intersection(_typeFilter, filter);
+			return this;
+		}
+
+		/// <summary>
+		/// Changes the current method matcher to be the union of the existing matcher and the
+		/// supplied <paramref name="matcher"/>.
+		/// </summary>
+		/// <param name="matcher">The matcher to union with.</param>
+		/// <returns>
+		/// The union of the existing matcher and the supplied <paramref name="matcher"/>.
+		/// </returns>
+		public virtual ComposablePointcut Union(IMethodMatcher matcher)
+		{
+			_methodMatcher = MethodMatchers.Union(_methodMatcher, matcher);
+			return this;
+		}
+
+		/// <summary>
+		/// Changes the current method matcher to be the intersection of the existing matcher
+		/// and the supplied <paramref name="matcher"/>.
+		/// </summary>
+		/// <param name="matcher">The matcher to diff against.</param>
+		/// <returns>
+		/// The intersection of the existing matcher and the supplied <paramref name="matcher"/>.
+		/// </returns>
+		public virtual ComposablePointcut Intersection(IMethodMatcher matcher)
+		{
+			_methodMatcher = MethodMatchers.Intersection(_methodMatcher, matcher);
+			return this;
+		}
+
+		/// <summary>
+		/// Changes current pointcut to intersection of the current and supplied pointcut
+		/// </summary>
+		/// <param name="other">pointcut to diff against</param>
+		/// <returns>updated pointcut</returns>
+		public virtual ComposablePointcut Intersection(IPointcut other)
+		{
+			_typeFilter = TypeFilters.Intersection(_typeFilter, other.TypeFilter);
+			_methodMatcher = MethodMatchers.Intersection(_methodMatcher, other.MethodMatcher);
+			return this;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/ControlFlowPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/ControlFlowPointcut.cs
new file mode 100644
index 00000000..2fd163f9
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/ControlFlowPointcut.cs
@@ -0,0 +1,244 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Pointcut and method matcher for use in simple <b>cflow</b>-style
+	/// pointcuts.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Evaluating such pointcuts is slower than evaluating normal pointcuts,
+	/// but can nevertheless be useful in some cases. Of course, your mileage
+	/// may vary as to what 'slower' actually means.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: ControlFlowPointcut.cs,v 1.6 2006/04/09 07:18:37 markpollack Exp $</version>
+	[Serializable]
+	public class ControlFlowPointcut : IPointcut, ITypeFilter, IMethodMatcher
+	{
+		#region Fields
+
+		private Type _type;
+		private string _methodName;
+		private int _evaluationCount;
+
+		#endregion
+
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="ControlFlowPointcut"/>
+		/// class.
+		/// </summary>
+		/// <param name="type">
+		/// The class under which <b>all</b> control flows are to be matched.
+		/// </param>
+		public ControlFlowPointcut(Type type) : this(type, null)
+		{
+		}
+
+		/// <summary>
+		/// Construct a new pointcut that matches all calls below the
+		/// given method in the given class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If the supplied <paramref name="methodName"/> is
+		/// <see langword="null"/>, <b>all</b> control flows below the given
+		/// class will be successfully matched.
+		/// </p>
+		/// </remarks>
+		/// <param name="type">
+		/// The class under which <b>all</b> control flows are to be matched.
+		/// </param>
+		/// <param name="methodName">
+		/// The method name under which <b>all</b> control flows are to be matched.
+		/// </param>
+		public ControlFlowPointcut(Type type, string methodName)
+		{
+			_type = type;
+			_methodName = methodName;
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.ITypeFilter"/> for this pointcut.
+		/// </summary>
+		/// <value>
+		/// The current <see cref="Spring.Aop.ITypeFilter"/>.
+		/// </value>
+		public ITypeFilter TypeFilter
+		{
+			get { return this; }
+		}
+
+		/// <summary>
+		/// Gets the number of times this pointcut has been <i>evaluated</i>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Useful as a debugging aid.
+		/// </p>
+		/// <p>
+		/// Note that this value is distinct from the number of times that this
+		/// pointcut sucessfully matches a target method, in that a
+		/// <see cref="ControlFlowPointcut"/> may be evaluated many times but
+		/// never actually match even once.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The number of times this pointcut has been <i>evaluated</i>.
+		/// </value>
+		public int EvaluationCount
+		{
+			get { return _evaluationCount; }
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.IMethodMatcher"/> for this pointcut.
+		/// </summary>
+		/// <value>
+		/// The current <see cref="Spring.Aop.IMethodMatcher"/>.
+		/// </value>
+		public IMethodMatcher MethodMatcher
+		{
+			get { return this; }
+		}
+
+		/// <summary>
+		/// Is this a runtime pointcut?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This implementation is a runtime pointcut, and so always returns
+		/// <see langword="true"/>.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// <see langword="true"/> if this is a runtime pointcut.
+		/// </value>
+		/// <seealso cref="Spring.Aop.IMethodMatcher.IsRuntime"/>
+		public bool IsRuntime
+		{
+			get { return true; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Should the pointcut apply to the supplied <see cref="System.Type"/>?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Subclasses are encouraged to override this method for greater
+		/// filtering (and performance).
+		/// </p>
+		/// <p>
+		/// This, the default, implementation always matches (returns
+		/// <see langword="true"/>).
+		/// </p>
+		/// </remarks>
+		/// <param name="type">The candidate target class.</param>
+		/// <returns>
+		/// <see langword="true"/> if the advice should apply to the supplied
+		/// <paramref name="type"/>
+		/// </returns>
+		public virtual bool Matches(Type type)
+		{
+			return true;
+		}
+
+		/// <summary>
+		/// Does the supplied <paramref name="method"/> satisfy this matcher?
+		/// Perform static checking. If this returns false, or if the isRuntime() method
+		/// returns false, no runtime check will be made.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Subclasses are encouraged to override this method if it is possible
+		/// to filter out some candidate classes.
+		/// </p>
+		/// <p>
+		/// This, the default, implementation always matches (returns
+		/// <see langword="true"/>). This means that the three argument
+		/// <see cref="Spring.Aop.IMethodMatcher.Matches(MethodInfo, Type, object[])"/>
+		/// method will always be invoked.
+		/// </p>
+		/// </remarks>
+		/// <param name="method">The candidate method.</param>
+		/// <param name="targetType">
+		/// The target class (may be <see langword="null"/>, in which case the
+		/// candidate class must be taken to be the <paramref name="method"/>'s
+		/// declaring class).
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if this this method matches statically.
+		/// </returns>
+		/// <seealso cref="Spring.Aop.IMethodMatcher.Matches(MethodInfo, Type)"/>
+		public virtual bool Matches(MethodInfo method, Type targetType)
+		{
+			return true;
+		}
+
+		/// <summary>
+		/// Is there a runtime (dynamic) match for the supplied
+		/// <paramref name="method"/>?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Subclasses are encouraged to override this method if it is possible
+		/// to filter out some candidate classes.
+		/// </p>
+		/// </remarks>
+		/// <param name="method">The candidate method.</param>
+		/// <param name="targetType">The target class.</param>
+		/// <param name="args">The arguments to the method</param>
+		/// <returns>
+		/// <see langword="true"/> if there is a runtime match.</returns>
+		/// <seealso cref="Spring.Aop.IMethodMatcher.Matches(MethodInfo, Type, object[])"/>
+		public virtual bool Matches(MethodInfo method, Type targetType, object[] args)
+		{
+			++_evaluationCount;
+			IControlFlow cflow = ControlFlowFactory.CreateControlFlow();
+			return (_methodName != null)
+				? cflow.Under(_type, _methodName)
+				: cflow.Under(_type);
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/DefaultIntroductionAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/DefaultIntroductionAdvisor.cs
new file mode 100644
index 00000000..00987686
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/DefaultIntroductionAdvisor.cs
@@ -0,0 +1,241 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+using Spring.Collections;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Simple <seealso cref="Spring.Aop.IIntroductionAdvisor"/> implementation that
+	/// by default applies to any class.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: DefaultIntroductionAdvisor.cs,v 1.11 2007/03/16 04:01:23 aseovic Exp $</version>
+	[Serializable]
+    public class DefaultIntroductionAdvisor : IIntroductionAdvisor, ITypeFilter
+	{
+		private IAdvice _introduction;
+		private ISet _interfaces = new HybridSet();
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.DefaultIntroductionAdvisor"/> class using
+		/// the supplied <paramref name="introduction"/>
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This constructor adds all interfaces implemented by the supplied
+		/// <paramref name="introduction"/> (except the
+		/// <see cref="AopAlliance.Aop.IAdvice"/> interface) to the list of
+		/// interfaces to introduce.
+		/// </p>
+		/// </remarks>
+		/// <param name="introduction">The introduction to use.</param>
+		public DefaultIntroductionAdvisor(IAdvice introduction)
+			: this(introduction, introduction.GetType().GetInterfaces())
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.DefaultIntroductionAdvisor"/> class using
+		/// the supplied <paramref name="introduction"/>
+		/// </summary>
+		/// <param name="introduction">The introduction to use.</param>
+		/// <param name="intf">
+		/// The interface to introduce.
+		/// </param>
+		public DefaultIntroductionAdvisor(IAdvice introduction, Type intf)
+			: this(introduction, new Type[] {intf})
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.DefaultIntroductionAdvisor"/> class using
+		/// the supplied <paramref name="introduction"/>
+		/// </summary>
+		/// <param name="introduction">The introduction to use.</param>
+		/// <param name="interfaces">
+		/// The interfaces to introduce.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="introduction"/> is <see langword="null"/>.
+		/// </exception>
+		public DefaultIntroductionAdvisor(IAdvice introduction, Type[] interfaces)
+		{
+			if (introduction == null)
+			{
+				throw new ArgumentNullException("introduction", "Introduction cannot be null");
+			}
+			_introduction = introduction;
+			foreach (Type intf in interfaces)
+			{
+				if (intf != typeof (IAdvice))
+				{
+					AddInterface(intf);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Returns the filter determining which target classes this
+		/// introduction should apply to. 
+		/// </summary>
+		/// <value>
+		/// The filter determining which target classes this introduction
+		/// should apply to. 
+		/// </value>
+		public virtual ITypeFilter TypeFilter
+		{
+			get { return this; }
+		}
+
+		/// <summary>
+		/// Gets the interfaces introduced by this
+		/// <see cref="Spring.Aop.IAdvisor"/>.
+		/// </summary>
+		/// <value>
+		/// The interfaces introduced by this
+		/// <see cref="Spring.Aop.IAdvisor"/>.
+		/// </value>
+		public virtual Type[] Interfaces
+		{
+			get
+			{
+				Type[] interfaces = new Type[_interfaces.Count];
+				_interfaces.CopyTo(interfaces, 0);
+				return interfaces;
+			}
+		}
+
+		/// <summary>
+		/// Is this advice associated with a particular instance?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Default for an introduction is per-instance interception.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// <see langword="true"/> if this advice is associated with a
+		/// particular instance.
+		/// </value>
+		public virtual bool IsPerInstance
+		{
+			get { return true; }
+		}
+
+		/// <summary>
+		/// Return the advice part of this aspect.
+		/// </summary>
+		/// <returns>
+		/// The advice that should apply if the pointcut matches.
+		/// </returns>
+		public virtual IAdvice Advice
+		{
+			get { return this._introduction; }
+		}
+
+		/// <summary>
+		/// Adds the supplied <paramref name="intf"/> to the list of
+		/// introduced interfaces.
+		/// </summary>
+		/// <param name="intf">The interface to add.</param>
+		/// <exception cref="System.ArgumentException">
+		/// If any of the <see cref="Interfaces"/> are not interface <see cref="System.Type"/>.
+		/// </exception>
+		public virtual void AddInterface(Type intf)
+		{
+			if(intf != null) 
+			{
+				BailIfNotAnInterfaceType(intf);
+				_interfaces.Add(intf);
+			}
+		}
+
+		/// <summary>
+		/// Should the pointcut apply to the supplied
+		/// <see cref="System.Type"/>?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This, the default, implementation always returns <see langword="true"/>.
+		/// </p>
+		/// </remarks>
+		/// <param name="type">
+		/// The candidate <see cref="System.Type"/>.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if the advice should apply to the supplied
+		/// <paramref name="type"/>
+		/// </returns>
+		public virtual bool Matches(Type type)
+		{
+			return true;
+		}
+
+		/// <summary>
+		/// Can the advised interfaces be implemented by the introduction
+		/// advice?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Invoked <b>before</b> adding an
+		/// <seealso cref="Spring.Aop.IIntroductionAdvisor"/>.
+		/// </p>
+		/// </remarks>
+		/// <exception cref="System.ArgumentException">
+		/// If the advised interfaces cannot be implemented by the introduction
+		/// advice.
+		/// </exception>
+		/// <seealso cref="Spring.Aop.IIntroductionAdvisor.Interfaces"/>
+		/// <exception cref="System.ArgumentException">
+		/// If any of the <see cref="Interfaces"/> are not interface <see cref="System.Type"/>.
+		/// </exception>
+		public virtual void ValidateInterfaces()
+		{
+			foreach (Type intf in _interfaces)
+			{
+				BailIfNotAnInterfaceType(intf);
+				if (! intf.IsAssignableFrom(_introduction.GetType()))
+				{
+					throw new ArgumentException("Introduction [" + _introduction.GetType().FullName + "] " +
+						"does not implement interface '" + intf.FullName + "' specified in introduction advice.");
+				}
+			}
+		}
+
+		private static void BailIfNotAnInterfaceType(Type intf)
+		{
+			if (intf != null && !intf.IsInterface)
+			{
+				throw new ArgumentException("Type [" + intf.FullName + "] is not an interface; cannot be used in an introduction.");
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/DefaultObjectFactoryPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/DefaultObjectFactoryPointcutAdvisor.cs
new file mode 100644
index 00000000..07a0d700
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/DefaultObjectFactoryPointcutAdvisor.cs
@@ -0,0 +1,60 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+namespace Spring.Aop.Support
+{
+    /// <summary>
+    /// Concrete ObjectFactory-based IPointcutAdvisor thta allows for any Advice to be
+    /// configured as reference to an Advice object in the ObjectFatory, as well as 
+    /// the Pointcut to be configured through an object property.
+    /// </summary>
+    /// <remarks>
+    /// Specifying the name of an advice object instead of the advice object itself
+    /// (if running within a ObjectFactory/ApplicationContext) increases loose coupling
+    /// at initialization time, in order to not intialize the advice object until the pointcut
+    /// actually matches.
+    /// </remarks>
+    /// <author>Juerge Hoeller</author>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: DefaultObjectFactoryPointcutAdvisor.cs,v 1.1 2007/05/30 22:35:43 markpollack Exp $</version>
+    public class DefaultObjectFactoryPointcutAdvisor : AbstractObjectFactoryPointcutAdvisor
+    {
+        private IPointcut pointcut = TruePointcut.True;
+
+
+        /// <summary>
+        /// The <see cref="Spring.Aop.IPointcut"/> that drives this advisor.
+        /// </summary>
+        public override IPointcut Pointcut
+        {
+            get { return pointcut; }
+            set { pointcut = (pointcut != null ? value : TruePointcut.True); }
+        }
+
+        /// <summary>
+        /// Describe this Advisor, showing pointcut and name of advice object.
+        /// </summary>
+        /// <returns>Type name , pointcut, and advice object name.</returns>
+        public override string ToString()
+        {
+            return GetType().Name + ": pointcut [" + Pointcut + "]; advice object = '" + AdviceObjectName + "'";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/DefaultPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/DefaultPointcutAdvisor.cs
new file mode 100644
index 00000000..0a0929a0
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/DefaultPointcutAdvisor.cs
@@ -0,0 +1,111 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Convenient pointcut-driven advisor implementation.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This is the most commonly used <see cref="Spring.Aop.IAdvisor"/> implementation.
+	/// It can be used with any pointcut and advice type, except for introductions.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: DefaultPointcutAdvisor.cs,v 1.8 2007/05/30 22:35:43 markpollack Exp $</version>
+	[Serializable]
+    public class DefaultPointcutAdvisor : AbstractGenericPointcutAdvisor
+	{
+
+		private IPointcut pointcut = TruePointcut.True;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.DefaultPointcutAdvisor"/> class.
+		/// </summary>
+		public DefaultPointcutAdvisor()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.DefaultPointcutAdvisor"/>
+		/// class for the supplied <paramref name="advice"/>,
+		/// </summary>
+		/// <param name="advice">
+		/// The advice to use.
+		/// </param>
+		public DefaultPointcutAdvisor(IAdvice advice)
+			: this(TruePointcut.True, advice)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.DefaultPointcutAdvisor"/>
+		/// class for the supplied <paramref name="advice"/> and
+		/// <paramref name="pointcut"/>.
+		/// </summary>
+		/// <param name="advice">
+		/// The advice to use.
+		/// </param>
+		/// <param name="pointcut">
+		/// The pointcut to use.
+		/// </param>
+		public DefaultPointcutAdvisor(IPointcut pointcut, IAdvice advice)
+		{
+			this.pointcut = pointcut;
+			Advice = advice;
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.IPointcut"/> that drives this advisor.
+		/// </summary>
+		public override IPointcut Pointcut
+		{
+			get { return pointcut; }
+            set { pointcut = value;}
+		}
+
+
+
+
+		/// <summary>
+		/// Returns a <see cref="System.String"/> that represents the current
+		/// <see cref="System.Object"/>.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> representation of this advisor.
+		/// </returns>
+		public override string ToString()
+		{
+			return GetType().Name + ": pointcut=[" + pointcut + "] advice=[" + Advice + "]";
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcher.cs
new file mode 100644
index 00000000..5b3301ba
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcher.cs
@@ -0,0 +1,114 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Convenient abstract superclass for dynamic method matchers that do
+	/// care about arguments at runtime.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: DynamicMethodMatcher.cs,v 1.5 2006/04/09 07:18:37 markpollack Exp $</version>
+	public abstract class DynamicMethodMatcher : IMethodMatcher
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.DynamicMethodMatcher"/>
+		/// class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an <see langword="abstract"/> class, and as such exposes no
+		/// public constructors.
+		/// </p>
+		/// </remarks>
+		protected DynamicMethodMatcher()
+		{
+		}
+
+		#endregion
+
+		/// <summary>
+		/// Is this <see cref="Spring.Aop.IMethodMatcher"/> dynamic?
+		/// </summary>
+		/// <value>
+		/// Always returns <see langword="true"/>, to specify that this is a
+		/// dynamic matcher.
+		/// </value>
+		public virtual bool IsRuntime
+		{
+			get { return true; }
+		}
+
+		/// <summary>
+		/// Does the supplied <paramref name="method"/> satisfy this matcher?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Derived classes can override this method to add preconditions for
+		/// dynamic matching.
+		/// </p>
+		/// <p>
+		/// This implementation always returns <see langword="true"/>.
+		/// </p>
+		/// </remarks>
+		/// <param name="method">The candidate method.</param>
+		/// <param name="targetType">
+		/// The target <see cref="System.Type"/> (may be <see langword="null"/>,
+		/// in which case the candidate <see cref="System.Type"/> must be taken
+		/// to be the <paramref name="method"/>'s declaring class).
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if this this method matches statically.
+		/// </returns>
+		public virtual bool Matches(MethodInfo method, Type targetType)
+		{
+			return true;
+		}
+
+		/// <summary>
+		/// Is there a runtime (dynamic) match for the supplied
+		/// <paramref name="method"/>?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Must be overriden by derived classes to provide criteria for dynamic matching.
+		/// </p>
+		/// </remarks>
+		/// <param name="method">The candidate method.</param>
+		/// <param name="targetType">
+		/// The target <see cref="System.Type"/>.
+		/// </param>
+		/// <param name="args">The arguments to the method</param>
+		/// <returns>
+		/// <see langword="true"/> if there is a runtime match.</returns>
+		public abstract bool Matches(MethodInfo method, Type targetType, object[] args);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcherPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcherPointcutAdvisor.cs
new file mode 100644
index 00000000..00371f96
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcherPointcutAdvisor.cs
@@ -0,0 +1,176 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Convenient superclass for <see cref="Spring.Aop.IAdvisor"/>s
+	/// that are also dynamic pointcuts.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: DynamicMethodMatcherPointcutAdvisor.cs,v 1.6 2007/03/16 04:01:24 aseovic Exp $</version>
+	[Serializable]
+    public abstract class DynamicMethodMatcherPointcutAdvisor
+		: DynamicMethodMatcher, IPointcutAdvisor, IPointcut, IOrdered
+	{
+		private int _order = Int32.MaxValue;
+		private IAdvice _advice;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.DynamicMethodMatcherPointcutAdvisor"/>
+		/// class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an abstract class, and as such has no publicly
+		/// visible constructors.
+		/// </p>
+		/// </remarks>
+		protected DynamicMethodMatcherPointcutAdvisor()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.DynamicMethodMatcherPointcutAdvisor"/>
+		/// class for the supplied <paramref name="advice"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an abstract class, and as such has no publicly
+		/// visible constructors.
+		/// </p>
+		/// </remarks>
+		/// <param name="advice">
+		/// The advice portion of this advisor.
+		/// </param>
+		protected DynamicMethodMatcherPointcutAdvisor(IAdvice advice)
+		{
+			this._advice = advice;
+		}
+
+		/// <summary>
+		/// Is this advice associated with a particular instance?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Not supported for dynamic advisors.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// <see langword="true"/> if this advice is associated with a
+		/// particular instance.
+		/// </value>
+		/// <exception cref="System.NotSupportedException">Always.</exception>
+		/// <see cref="Spring.Aop.IAdvisor.IsPerInstance"/>
+		public virtual bool IsPerInstance
+		{
+			get
+			{
+				throw new NotSupportedException(
+					"The 'IsPerInstance' property of the IAdvisor interface " +
+					"is not yet supported in Spring.NET.");
+			}
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.ITypeFilter"/> for this pointcut.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This implementation always returns a filter that evaluates to <see langword="true"/>
+		/// for any <see cref="System.Type"/>.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The current <see cref="Spring.Aop.ITypeFilter"/>.
+		/// </value>
+		public virtual ITypeFilter TypeFilter
+		{
+			get { return TrueTypeFilter.True; }
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.IMethodMatcher"/> for this pointcut.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This implementation always returns itself (this object).
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The current <see cref="Spring.Aop.IMethodMatcher"/>.
+		/// </value>
+		public virtual IMethodMatcher MethodMatcher
+		{
+			get { return this; }
+		}
+
+		/// <summary>
+		/// Returns this <see cref="Spring.Aop.IAdvisor"/>s order in the
+		/// interception chain.
+		/// </summary>
+		/// <returns>
+		/// This <see cref="Spring.Aop.IAdvisor"/>s order in the
+		/// interception chain.
+		/// </returns>
+		public virtual int Order
+		{
+			get { return this._order; }
+			set { this._order = value; }
+		}
+
+		/// <summary>
+		/// Return the advice part of this aspect.
+		/// </summary>
+		/// <returns>
+		/// The advice that should apply if the pointcut matches.
+		/// </returns>
+		/// <see cref="Spring.Aop.IAdvisor.Advice"/>
+		public virtual IAdvice Advice
+		{
+			get { return this._advice; }
+			set { this._advice = value; }
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.IPointcut"/> that drives this advisor.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This implementation always returns itself (this object).
+		/// </p>
+		/// </remarks>
+		public IPointcut Pointcut
+		{
+			get { return this; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/MethodMatchers.cs b/src/Spring/Spring.Aop/Aop/Support/MethodMatchers.cs
new file mode 100644
index 00000000..9047ac75
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/MethodMatchers.cs
@@ -0,0 +1,181 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Various utility methods relating to the composition of
+	/// <see cref="Spring.Aop.IMethodMatcher"/>s.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// A method matcher may be evaluated statically (based on method and target
+	/// class) or need further evaluation dynamically (based on arguments at
+	/// the time of method invocation).
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: MethodMatchers.cs,v 1.7 2007/03/16 04:01:24 aseovic Exp $</version>
+    public sealed class MethodMatchers
+	{
+		/// <summary>
+		/// Creates a new <see cref="Spring.Aop.IMethodMatcher"/> that is the
+		/// union of the two supplied <see cref="Spring.Aop.IMethodMatcher"/>s.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The newly created matcher will match all the methods that either of the two 
+		/// supplied matchers would match.
+		/// </p>
+		/// </remarks>
+		/// <param name="firstMatcher">The first method matcher.</param>
+		/// <param name="secondMatcher">The second method matcher.</param>
+		/// <returns>
+		/// A new <see cref="Spring.Aop.IMethodMatcher"/> that is the
+		/// union of the two supplied <see cref="Spring.Aop.IMethodMatcher"/>s
+		/// </returns>
+		public static IMethodMatcher Union(
+			IMethodMatcher firstMatcher, IMethodMatcher secondMatcher)
+		{
+			return new UnionMethodMatcher(firstMatcher, secondMatcher);
+		}
+
+		/// <summary>
+		/// Creates a new <see cref="Spring.Aop.IMethodMatcher"/> that is the
+		/// intersection of the two supplied <see cref="Spring.Aop.IMethodMatcher"/>s.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The newly created matcher will match only those methods that both
+		/// of the supplied matchers would match.
+		/// </p>
+		/// </remarks>
+		/// <param name="firstMatcher">The first method matcher.</param>
+		/// <param name="secondMatcher">The second method matcher.</param>
+		/// <returns>
+		/// A new <see cref="Spring.Aop.IMethodMatcher"/> that is the
+		/// intersection of the two supplied <see cref="Spring.Aop.IMethodMatcher"/>s
+		/// </returns>
+		public static IMethodMatcher Intersection(
+			IMethodMatcher firstMatcher, IMethodMatcher secondMatcher)
+		{
+			return new IntersectionMethodMatcher(firstMatcher, secondMatcher);
+		}
+
+		#region Inner Class : UnionMethodMatcher
+
+        [Serializable]
+        private sealed class UnionMethodMatcher : IMethodMatcher
+		{
+			private IMethodMatcher a;
+			private IMethodMatcher b;
+
+			public UnionMethodMatcher(IMethodMatcher a, IMethodMatcher b)
+			{
+				this.a = a;
+				this.b = b;
+			}
+
+			public bool IsRuntime
+			{
+				get { return a.IsRuntime || b.IsRuntime; }
+			}
+
+			public bool Matches(MethodInfo m, Type targetType)
+			{
+				return a.Matches(m, targetType) || b.Matches(m, targetType);
+			}
+
+			public bool Matches(MethodInfo m, Type targetType, object[] args)
+			{
+				return a.Matches(m, targetType, args) || b.Matches(m, targetType, args);
+			}
+		}
+
+		#endregion
+
+		#region Inner Class : IntersectionMethodMatcher
+
+        [Serializable]
+        private sealed class IntersectionMethodMatcher : IMethodMatcher
+		{
+			private IMethodMatcher a;
+			private IMethodMatcher b;
+
+			public IntersectionMethodMatcher(IMethodMatcher a, IMethodMatcher b)
+			{
+				this.a = a;
+				this.b = b;
+			}
+
+			public bool IsRuntime
+			{
+				get { return a.IsRuntime || b.IsRuntime; }
+			}
+
+			public bool Matches(MethodInfo m, Type targetType)
+			{
+				return a.Matches(m, targetType) && b.Matches(m, targetType);
+			}
+
+			public bool Matches(MethodInfo m, Type targetType, object[] args)
+			{
+				// Because a dynamic intersection may be composed of a static and dynamic part,
+				// we must avoid calling the 3-arg matches method on a dynamic matcher, as
+				// it will probably be an unsupported operation.
+				bool aMatches = a.IsRuntime ? a.Matches(m, targetType, args) : a.Matches(m, targetType);
+				bool bMatches = b.IsRuntime ? b.Matches(m, targetType, args) : b.Matches(m, targetType);
+				return aMatches && bMatches;
+			}
+		}
+
+		#endregion
+
+		#region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.MethodMatchers"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such has no publicly
+		/// visible constructors.
+		/// </p>
+		/// </remarks>
+		private MethodMatchers()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcut.cs
new file mode 100644
index 00000000..72a91684
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcut.cs
@@ -0,0 +1,122 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary> 
+	/// Pointcut object for simple method name matches, useful as an alternative to pure
+	/// regular expression based patterns.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: NameMatchMethodPointcut.cs,v 1.9 2007/03/16 04:01:24 aseovic Exp $</version>
+    [Serializable]
+    public class NameMatchMethodPointcut : StaticMethodMatcherPointcut
+	{
+		private string[] _mappedNames = new string[0];
+
+		/// <summary>
+		/// Convenience property when we have only a single method name
+		/// to match.
+		/// </summary>
+		/// <remarks>
+		/// <note type="caution">
+		/// Use either this property or the
+		/// <see cref="Spring.Aop.Support.NameMatchMethodPointcut.MappedNames"/> property,
+		/// not both.
+		/// </note>
+		/// </remarks>
+		public virtual string MappedName
+		{
+			set { MappedNames = new string[] {value}; }
+		}
+
+		/// <summary>
+		/// Set the method names defining methods to match.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Matching will be the union of all these; if any match, the pointcut matches.
+		/// </p>
+		/// </remarks>
+		public virtual string[] MappedNames
+		{
+			set { this._mappedNames = value; }
+		}
+
+		/// <summary>
+		/// Does the <see cref="System.Reflection.MemberInfo.Name"/> of the supplied
+		/// <paramref name="method"/> matches any of the mapped names?
+		/// </summary>
+		/// <param name="method">
+		/// The <see cref="System.Reflection.MethodBase"/> to check.
+		/// </param>
+		/// <param name="targetType">
+		/// The <see cref="System.Type"/> of the target class.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if the name of the supplied
+		/// <paramref name="method"/> matches one of the mapped names.
+		/// </returns>
+		public override bool Matches(MethodInfo method, Type targetType)
+		{
+			for (int i = 0; i < this._mappedNames.Length; i++)
+			{
+				string mappedName = this._mappedNames[i];
+				if (mappedName.Equals(method.Name) || IsMatch(method.Name, mappedName))
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/// <summary>
+        /// Does the supplied <paramref name="methodName"/> match the supplied <paramref name="mappedName"/>?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The default implementation checks for "xxx*", "*xxx" and "*xxx*" matches,
+	    /// as well as direct equality. Can be overridden in subclasses.
+		/// </p>
+		/// </remarks>
+		/// <param name="methodName">
+		/// The method name of the class.
+		/// </param>
+		/// <param name="mappedName">
+		/// The name in the descriptor.
+		/// </param>
+		/// <returns>
+		/// <b>True</b> if the names match.
+		/// </returns>
+		protected virtual bool IsMatch(string methodName, string mappedName)
+		{
+            return PatternMatchUtils.SimpleMatch(mappedName, methodName);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcutAdvisor.cs
new file mode 100644
index 00000000..0e86300c
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcutAdvisor.cs
@@ -0,0 +1,130 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary> 
+	/// Convenient class for name-match method pointcuts that hold an Interceptor,
+	/// making them an Advisor.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: NameMatchMethodPointcutAdvisor.cs,v 1.5 2007/05/30 22:35:43 markpollack Exp $</version>
+    [Serializable]
+    public class NameMatchMethodPointcutAdvisor : AbstractGenericPointcutAdvisor
+	{
+
+        private NameMatchMethodPointcut pointcut = new NameMatchMethodPointcut();
+
+        #region Constructor(s)
+
+        /// <summary>
+		/// Creates a new instance of the
+		/// <see cref="NameMatchMethodPointcutAdvisor"/> class.
+		/// </summary>
+		public NameMatchMethodPointcutAdvisor()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="NameMatchMethodPointcutAdvisor"/> class
+		/// for the supplied <paramref name="advice"/>.
+		/// </summary>
+		/// <param name="advice"></param>
+		public NameMatchMethodPointcutAdvisor(IAdvice advice)
+		{
+			Advice = advice;
+        }
+
+        #endregion
+
+
+        #region Properties 
+        /// <summary>
+        /// The <see cref="Spring.Aop.ITypeFilter"/> for this pointcut.
+        /// </summary>
+        /// <remarks>Default is </remarks>
+        /// <value>
+        /// The current <see cref="Spring.Aop.ITypeFilter"/>.
+        /// </value>
+        public ITypeFilter TypeFilter {
+            set
+            {
+                pointcut.TypeFilter = value;
+            }
+        }
+
+	    /// <summary>
+	    /// Convenience property when we have only a single method name
+	    /// to match.
+	    /// </summary>
+	    /// <remarks>
+	    /// <note type="caution">
+	    /// Use either this property or the
+	    /// <see cref="Spring.Aop.Support.NameMatchMethodPointcut.MappedNames"/> property,
+	    /// not both.
+	    /// </note>
+	    /// </remarks>
+	    public string MappedName
+	    {
+            set { pointcut.MappedName = value; }
+	    }
+
+	    /// <summary>
+	    /// Set the method names defining methods to match.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// Matching will be the union of all these; if any match, the pointcut matches.
+	    /// </p>
+	    /// </remarks>
+	    public string[] MappedNames
+	    {
+	        set { pointcut.MappedNames = value; }
+	    }
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.IPointcut"/> that drives this advisor.
+		/// </summary>
+		public override IPointcut Pointcut
+		{
+            get { return pointcut; }
+            set
+            {
+                AssertUtils.AssertArgumentType(value, "pointcut", typeof(NameMatchMethodPointcut),
+                              "Pointcut most be compatible with type NameMatchMethodPointcut");
+                pointcut = value as NameMatchMethodPointcut;
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/Pointcuts.cs b/src/Spring/Spring.Aop/Aop/Support/Pointcuts.cs
new file mode 100644
index 00000000..33c86860
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/Pointcuts.cs
@@ -0,0 +1,146 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary> 
+	/// Various <see cref="Spring.Aop.IPointcut"/> related utility methods.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// These methods are particularly useful for composing pointcuts
+	/// using the union and intersection methods.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: Pointcuts.cs,v 1.6 2007/03/16 04:01:25 aseovic Exp $</version>
+    public sealed class Pointcuts
+	{
+		/// <summary>
+		/// Creates a union of the two supplied pointcuts.
+		/// </summary>
+		/// <param name="firstPointcut">The first pointcut.</param>
+		/// <param name="secondPointcut">The second pointcut.</param>
+		/// <returns>
+		/// The union of the two supplied pointcuts.
+		/// </returns>
+		/// <seealso cref="Spring.Aop.Support.UnionPointcut"/>
+		public static IPointcut Union(IPointcut firstPointcut, IPointcut secondPointcut)
+		{
+			return new UnionPointcut(firstPointcut, secondPointcut);
+		}
+
+		/// <summary>
+		/// Creates an <see cref="Spring.Aop.IPointcut"/> that is the
+		/// intersection of the two supplied pointcuts.
+		/// </summary>
+		/// <param name="firstPointcut">The first pointcut.</param>
+		/// <param name="secondPointcut">The second pointcut.</param>
+		/// <returns>
+		/// An <see cref="Spring.Aop.IPointcut"/> that is the
+		/// intersection of the two supplied pointcuts.
+		/// </returns>
+		public static IPointcut Intersection(IPointcut firstPointcut, IPointcut secondPointcut)
+		{
+			return new ComposablePointcut(
+				firstPointcut.TypeFilter, firstPointcut.MethodMatcher)
+				.Intersection(secondPointcut);
+		}
+
+		/// <summary>
+		/// Performs the least expensive check for a match.
+		/// </summary>
+		/// <param name="pointcut">
+		/// The <see cref="Spring.Aop.IPointcut"/> to be evaluated.
+		/// </param>
+		/// <param name="method">The candidate method.</param>
+		/// <param name="targetType">
+		/// The target <see cref="System.Type"/>.
+		/// </param>
+		/// <param name="args">The arguments to the method</param>
+		/// <returns><see langword="true"/> if there is a runtime match.</returns>
+		/// <seealso cref="Spring.Aop.IMethodMatcher.Matches(MethodInfo, Type)"/>
+		public static bool Matches(
+			IPointcut pointcut, MethodInfo method, Type targetType, object[] args)
+		{
+			if(pointcut != null) 
+			{
+				if (pointcut == TruePointcut.True)
+				{
+					return true;
+				}
+				if (pointcut.TypeFilter.Matches(targetType))
+				{
+					IMethodMatcher mm = pointcut.MethodMatcher;
+					if (mm.Matches(method, targetType))
+					{
+						return mm.IsRuntime ? mm.Matches(method, targetType, args) : true;
+					}
+				}
+			}
+			return false;
+		}
+
+		/// <summary>
+		/// Are the supplied <see cref="Spring.Aop.IPointcut"/>s equal?
+		/// </summary>
+		/// <param name="firstPointcut">The first pointcut.</param>
+		/// <param name="secondPointcut">The second pointcut.</param>
+		/// <returns>
+		/// <see langword="true"/> if the supplied <see cref="Spring.Aop.IPointcut"/>s
+		/// are equal.
+		/// </returns>
+		public static bool AreEqual(IPointcut firstPointcut, IPointcut secondPointcut)
+		{
+			return firstPointcut.TypeFilter == secondPointcut.TypeFilter
+				&& firstPointcut.MethodMatcher == secondPointcut.MethodMatcher;
+		}
+
+		#region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.Pointcuts"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such has no publicly
+		/// visible constructors.
+		/// </p>
+		/// </remarks>
+		private Pointcuts()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/RegularExpressionMethodPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/RegularExpressionMethodPointcutAdvisor.cs
new file mode 100644
index 00000000..2195a67a
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/RegularExpressionMethodPointcutAdvisor.cs
@@ -0,0 +1,140 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+    /// <summary>
+    /// Convenient class for regular expression method pointcuts that hold an
+    /// <see cref="AopAlliance.Aop.IAdvice"/>, making them an
+    /// <see cref="Spring.Aop.IAdvisor"/>.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Configure this class using the <see cref="Pattern"/> and
+    /// <see cref="Patterns"/> pass-through properties. These are analogous
+    /// to the <see cref="AbstractRegularExpressionMethodPointcut.Pattern"/> and
+    /// <see cref="AbstractRegularExpressionMethodPointcut.Pattern"/>s properties of the
+    /// <see cref="AbstractRegularExpressionMethodPointcut"/> class.
+    /// </p>
+    /// <p>
+    /// Can delegate to any type of regular expression pointcut. Currently only
+    /// pointcuts based on the regular expression classes from the .NET Base
+    /// Class Library are supported. The
+    /// <see cref="Spring.Aop.Support.DefaultPointcutAdvisor.Pointcut"/>
+    /// property must be a subclass of the
+    /// <see cref="AbstractRegularExpressionMethodPointcut"/> class.
+    /// </p>
+    /// <p>
+    /// This should not normally be set directly.
+    /// </p>
+    /// </remarks>
+    /// <author>Dmitriy Kopylenko</author>
+    /// <author>Rod Johnson</author>
+    /// <author>Simon White (.NET)</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <see cref=" SdkRegularExpressionMethodPointcut"/>
+    [Serializable]
+    public class RegularExpressionMethodPointcutAdvisor : AbstractGenericPointcutAdvisor
+    {
+        private AbstractRegularExpressionMethodPointcut pointcut;
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="RegularExpressionMethodPointcutAdvisor"/>
+        /// class.
+        /// </summary>
+        public RegularExpressionMethodPointcutAdvisor()
+        {
+            InitPointcut();
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="RegularExpressionMethodPointcutAdvisor"/>
+        /// class for the supplied <paramref name="advice"/>.
+        /// </summary><param name="advice">
+        /// The target advice.
+        /// </param>
+        public RegularExpressionMethodPointcutAdvisor(IAdvice advice)
+        {
+            Advice = advice;
+            InitPointcut();
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// A single pattern to be used during method evaluation.
+        /// </summary>
+        public string Pattern
+        {
+            set
+            {
+                AbstractRegularExpressionMethodPointcut armp = (AbstractRegularExpressionMethodPointcut) Pointcut;
+                armp.Pattern = value;
+            }
+        }
+
+        /// <summary>
+        /// Multiple patterns to be used during method evaluation.
+        /// </summary>
+        public string[] Patterns
+        {
+            set
+            {
+                AbstractRegularExpressionMethodPointcut armp = (AbstractRegularExpressionMethodPointcut) Pointcut;
+                armp.Patterns = value;
+            }
+        }
+
+        /// <summary>
+        /// The <see cref="Spring.Aop.IPointcut"/> that drives this advisor.
+        /// </summary>
+        public override IPointcut Pointcut
+        {
+            get { return pointcut; }
+            set { 
+                AssertUtils.AssertArgumentType(value, "pointcut", typeof(AbstractRegularExpressionMethodPointcut), 
+                                              "Pointcut most be compatible with type AbstractRegularExpressionMethodPointuct");
+                pointcut = value as AbstractRegularExpressionMethodPointcut;
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Initialises the pointcut.
+        /// </summary>
+        protected void InitPointcut()
+        {
+            pointcut = new SdkRegularExpressionMethodPointcut();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/RootTypeFilter.cs b/src/Spring/Spring.Aop/Aop/Support/RootTypeFilter.cs
new file mode 100644
index 00000000..f4ad59da
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/RootTypeFilter.cs
@@ -0,0 +1,80 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Simple <see cref="Spring.Aop.ITypeFilter"/> implementation that matches
+	/// all classes classes (and any derived subclasses) of a give root
+	/// <see cref="System.Type"/>.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: RootTypeFilter.cs,v 1.3 2007/03/16 04:01:25 aseovic Exp $</version>
+    [Serializable]
+    public class RootTypeFilter : ITypeFilter
+	{
+		private Type _rootType;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="RootTypeFilter"/> for the supplied
+		/// <paramref name="rootType"/>.
+		/// </summary>
+		/// <param name="rootType">The root <see cref="System.Type"/>.</param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="rootType"/> is <see langword="null"/>.
+		/// </exception>
+		public RootTypeFilter(Type rootType)
+		{
+			AssertUtils.ArgumentNotNull(rootType, "rootType");
+			_rootType = rootType;
+		}
+
+		/// <summary>
+		/// Should the pointcut apply to the supplied
+		/// <see cref="System.Type"/>?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Returns <see langword="true"/> if the supplied <paramref name="type"/>
+		/// can be assigned to the root <see cref="System.Type"/>.
+		/// </p>
+		/// </remarks>
+		/// <param name="type">
+		/// The candidate <see cref="System.Type"/>.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if the advice should apply to the supplied
+		/// <paramref name="type"/>
+		/// </returns>
+		public virtual bool Matches(Type type)
+		{
+			return _rootType.IsAssignableFrom(type);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/SdkRegularExpressionMethodPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/SdkRegularExpressionMethodPointcut.cs
new file mode 100644
index 00000000..fb7d5900
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/SdkRegularExpressionMethodPointcut.cs
@@ -0,0 +1,207 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using System.Text.RegularExpressions;
+using Common.Logging;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Regular expression based pointcut object.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Uses the regular expression classes from the .NET Base Class Library.
+	/// </p>
+	/// <p>
+	/// The regular expressions must be a match. For example, the
+	/// <code>.*Get*</code> pattern will match <c>Com.Mycom.Foo.GetBar()</c>, and
+	/// <code>Get.*</code> will not.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	[Serializable]
+	public class SdkRegularExpressionMethodPointcut : AbstractRegularExpressionMethodPointcut
+	{
+		private ILog _logger = LogManager.GetLogger(typeof(SdkRegularExpressionMethodPointcut));
+		private Regex[] _compiledPatterns = new Regex[0];
+        private RegexOptions _defaultOptions = RegexOptions.None;
+	    
+		#region Constructors
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="SdkRegularExpressionMethodPointcut"/> class.
+		/// </summary>
+		public SdkRegularExpressionMethodPointcut()
+		{
+		}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="SdkRegularExpressionMethodPointcut"/> class,
+        /// using the supplied pattern or <paramref name="patterns"/>.
+        /// </summary>
+        /// <param name="patterns">
+        /// The intial pattern value(s) to be matched against.
+        /// </param>
+        public SdkRegularExpressionMethodPointcut(params string[] patterns)
+        {
+            Patterns = patterns;
+        }
+
+	    /// <summary>
+	    /// Creates a new instance of the
+	    /// <see cref="SdkRegularExpressionMethodPointcut"/> class.
+	    /// </summary>
+	    /// <param name="info">
+	    /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+	    /// that holds the serialized object data about the exception being thrown.
+	    /// </param>
+	    /// <param name="context">
+	    /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+	    /// that contains contextual information about the source or destination.
+	    /// </param>
+	    /// <exception cref="AopAlliance.Aop.AspectException">
+	    /// If an error was encountered during the deserialization process.
+	    /// </exception>
+	    protected SdkRegularExpressionMethodPointcut(SerializationInfo info, StreamingContext context)
+	        : base(info, context)
+	    {
+	    }
+
+	    #endregion
+
+	    #region Properties
+
+	    /// <summary>
+	    /// Gets or sets default options that should be used by
+	    /// regular expressions that don't have options explicitly set.
+	    /// </summary>
+	    /// <value>
+	    /// Default options that should be used by regular expressions 
+	    /// that don't have options explicitly set.
+	    /// </value>
+	    public RegexOptions DefaultOptions
+	    {
+	        get { return _defaultOptions; }
+	        set
+	        {
+	            _defaultOptions = value;
+	            InitPatternRepresentation(Patterns);
+	        }
+	    }
+
+	    #endregion
+
+	    #region Methods
+
+	    /// <summary>
+	    /// Initializes the regular expression pointcuts.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// Can be invoked multiple times.
+	    /// </p>
+	    /// <p>
+	    /// This method will be invoked from the
+	    /// <see cref="AbstractRegularExpressionMethodPointcut.Patterns"/> property,
+	    /// and also on deserialization.
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="patterns">
+	    /// The patterns to initialize.
+	    /// </param>
+	    /// <exception cref="System.ArgumentException">
+	    /// In the case of an invalid pattern.
+	    /// </exception>
+	    /// <exception cref="System.ArgumentNullException">
+	    /// If the supplied <paramref name="patterns"/> is <see langword="null"/>.
+	    /// </exception>
+	    protected override void InitPatternRepresentation(object[] patterns)
+	    {
+	        AssertUtils.ArgumentNotNull(patterns, "patterns");
+
+            if (patterns.Length > 0)
+            {
+                _compiledPatterns = new Regex[patterns.Length];
+                for (int i = 0; i < patterns.Length; i++)
+                {
+                    if (patterns[i] == null)
+                    {
+                        throw new ArgumentNullException(
+                            "Null is not a valid value for an element of the Patterns property.");
+                    }
+                    else if (patterns[i] is Regex)
+                    {
+                        _compiledPatterns[i] = (Regex)patterns[i];
+                    }
+                    else if (patterns[i] is string)
+                    {
+                        _compiledPatterns[i] = new Regex((string)patterns[i], DefaultOptions);
+                    }
+                    else
+                    {
+                        throw new ArgumentException(
+                            "You can only specify a string value or an instance of a Regex class " +
+                            "as an element of the 'Patterns' property.");
+                    }
+                }
+            }
+	    }
+
+	    /// <summary>
+	    /// Does the pattern at the supplied <paramref name="patternIndex"/>
+	    /// match this <paramref name="pattern"/>?
+	    /// </summary>
+	    /// <param name="pattern">The pattern to match</param>
+	    /// <param name="patternIndex">The index of pattern.</param>
+	    /// <returns>
+	    /// <see langword="true"/> if there is a match.
+	    /// </returns>
+	    protected override bool Matches(string pattern, int patternIndex)
+	    {
+	        Match match = _compiledPatterns[patternIndex].Match(pattern);
+	        bool matched = match.Success;
+
+	        #region Instrumentation
+
+	        if (_logger.IsDebugEnabled)
+	        {
+	            _logger.Debug("Candidate is: '" + pattern + "'; pattern is '" +
+	                          _compiledPatterns[patternIndex].ToString() + "'; matched=" + matched);
+	        }
+
+	        #endregion
+
+	        return matched;
+	    }
+
+	    #endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcher.cs
new file mode 100644
index 00000000..0f930290
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcher.cs
@@ -0,0 +1,103 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary> 
+	/// Convenient abstract superclass for static method matchers that don't care
+	/// about arguments at runtime. 
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: StaticMethodMatcher.cs,v 1.6 2006/04/09 07:18:37 markpollack Exp $</version>
+	[Serializable]
+	public abstract class StaticMethodMatcher : IMethodMatcher
+	{
+		/// <summary>
+		/// Is this <see cref="Spring.Aop.IMethodMatcher"/> dynamic?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Always returns <see langword="false"/>.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// Always returns <see langword="false"/>.
+		/// </value>
+		public bool IsRuntime
+		{
+			get { return false; }
+		}
+
+		/// <summary>
+		/// Is there a runtime (dynamic) match for the supplied
+		/// <paramref name="method"/>?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Always throws a <see cref="System.NotSupportedException"/>. This
+		/// method should never be called on a static matcher.
+		/// </p>
+		/// </remarks>
+		/// <param name="method">The candidate method.</param>
+		/// <param name="targetType">
+		/// The target <see cref="System.Type"/>.
+		/// </param>
+		/// <param name="args">The arguments to the method</param>
+		/// <returns>
+		/// Always throws a <see cref="System.NotSupportedException"/>.
+		/// </returns>
+		/// <exception cref="System.NotSupportedException">
+		/// Always.
+		/// </exception>
+		public bool Matches(MethodInfo method, Type targetType, object[] args)
+		{
+			throw new NotSupportedException(
+				"Illegal IMethodMatcher usage. Cannot call 3-arg Matches method on a static matcher.");
+		}
+
+		/// <summary>
+		/// Does the supplied <paramref name="method"/> satisfy this matcher?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Must be implemented by a derived class in order to specify matching
+		/// rules.
+		/// </p>
+		/// </remarks>
+		/// <param name="method">The candidate method.</param>
+		/// <param name="targetType">
+		/// The target <see cref="System.Type"/> (may be <see langword="null"/>,
+		/// in which case the candidate <see cref="System.Type"/> must be taken
+		/// to be the <paramref name="method"/>'s declaring class).
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if this this method matches statically.
+		/// </returns>
+		public abstract bool Matches(MethodInfo method, Type targetType);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcut.cs
new file mode 100644
index 00000000..89c7c2fa
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcut.cs
@@ -0,0 +1,85 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace Spring.Aop.Support
+{
+	/// <summary> 
+	/// Convenient superclass when one wants to force subclasses to
+	/// implement the <see cref="Spring.Aop.IMethodMatcher"/> interface
+	/// but subclasses will still want to be pointcuts.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The <see cref="Spring.Aop.Support.StaticMethodMatcherPointcut.TypeFilter"/>
+	/// property can be overriden to customize <see cref="System.Type"/> filter
+	/// behavior as well.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: StaticMethodMatcherPointcut.cs,v 1.8 2007/05/30 22:35:43 markpollack Exp $</version>
+	[Serializable]
+	public abstract class StaticMethodMatcherPointcut : StaticMethodMatcher, IPointcut
+	{
+	    private ITypeFilter typeFilter = TrueTypeFilter.True;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.AbstractRegularExpressionMethodPointcut"/>
+		/// class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an abstract class, and as such has no publicly
+		/// visible constructors.
+		/// </p>
+		/// </remarks>
+		protected StaticMethodMatcherPointcut()
+		{
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.ITypeFilter"/> for this pointcut.
+		/// </summary>
+		/// <value>
+		/// The current <see cref="Spring.Aop.ITypeFilter"/>.
+		/// </value>
+		public virtual ITypeFilter TypeFilter
+		{
+            get { return typeFilter; }
+            set { typeFilter = value;}
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.IMethodMatcher"/> for this pointcut.
+		/// </summary>
+		/// <value>
+		/// The current <see cref="Spring.Aop.IMethodMatcher"/>.
+		/// </value>
+		public virtual IMethodMatcher MethodMatcher
+		{
+			get { return this; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcutAdvisor.cs
new file mode 100644
index 00000000..e4f6ccdd
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcutAdvisor.cs
@@ -0,0 +1,134 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Convenient superclass for <see cref="Spring.Aop.IAdvisor"/>s that
+	/// are also static pointcuts.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.Net)</author>
+	/// <version>$Id: StaticMethodMatcherPointcutAdvisor.cs,v 1.6 2006/04/09 07:18:37 markpollack Exp $</version>
+	[Serializable]
+	public abstract class StaticMethodMatcherPointcutAdvisor
+		: StaticMethodMatcherPointcut, IPointcutAdvisor, IOrdered
+	{
+		private int _order = Int32.MaxValue;
+		private IAdvice _advice;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.StaticMethodMatcherPointcutAdvisor"/>
+		/// class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an abstract class, and as such has no publicly
+		/// visible constructors.
+		/// </p>
+		/// </remarks>
+		protected StaticMethodMatcherPointcutAdvisor()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.AbstractRegularExpressionMethodPointcut"/>
+		/// class for the supplied <paramref name="advice"/>
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an abstract class, and as such has no publicly
+		/// visible constructors.
+		/// </p>
+		/// </remarks>
+		/// <param name="advice">
+		/// The advice to use.
+		/// </param>
+		public StaticMethodMatcherPointcutAdvisor(IAdvice advice)
+		{
+			this._advice = advice;
+		}
+
+		/// <summary>
+		/// Is this advice associated with a particular instance?
+		/// </summary>
+		/// <value>
+		/// <see langword="true"/> if this advice is associated with a
+		/// particular instance.
+		/// </value>
+		/// <exception cref="System.NotSupportedException">
+		/// Always; this property is not yet supported.
+		/// </exception>
+		public virtual bool IsPerInstance
+		{
+			get
+			{
+				throw new NotSupportedException(
+					"The 'IsPerInstance' property of the IAdvisor interface is " +
+					"not yet supported in Spring.NET.");
+			}
+		}
+
+		/// <summary>
+		/// Returns this <see cref="Spring.Aop.IAdvisor"/>s order in the
+		/// interception chain.
+		/// </summary>
+		/// <returns>
+		/// This <see cref="Spring.Aop.IAdvisor"/>s order in the
+		/// interception chain.
+		/// </returns>
+		public virtual int Order
+		{
+			get { return this._order; }
+			set { this._order = value; }
+		}
+
+		/// <summary>
+		/// Return the advice part of this advisor.
+		/// </summary>
+		/// <returns>
+		/// The advice that should apply if the pointcut matches.
+		/// </returns>
+		/// <see cref="Spring.Aop.IAdvisor.Advice"/>
+		public virtual IAdvice Advice
+		{
+			get { return this._advice; }
+			set { this._advice = value; }
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.IPointcut"/> that drives this advisor.
+		/// </summary>
+		public virtual IPointcut Pointcut
+		{
+			get { return this; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/TypeFilters.cs b/src/Spring/Spring.Aop/Aop/Support/TypeFilters.cs
new file mode 100644
index 00000000..2ad45c5f
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/TypeFilters.cs
@@ -0,0 +1,158 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Defines miscellaneous <see cref="System.Type"/> filter operations.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.Net)</author>
+	/// <version>$Id: TypeFilters.cs,v 1.4 2007/03/16 04:01:25 aseovic Exp $</version>
+	public sealed class TypeFilters
+	{
+		/// <summary>
+		/// Creates a union of two <see cref="System.Type"/> filters.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The filter arising from the union will match all of the
+		/// <see cref="System.Type"/> that either of the two supplied filters
+		/// would match.
+		/// </p>
+		/// </remarks>
+		/// <param name="first">
+		/// The first <see cref="System.Type"/> filter.
+		/// </param>
+		/// <param name="second">
+		/// The second <see cref="System.Type"/> filter.
+		/// </param>
+		/// <returns>
+		/// The union of the supplied <see cref="System.Type"/> filters.
+		/// </returns>
+		public static ITypeFilter Union(ITypeFilter first, ITypeFilter second)
+		{
+			return new UnionTypeFilter(new ITypeFilter[] {first, second});
+		}
+
+		/// <summary>
+		/// Creates the intersection of two <see cref="System.Type"/> filters.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The filter arising from the intersection will match all of the
+		/// <see cref="System.Type"/> that both of the two supplied filters
+		/// would match.
+		/// </p>
+		/// </remarks>
+		/// <param name="first">
+		/// The first <see cref="System.Type"/> filter.
+		/// </param>
+		/// <param name="second">
+		/// The second <see cref="System.Type"/> filter.
+		/// </param>
+		/// <returns>
+		/// The intersection of the supplied <see cref="System.Type"/> filters.
+		/// </returns>
+		public static ITypeFilter Intersection(ITypeFilter first, ITypeFilter second)
+		{
+			return new IntersectionTypeFilter(new ITypeFilter[] {first, second});
+		}
+
+		/// <summary>
+		/// Union class filter implementation.
+		/// </summary>
+        [Serializable]
+        private sealed class UnionTypeFilter : ITypeFilter
+		{
+			private ITypeFilter[] _filters;
+
+			public UnionTypeFilter(ITypeFilter[] filters)
+			{
+				_filters = filters;
+			}
+
+			public bool Matches(Type type)
+			{
+				for (int i = 0; i < _filters.Length; i++)
+				{
+					if (_filters[i].Matches(type))
+					{
+						return true;
+					}
+				}
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Intersection <see cref="Spring.Aop.ITypeFilter"/> implementation.
+		/// </summary>
+        [Serializable]
+        private sealed class IntersectionTypeFilter : ITypeFilter
+		{
+			private ITypeFilter[] _filters;
+
+			public IntersectionTypeFilter(ITypeFilter[] filters)
+			{
+				_filters = filters;
+			}
+
+			public bool Matches(Type type)
+			{
+				for (int i = 0; i < _filters.Length; i++)
+				{
+					if (!_filters[i].Matches(type))
+					{
+						return false;
+					}
+				}
+				return true;
+			}
+		}
+
+		#region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.TypeFilters"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such has no publicly visible constructors.
+		/// </p>
+		/// </remarks>
+		private TypeFilters()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Support/UnionPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/UnionPointcut.cs
new file mode 100644
index 00000000..85956bae
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Support/UnionPointcut.cs
@@ -0,0 +1,124 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary> 
+	/// A <see cref="Spring.Aop.IPointcut"/> union.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Such pointcut unions are tricky, because one cannot simply <c>OR</c>
+	/// the respective <see cref="Spring.Aop.IMethodMatcher"/>s: one has to
+	/// ascertain that each <see cref="Spring.Aop.IMethodMatcher"/>'s
+	/// <see cref="Spring.Aop.IPointcut.TypeFilter"/> is also satisfied.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: UnionPointcut.cs,v 1.8 2007/03/16 04:01:25 aseovic Exp $</version>
+    [Serializable]
+    internal class UnionPointcut : IPointcut
+	{
+		private IPointcut a;
+		private IPointcut b;
+		private IMethodMatcher mm;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Support.UnionPointcut"/> class.
+		/// </summary>
+		/// <param name="firstPointcut">The first pointcut.</param>
+		/// <param name="secondPointcut">The second pointcut.</param>
+		public UnionPointcut(IPointcut firstPointcut, IPointcut secondPointcut)
+		{
+			this.a = firstPointcut;
+			this.b = secondPointcut;
+			this.mm = new PointcutUnionMethodMatcher(this);
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.ITypeFilter"/> for this pointcut.
+		/// </summary>
+		/// <value>
+		/// The current <see cref="Spring.Aop.ITypeFilter"/>.
+		/// </value>
+		public ITypeFilter TypeFilter
+		{
+			get { return TypeFilters.Union(a.TypeFilter, b.TypeFilter); }
+
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.IMethodMatcher"/> for this pointcut.
+		/// </summary>
+		/// <value>
+		/// The current <see cref="Spring.Aop.IMethodMatcher"/>.
+		/// </value>
+		public IMethodMatcher MethodMatcher
+		{
+			get { return mm; }
+		}
+
+		/// <summary>
+		/// Internal method matcher class for union pointcut.
+		/// </summary>
+		private sealed class PointcutUnionMethodMatcher : IMethodMatcher
+		{
+			private UnionPointcut _enclosingInstance;
+
+			public PointcutUnionMethodMatcher(UnionPointcut enclosingInstance)
+			{
+				this._enclosingInstance = enclosingInstance;
+			}
+
+			public bool IsRuntime
+			{
+				get
+				{
+					return _enclosingInstance.a.MethodMatcher.IsRuntime
+						|| _enclosingInstance.b.MethodMatcher.IsRuntime;
+				}
+			}
+
+			public bool Matches(MethodInfo method, Type targetType)
+			{
+				return (_enclosingInstance.a.TypeFilter.Matches(targetType)
+					&& _enclosingInstance.a.MethodMatcher.Matches(method, targetType))
+					|| (_enclosingInstance.b.TypeFilter.Matches(targetType)
+						&& _enclosingInstance.b.MethodMatcher.Matches(method, targetType));
+			}
+
+			public bool Matches(MethodInfo method, Type targetType, object[] args)
+			{
+				// 2-arg matcher will already have run, so we don't need to do type filtering again...
+				return _enclosingInstance.a.MethodMatcher.Matches(method, targetType, args)
+					|| _enclosingInstance.b.MethodMatcher.Matches(method, targetType, args);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Target/AbstractPoolingTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/AbstractPoolingTargetSource.cs
new file mode 100644
index 00000000..e6977f7c
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Target/AbstractPoolingTargetSource.cs
@@ -0,0 +1,204 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+using Spring.Aop.Support;
+using Spring.Objects;
+using Spring.Objects.Factory;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// Abstract superclass for pooling <see cref="Spring.Aop.ITargetSource"/>s.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Maintains a pool of target instances, acquiring and releasing a target
+	/// object from the pool for each method invocation. 
+	/// </p>
+	/// <p>
+	/// This class is independent of pooling technology.
+	/// </p>
+	/// <p>
+	/// Subclasses must implement the
+	/// <see cref="Spring.Aop.Target.AbstractPoolingTargetSource.GetTarget"/> and
+	/// <see cref="Spring.Aop.Target.AbstractPoolingTargetSource.ReleaseTarget"/>
+	/// methods to work with their chosen pool. The
+	/// <see cref="Spring.Aop.Target.AbstractPrototypeTargetSource.NewPrototypeInstance"/>
+	/// method inherited from the
+	/// <see cref="Spring.Aop.Target.AbstractPrototypeTargetSource"/> base class
+	/// can be used to create objects to put in the pool. Subclasses must also
+	/// implement some of the monitoring methods from the
+	/// <see cref="Spring.Aop.Target.PoolingConfig"/> interface. This class
+	/// provides the
+	/// <see cref="Spring.Aop.Target.AbstractPoolingTargetSource.GetPoolingConfigMixin"/>
+	/// method to return an <see cref="Spring.Aop.IIntroductionAdvisor"/>
+	/// making these statistics available on proxied objects.
+	/// </p>
+	/// <p>
+	/// This class implements the <see cref="System.IDisposable"/> interface in
+	/// order to force subclasses to implement the
+	/// <see cref="System.IDisposable.Dispose"/> method to cleanup and close
+	/// down their pool.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Federico Spinazzi (.NET)</author>
+	/// <version>$Id: AbstractPoolingTargetSource.cs,v 1.7 2007/03/16 04:01:26 aseovic Exp $</version>
+    [Serializable]
+    public abstract class AbstractPoolingTargetSource
+		: AbstractPrototypeTargetSource, PoolingConfig, IDisposable, IAdvice
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Target.AbstractPoolingTargetSource"/>
+		/// class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an <see langword="abstract"/> class, and as such exposes no
+		/// public constructors.
+		/// </p>
+		/// </remarks>
+		protected AbstractPoolingTargetSource()
+		{
+		}
+
+		#endregion
+
+		/// <summary>
+		/// Returns the target object (acquired from the pool).
+		/// </summary>
+		/// <returns>The target object (acquired from the pool).</returns>
+		/// <exception cref="System.Exception">
+		/// If unable to obtain the target object.
+		/// </exception>
+		public abstract override object GetTarget();
+
+		/// <summary>
+		/// Gets the <see cref="Spring.Aop.Target.PoolingConfig"/> mixin.
+		/// </summary>
+		/// <returns>
+		/// An <see cref="Spring.Aop.IIntroductionAdvisor"/> exposing statistics
+		/// about the pool maintained by this object.
+		/// </returns>
+		public DefaultIntroductionAdvisor GetPoolingConfigMixin()
+		{
+			return new DefaultIntroductionAdvisor(this, typeof (PoolingConfig));
+		}
+
+		/// <summary>
+		/// The maximum number of object instances in this pool.
+		/// </summary>
+		public int MaxSize
+		{
+			get { return _maxSize; }
+			set { _maxSize = value; }
+		}
+
+		/// <summary>
+		/// The number of active object instances in this pool.
+		/// </summary>
+		public abstract int Active { get; }
+
+		/// <summary>
+		/// The number of free object instances in this pool.
+		/// </summary>
+		public abstract int Free { get; }
+
+		/// <summary>
+		/// The target factory that will be used to perform the lookup
+		/// of the object referred to by the
+		/// <see cref="Spring.Aop.Target.AbstractPrototypeTargetSource.TargetObjectName"/>
+		/// property.
+		/// </summary>
+		/// <value>
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// (will never be <see langword="null"/>).
+		/// </value>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In case of initialization errors.
+		/// </exception>
+		/// <seealso cref="Spring.Aop.Target.AbstractPrototypeTargetSource.ObjectFactory"/>
+		public override IObjectFactory ObjectFactory
+		{
+			set
+			{
+				base.ObjectFactory = value;
+				try
+				{
+					CreatePool(value);
+				}
+				catch (ObjectsException)
+				{
+					throw;
+				}
+				catch (Exception ex)
+				{
+					throw new ObjectInitializationException("Could not create instance pool.", ex);
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Create the pool.
+		/// </summary>
+		/// <param name="factory">
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>, in
+		/// case one needs collaborators from it (normally one's own properties
+		/// are sufficient).
+		/// </param>
+		/// <exception cref="System.Exception">
+		/// In the case of errors encountered during the creation of the pool.
+		/// </exception>
+		protected abstract void CreatePool(IObjectFactory factory);
+
+		/// <summary>
+		/// Releases the target object (returns it to the pool).
+		/// </summary>
+		/// <param name="target">
+		/// The target object to release (return to the pool).
+		/// </param>
+		/// <exception cref="System.Exception">
+		/// In the case that the <paramref name="target"/> could not be released.
+		/// </exception>
+		public abstract override void ReleaseTarget(object target);
+
+		/// <summary>
+		/// Performs application-defined tasks associated with freeing, releasing, or
+		/// resetting unmanaged resources.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Disposes of the pool. 
+		/// </p>
+		/// </remarks>
+		public abstract void Dispose();
+
+		private int _maxSize;
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs
new file mode 100644
index 00000000..902ffd7e
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs
@@ -0,0 +1,238 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using Common.Logging;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// Base class for dynamic <see cref="Spring.Aop.ITargetSource"/>
+	/// implementations that can create new prototype object instances to
+	/// support a pooling or new-instance-per-invocation strategy.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// All such <see cref="Spring.Aop.ITargetSource"/>s must run in an
+	/// <see cref="Spring.Objects.Factory.IObjectFactory"/>, as they need to
+	/// call the <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>
+	/// method to create a new prototype instance.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Federico Spinazzi (.NET)</author>
+	/// <version>$Id: AbstractPrototypeTargetSource.cs,v 1.11 2007/07/28 07:32:52 markpollack Exp $</version>
+    public abstract class AbstractPrototypeTargetSource
+		: ITargetSource, IObjectFactoryAware, IInitializingObject
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Target.AbstractPrototypeTargetSource"/>
+		/// class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an <see langword="abstract"/> class, and as such exposes no
+		/// public constructors.
+		/// </p>
+		/// </remarks>
+		protected AbstractPrototypeTargetSource()
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// The name of the target object to be created on each invocation.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This object should be a prototype, or the same instance will always
+		/// be obtained from the owning <see cref="ObjectFactory"/>.
+		/// </p>
+		/// </remarks>
+		public virtual string TargetObjectName
+		{
+			get { return _targetObjectName; }
+			set { 
+				_targetObjectName = value;
+			}
+		}
+
+		/// <summary>
+		/// The <see cref="System.Type"/> of the target object.
+		/// </summary>
+		public virtual Type TargetType
+		{
+			get { return _targetType; }
+		}
+
+		/// <summary>
+		/// Is the target source static?
+		/// </summary>
+		/// <value>
+		/// <see langword="true"/> if the target source is static.
+		/// </value>
+		public virtual bool IsStatic
+		{
+			get { return false; }
+		}
+
+		/// <summary>
+		/// The target factory that will be used to perform the lookup
+		/// of the object referred to by the <see cref="TargetObjectName"/>
+		/// property.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Needed so that prototype instances can be created as necessary.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// (will never be <see langword="null"/>).
+		/// </value>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In case of initialization errors.
+		/// </exception>
+		/// <seealso cref="Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/>
+		public virtual IObjectFactory ObjectFactory
+		{
+			get { return _owningObjectFactory; }
+			set
+			{
+				_owningObjectFactory = value;
+				if (!value.IsPrototype(TargetObjectName))
+				{
+					throw new ObjectDefinitionStoreException(
+						"Cannot use PrototypeTargetSource against a " +
+						"Singleton object; instances would not be independent.");
+				}
+
+				#region Instrumentation
+
+				if (logger.IsDebugEnabled)
+				{
+					logger.Debug(string.Format(
+						"Getting object with name '{0}' to determine class.",
+						TargetObjectName));
+				}
+
+				#endregion
+                
+                _targetType = _owningObjectFactory.GetType(TargetObjectName);
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Subclasses should use this method to create a new prototype instance.
+		/// </summary>
+		protected virtual object NewPrototypeInstance()
+		{
+			#region Instrumentation
+
+			if (logger.IsDebugEnabled)
+			{
+				logger.Debug(string.Format(
+					"Creating new target from object '{0}'.",
+					TargetObjectName));
+			}
+
+			#endregion
+
+			return ObjectFactory.GetObject(TargetObjectName);
+		}
+
+		/// <summary>
+		/// Returns the target object.
+		/// </summary>
+		/// <returns>The target object.</returns>
+		/// <exception cref="System.Exception">
+		/// If unable to obtain the target object.
+		/// </exception>
+		public abstract object GetTarget();
+
+		/// <summary>
+		/// Releases the target object.
+		/// </summary>
+		/// <param name="target">The target object to release.</param>
+		public virtual void ReleaseTarget(object target)
+		{
+		}
+
+		/// <summary>
+		/// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// after it has set all object properties supplied
+		/// (and satisfied the
+		/// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+		/// and <see cref="Spring.Context.IApplicationContextAware"/>
+		/// interfaces).
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Ensures that the <see cref="TargetObjectName"/> property has been
+		/// set to a valid value (i.e. is not <see langword="null"/> or a string
+		/// that consists solely of whitespace).
+		/// </p>
+		/// </remarks>
+		/// <exception cref="System.Exception">
+		/// In the event of misconfiguration (such as failure to set an essential
+		/// property) or if initialization fails.
+		/// </exception>
+		/// <seealso cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+		public virtual void AfterPropertiesSet()
+		{
+			AssertUtils.ArgumentHasText(
+				TargetObjectName, "TargetObjectName",
+				"The 'TargetObjectName' property must have a value.");
+		}
+
+		#endregion
+
+		#region Fields
+
+		/// <summary>
+		/// The shared <see cref="Common.Logging.ILog"/> instance for this class (and derived classes).
+		/// </summary>
+		protected readonly ILog logger = LogManager.GetLogger(typeof (AbstractPrototypeTargetSource));
+
+		private String _targetObjectName;
+		private IObjectFactory _owningObjectFactory;
+		private Type _targetType;
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Target/EmptyTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/EmptyTargetSource.cs
new file mode 100644
index 00000000..8ffe6569
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Target/EmptyTargetSource.cs
@@ -0,0 +1,161 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// The <see cref="Spring.Aop.ITargetSource"/> to be used
+	/// when there is no target object, and behavior is supplied by the
+	/// advisors.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This class is exposed as a singleton.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: EmptyTargetSource.cs,v 1.4 2007/10/08 22:04:51 markpollack Exp $</version>
+	[Serializable]
+	public sealed class EmptyTargetSource : ITargetSource, ISerializable
+	{
+		/// <summary>
+		/// The <see cref="Spring.Aop.ITargetSource"/> to be used
+		/// when there is no target object, and behavior is supplied by the
+		/// advisors.
+		/// </summary>
+		public static readonly ITargetSource Empty = new EmptyTargetSource();
+
+		private object _dummyTarget = new object();
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="EmptyTargetSource"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such has no publicly visible constructors.
+		/// </p>
+		/// </remarks>
+		private EmptyTargetSource()
+		{
+		}
+
+		/// <summary>
+		/// The <see cref="System.Type"/> of the target object.
+		/// </summary>
+		public Type TargetType
+		{
+			get { return typeof(object); }
+		}
+
+		/// <summary>
+		/// Is the target source static?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The <see cref="Spring.Aop.Target.EmptyTargetSource.Empty"/>
+		/// instance is static, and this always returns <see langword="true"/>.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// <see langword="true"/> if the target source is static.
+		/// </value>
+		public bool IsStatic
+		{
+			get { return true; }
+		}
+
+		/// <summary>
+		/// Returns the target object.
+		/// </summary>
+		/// <returns>The target object.</returns>
+		/// <exception cref="System.Exception">
+		/// If unable to obtain the target object.
+		/// </exception>
+		public object GetTarget()
+		{
+			return _dummyTarget;
+		}
+
+		/// <summary>
+		/// Releases the target object.
+		/// </summary>
+		/// <remarks>
+		/// <note type="implementnotes">
+		/// This is a no-op operation in this implementation.
+		/// </note>
+		/// </remarks>
+		/// <param name="target">The target object to release.</param>
+		public void ReleaseTarget(object target)
+		{
+		}
+
+		/// <summary>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="Spring.Aop.ITargetSource"/>.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="Spring.Aop.ITargetSource"/>.
+		/// </returns>
+		public override string ToString()
+		{
+			return "EmptyTargetSource: no target";
+		}
+
+		/// <summary>
+		/// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+		/// the data needed to serialize the target object.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+		/// with data.
+		/// </param>
+		/// <param name="context">
+		/// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+		/// for this serialization.
+		/// </param>
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter=true)]
+		public void GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+			info.SetType(typeof (EmptyTargetSourceObjectReference));
+		}
+
+
+
+		[Serializable]
+		private sealed class EmptyTargetSourceObjectReference : IObjectReference
+		{
+			public object GetRealObject(StreamingContext context)
+			{
+				return EmptyTargetSource.Empty;
+			}
+		}
+	}
+}
diff --git a/src/Spring/Spring.Aop/Aop/Target/HotSwappableTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/HotSwappableTargetSource.cs
new file mode 100644
index 00000000..fe051edf
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Target/HotSwappableTargetSource.cs
@@ -0,0 +1,172 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// <see cref="Spring.Aop.ITargetSource"/> implementation that caches a
+	/// local target object, but allows the target to be swapped while the
+	/// application is running
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// If configuring an object of this class in a Spring IoC container,
+	/// use constructor injection to supply the intial target.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.Net)</author>
+	/// <version>$Id: HotSwappableTargetSource.cs,v 1.6 2007/03/16 04:01:26 aseovic Exp $</version>
+    [Serializable]
+    public class HotSwappableTargetSource : ITargetSource
+	{
+		private object _target;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Target.HotSwappableTargetSource"/> with the initial target.
+		/// </summary>
+		/// <param name="initialTarget">
+		/// The initial target. May be <see langword="null"/>.
+		/// </param>
+		public HotSwappableTargetSource(object initialTarget)
+		{
+			_target = initialTarget;
+		}
+
+		/// <summary>
+		/// The <see cref="System.Type"/> of the target object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Can return <see langword="null"/>.
+		/// </p>
+		/// </remarks>
+		public virtual Type TargetType
+		{
+			get { return _target.GetType(); }
+		}
+
+		/// <summary>
+		/// Is the target source static?
+		/// </summary>
+		/// <value>
+		/// <see langword="true"/> if the target source is static.
+		/// </value>
+		public virtual bool IsStatic
+		{
+			get { return false; }
+		}
+
+		/// <summary>
+		/// Returns the target object.
+		/// </summary>
+		/// <returns>The target object.</returns>
+		/// <exception cref="System.Exception">
+		/// If unable to obtain the target object.
+		/// </exception>
+		public object GetTarget()
+		{
+			// synchronization around something that takes so little time is fine...
+			lock (this)
+			{
+				return _target;
+			}
+		}
+
+		/// <summary>
+		/// Releases the target object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// No-op implementation.
+		/// </p>
+		/// </remarks>
+		/// <param name="target">The target object to release.</param>
+		public virtual void ReleaseTarget(Object target)
+		{
+		}
+
+		/// <summary>
+		/// Swap the target, returning the old target.
+		/// </summary>
+		/// <param name="newTarget">The new target.</param>
+		/// <returns>The old target.</returns>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the new target is <see langword="null"/>.
+		/// </exception>
+		public virtual object Swap(object newTarget)
+		{
+			AssertUtils.ArgumentNotNull(newTarget, "newTarget", "Cannot swap to null.");
+			lock (this)
+			{
+				// TODO: type checks
+				object old = _target;
+				_target = newTarget;
+				return old;
+			}
+		}
+
+		/// <summary>
+		/// Determines whether the specified <see cref="System.Object"/>
+		/// is equal to the current <see cref="System.Object"/>.  
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Two invoker interceptors are equal if they have the same target or
+		/// if the targets are equal.
+		/// </p>
+		/// </remarks>
+		/// <param name="other">The target source to compare with.</param>
+		/// <returns>
+		/// <see langword="true"/> if this instance is equal to the
+		/// specified <see cref="System.Object"/>.
+		/// </returns>
+		public override bool Equals(object other)
+		{
+			HotSwappableTargetSource otherTargetSource = other as HotSwappableTargetSource;
+			if (other == null)
+			{
+				return false;
+			}
+			return otherTargetSource._target == _target || otherTargetSource._target.Equals(_target);
+		}
+
+		/// <summary>
+		/// Serves as a hash function for a particular type, suitable for use
+		/// in hashing algorithms and data structures like a hash table.
+		/// </summary>
+		/// <returns>
+		/// A hash code for the current <see cref="System.Object"/>.
+		/// </returns>
+		public override int GetHashCode()
+		{
+			return base.GetHashCode() + 13 *
+				(_target == null ? 0 : _target.GetHashCode());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Target/IThreadLocalTargetSourceStats.cs b/src/Spring/Spring.Aop/Aop/Target/IThreadLocalTargetSourceStats.cs
new file mode 100644
index 00000000..16af7515
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Target/IThreadLocalTargetSourceStats.cs
@@ -0,0 +1,64 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// Statistics for a thread local <see cref="Spring.Aop.ITargetSource"/>.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Federico Spinazzi (.NET)</author>
+	/// <version>$Id: IThreadLocalTargetSourceStats.cs,v 1.3 2006/04/09 07:18:37 markpollack Exp $</version>
+	public interface IThreadLocalTargetSourceStats
+	{
+		/// <summary>
+		/// Gets the number of invocations of the
+		/// <see cref="ThreadLocalTargetSource.GetTarget()"/> and
+		/// <see cref="ThreadLocalTargetSource.Invoke(IMethodInvocation)"/> methods.
+		/// </summary>
+		/// <value>
+		/// The number of invocations of the
+		/// <see cref="ThreadLocalTargetSource.GetTarget()"/> and
+		/// <see cref="ThreadLocalTargetSource.Invoke(IMethodInvocation)"/> methods.
+		/// </value>
+		int Invocations { get; }
+
+		/// <summary>
+		/// Gets the number of hits that were satisfied by a thread bound object.
+		/// </summary>
+		/// <value>
+		/// The number of hits that were satisfied by a thread bound object.
+		/// </value>
+		int Hits { get; }
+
+		/// <summary>
+		/// Gets the number of thread bound objects created.
+		/// </summary>
+		/// <value>The number of thread bound objects created.</value>
+		int Objects { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Target/PoolingConfig.cs b/src/Spring/Spring.Aop/Aop/Target/PoolingConfig.cs
new file mode 100644
index 00000000..dabed2e1
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Target/PoolingConfig.cs
@@ -0,0 +1,52 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// Configuration interface for a pooling invoker.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: PoolingConfig.cs,v 1.4 2006/04/09 07:18:37 markpollack Exp $</version>
+	public interface PoolingConfig
+	{
+		/// <summary>
+		/// The number of active object instances in a pool.
+		/// </summary>
+		int Active { get; }
+
+		/// <summary>
+		/// The number of free object instances in a pool.
+		/// </summary>
+		int Free { get; }
+
+		/// <summary>
+		/// The maximum number of object instances in a pool.
+		/// </summary>
+		int MaxSize { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Target/PrototypeTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/PrototypeTargetSource.cs
new file mode 100644
index 00000000..728b5455
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Target/PrototypeTargetSource.cs
@@ -0,0 +1,80 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// <see cref="Spring.Aop.ITargetSource"/> implementation that creates a
+	/// new instance of the target object for each request.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Can only be used in an object factory.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Spinazzi Federico (.NET)</author>
+	/// <version>$Id: PrototypeTargetSource.cs,v 1.3 2006/04/09 07:18:37 markpollack Exp $
+	/// </version>
+	public sealed class PrototypeTargetSource : AbstractPrototypeTargetSource
+	{
+		/// <summary>
+		/// Returns the target object.
+		/// </summary>
+		/// <returns>The target object.</returns>
+		/// <exception cref="System.Exception">
+		/// If unable to obtain the target object.
+		/// </exception>
+		public override Object GetTarget()
+		{
+			return NewPrototypeInstance();
+		}
+
+		/// <summary>
+		/// Releases the target object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// No-op implementation.
+		/// </p>
+		/// </remarks>
+		/// <param name="target">The target object to release.</param>
+		public override void ReleaseTarget(object target)
+		{
+		}
+
+		/// <summary>
+		/// Is the target source static?
+		/// </summary>
+		/// <value>
+		/// <see langword="false"/> because this target source is never static.
+		/// </value>
+		public override bool IsStatic
+		{
+			get { return false; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs
new file mode 100644
index 00000000..977167b0
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs
@@ -0,0 +1,209 @@
+#region License
+
+/*
+* Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Objects.Factory;
+using Spring.Pool;
+using Spring.Pool.Support;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// Pooling target source implementation based on the
+	/// <see cref="Spring.Pool.Support.SimplePool"/>
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Federico Spinazzi</author>
+	/// <version>$Id: SimplePoolTargetSource.cs,v 1.9 2007/03/16 04:01:26 aseovic Exp $
+	/// </version>
+    [Serializable]
+    public class SimplePoolTargetSource : AbstractPoolingTargetSource, IPoolableObjectFactory
+	{
+		private IObjectPool objectPool;
+
+		/// <summary>
+		/// Returns the target object (acquired from the pool).
+		/// </summary>
+		/// <returns>
+		/// The target object (acquired from the pool).
+		/// </returns>
+		/// <exception cref="System.Exception">
+		/// If unable to obtain the target object.
+		/// </exception>
+		public override object GetTarget()
+		{
+			return this.objectPool.BorrowObject();
+		}
+
+		/// <summary>
+		/// Creates the pool.
+		/// </summary>
+		/// <param name="factory">
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>, in
+		/// case one needs collaborators from it (normally one's own properties
+		/// are sufficient).
+		/// </param>
+		/// <seealso cref="Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/>
+		protected override void CreatePool(IObjectFactory factory)
+		{
+			#region Instrumentation
+
+			if(logger.IsDebugEnabled)
+			{
+				logger.Debug("Creating object pool.");
+			}
+
+			#endregion
+
+			this.objectPool = CreateObjectPool();
+		}
+
+		/// <summary>
+		/// Creates a new instance of an appropriate
+		/// <see cref="Spring.Pool.IObjectPool"/> implementation.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Subclasses can, of course, override this method if they want to
+		/// return a different <see cref="Spring.Pool.IObjectPool"/> implementation.
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// An empty <see cref="Spring.Pool.IObjectPool"/>.
+		/// </returns>
+		protected virtual IObjectPool CreateObjectPool()
+		{
+			return new SimplePool(this, MaxSize);
+		}
+
+		/// <summary>
+		/// Releases the target object (returns it to the pool).
+		/// </summary>
+		/// <param name="target">The target object to release (return to the pool).</param>
+		/// <exception cref="System.Exception">
+		/// In the case that the <paramref name="target"/> could not be released.
+		/// </exception>
+		public override void ReleaseTarget(object target)
+		{
+			this.objectPool.ReturnObject(target);
+		}
+
+		/// <summary>
+		/// The number of active object instances in this pool.
+		/// </summary>
+		public override int Active
+		{
+			get { return this.objectPool.NumActive; }
+		}
+
+		/// <summary>
+		/// The number of free object instances in this pool.
+		/// </summary>
+		public override int Free
+		{
+			get { return this.objectPool.NumIdle; }
+		}
+
+		/// <summary>
+		/// Performs application-defined tasks associated with freeing, releasing, or
+		/// resetting unmanaged resources.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Disposes of the pool.
+		/// </p>
+		/// </remarks>
+		public override void Dispose()
+		{
+			#region Instrumentation
+
+			if(logger.IsDebugEnabled)
+			{
+				logger.Debug("Closing pool...");
+			}
+
+			#endregion
+
+			this.objectPool.Close();
+		}
+
+		/// <summary>
+		/// Creates an instance that can be returned by the pool.
+		/// </summary>
+		/// <returns>
+		/// An instance that can be returned by the pool.
+		/// </returns>
+		/// <seealso cref="Pool.IPoolableObjectFactory.MakeObject"/>
+		public virtual Object MakeObject()
+		{
+			return NewPrototypeInstance();
+		}
+
+		/// <summary>
+		/// Destroys an instance no longer needed by the pool.
+		/// </summary>
+		/// <param name="obj">The instance to be destroyed.</param>
+		/// <seealso cref="Pool.IPoolableObjectFactory.DestroyObject"/>
+		public virtual void DestroyObject(object obj)
+		{
+			if (obj is IDisposable)
+			{
+				((IDisposable) obj).Dispose();
+			}
+		}
+
+		/// <summary>
+		/// Ensures that the instance is safe to be returned by the pool.
+		/// Returns false if this object should be destroyed.
+		/// </summary>
+		/// <param name="obj">The instance to validate.</param>
+		/// <returns>
+		/// <see langword="false"/> if this object is not valid and
+		/// should be dropped from the pool, otherwise <see langword="true"/>.
+		/// </returns>
+		/// <seealso cref="IPoolableObjectFactory.ValidateObject(object)"/>
+		public virtual bool ValidateObject(object obj)
+		{
+			return true;
+		}
+
+		/// <summary>
+		/// Reinitialize an instance to be returned by the pool.
+		/// </summary>
+		/// <param name="obj">The instance to be activated.</param>
+		/// <seealso cref="IPoolableObjectFactory.ActivateObject(object)"/>
+		public virtual void ActivateObject(object obj)
+		{
+		}
+
+		/// <summary>
+		/// Passivates the object.
+		/// </summary>
+		/// <param name="obj">The instance returned to the pool.</param>
+		/// <seealso cref="Pool.IPoolableObjectFactory.PassivateObject"/>
+		public virtual void PassivateObject(object obj)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Target/SingletonTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/SingletonTargetSource.cs
new file mode 100644
index 00000000..beb57231
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Target/SingletonTargetSource.cs
@@ -0,0 +1,162 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// <see cref="Spring.Aop.ITargetSource"/> implementation that holds a local
+	/// object.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This is the default implementation of the
+	/// <see cref="Spring.Aop.ITargetSource"/> interface used by the AOP
+	/// framework. There should be no need to create objects of this class in
+	/// application code.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: SingletonTargetSource.cs,v 1.8 2008/03/21 14:11:57 markpollack Exp $</version>
+    [Serializable]
+    public sealed class SingletonTargetSource : ITargetSource
+	{
+		private object target;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Aop.Target.SingletonTargetSource"/>
+		/// for the specified target object.
+		/// </summary>
+		/// <param name="target">The target object to expose.</param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="target"/> is
+		/// <see langword="null"/>.
+		/// </exception>
+		public SingletonTargetSource(object target)
+		{
+			AssertUtils.ArgumentNotNull(target, "target");
+			this.target = target;
+		}
+
+	    #region ITarget Source impl
+
+	    /// <summary>
+		/// The <see cref="System.Type"/> of the target object.
+		/// </summary>
+		public Type TargetType
+		{
+			get { return target.GetType(); }
+		}
+
+		/// <summary>
+		/// Is the target source static?
+		/// </summary>
+		/// <value>
+		/// <see langword="true"/> because this target source is always static.
+		/// </value>
+		public bool IsStatic
+		{
+			get { return true; }
+		}
+
+		/// <summary>
+		/// Returns the target object.
+		/// </summary>
+		/// <returns>The target object.</returns>
+		/// <exception cref="System.Exception">
+		/// If unable to obtain the target object.
+		/// </exception>
+		public object GetTarget()
+		{
+			return target;
+		}
+
+		/// <summary>
+		/// Releases the target object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// No-op implementation.
+		/// </p>
+		/// </remarks>
+		/// <param name="target">The target object to release.</param>
+		public void ReleaseTarget(object target)
+		{
+          
+		}
+
+	    #endregion
+
+	    /// <summary>
+		/// Returns a stringified representation of this target source.
+		/// </summary>
+		/// <returns>
+		/// A stringified representation of this target source.
+		/// </returns>
+		public override string ToString()
+		{
+			return "Singleton target source (not dynamic): target=[" + target + "]";
+		}
+
+	    /// <summary>
+	    /// Determines whether the specified <see cref="System.Object"/>
+	    /// is equal to the current <see cref="System.Object"/>.  
+	    /// </summary>
+	    /// <param name="other">The target source to compare with.</param>
+	    /// <returns>
+	    /// <see langword="true"/> if this instance is equal to the
+	    /// specified <see cref="System.Object"/>.
+	    /// </returns>
+	    public override bool Equals(object other)
+	    {
+	        if (this == other)
+	        {
+	            return true;
+	        }
+	        SingletonTargetSource b = other as SingletonTargetSource;
+	        if (b == null)
+	        {
+	            return false;
+	        }
+	        return target.Equals(b.target);
+	    }
+
+	    /// <summary>
+		/// Serves as a hash function for a particular type, suitable for use
+		/// in hashing algorithms and data structures like a hash table.
+		/// </summary>
+		/// <returns>
+		/// A hash code for the current <see cref="System.Object"/>.
+		/// </returns>
+		public override int GetHashCode()
+		{
+			return base.GetHashCode() + 13 *
+				(target == null ? 0 : target.GetHashCode());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/Target/ThreadLocalTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/ThreadLocalTargetSource.cs
new file mode 100644
index 00000000..91c8a446
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/Target/ThreadLocalTargetSource.cs
@@ -0,0 +1,244 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Threading;
+using AopAlliance.Intercept;
+using Spring.Aop.Support;
+using Spring.Collections;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// <see cref="Spring.Aop.ITargetSource"/> implementation that uses a
+	/// threading model in which every thread has its own copy of the target.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Alternative to an object pool.
+	/// </p>
+	/// <p>
+	/// Application code is written as to a normal pool; callers can't assume
+	/// they will be dealing with the same instance in invocations in different
+	/// threads. However, state can be relied on during the operations of a
+	/// single thread: for example, if one caller makes repeated calls on the
+	/// AOP proxy.
+	/// </p>
+	/// <p>
+	/// This class act both as an introduction and as an interceptor, so it 
+	/// should be added twice, once as an introduction and once as an
+	/// interceptor.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Federico Spinazzi (.NET)</author>
+	/// <version>$Id: ThreadLocalTargetSource.cs,v 1.8 2006/04/09 07:18:37 markpollack Exp $</version>
+	public sealed class ThreadLocalTargetSource : AbstractPrototypeTargetSource,
+		IThreadLocalTargetSourceStats, IDisposable, IMethodInterceptor
+	{
+		#region Fields
+
+		/// <summary>
+		/// ThreadLocal holding the target associated with the current thread.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Unlike most thread local storage which is static, this variable is
+		/// meant to be per thread per instance of this class.
+		/// </p>
+		/// </remarks>
+		private LocalDataStoreSlot _targetInThread = Thread.AllocateDataSlot();
+
+		/// <summary>
+		/// The set of managed targets, enabling us to keep track of the
+		/// targets we've created.
+		/// </summary>
+		private ISet _targetSet = new ListSet();
+
+		private int _invocations;
+		private int _hits;
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets the number of invocations of the <see cref="GetTarget()"/> and
+		/// <see cref="Invoke(IMethodInvocation)"/> methods.
+		/// </summary>
+		/// <value>
+		/// The number of invocations of the <see cref="GetTarget()"/> and
+		/// <see cref="Invoke(IMethodInvocation)"/> methods.
+		/// </value>
+		public int Invocations
+		{
+			get { return _invocations; }
+		}
+
+		/// <summary>
+		/// Gets the number of hits that were satisfied by a thread bound object.
+		/// </summary>
+		/// <value>
+		/// The number of hits that were satisfied by a thread bound object.
+		/// </value>
+		public int Hits
+		{
+			get { return _hits; }
+		}
+
+		/// <summary>
+		/// Gets the number of thread bound objects created.
+		/// </summary>
+		/// <value>The number of thread bound objects created.</value>
+		public int Objects
+		{
+			get { return _targetSet.Count; }
+		}
+
+		private object ThreadBoundTarget
+		{
+			get { return Thread.GetData(_targetInThread); }
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Returns the target object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Tries to locate the target from thread local storage. If no target
+		/// is found, a target will be obtained and bound to the thread.
+		/// </p>
+		/// </remarks>
+		/// <returns>The target object.</returns>
+		/// <exception cref="System.Exception">
+		/// If unable to obtain the target object.
+		/// </exception>
+		/// <seealso cref="Spring.Aop.Target.AbstractPrototypeTargetSource.NewPrototypeInstance"/>
+		public override Object GetTarget()
+		{
+			++_invocations;
+			object target = ThreadBoundTarget;
+			if (target == null)
+			{
+				#region Instrumentation
+
+				if (logger.IsDebugEnabled)
+				{
+					logger.Debug(string.Format(
+						"No target for apartment prototype '{0}' " +
+						"found in thread: creating one and binding it to thread '#{1}'",
+						TargetObjectName, Thread.CurrentThread.GetHashCode()));
+				}
+
+				#endregion
+
+				target = NewPrototypeInstance();
+				Thread.SetData(_targetInThread, target);
+				_targetSet.Add(target);
+			}
+			else
+			{
+				++_hits;
+			}
+			return ThreadBoundTarget;
+		}
+
+		/// <summary>
+		/// Return an introduction advisor mixin that allows the AOP proxy to be
+		/// cast to an <see cref="IThreadLocalTargetSourceStats"/> reference.
+		/// </summary>
+		public IIntroductionAdvisor GetStatsMixin()
+		{
+			return new DefaultIntroductionAdvisor(this, typeof (IThreadLocalTargetSourceStats));
+		}
+
+		/// <summary>
+		/// Cleans up this instance's thread storage, and disposes of any
+		/// <see cref="System.IDisposable"/> targets as necessary.
+		/// </summary>
+		/// <seealso cref="System.IDisposable.Dispose"/>
+		public void Dispose()
+		{
+			#region Instrumentation
+
+			if (logger.IsDebugEnabled)
+			{
+				logger.Debug("Destroying ThreadLocal bindings");
+			}
+
+			#endregion
+
+			foreach (object target in _targetSet)
+			{
+				if (target is IDisposable)
+				{
+					try
+					{
+						((IDisposable) target).Dispose();
+					}
+					catch (Exception ex)
+					{
+						#region Instrumentation
+
+						if (logger.IsWarnEnabled)
+						{
+							logger.Warn(string.Format(
+								"Thread-bound target of class '{0}' " +
+								"threw exception from it's IDisposable.Dispose() method.",
+								target.GetType()), ex);
+						}
+
+						#endregion
+					}
+				}
+			}
+			_targetSet.Clear();
+			_targetInThread = null;
+		}
+
+		/// <summary>
+		/// Increments Invocations and Hits statistics
+		/// </summary>
+		/// <param name="invocation">The method invocation joinpoint</param>
+		/// <returns>The result of the call to IJoinpoint.Proceed(), might be intercepted by the interceptor.</returns>
+		/// <exception cref="System.Exception">if the interceptors or the target-object throws an exception.</exception>
+		public object Invoke(IMethodInvocation invocation)
+		{
+            if (ReflectionUtils.MethodIsOnOneOfTheseInterfaces(
+				invocation.Method, new Type[] {typeof (IThreadLocalTargetSourceStats)}))
+			{
+				return invocation.Method.Invoke(this, invocation.Arguments);
+			}
+			return invocation.Method.Invoke(GetTarget(), invocation.Arguments);
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aop/TrueMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/TrueMethodMatcher.cs
new file mode 100644
index 00000000..12c43729
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/TrueMethodMatcher.cs
@@ -0,0 +1,155 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Canonical <see cref="Spring.Aop.IMethodMatcher"/> that matches
+	/// <b>all</b> methods.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: TrueMethodMatcher.cs,v 1.5 2006/04/09 07:18:36 markpollack Exp $</version>
+	[Serializable]
+	public sealed class TrueMethodMatcher : IMethodMatcher, ISerializable
+	{
+		/// <summary>
+		/// Canonical instance that matches <b>all</b> methods.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// It is not dynamic.
+		/// </p>
+		/// </remarks>
+		public static readonly IMethodMatcher True = new TrueMethodMatcher();
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="TrueMethodMatcher"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such has no publicly visible
+		/// constructors.
+		/// </p>
+		/// </remarks>
+		private TrueMethodMatcher()
+		{
+		}
+
+		/// <summary>
+		/// Is this <see cref="Spring.Aop.IMethodMatcher"/> dynamic?
+		/// </summary>
+		/// <value>
+		/// <see langword="true"/> if this
+		/// <see cref="Spring.Aop.IMethodMatcher"/> is dynamic.
+		/// </value>
+		/// <seealso cref="Spring.Aop.IMethodMatcher.IsRuntime"/>
+		public bool IsRuntime
+		{
+			get { return false; }
+		}
+
+		/// <summary>
+		/// Does the supplied <paramref name="method"/> satisfy this matcher?
+		/// Perform static checking. If this returns false, or if the isRuntime() method
+		/// returns false, no runtime check will be made.
+		/// </summary>
+		/// <param name="method">The candidate method.</param>
+		/// <param name="targetType">
+		/// The target class (may be <see langword="null"/>, in which case the
+		/// candidate class must be taken to be the <paramref name="method"/>'s
+		/// declaring class).
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if this this method matches statically.
+		/// </returns>
+		/// <seealso cref="Spring.Aop.IMethodMatcher.Matches(MethodInfo, Type)"/>
+		public bool Matches(MethodInfo method, Type targetType)
+		{
+			return true;
+		}
+
+		/// <summary>
+		/// Is there a runtime (dynamic) match for the supplied
+		/// <paramref name="method"/>?
+		/// </summary>
+		/// <param name="method">The candidate method.</param>
+		/// <param name="targetType">The target class.</param>
+		/// <param name="args">The arguments to the method</param>
+		/// <returns>
+		/// <see langword="true"/> if there is a runtime match.</returns>
+		/// <seealso cref="Spring.Aop.IMethodMatcher.Matches(MethodInfo, Type, object[])"/>
+		public bool Matches(MethodInfo method, Type targetType, object[] args)
+		{
+			// should never be invoked if IsRuntime is false
+			return true;
+		}
+
+		/// <summary>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="Spring.Aop.IMethodMatcher"/>.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="Spring.Aop.IMethodMatcher"/>.
+		/// </returns>
+		public override string ToString()
+		{
+			return "TrueMethodMatcher.True";
+		}
+
+		/// <summary>
+		/// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+		/// the data needed to serialize the target object.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+		/// with data.
+		/// </param>
+		/// <param name="context">
+		/// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+		/// for this serialization.
+		/// </param>
+		[SecurityPermission (SecurityAction.Demand,SerializationFormatter=true)]
+		public void GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+			info.SetType(typeof (TrueMethodMatcherObjectReference));
+		}
+
+		[Serializable]
+		private sealed class TrueMethodMatcherObjectReference : IObjectReference
+		{
+			public object GetRealObject(StreamingContext context)
+			{
+				return TrueMethodMatcher.True;
+			}
+		}
+	}
+}
diff --git a/src/Spring/Spring.Aop/Aop/TruePointcut.cs b/src/Spring/Spring.Aop/Aop/TruePointcut.cs
new file mode 100644
index 00000000..0b467f3f
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/TruePointcut.cs
@@ -0,0 +1,121 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Canonical <see cref="Spring.Aop.IPointcut"/> instance that matches
+	/// everything.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	[Serializable]
+	public sealed class TruePointcut : IPointcut, ISerializable
+	{
+		/// <summary>
+		/// Canonical instance that matches everything.
+		/// </summary>
+		public static readonly IPointcut True = new TruePointcut();
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="TruePointcut"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such has no publicly
+		/// visible constructors.
+		/// </p>
+		/// </remarks>
+		private TruePointcut()
+		{
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.ITypeFilter"/> for this pointcut.
+		/// </summary>
+		/// <value>
+		/// The current <see cref="Spring.Aop.ITypeFilter"/>.
+		/// </value>
+		public ITypeFilter TypeFilter
+		{
+			get { return Aop.TrueTypeFilter.True; }
+		}
+
+		/// <summary>
+		/// The <see cref="Spring.Aop.IMethodMatcher"/> for this pointcut.
+		/// </summary>
+		/// <value>
+		/// The current <see cref="Spring.Aop.IMethodMatcher"/>.
+		/// </value>
+		public IMethodMatcher MethodMatcher
+		{
+			get { return TrueMethodMatcher.True; }
+		}
+
+		/// <summary>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="Spring.Aop.IPointcut"/>.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="Spring.Aop.IPointcut"/>.
+		/// </returns>
+		public override string ToString()
+		{
+			return "TruePointcut.TRUE";
+		}
+
+		/// <summary>
+		/// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+		/// the data needed to serialize the target object.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+		/// with data.
+		/// </param>
+		/// <param name="context">
+		/// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+		/// for this serialization.
+		/// </param>
+		[SecurityPermission (SecurityAction.Demand,SerializationFormatter=true)]
+		public void GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+			info.SetType(typeof (TruePointcutObjectReference));
+		}
+
+		[Serializable]
+		private sealed class TruePointcutObjectReference : IObjectReference
+		{
+			public object GetRealObject(StreamingContext context)
+			{
+				return TruePointcut.True;
+			}
+		}
+	}
+}
diff --git a/src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs b/src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs
new file mode 100644
index 00000000..f3f78242
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs
@@ -0,0 +1,124 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Canonical <see cref="Spring.Aop.ITypeFilter"/> instances.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Only one canonical <see cref="Spring.Aop.ITypeFilter"/> instance is
+	/// provided out of the box. The <see cref="TrueTypeFilter.True"/>
+	/// <see cref="Spring.Aop.ITypeFilter"/> matches all classes.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: TrueTypeFilter.cs,v 1.4 2006/04/09 07:18:36 markpollack Exp $</version>
+	[Serializable]
+	public sealed class TrueTypeFilter : ITypeFilter, ISerializable
+	{
+		/// <summary>
+		/// Canonical <see cref="Spring.Aop.ITypeFilter"/> instance that
+		/// matches all classes.
+		/// </summary>
+		public static readonly ITypeFilter True = new TrueTypeFilter();
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="TrueTypeFilter"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such has no publicly visible
+		/// constructors.
+		/// </p>
+		/// </remarks>
+		private TrueTypeFilter()
+		{
+		}
+
+		/// <summary>
+		/// Should the pointcut apply to the supplied
+		/// <see cref="System.Type"/>?
+		/// </summary>
+		/// <param name="type">
+		/// The candidate <see cref="System.Type"/>.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if the advice should apply to the supplied
+		/// <paramref name="type"/>
+		/// </returns>
+		/// <seealso cref="Spring.Aop.ITypeFilter.Matches(Type)"/>
+		public bool Matches(Type type)
+		{
+			return true;
+		}
+
+		/// <summary>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="Spring.Aop.ITypeFilter"/>.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="Spring.Aop.ITypeFilter"/>.
+		/// </returns>
+		public override string ToString()
+		{
+			return "TrueTypeFilter.True";
+		}
+
+		/// <summary>
+		/// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+		/// the data needed to serialize the target object.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+		/// with data.
+		/// </param>
+		/// <param name="context">
+		/// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+		/// for this serialization.
+		/// </param>
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter=true)]
+		public void GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+			info.SetType(typeof (TrueTypeFilterObjectReference));
+		}
+
+		[Serializable]
+		private sealed class TrueTypeFilterObjectReference : IObjectReference
+		{
+			public object GetRealObject(StreamingContext context)
+			{
+				return TrueTypeFilter.True;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/AopAlliance/Aop/AspectException.cs b/src/Spring/Spring.Aop/AopAlliance/Aop/AspectException.cs
new file mode 100644
index 00000000..90fa9526
--- /dev/null
+++ b/src/Spring/Spring.Aop/AopAlliance/Aop/AspectException.cs
@@ -0,0 +1,80 @@
+#region License
+
+/*
+ * All the source code provided by AOP Alliance is Public Domain.
+ * 
+ *      http://aopalliance.sourceforge.net/
+ * 
+ */
+
+#endregion
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace AopAlliance.Aop
+{
+	/// <summary>
+	/// Superclass for all AOP infrastructure exceptions.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: AspectException.cs,v 1.3 2006/04/09 07:18:33 markpollack Exp $</version>
+	[Serializable]
+	public class AspectException : Exception
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="AopAlliance.Aop.AspectException"/> class.
+		/// </summary>
+		public AspectException()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="AopAlliance.Aop.AspectException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public AspectException(string message) : base(message)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="AopAlliance.Aop.AspectException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="innerException">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public AspectException(string message, Exception innerException)
+			: base(message, innerException)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="AopAlliance.Aop.AspectException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected AspectException(SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/AopAlliance/Aop/IAdvice.cs b/src/Spring/Spring.Aop/AopAlliance/Aop/IAdvice.cs
new file mode 100644
index 00000000..5b4436d4
--- /dev/null
+++ b/src/Spring/Spring.Aop/AopAlliance/Aop/IAdvice.cs
@@ -0,0 +1,31 @@
+#region License
+
+/*
+ * All the source code provided by AOP Alliance is Public Domain.
+ * 
+ *      http://aopalliance.sourceforge.net/
+ * 
+ */
+
+#endregion
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace AopAlliance.Aop
+{
+	/// <summary>
+	/// Tag interface for advice.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	///  Implementations can be any type of advice, such as interceptors.
+	/// </p>
+	/// </remarks>
+	public interface IAdvice
+	{
+	}
+}
diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInterceptor.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInterceptor.cs
new file mode 100644
index 00000000..46d2b2df
--- /dev/null
+++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInterceptor.cs
@@ -0,0 +1,54 @@
+#region License
+
+/*
+ * All the source code provided by AOP Alliance is Public Domain.
+ * 
+ *      http://aopalliance.sourceforge.net/
+ * 
+ */
+
+#endregion
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace AopAlliance.Intercept
+{
+	/// <summary>
+	/// Intercepts the construction of a new object.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Such interceptions are nested "on top" of the target.
+	/// </p>
+	/// </remarks>
+	public interface IConstructorInterceptor : IInterceptor
+	{
+		/// <summary>
+		/// Implement this method to perform extra treatments before and after
+		/// the consruction of a new object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Polite implementations would certainly like to invoke
+		/// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/>. 
+		/// </p>
+		/// </remarks>
+		/// <param name="invocation">
+		/// The constructor invocation that is being intercepted.
+		/// </param>
+		/// <returns>
+		/// The newly created object, which is also the result of the call to
+		/// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/>, and might be
+		/// replaced by the interceptor.
+		/// </returns>
+		/// <exception cref="System.Exception">
+		/// If any of the interceptors in the chain or the target object itself
+		/// throws an exception.
+		/// </exception>
+		object Construct(IConstructorInvocation invocation);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInvocation.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInvocation.cs
new file mode 100644
index 00000000..1da95926
--- /dev/null
+++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IConstructorInvocation.cs
@@ -0,0 +1,51 @@
+#region License
+
+/*
+ * All the source code provided by AOP Alliance is Public Domain.
+ * 
+ *      http://aopalliance.sourceforge.net/
+ * 
+ */
+
+#endregion
+
+#region Imports
+
+using System.Reflection;
+
+#endregion
+
+namespace AopAlliance.Intercept
+{
+	/// <summary>
+	/// A description of an invocation to a constuctor, given to an interceptor
+	/// upon constructor-call.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// A constructor invocation is a joinpoint and can be intercepted by a
+	/// constructor interceptor.
+	/// </p>
+	/// </remarks>
+	/// <seealso cref="AopAlliance.Intercept.IConstructorInterceptor"/>
+	public interface IConstructorInvocation : IInvocation
+	{
+		/// <summary>
+		/// Gets the constructor invocation that is to be invoked.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This property is a friendly implementation of the
+		/// <see cref="AopAlliance.Intercept.IJoinpoint.StaticPart"/> property.
+		/// It should be used in preference to the
+		/// <see cref="AopAlliance.Intercept.IJoinpoint.StaticPart"/> property
+		/// because it provides immediate access to the underlying constructor
+		/// without the need to resort to a cast.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The constructor invocation that is to be invoked.
+		/// </value>
+		ConstructorInfo Constructor { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IInterceptor.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IInterceptor.cs
new file mode 100644
index 00000000..121c2ef4
--- /dev/null
+++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IInterceptor.cs
@@ -0,0 +1,39 @@
+#region License
+
+/*
+ * All the source code provided by AOP Alliance is Public Domain.
+ * 
+ *      http://aopalliance.sourceforge.net/
+ * 
+ */
+
+#endregion
+
+#region Imports
+
+using System;
+using AopAlliance.Aop;
+
+#endregion
+
+namespace AopAlliance.Intercept
+{
+	/// <summary>
+    /// Represents a generic interceptor.
+    /// </summary>
+	/// <remarks>
+	/// <p>
+	/// A generic interceptor can intercept runtime events that occur within a
+	/// base program. Those events are materialized by (reified in) joinpoints.
+	/// Runtime joinpoints can be invocations, field access, exceptions, etc.
+	/// </p>
+	/// <p>
+	/// This interface is not used directly. Use the various derived interfaces
+	/// to intercept specific events.
+	/// </p>
+	/// </remarks>
+    /// <seealso cref="AopAlliance.Intercept.IJoinpoint"/>
+	public interface IInterceptor : IAdvice
+	{
+	}
+}
diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IInvocation.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IInvocation.cs
new file mode 100644
index 00000000..af4d0e8f
--- /dev/null
+++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IInvocation.cs
@@ -0,0 +1,45 @@
+#region License
+
+/*
+ * All the source code provided by AOP Alliance is Public Domain.
+ * 
+ *      http://aopalliance.sourceforge.net/
+ * 
+ */
+
+#endregion
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace AopAlliance.Intercept
+{
+	/// <summary>
+	/// Represents an invocation in the program.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// An invocation is a joinpoint and can be intercepted by an interceptor.
+	/// Typical examples would be a constructor invocation and a method call.
+	/// </p>
+	/// </remarks>
+	public interface IInvocation : IJoinpoint
+	{
+        /// <summary>
+        /// Gets the arguments to an invocation.
+        /// </summary>
+		/// <remarks>
+		/// <p>
+		/// It is of course possible to change element values within this array
+		/// to change the arguments to an intercepted invocation.
+		/// </p>
+		/// </remarks>
+        /// <value>
+        /// The arguments to an invocation.
+        /// </value>
+        object[] Arguments { get; }
+	}
+}
diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IJoinpoint.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IJoinpoint.cs
new file mode 100644
index 00000000..971fa7e9
--- /dev/null
+++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IJoinpoint.cs
@@ -0,0 +1,88 @@
+#region License
+
+/*
+ * All the source code provided by AOP Alliance is Public Domain.
+ * 
+ *      http://aopalliance.sourceforge.net/
+ * 
+ */
+
+#endregion
+
+#region Imports
+
+using System.Reflection;
+
+#endregion
+
+namespace AopAlliance.Intercept
+{
+	/// <summary>
+	/// Represents a generic runtime joinpoint (in the AOP terminology).
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// A runtime joinpoint is an <i>event</i> that occurs on a static
+	/// joinpoint (i.e. a location in a program). For instance, an
+	/// invocation is the runtime joinpoint on a method (static joinpoint).
+	/// The static part of a given joinpoint can be generically retrieved
+	/// using the <see cref="AopAlliance.Intercept.IJoinpoint.StaticPart"/>
+	/// property.
+	/// </p>
+	/// <p>
+	/// In the context of an interception framework, a runtime joinpoint
+	/// is then the reification of an access to an accessible object (a
+	/// method, a constructor, a field), i.e. the static part of the
+	/// joinpoint. It is passed to the interceptors that are installed on
+	/// the static joinpoint.
+	/// </p>
+	/// </remarks>
+	/// <seealso cref="AopAlliance.Intercept.IInterceptor"/>
+	public interface IJoinpoint
+	{
+		/// <summary>
+		/// Gets the static part of this joinpoint.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The static part is an accessible object on which a chain of
+		/// interceptors are installed.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The static part of this joinpoint.
+		/// </value>
+		MemberInfo StaticPart { get; }
+
+		/// <summary>
+		/// Gets the object that holds the current joinpoint's static part.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// For instance, the target object for a method invocation.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The object that holds the current joinpoint's static part.
+		/// </value>
+		object This { get; }
+
+		/// <summary>
+		/// Proceeds to the next interceptor in the chain.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The implementation and semantics of this method depend on the
+		/// actual joinpoint type. Consult the derived interfaces of this
+		/// interface for specifics.
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// Consult the derived interfaces of this interface for specifics.
+		/// </returns>
+		/// <exception cref="System.Exception">
+		/// If any of the interceptors at the joinpoint throws an exception.
+		/// </exception>
+		object Proceed();
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInterceptor.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInterceptor.cs
new file mode 100644
index 00000000..79bc1c16
--- /dev/null
+++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInterceptor.cs
@@ -0,0 +1,55 @@
+#region License
+
+/*
+ * All the source code provided by AOP Alliance is Public Domain.
+ * 
+ *      http://aopalliance.sourceforge.net/
+ * 
+ */
+
+#endregion
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace AopAlliance.Intercept
+{
+	/// <summary>
+	/// Intercepts calls on an interface on its way to the target.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Such interceptions are nested "on top" of the target.
+	/// </p>
+	/// </remarks>
+	public interface IMethodInterceptor : IInterceptor
+	{
+        /// <summary>
+        /// Implement this method to perform extra treatments before and after
+        /// the call to the supplied <paramref name="invocation"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Polite implementations would certainly like to invoke
+        /// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/>. 
+        /// </p>
+        /// </remarks>
+        /// <param name="invocation">
+        /// The method invocation that is being intercepted.
+        /// </param>
+        /// <returns>
+        /// The result of the call to the
+        /// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+        /// the supplied <paramref name="invocation"/>; this return value may
+        /// well have been intercepted by the interceptor.
+        /// </returns>
+        /// <exception cref="System.Exception">
+        /// If any of the interceptors in the chain or the target object itself
+        /// throws an exception.
+        /// </exception>
+        object Invoke(IMethodInvocation invocation);
+	}
+}
diff --git a/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInvocation.cs b/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInvocation.cs
new file mode 100644
index 00000000..e4c27839
--- /dev/null
+++ b/src/Spring/Spring.Aop/AopAlliance/Intercept/IMethodInvocation.cs
@@ -0,0 +1,77 @@
+#region License
+
+/*
+ * All the source code provided by AOP Alliance is Public Domain.
+ * 
+ *      http://aopalliance.sourceforge.net/
+ * 
+ */
+
+#endregion
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace AopAlliance.Intercept
+{
+	/// <summary>
+	/// Description of an invocation to a method, given to an interceptor
+	/// upon method-call.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// A method invocation is a joinpoint and can be intercepted by a method
+	/// interceptor.
+	/// </p>
+	/// </remarks>
+	/// <seealso cref="AopAlliance.Intercept.IMethodInterceptor"/>
+	public interface IMethodInvocation : IInvocation
+	{
+		/// <summary>
+		/// Gets the method invocation that is to be invoked.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This property is a friendly implementation of the
+		/// <see cref="AopAlliance.Intercept.IJoinpoint.StaticPart"/> property.
+		/// It should be used in preference to the
+		/// <see cref="AopAlliance.Intercept.IJoinpoint.StaticPart"/> property
+		/// because it provides immediate access to the underlying method
+		/// without the need to resort to a cast.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The method invocation that is to be invoked.
+		/// </value>
+		MethodInfo Method { get; }
+
+        /// <summary>
+        /// Gets the proxy object for the invocation.
+        /// </summary>
+        /// <value>
+        /// The proxy object for this method invocation.
+        /// </value>
+        object Proxy { get; }
+
+        /// <summary>
+        /// Gets the target object for the invocation.
+        /// </summary>
+        /// <value>
+        /// The target object for this method invocation.
+        /// </value>
+        object Target { get; }
+
+        /// <summary>
+        /// Gets the type of the target object.
+        /// </summary>
+        /// <value>
+        /// The type of the target object.
+        /// </value>
+        Type TargetType { get; }
+
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandler.cs
new file mode 100644
index 00000000..9304354e
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandler.cs
@@ -0,0 +1,184 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+using Common.Logging;
+using Spring.Expressions;
+
+namespace Spring.Aspects
+{
+    /// <summary>
+    /// An abstract base class providing all necessary functionality for typical IExceptionHandler implementations.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AbstractExceptionHandler.cs,v 1.2 2007/10/10 18:07:46 markpollack Exp $</version>
+    public abstract class AbstractExceptionHandler  : IExceptionHandler
+    {
+        #region Fields
+
+        /// <summary>
+        /// The logging instance
+        /// </summary>
+        protected readonly ILog log;
+
+        private IList sourceExceptionNames = new ArrayList();
+        private IList sourceExceptionTypes = new ArrayList();
+        private string actionExpressionText;
+        private bool continueProcessing = false;
+        private string constraintExpressionText;
+
+        #endregion
+
+        #region Constructor(s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AbstractExceptionHandler"/> class.
+        /// </summary>
+        public AbstractExceptionHandler()
+        {
+            log = LogManager.GetLogger(GetType());
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AbstractExceptionHandler"/> class.
+        /// </summary>
+        /// <param name="exceptionNames">The exception names.</param>
+        public AbstractExceptionHandler(string[] exceptionNames)
+        {
+            log = LogManager.GetLogger(GetType());
+            foreach (string exceptionName in exceptionNames)
+            {
+                SourceExceptionNames.Add(exceptionName);
+            }
+        }
+
+        #endregion
+
+        #region Implementation of IExceptionHandler
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the source exception names.
+        /// </summary>
+        /// <value>The source exception names.</value>
+        public IList SourceExceptionNames
+        {
+            get { return sourceExceptionNames; }
+            set { sourceExceptionNames = value; }
+        }
+
+        /// <summary>
+        /// Gets the source exception types.
+        /// </summary>
+        /// <value>The source exception types.</value>
+        public IList SourceExceptionTypes
+        {
+            get { return sourceExceptionTypes; }
+            set { sourceExceptionTypes = value; }
+        }
+
+        /// <summary>
+        /// Gets the action translation expression text
+        /// </summary>
+        /// <value>The action translation expression.</value>
+        public string ActionExpressionText
+        {
+            get { return actionExpressionText; }
+            set { actionExpressionText = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the constraint expression text.
+        /// </summary>
+        /// <value>The constraint expression text.</value>
+        public string ConstraintExpressionText
+        {
+            get { return constraintExpressionText; }
+            set { constraintExpressionText = value; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether to continue processing.
+        /// </summary>
+        /// <value><c>true</c> if continue processing; otherwise, <c>false</c>.</value>
+        public bool ContinueProcessing
+        {
+            get { return continueProcessing; }
+            set { continueProcessing = value; }
+        }
+
+        #endregion
+
+
+
+        /// <summary>
+        /// Determines whether this instance can handle the exception the specified exception.
+        /// </summary>
+        /// <param name="ex">The exception.</param>
+        /// <param name="callContextDictionary">The call context dictionary.</param>
+        /// <returns>
+        /// 	<c>true</c> if this instance can handle the specified exception; otherwise, <c>false</c>.
+        /// </returns>
+        public bool CanHandleException(Exception ex, IDictionary callContextDictionary)
+        {
+            if (SourceExceptionNames != null)
+            {
+                foreach (string exceptionName in SourceExceptionNames)
+                {
+                    if (ex.GetType().Name.IndexOf(exceptionName) >= 0)
+                    {
+                        return true;
+                    }
+                }
+            }
+            if (ConstraintExpressionText != null)
+            {                
+                bool canProcess;
+                try
+                {
+                    IExpression expression = Expression.Parse(ConstraintExpressionText);
+                    canProcess = (bool) expression.GetValue(null, callContextDictionary);
+                } catch (InvalidCastException e)
+                {
+                    log.Warn("Was not able to unbox constraint expression to boolean [" + ConstraintExpressionText + "]", e);
+                    return false;
+                } catch (Exception e)
+                {
+                    log.Warn("Was not able to evaluate constraint expression [" + ConstraintExpressionText + "]",e);
+                    return false;
+                }
+                return canProcess;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Handles the exception.
+        /// </summary>
+        /// <returns>The return value from handling the exception, if not rethrown or a new exception is thrown.</returns>
+        public abstract object HandleException(IDictionary callContextDictionary);
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandlerAdvice.cs b/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandlerAdvice.cs
new file mode 100644
index 00000000..b84f1962
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandlerAdvice.cs
@@ -0,0 +1,157 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Text.RegularExpressions;
+using AopAlliance.Intercept;
+using Spring.Objects.Factory;
+using Spring.Util;
+
+namespace Spring.Aspects
+{
+    /// <summary>
+    /// This is 
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AbstractExceptionHandlerAdvice.cs,v 1.1 2007/10/08 22:05:16 markpollack Exp $</version>
+    public abstract class AbstractExceptionHandlerAdvice : IMethodInterceptor, IInitializingObject
+    {
+        /// <summary>
+        /// Gets or sets the Regex string used to parse advice expressions starting with 'on exception name' and subclass specific actions.
+        /// </summary>
+        /// <value>The regex string to parse advice expressions starting with 'on exception name' and subclass specific actions.</value>
+        public abstract string OnExceptionNameRegex
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// Gets or sets the Regex string used to parse advice expressions starting with 'on exception (constraint)' and subclass specific actions.
+        /// </summary>
+        /// <value>The regex string to parse advice expressions starting with 'on exception (constraint)' and subclass specific actions.</value>
+        public abstract string OnExceptionRegex
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// Implement this method to perform extra treatments before and after
+        /// the call to the supplied <paramref name="invocation"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Polite implementations would certainly like to invoke
+        /// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/>. 
+        /// </p>
+        /// </remarks>
+        /// <param name="invocation">
+        /// The method invocation that is being intercepted.
+        /// </param>
+        /// <returns>
+        /// The result of the call to the
+        /// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+        /// the supplied <paramref name="invocation"/>; this return value may
+        /// well have been intercepted by the interceptor.
+        /// </returns>
+        /// <exception cref="System.Exception">
+        /// If any of the interceptors in the chain or the target object itself
+        /// throws an exception.
+        /// </exception>
+        public abstract object Invoke(IMethodInvocation invocation);
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method allows the object instance to perform the kind of
+        /// initialization only possible when all of it's dependencies have
+        /// been injected (set), and to throw an appropriate exception in the
+        /// event of misconfiguration.
+        /// </p>
+        /// <p>
+        /// Please do consult the class level documentation for the
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+        /// description of exactly <i>when</i> this method is invoked. In
+        /// particular, it is worth noting that the
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and <see cref="Spring.Context.IApplicationContextAware"/>
+        /// callbacks will have been invoked <i>prior</i> to this method being
+        /// called.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as the failure to set a
+        /// required property) or if initialization fails.
+        /// </exception>
+        public abstract void AfterPropertiesSet();
+
+        /// <summary>
+        /// Parses the advice expression.
+        /// </summary>
+        /// <param name="adviceExpression">The advice expression.</param>
+        /// <returns>An instance of ParsedAdviceExpression</returns>
+        protected virtual ParsedAdviceExpression ParseAdviceExpression(string adviceExpression)
+        {
+            ParsedAdviceExpression parsedAdviceExpression = new ParsedAdviceExpression(adviceExpression);
+
+            Match match = GetMatch(adviceExpression, OnExceptionNameRegex);
+            if (match.Success)
+            {
+                parsedAdviceExpression.Success = true;
+                //using exception names for exception filter
+                parsedAdviceExpression.ExceptionNames = StringUtils.CommaDelimitedListToStringArray(match.Groups[2].Value.Trim());
+                parsedAdviceExpression.ActionText = match.Groups[3].Value.Trim();
+                parsedAdviceExpression.ActionExpressionText = match.Groups[4].Value.Trim();
+            }
+            else
+            {
+                match = GetMatch(adviceExpression, OnExceptionRegex);
+                if (match.Success)
+                {
+                    parsedAdviceExpression.Success = true;
+                    //using constratin expression for exception filter
+                    string constraintExpression = match.Groups[2].Value.Trim().Remove(0, 1);
+                    parsedAdviceExpression.ConstraintExpression = constraintExpression.Substring(0, constraintExpression.Length - 1);
+                    parsedAdviceExpression.ActionText = match.Groups[3].Value.Trim();
+                    parsedAdviceExpression.ActionExpressionText = match.Groups[4].Value.Trim();
+                }
+            }
+            return parsedAdviceExpression;
+        }
+
+
+        /// <summary>
+        /// Gets the match using exception constraint expression.
+        /// </summary>
+        /// <param name="adviceExpressionString">The advice expression string.</param>
+        /// <param name="regexString">The regex string.</param>
+        /// <returns>The Match object resulting from the regular expression match.</returns>
+        protected virtual Match GetMatch(string adviceExpressionString, string regexString)
+        {
+            RegexOptions options = ((RegexOptions.IgnorePatternWhitespace | RegexOptions.Multiline) | RegexOptions.IgnoreCase);
+            Regex reg = new Regex(regexString, options);
+            return reg.Match(adviceExpressionString);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs b/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs
new file mode 100644
index 00000000..28359226
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs
@@ -0,0 +1,160 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using Spring.Caching;
+using Spring.Context;
+using Spring.Expressions;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Aspects.Cache
+{
+    /// <summary>
+    /// Base class for different cache advice implementations that provide
+    /// access to common functionality, such as obtaining a cache instance.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: BaseCacheAdvice.cs,v 1.3 2007/04/01 15:04:04 bbaia Exp $</version>
+    public class BaseCacheAdvice : IApplicationContextAware
+    {
+        private IApplicationContext applicationContext;
+        
+        /// <summary>
+        /// Set the <see cref="Spring.Context.IApplicationContext"/> that this
+        /// object runs in.
+        /// </summary>
+        public IApplicationContext ApplicationContext
+        {
+            get { return applicationContext; }
+            set { applicationContext = value; }
+        }
+
+        /// <summary>
+        /// Returns an <see cref="ICache"/> instance based on the cache name.
+        /// </summary>
+        /// <param name="name">The name of the cache.</param>
+        /// <returns>
+        /// Cache instance for the specified <paramref name="name"/> if one
+        /// is registered in the application context, or <c>null</c> if it isn't.
+        /// </returns>
+        public ICache GetCache(string name)
+        {
+            return applicationContext.GetObject(name) as ICache;
+        }
+
+        /// <summary>
+        /// Prepares variables for expression evaluation by packaging all 
+        /// method arguments into a dictionary, keyed by argument name.
+        /// </summary>
+        /// <param name="method">
+        /// Method to get parameters info from.
+        /// </param>
+        /// <param name="arguments">
+        /// Argument values to package.
+        /// </param>
+        /// <returns>
+        /// A dictionary containing all method arguments, keyed by method name.
+        /// </returns>
+        protected static IDictionary PrepareVariables(MethodInfo method, object[] arguments)
+        {
+            ParameterInfo[] parameters = method.GetParameters();
+
+            IDictionary vars = new Hashtable();
+            for (int i = 0; i < parameters.Length; i++)
+            {
+                ParameterInfo p = parameters[i];
+                vars[p.Name] = arguments[i];
+            }
+            return vars;
+        }
+
+        /// <summary>
+        /// Evaluates a SpEL expression as a boolean value.
+        /// </summary>
+        /// <param name="condition">
+        /// The expression string that should be evaluated.
+        /// </param>
+        /// <param name="conditionExpression">
+        /// The SpEL expression instance that should be evaluated.
+        /// </param>
+        /// <param name="context">
+        /// The object to evaluate expression against.
+        /// </param>
+        /// <param name="variables">
+        /// The expression variables dictionary.
+        /// </param>
+        /// <returns>
+        /// The evaluated boolean.
+        /// </returns>
+        /// <exception cref="System.InvalidOperationException">
+        /// If the SpEL expression could not be successfuly resolved to a boolean.
+        /// </exception>
+        protected static bool EvalCondition(string condition, 
+            IExpression conditionExpression, object context, IDictionary variables)
+        {
+            if (conditionExpression == null)
+            {
+                return true;
+            }
+            else
+            {
+                object value = conditionExpression.GetValue(context, variables);
+                if (value is bool)
+                {
+                    return (bool)value;
+                }
+                else
+                {
+                    throw new InvalidOperationException(String.Format(
+                        "The SpEL expression '{0}' could not be successfuly resolved to a boolean.", 
+                        condition));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Retrieves custom attribute for the specified attribute type.
+        /// </summary>
+        /// <param name="method">
+        /// Method to get attribute from.
+        /// </param>
+        /// <param name="attributeType">
+        /// Attribute type.
+        /// </param>
+        /// <returns>
+        /// Attribute instance if one is found, <c>null</c> otherwise.
+        /// </returns>
+        protected static object GetCustomAttribute(MethodInfo method, Type attributeType)
+        {
+            object[] attributes = method.GetCustomAttributes(attributeType, false);
+            if (attributes.Length > 0)
+            {
+                return attributes[0];
+            }
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheAspect.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheAspect.cs
new file mode 100644
index 00000000..f574e551
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheAspect.cs
@@ -0,0 +1,107 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Aop;
+using Spring.Context;
+
+#endregion
+
+namespace Spring.Aspects.Cache
+{
+	/// <summary>
+	/// Caching aspect implementation.
+	/// </summary>
+	/// <remarks>
+    /// This class encapsulates all the advisors that need to be configured to support
+    /// Spring's full caching functionality.
+	/// </remarks>
+	/// <see cref="CacheResultAdvisor"/>
+	/// <see cref="CacheParameterAdvisor"/>
+	/// <see cref="InvalidateCacheAdvisor"/>
+    /// <author>Aleksandar Seovic</author>
+	/// <version>$Id: CacheAspect.cs,v 1.2 2007/08/03 14:38:35 markpollack Exp $</version>
+	public class CacheAspect : IAdvisors, IApplicationContextAware
+	{
+	    private IAdvisor[] advisors;
+	    private IApplicationContext applicationContext;
+
+	    /// <summary>
+        /// Creates a new instance.
+        /// </summary>
+	    public CacheAspect()
+	    {
+            advisors = new IAdvisor[] { new CacheResultAdvisor(), new CacheParameterAdvisor(), new InvalidateCacheAdvisor() };
+	    }
+
+	    /// <summary>
+        /// Gets or sets a list of advisors for this aspect.
+        /// </summary>
+        /// <value>
+        /// A list of advisors for this aspect.
+        /// </value>
+        public IList Advisors
+	    {
+	        get { return advisors; }
+	        set { throw new NotSupportedException("Cache aspect advisors cannot be set externally."); }
+	    }
+	    /// <summary>
+	    /// Set the <see cref="Spring.Context.IApplicationContext"/> that this
+	    /// object runs in.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// Normally this call will be used to initialize the object.
+	    /// </p>
+	    /// <p>
+	    /// Invoked after population of normal object properties but before an
+	    /// init callback such as
+	    /// <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+	    /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+	    /// or a custom init-method. Invoked after the setting of any
+	    /// <see cref="Spring.Context.IResourceLoaderAware"/>'s
+	    /// <see cref="Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+	    /// property.
+	    /// </p>
+	    /// </remarks>
+	    /// <exception cref="Spring.Context.ApplicationContextException">
+	    /// In the case of application context initialization errors.
+	    /// </exception>
+	    /// <exception cref="Spring.Objects.ObjectsException">
+	    /// If thrown by any application context methods.
+	    /// </exception>
+	    /// <exception cref="Spring.Objects.Factory.ObjectInitializationException"/>
+	    public IApplicationContext ApplicationContext
+	    {
+	        get { return applicationContext; }
+	        set
+	        {
+	            applicationContext = value;
+	            for (int i = 0; i < advisors.Length; i++)
+	            {
+                    ((IApplicationContextAware) advisors[i]).ApplicationContext = applicationContext;
+	            }
+	        }
+	    }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvice.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvice.cs
new file mode 100644
index 00000000..f3b705f6
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvice.cs
@@ -0,0 +1,113 @@
+#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
+
+#region Imports
+
+using System.Reflection;
+using Common.Logging;
+using Spring.Aop;
+using Spring.Caching;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aspects.Cache
+{
+    /// <summary>
+    /// Implementation of a parameter caching advice.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This advice can be used to cache the parameter of the method. 
+    /// </p>
+    /// <p>
+    /// Information that determines where, how and for how long the return value 
+    /// will be cached are retrieved from the <see cref="CacheParameterAttribute"/>s 
+    /// that are defined on the pointcut.
+    /// </p>
+    /// <p>
+    /// Parameter values are cached *after* the target method is invoked in order to
+    /// capture any parameter state changes it might make (for example, it is common
+    /// to set an object identifier within the save method for the persistent entity).
+    /// </p>
+    /// </remarks>
+    /// <seealso cref="CacheParameterAttribute"/>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CacheParameterAdvice.cs,v 1.7 2008/05/05 15:00:55 markpollack Exp $</version>
+    public class CacheParameterAdvice : BaseCacheAdvice, IAfterReturningAdvice
+    {
+        // shared logger instance
+        private static readonly ILog logger = LogManager.GetLogger(typeof(CacheParameterAdvice));
+
+        /// <summary>
+        /// Executes after target <paramref name="method"/>
+        /// returns <b>successfully</b>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Note that the supplied <paramref name="returnValue"/> <b>cannot</b>
+        /// be changed by this type of advice... use the around advice type
+        /// (<see cref="AopAlliance.Intercept.IMethodInterceptor"/>) if you
+        /// need to change the return value of an advised method invocation.
+        /// The data encapsulated by the supplied <paramref name="returnValue"/>
+        /// can of course be modified though.
+        /// </p>
+        /// </remarks>
+        /// <param name="returnValue">
+        /// The value returned by the <paramref name="target"/>.
+        /// </param>
+        /// <param name="method">The intecepted method.</param>
+        /// <param name="arguments">The intercepted method's arguments.</param>
+        /// <param name="target">The target object.</param>
+        /// <seealso cref="AopAlliance.Intercept.IMethodInterceptor.Invoke"/>
+        public void AfterReturning(object returnValue, MethodInfo method, object[] arguments, object target)
+        {
+            ParameterInfo[] parameters = method.GetParameters();
+            for (int i = 0; i < parameters.Length; i++)
+            {
+                ParameterInfo p = parameters[i];
+                CacheParameterAttribute[] paramInfoArray =
+                    (CacheParameterAttribute[])p.GetCustomAttributes(typeof(CacheParameterAttribute), false);
+
+                bool isLogDebugEnabled = logger.IsDebugEnabled;
+                foreach (CacheParameterAttribute paramInfo in paramInfoArray)
+                {
+                    if (EvalCondition(paramInfo.Condition, paramInfo.ConditionExpression, arguments[i], null))
+                    {
+                        ICache cache = GetCache(paramInfo.CacheName);
+                        AssertUtils.ArgumentNotNull(cache, "CacheName",
+                                                    "Parameter cache with the specified name [" + paramInfo.CacheName +
+                                                    "] does not exist.");
+                        object key = paramInfo.KeyExpression.GetValue(arguments[i]);
+                        #region Instrumentation
+
+                        if (isLogDebugEnabled)
+                        {
+                            logger.Debug("Caching parameter for key [" + key + "].");
+                        }
+
+                        #endregion
+                        cache.Insert(key, arguments[i], paramInfo.TimeToLiveTimeSpan);
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvisor.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvisor.cs
new file mode 100644
index 00000000..5186f4d6
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvisor.cs
@@ -0,0 +1,113 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Aop.Support;
+using Spring.Caching;
+using Spring.Context;
+
+#endregion
+
+namespace Spring.Aspects.Cache
+{
+    /// <summary>
+    /// Convinience advisor implementation that applies <see cref="CacheParameterAdvice"/>
+    /// to all the methods that have <see cref="CacheParameterAttribute"/> defined on one or
+    /// more of their parameters.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CacheParameterAdvisor.cs,v 1.1 2007/02/16 03:12:56 aseovic Exp $</version>
+    public class CacheParameterAdvisor : AttributeMatchMethodPointcutAdvisor, IApplicationContextAware
+    {
+        /// <summary>
+        /// Creates new advisor instance.
+        /// </summary>
+        public CacheParameterAdvisor()
+        {
+            Advice = new CacheParameterAdvice();
+            Attribute = typeof(CacheParameterAttribute);
+            Inherit = false;
+        }
+
+        /// <summary>
+        /// Set the <see cref="Spring.Context.IApplicationContext"/> that this
+        /// object runs in.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Normally this call will be used to initialize the object.
+        /// </p>
+        /// <p>
+        /// Invoked after population of normal object properties but before an
+        /// init callback such as
+        /// <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// or a custom init-method. Invoked after the setting of any
+        /// <see cref="Spring.Context.IResourceLoaderAware"/>'s
+        /// <see cref="Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+        /// property.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Context.ApplicationContextException">
+        /// In the case of application context initialization errors.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If thrown by any application context methods.
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectInitializationException"/>
+        public IApplicationContext ApplicationContext
+        {
+            get { return ((IApplicationContextAware) Advice).ApplicationContext; }
+            set { ((IApplicationContextAware)Advice).ApplicationContext = value; }
+        }
+
+        /// <summary>
+        /// Returns <c>true</c> if any of the parameters of the specified <paramref name="method"/>
+        /// has <see cref="CacheParameterAttribute"/> applied.
+        /// </summary>
+        /// <param name="method">
+        /// Method to check.
+        /// </param>
+        /// <param name="targetType">
+        /// Type of target object.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if any of the parameters of the specified <paramref name="method"/>
+        /// has <see cref="CacheParameterAttribute"/> applied; <c>false</c> otherwise.
+        /// </returns>
+        public override bool Matches(MethodInfo method, Type targetType)
+        {
+            ParameterInfo[] parameters = method.GetParameters();
+            for (int i = 0; i < parameters.Length; i++)
+            {
+                ParameterInfo p = parameters[i];
+                if (p.IsDefined(Attribute, Inherit))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvice.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvice.cs
new file mode 100644
index 00000000..17836b70
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvice.cs
@@ -0,0 +1,222 @@
+#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
+
+#region Imports
+
+using System.Collections;
+using System.Reflection;
+using AopAlliance.Intercept;
+using Common.Logging;
+using Spring.Caching;
+using Spring.Expressions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aspects.Cache
+{
+    /// <summary>
+    /// Implementation of a result caching advice.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This advice can be used to cache the return value of the method. 
+    /// </p>
+    /// <p>
+    /// Parameters that determine where, how and for how long the return value 
+    /// will be cached are retrieved from the <see cref="CacheResultAttribute"/> and/or 
+    /// <see cref="CacheResultItemsAttribute"/> that are defined on the pointcut.
+    /// </p>
+    /// </remarks>
+    /// <seealso cref="CacheResultAttribute"/>
+    /// <seealso cref="CacheResultItemsAttribute"/>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CacheResultAdvice.cs,v 1.6 2008/05/05 15:00:55 markpollack Exp $</version>
+    public class CacheResultAdvice : BaseCacheAdvice, IMethodInterceptor
+    {
+        // shared logger instance
+        private static readonly ILog logger = LogManager.GetLogger(typeof (CacheResultAdvice));
+
+		// NullValue
+		private static readonly object NullValue = new object();
+
+        /// <summary>
+        /// Applies caching around a method invocation.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method tries to retrieve an object from the cache, using the supplied
+        /// <paramref name="invocation"/> to generate a cache key. If an object is found
+        /// in the cache, the cached value is returned and the method call does not
+        /// proceed any further down the invocation chain.
+        /// </p>
+        /// <p>
+        /// If object does not exist in the cache, the advised method is called (using
+        /// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed()"/>)
+        /// and any return value is cached for the next method invocation.
+        /// </p>
+        /// </remarks>
+        /// <param name="invocation">
+        /// The method invocation that is being intercepted.
+        /// </param>
+        /// <returns>
+        /// A cached object or the result of the
+        /// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed()"/> call.
+        /// </returns>
+        /// <exception cref="System.Exception">
+        /// If any of the interceptors in the chain or the target object itself
+        /// throws an exception.
+        /// </exception>
+        public object Invoke(IMethodInvocation invocation)
+        {
+            CacheResultAttribute resultInfo =
+                (CacheResultAttribute) GetCustomAttribute(invocation.Method, typeof (CacheResultAttribute));
+            CacheResultItemsAttribute[] itemInfoArray =
+                (CacheResultItemsAttribute[])invocation.Method.GetCustomAttributes(typeof(CacheResultItemsAttribute), false);
+
+            bool cacheHit = false;
+            object returnValue = GetReturnValue(invocation, resultInfo, out cacheHit);
+
+            if (!cacheHit && itemInfoArray.Length > 0 && returnValue is ICollection)
+            {
+                CacheResultItems((ICollection)returnValue, itemInfoArray);
+            }
+
+            return returnValue;
+        }
+
+        /// <summary>
+        /// Obtains return value either from cache or by invoking target method
+        /// and caches it if necessary.
+        /// </summary>
+        /// <param name="invocation">
+        /// The method invocation that is being intercepted.
+        /// </param>
+        /// <param name="resultInfo">
+        /// Attribute specifying where and how to cache return value. Can be <c>null</c>,
+        /// in which case no caching of the result as a whole will be performed 
+        /// (if the result is collection, individual items could still be cached separately).
+        /// </param>
+        /// <param name="cacheHit">
+        /// Returns <c>true</c> if the return value was found in cache, <c>false</c> otherwise.
+        /// </param>
+        /// <returns>
+        /// Return value for the specified <paramref name="invocation"/>.
+        /// </returns>
+        private object GetReturnValue(IMethodInvocation invocation, CacheResultAttribute resultInfo, out bool cacheHit)
+        {
+            if (resultInfo != null)
+            {
+                object returnValue = null;
+                bool isLogDebugEnabled = logger.IsDebugEnabled;
+
+                IDictionary vars = PrepareVariables(invocation.Method, invocation.Arguments);
+
+                object resultKey = resultInfo.KeyExpression.GetValue(null, vars);
+                ICache cache = GetCache(resultInfo.CacheName);
+                AssertUtils.ArgumentNotNull(cache, "CacheName",
+                                            "Result cache with the specified name [" + resultInfo.CacheName +
+                                            "] does not exist.");
+
+                returnValue = cache.Get(resultKey);
+                cacheHit = (returnValue != null);
+                if (!cacheHit)
+                {
+                    #region Instrumentation
+
+                    if (isLogDebugEnabled)
+                    {
+                        logger.Debug("Object for key [" + resultKey + "] was not found in cache. Proceeding...");
+                    }
+
+                    #endregion
+
+                    returnValue = invocation.Proceed();
+                    if (EvalCondition(resultInfo.Condition, resultInfo.ConditionExpression, returnValue, vars))
+                    {
+                        #region Instrumentation
+
+                        if (isLogDebugEnabled)
+                        {
+                            logger.Debug("Caching object for key [" + resultKey + "].");
+                        }
+
+                        #endregion
+                        cache.Insert(resultKey, (returnValue==null)?NullValue:returnValue, resultInfo.TimeToLiveTimeSpan);
+                    }
+                }
+                else
+                {
+                    #region Instrumentation
+
+                    if (isLogDebugEnabled)
+                    {
+                        logger.Debug("Cache hit for [" + resultKey + "]. Aborting invocation...");
+                    }
+
+                    #endregion
+                }
+
+                return (returnValue==NullValue)?null:returnValue;
+            }
+
+            cacheHit = false;
+            return invocation.Proceed();
+        }
+
+        /// <summary>
+        /// Caches each item from the collection returned by target method.
+        /// </summary>
+        /// <param name="items">
+        /// A collection of items to cache.
+        /// </param>
+        /// <param name="itemInfoArray">
+        /// Attributes specifying where and how to cache each item from the collection.
+        /// </param>
+        private void CacheResultItems(ICollection items, CacheResultItemsAttribute[] itemInfoArray)
+        {
+            foreach (CacheResultItemsAttribute itemInfo in itemInfoArray)
+            {
+                ICache cache = GetCache(itemInfo.CacheName);
+                AssertUtils.ArgumentNotNull(cache, "CacheName",
+                                            "Result item cache with the specified name [" + itemInfo.CacheName +
+                                            "] does not exist.");
+
+                bool isDebugEnabled = logger.IsDebugEnabled;
+                foreach (object item in items)
+                {
+                    if (EvalCondition(itemInfo.Condition, itemInfo.ConditionExpression, item, null))
+                    {
+                        object itemKey = itemInfo.KeyExpression.GetValue(item);
+                        #region Instrumentation
+
+                        if (isDebugEnabled)
+                        {
+                            logger.Debug("Caching collection item for key [" + itemKey + "].");
+                        }
+
+                        #endregion
+                        cache.Insert(itemKey, (item==null?NullValue:item), itemInfo.TimeToLiveTimeSpan);
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvisor.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvisor.cs
new file mode 100644
index 00000000..160cfd5b
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvisor.cs
@@ -0,0 +1,103 @@
+#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
+
+#region Imports
+
+using System;
+using Spring.Aop.Support;
+using Spring.Caching;
+using Spring.Context;
+
+#endregion
+
+namespace Spring.Aspects.Cache
+{
+    /// <summary>
+    /// Convinience advisor implementation that applies <see cref="CacheResultAdvice"/>
+    /// to all the methods that have <see cref="CacheResultAttribute"/> defined.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CacheResultAdvisor.cs,v 1.1 2007/02/16 03:13:01 aseovic Exp $</version>
+    public class CacheResultAdvisor : AttributeMatchMethodPointcutAdvisor, IApplicationContextAware
+    {
+        /// <summary>
+        /// Creates new advisor instance.
+        /// </summary>
+        public CacheResultAdvisor()
+        {
+            Advice = new CacheResultAdvice();
+            Inherit = false;
+        }
+
+        /// <summary>
+        /// Set the <see cref="Spring.Context.IApplicationContext"/> that this
+        /// object runs in.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Normally this call will be used to initialize the object.
+        /// </p>
+        /// <p>
+        /// Invoked after population of normal object properties but before an
+        /// init callback such as
+        /// <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// or a custom init-method. Invoked after the setting of any
+        /// <see cref="Spring.Context.IResourceLoaderAware"/>'s
+        /// <see cref="Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+        /// property.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Context.ApplicationContextException">
+        /// In the case of application context initialization errors.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If thrown by any application context methods.
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectInitializationException"/>
+        public IApplicationContext ApplicationContext
+        {
+            get { return ((IApplicationContextAware) Advice).ApplicationContext; }
+            set { ((IApplicationContextAware) Advice).ApplicationContext = value; }
+        }
+
+        /// <summary>
+        /// Returns <c>true</c> if either <see cref="CacheResultAttribute"/> or 
+        /// <see cref="CacheResultItemsAttribute"/> is applied to the 
+        /// <paramref name="method"/>.
+        /// </summary>
+        /// <param name="method">
+        /// Method to check.
+        /// </param>
+        /// <param name="targetType">
+        /// Type of target object.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if either <see cref="CacheResultAttribute"/> or 
+        /// <see cref="CacheResultItemsAttribute"/> is applied to the 
+        /// <paramref name="method"/>; <c>false</c> otherwise.
+        /// </returns>
+        public override bool Matches(System.Reflection.MethodInfo method, Type targetType)
+        {
+            return method.IsDefined(typeof (CacheResultAttribute), Inherit)
+                   || method.IsDefined(typeof (CacheResultItemsAttribute), Inherit);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvice.cs b/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvice.cs
new file mode 100644
index 00000000..993f29ad
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvice.cs
@@ -0,0 +1,121 @@
+#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
+
+#region Imports
+
+using System.Collections;
+using System.Reflection;
+
+using Spring.Aop;
+using Spring.Caching;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aspects.Cache
+{
+    /// <summary>
+    /// Implementation of a cache invalidation advice.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This advice can be used to evict items from the cache. 
+    /// </p>
+    /// <p>
+    /// Information that determines which items should be evicted and from which cache
+    /// are retrieved from the <see cref="InvalidateCacheAttribute"/>s  that are defined 
+    /// on the pointcut.
+    /// </p>
+    /// <p>
+    /// Items are evicted *after* target method is invoked. Return value of the method, 
+    /// as well as method arguments, can be used to determine a list of keys for the items
+    /// that should be evicted (return value will be passed as a context for 
+    /// <see cref="InvalidateCacheAttribute.Keys"/> expression evaluation, and method
+    /// arguments will be passed as variables, keyed by argument name).
+    /// </p>
+    /// </remarks>
+    /// <seealso cref="InvalidateCacheAttribute"/>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: InvalidateCacheAdvice.cs,v 1.4 2007/04/01 15:04:05 bbaia Exp $</version>
+    public class InvalidateCacheAdvice : BaseCacheAdvice, IAfterReturningAdvice
+    {
+        // shared logger instance
+        //private static readonly ILog logger = LogManager.GetLogger(typeof(InvalidateCacheAdvice));
+
+        /// <summary>
+        /// Executes after <paramref name="target"/> <paramref name="method"/>
+        /// returns <b>successfully</b>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Note that the supplied <paramref name="returnValue"/> <b>cannot</b>
+        /// be changed by this type of advice... use the around advice type
+        /// (<see cref="AopAlliance.Intercept.IMethodInterceptor"/>) if you
+        /// need to change the return value of an advised method invocation.
+        /// The data encapsulated by the supplied <paramref name="returnValue"/>
+        /// can of course be modified though.
+        /// </p>
+        /// </remarks>
+        /// <param name="returnValue">
+        /// The value returned by the <paramref name="target"/>.
+        /// </param>
+        /// <param name="method">The intecepted method.</param>
+        /// <param name="arguments">The intercepted method's arguments.</param>
+        /// <param name="target">The target object.</param>
+        /// <seealso cref="AopAlliance.Intercept.IMethodInterceptor.Invoke"/>
+        public void AfterReturning(object returnValue, MethodInfo method, object[] arguments, object target)
+        {
+            InvalidateCacheAttribute[] cacheInfoArray =
+                (InvalidateCacheAttribute[]) method.GetCustomAttributes(typeof(InvalidateCacheAttribute), false);
+
+            if (cacheInfoArray.Length > 0)
+            {
+                IDictionary vars = PrepareVariables(method, arguments);
+                foreach (InvalidateCacheAttribute cacheInfo in cacheInfoArray)
+                {
+                    if (EvalCondition(cacheInfo.Condition, cacheInfo.ConditionExpression, returnValue, vars))
+                    {
+                        ICache cache = GetCache(cacheInfo.CacheName);
+                        AssertUtils.ArgumentNotNull(cache, "CacheName",
+                                                    "Cache with the specified name [" + cacheInfo.CacheName +
+                                                    "] does not exist.");
+
+                        if (cacheInfo.KeysExpression != null)
+                        {
+                            object keys = cacheInfo.KeysExpression.GetValue(returnValue, vars);
+                            if (keys is ICollection)
+                            {
+                                cache.RemoveAll(keys as ICollection);
+                            }
+                            else
+                            {
+                                cache.Remove(keys);
+                            }
+                        }
+                        else
+                        {
+                            cache.Clear();
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvisor.cs b/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvisor.cs
new file mode 100644
index 00000000..5eaf46e6
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvisor.cs
@@ -0,0 +1,82 @@
+#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
+
+#region Imports
+
+using System;
+using Spring.Aop.Support;
+using Spring.Caching;
+using Spring.Context;
+
+#endregion
+
+namespace Spring.Aspects.Cache
+{
+    /// <summary>
+    /// Convinience advisor implementation that applies <see cref="InvalidateCacheAdvice"/>
+    /// to all the methods that have <see cref="InvalidateCacheAttribute"/> defined.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: InvalidateCacheAdvisor.cs,v 1.1 2007/02/16 03:13:01 aseovic Exp $</version>
+    public class InvalidateCacheAdvisor : AttributeMatchMethodPointcutAdvisor, IApplicationContextAware
+    {
+        /// <summary>
+        /// Creates new advisor instance.
+        /// </summary>
+        public InvalidateCacheAdvisor()
+        {
+            Advice = new InvalidateCacheAdvice();
+            Attribute = typeof(InvalidateCacheAttribute);
+            Inherit = false;
+        }
+
+        /// <summary>
+        /// Set the <see cref="Spring.Context.IApplicationContext"/> that this
+        /// object runs in.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Normally this call will be used to initialize the object.
+        /// </p>
+        /// <p>
+        /// Invoked after population of normal object properties but before an
+        /// init callback such as
+        /// <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// or a custom init-method. Invoked after the setting of any
+        /// <see cref="Spring.Context.IResourceLoaderAware"/>'s
+        /// <see cref="Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+        /// property.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Context.ApplicationContextException">
+        /// In the case of application context initialization errors.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If thrown by any application context methods.
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectInitializationException"/>
+        public IApplicationContext ApplicationContext
+        {
+            get { return ((IApplicationContextAware) Advice).ApplicationContext; }
+            set { ((IApplicationContextAware) Advice).ApplicationContext = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Exceptions/ExceptionHandlerAdvice.cs b/src/Spring/Spring.Aop/Aspects/Exceptions/ExceptionHandlerAdvice.cs
new file mode 100644
index 00000000..17bc8b35
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Exceptions/ExceptionHandlerAdvice.cs
@@ -0,0 +1,391 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+using System.Reflection;
+using AopAlliance.Intercept;
+using Common.Logging;
+
+namespace Spring.Aspects.Exceptions
+{
+    /// <summary>
+    /// Exception advice to perform exception translation, conversion of exceptions to default return values, and
+    /// exception swallowing.  Configuration is via a DSL like string for ease of use in common cases as well as
+    /// allowing for custom translation logic by leveraging the Spring expression language.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The exception handler collection can be filled with either instances of objects that implement the interface
+    /// <see cref="IExceptionHandler"/> or a string that follows a simple syntax for most common exception management
+    /// needs.  The source exceptions to perform processing on are listed immediately after the keyword 'on' and can
+    /// be comma delmited.  Following that is the action to perform, either log, translate, wrap, replace, return, or
+    /// swallow.  Following the action is a Spring expression language (SpEL) fragment that is used to either create the
+    /// translated/wrapped/replaced exception or specify an alternative return value.  The variables available to be
+    /// used in the expression language fragment are, #method, #args, #target, and #e which are 1) the method that
+    /// threw the exception, the arguments to the method, the target object itself, and the exception that was thrown.
+    /// Using SpEL gives you great flexibility in creating a translation of an exception that has access to the calling context.
+    /// </para>
+    /// <para>Common translation cases, wrap and rethrow, are supported with a shorter syntax where you can specify only
+    /// the exception text for the new translated exception.  If you ommit the exception text a default value will be
+    /// used.</para>
+    /// <para>The exceptionsHandlers are compared to the thrown exception in the order they are listed.  logging
+    /// an exception will continue the evaluation process, in all other cases exceution stops at that point and the
+    /// appropriate exceptions handler is executed.</para>
+    /// <code escaped="true">
+    /// <property name="exceptionHandlers">
+    ///   <list>
+    ///     <value>on FooException1 log 'My Message, Method Name ' + #method.Name</value>
+	///     <value>on FooException1 translate new BarException('My Message, Method Called = ' + #method.Name", #e)</value>
+	///     <value>on FooException2,Foo3Exception wrap BarException 'My Bar Message'</value>
+	///     <value>on FooException4 replace BarException 'My Bar Message'</value>
+	///     <value>on FooException5 return 32</value>
+	///     <value>on FooException6 swallow</value>
+	///     <ref object="exceptionExpression"/>
+	///   </list>
+	/// </property>
+	/// </code>
+	/// 
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: ExceptionHandlerAdvice.cs,v 1.9 2007/10/11 01:29:42 markpollack Exp $</version>
+    public class ExceptionHandlerAdvice : AbstractExceptionHandlerAdvice
+    {
+        #region Fields
+
+        private static readonly ILog log = LogManager.GetLogger(typeof(ExceptionHandlerAdvice));
+
+        private IList exceptionHandlers = new ArrayList();
+
+        private string onExceptionNameRegex = @"^(on\s+exception\s+name)\s+(.*?)\s+(log|translate|wrap|replace|return|swallow)\s*(.*?)$";
+
+        private string onExceptionRegex = @"^(on\s+exception\s+)(\(.*?\))\s+(log|translate|wrap|replace|return|swallow)\s*(.*?)$";
+            
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the Regex string used to parse advice expressions starting with 'on exception name' and exception handling actions.
+        /// </summary>
+        /// <value>The regex string to parse advice expressions starting with 'on exception name' and exception handling actions.</value>
+        public override string OnExceptionNameRegex
+        {
+            get { return onExceptionNameRegex; }
+            set { onExceptionNameRegex = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Regex string used to parse advice expressions starting with 'on exception (constraint)' and exception handling actions.
+        /// </summary>
+        /// <value>The regex string to parse advice expressions starting with 'on exception (constraint)' and exception handling actions.</value>
+        public override string OnExceptionRegex
+        {
+            get { return onExceptionRegex; }
+            set { onExceptionRegex = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the exception handler.
+        /// </summary>
+        /// <value>The exception handler.</value>
+        public IList ExceptionHandlers
+        {
+            get { return exceptionHandlers; }
+            set { exceptionHandlers = value; }
+        }
+
+        #endregion
+
+        #region IMethodInterceptor implementation
+
+        /// <summary>
+        /// Implement this method to perform extra treatments before and after
+        /// the call to the supplied <paramref name="invocation"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Polite implementations would certainly like to invoke
+        /// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/>. 
+        /// </p>
+        /// </remarks>
+        /// <param name="invocation">
+        /// The method invocation that is being intercepted.
+        /// </param>
+        /// <returns>
+        /// The result of the call to the
+        /// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+        /// the supplied <paramref name="invocation"/>; this return value may
+        /// well have been intercepted by the interceptor.
+        /// </returns>
+        /// <exception cref="System.Exception">
+        /// If any of the interceptors in the chain or the target object itself
+        /// throws an exception.
+        /// </exception>
+        public override object Invoke(IMethodInvocation invocation)
+        {
+            try
+            {
+                return invocation.Proceed();
+            }
+            catch (TargetInvocationException ex)
+            {
+                Exception realException = ex.InnerException;
+                InvokeHandlers(realException, invocation);
+                throw realException;
+            }
+            catch (Exception ex)
+            {
+                object returnVal = InvokeHandlers(ex, invocation);
+
+                if (returnVal == null)
+                {
+                    return null;
+                }
+
+                // if only logged
+                if (returnVal.Equals("logged"))
+                {
+                    throw;
+                }
+
+                //only here if we only are swallowing, returning alternative value, no matching handler was found.
+                
+                // no matching handler.
+                if (returnVal.Equals("nomatch"))
+                {
+                    throw;
+                }
+                else
+                {
+                    //TODO make spring specific value.
+                    if (!returnVal.Equals("swallow"))
+                    {
+                        return returnVal;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region IInitializingObject implementation
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method allows the object instance to perform the kind of
+        /// initialization only possible when all of it's dependencies have
+        /// been injected (set), and to throw an appropriate exception in the
+        /// event of misconfiguration.
+        /// </p>
+        /// <p>
+        /// Please do consult the class level documentation for the
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+        /// description of exactly <i>when</i> this method is invoked. In
+        /// particular, it is worth noting that the
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and <see cref="Spring.Context.IApplicationContextAware"/>
+        /// callbacks will have been invoked <i>prior</i> to this method being
+        /// called.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as the failure to set a
+        /// required property) or if initialization fails.
+        /// </exception>
+        public override void AfterPropertiesSet()
+        {
+            if (exceptionHandlers.Count == 0)
+            {
+                throw new ArgumentException("At least one handler is required");
+            }
+            IList newExceptionHandlers = new ArrayList();
+            foreach (object o in exceptionHandlers)
+            {
+                string handlerString = o as string;
+                if (handlerString != null)
+                {
+                    IExceptionHandler handler = Parse(handlerString);
+                    if (handler == null)
+                    {
+                        throw new ArgumentException("Was not able to parse exception handler string [" + handlerString +
+                                                    "]");
+                    }
+                    newExceptionHandlers.Add(handler);
+                }
+
+            }
+            //TODO sync.
+            exceptionHandlers = newExceptionHandlers;
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Invokes handlers registered for the passed exception and <see cref="IMethodInvocation"/>
+        /// </summary>
+        /// <param name="ex">The exception to be handled</param>
+        /// <param name="invocation">The <see cref="IMethodInvocation"/> that raised this exception.</param>
+        /// <returns>The output of <see cref="IExceptionHandler.HandleException"/> </returns>
+        protected virtual object InvokeHandlers(Exception ex, IMethodInvocation invocation)
+        {
+            IDictionary callContextDictionary = new Hashtable();
+            callContextDictionary.Add("method", invocation.Method);
+            callContextDictionary.Add("args", invocation.Arguments);
+            callContextDictionary.Add("target", invocation.Target);
+            callContextDictionary.Add("e", ex);
+            object retValue = "nomatch";
+            foreach (IExceptionHandler handler in exceptionHandlers)
+            {
+                if (handler != null)
+                {
+                    if (handler.CanHandleException(ex, callContextDictionary))
+                    {
+                        retValue = handler.HandleException(callContextDictionary);
+                        if (!handler.ContinueProcessing)
+                        {
+                            return retValue;
+                        }
+                    }
+                }
+            }
+            return retValue;
+        }
+
+        /// <summary>
+        /// Parses the specified handler string, creating an instance of IExceptionHander.
+        /// </summary>
+        /// <param name="handlerString">The handler string.</param>
+        /// <returns>an instance of an exception handler or null if was not able to correctly parse
+        /// handler string.</returns>
+        protected virtual IExceptionHandler Parse(string handlerString)
+        {
+            ParsedAdviceExpression parsedAdviceExpression = ParseAdviceExpression(handlerString);
+
+            if (!parsedAdviceExpression.Success)
+            {
+                log.Warn("Could not parse exception hander statement " + handlerString);
+                return null;
+            }
+
+            return CreateExceptionHandler(parsedAdviceExpression);
+        }
+
+        private static IExceptionHandler CreateExceptionHandler(ParsedAdviceExpression parsedAdviceExpression)           
+        {
+            if (parsedAdviceExpression.ActionText.IndexOf("log") >= 0)
+            {
+                //TODO support user selection of level, log.Debug , log.Info etc.
+                LogExceptionHandler handler = new LogExceptionHandler(parsedAdviceExpression.ExceptionNames);
+                handler.ConstraintExpressionText = parsedAdviceExpression.ConstraintExpression;
+                handler.ActionExpressionText = "#log.Trace(" + parsedAdviceExpression.ActionExpressionText + ")";
+                return handler;
+            }
+            else if (parsedAdviceExpression.ActionText.IndexOf("translate") >= 0)
+            {
+                TranslationExceptionHandler handler = new TranslationExceptionHandler(parsedAdviceExpression.ExceptionNames);
+                handler.ConstraintExpressionText = parsedAdviceExpression.ConstraintExpression;
+                handler.ActionExpressionText = parsedAdviceExpression.ActionExpressionText;
+                return handler;
+            }
+            else if (parsedAdviceExpression.ActionText.IndexOf("wrap") >= 0)
+            {
+                TranslationExceptionHandler handler = new TranslationExceptionHandler(parsedAdviceExpression.ExceptionNames);
+                handler.ConstraintExpressionText = parsedAdviceExpression.ConstraintExpression;
+                handler.ActionExpressionText = ParseWrappedExceptionExpression("wrap", parsedAdviceExpression.AdviceExpression);
+                return handler;                
+            }
+            else if (parsedAdviceExpression.ActionText.IndexOf("replace") >= 0)
+            {
+                TranslationExceptionHandler handler = new TranslationExceptionHandler(parsedAdviceExpression.ExceptionNames);
+                handler.ConstraintExpressionText = parsedAdviceExpression.ConstraintExpression;
+                handler.ActionExpressionText = ParseWrappedExceptionExpression("replace", parsedAdviceExpression.AdviceExpression);
+                return handler;
+            }
+            else if (parsedAdviceExpression.ActionText.IndexOf("swallow") >= 0)
+            {
+                SwallowExceptionHandler handler = new SwallowExceptionHandler(parsedAdviceExpression.ExceptionNames);
+                handler.ConstraintExpressionText = parsedAdviceExpression.ConstraintExpression;
+                return handler;
+            }
+            else if (parsedAdviceExpression.ActionText.IndexOf("return") >= 0)
+            {
+                ReturnValueExceptionHandler handler = new ReturnValueExceptionHandler(parsedAdviceExpression.ExceptionNames);
+                handler.ConstraintExpressionText = parsedAdviceExpression.ConstraintExpression;
+                handler.ActionExpressionText = parsedAdviceExpression.ActionExpressionText;
+                return handler;
+            }
+            else
+            {
+                log.Warn("Could not parse exception hander statement " + parsedAdviceExpression.AdviceExpression);
+            }
+            return null;
+        }
+
+        private static string ParseWrappedExceptionExpression(string action, string handlerString)
+        {
+            int endOfActionIndex = handlerString.IndexOf(action) + action.Length;
+            string exceptionAndMessage = handlerString.Substring(endOfActionIndex).Trim();
+            int endOfExceptionTypeIndex = exceptionAndMessage.IndexOf(" ");
+
+            string rawExpressionTextPart;
+            string exception;
+            //Has two pieces.
+            if (endOfExceptionTypeIndex > 0)
+            {
+                exception = exceptionAndMessage.Substring(0, endOfExceptionTypeIndex).Trim();
+                rawExpressionTextPart = exceptionAndMessage.Substring(endOfExceptionTypeIndex).Trim();
+            }
+            else
+            {
+                exception = exceptionAndMessage;
+                if (action.Equals("wrap"))
+                {
+                    rawExpressionTextPart = "'Wrapped ' + #e.GetType().Name";
+                } else
+                {
+                    rawExpressionTextPart = "'Replaced ' + #e.GetType().Name";
+                }
+            }
+
+            if (action.Equals("wrap"))
+            {
+                return string.Format("new {0}({1}, #e)", exception, rawExpressionTextPart);
+            } else
+            {
+                return string.Format("new {0}({1})", exception, rawExpressionTextPart);
+            }
+        }
+
+
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs
new file mode 100644
index 00000000..56305bc1
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs
@@ -0,0 +1,91 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+using Common.Logging;
+using Spring.Expressions;
+
+namespace Spring.Aspects.Exceptions
+{
+    /// <summary>
+    /// Log the exceptions.  Default log nameis "LogExceptionHandler" and log level is Debug 
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: LogExceptionHandler.cs,v 1.6 2008/02/26 00:03:24 markpollack Exp $</version>
+    public class LogExceptionHandler : AbstractExceptionHandler
+    {
+        private string logName = "LogExceptionHandler";
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LogExceptionHandler"/> class.
+        /// </summary>
+        public LogExceptionHandler()
+        {
+            ContinueProcessing = true;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LogExceptionHandler"/> class.
+        /// </summary>
+        /// <param name="exceptionNames">The exception names.</param>
+        public LogExceptionHandler(string[] exceptionNames) : base(exceptionNames)
+        {
+            ContinueProcessing = true;
+        }
+
+
+
+        /// <summary>
+        /// Gets or sets the name of the log.
+        /// </summary>
+        /// <value>The name of the log.</value>
+        public string LogName
+        {
+            get { return logName; }
+            set { logName = value; }
+        }
+
+        
+        /// <summary>
+        /// Handles the exception.
+        /// </summary>
+        /// <param name="callContextDictionary">the calling context dictionary</param>
+        /// <returns>
+        /// The return value from handling the exception, if not rethrown or a new exception is thrown.
+        /// </returns>
+        public override object HandleException(IDictionary callContextDictionary)
+        {
+            ILog log = LogManager.GetLogger(logName);
+            callContextDictionary.Add("log", log);
+            try
+            {
+                IExpression expression = Expression.Parse(ActionExpressionText);
+                expression.GetValue(null, callContextDictionary);
+            }
+            catch (Exception e)
+            {
+                log.Warn("Was not able to evaluate action expression [" + ActionExpressionText + "]", e);                    
+            }
+            return "logged";            
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Exceptions/ReturnValueExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/Exceptions/ReturnValueExceptionHandler.cs
new file mode 100644
index 00000000..46c239df
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Exceptions/ReturnValueExceptionHandler.cs
@@ -0,0 +1,72 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+using Common.Logging;
+using Spring.Expressions;
+
+namespace Spring.Aspects.Exceptions
+{
+    /// <summary>
+    /// Evaluates the expression for the return value of the method.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: ReturnValueExceptionHandler.cs,v 1.3 2007/10/10 18:07:46 markpollack Exp $</version>
+    public class ReturnValueExceptionHandler : AbstractExceptionHandler
+    {
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReturnValueExceptionHandler"/> class.
+        /// </summary>
+        public ReturnValueExceptionHandler()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReturnValueExceptionHandler"/> class.
+        /// </summary>
+        /// <param name="exceptionNames">The exception names.</param>
+        public ReturnValueExceptionHandler(string[] exceptionNames) : base(exceptionNames)
+        {
+        }
+
+
+
+        /// <summary>
+        /// Returns the result of evaluating the translation expression.
+        /// </summary>
+        /// <returns>The return value from handling the exception, if not rethrown or a new exception is thrown.</returns>
+        public override object HandleException(IDictionary callContextDictionary)
+        {
+            object returnVal = null;
+            try
+            {
+                IExpression expression = Expression.Parse(ActionExpressionText);
+                returnVal = expression.GetValue(null, callContextDictionary);
+            }
+            catch (Exception e)
+            {
+                log.Warn("Was not able to evaluate action expression [" + ActionExpressionText + "]", e);
+            }
+            return returnVal;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Exceptions/SwallowExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/Exceptions/SwallowExceptionHandler.cs
new file mode 100644
index 00000000..f7f22db2
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Exceptions/SwallowExceptionHandler.cs
@@ -0,0 +1,58 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+
+namespace Spring.Aspects.Exceptions
+{
+    /// <summary>
+    /// Returns a token to indicate that this exception should be swallowed.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: SwallowExceptionHandler.cs,v 1.2 2007/10/02 21:56:53 markpollack Exp $</version>
+    public class SwallowExceptionHandler : AbstractExceptionHandler
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SwallowExceptionHandler"/> class.
+        /// </summary>
+        public SwallowExceptionHandler()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SwallowExceptionHandler"/> class.
+        /// </summary>
+        /// <param name="exceptionNames">The exception names.</param>
+        public SwallowExceptionHandler(string[] exceptionNames) : base(exceptionNames)
+        {
+        }
+
+
+
+        /// <summary>
+        /// Handles the exception.
+        /// </summary>
+        /// <returns>The return value from handling the exception, if not rethrown or a new exception is thrown.</returns>
+        public override object HandleException(IDictionary callContextDictionary)
+        {
+            return "swallow";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Exceptions/TranslationExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/Exceptions/TranslationExceptionHandler.cs
new file mode 100644
index 00000000..65700a5a
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Exceptions/TranslationExceptionHandler.cs
@@ -0,0 +1,80 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+using Common.Logging;
+using Spring.Expressions;
+
+namespace Spring.Aspects.Exceptions
+{
+    /// <summary>
+    /// Translates from one exception to another based.  My wrap or replace exception depending on the expression.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: TranslationExceptionHandler.cs,v 1.3 2007/10/10 18:07:46 markpollack Exp $</version>
+    public class TranslationExceptionHandler : AbstractExceptionHandler
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TranslationExceptionHandler"/> class.
+        /// </summary>
+        public TranslationExceptionHandler()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TranslationExceptionHandler"/> class.
+        /// </summary>
+        /// <param name="exceptionNames">The exception names.</param>
+        public TranslationExceptionHandler(string[] exceptionNames) : base(exceptionNames)
+        {
+        }
+
+
+
+        /// <summary>
+        /// Handles the exception.
+        /// </summary>
+        /// <returns>The return value from handling the exception, if not rethrown or a new exception is thrown.</returns>
+        public override object HandleException(IDictionary callContextDictionary)
+        {
+            object o = null;
+            try {
+                IExpression expression = Expression.Parse(ActionExpressionText);
+                o = expression.GetValue(null, callContextDictionary);
+            }
+            catch (Exception e)
+            {
+                log.Warn("Was not able to evaluate action expression [" + ActionExpressionText + "]", e);
+            }
+            Exception translatedException = o as Exception;
+            if (translatedException != null)
+            {
+                ThrowTranslatedException(translatedException);
+            }
+            return null;
+        }
+
+        private void ThrowTranslatedException(Exception exception)
+        {
+            throw exception;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/IExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/IExceptionHandler.cs
new file mode 100644
index 00000000..3ac61223
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/IExceptionHandler.cs
@@ -0,0 +1,97 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+
+namespace Spring.Aspects
+{
+    /// <summary>
+    /// Handles a thrown exception providing calling context.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: IExceptionHandler.cs,v 1.1 2007/10/08 22:05:16 markpollack Exp $</version>
+    public interface IExceptionHandler
+    {
+        /// <summary>
+        /// Determines whether this instance can handle the exception the specified exception.
+        /// </summary>
+        /// <param name="ex">The exception.</param>
+        /// <param name="callContextDictionary">The call context dictionary.</param>
+        /// <returns>
+        /// 	<c>true</c> if this instance can handle the specified exception; otherwise, <c>false</c>.
+        /// </returns>
+        bool CanHandleException(Exception ex, IDictionary callContextDictionary);
+
+        /// <summary>
+        /// Handles the exception.
+        /// </summary>
+        /// <param name="callContextDictionary">The call context dictionary.</param>
+        /// <returns>
+        /// The return value from handling the exception, if not rethrown or a new exception is thrown.
+        /// </returns>
+        object HandleException(IDictionary callContextDictionary);
+
+        /// <summary>
+        /// Gets the source exception names.
+        /// </summary>
+        /// <value>The source exception names.</value>
+        IList SourceExceptionNames
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// Gets the source exception types.
+        /// </summary>
+        /// <value>The source exception types.</value>
+        IList SourceExceptionTypes
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// Gets the translation expression text
+        /// </summary>
+        /// <value>The translation expression text</value>
+        string ActionExpressionText
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// Gets or sets the constraint expression text.
+        /// </summary>
+        /// <value>The constraint expression text.</value>
+        string ConstraintExpressionText
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether to continue processing.
+        /// </summary>
+        /// <value><c>true</c> if continue processing; otherwise, <c>false</c>.</value>
+        bool ContinueProcessing
+        {
+            get; set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Logging/AbstractLoggingAdvice.cs b/src/Spring/Spring.Aop/Aspects/Logging/AbstractLoggingAdvice.cs
new file mode 100644
index 00000000..a0b0b581
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Logging/AbstractLoggingAdvice.cs
@@ -0,0 +1,240 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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;
+using AopAlliance.Intercept;
+using Common.Logging;
+using Spring.Aop.Framework;
+
+namespace Spring.Aspects.Logging
+{
+    /// <summary>
+    /// Abstract base class for logging advice
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AbstractLoggingAdvice.cs,v 1.2 2007/12/06 17:17:19 markpollack Exp $</version>
+    public abstract class AbstractLoggingAdvice : IMethodInterceptor
+    {
+        #region Fields
+
+        /// <summary>
+        /// The default <code>ILog</code> instance used to write logging messages.
+        /// </summary>
+        protected ILog defaultLogger = LogManager.GetLogger(MethodInfo.GetCurrentMethod().DeclaringType);
+
+        /// <summary>
+        /// Indicates whether or not proxy type names should be hidden when using dynamic loggers.
+        /// </summary>
+        private bool hideProxyTypeNames = false;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Sets a value indicating whether to use a dynamic logger or static logger
+        /// </summary>
+        /// <remarks>Default is to use a static logger.
+        /// <para>
+        /// Used to determine which ILog instance should be used to write log messages for
+        /// a particular method invocation: a dynamic one for the Type getting called,
+        /// or a static one for the Type of the trace interceptor.
+        /// </para>
+        /// <para>
+        /// Specify either this property or LoggerName, not both.
+        /// </para>
+        /// </remarks>
+        /// <value><c>true</c> if use dynamic logger; otherwise, <c>false</c>.</value>
+        public bool UseDynamicLogger
+        {
+            set
+            {
+                defaultLogger = (value ? null : LogManager.GetLogger(GetType()));
+            }
+        }
+
+        /// <summary>
+        /// Sets the name of the logger to use.
+        /// </summary>
+        /// <remarks>
+        /// The name will be passed to the underlying logging implementation through Common.Logging,
+        /// getting interpreted as the log category according to the loggers configuration.
+        /// <para>
+        /// This can be specified to not log into the category of a Type (whether this
+        /// interceptor's class or the class getting called) but rather to a specific named category.
+        /// </para>
+        /// <para>
+        /// Specify either this property or UseDynamicLogger, but not both.
+        /// </para>
+        /// </remarks>
+        /// <value>The name of the logger.</value>
+        public string LoggerName
+        {
+            set
+            {
+                defaultLogger =  LogManager.GetLogger(value);
+            }
+        }
+
+
+        /// <summary>
+        /// Sets a value indicating whether hide proxy type names (whenever possible)
+        /// when using dynamic loggers, i.e. property UseDynamicLogger is set to true.
+        /// </summary>
+        /// <value><c>true</c> if [hide proxy type names]; otherwise, <c>false</c>.</value>
+        public bool HideProxyTypeNames
+        {
+            set { hideProxyTypeNames = value; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Adds logging to the method invocation.  
+        /// </summary>
+        /// <remarks>
+        /// The method IsInterceptorEnabled is called
+        /// as an optimization to determine if logging should be applied.  If logging should be 
+        /// applied, the method invocation is passed to the InvokeUnderLog method for handling.
+        /// If not, the method proceeds as normal. 
+        /// </remarks>
+        /// <param name="invocation">
+        /// The method invocation that is being intercepted.
+        /// </param>
+        /// <returns>
+        /// The result of the call to the
+        /// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+        /// the supplied <paramref name="invocation"/>; this return value may
+        /// well have been intercepted by the interceptor.
+        /// </returns>
+        /// <exception cref="System.Exception">
+        /// If any of the interceptors in the chain or the target object itself
+        /// throws an exception.
+        /// </exception>
+        public object Invoke(IMethodInvocation invocation)
+        {
+            object o = invocation.This;
+            ILog log = GetLoggerForInvocation(invocation);
+            if (IsInterceptorEnabled(invocation, log))
+            {
+                return InvokeUnderLog(invocation, log);
+            }
+            else
+            {
+                return invocation.Proceed();
+            }
+
+        }
+
+        /// <summary>
+        /// Determines whether the interceptor is enabled for the specified invocation, that
+        /// is, whether the method InvokeUnderLog is called.
+        /// </summary>
+        /// <remarks>The default behavior is to check whether the given ILog instance
+        /// is enabled by calling IsLogEnabled, whose default behavior is to check if
+        /// the TRACE level of logging is enabled.  Subclasses</remarks>
+        /// <param name="invocation">The invocation.</param>
+        /// <param name="log">The log to write messages to</param>
+        /// <returns>
+        /// 	<c>true</c> if [is interceptor enabled] [the specified invocation]; otherwise, <c>false</c>.
+        /// </returns>
+        protected virtual bool IsInterceptorEnabled(IMethodInvocation invocation, ILog log)
+        {
+            return IsLogEnabled(log);
+        }
+
+        /// <summary>
+        /// Determines whether the given log is enabled.
+        /// </summary>
+        /// <remarks>
+        /// Default is true when the trace level is enabled.  Subclasses may override this
+        /// to change the level at which logging occurs, or return true to ignore level
+        /// checks.</remarks>
+        /// <param name="log">The log instance to check.</param>
+        /// <returns>
+        /// 	<c>true</c> if log is for a given log level; otherwise, <c>false</c>.
+        /// </returns>
+        protected virtual bool IsLogEnabled(ILog log)
+        {
+            return log.IsTraceEnabled;
+        }
+
+        /// <summary>
+        /// Subclasses must override this method to perform any tracing around the supplied
+        /// IMethodInvocation.
+        /// </summary>
+        /// <remarks>
+        /// Subclasses are resonsible for ensuring that the IMethodInvocation actually executes
+        /// by calling IMethodInvocation.Proceed().
+        /// <para>
+        /// By default, the passed-in ILog instance will have log level
+        /// "trace" enabled. Subclasses do not have to check for this again, unless
+        /// they overwrite the IsInterceptorEnabled method to modify
+        /// the default behavior.
+        /// </para>
+        /// </remarks>
+        /// <param name="invocation">The method invocation to log</param>
+        /// <param name="log">The log to write messages to</param>
+        /// <returns>The result of the call to IMethodInvocation.Proceed()
+        /// </returns>
+        /// <exception cref="System.Exception">
+        /// If any of the interceptors in the chain or the target object itself
+        /// throws an exception.
+        /// </exception>
+        protected abstract object InvokeUnderLog(IMethodInvocation invocation, ILog log);
+
+
+        /// <summary>
+        /// Gets the appropriate log instance to use for the given IMethodInvocation.
+        /// </summary>
+        /// <remarks>
+        /// If the UseDynamicLogger property is set to true, the ILog instance will be
+        /// for the target class of the IMethodInvocation, otherwise the log will be the
+        /// default static logger.
+        /// </remarks>
+        /// <param name="invocation">The method invocation being logged.</param>
+        /// <returns>The ILog instance to use.</returns>
+        protected virtual ILog GetLoggerForInvocation(IMethodInvocation invocation)
+        {
+            if (defaultLogger != null)
+            {
+                return defaultLogger;
+            }
+            else
+            {
+                object target = invocation.This;
+                Type logCategoryType = target.GetType();
+                if (hideProxyTypeNames)
+                {
+                    logCategoryType = AopUtils.GetTargetType(target);
+                }
+                return LogManager.GetLogger(logCategoryType);
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Logging/SimpleLoggingAdvice.cs b/src/Spring/Spring.Aop/Aspects/Logging/SimpleLoggingAdvice.cs
new file mode 100644
index 00000000..c7374ec8
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Logging/SimpleLoggingAdvice.cs
@@ -0,0 +1,459 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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;
+using System.Text;
+using AopAlliance.Intercept;
+using Common.Logging;
+
+namespace Spring.Aspects.Logging
+{
+    /// <summary>
+    /// Configurable advice for logging.
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: SimpleLoggingAdvice.cs,v 1.7 2008/04/04 15:30:13 markpollack Exp $</version>
+    public class SimpleLoggingAdvice : AbstractLoggingAdvice
+    {
+        #region Fields
+
+        /// <summary>
+        /// Flag to indicate if unique identifier should be in the log message.
+        /// </summary>
+        private bool logUniqueIdentifier;
+
+        /// <summary>
+        /// Flag to indicate if the execution time should be in the log message.
+        /// </summary>
+        private bool logExecutionTime;
+
+        /// <summary>
+        /// Flag to indicate if the method arguments should be in the log message.
+        /// </summary>
+        private bool logMethodArguments;
+
+        /// <summary>
+        /// Flag to indicate if the return value should be in the log message.
+        /// </summary>
+        private bool logReturnValue;
+
+        /// <summary>
+        /// The separator string to use for delmiting log message fields.
+        /// </summary>
+        private string separator = ", ";
+
+        /// <summary>
+        /// The log level to use for logging the entry, exit, exception messages.
+        /// </summary>
+        private LogLevel logLevel = LogLevel.Trace;
+
+
+        #endregion
+
+        #region Constructor(s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleLoggingAdvice"/> class.
+        /// </summary>
+        public SimpleLoggingAdvice()
+        {
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleLoggingAdvice"/> class.
+        /// </summary>
+        /// <param name="useDynamicLogger">if set to <c>true</c> to use dynamic logger, if
+        /// <c>false</c> use static logger.</param>
+        public SimpleLoggingAdvice(bool useDynamicLogger)
+        {
+            UseDynamicLogger = useDynamicLogger;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to log a unique identifier with the log message.
+        /// </summary>
+        /// <value><c>true</c> if [log unique identifier]; otherwise, <c>false</c>.</value>
+        public bool LogUniqueIdentifier
+        {
+            get { return logUniqueIdentifier; }
+            set { logUniqueIdentifier = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to log execution time.
+        /// </summary>
+        /// <value><c>true</c> if log execution time; otherwise, <c>false</c>.</value>
+        public bool LogExecutionTime
+        {
+            get { return logExecutionTime; }
+            set { logExecutionTime = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether log method arguments.
+        /// </summary>
+        /// <value><c>true</c> if log method arguments]; otherwise, <c>false</c>.</value>
+        public bool LogMethodArguments
+        {
+            get { return logMethodArguments; }
+            set { logMethodArguments = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether log return value.
+        /// </summary>
+        /// <value><c>true</c> if log return value; otherwise, <c>false</c>.</value>
+        public bool LogReturnValue
+        {
+            get { return logReturnValue; }
+            set { logReturnValue = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the seperator string to use for delmiting log message fields.
+        /// </summary>
+        /// <value>The seperator.</value>
+        public string Separator
+        {
+            get { return separator; }
+            set { separator = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the entry log level.
+        /// </summary>
+        /// <value>The entry log level.</value>
+        public LogLevel LogLevel
+        {
+            get { return logLevel; }
+            set { logLevel = value; }
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Subclasses must override this method to perform any tracing around the supplied
+        /// IMethodInvocation.
+        /// </summary>
+        /// <param name="invocation">The method invocation to log</param>
+        /// <param name="log">The log to write messages to</param>
+        /// <returns>
+        /// The result of the call to IMethodInvocation.Proceed()
+        /// </returns>
+        /// <remarks>
+        /// Subclasses are resonsible for ensuring that the IMethodInvocation actually executes
+        /// by calling IMethodInvocation.Proceed().
+        /// <para>
+        /// By default, the passed-in ILog instance will have log level
+        /// "trace" enabled. Subclasses do not have to check for this again, unless
+        /// they overwrite the IsInterceptorEnabled method to modify
+        /// the default behavior.
+        /// </para>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// If any of the interceptors in the chain or the target object itself
+        /// throws an exception.
+        /// </exception>
+        protected override object InvokeUnderLog(IMethodInvocation invocation, ILog log)
+        {
+            object returnValue = null;
+            bool exitThroughException = false;
+            
+            DateTime startTime = DateTime.Now;
+            string uniqueIdentifier = null;
+
+            if (LogUniqueIdentifier)
+            {
+                uniqueIdentifier = CreateUniqueIdentifier(); 
+            }
+            try
+            {
+                WriteToLog(LogLevel, log, GetEntryMessage(invocation, uniqueIdentifier), null);
+                returnValue = invocation.Proceed();
+                return returnValue;
+            } catch (Exception e)
+            {
+                TimeSpan executionTimeSpan = DateTime.Now - startTime;
+                WriteToLog(LogLevel, log, GetExceptionMessage(invocation, e, executionTimeSpan, uniqueIdentifier), e);
+                exitThroughException = true;
+                throw;
+            }
+            finally
+            {
+                if (!exitThroughException)
+                {
+                    TimeSpan executionTimeSpan = DateTime.Now - startTime;
+                    WriteToLog(LogLevel, log, GetExitMessage(invocation, returnValue, executionTimeSpan, uniqueIdentifier), null);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the given log is enabled.
+        /// </summary>
+        /// <param name="log">The log instance to check.</param>
+        /// <returns>
+        /// 	<c>true</c> if log is for a given log level; otherwise, <c>false</c>.
+        /// </returns>
+        /// <remarks>
+        /// Default is true when the trace level is enabled.  Subclasses may override this
+        /// to change the level at which logging occurs, or return true to ignore level
+        /// checks.</remarks>
+        protected override bool IsLogEnabled(ILog log)
+        {
+            switch (LogLevel)
+            {
+                case LogLevel.All:
+                case LogLevel.Trace:
+                    if (log.IsTraceEnabled)
+                    {
+                        return true;
+                    }
+                    break;
+                case LogLevel.Debug:
+                    if (log.IsDebugEnabled)
+                    {
+                        return true;
+                    }
+                    break;
+                case LogLevel.Error:
+                    if (log.IsErrorEnabled)
+                    {
+                        return true;
+                    }
+                    break;
+                case LogLevel.Fatal:
+                    if (log.IsFatalEnabled)
+                    {
+                        return true;
+                    }
+                    break;
+                case LogLevel.Info:
+                    if (log.IsInfoEnabled)
+                    {
+                        return true;
+                    }
+                    break;
+                case LogLevel.Warn:
+                    if (log.IsWarnEnabled)
+                    {
+                        return true;
+                    }
+                    break;
+                case LogLevel.Off:
+                default:
+                    break;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Creates a unique identifier.
+        /// </summary>
+        /// <remarks>
+        /// Default implementation uses Guid.NewGuid().  Subclasses may override to provide an alternative
+        /// ID generation implementation.
+        /// </remarks>
+        /// <returns>A unique identifier</returns>
+        protected virtual string CreateUniqueIdentifier()
+        {
+            return Guid.NewGuid().ToString();
+        }
+
+        /// <summary>
+        /// Gets the entry message to log
+        /// </summary>
+        /// <param name="invocation">The invocation.</param>
+        /// <param name="idString">The id string.</param>
+        /// <returns>The entry log message</returns>
+        protected virtual string GetEntryMessage(IMethodInvocation invocation, string idString)
+        {            
+            StringBuilder sb = new StringBuilder(128);
+            sb.Append("Entering ");
+            AppendCommonInformation(sb, invocation, idString);
+            if (logMethodArguments)
+            {
+                sb.Append(GetMethodArgumentAsString(invocation));
+            }
+
+            return RemoveLastSeparator(sb.ToString(), Separator);
+        }
+
+        /// <summary>
+        /// Gets the exception message.
+        /// </summary>
+        /// <param name="invocation">The method invocation.</param>
+        /// <param name="e">The thown exception.</param>
+        /// <param name="executionTimeSpan">The execution time span.</param>
+        /// <param name="idString">The id string.</param>
+        /// <returns>The exception log message.</returns>
+        protected virtual string GetExceptionMessage(IMethodInvocation invocation, Exception e, TimeSpan executionTimeSpan, string idString)
+        {
+            StringBuilder sb = new StringBuilder(128);
+            sb.Append("Exception thrown in ");
+            sb.Append(invocation.Method.Name).Append(Separator);
+            AppendCommonInformation(sb, invocation, idString);
+            if (LogExecutionTime)
+            {
+                sb.Append(executionTimeSpan.TotalMilliseconds).Append(" ms");
+            }
+
+            return RemoveLastSeparator(sb.ToString(), Separator);
+        }
+
+
+        /// <summary>
+        /// Gets the exit log message.
+        /// </summary>
+        /// <param name="invocation">The method invocation.</param>
+        /// <param name="returnValue">The return value.</param>
+        /// <param name="executionTimeSpan">The execution time span.</param>
+        /// <param name="idString">The id string.</param>
+        /// <returns>the exit log message</returns>
+        protected virtual string GetExitMessage(IMethodInvocation invocation, object returnValue, TimeSpan executionTimeSpan, string idString)
+        {
+            StringBuilder sb = new StringBuilder(128);
+            sb.Append("Exiting ");
+            AppendCommonInformation(sb, invocation, idString);
+            if (LogReturnValue && invocation.Method.ReturnType != typeof(void))
+            {
+                sb.Append("return=").Append(returnValue).Append(Separator);
+            }
+            if (LogExecutionTime)
+            {
+                sb.Append(executionTimeSpan.TotalMilliseconds).Append(" ms");
+            }
+            return RemoveLastSeparator(sb.ToString(), Separator);
+        }
+
+
+        /// <summary>
+        /// Appends common information across entry,exit, exception logging
+        /// </summary>
+        /// <remarks>Add method name and unique identifier if required.</remarks>
+        /// <param name="sb">The string buffer building logging message.</param>
+        /// <param name="invocation">The method invocation.</param>
+        /// <param name="idString">The unique identifier string.</param>
+        protected virtual void AppendCommonInformation(StringBuilder sb, IMethodInvocation invocation, string idString)
+        {
+            sb.Append(invocation.Method.Name);
+            if (LogUniqueIdentifier)
+            {
+                sb.Append(Separator).Append(idString);
+            }
+            sb.Append(Separator);
+        }
+
+        /// <summary>
+        /// Gets the method argument as argumen name/value pairs.
+        /// </summary>
+        /// <param name="invocation">The method invocation.</param>
+        /// <returns>string for logging method argument name and values.</returns>
+        protected virtual string GetMethodArgumentAsString(IMethodInvocation invocation)
+        {
+            StringBuilder sb = new StringBuilder(128);
+            ParameterInfo[] parameterInfos = invocation.Method.GetParameters();
+            object[] argValues = invocation.Arguments;
+            for (int i=0; i< parameterInfos.Length; i++)
+            {
+                sb.Append(parameterInfos[i].Name).Append("=").Append(argValues[i]);
+                if (i != parameterInfos.Length) sb.Append("; ");
+            }
+
+            return RemoveLastSeparator(sb.ToString(), "; ");
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private string RemoveLastSeparator(string str, string separator)
+        {
+            if (str.EndsWith(separator))
+            {
+                return str.Substring(0, str.Length - separator.Length);
+            }
+            else
+            {
+                return str;
+            }
+        }
+
+        private void WriteToLog(LogLevel logLevel, ILog log, string text, Exception e)
+        {
+            switch (logLevel)
+            {
+                case LogLevel.All:
+                case LogLevel.Trace:
+                    if (log.IsTraceEnabled)
+                    {
+                        if (e == null) log.Trace(text); else log.Trace(text, e);
+                    }
+                    break;
+                case LogLevel.Debug:
+                    if (log.IsDebugEnabled)
+                    {
+                        if (e == null) log.Debug(text); else log.Debug(text, e);
+                    }
+                    break;
+                case LogLevel.Error:
+                    if (log.IsErrorEnabled)
+                    {
+                        if (e == null) log.Error(text); else log.Error(text, e);
+                    }
+                    break;
+                case LogLevel.Fatal:
+                    if (log.IsFatalEnabled)
+                    {
+                        if (e == null) log.Fatal(text); else log.Fatal(text, e);
+                    }
+                    break;
+                case LogLevel.Info:
+                    if (log.IsInfoEnabled)
+                    {
+                        if (e == null) log.Info(text); else log.Info(text, e);
+                    }
+                    break;
+                case LogLevel.Warn:
+                    if (log.IsWarnEnabled)
+                    {
+                        if (e == null) log.Warn(text); else log.Warn(text, e);
+                    }
+                    break;
+                case LogLevel.Off:
+                default:
+                    break;
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/ParsedAdviceExpression.cs b/src/Spring/Spring.Aop/Aspects/ParsedAdviceExpression.cs
new file mode 100644
index 00000000..0c127b7b
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/ParsedAdviceExpression.cs
@@ -0,0 +1,115 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+namespace Spring.Aspects
+{
+    /// <summary>
+    /// This class contains the results of parsing an advice expresion of the form
+    /// on exception name [ExceptionName1,ExceptionName2,...] [action] [action expression]
+    /// or
+    /// on exception [constraint expression] [action] [action expression]
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: ParsedAdviceExpression.cs,v 1.1 2007/10/08 22:05:16 markpollack Exp $</version>
+    public class ParsedAdviceExpression
+    {
+        private string adviceExpression;
+
+        private string[] exceptionNames = new string[0];
+        private string constraintExpression = null;
+        private string actionExpressionText = null;
+        private string actionText = null;
+        private bool success;
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ParsedAdviceExpression"/> class.
+        /// </summary>
+        /// <param name="adviceExpression">The advice expression.</param>
+        public ParsedAdviceExpression(string adviceExpression)
+        {
+            this.adviceExpression = adviceExpression;
+        }
+
+
+        /// <summary>
+        /// Gets or sets the advice expression.
+        /// </summary>
+        /// <value>The advice expression.</value>
+        public string AdviceExpression
+        {
+            get { return adviceExpression; }
+            set { adviceExpression = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the exception names.
+        /// </summary>
+        /// <value>The exception names.</value>
+        public string[] ExceptionNames
+        {
+            get { return exceptionNames; }
+            set { exceptionNames = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the constraint expression.
+        /// </summary>
+        /// <value>The constraint expression.</value>
+        public string ConstraintExpression
+        {
+            get { return constraintExpression; }
+            set { constraintExpression = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the action expression text.
+        /// </summary>
+        /// <value>The action expression text.</value>
+        public string ActionExpressionText
+        {
+            get { return actionExpressionText; }
+            set { actionExpressionText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the action text.
+        /// </summary>
+        /// <value>The action text.</value>
+        public string ActionText
+        {
+            get { return actionText; }
+            set { actionText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="ParsedAdviceExpression"/> is success.
+        /// </summary>
+        /// <value><c>true</c> if success; otherwise, <c>false</c>.</value>
+        public bool Success
+        {
+            get { return success; }
+            set { success = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/RetryAdvice.cs b/src/Spring/Spring.Aop/Aspects/RetryAdvice.cs
new file mode 100644
index 00000000..514e43af
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/RetryAdvice.cs
@@ -0,0 +1,316 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+using System.Text.RegularExpressions;
+using System.Threading;
+using AopAlliance.Intercept;
+using Common.Logging;
+using Spring.Core.TypeConversion;
+using Spring.Expressions;
+
+namespace Spring.Aspects
+{
+    /// <summary>
+    /// AOP Advice to retry a method invocation on an exception.  The retry semantics are defined by a DSL of the
+    /// form <code>on exception name [ExceptionName1,ExceptionName2,...] retry [number of times] [delay|rate] [delay time|rate expression]</code>.
+    /// For example, <code>on exception name ArithmeticException retry 3x delay 1s</code>
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: RetryAdvice.cs,v 1.5 2008/03/17 20:25:34 markpollack Exp $</version>
+    public class RetryAdvice : AbstractExceptionHandlerAdvice
+    {
+        #region Fields
+
+        private static readonly ILog log = LogManager.GetLogger(typeof (RetryAdvice));
+
+        private TimeSpanConverter timeSpanConverter = new TimeSpanConverter();
+
+        private RetryExceptionHandler retryExceptionHandler;
+
+        private string retryExpression;
+
+        private string onExceptionNameRegex = @"^(on\s+exception\s+name)\s+(.*?)\s+(retry)\s*(.*?)$";
+
+        private string onExceptionRegex = @"^(on\s+exception\s+)(\(.*?\))\s+(retry)\s*(.*?)$";
+
+        //retry 3x delay 10s
+        private string delayRegex = @"^(\d+)x\s+(delay)\s+(\d+\w+)?$";
+
+        //retry 3x rate 10n+5
+        private string rateRegex = @"^(\d+)x\s+(rate)\s+(\(.*?\))?$";
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the retry expression.
+        /// </summary>
+        /// <value>The retry expression.</value>
+        public string RetryExpression
+        {
+            get { return retryExpression; }
+            set { retryExpression = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Regex string used to parse advice expressions starting with 'on exception name' and exception handling actions.
+        /// </summary>
+        /// <value>The regex string to parse advice expressions starting with 'on exception name' and exception handling actions.</value>
+        public override string OnExceptionNameRegex
+        {
+            get { return onExceptionNameRegex; }
+            set { onExceptionNameRegex = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Regex string used to parse advice expressions starting with 'on exception (constraint)' and exception handling actions.
+        /// </summary>
+        /// <value>The regex string to parse advice expressions starting with 'on exception (constraint)' and exception handling actions.</value>
+        public override string OnExceptionRegex
+        {
+            get { return onExceptionRegex; }
+            set { onExceptionRegex = value; }
+        }
+
+        #endregion
+
+        #region IMethodInterceptor implementation
+
+        /// <summary>
+        /// Implement this method to perform extra treatments before and after
+        /// the call to the supplied <paramref name="invocation"/>.
+        /// </summary>
+        /// <param name="invocation">The method invocation that is being intercepted.</param>
+        /// <returns>
+        /// The result of the call to the
+        /// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+        /// the supplied <paramref name="invocation"/>; this return value may
+        /// well have been intercepted by the interceptor.
+        /// </returns>
+        /// <remarks>
+        /// 	<p>
+        /// Polite implementations would certainly like to invoke
+        /// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/>.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// If any of the interceptors in the chain or the target object itself
+        /// throws an exception.
+        /// </exception>
+        public override object Invoke(IMethodInvocation invocation)
+        {
+            IDictionary callContextDictionary = new Hashtable();
+            callContextDictionary.Add("method", invocation.Method);
+            callContextDictionary.Add("args", invocation.Arguments);
+            callContextDictionary.Add("target", invocation.Target);
+            int numAttempts = 0;
+
+            object returnVal = null;
+            do
+            {
+                try
+                {
+                    returnVal = invocation.Proceed();
+                    break;
+                }
+                catch (Exception ex)
+                {
+                    callContextDictionary["e"] = ex;
+                    if (retryExceptionHandler.CanHandleException(ex, callContextDictionary))
+                    {
+                        numAttempts++;
+                        if (numAttempts == retryExceptionHandler.MaximumRetryCount)
+                        {
+                            throw;
+                        }
+                        else
+                        {
+                            if (log.IsTraceEnabled)
+                            {
+                                log.Trace("Retrying " + invocation.Method.Name);
+                            }
+                            callContextDictionary["n"] = numAttempts;
+                            Sleep(retryExceptionHandler, callContextDictionary);
+                        }
+                    }
+                    else
+                    {
+                        throw;
+                    }
+                }
+            } while (numAttempts <= retryExceptionHandler.MaximumRetryCount);
+
+
+            log.Debug("Invoked successfully after " + numAttempts + " attempt(s)");
+            return returnVal;
+        }
+
+        private static void Sleep(RetryExceptionHandler handler, IDictionary callContextDictionary)
+        {
+            if (handler.IsDelayBased)
+            {
+                Thread.Sleep(handler.DelayTimeSpan);
+            }
+            else
+            {                
+                try
+                {
+                    IExpression expression = Expression.Parse(handler.DelayRateExpression);
+                    object result = expression.GetValue(null, callContextDictionary);
+                    decimal d = decimal.Parse(result.ToString());
+                    decimal rounded = decimal.Round(d*1000,0);
+                    int sleepInSeconds = decimal.ToInt32(rounded);
+                    Thread.Sleep(sleepInSeconds);
+                }
+                catch (InvalidCastException e)
+                {
+                    log.Warn("Was not able to cast expression to decimal [" + handler.DelayRateExpression + "]. Sleeping for 1 second", e);
+                    Thread.Sleep(1000);
+                }
+                catch (Exception e)
+                {
+                    log.Warn("Was not able to evaluate rate expression [" + handler.DelayRateExpression + "]. Sleeping for 1 second", e);
+                    Thread.Sleep(1000);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IInitializingObject implementation
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        /// <remarks>
+        /// 	<p>
+        /// This method allows the object instance to perform the kind of
+        /// initialization only possible when all of it's dependencies have
+        /// been injected (set), and to throw an appropriate exception in the
+        /// event of misconfiguration.
+        /// </p>
+        /// 	<p>
+        /// Please do consult the class level documentation for the
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+        /// description of exactly <i>when</i> this method is invoked. In
+        /// particular, it is worth noting that the
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and <see cref="Spring.Context.IApplicationContextAware"/>
+        /// callbacks will have been invoked <i>prior</i> to this method being
+        /// called.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as the failure to set a
+        /// required property) or if initialization fails.
+        /// </exception>
+        public override void AfterPropertiesSet()
+        {
+            if (retryExpression == null)
+            {
+                throw new ArgumentException("Must specify retry expression.");
+            }
+            RetryExceptionHandler handler = Parse(retryExpression);
+            if (handler == null)
+            {
+                throw new ArgumentException("Was not able to parse retry expression string [" + retryExpression + "]");
+            }
+            retryExceptionHandler = handler;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Parses the specified handler string.
+        /// </summary>
+        /// <param name="retryExpressionString">The handler string.</param>
+        /// <returns></returns>
+        protected virtual RetryExceptionHandler Parse(string retryExpressionString)
+        {
+
+            ParsedAdviceExpression parsedAdviceExpression = ParseAdviceExpression(retryExpressionString);
+
+            if (!parsedAdviceExpression.Success)
+            {
+                log.Warn("Could not parse retry expression " + retryExpressionString);
+                return null;
+            }
+
+            RetryExceptionHandler handler = new RetryExceptionHandler(parsedAdviceExpression.ExceptionNames);
+            handler.ConstraintExpressionText = parsedAdviceExpression.ConstraintExpression;
+            handler.ActionExpressionText = parsedAdviceExpression.AdviceExpression;
+            
+            Match match = GetMatchForActionExpression(parsedAdviceExpression.ActionExpressionText, delayRegex);
+            
+            if (match.Success)
+            {
+                handler.MaximumRetryCount = int.Parse(match.Groups[1].Value.Trim());
+                handler.IsDelayBased = true;
+
+                try
+                {
+                    string ts = match.Groups[3].Value.Trim();
+                    handler.DelayTimeSpan = (TimeSpan) timeSpanConverter.ConvertFrom(null, null, ts);
+                } catch (Exception)
+                {
+                    log.Warn("Could not parse timespan " + match.Groups[3].Value.Trim());
+                    return null;
+                }
+                return handler;
+            }
+            else
+            {
+                match = GetMatchForActionExpression(parsedAdviceExpression.ActionExpressionText, rateRegex);
+                if (match.Success)
+                {
+                    handler.MaximumRetryCount = int.Parse(match.Groups[1].Value.Trim());
+                    handler.IsDelayBased = false;
+                    handler.DelayRateExpression = match.Groups[3].Value.Trim();
+                    return handler;
+                }
+                else
+                {
+                    return null;
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Gets the match for action expression.
+        /// </summary>
+        /// <param name="actionExpressionString">The action expression string.</param>
+        /// <param name="regexString">The regex string.</param>
+        /// <returns>The Match object resulting from the regular expression match.</returns>
+        protected virtual Match GetMatchForActionExpression(string actionExpressionString, string regexString)
+        {
+            RegexOptions options = ((RegexOptions.IgnorePatternWhitespace | RegexOptions.Multiline) | RegexOptions.IgnoreCase);
+            Regex reg = new Regex(regexString, options);
+            return reg.Match(actionExpressionString);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/RetryExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/RetryExceptionHandler.cs
new file mode 100644
index 00000000..660fbc50
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/RetryExceptionHandler.cs
@@ -0,0 +1,130 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+
+namespace Spring.Aspects
+{
+    /// <summary>
+    /// Sleeps for the appropriate amount of time for an exception.
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: RetryExceptionHandler.cs,v 1.1 2007/10/10 07:38:17 markpollack Exp $</version>
+    public class RetryExceptionHandler : AbstractExceptionHandler
+    {
+        #region Fields
+
+        private int maximumRetryCount;
+
+        private bool isDelayBased;
+
+        private TimeSpan delayTimeSpan;
+        private string delayRateExpression;
+
+        #endregion
+
+        #region Constructor
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RetryExceptionHandler"/> class.
+        /// </summary>
+        public RetryExceptionHandler()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RetryExceptionHandler"/> class.
+        /// </summary>
+        /// <param name="exceptionNames">The exception names.</param>
+        public RetryExceptionHandler(string[] exceptionNames) : base(exceptionNames)
+        {
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the maximum retry count.
+        /// </summary>
+        /// <value>The maximum retry count.</value>
+        public int MaximumRetryCount
+        {
+            get { return maximumRetryCount; }
+            set { maximumRetryCount = value; }
+        }
+
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is delay based.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance is delay based; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsDelayBased
+        {
+            get { return isDelayBased; }
+            set { isDelayBased = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the delay time span to sleep after an exception is thrown and a rety is
+        /// attempted.
+        /// </summary>
+        /// <value>The delay time span.</value>
+        public TimeSpan DelayTimeSpan
+        {
+            get { return delayTimeSpan; }
+            set { delayTimeSpan = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the delay rate expression.
+        /// </summary>
+        /// <value>The delay rate expression.</value>
+        public string DelayRateExpression
+        {
+            get { return delayRateExpression; }
+            set { delayRateExpression = value; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Handles the exception.
+        /// </summary>
+        /// <param name="callContextDictionary"></param>
+        /// <returns>
+        /// The return value from handling the exception, if not rethrown or a new exception is thrown.
+        /// </returns>
+        public override object HandleException(IDictionary callContextDictionary)
+        {
+            return null;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvice.cs b/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvice.cs
new file mode 100644
index 00000000..c1ea994a
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvice.cs
@@ -0,0 +1,76 @@
+using System.Reflection;
+using Spring.Aop;
+using Spring.Context;
+using Spring.Validation;
+
+namespace Spring.Aspects.Validation
+{
+    /// <summary>
+    /// This advice is typically applied to service-layer methods in order to validate
+    /// method arguments.
+    /// </summary>
+    /// <remarks>
+    /// <para>Each argument that should be validated has to be marked with one or more
+    /// <see cref="ValidatedAttribute"/>s.</para>
+    /// <para>If the validation fails, this advice will throw <see cref="ValidationException"/>,
+    /// thus preventing target method invocation.
+    /// </para>
+    /// </remarks>
+    /// <author>Damjan Tomic</author>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ParameterValidationAdvice.cs,v 1.2 2008/04/02 23:00:28 markpollack Exp $</version>
+    public class ParameterValidationAdvice : IMethodBeforeAdvice, IApplicationContextAware
+    {
+        private IApplicationContext applicationContext; 
+
+        /// <summary>
+        /// Intercepts method invocation and validates arguments.
+        /// </summary>
+        /// <param name="method">
+        /// Method invocation.
+        /// </param>
+        /// <param name="args">
+        /// Method arguments.
+        /// </param>
+        /// <param name="target">
+        /// Target object.
+        /// </param>
+        /// <exception cref="ValidationException">
+        /// If one or more method arguments fail validation.
+        /// </exception>
+        public void Before(MethodInfo method, object[] args, object target)
+        {
+            ValidationErrors errors = new ValidationErrors();
+            ParameterInfo[] parameters = method.GetParameters();
+            
+            for (int i = 0; i < parameters.Length; i++)
+            {
+                ParameterInfo info = parameters[i];
+                ValidatedAttribute[] attributes = (ValidatedAttribute[]) info.GetCustomAttributes(typeof(ValidatedAttribute), true);
+                
+                foreach (ValidatedAttribute attribute in attributes)
+                {
+                    // throws NoSuchObjectDefinitionException if validator cannot be found
+                    IValidator validator = (IValidator) applicationContext.GetObject(attribute.ValidatorName);
+                    validator.Validate(args[i], errors);                        
+                }
+            }            
+            if (!errors.IsEmpty)
+            {
+                throw new ValidationException(errors);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the application context to search for validators in.
+        /// </summary>
+        /// <value>
+        /// The application context to search for validators in.
+        /// </value>
+        public IApplicationContext ApplicationContext
+        {
+            get { return this.applicationContext; }
+            set { this.applicationContext = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvisor.cs b/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvisor.cs
new file mode 100644
index 00000000..ad3a83ac
--- /dev/null
+++ b/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvisor.cs
@@ -0,0 +1,114 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using Spring.Aop.Support;
+using Spring.Validation;
+using Spring.Context;
+
+#endregion
+
+namespace Spring.Aspects.Validation
+{
+    /// <summary>
+    /// Convinience advisor implementation that applies <see cref="ParameterValidationAdvice"/>
+    /// to all the methods that have <see cref="ValidatedAttribute"/> defined on one or
+    /// more of their parameters.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: ParameterValidationAdvisor.cs,v 1.1 2008/05/26 09:17:50 bbaia Exp $</version>
+    public class ParameterValidationAdvisor : AttributeMatchMethodPointcutAdvisor, IApplicationContextAware
+    {
+        /// <summary>
+        /// Creates new advisor instance.
+        /// </summary>
+        public ParameterValidationAdvisor()
+        {
+            Advice = new ParameterValidationAdvice();
+            Attribute = typeof(ValidatedAttribute);
+            Inherit = false;
+        }
+
+        /// <summary>
+        /// Set the <see cref="Spring.Context.IApplicationContext"/> that this
+        /// object runs in.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Normally this call will be used to initialize the object.
+        /// </p>
+        /// <p>
+        /// Invoked after population of normal object properties but before an
+        /// init callback such as
+        /// <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// or a custom init-method. Invoked after the setting of any
+        /// <see cref="Spring.Context.IResourceLoaderAware"/>'s
+        /// <see cref="Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+        /// property.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Context.ApplicationContextException">
+        /// In the case of application context initialization errors.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If thrown by any application context methods.
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectInitializationException"/>
+        public IApplicationContext ApplicationContext
+        {
+            get { return ((IApplicationContextAware)Advice).ApplicationContext; }
+            set { ((IApplicationContextAware)Advice).ApplicationContext = value; }
+        }
+
+        /// <summary>
+        /// Returns <c>true</c> if any of the parameters of the specified <paramref name="method"/>
+        /// has <see cref="ValidatedAttribute"/> applied.
+        /// </summary>
+        /// <param name="method">
+        /// Method to check.
+        /// </param>
+        /// <param name="targetType">
+        /// Type of target object.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if any of the parameters of the specified <paramref name="method"/>
+        /// has <see cref="ValidatedAttribute"/> applied; <c>false</c> otherwise.
+        /// </returns>
+        public override bool Matches(MethodInfo method, Type targetType)
+        {
+            ParameterInfo[] parameters = method.GetParameters();
+            for (int i = 0; i < parameters.Length; i++)
+            {
+                ParameterInfo p = parameters[i];
+                if (p.IsDefined(Attribute, Inherit))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/AssemblyInfo.cs b/src/Spring/Spring.Aop/AssemblyInfo.cs
new file mode 100644
index 00000000..9d6e9d0d
--- /dev/null
+++ b/src/Spring/Spring.Aop/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle("Spring.Net AOP support")]
+[assembly: AssemblyDescription("Interfaces and classes that provide AOP support in Spring.Net")]
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Spring.Aop.2002.csproj b/src/Spring/Spring.Aop/Spring.Aop.2002.csproj
new file mode 100644
index 00000000..341e1152
--- /dev/null
+++ b/src/Spring/Spring.Aop/Spring.Aop.2002.csproj
@@ -0,0 +1,800 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.0.9955"
+        SchemaVersion = "1.0"
+        ProjectGuid = "{828F16E3-20A4-4EC4-A8F4-CD95B8ED44C9}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Aop"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                RootNamespace = "Spring"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_0"
+                    DocumentationFile = "Spring.Aop.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2002\Spring.Aop\Debug-1.0\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "3"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2002\Spring.Aop\Release-1.0\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
+                />
+                <Reference
+                    Name = "system.web"
+                    AssemblyName = "System.Web"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\system.web.dll"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "antlr.runtime"
+                    AssemblyName = "antlr.runtime"
+                    HintPath = "..\..\..\lib\Net\1.0\antlr.runtime.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.2002"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.0\Common.Logging.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IAdvisors.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IAfterReturningAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IBeforeAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IIntroductionAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IIntroductionInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IMethodBeforeAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IMethodMatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\ITargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IThrowsAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\ITypeFilter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\TrueMethodMatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\TruePointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\TrueTypeFilter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Config\AopNamespaceParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Config\AopNamespaceUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Config\ConfigObjectDefinitionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Config\spring-aop-1.1.xsd"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Aop\Framework\AbstractMethodInvocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AdvisedSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AdvisorChainFactoryUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AopConfigException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AopContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AopUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicMethodInvocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicTargetSourceWrapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\HashtableCachingAdvisorChainFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\IAdvised.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\IAdvisedSupportListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\IAdvisorChainFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\IAopProxy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\IAopProxyFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\InterceptorAndDynamicMethodMatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ITargetAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ITargetSourceWrapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ProxyConfig.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ProxyFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ProxyFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ReflectiveMethodInvocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\StaticTargetSourceWrapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\AdvisorAdapterRegistrationManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\AfterReturningAdviceAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\AfterReturningAdviceInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\BeforeAdviceAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\DefaultAdvisorAdapterRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\GlobalAdvisorAdapterRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\IAdvisorAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\IAdvisorAdapterRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\MethodBeforeAdviceInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\ThrowsAdviceAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\ThrowsAdviceInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\UnknownAdviceTypeException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\AbstractAdvisorAutoProxyCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\AbstractAutoProxyCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\DefaultAdvisorAutoProxyCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\ITargetSourceCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\ObjectNameAutoProxyCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\Target\AbstractPrototypeTargetSourceCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\AbstractAopProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\AbstractAopProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\AdvisedProxy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\BaseCompositionAopProxy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\CompositionAopProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\DecoratorAopProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\IAdvisedProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\IAopProxyTypeGenerator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\IntroductionProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\TargetAopProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AbstractGenericPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AbstractObjectFactoryPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AbstractPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AbstractRegularExpressionMethodPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AttributeMatchMethodPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AttributeMatchMethodPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\ComposablePointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\ControlFlowPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\DefaultIntroductionAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\DefaultObjectFactoryPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\DefaultPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\DynamicMethodMatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\DynamicMethodMatcherPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\MethodMatchers.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\NameMatchMethodPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\NameMatchMethodPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\Pointcuts.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\RegularExpressionMethodPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\RootTypeFilter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\SdkRegularExpressionMethodPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\StaticMethodMatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\StaticMethodMatcherPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\StaticMethodMatcherPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\TypeFilters.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\UnionPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\.cvsignore"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\Target\AbstractPoolingTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\AbstractPrototypeTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\EmptyTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\HotSwappableTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\IThreadLocalTargetSourceStats.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\PoolingConfig.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\PrototypeTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\SimplePoolTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\SingletonTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\ThreadLocalTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Aop\AspectException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Aop\IAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IConstructorInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IConstructorInvocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IInvocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IJoinpoint.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IMethodInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IMethodInvocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\AbstractExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\AbstractExceptionHandlerAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\IExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\ParsedAdviceExpression.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\RetryAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\RetryExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\BaseCacheAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheAspect.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheParameterAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheParameterAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheResultAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheResultAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\InvalidateCacheAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\InvalidateCacheAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Exceptions\ExceptionHandlerAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Exceptions\LogExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Exceptions\ReturnValueExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Exceptions\SwallowExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Exceptions\TranslationExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Logging\AbstractLoggingAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Logging\SimpleLoggingAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Validation\ParameterValidationAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Validation\ParameterValidationAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Aop/Spring.Aop.2003.csproj b/src/Spring/Spring.Aop/Spring.Aop.2003.csproj
new file mode 100644
index 00000000..69a7cb75
--- /dev/null
+++ b/src/Spring/Spring.Aop/Spring.Aop.2003.csproj
@@ -0,0 +1,813 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Aop"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1;DEBUG_DYNAMIC"
+                    DocumentationFile = "Spring.Aop.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Aop\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "true"
+                    WarningLevel = "1"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Aop\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "antlr.runtime"
+                    AssemblyName = "antlr.runtime"
+                    HintPath = "..\..\..\lib\Net\1.1\antlr.runtime.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CommonAssemblyInfo.cs"
+                    Link = "..\CommonAssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Aop.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\IAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IAdvisors.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IAfterReturningAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IBeforeAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IIntroductionAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IIntroductionInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IMethodBeforeAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IMethodMatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\ITargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\IThrowsAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\ITypeFilter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\TrueMethodMatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\TruePointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\TrueTypeFilter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Config\AopNamespaceParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Config\AopNamespaceUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Config\ConfigObjectDefinitionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Config\spring-aop-1.1.xsd"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Aop\Framework\AbstractMethodInvocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AdvisedSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AdvisorChainFactoryUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AopConfigException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AopContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AopUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicMethodInvocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicTargetSourceWrapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\HashtableCachingAdvisorChainFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\IAdvised.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\IAdvisedSupportListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\IAdvisorChainFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\IAopProxy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\IAopProxyFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\InterceptorAndDynamicMethodMatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ITargetAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ITargetSourceWrapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ProxyConfig.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ProxyFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ProxyFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ReflectiveMethodInvocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\StaticTargetSourceWrapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\AdvisorAdapterRegistrationManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\AfterReturningAdviceAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\AfterReturningAdviceInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\BeforeAdviceAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\DefaultAdvisorAdapterRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\GlobalAdvisorAdapterRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\IAdvisorAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\IAdvisorAdapterRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\MethodBeforeAdviceInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\ThrowsAdviceAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\ThrowsAdviceInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\UnknownAdviceTypeException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\AbstractAdvisorAutoProxyCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\AbstractAutoProxyCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\DefaultAdvisorAutoProxyCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\ITargetSourceCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\ObjectNameAutoProxyCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\Target\AbstractPrototypeTargetSourceCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\AbstractAopProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\AbstractAopProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\AdvisedProxy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\BaseCompositionAopProxy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\CachedAopProxyFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\CompositionAopProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\DecoratorAopProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\DefaultAopProxyFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\IAdvisedProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\IAopProxyTypeGenerator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\IntroductionProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\TargetAopProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AbstractGenericPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AbstractObjectFactoryPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AbstractPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AbstractRegularExpressionMethodPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AttributeMatchMethodPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AttributeMatchMethodPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\ComposablePointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\ControlFlowPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\DefaultIntroductionAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\DefaultObjectFactoryPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\DefaultPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\DynamicMethodMatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\DynamicMethodMatcherPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\MethodMatchers.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\NameMatchMethodPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\NameMatchMethodPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\Pointcuts.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\RegularExpressionMethodPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\RootTypeFilter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\SdkRegularExpressionMethodPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\StaticMethodMatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\StaticMethodMatcherPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\StaticMethodMatcherPointcutAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\TypeFilters.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\UnionPointcut.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\AbstractPoolingTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\AbstractPrototypeTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\EmptyTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\HotSwappableTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\IThreadLocalTargetSourceStats.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\PoolingConfig.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\PrototypeTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\SimplePoolTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\SingletonTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\ThreadLocalTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Aop\AspectException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Aop\IAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IConstructorInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IConstructorInvocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IInvocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IJoinpoint.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IMethodInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AopAlliance\Intercept\IMethodInvocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\AbstractExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\AbstractExceptionHandlerAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\IExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\ParsedAdviceExpression.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\RetryAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\RetryExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\BaseCacheAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheAspect.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheParameterAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheParameterAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheResultAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheResultAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\InvalidateCacheAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\InvalidateCacheAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Exceptions\ExceptionHandlerAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Exceptions\LogExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Exceptions\ReturnValueExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Exceptions\SwallowExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Exceptions\TranslationExceptionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Logging\AbstractLoggingAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Logging\SimpleLoggingAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Validation\ParameterValidationAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Validation\ParameterValidationAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Aop/Spring.Aop.2005.csproj b/src/Spring/Spring.Aop/Spring.Aop.2005.csproj
new file mode 100644
index 00000000..dd9fc546
--- /dev/null
+++ b/src/Spring/Spring.Aop/Spring.Aop.2005.csproj
@@ -0,0 +1,434 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Aop</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Aop\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0;DEBUG_DYNAMIC</DefineConstants>
+    <DocumentationFile>Spring.Aop.xml</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Aop\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AopAlliance\Aop\AspectException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AopAlliance\Aop\IAdvice.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AopAlliance\Intercept\IConstructorInterceptor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AopAlliance\Intercept\IConstructorInvocation.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AopAlliance\Intercept\IInterceptor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AopAlliance\Intercept\IInvocation.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AopAlliance\Intercept\IJoinpoint.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AopAlliance\Intercept\IMethodInterceptor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AopAlliance\Intercept\IMethodInvocation.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Config\AopNamespaceParser.cs" />
+    <Compile Include="Aop\Config\AopNamespaceUtils.cs" />
+    <Compile Include="Aop\Config\ConfigObjectDefinitionParser.cs" />
+    <Compile Include="Aop\Framework\AopUtils.cs" />
+    <Compile Include="Aop\Framework\DynamicMethodInvocation.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\CachedAopProxyFactory.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\DefaultAopProxyFactory.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\InheritanceAopProxyTypeBuilder.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\BaseAopProxyMethodBuilder.cs" />
+    <Compile Include="Aop\IAdvisors.cs" />
+    <Compile Include="Aop\Framework\AbstractMethodInvocation.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\AdvisorAdapterRegistrationManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\AfterReturningAdviceAdapter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\AfterReturningAdviceInterceptor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\BeforeAdviceAdapter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\DefaultAdvisorAdapterRegistry.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\GlobalAdvisorAdapterRegistry.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\IAdvisorAdapter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\IAdvisorAdapterRegistry.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\MethodBeforeAdviceInterceptor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\ThrowsAdviceAdapter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\ThrowsAdviceInterceptor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\UnknownAdviceTypeException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\AdvisedSupport.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\AdvisorChainFactoryUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\AopConfigException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\AopContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\AutoProxy\AbstractAdvisorAutoProxyCreator.cs" />
+    <Compile Include="Aop\Framework\AutoProxy\AbstractAutoProxyCreator.cs" />
+    <Compile Include="Aop\Framework\AutoProxy\DefaultAdvisorAutoProxyCreator.cs" />
+    <Compile Include="Aop\Framework\AutoProxy\ITargetSourceCreator.cs" />
+    <Compile Include="Aop\Framework\AutoProxy\ObjectNameAutoProxyCreator.cs" />
+    <Compile Include="Aop\Framework\AutoProxy\Target\AbstractPrototypeTargetSourceCreator.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\AbstractAopProxyMethodBuilder.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\AbstractAopProxyTypeBuilder.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\AdvisedProxy.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\CompositionAopProxyTypeBuilder.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\BaseCompositionAopProxy.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\IAdvisedProxyMethodBuilder.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\IAopProxyTypeGenerator.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\DecoratorAopProxyTypeBuilder.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\IntroductionProxyMethodBuilder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\DynamicProxy\TargetAopProxyMethodBuilder.cs" />
+    <Compile Include="Aop\Framework\DynamicTargetSourceWrapper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\HashtableCachingAdvisorChainFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\IAdvised.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\IAdvisedSupportListener.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\IAdvisorChainFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\IAopProxy.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\IAopProxyFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\InterceptorAndDynamicMethodMatcher.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\ITargetAware.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\ITargetSourceWrapper.cs" />
+    <Compile Include="Aop\Framework\ProxyConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\ProxyFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\ProxyFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\ReflectiveMethodInvocation.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\StaticTargetSourceWrapper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\IAdvisor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\IAfterReturningAdvice.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\IBeforeAdvice.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\IIntroductionAdvisor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\IIntroductionInterceptor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\IMethodBeforeAdvice.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\IMethodMatcher.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\IPointcut.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\IPointcutAdvisor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\ITargetSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\IThrowsAdvice.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\ITypeFilter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\AbstractGenericPointcutAdvisor.cs" />
+    <Compile Include="Aop\Support\AbstractObjectFactoryPointcutAdvisor.cs" />
+    <Compile Include="Aop\Support\AbstractPointcutAdvisor.cs" />
+    <Compile Include="Aop\Support\AbstractRegularExpressionMethodPointcut.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\AttributeMatchMethodPointcut.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\AttributeMatchMethodPointcutAdvisor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\ComposablePointcut.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\ControlFlowPointcut.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\DefaultIntroductionAdvisor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\DefaultObjectFactoryPointcutAdvisor.cs" />
+    <Compile Include="Aop\Support\DefaultPointcutAdvisor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\DynamicMethodMatcher.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\DynamicMethodMatcherPointcutAdvisor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\MethodMatchers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\NameMatchMethodPointcut.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\NameMatchMethodPointcutAdvisor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\Pointcuts.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\RegularExpressionMethodPointcutAdvisor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\RootTypeFilter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\SdkRegularExpressionMethodPointcut.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\StaticMethodMatcher.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\StaticMethodMatcherPointcut.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\StaticMethodMatcherPointcutAdvisor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\TypeFilters.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\UnionPointcut.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\AbstractPoolingTargetSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\AbstractPrototypeTargetSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\EmptyTargetSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\HotSwappableTargetSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\IThreadLocalTargetSourceStats.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\PoolingConfig.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\PrototypeTargetSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\SimplePoolTargetSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\SingletonTargetSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\ThreadLocalTargetSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\TrueMethodMatcher.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\TruePointcut.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\TrueTypeFilter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aspects\AbstractExceptionHandlerAdvice.cs" />
+    <Compile Include="Aspects\Cache\CacheAspect.cs" />
+    <Compile Include="Aspects\Cache\BaseCacheAdvice.cs" />
+    <Compile Include="Aspects\Cache\CacheResultAdvice.cs" />
+    <Compile Include="Aspects\Cache\CacheParameterAdvice.cs" />
+    <Compile Include="Aspects\Cache\CacheResultAdvisor.cs" />
+    <Compile Include="Aspects\Cache\CacheParameterAdvisor.cs" />
+    <Compile Include="Aspects\Cache\InvalidateCacheAdvisor.cs" />
+    <Compile Include="Aspects\Cache\InvalidateCacheAdvice.cs" />
+    <Compile Include="Aspects\Exceptions\ExceptionHandlerAdvice.cs" />
+    <Compile Include="Aspects\Exceptions\LogExceptionHandler.cs" />
+    <Compile Include="Aspects\Exceptions\ReturnValueExceptionHandler.cs" />
+    <Compile Include="Aspects\Exceptions\SwallowExceptionHandler.cs" />
+    <Compile Include="Aspects\Exceptions\TranslationExceptionHandler.cs" />
+    <Compile Include="Aspects\Logging\AbstractLoggingAdvice.cs" />
+    <Compile Include="Aspects\Logging\SimpleLoggingAdvice.cs" />
+    <Compile Include="Aspects\ParsedAdviceExpression.cs" />
+    <Compile Include="Aspects\RetryAdvice.cs" />
+    <Compile Include="Aspects\AbstractExceptionHandler.cs" />
+    <Compile Include="Aspects\IExceptionHandler.cs" />
+    <Compile Include="Aspects\RetryExceptionHandler.cs" />
+    <Compile Include="Aspects\Validation\ParameterValidationAdvisor.cs" />
+    <Compile Include="Aspects\Validation\ParameterValidationAdvice.cs" />
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+      <SubType>Code</SubType>
+    </Compile>
+    <EmbeddedResource Include="Aop\Config\spring-aop-1.1.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <None Include="Aop\Config\spring-aop-1.1.xsx">
+      <DependentUpon>spring-aop-1.1.xsd</DependentUpon>
+    </None>
+    <None Include="Spring.Aop.build" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Aop/Spring.Aop.build b/src/Spring/Spring.Aop/Spring.Aop.build
new file mode 100644
index 00000000..9b372bce
--- /dev/null
+++ b/src/Spring/Spring.Aop/Spring.Aop.build
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<project name="Spring.Aop" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+-->
+	<target name="build">
+		<!-- build Spring.Aop -->
+		<csc target="library" define="${current.build.defines.csc}"
+		     warnaserror="true"
+		     debug="${current.build.debug}"
+		     output="${current.bin.dir}/${project::get-name()}.dll"
+                     doc="${current.bin.dir}/${project::get-name()}.xml"
+		     >
+			<arg line="${compiler.args}"/>
+			<nowarn>
+				<warning number="${nowarn.numbers}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../GenCommonAssemblyInfo.cs" />
+			</sources>
+			<resources basedir="Resources">
+				<include name="**/*" />
+			</resources>
+            		<resources basedir="." prefix="Spring.Aop.Config">
+                	  <include name="Aop\Config\spring-aop-1.1.xsd" />
+	                </resources>
+			<references basedir="${current.bin.dir}">
+				<include name="Common.Logging.dll"/>
+				<include name="antlr.runtime.dll"/>
+				<include name="Spring.Core.dll" />
+				<include name="System.Data.dll" />
+			</references>
+		</csc>
+	</target>
+</project>
diff --git a/src/Spring/Spring.Aop/Spring.Aop.xml b/src/Spring/Spring.Aop/Spring.Aop.xml
new file mode 100644
index 00000000..23fe1a27
--- /dev/null
+++ b/src/Spring/Spring.Aop/Spring.Aop.xml
@@ -0,0 +1,10739 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Spring.Aop</name>
+    </assembly>
+    <members>
+        <member name="T:Spring.Aop.Framework.IAopProxy">
+            <summary>
+            The central interface for Spring.NET based AOP proxies. 
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IAopProxy.cs,v 1.4 2006/11/16 02:30:49 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAopProxy.GetProxy">
+            <summary>
+            Creates a new proxy object.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.HashtableCachingAdvisorChainFactory">
+            <summary> 
+            <see cref="T:Spring.Aop.Framework.IAdvisorChainFactory"/> implementation
+            that caches advisor chains on a per-advised-method basis.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: HashtableCachingAdvisorChainFactory.cs,v 1.9 2007/03/16 04:01:18 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.IAdvisorChainFactory">
+            <summary>
+            Factory interface for advisor chains.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IAdvisorChainFactory.cs,v 1.8 2006/09/14 21:05:23 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.IAdvisedSupportListener">
+            <summary>
+            Callback interface for
+            <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> listeners.
+            </summary>
+            <remarks>
+            <p>
+            Allows <see cref="T:Spring.Aop.Framework.IAdvisedSupportListener"/>
+            implementations to be notified of notable lifecycle events relating
+            to the creation of a proxy, and changes to the configuration data of a
+            proxy.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IAdvisedSupportListener.cs,v 1.5 2006/04/09 07:18:35 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvisedSupportListener.Activated(Spring.Aop.Framework.AdvisedSupport)">
+            <summary>
+            Invoked when the first proxy is created.
+            </summary>
+            <param name="source">
+            The relevant <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> source.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvisedSupportListener.AdviceChanged(Spring.Aop.Framework.AdvisedSupport)">
+            <summary>
+            Invoked when advice is changed after a proxy is created.
+            </summary>
+            <param name="source">
+            The relevant <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> source.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvisedSupportListener.InterfacesChanged(Spring.Aop.Framework.AdvisedSupport)">
+            <summary>
+            Invoked when interfaces are changed after a proxy is created.
+            </summary>
+            <param name="source">
+            The relevant <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> source.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvisorChainFactory.GetInterceptors(Spring.Aop.Framework.IAdvised,System.Object,System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Gets the list of <see cref="T:AopAlliance.Intercept.IInterceptor"/> and
+            <see cref="T:Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
+            instances for the supplied <paramref name="proxy"/>.
+            </summary>
+            <param name="advised">The proxy configuration object.</param>
+            <param name="proxy">The object proxy.</param>
+            <param name="method">
+            The method for which the interceptors are to be evaluated.
+            </param>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> of the target object.
+            </param>
+            <returns> 
+            The list of <see cref="T:AopAlliance.Intercept.IInterceptor"/> and
+            <see cref="T:Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
+            instances for the supplied <paramref name="proxy"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.HashtableCachingAdvisorChainFactory.GetInterceptors(Spring.Aop.Framework.IAdvised,System.Object,System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Gets the list of <see cref="T:AopAlliance.Intercept.IInterceptor"/> and
+            <see cref="T:Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
+            instances for the supplied <paramref name="proxy"/>.
+            </summary>
+            <param name="advised">The proxy configuration object.</param>
+            <param name="proxy">The object proxy.</param>
+            <param name="method">
+            The method for which the interceptors are to be evaluated.
+            </param>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> of the target object.
+            </param>
+            <returns> 
+            The list of <see cref="T:AopAlliance.Intercept.IInterceptor"/> and
+            <see cref="T:Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
+            instances for the supplied <paramref name="proxy"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.HashtableCachingAdvisorChainFactory.Activated(Spring.Aop.Framework.AdvisedSupport)">
+            <summary>
+            Invoked when the first proxy is created.
+            </summary>
+            <param name="source">
+            The relevant <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> source.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.HashtableCachingAdvisorChainFactory.AdviceChanged(Spring.Aop.Framework.AdvisedSupport)">
+            <summary>
+            Invoked when advice is changed after a proxy is created.
+            </summary>
+            <param name="source">
+            The relevant <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> source.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.HashtableCachingAdvisorChainFactory.InterfacesChanged(Spring.Aop.Framework.AdvisedSupport)">
+            <summary>
+            Invoked when interfaces are changed after a proxy is created.
+            </summary>
+            <param name="source">
+            The relevant <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> source.
+            </param>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy">
+            <summary>
+            Represents the AOP configuration data built-in with the proxy.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: AdvisedProxy.cs,v 1.10 2008/02/06 18:28:52 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.IAdvised">
+            <summary>
+            Configuration data for an AOP proxy factory.
+            </summary>
+            <remarks>
+            <p>
+            This configuration includes the
+            <see cref="T:AopAlliance.Intercept.IInterceptor"/>s,
+            <see cref="T:Spring.Aop.IAdvisor"/>s, and (any) proxied interfaces.
+            </p>
+            <p>
+            Any AOP proxy obtained from Spring.NET can be cast to this interface to
+            allow the manipulation of said proxy's AOP advice.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IAdvised.cs,v 1.15 2007/10/10 18:07:38 markpollack Exp $</version>
+            <seealso cref="T:Spring.Aop.Framework.AdvisedSupport"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.AddAdvice(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Adds the supplied <paramref name="advice"/> to the end (or tail)
+            of the advice (interceptor) chain.
+            </summary>
+            <remarks>
+            <p>
+            Please be aware that Spring.NET's AOP implementation only supports
+            method advice (as encapsulated by the 
+            <see cref="T:AopAlliance.Intercept.IMethodInterceptor"/> interface).
+            </p>
+            </remarks>
+            <param name="advice">
+            The <see cref="T:AopAlliance.Aop.IAdvice"/> to be added.
+            </param>
+            <seealso cref="T:Spring.Aop.Support.DefaultPointcutAdvisor"/>
+            <seealso cref="M:Spring.Aop.Framework.IAdvised.AddAdvice(System.Int32,AopAlliance.Aop.IAdvice)"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.AddAdvice(System.Int32,AopAlliance.Aop.IAdvice)">
+            <summary>
+            Adds the supplied <paramref name="advice"/> to the supplied
+            <paramref name="position"/> in the advice (interceptor) chain.
+            </summary>
+            <remarks>
+            <p>
+            Please be aware that Spring.NET's AOP implementation only supports
+            method advice (as encapsulated by the 
+            <see cref="T:AopAlliance.Intercept.IMethodInterceptor"/> interface).
+            </p>
+            </remarks>
+            <param name="position">
+            The zero (0) indexed position (from the head) at which the
+            supplied <paramref name="advice"/> is to be inserted into the
+            advice (interceptor) chain.
+            </param>
+            <param name="advice">
+            The <see cref="T:AopAlliance.Aop.IAdvice"/> to be added.
+            </param>
+            <seealso cref="T:Spring.Aop.Support.DefaultPointcutAdvisor"/>
+            <seealso cref="M:Spring.Aop.Framework.IAdvised.AddAdvice(AopAlliance.Aop.IAdvice)"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.IsInterfaceProxied(System.Type)">
+            <summary>
+            Is the supplied <paramref name="intf"/> (interface)
+            <see cref="T:System.Type"/> proxied?
+            </summary>
+            <param name="intf">
+            The interface <see cref="T:System.Type"/> to test.
+            </param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="intf"/>
+            (interface) <see cref="T:System.Type"/> is proxied;
+            <see langword="false"/> if not or the supplied
+            <paramref name="intf"/> is <cref lang="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.AddAdvisors(Spring.Aop.IAdvisors)">
+            <summary>
+            Adds the advisors from the supplied <paramref name="advisors"/> 
+            to the list of <see cref="P:Spring.Aop.Framework.IAdvised.Advisors"/>.
+            </summary>
+            <param name="advisors">
+            The <see cref="T:Spring.Aop.IAdvisors"/> to add advisors from.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="advisors"/> cannot be added.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.AddAdvisor(Spring.Aop.IAdvisor)">
+            <summary>
+            Adds the supplied <paramref name="advisor"/> to the list
+            of <see cref="P:Spring.Aop.Framework.IAdvised.Advisors"/>.
+            </summary>
+            <param name="advisor">
+            The <see cref="T:Spring.Aop.IAdvisor"/> to add.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="advisor"/> cannot be added.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.AddAdvisor(System.Int32,Spring.Aop.IAdvisor)">
+            <summary>
+            Adds the supplied <paramref name="advisor"/> to the list
+            of <see cref="P:Spring.Aop.Framework.IAdvised.Advisors"/>.
+            </summary>
+            <param name="index">
+            The index in the <see cref="P:Spring.Aop.Framework.IAdvised.Advisors"/>
+            list at which the supplied <paramref name="advisor"/>
+            is to be inserted.
+            </param>
+            <param name="advisor">
+            The <see cref="T:Spring.Aop.IIntroductionAdvisor"/> to add.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="advisor"/> cannot be added.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.AddIntroduction(Spring.Aop.IIntroductionAdvisor)">
+            <summary>
+            Adds the supplied <paramref name="introductionAdvisor"/> to the list
+            of <see cref="P:Spring.Aop.Framework.IAdvised.Introductions"/>.
+            </summary>
+            <param name="introductionAdvisor">
+            The <see cref="T:Spring.Aop.IIntroductionAdvisor"/> to add.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="introductionAdvisor"/> cannot be added.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.AddIntroduction(System.Int32,Spring.Aop.IIntroductionAdvisor)">
+            <summary>
+            Adds the supplied <paramref name="introductionAdvisor"/> to the list
+            of <see cref="P:Spring.Aop.Framework.IAdvised.Introductions"/>.
+            </summary>
+            <param name="index">
+            The index in the <see cref="P:Spring.Aop.Framework.IAdvised.Introductions"/>
+            list at which the supplied <paramref name="introductionAdvisor"/>
+            is to be inserted.
+            </param>
+            <param name="introductionAdvisor">
+            The <see cref="T:Spring.Aop.IIntroductionAdvisor"/> to add.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="introductionAdvisor"/> cannot be added.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.IndexOf(Spring.Aop.IAdvisor)">
+            <summary> 
+            Return the index (0 based) of the supplied
+            <see cref="T:Spring.Aop.IAdvisor"/> in the interceptor
+            (advice) chain for this proxy.
+            </summary>
+            <remarks>
+            <p>
+            The return value of this method can be used to index into
+            the <see cref="P:Spring.Aop.Framework.IAdvised.Advisors"/>
+            list.
+            </p>
+            </remarks>
+            <param name="advisor">
+            The <see cref="T:Spring.Aop.IAdvisor"/> to search for.
+            </param>
+            <returns>
+            The zero (0) based index of this advisor, or -1 if the
+            supplied <paramref name="advisor"/> is not an advisor for this
+            proxy.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.IndexOf(Spring.Aop.IIntroductionAdvisor)">
+            <summary> 
+            Return the index (0 based) of the supplied
+            <see cref="T:Spring.Aop.IIntroductionAdvisor"/> in the introductions
+            for this proxy.
+            </summary>
+            <remarks>
+            <p>
+            The return value of this method can be used to index into
+            the <see cref="P:Spring.Aop.Framework.IAdvised.Introductions"/>
+            list.
+            </p>
+            </remarks>
+            <param name="advisor">
+            The <see cref="T:Spring.Aop.IIntroductionAdvisor"/> to search for.
+            </param>
+            <returns>
+            The zero (0) based index of this advisor, or -1 if the
+            supplied <paramref name="advisor"/> is not an introduction advisor
+            for this proxy.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.RemoveAdvisor(Spring.Aop.IAdvisor)">
+            <summary>
+            Removes the supplied <paramref name="advisor"/> the list of advisors
+            for this proxy.
+            </summary>
+            <param name="advisor">The advisor to remove.</param>
+            <returns>
+            <see langword="true"/> if advisor was found in the list of
+            <see cref="P:Spring.Aop.Framework.IAdvised.Advisors"/> for this
+            proxy and was successfully removed; <see langword="false"/> if not
+            or if the supplied <paramref name="advisor"/> is <cref lang="null"/>.
+            </returns>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="advisor"/> cannot be removed.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.RemoveAdvisor(System.Int32)">
+            <summary>
+            Removes the <see cref="T:Spring.Aop.IAdvisor"/> at the supplied
+            <paramref name="index"/> in the
+            <see cref="P:Spring.Aop.Framework.IAdvised.Advisors"/> list
+            from the list of
+            <see cref="P:Spring.Aop.Framework.IAdvised.Advisors"/> for this proxy.
+            </summary>
+            <param name="index">
+            The index of the <see cref="T:Spring.Aop.IAdvisor"/> to remove.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <see cref="T:Spring.Aop.IAdvisor"/> at the supplied <paramref name="index"/>
+            cannot be removed; or if the supplied <paramref name="index"/> is out of
+            range.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.RemoveAdvice(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Removes the supplied <paramref name="advice"/> from the list
+            of <see cref="P:Spring.Aop.Framework.IAdvised.Advisors"/>.
+            </summary>
+            <param name="advice">
+            The <see cref="T:AopAlliance.Aop.IAdvice"/> to remove.
+            </param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="advice"/> was
+            found in the list of <see cref="P:Spring.Aop.Framework.IAdvised.Advisors"/>
+            and successfully removed.
+            </returns>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <see cref="T:AopAlliance.Aop.IAdvice"/> cannot be removed.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.RemoveIntroduction(Spring.Aop.IIntroductionAdvisor)">
+            <summary>
+            Removes the supplied <paramref name="introduction"/> from the list
+            of <see cref="P:Spring.Aop.Framework.IAdvised.Introductions"/>.
+            </summary>
+            <param name="introduction">
+            The <see cref="T:Spring.Aop.IIntroductionAdvisor"/> to remove.
+            </param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="introduction"/> was
+            found in the list of <see cref="P:Spring.Aop.Framework.IAdvised.Introductions"/>
+            and successfully removed.
+            </returns>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <see cref="T:Spring.Aop.IIntroductionAdvisor"/> cannot be removed.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.RemoveIntroduction(System.Int32)">
+            <summary>
+            Removes the <see cref="T:Spring.Aop.IIntroductionAdvisor"/> at the supplied
+            <paramref name="index"/> in the list of
+            <see cref="P:Spring.Aop.Framework.IAdvised.Introductions"/> for this proxy.
+            </summary>
+            <param name="index">The index of the advisor to remove.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <see cref="T:Spring.Aop.IIntroductionAdvisor"/> at the supplied
+            <paramref name="index"/> cannot be removed; or if the supplied
+            <paramref name="index"/> is out of range.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.ReplaceIntroduction(System.Int32,Spring.Aop.IIntroductionAdvisor)">
+            <summary>
+            Replaces the <see cref="T:Spring.Aop.IIntroductionAdvisor"/> that
+            exists at the supplied <paramref name="index"/> in the list of
+            <see cref="P:Spring.Aop.Framework.IAdvised.Introductions"/>
+            with the supplied <paramref name="introduction"/>.
+            </summary>
+            <param name="index">
+            The index of the <see cref="T:Spring.Aop.IIntroductionAdvisor"/>
+            in the list of
+            <see cref="P:Spring.Aop.Framework.IAdvised.Introductions"/>
+            that is to be replaced.
+            </param>
+            <param name="introduction">
+            The new (replacement) <see cref="T:Spring.Aop.IIntroductionAdvisor"/>.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If the supplied <paramref name="index"/> is out of range.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.ReplaceAdvisor(Spring.Aop.IAdvisor,Spring.Aop.IAdvisor)">
+            <summary> 
+            Replaces the <paramref name="oldAdvisor"/> with the
+            <paramref name="newAdvisor"/>.
+            </summary>
+            <param name="oldAdvisor">
+            The original (old) advisor to be replaced.
+            </param>
+            <param name="newAdvisor">
+            The new advisor to replace the <paramref name="oldAdvisor"/> with.
+            </param>
+            <returns>
+            <see langword="true"/> if the <paramref name="oldAdvisor"/> was
+            replaced; if the <paramref name="oldAdvisor"/> was not found in the
+            advisors collection, this method returns <see langword="false"/>
+            and (effectively) does nothing.
+            </returns>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="oldAdvisor"/> cannot be replaced.
+            </exception>
+            <seealso cref="P:Spring.Aop.Framework.ProxyConfig.IsFrozen"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAdvised.ToProxyConfigString">
+            <summary>
+            As <see cref="M:System.Object.ToString"/> will normally be passed
+            straight through to the advised target, this method returns the
+            <see cref="M:System.Object.ToString"/> equivalent for the AOP
+            proxy itself.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> description of the proxy configuration.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Framework.IAdvised.ExposeProxy">
+            <summary>
+            Should proxies obtained from this configuration expose
+            the AOP proxy to the
+            <see cref="T:Spring.Aop.Framework.AopContext"/> class?
+            </summary>
+            <remarks>
+            <p>
+            This is useful if an advised object needs to call another advised
+            method on itself. (If it uses the <c>this</c> reference (<c>Me</c>
+            in Visual Basic.NET), the invocation will <b>not</b> be advised).
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.IAdvised.AdvisorChainFactory">
+            <summary>
+            Gets the
+            <see cref="T:Spring.Aop.Framework.IAdvisorChainFactory"/>
+            implementation that will be used to get the interceptor
+            chains for the advised
+            <see cref="P:Spring.Aop.Framework.AdvisedSupport.Target"/>.
+            </summary>
+            <value>
+            The <see cref="T:Spring.Aop.Framework.IAdvisorChainFactory"/>
+            implementation that will be used to get the interceptor
+            chains for the advised
+            <see cref="P:Spring.Aop.Framework.AdvisedSupport.Target"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.IAdvised.ProxyTargetType">
+            <summary>
+            Is the target <see cref="T:System.Type"/> to be proxied in addition
+            to any interfaces declared on the proxied <see cref="T:System.Type"/>?
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Framework.IAdvised.ProxyTargetAttributes">
+            <summary>
+            Is target type attributes, method attributes, method's return type attributes 
+            and method's parameter attributes to be proxied in addition
+            to any interfaces declared on the proxied <see cref="T:System.Type"/>?
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Framework.IAdvised.Advisors">
+            <summary>
+            Returns the collection of <see cref="T:Spring.Aop.IAdvisor"/>
+            instances that have been applied to this proxy.
+            </summary>
+            <remarks>
+            <p>
+            Will never return <cref lang="null"/>, but may return an
+            empty array (in the case where no
+            <see cref="T:Spring.Aop.IAdvisor"/> instances have been applied to
+            this proxy).
+            </p>
+            </remarks>
+            <value>
+            The collection of <see cref="T:Spring.Aop.IAdvisor"/>
+            instances that have been applied to this proxy.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.IAdvised.Introductions">
+            <summary>
+            Returns the collection of <see cref="T:Spring.Aop.IIntroductionAdvisor"/>
+            instances that have been applied to this proxy.
+            </summary>
+            <remarks>
+            <p>
+            Will never return <cref lang="null"/>, but may return an
+            empty array (in the case where no
+            <see cref="T:Spring.Aop.IIntroductionAdvisor"/> instances have been
+            applied to this proxy).
+            </p>
+            </remarks>
+            <value>
+            The collection of <see cref="T:Spring.Aop.IIntroductionAdvisor"/>
+            instances that have been applied to this proxy.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.IAdvised.Interfaces">
+            <summary>
+            Returns the collection of interface <see cref="T:System.Type"/>s
+            to be (or that are being) proxied by this proxy.
+            </summary>
+            <value>
+            The collection of interface <see cref="T:System.Type"/>s
+            to be (or that are being) proxied by this proxy.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.IAdvised.InterfaceMap">
+            <summary>
+            Returns the mapping of the proxied interface
+            <see cref="T:System.Type"/>s to their delegates.
+            </summary>
+            <value>
+            The mapping of the proxied interface
+            <see cref="T:System.Type"/>s to their delegates.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.IAdvised.IsFrozen">
+            <summary>
+            Is this configuration frozen?
+            </summary>
+            <remarks>
+            <p>
+            When a config is frozen, no advice changes can be made. This is
+            useful for optimization, and useful when we don't want callers
+            to be able to manipulate configuration after casting to
+            <see cref="T:Spring.Aop.Framework.IAdvised"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.IAdvised.TargetSource">
+            <summary>
+            Returns the <see cref="T:Spring.Aop.ITargetSource"/> used by this
+            <see cref="T:Spring.Aop.Framework.IAdvised"/> object.
+            </summary>
+            <value>
+            The <see cref="T:Spring.Aop.ITargetSource"/> used by this
+            <see cref="T:Spring.Aop.Framework.IAdvised"/> object.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.IAdvised.IsSerializable">
+            <summary>
+            Returns a boolean specifying if this <see cref="T:Spring.Aop.Framework.IAdvised"/>
+            instance can be serialized.
+            </summary>
+            <value>
+            <c>true</c> if this instance can be serialized, <c>false</c> otherwise.
+            </value>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.UseDynamicReflection">
+            <summary>
+            Should we use dynamic reflection for method invocation ?
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.EmptyList">
+            <summary>
+            Optimization fields
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.m_advised">
+            <summary>
+            IAdvised delegate
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.m_introductions">
+            <summary>
+            Array of introduction delegates
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.m_targetSourceWrapper">
+            <summary>
+            Target source wrapper
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.m_targetType">
+            <summary>
+            Type of target object.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.#cctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.#ctor(Spring.Aop.Framework.IAdvised)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> class.
+            </summary>
+            <param name="advised">The proxy configuration.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.#ctor(Spring.Aop.Framework.IAdvised,Spring.Aop.Framework.IAopProxy)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> class.
+            </summary>
+            <param name="advised">The proxy configuration.</param>
+            <param name="proxy">The proxy.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Deserialization constructor.
+            </summary>
+            <param name="info">Serialization data.</param>
+            <param name="context">Serialization context.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Serializes this instance.
+            </summary>
+            <param name="info">Serialization data.</param>
+            <param name="context">Serialization context.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.Initialize(Spring.Aop.Framework.IAdvised,Spring.Aop.Framework.IAopProxy)">
+            <summary>
+            Initialization method.
+            </summary>
+            <param name="advised">The proxy configuration.</param>
+            <param name="proxy">
+            The current <see cref="T:Spring.Aop.Framework.IAopProxy"/> implementation.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.Invoke(System.Object,System.Object,System.Type,System.Reflection.MethodInfo,System.Reflection.MethodInfo,System.Object[],System.Collections.IList)">
+            <summary>
+            Invokes intercepted methods using reflection
+            </summary>
+            <param name="proxy">proxy object</param>
+            <param name="target">target object to invoke method on</param>
+            <param name="targetType">target type</param>
+            <param name="targetMethod">taget method to invoke</param>
+            <param name="proxyMethod">The method to invoke on proxy.</param>
+            <param name="args">method arguments</param>
+            <param name="interceptors">interceptor chain</param>
+            <returns>value returned by invocation chain</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.GetInterceptors(System.Type,System.Reflection.MethodInfo)">
+            <summary>
+            Returns a list of method interceptors
+            </summary>
+            <param name="targetType">target type</param>
+            <param name="method">target method</param>
+            <returns>list of inteceptors for the specified method</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.AddAdvice(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Adds the supplied <paramref name="advice"/> to the end (or tail)
+            of the advice (interceptor) chain.
+            </summary>
+            <param name="advice">
+            The <see cref="T:AopAlliance.Aop.IAdvice"/> to be added.
+            </param>
+            <seealso cref="T:Spring.Aop.Support.DefaultPointcutAdvisor"/>
+            <seealso cref="M:Spring.Aop.Framework.IAdvised.AddAdvice(System.Int32,AopAlliance.Aop.IAdvice)"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.AddAdvice(System.Int32,AopAlliance.Aop.IAdvice)">
+            <summary>
+            Adds the supplied <paramref name="advice"/> to the supplied
+            <paramref name="position"/> in the advice (interceptor) chain.
+            </summary>
+            <param name="position">
+            The zero (0) indexed position (from the head) at which the
+            supplied <paramref name="advice"/> is to be inserted into the
+            advice (interceptor) chain.
+            </param>
+            <param name="advice">
+            The <see cref="T:AopAlliance.Aop.IAdvice"/> to be added.
+            </param>
+            <seealso cref="T:Spring.Aop.Support.DefaultPointcutAdvisor"/>
+            <seealso cref="M:Spring.Aop.Framework.IAdvised.AddAdvice(AopAlliance.Aop.IAdvice)"/>
+        </member>
+        <member name="P:Spring.Aop.Framework.DynamicProxy.AdvisedProxy.TargetType">
+            <summary>
+            Gets the target type behind the implementing object.
+            Ttypically a proxy configuration or an actual proxy.
+            </summary>
+            <value>The type of the target or null if not known.</value>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTypeBuilder">
+            <summary>
+            Base class for proxy builders that can be used 
+            to create an AOP proxy for any object.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: AbstractAopProxyTypeBuilder.cs,v 1.5 2007/12/03 09:06:58 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator">
+            <summary>
+            Describes the operations that generates IL instructions 
+            used to build the Aop proxy type.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: IAopProxyTypeGenerator.cs,v 1.2 2006/11/05 20:36:59 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator.PushAdvisedProxy(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes  
+            the current <see cref="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> 
+            instance on stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTypeBuilder.PushTarget(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the target instance on which calls should be delegated to.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTypeBuilder.PushAdvisedProxy(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes  
+            the current <see cref="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> 
+            instance on stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTypeBuilder.GetTypeAttributes(System.Type)">
+            <summary>
+            Calculates and returns the list of attributes that apply to the
+            specified type.
+            </summary>
+            <remarks>
+            Removes <see cref="T:System.SerializableAttribute"/> from the list.
+            </remarks>
+            <param name="type">The type to find attributes for.</param>
+            <returns>
+            A list of custom attributes that should be applied to type.
+            </returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator">
+            <summary>
+            Object Auto Proxy Creator
+            </summary>
+            <remarks>
+            <para>
+            Auto proxy creator that identifies objects to proxy via a list of names.
+            Checks for direct, "xxx*", "*xxx" and "*xxx*" matches.
+            </para>
+            <para>In case of a IFactoryObject, only the objects created by the
+            FactoryBean will get proxied.  If you intend to proxy a IFactoryObject instance itself
+            specify the object name of the IFactoryObject including 
+            the factory-object prefix "&amp;"  e.g. "&amp;MyFactoryObject".
+            </para>
+            </remarks>
+            <seealso cref="M:Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator.IsMatch(System.String,System.String)"/>
+            <author>Juergen Hoeller</author>
+            <author>Adhari C Mahendra (.NET)</author>
+            <version>$Id: ObjectNameAutoProxyCreator.cs,v 1.8 2008/03/03 09:28:49 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator">
+            <summary>
+            ObjectPostProcessor implementation that wraps a group of objects with AOP proxies
+            that delegate to the given interceptors before invoking the object itself.
+            </summary>
+            <remarks>
+            <p>This class distinguishes between "common" interceptors: shared for all proxies it
+            creates, and "specific" interceptors: unique per object instance. There need not
+            be any common interceptors. If there are, they are set using the interceptorNames
+            property. As with ProxyFactoryObject, interceptors names in the current factory
+            are used rather than object references to allow correct handling of prototype
+            advisors and interceptors: for example, to support stateful mixins.
+            Any advice type is supported for "interceptorNames" entries.</p>
+            <p>Such autoproxying is particularly useful if there's a large number of objects that need
+            to be wrapped with similar proxies, i.e. delegating to the same interceptors.
+            Instead of x repetitive proxy definitions for x target objects, you can register
+            one single such post processor with the object factory to achieve the same effect.</p>
+            <p>Subclasses can apply any strategy to decide if a object is to be proxied,
+            e.g. by type, by name, by definition details, etc. They can also return
+            additional interceptors that should just be applied to the specific object
+            instance. The default concrete implementation is ObjectNameAutoProxyCreator,
+            identifying the objects to be proxied via a list of object names.</p>
+            <p>Any number of TargetSourceCreator implementations can be used with any subclass,
+            to create a custom target source - for example, to pool prototype objects.
+            Autoproxying will occur even if there is no advice if a TargetSourceCreator specifies
+            a custom TargetSource. If there are no TargetSourceCreators set, or if none matches,
+            a SingletonTargetSource will be used by default to wrap the object to be autoproxied.</p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rod Johnson</author>
+            <author>Adhari C Mahendra (.NET)</author>
+            <seealso cref="P:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.InterceptorNames"/>
+            <seealso cref="T:Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator"/>
+            <version>$Id: AbstractAutoProxyCreator.cs,v 1.15 2008/03/03 09:28:49 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.ProxyConfig">
+            <summary>
+            Convenience superclass for configuration used in creating proxies,
+            to ensure that all proxy creators have consistent properties.
+            </summary>
+            <remarks>
+            <p>
+            Note that it is no longer possible to configure subclasses to 
+            expose the <see cref="T:AopAlliance.Intercept.IMethodInvocation"/>.
+            Interceptors should normally manage their own thread locals if they
+            need to make resources available to advised objects. If it is
+            absolutely necessary to expose the
+            <see cref="T:AopAlliance.Intercept.IMethodInvocation"/>, use an
+            interceptor to do so.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: ProxyConfig.cs,v 1.13 2007/09/07 01:51:49 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyConfig.CopyFrom(Spring.Aop.Framework.ProxyConfig)">
+            <summary>
+            Copies the configuration from the supplied
+            <paramref name="otherConfiguration"/> into this instance.
+            </summary>
+            <param name="otherConfiguration">
+            The configuration to be copied.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="otherConfiguration"/> is
+            <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyConfig.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.Framework.ProxyConfig"/> configuration.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.Framework.ProxyConfig"/> configuration.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyConfig.SyncRoot">
+            <summary>
+            Use to synchronize access to this ProxyConfig instance
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyConfig.ProxyTargetType">
+            <summary>
+            Is the target <see cref="T:System.Type"/> to be proxied in addition
+            to any interfaces declared on the proxied <see cref="T:System.Type"/>?
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyConfig.ProxyTargetAttributes">
+            <summary>
+            Is target type attributes, method attributes, method's return type attributes 
+            and method's parameter attributes to be proxied in addition
+            to any interfaces declared on the proxied <see cref="T:System.Type"/>?
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyConfig.Optimize">
+            <summary>
+            Are any <i>agressive optimizations</i> to be performed?
+            </summary>
+            <remarks>
+            <p>
+            The exact meaning of <i>agressive optimizations</i> will differ
+            between proxies, but there is usually some tradeoff.
+            </p>
+            <p>
+            For example, optimization will usually mean that advice changes
+            won't take effect after a proxy has been created. For this reason,
+            optimization is disabled by default. An optimize value of
+            <see langword="true"/> may be ignored if other settings preclude
+            optimization: for example, if the
+            <see cref="P:Spring.Aop.Framework.ProxyConfig.ExposeProxy"/> property
+            is set to <see langword="true"/> and such a value is not compatible
+            with the optimization.
+            </p>
+            <p>
+            The default is <see langword="false"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyConfig.ExposeProxy">
+            <summary>
+            Should proxies obtained from this configuration expose
+            the AOP proxy to the
+            <see cref="T:Spring.Aop.Framework.AopContext"/> class?
+            </summary>
+            <remarks>
+            <p>
+            The default is <see langword="false"/>, as enabling this property
+            may impair performance.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyConfig.AopProxyFactory">
+            <summary>
+            Gets and set the factory to be used to create AOP proxies.
+            </summary>
+            <remarks>
+            <p>
+            This obviously allows one to customise the
+            <see cref="T:Spring.Aop.Framework.IAopProxyFactory"/> implementation,
+            allowing different strategies to be dropped in without changing the
+            core framework. For example, an
+            <see cref="T:Spring.Aop.Framework.IAopProxyFactory"/> implementation
+            could return an <see cref="T:Spring.Aop.Framework.IAopProxy"/>
+            using remoting proxies, <c>Reflection.Emit</c> or a code generation
+            strategy. 
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyConfig.IsFrozen">
+            <summary>
+            Is this configuration frozen?
+            </summary>
+            <remarks>
+            <p>
+            The default is not frozen.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.logger">
+            <summary>
+            The logger for this class hierarchy.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.DO_NOT_PROXY">
+            <summary>
+            Convenience constant for subclasses: Return value for "do not proxy".
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS">
+            <summary>
+            Convenience constant for subclasses: Return value for
+            "proxy without additional interceptors, just the common ones".
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.order">
+            <summary>
+            Default value is same as non-ordered
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.advisorAdapterRegistry">
+            <summary>
+            Default is global AdvisorAdapterRegistry
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.freezeProxy">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.interceptorNames">
+            <summary>
+            Names of common interceptors. 
+            We must use object name rather than object references
+            to handle prototype advisors/interceptors.
+            Default is the empty array: no common interceptors.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.targetSourcedObjects">
+            <summary>
+            Set of object type + name strings, referring to all objects that this auto-proxy
+            creator created a custom TargetSource for.  Used to detect own pre-built proxies
+            (from "PostProcessBeforeInstantiation") in the "PostProcessAfterInitialization" method.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.PostProcessAfterInitialization(System.Object,System.String)">
+            <summary>
+            Create a proxy with the configured interceptors if the object is
+            identified as one to proxy by the subclass.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.PostProcessBeforeInitialization(System.Object,System.String)">
+            <summary>
+            No-op for before initialization.
+            </summary>
+            <param name="obj">The obj.</param>
+            <param name="name">The name.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.ShouldSkip(System.Type,System.String)">
+            <summary>
+            Subclasses should override this method to return true if this
+            object should not be considered for autoproxying by this post processor.
+            Sometimes we need to be able to avoid this happening if it will lead to
+            a circular reference. This implementation returns true.
+            </summary>
+            <param name="objectType">the type of the object</param>
+            <param name="objectName">the name of the object</param>
+            <returns>if remarkable to skip</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.CustomizeProxyFactory(Spring.Aop.Framework.ProxyFactory)">
+            <summary>
+            Subclasses may choose to implement this: for example,
+            to change the interfaces exposed
+            </summary>
+            <param name="pf">
+            ProxyFactory that will be used to create the proxy immediably after this method returns.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.IsInfrastructureType(System.Type,System.String)">
+            <summary>
+            Determines whether the object is an infrastructure type,
+            IAdvisor, IAdvice, IAdvisors or AbstractAutoProxyCreator
+            </summary>
+            <param name="type">The object type to compare</param>
+            <param name="name">The name of the object</param>
+            <returns>
+            <c>true</c> if [is infrastructure type] [the specified obj]; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.GetCustomTargetSource(System.Type,System.String)">
+            <summary>
+            Create a target source for object instances. Uses any
+            TargetSourceCreators if set. Returns null if no Custom TargetSource
+            should be used.
+            This implementation uses the customTargetSourceCreators property.
+            Subclasses can override this method to use a different mechanism.
+            </summary>
+            <param name="objectType">the type of the object to create a TargetSource for</param>
+            <param name="name">the name of the object</param>
+            <returns>a TargetSource for this object</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.GetAdvicesAndAdvisorsForObject(System.Type,System.String,Spring.Aop.ITargetSource)">
+            <summary>
+            Return whether the given object is to be proxied, what additional
+            advices (e.g. AOP Alliance interceptors) and advisors to apply.
+            </summary>
+            <remarks>
+            <p>The previous name of this method was "GetInterceptorAndAdvisorForObject".
+            It has been renamed in the course of general terminology clarification
+            in Spring 1.1. An AOP Alliance Interceptor is just a special form of
+            Advice, so the generic Advice term is preferred now.</p>
+            <p>The third parameter, customTargetSource, is new in Spring 1.1;
+            add it to existing implementations of this method.</p>
+            </remarks>
+            <param name="objType">the new object instance</param>
+            <param name="name">the name of the object</param>
+            <param name="customTargetSource">targetSource returned by TargetSource property:
+            may be ignored. Will be null unless a custom target source is in use.</param>
+            <returns>an array of additional interceptors for the particular object;
+            or an empty array if no additional interceptors but just the common ones;
+            or null if no proxy at all, not even with the common interceptors.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.CreateProxy(System.Type,System.String,System.Object[],Spring.Aop.ITargetSource)">
+            <summary>
+            Create an AOP proxy for the given object.
+            </summary>
+            <param name="objectType">Type of the object.</param>
+            <param name="objectName">The name of the object.</param>
+            <param name="specificInterceptors">The set of interceptors that is specific to this
+            object (may be empty but not null)</param>
+            <param name="targetSource">The target source for the proxy, already pre-configured to access the object.</param>
+            <returns>The AOP Proxy for the object.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.CreateProxyFactory">
+            <summary>
+            Obtain a new proxy factory instance to be used for proxying a particular object
+            </summary>
+            <returns>A proxy factory instance for proxying a particular object</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.BuildAdvisors(System.String,System.Object[])">
+            <summary>
+            Determines the advisors for the given object, including the specific interceptors
+            as well as the common interceptor, all adapted to the Advisor interface.
+            </summary>
+            <param name="objectName">The name of the object.</param>
+            <param name="specificInterceptors">The set of interceptors that is specific to this
+            object (may be empty, but not null)</param>
+            <returns>The list of Advisors for the given object</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.GetCacheKey(System.Type,System.String)">
+            <summary>
+            Build a cache key for the given object type and object name
+            </summary>
+            <param name="objectType">The object type.</param>
+            <param name="objectName">The object name.</param>
+            <returns>The cache key for the given type and name</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.PostProcessBeforeInstantiation(System.Type,System.String)">
+            <summary>
+            Create the proxy if have a custom TargetSource
+            </summary>
+            <param name="objectType">The object type</param>
+            <param name="objectName">The object name</param>
+            <returns>null if not creating a proxy, otherwise return the proxy.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.PostProcessAfterInstantiation(System.Object,System.String)">
+            <summary>
+            Default behavior, return true and continue processing.
+            </summary>
+            <param name="objectInstance">The object instance</param>
+            <param name="objectName">The object name.</param>
+            <returns>true</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.PostProcessPropertyValues(Spring.Objects.IPropertyValues,System.Reflection.PropertyInfo[],System.Object,System.String)">
+            <summary>
+            Default behavior, return passed in PropertyValues
+            </summary>
+            <param name="pvs">The property values that the factory is about to apply (never <code>null</code>).</param>
+            <param name="pis">he relevant property infos for the target object (with ignored
+            dependency types - which the factory handles specifically - already filtered out)</param>
+            <param name="objectInstance">The object instance created, but whose properties have not yet 
+            been set.</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>The passed in PropertyValues</returns>
+        </member>
+        <member name="P:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.AdvisorAdapterRegistry">
+            <summary>
+            Sets the AdvisorAdapterRegistry to use. 
+            </summary>
+            <remarks>
+            Default is the global AdvisorAdapterRegistry.
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.CustomTargetSourceCreators">
+            <summary>
+            Sets custom TargetSourceCreators to be applied in this order.
+            </summary>
+            <remarks>
+            <para>
+            If the list is empty, or they all return null, a SingletonTargetSource
+            will be created.
+            </para>
+            <para>
+            TargetSourceCreators can only be invoked if this post processor is used
+            in a IObjectFactory, and its ObjectFactoryAware callback is used.
+            </para>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.InterceptorNames">
+            <summary> 
+            Sets the common interceptors, a list of <see cref="T:AopAlliance.Aop.IAdvice"/>, 
+            <see cref="T:Spring.Aop.IAdvisor"/> and introduction object names.
+            </summary>
+            <remarks>
+            <para>
+            If this property isn't set, there will be zero common interceptors. 
+            This is perfectly valid, if "specific" interceptors such as
+            matching Advisors are all we want.
+            </para>
+            </remarks>
+            <value>
+            The list of <see cref="T:AopAlliance.Aop.IAdvice"/>, 
+            <see cref="T:Spring.Aop.IAdvisor"/> and introduction object names.
+            </value>
+            <seealso cref="T:AopAlliance.Aop.IAdvice"/>
+            <seealso cref="T:Spring.Aop.IAdvisor"/>
+        </member>
+        <member name="P:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.ApplyCommonInterceptorsFirst">
+            <summary>
+            Sets whether the common interceptors should be applied before
+            object-specific ones. 
+            </summary>
+            <remarks>
+            Default is true; else, object-specific interceptors will get applied first.
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.IsFrozen">
+            <summary>
+            Set whether or not the proxy should be frozen, preventing advice
+            from being added to it once it is created.
+            </summary>
+            <remarks>
+            	<p>Overridden from the super class to prevent the proxy configuration
+            from being frozen before the proxy is created. The default is not frozen.
+                </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.ObjectFactory">
+            <summary>
+            Callback that supplies the owning factory to an object instance.
+            </summary>
+            <value>
+            Owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            (may not be <see langword="null"/>). The object can immediately
+            call methods on the factory.
+            </value>
+            <remarks>
+            	<p>
+            Invoked after population of normal object properties but before an init
+            callback like <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            method or a custom init-method.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of initialization errors.
+            </exception>
+        </member>
+        <member name="P:Spring.Aop.Framework.AutoProxy.AbstractAutoProxyCreator.Order">
+            <summary>
+            Propery Order
+            </summary>
+            <remarks>
+            Ordering which will apply to this class's implementation
+            of Ordered, used when applying multiple ObjectPostProcessors.
+            Default value is int.MaxValue, meaning that it's non-ordered.
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator.GetAdvicesAndAdvisorsForObject(System.Type,System.String,Spring.Aop.ITargetSource)">
+            <summary>
+            Identify as object to proxy if the object name is in the configured list of names.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator.IsMatch(System.String,System.String)">
+            <summary>
+            Return if the given object name matches the mapped name.
+            </summary>
+            <remarks>
+            <p>
+            The default implementation checks for "xxx*", "*xxx" and "*xxx*" matches,
+            as well as direct equality. Can be overridden in subclasses.
+            </p>
+            </remarks>
+            <param name="objectName">the object name to check</param>
+            <param name="mappedName">the name in the configured list of names</param>
+            <returns>if the names match</returns>
+        </member>
+        <member name="P:Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator.ObjectNames">
+            <summary>
+            Set the names of the objects in IList fashioned way that should automatically 
+            get wrapped with proxies.
+            A name can specify a prefix to match by ending with "*", e.g. "myObject,tx*"
+            will match the object named "myObject" and all objects whose name start with "tx".
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Config.ConfigObjectDefinitionParser">
+            <summary>
+            The <see cref="T:Spring.Objects.Factory.Xml.IObjectDefinitionParser"/> for the <code>&lt;aop:config&gt;</code> tag.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ConfigObjectDefinitionParser.cs,v 1.3 2008/02/20 14:29:13 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Config.ConfigObjectDefinitionParser.PROXY_TARGET_TYPE">
+            <summary>
+            The '<code>proxy-target-type</code>' attribute
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Config.ConfigObjectDefinitionParser.ParseElement(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parse the specified XmlElement and register the resulting
+            ObjectDefinitions with the <see cref="P:Spring.Objects.Factory.Xml.ParserContext.Registry"/> IObjectDefinitionRegistry
+            embedded in the supplied <see cref="T:Spring.Objects.Factory.Xml.ParserContext"/>
+            </summary>
+            <param name="element">The element to be parsed.</param>
+            <param name="parserContext">The object encapsulating the current state of the parsing process.
+            Provides access to a IObjectDefinitionRegistry</param>
+            <returns>The primary object definition.</returns>
+            <remarks>
+            	<p>
+            This method is never invoked if the parser is namespace aware
+            and was called to process the root node.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Config.ConfigObjectDefinitionParser.ParseAdvisor(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parses the supplied advisor element and registers the resulting <see cref="T:Spring.Aop.IAdvisor"/> 
+            </summary>
+            <param name="advisorElement">The advisor element.</param>
+            <param name="parserContext">The parser context.</param>
+        </member>
+        <member name="T:Spring.Aop.Config.AopNamespaceUtils">
+            <summary>
+            Utility class for handling registration of auto-proxy creators used internally by the
+            <code>aop</code> namespace tags.
+            </summary>
+            <author>Rob Harrop</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AopNamespaceUtils.cs,v 1.4 2007/05/26 19:25:48 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Config.AopNamespaceUtils.AUTO_PROXY_CREATOR_OBJECT_NAME">
+            <summary>
+             The object name of the internally managed auto-proxy creator.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Config.AopNamespaceUtils.RegisterAutoProxyCreatorIfNecessary(Spring.Objects.Factory.Xml.ParserContext,System.Xml.XmlElement)">
+            <summary>
+            Registers the auto proxy creator if necessary.
+            </summary>
+            <param name="parserContext">The parser context.</param>
+            <param name="sourceElement">The source element.</param>
+        </member>
+        <member name="M:Spring.Aop.Config.AopNamespaceUtils.RegisterApcAsRequired(System.Type,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Registries the or escalate apc as required.
+            </summary>
+            <param name="type">The type.</param>
+            <param name="parserContext">The parser context.</param>
+        </member>
+        <member name="M:Spring.Aop.Config.AopNamespaceUtils.ForceAutoProxyCreatorToUseDecoratorProxy(Spring.Objects.Factory.Support.IObjectDefinitionRegistry)">
+            <summary>
+            Forces the auto proxy creator to use decorator proxy.
+            </summary>
+            <param name="registry">The registry.</param>
+        </member>
+        <member name="T:AopAlliance.Intercept.IConstructorInvocation">
+            <summary>
+            A description of an invocation to a constuctor, given to an interceptor
+            upon constructor-call.
+            </summary>
+            <remarks>
+            <p>
+            A constructor invocation is a joinpoint and can be intercepted by a
+            constructor interceptor.
+            </p>
+            </remarks>
+            <seealso cref="T:AopAlliance.Intercept.IConstructorInterceptor"/>
+        </member>
+        <member name="T:AopAlliance.Intercept.IInvocation">
+            <summary>
+            Represents an invocation in the program.
+            </summary>
+            <remarks>
+            <p>
+            An invocation is a joinpoint and can be intercepted by an interceptor.
+            Typical examples would be a constructor invocation and a method call.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:AopAlliance.Intercept.IJoinpoint">
+            <summary>
+            Represents a generic runtime joinpoint (in the AOP terminology).
+            </summary>
+            <remarks>
+            <p>
+            A runtime joinpoint is an <i>event</i> that occurs on a static
+            joinpoint (i.e. a location in a program). For instance, an
+            invocation is the runtime joinpoint on a method (static joinpoint).
+            The static part of a given joinpoint can be generically retrieved
+            using the <see cref="P:AopAlliance.Intercept.IJoinpoint.StaticPart"/>
+            property.
+            </p>
+            <p>
+            In the context of an interception framework, a runtime joinpoint
+            is then the reification of an access to an accessible object (a
+            method, a constructor, a field), i.e. the static part of the
+            joinpoint. It is passed to the interceptors that are installed on
+            the static joinpoint.
+            </p>
+            </remarks>
+            <seealso cref="T:AopAlliance.Intercept.IInterceptor"/>
+        </member>
+        <member name="M:AopAlliance.Intercept.IJoinpoint.Proceed">
+            <summary>
+            Proceeds to the next interceptor in the chain.
+            </summary>
+            <remarks>
+            <p>
+            The implementation and semantics of this method depend on the
+            actual joinpoint type. Consult the derived interfaces of this
+            interface for specifics.
+            </p>
+            </remarks>
+            <returns>
+            Consult the derived interfaces of this interface for specifics.
+            </returns>
+            <exception cref="T:System.Exception">
+            If any of the interceptors at the joinpoint throws an exception.
+            </exception>
+        </member>
+        <member name="P:AopAlliance.Intercept.IJoinpoint.StaticPart">
+            <summary>
+            Gets the static part of this joinpoint.
+            </summary>
+            <remarks>
+            <p>
+            The static part is an accessible object on which a chain of
+            interceptors are installed.
+            </p>
+            </remarks>
+            <value>
+            The static part of this joinpoint.
+            </value>
+        </member>
+        <member name="P:AopAlliance.Intercept.IJoinpoint.This">
+            <summary>
+            Gets the object that holds the current joinpoint's static part.
+            </summary>
+            <remarks>
+            <p>
+            For instance, the target object for a method invocation.
+            </p>
+            </remarks>
+            <value>
+            The object that holds the current joinpoint's static part.
+            </value>
+        </member>
+        <member name="P:AopAlliance.Intercept.IInvocation.Arguments">
+            <summary>
+            Gets the arguments to an invocation.
+            </summary>
+            <remarks>
+            <p>
+            It is of course possible to change element values within this array
+            to change the arguments to an intercepted invocation.
+            </p>
+            </remarks>
+            <value>
+            The arguments to an invocation.
+            </value>
+        </member>
+        <member name="P:AopAlliance.Intercept.IConstructorInvocation.Constructor">
+            <summary>
+            Gets the constructor invocation that is to be invoked.
+            </summary>
+            <remarks>
+            <p>
+            This property is a friendly implementation of the
+            <see cref="P:AopAlliance.Intercept.IJoinpoint.StaticPart"/> property.
+            It should be used in preference to the
+            <see cref="P:AopAlliance.Intercept.IJoinpoint.StaticPart"/> property
+            because it provides immediate access to the underlying constructor
+            without the need to resort to a cast.
+            </p>
+            </remarks>
+            <value>
+            The constructor invocation that is to be invoked.
+            </value>
+        </member>
+        <member name="T:Spring.Aop.TrueTypeFilter">
+            <summary>
+            Canonical <see cref="T:Spring.Aop.ITypeFilter"/> instances.
+            </summary>
+            <remarks>
+            <p>
+            Only one canonical <see cref="T:Spring.Aop.ITypeFilter"/> instance is
+            provided out of the box. The <see cref="F:Spring.Aop.TrueTypeFilter.True"/>
+            <see cref="T:Spring.Aop.ITypeFilter"/> matches all classes.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: TrueTypeFilter.cs,v 1.4 2006/04/09 07:18:36 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.ITypeFilter">
+            <summary>
+            A filter that restricts the matching of a pointcut or introduction to
+            a given set of target types.
+            </summary>
+            <remarks>
+            <p>
+            Can be used as part of a pointcut, or for the entire targeting of an
+            introduction.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <seealso cref="T:Spring.Aop.IPointcut"/>
+            <seealso cref="F:Spring.Aop.TrueTypeFilter.True"/>
+            <version>$Id: ITypeFilter.cs,v 1.2 2006/04/09 07:18:36 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.ITypeFilter.Matches(System.Type)">
+            <summary>
+            Should the pointcut apply to the supplied
+            <see cref="T:System.Type"/>?
+            </summary>
+            <param name="type">
+            The candidate <see cref="T:System.Type"/>.
+            </param>
+            <returns>
+            <see langword="true"/> if the advice should apply to the supplied
+            <paramref name="type"/>
+            </returns>
+        </member>
+        <member name="F:Spring.Aop.TrueTypeFilter.True">
+            <summary>
+            Canonical <see cref="T:Spring.Aop.ITypeFilter"/> instance that
+            matches all classes.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.TrueTypeFilter.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.TrueTypeFilter"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly visible
+            constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.TrueTypeFilter.Matches(System.Type)">
+            <summary>
+            Should the pointcut apply to the supplied
+            <see cref="T:System.Type"/>?
+            </summary>
+            <param name="type">
+            The candidate <see cref="T:System.Type"/>.
+            </param>
+            <returns>
+            <see langword="true"/> if the advice should apply to the supplied
+            <paramref name="type"/>
+            </returns>
+            <seealso cref="M:Spring.Aop.ITypeFilter.Matches(System.Type)"/>
+        </member>
+        <member name="M:Spring.Aop.TrueTypeFilter.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.ITypeFilter"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.ITypeFilter"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.TrueTypeFilter.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="T:Spring.Aop.Target.ThreadLocalTargetSource">
+            <summary>
+            <see cref="T:Spring.Aop.ITargetSource"/> implementation that uses a
+            threading model in which every thread has its own copy of the target.
+            </summary>
+            <remarks>
+            <p>
+            Alternative to an object pool.
+            </p>
+            <p>
+            Application code is written as to a normal pool; callers can't assume
+            they will be dealing with the same instance in invocations in different
+            threads. However, state can be relied on during the operations of a
+            single thread: for example, if one caller makes repeated calls on the
+            AOP proxy.
+            </p>
+            <p>
+            This class act both as an introduction and as an interceptor, so it 
+            should be added twice, once as an introduction and once as an
+            interceptor.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Federico Spinazzi (.NET)</author>
+            <version>$Id: ThreadLocalTargetSource.cs,v 1.8 2006/04/09 07:18:37 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Target.AbstractPrototypeTargetSource">
+            <summary>
+            Base class for dynamic <see cref="T:Spring.Aop.ITargetSource"/>
+            implementations that can create new prototype object instances to
+            support a pooling or new-instance-per-invocation strategy.
+            </summary>
+            <remarks>
+            <p>
+            All such <see cref="T:Spring.Aop.ITargetSource"/>s must run in an
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/>, as they need to
+            call the <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>
+            method to create a new prototype instance.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Federico Spinazzi (.NET)</author>
+            <version>$Id: AbstractPrototypeTargetSource.cs,v 1.11 2007/07/28 07:32:52 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.ITargetSource">
+            <summary>
+            Used to obtain the current "target" of an AOP invocation
+            </summary>
+            <remarks>
+            <p>
+            This target will be invoked via reflection if no around advice chooses
+            to end the interceptor chain itself.
+            </p>
+            <p>
+            If an <see cref="T:Spring.Aop.ITargetSource"/> is <c>"static"</c>, it
+            will always return the same target, allowing optimizations in the AOP
+            framework. Dynamic target sources can support pooling, hot swapping etc.
+            </p>
+            <p>
+            Application developers don't usually need to work with target sources
+            directly: this is an AOP framework interface.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: ITargetSource.cs,v 1.9 2007/10/10 18:07:38 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.ITargetSource.GetTarget">
+            <summary>
+            Returns the target object.
+            </summary>
+            <returns>The target object.</returns>
+            <exception cref="T:System.Exception">
+            If unable to obtain the target object.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.ITargetSource.ReleaseTarget(System.Object)">
+            <summary>
+            Releases the target object.
+            </summary>
+            <param name="target">The target object to release.</param>
+        </member>
+        <member name="P:Spring.Aop.ITargetSource.TargetType">
+            <summary>
+            The <see cref="T:System.Type"/> of the target object.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.ITargetSource.IsStatic">
+            <summary>
+            Is the target source static?
+            </summary>
+            <value>
+            <see langword="true"/> if the target source is static.
+            </value>
+        </member>
+        <member name="M:Spring.Aop.Target.AbstractPrototypeTargetSource.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Target.AbstractPrototypeTargetSource"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no
+            public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Target.AbstractPrototypeTargetSource.NewPrototypeInstance">
+            <summary>
+            Subclasses should use this method to create a new prototype instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Target.AbstractPrototypeTargetSource.GetTarget">
+            <summary>
+            Returns the target object.
+            </summary>
+            <returns>The target object.</returns>
+            <exception cref="T:System.Exception">
+            If unable to obtain the target object.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Target.AbstractPrototypeTargetSource.ReleaseTarget(System.Object)">
+            <summary>
+            Releases the target object.
+            </summary>
+            <param name="target">The target object to release.</param>
+        </member>
+        <member name="M:Spring.Aop.Target.AbstractPrototypeTargetSource.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has set all object properties supplied
+            (and satisfied the
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            and <see cref="T:Spring.Context.IApplicationContextAware"/>
+            interfaces).
+            </summary>
+            <remarks>
+            <p>
+            Ensures that the <see cref="P:Spring.Aop.Target.AbstractPrototypeTargetSource.TargetObjectName"/> property has been
+            set to a valid value (i.e. is not <see langword="null"/> or a string
+            that consists solely of whitespace).
+            </p>
+            </remarks>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as failure to set an essential
+            property) or if initialization fails.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        </member>
+        <member name="F:Spring.Aop.Target.AbstractPrototypeTargetSource.logger">
+            <summary>
+            The shared <see cref="T:Common.Logging.ILog"/> instance for this class (and derived classes).
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Target.AbstractPrototypeTargetSource.TargetObjectName">
+            <summary>
+            The name of the target object to be created on each invocation.
+            </summary>
+            <remarks>
+            <p>
+            This object should be a prototype, or the same instance will always
+            be obtained from the owning <see cref="P:Spring.Aop.Target.AbstractPrototypeTargetSource.ObjectFactory"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Target.AbstractPrototypeTargetSource.TargetType">
+            <summary>
+            The <see cref="T:System.Type"/> of the target object.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Target.AbstractPrototypeTargetSource.IsStatic">
+            <summary>
+            Is the target source static?
+            </summary>
+            <value>
+            <see langword="true"/> if the target source is static.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Target.AbstractPrototypeTargetSource.ObjectFactory">
+            <summary>
+            The target factory that will be used to perform the lookup
+            of the object referred to by the <see cref="P:Spring.Aop.Target.AbstractPrototypeTargetSource.TargetObjectName"/>
+            property.
+            </summary>
+            <remarks>
+            <p>
+            Needed so that prototype instances can be created as necessary.
+            </p>
+            </remarks>
+            <value>
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            (will never be <see langword="null"/>).
+            </value>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of initialization errors.
+            </exception>
+            <seealso cref="P:Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/>
+        </member>
+        <member name="T:Spring.Aop.Target.IThreadLocalTargetSourceStats">
+            <summary>
+            Statistics for a thread local <see cref="T:Spring.Aop.ITargetSource"/>.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Federico Spinazzi (.NET)</author>
+            <version>$Id: IThreadLocalTargetSourceStats.cs,v 1.3 2006/04/09 07:18:37 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Aop.Target.IThreadLocalTargetSourceStats.Invocations">
+            <summary>
+            Gets the number of invocations of the
+            <see cref="M:Spring.Aop.Target.ThreadLocalTargetSource.GetTarget"/> and
+            <see cref="M:Spring.Aop.Target.ThreadLocalTargetSource.Invoke(AopAlliance.Intercept.IMethodInvocation)"/> methods.
+            </summary>
+            <value>
+            The number of invocations of the
+            <see cref="M:Spring.Aop.Target.ThreadLocalTargetSource.GetTarget"/> and
+            <see cref="M:Spring.Aop.Target.ThreadLocalTargetSource.Invoke(AopAlliance.Intercept.IMethodInvocation)"/> methods.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Target.IThreadLocalTargetSourceStats.Hits">
+            <summary>
+            Gets the number of hits that were satisfied by a thread bound object.
+            </summary>
+            <value>
+            The number of hits that were satisfied by a thread bound object.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Target.IThreadLocalTargetSourceStats.Objects">
+            <summary>
+            Gets the number of thread bound objects created.
+            </summary>
+            <value>The number of thread bound objects created.</value>
+        </member>
+        <member name="T:AopAlliance.Intercept.IMethodInterceptor">
+            <summary>
+            Intercepts calls on an interface on its way to the target.
+            </summary>
+            <remarks>
+            <p>
+            Such interceptions are nested "on top" of the target.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:AopAlliance.Intercept.IInterceptor">
+            <summary>
+            Represents a generic interceptor.
+            </summary>
+            <remarks>
+            <p>
+            A generic interceptor can intercept runtime events that occur within a
+            base program. Those events are materialized by (reified in) joinpoints.
+            Runtime joinpoints can be invocations, field access, exceptions, etc.
+            </p>
+            <p>
+            This interface is not used directly. Use the various derived interfaces
+            to intercept specific events.
+            </p>
+            </remarks>
+            <seealso cref="T:AopAlliance.Intercept.IJoinpoint"/>
+        </member>
+        <member name="T:AopAlliance.Aop.IAdvice">
+            <summary>
+            Tag interface for advice.
+            </summary>
+            <remarks>
+            <p>
+             Implementations can be any type of advice, such as interceptors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:AopAlliance.Intercept.IMethodInterceptor.Invoke(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Implement this method to perform extra treatments before and after
+            the call to the supplied <paramref name="invocation"/>.
+            </summary>
+            <remarks>
+            <p>
+            Polite implementations would certainly like to invoke
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/>. 
+            </p>
+            </remarks>
+            <param name="invocation">
+            The method invocation that is being intercepted.
+            </param>
+            <returns>
+            The result of the call to the
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+            the supplied <paramref name="invocation"/>; this return value may
+            well have been intercepted by the interceptor.
+            </returns>
+            <exception cref="T:System.Exception">
+            If any of the interceptors in the chain or the target object itself
+            throws an exception.
+            </exception>
+        </member>
+        <member name="F:Spring.Aop.Target.ThreadLocalTargetSource._targetInThread">
+            <summary>
+            ThreadLocal holding the target associated with the current thread.
+            </summary>
+            <remarks>
+            <p>
+            Unlike most thread local storage which is static, this variable is
+            meant to be per thread per instance of this class.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Aop.Target.ThreadLocalTargetSource._targetSet">
+            <summary>
+            The set of managed targets, enabling us to keep track of the
+            targets we've created.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Target.ThreadLocalTargetSource.GetTarget">
+            <summary>
+            Returns the target object.
+            </summary>
+            <remarks>
+            <p>
+            Tries to locate the target from thread local storage. If no target
+            is found, a target will be obtained and bound to the thread.
+            </p>
+            </remarks>
+            <returns>The target object.</returns>
+            <exception cref="T:System.Exception">
+            If unable to obtain the target object.
+            </exception>
+            <seealso cref="M:Spring.Aop.Target.AbstractPrototypeTargetSource.NewPrototypeInstance"/>
+        </member>
+        <member name="M:Spring.Aop.Target.ThreadLocalTargetSource.GetStatsMixin">
+            <summary>
+            Return an introduction advisor mixin that allows the AOP proxy to be
+            cast to an <see cref="T:Spring.Aop.Target.IThreadLocalTargetSourceStats"/> reference.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Target.ThreadLocalTargetSource.Dispose">
+            <summary>
+            Cleans up this instance's thread storage, and disposes of any
+            <see cref="T:System.IDisposable"/> targets as necessary.
+            </summary>
+            <seealso cref="M:System.IDisposable.Dispose"/>
+        </member>
+        <member name="M:Spring.Aop.Target.ThreadLocalTargetSource.Invoke(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Increments Invocations and Hits statistics
+            </summary>
+            <param name="invocation">The method invocation joinpoint</param>
+            <returns>The result of the call to IJoinpoint.Proceed(), might be intercepted by the interceptor.</returns>
+            <exception cref="T:System.Exception">if the interceptors or the target-object throws an exception.</exception>
+        </member>
+        <member name="P:Spring.Aop.Target.ThreadLocalTargetSource.Invocations">
+            <summary>
+            Gets the number of invocations of the <see cref="M:Spring.Aop.Target.ThreadLocalTargetSource.GetTarget"/> and
+            <see cref="M:Spring.Aop.Target.ThreadLocalTargetSource.Invoke(AopAlliance.Intercept.IMethodInvocation)"/> methods.
+            </summary>
+            <value>
+            The number of invocations of the <see cref="M:Spring.Aop.Target.ThreadLocalTargetSource.GetTarget"/> and
+            <see cref="M:Spring.Aop.Target.ThreadLocalTargetSource.Invoke(AopAlliance.Intercept.IMethodInvocation)"/> methods.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Target.ThreadLocalTargetSource.Hits">
+            <summary>
+            Gets the number of hits that were satisfied by a thread bound object.
+            </summary>
+            <value>
+            The number of hits that were satisfied by a thread bound object.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Target.ThreadLocalTargetSource.Objects">
+            <summary>
+            Gets the number of thread bound objects created.
+            </summary>
+            <value>The number of thread bound objects created.</value>
+        </member>
+        <member name="T:Spring.Aop.Target.SingletonTargetSource">
+            <summary>
+            <see cref="T:Spring.Aop.ITargetSource"/> implementation that holds a local
+            object.
+            </summary>
+            <remarks>
+            <p>
+            This is the default implementation of the
+            <see cref="T:Spring.Aop.ITargetSource"/> interface used by the AOP
+            framework. There should be no need to create objects of this class in
+            application code.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: SingletonTargetSource.cs,v 1.8 2008/03/21 14:11:57 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Target.SingletonTargetSource.#ctor(System.Object)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Target.SingletonTargetSource"/>
+            for the specified target object.
+            </summary>
+            <param name="target">The target object to expose.</param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="target"/> is
+            <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Target.SingletonTargetSource.GetTarget">
+            <summary>
+            Returns the target object.
+            </summary>
+            <returns>The target object.</returns>
+            <exception cref="T:System.Exception">
+            If unable to obtain the target object.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Target.SingletonTargetSource.ReleaseTarget(System.Object)">
+            <summary>
+            Releases the target object.
+            </summary>
+            <remarks>
+            <p>
+            No-op implementation.
+            </p>
+            </remarks>
+            <param name="target">The target object to release.</param>
+        </member>
+        <member name="M:Spring.Aop.Target.SingletonTargetSource.ToString">
+            <summary>
+            Returns a stringified representation of this target source.
+            </summary>
+            <returns>
+            A stringified representation of this target source.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Target.SingletonTargetSource.Equals(System.Object)">
+            <summary>
+            Determines whether the specified <see cref="T:System.Object"/>
+            is equal to the current <see cref="T:System.Object"/>.  
+            </summary>
+            <param name="other">The target source to compare with.</param>
+            <returns>
+            <see langword="true"/> if this instance is equal to the
+            specified <see cref="T:System.Object"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Target.SingletonTargetSource.GetHashCode">
+            <summary>
+            Serves as a hash function for a particular type, suitable for use
+            in hashing algorithms and data structures like a hash table.
+            </summary>
+            <returns>
+            A hash code for the current <see cref="T:System.Object"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Target.SingletonTargetSource.TargetType">
+            <summary>
+            The <see cref="T:System.Type"/> of the target object.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Target.SingletonTargetSource.IsStatic">
+            <summary>
+            Is the target source static?
+            </summary>
+            <value>
+            <see langword="true"/> because this target source is always static.
+            </value>
+        </member>
+        <member name="T:Spring.Aop.Support.RootTypeFilter">
+            <summary>
+            Simple <see cref="T:Spring.Aop.ITypeFilter"/> implementation that matches
+            all classes classes (and any derived subclasses) of a give root
+            <see cref="T:System.Type"/>.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: RootTypeFilter.cs,v 1.3 2007/03/16 04:01:25 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Support.RootTypeFilter.#ctor(System.Type)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.RootTypeFilter"/> for the supplied
+            <paramref name="rootType"/>.
+            </summary>
+            <param name="rootType">The root <see cref="T:System.Type"/>.</param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="rootType"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Support.RootTypeFilter.Matches(System.Type)">
+            <summary>
+            Should the pointcut apply to the supplied
+            <see cref="T:System.Type"/>?
+            </summary>
+            <remarks>
+            <p>
+            Returns <see langword="true"/> if the supplied <paramref name="type"/>
+            can be assigned to the root <see cref="T:System.Type"/>.
+            </p>
+            </remarks>
+            <param name="type">
+            The candidate <see cref="T:System.Type"/>.
+            </param>
+            <returns>
+            <see langword="true"/> if the advice should apply to the supplied
+            <paramref name="type"/>
+            </returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.ProxyFactory">
+            <summary>
+            Factory for AOP proxies for programmatic use, rather than via a
+            Spring.NET IoC container.
+            </summary>
+            <remarks>
+            <p>
+            This class provides a simple way of obtaining and configuring AOP
+            proxies in code.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: ProxyFactory.cs,v 1.8 2007/03/16 04:01:19 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.AdvisedSupport">
+            <summary>
+            Superclass for AOP proxy configuration managers.
+            </summary>
+            <remarks>
+            <p>
+            Instances of this class are not themselves AOP proxies, but
+            subclasses of this class are normally factories from which AOP proxy
+            instances are obtained directly.
+            </p>
+            <p>
+            This class frees subclasses of the housekeeping of
+            <see cref="T:AopAlliance.Intercept.IInterceptor"/> and
+            <see cref="T:Spring.Aop.IAdvisor"/> instances, but doesn't actually
+            implement proxy creation methods, the functionality for which
+            is provided by subclasses.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: AdvisedSupport.cs,v 1.36 2008/01/14 20:49:47 oakinger Exp $</version>
+            <seealso cref="T:Spring.Aop.Framework.IAopProxy"/>
+        </member>
+        <member name="F:Spring.Aop.Framework.AdvisedSupport._advisors">
+            <summary>The list of advice.</summary>
+            <remarks>
+            <p>
+            If an <see cref="T:AopAlliance.Intercept.IInterceptor"/> is added, it
+            will be wrapped in an advice before being added to this list. 
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Aop.Framework.AdvisedSupport._advisorsArray">
+            <summary> 
+            Array updated on changes to the advisors list, which is easier to
+            manipulate internally
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AdvisedSupport._introductions">
+            <summary> 
+            List of introductions. 
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AdvisedSupport._introductionsArray">
+            <summary> 
+            Array updated on changes to the advisors list, which is easier to
+            manipulate internally
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AdvisedSupport.interfaceMap">
+            <summary>
+            Interface map specifying which object should interface methods be
+            delegated to.
+            </summary>
+            <remarks>
+            <p>
+            If entry value is <cref lang="null"/> methods should be delegated
+            to the target object.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Aop.Framework.AdvisedSupport.m_targetSource">
+            <summary>
+            The <see cref="T:Spring.Aop.ITargetSource"/> for this instance.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AdvisedSupport.isActive">
+            <summary>
+            Set to <see langword="true"/> when the first AOP proxy has been
+            created, meaning that we must track advice changes via the
+            OnAdviceChange() callback.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AdvisedSupport.listeners">
+            <summary>
+            The list of <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> event listeners.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AdvisedSupport.advisorChainFactory">
+            <summary>
+            The advisor chain factory.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> class using the
+            default advisor chain factory.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.#ctor(System.Type[])">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> class.
+            </summary>
+            <param name="interfaces">The interfaces that are to be proxied.</param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this 
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.IsInterfaceProxied(System.Type)">
+            <summary>
+            Is the supplied <paramref name="intf"/> (interface)
+            <see cref="T:System.Type"/> proxied?
+            </summary>
+            <param name="intf">
+            The interface <see cref="T:System.Type"/> to test.
+            </param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="intf"/>
+            (interface) <see cref="T:System.Type"/> is proxied;
+            <see langword="false"/> if not or the supplied
+            <paramref name="intf"/> is <cref lang="null"/>.
+            </returns>
+            <seealso cref="M:Spring.Aop.Framework.IAdvised.IsInterfaceProxied(System.Type)"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.AddAdvice(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Adds the supplied <paramref name="advice"/> to the end (or tail)
+            of the advice (interceptor) chain.
+            </summary>
+            <param name="advice">
+            The <see cref="T:AopAlliance.Aop.IAdvice"/> to be added.
+            </param>
+            <seealso cref="T:Spring.Aop.Support.DefaultPointcutAdvisor"/>
+            <seealso cref="M:Spring.Aop.Framework.IAdvised.AddAdvice(System.Int32,AopAlliance.Aop.IAdvice)"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.AddAdvice(System.Int32,AopAlliance.Aop.IAdvice)">
+            <summary>
+            Adds the supplied <paramref name="advice"/> to the supplied
+            <paramref name="position"/> in the advice (interceptor) chain.
+            </summary>
+            <param name="position">
+            The zero (0) indexed position (from the head) at which the
+            supplied <paramref name="advice"/> is to be inserted into the
+            advice (interceptor) chain.
+            </param>
+            <param name="advice">
+            The <see cref="T:AopAlliance.Aop.IAdvice"/> to be added.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If the supplied <paramref name="advice"/> is <cref lang="null"/>;
+            or is not an <see cref="T:AopAlliance.Intercept.IMethodInterceptor"/>
+            reference; or if the supplied <paramref name="advice"/> is a
+            <see cref="T:Spring.Aop.IIntroductionInterceptor"/>.
+            </exception>
+            <seealso cref="T:Spring.Aop.Support.DefaultPointcutAdvisor"/>
+            <seealso cref="M:Spring.Aop.Framework.IAdvised.AddAdvice(AopAlliance.Aop.IAdvice)"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.IndexOf(Spring.Aop.IAdvisor)">
+            <summary> 
+            Return the index (0 based) of the supplied
+            <see cref="T:Spring.Aop.IAdvisor"/> in the interceptor
+            (advice) chain for this proxy.
+            </summary>
+            <param name="advisor">
+            The <see cref="T:Spring.Aop.IAdvisor"/> to search for.
+            </param>
+            <returns>
+            The zero (0) based index of this advisor, or -1 if the
+            supplied <paramref name="advisor"/> is not an advisor for this
+            proxy.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.IndexOf(Spring.Aop.IIntroductionAdvisor)">
+            <summary> 
+            Return the index (0 based) of the supplied
+            <see cref="T:Spring.Aop.IIntroductionAdvisor"/> in the introductions
+            for this proxy.
+            </summary>
+            <param name="advisor">
+            The <see cref="T:Spring.Aop.IIntroductionAdvisor"/> to search for.
+            </param>
+            <returns>
+            The zero (0) based index of this advisor, or -1 if the
+            supplied <paramref name="advisor"/> is not an introduction advisor
+            for this proxy.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.RemoveAdvisor(Spring.Aop.IAdvisor)">
+            <summary>
+            Removes the supplied <paramref name="advisor"/> the list of advisors
+            for this proxy.
+            </summary>
+            <param name="advisor">The advisor to remove.</param>
+            <returns>
+            <see langword="true"/> if advisor was found in the list of
+            <see cref="P:Spring.Aop.Framework.AdvisedSupport.Advisors"/> for this
+            proxy and was successfully removed; <see langword="false"/> if not
+            or if the supplied <paramref name="advisor"/> is <cref lang="null"/>.
+            </returns>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="advisor"/> cannot be removed.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.RemoveAdvisor(System.Int32)">
+            <summary>
+            Removes the <see cref="T:Spring.Aop.IAdvisor"/> at the supplied
+            <paramref name="index"/> in the
+            <see cref="P:Spring.Aop.Framework.AdvisedSupport.Advisors"/> list
+            from the list of
+            <see cref="P:Spring.Aop.Framework.AdvisedSupport.Advisors"/> for this proxy.
+            </summary>
+            <param name="index">
+            The index of the <see cref="T:Spring.Aop.IAdvisor"/> to remove.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <see cref="T:Spring.Aop.IAdvisor"/> at the supplied <paramref name="index"/>
+            cannot be removed; or if the supplied <paramref name="index"/> is out of
+            range.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.RemoveAdvice(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Removes the supplied <paramref name="advice"/> from the list
+            of <see cref="P:Spring.Aop.Framework.IAdvised.Advisors"/>.
+            </summary>
+            <param name="advice">
+            The <see cref="T:AopAlliance.Aop.IAdvice"/> to remove.
+            </param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="advice"/> was
+            found in the list of <see cref="P:Spring.Aop.Framework.IAdvised.Advisors"/>
+            and successfully removed.
+            </returns>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <see cref="T:AopAlliance.Aop.IAdvice"/> cannot be removed.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.RemoveIntroduction(Spring.Aop.IIntroductionAdvisor)">
+            <summary>
+            Removes the supplied <paramref name="introduction"/> from the list
+            of <see cref="P:Spring.Aop.Framework.AdvisedSupport.Introductions"/>.
+            </summary>
+            <param name="introduction">
+            The <see cref="T:Spring.Aop.IIntroductionAdvisor"/> to remove.
+            </param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="introduction"/> was
+            found in the list of <see cref="P:Spring.Aop.Framework.AdvisedSupport.Introductions"/>
+            and successfully removed.
+            </returns>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <see cref="T:Spring.Aop.IIntroductionAdvisor"/> cannot be removed.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.RemoveIntroduction(System.Int32)">
+            <summary>
+            Removes the <see cref="T:Spring.Aop.IIntroductionAdvisor"/> at the supplied
+            <paramref name="index"/> in the list of
+            <see cref="P:Spring.Aop.Framework.AdvisedSupport.Introductions"/> for this proxy.
+            </summary>
+            <param name="index">The index of the advisor to remove.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <see cref="T:Spring.Aop.IIntroductionAdvisor"/> at the supplied
+            <paramref name="index"/> cannot be removed; or if the supplied
+            <paramref name="index"/> is out of range.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.AddAdvisor(System.Int32,Spring.Aop.IAdvisor)">
+            <summary>
+            Adds the supplied <paramref name="advisor"/> to the list
+            of <see cref="P:Spring.Aop.Framework.AdvisedSupport.Advisors"/>.
+            </summary>
+            <param name="index">
+            The index in the <see cref="P:Spring.Aop.Framework.AdvisedSupport.Advisors"/>
+            list at which the supplied <paramref name="advisor"/>
+            is to be inserted. If -1, appends to the end of the list.
+            </param>
+            <param name="advisor">
+            The <see cref="T:Spring.Aop.IIntroductionAdvisor"/> to add.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="advisor"/> cannot be added.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.AddAdvisor(Spring.Aop.IAdvisor)">
+            <summary>
+            Adds the supplied <paramref name="advisor"/> to the list
+            of <see cref="P:Spring.Aop.Framework.AdvisedSupport.Advisors"/>.
+            </summary>
+            <param name="advisor">
+            The <see cref="T:Spring.Aop.IAdvisor"/> to add.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="advisor"/> cannot be added.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.AddAdvisors(Spring.Aop.IAdvisors)">
+            <summary>
+            Adds the advisors from the supplied <paramref name="advisors"/> 
+            to the list of <see cref="P:Spring.Aop.Framework.IAdvised.Advisors"/>.
+            </summary>
+            <param name="advisors">
+            The <see cref="T:Spring.Aop.IAdvisors"/> to add advisors from.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="advisors"/> cannot be added.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.AddIntroduction(System.Int32,Spring.Aop.IIntroductionAdvisor)">
+            <summary>
+            Adds the supplied <paramref name="introductionAdvisor"/> to the list
+            of <see cref="P:Spring.Aop.Framework.AdvisedSupport.Introductions"/>.
+            </summary>
+            <param name="index">
+            The index in the <see cref="P:Spring.Aop.Framework.AdvisedSupport.Introductions"/>
+            list at which the supplied <paramref name="introductionAdvisor"/>
+            is to be inserted.
+            </param>
+            <param name="introductionAdvisor">
+            The <see cref="T:Spring.Aop.IIntroductionAdvisor"/> to add.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="introductionAdvisor"/> cannot be added.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.AddIntroduction(Spring.Aop.IIntroductionAdvisor)">
+            <summary>
+            Adds the supplied <paramref name="introductionAdvisor"/> to the list
+            of <see cref="P:Spring.Aop.Framework.AdvisedSupport.Introductions"/>.
+            </summary>
+            <param name="introductionAdvisor">
+            The <see cref="T:Spring.Aop.IIntroductionAdvisor"/> to add.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="introductionAdvisor"/> cannot be added.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.ReplaceIntroduction(System.Int32,Spring.Aop.IIntroductionAdvisor)">
+            <summary>
+            Replaces the <see cref="T:Spring.Aop.IIntroductionAdvisor"/> that
+            exists at the supplied <paramref name="index"/> in the list of
+            <see cref="P:Spring.Aop.Framework.AdvisedSupport.Introductions"/>
+            with the supplied <paramref name="introduction"/>.
+            </summary>
+            <param name="index">
+            The index of the <see cref="T:Spring.Aop.IIntroductionAdvisor"/>
+            in the list of
+            <see cref="P:Spring.Aop.Framework.AdvisedSupport.Introductions"/>
+            that is to be replaced.
+            </param>
+            <param name="introduction">
+            The new (replacement) <see cref="T:Spring.Aop.IIntroductionAdvisor"/>.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If the supplied <paramref name="index"/> is out of range.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.ReplaceAdvisor(Spring.Aop.IAdvisor,Spring.Aop.IAdvisor)">
+            <summary> 
+            Replaces the <paramref name="oldAdvisor"/> with the
+            <paramref name="newAdvisor"/>.
+            </summary>
+            <param name="oldAdvisor">
+            The original (old) advisor to be replaced.
+            </param>
+            <param name="newAdvisor">
+            The new advisor to replace the <paramref name="oldAdvisor"/> with.
+            </param>
+            <returns>
+            <see langword="true"/> if the <paramref name="oldAdvisor"/> was
+            replaced; if the <paramref name="oldAdvisor"/> was not found in the
+            advisors collection (or the <paramref name="newAdvisor"/> is
+            <see lang="null"/>, this method returns <see langword="false"/>
+            and (effectively) does nothing.
+            </returns>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <paramref name="oldAdvisor"/> cannot be replaced.
+            </exception>
+            <seealso cref="P:Spring.Aop.Framework.ProxyConfig.IsFrozen"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.ToProxyConfigString">
+            <summary>
+            As <see cref="M:System.Object.ToString"/> will normally be passed straight through
+            to the advised target, this method returns the <see cref="M:System.Object.ToString"/>
+            equivalent for the AOP proxy itself.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> description of the proxy configuration.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.AddListener(Spring.Aop.Framework.IAdvisedSupportListener)">
+            <summary>
+            Registers the supplied <paramref name="listener"/> as a listener for
+            <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> notifications.
+            </summary>
+            <param name="listener">
+            The <see cref="T:Spring.Aop.Framework.IAdvisedSupportListener"/> to
+            register.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.RemoveListener(Spring.Aop.Framework.IAdvisedSupportListener)">
+            <summary>
+            Removes the supplied <paramref name="listener"/>.
+            </summary>
+            <param name="listener">
+            The <see cref="T:Spring.Aop.Framework.IAdvisedSupportListener"/> to
+            be removed.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.AddInterface(System.Type)">
+            <summary>
+            Adds a new interface to the list of interfaces that are proxied by this proxy.
+            </summary>
+            <param name="intf">
+            The interface to be proxied by this proxy.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen
+            (<see cref="P:Spring.Aop.Framework.ProxyConfig.IsFrozen"/>);
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="intf"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.AddInterfaceInternal(System.Type)">
+            <summary>
+            Adds a new interface to the list of interfaces that are proxied by this proxy.
+            </summary>
+            <param name="intf">
+            The interface to be proxied by this proxy.
+            </param>
+            <remarks>
+            Access is not synchronized.
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.RemoveInterface(System.Type)">
+            <summary>
+            Removes the supplied (proxied) <paramref name="intf"/>.
+            </summary>
+            <remarks>
+            <p>
+            Does nothing if the supplied (proxied) <paramref name="intf"/>
+            isn't proxied.
+            </p>
+            </remarks>
+            <param name="intf">The interface to remove.</param>
+            <returns>
+            <see langword="true"/> if the interface was removed.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.IndexOf(AopAlliance.Aop.IAdvice)">
+            <summary> 
+            Return the index (0 based) of the supplied
+            <see cref="T:AopAlliance.Aop.IAdvice"/> in the interceptor
+            (advice) chain for this proxy.
+            </summary>
+            <remarks>
+            <p>
+            The return value of this method can be used to index into
+            the <see cref="P:Spring.Aop.Framework.AdvisedSupport.Advisors"/>
+            list.
+            </p>
+            </remarks>
+            <param name="advice">
+            The <see cref="T:AopAlliance.Aop.IAdvice"/> to search for.
+            </param>
+            <returns>
+            The zero (0) based index of this interceptor, or -1 if the
+            supplied <paramref name="advice"/> is not an advice for this
+            proxy.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.IndexOfInternal(AopAlliance.Aop.IAdvice)">
+            <summary> 
+            Return the index (0 based) of the supplied
+            <see cref="T:AopAlliance.Aop.IAdvice"/> in the interceptor
+            (advice) chain for this proxy.
+            </summary>
+            <remarks>
+            <p>Acces is not synchronized</p>
+            <p>
+            The return value of this method can be used to index into
+            the <see cref="P:Spring.Aop.Framework.AdvisedSupport.Advisors"/>
+            list.
+            </p>
+            </remarks>
+            <param name="advice">
+            The <see cref="T:AopAlliance.Aop.IAdvice"/> to search for.
+            </param>
+            <returns>
+            The zero (0) based index of this interceptor, or -1 if the
+            supplied <paramref name="advice"/> is not an advice for this
+            proxy.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.IndexOfInternal(Spring.Aop.IAdvisor)">
+            <summary> 
+            Return the index (0 based) of the supplied
+            <see cref="T:Spring.Aop.IAdvisor"/> in the interceptor
+            (advice) chain for this proxy.
+            </summary>
+            <param name="advisor">
+            The <see cref="T:Spring.Aop.IAdvisor"/> to search for.
+            </param>
+            <returns>
+            The zero (0) based index of this advisor, or -1 if the
+            supplied <paramref name="advisor"/> is not an advisor for this
+            proxy.
+            </returns>
+            <remarks>
+            Access is not synchronized.
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.IndexOfInternal(Spring.Aop.IIntroductionAdvisor)">
+            <summary> 
+            Return the index (0 based) of the supplied
+            <see cref="T:Spring.Aop.IIntroductionAdvisor"/> in the introductions
+            for this proxy.
+            </summary>
+            <param name="advisor">
+            The <see cref="T:Spring.Aop.IIntroductionAdvisor"/> to search for.
+            </param>
+            <returns>
+            The zero (0) based index of this advisor, or -1 if the
+            supplied <paramref name="advisor"/> is not an introduction advisor
+            for this proxy.
+            </returns>
+            <remarks>
+            Access is not synchronized
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.RemoveAdvisorInternal(System.Int32)">
+            <summary>
+            Removes the <see cref="T:Spring.Aop.IAdvisor"/> at the supplied
+            <paramref name="index"/> in the
+            <see cref="P:Spring.Aop.Framework.AdvisedSupport.Advisors"/> list
+            from the list of
+            <see cref="P:Spring.Aop.Framework.AdvisedSupport.Advisors"/> for this proxy.
+            </summary>
+            <param name="index">
+            The index of the <see cref="T:Spring.Aop.IAdvisor"/> to remove.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If this proxy configuration is frozen and the
+            <see cref="T:Spring.Aop.IAdvisor"/> at the supplied <paramref name="index"/>
+            cannot be removed; or if the supplied <paramref name="index"/> is out of
+            range.
+            </exception>
+            <remarks>
+            Does not synchronize access.
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.AdviceIncluded(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Is the supplied <paramref name="advice"/> included in any
+            advisor?
+            </summary>
+            <param name="advice">
+            The <see cref="T:AopAlliance.Aop.IAdvice"/> to check for the
+            inclusion of.
+            </param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="advice"/>
+            could be run in an invocation (this does not imply that said
+            <paramref name="advice"/> will be run).
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.CountAdviceOfType(System.Type)">
+            <summary>
+            Returns a count of all of the <see cref="T:AopAlliance.Aop.IAdvice"/>
+            type-compatible with the supplied <see cref="T:System.Type"/>.
+            </summary>
+            <param name="interceptorType">
+            The <see cref="T:System.Type"/> of the
+            <see cref="T:AopAlliance.Aop.IAdvice"/> to check.
+            </param>
+            <returns>
+            A count of all of the <see cref="T:AopAlliance.Aop.IAdvice"/>
+            type-compatible with the supplied <see cref="T:System.Type"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.DieIfFrozen(System.String)">
+            <summary>
+            Throws an <see cref="T:Spring.Aop.Framework.AopConfigException"/> if
+            this instances proxy configuration data is frozen.
+            </summary>
+            <param name="message">
+            The message that will be passed through to the constructor of any
+            thrown <see cref="T:Spring.Aop.Framework.AopConfigException"/>.
+            </param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If the configuration for this proxy is frozen.
+            </exception>
+            <seealso cref="P:Spring.Aop.Framework.IAdvised.IsFrozen"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.UpdateAdvisorsArray">
+            <summary>
+            Bring the advisors array up to date with the list.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.UpdateIntroductionsArray">
+            <summary>
+            Bring the introductions array up to date with the list.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.InterfacesChanged">
+            <summary>
+            Callback method that is invoked when the list of proxied interfaces
+            has changed.
+            </summary>
+            <remarks>
+            <p>
+            An example of such a change would be when a new introduction is
+            added. Resetting
+            <see cref="P:Spring.Aop.Framework.AdvisedSupport.ProxyType"/> to
+            <cref lang="null"/> will cause a new proxy <see cref="T:System.Type"/>
+            to be generated on the next call to get a proxy.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.InterceptorsChanged">
+            <summary>
+            Callback method that is invoked when the interceptor list has changed.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.Activate">
+            <summary>
+            Activates this instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.CreateAopProxy">
+            <summary> 
+            Creates an AOP proxy using this instance's configuration data.
+            </summary>
+            <remarks>
+            <p>
+            Subclasses must not create a proxy by any other means (at least
+            without having a well thought out and cogent reason for doing so).
+            This is because the implementation of this method performs some
+            required housekeeping logic prior to creating an AOP proxy.
+            </p>
+            </remarks>
+            <seealso cref="M:Spring.Aop.Framework.IAopProxyFactory.CreateAopProxy(Spring.Aop.Framework.AdvisedSupport)"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.CopyConfigurationFrom(Spring.Aop.Framework.AdvisedSupport)">
+            <summary>
+            Copies the configuration from the supplied other
+            <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> into this instance.
+            </summary>
+            <remarks>
+            <p>
+            Useful when this instance has been created using the no-argument
+            constructor, and needs to get all of its confiuration data from
+            another <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> (most
+            usually to have an independant copy of said configuration data).
+            </p>
+            </remarks>
+            <param name="other">
+            The <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> instance
+            containing the configiration data that is to be copied into this
+            instance.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.Framework.ProxyConfig"/> configuration.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.Framework.ProxyConfig"/> configuration.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.ToStringInternal">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.Framework.ProxyConfig"/> configuration.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.Framework.ProxyConfig"/> configuration.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.InterfacesToString(System.Text.StringBuilder)">
+            <summary>
+            Helper method that adds the names of all of the proxied interfaces
+            to the buffer of the supplied <see cref="T:System.Text.StringBuilder"/>.
+            </summary>
+            <param name="buffer">
+            The <see cref="T:System.Text.StringBuilder"/> to append the proxied interface
+            names to.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.AdvisorsToString(System.Text.StringBuilder)">
+            <summary>
+            Helper method that adds advisor's <see cref="M:System.Object.ToString"/>
+            to the buffer of the supplied <see cref="T:System.Text.StringBuilder"/>.
+            </summary>
+            <param name="buffer">
+            The <see cref="T:System.Text.StringBuilder"/> to append the advisor details to.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisedSupport.GetInterfaces(System.Object)">
+            <summary>
+            Gets all of the interfaces implemented by the
+            <see cref="T:System.Type"/> of the supplied
+            <paramref name="target"/>.
+            </summary>
+            <param name="target">
+            The object to get the interfaces of.
+            </param>
+            <returns>
+            All of the interfaces implemented by the
+            <see cref="T:System.Type"/> of the supplied
+            <paramref name="target"/>.
+            </returns>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If the supplied <paramref name="target"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="P:Spring.Aop.Framework.AdvisedSupport.AdvisorChainFactory">
+            <summary>
+            Gets and sets the
+            <see cref="T:Spring.Aop.Framework.IAdvisorChainFactory"/>
+            implementation that will be used to get the interceptor
+            chains for the advised
+            <see cref="P:Spring.Aop.Framework.AdvisedSupport.Target"/>.
+            </summary>
+            <value>
+            The <see cref="T:Spring.Aop.Framework.IAdvisorChainFactory"/>
+            implementation that will be used to get the interceptor
+            chains for the advised
+            <see cref="P:Spring.Aop.Framework.AdvisedSupport.Target"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.AdvisedSupport.TargetSource">
+            <summary>
+            Returns the current <see cref="T:Spring.Aop.ITargetSource"/> used
+            by this <see cref="T:Spring.Aop.Framework.IAdvised"/> object.
+            </summary>
+            <value>
+            The <see cref="T:Spring.Aop.ITargetSource"/> used by this
+            <see cref="T:Spring.Aop.Framework.IAdvised"/> object.
+            </value>
+            <see cref="P:Spring.Aop.Framework.IAdvised.TargetSource"/>
+        </member>
+        <member name="P:Spring.Aop.Framework.AdvisedSupport.IsSerializable">
+            <summary>
+            Returns a boolean specifying if this <see cref="T:Spring.Aop.Framework.IAdvised"/>
+            instance can be serialized.
+            </summary>
+            <value>
+            <c>true</c> if this instance can be serialized, <c>false</c> otherwise.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.AdvisedSupport.Interfaces">
+            <summary>
+            Returns the collection of interface <see cref="T:System.Type"/>s
+            to be (or that are being) proxied by this proxy.
+            </summary>
+            <value>
+            The collection of interface <see cref="T:System.Type"/>s
+            to be (or that are being) proxied by this proxy.
+            </value>
+            <seealso cref="P:Spring.Aop.Framework.IAdvised.Interfaces"/>
+        </member>
+        <member name="P:Spring.Aop.Framework.AdvisedSupport.InterfaceMap">
+            <summary>
+            Returns the mapping of the proxied interface
+            <see cref="T:System.Type"/>s to their delegates.
+            </summary>
+            <value>
+            The mapping of the proxied interface
+            <see cref="T:System.Type"/>s to their delegates.
+            </value>
+            <seealso cref="P:Spring.Aop.Framework.IAdvised.InterfaceMap"/>
+        </member>
+        <member name="P:Spring.Aop.Framework.AdvisedSupport.Advisors">
+            <summary>
+            Returns the collection of <see cref="T:Spring.Aop.IAdvisor"/>
+            instances that have been applied to this proxy.
+            </summary>
+            <value>
+            The collection of <see cref="T:Spring.Aop.IAdvisor"/>
+            instances that have been applied to this proxy.
+            </value>
+            <seealso cref="P:Spring.Aop.Framework.IAdvised.Advisors"/>
+        </member>
+        <member name="P:Spring.Aop.Framework.AdvisedSupport.Introductions">
+            <summary>
+            Returns the collection of <see cref="T:Spring.Aop.IIntroductionAdvisor"/>
+            instances that have been applied to this proxy.
+            </summary>
+            <remarks>
+            <p>
+            Will never return <cref lang="null"/>, but may return an
+            empty array (in the case where no
+            <see cref="T:Spring.Aop.IIntroductionAdvisor"/> instances have been
+            applied to this proxy).
+            </p>
+            </remarks>
+            <value>
+            The collection of <see cref="T:Spring.Aop.IIntroductionAdvisor"/>
+            instances that have been applied to this proxy.
+            </value>
+            <seealso cref="P:Spring.Aop.Framework.IAdvised.Introductions"/>
+        </member>
+        <member name="P:Spring.Aop.Framework.AdvisedSupport.TargetType">
+            <summary>
+            Gets the target type behind the implementing object.
+            Ttypically a proxy configuration or an actual proxy.
+            </summary>
+            <value>The type of the target or null if not known.</value>
+        </member>
+        <member name="P:Spring.Aop.Framework.AdvisedSupport.Target">
+            <summary>
+            Sets the target object that is to be advised.
+            </summary>
+            <remarks>
+            <p>
+            This is a convenience write-only property that allows client code
+            to set the target object... the target object will be implicitly
+            wrapped within a new
+            <see cref="T:Spring.Aop.Target.SingletonTargetSource"/> instance.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.AdvisedSupport.IsActive">
+            <summary>
+            Called by subclasses to get a value indicating whether any AOP proxies have been created yet.
+            </summary>
+            <value><c>true</c> if this AOp proxies have been created; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Aop.Framework.AdvisedSupport.ProxyType">
+            <summary>
+            Specifies the <see cref="T:System.Type"/> of proxies that are to be
+            created for this instance of proxy config.
+            </summary>
+            <remarks>
+            <p>
+            If this property value is <cref lang="null"/> it simply means that
+            no proxies have been created yet. Only when the first proxy is
+            created will this property value be set by the AOP framework.
+            </p>
+            <p>
+            Users will be able to add interceptors dynamically without proxy
+            regeneration, but if they add introductions the proxy
+            <see cref="T:System.Type"/> will have to be regenerated.
+            </p>
+            </remarks>
+            <value>
+            The <see cref="T:System.Type"/> of proxies that are to be
+            created for this instance of proxy config; <cref lang="null"/> if
+            no proxies have been created yet.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.AdvisedSupport.ProxyConstructor">
+            <summary>
+            Caches proxy constructor for performance reasons.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactory.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Aop.Framework.ProxyFactory"/>
+            class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactory.#ctor(System.Object)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Aop.Framework.ProxyFactory"/>
+            class that proxys all of the interfaces exposed by the supplied
+            <paramref name="target"/>.
+            </summary>
+            <param name="target">The object to proxy.</param>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If the <paramref name="target"/> is <cref lang="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactory.#ctor(System.Type[])">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Aop.Framework.ProxyFactory"/>
+            class that has no target object, only interfaces.
+            </summary>
+            <remarks>
+            <p>
+            Interceptors must be added if this factory is to do anything useful.
+            </p>
+            </remarks>
+            <param name="interfaces">The interfaces to implement.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactory.GetProxy">
+            <summary>
+            Creates a new proxy according to the settings in this factory.
+            </summary>
+            <remarks>
+            <p>
+            Can be called repeatedly; the effect of repeated invocations will
+            (of course) vary if interfaces have been added or removed.
+            </p>
+            </remarks>
+            <returns>An AOP proxy for target object.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactory.GetProxy(System.Type,AopAlliance.Intercept.IInterceptor)">
+            <summary>
+            Creates a new proxy for the supplied <paramref name="proxyInterface"/>
+            and <paramref name="interceptor"/>.
+            </summary>
+            <remarks>
+            <p>
+            This is a convenience method for creating a proxy for a single
+            interceptor.
+            </p>
+            </remarks>
+            <param name="proxyInterface">
+            The interface that the proxy must implement.
+            </param>
+            <param name="interceptor">
+            The interceptor that the proxy must invoke.
+            </param>
+            <returns>
+            A new AOP proxy for the supplied <paramref name="proxyInterface"/>
+            and <paramref name="interceptor"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher">
+            <summary> Internal framework class.
+            This class is required because if we put an interceptor that implements IInterceptionAdvice
+            in the interceptor list passed to MethodInvocation, it may be mistaken for an
+            advice that requires dynamic method matching.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.Net)</author>
+            <version>$Id: InterceptorAndDynamicMethodMatcher.cs,v 1.3 2007/03/16 04:01:18 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.IntroductionProxyMethodBuilder">
+            <summary>
+            <see cref="T:Spring.Proxy.IProxyMethodBuilder"/> implementation 
+            that delegates method calls to introduction object.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Bruno Baia</author>
+            <version>$Id: IntroductionProxyMethodBuilder.cs,v 1.5 2006/11/05 20:36:59 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder">
+            <summary>
+            Base class for AOP method builders that contains common functionalities.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Bruno Baia</author>
+            <version>$Id: AbstractAopProxyMethodBuilder.cs,v 1.10 2008/05/21 08:04:34 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.aopProxyGenerator">
+            <summary>
+            The <see cref="T:Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator"/> implementation to use.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.targetMethods">
+            <summary>
+            The dictionary to cache the list of target  
+            <see cref="T:System.Reflection.MethodInfo"/>s.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.onProxyTargetMethods">
+            <summary>
+            The dictionary to cache the list of target  
+            <see cref="T:System.Reflection.MethodInfo"/>s defined on the proxy.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.interceptors">
+            <summary>
+            The local variable to store the list of method interceptors.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.targetType">
+            <summary>
+            The local variable to store the target type being proxied.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.arguments">
+            <summary>
+            The local variable to store method arguments.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.returnValue">
+            <summary>
+            The local variable to store the return value.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.genericTargetMethod">
+            <summary>
+            The local variable to store the closed generic method 
+            when the target method is generic.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.genericOnProxyTargetMethod">
+            <summary>
+            The local variable to store the closed generic method 
+            when the target method defined on the proxy is generic.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.targetMethodCacheField">
+            <summary>
+            The field to cache the target <see cref="T:System.Reflection.MethodInfo"/>.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.onProxyTargetMethodCacheField">
+            <summary>
+            The field to cache the target <see cref="T:System.Reflection.MethodInfo"/> 
+            defined on the proxy.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.methodReturnsValue">
+            <summary>
+            Indicates if the method returns a value.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.#ctor(System.Reflection.Emit.TypeBuilder,Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator,System.Boolean,System.Collections.IDictionary)">
+            <summary>
+            Creates a new instance of the method builder.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="aopProxyGenerator">
+            The <see cref="T:Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator"/> implementation to use.
+            </param>
+            <param name="explicitImplementation">
+            <see langword="true"/> if the interface is to be
+            implemented explicitly; otherwise <see langword="false"/>.
+            </param>
+            <param name="targetMethods">
+            The dictionary to cache the list of target 
+            <see cref="T:System.Reflection.MethodInfo"/>s.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.#ctor(System.Reflection.Emit.TypeBuilder,Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator,System.Boolean,System.Collections.IDictionary,System.Collections.IDictionary)">
+            <summary>
+            Creates a new instance of the method builder.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="aopProxyGenerator">
+            The <see cref="T:Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator"/> implementation to use.
+            </param>
+            <param name="explicitImplementation">
+            <see langword="true"/> if the interface is to be
+            implemented explicitly; otherwise <see langword="false"/>.
+            </param>
+            <param name="targetMethods">
+            The dictionary to cache the list of target 
+            <see cref="T:System.Reflection.MethodInfo"/>s.
+            </param>
+            <param name="onProxyTargetMethods">
+            The dictionary to cache the list of target  
+            <see cref="T:System.Reflection.MethodInfo"/>s defined on the proxy.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.GenerateMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Generates the proxy method.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+            <param name="interfaceMethod">
+            The interface definition of the method, if applicable.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.GenerateMethodCacheFieldId(System.Reflection.MethodInfo)">
+            <summary>
+            Generates unique method id for the cache field.
+            </summary>
+            <param name="method">The target method.</param>
+            <returns>An unique method name.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.GenerateTargetMethodCacheField(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo)">
+            <summary>
+            Create static field that will cache target method.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The target method.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.GenerateOnProxyTargetMethodCacheField(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo)">
+            <summary>
+            Create static field that will cache target method when defined on the proxy.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The target method.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.MakeGenericMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.Emit.FieldBuilder,System.Reflection.Emit.LocalBuilder)">
+            <summary>
+            Create a closed generic method for the current call 
+            if target method is a generic definition.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The target method.</param>
+            <param name="methodCacheField">
+            The field that contains the method generic definition
+            </param>
+            <param name="localMethod">
+            The local variable to store the closed generic method.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.PushTargetType(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the target type on stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.PushAdvisedProxy(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes  
+            the current <see cref="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> 
+            instance on stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.PushTargetMethodInfo(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo)">
+            <summary>
+            Pushes the target <see cref="T:System.Reflection.MethodInfo"/> to stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.PushOnProxyTargetMethodInfo(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo)">
+            <summary>
+            Pushes the target <see cref="T:System.Reflection.MethodInfo"/> defined on the proxy to stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.DeclareLocals(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo)">
+            <summary>
+            Creates local variable declarations.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.BeginMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo)">
+            <summary>
+            Initializes local variables
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.GenerateMethodLogic(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Generates method logic.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+            <param name="interfaceMethod">
+            The interface definition of the method, if applicable.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.CallInvoke(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo)">
+            <summary>
+            Calls method using Invoke
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.SetupMethodArguments(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.ParameterInfo[])">
+            <summary>
+            Setup proxied method arguments.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+            <param name="parameters">The method's parameters.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.CallDirectProxiedMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Calls proxied method directly.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+            <param name="interfaceMethod">
+            The interface definition of the method, if applicable.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.EndMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo)">
+            <summary>
+            Ends method by returning return value if appropriate.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.EmitLoadValueIndirect(System.Reflection.Emit.ILGenerator,System.Type)">
+            <summary>
+            Emits MSIL instructions to load a value of the specified <paramref name="type"/> 
+            onto the evaluation stack indirectly.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="type">The type of the value.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.EmitStoreValueIndirect(System.Reflection.Emit.ILGenerator,System.Type)">
+            <summary>
+            Emit MSIL instructions to store a value of the specified <paramref name="type"/> 
+            at a supplied address.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="type">The type of the value.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyMethodBuilder.EmitUnboxIfNeeded(System.Reflection.Emit.ILGenerator,System.Type)">
+            <summary>
+            Emits MSIL instructions to convert the boxed representation 
+            of the supplied <paramref name="type"/> to its unboxed form.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="type">The type specified in the instruction.</param>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.IntroductionProxyMethodBuilder.index">
+            <summary>
+            The index of the introduction to delegate call to.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.IntroductionProxyMethodBuilder.#ctor(System.Reflection.Emit.TypeBuilder,Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator,System.Collections.IDictionary,System.Int32)">
+            <summary>
+            Creates a new instance of the method builder.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="aopProxyGenerator">
+            The <see cref="T:Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator"/> implementation to use.
+            </param>
+            <param name="targetMethods">
+            
+            </param>
+            <param name="index">index of the introduction to delegate call to</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.IntroductionProxyMethodBuilder.PushTargetType(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the introduction type on stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.IntroductionProxyMethodBuilder.PushTarget(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the introduction instance on stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.IntroductionProxyMethodBuilder.CallDirectProxiedMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Calls proxied method directly.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+            <param name="interfaceMethod">
+            The interface definition of the method, if applicable.
+            </param>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.BeforeAdviceAdapter">
+            <summary>
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> implementation
+            to enable <see cref="T:Spring.Aop.IMethodBeforeAdvice"/> to be used in the
+            Spring.NET AOP framework.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: BeforeAdviceAdapter.cs,v 1.4 2007/03/16 04:01:21 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter">
+            <summary>
+            Permits the handling of new advisors and advice types as extensions to
+            the Spring AOP framework.
+            </summary>
+            <remarks>
+            <p>
+            Implementors can create AOP Alliance
+            <see cref="T:AopAlliance.Intercept.IInterceptor"/>s from custom advice
+            types, enabling these advice types to be used in the Spring.NET AOP
+            framework, which uses interception under the covers.
+            </p>
+            <p>
+            There is no need for most Spring.NET users to implement this interface;
+            do so only if you need to introduce more
+            <see cref="T:Spring.Aop.IAdvisor"/> or <see cref="T:AopAlliance.Aop.IAdvice"/>
+            types to Spring.NET.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IAdvisorAdapter.cs,v 1.4 2006/04/09 07:18:35 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.IAdvisorAdapter.SupportsAdvice(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Does this adapter understand the supplied <paramref name="advice"/>?
+            </summary>
+            <remarks>
+            <p>
+            Is it valid to invoke the
+            <see cref="M:Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry.Wrap(System.Object)"/>
+            method with the given advice as an argument?
+            </p>
+            </remarks>
+            <param name="advice">
+            <see cref="T:AopAlliance.Aop.IAdvice"/> such as
+            <see cref="T:Spring.Aop.IBeforeAdvice"/>.
+            </param>
+            <returns><see langword="true"/> if this adapter understands the
+            supplied <paramref name="advice"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.IAdvisorAdapter.GetInterceptor(Spring.Aop.IAdvisor)">
+            <summary>
+            Return an AOP Alliance
+            <see cref="T:AopAlliance.Intercept.IInterceptor"/> exposing the
+            behaviour of the given advice to an interception-based AOP
+            framework.
+            </summary>
+            <remarks>
+            <p>
+            Don't worry about any <see cref="T:Spring.Aop.IPointcut"/>
+            contained in the supplied <see cref="T:Spring.Aop.IAdvisor"/>;
+            the AOP framework will take care of checking the pointcut.
+            </p>
+            </remarks>
+            <param name="advisor">
+            The advice. The
+            <see cref="M:Spring.Aop.Framework.Adapter.IAdvisorAdapter.SupportsAdvice(AopAlliance.Aop.IAdvice)"/>
+            method must have previously returned <see langword="true"/> on the
+            supplied <paramref name="advisor"/>.
+            </param>
+            <returns>
+            An AOP Alliance
+            <see cref="T:AopAlliance.Intercept.IInterceptor"/> exposing the
+            behaviour of the given advice to an interception-based AOP
+            framework.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.BeforeAdviceAdapter.SupportsAdvice(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Returns <see langword="true"/> if the supplied
+            <paramref name="advice"/> is an instance of the
+            <see cref="T:Spring.Aop.IMethodBeforeAdvice"/> interface.
+            </summary>
+            <param name="advice">The advice to check.</param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="advice"/> is
+            an instance of the <see cref="T:Spring.Aop.IMethodBeforeAdvice"/> interface;
+            <see langword="false"/> if not or if the supplied
+            <paramref name="advice"/> is <cref lang="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.BeforeAdviceAdapter.GetInterceptor(Spring.Aop.IAdvisor)">
+            <summary>
+            Wraps the supplied <paramref name="advisor"/>'s
+            <see cref="P:Spring.Aop.IAdvisor.Advice"/> within a
+            <see cref="T:Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor"/>
+            instance.
+            </summary>
+            <param name="advisor">
+            The advisor exposing the <see cref="T:AopAlliance.Aop.IAdvice"/> that
+            is to be wrapped.
+            </param>
+            <returns>
+            The supplied <paramref name="advisor"/>'s
+            <see cref="P:Spring.Aop.IAdvisor.Advice"/> wrapped within a
+            <see cref="T:Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor"/>
+            instance.
+            </returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.AfterReturningAdviceInterceptor">
+            <summary>
+            Interceptor to wrap an <see cref="T:Spring.Aop.IAfterReturningAdvice"/>
+            instance.
+            </summary>
+            <remarks>
+            <p>
+            A more efficient alternative solution in cases where there is no
+            interception advice and therefore no need to create an
+            <see cref="T:AopAlliance.Intercept.IMethodInvocation"/> object may be
+            offered in future.
+            </p>
+            <p>
+            Used internally by the AOP framework: application developers should not need
+            to use this class directly.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: AfterReturningAdviceInterceptor.cs,v 1.8 2007/03/16 04:01:21 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.AfterReturningAdviceInterceptor.#ctor(Spring.Aop.IAfterReturningAdvice)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.Adapter.AfterReturningAdviceInterceptor"/>
+            class.
+            </summary>
+            <param name="advice">
+            The advice to be applied after a target method successfully
+            returns.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="advice"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.AfterReturningAdviceInterceptor.Invoke(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Executes interceptor after the target method successfully returns.
+            </summary>
+            <param name="invocation">
+            The method invocation that is being intercepted.
+            </param>
+            <returns>
+            The result of the call to the
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+            the supplied <paramref name="invocation"/>; this return value may
+            well have been intercepted by the interceptor.
+            </returns>
+            <exception cref="T:System.Exception">
+            If any of the interceptors in the chain or the target object itself
+            throws an exception.
+            </exception>
+        </member>
+        <member name="T:Spring.Aspects.IExceptionHandler">
+            <summary>
+            Handles a thrown exception providing calling context.
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: IExceptionHandler.cs,v 1.1 2007/10/08 22:05:16 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.IExceptionHandler.CanHandleException(System.Exception,System.Collections.IDictionary)">
+            <summary>
+            Determines whether this instance can handle the exception the specified exception.
+            </summary>
+            <param name="ex">The exception.</param>
+            <param name="callContextDictionary">The call context dictionary.</param>
+            <returns>
+            	<c>true</c> if this instance can handle the specified exception; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aspects.IExceptionHandler.HandleException(System.Collections.IDictionary)">
+            <summary>
+            Handles the exception.
+            </summary>
+            <param name="callContextDictionary">The call context dictionary.</param>
+            <returns>
+            The return value from handling the exception, if not rethrown or a new exception is thrown.
+            </returns>
+        </member>
+        <member name="P:Spring.Aspects.IExceptionHandler.SourceExceptionNames">
+            <summary>
+            Gets the source exception names.
+            </summary>
+            <value>The source exception names.</value>
+        </member>
+        <member name="P:Spring.Aspects.IExceptionHandler.SourceExceptionTypes">
+            <summary>
+            Gets the source exception types.
+            </summary>
+            <value>The source exception types.</value>
+        </member>
+        <member name="P:Spring.Aspects.IExceptionHandler.ActionExpressionText">
+            <summary>
+            Gets the translation expression text
+            </summary>
+            <value>The translation expression text</value>
+        </member>
+        <member name="P:Spring.Aspects.IExceptionHandler.ConstraintExpressionText">
+            <summary>
+            Gets or sets the constraint expression text.
+            </summary>
+            <value>The constraint expression text.</value>
+        </member>
+        <member name="P:Spring.Aspects.IExceptionHandler.ContinueProcessing">
+            <summary>
+            Gets a value indicating whether to continue processing.
+            </summary>
+            <value><c>true</c> if continue processing; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="T:Spring.Aop.Support.UnionPointcut">
+            <summary> 
+            A <see cref="T:Spring.Aop.IPointcut"/> union.
+            </summary>
+            <remarks>
+            <p>
+            Such pointcut unions are tricky, because one cannot simply <c>OR</c>
+            the respective <see cref="T:Spring.Aop.IMethodMatcher"/>s: one has to
+            ascertain that each <see cref="T:Spring.Aop.IMethodMatcher"/>'s
+            <see cref="P:Spring.Aop.IPointcut.TypeFilter"/> is also satisfied.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: UnionPointcut.cs,v 1.8 2007/03/16 04:01:25 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.IPointcut">
+            <summary>
+            Spring.NET's core pointcut abstraction.
+            </summary>
+            <remarks>
+            <p>
+            A pointcut is composed of <see cref="T:Spring.Aop.ITypeFilter"/>s and
+            <see cref="T:Spring.Aop.IMethodMatcher"/>s. Both these basic terms and an
+            <see cref="T:Spring.Aop.IPointcut"/> itself can be combined to build up
+            sophisticated combinations.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IPointcut.cs,v 1.9 2006/04/09 07:18:36 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Aop.IPointcut.TypeFilter">
+            <summary>
+            The <see cref="T:Spring.Aop.ITypeFilter"/> for this pointcut.
+            </summary>
+            <value>
+            The current <see cref="T:Spring.Aop.ITypeFilter"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.IPointcut.MethodMatcher">
+            <summary>
+            The <see cref="T:Spring.Aop.IMethodMatcher"/> for this pointcut.
+            </summary>
+            <value>
+            The current <see cref="T:Spring.Aop.IMethodMatcher"/>.
+            </value>
+        </member>
+        <member name="M:Spring.Aop.Support.UnionPointcut.#ctor(Spring.Aop.IPointcut,Spring.Aop.IPointcut)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.UnionPointcut"/> class.
+            </summary>
+            <param name="firstPointcut">The first pointcut.</param>
+            <param name="secondPointcut">The second pointcut.</param>
+        </member>
+        <member name="P:Spring.Aop.Support.UnionPointcut.TypeFilter">
+            <summary>
+            The <see cref="T:Spring.Aop.ITypeFilter"/> for this pointcut.
+            </summary>
+            <value>
+            The current <see cref="T:Spring.Aop.ITypeFilter"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Support.UnionPointcut.MethodMatcher">
+            <summary>
+            The <see cref="T:Spring.Aop.IMethodMatcher"/> for this pointcut.
+            </summary>
+            <value>
+            The current <see cref="T:Spring.Aop.IMethodMatcher"/>.
+            </value>
+        </member>
+        <member name="T:Spring.Aop.Support.UnionPointcut.PointcutUnionMethodMatcher">
+            <summary>
+            Internal method matcher class for union pointcut.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.IMethodMatcher">
+            <summary>
+            That part of an <see cref="T:Spring.Aop.IPointcut"/> that checks whether a
+            target method is eligible for advice.
+            </summary>
+            <remarks>
+            <p>
+            An <see cref="T:Spring.Aop.IMethodMatcher"/> may be evaluated
+            <b>statically</b> or at runtime (<b>dynamically</b>). Static
+            matching involves only the method signature and (possibly) any
+            <see cref="T:System.Attribute"/>s that have been applied to a method.
+            Dynamic matching additionally takes into account the actual argument
+            values passed to a method invocation.
+            </p>
+            <p>
+            If the value of the <see cref="P:Spring.Aop.IMethodMatcher.IsRuntime"/>
+            property of an implementation instance returns <see langword="false"/>,
+            evaluation can be performed statically, and the result will be the same
+            for all invocations of this method, whatever their arguments. This
+            means that if the value of the
+            <see cref="P:Spring.Aop.IMethodMatcher.IsRuntime"/> is
+            <see langword="false"/>, the three argument
+            <see cref="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type,System.Object[])"/>
+            method will never be invoked for the lifetime of the
+            <see cref="T:Spring.Aop.IMethodMatcher"/>.
+            </p>
+            <p>
+            If an implementation returns <see langword="true"/> in its two argument
+            <see cref="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type)"/>
+            method, and the value of it's
+            <see cref="P:Spring.Aop.IMethodMatcher.IsRuntime"/> property is
+            <see langword="true"/>, the three argument
+            <see cref="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type,System.Object[])"/>
+            method will be invoked <i>immediately before each and every potential
+            execution of the related advice</i>, to decide whether the advice
+            should run. All previous advice, such as earlier interceptors in an
+            interceptor chain, will have run, so any state changes they have
+            produced in parameters or thread local storage, will be available at
+            the time of evaluation.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IMethodMatcher.cs,v 1.9 2006/04/09 07:18:36 markpollack Exp $</version>
+            <seealso cref="T:Spring.Aop.TrueMethodMatcher"/>
+        </member>
+        <member name="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Does the supplied <paramref name="method"/> satisfy this matcher?
+            </summary>
+            <remarks>
+            <p>
+            This is a static check. If this method invocation returns
+            <see langword="false"/>,or if the
+            <see cref="P:Spring.Aop.IMethodMatcher.IsRuntime"/> property is
+            <see langword="false"/>, then no runtime check will be made.
+            </p>
+            </remarks>
+            <param name="method">The candidate method.</param>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/> (may be <see langword="null"/>,
+            in which case the candidate <see cref="T:System.Type"/> must be taken
+            to be the <paramref name="method"/>'s declaring class).
+            </param>
+            <returns>
+            <see langword="true"/> if this this method matches statically.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type,System.Object[])">
+            <summary>
+            Is there a runtime (dynamic) match for the supplied
+            <paramref name="method"/>?
+            </summary>
+            <remarks>
+            <p>
+            In order for this method to have even been invoked, the supplied
+            <paramref name="method"/> must have matched
+            statically. This method is invoked only if the two argument
+            <see cref="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type)"/>
+            method returns <see langword="true"/> for the supplied
+            <paramref name="method"/> and <paramref name="targetType"/>, and
+            if the <see cref="P:Spring.Aop.IMethodMatcher.IsRuntime"/> property
+            is <see langword="true"/>.
+            </p>
+            <p>
+            Invoked immediately <b>before</b> any potential running of the
+            advice, and <b>after</b> any advice earlier in the advice chain has
+            run.
+            </p>
+            </remarks>
+            <param name="method">The candidate method.</param>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/>.
+            </param>
+            <param name="args">The arguments to the method</param>
+            <returns>
+            <see langword="true"/> if there is a runtime match.</returns>
+        </member>
+        <member name="P:Spring.Aop.IMethodMatcher.IsRuntime">
+            <summary>
+            Is this <see cref="T:Spring.Aop.IMethodMatcher"/> dynamic?
+            </summary>
+            <remarks>
+            <p>
+            If <see langword="true"/>, the three argument
+            <see cref="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type,System.Object[])"/>
+            method will be invoked if the two argument
+            <see cref="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type)"/>
+            method returns <see langword="true"/>.
+            </p>
+            <p>
+            Note that this property can be checked when an AOP proxy is created,
+            and implementations need not check the value of this property again
+            before each method invocation.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if this
+            <see cref="T:Spring.Aop.IMethodMatcher"/> is dynamic.
+            </value>
+        </member>
+        <member name="T:Spring.Aop.Framework.AopContext">
+            <summary>
+            This class contains various <see langword="static"/> methods used to
+            obtain information about the current AOP invocation.
+            </summary>
+            <remarks>
+            <p>
+            The <see langword="static"/>
+            <see cref="P:Spring.Aop.Framework.AopContext.CurrentProxy"/> property is
+            usable if the AOP framework is configured to expose the current proxy
+            (not the default)... it returns the AOP proxy in use. Target objects or
+            advice can use this to make advised calls. They can also use it to find
+            advice configuration.
+            </p>
+            <note>
+            The AOP framework does not expose proxies by default, as there is a
+            performance cost in doing so.
+            </note>
+            <p>
+            The functionality in this class might be used by a target object that
+            needed access to resources on the invocation. However, this approach
+            should not be used when there is a reasonable alternative, as it makes
+            application code dependent on usage under AOP and the Spring.NET AOP
+            framework.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: AopContext.cs,v 1.7 2006/09/15 21:25:16 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopContext.PushProxy(System.Object)">
+            <summary>
+            Sets the current proxy by pushing it to the proxy stack. 
+            </summary>
+            <remarks>
+            <p>
+            This method is for internal use only, and should never be called by
+            client code.
+            </p>
+            </remarks>
+            <param name="proxy">
+            The proxy to put on top of the proxy stack.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopContext.PopProxy">
+            <summary>
+            Removes the current proxy from the proxy stack, making the previous
+            proxy (if any) the current proxy.
+            </summary>
+            <remarks>
+            <p>
+            This method is for internal use only, and should never be called by
+            client code.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If the proxy stack is empty.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopContext.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.AopContext"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.AopContext.ProxyStack">
+            <summary>
+            The AOP proxy associated with this thread.
+            </summary>
+            <remarks>
+            <p>
+            Will be <cref lang="null"/> unless the
+            <see cref="P:Spring.Aop.Framework.ProxyConfig.ExposeProxy"/> property
+            on the controlling proxy has been set to <see langword="true"/>.
+            </p>
+            <p>
+            The default value for the 
+            <see cref="P:Spring.Aop.Framework.ProxyConfig.ExposeProxy"/> property
+            is <see langword="false"/>, for performance reasons.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.AopContext.CurrentProxy">
+            <summary>
+            Gets the current AOP proxy.
+            </summary>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If the proxy stack is empty.
+            </exception>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry">
+            <summary>
+            A registry of
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> instances.
+            </summary>
+            <remarks>
+            <p>
+            Implementations <b>must</b> also automatically register adapters for
+            <see cref="T:AopAlliance.Intercept.IInterceptor"/> types.
+            </p>
+            <note>
+            This is an SPI interface, that should not need to be implemented by any
+            Spring.NET user.
+            </note>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IAdvisorAdapterRegistry.cs,v 1.3 2006/04/09 07:18:35 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry.Wrap(System.Object)">
+            <summary>
+            Returns an <see cref="T:Spring.Aop.IAdvisor"/> wrapping the supplied
+            <paramref name="advice"/>.
+            </summary>
+            <param name="advice">
+            The object that should be an advice, such as
+            <see cref="T:Spring.Aop.IBeforeAdvice"/> or
+            <see cref="T:Spring.Aop.IThrowsAdvice"/>.
+            </param>
+            <returns> 
+            An <see cref="T:Spring.Aop.IAdvisor"/> wrapping the supplied
+            <paramref name="advice"/>. Never returns <cref lang="null"/>. If
+            the <paramref name="advice"/> parameter is an
+            <see cref="T:Spring.Aop.IAdvisor"/>, it will simply be returned.
+            </returns>
+            <exception cref="T:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException">
+            If no registered
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> can wrap
+            the supplied <paramref name="advice"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry.GetInterceptor(Spring.Aop.IAdvisor)">
+            <summary>
+            Returns an <see cref="T:AopAlliance.Intercept.IInterceptor"/> to
+            allow the use of the supplied <paramref name="advisor"/> in an
+            interception-based framework. 
+            </summary>
+            <remarks>
+            <p>
+            Don't worry about the pointcut associated with the
+            <see cref="T:Spring.Aop.IAdvisor"/>; if it's an
+            <see cref="T:Spring.Aop.IPointcutAdvisor"/>, just return an
+            interceptor.
+            </p>
+            </remarks>
+            <param name="advisor">
+            The advisor to find an interceptor for.
+            </param>
+            <returns>
+            An interceptor to expose this advisor's behaviour.
+            </returns>
+            <exception cref="T:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException">
+            If the advisor type is not understood by any registered
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry.RegisterAdvisorAdapter(Spring.Aop.Framework.Adapter.IAdvisorAdapter)">
+            <summary>
+            Register the given <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/>.
+            </summary>
+            <remarks>
+            <p>
+            Note that it is not necessary to register adapters for
+            <see cref="T:AopAlliance.Intercept.IInterceptor"/> instances: these
+            must be automatically recognized by an
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry"/>
+            implementation.
+            </p>
+            </remarks>
+            <param name="adapter">
+            An <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> that
+            understands the particular advisor and advice types.
+            </param>
+        </member>
+        <member name="T:AopAlliance.Intercept.IConstructorInterceptor">
+            <summary>
+            Intercepts the construction of a new object.
+            </summary>
+            <remarks>
+            <p>
+            Such interceptions are nested "on top" of the target.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:AopAlliance.Intercept.IConstructorInterceptor.Construct(AopAlliance.Intercept.IConstructorInvocation)">
+            <summary>
+            Implement this method to perform extra treatments before and after
+            the consruction of a new object.
+            </summary>
+            <remarks>
+            <p>
+            Polite implementations would certainly like to invoke
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/>. 
+            </p>
+            </remarks>
+            <param name="invocation">
+            The constructor invocation that is being intercepted.
+            </param>
+            <returns>
+            The newly created object, which is also the result of the call to
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/>, and might be
+            replaced by the interceptor.
+            </returns>
+            <exception cref="T:System.Exception">
+            If any of the interceptors in the chain or the target object itself
+            throws an exception.
+            </exception>
+        </member>
+        <member name="T:Spring.Aspects.Exceptions.SwallowExceptionHandler">
+            <summary>
+            Returns a token to indicate that this exception should be swallowed.
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: SwallowExceptionHandler.cs,v 1.2 2007/10/02 21:56:53 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aspects.AbstractExceptionHandler">
+            <summary>
+            An abstract base class providing all necessary functionality for typical IExceptionHandler implementations.
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: AbstractExceptionHandler.cs,v 1.2 2007/10/10 18:07:46 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Aspects.AbstractExceptionHandler.log">
+            <summary>
+            The logging instance
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.AbstractExceptionHandler.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.AbstractExceptionHandler"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.AbstractExceptionHandler.#ctor(System.String[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.AbstractExceptionHandler"/> class.
+            </summary>
+            <param name="exceptionNames">The exception names.</param>
+        </member>
+        <member name="M:Spring.Aspects.AbstractExceptionHandler.CanHandleException(System.Exception,System.Collections.IDictionary)">
+            <summary>
+            Determines whether this instance can handle the exception the specified exception.
+            </summary>
+            <param name="ex">The exception.</param>
+            <param name="callContextDictionary">The call context dictionary.</param>
+            <returns>
+            	<c>true</c> if this instance can handle the specified exception; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aspects.AbstractExceptionHandler.HandleException(System.Collections.IDictionary)">
+            <summary>
+            Handles the exception.
+            </summary>
+            <returns>The return value from handling the exception, if not rethrown or a new exception is thrown.</returns>
+        </member>
+        <member name="P:Spring.Aspects.AbstractExceptionHandler.SourceExceptionNames">
+            <summary>
+            Gets the source exception names.
+            </summary>
+            <value>The source exception names.</value>
+        </member>
+        <member name="P:Spring.Aspects.AbstractExceptionHandler.SourceExceptionTypes">
+            <summary>
+            Gets the source exception types.
+            </summary>
+            <value>The source exception types.</value>
+        </member>
+        <member name="P:Spring.Aspects.AbstractExceptionHandler.ActionExpressionText">
+            <summary>
+            Gets the action translation expression text
+            </summary>
+            <value>The action translation expression.</value>
+        </member>
+        <member name="P:Spring.Aspects.AbstractExceptionHandler.ConstraintExpressionText">
+            <summary>
+            Gets or sets the constraint expression text.
+            </summary>
+            <value>The constraint expression text.</value>
+        </member>
+        <member name="P:Spring.Aspects.AbstractExceptionHandler.ContinueProcessing">
+            <summary>
+            Gets a value indicating whether to continue processing.
+            </summary>
+            <value><c>true</c> if continue processing; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.SwallowExceptionHandler.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.Exceptions.SwallowExceptionHandler"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.SwallowExceptionHandler.#ctor(System.String[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.Exceptions.SwallowExceptionHandler"/> class.
+            </summary>
+            <param name="exceptionNames">The exception names.</param>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.SwallowExceptionHandler.HandleException(System.Collections.IDictionary)">
+            <summary>
+            Handles the exception.
+            </summary>
+            <returns>The return value from handling the exception, if not rethrown or a new exception is thrown.</returns>
+        </member>
+        <member name="T:Spring.Aop.Target.HotSwappableTargetSource">
+            <summary>
+            <see cref="T:Spring.Aop.ITargetSource"/> implementation that caches a
+            local target object, but allows the target to be swapped while the
+            application is running
+            </summary>
+            <remarks>
+            <p>
+            If configuring an object of this class in a Spring IoC container,
+            use constructor injection to supply the intial target.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.Net)</author>
+            <version>$Id: HotSwappableTargetSource.cs,v 1.6 2007/03/16 04:01:26 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Target.HotSwappableTargetSource.#ctor(System.Object)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Target.HotSwappableTargetSource"/> with the initial target.
+            </summary>
+            <param name="initialTarget">
+            The initial target. May be <see langword="null"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Target.HotSwappableTargetSource.GetTarget">
+            <summary>
+            Returns the target object.
+            </summary>
+            <returns>The target object.</returns>
+            <exception cref="T:System.Exception">
+            If unable to obtain the target object.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Target.HotSwappableTargetSource.ReleaseTarget(System.Object)">
+            <summary>
+            Releases the target object.
+            </summary>
+            <remarks>
+            <p>
+            No-op implementation.
+            </p>
+            </remarks>
+            <param name="target">The target object to release.</param>
+        </member>
+        <member name="M:Spring.Aop.Target.HotSwappableTargetSource.Swap(System.Object)">
+            <summary>
+            Swap the target, returning the old target.
+            </summary>
+            <param name="newTarget">The new target.</param>
+            <returns>The old target.</returns>
+            <exception cref="T:System.ArgumentNullException">
+            If the new target is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Target.HotSwappableTargetSource.Equals(System.Object)">
+            <summary>
+            Determines whether the specified <see cref="T:System.Object"/>
+            is equal to the current <see cref="T:System.Object"/>.  
+            </summary>
+            <remarks>
+            <p>
+            Two invoker interceptors are equal if they have the same target or
+            if the targets are equal.
+            </p>
+            </remarks>
+            <param name="other">The target source to compare with.</param>
+            <returns>
+            <see langword="true"/> if this instance is equal to the
+            specified <see cref="T:System.Object"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Target.HotSwappableTargetSource.GetHashCode">
+            <summary>
+            Serves as a hash function for a particular type, suitable for use
+            in hashing algorithms and data structures like a hash table.
+            </summary>
+            <returns>
+            A hash code for the current <see cref="T:System.Object"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Target.HotSwappableTargetSource.TargetType">
+            <summary>
+            The <see cref="T:System.Type"/> of the target object.
+            </summary>
+            <remarks>
+            <p>
+            Can return <see langword="null"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Target.HotSwappableTargetSource.IsStatic">
+            <summary>
+            Is the target source static?
+            </summary>
+            <value>
+            <see langword="true"/> if the target source is static.
+            </value>
+        </member>
+        <member name="T:Spring.Aop.Target.AbstractPoolingTargetSource">
+            <summary>
+            Abstract superclass for pooling <see cref="T:Spring.Aop.ITargetSource"/>s.
+            </summary>
+            <remarks>
+            <p>
+            Maintains a pool of target instances, acquiring and releasing a target
+            object from the pool for each method invocation. 
+            </p>
+            <p>
+            This class is independent of pooling technology.
+            </p>
+            <p>
+            Subclasses must implement the
+            <see cref="M:Spring.Aop.Target.AbstractPoolingTargetSource.GetTarget"/> and
+            <see cref="M:Spring.Aop.Target.AbstractPoolingTargetSource.ReleaseTarget(System.Object)"/>
+            methods to work with their chosen pool. The
+            <see cref="M:Spring.Aop.Target.AbstractPrototypeTargetSource.NewPrototypeInstance"/>
+            method inherited from the
+            <see cref="T:Spring.Aop.Target.AbstractPrototypeTargetSource"/> base class
+            can be used to create objects to put in the pool. Subclasses must also
+            implement some of the monitoring methods from the
+            <see cref="T:Spring.Aop.Target.PoolingConfig"/> interface. This class
+            provides the
+            <see cref="M:Spring.Aop.Target.AbstractPoolingTargetSource.GetPoolingConfigMixin"/>
+            method to return an <see cref="T:Spring.Aop.IIntroductionAdvisor"/>
+            making these statistics available on proxied objects.
+            </p>
+            <p>
+            This class implements the <see cref="T:System.IDisposable"/> interface in
+            order to force subclasses to implement the
+            <see cref="M:System.IDisposable.Dispose"/> method to cleanup and close
+            down their pool.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Federico Spinazzi (.NET)</author>
+            <version>$Id: AbstractPoolingTargetSource.cs,v 1.7 2007/03/16 04:01:26 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Target.PoolingConfig">
+            <summary>
+            Configuration interface for a pooling invoker.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: PoolingConfig.cs,v 1.4 2006/04/09 07:18:37 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Aop.Target.PoolingConfig.Active">
+            <summary>
+            The number of active object instances in a pool.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Target.PoolingConfig.Free">
+            <summary>
+            The number of free object instances in a pool.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Target.PoolingConfig.MaxSize">
+            <summary>
+            The maximum number of object instances in a pool.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Target.AbstractPoolingTargetSource.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Target.AbstractPoolingTargetSource"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no
+            public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Target.AbstractPoolingTargetSource.GetTarget">
+            <summary>
+            Returns the target object (acquired from the pool).
+            </summary>
+            <returns>The target object (acquired from the pool).</returns>
+            <exception cref="T:System.Exception">
+            If unable to obtain the target object.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Target.AbstractPoolingTargetSource.GetPoolingConfigMixin">
+            <summary>
+            Gets the <see cref="T:Spring.Aop.Target.PoolingConfig"/> mixin.
+            </summary>
+            <returns>
+            An <see cref="T:Spring.Aop.IIntroductionAdvisor"/> exposing statistics
+            about the pool maintained by this object.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Target.AbstractPoolingTargetSource.CreatePool(Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Create the pool.
+            </summary>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>, in
+            case one needs collaborators from it (normally one's own properties
+            are sufficient).
+            </param>
+            <exception cref="T:System.Exception">
+            In the case of errors encountered during the creation of the pool.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Target.AbstractPoolingTargetSource.ReleaseTarget(System.Object)">
+            <summary>
+            Releases the target object (returns it to the pool).
+            </summary>
+            <param name="target">
+            The target object to release (return to the pool).
+            </param>
+            <exception cref="T:System.Exception">
+            In the case that the <paramref name="target"/> could not be released.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Target.AbstractPoolingTargetSource.Dispose">
+            <summary>
+            Performs application-defined tasks associated with freeing, releasing, or
+            resetting unmanaged resources.
+            </summary>
+            <remarks>
+            <p>
+            Disposes of the pool. 
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Target.AbstractPoolingTargetSource.MaxSize">
+            <summary>
+            The maximum number of object instances in this pool.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Target.AbstractPoolingTargetSource.Active">
+            <summary>
+            The number of active object instances in this pool.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Target.AbstractPoolingTargetSource.Free">
+            <summary>
+            The number of free object instances in this pool.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Target.AbstractPoolingTargetSource.ObjectFactory">
+            <summary>
+            The target factory that will be used to perform the lookup
+            of the object referred to by the
+            <see cref="P:Spring.Aop.Target.AbstractPrototypeTargetSource.TargetObjectName"/>
+            property.
+            </summary>
+            <value>
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            (will never be <see langword="null"/>).
+            </value>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of initialization errors.
+            </exception>
+            <seealso cref="P:Spring.Aop.Target.AbstractPrototypeTargetSource.ObjectFactory"/>
+        </member>
+        <member name="T:Spring.Aop.Support.NameMatchMethodPointcut">
+            <summary> 
+            Pointcut object for simple method name matches, useful as an alternative to pure
+            regular expression based patterns.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: NameMatchMethodPointcut.cs,v 1.9 2007/03/16 04:01:24 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Support.StaticMethodMatcherPointcut">
+            <summary> 
+            Convenient superclass when one wants to force subclasses to
+            implement the <see cref="T:Spring.Aop.IMethodMatcher"/> interface
+            but subclasses will still want to be pointcuts.
+            </summary>
+            <remarks>
+            <p>
+            The <see cref="P:Spring.Aop.Support.StaticMethodMatcherPointcut.TypeFilter"/>
+            property can be overriden to customize <see cref="T:System.Type"/> filter
+            behavior as well.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: StaticMethodMatcherPointcut.cs,v 1.8 2007/05/30 22:35:43 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Support.StaticMethodMatcher">
+            <summary> 
+            Convenient abstract superclass for static method matchers that don't care
+            about arguments at runtime. 
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: StaticMethodMatcher.cs,v 1.6 2006/04/09 07:18:37 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Support.StaticMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type,System.Object[])">
+            <summary>
+            Is there a runtime (dynamic) match for the supplied
+            <paramref name="method"/>?
+            </summary>
+            <remarks>
+            <p>
+            Always throws a <see cref="T:System.NotSupportedException"/>. This
+            method should never be called on a static matcher.
+            </p>
+            </remarks>
+            <param name="method">The candidate method.</param>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/>.
+            </param>
+            <param name="args">The arguments to the method</param>
+            <returns>
+            Always throws a <see cref="T:System.NotSupportedException"/>.
+            </returns>
+            <exception cref="T:System.NotSupportedException">
+            Always.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Support.StaticMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Does the supplied <paramref name="method"/> satisfy this matcher?
+            </summary>
+            <remarks>
+            <p>
+            Must be implemented by a derived class in order to specify matching
+            rules.
+            </p>
+            </remarks>
+            <param name="method">The candidate method.</param>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/> (may be <see langword="null"/>,
+            in which case the candidate <see cref="T:System.Type"/> must be taken
+            to be the <paramref name="method"/>'s declaring class).
+            </param>
+            <returns>
+            <see langword="true"/> if this this method matches statically.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.StaticMethodMatcher.IsRuntime">
+            <summary>
+            Is this <see cref="T:Spring.Aop.IMethodMatcher"/> dynamic?
+            </summary>
+            <remarks>
+            <p>
+            Always returns <see langword="false"/>.
+            </p>
+            </remarks>
+            <value>
+            Always returns <see langword="false"/>.
+            </value>
+        </member>
+        <member name="M:Spring.Aop.Support.StaticMethodMatcherPointcut.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an abstract class, and as such has no publicly
+            visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Support.StaticMethodMatcherPointcut.TypeFilter">
+            <summary>
+            The <see cref="T:Spring.Aop.ITypeFilter"/> for this pointcut.
+            </summary>
+            <value>
+            The current <see cref="T:Spring.Aop.ITypeFilter"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Support.StaticMethodMatcherPointcut.MethodMatcher">
+            <summary>
+            The <see cref="T:Spring.Aop.IMethodMatcher"/> for this pointcut.
+            </summary>
+            <value>
+            The current <see cref="T:Spring.Aop.IMethodMatcher"/>.
+            </value>
+        </member>
+        <member name="M:Spring.Aop.Support.NameMatchMethodPointcut.Matches(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Does the <see cref="P:System.Reflection.MemberInfo.Name"/> of the supplied
+            <paramref name="method"/> matches any of the mapped names?
+            </summary>
+            <param name="method">
+            The <see cref="T:System.Reflection.MethodBase"/> to check.
+            </param>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> of the target class.
+            </param>
+            <returns>
+            <see langword="true"/> if the name of the supplied
+            <paramref name="method"/> matches one of the mapped names.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.NameMatchMethodPointcut.IsMatch(System.String,System.String)">
+            <summary>
+            Does the supplied <paramref name="methodName"/> match the supplied <paramref name="mappedName"/>?
+            </summary>
+            <remarks>
+            <p>
+            The default implementation checks for "xxx*", "*xxx" and "*xxx*" matches,
+            as well as direct equality. Can be overridden in subclasses.
+            </p>
+            </remarks>
+            <param name="methodName">
+            The method name of the class.
+            </param>
+            <param name="mappedName">
+            The name in the descriptor.
+            </param>
+            <returns>
+            <b>True</b> if the names match.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.NameMatchMethodPointcut.MappedName">
+            <summary>
+            Convenience property when we have only a single method name
+            to match.
+            </summary>
+            <remarks>
+            <note type="caution">
+            Use either this property or the
+            <see cref="P:Spring.Aop.Support.NameMatchMethodPointcut.MappedNames"/> property,
+            not both.
+            </note>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Support.NameMatchMethodPointcut.MappedNames">
+            <summary>
+            Set the method names defining methods to match.
+            </summary>
+            <remarks>
+            <p>
+            Matching will be the union of all these; if any match, the pointcut matches.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Aop.Support.DefaultObjectFactoryPointcutAdvisor">
+            <summary>
+            Concrete ObjectFactory-based IPointcutAdvisor thta allows for any Advice to be
+            configured as reference to an Advice object in the ObjectFatory, as well as 
+            the Pointcut to be configured through an object property.
+            </summary>
+            <remarks>
+            Specifying the name of an advice object instead of the advice object itself
+            (if running within a ObjectFactory/ApplicationContext) increases loose coupling
+            at initialization time, in order to not intialize the advice object until the pointcut
+            actually matches.
+            </remarks>
+            <author>Juerge Hoeller</author>
+            <author>Mark Pollack</author>
+            <version>$Id: DefaultObjectFactoryPointcutAdvisor.cs,v 1.1 2007/05/30 22:35:43 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Support.AbstractObjectFactoryPointcutAdvisor">
+            <summary>
+            Abstract ObjectFactory-based IPointcutAdvisor that allows for any Advice to be
+            configured as reference to an Advice object in an ObjectFactory.
+            </summary>
+            <remarks>
+            specifying the name of an advice object instead of the advice object itself
+            (if running within an ObjectFactory/ApplicationContext increses loose coupling
+            at initialization time, in order not to initialize the advice object until the
+            pointcut actually matches.
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack</author>
+            <version>$Id: AbstractObjectFactoryPointcutAdvisor.cs,v 1.2 2007/08/10 17:39:44 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Support.AbstractPointcutAdvisor">
+            <summary>
+            Abstract base class for <see cref="T:Spring.Aop.IPointcutAdvisor"/> implementations.  
+            </summary>
+            <remarks>
+            Can be subclassed for returning a specific pointcut/advice or a freely configurable pointcut/advice.
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AbstractPointcutAdvisor.cs,v 1.2 2008/01/14 20:49:47 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.IPointcutAdvisor">
+            <summary>
+            Superinterface for all <see cref="T:Spring.Aop.IAdvisor"/>s that are
+            driven by a pointcut.
+            </summary>
+            <remarks>
+            <p>
+            This covers nearly all advisors except introduction advisors, for which
+            method-level matching does not apply.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <seealso cref="T:Spring.Aop.IIntroductionAdvisor"/>
+            <version>$Id: IPointcutAdvisor.cs,v 1.3 2006/04/09 07:18:36 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.IAdvisor">
+            <summary>
+            Base interface holding AOP advice and a filter determining the
+            applicability of the advice (such as a pointcut).
+            </summary>
+            <remarks>
+            <note>
+            This interface is not for use by Spring.NET users, but exists rather to
+            allow for commonality in the support for different types of advice
+            within the framework.
+            </note>
+            <p>
+            Spring.NET AOP is centered on <b>around advice</b> delivered via method
+            <b>interception</b>, compliant with the AOP Alliance interception API. 
+            The <see cref="T:Spring.Aop.IAdvisor"/> interface allows support for
+            different types of advice, such as <b>before</b> and <b>after</b>
+            advice, which need not be implemented using interception.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <seealso cref="T:Spring.Aop.IMethodBeforeAdvice"/>
+            <seealso cref="T:Spring.Aop.IAfterReturningAdvice"/>
+            <seealso cref="T:Spring.Aop.IThrowsAdvice"/>
+            <seealso cref="T:AopAlliance.Intercept.IMethodInterceptor"/>
+            <version>$Id: IAdvisor.cs,v 1.7 2006/04/09 07:18:36 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Aop.IAdvisor.IsPerInstance">
+            <summary>
+            Is this advice associated with a particular instance?
+            </summary>
+            <remarks>
+            <p>
+            An advisor that was creating a mixin would be a per instance
+            operation and would thus return <see langword="true"/>. If the
+            advisor is not per instance, it is shared with all instances of the
+            advised class obtained from the same Spring.NET IoC container.
+            </p>
+            <p>
+            Use <c>singleton</c> and <c>prototype</c> object definitions or
+            appropriate programmatic proxy creation to ensure that
+            <see cref="T:Spring.Aop.IAdvisor"/>s have the correct lifecycle model. 
+            </p>
+            <note>
+            This method is not currently used by the framework.
+            </note>
+            </remarks>
+            <value>
+            <see langword="true"/> if this advice is associated with a
+            particular instance.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.IAdvisor.Advice">
+            <summary>
+            Return the advice part of this aspect.
+            </summary>
+            <remarks>
+            <p>
+            An advice may be an interceptor, a throws advice, before advice,
+            introduction etc.
+            </p>
+            </remarks>
+            <returns>
+            The advice that should apply if the pointcut matches.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.IPointcutAdvisor.Pointcut">
+            <summary>
+            The <see cref="T:Spring.Aop.IPointcut"/> that drives this advisor.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.AbstractPointcutAdvisor.Equals(System.Object)">
+            <summary>
+            Determines whether the specified <see cref="T:System.Object"/>
+            is equal to the current <see cref="T:System.Object"/>.  
+            </summary>
+            <param name="o">The advisor to compare with.</param>
+            <returns>
+            <see langword="true"/> if this instance is equal to the
+            specified <see cref="T:System.Object"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.AbstractPointcutAdvisor.GetHashCode">
+            <summary>
+            Serves as a hash function for a particular type, suitable for use
+            in hashing algorithms and data structures like a hash table.
+            </summary>
+            <returns>
+            A hash code for the current <see cref="T:System.Object"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.AbstractPointcutAdvisor.Order">
+            <summary>
+            Returns this <see cref="T:Spring.Aop.IAdvisor"/>s order in the
+            interception chain.
+            </summary>
+            <returns>
+            This <see cref="T:Spring.Aop.IAdvisor"/>s order in the
+            interception chain.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.AbstractPointcutAdvisor.Advice">
+            <summary>
+            Return the advice part of this aspect.
+            </summary>
+            <remarks>
+            <p>
+            An advice may be an interceptor, a throws advice, before advice,
+            introduction etc.
+            </p>
+            </remarks>
+            <returns>
+            The advice that should apply if the pointcut matches.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.AbstractPointcutAdvisor.IsPerInstance">
+            <summary>
+            Is this advice associated with a particular instance?
+            </summary>
+            <remarks>
+            <p>
+            Not supported for dynamic advisors.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if this advice is associated with a
+            particular instance.
+            </value>
+            <exception cref="T:System.NotSupportedException">Always.</exception>
+            <see cref="P:Spring.Aop.IAdvisor.IsPerInstance"/>
+        </member>
+        <member name="P:Spring.Aop.Support.AbstractPointcutAdvisor.Pointcut">
+            <summary>
+            The <see cref="T:Spring.Aop.IPointcut"/> that drives this advisor.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.AbstractObjectFactoryPointcutAdvisor.ToString">
+            <summary>
+            Describe this Advisor, showing name of advice object.
+            </summary>
+            <returns>
+            Type name and advice object name.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.AbstractObjectFactoryPointcutAdvisor.AdviceObjectName">
+            <summary>
+            Gets or sets the name of the advice object that this advisor should refer to.
+            </summary>
+            <remarks>An instance of the specified object will be obtained on first access of
+            this advisor's advice.  This advisor will only ever obtain at most one
+            single instance of the advice object, caching the instance for the lifetime of
+            the advisor.</remarks>
+            <value>The name of the advice object.</value>
+        </member>
+        <member name="P:Spring.Aop.Support.AbstractObjectFactoryPointcutAdvisor.ObjectFactory">
+            <summary>
+            Callback that supplies the owning factory to an object instance.
+            </summary>
+            <value>
+            Owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            (may not be <see langword="null"/>). The object can immediately
+            call methods on the factory.
+            </value>
+            <remarks>
+            <p>
+            Invoked after population of normal object properties but before an init
+            callback like <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            method or a custom init-method.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of initialization errors.
+            </exception>
+        </member>
+        <member name="P:Spring.Aop.Support.AbstractObjectFactoryPointcutAdvisor.Advice">
+            <summary>
+            Return the advice part of this aspect.
+            </summary>
+            <remarks>
+            <p>
+            An advice may be an interceptor, a throws advice, before advice,
+            introduction etc.
+            </p>
+            </remarks>
+            <returns>
+            The advice that should apply if the pointcut matches.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.DefaultObjectFactoryPointcutAdvisor.ToString">
+            <summary>
+            Describe this Advisor, showing pointcut and name of advice object.
+            </summary>
+            <returns>Type name , pointcut, and advice object name.</returns>
+        </member>
+        <member name="P:Spring.Aop.Support.DefaultObjectFactoryPointcutAdvisor.Pointcut">
+            <summary>
+            The <see cref="T:Spring.Aop.IPointcut"/> that drives this advisor.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.IBeforeAdvice">
+            <summary>
+            Superinterface for all before advice.
+            </summary>
+            <remarks>
+            <p>
+            <i>Before</i> advice is advice that executes before a joinpoint, but
+            which does not have the ability to prevent execution flow proceeding to
+            the joinpoint (unless it throws an <see cref="T:System.Exception"/>).
+            </p>
+            <p>
+            Spring.NET only supports <i>method</i> before advice. Although this
+            is unlikely to change, this API is designed to allow <i>field</i>
+            before advice in future if desired.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <seealso cref="T:Spring.Aop.IMethodBeforeAdvice"/>
+            <seealso cref="T:Spring.Aop.IAfterReturningAdvice"/>
+            <seealso cref="T:Spring.Aop.IThrowsAdvice"/>
+            <seealso cref="T:AopAlliance.Intercept.IMethodInterceptor"/>
+            <version>$Id: IBeforeAdvice.cs,v 1.4 2006/04/09 07:18:36 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.AutoProxy.ITargetSourceCreator">
+            <summary>
+            Implementations can create special target sources, such as pooling target
+            sources, for particular objects. For example, they may base their choice
+            on attributes, such as a pooling attribute, on the target type.
+            </summary>
+            <remarks><p>AbstractAutoProxyCreator can support a number of TargetSourceCreators,
+            which will be applied in order.</p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Adhari C Mahendra (.NET)</author>
+            <version>$Id: ITargetSourceCreator.cs,v 1.3 2007/08/22 08:49:08 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.ITargetSourceCreator.GetTargetSource(System.Type,System.String,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Create a special TargetSource for the given object, if any.
+            </summary>
+            <param name="objectType">The type of the object to create a TargetSource for</param>
+            <param name="objectName">the name of the object</param>
+            <param name="factory">the containing factory</param>
+            <returns>a special TargetSource or null if this TargetSourceCreator isn't
+             interested in the particular object</returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator">
+            <summary>
+            ObjectPostProcessor implementation that creates AOP proxies based on all candidate
+            Advisors in the current IObjectFactory. This class is completely generic; it contains
+            no special code to handle any particular aspects, such as pooling aspects.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Adhari C Mahendra (.NET)</author>
+            <version>$Id: DefaultAdvisorAutoProxyCreator.cs,v 1.9 2007/10/08 22:04:51 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.AutoProxy.AbstractAdvisorAutoProxyCreator">
+            <summary>
+            Abstract IOBjectPostProcessor implementation that creates AOP proxies.
+            This class is completely generic; it contains no special code to handle
+            any particular aspects, such as pooling aspects.
+            </summary>
+            <remarks>
+            <p>Subclasses must implement the abstract findCandidateAdvisors() method
+            to return a list of Advisors applying to any object. Subclasses can also
+            override the inherited shouldSkip() method to exclude certain objects
+            from autoproxying, but they must be careful to invoke the shouldSkip()
+            method of this class, which tries to avoid circular reference problems
+            and infinite loops.</p>
+            <p>Advisors or advices requiring ordering should implement the Ordered interface.
+            This class sorts advisors by Ordered order value. Advisors that don't implement
+            the Ordered interface will be considered to be unordered, and will appear
+            at the end of the advisor chain in undefined order.</p>
+            </remarks>
+            <seealso cref="M:Spring.Aop.Framework.AutoProxy.AbstractAdvisorAutoProxyCreator.FindCandidateAdvisors"/>
+            <author>Rod Johnson</author>
+            <author>Adhari C Mahendra (.NET)</author>
+            <version>$Id: AbstractAdvisorAutoProxyCreator.cs,v 1.5 2007/08/22 08:49:08 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAdvisorAutoProxyCreator.GetAdvicesAndAdvisorsForObject(System.Type,System.String,Spring.Aop.ITargetSource)">
+            <summary>
+            Return whether the given object is to be proxied, what additional
+            advices (e.g. AOP Alliance interceptors) and advisors to apply.
+            </summary>
+            <param name="objType">the new object instance</param>
+            <param name="name">the name of the object</param>
+            <param name="customTargetSource">targetSource returned by TargetSource property:
+            may be ignored. Will be null unless a custom target source is in use.</param>
+            <returns>
+            an array of additional interceptors for the particular object;
+            or an empty array if no additional interceptors but just the common ones;
+            or null if no proxy at all, not even with the common interceptors.
+            </returns>
+            <remarks>
+            	<p>The previous name of this method was "GetInterceptorAndAdvisorForObject".
+            It has been renamed in the course of general terminology clarification
+            in Spring 1.1. An AOP Alliance Interceptor is just a special form of
+            Advice, so the generic Advice term is preferred now.</p>
+            	<p>The third parameter, customTargetSource, is new in Spring 1.1;
+            add it to existing implementations of this method.</p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAdvisorAutoProxyCreator.FindEligibleAdvisors(System.Type)">
+            <summary>
+            Find all eligible advices and for autoproxying this class.
+            </summary>
+            <param name="type"></param>
+            <returns>the empty list, not null, if there are no pointcuts or interceptors</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAdvisorAutoProxyCreator.SortAdvisors(System.Collections.IList)">
+            <summary>
+            Sorts the advisors.
+            </summary>
+            <param name="advisors">The advisors.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AbstractAdvisorAutoProxyCreator.FindCandidateAdvisors">
+            <summary>
+            Find all candidate advisors to use in auto-proxying.
+            </summary>
+            <returns>list of Advisors</returns>
+        </member>
+        <member name="P:Spring.Aop.Framework.AutoProxy.AbstractAdvisorAutoProxyCreator.ObjectFactory">
+            <summary>
+            We override this method to ensure that all candidate advisors are materialized
+            under a stack trace including this object. Otherwise, the dependencies won't
+            be apparent to the circular-reference prevention strategy in AbstractObjectFactory.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator.SEPARATOR">
+            <summary>
+            Separator between prefix and remainder of object name
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator.FindCandidateAdvisors">
+            <summary>
+            Find all candidate advices to use in auto proxying.
+            </summary>
+            <returns>list of Advice</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has injected all of an object's dependencies.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator.UsePrefix">
+            <summary>
+            Gets or sets a value indicating whether to exclude
+            advisors with a certain prefix.
+            </summary>
+            <value><c>true</c> if [use prefix]; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator.AdvisorObjectNamePrefix">
+            <summary>
+            Set the prefix for object names that will cause them to be included for
+            auto-proxying by this object. This prefix should be set to avoid circular
+            references. Default value is the object name of this object + a dot.
+            </summary>
+            <value>The advisor object name prefix.</value>
+        </member>
+        <member name="P:Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator.ObjectName">
+            <summary>
+            Set the name of the object in the object factory that created this object.
+            </summary>
+            <value>The name of the object in the factory.</value>
+            <remarks>
+            	<p>
+            Invoked after population of normal object properties but before an init
+            callback like <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            method or a custom init-method.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Aop.Support.DefaultPointcutAdvisor">
+            <summary>
+            Convenient pointcut-driven advisor implementation.
+            </summary>
+            <remarks>
+            <p>
+            This is the most commonly used <see cref="T:Spring.Aop.IAdvisor"/> implementation.
+            It can be used with any pointcut and advice type, except for introductions.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: DefaultPointcutAdvisor.cs,v 1.8 2007/05/30 22:35:43 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Support.AbstractGenericPointcutAdvisor">
+            <summary>
+            Abstract PointcutAdvisor that allows for any Advice to be configured.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AbstractGenericPointcutAdvisor.cs,v 1.2 2007/08/10 17:39:44 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Support.AbstractGenericPointcutAdvisor.ToString">
+            <summary>
+            Returns a <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> representation of this advisor.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.AbstractGenericPointcutAdvisor.Advice">
+            <summary>
+            Return the advice part of this advisor.
+            </summary>
+            <returns>
+            The advice that should apply if the pointcut matches.
+            </returns>
+            <see cref="P:Spring.Aop.IAdvisor.Advice"/>
+        </member>
+        <member name="M:Spring.Aop.Support.DefaultPointcutAdvisor.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.DefaultPointcutAdvisor"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.DefaultPointcutAdvisor.#ctor(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.DefaultPointcutAdvisor"/>
+            class for the supplied <paramref name="advice"/>,
+            </summary>
+            <param name="advice">
+            The advice to use.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Support.DefaultPointcutAdvisor.#ctor(Spring.Aop.IPointcut,AopAlliance.Aop.IAdvice)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.DefaultPointcutAdvisor"/>
+            class for the supplied <paramref name="advice"/> and
+            <paramref name="pointcut"/>.
+            </summary>
+            <param name="advice">
+            The advice to use.
+            </param>
+            <param name="pointcut">
+            The pointcut to use.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Support.DefaultPointcutAdvisor.ToString">
+            <summary>
+            Returns a <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> representation of this advisor.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.DefaultPointcutAdvisor.Pointcut">
+            <summary>
+            The <see cref="T:Spring.Aop.IPointcut"/> that drives this advisor.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicTargetSourceWrapper">
+            <summary>
+            Decorates a target source with the <see cref="T:System.IDisposable"/>
+            interface.
+            </summary>
+            <remarks>
+            <p>
+            This implementation will release the target object when said object
+            is disposed.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DynamicTargetSourceWrapper.cs,v 1.4 2007/03/16 04:01:17 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.ITargetSourceWrapper">
+            <summary>
+            Decorates a target source with the <see cref="T:System.IDisposable"/>
+            interface.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ITargetSourceWrapper.cs,v 1.1 2006/08/10 18:45:52 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.ITargetSourceWrapper.GetTarget">
+            <summary>
+            Returns the target object that proxy methods will be delegated to.
+            </summary>
+            <returns>The target object.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicTargetSourceWrapper.#ctor(Spring.Aop.ITargetSource)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.DynamicTargetSourceWrapper"/>
+            class.
+            </summary>
+            <param name="targetSource">
+            The target object that proxy methods will be delegated to.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="targetSource"/> is
+            <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicTargetSourceWrapper.GetTarget">
+            <summary>
+            Returns the target object that proxy methods will be delegated to.
+            </summary>
+            <returns>The target object.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicTargetSourceWrapper.Dispose">
+            <summary>
+            Releases the dynamic target when this object is disposed.
+            </summary>
+        </member>
+        <member name="T:AopAlliance.Aop.AspectException">
+            <summary>
+            Superclass for all AOP infrastructure exceptions.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AspectException.cs,v 1.3 2006/04/09 07:18:33 markpollack Exp $</version>
+        </member>
+        <member name="M:AopAlliance.Aop.AspectException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:AopAlliance.Aop.AspectException"/> class.
+            </summary>
+        </member>
+        <member name="M:AopAlliance.Aop.AspectException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:AopAlliance.Aop.AspectException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:AopAlliance.Aop.AspectException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:AopAlliance.Aop.AspectException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="innerException">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:AopAlliance.Aop.AspectException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:AopAlliance.Aop.AspectException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Aspects.Cache.BaseCacheAdvice">
+            <summary>
+            Base class for different cache advice implementations that provide
+            access to common functionality, such as obtaining a cache instance.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: BaseCacheAdvice.cs,v 1.3 2007/04/01 15:04:04 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Cache.BaseCacheAdvice.GetCache(System.String)">
+            <summary>
+            Returns an <see cref="T:Spring.Caching.ICache"/> instance based on the cache name.
+            </summary>
+            <param name="name">The name of the cache.</param>
+            <returns>
+            Cache instance for the specified <paramref name="name"/> if one
+            is registered in the application context, or <c>null</c> if it isn't.
+            </returns>
+        </member>
+        <member name="M:Spring.Aspects.Cache.BaseCacheAdvice.PrepareVariables(System.Reflection.MethodInfo,System.Object[])">
+            <summary>
+            Prepares variables for expression evaluation by packaging all 
+            method arguments into a dictionary, keyed by argument name.
+            </summary>
+            <param name="method">
+            Method to get parameters info from.
+            </param>
+            <param name="arguments">
+            Argument values to package.
+            </param>
+            <returns>
+            A dictionary containing all method arguments, keyed by method name.
+            </returns>
+        </member>
+        <member name="M:Spring.Aspects.Cache.BaseCacheAdvice.EvalCondition(System.String,Spring.Expressions.IExpression,System.Object,System.Collections.IDictionary)">
+            <summary>
+            Evaluates a SpEL expression as a boolean value.
+            </summary>
+            <param name="condition">
+            The expression string that should be evaluated.
+            </param>
+            <param name="conditionExpression">
+            The SpEL expression instance that should be evaluated.
+            </param>
+            <param name="context">
+            The object to evaluate expression against.
+            </param>
+            <param name="variables">
+            The expression variables dictionary.
+            </param>
+            <returns>
+            The evaluated boolean.
+            </returns>
+            <exception cref="T:System.InvalidOperationException">
+            If the SpEL expression could not be successfuly resolved to a boolean.
+            </exception>
+        </member>
+        <member name="M:Spring.Aspects.Cache.BaseCacheAdvice.GetCustomAttribute(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Retrieves custom attribute for the specified attribute type.
+            </summary>
+            <param name="method">
+            Method to get attribute from.
+            </param>
+            <param name="attributeType">
+            Attribute type.
+            </param>
+            <returns>
+            Attribute instance if one is found, <c>null</c> otherwise.
+            </returns>
+        </member>
+        <member name="P:Spring.Aspects.Cache.BaseCacheAdvice.ApplicationContext">
+            <summary>
+            Set the <see cref="T:Spring.Context.IApplicationContext"/> that this
+            object runs in.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Target.SimplePoolTargetSource">
+            <summary>
+            Pooling target source implementation based on the
+            <see cref="T:Spring.Pool.Support.SimplePool"/>
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Federico Spinazzi</author>
+            <version>$Id: SimplePoolTargetSource.cs,v 1.9 2007/03/16 04:01:26 aseovic Exp $
+            </version>
+        </member>
+        <member name="M:Spring.Aop.Target.SimplePoolTargetSource.GetTarget">
+            <summary>
+            Returns the target object (acquired from the pool).
+            </summary>
+            <returns>
+            The target object (acquired from the pool).
+            </returns>
+            <exception cref="T:System.Exception">
+            If unable to obtain the target object.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Target.SimplePoolTargetSource.CreatePool(Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Creates the pool.
+            </summary>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>, in
+            case one needs collaborators from it (normally one's own properties
+            are sufficient).
+            </param>
+            <seealso cref="P:Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/>
+        </member>
+        <member name="M:Spring.Aop.Target.SimplePoolTargetSource.CreateObjectPool">
+            <summary>
+            Creates a new instance of an appropriate
+            <see cref="T:Spring.Pool.IObjectPool"/> implementation.
+            </summary>
+            <remarks>
+            <p>
+            Subclasses can, of course, override this method if they want to
+            return a different <see cref="T:Spring.Pool.IObjectPool"/> implementation.
+            </p>
+            </remarks>
+            <returns>
+            An empty <see cref="T:Spring.Pool.IObjectPool"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Target.SimplePoolTargetSource.ReleaseTarget(System.Object)">
+            <summary>
+            Releases the target object (returns it to the pool).
+            </summary>
+            <param name="target">The target object to release (return to the pool).</param>
+            <exception cref="T:System.Exception">
+            In the case that the <paramref name="target"/> could not be released.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Target.SimplePoolTargetSource.Dispose">
+            <summary>
+            Performs application-defined tasks associated with freeing, releasing, or
+            resetting unmanaged resources.
+            </summary>
+            <remarks>
+            <p>
+            Disposes of the pool.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Target.SimplePoolTargetSource.MakeObject">
+            <summary>
+            Creates an instance that can be returned by the pool.
+            </summary>
+            <returns>
+            An instance that can be returned by the pool.
+            </returns>
+            <seealso cref="M:Spring.Pool.IPoolableObjectFactory.MakeObject"/>
+        </member>
+        <member name="M:Spring.Aop.Target.SimplePoolTargetSource.DestroyObject(System.Object)">
+            <summary>
+            Destroys an instance no longer needed by the pool.
+            </summary>
+            <param name="obj">The instance to be destroyed.</param>
+            <seealso cref="M:Spring.Pool.IPoolableObjectFactory.DestroyObject(System.Object)"/>
+        </member>
+        <member name="M:Spring.Aop.Target.SimplePoolTargetSource.ValidateObject(System.Object)">
+            <summary>
+            Ensures that the instance is safe to be returned by the pool.
+            Returns false if this object should be destroyed.
+            </summary>
+            <param name="obj">The instance to validate.</param>
+            <returns>
+            <see langword="false"/> if this object is not valid and
+            should be dropped from the pool, otherwise <see langword="true"/>.
+            </returns>
+            <seealso cref="M:Spring.Pool.IPoolableObjectFactory.ValidateObject(System.Object)"/>
+        </member>
+        <member name="M:Spring.Aop.Target.SimplePoolTargetSource.ActivateObject(System.Object)">
+            <summary>
+            Reinitialize an instance to be returned by the pool.
+            </summary>
+            <param name="obj">The instance to be activated.</param>
+            <seealso cref="M:Spring.Pool.IPoolableObjectFactory.ActivateObject(System.Object)"/>
+        </member>
+        <member name="M:Spring.Aop.Target.SimplePoolTargetSource.PassivateObject(System.Object)">
+            <summary>
+            Passivates the object.
+            </summary>
+            <param name="obj">The instance returned to the pool.</param>
+            <seealso cref="M:Spring.Pool.IPoolableObjectFactory.PassivateObject(System.Object)"/>
+        </member>
+        <member name="P:Spring.Aop.Target.SimplePoolTargetSource.Active">
+            <summary>
+            The number of active object instances in this pool.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Target.SimplePoolTargetSource.Free">
+            <summary>
+            The number of free object instances in this pool.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Support.AttributeMatchMethodPointcutAdvisor">
+            <summary> 
+            Convenient class for attribute-match method pointcuts that hold an Interceptor,
+            making them an Advisor.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: AttributeMatchMethodPointcutAdvisor.cs,v 1.3 2007/03/16 04:01:23 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Support.AttributeMatchMethodPointcut">
+            <summary> 
+            <see cref="T:Spring.Aop.IPointcut"/> implementation that matches methods
+            that have been decorated with a specified <see cref="T:System.Attribute"/>.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Ronald Wildenberg</author>
+            <version>$Id: AttributeMatchMethodPointcut.cs,v 1.8 2007/05/21 16:43:45 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Support.AttributeMatchMethodPointcut.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.AttributeMatchMethodPointcut"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.AttributeMatchMethodPointcut.#ctor(System.Type)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.AttributeMatchMethodPointcut"/> class.
+            </summary>
+            <param name="attribute">
+            The <see cref="T:System.Attribute"/> to match.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Support.AttributeMatchMethodPointcut.#ctor(System.Type,System.Boolean)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.AttributeMatchMethodPointcut"/>
+            class.
+            </summary>
+            <param name="attribute">
+            The <see cref="T:System.Attribute"/> to match.
+            </param>
+            <param name="inherit">
+            Flag that controls whether or not the inheritance tree of the
+            method to be included in the search for the <see cref="P:Spring.Aop.Support.AttributeMatchMethodPointcut.Attribute"/>?
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Support.AttributeMatchMethodPointcut.#ctor(System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.AttributeMatchMethodPointcut"/>
+            class.
+            </summary>
+            <param name="attribute">
+            The <see cref="T:System.Attribute"/> to match.
+            </param>
+            <param name="inherit">
+            Flag that controls whether or not the inheritance tree of the
+            method to be included in the search for the <see cref="P:Spring.Aop.Support.AttributeMatchMethodPointcut.Attribute"/>?
+            </param>
+            <param name="checkInterfaces">
+            Flag that controls whether or not interfaces attributes of the
+            method to be included in the search for the <see cref="P:Spring.Aop.Support.AttributeMatchMethodPointcut.Attribute"/>?
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Support.AttributeMatchMethodPointcut.Matches(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Does the supplied <paramref name="method"/> satisfy this matcher?
+            </summary>
+            <param name="method">The candidate method.</param>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/> (may be <see langword="null"/>,
+            in which case the candidate <see cref="T:System.Type"/> must be taken
+            to be the <paramref name="method"/>'s declaring class).
+            </param>
+            <returns>
+            <see langword="true"/> if this this method matches statically.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.AttributeMatchMethodPointcut.Attribute">
+            <summary>
+            The <see cref="T:System.Attribute"/> to match.
+            </summary>
+            <exception cref="T:System.ArgumentException">
+            If the supplied value is not a <see cref="T:System.Type"/> that
+            derives from the <see cref="T:System.Attribute"/> class.
+            </exception>
+        </member>
+        <member name="P:Spring.Aop.Support.AttributeMatchMethodPointcut.Inherit">
+            <summary>
+            Is the inheritance tree of the method to be included in the search for the
+            <see cref="P:Spring.Aop.Support.AttributeMatchMethodPointcut.Attribute"/>?
+            </summary>
+            <remarks>
+            <p>
+            The default is <see langword="true"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Support.AttributeMatchMethodPointcut.CheckInterfaces">
+            <summary>
+            Is the interfaces attributes of the method to be included in the search for the
+            <see cref="P:Spring.Aop.Support.AttributeMatchMethodPointcut.Attribute"/>?
+            </summary>
+            <remarks>
+            <p>
+            The default is <see langword="false"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Support.AttributeMatchMethodPointcutAdvisor.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.AttributeMatchMethodPointcutAdvisor"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.AttributeMatchMethodPointcutAdvisor.#ctor(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.AttributeMatchMethodPointcutAdvisor"/> class
+            for the supplied <paramref name="advice"/>.
+            </summary>
+            <param name="advice"></param>
+        </member>
+        <member name="P:Spring.Aop.Support.AttributeMatchMethodPointcutAdvisor.IsPerInstance">
+            <summary>
+            Is this advice associated with a particular instance?
+            </summary>
+            <value>
+            <see langword="true"/> if this advice is associated with a
+            particular instance.
+            </value>
+            <exception cref="T:System.NotSupportedException">
+            Always; this property is not yet supported.
+            </exception>
+        </member>
+        <member name="P:Spring.Aop.Support.AttributeMatchMethodPointcutAdvisor.Order">
+            <summary>
+            Returns this <see cref="T:Spring.Aop.IAdvisor"/>s order in the
+            interception chain.
+            </summary>
+            <returns>
+            This <see cref="T:Spring.Aop.IAdvisor"/>s order in the
+            interception chain.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.AttributeMatchMethodPointcutAdvisor.Advice">
+            <summary>
+            Return the advice part of this advisor.
+            </summary>
+            <returns>
+            The advice that should apply if the pointcut matches.
+            </returns>
+            <see cref="P:Spring.Aop.IAdvisor.Advice"/>
+        </member>
+        <member name="P:Spring.Aop.Support.AttributeMatchMethodPointcutAdvisor.Pointcut">
+            <summary>
+            The <see cref="T:Spring.Aop.IPointcut"/> that drives this advisor.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.IIntroductionInterceptor">
+            <summary> 
+            Subinterface of the AOP Alliance
+            <see cref="T:AopAlliance.Intercept.IMethodInterceptor"/> interface that
+            allows additional interfaces to be implemented by the interceptor, and
+            available via a proxy using that interceptor.
+            </summary>
+            <remarks>
+            <p>
+            This is a fundamental AOP concept called <b>introduction</b>.
+            </p>
+            <p>
+            Introductions are often <b>mixins</b>, enabling the building of composite
+            objects that can achieve many of the goals of multiple inheritance.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IIntroductionInterceptor.cs,v 1.3 2006/04/09 07:18:36 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.IIntroductionInterceptor.ImplementsInterface(System.Type)">
+            <summary>
+            Does this <see cref="T:Spring.Aop.IIntroductionInterceptor"/>
+            implement the given interface?
+            </summary>
+            <param name="intf">The interface to check.</param>
+            <returns>
+            <see langword="true"/> if this
+            <see cref="T:Spring.Aop.IIntroductionInterceptor"/>
+            implements the given interface.
+            </returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.BaseCompositionAopProxy">
+            <summary>
+            Base class that each dynamic composition proxy has to extend.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Bruno Baia</author>
+            <version>$Id: BaseCompositionAopProxy.cs,v 1.2 2007/03/16 04:01:22 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.BaseCompositionAopProxy.#ctor">
+            <summary>
+            Default constructor.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.BaseCompositionAopProxy.#ctor(Spring.Aop.Framework.IAdvised)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.DynamicProxy.BaseCompositionAopProxy"/> class.
+            </summary>
+            <param name="advised">The proxy configuration.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.BaseCompositionAopProxy.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Deserialization constructor.
+            </summary>
+            <param name="info">Serialization data.</param>
+            <param name="context">Serialization context.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.BaseCompositionAopProxy.Spring#Aop#Framework#IAopProxy#GetProxy">
+            <summary>
+            Returns this proxy instance
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.BaseCompositionAopProxy.Equals(System.Object)">
+            <summary>
+            Delegate to target object handling of equals method.
+            </summary>
+            <param name="obj">The object to compare with the current target object</param>
+            <returns>true if the specified Object is equal to the current target object; otherwise, false</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.BaseCompositionAopProxy.GetHashCode">
+            <summary>
+            Delgate to the target object generation of the hash code.
+            </summary>
+            <returns>A hash code for the target object.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.BaseCompositionAopProxy.ToString">
+            <summary>
+            Returns a String the represents the target object.
+            </summary>
+            <returns>A String that represents the target object</returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.GlobalAdvisorAdapterRegistry">
+            <summary>
+            Provides Singleton-style access to the default
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry"/> instance.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: GlobalAdvisorAdapterRegistry.cs,v 1.5 2006/04/09 07:18:35 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.DefaultAdvisorAdapterRegistry">
+            <summary>
+            Default implementation of the
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry"/>
+            interface.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: DefaultAdvisorAdapterRegistry.cs,v 1.5 2006/04/09 07:18:35 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.DefaultAdvisorAdapterRegistry.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.Adapter.DefaultAdvisorAdapterRegistry"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This constructor will also register the well-known
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> types.
+            </p>
+            </remarks>
+            <seealso cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.DefaultAdvisorAdapterRegistry.Wrap(System.Object)">
+            <summary>
+            Returns an <see cref="T:Spring.Aop.IAdvisor"/> wrapping the supplied
+            <paramref name="advice"/>.
+            </summary>
+            <param name="advice">
+            The object that should be an advice, such as
+            <see cref="T:Spring.Aop.IBeforeAdvice"/> or
+            <see cref="T:Spring.Aop.IThrowsAdvice"/>.
+            </param>
+            <returns> 
+            An <see cref="T:Spring.Aop.IAdvisor"/> wrapping the supplied
+            <paramref name="advice"/>. Never returns <cref lang="null"/>. If
+            the <paramref name="advice"/> parameter is an
+            <see cref="T:Spring.Aop.IAdvisor"/>, it will simply be returned.
+            </returns>
+            <exception cref="T:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException">
+            If no registered
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> can wrap
+            the supplied <paramref name="advice"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.DefaultAdvisorAdapterRegistry.GetInterceptor(Spring.Aop.IAdvisor)">
+            <summary>
+            Returns an <see cref="T:AopAlliance.Intercept.IInterceptor"/> to
+            allow the use of the supplied <paramref name="advisor"/> in an
+            interception-based framework.
+            </summary>
+            <param name="advisor">The advisor to find an interceptor for.</param>
+            <returns>
+            An interceptor to expose this advisor's behaviour.
+            </returns>
+            <exception cref="T:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException">
+            If the advisor type is not understood by any registered
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.DefaultAdvisorAdapterRegistry.RegisterAdvisorAdapter(Spring.Aop.Framework.Adapter.IAdvisorAdapter)">
+            <summary>
+            Register the given <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/>.
+            </summary>
+            <param name="adapter">
+            An <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> that
+            understands the particular advisor and advice types.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.GlobalAdvisorAdapterRegistry.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.Adapter.GlobalAdvisorAdapterRegistry"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This contructor is marked as <see langword="private"/> to enforce the
+            Singleton pattern
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.Adapter.GlobalAdvisorAdapterRegistry.Instance">
+            <summary>
+            The default <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry"/> instance.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Support.ControlFlowPointcut">
+            <summary>
+            Pointcut and method matcher for use in simple <b>cflow</b>-style
+            pointcuts.
+            </summary>
+            <remarks>
+            <p>
+            Evaluating such pointcuts is slower than evaluating normal pointcuts,
+            but can nevertheless be useful in some cases. Of course, your mileage
+            may vary as to what 'slower' actually means.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: ControlFlowPointcut.cs,v 1.6 2006/04/09 07:18:37 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Support.ControlFlowPointcut.#ctor(System.Type)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Aop.Support.ControlFlowPointcut"/>
+            class.
+            </summary>
+            <param name="type">
+            The class under which <b>all</b> control flows are to be matched.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Support.ControlFlowPointcut.#ctor(System.Type,System.String)">
+            <summary>
+            Construct a new pointcut that matches all calls below the
+            given method in the given class.
+            </summary>
+            <remarks>
+            <p>
+            If the supplied <paramref name="methodName"/> is
+            <see langword="null"/>, <b>all</b> control flows below the given
+            class will be successfully matched.
+            </p>
+            </remarks>
+            <param name="type">
+            The class under which <b>all</b> control flows are to be matched.
+            </param>
+            <param name="methodName">
+            The method name under which <b>all</b> control flows are to be matched.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Support.ControlFlowPointcut.Matches(System.Type)">
+            <summary>
+            Should the pointcut apply to the supplied <see cref="T:System.Type"/>?
+            </summary>
+            <remarks>
+            <p>
+            Subclasses are encouraged to override this method for greater
+            filtering (and performance).
+            </p>
+            <p>
+            This, the default, implementation always matches (returns
+            <see langword="true"/>).
+            </p>
+            </remarks>
+            <param name="type">The candidate target class.</param>
+            <returns>
+            <see langword="true"/> if the advice should apply to the supplied
+            <paramref name="type"/>
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.ControlFlowPointcut.Matches(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Does the supplied <paramref name="method"/> satisfy this matcher?
+            Perform static checking. If this returns false, or if the isRuntime() method
+            returns false, no runtime check will be made.
+            </summary>
+            <remarks>
+            <p>
+            Subclasses are encouraged to override this method if it is possible
+            to filter out some candidate classes.
+            </p>
+            <p>
+            This, the default, implementation always matches (returns
+            <see langword="true"/>). This means that the three argument
+            <see cref="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type,System.Object[])"/>
+            method will always be invoked.
+            </p>
+            </remarks>
+            <param name="method">The candidate method.</param>
+            <param name="targetType">
+            The target class (may be <see langword="null"/>, in which case the
+            candidate class must be taken to be the <paramref name="method"/>'s
+            declaring class).
+            </param>
+            <returns>
+            <see langword="true"/> if this this method matches statically.
+            </returns>
+            <seealso cref="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type)"/>
+        </member>
+        <member name="M:Spring.Aop.Support.ControlFlowPointcut.Matches(System.Reflection.MethodInfo,System.Type,System.Object[])">
+            <summary>
+            Is there a runtime (dynamic) match for the supplied
+            <paramref name="method"/>?
+            </summary>
+            <remarks>
+            <p>
+            Subclasses are encouraged to override this method if it is possible
+            to filter out some candidate classes.
+            </p>
+            </remarks>
+            <param name="method">The candidate method.</param>
+            <param name="targetType">The target class.</param>
+            <param name="args">The arguments to the method</param>
+            <returns>
+            <see langword="true"/> if there is a runtime match.</returns>
+            <seealso cref="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type,System.Object[])"/>
+        </member>
+        <member name="P:Spring.Aop.Support.ControlFlowPointcut.TypeFilter">
+            <summary>
+            The <see cref="T:Spring.Aop.ITypeFilter"/> for this pointcut.
+            </summary>
+            <value>
+            The current <see cref="T:Spring.Aop.ITypeFilter"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Support.ControlFlowPointcut.EvaluationCount">
+            <summary>
+            Gets the number of times this pointcut has been <i>evaluated</i>.
+            </summary>
+            <remarks>
+            <p>
+            Useful as a debugging aid.
+            </p>
+            <p>
+            Note that this value is distinct from the number of times that this
+            pointcut sucessfully matches a target method, in that a
+            <see cref="T:Spring.Aop.Support.ControlFlowPointcut"/> may be evaluated many times but
+            never actually match even once.
+            </p>
+            </remarks>
+            <value>
+            The number of times this pointcut has been <i>evaluated</i>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Support.ControlFlowPointcut.MethodMatcher">
+            <summary>
+            The <see cref="T:Spring.Aop.IMethodMatcher"/> for this pointcut.
+            </summary>
+            <value>
+            The current <see cref="T:Spring.Aop.IMethodMatcher"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Support.ControlFlowPointcut.IsRuntime">
+            <summary>
+            Is this a runtime pointcut?
+            </summary>
+            <remarks>
+            <p>
+            This implementation is a runtime pointcut, and so always returns
+            <see langword="true"/>.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if this is a runtime pointcut.
+            </value>
+            <seealso cref="P:Spring.Aop.IMethodMatcher.IsRuntime"/>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor">
+             <summary>Interceptor to wrap an after throwing advice.</summary>
+             <remarks>
+             <p>
+             Implementations of the <see cref="T:Spring.Aop.IThrowsAdvice"/> interface
+             <b>must</b> define methods of the form...
+             <code lang="C#">
+             AfterThrowing([MethodInfo method, Object[] args, Object target], Exception subclass); 
+             </code>
+             The method name is fixed (i.e. your methods <b>must</b> be named
+             <c>AfterThrowing</c>. The first three arguments (<i>as a whole</i>) are
+             optional, and only useful if futher information about the joinpoint is
+             required. The return type <i>can</i> be anything, but is almost always
+             <see langword="void"/> by convention.
+             </p>
+             <p>
+             Please note that the object encapsulating the throws advice does not
+             need to implement the <see cref="T:Spring.Aop.IThrowsAdvice"/> interface.
+             Throws advice methods are discovered via reflection... the
+             <see cref="T:Spring.Aop.IThrowsAdvice"/> interface serves merely to
+             <i>discover</i> objects that are to be considered as throws advice.
+             Other mechanisms for discovering throws advice such as attributes are
+             also equally valid... all that this class cares about is that a throws
+             advice object implement one or more methods with a valid throws advice
+             signature (see above, and the examples below).
+             </p>
+             <p>
+             This is a framework class that should not normally need to be used
+             directly by Spring.NET users.
+             </p>
+             </remarks>
+             <example>
+             <p>
+             Find below some examples of valid <see cref="T:Spring.Aop.IThrowsAdvice"/>
+             method signatures...
+             </p>
+             <code language="C#">
+             public class GlobalExceptionHandlingAdvice : IThrowsAdvice
+             {
+                 public void AfterThrowing(Exception ex) {
+                     // handles absolutely any and every Exception...
+                 }
+             }
+             </code>
+             <code language="C#">
+             public class RemotingExceptionHandlingAdvice : IThrowsAdvice
+             {
+                 public void AfterThrowing(RemotingException ex) {
+                     // handles any and every RemotingException (and subclasses of RemotingException)...
+                 }
+             }
+             </code>
+             <code language="C#">
+             using System.Data;
+             
+             public class DataExceptionHandlingAdvice
+             {
+                 public void AfterThrowing(ConstraintException ex) {
+                     // specialised handling of ConstraintExceptions
+                 }
+            
+                 public void AfterThrowing(NoNullAllowedException ex) {
+                     // specialised handling of NoNullAllowedExceptions
+                 }
+            
+                 public void AfterThrowing(DataException ex) {
+                     // handles all other DataExceptions...
+                 }
+             }
+             </code>
+             </example>
+             <author>Rod Johnson</author>
+             <author>Aleksandar Seovic (.NET)</author>
+             <version>$Id: ThrowsAdviceInterceptor.cs,v 1.8 2007/05/04 13:16:44 bbaia Exp $</version>
+             <seealso cref="T:Spring.Aop.IThrowsAdvice"/>
+        </member>
+        <member name="F:Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor.exceptionHandlers">
+            <summary>
+            The mapping of exception Types to MethodInfo handlers.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor.#ctor(System.Object)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor"/> class.
+            </summary>
+            <remarks>
+            </remarks>
+            <param name="advice">
+            The throws advice to check for exception handler methods.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="advice"/> is <see langword="null"/>.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If no (0) handler methods were discovered on the supplied <paramref name="advice"/>;
+            or if more than one handler method suitable for a particular
+            <see cref="T:System.Exception"/> type was discovered on the supplied
+            <paramref name="advice"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor.Invoke(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Executes interceptor if (and only if) the supplied
+            <paramref name="invocation"/> throws an exception that is mapped to
+            an appropriate exception handler.
+            </summary>
+            <param name="invocation">
+            The method invocation that is being intercepted.
+            </param>
+            <returns>
+            The result of the call to the
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+            the supplied <paramref name="invocation"/> (this assumes no
+            exception was thrown by the call to the supplied <paramref name="invocation"/>.
+            </returns>
+            <exception cref="T:System.Exception">
+            If any of the interceptors in the chain or the target object itself
+            throws an exception.
+            </exception>
+            <seealso cref="M:AopAlliance.Intercept.IMethodInterceptor.Invoke(AopAlliance.Intercept.IMethodInvocation)"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor.GetExceptionHandler(System.Exception)">
+            <summary>
+            Gets the exception handler (if any) that has been mapped to the
+            supplied <paramref name="exception"/>.
+            </summary>
+            <remarks>
+            <p>
+            Will return <cref lang="null"/> if not found.
+            </p>
+            </remarks>
+            <returns>
+            The exception handler for the <see cref="T:System.Type"/> of the
+            supplied <paramref name="exception"/> given exception.
+            </returns>
+            <param name="exception">exception that was thrown</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor.InvokeHandlerMethod(AopAlliance.Intercept.IMethodInvocation,System.Exception,System.Reflection.MethodInfo)">
+            <summary>
+            Invokes handler method with appropriate number of parameters
+            </summary>
+            <param name="invocation">
+            The original method invocation that was intercepted.
+            </param>
+            <param name="triggeringException">
+            The exception that triggered this interceptor.
+            </param>
+            <param name="handlerMethod">
+            The exception handler method to invoke.
+            </param>
+        </member>
+        <member name="P:Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor.HandlerMethodCount">
+            <summary>
+            Convenience property that returns the number of exception handler
+            methods managed by this interceptor.
+            </summary>
+            <value>
+            The number of exception handler methods managed by this interceptor.
+            </value>
+        </member>
+        <member name="T:Spring.Aspects.Validation.ParameterValidationAdvisor">
+            <summary>
+            Convinience advisor implementation that applies <see cref="T:Spring.Aspects.Validation.ParameterValidationAdvice"/>
+            to all the methods that have <see cref="T:Spring.Validation.ValidatedAttribute"/> defined on one or
+            more of their parameters.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: ParameterValidationAdvisor.cs,v 1.1 2008/05/26 09:17:50 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Validation.ParameterValidationAdvisor.#ctor">
+            <summary>
+            Creates new advisor instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.Validation.ParameterValidationAdvisor.Matches(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Returns <c>true</c> if any of the parameters of the specified <paramref name="method"/>
+            has <see cref="T:Spring.Validation.ValidatedAttribute"/> applied.
+            </summary>
+            <param name="method">
+            Method to check.
+            </param>
+            <param name="targetType">
+            Type of target object.
+            </param>
+            <returns>
+            <c>true</c> if any of the parameters of the specified <paramref name="method"/>
+            has <see cref="T:Spring.Validation.ValidatedAttribute"/> applied; <c>false</c> otherwise.
+            </returns>
+        </member>
+        <member name="P:Spring.Aspects.Validation.ParameterValidationAdvisor.ApplicationContext">
+            <summary>
+            Set the <see cref="T:Spring.Context.IApplicationContext"/> that this
+            object runs in.
+            </summary>
+            <remarks>
+            <p>
+            Normally this call will be used to initialize the object.
+            </p>
+            <p>
+            Invoked after population of normal object properties but before an
+            init callback such as
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            or a custom init-method. Invoked after the setting of any
+            <see cref="T:Spring.Context.IResourceLoaderAware"/>'s
+            <see cref="P:Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+            property.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Context.ApplicationContextException">
+            In the case of application context initialization errors.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If thrown by any application context methods.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectInitializationException"/>
+        </member>
+        <member name="T:Spring.Aspects.Exceptions.TranslationExceptionHandler">
+            <summary>
+            Translates from one exception to another based.  My wrap or replace exception depending on the expression.
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: TranslationExceptionHandler.cs,v 1.3 2007/10/10 18:07:46 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.TranslationExceptionHandler.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.Exceptions.TranslationExceptionHandler"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.TranslationExceptionHandler.#ctor(System.String[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.Exceptions.TranslationExceptionHandler"/> class.
+            </summary>
+            <param name="exceptionNames">The exception names.</param>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.TranslationExceptionHandler.HandleException(System.Collections.IDictionary)">
+            <summary>
+            Handles the exception.
+            </summary>
+            <returns>The return value from handling the exception, if not rethrown or a new exception is thrown.</returns>
+        </member>
+        <member name="T:Spring.Aop.TrueMethodMatcher">
+            <summary>
+            Canonical <see cref="T:Spring.Aop.IMethodMatcher"/> that matches
+            <b>all</b> methods.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: TrueMethodMatcher.cs,v 1.5 2006/04/09 07:18:36 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.TrueMethodMatcher.True">
+            <summary>
+            Canonical instance that matches <b>all</b> methods.
+            </summary>
+            <remarks>
+            <p>
+            It is not dynamic.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.TrueMethodMatcher.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.TrueMethodMatcher"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly visible
+            constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.TrueMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Does the supplied <paramref name="method"/> satisfy this matcher?
+            Perform static checking. If this returns false, or if the isRuntime() method
+            returns false, no runtime check will be made.
+            </summary>
+            <param name="method">The candidate method.</param>
+            <param name="targetType">
+            The target class (may be <see langword="null"/>, in which case the
+            candidate class must be taken to be the <paramref name="method"/>'s
+            declaring class).
+            </param>
+            <returns>
+            <see langword="true"/> if this this method matches statically.
+            </returns>
+            <seealso cref="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type)"/>
+        </member>
+        <member name="M:Spring.Aop.TrueMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type,System.Object[])">
+            <summary>
+            Is there a runtime (dynamic) match for the supplied
+            <paramref name="method"/>?
+            </summary>
+            <param name="method">The candidate method.</param>
+            <param name="targetType">The target class.</param>
+            <param name="args">The arguments to the method</param>
+            <returns>
+            <see langword="true"/> if there is a runtime match.</returns>
+            <seealso cref="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type,System.Object[])"/>
+        </member>
+        <member name="M:Spring.Aop.TrueMethodMatcher.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.IMethodMatcher"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.IMethodMatcher"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.TrueMethodMatcher.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="P:Spring.Aop.TrueMethodMatcher.IsRuntime">
+            <summary>
+            Is this <see cref="T:Spring.Aop.IMethodMatcher"/> dynamic?
+            </summary>
+            <value>
+            <see langword="true"/> if this
+            <see cref="T:Spring.Aop.IMethodMatcher"/> is dynamic.
+            </value>
+            <seealso cref="P:Spring.Aop.IMethodMatcher.IsRuntime"/>
+        </member>
+        <member name="T:Spring.Aop.Framework.ITargetAware">
+            <summary>
+            Provides access to the target object of an AOP proxy.
+            </summary>
+            <remarks>
+            <p>
+            To be implemented by introduction aspects in order to obtain access to
+            the target object.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ITargetAware.cs,v 1.3 2006/04/09 07:18:35 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Aop.Framework.ITargetAware.TargetProxy">
+            <summary>
+            Sets the <see cref="T:Spring.Aop.Framework.IAopProxy"/> target object.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.DecoratorAopProxyTypeBuilder">
+            <summary>
+            Builds an AOP proxy type using the decorator pattern.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: DecoratorAopProxyTypeBuilder.cs,v 1.17 2007/12/07 17:58:56 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.DecoratorAopProxyTypeBuilder.advisedProxyField">
+            <summary>
+            AdvisedProxy instance calls should be delegated to.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.DecoratorAopProxyTypeBuilder.#ctor(Spring.Aop.Framework.IAdvised)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Aop.Framework.DynamicProxy.DecoratorAopProxyTypeBuilder"/> class.
+            </summary>
+            <param name="advised">The proxy configuration.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.DecoratorAopProxyTypeBuilder.BuildProxyType">
+            <summary>
+            Creates the proxy type.
+            </summary>
+            <returns>The generated proxy class.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.DecoratorAopProxyTypeBuilder.PushAdvisedProxy(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes  
+            the current <see cref="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> 
+            instance on stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.DecoratorAopProxyTypeBuilder.DeclareAdvisedProxyInstanceField(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Declares field that holds the <see cref="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
+            instance used by the proxy.
+            </summary>
+            <param name="builder">
+            The <see cref="T:System.Type"/> builder to use for code generation.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.DecoratorAopProxyTypeBuilder.ImplementGetObjectDataMethod(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements serialization method.
+            </summary>
+            <param name="typeBuilder"></param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.DecoratorAopProxyTypeBuilder.ImplementSerializationConstructor(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements serialization constructor.
+            </summary>
+            <param name="typeBuilder">Type builder to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.DecoratorAopProxyTypeBuilder.ImplementConstructors(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements constructors for the proxy class.
+            </summary>
+            <remarks>
+            <p>
+            This implementation creates a new instance 
+            of the <see cref="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> class.
+            </p>
+            </remarks>
+            <param name="typeBuilder">
+            The <see cref="T:System.Type"/> builder to use.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.DecoratorAopProxyTypeBuilder.ImplementIAopProxy(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements <see cref="T:Spring.Aop.Framework.IAopProxy"/> interface.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.DecoratorAopProxyTypeBuilder.IsDecoratorProxy(System.Type)">
+            <summary>
+            Determines if the specified <paramref name="type"/> 
+            is one of those generated by this builder.
+            </summary>
+            <param name="type">The type to check.</param>
+            <returns>
+            <see langword="true"/> if the type is a decorator-based proxy;
+            otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.AopConfigException">
+            <summary>
+            Thrown in response to the misconfiguration of an AOP proxy.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: AopConfigException.cs,v 1.4 2006/04/09 07:18:35 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopConfigException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.AopConfigException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopConfigException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.AopConfigException"/> class with
+            the specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopConfigException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.AopConfigException"/> class with
+            the specified message and root cause.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopConfigException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.AopConfigException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Aop.Config.AopNamespaceParser">
+            <summary>
+            Namespace parser for the aop namespace.
+            </summary>
+            <remarks>
+            Using the <code>advisor</code> tag you can configure an <see cref="T:Spring.Aop.IAdvisor"/> and have it
+            applied to all the relevant objects in your application context automatically.  The
+            <code>advisor</code> tag supports only referenced <see cref="T:Spring.Aop.IPointcut"/>s.
+            </remarks>
+            <author>Rob harrop</author>
+            <author>Adrian Colyer</author>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AopNamespaceParser.cs,v 1.3 2007/08/09 02:42:35 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Config.AopNamespaceParser.Init">
+            <summary>
+            Register the <see cref="T:Spring.Objects.Factory.Xml.IObjectDefinitionParser"/> for the '<code>config</code>' tag.
+            </summary>
+        </member>
+        <member name="T:Spring.Aspects.Logging.AbstractLoggingAdvice">
+             <summary>
+             Abstract base class for logging advice
+             </summary>
+             <remarks>
+            
+             </remarks>
+             <author>Mark Pollack</author>
+             <version>$Id: AbstractLoggingAdvice.cs,v 1.2 2007/12/06 17:17:19 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Aspects.Logging.AbstractLoggingAdvice.defaultLogger">
+            <summary>
+            The default <code>ILog</code> instance used to write logging messages.
+            </summary>
+        </member>
+        <member name="F:Spring.Aspects.Logging.AbstractLoggingAdvice.hideProxyTypeNames">
+            <summary>
+            Indicates whether or not proxy type names should be hidden when using dynamic loggers.
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.Logging.AbstractLoggingAdvice.Invoke(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Adds logging to the method invocation.  
+            </summary>
+            <remarks>
+            The method IsInterceptorEnabled is called
+            as an optimization to determine if logging should be applied.  If logging should be 
+            applied, the method invocation is passed to the InvokeUnderLog method for handling.
+            If not, the method proceeds as normal. 
+            </remarks>
+            <param name="invocation">
+            The method invocation that is being intercepted.
+            </param>
+            <returns>
+            The result of the call to the
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+            the supplied <paramref name="invocation"/>; this return value may
+            well have been intercepted by the interceptor.
+            </returns>
+            <exception cref="T:System.Exception">
+            If any of the interceptors in the chain or the target object itself
+            throws an exception.
+            </exception>
+        </member>
+        <member name="M:Spring.Aspects.Logging.AbstractLoggingAdvice.IsInterceptorEnabled(AopAlliance.Intercept.IMethodInvocation,Common.Logging.ILog)">
+            <summary>
+            Determines whether the interceptor is enabled for the specified invocation, that
+            is, whether the method InvokeUnderLog is called.
+            </summary>
+            <remarks>The default behavior is to check whether the given ILog instance
+            is enabled by calling IsLogEnabled, whose default behavior is to check if
+            the TRACE level of logging is enabled.  Subclasses</remarks>
+            <param name="invocation">The invocation.</param>
+            <param name="log">The log to write messages to</param>
+            <returns>
+            	<c>true</c> if [is interceptor enabled] [the specified invocation]; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aspects.Logging.AbstractLoggingAdvice.IsLogEnabled(Common.Logging.ILog)">
+            <summary>
+            Determines whether the given log is enabled.
+            </summary>
+            <remarks>
+            Default is true when the trace level is enabled.  Subclasses may override this
+            to change the level at which logging occurs, or return true to ignore level
+            checks.</remarks>
+            <param name="log">The log instance to check.</param>
+            <returns>
+            	<c>true</c> if log is for a given log level; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aspects.Logging.AbstractLoggingAdvice.InvokeUnderLog(AopAlliance.Intercept.IMethodInvocation,Common.Logging.ILog)">
+            <summary>
+            Subclasses must override this method to perform any tracing around the supplied
+            IMethodInvocation.
+            </summary>
+            <remarks>
+            Subclasses are resonsible for ensuring that the IMethodInvocation actually executes
+            by calling IMethodInvocation.Proceed().
+            <para>
+            By default, the passed-in ILog instance will have log level
+            "trace" enabled. Subclasses do not have to check for this again, unless
+            they overwrite the IsInterceptorEnabled method to modify
+            the default behavior.
+            </para>
+            </remarks>
+            <param name="invocation">The method invocation to log</param>
+            <param name="log">The log to write messages to</param>
+            <returns>The result of the call to IMethodInvocation.Proceed()
+            </returns>
+            <exception cref="T:System.Exception">
+            If any of the interceptors in the chain or the target object itself
+            throws an exception.
+            </exception>
+        </member>
+        <member name="M:Spring.Aspects.Logging.AbstractLoggingAdvice.GetLoggerForInvocation(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Gets the appropriate log instance to use for the given IMethodInvocation.
+            </summary>
+            <remarks>
+            If the UseDynamicLogger property is set to true, the ILog instance will be
+            for the target class of the IMethodInvocation, otherwise the log will be the
+            default static logger.
+            </remarks>
+            <param name="invocation">The method invocation being logged.</param>
+            <returns>The ILog instance to use.</returns>
+        </member>
+        <member name="P:Spring.Aspects.Logging.AbstractLoggingAdvice.UseDynamicLogger">
+            <summary>
+            Sets a value indicating whether to use a dynamic logger or static logger
+            </summary>
+            <remarks>Default is to use a static logger.
+            <para>
+            Used to determine which ILog instance should be used to write log messages for
+            a particular method invocation: a dynamic one for the Type getting called,
+            or a static one for the Type of the trace interceptor.
+            </para>
+            <para>
+            Specify either this property or LoggerName, not both.
+            </para>
+            </remarks>
+            <value><c>true</c> if use dynamic logger; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Aspects.Logging.AbstractLoggingAdvice.LoggerName">
+            <summary>
+            Sets the name of the logger to use.
+            </summary>
+            <remarks>
+            The name will be passed to the underlying logging implementation through Common.Logging,
+            getting interpreted as the log category according to the loggers configuration.
+            <para>
+            This can be specified to not log into the category of a Type (whether this
+            interceptor's class or the class getting called) but rather to a specific named category.
+            </para>
+            <para>
+            Specify either this property or UseDynamicLogger, but not both.
+            </para>
+            </remarks>
+            <value>The name of the logger.</value>
+        </member>
+        <member name="P:Spring.Aspects.Logging.AbstractLoggingAdvice.HideProxyTypeNames">
+            <summary>
+            Sets a value indicating whether hide proxy type names (whenever possible)
+            when using dynamic loggers, i.e. property UseDynamicLogger is set to true.
+            </summary>
+            <value><c>true</c> if [hide proxy type names]; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="T:Spring.Aspects.Exceptions.ExceptionHandlerAdvice">
+            <summary>
+            Exception advice to perform exception translation, conversion of exceptions to default return values, and
+            exception swallowing.  Configuration is via a DSL like string for ease of use in common cases as well as
+            allowing for custom translation logic by leveraging the Spring expression language.
+            </summary>
+            <remarks>
+            <para>
+            The exception handler collection can be filled with either instances of objects that implement the interface
+            <see cref="T:Spring.Aspects.IExceptionHandler"/> or a string that follows a simple syntax for most common exception management
+            needs.  The source exceptions to perform processing on are listed immediately after the keyword 'on' and can
+            be comma delmited.  Following that is the action to perform, either log, translate, wrap, replace, return, or
+            swallow.  Following the action is a Spring expression language (SpEL) fragment that is used to either create the
+            translated/wrapped/replaced exception or specify an alternative return value.  The variables available to be
+            used in the expression language fragment are, #method, #args, #target, and #e which are 1) the method that
+            threw the exception, the arguments to the method, the target object itself, and the exception that was thrown.
+            Using SpEL gives you great flexibility in creating a translation of an exception that has access to the calling context.
+            </para>
+            <para>Common translation cases, wrap and rethrow, are supported with a shorter syntax where you can specify only
+            the exception text for the new translated exception.  If you ommit the exception text a default value will be
+            used.</para>
+            <para>The exceptionsHandlers are compared to the thrown exception in the order they are listed.  logging
+            an exception will continue the evaluation process, in all other cases exceution stops at that point and the
+            appropriate exceptions handler is executed.</para>
+            <code escaped="true">
+            <property name="exceptionHandlers">
+              <list>
+                <value>on FooException1 log 'My Message, Method Name ' + #method.Name</value>
+                <value>on FooException1 translate new BarException('My Message, Method Called = ' + #method.Name", #e)</value>
+                <value>on FooException2,Foo3Exception wrap BarException 'My Bar Message'</value>
+                <value>on FooException4 replace BarException 'My Bar Message'</value>
+                <value>on FooException5 return 32</value>
+                <value>on FooException6 swallow</value>
+                <ref object="exceptionExpression"/>
+              </list>
+            </property>
+            </code>
+            
+            </remarks>
+            <author>Mark Pollack</author>
+            <version>$Id: ExceptionHandlerAdvice.cs,v 1.9 2007/10/11 01:29:42 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aspects.AbstractExceptionHandlerAdvice">
+             <summary>
+             This is 
+             </summary>
+             <remarks>
+            
+             </remarks>
+             <author>Mark Pollack</author>
+             <version>$Id: AbstractExceptionHandlerAdvice.cs,v 1.1 2007/10/08 22:05:16 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.AbstractExceptionHandlerAdvice.Invoke(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Implement this method to perform extra treatments before and after
+            the call to the supplied <paramref name="invocation"/>.
+            </summary>
+            <remarks>
+            <p>
+            Polite implementations would certainly like to invoke
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/>. 
+            </p>
+            </remarks>
+            <param name="invocation">
+            The method invocation that is being intercepted.
+            </param>
+            <returns>
+            The result of the call to the
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+            the supplied <paramref name="invocation"/>; this return value may
+            well have been intercepted by the interceptor.
+            </returns>
+            <exception cref="T:System.Exception">
+            If any of the interceptors in the chain or the target object itself
+            throws an exception.
+            </exception>
+        </member>
+        <member name="M:Spring.Aspects.AbstractExceptionHandlerAdvice.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has injected all of an object's dependencies.
+            </summary>
+            <remarks>
+            <p>
+            This method allows the object instance to perform the kind of
+            initialization only possible when all of it's dependencies have
+            been injected (set), and to throw an appropriate exception in the
+            event of misconfiguration.
+            </p>
+            <p>
+            Please do consult the class level documentation for the
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> interface for a
+            description of exactly <i>when</i> this method is invoked. In
+            particular, it is worth noting that the
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            and <see cref="T:Spring.Context.IApplicationContextAware"/>
+            callbacks will have been invoked <i>prior</i> to this method being
+            called.
+            </p>
+            </remarks>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as the failure to set a
+            required property) or if initialization fails.
+            </exception>
+        </member>
+        <member name="M:Spring.Aspects.AbstractExceptionHandlerAdvice.ParseAdviceExpression(System.String)">
+            <summary>
+            Parses the advice expression.
+            </summary>
+            <param name="adviceExpression">The advice expression.</param>
+            <returns>An instance of ParsedAdviceExpression</returns>
+        </member>
+        <member name="M:Spring.Aspects.AbstractExceptionHandlerAdvice.GetMatch(System.String,System.String)">
+            <summary>
+            Gets the match using exception constraint expression.
+            </summary>
+            <param name="adviceExpressionString">The advice expression string.</param>
+            <param name="regexString">The regex string.</param>
+            <returns>The Match object resulting from the regular expression match.</returns>
+        </member>
+        <member name="P:Spring.Aspects.AbstractExceptionHandlerAdvice.OnExceptionNameRegex">
+            <summary>
+            Gets or sets the Regex string used to parse advice expressions starting with 'on exception name' and subclass specific actions.
+            </summary>
+            <value>The regex string to parse advice expressions starting with 'on exception name' and subclass specific actions.</value>
+        </member>
+        <member name="P:Spring.Aspects.AbstractExceptionHandlerAdvice.OnExceptionRegex">
+            <summary>
+            Gets or sets the Regex string used to parse advice expressions starting with 'on exception (constraint)' and subclass specific actions.
+            </summary>
+            <value>The regex string to parse advice expressions starting with 'on exception (constraint)' and subclass specific actions.</value>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.ExceptionHandlerAdvice.Invoke(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Implement this method to perform extra treatments before and after
+            the call to the supplied <paramref name="invocation"/>.
+            </summary>
+            <remarks>
+            <p>
+            Polite implementations would certainly like to invoke
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/>. 
+            </p>
+            </remarks>
+            <param name="invocation">
+            The method invocation that is being intercepted.
+            </param>
+            <returns>
+            The result of the call to the
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+            the supplied <paramref name="invocation"/>; this return value may
+            well have been intercepted by the interceptor.
+            </returns>
+            <exception cref="T:System.Exception">
+            If any of the interceptors in the chain or the target object itself
+            throws an exception.
+            </exception>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.ExceptionHandlerAdvice.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has injected all of an object's dependencies.
+            </summary>
+            <remarks>
+            <p>
+            This method allows the object instance to perform the kind of
+            initialization only possible when all of it's dependencies have
+            been injected (set), and to throw an appropriate exception in the
+            event of misconfiguration.
+            </p>
+            <p>
+            Please do consult the class level documentation for the
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> interface for a
+            description of exactly <i>when</i> this method is invoked. In
+            particular, it is worth noting that the
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            and <see cref="T:Spring.Context.IApplicationContextAware"/>
+            callbacks will have been invoked <i>prior</i> to this method being
+            called.
+            </p>
+            </remarks>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as the failure to set a
+            required property) or if initialization fails.
+            </exception>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.ExceptionHandlerAdvice.InvokeHandlers(System.Exception,AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Invokes handlers registered for the passed exception and <see cref="T:AopAlliance.Intercept.IMethodInvocation"/>
+            </summary>
+            <param name="ex">The exception to be handled</param>
+            <param name="invocation">The <see cref="T:AopAlliance.Intercept.IMethodInvocation"/> that raised this exception.</param>
+            <returns>The output of <see cref="M:Spring.Aspects.IExceptionHandler.HandleException(System.Collections.IDictionary)"/> </returns>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.ExceptionHandlerAdvice.Parse(System.String)">
+            <summary>
+            Parses the specified handler string, creating an instance of IExceptionHander.
+            </summary>
+            <param name="handlerString">The handler string.</param>
+            <returns>an instance of an exception handler or null if was not able to correctly parse
+            handler string.</returns>
+        </member>
+        <member name="P:Spring.Aspects.Exceptions.ExceptionHandlerAdvice.OnExceptionNameRegex">
+            <summary>
+            Gets or sets the Regex string used to parse advice expressions starting with 'on exception name' and exception handling actions.
+            </summary>
+            <value>The regex string to parse advice expressions starting with 'on exception name' and exception handling actions.</value>
+        </member>
+        <member name="P:Spring.Aspects.Exceptions.ExceptionHandlerAdvice.OnExceptionRegex">
+            <summary>
+            Gets or sets the Regex string used to parse advice expressions starting with 'on exception (constraint)' and exception handling actions.
+            </summary>
+            <value>The regex string to parse advice expressions starting with 'on exception (constraint)' and exception handling actions.</value>
+        </member>
+        <member name="P:Spring.Aspects.Exceptions.ExceptionHandlerAdvice.ExceptionHandlers">
+            <summary>
+            Gets or sets the exception handler.
+            </summary>
+            <value>The exception handler.</value>
+        </member>
+        <member name="T:Spring.Aop.Support.DynamicMethodMatcherPointcutAdvisor">
+            <summary>
+            Convenient superclass for <see cref="T:Spring.Aop.IAdvisor"/>s
+            that are also dynamic pointcuts.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: DynamicMethodMatcherPointcutAdvisor.cs,v 1.6 2007/03/16 04:01:24 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Support.DynamicMethodMatcher">
+            <summary>
+            Convenient abstract superclass for dynamic method matchers that do
+            care about arguments at runtime.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: DynamicMethodMatcher.cs,v 1.5 2006/04/09 07:18:37 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Support.DynamicMethodMatcher.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.DynamicMethodMatcher"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no
+            public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Support.DynamicMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Does the supplied <paramref name="method"/> satisfy this matcher?
+            </summary>
+            <remarks>
+            <p>
+            Derived classes can override this method to add preconditions for
+            dynamic matching.
+            </p>
+            <p>
+            This implementation always returns <see langword="true"/>.
+            </p>
+            </remarks>
+            <param name="method">The candidate method.</param>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/> (may be <see langword="null"/>,
+            in which case the candidate <see cref="T:System.Type"/> must be taken
+            to be the <paramref name="method"/>'s declaring class).
+            </param>
+            <returns>
+            <see langword="true"/> if this this method matches statically.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.DynamicMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type,System.Object[])">
+            <summary>
+            Is there a runtime (dynamic) match for the supplied
+            <paramref name="method"/>?
+            </summary>
+            <remarks>
+            <p>
+            Must be overriden by derived classes to provide criteria for dynamic matching.
+            </p>
+            </remarks>
+            <param name="method">The candidate method.</param>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/>.
+            </param>
+            <param name="args">The arguments to the method</param>
+            <returns>
+            <see langword="true"/> if there is a runtime match.</returns>
+        </member>
+        <member name="P:Spring.Aop.Support.DynamicMethodMatcher.IsRuntime">
+            <summary>
+            Is this <see cref="T:Spring.Aop.IMethodMatcher"/> dynamic?
+            </summary>
+            <value>
+            Always returns <see langword="true"/>, to specify that this is a
+            dynamic matcher.
+            </value>
+        </member>
+        <member name="M:Spring.Aop.Support.DynamicMethodMatcherPointcutAdvisor.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.DynamicMethodMatcherPointcutAdvisor"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an abstract class, and as such has no publicly
+            visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Support.DynamicMethodMatcherPointcutAdvisor.#ctor(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.DynamicMethodMatcherPointcutAdvisor"/>
+            class for the supplied <paramref name="advice"/>.
+            </summary>
+            <remarks>
+            <p>
+            This is an abstract class, and as such has no publicly
+            visible constructors.
+            </p>
+            </remarks>
+            <param name="advice">
+            The advice portion of this advisor.
+            </param>
+        </member>
+        <member name="P:Spring.Aop.Support.DynamicMethodMatcherPointcutAdvisor.IsPerInstance">
+            <summary>
+            Is this advice associated with a particular instance?
+            </summary>
+            <remarks>
+            <p>
+            Not supported for dynamic advisors.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if this advice is associated with a
+            particular instance.
+            </value>
+            <exception cref="T:System.NotSupportedException">Always.</exception>
+            <see cref="P:Spring.Aop.IAdvisor.IsPerInstance"/>
+        </member>
+        <member name="P:Spring.Aop.Support.DynamicMethodMatcherPointcutAdvisor.TypeFilter">
+            <summary>
+            The <see cref="T:Spring.Aop.ITypeFilter"/> for this pointcut.
+            </summary>
+            <remarks>
+            <p>
+            This implementation always returns a filter that evaluates to <see langword="true"/>
+            for any <see cref="T:System.Type"/>.
+            </p>
+            </remarks>
+            <value>
+            The current <see cref="T:Spring.Aop.ITypeFilter"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Support.DynamicMethodMatcherPointcutAdvisor.MethodMatcher">
+            <summary>
+            The <see cref="T:Spring.Aop.IMethodMatcher"/> for this pointcut.
+            </summary>
+            <remarks>
+            <p>
+            This implementation always returns itself (this object).
+            </p>
+            </remarks>
+            <value>
+            The current <see cref="T:Spring.Aop.IMethodMatcher"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Support.DynamicMethodMatcherPointcutAdvisor.Order">
+            <summary>
+            Returns this <see cref="T:Spring.Aop.IAdvisor"/>s order in the
+            interception chain.
+            </summary>
+            <returns>
+            This <see cref="T:Spring.Aop.IAdvisor"/>s order in the
+            interception chain.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.DynamicMethodMatcherPointcutAdvisor.Advice">
+            <summary>
+            Return the advice part of this aspect.
+            </summary>
+            <returns>
+            The advice that should apply if the pointcut matches.
+            </returns>
+            <see cref="P:Spring.Aop.IAdvisor.Advice"/>
+        </member>
+        <member name="P:Spring.Aop.Support.DynamicMethodMatcherPointcutAdvisor.Pointcut">
+            <summary>
+            The <see cref="T:Spring.Aop.IPointcut"/> that drives this advisor.
+            </summary>
+            <remarks>
+            <p>
+            This implementation always returns itself (this object).
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor">
+            <summary>
+            <see cref="T:AopAlliance.Intercept.IInterceptor"/> implementation that
+            wraps <see cref="T:Spring.Aop.IMethodBeforeAdvice"/> instances.
+            </summary>
+            <remarks>
+            <p>
+            In the future Spring.NET may also offer a more efficient alternative
+            solution in cases where there is no interception advice and therefore
+            no need to create an <see cref="T:AopAlliance.Intercept.IMethodInvocation"/>
+            object.
+            </p>
+            <p>
+            Used internally by the Spring.NET AOP framework: application developers
+            should not need to use this class directly.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: MethodBeforeAdviceInterceptor.cs,v 1.5 2007/03/16 04:01:21 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor.#ctor(Spring.Aop.IMethodBeforeAdvice)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor"/>
+            class.
+            </summary>
+            <param name="advice">
+            The <see cref="T:Spring.Aop.IMethodBeforeAdvice"/> that is to be wrapped.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="advice"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.MethodBeforeAdviceInterceptor.Invoke(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Executes interceptor before the target method successfully returns.
+            </summary>
+            <param name="invocation">
+            The method invocation that is being intercepted.
+            </param>
+            <returns>
+            The result of the call to the
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+            the supplied <paramref name="invocation"/>.
+            </returns>
+            <exception cref="T:System.Exception">
+            If any of the interceptors in the chain or the target object itself
+            throws an exception.
+            </exception>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.DefaultAopProxyFactory">
+            <summary>
+            Default implementation of the
+            <see cref="T:Spring.Aop.Framework.IAopProxyFactory"/> interface,
+            either creating a decorator-based dynamic proxy or 
+            a composition-based dynamic proxy.
+            </summary>
+            <remarks>
+            <p>
+            Creates a decorator-base proxy if one the following is true :
+            - the "ProxyTargetType" property is set
+            - no interfaces have been specified
+            </p>
+            <p>
+            In general, specify "ProxyTargetType" to enforce a decorator-based proxy,
+            or specify one or more interfaces to use a composition-based proxy.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <author>Bruno Baia (.NET)</author>
+            <seealso cref="T:Spring.Aop.Framework.IAopProxyFactory"/>
+            <version>$Id: DefaultAopProxyFactory.cs,v 1.2 2007/08/02 16:28:29 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.IAopProxyFactory">
+            <summary> 
+            Factory interface for the creation of AOP proxies based on
+            <see cref="T:Spring.Aop.Framework.AdvisedSupport"/> configuration
+            objects.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IAopProxyFactory.cs,v 1.3 2006/04/09 07:18:35 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.IAopProxyFactory.CreateAopProxy(Spring.Aop.Framework.AdvisedSupport)">
+            <summary>
+            Creates an <see cref="T:Spring.Aop.Framework.IAopProxy"/> for the
+            supplied <paramref name="advisedSupport"/> configuration.
+            </summary>
+            <param name="advisedSupport">The AOP configuration.</param>
+            <returns>An <see cref="T:Spring.Aop.Framework.IAopProxy"/>.</returns>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If the supplied <paramref name="advisedSupport"/> configuration is
+            invalid.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.DefaultAopProxyFactory.CreateAopProxy(Spring.Aop.Framework.AdvisedSupport)">
+            <summary>
+            Creates an <see cref="T:Spring.Aop.Framework.IAopProxy"/> for the
+            supplied <paramref name="advisedSupport"/> configuration.
+            </summary>
+            <param name="advisedSupport">The AOP configuration.</param>
+            <returns>An <see cref="T:Spring.Aop.Framework.IAopProxy"/>.</returns>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If the supplied <paramref name="advisedSupport"/> configuration is
+            invalid.
+            </exception>
+            <seealso cref="M:Spring.Aop.Framework.IAopProxyFactory.CreateAopProxy(Spring.Aop.Framework.AdvisedSupport)"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.DefaultAopProxyFactory.BuildProxyType(Spring.Proxy.IProxyTypeBuilder)">
+            <summary>
+            Generates the proxy type.
+            </summary>
+            <param name="typeBuilder">
+            The <see cref="T:Spring.Proxy.IProxyTypeBuilder"/> to use
+            </param>
+            <returns>The generated proxy class.</returns>
+        </member>
+        <member name="T:Spring.Aspects.Cache.InvalidateCacheAdvisor">
+            <summary>
+            Convinience advisor implementation that applies <see cref="T:Spring.Aspects.Cache.InvalidateCacheAdvice"/>
+            to all the methods that have <see cref="T:Spring.Caching.InvalidateCacheAttribute"/> defined.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: InvalidateCacheAdvisor.cs,v 1.1 2007/02/16 03:13:01 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Cache.InvalidateCacheAdvisor.#ctor">
+            <summary>
+            Creates new advisor instance.
+            </summary>
+        </member>
+        <member name="P:Spring.Aspects.Cache.InvalidateCacheAdvisor.ApplicationContext">
+            <summary>
+            Set the <see cref="T:Spring.Context.IApplicationContext"/> that this
+            object runs in.
+            </summary>
+            <remarks>
+            <p>
+            Normally this call will be used to initialize the object.
+            </p>
+            <p>
+            Invoked after population of normal object properties but before an
+            init callback such as
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            or a custom init-method. Invoked after the setting of any
+            <see cref="T:Spring.Context.IResourceLoaderAware"/>'s
+            <see cref="P:Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+            property.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Context.ApplicationContextException">
+            In the case of application context initialization errors.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If thrown by any application context methods.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectInitializationException"/>
+        </member>
+        <member name="T:Spring.Aop.Framework.AbstractMethodInvocation">
+            <summary>
+            Convenience base class for <see cref="T:AopAlliance.Intercept.IMethodInvocation"/>
+            implementations.
+            </summary>
+            <remarks>
+            <p>
+            Subclasses can override the
+            <see cref="M:Spring.Aop.Framework.AbstractMethodInvocation.InvokeJoinpoint"/>
+            method to change this behavior, so this is a useful/ base class for
+            <see cref="T:AopAlliance.Intercept.IMethodInvocation"/> implementations.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <author>Rick Evans (.NET)</author>
+            <author>Bruno Baia (.NET)</author>
+            <version>$Id: AbstractMethodInvocation.cs,v 1.8 2007/07/05 20:29:21 bbaia Exp $</version>
+        </member>
+        <member name="T:AopAlliance.Intercept.IMethodInvocation">
+            <summary>
+            Description of an invocation to a method, given to an interceptor
+            upon method-call.
+            </summary>
+            <remarks>
+            <p>
+            A method invocation is a joinpoint and can be intercepted by a method
+            interceptor.
+            </p>
+            </remarks>
+            <seealso cref="T:AopAlliance.Intercept.IMethodInterceptor"/>
+        </member>
+        <member name="P:AopAlliance.Intercept.IMethodInvocation.Method">
+            <summary>
+            Gets the method invocation that is to be invoked.
+            </summary>
+            <remarks>
+            <p>
+            This property is a friendly implementation of the
+            <see cref="P:AopAlliance.Intercept.IJoinpoint.StaticPart"/> property.
+            It should be used in preference to the
+            <see cref="P:AopAlliance.Intercept.IJoinpoint.StaticPart"/> property
+            because it provides immediate access to the underlying method
+            without the need to resort to a cast.
+            </p>
+            </remarks>
+            <value>
+            The method invocation that is to be invoked.
+            </value>
+        </member>
+        <member name="P:AopAlliance.Intercept.IMethodInvocation.Proxy">
+            <summary>
+            Gets the proxy object for the invocation.
+            </summary>
+            <value>
+            The proxy object for this method invocation.
+            </value>
+        </member>
+        <member name="P:AopAlliance.Intercept.IMethodInvocation.Target">
+            <summary>
+            Gets the target object for the invocation.
+            </summary>
+            <value>
+            The target object for this method invocation.
+            </value>
+        </member>
+        <member name="P:AopAlliance.Intercept.IMethodInvocation.TargetType">
+            <summary>
+            Gets the type of the target object.
+            </summary>
+            <value>
+            The type of the target object.
+            </value>
+        </member>
+        <member name="F:Spring.Aop.Framework.AbstractMethodInvocation.arguments">
+            <summary>
+            The arguments (if any = may be <see lang="null"/>) to the method
+            that is to be invoked.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AbstractMethodInvocation.target">
+            <summary>
+            The target object that the method is to be invoked on.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AbstractMethodInvocation.proxy">
+            <summary>
+            The AOP proxy for the target object.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AbstractMethodInvocation.method">
+            <summary>
+            The method invocation that is to be invoked.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AbstractMethodInvocation.interceptors">
+            <summary>
+            The list of <see cref="T:AopAlliance.Intercept.IMethodInterceptor"/> and
+            <cref see="Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
+            that need dynamic checks.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AbstractMethodInvocation.targetType">
+            <summary>
+            The declaring type of the method that is to be invoked.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AbstractMethodInvocation.currentInterceptorIndex">
+            <summary>
+            The index from 0 of the current interceptor we're invoking.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.AbstractMethodInvocation.#ctor(System.Object,System.Object,System.Reflection.MethodInfo,System.Object[],System.Type,System.Collections.IList)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.AbstractMethodInvocation"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is an abstract class, and as such exposes no publicly visible
+            constructors.
+            </p>
+            <p>
+            <note type="implementnotes">
+            The <paramref name="interceptors"/>	list can also contain any
+            <see cref="T:Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>s
+            that need evaluation at runtime.
+            <see cref="T:Spring.Aop.IMethodMatcher"/>s included in an
+            <see cref="T:Spring.Aop.Framework.InterceptorAndDynamicMethodMatcher"/>
+            must already have been found to have matched as far as was possible
+            <b>statically</b>. Passing an array might be about 10% faster, but
+            would complicate the code, and it would work only for static
+            pointcuts.
+            </note>
+            </p>
+            </remarks>
+            <param name="proxy">The AOP proxy.</param>
+            <param name="target">The target object.</param>
+            <param name="method">the target method.</param>
+            <param name="arguments">The target method's arguments.</param>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> of the target object.</param>
+            <param name="interceptors">
+            The list of interceptors that are to be applied. May be
+            <cref lang="null"/>.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the <paramref name="target"/> is <see lang="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.AbstractMethodInvocation.Proceed">
+            <summary>
+            Proceeds to the next interceptor in the chain.
+            </summary>
+            <returns>
+            The return value of the method invocation.
+            </returns>
+            <exception cref="T:System.Exception">
+            If any of the interceptors at the joinpoint throws an exception.
+            </exception>
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.AbstractMethodInvocation.PrepareMethodInvocationForProceed(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Retrieves a new <see cref="T:AopAlliance.Intercept.IMethodInvocation"/> instance 
+            for the next Proceed method call.
+            </summary>
+            <param name="invocation">
+            The current <see cref="T:AopAlliance.Intercept.IMethodInvocation"/> instance.
+            </param>
+            <returns>
+            The new <see cref="T:AopAlliance.Intercept.IMethodInvocation"/> instance to use.
+            </returns>
+            <see cref="M:Spring.Aop.Framework.ReflectiveMethodInvocation.PrepareMethodInvocationForProceed(AopAlliance.Intercept.IMethodInvocation)"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.AbstractMethodInvocation.InvokeJoinpoint">
+            <summary>
+            Invokes the joinpoint.
+            </summary>
+            <remarks>
+            <p>
+            Subclasses can override this to use custom invocation.
+            </p>
+            </remarks>
+            <returns>
+            The return value of the invocation of the joinpoint.
+            </returns>
+            <exception cref="T:System.Exception">
+            If invoking the joinpoint resulted in an exception.
+            </exception>
+            <see cref="M:Spring.Aop.Framework.ReflectiveMethodInvocation.InvokeJoinpoint"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.AbstractMethodInvocation.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            invocation.
+            </summary>
+            <remarks>
+            <p>
+            <note type="implementnotes">
+            Does <b>not</b> invoke <see cref="M:System.Object.ToString"/> on the 
+            <see cref="P:Spring.Aop.Framework.AbstractMethodInvocation.This"/> target
+            object, as that too may be proxied. 
+            </note>
+            </p>
+            </remarks>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current invocation.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Framework.AbstractMethodInvocation.Method">
+            <summary>
+            Gets the method invocation that is to be invoked.
+            </summary>
+            <remarks>
+            <p>
+            May or may not correspond with a method invoked on an underlying
+            implementation of that interface.
+            </p>
+            </remarks>
+            <see cref="P:AopAlliance.Intercept.IMethodInvocation.Method"/>
+        </member>
+        <member name="P:Spring.Aop.Framework.AbstractMethodInvocation.StaticPart">
+            <summary>
+            Gets the static part of this joinpoint.
+            </summary>
+            <value>
+            The proxied member's information.
+            </value>
+            <see cref="P:AopAlliance.Intercept.IJoinpoint.StaticPart"/>
+        </member>
+        <member name="P:Spring.Aop.Framework.AbstractMethodInvocation.Proxy">
+            <summary>
+            Gets the proxy that this interception was made through.
+            </summary>
+            <value>
+            The proxy that this interception was made through.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.AbstractMethodInvocation.Target">
+            <summary>
+            Gets the target object for the invocation.
+            </summary>
+            <value>
+            The target object for this method invocation.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.AbstractMethodInvocation.TargetType">
+            <summary>
+            Gets the type of the target object.
+            </summary>
+            <value>
+            The type of the target object.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.AbstractMethodInvocation.Arguments">
+            <summary>
+            Gets and sets the arguments (if any - may be <cref lang="null"/>)
+            to the method that is to be invoked.
+            </summary>
+            <value>
+            The arguments (if any - may be <cref lang="null"/>) to the
+            method that is to be invoked.
+            </value>
+            <see cref="P:AopAlliance.Intercept.IInvocation.Arguments"/>
+        </member>
+        <member name="P:Spring.Aop.Framework.AbstractMethodInvocation.Interceptors">
+            <summary>
+            The list of method interceptors.
+            </summary>
+            <remarks>
+            <p>
+            May be <see lang="null"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Framework.AbstractMethodInvocation.This">
+            <summary>
+            Gets the target object.
+            </summary>
+        </member>
+        <member name="T:Spring.Aspects.RetryExceptionHandler">
+             <summary>
+             Sleeps for the appropriate amount of time for an exception.
+             </summary>
+             <remarks>
+            
+             </remarks>
+             <author>Mark Pollack</author>
+             <version>$Id: RetryExceptionHandler.cs,v 1.1 2007/10/10 07:38:17 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.RetryExceptionHandler.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.RetryExceptionHandler"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.RetryExceptionHandler.#ctor(System.String[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.RetryExceptionHandler"/> class.
+            </summary>
+            <param name="exceptionNames">The exception names.</param>
+        </member>
+        <member name="M:Spring.Aspects.RetryExceptionHandler.HandleException(System.Collections.IDictionary)">
+            <summary>
+            Handles the exception.
+            </summary>
+            <param name="callContextDictionary"></param>
+            <returns>
+            The return value from handling the exception, if not rethrown or a new exception is thrown.
+            </returns>
+        </member>
+        <member name="P:Spring.Aspects.RetryExceptionHandler.MaximumRetryCount">
+            <summary>
+            Gets the maximum retry count.
+            </summary>
+            <value>The maximum retry count.</value>
+        </member>
+        <member name="P:Spring.Aspects.RetryExceptionHandler.IsDelayBased">
+            <summary>
+            Gets a value indicating whether this instance is delay based.
+            </summary>
+            <value>
+            	<c>true</c> if this instance is delay based; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Aspects.RetryExceptionHandler.DelayTimeSpan">
+            <summary>
+            Gets or sets the delay time span to sleep after an exception is thrown and a rety is
+            attempted.
+            </summary>
+            <value>The delay time span.</value>
+        </member>
+        <member name="P:Spring.Aspects.RetryExceptionHandler.DelayRateExpression">
+            <summary>
+            Gets or sets the delay rate expression.
+            </summary>
+            <value>The delay rate expression.</value>
+        </member>
+        <member name="T:Spring.Aop.Support.ComposablePointcut">
+            <summary>
+            Convenient class for building up pointcuts.
+            </summary>
+            <remarks>
+            <p>
+            All methods return a <see cref="T:Spring.Aop.Support.ComposablePointcut"/>
+            instance, which facilitates the following concise usage pattern...
+            </p>
+            <code language="C#">
+            IPointcut pointcut = new ComposablePointcut()
+            		.Union(typeFilter)
+            			.Intersection(methodMatcher)
+            				.Intersection(pointcut);
+            </code>
+            <p>
+            There is no <c>Union()</c> method on this class. Use the
+            <see cref="M:Spring.Aop.Support.Pointcuts.Union(Spring.Aop.IPointcut,Spring.Aop.IPointcut)"/> method for such functionality.
+            </p>
+            </remarks> 
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: ComposablePointcut.cs,v 1.7 2007/03/16 04:01:23 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Support.ComposablePointcut.#ctor">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Aop.Support.ComposablePointcut"/> class
+            that matches all the methods on all <see cref="T:System.Type"/>s.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.ComposablePointcut.#ctor(Spring.Aop.ITypeFilter,Spring.Aop.IMethodMatcher)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Aop.Support.ComposablePointcut"/> class
+            that uses the supplied <paramref name="typeFilter"/> and
+            <paramref name="methodMatcher"/>.
+            </summary>
+            <param name="typeFilter">
+            The type filter to use.
+            </param>
+            <param name="methodMatcher">
+            The method matcher to use.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Support.ComposablePointcut.Union(Spring.Aop.ITypeFilter)">
+            <summary>
+            Changes the current type filter to be the union of the existing filter and the
+            supplied <paramref name="filter"/>.
+            </summary>
+            <param name="filter">The filter to union with.</param>
+            <returns>
+            The union of the existing filter and the supplied <paramref name="filter"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.ComposablePointcut.Intersection(Spring.Aop.ITypeFilter)">
+            <summary>
+            Changes the current type filter to be the intersection of the existing filter
+            and the supplied <paramref name="filter"/>.
+            </summary>
+            <param name="filter">The filter to diff against.</param>
+            <returns>
+            The intersection of the existing filter and the supplied <paramref name="filter"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.ComposablePointcut.Union(Spring.Aop.IMethodMatcher)">
+            <summary>
+            Changes the current method matcher to be the union of the existing matcher and the
+            supplied <paramref name="matcher"/>.
+            </summary>
+            <param name="matcher">The matcher to union with.</param>
+            <returns>
+            The union of the existing matcher and the supplied <paramref name="matcher"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.ComposablePointcut.Intersection(Spring.Aop.IMethodMatcher)">
+            <summary>
+            Changes the current method matcher to be the intersection of the existing matcher
+            and the supplied <paramref name="matcher"/>.
+            </summary>
+            <param name="matcher">The matcher to diff against.</param>
+            <returns>
+            The intersection of the existing matcher and the supplied <paramref name="matcher"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.ComposablePointcut.Intersection(Spring.Aop.IPointcut)">
+            <summary>
+            Changes current pointcut to intersection of the current and supplied pointcut
+            </summary>
+            <param name="other">pointcut to diff against</param>
+            <returns>updated pointcut</returns>
+        </member>
+        <member name="P:Spring.Aop.Support.ComposablePointcut.TypeFilter">
+            <summary>
+            The <see cref="T:Spring.Aop.ITypeFilter"/> for this pointcut.
+            </summary>
+            <value>
+            The current <see cref="T:Spring.Aop.ITypeFilter"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Support.ComposablePointcut.MethodMatcher">
+            <summary>
+            The <see cref="T:Spring.Aop.IMethodMatcher"/> for this pointcut.
+            </summary>
+            <value>
+            The current <see cref="T:Spring.Aop.IMethodMatcher"/>.
+            </value>
+        </member>
+        <member name="T:Spring.Aop.IAfterReturningAdvice">
+            <summary>
+            Advice that executes after a method returns <b>successfully</b>.
+            </summary>
+            <remarks>
+            <p>
+            <i>After</i> returning advice is invoked only on a normal method
+            return, but <b>not</b> if an exception is thrown. Such advice can see
+            the return value of the advised method invocation, but cannot change it.
+            </p>
+            <p>
+            Possible uses for this type of advice would include performing access
+            control checks on the return value of an advised method invocation, the
+            ubiquitous logging of method invocation return values (useful during
+            development), etc.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <seealso cref="T:Spring.Aop.IMethodBeforeAdvice"/>
+            <seealso cref="T:Spring.Aop.IThrowsAdvice"/>
+            <seealso cref="T:AopAlliance.Intercept.IMethodInterceptor"/>
+            <version>$Id: IAfterReturningAdvice.cs,v 1.6 2006/04/09 07:18:36 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.IAfterReturningAdvice.AfterReturning(System.Object,System.Reflection.MethodInfo,System.Object[],System.Object)">
+            <summary>
+            Executes after <paramref name="target"/> <paramref name="method"/>
+            returns <b>successfully</b>.
+            </summary>
+            <remarks>
+            <p>
+            Note that the supplied <paramref name="returnValue"/> <b>cannot</b>
+            be changed by this type of advice... use the around advice type
+            (<see cref="T:AopAlliance.Intercept.IMethodInterceptor"/>) if you
+            need to change the return value of an advised method invocation.
+            The data encapsulated by the supplied <paramref name="returnValue"/>
+            can of course be modified though.
+            </p>
+            </remarks>
+            <param name="returnValue">
+            The value returned by the <paramref name="target"/>.
+            </param>
+            <param name="method">The intecepted method.</param>
+            <param name="args">The intercepted method's arguments.</param>
+            <param name="target">The target object.</param>
+            <seealso cref="M:AopAlliance.Intercept.IMethodInterceptor.Invoke(AopAlliance.Intercept.IMethodInvocation)"/>
+        </member>
+        <member name="T:Spring.Aop.Framework.ReflectiveMethodInvocation">
+            <summary>
+            Invokes a target method using standard reflection.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <author>Rick Evans (.NET)</author>
+            <author>Bruno Baia (.NET)</author>
+            <version>$Id: ReflectiveMethodInvocation.cs,v 1.18 2008/02/06 18:28:52 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Framework.ReflectiveMethodInvocation.proxyMethod">
+            <summary>
+            The method invocation that is to be invoked on the proxy.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ReflectiveMethodInvocation.#ctor(System.Object,System.Object,System.Reflection.MethodInfo,System.Reflection.MethodInfo,System.Object[],System.Type,System.Collections.IList)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.ReflectiveMethodInvocation"/> class.
+            </summary>
+            <param name="proxy">The AOP proxy.</param>
+            <param name="target">The target object.</param>
+            <param name="method">The target method proxied.</param>
+            <param name="proxyMethod">The method to invoke on proxy.</param>
+            <param name="arguments">The target method's arguments.</param>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> of the target object.</param>
+            <param name="interceptors">
+            The list of interceptors that are to be applied. May be
+            <cref lang="null"/>.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If any of the <paramref name="target"/> or <paramref name="method"/>
+            parameters is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.ReflectiveMethodInvocation.InvokeJoinpoint">
+            <summary>
+            Invokes the joinpoint using standard reflection.
+            </summary>
+            <remarks>
+            <p>
+            Subclasses can override this to use custom invocation.
+            </p>
+            </remarks>
+            <returns>
+            The return value of the invocation of the joinpoint.
+            </returns>
+            <exception cref="T:System.Exception">
+            If invoking the joinpoint resulted in an exception.
+            </exception>
+            <see cref="M:Spring.Aop.Framework.AbstractMethodInvocation.InvokeJoinpoint"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.ReflectiveMethodInvocation.PrepareMethodInvocationForProceed(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Creates a new <see cref="T:Spring.Aop.Framework.ReflectiveMethodInvocation"/> instance 
+            from the specified <see cref="T:AopAlliance.Intercept.IMethodInvocation"/> and  
+            increments the interceptor index.
+            </summary>
+            <param name="invocation">
+            The current <see cref="T:AopAlliance.Intercept.IMethodInvocation"/> instance.
+            </param>
+            <returns>
+            The new <see cref="T:AopAlliance.Intercept.IMethodInvocation"/> instance to use.
+            </returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder">
+            <summary>
+            Builds an AOP proxy type using inheritance.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: InheritanceAopProxyTypeBuilder.cs,v 1.2 2008/03/03 09:28:50 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder.advisedProxyField">
+            <summary>
+            AdvisedProxy instance calls should be delegated to.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder.#ctor(Spring.Aop.Framework.IAdvised)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Aop.Framework.DynamicProxy.CompositionAopProxyTypeBuilder"/> class.
+            </summary>
+            <param name="advised">The proxy configuration.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder.BuildProxyType">
+            <summary>
+            Creates the proxy type.
+            </summary>
+            <returns>The generated proxy class.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder.PushTarget(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the target instance on which calls should be delegated to.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder.PushAdvisedProxy(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes  
+            the current <see cref="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> 
+            instance on stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder.DeclareAdvisedProxyInstanceField(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Declares field that holds the <see cref="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/>
+            instance used by the proxy.
+            </summary>
+            <param name="builder">
+            The <see cref="T:System.Type"/> builder to use for code generation.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder.ImplementGetObjectDataMethod(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements serialization method.
+            </summary>
+            <param name="typeBuilder"></param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder.ImplementSerializationConstructor(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements serialization constructor.
+            </summary>
+            <param name="typeBuilder">Type builder to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder.DefineConstructorParameters(System.Reflection.ConstructorInfo)">
+            <summary>
+            Defines the types of the parameters for the specified constructor.
+            </summary>
+            <param name="constructor">The constructor to use.</param>
+            <returns>The types for constructor's parameters.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder.GenerateConstructor(System.Reflection.Emit.ConstructorBuilder,System.Reflection.Emit.ILGenerator,System.Reflection.ConstructorInfo)">
+            <summary>
+            Generates the proxy constructor.
+            </summary>
+            <remarks>
+            <p>
+            This implementation creates instance of the AdvisedProxy object.
+            </p>
+            </remarks>
+            <param name="builder">The constructor builder to use.</param>
+            <param name="il">The IL generator to use.</param>
+            <param name="constructor">The constructor to delegate the creation to.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder.ImplementIAopProxy(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements <see cref="T:Spring.Aop.Framework.IAopProxy"/> interface.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder.IsInheritanceProxy(System.Type)">
+            <summary>
+            Determines if the specified <paramref name="type"/> 
+            is one of those generated by this builder.
+            </summary>
+            <param name="type">The type to check.</param>
+            <returns>
+            <see langword="true"/> if the type is a inheritance-based proxy;
+            otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTypeBuilder.ProxyDeclaredMembersOnly">
+            <summary>
+            Gets or sets a value indicating whether inherited members should be proxied.
+            </summary>
+            <value>
+            <see langword="true"/> if inherited members should be proxied; 
+            otherwise, <see langword="false"/>.
+            </value>
+        </member>
+        <member name="T:Spring.Aspects.ParsedAdviceExpression">
+             <summary>
+             This class contains the results of parsing an advice expresion of the form
+             on exception name [ExceptionName1,ExceptionName2,...] [action] [action expression]
+             or
+             on exception [constraint expression] [action] [action expression]
+             </summary>
+             <remarks>
+            
+             </remarks>
+             <author>Mark Pollack</author>
+             <version>$Id: ParsedAdviceExpression.cs,v 1.1 2007/10/08 22:05:16 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.ParsedAdviceExpression.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.ParsedAdviceExpression"/> class.
+            </summary>
+            <param name="adviceExpression">The advice expression.</param>
+        </member>
+        <member name="P:Spring.Aspects.ParsedAdviceExpression.AdviceExpression">
+            <summary>
+            Gets or sets the advice expression.
+            </summary>
+            <value>The advice expression.</value>
+        </member>
+        <member name="P:Spring.Aspects.ParsedAdviceExpression.ExceptionNames">
+            <summary>
+            Gets or sets the exception names.
+            </summary>
+            <value>The exception names.</value>
+        </member>
+        <member name="P:Spring.Aspects.ParsedAdviceExpression.ConstraintExpression">
+            <summary>
+            Gets or sets the constraint expression.
+            </summary>
+            <value>The constraint expression.</value>
+        </member>
+        <member name="P:Spring.Aspects.ParsedAdviceExpression.ActionExpressionText">
+            <summary>
+            Gets or sets the action expression text.
+            </summary>
+            <value>The action expression text.</value>
+        </member>
+        <member name="P:Spring.Aspects.ParsedAdviceExpression.ActionText">
+            <summary>
+            Gets or sets the action text.
+            </summary>
+            <value>The action text.</value>
+        </member>
+        <member name="P:Spring.Aspects.ParsedAdviceExpression.Success">
+            <summary>
+            Gets or sets a value indicating whether this <see cref="T:Spring.Aspects.ParsedAdviceExpression"/> is success.
+            </summary>
+            <value><c>true</c> if success; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="T:Spring.Aspects.Cache.InvalidateCacheAdvice">
+            <summary>
+            Implementation of a cache invalidation advice.
+            </summary>
+            <remarks>
+            <p>
+            This advice can be used to evict items from the cache. 
+            </p>
+            <p>
+            Information that determines which items should be evicted and from which cache
+            are retrieved from the <see cref="T:Spring.Caching.InvalidateCacheAttribute"/>s  that are defined 
+            on the pointcut.
+            </p>
+            <p>
+            Items are evicted *after* target method is invoked. Return value of the method, 
+            as well as method arguments, can be used to determine a list of keys for the items
+            that should be evicted (return value will be passed as a context for 
+            <see cref="P:Spring.Caching.InvalidateCacheAttribute.Keys"/> expression evaluation, and method
+            arguments will be passed as variables, keyed by argument name).
+            </p>
+            </remarks>
+            <seealso cref="T:Spring.Caching.InvalidateCacheAttribute"/>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: InvalidateCacheAdvice.cs,v 1.4 2007/04/01 15:04:05 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Cache.InvalidateCacheAdvice.AfterReturning(System.Object,System.Reflection.MethodInfo,System.Object[],System.Object)">
+            <summary>
+            Executes after <paramref name="target"/> <paramref name="method"/>
+            returns <b>successfully</b>.
+            </summary>
+            <remarks>
+            <p>
+            Note that the supplied <paramref name="returnValue"/> <b>cannot</b>
+            be changed by this type of advice... use the around advice type
+            (<see cref="T:AopAlliance.Intercept.IMethodInterceptor"/>) if you
+            need to change the return value of an advised method invocation.
+            The data encapsulated by the supplied <paramref name="returnValue"/>
+            can of course be modified though.
+            </p>
+            </remarks>
+            <param name="returnValue">
+            The value returned by the <paramref name="target"/>.
+            </param>
+            <param name="method">The intecepted method.</param>
+            <param name="arguments">The intercepted method's arguments.</param>
+            <param name="target">The target object.</param>
+            <seealso cref="M:AopAlliance.Intercept.IMethodInterceptor.Invoke(AopAlliance.Intercept.IMethodInvocation)"/>
+        </member>
+        <member name="T:Spring.Aspects.Cache.CacheResultAdvice">
+            <summary>
+            Implementation of a result caching advice.
+            </summary>
+            <remarks>
+            <p>
+            This advice can be used to cache the return value of the method. 
+            </p>
+            <p>
+            Parameters that determine where, how and for how long the return value 
+            will be cached are retrieved from the <see cref="T:Spring.Caching.CacheResultAttribute"/> and/or 
+            <see cref="T:Spring.Caching.CacheResultItemsAttribute"/> that are defined on the pointcut.
+            </p>
+            </remarks>
+            <seealso cref="T:Spring.Caching.CacheResultAttribute"/>
+            <seealso cref="T:Spring.Caching.CacheResultItemsAttribute"/>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CacheResultAdvice.cs,v 1.6 2008/05/05 15:00:55 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Cache.CacheResultAdvice.Invoke(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Applies caching around a method invocation.
+            </summary>
+            <remarks>
+            <p>
+            This method tries to retrieve an object from the cache, using the supplied
+            <paramref name="invocation"/> to generate a cache key. If an object is found
+            in the cache, the cached value is returned and the method call does not
+            proceed any further down the invocation chain.
+            </p>
+            <p>
+            If object does not exist in the cache, the advised method is called (using
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/>)
+            and any return value is cached for the next method invocation.
+            </p>
+            </remarks>
+            <param name="invocation">
+            The method invocation that is being intercepted.
+            </param>
+            <returns>
+            A cached object or the result of the
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/> call.
+            </returns>
+            <exception cref="T:System.Exception">
+            If any of the interceptors in the chain or the target object itself
+            throws an exception.
+            </exception>
+        </member>
+        <member name="M:Spring.Aspects.Cache.CacheResultAdvice.GetReturnValue(AopAlliance.Intercept.IMethodInvocation,Spring.Caching.CacheResultAttribute,System.Boolean@)">
+            <summary>
+            Obtains return value either from cache or by invoking target method
+            and caches it if necessary.
+            </summary>
+            <param name="invocation">
+            The method invocation that is being intercepted.
+            </param>
+            <param name="resultInfo">
+            Attribute specifying where and how to cache return value. Can be <c>null</c>,
+            in which case no caching of the result as a whole will be performed 
+            (if the result is collection, individual items could still be cached separately).
+            </param>
+            <param name="cacheHit">
+            Returns <c>true</c> if the return value was found in cache, <c>false</c> otherwise.
+            </param>
+            <returns>
+            Return value for the specified <paramref name="invocation"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aspects.Cache.CacheResultAdvice.CacheResultItems(System.Collections.ICollection,Spring.Caching.CacheResultItemsAttribute[])">
+            <summary>
+            Caches each item from the collection returned by target method.
+            </summary>
+            <param name="items">
+            A collection of items to cache.
+            </param>
+            <param name="itemInfoArray">
+            Attributes specifying where and how to cache each item from the collection.
+            </param>
+        </member>
+        <member name="T:Spring.Aop.Support.TypeFilters">
+            <summary>
+            Defines miscellaneous <see cref="T:System.Type"/> filter operations.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.Net)</author>
+            <version>$Id: TypeFilters.cs,v 1.4 2007/03/16 04:01:25 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Support.TypeFilters.Union(Spring.Aop.ITypeFilter,Spring.Aop.ITypeFilter)">
+            <summary>
+            Creates a union of two <see cref="T:System.Type"/> filters.
+            </summary>
+            <remarks>
+            <p>
+            The filter arising from the union will match all of the
+            <see cref="T:System.Type"/> that either of the two supplied filters
+            would match.
+            </p>
+            </remarks>
+            <param name="first">
+            The first <see cref="T:System.Type"/> filter.
+            </param>
+            <param name="second">
+            The second <see cref="T:System.Type"/> filter.
+            </param>
+            <returns>
+            The union of the supplied <see cref="T:System.Type"/> filters.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.TypeFilters.Intersection(Spring.Aop.ITypeFilter,Spring.Aop.ITypeFilter)">
+            <summary>
+            Creates the intersection of two <see cref="T:System.Type"/> filters.
+            </summary>
+            <remarks>
+            <p>
+            The filter arising from the intersection will match all of the
+            <see cref="T:System.Type"/> that both of the two supplied filters
+            would match.
+            </p>
+            </remarks>
+            <param name="first">
+            The first <see cref="T:System.Type"/> filter.
+            </param>
+            <param name="second">
+            The second <see cref="T:System.Type"/> filter.
+            </param>
+            <returns>
+            The intersection of the supplied <see cref="T:System.Type"/> filters.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.TypeFilters.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.TypeFilters"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Aop.Support.TypeFilters.UnionTypeFilter">
+            <summary>
+            Union class filter implementation.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Support.TypeFilters.IntersectionTypeFilter">
+            <summary>
+            Intersection <see cref="T:Spring.Aop.ITypeFilter"/> implementation.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Support.NameMatchMethodPointcutAdvisor">
+            <summary> 
+            Convenient class for name-match method pointcuts that hold an Interceptor,
+            making them an Advisor.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: NameMatchMethodPointcutAdvisor.cs,v 1.5 2007/05/30 22:35:43 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Support.NameMatchMethodPointcutAdvisor.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.NameMatchMethodPointcutAdvisor"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.NameMatchMethodPointcutAdvisor.#ctor(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.NameMatchMethodPointcutAdvisor"/> class
+            for the supplied <paramref name="advice"/>.
+            </summary>
+            <param name="advice"></param>
+        </member>
+        <member name="P:Spring.Aop.Support.NameMatchMethodPointcutAdvisor.TypeFilter">
+            <summary>
+            The <see cref="T:Spring.Aop.ITypeFilter"/> for this pointcut.
+            </summary>
+            <remarks>Default is </remarks>
+            <value>
+            The current <see cref="T:Spring.Aop.ITypeFilter"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Support.NameMatchMethodPointcutAdvisor.MappedName">
+            <summary>
+            Convenience property when we have only a single method name
+            to match.
+            </summary>
+            <remarks>
+            <note type="caution">
+            Use either this property or the
+            <see cref="P:Spring.Aop.Support.NameMatchMethodPointcut.MappedNames"/> property,
+            not both.
+            </note>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Support.NameMatchMethodPointcutAdvisor.MappedNames">
+            <summary>
+            Set the method names defining methods to match.
+            </summary>
+            <remarks>
+            <p>
+            Matching will be the union of all these; if any match, the pointcut matches.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Support.NameMatchMethodPointcutAdvisor.Pointcut">
+            <summary>
+            The <see cref="T:Spring.Aop.IPointcut"/> that drives this advisor.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.IThrowsAdvice">
+            <summary> 
+            Simple marker interface for throws advice.
+            </summary>
+            <remarks>
+            <p>
+            There are no methods on this interface, as methods are discovered and
+            invoked via reflection. Please do see read the API documentation for the
+            <see cref="T:Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor"/> class;
+            said documention describes in detail the signature of the methods that
+            implementations of the <see cref="T:Spring.Aop.IThrowsAdvice"/> interface
+            must adhere to in the specific case of Spring.NET's implementation of
+            throws advice.
+            </p>
+            <p>
+            There are any number of possible uses for this type of advice. Some
+            examples would include the ubiquitous logging of any such exceptions,
+            monitoring the number and type of exceptions and sending emails to
+            a support desk once certain criteria have been met, wrapping generic
+            exceptions such as <see cref="T:System.Data.SqlClient.SqlException"/> in
+            exceptions that are more meaningful to your business logic, etc.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <seealso cref="T:Spring.Aop.IMethodBeforeAdvice"/>
+            <seealso cref="T:Spring.Aop.IAfterReturningAdvice"/>
+            <seealso cref="T:AopAlliance.Intercept.IMethodInterceptor"/>
+            <version>$Id: IThrowsAdvice.cs,v 1.5 2006/04/09 07:18:36 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException">
+            <summary>
+            Exception thrown when an attempt is made to use an unsupported
+            <see cref="T:Spring.Aop.IAdvisor"/> or <see cref="T:AopAlliance.Aop.IAdvice"/>
+            type.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: UnknownAdviceTypeException.cs,v 1.4 2006/04/09 07:18:35 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException.#ctor(System.Object)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException"/> class.
+            </summary>
+            <param name="advice">The advice that caused the exception.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException"/> class with
+            the specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException"/> class with
+            the specified message and root cause.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.Adapter.UnknownAdviceTypeException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Aop.Target.PrototypeTargetSource">
+            <summary>
+            <see cref="T:Spring.Aop.ITargetSource"/> implementation that creates a
+            new instance of the target object for each request.
+            </summary>
+            <remarks>
+            <p>
+            Can only be used in an object factory.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Spinazzi Federico (.NET)</author>
+            <version>$Id: PrototypeTargetSource.cs,v 1.3 2006/04/09 07:18:37 markpollack Exp $
+            </version>
+        </member>
+        <member name="M:Spring.Aop.Target.PrototypeTargetSource.GetTarget">
+            <summary>
+            Returns the target object.
+            </summary>
+            <returns>The target object.</returns>
+            <exception cref="T:System.Exception">
+            If unable to obtain the target object.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Target.PrototypeTargetSource.ReleaseTarget(System.Object)">
+            <summary>
+            Releases the target object.
+            </summary>
+            <remarks>
+            <p>
+            No-op implementation.
+            </p>
+            </remarks>
+            <param name="target">The target object to release.</param>
+        </member>
+        <member name="P:Spring.Aop.Target.PrototypeTargetSource.IsStatic">
+            <summary>
+            Is the target source static?
+            </summary>
+            <value>
+            <see langword="false"/> because this target source is never static.
+            </value>
+        </member>
+        <member name="T:Spring.Aop.Support.SdkRegularExpressionMethodPointcut">
+            <summary>
+            Regular expression based pointcut object.
+            </summary>
+            <remarks>
+            <p>
+            Uses the regular expression classes from the .NET Base Class Library.
+            </p>
+            <p>
+            The regular expressions must be a match. For example, the
+            <code>.*Get*</code> pattern will match <c>Com.Mycom.Foo.GetBar()</c>, and
+            <code>Get.*</code> will not.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="T:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut">
+            <summary>
+            Abstract base regular expression pointcut object.
+            </summary>
+            <remarks>
+            <p>
+            The regular expressions must be a match. For example, the
+            <code>.*Get.*</code> pattern will match <c>Com.Mycom.Foo.GetBar()</c>, and
+            <code>Get.*</code> will not.
+            </p>
+            <p>
+            This base class is serializable. Subclasses should decorate all
+            fields with the <see cref="T:System.NonSerializedAttribute"/> - the
+            <see cref="M:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.InitPatternRepresentation(System.Object[])"/>
+            method in this class will be invoked again on the client side on deserialization.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="M:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an abstract class, and as such has no publicly
+            visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut"/>
+            class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+            <exception cref="T:AopAlliance.Aop.AspectException">
+            If an error was encountered during the deserialization process.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.InitPatternRepresentation(System.Object[])">
+            <summary>
+            Subclasses must implement this to initialize regular expression pointcuts.
+            </summary>
+            <remarks>
+            <p>
+            Can be invoked multiple times.
+            </p>
+            <p>
+            This method will be invoked from the <see cref="P:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.Patterns"/> property,
+            and also on deserialization.
+            </p>
+            </remarks>
+            <param name="patterns">
+            The patterns to initialize.
+            </param>
+            <exception cref="T:System.ArgumentException">
+            In the case of an invalid pattern.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.Matches(System.String,System.Int32)">
+            <summary>
+            Does the pattern at the supplied <paramref name="patternIndex"/>
+            match this <paramref name="pattern"/>?
+            </summary>
+            <param name="pattern">The pattern to match</param>
+            <param name="patternIndex">The index of pattern.</param>
+            <returns>
+            <see langword="true"/> if there is a match.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.Matches(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Does the supplied <paramref name="method"/> satisfy this matcher?
+            </summary>
+            <remarks>
+            <p>
+            Try to match the regular expression against the fully qualified name
+            of the method's declaring <see cref="T:System.Type"/>, plus the name of
+            the supplied <paramref name="method"/>.
+            </p>
+            <p>
+            Note that the declaring <see cref="T:System.Type"/> is that
+            <see cref="T:System.Type"/> that originally declared
+            the method, not necessarily the <see cref="T:System.Type"/> that is
+            currently exposing it. For example, <see cref="M:System.Object.Equals(System.Object)"/>
+            matches any subclass of <see cref="T:System.Object"/>'s
+            <see cref="M:System.Object.Equals(System.Object)"/> method.
+            </p>
+            </remarks>
+            <param name="method">The candidate method.</param>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/> (may be <see langword="null"/>,
+            in which case the candidate <see cref="T:System.Type"/> must be taken
+            to be the <paramref name="method"/>'s declaring class).
+            </param>
+            <returns>
+            <see langword="true"/> if this this method matches statically.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.Matches(System.Type)">
+            <summary>
+            Should the pointcut apply to the supplied
+            <see cref="T:System.Type"/>?
+            </summary>
+            <remarks>
+            <p>
+            In this instance, simply returns <see langword="true"/>.
+            </p>
+            </remarks>
+            <param name="type">
+            The candidate <see cref="T:System.Type"/>.
+            </param>
+            <returns>
+            <see langword="true"/> if the advice should apply to the supplied
+            <paramref name="type"/>
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.TypeFilter">
+            <summary>
+            The <see cref="T:Spring.Aop.ITypeFilter"/> for this pointcut.
+            </summary>
+            <value>
+            The current <see cref="T:Spring.Aop.ITypeFilter"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.Pattern">
+            <summary>
+            Convenience property for setting a single pattern.
+            </summary>
+            <remarks>
+            Use this property or Patterns, not both.
+            </remarks>
+        </member>
+        <member name="P:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.Patterns">
+            <summary>
+            The regular expressions defining methods to match.
+            </summary>
+            <remarks>
+            Matching will be the union of all these; if any match,
+            the pointcut matches.
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Support.SdkRegularExpressionMethodPointcut.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.SdkRegularExpressionMethodPointcut"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.SdkRegularExpressionMethodPointcut.#ctor(System.String[])">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.SdkRegularExpressionMethodPointcut"/> class,
+            using the supplied pattern or <paramref name="patterns"/>.
+            </summary>
+            <param name="patterns">
+            The intial pattern value(s) to be matched against.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Support.SdkRegularExpressionMethodPointcut.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.SdkRegularExpressionMethodPointcut"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+            <exception cref="T:AopAlliance.Aop.AspectException">
+            If an error was encountered during the deserialization process.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Support.SdkRegularExpressionMethodPointcut.InitPatternRepresentation(System.Object[])">
+            <summary>
+            Initializes the regular expression pointcuts.
+            </summary>
+            <remarks>
+            <p>
+            Can be invoked multiple times.
+            </p>
+            <p>
+            This method will be invoked from the
+            <see cref="P:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.Patterns"/> property,
+            and also on deserialization.
+            </p>
+            </remarks>
+            <param name="patterns">
+            The patterns to initialize.
+            </param>
+            <exception cref="T:System.ArgumentException">
+            In the case of an invalid pattern.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="patterns"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Support.SdkRegularExpressionMethodPointcut.Matches(System.String,System.Int32)">
+            <summary>
+            Does the pattern at the supplied <paramref name="patternIndex"/>
+            match this <paramref name="pattern"/>?
+            </summary>
+            <param name="pattern">The pattern to match</param>
+            <param name="patternIndex">The index of pattern.</param>
+            <returns>
+            <see langword="true"/> if there is a match.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.SdkRegularExpressionMethodPointcut.DefaultOptions">
+            <summary>
+            Gets or sets default options that should be used by
+            regular expressions that don't have options explicitly set.
+            </summary>
+            <value>
+            Default options that should be used by regular expressions 
+            that don't have options explicitly set.
+            </value>
+        </member>
+        <member name="T:Spring.Aop.Support.DefaultIntroductionAdvisor">
+            <summary>
+            Simple <seealso cref="T:Spring.Aop.IIntroductionAdvisor"/> implementation that
+            by default applies to any class.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: DefaultIntroductionAdvisor.cs,v 1.11 2007/03/16 04:01:23 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.IIntroductionAdvisor">
+            <summary>
+            Superinterface for advisors that perform one or more AOP
+            <b>introductions</b>.
+            </summary>
+            <remarks>
+            <p>
+            This interface cannot be implemented directly; subinterfaces must
+            provide the advice type implementing the introduction.
+            </p>
+            <p>
+            Introduction is the implementation of additional interfaces (not
+            implemented by a target) via AOP advice.
+            </p>
+            </remarks>
+            <seealso cref="T:Spring.Aop.IIntroductionInterceptor"/>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IIntroductionAdvisor.cs,v 1.8 2006/04/09 07:18:36 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.IIntroductionAdvisor.ValidateInterfaces">
+            <summary>
+            Can the advised interfaces be implemented by the introduction
+            advice?
+            </summary>
+            <remarks>
+            <p>
+            Invoked <b>before</b> adding an
+            <seealso cref="T:Spring.Aop.IIntroductionAdvisor"/>.
+            </p>
+            </remarks>
+            <exception cref="T:System.ArgumentException">
+            If the advised interfaces cannot be implemented by the introduction
+            advice.
+            </exception>
+            <seealso cref="P:Spring.Aop.IIntroductionAdvisor.Interfaces"/>
+        </member>
+        <member name="P:Spring.Aop.IIntroductionAdvisor.TypeFilter">
+            <summary>
+            Returns the filter determining which target classes this
+            introduction should apply to. 
+            </summary>
+            <remarks>
+            <p>
+            This is the <see cref="T:System.Type"/> part of a pointcut.
+            Be advised that method matching doesn't make sense in the context
+            of introductions.
+            </p>
+            </remarks>
+            <value>
+            The filter determining which target classes this introduction
+            should apply to. 
+            </value>
+        </member>
+        <member name="P:Spring.Aop.IIntroductionAdvisor.Interfaces">
+            <summary>
+            Gets the interfaces introduced by this
+            <see cref="T:Spring.Aop.IAdvisor"/>.
+            </summary>
+            <value>
+            The interfaces introduced by this
+            <see cref="T:Spring.Aop.IAdvisor"/>.
+            </value>
+        </member>
+        <member name="M:Spring.Aop.Support.DefaultIntroductionAdvisor.#ctor(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.DefaultIntroductionAdvisor"/> class using
+            the supplied <paramref name="introduction"/>
+            </summary>
+            <remarks>
+            <p>
+            This constructor adds all interfaces implemented by the supplied
+            <paramref name="introduction"/> (except the
+            <see cref="T:AopAlliance.Aop.IAdvice"/> interface) to the list of
+            interfaces to introduce.
+            </p>
+            </remarks>
+            <param name="introduction">The introduction to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Support.DefaultIntroductionAdvisor.#ctor(AopAlliance.Aop.IAdvice,System.Type)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.DefaultIntroductionAdvisor"/> class using
+            the supplied <paramref name="introduction"/>
+            </summary>
+            <param name="introduction">The introduction to use.</param>
+            <param name="intf">
+            The interface to introduce.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Support.DefaultIntroductionAdvisor.#ctor(AopAlliance.Aop.IAdvice,System.Type[])">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.DefaultIntroductionAdvisor"/> class using
+            the supplied <paramref name="introduction"/>
+            </summary>
+            <param name="introduction">The introduction to use.</param>
+            <param name="interfaces">
+            The interfaces to introduce.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="introduction"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Support.DefaultIntroductionAdvisor.AddInterface(System.Type)">
+            <summary>
+            Adds the supplied <paramref name="intf"/> to the list of
+            introduced interfaces.
+            </summary>
+            <param name="intf">The interface to add.</param>
+            <exception cref="T:System.ArgumentException">
+            If any of the <see cref="P:Spring.Aop.Support.DefaultIntroductionAdvisor.Interfaces"/> are not interface <see cref="T:System.Type"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Support.DefaultIntroductionAdvisor.Matches(System.Type)">
+            <summary>
+            Should the pointcut apply to the supplied
+            <see cref="T:System.Type"/>?
+            </summary>
+            <remarks>
+            <p>
+            This, the default, implementation always returns <see langword="true"/>.
+            </p>
+            </remarks>
+            <param name="type">
+            The candidate <see cref="T:System.Type"/>.
+            </param>
+            <returns>
+            <see langword="true"/> if the advice should apply to the supplied
+            <paramref name="type"/>
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.DefaultIntroductionAdvisor.ValidateInterfaces">
+            <summary>
+            Can the advised interfaces be implemented by the introduction
+            advice?
+            </summary>
+            <remarks>
+            <p>
+            Invoked <b>before</b> adding an
+            <seealso cref="T:Spring.Aop.IIntroductionAdvisor"/>.
+            </p>
+            </remarks>
+            <exception cref="T:System.ArgumentException">
+            If the advised interfaces cannot be implemented by the introduction
+            advice.
+            </exception>
+            <seealso cref="P:Spring.Aop.IIntroductionAdvisor.Interfaces"/>
+            <exception cref="T:System.ArgumentException">
+            If any of the <see cref="P:Spring.Aop.Support.DefaultIntroductionAdvisor.Interfaces"/> are not interface <see cref="T:System.Type"/>.
+            </exception>
+        </member>
+        <member name="P:Spring.Aop.Support.DefaultIntroductionAdvisor.TypeFilter">
+            <summary>
+            Returns the filter determining which target classes this
+            introduction should apply to. 
+            </summary>
+            <value>
+            The filter determining which target classes this introduction
+            should apply to. 
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Support.DefaultIntroductionAdvisor.Interfaces">
+            <summary>
+            Gets the interfaces introduced by this
+            <see cref="T:Spring.Aop.IAdvisor"/>.
+            </summary>
+            <value>
+            The interfaces introduced by this
+            <see cref="T:Spring.Aop.IAdvisor"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Support.DefaultIntroductionAdvisor.IsPerInstance">
+            <summary>
+            Is this advice associated with a particular instance?
+            </summary>
+            <remarks>
+            <p>
+            Default for an introduction is per-instance interception.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if this advice is associated with a
+            particular instance.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Support.DefaultIntroductionAdvisor.Advice">
+            <summary>
+            Return the advice part of this aspect.
+            </summary>
+            <returns>
+            The advice that should apply if the pointcut matches.
+            </returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.AutoProxy.Target.AbstractPrototypeTargetSourceCreator">
+            <summary>
+            Summary description for AbstractPrototypeBasedTargetSourceCreator.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.AutoProxy.Target.AbstractPrototypeTargetSourceCreator.logger">
+            <summary>
+            The logger
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.Target.AbstractPrototypeTargetSourceCreator.GetTargetSource(System.Type,System.String,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Create a special TargetSource for the given object, if any.
+            </summary>
+            <param name="objectType">the type of the object to create a TargetSource for</param>
+            <param name="name">the name of the object</param>
+            <param name="factory">the containing factory</param>
+            <returns>
+            a special TargetSource or null if this TargetSourceCreator isn't
+            interested in the particular object
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.Target.AbstractPrototypeTargetSourceCreator.CreatePrototypeTargetSource(System.Type,System.String,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Creates the prototype target source.
+            </summary>
+            <param name="objectType">The type of the object to create a target source for.</param>
+            <param name="name">The name.</param>
+            <param name="factory">The factory.</param>
+            <returns></returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.ThrowsAdviceAdapter">
+            <summary>
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> implementation
+            to enable <see cref="T:Spring.Aop.IThrowsAdvice"/> to be used in the
+            Spring.NET AOP framework.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: ThrowsAdviceAdapter.cs,v 1.4 2007/03/16 04:01:21 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.ThrowsAdviceAdapter.SupportsAdvice(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Returns <see langword="true"/> if the supplied
+            <paramref name="advice"/> is an instance of the
+            <see cref="T:Spring.Aop.IThrowsAdvice"/> interface.
+            </summary>
+            <param name="advice">The advice to check.</param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="advice"/> is
+            an instance of the <see cref="T:Spring.Aop.IThrowsAdvice"/> interface;
+            <see langword="false"/> if not or if the supplied
+            <paramref name="advice"/> is <cref lang="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.ThrowsAdviceAdapter.GetInterceptor(Spring.Aop.IAdvisor)">
+            <summary>
+            Wraps the supplied <paramref name="advisor"/>'s
+            <see cref="P:Spring.Aop.IAdvisor.Advice"/> within a
+            <see cref="T:Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor"/>
+            instance.
+            </summary>
+            <param name="advisor">
+            The advisor exposing the <see cref="T:AopAlliance.Aop.IAdvice"/> that
+            is to be wrapped.
+            </param>
+            <returns>
+            The supplied <paramref name="advisor"/>'s
+            <see cref="P:Spring.Aop.IAdvisor.Advice"/> wrapped within a
+            <see cref="T:Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptor"/>
+            instance.
+            </returns>
+        </member>
+        <member name="T:Spring.Aspects.Exceptions.LogExceptionHandler">
+            <summary>
+            Log the exceptions.  Default log nameis "LogExceptionHandler" and log level is Debug 
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: LogExceptionHandler.cs,v 1.6 2008/02/26 00:03:24 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.LogExceptionHandler.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.Exceptions.LogExceptionHandler"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.LogExceptionHandler.#ctor(System.String[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.Exceptions.LogExceptionHandler"/> class.
+            </summary>
+            <param name="exceptionNames">The exception names.</param>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.LogExceptionHandler.HandleException(System.Collections.IDictionary)">
+            <summary>
+            Handles the exception.
+            </summary>
+            <param name="callContextDictionary">the calling context dictionary</param>
+            <returns>
+            The return value from handling the exception, if not rethrown or a new exception is thrown.
+            </returns>
+        </member>
+        <member name="P:Spring.Aspects.Exceptions.LogExceptionHandler.LogName">
+            <summary>
+            Gets or sets the name of the log.
+            </summary>
+            <value>The name of the log.</value>
+        </member>
+        <member name="T:Spring.Aspects.Cache.CacheParameterAdvice">
+            <summary>
+            Implementation of a parameter caching advice.
+            </summary>
+            <remarks>
+            <p>
+            This advice can be used to cache the parameter of the method. 
+            </p>
+            <p>
+            Information that determines where, how and for how long the return value 
+            will be cached are retrieved from the <see cref="T:Spring.Caching.CacheParameterAttribute"/>s 
+            that are defined on the pointcut.
+            </p>
+            <p>
+            Parameter values are cached *after* the target method is invoked in order to
+            capture any parameter state changes it might make (for example, it is common
+            to set an object identifier within the save method for the persistent entity).
+            </p>
+            </remarks>
+            <seealso cref="T:Spring.Caching.CacheParameterAttribute"/>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CacheParameterAdvice.cs,v 1.7 2008/05/05 15:00:55 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Cache.CacheParameterAdvice.AfterReturning(System.Object,System.Reflection.MethodInfo,System.Object[],System.Object)">
+            <summary>
+            Executes after target <paramref name="method"/>
+            returns <b>successfully</b>.
+            </summary>
+            <remarks>
+            <p>
+            Note that the supplied <paramref name="returnValue"/> <b>cannot</b>
+            be changed by this type of advice... use the around advice type
+            (<see cref="T:AopAlliance.Intercept.IMethodInterceptor"/>) if you
+            need to change the return value of an advised method invocation.
+            The data encapsulated by the supplied <paramref name="returnValue"/>
+            can of course be modified though.
+            </p>
+            </remarks>
+            <param name="returnValue">
+            The value returned by the <paramref name="target"/>.
+            </param>
+            <param name="method">The intecepted method.</param>
+            <param name="arguments">The intercepted method's arguments.</param>
+            <param name="target">The target object.</param>
+            <seealso cref="M:AopAlliance.Intercept.IMethodInterceptor.Invoke(AopAlliance.Intercept.IMethodInvocation)"/>
+        </member>
+        <member name="T:Spring.Aspects.Cache.CacheAspect">
+            <summary>
+            Caching aspect implementation.
+            </summary>
+            <remarks>
+            This class encapsulates all the advisors that need to be configured to support
+            Spring's full caching functionality.
+            </remarks>
+            <see cref="T:Spring.Aspects.Cache.CacheResultAdvisor"/>
+            <see cref="T:Spring.Aspects.Cache.CacheParameterAdvisor"/>
+            <see cref="T:Spring.Aspects.Cache.InvalidateCacheAdvisor"/>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CacheAspect.cs,v 1.2 2007/08/03 14:38:35 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.IAdvisors">
+            <summary>
+            AOP Aspect abstraction, holding a list of <see cref="T:Spring.Aop.IAdvisor"/>s
+            </summary>
+            <seealso cref="T:Spring.Aop.IAdvisor"/>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IAdvisors.cs,v 1.1 2007/08/03 14:38:30 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Aop.IAdvisors.Advisors">
+            <summary>
+            Gets or sets a list of advisors.
+            </summary>
+            <value>
+            A list of advisors.
+            </value>
+        </member>
+        <member name="M:Spring.Aspects.Cache.CacheAspect.#ctor">
+            <summary>
+            Creates a new instance.
+            </summary>
+        </member>
+        <member name="P:Spring.Aspects.Cache.CacheAspect.Advisors">
+            <summary>
+            Gets or sets a list of advisors for this aspect.
+            </summary>
+            <value>
+            A list of advisors for this aspect.
+            </value>
+        </member>
+        <member name="P:Spring.Aspects.Cache.CacheAspect.ApplicationContext">
+            <summary>
+            Set the <see cref="T:Spring.Context.IApplicationContext"/> that this
+            object runs in.
+            </summary>
+            <remarks>
+            <p>
+            Normally this call will be used to initialize the object.
+            </p>
+            <p>
+            Invoked after population of normal object properties but before an
+            init callback such as
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            or a custom init-method. Invoked after the setting of any
+            <see cref="T:Spring.Context.IResourceLoaderAware"/>'s
+            <see cref="P:Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+            property.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Context.ApplicationContextException">
+            In the case of application context initialization errors.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If thrown by any application context methods.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectInitializationException"/>
+        </member>
+        <member name="T:Spring.Aop.Target.EmptyTargetSource">
+            <summary>
+            The <see cref="T:Spring.Aop.ITargetSource"/> to be used
+            when there is no target object, and behavior is supplied by the
+            advisors.
+            </summary>
+            <remarks>
+            <p>
+            This class is exposed as a singleton.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: EmptyTargetSource.cs,v 1.4 2007/10/08 22:04:51 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Target.EmptyTargetSource.Empty">
+            <summary>
+            The <see cref="T:Spring.Aop.ITargetSource"/> to be used
+            when there is no target object, and behavior is supplied by the
+            advisors.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Target.EmptyTargetSource.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Target.EmptyTargetSource"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Target.EmptyTargetSource.GetTarget">
+            <summary>
+            Returns the target object.
+            </summary>
+            <returns>The target object.</returns>
+            <exception cref="T:System.Exception">
+            If unable to obtain the target object.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Target.EmptyTargetSource.ReleaseTarget(System.Object)">
+            <summary>
+            Releases the target object.
+            </summary>
+            <remarks>
+            <note type="implementnotes">
+            This is a no-op operation in this implementation.
+            </note>
+            </remarks>
+            <param name="target">The target object to release.</param>
+        </member>
+        <member name="M:Spring.Aop.Target.EmptyTargetSource.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.ITargetSource"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.ITargetSource"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Target.EmptyTargetSource.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="P:Spring.Aop.Target.EmptyTargetSource.TargetType">
+            <summary>
+            The <see cref="T:System.Type"/> of the target object.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Target.EmptyTargetSource.IsStatic">
+            <summary>
+            Is the target source static?
+            </summary>
+            <remarks>
+            <p>
+            The <see cref="F:Spring.Aop.Target.EmptyTargetSource.Empty"/>
+            instance is static, and this always returns <see langword="true"/>.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if the target source is static.
+            </value>
+        </member>
+        <member name="T:Spring.Aop.IMethodBeforeAdvice">
+            <summary>
+            Advice executed before a method is invoked.
+            </summary>
+            <remarks>
+            <p>
+            Such advice cannot prevent the method call proceeding, short of
+            throwing an <see cref="T:System.Exception"/>.
+            </p>
+            <p>
+            The main advantage of <c>before</c> advice is that there is no
+            possibility of inadvertently failing to proceed down the interceptor
+            chain, since there is no need (and indeed means) to invoke the next
+            interceptor in the call chain.
+            </p>
+            <p>
+            Possible uses for this type of advice would include performing class
+            invariant checks prior to the actual method invocation, the ubiquitous
+            logging of method invocations (useful during development), etc.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <seealso cref="T:Spring.Aop.IBeforeAdvice"/>
+            <seealso cref="T:Spring.Aop.IAfterReturningAdvice"/>
+            <seealso cref="T:Spring.Aop.IThrowsAdvice"/>
+            <seealso cref="T:AopAlliance.Intercept.IMethodInterceptor"/>
+            <version>$Id: IMethodBeforeAdvice.cs,v 1.6 2006/04/09 07:18:36 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.IMethodBeforeAdvice.Before(System.Reflection.MethodInfo,System.Object[],System.Object)">
+            <summary>
+            The callback before a given method is invoked.
+            </summary>
+            <param name="method">The method being invoked.</param>
+            <param name="args">The arguments to the method.</param>
+            <param name="target">
+            The target of the method invocation. May be <see langword="null"/>.
+            </param>
+            <exception cref="T:System.Exception">
+            Thrown when and if this object wishes to abort the call. Any
+            exception so thrown will be propagated to the caller.
+            </exception>
+        </member>
+        <member name="T:Spring.Aop.Framework.StaticTargetSourceWrapper">
+            <summary>
+            Decorates a target source with the <see cref="T:System.IDisposable"/>
+            interface.
+            </summary>
+            <remarks>
+            <p>
+            Because the target source is static, the target object can be cached
+            and simply returned as is.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: StaticTargetSourceWrapper.cs,v 1.3 2007/03/16 04:01:20 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.StaticTargetSourceWrapper.#ctor(Spring.Aop.ITargetSource)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.StaticTargetSourceWrapper"/>
+            class.
+            </summary>
+            <param name="targetSource">
+            The target object that proxy methods will be delegated to.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="targetSource"/> is
+            <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.StaticTargetSourceWrapper.GetTarget">
+            <summary>
+            Returns the target object that proxy methods will be delegated to.
+            </summary>
+            <returns>The target object.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.StaticTargetSourceWrapper.Dispose">
+            <summary>
+            Performs application-defined tasks associated with freeing,
+            releasing, or resetting unmanaged resources.
+            </summary>
+            <remarks>
+            <note type="implementnotes">
+            This is a no-op operation in this implementation.
+            </note>
+            </remarks>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.AdvisorAdapterRegistrationManager">
+            <summary>
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/> implementation
+            that registers instances of any non-default
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> instances with the
+            <see cref="T:Spring.Aop.Framework.Adapter.GlobalAdvisorAdapterRegistry"/>
+            singleton.
+            </summary>
+            <remarks>
+            <p>
+            The only requirement for it to work is that it needs to be defined
+            in an application context along with any arbitrary "non-native" Spring.NET
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> instances that need
+            to be recognized by Spring.NET's AOP framework.
+            </p>
+            </remarks>
+            <author>Dmitriy Kopylenko</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: AdvisorAdapterRegistrationManager.cs,v 1.5 2007/08/22 08:49:08 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.AdvisorAdapterRegistrationManager.PostProcessBeforeInitialization(System.Object,System.String)">
+            <summary>
+            Apply this <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            to the given new object instance <i>before</i> any object initialization callbacks.
+            </summary>
+            <remarks>
+            <p>
+            Does nothing, simply returns the supplied <paramref name="instance"/> as is.
+            </p>
+            </remarks>
+            <param name="instance">
+            The new object instance.
+            </param>
+            <param name="name">
+            The name of the object.
+            </param>
+            <returns>
+            The object instance to use, either the original or a wrapped one.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.AdvisorAdapterRegistrationManager.PostProcessAfterInitialization(System.Object,System.String)">
+            <summary>
+            Apply this <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/> to the
+            given new object instance <i>after</i> any object initialization callbacks.
+            </summary>
+            <remarks>
+            <p>
+            Registers the supplied <paramref name="instance"/> with the
+            <see cref="T:Spring.Aop.Framework.Adapter.GlobalAdvisorAdapterRegistry"/>
+            singleton if it is an <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/>
+            instance.
+            </p>
+            </remarks>
+            <param name="instance">
+            The new object instance.
+            </param>
+            <param name="objectName">
+            The name of the object.
+            </param>
+            <returns>
+            The object instance to use, either the original or a wrapped one.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="T:Spring.Aspects.RetryAdvice">
+             <summary>
+             AOP Advice to retry a method invocation on an exception.  The retry semantics are defined by a DSL of the
+             form <code>on exception name [ExceptionName1,ExceptionName2,...] retry [number of times] [delay|rate] [delay time|rate expression]</code>.
+             For example, <code>on exception name ArithmeticException retry 3x delay 1s</code>
+             </summary>
+             <remarks>
+            
+             </remarks>
+             <author>Mark Pollack</author>
+             <version>$Id: RetryAdvice.cs,v 1.5 2008/03/17 20:25:34 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.RetryAdvice.Invoke(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Implement this method to perform extra treatments before and after
+            the call to the supplied <paramref name="invocation"/>.
+            </summary>
+            <param name="invocation">The method invocation that is being intercepted.</param>
+            <returns>
+            The result of the call to the
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+            the supplied <paramref name="invocation"/>; this return value may
+            well have been intercepted by the interceptor.
+            </returns>
+            <remarks>
+            	<p>
+            Polite implementations would certainly like to invoke
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/>.
+            </p>
+            </remarks>
+            <exception cref="T:System.Exception">
+            If any of the interceptors in the chain or the target object itself
+            throws an exception.
+            </exception>
+        </member>
+        <member name="M:Spring.Aspects.RetryAdvice.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has injected all of an object's dependencies.
+            </summary>
+            <remarks>
+            	<p>
+            This method allows the object instance to perform the kind of
+            initialization only possible when all of it's dependencies have
+            been injected (set), and to throw an appropriate exception in the
+            event of misconfiguration.
+            </p>
+            	<p>
+            Please do consult the class level documentation for the
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> interface for a
+            description of exactly <i>when</i> this method is invoked. In
+            particular, it is worth noting that the
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            and <see cref="T:Spring.Context.IApplicationContextAware"/>
+            callbacks will have been invoked <i>prior</i> to this method being
+            called.
+            </p>
+            </remarks>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as the failure to set a
+            required property) or if initialization fails.
+            </exception>
+        </member>
+        <member name="M:Spring.Aspects.RetryAdvice.Parse(System.String)">
+            <summary>
+            Parses the specified handler string.
+            </summary>
+            <param name="retryExpressionString">The handler string.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Aspects.RetryAdvice.GetMatchForActionExpression(System.String,System.String)">
+            <summary>
+            Gets the match for action expression.
+            </summary>
+            <param name="actionExpressionString">The action expression string.</param>
+            <param name="regexString">The regex string.</param>
+            <returns>The Match object resulting from the regular expression match.</returns>
+        </member>
+        <member name="P:Spring.Aspects.RetryAdvice.RetryExpression">
+            <summary>
+            Gets or sets the retry expression.
+            </summary>
+            <value>The retry expression.</value>
+        </member>
+        <member name="P:Spring.Aspects.RetryAdvice.OnExceptionNameRegex">
+            <summary>
+            Gets or sets the Regex string used to parse advice expressions starting with 'on exception name' and exception handling actions.
+            </summary>
+            <value>The regex string to parse advice expressions starting with 'on exception name' and exception handling actions.</value>
+        </member>
+        <member name="P:Spring.Aspects.RetryAdvice.OnExceptionRegex">
+            <summary>
+            Gets or sets the Regex string used to parse advice expressions starting with 'on exception (constraint)' and exception handling actions.
+            </summary>
+            <value>The regex string to parse advice expressions starting with 'on exception (constraint)' and exception handling actions.</value>
+        </member>
+        <member name="T:Spring.Aspects.Cache.CacheParameterAdvisor">
+            <summary>
+            Convinience advisor implementation that applies <see cref="T:Spring.Aspects.Cache.CacheParameterAdvice"/>
+            to all the methods that have <see cref="T:Spring.Caching.CacheParameterAttribute"/> defined on one or
+            more of their parameters.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CacheParameterAdvisor.cs,v 1.1 2007/02/16 03:12:56 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Cache.CacheParameterAdvisor.#ctor">
+            <summary>
+            Creates new advisor instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.Cache.CacheParameterAdvisor.Matches(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Returns <c>true</c> if any of the parameters of the specified <paramref name="method"/>
+            has <see cref="T:Spring.Caching.CacheParameterAttribute"/> applied.
+            </summary>
+            <param name="method">
+            Method to check.
+            </param>
+            <param name="targetType">
+            Type of target object.
+            </param>
+            <returns>
+            <c>true</c> if any of the parameters of the specified <paramref name="method"/>
+            has <see cref="T:Spring.Caching.CacheParameterAttribute"/> applied; <c>false</c> otherwise.
+            </returns>
+        </member>
+        <member name="P:Spring.Aspects.Cache.CacheParameterAdvisor.ApplicationContext">
+            <summary>
+            Set the <see cref="T:Spring.Context.IApplicationContext"/> that this
+            object runs in.
+            </summary>
+            <remarks>
+            <p>
+            Normally this call will be used to initialize the object.
+            </p>
+            <p>
+            Invoked after population of normal object properties but before an
+            init callback such as
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            or a custom init-method. Invoked after the setting of any
+            <see cref="T:Spring.Context.IResourceLoaderAware"/>'s
+            <see cref="P:Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+            property.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Context.ApplicationContextException">
+            In the case of application context initialization errors.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If thrown by any application context methods.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectInitializationException"/>
+        </member>
+        <member name="T:Spring.Aspects.Cache.CacheResultAdvisor">
+            <summary>
+            Convinience advisor implementation that applies <see cref="T:Spring.Aspects.Cache.CacheResultAdvice"/>
+            to all the methods that have <see cref="T:Spring.Caching.CacheResultAttribute"/> defined.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CacheResultAdvisor.cs,v 1.1 2007/02/16 03:13:01 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Cache.CacheResultAdvisor.#ctor">
+            <summary>
+            Creates new advisor instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.Cache.CacheResultAdvisor.Matches(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Returns <c>true</c> if either <see cref="T:Spring.Caching.CacheResultAttribute"/> or 
+            <see cref="T:Spring.Caching.CacheResultItemsAttribute"/> is applied to the 
+            <paramref name="method"/>.
+            </summary>
+            <param name="method">
+            Method to check.
+            </param>
+            <param name="targetType">
+            Type of target object.
+            </param>
+            <returns>
+            <c>true</c> if either <see cref="T:Spring.Caching.CacheResultAttribute"/> or 
+            <see cref="T:Spring.Caching.CacheResultItemsAttribute"/> is applied to the 
+            <paramref name="method"/>; <c>false</c> otherwise.
+            </returns>
+        </member>
+        <member name="P:Spring.Aspects.Cache.CacheResultAdvisor.ApplicationContext">
+            <summary>
+            Set the <see cref="T:Spring.Context.IApplicationContext"/> that this
+            object runs in.
+            </summary>
+            <remarks>
+            <p>
+            Normally this call will be used to initialize the object.
+            </p>
+            <p>
+            Invoked after population of normal object properties but before an
+            init callback such as
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            or a custom init-method. Invoked after the setting of any
+            <see cref="T:Spring.Context.IResourceLoaderAware"/>'s
+            <see cref="P:Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+            property.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Context.ApplicationContextException">
+            In the case of application context initialization errors.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If thrown by any application context methods.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectInitializationException"/>
+        </member>
+        <member name="T:Spring.Aop.Framework.ProxyFactoryObject">
+            <summary>
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> implementation to
+            source AOP proxies from a Spring.NET IoC container (an
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/>).
+            </summary>
+            <remarks>
+            <p>
+            <see cref="T:AopAlliance.Intercept.IInterceptor"/>s and
+            <see cref="T:Spring.Aop.IAdvisor"/>s are identified by a list of object
+            names in the current container.</p>
+            <p>
+            Global interceptors and advisors can be added at the factory level
+            (that is, outside the context of a
+            <see cref="T:Spring.Aop.Framework.ProxyFactoryObject"/> definition). The
+            specified interceptors and advisors are expanded in an interceptor list
+            (see
+            <see cref="P:Spring.Aop.Framework.ProxyFactoryObject.InterceptorNames"/>)
+            where an <c>'xxx*'</c> wildcard-style entry is included in the list,
+            matching the given prefix with the object names. For example,
+            <c>'global*'</c> would match both <c>'globalObject1'</c> and
+            <c>'globalObjectBar'</c>, and <c>'*'</c> would match all defined
+            interceptors. The matching interceptors get applied according to their
+            returned order value, if they implement the
+            <see cref="T:Spring.Core.IOrdered"/> interface. An interceptor name list
+            may not conclude with a global <c>'xxx*'</c> pattern, as global
+            interceptors cannot invoke targets.
+            </p>
+            <p>
+            It is possible to cast a proxy obtained from this factory to an
+            <see cref="T:Spring.Aop.Framework.IAdvised"/> reference, or to obtain the
+            <see cref="T:Spring.Aop.Framework.ProxyFactoryObject"/> reference and
+            programmatically manipulate it. This won't work for existing prototype
+            references, which are independent... however, it will work for prototypes
+            subsequently obtained from the factory. Changes to interception will
+            work immediately on singletons (including existing references).
+            However, to change interfaces or the target it is necessary to obtain a
+            new instance from the surrounding container. This means that singleton
+            instances obtained from the factory do not have the same object
+            identity... however, they do have the same interceptors and target, and
+            changing any reference will change all objects.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Federico Spinazzi (.NET)</author>
+            <author>Choy Rim (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: ProxyFactoryObject.cs,v 1.26 2007/08/03 14:38:30 markpollack Exp $</version>
+            <seealso cref="P:Spring.Aop.Framework.ProxyFactoryObject.InterceptorNames"/>
+            <seealso cref="P:Spring.Aop.Framework.ProxyFactoryObject.ProxyInterfaces"/>
+            <seealso cref="T:AopAlliance.Intercept.IMethodInterceptor"/>
+            <seealso cref="T:Spring.Aop.IAdvisor"/>
+            <seealso cref="T:Spring.Aop.Target.SingletonTargetSource"/>
+        </member>
+        <member name="F:Spring.Aop.Framework.ProxyFactoryObject.GlobalInterceptorSuffix">
+            <summary>
+            This suffix in a value in an interceptor list indicates to expand globals.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.ProxyFactoryObject.logger">
+            <summary>
+            The shared <see cref="T:Common.Logging.ILog"/> instance for this class.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.ProxyFactoryObject.singleton">
+            <summary>
+            Is the object managed by this factory a singleton or a prototype?
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.ProxyFactoryObject.singletonInstance">
+            <summary>
+            The cached instance if this proxy factory object is a singleton.
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.ProxyFactoryObject.objectFactory">
+            <summary>
+            The owning object factory (which cannot be changed after this object is initialized).
+            </summary>
+        </member>
+        <member name="F:Spring.Aop.Framework.ProxyFactoryObject.sourceDictionary">
+            <summary> 
+            The mapping from an <see cref="T:Spring.Aop.IPointcut"/> or interceptor
+            to an object name (or <see lang="null"/>), depending on where it was
+            sourced from.
+            </summary>
+            <remarks>
+            <p>
+            If it's sourced from object name, it will need to be
+            refreshed each time a new prototype instance is created.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Aop.Framework.ProxyFactoryObject.interceptorNames">
+            <summary>
+            Names of interceptors and pointcut objects in the factory.
+            </summary>
+            <remarks>
+            <p>
+            Default is for globals expansion only.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Aop.Framework.ProxyFactoryObject.introductionNames">
+            <summary>
+            Names of introductions and pointcut objects in the factory.
+            </summary>
+            <remarks>
+            <p>
+            Default is for globals expansion only.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Aop.Framework.ProxyFactoryObject.targetName">
+            <summary>
+            The name of the target object(in the enclosing
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/>).
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.GetObject">
+            <summary> 
+            Creates an instance of the AOP proxy to be returned by this factory
+            </summary>
+            <remarks>
+            <p>
+            Invoked when clients obtain objects from this factory object. The
+            (proxy) instance will be cached for a singleton, and created on each
+            call to <see cref="M:Spring.Aop.Framework.ProxyFactoryObject.GetObject"/>
+            for a prototype.
+            </p>
+            </remarks>
+            <returns>
+            A fresh AOP proxy reflecting the current state of this factory.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IFactoryObject.GetObject"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.ConfigureAdvisorChain">
+            <summary>Create the advisor (interceptor) chain.</summary>
+            <remarks>
+            The advisors that are sourced from an ObjectFactory will be refreshed each time
+            a new prototype instance is added. Interceptors added programmatically through 
+            the factory API are unaffected by such changes.
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.ConfigureIntroductions">
+            <summary>
+            Configures introductions for this proxy.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.AddGlobalAdvisor(Spring.Objects.Factory.IListableObjectFactory,System.String)">
+            <summary> Add all global interceptors and pointcuts.</summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.AddGlobalIntroduction(Spring.Objects.Factory.IListableObjectFactory,System.String)">
+            <summary> Add all global introductions.</summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.AddAdvisor(System.Object,System.String)">
+            <summary> Add the given interceptor or pointcut to the interceptor list.</summary>
+            <param name="next">interceptor or pointcut to add</param>
+            <param name="name">object name from which we obtained this object in our owning object factory</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.AddIntroduction(System.Object,System.String)">
+            <summary>Add the introduction to the introduction list.</summary>
+            <remarks>
+            If specified parameter is IIntroducionAdvisor it is added directly, otherwise it is wrapped
+            with DefaultIntroductionAdvisor first.
+            </remarks>
+            <param name="introduction">introducion to add</param>
+            <param name="name">object name from which we obtained this object in our owning object factory</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.RefreshAdvisorChain">
+            <summary> Refresh named objects from the interceptor chain.
+            We need to do this every time a new prototype instance is returned,
+            to return distinct instances of prototype interfaces and pointcuts.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.RefreshTarget">
+            <summary>
+            Refreshes target object for prototype instances.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.RefreshIntroductions">
+            <summary> Refresh named objects from the interceptor chain.
+            We need to do this every time a new prototype instance is returned,
+            to return distinct instances of prototype interfaces and pointcuts.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.NamedObjectToAdvisor(System.Object)">
+            <summary>Wraps pointcut or interceptor with appropriate advisor</summary>
+            <param name="next">pointcut or interceptor that needs to be wrapped with advisor</param>
+            <returns>Advisor</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.NamedObjectToTargetSource(System.Object)">
+            <summary>Wraps target with SingletonTargetSource if necessary</summary>
+            <param name="target">target or target source object</param>
+            <returns>target source passed or target wrapped with SingletonTargetSource</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.NamedObjectToIntroduction(System.Object)">
+            <summary>Wraps introduction with IIntroductionAdvisor if necessary</summary>
+            <param name="introduction">object to wrap</param>
+            <returns>Introduction advisor</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.Activated(Spring.Aop.Framework.AdvisedSupport)">
+            <seealso cref="M:Spring.Aop.Framework.IAdvisedSupportListener.Activated(Spring.Aop.Framework.AdvisedSupport)">
+            </seealso>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.AdviceChanged(Spring.Aop.Framework.AdvisedSupport)">
+            <summary> No need to do anything when advice change, proxy can handle those changes by itself.</summary>
+            <seealso cref="M:Spring.Aop.Framework.IAdvisedSupportListener.AdviceChanged(Spring.Aop.Framework.AdvisedSupport)">
+            </seealso>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObject.InterfacesChanged(Spring.Aop.Framework.AdvisedSupport)">
+            <summary>Implementation of listener for AdvisedSupport.InterfacesChanged event</summary>
+            <param name="advisedSupport">event source</param>
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyFactoryObject.ProxyInterfaces">
+            <summary>
+            Sets the names of the interfaces that are to be implemented by the proxy.
+            </summary>
+            <value>
+            The names of the interfaces that are to be implemented by the proxy.
+            </value>
+            <exception cref="T:Spring.Aop.Framework.AopConfigException">
+            If the supplied value (or any of its elements) is <see langword="null"/>;
+            or if any of the element values is not the (assembly qualified) name of
+            an interface type.
+            </exception>
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyFactoryObject.TargetName">
+            <summary>
+            Sets the name of the target object being proxied.
+            </summary>
+            <remarks>
+            <p>
+            Only works when the
+            <see cref="P:Spring.Aop.Framework.ProxyFactoryObject.ObjectFactory"/>
+            property is set; it is a logic error on the part of the programmer
+            if this value is set and the accompanying
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> is not also set.
+            </p>
+            </remarks>
+            <value>
+            The name of the target object being proxied.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyFactoryObject.InterceptorNames">
+            <summary> 
+            Sets the list of <see cref="T:AopAlliance.Intercept.IMethodInterceptor"/> and
+            <see cref="T:Spring.Aop.IAdvisor"/> object names.
+            </summary>
+            <remarks>
+            <p>
+            This property must always be set (configured) when using a
+            <see cref="T:Spring.Aop.Framework.ProxyFactoryObject"/> in an
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> context.
+            </p>
+            </remarks>
+            <value>
+            The list of <see cref="T:AopAlliance.Intercept.IMethodInterceptor"/> and
+            <see cref="T:Spring.Aop.IAdvisor"/> object names.
+            </value>
+            <seealso cref="T:AopAlliance.Intercept.IInterceptor"/>
+            <seealso cref="T:Spring.Aop.IAdvisor"/>
+            <seealso cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            <seealso cref="P:Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/>
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyFactoryObject.IntroductionNames">
+            <summary> 
+            Sets the list of introduction object names. 
+            </summary>
+            <remarks>
+            <p>
+            Only works when the
+            <see cref="P:Spring.Aop.Framework.ProxyFactoryObject.ObjectFactory"/>
+            property is set; it is a logic error on the part of the programmer
+            if this value is set and the accompanying
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> is not supplied.
+            </p>
+            </remarks>
+            <value>
+            The list of introduction object names. .
+            </value>
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyFactoryObject.ObjectFactory">
+            <summary>
+            Callback that supplies the owning factory to an object instance.
+            </summary>
+            <value>
+            Owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            (may not be <see langword="null"/>). The object can immediately
+            call methods on the factory.
+            </value>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of initialization errors.
+            </exception>
+            <seealso cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            <seealso cref="P:Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/>
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyFactoryObject.ObjectType">
+            <summary>
+            Return the <see cref="T:System.Type"/> of the proxy. 
+            </summary>
+            <remarks>
+            Will check the singleton instance if already created, 
+            else fall back to the proxy interface (if a single one),
+            the target bean type, or the TargetSource's target class.
+            </remarks>
+            Return the <see cref="T:System.Type"/> of object that this
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> creates, or
+            <see langword="null"/> if not known in advance.
+        </member>
+        <member name="P:Spring.Aop.Framework.ProxyFactoryObject.IsSingleton">
+            <summary>
+            Is the object managed by this factory a singleton or a prototype?
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.TargetAopProxyMethodBuilder">
+            <summary>
+            <see cref="T:Spring.Proxy.IProxyMethodBuilder"/> implementation 
+            that delegates method calls to target object.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Bruno Baia</author>
+            <version>$Id: TargetAopProxyMethodBuilder.cs,v 1.3 2008/01/29 18:24:50 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.TargetAopProxyMethodBuilder.targetSource">
+            <summary>
+            The local variable to store
+            the <see cref="T:Spring.Aop.Framework.ITargetSourceWrapper"/> instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.TargetAopProxyMethodBuilder.#ctor(System.Reflection.Emit.TypeBuilder,Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator,System.Boolean,System.Collections.IDictionary)">
+            <summary>
+            Creates a new instance of the method builder.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="aopProxyGenerator">
+            The <see cref="T:Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator"/> implementation to use.
+            </param>
+            <param name="explicitImplementation">
+            <see langword="true"/> if the interface is to be
+            implemented explicitly; otherwise <see langword="false"/>.
+            </param>
+            <param name="targetMethods">
+            The dictionary to cache the list of target 
+            <see cref="T:System.Reflection.MethodInfo"/>s.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.TargetAopProxyMethodBuilder.DeclareLocals(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo)">
+            <summary>
+            Creates local variable declarations.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.TargetAopProxyMethodBuilder.GenerateMethodLogic(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Generates method logic.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+            <param name="interfaceMethod">
+            The interface definition of the method, if applicable.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.TargetAopProxyMethodBuilder.CallDirectProxiedMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Calls proxied method directly.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+            <param name="interfaceMethod">
+            The interface definition of the method, if applicable.
+            </param>
+        </member>
+        <member name="T:Spring.Aspects.Logging.SimpleLoggingAdvice">
+             <summary>
+             Configurable advice for logging.
+             </summary>
+             <remarks>
+            
+             </remarks>
+             <author>Mark Pollack</author>
+             <version>$Id: SimpleLoggingAdvice.cs,v 1.7 2008/04/04 15:30:13 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Aspects.Logging.SimpleLoggingAdvice.logUniqueIdentifier">
+            <summary>
+            Flag to indicate if unique identifier should be in the log message.
+            </summary>
+        </member>
+        <member name="F:Spring.Aspects.Logging.SimpleLoggingAdvice.logExecutionTime">
+            <summary>
+            Flag to indicate if the execution time should be in the log message.
+            </summary>
+        </member>
+        <member name="F:Spring.Aspects.Logging.SimpleLoggingAdvice.logMethodArguments">
+            <summary>
+            Flag to indicate if the method arguments should be in the log message.
+            </summary>
+        </member>
+        <member name="F:Spring.Aspects.Logging.SimpleLoggingAdvice.logReturnValue">
+            <summary>
+            Flag to indicate if the return value should be in the log message.
+            </summary>
+        </member>
+        <member name="F:Spring.Aspects.Logging.SimpleLoggingAdvice.separator">
+            <summary>
+            The separator string to use for delmiting log message fields.
+            </summary>
+        </member>
+        <member name="F:Spring.Aspects.Logging.SimpleLoggingAdvice.logLevel">
+            <summary>
+            The log level to use for logging the entry, exit, exception messages.
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.Logging.SimpleLoggingAdvice.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.Logging.SimpleLoggingAdvice"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.Logging.SimpleLoggingAdvice.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.Logging.SimpleLoggingAdvice"/> class.
+            </summary>
+            <param name="useDynamicLogger">if set to <c>true</c> to use dynamic logger, if
+            <c>false</c> use static logger.</param>
+        </member>
+        <member name="M:Spring.Aspects.Logging.SimpleLoggingAdvice.InvokeUnderLog(AopAlliance.Intercept.IMethodInvocation,Common.Logging.ILog)">
+            <summary>
+            Subclasses must override this method to perform any tracing around the supplied
+            IMethodInvocation.
+            </summary>
+            <param name="invocation">The method invocation to log</param>
+            <param name="log">The log to write messages to</param>
+            <returns>
+            The result of the call to IMethodInvocation.Proceed()
+            </returns>
+            <remarks>
+            Subclasses are resonsible for ensuring that the IMethodInvocation actually executes
+            by calling IMethodInvocation.Proceed().
+            <para>
+            By default, the passed-in ILog instance will have log level
+            "trace" enabled. Subclasses do not have to check for this again, unless
+            they overwrite the IsInterceptorEnabled method to modify
+            the default behavior.
+            </para>
+            </remarks>
+            <exception cref="T:System.Exception">
+            If any of the interceptors in the chain or the target object itself
+            throws an exception.
+            </exception>
+        </member>
+        <member name="M:Spring.Aspects.Logging.SimpleLoggingAdvice.IsLogEnabled(Common.Logging.ILog)">
+            <summary>
+            Determines whether the given log is enabled.
+            </summary>
+            <param name="log">The log instance to check.</param>
+            <returns>
+            	<c>true</c> if log is for a given log level; otherwise, <c>false</c>.
+            </returns>
+            <remarks>
+            Default is true when the trace level is enabled.  Subclasses may override this
+            to change the level at which logging occurs, or return true to ignore level
+            checks.</remarks>
+        </member>
+        <member name="M:Spring.Aspects.Logging.SimpleLoggingAdvice.CreateUniqueIdentifier">
+            <summary>
+            Creates a unique identifier.
+            </summary>
+            <remarks>
+            Default implementation uses Guid.NewGuid().  Subclasses may override to provide an alternative
+            ID generation implementation.
+            </remarks>
+            <returns>A unique identifier</returns>
+        </member>
+        <member name="M:Spring.Aspects.Logging.SimpleLoggingAdvice.GetEntryMessage(AopAlliance.Intercept.IMethodInvocation,System.String)">
+            <summary>
+            Gets the entry message to log
+            </summary>
+            <param name="invocation">The invocation.</param>
+            <param name="idString">The id string.</param>
+            <returns>The entry log message</returns>
+        </member>
+        <member name="M:Spring.Aspects.Logging.SimpleLoggingAdvice.GetExceptionMessage(AopAlliance.Intercept.IMethodInvocation,System.Exception,System.TimeSpan,System.String)">
+            <summary>
+            Gets the exception message.
+            </summary>
+            <param name="invocation">The method invocation.</param>
+            <param name="e">The thown exception.</param>
+            <param name="executionTimeSpan">The execution time span.</param>
+            <param name="idString">The id string.</param>
+            <returns>The exception log message.</returns>
+        </member>
+        <member name="M:Spring.Aspects.Logging.SimpleLoggingAdvice.GetExitMessage(AopAlliance.Intercept.IMethodInvocation,System.Object,System.TimeSpan,System.String)">
+            <summary>
+            Gets the exit log message.
+            </summary>
+            <param name="invocation">The method invocation.</param>
+            <param name="returnValue">The return value.</param>
+            <param name="executionTimeSpan">The execution time span.</param>
+            <param name="idString">The id string.</param>
+            <returns>the exit log message</returns>
+        </member>
+        <member name="M:Spring.Aspects.Logging.SimpleLoggingAdvice.AppendCommonInformation(System.Text.StringBuilder,AopAlliance.Intercept.IMethodInvocation,System.String)">
+            <summary>
+            Appends common information across entry,exit, exception logging
+            </summary>
+            <remarks>Add method name and unique identifier if required.</remarks>
+            <param name="sb">The string buffer building logging message.</param>
+            <param name="invocation">The method invocation.</param>
+            <param name="idString">The unique identifier string.</param>
+        </member>
+        <member name="M:Spring.Aspects.Logging.SimpleLoggingAdvice.GetMethodArgumentAsString(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Gets the method argument as argumen name/value pairs.
+            </summary>
+            <param name="invocation">The method invocation.</param>
+            <returns>string for logging method argument name and values.</returns>
+        </member>
+        <member name="P:Spring.Aspects.Logging.SimpleLoggingAdvice.LogUniqueIdentifier">
+            <summary>
+            Gets or sets a value indicating whether to log a unique identifier with the log message.
+            </summary>
+            <value><c>true</c> if [log unique identifier]; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Aspects.Logging.SimpleLoggingAdvice.LogExecutionTime">
+            <summary>
+            Gets or sets a value indicating whether to log execution time.
+            </summary>
+            <value><c>true</c> if log execution time; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Aspects.Logging.SimpleLoggingAdvice.LogMethodArguments">
+            <summary>
+            Gets or sets a value indicating whether log method arguments.
+            </summary>
+            <value><c>true</c> if log method arguments]; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Aspects.Logging.SimpleLoggingAdvice.LogReturnValue">
+            <summary>
+            Gets or sets a value indicating whether log return value.
+            </summary>
+            <value><c>true</c> if log return value; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Aspects.Logging.SimpleLoggingAdvice.Separator">
+            <summary>
+            Gets or sets the seperator string to use for delmiting log message fields.
+            </summary>
+            <value>The seperator.</value>
+        </member>
+        <member name="P:Spring.Aspects.Logging.SimpleLoggingAdvice.LogLevel">
+            <summary>
+            Gets or sets the entry log level.
+            </summary>
+            <value>The entry log level.</value>
+        </member>
+        <member name="T:Spring.Aspects.Exceptions.ReturnValueExceptionHandler">
+            <summary>
+            Evaluates the expression for the return value of the method.
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: ReturnValueExceptionHandler.cs,v 1.3 2007/10/10 18:07:46 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.ReturnValueExceptionHandler.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.Exceptions.ReturnValueExceptionHandler"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.ReturnValueExceptionHandler.#ctor(System.String[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.Exceptions.ReturnValueExceptionHandler"/> class.
+            </summary>
+            <param name="exceptionNames">The exception names.</param>
+        </member>
+        <member name="M:Spring.Aspects.Exceptions.ReturnValueExceptionHandler.HandleException(System.Collections.IDictionary)">
+            <summary>
+            Returns the result of evaluating the translation expression.
+            </summary>
+            <returns>The return value from handling the exception, if not rethrown or a new exception is thrown.</returns>
+        </member>
+        <member name="T:Spring.Aop.TruePointcut">
+            <summary>
+            Canonical <see cref="T:Spring.Aop.IPointcut"/> instance that matches
+            everything.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+        </member>
+        <member name="F:Spring.Aop.TruePointcut.True">
+            <summary>
+            Canonical instance that matches everything.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.TruePointcut.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.TruePointcut"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly
+            visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.TruePointcut.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.IPointcut"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:Spring.Aop.IPointcut"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.TruePointcut.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="P:Spring.Aop.TruePointcut.TypeFilter">
+            <summary>
+            The <see cref="T:Spring.Aop.ITypeFilter"/> for this pointcut.
+            </summary>
+            <value>
+            The current <see cref="T:Spring.Aop.ITypeFilter"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Aop.TruePointcut.MethodMatcher">
+            <summary>
+            The <see cref="T:Spring.Aop.IMethodMatcher"/> for this pointcut.
+            </summary>
+            <value>
+            The current <see cref="T:Spring.Aop.IMethodMatcher"/>.
+            </value>
+        </member>
+        <member name="T:Spring.Aop.Support.StaticMethodMatcherPointcutAdvisor">
+            <summary>
+            Convenient superclass for <see cref="T:Spring.Aop.IAdvisor"/>s that
+            are also static pointcuts.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.Net)</author>
+            <version>$Id: StaticMethodMatcherPointcutAdvisor.cs,v 1.6 2006/04/09 07:18:37 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Support.StaticMethodMatcherPointcutAdvisor.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.StaticMethodMatcherPointcutAdvisor"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an abstract class, and as such has no publicly
+            visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Support.StaticMethodMatcherPointcutAdvisor.#ctor(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut"/>
+            class for the supplied <paramref name="advice"/>
+            </summary>
+            <remarks>
+            <p>
+            This is an abstract class, and as such has no publicly
+            visible constructors.
+            </p>
+            </remarks>
+            <param name="advice">
+            The advice to use.
+            </param>
+        </member>
+        <member name="P:Spring.Aop.Support.StaticMethodMatcherPointcutAdvisor.IsPerInstance">
+            <summary>
+            Is this advice associated with a particular instance?
+            </summary>
+            <value>
+            <see langword="true"/> if this advice is associated with a
+            particular instance.
+            </value>
+            <exception cref="T:System.NotSupportedException">
+            Always; this property is not yet supported.
+            </exception>
+        </member>
+        <member name="P:Spring.Aop.Support.StaticMethodMatcherPointcutAdvisor.Order">
+            <summary>
+            Returns this <see cref="T:Spring.Aop.IAdvisor"/>s order in the
+            interception chain.
+            </summary>
+            <returns>
+            This <see cref="T:Spring.Aop.IAdvisor"/>s order in the
+            interception chain.
+            </returns>
+        </member>
+        <member name="P:Spring.Aop.Support.StaticMethodMatcherPointcutAdvisor.Advice">
+            <summary>
+            Return the advice part of this advisor.
+            </summary>
+            <returns>
+            The advice that should apply if the pointcut matches.
+            </returns>
+            <see cref="P:Spring.Aop.IAdvisor.Advice"/>
+        </member>
+        <member name="P:Spring.Aop.Support.StaticMethodMatcherPointcutAdvisor.Pointcut">
+            <summary>
+            The <see cref="T:Spring.Aop.IPointcut"/> that drives this advisor.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor">
+            <summary>
+            Convenient class for regular expression method pointcuts that hold an
+            <see cref="T:AopAlliance.Aop.IAdvice"/>, making them an
+            <see cref="T:Spring.Aop.IAdvisor"/>.
+            </summary>
+            <remarks>
+            <p>
+            Configure this class using the <see cref="P:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor.Pattern"/> and
+            <see cref="P:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor.Patterns"/> pass-through properties. These are analogous
+            to the <see cref="P:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.Pattern"/> and
+            <see cref="P:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut.Pattern"/>s properties of the
+            <see cref="T:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut"/> class.
+            </p>
+            <p>
+            Can delegate to any type of regular expression pointcut. Currently only
+            pointcuts based on the regular expression classes from the .NET Base
+            Class Library are supported. The
+            <see cref="P:Spring.Aop.Support.DefaultPointcutAdvisor.Pointcut"/>
+            property must be a subclass of the
+            <see cref="T:Spring.Aop.Support.AbstractRegularExpressionMethodPointcut"/> class.
+            </p>
+            <p>
+            This should not normally be set directly.
+            </p>
+            </remarks>
+            <author>Dmitriy Kopylenko</author>
+            <author>Rod Johnson</author>
+            <author>Simon White (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <see cref="T:Spring.Aop.Support.SdkRegularExpressionMethodPointcut"/>
+        </member>
+        <member name="M:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor"/>
+            class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor.#ctor(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor"/>
+            class for the supplied <paramref name="advice"/>.
+            </summary><param name="advice">
+            The target advice.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor.InitPointcut">
+            <summary>
+            Initialises the pointcut.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor.Pattern">
+            <summary>
+            A single pattern to be used during method evaluation.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor.Patterns">
+            <summary>
+            Multiple patterns to be used during method evaluation.
+            </summary>
+        </member>
+        <member name="P:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor.Pointcut">
+            <summary>
+            The <see cref="T:Spring.Aop.IPointcut"/> that drives this advisor.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Support.Pointcuts">
+            <summary> 
+            Various <see cref="T:Spring.Aop.IPointcut"/> related utility methods.
+            </summary>
+            <remarks>
+            <p>
+            These methods are particularly useful for composing pointcuts
+            using the union and intersection methods.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: Pointcuts.cs,v 1.6 2007/03/16 04:01:25 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Support.Pointcuts.Union(Spring.Aop.IPointcut,Spring.Aop.IPointcut)">
+            <summary>
+            Creates a union of the two supplied pointcuts.
+            </summary>
+            <param name="firstPointcut">The first pointcut.</param>
+            <param name="secondPointcut">The second pointcut.</param>
+            <returns>
+            The union of the two supplied pointcuts.
+            </returns>
+            <seealso cref="T:Spring.Aop.Support.UnionPointcut"/>
+        </member>
+        <member name="M:Spring.Aop.Support.Pointcuts.Intersection(Spring.Aop.IPointcut,Spring.Aop.IPointcut)">
+            <summary>
+            Creates an <see cref="T:Spring.Aop.IPointcut"/> that is the
+            intersection of the two supplied pointcuts.
+            </summary>
+            <param name="firstPointcut">The first pointcut.</param>
+            <param name="secondPointcut">The second pointcut.</param>
+            <returns>
+            An <see cref="T:Spring.Aop.IPointcut"/> that is the
+            intersection of the two supplied pointcuts.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.Pointcuts.Matches(Spring.Aop.IPointcut,System.Reflection.MethodInfo,System.Type,System.Object[])">
+            <summary>
+            Performs the least expensive check for a match.
+            </summary>
+            <param name="pointcut">
+            The <see cref="T:Spring.Aop.IPointcut"/> to be evaluated.
+            </param>
+            <param name="method">The candidate method.</param>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/>.
+            </param>
+            <param name="args">The arguments to the method</param>
+            <returns><see langword="true"/> if there is a runtime match.</returns>
+            <seealso cref="M:Spring.Aop.IMethodMatcher.Matches(System.Reflection.MethodInfo,System.Type)"/>
+        </member>
+        <member name="M:Spring.Aop.Support.Pointcuts.AreEqual(Spring.Aop.IPointcut,Spring.Aop.IPointcut)">
+            <summary>
+            Are the supplied <see cref="T:Spring.Aop.IPointcut"/>s equal?
+            </summary>
+            <param name="firstPointcut">The first pointcut.</param>
+            <param name="secondPointcut">The second pointcut.</param>
+            <returns>
+            <see langword="true"/> if the supplied <see cref="T:Spring.Aop.IPointcut"/>s
+            are equal.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.Pointcuts.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.Pointcuts"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly
+            visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.IAdvisedProxyMethodBuilder">
+            <summary>
+            <see cref="T:Spring.Proxy.IProxyMethodBuilder"/> implementation that delegates 
+            method calls to an <see cref="T:Spring.Aop.Framework.IAdvised"/> instance.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: IAdvisedProxyMethodBuilder.cs,v 1.3 2006/11/12 01:37:47 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.IAdvisedProxyMethodBuilder._aopProxyGenerator">
+            <summary>
+            The <see cref="T:Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator"/> implementation to use.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.IAdvisedProxyMethodBuilder.#ctor(System.Reflection.Emit.TypeBuilder,Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator)">
+            <summary>
+            Creates a new instance of the method builder.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="aopProxyGenerator">
+            The <see cref="T:Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator"/> implementation to use.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.IAdvisedProxyMethodBuilder.PushTarget(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the target instance on which calls should be delegated to.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.BaseAopProxyMethodBuilder">
+            <summary>
+            <see cref="T:Spring.Proxy.IProxyMethodBuilder"/> implementation 
+            that delegates method calls to the base method.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: BaseAopProxyMethodBuilder.cs,v 1.1 2008/02/06 18:28:52 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.BaseAopProxyMethodBuilder.#ctor(System.Reflection.Emit.TypeBuilder,Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator,System.Collections.IDictionary,System.Collections.IDictionary)">
+            <summary>
+            Creates a new instance of the method builder.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="aopProxyGenerator">
+            The <see cref="T:Spring.Aop.Framework.DynamicProxy.IAopProxyTypeGenerator"/> implementation to use.
+            </param>
+            <param name="targetMethods">
+            The dictionary to cache the list of target 
+            <see cref="T:System.Reflection.MethodInfo"/>s.
+            </param>
+            <param name="onProxyTargetMethods">
+            The dictionary to cache the list of target  
+            <see cref="T:System.Reflection.MethodInfo"/>s defined on the proxy.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.BaseAopProxyMethodBuilder.GenerateOnProxyTargetMethodCacheField(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo)">
+            <summary>
+            Create static field that will cache target method when defined on the proxy.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The target method.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.BaseAopProxyMethodBuilder.CallDirectProxiedMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Calls target method directly.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+            <param name="interfaceMethod">
+            The interface definition of the method, if applicable.
+            </param>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.CachedAopProxyFactory">
+            <summary>
+            Implementation of the <see cref="T:Spring.Aop.Framework.IAopProxyFactory"/> 
+            interface that caches the AOP proxy <see cref="T:System.Type"/> instance.
+            </summary>
+            <remarks>
+            <p>
+            Caches against a key based on :
+            - the base type
+            - the target type
+            - the interfaces to proxy
+            </p>
+            </remarks>
+            <author>Bruno Baia</author>
+            <author>Erich Eichinger</author>
+            <seealso cref="T:Spring.Aop.Framework.DynamicProxy.DefaultAopProxyFactory"/>
+            <seealso cref="T:Spring.Aop.Framework.IAopProxyFactory"/>
+            <version>$Id: CachedAopProxyFactory.cs,v 1.1 2007/08/02 04:15:21 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicProxy.CachedAopProxyFactory.logger">
+            <summary>
+            The shared <see cref="T:Common.Logging.ILog"/> instance for this class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.CachedAopProxyFactory.BuildProxyType(Spring.Proxy.IProxyTypeBuilder)">
+            <summary>
+            Generates the proxy type and caches the <see cref="T:System.Type"/>
+            instance against the base type and the interfaces to proxy.
+            </summary>
+            <param name="typeBuilder">
+            The <see cref="T:Spring.Proxy.IProxyTypeBuilder"/> to use
+            </param>
+            <returns>The generated or cached proxy class.</returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.CachedAopProxyFactory.ProxyTypeCacheKey">
+            <summary>
+            Uniquely identifies a proxytype in the cache
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.AopUtils">
+            <summary>
+            Utility methods used by the AOP framework.
+            </summary>
+            <remarks>
+            <p>
+            Not intended to be used directly by applications.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: AopUtils.cs,v 1.4 2007/10/10 18:07:38 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopUtils.IsAopProxy(System.Object)">
+            <summary>
+            Is the supplied <paramref name="instance"/> an AOP proxy?
+            </summary>
+            <remarks>
+            Return whether the given object is either 
+            a composition-based proxy or a decorator-based proxy.
+            </remarks>
+            <param name="instance">The instance to be checked.</param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="instance"/> is
+            an AOP proxy.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopUtils.IsCompositionAopProxy(System.Object)">
+            <summary>
+            Is the supplied <paramref name="instance"/> a composition-based AOP proxy?
+            </summary>
+            <param name="instance">The instance to be checked.</param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="instance"/> is
+            an composition-based AOP proxy.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopUtils.IsDecoratorAopProxy(System.Object)">
+            <summary>
+            Is the supplied <paramref name="instance"/> a decorator-based AOP proxy?
+            </summary>
+            <param name="instance">The instance to be checked.</param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="instance"/> is
+            an decorator-based AOP proxy.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopUtils.GetAllInterfaces(System.Object)">
+            <summary>
+            Gets all of the interfaces that the <see cref="T:System.Type"/> of the
+            supplied <paramref name="instance"/> implements.
+            </summary>
+            <remarks>
+            <p>
+            This includes interfaces implemented by any superclasses.
+            </p>
+            </remarks>
+            <param name="instance">
+            The object to analyse for interfaces.
+            </param>
+            <returns>
+            All of the interfaces that the <see cref="T:System.Type"/> of the
+            supplied <paramref name="instance"/> implements; or an empty
+            array if the supplied <paramref name="instance"/> is
+            <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopUtils.CanApply(Spring.Aop.IPointcut,System.Type,System.Type[])">
+            <summary> 
+            Can the supplied <paramref name="pointcut"/> apply at all on the
+            supplied <paramref name="targetType"/>?
+            </summary>
+            <remarks>
+            <p>
+            This is an important test as it can be used to optimize out a
+            pointcut for a class.
+            </p>
+            <p>
+            Invoking this method with a <paramref name="targetType"/> that is
+            an interface type will always yield a <see langword="false"/>
+            return value.
+            </p>
+            </remarks>
+            <param name="pointcut">The pointcut being tested.</param>
+            <param name="targetType">The class being tested.</param>
+            <param name="proxyInterfaces">
+            The interfaces being proxied. If <see langword="null"/>, all
+            methods on a class may be proxied.
+            </param>
+            <returns>
+            <see langword="true"/> if the pointcut can apply on any method.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopUtils.CanApply(Spring.Aop.IAdvisor,System.Type,System.Type[])">
+            <summary> 
+            Can the supplied <paramref name="advisor"/> apply at all on the
+            supplied <paramref name="targetType"/>?
+            </summary>
+            <remarks>
+            <p>
+            This is an important test as it can be used to optimize out an
+            advisor for a class.
+            </p>
+            </remarks>
+            <param name="advisor">The advisor to check.</param>
+            <param name="targetType">The class being tested.</param>
+            <param name="proxyInterfaces">
+            The interfaces being proxied. If <see langword="null"/>, all
+            methods on a class may be proxied.
+            </param>
+            <returns>
+            <see langword="true"/> if the advisor can apply on any method.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopUtils.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.AopUtils"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly
+            visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Aop.Framework.AopUtils.GetTargetType(System.Object)">
+            <summary>
+            Gets the type of the target.
+            </summary>
+            <param name="candidate">The candidate.</param>
+            <returns></returns>
+        </member>
+        <member name="T:Spring.Aspects.Validation.ParameterValidationAdvice">
+            <summary>
+            This advice is typically applied to service-layer methods in order to validate
+            method arguments.
+            </summary>
+            <remarks>
+            <para>Each argument that should be validated has to be marked with one or more
+            <see cref="T:Spring.Validation.ValidatedAttribute"/>s.</para>
+            <para>If the validation fails, this advice will throw <see cref="T:Spring.Validation.ValidationException"/>,
+            thus preventing target method invocation.
+            </para>
+            </remarks>
+            <author>Damjan Tomic</author>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ParameterValidationAdvice.cs,v 1.2 2008/04/02 23:00:28 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Validation.ParameterValidationAdvice.Before(System.Reflection.MethodInfo,System.Object[],System.Object)">
+            <summary>
+            Intercepts method invocation and validates arguments.
+            </summary>
+            <param name="method">
+            Method invocation.
+            </param>
+            <param name="args">
+            Method arguments.
+            </param>
+            <param name="target">
+            Target object.
+            </param>
+            <exception cref="T:Spring.Validation.ValidationException">
+            If one or more method arguments fail validation.
+            </exception>
+        </member>
+        <member name="P:Spring.Aspects.Validation.ParameterValidationAdvice.ApplicationContext">
+            <summary>
+            Gets or sets the application context to search for validators in.
+            </summary>
+            <value>
+            The application context to search for validators in.
+            </value>
+        </member>
+        <member name="T:Spring.Aop.Support.MethodMatchers">
+            <summary>
+            Various utility methods relating to the composition of
+            <see cref="T:Spring.Aop.IMethodMatcher"/>s.
+            </summary>
+            <remarks>
+            <p>
+            A method matcher may be evaluated statically (based on method and target
+            class) or need further evaluation dynamically (based on arguments at
+            the time of method invocation).
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: MethodMatchers.cs,v 1.7 2007/03/16 04:01:24 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Support.MethodMatchers.Union(Spring.Aop.IMethodMatcher,Spring.Aop.IMethodMatcher)">
+            <summary>
+            Creates a new <see cref="T:Spring.Aop.IMethodMatcher"/> that is the
+            union of the two supplied <see cref="T:Spring.Aop.IMethodMatcher"/>s.
+            </summary>
+            <remarks>
+            <p>
+            The newly created matcher will match all the methods that either of the two 
+            supplied matchers would match.
+            </p>
+            </remarks>
+            <param name="firstMatcher">The first method matcher.</param>
+            <param name="secondMatcher">The second method matcher.</param>
+            <returns>
+            A new <see cref="T:Spring.Aop.IMethodMatcher"/> that is the
+            union of the two supplied <see cref="T:Spring.Aop.IMethodMatcher"/>s
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.MethodMatchers.Intersection(Spring.Aop.IMethodMatcher,Spring.Aop.IMethodMatcher)">
+            <summary>
+            Creates a new <see cref="T:Spring.Aop.IMethodMatcher"/> that is the
+            intersection of the two supplied <see cref="T:Spring.Aop.IMethodMatcher"/>s.
+            </summary>
+            <remarks>
+            <p>
+            The newly created matcher will match only those methods that both
+            of the supplied matchers would match.
+            </p>
+            </remarks>
+            <param name="firstMatcher">The first method matcher.</param>
+            <param name="secondMatcher">The second method matcher.</param>
+            <returns>
+            A new <see cref="T:Spring.Aop.IMethodMatcher"/> that is the
+            intersection of the two supplied <see cref="T:Spring.Aop.IMethodMatcher"/>s
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Support.MethodMatchers.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Support.MethodMatchers"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly
+            visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.CompositionAopProxyTypeBuilder">
+            <summary>
+            Builds an AOP proxy type using composition.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Bruno Baia</author>
+            <version>$Id: CompositionAopProxyTypeBuilder.cs,v 1.15 2007/12/07 17:58:56 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.CompositionAopProxyTypeBuilder.#ctor(Spring.Aop.Framework.IAdvised)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Aop.Framework.DynamicProxy.CompositionAopProxyTypeBuilder"/> class.
+            </summary>
+            <param name="advised">The proxy configuration.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.CompositionAopProxyTypeBuilder.BuildProxyType">
+            <summary>
+            Creates the proxy type.
+            </summary>
+            <returns>The generated proxy type.</returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.CompositionAopProxyTypeBuilder.PushAdvisedProxy(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes  
+            the current <see cref="T:Spring.Aop.Framework.DynamicProxy.AdvisedProxy"/> 
+            instance on stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.CompositionAopProxyTypeBuilder.ImplementSerializationConstructor(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements serialization constructor.
+            </summary>
+            <param name="typeBuilder">Type builder to use.</param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.CompositionAopProxyTypeBuilder.ImplementConstructors(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements constructors for the proxy class.
+            </summary>
+            <remarks>
+            <p>
+            This implementation calls the base constructor.
+            </p>
+            </remarks>
+            <param name="typeBuilder">
+            The <see cref="T:System.Type"/> builder to use.
+            </param>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.CompositionAopProxyTypeBuilder.IsCompositionProxy(System.Type)">
+            <summary>
+            Determines if the specified <paramref name="type"/> 
+            is one of those generated by this builder.
+            </summary>
+            <param name="type">The type to check.</param>
+            <returns>
+            <see langword="true"/> if the type is a composition-based proxy;
+            otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.AdvisorChainFactoryUtils">
+            <summary>
+            Utility methods for use by
+            <see cref="T:Spring.Aop.Framework.IAdvisorChainFactory"/> implementations.
+            </summary>
+            <remarks>
+            <p>
+            Not intended to be used directly by applications.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: AdvisorChainFactoryUtils.cs,v 1.7 2006/04/09 07:18:35 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisorChainFactoryUtils.CalculateInterceptors(Spring.Aop.Framework.IAdvised,System.Object,System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Gets the list of
+            <see langword="static"/> interceptors and dynamic interception
+            advice that may apply to the supplied <paramref name="method"/>
+            invocation.
+            </summary>
+            <param name="config">The proxy configuration.</param>
+            <param name="proxy">The object proxy.</param>
+            <param name="method">
+            The method to evaluate interceptors for.
+            </param>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> of the target object.
+            </param>
+            <returns>
+            A <see cref="T:System.Collections.IList"/> of
+            <see cref="T:AopAlliance.Intercept.IMethodInterceptor"/> (if there's
+            a dynamic method matcher that needs evaluation at runtime).
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.AdvisorChainFactoryUtils.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.AdvisorChainFactoryUtils"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly visible
+            constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.AfterReturningAdviceAdapter">
+            <summary>
+            <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapter"/> implementation
+            to enable <see cref="T:Spring.Aop.IAfterReturningAdvice"/> to be used in the
+            Spring.NET AOP framework.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: AfterReturningAdviceAdapter.cs,v 1.5 2007/03/16 04:01:20 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.AfterReturningAdviceAdapter.SupportsAdvice(AopAlliance.Aop.IAdvice)">
+            <summary>
+            Returns <see langword="true"/> if the supplied
+            <paramref name="advice"/> is an instance of the
+            <see cref="T:Spring.Aop.IAfterReturningAdvice"/> interface.
+            </summary>
+            <param name="advice">The advice to check.</param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="advice"/> is
+            an instance of the <see cref="T:Spring.Aop.IAfterReturningAdvice"/> interface;
+            <see langword="false"/> if not or if the supplied
+            <paramref name="advice"/> is <cref lang="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Aop.Framework.Adapter.AfterReturningAdviceAdapter.GetInterceptor(Spring.Aop.IAdvisor)">
+            <summary>
+            Wraps the supplied <paramref name="advisor"/>'s
+            <see cref="P:Spring.Aop.IAdvisor.Advice"/> within a
+            <see cref="T:Spring.Aop.Framework.Adapter.AfterReturningAdviceInterceptor"/>
+            instance.
+            </summary>
+            <param name="advisor">
+            The advisor exposing the <see cref="T:AopAlliance.Aop.IAdvice"/> that
+            is to be wrapped.
+            </param>
+            <returns>
+            The supplied <paramref name="advisor"/>'s
+            <see cref="P:Spring.Aop.IAdvisor.Advice"/> wrapped within a
+            <see cref="T:Spring.Aop.Framework.Adapter.AfterReturningAdviceInterceptor"/>
+            instance.
+            </returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicMethodInvocation">
+            <summary>
+            Invokes a target method using dynamic reflection.
+            </summary>
+            <seealso cref="T:Spring.Reflection.Dynamic.DynamicMethod"/>
+            <author>Aleksandar Seovic</author>
+            <author>Bruno Baia</author>
+            <version>$Id: DynamicMethodInvocation.cs,v 1.3 2008/02/06 18:28:52 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Framework.DynamicMethodInvocation.proxyMethod">
+            <summary>
+            The method invocation that is to be invoked on the proxy.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicMethodInvocation.#ctor(System.Object,System.Object,System.Reflection.MethodInfo,System.Reflection.MethodInfo,System.Object[],System.Type,System.Collections.IList)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Aop.Framework.DynamicMethodInvocation"/> class.
+            </summary>
+            <param name="proxy">The AOP proxy.</param>
+            <param name="target">The target object.</param>
+            <param name="method">The target method proxied.</param>
+            <param name="proxyMethod">The method to invoke on proxy.</param>
+            <param name="arguments">The target method's arguments.</param>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> of the target object.</param>
+            <param name="interceptors">
+            The list of interceptors that are to be applied. May be
+            <cref lang="null"/>.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If any of the <paramref name="target"/> or <paramref name="method"/>
+            parameters is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicMethodInvocation.InvokeJoinpoint">
+            <summary>
+            Invokes the joinpoint using dynamic reflection.
+            </summary>
+            <remarks>
+            <p>
+            Subclasses can override this to use custom invocation.
+            </p>
+            </remarks>
+            <returns>
+            The return value of the invocation of the joinpoint.
+            </returns>
+            <exception cref="T:System.Exception">
+            If invoking the joinpoint resulted in an exception.
+            </exception>
+            <see cref="M:Spring.Aop.Framework.AbstractMethodInvocation.InvokeJoinpoint"/>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicMethodInvocation.PrepareMethodInvocationForProceed(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Creates a new <see cref="T:Spring.Aop.Framework.DynamicMethodInvocation"/> instance 
+            from the specified <see cref="T:AopAlliance.Intercept.IMethodInvocation"/> and  
+            increments the interceptor index.
+            </summary>
+            <param name="invocation">
+            The current <see cref="T:AopAlliance.Intercept.IMethodInvocation"/> instance.
+            </param>
+            <returns>
+            The new <see cref="T:AopAlliance.Intercept.IMethodInvocation"/> instance to use.
+            </returns>
+        </member>
+    </members>
+</doc>
diff --git a/src/Spring/Spring.Core/AssemblyInfo.cs b/src/Spring/Spring.Core/AssemblyInfo.cs
new file mode 100644
index 00000000..d6adf3f5
--- /dev/null
+++ b/src/Spring/Spring.Core/AssemblyInfo.cs
@@ -0,0 +1,34 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Reflection;
+using System.Runtime.InteropServices;
+using System.Security.Permissions;
+[assembly: ComVisible(false)]
+[assembly: AssemblyTitle("Spring.Net Core functionality")]
+[assembly: AssemblyDescription("Core functionality for Spring.Net IoC container")]
+
+//
+// Security Permissions
+//
+// we need full, unrestricted access to reflection metadata...
+[assembly: ReflectionPermission(SecurityAction.RequestMinimum, Unrestricted=true)]
+//[assembly: AssemblyKeyFile(@"C:\users\aseovic\projects\OpenSource\Spring.Net\Spring.Net.PrivateKey.keys")]
+//[assembly: AssemblyKeyFile(@"C:\projects\Spring.Net\Spring.Net.snk")]
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Caching/AbstractCache.cs b/src/Spring/Spring.Core/Caching/AbstractCache.cs
new file mode 100644
index 00000000..94c5c746
--- /dev/null
+++ b/src/Spring/Spring.Core/Caching/AbstractCache.cs
@@ -0,0 +1,202 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+namespace Spring.Caching
+{
+    /// <summary>
+    /// An abstract <see cref="ICache"/> implementation that can
+    /// be used as base class for concrete implementations.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: AbstractCache.cs,v 1.7 2007/10/11 01:29:49 markpollack Exp $</version>
+    public abstract class AbstractCache : ICache
+    {
+        #region Fields
+
+        private bool _enforceTimeToLive = false;
+        private TimeSpan _timeToLive = TimeSpan.Zero;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets/Set the Default time-to-live (TTL) for items inserted into this cache. 
+        /// Used by <see cref="Insert(object,object)"/>
+        /// </summary>
+        public TimeSpan TimeToLive
+        {
+            get { return _timeToLive; }
+            set { _timeToLive = value; }
+        }
+
+        /// <summary>
+        /// Gets/Sets a value, whether the this cache instance's <see cref="TimeToLive"/> 
+        /// shall be applied to all items, regardless of their individual TTL 
+        /// when <see cref="Insert(object,object,TimeSpan)"/> is called.
+        /// </summary>
+        public bool EnforceTimeToLive
+        {
+            get { return _enforceTimeToLive; }
+            set { _enforceTimeToLive = value; }
+        }
+
+        #endregion
+
+        #region ICache Implementation
+
+        #region 
+
+        /// <summary>
+        /// Gets the number of items in the cache.
+        /// </summary>
+        /// <remarks>
+        /// May be overridden by subclasses for cache-specific efficient implementation.
+        /// </remarks>
+        public virtual int Count
+        {
+            get
+            {
+                return Keys.Count;
+            }
+        }
+        
+        /// <summary>
+        /// Gets a collection of all cache item keys.
+        /// </summary>
+        public abstract ICollection Keys { get; }
+
+
+
+        /// <summary>
+        /// Retrieves an item from the cache.
+        /// </summary>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        /// <returns>
+        /// Item for the specified <paramref name="key"/>, or <c>null</c>.
+        /// </returns>
+        public abstract object Get(object key);
+
+        /// <summary>
+        /// Removes an item from the cache.
+        /// </summary>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        public abstract void Remove(object key);
+
+        /// <summary>
+        /// Removes collection of items from the cache.
+        /// </summary>
+        /// <param name="keys">
+        /// Collection of keys to remove.
+        /// </param>
+        public virtual void RemoveAll(ICollection keys)
+        {
+            foreach (object key in keys)
+            {
+                Remove(key);
+            }
+        }
+
+        /// <summary>
+        /// Removes all items from the cache.
+        /// </summary>
+        public virtual void Clear()
+        {
+            RemoveAll(this.Keys);
+        }
+
+
+        /// <summary>
+        /// Inserts an item into the cache.
+        /// </summary>
+        /// <remarks>
+        /// Items inserted using this method use the default
+        /// </remarks>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        /// <param name="value">
+        /// Item value.
+        /// </param>
+        public virtual void Insert(object key, object value)
+        {
+            Insert(key, value, TimeToLive);
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache.
+        /// </summary>
+        /// <remarks>
+        /// If <paramref name="timeToLive"/> equals <see cref="TimeSpan.MinValue"/>, 
+        /// or <see cref="EnforceTimeToLive"/> is <value>true</value>, this cache 
+        /// instance's <see cref="TimeToLive"/> value will be applied.
+        /// </remarks>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        /// <param name="value">
+        /// Item value.
+        /// </param>
+        /// <param name="timeToLive">
+        /// Item's time-to-live (TTL).
+        /// </param>
+        public virtual void Insert(object key, object value, TimeSpan timeToLive)
+        {
+            if (_enforceTimeToLive || (timeToLive < TimeSpan.Zero))
+            {
+                timeToLive = _timeToLive;
+            }
+            DoInsert(key, value, timeToLive);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Actually does the cache implementation specific insert operation into the cache.
+        /// </summary>
+        /// <remarks>
+        /// Items inserted using this method have default cache priority.
+        /// </remarks>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        /// <param name="value">
+        /// Item value.
+        /// </param>
+        /// <param name="timeToLive">
+        /// Item's time-to-live (TTL).
+        /// </param>
+        protected abstract void DoInsert(object key, object value, TimeSpan timeToLive);
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Caching/BaseCacheAttribute.cs b/src/Spring/Spring.Core/Caching/BaseCacheAttribute.cs
new file mode 100644
index 00000000..c88378e8
--- /dev/null
+++ b/src/Spring/Spring.Core/Caching/BaseCacheAttribute.cs
@@ -0,0 +1,176 @@
+using System;
+using Spring.Core.TypeConversion;
+using Spring.Expressions;
+
+namespace Spring.Caching
+{
+    /// <summary>
+    /// Abstract base class containing shared properties for all cache attributes.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: BaseCacheAttribute.cs,v 1.5 2007/08/29 17:29:10 oakinger Exp $</version>
+    [Serializable]
+    public abstract class BaseCacheAttribute : Attribute
+    {
+        #region Fields
+
+        /// <summary>
+        /// The <see cref="TimeSpanConverter"/> instance used to parse <see cref="TimeSpan"/> values.
+        /// </summary>
+        /// <see cref="TimeToLive"/>
+        /// <see cref="TimeToLiveTimeSpan"/>
+        protected static readonly TimeSpanConverter TimeSpanConverter = new TimeSpanConverter();
+
+        private string cacheName;
+        private string key;
+        private IExpression keyExpression;
+        private string condition;
+        private IExpression conditionExpression;
+        private string timeToLive = null;
+        private TimeSpan timeToLiveTimeSpan = TimeSpan.MinValue;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates an attribute instance.
+        /// </summary>
+        public BaseCacheAttribute()
+        {
+        }
+
+        /// <summary>
+        /// Creates an attribute instance.
+        /// </summary>
+        /// <param name="cacheName">
+        /// The name of the cache to use.
+        /// </param>
+        /// <param name="key">
+        /// An expression string that should be evaluated in order to determine
+        /// the cache key for the item.
+        /// </param>
+        public BaseCacheAttribute(string cacheName, string key)
+        {
+            this.CacheName = cacheName;
+            this.Key = key;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the name of the cache to use.
+        /// </summary>
+        /// <value>
+        /// The name of the cache to use.
+        /// </value>
+        public string CacheName
+        {
+            get { return cacheName; }
+            set { cacheName = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a SpEL expression that should be evaluated in order 
+        /// to determine the cache key for the item.
+        /// </summary>
+        /// <value>
+        /// An expression string that should be evaluated in order to determine
+        /// the cache key for the item.
+        /// </value>
+        public string Key
+        {
+            get { return key; }
+            set
+            {
+                key = value;
+                keyExpression = Expression.Parse(value);
+            }
+        }
+
+        /// <summary>
+        /// Gets an expression instance that should be evaluated in order 
+        /// to determine the cache key for the item.
+        /// </summary>
+        /// <value>
+        /// An expression instance that should be evaluated in order to determine
+        /// the cache key for the item.
+        /// </value>
+        public IExpression KeyExpression
+        {
+            get { return keyExpression; }
+        }
+
+        /// <summary>
+        /// Gets or sets a SpEL expression that should be evaluated in order 
+        /// to determine whether the item should be cached.
+        /// </summary>
+        /// <value>
+        /// An expression string that should be evaluated in order to determine
+        /// whether the item should be cached.
+        /// </value>
+        public string Condition
+        {
+            get { return condition; }
+            set
+            {
+                condition = value;
+                conditionExpression = Expression.Parse(value);
+            }
+        }
+
+        /// <summary>
+        /// Gets an expression instance that should be evaluated in order 
+        /// to determine whether the item should be cached.
+        /// </summary>
+        /// <value>
+        /// An expression instance that should be evaluated in order to determine
+        /// whether the item should be cached.
+        /// </value>
+        public IExpression ConditionExpression
+        {
+            get { return conditionExpression; }
+        }
+
+        /// <summary>
+        /// The amount of time an object should remain in the cache.
+        /// </summary>
+        /// <remarks>
+        /// If no TTL is specified, the default TTL defined by the 
+        /// cache's policy will be applied.
+        /// </remarks>
+        /// <value>
+        /// The amount of time object should remain in the cache 
+        /// formatted to be recognizable by <see cref="TimeSpan.Parse(string)"/>.
+        /// </value>
+        public string TimeToLive
+        {
+            get { return timeToLive; }
+            set
+            {
+                timeToLive = value;
+                timeToLiveTimeSpan = (timeToLive == null) ? TimeSpan.MinValue : (TimeSpan)TimeSpanConverter.ConvertFrom(timeToLive);
+            }
+        }
+
+
+        /// <summary>
+        /// The amount of time an object should remain in the cache (in seconds).
+        /// </summary>
+        /// <remarks>
+        /// If no TTL is specified, the default TTL defined by the 
+        /// cache's policy will be applied.
+        /// </remarks>
+        /// <value>
+        /// The amount of time object should remain in the cache (in seconds).
+        /// </value>
+        public TimeSpan TimeToLiveTimeSpan
+        {
+            get { return timeToLiveTimeSpan; }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Caching/CacheParameterAttribute.cs b/src/Spring/Spring.Core/Caching/CacheParameterAttribute.cs
new file mode 100644
index 00000000..63d0a728
--- /dev/null
+++ b/src/Spring/Spring.Core/Caching/CacheParameterAttribute.cs
@@ -0,0 +1,72 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Caching
+{
+    /// <summary>
+    /// This attribute should be used to mark methods whose argument(s) 
+    /// need to be cached.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This attribute allows application developers to specify that an argument 
+    /// of the method should be cached, but it will not do any caching by itself.
+    /// </p>
+    /// <p>
+    /// In order to actually cache the result, an application developer
+    /// must apply a <c>Spring.Aspects.Cache.CacheParameterAdvice</c> to
+    /// all of the members that have this attribute defined.
+    /// </p>
+    /// <p>
+    /// You can specify this attribute multiple times on the same method in order to
+    /// cache several method parameters.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CacheParameterAttribute.cs,v 1.2 2007/03/31 01:07:26 bbaia Exp $</version>
+    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = true, Inherited = false)]
+    [Serializable]
+    public sealed class CacheParameterAttribute : BaseCacheAttribute
+    {
+        /// <summary>
+        /// Creates an attribute instance.
+        /// </summary>
+        public CacheParameterAttribute()
+        {
+        }
+
+        /// <summary>
+        /// Creates an attribute instance.
+        /// </summary>
+        /// <param name="cacheName">
+        /// The name of the cache to use.
+        /// </param>
+        /// <param name="key">
+        /// An expression string that should be evaluated in order to determine
+        /// the cache key for the item.
+        /// </param>
+        public CacheParameterAttribute(string cacheName, string key)
+            : base(cacheName, key)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Caching/CacheResultAttribute.cs b/src/Spring/Spring.Core/Caching/CacheResultAttribute.cs
new file mode 100644
index 00000000..bee2ef45
--- /dev/null
+++ b/src/Spring/Spring.Core/Caching/CacheResultAttribute.cs
@@ -0,0 +1,69 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Caching
+{
+    /// <summary>
+    /// This attribute should be used to mark methods whose result 
+    /// needs to be cached.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This attribute allows application developers to mark that a result 
+    /// of the method invocation should be cached, but it will not do any
+    /// caching by itself.
+    /// </p>
+    /// <p>
+    /// In order to actually cache the result, an application developer
+    /// must apply a <c>Spring.Aspects.Cache.CacheResultAdvice</c> to
+    /// all of the members that have this attribute defined.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CacheResultAttribute.cs,v 1.1 2007/02/09 07:12:23 aseovic Exp $</version>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
+    [Serializable]
+    public sealed class CacheResultAttribute : BaseCacheAttribute
+    {
+        /// <summary>
+        /// Creates an attribute instance.
+        /// </summary>
+        public CacheResultAttribute()
+        {
+        }
+
+        /// <summary>
+        /// Creates an attribute instance.
+        /// </summary>
+        /// <param name="cacheName">
+        /// The name of the cache to use.
+        /// </param>
+        /// <param name="key">
+        /// An expression string that should be evaluated in order to determine
+        /// the cache key for the item.
+        /// </param>
+        public CacheResultAttribute(string cacheName, string key)
+            : base(cacheName, key)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Caching/CacheResultItemsAttribute.cs b/src/Spring/Spring.Core/Caching/CacheResultItemsAttribute.cs
new file mode 100644
index 00000000..91824086
--- /dev/null
+++ b/src/Spring/Spring.Core/Caching/CacheResultItemsAttribute.cs
@@ -0,0 +1,70 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+namespace Spring.Caching
+{
+    /// <summary>
+    /// This attribute should be used with methods that return an <see cref="ICollection"/>
+    /// in order to cache each item separately.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This attribute allows application developers to specify that each item
+    /// from the collection returned by the method should be cached, 
+    /// but it will not do any caching by itself.
+    /// </p>
+    /// <p>
+    /// In order to actually cache the result, an application developer
+    /// must apply a <c>Spring.Aspects.Cache.CacheResultAdvice</c> to
+    /// all of the members that have this attribute defined.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CacheResultItemsAttribute.cs,v 1.2 2007/03/31 02:59:48 bbaia Exp $</version>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
+    [Serializable]
+    public sealed class CacheResultItemsAttribute : BaseCacheAttribute
+    {
+        /// <summary>
+        /// Creates an attribute instance.
+        /// </summary>
+        public CacheResultItemsAttribute()
+        {
+        }
+
+        /// <summary>
+        /// Creates an attribute instance.
+        /// </summary>
+        /// <param name="cacheName">
+        /// The name of the cache to use.
+        /// </param>
+        /// <param name="key">
+        /// An expression string that should be evaluated in order to determine
+        /// the cache key for the item.
+        /// </param>
+        public CacheResultItemsAttribute(string cacheName, string key)
+            : base(cacheName, key)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Caching/ICache.cs b/src/Spring/Spring.Core/Caching/ICache.cs
new file mode 100644
index 00000000..86511f4b
--- /dev/null
+++ b/src/Spring/Spring.Core/Caching/ICache.cs
@@ -0,0 +1,108 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+namespace Spring.Caching
+{
+	/// <summary>
+	/// Defines a contract that all cache implementations have to fulfill.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ICache.cs,v 1.5 2007/08/27 09:38:11 oakinger Exp $</version>
+	public interface ICache
+	{
+        /// <summary>
+        /// Gets the number of items in the cache.
+        /// </summary>
+        int Count { get; }
+
+        /// <summary>
+        /// Gets a collection of all cache item keys.
+        /// </summary>
+        ICollection Keys { get; }
+
+        /// <summary>
+        /// Retrieves an item from the cache.
+        /// </summary>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        /// <returns>
+        /// Item for the specified <paramref name="key"/>, or <c>null</c>.
+        /// </returns>
+	    object Get(object key);
+
+        /// <summary>
+        /// Removes an item from the cache.
+        /// </summary>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        void Remove(object key);
+
+        /// <summary>
+        /// Removes collection of items from the cache.
+        /// </summary>
+        /// <param name="keys">
+        /// Collection of keys to remove.
+        /// </param>
+        void RemoveAll(ICollection keys);
+
+        /// <summary>
+        /// Removes all items from the cache.
+        /// </summary>
+        void Clear();
+
+        /// <summary>
+        /// Inserts an item into the cache.
+        /// </summary>
+        /// <remarks>
+        /// Items inserted using this method have no expiration time
+        /// and default cache priority.
+        /// </remarks>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        /// <param name="value">
+        /// Item value.
+        /// </param>
+	    void Insert(object key, object value);
+
+        /// <summary>
+        /// Inserts an item into the cache.
+        /// </summary>
+        /// <remarks>
+        /// Items inserted using this method have default cache priority.
+        /// </remarks>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        /// <param name="value">
+        /// Item value.
+        /// </param>
+        /// <param name="timeToLive">
+        /// Item's time-to-live.
+        /// </param>
+        void Insert(object key, object value, TimeSpan timeToLive);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Caching/InvalidateCacheAttribute.cs b/src/Spring/Spring.Core/Caching/InvalidateCacheAttribute.cs
new file mode 100644
index 00000000..b16283d2
--- /dev/null
+++ b/src/Spring/Spring.Core/Caching/InvalidateCacheAttribute.cs
@@ -0,0 +1,146 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 Spring.Expressions;
+
+namespace Spring.Caching
+{
+    /// <summary>
+    /// This attribute should be used to mark method that should 
+    /// invalidate one or more cache items when invoked.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This attribute allows application developers to specify that some
+    /// cache items should be evicted from cache when the method is invoked, 
+    /// but it will not do any eviction by itself.
+    /// </p>
+    /// <p>
+    /// In order to actually evict cache items, an application developer
+    /// must apply a <c>Spring.Aspects.Cache.InvalidateCacheAdvice</c> to
+    /// all of the members that have this attribute defined.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: InvalidateCacheAttribute.cs,v 1.2 2007/04/01 15:04:39 bbaia Exp $</version>
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
+    [Serializable]
+    public sealed class InvalidateCacheAttribute : Attribute
+    {
+        private string cacheName;
+        private string keys;
+        private IExpression keysExpression;
+        private string condition;
+        private IExpression conditionExpression;
+
+        /// <summary>
+        /// Creates an attribute instance.
+        /// </summary>
+        public InvalidateCacheAttribute()
+        {
+        }
+
+        /// <summary>
+        /// Creates an attribute instance.
+        /// </summary>
+        /// <param name="cacheName">
+        /// The name of the cache to use.
+        /// </param>
+        public InvalidateCacheAttribute(string cacheName)
+        {
+            this.cacheName = cacheName;
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the cache to use.
+        /// </summary>
+        /// <value>
+        /// The name of the cache to use.
+        /// </value>
+        public string CacheName
+        {
+            get { return cacheName; }
+            set { cacheName = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a SpEL expression that should be evaluated in order 
+        /// to determine the keys for the items that should be evicted.
+        /// </summary>
+        /// <value>
+        /// An expression string that should be evaluated in order 
+        /// to determine the keys for the items that should be evicted.
+        /// </value>
+        public string Keys
+        {
+            get { return keys; }
+            set
+            {
+                keys = value;
+                keysExpression = Expression.Parse(value);
+            }
+        }
+
+        /// <summary>
+        /// Gets an expression instance that should be evaluated in order 
+        /// to determine the keys for the items that should be evicted.
+        /// </summary>
+        /// <value>
+        /// An expression instance that should be evaluated in order 
+        /// to determine the keys for the items that should be evicted.
+        /// </value>
+        public IExpression KeysExpression
+        {
+            get { return keysExpression; }
+        }
+
+        /// <summary>
+        /// Gets or sets a SpEL expression that should be evaluated in order 
+        /// to determine whether items should be evicted.
+        /// </summary>
+        /// <value>
+        /// An expression string that should be evaluated in order to determine 
+        /// whether items should be evicted.
+        /// </value>
+        public string Condition
+        {
+            get { return condition; }
+            set
+            {
+                condition = value;
+                conditionExpression = Expression.Parse(value);
+            }
+        }
+
+        /// <summary>
+        /// Gets an expression instance that should be evaluated in order 
+        /// to determine whether items should be evicted.
+        /// </summary>
+        /// <value>
+        /// An expression instance that should be evaluated in order to determine 
+        /// whether items should be evicted.
+        /// </value>
+        public IExpression ConditionExpression
+        {
+            get { return conditionExpression; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Caching/NonExpiringCache.cs b/src/Spring/Spring.Core/Caching/NonExpiringCache.cs
new file mode 100644
index 00000000..3b368f4e
--- /dev/null
+++ b/src/Spring/Spring.Core/Caching/NonExpiringCache.cs
@@ -0,0 +1,143 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+namespace Spring.Caching
+{
+    /// <summary>
+    /// A simple <see cref="ICache"/> implementation backed by a dictionary that
+    /// never expires cache items.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: NonExpiringCache.cs,v 1.4 2007/08/24 22:43:55 oakinger Exp $</version>
+    public class NonExpiringCache : AbstractCache
+    {
+        private readonly IDictionary itemStore = new Hashtable();
+
+        /// <summary>
+        /// Gets the number of items in the cache.
+        /// </summary>
+        public override int Count
+        {
+            get
+            {
+                lock (itemStore.SyncRoot)
+                {
+                    return itemStore.Count;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of all cache item keys.
+        /// </summary>
+        public override ICollection Keys
+        {
+            get
+            {
+                lock (itemStore.SyncRoot)
+                {
+                    return itemStore.Keys;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Retrieves an item from the cache.
+        /// </summary>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        /// <returns>
+        /// Item for the specified <paramref name="key"/>, or <c>null</c>.
+        /// </returns>
+        public override object Get(object key)
+        {
+            lock (itemStore.SyncRoot)
+            {
+                return itemStore[key];
+            }
+        }
+
+        /// <summary>
+        /// Removes an item from the cache.
+        /// </summary>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        public override void Remove(object key)
+        {
+            lock (itemStore.SyncRoot)
+            {
+                itemStore.Remove(key);
+            }
+        }
+
+        /// <summary>
+        /// Removes collection of items from the cache.
+        /// </summary>
+        /// <param name="keys">
+        /// Collection of keys to remove.
+        /// </param>
+        public override void RemoveAll(ICollection keys)
+        {
+            lock (itemStore.SyncRoot)
+            {
+                foreach (object key in keys)
+                {
+                    itemStore.Remove(key);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Removes all items from the cache.
+        /// </summary>
+        public override void Clear()
+        {
+            lock (itemStore.SyncRoot)
+            {
+                itemStore.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache.
+        /// </summary>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        /// <param name="value">
+        /// Item value.
+        /// </param>
+        /// <param name="timeToLive">
+        /// Item's time-to-live (TTL) in milliseconds.
+        /// </param>
+        protected override void DoInsert(object key, object value, TimeSpan timeToLive)
+        {
+            lock (itemStore.SyncRoot)
+            {
+                itemStore[key] = value;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/AbstractQueue.cs b/src/Spring/Spring.Core/Collections/AbstractQueue.cs
new file mode 100644
index 00000000..5fd846a7
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/AbstractQueue.cs
@@ -0,0 +1,347 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary> 
+	/// This class provides skeletal implementations of some
+	/// <see cref="IQueue"/> operations.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The implementations in this class are appropriate when the base
+	/// implementation does not allow <see lang="null"/> elements. The methods
+	/// <see cref="Spring.Collections.AbstractQueue.Add(object)"/>,
+	/// <see cref="Spring.Collections.AbstractQueue.Remove()"/>, and
+	/// <see cref="Spring.Collections.AbstractQueue.Element()"/> are based on
+	/// the <see cref="Spring.Collections.AbstractQueue.Offer(object)"/>,
+	/// <see cref="Spring.Collections.AbstractQueue.Poll()"/>, and
+	/// <see cref="Spring.Collections.AbstractQueue.Peek()"/> methods
+	/// respectively but throw exceptions instead of indicating failure via
+	/// <see lang="false"/> or <see lang="null"/> returns.
+	/// <p/> 
+	/// An <see cref="IQueue"/> implementation that extends this class must
+	/// minimally define a method
+	/// <see cref="Spring.Collections.AbstractQueue.Offer(object)"/> which does
+	/// not permit the insertion of <see lang="null"/> elements, along with methods 
+	/// <see cref="Spring.Collections.AbstractQueue.Poll()"/>, and
+	/// <see cref="Spring.Collections.AbstractQueue.Peek()"/>. Typically,
+	/// additional methods will be overridden as well. If these requirements
+	/// cannot be met, consider instead subclassing
+	/// <see cref="System.Collections.CollectionBase"/>}.
+	/// </p>
+	/// </remarks>
+	/// <author>Doug Lea</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: AbstractQueue.cs,v 1.8 2007/08/27 09:38:11 oakinger Exp $</version>
+	[Serializable]
+	public abstract class AbstractQueue : IQueue
+	{
+		/// <summary>
+		/// Creates a new instance of the <see cref="Spring.Collections.AbstractQueue"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an abstract class, and as such has no publicly
+		/// visible constructors.
+		/// </p>
+		/// </remarks>
+		protected AbstractQueue()
+		{}
+
+		/// <summary> 
+		/// Inserts the specified element into this queue if it is possible
+		/// to do so immediately without violating capacity restrictions.
+		/// </summary>
+		/// <param name="objectToAdd">
+		/// The element to add.
+		/// </param>
+		/// <returns> 
+		/// <see lang="true"/> if successful.
+		/// </returns>
+		/// <exception cref="System.InvalidOperationException">
+		/// If the element cannot be added at this time due to capacity restrictions.
+		/// </exception>
+		public virtual bool Add(object objectToAdd)
+		{
+			if(Offer(objectToAdd))
+			{
+				return true;
+			}
+			else
+			{
+				throw new InvalidOperationException("Queue full.");
+			}
+		}
+
+		/// <summary> 
+		/// Retrieves and removes the head of this queue.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This method differs from
+		/// <see cref="Spring.Collections.AbstractQueue.Poll()"/> only in that
+		/// it throws an exception if this queue is empty.
+		/// </p>
+		/// </remarks>
+		/// <returns> 
+		/// The head of this queue
+		/// </returns>
+		/// <exception cref="NoElementsException">
+		/// If this queue is empty.
+		/// </exception>
+		public virtual object Remove()
+		{
+			object element = Poll();
+			if(element != null)
+			{
+				return element;
+			}
+			else
+			{
+				throw new NoElementsException("Queue is empty.");
+			}
+		}
+
+
+		/// <summary> 
+		/// Retrieves, but does not remove, the head of this queue.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This method differs from <see cref="Spring.Collections.AbstractQueue.Peek()"/>
+		/// only in that it throws an exception if this queue is empty.
+		/// </p>
+		/// <p>
+		/// ALso note that this implementation returns the result of
+		/// <see cref="Spring.Collections.AbstractQueue.Peek()"/> unless the queue
+		/// is empty.
+		/// </p>
+		/// </remarks>
+		/// <returns>The head of this queue.</returns>
+		/// <exception cref="NoElementsException">
+		/// If this queue is empty.
+		/// </exception>
+		public virtual object Element()
+		{
+			object element = Peek();
+			if(element != null)
+			{
+				return element;
+			}
+			else
+			{
+				throw new NoElementsException("Queue is empty.");
+			}
+		}
+
+		/// <summary> 
+		/// Removes all of the elements from this queue.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The queue will be empty after this call returns.
+		/// </p>
+		/// <p>
+		/// This implementation repeatedly invokes
+		/// <see cref="Spring.Collections.AbstractQueue.Poll()"/> until it
+		/// returns <see lang="null"/>.
+		/// </p>
+		/// </remarks>
+		public virtual void Clear()
+		{
+			while(Poll() != null)
+			{
+				;
+			}
+		}
+
+		/// <summary> 
+		/// Adds all of the elements in the supplied <paramref name="collection"/>
+		/// to this queue.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Attempts to
+		/// <see cref="Spring.Collections.AbstractQueue.AddAll(ICollection)"/>
+		/// of a queue to itself result in <see cref="ArgumentException"/>.
+		/// Further, the behavior of this operation is undefined if the specified
+		/// collection is modified while the operation is in progress.
+		/// </p>
+		/// <p>
+		/// This implementation iterates over the specified collection,
+		/// and adds each element returned by the iterator to this queue, in turn.
+		/// An exception encountered while trying to add an element (including,
+		/// in particular, a <see lang="null"/> element) may result in only some
+		/// of the elements having been successfully added when the associated
+		/// exception is thrown.
+		/// </p>
+		/// </remarks>
+		/// <param name="collection">
+		/// The collection containing the elements to be added to this queue.
+		/// </param>
+		/// <returns>
+		/// <see lang="true"/> if this queue changed as a result of the call.
+		/// </returns>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="collection"/> or any one of its elements are <see lang="null"/>.
+		/// </exception>
+		/// <exception cref="System.ArgumentException">
+		/// If the collection is the current <see cref="Spring.Collections.IQueue"/> or 
+		/// the collection size is greater than the queue capacity.
+		/// </exception>
+		public virtual bool AddAll(ICollection collection)
+		{
+			if(collection == null)
+			{
+				throw new ArgumentNullException("Collection cannot be null.");
+			}
+			if(collection == this)
+			{
+				throw new ArgumentException();
+			}
+			if(collection.Count > Capacity)
+			{
+				throw new ArgumentException("Collcation size greater than queue capacity.");
+			}
+			bool modified = false;
+			foreach(object element in collection)
+			{
+				if(element == null)
+				{
+					throw new ArgumentNullException("Cannot add null elements to this queue.");
+				}
+				else if(Add(element))
+				{
+					modified = true;
+				}
+			}
+			return modified;
+		}
+
+		/// <summary> 
+		/// Inserts the specified element into this queue if it is possible to do
+		/// so immediately without violating capacity restrictions.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// When using a capacity-restricted queue, this method is generally
+		/// preferable to <see cref="Spring.Collections.IQueue.Add(object)"/>,
+		/// which can fail to insert an element only by throwing an exception.
+		/// </p>
+		/// </remarks>
+		/// <param name="objectToAdd">
+		/// The element to add.
+		/// </param>
+		/// <returns>
+		/// <see lang="true"/> if the element was added to this queue.
+		/// </returns>
+		/// <exception cref="System.InvalidOperationException">
+		/// If the element cannot be added at this time due to capacity restrictions.
+		/// </exception>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="objectToAdd"/> is
+		/// <see lang="null"/>.
+		/// </exception>
+		/// <exception cref="System.ArgumentException">
+		/// If some property of the supplied <paramref name="objectToAdd"/> prevents
+		/// it from being added to this queue.
+		/// </exception>
+		public abstract bool Offer(object objectToAdd);
+
+		/// <summary> 
+		/// Retrieves, but does not remove, the head of this queue,
+		/// or returns <see lang="null"/> if this queue is empty.
+		/// </summary>
+		/// <returns> 
+		/// The head of this queue, or <see lang="null"/> if this queue is empty.
+		/// </returns>
+		public abstract object Peek();
+
+		/// <summary> 
+		/// Retrieves and removes the head of this queue,
+		/// or returns <see lang="null"/> if this queue is empty.
+		/// </summary>
+		/// <returns> 
+		/// The head of this queue, or <see lang="null"/> if this queue is empty.
+		/// </returns>
+		public abstract object Poll();
+
+		/// <summary>
+		/// Returns <see lang="true"/> if there are no elements in the <see cref="IQueue"/>, <see lang="false"/> otherwise.
+		/// </summary>
+		public abstract bool IsEmpty { get; }
+
+		/// <summary>
+		/// Returns the current capacity of this queue.
+		/// </summary>
+		public abstract int Capacity { get; }
+
+		///<summary>
+		///Copies the elements of the <see cref="T:System.Collections.ICollection"></see> to an <see cref="T:System.Array"></see>, starting at a particular <see cref="T:System.Array"></see> index.
+		///</summary>
+		///<param name="array">The one-dimensional <see cref="T:System.Array"></see> that is the destination of the elements copied from <see cref="T:System.Collections.ICollection"></see>. The <see cref="T:System.Array"></see> must have zero-based indexing. </param>
+		///<param name="index">The zero-based index in array at which copying begins. </param>
+		///<exception cref="T:System.ArgumentNullException">array is null. </exception>
+		///<exception cref="T:System.ArgumentOutOfRangeException">index is less than zero. </exception>
+		///<exception cref="T:System.ArgumentException">array is multidimensional.-or- index is equal to or greater than the length of array.-or- The number of elements in the source <see cref="T:System.Collections.ICollection"></see> is greater than the available space from index to the end of the destination array. </exception>
+		///<exception cref="T:System.InvalidCastException">The type of the source <see cref="T:System.Collections.ICollection"></see> cannot be cast automatically to the type of the destination array. </exception><filterpriority>2</filterpriority>
+		public abstract void CopyTo(Array array, int index);
+
+		///<summary>
+		///Gets the number of elements contained in the <see cref="T:System.Collections.ICollection"></see>.
+		///</summary>
+		///<returns>
+		///The number of elements contained in the <see cref="T:System.Collections.ICollection"></see>.
+		///</returns>
+		public abstract int Count { get; }
+
+		///<summary>
+		///Gets an object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"></see>.
+		///</summary>
+		///<returns>
+		///An object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"></see>.
+		///</returns>
+		public abstract object SyncRoot { get; }
+
+		///<summary>
+		///Gets a value indicating whether access to the <see cref="T:System.Collections.ICollection"></see> is synchronized (thread safe).
+		///</summary>
+		///<returns>
+		///true if access to the <see cref="T:System.Collections.ICollection"></see> is synchronized (thread safe); otherwise, false.
+		///</returns>
+		public abstract bool IsSynchronized { get; }
+
+		///<summary>
+		///Returns an enumerator that iterates through a collection.
+		///</summary>
+		///<returns>
+		///An <see cref="T:System.Collections.IEnumerator"></see> object that can be used to iterate through the collection.
+		///</returns>
+		public abstract IEnumerator GetEnumerator();
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/DictionarySet.cs b/src/Spring/Spring.Core/Collections/DictionarySet.cs
new file mode 100644
index 00000000..0d112d31
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/DictionarySet.cs
@@ -0,0 +1,394 @@
+/* Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith. */
+
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// <see cref="Spring.Collections.DictionarySet"/> is an
+	/// <see langword="abstract"/> class that supports the creation of new
+	/// <see cref="Spring.Collections.ISet"/> types where the underlying data
+	/// store is an <see cref="System.Collections.IDictionary"/> instance.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// You can use any object that implements the
+	/// <see cref="System.Collections.IDictionary"/> interface to hold set
+	/// data. You can define your own, or you can use one of the objects
+	/// provided in the framework. The type of
+	/// <see cref="System.Collections.IDictionary"/> you
+	/// choose will affect both the performance and the behavior of the
+	/// <see cref="Spring.Collections.ISet"/> using it.
+	/// </p>
+	/// <p>
+	/// This object overrides the <see cref="System.Object.Equals(object)"/> method,
+	/// but not the <see cref="System.Object.GetHashCode"/> method, because
+	/// the <see cref="Spring.Collections.DictionarySet"/> class is mutable.
+	/// Therefore, it is not safe to use as a key value in a dictionary.
+	/// </p>
+	/// <p>
+	/// To make a <see cref="Spring.Collections.ISet"/> typed based on your
+	/// own <see cref="System.Collections.IDictionary"/>, simply derive a new
+	/// class with a constructor that takes no parameters. Some
+	/// <see cref="Spring.Collections.ISet"/> implmentations cannot be defined
+	/// with a default constructor. If this is the case for your class, you
+	/// will need to override <b>clone</b> as well.
+	/// </p>
+	/// <p>
+	/// It is also standard practice that at least one of your constructors
+	/// takes an <see cref="System.Collections.ICollection"/> or an
+	/// <see cref="Spring.Collections.ISet"/> as an argument.
+	/// </p>
+	/// </remarks>
+	/// <seealso cref="Spring.Collections.ISet"/>
+	/// <version>$Id: DictionarySet.cs,v 1.7 2007/03/16 04:01:27 aseovic Exp $</version>
+	[Serializable]
+    public abstract class DictionarySet : Set
+	{
+		private IDictionary _internalDictionary;
+
+		private static readonly object PlaceholderObject = new object();
+		private static readonly object NullPlaceHolderKey = new object();
+
+		/// <summary>
+		/// Provides the storage for elements in the
+		/// <see cref="Spring.Collections.ISet"/>, stored as the key-set
+		/// of the <see cref="System.Collections.IDictionary"/> object.  
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Set this object in the constructor if you create your own
+		/// <see cref="Spring.Collections.ISet"/> class.
+		/// </p>
+		/// </remarks>
+		protected IDictionary InternalDictionary 
+		{
+			get { return _internalDictionary; }
+			set { _internalDictionary = value; }
+		}
+
+		/// <summary>
+		/// The placeholder object used as the value for the
+		/// <see cref="System.Collections.IDictionary"/> instance.
+		/// </summary>
+		/// <remarks>
+		/// There is a single instance of this object globally, used for all
+		/// <see cref="Spring.Collections.ISet"/>s.
+		/// </remarks>
+		protected static object Placeholder
+		{
+			get { return PlaceholderObject; }
+		}
+
+		/// <summary>
+		/// Adds the specified element to this set if it is not already present.
+		/// </summary>
+		/// <param name="element">The object to add to the set.</param>
+		/// <returns>
+		/// <see langword="true"/> is the object was added,
+		/// <see langword="true"/> if the object was already present.
+		/// </returns>
+		public override bool Add(object element)
+		{
+			element = MaskNull(element);
+			if (InternalDictionary[element] != null)
+			{
+				return false;
+			}
+			else
+			{
+				//The object we are adding is just a placeholder.  The thing we are
+				//really concerned with is 'o', the key.
+				InternalDictionary.Add(element, PlaceholderObject);
+				return true;
+			}
+		}
+
+		/// <summary>
+		/// Adds all the elements in the specified collection to the set if
+		/// they are not already present.
+		/// </summary>
+		/// <param name="collection">A collection of objects to add to the set.</param>
+		/// <returns>
+		/// <see langword="true"/> is the set changed as a result of this
+		/// operation.
+		/// </returns>
+		public override bool AddAll(ICollection collection)
+		{
+			bool changed = false;
+			foreach (object o in collection)
+			{
+				changed |= this.Add(o);
+			}
+			return changed;
+		}
+
+		/// <summary>
+		/// Removes all objects from this set.
+		/// </summary>
+		public override void Clear()
+		{
+			InternalDictionary.Clear();
+		}
+
+		/// <summary>
+		/// Returns <see langword="true"/> if this set contains the specified
+		/// element.
+		/// </summary>
+		/// <param name="element">The element to look for.</param>
+		/// <returns>
+		/// <see langword="true"/> if this set contains the specified element.
+		/// </returns>
+		public override bool Contains(object element)
+		{
+			element = MaskNull(element);
+			return InternalDictionary[element] != null;
+		}
+
+		/// <summary>
+		/// Returns <see langword="true"/> if the set contains all the
+		/// elements in the specified collection.
+		/// </summary>
+		/// <param name="collection">A collection of objects.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set contains all the elements in the
+		/// specified collection; also <see langword="false"/> if the
+		/// supplied <paramref name="collection"/> is <see langword="null"/>.
+		/// </returns>
+		public override bool ContainsAll(ICollection collection)
+		{
+			if(collection == null) 
+			{
+				return false;
+			}
+			foreach (object o in collection)
+			{
+				if (!this.Contains(MaskNull(o)))
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+
+		/// <summary>
+		/// Returns <see langword="true"/> if this set contains no elements.
+		/// </summary>
+		public override bool IsEmpty
+		{
+			get { return InternalDictionary.Count == 0; }
+		}
+
+		/// <summary>
+		/// Removes the specified element from the set.
+		/// </summary>
+		/// <param name="element">The element to be removed.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set contained the specified element.
+		/// </returns>
+		public override bool Remove(object element)
+		{
+			element = MaskNull(element);
+			bool contained = this.Contains(element);
+			if (contained)
+			{
+				InternalDictionary.Remove(element);
+			}
+			return contained;
+		}
+
+		/// <summary>
+		/// Remove all the specified elements from this set, if they exist in
+		/// this set.
+		/// </summary>
+		/// <param name="collection">A collection of elements to remove.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set was modified as a result of this
+		/// operation.
+		/// </returns>
+		public override bool RemoveAll(ICollection collection)
+		{
+			bool changed = false;
+			foreach (object o in collection)
+			{
+				changed |= this.Remove(o);
+			}
+			return changed;
+		}
+
+		/// <summary>
+		/// Retains only the elements in this set that are contained in the
+		/// specified collection.
+		/// </summary>
+		/// <param name="collection">
+		/// The collection that defines the set of elements to be retained.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if this set changed as a result of this
+		/// operation.
+		/// </returns>
+		public override bool RetainAll(ICollection collection)
+		{
+			//Put data from C into a set so we can use the Contains() method.
+			Set cSet = new HybridSet(collection);
+
+			//We are going to build a set of elements to remove.
+			Set removeSet = new HybridSet();
+
+			foreach (object o in this)
+			{
+				//If C does not contain O, then we need to remove O from our
+				//set.  We can't do this while iterating through our set, so
+				//we put it into RemoveSet for later.
+				if (!cSet.Contains(o))
+				{
+					removeSet.Add(o);
+				}
+			}
+			return this.RemoveAll(removeSet);
+		}
+
+		/// <summary>
+		/// Copies the elements in the <see cref="Spring.Collections.ISet"/> to
+		/// an array.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The type of array needs to be compatible with the objects in the
+		/// <see cref="Spring.Collections.ISet"/>, obviously.
+		/// </p>
+		/// </remarks>
+		/// <param name="array">
+		/// An array that will be the target of the copy operation.
+		/// </param>
+		/// <param name="index">
+		/// The zero-based index where copying will start.
+		/// </param>
+		public override void CopyTo(Array array, int index)
+		{
+			int i = index;
+			foreach (object o in this)
+			{
+				array.SetValue(UnmaskNull(o), i++);
+			}
+		}
+
+		/// <summary>
+		/// The number of elements currently contained in this collection.
+		/// </summary>
+		public override int Count
+		{
+			get { return InternalDictionary.Count; }
+		}
+
+		/// <summary>
+		/// Returns <see langword="true"/> if the
+		/// <see cref="Spring.Collections.ISet"/> is synchronized across
+		/// threads.
+		/// </summary>
+		/// <seealso cref="Spring.Collections.Set.IsSynchronized"/>
+		public override bool IsSynchronized
+		{
+			get { return false; }
+		}
+
+		/// <summary>
+		/// An object that can be used to synchronize this collection to make
+		/// it thread-safe.
+		/// </summary>
+		/// <value>
+		/// An object that can be used to synchronize this collection to make
+		/// it thread-safe.
+		/// </value>
+		/// <seealso cref="Spring.Collections.Set.SyncRoot"/>
+		public override object SyncRoot
+		{
+			get { return InternalDictionary.SyncRoot; }
+		}
+
+		/// <summary>
+		/// Gets an enumerator for the elements in the
+		/// <see cref="Spring.Collections.ISet"/>.
+		/// </summary>
+		/// <returns>
+		/// An <see cref="System.Collections.IEnumerator"/> over the elements
+		/// in the <see cref="Spring.Collections.ISet"/>.
+		/// </returns>
+		public override IEnumerator GetEnumerator()
+		{
+			return new DictionarySetEnumerator(InternalDictionary.Keys.GetEnumerator());
+		}
+
+		private static object MaskNull(object key)
+		{
+			return key == null ? NullPlaceHolderKey : key;
+		}
+
+		private static object UnmaskNull(object key)
+		{
+			return key == NullPlaceHolderKey ? null : key;
+		}
+
+		#region Inner Class : DictionarySetEnumerator
+
+		private sealed class DictionarySetEnumerator : IEnumerator
+		{
+			#region Constructor (s) / Destructor
+
+			public DictionarySetEnumerator(IEnumerator enumerator)
+			{
+				_enumerator = enumerator;
+			}
+
+			#endregion
+
+			#region IEnumerator Members
+
+			public void Reset()
+			{
+				_enumerator.Reset();
+			}
+
+			public object Current
+			{
+				get { return UnmaskNull(_enumerator.Current); }
+			}
+
+			public bool MoveNext()
+			{
+				return _enumerator.MoveNext();
+			}
+
+			#endregion
+
+			private IEnumerator _enumerator;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/HashedSet.cs b/src/Spring/Spring.Core/Collections/HashedSet.cs
new file mode 100644
index 00000000..b1ac2f15
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/HashedSet.cs
@@ -0,0 +1,67 @@
+/* Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith. */
+
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Implements an <see cref="Spring.Collections.ISet"/> based on a
+	/// hash table.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This will give the best lookup, add, and remove performance for very
+	/// large data-sets, but iteration will occur in no particular order.
+	/// </p>
+	/// </remarks>
+	/// <seealso cref="Spring.Collections.ISet"/>
+	/// <version>$Id: HashedSet.cs,v 1.6 2007/03/16 04:01:27 aseovic Exp $</version>
+	[Serializable]
+    public class HashedSet : DictionarySet
+	{
+		/// <summary>
+		/// Creates a new instance of the <see cref="HashedSet"/> class.
+		/// </summary>
+		public HashedSet()
+		{
+			InternalDictionary = new Hashtable();
+		}
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="HashedSet"/> class, and
+		/// initializes it based on a collection of elements.
+		/// </summary>
+		/// <param name="initialValues">
+		/// A collection of elements that defines the initial set contents.
+		/// </param>
+		public HashedSet(ICollection initialValues) : this()
+		{
+			this.AddAll(initialValues);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/HybridSet.cs b/src/Spring/Spring.Core/Collections/HybridSet.cs
new file mode 100644
index 00000000..f1264c4f
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/HybridSet.cs
@@ -0,0 +1,76 @@
+/* Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith. */
+
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Implements an <see cref="Spring.Collections.ISet"/> that automatically
+	/// changes from a list based implementation to a hashtable based
+	/// implementation when the size reaches a certain threshold.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This is good if you are unsure about whether you data-set will be tiny
+	/// or huge.
+	/// </p>
+	/// <note>
+	/// Because this uses a dual implementation, iteration order is <b>not</b>
+	/// guaranteed!
+	/// </note>
+	/// </remarks>
+	/// <seealso cref="Spring.Collections.ISet"/>
+	/// <version>$Id: HybridSet.cs,v 1.6 2007/03/16 04:01:28 aseovic Exp $</version>
+	[Serializable]
+    public class HybridSet : DictionarySet
+	{
+		/// <summary>
+		/// Creates a new set instance based on either a list or a hash table,
+		/// depending on which will be more efficient based on the data-set
+		/// size.
+		/// </summary>
+		public HybridSet()
+		{
+			InternalDictionary = new HybridDictionary();
+		}
+
+		/// <summary>
+		/// Creates a new set instance based on either a list or a hash table,
+		/// depending on which will be more efficient based on the data-set
+		/// size, and initializes it based on a collection of elements.
+		/// </summary>
+		/// <param name="initialValues">
+		/// A collection of elements that defines the initial set contents.
+		/// </param>
+		public HybridSet(ICollection initialValues) : this()
+		{
+			this.AddAll(initialValues);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/IQueue.cs b/src/Spring/Spring.Core/Collections/IQueue.cs
new file mode 100644
index 00000000..990d6dc7
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/IQueue.cs
@@ -0,0 +1,233 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// A collection designed for holding elements prior to processing.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Besides basic <see cref="ICollection"/> operations,
+	/// queues provide additional insertion, extraction, and inspection
+	/// operations.
+	/// </p>
+	/// <p>
+	/// Each of these methods exists in two forms: one throws
+	/// an exception if the operation fails, the other returns a special
+	/// value (either <see lang="null"/> or <see lang="false"/>, depending on the
+	/// operation). The latter form of the insert operation is designed
+	/// specifically for use with capacity-restricted <see cref="IQueue"/>
+	/// implementations; in most implementations, insert operations cannot
+	/// fail.
+	/// </p>
+	/// <p>
+	/// Queues typically, but do not necessarily, order elements in a
+	/// FIFO (first-in-first-out) manner. Among the exceptions are
+	/// priority queues, which order elements according to a supplied
+	/// comparator, or the elements' natural ordering, and LIFO queues (or
+	/// stacks) which order the elements LIFO (last-in-first-out).
+	/// Whatever the ordering used, the head of the queue is that
+	/// element which would be removed by a call to
+	/// <see cref="Spring.Collections.IQueue.Remove"/> or
+	/// <see cref="Spring.Collections.IQueue.Poll"/>. In a FIFO queue, all new
+	/// elements are inserted at the tail of the queue. Other kinds of queues may
+	/// use different placement rules. Every <see cref="IQueue"/> implementation
+	/// must specify its ordering properties.
+	/// </p>
+	/// <p>
+	/// The <see cref="Spring.Collections.IQueue.Offer(object)"/> method inserts an
+	/// element if possible, otherwise returning <see lang="false"/>. This differs from the 
+	/// <see cref="Spring.Collections.IQueue.Add(object)"/> method, which can fail to
+	/// add an element only by throwing an exception. The
+	/// <see cref="Spring.Collections.IQueue.Offer(object)"/> method is designed for
+	/// use when failure is a normal, rather than exceptional occurrence, for example,
+	/// in fixed-capacity (or "bounded" queues.
+	/// </p>
+	/// <p>
+	/// The <see cref="Spring.Collections.IQueue.Remove()"/>
+	/// <see cref="Spring.Collections.IQueue.Poll()"/> methods remove and
+	/// return the head of the queue. Exactly which element is removed from the
+	/// queue is a function of the queue's ordering policy, which differs from
+	/// implementation to implementation. The
+	/// <see cref="Spring.Collections.IQueue.Remove()"/> and
+	/// <see cref="Spring.Collections.IQueue.Poll()"/> methods differ only in their
+	/// behavior when the queue is empty: the
+	/// <see cref="Spring.Collections.IQueue.Remove()"/> method throws an exception,
+	/// while the <see cref="Spring.Collections.IQueue.Poll()"/> method returns
+	/// <see lang="null"/>.
+	/// </p>
+	/// <p>
+	/// The <see cref="Spring.Collections.IQueue.Element()"/> and
+	/// <see cref="Spring.Collections.IQueue.Peek()"/> methods return, but do
+	/// not remove, the head of the queue.
+	/// </p>
+	/// <p>
+	/// The <see cref="IQueue"/> interface does not define the blocking queue
+	/// methods, which are common in concurrent programming.
+	/// </p>
+	/// <p>
+	/// <see cref="IQueue"/> implementations generally do not allow insertion
+	/// of <see lang="null"/> elements, although some implementations, such as
+	/// a linked list, do not prohibit the insertion of <see lang="null"/>.
+	/// Even in the implementations that permit it, <see lang="null"/> should
+	/// not be inserted into a <see cref="IQueue"/>, as <see lang="null"/> is also
+	/// used as a special return value by the
+	/// <see cref="Spring.Collections.IQueue.Poll()"/> method to
+	/// indicate that the queue contains no elements.
+	/// </p>
+	/// <p>
+	/// <see cref="IQueue"/> implementations generally do not define
+	/// element-based versions of methods <see cref="System.Object.Equals(object)"/> 
+	/// and <see cref="System.Object.GetHashCode()"/>, but instead inherit the
+	/// identity based versions from the class object, because element-based equality
+	/// is not always well-defined for queues with the same elements but different
+	/// ordering properties.
+	/// </p>
+	/// <p>
+	/// Based on the back port of JCP JSR-166.
+	/// </p>
+	/// </remarks>
+	/// <author>Doug Lea</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: IQueue.cs,v 1.7 2006/09/30 18:39:24 gcaprio Exp $</version>
+	public interface IQueue : ICollection
+	{
+		/// <summary> 
+		/// Inserts the specified element into this queue if it is possible to do so
+		/// immediately without violating capacity restrictions, returning
+		/// <see lang="true"/> upon success and throwing an
+		/// <see cref="System.InvalidOperationException"/> if no space is
+		/// currently available.
+		/// </summary>
+		/// <param name="objectToAdd">
+		/// The element to add.
+		/// </param>
+		/// <returns> 
+		/// <see lang="true"/> if successful.
+		/// </returns>
+		/// <exception cref="System.InvalidOperationException">
+		/// If the element cannot be added at this time due to capacity restrictions.
+		/// </exception>
+		/// <exception cref="InvalidCastException">
+		/// If the class of the supplied <paramref name="objectToAdd"/> prevents it
+		/// from being added to this queue.
+		/// </exception>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the specified element is <see lang="null"/> and this queue does not
+		/// permit <see lang="null"/> elements.
+		/// </exception>
+		/// <exception cref="System.ArgumentException">
+		/// If some property of the supplied <paramref name="objectToAdd"/> prevents
+		/// it from being added to this queue.
+		/// </exception>
+		bool Add(object objectToAdd);
+
+		/// <summary> 
+		/// Inserts the specified element into this queue if it is possible to do
+		/// so immediately without violating capacity restrictions.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// When using a capacity-restricted queue, this method is generally
+		/// preferable to <see cref="Spring.Collections.IQueue.Add(object)"/>,
+		/// which can fail to insert an element only by throwing an exception.
+		/// </p>
+		/// </remarks>
+		/// <param name="objectToAdd">
+		/// The element to add.
+		/// </param>
+		/// <returns>
+		/// <see lang="true"/> if the element was added to this queue.
+		/// </returns>
+		/// <exception cref="System.InvalidOperationException">
+		/// If the element cannot be added at this time due to capacity restrictions.
+		/// </exception>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="objectToAdd"/> is
+		/// <see lang="null"/>.
+		/// </exception>
+		/// <exception cref="System.ArgumentException">
+		/// If some property of the supplied <paramref name="objectToAdd"/> prevents
+		/// it from being added to this queue.
+		/// </exception>
+		bool Offer(object objectToAdd);
+
+		/// <summary> 
+		/// Retrieves and removes the head of this queue.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This method differs from <see cref="Spring.Collections.IQueue.Poll()"/>
+		/// only in that it throws an exception if this queue is empty.
+		/// </p>
+		/// </remarks>
+		/// <returns> 
+		/// The head of this queue
+		/// </returns>
+		/// <exception cref="Spring.Collections.NoElementsException">if this queue is empty</exception>
+		object Remove();
+
+		/// <summary> 
+		/// Retrieves and removes the head of this queue,
+		/// or returns <see lang="null"/> if this queue is empty.
+		/// </summary>
+		/// <returns> 
+		/// The head of this queue, or <see lang="null"/> if this queue is empty.
+		/// </returns>
+		object Poll();
+
+		/// <summary> 
+		/// Retrieves, but does not remove, the head of this queue.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This method differs from <see cref="Spring.Collections.IQueue.Peek()"/>
+		/// only in that it throws an exception if this queue is empty.
+		/// </p>
+		/// </remarks>
+		/// <returns> 
+		/// The head of this queue.
+		/// </returns>
+		/// <exception cref="Spring.Collections.NoElementsException">If this queue is empty.</exception>
+		object Element();
+
+		/// <summary> 
+		/// Retrieves, but does not remove, the head of this queue,
+		/// or returns <see lang="null"/> if this queue is empty.
+		/// </summary>
+		/// <returns> 
+		/// The head of this queue, or <see lang="null"/> if this queue is empty.
+		/// </returns>
+		object Peek();
+		
+		/// <summary>
+		/// Returns <see lang="true"/> if there are no elements in the <see cref="IQueue"/>, <see lang="false"/> otherwise.
+		/// </summary>
+		bool IsEmpty { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/ISet.cs b/src/Spring/Spring.Core/Collections/ISet.cs
new file mode 100644
index 00000000..fb27dd38
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/ISet.cs
@@ -0,0 +1,275 @@
+/* Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith. */
+
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// A collection that contains no duplicate elements.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This interface models the mathematical
+	/// <see cref="Spring.Collections.ISet"/> abstraction. The order of
+	/// elements in a set is dependant on (a)the data-structure implementation, and 
+	/// (b)the implementation of the various
+	/// <see cref="Spring.Collections.ISet"/> methods, and thus is not
+	/// guaranteed.
+	/// </p>
+	/// <p>
+	/// <see cref="Spring.Collections.ISet"/> overrides the
+	/// <see cref="System.Object.Equals(object)"/> method to test for "equivalency":
+	/// whether the two sets contain the same elements. The "==" and "!="
+	/// operators are not overridden by design, since it is often desirable to
+	/// compare object references for equality.
+	/// </p>
+	/// <p>
+	/// Also, the <see cref="System.Object.GetHashCode"/> method is not
+	/// implemented on any of the set implementations, since none of them are
+	/// truly immutable. This is by design, and it is the way almost all
+	/// collections in the .NET framework function. So as a general rule, don't
+	/// store collection objects inside <see cref="Spring.Collections.ISet"/>
+	/// instances. You would typically want to use a keyed
+	/// <see cref="System.Collections.IDictionary"/> instead.
+	/// </p>
+	/// <p>
+	/// None of the <see cref="Spring.Collections.ISet"/> implementations in
+	/// this library are guaranteed to be thread-safe in any way unless wrapped
+	/// in a <see cref="Spring.Collections.SynchronizedSet"/>.
+	/// </p>
+	/// <p>
+	/// The following table summarizes the binary operators that are supported
+	/// by the <see cref="Spring.Collections.ISet"/> class.
+	/// </p>
+	/// <list type="table">
+	///		<listheader>
+	///			<term>Operation</term>
+	///			<term>Description</term>
+	///			<term>Method</term>
+	///		</listheader>
+	///		<item>
+	///			<term>Union (OR)</term>
+	///			<term>
+	///			Element included in result if it exists in either <c>A</c> OR
+	///			<c>B</c>.
+	///			</term>
+	///			<term><c>Union()</c></term>
+	///		</item>
+	///		<item>
+	///			<term>Intersection (AND)</term>
+	///			<term>
+	///			Element included in result if it exists in both <c>A</c> AND
+	///			<c>B</c>.
+	///			</term>
+	///			<term><c>InterSect()</c></term>
+	///		</item>
+	///		<item>
+	///			<term>Exclusive Or (XOR)</term>
+	///			<term>
+	///			Element included in result if it exists in one, but not both,
+	///			of <c>A</c> and <c>B</c>.
+	///			</term>
+	///			<term><c>ExclusiveOr()</c></term>
+	///		</item>
+	///		<item>
+	///			<term>Minus (n/a)</term>
+	///			<term>
+	///			Take all the elements in <c>A</c>. Now, if any of them exist in
+	///			 <c>B</c>, remove them. Note that unlike the other operators,
+	///			 <c>A - B</c> is not the same as <c>B - A</c>.
+	///			 </term>
+	///			<term><c>Minus()</c></term>
+	///		</item>
+	/// </list>
+	/// </remarks>
+	/// <version>$Id: ISet.cs,v 1.5 2006/04/09 07:18:37 markpollack Exp $</version>
+	public interface ISet : ICollection, ICloneable
+	{
+		/// <summary>
+		/// Performs a "union" of the two sets, where all the elements
+		/// in both sets are present. 
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// That is, the element is included if it is in either
+		/// <paramref name="setOne"/> or this set. Neither this set nor the input
+		/// set are modified during the operation. The return value is a
+		/// <b>clone</b> of this set with the extra elements added in.
+		/// </p>
+		/// </remarks>
+		/// <param name="setOne">A collection of elements.</param>
+		/// <returns>
+		/// A new <see cref="Spring.Collections.ISet"/> containing the union of
+		/// this <see cref="Spring.Collections.ISet"/> with the specified
+		/// collection. Neither of the input objects is modified by the union.
+		/// </returns>
+		ISet Union(ISet setOne);
+
+		/// <summary>
+		/// Performs an "intersection" of the two sets, where only the elements
+		/// that are present in both sets remain.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// That is, the element is included if it exists in both sets. The
+		/// <c>Intersect()</c> operation does not modify the input sets. It
+		/// returns a <b>clone</b> of this set with the appropriate elements
+		/// removed.
+		/// </p>
+		/// </remarks>
+		/// <param name="setOne">A set of elements.</param>
+		/// <returns>
+		/// The intersection of this set with <paramref name="setOne"/>.
+		/// </returns>
+		ISet Intersect(ISet setOne);
+
+		/// <summary>
+		/// Performs a "minus" of this set from the <paramref name="setOne"/>
+		/// set.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This returns a set of all the elements in set
+		/// <paramref name="setOne"/>, removing the elements that are also in
+		/// this set. The original sets are not modified during this operation.
+		/// The result set is a <b>clone</b> of this
+		/// <see cref="Spring.Collections.ISet"/> containing the elements from
+		/// the operation.
+		/// </p>
+		/// </remarks>
+		/// <param name="setOne">A set of elements.</param>
+		/// <returns>
+		/// A set containing the elements from this set with the elements in
+		/// <paramref name="setOne"/> removed.
+		/// </returns>
+		ISet Minus(ISet setOne);
+
+		/// <summary>
+		/// Performs an "exclusive-or" of the two sets, keeping only those
+		/// elements that are in one of the sets, but not in both.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The original sets are not modified during this operation. The
+		/// result set is a <b>clone</b> of this set containing the elements
+		/// from the exclusive-or operation.
+		/// </p>
+		/// </remarks>
+		/// <param name="setOne">A set of elements.</param>
+		/// <returns>
+		/// A set containing the result of
+		/// <c><paramref name="setOne"/> ^ this</c>.
+		/// </returns>
+		ISet ExclusiveOr(ISet setOne);
+
+		/// <summary>
+		/// Returns <see langword="true"/> if this set contains the specified
+		/// element.
+		/// </summary>
+		/// <param name="element">The element to look for.</param>
+		/// <returns>
+		/// <see langword="true"/> if this set contains the specified element.
+		/// </returns>
+		bool Contains(object element);
+
+		/// <summary>
+		/// Returns <see langword="true"/> if the set contains all the
+		/// elements in the specified collection.
+		/// </summary>
+		/// <param name="collection">A collection of objects.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set contains all the elements in the
+		/// specified collection.
+		/// </returns>
+		bool ContainsAll(ICollection collection);
+
+		/// <summary>
+		/// Returns <see langword="true"/> if this set contains no elements.
+		/// </summary>
+		bool IsEmpty { get; }
+
+		/// <summary>
+		/// Adds the specified element to this set if it is not already present.
+		/// </summary>
+		/// <param name="element">The object to add to the set.</param>
+		/// <returns>
+		/// <see langword="true"/> is the object was added,
+		/// <see langword="true"/> if the object was already present.
+		/// </returns>
+		bool Add(object element);
+
+		/// <summary>
+		/// Adds all the elements in the specified collection to the set if
+		/// they are not already present.
+		/// </summary>
+		/// <param name="collection">A collection of objects to add to the set.</param>
+		/// <returns>
+		/// <see langword="true"/> is the set changed as a result of this
+		/// operation.
+		/// </returns>
+		bool AddAll(ICollection collection);
+
+		/// <summary>
+		/// Removes the specified element from the set.
+		/// </summary>
+		/// <param name="element">The element to be removed.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set contained the specified element.
+		/// </returns>
+		bool Remove(object element);
+
+		/// <summary>
+		/// Remove all the specified elements from this set, if they exist in
+		/// this set.
+		/// </summary>
+		/// <param name="collection">A collection of elements to remove.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set was modified as a result of this
+		/// operation.
+		/// </returns>
+		bool RemoveAll(ICollection collection);
+
+		/// <summary>
+		/// Retains only the elements in this set that are contained in the
+		/// specified collection.
+		/// </summary>
+		/// <param name="collection">
+		/// The collection that defines the set of elements to be retained.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if this set changed as a result of this
+		/// operation.
+		/// </returns>
+		bool RetainAll(ICollection collection);
+
+		/// <summary>
+		/// Removes all objects from this set.
+		/// </summary>
+		void Clear();
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/ImmutableSet.cs b/src/Spring/Spring.Core/Collections/ImmutableSet.cs
new file mode 100644
index 00000000..399c4e3b
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/ImmutableSet.cs
@@ -0,0 +1,357 @@
+/* Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith. */
+
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Implements an immutable (read-only)
+	/// <see cref="Spring.Collections.ISet"/> wrapper.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Although this class is advertised as immutable, it really isn't.
+	/// Anyone with access to the wrapped <see cref="Spring.Collections.ISet"/>
+	/// can still change the data. So <see cref="System.Object.GetHashCode"/>
+	/// is not implemented for this <see cref="Spring.Collections.ISet"/>, as
+	/// is the case for all <see cref="Spring.Collections.ISet"/>
+	/// implementations in this library. This design decision was based on the
+	/// efficiency of not having to <b>clone</b> the wrapped
+	/// <see cref="Spring.Collections.ISet"/> every time you wrap a mutable
+	/// <see cref="Spring.Collections.ISet"/>.
+	/// </p>
+	/// </remarks>
+	/// <version>$Id: ImmutableSet.cs,v 1.6 2007/03/16 04:01:28 aseovic Exp $</version>
+    [Serializable]
+    public sealed class ImmutableSet : Set
+	{
+		private const string ErrorMessage = "Object is immutable.";
+		private ISet _mBasisSet;
+
+		internal ISet BasisSet
+		{
+			get { return _mBasisSet; }
+		}
+
+		/// <summary>
+		/// Constructs an immutable (read-only)
+		/// <see cref="Spring.Collections.ISet"/> wrapper.
+		/// </summary>
+		/// <param name="basisSet">
+		/// The <see cref="Spring.Collections.ISet"/> that is to be wrapped.
+		/// </param>
+		public ImmutableSet(ISet basisSet)
+		{
+			_mBasisSet = basisSet;
+		}
+
+		/// <summary>
+		/// Adds the specified element to this set if it is not already present.
+		/// </summary>
+		/// <param name="element">The object to add to the set.</param>
+		/// <returns>
+		/// <see langword="true"/> is the object was added,
+		/// <see langword="true"/> if the object was already present.
+		/// </returns>
+		/// <exception cref="System.NotSupportedException"/>
+		public override sealed bool Add(object element)
+		{
+			throw CreateNotSupportedException();
+		}
+
+		/// <summary>
+		/// Adds all the elements in the specified collection to the set if
+		/// they are not already present.
+		/// </summary>
+		/// <param name="collection">A collection of objects to add to the set.</param>
+		/// <returns>
+		/// <see langword="true"/> is the set changed as a result of this
+		/// operation.
+		/// </returns>
+		/// <exception cref="System.NotSupportedException"/>
+		public override sealed bool AddAll(ICollection collection)
+		{
+			throw CreateNotSupportedException();
+		}
+
+		/// <summary>
+		/// Removes all objects from this set.
+		/// </summary>
+		/// <exception cref="System.NotSupportedException"/>
+		public override sealed void Clear()
+		{
+			throw CreateNotSupportedException();
+		}
+
+		/// <summary>
+		/// Returns <see langword="true"/> if this set contains the specified
+		/// element.
+		/// </summary>
+		/// <param name="element">The element to look for.</param>
+		/// <returns>
+		/// <see langword="true"/> if this set contains the specified element.
+		/// </returns>
+		public override sealed bool Contains(object element)
+		{
+			return _mBasisSet.Contains(element);
+		}
+
+		/// <summary>
+		/// Returns <see langword="true"/> if the set contains all the
+		/// elements in the specified collection.
+		/// </summary>
+		/// <param name="collection">A collection of objects.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set contains all the elements in the
+		/// specified collection.
+		/// </returns>
+		public override sealed bool ContainsAll(ICollection collection)
+		{
+			return _mBasisSet.ContainsAll(collection);
+		}
+
+		/// <summary>
+		/// Returns <see langword="true"/> if this set contains no elements.
+		/// </summary>
+		public override sealed bool IsEmpty
+		{
+			get { return _mBasisSet.IsEmpty; }
+		}
+
+		/// <summary>
+		/// Removes the specified element from the set.
+		/// </summary>
+		/// <param name="element">The element to be removed.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set contained the specified element.
+		/// </returns>
+		/// <exception cref="System.NotSupportedException"/>
+		public override sealed bool Remove(object element)
+		{
+			throw CreateNotSupportedException();
+		}
+
+		/// <summary>
+		/// Remove all the specified elements from this set, if they exist in
+		/// this set.
+		/// </summary>
+		/// <param name="collection">A collection of elements to remove.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set was modified as a result of this
+		/// operation.
+		/// </returns>
+		/// <exception cref="System.NotSupportedException"/>
+		public override sealed bool RemoveAll(ICollection collection)
+		{
+			throw CreateNotSupportedException();
+		}
+
+		/// <summary>
+		/// Retains only the elements in this set that are contained in the
+		/// specified collection.
+		/// </summary>
+		/// <param name="collection">
+		/// The collection that defines the set of elements to be retained.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if this set changed as a result of this
+		/// operation.
+		/// </returns>
+		/// <exception cref="System.NotSupportedException"/>
+		public override sealed bool RetainAll(ICollection collection)
+		{
+			throw CreateNotSupportedException();
+		}
+
+		private static NotSupportedException CreateNotSupportedException()
+		{
+			return new NotSupportedException(ImmutableSet.ErrorMessage);
+		}
+
+		/// <summary>
+		/// Copies the elements in the <see cref="Spring.Collections.ISet"/> to
+		/// an array.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The type of array needs to be compatible with the objects in the
+		/// <see cref="Spring.Collections.ISet"/>, obviously.
+		/// </p>
+		/// </remarks>
+		/// <param name="array">
+		/// An array that will be the target of the copy operation.
+		/// </param>
+		/// <param name="index">
+		/// The zero-based index where copying will start.
+		/// </param>
+		public override sealed void CopyTo(Array array, int index)
+		{
+			_mBasisSet.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// The number of elements currently contained in this collection.
+		/// </summary>
+		public override sealed int Count
+		{
+			get { return _mBasisSet.Count; }
+		}
+
+		/// <summary>
+		/// Returns <see langword="true"/> if the
+		/// <see cref="Spring.Collections.ISet"/> is synchronized across
+		/// threads.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Note that enumeration is inherently not thread-safe. Use the
+		/// <see cref="SyncRoot"/> to lock the object during enumeration.
+		/// </p>
+		/// </remarks>
+		public override sealed bool IsSynchronized
+		{
+			get { return _mBasisSet.IsSynchronized; }
+		}
+
+		/// <summary>
+		/// An object that can be used to synchronize this collection to make
+		/// it thread-safe.
+		/// </summary>
+		/// <value>
+		/// An object that can be used to synchronize this collection to make
+		/// it thread-safe.
+		/// </value>
+		public override sealed object SyncRoot
+		{
+			get { return _mBasisSet.SyncRoot; }
+		}
+
+		/// <summary>
+		/// Gets an enumerator for the elements in the
+		/// <see cref="Spring.Collections.ISet"/>.
+		/// </summary>
+		/// <returns>
+		/// An <see cref="System.Collections.IEnumerator"/> over the elements
+		/// in the <see cref="Spring.Collections.ISet"/>.
+		/// </returns>
+		public override sealed IEnumerator GetEnumerator()
+		{
+			return _mBasisSet.GetEnumerator();
+		}
+
+		/// <summary>
+		/// Returns a clone of the <see cref="Spring.Collections.ISet"/>
+		/// instance.
+		/// </summary>
+		/// <returns>A clone of this object.</returns>
+		public override sealed object Clone()
+		{
+			return new ImmutableSet(_mBasisSet);
+		}
+
+		/// <summary>
+		/// Performs a "union" of the two sets, where all the elements
+		/// in both sets are present. 
+		/// </summary>
+		/// <param name="setOne">A collection of elements.</param>
+		/// <returns>
+		/// A new <see cref="Spring.Collections.ISet"/> containing the union of
+		/// this <see cref="Spring.Collections.ISet"/> with the specified
+		/// collection. Neither of the input objects is modified by the union.
+		/// </returns>
+		/// <see cref="Spring.Collections.ISet.Union(ISet)"/>
+		public override sealed ISet Union(ISet setOne)
+		{
+			ISet m = this;
+			while (m is ImmutableSet) 
+			{
+				m = ((ImmutableSet) m).BasisSet;
+			}
+			return new ImmutableSet(m.Union(setOne));
+		}
+
+		/// <summary>
+		/// Performs an "intersection" of the two sets, where only the elements
+		/// that are present in both sets remain.
+		/// </summary>
+		/// <param name="setOne">A set of elements.</param>
+		/// <returns>
+		/// The intersection of this set with <paramref name="setOne"/>.
+		/// </returns>
+		/// <see cref="Spring.Collections.ISet.Intersect(ISet)"/>
+		public override sealed ISet Intersect(ISet setOne)
+		{
+			ISet m = this;
+			while (m is ImmutableSet) 
+			{
+				m = ((ImmutableSet) m).BasisSet;
+			}
+			return new ImmutableSet(m.Intersect(setOne));
+		}
+
+		/// <summary>
+		/// Performs a "minus" of this set from the <paramref name="setOne"/>
+		/// set.
+		/// </summary>
+		/// <param name="setOne">A set of elements.</param>
+		/// <returns>
+		/// A set containing the elements from this set with the elements in
+		/// <paramref name="setOne"/> removed.
+		/// </returns>
+		/// <seealso cref="Spring.Collections.ISet.Minus(ISet)"/>
+		public override sealed ISet Minus(ISet setOne)
+		{
+			ISet m = this;
+			while (m is ImmutableSet) 
+			{
+				m = ((ImmutableSet) m).BasisSet;
+			}
+			return new ImmutableSet(m.Minus(setOne));
+		}
+
+		/// <summary>
+		/// Performs an "exclusive-or" of the two sets, keeping only those
+		/// elements that are in one of the sets, but not in both.
+		/// </summary>
+		/// <param name="setOne">A set of elements.</param>
+		/// <returns>
+		/// A set containing the result of
+		/// <c><paramref name="setOne"/> ^ this</c>.
+		/// </returns>
+		/// <seealso cref="Spring.Collections.ISet.ExclusiveOr(ISet)"/>
+		public override sealed ISet ExclusiveOr(ISet setOne)
+		{
+			ISet m = this;
+			while (m is ImmutableSet) 
+			{
+				m = ((ImmutableSet) m).BasisSet;
+			}
+			return new ImmutableSet(m.ExclusiveOr(setOne));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/LinkedList.cs b/src/Spring/Spring.Core/Collections/LinkedList.cs
new file mode 100644
index 00000000..18e188dc
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/LinkedList.cs
@@ -0,0 +1,545 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Simple linked list implementation.
+	/// </summary>
+	/// <author>Simon White</author>
+	/// <version>$Id: LinkedList.cs,v 1.9 2007/03/16 04:01:28 aseovic Exp $</version>
+    [Serializable]
+    public class LinkedList : IList
+	{
+		private int _nodeIndex;
+		private Node _rootNode;
+		private int _modId;
+
+		#region Constructors
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Collections.LinkedList"/> class.
+		/// </summary>
+		public LinkedList()
+		{
+			_rootNode = new Node(null, null, null);
+			_rootNode.PreviousNode = _rootNode;
+			_rootNode.NextNode = _rootNode;
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Collections.LinkedList"/> class that contains all
+		///  elements of the specified list.
+		/// </summary>
+		/// <param name="list">
+		/// A list of elements that defines the initial contents.
+		/// </param>
+		public LinkedList(IList list) : this()
+		{
+			AddAll(list);
+		}
+
+		#endregion
+
+		#region IList Members
+
+		/// <summary>
+		/// Is list read only?
+		/// </summary>
+		/// <value>
+		/// <see langword="true"/> if the list is read only.
+		/// </value>
+		public bool IsReadOnly
+		{
+			get { return false; }
+		}
+
+		/// <summary>
+		/// Returns the node at the specified index.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is the indexer for the
+		/// <see cref="Spring.Collections.LinkedList"/> class.
+		/// </p>
+		/// </remarks>
+		/// <seealso cref="GetNode(int)"/>
+		public object this[int index]
+		{
+			get { return GetNode(index).Value; }
+			set { GetNode(index).Value = value; }
+		}
+
+		/// <summary>
+		/// Removes the object at the specified index.
+		/// </summary>
+		/// <param name="index">The lookup index.</param>
+		/// <exception cref="System.ArgumentOutOfRangeException">
+		/// If the specified <paramref name="index"/> is greater than the
+		/// number of objects within the list.
+		/// </exception>
+		public void RemoveAt(int index)
+		{
+			CheckUpdateState();
+			RemoveNode(GetNode(index));
+		}
+
+		/// <summary>
+		/// Inserts an object at the specified index.
+		/// </summary>
+		/// <param name="index">The lookup index.</param>
+		/// <param name="value">The object to be inserted.</param>
+		/// <exception cref="System.ArgumentOutOfRangeException">
+		/// If the specified <paramref name="index"/> is greater than the
+		/// number of objects within the list.
+		/// </exception>
+		public void Insert(int index, object value)
+		{
+			CheckUpdateState();
+
+			Node node = null;
+			if (index == _nodeIndex)
+			{
+				node = new Node(value, _rootNode.PreviousNode, _rootNode);
+			}
+			else
+			{
+				Node insert = GetNode(index);
+				node = new Node(value, insert.PreviousNode, insert);
+			}
+			node.PreviousNode.NextNode = node;
+			node.NextNode.PreviousNode = node;
+			_nodeIndex++;
+			_modId++;
+		}
+
+		/// <summary>
+		/// Removes the first instance of the specified object found.
+		/// </summary>
+		/// <param name="value">The object to remove</param>
+		public void Remove(object value)
+		{
+			CheckUpdateState();
+			NodeHolder nh = GetNode(value);
+			RemoveNode(nh.Node);
+		}
+
+		/// <summary>
+		/// Returns <see langword="true"/> if this list contains the specified
+		/// element.
+		/// </summary>
+		/// <param name="value">The element to look for.</param>
+		/// <returns>
+		/// <see langword="true"/> if this list contains the specified element.
+		/// </returns>
+		public bool Contains(object value)
+		{
+			return GetNode(value) != null;
+		}
+
+		/// <summary>
+		/// Removes all objects from the list.
+		/// </summary>
+		public void Clear()
+		{
+			_rootNode = new Node(null, null, null);
+			_nodeIndex = 0;
+			_modId++;
+		}
+
+		/// <summary>
+		/// Returns the index of the first instance of the specified
+		/// <paramref name="value"/> found.
+		/// </summary>
+		/// <param name="value">The object to search for</param>
+		/// <returns>
+		/// The index of the first instance found, or -1 if the element was not
+		/// found.
+		/// </returns>
+		public int IndexOf(object value)
+		{
+			NodeHolder nh = GetNode(value);
+			if (nh == null)
+			{
+				return -1;
+			}
+			return nh.Index;
+		}
+
+		/// <summary>
+		/// Adds the specified object to the end of the list.
+		/// </summary>
+		/// <param name="value">The object to add</param>
+		/// <returns>The index that the object was added at.</returns>
+		public int Add(object value)
+		{
+			Insert(_nodeIndex, value);
+			return _nodeIndex - 1;
+		}
+
+		/// <summary>
+		/// Adds all of the elements of the supplied
+		/// <paramref name="elements"/>list to the end of this list.
+		/// </summary>
+		/// <param name="elements">The list of objects to add.</param>
+		public void AddAll(IList elements)
+		{
+			foreach (object obj in elements)
+			{
+				Add(obj);
+			}
+		}
+
+		/// <summary>
+		/// Is the list a fixed size?
+		/// </summary>
+		/// <value>
+		/// <see langword="true"/> if the list is a fixed size list.
+		/// </value>
+		public bool IsFixedSize
+		{
+			get { return false; }
+		}
+
+		#endregion
+
+		#region Private Methods
+
+		/// <summary>
+		/// Checks whether the list can be modified.
+		/// </summary>
+		/// <exception cref="System.NotSupportedException">
+		/// If the list cannot be modified.
+		/// </exception>
+		private void CheckUpdateState()
+		{
+			if (IsReadOnly || IsFixedSize)
+			{
+				throw new NotSupportedException("LinkedList cannot be modified.");
+			}
+		}
+
+		/// <summary>
+		/// Validates the specified index.
+		/// </summary>
+		/// <param name="index">The lookup index.</param>
+		/// <exception cref="System.ArgumentOutOfRangeException">
+		/// If the index is invalid.
+		/// </exception>
+		private void ValidateIndex(int index)
+		{
+			if (index < 0 || index >= _nodeIndex)
+			{
+				throw new ArgumentOutOfRangeException("index");
+			}
+		}
+
+		/// <summary>
+		/// Returns the node at the specified index.
+		/// </summary>
+		/// <param name="index">The lookup index.</param>
+		/// <returns>The node at the specified index.</returns>
+		/// <exception cref="System.ArgumentOutOfRangeException">
+		/// If the specified <paramref name="index"/> is greater than the
+		/// number of objects within the list.
+		/// </exception>
+		private Node GetNode(int index)
+		{
+			ValidateIndex(index);
+			Node node = _rootNode;
+			for (int i = 0; i <= index; i++)
+			{
+				node = node.NextNode;
+			}
+			return node;
+		}
+
+		/// <summary>
+		/// Returns the node (and index) of the first node that contains
+		/// the specified value.
+		/// </summary>
+		/// <param name="value">The value to search for.</param>
+		/// <returns>
+		/// The node, or <see langword="null"/> if not found.
+		/// </returns>
+		private NodeHolder GetNode(object value)
+		{
+            int i = 0;
+            if (value == null)
+            {
+
+                for (Node n = _rootNode.NextNode; n != _rootNode; n = n.NextNode)
+                {
+                    if (n.Value == null)
+                    {
+                        return new NodeHolder(n, i);
+                    }
+                    i++;
+                }
+            }
+            else
+            {
+
+                for (Node n = _rootNode.NextNode; n != _rootNode; n = n.NextNode)
+                {
+                    if (value.Equals(n.Value))                
+                    {
+                        return new NodeHolder(n, i);
+                    }
+                    i++;
+                }
+            }
+			return null;
+		}
+
+		/// <summary>
+		/// Removes the specified node.
+		/// </summary>
+		/// <param name="node">The node to be removed.</param>
+		private void RemoveNode(Node node)
+		{
+			Node previousNode = node.PreviousNode;
+			previousNode.NextNode = node.NextNode;
+			node.NextNode.PreviousNode = previousNode;
+			node.PreviousNode = null;
+			node.NextNode = null;
+			_nodeIndex--;
+			_modId++;
+		}
+
+		#endregion
+
+		#region ICollection Members
+
+		/// <summary>
+		/// Returns <see langword="true"/> if the list is synchronized across
+		/// threads.
+		/// </summary>
+		/// <remarks>
+		/// <note>
+		/// This implementation <b>always</b> returns <see langword="false"/>.
+		/// </note>
+		/// <p>
+		/// Note that enumeration is inherently not thread-safe. Use the
+		/// <see cref="SyncRoot"/> to lock the object during enumeration.
+		/// </p>
+		/// </remarks>
+		public bool IsSynchronized
+		{
+			get { return false; }
+		}
+
+		/// <summary>
+		/// The number of objects within the list.
+		/// </summary>
+		public int Count
+		{
+			get { return _nodeIndex; }
+		}
+
+		/// <summary>
+		/// Copies the elements in this list to an array.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The type of array needs to be compatible with the objects in this
+		/// list, obviously.
+		/// </p>
+		/// </remarks>
+		/// <param name="array">
+		/// An array that will be the target of the copy operation.
+		/// </param>
+		/// <param name="index">
+		/// The zero-based index where copying will start.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="array"/> is <see langword="null"/>.
+		/// </exception>
+		/// <exception cref="System.ArgumentOutOfRangeException">
+		/// If the supplied <paramref name="index"/> is less than zero
+		/// or is greater than the length of <paramref name="array"/>.
+		/// </exception>
+		/// <exception cref="System.ArgumentException">
+		/// If the supplied <paramref name="array"/> is of insufficient size.
+		/// </exception>
+		public void CopyTo(Array array, int index)
+		{
+			if (array == null)
+			{
+				throw new ArgumentNullException("array");
+			}
+			if ((index < 0) || (index > array.Length))
+			{
+				throw new ArgumentOutOfRangeException("index", String.Format("Index {0} is out of range.", index));
+			}
+			if ((array.Length - index) < this._nodeIndex)
+			{
+				throw new ArgumentException("Array is of insufficient size.");
+			}
+
+			Node node = this._rootNode;
+			for (int i = 0, pos = index; i < this._nodeIndex; i++, pos++)
+			{
+				node = node.NextNode;
+				array.SetValue(node.Value, pos);
+			}
+		}
+
+		/// <summary>
+		/// An object that can be used to synchronize this
+		/// <see cref="Spring.Collections.LinkedList"/> to make it thread-safe.
+		/// </summary>
+		/// <value>
+		/// An object that can be used to synchronize this
+		/// <see cref="Spring.Collections.LinkedList"/> to make it thread-safe.
+		/// </value>
+		public object SyncRoot
+		{
+			get { return this; }
+		}
+
+		#endregion
+
+		#region IEnumerable Members
+
+		/// <summary>
+		/// Gets an enumerator for the elements in the
+		/// <see cref="Spring.Collections.LinkedList"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Enumerators are fail fast.
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// An <see cref="System.Collections.IEnumerator"/> over the elements
+		/// in the <see cref="Spring.Collections.LinkedList"/>.
+		/// </returns>
+		public IEnumerator GetEnumerator()
+		{
+			return new LinkedListEnumerator(this);
+		}
+
+		#endregion
+
+		#region Inner Classes
+
+        [Serializable]
+        private class Node
+		{
+			private object _value;
+			private Node _next;
+			private Node _previous;
+
+			public object Value
+			{
+				get { return _value; }
+				set { _value = value; }
+			}
+
+			public Node NextNode
+			{
+				get { return _next; }
+				set { this._next = value; }
+			}
+
+			public Node PreviousNode
+			{
+				get { return _previous; }
+				set { this._previous = value; }
+			}
+
+			public Node(object val, Node previous, Node next)
+			{
+				this._value = val;
+				this._next = next;
+				this._previous = previous;
+			}
+		}
+
+		private class NodeHolder
+		{
+			private int _index;
+			private Node _node;
+
+			public int Index
+			{
+				get { return _index; }
+			}
+
+			public Node Node
+			{
+				get { return _node; }
+			}
+
+			public NodeHolder(Node node, int index)
+			{
+				this._node = node;
+				this._index = index;
+			}
+		}
+
+		private class LinkedListEnumerator : IEnumerator
+		{
+			private LinkedList _ll;
+			private Node _current;
+			private int _modId;
+
+			public object Current
+			{
+				get { return _current.Value; }
+			}
+
+			public LinkedListEnumerator(LinkedList ll)
+			{
+				this._ll = ll;
+				this._modId = ll._modId;
+				this._current = _ll._rootNode;
+			}
+
+			public bool MoveNext()
+			{
+				if (this._modId != this._ll._modId)
+				{
+					throw new InvalidOperationException("LinkedList has been modified.");
+				}
+
+				_current = _current.NextNode;
+				return (_current == _ll._rootNode ? false : true);
+			}
+
+			public void Reset()
+			{
+				_current = _ll._rootNode;
+			}
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/ListSet.cs b/src/Spring/Spring.Core/Collections/ListSet.cs
new file mode 100644
index 00000000..ace9afc2
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/ListSet.cs
@@ -0,0 +1,70 @@
+/* Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith. */  
+
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Implements a <see cref="Spring.Collections.ISet"/> based on a list.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Performance is much better for very small lists than either
+	/// <see cref="Spring.Collections.HashedSet"/> or <see cref="Spring.Collections.SortedSet"/>.
+	/// However, performance degrades rapidly as the data-set gets bigger. Use a
+	/// <see cref="Spring.Collections.HybridSet"/> instead if you are not sure your data-set
+	/// will always remain very small. Iteration produces elements in the order they were added.
+	/// However, element order is not guaranteed to be maintained by the various
+	/// <see cref="Spring.Collections.ISet"/> mathematical operators.  
+	/// </p>
+	/// </remarks>
+    [Serializable]
+    public class ListSet : DictionarySet
+	{
+		/// <summary>
+		/// Creates a new set instance based on a list.
+		/// </summary>
+		public ListSet()
+		{
+			InternalDictionary = new ListDictionary();
+		}
+
+		/// <summary>
+		/// Creates a new set instance based on a list and initializes it based on a
+		/// collection of elements.
+		/// </summary>
+		/// <param name="initialValues">
+		/// A collection of elements that defines the initial set contents.
+		/// </param>
+		public ListSet(ICollection initialValues) : this()
+		{
+			this.AddAll(initialValues);
+		}
+	}
+}
diff --git a/src/Spring/Spring.Core/Collections/NoElementsException.cs b/src/Spring/Spring.Core/Collections/NoElementsException.cs
new file mode 100644
index 00000000..af54bfe1
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/NoElementsException.cs
@@ -0,0 +1,91 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Thrown when an element is requested from an empty <see cref="IQueue"/>.
+	/// </summary>
+	/// <author>Griffin Caprio</author>
+	/// <version>$Id: NoElementsException.cs,v 1.4 2006/04/09 07:18:37 markpollack Exp $</version>
+	[Serializable]
+	public class NoElementsException : ApplicationException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="NoElementsException"/> class.
+		/// </summary>
+		public NoElementsException()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="NoElementsException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected NoElementsException(SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="NoElementsException"/> class with the
+		/// specified message.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public NoElementsException(string message) : base(message)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="NoElementsException"/> class with the
+		/// specified message.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public NoElementsException(string message, Exception rootCause)
+			: base(message, rootCause)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/PriorityQueue.cs b/src/Spring/Spring.Core/Collections/PriorityQueue.cs
new file mode 100644
index 00000000..338141c0
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/PriorityQueue.cs
@@ -0,0 +1,833 @@
+#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.Collections;
+using System.Diagnostics;
+using System.Reflection;
+using System.Runtime.Serialization;
+
+namespace Spring.Collections
+{
+	/// <summary> 
+	/// An unbounded priority <see cref="Spring.Collections.IQueue"/> based on a priority
+	/// heap.  This queue orders elements according to an order specified
+	/// at construction time, which is specified either according to their
+	/// <i>natural order</i> (see <see cref="System.IComparable"/>, or according to a
+	/// <see cref="System.Collections.IComparer"/>, depending on which constructor is
+	/// used. A priority queue does not permit <see lang="null"/> elements.
+	/// A priority queue relying on natural ordering also does not
+	/// permit insertion of non-comparable objects (doing so will result
+	/// <see cref="System.InvalidCastException"/>.
+	/// 
+	/// <p/>
+	/// The <i>head</i> of this queue is the <i>lowest</i> element
+	/// with respect to the specified ordering.  If multiple elements are
+	/// tied for lowest value, the head is one of those elements -- ties are
+	/// broken arbitrarily. 
+	/// 
+	/// <p/>
+	/// A priority queue is unbounded, but has an internal
+	/// <i>capacity</i> governing the size of an array used to store the
+	/// elements on the queue.  It is always at least as large as the queue
+	/// size.  As elements are added to a priority queue, its capacity
+	/// grows automatically.  The details of the growth policy are not
+	/// specified.
+	/// 
+	/// <p/>
+	/// This class and its enumerator implement all of the
+	/// <i>optional</i> methods of the <see cref="System.Collections.ICollection"/> and
+	/// <see cref="System.Collections.IEnumerator"/> interfaces.
+	/// The enumerator provided in method <see cref="System.Collections.IEnumerable.GetEnumerator"/> 
+	/// is <b>not</b> guaranteed to traverse the elements of the PriorityQueue in any
+	/// particular order.
+	/// 
+	/// <p/> 
+	/// Note that this implementation is <b>NOT</b> synchronized.
+	/// Multiple threads should not access a <see cref="Spring.Collections.PriorityQueue"/>
+	/// instance concurrently if any of the threads modifies the list
+	/// structurally. Instead, use the thread-safe PriorityBlockingQueue.
+	/// </summary>
+	/// <author>Josh Bloch</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	[Serializable]
+	public class PriorityQueue : AbstractQueue, ISerializable
+	{
+		private class PriorityQueueEnumerator : IEnumerator
+		{
+			private PriorityQueue _enclosingInstance;
+
+			public PriorityQueueEnumerator(PriorityQueue enclosingInstance)
+			{
+				_enclosingInstance = enclosingInstance;
+			}
+
+			public Object Current
+			{
+				get
+				{
+					Object result = null;
+					if (_cursorIndex <= _enclosingInstance._priorityQueueSize)
+					{
+						result = _enclosingInstance._queue[_cursorIndex];
+					}
+					return result;
+				}
+
+			}
+
+			/// <summary> 
+			/// Index (into queue array) of element to be returned by subsequent call to next.
+			/// </summary>
+			private int _cursorIndex = 0;
+
+			public bool MoveNext()
+			{
+				if ( _cursorIndex < _enclosingInstance._priorityQueueSize )
+				{
+					_cursorIndex++;
+					return true;
+				}
+				return false;
+			}
+
+			public void Reset()
+			{
+				_cursorIndex = 0;
+			}
+		}
+
+
+		#region Private Fields
+
+		private const int DEFAULT_INITIAL_CAPACITY = 11;
+
+		/// <summary> 
+		/// Priority queue represented as a balanced binary heap: the two children
+		/// of queue[n] are queue[2*n] and queue[2*n + 1].  The priority queue is
+		/// ordered by comparator, or by the elements' natural ordering, if
+		/// comparator is null:  For each node n in the heap and each descendant d
+		/// of n, n &lt;= d.
+		/// 
+		/// The element with the lowest value is in queue[1], assuming the queue is
+		/// nonempty.  (A one-based array is used in preference to the traditional
+		/// zero-based array to simplify parent and child calculations.)
+		/// 
+		/// queue.length must be >= 2, even if size == 0.
+		/// </summary>
+		[NonSerialized] private object[] _queue;
+
+		/// <summary> The number of elements in the priority queue.</summary>
+		private int _priorityQueueSize = 0;
+		
+		/// <summary> 
+		/// The comparator, or null if priority queue uses elements'
+		/// natural ordering.
+		/// </summary>
+		private IComparer _comparator;
+
+		/// <summary> 
+		/// The number of times this priority queue has been
+		/// <i>structurally modified</i>.
+		/// </summary>
+		[NonSerialized] private int _queueModificationCount = 0;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// Creates a <see cref="Spring.Collections.PriorityQueue"/> with the default initial capacity
+		/// (11) that orders its elements according to their natural
+		/// ordering (using <see cref="System.IComparable"/>).
+		/// </summary>
+		public PriorityQueue() : this(DEFAULT_INITIAL_CAPACITY, null)
+		{
+		}
+
+		/// <summary> 
+		/// Creates a <see cref="Spring.Collections.PriorityQueue"/> with the specified initial capacity
+		/// that orders its elements according to their natural ordering
+		/// (using <see cref="System.IComparable"/>).
+		/// </summary>
+		/// <param name="initialCapacity">the initial capacity for this priority queue.
+		/// </param>
+		/// <exception cref="System.ArgumentException">if <paramref name="initialCapacity"/> is less than 1.</exception>
+		public PriorityQueue(int initialCapacity) : this(initialCapacity, null)
+		{
+		}
+
+		/// <summary> 
+		/// Creates a <see cref="Spring.Collections.PriorityQueue"/> with the specified initial capacity
+		/// that orders its elements according to the specified comparator.
+		/// </summary>
+		/// <param name="initialCapacity">the initial capacity for this priority queue.</param>
+		/// <param name="comparator">the comparator used to order this priority queue.
+		/// If <see lang="null"/> then the order depends on the elements' natural ordering.
+		/// </param>
+		/// <exception cref="System.ArgumentException">if <paramref name="initialCapacity"/> is less than 1.</exception>
+		public PriorityQueue(int initialCapacity, IComparer comparator)
+		{
+			if (initialCapacity < 1)
+				throw new ArgumentException("initialCapacity");
+			_queue = new object[initialCapacity + 1];
+			_comparator = comparator;
+		}
+
+		/// <summary> 
+		/// Creates a <see cref="Spring.Collections.PriorityQueue"/> containing the elements in the
+		/// specified collection.  The priority queue has an initial
+		/// capacity of 110% of the size of the specified collection or 1
+		/// if the collection is empty.  If the specified collection is an
+		/// instance of a <see cref="Spring.Collections.PriorityQueue"/>, the priority queue will be sorted
+		/// according to the same comparator, or according to its elements'
+		/// natural order if the collection is sorted according to its
+		/// elements' natural order.  Otherwise, the priority queue is
+		/// ordered according to its elements' natural order.
+		/// </summary>
+		/// <param name="collection">the collection whose elements are to be placed into this priority queue.</param>
+		/// <exception cref="System.InvalidCastException">if elements of <paramref name="collection"/> cannot be 
+		/// compared to one another according to the priority queue's ordering</exception>
+		/// <exception cref="System.ArgumentNullException">if <paramref name="collection"/> or any element with it is
+		/// <see lang="null"/>
+		/// </exception>
+		public PriorityQueue(ICollection collection)
+		{
+			if ( null == collection )
+				throw new ArgumentNullException("collection");
+			initializeArray(collection);
+			if (collection is PriorityQueue)
+			{
+				PriorityQueue s = (PriorityQueue) collection;
+				_comparator = s.Comparator();
+				fillFromSorted(s);
+			}
+			else
+			{
+				_comparator = null;
+				fillFromUnsorted(collection);
+			}
+		}
+
+		#endregion
+
+		#region Private Helper Methods
+
+		/// <summary> 
+		/// Common code to initialize underlying queue array across
+		/// constructors below.
+		/// </summary>
+		private void initializeArray(ICollection c)
+		{
+			int size = c.Count;
+			int initialCapacity = getQueueSizeBasedOnPercentage(size, 110);
+			if (initialCapacity < 1)
+				initialCapacity = 1;
+
+			_queue = new Object[initialCapacity + 1];
+		}
+
+		/// <summary>
+		/// Performs an unsigned bitwise right shift with the specified number
+		/// </summary>
+		/// <param name="number">Number to operate on</param>
+		/// <param name="bits">Ammount of bits to shift</param>
+		/// <returns>The resulting number from the shift operation</returns>
+		private int urShift(int number, int bits)
+		{
+			if (number >= 0)
+				return number >> bits;
+			else
+				return (number >> bits) + (2 << ~bits);
+		}
+
+		/// <summary> 
+		/// Establishes the heap invariant assuming the heap
+		/// satisfies the invariant except possibly for the leaf-node indexed by k
+		/// (which may have a nextExecutionTime less than its parent's).
+		/// </summary>
+		/// <remarks>
+		/// This method functions by "promoting" queue[k] up the hierarchy
+		/// (by swapping it with its parent) repeatedly until queue[k]
+		/// is greater than or equal to its parent.
+		/// </remarks>
+		private void fixUp(int k)
+		{
+			if (_comparator == null)
+			{
+				while (k > 1)
+				{
+					int j = k >> 1;
+					if (((IComparable) _queue[j]).CompareTo(_queue[k]) <= 0)
+						break;
+					Object tmp = _queue[j];
+					_queue[j] = _queue[k];
+					_queue[k] = tmp;
+					k = j;
+				}
+			}
+			else
+			{
+				while (k > 1)
+				{
+					int j = urShift(k, 1);
+					if (_comparator.Compare(_queue[j], _queue[k]) <= 0)
+						break;
+					Object tmp = _queue[j];
+					_queue[j] = _queue[k];
+					_queue[k] = tmp;
+					k = j;
+				}
+			}
+		}
+
+		/// <summary> 
+		/// Establishes the heap invariant (described above) in the subtree
+		/// rooted at k, which is assumed to satisfy the heap invariant except
+		/// possibly for node k itself (which may be greater than its children).
+		/// </summary>
+		/// <remarks>
+		/// This method functions by "demoting" queue[k] down the hierarchy
+		/// (by swapping it with its smaller child) repeatedly until queue[k]
+		/// is less than or equal to its children.
+		/// </remarks>
+		private void fixDown(int k)
+		{
+			int j;
+			if (_comparator == null)
+			{
+				while ((j = k << 1) <= _priorityQueueSize && (j > 0))
+				{
+					if (j < _priorityQueueSize && ((IComparable) _queue[j]).CompareTo(_queue[j + 1]) > 0)
+						j++; // j indexes smallest kid
+
+					if (((IComparable) _queue[k]).CompareTo(_queue[j]) <= 0)
+						break;
+					Object tmp = _queue[j];
+					_queue[j] = _queue[k];
+					_queue[k] = tmp;
+					k = j;
+				}
+			}
+			else
+			{
+				while ((j = k << 1) <= _priorityQueueSize && (j > 0))
+				{
+					if (j < _priorityQueueSize && _comparator.Compare(_queue[j], _queue[j + 1]) > 0)
+						j++; // j indexes smallest kid
+					if (_comparator.Compare(_queue[k], _queue[j]) <= 0)
+						break;
+					Object tmp = _queue[j];
+					_queue[j] = _queue[k];
+					_queue[k] = tmp;
+					k = j;
+				}
+			}
+		}
+
+		/// <summary> 
+		/// Establishes the heap invariant in the entire tree,
+		/// assuming nothing about the order of the elements prior to the call.
+		/// </summary>
+		private void heapify()
+		{
+			for (int i = _priorityQueueSize/2; i >= 1; i--)
+				fixDown(i);
+		}
+
+		/// <summary>
+		/// Returns the <paramref name="percentage"/> of <paramref name="size"/> or <see cref="System.Int32.MaxValue"/> - 1,
+		/// whichever is smaller. 
+		/// </summary>
+		/// <param name="size">base size</param>
+		/// <param name="percentage">percentage to return</param>
+		/// <returns><paramref name="percentage"/> of <paramref name="size"/></returns>
+		private int getQueueSizeBasedOnPercentage(int size, long percentage)
+		{
+			return (int) Math.Min((size*percentage)/100, Int32.MaxValue - 1);
+		}
+
+		/// <summary> 
+		/// Initially fill elements of the queue array under the
+		/// knowledge that it is sorted or is another <see cref="Spring.Collections.PriorityQueue"/>, in which
+		/// case we can just place the elements in the order presented.
+		/// </summary>
+		private void fillFromSorted(ICollection collection)
+		{
+			fillArray(collection, true);
+		}
+
+		private void fillArray(ICollection collection, bool sorted)
+		{
+			foreach (object currentObject in collection)
+			{
+				if (null == currentObject )
+					throw new ArgumentNullException("collection", "Cannot add null elements to queue.");
+				_queue[++_priorityQueueSize] = currentObject;
+			}
+			if (! sorted)
+			{
+				heapify();
+			}
+		}
+
+		/// <summary> 
+		/// Initially fill elements of the queue array that is not to our knowledge
+		/// sorted, so we must rearrange the elements to guarantee the heap
+		/// invariant.
+		/// </summary>
+		private void fillFromUnsorted(ICollection collection)
+		{
+			fillArray(collection, false);
+		}
+
+		/// <summary> 
+		/// Removes and returns element located at <paramref name="index"/> from queue.  (Recall that the queue
+		/// is one-based, so 1 &lt;= i &lt;= size.)
+		/// </summary>
+		/// <remarks>
+		/// Normally this method leaves the elements at positions from 1 up to i-1,
+		/// inclusive, untouched.  Under these circumstances, it returns <see lang="null"/>.
+		/// Occasionally, in order to maintain the heap invariant, it must move
+		/// the last element of the list to some index in the range [2, i-1],
+		/// and move the element previously at position (i/2) to position i.
+		/// Under these circumstances, this method returns the element that was
+		/// previously at the end of the list and is now at some position between
+		/// 2 and i-1 inclusive.
+		/// </remarks>
+		private Object removeAt(int index)
+		{
+			Debug.Assert(index > 0 && index <= _priorityQueueSize);
+			_queueModificationCount++;
+
+			Object moved = _queue[_priorityQueueSize];
+			_queue[index] = moved;
+			_queue[_priorityQueueSize--] = null;
+			if (index <= _priorityQueueSize)
+			{
+				fixDown(index);
+				if (_queue[index] == moved)
+				{
+					fixUp(index);
+					if (_queue[index] != moved)
+						return moved;
+				}
+			}
+			return null;
+		}
+
+		/// <summary> Resize array, if necessary, to be able to hold given index</summary>
+		private void grow(int index)
+		{
+			int newLength = _queue.Length;
+			if (index < newLength)
+				return;
+			if (index == Int32.MaxValue)
+				throw new InvalidOperationException("Cannot grow queue to accomdate index " + index + ".  Doing so would result in a memory overflow.");
+			while (newLength <= index)
+			{
+				if (newLength >= Int32.MaxValue/2)
+				{
+					newLength = Int32.MaxValue;
+				}
+				else
+				{
+					newLength <<= 2;
+				}
+			}
+			Object[] newQueue = new Object[newLength];
+			Array.Copy(_queue, 0, newQueue, 0, _queue.Length);
+			_queue = newQueue;
+		}
+
+		#endregion
+
+		#region Public Methods
+		/// <summary>
+		/// Gets the Capacity of this queue.  Will equal <see cref="System.Collections.ICollection.Count"/>
+		/// </summary>
+		public override int Capacity
+		{
+			get
+			{
+				return _queue.Length;
+			}
+		}
+
+		/// <summary>
+		/// Returns the queue count.
+		/// </summary>
+		public override int Count
+		{
+			get { return _priorityQueueSize; }
+		}
+
+		/// <summary> 
+		/// Inserts the specified element into this queue if it is possible to do
+		/// so immediately without violating capacity restrictions.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// When using a capacity-restricted queue, this method is generally
+		/// preferable to <see cref="Spring.Collections.IQueue.Add(object)"/>,
+		/// which can fail to insert an element only by throwing an exception.
+		/// </p>
+		/// </remarks>
+		/// <param name="objectToAdd">
+		/// The element to add.
+		/// </param>
+		/// <returns>
+		/// <see lang="true"/> if the element was added to this queue.
+		/// </returns>
+		/// <exception cref="System.InvalidCastException">
+		/// if the specified element cannot be compared
+		/// with elements currently in the priority queue according
+		/// to the priority queue's ordering.
+		/// </exception>
+		/// <exception cref="System.InvalidOperationException">
+		/// If the element cannot be added at this time due to capacity restrictions.
+		/// </exception>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="objectToAdd"/> is
+		/// <see lang="null"/> and this queue does not permit <see lang="null"/>
+		/// elements.
+		/// </exception>
+		/// <exception cref="System.ArgumentException">
+		/// If some property of the supplied <paramref name="objectToAdd"/> prevents
+		/// it from being added to this queue.
+		/// </exception>
+		public override bool Offer(Object objectToAdd)
+		{
+			if (objectToAdd == null)
+				throw new ArgumentNullException("objectToAdd");
+			_queueModificationCount++;
+			++_priorityQueueSize;
+
+			if (_priorityQueueSize >= _queue.Length)
+			{
+				grow(_priorityQueueSize);
+			}
+			_queue[_priorityQueueSize] = objectToAdd;
+			fixUp(_priorityQueueSize);
+			return true;
+		}
+
+		/// <summary> 
+		/// Retrieves, but does not remove, the head of this queue,
+		/// or returns <see lang="null"/> if this queue is empty.
+		/// </summary>
+		/// <returns> 
+		/// The head of this queue, or <see lang="null"/> if this queue is empty.
+		/// </returns>
+		public override Object Peek()
+		{
+			if (_priorityQueueSize == 0)
+				return null;
+			return _queue[1];
+		}
+
+		// Collection Methods - the first two override to update docs
+		/// <summary> 
+		/// Inserts the specified element into this queue if it is possible to do so
+		/// immediately without violating capacity restrictions, returning
+		/// <see lang="true"/> upon success and throwing an
+		/// <see cref="System.InvalidOperationException"/> if no space is
+		/// currently available.
+		/// </summary>
+		/// <param name="objectToAdd">
+		/// The element to add.
+		/// </param>
+		/// <returns> 
+		/// <see lang="true"/> if successful.
+		/// </returns>
+		/// <exception cref="System.InvalidOperationException">
+		/// If the element cannot be added at this time due to capacity restrictions.
+		/// </exception>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the specified element is <see lang="null"/> and this queue does not
+		/// permit <see lang="null"/> elements.
+		/// </exception>
+		/// <exception cref="System.ArgumentException">
+		/// If some property of the supplied <paramref name="objectToAdd"/> prevents
+		/// it from being added to this queue.
+		/// </exception>
+		/// <exception cref="System.InvalidCastException">
+		/// if the specified element cannot be compared
+		/// with elements currently in the priority queue according
+		/// to the priority queue's ordering.
+		/// </exception>
+		public override bool Add(Object objectToAdd)
+		{
+			return Offer(objectToAdd);
+		}
+
+		/// <summary> 
+		/// Removes a single instance of the specified element from this
+		/// queue, if it is present.
+		/// </summary>
+		public virtual bool Remove(Object objectToRemove)
+		{
+			if (objectToRemove == null)
+			{
+				return false;
+			}
+
+			if (_comparator == null)
+			{
+				for (int i = 1; i <= _priorityQueueSize; i++)
+				{
+					if (((IComparable) _queue[i]).CompareTo(objectToRemove) == 0)
+					{
+						removeAt(i);
+						return true;
+					}
+				}
+			}
+			else
+			{
+				for (int i = 1; i <= _priorityQueueSize; i++)
+				{
+					if (_comparator.Compare(_queue[i], objectToRemove) == 0)
+					{
+						removeAt(i);
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		/// <summary> 
+		/// Returns an <see cref="System.Collections.IEnumerator"/> over the elements in this queue. 
+		/// The enumeratoar does not return the elements in any particular order.
+		/// </summary>
+		/// <returns> an enumerator over the elements in this queue.</returns>
+		public override IEnumerator GetEnumerator()
+		{
+			return new PriorityQueueEnumerator(this);
+		}
+
+
+		/// <summary> 
+		/// Removes all elements from the priority queue.
+		/// The queue will be empty after this call returns.
+		/// </summary>
+		public override void Clear()
+		{
+			_queueModificationCount++;
+
+			for (int i = 1; i <= _priorityQueueSize; i++)
+				_queue[i] = null;
+
+			_priorityQueueSize = 0;
+		}
+
+		/// <summary> 
+		/// Retrieves and removes the head of this queue,
+		/// or returns <see lang="null"/> if this queue is empty.
+		/// </summary>
+		/// <returns> 
+		/// The head of this queue, or <see lang="null"/> if this queue is empty.
+		/// </returns>
+		public override Object Poll()
+		{
+			if (_priorityQueueSize == 0)
+				return null;
+			_queueModificationCount++;
+
+			Object result = _queue[1];
+			_queue[1] = _queue[_priorityQueueSize];
+			_queue[_priorityQueueSize--] = null;
+			if (_priorityQueueSize > 1)
+				fixDown(1);
+			return result;
+		}
+		/// <summary>
+		/// Queries the queue to see if it contains the specified <pararef name="element"/>
+		/// </summary>
+		/// <param name="element">element to look for.</param>
+		/// <returns><see lang="true"/> if the queue contains the <pararef name="element"/>, 
+		/// <see lang="false"/> otherwise.</returns>
+		public bool Contains( object element )
+		{
+			if (element == null)
+			{
+				for (int num1 = 0; num1 < Capacity; num1++)
+				{
+					if (_queue[num1] == null)
+					{
+						return true;
+					}
+				}
+				return false;
+			}
+			for (int num2 = 0; num2 < Capacity; num2++)
+			{
+				if (element.Equals(_queue[num2]))
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+
+
+		/// <summary> Returns the comparator used to order this collection, or <see lang="null"/>
+		/// if this collection is sorted according to its elements natural ordering
+		/// (using <see cref="System.IComparable"/>).
+		/// 
+		/// </summary>
+		/// <returns> the comparator used to order this collection, or <see lang="null"/>
+		/// if this collection is sorted according to its elements natural ordering.
+		/// </returns>
+		public virtual IComparer Comparator()
+		{
+			return _comparator;
+		}
+		#endregion
+
+		#region ISerializable Implementation
+		/// <summary> 
+		/// Save the state of the instance to a stream (that
+		/// is, serialize it).
+		/// </summary>
+		/// <serialData> The length of the array backing the instance is
+		/// emitted (int), followed by all of its elements (each an
+		/// <see cref="System.Object"/>) in the proper order.
+		/// </serialData>
+		/// <param name="serializationInfo">the stream</param>
+		/// <param name="context">the context</param>
+		public virtual void GetObjectData(SerializationInfo serializationInfo, StreamingContext context)
+		{
+			Type thisType = this.GetType();
+			MemberInfo[] mi = FormatterServices.GetSerializableMembers(thisType, context);
+			for (int i = 0; i < mi.Length; i++)
+			{
+				serializationInfo.AddValue(mi[i].Name, ((FieldInfo) mi[i]).GetValue(this));
+			}
+
+			// Write out array length
+			serializationInfo.AddValue("Spring.Collections.PriorityQueuedata1", _queue.Length);
+
+			// Write out all elements in the proper order.
+			for (int i = 1; i <= _priorityQueueSize; i++)
+			{
+				serializationInfo.AddValue("Spring.Collections.PriorityQueueData" + i, _queue[i]);
+			}
+		}
+
+		/// <summary> 
+		/// Reconstitute the <see cref="Spring.Collections.PriorityQueue"/> instance from a stream (that is,
+		/// deserialize it).
+		/// </summary>
+		/// <param name="serializationInfo">the stream</param>
+		/// <param name="context">the context</param>
+		protected PriorityQueue(SerializationInfo serializationInfo, StreamingContext context)
+		{
+			Type thisType = this.GetType();
+			MemberInfo[] mi = FormatterServices.GetSerializableMembers(thisType, context);
+			for (int i = 0; i < mi.Length; i++)
+			{
+				FieldInfo fi = (FieldInfo) mi[i];
+				fi.SetValue(this, serializationInfo.GetValue(fi.Name, fi.FieldType));
+			}
+			int arrayLength = serializationInfo.GetInt32("Spring.Collections.PriorityQueuedata1");
+			_queue = new Object[arrayLength];
+
+			for (int i = 1; i <= _priorityQueueSize; i++)
+			{
+				_queue[i] = serializationInfo.GetValue("Spring.Collections.PriorityQueueData" + i, typeof (Object));
+			}
+		}
+		#endregion
+
+		#region ICollection Implementation
+
+		///<summary>
+		///Copies the elements of the <see cref="T:System.Collections.ICollection"></see> to an <see cref="T:System.Array"></see>, starting at a particular <see cref="T:System.Array"></see> index.
+		///</summary>
+		///<param name="array">The one-dimensional <see cref="T:System.Array"></see> that is the destination of the elements copied from <see cref="T:System.Collections.ICollection"></see>. The <see cref="T:System.Array"></see> must have zero-based indexing. </param>
+		///<param name="index">The zero-based index in array at which copying begins. </param>
+		///<exception cref="T:System.ArgumentNullException">array is null. </exception>
+		///<exception cref="T:System.ArgumentOutOfRangeException">index is less than zero. </exception>
+		///<exception cref="T:System.ArgumentException">array is multidimensional.-or- index is equal to or greater than the length of array.-or- The number of elements in the source <see cref="T:System.Collections.ICollection"></see> is greater than the available space from index to the end of the destination array. </exception>
+		///<exception cref="T:System.InvalidCastException">The type of the source <see cref="T:System.Collections.ICollection"></see> cannot be cast automatically to the type of the destination array. </exception><filterpriority>2</filterpriority>
+		public override void CopyTo(Array array,Int32 index)
+		{
+			if ( _priorityQueueSize > array.Length ) throw new ArgumentException("Destination array too small.", "array");
+			if ( index > array.Length - 1 ) throw new ArgumentException("Starting index outside bounds of target array.", "index");
+			if ( index + _priorityQueueSize > array.Length ) throw new IndexOutOfRangeException("Destination array not long enough to begin copying at index " + index + ".");
+
+			for ( int queueElementCount = 1; queueElementCount <= _priorityQueueSize; queueElementCount++)
+			{
+				array.SetValue(_queue[queueElementCount], index );
+				index++;
+			}
+			Array.Sort(array);
+		}
+
+		///<summary>
+		///Copies the elements of the <see cref="T:System.Collections.ICollection"></see> to an <see cref="T:System.Array"></see>, starting at index 0.
+		///</summary>
+		///<param name="array">The one-dimensional <see cref="T:System.Array"></see> that is the destination of the elements copied from <see cref="T:System.Collections.ICollection"></see>. The <see cref="T:System.Array"></see> must have zero-based indexing. </param>
+		///<exception cref="T:System.ArgumentNullException">array is null. </exception>
+		///<exception cref="T:System.ArgumentOutOfRangeException">index is less than zero. </exception>
+		///<exception cref="T:System.ArgumentException">array is multidimensional.-or- index is equal to or greater than the length of array.-or- The number of elements in the source <see cref="T:System.Collections.ICollection"></see> is greater than the available space from index to the end of the destination array. </exception>
+		///<exception cref="T:System.InvalidCastException">The type of the source <see cref="T:System.Collections.ICollection"></see> cannot be cast automatically to the type of the destination array. </exception><filterpriority>2</filterpriority>
+		public void CopyTo(Array array)
+		{
+			CopyTo(array, 0);
+		}
+
+		///<summary>
+		///Gets an object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"></see>.
+		///</summary>
+		///<returns>
+		///An object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"></see>.
+		///</returns>
+		public override Object SyncRoot
+		{
+			get { return null; }
+
+		}
+
+		///<summary>
+		///Gets a value indicating whether access to the <see cref="T:System.Collections.ICollection"></see> is synchronized (thread safe).
+		///</summary>
+		///<returns>
+		///true if access to the <see cref="T:System.Collections.ICollection"></see> is synchronized (thread safe); otherwise, false.
+		///</returns>
+		public override Boolean IsSynchronized
+		{
+			get { return false; }
+
+		}
+
+		/// <summary>
+		/// Returns <see lang="true"/> if there are no elements in the <see cref="IQueue"/>, <see lang="false"/> otherwise.
+		/// </summary>
+		public override bool IsEmpty
+		{
+			get { return _priorityQueueSize == 0; }
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/Set.cs b/src/Spring/Spring.Core/Collections/Set.cs
new file mode 100644
index 00000000..ff6ca5eb
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/Set.cs
@@ -0,0 +1,568 @@
+/* Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith. */
+
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// A collection that contains no duplicate elements.
+	/// </summary>
+	/// <seealso cref="Spring.Collections.ISet"/>
+	/// <version>$Id: Set.cs,v 1.7 2007/03/16 04:01:28 aseovic Exp $</version>
+    [Serializable]
+    public abstract class Set : ISet
+	{
+		/// <summary>
+		/// Performs a "union" of the two sets, where all the elements
+		/// in both sets are present. 
+		/// </summary>
+		/// <param name="setOne">A collection of elements.</param>
+		/// <returns>
+		/// A new <see cref="Spring.Collections.ISet"/> containing the union of
+		/// this <see cref="Spring.Collections.ISet"/> with the specified
+		/// collection. Neither of the input objects is modified by the union.
+		/// </returns>
+		/// <see cref="Spring.Collections.ISet.Union(ISet)"/>
+		public virtual ISet Union(ISet setOne)
+		{
+			ISet resultSet = (ISet) this.Clone();
+			if (setOne != null) 
+			{
+				resultSet.AddAll(setOne);
+			}
+			return resultSet;
+		}
+
+		/// <summary>
+		/// Performs a "union" of two sets, where all the elements in both are
+		/// present.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// That is, the element is included if it is in either
+		/// <paramref name="setOne"/> or <paramref name="anotherSet"/>. The return
+		/// value is a <b>clone</b> of one of the sets (<paramref name="setOne"/>
+		/// if it is not <see langword="null"/>) with elements of the other set
+		/// added in. Neither of the input sets is modified by the operation.
+		/// </p>
+		/// </remarks>
+		/// <param name="setOne">A set of elements.</param>
+		/// <param name="anotherSet">A set of elements.</param>
+		/// <returns>
+		/// A set containing the union of the input sets;
+		/// <see langword="null"/> if both sets are <see langword="null"/>.
+		/// </returns>
+		public static ISet Union(ISet setOne, ISet anotherSet)
+		{
+			if (setOne == null && anotherSet == null)
+			{
+				return null;
+			}
+			else if (setOne == null)
+			{
+				return (ISet) anotherSet.Clone();
+			}
+			else if (anotherSet == null)
+			{
+				return (ISet) setOne.Clone();
+			}
+			else
+			{
+				return setOne.Union(anotherSet);
+			}
+		}
+
+		/// <summary>
+		/// Performs a "union" of two sets, where all the elements in both are
+		/// present.
+		/// </summary>
+		/// <param name="setOne">A set of elements.</param>
+		/// <param name="anotherSet">A set of elements.</param>
+		/// <returns>
+		/// A set containing the union of the input sets;
+		/// <see langword="null"/> if both sets are <see langword="null"/>.
+		/// </returns>
+		/// <seealso cref="Union(ISet, ISet)"/>
+		public static Set operator |(Set setOne, Set anotherSet)
+		{
+			return (Set) Union(setOne, anotherSet);
+		}
+
+		/// <summary>
+		/// Performs an "intersection" of the two sets, where only the elements
+		/// that are present in both sets remain.
+		/// </summary>
+		/// <param name="setOne">A set of elements.</param>
+		/// <returns>
+		/// The intersection of this set with <paramref name="setOne"/>.
+		/// </returns>
+		/// <see cref="Spring.Collections.ISet.Intersect(ISet)"/>
+		public virtual ISet Intersect(ISet setOne)
+		{
+			ISet resultSet = (ISet) this.Clone();
+			if (setOne != null)
+			{
+				resultSet.RetainAll(setOne);
+			}
+			else
+			{
+				resultSet.Clear();
+			}
+			return resultSet;
+		}
+
+		/// <summary>
+		/// Performs an "intersection" of the two sets, where only the elements
+		/// that are present in both sets remain. 
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// That is, the element is included only if it exists in both
+		/// <paramref name="setOne"/> and <paramref name="anotherSet"/>. Neither input
+		/// object is modified by the operation. The result object is a
+		/// <b>clone</b> of one of the input objects (<paramref name="setOne"/>
+		/// if it is not <see langword="null"/>) containing the elements from
+		/// the intersect operation.
+		/// </p>
+		/// </remarks>
+		/// <param name="setOne">A set of elements.</param>
+		/// <param name="anotherSet">A set of elements.</param>
+		/// <returns>
+		/// The intersection of the two input sets; <see langword="null"/> if
+		/// both sets are <see langword="null"/>.
+		/// </returns>
+		public static ISet Intersect(ISet setOne, ISet anotherSet)
+		{
+			if (setOne == null && anotherSet == null)
+			{
+				return null;
+			}
+			else if (setOne == null)
+			{
+				return anotherSet.Intersect(setOne);
+			}
+			else
+			{
+				return setOne.Intersect(anotherSet);
+			}
+		}
+
+		/// <summary>
+		/// Performs an "intersection" of the two sets, where only the elements
+		/// that are present in both sets remain. 
+		/// </summary>
+		/// <param name="setOne">A set of elements.</param>
+		/// <param name="anotherSet">A set of elements.</param>
+		/// <returns>
+		/// The intersection of the two input sets; <see langword="null"/> if
+		/// both sets are <see langword="null"/>.
+		/// </returns>
+		/// <seealso cref="Intersect(ISet, ISet)"/>
+		public static Set operator &(Set setOne, Set anotherSet)
+		{
+			return (Set) Intersect(setOne, anotherSet);
+		}
+
+		/// <summary>
+		/// Performs a "minus" of this set from the <paramref name="setOne"/>
+		/// set.
+		/// </summary>
+		/// <param name="setOne">A set of elements.</param>
+		/// <returns>
+		/// A set containing the elements from this set with the elements in
+		/// <paramref name="setOne"/> removed.
+		/// </returns>
+		/// <seealso cref="Spring.Collections.ISet.Minus(ISet)"/>
+		public virtual ISet Minus(ISet setOne)
+		{
+			ISet resultSet = (ISet) this.Clone();
+			if (setOne != null)
+			{
+				resultSet.RemoveAll(setOne);
+			}
+			return resultSet;
+		}
+
+		/// <summary>
+		/// Performs a "minus" of set <paramref name="anotherSet"/> from set
+		/// <paramref name="setOne"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This returns a set of all the elements in set
+		/// <paramref name="setOne"/>, removing the elements that are also in
+		/// set <paramref name="anotherSet"/>. The original sets are not modified
+		/// during this operation. The result set is a <b>clone</b> of set
+		/// <paramref name="setOne"/> containing the elements from the operation. 
+		/// </p>
+		/// </remarks>
+		/// <param name="setOne">A set of elements.</param>
+		/// <param name="anotherSet">A set of elements.</param>
+		/// <returns>
+		/// A set containing
+		/// <c><paramref name="setOne"/> - <paramref name="anotherSet"/></c> elements.
+		/// <see langword="null"/> if <paramref name="setOne"/> is
+		/// <see langword="null"/>.
+		/// </returns>
+		public static ISet Minus(ISet setOne, ISet anotherSet)
+		{
+			if (setOne == null)
+			{
+				return null;
+			}
+			else
+			{
+				return setOne.Minus(anotherSet);
+			}
+		}
+
+		/// <summary>
+		/// Performs a "minus" of set <paramref name="anotherSet"/> from set
+		/// <paramref name="setOne"/>.
+		/// </summary>
+		/// <param name="setOne">A set of elements.</param>
+		/// <param name="anotherSet">A set of elements.</param>
+		/// <returns>
+		/// A set containing
+		/// <c><paramref name="setOne"/> - <paramref name="anotherSet"/></c> elements.
+		/// <see langword="null"/> if <paramref name="setOne"/> is
+		/// <see langword="null"/>.
+		/// </returns>
+		/// <seealso cref="Minus(ISet, ISet)"/>
+		public static Set operator -(Set setOne, Set anotherSet)
+		{
+			return (Set) Minus(setOne, anotherSet);
+		}
+
+
+		/// <summary>
+		/// Performs an "exclusive-or" of the two sets, keeping only those
+		/// elements that are in one of the sets, but not in both.
+		/// </summary>
+		/// <param name="setOne">A set of elements.</param>
+		/// <returns>
+		/// A set containing the result of
+		/// <c><paramref name="setOne"/> ^ this</c>.
+		/// </returns>
+		/// <seealso cref="Spring.Collections.ISet.ExclusiveOr(ISet)"/>
+		public virtual ISet ExclusiveOr(ISet setOne)
+		{
+			ISet resultSet = (ISet) this.Clone();
+			foreach (object element in setOne)
+			{
+				if (resultSet.Contains(element))
+				{
+					resultSet.Remove(element);
+				}
+				else
+				{
+					resultSet.Add(element);
+				}
+			}
+			return resultSet;
+		}
+
+		/// <summary>
+		/// Performs an "exclusive-or" of the two sets, keeping only those
+		/// elements that are in one of the sets, but not in both.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The original sets are not modified during this operation. The
+		/// result set is a <b>clone</b> of one of the sets (
+		/// <paramref name="setOne"/> if it is not <see langword="null"/>)
+		/// containing the elements from the exclusive-or operation.
+		/// </p>
+		/// </remarks>
+		/// <param name="setOne">A set of elements.</param>
+		/// <param name="anotherSet">A set of elements.</param>
+		/// <returns>
+		/// A set containing the result of
+		/// <c><paramref name="setOne"/> ^ <paramref name="anotherSet"/></c>.
+		/// <see langword="null"/> if both sets are <see langword="null"/>.
+		/// </returns>
+		public static ISet ExclusiveOr(ISet setOne, ISet anotherSet)
+		{
+			if (setOne == null && anotherSet == null)
+			{
+				return null;
+			}
+			else if (setOne == null)
+			{
+				return (Set) anotherSet.Clone();
+			}
+			else if (anotherSet == null)
+			{
+				return (Set) setOne.Clone();
+			}
+			else
+			{
+				return setOne.ExclusiveOr(anotherSet);
+			}
+		}
+
+		/// <summary>
+		/// Performs an "exclusive-or" of the two sets, keeping only those
+		/// elements that are in one of the sets, but not in both.
+		/// </summary>
+		/// <param name="setOne">A set of elements.</param>
+		/// <param name="anotherSet">A set of elements.</param>
+		/// <returns>
+		/// A set containing the result of
+		/// <c><paramref name="setOne"/> ^ <paramref name="anotherSet"/></c>.
+		/// <see langword="null"/> if both sets are <see langword="null"/>.
+		/// </returns>
+		/// <seealso cref="ExclusiveOr(ISet, ISet)"/>
+		public static Set operator ^(Set setOne, Set anotherSet)
+		{
+			return (Set) ExclusiveOr(setOne, anotherSet);
+		}
+
+		/// <summary>
+		/// Adds the specified element to this set if it is not already present.
+		/// </summary>
+		/// <param name="element">The object to add to the set.</param>
+		/// <returns>
+		/// <see langword="true"/> is the object was added,
+		/// <see langword="true"/> if the object was already present.
+		/// </returns>
+		public abstract bool Add(object element);
+
+		/// <summary>
+		/// Adds all the elements in the specified collection to the set if
+		/// they are not already present.
+		/// </summary>
+		/// <param name="collection">A collection of objects to add to the set.</param>
+		/// <returns>
+		/// <see langword="true"/> is the set changed as a result of this
+		/// operation.
+		/// </returns>
+		public abstract bool AddAll(ICollection collection);
+
+		/// <summary>
+		/// Removes all objects from this set.
+		/// </summary>
+		public abstract void Clear();
+
+		/// <summary>
+		/// Returns <see langword="true"/> if this set contains the specified
+		/// element.
+		/// </summary>
+		/// <param name="element">The element to look for.</param>
+		/// <returns>
+		/// <see langword="true"/> if this set contains the specified element.
+		/// </returns>
+		public abstract bool Contains(object element);
+
+		/// <summary>
+		/// Returns <see langword="true"/> if the set contains all the
+		/// elements in the specified collection.
+		/// </summary>
+		/// <param name="collection">A collection of objects.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set contains all the elements in the
+		/// specified collection.
+		/// </returns>
+		public abstract bool ContainsAll(ICollection collection);
+
+		/// <summary>
+		/// Returns <see langword="true"/> if this set contains no elements.
+		/// </summary>
+		public abstract bool IsEmpty { get; }
+
+		/// <summary>
+		/// Removes the specified element from the set.
+		/// </summary>
+		/// <param name="element">The element to be removed.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set contained the specified element.
+		/// </returns>
+		public abstract bool Remove(object element);
+
+		/// <summary>
+		/// Remove all the specified elements from this set, if they exist in
+		/// this set.
+		/// </summary>
+		/// <param name="collection">A collection of elements to remove.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set was modified as a result of this
+		/// operation.
+		/// </returns>
+		public abstract bool RemoveAll(ICollection collection);
+
+		/// <summary>
+		/// Retains only the elements in this set that are contained in the
+		/// specified collection.
+		/// </summary>
+		/// <param name="collection">
+		/// The collection that defines the set of elements to be retained.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if this set changed as a result of this
+		/// operation.
+		/// </returns>
+		public abstract bool RetainAll(ICollection collection);
+
+		/// <summary>
+		/// Returns a clone of the <see cref="Spring.Collections.ISet"/>
+		/// instance.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This will work for derived <see cref="Spring.Collections.ISet"/>
+		/// classes if the derived class implements a constructor that takes no
+		/// arguments.
+		/// </p>
+		/// </remarks>
+		/// <returns>A clone of this object.</returns>
+		public virtual object Clone()
+		{
+			Set newSet = (Set) Activator.CreateInstance(this.GetType());
+			newSet.AddAll(this);
+			return newSet;
+		}
+
+		/// <summary>
+		/// Copies the elements in the <see cref="Spring.Collections.ISet"/> to
+		/// an array.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The type of array needs to be compatible with the objects in the
+		/// <see cref="Spring.Collections.ISet"/>, obviously.
+		/// </p>
+		/// </remarks>
+		/// <param name="array">
+		/// An array that will be the target of the copy operation.
+		/// </param>
+		/// <param name="index">
+		/// The zero-based index where copying will start.
+		/// </param>
+		public abstract void CopyTo(Array array, int index);
+
+		/// <summary>
+		/// The number of elements currently contained in this collection.
+		/// </summary>
+		public abstract int Count { get; }
+
+		/// <summary>
+		/// Returns <see langword="true"/> if the
+		/// <see cref="Spring.Collections.ISet"/> is synchronized across
+		/// threads.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Note that enumeration is inherently not thread-safe. Use the
+		/// <see cref="SyncRoot"/> to lock the object during enumeration.
+		/// </p>
+		/// </remarks>
+		public abstract bool IsSynchronized { get; }
+
+		/// <summary>
+		/// An object that can be used to synchronize this collection to make
+		/// it thread-safe.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// When implementing this, if your object uses a base object, like an
+		/// <see cref="System.Collections.IDictionary"/>, or anything that has
+		/// a <c>SyncRoot</c>, return that object instead of "<c>this</c>".
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// An object that can be used to synchronize this collection to make
+		/// it thread-safe.
+		/// </value>
+		public abstract object SyncRoot { get; }
+
+		/// <summary>
+		/// Gets an enumerator for the elements in the
+		/// <see cref="Spring.Collections.ISet"/>.
+		/// </summary>
+		/// <returns>
+		/// An <see cref="System.Collections.IEnumerator"/> over the elements
+		/// in the <see cref="Spring.Collections.ISet"/>.
+		/// </returns>
+		public abstract IEnumerator GetEnumerator();
+
+		/// <summary>
+		/// This method will test the <see cref="Spring.Collections.ISet"/>
+		/// against another <see cref="Spring.Collections.ISet"/> for
+		/// "equality".
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// In this case, "equality" means that the two sets contain the same
+		/// elements. The "==" and "!=" operators are not overridden by design.
+		/// If you wish to check for "equivalent"
+		/// <see cref="Spring.Collections.ISet"/> instances, use
+		/// <c>Equals()</c>. If you wish to check to see if two references are
+		/// actually the same object, use "==" and "!=".  
+		/// </p>
+		/// </remarks>
+		/// <param name="obj">
+		/// A <see cref="Spring.Collections.ISet"/> object to compare to.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if the two sets contain the same elements.
+		/// </returns>
+		public override bool Equals(object obj)
+		{
+			Set theOtherSet = obj as Set;
+			if (theOtherSet == null || theOtherSet.Count != Count)
+			{
+				return false;
+			}
+			else
+			{
+				foreach (object element in theOtherSet)
+				{
+					if (!this.Contains(element))
+					{
+						return false;
+					}
+				}
+				return true;
+			}
+		}
+
+		/// <summary>
+		/// Gets the hashcode for the object.
+		/// </summary>
+		public override int GetHashCode()
+		{
+            int hashCode = 0, count = 0;
+            foreach (object element in this)
+            {
+                hashCode += element.GetHashCode();
+                count++;
+            }
+            return count + hashCode;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/SortedSet.cs b/src/Spring/Spring.Core/Collections/SortedSet.cs
new file mode 100644
index 00000000..55bd6558
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/SortedSet.cs
@@ -0,0 +1,79 @@
+/* Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith. */
+
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Implements an <see cref="Spring.Collections.ISet"/> based on a sorted
+	/// tree.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This gives good performance for operations on very large data-sets,
+	/// though not as good - asymptotically - as a
+	/// <see cref="Spring.Collections.HashedSet"/>. However, iteration occurs
+	/// in order.
+	/// </p>
+	/// <p>
+	/// Elements that you put into this type of collection must implement
+	/// <see cref="System.IComparable"/>, and they must actually be comparable.
+	/// You can't mix <see cref="System.String"/> and
+	/// <see cref="System.Int32"/> values, for example.
+	/// </p>
+	/// <p>
+	/// This <see cref="Spring.Collections.ISet"/> implementation does
+	/// <b>not</b> support elements that are <see langword="null"/>.
+	/// </p>
+	/// </remarks>
+	/// <seealso cref="Spring.Collections.ISet"/>
+	/// <version>$Id: SortedSet.cs,v 1.6 2007/03/16 04:01:29 aseovic Exp $</version>
+    [Serializable]
+    public class SortedSet : DictionarySet
+	{
+		/// <summary>
+		/// Creates a new set instance based on a sorted tree.
+		/// </summary>
+		public SortedSet()
+		{
+			InternalDictionary = new SortedList();
+		}
+
+		/// <summary>
+		/// Creates a new set instance based on a sorted tree and initializes
+		/// it based on a collection of elements.
+		/// </summary>
+		/// <param name="initialValues">
+		/// A collection of elements that defines the initial set contents.
+		/// </param>
+		public SortedSet(ICollection initialValues) : this()
+		{
+			this.AddAll(initialValues);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/SynchronizedDictionaryEnumerator.cs b/src/Spring/Spring.Core/Collections/SynchronizedDictionaryEnumerator.cs
new file mode 100644
index 00000000..f6061e71
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/SynchronizedDictionaryEnumerator.cs
@@ -0,0 +1,76 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+namespace Spring.Collections
+{
+    /// <summary>
+    /// Synchronized <see cref="IDictionaryEnumerator"/> that should be returned by synchronized
+    /// dictionary implementations in order to ensure that the enumeration is thread safe.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SynchronizedDictionaryEnumerator.cs,v 1.1 2006/05/03 01:13:41 aseovic Exp $</version>
+    internal class SynchronizedDictionaryEnumerator : SynchronizedEnumerator, IDictionaryEnumerator
+    {
+        public SynchronizedDictionaryEnumerator(object syncRoot, IDictionaryEnumerator enumerator)
+            : base(syncRoot, enumerator)
+        {
+        }
+
+        protected IDictionaryEnumerator Enumerator
+        {
+            get { return (IDictionaryEnumerator) enumerator; }
+        }
+
+        public object Key
+        {
+            get
+            {
+                lock (syncRoot)
+                {
+                    return Enumerator.Key;
+                }
+            }
+        }
+
+        public object Value
+        {
+            get
+            {
+                lock (syncRoot)
+                {
+                    return Enumerator.Value;
+                }
+            }
+        }
+
+        public DictionaryEntry Entry
+        {
+            get
+            {
+                lock (syncRoot)
+                {
+                    return Enumerator.Entry;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/SynchronizedEnumerator.cs b/src/Spring/Spring.Core/Collections/SynchronizedEnumerator.cs
new file mode 100644
index 00000000..5060853b
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/SynchronizedEnumerator.cs
@@ -0,0 +1,69 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+namespace Spring.Collections
+{
+    /// <summary>
+    /// Synchronized <see cref="IEnumerator"/> that should be returned by synchronized
+    /// collections in order to ensure that the enumeration is thread safe.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SynchronizedEnumerator.cs,v 1.1 2006/05/03 01:13:41 aseovic Exp $</version>
+    internal class SynchronizedEnumerator : IEnumerator
+    {
+        protected object syncRoot;
+        protected IEnumerator enumerator;
+
+        public SynchronizedEnumerator(object syncRoot, IEnumerator enumerator)
+        {
+            this.syncRoot = syncRoot;
+            this.enumerator = enumerator;
+        }
+
+        public bool MoveNext()
+        {
+            lock (syncRoot)
+            {
+                return enumerator.MoveNext();
+            }
+        }
+
+        public void Reset()
+        {
+            lock (syncRoot)
+            {
+                enumerator.Reset();
+            }
+        }
+
+        public object Current
+        {
+            get
+            {
+                lock (syncRoot)
+                {
+                    return enumerator.Current;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/SynchronizedHashtable.cs b/src/Spring/Spring.Core/Collections/SynchronizedHashtable.cs
new file mode 100644
index 00000000..4b754c36
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/SynchronizedHashtable.cs
@@ -0,0 +1,367 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using Spring.Util;
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Synchronized <see cref="Hashtable"/> that, unlike hashtable created
+	/// using <see cref="Hashtable.Synchronized"/> method, synchronizes 
+	/// reads from the underlying hashtable in addition to writes.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// In addition to synchronizing reads, this implementation also fixes
+	/// IEnumerator/ICollection issue described at 
+	/// http://msdn.microsoft.com/netframework/programming/breakingchanges/runtime/clr.aspx
+	/// (search for SynchronizedHashtable for issue description), by implementing 
+	/// <see cref="IEnumerator"/> interface explicitly, and returns thread safe enumerator
+	/// implementations as well.
+	/// </p>
+	/// <p>
+	/// This class should be used whenever a truly synchronized <see cref="Hashtable"/>
+	/// is needed.
+	/// </p>
+	/// </remarks>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: SynchronizedHashtable.cs,v 1.2 2007/08/27 13:57:17 oakinger Exp $</version>
+	[Serializable]
+	public class SynchronizedHashtable : IDictionary, ICollection, IEnumerable, ICloneable
+	{
+		private readonly Hashtable _table;
+
+		#region Constructors
+
+		/// <summary>
+		/// Initializes a new instance of <see cref="SynchronizedHashtable"/>
+		/// </summary>
+		public SynchronizedHashtable()
+		{
+			this._table = new Hashtable();
+		}
+
+		/// <summary>
+		/// Initializes a new instance of <see cref="SynchronizedHashtable"/>, copying inital entries from <param name="dictionary"/>.
+		/// </summary>
+		public SynchronizedHashtable(IDictionary dictionary)
+		{
+			AssertUtils.ArgumentNotNull(dictionary, "dictionary");
+			this._table = new Hashtable(dictionary);
+		}
+
+		#endregion
+
+		#region Properties
+
+		///<summary>
+		///Gets a value indicating whether the <see cref="T:System.Collections.IDictionary"></see> object is read-only.
+		///</summary>
+		///<returns>
+		///true if the <see cref="T:System.Collections.IDictionary"></see> object is read-only; otherwise, false.
+		///</returns>
+		public bool IsReadOnly
+		{
+			get
+			{
+				lock (SyncRoot)
+				{
+					return _table.IsReadOnly;
+				}
+			}
+		}
+
+		///<summary>
+		///Gets a value indicating whether the <see cref="T:System.Collections.IDictionary"></see> object has a fixed size.
+		///</summary>
+		///<returns>
+		///true if the <see cref="T:System.Collections.IDictionary"></see> object has a fixed size; otherwise, false.
+		///</returns>
+		public bool IsFixedSize
+		{
+			get
+			{
+				lock (SyncRoot)
+				{
+					return _table.IsFixedSize;
+				}
+			}
+		}
+
+		///<summary>
+		///Gets a value indicating whether access to the <see cref="T:System.Collections.ICollection"></see> is synchronized (thread safe).
+		///</summary>
+		///<returns>
+		///true if access to the <see cref="T:System.Collections.ICollection"></see> is synchronized (thread safe); otherwise, false.
+		///</returns>
+		public bool IsSynchronized
+		{
+			get { return true; }
+		}
+
+		///<summary>
+		///Gets an <see cref="T:System.Collections.ICollection"></see> object containing the keys of the <see cref="T:System.Collections.IDictionary"></see> object.
+		///</summary>
+		///<returns>
+		///An <see cref="T:System.Collections.ICollection"></see> object containing the keys of the <see cref="T:System.Collections.IDictionary"></see> object.
+		///</returns>
+		public ICollection Keys
+		{
+			get
+			{
+				lock (SyncRoot)
+				{
+					return _table.Keys;
+				}
+			}
+		}
+
+		///<summary>
+		///Gets an <see cref="T:System.Collections.ICollection"></see> object containing the values in the <see cref="T:System.Collections.IDictionary"></see> object.
+		///</summary>
+		///<returns>
+		///An <see cref="T:System.Collections.ICollection"></see> object containing the values in the <see cref="T:System.Collections.IDictionary"></see> object.
+		///</returns>
+		public ICollection Values
+		{
+			get
+			{
+				lock (SyncRoot)
+				{
+					return _table.Values;
+				}
+			}
+		}
+
+		///<summary>
+		///Gets an object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"></see>.
+		///</summary>
+		///<returns>
+		///An object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"></see>.
+		///</returns>
+		public object SyncRoot
+		{
+			get { return _table.SyncRoot; }
+		}
+
+		///<summary>
+		///Gets the number of elements contained in the <see cref="T:System.Collections.ICollection"></see>.
+		///</summary>
+		///<returns>
+		///The number of elements contained in the <see cref="T:System.Collections.ICollection"></see>.
+		///</returns>
+		public int Count
+		{
+			get
+			{
+				lock (SyncRoot)
+				{
+					return _table.Count;
+				}
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		///<summary>
+		///Adds an element with the provided key and value to the <see cref="T:System.Collections.IDictionary"></see> object.
+		///</summary>
+		///<param name="value">The <see cref="T:System.Object"></see> to use as the value of the element to add. </param>
+		///<param name="key">The <see cref="T:System.Object"></see> to use as the key of the element to add. </param>
+		///<exception cref="T:System.ArgumentException">An element with the same key already exists in the <see cref="T:System.Collections.IDictionary"></see> object. </exception>
+		///<exception cref="T:System.ArgumentNullException">key is null. </exception>
+		///<exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.IDictionary"></see> is read-only.-or- The <see cref="T:System.Collections.IDictionary"></see> has a fixed size. </exception><filterpriority>2</filterpriority>
+		public void Add(object key, object value)
+		{
+			lock (SyncRoot)
+			{
+				_table.Add(key, value);
+			}
+		}
+
+		///<summary>
+		///Removes all elements from the <see cref="T:System.Collections.IDictionary"></see> object.
+		///</summary>
+		///<exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.IDictionary"></see> object is read-only. </exception><filterpriority>2</filterpriority>
+		public void Clear()
+		{
+			lock (SyncRoot)
+			{
+				_table.Clear();
+			}
+		}
+
+		///<summary>
+		///Creates a new object that is a copy of the current instance.
+		///</summary>
+		///<returns>
+		///A new object that is a copy of this instance.
+		///</returns>
+		public object Clone()
+		{
+			lock (SyncRoot)
+			{
+				return new SynchronizedHashtable(this);
+			}
+		}
+
+		///<summary>
+		///Determines whether the <see cref="T:System.Collections.IDictionary"></see> object contains an element with the specified key.
+		///</summary>
+		///<returns>
+		///true if the <see cref="T:System.Collections.IDictionary"></see> contains an element with the key; otherwise, false.
+		///</returns>
+		///<param name="key">The key to locate in the <see cref="T:System.Collections.IDictionary"></see> object.</param>
+		///<exception cref="T:System.ArgumentNullException">key is null. </exception><filterpriority>2</filterpriority>
+		public bool Contains(object key)
+		{
+			lock (SyncRoot)
+			{
+				return _table.Contains(key);
+			}
+		}
+
+		///<summary>
+		/// Returns, whether this <see cref="IDictionary"/> contains an entry with the specified <paramref name="key"/>.
+		///</summary>
+		///<param name="key">The key to look for</param>
+		///<returns><see lang="true"/>, if this <see cref="IDictionary"/> contains an entry with this <paramref name="key"/></returns>
+		public bool ContainsKey(object key)
+		{
+			lock (SyncRoot)
+			{
+				return _table.ContainsKey(key);
+			}
+		}
+
+		///<summary>
+		/// Returns, whether this <see cref="IDictionary"/> contains an entry with the specified <paramref name="value"/>.
+		///</summary>
+		///<param name="value">The valúe to look for</param>
+		///<returns><see lang="true"/>, if this <see cref="IDictionary"/> contains an entry with this <paramref name="value"/></returns>
+		public bool ContainsValue(object value)
+		{
+			lock (SyncRoot)
+			{
+				return _table.ContainsValue(value);
+			}
+		}
+
+		///<summary>
+		///Copies the elements of the <see cref="T:System.Collections.ICollection"></see> to an <see cref="T:System.Array"></see>, starting at a particular <see cref="T:System.Array"></see> index.
+		///</summary>
+		///<param name="array">The one-dimensional <see cref="T:System.Array"></see> that is the destination of the elements copied from <see cref="T:System.Collections.ICollection"></see>. The <see cref="T:System.Array"></see> must have zero-based indexing. </param>
+		///<param name="index">The zero-based index in array at which copying begins. </param>
+		///<exception cref="T:System.ArgumentNullException">array is null. </exception>
+		///<exception cref="T:System.ArgumentException">The type of the source <see cref="T:System.Collections.ICollection"></see> cannot be cast automatically to the type of the destination array. </exception>
+		///<exception cref="T:System.ArgumentOutOfRangeException">index is less than zero. </exception>
+		///<exception cref="T:System.ArgumentException">array is multidimensional.-or- index is equal to or greater than the length of array.-or- The number of elements in the source <see cref="T:System.Collections.ICollection"></see> is greater than the available space from index to the end of the destination array. </exception><filterpriority>2</filterpriority>
+		public void CopyTo(Array array, int index)
+		{
+			lock (SyncRoot)
+			{
+				_table.CopyTo(array, index);
+			}
+		}
+
+		///<summary>
+		///Returns an <see cref="T:System.Collections.IDictionaryEnumerator"></see> object for the <see cref="T:System.Collections.IDictionary"></see> object.
+		///</summary>
+		///<returns>
+		///An <see cref="T:System.Collections.IDictionaryEnumerator"></see> object for the <see cref="T:System.Collections.IDictionary"></see> object.
+		///</returns>
+		public IDictionaryEnumerator GetEnumerator()
+		{
+			lock (SyncRoot)
+			{
+				return new SynchronizedDictionaryEnumerator(SyncRoot, _table.GetEnumerator());
+			}
+		}
+
+		///<summary>
+		///Removes the element with the specified key from the <see cref="T:System.Collections.IDictionary"></see> object.
+		///</summary>
+		///<param name="key">The key of the element to remove. </param>
+		///<exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.IDictionary"></see> object is read-only.-or- The <see cref="T:System.Collections.IDictionary"></see> has a fixed size. </exception>
+		///<exception cref="T:System.ArgumentNullException">key is null. </exception><filterpriority>2</filterpriority>
+		public void Remove(object key)
+		{
+			lock (SyncRoot)
+			{
+				_table.Remove(key);
+			}
+		}
+
+		#endregion
+
+		#region IEnumerable implementation
+
+		///<summary>
+		///Returns an enumerator that iterates through a collection.
+		///</summary>
+		///<returns>
+		///An <see cref="T:System.Collections.IEnumerator"></see> object that can be used to iterate through the collection.
+		///</returns>
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			lock (SyncRoot)
+			{
+				return new SynchronizedEnumerator(SyncRoot, ((IEnumerable) _table).GetEnumerator());
+			}
+		}
+
+		#endregion
+
+		#region Indexer
+
+		///<summary>
+		///Gets or sets the element with the specified key.
+		///</summary>
+		///<returns>
+		///The element with the specified key.
+		///</returns>
+		///<param name="key">The key of the element to get or set. </param>
+		///<exception cref="T:System.NotSupportedException">The property is set and the <see cref="T:System.Collections.IDictionary"></see> object is read-only.-or- The property is set, key does not exist in the collection, and the <see cref="T:System.Collections.IDictionary"></see> has a fixed size. </exception>
+		///<exception cref="T:System.ArgumentNullException">key is null. </exception><filterpriority>2</filterpriority>
+		public object this[object key]
+		{
+			get
+			{
+				lock (SyncRoot)
+				{
+					return _table[key];
+				}
+			}
+			set
+			{
+				lock (SyncRoot)
+				{
+					_table[key] = value;
+				}
+			}
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Collections/SynchronizedSet.cs b/src/Spring/Spring.Core/Collections/SynchronizedSet.cs
new file mode 100644
index 00000000..cfc216c5
--- /dev/null
+++ b/src/Spring/Spring.Core/Collections/SynchronizedSet.cs
@@ -0,0 +1,331 @@
+/* Copyright © 2002-2004 by Aidant Systems, Inc., and by Jason Smith. */
+
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports 
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Implements a thread-safe <see cref="Spring.Collections.ISet"/> wrapper.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The implementation is extremely conservative, serializing critical
+	/// sections to prevent possible deadlocks, and locking on everything. The
+	/// one exception is for enumeration, which is inherently not thread-safe.
+	/// For this, you have to <c>lock</c> the <c>SyncRoot</c> object for the
+	/// duration of the enumeration.
+	/// </p>
+	/// </remarks>
+	/// <seealso cref="Spring.Collections.ISet"/>
+	/// <version>$Id: SynchronizedSet.cs,v 1.6 2007/03/16 04:01:29 aseovic Exp $</version>
+    [Serializable]
+    public sealed class SynchronizedSet : Set
+	{
+		private ISet _mBasisSet;
+		private object _mSyncRoot;
+
+		/// <summary>
+		/// Constructs a thread-safe <see cref="Spring.Collections.ISet"/>
+		/// wrapper.
+		/// </summary>
+		/// <param name="basisSet">
+		/// The <see cref="Spring.Collections.ISet"/> object that this object
+		/// will wrap.
+		/// </param>
+		/// <exception cref="System.NullReferenceException">
+		/// If the supplied <paramref name="basisSet"/> ecposes a
+		/// <see langword="null"/> <c>SyncRoot</c> value.
+		/// </exception>
+		public SynchronizedSet(ISet basisSet)
+		{
+			_mBasisSet = basisSet;
+			_mSyncRoot = basisSet.SyncRoot;
+			if (_mSyncRoot == null)
+			{
+				throw new NullReferenceException(
+					"The Set you specified returned a null SyncRoot.");
+			}
+		}
+
+		/// <summary>
+		/// Adds the specified element to this set if it is not already present.
+		/// </summary>
+		/// <param name="element">The object to add to the set.</param>
+		/// <returns>
+		/// <see langword="true"/> is the object was added,
+		/// <see langword="true"/> if the object was already present.
+		/// </returns>
+		public override sealed bool Add(object element)
+		{
+			lock (_mSyncRoot)
+			{
+				return _mBasisSet.Add(element);
+			}
+		}
+
+		/// <summary>
+		/// Adds all the elements in the specified collection to the set if
+		/// they are not already present.
+		/// </summary>
+		/// <param name="collection">A collection of objects to add to the set.</param>
+		/// <returns>
+		/// <see langword="true"/> is the set changed as a result of this
+		/// operation.
+		/// </returns>
+		public override sealed bool AddAll(ICollection collection)
+		{
+			if(collection == null) 
+			{
+				return false;
+			}
+			Set temp;
+			lock (collection.SyncRoot)
+			{
+				temp = new HybridSet(collection);
+			}
+			lock (_mSyncRoot)
+			{
+				return _mBasisSet.AddAll(temp);
+			}
+		}
+
+		/// <summary>
+		/// Removes all objects from this set.
+		/// </summary>
+		public override sealed void Clear()
+		{
+			lock (_mSyncRoot)
+			{
+				_mBasisSet.Clear();
+			}
+		}
+
+		/// <summary>
+		/// Returns <see langword="true"/> if this set contains the specified
+		/// element.
+		/// </summary>
+		/// <param name="element">The element to look for.</param>
+		/// <returns>
+		/// <see langword="true"/> if this set contains the specified element.
+		/// </returns>
+		public override sealed bool Contains(object element)
+		{
+			lock (_mSyncRoot)
+			{
+				return _mBasisSet.Contains(element);
+			}
+		}
+
+		/// <summary>
+		/// Returns <see langword="true"/> if the set contains all the
+		/// elements in the specified collection.
+		/// </summary>
+		/// <param name="collection">A collection of objects.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set contains all the elements in the
+		/// specified collection; also <see langword="false"/> if the
+		/// supplied <paramref name="collection"/> is <see langword="null"/>.
+		/// </returns>
+		public override sealed bool ContainsAll(ICollection collection)
+		{
+			if(collection == null) 
+			{
+				return false;
+			}
+			Set temp;
+			lock (collection.SyncRoot)
+			{
+				temp = new HybridSet(collection);
+			}
+			lock (_mSyncRoot)
+			{
+				return _mBasisSet.ContainsAll(temp);
+			}
+		}
+
+		/// <summary>
+		/// Returns <see langword="true"/> if this set contains no elements.
+		/// </summary>
+		public override sealed bool IsEmpty
+		{
+			get
+			{
+				lock (_mSyncRoot)
+				{
+					return _mBasisSet.IsEmpty;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Removes the specified element from the set.
+		/// </summary>
+		/// <param name="element">The element to be removed.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set contained the specified element.
+		/// </returns>
+		public override sealed bool Remove(object element)
+		{
+			lock (_mSyncRoot)
+			{
+				return _mBasisSet.Remove(element);
+			}
+		}
+
+		/// <summary>
+		/// Remove all the specified elements from this set, if they exist in
+		/// this set.
+		/// </summary>
+		/// <param name="collection">A collection of elements to remove.</param>
+		/// <returns>
+		/// <see langword="true"/> if the set was modified as a result of this
+		/// operation.
+		/// </returns>
+		public override sealed bool RemoveAll(ICollection collection)
+		{
+			Set temp;
+			lock (collection.SyncRoot)
+			{
+				temp = new HybridSet(collection);
+			}
+			lock (_mSyncRoot)
+			{
+				return _mBasisSet.RemoveAll(temp);
+			}
+		}
+
+		/// <summary>
+		/// Retains only the elements in this set that are contained in the
+		/// specified collection.
+		/// </summary>
+		/// <param name="c">
+		/// The collection that defines the set of elements to be retained.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if this set changed as a result of this
+		/// operation.
+		/// </returns>
+		public override sealed bool RetainAll(ICollection c)
+		{
+			Set temp;
+			lock (c.SyncRoot)
+			{
+				temp = new HybridSet(c);
+			}
+			lock (_mSyncRoot)
+			{
+				return _mBasisSet.RetainAll(temp);
+			}
+		}
+
+		/// <summary>
+		/// Copies the elements in the <see cref="Spring.Collections.ISet"/> to
+		/// an array.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The type of array needs to be compatible with the objects in the
+		/// <see cref="Spring.Collections.ISet"/>, obviously.
+		/// </p>
+		/// </remarks>
+		/// <param name="array">
+		/// An array that will be the target of the copy operation.
+		/// </param>
+		/// <param name="index">
+		/// The zero-based index where copying will start.
+		/// </param>
+		public override sealed void CopyTo(Array array, int index)
+		{
+			lock (_mSyncRoot)
+			{
+				_mBasisSet.CopyTo(array, index);
+			}
+		}
+
+		/// <summary>
+		/// The number of elements currently contained in this collection.
+		/// </summary>
+		public override sealed int Count
+		{
+			get
+			{
+				lock (_mSyncRoot)
+				{
+					return _mBasisSet.Count;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Returns <see langword="true"/> if the
+		/// <see cref="Spring.Collections.ISet"/> is synchronized across
+		/// threads.
+		/// </summary>
+		/// <seealso cref="Spring.Collections.Set.IsSynchronized"/>
+		public override sealed bool IsSynchronized
+		{
+			get { return true; }
+		}
+
+		/// <summary>
+		/// An object that can be used to synchronize this collection to make
+		/// it thread-safe.
+		/// </summary>
+		/// <value>
+		/// An object that can be used to synchronize this collection to make
+		/// it thread-safe.
+		/// </value>
+		/// <seealso cref="Spring.Collections.Set.SyncRoot"/>
+		public override sealed object SyncRoot
+		{
+			get { return _mSyncRoot; }
+		}
+
+		/// <summary>
+		/// Gets an enumerator for the elements in the
+		/// <see cref="Spring.Collections.ISet"/>.
+		/// </summary>
+		/// <returns>
+		/// An <see cref="System.Collections.IEnumerator"/> over the elements
+		/// in the <see cref="Spring.Collections.ISet"/>.
+		/// </returns>
+		public override sealed IEnumerator GetEnumerator()
+		{
+			return _mBasisSet.GetEnumerator();
+		}
+
+		/// <summary>
+		/// Returns a clone of the <see cref="Spring.Collections.ISet"/> instance.  
+		/// </summary>
+		/// <returns>A clone of this object.</returns>
+		public override object Clone()
+		{
+			return new SynchronizedSet((ISet) _mBasisSet.Clone());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/ApplicationContextException.cs b/src/Spring/Spring.Core/Context/ApplicationContextException.cs
new file mode 100644
index 00000000..d57d1bdb
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/ApplicationContextException.cs
@@ -0,0 +1,87 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Context
+{
+    /// <summary>Exception thrown during application context initialization.</summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ApplicationContextException.cs,v 1.5 2006/04/09 07:18:38 markpollack Exp $</version>
+    [Serializable]
+    public class ApplicationContextException : FatalObjectException
+    {
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.ApplicationContextException"/> class.
+		/// </summary>
+		public ApplicationContextException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.ApplicationContextException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected ApplicationContextException( SerializationInfo info, StreamingContext context )
+			: base( info, context ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.ApplicationContextException"/> class with the
+		/// specified message.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+        public ApplicationContextException(string message) : base(message)
+        {
+        }
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.ApplicationContextException"/> class with the
+		/// specified message.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+        public ApplicationContextException(string message, Exception rootCause)
+			: base(message, rootCause)
+        {
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Context/ApplicationEventArgs.cs b/src/Spring/Spring.Core/Context/ApplicationEventArgs.cs
new file mode 100644
index 00000000..99e51ecc
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/ApplicationEventArgs.cs
@@ -0,0 +1,71 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace Spring.Context
+{
+	/// <summary>
+	/// Encapsulates the data associated with an event raised by an
+	/// <see cref="Spring.Context.IApplicationContext"/>.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <seealso cref="Spring.Context.IApplicationEventListener"/>
+	/// <version>$Id: ApplicationEventArgs.cs,v 1.5 2006/04/09 07:18:38 markpollack Exp $</version>
+	[Serializable]
+	public class ApplicationEventArgs : EventArgs
+	{
+		private const long TicksAtEpoch = 621355968000000000;
+		private DateTime _timestamp;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.ApplicationEventArgs"/> class.
+		/// </summary>
+		public ApplicationEventArgs()
+		{
+			_timestamp = DateTime.Now;
+		}
+
+		/// <summary>
+		/// The date and time when the event occured.
+		/// </summary>
+		/// <value>
+		/// The date and time when the event occured.
+		/// </value>
+		public DateTime TimeStamp
+		{
+			get { return _timestamp; }
+		}
+
+		/// <summary>
+		/// The system time in milliseconds when the event happened.
+		/// </summary>
+		/// <value>
+		/// The system time in milliseconds when the event happened.
+		/// </value>
+		public long EventTimeMilliseconds 
+		{
+			get { return ( _timestamp.Ticks - TicksAtEpoch ) / 10000; }
+		}
+	}
+}
diff --git a/src/Spring/Spring.Core/Context/EventListenerAttribute.cs b/src/Spring/Spring.Core/Context/EventListenerAttribute.cs
new file mode 100644
index 00000000..86c8d0b4
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/EventListenerAttribute.cs
@@ -0,0 +1,44 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Context
+{
+	/// <summary>
+	/// Marks an interface as being an application event listener.
+	/// </summary>
+	/// <author>Griffin Caprio</author>
+	/// <version>$Id: EventListenerAttribute.cs,v 1.5 2006/04/09 07:18:38 markpollack Exp $</version>
+	/// <see cref="Spring.Context.IApplicationEventListener"/>
+	[AttributeUsage(AttributeTargets.Interface)]
+	public sealed class EventListenerAttribute : Attribute
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.EventListenerAttribute"/> class.
+		/// </summary>
+		public EventListenerAttribute() {}
+	}
+}
diff --git a/src/Spring/Spring.Core/Context/Events/ConsoleListener.cs b/src/Spring/Spring.Core/Context/Events/ConsoleListener.cs
new file mode 100644
index 00000000..fb050fc3
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Events/ConsoleListener.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Context.Events
+{
+	/// <summary>
+	/// Simple listener that logs application events to the console.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Intended for use during debugging only.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: ConsoleListener.cs,v 1.6 2006/04/09 07:18:38 markpollack Exp $</version>
+	/// <seealso cref="Spring.Context.IApplicationEventListener"/>
+	public sealed class ConsoleListener : IApplicationEventListener
+	{
+		/// <summary>
+		/// Creates a new instance of the 
+		/// <see cref="Spring.Context.Events.ConsoleListener"/> class.
+		/// </summary>
+		public ConsoleListener()
+		{
+		}
+
+		/// <summary>
+		/// Handle an application event.
+		/// </summary>
+		/// <param name="sender">
+		/// The source of the event.
+		/// </param>
+		/// <param name="e">
+		/// The event that is to be handled.
+		/// </param>
+		public void HandleApplicationEvent(object sender, ApplicationEventArgs e)
+		{
+			Console.WriteLine("Source      : " + sender);
+			Console.WriteLine("Event fired : " + e.TimeStamp);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Events/ContextEventArgs.cs b/src/Spring/Spring.Core/Context/Events/ContextEventArgs.cs
new file mode 100644
index 00000000..5f06af9a
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Events/ContextEventArgs.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Globalization;
+
+namespace Spring.Context.Events
+{
+	/// <summary>
+	/// Event object sent to listeners registered with an
+	/// <see cref="Spring.Context.IApplicationContext"/> to inform them of
+	/// context lifecycle events.
+	/// </summary>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: ContextEventArgs.cs,v 1.8 2007/07/31 08:18:11 markpollack Exp $</version>
+	/// <seealso cref="Spring.Context.IApplicationContext"/>
+	/// <seealso cref="Spring.Context.IApplicationEventListener"/>
+	/// <seealso cref="Spring.Context.EventListenerAttribute"/>
+	public class ContextEventArgs : ApplicationEventArgs
+	{
+		/// <summary>
+		/// The various context event types.
+		/// </summary>
+		public enum ContextEvent
+		{
+			/// <summary>
+			/// The event type when the context is refreshed or created.
+			/// </summary>
+			Refreshed,
+
+			/// <summary>
+			/// The event type when the context is closed.
+			/// </summary>
+			Closed
+		} ;
+
+		private ContextEvent _contextEvent;
+
+		/// <summary>
+		/// Creates a new instance of the ContextEventArgs class to represent the
+		/// supplied context event.
+		/// </summary>
+		/// <param name="e">The type of context event.</param>
+		public ContextEventArgs(ContextEvent e)
+		{
+			_contextEvent = e;
+		}
+
+		/// <summary>
+		/// The event type.
+		/// </summary>
+		public ContextEvent Event
+		{
+			get { return _contextEvent; }
+		}
+
+		/// <summary>
+		/// Returns a string representation of this object.
+		/// </summary>
+		/// <returns>A string representation of this object.</returns>
+		public override string ToString()
+		{
+			return string.Format(
+				CultureInfo.InvariantCulture,
+				"{0} [{1}]", GetType().Name, Event);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/IApplicationContext.cs b/src/Spring/Spring.Core/Context/IApplicationContext.cs
new file mode 100644
index 00000000..fc745fb1
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/IApplicationContext.cs
@@ -0,0 +1,164 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using Spring.Core.IO;
+using Spring.Objects.Events;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Context
+{
+	/// <summary>
+	/// The central interface to Spring.NET's IoC container.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// <see cref="Spring.Context.IApplicationContext"/> implementations
+	/// provide:
+	/// <list type="bullet">
+	/// <item>
+	/// <description>
+	/// Object factory functionality inherited from the
+	/// <see cref="Spring.Objects.Factory.IListableObjectFactory"/>
+	/// and <see cref="Spring.Objects.Factory.IHierarchicalObjectFactory"/>
+	/// interfaces.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// The ability to resolve messages, supporting internationalization.
+	/// Inherited from the <see cref="Spring.Context.IMessageSource"/>
+	/// interface.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// The ability to load file resources in a generic fashion.
+	/// Inherited from the <see cref="Spring.Core.IO.IResourceLoader"/>
+	/// interface.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// Acts an an event registry for supporting loosely coupled eventing
+	/// between objecs. Inherited from the
+	/// <see cref="Spring.Objects.Events.IEventRegistry"/> interface.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// The ability to raise events related to the context lifecycle. Inherited
+	/// from the <see cref="Spring.Context.IApplicationEventPublisher"/>
+	/// interface.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// Inheritance from a parent context. Definitions in a descendant context
+	/// will always take priority.
+	/// </description>
+	/// </item>
+	/// </list>
+	/// </p>
+	/// <p>
+	/// In addition to standard object factory lifecycle capabilities,
+	/// <see cref="Spring.Context.IApplicationContext"/> implementations need
+	/// to detect
+	/// <see cref="Spring.Context.IApplicationContextAware"/>,
+	/// <see cref="Spring.Objects.Events.IEventRegistryAware"/>, and
+	/// <see cref="Spring.Context.IMessageSourceAware"/> objects and supply
+	/// their attendant dependencies accordingly.
+	/// </p>
+	/// <p>
+	/// This interface is the central client interface in Spring.NET's IoC
+	/// container implementation. As such it does inherit a quite sizeable
+	/// number of interfaces; implementations are strongly encouraged to use
+	/// composition to satisfy each of the inherited interfaces (where
+	/// appropriate of course).
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <seealso cref="Spring.Context.Support.AbstractApplicationContext"/>
+	/// <seealso cref="Spring.Context.Support.XmlApplicationContext"/>
+	/// <seealso cref="Spring.Context.Support.DelegatingMessageSource"/>
+	/// <seealso cref="Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>
+	/// <version>$Id: IApplicationContext.cs,v 1.15 2007/08/08 17:46:37 bbaia Exp $</version>
+	public interface IApplicationContext
+		: IListableObjectFactory, IHierarchicalObjectFactory, IMessageSource,
+			IApplicationEventPublisher, IResourceLoader, IEventRegistry, IDisposable
+	{
+		/// <summary>
+		/// Raised in response to an application context event.
+		/// </summary>
+		event ApplicationEventHandler ContextEvent;
+
+		/// <summary>
+		/// Returns the date and time this context was loaded.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is to be set immediately after an 
+		/// <see cref="Spring.Context.IApplicationContext"/> has been
+		/// instantiated and its configuration has been loaded. Implementations
+		/// are permitted to update this value if the context is reset or
+		/// refreshed in some way.
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// The <see cref="System.DateTime"/> representing when this context
+		/// was loaded.
+		/// </returns>
+		/// <seealso cref="Spring.Context.IConfigurableApplicationContext.Refresh"/>
+		DateTime StartupDate { get; }
+
+		/// <summary>
+		/// Gets the parent context, or <see langword="null"/> if there is no
+		/// parent context.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If the parent context is <see langword="null"/>, then this context
+		/// is the root of any context hierarchy.
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// The parent context, or <see langword="null"/>  if there is no
+		/// parent.
+		/// </returns>
+		IApplicationContext ParentContext { get; }
+
+		/// <summary>
+		/// Gets and sets a name for this context.
+		/// </summary>
+		/// <returns>
+		/// A name for this context.
+		/// </returns>
+		string Name { get; set; }
+
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/IApplicationContextAware.cs b/src/Spring/Spring.Core/Context/IApplicationContextAware.cs
new file mode 100644
index 00000000..f82fe311
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/IApplicationContextAware.cs
@@ -0,0 +1,99 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Context
+{
+    /// <summary>
+    /// To be implemented by any object that wishes to be notified
+    /// of the <see cref="Spring.Context.IApplicationContext"/> that it runs in.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Implementing this interface makes sense when an object requires access
+    /// to a set of collaborating objects. Note that configuration via object
+    /// references is preferable to implementing this interface just for object
+    /// lookup purposes.
+    /// </p>
+    /// <p>
+    /// This interface can also be implemented if an object needs access to
+    /// file resources, i.e. wants to call
+    /// <see cref="Spring.Core.IO.IResourceLoader.GetResource"/>, or access to
+    /// the <see cref="Spring.Context.IMessageSource"/>. However, it is
+    /// preferable to implement the more specific
+    /// <see cref="Spring.Context.IResourceLoaderAware"/>
+    /// interface to receive a reference to the
+    /// <see cref="Spring.Context.IMessageSource"/> object in that scenario.
+    /// </p>
+    /// <p>
+    /// Note that <see cref="Spring.Core.IO.IResource"/> dependencies can also
+    /// be exposed as object properties of the
+    /// <see cref="Spring.Core.IO.IResource"/> type, populated via strings with
+    /// automatic type conversion performed by an object factory. This obviates
+    /// the need for implementing any callback interface just for the purpose
+    /// of accessing a specific file resource.
+    /// </p>
+    /// <p>
+    /// <see cref="Spring.Context.Support.ApplicationObjectSupport"/>
+    /// is a convenience implementation of this interface for your
+    /// application objects.
+    /// </p>
+    /// <p>
+    /// For a list of all object lifecycle methods, see the overview for the 
+    /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: IApplicationContextAware.cs,v 1.8 2007/08/08 17:46:37 bbaia Exp $</version>
+    /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+    /// <see cref="Spring.Objects.Factory.IInitializingObject"/>
+    /// <see cref="Spring.Objects.Factory.IObjectFactory"/>
+    /// <version>$Id: IApplicationContextAware.cs,v 1.8 2007/08/08 17:46:37 bbaia Exp $</version>
+    public interface IApplicationContextAware
+    {
+    	/// <summary>
+    	/// Set the <see cref="Spring.Context.IApplicationContext"/> that this
+    	/// object runs in.
+    	/// </summary>
+    	/// <remarks>
+    	/// <p>
+    	/// Normally this call will be used to initialize the object.
+    	/// </p>
+    	/// <p>
+    	/// Invoked after population of normal object properties but before an
+    	/// init callback such as
+    	/// <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+    	/// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+    	/// or a custom init-method. Invoked after the setting of any
+    	/// <see cref="Spring.Context.IResourceLoaderAware"/>'s
+    	/// <see cref="Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+    	/// property.
+    	/// </p>
+    	/// </remarks>
+    	/// <exception cref="Spring.Context.ApplicationContextException">
+    	/// In the case of application context initialization errors.
+    	/// </exception>
+    	/// <exception cref="Spring.Objects.ObjectsException">
+    	/// If thrown by any application context methods.
+    	/// </exception>
+    	/// <exception cref="Spring.Objects.Factory.ObjectInitializationException"/>
+    	IApplicationContext ApplicationContext { set; get; }
+    }
+}
diff --git a/src/Spring/Spring.Core/Context/IApplicationEventListener.cs b/src/Spring/Spring.Core/Context/IApplicationEventListener.cs
new file mode 100644
index 00000000..d6d65803
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/IApplicationEventListener.cs
@@ -0,0 +1,48 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Context
+{
+	/// <summary>
+	/// The callback for application events.
+	/// </summary>
+	public delegate void ApplicationEventHandler(object sender, ApplicationEventArgs e);
+
+	/// <summary>
+	/// A listener for application events.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: IApplicationEventListener.cs,v 1.2 2006/04/09 07:18:38 markpollack Exp $</version>
+	[EventListener]
+	public interface IApplicationEventListener
+	{
+		/// <summary>
+		/// Handle an application event.
+		/// </summary>
+		/// <param name="sender">
+		/// The source of the event.
+		/// </param>
+		/// <param name="e">
+		/// The event that is to be handled.
+		/// </param>
+		void HandleApplicationEvent(object sender, ApplicationEventArgs e);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/IApplicationEventPublisher.cs b/src/Spring/Spring.Core/Context/IApplicationEventPublisher.cs
new file mode 100644
index 00000000..c8fc9941
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/IApplicationEventPublisher.cs
@@ -0,0 +1,48 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Context {
+
+	/// <summary>
+	/// Encapsulates event publication functionality.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Serves as a super-interface for the
+	/// <see cref="Spring.Context.IApplicationContext"/> interface.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: IApplicationEventPublisher.cs,v 1.2 2006/04/09 07:18:38 markpollack Exp $</version>
+	public interface IApplicationEventPublisher 
+    {
+		/// <summary>
+		/// Publishes an application context event.
+		/// </summary>
+		/// <param name="sender">
+		/// The source of the event. May be <see langword="null"/>.
+		/// </param>
+		/// <param name="e">
+		/// The event that is to be raised.
+		/// </param>
+		void PublishEvent(object sender, ApplicationEventArgs e);
+	}
+}
diff --git a/src/Spring/Spring.Core/Context/IConfigurableApplicationContext.cs b/src/Spring/Spring.Core/Context/IConfigurableApplicationContext.cs
new file mode 100644
index 00000000..f9fc53fb
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/IConfigurableApplicationContext.cs
@@ -0,0 +1,132 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Context
+{
+    /// <summary>
+    /// Provides the means to configure an application context in addition to
+    /// the methods exposed on the
+    /// <see cref="Spring.Context.IApplicationContext"/> interface.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This interface is to be implemented by most (if not all)
+    /// <see cref="Spring.Context.IApplicationContext"/> implementations.
+    /// </p>
+    /// <p>
+    /// Configuration and lifecycle methods are encapsulated here to avoid
+    /// making them obvious to <see cref="Spring.Context.IApplicationContext"/>
+    /// client code.
+    /// </p>
+    /// <p>
+    /// Calling <see cref="System.IDisposable.Dispose()"/> will close this
+    /// application context, releasing all resources and locks that the
+    /// implementation might hold. This includes disposing all cached
+    /// <b>singleton</b> objects.
+    /// </p>
+    /// <note type="caution">
+    /// <see cref="System.IDisposable.Dispose()"/> does <i>not</i> invoke the
+    /// attendant <see cref="System.IDisposable.Dispose()"/> on any parent
+    /// context.
+    /// </note>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: IConfigurableApplicationContext.cs,v 1.10 2006/04/09 07:18:38 markpollack Exp $</version>
+    /// <seealso cref="System.IDisposable"/>
+    /// <seealso cref="Spring.Context.IApplicationContext"/>
+    public interface IConfigurableApplicationContext : IApplicationContext
+    {
+        /// <summary>
+        /// Return the internal object factory of this application context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Can be used to access specific functionality of the factory.
+        /// </p>
+        /// <note type="caution">
+        /// This is just guaranteed to return an instance that is not 
+        /// <see langword="null"/> <i>after</i> the context has been refreshed
+        /// at least once.
+        /// </note>
+        /// <note type="caution">
+        /// Do not use this to post-process the object factory; singletons
+        /// will already have been instantiated. Use an
+        /// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+        /// to intercept the object factory setup process before objects even
+        /// get touched.
+        /// </note>
+        /// </remarks>
+        /// <seealso cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+        IConfigurableListableObjectFactory ObjectFactory { get; }
+
+        /// <summary>
+        /// Add an
+        /// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+        /// that will get applied to the internal object factory of this
+        /// application context on refresh, before any of the object
+        /// definitions are evaluated.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// To be invoked during context configuration.
+        /// </p>
+        /// </remarks>
+        /// <param name="objectFactoryPostProcessor">
+        /// The factory processor to register.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+        void AddObjectFactoryPostProcessor(
+            IObjectFactoryPostProcessor objectFactoryPostProcessor);
+
+        /// <summary>
+        /// Load or refresh the persistent representation of the configuration,
+        /// which might an XML file, properties file, or relational database schema.
+        /// </summary>
+        /// <exception cref="Spring.Context.ApplicationContextException">
+        /// If the configuration cannot be loaded.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object factory could not be initialized.
+        /// </exception>
+        void Refresh();
+
+        /// <summary>
+        /// Sets the parent of this application context.
+        /// </summary>
+        /// <remarks>
+        /// <note>
+        /// The parent should <b>not</b> be changed: it should only be set
+        /// outside a constructor if it isn't available when an instance of
+        /// this class is created.
+        /// </note>
+        /// </remarks>
+        /// <value>
+        /// The parent context.
+        /// </value>
+        new IApplicationContext ParentContext { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/IHierarchicalMessageSource.cs b/src/Spring/Spring.Core/Context/IHierarchicalMessageSource.cs
new file mode 100644
index 00000000..e28c1654
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/IHierarchicalMessageSource.cs
@@ -0,0 +1,46 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Context
+{
+	/// <summary>
+	/// Sub-interface of <see cref="Spring.Context.IMessageSource"/> to be
+	/// implemented by objects that can resolve messages hierarchically.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IHierarchicalMessageSource.cs,v 1.6 2006/04/09 07:18:38 markpollack Exp $</version>
+	/// <seealso cref="Spring.Context.IMessageSource"/>
+	public interface IHierarchicalMessageSource : IMessageSource
+	{
+		/// <summary>
+		/// The parent message source used to try and resolve messages that
+		/// this object can't resolve.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If the value of this property is <see langword="null"/> then no
+		/// further resolution is possible.
+		/// </p>
+		/// </remarks>
+		IMessageSource ParentMessageSource { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/IMessageSource.cs b/src/Spring/Spring.Core/Context/IMessageSource.cs
new file mode 100644
index 00000000..b87cf616
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/IMessageSource.cs
@@ -0,0 +1,308 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Globalization;
+
+namespace Spring.Context {
+    /// <summary>
+    /// Describes an object that can resolve messages.
+    /// </summary>
+    /// <remarks>
+    /// <p> 
+    /// This enables the parameterization and internationalization of messages.
+    /// </p>
+    /// <p>
+    /// Spring.NET provides one out-of-the-box implementation for production
+    /// use:
+    /// <ul>
+    /// <li><see cref="Spring.Context.Support.ResourceSetMessageSource"/>.</li>
+    /// </ul>
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: IMessageSource.cs,v 1.13 2007/07/02 21:24:39 markpollack Exp $</version>
+    /// <seealso cref="Spring.Context.Support.ResourceSetMessageSource"/>
+    public interface IMessageSource {
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the lookup is not successful, implementations are permitted to
+        /// take one of two actions.
+        /// </p>
+        /// <list type="bullet">
+        /// <item>
+        /// <description>Throw an exception.</description>
+        /// </item>
+        /// <item>
+        /// <description>
+        /// Return the supplied <paramref name="name"/> as is.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        string GetMessage(string name);
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the lookup is not successful, implementations are permitted to
+        /// take one of two actions.
+        /// </p>
+        /// <list type="bullet">
+        /// <item>
+        /// <description>Throw an exception.</description>
+        /// </item>
+        /// <item>
+        /// <description>
+        /// Return the supplied <paramref name="name"/> as is.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="arguments">
+        /// The array of arguments that will be filled in for parameters within
+        /// the message, or <see langword="null"/> if there are no parameters
+        /// within the message. Parameters within a message should be
+        /// referenced using the same syntax as the format string for the
+        /// <see cref="System.String.Format(string,object[])"/> method.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        string GetMessage(string name, params object[] arguments);
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <remarks>
+        /// Note that the fallback behavior based on CultureInfo seem to 
+        /// have a bug that is fixed by installed .NET 1.1 Service Pack 1.  
+        /// <p>
+        /// If the lookup is not successful, implementations are permitted to
+        /// take one of two actions.
+        /// </p>
+        /// <list type="bullet">
+        /// <item>
+        /// <description>Throw an exception.</description>
+        /// </item>
+        /// <item>
+        /// <description>
+        /// Return the supplied <paramref name="name"/> as is.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        string GetMessage(string name, CultureInfo culture);
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <remarks>
+        /// Note that the fallback behavior based on CultureInfo seem to 
+        /// have a bug that is fixed by installed .NET 1.1 Service Pack 1.      
+        /// <p>
+        /// If the lookup is not successful, implementations are permitted to
+        /// take one of two actions.
+        /// </p>
+        /// <list type="bullet">
+        /// <item>
+        /// <description>Throw an exception.</description>
+        /// </item>
+        /// <item>
+        /// <description>
+        /// Return the supplied <paramref name="name"/> as is.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.
+        /// </param>
+        /// <param name="arguments">
+        /// The array of arguments that will be filled in for parameters within
+        /// the message, or <see langword="null"/> if there are no parameters
+        /// within the message. Parameters within a message should be
+        /// referenced using the same syntax as the format string for the
+        /// <see cref="System.String.Format(string,object[])"/> method.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        string GetMessage(string name, CultureInfo culture, params object[] arguments);
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <remarks>
+        /// Note that the fallback behavior based on CultureInfo seem to 
+        /// have a bug that is fixed by installed .NET 1.1 Service Pack 1.      
+        /// <p>
+        /// If the lookup is not successful, implementations are permitted to
+        /// take one of two actions.
+        /// </p>
+        /// <list type="bullet">
+        /// <item>
+        /// <description>Throw an exception.</description>
+        /// </item>
+        /// <item>
+        /// <description>
+        /// Return the supplied <paramref name="name"/> as is.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="defaultMessage">The default message if name is not found.</param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.
+        /// </param>
+        /// <param name="arguments">
+        /// The array of arguments that will be filled in for parameters within
+        /// the message, or <see langword="null"/> if there are no parameters
+        /// within the message. Parameters within a message should be
+        /// referenced using the same syntax as the format string for the
+        /// <see cref="System.String.Format(string,object[])"/> method.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        string GetMessage(string name, string defaultMessage, CultureInfo culture, params object[] arguments);
+
+        /// <summary>
+        /// Resolve the message using all of the attributes contained within
+        /// the supplied <see cref="Spring.Context.IMessageSourceResolvable"/>
+        /// argument.
+        /// </summary>
+        /// <param name="resolvable">
+        /// The value object storing those attributes that are required to
+        /// properly resolve a message.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If the message could not be resolved.
+        /// </exception>
+        string GetMessage(IMessageSourceResolvable resolvable, CultureInfo culture);
+
+        /// <summary>
+        /// Gets a localized resource object identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method must use the
+        /// <see cref="System.Globalization.CultureInfo.CurrentUICulture"/>
+        /// value to obtain a resource.
+        /// </p>
+        /// <p>
+        /// Examples of resources that may be resolved by this method include
+        /// (but are not limited to) objects such as icons and bitmaps.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">
+        /// The name of the resource object to resolve.
+        /// </param>
+        /// <returns>
+        /// The resolved object, or <see langword="null"/> if not found.
+        /// </returns>
+        object GetResourceObject(string name);
+
+        /// <summary>
+        /// Gets a localized resource object identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Examples of resources that may be resolved by this method include
+        /// (but are not limited to) objects such as icons and bitmaps.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">
+        /// The name of the resource object to resolve.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.
+        /// </param>
+        /// <returns>
+        /// The resolved object, or <see langword="null"/> if not found.
+        /// </returns>
+        object GetResourceObject(string name, CultureInfo culture);
+
+        /// <summary>
+        /// Applies resources to object properties.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Resource key names are of the form <c>objectName.propertyName</c>.
+        /// </p>
+        /// </remarks>
+        /// <param name="value">
+        /// An object that contains the property values to be applied.
+        /// </param>
+        /// <param name="objectName">
+        /// The base name of the object to use for key lookup.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.
+        /// </param>
+        void ApplyResources(object value, string objectName, CultureInfo culture);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/IMessageSourceAware.cs b/src/Spring/Spring.Core/Context/IMessageSourceAware.cs
new file mode 100644
index 00000000..9407c0b2
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/IMessageSourceAware.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Context {
+
+	/// <summary>
+	/// To be implemented by any object that wishes to be notified
+	/// of the <see cref="Spring.Context.IMessageSource"/> associated with it.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// In the current implementation, the
+	/// <see cref="Spring.Context.IMessageSource"/> will typically be the
+	/// associated <see cref="Spring.Context.IApplicationContext"/> that
+	/// spawned the implementing object.
+	/// </p>
+	/// <p>
+	/// The <see cref="Spring.Context.IMessageSource"/> can usually also be
+	/// passed on as an object reference to arbitrary object properties or
+	/// constructor arguments, because a
+	/// <see cref="Spring.Context.IMessageSource"/> is typically defined as an
+	/// object with the well known name <c>"messageSource"</c> in the
+	/// associated application context.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: IMessageSourceAware.cs,v 1.4 2006/04/09 07:18:38 markpollack Exp $</version>
+    /// <seealso cref="Spring.Objects.Factory.IInitializingObject"/>
+	public interface IMessageSourceAware 
+    {
+		/// <summary>
+		/// Sets the <see cref="Spring.Context.IMessageSource"/> associated
+		/// with this object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Invoked <b>after</b> population of normal object properties but
+		/// <b>before</b> an initializing callback such as the
+		/// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+		/// method of the
+		/// <see cref="Spring.Objects.Factory.IInitializingObject"/> interface
+		/// or a custom init-method.
+		/// </p>
+		/// <p>
+		/// It is also invoked <b>before</b> the
+		/// <see cref="Spring.Context.IApplicationContextAware.ApplicationContext"/>
+		/// property of any
+		/// <see cref="Spring.Context.IApplicationContextAware"/>
+		/// implementation.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The <see cref="Spring.Context.IMessageSource"/> associated
+		/// with this object.
+		/// </value>
+		IMessageSource MessageSource 
+		{
+			set;
+		}
+	}
+}
diff --git a/src/Spring/Spring.Core/Context/IMessageSourceResolvable.cs b/src/Spring/Spring.Core/Context/IMessageSourceResolvable.cs
new file mode 100644
index 00000000..01473015
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/IMessageSourceResolvable.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+
+#endregion
+
+namespace Spring.Context
+{
+    /// <summary>
+    /// Describes objects that are suitable for message resolution in a
+    /// <see cref="Spring.Context.IMessageSource"/>.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+	/// Spring.NET's own validation error classes implement this interface.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IMessageSourceResolvable.cs,v 1.6 2006/04/09 07:18:38 markpollack Exp $</version>
+    /// <seealso cref="Spring.Context.IMessageSource.GetMessage(IMessageSourceResolvable, CultureInfo)"/>
+    /// <seealso cref="Spring.Context.Support.DefaultMessageSourceResolvable"/>
+    public interface IMessageSourceResolvable
+	{
+        /// <summary>
+        /// Return the codes to be used to resolve this message, in the order
+        /// that they are to be tried.
+        /// </summary>
+		/// <remarks>
+		/// <p>
+		/// The last code will therefore be the default one.
+		/// </p>
+		/// </remarks>
+        /// <returns>
+        /// A <see cref="System.String"/> array of codes which are associated
+        /// with this message.
+        /// </returns>
+        string[] GetCodes();
+
+        /// <summary>
+        /// Return the array of arguments to be used to resolve this message.
+        /// </summary>
+        /// <returns>
+        /// An array of objects to be used as parameters to replace
+        /// placeholders within the message text.
+        /// </returns>
+        object[] GetArguments();
+
+        /// <summary>
+        /// Return the default message to be used to resolve this message.
+        /// </summary>
+        /// <returns>
+        /// The default message, or <see langword="null"/> if there is no
+        /// default.
+        /// </returns>
+        string DefaultMessage { get; }
+	}
+}
diff --git a/src/Spring/Spring.Core/Context/IResourceLoaderAware.cs b/src/Spring/Spring.Core/Context/IResourceLoaderAware.cs
new file mode 100644
index 00000000..f8006c7b
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/IResourceLoaderAware.cs
@@ -0,0 +1,83 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using Spring.Core.IO;
+
+#endregion
+
+namespace Spring.Context
+{
+    /// <summary>
+    /// Interface to be implemented by any object that wishes to be notified
+    /// of the <see cref="Spring.Core.IO.IResourceLoader"/> (typically the
+    /// <see cref="Spring.Context.IApplicationContext"/>) that it runs in.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Note that <see cref="Spring.Core.IO.IResource"/> dependencies can also
+    /// be exposed as object properties of type
+    /// <see cref="Spring.Core.IO.IResource"/>, populated via strings with
+    /// automatic type conversion by the object factory. This obviates the
+    /// need for implementing any callback interface just for the purpose of
+    /// accessing a specific resource.
+    /// </p>
+    /// <p>
+    /// You typically need an <see cref="Spring.Core.IO.IResourceLoader"/>
+    /// when your application object has to access a variety of file resources
+    /// whose names are calculated. A good strategy is to make the object use
+    /// a default resource loader but still implement the
+    /// <see cref="Spring.Context.IResourceLoaderAware"/> interface to allow
+    /// for overriding when running in an
+    /// <see cref="Spring.Context.IApplicationContext"/>.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IResourceLoaderAware.cs,v 1.8 2007/08/08 17:46:37 bbaia Exp $</version>
+    /// <see cref="Spring.Context.IApplicationContextAware"/>
+    /// <see cref="Spring.Objects.Factory.IInitializingObject"/>
+    /// <see cref="Spring.Core.IO.IResourceLoader"/>
+    public interface IResourceLoaderAware
+    {
+        /// <summary>
+        /// Gets and sets the <see cref="Spring.Core.IO.IResourceLoader"/>
+        /// that this object runs in.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Invoked <b>after</b> population of normal objects properties but
+        /// before an init callback such as
+        /// <see cref="Spring.Objects.Factory.IInitializingObject"/>'s 
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet()"/>
+        /// or a custom init-method. Invoked <b>before</b> setting 
+        /// <see cref="Spring.Context.IApplicationContextAware"/>'s
+        /// <see cref="Spring.Context.IApplicationContextAware.ApplicationContext"/>
+        /// property.
+        /// </p>
+        /// </remarks>
+        IResourceLoader ResourceLoader
+        {
+            set;
+			get;
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Context/NoSuchMessageException.cs b/src/Spring/Spring.Core/Context/NoSuchMessageException.cs
new file mode 100644
index 00000000..b2eb9026
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/NoSuchMessageException.cs
@@ -0,0 +1,115 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Context
+{
+	/// <summary>
+	/// Thrown when a message cannot be resolved.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <seealso cref="Spring.Context.IMessageSource"/>
+	/// <seealso cref="Spring.Context.IMessageSourceResolvable"/>
+	/// <version>$Id: NoSuchMessageException.cs,v 1.8 2007/07/17 14:51:13 oakinger Exp $</version>
+	[Serializable]
+	public class NoSuchMessageException : ApplicationException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.NoSuchMessageException"/> class.
+		/// </summary>
+		public NoSuchMessageException()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.NoSuchMessageException"/> class with the
+		/// specified message.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public NoSuchMessageException(string message, Exception rootCause)
+			: base(message, rootCause)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.NoSuchMessageException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being
+		/// thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or
+		/// destination.
+		/// </param>
+		protected NoSuchMessageException(
+			SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.NoSuchMessageException"/> class.
+		/// </summary>
+		/// <param name="code">
+		/// The code that could not be resolved for given culture.
+		/// </param>
+		/// <param name="culture">
+		/// The <see cref="System.Globalization.CultureInfo"/> that was used
+		/// to search for the code.
+		/// </param>
+		public NoSuchMessageException(string code, CultureInfo culture)
+			: base(string.Format("No message found under code '{0}' for locale '{1}'.",
+			code, culture))
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.NoSuchMessageException"/> class.
+		/// </summary>
+		/// <param name="code">
+		/// The code that could not be resolved for the current UI culture.
+		/// </param>
+		public NoSuchMessageException(string code)
+			: this(code, CultureInfo.CurrentUICulture)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs
new file mode 100644
index 00000000..ed7ab560
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs
@@ -0,0 +1,1754 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Globalization;
+using Common.Logging;
+using Spring.Context.Events;
+using Spring.Core;
+using Spring.Core.IO;
+using Spring.Objects;
+using Spring.Objects.Events;
+using Spring.Objects.Events.Support;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Partial implementation of the
+    /// <see cref="Spring.Context.IApplicationContext"/> interface.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Does not mandate the type of storage used for configuration, but does
+    /// implement common functionality. Uses the Template Method design
+    /// pattern, requiring concrete subclasses to implement
+    /// <see langword="abstract"/> methods.
+    /// </p>
+    /// <p>
+    /// In contrast to a plain vanilla
+    /// <see cref="Spring.Objects.Factory.IObjectFactory"/>, an
+    /// <see cref="Spring.Context.IApplicationContext"/> is supposed
+    /// to detect special objects defined in its object factory: therefore,
+    /// this class automatically registers
+    /// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>s,
+    /// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+    /// and <see cref="Spring.Context.IApplicationEventListener"/>s that are
+    /// defined as objects in the context.
+    /// </p>
+    /// <p>
+    /// An <see cref="Spring.Context.IMessageSource"/> may be also supplied as
+    /// an object in the context, with the special, well-known-name of
+    /// <c>"messageSource"</c>. Else, message resolution is delegated to the
+    /// parent context.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergan Hoeller</author>
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <version>$Id: AbstractApplicationContext.cs,v 1.74 2007/08/27 09:38:28 oakinger Exp $</version>
+    /// <seealso cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+    /// <seealso cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+    public abstract class AbstractApplicationContext
+        : ConfigurableResourceLoader, IConfigurableApplicationContext
+    {
+        #region Constants
+
+        /// <summary>
+        /// Name of the .Net config section that contains Spring.Net context definition.
+        /// </summary>
+        public const string ContextSectionName = "spring/context";
+
+        /// <summary>
+        /// Default name of the root context.
+        /// </summary>
+        public const string DefaultRootContextName = "spring.root";
+
+        #endregion
+
+        #region Fields
+
+        private const long TicksAtEpoch = 621355968000000000;
+
+        /// <summary>
+        /// The special, well-known-name of the default
+        /// <see cref="Spring.Context.IMessageSource"/> in the context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If no <see cref="Spring.Context.IMessageSource"/> can be found
+        /// in the context using this lookup key, then message resolution
+        /// will be delegated to the parent context (if any).
+        /// </p>
+        /// </remarks>
+        public static readonly string MessageSourceObjectName = "messageSource";
+
+        /// <summary>
+        /// The special, well-known-name of the default
+        /// <see cref="Spring.Objects.Events.IEventRegistry"/> in the context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If no <see cref="Spring.Objects.Events.IEventRegistry"/> can be found
+        /// in the context using this lookup key, then a default
+        /// <see cref="Spring.Objects.Events.IEventRegistry"/> will be used.
+        /// </p>
+        /// </remarks>
+        public static readonly string EventRegistryObjectName = "eventRegistry";
+
+        /// <summary>
+        /// The <see cref="Common.Logging.ILog"/> instance for this class.
+        /// </summary>
+        private static readonly ILog log = LogManager.GetLogger(typeof(AbstractApplicationContext));
+
+        /// <summary>
+        /// The <see cref="Spring.Context.IMessageSource"/> instance we delegate
+        /// our implementation of said interface to.
+        /// </summary>
+        private IMessageSource _messageSource;
+
+        /// <summary>
+        /// The <see cref="Spring.Objects.Events.IEventRegistry"/> instance we
+        /// delegate our implementation of said interface to.
+        /// </summary>
+        private IEventRegistry _eventRegistry;
+
+        private IApplicationContext _parentApplicationContext;
+        private readonly IList _objectFactoryPostProcessors;
+        private IList _defaultObjectPostProcessors;
+        private string _name;
+        private DateTime _startupDate;
+        private readonly bool _caseSensitive;
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="AbstractApplicationContext"/>
+        /// with no parent context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes
+        /// no public constructors.
+        /// </p>
+        /// </remarks>
+        protected AbstractApplicationContext() : this(null, true, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="AbstractApplicationContext"/>
+        /// with no parent context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes
+        /// no public constructors.
+        /// </p>
+        /// </remarks>
+        /// <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+        protected AbstractApplicationContext(bool caseSensitive) : this(null, caseSensitive, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="AbstractApplicationContext"/>
+        /// with the supplied parent context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes
+        /// no public constructors.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">The application context name.</param>
+        /// <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+        /// <param name="parentApplicationContext">The parent application context.</param>
+        protected AbstractApplicationContext(string name, bool caseSensitive,
+                                             IApplicationContext parentApplicationContext)
+        {
+            _name = (StringUtils.IsNullOrEmpty(name)) ? DefaultRootContextName : name;
+            _caseSensitive = caseSensitive;
+            _parentApplicationContext = parentApplicationContext;
+            _objectFactoryPostProcessors = new ArrayList();
+            _defaultObjectPostProcessors = new ArrayList();
+            AddDefaultObjectPostProcessor(new ObjectPostProcessorChecker());
+            AddDefaultObjectPostProcessor(new ApplicationContextAwareProcessor(this));
+        }
+
+        /// <summary>
+        /// Adds the given <see cref="IObjectPostProcessor"/> to the list of standard
+        /// processors being added to the underlying <see cref="IConfigurableObjectFactory"/>
+        /// </summary>
+        /// <remarks>
+        /// Each time <see cref="Refresh()"/> is called on this context, the context ensures, that 
+        /// all default <see cref="IObjectPostProcessor"/>s are registered with the underlying <see cref="IConfigurableObjectFactory"/>.
+        /// </remarks>
+        /// <param name="defaultObjectPostProcessor">The <see cref="IObjectPostProcessor"/> instance.</param>
+        protected void AddDefaultObjectPostProcessor(IObjectPostProcessor defaultObjectPostProcessor)
+        {
+            _defaultObjectPostProcessors.Add(defaultObjectPostProcessor);
+        }
+
+        /// <summary>
+        /// Closes this context and disposes of any resources (such as
+        /// singleton objects in the wrapped
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/>).
+        /// </summary>
+        public virtual void Dispose()
+        {
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(string.Format(
+                              CultureInfo.InvariantCulture,
+                              "Closing application context [{0}].",
+                              Name));
+            }
+
+            #endregion
+
+            new DefensiveEventRaiser().Raise(
+                ContextEvent, this,
+                new ContextEventArgs(ContextEventArgs.ContextEvent.Closed));
+            ObjectFactory.Dispose();
+        }
+
+        #endregion
+
+        #region Abstract Methods
+
+        /// <summary>
+        /// Subclasses must implement this method to perform the actual
+        /// configuration loading.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method is invoked by
+        /// <see cref="Spring.Context.Support.AbstractApplicationContext.Refresh()"/>,
+        /// before any other initialization occurs.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of errors encountered while refreshing the object factory.
+        /// </exception>
+        protected abstract void RefreshObjectFactory();
+
+        #endregion
+
+        /// <summary>
+        /// An object that can be used to synchronize access to the <see cref="AbstractXmlApplicationContext"/>
+        /// </summary>
+        public object SyncRoot
+        {
+            get { return this; }
+        }
+
+        /// <summary>
+        /// The timestamp when this context was first loaded.
+        /// </summary>
+        /// <returns>
+        /// The timestamp (milliseconds) when this context was first loaded.
+        /// </returns>
+        public long StartupDateMilliseconds
+        {
+            get { return (StartupDate.Ticks - TicksAtEpoch)/10000; }
+        }
+
+
+        /// <summary>
+        /// Gets a flag indicating whether context should be case sensitive.
+        /// </summary>
+        /// <value><c>true</c> if object lookups are case sensitive; otherwise, <c>false</c>.</value>
+        protected bool CaseSensitive
+        {
+            get { return _caseSensitive; }
+        }
+
+        /// <summary>
+        /// The <see cref="Spring.Context.IMessageSource"/> for this context.
+        /// </summary>
+        /// <exception cref="System.InvalidOperationException">
+        /// If the context has not been initialized yet.
+        /// </exception>
+        public IMessageSource MessageSource
+        {
+            get
+            {
+                if (_messageSource == null)
+                {
+                    throw new InvalidOperationException(
+                        "MessageSource not initialized - call 'Refresh()' " +
+                        "before accessing messages via the context: " + this);
+                }
+                return _messageSource;
+            }
+        }
+
+        /// <summary>
+        /// The <see cref="Spring.Objects.Events.IEventRegistry"/> for this context.
+        /// </summary>
+        /// <exception cref="System.InvalidOperationException">
+        /// If the context has not been initialized yet.
+        /// </exception>
+        public IEventRegistry EventRegistry
+        {
+            get
+            {
+                if (_eventRegistry == null)
+                {
+                    throw new InvalidOperationException(
+                        "EventRegistry not initialized - call 'Refresh()' " +
+                        "before accessing the event registry via the context: " + this);
+                }
+                return _eventRegistry;
+            }
+        }
+
+        /// <summary>
+        /// Returns the internal object factory of the parent context if it implements
+        /// <see cref="Spring.Context.IConfigurableApplicationContext"/>; else,
+        /// returns the parent context itself.
+        /// </summary>
+        /// <returns>
+        /// The parent context's object factory, or the parent itself.
+        /// </returns>
+        protected IObjectFactory GetInternalParentObjectFactory()
+        {
+            IConfigurableApplicationContext configContext
+                = _parentApplicationContext as IConfigurableApplicationContext;
+            if (configContext != null)
+            {
+                return ((IConfigurableApplicationContext)
+                        _parentApplicationContext).ObjectFactory;
+            }
+            else
+            {
+                return _parentApplicationContext;
+            }
+        }
+
+        /// <summary>
+        /// Raises an application context event.
+        /// </summary>
+        /// <param name="e">
+        /// Any arguments to the event. May be <see langword="null"/>.
+        /// </param>
+        protected virtual void OnContextEvent(ApplicationEventArgs e)
+        {
+            OnContextEvent(this, e);
+        }
+
+        /// <summary>
+        /// Raises an application context event.
+        /// </summary>
+        /// <param name="source">
+        /// The source of the event.
+        /// </param>
+        /// <param name="e">
+        /// Any arguments to the event. May be <see langword="null"/>.
+        /// </param>
+        protected virtual void OnContextEvent(object source, ApplicationEventArgs e)
+        {
+            new DefensiveEventRaiser().Raise(ContextEvent, source, e);
+        }
+
+        /// <summary>
+        /// Modify the application context's internal object factory after its standard
+        /// initialization.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// All object definitions will have been loaded, but no objects
+        /// will have been instantiated yet. This allows for the registration
+        /// of special
+        /// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+        /// in certain
+        /// <see cref="Spring.Context.IApplicationContext"/> implementations.
+        /// </p>
+        /// </remarks>
+        /// <param name="objectFactory">
+        /// The object factory used by the application context.
+        /// </param>
+        /// <exception cref="ObjectsException">
+        /// In the case of errors.
+        /// </exception>.
+        protected virtual void PostProcessObjectFactory(
+            IConfigurableListableObjectFactory objectFactory)
+        {
+        }
+
+        /// <summary>
+        /// Template method which can be overridden to add context-specific
+        /// refresh work.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Called on initialization of special objects, before instantiation
+        /// of singletons.
+        /// </p>
+        /// </remarks>
+        protected virtual void OnRefresh()
+        {
+        }
+
+        /// <summary>
+        /// Instantiate and invoke all registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+        /// objects, respecting any explicit ordering.
+        /// </summary>
+        /// <remarks>
+        /// <note type="caution">
+        /// <b>Must</b> be called before singleton instantiation.
+        /// </note>
+        /// </remarks>
+        /// <exception cref="ObjectsException">In the case of errors.</exception>
+        private void InvokeObjectFactoryPostProcessors()
+        {
+            // do NOT include IFactoryObjects; they (typically) need to be instantiated
+            // to determine the Type of object that they create, and if they are instantiated
+            // then we won't be able to do any factory post processin' on 'em...
+            string[] factoryProcessorNames
+                = GetObjectNamesForType(typeof(IObjectFactoryPostProcessor), true, false);
+            ArrayList orderedFactoryProcessors = new ArrayList();
+            IList nonOrderedFactoryProcessorNames = new ArrayList();
+            for (int i = 0; i < factoryProcessorNames.Length; ++i)
+            {
+                string processorName = factoryProcessorNames[i];
+                object processor = GetObject(processorName);
+                if (typeof(IOrdered).IsAssignableFrom(GetType(processorName)))
+                {
+                    orderedFactoryProcessors.Add(processor);
+                }
+                else
+                {
+                    nonOrderedFactoryProcessorNames.Add(processor);
+                }
+            }
+            // first, invoke those IObjectFactoryPostProcessors that implement IOrdered...
+            orderedFactoryProcessors.Sort(new OrderComparator());
+            ProcessObjectFactoryPostProcessors(orderedFactoryProcessors);
+            // and then the unordered ones...
+            ProcessObjectFactoryPostProcessors(nonOrderedFactoryProcessorNames);
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(string.Format(
+                              CultureInfo.InvariantCulture,
+                              "processed {0} IFactoryObjectPostProcessors defined in application context [{1}].",
+                              factoryProcessorNames.Length,
+                              Name));
+            }
+
+            #endregion
+        }
+
+        private void ProcessObjectFactoryPostProcessors(IList orderedFactoryProcessors)
+        {
+            foreach (IObjectFactoryPostProcessor processor in orderedFactoryProcessors)
+            {
+                processor.PostProcessObjectFactory(ObjectFactory);
+            }
+        }
+
+        private void RegisterObjectPostProcessors(IConfigurableListableObjectFactory objectFactory)
+        {
+            RegisterObjectPostProcessorChecker(objectFactory);
+            IDictionary dict = GetObjectsOfType(typeof(IObjectPostProcessor), true, false);
+            ArrayList objectProcessors = new ArrayList(dict.Values);
+            objectProcessors.Sort(new OrderComparator());
+            foreach (IObjectPostProcessor objectPostProcessor in objectProcessors)
+            {
+                ObjectFactory.AddObjectPostProcessor(objectPostProcessor);
+            }
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(string.Format(
+                              CultureInfo.InvariantCulture,
+                              "processed {0} IObjectPostProcessors defined in application context [{1}].",
+                              objectProcessors.Count,
+                              Name));
+            }
+        }
+
+        /// <summary>
+        /// Register an IObjectPostProcessorChecker that logs an info
+        /// message when an object is created during IObjectPostProcessor
+        /// instantiation, i.e. when an object is not eligible for being
+        /// processed by all IObjectPostProcessors.
+        /// </summary>
+        private void RegisterObjectPostProcessorChecker(IConfigurableListableObjectFactory objectFactory)
+        {
+            int objectPostProcessorCount
+                = ObjectFactory.ObjectPostProcessorCount + 1
+                  + GetObjectNamesForType(typeof(IObjectPostProcessor), true, false).Length;
+//            ObjectFactory.AddObjectPostProcessor(
+//                new ObjectPostProcessorChecker(objectFactory, objectPostProcessorCount));
+            ((ObjectPostProcessorChecker) _defaultObjectPostProcessors[0]).Reset(objectFactory, objectPostProcessorCount);
+        }
+
+        /// <summary>
+        /// Initializes the default event registry for this context.
+        /// </summary>
+        private void InitEventRegistry()
+        {
+            if (ContainsObject(EventRegistryObjectName))
+            {
+                object candidateRegistry = GetObject(EventRegistryObjectName);
+                if (candidateRegistry is IEventRegistry)
+                {
+                    _eventRegistry = (IEventRegistry) candidateRegistry;
+
+                    #region Instrumentation
+
+                    log.Debug(StringUtils.Surround(
+                                  "Using IEventRegistry [", EventRegistry, "]"));
+
+                    #endregion
+                }
+                else
+                {
+                    _eventRegistry = new EventRegistry();
+
+                    #region Instrumentation
+
+                    if (log.IsWarnEnabled)
+                    {
+                        log.Warn(string.Format(
+                                     "Found object in context named '{0}' : this name " +
+                                     "is typically reserved for IEventRegistry objects. " +
+                                     "Falling back to default '{1}'.",
+                                     EventRegistryObjectName, EventRegistry));
+                    }
+
+                    #endregion
+                }
+            }
+            else
+            {
+                _eventRegistry = new EventRegistry();
+
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(string.Format(
+                                  "No IEventRegistry found with name '{0}' : using default '{1}'.",
+                                  EventRegistryObjectName, EventRegistry));
+                }
+
+                #endregion
+            }
+            ICollection interestedParties
+                = GetObjectsOfType(typeof(IEventRegistryAware), true, false).Values;
+            foreach (IEventRegistryAware party in interestedParties)
+            {
+                party.EventRegistry = EventRegistry;
+            }
+            EventRegistry.PublishEvents(this);
+        }
+
+        /// <summary>
+        /// Returns the internal message source of the parent context if said
+        /// parent context is an <see cref="AbstractApplicationContext"/>, else
+        /// simply the parent context itself.
+        /// </summary>
+        /// <returns>
+        /// The internal message source of the parent context if said
+        /// parent context is an <see cref="AbstractApplicationContext"/>, else
+        /// simply the parent context itself.
+        /// </returns>
+        protected virtual IMessageSource GetInternalParentMessageSource()
+        {
+            AbstractApplicationContext parent
+                = ParentContext as AbstractApplicationContext;
+            return parent == null ? ParentContext : parent._messageSource;
+        }
+
+        /// <summary>
+        /// Initializes the default message source for this context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Uses any parent context's message source if one is not available
+        /// in this context.
+        /// </p>
+        /// </remarks>
+        private void InitMessageSource()
+        {
+            if (ContainsObject(MessageSourceObjectName))
+            {
+                object candidateSource = GetObject(MessageSourceObjectName);
+                if (candidateSource is IMessageSource)
+                {
+                    _messageSource
+                        = (IMessageSource) GetObject(MessageSourceObjectName);
+
+                    // make IMessageSource aware of any parent IMessageSource...
+                    if (ParentContext != null)
+                    {
+                        IHierarchicalMessageSource hierSource
+                            = MessageSource as IHierarchicalMessageSource;
+                        if (hierSource != null)
+                        {
+                            IMessageSource parentMessageSource
+                                = GetInternalParentMessageSource();
+                            hierSource.ParentMessageSource = parentMessageSource;
+                        }
+                    }
+
+                    #region Instrumentation
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(StringUtils.Surround(
+                                      "Using MessageSource [", MessageSource, "]"));
+                    }
+
+                    #endregion
+                }
+                else
+                {
+                    _messageSource = new DelegatingMessageSource(
+                        GetInternalParentMessageSource());
+
+                    #region Instrumentation
+
+                    if (log.IsWarnEnabled)
+                    {
+                        log.Warn(string.Format(
+                                     "Found object in context named '{0}' : this name " +
+                                     "is typically reserved for IMessageSource objects. " +
+                                     "Falling back to default '{1}'.",
+                                     MessageSourceObjectName, MessageSource));
+                    }
+
+                    #endregion
+                }
+            }
+            else if (ParentContext != null)
+            {
+                _messageSource = new DelegatingMessageSource(
+                    GetInternalParentMessageSource());
+
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(string.Format(
+                                  "No message source found in the current context: using parent context's message source '{0}'.",
+                                  MessageSource));
+                }
+
+                #endregion
+            }
+            else
+            {
+                _messageSource = new StaticMessageSource();
+
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(string.Format(
+                                  "No IMessageSource found with name '{0}' : using default '{1}'.",
+                                  MessageSourceObjectName, MessageSource));
+                }
+
+                #endregion
+            }
+        }
+
+        private void RefreshApplicationEventListeners()
+        {
+            ICollection listeners
+                = GetObjectsOfType(
+                    typeof(IApplicationEventListener), true, false).Values;
+            foreach (IApplicationEventListener applicationListener in listeners)
+            {
+                EventRegistry.Subscribe(applicationListener);
+            }
+        }
+
+        /// <summary>
+        /// Returns the list of the
+        /// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>s
+        /// that will be applied to the objects created with this factory.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The elements of this list are instances of implementations of the
+        /// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+        /// interface.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The list of the
+        /// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>s
+        /// that will be applied to the objects created with this factory.
+        /// </value>
+        private IList ObjectFactoryPostProcessors
+        {
+            get { return _objectFactoryPostProcessors; }
+        }
+
+        #region IConfigurableApplicationContext Members
+
+        /// <summary>
+        /// Return the internal object factory of this application context.
+        /// </summary>
+        public abstract IConfigurableListableObjectFactory ObjectFactory { get; }
+
+        /// <summary>
+        /// Add a new <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+        /// that will get applied to the internal object factory of this application context
+        /// on refresh, before any of the object definitions are evaluated.
+        /// </summary>
+        /// <param name="objectFactoryPostProcessor">
+        /// The factory processor to register.
+        /// </param>
+        public void AddObjectFactoryPostProcessor(
+            IObjectFactoryPostProcessor objectFactoryPostProcessor)
+        {
+            _objectFactoryPostProcessors.Add(objectFactoryPostProcessor);
+        }
+
+        /// <summary>
+        /// Load or refresh the persistent representation of the configuration,
+        /// which might an XML file, properties file, or relational database schema.
+        /// </summary>
+        /// <exception cref="Spring.Context.ApplicationContextException">
+        /// If the configuration cannot be loaded.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object factory could not be initialized.
+        /// </exception>
+        public virtual void Refresh()
+        {
+            lock (SyncRoot)
+            {
+
+                /*
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    StackTrace stackTrace = new StackTrace(1, true);
+                    log.Debug(string.Format(
+                                  CultureInfo.InvariantCulture,
+                                  "Refreshing application context [{0}]. Called from:{1}",
+                                  Name, stackTrace));
+                }
+
+                #endregion
+                */
+
+                _startupDate = DateTime.Now;
+
+                RefreshObjectFactory();
+                IConfigurableListableObjectFactory objectFactory = ObjectFactory;
+
+                EnsureKnownObjectPostProcessors(objectFactory);
+                objectFactory.IgnoreDependencyType(typeof(IResourceLoader));
+                objectFactory.IgnoreDependencyType(typeof(IApplicationContext));
+
+                PostProcessObjectFactory(objectFactory);
+                foreach (IObjectFactoryPostProcessor factoryProcessor in ObjectFactoryPostProcessors)
+                {
+                    factoryProcessor.PostProcessObjectFactory(objectFactory);
+                }
+
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(string.Format(
+                                  CultureInfo.InvariantCulture,
+                                  "{0} objects defined in application context [{1}].",
+                                  ObjectDefinitionCount == 0 ? "No" : ObjectDefinitionCount.ToString(),
+                                  Name));
+                }
+
+                #endregion
+
+                InvokeObjectFactoryPostProcessors();
+                RegisterObjectPostProcessors(objectFactory);
+                InitEventRegistry();
+                InitMessageSource();
+                OnRefresh();
+                RefreshApplicationEventListeners();
+
+                objectFactory.PreInstantiateSingletons();
+
+                new DefensiveEventRaiser().Raise(
+                    ContextEvent, this,
+                    new ContextEventArgs(ContextEventArgs.ContextEvent.Refreshed));
+            }
+        }
+
+        /// <summary>
+        /// Ensures, that predefined ObjectPostProcessors are registered with this ObjectFactory
+        /// </summary>
+        /// <param name="objectFactory"></param>
+        protected void EnsureKnownObjectPostProcessors(IConfigurableListableObjectFactory objectFactory)
+        {
+            // index 0 contains the ObjectPostProcessorChecker that is handled separately!
+            for (int i = 1; i < _defaultObjectPostProcessors.Count; i++)
+            {
+                objectFactory.AddObjectPostProcessor((IObjectPostProcessor) this._defaultObjectPostProcessors[i]);
+            }
+        }
+
+        /// <summary>
+        /// Gets the parent context, or <see langword="null"/> if there is no
+        /// parent context.
+        /// </summary>
+        /// <returns>
+        /// The parent context, or <see langword="null"/>  if there is no
+        /// parent.
+        /// </returns>
+        /// <seealso cref="Spring.Context.IApplicationContext.ParentContext"/>
+        public virtual IApplicationContext ParentContext
+        {
+            get { return _parentApplicationContext; }
+            set { _parentApplicationContext = value; }
+        }
+
+        #endregion
+
+        #region IApplicationContext Members
+
+        /// <summary>
+        /// Raised in response to an implementation-dependant application
+        /// context event.
+        /// </summary>
+        public event ApplicationEventHandler ContextEvent;
+
+        /// <summary>
+        /// The date and time this context was first loaded.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="System.DateTime"/> representing when this context
+        /// was first loaded.
+        /// </returns>
+        public DateTime StartupDate
+        {
+            get { return _startupDate; }
+        }
+
+        /// <summary>
+        /// A name for this context.
+        /// </summary>
+        /// <returns>
+        /// A name for this context.
+        /// </returns>
+        public string Name
+        {
+            get { return _name; }
+            set { _name = value; }
+        }
+
+
+
+        #endregion
+
+        #region IListableObjectFactory Members
+
+        /// <summary>
+        /// Return the names of objects matching the given <see cref="System.Type"/>
+        /// (including subclasses), judging from the object definitions.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> (class or interface) to match, or <see langword="null"/>
+        /// for all object names.
+        /// </param>
+        /// <returns>
+        /// The names of all objects defined in this factory, or an empty array if none
+        /// are defined.
+        /// </returns>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectNamesForType(Type)"/>
+        public string[] GetObjectNamesForType(Type type)
+        {
+            return ObjectFactory.GetObjectNamesForType(type);
+        }
+
+        /// <summary>
+        /// Return the names of objects matching the given <see cref="System.Type"/>
+        /// (including subclasses), judging from the object definitions.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> (class or interface) to match, or <see langword="null"/>
+        /// for all object names.
+        /// </param>
+        /// <param name="includePrototypes">
+        /// Whether to include prototype objects too or just singletons (also applies to
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s).
+        /// </param>
+        /// <param name="includeFactoryObjects">
+        /// Whether to include <see cref="Spring.Objects.Factory.IFactoryObject"/>s too
+        /// or just normal objects.
+        /// </param>
+        /// <returns>
+        /// The names of all objects defined in this factory, or an empty array if none
+        /// are defined.
+        /// </returns>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectNamesForType(Type, bool, bool)"/>
+        public string[] GetObjectNamesForType(
+            Type type, bool includePrototypes, bool includeFactoryObjects)
+        {
+            return ObjectFactory.GetObjectNamesForType(type, includePrototypes, includeFactoryObjects);
+        }
+
+        /// <summary>
+        /// Return the names of all objects defined in this factory.
+        /// </summary>
+        /// <returns>
+        /// The names of all objects defined in this factory, or an empty array if none
+        /// are defined.
+        /// </returns>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectDefinitionNames()"/>
+        public string[] GetObjectDefinitionNames()
+        {
+            return ObjectFactory.GetObjectDefinitionNames();
+        }
+
+        /// <summary>
+        /// Return the registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+        /// given object, allowing access to its property values and constructor
+        /// argument values.
+        /// </summary>
+        /// <param name="name">The name of the object.</param>
+        /// <returns>
+        /// The registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>.
+        /// </returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there is no object with the given name.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of errors.
+        /// </exception>        
+        public virtual IObjectDefinition GetObjectDefinition(string name)
+        {
+            return ObjectFactory.GetObjectDefinition(name);
+        }
+
+
+        /// <summary>
+        /// Return the registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+        /// given object, allowing access to its property values and constructor
+        /// argument values.
+        /// </summary>
+        /// <param name="name">The name of the object.</param>
+        /// <param name="includeAncestors">Whether to search parent object factories.</param>
+        /// <returns>
+        /// The registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>.
+        /// </returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there is no object with the given name.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of errors.
+        /// </exception>       
+        public IObjectDefinition GetObjectDefinition(string name, bool includeAncestors)
+        {
+            return ObjectFactory.GetObjectDefinition(name, includeAncestors);
+        }
+
+        /// <summary>
+        /// Return the object instances that match the given object
+        /// <see cref="System.Type"/> (including subclasses), judging from either object
+        /// definitions or the value of
+        /// <see cref="Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> (class or interface) to match.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.Collections.IDictionary"/> of the matching objects,
+        /// containing the object names as keys and the corresponding object instances
+        /// as values.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the objects could not be created.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(Type)"/>
+        public IDictionary GetObjectsOfType(Type type)
+        {
+            return GetObjectsOfType(type, true, true);
+        }
+
+        /// <summary>
+        /// Return the object instances that match the given object
+        /// <see cref="System.Type"/> (including subclasses), judging from either object
+        /// definitions or the value of
+        /// <see cref="Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> (class or interface) to match.
+        /// </param>
+        /// <param name="includePrototypes">
+        /// Whether to include prototype objects too or just singletons (also applies to
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s).
+        /// </param>
+        /// <param name="includeFactoryObjects">
+        /// Whether to include <see cref="Spring.Objects.Factory.IFactoryObject"/>s too
+        /// or just normal objects.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.Collections.IDictionary"/> of the matching objects,
+        /// containing the object names as keys and the corresponding object instances
+        /// as values.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the objects could not be created.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(Type, bool, bool)"/>
+        public IDictionary GetObjectsOfType(
+            Type type, bool includePrototypes, bool includeFactoryObjects)
+        {
+            return ObjectFactory.GetObjectsOfType(type, includePrototypes, includeFactoryObjects);
+        }
+
+        /// <summary>
+        /// Return the number of objects defined in the factory.
+        /// </summary>
+        /// <value>
+        /// The number of objects defined in the factory.
+        /// </value>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.ObjectDefinitionCount"/>
+        public int ObjectDefinitionCount
+        {
+            get { return ObjectFactory.ObjectDefinitionCount; }
+        }
+
+        /// <summary>
+        /// Check if this object factory contains an object definition with the given name.
+        /// </summary>
+        /// <param name="name">The name of the object to look for.</param>
+        /// <returns>
+        /// True if this object factory contains an object definition with the given name.
+        /// </returns>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.ContainsObjectDefinition(string)"/>
+        public bool ContainsObjectDefinition(string name)
+        {
+            return ObjectFactory.ContainsObjectDefinition(name);
+        }
+
+        #endregion
+
+        #region IObjectFactory Members
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the given object name.
+        /// </summary>
+        /// <param name="name">The name of the object to return.</param>
+        /// <returns>The instance of the object.</returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there's no such object definition.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object could not be created.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>
+        public object this[string name]
+        {
+            get { return ObjectFactory.GetObject(name); }
+        }
+
+        /// <summary>
+        /// Does this object factory contain an object with the given name?
+        /// </summary>
+        /// <param name="name">The name of the object to query.</param>
+        /// <returns>
+        /// <see langword="true"/> if an object with the given name is defined.
+        /// </returns>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.ContainsObject(string)"/>
+        public bool ContainsObject(string name)
+        {
+            return ObjectFactory.ContainsObject(name);
+        }
+
+        /// <summary>
+        /// Return the aliases for the given object name, if defined.
+        /// </summary>
+        /// <param name="name">The object name to check for aliases.</param>
+        /// <returns>The aliases, or an empty array if none.</returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there's no such object definition.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.GetAliases(string)"/>
+        public string[] GetAliases(string name)
+        {
+            return ObjectFactory.GetAliases(name);
+        }
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the given object name.
+        /// </summary>
+        /// <param name="name">The name of the object to return.</param>
+        /// <param name="requiredType">
+        /// <see cref="System.Type"/> the object may match. Can be an interface or
+        /// superclass of the actual class. For example, if the value is the
+        /// <see cref="System.Object"/> class, this method will succeed whatever the
+        /// class of the returned instance.
+        /// </param>
+        /// <returns>The instance of the object.</returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there's no such object definition.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object could not be created.
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectNotOfRequiredTypeException">
+        /// If the object is not of the required type.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.GetObject(string, Type)"/>
+        public object GetObject(string name, Type requiredType)
+        {
+            return ObjectFactory.GetObject(name, requiredType);
+        }
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the given object name.
+        /// </summary>
+        /// <param name="name">The name of the object to return.</param>
+        /// <returns>The instance of the object.</returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there's no such object definition.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object could not be created.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>
+        public object GetObject(string name)
+        {
+            return ObjectFactory.GetObject(name);
+        }
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the given object name.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method allows an object factory to be used as a replacement for the
+        /// Singleton or Prototype design pattern.
+        /// </p>
+        /// <p>
+        /// Note that callers should retain references to returned objects. There is no
+        /// guarantee that this method will be implemented to be efficient. For example,
+        /// it may be synchronized, or may need to run an RDBMS query.
+        /// </p>
+        /// <p>
+        /// Will ask the parent factory if the object cannot be found in this factory
+        /// instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">The name of the object to return.</param>
+        /// <param name="arguments">
+        /// The arguments to use if creating a prototype using explicit arguments to
+        /// a static factory method. If there is no factory method and the
+        /// arguments are not null, then match the argument values by type and
+        /// call the object's constructor.
+        /// </param>
+        /// <returns>The instance of the object.</returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there's no such object definition.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object could not be created.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="name"/> is <see langword="null"/>.
+        /// </exception>
+        public object GetObject(string name, object[] arguments)
+        {
+            return ObjectFactory.GetObject(name, arguments);
+        }
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the given object name.
+        /// </summary>
+        /// <param name="name">The name of the object to return.</param>
+        /// <param name="requiredType">
+        /// The <see cref="System.Type"/> the object may match. Can be an interface or
+        /// superclass of the actual class. For example, if the value is the
+        /// <see cref="System.Object"/> class, this method will succeed whatever the
+        /// class of the returned instance.
+        /// </param>
+        /// <param name="arguments">
+        /// The arguments to use if creating a prototype using explicit arguments to
+        /// a <see lang="static"/> factory method. If there is no factory method and the
+        /// supplied <paramref name="arguments"/> array is not <see lang="null"/>, then
+        /// match the argument values by type and call the object's constructor.
+        /// </param>
+        /// <returns>The instance of the object.</returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there's no such object definition.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object could not be created.
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectNotOfRequiredTypeException">
+        /// If the object is not of the required type.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="name"/> is <see langword="null"/>.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.GetObject(string, Type)"/>
+        public object GetObject(string name, Type requiredType, object[] arguments)
+        {
+            return ObjectFactory.GetObject(name, requiredType, arguments);
+        }
+
+        /// <summary>
+        /// Is this object a singleton?
+        /// </summary>
+        /// <param name="name">The name of the object to query.</param>
+        /// <returns>True if the named object is a singleton.</returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there's no such object definition.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.IsSingleton(string)"/>
+        public bool IsSingleton(string name)
+        {
+            return ObjectFactory.IsSingleton(name);
+        }
+
+        /// <summary>
+        /// Determines whether the specified object name is prototype.  That is, will GetObject
+        /// always return independent instances?
+        /// </summary>
+        /// <param name="name">The name of the object to query</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified object name will always deliver independent instances; otherwise, <c>false</c>.
+        /// </returns>
+        /// <remarks>This method returning false does not clearly indicate a singleton object.
+        /// It indicated non-independent instances, which may correspond to a scoped object as
+        /// well.  use the IsSingleton property to explicitly check for a shared
+        /// singleton instance.
+        /// <para>Translates aliases back to the corresponding canonical object name.  Will ask the
+        /// parent factory if the object can not be found in this factory instance.
+        /// </para>
+        /// </remarks>
+        /// <exception cref="NoSuchObjectDefinitionException">if there is no object with the given name.</exception>
+        public bool IsPrototype(string name)
+        {
+            return ObjectFactory.IsPrototype(name);
+        }
+
+
+        /// <summary>
+        /// Determines whether the object with the given name matches the specified type.
+        /// </summary>
+        /// <remarks>More specifically, check whether a GetObject call for the given name
+        /// would return an object that is assignable to the specified target type.
+        /// Translates aliases back to the corresponding canonical bean name.
+        /// Will ask the parent factory if the bean cannot be found in this factory instance.
+        /// </remarks>
+        /// <param name="name">The name of the object to query.</param>
+        /// <param name="targetType">Type of the target to match against.</param>
+        /// <returns>
+        /// 	<c>true</c> if the object type matches; otherwise, <c>false</c>
+        /// if it doesn't match or cannot be determined yet.
+        /// </returns>
+        /// <exception cref="NoSuchObjectDefinitionException">Ff there is no object with the given name
+        /// </exception>
+        public bool IsTypeMatch(string name, Type targetType)
+        {
+            return ObjectFactory.IsTypeMatch(name, targetType);
+        }
+
+        /// <summary>
+        /// Determine the <see cref="System.Type"/>  of the object with the
+        /// given name.
+        /// </summary>
+        /// <param name="name">The name of the object to query.</param>
+        /// <returns>
+        /// The <see cref="System.Type"/> of the object, or <see langword="null"/>
+        /// if not determinable.
+        /// </returns>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.GetType(string)"/>
+        public Type GetType(string name)
+        {
+            return ObjectFactory.GetType(name);
+        }
+
+        /// <summary>
+        /// Injects dependencies into the supplied <paramref name="target"/> instance
+        /// using the named object definition.
+        /// </summary>
+        /// <param name="target">
+        /// The object instance that is to be so configured.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object definition expressing the dependencies that are to
+        /// be injected into the supplied <parameref name="target"/> instance.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.ConfigureObject(object, string)"/>
+        public object ConfigureObject(object target, string name)
+        {
+            return ObjectFactory.ConfigureObject(target, name);
+        }
+
+        /// <summary>
+        /// Injects dependencies into the supplied <paramref name="target"/> instance
+        /// using the supplied <paramref name="definition"/>.
+        /// </summary>
+        /// <param name="target">
+        /// The object instance that is to be so configured.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object definition expressing the dependencies that are to
+        /// be injected into the supplied <parameref name="target"/> instance.
+        /// </param>
+        /// <param name="definition">
+        /// An object definition that should be used to configure object.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.ConfigureObject(object, string)"/>
+        public object ConfigureObject(object target, string name, IObjectDefinition definition)
+        {
+            return ObjectFactory.ConfigureObject(target, name, definition);
+        }
+
+        #endregion
+
+        #region IHierarchicalObjectFactory Members
+
+        /// <summary>
+        /// Return the parent object factory, or <see langword="null"/> if there is none.
+        /// </summary>
+        /// <value>
+        /// The parent object factory, or <see langword="null"/> if there is none.
+        /// </value>
+        /// <seealso cref="Spring.Objects.Factory.IHierarchicalObjectFactory.ParentObjectFactory"/>
+        public IObjectFactory ParentObjectFactory
+        {
+            get { return _parentApplicationContext; }
+        }
+
+        #endregion
+
+        #region IMessageSource Members
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.
+        /// </param>
+        /// <param name="arguments">
+        /// The array of arguments that will be filled in for parameters within
+        /// the message, or <see langword="null"/> if there are no parameters
+        /// within the message. Parameters within a message should be
+        /// referenced using the same syntax as the format string for the
+        /// <see cref="System.String.Format(string,object[])"/> method.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If no message could be resolved.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="name"/> is <see langword="null"/>.
+        /// </exception>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(string, CultureInfo, object[])"/>
+        public string GetMessage(
+            string name, CultureInfo culture, params object[] arguments)
+        {
+            return MessageSource.GetMessage(name, culture, arguments);
+        }
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="defaultMessage">The default message.</param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.
+        /// </param>
+        /// <param name="arguments">
+        /// The array of arguments that will be filled in for parameters within
+        /// the message, or <see langword="null"/> if there are no parameters
+        /// within the message. Parameters within a message should be
+        /// referenced using the same syntax as the format string for the
+        /// <see cref="System.String.Format(string,object[])"/> method.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If no message could be resolved.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="name"/> is <see langword="null"/>.
+        /// </exception>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(string, CultureInfo, object[])"/>
+        public string GetMessage(string name, string defaultMessage, CultureInfo culture, params object[] arguments)
+        {
+            return MessageSource.GetMessage(name, defaultMessage, culture, arguments);
+        }
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <returns>
+        /// The resolved message if the lookup was successful.
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If no message could be resolved.
+        /// </exception>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(string)"/>
+        public string GetMessage(string name)
+        {
+            return MessageSource.GetMessage(name);
+        }
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="arguments">
+        /// The array of arguments that will be filled in for parameters within
+        /// the message, or <see langword="null"/> if there are no parameters
+        /// within the message. Parameters within a message should be
+        /// referenced using the same syntax as the format string for the
+        /// <see cref="System.String.Format(string,object[])"/> method.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful.
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If no message could be resolved.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="name"/> is <see langword="null"/>.
+        /// </exception>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(string, object[])"/>
+        public string GetMessage(string name, params object[] arguments)
+        {
+            return MessageSource.GetMessage(name, arguments);
+        }
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If no message could be resolved.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="name"/> is <see langword="null"/>.
+        /// </exception>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(string, CultureInfo)"/>
+        public string GetMessage(string name, CultureInfo culture)
+        {
+            return MessageSource.GetMessage(name, culture);
+        }
+
+        /// <summary>
+        /// Resolve the message using all of the attributes contained within
+        /// the supplied <see cref="Spring.Context.IMessageSourceResolvable"/>
+        /// argument.
+        /// </summary>
+        /// <param name="resolvable">
+        /// The value object storing those attributes that are required to
+        /// properly resolve a message.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If the message could not be resolved.
+        /// </exception>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(IMessageSourceResolvable, CultureInfo)"/>
+        public string GetMessage(IMessageSourceResolvable resolvable, CultureInfo culture)
+        {
+            return MessageSource.GetMessage(resolvable, culture);
+        }
+
+        /// <summary>
+        /// Gets a localized resource object identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the resource object to resolve.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.
+        /// </param>
+        /// <returns>
+        /// The resolved object, or <see langword="null"/> if not found.
+        /// </returns>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(string, CultureInfo)"/>
+        object IMessageSource.GetResourceObject(string name, CultureInfo culture)
+        {
+            return GetResourceObject(name, culture);
+        }
+
+        /// <summary>
+        /// Gets a localized resource object identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the resource object to resolve.
+        /// </param>
+        /// <returns>
+        /// The resolved object, or <see langword="null"/> if not found.
+        /// </returns>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(string)"/>
+        object IMessageSource.GetResourceObject(string name)
+        {
+            return GetResourceObject(name);
+        }
+
+        /// <summary>
+        /// Gets a localized resource object identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the resource object to resolve.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.
+        /// </param>
+        /// <returns>
+        /// The resolved object, or <see langword="null"/> if not found.
+        /// </returns>
+        /// <seealso cref="Spring.Context.IMessageSource.GetResourceObject(string, CultureInfo)"/>
+        public object GetResourceObject(string name, CultureInfo culture)
+        {
+            return MessageSource.GetResourceObject(name, culture);
+        }
+
+        /// <summary>
+        /// Gets a localized resource object identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the resource object to resolve.
+        /// </param>
+        /// <returns>
+        /// The resolved object, or <see langword="null"/> if not found.
+        /// </returns>
+        /// <seealso cref="Spring.Context.IMessageSource.GetResourceObject(string)"/>
+        public object GetResourceObject(string name)
+        {
+            return MessageSource.GetResourceObject(name);
+        }
+
+        /// <summary>
+        /// Applies resources to object properties.
+        /// </summary>
+        /// <param name="value">
+        /// An object that contains the property values to be applied.
+        /// </param>
+        /// <param name="objectName">
+        /// The base name of the object to use for key lookup.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.
+        /// </param>
+        /// <seealso cref="Spring.Context.IMessageSource.ApplyResources(object, string, CultureInfo)"/>
+        public void ApplyResources(object value, string objectName, CultureInfo culture)
+        {
+            MessageSource.ApplyResources(value, objectName, culture);
+        }
+
+        #endregion
+
+        #region IEventRegistry Members
+
+        /// <summary>
+        /// Publishes <b>all</b> events of the source object.
+        /// </summary>
+        /// <param name="sourceObject">
+        /// The source object containing events to publish.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Events.IEventRegistry.PublishEvents"/>
+        public void PublishEvents(object sourceObject)
+        {
+            _eventRegistry.PublishEvents(sourceObject);
+        }
+
+        /// <summary>
+        /// Subscribes to <b>all</b> events published, if the subscriber
+        /// implements compatible handler methods.
+        /// </summary>
+        /// <param name="subscriber">The subscriber to use.</param>
+        /// <seealso cref="Spring.Objects.Events.IEventRegistry.Subscribe(object)"/>
+        public void Subscribe(object subscriber)
+        {
+            _eventRegistry.Subscribe(subscriber);
+        }
+
+        /// <summary>
+        /// Subscribes to published events of a all objects of a given
+        /// <see cref="System.Type"/>, if the subscriber implements
+        /// compatible handler methods.
+        /// </summary>
+        /// <param name="subscriber">The subscriber to use.</param>
+        /// <param name="targetSourceType">
+        /// The target <see cref="System.Type"/> to subscribe to.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Events.IEventRegistry.Subscribe(object, Type)"/>
+        public void Subscribe(object subscriber, Type targetSourceType)
+        {
+            _eventRegistry.Subscribe(subscriber, targetSourceType);
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Publishes an application context event.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// 
+        /// </p>
+        /// </remarks>
+        /// <param name="sender">
+        /// The source of the event. May be <see langword="null"/>.
+        /// </param>
+        /// <param name="e">
+        /// The event that is to be raised.
+        /// </param>
+        /// <seealso cref="Spring.Context.IApplicationEventPublisher.PublishEvent"/>
+        public void PublishEvent(object sender, ApplicationEventArgs e)
+        {
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(string.Format(
+                              CultureInfo.InvariantCulture,
+                              "Publishing event in context [{0}] : {1}",
+                              Name, e));
+            }
+
+            #endregion
+
+            OnContextEvent(sender, e);
+
+            if (ParentContext != null)
+            {
+                ParentContext.PublishEvent(sender, e);
+            }
+        }
+
+        #region IPostProcessor implementation 
+
+        private sealed class ObjectPostProcessorChecker : IObjectPostProcessor
+        {
+            private int _objectPostProcessorTargetCount;
+            private IConfigurableListableObjectFactory _objectFactory;
+
+
+            public ObjectPostProcessorChecker()
+            {
+            }
+
+//            public ObjectPostProcessorChecker(
+//                IConfigurableListableObjectFactory objectFactory, int objectPostProcessorTargetCount)
+//            {
+//                _objectFactory = objectFactory;
+//                _objectPostProcessorTargetCount = objectPostProcessorTargetCount;
+//            }
+
+            public void Reset(IConfigurableListableObjectFactory objectFactory, int objectPostProcessorTargetCount)
+            {
+                _objectFactory = objectFactory;
+                _objectPostProcessorTargetCount = objectPostProcessorTargetCount;
+            }
+
+            public object PostProcessBeforeInitialization(object obj, string name)
+            {
+                return obj;
+            }
+
+            public object PostProcessAfterInitialization(object obj, string objectName)
+            {
+                if (_objectFactory.ObjectPostProcessorCount < _objectPostProcessorTargetCount)
+                {
+                    #region Instrumentation
+
+                    if (log.IsInfoEnabled)
+                    {
+                        log.Info(string.Format(
+                                     "Object '{0}' is not eligible for being processed by all " +
+                                     "IObjectPostProcessors (for example: not eligible for auto-proxying).", objectName));
+                    }
+
+                    #endregion
+                }
+                return obj;
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/AbstractMessageSource.cs b/src/Spring/Spring.Core/Context/Support/AbstractMessageSource.cs
new file mode 100644
index 00000000..0c426817
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/AbstractMessageSource.cs
@@ -0,0 +1,617 @@
+#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.Globalization;
+using Common.Logging;
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Abstract implementation of the <see cref="Spring.Context.IHierarchicalMessageSource"/> interface,
+    /// implementing common handling of message variants, making it easy
+    /// to implement a specific strategy for a concrete <see cref="Spring.Context.IMessageSource"/>.
+    /// </summary>
+    /// <remarks>
+    /// <p>Subclasses must implement the abstract <code>ResolveObject</code>
+    /// method.</p>
+    /// <p><b>Note:</b> By default, message texts are only parsed through
+    /// String.Format if arguments have been passed in for the message. In case
+    /// of no arguments, message texts will be returned as-is. As a consequence,
+    /// you should only use String.Format escaping for messages with actual
+    /// arguments, and keep all other messages unescaped.
+    /// </p>
+    /// <p>Supports not only IMessageSourceResolvables as primary messages
+    /// but also resolution of message arguments that are in turn
+    /// IMessageSourceResolvables themselves.
+    /// </p>
+    /// <p>This class does not implement caching of messages per code, thus
+    /// subclasses can dynamically change messages over time. Subclasses are
+    /// encouraged to cache their messages in a modification-aware fashion,
+    /// allowing for hot deployment of updated messages.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <author>Harald Radi (.NET)</author>
+    /// <version>$Id: AbstractMessageSource.cs,v 1.23 2007/08/28 14:16:15 oakinger Exp $</version>
+    /// <seealso cref="Spring.Context.IMessageSourceResolvable"/>
+    /// <seealso cref="Spring.Context.IMessageSource"/>
+    /// <seealso cref="Spring.Context.IHierarchicalMessageSource"/>
+    public abstract class AbstractMessageSource : IHierarchicalMessageSource
+    {
+        #region Fields
+
+        /// <summary>
+        /// holds the logger instance shared with subclasses.
+        /// </summary>
+        protected readonly ILog log;
+
+        private IMessageSource parentMessageSource;
+        private bool useCodeAsDefaultMessage = false;
+
+        #endregion
+
+        #region Constructor
+
+		/// <summary>
+		/// Initializes this instance.
+		/// </summary>
+        protected AbstractMessageSource()
+        {
+            log = LogManager.GetLogger(GetType());
+        }
+
+        #endregion
+
+        #region Properties
+
+
+        /// <summary>Gets or Sets a value indicating whether to use the message code as 
+        /// default message instead of throwing a NoSuchMessageException. 
+        /// Useful for development and debugging. Default is "false".
+        /// </summary>
+        /// <remarks>
+        /// <p>Note: In case of a IMessageSourceResolvable with multiple codes
+        /// (like a FieldError) and a MessageSource that has a parent MessageSource,
+        /// do <i>not</i> activate "UseCodeAsDefaultMessage" in the <i>parent</i>:
+        /// Else, you'll get the first code returned as message by the parent,
+        /// without attempts to check further codes.</p>
+        /// <p>To be able to work with "UseCodeAsDefaultMessage" turned on in the parent,
+        /// AbstractMessageSource contains special checks
+        /// to delegate to the internal <code>GetMessageInternal</code> method if available.
+        /// In general, it is recommended to just use "UseCodeAsDefaultMessage" during
+        /// development and not rely on it in production in the first place, though.</p>
+        /// <p>Alternatively, consider overriding the <code>GetDefaultMessage</code>
+        /// method to return a custom fallback message for an unresolvable code.</p>
+        /// </remarks>
+        /// <value>
+        /// 	<c>true</c> if use the message code as default message instead of 
+        /// throwing a NoSuchMessageException; otherwise, <c>false</c>.
+        /// </value>
+        public bool UseCodeAsDefaultMessage
+        {
+            get { return useCodeAsDefaultMessage; }
+            set { useCodeAsDefaultMessage = value; }
+        }
+
+        #endregion
+
+        #region IHierarchicalMessageSource Members
+
+        /// <summary>
+        /// The parent message source used to try and resolve messages that
+        /// this object can't resolve.
+        /// </summary>
+        /// <value></value>
+        /// <remarks>
+        /// 	<p>
+        /// If the value of this property is <see langword="null"/> then no
+        /// further resolution is possible.
+        /// </p>
+        /// </remarks>
+        public IMessageSource ParentMessageSource
+        {
+            get { return parentMessageSource; }
+            set { parentMessageSource = value; }
+        }
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <remarks>
+        /// If the lookup is not successful throw NoSuchMessageException
+        /// </remarks>
+        public string GetMessage(string name)
+        {
+            return GetMessage(name, CultureInfo.CurrentUICulture, null);
+        }
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="culture">The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.</param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <remarks>
+        /// Note that the fallback behavior based on CultureInfo seem to
+        /// have a bug that is fixed by installed .NET 1.1 Service Pack 1.
+        /// <p>
+        /// If the lookup is not successful, implementations are permitted to
+        /// take one of two actions.
+        /// </p>
+        /// If the lookup is not successful throw NoSuchMessageException
+        /// </remarks>
+        public string GetMessage(string name, CultureInfo culture)
+        {
+            return GetMessage(name, culture, null);
+        }
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="arguments">The array of arguments that will be filled in for parameters within
+        /// the message, or <see langword="null"/> if there are no parameters
+        /// within the message. Parameters within a message should be
+        /// referenced using the same syntax as the format string for the
+        /// <see cref="System.String.Format(string,object[])"/> method.</param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <remarks>
+        /// If the lookup is not successful throw NoSuchMessageException
+        /// </remarks>
+        public string GetMessage(string name, params object[] arguments)
+        {
+            return GetMessage(name, CultureInfo.CurrentUICulture, arguments);
+        }
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="culture">The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.</param>
+        /// <param name="arguments">The array of arguments that will be filled in for parameters within
+        /// the message, or <see langword="null"/> if there are no parameters
+        /// within the message. Parameters within a message should be
+        /// referenced using the same syntax as the format string for the
+        /// <see cref="System.String.Format(string,object[])"/> method.</param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <remarks>
+        /// Note that the fallback behavior based on CultureInfo seem to
+        /// have a bug that is fixed by installed .NET 1.1 Service Pack 1.
+        /// <p>
+        /// If the lookup is not successful throw NoSuchMessageException.
+        /// </p>
+        /// </remarks>        
+        public string GetMessage(string name, CultureInfo culture, params object[] arguments)
+        {
+            string msg = GetMessageInternal(name, arguments, culture);
+            if (msg != null) return msg;
+            string fallback = GetDefaultMessage(name);
+            if (fallback != null) return fallback;
+            throw new NoSuchMessageException(name, culture);
+        }
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="defaultMessage">The default message if name is not found.</param>
+        /// <param name="culture">The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.</param>
+        /// <param name="arguments">The array of arguments that will be filled in for parameters within
+        /// the message, or <see langword="null"/> if there are no parameters
+        /// within the message. Parameters within a message should be
+        /// referenced using the same syntax as the format string for the
+        /// <see cref="System.String.Format(string,object[])"/> method.</param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <remarks>
+        /// Note that the fallback behavior based on CultureInfo seem to
+        /// have a bug that is fixed by installed .NET 1.1 Service Pack 1.
+        /// <p>
+        /// If the lookup is not successful throw NoSuchMessageException
+        /// </p>
+        /// </remarks>
+        public string GetMessage(string name, string defaultMessage, CultureInfo culture, params object[] arguments)
+        {
+            string msg = GetMessageInternal(name, arguments, culture);
+            if (msg != null) return msg;
+            if (defaultMessage == null)
+            {
+                string fallback = GetDefaultMessage(name);
+                if (fallback != null) return fallback;
+            }
+            return RenderDefaultMessage(defaultMessage, arguments, culture);
+        }
+
+        /// <summary>
+        /// Resolve the message using all of the attributes contained within
+        /// the supplied <see cref="Spring.Context.IMessageSourceResolvable"/>
+        /// argument.
+        /// </summary>
+        /// <param name="resolvable">The value object storing those attributes that are required to
+        /// properly resolve a message.</param>
+        /// <param name="culture">The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.</param>
+        /// <returns>
+        /// The resolved message if the lookup was successful.
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If the message could not be resolved.
+        /// </exception>
+        public string GetMessage(IMessageSourceResolvable resolvable, CultureInfo culture)
+        {
+            string[] codes = resolvable.GetCodes();
+            if (codes == null) codes = new string[0];
+            for (int i = 0; i < codes.Length; i++)
+            {
+                string msg = GetMessageInternal(codes[i], resolvable.GetArguments(), culture);
+                if (msg != null) return msg;
+            }
+            if (resolvable.DefaultMessage != null)
+                return RenderDefaultMessage(resolvable.DefaultMessage, resolvable.GetArguments(), culture);
+            if (codes.Length > 0)
+            {
+                string fallback = GetDefaultMessage(codes[0]);
+                if (fallback != null) return fallback;
+            }
+            throw new NoSuchMessageException(codes.Length > 0 ? codes[codes.Length - 1] : null, culture);
+        }
+
+        /// <summary>
+        /// Gets a localized resource object identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the resource object to resolve.
+        /// </param>
+        /// <returns>
+        /// The resolved object, or <see langword="null"/> if not found.
+        /// </returns>
+        /// <seealso cref="Spring.Context.IMessageSource.GetResourceObject(string)"/>
+        public object GetResourceObject(string name)
+        {
+            object resource = GetResourceInternal(name, CultureInfo.CurrentUICulture);
+            if (resource != null) return resource;
+            if (ParentMessageSource != null)
+                return ParentMessageSource.GetResourceObject(name, CultureInfo.CurrentUICulture);
+            return null;
+        }
+
+        /// <summary>
+        /// Gets a localized resource object identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <remarks>
+        /// Note that the fallback behavior based on CultureInfo seem to 
+        /// have a bug that is fixed by installed .NET 1.1 Service Pack 1.  
+        /// </remarks>	    
+        /// <param name="name">
+        /// The name of the resource object to resolve.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.
+        /// </param>
+        /// <returns>
+        /// The resolved object, or <see langword="null"/> if not found.  If
+        /// the resource name resolves to null, then in .NET 1.1 the return
+        /// value will be String.Empty whereas in .NET 2.0 it will return
+        /// null.
+        /// </returns>
+        /// <seealso cref="Spring.Context.IMessageSource.GetResourceObject(string, CultureInfo)"/>
+        public object GetResourceObject(string name, CultureInfo culture)
+        {
+            object resource = GetResourceInternal(name, culture);
+            if (resource != null) return resource;
+            if (ParentMessageSource != null) return ParentMessageSource.GetResourceObject(name, culture);
+            return null;
+        }
+
+        /// <summary>
+        /// Applies resources to object properties.
+        /// </summary>
+        /// <param name="value">
+        /// An object that contains the property values to be applied.
+        /// </param>
+        /// <param name="objectName">
+        /// The base name of the object to use for key lookup.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.
+        /// </param>
+        /// <seealso cref="Spring.Context.IMessageSource.ApplyResources(object, string, CultureInfo)"/>
+        public void ApplyResources(
+            object value, string objectName, CultureInfo culture)
+        {
+            ApplyResourcesInternal(value, objectName, culture);
+            if (ParentMessageSource != null) ParentMessageSource.ApplyResources(value, objectName, culture);
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>Resolve the given code and arguments as message in the given culture,
+        /// returning null if not found. Does <i>not</i> fall back to the code
+        /// as default message. Invoked by GetMessage methods.
+        /// </summary>
+        /// <param name="code">The code to lookup up, such as 'calculator.noRateSet'.</param>
+        /// <param name="args"> array of arguments that will be filled in for params
+        /// within the message.</param>
+        /// <param name="culture">The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.</param>
+        /// <returns>
+        /// The resolved message if the lookup was successful.
+        /// </returns>
+        protected string GetMessageInternal(string code, object[] args, CultureInfo culture)
+        {
+            if (code == null) return null;
+            if (culture == null) culture = CultureInfo.CurrentUICulture;
+
+            if ((args != null && args.Length > 0))
+            {
+                // Resolve arguments eagerly, for the case where the message
+                // is defined in a parent MessageSource but resolvable arguments
+                // are defined in the child MessageSource.
+                args = ResolveArguments(args, culture);
+            }
+
+            string message = ResolveMessage(code, culture);
+
+            if (message != null) return FormatMessage(message, args, culture);
+
+            // Not found -> check parent, if any.
+            return GetMessageFromParent(code, args, culture);
+        }
+
+
+        /// <summary>
+        /// Try to retrieve the given message from the parent MessageSource, if any.
+        /// </summary>
+        /// <param name="code">The code to lookup up, such as 'calculator.noRateSet'.</param>
+        /// <param name="args"> array of arguments that will be filled in for params
+        /// within the message.</param>
+        /// <param name="culture">The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.</param>
+        /// <returns>
+        /// The resolved message if the lookup was successful.
+        /// </returns>
+        protected string GetMessageFromParent(string code, object[] args, CultureInfo culture)
+        {
+            if (ParentMessageSource != null)
+            {
+                AbstractMessageSource parent = ParentMessageSource as AbstractMessageSource;
+                if (parent != null)
+                {
+                    // Call internal method to avoid getting the default code back
+                    // in case of "useCodeAsDefaultMessage" being activated.
+                    return parent.GetMessageInternal(code, args, culture);
+                }
+                else
+                {
+                    // Check parent MessageSource, returning null if not found there.
+                    return ParentMessageSource.GetMessage(code, null, culture, args);
+                }
+            }
+            // Not found in parent either.
+            return null;
+        }
+
+
+        /// <summary>
+        /// Return a fallback default message for the given code, if any.
+        /// </summary>
+        /// <remarks>
+        /// Default is to return the code itself if "UseCodeAsDefaultMessage"
+        /// is activated, or return no fallback else. In case of no fallback,
+        /// the caller will usually receive a NoSuchMessageException from GetMessage
+        /// </remarks>
+        /// <param name="code">The code to lookup up, such as 'calculator.noRateSet'.</param>
+        /// <returns>The default message to use, or null if none.</returns>
+        protected virtual string GetDefaultMessage(string code)
+        {
+            if (UseCodeAsDefaultMessage) return code;
+            return null;
+        }
+
+
+
+        /// <summary>
+        /// Renders the default message string.  The default message is passed in as specified by the
+        /// caller and can be rendered into a fully formatted default message shown to the user.
+        /// </summary>
+        /// <remarks>Default implementation passed he String for String.Format resolving any 
+        /// argument placeholders found in them.  Subclasses may override this method to plug
+        /// in custom processing of default messages.
+        /// </remarks>
+        /// <param name="defaultMessage">The default message.</param>
+        /// <param name="args">The array of agruments that will be filled in for parameter
+        /// placeholders within the message, or null if none.</param>
+        /// <param name="culture">The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.</param>
+        /// <returns>The rendered default message (with resolved arguments)</returns>
+        protected virtual string RenderDefaultMessage(string defaultMessage, object[] args, CultureInfo culture)
+        {
+            return FormatMessage(defaultMessage, args, culture);
+        }
+
+        /// <summary>
+        /// Format the given default message String resolving any 
+        /// agrument placeholders found in them.
+        /// </summary>
+        /// <param name="msg">The message to format.</param>
+        /// <param name="args">The array of agruments that will be filled in for parameter
+        /// placeholders within the message, or null if none.</param>
+        /// <param name="culture">The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.</param>
+        /// <returns>The formatted message (with resolved arguments)</returns>
+        protected virtual string FormatMessage(string msg, object[] args, CultureInfo culture)
+        {
+            if (msg == null || ((args == null || args.Length == 0))) return msg;
+            return String.Format(culture, msg, args);
+        }
+
+
+        /// <summary>
+        /// Search through the given array of objects, find any
+        /// MessageSourceResolvable objects and resolve them.
+        /// </summary>
+        /// <remarks>
+        /// Allows for messages to have MessageSourceResolvables as arguments.
+        /// </remarks>
+        /// 
+        /// <param name="args">The array of arguments for a message.</param>
+        /// <param name="culture">The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.</param>
+        /// <returns>An array of arguments with any IMessageSourceResolvables resolved</returns>
+        protected virtual object[] ResolveArguments(object[] args, CultureInfo culture)
+        {
+            if (args == null) return new object[0];
+            object[] resolvedArgs = new object[args.Length];
+
+            for (int i = 0; i < args.Length; i++)
+            {
+                IMessageSourceResolvable resolvable = args[i] as IMessageSourceResolvable;
+                if (resolvable != null) resolvedArgs[i] = GetMessage(resolvable, culture);
+                else resolvedArgs[i] = args[i];
+            }
+
+            return resolvedArgs;
+        }
+
+		/// <summary>
+		/// Gets the specified resource (e.g. Icon or Bitmap).
+		/// </summary>
+		/// <param name="name">The name of the resource to resolve.</param>
+		/// <param name="cultureInfo">
+		/// The <see cref="System.Globalization.CultureInfo"/> to resolve the
+		/// code for.
+		/// </param>
+		/// <returns>The resource if found. <see langword="null"/> otherwise.</returns>
+        protected object GetResourceInternal(string name, CultureInfo cultureInfo)
+        {
+            if (cultureInfo == null) cultureInfo = CultureInfo.CurrentUICulture;
+            if (name == null) return null;
+            return ResolveObject(name, cultureInfo);
+        }
+
+		/// <summary>
+		/// Applies resources from the given name on the specified object.
+		/// </summary>
+		/// <param name="value">
+		/// An object that contains the property values to be applied.
+		/// </param>
+		/// <param name="objectName">
+		/// The base name of the object to use for key lookup.
+		/// </param>
+		/// <param name="cultureInfo">
+		/// The <see cref="System.Globalization.CultureInfo"/> with which the
+		/// resource is associated.
+		/// </param>
+		protected void ApplyResourcesInternal(object value, string objectName, CultureInfo cultureInfo)
+        {
+            if (cultureInfo == null) cultureInfo = CultureInfo.CurrentUICulture;
+            ApplyResourcesToObject(value, objectName, cultureInfo);
+        }
+
+        #endregion
+
+        #region Protected Abstract Methods
+
+        /// <summary>
+        /// Subclasses must implement this method to resolve a message.
+        /// </summary>
+        /// <param name="code">The code to lookup up, such as 'calculator.noRateSet'.</param>
+        /// <param name="cultureInfo">The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.</param>
+        /// <returns>The resolved message from the backing store of message data.</returns>
+        protected abstract string ResolveMessage(string code, CultureInfo cultureInfo);
+
+        /// <summary>
+        /// Resolves an object (typically an icon or bitmap).
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Subclasses must implement this method to resolve an object.
+        /// </p>
+        /// </remarks>
+        /// <param name="code">The code of the object to resolve.</param>
+        /// <param name="cultureInfo">
+        /// The <see cref="System.Globalization.CultureInfo"/> to resolve the
+        /// code for.
+        /// </param>
+        /// <returns>
+        /// The resolved object or <see langword="null"/> if not found.
+        /// </returns>
+        protected abstract object ResolveObject(string code, CultureInfo cultureInfo);
+
+        /// <summary>
+        /// Applies resources to object properties.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Subclasses must implement this method to apply resources
+        /// to an arbitrary object.
+        /// </p>
+        /// </remarks>
+        /// <param name="value">
+        /// An object that contains the property values to be applied.
+        /// </param>
+        /// <param name="objectName">
+        /// The base name of the object to use for key lookup.
+        /// </param>
+        /// <param name="cultureInfo">
+        /// The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.
+        /// </param>
+        protected abstract void ApplyResourcesToObject(object value, string objectName, CultureInfo cultureInfo);
+
+
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs
new file mode 100644
index 00000000..75025375
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs
@@ -0,0 +1,293 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using Common.Logging;
+using Spring.Objects;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Convenient abstract superclass for
+    /// <see cref="Spring.Context.IApplicationContext"/> implementations that
+    /// draw their configuration from XML documents containing object
+    /// definitions as understood by an 
+    /// <see cref="Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/>.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <version>$Id: AbstractXmlApplicationContext.cs,v 1.20 2007/07/20 11:37:55 oakinger Exp $</version>
+    public abstract class AbstractXmlApplicationContext : AbstractApplicationContext
+    {
+		/// <summary>
+		/// The <see cref="Common.Logging.ILog"/> instance for this class.
+		/// </summary>
+		private static readonly ILog log = LogManager.GetLogger(typeof(AbstractXmlApplicationContext));
+
+        private DefaultListableObjectFactory _objectFactory;
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Context.Support.AbstractXmlApplicationContext"/>
+        /// class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes
+        /// no public constructors.
+        /// </p>
+        /// </remarks>
+        protected AbstractXmlApplicationContext() : this(null, true, null)
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Context.Support.AbstractXmlApplicationContext"/> class
+        /// with the given parent context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes
+        /// no public constructors.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">The application context name.</param>
+        /// <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+        /// <param name="parentContext">The parent context.</param>
+        protected AbstractXmlApplicationContext(string name, bool caseSensitive, 
+			IApplicationContext parentContext) : base(name, caseSensitive, parentContext)
+        {}
+
+        /// <summary>
+        /// An array of resource locations, referring to the XML object
+        /// definition files that this context is to be built with.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Examples of the format of the various strings that would be
+        /// returned by accessing this property can be found in the overview
+        /// documentation of with the <see cref="XmlApplicationContext"/>
+        /// class.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// An array of resource locations, or <see langword="null"/> if none.
+        /// </returns>
+        protected abstract string[] ConfigurationLocations { get; }
+
+        /// <summary>
+        /// Instantiates and populates the underlying
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> with the object
+        /// definitions yielded up by the <see cref="ConfigurationLocations"/>
+        /// method.
+        /// </summary>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of errors encountered while refreshing the object factory.
+        /// </exception>
+        /// <exception cref="ApplicationContextException">
+        /// In the case of errors encountered reading any of the resources
+        /// yielded by the <see cref="ConfigurationLocations"/> method.
+        /// </exception>
+        /// <seealso cref="Spring.Context.Support.AbstractApplicationContext.RefreshObjectFactory()"/>
+        protected override void RefreshObjectFactory()
+        {
+            // Shut down previous object factory, if any.
+            IConfigurableListableObjectFactory oldObjectFactory = null;
+            oldObjectFactory = _objectFactory;
+
+            if (oldObjectFactory != null)
+            {
+                _objectFactory = null;
+                oldObjectFactory.Dispose();
+            }
+
+            try
+            {
+                DefaultListableObjectFactory objectFactory = CreateObjectFactory();
+                LoadObjectDefinitions(objectFactory);
+
+                _objectFactory = objectFactory;
+
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(
+                        string.Format(
+                            "Refreshed ObjectFactory for application context '{0}'.",
+                            Name));
+                }
+
+                #endregion
+            }
+            catch (IOException ex)
+            {
+                throw new ApplicationContextException(
+                    string.Format(
+                        "I/O error parsing XML resource for application context '{0}'.",
+                        Name), ex);
+            }
+            catch (UriFormatException ex)
+            {
+                throw new ApplicationContextException(
+                    string.Format(
+                        "Error parsing resource locations [{0}] for application context '{1}'.",
+                        StringUtils.ArrayToCommaDelimitedString(ConfigurationLocations),
+                        Name), ex);
+            }
+        }
+
+
+        /// <summary>
+        /// Initialize the object definition reader used for loading the object
+        /// definitions of this context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The default implementation of this method is a no-op; i.e. it does
+        /// nothing. Can be overridden in subclasses to provide custom
+        /// initialization of the supplied
+        /// <paramref name="objectDefinitionReader"/>; for example, a derived
+        /// class may want to turn off XML validation.
+        /// </p>
+        /// </remarks>
+        /// <param name="objectDefinitionReader">
+        /// The object definition reader used by this context.
+        /// </param>
+        protected virtual void InitObjectDefinitionReader(
+            XmlObjectDefinitionReader objectDefinitionReader)
+        {}
+
+        /// <summary>
+        /// Load the object definitions with the given 
+        /// <see cref="Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The lifecycle of the object factory is handled by
+        /// <see cref="Spring.Context.Support.AbstractXmlApplicationContext.RefreshObjectFactory"/>;
+        /// therefore this method is just supposed to load and / or register
+        /// object definitions.
+        /// </p>
+        /// </remarks>
+        /// <param name="objectDefinitionReader">
+        /// The reader containing object definitions.</param>
+        /// <exception cref="ObjectsException">
+        /// In case of object registration errors.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of errors encountered reading any of the resources
+        /// yielded by the <see cref="ConfigurationLocations"/> method.
+        /// </exception>
+        protected virtual void LoadObjectDefinitions(
+            XmlObjectDefinitionReader objectDefinitionReader)
+        {
+            string[] locations = ConfigurationLocations;
+            if (locations != null)
+            {
+                objectDefinitionReader.LoadObjectDefinitions(ConfigurationLocations);
+            }
+        }
+
+
+        /// <summary>
+        /// Loads the object definitions into the given object factory, typically through
+        /// delegating to one or more object definition readers.
+        /// </summary>
+        /// <param name="objectFactory">The object factory to lead object definitions into</param>
+        /// <see cref="XmlObjectDefinitionReader"/>
+        /// <see cref="PropertiesObjectDefinitionReader"/>
+        protected virtual void LoadObjectDefinitions(DefaultListableObjectFactory objectFactory)
+        {
+            //Create a new XmlObjectDefinitionReader for the given ObjectFactory
+            XmlObjectDefinitionReader objectDefinitionReader = new XmlObjectDefinitionReader(objectFactory);
+
+            // Configure the bean definition reader with this context's
+            // resource loading environment.
+            objectDefinitionReader.ResourceLoader = this;
+
+            // Allow a subclass to provide custom initialization of the reader,
+            // then proceed with actually loading the object definitions.
+            InitObjectDefinitionReader(objectDefinitionReader);
+            LoadObjectDefinitions(objectDefinitionReader);
+        }
+
+        /// <summary>
+        /// Customizes the internal object factory used by this context.
+        /// </summary>
+        /// <remarks>Called for each <see cref="AbstractApplicationContext.Refresh()"/> attempt.
+        /// <p>
+        /// The default implementation is empty.  Can be overriden in subclassses to customize
+        /// DefaultListableBeanFatory's standard settings.
+        /// </p></remarks>
+        /// <param name="objectFactory">The newly created object factory for this context</param>
+        protected virtual void CustomizeObjectFactory(DefaultListableObjectFactory objectFactory)
+        {
+            
+        }
+
+        /// <summary>
+        /// Create an internal object factory for this context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Called for each <see cref="AbstractApplicationContext.Refresh()"/> attempt.
+        /// This default implementation creates a
+        /// <see cref="Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>
+        /// with the internal object factory of this context's parent serving
+        /// as the parent object factory.  Can be overridden in subclasse,s 
+        /// for example to customize DefaultListableBeanFactory's settings.
+        /// </p>
+        /// </remarks>
+        /// <returns>The object factory for this context.</returns>
+        protected virtual DefaultListableObjectFactory CreateObjectFactory()
+        {
+            return new DefaultListableObjectFactory(CaseSensitive, GetInternalParentObjectFactory());
+        }
+
+        /// <summary>
+        /// Subclasses must return their internal object factory here.
+        /// </summary>
+        /// <returns>
+        /// The internal object factory for the application context.
+        /// </returns>
+        /// <seealso cref="Spring.Context.Support.AbstractApplicationContext.ObjectFactory"/>
+        public override IConfigurableListableObjectFactory ObjectFactory
+        {
+            get
+            {
+				lock(SyncRoot)
+				{
+					return _objectFactory;
+				}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/ApplicationContextAwareProcessor.cs b/src/Spring/Spring.Core/Context/Support/ApplicationContextAwareProcessor.cs
new file mode 100644
index 00000000..3d8a45ac
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/ApplicationContextAwareProcessor.cs
@@ -0,0 +1,149 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Remoting;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+	/// implementation that passes the application context to object that
+	/// implement the
+	/// <see cref="Spring.Context.IApplicationContextAware"/>,
+	/// <see cref="Spring.Context.IMessageSourceAware"/>, and
+	/// <see cref="Spring.Context.IResourceLoaderAware"/> interfaces. 
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// If an object's class implements more than one of the
+	/// <see cref="Spring.Context.IApplicationContextAware"/>,
+	/// <see cref="Spring.Context.IMessageSourceAware"/>, and
+	/// <see cref="Spring.Context.IResourceLoaderAware"/> interfaces, then the
+	/// order in which the interfaces are satisfied is as follows...
+	/// <list type="bullet">
+	/// <item><description>
+	/// <see cref="Spring.Context.IResourceLoaderAware"/>
+	/// </description></item>
+	/// <item><description>
+	/// <see cref="Spring.Context.IMessageSourceAware"/>
+	/// </description></item>
+	/// <item><description>
+	/// <see cref="Spring.Context.IApplicationContextAware"/>
+	/// </description></item>
+	/// </list>
+	/// </p>
+	/// <p>
+	/// Application contexts will automatically register this with their
+	/// underlying object factory. Applications should thus never need to use
+	/// this class directly.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: ApplicationContextAwareProcessor.cs,v 1.8 2007/08/22 08:49:26 markpollack Exp $</version>
+	public class ApplicationContextAwareProcessor : IObjectPostProcessor
+	{
+		private IApplicationContext _applicationContext;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.Support.ApplicationContextAwareProcessor"/> class.
+		/// </summary>
+		/// <param name="applicationContext">
+		/// The <see cref="Spring.Context.IApplicationContext"/> that this
+		/// instance will work with.
+		/// </param>
+		public ApplicationContextAwareProcessor(
+			IApplicationContext applicationContext)
+		{
+			_applicationContext = applicationContext;
+		}
+
+		/// <summary>
+		/// Apply this <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+		/// to the given new object instance <i>before</i> any object
+		/// initialization callbacks.
+		/// </summary>
+		/// <param name="obj">
+		/// The new object instance.
+		/// </param>
+		/// <param name="objectName">
+		/// The name of the object.
+		/// </param>
+		/// <returns>
+		/// The the object instance to use, either the original or a wrapped one.
+		/// </returns>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In case of errors.
+		/// </exception>
+		/// <seealso cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization"/>
+		public object PostProcessAfterInitialization(object obj, string objectName)
+		{
+			return obj;
+		}
+
+		/// <summary>
+		/// Apply this <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/> to the
+		/// given new object instance <i>after</i> any object initialization
+		/// callbacks.
+		/// </summary>
+		/// <param name="obj">
+		/// The new object instance.
+		/// </param>
+		/// <param name="name">
+		/// The name of the object.
+		/// </param>
+		/// <returns>
+		/// The object instance to use, either the original or a wrapped one.
+		/// </returns>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In case of errors.
+		/// </exception>
+		/// <seealso cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization"/>
+		public object PostProcessBeforeInitialization(object obj, string name)
+		{
+			if(!RemotingServices.IsTransparentProxy(obj)) 
+			{
+				if (typeof (IResourceLoaderAware).IsInstanceOfType(obj))
+				{
+					((IResourceLoaderAware) obj).ResourceLoader
+						= _applicationContext;
+				}
+				if (typeof (IMessageSourceAware).IsInstanceOfType(obj))
+				{
+					((IMessageSourceAware) obj).MessageSource
+						= _applicationContext;
+				}
+				if (typeof (IApplicationContextAware).IsInstanceOfType(obj))
+				{
+					((IApplicationContextAware) obj).ApplicationContext
+						= _applicationContext;
+				}
+			}
+			return obj;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/ApplicationObjectSupport.cs b/src/Spring/Spring.Core/Context/Support/ApplicationObjectSupport.cs
new file mode 100644
index 00000000..f6807649
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/ApplicationObjectSupport.cs
@@ -0,0 +1,210 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// Convenient superclass for application objects that want to be aware of
+	/// the application context, e.g. for custom lookup of collaborating object
+	/// or for context-specific resource access. 
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// It saves the application context reference and provides an
+	/// initialization callback method. Furthermore, it offers numerous
+	/// convenience methods for message lookup.
+	/// </p>
+	/// <p>
+	/// There is no requirement to subclass this class: it just makes things
+	/// a little easier if you need access to the context, e.g. for access to
+	/// file resources or to the message source. Note that many application
+	/// objects do not need to be aware of the application context at all,
+	/// as they can receive collaborating objects via object references.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: ApplicationObjectSupport.cs,v 1.8 2007/07/17 14:51:14 oakinger Exp $</version>
+	public abstract class ApplicationObjectSupport : IApplicationContextAware
+	{
+		private IApplicationContext _applicationContext;
+		private MessageSourceAccessor _messageSourceAccessor;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.Support.ApplicationObjectSupport"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an <see langword="abstract"/> class, and as such exposes no
+		/// public constructors.
+		/// </p>
+		/// </remarks>
+		protected ApplicationObjectSupport()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.Support.ApplicationObjectSupport"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an <see langword="abstract"/> class, and as such exposes no
+		/// public constructors.
+		/// </p>
+		/// </remarks>
+		/// <param name="applicationContext">
+		/// The <see cref="Spring.Context.IApplicationContext"/> that this
+		/// object runs in.
+		/// </param>
+		protected ApplicationObjectSupport(
+			IApplicationContext applicationContext)
+		{
+			_applicationContext = applicationContext;
+		}
+
+		/// <summary>
+		/// The context class that any context passed to the
+		/// <see cref="Spring.Context.Support.ApplicationObjectSupport.ApplicationContext"/>
+		/// must be an instance of.
+		/// </summary>
+		/// <value>
+		/// The <see cref="Spring.Context.IApplicationContext"/>
+		/// <see cref="System.Type"/>.
+		/// </value>
+		protected virtual Type RequiredType
+		{
+			get { return typeof (IApplicationContext); }
+		}
+
+		/// <summary>
+		/// Intializes the wrapped
+		/// <see cref="Spring.Context.IApplicationContext"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a template method that subclasses can override for custom
+		/// initialization behavior.
+		/// </p>
+		/// <p>
+		/// Gets called by the
+		/// <see cref="Spring.Context.Support.ApplicationObjectSupport.ApplicationContext"/>
+		/// instance directly after setting the context instance.
+		/// </p>
+		/// <note type="caution">
+		/// Does not get called on reinitialization of the context.
+		/// </note>
+		/// </remarks>
+		/// <exception cref="ApplicationContextException">
+		/// In the case of any initialization errors.
+		/// </exception>
+		/// <exception cref="ObjectsException">
+		/// If thrown by application context methods.
+		/// </exception>
+		protected virtual void InitApplicationContext()
+		{
+		}
+
+		/// <summary>
+		/// Return a <see cref="Spring.Context.Support.MessageSourceAccessor"/> for the
+		/// application context used by this object, for easy message access.
+		/// </summary>
+		public MessageSourceAccessor MessageSourceAccessor
+		{
+			get { return _messageSourceAccessor; }
+		}
+
+		#region IApplicationContextAware Members
+
+		/// <summary>
+		/// Set the <see cref="Spring.Context.IApplicationContext"/> that this
+		/// object runs in.
+		/// </summary>
+		/// <exception cref="Spring.Context.ApplicationContextException">
+		/// When passed an unexpected
+		/// <see cref="Spring.Context.IApplicationContext"/> implementation
+		/// instance that is not compatible with the <see cref="System.Type"/>
+		/// defined by the value of the
+		/// <see cref="Spring.Context.Support.ApplicationObjectSupport.RequiredType"/>. 
+		/// property. Also, thrown when trying to re-initialize with a
+		/// different <see cref="Spring.Context.IApplicationContext"/> than was
+		/// originally used.
+		/// </exception>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If thrown by any application context methods.
+		/// </exception>
+		/// <exception cref="Spring.Objects.Factory.ObjectInitializationException"/>
+		/// <seealso cref="Spring.Context.IApplicationContextAware.ApplicationContext"/>
+		public IApplicationContext ApplicationContext
+		{
+			get { return _applicationContext; }
+			set
+			{
+				if (_applicationContext == null)
+				{
+					if (! isValueOfRequiredType(value))
+					{
+						throw new ApplicationContextException(
+							"Invalid application context: needs to by of type '" + RequiredType.DeclaringType + "'");
+					}
+					_applicationContext = value;
+					_messageSourceAccessor = new MessageSourceAccessor(value);
+					InitApplicationContext();
+				}
+				else
+				{
+					if (_applicationContext != value)
+					{
+						throw new ApplicationContextException("Cannot reinitialize with different application context");
+					}
+				}
+			}
+		}
+
+		private bool isValueOfRequiredType(IApplicationContext value)
+		{
+			if (value.GetType() == RequiredType)
+			{
+				return true;
+			}
+			Type[] implementedTypes = value.GetType().GetInterfaces();
+			for (int i = 0; i < implementedTypes.Length; i++)
+			{
+				if (implementedTypes[i] == RequiredType)
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/ContextHandler.cs b/src/Spring/Spring.Core/Context/Support/ContextHandler.cs
new file mode 100644
index 00000000..3d613f4c
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/ContextHandler.cs
@@ -0,0 +1,642 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Configuration;
+using System.Reflection;
+using System.Xml;
+
+using Common.Logging;
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Objects;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// Creates an <see cref="Spring.Context.IApplicationContext"/> instance
+	/// using context definitions supplied in a custom configuration and
+	/// configures the <see cref="ContextRegistry"/> with that instance.
+	/// </summary>
+	/// <remarks>
+	/// Implementations of the <see cref="Spring.Context.IApplicationContext"/>
+	/// interface <b>must</b> provide the following two constructors:
+	/// <list type="number">
+	/// <item>
+	/// <description>
+	/// A constructor that takes a string array of resource locations.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// A constructor that takes a reference to a parent application context
+	/// and a string array of resource locations (and in that order).
+	/// </description>
+	/// </item>
+	/// </list>
+	/// <p>
+	/// Note that if the <c>type</c> attribute is not present in the declaration
+	/// of a particular context, then a default
+	/// <see cref="Spring.Context.IApplicationContext"/> <see cref="System.Type"/>
+	/// is assumed. This default
+	/// <see cref="Spring.Context.IApplicationContext"/> <see cref="System.Type"/>
+	/// is currently the <see cref="Spring.Context.Support.XmlApplicationContext"/>
+	/// <see cref="System.Type"/>; please note the exact <see cref="System.Type"/>
+	/// of this default <see cref="Spring.Context.IApplicationContext"/> is an
+	/// implementation detail, that, while unlikely, may do so in the future.
+	/// to
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <p>
+	/// This is an example of specifying a context that reads its resources from
+	/// an embedded Spring.NET XML object configuration file...
+	/// </p>
+	/// <code escaped="true">
+	/// <configuration>
+	///     <configSections>
+	///		    <sectionGroup name="spring">
+	///			    <section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/>
+	///		    </sectionGroup>
+	///     </configSections>
+	///     <spring>
+	///		    <context>
+	///			    <resource uri="assembly://MyAssemblyName/MyResourceNamespace/MyObjects.xml"/>
+	///		    </context>
+	///     </spring>
+	/// </configuration>
+	/// </code>
+	/// <p>
+	/// This is an example of specifying a context that reads its resources from
+	/// a custom configuration section within the same application / web
+	/// configuration file and uses case insensitive object lookups. 
+	/// </p>
+	/// <p>
+	/// Please note that you <b>must</b> adhere to the naming
+	/// of the various sections (i.e. '&lt;sectionGroup name="spring"&gt;' and
+	/// '&lt;section name="context"&gt;'.
+	/// </p>
+	/// <code escaped="true">
+	/// <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" />
+	///		    </sectionGroup>
+	///     </configSections>
+	///     <spring>
+	///		    <context
+	///		        caseSensitive="false"
+	///			    type="Spring.Context.Support.XmlApplicationContext, Spring.Core">
+	///			    <resource uri="config://spring/objects"/>
+	///		    </context>
+	///		    <objects xmlns="http://www.springframework.net">
+	///			    <!-- object definitions... -->
+	///		    </objects>
+	///     </spring>
+	/// </configuration>
+	/// </code>
+	/// <p>
+	/// And this is an example of specifying a hierarchy of contexts. The
+	/// hierarchy in this case is only a simple parent->child hierarchy, but
+	/// hopefully it illustrates the nesting of context configurations. This
+	/// nesting of contexts can be arbitrarily deep, and is one way... child
+	/// contexts know about their parent contexts, but parent contexts do not
+	/// know how many child contexts they have (if any), or have references
+	/// to any such child contexts.
+	/// </p>
+	/// <code escaped="true">
+	/// <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' />
+    ///             <sectionGroup name="child">
+	/// 			    <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
+    ///             </sectionGroup>
+	/// 		</sectionGroup>
+	/// 	</configSections>
+	/// 	
+	///     <spring>
+	/// 		<context name='Parent'>
+	/// 			<resource uri='config://spring/objects'/>
+	/// 		    <context name='Child'>
+	/// 			    <resource uri='config://spring/childObjects'/>
+	/// 		    </context>
+	/// 		</context>
+	/// 		<!-- parent context's objects -->
+	/// 		<objects xmlns='http://www.springframework.net'>
+	/// 			<object id='Parent' type='Spring.Objects.TestObject,Spring.Core.Tests'>
+	///                 <property name='name' value='Parent'/>
+	///             </object>
+	/// 		</objects>
+	/// 		<!-- child context's objects -->
+    ///         <child>
+    /// 		    <objects xmlns='http://www.springframework.net'>
+	/// 			    <object id='Child' type='Spring.Objects.TestObject,Spring.Core.Tests'>
+	///                     <property name='name' value='Child'/>
+	///                 </object>
+    /// 		    </objects>
+    ///         </child>
+	///     </spring>
+	/// </configuration>
+	/// </code>
+	/// </example>
+	/// <author>Mark Pollack</author>
+	/// <author>Aleksandar Seovic</author>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: ContextHandler.cs,v 1.36 2008/03/13 20:07:33 bbaia Exp $</version>
+	/// <seealso cref="ContextRegistry"/>
+	public class ContextHandler : IConfigurationSectionHandler
+	{
+		private readonly ILog Log = LogManager.GetLogger(typeof(ContextHandler));
+		
+		/// <summary>
+		/// The <see cref="System.Type"/> of <see cref="Spring.Context.IApplicationContext"/>
+		/// created if no <c>type</c> attribute is specified on a <c>context</c> element.
+		/// </summary>
+		/// <seealso cref="GetContextType"/>
+		protected virtual Type DefaultApplicationContextType
+		{
+			get { return typeof (XmlApplicationContext); }
+		}
+
+		/// <summary>
+		/// Get the context's case-sensitivity to use if none is specified
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Derived handlers may override this property to change their default case-sensitivity.
+		/// </p>
+		/// <p>
+		/// Defaults to 'true'.
+		/// </p>
+		/// </remarks>
+		protected virtual bool DefaultCaseSensitivity
+		{
+			get { return true; }
+		}
+		
+	    /// <summary>
+	    /// Creates an <see cref="Spring.Context.IApplicationContext"/> instance
+	    /// using the context definitions supplied in a custom
+	    /// configuration section.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// This <see cref="Spring.Context.IApplicationContext"/> instance is
+	    /// also used to configure the <see cref="ContextRegistry"/>.
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="parent">
+	    /// The configuration settings in a corresponding parent
+	    /// configuration section.
+	    /// </param>
+	    /// <param name="configContext">
+	    /// The configuration context when called from the ASP.NET
+	    /// configuration system. Otherwise, this parameter is reserved and
+	    /// is <see langword="null"/>.
+	    /// </param>
+	    /// <param name="section">
+	    /// The <see cref="System.Xml.XmlNode"/> for the section.
+	    /// </param>
+	    /// <returns>
+	    /// An <see cref="Spring.Context.IApplicationContext"/> instance
+	    /// populated with the object definitions supplied in the configuration
+	    /// section.
+	    /// </returns>
+	    public object Create(object parent, object configContext, XmlNode section)
+	    {
+	    	XmlElement contextElement = section as XmlElement;
+
+			#region Sanity Checks
+
+	    	if (contextElement == null)
+	    	{
+	    		throw ConfigurationUtils.CreateConfigurationException(
+	    			"Context configuration section must be an XmlElement.");
+	    	}
+
+	    	// sanity check on parent
+	    	if ( (parent != null) && !(parent is IApplicationContext) )
+	    	{
+	    		throw ConfigurationUtils.CreateConfigurationException( 
+	    			String.Format("Parent context must be of type IApplicationContext, but was '{0}'", parent.GetType().FullName));
+	    	}
+
+	    	#endregion
+	        		    	
+			// determine name of context to be created
+			string contextName = GetContextName(configContext, contextElement);
+			if (!StringUtils.HasLength(contextName))
+			{
+				contextName = AbstractApplicationContext.DefaultRootContextName;
+			}
+	    	
+			#region Instrumentation
+			if (Log.IsDebugEnabled) Log.Debug(string.Format("creating context '{0}'", contextName ) );
+			#endregion
+	    	
+	    	IApplicationContext context = null;
+	        try
+	        {
+	        	IApplicationContext parentContext = parent as IApplicationContext;
+	        	
+	            // determine context type
+	        	Type contextType = GetContextType(contextElement, parentContext);
+
+	        	// determine case-sensitivity
+	        	bool caseSensitive = GetCaseSensitivity(contextElement);
+
+	        	// get resource-list
+	        	string[] resources = GetResources(contextElement);
+	        	
+	        	// finally create the context instance
+				context = InstantiateContext(parentContext, configContext, contextName, contextType, caseSensitive, resources);
+
+				// get and create child context definitions
+                XmlNode[] childContexts = GetChildContexts(contextElement);
+				CreateChildContexts(context, configContext, childContexts);
+
+	        	if (Log.IsDebugEnabled) Log.Debug( string.Format("context '{0}' created for name '{1}'", context, contextName) );
+	        }
+	        catch (Exception ex)
+	        {
+	            if (!ConfigurationUtils.IsConfigurationException(ex))
+	            {
+                    throw ConfigurationUtils.CreateConfigurationException(
+                        String.Format("Error creating context '{0}': {1}", 
+                        contextName, ReflectionUtils.GetExplicitBaseException(ex).Message), ex);
+	            }
+	            throw;
+	        }
+	        return context;
+	    }
+
+		/// <summary>
+		/// Create all child-contexts in the given <see cref="XmlNodeList"/> for the given context.
+		/// </summary>
+		/// <param name="parentContext">The parent context to use</param>
+		/// <param name="configContext">The current configContext <see cref="IConfigurationSectionHandler.Create"/></param>
+		/// <param name="childContexts">The list of child context elements</param>
+		protected virtual void CreateChildContexts(IApplicationContext parentContext, object configContext, XmlNode[] childContexts)
+		{	
+			// create child contexts for 'the most recently created context'...
+			foreach (XmlNode childContext in childContexts)
+			{
+				this.Create(parentContext, configContext, childContext);
+			}
+		}
+
+		/// <summary>
+		/// Instantiates a new context.
+		/// </summary>
+		protected virtual IApplicationContext InstantiateContext(IApplicationContext parentContext, object configContext, string contextName, Type contextType, bool caseSensitive, string[] resources)
+		{
+			IApplicationContext context;
+			ContextInstantiator instantiator;
+			
+			if (parentContext == null)
+			{
+				instantiator = new RootContextInstantiator(contextType, contextName, caseSensitive, resources);
+			} 
+			else
+			{
+				instantiator = new DescendantContextInstantiator(parentContext, contextType, contextName, caseSensitive, resources);
+			}
+			
+			if (IsLazy)
+			{
+				// TODO
+			}
+			context = instantiator.InstantiateContext();
+			return context;
+		}
+
+		/// <summary>
+		/// Gets the context's name specified in the name attribute of the context element.
+		/// </summary>
+		/// <param name="configContext">The current configContext <see cref="IConfigurationSectionHandler.Create"/></param>
+		/// <param name="contextElement">The context element</param>
+		protected virtual string GetContextName(object configContext, XmlElement contextElement)
+		{
+			string contextName;
+			contextName = contextElement.GetAttribute(ContextSchema.NameAttribute);
+			return contextName;
+		}
+		
+		/// <summary>
+		/// Extracts the context-type from the context element. 
+		/// If none is specified, returns the parent's type.
+		/// </summary>
+		private Type GetContextType(XmlElement contextElement, IApplicationContext parentContext)
+		{
+			Type contextType;
+			if (parentContext != null)
+			{
+				// set default context type to parent's type (allows for type inheritance)
+				contextType = GetConfiguredContextType(contextElement, parentContext.GetType());
+			}
+			else
+			{
+				contextType = GetConfiguredContextType(contextElement, this.DefaultApplicationContextType);
+			}
+			return contextType;
+		}
+
+		/// <summary>
+		/// Extracts the case-sensitivity attribute from the context element
+		/// </summary>
+		private  bool GetCaseSensitivity(XmlElement contextElement)
+		{
+			bool caseSensitive = DefaultCaseSensitivity;
+			
+			string caseSensitiveAttr = contextElement.GetAttribute(ContextSchema.CaseSensitiveAttribute);
+			if (StringUtils.HasText(caseSensitiveAttr))
+			{
+				caseSensitive = Boolean.Parse(caseSensitiveAttr);
+			}
+			return caseSensitive;
+		}
+
+		/// <summary>
+	    /// Gets the context <see cref="System.Type"/> specified in the type
+	    /// attribute of the context element.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// If this attribute is not defined it defaults to the
+	    /// <see cref="Spring.Context.Support.XmlApplicationContext"/> type.
+	    /// </p>
+	    /// </remarks>
+	    /// <exception cref="TypeMismatchException">
+	    /// If the context type does not implement the
+	    /// <see cref="Spring.Context.IApplicationContext"/> interface.
+	    /// </exception>
+	    private Type GetConfiguredContextType(XmlElement contextElement, Type defaultContextType)
+	    {
+            string typeName = contextElement.GetAttribute(ContextSchema.TypeAttribute);
+			
+            if (StringUtils.IsNullOrEmpty(typeName))
+            {
+                return defaultContextType;
+            }
+            else
+            {
+                Type type = TypeResolutionUtils.ResolveType(typeName);
+                if (typeof(IApplicationContext).IsAssignableFrom(type))
+                {
+                    return type;
+                }
+                else
+                {
+                    throw new TypeMismatchException( type.Name + " does not implement IApplicationContext.");
+                }
+            }
+	    }
+
+	    /// <summary>
+	    /// Returns <see langword="true"/> if the context should be lazily
+	    /// initialized.
+	    /// </summary>
+	    private bool IsLazy
+	    {
+	        get { return false; }
+	    }
+
+	    /// <summary>
+	    /// Returns the array of resources containing object definitions for
+	    /// this context.
+	    /// </summary>
+	    private string[] GetResources( XmlElement contextElement )
+	    {
+	        ArrayList resourceNodes = new ArrayList(contextElement.ChildNodes.Count);
+	        foreach (XmlNode possibleResourceNode in contextElement.ChildNodes)
+	        {
+	            XmlElement possibleResourceElement = possibleResourceNode as XmlElement;
+	            if(possibleResourceElement != null &&
+	               possibleResourceElement.LocalName == ContextSchema.ResourceElement)
+	            {
+	                string resourceName = possibleResourceElement.GetAttribute(ContextSchema.URIAttribute);
+	                if(StringUtils.HasText(resourceName))
+	                {
+	                    resourceNodes.Add(resourceName);
+	                }
+	            }
+	        }
+	        return (string[]) resourceNodes.ToArray(typeof(string));
+	    }
+
+        /// <summary>
+        /// Returns the array of child contexts for this context.
+        /// </summary>
+        private XmlNode[] GetChildContexts(XmlElement contextElement)
+        {
+            ArrayList contextNodes = new ArrayList(contextElement.ChildNodes.Count);
+            foreach (XmlNode possibleContextNode in contextElement.ChildNodes)
+            {
+                XmlElement possibleContextElement = possibleContextNode as XmlElement;
+                if (possibleContextElement != null &&
+                   possibleContextElement.LocalName == ContextSchema.ContextElement)
+                {
+                    contextNodes.Add(possibleContextElement);
+                }
+            }
+            return (XmlNode[])contextNodes.ToArray(typeof(XmlNode));
+        }
+
+	    #region Inner Class : ContextInstantiator
+
+	    private abstract class ContextInstantiator
+	    {
+	        protected ContextInstantiator(
+	            Type contextType, string contextName, bool caseSensitive, string[] resources)
+	        {
+	            _contextType = contextType;
+	            _contextName = contextName;
+                _caseSensitive = caseSensitive;
+	            _resources = resources;
+	        }
+
+            public IApplicationContext InstantiateContext()
+            {
+                ConstructorInfo ctor = GetContextConstructor();
+                if (ctor == null)
+                {
+                    string errorMessage = "No constructor with string[] argument found for context type [" + ContextType.Name + "]";
+                    throw ConfigurationUtils.CreateConfigurationException(errorMessage);
+                }
+                IApplicationContext context = InvokeContextConstructor(ctor);
+                ContextRegistry.RegisterContext(context);
+                return context;
+            }
+
+	        protected abstract ConstructorInfo GetContextConstructor();
+
+	        protected abstract IApplicationContext InvokeContextConstructor(
+	            ConstructorInfo ctor);
+
+	        protected Type ContextType
+	        {
+	            get { return _contextType; }
+	        }
+
+	        protected string ContextName
+	        {
+	            get { return _contextName; }
+	        }
+
+	        protected bool CaseSensitive
+	        {
+	            get { return _caseSensitive; }
+	        }
+
+	        protected string[] Resources
+	        {
+	            get { return _resources; }
+	        }
+
+	        private Type _contextType;
+	        private string _contextName;
+            private bool _caseSensitive;
+	        private string[] _resources;
+	    }
+
+	    #endregion
+
+	    #region Inner Class : RootContextInstantiator
+
+	    private sealed class RootContextInstantiator : ContextInstantiator
+	    {
+	        public RootContextInstantiator(
+	            Type contextType, string contextName, bool caseSensitive, string[] resources)
+	            : base(contextType, contextName, caseSensitive, resources)
+	        {
+	        }
+
+	        protected override ConstructorInfo GetContextConstructor()
+	        {
+	            return ContextType.GetConstructor(new Type[] {typeof(string), typeof(bool), typeof(string[])});
+	        }
+
+	        protected override IApplicationContext InvokeContextConstructor(
+	            ConstructorInfo ctor)
+	        {
+	            return (IApplicationContext) ObjectUtils.InstantiateType(
+	                       ctor, new object[] {ContextName, CaseSensitive, Resources});
+	        }
+	    }
+
+	    #endregion
+
+	    #region Inner Class : DescendantContextInstantiator
+
+	    private sealed class DescendantContextInstantiator : ContextInstantiator
+	    {
+	        public DescendantContextInstantiator(
+	            IApplicationContext parentContext, Type contextType,
+	            string contextName, bool caseSensitive, string[] resources)
+	            : base(contextType, contextName, caseSensitive, resources)
+	        {
+	            this.parentContext = parentContext;
+	        }
+
+	        protected override ConstructorInfo GetContextConstructor()
+	        {
+	            return ContextType.GetConstructor(
+	                new Type[] {typeof(string), typeof(bool), typeof(IApplicationContext), typeof(string[])});
+	        }
+
+	        protected override IApplicationContext InvokeContextConstructor(
+	            ConstructorInfo ctor)
+	        {
+	            return (IApplicationContext) ObjectUtils.InstantiateType(
+	                       ctor, new object[] {ContextName, CaseSensitive, this.parentContext, Resources});
+	        }
+
+	        private IApplicationContext parentContext;
+	    }
+
+	    #endregion
+
+	    #region Context Schema Constants
+
+	    /// <summary>
+	    /// Constants defining the structure and values associated with the
+	    /// schema for laying out Spring.NET contexts in XML.
+	    /// </summary>
+	    private sealed class ContextSchema
+	    {
+	        /// <summary>
+	        /// Defines a single
+	        /// <see cref="Spring.Context.IApplicationContext"/>.
+	        /// </summary>
+	        public const string ContextElement = "context";
+
+	        /// <summary>
+	        /// Specifies a context name.
+	        /// </summary>
+	        public const string NameAttribute = "name";
+
+            /// <summary>
+            /// Specifies if context should be case sensitive or not. Default is <c>true</c>.
+            /// </summary>
+            public const string CaseSensitiveAttribute = "caseSensitive";
+
+	        /// <summary>
+	        /// Specifies a <see cref="System.Type"/>.
+	        /// </summary>
+	        /// <remarks>
+	        /// <p>
+	        /// Does not have to be fully assembly qualified, but its generally regarded
+	        /// as better form if the <see cref="System.Type"/> names of one's objects
+	        /// are specified explicitly.
+	        /// </p>
+	        /// </remarks>
+	        public const string TypeAttribute = "type";
+
+	        /// <summary>
+	        /// Specifies whether context should be lazy initialized.
+	        /// </summary>
+	        public const string LazyAttribute = "lazy";
+
+	        /// <summary>
+	        /// Defines an <see cref="Spring.Core.IO.IResource"/>
+	        /// </summary>
+	        public const string ResourceElement = "resource";
+
+	        /// <summary>
+	        /// Specifies the URI for an
+	        /// <see cref="Spring.Core.IO.IResource"/>.
+	        /// </summary>
+	        public const string URIAttribute = "uri";
+	    }
+
+	    #endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs b/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs
new file mode 100644
index 00000000..c4f6d47e
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs
@@ -0,0 +1,286 @@
+#region License
+
+/* 
+ * Copyright © 2002-2005 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 
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Configuration;
+using Common.Logging;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary> 
+    /// Provides access to a central registry of 
+    /// <see cref="Spring.Context.IApplicationContext"/>s.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// A singleton implementation to access one or more application contexts.  Application
+    /// context instances are cached.
+    /// </p>
+    /// <p>Note that the use of this class or similar is unnecessary except (sometimes) for
+    /// a small amount of glue code.  Excessive usage will lead to code that is more tightly
+    /// coupled, and harder to modify or test.  Consider refactoring your code to use standard
+    /// Dependency Injection techniques or implement the interface IApplicationContextAware to
+    /// obtain a reference to an application context.</p>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <author>Aleksandar Seovic</author>
+    /// <seealso cref="Spring.Context.IApplicationContext"/>
+    /// <version>$Id: ContextRegistry.cs,v 1.28 2008/03/21 10:49:37 oakinger Exp $</version>
+    public sealed class ContextRegistry
+    {
+        /// <summary>
+        /// The shared <see cref="Common.Logging.ILog"/> instance for this class (and derived classes).
+        /// </summary>
+        private static readonly ILog log = LogManager.GetLogger(typeof(ContextRegistry));
+
+        private static readonly object syncRoot = new Object();
+        private static readonly ContextRegistry instance = new ContextRegistry();
+        private static string rootContextName = null;
+
+        private IDictionary contextMap = CollectionsUtil.CreateCaseInsensitiveHashtable();
+
+        #region Constructor (s) / Destructor
+
+        // CLOVER:OFF
+
+        /// <summary>
+        /// Creates a new instance of the ContextRegistry class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Explicit static constructor to tell C# compiler
+        /// not to mark type as beforefieldinit.
+        /// </p>
+        /// </remarks>
+        static ContextRegistry()
+        {}
+
+        // CLOVER:ON
+
+        #endregion
+
+        /// <summary>
+		/// This event is fired, if ContextRegistry.Clear() is called.<br/>
+		/// Clients may register to get informed
+		/// </summary>
+		/// <remarks>
+		/// This event is fired while still holding a lock on the Registry.<br/>
+		/// 'sender' parameter is sent as typeof(ContextRegistry), EventArgs are not used
+		/// </remarks>
+		public static event EventHandler Cleared;
+
+        /// <summary>
+        /// Gets an object that should be used to synchronize access to ContextRegistry
+        /// from the calling code.
+        /// </summary>
+        public static object SyncRoot
+        {
+            get { return syncRoot; }
+        }
+
+        /// <summary> 
+        /// Registers an instance of an
+        /// <see cref="Spring.Context.IApplicationContext"/>. 
+        /// </summary> 
+        /// <remarks>
+        /// <p>
+        /// This is usually called via a
+        /// <see cref="Spring.Context.Support.ContextHandler"/> inside a .NET
+        /// application configuration file. 
+        /// </p>
+        /// </remarks>
+        /// <param name="context">The application context to be registered.</param>
+        /// <exception cref="Spring.Context.ApplicationContextException">
+        /// If a context has previously been registered using the same name
+        /// </exception>
+        public static void RegisterContext(IApplicationContext context)
+        {
+            lock (syncRoot)
+            {
+                if (instance.contextMap.Contains(context.Name))
+                {
+                    IApplicationContext ctx = (IApplicationContext)instance.contextMap[context.Name];
+                    throw new ApplicationContextException(
+                        string.Format("Existing context '{0}' already registered under name '{1}'.",
+                                      ctx, context.Name));
+                }
+                instance.contextMap[context.Name] = context;
+
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(String.Format(
+                        "Registering context '{0}' under name '{1}'.", context, context.Name));
+                }
+
+                #endregion
+
+                if (rootContextName == null)
+                {
+                    rootContextName = context.Name;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the root application context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The first call to GetContext will create the context 
+        /// as specified in the .NET application configuration file 
+        /// under the location spring/context.
+        /// </p>
+        /// </remarks>
+        /// <returns>The root application context.</returns>
+        public static IApplicationContext GetContext()
+        {
+            lock (syncRoot)
+            {
+                InitializeContextIfNeeded();
+                return GetContext(rootContextName);
+            }
+        }
+
+        /// <summary>
+        /// Returns context based on specified name.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The first call to GetContext will create the context 
+        /// as specified in the .NET application configuration file 
+        /// under the location spring/context.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">The context name.</param>
+        /// <returns>The specified context, or null, if context with that name doesn't exists.</returns>
+        /// <exception cref="System.ArgumentException">
+        /// If the context name is null or empty
+        /// </exception>
+        public static IApplicationContext GetContext(string name)
+        {
+            if (StringUtils.IsNullOrEmpty(name))
+            {
+                throw new ArgumentException(
+                    "The context name passed to the GetContext method cannot be null or empty.");
+            }
+            else
+            {
+                lock (syncRoot)
+                {
+                    InitializeContextIfNeeded();
+                    IApplicationContext ctx = (IApplicationContext)instance.contextMap[name];
+
+                    #region Instrumentation
+
+                    if (log.IsDebugEnabled)
+                    {
+                        if (ctx == null)
+                        {
+                            log.Debug(String.Format(
+                                          "No context registered under name '{0}'.", name));
+                        }
+                        else
+                        {
+                            log.Debug(String.Format(
+                                          "Returning context '{0}' registered under name '{1}'.", ctx, name));
+                        }
+                    }
+
+                    #endregion
+
+                    return ctx;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Removes all registered
+        /// <see cref="Spring.Context.IApplicationContext"/>s from this
+        /// registry.
+        /// </summary>
+        /// <remarks>
+        /// Raises the <see cref="ContextRegistry.Cleared"/> event while still holding a lock on <see cref="ContextRegistry.SyncRoot"/>
+        /// </remarks>
+        public static void Clear()
+        {
+            lock (syncRoot)
+            {
+                foreach (IApplicationContext ctx in instance.contextMap.Values)
+                {
+                    ctx.Dispose();
+                }
+                instance.contextMap.Clear();
+                rootContextName = null;
+                ConfigurationUtils.RefreshSection(AbstractApplicationContext.ContextSectionName);
+                if (Cleared != null)
+                {
+                    Cleared(typeof(ContextRegistry), EventArgs.Empty);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Allows to check, if a context is already registered
+        /// </summary>
+        /// <param name="name">The context name.</param>
+        /// <returns>true, if the context is already registered. false otherwise</returns>
+        public static bool IsContextRegistered( string name )
+        {
+            lock (instance)
+            {
+                return (instance.contextMap[name] != null);
+            }
+        }
+
+        private static bool rootContextCurrentlyInCreation;
+
+        private static void InitializeContextIfNeeded()
+        {
+            if (rootContextName == null)
+            {
+                if (rootContextCurrentlyInCreation)
+                {
+                    throw new InvalidOperationException("root context is currently in creation. You must not call ContextRegistry.GetContext() from e.g. constructors of your singleton objects");    
+                }
+
+                rootContextCurrentlyInCreation = true;
+                try
+                {
+                    ConfigurationUtils.GetSection(AbstractApplicationContext.ContextSectionName);
+                }
+                finally
+                {
+                    rootContextCurrentlyInCreation = false;
+                }
+            }
+        }
+	}
+}
+
diff --git a/src/Spring/Spring.Core/Context/Support/DefaultMessageSourceResolvable.cs b/src/Spring/Spring.Core/Context/Support/DefaultMessageSourceResolvable.cs
new file mode 100644
index 00000000..d91942a8
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/DefaultMessageSourceResolvable.cs
@@ -0,0 +1,227 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// Default implementation of the
+	/// <see cref="Spring.Context.IMessageSourceResolvable"/> interface.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Provides easy ways to store all the necessary values needed to resolve
+	/// messages from an <see cref="Spring.Context.IMessageSource"/>.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: DefaultMessageSourceResolvable.cs,v 1.4 2007/07/02 21:24:39 markpollack Exp $</version>
+	/// <seealso cref="Spring.Context.IMessageSource.GetMessage(IMessageSourceResolvable, CultureInfo)"/>
+	[Serializable]
+	public class DefaultMessageSourceResolvable : IMessageSourceResolvable
+	{
+		private string[] codes;
+		private object[] arguments;
+		private string defaultMessage;
+
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="DefaultMessageSourceResolvable"/> class
+		/// using a single code.
+		/// </summary>
+		/// <param name="code">The message code to be resolved.</param>
+		public DefaultMessageSourceResolvable(string code)
+			: this(new string[] {code}, StringUtils.EmptyStrings, string.Empty)
+		{
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DefaultMessageSourceResolvable"/> class.
+        /// </summary>
+        /// <param name="codes">The codes to be used to resolve this message</param>
+        public DefaultMessageSourceResolvable(string[] codes)
+            : this(codes, StringUtils.EmptyStrings, string.Empty)
+        {            
+        }
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="DefaultMessageSourceResolvable"/> class
+		/// using multiple codes.
+		/// </summary>
+		/// <param name="codes">The message codes to be resolved.</param>
+		/// <param name="arguments">
+		/// The arguments used to resolve the supplied <paramref name="codes"/>.
+		/// </param>
+		public DefaultMessageSourceResolvable(string[] codes, object[] arguments)
+			: this(codes, arguments, string.Empty)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="DefaultMessageSourceResolvable"/> class
+		/// using multiple codes and a default message.
+		/// </summary>
+		/// <param name="codes">The message codes to be resolved.</param>
+		/// <param name="arguments">
+		/// The arguments used to resolve the supplied <paramref name="codes"/>.
+		/// </param>
+		/// <param name="defaultMessage">
+		/// The default message used if no code could be resolved.
+		/// </param>
+		public DefaultMessageSourceResolvable(
+			string[] codes, object[] arguments, string defaultMessage)
+		{
+			this.codes = codes;
+			this.arguments = arguments;
+			this.defaultMessage = defaultMessage;
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="DefaultMessageSourceResolvable"/> class
+		/// from another resolvable.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is the <i>copy constructor</i> for the
+		/// <see cref="DefaultMessageSourceResolvable"/> class.
+		/// </p>
+		/// </remarks>
+		/// <param name="resolvable">
+		/// The <see cref="Spring.Context.IMessageSourceResolvable"/> to be copied.
+		/// </param>
+		/// <exception cref="System.NullReferenceException">
+		/// If the supplied <paramref name="resolvable"/> is <see langword="null"/>.
+		/// </exception>
+		public DefaultMessageSourceResolvable(IMessageSourceResolvable resolvable)
+			: this(resolvable.GetCodes(), resolvable.GetArguments(), resolvable.DefaultMessage)
+		{
+		}
+
+		#endregion
+
+		/// <summary>
+		/// Return the default code for this resolvable.
+		/// </summary>
+		/// <returns>
+		/// The default code of this resolvable; this will be the last code in
+		/// the codes array, or <see langword="null"/> if this instance has no
+		/// codes.
+		/// </returns>
+		/// <seealso cref="GetCodes"/>
+		public string LastCode
+		{
+			get
+			{
+				if (codes != null && codes.Length > 0)
+				{
+					return codes[codes.Length - 1];
+				}
+				else
+				{
+					return null;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Returns a <see cref="System.String"/> representation of this
+		/// <see cref="Spring.Context.IMessageSourceResolvable"/>.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> representation of this
+		/// <see cref="Spring.Context.IMessageSourceResolvable"/>.
+		/// </returns>
+		public override string ToString()
+		{
+			return Accept(new MessageSourceResolvableVisitor());
+		}
+
+		/// <summary>
+		/// Calls the visit method on the supplied <paramref name="visitor"/>
+		/// to output a <see cref="System.String"/> version of this class.
+		/// </summary>
+		/// <param name="visitor">The visitor to use.</param>
+		/// <returns>
+		/// A <see cref="System.String"/> representation of this
+		/// <see cref="Spring.Context.IMessageSourceResolvable"/>.
+		/// </returns>
+		public string Accept(MessageSourceResolvableVisitor visitor)
+		{
+			return visitor.VisitMessageSourceResolvableString(this);
+		}
+
+		#region IMessageSourceResolvable Members
+
+		/// <summary>
+		/// Return the codes to be used to resolve this message, in the order
+		/// that they are to be tried.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> array of codes which are associated
+		/// with this message.
+		/// </returns>
+		/// <seealso cref="Spring.Context.IMessageSourceResolvable.GetCodes"/>
+		public string[] GetCodes()
+		{
+			return codes;
+		}
+
+		/// <summary>
+		/// Return the array of arguments to be used to resolve this message.
+		/// </summary>
+		/// <returns>
+		/// An array of objects to be used as parameters to replace
+		/// placeholders within the message text.
+		/// </returns>
+		/// <seealso cref="Spring.Context.IMessageSourceResolvable.GetArguments"/>
+		public object[] GetArguments()
+		{
+			return arguments;
+		}
+
+		/// <summary>
+		/// Return the default message to be used to resolve this message.
+		/// </summary>
+		/// <returns>
+		/// The default message, or <see langword="null"/> if there is no
+		/// default.
+		/// </returns>
+		/// <seealso cref="Spring.Context.IMessageSourceResolvable.DefaultMessage"/>
+		public string DefaultMessage
+		{
+			get { return defaultMessage; }
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/DefaultSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/DefaultSectionHandler.cs
new file mode 100644
index 00000000..4fccf4c2
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/DefaultSectionHandler.cs
@@ -0,0 +1,65 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Configuration;
+using System.Xml;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Default section handler that can handle any configuration section.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Simply returns the configuration section as an <see cref="System.Xml.XmlElement"/>.
+    /// </p>
+    /// </remarks>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: DefaultSectionHandler.cs,v 1.4 2006/04/09 07:18:38 markpollack Exp $</version>
+    public class DefaultSectionHandler : IConfigurationSectionHandler
+    {
+        #region Methods
+        /// <summary>
+        /// Returns the configuration section as an <see cref="System.Xml.XmlElement"/>
+        /// </summary>
+        /// <param name="parent">
+        /// The configuration settings in a corresponding parent
+        /// configuration section.
+        /// </param>
+        /// <param name="configContext">
+        /// The configuration context when called from the ASP.NET
+        /// configuration system. Otherwise, this parameter is reserved and
+        /// is a null reference.
+        /// </param>
+        /// <param name="section">
+        /// The <see cref="System.Xml.XmlNode"/> for the section.
+        /// </param>
+        /// <returns>Config section as XmlElement.</returns>
+        public object Create(object parent, object configContext, XmlNode section)
+        {
+            return section as XmlElement;
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/DelegatingMessageSource.cs b/src/Spring/Spring.Core/Context/Support/DelegatingMessageSource.cs
new file mode 100644
index 00000000..da5a3f8a
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/DelegatingMessageSource.cs
@@ -0,0 +1,387 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Globalization;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Empty <see cref="Spring.Context.IMessageSource"/> implementation that
+    /// simply delegates all method calls to it's parent
+    /// <see cref="Spring.Context.IMessageSource"/>.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// If no parent <see cref="Spring.Context.IMessageSource"/> is available,
+    /// no messages will be resolved (and a
+    /// <see cref="Spring.Context.NoSuchMessageException"/> will be thrown).
+    /// </p>
+    /// <p>
+    /// Used as placeholder <see cref="Spring.Context.IMessageSource"/> by the
+    /// <see cref="Spring.Context.Support.AbstractApplicationContext"/> class,
+    /// if the context definition doesn't define its own
+    /// <see cref="Spring.Context.IMessageSource"/>. Not intended for direct use
+    /// in applications.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergan Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: DelegatingMessageSource.cs,v 1.5 2007/07/02 21:24:39 markpollack Exp $</version>
+    /// <seealso cref="Spring.Context.Support.AbstractApplicationContext"/>
+    public class DelegatingMessageSource : IHierarchicalMessageSource
+    {
+        #region Fields
+
+        private IMessageSource _parentMessageSource;
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Context.Support.DelegatingMessageSource"/> class.
+        /// </summary>
+        public DelegatingMessageSource()
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Context.Support.DelegatingMessageSource"/> class.
+        /// </summary>
+        /// <param name="parentMessageSource">
+        /// The parent message source used to try and resolve messages that
+        /// this object can't resolve.
+        /// </param>
+        public DelegatingMessageSource(IMessageSource parentMessageSource)
+        {
+            ParentMessageSource = parentMessageSource;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The parent message source used to try and resolve messages that
+        /// this object can't resolve.
+        /// </summary>
+        /// <seealso cref="Spring.Context.IHierarchicalMessageSource.ParentMessageSource"/>
+        public IMessageSource ParentMessageSource
+        {
+            get
+            {
+                if (_parentMessageSource == null)
+                {
+                    _parentMessageSource = new SpecialCaseNullMessageSource();
+                }
+                return _parentMessageSource;
+            }
+            set { _parentMessageSource = value; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If the message could not be resolved.
+        /// </exception>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(string)"/>
+        public string GetMessage(string name)
+        {
+            return ParentMessageSource.GetMessage(name);
+        }
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="arguments">
+        /// The array of arguments that will be filled in for parameters within
+        /// the message, or <see langword="null"/> if there are no parameters
+        /// within the message. Parameters within a message should be
+        /// referenced using the same syntax as the format string for the
+        /// <see cref="System.String.Format(string,object[])"/> method.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If the message could not be resolved.
+        /// </exception>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(string, object[])"/>
+        public string GetMessage(string name, params object[] arguments)
+        {
+            return ParentMessageSource.GetMessage(name, arguments);
+        }
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If the message could not be resolved.
+        /// </exception>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(string, CultureInfo)"/>
+        public string GetMessage(string name, CultureInfo culture)
+        {
+            return ParentMessageSource.GetMessage(name, culture);
+        }
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.
+        /// </param>
+        /// <param name="arguments">
+        /// The array of arguments that will be filled in for parameters within
+        /// the message, or <see langword="null"/> if there are no parameters
+        /// within the message. Parameters within a message should be
+        /// referenced using the same syntax as the format string for the
+        /// <see cref="System.String.Format(string,object[])"/> method.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If the message could not be resolved.
+        /// </exception>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(string, CultureInfo, object[])"/>
+        public string GetMessage(string name, CultureInfo culture, params object[] arguments)
+        {
+            return ParentMessageSource.GetMessage(name, culture, arguments);
+        }
+
+        /// <summary>
+        /// Resolve the message identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the message to resolve.</param>
+        /// <param name="defaultMessage">The default message.</param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.
+        /// </param>
+        /// <param name="arguments">
+        /// The array of arguments that will be filled in for parameters within
+        /// the message, or <see langword="null"/> if there are no parameters
+        /// within the message. Parameters within a message should be
+        /// referenced using the same syntax as the format string for the
+        /// <see cref="System.String.Format(string,object[])"/> method.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If the message could not be resolved.
+        /// </exception>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(string, CultureInfo, object[])"/>
+        public string GetMessage(string name, string defaultMessage, CultureInfo culture, params object[] arguments)
+        {
+            return ParentMessageSource.GetMessage(name, defaultMessage, culture, arguments);
+        }
+
+        /// <summary>
+        /// Resolve the message using all of the attributes contained within
+        /// the supplied <see cref="Spring.Context.IMessageSourceResolvable"/>
+        /// argument.
+        /// </summary>
+        /// <param name="resolvable">
+        /// The value object storing those attributes that are required to
+        /// properly resolve a message.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> that represents
+        /// the culture for which the resource is localized.
+        /// </param>
+        /// <returns>
+        /// The resolved message if the lookup was successful (see above for
+        /// the return value in the case of an unsuccessful lookup).
+        /// </returns>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If the message could not be resolved.
+        /// </exception>
+        /// <exception cref="Spring.Context.NoSuchMessageException">
+        /// If the message could not be resolved.
+        /// </exception>
+        /// <seealso cref="Spring.Context.IMessageSource.GetMessage(IMessageSourceResolvable, CultureInfo)"/>
+        public string GetMessage(IMessageSourceResolvable resolvable, CultureInfo culture)
+        {
+            return ParentMessageSource.GetMessage(resolvable, culture);
+        }
+
+        /// <summary>
+        /// Gets a localized resource object identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the resource object to resolve.
+        /// </param>
+        /// <returns>
+        /// The resolved object, or <see langword="null"/> if not found.
+        /// </returns>
+        /// <seealso cref="Spring.Context.IMessageSource.GetResourceObject(string)"/>
+        public object GetResourceObject(string name)
+        {
+            return ParentMessageSource.GetResourceObject(name);
+        }
+
+        /// <summary>
+        /// Gets a localized resource object identified by the supplied
+        /// <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the resource object to resolve.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.
+        /// </param>
+        /// <returns>
+        /// The resolved object, or <see langword="null"/> if not found.
+        /// </returns>
+        /// <seealso cref="Spring.Context.IMessageSource.GetResourceObject(string, CultureInfo)"/>
+        public object GetResourceObject(string name, CultureInfo culture)
+        {
+            return ParentMessageSource.GetResourceObject(name, culture);
+        }
+
+        /// <summary>
+        /// Applies resources to object properties.
+        /// </summary>
+        /// <param name="value">
+        /// An object that contains the property values to be applied.
+        /// </param>
+        /// <param name="objectName">
+        /// The base name of the object to use for key lookup.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.
+        /// </param>
+        /// <seealso cref="Spring.Context.IMessageSource.ApplyResources(object, string, CultureInfo)"/>
+        public void ApplyResources(object value, string objectName, CultureInfo culture)
+        {
+            ParentMessageSource.ApplyResources(value, objectName, culture);
+        }
+
+        #endregion
+
+        #region Inner Class : SpecialCaseNullMessageSource
+
+        private sealed class SpecialCaseNullMessageSource : IMessageSource
+        {
+            public string GetMessage(string name)
+            {
+                return GetMessage(name, (object[]) null);
+            }
+
+            public string GetMessage(string name, params object[] arguments)
+            {
+                return GetMessage(name, CultureInfo.CurrentUICulture, null);
+            }
+
+            public string GetMessage(string name, CultureInfo culture)
+            {
+                return GetMessage(name, culture, null);
+            }
+
+            public string GetMessage(string name, CultureInfo culture, params object[] arguments)
+            {
+                throw new NoSuchMessageException(name, culture);
+            }
+
+            public string GetMessage(string name, string defaultMessage, CultureInfo culture, params object[] arguments)
+            {
+                throw new NoSuchMessageException(name, culture);
+            }
+
+
+            public string GetMessage(IMessageSourceResolvable resolvable, CultureInfo culture)
+            {
+                if (StringUtils.HasText(resolvable.DefaultMessage))
+                {
+                    return resolvable.DefaultMessage;
+                }
+                string[] codes = resolvable.GetCodes();
+                string code = (codes != null && codes.Length > 0 ? codes[0] : string.Empty);
+                throw new NoSuchMessageException(code, culture);
+            }
+
+            public object GetResourceObject(string name)
+            {
+                return GetResourceObject(name, CultureInfo.CurrentUICulture);
+            }
+
+            public object GetResourceObject(string name, CultureInfo culture)
+            {
+                throw new ApplicationContextException(
+                    string.Format(
+                        "Cannot lookup the named resource '{0}' for locale '{1}' " +
+                            ": no IMessageSource in context.",
+                        name, culture));
+            }
+
+            public void ApplyResources(object value, string objectName, CultureInfo culture)
+            {
+                throw new ApplicationContextException(
+                    string.Format(
+                        "Cannot apply [{0}] resource to object '{1}' for locale '{2}' " +
+                            ": no IMessageSource in context.",
+                        value, objectName, culture));
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/GenericApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/GenericApplicationContext.cs
new file mode 100644
index 00000000..935382fa
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/GenericApplicationContext.cs
@@ -0,0 +1,259 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 Spring.Core.IO;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Util;
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Generic ApplicationContext implementation that holds a single internal
+    /// <see cref="DefaultListableObjectFactory"/>  instance and does not 
+    /// assume a specific object definition format.
+    /// </summary>
+    /// <remarks>
+    /// Implements the <see cref="IObjectDefinitionRegistry"/> interface in order
+    /// to allow for aplying any object definition readers to it.
+    /// <para>Typical usage is to register a variety of object definitions via the
+    /// <see cref="IObjectDefinitionRegistry"/> interface and then call 
+    /// <see cref="IConfigurableApplicationContext.Refresh"/> to initialize those
+    /// objects with application context semantics (handling 
+    /// <see cref="IApplicationContextAware"/>, auto-detecting 
+    /// <see cref="IObjectPostProcessor"/> ObjectFactoryPostProcessors, etc).
+    /// </para>
+    /// <para>In contrast to other IApplicationContext implementations that create a new internal
+    /// IObjectFactory instance for each refresh, the internal IObjectFactory of this context
+    /// is available right from the start, to be able to register object definitions on it.
+    /// <see cref="IConfigurableApplicationContext.Refresh"/> may only be called once</para>
+    /// <para>Usage examples</para>
+    /// <example>
+    /// GenericApplicationContext ctx = new GenericApplicationContext();
+    /// 
+    /// </example>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: GenericApplicationContext.cs,v 1.5 2008/02/17 13:34:44 markpollack Exp $</version>
+    public class GenericApplicationContext : AbstractApplicationContext, IObjectDefinitionRegistry
+    {
+        private DefaultListableObjectFactory objectFactory;
+
+        private bool refreshed = false;
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GenericApplicationContext"/> class.
+        /// </summary>
+        public GenericApplicationContext()
+        {
+            objectFactory = new DefaultListableObjectFactory();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GenericApplicationContext"/> class.
+        /// </summary>
+        /// <param name="caseSensitive">if set to <c>true</c> names in the context are case sensitive.</param>
+        public GenericApplicationContext(bool caseSensitive)
+        {
+            objectFactory = new DefaultListableObjectFactory(caseSensitive);
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GenericApplicationContext"/> class.
+        /// </summary>
+        /// <param name="objectFactory">The object factory instance to use for this context.</param>
+        public GenericApplicationContext(DefaultListableObjectFactory objectFactory)
+        {
+            AssertUtils.ArgumentNotNull(objectFactory, "objectFactory", "ObjectFactory must not be null");
+            this.objectFactory = objectFactory; 
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GenericApplicationContext"/> class.
+        /// </summary>
+        /// <param name="parent">The parent application context.</param>
+        public GenericApplicationContext(IApplicationContext parent)
+        {
+            objectFactory = new DefaultListableObjectFactory();
+            ParentContext = parent;
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GenericApplicationContext"/> class.
+        /// </summary>
+        /// <param name="name">The name of the application context.</param>
+        /// <param name="caseSensitive">if set to <c>true</c> names in the context are case sensitive.</param>
+        /// <param name="parent">The parent application context.</param>
+        public GenericApplicationContext(string name, bool caseSensitive, IApplicationContext parent) : this(caseSensitive)
+        {
+            Name = name;
+            ParentContext = parent;
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GenericApplicationContext"/> class.
+        /// </summary>
+        /// <param name="objectFactory">The object factory to use for this context</param>
+        /// <param name="parent">The parent applicaiton context.</param>
+        public GenericApplicationContext(DefaultListableObjectFactory objectFactory, IApplicationContext parent) : this(objectFactory)
+        {
+            ParentContext = parent;
+        }
+
+
+
+        /// <summary>
+        /// Gets the parent context, or <see langword="null"/> if there is no
+        /// parent context.  Set the parent of this application context also setting
+        /// the parent of the interanl ObjectFactory accordingly.
+        /// </summary>
+        /// <value>The parent context</value>
+        /// <returns>
+        /// The parent context, or <see langword="null"/>  if there is no
+        /// parent.
+        /// </returns>
+        /// <seealso cref="Spring.Context.IApplicationContext.ParentContext"/>
+        public override IApplicationContext ParentContext
+        {
+            get
+            {
+                return base.ParentContext;
+            }
+            set { 
+                base.ParentContext = value;
+                objectFactory.ParentObjectFactory = GetInternalParentObjectFactory();
+            }
+        }
+
+
+        /// <summary>
+        /// Do nothing operation.  We hold a single internal ObjectFactory and rely on callers
+        /// to register objects throug our public methods (or the ObjectFactory's).
+        /// </summary>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of errors encountered while refreshing the object factory.
+        /// </exception>
+        protected override void RefreshObjectFactory()
+        {
+            if (refreshed)
+            {
+                throw new InvalidOperationException(
+                    "GenericApplicationContext does not support multiple refresh attempts: just call 'refresh' once");
+            }
+            
+            refreshed = true;
+        }
+
+        /// <summary>
+        /// Return the internal object factory of this application context.
+        /// </summary>
+        /// <value></value>
+        public override IConfigurableListableObjectFactory ObjectFactory
+        {
+            get { return objectFactory; }
+        }
+
+        /// <summary>
+        /// Gets the underlying object factory of this context, available for 
+        /// registering object definitions.
+        /// </summary>
+        /// <remarks>You need to call <code>Refresh</code> to initialize the
+        /// objects factory and its contained objects with application context
+        /// semantics (autodecting IObjectFactoryPostProcessors, etc).</remarks>
+        /// <value>The internal object factory (as DefaultListableObjectFactory).</value>
+        public DefaultListableObjectFactory DefaultListableObjectFactory
+        {
+            get { return objectFactory; }
+        }
+
+
+
+        #region IObjectDefinitionRegistry Members
+
+        /// <summary>
+        /// Returns the
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>
+        /// for the given object name.
+        /// </summary>
+        /// <param name="name">The name of the object to find a definition for.</param>
+        /// <returns>
+        /// The <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> for
+        /// the given name (never null).
+        /// </returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If the object definition cannot be resolved.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        public override IObjectDefinition GetObjectDefinition(string name)
+        {
+            return objectFactory.GetObjectDefinition(name);
+        }
+
+        /// <summary>
+        /// Register a new object definition with this registry.
+        /// Must support
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+        /// and <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/>.
+        /// </summary>
+        /// <param name="name">The name of the object instance to register.</param>
+        /// <param name="definition">The definition of the object instance to register.</param>
+        /// <remarks>
+        /// 	<p>
+        /// Must support
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> and
+        /// <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/>.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object definition is invalid.
+        /// </exception>
+        public void RegisterObjectDefinition(string name, IObjectDefinition definition)
+        {
+            objectFactory.RegisterObjectDefinition(name, definition);
+        }
+
+        /// <summary>
+        /// Given a object name, create an alias. We typically use this method to
+        /// support names that are illegal within XML ids (used for object names).
+        /// </summary>
+        /// <param name="name">The name of the object.</param>
+        /// <param name="theAlias">The alias that will behave the same as the object name.</param>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there is no object with the given name.
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectDefinitionStoreException">
+        /// If the alias is already in use.
+        /// </exception>
+        public void RegisterAlias(string name, string theAlias)
+        {
+            objectFactory.RegisterAlias(name, theAlias);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/MessageSourceAccessor.cs b/src/Spring/Spring.Core/Context/Support/MessageSourceAccessor.cs
new file mode 100644
index 00000000..b44f50c8
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/MessageSourceAccessor.cs
@@ -0,0 +1,188 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// Helper class for easy access to messages from an
+	/// <see cref="Spring.Context.IMessageSource"/>, providing various
+	/// overloaded <c>GetMessage</c> methods.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Available from
+	/// <see cref="Spring.Context.Support.ApplicationObjectSupport"/>, but also
+	/// reusable as a standalone helper to delegate to in application objects.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: MessageSourceAccessor.cs,v 1.8 2007/08/23 14:30:50 oakinger Exp $</version>
+	/// <seealso cref="Spring.Context.IMessageSource"/>
+	/// <seealso cref="Spring.Context.Support.ApplicationObjectSupport"/>
+	public class MessageSourceAccessor
+	{
+		private IMessageSource _messageSource;
+		private CultureInfo _defaultCultureInfo;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.Support.MessageSourceAccessor"/> class
+		/// that uses the current <see cref="System.Globalization.CultureInfo.CurrentUICulture"/>
+		/// for all locale specific lookups.
+		/// </summary>
+		/// <param name="messageSource">
+		/// The <see cref="Spring.Context.IMessageSource"/> to use to locate messages.
+		/// </param>
+		public MessageSourceAccessor(IMessageSource messageSource)
+			: this(messageSource, CultureInfo.CurrentUICulture)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.Support.MessageSourceAccessor"/> class
+		/// </summary>
+		/// <param name="messageSource">
+		/// The <see cref="Spring.Context.IMessageSource"/> to use to locate
+		/// messages.
+		/// </param>
+		/// <param name="cultureInfo">
+		/// The <see cref="System.Globalization.CultureInfo"/> to use for
+		/// locale specific messages.
+		/// </param>
+		public MessageSourceAccessor(
+			IMessageSource messageSource, CultureInfo cultureInfo)
+		{
+			_messageSource = messageSource;
+			_defaultCultureInfo = cultureInfo;
+		}
+
+		/// <summary>
+		/// Retrieve the message for the given code and the default
+		/// <see cref="System.Globalization.CultureInfo"/>.
+		/// </summary>
+		/// <param name="code">The code of the message.</param>
+		/// <returns>The message.</returns>
+		public string GetMessage(string code)
+		{
+			return _messageSource.GetMessage(code, _defaultCultureInfo);
+		}
+
+		/// <summary>
+		/// Retrieve the message for the given code and the given
+		/// <see cref="System.Globalization.CultureInfo"/>.
+		/// </summary>
+		/// <param name="code">The code of the message.</param>       
+		/// <param name="cultureInfo">
+		/// The <see cref="System.Globalization.CultureInfo"/> to use for
+		/// lookups.
+		/// </param>
+		/// <returns>The message.</returns>
+		public string GetMessage(string code, CultureInfo cultureInfo)
+		{
+			return _messageSource.GetMessage(code, cultureInfo);
+		}
+
+		/// <summary>
+		/// Retrieve the message for the given code and the default
+		/// <see cref="System.Globalization.CultureInfo"/>.
+		/// </summary>
+		/// <param name="code">The code of the message.</param>
+		/// <param name="args">
+		/// The arguments for the message, or <see langword="null"/> if none.
+		/// </param>
+		/// <returns>The message.</returns>
+		/// <exception cref="NoSuchMessageException">
+		/// If the message could not be found.
+		/// </exception>
+		public string GetMessage(string code, params object[] args)
+		{
+			return _messageSource.GetMessage(code, _defaultCultureInfo, args);
+		}
+
+		/// <summary>
+		/// Retrieve the message for the given code and the given
+		/// <see cref="System.Globalization.CultureInfo"/>.
+		/// </summary>
+		/// <param name="code">The code of the message.</param>      
+		/// <param name="cultureInfo">
+		/// The <see cref="System.Globalization.CultureInfo"/> to use for
+		/// lookups.
+		/// </param>
+		/// <param name="args">
+		/// The arguments for the message, or <see langword="null"/> if none.
+		/// </param>
+		/// <returns>The message.</returns>
+		/// <exception cref="NoSuchMessageException">
+		/// If the message could not be found.
+		/// </exception>
+		public string GetMessage(
+			string code, CultureInfo cultureInfo, params object[] args)
+		{
+			return _messageSource.GetMessage(code, cultureInfo, args);
+		}
+
+		/// <summary>
+		/// Retrieve a mesage using the given
+		/// <see cref="Spring.Context.IMessageSourceResolvable"/>.
+		/// </summary>
+		/// <param name="resolvable">
+		/// The <see cref="Spring.Context.IMessageSourceResolvable"/>.
+		/// </param>
+		/// <returns>The message.</returns>
+		/// <exception cref="NoSuchMessageException">
+		/// If the message could not be found.
+		/// </exception>
+		public string GetMessage(IMessageSourceResolvable resolvable)
+		{
+			return GetMessage(resolvable, _defaultCultureInfo);
+		}
+
+		/// <summary>
+		/// Retrieve a mesage using the given
+		/// <see cref="Spring.Context.IMessageSourceResolvable"/> in the given
+		/// <see cref="System.Globalization.CultureInfo"/>.
+		/// </summary>
+		/// <param name="resolvable">
+		/// The <see cref="Spring.Context.IMessageSourceResolvable"/>.
+		/// </param>     
+		/// <param name="cultureInfo">
+		/// The <see cref="System.Globalization.CultureInfo"/> to use for
+		/// lookups.
+		/// </param>
+		/// <returns>The message</returns>
+		/// <exception cref="NoSuchMessageException">
+		/// If the message could not be found.
+		/// </exception>
+		public string GetMessage(
+			IMessageSourceResolvable resolvable, CultureInfo cultureInfo)
+		{
+			return _messageSource.GetMessage(resolvable, cultureInfo);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/MessageSourceResolvableVisitor.cs b/src/Spring/Spring.Core/Context/Support/MessageSourceResolvableVisitor.cs
new file mode 100644
index 00000000..fb579548
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/MessageSourceResolvableVisitor.cs
@@ -0,0 +1,97 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Text;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// Visitor class to represent
+	/// <see cref="Spring.Context.IMessageSourceResolvable"/> instances.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Used in the first instance to supply stringified versions of
+	/// <see cref="Spring.Context.IMessageSourceResolvable"/> instances. 
+	/// </p>
+	/// <p>
+	/// Other methods can be added here to return different representations,
+	/// including XML, CSV, etc..
+	/// </p>
+	/// </remarks>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: MessageSourceResolvableVisitor.cs,v 1.6 2006/04/09 07:18:38 markpollack Exp $</version>
+	public class MessageSourceResolvableVisitor
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.Support.MessageSourceResolvableVisitor"/> class.
+		/// </summary>
+		public MessageSourceResolvableVisitor()
+		{
+		}
+
+		/// <summary>
+		/// Outputs the supplied <see cref="Spring.Context.IMessageSourceResolvable"/>
+		/// as a nicely formatted <see cref="System.String"/>.
+		/// </summary>
+		/// <param name="resolvable">
+		/// The <see cref="Spring.Context.IMessageSourceResolvable"/> to output.
+		/// </param>
+		public string VisitMessageSourceResolvableString(
+			IMessageSourceResolvable resolvable)
+		{
+			StringBuilder builder = new StringBuilder();
+			builder.Append("codes=[");
+			builder.Append(StringUtils.ArrayToDelimitedString(resolvable.GetCodes(), ","));
+			builder.Append("]; arguments=[");
+			if (resolvable.GetArguments() == null)
+			{
+				builder.Append("null");
+			}
+			else
+			{
+				object[] arguments = resolvable.GetArguments();
+				for (int i = 0; i < arguments.Length; i++)
+				{
+					builder.Append("(");
+					builder.Append(arguments[i].GetType().Name);
+					builder.Append(")[");
+					builder.Append(arguments[i]);
+					builder.Append("]");
+					if (i < arguments.Length - 1)
+					{
+						builder.Append(", ");
+					}
+				}
+			}
+			builder.Append("]; defaultMessage=[");
+			builder.Append(resolvable.DefaultMessage);
+			builder.Append("]");
+			return builder.ToString();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/NamespaceParsersSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/NamespaceParsersSectionHandler.cs
new file mode 100644
index 00000000..0e7c7326
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/NamespaceParsersSectionHandler.cs
@@ -0,0 +1,139 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Configuration;
+using System.Globalization;
+using System.Xml;
+
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Objects;
+using Spring.Objects.Factory.Xml;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// Configuration section handler for the (recommended, Spring.NET standard) <c>parsers</c>
+	/// config section.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Spring.NET allows the registration of custom configuration parsers that
+	/// can be used to create simplified configuration schemas that better
+	/// describe object definitions.
+	/// </p>
+	/// <p>
+	/// For example, Spring.NET uses this facility internally in order to
+	/// define simplified schemas for various AOP, Data and Services definitions.
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <p>
+	/// The following example shows how to configure both this section handler
+	/// and how to define custom configuration parsers within a Spring.NET
+	/// config section.
+	/// </p>
+	/// <code escaped="true">
+	/// <configuration>
+	///     <configSections>
+	///		    <sectionGroup name="spring">
+    ///			    <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
+	///		    </sectionGroup>
+	///     </configSections>
+	///     <spring>
+	///		    <parsers>
+    ///			    <parser type="Spring.Aop.Config.AopNamespaceParser, Spring.Aop"/>
+    ///			    <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>
+	///			    ...
+	///		    </parsers>
+	///		    ...
+	///     </spring>
+	/// </configuration>
+	/// </code>
+	/// </example>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: NamespaceParsersSectionHandler.cs,v 1.1 2007/08/08 01:53:43 bbaia Exp $</version>
+	/// <seealso cref="NamespaceParserRegistry"/>
+    public class NamespaceParsersSectionHandler : IConfigurationSectionHandler
+	{
+		private const string ParserElementName = "parser";
+        private const string TypeAttributeName = "type";
+        private const string NamespaceAttributeName = "namespace";
+		private const string SchemaLocationAttributeName = "schemaLocation";
+
+		/// <summary>
+		/// Registers parsers specified in the (recommended, Spring.NET standard)
+		/// <c>parsers</c> config section with the <see cref="NamespaceParserRegistry"/>.
+		/// </summary>
+		/// <param name="parent">
+		/// The configuration settings in a corresponding parent
+		/// configuration section.
+		/// </param>
+		/// <param name="configContext">
+		/// The configuration context when called from the ASP.NET
+		/// configuration system. Otherwise, this parameter is reserved and
+		/// is <see langword="null"/>.
+		/// </param>
+		/// <param name="section">
+		/// The <see cref="System.Xml.XmlNode"/> for the section.
+		/// </param>
+		/// <returns>
+		/// This method always returns <see langword="null"/>, because parsers
+		/// are registered as a side-effect of this object's execution and there
+		/// is thus no need to return anything.
+		/// </returns>
+		public object Create(object parent, object configContext, XmlNode section)
+		{
+            if (section != null)
+            {
+                XmlNodeList parsers = ((XmlElement)section).GetElementsByTagName(ParserElementName);
+                foreach (XmlElement parserElement in parsers)
+                {
+                    string parserTypeName = GetRequiredAttributeValue(parserElement, TypeAttributeName, section);
+                    string xmlNamespace = parserElement.GetAttribute(NamespaceAttributeName);
+                    string schemaLocation = parserElement.GetAttribute(SchemaLocationAttributeName);
+
+                    Type parserType = TypeResolutionUtils.ResolveType(parserTypeName);
+                    NamespaceParserRegistry.RegisterParser(parserType, xmlNamespace, schemaLocation);
+                }
+            }
+            return null;
+		}
+
+		private static string GetRequiredAttributeValue(
+			XmlElement aliasElement, string requiredAttributeName, XmlNode section)
+		{
+			XmlAttribute attribute = aliasElement.GetAttributeNode(requiredAttributeName);
+			if (attribute == null)
+			{
+                string errorMessage = string.Format(CultureInfo.InvariantCulture,
+                    "The '{0}' attribute is required for the <parser/> element.", requiredAttributeName);
+				throw ConfigurationUtils.CreateConfigurationException(errorMessage, section);
+			}
+			return attribute.Value;
+		}
+	}
+}
diff --git a/src/Spring/Spring.Core/Context/Support/NullMessageSource.cs b/src/Spring/Spring.Core/Context/Support/NullMessageSource.cs
new file mode 100644
index 00000000..e9b691d7
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/NullMessageSource.cs
@@ -0,0 +1,117 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System.Globalization;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// An <see cref="Spring.Context.IMessageSource"/> that doesn't do a whole lot.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// <see cref="Spring.Context.Support.NullMessageSource"/> is an implementation of
+    /// the <c>NullObject</c> pattern. It should be used in those situations where a
+    /// <see cref="Spring.Context.IMessageSource"/> needs to be passed (say to a
+    /// method) but where the resolution of messages is not required.
+    /// </p>
+    /// <p>
+    /// There should not (typically) be a need to instantiate instances of this class;
+    /// <see cref="Spring.Context.Support.NullMessageSource"/> does not maintan any state
+    /// and the <see cref="Spring.Context.Support.NullMessageSource.Null"/> instance is
+    /// thus safe to pass around. 
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: NullMessageSource.cs,v 1.5 2007/08/27 09:38:29 oakinger Exp $</version>
+    public sealed class NullMessageSource : AbstractMessageSource
+    {
+        /// <summary>
+        /// The canonical instance of the
+        /// <see cref="Spring.Context.Support.NullMessageSource"/> class.
+        /// </summary>
+        public static readonly NullMessageSource Null = new NullMessageSource();
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="NullMessageSource"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Consider using <see cref="Spring.Context.Support.NullMessageSource.Null"/>
+        /// instead.
+        /// </p>
+        /// </remarks>
+        public NullMessageSource()
+        {}
+
+        /// <summary>
+        /// Simply returns the supplied message <paramref name="code"/> as-is.
+        /// </summary>
+        /// <param name="code">The code of the message to resolve.</param>
+        /// <param name="cultureInfo">
+        /// The <see cref="System.Globalization.CultureInfo"/> to resolve the
+        /// code for.
+        /// </param>
+        /// <returns>
+        /// The supplied message <paramref name="code"/> as-is.
+        /// </returns>
+        protected override string ResolveMessage(string code, CultureInfo cultureInfo)
+        {
+            return code;
+        }
+
+        /// <summary>
+        /// Always returns <see lang="null"/>.
+        /// </summary>
+        /// <param name="code">The code of the object to resolve.</param>
+        /// <param name="cultureInfo">
+        /// The <see cref="System.Globalization.CultureInfo"/> to resolve the
+        /// code for.
+        /// </param>
+        /// <returns>
+        /// <see lang="null"/> (always).
+        /// </returns>
+        protected override object ResolveObject(string code, CultureInfo cultureInfo)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Does nothing.
+        /// </summary>
+        /// <param name="value">
+        /// An object that contains the property values to be applied.
+        /// </param>
+        /// <param name="objectName">
+        /// The base name of the object to use for key lookup.
+        /// </param>
+        /// <param name="cultureInfo">
+        /// The <see cref="System.Globalization.CultureInfo"/> with which the
+        /// resource is associated.
+        /// </param>
+        protected override void ApplyResourcesToObject(
+            object value, string objectName, CultureInfo cultureInfo)
+        {}
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/ResourceHandlersSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/ResourceHandlersSectionHandler.cs
new file mode 100644
index 00000000..872efe18
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/ResourceHandlersSectionHandler.cs
@@ -0,0 +1,137 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+#if ! NET_COMPACT_FRAMEWORK
+#endif
+using System.Configuration;
+using System.Globalization;
+using System.Xml;
+
+using Spring.Core.IO;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Handler for Spring.NET <c>resourceHandlers</c> config section.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Spring allows registration of custom resource handlers that can be used to load
+    /// object definitions from.
+    /// </p>
+    /// <p>
+    /// For example, if you wanted to store your object definitions in a database instead
+    /// of in the config file, you could write a custom <see cref="IResource"/> implementation
+    /// and register it with Spring using 'db' as a protocol name.
+    /// </p>
+    /// <p>
+    /// Afterwards, you would simply specify resource URI within the <c>context</c> config element
+    /// using your custom resource handler.
+    /// </p>
+    /// </remarks>
+    /// <example>
+    /// <p>
+    /// The following example shows how to configure both this section handler,
+    /// how to define custom resource within Spring config section, and how to load
+    /// object definitions using custom resource handler:
+    /// </p>
+    /// <code escaped="true">
+    /// <configuration>
+    ///     <configSections>
+    ///		    <sectionGroup name="spring">
+    ///			    <section name="resourceHandlers" type="Spring.Context.Support.ResourceHandlersSectionHandler, Spring.Core"/>
+    ///		    </sectionGroup>
+    ///     </configSections>
+    ///     <spring>
+    ///		    <resourceHandlers>
+    ///			    <handler protocol="db" type="MyCompany.MyApp.Resources.MyDbResource, MyAssembly"/>
+    ///		    </resourceHandlers>
+    ///		    <context>
+    ///		        <resource uri="db://user:pass@dbName/MyDefinitionsTable"/>
+    ///		    </context>
+    ///     </spring>
+    /// </configuration>
+    /// </code>
+    /// </example>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ResourceHandlersSectionHandler.cs,v 1.3 2007/08/08 17:46:37 bbaia Exp $</version>
+    /// <seealso cref="IResource"/>
+    public class ResourceHandlersSectionHandler : IConfigurationSectionHandler
+    {
+        private const string HandlerElement = "handler";
+        private const string ProtocolAttribute = "protocol";
+        private const string TypeAttribute = "type";
+
+        /// <summary>
+        /// Registers resource handlers that are specified in
+        /// the <c>resources</c> config section with the <see cref="ResourceHandlerRegistry"/>.
+        /// </summary>
+        /// <param name="parent">
+        /// The configuration settings in a corresponding parent
+        /// configuration section. Ignored.
+        /// </param>
+        /// <param name="configContext">
+        /// The configuration context when called from the ASP.NET
+        /// configuration system. Otherwise, this parameter is reserved and
+        /// is <see langword="null"/>.
+        /// </param>
+        /// <param name="section">
+        /// The <see cref="System.Xml.XmlNode"/> for the section.
+        /// </param>
+        /// <returns>
+        /// This method always returns <c>null</c>, because resource handlers are registered
+        /// as a sideffect of its execution and there is no need to return anything.
+        /// </returns>
+        public object Create(object parent, object configContext, XmlNode section)
+        {
+            if (section != null)
+            {
+                XmlNodeList resourceHandlers = ((XmlElement) section).GetElementsByTagName(HandlerElement);
+
+                foreach (XmlElement handler in resourceHandlers)
+                {
+                    string protocolName = GetRequiredAttributeValue(handler, ProtocolAttribute, section);
+                    string typeName = GetRequiredAttributeValue(handler, TypeAttribute, section);
+
+                    ResourceHandlerRegistry.RegisterResourceHandler(protocolName, typeName);
+                }
+            }
+            return null;
+        }
+
+        private static string GetRequiredAttributeValue(XmlElement resourceElement, string requiredAttributeName, XmlNode section)
+        {
+            XmlAttribute attribute = resourceElement.GetAttributeNode(requiredAttributeName);
+            if (attribute == null)
+            {
+                string errorMessage =
+                        string.Format(CultureInfo.InvariantCulture, "The '{0}' attribute is required for the resource handler definition.",
+                                      requiredAttributeName);
+                throw ConfigurationUtils.CreateConfigurationException(errorMessage, section);
+            }
+            return attribute.Value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/ResourceSetMessageSource.cs b/src/Spring/Spring.Core/Context/Support/ResourceSetMessageSource.cs
new file mode 100644
index 00000000..ac705f94
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/ResourceSetMessageSource.cs
@@ -0,0 +1,238 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Resources;
+using System.Text;
+
+using Spring.Objects.Factory;
+using Spring.Core.TypeConversion;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// An <see cref="Spring.Context.IMessageSource"/> implementation that
+	/// accesses resources from .resx / .resource files.
+	/// </summary>
+    /// <remarks>Note that for the method 
+    /// GetResourceObject if the resource name resolves to null, then in 
+    /// .NET 1.1 the return value will be String.Empty whereas 
+    /// in .NET 2.0 it will return null.</remarks>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: ResourceSetMessageSource.cs,v 1.23 2007/07/31 18:15:50 bbaia Exp $</version>
+	public class ResourceSetMessageSource : AbstractMessageSource, IInitializingObject
+	{
+		#region Fields
+
+		private Hashtable _cachedResources;
+		private IList _resourceManagers;
+
+		#endregion
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.Support.ResourceSetMessageSource"/> class.
+		/// </summary>
+		public ResourceSetMessageSource()
+		{
+			_cachedResources = new Hashtable();
+			_resourceManagers = new ArrayList();
+		}
+
+		/// <summary>
+		/// The collection of <see cref="System.Resources.ResourceManager"/>s
+		/// in this <see cref="Spring.Context.Support.ResourceSetMessageSource"/>.
+		/// </summary>
+		public IList ResourceManagers
+		{
+			get { return _resourceManagers; }
+			set { _resourceManagers = value; }
+		}
+
+		/// <summary>
+		/// Resolves a given code by searching through each assembly name in
+		/// the base names array.
+		/// </summary>
+		/// <param name="code">The code to resolve.</param>      
+		/// <param name="cultureInfo">
+		/// The <see cref="System.Globalization.CultureInfo"/> to use for lookups.
+		/// </param>
+		/// <returns>The message from the resource set.</returns>
+		protected override string ResolveMessage(
+			string code, CultureInfo cultureInfo)
+		{
+			string message = null;
+			for (int i = 0; message == null & i < _resourceManagers.Count; i++)
+			{
+				message = ResolveObject((ResourceManager) _resourceManagers[i], code, cultureInfo) as string;
+			}
+			return message;
+		}
+
+		/// <summary>
+		/// Resolves a given code by searching through each assembly name in the array.
+		/// </summary>
+		/// <param name="code">The code to resolve.</param>      
+		/// <param name="cultureInfo">
+		/// The <see cref="System.Globalization.CultureInfo"/> to use for lookups.
+		/// </param>
+		/// <returns>The object from the resource set.</returns>
+		protected override object ResolveObject(string code, CultureInfo cultureInfo)
+		{
+			object obj = null;
+
+			for (int i = 0; obj == null & i < _resourceManagers.Count; i++)
+			{
+				obj = ResolveObject((ResourceManager) _resourceManagers[i], code, cultureInfo);
+			}
+			return obj;
+		}
+
+		// *** NOTE Don't use cref for ComponentResourceManager as it doesn't
+		//          exist on 1.0
+		//
+
+		/// <summary>
+		/// Uses a System.ComponentModel.ComponentResourceManager
+		/// to apply resources to object properties.
+		/// Resource key names are of the form objectName.propertyName
+		/// </summary>
+		/// <remarks>
+        /// This feature is not currently supported on version 1.0 of the .NET platform.
+		/// </remarks>
+		/// <param name="value">
+		/// An object that contains the property values to be applied.
+		/// </param>
+		/// <param name="objectName">
+		/// The base name of the object to use for the key lookup.
+		/// </param>      
+		/// <param name="culture">
+		/// The <see cref="System.Globalization.CultureInfo"/> to use for lookups.
+		/// If <cref lang="null"/>, uses the
+		/// <see cref="System.Globalization.CultureInfo.CurrentUICulture"/> value.
+		/// </param>
+		/// <exception cref="System.NotSupportedException">
+		/// This feature is not currently supported on version 1.0 of the .NET platform.
+		/// </exception>
+		protected override void ApplyResourcesToObject(object value, string objectName, CultureInfo culture)
+		{
+#if !NET_1_0
+		    if(value != null) 
+		    {
+		        ComponentResourceManager crm = new ComponentResourceManager(value.GetType());
+		        crm.ApplyResources(value, objectName, culture);
+		    }
+#else
+		    throw new NotSupportedException("Operation not supported in .NET 1.0 Release.");
+#endif 
+		}
+
+	    /// <summary>
+	    /// Resolves a code into an object given a base name.
+	    /// </summary>
+	    /// <param name="resourceManager">The <see cref="System.Resources.ResourceManager"/> to search.</param>
+	    /// <param name="code">The code to resolve.</param>      
+	    /// <param name="cultureInfo">
+	    /// The <see cref="System.Globalization.CultureInfo"/> to use for lookups.
+	    /// </param>
+	    /// <returns>The object from the resource file.</returns>
+	    protected object ResolveObject(ResourceManager resourceManager, string code, CultureInfo cultureInfo)
+	    {
+            string cacheKey = code + "." + cultureInfo.Name;
+            object resource = _cachedResources[cacheKey];
+
+            if (resource == null)
+            {
+                resource = resourceManager.GetObject(code, cultureInfo);
+                if (resource != null)
+                {
+                    lock (_cachedResources)
+                    {
+                        _cachedResources[cacheKey] = resource;
+                    }
+                }
+            }
+
+            return resource;
+	    }
+
+	    /// <summary>
+	    /// Returns a <see cref="System.String"/> representation of the
+	    /// <see cref="Spring.Context.Support.ResourceSetMessageSource"/>.
+	    /// </summary>
+	    /// <returns>A <see cref="System.String"/> representation of the
+	    /// <see cref="Spring.Context.Support.ResourceSetMessageSource"/>.</returns>
+	    public override string ToString()
+	    {
+	        StringBuilder sb = new StringBuilder();
+	        sb.Append(GetType().Name);
+	        sb.Append(" with ResourceManagers of base names = [");
+	        foreach (ResourceManager rm in ResourceManagers)
+	        {
+	            sb.Append(rm.BaseName);
+	            sb.Append(",");
+	        }
+	        string s = sb.ToString();
+	        return s.TrimEnd(new char[] {','}) + "]";
+	    }
+
+	    /// <summary>
+	    /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+	    /// after it has set all object properties supplied.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// The list may contain objects of type <see cref="System.String"/> or
+	    /// <see cref="System.Resources.ResourceManager"/>. <see cref="System.String"/> types
+	    /// are converted to <see cref="System.Resources.ResourceManager"/> instances using the notation
+	    /// resourcename, assembly partial name.
+	    /// </p>
+	    /// </remarks>
+	    /// <exception cref="System.ArgumentException">
+	    /// If the conversion from a <see cref="System.String"/> to a
+	    /// <see cref="System.Resources.ResourceManager"/> can't be performed.
+	    /// </exception>
+	    public void AfterPropertiesSet()
+	    {
+	        ResourceManagerConverter cvt = new ResourceManagerConverter();
+	        for (int i = 0; i < _resourceManagers.Count; i++)
+	        {
+	            object o = _resourceManagers[i];
+	            if (o is String)
+	            {
+	                _resourceManagers[i] = cvt.ConvertFrom((string) o);
+	            }
+	            else if (!(o is ResourceManager))
+	            {
+	                throw new ArgumentException("Only Types of string and ResourceManager are allowed.  Type " + o.GetType() + " was set instead.");
+	            }
+	        }
+	    }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/StaticApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/StaticApplicationContext.cs
new file mode 100644
index 00000000..53cea4f0
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/StaticApplicationContext.cs
@@ -0,0 +1,102 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using Spring.Objects;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// <see cref="Spring.Context.IApplicationContext"/> that allows concrete registration of
+	/// objects and messages in code, rather than from external configuration sources.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Mainly useful for testing.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: StaticApplicationContext.cs,v 1.9 2007/07/10 05:48:03 markpollack Exp $</version>
+	public class StaticApplicationContext : GenericApplicationContext
+	{
+		/// <summary>
+		/// Creates a new instance of the StaticApplicationContext class.
+		/// </summary>
+		public StaticApplicationContext() : this( null ) {}
+
+		/// <summary>
+		/// Creates a new instance of the StaticApplicationContext class.
+		/// </summary>
+		/// <param name="parentContext">The parent application context.</param>
+		public StaticApplicationContext( IApplicationContext parentContext )
+			: base( null, true, parentContext ) 
+		{			
+			RegisterSingleton( MessageSourceObjectName, typeof( StaticMessageSource ), null );
+		}
+
+		/// <summary>
+		/// Do nothing: we rely on callers to update our public methods.
+		/// </summary>
+		protected override void RefreshObjectFactory() {}
+
+		/// <summary>
+		/// Register a singleton object with the default object factory.
+		/// </summary>
+		/// <param name="name">The name of the object.</param>
+		/// <param name="classType">The <see cref="System.Type"/> of the object.</param>
+		/// <param name="propertyValues">The property values for the singleton instance.</param>
+		public void RegisterSingleton( string name, Type classType, MutablePropertyValues propertyValues ) 
+		{
+			DefaultListableObjectFactory.RegisterObjectDefinition( name, new RootObjectDefinition( classType, propertyValues ) ); 
+		}
+
+		/// <summary>
+		/// Registers a prototype object with the default object factory.
+		/// </summary>
+		/// <param name="name">The name of the prototype object.</param>
+		/// <param name="classType">The <see cref="System.Type"/> of the prototype object.</param>
+		/// <param name="propertyValues">The property values for the prototype instance.</param>
+		public void RegisterPrototype( string name, Type classType, MutablePropertyValues propertyValues ) 
+		{
+            DefaultListableObjectFactory.RegisterObjectDefinition(name, new RootObjectDefinition(classType, propertyValues, false));
+		}
+
+		/// <summary>
+		/// Associate the given message with the given code.
+		/// </summary>
+		/// <param name="code">The lookup code.</param>
+		/// <param name="cultureInfo">
+		/// The <see cref="System.Globalization.CultureInfo"/> that the message should be found within.
+		/// </param>
+		/// <param name="defaultMessage">The message associated with the lookup code.</param>
+		public void AddMessage( string code, CultureInfo cultureInfo, string defaultMessage ) 
+		{
+			StaticMessageSource messageSource = (StaticMessageSource) GetObject( MessageSourceObjectName );
+			messageSource.AddMessage( code, cultureInfo, defaultMessage );
+		}
+	}
+}
diff --git a/src/Spring/Spring.Core/Context/Support/StaticMessageSource.cs b/src/Spring/Spring.Core/Context/Support/StaticMessageSource.cs
new file mode 100644
index 00000000..d56380b8
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/StaticMessageSource.cs
@@ -0,0 +1,202 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Simple implementation of <see cref="Spring.Context.IMessageSource"/>
+    /// that allows messages to be held in an object and added programmatically.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Mainly useful for testing.
+	/// </p>
+	/// <p>
+	/// This <see cref="Spring.Context.IMessageSource"/> supports internationalization.
+	/// </p>
+	/// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <seealso cref="Spring.Context.Support.DelegatingMessageSource"/>
+    /// <version>$Id: StaticMessageSource.cs,v 1.16 2007/08/27 13:57:27 oakinger Exp $</version>
+    public class StaticMessageSource : AbstractMessageSource
+    {
+        private Hashtable _messages;
+        private Hashtable _objects;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.Support.StaticMessageSource"/> class.
+		/// </summary>
+        public StaticMessageSource()
+        {
+            _messages = new Hashtable();
+            _objects = new Hashtable();
+        }
+
+		/// <summary>
+		/// Returns a format string.
+		/// </summary>
+		/// <param name="code">The code of the message to resolve.</param>
+		/// <param name="cultureInfo">
+		/// The <see cref="System.Globalization.CultureInfo"/> to resolve the
+		/// code for.
+		/// </param>
+		/// <returns>
+		/// A format string or <see langword="null"/> if not found.
+		/// </returns>
+		/// <seealso cref="Spring.Context.Support.AbstractMessageSource.ResolveMessage(string, CultureInfo)"/>
+		protected override string ResolveMessage(string code, CultureInfo cultureInfo)
+        {
+            return (string) _messages[GetLookupKey(code, cultureInfo)];
+        }
+
+		/// <summary>
+		/// Resolves an object (typically an icon or bitmap).
+		/// </summary>
+		/// <param name="code">The code of the object to resolve.</param>
+		/// <param name="cultureInfo">
+		/// The <see cref="System.Globalization.CultureInfo"/> to resolve the
+		/// code for.
+		/// </param>
+		/// <returns>
+		/// The resolved object or <see langword="null"/> if not found.
+		/// </returns>
+		/// <seealso cref="Spring.Context.Support.AbstractMessageSource.ResolveObject(string, CultureInfo)"/>
+        protected override object ResolveObject(string code, CultureInfo cultureInfo)
+        {
+            return _objects[GetLookupKey(code, cultureInfo)];
+        }
+
+
+	// *** NOTE Don't use cref for ComponentResourceManager as it doesn't
+	//          exist on 1.0
+	//
+
+        /// <summary>
+        /// Applies resources to object properties.
+        /// </summary>
+		/// <remarks>
+		/// <p>
+		/// Uses a System.ComponentModel.ComponentResourceManager
+		/// internally to apply resources to object properties. Resource key
+		/// names are of the form <c>objectName.propertyName</c>.
+		/// </p>
+        /// <p>
+        /// This feature is not currently supported on version 1.0 of the .NET platform.
+        /// </p>
+        /// </remarks>
+		/// <param name="value">
+		/// An object that contains the property values to be applied.
+		/// </param>
+		/// <param name="objectName">
+		/// The base name of the object to use for key lookup.
+		/// </param>
+		/// <param name="cultureInfo">
+		/// The <see cref="System.Globalization.CultureInfo"/> with which the
+		/// resource is associated.
+		/// </param>
+		/// <exception cref="System.NotSupportedException">
+		/// This feature is not currently supported on version 1.0 of the .NET platform.
+		/// </exception>
+		/// <seealso cref="Spring.Context.Support.AbstractMessageSource.ApplyResourcesToObject(object, string, CultureInfo)"/>
+		protected override void ApplyResourcesToObject(object value, string objectName, CultureInfo cultureInfo)
+		{
+#if !NET_1_0
+		    if(value != null) 
+		    {
+		        new ComponentResourceManager(value.GetType()).ApplyResources(value, objectName, cultureInfo);
+		    }
+#else
+		    throw new System.NotSupportedException("Operation not supported in .NET 1.0 Release.");
+#endif 
+		}
+
+        /// <summary>
+        /// Associate the supplied <paramref name="messageFormat"/> with the
+        /// supplied <paramref name="code"/>.
+        /// </summary>
+        /// <param name="code">The lookup code.</param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to resolve the
+        /// code for.
+        /// </param>
+        /// <param name="messageFormat">
+        /// The message format associated with this lookup code.
+        /// </param>
+        public void AddMessage(
+            string code, CultureInfo culture, string messageFormat)
+        {
+            _messages.Add(GetLookupKey(code, culture), messageFormat);
+        }
+
+        /// <summary>
+        /// Associate the supplied <paramref name="value"/> with the
+        /// supplied <paramref name="code"/>.
+        /// </summary>
+        /// <param name="code">The lookup code.</param>
+        /// <param name="cultureInfo">
+        /// The <see cref="System.Globalization.CultureInfo"/> to resolve the
+        /// code for.
+        /// </param>
+        /// <param name="value">
+        /// The object associated with this lookup code.
+        /// </param>
+        public void AddObject(string code, CultureInfo cultureInfo, object value)
+        {
+            _objects.Add(GetLookupKey(code, cultureInfo), value);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> representation of this
+        /// message source.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> containing all of this message
+        /// source's messages.
+        /// </returns>
+        public override string ToString()
+        {
+            StringBuilder output = new StringBuilder();
+            output.Append(GetType().Name);
+            output.Append(" : ");
+            foreach (string code in _messages.Keys)
+            {
+                output.AppendFormat("['{0}' : '{1}']", code, _messages[code]);
+            }
+            return output.ToString();
+        }
+
+        private static string GetLookupKey(string code, CultureInfo culture)
+        {
+            return new StringBuilder(code).Append("_").Append(culture).ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/TypeAliasesSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/TypeAliasesSectionHandler.cs
new file mode 100644
index 00000000..9ed6e7da
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/TypeAliasesSectionHandler.cs
@@ -0,0 +1,130 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Configuration;
+using System.Globalization;
+using System.Xml;
+
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Configuration section handler for the Spring.NET <c>typeAliases</c>
+    /// config section.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Type aliases can be used instead of fully qualified type names anywhere
+    /// a type name is expected in a Spring.NET configuration file.
+    /// </p>
+    /// <p>
+    /// This includes type names specified within an object definition, as well
+    /// as values of the properties or constructor arguments that expect
+    /// <see cref="System.Type"/> instances.
+    /// </p>
+    /// </remarks>
+    /// <example>
+    /// <p>
+    /// The following example shows how to configure both this section handler and
+    /// how to define type aliases within a Spring.NET config section:
+    /// </p>
+    /// <code escaped="true">
+    /// <configuration>
+    ///     <configSections>
+    ///		    <sectionGroup name="spring">
+    ///			    <section name="typeAliases" type="Spring.Context.Support.TypeAliasesSectionHandler, Spring.Core"/>
+    ///		    </sectionGroup>
+    ///     </configSections>
+    ///     <spring>
+    ///		    <typeAliases>
+    ///			    <alias name="WebServiceExporter" type="Spring.Web.Services.WebServiceExporter, Spring.Web"/>
+    ///			    <alias name="MyType" type="MyCompany.MyProject.MyNamespace.MyType, MyAssembly"/>
+    ///			    ...
+    ///		    </typeAliases>
+    ///		    ...
+    ///     </spring>
+    /// </configuration>
+    /// </code>
+    /// </example>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: TypeAliasesSectionHandler.cs,v 1.8 2007/07/31 18:15:50 bbaia Exp $</version>
+    /// <seealso cref="Spring.Core.TypeResolution.TypeRegistry"/>
+    public class TypeAliasesSectionHandler : IConfigurationSectionHandler
+    {
+        private const string AliasElementName = "alias";
+        private const string NameAttributeName = "name";
+        private const string TypeAttributeName = "type";
+
+        /// <summary>
+        /// Populates <see cref="TypeRegistry"/> using values specified in
+        /// the <c>typeAliases</c> config section.
+        /// </summary>
+        /// <param name="parent">
+        /// The configuration settings in a corresponding parent
+        /// configuration section.
+        /// </param>
+        /// <param name="configContext">
+        /// The configuration context when called from the ASP.NET
+        /// configuration system. Otherwise, this parameter is reserved and
+        /// is <see langword="null"/>.
+        /// </param>
+        /// <param name="section">
+        /// The <see cref="System.Xml.XmlNode"/> for the section.
+        /// </param>
+        /// <returns>
+        /// This method always returns <see langword="null"/>, because the
+        /// <see cref="TypeRegistry"/> is populated as a side-effect of this
+        /// object's execution and thus there is no need to return anything.
+        /// </returns>
+        public object Create(object parent, object configContext, XmlNode section)
+        {
+            if (section != null)
+            {
+                XmlNodeList aliases = ((XmlElement) section).GetElementsByTagName(AliasElementName);
+                foreach (XmlElement aliasElement in aliases)
+                {
+                    string alias = GetRequiredAttributeValue(aliasElement, NameAttributeName, section);
+                    string typeName = GetRequiredAttributeValue(aliasElement, TypeAttributeName, section);
+                    TypeRegistry.RegisterType(alias, typeName);
+                }
+            }
+            return null;
+        }
+
+        private static string GetRequiredAttributeValue(
+            XmlElement aliasElement, string requiredAttributeName, XmlNode section)
+        {
+            XmlAttribute attribute = aliasElement.GetAttributeNode(requiredAttributeName);
+            if (attribute == null)
+            {
+                string errorMessage = string.Format(CultureInfo.InvariantCulture,
+                                                    "The '{0}' attribute is required for the (type) <alias/> element.", requiredAttributeName);
+                throw ConfigurationUtils.CreateConfigurationException(errorMessage, section);
+            }
+            return attribute.Value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/TypeConvertersSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/TypeConvertersSectionHandler.cs
new file mode 100644
index 00000000..941d7f87
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/TypeConvertersSectionHandler.cs
@@ -0,0 +1,148 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.ComponentModel;
+using System.Configuration;
+using System.Globalization;
+using System.Xml;
+
+using Spring.Core.TypeConversion;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Configuration section handler for the Spring.NET <c>typeConverters</c>
+    /// config section.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Type converters are used to convert objects from one type into another
+    /// when injecting property values, evaluating expressions, performing data
+    /// binding, etc.
+    /// </p>
+    /// <p>
+    /// They are a very powerful mechanism as they allow Spring.NET to automatically
+    /// convert string-based property values from the configuration file into the appropriate
+    /// type based on the target property's type or to convert string values submitted
+    /// via a web form into a type that is used by your data model when Spring.NET data
+    /// binding is used. Because they offer such tremendous help, you should always provide
+    /// a type converter implementation for your custom types that you want to be able to use
+    /// for injected properties or for data binding.
+    /// </p>
+    /// <p>
+    /// The standard .NET mechanism for specifying type converter for a particular type is
+    /// to decorate the type with a <see cref="TypeConverterAttribute"/>, passing the type
+    /// of the <see cref="TypeConverter"/>-derived class as a parameter.
+    /// </p>
+    /// <p>
+    /// This mechanism will still work and is a preferred way of defining type converters if
+    /// you control the source code for the type that you want to define a converter for. However, 
+    /// this configuration section allows you to specify converters for the types that you don't 
+    /// control and it also allows you to override some of the standard type converters, such as
+    /// the ones that are defined for some of the types in the .NET Base Class Library.
+    /// </p>
+    /// </remarks>
+    /// <example>
+    /// <p>
+    /// The following example shows how to configure both this section handler and
+    /// how to define type converters within a Spring.NET config section:
+    /// </p>
+    /// <code escaped="true">
+    /// <configuration>
+    ///     <configSections>
+    ///		    <sectionGroup name="spring">
+    ///			    <section name="typeConverters" type="Spring.Context.Support.TypeConvertersSectionHandler, Spring.Core"/>
+    ///		    </sectionGroup>
+    ///     </configSections>
+    ///     <spring>
+    ///		    <typeConverters>
+    ///			    <converter for="Spring.Expressions.IExpression, Spring.Core" type="Spring.Expressions.ExpressionConverter, Spring.Core"/>
+    ///			    <converter for="MyTypeAlias" type="MyCompany.MyProject.Converters.MyTypeConverter, MyAssembly"/>
+    ///			    ...
+    ///		    </typeConverters>
+    ///		    ...
+    ///     </spring>
+    /// </configuration>
+    /// </code>
+    /// </example>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: TypeConvertersSectionHandler.cs,v 1.6 2007/07/31 18:15:50 bbaia Exp $</version>
+    /// <seealso cref="Spring.Core.TypeResolution.TypeRegistry"/>
+    public class TypeConvertersSectionHandler : IConfigurationSectionHandler
+    {
+        private const string ConverterElementName = "converter";
+        private const string ForAttributeName = "for";
+        private const string TypeAttributeName = "type";
+
+        /// <summary>
+        /// Populates <see cref="TypeConverterRegistry"/> using values specified in
+        /// the <c>typeConverters</c> config section.
+        /// </summary>
+        /// <param name="parent">
+        /// The configuration settings in a corresponding parent
+        /// configuration section.
+        /// </param>
+        /// <param name="configContext">
+        /// The configuration context when called from the ASP.NET
+        /// configuration system. Otherwise, this parameter is reserved and
+        /// is <see langword="null"/>.
+        /// </param>
+        /// <param name="section">
+        /// The <see cref="System.Xml.XmlNode"/> for the section.
+        /// </param>
+        /// <returns>
+        /// This method always returns <see langword="null"/>, because the
+        /// <see cref="TypeConverterRegistry"/> is populated as a side-effect of 
+        /// its execution and thus there is no need to return anything.
+        /// </returns>
+        public object Create(object parent, object configContext, XmlNode section)
+        {
+            if (section != null)
+            {
+                XmlNodeList converters = ((XmlElement) section).GetElementsByTagName(ConverterElementName);
+                foreach (XmlElement aliasElement in converters)
+                {
+                    string forType = GetRequiredAttributeValue(aliasElement, ForAttributeName, section);
+                    string converterType = GetRequiredAttributeValue(aliasElement, TypeAttributeName, section);
+                    TypeConverterRegistry.RegisterConverter(forType, converterType);
+                }
+            }
+            return null;
+        }
+
+        private static string GetRequiredAttributeValue(
+            XmlElement aliasElement, string requiredAttributeName, XmlNode section)
+        {
+            XmlAttribute attribute = aliasElement.GetAttributeNode(requiredAttributeName);
+            if (attribute == null)
+            {
+                string errorMessage = string.Format(CultureInfo.InvariantCulture,
+                                                    "The '{0}' attribute is required for the <converter> element.", requiredAttributeName);
+                throw ConfigurationUtils.CreateConfigurationException(errorMessage, section);
+            }
+            return attribute.Value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs
new file mode 100644
index 00000000..7dd00abc
--- /dev/null
+++ b/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs
@@ -0,0 +1,235 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// An <see cref="Spring.Context.IApplicationContext"/> implementation that
+	/// reads context definitions from XML based resources.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Currently, the resources that are supported are the <c>file</c>,
+	/// <c>http</c>, <c>ftp</c>, <c>config</c> and <c>assembly</c> resource
+	/// types.
+	/// </p>
+	/// <p>
+	/// You can provide custom implementations of the
+	/// <see cref="Spring.Core.IO.IResource"/> interface and and register them
+	/// with any <see cref="Spring.Context.IApplicationContext"/> that inherits
+	/// from the
+	/// <see cref="Spring.Context.Support.AbstractApplicationContext"/>
+	/// interface.
+	/// </p>
+	/// <note>
+	/// In case of multiple config locations, later object definitions will
+	/// override ones defined in previously loaded resources. This can be
+	/// leveraged to deliberately override certain object definitions via an
+	/// extra XML file.
+	/// </note>
+	/// </remarks>
+	/// <example>
+	/// <p>
+	/// Find below some examples of instantiating an
+	/// <see cref="Spring.Context.Support.XmlApplicationContext"/> using a
+	/// variety of different XML resources.
+	/// </p>
+	/// <code language="C#">
+	/// // an XmlApplicationContext that reads its object definitions from an
+	/// //    XML file that has been embedded in an assembly...
+	/// IApplicationContext context = new XmlApplicationContext
+	///		(
+	///			"assembly://AssemblyName/NameSpace/ResourceName"
+	///		);
+	///		
+	/// // an XmlApplicationContext that reads its object definitions from a
+	/// //    number of disparate XML resources...
+	/// IApplicationContext context = new XmlApplicationContext
+	///		(
+	///			// from an XML file that has been embedded in an assembly...
+	///			"assembly://AssemblyName/NameSpace/ResourceName",
+	///			// and from a (relative) filesystem-based resource...
+	///			"file://Objects/services.xml",
+	///			// and from an App.config / Web.config resource...
+	///			"config://spring/objects"
+	///		);
+	/// </code>
+	/// </example>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: XmlApplicationContext.cs,v 1.18 2007/08/08 17:46:37 bbaia Exp $</version>
+	/// <seealso cref="Spring.Core.IO.IResource"/>
+	/// <seealso cref="Spring.Core.IO.IResourceLoader"/>
+	/// <seealso cref="Spring.Core.IO.ConfigurableResourceLoader"/>
+	public class XmlApplicationContext : AbstractXmlApplicationContext
+	{
+		private string[] _configurationLocations;
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Context.Support.XmlApplicationContext"/> class,
+        /// loading the definitions from the supplied XML resource locations.
+        /// </summary>
+        /// <remarks>The created context will be case sensitive.</remarks>
+        /// <param name="configurationLocations">
+        /// Any number of XML based object definition resource locations.
+        /// </param>
+        public XmlApplicationContext(params string[] configurationLocations)
+            : this(true, null, true, null, configurationLocations)
+        { }
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.Support.XmlApplicationContext"/> class,
+		/// loading the definitions from the supplied XML resource locations.
+		/// </summary>
+		/// <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+		/// <param name="configurationLocations">
+		/// Any number of XML based object definition resource locations.
+		/// </param>
+        public XmlApplicationContext(bool caseSensitive,
+            params string[] configurationLocations)
+            : this(true, null, caseSensitive, null, configurationLocations)
+        { }
+        
+        /// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.Support.XmlApplicationContext"/> class,
+		/// loading the definitions from the supplied XML resource locations.
+		/// </summary>
+		/// <param name="name">The application context name.</param>
+        /// <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+        /// <param name="configurationLocations">
+		/// Any number of XML based object definition resource locations.
+		/// </param>
+        public XmlApplicationContext(string name, bool caseSensitive,
+            params string[] configurationLocations)
+            : this(true, name, caseSensitive, null, configurationLocations)
+        { }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Context.Support.XmlApplicationContext"/> class,
+        /// loading the definitions from the supplied XML resource locations,
+        /// with the given <paramref name="parentContext"/>.
+        /// </summary>
+        /// <param name="parentContext">
+        /// The parent context (may be <see langword="null"/>).
+        /// </param>
+        /// <param name="configurationLocations">
+        /// Any number of XML based object definition resource locations.
+        /// </param>
+        public XmlApplicationContext(
+            IApplicationContext parentContext,
+            params string[] configurationLocations)
+            : this(true, null, true, parentContext, configurationLocations)
+        { }
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.Support.XmlApplicationContext"/> class,
+		/// loading the definitions from the supplied XML resource locations,
+		/// with the given <paramref name="parentContext"/>.
+		/// </summary>
+		/// <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+		/// <param name="parentContext">
+		/// The parent context (may be <see langword="null"/>).
+		/// </param>
+		/// <param name="configurationLocations">
+		/// Any number of XML based object definition resource locations.
+		/// </param>
+        public XmlApplicationContext(
+            bool caseSensitive,
+            IApplicationContext parentContext,
+            params string[] configurationLocations)
+            : this(true, null, caseSensitive, parentContext, configurationLocations)
+        { }
+        
+        /// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Context.Support.XmlApplicationContext"/> class,
+		/// loading the definitions from the supplied XML resource locations,
+		/// with the given <paramref name="parentContext"/>.
+		/// </summary>
+		/// <param name="name">The application context name.</param>
+        /// <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+        /// <param name="parentContext">
+		/// The parent context (may be <see langword="null"/>).
+		/// </param>
+		/// <param name="configurationLocations">
+		/// Any number of XML based object definition resource locations.
+		/// </param>
+        public XmlApplicationContext(
+            string name,
+            bool caseSensitive,
+            IApplicationContext parentContext,
+            params string[] configurationLocations)
+            : this(true, name, caseSensitive, parentContext, configurationLocations)
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Context.Support.XmlApplicationContext"/> class,
+        /// loading the definitions from the supplied XML resource locations,
+        /// with the given <paramref name="parentContext"/>.
+        /// </summary>
+        /// <remarks>
+        /// This constructor is meant to be used by derived classes. By passing <paramref name="refresh"/>=false, it is
+        /// the responsibility of the deriving class to call <see cref="AbstractApplicationContext.Refresh()"/> to initialize the context instance.
+        /// </remarks>
+        /// <param name="refresh">if true, <see cref="AbstractApplicationContext.Refresh()"/> is called automatically.</param>
+        /// <param name="name">The application context name.</param>
+        /// <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+        /// <param name="parentContext">
+        /// The parent context (may be <see langword="null"/>).
+        /// </param>
+        /// <param name="configurationLocations">
+        /// Any number of XML based object definition resource locations.
+        /// </param>
+        public XmlApplicationContext(
+            bool refresh,
+            string name,
+            bool caseSensitive,
+            IApplicationContext parentContext,
+            params string[] configurationLocations)
+            : base(name, caseSensitive, parentContext )
+        {
+            _configurationLocations = configurationLocations;
+            if (refresh)
+            {
+                Refresh();
+            }
+        }
+
+	    /// <summary>
+	    /// An array of resource locations, referring to the XML object
+	    /// definition files that this context is to be built with.
+	    /// </summary>
+	    /// <returns>
+	    /// An array of resource locations, or <see langword="null"/> if none.
+	    /// </returns>
+	    /// <seealso cref="Spring.Context.Support.AbstractXmlApplicationContext.ConfigurationLocations"/>
+	    protected override string[] ConfigurationLocations
+	    {
+	        get { return _configurationLocations; }
+	    }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/CannotLoadObjectTypeException.cs b/src/Spring/Spring.Core/Core/CannotLoadObjectTypeException.cs
new file mode 100644
index 00000000..99d9a92a
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/CannotLoadObjectTypeException.cs
@@ -0,0 +1,180 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Exception thrown when the ObjectFactory cannot load the specified type of a given object.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: CannotLoadObjectTypeException.cs,v 1.4 2007/08/01 23:24:11 bbaia Exp $</version>
+    [Serializable]
+    public class CannotLoadObjectTypeException : FatalReflectionException
+    {
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CannotLoadObjectTypeException"/> class.
+        /// </summary>
+        public CannotLoadObjectTypeException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="CannotLoadObjectTypeException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public CannotLoadObjectTypeException(string message)
+            : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="CannotLoadObjectTypeException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public CannotLoadObjectTypeException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CannotLoadObjectTypeException"/> class.
+        /// </summary>
+        /// <param name="resourceDescription">The resource description that the object definition came from.</param>
+        /// <param name="objectName">Name of the object requested</param>
+        /// <param name="objectTypeName">Name of the object type.</param>
+        /// <param name="rootCause">The root cause.</param>
+        public CannotLoadObjectTypeException(string resourceDescription, string objectName, string objectTypeName, Exception rootCause )
+            : base("Cannot resolve type [" + objectTypeName + "] for object with name '" + objectName + "' defined in " + resourceDescription, rootCause)
+        {
+            this.resourceDescription = resourceDescription;
+            this.objectName = objectName;
+            this.objectTypeName = objectTypeName;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="InvalidPropertyException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected CannotLoadObjectTypeException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+
+            resourceDescription = info.GetString("ResourceDescription");
+            objectName = info.GetString("ObjectName");
+            objectTypeName = info.GetString("ObjectTypeName");
+        }
+
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets he name of the object we are trying to load.
+        /// </summary>
+        /// <value>The name of the object.</value>
+        public string ObjectName
+        {
+            get { return objectName; }
+        }
+
+        /// <summary>
+        /// Gets the name of the object type we are trying to load.
+        /// </summary>
+        /// <value>The name of the object type.</value>
+        public string ObjectTypeName
+        {
+            get { return objectTypeName; }
+        }
+
+        /// <summary>
+        /// Gets the resource description that the object definition came from
+        /// </summary>
+        /// <value>The resource description.</value>
+        public string ResourceDescription
+        {
+            get { return resourceDescription; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+        /// the data needed to serialize the target object.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+        /// with data.
+        /// </param>
+        /// <param name="context">
+        /// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+        /// for this serialization.
+        /// </param>
+        [SecurityPermission(SecurityAction.Demand, SerializationFormatter=true)]
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            base.GetObjectData(info, context);
+            info.AddValue("ResourceDescription", ResourceDescription);
+            info.AddValue("ObjectName", ObjectName);
+            info.AddValue("ObjectTypeName", ObjectTypeName);
+        }
+
+        #endregion
+
+        #region Fields
+
+        private string resourceDescription;
+        private string objectName;
+        private string objectTypeName;
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/ComposedCriteria.cs b/src/Spring/Spring.Core/Core/ComposedCriteria.cs
new file mode 100644
index 00000000..30f1d6d1
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/ComposedCriteria.cs
@@ -0,0 +1,116 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// A <see cref="Spring.Core.ICriteria"/> implementation that represents
+    /// a composed collection of <see cref="Spring.Core.ICriteria"/> instances.
+    /// </summary>
+    public class ComposedCriteria : ICriteria
+    {
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="ComposedCriteria"/> class.
+        /// </summary>
+        public ComposedCriteria() : this(null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="ComposedCriteria"/> class.
+        /// </summary>
+        /// <param name="criteria">
+        /// A user-defined (child) criteria that will be composed into this instance.
+        /// </param>
+        public ComposedCriteria(ICriteria criteria)
+        {
+            _criteria = new ArrayList();
+            Add(criteria);
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+        /// this instance?
+        /// </summary>
+        /// <param name="datum">The data to be checked by this criteria instance.</param>
+        /// <returns>
+        /// True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+        /// by this instance; false if not or the supplied <paramref name="datum"/> is null.
+        /// </returns>
+        public virtual bool IsSatisfied(object datum)
+        {
+            foreach (ICriteria criteria in _criteria)
+            {
+                if (!criteria.IsSatisfied(datum))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Adds the supplied <parameref name="criteria"/> into the criteria
+        /// composed within this instance.
+        /// </summary>
+        /// <param name="criteria">
+        /// The <see cref="Spring.Core.ICriteria"/> to be added.
+        /// </param>
+        public void Add(ICriteria criteria)
+        {
+            if (criteria != null)
+            {
+                _criteria.Add(criteria);
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// The list of <see cref="Spring.Core.ICriteria"/> composing this
+        /// instance.
+        /// </summary>
+        protected IList Criteria
+        {
+            get { return _criteria; }
+        }
+
+        #region Fields
+
+        private IList _criteria;
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/ControlFlowFactory.cs b/src/Spring/Spring.Core/Core/ControlFlowFactory.cs
new file mode 100644
index 00000000..34af262f
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/ControlFlowFactory.cs
@@ -0,0 +1,151 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Core
+{
+	/// <summary>
+	/// Factory class to conceal any default <see cref="Spring.Core.IControlFlow"/> implementation.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: ControlFlowFactory.cs,v 1.9 2007/07/31 01:35:07 markpollack Exp $</version>
+	public abstract class ControlFlowFactory
+	{
+		/// <summary>
+		/// Creates a new instance of the <see cref="Spring.Core.IControlFlow"/>
+		/// implementation provided by this factory.
+		/// </summary>
+		/// <returns>
+		/// A new instance of the <see cref="Spring.Core.IControlFlow"/>
+		/// implementation provided by this factory.
+		/// </returns>
+		public static IControlFlow CreateControlFlow()
+		{
+			return new DefaultControlFlow();
+		}
+
+		private class DefaultControlFlow : IControlFlow
+		{
+			private StackTrace _stackTrace;
+
+			#region Constructor (s) / Destructor
+
+			/// <summary>
+			/// Creates a new instance of the
+			/// <see cref="Spring.Core.ControlFlowFactory.DefaultControlFlow"/> class.
+			/// </summary>
+			public DefaultControlFlow()
+			{
+				_stackTrace = new StackTrace();
+			}
+
+			#endregion
+
+			#region IControlFlow Members
+
+			/// <summary>
+			/// Detects whether the caller is under the supplied <see cref="System.Type"/>,
+			/// according to the current stacktrace.
+			/// </summary>
+			/// <seealso cref="Spring.Core.IControlFlow.Under(Type)"/>
+			bool IControlFlow.Under(Type type)
+			{
+				return IsMatch(new MethodsDeclaredTypeCriteria(type));
+			}
+
+			/// <summary>
+			/// Detects whether the caller is under the supplied <see cref="System.Type"/>
+			/// and <paramref name="methodName"/>, according to the current stacktrace.
+			/// </summary>
+			/// <remarks>
+			/// <p>
+			/// Matches the whole method name.
+			/// </p>
+			/// </remarks>
+			/// <seealso cref="Spring.Core.IControlFlow.Under(Type, string)"/>
+			bool IControlFlow.Under(Type type, string methodName)
+			{
+				ComposedCriteria criteria = new ComposedCriteria();
+				criteria.Add(new MethodsDeclaredTypeCriteria(type));
+				criteria.Add(new RegularExpressionMethodNameCriteria(methodName));
+				return IsMatch(criteria);
+			}
+
+			/// <summary>
+			/// Does the current stack trace contain the supplied <paramref name="token"/>?
+			/// </summary>
+			/// <remarks>
+			/// <p>
+			/// This leaves it up to the caller to decide what matches, but is obviously less of
+			/// an abstraction because the caller must know the exact format of the underlying
+			/// stack trace.
+			/// </p>
+			/// </remarks>
+			/// <seealso cref="Spring.Core.IControlFlow.UnderToken(string)"/>
+			bool IControlFlow.UnderToken(string token)
+			{
+				return _stackTrace.ToString().IndexOf(token) != -1;
+			}
+
+			private bool IsMatch(ICriteria criteria) 
+			{
+				for (int i = 0; i < _stackTrace.FrameCount; i++)
+				{
+					MethodBase method = _stackTrace.GetFrame(i).GetMethod();
+					if(criteria.IsSatisfied(method)) 
+					{
+						return true;
+					}
+				}
+				return false;
+			}
+
+			private sealed class MethodsDeclaredTypeCriteria : ICriteria  
+			{
+				public MethodsDeclaredTypeCriteria(Type typeToMatch)
+				{
+					_typeToMatch = typeToMatch;
+				}
+
+				public bool IsSatisfied(object datum)
+				{
+					MethodBase method = datum as MethodBase;
+					if(method != null && method.DeclaringType != null) 
+					{
+						return method.DeclaringType.Equals(_typeToMatch);
+					}
+					return false;
+				}
+
+				private Type _typeToMatch;
+			}
+
+			#endregion
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/Conventions.cs b/src/Spring/Spring.Core/Core/Conventions.cs
new file mode 100644
index 00000000..a983fbd8
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/Conventions.cs
@@ -0,0 +1,71 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 Spring.Util;
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Provides methods to support various naming and other conventions used throughout the framework.
+    /// Mainly for internal use within the framework.
+    /// </summary>
+    /// <author>Rob Harrop</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: Conventions.cs,v 1.1 2007/05/26 00:42:36 markpollack Exp $</version>
+    public sealed class Conventions
+    {
+        /// <summary> Convert <code>String</code>s in attribute name format (lowercase, hyphens separating words)
+        /// into property name format (camel-cased). For example, <code>transaction-manager</code> is
+        /// converted into <code>transactionManager</code>.
+        /// </summary>
+        public static string AttributeNameToPropertyName(string attributeName)
+        {
+            AssertUtils.ArgumentNotNull(attributeName, "attributeName");
+            if (attributeName.IndexOf("-") == -1)
+            {
+                return attributeName;
+            }
+            char[] chars = attributeName.ToCharArray();
+            char[] result = new char[chars.Length - 1]; // not completely accurate but good guess
+            int currPos = 0;
+            bool upperCaseNext = false;
+            for (int i = 0; i < chars.Length; i++)
+            {
+                char c = chars[i];
+                if (c == '-')
+                {
+                    upperCaseNext = true;
+                }
+                else if (upperCaseNext)
+                {
+                    result[currPos++] = Char.ToUpper(c);
+                    upperCaseNext = false;
+                }                  
+                else
+                {
+                    result[currPos++] = c;
+                }
+            }
+            return new String(result, 0, currPos);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/CriteriaMemberFilter.cs b/src/Spring/Spring.Core/Core/CriteriaMemberFilter.cs
new file mode 100644
index 00000000..a7b57e4c
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/CriteriaMemberFilter.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Convenience class that exposes a signature that matches the
+    /// <see cref="System.Reflection.MemberFilter"/> delegate.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Useful when filtering <see cref="System.Type"/> members via the
+    /// <see cref="Spring.Core.ICriteria"/> mechanism.
+    /// </p>
+    /// </remarks>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: CriteriaMemberFilter.cs,v 1.1 2007/07/31 21:43:52 markpollack Exp $</version>
+    public class CriteriaMemberFilter 
+    {
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="CriteriaMemberFilter"/> class.
+        /// </summary>
+        public CriteriaMemberFilter ()
+        {
+        }
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Returns true if the supplied <see cref="System.Reflection.MemberInfo"/> instance
+        /// satisfies the supplied <paramref name="filterCriteria"/> (which must be an
+        /// <see cref="Spring.Core.ICriteria"/> implementation).
+        /// </summary>
+        /// <param name="member">
+        /// The <see cref="System.Reflection.MemberInfo"/> instance that will be checked to see if
+        /// it matches the supplied <paramref name="filterCriteria"/>.
+        /// </param>
+        /// <param name="filterCriteria">
+        /// The criteria against which to filter the supplied
+        /// <see cref="System.Reflection.MemberInfo"/> instance.
+        /// </param>
+        /// <returns>
+        /// True if the supplied <see cref="System.Reflection.MemberInfo"/> instance
+        /// satisfies the supplied <paramref name="filterCriteria"/> (which must be an
+        /// <see cref="Spring.Core.ICriteria"/> implementation); false if not or the
+        /// supplied <paramref name="filterCriteria"/> is not an
+        /// <see cref="Spring.Core.ICriteria"/> implementation or is null.
+        /// </returns>
+        public virtual bool FilterMemberByCriteria (MemberInfo member, object filterCriteria) 
+        {
+            ICriteria criteria = filterCriteria as ICriteria;
+            return criteria.IsSatisfied (member);
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/IControlFlow.cs b/src/Spring/Spring.Core/Core/IControlFlow.cs
new file mode 100644
index 00000000..f1b464f2
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IControlFlow.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Core
+{
+	/// <summary> 
+	/// Interface to be implemented by objects that can return information about
+	/// the current call stack.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Useful in AOP (as an expression of the AspectJ <c>cflow</c> concept) but not AOP-specific.
+	/// </p>
+	/// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.Net)</author>
+    /// <version>$Id: IControlFlow.cs,v 1.4 2006/04/09 07:18:38 markpollack Exp $</version>
+    public interface IControlFlow
+	{
+        /// <summary>
+        /// Detects whether the caller is under the supplied <see cref="System.Type"/>,
+        /// according to the current stacktrace.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> to look for.
+        /// </param>
+        /// <returns>
+		/// <see langword="true"/> if the caller is under the supplied <see cref="System.Type"/>.
+		/// </returns>
+		bool Under(Type type);
+        
+		/// <summary>
+		/// Detects whether the caller is under the supplied <see cref="System.Type"/>
+		/// and <paramref name="methodName"/>, according to the current stacktrace.
+		/// </summary>
+		/// <param name="type">
+		/// The <see cref="System.Type"/> to look for.
+		/// </param>
+		/// <param name="methodName">The name of the method to look for.</param>
+		/// <returns>
+		/// <see langword="true"/> if the caller is under the supplied <see cref="System.Type"/>
+		/// and <paramref name="methodName"/>.
+		/// </returns>
+        bool Under(Type type, string methodName);
+		
+        /// <summary>
+        /// Does the current stack trace contain the supplied <paramref name="token"/>?
+        /// </summary>
+        /// <param name="token">The token to match against.</param>
+        /// <returns>
+        /// <see langword="true"/> if the current stack trace contains the supplied
+        /// <paramref name="token"/>.
+        /// </returns>
+		bool UnderToken(string token);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/ICriteria.cs b/src/Spring/Spring.Core/Core/ICriteria.cs
new file mode 100644
index 00000000..81bdb297
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/ICriteria.cs
@@ -0,0 +1,51 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// The criteria for an arbitrary filter.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ICriteria.cs,v 1.6 2006/04/09 07:18:38 markpollack Exp $</version>
+    public interface ICriteria 
+    {
+        /// <summary>
+        /// Does the supplied <paramref name="datum"/> satisfy the criteria
+        /// encapsulated by this instance?
+        /// </summary>
+        /// <param name="datum">
+        /// The datum to be checked by this criteria instance.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="datum"/>
+        /// satisfies the criteria encapsulated by this instance;
+        /// <see langword="false"/> if not, or the supplied
+        /// <paramref name="datum"/> is <see langword="null"/>.
+        /// </returns>
+        bool IsSatisfied (object datum);
+    }
+}
diff --git a/src/Spring/Spring.Core/Core/IErrorCoded.cs b/src/Spring/Spring.Core/Core/IErrorCoded.cs
new file mode 100644
index 00000000..611c1dc0
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IErrorCoded.cs
@@ -0,0 +1,60 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+
+
+#endregion
+
+namespace Spring.Core
+{
+	/// <summary>
+	/// Interface that can be implemented by exceptions etc that are error coded.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The error code is a <see cref="System.String"/>, rather than a number, so it can
+	/// be given user-readable values, such as "object.failureDescription".
+	/// </p>
+	/// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.Net)</author>
+    /// <version>$Id: IErrorCoded.cs,v 1.6 2006/04/09 07:18:38 markpollack Exp $</version>
+	public interface IErrorCoded
+	{
+		/// <summary>
+		/// Return the error code associated with this failure.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The GUI can render this anyway it pleases, allowing for I18n etc.
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// The <see cref="System.String"/> error code associated with this failure,
+		/// or the empty string instance if not error-coded.
+		/// </returns>
+		string ErrorCode
+		{
+			get;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/IO/AbstractResource.cs b/src/Spring/Spring.Core/Core/IO/AbstractResource.cs
new file mode 100644
index 00000000..a5afc244
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IO/AbstractResource.cs
@@ -0,0 +1,764 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Text;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+    /// <summary>
+    /// Convenience base class for <see cref="Spring.Core.IO.IResource"/>
+    /// implementations, pre-implementing typical behavior.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// The <see cref="Spring.Core.IO.AbstractResource.Exists"/> method will
+    /// check whether a <see cref="System.IO.FileInfo"/> or
+    /// <see cref="System.IO.Stream"/> can be opened;
+    /// <see cref="Spring.Core.IO.AbstractResource.IsOpen"/> will always return
+    /// <see langword="false"/>;
+    /// <see cref="Spring.Core.IO.AbstractResource.Uri"/> and
+    /// <see cref="Spring.Core.IO.AbstractResource.File"/> throw an exception;
+    /// and <see cref="Spring.Core.IO.AbstractResource.ToString()"/> will
+    /// return the value of the
+    /// <see cref="Spring.Core.IO.IResource.Description"/> property.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: AbstractResource.cs,v 1.25 2007/12/06 22:08:47 markpollack Exp $</version>
+    /// <seealso cref="Spring.Core.IO.IResource"/>
+    public abstract class AbstractResource : IResource
+    {
+        /// <summary>
+        /// The default special character that denotes the base (home, or root)
+        /// path.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Will be resolved (by those <see cref="Spring.Core.IO.IResource"/>
+        /// implementations that support it) to the home (or root) path for
+        /// the specific <see cref="Spring.Core.IO.IResource"/> implementation.
+        /// </p>
+        /// <p>
+        /// For example, in the case of a web application this will (probably)
+        /// resolve to the virtual directory of said web application.
+        /// </p>
+        /// </remarks>
+        protected const string DefaultBasePathPlaceHolder = "~";
+
+        private string protocol;
+        private string basePathPlaceHolder = DefaultBasePathPlaceHolder;
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.IO.AbstractResource"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes no
+        /// public constructors.
+        /// </p>
+        /// </remarks>
+        protected AbstractResource()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.IO.AbstractResource"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes no
+        /// public constructors.
+        /// </p>
+        /// </remarks>
+        /// <param name="resourceName">
+        /// A string representation of the resource.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="resourceName"/> is
+        /// <see langword="null"/> or contains only whitespace character(s).
+        /// </exception>
+        protected AbstractResource(string resourceName)
+        {
+            AssertUtils.ArgumentHasText(resourceName, "resourceName");
+            protocol = ConfigurableResourceLoader.GetProtocol(resourceName);
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The special character that denotes the base (home, or root)
+        /// path.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Will be resolved (by those <see cref="Spring.Core.IO.IResource"/>
+        /// implementations that support it) to the home (or root) path for
+        /// the specific <see cref="Spring.Core.IO.IResource"/> implementation.
+        /// </p>
+        /// <p>
+        /// For example, in the case of a web application this will (probably)
+        /// resolve to the virtual directory of said web application.
+        /// </p>
+        /// </remarks>
+        /// <seealso cref="Spring.Core.IO.AbstractResource.DefaultBasePathPlaceHolder"/>
+        public string BasePathPlaceHolder
+        {
+            get { return basePathPlaceHolder; }
+            set { basePathPlaceHolder = value; }
+        }
+
+        /// <summary>
+        /// Return an <see cref="System.IO.Stream"/> for this resource.
+        /// </summary>
+        /// <value>
+        /// An <see cref="System.IO.Stream"/>.
+        /// </value>
+        /// <exception cref="System.IO.IOException">
+        /// If the stream could not be opened.
+        /// </exception>
+        /// <seealso cref="Spring.Core.IO.IInputStreamSource.InputStream"/>
+        public abstract Stream InputStream { get; }
+
+        /// <summary>
+        /// Returns a description for this resource.
+        /// </summary>
+        /// <value>
+        /// A description for this resource.
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.IResource.Description"/>
+        public abstract string Description { get; }
+
+        /// <summary>
+        /// Returns the protocol associated with this resource (if any).
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The value of this property may be <see langword="null"/> if no
+        /// protocol is associated with the resource type (for example if the
+        /// resource is a memory stream).
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The protocol associated with this resource (if any).
+        /// </value>
+        public string Protocol
+        {
+            get { return protocol; }
+        }
+
+        /// <summary>
+        /// Does this resource represent a handle with an open stream?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This, the default implementation, always returns
+        /// <see langword="false"/>.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// <see langword="true"/> if this resource represents a handle with an
+        /// open stream.
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.IResource.IsOpen"/>
+        public virtual bool IsOpen
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns the <see cref="System.Uri"/> handle for this resource.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This, the default implementation, always throws a
+        /// <see cref="System.IO.FileNotFoundException"/>, assuming that the
+        /// resource cannot be exposed as a <see cref="System.Uri"/>.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The <see cref="System.Uri"/> handle for this resource.
+        /// </value>
+        /// <exception cref="System.IO.FileNotFoundException">
+        /// This, the default implementation, <b>always</b> throws a
+        /// <see cref="System.IO.FileNotFoundException"/>.
+        /// </exception>
+        /// <seealso cref="Spring.Core.IO.IResource.Uri"/>
+        public virtual Uri Uri
+        {
+            get
+            {
+                throw new FileNotFoundException(
+                    Description + " cannot be resolved to a Uri.");
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="System.IO.FileInfo"/> handle for this resource.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This, the default implementation, always throws a
+        /// <see cref="System.IO.FileNotFoundException"/>, assuming that the
+        /// resource cannot be resolved to an absolute file path.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The <see cref="System.IO.FileInfo"/> handle for this resource.
+        /// </value>
+        /// <exception cref="System.IO.FileNotFoundException">
+        /// This implementation <b>always</b> throws a
+        /// <see cref="System.IO.FileNotFoundException"/>.
+        /// </exception>
+        /// <seealso cref="Spring.Core.IO.IResource"/>
+        /// <see cref="Spring.Core.IO.IResource.Exists"/>
+        public virtual FileInfo File
+        {
+            get
+            {
+                throw new FileNotFoundException(
+                    Description + " cannot be resolved to an absolute file path.");
+            }
+        }
+
+        /// <summary>
+        /// Does this resource actually exist in physical form?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation checks whether a <see cref="System.IO.FileInfo"/>
+        /// can be opened, falling back to whether a
+        /// <see cref="System.IO.Stream"/> can be opened.
+        /// </p>
+        /// <p>
+        /// This will cover both directories and content resources.
+        /// </p>
+        /// <p>
+        /// This implementation will also return <see langword="false"/> if
+        /// permission to the (file's) path is denied.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// <see langword="true"/> if this resource actually exists in physical
+        /// form (for example on a filesystem).
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.IResource.Exists"/>
+        /// <seealso cref="Spring.Core.IO.IResource.File"/>
+        public virtual bool Exists
+        {
+            get
+            {
+                try
+                {
+                    return File.Exists;
+                }
+                catch (IOException)
+                {
+                    try
+                    {
+                        Stream inputStream = InputStream;
+                        inputStream.Close();
+                        return true;                        
+                    } catch (Exception)
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Strips any protocol name from the supplied
+        /// <paramref name="resourceName"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the supplied <paramref name="resourceName"/> does not
+        /// have any protocol associated with it, then the supplied
+        /// <paramref name="resourceName"/> will be returned as-is.
+        /// </p>
+        /// </remarks>
+        /// <example>
+        /// <code language="C#">
+        /// GetResourceNameWithoutProtocol("http://www.mycompany.com/resource.txt");
+        ///		// returns www.mycompany.com/resource.txt
+        /// </code>
+        /// </example>
+        /// <param name="resourceName">
+        /// The name of the resource.
+        /// </param>
+        /// <returns>
+        /// The name of the resource without the protocol name.
+        /// </returns>
+        protected static string GetResourceNameWithoutProtocol(string resourceName)
+        {
+            int pos = resourceName.IndexOf(
+                ConfigurableResourceLoader.ProtocolSeparator);
+            if (pos == -1)
+            {
+                return resourceName;
+            }
+            else
+            {
+                return resourceName.Substring(pos + ConfigurableResourceLoader.ProtocolSeparator.Length);
+            }
+        }
+
+        /// <summary>
+        /// Resolves the supplied <paramref name="resourceName"/> to its value
+        /// sans any leading protocol.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the resource.
+        /// </param>
+        /// <returns>
+        /// The name of the resource without the protocol name.
+        /// </returns>
+        /// <see cref="Spring.Core.IO.AbstractResource.GetResourceNameWithoutProtocol"/>
+        protected virtual string ResolveResourceNameWithoutProtocol(string resourceName)
+        {
+            return ResolveBasePathPlaceHolder(
+                GetResourceNameWithoutProtocol(resourceName), BasePathPlaceHolder);
+        }
+
+        /// <summary>
+        /// Resolves the presence of the
+        /// <paramref name="basePathPlaceHolder"/> value
+        /// in the supplied <paramref name="resourceName"/> into a path.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The default implementation simply returns the supplied
+        /// <paramref name="resourceName"/> as is.
+        /// </p>
+        /// </remarks>
+        /// <param name="resourceName">
+        /// The name of the resource.
+        /// </param>
+        /// <param name="basePathPlaceHolder">
+        /// The string that is a placeholder for a base path.
+        /// </param>
+        /// <returns>
+        /// The name of the resource with any <paramref name="basePathPlaceHolder"/>
+        /// value having been resolved into an actual path.
+        /// </returns>
+        protected virtual string ResolveBasePathPlaceHolder(
+            string resourceName, string basePathPlaceHolder)
+        {
+            return resourceName;
+        }
+
+        /// <summary>
+        /// This implementation returns the
+        /// <see cref="Description"/> of this resource.
+        /// </summary>
+        /// <seealso cref="Spring.Core.IO.IResource.Description"/>
+        public override string ToString()
+        {
+            return Description;
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is
+        /// equal to the current <see cref="System.Object"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation compares <see cref="Description"/> values.
+        /// </p>
+        /// </remarks>
+        /// <seealso cref="Spring.Core.IO.IResource.Description"/>
+        public override bool Equals(object obj)
+        {
+            return obj is IResource
+                   && ((IResource)obj).Description.Equals(Description);
+        }
+
+        /// <summary>
+        /// Serves as a hash function for a particular type, suitable for use
+        /// in hashing algorithms and data structures like a hash table. 
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation returns the hashcode of the
+        /// <see cref="Description"/> property.
+        /// </p>
+        /// </remarks>
+        /// <seealso cref="Spring.Core.IO.IResource.Description"/>
+        public override int GetHashCode()
+        {
+            return Description.GetHashCode();
+        }
+
+        #endregion
+
+        #region Relative Resource Support
+
+        /// <summary>
+        /// Factory Method. Create a new instance of the current resource type using the given resourceName
+        /// </summary>
+        protected virtual IResource CreateResourceInstance( string resourceName )
+        {
+            return null;
+        }
+                
+        /// <summary>
+        /// The ResourceLoader to be used for resolving relative resources
+        /// </summary>
+        protected virtual IResourceLoader GetResourceLoader()
+        {
+            return new ConfigurableResourceLoader();
+        }
+        
+        /// <summary>
+        /// Does this <see cref="Spring.Core.IO.IResource"/> support relative
+        /// resource retrieval?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This property is generally to be consulted prior to attempting
+        /// to attempting to access a resource that is relative to this
+        /// resource (via a call to
+        /// <see cref="Spring.Core.IO.IResource.CreateRelative"/>).
+        /// </p>
+        /// <p>
+        /// This, the default implementation, always returns
+        /// <see langword="false"/>.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// <see langword="true"/> if this
+        /// <see cref="Spring.Core.IO.IResource"/> supports relative resource
+        /// retrieval.
+        /// </value>
+        protected virtual bool SupportsRelativeResources
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Gets the root location of the resource.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Where root resource can be taken to mean that part of the resource
+        /// descriptor that doesn't change when a relative resource is looked
+        /// up. Examples of such a root location would include a drive letter,
+        /// a web server name, an assembly name, etc.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The root location of the resource.
+        /// </value>
+        /// <exception cref="System.NotSupportedException">
+        /// This, the default implementation, <b>always</b> throws a
+        /// <see cref="System.NotSupportedException"/>.
+        /// </exception>
+        protected virtual string RootLocation
+        {
+            get { throw new NotSupportedException(); }
+        }
+
+        /// <summary>
+        /// Gets the current path of the resource.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// An example value of this property would be the name of the
+        /// directory containing a filesystem based resource.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The current path of the resource.
+        /// </value>
+        /// <exception cref="System.NotSupportedException">
+        /// This, the default implementation, <b>always</b> throws a
+        /// <see cref="System.NotSupportedException"/>.
+        /// </exception>
+        protected virtual string ResourcePath
+        {
+            get { throw new NotSupportedException(); }
+        }
+
+        /// <summary>
+        /// Gets those characters that are valid path separators for the
+        /// resource type.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// An example value of this property would be the
+        /// <see cref="System.IO.Path.DirectorySeparatorChar"/> and
+        /// <see cref="System.IO.Path.AltDirectorySeparatorChar"/> values for a
+        /// filesystem based resource.
+        /// </p>
+        /// <p>
+        /// Any derived classes that override this method are expected to
+        /// return a new array for each access of this property.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// Those characters that are valid path separators for the resource
+        /// type.
+        /// </value>
+        /// <exception cref="System.NotSupportedException">
+        /// This, the default implementation, <b>always</b> throws a
+        /// <see cref="System.NotSupportedException"/>.
+        /// </exception>
+        protected virtual char[] PathSeparatorChars
+        {
+            get { throw new NotSupportedException(); }
+        }
+
+        /// <summary>
+        /// Does the supplied <paramref name="resourceName"/> relative ?
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the resource to test.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if resource name is relative; 
+        /// otherwise <see langword="false"/>.
+        /// </returns>
+        protected virtual bool IsRelativeResource(string resourceName)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Creates a new resource that is relative to this resource based on the
+        /// supplied <paramref name="resourceName"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method can accept either a fully qualified resource name or a
+        /// relative resource name as it's parameter.
+        /// </p>
+        /// <p>
+        /// A fully qualified resource is one that has a protocol prefix and
+        /// all elements of the resource name. All other resources are treated
+        /// as relative to this resource, and the following rules are used to
+        /// locate a relative resource:
+        /// </p>
+        /// <list type="bullet">
+        ///     <item>
+        ///     If the <paramref name="resourceName"/> starts with <c>'..'</c>,
+        ///     the current resource path is navigated backwards before the
+        ///     <paramref name="resourceName"/> is concatenated to the current
+        ///     <see cref="Spring.Core.IO.AbstractResource.ResourcePath"/> of
+        ///     this resource.
+        ///     </item>
+        ///     <item>
+        ///     If the <paramref name="resourceName"/> starts with '/', the
+        ///     current resource path is ignored and a new resource name is
+        ///     appended to the
+        ///     <see cref="Spring.Core.IO.AbstractResource.RootLocation"/> of
+        ///     this resource.
+        ///     </item>
+        ///     <item>
+        ///     If the <paramref name="resourceName"/> starts with '.' or a
+        ///     letter, a new path is appended to the current 
+        ///     <see cref="Spring.Core.IO.AbstractResource.ResourcePath"/> of
+        ///     this resource.
+        ///     </item>
+        /// </list>
+        /// </remarks>
+        /// <param name="resourceName">
+        /// The name of the resource to create.
+        /// </param>
+        /// <returns>The relative resource.</returns>
+        /// <exception cref="System.UriFormatException">
+        /// If the process of resolving the relative resource yielded an
+        /// invalid URI.
+        /// </exception>
+        /// <exception cref="System.NotSupportedException">
+        /// If this resource does not support the resolution of relative
+        /// resources (as determined by the value of the
+        /// <see cref="Spring.Core.IO.AbstractResource.SupportsRelativeResources"/>
+        /// property).
+        /// </exception>
+        /// <seealso cref="Spring.Core.IO.AbstractResource.ResourcePath"/>
+        public virtual IResource CreateRelative(string resourceName)
+        {
+            AssertUtils.ArgumentNotNull(resourceName, "relativePath");
+
+            // try to create fully qualified resource...
+            IResourceLoader loader = GetResourceLoader();
+            
+            if (ConfigurableResourceLoader.HasProtocol(resourceName))
+            {
+                IResource resource = loader.GetResource(resourceName);
+                if (resource != null)
+                {
+                    return resource;
+                }
+            }
+            if (!SupportsRelativeResources)
+            {
+                throw new NotSupportedException(GetType().Name +
+                                                " does not support relative resources. Please use fully qualified resource name.");
+            }
+
+            StringBuilder fullResourceName = new StringBuilder(256);
+            if (Protocol != null && Protocol != String.Empty)
+            {
+                fullResourceName.Append(Protocol).Append(ConfigurableResourceLoader.ProtocolSeparator);
+            }
+            
+            if (!IsRelativeResource(resourceName))
+            {
+                fullResourceName.Append(resourceName);
+            }
+            else
+            {
+                string targetResource;
+                string resourcePath;
+                int n = resourceName.LastIndexOfAny(new char[] { '/', '\\' });
+                if (n >= 0)
+                {
+                    targetResource = resourceName.Substring(n + 1);
+                    resourcePath = CalculateResourcePath(resourceName.Substring(0, n + 1));
+                }
+                else // only resource name is specified, so current path should be used
+                {
+                    targetResource = resourceName;
+                    resourcePath = ResourcePath;
+                }
+
+                fullResourceName.Append(RootLocation.TrimEnd('\\','/'));
+                if (resourcePath != null && resourcePath != String.Empty)
+                {
+                    fullResourceName.Append('/').Append(resourcePath);
+                }
+                fullResourceName.Append('/').Append(targetResource);
+            }
+
+            string resultResourceName = fullResourceName.ToString();
+            
+            if (!ConfigurableResourceLoader.HasProtocol( resultResourceName ))
+            {
+                // give derived resource classes a chance to create an instance on their own
+                IResource resultResource = CreateResourceInstance( resultResourceName );
+                if (resultResource != null) return resultResource;
+            }
+            
+            // create resource instance using default loader
+            return loader.GetResource(resultResourceName);
+        }
+
+        /// <summary>
+        /// Calculates a new resource path based on the supplied
+        /// <paramref name="relativePath"/>.
+        /// </summary>
+        /// <param name="relativePath">
+        /// The relative path to evaluate.
+        /// </param>
+        /// <returns>The newly calculated resource path.</returns>
+        private string CalculateResourcePath(string relativePath )
+        {
+            StringBuilder path = new StringBuilder(256);
+            if (relativePath.StartsWith("..")) // back level navigation
+            {
+                string[] pathElements = ResourcePath.Split(PathSeparatorChars);
+                int upWalks = UpWalks(relativePath);
+                if (upWalks > pathElements.Length)
+                {
+                    throw new UriFormatException("Too many back levels.");
+                }
+                char separator = PathSeparatorChars[0];
+                for (int i = 0; i < pathElements.Length - upWalks; i++)
+                {
+                    path.Append(pathElements[i]).Append(separator);
+                }
+                string[] relativeParts = relativePath.Split('/', '\\');
+                for (int i = upWalks; i < relativeParts.Length - 1; i++)
+                {
+                    path.Append(relativeParts[i]).Append(separator);
+                }
+                if (path.Length > 0)
+                {
+                    path.Length -= 1;
+                }
+                return path.ToString();
+            }
+            else if (relativePath.StartsWith("/")) // relative to root 
+            {
+                if (relativePath.Length > 1)
+                {
+                    return relativePath.Substring(1, relativePath.Length - 2);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            else // relative to current namespace...
+            {
+                if (ResourcePath != null && ResourcePath != String.Empty)
+                {
+                    path.Append(ResourcePath.TrimEnd(PathSeparatorChars)).Append(PathSeparatorChars[0]);
+                }
+                if (relativePath.StartsWith("./"))
+                {
+                    if (relativePath.Length > 2)
+                    {
+                        path.Append(relativePath.Substring(2, relativePath.Length - 3));
+                    }
+                }
+                else
+                {
+                    path.Append(relativePath.Substring(0, relativePath.Length - 1));
+                }
+
+                return path.ToString();
+            }
+        }
+
+        private int UpWalks(string path)
+        {
+            string[] parts = path.Split('/', '\\');
+            int count = 0;
+            for (; count < parts.Length && parts[count].Equals(".."); count++)
+            {
+                ;
+            }
+            return count;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs b/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs
new file mode 100644
index 00000000..d10283be
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs
@@ -0,0 +1,272 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+using Common.Logging;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+    /// <summary>
+    /// An <see cref="Spring.Core.IO.IResource"/> implementation for
+    /// resources stored within assemblies.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This implementation expects any resource name passed to the
+    /// constructor to adhere to the following format:
+    /// </p>
+    /// <p>
+    /// assembly://<i>assemblyName</i>/<i>namespace</i>/<i>resourceName</i>
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <author>Federico Spinazzi (.NET)</author>
+    /// <version>$Id: AssemblyResource.cs,v 1.16 2007/08/08 17:46:55 bbaia Exp $</version>
+    public class AssemblyResource : AbstractResource
+    {
+        #region Fields
+
+        private Assembly _assembly;
+        private string[] _resources;
+        private string _resourceName;
+        private string _fullResourceName;
+        private string _resourceNamespace;
+        private string _resourceAssemblyName;
+        private static readonly ILog log = LogManager.GetLogger(typeof(AssemblyResource));
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.IO.AssemblyResource"/> class.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the assembly resource.
+		/// </param>
+		/// <exception cref="System.UriFormatException">
+		/// If the supplied <paramref name="resourceName"/> did not conform
+		/// to the expected format.
+		/// </exception>
+		/// <exception cref="System.IO.FileLoadException">
+		/// If the assembly specified in the supplied
+		/// <paramref name="resourceName"/> was loaded twice with two
+		/// different evidences.
+		/// </exception>
+		/// <exception cref="System.IO.FileNotFoundException">
+		/// If the assembly specified in the supplied
+		/// <paramref name="resourceName"/> could not be found.
+		/// </exception>
+		/// <exception cref="System.Security.SecurityException">
+		/// If the caller does not have the required permission to load
+		/// the assembly specified in the supplied
+		/// <paramref name="resourceName"/>.
+		/// </exception>
+        /// <see cref="System.Reflection.Assembly.LoadWithPartialName(string)"/>
+        public AssemblyResource(string resourceName) : base(resourceName)
+        {
+        	string[] info = GetResourceNameWithoutProtocol(resourceName).Split('/');
+        	if (info.Length != 3)
+        	{
+        		throw new UriFormatException(
+        			"Invalid resource name. Name has to be in " +
+        				"'assembly:<assemblyName>/<namespace>/<resourceName>' format.");
+        	}
+#if NET_2_0
+            this._assembly = Assembly.Load(info[0]);
+#else
+	        this._assembly = Assembly.LoadWithPartialName(info[0]);
+#endif
+            if (this._assembly == null)
+        	{
+        		throw new FileNotFoundException("Unable to load assembly [" + info[0] + "]");
+        	}
+        	this._fullResourceName = resourceName;
+        	this._resourceAssemblyName = info[0];
+        	this._resourceNamespace = info[1];
+        	this._resourceName = String.Format("{0}.{1}", info[1], info[2]);
+        }
+
+    	#endregion
+
+    	#region Properties
+
+		/// <summary>
+		/// Return an <see cref="System.IO.Stream"/> for this resource.
+		/// </summary>
+		/// <value>
+		/// An <see cref="System.IO.Stream"/>.
+		/// </value>
+		/// <exception cref="System.IO.IOException">
+		/// If the stream could not be opened.
+		/// </exception>
+		/// <exception cref="System.Security.SecurityException">
+		/// If the caller does not have the required permission to load
+		/// the underlying assembly's manifest.
+		/// </exception>
+		/// <seealso cref="Spring.Core.IO.IInputStreamSource"/>
+		/// <see cref="System.Reflection.Assembly.GetManifestResourceStream(string)"/> 
+    	public override Stream InputStream
+    	{
+    		get
+    		{
+    			Stream stream = _assembly.GetManifestResourceStream(_resourceName);
+    			if (stream == null)
+    			{
+    				log.Error("Could not load resource with name = [" + _resourceName +
+    					"] from assembly + " + _assembly);
+    				log.Error("URI specified = [" + this._fullResourceName + "] Spring.NET URI syntax is 'assembly://assemblyName/namespace/resourceName'.");
+    				log.Error("Resource name often has the default namespace prefixed, e.g. 'assembly://MyAssembly/MyNamespace/MyNamespace.MyResource.txt'.");
+    			}
+    			return stream;
+    		}
+    	}
+
+		/// <summary>
+		/// Does the embedded resource specified in the value passed to the
+		/// constructor exist?
+		/// </summary>
+		/// <value>
+		/// <see langword="true"/> if this resource actually exists in physical
+		/// form (for example on a filesystem).
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.IResource.Exists"/>
+		/// <seealso cref="Spring.Core.IO.IResource.File"/>
+		/// <see cref="System.Reflection.Assembly.GetManifestResourceNames()"/> 
+    	public override bool Exists
+    	{
+    		get
+    		{
+    			if (_resources == null)
+    			{
+    				_resources = _assembly.GetManifestResourceNames();
+    				Array.Sort(_resources);
+    			}
+    			return (Array.BinarySearch(_resources, _resourceName) >= 0);
+    		}
+    	}
+
+		/// <summary>
+		/// Does this <see cref="Spring.Core.IO.IResource"/> support relative
+		/// resource retrieval?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This implementation does support relative resource retrieval, and
+		/// so will always return <see langword="true"/>.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// <see langword="true"/> if this
+		/// <see cref="Spring.Core.IO.IResource"/> supports relative resource
+		/// retrieval.
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.AbstractResource.SupportsRelativeResources"/>
+    	protected override bool SupportsRelativeResources
+    	{
+    		get { return true; }
+    	}
+
+		/// <summary>
+		/// Gets the root location of the resource (the assembly name in this
+		/// case).
+		/// </summary>
+		/// <value>
+		/// The root location of the resource.
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.AbstractResource.RootLocation"/>
+    	protected override string RootLocation
+    	{
+    		get { return _resourceAssemblyName; }
+    	}
+
+		/// <summary>
+		/// Gets the current path of the resource (the namespace in which the
+		/// target resource was embedded in this case).
+		/// </summary>
+		/// <value>
+		/// The current path of the resource.
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.AbstractResource.ResourcePath"/>
+    	protected override string ResourcePath
+    	{
+    		get { return _resourceNamespace; }
+    	}
+
+		/// <summary>
+		/// Gets those characters that are valid path separators for the
+		/// resource type.
+		/// </summary>
+		/// <value>
+		/// Those characters that are valid path separators for the resource
+		/// type.
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.AbstractResource.PathSeparatorChars"/>
+    	protected override char[] PathSeparatorChars
+    	{
+    		get { return new char[] {'.'}; }
+    	}
+
+		/// <summary>
+		/// Returns a description for this resource.
+		/// </summary>
+		/// <value>
+		/// A description for this resource.
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.IResource.Description"/>
+    	public override string Description
+    	{
+    		get
+    		{
+    			return string.Format(
+    				CultureInfo.InvariantCulture,
+    				"assembly [{0}], resource [{1}]", _assembly.FullName, _resourceName);
+    		}
+    	}
+
+    	#endregion
+
+        /// <summary>
+        /// Does the supplied <paramref name="resourceName"/> relative ?
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the resource to test.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if resource name is relative; 
+        /// otherwise <see langword="false"/>.
+        /// </returns>
+        protected override bool IsRelativeResource(string resourceName)
+        {
+            return (resourceName.StartsWith("./") ||
+                resourceName.StartsWith("/") ||
+                resourceName.StartsWith("../") ||
+                resourceName.Split('/').Length != 3);                
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/IO/ConfigSectionResource.cs b/src/Spring/Spring.Core/Core/IO/ConfigSectionResource.cs
new file mode 100644
index 00000000..4fd3bd7f
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IO/ConfigSectionResource.cs
@@ -0,0 +1,204 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Text;
+using System.Xml;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+    /// <summary>
+    /// Used when retrieving information from the standard .NET configuration
+    /// files (App.config / Web.config).
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// If created with the name of a configuration section, then all methods
+    /// aside from the description return <see langword="null"/>,
+    /// <see langword="false"/>, or throw an exception. If created with an
+    /// <see cref="System.Xml.XmlElement"/>, then the
+    /// <see cref="Spring.Core.IO.ConfigSectionResource.InputStream"/> property
+    /// will return a corresponding <see cref="System.IO.Stream"/> to parse.
+    /// </p>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ConfigSectionResource.cs,v 1.27 2007/12/05 00:57:31 bbaia Exp $</version>
+    public class ConfigSectionResource : AbstractResource
+    {
+        private XmlElement configElement;
+        private string sectionName;
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates new instance of the
+        /// <see cref="Spring.Core.IO.ConfigSectionResource"/> class.
+        /// </summary>
+        /// <param name="configSection">
+        /// The actual XML configuration section.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="configSection"/> is <see langword="null"/>.
+        /// </exception>
+        public ConfigSectionResource(XmlElement configSection)
+        {
+            AssertUtils.ArgumentNotNull(configSection, "configSection");
+            sectionName = configSection.Name;
+            configElement = configSection;
+        }
+
+        /// <summary>
+        /// Creates new instance of the
+        /// <see cref="Spring.Core.IO.ConfigSectionResource"/> class.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the configuration section.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="resourceName"/> is
+        /// <see langword="null"/> or contains only whitespace character(s).
+        /// </exception>
+        public ConfigSectionResource(string resourceName) : base(resourceName)
+        {
+            AssertUtils.ArgumentHasText(resourceName, "resourceName");
+            sectionName = GetResourceNameWithoutProtocol(resourceName);
+            configElement = (XmlElement) ConfigurationUtils.GetSection(sectionName);
+        }
+
+        #endregion
+
+        #region IResource Members
+
+        /// <summary>
+        /// Returns the <see cref="System.Uri"/> handle for this resource.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation always returns <see langword="null"/>.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// <see langword="null"/>.
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.IResource.Uri"/>
+        public override Uri Uri
+        {
+            get { return null; }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="System.IO.FileInfo"/> handle for this resource.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation always returns <see langword="null"/>.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// <see langword="null"/>.
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.IResource.File"/>
+        public override FileInfo File
+        {
+            get { return null; }
+        }
+
+        /// <summary>
+        /// Returns a description for this resource (the name of the
+        /// configuration section in this case).
+        /// </summary>
+        /// <value>
+        /// A description for this resource.
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.IResource.Description"/>
+        public override string Description
+        {
+            get
+            {
+                return StringUtils.Surround("config [", sectionName, "]");
+            }
+        }
+
+        /// <summary>
+        /// Does this resource actually exist in physical form?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation always returns <see langword="false"/>.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// <see langword="false"/>
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.IResource.Exists"/>
+        /// <seealso cref="Spring.Core.IO.IResource.File"/>
+        public override bool Exists
+        {
+            get { return false; }
+        }
+
+        #endregion
+
+        #region IInputStreamSource Members
+
+        /// <summary>
+        /// Return an <see cref="System.IO.Stream"/> for this resource.
+        /// </summary>
+        /// <value>
+        /// An <see cref="System.IO.Stream"/>.
+        /// </value>
+        /// <exception cref="System.IO.IOException">
+        /// If the stream could not be opened.
+        /// </exception>
+        /// <seealso cref="Spring.Core.IO.IInputStreamSource"/>
+        public override Stream InputStream
+        {
+            get { return new MemoryStream(Encoding.UTF8.GetBytes(configElement.OuterXml)); }
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Exposes the actual <see cref="System.Xml.XmlElement"/> for the
+        /// configuration section.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Introduced to accomodate line info tracking during parsing.
+        /// </p>
+        /// </remarks>
+        internal XmlElement ConfigElement
+        {
+            get { return configElement; }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/IO/ConfigurableResourceLoader.cs b/src/Spring/Spring.Core/Core/IO/ConfigurableResourceLoader.cs
new file mode 100644
index 00000000..b577fe1e
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IO/ConfigurableResourceLoader.cs
@@ -0,0 +1,197 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Util;
+using Spring.Reflection.Dynamic;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+    /// <summary>
+    /// Configurable implementation of the
+    /// <see cref="Spring.Core.IO.IResourceLoader"/> interface.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This <see cref="Spring.Core.IO.IResourceLoader"/> implementation
+    /// supports the configuration of resource access protocols and the
+    /// corresponding .NET types that know how to handle those protocols.
+    /// </p>
+    /// <p>
+    /// Basic protocol-to-resource type mappings are also defined by this class,
+    /// while others can be added either internally, by application contexts
+    /// extending this class, or externally, by the end user configuring the
+    /// context.
+    /// </p>
+    /// <p>
+    /// Only one resource type can be defined for each protocol, but multiple
+    /// protocols can map to the same resource type (for example, the
+    /// <c>"http"</c> and <c>"ftp"</c> protocols both map to the
+    /// <see cref="Spring.Core.IO.UrlResource"/> type. The protocols that are
+    /// mapped by default can be found in the following list.
+    /// </p>
+    /// <p>
+    /// <list type="bullet">
+    /// <item>
+    /// <description>assembly</description>
+    /// </item>
+    /// <item>
+    /// <description>config</description>
+    /// </item>
+    /// <item>
+    /// <description>file</description>
+    /// </item>
+    /// <item>
+    /// <description>http</description>
+    /// </item>
+    /// <item>
+    /// <description>https</description>
+    /// </item>
+    /// </list>
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ConfigurableResourceLoader.cs,v 1.25 2007/08/08 17:46:55 bbaia Exp $</version>
+    /// <seealso cref="Spring.Core.IO.IResource"/>
+    /// <seealso cref="Spring.Core.IO.ResourceConverter"/>
+    /// <seealso cref="Spring.Context.IApplicationContext"/>
+    public class ConfigurableResourceLoader : IResourceLoader
+    {
+        /// <summary>
+        /// The separator between the protocol name and the resource name.
+        /// </summary>
+        public const string ProtocolSeparator = "://";
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.IO.ConfigurableResourceLoader"/> class.
+        /// </summary>
+        public ConfigurableResourceLoader()
+        { }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.IO.ConfigurableResourceLoader"/> class using the specified default protocol for unqualified resources.
+        /// </summary>
+        public ConfigurableResourceLoader(string defaultProtocol)
+        {
+            AssertUtils.ArgumentNotNull(defaultProtocol, "defaultProtocol");
+            this.defaultProtocol = defaultProtocol;
+        }
+
+        /// <summary>
+        /// The default protocol to use for unqualified resources.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The initial value is <c>"file"</c>.
+        /// </p>
+        /// </remarks>
+        public string DefaultResourceProtocol
+        {
+            get { return defaultProtocol; }
+            set { defaultProtocol = value; }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="Spring.Core.IO.IResource"/> that has been
+        /// mapped to the protocol of the supplied <paramref name="resourceName"/>.
+        /// </summary>
+        /// <param name="resourceName">The name of the resource.</param>
+        /// <returns>
+        /// A new <see cref="Spring.Core.IO.IResource"/> instance for the
+        /// supplied <paramref name="resourceName"/>.
+        /// </returns>
+        /// <exception cref="System.UriFormatException">
+        /// If a <see cref="Spring.Core.IO.IResource"/> <see cref="System.Type"/>
+        /// mapping does not exist for the supplied <paramref name="resourceName"/>.
+        /// </exception>
+        /// <exception cref="System.Exception">
+        /// In the case of any errors arising from the instantiation of the
+        /// returned <see cref="Spring.Core.IO.IResource"/> instance.
+        /// </exception>
+        /// <seealso cref="ResourceHandlerRegistry.RegisterResourceHandler(string, Type)"/>
+        public IResource GetResource(string resourceName)
+        {
+            string protocol = GetProtocol(resourceName);
+            if (protocol == null)
+            {
+                protocol = DefaultResourceProtocol;
+                resourceName = protocol + ProtocolSeparator + resourceName;
+            }
+
+            IDynamicConstructor handler = ResourceHandlerRegistry.GetResourceHandler(protocol);
+            if (handler == null)
+            {
+                throw new UriFormatException("Resource handler for the '" + protocol + "' protocol is not defined.");
+            }
+
+            return (IResource) handler.Invoke(new object[] { resourceName });
+        }
+
+        /// <summary>
+        /// Checks that the supplied <paramref name="resourceName"/> starts
+        /// with one of the protocol names currently mapped by this
+        /// <see cref="ConfigurableResourceLoader"/> instance.
+        /// </summary>
+        /// <param name="resourceName">The name of the resource.</param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied
+        /// <paramref name="resourceName"/> starts with one of the known
+        /// protocols; <see langword="false"/> if not, or if the supplied
+        /// <paramref name="resourceName"/> is itself <see langword="null"/>.
+        /// </returns>
+        public static bool HasProtocol(string resourceName)
+        {
+            string protocol = GetProtocol(resourceName);
+            return protocol != null && ResourceHandlerRegistry.IsHandlerRegistered(protocol);
+        }
+
+        /// <summary>
+        /// Extracts the protocol name from the supplied
+        /// <paramref name="resourceName"/>.
+        /// </summary>
+        /// <param name="resourceName">The name of the resource.</param>
+        /// <returns>
+        /// The extracted protocol name or <see langword="null"/> if the
+        /// supplied <paramref name="resourceName"/> is unqualified (or
+        /// is itself <see langword="null"/>).
+        /// </returns>
+        internal static string GetProtocol(string resourceName)
+        {
+            if (resourceName == null)
+            {
+                return null;
+            }
+            int pos = resourceName.IndexOf(ProtocolSeparator);
+            return pos == -1 ? null : resourceName.Substring(0, pos);
+        }
+
+        #region Fields
+
+        private string defaultProtocol = "file";
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/IO/FileSystemResource.cs b/src/Spring/Spring.Core/Core/IO/FileSystemResource.cs
new file mode 100644
index 00000000..4d96f082
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IO/FileSystemResource.cs
@@ -0,0 +1,394 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.IO;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+    /// <summary>
+    /// A <see cref="System.IO.File"/> backed resource.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Supports resolution as both a <see cref="System.IO.FileInfo"/> and a
+    /// <see cref="System.Uri"/>.
+    /// </p>
+    /// <p>
+    /// Also supports the use of the <c>~</c> character. If the <c>~</c> character
+    /// is the first character in a resource path (sans protocol), the <c>~</c>
+    /// character will be replaced with the value of the
+    /// <c>System.AppDomain.CurrentDomain.BaseDirectory</c> property (an example of
+    /// this can be seen in the examples below).
+    /// </p>
+    /// </remarks>
+    /// <example>
+    /// <p>
+    /// Consider the example of an application that is running (has been launched
+    /// from) the <c>C:\App\</c> directory. The following resource paths will map
+    /// to the following resources on the filesystem...
+    /// </p>
+    /// <code escaped="true">
+    ///     strings.txt              C:\App\strings.txt
+    ///     ~/strings.txt            C:\App\strings.txt
+    ///     file://~/strings.txt     C:\App\strings.txt
+    ///     file://~/../strings.txt  C:\strings.txt
+    ///     ../strings.txt           C:\strings.txt
+    ///     ~/../strings.txt         C:\strings.txt
+    ///     
+    ///     // note that only a leading ~ character is resolved to the executing directory...
+    ///     stri~ngs.txt              C:\App\stri~ngs.txt
+    /// </code>
+    /// </example>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Leonardo Susatyo (.NET)</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: FileSystemResource.cs,v 1.23 2007/08/08 17:46:55 bbaia Exp $</version>
+    public class FileSystemResource : AbstractResource
+    {
+        private FileInfo fileHandle;
+        private string rootLocation;
+        private string resourcePath;
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.IO.FileSystemResource"/> class.
+        /// </summary>
+        protected FileSystemResource()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="Spring.Core.IO.FileSystemResource"/> class.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the file system resource.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="resourceName"/> is
+        /// <see langword="null"/> or contains only whitespace character(s).
+        /// </exception>
+        public FileSystemResource(string resourceName)
+            : this(resourceName, false)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="Spring.Core.IO.FileSystemResource"/> class.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the file system resource.
+        /// </param>
+        /// <param name="suppressInitialize">
+        /// Supresses initialization of this instance. Used from derived classes.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="resourceName"/> is
+        /// <see langword="null"/> or contains only whitespace character(s).
+        /// </exception>
+        protected FileSystemResource(string resourceName, bool suppressInitialize)
+            : base(resourceName)
+        {
+            if (!suppressInitialize)
+            {
+                Initialize( resourceName );
+            }
+        }
+        
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Returns the underlying <see cref="System.IO.FileInfo"/> handle for
+        /// this resource.
+        /// </summary>
+        /// <value>
+        /// The <see cref="System.IO.FileInfo"/> handle for this resource.
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.IResource.File"/>
+        public override FileInfo File
+        {
+            get { return fileHandle; }
+        }
+
+        /// <summary>
+        /// Does this <see cref="Spring.Core.IO.IResource"/> support relative
+        /// resource retrieval?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation does support relative resource retrieval, and
+        /// so will always return <see langword="true"/>.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// <see langword="true"/> if this
+        /// <see cref="Spring.Core.IO.IResource"/> supports relative resource
+        /// retrieval.
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.AbstractResource.SupportsRelativeResources"/>
+        protected override bool SupportsRelativeResources
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// Gets the root location of the resource (a drive or UNC file share
+        /// name in this case).
+        /// </summary>
+        /// <value>
+        /// The root location of the resource.
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.AbstractResource.RootLocation"/>
+        protected override string RootLocation
+        {
+            get { return this.rootLocation; }
+        }
+
+        /// <summary>
+        /// Gets the current path of the resource.
+        /// </summary>
+        /// <value>
+        /// The current path of the resource.
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.AbstractResource.ResourcePath"/>
+        protected override string ResourcePath
+        {
+            get { return this.resourcePath; }
+        }
+
+        /// <summary>
+        /// Gets those characters that are valid path separators for the
+        /// resource type.
+        /// </summary>
+        /// <value>
+        /// Those characters that are valid path separators for the resource
+        /// type.
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.AbstractResource.PathSeparatorChars"/>
+        /// <seealso cref="System.IO.Path"/>
+        protected override char[] PathSeparatorChars
+        {
+            get { return new char[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }; }
+        }
+
+        /// <summary>
+        /// Return an <see cref="System.IO.Stream"/> for this resource.
+        /// </summary>
+        /// <value>
+        /// An <see cref="System.IO.Stream"/>.
+        /// </value>
+        /// <exception cref="System.IO.IOException">
+        /// If the stream could not be opened.
+        /// </exception>
+        /// <exception cref="System.IO.FileNotFoundException">
+        /// If the underlying file could not be found.
+        /// </exception>
+        /// <seealso cref="Spring.Core.IO.IInputStreamSource"/>
+        public override Stream InputStream
+        {
+            get
+            {
+                if (Uri.IsFile)
+                {
+                    try
+                    {
+                        return new FileStream(Uri.LocalPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+                    }
+                    catch(DirectoryNotFoundException)
+                    {
+                        // ignore difference between File & Directory exception in this case
+                    }
+                }
+                throw new FileNotFoundException(Description
+                                                + " cannot be resolved to local file path"
+                                                + " - resource does not use 'file:' protocol.");
+            }
+        }
+
+        /// <summary>
+        /// Returns a description for this resource.
+        /// </summary>
+        /// <value>
+        /// A description for this resource.
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.IResource.Description"/>
+        public override string Description
+        {
+            get
+            {
+                return string.Format(
+                    CultureInfo.InvariantCulture,
+                    "file [{0}]", fileHandle.FullName);
+            }
+        }
+
+        /// <summary>
+        /// Returns the <see cref="System.Uri"/> handle for this resource.
+        /// </summary>
+        /// <value>
+        /// The <see cref="System.Uri"/> handle for this resource.
+        /// </value>
+        /// <exception cref="System.IO.IOException">
+        /// If the resource is not available or cannot be exposed as a
+        /// <see cref="System.Uri"/>.
+        /// </exception>
+        /// <seealso cref="Spring.Core.IO.IResource.Uri"/>
+        public override Uri Uri
+        {
+            get { return new UriBuilder("file", null, 0, fileHandle.FullName).Uri; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Initializes this instance.
+        /// </summary>
+        /// <param name="resourceName"></param>
+        protected void Initialize( string resourceName )
+        {
+            this.fileHandle = ResolveFileHandle(resourceName);
+            this.rootLocation = ResolveRootLocation(resourceName);
+            this.resourcePath = ResolveResourcePath(resourceName);            
+        }
+        
+        /// <summary>
+        /// Resolves the <see cref="System.IO.FileInfo"/> handle 
+        /// for the supplied <paramref name="resourceName"/>.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the file system resource.
+        /// </param>
+        /// <returns>
+        /// The <see cref="System.IO.FileInfo"/> handle for this resource.
+        /// </returns>
+        protected virtual FileInfo ResolveFileHandle(string resourceName)
+        {
+            return new FileInfo(ResolveResourceNameWithoutProtocol(resourceName));
+        }
+
+        /// <summary>
+        /// Resolves the root location for the supplied <paramref name="resourceName"/>.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the file system resource.
+        /// </param>
+        /// <returns>
+        /// The root location of the resource.
+        /// </returns>
+        protected virtual string ResolveRootLocation(string resourceName)
+        {
+            string root = this.fileHandle.Directory.Root.ToString();
+            if (root.Length > 0 &&
+                (root.EndsWith(Path.DirectorySeparatorChar.ToString()) ||
+                 root.EndsWith(Path.AltDirectorySeparatorChar.ToString())))
+            {
+                root = root.Substring(0, root.Length - 1);
+            }
+
+            return root;
+        }
+
+        /// <summary>
+        /// Resolves the path for the supplied <paramref name="resourceName"/>.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the file system resource.
+        /// </param>
+        /// <returns>
+        /// The current path of the resource.
+        /// </returns>
+        protected virtual string ResolveResourcePath(string resourceName)
+        {
+            string path = this.fileHandle.DirectoryName;
+            if (path.Equals(this.fileHandle.Directory.Root.ToString()))
+            {
+                path = null;
+            }
+            else
+            {
+                path = path.Substring(this.rootLocation.Length + 1);
+            }
+
+            return path;
+        }
+
+        /// <summary>
+        /// Resolves the presence of the
+        /// <paramref name="basePathPlaceHolder"/> value
+        /// in the supplied <paramref name="resourceName"/> into a path.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the resource.
+        /// </param>
+        /// <param name="basePathPlaceHolder">
+        /// The string that is a placeholder for a base path.
+        /// </param>
+        /// <returns>
+        /// The name of the resource with any <paramref name="basePathPlaceHolder"/>
+        /// value having been resolved into an actual path.
+        /// </returns>
+        protected override string ResolveBasePathPlaceHolder(
+            string resourceName, string basePathPlaceHolder)
+        {
+            // Remove extra slashes used to indicate that resource is local (handle the case "/C:/path1/...")
+            if (resourceName[0] == '/' && resourceName[2] == ':')
+            {
+                resourceName = resourceName.Substring(1);
+            }
+            
+            if (StringUtils.HasText(resourceName)
+                && resourceName.TrimStart().StartsWith(basePathPlaceHolder))
+            {
+                return resourceName.Replace(basePathPlaceHolder, AppDomain.CurrentDomain.BaseDirectory).TrimStart();
+            }
+            return resourceName;
+        }
+
+        /// <summary>
+        /// Does the supplied <paramref name="resourceName"/> relative ?
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the resource to test.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if resource name is relative; 
+        /// otherwise <see langword="false"/>.
+        /// </returns>
+        protected override bool IsRelativeResource(string resourceName)
+        {
+            return (!
+                (resourceName.StartsWith(@"\\") ||              // UNC file share
+                resourceName.IndexOf(':') >= 0 ||               // drive
+                resourceName.StartsWith(BasePathPlaceHolder)));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/IO/IInputStreamSource.cs b/src/Spring/Spring.Core/Core/IO/IInputStreamSource.cs
new file mode 100644
index 00000000..64a9e5be
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IO/IInputStreamSource.cs
@@ -0,0 +1,68 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+	/// <summary>
+    /// Simple interface for objects that are sources for
+    /// <see cref="System.IO.Stream"/>s.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+    /// This is the base interface for the abstraction encapsulated by
+    /// Spring.NET's <see cref="Spring.Core.IO.IResource"/> interface.
+	/// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: IInputStreamSource.cs,v 1.10 2007/08/08 17:46:55 bbaia Exp $</version>
+    /// <seealso cref="Spring.Core.IO.IResource"/>
+	public interface IInputStreamSource 
+    {
+        /// <summary>
+        /// Return an <see cref="System.IO.Stream"/> for this resource.
+        /// </summary>
+        /// <remarks>
+        /// <note type="caution">
+        /// Clients of this interface must be aware that every access of this
+        /// property will create a <i>fresh</i> <see cref="System.IO.Stream"/>;
+        /// it is the responsibility of the calling code to close any such
+        /// <see cref="System.IO.Stream"/>.
+        /// </note>
+        /// </remarks>
+        /// <value>
+        /// An <see cref="System.IO.Stream"/>.
+        /// </value>
+        /// <exception cref="System.IO.IOException">
+        /// If the stream could not be opened.
+        /// </exception>
+        Stream InputStream
+        {
+            get;
+        }
+	}
+}
diff --git a/src/Spring/Spring.Core/Core/IO/IResource.cs b/src/Spring/Spring.Core/Core/IO/IResource.cs
new file mode 100644
index 00000000..6c459191
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IO/IResource.cs
@@ -0,0 +1,195 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.IO;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+	/// <summary>
+    /// The central abstraction for Spring.NET's access to resources such as
+    /// <see cref="System.IO.Stream"/>s.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This interface encapsulates a resource descriptor that abstracts away
+	/// from the underlying type of resource; possible resource types include
+	/// files, memory streams, and databases (this list is not exhaustive).
+	/// </p>
+	/// <p>
+	/// A <see cref="System.IO.Stream"/> can definitely be opened and accessed
+	/// for every such resource; if the resource exists in a physical form (for
+	/// example, the resource is not an in-memory stream or one that has been
+	/// extracted from an assembly or ZIP file), a <see cref="System.Uri"/> or
+	/// <see cref="System.IO.FileInfo"/> can also be accessed. The actual
+	/// behavior is implementation-specific.
+	/// </p>
+	/// <p>
+	/// This interface, when used in tandem with the
+	/// <see cref="IResourceLoader"/> interface, forms the backbone of
+	/// Spring.NET's resource handling. Third party extensions or libraries
+	/// that want to integrate external resources with Spring.NET's IoC
+	/// container are encouraged expose such resources via this abstraction.
+	/// </p>
+	/// <p>
+	/// Interfaces cannot obviously mandate implementation, but derived classes
+	/// are <b>strongly</b> encouraged to expose a constructor that takes a
+	/// single <see cref="System.String"/> as it's sole argument (see example).
+	/// Exposing such a constructor will make your custom
+	/// <see cref="Spring.Core.IO.IResource"/> implementation integrate nicely
+	/// with the <see cref="Spring.Core.IO.ConfigurableResourceLoader"/> class.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: IResource.cs,v 1.12 2007/08/08 17:46:55 bbaia Exp $</version>
+	/// <seealso cref="Spring.Core.IO.IResourceLoader"/>
+	/// <seealso cref="Spring.Core.IO.ConfigurableResourceLoader"/>
+    [TypeConverter(typeof(ResourceConverter))]
+	public interface IResource : IInputStreamSource
+	{
+		/// <summary>
+		/// Does this resource represent a handle with an open stream?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If <see langword="true"/>, the <see cref="System.IO.Stream"/>
+		/// cannot be read multiple times, and must be read and then closed to
+		/// avoid resource leaks.
+		/// </p>
+		/// <p>
+		/// Will be <see langword="false"/> for all usual resource descriptors.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// <see langword="true"/> if this resource represents a handle with an
+		/// open stream.
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.IInputStreamSource.InputStream"/>
+		bool IsOpen { get; }
+
+		/// <summary>
+		/// Returns the <see cref="System.Uri"/> handle for this resource.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// For safety, always check the value of the
+		/// <see cref="Spring.Core.IO.IResource.Exists"/> property prior to
+		/// accessing this property; resources that cannot be exposed as 
+		/// a <see cref="System.Uri"/> will typically return
+		/// <see langword="false"/> from a call to the
+		/// <see cref="Spring.Core.IO.IResource.Exists"/> property.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The <see cref="System.Uri"/> handle for this resource.
+		/// </value>
+		/// <exception cref="System.IO.IOException">
+		/// If the resource is not available or cannot be exposed as a
+		/// <see cref="System.Uri"/>.
+		/// </exception>
+		/// <seealso cref="Spring.Core.IO.IResource"/>
+		/// <seealso cref="Spring.Core.IO.IResource.Exists"/>
+		Uri Uri { get; }
+
+		/// <summary>
+		/// Returns a <see cref="System.IO.FileInfo"/> handle for this resource.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// For safety, always check the value of the
+		/// <see cref="Spring.Core.IO.IResource.Exists"/> property prior to
+		/// accessing this property; resources that cannot be exposed as 
+		/// a <see cref="System.IO.FileInfo"/> will typically return
+		/// <see langword="false"/> from a call to the
+		/// <see cref="Spring.Core.IO.IResource.Exists"/> property.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The <see cref="System.IO.FileInfo"/> handle for this resource.
+		/// </value>
+		/// <exception cref="System.IO.IOException">
+		/// If the resource is not available on a filesystem, or cannot be
+		/// exposed as a <see cref="System.IO.FileInfo"/> handle.
+		/// </exception>
+		/// <seealso cref="Spring.Core.IO.IResource"/>
+		/// <seealso cref="Spring.Core.IO.IResource.Exists"/>
+		FileInfo File { get; }
+
+		/// <summary>
+		/// Returns a description for this resource.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The description is typically used for diagnostics and other such
+		/// logging when working with the resource.
+		/// </p>
+		/// <p>
+		/// Implementations are also encouraged to return this value from their
+		/// <see cref="System.Object.ToString()"/> method.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// A description for this resource.
+		/// </value>
+		string Description { get; }
+
+		/// <summary>
+		/// Does this resource actually exist in physical form?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// An example of a resource that physically exists would be a
+		/// file on a local filesystem. An example of a resource that does not
+		/// physically exist would be an in-memory stream.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// <see langword="true"/> if this resource actually exists in physical
+		/// form (for example on a filesystem).
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.IResource.File"/>
+		/// <seealso cref="Spring.Core.IO.IResource.Uri"/>
+		bool Exists { get; }
+
+		/// <summary>
+		/// Creates a resource relative to this resource.
+		/// </summary>
+		/// <param name="relativePath">
+		/// The path (always resolved as relative to this resource).
+		/// </param>
+		/// <returns>
+		/// The relative resource.
+		/// </returns>
+		/// <exception cref="System.IO.IOException">
+		/// If the relative resource could not be created from the supplied
+		/// path.
+		/// </exception>
+		/// <exception cref="System.NotSupportedException">
+		/// If the resource does not support the notion of a relative path.
+		/// </exception>
+		IResource CreateRelative(string relativePath);
+	}
+}
diff --git a/src/Spring/Spring.Core/Core/IO/IResourceLoader.cs b/src/Spring/Spring.Core/Core/IO/IResourceLoader.cs
new file mode 100644
index 00000000..8c7c0140
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IO/IResourceLoader.cs
@@ -0,0 +1,94 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+
+
+#endregion
+
+namespace Spring.Core.IO
+{
+    /// <summary>
+    /// Describes an object that can load
+    /// <see cref="Spring.Core.IO.IResource"/>s.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// An <see cref="Spring.Context.IApplicationContext"/> implementation is
+    /// generally required to support the functionality described by this
+    /// interface.
+    /// </p>
+    /// <p>
+    /// The <see cref="Spring.Core.IO.ConfigurableResourceLoader"/> class is a
+    /// standalone implementation that is usable outside an
+    /// <see cref="Spring.Context.IApplicationContext"/>; the aforementioned
+    /// class is also used by the
+    /// <see cref="Spring.Core.IO.ResourceConverter"/> class.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: IResourceLoader.cs,v 1.12 2007/08/08 17:46:55 bbaia Exp $</version>
+    /// <seealso cref="Spring.Core.IO.IResource"/>
+    /// <seealso cref="Spring.Core.IO.ResourceConverter"/>
+    /// <seealso cref="Spring.Core.IO.ConfigurableResourceLoader"/>
+    public interface IResourceLoader
+    {
+    	/// <summary>
+    	/// Return an <see cref="Spring.Core.IO.IResource"/> handle for the
+    	/// specified resource.
+    	/// </summary>
+    	/// <remarks>
+    	/// <p>
+    	/// The handle should always be a reusable resource descriptor; this
+    	/// allows one to make repeated calls to the underlying
+    	/// <see cref="Spring.Core.IO.IInputStreamSource.InputStream"/>.
+    	/// </p>
+    	/// <p>
+    	/// <ul>
+    	/// <li>
+    	/// <b>Must</b> support fully qualified URLs, e.g. "file:C:/test.dat".
+    	/// </li>
+    	/// <li>
+    	/// Should support relative file paths, e.g. "test.dat" (this will be
+    	/// implementation-specific, typically provided by an
+    	/// <see cref="Spring.Context.IApplicationContext"/> implementation).
+    	/// </li>
+    	/// </ul>
+    	/// </p>
+    	/// <note>
+    	/// An <see cref="Spring.Core.IO.IResource"/> handle does not imply an
+    	/// existing resource; you need to check the value of an
+    	/// <see cref="Spring.Core.IO.IResource"/>'s
+    	/// <see cref="Spring.Core.IO.IResource.Exists"/> property to determine
+    	/// conclusively whether or not the resource actually exists.
+    	/// </note>
+    	/// </remarks>
+    	/// <param name="location">The resource location.</param>
+    	/// <returns>
+    	/// An appropriate <see cref="Spring.Core.IO.IResource"/> handle.
+    	/// </returns>
+    	/// <seealso cref="Spring.Core.IO.IResource"/>
+    	/// <seealso cref="Spring.Core.IO.IResource.Exists"/>
+    	/// <seealso cref="Spring.Context.IApplicationContext"/>
+    	IResource GetResource(string location);
+    }
+}
diff --git a/src/Spring/Spring.Core/Core/IO/InputStreamResource.cs b/src/Spring/Spring.Core/Core/IO/InputStreamResource.cs
new file mode 100644
index 00000000..fc051b95
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IO/InputStreamResource.cs
@@ -0,0 +1,145 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+	/// <summary>
+	/// <see cref="IResource"/> adapter implementation for a
+	/// <see cref="System.IO.Stream"/>.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Should only be used if no other <see cref="Spring.Core.IO.IResource"/>
+	/// implementation is applicable.
+	/// </p>
+	/// <p>
+	/// In contrast to other <see cref="Spring.Core.IO.IResource"/>
+	/// implementations, this is an adapter for an <i>already opened</i>
+	/// resource - the <see cref="Spring.Core.IO.InputStreamResource.IsOpen"/>
+	/// therefore always returns <see langword="true"/>. Do not use this class
+	/// if you need to keep the resource descriptor somewhere, or if you need
+	/// to read a stream multiple times.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: InputStreamResource.cs,v 1.10 2007/12/06 22:08:47 markpollack Exp $</version>
+	public class InputStreamResource : AbstractResource
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Core.IO.InputStreamResource"/> class.
+		/// </summary>
+		/// <param name="inputStream">
+		/// The input <see cref="System.IO.Stream"/> to use.
+		/// </param>
+		/// <param name="description">
+		/// Where the input <see cref="System.IO.Stream"/> comes from.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="inputStream"/> is
+		/// <see langword="null"/>.
+		/// </exception>
+		public InputStreamResource(Stream inputStream, string description)
+		{
+			AssertUtils.ArgumentNotNull(inputStream, "inputStream");
+
+			_inputStream = inputStream;
+			_description = description == null ? string.Empty : description;
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// The input <see cref="System.IO.Stream"/> to use.
+		/// </summary>
+		/// <exception cref="System.InvalidOperationException">
+		/// If the underlying <see cref="System.IO.Stream"/> has already
+		/// been read.
+		/// </exception>
+		public override Stream InputStream
+		{
+			get
+			{
+				if (_inputStream == null)
+				{
+					throw new InvalidOperationException(
+						"InputStream has already been read - " +
+						"do not use InputStreamResource if a stream " +
+						"needs to be read multiple times");
+				}
+				Stream result = _inputStream;
+				_inputStream = null;
+				return result;
+			}
+		}
+
+		/// <summary>
+		/// Returns a description for this resource.
+		/// </summary>
+		/// <value>
+		/// A description for this resource.
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.IResource.Description"/>
+		public override string Description
+		{
+			get { return _description; }
+		}
+
+        /// <summary>
+        /// This implementation always returns true
+        /// </summary>
+		public override bool IsOpen
+		{
+			get { return true; }
+		}
+
+
+
+        /// <summary>
+        /// This implemementation always returns true
+        /// </summary>
+		public override bool Exists
+		{
+			get { return true; }
+		}
+
+		#endregion
+
+		#region Fields
+
+		private Stream _inputStream;
+		private string _description;
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs b/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs
new file mode 100644
index 00000000..45a72155
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs
@@ -0,0 +1,215 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using Common.Logging;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+	/// <summary>
+	/// Custom type converter for <see cref="Spring.Core.IO.IResource"/> instances.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// A resource path may contain placeholder variables of the form <c>${...}</c>
+	/// that will be expended to <b>environment variables</b>.
+	/// </p>
+	/// <p>
+	/// Currently only supports conversion from a <see cref="System.String"/>
+	/// instance.
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <p>
+	/// On Win9x boxes, this resource path, <c>${userprofile}\objects.xml</c> will
+	/// be expanded at runtime with the value of the <c>'userprofile'</c> environment
+	/// variable substituted for the <c>'${userprofile}'</c> portion of the path.
+	/// </p>
+	/// <code escaped="true">
+	/// // assuming a user called Rick, running on a plain vanilla Windows XP setup...
+	/// // this resource path...
+	/// 
+	/// ${userprofile}\objects.xml
+	/// 
+	/// // will become (after expansion)...
+	/// 
+	/// C:\Documents and Settings\Rick\objects.xml
+	/// </code>
+	/// </example>
+	/// <author>Mark Pollack</author>
+	/// <version>$Id: ResourceConverter.cs,v 1.14 2007/08/08 17:46:55 bbaia Exp $</version>
+	/// <seealso cref="Spring.Core.IO.IResourceLoader"/>
+	/// <seealso cref="System.ComponentModel.TypeConverter"/>
+	public class ResourceConverter : TypeConverter
+	{
+		private ILog _log = LogManager.GetLogger(typeof (ResourceConverter));
+		private IResourceLoader _resourceLoader;
+		
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Core.IO.ResourceConverter"/> class.
+		/// </summary>
+		public ResourceConverter()
+		{
+			_resourceLoader = new ConfigurableResourceLoader();
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Core.IO.ResourceConverter"/> class using the specified resourceLoader.
+		/// </summary>
+		/// <param name="resourceLoader">the underlying IResourceLoader to be used to resolve resources</param>
+		public ResourceConverter( IResourceLoader resourceLoader )
+		{
+			AssertUtils.ArgumentNotNull( resourceLoader, "resourceLoader" );
+			_resourceLoader = resourceLoader;			
+		}
+		#endregion
+
+		/// <summary>
+		/// Returns whether this converter can convert an object of one
+		/// <see cref="System.Type"/> to a <see cref="Spring.Core.IO.IResource"/>
+		/// </summary>
+		/// <param name="context">
+		/// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+		/// that provides a format context.
+		/// </param>
+		/// <param name="sourceType">
+		/// A <see cref="System.Type"/> that represents the
+		/// <see cref="System.Type"/> you want to convert from.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if the conversion is possible.
+		/// </returns>
+		public override bool CanConvertFrom(
+			ITypeDescriptorContext context,
+			Type sourceType)
+		{
+			if (sourceType == typeof (string))
+			{
+				return true;
+			}
+			return base.CanConvertFrom(context, sourceType);
+		}
+
+		/// <summary>
+		/// Convert from a string value to a
+		/// <see cref="Spring.Core.IO.IResource"/> instance.
+		/// </summary>
+		/// <param name="context">
+		/// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+		/// that provides a format context.
+		/// </param>
+		/// <param name="culture">
+		/// The <see cref="System.Globalization.CultureInfo"/> to use
+		/// as the current culture. 
+		/// </param>
+		/// <param name="value">
+		/// The value that is to be converted.
+		/// </param>
+		/// <returns>
+		/// An <see cref="Spring.Core.IO.IResource"/> if successful. 
+		/// </returns>
+		/// <exception cref="System.UriFormatException">
+		/// If the resource name objectained form the supplied
+		/// <paramref name="value"/> is malformed.
+		/// </exception>
+		/// <exception cref="System.Exception">
+		/// In the case of any errors arising from the instantiation of the
+		/// returned <see cref="Spring.Core.IO.IResource"/> instance.
+		/// </exception>
+		public override object ConvertFrom(
+			ITypeDescriptorContext context,
+			CultureInfo culture, object value)
+		{
+			string resource = value as string;
+			if (resource != null)
+			{
+				return GetResourceLoader().GetResource(ResolvePath(resource));
+			}
+			return base.ConvertFrom(context, culture, value);
+		}
+
+		/// <summary>
+		/// Resolve the given path, replacing placeholder values with
+		/// corresponding property values if necessary.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This implementation resolves environment variables only.
+		/// </p>
+		/// </remarks>
+		/// <param name="path">The original resource path.</param>
+		/// <returns>The resolved resource path.</returns>
+		protected virtual string ResolvePath(string path)
+		{
+			// quite inefficient, but cost is only ever paid once at startup...
+			IList expressions = StringUtils.GetAntExpressions(path);
+			foreach (string expression in expressions)
+			{
+				string environmentValue
+					= Environment.GetEnvironmentVariable(expression);
+				if (environmentValue != null)
+				{
+					path = StringUtils.SetAntExpression(
+						path, expression, environmentValue);
+				}
+				else
+				{
+					#region Instrumentation
+
+					if (_log.IsWarnEnabled)
+					{
+						_log.Warn(string.Format(
+							CultureInfo.InvariantCulture,
+							"Could not resolve placeholder '{0}' in resource path " +
+								"'{1}' as an environment variable.", expression, path));
+					}
+
+					#endregion
+				}
+			}
+			return path;
+		}
+
+		/// <summary>
+		/// Return the <see cref="Spring.Core.IO.IResourceLoader"/> used to
+		/// resolve the string.
+		/// </summary>
+		/// <returns>
+		/// The <see cref="Spring.Core.IO.IResourceLoader"/> used to resolve
+		/// the string.
+		/// </returns>
+		protected internal virtual IResourceLoader GetResourceLoader()
+		{
+			return _resourceLoader;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/IO/ResourceHandlerRegistry.cs b/src/Spring/Spring.Core/Core/IO/ResourceHandlerRegistry.cs
new file mode 100644
index 00000000..053d6154
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IO/ResourceHandlerRegistry.cs
@@ -0,0 +1,264 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Reflection;
+
+using Spring.Context.Support;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+using Spring.Reflection.Dynamic;
+
+namespace Spring.Core.IO
+{
+    /// <summary>
+    /// Registry class that allows users to register and retrieve protocol handlers.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Resource handler is an implementation of <see cref="IResource"/> interface
+    /// that should be used to process resources with the specified protocol.
+    /// </para>
+    /// <para>
+    /// They are used throughout the framework to access resources from various 
+    /// sources. For example, application context loads object definitions from the resources
+    /// that are processed using one of the registered resource handlers.
+    /// </para>
+    /// <para>Following resource handlers are registered by default:</para>
+    /// <list type="table">
+    ///     <listheader>
+    ///         <term>Protocol</term>
+    ///         <term>Handler Type</term>
+    ///         <term>Description</term>
+    ///     </listheader>
+    ///     <item>
+    ///         <description>config</description>
+    ///         <description><see cref="Spring.Core.IO.ConfigSectionResource"/></description>
+    ///         <description>Resolves the resources by loading specified configuration section from the standard .NET config file.</description>
+    ///     </item>
+    ///     <item>
+    ///         <description>file</description>
+    ///         <description><see cref="Spring.Core.IO.FileSystemResource"/></description>
+    ///         <description>Resolves filesystem resources.</description>
+    ///     </item>
+    ///     <item>
+    ///         <description>http</description>
+    ///         <description><see cref="Spring.Core.IO.UrlResource"/></description>
+    ///         <description>Resolves remote web resources.</description>
+    ///     </item>
+    ///     <item>
+    ///         <description>https</description>
+    ///         <description><see cref="Spring.Core.IO.UrlResource"/></description>
+    ///         <description>Resolves remote web resources via HTTPS.</description>
+    ///     </item>
+    ///     <item>
+    ///         <description>ftp</description>
+    ///         <description><see cref="Spring.Core.IO.UrlResource"/></description>
+    ///         <description>Resolves ftp resources.</description>
+    ///     </item>
+    ///     <item>
+    ///         <description>assembly</description>
+    ///         <description><see cref="Spring.Core.IO.AssemblyResource"/></description>
+    ///         <description>Resolves resources that are embedded into an assembly.</description>
+    ///     </item>
+    ///     <item>
+    ///         <description>web</description>
+    ///         <description><c>Spring.Core.IO.WebResource, Spring.Web</c>*</description>
+    ///         <description>Resolves resources relative to the web application's virtual directory.</description>
+    ///     </item>
+    /// </list>
+    /// * only available in web applications.
+    /// <para>
+    /// Users can create and register their own protocol handlers by implementing <see cref="IResource"/> interface
+    /// and mapping custom protocol name to that implementation. See <see cref="ResourceHandlersSectionHandler"/> for details
+    /// on how to register custom protocol handler.
+    /// </para>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ResourceHandlerRegistry.cs,v 1.7 2007/08/08 17:46:55 bbaia Exp $</version>
+    public class ResourceHandlerRegistry
+    {
+        /// <summary>
+        /// Name of the .Net config section that contains definitions 
+        /// for custom resource handlers.
+        /// </summary>
+        private const string ResourcesSectionName = "spring/resourceHandlers";
+
+        private static IDictionary resourceHandlers = new Hashtable();
+
+        /// <summary>
+        /// Registers standard and user-configured resource handlers.
+        /// </summary>
+        static ResourceHandlerRegistry()
+        {
+            lock (resourceHandlers.SyncRoot)
+            {
+                resourceHandlers["config"] = GetResourceConstructor(typeof(ConfigSectionResource));
+                resourceHandlers["file"] = GetResourceConstructor(typeof(FileSystemResource));
+                resourceHandlers["http"] = GetResourceConstructor(typeof(UrlResource));
+                resourceHandlers["https"] = GetResourceConstructor(typeof(UrlResource));
+#if NET_2_0
+                resourceHandlers["ftp"] = GetResourceConstructor(typeof(UrlResource));
+#endif
+                resourceHandlers["assembly"] = GetResourceConstructor(typeof(AssemblyResource));
+
+                // register custom resource handlers
+                ConfigurationUtils.GetSection(ResourcesSectionName);
+            }
+        }
+
+        /// <summary>
+        /// Returns resource handler for the specified protocol name.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This method returns <see cref="ConstructorInfo"/> object that should be used
+        /// to create an instance of the <see cref="IResource"/>-derived type by passing
+        /// resource location as a parameter.
+        /// </para>
+        /// </remarks>
+        /// <param name="protocolName">Name of the protocol to get the handler for.</param>
+        /// <returns>Resource handler constructor for the specified protocol name.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="protocolName"/> is <c>null</c>.</exception>
+        public static IDynamicConstructor GetResourceHandler(string protocolName)
+        {
+            AssertUtils.ArgumentNotNull(protocolName, "protocolName");
+            return (IDynamicConstructor) resourceHandlers[protocolName];
+        }
+
+        /// <summary>
+        /// Returns <c>true</c> if a handler is registered for the specified protocol, 
+        /// <c>false</c> otherwise.
+        /// </summary>
+        /// <param name="protocolName">Name of the protocol.</param>
+        /// <returns>
+        ///     <c>true</c> if a handler is registered for the specified protocol, <c>false</c> otherwise.
+        /// </returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="protocolName"/> is <c>null</c>.</exception>
+        public static bool IsHandlerRegistered(string protocolName)
+        {
+            return resourceHandlers.Contains(protocolName);
+        }
+
+        /// <summary>
+        /// Registers resource handler and maps it to the specified protocol name.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the mapping already exists, the existing mapping will be
+        /// silently overwritten with the new mapping.
+        /// </p>
+        /// </remarks>
+        /// <param name="protocolName">
+        /// The protocol to add (or override).
+        /// </param>
+        /// <param name="handlerTypeName">
+        /// The type name of the concrete implementation of the
+        /// <see cref="Spring.Core.IO.IResource"/> interface that will handle
+        /// the specified protocol.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="protocolName"/> is
+        /// <see langword="null"/> or contains only whitespace character(s); or
+        /// if the supplied <paramref name="handlerTypeName"/> is
+        /// <see langword="null"/>.
+        /// </exception>
+        /// <exception cref="System.ArgumentException">
+        /// If the supplied <paramref name="handlerTypeName"/> is not a 
+        /// <see cref="Type"/> that derives from the
+        /// <see cref="Spring.Core.IO.IResource"/> interface; or (having passed
+        /// this first check), the supplied <paramref name="handlerTypeName"/>
+        /// does not expose a constructor that takes a single
+        /// <see cref="System.String"/> parameter.
+        /// </exception>
+        public static void RegisterResourceHandler(string protocolName, string handlerTypeName)
+        {
+            AssertUtils.ArgumentHasText(protocolName, "protocolName");
+            AssertUtils.ArgumentHasText(handlerTypeName, "handlerTypeName");
+
+            Type handlerType = TypeResolutionUtils.ResolveType(handlerTypeName);
+            RegisterResourceHandler(protocolName, handlerType);
+        }
+    
+        /// <summary>
+        /// Registers resource handler and maps it to the specified protocol name.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the mapping already exists, the existing mapping will be
+        /// silently overwritten with the new mapping.
+        /// </p>
+        /// </remarks>
+        /// <param name="protocolName">
+        /// The protocol to add (or override).
+        /// </param>
+        /// <param name="handlerType">
+        /// The concrete implementation of the
+        /// <see cref="Spring.Core.IO.IResource"/> interface that will handle
+        /// the specified protocol.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="protocolName"/> is
+        /// <see langword="null"/> or contains only whitespace character(s); or
+        /// if the supplied <paramref name="handlerType"/> is
+        /// <see langword="null"/>.
+        /// </exception>
+        /// <exception cref="System.ArgumentException">
+        /// If the supplied <paramref name="handlerType"/> is not a 
+        /// <see cref="Type"/> that derives from the
+        /// <see cref="Spring.Core.IO.IResource"/> interface; or (having passed
+        /// this first check), the supplied <paramref name="handlerType"/>
+        /// does not expose a constructor that takes a single
+        /// <see cref="System.String"/> parameter.
+        /// </exception>
+        public static void RegisterResourceHandler(string protocolName, Type handlerType)
+        {
+            #region Sanity Checks
+
+            AssertUtils.ArgumentHasText(protocolName, "protocolName");
+            AssertUtils.ArgumentNotNull(handlerType, "handlerType");
+            if (!typeof(IResource).IsAssignableFrom(handlerType))
+            {
+                throw new ArgumentException(
+                        string.Format("[{0}] does not implement [{1}] interface (it must).", handlerType.FullName, typeof(IResource).FullName));
+            }
+
+            #endregion
+
+            lock (resourceHandlers.SyncRoot)
+            {
+                IDynamicConstructor ctor = GetResourceConstructor(handlerType);
+                resourceHandlers[protocolName] = ctor;
+            }
+        }
+
+        private static IDynamicConstructor GetResourceConstructor(Type handlerType)
+        {
+            ConstructorInfo ctor = handlerType.GetConstructor(new Type[] {typeof(string)});
+            if (ctor == null)
+            {
+                throw new ArgumentException(
+                        string.Format("[{0}] does not have a constructor that takes a single string as an argument (it must).", handlerType.FullName));
+            }
+            return DynamicConstructor.Create(ctor);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/IO/UrlResource.cs b/src/Spring/Spring.Core/Core/IO/UrlResource.cs
new file mode 100644
index 00000000..fad9ae5d
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IO/UrlResource.cs
@@ -0,0 +1,269 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Net;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+	/// <summary>
+    /// A <see cref="System.Uri"/> backed resource 
+    /// on top of <see cref="System.Net.WebRequest"/>
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Obviously supports resolution as a <see cref="System.Uri"/>, and also
+	/// as a <see cref="System.IO.FileInfo"/> in the case of the <c>"file:"</c>
+	/// protocol.
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <p>
+	/// Some examples of the strings that can be used to initialize a new
+	/// instance of the <see cref="Spring.Core.IO.UrlResource"/> class
+	/// include...
+	/// <list type="bullet">
+	/// <item>
+	/// <description>file:///Config/objects.xml</description>
+	/// </item>
+	/// <item>
+	/// <description>http://www.mycompany.com/services.txt</description>
+	/// </item>
+	/// </list>
+	/// </p>
+	/// </example>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Leonardo Susatyo (.NET)</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: UrlResource.cs,v 1.15 2007/08/08 17:46:55 bbaia Exp $</version>
+	/// <seealso cref="Spring.Core.IO.IResource"/>
+	/// <seealso cref="Spring.Core.IO.IResourceLoader"/>
+	/// <seealso cref="Spring.Core.IO.ConfigurableResourceLoader"/>
+	public class UrlResource : AbstractResource
+	{
+		private Uri _uri;
+        private WebRequest _webRequest;
+		private string _rootLocation;
+		private string _resourcePath;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Core.IO.UrlResource"/> class.
+		/// </summary>
+		/// <example>
+		/// <p>
+		/// Some examples of the values that the <paramref name="resourceName"/>
+		/// can typically be expected to hold include...
+		/// <list type="bullet">
+		/// <item>
+		/// <description>file:///Config/objects.xml</description>
+		/// </item>
+		/// <item>
+		/// <description>http://www.mycompany.com/services.txt</description>
+		/// </item>
+		/// </list>
+		/// </p>
+		/// </example>
+		/// <param name="resourceName">
+		/// A string representation of the <see cref="System.Uri"/> resource.
+		/// </param>
+		public UrlResource(string resourceName) : base(resourceName)
+		{
+			this._uri = new Uri(resourceName);
+			_rootLocation = _uri.Host;
+			if (!_uri.IsDefaultPort)
+			{
+				_rootLocation += ":" + _uri.Port;
+			}
+			_resourcePath = _uri.AbsolutePath;
+			int n = _resourcePath.LastIndexOf('/');
+			if (n > 0)
+			{
+				_resourcePath = _resourcePath.Substring(1, n - 1);
+			}
+			else
+			{
+				_resourcePath = null;
+			}
+            _webRequest = WebRequest.Create(_uri);
+		}
+
+        /// <summary>
+        /// Returns the <see cref="System.Net.WebRequest"/> instance 
+        /// used for the resource resolution.
+        /// </summary>
+        /// <value>
+        /// A <see cref="System.Net.WebRequest"/> instance.
+        /// </value>
+        /// <seealso cref="System.Net.HttpWebRequest"/>
+        /// <seealso cref="System.Net.FileWebRequest"/>
+        public WebRequest WebRequest
+        {
+            get { return _webRequest; }
+        }
+
+		/// <summary>
+		/// Return an <see cref="System.IO.Stream"/> for this resource.
+		/// </summary>
+		/// <value>
+		/// An <see cref="System.IO.Stream"/>.
+		/// </value>
+		/// <exception cref="System.IO.IOException">
+		/// If the stream could not be opened.
+		/// </exception>
+		/// <seealso cref="Spring.Core.IO.IInputStreamSource"/>
+		public override Stream InputStream
+		{
+			get { return _webRequest.GetResponse().GetResponseStream(); }
+		}
+
+		/// <summary>
+		/// Returns the <see cref="System.Uri"/> handle for this resource.
+		/// </summary>
+		/// <value>
+		/// The <see cref="System.Uri"/> handle for this resource.
+		/// </value>
+		/// <exception cref="System.IO.IOException">
+		/// If the resource is not available or cannot be exposed as a
+		/// <see cref="System.Uri"/>.
+		/// </exception>
+		/// <seealso cref="Spring.Core.IO.IResource.Uri"/>
+		public override Uri Uri
+		{
+			get { return _uri; }
+		}
+
+		/// <summary>
+		/// Returns a <see cref="System.IO.FileInfo"/> handle for this resource.
+		/// </summary>
+		/// <value>
+		/// The <see cref="System.IO.FileInfo"/> handle for this resource.
+		/// </value>
+		/// <exception cref="System.IO.FileNotFoundException">
+		/// If the resource is not available on a filesystem.
+		/// </exception>
+		/// <seealso cref="Spring.Core.IO.IResource.File"/>
+		public override FileInfo File
+		{
+			get
+			{
+				if (_uri.IsFile)
+				{
+					return new FileInfo(_uri.AbsolutePath);
+				}
+				throw new FileNotFoundException(Description +
+					" cannot be resolved to absolute file path - " +
+					"resource does not use 'file:' protocol." );
+			}
+		}
+
+		/// <summary>
+		/// Does this <see cref="Spring.Core.IO.IResource"/> support relative
+		/// resource retrieval?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This implementation does support relative resource retrieval, and
+		/// so will always return <see langword="true"/>.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// <see langword="true"/> if this
+		/// <see cref="Spring.Core.IO.IResource"/> supports relative resource
+		/// retrieval.
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.AbstractResource.SupportsRelativeResources"/>
+		protected override bool SupportsRelativeResources
+		{
+			get { return true; }
+		}
+
+		/// <summary>
+		/// Gets the root location of the resource.
+		/// </summary>
+		/// <value>
+		/// The root location of the resource.
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.AbstractResource.RootLocation"/>
+		protected override string RootLocation
+		{
+			get { return _rootLocation; }
+		}
+
+		/// <summary>
+		/// Gets the current path of the resource.
+		/// </summary>
+		/// <value>
+		/// The current path of the resource.
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.AbstractResource.ResourcePath"/>
+		protected override string ResourcePath
+		{
+			get { return _resourcePath; }
+		}
+
+		/// <summary>
+		/// Gets those characters that are valid path separators for the
+		/// resource type.
+		/// </summary>
+		/// <value>
+		/// Those characters that are valid path separators for the resource
+		/// type.
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.AbstractResource.PathSeparatorChars"/>
+		protected override char[] PathSeparatorChars
+		{
+			get { return new char[] {'/'}; }
+		}
+
+		/// <summary>
+		/// Returns a description for this resource.
+		/// </summary>
+		/// <value>
+		/// A description for this resource.
+		/// </value>
+		/// <seealso cref="Spring.Core.IO.IResource.Description"/>
+		public override string Description
+		{
+			get { return StringUtils.Surround("URL [", Uri, "]"); }
+		}
+
+        /// <summary>
+        /// Does the supplied <paramref name="resourceName"/> relative ?
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the resource to test.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if resource name is relative; 
+        /// otherwise <see langword="false"/>.
+        /// </returns>
+        protected override bool IsRelativeResource(string resourceName)
+        {
+            return true;
+        }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/IOrdered.cs b/src/Spring/Spring.Core/Core/IOrdered.cs
new file mode 100644
index 00000000..b7dadb69
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/IOrdered.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+
+
+#endregion
+
+namespace Spring.Core
+{
+	/// <summary>
+	/// Interface that can be implemented by objects that should be orderable, e.g. in an
+	/// <see cref="System.Collections.ICollection"/>.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+    /// The actual order can be interpreted as prioritization, the first object (with the
+    /// lowest order value) having the highest priority.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+    /// <author>Aleksandar Seovic (.Net)</author>
+    /// <version>$Id: IOrdered.cs,v 1.6 2007/05/26 00:42:36 markpollack Exp $</version>
+    public interface IOrdered
+	{
+
+		/// <summary>
+		/// Return the order value of this object, where a higher value means greater in
+		/// terms of sorting.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+        /// Normally starting with 0 or 1, with <see cref="System.Int32.MaxValue"/> indicating
+        /// greatest. Same order values will result in arbitrary positions for the affected
+        /// objects.
+		/// </p>
+		/// <p>
+        /// Higher value can be interpreted as lower priority, consequently the first object
+        /// has highest priority.
+		/// </p>
+		/// </remarks>
+		/// <returns>The order value.</returns>
+        int Order
+        {
+            get;
+        }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/InvalidPropertyException.cs b/src/Spring/Spring.Core/Core/InvalidPropertyException.cs
new file mode 100644
index 00000000..17cae32f
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/InvalidPropertyException.cs
@@ -0,0 +1,214 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Thrown in response to referring to an invalid property (most often via reflection).
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: InvalidPropertyException.cs,v 1.2 2007/07/31 03:47:22 markpollack Exp $</version>
+    [Serializable]
+    public class InvalidPropertyException : FatalReflectionException
+    {
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="InvalidPropertyException"/> class.
+        /// </summary>
+        public InvalidPropertyException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="InvalidPropertyException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public InvalidPropertyException(string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="InvalidPropertyException"/> class.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> that is (or rather was) the source of the
+        /// offending property.
+        /// </param>
+        /// <param name="propertyName">
+        /// The name of the offending property.
+        /// </param>
+        public InvalidPropertyException(Type type, string propertyName)
+            : this(type, propertyName, string.Format(
+                                           CultureInfo.InvariantCulture,
+                                           "Invalid property '{0}' in class [{1}].", propertyName, type.FullName))
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="InvalidPropertyException"/> class.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> that is (or rather was) the source of the
+        /// offending property.
+        /// </param>
+        /// <param name="propertyName">
+        /// The name of the offending property.
+        /// </param>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public InvalidPropertyException(Type type, string propertyName, string message)
+            : base(message)
+        {
+            offendingObjectType = type;
+            offendingPropertyName = propertyName;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the InvalidPropertyException class.
+        /// </summary>
+        /// <param name="offendingType">
+        /// The <see cref="System.Type"/> that is (or rather was) the source of the
+        /// offending property.
+        /// </param>
+        /// <param name="offendingProperty">
+        /// The name of the offending property.
+        /// </param>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public InvalidPropertyException (
+            Type offendingType, string offendingProperty, string message, Exception rootCause)
+            : base (message, rootCause)
+        {
+            offendingObjectType = offendingType;
+            offendingPropertyName = offendingProperty;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="InvalidPropertyException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public InvalidPropertyException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="InvalidPropertyException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected InvalidPropertyException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+            offendingObjectType = info.GetValue("ObjectType", typeof (Type)) as Type;
+            offendingPropertyName = info.GetString("OffendingPropertyName");
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The <see cref="System.Type"/> that is (or rather was) the source of the
+        /// offending property.
+        /// </summary>
+        public Type ObjectType
+        {
+            get { return offendingObjectType; }
+        }
+
+        /// <summary>
+        /// The name of the offending property.
+        /// </summary>
+        public string OffendingPropertyName
+        {
+            get { return offendingPropertyName; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+        /// the data needed to serialize the target object.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+        /// with data.
+        /// </param>
+        /// <param name="context">
+        /// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+        /// for this serialization.
+        /// </param>
+        [SecurityPermission(SecurityAction.Demand, SerializationFormatter=true)]
+        public override void GetObjectData(
+            SerializationInfo info, StreamingContext context)
+        {
+            base.GetObjectData(info, context);
+            info.AddValue("ObjectType", ObjectType, typeof (Type));
+            info.AddValue("OffendingPropertyName", OffendingPropertyName);
+        }
+
+        #endregion
+
+        #region Fields
+
+        private Type offendingObjectType;
+        private string offendingPropertyName;
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs b/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs
new file mode 100644
index 00000000..fb8b4b2c
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs
@@ -0,0 +1,141 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Criteria that is satisfied if the number of generic arguments to a given
+    /// <see cref="System.Reflection.MethodBase"/> matches an arbitrary number.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This class supports checking the generic arguments count of both 
+    /// generic methods and constructors.
+    /// </p>
+    /// </remarks>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: MethodGenericArgumentsCountCriteria.cs,v 1.1 2007/08/04 01:04:33 bbaia Exp $</version>
+    public class MethodGenericArgumentsCountCriteria : ICriteria
+    {
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="MethodGenericArgumentsCountCriteria"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This constructor sets the
+        /// <see cref="MethodGenericArgumentsCountCriteria.ExpectedGenericArgumentCount"/>
+        /// property to zero (0).
+        /// </p>
+        /// </remarks>
+        public MethodGenericArgumentsCountCriteria() : this(0)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="MethodGenericArgumentsCountCriteria"/> class.
+        /// </summary>
+        /// <param name="expectedGenericArgumentCount">
+        /// The number of generic arguments that a <see cref="System.Reflection.MethodInfo"/> 
+        /// must have to satisfy this criteria.
+        /// </param>
+        /// <exception cref="System.ArgumentException">
+        /// If the supplied <paramref name="expectedParameterCount"/> is less
+        /// than zero.
+        /// </exception>
+        public MethodGenericArgumentsCountCriteria(int expectedGenericArgumentCount)
+        {
+            ExpectedGenericArgumentCount = expectedGenericArgumentCount;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The number of generic arguments that a <see cref="System.Reflection.MethodInfo"/> 
+        /// must have to satisfy this criteria.
+        /// </summary>
+        /// <exception cref="System.ArgumentException">
+        /// If the supplied value is less than zero.
+        /// </exception>
+        public int ExpectedGenericArgumentCount
+        {
+            get { return _count; }
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentOutOfRangeException(
+                        "value", value, "Cannot specify a generic argument count of less than zero.");
+                }
+                _count = value;
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+        /// this instance?
+        /// </summary>
+        /// <param name="datum">The datum to be checked by this criteria instance.</param>
+        /// <returns>
+        /// True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+        /// by this instance; false if not or the supplied <paramref name="datum"/> is null.
+        /// </returns>
+        public bool IsSatisfied(object datum)
+        {
+            bool satisfied = false;
+            MethodBase method = datum as MethodBase;
+            if (method != null)
+            {
+                satisfied = method.GetGenericArguments().Length == ExpectedGenericArgumentCount;
+            }
+            return satisfied;
+        }
+
+        #endregion
+
+        #region Fields
+
+        private int _count;
+
+        #endregion
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/MethodInvocationException.cs b/src/Spring/Spring.Core/Core/MethodInvocationException.cs
new file mode 100644
index 00000000..d9f4f5b3
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/MethodInvocationException.cs
@@ -0,0 +1,120 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Thrown when a method (typically a property getter or setter invoked via reflection)
+    /// throws an exception, analogous to a <see cref="System.Reflection.TargetInvocationException"/>.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: MethodInvocationException.cs,v 1.1 2007/07/31 00:08:42 markpollack Exp $
+    /// </version>
+    [Serializable]
+    public class MethodInvocationException : PropertyAccessException
+    {
+        /// <summary>
+        /// The error code string for this exception.
+        /// </summary>
+        override public string ErrorCode
+        {
+            get
+            {
+                return "methodInvocation";
+            }			
+        }
+
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the MethodInvocationException class.
+        /// </summary>
+        public MethodInvocationException ()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the MethodInvocationException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public MethodInvocationException (string message)
+            : base (message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the MethodInvocationException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public MethodInvocationException (string message, Exception rootCause)
+            : base (message, rootCause)
+        {
+        }
+		
+        /// <summary>
+        /// Constructor to use when an exception results from a
+        /// <see cref="System.ComponentModel.PropertyChangedEventArgs"/>.
+        /// </summary>
+        /// <param name="ex">
+        /// The <see cref="System.Exception"/> raised by the invoked property.
+        /// </param>
+        /// <param name="argument">
+        /// The <see cref="System.ComponentModel.PropertyChangedEventArgs"/> that
+        /// resulted in an exception.
+        /// </param>
+        public MethodInvocationException (Exception ex, PropertyChangeEventArgs argument) : 
+            base ("Property '" + argument.PropertyName + "' threw exception.", argument, ex)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the MethodInvocationException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected MethodInvocationException (
+            SerializationInfo info, StreamingContext context)
+            : base (info, context)
+        {
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/MethodNameMatchCriteria.cs b/src/Spring/Spring.Core/Core/MethodNameMatchCriteria.cs
new file mode 100644
index 00000000..50f6c7d0
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/MethodNameMatchCriteria.cs
@@ -0,0 +1,132 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core
+{
+     /// <summary>
+    /// Criteria that is satisfied if the method <c>Name</c> of an
+    /// <see cref="System.Reflection.MethodInfo"/> instance matches a
+    /// supplied string pattern.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Supports the following simple pattern styles: 
+    /// "xxx*", "*xxx" and "*xxx*" matches, as well as direct equality.
+    /// </para>
+    /// </remarks>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: MethodNameMatchCriteria.cs,v 1.1 2007/08/04 01:04:34 bbaia Exp $</version>
+    public class MethodNameMatchCriteria : ICriteria
+    {
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="MethodNameMatchCriteria"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This constructor sets the
+        /// <see cref="MethodNameMatchCriteria.Pattern"/>
+        /// property to * (any method name).
+        /// </p>
+        /// </remarks>
+        public MethodNameMatchCriteria() : this("*")
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="MethodNameMatchCriteria"/> class.
+        /// </summary>
+        /// The pattern that <see cref="System.Reflection.MethodInfo"/> names
+        /// must match against in order to satisfy this criteria.
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="pattern"/> is null or resolve to an empty string.
+        /// </exception>
+        public MethodNameMatchCriteria(string pattern)
+        {
+            Pattern = pattern;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The number of parameters that a <see cref="System.Reflection.MethodInfo"/>
+        /// must have to satisfy this criteria.
+        /// </summary>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied value is null or resolve to an empty string.
+        /// </exception>
+        public string Pattern
+        {
+            get { return pattern; }
+            set
+            {
+                AssertUtils.ArgumentHasText(value, "value");
+                pattern = value;
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+        /// this instance?
+        /// </summary>
+        /// <param name="datum">The datum to be checked by this criteria instance.</param>
+        /// <returns>
+        /// True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+        /// by this instance; false if not or the supplied <paramref name="datum"/> is null.
+        /// </returns>
+        public bool IsSatisfied(object datum)
+        {
+            bool satisfied = false;
+            MethodBase method = datum as MethodBase;
+            if (method != null)
+            {
+                satisfied = PatternMatchUtils.SimpleMatch(pattern.ToLower(), method.Name.ToLower());
+            }
+            return satisfied;
+        }
+
+        #endregion
+
+        #region Fields
+
+        private string pattern;
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/MethodParametersCountCriteria.cs b/src/Spring/Spring.Core/Core/MethodParametersCountCriteria.cs
new file mode 100644
index 00000000..837f800a
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/MethodParametersCountCriteria.cs
@@ -0,0 +1,148 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Criteria that is satisfied if the number of parameters to a given
+    /// <see cref="System.Reflection.MethodBase"/> matches an arbitrary number.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This class supports checking the parameter count of both methods and
+    /// constructors.
+    /// </p>
+    /// <p>
+    /// Default parameters, etc need to taken into account.
+    /// </p>
+    /// </remarks>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: MethodParametersCountCriteria.cs,v 1.2 2007/09/20 14:20:45 bbaia Exp $</version>
+    public class MethodParametersCountCriteria : ICriteria
+    {
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="MethodParametersCountCriteria"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This constructor sets the
+        /// <see cref="MethodParametersCountCriteria.ExpectedParameterCount"/>
+        /// property to zero (0).
+        /// </p>
+        /// </remarks>
+        public MethodParametersCountCriteria() : this(0)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="MethodParametersCountCriteria"/> class.
+        /// </summary>
+        /// <param name="expectedParameterCount">
+        /// The number of parameters that a <see cref="System.Reflection.MethodInfo"/>
+        /// must have to satisfy this criteria.
+        /// </param>
+        /// <exception cref="System.ArgumentException">
+        /// If the supplied <paramref name="expectedParameterCount"/> is less
+        /// than zero.
+        /// </exception>
+        public MethodParametersCountCriteria(int expectedParameterCount)
+        {
+            ExpectedParameterCount = expectedParameterCount;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The number of parameters that a <see cref="System.Reflection.MethodInfo"/>
+        /// must have to satisfy this criteria.
+        /// </summary>
+        /// <exception cref="System.ArgumentException">
+        /// If the supplied value is less than zero.
+        /// </exception>
+        public int ExpectedParameterCount
+        {
+            get { return _count; }
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentOutOfRangeException(
+                        "value", value, "Cannot specify a parameter count of less than zero.");
+                }
+                _count = value;
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+        /// this instance?
+        /// </summary>
+        /// <param name="datum">The datum to be checked by this criteria instance.</param>
+        /// <returns>
+        /// True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+        /// by this instance; false if not or the supplied <paramref name="datum"/> is null.
+        /// </returns>
+        public bool IsSatisfied(object datum)
+        {
+            bool satisfied = false;
+            MethodBase method = datum as MethodBase;
+            if (method != null)
+            {
+                ParameterInfo[] parameters = method.GetParameters();
+                if (parameters.Length == ExpectedParameterCount)
+                {
+                    satisfied = true;
+                }
+                else if ((parameters.Length > 0) && (ExpectedParameterCount >= parameters.Length-1))
+                {
+                    ParameterInfo lastParameter = parameters[parameters.Length - 1];
+                    satisfied = lastParameter.GetCustomAttributes(typeof(ParamArrayAttribute), false).Length > 0;
+                }
+            }
+            return satisfied;
+        }
+
+        #endregion
+
+        #region Fields
+
+        private int _count;
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/MethodParametersCriteria.cs b/src/Spring/Spring.Core/Core/MethodParametersCriteria.cs
new file mode 100644
index 00000000..8712a08f
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/MethodParametersCriteria.cs
@@ -0,0 +1,180 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Criteria that is satisfied if the <see cref="System.Type"/> of each of the
+    /// parameters of a given <see cref="System.Reflection.MethodInfo"/> matches each
+    /// of the parameter <see cref="System.Type"/>s of a given
+    /// <see cref="System.Reflection.MethodInfo"/>.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// If no <see cref="System.Type"/> array is passed to the overloaded constructor,
+    /// any method that has no parameters will satisfy an instance of this
+    /// class. The same effect could be achieved by passing the
+    /// <see cref="System.Type.EmptyTypes"/> array to the overloaded constructor.
+    /// </p>
+    /// </remarks>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: MethodParametersCriteria.cs,v 1.2 2007/09/20 14:20:46 bbaia Exp $</version>
+    public class MethodParametersCriteria : ICriteria
+    {
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="MethodParametersCriteria"/> class.
+        /// </summary>
+        public MethodParametersCriteria() : this(Type.EmptyTypes)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="MethodParametersCriteria"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the supplied <paramref name="parameters"/> array is null, then this
+        /// constructor uses the <see cref="System.Type.EmptyTypes"/> array.
+        /// </p>
+        /// </remarks>
+        /// <param name="parameters">
+        /// The <see cref="System.Type"/> array that this criteria will use to
+        /// check parameter <see cref="System.Type"/>s.
+        /// </param>
+        public MethodParametersCriteria(Type[] parameters)
+        {
+            _parameters = parameters;
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+        /// this instance?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation respects the inheritance chain of any parameter
+        /// <see cref="System.Type"/>s... i.e. methods that have a base type (or
+        /// interface) that is assignable to the <see cref="System.Type"/> in the
+        /// same corresponding index of the parameter types will satisfy this
+        /// criteria instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="datum">The datum to be checked by this criteria instance.</param>
+        /// <returns>
+        /// True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+        /// by this instance; false if not or the supplied <paramref name="datum"/> is null.
+        /// </returns>
+        public bool IsSatisfied(object datum)
+        {
+            bool satisfied = false;
+            MethodInfo method = datum as MethodInfo;
+            if (method != null)
+            {
+                bool isParamArray = false;
+                Type paramArrayType = null;
+                ParameterInfo[] parametersBeingChecked = method.GetParameters();
+                if (parametersBeingChecked.Length > 0)
+                {
+                    ParameterInfo lastParameter = parametersBeingChecked[parametersBeingChecked.Length - 1];
+                    isParamArray = lastParameter.GetCustomAttributes(typeof(ParamArrayAttribute), false).Length > 0;
+                    if (isParamArray)
+                    {
+                        paramArrayType = lastParameter.ParameterType.GetElementType();
+                    }
+                }
+                if (parametersBeingChecked != null
+                    && parametersBeingChecked.Length == _parameters.Length)
+                {
+                    satisfied = true;
+                    for (int i = 0; i < _parameters.Length; ++i)
+                    {
+                        Type sourceType = _parameters[i];
+                        Type typeBeingChecked = parametersBeingChecked[i].ParameterType;
+                        if (!typeBeingChecked.IsAssignableFrom(sourceType))
+                        {
+                            if (isParamArray && i == _parameters.Length - 1)
+                            {
+                                if (!paramArrayType.IsAssignableFrom(sourceType))
+                                {
+                                    satisfied = false;
+                                    break;
+                                }
+                            }
+                            else
+                            {
+                                satisfied = false;
+                                break;
+                            }
+                        }
+                    }
+                }
+                else if (isParamArray && (_parameters.Length >= parametersBeingChecked.Length - 1))
+                {
+                    satisfied = true;
+                    for (int i = 0; i < parametersBeingChecked.Length - 1; ++i)
+                    {
+                        Type sourceType = _parameters[i];
+                        Type typeBeingChecked = parametersBeingChecked[i].ParameterType;
+                        if (!typeBeingChecked.IsAssignableFrom(sourceType))
+                        {
+                            satisfied = false;
+                            break;
+                        }
+                    }
+                    for (int i = parametersBeingChecked.Length - 1; i < _parameters.Length; ++i)
+                    {
+                        Type sourceType = _parameters[i];
+                        if (!paramArrayType.IsAssignableFrom(sourceType))
+                        {
+                            satisfied = false;
+                            break;
+                        }
+                    }
+                }
+            }
+            return satisfied;
+        }
+
+        #endregion
+
+        #region Fields
+
+        private readonly Type[] _parameters;
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/MethodReturnTypeCriteria.cs b/src/Spring/Spring.Core/Core/MethodReturnTypeCriteria.cs
new file mode 100644
index 00000000..0fad4d09
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/MethodReturnTypeCriteria.cs
@@ -0,0 +1,121 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Criteria that is satisfied if the return <see cref="System.Type"/> of a given
+    /// <see cref="System.Reflection.MethodInfo"/> matches a given <see cref="System.Type"/>.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: MethodReturnTypeCriteria.cs,v 1.1 2007/07/31 02:03:36 markpollack Exp $</version>
+    public class MethodReturnTypeCriteria : ICriteria
+    {
+        #region Constants
+
+        /// <summary>
+        /// The return <see cref="System.Type"/> to match against if no
+        /// <see cref="System.Type"/> is provided explictly.
+        /// </summary>
+        private static readonly Type DefaultType = typeof (void);
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="MethodReturnTypeCriteria"/> class.
+        /// </summary>
+        public MethodReturnTypeCriteria()
+            : this(DefaultType)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="MethodReturnTypeCriteria"/> class.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> that the return type of a given
+        /// <see cref="System.Reflection.MethodInfo"/> must match in order to satisfy
+        /// this criteria.
+        /// </param>
+        public MethodReturnTypeCriteria(Type type)
+        {
+            ReturnType = type;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The <see cref="System.Type"/> that the return type of a given
+        /// <see cref="System.Reflection.MethodInfo"/> must match in order to satisfy
+        /// this criteria.
+        /// </summary>
+        public Type ReturnType
+        {
+            get { return _type; }
+            set { _type = value == null ? DefaultType : value; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+        /// this instance?
+        /// </summary>
+        /// <param name="datum">The datum to be checked by this criteria instance.</param>
+        /// <returns>
+        /// True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+        /// by this instance; false if not or the supplied <paramref name="datum"/> is null.
+        /// </returns>
+        public bool IsSatisfied(object datum)
+        {
+            bool satisfied = false;
+            MethodInfo method = datum as MethodInfo;
+            if (method != null)
+            {
+                satisfied = method.ReturnType.Equals(ReturnType);
+            }
+            return satisfied;
+        }
+
+        #endregion
+
+        #region Fields
+
+        private Type _type;
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/NotReadablePropertyException.cs b/src/Spring/Spring.Core/Core/NotReadablePropertyException.cs
new file mode 100644
index 00000000..60cae8df
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/NotReadablePropertyException.cs
@@ -0,0 +1,116 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Thrown in response to a failed attempt to read a property.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Typically thrown when attempting to read the value of a write-only
+    /// property via reflection.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: NotReadablePropertyException.cs,v 1.2 2007/07/31 00:26:30 markpollack Exp $</version>
+    [Serializable]
+    public class NotReadablePropertyException : InvalidPropertyException
+    {
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.NotReadablePropertyException"/> class.
+        /// </summary>
+        public NotReadablePropertyException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.NotReadablePropertyException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public NotReadablePropertyException(string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.NotReadablePropertyException"/> class.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> that is (or rather was) the source of the
+        /// offending property.
+        /// </param>
+        /// <param name="propertyName">
+        /// The name of the offending property.
+        /// </param>
+        public NotReadablePropertyException(Type type, string propertyName)
+            : base(type, propertyName, string.Format(
+                                           CultureInfo.InvariantCulture,
+                                           "Cannot read the value of the '{0}' property " +
+                                           "declared on the [{1}] class : property is read-only.", propertyName, type.FullName))
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.NotReadablePropertyException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public NotReadablePropertyException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.NotReadablePropertyException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected NotReadablePropertyException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/NotWritablePropertyException.cs b/src/Spring/Spring.Core/Core/NotWritablePropertyException.cs
new file mode 100644
index 00000000..0f6b012a
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/NotWritablePropertyException.cs
@@ -0,0 +1,148 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Thrown in response to a failed attempt to write a property.
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: NotWritablePropertyException.cs,v 1.1 2007/07/31 00:08:42 markpollack Exp $</version>
+    [Serializable]
+    public class NotWritablePropertyException : InvalidPropertyException
+    {
+        /// <summary>
+        /// Creates a new instance of the NotWritablePropertyException class.
+        /// </summary>
+        public NotWritablePropertyException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the NotWritablePropertyException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public NotWritablePropertyException(string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the NotWritablePropertyException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public NotWritablePropertyException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the NotWritablePropertyException class.
+        /// </summary>
+        /// <param name="offendingType">
+        /// The <see cref="System.Type"/> that is (or rather was) the source of the
+        /// offending property.
+        /// </param>
+        /// <param name="offendingProperty">
+        /// The name of the offending property.
+        /// </param>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public NotWritablePropertyException(
+            Type offendingType, string offendingProperty, string message, Exception rootCause)
+            : base(offendingType, offendingProperty, message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the NotWritablePropertyException class
+        /// summarizing what property was not writable.
+        /// </summary>
+        /// <param name="offendingProperty">
+        /// The name of the property that is not writable.
+        /// </param>
+        /// <param name="offendingType">
+        /// The <see cref="System.Type"/> in which the property is not writable.
+        /// </param>
+        public NotWritablePropertyException(string offendingProperty, Type offendingType)
+            : base(offendingType, offendingProperty,
+                   string.Format(CultureInfo.InvariantCulture,
+                                 "Property '{0}' is not writable in class [{1}].",
+                                 offendingProperty, offendingType.FullName))
+        {
+        }
+
+        /// <summary>
+        /// Creates new NotWritablePropertyException with a root cause.
+        /// </summary>
+        /// <param name="offendingProperty">
+        /// The name of the property that is not writable.
+        /// </param>
+        /// <param name="offendingType">
+        /// The <see cref="System.Type"/> in which the property is not writable.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root cause indicating why the property was not writable.
+        /// </param>
+        public NotWritablePropertyException(string offendingProperty, Type offendingType, Exception rootCause)
+            : base(offendingType, offendingProperty,
+                   string.Format(CultureInfo.InvariantCulture,
+                                 "Property '{0}' is not writable in class [{1}].",
+                                 offendingProperty,
+                                 offendingType != null ? offendingType.FullName : "null"),
+                   rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the NotWritablePropertyException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected NotWritablePropertyException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/NullValueInNestedPathException.cs b/src/Spring/Spring.Core/Core/NullValueInNestedPathException.cs
new file mode 100644
index 00000000..76ef1cc5
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/NullValueInNestedPathException.cs
@@ -0,0 +1,172 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Thrown in response to encountering a <see langword="null"/> value
+    /// when traversing a nested path expression.
+    /// </summary>
+    /// <version>$Id: NullValueInNestedPathException.cs,v 1.2 2007/07/31 03:47:22 markpollack Exp $</version>
+    [Serializable]
+    public class NullValueInNestedPathException : FatalReflectionException
+    {
+        private string property;
+        private Type type;
+
+        /// <summary>
+        /// The name of the offending property.
+        /// </summary>
+        public string PropertyName
+        {
+            get { return property; }
+        }
+
+        /// <summary>
+        /// The <see cref="System.Type"/> of the class where the property was last looked for.
+        /// </summary>
+        public Type ObjectType
+        {
+            get { return type; }
+        }
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="NullValueInNestedPathException"/> class.
+        /// </summary>
+        public NullValueInNestedPathException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="NullValueInNestedPathException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public NullValueInNestedPathException(string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="NullValueInNestedPathException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public NullValueInNestedPathException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="NullValueInNestedPathException"/> class.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> of the object where the property was not found.
+        /// </param>
+        /// <param name="theProperty">The name of the property not found.</param>
+        public NullValueInNestedPathException(Type type, string theProperty)
+            : this(type, theProperty, string.Format(CultureInfo.InvariantCulture,
+                                                    "Value of nested property '{0}' is null in Type [{1}].", theProperty, type))
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="NullValueInNestedPathException"/> class.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> of the object where the property was not found.
+        /// </param>
+        /// <param name="theProperty">The name of the property not found.</param>
+        /// <param name="message">A message about the exception.</param>
+        public NullValueInNestedPathException(Type type, string theProperty, string message)
+            : base(message)
+        {
+            property = theProperty;
+            this.type = type;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="NullValueInNestedPathException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected NullValueInNestedPathException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+            type = info.GetValue("ObjectType", typeof (Type)) as Type;
+            property = info.GetString("PropertyName");
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+        /// the data needed to serialize the target object.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+        /// with data.
+        /// </param>
+        /// <param name="context">
+        /// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+        /// for this serialization.
+        /// </param>
+        [SecurityPermission(SecurityAction.Demand, SerializationFormatter=true)]
+        public override void GetObjectData(
+            SerializationInfo info, StreamingContext context)
+        {
+            base.GetObjectData(info, context);
+            info.AddValue("ObjectType", ObjectType);
+            info.AddValue("PropertyName", PropertyName);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/OrderComparator.cs b/src/Spring/Spring.Core/Core/OrderComparator.cs
new file mode 100644
index 00000000..ccc061e2
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/OrderComparator.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Core
+{
+	/// <summary>
+	/// Comparator implementation for <see cref="Spring.Core.IOrdered"/> objects, sorting by
+	/// order value ascending (resp. by priority descending).
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Non-<see cref="Spring.Core.IOrdered"/> objects are treated as greatest order values,
+	/// thus ending up at the end of a list, in arbitrary order (just like same order values of
+	/// <see cref="Spring.Core.IOrdered"/> objects).
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+    /// <author>Aleksandar Seovic (.Net)</author>
+    /// <version>$Id: OrderComparator.cs,v 1.5 2006/04/09 07:18:38 markpollack Exp $</version>
+    public class OrderComparator : IComparer
+	{
+        /// <summary>
+        /// Compares two objects and returns a value indicating whether one is less than,
+        /// equal to or greater than the other.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Uses direct evaluation instead of <see cref="System.Int32.CompareTo(object)"/>
+        /// to avoid unnecessary boxing.
+        /// </p>
+        /// </remarks>
+        /// <param name="o1">The first object to compare.</param>
+        /// <param name="o2">The second object to compare.</param>
+        /// <returns>
+        /// -1 if first object is less then second, 1 if it is greater, or 0 if they are equal.
+        /// </returns>
+		public virtual int Compare(object o1, object o2)
+		{
+			IOrdered o1lhs = o1 as IOrdered;
+			IOrdered o2rhs = o2 as IOrdered;
+			int lhs = o1lhs != null ? o1lhs.Order : Int32.MaxValue;
+			int rhs = o2rhs != null ? o2rhs.Order : Int32.MaxValue;
+            if (lhs < rhs)
+            {
+                return - 1;
+            }
+            else if (lhs > rhs)
+            {
+                return 1;
+            }
+            else
+            {
+                return 0;
+            }
+		}
+	}
+}
diff --git a/src/Spring/Spring.Core/Core/PropertyAccessException.cs b/src/Spring/Spring.Core/Core/PropertyAccessException.cs
new file mode 100644
index 00000000..275003a7
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/PropertyAccessException.cs
@@ -0,0 +1,159 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Superclass for exceptions related to a property access, such as a <see cref="System.Type"/>
+    /// mismatch or a target invocation exception.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: PropertyAccessException.cs,v 1.2 2007/07/31 03:47:22 markpollack Exp $</version>
+    [Serializable]
+    public abstract class PropertyAccessException : ReflectionException, IErrorCoded
+    {
+        /// <summary>
+        /// Returns the PropertyChangeEventArgs that resulted in the problem.
+        /// </summary>
+        public PropertyChangeEventArgs PropertyChangeArgs
+        {
+            get { return _propertyChangeEventArgs; }
+        }
+
+        /// <summary>
+        /// The string error code used to classify the error.
+        /// </summary>
+        public abstract string ErrorCode { get; }
+
+        private PropertyChangeEventArgs _propertyChangeEventArgs;
+
+        #region Methods
+
+        /// <summary>
+        /// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+        /// the data needed to serialize the target object.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+        /// with data.
+        /// </param>
+        /// <param name="context">
+        /// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+        /// for this serialization.
+        /// </param>
+        [SecurityPermission(SecurityAction.Demand, SerializationFormatter=true)]
+        public override void GetObjectData(
+            SerializationInfo info, StreamingContext context)
+        {
+            base.GetObjectData(info, context);
+            info.AddValue("PropertyChangeArgs", PropertyChangeArgs);
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Create a new instance of the PropertyAccessException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="propertyChangeEvent">Describes the change attempted on the property.</param>
+        protected PropertyAccessException(string message, PropertyChangeEventArgs propertyChangeEvent) : base(message)
+        {
+            _propertyChangeEventArgs = propertyChangeEvent;
+        }
+
+        /// <summary>
+        /// Create a new instance of the PropertyAccessException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="propertyChangeEvent">Describes the change attempted on the property.</param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        protected PropertyAccessException(string message, PropertyChangeEventArgs propertyChangeEvent, Exception rootCause)
+            : base(message, rootCause)
+        {
+            _propertyChangeEventArgs = propertyChangeEvent;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the PropertyAccessException class.
+        /// </summary>
+        protected PropertyAccessException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the PropertyAccessException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        protected PropertyAccessException(string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the PropertyAccessExceptionsException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        protected PropertyAccessException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the PropertyAccessExceptionsException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected PropertyAccessException(
+            SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+            _propertyChangeEventArgs = info.GetValue("PropertyChangeArgs", typeof (object)) as PropertyChangeEventArgs;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/PropertyChangeEventArgs.cs b/src/Spring/Spring.Core/Core/PropertyChangeEventArgs.cs
new file mode 100644
index 00000000..a861d711
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/PropertyChangeEventArgs.cs
@@ -0,0 +1,83 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Provides additional data for the <c>PropertyChanged</c> event.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Provides some additional properties over and above the name of the
+    /// property that has changed (which is inherited from the
+    /// <see cref="System.ComponentModel.PropertyChangedEventArgs"/> base class).
+    /// This allows calling code to determine whether or not a property has
+    /// actually changed (i.e. a <c>PropertyChanged</c> event may have been
+    /// raised, but the value itself may be equivalent).
+    /// </p>
+    /// </remarks>
+    /// <seealso cref="System.ComponentModel.PropertyChangedEventArgs"/>
+    [Serializable]
+    public class PropertyChangeEventArgs : PropertyChangedEventArgs
+    {
+        private object oldValue;
+        private object newValue;
+
+        /// <summary>
+        /// Create a new instance of the
+        /// <see cref="Spring.Core.PropertyChangeEventArgs"/> class.
+        /// </summary>
+        /// <param name="propertyName">
+        /// The name of the property that was changed.</param>
+        /// <param name="oldValue">The old value of the property.</param>
+        /// <param name="newValue">the new value of the property.</param>
+        public PropertyChangeEventArgs(
+            string propertyName, object oldValue, object newValue) : base(propertyName)
+        {
+            this.oldValue = oldValue;
+            this.newValue = newValue;
+        }
+
+        /// <summary>
+        /// Get the old value for the property.
+        /// </summary>
+        /// <seealso cref="System.ComponentModel.PropertyChangedEventArgs.PropertyName"/>
+        public object OldValue
+        {
+            get { return oldValue; }
+        }
+
+        /// <summary>
+        /// Get the new value of the property.
+        /// </summary>
+        /// <seealso cref="System.ComponentModel.PropertyChangedEventArgs.PropertyName"/>
+        public object NewValue
+        {
+            get { return newValue; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/RegularExpressionCriteria.cs b/src/Spring/Spring.Core/Core/RegularExpressionCriteria.cs
new file mode 100644
index 00000000..38160dad
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/RegularExpressionCriteria.cs
@@ -0,0 +1,143 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Text.RegularExpressions;
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// A base class for all <see cref="Spring.Core.ICriteria"/>
+    /// implementations that are regular expression based.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: RegularExpressionCriteria.cs,v 1.1 2007/07/31 01:35:07 markpollack Exp $</version>
+    public abstract class RegularExpressionCriteria : ICriteria
+    {
+        #region Constants
+
+        /// <summary>
+        /// The default pattern... matches absolutely anything.
+        /// </summary>
+        protected const string MatchAnyThingPattern = ".*";
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="RegularExpressionCriteria"/> class.
+        /// </summary>
+        protected RegularExpressionCriteria() : this(RegularExpressionCriteria.MatchAnyThingPattern)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="RegularExpressionCriteria"/> class.
+        /// </summary>
+        /// <param name="pattern">
+        /// The regular expression pattern to be applied.
+        /// </param>
+        protected RegularExpressionCriteria(string pattern)
+        {
+            Pattern = pattern;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The regular expression pattern to be applied.
+        /// </summary>
+        public string Pattern
+        {
+            get { return _pattern; }
+            set
+            {
+                _pattern = StringUtils.HasText(value) ?
+                           value : RegularExpressionCriteria.MatchAnyThingPattern;
+                Expression = new Regex(Pattern, Options);
+            }
+        }
+
+        /// <summary>
+        /// The regular expression options to be applied.
+        /// </summary>
+        public RegexOptions Options
+        {
+            get { return _options; }
+            set { _options = value; }
+        }
+
+        /// <summary>
+        /// The regular expression to be applied.
+        /// </summary>
+        public Regex Expression
+        {
+            get { return _expression; }
+            set { _expression = value; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+        /// this instance?
+        /// </summary>
+        /// <param name="datum">The datum to be checked by this criteria instance.</param>
+        /// <returns>
+        /// True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+        /// by this instance; false if not or the supplied <paramref name="datum"/> is null.
+        /// </returns>
+        public abstract bool IsSatisfied(object datum);
+
+        /// <summary>
+        /// Convenience method that calls the
+        /// <see cref="System.Text.RegularExpressions.Regex.IsMatch(string)"/>
+        /// on the supplied <paramref name="input"/>.
+        /// </summary>
+        /// <param name="input">The input to match against.</param>
+        /// <returns>True if the <paramref name="input"/> matches.</returns>
+        protected bool IsMatch(string input)
+        {
+            return Expression.IsMatch(input);
+        }
+
+        #endregion
+
+        #region Fields
+
+        private string _pattern;
+        private RegexOptions _options;
+        private Regex _expression;
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/RegularExpressionEventNameCriteria.cs b/src/Spring/Spring.Core/Core/RegularExpressionEventNameCriteria.cs
new file mode 100644
index 00000000..8bb72195
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/RegularExpressionEventNameCriteria.cs
@@ -0,0 +1,103 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Reflection;
+using System.Text.RegularExpressions;
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Criteria that is satisfied if the <c>Name</c> property of an
+    /// <see cref="System.Reflection.EventInfo"/> instance matches a
+    /// supplied regular expression pattern.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: RegularExpressionEventNameCriteria.cs,v 1.1 2007/07/31 01:35:07 markpollack Exp $</version>
+    public class RegularExpressionEventNameCriteria : RegularExpressionCriteria
+    {
+        #region Constants
+
+        /// <summary>
+        /// The default event name pattern... matches pretty much any event name.
+        /// </summary>
+        private const string MatchAnyEventNamePattern = ".+";
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="RegularExpressionEventNameCriteria"/> class.
+        /// </summary>
+        public RegularExpressionEventNameCriteria()
+            : this(RegularExpressionEventNameCriteria.MatchAnyEventNamePattern)
+        {
+            Options = RegexOptions.IgnoreCase;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="RegularExpressionEventNameCriteria"/> class.
+        /// </summary>
+        /// <param name="eventNamePattern">
+        /// The pattern that <see cref="System.Reflection.EventInfo"/> names
+        /// must match against in order to satisfy this criteria.
+        /// </param>
+        public RegularExpressionEventNameCriteria(string eventNamePattern)
+        {
+            Options = RegexOptions.IgnoreCase;
+            Pattern = StringUtils.HasText(eventNamePattern) ?
+                      eventNamePattern : RegularExpressionEventNameCriteria.MatchAnyEventNamePattern;
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+        /// this instance?
+        /// </summary>
+        /// <param name="datum">The datum to be checked by this criteria instance.</param>
+        /// <returns>
+        /// True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+        /// by this instance; false if not or the supplied <paramref name="datum"/> is null.
+        /// </returns>
+        public override bool IsSatisfied(object datum)
+        {
+            bool satisfied = false;
+            EventInfo evt = datum as EventInfo;
+            if (evt != null)
+            {
+                satisfied = IsMatch(evt.Name);
+            }
+            return satisfied;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/RegularExpressionMethodNameCriteria.cs b/src/Spring/Spring.Core/Core/RegularExpressionMethodNameCriteria.cs
new file mode 100644
index 00000000..0c619a71
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/RegularExpressionMethodNameCriteria.cs
@@ -0,0 +1,103 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Reflection;
+using System.Text.RegularExpressions;
+using Spring.Objects.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Criteria that is satisfied if the <c>Name</c> property of an
+    /// <see cref="System.Reflection.MethodInfo"/> instance matches a
+    /// supplied regular expression pattern.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: RegularExpressionMethodNameCriteria.cs,v 1.1 2007/07/31 01:35:07 markpollack Exp $</version>
+    public class RegularExpressionMethodNameCriteria : RegularExpressionCriteria
+    {
+        #region Constants
+
+        /// <summary>
+        /// The default method name pattern... matches pretty much any method name.
+        /// </summary>
+        private const string MatchAnyMethodNamePattern = ".+";
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="RegularExpressionMethodNameCriteria"/> class.
+        /// </summary>
+        public RegularExpressionMethodNameCriteria()
+            : this(RegularExpressionMethodNameCriteria.MatchAnyMethodNamePattern)
+        {
+            Options = RegexOptions.IgnoreCase;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="RegularExpressionMethodNameCriteria"/> class.
+        /// </summary>
+        /// <param name="methodNamePattern">
+        /// The pattern that <see cref="System.Reflection.MethodInfo"/> names
+        /// must match against in order to satisfy this criteria.
+        /// </param>
+        public RegularExpressionMethodNameCriteria(string methodNamePattern)
+        {
+            Options = RegexOptions.IgnoreCase;
+            Pattern = StringUtils.HasText(methodNamePattern) ?
+                      methodNamePattern : RegularExpressionMethodNameCriteria.MatchAnyMethodNamePattern;
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+        /// this instance?
+        /// </summary>
+        /// <param name="datum">The datum to be checked by this criteria instance.</param>
+        /// <returns>
+        /// True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+        /// by this instance; false if not or the supplied <paramref name="datum"/> is null.
+        /// </returns>
+        public override bool IsSatisfied(object datum)
+        {
+            bool satisfied = false;
+            MethodInfo method = datum as MethodInfo;
+            if (method != null)
+            {
+                satisfied = IsMatch(method.Name);
+            }
+            return satisfied;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/CredentialConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/CredentialConverter.cs
new file mode 100644
index 00000000..b699da91
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/CredentialConverter.cs
@@ -0,0 +1,125 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Net;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text.RegularExpressions;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Converts string representation of a credential for Web client authentication 
+    /// into an instance of <see cref="System.Net.NetworkCredential"/>.
+    /// </summary>
+    /// <example>
+    /// <p>
+    /// Find below some examples of the XML formatted strings that this
+    /// converter will sucessfully convert.
+    /// </p>
+    /// <code escaped="true">
+    /// <property name="credentials" value="Spring\bbaia:sprnet"/>
+    /// </code>
+    /// <code escaped="true">
+    /// <property name="credentials" value="bbaia:sprnet"/>
+    /// </code>
+    /// </example>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: CredentialConverter.cs,v 1.2 2007/12/07 15:14:40 bbaia Exp $</version>
+    public class CredentialConverter : TypeConverter
+    {
+        private readonly static Regex credentialRegex = new Regex(
+            @"(((?<domain>[\w_.]+)\\)?)(?<userName>([\w_.]+))((:(?<password>([\w_.]+)))?)",
+            RegexOptions.Compiled);
+
+        /// <summary>
+        /// Can we convert from the sourcetype 
+        /// to a <see cref="System.Net.NetworkCredential"/> instance ?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Currently only supports conversion from a <see cref="System.String"/> instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="sourceType">
+        /// A <see cref="System.Type"/> that represents the
+        /// <see cref="System.Type"/> you want to convert from.
+        /// </param>
+        /// <returns><see langword="true"/> if the conversion is possible.</returns>
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            return (sourceType == typeof(string));
+        }
+
+        /// <summary>
+        /// Convert from a <see cref="System.String"/> value to an
+        /// <see cref="System.Net.NetworkCredential"/> instance.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to use
+        /// as the current culture.
+        /// </param>
+        /// <param name="value">
+        /// The value that is to be converted.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.Net.NetworkCredential"/> instance if successful.
+        /// </returns>        
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                string credentials = (string)value;
+                Match m = credentialRegex.Match(credentials);
+
+                if (!m.Success || m.Value != credentials)
+                {
+                    throw new ArgumentException(String.Format("The credential '{0}' is not well-formed.", value));
+                }
+
+                // Get domain
+                string domain = m.Groups["domain"].Value;
+
+                // Get user name
+                string userName = m.Groups["userName"].Value;
+
+                // Get password
+                string password = m.Groups["password"].Value;
+
+                return new NetworkCredential(userName, password, domain);
+            }
+            return base.ConvertFrom(context, culture, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/CustomNumberConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/CustomNumberConverter.cs
new file mode 100644
index 00000000..f13c4b99
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/CustomNumberConverter.cs
@@ -0,0 +1,187 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+	/// <summary>
+	/// A custom <see cref="System.ComponentModel.TypeConverter"/> for any
+	/// primitive numeric type such as <see cref="System.Int32"/>,
+	/// <see cref="System.Single"/>, <see cref="System.Double"/>, etc.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Can use a given <see cref="System.Globalization.NumberFormatInfo"/> for
+	/// (locale-specific) parsing and rendering.
+	/// </p>
+	/// <p>
+	/// This is not meant to be used as a system
+	/// <see cref="System.ComponentModel.TypeConverter"/> but rather as a
+	/// locale-specific number converter within custom controller code, to
+	/// parse user-entered number strings into number properties of objects,
+	/// and render them in a UI form.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: CustomNumberConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+	public class CustomNumberConverter : TypeConverter
+	{
+		private Type _type;
+		private NumberFormatInfo _nfi;
+		private bool _allowEmpty;
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="CustomNumberConverter"/>
+		/// class.
+		/// </summary>
+		/// <param name="type">
+		/// The primitive numeric <see cref="System.Type"/> to convert to.
+		/// </param>
+		/// <param name="format">
+		/// The <see cref="System.Globalization.NumberFormatInfo"/> to use for
+		/// (locale-specific) parsing and rendering
+		/// </param>
+		/// <param name="allowEmpty">
+		/// Is an empty string allowed to be converted? If
+		/// <see langword="true"/>, an empty string value will be converted to
+		/// numeric 0.</param>
+		/// <exception cref="System.ArgumentException">
+		/// Id the supplied <paramref name="type"/> is not a primitive
+		/// <see cref="System.Type"/>.
+		/// </exception>
+		/// <seealso cref="System.Type.IsPrimitive"/>
+		public CustomNumberConverter(
+			Type type, NumberFormatInfo format, bool allowEmpty)
+		{
+			if (!type.IsPrimitive)
+			{
+				throw new ArgumentException(
+					"Property type must be a primitive type.");
+			}
+			this._type = type;
+			this._nfi = format;
+			this._allowEmpty = allowEmpty;
+		}
+
+		/// <summary>
+		/// Returns whether this converter can convert an object of one
+		/// <see cref="System.Type"/> to a <see cref="System.IO.FileInfo"/>
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Currently only supports conversion from a
+		/// <see cref="System.String"/> instance.
+		/// </p>
+		/// </remarks>
+		/// <param name="context">
+		/// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+		/// that provides a format context.
+		/// </param>
+		/// <param name="sourceType">
+		/// A <see cref="System.Type"/> that represents the
+		/// <see cref="System.Type"/> you want to convert from.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if the conversion is possible.
+		/// </returns>
+		public override bool CanConvertFrom(
+			ITypeDescriptorContext context, Type sourceType)
+		{
+			if (sourceType == typeof (string))
+			{
+				return true;
+			}
+			return base.CanConvertFrom(context, sourceType);
+		}
+
+		/// <summary>
+		/// Converts the specified object (a string) to the required primitive
+		/// type.
+		/// </summary>
+		/// <param name="context">
+		/// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+		/// that provides a format context.
+		/// </param>
+		/// <param name="culture">
+		/// The <see cref="System.Globalization.CultureInfo"/> to use
+		/// as the current culture. 
+		/// </param>
+		/// <param name="val">
+		/// The value that is to be converted.
+		/// </param>
+		/// <returns>A primitive representation of the string value.</returns>
+		public override object ConvertFrom(
+			ITypeDescriptorContext context, CultureInfo culture, object val)
+		{
+			if (val is string)
+			{
+				string value = val as string;
+				if (!StringUtils.HasText(value)
+					&& _allowEmpty)
+				{
+					value = "0";
+				}
+				if (_type.Equals(typeof (Int16)))
+				{
+					return Convert.ToInt16(value, _nfi);
+				}
+				else if (_type.Equals(typeof (UInt16)))
+				{
+					return Convert.ToUInt16(value, _nfi);
+				}
+				else if (_type.Equals(typeof (Int32)))
+				{
+					return Convert.ToInt32(value, _nfi);
+				}
+				else if (_type.Equals(typeof (UInt32)))
+				{
+					return Convert.ToUInt32(value, _nfi);
+				}
+				else if (_type.Equals(typeof (Int64)))
+				{
+					return Convert.ToInt64(value, _nfi);
+				}
+				else if (_type.Equals(typeof (UInt64)))
+				{
+					return Convert.ToUInt64(value, _nfi);
+				}
+				else if (_type.Equals(typeof (Single)))
+				{
+					return Convert.ToSingle(value, _nfi);
+				}
+				else if (_type.Equals(typeof (Double)))
+				{
+					return Convert.ToDouble(value, _nfi);
+				}
+			}
+			return base.ConvertFrom(context, culture, val);
+		}
+	}
+}
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/FileInfoConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/FileInfoConverter.cs
new file mode 100644
index 00000000..5533f958
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/FileInfoConverter.cs
@@ -0,0 +1,109 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Converter for <see cref="System.IO.FileInfo"/> instances.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    public class FileInfoConverter : TypeConverter
+    {
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.TypeConversion.FileInfoConverter"/> class.
+        /// </summary>
+        public FileInfoConverter () {}
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Returns whether this converter can convert an object of one
+        /// <see cref="System.Type"/> to a <see cref="System.IO.FileInfo"/>
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Currently only supports conversion from a
+        /// <see cref="System.String"/> instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="sourceType">
+        /// A <see cref="System.Type"/> that represents the
+        /// <see cref="System.Type"/> you want to convert from.
+        /// </param>
+        /// <returns>True if the conversion is possible.</returns>
+        public override bool CanConvertFrom (
+            ITypeDescriptorContext context, 
+            Type sourceType) 
+        {
+            if (sourceType == typeof (string)) 
+            {
+                return true;
+            }
+            return base.CanConvertFrom (context, sourceType);
+        }
+
+        /// <summary>
+        /// Convert from a string value to a <see cref="System.IO.FileInfo"/> instance.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to use
+        /// as the current culture. 
+        /// </param>
+        /// <param name="value">
+        /// The value that is to be converted.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.IO.FileInfo"/> if successful. 
+        /// </returns>
+        public override object ConvertFrom (
+            ITypeDescriptorContext context, 
+            CultureInfo culture, object value) 
+        {
+            if (value is string) 
+            {          
+                return new FileInfo(value as string);
+            }
+            return base.ConvertFrom (context, culture, value);
+        }
+        #endregion
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/NameValueConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/NameValueConverter.cs
new file mode 100644
index 00000000..b6556d00
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/NameValueConverter.cs
@@ -0,0 +1,159 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Configuration;
+using System.Globalization;
+using System.Xml;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+	/// <summary>
+	/// Custom <see cref="System.ComponentModel.TypeConverter"/> implementation for
+	/// <see cref="System.Collections.Specialized.NameValueCollection"/> objects.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Handles conversion from an <b>XML formatted string</b> to a
+	/// <see cref="System.Collections.Specialized.NameValueCollection"/> object
+	/// (see below for an example of the expected XML format).
+	/// </p>
+	/// <p>
+	/// This converter must be registered before it will be available. Standard
+	/// converters in this namespace are automatically registered by the
+	/// <see cref="Spring.Objects.ObjectWrapper"/> class.
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <p>
+	/// Find below some examples of the XML formatted strings that this
+	/// converter will sucessfully convert. Note that the name of the top level
+	/// (document) element is quite arbitrary... it is only the content that
+	/// matters (and which must be in the format
+	/// <c>&lt;add key="..." value="..."/&gt;</c>. For your continued sanity
+	/// though, you may wish to standardize on the top level name of
+	/// <c>'dictionary'</c> (although you are of course free to not do so).
+	/// </p>
+	/// <code escaped="true">
+	/// <dictionary>
+	///		<add key="host" value="localhost"/>
+	///		<add key="port" value="8080"/>
+	/// </dictionary>
+	/// </code>
+	/// <p>
+	/// The following example uses a different top level (document) element
+	/// name, but is equivalent to the first example.
+	/// </p>
+	/// <code escaped="true">
+	/// <web-configuration-parameters>
+	///		<add key="host" value="localhost"/>
+	///		<add key="port" value="8080"/>
+	/// </web-configuration-parameters>
+	/// </code>
+	/// </example>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: NameValueConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+	public class NameValueConverter : TypeConverter
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+        /// <see cref="Spring.Core.TypeConversion.NameValueConverter"/> class.
+		/// </summary>
+		public NameValueConverter()
+		{
+		}
+
+		#endregion
+
+		/// <summary>
+		/// Returns whether this converter can convert an object of one
+		/// <see cref="System.Type"/> to a
+		/// <see cref="System.Collections.Specialized.NameValueCollection"/>
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Currently only supports conversion from an
+		/// <b>XML formatted</b> <see cref="System.String"/> instance.
+		/// </p>
+		/// </remarks>
+		/// <param name="context">
+		/// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+		/// that provides a format context.
+		/// </param>
+		/// <param name="sourceType">
+		/// A <see cref="System.Type"/> that represents the
+		/// <see cref="System.Type"/> you want to convert from.
+		/// </param>
+		/// <returns>True if the conversion is possible.</returns>
+		public override bool CanConvertFrom(
+			ITypeDescriptorContext context,
+			Type sourceType)
+		{
+			if (sourceType == typeof (string))
+			{
+				return true;
+			}
+			return base.CanConvertFrom(context, sourceType);
+		}
+
+		/// <summary>
+		/// Convert from a string value to a
+		/// <see cref="System.Collections.Specialized.NameValueCollection"/> instance.
+		/// </summary>
+		/// <param name="context">
+		/// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+		/// that provides a format context.
+		/// </param>
+		/// <param name="culture">
+		/// The <see cref="System.Globalization.CultureInfo"/> to use
+		/// as the current culture. 
+		/// </param>
+		/// <param name="value">
+		/// The value that is to be converted.
+		/// </param>
+		/// <returns>
+		/// A <see cref="System.Collections.Specialized.NameValueCollection"/>
+		/// if successful. 
+		/// </returns>
+		public override object ConvertFrom(
+			ITypeDescriptorContext context,
+			CultureInfo culture, object value)
+		{
+			string text = value as string;
+			if (text != null)
+			{
+				XmlDocument doc = new XmlDocument();
+				doc.LoadXml(text);
+				return new NameValueSectionHandler()
+					.Create(null, null, doc.DocumentElement);
+			}
+			return base.ConvertFrom(context, culture, value);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/RGBColorConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/RGBColorConverter.cs
new file mode 100644
index 00000000..0356c04c
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/RGBColorConverter.cs
@@ -0,0 +1,170 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Converter for <see cref="System.Drawing.Color"/> from a comma separated
+    /// list of RBG values.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Please note that this class does <b>not</b> implement converting
+    /// to a comma separated list of RBG values from a
+    /// <see cref="System.Drawing.Color"/>.
+    /// </p>
+    /// </remarks>
+    /// <author>Federico Spinazzi</author>
+    /// <version>$Id: RGBColorConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+    public sealed class RGBColorConverter : TypeConverter
+    {
+        private const char ArgbSeparator = ',';
+
+        private const string DefaultAlpha = "255";
+
+        /// <summary>
+        /// Returns whether this converter can convert an object of one
+        /// <see cref="System.Type"/> to a 
+        /// <see cref="System.Drawing.Color"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Currently only supports conversion from a
+        /// <see cref="System.String"/> instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="sourceType">
+        /// A <see cref="System.Type"/> that represents the
+        /// <see cref="System.Type"/> you want to convert from.
+        /// </param>
+        /// <returns><see langword="true"/> if the conversion is possible.</returns>
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof (string))
+            {
+                return true;
+            }
+            return base.CanConvertFrom(context, sourceType);
+        }
+
+        /// <summary>
+        /// Converts the specified object (a string) a <see cref="System.Drawing.Color"/>
+        /// instance.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to use
+        /// as the current culture: currently ignored.
+        /// </param>
+        /// <param name="value">
+        /// The value that is to be converted, in "R,G,B", "A,R,G,B", or 
+        /// symbolic color name (<see cref="System.Drawing.KnownColor"/>).
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.Drawing.Color"/> representation of the string value.
+        /// </returns>
+        /// <exception cref="System.FormatException">
+        /// If the input string is not in a supported format, or is not one of the
+        /// predefined system colors (<see cref="System.Drawing.KnownColor"/>).
+        /// </exception>
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            string input = value as string;
+            if (StringUtils.HasText(input))
+            {
+                if (input.IndexOf(ArgbSeparator) > -1)
+                {
+                    string[] colorSplit = input.Split(ArgbSeparator);
+                    if (colorSplit.Length == 3)
+                    {
+                        return FromRgb(colorSplit);
+                    }
+                    else if (colorSplit.Length == 4)
+                    {
+                        return FromArgb(colorSplit);
+                    }
+                    else
+                    {
+                        throw new FormatException(
+                            "Input string is not in the correct format : '" + input + "'.");
+                    }
+                }
+                return FromName(input);
+            }
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        private static object FromRgb(string[] rgb)
+        {
+            return GetColorFrom(DefaultAlpha, rgb[0], rgb[1], rgb[2]);
+        }
+
+        private static object FromArgb(string[] argb)
+        {
+            return GetColorFrom(argb[0], argb[1], argb[2], argb[3]);
+        }
+
+        private static Color FromName(string name)
+        {
+            try
+            {
+                KnownColor color = (KnownColor) Enum.Parse(typeof (KnownColor), name);
+                return Color.FromKnownColor(color);
+            }
+            catch (Exception ex)
+            {
+                throw new FormatException(
+                    "Input string is not a known system color : '" + name + "'.", ex);
+            }
+        }
+
+        private static Color GetColorFrom(string alpha, string red, string green, string blue)
+        {
+            try
+            {
+                return Color.FromArgb(Int32.Parse(alpha), Int32.Parse(red), Int32.Parse(green), Int32.Parse(blue));
+            }
+            catch (Exception ex)
+            {
+                throw new FormatException(
+                    "Bad color format.", ex);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/RegexConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/RegexConverter.cs
new file mode 100644
index 00000000..d85abc37
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/RegexConverter.cs
@@ -0,0 +1,92 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text.RegularExpressions;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Converts string representation of a regular expression into an instance of <see cref="Regex"/>.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: RegexConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+    public class RegexConverter : TypeConverter
+    {
+        /// <summary>
+        /// Can we convert from the sourcetype to a <see cref="Regex"/>?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Currently only supports conversion from a <see cref="System.String"/> instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="sourceType">
+        /// A <see cref="System.Type"/> that represents the
+        /// <see cref="System.Type"/> you want to convert from.
+        /// </param>
+        /// <returns><see langword="true"/> if the conversion is possible.</returns>
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            return (sourceType == typeof(string));
+        }
+
+        /// <summary>
+        /// Convert from a <see cref="System.String"/> value to an
+        /// <see cref="Regex"/> instance.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to use
+        /// as the current culture.
+        /// </param>
+        /// <param name="value">
+        /// The value that is to be converted.
+        /// </param>
+        /// <returns>
+        /// A <see cref="Regex"/> if successful.
+        /// </returns>        
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                return new Regex(value as string);
+            }
+            else
+            {
+                return base.ConvertFrom(context, culture, value);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/RegistryKeyConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/RegistryKeyConverter.cs
new file mode 100644
index 00000000..f9aabd11
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/RegistryKeyConverter.cs
@@ -0,0 +1,164 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using Microsoft.Win32;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Converts string representation of the registry key
+    /// into <see cref="RegistryKey"/> instance.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: RegistryKeyConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+    public class RegistryKeyConverter : TypeConverter
+    {
+        /// <summary>
+        /// Can we convert from a the sourcetype to a <see cref="RegistryKey"/>?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Currently only supports conversion from a <see cref="System.String"/> instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="sourceType">
+        /// A <see cref="System.Type"/> that represents the
+        /// <see cref="System.Type"/> you want to convert from.
+        /// </param>
+        /// <returns><see langword="true"/> if the conversion is possible.</returns>
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return (sourceType == typeof(string));
+        }
+
+        /// <summary>
+        /// Convert from a <see cref="System.String"/> value to an
+        /// <see cref="RegistryKey"/> instance.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to use
+        /// as the current culture.
+        /// </param>
+        /// <param name="value">
+        /// The value that is to be converted.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.String"/> array if successful.
+        /// </returns>        
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            AssertUtils.ArgumentNotNull(value, "value");
+
+            if (value is string)
+            {
+                string keyName = (string) value;
+                AssertUtils.ArgumentHasText(keyName, "value");
+
+                string[] keys = StringUtils.Split(keyName, "\\", false, true);
+                RegistryKey key = GetRootKey(keys[0]);
+                for (int i = 1; i < keys.Length; i++)
+                {
+                    // open all sub-keys but the last one as read-only
+                    key = key.OpenSubKey(keys[i], (i == keys.Length - 1));
+                    if (key == null)
+                    {
+                        throw new ArgumentException("Registry key [" + GetPartialKeyName(keys, i) + "] does not exist.");
+                    }
+                }
+
+                return key;
+            }
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        /// <summary>
+        /// Generates partial registry key name.
+        /// </summary>
+        /// <param name="keys">
+        /// Key elements.
+        /// </param>
+        /// <param name="index">
+        /// Index of the last element to use.
+        /// </param>
+        /// <returns>
+        /// Friendly key name containing key element from 
+        /// 0 to <paramref name="index"/>, inclusive.
+        /// </returns>
+        private static string GetPartialKeyName(string[] keys, int index)
+        {
+            string keyName = "";
+            for (int i = 0; i <= index; i++)
+            {
+                keyName += (keys[i] + (i < index ? "\\" : ""));
+            }
+            return keyName;
+        }
+
+        /// <summary>
+        /// Returns <see cref="RegistryKey"/> for the specified
+        /// root hive name.
+        /// </summary>
+        /// <param name="name">
+        /// Root hive name.
+        /// </param>
+        /// <returns>
+        /// Registry key for the specified name.
+        /// </returns>
+        private static RegistryKey GetRootKey(string name)
+        {
+            switch (name)
+            {
+                case "HKEY_CURRENT_USER":
+                    return Registry.CurrentUser;
+                case "HKEY_LOCAL_MACHINE":
+                    return Registry.LocalMachine;
+                case "HKEY_CLASSES_ROOT":
+                    return Registry.ClassesRoot;
+                case "HKEY_USERS":
+                    return Registry.Users;
+                case "HKEY_PERFORMANCE_DATA":
+                    return Registry.PerformanceData;
+                case "HKEY_CURRENT_CONFIG":
+                    return Registry.CurrentConfig;
+                case "HKEY_DYN_DATA":
+                    return Registry.DynData;
+                default:
+                    throw new ArgumentException("Invalid root hive name [" + name + "].");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs
new file mode 100644
index 00000000..aaee91c2
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs
@@ -0,0 +1,158 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Reflection;
+using System.Resources;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+	/// <summary>
+	/// Converts a two part string, (resource name, assembly name)
+	/// to a ResourceManager instance.
+	/// </summary>
+	public class ResourceManagerConverter : TypeConverter
+	{
+		/// <summary>
+		/// This constant represents the name of the folder/assembly containing global resources.
+		/// </summary>
+	    public static readonly string APP_GLOBALRESOURCES_ASSEMBLYNAME = "App_GlobalResources";
+
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.TypeConversion.ResourceManagerConverter"/> class.
+        /// </summary>
+        public ResourceManagerConverter()
+        {
+        }
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Returns whether this converter can convert an object of one
+        /// <see cref="System.Type"/> to a
+        /// <see cref="System.Resources.ResourceManager"/>
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Currently only supports conversion from a
+        /// <see cref="System.String"/> instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="sourceType">
+        /// A <see cref="System.Type"/> that represents the
+        /// <see cref="System.Type"/> you want to convert from.
+        /// </param>
+        /// <returns>True if the conversion is possible.</returns>
+        public override bool CanConvertFrom (
+            ITypeDescriptorContext context, 
+            Type sourceType)
+        {
+            if (sourceType == typeof(string)) 
+            {
+                return true;
+            }
+            return base.CanConvertFrom(context, sourceType);
+        }
+
+        /// <summary>
+        /// Convert from a string value to a
+        /// <see cref="System.Resources.ResourceManager"/> instance.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to use
+        /// as the current culture. 
+        /// </param>
+        /// <param name="value">
+        /// The value that is to be converted.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.Resources.ResourceManager"/>
+        /// if successful. 
+        /// </returns>
+        /// <exception cref="ArgumentException">If the specified <paramref name="value"/> does not denote a valid resource</exception>
+        public override object ConvertFrom (
+            ITypeDescriptorContext context, 
+            CultureInfo culture, object value) 
+        {
+            if (value is string) 
+            {          
+                // convert incoming string into ResourceManager...
+                string[] resourceManagerDescription = StringUtils.DelimitedListToStringArray((string)value, ",");
+                if (resourceManagerDescription.Length != 2)
+                {
+                    throw new ArgumentException ("The string to specify a ResourceManager must be a comma delimited list of length two.  i.e. resourcename, assembly parial name.");
+                }
+                string resourceName = resourceManagerDescription[0].Trim();
+                if (resourceName != null && resourceName.Length == 0)
+                {
+                    throw new ArgumentException("Empty value set for the resource name in ResourceManager string.");
+                }
+                string assemblyName = resourceManagerDescription[1].Trim();
+                if (assemblyName != null && assemblyName.Length == 0)
+                {
+                    throw new ArgumentException("Empty value set for the assembly name in ResourceManager string.");
+                }
+#if NET_2_0
+                if (assemblyName == APP_GLOBALRESOURCES_ASSEMBLYNAME)
+                {
+                    try
+                    {
+                        Type globalResourcesType = TypeResolutionUtils.ResolveType(resourceName);
+                        // look both, NonPublic and Public properties (SPRNET-861)
+                        PropertyInfo resourceManagerProperty = globalResourcesType.GetProperty("ResourceManager", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static);
+                        return (ResourceManager) resourceManagerProperty.GetValue(globalResourcesType, null);
+                    }
+                    catch (TypeLoadException ex)
+                    {
+                        throw new ArgumentException("Could not load resources '{0}'", resourceName, ex);
+                    }
+                }
+                Assembly ass = Assembly.LoadWithPartialName(assemblyName);
+#else
+                Assembly ass = Assembly.LoadWithPartialName(assemblyName);
+#endif
+                if (ass == null)
+                {
+                    throw new ArgumentException("Could not find assembly with name = '" + assemblyName + "'.");
+                }
+                return new ResourceManager(resourceName, ass);
+            }
+            return base.ConvertFrom (context, culture, value);
+        }
+        #endregion
+	}
+}
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/RuntimeTypeConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/RuntimeTypeConverter.cs
new file mode 100644
index 00000000..e609cbc2
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/RuntimeTypeConverter.cs
@@ -0,0 +1,175 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+
+	/// <summary>
+	/// A custom <see cref="System.ComponentModel.TypeConverter"/> for
+	/// runtime type references.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Currently only supports conversion to and from a
+    /// <see cref="System.String"/>.
+    /// </p>
+    /// </remarks>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: RuntimeTypeConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+    public class RuntimeTypeConverter : TypeConverter
+    {
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.TypeConversion.RuntimeTypeConverter"/> class.
+        /// </summary>
+        public RuntimeTypeConverter () {}
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Returns whether this converter can convert an object of one
+        /// <see cref="System.Type"/> to the <see cref="System.Type"/>
+        /// of this converter.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Currently only supports conversion from a
+        /// <see cref="System.String"/> instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="sourceType">
+        /// A <see cref="System.Type"/> that represents the
+        /// <see cref="System.Type"/> you want to convert from.
+        /// </param>
+        /// <returns>True if the conversion is possible.</returns>
+        public override bool CanConvertFrom (
+            ITypeDescriptorContext context, 
+            Type sourceType) 
+        {
+            if (sourceType == typeof (string)) 
+            {
+                return true;
+            }
+            return base.CanConvertFrom (context, sourceType);
+        }
+
+        /// <summary>
+        /// Returns whether this converter can convert the object to the specified
+        /// <see cref="System.Type"/>.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="destinationType">
+        /// A <see cref="System.Type"/> that represents the
+        /// <see cref="System.Type"/> you want to convert to.
+        /// </param>
+        /// <returns>True if the conversion is possible.</returns>
+        public override bool CanConvertTo (
+            ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof (Type))
+            {
+                return true;
+            }
+            return base.CanConvertTo (context, destinationType);
+        }
+
+        /// <summary>
+        /// Converts the given value to the type of this converter.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to use
+        /// as the current culture. 
+        /// </param>
+        /// <param name="value">
+        /// The value that is to be converted.
+        /// </param>
+        /// <returns>
+        /// An <see cref="System.Object"/> that represents the converted value.
+        /// </returns>
+        public override object ConvertFrom (
+            ITypeDescriptorContext context, 
+            CultureInfo culture, object value) 
+        {
+            if (value is string) 
+            {
+                return TypeResolutionUtils.ResolveType(value as string);
+            }
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        /// <summary>
+        /// Converts the given value object to the specified type,
+        /// using the specified context and culture information.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to use
+        /// as the current culture. 
+        /// </param>
+        /// <param name="value">
+        /// The value that is to be converted.
+        /// </param>
+        /// <param name="destinationType">
+        /// The <see cref="System.Type"/> to convert the
+        /// <paramref name="value"/> parameter to.
+        /// </param>
+        /// <returns>
+        /// An <see cref="System.Object"/> that represents the converted value.
+        /// </returns>
+        public override object ConvertTo (
+            ITypeDescriptorContext context, 
+            CultureInfo culture, object value, Type destinationType) 
+        {  
+            if (value is Type
+                && destinationType == typeof (string)) 
+            {
+                return ((Type) value).AssemblyQualifiedName;
+            }
+            return base.ConvertTo (context, culture, value, destinationType);
+        }
+        #endregion
+	}
+}
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/StreamConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/StreamConverter.cs
new file mode 100644
index 00000000..de8f5b31
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/StreamConverter.cs
@@ -0,0 +1,126 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+using Spring.Core.IO;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+	/// <summary>
+	/// Converter for <see cref="System.IO.Stream"/> to directly set a
+	/// <see cref="System.IO.Stream"/> property.
+	/// </summary>
+	/// <author>Jurgen Hoeller</author>
+	/// <author>Mark Pollack (.NET)</author>
+	public class StreamConverter : TypeConverter
+	{
+        private ResourceConverter resourceConverter;
+
+        #region Constructors
+        /// <summary>
+        /// Create a new StreamConverter using the default
+        /// <see cref="Spring.Core.IO.ResourceConverter"/>.
+        /// </summary>
+		public StreamConverter() : this (new ResourceConverter())
+		{
+		}
+
+        /// <summary>
+        /// Create a new StreamConverter using the given
+        /// <see cref="Spring.Core.IO.ResourceConverter"/>.
+        /// </summary>
+        /// <param name="resourceConverter">
+        /// The <see cref="Spring.Core.IO.ResourceConverter"/> to use.</param>
+        public StreamConverter(ResourceConverter resourceConverter)
+        {
+            this.resourceConverter = resourceConverter == null
+                ? new ResourceConverter() : resourceConverter;
+        }
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Returns whether this converter can convert an object of one
+        /// <see cref="System.Type"/> to a <see cref="System.IO.Stream"/>
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Currently only supports conversion from a
+        /// <see cref="System.String"/> instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="sourceType">
+        /// A <see cref="System.Type"/> that represents the
+        /// <see cref="System.Type"/> you want to convert from.
+        /// </param>
+        /// <returns>True if the conversion is possible.</returns>
+        public override bool CanConvertFrom (
+            ITypeDescriptorContext context, 
+            Type sourceType) 
+        {
+            if (sourceType == typeof (string)) 
+            {
+                return true;
+            }
+            return base.CanConvertFrom (context, sourceType);
+        }
+
+        /// <summary>
+        /// Convert from a string value to a <see cref="System.IO.Stream"/> instance.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to use
+        /// as the current culture. 
+        /// </param>
+        /// <param name="val">
+        /// The value that is to be converted.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.IO.Stream"/> if successful. 
+        /// </returns>
+        public override object ConvertFrom (
+            ITypeDescriptorContext context, 
+            CultureInfo culture, object val) 
+        {
+            if (val is string) 
+            {
+                IResource resource = (IResource) resourceConverter.ConvertFrom(context, culture, val);
+                return resource.InputStream;
+            }
+            return base.ConvertFrom (context, culture, val);
+        }
+        #endregion
+	}
+}
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/StringArrayConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/StringArrayConverter.cs
new file mode 100644
index 00000000..51e284f6
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/StringArrayConverter.cs
@@ -0,0 +1,183 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+	/// <summary>
+	/// Converts a separated <see cref="System.String"/> to a <see cref="System.String"/>
+	/// array.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Defaults to using the <c>,</c> (comma) as the list separator. Note that the value
+	/// of the current <see cref="System.Globalization.CultureInfo.CurrentCulture"/> is
+	/// <b>not</b> used.
+	/// </p>
+	/// <p>
+	/// If you want to provide your own list separator, you can set the value of the
+    /// <see cref="Spring.Core.TypeConversion.StringArrayConverter.ListSeparator"/>
+	/// property to the value that you want. Please note that this value will be used
+	/// for <i>all</i> future conversions in preference to the default list separator.
+	/// </p>
+	/// <p>
+	/// Please note that the individual elements of a string will be passed
+	/// through <i>as is</i> (i.e. no conversion or trimming of surrounding
+	/// whitespace will be performed).
+	/// </p>
+	/// <p>
+	/// This <see cref="System.ComponentModel.TypeConverter"/> should be
+	/// automatically registered with any <see cref="Spring.Objects.IObjectWrapper"/>
+	/// implementations.
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <code language="C#">
+	/// public class StringArrayConverterExample 
+	/// {     
+	///     public static void Main()
+	///     {
+	///         StringArrayConverter converter = new StringArrayConverter();
+	///			
+	///			string csvWords = "This,Is,It";
+	///			string[] frankBoothWords = converter.ConvertFrom(csvWords);
+	///
+	///			// the 'frankBoothWords' array will have 3 elements, namely
+	///			// "This", "Is", "It".
+	///			
+	///			// please note that extraneous whitespace is NOT trimmed off
+	///			// in the current implementation...
+	///			string csv = "  Cogito ,ergo ,sum ";
+	///			string[] descartesWords = converter.ConvertFrom(csv);
+	///			
+	///			// the 'descartesWords' array will have 3 elements, namely
+	///			// "  Cogito ", "ergo ", "sum ".
+	///			// notice how the whitespace has NOT been trimmed.
+	///     }
+	/// }
+	/// </code>
+	/// </example>
+	/// <author></author>
+	/// <version>$Id: StringArrayConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+	public class StringArrayConverter : TypeConverter
+	{
+		private const string DefaultListSeparator = ",";
+
+		private string listSeparator = DefaultListSeparator;
+
+		/// <summary>
+		/// The value that will be used as the list separator when performing
+		/// conversions.
+		/// </summary>
+		/// <value>
+		/// A 'single' string character that will be used as the list separator
+		/// when performing conversions.
+		/// </value>
+		/// <exception cref="System.ArgumentException">
+		/// If the supplied value is not <cref lang="null"/> and is an empty
+		/// string, or has more than one character.
+		/// </exception>
+		public string ListSeparator
+		{
+			get { return this.listSeparator; }
+			set
+			{
+				if (value != null)
+				{
+					if (value.Length != 1)
+					{
+						throw new ArgumentException(
+							"The 'ListSeparator' must be exactly one character in length.");
+					}
+					listSeparator = value;
+				}
+				else
+				{
+					listSeparator = DefaultListSeparator;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Can we convert from a the sourcetype to a <see cref="System.String"/> array?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Currently only supports conversion from a <see cref="System.String"/> instance.
+		/// </p>
+		/// </remarks>
+		/// <param name="context">
+		/// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+		/// that provides a format context.
+		/// </param>
+		/// <param name="sourceType">
+		/// A <see cref="System.Type"/> that represents the
+		/// <see cref="System.Type"/> you want to convert from.
+		/// </param>
+		/// <returns><see langword="true"/> if the conversion is possible.</returns>
+		public override bool CanConvertFrom(
+			ITypeDescriptorContext context, Type sourceType)
+		{
+			if (sourceType == typeof (string))
+			{
+				return true;
+			}
+			return base.CanConvertFrom(context, sourceType);
+		}
+
+		/// <summary>
+		/// Convert from a <see cref="System.String"/> value to a
+		/// <see cref="System.String"/> array.
+		/// </summary>
+		/// <param name="context">
+		/// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+		/// that provides a format context.
+		/// </param>
+		/// <param name="culture">
+		/// The <see cref="System.Globalization.CultureInfo"/> to use
+		/// as the current culture.
+		/// </param>
+		/// <param name="value">
+		/// The value that is to be converted.
+		/// </param>
+		/// <returns>
+		/// A <see cref="System.String"/> array if successful.
+		/// </returns>        
+		public override object ConvertFrom(
+			ITypeDescriptorContext context, CultureInfo culture, object value)
+		{
+			string values = value as string;
+			if (values != null)
+			{
+				return StringUtils.DelimitedListToStringArray(values, this.ListSeparator);
+			}
+			return base.ConvertFrom(context, culture, value);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/TimeSpanConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/TimeSpanConverter.cs
new file mode 100644
index 00000000..347e4bd9
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/TimeSpanConverter.cs
@@ -0,0 +1,110 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Converter for <see cref="System.TimeSpan"/> instances.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: TimeSpanConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+    public class TimeSpanConverter : System.ComponentModel.TimeSpanConverter
+    {
+        #region Constants
+
+        private const string DaySpecifier = "d";
+        private const string HourSpecifier = "h";
+        private const string MinuteSpecifier = "m";
+        private const string SecondSpecifier = "s";
+        private const string MillisecondSpecifier = "ms";
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.TypeConversion.TimeSpanConverter"/> class.
+        /// </summary>
+        public TimeSpanConverter() { }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Convert from a string value to a <see cref="System.TimeSpan"/> instance.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to use
+        /// as the current culture. 
+        /// </param>
+        /// <param name="value">
+        /// The value that is to be converted.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.TimeSpan"/> if successful. 
+        /// </returns>
+        public override object ConvertFrom(
+            ITypeDescriptorContext context,
+            CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                try
+                {
+                    string timeSpan = ((string)value).ToLower();
+                    int specifierLengh = (timeSpan.EndsWith(MillisecondSpecifier)) ? 2 : 1;
+                    int time = int.Parse(timeSpan.Substring(0, timeSpan.Length - specifierLengh));
+
+                    switch (timeSpan.Substring(timeSpan.Length - specifierLengh, specifierLengh))
+                    {
+                        case MillisecondSpecifier:
+                            return TimeSpan.FromMilliseconds((double)time);
+                        case SecondSpecifier:
+                            return TimeSpan.FromSeconds((double)time);
+                        case MinuteSpecifier:
+                            return TimeSpan.FromMinutes((double)time);
+                        case HourSpecifier:
+                            return TimeSpan.FromHours((double)time);
+                        case DaySpecifier:
+                            return TimeSpan.FromDays((double)time);
+                    }
+                }
+                catch { }
+            }
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs b/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs
new file mode 100644
index 00000000..9fd69a6d
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/TypeConversionUtils.cs
@@ -0,0 +1,211 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Utility methods that are used to convert objects from one type into another.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: TypeConversionUtils.cs,v 1.4 2008/03/20 23:58:16 oakinger Exp $</version>
+    public class TypeConversionUtils
+    {
+        /// <summary>
+        /// Convert the value to the required <see cref="System.Type"/> (if necessary from a string).
+        /// </summary>
+        /// <param name="newValue">The proposed change value.</param>
+        /// <param name="requiredType">
+        /// The <see cref="System.Type"/> we must convert to.
+        /// </param>
+        /// <param name="propertyName">Property name, used for error reporting purposes...</param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If there is an internal error.
+        /// </exception>
+        /// <returns>The new value, possibly the result of type conversion.</returns>
+        public static object ConvertValueIfNecessary(Type requiredType, object newValue, string propertyName)
+        {
+            if (newValue != null)
+            {
+                // if it is assignable, return the value right away
+                if (IsAssignableFrom(newValue, requiredType))
+                {
+                    return newValue;
+                }
+
+                // if required type is an array, convert all the elements
+                if (requiredType != null && requiredType.IsArray)
+                {
+                    // convert individual elements to array elements
+                    Type componentType = requiredType.GetElementType();
+                    if (newValue is IList)
+                    {
+                        IList elements = (IList) newValue;
+                        return ToArrayWithTypeConversion(componentType, elements, propertyName);
+                    }
+                    else if (newValue is string)
+                    {
+                        if (requiredType.Equals(typeof(char[])))
+                        {
+                            return ((string) newValue).ToCharArray();
+                        }
+                        else
+                        {
+                            string[] elements = StringUtils.CommaDelimitedListToStringArray((string) newValue);
+                            return ToArrayWithTypeConversion(componentType, elements, propertyName);
+                        }
+                    }
+                    else if (!newValue.GetType().IsArray)
+                    {
+                        Array result = Array.CreateInstance(componentType, 1);
+                        object val = ConvertValueIfNecessary(componentType, newValue, propertyName);
+                        result.SetValue(val, 0);
+                        return result;
+                    }
+                }
+
+                // try to convert using type converter
+                try
+                {
+                    TypeConverter typeConverter = TypeConverterRegistry.GetConverter(requiredType);
+                    if (typeConverter != null && typeConverter.CanConvertFrom(newValue.GetType()))
+                    {
+                        try
+                        {
+                            newValue = typeConverter.ConvertFrom(newValue);
+                        }
+                        catch
+                        {
+                            if (newValue is string)
+                            {
+                                newValue = typeConverter.ConvertFromInvariantString((string)newValue);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        typeConverter = TypeConverterRegistry.GetConverter(newValue.GetType());
+                        if (typeConverter != null && typeConverter.CanConvertTo(requiredType))
+                        {
+                            newValue = typeConverter.ConvertTo(newValue, requiredType);
+                        }
+                        else
+                        {
+                            // look if it's an enum
+                            if (requiredType != null 
+                                && requiredType.IsEnum
+                                && (!(newValue is float)
+                                    && (!(newValue is double))))
+                            {
+                                // convert numeric value into enum's underlying type
+                                Type numericType = Enum.GetUnderlyingType(requiredType);
+                                newValue = Convert.ChangeType(newValue, numericType);
+
+                                if (Enum.IsDefined(requiredType, newValue))
+                                {
+                                    newValue = Enum.ToObject(requiredType, newValue);
+                                }
+                                else
+                                {
+                                    throw new TypeMismatchException(
+                                        CreatePropertyChangeEventArgs(propertyName, null, newValue), requiredType);
+                                }
+                            }
+                            else if (newValue is IConvertible)
+                            {
+                                // last resort - try ChangeType
+                                newValue = Convert.ChangeType(newValue, requiredType);
+                            }
+                            else
+                            {
+                                throw new TypeMismatchException(
+                                    CreatePropertyChangeEventArgs(propertyName, null, newValue), requiredType);                                                                    
+                            }
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    throw new TypeMismatchException(
+                        CreatePropertyChangeEventArgs(propertyName, null, newValue), requiredType, ex);
+                }
+                if (newValue == null)
+                {
+                    throw new TypeMismatchException(
+                        CreatePropertyChangeEventArgs(propertyName, null, newValue), requiredType);
+                }
+            }
+            return newValue;
+        }
+
+        private static object ToArrayWithTypeConversion(Type componentType, IList elements, string propertyName)
+        {
+            Array destination = Array.CreateInstance(componentType, elements.Count);
+            for (int i = 0; i < elements.Count; ++i)
+            {
+                object value = ConvertValueIfNecessary(componentType, elements[i], propertyName + "[" + i + "]");
+                destination.SetValue(value, i);
+            }
+            return destination;
+        }
+
+        private static bool IsAssignableFrom(object newValue, Type requiredType)
+        {
+            if (newValue is MarshalByRefObject)
+            {
+                //TODO see what type of type checking can be done.  May need to 
+                //preserve information when proxy was created by SaoServiceExporter.
+                return true;
+            }
+            if (requiredType == null)
+            {
+                return false;
+            }
+            return requiredType.IsAssignableFrom(newValue.GetType());
+        }
+
+        /// <summary>
+        /// Utility method to create a property change event.
+        /// </summary>
+        /// <param name="fullPropertyName">
+        /// The full name of the property that has changed.
+        /// </param>
+        /// <param name="oldValue">The property old value</param>
+        /// <param name="newValue">The property new value</param>
+        /// <returns>
+        /// A new <see cref="Spring.Core.PropertyChangeEventArgs"/>.
+        /// </returns>
+        private static PropertyChangeEventArgs CreatePropertyChangeEventArgs(string fullPropertyName, object oldValue,
+                                                                             object newValue)
+        {
+            return new PropertyChangeEventArgs(fullPropertyName, oldValue, newValue);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/TypeConverterRegistry.cs b/src/Spring/Spring.Core/Core/TypeConversion/TypeConverterRegistry.cs
new file mode 100644
index 00000000..caaf5cd0
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/TypeConverterRegistry.cs
@@ -0,0 +1,167 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Drawing;
+using System.IO;
+using System.Net;
+using System.Resources;
+using System.Text.RegularExpressions;
+using Microsoft.Win32;
+
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Registry class that allows users to register and retrieve type converters.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: TypeConverterRegistry.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+    public class TypeConverterRegistry
+    {
+        /// <summary>
+        /// Name of the .Net config section that contains Spring.Net type aliases.
+        /// </summary>
+        private const string TypeConvertersSectionName = "spring/typeConverters";
+
+        private static IDictionary converters = new Hashtable();
+        
+        /// <summary>
+        /// Registers standard and configured type converters.
+        /// </summary>
+        static TypeConverterRegistry()
+        {
+            lock (converters.SyncRoot)
+            {
+                converters[typeof(string[])] = new StringArrayConverter();
+                converters[typeof(Type)] = new RuntimeTypeConverter();
+                converters[typeof(Color)] = new RGBColorConverter();
+                converters[typeof(Uri)] = new UriConverter();
+                converters[typeof(FileInfo)] = new FileInfoConverter();
+                converters[typeof(Stream)] = new StreamConverter();
+                converters[typeof(NameValueCollection)] = new NameValueConverter();
+                converters[typeof(ResourceManager)] = new ResourceManagerConverter();
+                converters[typeof(Regex)] = new RegexConverter();
+                converters[typeof(TimeSpan)] = new TimeSpanConverter();
+                converters[typeof(ICredentials)] = new CredentialConverter();
+                converters[typeof(NetworkCredential)] = new CredentialConverter();
+                converters[typeof(RegistryKey)] = new RegistryKeyConverter();
+        
+                // register user-defined type converters
+                ConfigurationUtils.GetSection(TypeConvertersSectionName);
+            }
+        }
+        
+        /// <summary>
+        /// Returns <see cref="TypeConverter"/> for the specified type.
+        /// </summary>
+        /// <param name="type">Type to get the converter for.</param>
+        /// <returns>a type converter for the specified type.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="type"/> is <c>null</c>.</exception>
+        public static TypeConverter GetConverter(Type type)
+        {
+            AssertUtils.ArgumentNotNull(type, "type");
+
+            TypeConverter converter = (TypeConverter) converters[type];
+            if (converter == null)
+            {
+                if (type.IsEnum)
+                {
+                    converter = new EnumConverter(type);
+                }
+                else
+                {
+                    converter = TypeDescriptor.GetConverter(type);
+                }
+            }
+            
+            return converter;
+        }
+        
+        /// <summary>
+        /// Registers <see cref="TypeConverter"/> for the specified type.
+        /// </summary>
+        /// <param name="type">Type to register the converter for.</param>
+        /// <param name="converter">Type converter to register.</param>
+        /// <exception cref="ArgumentNullException">If either of arguments is <c>null</c>.</exception>
+        public static void RegisterConverter(Type type, TypeConverter converter)
+        {
+            AssertUtils.ArgumentNotNull(type, "type");
+            AssertUtils.ArgumentNotNull(converter, "converter");
+
+            lock (converters.SyncRoot)
+            {
+                converters[type] = converter;
+            }
+        }
+
+        /// <summary>
+        /// Registers <see cref="TypeConverter"/> for the specified type.
+        /// </summary>
+        /// <remarks>
+        /// This is a convinience method that accepts the names of both
+        /// type to register converter for and the converter itself,
+        /// resolves them using <see cref="TypeRegistry"/>, creates an
+        /// instance of type converter and calls overloaded
+        /// <see cref="RegisterConverter(Type,TypeConverter)"/> method.
+        /// </remarks>
+        /// <param name="typeName">Type name of the type to register the converter for (can be a type alias).</param>
+        /// <param name="converterTypeName">Type name of the type converter to register (can be a type alias).</param>
+        /// <exception cref="ArgumentNullException">If either of arguments is <c>null</c> or empty string.</exception>
+        /// <exception cref="TypeLoadException">
+        /// If either of arguments fails to resolve to a valid <see cref="Type"/>.
+        /// </exception>
+        /// <exception cref="ArgumentException">
+        /// If type converter does not derive from <see cref="TypeConverter"/> or if it cannot be instantiated.
+        /// </exception>
+        public static void RegisterConverter(string typeName, string converterTypeName)
+        {
+            AssertUtils.ArgumentHasText(typeName, "typeName");
+            AssertUtils.ArgumentHasText(converterTypeName, "converterTypeName");
+            
+            try
+            {
+                Type type = TypeResolutionUtils.ResolveType(typeName);
+                Type converterType = TypeResolutionUtils.ResolveType(converterTypeName);
+                if (!typeof(TypeConverter).IsAssignableFrom(converterType))
+                {
+                    throw new ArgumentException(
+                            "Type specified as a 'converterTypeName' does not inherit from System.ComponentModel.TypeConverter");
+                }
+                RegisterConverter(type,(TypeConverter) ObjectUtils.InstantiateType(converterType));
+            }
+            catch (FatalReflectionException e)
+            {
+                throw new ArgumentException("Failed to create an instance of the specified type converter.", e);
+            }
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/UniqueKeyConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/UniqueKeyConverter.cs
new file mode 100644
index 00000000..5bcd16be
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/UniqueKeyConverter.cs
@@ -0,0 +1,162 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Importsusing System;
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Converts between instances of <see cref="UniqueKey"/> and their string representations.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: UniqueKeyConverter.cs,v 1.1 2007/08/22 20:17:35 oakinger Exp $</version>
+    public class UniqueKeyConverter : TypeConverter
+    {
+        /// <summary>
+        /// Can we convert from the sourcetype to a <see cref="UniqueKey"/>?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Currently only supports conversion from a <see cref="System.String"/> instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/> that provides a format context.
+        /// </param>
+        /// <param name="sourceType">
+        /// A <see cref="System.Type"/> that represents the <see cref="System.Type"/> you want to convert from.
+        /// </param>
+        /// <returns><see langword="true"/> if the conversion is possible.</returns>
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            return (typeof(string)==sourceType || typeof(UniqueKey)==sourceType);
+        }
+
+        /// <summary>
+        /// Convert from a <see cref="System.String"/> value to an <see cref="UniqueKey"/> instance.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to use
+        /// as the current culture.
+        /// </param>
+        /// <param name="value">
+        /// The value that is to be converted.
+        /// </param>
+        /// <returns>
+        /// A <see cref="UniqueKey"/> if successful, <see langword="null"/> otherwise.
+        /// </returns>        
+        ///<exception cref="T:System.NotSupportedException">The conversion cannot be performed. </exception>
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value == null) return null;
+
+            if (!CanConvertFrom(context, value.GetType()))
+            {
+                throw new NotSupportedException(string.Format("Conversion from value of type '{0}' is not supported", value.GetType().FullName));
+            }
+
+            if (value is string)
+            {
+                return new UniqueKey(value as string);
+            }
+            else if (value is UniqueKey)
+            {
+                return value;
+            }
+
+            throw new NotSupportedException(string.Format("Cannot convert from value of type '{0}' to '{1}'", value.GetType().FullName, typeof(UniqueKey).FullName));
+        }
+
+        ///<summary>
+        ///Returns whether this converter can convert the object to the specified type, using the specified context.
+        ///</summary>
+        ///<param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext"></see> that provides a format context. </param>
+        ///<param name="destinationType">A <see cref="T:System.Type"></see> that represents the type you want to convert to. </param>
+        ///<returns>
+        ///true if this converter can perform the conversion; otherwise, false.
+        ///</returns>
+        /// <remarks>
+        /// At the moment only conversion to string is supported.
+        /// </remarks>
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            return (typeof(string)==destinationType || typeof(UniqueKey)==destinationType);
+        }
+
+        ///<summary>
+        ///Converts the given value object to the specified type, using the specified context and culture information.
+        ///</summary>
+        ///
+        ///<returns>
+        ///An <see cref="T:System.Object"></see> that represents the converted value.
+        ///</returns>
+        ///
+        ///<param name="culture">A <see cref="T:System.Globalization.CultureInfo"></see>. If null is passed, the current culture is assumed. </param>
+        ///<param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext"></see> that provides a format context. </param>
+        ///<param name="destinationType">The <see cref="T:System.Type"></see> to convert the value parameter to. </param>
+        ///<param name="value">The <see cref="T:System.Object"></see> to convert. </param>
+        ///<exception cref="T:System.NotSupportedException">The conversion cannot be performed. </exception>
+        ///<exception cref="T:System.ArgumentNullException">The destinationType parameter is null. </exception>
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            // check destinationType
+            if (destinationType == null)
+            {
+                throw new ArgumentNullException("destinationType", "destinationType must not be null");
+            }
+            if (!CanConvertTo(context, destinationType))
+            {
+                throw new NotSupportedException(string.Format("conversion to destinationType '{0}' is not supported.", destinationType.FullName));
+            }
+
+            // value must either be null or a UniqueKey
+            if ( (value != null) && (typeof(UniqueKey) != value.GetType()) )
+            {
+                throw new NotSupportedException(string.Format("value is not of type '{0}'", typeof(UniqueKey).FullName));
+            }
+
+            if (value == null) return null;
+
+            if (typeof(string)==destinationType)
+            {
+                return (value).ToString();
+            }
+            else if (typeof(UniqueKey)==destinationType)
+            {
+                return value;
+            }
+
+            throw new NotSupportedException(string.Format("destinationType must be '{0}' but was '{1}'", typeof(string).FullName, destinationType));
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeConversion/UriConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/UriConverter.cs
new file mode 100644
index 00000000..9c681263
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeConversion/UriConverter.cs
@@ -0,0 +1,114 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+	/// <summary>
+	/// Converter for <see cref="System.Uri"/> instances.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: UriConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+	public class UriConverter : TypeConverter
+	{
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Core.TypeConversion.UriConverter"/> class.
+        /// </summary>
+        public UriConverter () {}
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Returns whether this converter can convert an object of one
+        /// <see cref="System.Type"/> to a <see cref="System.Uri"/>
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Currently only supports conversion from a
+        /// <see cref="System.String"/> instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="sourceType">
+        /// A <see cref="System.Type"/> that represents the
+        /// <see cref="System.Type"/> you want to convert from.
+        /// </param>
+        /// <returns>True if the conversion is possible.</returns>
+        public override bool CanConvertFrom (
+            ITypeDescriptorContext context, 
+            Type sourceType) 
+        {
+            if (sourceType == typeof (string)) 
+            {
+                return true;
+            }
+            return base.CanConvertFrom (context, sourceType);
+        }
+
+        /// <summary>
+        /// Convert from a string value to a <see cref="System.Uri"/> instance.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to use
+        /// as the current culture. 
+        /// </param>
+        /// <param name="value">
+        /// The value that is to be converted.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.Uri"/> if successful. 
+        /// </returns>
+        public override object ConvertFrom (
+            ITypeDescriptorContext context, 
+            CultureInfo culture, object value) 
+        {
+            if (value is string) 
+            {
+                try 
+                {
+                    return new Uri(value as string);
+                }
+                catch (UriFormatException ex)
+                {
+                    throw new ArgumentException("Malformed URL: ", ex);
+                }
+            }
+            return base.ConvertFrom (context, culture, value);
+        }
+        #endregion
+	}
+}
diff --git a/src/Spring/Spring.Core/Core/TypeMismatchException.cs b/src/Spring/Spring.Core/Core/TypeMismatchException.cs
new file mode 100644
index 00000000..c5effa58
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeMismatchException.cs
@@ -0,0 +1,158 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using System.Text;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Exception thrown on a <see cref="System.Type"/> mismatch when trying to set a property
+    /// or resolve an argument to a method invocation.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: TypeMismatchException.cs,v 1.1 2007/07/31 00:08:42 markpollack Exp $</version>
+    [Serializable]
+    public class TypeMismatchException : PropertyAccessException
+    {
+        /// <summary>
+        /// The string error code used to classify the exception.
+        /// </summary>
+        public override string ErrorCode
+        {
+            get { return "typeMismatch"; }
+        }
+
+        /// <summary>
+        /// Creates a new instance of the TypeMismatchException class.
+        /// </summary>
+        public TypeMismatchException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the TypeMismatchException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public TypeMismatchException(string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the TypeMismatchException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public TypeMismatchException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the TypeMismatchException class describing the
+        /// property and required type that could not used to set a property on the target object.
+        /// </summary>
+        /// <param name="propertyChangeEventArgs">
+        /// The description of the property that was to be changed.
+        /// </param>
+        /// <param name="requiredType">The target conversion type.</param>
+        public TypeMismatchException(
+            PropertyChangeEventArgs propertyChangeEventArgs, Type requiredType) :
+                base(BuildMessage(propertyChangeEventArgs, requiredType), propertyChangeEventArgs)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the TypeMismatchException class describing the
+        /// property, required type, and underlying exception that could not be used
+        /// to set a property on the target object.
+        /// </summary>
+        /// <param name="propertyChangeEventArgs">
+        /// The description of the property that was to be changed.
+        /// </param>
+        /// <param name="requiredType">The target conversion type.</param>
+        /// <param name="rootCause">The underlying exception.</param>
+        public TypeMismatchException(
+            PropertyChangeEventArgs propertyChangeEventArgs, Type requiredType, Exception rootCause) :
+                base(BuildMessage(propertyChangeEventArgs, requiredType), propertyChangeEventArgs, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the TypeMismatchException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected TypeMismatchException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        private static string BuildMessage(PropertyChangeEventArgs propertyChangeEventArgs, Type requiredType)
+        {
+            StringBuilder message = new StringBuilder();
+            message.Append("Cannot convert property value of type [");
+            if (propertyChangeEventArgs != null && propertyChangeEventArgs.NewValue != null)
+            {
+                message.Append(propertyChangeEventArgs.NewValue.GetType().FullName);
+            }
+            else
+            {
+                message.Append("null");
+            }
+            message.Append("] to required type [");
+            if (requiredType != null)
+            {
+                message.Append(requiredType.FullName);
+            }
+            else
+            {
+                message.Append("null");
+            }
+            message.Append("] for property '");
+            if (propertyChangeEventArgs != null && propertyChangeEventArgs.PropertyName != null)
+            {
+                message.Append(propertyChangeEventArgs.PropertyName);
+            }
+            message.Append("'.");
+            return message.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeResolution/CachedTypeResolver.cs b/src/Spring/Spring.Core/Core/TypeResolution/CachedTypeResolver.cs
new file mode 100644
index 00000000..fb26323b
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeResolution/CachedTypeResolver.cs
@@ -0,0 +1,125 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeResolution
+{
+	/// <summary>
+	/// Resolves (instantiates) a <see cref="System.Type"/> by it's (possibly
+	/// assembly qualified) name, and caches the <see cref="System.Type"/>
+	/// instance against the type name.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <author>Bruno Baia</author>
+    /// <author>Erich Eichinger</author>
+	/// <version>$Id: CachedTypeResolver.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+	public class CachedTypeResolver : ITypeResolver
+	{
+		/// <summary>
+		/// The cache, mapping type names (<see cref="System.String"/> instances) against
+		/// <see cref="System.Type"/> instances.
+		/// </summary>
+		private IDictionary typeCache = new HybridDictionary();
+
+		private ITypeResolver typeResolver;
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="Spring.Core.TypeResolution.CachedTypeResolver"/> class.
+		/// </summary>
+		/// <param name="typeResolver">
+		/// The <see cref="Spring.Core.TypeResolution.ITypeResolver"/> that this instance will delegate
+		/// actual <see cref="System.Type"/> resolution to if a <see cref="System.Type"/>
+		/// cannot be found in this instance's <see cref="System.Type"/> cache.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="typeResolver"/> is <see langword="null"/>.
+		/// </exception>
+		public CachedTypeResolver(ITypeResolver typeResolver)
+		{
+			AssertUtils.ArgumentNotNull(typeResolver, "typeResolver");
+			this.typeResolver = typeResolver;
+		}
+
+		/// <summary>
+		/// Resolves the supplied <paramref name="typeName"/> to a
+		/// <see cref="System.Type"/>
+		/// instance.
+		/// </summary>
+		/// <param name="typeName">
+		/// The (possibly partially assembly qualified) name of a
+		/// <see cref="System.Type"/>.
+		/// </param>
+		/// <returns>
+		/// A resolved <see cref="System.Type"/> instance.
+		/// </returns>
+		/// <exception cref="System.TypeLoadException">
+		/// If the supplied <paramref name="typeName"/> could not be resolved
+		/// to a <see cref="System.Type"/>.
+		/// </exception>
+		public Type Resolve(string typeName)
+		{
+			if (StringUtils.IsNullOrEmpty(typeName))
+			{
+				throw BuildTypeLoadException(typeName);
+			}
+			Type type = null;
+			try
+			{
+                lock (this.typeCache.SyncRoot)
+                {
+                    type = this.typeCache[typeName] as Type;
+                    if (type == null)
+                    {
+                        type = this.typeResolver.Resolve(typeName);
+                        this.typeCache[typeName] = type;
+                    }
+                }
+			}
+			catch (Exception ex)
+			{
+				if (ex is TypeLoadException)
+				{
+					throw;
+				}
+				throw BuildTypeLoadException(typeName, ex);
+			}
+			return type;
+		}
+
+		private static TypeLoadException BuildTypeLoadException(string typeName)
+		{
+			return new TypeLoadException("Could not load type from string value '" + typeName + "'.");
+		}
+
+        private static TypeLoadException BuildTypeLoadException(string typeName, Exception ex)
+        {
+            return new TypeLoadException("Could not load type from string value '" + typeName + "'.", ex);
+        }
+	}
+}
diff --git a/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs b/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs
new file mode 100644
index 00000000..f43e3809
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs
@@ -0,0 +1,223 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System.Collections;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeResolution
+{
+    /// <summary>
+    /// Holder for the generic arguments when using type parameters.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Type parameters can be applied to classes, interfaces, 
+    /// structures, methods, delegates, etc...
+    /// </p>
+    /// </remarks>
+    public class GenericArgumentsHolder
+    {
+        #region Constants
+
+        /// <summary>
+        /// The generic arguments prefix.
+        /// </summary>
+        public const char GenericArgumentsPrefix = '<';
+
+        /// <summary>
+        /// The generic arguments suffix.
+        /// </summary>
+        public const char GenericArgumentsSuffix = '>';
+
+        /// <summary>
+        /// The character that separates a list of generic arguments.
+        /// </summary>
+        public const char GenericArgumentsSeparator = ',';
+
+        #endregion
+
+        #region Fields
+
+        private string unresolvedGenericTypeName;
+        private string unresolvedGenericMethodName;
+        private string[] unresolvedGenericArguments;
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the GenericArgumentsHolder class.
+        /// </summary>
+        /// <param name="value">
+        /// The string value to parse looking for a generic definition
+        /// and retrieving its generic arguments.
+        /// </param>
+        public GenericArgumentsHolder(string value)
+        {
+            ParseGenericArguments(value);
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The (unresolved) generic type name portion 
+        /// of the original value when parsing a generic type.
+        /// </summary>
+        public string GenericTypeName
+        {
+            get { return unresolvedGenericTypeName; }
+        }
+
+        /// <summary>
+        /// The (unresolved) generic method name portion 
+        /// of the original value when parsing a generic method.
+        /// </summary>
+        public string GenericMethodName
+        {
+            get { return unresolvedGenericMethodName; }
+        }
+
+        /// <summary>
+        /// Is the string value contains generic arguments ?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// A generic argument can be a type parameter or a type argument.
+        /// </p>
+        /// </remarks>
+        public bool ContainsGenericArguments
+        {
+            get
+            {
+                return (unresolvedGenericArguments != null &&
+                    unresolvedGenericArguments.Length > 0);
+            }
+        }
+
+        /// <summary>
+        /// Is generic arguments only contains type parameters ?
+        /// </summary>
+        public bool IsGenericDefinition
+        {
+            get
+            {
+                if (unresolvedGenericArguments == null)
+                    return false;
+
+                foreach (string arg in unresolvedGenericArguments)
+                {
+                    if (arg.Length > 0)
+                        return false;
+                }
+                return true;
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Returns an array of unresolved generic arguments types.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// A empty string represents a type parameter that 
+        /// did not have been substituted by a specific type.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// An array of strings that represents the unresolved generic 
+        /// arguments types or an empty array if not generic.
+        /// </returns>
+        public string[] GetGenericArguments()
+        {
+            if (unresolvedGenericArguments == null)
+                return StringUtils.EmptyStrings;
+
+            return unresolvedGenericArguments;
+        }
+
+        private void ParseGenericArguments(string originalString)
+        {
+            int argsStartIndex
+                = originalString.IndexOf(GenericArgumentsPrefix);
+            if (argsStartIndex < 0)
+            {
+                unresolvedGenericTypeName = originalString;
+                unresolvedGenericMethodName = originalString;
+            }
+            else
+            {
+                int argsEndIndex =
+                    originalString.LastIndexOf(GenericArgumentsSuffix);
+                if (argsEndIndex != -1)
+                {
+                    unresolvedGenericMethodName = originalString.Remove(
+                        argsStartIndex, argsEndIndex - argsStartIndex + 1);
+
+                    SplitGenericArguments(originalString.Substring(
+                        argsStartIndex + 1, argsEndIndex - argsStartIndex - 1));
+
+                    unresolvedGenericTypeName = originalString.Replace(
+                        originalString.Substring(argsStartIndex, argsEndIndex - argsStartIndex + 1),
+                        "`" + unresolvedGenericArguments.Length);
+                }
+            }
+        }
+
+        private void SplitGenericArguments(string originalArgs)
+        {
+            IList args = new ArrayList();
+
+            int index = 0;
+            int cursor = originalArgs.IndexOf(GenericArgumentsSeparator, index);
+            while (cursor != -1)
+            {
+                string arg = originalArgs.Substring(index, cursor - index);
+                if (arg.Split(GenericArgumentsPrefix).Length ==
+                    arg.Split(GenericArgumentsSuffix).Length)
+                {
+                    args.Add(arg.Trim());
+                    index = cursor + 1;
+                }
+                cursor = originalArgs.IndexOf(GenericArgumentsSeparator, cursor + 1);
+            }
+            args.Add(originalArgs.Substring(index, originalArgs.Length - index).Trim());
+
+            unresolvedGenericArguments = new string[args.Count];
+            args.CopyTo(unresolvedGenericArguments, 0);
+        }
+
+        #endregion
+    }
+}
+
+#endif
diff --git a/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs b/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs
new file mode 100644
index 00000000..b5fe9425
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs
@@ -0,0 +1,101 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeResolution
+{
+    /// <summary>
+    /// Resolves a generic <see cref="System.Type"/> by name.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: GenericTypeResolver.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+    public class GenericTypeResolver : TypeResolver
+    {
+        /// <summary>
+        /// Resolves the supplied generic <paramref name="typeName"/> to a
+        /// <see cref="System.Type"/> instance.
+        /// </summary>
+        /// <param name="typeName">
+        /// The unresolved (possibly generic) name of a <see cref="System.Type"/>.
+        /// </param>
+        /// <returns>
+        /// A resolved <see cref="System.Type"/> instance.
+        /// </returns>
+        /// <exception cref="System.TypeLoadException">
+        /// If the supplied <paramref name="typeName"/> could not be resolved
+        /// to a <see cref="System.Type"/>.
+        /// </exception>
+        public override Type Resolve(string typeName)
+        {
+            if (StringUtils.IsNullOrEmpty(typeName))
+            {
+                throw BuildTypeLoadException(typeName);
+            }
+            GenericArgumentsHolder genericInfo = new GenericArgumentsHolder(typeName);
+            Type type = null;
+            try
+            {
+                if (genericInfo.ContainsGenericArguments)
+                {
+                    type = TypeResolutionUtils.ResolveType(genericInfo.GenericTypeName);
+                    if (!genericInfo.IsGenericDefinition)
+                    {
+                        string[] unresolvedGenericArgs = genericInfo.GetGenericArguments();
+                        Type[] genericArgs = new Type[unresolvedGenericArgs.Length];
+                        for (int i = 0; i < unresolvedGenericArgs.Length; i++)
+                        {
+                            genericArgs[i] = TypeResolutionUtils.ResolveType(unresolvedGenericArgs[i]);
+                        }
+                        type = type.MakeGenericType(genericArgs);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is TypeLoadException)
+                {
+                    throw;
+                }
+                throw BuildTypeLoadException(typeName, ex);
+            }
+
+            if (type == null)
+            {
+                type = base.Resolve(typeName);
+            }
+
+            return type;
+        }
+    }
+}
+
+#endif
diff --git a/src/Spring/Spring.Core/Core/TypeResolution/ITypeResolver.cs b/src/Spring/Spring.Core/Core/TypeResolution/ITypeResolver.cs
new file mode 100644
index 00000000..28b3d639
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeResolution/ITypeResolver.cs
@@ -0,0 +1,62 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Core.TypeResolution
+{
+	/// <summary>
+	/// Resolves a <see cref="System.Type"/> by name.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The rationale behind the creation of this interface is to centralise
+	/// the resolution of type names to <see cref="System.Type"/> instances
+	/// beyond that offered by the plain vanilla
+	/// <see cref="System.Type.GetType(string)"/> method call.
+	/// </p>
+	/// </remarks>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: ITypeResolver.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+	public interface ITypeResolver
+	{
+		/// <summary>
+		/// Resolves the supplied <paramref name="typeName"/> to a
+		/// <see cref="System.Type"/>
+		/// instance.
+		/// </summary>
+		/// <param name="typeName">
+		/// The (possibly partially assembly qualified) name of a
+		/// <see cref="System.Type"/>.
+		/// </param>
+		/// <returns>
+		/// A resolved <see cref="System.Type"/> instance.
+		/// </returns>
+		/// <exception cref="System.TypeLoadException">
+		/// If the supplied <paramref name="typeName"/> could not be resolved
+		/// to a <see cref="System.Type"/>.
+		/// </exception>
+		Type Resolve(string typeName);
+	}
+}
diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeAssemblyHolder.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeAssemblyHolder.cs
new file mode 100644
index 00000000..38fa0f63
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeAssemblyHolder.cs
@@ -0,0 +1,117 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeResolution
+{
+    /// <summary>
+    /// Holds data about a <see cref="System.Type"/> and it's
+    /// attendant <see cref="System.Reflection.Assembly"/>.
+    /// </summary>
+    public class TypeAssemblyHolder
+    {
+        #region Constants
+
+        /// <summary>
+        /// The string that separates a <see cref="System.Type"/> name
+        /// from the name of it's attendant <see cref="System.Reflection.Assembly"/>
+        /// in an assembly qualified type name.
+        /// </summary>
+        public const string TypeAssemblySeparator = ",";
+
+        #endregion
+
+        #region Fields
+
+        private string unresolvedAssemblyName;
+        private string unresolvedTypeName;
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the TypeAssemblyHolder class.
+        /// </summary>
+        /// <param name="unresolvedTypeName">
+        /// The unresolved name of a <see cref="System.Type"/>.
+        /// </param>
+        public TypeAssemblyHolder(string unresolvedTypeName)
+        {
+            SplitTypeAndAssemblyNames(unresolvedTypeName);
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The (unresolved) type name portion of the original type name.
+        /// </summary>
+        public string TypeName
+        {
+            get { return unresolvedTypeName; }
+        }
+
+        /// <summary>
+        /// The (unresolved, possibly partial) name of the attandant assembly.
+        /// </summary>
+        public string AssemblyName
+        {
+            get { return unresolvedAssemblyName; }
+        }
+
+        /// <summary>
+        /// Is the type name being resolved assembly qualified?
+        /// </summary>
+        public bool IsAssemblyQualified
+        {
+            get { return StringUtils.HasText(AssemblyName); }
+        }
+
+        #endregion
+
+        #region Methods
+
+        private void SplitTypeAndAssemblyNames(string originalTypeName)
+        {
+            int typeAssemblyIndex
+                = originalTypeName.IndexOf(TypeAssemblySeparator);
+            if (typeAssemblyIndex < 0)
+            {
+                unresolvedTypeName = originalTypeName;
+            }
+            else
+            {
+                unresolvedTypeName = originalTypeName.Substring(
+                    0, typeAssemblyIndex).Trim();
+                unresolvedAssemblyName = originalTypeName.Substring(
+                    typeAssemblyIndex + 1).Trim();
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs
new file mode 100644
index 00000000..1fb1b35a
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs
@@ -0,0 +1,685 @@
+#region License
+
+/* 
+ * Copyright © 2002-2005 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 
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeResolution
+{
+    /// <summary> 
+    /// Provides access to a central registry of aliased <see cref="System.Type"/>s.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Simplifies configuration by allowing aliases to be used instead of
+    /// fully qualified type names.
+    /// </p>
+    /// <p>
+    /// Comes 'pre-loaded' with a number of convenience alias' for the more
+    /// common types; an example would be the '<c>int</c>' (or '<c>Integer</c>'
+    /// for Visual Basic.NET developers) alias for the <see cref="System.Int32"/>
+    /// type.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <seealso cref="Spring.Context.Support.TypeAliasesSectionHandler"/>
+    /// <version>$Id: TypeRegistry.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+    public sealed class TypeRegistry
+    {
+        #region Constants
+
+        /// <summary>
+        /// Name of the .Net config section that contains Spring.Net type aliases.
+        /// </summary>
+        private const string TypeAliasesSectionName = "spring/typeAliases";
+
+        /// <summary>
+        /// The alias around the 'int' type.
+        /// </summary>
+        public const string Int32Alias = "int";
+
+        /// <summary>
+        /// The alias around the 'Integer' type (Visual Basic.NET style).
+        /// </summary>
+        public const string Int32AliasVB = "Integer";
+
+        /// <summary>
+        /// The alias around the 'int[]' array type.
+        /// </summary>
+        public const string Int32ArrayAlias = "int[]";
+
+        /// <summary>
+        /// The alias around the 'Integer()' array type (Visual Basic.NET style).
+        /// </summary>
+        public const string Int32ArrayAliasVB = "Integer()";
+
+        /// <summary>
+        /// The alias around the 'decimal' type.
+        /// </summary>
+        public const string DecimalAlias = "decimal";
+
+        /// <summary>
+        /// The alias around the 'Decimal' type (Visual Basic.NET style).
+        /// </summary>
+        public const string DecimalAliasVB = "Decimal";
+
+        /// <summary>
+        /// The alias around the 'decimal[]' array type.
+        /// </summary>
+        public const string DecimalArrayAlias = "decimal[]";
+
+        /// <summary>
+        /// The alias around the 'Decimal()' array type (Visual Basic.NET style).
+        /// </summary>
+        public const string DecimalArrayAliasVB = "Decimal()";
+
+        /// <summary>
+        /// The alias around the 'char' type.
+        /// </summary>
+        public const string CharAlias = "char";
+
+        /// <summary>
+        /// The alias around the 'Char' type (Visual Basic.NET style).
+        /// </summary>
+        public const string CharAliasVB = "Char";
+
+        /// <summary>
+        /// The alias around the 'char[]' array type.
+        /// </summary>
+        public const string CharArrayAlias = "char[]";
+
+        /// <summary>
+        /// The alias around the 'Char()' array type (Visual Basic.NET style).
+        /// </summary>
+        public const string CharArrayAliasVB = "Char()";
+
+        /// <summary>
+        /// The alias around the 'long' type.
+        /// </summary>
+        public const string Int64Alias = "long";
+
+        /// <summary>
+        /// The alias around the 'Long' type (Visual Basic.NET style).
+        /// </summary>
+        public const string Int64AliasVB = "Long";
+
+        /// <summary>
+        /// The alias around the 'long[]' array type.
+        /// </summary>
+        public const string Int64ArrayAlias = "long[]";
+
+        /// <summary>
+        /// The alias around the 'Long()' array type (Visual Basic.NET style).
+        /// </summary>
+        public const string Int64ArrayAliasVB = "Long()";
+
+        /// <summary>
+        /// The alias around the 'short' type.
+        /// </summary>
+        public const string Int16Alias = "short";
+
+        /// <summary>
+        /// The alias around the 'Short' type (Visual Basic.NET style).
+        /// </summary>
+        public const string Int16AliasVB = "Short";
+
+        /// <summary>
+        /// The alias around the 'short[]' array type.
+        /// </summary>
+        public const string Int16ArrayAlias = "short[]";
+
+        /// <summary>
+        /// The alias around the 'Short()' array type (Visual Basic.NET style).
+        /// </summary>
+        public const string Int16ArrayAliasVB = "Short()";
+
+        /// <summary>
+        /// The alias around the 'unsigned int' type.
+        /// </summary>
+        public const string UInt32Alias = "uint";
+
+        /// <summary>
+        /// The alias around the 'unsigned long' type.
+        /// </summary>
+        public const string UInt64Alias = "ulong";
+
+        /// <summary>
+        /// The alias around the 'ulong[]' array type.
+        /// </summary>
+        public const string UInt64ArrayAlias = "ulong[]";
+
+        /// <summary>
+        /// The alias around the 'uint[]' array type.
+        /// </summary>
+        public const string UInt32ArrayAlias = "uint[]";
+
+        /// <summary>
+        /// The alias around the 'unsigned short' type.
+        /// </summary>
+        public const string UInt16Alias = "ushort";
+
+        /// <summary>
+        /// The alias around the 'ushort[]' array type.
+        /// </summary>
+        public const string UInt16ArrayAlias = "ushort[]";
+
+        /// <summary>
+        /// The alias around the 'double' type.
+        /// </summary>
+        public const string DoubleAlias = "double";
+
+        /// <summary>
+        /// The alias around the 'Double' type (Visual Basic.NET style).
+        /// </summary>
+        public const string DoubleAliasVB = "Double";
+
+        /// <summary>
+        /// The alias around the 'double[]' array type.
+        /// </summary>
+        public const string DoubleArrayAlias = "double[]";
+
+        /// <summary>
+        /// The alias around the 'Double()' array type (Visual Basic.NET style).
+        /// </summary>
+        public const string DoubleArrayAliasVB = "Double()";
+
+        /// <summary>
+        /// The alias around the 'float' type.
+        /// </summary>
+        public const string FloatAlias = "float";
+
+        /// <summary>
+        /// The alias around the 'Single' type (Visual Basic.NET style).
+        /// </summary>
+        public const string SingleAlias = "Single";
+
+        /// <summary>
+        /// The alias around the 'float[]' array type.
+        /// </summary>
+        public const string FloatArrayAlias = "float[]";
+
+        /// <summary>
+        /// The alias around the 'Single()' array type (Visual Basic.NET style).
+        /// </summary>
+        public const string SingleArrayAliasVB = "Single()";
+
+        /// <summary>
+        /// The alias around the 'DateTime' type.
+        /// </summary>
+        public const string DateTimeAlias = "DateTime";
+        
+        /// <summary>
+        /// The alias around the 'DateTime' type (C# style).
+        /// </summary>
+        public const string DateAlias = "date";
+
+        /// <summary>
+        /// The alias around the 'DateTime' type (Visual Basic.NET style).
+        /// </summary>
+        public const string DateAliasVB = "Date";
+
+        /// <summary>
+        /// The alias around the 'DateTime[]' array type.
+        /// </summary>
+        public const string DateTimeArrayAlias = "DateTime[]";
+        
+        /// <summary>
+        /// The alias around the 'DateTime[]' array type.
+        /// </summary>
+        public const string DateTimeArrayAliasCSharp = "date[]";
+
+        /// <summary>
+        /// The alias around the 'DateTime()' array type (Visual Basic.NET style).
+        /// </summary>
+        public const string DateTimeArrayAliasVB = "DateTime()";
+
+        /// <summary>
+        /// The alias around the 'bool' type.
+        /// </summary>
+        public const string BoolAlias = "bool";
+
+        /// <summary>
+        /// The alias around the 'Boolean' type (Visual Basic.NET style).
+        /// </summary>
+        public const string BoolAliasVB = "Boolean";
+
+        /// <summary>
+        /// The alias around the 'bool[]' array type.
+        /// </summary>
+        public const string BoolArrayAlias = "bool[]";
+
+        /// <summary>
+        /// The alias around the 'Boolean()' array type (Visual Basic.NET style).
+        /// </summary>
+        public const string BoolArrayAliasVB = "Boolean()";
+
+        /// <summary>
+        /// The alias around the 'string' type.
+        /// </summary>
+        public const string StringAlias = "string";
+
+        /// <summary>
+        /// The alias around the 'string' type (Visual Basic.NET style).
+        /// </summary>
+        public const string StringAliasVB = "String";
+
+        /// <summary>
+        /// The alias around the 'string[]' array type.
+        /// </summary>
+        public const string StringArrayAlias = "string[]";
+
+        /// <summary>
+        /// The alias around the 'string[]' array type (Visual Basic.NET style).
+        /// </summary>
+        public const string StringArrayAliasVB = "String()";
+
+        /// <summary>
+        /// The alias around the 'object' type.
+        /// </summary>
+        public const string ObjectAlias = "object";
+
+        /// <summary>
+        /// The alias around the 'object' type (Visual Basic.NET style).
+        /// </summary>
+        public const string ObjectAliasVB = "Object";
+
+        /// <summary>
+        /// The alias around the 'object[]' array type.
+        /// </summary>
+        public const string ObjectArrayAlias = "object[]";
+
+        /// <summary>
+        /// The alias around the 'object[]' array type (Visual Basic.NET style).
+        /// </summary>
+        public const string ObjectArrayAliasVB = "Object()";
+
+#if NET_2_0
+        /// <summary>
+        /// The alias around the 'int?' type.
+        /// </summary>
+        public const string NullableInt32Alias = "int?";
+
+        /// <summary>
+        /// The alias around the 'int?[]' array type.
+        /// </summary>
+        public const string NullableInt32ArrayAlias = "int?[]";
+
+        /// <summary>
+        /// The alias around the 'decimal?' type.
+        /// </summary>
+        public const string NullableDecimalAlias = "decimal?";
+
+        /// <summary>
+        /// The alias around the 'decimal?[]' array type.
+        /// </summary>
+        public const string NullableDecimalArrayAlias = "decimal?[]";
+
+        /// <summary>
+        /// The alias around the 'char?' type.
+        /// </summary>
+        public const string NullableCharAlias = "char?";
+
+        /// <summary>
+        /// The alias around the 'char?[]' array type.
+        /// </summary>
+        public const string NullableCharArrayAlias = "char?[]";
+
+        /// <summary>
+        /// The alias around the 'long?' type.
+        /// </summary>
+        public const string NullableInt64Alias = "long?";
+
+        /// <summary>
+        /// The alias around the 'long?[]' array type.
+        /// </summary>
+        public const string NullableInt64ArrayAlias = "long?[]";
+
+        /// <summary>
+        /// The alias around the 'short?' type.
+        /// </summary>
+        public const string NullableInt16Alias = "short?";
+
+        /// <summary>
+        /// The alias around the 'short?[]' array type.
+        /// </summary>
+        public const string NullableInt16ArrayAlias = "short?[]";
+
+        /// <summary>
+        /// The alias around the 'unsigned int?' type.
+        /// </summary>
+        public const string NullableUInt32Alias = "uint?";
+
+        /// <summary>
+        /// The alias around the 'unsigned long?' type.
+        /// </summary>
+        public const string NullableUInt64Alias = "ulong?";
+
+        /// <summary>
+        /// The alias around the 'ulong?[]' array type.
+        /// </summary>
+        public const string NullableUInt64ArrayAlias = "ulong?[]";
+
+        /// <summary>
+        /// The alias around the 'uint?[]' array type.
+        /// </summary>
+        public const string NullableUInt32ArrayAlias = "uint?[]";
+
+        /// <summary>
+        /// The alias around the 'unsigned short?' type.
+        /// </summary>
+        public const string NullableUInt16Alias = "ushort?";
+
+        /// <summary>
+        /// The alias around the 'ushort?[]' array type.
+        /// </summary>
+        public const string NullableUInt16ArrayAlias = "ushort?[]";
+
+        /// <summary>
+        /// The alias around the 'double?' type.
+        /// </summary>
+        public const string NullableDoubleAlias = "double?";
+
+        /// <summary>
+        /// The alias around the 'double?[]' array type.
+        /// </summary>
+        public const string NullableDoubleArrayAlias = "double?[]";
+
+        /// <summary>
+        /// The alias around the 'float?' type.
+        /// </summary>
+        public const string NullableFloatAlias = "float?";
+
+        /// <summary>
+        /// The alias around the 'float?[]' array type.
+        /// </summary>
+        public const string NullableFloatArrayAlias = "float?[]";
+
+        /// <summary>
+        /// The alias around the 'bool?' type.
+        /// </summary>
+        public const string NullableBoolAlias = "bool?";
+
+        /// <summary>
+        /// The alias around the 'bool?[]' array type.
+        /// </summary>
+        public const string NullableBoolArrayAlias = "bool?[]";
+#endif
+
+        #endregion
+
+        #region Fields
+
+        private static IDictionary types = new Hashtable();
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Registers standard and user-configured type aliases.
+        /// </summary>
+        static TypeRegistry()
+        {
+            lock (types.SyncRoot)
+            {
+                types["Int32"] = typeof(Int32);
+                types[Int32Alias] = typeof(Int32);
+                types[Int32AliasVB] = typeof(Int32);
+                types[Int32ArrayAlias] = typeof(Int32[]);
+                types[Int32ArrayAliasVB] = typeof(Int32[]);
+
+                types["UInt32"] = typeof(UInt32);
+                types[UInt32Alias] = typeof(UInt32);
+                types[UInt32ArrayAlias] = typeof(UInt32[]);
+
+                types["Int16"] = typeof(Int16);
+                types[Int16Alias] = typeof(Int16);
+                types[Int16AliasVB] = typeof(Int16);
+                types[Int16ArrayAlias] = typeof(Int16[]);
+                types[Int16ArrayAliasVB] = typeof(Int16[]);
+
+                types["UInt16"] = typeof(UInt16);
+                types[UInt16Alias] = typeof(UInt16);
+                types[UInt16ArrayAlias] = typeof(UInt16[]);
+
+                types["Int64"] = typeof(Int64);
+                types[Int64Alias] = typeof(Int64);
+                types[Int64AliasVB] = typeof(Int64);
+                types[Int64ArrayAlias] = typeof(Int64[]);
+                types[Int64ArrayAliasVB] = typeof(Int64[]);
+
+                types["UInt64"] = typeof(UInt64);
+                types[UInt64Alias] = typeof(UInt64);
+                types[UInt64ArrayAlias] = typeof(UInt64[]);
+
+                types[DoubleAlias] = typeof(double);
+                types[DoubleAliasVB] = typeof(double);
+                types[DoubleArrayAlias] = typeof(double[]);
+                types[DoubleArrayAliasVB] = typeof(double[]);
+
+                types[FloatAlias] = typeof(float);
+                types[SingleAlias] = typeof(float);
+                types[FloatArrayAlias] = typeof(float[]);
+                types[SingleArrayAliasVB] = typeof(float[]);
+
+                types[DateTimeAlias] = typeof(DateTime);
+                types[DateAlias] = typeof(DateTime);
+                types[DateAliasVB] = typeof(DateTime);
+                types[DateTimeArrayAlias] = typeof(DateTime[]);
+                types[DateTimeArrayAliasCSharp] = typeof(DateTime[]);
+                types[DateTimeArrayAliasVB] = typeof(DateTime[]);
+
+                types[BoolAlias] = typeof(bool);
+                types[BoolAliasVB] = typeof(bool);
+                types[BoolArrayAlias] = typeof(bool[]);
+                types[BoolArrayAliasVB] = typeof(bool[]);
+
+                types[DecimalAlias] = typeof(decimal);
+                types[DecimalAliasVB] = typeof(decimal);
+                types[DecimalArrayAlias] = typeof(decimal[]);
+                types[DecimalArrayAliasVB] = typeof(decimal[]);
+
+                types[CharAlias] = typeof(char);
+                types[CharAliasVB] = typeof(char);
+                types[CharArrayAlias] = typeof(char[]);
+                types[CharArrayAliasVB] = typeof(char[]);
+
+                types[StringAlias] = typeof(string);
+                types[StringAliasVB] = typeof(string);
+                types[StringArrayAlias] = typeof(string[]);
+                types[StringArrayAliasVB] = typeof(string[]);
+
+                types[ObjectAlias] = typeof(object);
+                types[ObjectAliasVB] = typeof(object);
+                types[ObjectArrayAlias] = typeof(object[]);
+                types[ObjectArrayAliasVB] = typeof(object[]);
+
+#if NET_2_0
+                types[NullableInt32Alias] = typeof(int?);
+                types[NullableInt32ArrayAlias] = typeof(int?[]);
+
+                types[NullableDecimalAlias] = typeof(decimal?);
+                types[NullableDecimalArrayAlias] = typeof(decimal?[]);
+
+                types[NullableCharAlias] = typeof(char?);
+                types[NullableCharArrayAlias] = typeof(char?[]);
+
+                types[NullableInt64Alias] = typeof(long?);
+                types[NullableInt64ArrayAlias] = typeof(long?[]);
+
+                types[NullableInt16Alias] = typeof(short?);
+                types[NullableInt16ArrayAlias] = typeof(short?[]);
+
+                types[NullableUInt32Alias] = typeof(uint?);
+                types[NullableUInt32ArrayAlias] = typeof(uint?[]);
+
+                types[NullableUInt64Alias] = typeof(ulong?);
+                types[NullableUInt64ArrayAlias] = typeof(ulong?[]);
+
+                types[NullableUInt16Alias] = typeof(ushort?);
+                types[NullableUInt16ArrayAlias] = typeof(ushort?[]);
+
+                types[NullableDoubleAlias] = typeof(double?);
+                types[NullableDoubleArrayAlias] = typeof(double?[]);
+
+                types[NullableFloatAlias] = typeof(float?);
+                types[NullableFloatArrayAlias] = typeof(float?[]);
+
+                types[NullableBoolAlias] = typeof(bool?);
+                types[NullableBoolArrayAlias] = typeof(bool?[]);
+#endif
+
+                // register user-configured type aliases
+                ConfigurationUtils.GetSection(TypeAliasesSectionName);
+            }
+        }
+
+        #endregion
+
+        /// <summary> 
+        /// Registers an alias for the specified <see cref="System.Type"/>. 
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This overload does eager resolution of the <see cref="System.Type"/>
+        /// referred to by the <paramref name="typeName"/> parameter. It will throw a
+        /// <see cref="System.TypeLoadException"/> if the <see cref="System.Type"/> referred
+        /// to by the <paramref name="typeName"/> parameter cannot be resolved.
+        /// </p>
+        /// </remarks>
+        /// <param name="alias">
+        /// A string that will be used as an alias for the specified
+        /// <see cref="System.Type"/>.
+        /// </param>
+        /// <param name="typeName">
+        /// The (possibly partially assembly qualified) name of the
+        /// <see cref="System.Type"/> to register the alias for.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If either of the supplied parameters is <see langword="null"/> or
+        /// contains only whitespace character(s).
+        /// </exception>
+        /// <exception cref="System.TypeLoadException">
+        /// If the <see cref="System.Type"/> referred to by the supplied
+        /// <paramref name="typeName"/> cannot be loaded.
+        /// </exception>
+        public static void RegisterType(string alias, string typeName)
+        {
+            AssertUtils.ArgumentHasText(alias, "alias");
+            AssertUtils.ArgumentHasText(typeName, "typeName");
+
+            Type type = TypeResolutionUtils.ResolveType(typeName);
+#if NET_2_0
+            if (type.IsGenericTypeDefinition)
+                alias += ("`" + type.GetGenericArguments().Length);
+#endif
+            RegisterType(alias, type);
+        }
+
+        /// <summary> 
+        /// Registers short type name as an alias for 
+        /// the supplied <see cref="System.Type"/>. 
+        /// </summary> 
+        /// <param name="type">
+        /// The <see cref="System.Type"/> to register.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="type"/> is <see langword="null"/>.
+        /// </exception>
+        public static void RegisterType(Type type)
+        {
+            AssertUtils.ArgumentNotNull(type, "type");
+            
+            lock (types.SyncRoot)
+            {
+                types[type.Name] = type;
+            }
+        }
+        
+        /// <summary> 
+        /// Registers an alias for the supplied <see cref="System.Type"/>. 
+        /// </summary> 
+        /// <param name="alias">
+        /// The alias for the supplied <see cref="System.Type"/>.
+        /// </param>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> to register the supplied <paramref name="alias"/> under.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="type"/> is <see langword="null"/>; or if
+        /// the supplied <paramref name="alias"/> is <see langword="null"/> or
+        /// contains only whitespace character(s).
+        /// </exception>
+        public static void RegisterType(string alias, Type type)
+        {
+            AssertUtils.ArgumentHasText(alias, "alias");
+            AssertUtils.ArgumentNotNull(type, "type");
+
+            lock (types.SyncRoot)
+            {
+                types[alias] = type;
+            }
+        }
+
+        /// <summary> 
+        /// Resolves the supplied <paramref name="alias"/> to a <see cref="System.Type"/>. 
+        /// </summary> 
+        /// <param name="alias">
+        /// The alias to resolve.
+        /// </param>
+        /// <returns>
+        /// The <see cref="System.Type"/> the supplied <paramref name="alias"/> was
+        /// associated with, or <see lang="null"/> if no <see cref="System.Type"/> 
+        /// was previously registered for the supplied <paramref name="alias"/>.
+        /// </returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="alias"/> is <see langword="null"/> or
+        /// contains only whitespace character(s).
+        /// </exception>
+        public static Type ResolveType(string alias)
+        {
+            AssertUtils.ArgumentHasText(alias, "alias");
+            return (Type) types[alias];
+        }
+
+        /// <summary>
+        /// Returns a flag specifying whether <b>TypeRegistry</b> contains
+        /// specified alias or not.
+        /// </summary>
+        /// <param name="alias">
+        /// Alias to check.
+        /// </param>
+        /// <returns>
+        /// <c>true</c> if the specified type alias is registered, 
+        /// <c>false</c> otherwise.
+        /// </returns>
+        public static bool ContainsAlias(string alias)
+        {
+            return types.Contains(alias);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs
new file mode 100644
index 00000000..77c939ab
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs
@@ -0,0 +1,215 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.Reflection;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeResolution
+{
+    /// <summary>
+    /// Helper methods with regard to type resolution.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Not intended to be used directly by applications.
+    /// </p>
+    /// </remarks>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: TypeResolutionUtils.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+    public sealed class TypeResolutionUtils
+    {
+        #region Fields
+
+#if NET_2_0
+        private static readonly ITypeResolver internalTypeResolver
+            = new CachedTypeResolver(new GenericTypeResolver());
+#else
+        private static readonly ITypeResolver internalTypeResolver
+            = new CachedTypeResolver(new TypeResolver());
+#endif
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        // CLOVER:OFF
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Core.TypeResolution.TypeResolutionUtils"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is a utility class, and as such exposes no public constructors.
+        /// </p>
+        /// </remarks>
+        private TypeResolutionUtils()
+        {
+        }
+
+        // CLOVER:ON
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Resolves the supplied type name into a <see cref="System.Type"/>
+        /// instance.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If you require special <see cref="System.Type"/> resolution, do
+        /// <b>not</b> use this method, but rather instantiate
+        /// your own <see cref="Spring.Core.TypeResolution.TypeResolver"/>.
+        /// </p>
+        /// </remarks>
+        /// <param name="typeName">
+        /// The (possibly partially assembly qualified) name of a
+        /// <see cref="System.Type"/>.
+        /// </param>
+        /// <returns>
+        /// A resolved <see cref="System.Type"/> instance.
+        /// </returns>
+        /// <exception cref="System.TypeLoadException">
+        /// If the type cannot be resolved.
+        /// </exception>
+        public static Type ResolveType(string typeName)
+        {
+            Type type = TypeRegistry.ResolveType(typeName);
+            if (type == null)
+            {
+                type = internalTypeResolver.Resolve(typeName);
+            }
+            return type;
+        }
+
+        /// <summary>
+        /// Resolves a string array of interface names to
+        /// a <see cref="System.Type"/> array.
+        /// </summary>
+        /// <param name="interfaceNames">
+        /// An array of valid interface names. Each name must include the full
+        /// interface and assembly name.
+        /// </param>
+        /// <returns>An array of interface <see cref="System.Type"/>s.</returns>
+        /// <exception cref="System.TypeLoadException">
+        /// If any of the interfaces can't be loaded.
+        /// </exception>
+        /// <exception cref="System.ArgumentException">
+        /// If any of the <see cref="System.Type"/>s specified is not an interface.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If <paramref name="interfaceNames"/> (or any of its elements ) is
+        /// <see langword="null"/>.
+        /// </exception>
+        public static Type[] ResolveInterfaceArray(string[] interfaceNames)
+        {
+            AssertUtils.ArgumentNotNull(interfaceNames, "interfaceNames");
+
+            ArrayList interfaces = new ArrayList();
+            for (int i = 0; i < interfaceNames.Length; i++)
+            {
+                string interfaceName = interfaceNames[i];
+                AssertUtils.ArgumentNotNull(interfaceName,
+                                            string.Format(CultureInfo.InvariantCulture, "interfaceNames[{0}]", i));
+                Type resolvedInterface = ResolveType(interfaceName);
+                if (!resolvedInterface.IsInterface)
+                {
+                    throw new ArgumentException(
+                        string.Format(CultureInfo.InvariantCulture,
+                                      "[{0}] is a class.",
+                                      resolvedInterface.FullName));
+                }
+                interfaces.Add(resolvedInterface);
+                interfaces.AddRange(resolvedInterface.GetInterfaces());
+            }
+            return (Type[])interfaces.ToArray(typeof(Type));
+        }
+
+        #region MethodMatch
+
+        // TODO : Use the future Pointcut expression language instead
+
+        private readonly static Regex methodMatchRegex = new Regex(
+            @"(?<methodName>([\w]+\.)*[\w\*]+)(?<parameters>(\((?<parameterTypes>[\w\.]+(,[\w\.]+)*)*\))?)",
+            RegexOptions.Compiled | RegexOptions.ExplicitCapture);
+
+        /// <summary>
+        /// Match a method against the given pattern.
+        /// </summary>
+        /// <param name="pattern">the pattern to match against.</param>
+        /// <param name="method">the method to match.</param>
+        /// <returns>
+        /// <see lang="true"/> if the method matches the given pattern; otherwise <see lang="false"/>.
+        /// </returns>
+        /// <exception cref="System.ArgumentException">
+        /// If the supplied <paramref name="pattern"/> is invalid.
+        /// </exception>
+        public static bool MethodMatch(string pattern, MethodInfo method)
+        {
+            Match m = methodMatchRegex.Match(pattern);
+
+            if (!m.Success)
+                throw new ArgumentException(String.Format("The pattern [{0}] is not well-formed.", pattern));
+
+            // Check method name
+            string methodNamePattern = m.Groups["methodName"].Value;
+            if (!PatternMatchUtils.SimpleMatch(methodNamePattern, method.Name))
+                return false;
+
+            if (m.Groups["parameters"].Value.Length > 0)
+            {
+                // Check parameter types
+                string parameters = m.Groups["parameterTypes"].Value;
+                string[] paramTypes =
+                    (parameters.Length == 0)
+                    ? new string[0]
+                    : StringUtils.DelimitedListToStringArray(parameters, ",");
+                ParameterInfo[] paramInfos = method.GetParameters();
+
+                // Verify parameter count
+                if (paramTypes.Length != paramInfos.Length)
+                    return false;
+
+                // Match parameter types
+                for (int i = 0; i < paramInfos.Length; i++)
+                {
+                    if (paramInfos[i].ParameterType != TypeResolutionUtils.ResolveType(paramTypes[i]))
+                        return false;
+                }
+            }
+
+            return true;
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeResolver.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolver.cs
new file mode 100644
index 00000000..e73f4827
--- /dev/null
+++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolver.cs
@@ -0,0 +1,169 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeResolution
+{
+    /// <summary>
+    /// Resolves a <see cref="System.Type"/> by name.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: TypeResolver.cs,v 1.3 2007/08/27 15:18:24 oakinger Exp $</version>
+    public class TypeResolver : ITypeResolver
+    {
+        /// <summary>
+        /// Resolves the supplied <paramref name="typeName"/> to a
+        /// <see cref="System.Type"/> instance.
+        /// </summary>
+        /// <param name="typeName">
+        /// The unresolved (possibly partially assembly qualified) name 
+        /// of a <see cref="System.Type"/>.
+        /// </param>
+        /// <returns>
+        /// A resolved <see cref="System.Type"/> instance.
+        /// </returns>
+        /// <exception cref="System.TypeLoadException">
+        /// If the supplied <paramref name="typeName"/> could not be resolved
+        /// to a <see cref="System.Type"/>.
+        /// </exception>
+        public virtual Type Resolve(string typeName)
+        {
+            if (StringUtils.IsNullOrEmpty(typeName))
+            {
+                throw BuildTypeLoadException(typeName);
+            }
+            TypeAssemblyHolder typeInfo = new TypeAssemblyHolder(typeName);
+            Type type = null;
+            try
+            {
+                type = (typeInfo.IsAssemblyQualified) ?
+                     LoadTypeDirectlyFromAssembly(typeInfo) :
+                     LoadTypeByIteratingOverAllLoadedAssemblies(typeInfo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is TypeLoadException)
+                {
+                    throw;
+                }
+                throw BuildTypeLoadException(typeName, ex);
+            }
+            if (type == null)
+            {
+                throw BuildTypeLoadException(typeName);
+            }
+            return type;
+        }
+
+        /// <summary>
+        /// Uses <see cref="System.Reflection.Assembly.LoadWithPartialName(string)"/>
+        /// to load an <see cref="System.Reflection.Assembly"/> and then the attendant
+        /// <see cref="System.Type"/> referred to by the <paramref name="typeInfo"/>
+        /// parameter.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// <see cref="System.Reflection.Assembly.LoadWithPartialName(string)"/> is
+        /// deprecated in .NET 2.0, but is still used here (even when this class is
+        /// compiled for .NET 2.0);
+        /// <see cref="System.Reflection.Assembly.LoadWithPartialName(string)"/> will
+        /// still resolve (non-.NET Framework) local assemblies when given only the
+        /// display name of an assembly (the behaviour for .NET Framework assemblies
+        /// and strongly named assemblies is documented in the docs for the
+        /// <see cref="System.Reflection.Assembly.LoadWithPartialName(string)"/> method).
+        /// </p>
+        /// </remarks>
+        /// <param name="typeInfo">
+        /// The assembly and type to be loaded.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.Type"/>, or <see lang="null"/>.
+        /// </returns>
+        /// <exception cref="System.Exception">
+        /// <see cref="System.Reflection.Assembly.LoadWithPartialName(string)"/>
+        /// </exception>
+        private static Type LoadTypeDirectlyFromAssembly(TypeAssemblyHolder typeInfo)
+        {
+            Type type = null;
+            Assembly assembly = Assembly.LoadWithPartialName(typeInfo.AssemblyName);
+            if (assembly != null)
+            {
+                type = assembly.GetType(typeInfo.TypeName, true, true);
+            }
+            return type;
+        }
+
+        /// <summary>
+        /// Uses <see cref="M:System.AppDomain.CurrentDomain.GetAssemblies()"/>
+        /// to load the attendant <see cref="System.Type"/> referred to by 
+        /// the <paramref name="typeInfo"/> parameter.
+        /// </summary>
+        /// <param name="typeInfo">
+        /// The type to be loaded.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.Type"/>, or <see lang="null"/>.
+        /// </returns>
+        private static Type LoadTypeByIteratingOverAllLoadedAssemblies(TypeAssemblyHolder typeInfo)
+        {
+            Type type = null;
+            Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
+            foreach (Assembly assembly in assemblies)
+            {
+                type = assembly.GetType(typeInfo.TypeName, false, false);
+                if (type != null)
+                {
+                    break;
+                }
+            }
+            return type;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="TypeLoadException"/> instance 
+        /// from the given <paramref name="typeName"/>
+        /// </summary>
+        protected static TypeLoadException BuildTypeLoadException(string typeName)
+        {
+            return new TypeLoadException("Could not load type from string value '" + typeName + "'.");
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="TypeLoadException"/> instance
+        /// from the given <paramref name="typeName"/> with the given inner <see cref="Exception"/> 
+        /// </summary>
+        protected static TypeLoadException BuildTypeLoadException(string typeName, Exception ex)
+        {
+            return new TypeLoadException("Could not load type from string value '" + typeName + "'.", ex);
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/DataBinding/AbstractBinding.cs b/src/Spring/Spring.Core/DataBinding/AbstractBinding.cs
new file mode 100644
index 00000000..0b17df5a
--- /dev/null
+++ b/src/Spring/Spring.Core/DataBinding/AbstractBinding.cs
@@ -0,0 +1,181 @@
+using System;
+using System.Collections;
+using Spring.Threading;
+using Spring.Util;
+using Spring.Validation;
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// Abstract base class for <see cref="IBinding"/> implementations.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AbstractBinding.cs,v 1.2 2008/02/05 20:40:25 aseovic Exp $</version>
+    public abstract class AbstractBinding : IBinding
+    {
+        #region Fields
+
+        // each Binding instance needs its own ID
+        private readonly string BINDING_ID = Guid.NewGuid().ToString("N");
+
+        private BindingDirection direction = BindingDirection.Bidirectional;
+        private ErrorMessage errorMessage;
+        private string[] errorProviders;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a flag specifying whether this binding is valid.
+        /// </summary>
+        /// <value>
+        ///     <c>true</c> if this binding evaluated without errors;
+        ///     <c>false</c> otherwise.
+        /// </value>
+        public bool IsValid
+        {
+            get
+            {
+                object val = LogicalThreadContext.GetData(GetIsValidKey());
+                return val == null || (bool)val;
+            }
+            set
+            {
+                LogicalThreadContext.SetData(GetIsValidKey(), value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="BindingDirection"/>.
+        /// </summary>
+        /// <value>The binding direction.</value>
+        public BindingDirection Direction
+        {
+            get { return direction; }
+            set { direction = value; }
+        }
+
+        /// <summary>
+        /// Gets the error message.
+        /// </summary>
+        /// <value>The error message.</value>
+        public ErrorMessage ErrorMessage
+        {
+            get { return errorMessage; }
+        }
+
+        /// <summary>
+        /// Gets the error providers.
+        /// </summary>
+        public string[] ErrorProviders
+        {
+            get { return errorProviders; }
+        }
+
+        #endregion
+
+        #region IBinding Implementation
+
+        /// <summary>
+        /// Binds source object to target object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        public void BindSourceToTarget(object source, object target, IValidationErrors validationErrors)
+        {
+            BindSourceToTarget(source, target, validationErrors, null);
+        }
+
+        /// <summary>
+        /// Binds target object to source object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        public void BindTargetToSource(object source, object target, IValidationErrors validationErrors)
+        {
+            BindTargetToSource(source, target, validationErrors, null);
+        }
+
+        /// <summary>
+        /// Binds source object to target object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        public abstract void BindSourceToTarget(object source, object target, IValidationErrors validationErrors, IDictionary variables);
+
+        /// <summary>
+        /// Binds target object to source object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        public abstract void BindTargetToSource(object source, object target, IValidationErrors validationErrors, IDictionary variables);
+
+        /// <summary>
+        /// Sets error message that should be displayed in the case 
+        /// of a non-fatal binding error.
+        /// </summary>
+        /// <param name="messageId">
+        /// Resource ID of the error message.
+        /// </param>
+        /// <param name="errorProviders">
+        /// List of error providers message should be added to.
+        /// </param>
+        public void SetErrorMessage(string messageId, params string[] errorProviders)
+        {
+            AssertUtils.ArgumentHasText(messageId, "messageId");
+            if (errorProviders == null || errorProviders.Length == 0)
+            {
+                throw new ArgumentException("At least one error provider has to be specified.", "providers");
+            }
+
+            this.errorMessage = new ErrorMessage(messageId, null);
+            this.errorProviders = errorProviders;
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private string GetIsValidKey()
+        {
+            return "Binding." + BINDING_ID + ".IsValid";
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/DataBinding/AbstractSimpleBinding.cs b/src/Spring/Spring.Core/DataBinding/AbstractSimpleBinding.cs
new file mode 100644
index 00000000..b9335d1f
--- /dev/null
+++ b/src/Spring/Spring.Core/DataBinding/AbstractSimpleBinding.cs
@@ -0,0 +1,253 @@
+using System;
+using System.Collections;
+using Spring.Globalization;
+using Spring.Validation;
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// Abstract base class for simple, one-to-one <see cref="IBinding"/> implementations.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AbstractSimpleBinding.cs,v 1.4 2008/02/05 20:40:25 aseovic Exp $</version>
+    public abstract class AbstractSimpleBinding : AbstractBinding
+    {
+        #region Fields
+
+        private IFormatter formatter;
+
+        #endregion
+
+        #region Constructor(s)
+
+        /// <summary>
+        /// Initialize a new instance of <see cref="AbstractSimpleBinding"/> without any <see cref="IFormatter"/>
+        /// </summary>
+        protected AbstractSimpleBinding()
+        {
+        }
+
+        /// <summary>
+        /// Initialize a new instance of <see cref="AbstractSimpleBinding"/> with the 
+        /// specified <see cref="IFormatter"/>.
+        /// </summary>
+        protected AbstractSimpleBinding(IFormatter formatter)
+        {
+            this.formatter = formatter;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the <see cref="IFormatter"/> to use.
+        /// </summary>
+        /// <value>The formatter to use.</value>
+        public IFormatter Formatter
+        {
+            get { return formatter; }
+            set { formatter = value; }
+        }
+
+        #endregion
+
+        #region IBinding Implementation
+
+        /// <summary>
+        /// Binds source object to target object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        public override void BindSourceToTarget(object source, object target, IValidationErrors validationErrors,
+                                                IDictionary variables)
+        {
+            if (this.IsValid
+                &&
+                (this.Direction == BindingDirection.Bidirectional || this.Direction == BindingDirection.SourceToTarget))
+            {
+                try
+                {
+                    DoBindSourceToTarget(source, target, variables);
+                    this.IsValid = true;
+                }
+                catch (Exception)
+                {
+                    this.IsValid = false;
+                    if (this.ErrorMessage != null && validationErrors != null)
+                    {
+                        foreach (string provider in this.ErrorProviders)
+                        {
+                            validationErrors.AddError(provider, this.ErrorMessage);
+                        }
+                    }
+                    else
+                    {
+                        throw;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Concrete implementation if source to target binding.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        protected virtual void DoBindSourceToTarget(object source, object target, IDictionary variables)
+        {
+            object value = this.GetSourceValue(source, variables);
+            if (this.Formatter != null && value is string)
+            {
+                value = this.Formatter.Parse((string) value);
+            }
+            this.SetTargetValue(target, value, variables);
+        }
+
+        /// <summary>
+        /// Binds target object to source object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        public override void BindTargetToSource(object source, object target, IValidationErrors validationErrors,
+                                                IDictionary variables)
+        {
+            if (this.IsValid
+                &&
+                (this.Direction == BindingDirection.Bidirectional || this.Direction == BindingDirection.TargetToSource))
+            {
+                try
+                {
+                    DoBindTargetToSource(source, target, variables);
+                    this.IsValid = true;
+                }
+                catch (Exception)
+                {
+                    this.IsValid = false;
+                    if (this.ErrorMessage != null && validationErrors != null)
+                    {
+                        foreach (string provider in this.ErrorProviders)
+                        {
+                            validationErrors.AddError(provider, this.ErrorMessage);
+                        }
+                    }
+                    else
+                    {
+                        throw;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Concrete implementation of target to source binding.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        protected virtual void DoBindTargetToSource(object source, object target, IDictionary variables)
+        {
+            object value = this.GetTargetValue(target, variables);
+            if (this.Formatter != null)
+            {
+                value = this.Formatter.Format(value);
+            }
+            this.SetSourceValue(source, value, variables);
+        }
+
+        #endregion
+
+        #region Abstract Methods
+
+        /// <summary>
+        /// Gets the source value for the binding.
+        /// </summary>
+        /// <param name="source">
+        /// Source object to extract value from.
+        /// </param>
+        /// <param name="variables">
+        /// Variables for expression evaluation.
+        /// </param>
+        /// <returns>
+        /// The source value for the binding.
+        /// </returns>
+        protected abstract object GetSourceValue(object source, IDictionary variables);
+
+        /// <summary>
+        /// Sets the source value for the binding.
+        /// </summary>
+        /// <param name="source">
+        /// The source object to set the value on.
+        /// </param>
+        /// <param name="value">
+        /// The value to set.
+        /// </param>
+        /// <param name="variables">
+        /// Variables for expression evaluation.
+        /// </param>
+        protected abstract void SetSourceValue(object source, object value, IDictionary variables);
+
+        /// <summary>
+        /// Gets the target value for the binding.
+        /// </summary>
+        /// <param name="target">
+        /// Source object to extract value from.
+        /// </param>
+        /// <param name="variables">
+        /// Variables for expression evaluation.
+        /// </param>
+        /// <returns>
+        /// The target value for the binding.
+        /// </returns>
+        protected abstract object GetTargetValue(object target, IDictionary variables);
+
+        /// <summary>
+        /// Sets the target value for the binding.
+        /// </summary>
+        /// <param name="target">
+        /// The target object to set the value on.
+        /// </param>
+        /// <param name="value">
+        /// The value to set.
+        /// </param>
+        /// <param name="variables">
+        /// Variables for expression evaluation.
+        /// </param>
+        protected abstract void SetTargetValue(object target, object value, IDictionary variables);
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/DataBinding/BaseBindingContainer.cs b/src/Spring/Spring.Core/DataBinding/BaseBindingContainer.cs
new file mode 100644
index 00000000..eaebbbd1
--- /dev/null
+++ b/src/Spring/Spring.Core/DataBinding/BaseBindingContainer.cs
@@ -0,0 +1,262 @@
+using System.Collections;
+using Spring.Globalization;
+using Spring.Validation;
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// Base implementation of the <see cref="IBindingContainer"/>.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: BaseBindingContainer.cs,v 1.2 2008/02/05 20:40:25 aseovic Exp $</version>
+    public class BaseBindingContainer : IBindingContainer
+    {
+        #region Fields
+
+        private IList bindings = new ArrayList();
+
+        #endregion
+
+        #region Constructor(s)
+
+        /// <summary>
+        /// Creates a new instance of <see cref="BaseBindingContainer"/>.
+        /// </summary>
+        public BaseBindingContainer()
+        {}
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets a list of bindings for this container.
+        /// </summary>
+        /// <value>
+        /// A list of bindings for this container.
+        /// </value>
+        protected IList Bindings
+        {
+            get { return bindings; }
+        }
+
+        #endregion
+
+        #region IBindingContainer Implementation
+
+        /// <summary>
+        /// Gets a value indicating whether this instance has bindings.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance has bindings; otherwise, <c>false</c>.
+        /// </value>
+        public bool HasBindings
+        {
+            get { return bindings.Count > 0; }
+        }
+
+        /// <summary>
+        /// Adds the binding.
+        /// </summary>
+        /// <param name="binding">
+        /// Binding definition to add.
+        /// </param>
+        /// <returns>
+        /// Added <see cref="IBinding"/> instance.
+        /// </returns>
+        public IBinding AddBinding(IBinding binding)
+        {
+            bindings.Add(binding);
+            return binding;
+        }
+
+        /// <summary>
+        /// Adds the <see cref="SimpleExpressionBinding"/> binding with a default 
+        /// binding direction of <see cref="BindingDirection.Bidirectional"/>.
+        /// </summary>
+        /// <param name="sourceExpression">
+        /// The source expression.
+        /// </param>
+        /// <param name="targetExpression">
+        /// The target expression.
+        /// </param>
+        /// <returns>
+        /// Added <see cref="SimpleExpressionBinding"/> instance.
+        /// </returns>
+        public IBinding AddBinding(string sourceExpression, string targetExpression)
+        {
+            return AddBinding(sourceExpression, targetExpression, BindingDirection.Bidirectional, null);
+        }
+
+        /// <summary>
+        /// Adds the <see cref="SimpleExpressionBinding"/> binding.
+        /// </summary>
+        /// <param name="sourceExpression">
+        /// The source expression.
+        /// </param>
+        /// <param name="targetExpression">
+        /// The target expression.
+        /// </param>
+        /// <param name="direction">
+        /// Binding direction.
+        /// </param>
+        /// <returns>
+        /// Added <see cref="SimpleExpressionBinding"/> instance.
+        /// </returns>
+        public IBinding AddBinding(string sourceExpression, string targetExpression, BindingDirection direction)
+        {
+            return AddBinding(sourceExpression, targetExpression, direction, null);
+        }
+
+        /// <summary>
+        /// Adds the <see cref="SimpleExpressionBinding"/> binding with a default 
+        /// binding direction of <see cref="BindingDirection.Bidirectional"/>.
+        /// </summary>
+        /// <param name="sourceExpression">
+        /// The source expression.
+        /// </param>
+        /// <param name="targetExpression">
+        /// The target expression.
+        /// </param>
+        /// <param name="formatter">
+        /// <see cref="IFormatter"/> to use for value formatting and parsing.
+        /// </param>
+        /// <returns>
+        /// Added <see cref="SimpleExpressionBinding"/> instance.
+        /// </returns>
+        public IBinding AddBinding(string sourceExpression, string targetExpression, IFormatter formatter)
+        {
+            return AddBinding(sourceExpression, targetExpression, BindingDirection.Bidirectional, formatter);
+        }
+
+        /// <summary>
+        /// Adds the <see cref="SimpleExpressionBinding"/> binding.
+        /// </summary>
+        /// <param name="sourceExpression">
+        /// The source expression.
+        /// </param>
+        /// <param name="targetExpression">
+        /// The target expression.
+        /// </param>
+        /// <param name="direction">
+        /// Binding direction.
+        /// </param>
+        /// <param name="formatter">
+        /// <see cref="IFormatter"/> to use for value formatting and parsing.
+        /// </param>
+        /// <returns>
+        /// Added <see cref="SimpleExpressionBinding"/> instance.
+        /// </returns>
+        public virtual IBinding AddBinding(string sourceExpression, string targetExpression, 
+                                           BindingDirection direction, IFormatter formatter)
+        {
+            SimpleExpressionBinding binding = new SimpleExpressionBinding(sourceExpression, targetExpression);
+            binding.Direction = direction;
+            binding.Formatter = formatter;
+            bindings.Add(binding);
+            
+            return binding;
+        }
+
+        #endregion
+
+        #region IBinding Implementation
+
+        /// <summary>
+        /// Binds source object to target object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        public void BindSourceToTarget(object source, object target, IValidationErrors validationErrors)
+        {
+            BindSourceToTarget(source, target, validationErrors, null);
+        }
+
+        /// <summary>
+        /// Binds source object to target object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        public virtual void BindSourceToTarget(object source, object target, IValidationErrors validationErrors,
+                                       IDictionary variables)
+        {
+            foreach (IBinding binding in bindings)
+            {
+                binding.BindSourceToTarget(source, target, validationErrors);
+            }
+        }
+
+        /// <summary>
+        /// Binds target object to source object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        public void BindTargetToSource(object source, object target, IValidationErrors validationErrors)
+        {
+            BindTargetToSource(source, target, validationErrors, null);
+        }
+
+        /// <summary>
+        /// Binds target object to source object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        public virtual void BindTargetToSource(object source, object target, IValidationErrors validationErrors,
+                                       IDictionary variables)
+        {
+            foreach (IBinding binding in bindings)
+            {
+                binding.BindTargetToSource(source, target, validationErrors);
+            }
+        }
+
+        /// <summary>
+        /// Sets error message that should be displayed in the case 
+        /// of a non-fatal binding error.
+        /// </summary>
+        /// <param name="messageId">
+        /// Resource ID of the error message.
+        /// </param>
+        /// <param name="errorProviders">
+        /// List of error providers message should be added to.
+        /// </param>
+        public virtual void SetErrorMessage(string messageId, params string[] errorProviders)
+        {}
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/DataBinding/BaseBindingManager.cs b/src/Spring/Spring.Core/DataBinding/BaseBindingManager.cs
new file mode 100644
index 00000000..b0d6391a
--- /dev/null
+++ b/src/Spring/Spring.Core/DataBinding/BaseBindingManager.cs
@@ -0,0 +1,46 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+using Spring.Globalization;
+using Spring.Validation;
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// BaseBindingManager keeps track of all registered bindings and 
+    /// represents an entry point for the binding and unbinding process.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: BaseBindingManager.cs,v 1.1 2006/11/21 05:46:57 aseovic Exp $</version>
+    public class BaseBindingManager : BaseBindingContainer
+    {
+        #region Constructor(s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseBindingManager"/> class.
+        /// </summary>
+        public BaseBindingManager()
+        {}
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/DataBinding/BindingDirection.cs b/src/Spring/Spring.Core/DataBinding/BindingDirection.cs
new file mode 100644
index 00000000..2be758c6
--- /dev/null
+++ b/src/Spring/Spring.Core/DataBinding/BindingDirection.cs
@@ -0,0 +1,48 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.DataBinding
+{
+	/// <summary>
+	/// Enumeration that defines possible values for data binding direction.
+	/// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: BindingDirection.cs,v 1.2 2006/04/09 07:18:39 markpollack Exp $</version>
+    [Flags]
+    public enum BindingDirection
+	{
+        /// <summary>
+        /// Specifies that value from the control property should be bound to a data model.
+        /// </summary>
+        SourceToTarget = 0x0001,
+
+        /// <summary>
+        /// Specifies that value from the data model should be bound to control property.
+        /// </summary>
+        TargetToSource = 0x0002,
+        
+        /// <summary>
+        /// Specifies that binding is bidirectional.
+        /// </summary>
+        Bidirectional = SourceToTarget | TargetToSource
+	}
+}
diff --git a/src/Spring/Spring.Core/DataBinding/IBinding.cs b/src/Spring/Spring.Core/DataBinding/IBinding.cs
new file mode 100644
index 00000000..fa0c20e3
--- /dev/null
+++ b/src/Spring/Spring.Core/DataBinding/IBinding.cs
@@ -0,0 +1,88 @@
+using System.Collections;
+using Spring.Validation;
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// An interface that defines the methods that have to be implemented by all data bindings.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IBinding.cs,v 1.3 2008/02/05 20:40:25 aseovic Exp $</version>
+    public interface IBinding
+    {
+        /// <summary>
+        /// Binds source object to target object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        void BindSourceToTarget(object source, object target, IValidationErrors validationErrors);
+
+        /// <summary>
+        /// Binds source object to target object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        void BindSourceToTarget(object source, object target, IValidationErrors validationErrors, IDictionary variables);
+
+        /// <summary>
+        /// Binds target object to source object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        void BindTargetToSource(object source, object target, IValidationErrors validationErrors);
+
+        /// <summary>
+        /// Binds target object to source object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        void BindTargetToSource(object source, object target, IValidationErrors validationErrors, IDictionary variables);
+
+        /// <summary>
+        /// Sets error message that should be displayed in the case 
+        /// of a non-fatal binding error.
+        /// </summary>
+        /// <param name="messageId">
+        /// Resource ID of the error message.
+        /// </param>
+        /// <param name="errorProviders">
+        /// List of error providers message should be added to.
+        /// </param>
+        void SetErrorMessage(string messageId, params string[] errorProviders);
+        
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/DataBinding/IBindingContainer.cs b/src/Spring/Spring.Core/DataBinding/IBindingContainer.cs
new file mode 100644
index 00000000..f63dc54e
--- /dev/null
+++ b/src/Spring/Spring.Core/DataBinding/IBindingContainer.cs
@@ -0,0 +1,120 @@
+using Spring.Globalization;
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// An interface that has to be implemented by all data binding containers.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IBindingContainer.cs,v 1.1 2006/11/21 05:46:57 aseovic Exp $</version>
+    public interface IBindingContainer : IBinding
+    {
+        /// <summary>
+        /// Gets a value indicating whether this data binding container 
+        /// has bindings.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this data binding container has bindings; 
+        ///     <c>false</c> otherwise.
+        /// </value>
+        bool HasBindings { get; }
+
+        /// <summary>
+        /// Adds the binding.
+        /// </summary>
+        /// <param name="binding">
+        /// Binding definition to add.
+        /// </param>
+        /// <returns>
+        /// Added <see cref="IBinding"/> instance.
+        /// </returns>
+        IBinding AddBinding(IBinding binding);
+
+        /// <summary>
+        /// Adds the <see cref="SimpleExpressionBinding"/> binding with a default 
+        /// binding direction of <see cref="BindingDirection.Bidirectional"/>.
+        /// </summary>
+        /// <remarks>
+        /// This is a convinience method for adding <b>SimpleExpressionBinding</b>,
+        /// one of the most often used binding types, to the bindings list.
+        /// </remarks>
+        /// <param name="sourceExpression">
+        /// The source expression.
+        /// </param>
+        /// <param name="targetExpression">
+        /// The target expression.
+        /// </param>
+        /// <returns>
+        /// Added <see cref="SimpleExpressionBinding"/> instance.
+        /// </returns>
+        IBinding AddBinding(string sourceExpression, string targetExpression);
+
+        /// <summary>
+        /// Adds the <see cref="SimpleExpressionBinding"/> binding.
+        /// </summary>
+        /// <remarks>
+        /// This is a convinience method for adding <b>SimpleExpressionBinding</b>,
+        /// one of the most often used binding types, to the bindings list.
+        /// </remarks>
+        /// <param name="sourceExpression">
+        /// The source expression.
+        /// </param>
+        /// <param name="targetExpression">
+        /// The target expression.
+        /// </param>
+        /// <param name="direction">
+        /// Binding direction.
+        /// </param>
+        /// <returns>
+        /// Added <see cref="SimpleExpressionBinding"/> instance.
+        /// </returns>
+        IBinding AddBinding(string sourceExpression, string targetExpression, BindingDirection direction);
+
+        /// <summary>
+        /// Adds the <see cref="SimpleExpressionBinding"/> binding with a default 
+        /// binding direction of <see cref="BindingDirection.Bidirectional"/>.
+        /// </summary>
+        /// <remarks>
+        /// This is a convinience method for adding <b>SimpleExpressionBinding</b>,
+        /// one of the most often used binding types, to the bindings list.
+        /// </remarks>
+        /// <param name="sourceExpression">
+        /// The source expression.
+        /// </param>
+        /// <param name="targetExpression">
+        /// The target expression.
+        /// </param>
+        /// <param name="formatter">
+        /// <see cref="IFormatter"/> to use for value formatting and parsing.
+        /// </param>
+        /// <returns>
+        /// Added <see cref="SimpleExpressionBinding"/> instance.
+        /// </returns>
+        IBinding AddBinding(string sourceExpression, string targetExpression, IFormatter formatter);
+
+        /// <summary>
+        /// Adds the <see cref="SimpleExpressionBinding"/> binding.
+        /// </summary>
+        /// <remarks>
+        /// This is a convinience method for adding <b>SimpleExpressionBinding</b>,
+        /// one of the most often used binding types, to the bindings list.
+        /// </remarks>
+        /// <param name="sourceExpression">
+        /// The source expression.
+        /// </param>
+        /// <param name="targetExpression">
+        /// The target expression.
+        /// </param>
+        /// <param name="direction">
+        /// Binding direction.
+        /// </param>
+        /// <param name="formatter">
+        /// <see cref="IFormatter"/> to use for value formatting and parsing.
+        /// </param>
+        /// <returns>
+        /// Added <see cref="SimpleExpressionBinding"/> instance.
+        /// </returns>
+        IBinding AddBinding(string sourceExpression, string targetExpression, BindingDirection direction,
+                            IFormatter formatter);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/DataBinding/IDataBound.cs b/src/Spring/Spring.Core/DataBinding/IDataBound.cs
new file mode 100644
index 00000000..cdf68c63
--- /dev/null
+++ b/src/Spring/Spring.Core/DataBinding/IDataBound.cs
@@ -0,0 +1,37 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// Interface that should be implemented by data bound objects, such as 
+    /// web pages, user controls, windows forms, etc.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IDataBound.cs,v 1.3 2006/11/21 05:46:57 aseovic Exp $</version>
+    public interface IDataBound
+    {
+        /// <summary>
+        /// Gets the binding manager.
+        /// </summary>
+        /// <value>The binding manager.</value>
+        IBindingContainer BindingManager { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/DataBinding/ListBinding.cs b/src/Spring/Spring.Core/DataBinding/ListBinding.cs
new file mode 100644
index 00000000..30aea12a
--- /dev/null
+++ b/src/Spring/Spring.Core/DataBinding/ListBinding.cs
@@ -0,0 +1,75 @@
+using System.Collections;
+using Spring.Expressions;
+using Spring.Validation;
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// <see cref="IBindingContainer"/> implementation that allows
+    /// data binding between collections that implement <see cref="IList"/>
+    /// interface.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ListBinding.cs,v 1.2 2008/02/05 20:40:25 aseovic Exp $</version>
+    public class ListBinding : AbstractBinding
+    {
+        private IExpression sourceExpression = Expression.Parse("#source = #target");
+        private IExpression targetExpression = Expression.Parse("#target = #source");
+        
+        /// <summary>
+        /// Binds source object to target object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        public override void BindSourceToTarget(object source, object target, IValidationErrors validationErrors,
+                                                IDictionary variables)
+        {
+            if (variables == null)
+            {
+                variables = new Hashtable();
+            }
+            variables["source"] = source;
+            variables["target"] = target;
+
+            targetExpression.GetValue(null, variables);
+        }
+
+        /// <summary>
+        /// Binds target object to source object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        public override void BindTargetToSource(object source, object target, IValidationErrors validationErrors,
+                                                IDictionary variables)
+        {
+            if (variables == null)
+            {
+                variables = new Hashtable();
+            }
+            variables["source"] = source;
+            variables["target"] = target;
+
+            sourceExpression.GetValue(null, variables);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/DataBinding/SimpleExpressionBinding.cs b/src/Spring/Spring.Core/DataBinding/SimpleExpressionBinding.cs
new file mode 100644
index 00000000..bc7b41eb
--- /dev/null
+++ b/src/Spring/Spring.Core/DataBinding/SimpleExpressionBinding.cs
@@ -0,0 +1,175 @@
+#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.Collections;
+using Spring.Expressions;
+using Spring.Globalization;
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// Simple, expression-based implementation of <see cref="IBinding"/> that
+    /// binds source to target one-to-one.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SimpleExpressionBinding.cs,v 1.3 2007/03/19 16:05:52 oakinger Exp $</version>
+    public class SimpleExpressionBinding : AbstractSimpleBinding
+    {
+        #region Fields
+
+        private IExpression sourceExpression;
+        private IExpression targetExpression;
+
+        #endregion
+
+        #region Constructor(s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleExpressionBinding"/> class.
+        /// </summary>
+        /// <param name="sourceExpression">
+        /// The source expression.
+        /// </param>
+        /// <param name="targetExpression">
+        /// The target expression.
+        /// </param>
+        public SimpleExpressionBinding(string sourceExpression, string targetExpression)
+        {
+            this.sourceExpression = Expression.Parse(sourceExpression);
+            this.targetExpression = Expression.Parse(targetExpression);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleExpressionBinding"/> class.
+        /// </summary>
+        /// <param name="sourceExpression">
+        /// The source expression.
+        /// </param>
+        /// <param name="targetExpression">
+        /// The target expression.
+        /// </param>
+        /// <param name="formatter">
+        /// The formatter to use.
+        /// </param>
+        public SimpleExpressionBinding(string sourceExpression, string targetExpression, IFormatter formatter)
+            :base(formatter)
+        {
+            this.sourceExpression = Expression.Parse(sourceExpression);
+            this.targetExpression = Expression.Parse(targetExpression);
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the source expression.
+        /// </summary>
+        /// <value>The source expression.</value>
+        public IExpression SourceExpression
+        {
+            get { return sourceExpression; }
+        }
+
+        /// <summary>
+        /// Gets the target expression.
+        /// </summary>
+        /// <value>The target expression.</value>
+        public IExpression TargetExpression
+        {
+            get { return targetExpression; }
+        }
+
+        #endregion
+
+        #region Abstract Methods Implementation
+
+        /// <summary>
+        /// Gets the source value for the binding.
+        /// </summary>
+        /// <param name="source">
+        /// Source object to extract value from.
+        /// </param>
+        /// <param name="variables">
+        /// Variables for expression evaluation.
+        /// </param>
+        /// <returns>
+        /// The source value for the binding.
+        /// </returns>
+        protected override object GetSourceValue(object source, IDictionary variables)
+        {
+            return this.SourceExpression.GetValue(source, variables);
+        }
+
+        /// <summary>
+        /// Sets the source value for the binding.
+        /// </summary>
+        /// <param name="source">
+        /// The source object to set the value on.
+        /// </param>
+        /// <param name="value">
+        /// The value to set.
+        /// </param>
+        /// <param name="variables">
+        /// Variables for expression evaluation.
+        /// </param>
+        protected override void SetSourceValue(object source, object value, IDictionary variables)
+        {
+            this.SourceExpression.SetValue(source, variables, value);
+        }
+
+        /// <summary>
+        /// Gets the target value for the binding.
+        /// </summary>
+        /// <param name="target">
+        /// Source object to extract value from.
+        /// </param>
+        /// <param name="variables">
+        /// Variables for expression evaluation.
+        /// </param>
+        /// <returns>
+        /// The target value for the binding.
+        /// </returns>
+        protected override object GetTargetValue(object target, IDictionary variables)
+        {
+            return this.TargetExpression.GetValue(target, variables);
+        }
+
+        /// <summary>
+        /// Sets the target value for the binding.
+        /// </summary>
+        /// <param name="target">
+        /// The target object to set the value on.
+        /// </param>
+        /// <param name="value">
+        /// The value to set.
+        /// </param>
+        /// <param name="variables">
+        /// Variables for expression evaluation.
+        /// </param>
+        protected override void SetTargetValue(object target, object value, IDictionary variables)
+        {
+            this.TargetExpression.SetValue(target, variables, value);
+        }
+
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs b/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs
new file mode 100644
index 00000000..2dd3cc45
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs
@@ -0,0 +1,101 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+
+using antlr.collections;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed method node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ArrayConstructorNode.cs,v 1.11 2007/09/07 03:01:21 markpollack Exp $</version>
+    [Serializable]
+    public class ArrayConstructorNode : NodeWithArguments
+    {
+        private Type arrayType;
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public ArrayConstructorNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected ArrayConstructorNode(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Creates new instance of the type defined by this node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            if (arrayType == null)
+            {
+                lock (this)
+                {
+                    if (arrayType == null)
+                    {
+                        arrayType = TypeResolutionUtils.ResolveType(getText());
+                    }
+                }
+            }
+
+            AST rankRoot = getFirstChild();
+            int dimensions = rankRoot.getNumberOfChildren();
+            int[] ranks = new int[dimensions];
+            if (dimensions > 0)
+            {
+                int i = 0;
+                AST rankNode = rankRoot.getFirstChild();
+                while (rankNode != null)
+                {
+                    ranks[i++] = (int)((BaseNode)rankNode).GetValueInternal(context, evalContext);
+                    rankNode = rankNode.getNextSibling();
+                }
+                return Array.CreateInstance(arrayType, ranks);
+            }
+            else
+            {
+                AST valuesRoot = getFirstChild().getNextSibling();
+                if (valuesRoot != null)
+                {
+                    ArrayList values = (ArrayList)((BaseNode)valuesRoot).GetValueInternal(context, evalContext);
+                    return values.ToArray(arrayType);
+                }
+            }
+
+            throw new ArgumentException("You have to specify either rank or initializer for an array.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/AssignNode.cs b/src/Spring/Spring.Core/Expressions/AssignNode.cs
new file mode 100644
index 00000000..e16922fc
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/AssignNode.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using antlr.collections;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed assignment node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AssignNode.cs,v 1.9 2007/09/07 03:01:21 markpollack Exp $</version>
+    [Serializable]
+    public class AssignNode : BaseNode
+    {        
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public AssignNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected AssignNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Assigns value of the right operand to the left one.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            AST left = getFirstChild();
+            AST right = left.getNextSibling();
+
+            object result;
+
+            if (right.getFirstChild() is LambdaExpressionNode)
+            {
+                if (!(left.getFirstChild() is VariableNode))
+                {
+                    throw new ArgumentException("Lambda expression can only be assigned to a global variable.");
+                }
+                result = right.getFirstChild();
+            }
+            else
+            {
+                result = ((BaseNode)right).GetValueInternal(context, evalContext);
+            }
+
+            ((BaseNode)left).SetValueInternal( context, evalContext, result );
+
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/AttributeNode.cs b/src/Spring/Spring.Core/Expressions/AttributeNode.cs
new file mode 100644
index 00000000..e241cc3c
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/AttributeNode.cs
@@ -0,0 +1,85 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed attribute node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AttributeNode.cs,v 1.9 2007/09/07 03:01:21 markpollack Exp $</version>
+    [Serializable]
+    public class AttributeNode : ConstructorNode
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public AttributeNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected AttributeNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Tries to determine attribute type based on the specified
+        /// attribute type name.
+        /// </summary>
+        /// <param name="typeName">
+        /// Attribute type name to resolve.
+        /// </param>
+        /// <returns>
+        /// Resolved attribute type.
+        /// </returns>
+        /// <exception cref="TypeLoadException">
+        /// If type cannot be resolved.
+        /// </exception>
+        protected override Type GetObjectType(string typeName)
+        {
+            Type type;
+
+            try
+            {
+                type = base.GetObjectType(typeName);
+            }
+            catch (TypeLoadException)
+            {
+                if (typeName.EndsWith("Attribute"))
+                {
+                    throw;
+                }
+                type = TypeResolutionUtils.ResolveType(typeName + "Attribute");
+            }
+
+            return type;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/BaseNode.cs b/src/Spring/Spring.Core/Expressions/BaseNode.cs
new file mode 100644
index 00000000..88d87ac2
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/BaseNode.cs
@@ -0,0 +1,267 @@
+#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.Collections;
+using System.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Base type for all expression nodes.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: BaseNode.cs,v 1.24 2007/09/07 03:01:21 markpollack Exp $</version>
+    //[Serializable]
+    public abstract class BaseNode : SpringAST, IExpression
+    {
+        #region EvaluationContext class
+
+        /// <summary>
+        /// Holds the state during evaluating an expression.
+        /// </summary>
+        public class EvaluationContext
+        {
+            #region Holder classes
+
+            private class ThisContextHolder : IDisposable
+            {
+                private readonly EvaluationContext owner;
+                private readonly object savedThisContext;
+
+                public ThisContextHolder(EvaluationContext owner)
+                {
+                    this.owner = owner;
+                    this.savedThisContext = owner.ThisContext;
+                }
+
+                public void Dispose()
+                {
+                    owner.ThisContext = savedThisContext;
+                }
+            }
+
+            private class LocalVariablesHolder : IDisposable
+            {
+                private readonly EvaluationContext owner;
+                private readonly IDictionary savedLocalVariables;
+
+                public LocalVariablesHolder(EvaluationContext owner, IDictionary newLocalVariables)
+                {
+                    this.owner = owner;
+                    this.savedLocalVariables = owner.LocalVariables;
+                    owner.LocalVariables = newLocalVariables;
+                }
+
+                public void Dispose()
+                {
+                    owner.LocalVariables = savedLocalVariables;
+                }
+            }
+
+            #endregion
+
+            /// <summary>
+			/// Gets/Sets the root context of the current evaluation
+			/// </summary>
+            public object RootContext;
+			/// <summary>
+			/// Gets the type of the <see cref="RootContext"/>
+			/// </summary>
+            public Type RootContextType { get { return (RootContext == null) ? null : RootContext.GetType(); } }
+			/// <summary>
+			/// Gets/Sets the current context of the current evaluation
+			/// </summary>
+            public object ThisContext;
+			/// <summary>
+			/// Gets/Sets global variables of the current evaluation
+			/// </summary>
+            public IDictionary Variables;
+			/// <summary>
+			/// Gets/Sets local variables of the current evaluation
+			/// </summary>
+            public IDictionary LocalVariables;
+
+            /// <summary>
+            /// Initializes a new EvaluationContext instance.
+            /// </summary>
+            /// <param name="rootContext">The root context for this evaluation</param>
+            /// <param name="globalVariables">dictionary of global variables used during this evaluation</param>
+            public EvaluationContext(object rootContext, IDictionary globalVariables)
+            {
+                this.RootContext = rootContext;
+                this.ThisContext = rootContext;
+                this.Variables = globalVariables;
+            }
+
+            /// <summary>
+            /// Switches current ThisContext.
+            /// </summary>
+            public IDisposable SwitchThisContext()
+            {
+                return new ThisContextHolder(this);
+            }
+
+            /// <summary>
+            /// Switches current LocalVariables.
+            /// </summary>
+            public IDisposable SwitchLocalVariables(IDictionary newLocalVariables)
+            {
+                return new LocalVariablesHolder(this, newLocalVariables);
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public BaseNode()
+        {}
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected BaseNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Returns node's value.
+        /// </summary>
+        /// <returns>Node's value.</returns>
+        object IExpression.GetValue()
+        {
+            return GetValue(null, null);
+        }
+
+        /// <summary>
+        /// Returns node's value for the given context.
+        /// </summary>
+        /// <param name="context">Object to evaluate node against.</param>
+        /// <returns>Node's value.</returns>
+        object IExpression.GetValue(object context)
+        {
+            return GetValue(context, null);
+        }
+
+        /// <summary>
+        /// Returns node's value for the given context.
+        /// </summary>
+        /// <param name="context">Object to evaluate node against.</param>
+        /// <param name="variables">Expression variables map.</param>
+        /// <returns>Node's value.</returns>
+        object IExpression.GetValue(object context, IDictionary variables)
+        {
+            return GetValue(context, variables);
+        }
+
+        /// <summary>
+        /// This is the entrypoint into evaluating this expression.
+        /// </summary>
+        private object GetValue(object context, IDictionary variables)
+        {
+            EvaluationContext evalContext = new EvaluationContext( context,variables );
+            return Get( context, evalContext );
+        }
+
+        /// <summary>
+        /// Called internally during expression evaluation
+        /// </summary>
+        /// <param name="context">Object to evaluate node against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns></returns>
+        protected internal object GetValueInternal(object context, EvaluationContext evalContext)
+        {
+            return Get(context, evalContext);
+        }
+
+        /// <summary>
+        /// Returns node's value for the given context.
+        /// </summary>
+        /// <returns>Node's value.</returns>
+        protected abstract object Get(object context, EvaluationContext evalContext);
+
+        /// <summary>
+        /// Sets node's value for the given context.
+        /// </summary>
+        /// <param name="context">Object to evaluate node against.</param>
+        /// <param name="newValue">New value for this node.</param>
+        void IExpression.SetValue(object context, object newValue)
+        {
+            SetValue(context, null, newValue);
+        }
+
+        /// <summary>
+        /// Sets node's value for the given context.
+        /// </summary>
+        /// <param name="context">Object to evaluate node against.</param>
+        /// <param name="variables">Expression variables map.</param>
+        /// <param name="newValue">New value for this node.</param>
+        void IExpression.SetValue(object context, IDictionary variables, object newValue)
+        {
+            SetValue( context,variables,newValue );
+        }
+
+        /// <summary>
+        /// This is the entrypoint into evaluating this expression.
+        /// </summary>
+        private void SetValue(object context,IDictionary variables,object newValue)
+        {
+            EvaluationContext evalContext = new EvaluationContext( context,variables );
+            Set( context, evalContext,newValue );
+        }
+
+        /// <summary>
+        /// Called internally during expression evaluation.
+        /// </summary>
+        protected internal void SetValueInternal(object context, EvaluationContext evalContext, object newValue)
+        {
+            Set(context, evalContext, newValue);
+        }
+
+        /// <summary>
+        /// Sets node's value for the given context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is a default implementation of <c>Set</c> method, which
+        /// simply throws <see cref="NotSupportedException"/>. 
+        /// </p>
+        /// <p>
+        /// This was done in order to avoid redundant <c>Set</c> method implementations,
+        /// because most of the node types do not support value setting.
+        /// </p>
+        /// </remarks>
+        protected virtual void Set(object context, EvaluationContext evalContext, object newValue)
+        {
+            throw new NotSupportedException("You cannot set the value for the node of this type: [" + this.GetType().Name + "].");
+        }
+        
+        /// <summary>
+        /// Returns a string representation of this node instance.
+        /// </summary>
+        public override string ToString()
+        {
+            return string.Format("{0}[{1}]", this.GetType().Name, base.GetHashCode());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/BinaryOperator.cs b/src/Spring/Spring.Core/Expressions/BinaryOperator.cs
new file mode 100644
index 00000000..0136a374
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/BinaryOperator.cs
@@ -0,0 +1,65 @@
+#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.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Base class for unary operators.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: BinaryOperator.cs,v 1.8 2007/09/07 03:01:21 markpollack Exp $</version>
+    [Serializable]
+    public abstract class BinaryOperator : BaseNode
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public BinaryOperator()
+        {}
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected BinaryOperator(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {}
+        
+        /// <summary>
+        /// Gets the left operand.
+        /// </summary>
+        /// <value>The left operand.</value>
+        public BaseNode Left
+        {
+            get { return (BaseNode) this.getFirstChild(); }
+        }
+
+        /// <summary>
+        /// Gets the right operand.
+        /// </summary>
+        /// <value>The right operand.</value>
+        public BaseNode Right
+        {
+            get { return (BaseNode) this.getFirstChild().getNextSibling(); }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/BooleanLiteralNode.cs b/src/Spring/Spring.Core/Expressions/BooleanLiteralNode.cs
new file mode 100644
index 00000000..77660747
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/BooleanLiteralNode.cs
@@ -0,0 +1,74 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed boolean literal node.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: BooleanLiteralNode.cs,v 1.9 2007/09/07 03:01:21 markpollack Exp $</version>
+    [Serializable]
+    public class BooleanLiteralNode : BaseNode
+    {
+        private object nodeValue;
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public BooleanLiteralNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected BooleanLiteralNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the boolean literal node.
+        /// </summary>
+        /// <summary>
+        /// This is the entrypoint into evaluating this expression.
+        /// </summary>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            if (nodeValue == null)
+            {
+                lock(this)
+                {
+                    if (nodeValue == null)
+                    {
+                        nodeValue = Boolean.Parse(this.getText());
+                    }
+                }
+            }
+
+            return nodeValue;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/ConstructorNode.cs b/src/Spring/Spring.Core/Expressions/ConstructorNode.cs
new file mode 100644
index 00000000..d43b39a4
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/ConstructorNode.cs
@@ -0,0 +1,208 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Reflection;
+using System.Runtime.Serialization;
+
+using Spring.Core.TypeResolution;
+using Spring.Util;
+using Spring.Reflection.Dynamic;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed method node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ConstructorNode.cs,v 1.16 2007/09/07 03:01:21 markpollack Exp $</version>
+    [Serializable]
+    public class ConstructorNode : NodeWithArguments
+    {
+        private SafeConstructor constructor;
+        private IDictionary namedArgs;
+        private bool isParamArray = false;
+        private Type paramArrayType;
+        private int argumentCount;
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public ConstructorNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected ConstructorNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Creates new instance of the type defined by this node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object[] argValues = ResolveArguments(evalContext);
+            IDictionary namedArgValues = ResolveNamedArguments(evalContext);
+
+            if (constructor == null)
+            {
+                lock(this)
+                {
+                    if (constructor == null)
+                    {
+                        constructor = InitializeNode(argValues, namedArgValues);
+                    }
+                }
+            }
+
+            object[] paramValues = (isParamArray ? ReflectionUtils.PackageParamArray(argValues, argumentCount, paramArrayType) : argValues);
+            object instance = constructor.Invoke(paramValues);
+            if (namedArgValues != null)
+            {
+                SetNamedArguments(instance, namedArgValues);
+            }
+            
+            return instance;
+        }
+
+        /// <summary>
+        /// Determines the type of object that should be instantiated.
+        /// </summary>
+        /// <param name="typeName">
+        /// The type name to resolve.
+        /// </param>
+        /// <returns>
+        /// The type of object that should be instantiated.
+        /// </returns>
+        /// <exception cref="TypeLoadException">
+        /// If the type cannot be resolved.
+        /// </exception>
+        protected virtual Type GetObjectType(string typeName)
+        {
+            return TypeResolutionUtils.ResolveType(typeName);
+        }
+
+        /// <summary>
+        /// Initializes this node by caching necessary constructor and property info.
+        /// </summary>
+        /// <param name="argValues"></param>
+        /// <param name="namedArgValues"></param>
+        private SafeConstructor InitializeNode(object[] argValues, IDictionary namedArgValues)
+        {
+            SafeConstructor ctor = null;
+            Type objectType = GetObjectType(this.getText().Trim());
+                
+            // cache constructor info
+            ConstructorInfo ci = GetBestConstructor(objectType, argValues);
+            if (ci == null)
+            {
+                throw new ArgumentException(
+                    String.Format("Constructor for the type [{0}] with a specified " +
+                                  "number and types of arguments does not exist.",
+                                  objectType.FullName));
+            }
+            else 
+            {
+                ParameterInfo[] parameters = ci.GetParameters();
+                if (parameters.Length > 0)
+                {
+                    ParameterInfo lastParameter = parameters[parameters.Length - 1];
+                    isParamArray = lastParameter.GetCustomAttributes(typeof(ParamArrayAttribute), false).Length > 0;
+                    if (isParamArray)
+                    {
+                        paramArrayType = lastParameter.ParameterType.GetElementType();
+                        argumentCount = parameters.Length;
+                    }
+                }
+                ctor = new SafeConstructor(ci);
+            }
+                
+            // cache named args info
+            if (namedArgValues != null)
+            {
+                namedArgs = new Hashtable(namedArgValues.Count);
+                foreach (string name in namedArgValues.Keys)
+                {
+                    this.namedArgs[name] = Expression.ParseProperty(name);
+                }
+            }
+
+            return ctor;
+        }
+
+        /// <summary>
+        /// Sets the named arguments (properties).
+        /// </summary>
+        /// <param name="instance">Instance to set property values on.</param>
+        /// <param name="namedArgValues">Argument (property) name to value mappings.</param>
+        private void SetNamedArguments(object instance, IDictionary namedArgValues)
+        {
+            foreach (string name in namedArgValues.Keys)
+            {
+                IExpression property = (IExpression) namedArgs[name];
+                property.SetValue(instance, namedArgValues[name]);
+            }
+        }
+
+        private static ConstructorInfo GetBestConstructor(Type type, object[] argValues)
+        {
+            ConstructorInfo[] candidates = GetCandidateConstructors(type, argValues.Length);
+            if (candidates.Length > 0)
+            {
+                return ReflectionUtils.GetConstructorByArgumentValues(candidates, argValues);
+            }
+            return null;
+        }
+
+        private static ConstructorInfo[] GetCandidateConstructors(Type type, int argCount)
+        {
+            ConstructorInfo[] ctors = type.GetConstructors();
+            ArrayList matches = new ArrayList();
+
+            foreach (ConstructorInfo ctor in ctors)
+            {
+                ParameterInfo[] parameters = ctor.GetParameters();
+                if (parameters.Length == argCount)
+                {
+                    matches.Add(ctor);
+                }
+                else if (parameters.Length > 0)
+                {
+                    ParameterInfo lastParameter = parameters[parameters.Length - 1];
+                    if (lastParameter.GetCustomAttributes(typeof(ParamArrayAttribute), false).Length > 0)
+                    {
+                        matches.Add(ctor);
+                    }
+                }
+            }
+
+            return (ConstructorInfo[]) matches.ToArray(typeof(ConstructorInfo));
+        }
+
+    }
+}
diff --git a/src/Spring/Spring.Core/Expressions/DateLiteralNode.cs b/src/Spring/Spring.Core/Expressions/DateLiteralNode.cs
new file mode 100644
index 00000000..90115ecb
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/DateLiteralNode.cs
@@ -0,0 +1,85 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Globalization;
+using System.Runtime.Serialization;
+using antlr.collections;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DateLiteralNode.cs,v 1.7 2007/09/07 03:01:21 markpollack Exp $</version>
+    [Serializable]
+    public class DateLiteralNode : BaseNode
+    {
+        private object nodeValue;
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public DateLiteralNode():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected DateLiteralNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns node's value for the given context.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            if (nodeValue == null)
+            {
+                lock (this)
+                {
+                    if (nodeValue == null)
+                    {
+                        AST dateString = this.getFirstChild();
+                        if (getNumberOfChildren() == 2)
+                        {
+                            AST dateFormat = dateString.getNextSibling();
+                            nodeValue =
+                                DateTime.ParseExact(dateString.getText(), dateFormat.getText(),
+                                                    CultureInfo.InvariantCulture);
+                        }
+                        else
+                        {
+                            nodeValue = DateTime.Parse(dateString.getText());
+                        }
+                    }
+                }
+            }
+            return nodeValue;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/DefaultNode.cs b/src/Spring/Spring.Core/Expressions/DefaultNode.cs
new file mode 100644
index 00000000..cfda1b04
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/DefaultNode.cs
@@ -0,0 +1,63 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed default node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DefaultNode.cs,v 1.3 2007/09/07 03:01:24 markpollack Exp $</version>
+    [Serializable]
+    public class DefaultNode : BinaryOperator
+    {        
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public DefaultNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected DefaultNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Returns left operand if it is not null, or the right operand if it is.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal(context, evalContext);
+            object right = Right.GetValueInternal(context, evalContext);
+
+            return (left != null ? left : right);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/Expression.cs b/src/Spring/Spring.Core/Expressions/Expression.cs
new file mode 100644
index 00000000..a646ae62
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Expression.cs
@@ -0,0 +1,285 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.IO;
+using System.Reflection;
+using System.Runtime.Serialization;
+using antlr;
+using antlr.collections;
+using Spring.Core;
+using Spring.Util;
+using StringUtils=Spring.Util.StringUtils;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Container object for the parsed expression.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Preparing this object once and reusing it many times for expression
+    /// evaluation can result in significant performance improvements, as 
+    /// expression parsing and reflection lookups are only performed once. 
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: Expression.cs,v 1.19 2008/03/20 10:35:54 oakinger Exp $</version>
+    [Serializable]
+    public class Expression : BaseNode
+    {
+        /// <summary>
+        /// Contains a list of reserved variable names.
+        /// You must not use any variable names with the reserved prefix!
+        /// </summary>
+        public class ReservedVariableNames
+        {
+            /// <summary>
+            /// Variable Names using this prefix are reserved for internal framework use
+            /// </summary>
+            public static readonly string RESERVEDPREFIX = "____spring_";
+
+            /// <summary>
+            /// variable name of the currently processed object factory, if any
+            /// </summary>
+            internal static readonly string CurrentObjectFactory = RESERVEDPREFIX + "CurrentObjectFactory";
+        }
+
+        private class SpringASTFactory : ASTFactory
+        {
+            public SpringASTFactory(Type t) : base(t.FullName)
+            {
+                base.defaultASTNodeTypeObject_ = t;
+                base.typename2creator_ = new Hashtable(32, 0.3f);
+                base.typename2creator_[t.FullName] = SpringAST.Creator;
+            }
+        }
+
+        private class SpringExpressionParser : ExpressionParser
+        {
+            public SpringExpressionParser(TokenStream lexer)
+                : base(lexer)
+            {
+                base.astFactory = new SpringASTFactory(typeof(SpringAST));
+                base.initialize();
+            }
+        }
+
+        static Expression()
+        {
+            // Ensure antlr is loaded (fixes GAC issues)!
+            Assembly antlrAss = typeof(antlr.LLkParser).Assembly;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Expression"/> class
+        /// by parsing specified expression string.
+        /// </summary>
+        /// <param name="expression">Expression to parse.</param>
+        public static IExpression Parse(string expression)
+        {
+            if (StringUtils.HasText(expression))
+            {
+                ExpressionLexer lexer = new ExpressionLexer(new StringReader(expression));
+                ExpressionParser parser = new SpringExpressionParser(lexer);
+
+                parser.expr();
+
+                return (IExpression) parser.getAST();
+            }
+            else
+            {
+                return new Expression();
+            }
+        }
+
+        /// <summary>
+        /// Registers lambda expression under the specified <paramref name="functionName"/>.
+        /// </summary>
+        /// <param name="functionName">Function name to register expression as.</param>
+        /// <param name="lambdaExpression">Lambda expression to register.</param>
+        /// <param name="variables">Variables dictionary that the function will be registered in.</param>
+        public static void RegisterFunction(string functionName, string lambdaExpression, IDictionary variables)
+        {
+            AssertUtils.ArgumentHasText(functionName, "functionName");
+            AssertUtils.ArgumentHasText(lambdaExpression, "lambdaExpression");
+
+            ExpressionLexer lexer = new ExpressionLexer(new StringReader(lambdaExpression));
+            ExpressionParser parser = new SpringExpressionParser(lexer);
+
+            parser.lambda();
+            variables[functionName] = parser.getAST();
+        }
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Expression"/> class
+        /// by parsing specified primary expression string.
+        /// </summary>
+        /// <param name="expression">Primary expression to parse.</param>
+        internal static IExpression ParsePrimary(string expression)
+        {
+            if (StringUtils.HasText(expression))
+            {
+                ExpressionLexer lexer = new ExpressionLexer(new StringReader(expression));
+                ExpressionParser parser = new SpringExpressionParser(lexer);
+
+                parser.primaryExpression();
+                return (IExpression) parser.getAST();
+            }
+            else
+            {
+                return new Expression();
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Expression"/> class
+        /// by parsing specified property expression string.
+        /// </summary>
+        /// <param name="expression">Property expression to parse.</param>
+        internal static IExpression ParseProperty(string expression)
+        {
+            if (StringUtils.HasText(expression))
+            {
+                ExpressionLexer lexer = new ExpressionLexer(new StringReader(expression));
+                ExpressionParser parser = new SpringExpressionParser(lexer);
+
+                parser.property();
+                return (IExpression) parser.getAST();
+            }
+            else
+            {
+                return new Expression();
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Expression"/> class.
+        /// </summary>
+        public Expression()
+        {}
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected Expression(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {}
+
+        /// <summary>
+        /// Evaluates this expression for the specified root object and returns 
+        /// value of the last node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Value of the last node.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object result = context;
+
+            if (this.getNumberOfChildren() > 0)
+            {
+                AST node = this.getFirstChild();
+                while (node != null)
+                {
+                    result = ((BaseNode)node).GetValueInternal( result, evalContext );
+
+                    node = node.getNextSibling();
+                }
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Evaluates this expression for the specified root object and sets 
+        /// value of the last node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <param name="newValue">Value to set last node to.</param>
+        /// <exception cref="NotSupportedException">If navigation expression is empty.</exception>
+        protected override void Set(object context, EvaluationContext evalContext, object newValue)
+        {
+            object target = context;
+
+            if (this.getNumberOfChildren() > 0)
+            {
+                AST node = this.getFirstChild();
+
+                for (int i = 0; i < this.getNumberOfChildren() - 1; i++)
+                {
+                    try
+                    {
+                        target = ((BaseNode) node).GetValueInternal(target, evalContext);
+                        node = node.getNextSibling();
+                    }
+                    catch (NotReadablePropertyException e)
+                    {
+                        throw new NotWritablePropertyException("Cannot read the value of '" + node.getText() + "' property in the expression.", e);
+                    }
+                }
+                ((BaseNode) node).SetValueInternal(target, evalContext, newValue);
+            }
+            else
+            {
+                throw new NotSupportedException("You cannot set the value for an empty expression.");
+            }
+        }
+
+        /// <summary>
+        /// Evaluates this expression for the specified root object and returns 
+        /// <see cref="PropertyInfo"/> of the last node, if possible.
+        /// </summary>
+        /// <param name="context">Context to evaluate expression against.</param>
+        /// <param name="variables">Expression variables map.</param>
+        /// <returns>Value of the last node.</returns>
+        internal PropertyInfo GetPropertyInfo(object context, IDictionary variables)
+        {
+            if (this.getNumberOfChildren() > 0)
+            {
+                object target = context;
+                AST node = this.getFirstChild();
+
+                for (int i = 0; i < this.getNumberOfChildren() - 1; i++)
+                {
+                    target = ((IExpression) node).GetValue(target, variables);
+                    node = node.getNextSibling();
+                }
+
+                if (node is PropertyOrFieldNode)
+                {
+                    return (PropertyInfo) ((PropertyOrFieldNode) node).GetMemberInfo(target);
+                }
+                else if (node is IndexerNode)
+                {
+                    return ((IndexerNode)node).GetPropertyInfo(target, variables);
+                }
+                else
+                {
+                    throw new FatalReflectionException("Cannot obtain PropertyInfo from an expression that does not resolve to a property or an indexer.");
+                }
+            }
+
+            throw new FatalReflectionException("Cannot obtain PropertyInfo for empty property name.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/Expression.g b/src/Spring/Spring.Core/Expressions/Expression.g
new file mode 100644
index 00000000..a549f6f8
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Expression.g
@@ -0,0 +1,528 @@
+options
+{
+	language = "CSharp";
+	namespace = "Spring.Expressions";
+}
+
+class ExpressionParser extends Parser;
+
+options {
+	codeGenMakeSwitchThreshold = 3;
+	codeGenBitsetTestThreshold = 4;
+	classHeaderPrefix = "internal"; 
+	buildAST=true;
+	ASTLabelType = "Spring.Expressions.SpringAST";
+	k = 2;
+}
+
+tokens {
+	EXPR;
+	OPERAND;
+	FALSE = "false";
+	TRUE = "true";
+	AND = "and";
+	OR = "or";
+	IN = "in";
+	IS = "is";
+	BETWEEN = "between";
+	LIKE = "like";
+	MATCHES = "matches";
+	NULL_LITERAL = "null";
+}
+
+{
+    // CLOVER:OFF
+    
+    public override void reportError(RecognitionException ex)
+    {
+		//base.reportError(ex);
+        throw ex;
+    }
+
+    public override void reportError(string error)
+    {
+		//base.reportError(error);
+        throw new RecognitionException(error);
+    }
+    
+    private string GetRelationalOperatorNodeType(string op)
+    {
+        switch (op)
+        {
+            case "==" : return "Spring.Expressions.OpEqual";
+            case "!=" : return "Spring.Expressions.OpNotEqual";
+            case "<" : return "Spring.Expressions.OpLess";
+            case "<=" : return "Spring.Expressions.OpLessOrEqual";
+            case ">" : return "Spring.Expressions.OpGreater";
+            case ">=" : return "Spring.Expressions.OpGreaterOrEqual";
+            case "in" : return "Spring.Expressions.OpIn";
+            case "is" : return "Spring.Expressions.OpIs";
+            case "between" : return "Spring.Expressions.OpBetween";
+            case "like" : return "Spring.Expressions.OpLike";
+            case "matches" : return "Spring.Expressions.OpMatches";
+            default : 
+                throw new ArgumentException("Node type for operator '" + op + "' is not defined.");
+        }
+    }
+}
+
+expr : expression EOF!;
+
+exprList 
+    : LPAREN! expression (SEMI! expression)+ RPAREN!
+        { #exprList = #([EXPR,"expressionList","Spring.Expressions.ExpressionListNode"], #exprList); }
+    ;
+
+expression	:	logicalOrExpression 
+				(
+					(ASSIGN^ <AST = Spring.Expressions.AssignNode> logicalOrExpression) 
+				|   (DEFAULT^ <AST = Spring.Expressions.DefaultNode> logicalOrExpression) 
+				|	(QMARK^ <AST = Spring.Expressions.TernaryNode> expression COLON! expression)
+				)?
+			;
+			
+parenExpr
+    : LPAREN! expression RPAREN!;
+    
+logicalOrExpression : logicalAndExpression (OR^ <AST = Spring.Expressions.OpOR> logicalAndExpression)* ;
+                        
+logicalAndExpression : relationalExpression (AND^ <AST = Spring.Expressions.OpAND> relationalExpression)* ;                        
+
+relationalExpression
+    :   e1:sumExpr 
+          (op:relationalOperator! e2:sumExpr
+            {#relationalExpression = #(#[EXPR, op_AST.getText(), GetRelationalOperatorNodeType(op_AST.getText())], #relationalExpression);} 
+          )?
+    ;
+
+sumExpr  : prodExpr (
+                        (PLUS^ <AST = Spring.Expressions.OpADD> 
+                        | MINUS^ <AST = Spring.Expressions.OpSUBTRACT>) prodExpr)* ; 
+
+prodExpr : powExpr (
+                        (STAR^ <AST = Spring.Expressions.OpMULTIPLY> 
+                        | DIV^ <AST = Spring.Expressions.OpDIVIDE> 
+                        | MOD^ <AST = Spring.Expressions.OpMODULUS>) powExpr)* ;
+
+powExpr  : unaryExpression (POWER^ <AST = Spring.Expressions.OpPOWER> unaryExpression)? ;
+
+unaryExpression 
+	:	(PLUS^ <AST = Spring.Expressions.OpUnaryPlus> 
+	    | MINUS^ <AST = Spring.Expressions.OpUnaryMinus> 
+	    | BANG^ <AST = Spring.Expressions.OpNOT>) unaryExpression	
+	|	primaryExpression
+	;
+	
+unaryOperator
+	: PLUS | MINUS | BANG
+    ;
+    
+primaryExpression : startNode (node)?
+			{ #primaryExpression = #([EXPR,"expression","Spring.Expressions.Expression"], #primaryExpression); };
+
+startNode 
+    : 
+    (   (LPAREN expression SEMI) => exprList 
+    |   parenExpr
+    |   methodOrProperty 
+    |   functionOrVar 
+    |   localFunctionOrVar
+    |   reference
+    |   indexer 
+    |   literal 
+    |   type 
+    |   constructor
+    |   projection 
+    |   selection 
+    |   firstSelection 
+    |   lastSelection 
+    |   listInitializer
+    |   mapInitializer
+    |   lambda
+    |   attribute
+    )
+    ;
+
+node : 
+    (   methodOrProperty 
+    |   indexer 
+    |   projection 
+    |   selection 
+    |   firstSelection 
+    |   lastSelection 
+    |   exprList
+    |	DOT! 
+    )+
+    ;
+
+functionOrVar 
+    : (POUND ID LPAREN) => function
+    | var
+    ;
+
+function : POUND! ID^ <AST = Spring.Expressions.FunctionNode> methodArgs
+    ;
+    
+var : POUND! ID^ <AST = Spring.Expressions.VariableNode>;
+
+localFunctionOrVar 
+    : (DOLLAR ID LPAREN) => localFunction
+    | localVar
+    ;
+
+localFunction : DOLLAR! ID^ <AST = Spring.Expressions.LocalFunctionNode> methodArgs
+    ;
+
+localVar : DOLLAR! ID^ <AST = Spring.Expressions.LocalVariableNode>;
+
+methodOrProperty
+	:	(ID LPAREN)=>
+		ID^ <AST = Spring.Expressions.MethodNode> methodArgs
+	|	property
+	;
+
+methodArgs
+	:  LPAREN! (argument (COMMA! argument)*)? RPAREN!
+	;
+
+property
+    :  ID <AST = Spring.Expressions.PropertyOrFieldNode>
+    ;
+
+reference
+  :  AT! LPAREN! (cn:contextName! COLON!)? id:qualifiedId! RPAREN!
+       { #reference = #([EXPR, "ref", "Spring.Context.Support.ReferenceNode"], #cn, #id); }
+  ;
+
+indexer
+	:	
+      LBRACKET^ <AST = Spring.Expressions.IndexerNode> argument (COMMA! argument)* RBRACKET!
+	;
+
+projection
+	:	
+		PROJECT^ <AST = Spring.Expressions.ProjectionNode> expression RCURLY!
+	;
+
+selection
+	:	
+		SELECT^ <AST = Spring.Expressions.SelectionNode> expression (COMMA! expression)* RCURLY!
+	;
+
+firstSelection
+	:	
+		SELECT_FIRST^ <AST = Spring.Expressions.SelectionFirstNode> expression RCURLY!
+	;
+
+lastSelection
+	:	
+		SELECT_LAST^ <AST = Spring.Expressions.SelectionLastNode> expression RCURLY!
+	;
+
+type
+    :   TYPE! tn:qualifiedId! (LBRACKET RBRACKET)? (COMMA qualifiedId)? RPAREN!
+		   { #type = #([EXPR, tn_AST.getText(), "Spring.Expressions.TypeNode"], #type); }
+    ;
+
+attribute
+	:	AT! LBRACKET! tn:qualifiedId! (ctorArgs)? RBRACKET!
+		   { #attribute = #([EXPR, tn_AST.getText(), "Spring.Expressions.AttributeNode"], #attribute); }
+	;
+
+lambda
+    :   LAMBDA! (argList)? PIPE! expression RCURLY!
+		   { #lambda = #([EXPR, "lambda", "Spring.Expressions.LambdaExpressionNode"], #lambda); }
+	;
+
+argList : (ID (COMMA! ID)*)
+		   { #argList = #([EXPR, "args"], #argList); }
+	;
+
+constructor
+	:	("new" qualifiedId LPAREN) => "new"! type:qualifiedId! ctorArgs
+		   { #constructor = #([EXPR, type_AST.getText(), "Spring.Expressions.ConstructorNode"], #constructor); }
+	|   arrayConstructor
+	;
+
+arrayConstructor
+	:	 "new"! type:qualifiedId! arrayRank (listInitializer)?
+	       { #arrayConstructor = #([EXPR, type_AST.getText(), "Spring.Expressions.ArrayConstructorNode"], #arrayConstructor); }
+	;
+    
+arrayRank
+    :   LBRACKET^ (expression (COMMA! expression)*)? RBRACKET!
+    ;
+
+listInitializer
+    :   LCURLY^ <AST = Spring.Expressions.ListInitializerNode> expression (COMMA! expression)* RCURLY!
+    ;
+
+mapInitializer
+    :   POUND! LCURLY^ <AST = Spring.Expressions.MapInitializerNode> mapEntry (COMMA! mapEntry)* RCURLY!
+    ;
+      
+mapEntry
+    :   expression COLON! expression
+          { #mapEntry = #([EXPR, "entry", "Spring.Expressions.MapEntryNode"], #mapEntry); }
+    ;
+     
+ctorArgs : LPAREN! (namedArgument (COMMA! namedArgument)*)? RPAREN!;
+            
+argument : expression;
+
+namedArgument 
+    :   (ID ASSIGN) => ID^ <AST = Spring.Expressions.NamedArgumentNode> ASSIGN! expression 
+    |   argument 
+    ;
+
+qualifiedId : ID^ <AST = Spring.Expressions.QualifiedIdentifier> (DOT ID)*
+    ;
+
+contextName : ID^ <AST = Spring.Expressions.QualifiedIdentifier> (DIV ID)*
+    ;
+        
+literal
+	:	NULL_LITERAL <AST = Spring.Expressions.NullLiteralNode>
+	|   INTEGER_LITERAL <AST = Spring.Expressions.IntLiteralNode>
+	|   HEXADECIMAL_INTEGER_LITERAL <AST = Spring.Expressions.HexLiteralNode>
+	|   REAL_LITERAL <AST = Spring.Expressions.RealLiteralNode>
+	|	STRING_LITERAL <AST = Spring.Expressions.StringLiteralNode>
+	|   boolLiteral
+	|   dateLiteral
+	;
+
+boolLiteral
+    :   TRUE <AST = Spring.Expressions.BooleanLiteralNode>
+    |   FALSE <AST = Spring.Expressions.BooleanLiteralNode>
+    ;
+    
+dateLiteral
+    :   "date"^ <AST = Spring.Expressions.DateLiteralNode> 
+            LPAREN! STRING_LITERAL (COMMA! STRING_LITERAL)? RPAREN!
+    ;
+
+relationalOperator
+    :   EQUAL 
+    |   NOT_EQUAL
+    |   LESS_THAN
+    |   LESS_THAN_OR_EQUAL      
+    |   GREATER_THAN            
+    |   GREATER_THAN_OR_EQUAL 
+    |   IN   
+    |   IS   
+    |   BETWEEN   
+    |   LIKE   
+    |   MATCHES   
+    ; 
+    
+
+class ExpressionLexer extends Lexer;
+
+options {
+    charVocabulary = '\u0000' .. '\uFFFE'; 
+	classHeaderPrefix = "internal"; 
+	k = 2;
+}
+
+{
+    // CLOVER:OFF
+}
+
+WS	:	(' '
+	|	'\t'
+	|	'\n'
+	|	'\r')
+		{ _ttype = Token.SKIP; }
+	;
+
+AT: '@'
+  ;
+
+PIPE: '|'
+  ;
+
+BANG: '!'
+  ;
+
+QMARK: '?'
+  ;
+
+DOLLAR: '$'
+  ;
+
+POUND: '#'
+  ;
+    
+LPAREN:	'('
+	;
+
+RPAREN:	')'
+	;
+
+LBRACKET:	'['
+	;
+
+RBRACKET:	']'
+	;
+
+LCURLY:	'{'
+	;
+
+RCURLY:	'}'
+	;
+
+COMMA : ','
+   ;
+
+SEMI: ';'
+  ;
+
+COLON: ':'
+  ;
+
+ASSIGN: '='
+  ;
+
+DEFAULT: "??"
+  ;
+  
+PLUS: '+'
+  ;
+
+MINUS: '-'
+  ;
+   
+DIV: '/'
+  ;
+
+STAR: '*'
+  ;
+
+MOD: '%'
+  ;
+
+POWER: '^'
+  ;
+  
+EQUAL: "=="
+  ;
+
+NOT_EQUAL: "!="
+  ;
+
+LESS_THAN: '<'
+  ;
+
+LESS_THAN_OR_EQUAL: "<="
+  ;
+
+GREATER_THAN: '>'
+  ;
+
+GREATER_THAN_OR_EQUAL: ">="
+  ;
+
+PROJECT: "!{"
+  ;
+  
+SELECT: "?{"
+  ;
+
+SELECT_FIRST: "^{"
+  ;
+  
+SELECT_LAST: "${"
+  ;
+
+TYPE: "T("
+  ;
+
+LAMBDA: "{|"
+  ;
+
+DOT_ESCAPED: "\\."
+  ;
+  
+STRING_LITERAL
+	:	'\''! (APOS|~'\'')* '\''!
+	;
+
+protected 
+APOS : '\''! '\''
+    ;
+  
+ID
+options {
+	testLiterals = true;
+}
+	:	('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|DOT_ESCAPED)*
+	;
+
+NUMERIC_LITERAL
+
+	// real
+	:	('.' DECIMAL_DIGIT) =>
+		 '.' (DECIMAL_DIGIT)+ (EXPONENT_PART)? (REAL_TYPE_SUFFIX)?
+		{$setType(REAL_LITERAL);}
+			
+	|	((DECIMAL_DIGIT)+ '.' DECIMAL_DIGIT) =>
+		 (DECIMAL_DIGIT)+ '.' (DECIMAL_DIGIT)+ (EXPONENT_PART)? (REAL_TYPE_SUFFIX)?
+		{$setType(REAL_LITERAL);}
+		
+	|	((DECIMAL_DIGIT)+ (EXPONENT_PART)) =>
+		 (DECIMAL_DIGIT)+ (EXPONENT_PART) (REAL_TYPE_SUFFIX)?
+		{$setType(REAL_LITERAL);}
+		
+	|	((DECIMAL_DIGIT)+ (REAL_TYPE_SUFFIX)) =>
+		 (DECIMAL_DIGIT)+ (REAL_TYPE_SUFFIX)		
+		{$setType(REAL_LITERAL);}
+		 
+	// integer
+	|	 (DECIMAL_DIGIT)+ (INTEGER_TYPE_SUFFIX)?	
+		{$setType(INTEGER_LITERAL);}
+	
+	// just a dot
+	| '.'{$setType(DOT);}
+	;
+
+	
+HEXADECIMAL_INTEGER_LITERAL
+	:	"0x"   (HEX_DIGIT)+   (INTEGER_TYPE_SUFFIX)?
+	;
+
+protected
+DECIMAL_DIGIT
+	: 	'0'..'9'
+	;
+protected	
+INTEGER_TYPE_SUFFIX
+	:
+	(	options {generateAmbigWarnings=false;}
+		:	"UL"	| "LU" 	| "ul"	| "lu"
+		|	"UL"	| "LU" 	| "uL"	| "lU"
+		|	"U"		| "L"	| "u"	| "l"
+	)
+	;
+		
+protected
+HEX_DIGIT
+	:	'0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | 
+		'A' | 'B' | 'C' | 'D' | 'E' | 'F'  |
+		'a' | 'b' | 'c' | 'd' | 'e' | 'f'
+	;	
+	
+protected	
+EXPONENT_PART
+	:	"e"  (SIGN)*  (DECIMAL_DIGIT)+
+	|	"E"  (SIGN)*  (DECIMAL_DIGIT)+
+	;	
+	
+protected
+SIGN
+	:	'+' | '-'
+	;
+	
+protected
+REAL_TYPE_SUFFIX
+	: 'F' | 'f' | 'D' | 'd' | 'M' | 'm'
+	;
diff --git a/src/Spring/Spring.Core/Expressions/ExpressionConverter.cs b/src/Spring/Spring.Core/Expressions/ExpressionConverter.cs
new file mode 100644
index 00000000..3550bbcf
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/ExpressionConverter.cs
@@ -0,0 +1,87 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+using Spring.Expressions;
+
+#endregion
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Converts string representation of expression into an instance of <see cref="IExpression"/>.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ExpressionConverter.cs,v 1.1 2007/07/31 02:13:52 markpollack Exp $</version>
+    public class ExpressionConverter : TypeConverter
+    {
+        /// <summary>
+        /// Can we convert from a the sourcetype to a <see cref="IExpression"/>?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Currently only supports conversion from a <see cref="System.String"/> instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="sourceType">
+        /// A <see cref="System.Type"/> that represents the
+        /// <see cref="System.Type"/> you want to convert from.
+        /// </param>
+        /// <returns><see langword="true"/> if the conversion is possible.</returns>
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            return (sourceType == typeof(string));
+        }
+
+        /// <summary>
+        /// Convert from a <see cref="System.String"/> value to an
+        /// <see cref="IExpression"/> instance.
+        /// </summary>
+        /// <param name="context">
+        /// A <see cref="System.ComponentModel.ITypeDescriptorContext"/>
+        /// that provides a format context.
+        /// </param>
+        /// <param name="culture">
+        /// The <see cref="System.Globalization.CultureInfo"/> to use
+        /// as the current culture.
+        /// </param>
+        /// <param name="value">
+        /// The value that is to be converted.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.String"/> array if successful.
+        /// </returns>        
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            return Expression.Parse(value as string);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/ExpressionEvaluator.cs b/src/Spring/Spring.Core/Expressions/ExpressionEvaluator.cs
new file mode 100644
index 00000000..e768a04a
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/ExpressionEvaluator.cs
@@ -0,0 +1,98 @@
+#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.Collections;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Utility class that enables easy expression evaluation.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This class allows users to get or set properties, execute methods, and evaluate
+    /// logical and arithmetic expressions.
+    /// </p>
+    /// <p>
+    /// Methods in this class parse expression on every invocation.
+    /// If you plan to reuse the same expression many times, you should prepare
+    /// the expression once using the static <see cref="Expression.Parse(string)"/> method,
+    /// and then call <see cref="IExpression.GetValue(object, IDictionary)"/> to evaluate it.
+    /// </p>
+    /// <p>
+    /// This can result in significant performance improvements as it avoids expression
+    /// parsing and node resolution every time it is called. 
+    /// </p>
+    /// <p>
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ExpressionEvaluator.cs,v 1.2 2006/04/09 07:18:39 markpollack Exp $</version>
+    public class ExpressionEvaluator
+    {
+        /// <summary>
+        /// Parses and evaluates specified expression.
+        /// </summary>
+        /// <param name="root">Root object.</param>
+        /// <param name="expression">Expression to evaluate.</param>
+        /// <returns>Value of the last node in the expression.</returns>
+        public static object GetValue(object root, string expression)
+        {
+            return Expression.Parse(expression).GetValue(root, null);
+        }
+
+        /// <summary>
+        /// Parses and evaluates specified expression.
+        /// </summary>
+        /// <param name="root">Root object.</param>
+        /// <param name="expression">Expression to evaluate.</param>
+        /// <param name="variables">Expression variables map.</param>
+        /// <returns>Value of the last node in the expression.</returns>
+        public static object GetValue(object root, string expression, IDictionary variables)
+        {
+            return Expression.Parse(expression).GetValue(root, variables);
+        }
+
+        /// <summary>
+        /// Parses and specified expression and sets the value of the
+        /// last node to the value of the <c>newValue</c> parameter.
+        /// </summary>
+        /// <param name="root">Root object.</param>
+        /// <param name="expression">Expression to evaluate.</param>
+        /// <param name="newValue">Value to set last node to.</param>
+        public static void SetValue(object root, string expression, object newValue)
+        {
+            Expression.Parse(expression).SetValue(root, null, newValue);
+        }
+
+        /// <summary>
+        /// Parses and specified expression and sets the value of the
+        /// last node to the value of the <c>newValue</c> parameter.
+        /// </summary>
+        /// <param name="root">Root object.</param>
+        /// <param name="expression">Expression to evaluate.</param>
+        /// <param name="variables">Expression variables map.</param>
+        /// <param name="newValue">Value to set last node to.</param>
+        public static void SetValue(object root, string expression, IDictionary variables, object newValue)
+        {
+            Expression.Parse(expression).SetValue(root, variables, newValue);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs b/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs
new file mode 100644
index 00000000..a59771b3
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs
@@ -0,0 +1,69 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using antlr.collections;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed expression list node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ExpressionListNode.cs,v 1.6 2007/09/07 03:01:24 markpollack Exp $</version>
+    [Serializable]
+    public class ExpressionListNode : BaseNode
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public ExpressionListNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected ExpressionListNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a result of the last expression in a list.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Result of the last expression in a list</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object result = context;
+
+            AST node = this.getFirstChild();
+            while (node != null)
+            {
+                result = ((BaseNode) node).GetValueInternal(context, evalContext);
+                node = node.getNextSibling();
+            }
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/FunctionNode.cs b/src/Spring/Spring.Core/Expressions/FunctionNode.cs
new file mode 100644
index 00000000..b7b4f369
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/FunctionNode.cs
@@ -0,0 +1,93 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed function node.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: FunctionNode.cs,v 1.7 2008/03/20 23:58:16 oakinger Exp $</version>
+    [Serializable]
+    public class FunctionNode : NodeWithArguments
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public FunctionNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected FunctionNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Evaluates function represented by this node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Result of the function evaluation.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            string name = this.getText();
+            LambdaExpressionNode lambda = evalContext.Variables[name] as LambdaExpressionNode;
+            Delegate function = evalContext.Variables[name] as Delegate;
+
+            if (lambda == null && function == null)
+            {
+                throw new InvalidOperationException("Function '" + name + "' is not defined.");
+            }
+
+            object[] argValues = ResolveArguments(evalContext);
+
+            // delegate?
+            if (function != null)
+            {
+                return function.DynamicInvoke(argValues);
+            }
+
+            // lambda!
+            string[] argNames = lambda.ArgumentNames;
+
+            if (argValues.Length != argNames.Length)
+            {
+                throw new InvalidOperationException(
+                    "Function '" + name + "' requires " + argNames.Length + " arguments.");
+            }
+
+            IDictionary arguments = new Hashtable();
+            for (int i = 0; i < argValues.Length; i++)
+            {
+                arguments[argNames[i]] = argValues[i];
+            }
+
+            return lambda.GetValueInternal(context, evalContext, arguments);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/HexLiteralNode.cs b/src/Spring/Spring.Core/Expressions/HexLiteralNode.cs
new file mode 100644
index 00000000..6e863d88
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/HexLiteralNode.cs
@@ -0,0 +1,82 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Globalization;
+using System.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed hexadecimal integer literal node.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: HexLiteralNode.cs,v 1.9 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class HexLiteralNode : BaseNode
+    {
+        private object nodeValue;
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public HexLiteralNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected HexLiteralNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the hexadecimal integer literal node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            if (nodeValue == null)
+            {
+                lock (this)
+                {
+                    if (nodeValue == null)
+                    {
+                        string n = this.getText();
+                        try
+                        {
+                            nodeValue = Int32.Parse(n.Substring(2), NumberStyles.HexNumber);
+                        }
+                        catch (OverflowException)
+                        {
+                            nodeValue = Int64.Parse(n.Substring(2), NumberStyles.HexNumber);
+                        }
+                    }
+                }
+            }
+
+            return nodeValue;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/IExpression.cs b/src/Spring/Spring.Core/Expressions/IExpression.cs
new file mode 100644
index 00000000..e5d76d5b
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/IExpression.cs
@@ -0,0 +1,70 @@
+#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.Collections;
+using System.ComponentModel;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Interface that all navigation expression nodes have to implement.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IExpression.cs,v 1.5 2007/07/31 08:18:20 markpollack Exp $</version>
+    [TypeConverter(typeof(ExpressionConverter))]
+    public interface IExpression
+    {
+        /// <summary>
+        /// Returns expression value.
+        /// </summary>
+        /// <returns>Value of the expression.</returns>
+        object GetValue();
+
+        /// <summary>
+        /// Returns expression value.
+        /// </summary>
+        /// <param name="context">Object to evaluate expression against.</param>
+        /// <returns>Value of the expression.</returns>
+        object GetValue(object context);
+
+        /// <summary>
+        /// Returns expression value.
+        /// </summary>
+        /// <param name="context">Object to evaluate expression against.</param>
+        /// <param name="variables">Expression variables map.</param>
+        /// <returns>Value of the expression.</returns>
+        object GetValue(object context, IDictionary variables);
+
+        /// <summary>
+        /// Sets expression value.
+        /// </summary>
+        /// <param name="context">Object to evaluate expression against.</param>
+        /// <param name="newValue">New value for the last node of the expression.</param>
+        void SetValue(object context, object newValue);
+
+        /// <summary>
+        /// Sets expression value.
+        /// </summary>
+        /// <param name="context">Object to evaluate expression against.</param>
+        /// <param name="variables">Expression variables map.</param>
+        /// <param name="newValue">New value for the last node of the expression.</param>
+        void SetValue(object context, IDictionary variables, object newValue);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/IndexerNode.cs b/src/Spring/Spring.Core/Expressions/IndexerNode.cs
new file mode 100644
index 00000000..d0b32143
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/IndexerNode.cs
@@ -0,0 +1,294 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Reflection;
+using System.Runtime.Serialization;
+using Spring.Core;
+using Spring.Util;
+using Spring.Reflection.Dynamic;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed indexer node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IndexerNode.cs,v 1.16 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class IndexerNode : NodeWithArguments
+    {
+        private const BindingFlags BINDING_FLAGS
+            = BindingFlags.Public | BindingFlags.NonPublic
+            | BindingFlags.Instance | BindingFlags.Static
+            | BindingFlags.IgnoreCase;
+
+        private SafeIndexer indexer;
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public IndexerNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected IndexerNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns node's value for the given context.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            if (context == null)
+            {
+                throw new NullValueInNestedPathException("Cannot retrieve the value of the indexer because the context for its resolution is null.");
+            }
+
+            try
+            {
+                if (context is Array)
+                {
+                    return GetArrayValue( (Array) context, evalContext );
+                }
+                else if (context is IList)
+                {
+                    return GetListValue( (IList) context, evalContext );
+                }
+                else if (context is IDictionary)
+                {
+                    return GetDictionaryValue( (IDictionary) context, evalContext );
+                }
+                else if (context is string)
+                {
+                    return GetCharacter( (string) context, evalContext );
+                }
+                else
+                {
+                    return GetGenericIndexer( context, evalContext );
+                }
+            }
+            catch (TargetInvocationException e)
+            {
+                throw new InvalidPropertyException(evalContext.RootContextType, this.ToString(), "Getter for indexer threw an exception.", e);
+            }
+            catch (UnauthorizedAccessException e)
+            {
+                throw new InvalidPropertyException( evalContext.RootContextType,this.ToString(),"Illegal attempt to get value for the indexer.",e );
+            }
+            catch (IndexOutOfRangeException e)
+            {
+                throw new InvalidPropertyException( evalContext.RootContextType,this.ToString(),"Index out of range.",e );
+            }
+            catch (ArgumentOutOfRangeException e)
+            {
+                throw new InvalidPropertyException( evalContext.RootContextType,this.ToString(),"Argument out of range.",e );
+            }
+            catch (InvalidCastException e)
+            {
+                throw new InvalidPropertyException( evalContext.RootContextType,this.ToString(),"Invalid index type.",e );
+            }
+            catch (ArgumentException e)
+            {
+                throw new InvalidPropertyException( evalContext.RootContextType,this.ToString(),"Invalid argument.",e );
+            }
+        }
+
+        /// <summary>
+        /// Sets node's value for the given context.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <param name="newValue">New value for this node.</param>
+        protected override void Set(object context, EvaluationContext evalContext, object newValue)
+        {
+            if (context == null)
+            {
+                throw new NullValueInNestedPathException("Cannot set the value of the indexer because the context for its resolution is null.");
+            }
+            
+            try
+            {
+                if (context is Array)
+                {
+                    SetArrayValue( (Array) context, evalContext,newValue );
+                }
+                else if (context is IList)
+                {
+                    SetListValue( (IList) context, evalContext,newValue );
+                }
+                else if (context is IDictionary)
+                {
+                    SetDictionaryValue( (IDictionary) context, evalContext,newValue );
+                }
+                else
+                {
+                    SetGenericIndexer( context, evalContext,newValue );
+                }
+            }
+            catch (TargetInvocationException e)
+            {
+                throw new InvalidPropertyException( evalContext.RootContextType,this.ToString(),"Setter for indexer threw an exception.",e );
+            }
+            catch (UnauthorizedAccessException e)
+            {
+                throw new InvalidPropertyException( evalContext.RootContextType,this.ToString(),"Illegal attempt to set value for the indexer.",e );
+            }
+            catch (IndexOutOfRangeException e)
+            {
+                throw new InvalidPropertyException( evalContext.RootContextType,this.ToString(),"Index out of range.",e );
+            }
+            catch (ArgumentOutOfRangeException e)
+            {
+                throw new InvalidPropertyException( evalContext.RootContextType,this.ToString(),"Argument out of range.",e );
+            }
+            catch (InvalidCastException e)
+            {
+                throw new InvalidPropertyException( evalContext.RootContextType,this.ToString(),"Invalid index type.",e );
+            }
+            catch (ArgumentException e)
+            {
+                throw new InvalidPropertyException( evalContext.RootContextType,this.ToString(),"Invalid argument.",e );
+            }
+            
+        }
+
+        /// <summary>
+        /// Utility method that is needed by ObjectWrapper and AbstractAutowireCapableObjectFactory.
+        /// </summary>
+        /// <param name="context">Context to resolve property against.</param>
+        /// <param name="variables">Expression variables map.</param>
+        /// <returns>PropertyInfo for this node.</returns>
+        internal PropertyInfo GetPropertyInfo(object context, IDictionary variables)
+        {
+            lock (this)
+            {
+                EvaluationContext evalContext = new EvaluationContext(context, variables);
+                InitializeIndexerProperty(context, evalContext);
+
+                return indexer.IndexerProperty;
+            }
+        }
+
+        private object GetArrayValue(Array array, EvaluationContext evalContext)
+        {
+            int argCount = array.Rank;
+            AssertArgumentCount(argCount);
+
+            Int32[] indices = new Int32[argCount];
+            for (int i = 0; i < argCount; i++)
+            {
+                indices[i] = (Int32) ResolveArgument(i, evalContext);
+            }
+            return array.GetValue(indices);
+        }
+
+        private object GetListValue(IList list, EvaluationContext evalContext)
+        {
+            AssertArgumentCount(1);
+            return list[(int) ResolveArgument(0, evalContext)];
+        }
+
+        private object GetDictionaryValue(IDictionary dictionary, EvaluationContext evalContext)
+        {
+            AssertArgumentCount(1);
+            return dictionary[ResolveArgument( 0,evalContext )];
+        }
+
+        private object GetCharacter(string character, EvaluationContext evalContext)
+        {
+            AssertArgumentCount(1);
+            return character[(int)ResolveArgument( 0,evalContext )];
+        }
+
+        private object GetGenericIndexer(object context, EvaluationContext evalContext)
+        {
+            object[] indices = InitializeIndexerProperty( context, evalContext );
+            return indexer.GetValue(context, indices);
+        }
+
+        private void SetArrayValue(Array array, EvaluationContext evalContext,object newValue)
+        {
+            int argCount = array.Rank;
+            AssertArgumentCount(argCount);
+
+            Int32[] indices = new Int32[argCount];
+            for (int i = 0; i < argCount; i++)
+            {
+                indices[i] = (Int32) ResolveArgument(i, evalContext);
+            }
+            array.SetValue(newValue, indices);
+        }
+
+        private void SetListValue(IList list, EvaluationContext evalContext,object newValue)
+        {
+            AssertArgumentCount(1);
+            list[(int) ResolveArgument(0, evalContext)] = newValue;
+        }
+
+        private void SetDictionaryValue(IDictionary dictionary, EvaluationContext evalContext,object newValue)
+        {
+            AssertArgumentCount(1);
+            dictionary[ResolveArgument( 0,evalContext )] = newValue;
+        }
+
+        private void SetGenericIndexer(object context, EvaluationContext evalContext,object newValue)
+        {
+            object[] indices = InitializeIndexerProperty( context, evalContext );
+            indexer.SetValue( context,indices,newValue );
+        }
+
+        private object[] InitializeIndexerProperty(object context, EvaluationContext evalContext)
+        {
+            object[] indices = ResolveArguments( evalContext );
+
+            if (indexer == null)
+            {
+                lock (this)
+                {
+                    if (indexer == null)
+                    {
+                        Type[] argTypes = ReflectionUtils.GetTypes(indices);
+                        PropertyInfo indexerProperty = context.GetType().GetProperty("Item", BINDING_FLAGS, null, null, argTypes, null);
+                        if (indexerProperty == null)
+                        {
+                            throw new ArgumentException("Indexer property with specified number and types of arguments does not exist.");
+                        }
+                        else
+                        {
+                            indexer = new SafeIndexer(indexerProperty);
+                        }
+                    }
+                }
+            }
+
+            return indices;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/IntLiteralNode.cs b/src/Spring/Spring.Core/Expressions/IntLiteralNode.cs
new file mode 100644
index 00000000..856ca77e
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/IntLiteralNode.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed integer literal node.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IntLiteralNode.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class IntLiteralNode : BaseNode
+    {
+        private object nodeValue;
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public IntLiteralNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected IntLiteralNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the integer literal node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            if (nodeValue == null)
+            {
+                lock (this)
+                {
+                    if (nodeValue == null)
+                    {
+                        string n = this.getText();
+                        try
+                        {
+                            nodeValue = Int32.Parse(n);
+                        }
+                        catch (OverflowException)
+                        {
+                            nodeValue = Int64.Parse(n);
+                        }
+                    }
+                }
+            }
+
+            return nodeValue;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs b/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs
new file mode 100644
index 00000000..a2983f62
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs
@@ -0,0 +1,138 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+using antlr.collections;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents lambda expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: LambdaExpressionNode.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class LambdaExpressionNode : BaseNode
+    {
+        /// <summary>
+        /// caches argumentNames of this instance
+        /// </summary>
+        private string[] argumentNames;
+        
+        /// <summary>
+        /// caches body expression of this lambda function
+        /// </summary>
+        private BaseNode bodyExpression;
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public LambdaExpressionNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected LambdaExpressionNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Gets argument names for this lambda expression.
+        /// </summary>
+        public string[] ArgumentNames
+        {
+            get
+            {
+                if(bodyExpression == null)
+                {
+                    InitializeLambda();
+                }
+                return argumentNames;
+            }
+        }
+
+        /// <summary>
+        /// Assigns value of the right operand to the left one.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            if(bodyExpression == null)
+            {
+                InitializeLambda();
+            }
+
+            object result = bodyExpression.GetValueInternal(context, evalContext);
+            return result;
+        }
+
+        /// <summary>
+        /// Returns Lambda Expression's value for the given context.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <param name="arguments">A dictionary containing argument map for this lambda expression.</param>
+        /// <returns>Node's value.</returns>
+        public object GetValueInternal(object context, EvaluationContext evalContext, IDictionary arguments)
+        {
+            using (evalContext.SwitchLocalVariables(arguments))
+            {
+                object result = base.GetValueInternal(context, evalContext);
+                return result;
+            }
+        }
+        
+        private void InitializeLambda()
+        {
+            lock (this)
+            {
+                if (bodyExpression == null)
+                {
+                    if (this.getNumberOfChildren() == 1)
+                    {
+                        argumentNames = new string[0];
+                        bodyExpression = (BaseNode)this.getFirstChild();
+                    }
+                    else
+                    {
+                        AST argsNode = this.getFirstChild();
+                        argumentNames = new string[argsNode.getNumberOfChildren()];
+                        AST argNode = argsNode.getFirstChild();
+                        int i = 0;
+                        while (argNode != null)
+                        {
+                            argumentNames[i++] = argNode.getText();
+                            argNode = argNode.getNextSibling();
+                        }
+
+                        bodyExpression = (BaseNode)argsNode.getNextSibling();
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/ListInitializerNode.cs b/src/Spring/Spring.Core/Expressions/ListInitializerNode.cs
new file mode 100644
index 00000000..a2dc371a
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/ListInitializerNode.cs
@@ -0,0 +1,62 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+	/// <summary>
+	/// Represents parsed list initializer node in the navigation expression.
+	/// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ListInitializerNode.cs,v 1.4 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class ListInitializerNode : NodeWithArguments
+	{
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public ListInitializerNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected ListInitializerNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+	    
+        /// <summary>
+        /// Creates new instance of the list defined by this node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object[] values = ResolveArguments(evalContext);
+            return new ArrayList(values);
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Expressions/LocalFunctionNode.cs b/src/Spring/Spring.Core/Expressions/LocalFunctionNode.cs
new file mode 100644
index 00000000..deba2fd5
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/LocalFunctionNode.cs
@@ -0,0 +1,85 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents local function node.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: LocalFunctionNode.cs,v 1.7 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class LocalFunctionNode : NodeWithArguments
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public LocalFunctionNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected LocalFunctionNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Evaluates function represented by this node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Result of the function evaluation.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            string name = this.getText();
+            IDictionary locals = evalContext.LocalVariables;
+            LambdaExpressionNode lambda = locals[name] as LambdaExpressionNode;
+            
+            if (lambda == null)
+            {
+                throw new InvalidOperationException("Function '" + name + "' is not defined.");
+            }
+
+            object[] argValues = ResolveArguments(evalContext);
+            string[] argNames = lambda.ArgumentNames;
+            
+            if (argValues.Length != argNames.Length)
+            {
+                throw new InvalidOperationException(
+                    "Function '" + name + "' requires " + argNames.Length + " arguments.");
+            }
+
+            IDictionary arguments = new Hashtable();
+            for (int i = 0; i < argValues.Length; i++)
+            {
+                arguments[argNames[i]] = argValues[i];
+            }
+            
+            return lambda.GetValueInternal(context, evalContext, arguments);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/LocalVariableNode.cs b/src/Spring/Spring.Core/Expressions/LocalVariableNode.cs
new file mode 100644
index 00000000..e4268ec5
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/LocalVariableNode.cs
@@ -0,0 +1,87 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed variable node.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: LocalVariableNode.cs,v 1.4 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class LocalVariableNode : BaseNode
+    {
+        //internal const string LOCAL_VARIABLES = "__locals";
+     
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public LocalVariableNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected LocalVariableNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns value of the local variable represented by this node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            string varName = this.getText();
+            IDictionary locals = evalContext.LocalVariables;
+            if (locals != null)
+            {
+                return locals[varName];
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Sets value of the local variable represented by this node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <param name="newValue">New value for this node.</param>
+        protected override void Set(object context, EvaluationContext evalContext, object newValue)
+        {
+            string varName = this.getText();
+            IDictionary locals = evalContext.LocalVariables;
+            if (locals == null)
+            {
+                locals = new Hashtable();
+                evalContext.LocalVariables = locals;
+            }
+            locals[varName] = newValue;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/MapEntryNode.cs b/src/Spring/Spring.Core/Expressions/MapEntryNode.cs
new file mode 100644
index 00000000..ea3bd763
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/MapEntryNode.cs
@@ -0,0 +1,63 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed map entry node.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: MapEntryNode.cs,v 1.4 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class MapEntryNode : BaseNode
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="MapEntryNode"/>.
+        /// </summary>
+        public MapEntryNode()
+        {}
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected MapEntryNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Creates new instance of the map entry defined by this node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object key = ((BaseNode)this.getFirstChild()).GetValueInternal(context, evalContext);
+            object value = ((BaseNode)this.getFirstChild().getNextSibling()).GetValueInternal(context, evalContext);
+
+            return new DictionaryEntry(key, value);
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs b/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs
new file mode 100644
index 00000000..53a322b2
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs
@@ -0,0 +1,71 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+using antlr.collections;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed map initializer node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: MapInitializerNode.cs,v 1.4 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class MapInitializerNode : BaseNode
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="MapInitializerNode"/>.
+        /// </summary>
+        public MapInitializerNode()
+        {}
+
+         /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected MapInitializerNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Creates new instance of the map defined by this node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            IDictionary entries = new Hashtable();
+            AST entryNode = this.getFirstChild();
+            while (entryNode != null)
+            {
+                DictionaryEntry entry = (DictionaryEntry)
+                                        ((MapEntryNode)entryNode).GetValueInternal( evalContext.RootContext, evalContext );
+                entries[entry.Key] = entry.Value;
+                entryNode = entryNode.getNextSibling();
+            }
+
+            return entries;
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Expressions/MethodNode.cs b/src/Spring/Spring.Core/Expressions/MethodNode.cs
new file mode 100644
index 00000000..4e446eab
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/MethodNode.cs
@@ -0,0 +1,287 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Reflection;
+using System.Runtime.Serialization;
+using Spring.Expressions.Processors;
+using Spring.Util;
+using Spring.Reflection.Dynamic;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed method node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: MethodNode.cs,v 1.21 2008/03/20 23:58:16 oakinger Exp $</version>
+    [Serializable]
+    public class MethodNode : NodeWithArguments
+    {
+        private const BindingFlags BINDING_FLAGS
+            = BindingFlags.Public | BindingFlags.NonPublic
+            | BindingFlags.Instance | BindingFlags.Static
+            | BindingFlags.IgnoreCase;
+
+        private static readonly IDictionary collectionProcessorMap = new Hashtable();
+
+        private bool initialized = false;
+        private bool isParamArray = false;
+        private Type paramArrayType;
+        private int argumentCount;
+        private SafeMethod method;
+        private int methodHash;
+        private bool isCollectionProcessor = false;
+        private ICollectionProcessor collectionProcessor;
+
+        /// <summary>
+        /// Static constructor. Initializes a map of special collection processor methods.
+        /// </summary>
+        static MethodNode()
+        {
+            collectionProcessorMap.Add("count", new CountAggregator());
+            collectionProcessorMap.Add("sum", new SumAggregator());
+            collectionProcessorMap.Add("max", new MaxAggregator());
+            collectionProcessorMap.Add("min", new MinAggregator());
+            collectionProcessorMap.Add("average", new AverageAggregator());
+            collectionProcessorMap.Add("sort", new SortProcessor());
+            collectionProcessorMap.Add("orderBy", new OrderByProcessor());
+            collectionProcessorMap.Add("distinct", new DistinctProcessor());
+            collectionProcessorMap.Add("nonNull", new NonNullProcessor());
+            collectionProcessorMap.Add("convert", new ConversionProcessor());
+            collectionProcessorMap.Add("reverse", new ReverseProcessor());
+        }
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public MethodNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected MethodNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Returns node's value for the given context.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object[] argValues = ResolveArguments(evalContext);
+
+            ICollectionProcessor localCollectionProcessor = null;
+            SafeMethod localMethod = null;
+
+            // resolve method, if necessary
+            lock (this)
+            {
+                if (!isCollectionProcessor)
+                {
+                    if ((context == null || context is ICollection))
+                    {
+                        string methodName = this.getText();
+
+                        // predefined collection processor?
+                        collectionProcessor = (ICollectionProcessor)collectionProcessorMap[methodName];
+                        isCollectionProcessor = (collectionProcessor != null);
+                        localCollectionProcessor = collectionProcessor;
+
+                        if (!isCollectionProcessor && evalContext.Variables != null)
+                        {
+                            localCollectionProcessor = evalContext.Variables[methodName] as ICollectionProcessor;
+                        }
+                    }
+                }
+                else
+                {
+                    localCollectionProcessor = collectionProcessor;
+                }
+
+                if (localCollectionProcessor == null)
+                {
+                    if (context == null)
+                    {
+                        throw new ArgumentNullException("Context for method invocation cannot be null.");
+                    }
+
+                    // calculate checksum, if the cached method matches the current context
+                    if (initialized)
+                    {
+                        int calculatedHash = CalculateMethodHash(context.GetType(), argValues);
+                        initialized = (calculatedHash == methodHash);
+                    }
+
+                    if (!initialized)
+                    {
+                        string methodName = this.getText();
+                        Initialize(methodName, argValues, context);
+                        initialized = true;
+                    }
+
+                    localMethod = method;
+                }
+            }
+
+            // invoke method
+            if (localCollectionProcessor != null)
+            {
+                return localCollectionProcessor.Process((ICollection)context, argValues);
+            }
+            else
+            {
+                object[] paramValues = (isParamArray ? ReflectionUtils.PackageParamArray(argValues, argumentCount, paramArrayType) : argValues);
+                return localMethod.Invoke(context, paramValues);
+            }
+        }
+
+        private int CalculateMethodHash(Type contextType, object[] argValues)
+        {
+            int hash = contextType.GetHashCode();
+            for (int i = 0; i < argValues.Length; i++)
+            {
+                object arg = argValues[i];
+                if (arg != null) hash += s_primes[i] * arg.GetType().GetHashCode();
+            }
+            return hash;
+        }
+
+        private void Initialize(string methodName, object[] argValues, object context)
+        {
+            Type contextType = (context is Type ? context as Type : context.GetType());
+
+            // check the context type first
+            MethodInfo mi = GetBestMethod(contextType, methodName, BINDING_FLAGS, argValues);
+
+            // if not found, probe the Type's type          
+            if (mi == null)
+            {
+                mi = GetBestMethod(typeof(Type), methodName, BINDING_FLAGS, argValues);
+            }
+
+            if (mi == null)
+            {
+                throw new ArgumentException(
+                    string.Format("Method '{0}' with the specified number and types of arguments does not exist.",
+                                  methodName));
+            }
+            else
+            {
+                ParameterInfo[] parameters = mi.GetParameters();
+                if (parameters.Length > 0)
+                {
+                    ParameterInfo lastParameter = parameters[parameters.Length - 1];
+                    isParamArray = lastParameter.GetCustomAttributes(typeof(ParamArrayAttribute), false).Length > 0;
+                    if (isParamArray)
+                    {
+                        paramArrayType = lastParameter.ParameterType.GetElementType();
+                        argumentCount = parameters.Length;
+                    }
+                }
+
+                method = new SafeMethod(mi);
+                methodHash = CalculateMethodHash(contextType, argValues);
+            }
+        }
+
+        /// <summary>
+        /// Gets the best method given the name, argument values, for a given type.
+        /// </summary>
+        /// <param name="type">The type on which to search for the method.</param>
+        /// <param name="methodName">Name of the method.</param>
+        /// <param name="bindingFlags">The binding flags.</param>
+        /// <param name="argValues">The arg values.</param>
+        /// <returns>Best matching method or null if none found.</returns>
+        public static MethodInfo GetBestMethod(Type type, string methodName, BindingFlags bindingFlags, object[] argValues)
+        {
+            MethodInfo mi = null;
+            try
+            {
+                mi = type.GetMethod(methodName, bindingFlags | BindingFlags.FlattenHierarchy);
+            }
+            catch (AmbiguousMatchException)
+            {
+
+                MethodInfo[] overloads = GetCandidateMethods(type, methodName, bindingFlags, argValues.Length);
+                if (overloads.Length > 0)
+                {
+                    mi = ReflectionUtils.GetMethodByArgumentValues(overloads, argValues);
+                }
+            }
+            return mi;
+        }
+
+
+
+        private static MethodInfo[] GetCandidateMethods(Type type, string methodName, BindingFlags bindingFlags, int argCount)
+        {
+            MethodInfo[] methods = type.GetMethods(bindingFlags | BindingFlags.FlattenHierarchy);
+            ArrayList matches = new ArrayList();
+
+            foreach (MethodInfo method in methods)
+            {
+                if (method.Name == methodName)
+                {
+                    ParameterInfo[] parameters = method.GetParameters();
+                    if (parameters.Length == argCount)
+                    {
+                        matches.Add(method);
+                    }
+                    else if (parameters.Length > 0)
+                    {
+                        ParameterInfo lastParameter = parameters[parameters.Length - 1];
+                        if (lastParameter.GetCustomAttributes(typeof(ParamArrayAttribute), false).Length > 0)
+                        {
+                            matches.Add(method);
+                        }
+                    }
+                }
+            }
+
+            return (MethodInfo[])matches.ToArray(typeof(MethodInfo));
+        }
+
+        // used to calculate signature hash while caring for arg positions
+        private static readonly int[] s_primes =
+            {
+                17, 19, 23, 29
+                , 31, 37, 41, 43, 47, 53, 59, 61, 67, 71
+                , 73, 79, 83, 89, 97, 101, 103, 107, 109, 113
+                , 127, 131, 137, 139, 149, 151, 157, 163, 167, 173
+                , 179, 181, 191, 193, 197, 199, 211, 223, 227, 229
+                , 233, 239, 241, 251, 257, 263, 269, 271, 277, 281
+                , 283, 293, 307, 311, 313, 317, 331, 337, 347, 349
+                , 353, 359, 367, 373, 379, 383, 389, 397, 401, 409
+                , 419, 421, 431, 433, 439, 443, 449, 457, 461, 463
+                , 467, 479, 487, 491, 499, 503, 509, 521, 523, 541
+                , 547, 557, 563, 569, 571, 577, 587, 593, 599, 601
+                , 607, 613, 617, 619, 631, 641, 643, 647, 653, 659
+                , 661, 673, 677, 683, 691, 701, 709, 719, 727, 733
+            };
+    }
+}
diff --git a/src/Spring/Spring.Core/Expressions/NamedArgumentNode.cs b/src/Spring/Spring.Core/Expressions/NamedArgumentNode.cs
new file mode 100644
index 00000000..7919a669
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/NamedArgumentNode.cs
@@ -0,0 +1,60 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed named argument node in the expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: NamedArgumentNode.cs,v 1.4 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class NamedArgumentNode : BaseNode
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public NamedArgumentNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected NamedArgumentNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns the value of the named argument defined by this node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            return ((BaseNode) this.getFirstChild()).GetValueInternal(evalContext.RootContext, evalContext);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs b/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs
new file mode 100644
index 00000000..6734ac1c
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs
@@ -0,0 +1,176 @@
+#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.Collections;
+using System.Runtime.Serialization;
+using antlr.collections;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Base type for nodes that accept arguments.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: NodeWithArguments.cs,v 1.15 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public abstract class NodeWithArguments : BaseNode
+    {
+        private BaseNode[] args;
+        private IDictionary namedArgs;
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public NodeWithArguments()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected NodeWithArguments(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Initializes the node. 
+        /// </summary>
+        private void InitializeNode()
+        {
+            if (args == null)
+            {
+                lock (this)
+                {
+                    if (args == null)
+                    {
+                        ArrayList argList = new ArrayList();
+                        namedArgs = new Hashtable();
+
+                        AST node = this.getFirstChild();
+
+                        while (node != null)
+                        {
+                            if (node.getFirstChild() is LambdaExpressionNode)
+                            {
+                                argList.Add(node.getFirstChild());
+                            }
+                            else if (node is NamedArgumentNode)
+                            {
+                                namedArgs.Add(node.getText(), node);
+                            }
+                            else
+                            {
+                                argList.Add(node);
+                            }
+                            node = node.getNextSibling();
+                        }
+
+                        args = (BaseNode[])argList.ToArray(typeof(BaseNode));
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Asserts the argument count.
+        /// </summary>
+        /// <param name="requiredCount">The required count.</param>
+        protected void AssertArgumentCount(int requiredCount)
+        {
+            InitializeNode();
+            if (requiredCount != args.Length)
+            {
+                throw new ArgumentException("This expression node requires exactly " +
+                                            requiredCount + " argument(s) and " +
+                                            args.Length + " were specified.");
+            }
+        }
+
+        /// <summary>
+        /// Resolves the arguments.
+        /// </summary>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>An array of argument values</returns>
+        protected object[] ResolveArguments(EvaluationContext evalContext)
+        {
+            InitializeNode();
+            object[] values = new object[args.Length];
+            for (int i = 0; i < args.Length; i++)
+            {
+                values[i] = ResolveArgument(i, evalContext);
+            }
+            return values;
+        }
+
+        /// <summary>
+        /// Resolves the named arguments.
+        /// </summary>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>A dictionary of argument name to value mappings.</returns>
+        protected IDictionary ResolveNamedArguments(EvaluationContext evalContext)
+        {
+            InitializeNode();
+            if (namedArgs.Count == 0)
+            {
+                return null;
+            }
+
+            IDictionary namesAndValues = new Hashtable(namedArgs.Count);
+            foreach (string name in namedArgs.Keys)
+            {
+                namesAndValues[name] = ResolveNamedArgument(name, evalContext);
+            }
+            return namesAndValues;
+        }
+
+        /// <summary>
+        /// Resolves the argument.
+        /// </summary>
+        /// <param name="position">Argument position.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Resolved argument value.</returns>
+        protected object ResolveArgument(int position, EvaluationContext evalContext)
+        {
+            InitializeNode();
+            if (args[position] is LambdaExpressionNode)
+            {
+                return args[position];
+            }
+            else
+            {
+                return ((BaseNode)args[position]).GetValueInternal(evalContext.ThisContext, evalContext);
+            }
+        }
+
+        /// <summary>
+        /// Resolves the named argument.
+        /// </summary>
+        /// <param name="name">Argument name.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Resolved named argument value.</returns>
+        private object ResolveNamedArgument(string name, EvaluationContext evalContext)
+        {
+            return ((BaseNode)namedArgs[name]).GetValueInternal(evalContext.ThisContext, evalContext);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/NullLiteralNode.cs b/src/Spring/Spring.Core/Expressions/NullLiteralNode.cs
new file mode 100644
index 00000000..ad53f007
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/NullLiteralNode.cs
@@ -0,0 +1,60 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed null literal node.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: NullLiteralNode.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class NullLiteralNode : BaseNode
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public NullLiteralNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected NullLiteralNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the null literal node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpADD.cs b/src/Spring/Spring.Core/Expressions/OpADD.cs
new file mode 100644
index 00000000..928d8d7f
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpADD.cs
@@ -0,0 +1,120 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+using Spring.Collections;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents arithmetic addition operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpADD.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpADD : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpADD()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpADD(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the arithmetic addition operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal(context, evalContext);
+            object right = Right.GetValueInternal(context, evalContext);
+
+            if (NumberUtils.IsNumber(left) && NumberUtils.IsNumber(right))
+            {
+                return NumberUtils.Add(left, right);
+            }
+            else if (left is DateTime && (right is TimeSpan || right is string || NumberUtils.IsNumber(right)))
+            {
+                if (NumberUtils.IsNumber(right))
+                {
+                    right = TimeSpan.FromDays(Convert.ToDouble(right));
+                }
+                else if (right is string)
+                {
+                    right = TimeSpan.Parse((string) right);
+                }
+
+                return (DateTime) left + (TimeSpan) right;
+            }
+            else if (left is String || right is String)
+            {
+                return left.ToString() + right.ToString();
+            }
+            else if ((left is IList || left is ISet) && (right is IList || right is ISet))
+            {
+                ISet leftset = new HybridSet(left as ICollection);
+                ISet rightset = new HybridSet(right as ICollection);
+                return leftset.Union(rightset);
+            }
+            else if (left is IDictionary && right is IDictionary)
+            {
+                ISet leftset = new HybridSet(((IDictionary) left).Keys);
+                ISet rightset = new HybridSet(((IDictionary) right).Keys);
+                ISet unionset = leftset.Union(rightset);
+                
+                IDictionary result = new Hashtable(unionset.Count);
+                foreach(object key in unionset)
+                {
+                    if(leftset.Contains(key))
+                    {
+                        result.Add(key, ((IDictionary)left)[key]);
+                    }
+                    else
+                    {
+                        result.Add(key, ((IDictionary)right)[key]);
+                    }
+                }
+                return result;
+            }
+            else
+            {
+                throw new ArgumentException("Cannot add instances of '"
+                                            + left.GetType().FullName
+                                            + "' and '"
+                                            + right.GetType().FullName
+                                            + "'.");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpAND.cs b/src/Spring/Spring.Core/Expressions/OpAND.cs
new file mode 100644
index 00000000..cb3ea50b
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpAND.cs
@@ -0,0 +1,61 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents logical AND operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpAND.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpAND : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpAND()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpAND(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical AND operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            return Convert.ToBoolean(Left.GetValueInternal(context, evalContext))
+                   && Convert.ToBoolean(Right.GetValueInternal(context, evalContext));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpBetween.cs b/src/Spring/Spring.Core/Expressions/OpBetween.cs
new file mode 100644
index 00000000..298d6409
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpBetween.cs
@@ -0,0 +1,75 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents logical BETWEEN operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpBetween.cs,v 1.5 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpBetween : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpBetween()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpBetween(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical IN operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>
+        /// true if the left operand is contained within the right operand, false otherwise.
+        /// </returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object value = Left.GetValueInternal(context, evalContext);
+            IList range = Right.GetValueInternal(context, evalContext) as IList;
+
+            if (range == null || range.Count != 2)
+            {
+                throw new ArgumentException("Right operand for the 'between' operator has to be a two-element list.");
+            }
+
+            object low = range[0];
+            object high = range[1];
+
+            return (CompareUtils.Compare(value, low) >= 0 && CompareUtils.Compare(value, high) <= 0);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpDIVIDE.cs b/src/Spring/Spring.Core/Expressions/OpDIVIDE.cs
new file mode 100644
index 00000000..d6f6ef72
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpDIVIDE.cs
@@ -0,0 +1,76 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents arithmetic division operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpDIVIDE.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpDIVIDE : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpDIVIDE()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpDIVIDE(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the arithmetic division operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal(context, evalContext);
+            object right = Right.GetValueInternal(context, evalContext);
+
+            if (NumberUtils.IsNumber(left) && NumberUtils.IsNumber(right))
+            {
+                return NumberUtils.Divide(left, right);
+            }
+            else
+            {
+                throw new ArgumentException("Cannot divide instances of '"
+                                            + left.GetType().FullName
+                                            + "' and '"
+                                            + right.GetType().FullName
+                                            + "'.");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpEqual.cs b/src/Spring/Spring.Core/Expressions/OpEqual.cs
new file mode 100644
index 00000000..e740cd1d
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpEqual.cs
@@ -0,0 +1,94 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents logical equality operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpEqual.cs,v 1.12 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpEqual : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpEqual()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+                protected OpEqual(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical equality operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal( context, evalContext );
+            object right = Right.GetValueInternal( context, evalContext );
+
+            if (left == null)
+            {
+                return (right == null);
+            }
+            else if (right == null)
+            {
+                return false;
+            }
+            else if (left.GetType() == right.GetType())
+            {
+                if (left is Array)
+                {
+                    return ArrayUtils.AreEqual(left as Array, right as Array);
+                }
+                else
+                {
+                    return left.Equals(right);                    
+                }
+            }
+            else if (left.GetType().IsEnum && right is string)
+            {
+                return left.Equals(Enum.Parse(left.GetType(), (string) right));
+            }
+            else if (right.GetType().IsEnum && left is string)
+            {
+                return right.Equals(Enum.Parse(right.GetType(), (string) left));
+            }
+            else
+            {
+                return CompareUtils.Compare(left, right) == 0;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpGreater.cs b/src/Spring/Spring.Core/Expressions/OpGreater.cs
new file mode 100644
index 00000000..5ca6a970
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpGreater.cs
@@ -0,0 +1,64 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents logical "greater than" operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpGreater.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpGreater : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpGreater():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpGreater(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical "greater than" operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal(context, evalContext);
+            object right = Right.GetValueInternal(context, evalContext);
+
+            return CompareUtils.Compare(left, right) > 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpGreaterOrEqual.cs b/src/Spring/Spring.Core/Expressions/OpGreaterOrEqual.cs
new file mode 100644
index 00000000..756c453e
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpGreaterOrEqual.cs
@@ -0,0 +1,64 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents logical "greater than or equal" operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpGreaterOrEqual.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpGreaterOrEqual : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpGreaterOrEqual():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpGreaterOrEqual(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical "greater than or equal" operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal( context, evalContext );
+            object right = Right.GetValueInternal( context, evalContext );
+
+            return CompareUtils.Compare(left, right) >= 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpIn.cs b/src/Spring/Spring.Core/Expressions/OpIn.cs
new file mode 100644
index 00000000..05488fce
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpIn.cs
@@ -0,0 +1,82 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents logical IN operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpIn.cs,v 1.5 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpIn : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpIn():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpIn(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical IN operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>
+        /// true if the left operand is contained within the right operand, false otherwise.
+        /// </returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal( context, evalContext );
+            object right = Right.GetValueInternal( context, evalContext );
+
+            if (right == null)
+            {
+                return false;
+            }
+            else if (right is IList)
+            {
+                return ((IList) right).Contains(left);
+            }
+            else if (right is IDictionary)
+            {
+                return ((IDictionary) right).Contains(left);
+            }
+            else
+            {
+                throw new ArgumentException(
+                    "Right hand parameter for 'in' operator has to be an instance of IList or IDictionary.");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpIs.cs b/src/Spring/Spring.Core/Expressions/OpIs.cs
new file mode 100644
index 00000000..abecd404
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpIs.cs
@@ -0,0 +1,69 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents logical IS operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpIs.cs,v 1.4 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpIs : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpIs():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpIs(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical IS operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>
+        /// true if the left operand is contained within the right operand, false otherwise.
+        /// </returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object instance = Left.GetValueInternal( context, evalContext );
+            Type type = Right.GetValueInternal( context, evalContext ) as Type;
+
+            if (instance == null || type == null)
+            {
+                return false;
+            }
+            return type.IsAssignableFrom(instance.GetType());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpLess.cs b/src/Spring/Spring.Core/Expressions/OpLess.cs
new file mode 100644
index 00000000..80c460ec
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpLess.cs
@@ -0,0 +1,64 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents logical "less than" operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpLess.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpLess : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpLess():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpLess(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Returns a value for the logical "less than" operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal( context, evalContext );
+            object right = Right.GetValueInternal( context, evalContext );
+
+            return CompareUtils.Compare(left, right) < 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpLessOrEqual.cs b/src/Spring/Spring.Core/Expressions/OpLessOrEqual.cs
new file mode 100644
index 00000000..e93e67d5
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpLessOrEqual.cs
@@ -0,0 +1,65 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents logical "less than or equal" operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpLessOrEqual.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpLessOrEqual : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpLessOrEqual():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpLessOrEqual(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical "less than or equal" operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal( context, evalContext );
+            object right = Right.GetValueInternal( context, evalContext );
+
+            return CompareUtils.Compare(left, right) <= 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpLike.cs b/src/Spring/Spring.Core/Expressions/OpLike.cs
new file mode 100644
index 00000000..b8a92561
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpLike.cs
@@ -0,0 +1,73 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+#if NET_2_0  && !MONO
+using Microsoft.VisualBasic;
+using Microsoft.VisualBasic.CompilerServices;
+#endif
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents VB-style logical LIKE operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpLike.cs,v 1.5 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpLike : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpLike():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpLike(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical LIKE operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>
+        /// true if the left operand matches the right operand, false otherwise.
+        /// </returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+#if NET_2_0 && !MONO
+            string text = Left.GetValueInternal( context, evalContext ) as string;
+            string pattern = Right.GetValueInternal( context, evalContext ) as string;
+
+            return LikeOperator.LikeString(text, pattern, CompareMethod.Text);
+#else
+            throw new NotSupportedException("'like' operator is only supported in .NET 2.0 or higher.");
+#endif
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpMODULUS.cs b/src/Spring/Spring.Core/Expressions/OpMODULUS.cs
new file mode 100644
index 00000000..c65316ca
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpMODULUS.cs
@@ -0,0 +1,75 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents arithmetic modulus operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpMODULUS.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpMODULUS : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpMODULUS():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpMODULUS(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the arithmetic modulus operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal( context, evalContext );
+            object right = Right.GetValueInternal( context, evalContext );
+
+            if (NumberUtils.IsNumber(left) && NumberUtils.IsNumber(right))
+            {
+                return NumberUtils.Modulus(left, right);
+            }
+            else
+            {
+                throw new ArgumentException("Cannot calculate modulus for instances of '"
+                                            + left.GetType().FullName
+                                            + "' and '"
+                                            + right.GetType().FullName
+                                            + "'.");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpMULTIPLY.cs b/src/Spring/Spring.Core/Expressions/OpMULTIPLY.cs
new file mode 100644
index 00000000..575f48fa
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpMULTIPLY.cs
@@ -0,0 +1,126 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+using Spring.Collections;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents arithmetic multiplication operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpMULTIPLY.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpMULTIPLY : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpMULTIPLY():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpMULTIPLY(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the arithmetic multiplication operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal( context, evalContext );
+            object right = Right.GetValueInternal( context, evalContext );
+
+            if (NumberUtils.IsNumber(left) && NumberUtils.IsNumber(right))
+            {
+                return NumberUtils.Multiply(left, right);
+            }
+            else if (left is IList || left is ISet)
+            {
+                ISet leftset = new HybridSet(left as ICollection);
+                ISet rightset;
+                if (right is IList || right is ISet)
+                {
+                    rightset = new HybridSet(right as ICollection);
+                }
+                else if (right is IDictionary)
+                {
+                    rightset = new HybridSet(((IDictionary)right).Keys);
+                }
+                else
+                {
+                    throw new ArgumentException("Cannot subtract instances of '"
+                    + left.GetType().FullName
+                    + "' and '"
+                    + right.GetType().FullName
+                    + "'.");
+                }
+                return leftset.Intersect(rightset);
+            }
+            else if (left is IDictionary)
+            {
+                ISet leftset = new HybridSet(((IDictionary)left).Keys);
+                ISet rightset;
+                if (right is IList || right is ISet)
+                {
+                    rightset = new HybridSet(right as ICollection);
+                }
+                else if (right is IDictionary)
+                {
+                    rightset = new HybridSet(((IDictionary)right).Keys);
+                }
+                else
+                {
+                    throw new ArgumentException("Cannot subtract instances of '"
+                    + left.GetType().FullName
+                    + "' and '"
+                    + right.GetType().FullName
+                    + "'.");
+                }
+                IDictionary result = new Hashtable(rightset.Count);
+                foreach (object key in leftset.Intersect(rightset))
+                {
+                    result.Add(key, ((IDictionary)left)[key]);
+                }
+                return result;
+            }
+            else
+            {
+                throw new ArgumentException("Cannot multiply instances of '"
+                                            + left.GetType().FullName
+                                            + "' and '"
+                                            + right.GetType().FullName
+                                            + "'.");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpMatches.cs b/src/Spring/Spring.Core/Expressions/OpMatches.cs
new file mode 100644
index 00000000..7a5d9037
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpMatches.cs
@@ -0,0 +1,78 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using System.Text.RegularExpressions;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents logical MATCHES operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpMatches.cs,v 1.5 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpMatches : BinaryOperator
+    {
+        private Regex regex;
+        
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpMatches():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpMatches(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical MATCHES operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>
+        /// true if the left operand matches the right operand, false otherwise.
+        /// </returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            if (regex == null)
+            {
+                lock (this)
+                {
+                    if (regex == null)
+                    {
+                        string pattern = Right.GetValueInternal( context, evalContext ) as string;
+                        regex = new Regex(pattern, RegexOptions.Compiled);
+                    }
+                }
+            }
+
+            string text = Left.GetValueInternal( context, evalContext ) as string;
+            return regex.IsMatch(text);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpNOT.cs b/src/Spring/Spring.Core/Expressions/OpNOT.cs
new file mode 100644
index 00000000..f923b7d0
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpNOT.cs
@@ -0,0 +1,60 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents logical NOT operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpNOT.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpNOT : UnaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpNOT():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpNOT(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical NOT operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            return !Convert.ToBoolean(Operand.GetValueInternal(context, evalContext));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpNotEqual.cs b/src/Spring/Spring.Core/Expressions/OpNotEqual.cs
new file mode 100644
index 00000000..88907771
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpNotEqual.cs
@@ -0,0 +1,86 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents logical inequality operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpNotEqual.cs,v 1.11 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpNotEqual : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpNotEqual():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpNotEqual(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical inequality operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal( context, evalContext );
+            object right = Right.GetValueInternal( context, evalContext );
+
+            if (left == null)
+            {
+                return (right != null);
+            }
+            else if (right == null)
+            {
+                return true;
+            }
+            else if (left.GetType() == right.GetType())
+            {
+                if (left is Array)
+                {
+                    return !ArrayUtils.AreEqual(left as Array, right as Array);
+                }
+                else
+                {
+                    return !left.Equals(right);
+                }
+            }
+            else
+            {
+                return CompareUtils.Compare(left, right) != 0;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpOR.cs b/src/Spring/Spring.Core/Expressions/OpOR.cs
new file mode 100644
index 00000000..14ce8627
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpOR.cs
@@ -0,0 +1,61 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents logical OR operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpOR.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpOR : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpOR():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpOR(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical OR operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            return Convert.ToBoolean( Left.GetValueInternal( context, evalContext ) )
+                   || Convert.ToBoolean( Right.GetValueInternal( context, evalContext ) );
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpPOWER.cs b/src/Spring/Spring.Core/Expressions/OpPOWER.cs
new file mode 100644
index 00000000..733578e0
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpPOWER.cs
@@ -0,0 +1,75 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents arithmetic exponent operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpPOWER.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpPOWER : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpPOWER():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpPOWER(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the arithmetic exponent operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal( context, evalContext );
+            object right = Right.GetValueInternal( context, evalContext );
+
+            if (NumberUtils.IsNumber(left) && NumberUtils.IsNumber(right))
+            {
+                return NumberUtils.Power(left, right);
+            }
+            else
+            {
+                throw new ArgumentException("Cannot calculate exponent for the instances of '"
+                                            + left.GetType().FullName
+                                            + "' and '"
+                                            + right.GetType().FullName
+                                            + "'.");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpSUBTRACT.cs b/src/Spring/Spring.Core/Expressions/OpSUBTRACT.cs
new file mode 100644
index 00000000..1f029d26
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpSUBTRACT.cs
@@ -0,0 +1,142 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+using Spring.Collections;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents arithmetic subtraction operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpSUBTRACT.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpSUBTRACT : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpSUBTRACT():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpSUBTRACT(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the arithmetic subtraction operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object left = Left.GetValueInternal( context, evalContext );
+            object right = Right.GetValueInternal( context, evalContext );
+
+            if (NumberUtils.IsNumber(left) && NumberUtils.IsNumber(right))
+            {
+                return NumberUtils.Subtract(left, right);
+            }
+            else if (left is DateTime && (right is TimeSpan || right is string || NumberUtils.IsNumber(right)))
+            {
+                if (NumberUtils.IsNumber(right))
+                {
+                    right = TimeSpan.FromDays(Convert.ToDouble(right));
+                }
+                else if (right is string)
+                {
+                    right = TimeSpan.Parse((string) right);
+                }
+                return (DateTime) left - (TimeSpan) right;
+            }
+            else if (left is DateTime && right is DateTime)
+            {
+                return (DateTime) left - (DateTime) right;
+            }
+            else if (left is IList || left is ISet)
+            {
+                ISet leftset = new HybridSet(left as ICollection);
+                ISet rightset;
+                if(right is IList || right is ISet)
+                {
+                    rightset = new HybridSet(right as ICollection);
+                }
+                else if (right is IDictionary)
+                {
+                    rightset = new HybridSet(((IDictionary) right).Keys);
+                }
+                else
+                {
+                    throw new ArgumentException("Cannot subtract instances of '"
+                    + left.GetType().FullName
+                    + "' and '"
+                    + right.GetType().FullName
+                    + "'.");
+                }
+                return leftset.Minus(rightset);
+            }
+            else if (left is IDictionary)
+            {
+                ISet leftset = new HybridSet(((IDictionary) left).Keys);
+                ISet rightset;
+                if (right is IList || right is ISet)
+                {
+                    rightset = new HybridSet(right as ICollection);
+                }
+                else if (right is IDictionary)
+                {
+                    rightset = new HybridSet(((IDictionary) right).Keys);
+                }
+                else
+                {
+                    throw new ArgumentException("Cannot subtract instances of '"
+                    + left.GetType().FullName
+                    + "' and '"
+                    + right.GetType().FullName
+                    + "'.");
+                }
+                IDictionary result = new Hashtable(rightset.Count);
+                foreach(object key in leftset.Minus(rightset))
+                {
+                    result.Add(key, ((IDictionary)left)[key]);
+                }
+                return result;
+            }
+            else
+            {
+                throw new ArgumentException("Cannot subtract instances of '"
+                    + left.GetType().FullName
+                    + "' and '"
+                    + right.GetType().FullName
+                    + "'.");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpUnaryMinus.cs b/src/Spring/Spring.Core/Expressions/OpUnaryMinus.cs
new file mode 100644
index 00000000..11121670
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpUnaryMinus.cs
@@ -0,0 +1,68 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents unary minus operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpUnaryMinus.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpUnaryMinus : UnaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpUnaryMinus():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpUnaryMinus(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the unary plus operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object n = Operand.GetValueInternal( context, evalContext );
+
+            if (!NumberUtils.IsNumber(n))
+            {
+                throw new ArgumentException(
+                    "Specified operand is not a number. Only numbers support unary minus operator.");
+            }
+            return NumberUtils.Negate(n);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/OpUnaryPlus.cs b/src/Spring/Spring.Core/Expressions/OpUnaryPlus.cs
new file mode 100644
index 00000000..d0c0c0c1
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/OpUnaryPlus.cs
@@ -0,0 +1,68 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using Spring.Util;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents unary plus operator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: OpUnaryPlus.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class OpUnaryPlus : UnaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpUnaryPlus():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpUnaryPlus(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Returns a value for the unary plus operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object n = Operand.GetValueInternal( context, evalContext );
+
+            if (!NumberUtils.IsNumber(n))
+            {
+                throw new ArgumentException(
+                    "Specified operand is not a number. Only numbers support unary plus operator.");
+            }
+            return n;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs
new file mode 100644
index 00000000..f80e88df
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs
@@ -0,0 +1,1939 @@
+// $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionLexer.cs"$
+
+namespace Spring.Expressions
+{
+	// Generate header specific to lexer CSharp file
+	using System;
+	using Stream                          = System.IO.Stream;
+	using TextReader                      = System.IO.TextReader;
+	using Hashtable                       = System.Collections.Hashtable;
+	using Comparer                        = System.Collections.Comparer;
+	
+	using TokenStreamException            = antlr.TokenStreamException;
+	using TokenStreamIOException          = antlr.TokenStreamIOException;
+	using TokenStreamRecognitionException = antlr.TokenStreamRecognitionException;
+	using CharStreamException             = antlr.CharStreamException;
+	using CharStreamIOException           = antlr.CharStreamIOException;
+	using ANTLRException                  = antlr.ANTLRException;
+	using CharScanner                     = antlr.CharScanner;
+	using InputBuffer                     = antlr.InputBuffer;
+	using ByteBuffer                      = antlr.ByteBuffer;
+	using CharBuffer                      = antlr.CharBuffer;
+	using Token                           = antlr.Token;
+	using IToken                          = antlr.IToken;
+	using CommonToken                     = antlr.CommonToken;
+	using SemanticException               = antlr.SemanticException;
+	using RecognitionException            = antlr.RecognitionException;
+	using NoViableAltForCharException     = antlr.NoViableAltForCharException;
+	using MismatchedCharException         = antlr.MismatchedCharException;
+	using TokenStream                     = antlr.TokenStream;
+	using LexerSharedInputState           = antlr.LexerSharedInputState;
+	using BitSet                          = antlr.collections.impl.BitSet;
+	
+	internal 	class ExpressionLexer : antlr.CharScanner	, TokenStream
+	 {
+		public const int EOF = 1;
+		public const int NULL_TREE_LOOKAHEAD = 3;
+		public const int EXPR = 4;
+		public const int OPERAND = 5;
+		public const int FALSE = 6;
+		public const int TRUE = 7;
+		public const int AND = 8;
+		public const int OR = 9;
+		public const int IN = 10;
+		public const int IS = 11;
+		public const int BETWEEN = 12;
+		public const int LIKE = 13;
+		public const int MATCHES = 14;
+		public const int NULL_LITERAL = 15;
+		public const int LPAREN = 16;
+		public const int SEMI = 17;
+		public const int RPAREN = 18;
+		public const int ASSIGN = 19;
+		public const int DEFAULT = 20;
+		public const int QMARK = 21;
+		public const int COLON = 22;
+		public const int PLUS = 23;
+		public const int MINUS = 24;
+		public const int STAR = 25;
+		public const int DIV = 26;
+		public const int MOD = 27;
+		public const int POWER = 28;
+		public const int BANG = 29;
+		public const int DOT = 30;
+		public const int POUND = 31;
+		public const int ID = 32;
+		public const int DOLLAR = 33;
+		public const int COMMA = 34;
+		public const int AT = 35;
+		public const int LBRACKET = 36;
+		public const int RBRACKET = 37;
+		public const int PROJECT = 38;
+		public const int RCURLY = 39;
+		public const int SELECT = 40;
+		public const int SELECT_FIRST = 41;
+		public const int SELECT_LAST = 42;
+		public const int TYPE = 43;
+		public const int LAMBDA = 44;
+		public const int PIPE = 45;
+		public const int LITERAL_new = 46;
+		public const int LCURLY = 47;
+		public const int INTEGER_LITERAL = 48;
+		public const int HEXADECIMAL_INTEGER_LITERAL = 49;
+		public const int REAL_LITERAL = 50;
+		public const int STRING_LITERAL = 51;
+		public const int LITERAL_date = 52;
+		public const int EQUAL = 53;
+		public const int NOT_EQUAL = 54;
+		public const int LESS_THAN = 55;
+		public const int LESS_THAN_OR_EQUAL = 56;
+		public const int GREATER_THAN = 57;
+		public const int GREATER_THAN_OR_EQUAL = 58;
+		public const int WS = 59;
+		public const int DOT_ESCAPED = 60;
+		public const int APOS = 61;
+		public const int NUMERIC_LITERAL = 62;
+		public const int DECIMAL_DIGIT = 63;
+		public const int INTEGER_TYPE_SUFFIX = 64;
+		public const int HEX_DIGIT = 65;
+		public const int EXPONENT_PART = 66;
+		public const int SIGN = 67;
+		public const int REAL_TYPE_SUFFIX = 68;
+		
+		
+    // CLOVER:OFF
+		public ExpressionLexer(Stream ins) : this(new ByteBuffer(ins))
+		{
+		}
+		
+		public ExpressionLexer(TextReader r) : this(new CharBuffer(r))
+		{
+		}
+		
+		public ExpressionLexer(InputBuffer ib)		 : this(new LexerSharedInputState(ib))
+		{
+		}
+		
+		public ExpressionLexer(LexerSharedInputState state) : base(state)
+		{
+			initialize();
+		}
+		private void initialize()
+		{
+			caseSensitiveLiterals = true;
+			setCaseSensitive(true);
+			literals = new Hashtable(100, (float) 0.4, null, Comparer.Default);
+			literals.Add("true", 7);
+			literals.Add("and", 8);
+			literals.Add("matches", 14);
+			literals.Add("in", 10);
+			literals.Add("null", 15);
+			literals.Add("between", 12);
+			literals.Add("or", 9);
+			literals.Add("is", 11);
+			literals.Add("like", 13);
+			literals.Add("new", 46);
+			literals.Add("date", 52);
+			literals.Add("false", 6);
+		}
+		
+		override public IToken nextToken()			//throws TokenStreamException
+		{
+			IToken theRetToken = null;
+tryAgain:
+			for (;;)
+			{
+				IToken _token = null;
+				int _ttype = Token.INVALID_TYPE;
+				resetText();
+				try     // for char stream error handling
+				{
+					try     // for lexical error handling
+					{
+						switch ( cached_LA1 )
+						{
+						case '\t':  case '\n':  case '\r':  case ' ':
+						{
+							mWS(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case '@':
+						{
+							mAT(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case '|':
+						{
+							mPIPE(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case '#':
+						{
+							mPOUND(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case '(':
+						{
+							mLPAREN(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case ')':
+						{
+							mRPAREN(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case '[':
+						{
+							mLBRACKET(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case ']':
+						{
+							mRBRACKET(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case '}':
+						{
+							mRCURLY(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case ',':
+						{
+							mCOMMA(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case ';':
+						{
+							mSEMI(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case ':':
+						{
+							mCOLON(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case '+':
+						{
+							mPLUS(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case '-':
+						{
+							mMINUS(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case '/':
+						{
+							mDIV(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case '*':
+						{
+							mSTAR(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case '%':
+						{
+							mMOD(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case '\\':
+						{
+							mDOT_ESCAPED(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						case '\'':
+						{
+							mSTRING_LITERAL(true);
+							theRetToken = returnToken_;
+							break;
+						}
+						default:
+							if ((cached_LA1=='?') && (cached_LA2=='?'))
+							{
+								mDEFAULT(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='=') && (cached_LA2=='=')) {
+								mEQUAL(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='!') && (cached_LA2=='=')) {
+								mNOT_EQUAL(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='<') && (cached_LA2=='=')) {
+								mLESS_THAN_OR_EQUAL(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='>') && (cached_LA2=='=')) {
+								mGREATER_THAN_OR_EQUAL(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='!') && (cached_LA2=='{')) {
+								mPROJECT(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='?') && (cached_LA2=='{')) {
+								mSELECT(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='^') && (cached_LA2=='{')) {
+								mSELECT_FIRST(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='$') && (cached_LA2=='{')) {
+								mSELECT_LAST(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='T') && (cached_LA2=='(')) {
+								mTYPE(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='{') && (cached_LA2=='|')) {
+								mLAMBDA(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='0') && (cached_LA2=='x')) {
+								mHEXADECIMAL_INTEGER_LITERAL(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='!') && (true)) {
+								mBANG(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='?') && (true)) {
+								mQMARK(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='$') && (true)) {
+								mDOLLAR(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='{') && (true)) {
+								mLCURLY(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='=') && (true)) {
+								mASSIGN(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='^') && (true)) {
+								mPOWER(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='<') && (true)) {
+								mLESS_THAN(true);
+								theRetToken = returnToken_;
+							}
+							else if ((cached_LA1=='>') && (true)) {
+								mGREATER_THAN(true);
+								theRetToken = returnToken_;
+							}
+							else if ((tokenSet_0_.member(cached_LA1)) && (true)) {
+								mID(true);
+								theRetToken = returnToken_;
+							}
+							else if ((tokenSet_1_.member(cached_LA1)) && (true)) {
+								mNUMERIC_LITERAL(true);
+								theRetToken = returnToken_;
+							}
+						else
+						{
+							if (cached_LA1==EOF_CHAR) { uponEOF(); returnToken_ = makeToken(Token.EOF_TYPE); }
+				else {throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());}
+						}
+						break; }
+						if ( null==returnToken_ ) goto tryAgain; // found SKIP token
+						_ttype = returnToken_.Type;
+						_ttype = testLiteralsTable(_ttype);
+						returnToken_.Type = _ttype;
+						return returnToken_;
+					}
+					catch (RecognitionException e) {
+							throw new TokenStreamRecognitionException(e);
+					}
+				}
+				catch (CharStreamException cse) {
+					if ( cse is CharStreamIOException ) {
+						throw new TokenStreamIOException(((CharStreamIOException)cse).io);
+					}
+					else {
+						throw new TokenStreamException(cse.Message);
+					}
+				}
+			}
+		}
+		
+	public void mWS(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = WS;
+		
+		{
+			switch ( cached_LA1 )
+			{
+			case ' ':
+			{
+				match(' ');
+				break;
+			}
+			case '\t':
+			{
+				match('\t');
+				break;
+			}
+			case '\n':
+			{
+				match('\n');
+				break;
+			}
+			case '\r':
+			{
+				match('\r');
+				break;
+			}
+			default:
+			{
+				throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());
+			}
+			 }
+		}
+		if (0==inputState.guessing)
+		{
+			_ttype = Token.SKIP;
+		}
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mAT(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = AT;
+		
+		match('@');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mPIPE(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = PIPE;
+		
+		match('|');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mBANG(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = BANG;
+		
+		match('!');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mQMARK(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = QMARK;
+		
+		match('?');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mDOLLAR(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = DOLLAR;
+		
+		match('$');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mPOUND(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = POUND;
+		
+		match('#');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mLPAREN(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = LPAREN;
+		
+		match('(');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mRPAREN(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = RPAREN;
+		
+		match(')');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mLBRACKET(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = LBRACKET;
+		
+		match('[');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mRBRACKET(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = RBRACKET;
+		
+		match(']');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mLCURLY(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = LCURLY;
+		
+		match('{');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mRCURLY(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = RCURLY;
+		
+		match('}');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mCOMMA(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = COMMA;
+		
+		match(',');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mSEMI(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = SEMI;
+		
+		match(';');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mCOLON(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = COLON;
+		
+		match(':');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mASSIGN(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = ASSIGN;
+		
+		match('=');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mDEFAULT(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = DEFAULT;
+		
+		match("??");
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mPLUS(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = PLUS;
+		
+		match('+');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mMINUS(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = MINUS;
+		
+		match('-');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mDIV(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = DIV;
+		
+		match('/');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mSTAR(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = STAR;
+		
+		match('*');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mMOD(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = MOD;
+		
+		match('%');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mPOWER(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = POWER;
+		
+		match('^');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mEQUAL(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = EQUAL;
+		
+		match("==");
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mNOT_EQUAL(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = NOT_EQUAL;
+		
+		match("!=");
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mLESS_THAN(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = LESS_THAN;
+		
+		match('<');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mLESS_THAN_OR_EQUAL(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = LESS_THAN_OR_EQUAL;
+		
+		match("<=");
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mGREATER_THAN(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = GREATER_THAN;
+		
+		match('>');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mGREATER_THAN_OR_EQUAL(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = GREATER_THAN_OR_EQUAL;
+		
+		match(">=");
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mPROJECT(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = PROJECT;
+		
+		match("!{");
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mSELECT(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = SELECT;
+		
+		match("?{");
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mSELECT_FIRST(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = SELECT_FIRST;
+		
+		match("^{");
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mSELECT_LAST(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = SELECT_LAST;
+		
+		match("${");
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mTYPE(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = TYPE;
+		
+		match("T(");
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mLAMBDA(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = LAMBDA;
+		
+		match("{|");
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mDOT_ESCAPED(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = DOT_ESCAPED;
+		
+		match("\\.");
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mSTRING_LITERAL(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = STRING_LITERAL;
+		
+		int _saveIndex = 0;
+		_saveIndex = text.Length;
+		match('\'');
+		text.Length = _saveIndex;
+		{    // ( ... )*
+			for (;;)
+			{
+				if ((cached_LA1=='\'') && (cached_LA2=='\''))
+				{
+					mAPOS(false);
+				}
+				else if ((tokenSet_2_.member(cached_LA1))) {
+					matchNot('\'');
+				}
+				else
+				{
+					goto _loop156_breakloop;
+				}
+				
+			}
+_loop156_breakloop:			;
+		}    // ( ... )*
+		_saveIndex = text.Length;
+		match('\'');
+		text.Length = _saveIndex;
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	protected void mAPOS(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = APOS;
+		
+		int _saveIndex = 0;
+		_saveIndex = text.Length;
+		match('\'');
+		text.Length = _saveIndex;
+		match('\'');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mID(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = ID;
+		
+		{
+			switch ( cached_LA1 )
+			{
+			case 'a':  case 'b':  case 'c':  case 'd':
+			case 'e':  case 'f':  case 'g':  case 'h':
+			case 'i':  case 'j':  case 'k':  case 'l':
+			case 'm':  case 'n':  case 'o':  case 'p':
+			case 'q':  case 'r':  case 's':  case 't':
+			case 'u':  case 'v':  case 'w':  case 'x':
+			case 'y':  case 'z':
+			{
+				matchRange('a','z');
+				break;
+			}
+			case 'A':  case 'B':  case 'C':  case 'D':
+			case 'E':  case 'F':  case 'G':  case 'H':
+			case 'I':  case 'J':  case 'K':  case 'L':
+			case 'M':  case 'N':  case 'O':  case 'P':
+			case 'Q':  case 'R':  case 'S':  case 'T':
+			case 'U':  case 'V':  case 'W':  case 'X':
+			case 'Y':  case 'Z':
+			{
+				matchRange('A','Z');
+				break;
+			}
+			case '_':
+			{
+				match('_');
+				break;
+			}
+			default:
+			{
+				throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());
+			}
+			 }
+		}
+		{    // ( ... )*
+			for (;;)
+			{
+				switch ( cached_LA1 )
+				{
+				case 'a':  case 'b':  case 'c':  case 'd':
+				case 'e':  case 'f':  case 'g':  case 'h':
+				case 'i':  case 'j':  case 'k':  case 'l':
+				case 'm':  case 'n':  case 'o':  case 'p':
+				case 'q':  case 'r':  case 's':  case 't':
+				case 'u':  case 'v':  case 'w':  case 'x':
+				case 'y':  case 'z':
+				{
+					matchRange('a','z');
+					break;
+				}
+				case 'A':  case 'B':  case 'C':  case 'D':
+				case 'E':  case 'F':  case 'G':  case 'H':
+				case 'I':  case 'J':  case 'K':  case 'L':
+				case 'M':  case 'N':  case 'O':  case 'P':
+				case 'Q':  case 'R':  case 'S':  case 'T':
+				case 'U':  case 'V':  case 'W':  case 'X':
+				case 'Y':  case 'Z':
+				{
+					matchRange('A','Z');
+					break;
+				}
+				case '_':
+				{
+					match('_');
+					break;
+				}
+				case '0':  case '1':  case '2':  case '3':
+				case '4':  case '5':  case '6':  case '7':
+				case '8':  case '9':
+				{
+					matchRange('0','9');
+					break;
+				}
+				case '\\':
+				{
+					mDOT_ESCAPED(false);
+					break;
+				}
+				default:
+				{
+					goto _loop161_breakloop;
+				}
+				 }
+			}
+_loop161_breakloop:			;
+		}    // ( ... )*
+		_ttype = testLiteralsTable(_ttype);
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mNUMERIC_LITERAL(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = NUMERIC_LITERAL;
+		
+		bool synPredMatched164 = false;
+		if (((cached_LA1=='.') && ((cached_LA2 >= '0' && cached_LA2 <= '9'))))
+		{
+			int _m164 = mark();
+			synPredMatched164 = true;
+			inputState.guessing++;
+			try {
+				{
+					match('.');
+					mDECIMAL_DIGIT(false);
+				}
+			}
+			catch (RecognitionException)
+			{
+				synPredMatched164 = false;
+			}
+			rewind(_m164);
+			inputState.guessing--;
+		}
+		if ( synPredMatched164 )
+		{
+			match('.');
+			{ // ( ... )+
+				int _cnt166=0;
+				for (;;)
+				{
+					if (((cached_LA1 >= '0' && cached_LA1 <= '9')))
+					{
+						mDECIMAL_DIGIT(false);
+					}
+					else
+					{
+						if (_cnt166 >= 1) { goto _loop166_breakloop; } else { throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());; }
+					}
+					
+					_cnt166++;
+				}
+_loop166_breakloop:				;
+			}    // ( ... )+
+			{
+				if ((cached_LA1=='E'||cached_LA1=='e'))
+				{
+					mEXPONENT_PART(false);
+				}
+				else {
+				}
+				
+			}
+			{
+				if ((tokenSet_3_.member(cached_LA1)))
+				{
+					mREAL_TYPE_SUFFIX(false);
+				}
+				else {
+				}
+				
+			}
+			if (0==inputState.guessing)
+			{
+				_ttype = REAL_LITERAL;
+			}
+		}
+		else {
+			bool synPredMatched172 = false;
+			if ((((cached_LA1 >= '0' && cached_LA1 <= '9')) && (tokenSet_1_.member(cached_LA2))))
+			{
+				int _m172 = mark();
+				synPredMatched172 = true;
+				inputState.guessing++;
+				try {
+					{
+						{ // ( ... )+
+							int _cnt171=0;
+							for (;;)
+							{
+								if (((cached_LA1 >= '0' && cached_LA1 <= '9')))
+								{
+									mDECIMAL_DIGIT(false);
+								}
+								else
+								{
+									if (_cnt171 >= 1) { goto _loop171_breakloop; } else { throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());; }
+								}
+								
+								_cnt171++;
+							}
+_loop171_breakloop:							;
+						}    // ( ... )+
+						match('.');
+						mDECIMAL_DIGIT(false);
+					}
+				}
+				catch (RecognitionException)
+				{
+					synPredMatched172 = false;
+				}
+				rewind(_m172);
+				inputState.guessing--;
+			}
+			if ( synPredMatched172 )
+			{
+				{ // ( ... )+
+					int _cnt174=0;
+					for (;;)
+					{
+						if (((cached_LA1 >= '0' && cached_LA1 <= '9')))
+						{
+							mDECIMAL_DIGIT(false);
+						}
+						else
+						{
+							if (_cnt174 >= 1) { goto _loop174_breakloop; } else { throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());; }
+						}
+						
+						_cnt174++;
+					}
+_loop174_breakloop:					;
+				}    // ( ... )+
+				match('.');
+				{ // ( ... )+
+					int _cnt176=0;
+					for (;;)
+					{
+						if (((cached_LA1 >= '0' && cached_LA1 <= '9')))
+						{
+							mDECIMAL_DIGIT(false);
+						}
+						else
+						{
+							if (_cnt176 >= 1) { goto _loop176_breakloop; } else { throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());; }
+						}
+						
+						_cnt176++;
+					}
+_loop176_breakloop:					;
+				}    // ( ... )+
+				{
+					if ((cached_LA1=='E'||cached_LA1=='e'))
+					{
+						mEXPONENT_PART(false);
+					}
+					else {
+					}
+					
+				}
+				{
+					if ((tokenSet_3_.member(cached_LA1)))
+					{
+						mREAL_TYPE_SUFFIX(false);
+					}
+					else {
+					}
+					
+				}
+				if (0==inputState.guessing)
+				{
+					_ttype = REAL_LITERAL;
+				}
+			}
+			else {
+				bool synPredMatched183 = false;
+				if ((((cached_LA1 >= '0' && cached_LA1 <= '9')) && (tokenSet_4_.member(cached_LA2))))
+				{
+					int _m183 = mark();
+					synPredMatched183 = true;
+					inputState.guessing++;
+					try {
+						{
+							{ // ( ... )+
+								int _cnt181=0;
+								for (;;)
+								{
+									if (((cached_LA1 >= '0' && cached_LA1 <= '9')))
+									{
+										mDECIMAL_DIGIT(false);
+									}
+									else
+									{
+										if (_cnt181 >= 1) { goto _loop181_breakloop; } else { throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());; }
+									}
+									
+									_cnt181++;
+								}
+_loop181_breakloop:								;
+							}    // ( ... )+
+							{
+								mEXPONENT_PART(false);
+							}
+						}
+					}
+					catch (RecognitionException)
+					{
+						synPredMatched183 = false;
+					}
+					rewind(_m183);
+					inputState.guessing--;
+				}
+				if ( synPredMatched183 )
+				{
+					{ // ( ... )+
+						int _cnt185=0;
+						for (;;)
+						{
+							if (((cached_LA1 >= '0' && cached_LA1 <= '9')))
+							{
+								mDECIMAL_DIGIT(false);
+							}
+							else
+							{
+								if (_cnt185 >= 1) { goto _loop185_breakloop; } else { throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());; }
+							}
+							
+							_cnt185++;
+						}
+_loop185_breakloop:						;
+					}    // ( ... )+
+					{
+						mEXPONENT_PART(false);
+					}
+					{
+						if ((tokenSet_3_.member(cached_LA1)))
+						{
+							mREAL_TYPE_SUFFIX(false);
+						}
+						else {
+						}
+						
+					}
+					if (0==inputState.guessing)
+					{
+						_ttype = REAL_LITERAL;
+					}
+				}
+				else {
+					bool synPredMatched192 = false;
+					if ((((cached_LA1 >= '0' && cached_LA1 <= '9')) && (tokenSet_5_.member(cached_LA2))))
+					{
+						int _m192 = mark();
+						synPredMatched192 = true;
+						inputState.guessing++;
+						try {
+							{
+								{ // ( ... )+
+									int _cnt190=0;
+									for (;;)
+									{
+										if (((cached_LA1 >= '0' && cached_LA1 <= '9')))
+										{
+											mDECIMAL_DIGIT(false);
+										}
+										else
+										{
+											if (_cnt190 >= 1) { goto _loop190_breakloop; } else { throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());; }
+										}
+										
+										_cnt190++;
+									}
+_loop190_breakloop:									;
+								}    // ( ... )+
+								{
+									mREAL_TYPE_SUFFIX(false);
+								}
+							}
+						}
+						catch (RecognitionException)
+						{
+							synPredMatched192 = false;
+						}
+						rewind(_m192);
+						inputState.guessing--;
+					}
+					if ( synPredMatched192 )
+					{
+						{ // ( ... )+
+							int _cnt194=0;
+							for (;;)
+							{
+								if (((cached_LA1 >= '0' && cached_LA1 <= '9')))
+								{
+									mDECIMAL_DIGIT(false);
+								}
+								else
+								{
+									if (_cnt194 >= 1) { goto _loop194_breakloop; } else { throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());; }
+								}
+								
+								_cnt194++;
+							}
+_loop194_breakloop:							;
+						}    // ( ... )+
+						{
+							mREAL_TYPE_SUFFIX(false);
+						}
+						if (0==inputState.guessing)
+						{
+							_ttype = REAL_LITERAL;
+						}
+					}
+					else if (((cached_LA1 >= '0' && cached_LA1 <= '9')) && (true)) {
+						{ // ( ... )+
+							int _cnt197=0;
+							for (;;)
+							{
+								if (((cached_LA1 >= '0' && cached_LA1 <= '9')))
+								{
+									mDECIMAL_DIGIT(false);
+								}
+								else
+								{
+									if (_cnt197 >= 1) { goto _loop197_breakloop; } else { throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());; }
+								}
+								
+								_cnt197++;
+							}
+_loop197_breakloop:							;
+						}    // ( ... )+
+						{
+							if ((tokenSet_6_.member(cached_LA1)))
+							{
+								mINTEGER_TYPE_SUFFIX(false);
+							}
+							else {
+							}
+							
+						}
+						if (0==inputState.guessing)
+						{
+							_ttype = INTEGER_LITERAL;
+						}
+					}
+					else if ((cached_LA1=='.') && (true)) {
+						match('.');
+						if (0==inputState.guessing)
+						{
+							_ttype = DOT;
+						}
+					}
+					else
+					{
+						throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());
+					}
+					}}}
+					if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+					{
+						_token = makeToken(_ttype);
+						_token.setText(text.ToString(_begin, text.Length-_begin));
+					}
+					returnToken_ = _token;
+				}
+				
+	protected void mDECIMAL_DIGIT(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = DECIMAL_DIGIT;
+		
+		matchRange('0','9');
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	protected void mEXPONENT_PART(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = EXPONENT_PART;
+		
+		switch ( cached_LA1 )
+		{
+		case 'e':
+		{
+			match("e");
+			{    // ( ... )*
+				for (;;)
+				{
+					if ((cached_LA1=='+'||cached_LA1=='-'))
+					{
+						mSIGN(false);
+					}
+					else
+					{
+						goto _loop209_breakloop;
+					}
+					
+				}
+_loop209_breakloop:				;
+			}    // ( ... )*
+			{ // ( ... )+
+				int _cnt211=0;
+				for (;;)
+				{
+					if (((cached_LA1 >= '0' && cached_LA1 <= '9')))
+					{
+						mDECIMAL_DIGIT(false);
+					}
+					else
+					{
+						if (_cnt211 >= 1) { goto _loop211_breakloop; } else { throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());; }
+					}
+					
+					_cnt211++;
+				}
+_loop211_breakloop:				;
+			}    // ( ... )+
+			break;
+		}
+		case 'E':
+		{
+			match("E");
+			{    // ( ... )*
+				for (;;)
+				{
+					if ((cached_LA1=='+'||cached_LA1=='-'))
+					{
+						mSIGN(false);
+					}
+					else
+					{
+						goto _loop213_breakloop;
+					}
+					
+				}
+_loop213_breakloop:				;
+			}    // ( ... )*
+			{ // ( ... )+
+				int _cnt215=0;
+				for (;;)
+				{
+					if (((cached_LA1 >= '0' && cached_LA1 <= '9')))
+					{
+						mDECIMAL_DIGIT(false);
+					}
+					else
+					{
+						if (_cnt215 >= 1) { goto _loop215_breakloop; } else { throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());; }
+					}
+					
+					_cnt215++;
+				}
+_loop215_breakloop:				;
+			}    // ( ... )+
+			break;
+		}
+		default:
+		{
+			throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());
+		}
+		 }
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	protected void mREAL_TYPE_SUFFIX(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = REAL_TYPE_SUFFIX;
+		
+		switch ( cached_LA1 )
+		{
+		case 'F':
+		{
+			match('F');
+			break;
+		}
+		case 'f':
+		{
+			match('f');
+			break;
+		}
+		case 'D':
+		{
+			match('D');
+			break;
+		}
+		case 'd':
+		{
+			match('d');
+			break;
+		}
+		case 'M':
+		{
+			match('M');
+			break;
+		}
+		case 'm':
+		{
+			match('m');
+			break;
+		}
+		default:
+		{
+			throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());
+		}
+		 }
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	protected void mINTEGER_TYPE_SUFFIX(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = INTEGER_TYPE_SUFFIX;
+		
+		{
+			if ((cached_LA1=='U') && (cached_LA2=='L'))
+			{
+				match("UL");
+			}
+			else if ((cached_LA1=='L') && (cached_LA2=='U')) {
+				match("LU");
+			}
+			else if ((cached_LA1=='u') && (cached_LA2=='l')) {
+				match("ul");
+			}
+			else if ((cached_LA1=='l') && (cached_LA2=='u')) {
+				match("lu");
+			}
+			else if ((cached_LA1=='U') && (cached_LA2=='L')) {
+				match("UL");
+			}
+			else if ((cached_LA1=='L') && (cached_LA2=='U')) {
+				match("LU");
+			}
+			else if ((cached_LA1=='u') && (cached_LA2=='L')) {
+				match("uL");
+			}
+			else if ((cached_LA1=='l') && (cached_LA2=='U')) {
+				match("lU");
+			}
+			else if ((cached_LA1=='U') && (true)) {
+				match("U");
+			}
+			else if ((cached_LA1=='L') && (true)) {
+				match("L");
+			}
+			else if ((cached_LA1=='u') && (true)) {
+				match("u");
+			}
+			else if ((cached_LA1=='l') && (true)) {
+				match("l");
+			}
+			else
+			{
+				throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());
+			}
+			
+		}
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	public void mHEXADECIMAL_INTEGER_LITERAL(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = HEXADECIMAL_INTEGER_LITERAL;
+		
+		match("0x");
+		{ // ( ... )+
+			int _cnt201=0;
+			for (;;)
+			{
+				if ((tokenSet_7_.member(cached_LA1)))
+				{
+					mHEX_DIGIT(false);
+				}
+				else
+				{
+					if (_cnt201 >= 1) { goto _loop201_breakloop; } else { throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());; }
+				}
+				
+				_cnt201++;
+			}
+_loop201_breakloop:			;
+		}    // ( ... )+
+		{
+			if ((tokenSet_6_.member(cached_LA1)))
+			{
+				mINTEGER_TYPE_SUFFIX(false);
+			}
+			else {
+			}
+			
+		}
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	protected void mHEX_DIGIT(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = HEX_DIGIT;
+		
+		switch ( cached_LA1 )
+		{
+		case '0':
+		{
+			match('0');
+			break;
+		}
+		case '1':
+		{
+			match('1');
+			break;
+		}
+		case '2':
+		{
+			match('2');
+			break;
+		}
+		case '3':
+		{
+			match('3');
+			break;
+		}
+		case '4':
+		{
+			match('4');
+			break;
+		}
+		case '5':
+		{
+			match('5');
+			break;
+		}
+		case '6':
+		{
+			match('6');
+			break;
+		}
+		case '7':
+		{
+			match('7');
+			break;
+		}
+		case '8':
+		{
+			match('8');
+			break;
+		}
+		case '9':
+		{
+			match('9');
+			break;
+		}
+		case 'A':
+		{
+			match('A');
+			break;
+		}
+		case 'B':
+		{
+			match('B');
+			break;
+		}
+		case 'C':
+		{
+			match('C');
+			break;
+		}
+		case 'D':
+		{
+			match('D');
+			break;
+		}
+		case 'E':
+		{
+			match('E');
+			break;
+		}
+		case 'F':
+		{
+			match('F');
+			break;
+		}
+		case 'a':
+		{
+			match('a');
+			break;
+		}
+		case 'b':
+		{
+			match('b');
+			break;
+		}
+		case 'c':
+		{
+			match('c');
+			break;
+		}
+		case 'd':
+		{
+			match('d');
+			break;
+		}
+		case 'e':
+		{
+			match('e');
+			break;
+		}
+		case 'f':
+		{
+			match('f');
+			break;
+		}
+		default:
+		{
+			throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());
+		}
+		 }
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	protected void mSIGN(bool _createToken) //throws RecognitionException, CharStreamException, TokenStreamException
+{
+		int _ttype; IToken _token=null; int _begin=text.Length;
+		_ttype = SIGN;
+		
+		switch ( cached_LA1 )
+		{
+		case '+':
+		{
+			match('+');
+			break;
+		}
+		case '-':
+		{
+			match('-');
+			break;
+		}
+		default:
+		{
+			throw new NoViableAltForCharException(cached_LA1, getFilename(), getLine(), getColumn());
+		}
+		 }
+		if (_createToken && (null == _token) && (_ttype != Token.SKIP))
+		{
+			_token = makeToken(_ttype);
+			_token.setText(text.ToString(_begin, text.Length-_begin));
+		}
+		returnToken_ = _token;
+	}
+	
+	
+	private static long[] mk_tokenSet_0_()
+	{
+		long[] data = new long[1025];
+		data[0]=0L;
+		data[1]=576460745995190270L;
+		for (int i = 2; i<=1024; i++) { data[i]=0L; }
+		return data;
+	}
+	public static readonly BitSet tokenSet_0_ = new BitSet(mk_tokenSet_0_());
+	private static long[] mk_tokenSet_1_()
+	{
+		long[] data = new long[1025];
+		data[0]=288019269919178752L;
+		for (int i = 1; i<=1024; i++) { data[i]=0L; }
+		return data;
+	}
+	public static readonly BitSet tokenSet_1_ = new BitSet(mk_tokenSet_1_());
+	private static long[] mk_tokenSet_2_()
+	{
+		long[] data = new long[2048];
+		data[0]=-549755813889L;
+		for (int i = 1; i<=1022; i++) { data[i]=-1L; }
+		data[1023]=9223372036854775807L;
+		for (int i = 1024; i<=2047; i++) { data[i]=0L; }
+		return data;
+	}
+	public static readonly BitSet tokenSet_2_ = new BitSet(mk_tokenSet_2_());
+	private static long[] mk_tokenSet_3_()
+	{
+		long[] data = new long[1025];
+		data[0]=0L;
+		data[1]=35527969480784L;
+		for (int i = 2; i<=1024; i++) { data[i]=0L; }
+		return data;
+	}
+	public static readonly BitSet tokenSet_3_ = new BitSet(mk_tokenSet_3_());
+	private static long[] mk_tokenSet_4_()
+	{
+		long[] data = new long[1025];
+		data[0]=287948901175001088L;
+		data[1]=137438953504L;
+		for (int i = 2; i<=1024; i++) { data[i]=0L; }
+		return data;
+	}
+	public static readonly BitSet tokenSet_4_ = new BitSet(mk_tokenSet_4_());
+	private static long[] mk_tokenSet_5_()
+	{
+		long[] data = new long[1025];
+		data[0]=287948901175001088L;
+		data[1]=35527969480784L;
+		for (int i = 2; i<=1024; i++) { data[i]=0L; }
+		return data;
+	}
+	public static readonly BitSet tokenSet_5_ = new BitSet(mk_tokenSet_5_());
+	private static long[] mk_tokenSet_6_()
+	{
+		long[] data = new long[1025];
+		data[0]=0L;
+		data[1]=9024791442886656L;
+		for (int i = 2; i<=1024; i++) { data[i]=0L; }
+		return data;
+	}
+	public static readonly BitSet tokenSet_6_ = new BitSet(mk_tokenSet_6_());
+	private static long[] mk_tokenSet_7_()
+	{
+		long[] data = new long[1025];
+		data[0]=287948901175001088L;
+		data[1]=541165879422L;
+		for (int i = 2; i<=1024; i++) { data[i]=0L; }
+		return data;
+	}
+	public static readonly BitSet tokenSet_7_ = new BitSet(mk_tokenSet_7_());
+	
+}
+}
diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs
new file mode 100644
index 00000000..d7779e60
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs
@@ -0,0 +1,3441 @@
+// $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionParser.cs"$
+
+namespace Spring.Expressions
+{
+	// Generate the header common to all output files.
+	using System;
+	
+	using TokenBuffer              = antlr.TokenBuffer;
+	using TokenStreamException     = antlr.TokenStreamException;
+	using TokenStreamIOException   = antlr.TokenStreamIOException;
+	using ANTLRException           = antlr.ANTLRException;
+	using LLkParser = antlr.LLkParser;
+	using Token                    = antlr.Token;
+	using IToken                   = antlr.IToken;
+	using TokenStream              = antlr.TokenStream;
+	using RecognitionException     = antlr.RecognitionException;
+	using NoViableAltException     = antlr.NoViableAltException;
+	using MismatchedTokenException = antlr.MismatchedTokenException;
+	using SemanticException        = antlr.SemanticException;
+	using ParserSharedInputState   = antlr.ParserSharedInputState;
+	using BitSet                   = antlr.collections.impl.BitSet;
+	using AST                      = antlr.collections.AST;
+	using ASTPair                  = antlr.ASTPair;
+	using ASTFactory               = antlr.ASTFactory;
+	using ASTArray                 = antlr.collections.impl.ASTArray;
+	
+	internal 	class ExpressionParser : antlr.LLkParser
+	{
+		public const int EOF = 1;
+		public const int NULL_TREE_LOOKAHEAD = 3;
+		public const int EXPR = 4;
+		public const int OPERAND = 5;
+		public const int FALSE = 6;
+		public const int TRUE = 7;
+		public const int AND = 8;
+		public const int OR = 9;
+		public const int IN = 10;
+		public const int IS = 11;
+		public const int BETWEEN = 12;
+		public const int LIKE = 13;
+		public const int MATCHES = 14;
+		public const int NULL_LITERAL = 15;
+		public const int LPAREN = 16;
+		public const int SEMI = 17;
+		public const int RPAREN = 18;
+		public const int ASSIGN = 19;
+		public const int DEFAULT = 20;
+		public const int QMARK = 21;
+		public const int COLON = 22;
+		public const int PLUS = 23;
+		public const int MINUS = 24;
+		public const int STAR = 25;
+		public const int DIV = 26;
+		public const int MOD = 27;
+		public const int POWER = 28;
+		public const int BANG = 29;
+		public const int DOT = 30;
+		public const int POUND = 31;
+		public const int ID = 32;
+		public const int DOLLAR = 33;
+		public const int COMMA = 34;
+		public const int AT = 35;
+		public const int LBRACKET = 36;
+		public const int RBRACKET = 37;
+		public const int PROJECT = 38;
+		public const int RCURLY = 39;
+		public const int SELECT = 40;
+		public const int SELECT_FIRST = 41;
+		public const int SELECT_LAST = 42;
+		public const int TYPE = 43;
+		public const int LAMBDA = 44;
+		public const int PIPE = 45;
+		public const int LITERAL_new = 46;
+		public const int LCURLY = 47;
+		public const int INTEGER_LITERAL = 48;
+		public const int HEXADECIMAL_INTEGER_LITERAL = 49;
+		public const int REAL_LITERAL = 50;
+		public const int STRING_LITERAL = 51;
+		public const int LITERAL_date = 52;
+		public const int EQUAL = 53;
+		public const int NOT_EQUAL = 54;
+		public const int LESS_THAN = 55;
+		public const int LESS_THAN_OR_EQUAL = 56;
+		public const int GREATER_THAN = 57;
+		public const int GREATER_THAN_OR_EQUAL = 58;
+		public const int WS = 59;
+		public const int DOT_ESCAPED = 60;
+		public const int APOS = 61;
+		public const int NUMERIC_LITERAL = 62;
+		public const int DECIMAL_DIGIT = 63;
+		public const int INTEGER_TYPE_SUFFIX = 64;
+		public const int HEX_DIGIT = 65;
+		public const int EXPONENT_PART = 66;
+		public const int SIGN = 67;
+		public const int REAL_TYPE_SUFFIX = 68;
+		
+		
+    // CLOVER:OFF
+    
+    public override void reportError(RecognitionException ex)
+    {
+		//base.reportError(ex);
+        throw ex;
+    }
+
+    public override void reportError(string error)
+    {
+		//base.reportError(error);
+        throw new RecognitionException(error);
+    }
+    
+    private string GetRelationalOperatorNodeType(string op)
+    {
+        switch (op)
+        {
+            case "==" : return "Spring.Expressions.OpEqual";
+            case "!=" : return "Spring.Expressions.OpNotEqual";
+            case "<" : return "Spring.Expressions.OpLess";
+            case "<=" : return "Spring.Expressions.OpLessOrEqual";
+            case ">" : return "Spring.Expressions.OpGreater";
+            case ">=" : return "Spring.Expressions.OpGreaterOrEqual";
+            case "in" : return "Spring.Expressions.OpIn";
+            case "is" : return "Spring.Expressions.OpIs";
+            case "between" : return "Spring.Expressions.OpBetween";
+            case "like" : return "Spring.Expressions.OpLike";
+            case "matches" : return "Spring.Expressions.OpMatches";
+            default : 
+                throw new ArgumentException("Node type for operator '" + op + "' is not defined.");
+        }
+    }
+		
+		protected void initialize()
+		{
+			tokenNames = tokenNames_;
+			initializeFactory();
+		}
+		
+		
+		protected ExpressionParser(TokenBuffer tokenBuf, int k) : base(tokenBuf, k)
+		{
+			initialize();
+		}
+		
+		public ExpressionParser(TokenBuffer tokenBuf) : this(tokenBuf,2)
+		{
+		}
+		
+		protected ExpressionParser(TokenStream lexer, int k) : base(lexer,k)
+		{
+			initialize();
+		}
+		
+		public ExpressionParser(TokenStream lexer) : this(lexer,2)
+		{
+		}
+		
+		public ExpressionParser(ParserSharedInputState state) : base(state,2)
+		{
+			initialize();
+		}
+		
+	public void expr() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST expr_AST = null;
+		
+		try {      // for error handling
+			expression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			match(Token.EOF_TYPE);
+			expr_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_0_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = expr_AST;
+	}
+	
+	public void expression() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST expression_AST = null;
+		
+		try {      // for error handling
+			logicalOrExpression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{
+				switch ( LA(1) )
+				{
+				case ASSIGN:
+				{
+					{
+						Spring.Expressions.AssignNode tmp2_AST = null;
+						tmp2_AST = (Spring.Expressions.AssignNode) astFactory.create(LT(1), "Spring.Expressions.AssignNode");
+						astFactory.makeASTRoot(ref currentAST, (AST)tmp2_AST);
+						match(ASSIGN);
+						logicalOrExpression();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					break;
+				}
+				case DEFAULT:
+				{
+					{
+						Spring.Expressions.DefaultNode tmp3_AST = null;
+						tmp3_AST = (Spring.Expressions.DefaultNode) astFactory.create(LT(1), "Spring.Expressions.DefaultNode");
+						astFactory.makeASTRoot(ref currentAST, (AST)tmp3_AST);
+						match(DEFAULT);
+						logicalOrExpression();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					break;
+				}
+				case QMARK:
+				{
+					{
+						Spring.Expressions.TernaryNode tmp4_AST = null;
+						tmp4_AST = (Spring.Expressions.TernaryNode) astFactory.create(LT(1), "Spring.Expressions.TernaryNode");
+						astFactory.makeASTRoot(ref currentAST, (AST)tmp4_AST);
+						match(QMARK);
+						expression();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+						match(COLON);
+						expression();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					break;
+				}
+				case EOF:
+				case SEMI:
+				case RPAREN:
+				case COLON:
+				case COMMA:
+				case RBRACKET:
+				case RCURLY:
+				{
+					break;
+				}
+				default:
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				 }
+			}
+			expression_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_1_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = expression_AST;
+	}
+	
+	public void exprList() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST exprList_AST = null;
+		
+		try {      // for error handling
+			match(LPAREN);
+			expression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{ // ( ... )+
+				int _cnt4=0;
+				for (;;)
+				{
+					if ((LA(1)==SEMI))
+					{
+						match(SEMI);
+						expression();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else
+					{
+						if (_cnt4 >= 1) { goto _loop4_breakloop; } else { throw new NoViableAltException(LT(1), getFilename());; }
+					}
+					
+					_cnt4++;
+				}
+_loop4_breakloop:				;
+			}    // ( ... )+
+			match(RPAREN);
+			if (0==inputState.guessing)
+			{
+				exprList_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				exprList_AST = (Spring.Expressions.SpringAST) astFactory.make((AST)(Spring.Expressions.SpringAST) astFactory.create(EXPR,"expressionList","Spring.Expressions.ExpressionListNode"), (AST)exprList_AST);
+				currentAST.root = exprList_AST;
+				if ( (null != exprList_AST) && (null != exprList_AST.getFirstChild()) )
+					currentAST.child = exprList_AST.getFirstChild();
+				else
+					currentAST.child = exprList_AST;
+				currentAST.advanceChildToEnd();
+			}
+			exprList_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = exprList_AST;
+	}
+	
+	public void logicalOrExpression() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST logicalOrExpression_AST = null;
+		
+		try {      // for error handling
+			logicalAndExpression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{    // ( ... )*
+				for (;;)
+				{
+					if ((LA(1)==OR))
+					{
+						Spring.Expressions.OpOR tmp9_AST = null;
+						tmp9_AST = (Spring.Expressions.OpOR) astFactory.create(LT(1), "Spring.Expressions.OpOR");
+						astFactory.makeASTRoot(ref currentAST, (AST)tmp9_AST);
+						match(OR);
+						logicalAndExpression();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else
+					{
+						goto _loop13_breakloop;
+					}
+					
+				}
+_loop13_breakloop:				;
+			}    // ( ... )*
+			logicalOrExpression_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_3_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = logicalOrExpression_AST;
+	}
+	
+	public void parenExpr() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST parenExpr_AST = null;
+		
+		try {      // for error handling
+			match(LPAREN);
+			expression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			match(RPAREN);
+			parenExpr_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = parenExpr_AST;
+	}
+	
+	public void logicalAndExpression() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST logicalAndExpression_AST = null;
+		
+		try {      // for error handling
+			relationalExpression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{    // ( ... )*
+				for (;;)
+				{
+					if ((LA(1)==AND))
+					{
+						Spring.Expressions.OpAND tmp12_AST = null;
+						tmp12_AST = (Spring.Expressions.OpAND) astFactory.create(LT(1), "Spring.Expressions.OpAND");
+						astFactory.makeASTRoot(ref currentAST, (AST)tmp12_AST);
+						match(AND);
+						relationalExpression();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else
+					{
+						goto _loop16_breakloop;
+					}
+					
+				}
+_loop16_breakloop:				;
+			}    // ( ... )*
+			logicalAndExpression_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_4_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = logicalAndExpression_AST;
+	}
+	
+	public void relationalExpression() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST relationalExpression_AST = null;
+		Spring.Expressions.SpringAST e1_AST = null;
+		Spring.Expressions.SpringAST op_AST = null;
+		Spring.Expressions.SpringAST e2_AST = null;
+		
+		try {      // for error handling
+			sumExpr();
+			if (0 == inputState.guessing)
+			{
+				e1_AST = (Spring.Expressions.SpringAST)returnAST;
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{
+				if ((tokenSet_5_.member(LA(1))))
+				{
+					relationalOperator();
+					if (0 == inputState.guessing)
+					{
+						op_AST = (Spring.Expressions.SpringAST)returnAST;
+					}
+					sumExpr();
+					if (0 == inputState.guessing)
+					{
+						e2_AST = (Spring.Expressions.SpringAST)returnAST;
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					if (0==inputState.guessing)
+					{
+						relationalExpression_AST = (Spring.Expressions.SpringAST)currentAST.root;
+						relationalExpression_AST = (Spring.Expressions.SpringAST) astFactory.make((AST)(Spring.Expressions.SpringAST) astFactory.create(EXPR,op_AST.getText(),GetRelationalOperatorNodeType(op_AST.getText())), (AST)relationalExpression_AST);
+						currentAST.root = relationalExpression_AST;
+						if ( (null != relationalExpression_AST) && (null != relationalExpression_AST.getFirstChild()) )
+							currentAST.child = relationalExpression_AST.getFirstChild();
+						else
+							currentAST.child = relationalExpression_AST;
+						currentAST.advanceChildToEnd();
+					}
+				}
+				else if ((tokenSet_6_.member(LA(1)))) {
+				}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				
+			}
+			relationalExpression_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_6_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = relationalExpression_AST;
+	}
+	
+	public void sumExpr() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST sumExpr_AST = null;
+		
+		try {      // for error handling
+			prodExpr();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{    // ( ... )*
+				for (;;)
+				{
+					if ((LA(1)==PLUS||LA(1)==MINUS))
+					{
+						{
+							if ((LA(1)==PLUS))
+							{
+								Spring.Expressions.OpADD tmp13_AST = null;
+								tmp13_AST = (Spring.Expressions.OpADD) astFactory.create(LT(1), "Spring.Expressions.OpADD");
+								astFactory.makeASTRoot(ref currentAST, (AST)tmp13_AST);
+								match(PLUS);
+							}
+							else if ((LA(1)==MINUS)) {
+								Spring.Expressions.OpSUBTRACT tmp14_AST = null;
+								tmp14_AST = (Spring.Expressions.OpSUBTRACT) astFactory.create(LT(1), "Spring.Expressions.OpSUBTRACT");
+								astFactory.makeASTRoot(ref currentAST, (AST)tmp14_AST);
+								match(MINUS);
+							}
+							else
+							{
+								throw new NoViableAltException(LT(1), getFilename());
+							}
+							
+						}
+						prodExpr();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else
+					{
+						goto _loop22_breakloop;
+					}
+					
+				}
+_loop22_breakloop:				;
+			}    // ( ... )*
+			sumExpr_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_7_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = sumExpr_AST;
+	}
+	
+	public void relationalOperator() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST relationalOperator_AST = null;
+		
+		try {      // for error handling
+			switch ( LA(1) )
+			{
+			case EQUAL:
+			{
+				Spring.Expressions.SpringAST tmp15_AST = null;
+				tmp15_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp15_AST);
+				match(EQUAL);
+				relationalOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case NOT_EQUAL:
+			{
+				Spring.Expressions.SpringAST tmp16_AST = null;
+				tmp16_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp16_AST);
+				match(NOT_EQUAL);
+				relationalOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case LESS_THAN:
+			{
+				Spring.Expressions.SpringAST tmp17_AST = null;
+				tmp17_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp17_AST);
+				match(LESS_THAN);
+				relationalOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case LESS_THAN_OR_EQUAL:
+			{
+				Spring.Expressions.SpringAST tmp18_AST = null;
+				tmp18_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp18_AST);
+				match(LESS_THAN_OR_EQUAL);
+				relationalOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case GREATER_THAN:
+			{
+				Spring.Expressions.SpringAST tmp19_AST = null;
+				tmp19_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp19_AST);
+				match(GREATER_THAN);
+				relationalOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case GREATER_THAN_OR_EQUAL:
+			{
+				Spring.Expressions.SpringAST tmp20_AST = null;
+				tmp20_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp20_AST);
+				match(GREATER_THAN_OR_EQUAL);
+				relationalOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case IN:
+			{
+				Spring.Expressions.SpringAST tmp21_AST = null;
+				tmp21_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp21_AST);
+				match(IN);
+				relationalOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case IS:
+			{
+				Spring.Expressions.SpringAST tmp22_AST = null;
+				tmp22_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp22_AST);
+				match(IS);
+				relationalOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case BETWEEN:
+			{
+				Spring.Expressions.SpringAST tmp23_AST = null;
+				tmp23_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp23_AST);
+				match(BETWEEN);
+				relationalOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case LIKE:
+			{
+				Spring.Expressions.SpringAST tmp24_AST = null;
+				tmp24_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp24_AST);
+				match(LIKE);
+				relationalOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case MATCHES:
+			{
+				Spring.Expressions.SpringAST tmp25_AST = null;
+				tmp25_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp25_AST);
+				match(MATCHES);
+				relationalOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			default:
+			{
+				throw new NoViableAltException(LT(1), getFilename());
+			}
+			 }
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_8_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = relationalOperator_AST;
+	}
+	
+	public void prodExpr() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST prodExpr_AST = null;
+		
+		try {      // for error handling
+			powExpr();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{    // ( ... )*
+				for (;;)
+				{
+					if (((LA(1) >= STAR && LA(1) <= MOD)))
+					{
+						{
+							switch ( LA(1) )
+							{
+							case STAR:
+							{
+								Spring.Expressions.OpMULTIPLY tmp26_AST = null;
+								tmp26_AST = (Spring.Expressions.OpMULTIPLY) astFactory.create(LT(1), "Spring.Expressions.OpMULTIPLY");
+								astFactory.makeASTRoot(ref currentAST, (AST)tmp26_AST);
+								match(STAR);
+								break;
+							}
+							case DIV:
+							{
+								Spring.Expressions.OpDIVIDE tmp27_AST = null;
+								tmp27_AST = (Spring.Expressions.OpDIVIDE) astFactory.create(LT(1), "Spring.Expressions.OpDIVIDE");
+								astFactory.makeASTRoot(ref currentAST, (AST)tmp27_AST);
+								match(DIV);
+								break;
+							}
+							case MOD:
+							{
+								Spring.Expressions.OpMODULUS tmp28_AST = null;
+								tmp28_AST = (Spring.Expressions.OpMODULUS) astFactory.create(LT(1), "Spring.Expressions.OpMODULUS");
+								astFactory.makeASTRoot(ref currentAST, (AST)tmp28_AST);
+								match(MOD);
+								break;
+							}
+							default:
+							{
+								throw new NoViableAltException(LT(1), getFilename());
+							}
+							 }
+						}
+						powExpr();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else
+					{
+						goto _loop26_breakloop;
+					}
+					
+				}
+_loop26_breakloop:				;
+			}    // ( ... )*
+			prodExpr_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_9_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = prodExpr_AST;
+	}
+	
+	public void powExpr() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST powExpr_AST = null;
+		
+		try {      // for error handling
+			unaryExpression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{
+				if ((LA(1)==POWER))
+				{
+					Spring.Expressions.OpPOWER tmp29_AST = null;
+					tmp29_AST = (Spring.Expressions.OpPOWER) astFactory.create(LT(1), "Spring.Expressions.OpPOWER");
+					astFactory.makeASTRoot(ref currentAST, (AST)tmp29_AST);
+					match(POWER);
+					unaryExpression();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+				}
+				else if ((tokenSet_10_.member(LA(1)))) {
+				}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				
+			}
+			powExpr_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_10_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = powExpr_AST;
+	}
+	
+	public void unaryExpression() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST unaryExpression_AST = null;
+		
+		try {      // for error handling
+			if ((LA(1)==PLUS||LA(1)==MINUS||LA(1)==BANG))
+			{
+				{
+					switch ( LA(1) )
+					{
+					case PLUS:
+					{
+						Spring.Expressions.OpUnaryPlus tmp30_AST = null;
+						tmp30_AST = (Spring.Expressions.OpUnaryPlus) astFactory.create(LT(1), "Spring.Expressions.OpUnaryPlus");
+						astFactory.makeASTRoot(ref currentAST, (AST)tmp30_AST);
+						match(PLUS);
+						break;
+					}
+					case MINUS:
+					{
+						Spring.Expressions.OpUnaryMinus tmp31_AST = null;
+						tmp31_AST = (Spring.Expressions.OpUnaryMinus) astFactory.create(LT(1), "Spring.Expressions.OpUnaryMinus");
+						astFactory.makeASTRoot(ref currentAST, (AST)tmp31_AST);
+						match(MINUS);
+						break;
+					}
+					case BANG:
+					{
+						Spring.Expressions.OpNOT tmp32_AST = null;
+						tmp32_AST = (Spring.Expressions.OpNOT) astFactory.create(LT(1), "Spring.Expressions.OpNOT");
+						astFactory.makeASTRoot(ref currentAST, (AST)tmp32_AST);
+						match(BANG);
+						break;
+					}
+					default:
+					{
+						throw new NoViableAltException(LT(1), getFilename());
+					}
+					 }
+				}
+				unaryExpression();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				unaryExpression_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else if ((tokenSet_11_.member(LA(1)))) {
+				primaryExpression();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				unaryExpression_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else
+			{
+				throw new NoViableAltException(LT(1), getFilename());
+			}
+			
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_12_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = unaryExpression_AST;
+	}
+	
+	public void primaryExpression() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST primaryExpression_AST = null;
+		
+		try {      // for error handling
+			startNode();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{
+				if ((tokenSet_13_.member(LA(1))))
+				{
+					node();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+				}
+				else if ((tokenSet_12_.member(LA(1)))) {
+				}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				
+			}
+			if (0==inputState.guessing)
+			{
+				primaryExpression_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				primaryExpression_AST = (Spring.Expressions.SpringAST) astFactory.make((AST)(Spring.Expressions.SpringAST) astFactory.create(EXPR,"expression","Spring.Expressions.Expression"), (AST)primaryExpression_AST);
+				currentAST.root = primaryExpression_AST;
+				if ( (null != primaryExpression_AST) && (null != primaryExpression_AST.getFirstChild()) )
+					currentAST.child = primaryExpression_AST.getFirstChild();
+				else
+					currentAST.child = primaryExpression_AST;
+				currentAST.advanceChildToEnd();
+			}
+			primaryExpression_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_12_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = primaryExpression_AST;
+	}
+	
+	public void unaryOperator() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST unaryOperator_AST = null;
+		
+		try {      // for error handling
+			switch ( LA(1) )
+			{
+			case PLUS:
+			{
+				Spring.Expressions.SpringAST tmp33_AST = null;
+				tmp33_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp33_AST);
+				match(PLUS);
+				unaryOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case MINUS:
+			{
+				Spring.Expressions.SpringAST tmp34_AST = null;
+				tmp34_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp34_AST);
+				match(MINUS);
+				unaryOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case BANG:
+			{
+				Spring.Expressions.SpringAST tmp35_AST = null;
+				tmp35_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp35_AST);
+				match(BANG);
+				unaryOperator_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			default:
+			{
+				throw new NoViableAltException(LT(1), getFilename());
+			}
+			 }
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_0_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = unaryOperator_AST;
+	}
+	
+	public void startNode() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST startNode_AST = null;
+		
+		try {      // for error handling
+			{
+				switch ( LA(1) )
+				{
+				case ID:
+				{
+					methodOrProperty();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					break;
+				}
+				case DOLLAR:
+				{
+					localFunctionOrVar();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					break;
+				}
+				case LBRACKET:
+				{
+					indexer();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					break;
+				}
+				case FALSE:
+				case TRUE:
+				case NULL_LITERAL:
+				case INTEGER_LITERAL:
+				case HEXADECIMAL_INTEGER_LITERAL:
+				case REAL_LITERAL:
+				case STRING_LITERAL:
+				case LITERAL_date:
+				{
+					literal();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					break;
+				}
+				case TYPE:
+				{
+					type();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					break;
+				}
+				case LITERAL_new:
+				{
+					constructor();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					break;
+				}
+				case PROJECT:
+				{
+					projection();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					break;
+				}
+				case SELECT:
+				{
+					selection();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					break;
+				}
+				case SELECT_FIRST:
+				{
+					firstSelection();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					break;
+				}
+				case SELECT_LAST:
+				{
+					lastSelection();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					break;
+				}
+				case LCURLY:
+				{
+					listInitializer();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					break;
+				}
+				case LAMBDA:
+				{
+					lambda();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					break;
+				}
+				default:
+					bool synPredMatched37 = false;
+					if (((LA(1)==LPAREN) && (tokenSet_8_.member(LA(2)))))
+					{
+						int _m37 = mark();
+						synPredMatched37 = true;
+						inputState.guessing++;
+						try {
+							{
+								match(LPAREN);
+								expression();
+								match(SEMI);
+							}
+						}
+						catch (RecognitionException)
+						{
+							synPredMatched37 = false;
+						}
+						rewind(_m37);
+						inputState.guessing--;
+					}
+					if ( synPredMatched37 )
+					{
+						exprList();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else if ((LA(1)==LPAREN) && (tokenSet_8_.member(LA(2)))) {
+						parenExpr();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else if ((LA(1)==POUND) && (LA(2)==ID)) {
+						functionOrVar();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else if ((LA(1)==AT) && (LA(2)==LPAREN)) {
+						reference();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else if ((LA(1)==POUND) && (LA(2)==LCURLY)) {
+						mapInitializer();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else if ((LA(1)==AT) && (LA(2)==LBRACKET)) {
+						attribute();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				break; }
+			}
+			startNode_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = startNode_AST;
+	}
+	
+	public void node() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST node_AST = null;
+		
+		try {      // for error handling
+			{ // ( ... )+
+				int _cnt40=0;
+				for (;;)
+				{
+					switch ( LA(1) )
+					{
+					case ID:
+					{
+						methodOrProperty();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+						break;
+					}
+					case LBRACKET:
+					{
+						indexer();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+						break;
+					}
+					case PROJECT:
+					{
+						projection();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+						break;
+					}
+					case SELECT:
+					{
+						selection();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+						break;
+					}
+					case SELECT_FIRST:
+					{
+						firstSelection();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+						break;
+					}
+					case SELECT_LAST:
+					{
+						lastSelection();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+						break;
+					}
+					case LPAREN:
+					{
+						exprList();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+						break;
+					}
+					case DOT:
+					{
+						match(DOT);
+						break;
+					}
+					default:
+					{
+						if (_cnt40 >= 1) { goto _loop40_breakloop; } else { throw new NoViableAltException(LT(1), getFilename());; }
+					}
+					break; }
+					_cnt40++;
+				}
+_loop40_breakloop:				;
+			}    // ( ... )+
+			node_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_12_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = node_AST;
+	}
+	
+	public void methodOrProperty() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST methodOrProperty_AST = null;
+		
+		try {      // for error handling
+			bool synPredMatched53 = false;
+			if (((LA(1)==ID) && (LA(2)==LPAREN)))
+			{
+				int _m53 = mark();
+				synPredMatched53 = true;
+				inputState.guessing++;
+				try {
+					{
+						match(ID);
+						match(LPAREN);
+					}
+				}
+				catch (RecognitionException)
+				{
+					synPredMatched53 = false;
+				}
+				rewind(_m53);
+				inputState.guessing--;
+			}
+			if ( synPredMatched53 )
+			{
+				Spring.Expressions.MethodNode tmp37_AST = null;
+				tmp37_AST = (Spring.Expressions.MethodNode) astFactory.create(LT(1), "Spring.Expressions.MethodNode");
+				astFactory.makeASTRoot(ref currentAST, (AST)tmp37_AST);
+				match(ID);
+				methodArgs();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				methodOrProperty_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else if ((LA(1)==ID) && (tokenSet_2_.member(LA(2)))) {
+				property();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				methodOrProperty_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else
+			{
+				throw new NoViableAltException(LT(1), getFilename());
+			}
+			
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = methodOrProperty_AST;
+	}
+	
+	public void functionOrVar() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST functionOrVar_AST = null;
+		
+		try {      // for error handling
+			bool synPredMatched43 = false;
+			if (((LA(1)==POUND) && (LA(2)==ID)))
+			{
+				int _m43 = mark();
+				synPredMatched43 = true;
+				inputState.guessing++;
+				try {
+					{
+						match(POUND);
+						match(ID);
+						match(LPAREN);
+					}
+				}
+				catch (RecognitionException)
+				{
+					synPredMatched43 = false;
+				}
+				rewind(_m43);
+				inputState.guessing--;
+			}
+			if ( synPredMatched43 )
+			{
+				function();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				functionOrVar_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else if ((LA(1)==POUND) && (LA(2)==ID)) {
+				var();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				functionOrVar_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else
+			{
+				throw new NoViableAltException(LT(1), getFilename());
+			}
+			
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = functionOrVar_AST;
+	}
+	
+	public void localFunctionOrVar() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST localFunctionOrVar_AST = null;
+		
+		try {      // for error handling
+			bool synPredMatched48 = false;
+			if (((LA(1)==DOLLAR) && (LA(2)==ID)))
+			{
+				int _m48 = mark();
+				synPredMatched48 = true;
+				inputState.guessing++;
+				try {
+					{
+						match(DOLLAR);
+						match(ID);
+						match(LPAREN);
+					}
+				}
+				catch (RecognitionException)
+				{
+					synPredMatched48 = false;
+				}
+				rewind(_m48);
+				inputState.guessing--;
+			}
+			if ( synPredMatched48 )
+			{
+				localFunction();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				localFunctionOrVar_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else if ((LA(1)==DOLLAR) && (LA(2)==ID)) {
+				localVar();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				localFunctionOrVar_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else
+			{
+				throw new NoViableAltException(LT(1), getFilename());
+			}
+			
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = localFunctionOrVar_AST;
+	}
+	
+	public void reference() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST reference_AST = null;
+		Spring.Expressions.SpringAST cn_AST = null;
+		Spring.Expressions.SpringAST id_AST = null;
+		
+		try {      // for error handling
+			match(AT);
+			match(LPAREN);
+			{
+				if ((LA(1)==ID) && (LA(2)==COLON||LA(2)==DIV))
+				{
+					contextName();
+					if (0 == inputState.guessing)
+					{
+						cn_AST = (Spring.Expressions.SpringAST)returnAST;
+					}
+					match(COLON);
+				}
+				else if ((LA(1)==ID) && (LA(2)==RPAREN||LA(2)==DOT)) {
+				}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				
+			}
+			qualifiedId();
+			if (0 == inputState.guessing)
+			{
+				id_AST = (Spring.Expressions.SpringAST)returnAST;
+			}
+			match(RPAREN);
+			if (0==inputState.guessing)
+			{
+				reference_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				reference_AST = (Spring.Expressions.SpringAST) astFactory.make((AST)(Spring.Expressions.SpringAST) astFactory.create(EXPR,"ref","Spring.Context.Support.ReferenceNode"), (AST)cn_AST, (AST)id_AST);
+				currentAST.root = reference_AST;
+				if ( (null != reference_AST) && (null != reference_AST.getFirstChild()) )
+					currentAST.child = reference_AST.getFirstChild();
+				else
+					currentAST.child = reference_AST;
+				currentAST.advanceChildToEnd();
+			}
+			reference_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = reference_AST;
+	}
+	
+	public void indexer() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST indexer_AST = null;
+		
+		try {      // for error handling
+			Spring.Expressions.IndexerNode tmp42_AST = null;
+			tmp42_AST = (Spring.Expressions.IndexerNode) astFactory.create(LT(1), "Spring.Expressions.IndexerNode");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp42_AST);
+			match(LBRACKET);
+			argument();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{    // ( ... )*
+				for (;;)
+				{
+					if ((LA(1)==COMMA))
+					{
+						match(COMMA);
+						argument();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else
+					{
+						goto _loop63_breakloop;
+					}
+					
+				}
+_loop63_breakloop:				;
+			}    // ( ... )*
+			match(RBRACKET);
+			indexer_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = indexer_AST;
+	}
+	
+	public void literal() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST literal_AST = null;
+		
+		try {      // for error handling
+			switch ( LA(1) )
+			{
+			case NULL_LITERAL:
+			{
+				Spring.Expressions.NullLiteralNode tmp45_AST = null;
+				tmp45_AST = (Spring.Expressions.NullLiteralNode) astFactory.create(LT(1), "Spring.Expressions.NullLiteralNode");
+				astFactory.addASTChild(ref currentAST, (AST)tmp45_AST);
+				match(NULL_LITERAL);
+				literal_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case INTEGER_LITERAL:
+			{
+				Spring.Expressions.IntLiteralNode tmp46_AST = null;
+				tmp46_AST = (Spring.Expressions.IntLiteralNode) astFactory.create(LT(1), "Spring.Expressions.IntLiteralNode");
+				astFactory.addASTChild(ref currentAST, (AST)tmp46_AST);
+				match(INTEGER_LITERAL);
+				literal_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case HEXADECIMAL_INTEGER_LITERAL:
+			{
+				Spring.Expressions.HexLiteralNode tmp47_AST = null;
+				tmp47_AST = (Spring.Expressions.HexLiteralNode) astFactory.create(LT(1), "Spring.Expressions.HexLiteralNode");
+				astFactory.addASTChild(ref currentAST, (AST)tmp47_AST);
+				match(HEXADECIMAL_INTEGER_LITERAL);
+				literal_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case REAL_LITERAL:
+			{
+				Spring.Expressions.RealLiteralNode tmp48_AST = null;
+				tmp48_AST = (Spring.Expressions.RealLiteralNode) astFactory.create(LT(1), "Spring.Expressions.RealLiteralNode");
+				astFactory.addASTChild(ref currentAST, (AST)tmp48_AST);
+				match(REAL_LITERAL);
+				literal_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case STRING_LITERAL:
+			{
+				Spring.Expressions.StringLiteralNode tmp49_AST = null;
+				tmp49_AST = (Spring.Expressions.StringLiteralNode) astFactory.create(LT(1), "Spring.Expressions.StringLiteralNode");
+				astFactory.addASTChild(ref currentAST, (AST)tmp49_AST);
+				match(STRING_LITERAL);
+				literal_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case FALSE:
+			case TRUE:
+			{
+				boolLiteral();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				literal_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			case LITERAL_date:
+			{
+				dateLiteral();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				literal_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				break;
+			}
+			default:
+			{
+				throw new NoViableAltException(LT(1), getFilename());
+			}
+			 }
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = literal_AST;
+	}
+	
+	public void type() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST type_AST = null;
+		Spring.Expressions.SpringAST tn_AST = null;
+		
+		try {      // for error handling
+			match(TYPE);
+			qualifiedId();
+			if (0 == inputState.guessing)
+			{
+				tn_AST = (Spring.Expressions.SpringAST)returnAST;
+			}
+			{
+				if ((LA(1)==LBRACKET))
+				{
+					Spring.Expressions.SpringAST tmp51_AST = null;
+					tmp51_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+					astFactory.addASTChild(ref currentAST, (AST)tmp51_AST);
+					match(LBRACKET);
+					Spring.Expressions.SpringAST tmp52_AST = null;
+					tmp52_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+					astFactory.addASTChild(ref currentAST, (AST)tmp52_AST);
+					match(RBRACKET);
+				}
+				else if ((LA(1)==RPAREN||LA(1)==COMMA)) {
+				}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				
+			}
+			{
+				if ((LA(1)==COMMA))
+				{
+					Spring.Expressions.SpringAST tmp53_AST = null;
+					tmp53_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+					astFactory.addASTChild(ref currentAST, (AST)tmp53_AST);
+					match(COMMA);
+					qualifiedId();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+				}
+				else if ((LA(1)==RPAREN)) {
+				}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				
+			}
+			match(RPAREN);
+			if (0==inputState.guessing)
+			{
+				type_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				type_AST = (Spring.Expressions.SpringAST) astFactory.make((AST)(Spring.Expressions.SpringAST) astFactory.create(EXPR,tn_AST.getText(),"Spring.Expressions.TypeNode"), (AST)type_AST);
+				currentAST.root = type_AST;
+				if ( (null != type_AST) && (null != type_AST.getFirstChild()) )
+					currentAST.child = type_AST.getFirstChild();
+				else
+					currentAST.child = type_AST;
+				currentAST.advanceChildToEnd();
+			}
+			type_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = type_AST;
+	}
+	
+	public void constructor() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST constructor_AST = null;
+		Spring.Expressions.SpringAST type_AST = null;
+		
+		try {      // for error handling
+			bool synPredMatched83 = false;
+			if (((LA(1)==LITERAL_new) && (LA(2)==ID)))
+			{
+				int _m83 = mark();
+				synPredMatched83 = true;
+				inputState.guessing++;
+				try {
+					{
+						match(LITERAL_new);
+						qualifiedId();
+						match(LPAREN);
+					}
+				}
+				catch (RecognitionException)
+				{
+					synPredMatched83 = false;
+				}
+				rewind(_m83);
+				inputState.guessing--;
+			}
+			if ( synPredMatched83 )
+			{
+				match(LITERAL_new);
+				qualifiedId();
+				if (0 == inputState.guessing)
+				{
+					type_AST = (Spring.Expressions.SpringAST)returnAST;
+				}
+				ctorArgs();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				if (0==inputState.guessing)
+				{
+					constructor_AST = (Spring.Expressions.SpringAST)currentAST.root;
+					constructor_AST = (Spring.Expressions.SpringAST) astFactory.make((AST)(Spring.Expressions.SpringAST) astFactory.create(EXPR,type_AST.getText(),"Spring.Expressions.ConstructorNode"), (AST)constructor_AST);
+					currentAST.root = constructor_AST;
+					if ( (null != constructor_AST) && (null != constructor_AST.getFirstChild()) )
+						currentAST.child = constructor_AST.getFirstChild();
+					else
+						currentAST.child = constructor_AST;
+					currentAST.advanceChildToEnd();
+				}
+				constructor_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else if ((LA(1)==LITERAL_new) && (LA(2)==ID)) {
+				arrayConstructor();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				constructor_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else
+			{
+				throw new NoViableAltException(LT(1), getFilename());
+			}
+			
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = constructor_AST;
+	}
+	
+	public void projection() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST projection_AST = null;
+		
+		try {      // for error handling
+			Spring.Expressions.ProjectionNode tmp56_AST = null;
+			tmp56_AST = (Spring.Expressions.ProjectionNode) astFactory.create(LT(1), "Spring.Expressions.ProjectionNode");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp56_AST);
+			match(PROJECT);
+			expression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			match(RCURLY);
+			projection_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = projection_AST;
+	}
+	
+	public void selection() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST selection_AST = null;
+		
+		try {      // for error handling
+			Spring.Expressions.SelectionNode tmp58_AST = null;
+			tmp58_AST = (Spring.Expressions.SelectionNode) astFactory.create(LT(1), "Spring.Expressions.SelectionNode");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp58_AST);
+			match(SELECT);
+			expression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{    // ( ... )*
+				for (;;)
+				{
+					if ((LA(1)==COMMA))
+					{
+						match(COMMA);
+						expression();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else
+					{
+						goto _loop67_breakloop;
+					}
+					
+				}
+_loop67_breakloop:				;
+			}    // ( ... )*
+			match(RCURLY);
+			selection_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = selection_AST;
+	}
+	
+	public void firstSelection() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST firstSelection_AST = null;
+		
+		try {      // for error handling
+			Spring.Expressions.SelectionFirstNode tmp61_AST = null;
+			tmp61_AST = (Spring.Expressions.SelectionFirstNode) astFactory.create(LT(1), "Spring.Expressions.SelectionFirstNode");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp61_AST);
+			match(SELECT_FIRST);
+			expression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			match(RCURLY);
+			firstSelection_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = firstSelection_AST;
+	}
+	
+	public void lastSelection() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST lastSelection_AST = null;
+		
+		try {      // for error handling
+			Spring.Expressions.SelectionLastNode tmp63_AST = null;
+			tmp63_AST = (Spring.Expressions.SelectionLastNode) astFactory.create(LT(1), "Spring.Expressions.SelectionLastNode");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp63_AST);
+			match(SELECT_LAST);
+			expression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			match(RCURLY);
+			lastSelection_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = lastSelection_AST;
+	}
+	
+	public void listInitializer() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST listInitializer_AST = null;
+		
+		try {      // for error handling
+			Spring.Expressions.ListInitializerNode tmp65_AST = null;
+			tmp65_AST = (Spring.Expressions.ListInitializerNode) astFactory.create(LT(1), "Spring.Expressions.ListInitializerNode");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp65_AST);
+			match(LCURLY);
+			expression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{    // ( ... )*
+				for (;;)
+				{
+					if ((LA(1)==COMMA))
+					{
+						match(COMMA);
+						expression();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else
+					{
+						goto _loop92_breakloop;
+					}
+					
+				}
+_loop92_breakloop:				;
+			}    // ( ... )*
+			match(RCURLY);
+			listInitializer_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = listInitializer_AST;
+	}
+	
+	public void mapInitializer() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST mapInitializer_AST = null;
+		
+		try {      // for error handling
+			match(POUND);
+			Spring.Expressions.MapInitializerNode tmp69_AST = null;
+			tmp69_AST = (Spring.Expressions.MapInitializerNode) astFactory.create(LT(1), "Spring.Expressions.MapInitializerNode");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp69_AST);
+			match(LCURLY);
+			mapEntry();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{    // ( ... )*
+				for (;;)
+				{
+					if ((LA(1)==COMMA))
+					{
+						match(COMMA);
+						mapEntry();
+						if (0 == inputState.guessing)
+						{
+							astFactory.addASTChild(ref currentAST, (AST)returnAST);
+						}
+					}
+					else
+					{
+						goto _loop95_breakloop;
+					}
+					
+				}
+_loop95_breakloop:				;
+			}    // ( ... )*
+			match(RCURLY);
+			mapInitializer_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = mapInitializer_AST;
+	}
+	
+	public void lambda() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST lambda_AST = null;
+		
+		try {      // for error handling
+			match(LAMBDA);
+			{
+				if ((LA(1)==ID))
+				{
+					argList();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+				}
+				else if ((LA(1)==PIPE)) {
+				}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				
+			}
+			match(PIPE);
+			expression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			match(RCURLY);
+			if (0==inputState.guessing)
+			{
+				lambda_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				lambda_AST = (Spring.Expressions.SpringAST) astFactory.make((AST)(Spring.Expressions.SpringAST) astFactory.create(EXPR,"lambda","Spring.Expressions.LambdaExpressionNode"), (AST)lambda_AST);
+				currentAST.root = lambda_AST;
+				if ( (null != lambda_AST) && (null != lambda_AST.getFirstChild()) )
+					currentAST.child = lambda_AST.getFirstChild();
+				else
+					currentAST.child = lambda_AST;
+				currentAST.advanceChildToEnd();
+			}
+			lambda_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = lambda_AST;
+	}
+	
+	public void attribute() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST attribute_AST = null;
+		Spring.Expressions.SpringAST tn_AST = null;
+		
+		try {      // for error handling
+			match(AT);
+			match(LBRACKET);
+			qualifiedId();
+			if (0 == inputState.guessing)
+			{
+				tn_AST = (Spring.Expressions.SpringAST)returnAST;
+			}
+			{
+				if ((LA(1)==LPAREN))
+				{
+					ctorArgs();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+				}
+				else if ((LA(1)==RBRACKET)) {
+				}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				
+			}
+			match(RBRACKET);
+			if (0==inputState.guessing)
+			{
+				attribute_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				attribute_AST = (Spring.Expressions.SpringAST) astFactory.make((AST)(Spring.Expressions.SpringAST) astFactory.create(EXPR,tn_AST.getText(),"Spring.Expressions.AttributeNode"), (AST)attribute_AST);
+				currentAST.root = attribute_AST;
+				if ( (null != attribute_AST) && (null != attribute_AST.getFirstChild()) )
+					currentAST.child = attribute_AST.getFirstChild();
+				else
+					currentAST.child = attribute_AST;
+				currentAST.advanceChildToEnd();
+			}
+			attribute_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = attribute_AST;
+	}
+	
+	public void function() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST function_AST = null;
+		
+		try {      // for error handling
+			match(POUND);
+			Spring.Expressions.FunctionNode tmp79_AST = null;
+			tmp79_AST = (Spring.Expressions.FunctionNode) astFactory.create(LT(1), "Spring.Expressions.FunctionNode");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp79_AST);
+			match(ID);
+			methodArgs();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			function_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = function_AST;
+	}
+	
+	public void var() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST var_AST = null;
+		
+		try {      // for error handling
+			match(POUND);
+			Spring.Expressions.VariableNode tmp81_AST = null;
+			tmp81_AST = (Spring.Expressions.VariableNode) astFactory.create(LT(1), "Spring.Expressions.VariableNode");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp81_AST);
+			match(ID);
+			var_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = var_AST;
+	}
+	
+	public void methodArgs() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST methodArgs_AST = null;
+		
+		try {      // for error handling
+			match(LPAREN);
+			{
+				if ((tokenSet_8_.member(LA(1))))
+				{
+					argument();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					{    // ( ... )*
+						for (;;)
+						{
+							if ((LA(1)==COMMA))
+							{
+								match(COMMA);
+								argument();
+								if (0 == inputState.guessing)
+								{
+									astFactory.addASTChild(ref currentAST, (AST)returnAST);
+								}
+							}
+							else
+							{
+								goto _loop57_breakloop;
+							}
+							
+						}
+_loop57_breakloop:						;
+					}    // ( ... )*
+				}
+				else if ((LA(1)==RPAREN)) {
+				}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				
+			}
+			match(RPAREN);
+			methodArgs_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = methodArgs_AST;
+	}
+	
+	public void localFunction() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST localFunction_AST = null;
+		
+		try {      // for error handling
+			match(DOLLAR);
+			Spring.Expressions.LocalFunctionNode tmp86_AST = null;
+			tmp86_AST = (Spring.Expressions.LocalFunctionNode) astFactory.create(LT(1), "Spring.Expressions.LocalFunctionNode");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp86_AST);
+			match(ID);
+			methodArgs();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			localFunction_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = localFunction_AST;
+	}
+	
+	public void localVar() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST localVar_AST = null;
+		
+		try {      // for error handling
+			match(DOLLAR);
+			Spring.Expressions.LocalVariableNode tmp88_AST = null;
+			tmp88_AST = (Spring.Expressions.LocalVariableNode) astFactory.create(LT(1), "Spring.Expressions.LocalVariableNode");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp88_AST);
+			match(ID);
+			localVar_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = localVar_AST;
+	}
+	
+	public void property() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST property_AST = null;
+		
+		try {      // for error handling
+			Spring.Expressions.PropertyOrFieldNode tmp89_AST = null;
+			tmp89_AST = (Spring.Expressions.PropertyOrFieldNode) astFactory.create(LT(1), "Spring.Expressions.PropertyOrFieldNode");
+			astFactory.addASTChild(ref currentAST, (AST)tmp89_AST);
+			match(ID);
+			property_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = property_AST;
+	}
+	
+	public void argument() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST argument_AST = null;
+		
+		try {      // for error handling
+			expression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			argument_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_14_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = argument_AST;
+	}
+	
+	public void contextName() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST contextName_AST = null;
+		
+		try {      // for error handling
+			Spring.Expressions.QualifiedIdentifier tmp90_AST = null;
+			tmp90_AST = (Spring.Expressions.QualifiedIdentifier) astFactory.create(LT(1), "Spring.Expressions.QualifiedIdentifier");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp90_AST);
+			match(ID);
+			{    // ( ... )*
+				for (;;)
+				{
+					if ((LA(1)==DIV))
+					{
+						Spring.Expressions.SpringAST tmp91_AST = null;
+						tmp91_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+						astFactory.addASTChild(ref currentAST, (AST)tmp91_AST);
+						match(DIV);
+						Spring.Expressions.SpringAST tmp92_AST = null;
+						tmp92_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+						astFactory.addASTChild(ref currentAST, (AST)tmp92_AST);
+						match(ID);
+					}
+					else
+					{
+						goto _loop110_breakloop;
+					}
+					
+				}
+_loop110_breakloop:				;
+			}    // ( ... )*
+			contextName_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_15_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = contextName_AST;
+	}
+	
+	public void qualifiedId() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST qualifiedId_AST = null;
+		
+		try {      // for error handling
+			Spring.Expressions.QualifiedIdentifier tmp93_AST = null;
+			tmp93_AST = (Spring.Expressions.QualifiedIdentifier) astFactory.create(LT(1), "Spring.Expressions.QualifiedIdentifier");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp93_AST);
+			match(ID);
+			{    // ( ... )*
+				for (;;)
+				{
+					if ((LA(1)==DOT))
+					{
+						Spring.Expressions.SpringAST tmp94_AST = null;
+						tmp94_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+						astFactory.addASTChild(ref currentAST, (AST)tmp94_AST);
+						match(DOT);
+						Spring.Expressions.SpringAST tmp95_AST = null;
+						tmp95_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+						astFactory.addASTChild(ref currentAST, (AST)tmp95_AST);
+						match(ID);
+					}
+					else
+					{
+						goto _loop107_breakloop;
+					}
+					
+				}
+_loop107_breakloop:				;
+			}    // ( ... )*
+			qualifiedId_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_16_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = qualifiedId_AST;
+	}
+	
+	public void ctorArgs() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST ctorArgs_AST = null;
+		
+		try {      // for error handling
+			match(LPAREN);
+			{
+				if ((tokenSet_8_.member(LA(1))))
+				{
+					namedArgument();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					{    // ( ... )*
+						for (;;)
+						{
+							if ((LA(1)==COMMA))
+							{
+								match(COMMA);
+								namedArgument();
+								if (0 == inputState.guessing)
+								{
+									astFactory.addASTChild(ref currentAST, (AST)returnAST);
+								}
+							}
+							else
+							{
+								goto _loop100_breakloop;
+							}
+							
+						}
+_loop100_breakloop:						;
+					}    // ( ... )*
+				}
+				else if ((LA(1)==RPAREN)) {
+				}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				
+			}
+			match(RPAREN);
+			ctorArgs_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = ctorArgs_AST;
+	}
+	
+	public void argList() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST argList_AST = null;
+		
+		try {      // for error handling
+			{
+				Spring.Expressions.SpringAST tmp99_AST = null;
+				tmp99_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+				astFactory.addASTChild(ref currentAST, (AST)tmp99_AST);
+				match(ID);
+				{    // ( ... )*
+					for (;;)
+					{
+						if ((LA(1)==COMMA))
+						{
+							match(COMMA);
+							Spring.Expressions.SpringAST tmp101_AST = null;
+							tmp101_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+							astFactory.addASTChild(ref currentAST, (AST)tmp101_AST);
+							match(ID);
+						}
+						else
+						{
+							goto _loop80_breakloop;
+						}
+						
+					}
+_loop80_breakloop:					;
+				}    // ( ... )*
+			}
+			if (0==inputState.guessing)
+			{
+				argList_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				argList_AST = (Spring.Expressions.SpringAST) astFactory.make((AST)(Spring.Expressions.SpringAST) astFactory.create(EXPR,"args"), (AST)argList_AST);
+				currentAST.root = argList_AST;
+				if ( (null != argList_AST) && (null != argList_AST.getFirstChild()) )
+					currentAST.child = argList_AST.getFirstChild();
+				else
+					currentAST.child = argList_AST;
+				currentAST.advanceChildToEnd();
+			}
+			argList_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_17_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = argList_AST;
+	}
+	
+	public void arrayConstructor() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST arrayConstructor_AST = null;
+		Spring.Expressions.SpringAST type_AST = null;
+		
+		try {      // for error handling
+			match(LITERAL_new);
+			qualifiedId();
+			if (0 == inputState.guessing)
+			{
+				type_AST = (Spring.Expressions.SpringAST)returnAST;
+			}
+			arrayRank();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			{
+				if ((LA(1)==LCURLY))
+				{
+					listInitializer();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+				}
+				else if ((tokenSet_2_.member(LA(1)))) {
+				}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				
+			}
+			if (0==inputState.guessing)
+			{
+				arrayConstructor_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				arrayConstructor_AST = (Spring.Expressions.SpringAST) astFactory.make((AST)(Spring.Expressions.SpringAST) astFactory.create(EXPR,type_AST.getText(),"Spring.Expressions.ArrayConstructorNode"), (AST)arrayConstructor_AST);
+				currentAST.root = arrayConstructor_AST;
+				if ( (null != arrayConstructor_AST) && (null != arrayConstructor_AST.getFirstChild()) )
+					currentAST.child = arrayConstructor_AST.getFirstChild();
+				else
+					currentAST.child = arrayConstructor_AST;
+				currentAST.advanceChildToEnd();
+			}
+			arrayConstructor_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = arrayConstructor_AST;
+	}
+	
+	public void arrayRank() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST arrayRank_AST = null;
+		
+		try {      // for error handling
+			Spring.Expressions.SpringAST tmp103_AST = null;
+			tmp103_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp103_AST);
+			match(LBRACKET);
+			{
+				if ((tokenSet_8_.member(LA(1))))
+				{
+					expression();
+					if (0 == inputState.guessing)
+					{
+						astFactory.addASTChild(ref currentAST, (AST)returnAST);
+					}
+					{    // ( ... )*
+						for (;;)
+						{
+							if ((LA(1)==COMMA))
+							{
+								match(COMMA);
+								expression();
+								if (0 == inputState.guessing)
+								{
+									astFactory.addASTChild(ref currentAST, (AST)returnAST);
+								}
+							}
+							else
+							{
+								goto _loop89_breakloop;
+							}
+							
+						}
+_loop89_breakloop:						;
+					}    // ( ... )*
+				}
+				else if ((LA(1)==RBRACKET)) {
+				}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				
+			}
+			match(RBRACKET);
+			arrayRank_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_18_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = arrayRank_AST;
+	}
+	
+	public void mapEntry() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST mapEntry_AST = null;
+		
+		try {      // for error handling
+			expression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			match(COLON);
+			expression();
+			if (0 == inputState.guessing)
+			{
+				astFactory.addASTChild(ref currentAST, (AST)returnAST);
+			}
+			if (0==inputState.guessing)
+			{
+				mapEntry_AST = (Spring.Expressions.SpringAST)currentAST.root;
+				mapEntry_AST = (Spring.Expressions.SpringAST) astFactory.make((AST)(Spring.Expressions.SpringAST) astFactory.create(EXPR,"entry","Spring.Expressions.MapEntryNode"), (AST)mapEntry_AST);
+				currentAST.root = mapEntry_AST;
+				if ( (null != mapEntry_AST) && (null != mapEntry_AST.getFirstChild()) )
+					currentAST.child = mapEntry_AST.getFirstChild();
+				else
+					currentAST.child = mapEntry_AST;
+				currentAST.advanceChildToEnd();
+			}
+			mapEntry_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_19_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = mapEntry_AST;
+	}
+	
+	public void namedArgument() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST namedArgument_AST = null;
+		
+		try {      // for error handling
+			bool synPredMatched104 = false;
+			if (((LA(1)==ID) && (LA(2)==ASSIGN)))
+			{
+				int _m104 = mark();
+				synPredMatched104 = true;
+				inputState.guessing++;
+				try {
+					{
+						match(ID);
+						match(ASSIGN);
+					}
+				}
+				catch (RecognitionException)
+				{
+					synPredMatched104 = false;
+				}
+				rewind(_m104);
+				inputState.guessing--;
+			}
+			if ( synPredMatched104 )
+			{
+				Spring.Expressions.NamedArgumentNode tmp107_AST = null;
+				tmp107_AST = (Spring.Expressions.NamedArgumentNode) astFactory.create(LT(1), "Spring.Expressions.NamedArgumentNode");
+				astFactory.makeASTRoot(ref currentAST, (AST)tmp107_AST);
+				match(ID);
+				match(ASSIGN);
+				expression();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				namedArgument_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else if ((tokenSet_8_.member(LA(1))) && (tokenSet_20_.member(LA(2)))) {
+				argument();
+				if (0 == inputState.guessing)
+				{
+					astFactory.addASTChild(ref currentAST, (AST)returnAST);
+				}
+				namedArgument_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else
+			{
+				throw new NoViableAltException(LT(1), getFilename());
+			}
+			
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_21_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = namedArgument_AST;
+	}
+	
+	public void boolLiteral() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST boolLiteral_AST = null;
+		
+		try {      // for error handling
+			if ((LA(1)==TRUE))
+			{
+				Spring.Expressions.BooleanLiteralNode tmp109_AST = null;
+				tmp109_AST = (Spring.Expressions.BooleanLiteralNode) astFactory.create(LT(1), "Spring.Expressions.BooleanLiteralNode");
+				astFactory.addASTChild(ref currentAST, (AST)tmp109_AST);
+				match(TRUE);
+				boolLiteral_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else if ((LA(1)==FALSE)) {
+				Spring.Expressions.BooleanLiteralNode tmp110_AST = null;
+				tmp110_AST = (Spring.Expressions.BooleanLiteralNode) astFactory.create(LT(1), "Spring.Expressions.BooleanLiteralNode");
+				astFactory.addASTChild(ref currentAST, (AST)tmp110_AST);
+				match(FALSE);
+				boolLiteral_AST = (Spring.Expressions.SpringAST)currentAST.root;
+			}
+			else
+			{
+				throw new NoViableAltException(LT(1), getFilename());
+			}
+			
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = boolLiteral_AST;
+	}
+	
+	public void dateLiteral() //throws RecognitionException, TokenStreamException
+{
+		
+		returnAST = null;
+		ASTPair currentAST = new ASTPair();
+		Spring.Expressions.SpringAST dateLiteral_AST = null;
+		
+		try {      // for error handling
+			Spring.Expressions.DateLiteralNode tmp111_AST = null;
+			tmp111_AST = (Spring.Expressions.DateLiteralNode) astFactory.create(LT(1), "Spring.Expressions.DateLiteralNode");
+			astFactory.makeASTRoot(ref currentAST, (AST)tmp111_AST);
+			match(LITERAL_date);
+			match(LPAREN);
+			Spring.Expressions.SpringAST tmp113_AST = null;
+			tmp113_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+			astFactory.addASTChild(ref currentAST, (AST)tmp113_AST);
+			match(STRING_LITERAL);
+			{
+				if ((LA(1)==COMMA))
+				{
+					match(COMMA);
+					Spring.Expressions.SpringAST tmp115_AST = null;
+					tmp115_AST = (Spring.Expressions.SpringAST) astFactory.create(LT(1));
+					astFactory.addASTChild(ref currentAST, (AST)tmp115_AST);
+					match(STRING_LITERAL);
+				}
+				else if ((LA(1)==RPAREN)) {
+				}
+				else
+				{
+					throw new NoViableAltException(LT(1), getFilename());
+				}
+				
+			}
+			match(RPAREN);
+			dateLiteral_AST = (Spring.Expressions.SpringAST)currentAST.root;
+		}
+		catch (RecognitionException ex)
+		{
+			if (0 == inputState.guessing)
+			{
+				reportError(ex);
+				recover(ex,tokenSet_2_);
+			}
+			else
+			{
+				throw ex;
+			}
+		}
+		returnAST = dateLiteral_AST;
+	}
+	
+	public new Spring.Expressions.SpringAST getAST()
+	{
+		return (Spring.Expressions.SpringAST) returnAST;
+	}
+	
+	private void initializeFactory()
+	{
+		if (astFactory == null)
+		{
+			astFactory = new ASTFactory("Spring.Expressions.SpringAST");
+		}
+		initializeASTFactory( astFactory );
+	}
+	static public void initializeASTFactory( ASTFactory factory )
+	{
+		factory.setMaxNodeType(68);
+	}
+	
+	public static readonly string[] tokenNames_ = new string[] {
+		@"""<0>""",
+		@"""EOF""",
+		@"""<2>""",
+		@"""NULL_TREE_LOOKAHEAD""",
+		@"""EXPR""",
+		@"""OPERAND""",
+		@"""false""",
+		@"""true""",
+		@"""and""",
+		@"""or""",
+		@"""in""",
+		@"""is""",
+		@"""between""",
+		@"""like""",
+		@"""matches""",
+		@"""null""",
+		@"""LPAREN""",
+		@"""SEMI""",
+		@"""RPAREN""",
+		@"""ASSIGN""",
+		@"""DEFAULT""",
+		@"""QMARK""",
+		@"""COLON""",
+		@"""PLUS""",
+		@"""MINUS""",
+		@"""STAR""",
+		@"""DIV""",
+		@"""MOD""",
+		@"""POWER""",
+		@"""BANG""",
+		@"""DOT""",
+		@"""POUND""",
+		@"""ID""",
+		@"""DOLLAR""",
+		@"""COMMA""",
+		@"""AT""",
+		@"""LBRACKET""",
+		@"""RBRACKET""",
+		@"""PROJECT""",
+		@"""RCURLY""",
+		@"""SELECT""",
+		@"""SELECT_FIRST""",
+		@"""SELECT_LAST""",
+		@"""TYPE""",
+		@"""LAMBDA""",
+		@"""PIPE""",
+		@"""new""",
+		@"""LCURLY""",
+		@"""INTEGER_LITERAL""",
+		@"""HEXADECIMAL_INTEGER_LITERAL""",
+		@"""REAL_LITERAL""",
+		@"""STRING_LITERAL""",
+		@"""date""",
+		@"""EQUAL""",
+		@"""NOT_EQUAL""",
+		@"""LESS_THAN""",
+		@"""LESS_THAN_OR_EQUAL""",
+		@"""GREATER_THAN""",
+		@"""GREATER_THAN_OR_EQUAL""",
+		@"""WS""",
+		@"""DOT_ESCAPED""",
+		@"""APOS""",
+		@"""NUMERIC_LITERAL""",
+		@"""DECIMAL_DIGIT""",
+		@"""INTEGER_TYPE_SUFFIX""",
+		@"""HEX_DIGIT""",
+		@"""EXPONENT_PART""",
+		@"""SIGN""",
+		@"""REAL_TYPE_SUFFIX"""
+	};
+	
+	private static long[] mk_tokenSet_0_()
+	{
+		long[] data = { 2L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_0_ = new BitSet(mk_tokenSet_0_());
+	private static long[] mk_tokenSet_1_()
+	{
+		long[] data = { 704379224066L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_1_ = new BitSet(mk_tokenSet_1_());
+	private static long[] mk_tokenSet_2_()
+	{
+		long[] data = { 567462303507644162L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_2_ = new BitSet(mk_tokenSet_2_());
+	private static long[] mk_tokenSet_3_()
+	{
+		long[] data = { 704382894082L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_3_ = new BitSet(mk_tokenSet_3_());
+	private static long[] mk_tokenSet_4_()
+	{
+		long[] data = { 704382894594L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_4_ = new BitSet(mk_tokenSet_4_());
+	private static long[] mk_tokenSet_5_()
+	{
+		long[] data = { 567453553048714240L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_5_ = new BitSet(mk_tokenSet_5_());
+	private static long[] mk_tokenSet_6_()
+	{
+		long[] data = { 704382894850L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_6_ = new BitSet(mk_tokenSet_6_());
+	private static long[] mk_tokenSet_7_()
+	{
+		long[] data = { 567454257431609090L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_7_ = new BitSet(mk_tokenSet_7_());
+	private static long[] mk_tokenSet_8_()
+	{
+		long[] data = { 8971308922667200L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_8_ = new BitSet(mk_tokenSet_8_());
+	private static long[] mk_tokenSet_9_()
+	{
+		long[] data = { 567454257456774914L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_9_ = new BitSet(mk_tokenSet_9_());
+	private static long[] mk_tokenSet_10_()
+	{
+		long[] data = { 567454257691655938L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_10_ = new BitSet(mk_tokenSet_10_());
+	private static long[] mk_tokenSet_11_()
+	{
+		long[] data = { 8971308360630464L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_11_ = new BitSet(mk_tokenSet_11_());
+	private static long[] mk_tokenSet_12_()
+	{
+		long[] data = { 567454257960091394L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_12_ = new BitSet(mk_tokenSet_12_());
+	private static long[] mk_tokenSet_13_()
+	{
+		long[] data = { 8045547552768L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_13_ = new BitSet(mk_tokenSet_13_());
+	private static long[] mk_tokenSet_14_()
+	{
+		long[] data = { 154619084800L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_14_ = new BitSet(mk_tokenSet_14_());
+	private static long[] mk_tokenSet_15_()
+	{
+		long[] data = { 4194304L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_15_ = new BitSet(mk_tokenSet_15_());
+	private static long[] mk_tokenSet_16_()
+	{
+		long[] data = { 223338627072L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_16_ = new BitSet(mk_tokenSet_16_());
+	private static long[] mk_tokenSet_17_()
+	{
+		long[] data = { 35184372088832L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_17_ = new BitSet(mk_tokenSet_17_());
+	private static long[] mk_tokenSet_18_()
+	{
+		long[] data = { 567603040995999490L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_18_ = new BitSet(mk_tokenSet_18_());
+	private static long[] mk_tokenSet_19_()
+	{
+		long[] data = { 566935683072L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_19_ = new BitSet(mk_tokenSet_19_());
+	private static long[] mk_tokenSet_20_()
+	{
+		long[] data = { 576460065104330688L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_20_ = new BitSet(mk_tokenSet_20_());
+	private static long[] mk_tokenSet_21_()
+	{
+		long[] data = { 17180131328L, 0L};
+		return data;
+	}
+	public static readonly BitSet tokenSet_21_ = new BitSet(mk_tokenSet_21_());
+	
+}
+}
diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs
new file mode 100644
index 00000000..1f47e89a
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs
@@ -0,0 +1,76 @@
+// $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionLexer.cs"$
+
+namespace Spring.Expressions
+{
+	public class ExpressionParserTokenTypes
+	{
+		public const int EOF = 1;
+		public const int NULL_TREE_LOOKAHEAD = 3;
+		public const int EXPR = 4;
+		public const int OPERAND = 5;
+		public const int FALSE = 6;
+		public const int TRUE = 7;
+		public const int AND = 8;
+		public const int OR = 9;
+		public const int IN = 10;
+		public const int IS = 11;
+		public const int BETWEEN = 12;
+		public const int LIKE = 13;
+		public const int MATCHES = 14;
+		public const int NULL_LITERAL = 15;
+		public const int LPAREN = 16;
+		public const int SEMI = 17;
+		public const int RPAREN = 18;
+		public const int ASSIGN = 19;
+		public const int DEFAULT = 20;
+		public const int QMARK = 21;
+		public const int COLON = 22;
+		public const int PLUS = 23;
+		public const int MINUS = 24;
+		public const int STAR = 25;
+		public const int DIV = 26;
+		public const int MOD = 27;
+		public const int POWER = 28;
+		public const int BANG = 29;
+		public const int DOT = 30;
+		public const int POUND = 31;
+		public const int ID = 32;
+		public const int DOLLAR = 33;
+		public const int COMMA = 34;
+		public const int AT = 35;
+		public const int LBRACKET = 36;
+		public const int RBRACKET = 37;
+		public const int PROJECT = 38;
+		public const int RCURLY = 39;
+		public const int SELECT = 40;
+		public const int SELECT_FIRST = 41;
+		public const int SELECT_LAST = 42;
+		public const int TYPE = 43;
+		public const int LAMBDA = 44;
+		public const int PIPE = 45;
+		public const int LITERAL_new = 46;
+		public const int LCURLY = 47;
+		public const int INTEGER_LITERAL = 48;
+		public const int HEXADECIMAL_INTEGER_LITERAL = 49;
+		public const int REAL_LITERAL = 50;
+		public const int STRING_LITERAL = 51;
+		public const int LITERAL_date = 52;
+		public const int EQUAL = 53;
+		public const int NOT_EQUAL = 54;
+		public const int LESS_THAN = 55;
+		public const int LESS_THAN_OR_EQUAL = 56;
+		public const int GREATER_THAN = 57;
+		public const int GREATER_THAN_OR_EQUAL = 58;
+		public const int WS = 59;
+		public const int DOT_ESCAPED = 60;
+		public const int APOS = 61;
+		public const int NUMERIC_LITERAL = 62;
+		public const int DECIMAL_DIGIT = 63;
+		public const int INTEGER_TYPE_SUFFIX = 64;
+		public const int HEX_DIGIT = 65;
+		public const int EXPONENT_PART = 66;
+		public const int SIGN = 67;
+		public const int REAL_TYPE_SUFFIX = 68;
+		
+	}
+}
diff --git a/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.txt b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.txt
new file mode 100644
index 00000000..5e36c13e
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.txt
@@ -0,0 +1,67 @@
+// $ANTLR 2.7.6 (2005-12-22): Expression.g -> ExpressionParserTokenTypes.txt$
+ExpressionParser    // output token vocab name
+EXPR=4
+OPERAND=5
+FALSE="false"=6
+TRUE="true"=7
+AND="and"=8
+OR="or"=9
+IN="in"=10
+IS="is"=11
+BETWEEN="between"=12
+LIKE="like"=13
+MATCHES="matches"=14
+NULL_LITERAL="null"=15
+LPAREN=16
+SEMI=17
+RPAREN=18
+ASSIGN=19
+DEFAULT=20
+QMARK=21
+COLON=22
+PLUS=23
+MINUS=24
+STAR=25
+DIV=26
+MOD=27
+POWER=28
+BANG=29
+DOT=30
+POUND=31
+ID=32
+DOLLAR=33
+COMMA=34
+AT=35
+LBRACKET=36
+RBRACKET=37
+PROJECT=38
+RCURLY=39
+SELECT=40
+SELECT_FIRST=41
+SELECT_LAST=42
+TYPE=43
+LAMBDA=44
+PIPE=45
+LITERAL_new="new"=46
+LCURLY=47
+INTEGER_LITERAL=48
+HEXADECIMAL_INTEGER_LITERAL=49
+REAL_LITERAL=50
+STRING_LITERAL=51
+LITERAL_date="date"=52
+EQUAL=53
+NOT_EQUAL=54
+LESS_THAN=55
+LESS_THAN_OR_EQUAL=56
+GREATER_THAN=57
+GREATER_THAN_OR_EQUAL=58
+WS=59
+DOT_ESCAPED=60
+APOS=61
+NUMERIC_LITERAL=62
+DECIMAL_DIGIT=63
+INTEGER_TYPE_SUFFIX=64
+HEX_DIGIT=65
+EXPONENT_PART=66
+SIGN=67
+REAL_TYPE_SUFFIX=68
diff --git a/src/Spring/Spring.Core/Expressions/Processors/AverageAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/AverageAggregator.cs
new file mode 100644
index 00000000..36083ab1
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Processors/AverageAggregator.cs
@@ -0,0 +1,69 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using Spring.Util;
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// Implementation of the average aggregator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AverageAggregator.cs,v 1.2 2006/12/04 08:58:33 aseovic Exp $</version>
+    public class AverageAggregator : ICollectionProcessor
+    {
+        /// <summary>
+        /// Returns the average of the numeric values in the source collection.
+        /// </summary>
+        /// <param name="source">
+        /// The source collection to process.
+        /// </param>
+        /// <param name="args">
+        /// Ignored.
+        /// </param>
+        /// <returns>
+        /// The average of the numeric values in the source collection.
+        /// </returns>
+        public object Process(ICollection source, object[] args)
+        {
+            int n = 0;
+            object total = 0d;
+            foreach (object item in source)
+            {
+                if (item != null)
+                {
+                    if (NumberUtils.IsNumber(item))
+                    {
+                        total = NumberUtils.Add(total, item);
+                        n++;
+                    }
+                    else
+                    {
+                        throw new ArgumentException("Average can only be calculated for a collection of numeric values.");
+                    }
+                }
+            }
+            
+            return NumberUtils.Divide(total, n);
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Expressions/Processors/ConversionProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/ConversionProcessor.cs
new file mode 100644
index 00000000..a6fd412d
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Processors/ConversionProcessor.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Core.TypeConversion;
+
+#endregion
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// Converts all elements in the input list to a given target type.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ConversionProcessor.cs,v 1.1 2008/03/20 23:58:16 oakinger Exp $</version>
+    public class ConversionProcessor : ICollectionProcessor
+    {
+        /// <summary>
+        /// Processes a list of source items and returns a result.
+        /// </summary>
+        /// <param name="source">
+        /// The source list to process.
+        /// </param>
+        /// <param name="args">
+        /// An optional processor arguments array.
+        /// </param>
+        /// <returns>
+        /// The processing result.
+        /// </returns>
+        public object Process(ICollection source, object[] args)
+        {
+            if (source == null
+                || source.Count == 0)
+            {
+                return source;
+            }
+
+            Type targetType = typeof(double);
+            if (args == null || args.Length == 0)
+            {
+                throw new ArgumentNullException("convert() processor requires a Type value argument.");
+            }
+            else if (args.Length == 1)
+            {
+                if (args[0] is Type)
+                {
+                    targetType = (Type)args[0];
+                }
+                else
+                {
+                    throw new ArgumentException("convert() processor argument must be a Type value.");
+                }
+            }
+            else if (args.Length > 1)
+            {
+                throw new ArgumentException("Only a single argument can be specified for a convert() processor.");
+            }        
+    
+            ArrayList result = new ArrayList();
+            foreach(object val in source)
+            {
+                object newVal = TypeConversionUtils.ConvertValueIfNecessary(targetType, val, null);
+                result.Add(newVal);                
+            }
+
+            return result.ToArray(targetType);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/Processors/CountAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/CountAggregator.cs
new file mode 100644
index 00000000..fe0beb81
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Processors/CountAggregator.cs
@@ -0,0 +1,54 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// Implementation of the count aggregator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CountAggregator.cs,v 1.2 2006/12/04 08:58:33 aseovic Exp $</version>
+    public class CountAggregator : ICollectionProcessor
+    {
+        /// <summary>
+        /// Returns the number of items in the source collection.
+        /// </summary>
+        /// <param name="source">
+        /// The source collection to process.
+        /// </param>
+        /// <param name="args">
+        /// Ignored.
+        /// </param>
+        /// <returns>
+        /// The number of items in the source collection, 
+        /// or zero if the collection is empty or <c>null</c>.
+        /// </returns>
+        public object Process(ICollection source, object[] args)
+        {
+            if (source == null)
+            {
+                return 0;
+            }
+            return source.Count;
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Expressions/Processors/DistinctProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/DistinctProcessor.cs
new file mode 100644
index 00000000..01107a6d
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Processors/DistinctProcessor.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using Spring.Collections;
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// Implementation of the distinct processor.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DistinctProcessor.cs,v 1.1 2006/12/04 08:58:33 aseovic Exp $</version>
+    public class DistinctProcessor : ICollectionProcessor
+    {
+        /// <summary>
+        /// Returns distinct items from the collection.
+        /// </summary>
+        /// <param name="source">
+        /// The source collection to process.
+        /// </param>
+        /// <param name="args">
+        /// 0: boolean flag specifying whether to include <c>null</c>
+        /// in the results or not. Default is false, which means that
+        /// <c>null</c> values will not be included in the results.
+        /// </param>
+        /// <returns>
+        /// A collection containing distinct source collection elements.
+        /// </returns>
+        /// <exception cref="ArgumentException">
+        /// If there is more than one argument, or if the single optional argument 
+        /// is not <b>Boolean</b>.
+        /// </exception>
+        public object Process(ICollection source, object[] args)
+        {
+            if (source == null)
+            {
+                return null;
+            }
+            
+            bool includeNulls = false;
+            if (args.Length == 1)
+            {
+                if (args[0] is bool)
+                {
+                    includeNulls = (bool) args[0];
+                }
+                else
+                {
+                    throw new ArgumentException("distinct() processor argument must be a boolean value.");
+                }
+            }
+            else if (args.Length > 1)
+            {
+                throw new ArgumentException("Only a single argument can be specified for a distinct() processor.");
+            }
+
+            HybridSet set = new HybridSet(source);
+            if (!includeNulls)
+            {
+                set.Remove(null);
+            }
+            return set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/Processors/ICollectionProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/ICollectionProcessor.cs
new file mode 100644
index 00000000..b7a2563d
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Processors/ICollectionProcessor.cs
@@ -0,0 +1,45 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// Defines an interface that should be implemented
+    /// by all collection processors and aggregators.
+    /// </summary>
+    public interface ICollectionProcessor
+    {
+        /// <summary>
+        /// Processes a list of source items and returns a result.
+        /// </summary>
+        /// <param name="source">
+        /// The source list to process.
+        /// </param>
+        /// <param name="args">
+        /// An optional processor arguments array.
+        /// </param>
+        /// <returns>
+        /// The processing result.
+        /// </returns>
+        object Process(ICollection source, object[] args);
+    }
+}
diff --git a/src/Spring/Spring.Core/Expressions/Processors/MaxAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/MaxAggregator.cs
new file mode 100644
index 00000000..4040e12a
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Processors/MaxAggregator.cs
@@ -0,0 +1,58 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using Spring.Util;
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// Implementation of the maximum aggregator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: MaxAggregator.cs,v 1.2 2006/12/04 08:58:33 aseovic Exp $</version>
+    public class MaxAggregator : ICollectionProcessor
+    {
+        /// <summary>
+        /// Returns the largest item in the source collection.
+        /// </summary>
+        /// <param name="source">
+        /// The source collection to process.
+        /// </param>
+        /// <param name="args">
+        /// Ignored.
+        /// </param>
+        /// <returns>
+        /// The largest item in the source collection.
+        /// </returns>
+        public object Process(ICollection source, object[] args)
+        {
+            object maxItem = null;
+            foreach (object item in source)
+            {
+                if (CompareUtils.Compare(maxItem, item) < 0)
+                {
+                    maxItem = item;
+                }
+            }
+            return maxItem;
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Expressions/Processors/MinAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/MinAggregator.cs
new file mode 100644
index 00000000..e606c568
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Processors/MinAggregator.cs
@@ -0,0 +1,58 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using Spring.Util;
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// Implementation of the minimum aggregator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: MinAggregator.cs,v 1.2 2006/12/04 08:58:33 aseovic Exp $</version>
+    public class MinAggregator : ICollectionProcessor
+    {
+        /// <summary>
+        /// Returns the smallest item in the source collection.
+        /// </summary>
+        /// <param name="source">
+        /// The source collection to process.
+        /// </param>
+        /// <param name="args">
+        /// Ignored.
+        /// </param>
+        /// <returns>
+        /// The smallest item in the source collection.
+        /// </returns>
+        public object Process(ICollection source, object[] args)
+        {
+            object minItem = null;
+            foreach (object item in source)
+            {
+                if ((minItem == null && item != null) || (CompareUtils.Compare(minItem, item) > 0))
+                {
+                    minItem = item;
+                }
+            }
+            return minItem;
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Expressions/Processors/NonNullProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/NonNullProcessor.cs
new file mode 100644
index 00000000..7fd37c8b
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Processors/NonNullProcessor.cs
@@ -0,0 +1,62 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// Implementation of the non-null processor.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: NonNullProcessor.cs,v 1.2 2007/07/31 21:43:52 markpollack Exp $</version>
+    public class NonNullProcessor : ICollectionProcessor
+    {
+        /// <summary>
+        /// Returns non-null items from the collection.
+        /// </summary>
+        /// <param name="source">
+        /// The source collection to process.
+        /// </param>
+        /// <param name="args">
+        /// Ignored.
+        /// </param>
+        /// <returns>
+        /// A collection containing non-null source collection elements.
+        /// </returns>
+        public object Process(ICollection source, object[] args)
+        {
+            if (source == null)
+            {
+                return null;
+            }
+
+            ArrayList list = new ArrayList();
+            foreach (object item in source)
+            {
+                if (item != null)
+                {
+                    list.Add(item);
+                }
+            }
+            return list.ToArray();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/Processors/OrderByProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/OrderByProcessor.cs
new file mode 100644
index 00000000..57bce703
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Processors/OrderByProcessor.cs
@@ -0,0 +1,166 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using Spring.Util;
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// Implementation of the 'order by' processor.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: OrderByProcessor.cs,v 1.2 2008/03/20 23:58:16 oakinger Exp $</version>
+    public class OrderByProcessor : ICollectionProcessor
+    {
+        #region Comparer Helper Implementations
+
+        private class SimpleExpressionComparer : IComparer
+        {
+            private readonly IExpression _expression;
+
+            public SimpleExpressionComparer(IExpression expression)
+            {
+                _expression = expression;
+            }
+
+            public int Compare(object x, object y)
+            {
+                x = _expression.GetValue(x);
+                y = _expression.GetValue(y);
+
+                if (x==y) return 0;
+
+                if (x != null) return ((IComparable) x).CompareTo(y);
+                
+                return ((IComparable)y).CompareTo(x)*-1;
+            }
+        }
+
+        private class LambdaComparer : IComparer
+        {
+            private readonly Hashtable _variables;
+            private readonly IExpression _fn;
+
+            public LambdaComparer(LambdaExpressionNode lambdaExpression)
+            {
+                FunctionNode functionNode = new FunctionNode();
+                functionNode.Text = "compare";
+                VariableNode x = new VariableNode();
+                x.Text = "x";
+                VariableNode y = new VariableNode();
+                y.Text = "y";
+
+                functionNode.addChild(x);
+                functionNode.addChild(y);
+
+                _fn = functionNode;
+                _variables = new Hashtable();
+                _variables.Add( "compare", lambdaExpression );
+            }
+
+            public int Compare(object x, object y)
+            {
+                _variables["x"] = x;
+                _variables["y"] = y;
+                return (int) _fn.GetValue(null, _variables);
+            }
+        }
+
+        private class DelegateComparer : IComparer
+        {
+            private readonly Delegate _fnCompare;
+
+            public DelegateComparer(Delegate fnCompare)
+            {
+                _fnCompare = fnCompare;
+            }
+
+            public int Compare(object x, object y)
+            {
+                return (int)_fnCompare.DynamicInvoke(new object[] { x, y });
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Sorts the source collection using custom sort criteria.
+        /// </summary>
+        /// <remarks>
+        /// Please not that your compare function needs to take care about
+        /// proper conversion of types to be comparable!
+        /// </remarks>
+        /// <param name="source">
+        /// The source collection to sort.
+        /// </param>
+        /// <param name="args">
+        /// Sort criteria to use.
+        /// </param>
+        /// <returns>
+        /// A sorted array containing collection elements.
+        /// </returns>
+        public object Process(ICollection source, object[] args)
+        {
+            if (source == null || source.Count == 0)
+            {
+                return source;
+            }
+
+            if (args == null || args.Length != 1)
+            {
+                throw new ArgumentException("compare expression is a required argument for orderBy");
+            }
+
+            object arg = args[0];
+            IComparer comparer = null;
+            if (arg is string)
+            {
+                IExpression expCompare = Expression.Parse((string) arg);
+                comparer = new SimpleExpressionComparer(expCompare);
+            }
+            else if (arg is IComparer)
+            {
+                comparer = (IComparer) arg;
+            }
+            else if (arg is LambdaExpressionNode)
+            {
+                LambdaExpressionNode fnCompare = (LambdaExpressionNode)arg;
+                if (fnCompare.ArgumentNames.Length != 2)
+                {
+                    throw new ArgumentException("compare function must accept 2 arguments");
+                }
+                comparer = new LambdaComparer(fnCompare);                
+            }
+            else if (arg is Delegate)
+            {
+                comparer = new DelegateComparer((Delegate) arg);                
+            }
+
+            AssertUtils.ArgumentNotNull(comparer, "comparer", "orderBy(comparer) argument 'comparer' does not evaluate to a supported type");
+
+            ArrayList list = new ArrayList(source);
+            list.Sort(comparer);
+            return list;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/Processors/ReverseProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/ReverseProcessor.cs
new file mode 100644
index 00000000..40919670
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Processors/ReverseProcessor.cs
@@ -0,0 +1,62 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// Reverts order of elements in the list
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ReverseProcessor.cs,v 1.1 2008/03/20 23:58:16 oakinger Exp $</version>
+    public class ReverseProcessor : ICollectionProcessor
+    {
+        /// <summary>
+        /// Processes a list of source items and returns a result.
+        /// </summary>
+        /// <param name="source">
+        /// The source list to process.
+        /// </param>
+        /// <param name="args">
+        /// An optional processor arguments array.
+        /// </param>
+        /// <returns>
+        /// The processing result.
+        /// </returns>
+        public object Process(ICollection source, object[] args)
+        {
+            if (source == null || source.Count == 0)
+            {
+                return source;
+            }
+
+            ArrayList list = new ArrayList(source);
+            list.Reverse();
+
+            return list;            
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/Processors/SortProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/SortProcessor.cs
new file mode 100644
index 00000000..857db6f3
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Processors/SortProcessor.cs
@@ -0,0 +1,96 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Collections;
+
+#endregion
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// Implementation of the sort processor.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SortProcessor.cs,v 1.4 2008/03/20 23:58:16 oakinger Exp $</version>
+    public class SortProcessor : ICollectionProcessor
+    {
+        /// <summary>
+        /// Sorts the source collection.
+        /// </summary>
+        /// <remarks>
+        /// Please not that this processor requires that collection elements
+        /// are of a uniform type and that they implement <see cref="IComparable"/>
+        /// interface.
+        /// <p/>
+        /// If you want to perform custom sorting based on element properties
+        /// you should consider using <see cref="OrderByProcessor"/> instead.
+        /// </remarks>
+        /// <param name="source">
+        /// The source collection to sort.
+        /// </param>
+        /// <param name="args">
+        /// Ignored.
+        /// </param>
+        /// <returns>
+        /// An array containing sorted collection elements.
+        /// </returns>
+        /// <exception cref="ArgumentException">
+        /// If <paramref name="source"/> collection is not empty and it is 
+        /// neither <see cref="IList"/> nor <see cref="ISet"/>.
+        /// </exception>
+        public object Process(ICollection source, object[] args)
+        {
+            if (source == null || source.Count == 0)
+            {
+                return source;
+            }
+
+            bool sortAscending = true;
+            if (args != null && args.Length == 1 && args[0] is bool)
+            {
+                sortAscending = (bool) args[0];
+            }
+
+            ArrayList list = new ArrayList(source);
+            list.Sort();
+            if (!sortAscending)
+            {
+                list.Reverse();
+            }
+
+            Type elementType = DetermineElementType(list);
+            return list.ToArray(elementType);
+        }
+
+        private Type DetermineElementType(IList list)
+        {
+            for(int i=0;i<list.Count;i++)
+            {
+                object element = list[i];
+                if (element != null) return element.GetType();
+            }
+            return typeof (object);
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Expressions/Processors/SumAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/SumAggregator.cs
new file mode 100644
index 00000000..482a6bfa
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/Processors/SumAggregator.cs
@@ -0,0 +1,67 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using Spring.Util;
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// Implementation of the sum aggregator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SumAggregator.cs,v 1.2 2006/12/04 08:58:33 aseovic Exp $</version>
+    public class SumAggregator : ICollectionProcessor
+    {
+        /// <summary>
+        /// Returns the sum of the numeric values in the source collection.
+        /// </summary>
+        /// <param name="source">
+        /// The source collection to process.
+        /// </param>
+        /// <param name="args">
+        /// Ignored.
+        /// </param>
+        /// <returns>
+        /// The sum of the numeric values in the source collection.
+        /// </returns>
+        public object Process(ICollection source, object[] args)
+        {
+            object total = 0d;
+            foreach (object item in source)
+            {
+                if (item != null)
+                {
+                    if (NumberUtils.IsNumber(item))
+                    {
+                        total = NumberUtils.Add(total, item);
+                    }
+                    else
+                    {
+                        throw new ArgumentException("Sum can only be calculated for a collection of numeric values.");
+                    }
+                }
+            }
+            
+            return total;
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Expressions/ProjectionNode.cs b/src/Spring/Spring.Core/Expressions/ProjectionNode.cs
new file mode 100644
index 00000000..ec153876
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/ProjectionNode.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed projection node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ProjectionNode.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class ProjectionNode : BaseNode
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public ProjectionNode():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected ProjectionNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a <see cref="IList"/> containing results of evaluation
+        /// of projection expression against each node in the context.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            IEnumerable enumerable = context as IEnumerable;
+            if(enumerable == null)
+            {
+                throw new ArgumentException(
+                    "Projection can only be used on an instance of the type that implements IEnumerable.");
+            }
+
+            BaseNode expression = (BaseNode) this.getFirstChild();
+            IList projectedList = new ArrayList();
+            using (evalContext.SwitchThisContext())
+            {
+                foreach(object o in enumerable)
+                {
+                    evalContext.ThisContext = o;
+                    projectedList.Add(expression.GetValueInternal(o, evalContext));
+                }
+            }
+            return projectedList;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/PropertyOrFieldNode.cs b/src/Spring/Spring.Core/Expressions/PropertyOrFieldNode.cs
new file mode 100644
index 00000000..b2c8bb08
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/PropertyOrFieldNode.cs
@@ -0,0 +1,725 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Runtime.Remoting;
+using System.Runtime.Serialization;
+
+using Spring.Collections;
+using Spring.Core;
+using Spring.Core.TypeConversion;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+using Spring.Reflection.Dynamic;
+
+#endregion
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents node that navigates to object's property or public field.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: PropertyOrFieldNode.cs,v 1.28 2007/09/14 13:48:53 oakinger Exp $</version>
+    [Serializable]
+    public class PropertyOrFieldNode : BaseNode
+    {
+        //private static readonly Common.Logging.ILog Log = Common.Logging.LogManager.GetLogger(typeof(PropertyOrFieldNode));
+
+        private const BindingFlags BINDING_FLAGS =
+            BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static |
+            BindingFlags.IgnoreCase;
+
+        private string memberName;
+        private IValueAccessor accessor;
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public PropertyOrFieldNode()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected PropertyOrFieldNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Initializes the node.
+        /// </summary>
+        /// <param name="context">The parent.</param>
+        private void InitializeNode(object context)
+        {
+            Type contextType = (context == null || context is Type ? context as Type : context.GetType());
+
+            if (accessor == null || accessor.RequiresRefresh(contextType))
+            {
+                memberName = this.getText();
+
+                // clear cached member info if context type has changed (for example, when ASP.NET page is recompiled)
+                if (accessor != null && accessor.RequiresRefresh(contextType))
+                {
+                    accessor = null;
+                }
+
+                // initialize this node if necessary
+                if (contextType != null && accessor == null)
+                {
+                    // try to initialize node as enum value first
+                    if (contextType.IsEnum)
+                    {
+                        try
+                        {
+                            accessor = new EnumValueAccessor(Enum.Parse(contextType, memberName, true));
+                        }
+                        catch (ArgumentException)
+                        {
+                            // ArgumentException will be thrown if specified member name is not a valid
+                            // enum value for the context type. We should just ignore it and continue processing,
+                            // because the specified member could be a property of a Type class (i.e. EnumType.FullName)
+                        }
+                    }
+
+                    // then try to initialize node as property or field value
+                    if (accessor == null)
+                    {
+                        // check the context type first
+                        accessor = GetPropertyOrFieldAccessor(contextType, memberName, BINDING_FLAGS);
+
+                        // if not found, probe the Type type
+                        if (accessor == null && context is Type)
+                        {
+                            accessor = GetPropertyOrFieldAccessor(typeof(Type), memberName, BINDING_FLAGS);
+                        }
+                    }
+                }
+
+                // if there is still no match, try to initialize node as type accessor
+                if (accessor == null)
+                {
+                    try
+                    {
+                        accessor = new TypeValueAccessor(TypeResolutionUtils.ResolveType(memberName));
+                    }
+                    catch (TypeLoadException)
+                    {
+                        if (context == null)
+                        {
+                            throw new NullValueInNestedPathException("Cannot initialize property or field node '" +
+                                                                     memberName +
+                                                                     "' because the specified context is null.");
+                        }
+                        else
+                        {
+                            throw new InvalidPropertyException(contextType, memberName,
+                                                               "'" + memberName +
+                                                               "' node cannot be resolved for the specified context [" +
+                                                               context + "].");
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Attempts to resolve property or field.
+        /// </summary>
+        /// <param name="contextType">
+        /// Type to search for a property or a field.
+        /// </param>
+        /// <param name="memberName">
+        /// Property or field name.
+        /// </param>
+        /// <param name="bindingFlags">
+        /// Binding flags to use.
+        /// </param>
+        /// <returns>
+        /// Resolved property or field accessor, or <c>null</c> 
+        /// if specified <paramref name="memberName"/> cannot be resolved.
+        /// </returns>
+        private static IValueAccessor GetPropertyOrFieldAccessor(Type contextType, string memberName, BindingFlags bindingFlags)
+        {
+            try
+            {
+                PropertyInfo pi = contextType.GetProperty(memberName, bindingFlags);
+                if (pi == null)
+                {
+                    FieldInfo fi = contextType.GetField(memberName, bindingFlags);
+                    if (fi != null)
+                    {
+                        return new FieldValueAccessor(fi);
+                    }
+                }
+                else
+                {
+                    return new PropertyValueAccessor(pi);
+                }
+            }
+            catch (AmbiguousMatchException)
+            {
+                PropertyInfo pi = null;
+
+                // search type hierarchy
+                while (contextType != typeof(object))
+                {
+                    pi = contextType.GetProperty(memberName, bindingFlags | BindingFlags.DeclaredOnly);
+                    if (pi == null)
+                    {
+                        FieldInfo fi = contextType.GetField(memberName, bindingFlags | BindingFlags.DeclaredOnly);
+                        if (fi != null)
+                        {
+                            return new FieldValueAccessor(fi);
+                        }
+                    }
+                    else
+                    {
+                        return new PropertyValueAccessor(pi);
+                    }
+                    contextType = contextType.BaseType;
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Returns node's value for the given context.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            lock (this)
+            {
+                InitializeNode(context);
+
+                if (context == null && accessor.RequiresContext)
+                {
+                    throw new NullValueInNestedPathException(
+                        "Cannot retrieve the value of a field or property '" + this.memberName
+                        + "', because context for its resolution is null.");
+                }
+                if (IsProperty || IsField)
+                {
+                    return GetPropertyOrFieldValue(context, evalContext);
+                }
+                else
+                {
+                    return accessor.Get(context);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sets node's value for the given context.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <param name="newValue">New value for this node.</param>
+        protected override void Set(object context, EvaluationContext evalContext, object newValue)
+        {
+            lock (this)
+            {
+                InitializeNode(context);
+
+                if (context == null && accessor.RequiresContext)
+                {
+                    throw new NullValueInNestedPathException(
+                        "Cannot set the value of a field or property '" + this.memberName
+                        + "', because context for its resolution is null.");
+                }
+                if (IsProperty || IsField)
+                {
+                    SetPropertyOrFieldValue(context, evalContext, newValue);
+                }
+                else
+                {
+                    accessor.Set(context, newValue);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this node represents a property.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this node is a property; otherwise, <c>false</c>.
+        /// </value>
+        private bool IsProperty
+        {
+            get { return accessor is PropertyValueAccessor; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this node represents a field.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this node is a field; otherwise, <c>false</c>.
+        /// </value>
+        private bool IsField
+        {
+            get { return accessor is FieldValueAccessor; }
+        }
+
+        /// <summary>
+        /// Retrieves property or field value.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Property or field value.</returns>
+        private object GetPropertyOrFieldValue(object context, EvaluationContext evalContext)
+        {
+            try
+            {
+                return accessor.Get(context);
+            }
+            catch (InvalidOperationException)
+            {
+                throw new NotReadablePropertyException(evalContext.RootContextType, this.memberName);
+            }
+            catch (TargetInvocationException e)
+            {
+                throw new InvalidPropertyException(evalContext.RootContextType, this.memberName,
+                                                   "Getter for property '" + this.memberName + "' threw an exception.",
+                                                   e);
+            }
+            catch (UnauthorizedAccessException e)
+            {
+                throw new InvalidPropertyException(evalContext.RootContextType, this.memberName,
+                                                   "Illegal attempt to get value for the property '" + this.memberName +
+                                                   "'.", e);
+            }
+        }
+
+        /// <summary>
+        /// Sets property value, doing any type conversions that are necessary along the way.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <param name="newValue">New value for this node.</param>
+        private void SetPropertyOrFieldValue(object context, EvaluationContext evalContext, object newValue)
+        {
+            bool isWriteable = accessor.IsWriteable;
+            Type targetType = accessor.TargetType;
+
+            try
+            {
+                if (!isWriteable)
+                {
+                    if (!AddToCollections(context, evalContext, newValue))
+                    {
+                        throw new NotWritablePropertyException(
+                            "Can't change the value of the read-only property or field '" + this.memberName + "'.");
+                    }
+                }
+                else if (targetType.IsPrimitive && (newValue == null || String.Empty.Equals(newValue)))
+                {
+                    throw new ArgumentException("Invalid value [" + newValue + "] for property or field '" +
+                                                this.memberName + "' of primitive type ["
+                                                + targetType + "]");
+                }
+                else if (newValue == null || targetType.IsAssignableFrom(newValue.GetType()))
+                {
+                    SetPropertyOrFieldValueInternal(context, newValue);
+                }
+                else if (!RemotingServices.IsTransparentProxy(newValue) &&
+                         (newValue is IList || newValue is IDictionary || newValue is ISet))
+                {
+                    if (!AddToCollections(context, evalContext, newValue))
+                    {
+                        object tmpValue =
+                            TypeConversionUtils.ConvertValueIfNecessary(targetType, newValue, this.memberName);
+                        SetPropertyOrFieldValueInternal(context, tmpValue);
+                    }
+                }
+                else
+                {
+                    object tmpValue = TypeConversionUtils.ConvertValueIfNecessary(targetType, newValue, this.memberName);
+                    SetPropertyOrFieldValueInternal(context, tmpValue);
+                }
+            }
+            catch (TargetInvocationException ex)
+            {
+                PropertyChangeEventArgs propertyChangeEvent =
+                    new PropertyChangeEventArgs(this.memberName, null, newValue);
+                if (ex.GetBaseException() is InvalidCastException)
+                {
+                    throw new TypeMismatchException(propertyChangeEvent, targetType, ex.GetBaseException());
+                }
+                else
+                {
+                    throw new MethodInvocationException(ex.GetBaseException(), propertyChangeEvent);
+                }
+            }
+            catch (UnauthorizedAccessException ex)
+            {
+                throw new FatalReflectionException("Illegal attempt to set property '" + this.memberName + "'", ex);
+            }
+            catch (NotWritablePropertyException)
+            {
+                throw;
+            }
+            catch (NotReadablePropertyException)
+            {
+                throw;
+            }
+            catch (ArgumentException ex)
+            {
+                PropertyChangeEventArgs propertyChangeEvent =
+                    new PropertyChangeEventArgs(this.memberName, null, newValue);
+                throw new TypeMismatchException(propertyChangeEvent, targetType, ex);
+            }
+        }
+
+        /// <summary>
+        /// Sets property or field value using either dynamic or standard reflection.
+        /// </summary>
+        /// <param name="context">Object to evaluate node against.</param>
+        /// <param name="newValue">New value for this node, converted to appropriate type.</param>
+        private void SetPropertyOrFieldValueInternal(object context, object newValue)
+        {
+            accessor.Set(context, newValue);
+        }
+
+        /// <summary>
+        /// In the case of read only collections or custom collections that are not assignable from
+        /// IList, try to add to the collection.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <param name="newValue">New value for this node.</param>
+        /// <returns>true if was able add to IList, IDictionary, or ISet</returns>
+        private bool AddToCollections(object context, EvaluationContext evalContext, object newValue)
+        {
+            // short-circuit if accessor is not readable
+            if (!this.accessor.IsReadable)
+            {
+                return false;
+            }
+
+            bool added = false;
+
+            // try adding values if property is a list...
+            if (newValue is IList && !RemotingServices.IsTransparentProxy(newValue))
+            {
+                IList currentValue = (IList)Get(context, evalContext);
+                if (currentValue != null && !currentValue.IsFixedSize && !currentValue.IsReadOnly)
+                {
+                    foreach (object el in (IList)newValue)
+                    {
+                        currentValue.Add(el);
+                    }
+                    added = true;
+                }
+            }
+            // try adding values if property is a dictionary...
+            else if (newValue is IDictionary && !RemotingServices.IsTransparentProxy(newValue))
+            {
+                IDictionary currentValue = (IDictionary)Get(context, evalContext);
+                if (currentValue != null && !currentValue.IsFixedSize && !currentValue.IsReadOnly)
+                {
+                    foreach (DictionaryEntry entry in (IDictionary)newValue)
+                    {
+                        currentValue[entry.Key] = entry.Value;
+                    }
+                    added = true;
+                }
+            }
+            // try adding values if property is a set...
+            else if (newValue is ISet && !RemotingServices.IsTransparentProxy(newValue))
+            {
+                ISet currentValue = (ISet)Get(context, evalContext);
+                if (currentValue != null)
+                {
+                    currentValue.AddAll((ICollection)newValue);
+                    added = true;
+                }
+            }
+            return added;
+        }
+
+        /// <summary>
+        /// Utility method that is needed by ObjectWrapper and AbstractAutowireCapableObjectFactory.
+        /// We try as hard as we can, but there are instances when we won't be able to obtain PropertyInfo...
+        /// </summary>
+        /// <param name="context">Context to resolve property against.</param>
+        /// <returns>PropertyInfo for this node.</returns>
+        internal MemberInfo GetMemberInfo(object context)
+        {
+            lock (this)
+            {
+                InitializeNode(context);
+            }
+            return accessor.MemberInfo;
+
+            //if (IsProperty)
+            //{
+            //    return (((PropertyValueAccessor) accessor).MemberInfo);
+            //}
+            //else
+            //{
+            //    throw new FatalObjectException(
+            //        "Cannot obtain PropertyInfo from an expression that does not resolve to a property.");
+            //}
+        }
+
+        #region IValueAccessor interface
+
+        private interface IValueAccessor
+        {
+            object Get(object context);
+            void Set(object context, object value);
+
+            bool IsReadable { get; }
+            bool IsWriteable { get; }
+            bool RequiresContext { get; }
+            Type TargetType { get; }
+            MemberInfo MemberInfo { get; }
+            bool RequiresRefresh(Type contextType);
+        }
+
+        #endregion
+
+        #region BaseValueAccessor implementation
+
+        private abstract class BaseValueAccessor : IValueAccessor
+        {
+            public abstract object Get(object context);
+
+            public abstract void Set(object context, object value);
+
+            public virtual bool IsReadable
+            {
+                get { return true; }
+            }
+
+            public virtual bool IsWriteable
+            {
+                get { return false; }
+            }
+
+            public virtual bool RequiresContext
+            {
+                get { return false; }
+            }
+
+            public virtual Type TargetType
+            {
+                get { throw new NotSupportedException(); }
+            }
+
+            public virtual MemberInfo MemberInfo
+            {
+                get { throw new NotSupportedException(); }
+            }
+
+            public virtual bool RequiresRefresh(Type contextType)
+            {
+                return false;
+            }
+        }
+
+        #endregion
+
+        #region PropertyValueAccessor implementation
+
+        private class PropertyValueAccessor : BaseValueAccessor
+        {
+            private SafeProperty property;
+            private string name;
+            private bool isReadable;
+            private bool isWriteable;
+            private Type targetType;
+            private Type contextType;
+
+            public PropertyValueAccessor(PropertyInfo propertyInfo)
+            {
+                this.name = propertyInfo.Name;
+                this.isReadable = propertyInfo.CanRead;
+                this.isWriteable = propertyInfo.CanWrite;
+                this.targetType = propertyInfo.PropertyType;
+                this.contextType = propertyInfo.DeclaringType;
+                this.property = new SafeProperty(propertyInfo);
+            }
+
+            public override object Get(object context)
+            {
+                if (!isReadable)
+                {
+                    throw new NotReadablePropertyException("Cannot get a non-readable property [" + name + "]");
+                }
+                return property.GetValue(context);
+            }
+
+            public override void Set(object context, object value)
+            {
+                if (!isWriteable)
+                {
+                    throw new NotWritablePropertyException("Cannot set a read-only property [" + name + "]");
+                }
+                property.SetValue(context, value);
+            }
+
+            public override bool IsReadable
+            {
+                get { return isReadable; }
+            }
+
+            public override bool IsWriteable
+            {
+                get { return isWriteable; }
+            }
+
+            public override bool RequiresContext
+            {
+                get { return true; }
+            }
+
+            public override Type TargetType
+            {
+                get { return targetType; }
+            }
+
+            public override MemberInfo MemberInfo
+            {
+                get { return property.PropertyInfo; }
+            }
+
+            public override bool RequiresRefresh(Type contextType)
+            {
+                return this.contextType != contextType;
+            }
+        }
+
+        #endregion
+
+        #region FieldValueAccessor implementation
+
+        private class FieldValueAccessor : BaseValueAccessor
+        {
+            private SafeField field;
+            private bool isWriteable;
+            private Type targetType;
+            private Type contextType;
+
+            public FieldValueAccessor(FieldInfo fieldInfo)
+            {
+                this.field = new SafeField(fieldInfo);
+                this.isWriteable = !(fieldInfo.IsInitOnly || fieldInfo.IsLiteral);
+                this.targetType = fieldInfo.FieldType;
+                this.contextType = fieldInfo.DeclaringType;
+            }
+
+            public override object Get(object context)
+            {
+                return field.GetValue(context);
+            }
+
+            public override void Set(object context, object value)
+            {
+                field.SetValue(context, value);
+            }
+
+            public override bool IsWriteable
+            {
+                get { return isWriteable; }
+            }
+
+            public override bool RequiresContext
+            {
+                get { return true; }
+            }
+
+            public override Type TargetType
+            {
+                get { return targetType; }
+            }
+
+            public override MemberInfo MemberInfo
+            {
+                get { return field.FieldInfo; }
+            }
+
+            public override bool RequiresRefresh(Type contextType)
+            {
+                return this.contextType != contextType;
+            }
+        }
+
+        #endregion
+
+        #region EnumValueAccessor implementation
+
+        private class EnumValueAccessor : BaseValueAccessor
+        {
+            private object enumValue;
+
+            public EnumValueAccessor(object enumValue)
+            {
+                this.enumValue = enumValue;
+            }
+
+            public override object Get(object context)
+            {
+                return enumValue;
+            }
+
+            public override void Set(object context, object value)
+            {
+                throw new NotSupportedException("Cannot set the value of an enum.");
+            }
+        }
+
+        #endregion
+
+        #region TypeValueAccessor implementation
+
+        private class TypeValueAccessor : BaseValueAccessor
+        {
+            private Type type;
+
+            public TypeValueAccessor(Type type)
+            {
+                this.type = type;
+            }
+
+            public override object Get(object context)
+            {
+                return type;
+            }
+
+            public override void Set(object context, object value)
+            {
+                throw new NotSupportedException("Cannot set the value of a type.");
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs b/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs
new file mode 100644
index 00000000..94a11604
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs
@@ -0,0 +1,98 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using antlr.collections;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed named argument node in the expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: QualifiedIdentifier.cs,v 1.7 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class QualifiedIdentifier : BaseNode
+    {
+        private const string ESCAPE_CHAR = "\\";
+
+        private string identifier;
+        
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public QualifiedIdentifier():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected QualifiedIdentifier(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns the value of the named argument defined by this node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            if (identifier == null)
+            {
+                lock (this)
+                {
+                    if (identifier == null)
+                    {
+                        identifier = base.getText();
+                        if (identifier != null) 
+                        {
+                            identifier = identifier.Replace(ESCAPE_CHAR,""); // remove all occurrences of escape char
+                        }
+                        AST node = this.getFirstChild();
+                        while (node != null)
+                        {
+                            identifier += node.getText();
+                            node = node.getNextSibling();
+                        }
+                    }
+                }
+            }
+
+            return identifier;
+        }
+
+        /// <summary>
+        /// Overrides getText to allow easy way to get fully 
+        /// qualified identifier.
+        /// </summary>
+        /// <returns>
+        /// Fully qualified identifier as a string.
+        /// </returns>
+        public override string getText()
+        {
+            return (string) Get(null, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/RealLiteralNode.cs b/src/Spring/Spring.Core/Expressions/RealLiteralNode.cs
new file mode 100644
index 00000000..86468131
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/RealLiteralNode.cs
@@ -0,0 +1,95 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Globalization;
+using System.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed real literal node.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: RealLiteralNode.cs,v 1.11 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class RealLiteralNode : BaseNode
+    {
+        private object nodeValue;
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public RealLiteralNode():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected RealLiteralNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the real literal node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            if (nodeValue == null)
+            {
+                lock (this)
+                {
+                    if (nodeValue == null)
+                    {
+                        string n = this.getText();
+                        char lastChar = n.ToLower()[n.Length - 1];
+                        if (Char.IsDigit(lastChar))
+                        {
+                            nodeValue = Double.Parse(n, NumberFormatInfo.InvariantInfo);
+                        }
+                        else
+                        {
+                            n = n.Substring(0, n.Length - 1);
+                            if (lastChar == 'm')
+                            {
+                                nodeValue = Decimal.Parse(n, NumberFormatInfo.InvariantInfo);
+                            }
+                            else if (lastChar == 'f')
+                            {
+                                nodeValue = Single.Parse(n, NumberFormatInfo.InvariantInfo);
+                            }
+                            else
+                            {
+                                nodeValue = Double.Parse(n, NumberFormatInfo.InvariantInfo);
+                            }
+                        }
+                    }
+                }
+            }
+
+            return nodeValue;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/ReferenceNode.cs b/src/Spring/Spring.Core/Expressions/ReferenceNode.cs
new file mode 100644
index 00000000..b5440338
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/ReferenceNode.cs
@@ -0,0 +1,96 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using Spring.Expressions;
+using Spring.Objects.Factory;
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Represents a reference to a Spring-managed object.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ReferenceNode.cs,v 1.13 2008/03/20 10:35:54 oakinger Exp $</version>
+    [Serializable]
+    public class ReferenceNode : BaseNode
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public ReferenceNode():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected ReferenceNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the integer literal node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            IApplicationContext ctx;
+            string objectName;
+
+            if (this.getNumberOfChildren() == 2)
+            {
+                string contextName = this.getFirstChild().getText();
+                objectName = this.getFirstChild().getNextSibling().getText();
+                ctx = ContextRegistry.GetContext(contextName);
+                if (ctx == null)
+                {
+                    throw new ArgumentException(string.Format("Context '{0}' is not registered.", contextName));
+                }
+            }
+            else
+            {
+                objectName = this.getFirstChild().getText();
+                IObjectFactory currentObjectFactory = (evalContext.Variables != null)
+                                                          ? (IObjectFactory)evalContext.Variables[Expression.ReservedVariableNames.CurrentObjectFactory]
+                                                          : null;
+
+                // this is a local reference within an object factory
+                if (currentObjectFactory != null)
+                {
+                    return currentObjectFactory.GetObject(objectName);
+                }
+
+                // else lookup in default context
+                ctx = ContextRegistry.GetContext();
+                if (ctx == null)
+                {
+                    throw new ArgumentException("No context registered.");
+                }
+            }
+
+            return ctx.GetObject(objectName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/SelectionFirstNode.cs b/src/Spring/Spring.Core/Expressions/SelectionFirstNode.cs
new file mode 100644
index 00000000..31273dde
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/SelectionFirstNode.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed selection node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SelectionFirstNode.cs,v 1.5 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class SelectionFirstNode : BaseNode
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public SelectionFirstNode():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected SelectionFirstNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns the first context item that matches selection expression.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            IEnumerable enumerable = context as IEnumerable;
+            if (enumerable == null)
+            {
+                throw new ArgumentException(
+                    "Selection can only be used on an instance of the type that implements IEnumerable.");
+            }
+
+            BaseNode expression = (BaseNode) this.getFirstChild();
+            using (evalContext.SwitchThisContext())
+            {
+                foreach (object o in enumerable)
+                {
+                    evalContext.ThisContext = o;
+                    bool isMatch = (bool) expression.GetValueInternal(o, evalContext);
+                    if (isMatch)
+                    {
+                        return o;
+                    }
+                }
+            }
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/SelectionLastNode.cs b/src/Spring/Spring.Core/Expressions/SelectionLastNode.cs
new file mode 100644
index 00000000..e0aee460
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/SelectionLastNode.cs
@@ -0,0 +1,83 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed selection node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SelectionLastNode.cs,v 1.5 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class SelectionLastNode : BaseNode
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public SelectionLastNode():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected SelectionLastNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns the last context item that matches selection expression.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            IList list = context as IList;
+
+            if (list == null)
+            {
+                throw new ArgumentException(
+                    "Selection can only be used on an instance of the type that implements IList.");
+            }
+
+            using (evalContext.SwitchThisContext())
+            {
+                BaseNode expression = (BaseNode) this.getFirstChild();
+                for (int i = list.Count - 1; i >= 0; i--)
+                {
+                    object listItem = list[i];
+                    evalContext.ThisContext = listItem;
+                    bool isMatch = (bool)expression.GetValueInternal( listItem, evalContext );
+                    if (isMatch)
+                    {
+                        return listItem;
+                    }
+                }
+            }
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/SelectionNode.cs b/src/Spring/Spring.Core/Expressions/SelectionNode.cs
new file mode 100644
index 00000000..ec3c2a9a
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/SelectionNode.cs
@@ -0,0 +1,105 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed selection node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SelectionNode.cs,v 1.6 2008/03/25 22:33:04 oakinger Exp $</version>
+    [Serializable]
+    public class SelectionNode : BaseNode
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public SelectionNode()
+            : base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected SelectionNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Returns a <see cref="IList"/> containing results of evaluation
+        /// of selection expression against each node in the context.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            IEnumerable enumerable = context as IEnumerable;
+            if (enumerable == null)
+            {
+                throw new ArgumentException(
+                    "Selection can only be used on an instance of the type that implements IEnumerable.");
+            }
+
+            BaseNode expression = (BaseNode)this.getFirstChild();
+            BaseNode minIndexExpression = (BaseNode)expression.getNextSibling();
+            BaseNode maxIndexExpression = (minIndexExpression == null) ? null : (BaseNode)minIndexExpression.getNextSibling();
+
+            int minIndex = (int)((minIndexExpression == null)
+                                      ? Int32.MinValue
+                                      : minIndexExpression.GetValueInternal(context, evalContext));
+            int maxIndex = (int)((maxIndexExpression == null)
+                                      ? Int32.MaxValue
+                                      : maxIndexExpression.GetValueInternal(context, evalContext));
+
+            IList selectionList = new ArrayList();
+
+            using (evalContext.SwitchThisContext())
+            {
+                int found = 0;
+                foreach (object o in enumerable)
+                {
+                    evalContext.ThisContext = o;
+                    bool isMatch = (bool)expression.GetValueInternal(o, evalContext);
+                    if (isMatch)
+                    {
+                        if (minIndex <= found && found <= maxIndex)
+                        {
+                            selectionList.Add(o);
+                        }
+                        found++;
+
+                        if (found>maxIndex)
+                        {
+                            break; // don't look any further
+                        }
+                    }
+                }
+            }
+            return selectionList;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/SpringAST.cs b/src/Spring/Spring.Core/Expressions/SpringAST.cs
new file mode 100644
index 00000000..46a5d4ce
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/SpringAST.cs
@@ -0,0 +1,152 @@
+using System;
+using System.Runtime.Serialization;
+using antlr;
+using antlr.collections;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// For internal purposes only. Use <see cref="BaseNode"/> for expression node implementations.
+    /// </summary>
+    /// <remarks>
+    /// This class is only required to enable serialization of parsed Spring expressions since antlr.CommonAST
+    /// unfortunately is not marked as [Serializable].<br/>
+    /// <br/>
+    /// <b>Note:</b>Since SpringAST implements <see cref="ISerializable"/>, deriving classes 
+    /// have to explicitely override <see cref="GetObjectData"/> if they need to persist additional
+    /// data during serialization.
+    /// </remarks>
+    [Serializable]
+    public class SpringAST : antlr.BaseAST, ISerializable
+    {
+        #region Global SpringAST Factory
+
+        internal class SpringASTCreator : antlr.ASTNodeCreator
+        {
+            public override antlr.collections.AST Create()
+            {
+                return new SpringAST();
+            }
+
+            public override string ASTNodeTypeName
+            {
+                get { return typeof(SpringAST).FullName; }
+            }
+        }
+
+        /// <summary>
+        /// The global SpringAST node factory
+        /// </summary>
+        internal static readonly SpringASTCreator Creator = new SpringASTCreator();
+
+        #endregion
+
+        #region Members
+
+        private string text;
+        private int ttype;
+
+        #endregion
+
+        /// <summary>
+        /// Create an instance
+        /// </summary>
+        public SpringAST()
+        {}
+
+        /// <summary>
+        /// Create an instance from a token
+        /// </summary>
+        public SpringAST(IToken token)
+        {
+            initialize(token);
+        }
+
+        /// <summary>
+        /// initialize this instance from an AST
+        /// </summary>
+        public override void initialize(AST t)
+        {
+            this.setText(t.getText());
+            this.Type = t.Type;
+        }
+
+        /// <summary>
+        /// initialize this instance from an IToken
+        /// </summary>
+        public override void initialize(IToken tok)
+        {
+            this.setText(tok.getText());
+            this.Type = tok.Type;
+        }
+
+        /// <summary>
+        /// initialize this instance from a token type number and a text
+        /// </summary>
+        public override void initialize(int t, string txt)
+        {
+            this.Type = t;
+            this.setText(txt);
+        }
+
+        /// <summary>
+        /// gets or sets the token type of this node
+        /// </summary>
+        public override int Type
+        {
+            get { return this.ttype; }
+            set { this.ttype = value; }
+        }
+
+        /// <summary>
+        /// gets or sets the text of this node
+        /// </summary>
+        public string Text
+        {
+            get { return this.getText(); }
+            set { this.setText(value); }
+        }
+
+        /// <summary>
+        /// sets the text of this node
+        /// </summary>
+        public override void setText(string txt)
+        {
+            this.text = txt;
+        }
+
+        /// <summary>
+        /// gets the text of this node
+        /// </summary>
+        public override string getText()
+        {
+            return this.text;
+        }
+
+        #region ISerializable Implementation
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected SpringAST(SerializationInfo info, StreamingContext context)
+        {
+            base.down = (BaseAST)info.GetValue("down", typeof(BaseAST));
+            base.right = (BaseAST)info.GetValue("right", typeof(BaseAST));
+            this.ttype = info.GetInt32("ttype");
+            this.text = info.GetString("text");
+        }
+
+        /// <summary>
+        /// populate SerializationInfo from this instance
+        /// </summary>
+        public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            info.AddValue("down", base.down, typeof(SpringAST));
+            info.AddValue("right", base.right, typeof(SpringAST));
+            info.AddValue("ttype", this.Type, typeof(int));
+            info.AddValue("text", this.Text, typeof(string));
+        }
+        
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/StringLiteralNode.cs b/src/Spring/Spring.Core/Expressions/StringLiteralNode.cs
new file mode 100644
index 00000000..4c0394a6
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/StringLiteralNode.cs
@@ -0,0 +1,60 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed string literal node.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: StringLiteralNode.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class StringLiteralNode : BaseNode
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public StringLiteralNode():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected StringLiteralNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the string literal node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            return this.getText();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/TernaryNode.cs b/src/Spring/Spring.Core/Expressions/TernaryNode.cs
new file mode 100644
index 00000000..39d90af3
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/TernaryNode.cs
@@ -0,0 +1,91 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+using antlr.collections;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents ternary expression node.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: TernaryNode.cs,v 1.9 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class TernaryNode : BaseNode
+    {
+        private bool initialized = false;
+        private BaseNode condition;
+        private BaseNode trueExp;
+        private BaseNode falseExp;
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public TernaryNode():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected TernaryNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the string literal node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            if (!initialized)
+            {
+                lock (this)
+                {
+                    if (!initialized)
+                    {
+                        AST node = this.getFirstChild();
+                        condition = (BaseNode) node;
+                        node = node.getNextSibling();
+                        trueExp = (BaseNode) node;
+                        node = node.getNextSibling();
+                        falseExp = (BaseNode) node;
+
+                        initialized = true;
+                    }
+                }
+            }
+
+            if (Convert.ToBoolean(condition.GetValueInternal(context, evalContext)))
+            {
+                return trueExp.GetValueInternal(context, evalContext);
+            }
+            else
+            {
+                return falseExp.GetValueInternal(context, evalContext);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/TypeNode.cs b/src/Spring/Spring.Core/Expressions/TypeNode.cs
new file mode 100644
index 00000000..a1c82055
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/TypeNode.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+
+using antlr.collections;
+using Spring.Core.TypeResolution;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed type node in the navigation expression.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: TypeNode.cs,v 1.11 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class TypeNode : BaseNode
+    {
+        private Type type;
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public TypeNode():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected TypeNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns node's value for the given context.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            if (type == null)
+            {
+                lock (this)
+                {
+                    if (type == null)
+                    {
+                        string typeName = this.getText();
+                        AST node = this.getFirstChild();
+                        while (node != null)
+                        {
+                            typeName += node.getText();
+                            node = node.getNextSibling();
+                        }
+
+                        type = TypeResolutionUtils.ResolveType(typeName);
+                    }
+                }
+            }
+
+            return type;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/UnaryOperator.cs b/src/Spring/Spring.Core/Expressions/UnaryOperator.cs
new file mode 100644
index 00000000..b13ef61e
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/UnaryOperator.cs
@@ -0,0 +1,57 @@
+#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.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Base class for unary operators.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: UnaryOperator.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    //[Serializable]
+    public abstract class UnaryOperator : BaseNode
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public UnaryOperator():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected UnaryOperator(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Gets the operand.
+        /// </summary>
+        /// <value>The operand.</value>
+        public BaseNode Operand
+        {
+            get { return (BaseNode) this.getFirstChild(); }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Expressions/VariableNode.cs b/src/Spring/Spring.Core/Expressions/VariableNode.cs
new file mode 100644
index 00000000..2a7db702
--- /dev/null
+++ b/src/Spring/Spring.Core/Expressions/VariableNode.cs
@@ -0,0 +1,90 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Runtime.Serialization;
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// Represents parsed variable node.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: VariableNode.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+    [Serializable]
+    public class VariableNode : BaseNode
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public VariableNode():base()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected VariableNode(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns value of the variable represented by this node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <returns>Node's value.</returns>
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            string varName = this.getText();
+            if (varName == "this")
+            {
+                return evalContext.ThisContext;
+            }
+            else if (varName == "root")
+            {
+                return evalContext.RootContext;
+            }
+            return evalContext.Variables[varName];
+        }
+
+        /// <summary>
+        /// Sets value of the variable represented by this node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
+        /// <param name="newValue">New value for this node.</param>
+        protected override void Set(object context, EvaluationContext evalContext, object newValue)
+        {
+            string varName = this.getText();
+            if (varName == "this" || varName == "root")
+            {
+                throw new ArgumentException("You cannot assign a value to intrinsic variable '" + varName + "'.");
+            }
+            if (evalContext.Variables == null)
+            {
+                throw new InvalidOperationException(
+                    "You need to provide variables dictionary to expression evaluation engine in order to be able to set variable values.");
+            }
+            evalContext.Variables[varName] = newValue;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Globalization/AbstractLocalizer.cs b/src/Spring/Spring.Core/Globalization/AbstractLocalizer.cs
new file mode 100644
index 00000000..d472a870
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/AbstractLocalizer.cs
@@ -0,0 +1,124 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Globalization;
+using System.Threading;
+
+using Spring.Context;
+using Spring.Util;
+
+namespace Spring.Globalization
+{
+    /// <summary>
+    /// Abstract base class that all localizers should extend
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This class contains the bulk of the localizer logic, including implementation
+    /// of the <c>ApplyResources</c> methods that are defined in <see cref="ILocalizer"/>
+    /// interface.
+    /// </p>
+    /// <p>
+    /// All specific localizers need to do is inherit this class and implement 
+    /// <c>GetResources</c> method that will return a list of <see cref="Resource"/>
+    /// objects that should be applied to a specified <c>target</c>.
+    /// </p>
+    /// <p>
+    /// Custom implementations can use whatever type of resource storage they want,
+    /// such as standard .NET resource sets, custom XML files, database, etc.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AbstractLocalizer.cs,v 1.5 2007/07/24 17:26:25 oakinger Exp $</version>
+    public abstract class AbstractLocalizer : ILocalizer
+    {
+        private IResourceCache resourceCache = new NullResourceCache();
+
+        /// <summary>
+        /// Gets or sets the resource cache instance.
+        /// </summary>
+        /// <value>The resource cache instance.</value>
+        public IResourceCache ResourceCache
+        {
+            get { return resourceCache; }
+            set { resourceCache = value; }
+        }
+
+        /// <summary>
+        /// Applies resources of the specified culture to the specified target object.
+        /// </summary>
+        /// <param name="target">Target object to apply resources to.</param>
+        /// <param name="messageSource"><see cref="IMessageSource"/> instance to retrieve resources from.</param>
+        /// <param name="culture">Resource culture to use for resource lookup.</param>
+        public void ApplyResources(object target, IMessageSource messageSource, CultureInfo culture)
+        {
+            AssertUtils.ArgumentNotNull(target, "target");
+            AssertUtils.ArgumentNotNull(culture, "culture");
+
+            IList resources = GetResources(target, messageSource, culture);
+            foreach (Resource resource in resources)
+            {
+                resource.Target.SetValue(target, null, resource.Value);
+            }
+        }
+
+        /// <summary>
+        /// Applies resources to the specified target object, using current thread's uiCulture to resolve resources.
+        /// </summary>
+        /// <param name="target">Target object to apply resources to.</param>
+        /// <param name="messageSource"><see cref="IMessageSource"/> instance to retrieve resources from.</param>
+        public void ApplyResources(object target, IMessageSource messageSource)
+        {
+            AssertUtils.ArgumentNotNull(target, "target");
+            ApplyResources(target, messageSource, Thread.CurrentThread.CurrentUICulture);
+        }
+
+        /// <summary>
+        /// Returns a list of <see cref="Resource"/> instances that should be applied to the target.
+        /// </summary>
+        /// <param name="target">Target to get a list of resources for.</param>
+        /// <param name="messageSource"><see cref="IMessageSource"/> instance to retrieve resources from.</param>
+        /// <param name="culture">Resource locale.</param>
+        /// <returns>A list of resources to apply.</returns>
+        private IList GetResources(object target, IMessageSource messageSource, CultureInfo culture)
+        {
+            IList resources = resourceCache.GetResources(target, culture);
+
+            if (resources == null)
+            {
+                resources = LoadResources(target, messageSource, culture);
+                resourceCache.PutResources(target, culture, resources);
+            }
+
+            return resources;
+        }
+
+        /// <summary>
+        /// Loads resources from the storage and creates a list of <see cref="Resource"/> instances that should be applied to the target.
+        /// </summary>
+        /// <param name="target">Target to get a list of resources for.</param>
+        /// <param name="messageSource"><see cref="IMessageSource"/> instance to retrieve resources from.</param>
+        /// <param name="culture">Resource locale.</param>
+        /// <returns>A list of resources to apply.</returns>
+        protected abstract IList LoadResources(object target, IMessageSource messageSource, CultureInfo culture);
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Globalization/AbstractResourceCache.cs b/src/Spring/Spring.Core/Globalization/AbstractResourceCache.cs
new file mode 100644
index 00000000..306d46ef
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/AbstractResourceCache.cs
@@ -0,0 +1,82 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Globalization;
+
+namespace Spring.Globalization
+{
+    /// <summary>
+    /// Abstract base class that all resource cache implementations should extend.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AbstractResourceCache.cs,v 1.3 2006/04/09 07:18:47 markpollack Exp $</version>
+    public abstract class AbstractResourceCache : IResourceCache
+    {
+        /// <summary>
+        /// Gets the list of resources from the cache.
+        /// </summary>
+        /// <param name="target">Target to get a list of resources for.</param>
+        /// <param name="culture">Resource culture.</param>
+        /// <returns>A list of cached resources for the specified target object and culture.</returns>
+        public IList GetResources(object target, CultureInfo culture)
+        {
+            return GetResources(CreateCacheKey(target, culture));
+        }
+
+        /// <summary>
+        /// Puts the list of resources in the cache.
+        /// </summary>
+        /// <param name="target">Target to cache a list of resources for.</param>
+        /// <param name="culture">Resource culture.</param>
+        /// <param name="resources">A list of resources to cache.</param>
+        /// <returns>A list of cached resources for the specified target object and culture.</returns>
+        public void PutResources(object target, CultureInfo culture, IList resources)
+        {
+            PutResources(CreateCacheKey(target, culture), resources);
+        }
+
+        /// <summary>
+        /// Crates resource cache key for the specified target object and culture.
+        /// </summary>
+        /// <param name="target">Target object to apply resources to.</param>
+        /// <param name="culture">Resource culture to use for resource lookup.</param>
+        protected virtual string CreateCacheKey(object target, CultureInfo culture)
+        {
+            return target.GetType().FullName + "." + culture.Name + ".resources";
+        }
+
+        /// <summary>
+        /// Gets the list of resources from cache.
+        /// </summary>
+        /// <param name="cacheKey">Cache key to use for lookup.</param>
+        /// <returns>A list of cached resources for the specified target object and culture.</returns>
+        protected abstract IList GetResources(string cacheKey);
+
+        /// <summary>
+        /// Puts the list of resources in the cache.
+        /// </summary>
+        /// <param name="cacheKey">Cache key to use for the specified resources.</param>
+        /// <param name="resources">A list of resources to cache.</param>
+        /// <returns>A list of cached resources for the specified target object and culture.</returns>
+        protected abstract void PutResources(string cacheKey, IList resources);
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Globalization/Formatters/BooleanFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/BooleanFormatter.cs
new file mode 100644
index 00000000..e6ddbd43
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/Formatters/BooleanFormatter.cs
@@ -0,0 +1,146 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Globalization;
+
+using Spring.Util;
+
+namespace Spring.Globalization.Formatters
+{
+    /// <summary>
+    /// Implementation of <see cref="IFormatter"/> that can be used to
+    /// format and parse boolean values.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: BooleanFormatter.cs,v 1.1 2007/06/01 08:59:31 oakinger Exp $</version>
+    public class BooleanFormatter:IFormatter
+    {
+        private string trueString;
+        private string falseString;
+        private bool ignoreCase;
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BooleanFormatter"/> class
+        /// using default values
+        /// </summary>
+        public BooleanFormatter()
+            : this(true,bool.TrueString,bool.FalseString)
+        { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BooleanFormatter"/> class
+        /// </summary>
+        public BooleanFormatter(bool ignoreCase,string trueString,string falseString)
+        {
+            this.trueString = trueString;
+            this.falseString = falseString;
+            this.ignoreCase = ignoreCase;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Set/Get value to control casesensitivity of <see cref="Parse"/>
+        /// </summary>
+        /// <remarks>
+        /// Defaults to <value>true</value>
+        /// </remarks>
+        public bool IgnoreCase
+        {
+            get { return this.ignoreCase; }
+            set { this.ignoreCase = value; }
+        }
+
+        /// <summary>
+        /// Set/Get value to recognize as boolean "true" value
+        /// </summary>
+        /// <remarks>
+        /// Defaults to <see cref="bool.TrueString" />
+        /// </remarks>
+        public string TrueString
+        {
+            get { return this.trueString; }
+            set { this.trueString = value; }
+        }
+
+        /// <summary>
+        /// Set/Get value to recognize as boolean "false" value
+        /// </summary>
+        /// <remarks>
+        /// Defaults to <see cref="bool.FalseString" />
+        /// </remarks>
+        public string FalseString
+        {
+            get { return this.falseString; }
+            set { this.falseString = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Formats the specified boolean value.
+        /// </summary>
+        /// <param name="value">The value to format.</param>
+        /// <returns>Formatted boolean value.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="value"/> is not of type <see cref="System.Boolean"/>.</exception>
+        public string Format(object value)
+        {
+            AssertUtils.ArgumentNotNull( value,"value" );
+            if(!(value is bool))
+            {
+                throw new ArgumentException( "BooleanFormatter can only be used to format instances of [System.Boolean]" );
+            }
+            return ((bool) value) ? this.trueString : this.falseString;
+        }
+
+        /// <summary>
+        /// Parses the specified boolean value according to settings of <see cref="TrueString"/> and <see cref="FalseString"/>
+        /// </summary>
+        /// <param name="value">The boolean value to parse.</param>
+        /// <returns>Parsed boolean value as a <see cref="System.Boolean"/>.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="value"/> does not match <see cref="TrueString"/> or <see cref="FalseString"/>.</exception>
+        public object Parse(string value)
+        {
+            if(!StringUtils.HasText( value ))
+            {
+                return false;
+            }
+
+            if ( 0 == string.Compare( value, this.trueString, this.ignoreCase ))
+            {
+                return true;
+            }
+            else if(0 == string.Compare( value,this.falseString,this.ignoreCase ))
+            {
+                return false;
+            }
+            else
+            {
+                throw new ArgumentException( string.Format("input value '{0}' is not recognized as a boolean", value) );
+            }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Globalization/Formatters/CurrencyFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/CurrencyFormatter.cs
new file mode 100644
index 00000000..a7e47d42
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/Formatters/CurrencyFormatter.cs
@@ -0,0 +1,209 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Globalization;
+
+using Spring.Util;
+
+namespace Spring.Globalization.Formatters
+{
+	/// <summary>
+	/// Implementation of <see cref="IFormatter"/> that can be used to
+	/// format and parse currency values.
+	/// </summary>
+	/// <remarks>
+	/// <para>
+	/// <c>CurrencyFormatter</c> uses currency related properties of the
+	/// <see cref="NumberFormatInfo"/> to format and parse currency values. 
+	/// </para>
+	/// <para>
+	/// If you use one of the constructors that accept culture as a parameter
+	/// to create an instance of <c>CurrencyFormatter</c>, default <c>NumberFormatInfo</c>
+	/// for the specified culture will be used.
+	/// </para>
+	/// <para>
+	/// You can also use properties exposed by the <c>CurrencyFormatter</c> in order
+	/// to override some of the default currency formatting parameters.
+	/// </para>
+	/// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CurrencyFormatter.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+    public class CurrencyFormatter : IFormatter
+	{
+        private NumberFormatInfo formatInfo;
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CurrencyFormatter"/> class
+        /// using default <see cref="NumberFormatInfo"/> for the current thread's culture.
+        /// </summary>
+        public CurrencyFormatter() : this(CultureInfo.CurrentCulture)
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CurrencyFormatter"/> class
+        /// using default <see cref="NumberFormatInfo"/> for the specified culture.
+        /// </summary>
+        /// <param name="cultureName">The culture name.</param>
+        public CurrencyFormatter(string cultureName) : this(CultureInfo.CreateSpecificCulture(cultureName))
+        {}
+
+        /// <summary>
+	    /// Initializes a new instance of the <see cref="CurrencyFormatter"/> class
+	    /// using default <see cref="NumberFormatInfo"/> for the specified culture.
+	    /// </summary>
+	    /// <param name="culture">The culture.</param>
+	    public CurrencyFormatter(CultureInfo culture)
+	    {
+	        formatInfo = culture.NumberFormat;
+	    }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CurrencyFormatter"/> class
+        /// using specified <see cref="NumberFormatInfo"/>.
+        /// </summary>
+        /// <param name="formatInfo">
+        /// The <see cref="NumberFormatInfo"/> instance that defines how 
+        /// currency values are formatted.
+        /// </param>
+        public CurrencyFormatter(NumberFormatInfo formatInfo)
+        {
+            this.formatInfo = formatInfo;
+        }
+
+	    #endregion
+
+	    #region Properties
+
+	    /// <summary>
+	    /// Gets or sets the currency decimal digits.
+	    /// </summary>
+	    /// <value>The currency decimal digits.</value>
+        /// <seealso cref="NumberFormatInfo.CurrencyDecimalDigits"/>
+        public int DecimalDigits
+	    {
+	        get { return formatInfo.CurrencyDecimalDigits; }
+	        set { formatInfo.CurrencyDecimalDigits = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the currency decimal separator.
+        /// </summary>
+	    /// <value>The currency decimal separator.</value>
+        /// <seealso cref="NumberFormatInfo.CurrencyDecimalSeparator"/>
+        public string DecimalSeparator
+	    {
+	        get { return formatInfo.CurrencyDecimalSeparator; }
+	        set { formatInfo.CurrencyDecimalSeparator = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the currency group sizes.
+        /// </summary>
+	    /// <value>The currency group sizes.</value>
+        /// <seealso cref="NumberFormatInfo.CurrencyGroupSizes"/>
+        public int[] GroupSizes
+	    {
+	        get { return formatInfo.CurrencyGroupSizes; }
+	        set { formatInfo.CurrencyGroupSizes = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the currency group separator.
+        /// </summary>
+	    /// <value>The currency group separator.</value>
+        /// <seealso cref="NumberFormatInfo.CurrencyGroupSeparator"/>
+        public string GroupSeparator
+	    {
+	        get { return formatInfo.CurrencyGroupSeparator; }
+	        set { formatInfo.CurrencyGroupSeparator = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the currency symbol.
+        /// </summary>
+	    /// <value>The currency symbol.</value>
+        /// <seealso cref="NumberFormatInfo.CurrencySymbol"/>
+        public string CurrencySymbol
+	    {
+	        get { return formatInfo.CurrencySymbol; }
+	        set { formatInfo.CurrencySymbol = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the currency negative pattern.
+        /// </summary>
+	    /// <value>The currency negative pattern.</value>
+        /// <seealso cref="NumberFormatInfo.CurrencyNegativePattern"/>
+        public int NegativePattern
+	    {
+	        get { return formatInfo.CurrencyNegativePattern; }
+	        set { formatInfo.CurrencyNegativePattern = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the currency positive pattern.
+        /// </summary>
+	    /// <value>The currency positive pattern.</value>
+        /// <seealso cref="NumberFormatInfo.CurrencyPositivePattern"/>
+        public int PositivePattern
+	    {
+	        get { return formatInfo.CurrencyPositivePattern; }
+	        set { formatInfo.CurrencyPositivePattern = value; }
+	    }
+
+	    #endregion
+
+	    /// <summary>
+	    /// Formats the specified currency value.
+	    /// </summary>
+	    /// <param name="value">The value to format.</param>
+	    /// <returns>Formatted currency <paramref name="value"/>.</returns>
+	    /// <exception cref="ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+	    /// <exception cref="ArgumentException">If <paramref name="value"/> is not a number.</exception>
+	    public string Format(object value)
+	    {
+            AssertUtils.ArgumentNotNull(value, "value");
+            if (!NumberUtils.IsNumber(value))
+            {
+                throw new ArgumentException("CurrencyFormatter can only be used to format numbers.");
+            }
+
+	        return String.Format(formatInfo, "{0:C}", value);
+	    }
+
+	    /// <summary>
+	    /// Parses the specified currency value.
+	    /// </summary>
+	    /// <param name="value">The currency value to parse.</param>
+	    /// <returns>Parsed currency value as a <see cref="Double"/>.</returns>
+        public object Parse(string value)
+	    {
+            if (!StringUtils.HasText(value))
+            {
+                return 0d;
+            }
+
+            return Double.Parse(value, NumberStyles.Currency, formatInfo);
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Core/Globalization/Formatters/DateTimeFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/DateTimeFormatter.cs
new file mode 100644
index 00000000..1ea2c588
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/Formatters/DateTimeFormatter.cs
@@ -0,0 +1,120 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Globalization;
+
+using Spring.Util;
+
+namespace Spring.Globalization.Formatters
+{
+	/// <summary>
+	/// Implementation of <see cref="IFormatter"/> that can be used to
+	/// format and parse <see cref="DateTime"/> values.
+	/// </summary>
+	/// <remarks>
+	/// <para>
+	/// <c>DateTimeFormatter</c> uses properties of the
+	/// <see cref="DateTimeFormatInfo"/> to format and parse <see cref="DateTime"/> values. 
+	/// </para>
+	/// <para>
+	/// If you use one of the constructors that accept culture as a parameter
+	/// to create an instance of <c>DateTimeFormatter</c>, default <c>DateTimeFormatInfo</c>
+	/// for the specified culture will be used.
+	/// </para>
+	/// <para>
+	/// You can also use properties exposed by the <c>DateTimeFormatter</c> in order
+	/// to override some of the default formatting parameters.
+	/// </para>
+	/// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DateTimeFormatter.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+    public class DateTimeFormatter : IFormatter
+	{
+        private DateTimeFormatInfo formatInfo;
+        private string format;
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DateTimeFormatter"/> class
+        /// using default <see cref="DateTimeFormatInfo"/> for the current thread's culture.
+        /// </summary>
+        /// <param name="format">Date/time format string.</param>
+        public DateTimeFormatter(string format) : this(format, CultureInfo.CurrentCulture)
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DateTimeFormatter"/> class
+        /// using default <see cref="DateTimeFormatInfo"/> for the specified culture.
+        /// </summary>
+        /// <param name="format">Date/time format string.</param>
+        /// <param name="cultureName">The culture name.</param>
+        public DateTimeFormatter(string format, string cultureName) : this(format, CultureInfo.CreateSpecificCulture(cultureName))
+        {}
+
+        /// <summary>
+	    /// Initializes a new instance of the <see cref="DateTimeFormatter"/> class
+	    /// using default <see cref="DateTimeFormatInfo"/> for the specified culture.
+	    /// </summary>
+	    /// <param name="format">Date/time format string.</param>
+	    /// <param name="culture">The culture.</param>
+	    public DateTimeFormatter(string format, CultureInfo culture)
+	    {
+            this.format = format;
+	        this.formatInfo = culture.DateTimeFormat;
+	    }
+
+	    #endregion
+
+	    /// <summary>
+	    /// Formats the specified <see cref="DateTime"/> value.
+	    /// </summary>
+	    /// <param name="value">The value to format.</param>
+	    /// <returns>Formatted <see cref="DateTime"/> value.</returns>
+	    /// <exception cref="ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+	    /// <exception cref="ArgumentException">If <paramref name="value"/> is not an instance of <see cref="DateTime"/>.</exception>
+	    public string Format(object value)
+	    {
+            AssertUtils.ArgumentNotNull(value, "value");
+            if (!(value is DateTime))
+            {
+                throw new ArgumentException("DateTimeFormatter can only be used to format instances of [System.DateTime].");
+            }
+
+	        return ((DateTime) value).ToString(format, formatInfo);
+	    }
+
+	    /// <summary>
+	    /// Parses the specified value.
+	    /// </summary>
+	    /// <param name="value">The string to parse.</param>
+	    /// <returns>Parsed <see cref="DateTime"/> value.</returns>
+        public object Parse(string value)
+	    {
+            if (!StringUtils.HasText(value))
+            {
+                return DateTime.MinValue;
+            }
+
+            return DateTime.ParseExact(value, format, formatInfo, DateTimeStyles.AllowWhiteSpaces);
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Core/Globalization/Formatters/FilteringFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/FilteringFormatter.cs
new file mode 100644
index 00000000..e54af5f1
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/Formatters/FilteringFormatter.cs
@@ -0,0 +1,101 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Globalization.Formatters
+{
+    /// <summary>
+    /// Provides base functionality for filtering values before they actually get parsed/formatted.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: FilteringFormatter.cs,v 1.1 2008/03/20 13:19:47 oakinger Exp $</version>
+    public abstract class FilteringFormatter : IFormatter
+    {
+        private readonly IFormatter _underlyingFormatter;
+
+        ///<summary>
+        /// Creates a new instance of this FilteringFormatter.
+        ///</summary>
+        ///<param name="underlyingFormatter">an optional underlying formatter</param>
+        /// <remarks>
+        /// If no underlying formatter is specified, the values 
+        /// get passed through "as-is" after being filtered
+        /// </remarks>
+        public FilteringFormatter(IFormatter underlyingFormatter)
+        {
+            _underlyingFormatter = underlyingFormatter;
+        }
+
+        /// <summary>
+        /// Parses the specified value.
+        /// </summary>
+        /// <param name="value">The value to parse.</param>
+        /// <returns>Parsed <paramref name="value"/>.</returns>
+        public object Parse(string value)
+        {
+            value = FilterValueToParse(value);
+
+            if (_underlyingFormatter != null)
+            {
+                return _underlyingFormatter.Parse(value);
+            }
+
+            return value;
+        }
+
+        /// <summary>
+        /// Formats the specified value.
+        /// </summary>
+        /// <param name="value">The value to format.</param>
+        /// <returns>Formatted <paramref name="value"/>.</returns>
+        public string Format(object value)
+        {
+            value = FilterValueToFormat(value);
+
+            if (_underlyingFormatter != null)
+            {
+                return _underlyingFormatter.Format(value);
+            }
+
+            return (value != null) ? value.ToString() : null;
+        }
+
+        /// <summary>
+        /// Allows to rewrite a value before it gets parsed by the underlying formatter
+        /// </summary>
+        protected virtual string FilterValueToParse(string value)
+        {
+            return value;
+        }
+
+        /// <summary>
+        /// Allows to change a value before it gets formatted by the underlying formatter
+        /// </summary>
+        protected virtual object FilterValueToFormat(object value)
+        {
+            return value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Globalization/Formatters/FloatFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/FloatFormatter.cs
new file mode 100644
index 00000000..d55df1b6
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/Formatters/FloatFormatter.cs
@@ -0,0 +1,131 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Globalization;
+
+using Spring.Util;
+
+namespace Spring.Globalization.Formatters
+{
+	/// <summary>
+	/// Implementation of <see cref="IFormatter"/> that can be used to
+	/// format and parse floating point numbers.
+	/// </summary>
+	/// <remarks>
+	/// <para>
+	/// This formatter allows you to format and parse numbers that conform 
+	/// to <see cref="NumberStyles.Float"/> number style (leading and trailing 
+	/// white space, leading sign, decimal point, exponent).
+	/// </para>
+	/// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: FloatFormatter.cs,v 1.4 2006/04/09 07:18:47 markpollack Exp $</version>
+    public class FloatFormatter : IFormatter
+	{
+        /// <summary>
+        /// Default format string.
+        /// </summary>
+        public const string DefaultFormat = "{0:F}";
+
+        private string format;
+		private NumberFormatInfo numberInfo;
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FloatFormatter"/> class,
+        /// using default format string of '{0:F}' and current thread's culture.
+        /// </summary>
+        public FloatFormatter() : this(DefaultFormat, CultureInfo.CurrentCulture)
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FloatFormatter"/> class,
+        /// using specified format string and current thread's culture.
+        /// </summary>
+        /// <param name="format">The format string.</param>
+        public FloatFormatter(string format) : this(format, CultureInfo.CurrentCulture)
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FloatFormatter"/> class,
+        /// using default format string of '{0:F}' and specified culture.
+        /// </summary>
+        /// <param name="culture">The culture.</param>
+        public FloatFormatter(CultureInfo culture) : this(DefaultFormat, culture)
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FloatFormatter"/> class,
+        /// using specified format string and current thread's culture.
+        /// </summary>
+        /// <param name="format">The format string.</param>
+        /// <param name="cultureName">The culture name.</param>
+        public FloatFormatter(string format, string cultureName) : this(format, CultureInfo.CreateSpecificCulture(cultureName))
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FloatFormatter"/> class,
+        /// using specified format string and culture.
+        /// </summary>
+        /// <param name="format">The format string.</param>
+        /// <param name="culture">The culture.</param>
+        public FloatFormatter(string format, CultureInfo culture)
+        {
+            this.format = format;
+            this.numberInfo = culture.NumberFormat;
+        }
+
+	    #endregion
+
+        /// <summary>
+        /// Formats the specified float value.
+        /// </summary>
+        /// <param name="value">The value to format.</param>
+        /// <returns>Formatted floating point number.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="value"/> is not a number.</exception>
+        public string Format(object value)
+	    {
+            AssertUtils.ArgumentNotNull(value, "value");
+            if (!NumberUtils.IsNumber(value))
+            {
+                throw new ArgumentException("FloatFormatter can only be used to format numbers.");
+            }
+
+	        return String.Format(numberInfo, format, value);
+	    }
+
+        /// <summary>
+        /// Parses the specified float value.
+        /// </summary>
+        /// <param name="value">The float value to parse.</param>
+        /// <returns>Parsed float value as a <see cref="Double"/>.</returns>
+        public object Parse(string value)
+	    {
+            if (!StringUtils.HasText(value))
+            {
+                return 0d;
+            }
+	        return Double.Parse(value, NumberStyles.Float, numberInfo);
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Core/Globalization/Formatters/HasTextFilteringFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/HasTextFilteringFormatter.cs
new file mode 100644
index 00000000..296bb688
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/Formatters/HasTextFilteringFormatter.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Globalization.Formatters
+{
+    /// <summary>
+    /// Replaces input strings with a given default value, 
+    /// if they are null or contain whitespaces only,
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: HasTextFilteringFormatter.cs,v 1.1 2008/03/20 13:19:47 oakinger Exp $</version>
+    public class HasTextFilteringFormatter : FilteringFormatter
+    {
+        private readonly string _defaultValue;
+
+        ///<summary>
+        /// Creates a new instance of this HasTextFilteringFormatter using null as default value.
+        ///</summary>
+        ///<param name="underlyingFormatter">an optional underlying formatter</param>
+        /// <remarks>
+        /// If no underlying formatter is specified, the values 
+        /// get passed through "as-is" after being filtered
+        /// </remarks>
+        public HasTextFilteringFormatter(IFormatter underlyingFormatter) 
+            : this(null, underlyingFormatter)
+        {
+        }
+
+        ///<summary>
+        /// Creates a new instance of this HasTextFilteringFormatter.
+        ///</summary>
+        /// <param name="defaultValue">the default value to be returned, if input text doesn't contain text</param>
+        ///<param name="underlyingFormatter">an optional underlying formatter</param>
+        /// <remarks>
+        /// If no underlying formatter is specified, the values 
+        /// get passed through "as-is" after being filtered
+        /// </remarks>
+        public HasTextFilteringFormatter(string defaultValue, IFormatter underlyingFormatter)
+            : base(underlyingFormatter)
+        {
+            _defaultValue = defaultValue;
+        }
+
+        /// <summary>
+        /// If value contains no text, it will be replaced by a defaultValue.
+        /// </summary>
+        protected override string FilterValueToParse(string value)
+        {
+            if (!StringUtils.HasText(value))
+            {
+                value = _defaultValue;
+            }
+            return value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Globalization/Formatters/IntegerFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/IntegerFormatter.cs
new file mode 100644
index 00000000..12a91aff
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/Formatters/IntegerFormatter.cs
@@ -0,0 +1,97 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Globalization;
+
+using Spring.Util;
+
+namespace Spring.Globalization.Formatters
+{
+	/// <summary>
+	/// Implementation of <see cref="IFormatter"/> that can be used to
+	/// format and parse integer numbers.
+	/// </summary>
+	/// <remarks>
+	/// <para>
+	/// This formatter allows you to format and parse numbers that conform 
+	/// to <see cref="NumberStyles.Integer"/> number style (leading and trailing 
+	/// white space, leading sign).
+	/// </para>
+	/// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IntegerFormatter.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+    public class IntegerFormatter : IFormatter
+	{
+        private string format = "{0:D}";
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IntegerFormatter"/> class,
+        /// using default format string of '{0:D}'.
+        /// </summary>
+        public IntegerFormatter()
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IntegerFormatter"/> class,
+        /// using specified format string.
+        /// </summary>
+        public IntegerFormatter(string format)
+        {
+            this.format = format;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Formats the specified integer value.
+        /// </summary>
+        /// <param name="value">The value to format.</param>
+        /// <returns>Formatted integer number.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="value"/> is not an integer number.</exception>
+        public string Format(object value)
+	    {
+            AssertUtils.ArgumentNotNull(value, "value");
+            if (!NumberUtils.IsInteger(value))
+            {
+                throw new ArgumentException("IntegerFormatter can only be used to format integer numbers.");
+            }
+
+	        return String.Format(format, value);
+	    }
+
+        /// <summary>
+        /// Parses the specified integer value.
+        /// </summary>
+        /// <param name="value">The integer value to parse.</param>
+        /// <returns>Parsed number value as a <see cref="Int32"/>.</returns>
+        public object Parse(string value)
+	    {
+            if (!StringUtils.HasText(value))
+            {
+                return 0;
+            }
+	        return Int32.Parse(value, NumberStyles.Integer);
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Core/Globalization/Formatters/NullFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/NullFormatter.cs
new file mode 100644
index 00000000..b11c5c52
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/Formatters/NullFormatter.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Globalization.Formatters
+{
+    /// <summary>
+    /// Implementation of <see cref="IFormatter"/> that simply calls <see cref="object.ToString()"/>.
+    /// </summary>
+    /// <remarks>
+    /// This formatter is a no-operation implementation.
+    /// </remarks>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: NullFormatter.cs,v 1.1 2007/05/19 00:23:18 oakinger Exp $</version>
+    public class NullFormatter : IFormatter
+    {
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NullFormatter"/> class.
+        /// </summary>
+        public NullFormatter()
+        {
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Converts the passed value to a string by calling <see cref="Object.ToString()"/>.
+        /// </summary>
+        /// <param name="value">The value to convert.</param>
+        /// <returns>to string converted value.</returns>
+        public string Format(object value)
+        {
+            return value != null ? value.ToString() : null;
+        }
+
+        /// <summary>
+        /// Returns the passed string "as is".
+        /// </summary>
+        /// <param name="value">The value to return.</param>
+        /// <returns>The value passed into this method.</returns>
+        public object Parse(string value)
+        {
+            return value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Globalization/Formatters/NumberFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/NumberFormatter.cs
new file mode 100644
index 00000000..6fd0f2b6
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/Formatters/NumberFormatter.cs
@@ -0,0 +1,199 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Globalization;
+
+using Spring.Util;
+
+namespace Spring.Globalization.Formatters
+{
+	/// <summary>
+	/// Implementation of <see cref="IFormatter"/> that can be used to
+	/// format and parse numbers.
+	/// </summary>
+	/// <remarks>
+	/// <para>
+	/// <c>NumberFormatter</c> uses number-related properties of the
+	/// <see cref="NumberFormatInfo"/> to format and parse numbers. 
+	/// </para>
+	/// <para>
+	/// This formatter works with both integer and decimal numbers and allows
+	/// you to format and parse numbers that conform to <see cref="NumberStyles.Number"/>
+	/// number style (leading and trailing white space and/or sign, thousands separator,
+	/// decimal point)
+	/// </para>
+	/// <para>
+	/// If you use one of the constructors that accept culture as a parameter
+	/// to create an instance of <c>NumberFormatter</c>, default <c>NumberFormatInfo</c>
+	/// for the specified culture will be used.
+	/// </para>
+	/// <para>
+	/// You can also use properties exposed by the <c>NumberFormatter</c> in order
+	/// to override some of the default number formatting parameters.
+	/// </para>
+	/// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: NumberFormatter.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+    public class NumberFormatter : IFormatter
+	{
+        private NumberFormatInfo formatInfo;
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NumberFormatter"/> class
+        /// using default <see cref="NumberFormatInfo"/> for the current thread's culture.
+        /// </summary>
+        public NumberFormatter() : this(CultureInfo.CurrentCulture)
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NumberFormatter"/> class
+        /// using default <see cref="NumberFormatInfo"/> for the specified culture.
+        /// </summary>
+        /// <param name="cultureName">The culture name.</param>
+        public NumberFormatter(string cultureName) : this(CultureInfo.CreateSpecificCulture(cultureName))
+        {}
+
+        /// <summary>
+	    /// Initializes a new instance of the <see cref="NumberFormatter"/> class
+	    /// using default <see cref="NumberFormatInfo"/> for the specified culture.
+	    /// </summary>
+	    /// <param name="culture">The culture.</param>
+	    public NumberFormatter(CultureInfo culture)
+	    {
+	        formatInfo = culture.NumberFormat;
+	    }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NumberFormatter"/> class
+        /// using specified <see cref="NumberFormatInfo"/>.
+        /// </summary>
+        /// <param name="formatInfo">
+        /// The <see cref="NumberFormatInfo"/> instance that defines how 
+        /// numbers are formatted and parsed.
+        /// </param>
+        public NumberFormatter(NumberFormatInfo formatInfo)
+        {
+            this.formatInfo = formatInfo;
+        }
+
+	    #endregion
+
+	    #region Properties
+
+	    /// <summary>
+	    /// Gets or sets the number of decimal digits.
+	    /// </summary>
+	    /// <value>The number of decimal digits.</value>
+        /// <seealso cref="NumberFormatInfo.NumberDecimalDigits"/>
+        public int DecimalDigits
+	    {
+	        get { return formatInfo.NumberDecimalDigits; }
+	        set { formatInfo.NumberDecimalDigits = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the decimal separator.
+        /// </summary>
+	    /// <value>The decimal separator.</value>
+        /// <seealso cref="NumberFormatInfo.NumberDecimalSeparator"/>
+        public string DecimalSeparator
+	    {
+	        get { return formatInfo.NumberDecimalSeparator; }
+	        set { formatInfo.NumberDecimalSeparator = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the number group sizes.
+        /// </summary>
+	    /// <value>The number group sizes.</value>
+        /// <seealso cref="NumberFormatInfo.NumberGroupSizes"/>
+        public int[] GroupSizes
+	    {
+	        get { return formatInfo.NumberGroupSizes; }
+	        set { formatInfo.NumberGroupSizes = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the number group separator.
+        /// </summary>
+	    /// <value>The number group separator.</value>
+        /// <seealso cref="NumberFormatInfo.NumberGroupSeparator"/>
+        public string GroupSeparator
+	    {
+	        get { return formatInfo.NumberGroupSeparator; }
+	        set { formatInfo.NumberGroupSeparator = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the negative pattern.
+        /// </summary>
+	    /// <value>The number negative pattern.</value>
+        /// <seealso cref="NumberFormatInfo.NumberNegativePattern"/>
+        public int NegativePattern
+	    {
+	        get { return formatInfo.NumberNegativePattern; }
+	        set { formatInfo.NumberNegativePattern = value; }
+	    }
+
+	    #endregion
+
+        /// <summary>
+        /// Formats the specified number value.
+        /// </summary>
+        /// <param name="value">The value to format.</param>
+        /// <returns>Formatted number <paramref name="value"/>.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="value"/> is not a number.</exception>
+        public string Format(object value)
+	    {
+            AssertUtils.ArgumentNotNull(value, "value");
+            if (!NumberUtils.IsNumber(value))
+            {
+                throw new ArgumentException("NumberFormatter can only be used to format numbers.");
+            }
+
+	        return String.Format(formatInfo, "{0:N}", value);
+	    }
+
+        /// <summary>
+        /// Parses the specified number value.
+        /// </summary>
+        /// <param name="value">The number value to parse.</param>
+        /// <returns>Parsed number value as a <see cref="Double"/>.</returns>
+        public object Parse(string value)
+	    {
+            if (!StringUtils.HasText(value))
+            {
+                return 0d;
+            }
+
+            NumberStyles numberStyle = NumberStyles.Number;
+            if (formatInfo.NumberNegativePattern == 0)
+            {
+                numberStyle |= NumberStyles.AllowParentheses;
+            }
+
+	        return Double.Parse(value, numberStyle, formatInfo);
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Core/Globalization/Formatters/PercentFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/PercentFormatter.cs
new file mode 100644
index 00000000..6c678c9a
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/Formatters/PercentFormatter.cs
@@ -0,0 +1,233 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Globalization;
+
+using Spring.Util;
+
+namespace Spring.Globalization.Formatters
+{
+	/// <summary>
+	/// Implementation of <see cref="IFormatter"/> that can be used to
+	/// format and parse numbers.
+	/// </summary>
+	/// <remarks>
+	/// <para>
+	/// <c>PercentFormatter</c> uses percent-related properties of the
+	/// <see cref="NumberFormatInfo"/> to format and parse percentages. 
+	/// </para>
+	/// <para>
+	/// If you use one of the constructors that accept culture as a parameter
+	/// to create an instance of <c>PercentFormatter</c>, default <c>NumberFormatInfo</c>
+	/// for the specified culture will be used.
+	/// </para>
+	/// <para>
+	/// You can also use properties exposed by the <c>PercentFormatter</c> in order
+	/// to override some of the default number formatting parameters.
+	/// </para>
+	/// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: PercentFormatter.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+    public class PercentFormatter : IFormatter
+	{
+        private static int[] positivePatterns = new int[] {3, 1, 0};
+        private static int[] negativePatterns = new int[] {8, 5, 1};
+
+        private NumberFormatInfo formatInfo;
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PercentFormatter"/> class
+        /// using default <see cref="NumberFormatInfo"/> for the current thread's culture.
+        /// </summary>
+        public PercentFormatter() : this(CultureInfo.CurrentCulture)
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PercentFormatter"/> class
+        /// using default <see cref="NumberFormatInfo"/> for the specified culture.
+        /// </summary>
+        /// <param name="cultureName">The culture name.</param>
+        public PercentFormatter(string cultureName) : this(CultureInfo.CreateSpecificCulture(cultureName))
+        {}
+
+        /// <summary>
+	    /// Initializes a new instance of the <see cref="PercentFormatter"/> class
+	    /// using default <see cref="NumberFormatInfo"/> for the specified culture.
+	    /// </summary>
+	    /// <param name="culture">The culture.</param>
+	    public PercentFormatter(CultureInfo culture)
+	    {
+	        formatInfo = culture.NumberFormat;
+	    }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PercentFormatter"/> class
+        /// using specified <see cref="NumberFormatInfo"/>.
+        /// </summary>
+        /// <param name="formatInfo">
+        /// The <see cref="NumberFormatInfo"/> instance that defines how 
+        /// numbers are formatted and parsed.
+        /// </param>
+        public PercentFormatter(NumberFormatInfo formatInfo)
+        {
+            this.formatInfo = formatInfo;
+        }
+
+	    #endregion
+
+	    #region Properties
+
+	    /// <summary>
+	    /// Gets or sets the number of decimal digits.
+	    /// </summary>
+	    /// <value>The number of decimal digits.</value>
+        /// <seealso cref="NumberFormatInfo.PercentDecimalDigits"/>
+        public int DecimalDigits
+	    {
+	        get { return formatInfo.PercentDecimalDigits; }
+	        set { formatInfo.PercentDecimalDigits = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the decimal separator.
+        /// </summary>
+	    /// <value>The decimal separator.</value>
+        /// <seealso cref="NumberFormatInfo.PercentDecimalSeparator"/>
+        public string DecimalSeparator
+	    {
+	        get { return formatInfo.PercentDecimalSeparator; }
+	        set { formatInfo.PercentDecimalSeparator = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the percent group sizes.
+        /// </summary>
+	    /// <value>The percent group sizes.</value>
+        /// <seealso cref="NumberFormatInfo.PercentGroupSizes"/>
+        public int[] GroupSizes
+	    {
+	        get { return formatInfo.PercentGroupSizes; }
+	        set { formatInfo.PercentGroupSizes = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the percent group separator.
+        /// </summary>
+	    /// <value>The percent group separator.</value>
+        /// <seealso cref="NumberFormatInfo.PercentGroupSeparator"/>
+        public string GroupSeparator
+	    {
+	        get { return formatInfo.PercentGroupSeparator; }
+	        set { formatInfo.PercentGroupSeparator = value; }
+	    }
+
+	    /// <summary>
+	    /// Gets or sets the negative pattern.
+        /// </summary>
+	    /// <value>The percent negative pattern.</value>
+        /// <seealso cref="NumberFormatInfo.PercentNegativePattern"/>
+        public int NegativePattern
+	    {
+	        get { return formatInfo.PercentNegativePattern; }
+	        set { formatInfo.PercentNegativePattern = value; }
+	    }
+
+        /// <summary>
+        /// Gets or sets the positive pattern.
+        /// </summary>
+        /// <value>The percent positive pattern.</value>
+        /// <seealso cref="NumberFormatInfo.PercentPositivePattern"/>
+        public int PositivePattern
+        {
+            get { return formatInfo.PercentPositivePattern; }
+            set { formatInfo.PercentPositivePattern = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the percent symbol.
+        /// </summary>
+        /// <value>The percent symbol.</value>
+        /// <seealso cref="NumberFormatInfo.PercentSymbol"/>
+        public string PercentSymbol
+	    {
+	        get { return formatInfo.PercentSymbol; }
+	        set { formatInfo.PercentSymbol = value; }
+	    }
+
+        /// <summary>
+        /// Gets or sets the per mille symbol.
+        /// </summary>
+        /// <value>The per mille symbol.</value>
+        /// <seealso cref="NumberFormatInfo.PerMilleSymbol"/>
+        public string PerMilleSymbol
+	    {
+	        get { return formatInfo.PerMilleSymbol; }
+	        set { formatInfo.PerMilleSymbol = value; }
+	    }
+
+	    #endregion
+
+        /// <summary>
+        /// Formats the specified percentage value.
+        /// </summary>
+        /// <param name="value">The value to format.</param>
+        /// <returns>Formatted percentage.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="value"/> is not a number.</exception>
+        public string Format(object value)
+	    {
+            AssertUtils.ArgumentNotNull(value, "value");
+            if (!NumberUtils.IsNumber(value))
+            {
+                throw new ArgumentException("PercentFormatter can only be used to format numbers.");
+            }
+
+	        return String.Format(formatInfo, "{0:P}", value);
+	    }
+
+        /// <summary>
+        /// Parses the specified percentage value.
+        /// </summary>
+        /// <param name="value">The percentage value to parse.</param>
+        /// <returns>Parsed percentage value as a <see cref="Double"/>.</returns>
+        public object Parse(string value)
+	    {
+            if (!StringUtils.HasText(value))
+            {
+                return 0d;
+            }
+
+            // there is no percentage parser in .NET, so we use currency parser to achieve the goal
+            NumberFormatInfo fi = (NumberFormatInfo) formatInfo.Clone();
+            fi.CurrencyDecimalDigits = formatInfo.PercentDecimalDigits;
+            fi.CurrencyDecimalSeparator = formatInfo.PercentDecimalSeparator;
+            fi.CurrencyGroupSeparator = formatInfo.PercentGroupSeparator;
+            fi.CurrencyGroupSizes = formatInfo.PercentGroupSizes;
+            fi.CurrencyNegativePattern = negativePatterns[formatInfo.PercentNegativePattern];
+            fi.CurrencyPositivePattern = positivePatterns[formatInfo.PercentPositivePattern];
+            fi.CurrencySymbol = formatInfo.PercentSymbol;
+
+	        return Double.Parse(value, NumberStyles.Currency, fi) / 100;
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Core/Globalization/ICultureResolver.cs b/src/Spring/Spring.Core/Globalization/ICultureResolver.cs
new file mode 100644
index 00000000..d86facb2
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/ICultureResolver.cs
@@ -0,0 +1,71 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Globalization;
+
+#endregion
+
+namespace Spring.Globalization
+{
+    /// <summary>
+    /// Strategy interface for <see cref="System.Globalization.CultureInfo"/>
+    /// resolution.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ICultureResolver.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+    public interface ICultureResolver
+    {
+        /// <summary>
+        /// Resolves the <see cref="System.Globalization.CultureInfo"/>
+        /// from some context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The 'context' is determined by the appropriate implementation class.
+        /// An example of such a context might be a thread local bound
+        /// <see cref="System.Globalization.CultureInfo"/>, or a
+        /// <see cref="System.Globalization.CultureInfo"/> sourced from an HTTP
+        /// session.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// The <see cref="System.Globalization.CultureInfo"/> that should be used
+        /// by the caller.
+        ///  </returns>
+        CultureInfo ResolveCulture();
+
+        /// <summary>
+        /// Sets the <see cref="System.Globalization.CultureInfo"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an optional operation and does not need to be implemented
+        /// such that it actually does anything useful (i.e. it can be a no-op).
+        /// </p>
+        /// </remarks>
+        /// <param name="culture">
+        /// The new <see cref="System.Globalization.CultureInfo"/> or
+        /// <cref lang="null"/> to clear the current <see cref="System.Globalization.CultureInfo"/>.
+        /// </param>
+        void SetCulture(CultureInfo culture);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Globalization/IFormatter.cs b/src/Spring/Spring.Core/Globalization/IFormatter.cs
new file mode 100644
index 00000000..a51a0eec
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/IFormatter.cs
@@ -0,0 +1,51 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+namespace Spring.Globalization
+{
+    /// <summary>
+    /// Interface that should be implemented by all formatters.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Formatters assume that source value is a string, and make no assumptions
+    /// about the target value's type, which means that <c>Parse</c> method can return
+    /// object of any type. 
+    /// </para>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IFormatter.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+    public interface IFormatter
+    {
+        /// <summary>
+        /// Formats the specified value.
+        /// </summary>
+        /// <param name="value">The value to format.</param>
+        /// <returns>Formatted <paramref name="value"/>.</returns>
+        string Format(object value);
+
+        /// <summary>
+        /// Parses the specified value.
+        /// </summary>
+        /// <param name="value">The value to parse.</param>
+        /// <returns>Parsed <paramref name="value"/>.</returns>
+        object Parse(string value);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Globalization/ILocalizer.cs b/src/Spring/Spring.Core/Globalization/ILocalizer.cs
new file mode 100644
index 00000000..7e41875a
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/ILocalizer.cs
@@ -0,0 +1,61 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Globalization;
+
+using Spring.Context;
+
+namespace Spring.Globalization
+{
+    /// <summary>
+    /// Defines an interface that localizers have to implement.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Localizers are used to automatically apply resources to object's members
+    /// using reflection.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ILocalizer.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+    public interface ILocalizer
+    {
+        /// <summary>
+        /// Gets or sets the resource cache instance.
+        /// </summary>
+        /// <value>The resource cache instance.</value>
+        IResourceCache ResourceCache { get; set; }
+        
+        /// <summary>
+        /// Applies resources of the specified culture to the specified target object.
+        /// </summary>
+        /// <param name="target">Target object to apply resources to.</param>
+        /// <param name="messageSource"><see cref="IMessageSource"/> instance to retrieve resources from.</param>
+        /// <param name="culture">Resource culture to use for resource lookup.</param>
+        void ApplyResources(object target, IMessageSource messageSource, CultureInfo culture);
+
+        /// <summary>
+        /// Applies resources to the specified target object, using current thread's culture to resolve resources.
+        /// </summary>
+        /// <param name="target">Target object to apply resources to.</param>
+        /// <param name="messageSource"><see cref="IMessageSource"/> instance to retrieve resources from.</param>
+        void ApplyResources(object target, IMessageSource messageSource);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Globalization/IResourceCache.cs b/src/Spring/Spring.Core/Globalization/IResourceCache.cs
new file mode 100644
index 00000000..5a171804
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/IResourceCache.cs
@@ -0,0 +1,50 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Globalization;
+
+namespace Spring.Globalization
+{
+    /// <summary>
+    /// Defines an interface that resource cache adapters have to implement.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IResourceCache.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+    public interface IResourceCache
+    {
+        /// <summary>
+        /// Gets the list of resources from cache.
+        /// </summary>
+        /// <param name="target">Target to get a list of resources for.</param>
+        /// <param name="culture">Resource culture.</param>
+        /// <returns>A list of cached resources for the specified target object and culture.</returns>
+        IList GetResources(object target, CultureInfo culture);
+
+        /// <summary>
+        /// Puts the list of resources in the cache.
+        /// </summary>
+        /// <param name="target">Target to cache a list of resources for.</param>
+        /// <param name="culture">Resource culture.</param>
+        /// <param name="resources">A list of resources to cache.</param>
+        /// <returns>A list of cached resources for the specified target object and culture.</returns>
+        void PutResources(object target, CultureInfo culture, IList resources);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Globalization/Localizers/ResourceSetLocalizer.cs b/src/Spring/Spring.Core/Globalization/Localizers/ResourceSetLocalizer.cs
new file mode 100644
index 00000000..f1e13f4c
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/Localizers/ResourceSetLocalizer.cs
@@ -0,0 +1,112 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Globalization;
+using System.Resources;
+using Common.Logging;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Expressions;
+
+namespace Spring.Globalization.Localizers
+{
+    /// <summary>
+    /// Loads a list of resources that should be applied from the .NET <see cref="ResourceSet"/>.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This <see cref="ILocalizer"/> implementation will iterate over all resource managers 
+    /// within the message source and return a list of all the resources whose name starts with '$this'.
+    /// </p>
+    /// <p>
+    /// All other resources will be ignored, but you can retrieve them by calling one of 
+    /// <c>GetMessage</c> methods on the message source directly.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ResourceSetLocalizer.cs,v 1.11 2007/07/24 17:26:25 oakinger Exp $</version>
+    public class ResourceSetLocalizer : AbstractLocalizer
+    {
+        private static readonly ILog log = LogManager.GetLogger(typeof(ResourceSetLocalizer));
+
+        private static readonly IList ignoreList =
+            new string[] {"$this.DefaultModifiers", "$this.TrayAutoArrange", "$this.TrayLargeIcon"};
+
+        /// <summary>
+        /// Loads resources from the storage and creates a list of <see cref="Resource"/> instances that should be applied to the target.
+        /// </summary>
+        /// <remarks>
+        /// This feature is not currently supported on version 1.0 of the .NET platform.
+        /// </remarks>
+        /// <param name="target">Target to get a list of resources for.</param>
+        /// <param name="messageSource"><see cref="IMessageSource"/> instance to retrieve resources from.</param>
+        /// <param name="culture">Resource locale.</param>
+        /// <returns>A list of resources to apply.</returns>
+        protected override IList LoadResources(object target, IMessageSource messageSource, CultureInfo culture)
+        {
+#if ! NET_1_0
+            IList resources;
+            resources = new ArrayList();
+
+            if (messageSource is ResourceSetMessageSource)
+            {
+                for (int i = 0; i < ((ResourceSetMessageSource) messageSource).ResourceManagers.Count; i++)
+                {
+                    ResourceManager rm = ((ResourceSetMessageSource) messageSource).ResourceManagers[i] as ResourceManager;
+                    ResourceSet invariantResources = null;
+                    try
+                    {
+                        invariantResources = rm.GetResourceSet(CultureInfo.InvariantCulture, true, true);
+                    }
+                    catch (MissingManifestResourceException mmrex)
+                    {
+                        // ignore but log missing ResourceSet
+                        log.Debug("No ResourceSet available for invariant culture", mmrex);
+                    }
+
+                    if (invariantResources != null)
+                    {
+                        foreach (DictionaryEntry resource in invariantResources)
+                        {
+                            string resourceName = (string)resource.Key;
+                            if (resourceName.StartsWith("$this") && !ignoreList.Contains(resourceName))
+                            {
+                                // redirect resource resolution if necessary
+                                object resourceValue = rm.GetObject(resourceName, culture);
+                                if (resourceValue is String && ((String)resourceValue).StartsWith("$messageSource"))
+                                {
+                                    resourceValue = messageSource.GetResourceObject(((String)resourceValue).Substring(15), culture);
+                                }
+                                resources.Add(new Resource(Expression.ParsePrimary(resourceName.Substring(6)), resourceValue));
+                            }
+                        }
+                    }
+                }
+            }
+            return resources;
+#else
+            throw new NotSupportedException("Operation not supported in .NET 1.0 Release.");
+#endif 
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Globalization/NullResourceCache.cs b/src/Spring/Spring.Core/Globalization/NullResourceCache.cs
new file mode 100644
index 00000000..d7f58477
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/NullResourceCache.cs
@@ -0,0 +1,50 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+namespace Spring.Globalization
+{
+    /// <summary>
+    /// Resource cache implementation that doesn't cache resources.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: NullResourceCache.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+    public class NullResourceCache : AbstractResourceCache
+    {
+        /// <summary>
+        /// Gets the list of resources from cache.
+        /// </summary>
+        /// <param name="cacheKey">Cache key to use for lookup.</param>
+        /// <returns>Always returns <c>null</c>.</returns>
+        protected override IList GetResources(string cacheKey)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Puts the list of resources in the cache.
+        /// </summary>
+        /// <param name="cacheKey">Cache key to use for the specified resources.</param>
+        /// <param name="resources">A list of resources to cache.</param>
+        protected override void PutResources(string cacheKey, IList resources)
+        {}
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Globalization/Resolvers/DefaultCultureResolver.cs b/src/Spring/Spring.Core/Globalization/Resolvers/DefaultCultureResolver.cs
new file mode 100644
index 00000000..df2a064c
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/Resolvers/DefaultCultureResolver.cs
@@ -0,0 +1,123 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Globalization;
+using System.Threading;
+
+#endregion
+
+namespace Spring.Globalization.Resolvers
+{
+    /// <summary>
+    /// <see cref="ICultureResolver"/> implementation
+    /// that simply returns the <see cref="System.Globalization.CultureInfo"/>
+    /// value of the
+    /// <see cref="DefaultCulture"/>
+    /// property (if said property value is not <cref lang="null"/>), or the
+    /// <see cref="System.Globalization.CultureInfo"/> of the current thread if it is
+    /// <cref lang="null"/>.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DefaultCultureResolver.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+    public class DefaultCultureResolver : ICultureResolver
+    {
+        private CultureInfo defaultCulture;
+
+        /// <summary>
+        /// The default <see cref="System.Globalization.CultureInfo"/>.
+        /// </summary>
+        /// <value>
+        /// The default <see cref="System.Globalization.CultureInfo"/>.
+        /// </value>
+        public CultureInfo DefaultCulture
+        {
+            get { return defaultCulture; }
+            set { defaultCulture = value; }
+        }
+
+        /// <summary>
+        /// Returns the default <see cref="System.Globalization.CultureInfo"/>. 
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// It tries to get the <see cref="System.Globalization.CultureInfo"/>
+        /// from the value of the
+        /// <see cref="DefaultCulture"/>
+        /// property and falls back to the <see cref="System.Globalization.CultureInfo"/> of the
+        /// current thread if the
+        /// <see cref="DefaultCulture"/>
+        /// is <cref lang="null"/>.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// The default <see cref="System.Globalization.CultureInfo"/>
+        /// </returns>
+        protected virtual CultureInfo GetDefaultLocale()
+        {
+            if (defaultCulture != null)
+            {
+                return defaultCulture;
+            }
+            else
+            {
+                return Thread.CurrentThread.CurrentUICulture;
+            }
+        }
+
+        /// <summary>
+        /// Resolves the <see cref="System.Globalization.CultureInfo"/>
+        /// from some context.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The 'context' in this implementation is the
+        /// <see cref="System.Globalization.CultureInfo"/> value of the
+        /// <see cref="DefaultCulture"/>
+        /// property (if said property value is not <cref lang="null"/>), or the
+        /// <see cref="System.Globalization.CultureInfo"/> of the current thread if it is
+        /// <cref lang="null"/>.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// The <see cref="System.Globalization.CultureInfo"/> that should be used
+        /// by the caller.
+        ///  </returns>
+        public virtual CultureInfo ResolveCulture()
+        {
+            return GetDefaultLocale();
+        }
+
+        /// <summary>
+        /// Sets the <see cref="System.Globalization.CultureInfo"/>.
+        /// </summary>
+        /// <param name="culture">
+        /// The new <see cref="System.Globalization.CultureInfo"/> or
+        /// <cref lang="null"/> to clear the current <see cref="System.Globalization.CultureInfo"/>.
+        /// </param>
+        /// <seealso cref="DefaultCulture"/>
+        /// <seealso cref="ICultureResolver.SetCulture"/>
+        public virtual void SetCulture(CultureInfo culture)
+        {
+            defaultCulture = culture;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Globalization/Resource.cs b/src/Spring/Spring.Core/Globalization/Resource.cs
new file mode 100644
index 00000000..98fc094f
--- /dev/null
+++ b/src/Spring/Spring.Core/Globalization/Resource.cs
@@ -0,0 +1,67 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 Spring.Expressions;
+
+namespace Spring.Globalization
+{
+	/// <summary>
+	/// Holds mapping between control property and it's value 
+	/// as read from the resource file.
+	/// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: Resource.cs,v 1.3 2006/04/09 07:18:47 markpollack Exp $</version>
+    [Serializable]
+    public class Resource
+    {
+        private IExpression target;
+        private object resourceValue;
+
+        /// <summary>
+        /// Creates instance of resource mapper.
+        /// </summary>
+        /// <param name="target">Target property.</param>
+        /// <param name="resourceValue">Resource value.</param>
+        public Resource(IExpression target, object resourceValue)
+        {
+            this.target = target;
+            this.resourceValue = resourceValue;
+        }
+
+        /// <summary>
+        /// Gets parsed target property expression. See <see cref="Spring.Expressions.IExpression"/>
+        /// for more information on object navigation expressions.
+        /// </summary>
+        public IExpression Target
+        {
+            get { return target; }
+        }
+
+        /// <summary>
+        /// Value of the resource that target property should be set to.
+        /// </summary>
+        public object Value
+        {
+            get { return resourceValue; }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Events/IEventRegistry.cs b/src/Spring/Spring.Core/Objects/Events/IEventRegistry.cs
new file mode 100644
index 00000000..382ce538
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Events/IEventRegistry.cs
@@ -0,0 +1,59 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace Spring.Objects.Events
+{
+	/// <summary>
+	/// A registry that manages subscriptions to and the
+	/// publishing of events.
+	/// </summary>
+	/// <author>Griffin Caprio</author>
+	/// <version>$Id: IEventRegistry.cs,v 1.5 2006/04/09 07:18:47 markpollack Exp $</version>
+	public interface IEventRegistry
+	{
+		/// <summary>
+		/// Publishes <b>all</b> events of the source object.
+		/// </summary>
+		/// <param name="sourceObject">
+		/// The source object containing events to publish.
+		/// </param>
+		void PublishEvents(object sourceObject);
+
+		/// <summary>
+		/// Subscribes to <b>all</b> events published, if the subscriber
+		/// implements compatible handler methods.
+		/// </summary>
+		/// <param name="subscriber">The subscriber to use.</param>
+		void Subscribe(object subscriber);
+
+		/// <summary>
+		/// Subscribes to the published events of all objects of a given
+		/// <see cref="System.Type"/>, if the subscriber implements
+		/// compatible handler methods.
+		/// </summary>
+		/// <param name="subscriber">The subscriber to use.</param>
+		/// <param name="targetSourceType">
+		/// The target <see cref="System.Type"/> to subscribe to.
+		/// </param>
+		void Subscribe(object subscriber, Type targetSourceType);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Events/IEventRegistryAware.cs b/src/Spring/Spring.Core/Objects/Events/IEventRegistryAware.cs
new file mode 100644
index 00000000..2037464e
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Events/IEventRegistryAware.cs
@@ -0,0 +1,64 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Events
+{
+	/// <summary>
+	/// To be implemented by any object that wishes to receive a reference to
+	/// an <see cref="Spring.Objects.Events.IEventRegistry"/>.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This interface only applies to objects that have been instantiated
+	/// within the context of an
+	/// <see cref="Spring.Context.IApplicationContext"/>. This interface does
+	/// not typically need to be implemented by application code, but is rather
+	/// used by classes internal to Spring.NET.
+	/// </p>
+	/// </remarks>
+	/// <author>Mark Pollack</author>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: IEventRegistryAware.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+	public interface IEventRegistryAware
+	{
+		/// <summary>
+		/// Set the <see cref="Spring.Objects.Events.IEventRegistry"/>
+		/// associated with the
+		/// <see cref="Spring.Context.IApplicationContext"/> that created this
+		/// object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This property will be set by the relevant
+		/// <see cref="Spring.Context.IApplicationContext"/> after all of this
+		/// object's dependencies have been resolved. This object can use the
+		/// supplied <see cref="Spring.Objects.Events.IEventRegistry"/>
+		/// immediately to publish or subscribe to one or more events.
+		/// </p>
+		/// </remarks>
+		IEventRegistry EventRegistry { set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Events/Support/EventManipulationUtils.cs b/src/Spring/Spring.Core/Objects/Events/Support/EventManipulationUtils.cs
new file mode 100644
index 00000000..8eca6c13
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Events/Support/EventManipulationUtils.cs
@@ -0,0 +1,120 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Core;
+using Spring.Objects.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Events.Support
+{
+	/// <summary>
+	/// Utility class to aid in the manipulation of events and delegates.
+	/// </summary>
+	/// <author>Griffin Caprio</author>
+	/// <version>$Id: EventManipulationUtils.cs,v 1.3 2007/07/31 01:35:12 markpollack Exp $</version>
+	public sealed class EventManipulationUtils
+	{
+		/// <summary>
+		/// Returns a new instance of the requested <see cref="Delegate"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Often used to wire subscribers to event publishers.
+		/// </p>
+		/// </remarks>
+		/// <param name="delegateType">
+		/// The <see cref="System.Type"/> of delegate to create.
+		/// </param>
+		/// <param name="targetSubscriber">
+		/// The target subscriber object that contains the delegate implementation.
+		/// </param>
+		/// <param name="targetSubscriberDelegateMethod">
+		/// <see cref="MethodInfo"/> referencing the delegate method on the subscriber.
+		/// </param>
+		/// <returns>
+		/// A delegate handler that can be added to an events list of handlers, or called directly.
+		/// </returns>
+		public static Delegate GetHandlerDelegate(
+			Type delegateType, object targetSubscriber, MethodInfo targetSubscriberDelegateMethod)
+		{
+			return Delegate.CreateDelegate(
+				delegateType, targetSubscriber, targetSubscriberDelegateMethod.Name);
+		}
+
+		/// <summary>
+		/// Queries the input type for a <see cref="MethodInfo" /> signature matching the input
+		/// <see cref="MethodInfo"/> signature.
+		/// </summary>
+		/// <remarks>
+		/// Typically used to query a potential subscriber to see if they implement an event handler.
+		/// </remarks>
+		/// <param name="invoke"><see cref="MethodInfo"/> to match against</param>
+		/// <param name="subscriberType"><see cref="Type"/> to query</param>
+		/// <returns>
+		/// <see cref="MethodInfo"/> matching input <see cref="MethodInfo"/>
+		/// signature, or <see langword="null"/> if there is no match.
+		/// </returns>
+		public static MethodInfo GetMethodInfoMatchingSignature(
+			MethodInfo invoke, Type subscriberType)
+		{
+			ComposedCriteria criteria = new ComposedCriteria();
+			criteria.Add(new MethodReturnTypeCriteria(invoke.ReturnType));
+			criteria.Add(new MethodParametersCountCriteria(invoke.GetParameters().Length));
+			criteria.Add(new MethodParametersCriteria(ReflectionUtils.GetParameterTypes(invoke)));
+
+			MemberInfo[] methods = subscriberType.FindMembers(
+				MemberTypes.Method, ReflectionUtils.AllMembersCaseInsensitiveFlags,
+				new MemberFilter(new CriteriaMemberFilter().FilterMemberByCriteria),
+				criteria);
+			if (methods != null
+				&& methods.Length > 0)
+			{
+				return methods[0] as MethodInfo;
+			}
+			return null;
+		}
+
+		#region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the EventManipulationUtilities class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such has no publicly visible constructors.
+		/// </p>
+		/// </remarks>
+		private EventManipulationUtils()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Events/Support/EventRegistry.cs b/src/Spring/Spring.Core/Objects/Events/Support/EventRegistry.cs
new file mode 100644
index 00000000..edf21d49
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Events/Support/EventRegistry.cs
@@ -0,0 +1,125 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Objects.Events.Support
+{
+	/// <summary>
+	/// Default implementation of the <see cref="Spring.Objects.Events.IEventRegistry"/>
+	/// interface.
+	/// </summary>
+	/// <author>Griffin Caprio</author>
+	/// <version>$Id: EventRegistry.cs,v 1.7 2006/04/09 07:18:47 markpollack Exp $</version>
+	public class EventRegistry : IEventRegistry
+	{
+		private IList _publishers;
+
+		/// <summary>
+		/// Creates a new instance of the EventRegistry class.
+		/// </summary>
+		public EventRegistry()
+		{
+			_publishers = new ArrayList();
+		}
+
+		/// <summary>
+		/// The list of event publishers.
+		/// </summary>
+		/// <value>The list of event publishers.</value>
+		protected IList Publishers
+		{
+			get { return _publishers; }
+		}
+
+		/// <summary>
+		/// Adds the input object to the list of publishers.
+		/// </summary>
+		/// <remarks>
+		/// This publishes <b>all</b> events of the source object to any object
+		/// wishing to subscribe
+		/// </remarks>
+		/// <param name="source">The source object to publish.</param>
+		public virtual void PublishEvents(object source)
+		{
+			Publishers.Add(source);
+		}
+
+		/// <summary>
+		/// Subscribes to <b>all</b> events published, if the subscriber implements
+		/// compatible handler methods.
+		/// </summary>
+		/// <param name="subscriber">The subscriber to use.</param>
+		public virtual void Subscribe(object subscriber)
+		{
+			Subscribe(subscriber, null);
+		}
+
+		/// <summary>
+		/// Subscribes to published events of all objects of a given type, if the
+		/// subscriber implements compatible handler methods.
+		/// </summary>
+		/// <param name="subscriber">The subscriber to use.</param>
+		/// <param name="sourceType">
+		/// The target <see cref="System.Type"/> to subscribe to.
+		/// </param>
+		public virtual void Subscribe(object subscriber, Type sourceType)
+		{
+			Type currentSubscriberType = subscriber.GetType();
+			foreach (object currentPublisher in _publishers)
+			{
+				if (null == sourceType
+					|| sourceType.IsAssignableFrom(currentPublisher.GetType()))
+				{
+					wireSubscriberToPublisher(
+						currentPublisher, currentSubscriberType, subscriber);
+				}
+			}
+		}
+
+		private static void wireSubscriberToPublisher(
+			object currentPublisher, Type currentSubscriberType, object subscriber)
+		{
+			Type currentPublisherType = currentPublisher.GetType();
+			EventInfo[] events = currentPublisherType.GetEvents();
+			foreach (EventInfo currentEvent in events)
+			{
+				Type eventHandlerType = currentEvent.EventHandlerType;
+				MethodInfo invoke = eventHandlerType.GetMethod("Invoke");
+				MethodInfo eventHandler
+					= EventManipulationUtils.GetMethodInfoMatchingSignature(
+						invoke, currentSubscriberType);
+				if (eventHandler != null)
+				{
+					currentEvent.AddEventHandler(
+						currentPublisher,
+						EventManipulationUtils.GetHandlerDelegate(
+							eventHandlerType, subscriber, eventHandler));
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttribute.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttribute.cs
new file mode 100644
index 00000000..29a66e32
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttribute.cs
@@ -0,0 +1,40 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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;
+
+namespace Spring.Objects.Factory.Attributes
+{
+    /// <summary>
+    /// Marks a property as being 'required': that is, the setter property 
+    /// must be configured to be dependency-injected with a value.
+    /// </summary>
+    /// <remarks>Consult the SDK documentation for <see cref="RequiredAttributeObjectPostProcessor"/>, 
+    /// which, by default, checks for the presence of this annotation.
+    /// </remarks>
+    /// <author>Rob Harrop</author>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: RequiredAttribute.cs,v 1.1 2008/04/02 18:02:24 markpollack Exp $</version>
+    [AttributeUsage(AttributeTargets.Property, Inherited = true)]    
+    public class RequiredAttribute : Attribute
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessor.cs
new file mode 100644
index 00000000..e76c1e99
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessor.cs
@@ -0,0 +1,186 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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.Collections;
+using System.Reflection;
+using System.Text;
+using Spring.Collections;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Attributes;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+namespace Spring.Objects.Factory.Attributes
+{
+    /// <summary>
+    ///  A <see cref="IObjectPostProcessor"/> implementation that enforces required properties to have been configured.
+    /// Required properties are detected through an attribute, by default, Spring's <see cref="RequiredAttribute"/>
+    /// attribute.
+    /// </summary>
+    /// <remarks>
+    /// <para>The motivation for the existence of this IObjectPostProcessor is to allow
+    /// developers to annotate the setter properties of their own classes with an
+    /// arbitrary attribute to indicate that the container must check
+    /// for the configuration of a dependency injected value. This neatly pushes
+    /// responsibility for such checking onto the container (where it arguably belongs),
+    /// and obviates the need (<b>in part</b>) for a developer to code a method that
+    /// simply checks that all required properties have actually been set.
+    /// </para>
+    /// <para>Please note that an 'init' method may still need to implemented (and may
+    /// still be desirable), because all that this class does is enforce that a
+    /// 'required' property has actually been configured with a value. It does
+    /// <b>not</b> check anything else... In particular, it does not check that a
+    /// configured value is not <code>null</code>.
+    /// </para>
+    /// </remarks>
+    /// <author>Rob Harrop</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: RequiredAttributeObjectPostProcessor.cs,v 1.2 2008/04/08 19:29:07 markpollack Exp $</version>
+    public class RequiredAttributeObjectPostProcessor : InstantiationAwareObjectPostProcessorAdapter
+    {
+        private Type requiredAttributeType = typeof (RequiredAttribute);
+
+        /// <summary>
+        /// Cache for validated object names, skipping re-validation for the same object
+        /// </summary>
+        private ISet validatedObjectNames = new SynchronizedSet(new HashedSet());
+
+        /// <summary>
+        /// Sets the type of the required attribute, to be used on a property setter
+        /// </summary>
+        /// <remarks>
+        /// The default required attribute type is the Spring-provided <see cref="RequiredAttribute"/> attribute.
+        /// This setter property exists so that developers can provide their own 
+        /// (non-Spring-specific) annotation type to indicate that a property value is required.
+        /// </remarks>
+        /// <value>The type of the required attribute.</value>
+        public Type RequiredAttributeType
+        {            
+            set
+            {
+                AssertUtils.ArgumentNotNull(value, "RequiredAttributeType", "RequiredAttributeType property must not be null");
+                if (!typeof(Attribute).IsAssignableFrom(value))
+                {
+                    throw new ArgumentException(
+                        string.Format("[{0}] does not inherit from System.Attribute (it must).", value.FullName));
+                }
+                requiredAttributeType = value;
+            }
+            get
+            {
+                return requiredAttributeType;
+            }
+        }
+
+
+        /// <summary>
+        /// Post-process the given property values before the factory applies them
+        /// to the given object.  Checks for the attribute specified by this PostProcessor's RequiredAttributeType.
+        /// </summary>
+        /// <param name="pvs">The property values that the factory is about to apply (never <code>null</code>).</param>
+        /// <param name="pis">The relevant property infos for the target object (with ignored
+        /// dependency types - which the factory handles specifically - already filtered out)</param>
+        /// <param name="objectInstance">The object instance created, but whose properties have not yet
+        /// been set.</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>
+        /// The actual property values to apply to the given object (can be the
+        /// passed-in PropertyValues instances or null to skip property population.
+        /// </returns>
+        /// <exception cref="ObjectInitializationException">If a required property value has not been specified
+        /// in the configuration metadata.</exception>
+        public override IPropertyValues PostProcessPropertyValues(IPropertyValues pvs, PropertyInfo[] pis, object objectInstance,
+                                                         string objectName)
+        {
+            if (!validatedObjectNames.Contains(objectName))
+            {
+                ArrayList invalidProperties = new ArrayList();
+
+                foreach (PropertyInfo pi in pis)
+                {
+                    if (IsRequiredProperty(pi) && !pvs.Contains(pi.Name))
+                    {
+                        invalidProperties.Add(pi.Name);
+                    }
+                }
+                if (invalidProperties.Count != 0)
+                {
+                    throw new ObjectInitializationException(
+                        BuildExceptionMessage((string[]) invalidProperties.ToArray(typeof (string)), objectName));
+                }
+                validatedObjectNames.Add(objectName);
+            }
+            return pvs;
+        }
+
+        /// <summary>
+        /// Determines whether the supplied property is required to have a value, that is to be dependency injected.
+        /// </summary>
+        /// <remarks>
+        /// This implementation looks for the existence of a "required" attribute on the supplied PropertyInfo and that
+        /// the property has a setter method.
+        /// </remarks>
+        /// <param name="pi">The target PropertyInfo</param>
+        /// <returns>
+        /// 	<c>true</c> if the supplied property has been marked as being required;; otherwise, <c>false</c> if
+        /// not or if the supplied property does not have a setter method
+        /// </returns>
+        protected virtual bool IsRequiredProperty(PropertyInfo pi)
+        {
+            return (pi.GetSetMethod() != null && pi.GetCustomAttributes(RequiredAttributeType, true).Length > 0);
+        }
+
+        /// <summary>
+        /// Builds an exception message for the given list of invalid properties.
+        /// </summary>
+        /// <param name="invalidProperties">The list of names of invalid properties.</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>The exception message</returns>
+        private string BuildExceptionMessage(string[] invalidProperties, ICloneable objectName)
+        {
+            int size = invalidProperties.Length;
+            StringBuilder sb = new StringBuilder();
+            sb.Append(size == 1 ? "Property" : "Properties");
+            for (int i=0; i < size; i++)
+            {
+                string propName = invalidProperties[i];
+                if (i > 0)
+                {
+                    if (i == (size -1 ))
+                    {
+                        sb.Append(" and");
+                    }
+                    else
+                    {
+                        sb.Append(", ");
+                    }
+                }
+                sb.Append(" '").Append(propName).Append("'");
+            }
+            sb.Append(" required for object '").Append(objectName).Append("'");
+            return sb.ToString();
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/AbstractConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/AbstractConfigurer.cs
new file mode 100644
index 00000000..e7642b6f
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/AbstractConfigurer.cs
@@ -0,0 +1,123 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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 Spring.Core;
+using Spring.Core.TypeResolution;
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Base class that provides common functionality needed for several IObjectFactoryPostProcessor
+    /// implementations
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AbstractConfigurer.cs,v 1.3 2007/07/31 18:16:49 bbaia Exp $</version>
+    [Serializable]
+    public abstract class AbstractConfigurer : IOrdered, IObjectFactoryPostProcessor
+    {
+        private int order = Int32.MaxValue; // default: same as non-Ordered
+
+        /// <summary>
+        /// Return the order value of this object, with a higher value meaning
+        /// greater in terms of sorting.
+        /// </summary>
+        /// <returns>The order value.</returns>
+        /// <seealso cref="Spring.Core.IOrdered.Order"/>
+        public int Order
+        {
+            get { return order; }
+            set { order = value; }
+        }
+
+        /// <summary>
+        /// Modify the application context's internal object factory after its
+        /// standard initialization.
+        /// </summary>
+        /// <param name="factory">The object factory used by the application context.</param>
+        /// <remarks>
+        /// 	<p>
+        /// All object definitions will have been loaded, but no objects will have
+        /// been instantiated yet. This allows for overriding or adding properties
+        /// even to eager-initializing objects.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        public abstract void PostProcessObjectFactory(
+            IConfigurableListableObjectFactory factory);
+
+        /// <summary>
+        /// Resolves the supplied <paramref name="value"/> into a
+        /// <see cref="System.Type"/> instance.
+        /// </summary>
+        /// <param name="value">The object that is to be resolved into a <see cref="System.Type"/>
+        /// instance.</param>
+        /// <param name="errorContextSource">The error context source.</param>
+        /// <param name="errorContext">The error context string.</param>
+        /// <returns>A resolved <see cref="System.Type"/>.</returns>
+        /// <remarks>
+        /// 	<p>
+        /// This (default) implementation supports resolving
+        /// <see cref="System.String"/>s and <see cref="System.Type"/>s.
+        /// Only override this method if you want to key your type alias
+        /// on something other than <see cref="System.String"/>s
+        /// and <see cref="System.Type"/>s.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the supplied <paramref name="value"/> is <see langword="null"/>,
+        /// or the supplied <paramref name="value"/> cannot be resolved.
+        /// </exception>
+        protected virtual Type ResolveRequiredType(object value, string errorContextSource, string errorContext)
+        {
+            Type requiredType = value as Type;
+            if (requiredType == null)
+            {
+                string typeName = value as string;
+                if (typeName != null)
+                {
+                    try
+                    {
+                        requiredType = TypeResolutionUtils.ResolveType(typeName);
+                    }
+                    catch (TypeLoadException ex)
+                    {
+                        throw new ObjectInitializationException(
+                            string.Format(
+                                "Could not load required type [{0}] for {1}.",
+                                typeName, errorContext), ex);
+                    }
+                }
+                else
+                {
+                    throw new ObjectInitializationException(
+                        string.Format(
+                            "Invalid value '{0}' for {1} - " +
+                            "must be a System.String or System.Type.",
+                            value, errorContext));
+                }
+            }
+            return requiredType;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/AbstractFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/AbstractFactoryObject.cs
new file mode 100644
index 00000000..e5f71ce4
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/AbstractFactoryObject.cs
@@ -0,0 +1,163 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Simple template superclass for <see cref="Spring.Objects.Factory.IFactoryObject"/>
+	/// implementations that allows for the creation of a singleton or a prototype
+	/// instance (depending on a flag).
+	/// </summary>
+	/// <remarks>
+	/// If the value of the 
+	/// <see cref="Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+	/// property is <see langword="true"/> (this is the default), this class
+	/// will create a single instance of it's object upon initialization and
+	/// subsequently return the singleton instance; else, this class will
+	/// create a new instance each time (prototype mode). Subclasses must
+	/// implement the <see langword="abstract"/>
+	/// <see cref="Spring.Objects.Factory.Config.AbstractFactoryObject.CreateInstance"/>
+	/// template method to actually create objects.
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Keith Donald</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: AbstractFactoryObject.cs,v 1.13 2007/03/16 04:01:34 aseovic Exp $</version>
+    [Serializable]
+    public abstract class AbstractFactoryObject : IFactoryObject, IInitializingObject, IDisposable
+	{
+		private bool isSingleton = true;
+		private object singletonInstance;
+
+		/// <summary>
+		/// Is the object managed by this factory a singleton or a prototype?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Please note that changing the value of this property <b>after</b>
+		/// this factory object instance has been created by an enclosing
+		/// Spring.NET IoC container really is a programming error. This
+		/// property should really only be set once, prior to the invocation
+		/// of the
+		/// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+		/// callback method.
+		/// </p>
+		/// </remarks>
+		/// <see cref="Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+		public bool IsSingleton
+		{
+			get { return this.isSingleton; }
+			set { this.isSingleton = value; }
+		}
+
+		/// <summary>
+		/// Return the <see cref="System.Type"/> of object that this
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/> creates, or
+		/// <see langword="null"/> if not known in advance.
+		/// </summary>
+		/// <see cref="Spring.Objects.Factory.IFactoryObject.ObjectType"/>
+		public abstract Type ObjectType { get; }
+
+		/// <summary>
+		/// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// after it has injected all of an object's dependencies.
+		/// </summary>
+		/// <exception cref="System.Exception">
+		/// In the event of misconfiguration (such as the failure to set a
+		/// required property) or if initialization fails.
+		/// </exception>
+		/// <seealso cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+		public virtual void AfterPropertiesSet()
+		{
+			if (this.isSingleton && this.singletonInstance == null)
+			{
+				this.singletonInstance = CreateInstance();
+			}
+		}
+
+		/// <summary>
+		/// Return an instance (possibly shared or independent) of the object
+		/// managed by this factory.
+		/// </summary>
+		/// <returns>
+		/// An instance (possibly shared or independent) of the object managed by
+		/// this factory.
+		/// </returns>
+		/// <seealso cref="Spring.Objects.Factory.IFactoryObject.GetObject"/>
+		public object GetObject()
+		{
+			if (this.isSingleton)
+			{
+				return this.singletonInstance;
+			}
+			else
+			{
+				return CreateInstance();
+			}
+		}
+
+		/// <summary>
+		/// Template method that subclasses must override to construct
+		/// the object returned by this factory.
+		/// </summary>
+		/// <remarks>
+		/// Invoked once immediately after the initialization of this
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/> in the case of
+		/// a singleton; else, on each call to the
+		/// <see cref="Spring.Objects.Factory.IFactoryObject.GetObject"/>
+		/// method.
+		/// </remarks>
+		/// <exception cref="System.Exception">
+		/// If an exception occured during object creation.
+		/// </exception>
+		/// <returns>
+		/// A distinct instance of the object created by this factory.
+		/// </returns>
+		protected abstract object CreateInstance();
+
+		/// <summary>
+		/// Performs cleanup on any cached singleton object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Only makes sense in the context of a singleton object.
+		/// </p>
+		/// </remarks>
+		/// <see cref="Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+		/// <seealso cref="System.IDisposable.Dispose"/>
+		public virtual void Dispose()
+		{
+			if (this.isSingleton && this.singletonInstance != null)
+			{
+				IDisposable disposableSingletonInstance = this.singletonInstance as IDisposable;
+				if (disposableSingletonInstance != null)
+				{
+					disposableSingletonInstance.Dispose();
+				}
+			}
+		}
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/AutoWiringMode.cs b/src/Spring/Spring.Core/Objects/Factory/Config/AutoWiringMode.cs
new file mode 100644
index 00000000..ef9a0403
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/AutoWiringMode.cs
@@ -0,0 +1,60 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace Spring.Objects.Factory.Config
+{
+
+	/// <summary>
+	/// The various autowiring modes.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: AutoWiringMode.cs,v 1.8 2007/03/16 04:01:34 aseovic Exp $</version>
+    [Serializable]
+    public enum AutoWiringMode 
+    {
+        /// <summary>
+        /// Do not autowire.
+        /// </summary>
+        No = 0,
+
+        /// <summary>
+        /// Autowire by name.
+        /// </summary>
+        ByName = 1,
+
+        /// <summary>
+        /// Autowire by <see cref="System.Type"/>.
+        /// </summary>
+        ByType = 2,
+
+        /// <summary>
+        /// Autowiring by constructor.
+        /// </summary>
+        Constructor = 3,
+
+        /// <summary>
+        /// The autowiring strategy is to be determined by introspection
+        /// of the object's <see cref="System.Type"/>.
+        /// </summary>
+        AutoDetect = 4
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/CommandLineArgsVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/CommandLineArgsVariableSource.cs
new file mode 100644
index 00000000..57a8fe39
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/CommandLineArgsVariableSource.cs
@@ -0,0 +1,128 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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.Collections;
+using System.Collections.Specialized;
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Implementation of <see cref="IVariableSource"/> that
+    /// resolves variable name against command line arguments.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CommandLineArgsVariableSource.cs,v 1.3 2007/08/02 22:18:32 markpollack Exp $</version>
+    [Serializable]
+    public class CommandLineArgsVariableSource : IVariableSource
+    {
+        private const string DEFAULT_ARG_PREFIX = "/";
+        private const string DEFAULT_VALUE_SEPARATOR = ":";
+
+        private string argumentPrefix = DEFAULT_ARG_PREFIX;
+        private string valueSeparator = DEFAULT_VALUE_SEPARATOR;
+
+        private string[] commandLineArgs;
+        private IDictionary arguments;
+
+        /// <summary>
+        /// Default constructor. 
+        /// Initializes command line arguments from the environment.
+        /// </summary>
+        public CommandLineArgsVariableSource()
+        {
+            this.commandLineArgs = Environment.GetCommandLineArgs();
+        }
+
+        /// <summary>
+        /// Constructor that allows arguments to be passed externally.
+        /// Useful for testing.
+        /// </summary>
+        public CommandLineArgsVariableSource(string[] commandLineArgs)
+        {
+            this.commandLineArgs = commandLineArgs;
+        }
+
+        /// <summary>
+        /// Gets or sets a prefix that should be used to 
+        /// identify arguments to extract values from.
+        /// </summary>
+        /// <value>
+        /// A prefix that should be used to identify arguments 
+        /// to extract values from. Defaults to slash ("/").
+        /// </value>
+        public string ArgumentPrefix
+        {
+            get { return argumentPrefix; }
+            set { argumentPrefix = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a character that should be used to
+        /// separate argument name from its value.
+        /// </summary>
+        /// <value>
+        /// A character that should be used to separate argument 
+        /// name from its value. Defaults to colon (":").
+        /// </value>
+        public string ValueSeparator
+        {
+            get { return valueSeparator; }
+            set { valueSeparator = value; }
+        }
+
+        /// <summary>
+        /// Resolves variable value for the specified variable name.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the variable to resolve.
+        /// </param>
+        /// <returns>
+        /// The variable value if able to resolve, <c>null</c> otherwise.
+        /// </returns>
+        public string ResolveVariable(string name)
+        {
+            if (arguments == null)
+            {
+                InitArguments();
+            }
+            return (string) this.arguments[name];
+        }
+
+        /// <summary>
+        /// Initializes command line arguments dictionary.
+        /// </summary>
+        private void InitArguments()
+        {
+            this.arguments = CollectionsUtil.CreateCaseInsensitiveHashtable(commandLineArgs.Length);
+
+            foreach (string arg in commandLineArgs)
+            {
+                int separatorIndex = arg.IndexOf(valueSeparator);
+                if (arg.StartsWith(argumentPrefix) && separatorIndex > argumentPrefix.Length)
+                {
+                    string argName = arg.Substring(argumentPrefix.Length, separatorIndex - argumentPrefix.Length);
+                    string argValue = arg.Substring(separatorIndex + valueSeparator.Length);
+                    this.arguments[argName] = argValue;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs
new file mode 100644
index 00000000..108f2b7c
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs
@@ -0,0 +1,136 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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.Collections.Specialized;
+using System.Configuration;
+using Spring.Util;
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Implementation of <see cref="IVariableSource"/> that
+    /// resolves variable name against name-value sections in
+    /// the standard .NET configuration file.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ConfigSectionVariableSource.cs,v 1.4 2007/08/22 20:16:27 oakinger Exp $</version>
+    [Serializable]
+    public class ConfigSectionVariableSource : IVariableSource
+    {
+        private string[] sectionNames;
+        private NameValueCollection variables;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ConfigSectionVariableSource"/>
+        /// </summary>
+        public ConfigSectionVariableSource()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ConfigSectionVariableSource"/> from the given <paramref name="sectionName"/>
+        /// </summary>
+        public ConfigSectionVariableSource(string sectionName)
+        {
+            this.SectionName = sectionName;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ConfigSectionVariableSource"/> from the given <paramref name="sectionNames"/>
+        /// </summary>
+        public ConfigSectionVariableSource(string[] sectionNames)
+        {
+            this.SectionNames = sectionNames;
+        }
+
+        /// <summary>
+        /// Gets or sets a list of section names variables should be loaded from.
+        /// </summary>
+        /// <remarks>
+        /// All sections specified need to be handled by the <see cref="NameValueSectionHandler"/>
+        /// in order to be processed successfully.
+        /// </remarks>
+        /// <value>
+        /// A list of section names variables should be loaded from.
+        /// </value>
+        public string[] SectionNames
+        {
+            get { return sectionNames; }
+            set { sectionNames = value; }
+        }
+
+        /// <summary>
+        /// Convinience property. Gets or sets a single section
+        /// to read properties from.
+        /// </summary>
+        /// <remarks>
+        /// The section specified needs to be handled by the <see cref="NameValueSectionHandler"/>
+        /// in order to be processed successfully.
+        /// </remarks>
+        /// <value>
+        /// A section to read properties from.
+        /// </value>
+        public string SectionName
+        {
+            set { sectionNames = new string[] { value }; }
+        }
+
+        /// <summary>
+        /// Resolves variable value for the specified variable name.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the variable to resolve.
+        /// </param>
+        /// <returns>
+        /// The variable value if able to resolve, <c>null</c> otherwise.
+        /// </returns>
+        public string ResolveVariable(string name)
+        {
+            if (variables == null)
+            {
+                InitVariables();
+            }
+            return variables.Get(name);
+        }
+
+        /// <summary>
+        /// Initializes properties based on the specified 
+        /// property file locations.
+        /// </summary>
+        private void InitVariables()
+        {
+            variables = new NameValueCollection();
+            foreach (string sectionName in sectionNames)
+            {
+                object section = ConfigurationUtils.GetSection(sectionName);
+                if (section is NameValueCollection)
+                {
+                    variables.Add((NameValueCollection) section);
+                }
+                else
+                {
+                    throw new ArgumentException("Section [" + sectionName +
+                                                "] is not handled by the NameValueSectionHandler.");
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs
new file mode 100644
index 00000000..73146a93
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs
@@ -0,0 +1,347 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using System.Configuration;
+using System.IO;
+using System.Xml;
+
+using Common.Logging;
+using Spring.Core;
+using Spring.Core.IO;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Various utility methods for .NET style .config files. 
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Currently supports reading custom configuration sections and returning them as 
+	/// <see cref="System.Collections.Specialized.NameValueCollection"/> objects.
+	/// </p>
+	/// </remarks>
+	/// <author>Simon White</author>
+	/// <author>Mark Pollack</author>
+	/// <version>$Id: ConfigurationReader.cs,v 1.18 2007/08/08 17:47:13 bbaia Exp $</version>
+	public sealed class ConfigurationReader
+	{
+		private const string ConfigSectionTypeAttribute = "type";
+		private const string ConfigurationElement = "configuration";
+		private const string ConfigSectionsElement = "configSections";
+		private const string ConfigSectionElement = "section";
+		private const string ConfigSectionNameAttribute = "name";
+
+		private static readonly ILog _log = LogManager.GetLogger(typeof (ConfigurationReader));
+
+		/// <summary>
+		/// Reads the specified configuration section into a
+		/// <see cref="System.Collections.Specialized.NameValueCollection"/>.
+		/// </summary>
+		/// <param name="resource">The resource to read.</param>
+		/// <param name="configSection">The section name.</param>
+		/// <returns>
+		/// A newly populated
+		/// <see cref="System.Collections.Specialized.NameValueCollection"/>.
+		/// </returns>
+		/// <exception cref="System.IO.IOException">
+		/// If any errors are encountered while attempting to open a stream
+		/// from the supplied <paramref name="resource"/>.
+		/// </exception>
+		/// <exception cref="System.Xml.XmlException">
+		/// If any errors are encountered while loading or reading (this only applies to
+		/// v1.1 and greater of the .NET Framework) the actual XML.
+		/// </exception>
+		/// <exception cref="System.Exception">
+		/// If any errors are encountered while loading or reading (this only applies to
+		/// v1.0 of the .NET Framework).
+		/// </exception>
+		/// <exception cref="Spring.Objects.FatalObjectException">
+		/// If the configuration section was otherwise invalid.
+		/// </exception>
+		public static NameValueCollection Read(IResource resource, string configSection)
+		{
+			return ConfigurationReader.Read(resource, configSection, new NameValueCollection());
+		}
+
+		/// <summary>
+		/// Reads the specified configuration section into the supplied
+		/// <see cref="System.Collections.Specialized.NameValueCollection"/>.
+		/// </summary>
+		/// <param name="resource">The resource to read.</param>
+		/// <param name="configSection">The section name.</param>
+		/// <param name="properties">
+		/// The collection that is to be populated. May be
+		/// <see langword="null"/>.
+		/// </param>
+		/// <returns>
+		/// A newly populated
+		/// <see cref="System.Collections.Specialized.NameValueCollection"/>.
+		/// </returns>
+		/// <exception cref="System.IO.IOException">
+		/// If any errors are encountered while attempting to open a stream
+		/// from the supplied <paramref name="resource"/>.
+		/// </exception>
+		/// <exception cref="System.Xml.XmlException">
+		/// If any errors are encountered while loading or reading (this only applies to
+		/// v1.1 and greater of the .NET Framework) the actual XML.
+		/// </exception>
+		/// <exception cref="System.Exception">
+		/// If any errors are encountered while loading or reading (this only applies to
+		/// v1.0 of the .NET Framework).
+		/// </exception>
+		/// <exception cref="Spring.Objects.FatalObjectException">
+		/// If the configuration section was otherwise invalid.
+		/// </exception>
+		public static NameValueCollection Read(
+			IResource resource, string configSection, NameValueCollection properties)
+		{
+			return ConfigurationReader.Read(resource, configSection, properties, true);
+		}
+
+		/// <summary>
+		/// Reads the specified configuration section into the supplied
+		/// <see cref="System.Collections.Specialized.NameValueCollection"/>.
+		/// </summary>
+		/// <param name="resource">The resource to read.</param>
+		/// <param name="configSection">The section name.</param>
+		/// <param name="properties">
+		/// The collection that is to be populated. May be
+		/// <see langword="null"/>.
+		/// </param>
+		/// <param name="overrideValues">
+		/// If a key already exists, is its value to be appended to the current
+		/// value or replaced?
+		/// </param>
+		/// <returns>
+		/// The populated
+		/// <see cref="System.Collections.Specialized.NameValueCollection"/>.
+		/// </returns>
+		/// <exception cref="System.IO.IOException">
+		/// If any errors are encountered while attempting to open a stream
+		/// from the supplied <paramref name="resource"/>.
+		/// </exception>
+		/// <exception cref="System.Xml.XmlException">
+		/// If any errors are encountered while loading or reading (this only applies to
+		/// v1.1 and greater of the .NET Framework) the actual XML.
+		/// </exception>
+		/// <exception cref="System.Exception">
+		/// If any errors are encountered while loading or reading (this only applies to
+		/// v1.0 of the .NET Framework).
+		/// </exception>
+		/// <exception cref="Spring.Objects.FatalObjectException">
+		/// If the configuration section was otherwise invalid.
+		/// </exception>
+		public static NameValueCollection Read(
+			IResource resource, string configSection, NameValueCollection properties, bool overrideValues)
+		{
+			if (properties == null)
+			{
+				properties = new NameValueCollection();
+			}
+			Stream stream = null;
+			try
+			{
+				XmlDocument doc = new XmlDocument();
+				stream = resource.InputStream;
+				doc.Load(stream);
+				NameValueCollection newProperties = ReadFromXmlDocument(doc, configSection);
+				if(newProperties != null) 
+				{
+					PopulateProperties(overrideValues, properties, newProperties);
+				}
+			}
+			finally
+			{
+				if (stream != null)
+				{
+					try
+					{
+						stream.Close();
+					}
+					catch (IOException ex)
+					{
+						#region Instrumentation
+
+						if (_log.IsWarnEnabled)
+						{
+							_log.Warn("Could not close stream from resource " + resource.Description, ex);
+						}
+
+						#endregion
+					}
+				}
+			}
+			return properties;
+		}
+
+		/// <summary>
+		/// Read from the specified configuration from the supplied XML
+		/// <paramref name="document"/> into a
+		/// <see cref="System.Collections.Specialized.NameValueCollection"/>.
+		/// </summary>
+		/// <remarks>
+		/// <note>
+		/// Does <b>not</b> support section grouping. The supplied XML
+		/// <paramref name="document"/> must already be loaded.
+		/// </note>
+		/// </remarks>
+		/// <param name="document">
+		/// The <see cref="System.Xml.XmlDocument"/> to read from.
+		/// </param>
+		/// <param name="configSectionName">
+		/// The configuration section name to read.
+		/// </param>
+		/// <returns>
+		/// A newly populated
+		/// <see cref="System.Collections.Specialized.NameValueCollection"/>.
+		/// </returns>
+		/// <exception cref="System.Xml.XmlException">
+		/// If any errors are encountered while reading (this only applies to
+		/// v1.1 and greater of the .NET Framework).
+		/// </exception>
+		/// <exception cref="System.Exception">
+		/// If any errors are encountered while reading (this only applies to
+		/// v1.0 of the .NET Framework).
+		/// </exception>
+		/// <exception cref="Spring.Objects.FatalObjectException">
+		/// If the configuration section was otherwise invalid.
+		/// </exception>
+		public static NameValueCollection ReadFromXmlDocument(XmlDocument document,
+		                                                      string configSectionName)
+		{
+			// find the config section declaration (if one exists)...
+			XmlNode xmlConfig = document.SelectSingleNode(
+				string.Format("//{0}//{1}//{2}[@{3}='{4}']",
+					ConfigurationElement, ConfigSectionsElement,
+					ConfigSectionElement, ConfigSectionNameAttribute, configSectionName));
+
+			// create appropriate configuration section handler...
+			NameValueSectionHandler handler = null;
+			if (xmlConfig == null)
+			{
+				// none specified, so use the default...
+				handler = new NameValueSectionHandler();
+			}
+			else
+			{
+				XmlAttribute xmlConfigType = xmlConfig.Attributes[ConfigSectionTypeAttribute];
+                Type cshType = TypeResolutionUtils.ResolveType(xmlConfigType.Value);
+				object o = ObjectUtils.InstantiateType(cshType);
+				handler = o as NameValueSectionHandler;
+				if (handler == null)
+				{
+					throw ConfigurationUtils.CreateConfigurationException("Configuration section '" + configSectionName + "' not of type NameValueCollection.");
+				}
+					
+			}
+			XmlNode collectionNode = document.SelectSingleNode(
+				string.Format("//{0}//{1}", ConfigurationElement, configSectionName));
+			if (collectionNode == null)
+            {
+                throw ConfigurationUtils.CreateConfigurationException("Cannot read properties; config section '" + configSectionName + "' not found.");
+			}
+			else
+			{
+				return (NameValueCollection) handler.Create(null, null, collectionNode);
+			}
+		}
+
+		/// <summary>
+		/// Populates the supplied <paramref name="properties"/> with values from
+		/// a .NET application configuration file.
+		/// </summary>
+		/// <param name="properties">
+		/// The <see cref="System.Collections.Specialized.NameValueCollection"/>
+		/// to add any key-value pairs to.
+		/// </param>
+		/// <param name="configSectionName">
+		/// The configuration section name in the a .NET application configuration
+		/// file.
+		/// </param>
+		/// <param name="overrideValues">
+		/// If a key already exists, is its value to be appended to the current
+		/// value or replaced?
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if the supplied
+		/// <paramref name="configSectionName"/> was found.
+		/// </returns>
+		public static bool PopulateFromAppConfig(
+			NameValueCollection properties, string configSectionName, bool overrideValues)
+		{
+			bool sectionFound = false;
+
+            NameValueCollection newProperties
+                = ConfigurationUtils.GetSection(configSectionName) as NameValueCollection;
+
+            if (newProperties != null)
+			{
+				sectionFound = true;
+				PopulateProperties(overrideValues, properties, newProperties);
+			}
+			return sectionFound;
+		}
+
+		private static void PopulateProperties(
+			bool overrideValues, NameValueCollection properties, NameValueCollection newProperties)
+		{
+			if (!overrideValues)
+			{
+				properties.Add(newProperties);
+			}
+			else
+			{
+				foreach (string key in newProperties.AllKeys)
+				{
+					properties.Set(key, newProperties.Get(key));
+				}
+			}
+		}
+
+		#region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the ConfigurationReader class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such has no publicly visible
+		/// constructors.
+		/// </p>
+		/// </remarks>
+		private ConfigurationReader()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs
new file mode 100644
index 00000000..cc9bb027
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs
@@ -0,0 +1,96 @@
+#if NET_2_0
+#region License
+
+/*
+ * Copyright © 2002-2007 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.Collections.Specialized;
+using System.Configuration;
+using Spring.Util;
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Implementation of <see cref="IVariableSource"/> that
+    /// resolves variable name connection strings defined in
+    /// the standard .NET configuration file.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// When the &lt;connectionStrings&gt; configuration section is processed by this class,
+    /// two variables are defined for each connection string: one for connection string and
+    /// the second one for the provider name.</p>
+    /// <p>
+    /// Variable names are generated by appending '.connectionString' and '.providerName'
+    /// literals to the value of the <c>name</c> attribute of the connection string element.
+    /// For example:</p>
+    /// <pre>
+    /// <connectionStrings>
+    ///    <add name="myConn" connectionString="..." providerName="..." />
+    /// </connectionStrings>
+    /// </pre>
+    /// <p>
+    /// will result in two variables being created: <b>myConn.connectionString</b> and <b>myConn.providerName</b>.
+    /// You can reference these variables within your object definitions, just like any other variable.</p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ConnectionStringsVariableSource.cs,v 1.4 2007/08/02 22:18:32 markpollack Exp $</version>
+    [Serializable]
+    public class ConnectionStringsVariableSource : IVariableSource
+    {
+        private NameValueCollection variables;
+
+        /// <summary>
+        /// Resolves variable value for the specified variable name.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the variable to resolve.
+        /// </param>
+        /// <returns>
+        /// The variable value if able to resolve, <c>null</c> otherwise.
+        /// </returns>
+        public string ResolveVariable(string name)
+        {
+            if (variables == null)
+            {
+                InitVariables();
+            }
+            return variables.Get(name);
+        }
+
+        /// <summary>
+        /// Initializes properties based on the specified 
+        /// property file locations.
+        /// </summary>
+        private void InitVariables()
+        {
+            variables = new NameValueCollection();
+            ConnectionStringSettingsCollection settings = ConfigurationManager.ConnectionStrings;
+            foreach (ConnectionStringSettings setting in settings)
+            {
+                string providerName = setting.ProviderName;
+
+                variables.Add(setting.Name + ".connectionString", setting.ConnectionString);
+                variables.Add(setting.Name + ".providerName",
+                              StringUtils.HasText(providerName) ? providerName : "System.Data.SqlClient");
+            }
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConstructorArgumentValues.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConstructorArgumentValues.cs
new file mode 100644
index 00000000..5ac02f1c
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConstructorArgumentValues.cs
@@ -0,0 +1,659 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using Spring.Collections;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Holder for constructor argument values for an object.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Supports values for a specific index or parameter name (case
+	/// insensitive) in the constructor argument list, and generic matches by
+	/// <see cref="System.Type.FullName"/>.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: ConstructorArgumentValues.cs,v 1.16 2008/03/03 09:29:07 bbaia Exp $</version>
+	/// <see cref="Spring.Objects.Factory.Config.IObjectDefinition.ConstructorArgumentValues"/>
+	[Serializable]
+	public class ConstructorArgumentValues
+	{
+		/// <summary>
+		/// Can be used as an argument filler for the
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.GetArgumentValue(int, string,Type,ISet)"/>
+		/// overload when one is not looking for an argument by index.
+		/// </summary>
+		public const int NoIndex = -1289; // yes, the number really is wholly arbitrary...
+
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+		/// class.
+		/// </summary>
+		public ConstructorArgumentValues()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+		/// class.
+		/// </summary>
+		/// <param name="other">
+		/// The <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+		/// to be used to populate this instance.
+		/// </param>
+		public ConstructorArgumentValues(ConstructorArgumentValues other)
+		{
+			AddAll(other);
+		}
+
+		#endregion
+
+		#region Fields
+
+        private CultureInfo enUSCultureInfo = new CultureInfo("en-US", false);
+		private IDictionary _indexedArgumentValues = new Hashtable();
+		private IList _genericArgumentValues = new LinkedList();
+		private IDictionary _namedArgumentValues = new Hashtable();
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Return the map of indexed argument values.
+		/// </summary>
+		/// <returns>
+		/// An <see cref="System.Collections.IDictionary"/> with
+		/// <see cref="System.Int32"/> indices as keys and
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>s
+		/// as values.
+		/// </returns>
+		public virtual IDictionary IndexedArgumentValues
+		{
+			get { return _indexedArgumentValues; }
+		}
+
+		/// <summary>
+		/// Return the map of named argument values.
+		/// </summary>
+		/// <returns>
+		/// An <see cref="System.Collections.IDictionary"/> with
+		/// <see cref="System.String"/> named arguments as keys and
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>s
+		/// as values.
+		/// </returns>
+		public virtual IDictionary NamedArgumentValues
+		{
+			get { return _namedArgumentValues; }
+		}
+
+		/// <summary>
+		/// Return the set of generic argument values.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.Collections.IList"/> of
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>s.
+		/// </returns>
+		public virtual IList GenericArgumentValues
+		{
+			get { return _genericArgumentValues; }
+
+		}
+
+		/// <summary>
+		/// Return the number of arguments held in this instance.
+		/// </summary>
+		public virtual int ArgumentCount
+		{
+			get
+			{
+				return IndexedArgumentValues.Count
+					+ GenericArgumentValues.Count
+					+ NamedArgumentValues.Count;
+			}
+
+		}
+
+		/// <summary>
+		/// Returns true if this holder does not contain any argument values,
+		/// neither indexed ones nor generic ones.
+		/// </summary>
+		public virtual bool Empty
+		{
+			get
+			{
+				return IndexedArgumentValues.Count == 0
+					&& GenericArgumentValues.Count == 0
+					&& NamedArgumentValues.Count == 0;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Copy all given argument values into this object.
+		/// </summary>
+		/// <param name="other">
+		/// The <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+		/// to be used to populate this instance.
+		/// </param>
+		public void AddAll(ConstructorArgumentValues other)
+		{
+			if (other != null)
+			{
+				foreach (object o in other.GenericArgumentValues)
+				{
+					GenericArgumentValues.Add(o);
+				}
+				foreach (DictionaryEntry entry in other.IndexedArgumentValues)
+				{
+					IndexedArgumentValues.Add(entry.Key, entry.Value);
+				}
+				foreach (DictionaryEntry entry in other.NamedArgumentValues)
+				{
+					NamedArgumentValues.Add(entry.Key, entry.Value);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Add argument value for the given index in the constructor argument list.
+		/// </summary>
+		/// <param name="index">
+		/// The index in the constructor argument list.
+		/// </param>
+		/// <param name="value">
+		/// The argument value.
+		/// </param>
+		public virtual void AddIndexedArgumentValue(int index, object value)
+		{
+			IndexedArgumentValues[index] = new ValueHolder(value);
+		}
+
+		/// <summary>
+		/// Add argument value for the given index in the constructor argument list.
+		/// </summary>
+		/// <param name="index">The index in the constructor argument list.</param>
+		/// <param name="value">The argument value.</param>
+		/// <param name="type">
+		/// The <see cref="System.Type.FullName"/> of the argument
+		/// <see cref="System.Type"/>.
+		/// </param>
+		public virtual void AddIndexedArgumentValue(int index, object value, string type)
+		{
+			IndexedArgumentValues[index] = new ValueHolder(value, type);
+		}
+
+		/// <summary>
+		/// Add argument value for the given name in the constructor argument list.
+		/// </summary>
+		/// <param name="name">The name in the constructor argument list.</param>
+		/// <param name="value">The argument value.</param>
+		/// <exception cref="ArgumentException">
+		/// If the supplied <paramref name="name"/> is <see langword="null"/>
+		/// or is composed wholly of whitespace.
+		/// </exception>
+		public virtual void AddNamedArgumentValue(string name, object value)
+		{
+			AssertUtils.ArgumentHasText(name, "name");
+			NamedArgumentValues[GetCanonicalNamedArgument(name)] = new ValueHolder(value);
+		}
+
+		/// <summary>
+		/// Get argument value for the given index in the constructor argument list.
+		/// </summary>
+		/// <param name="index">The index in the constructor argument list.</param>
+		/// <param name="requiredType">
+		/// The required <see cref="System.Type"/> of the argument.
+		/// </param>
+		/// <returns>
+		/// The
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+		/// for the argument, or <see langword="null"/> if none set.
+		/// </returns>
+		public virtual ValueHolder GetIndexedArgumentValue(int index, Type requiredType)
+		{
+			ValueHolder valueHolder = (ValueHolder) IndexedArgumentValues[index];
+			if (valueHolder != null)
+			{
+				if (valueHolder.Type == null
+					|| requiredType.FullName.Equals(valueHolder.Type)
+					|| requiredType.AssemblyQualifiedName.Equals(valueHolder.Type))
+				{
+					return valueHolder;
+				}
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Get argument value for the given name in the constructor argument list.
+		/// </summary>
+		/// <param name="name">The name in the constructor argument list.</param>
+		/// <returns>
+		/// The
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+		/// for the argument, or <see langword="null"/> if none set.
+		/// </returns>
+        public virtual ValueHolder GetNamedArgumentValue(string name)
+        {
+            ValueHolder valueHolder = null;
+            if (name != null && ContainsNamedArgument(name))
+            {
+                valueHolder = (ValueHolder)NamedArgumentValues[GetCanonicalNamedArgument(name)];
+            }
+            return valueHolder;
+        }
+
+		/// <summary>
+		/// Does this set of constructor arguments contain a named argument matching the
+		/// supplied <paramref name="argument"/> name?
+		/// </summary>
+		/// <remarks>
+		/// <note>
+		/// The comparison is performed in a case-insensitive fashion.
+		/// </note>
+		/// </remarks>
+		/// <param name="argument">The named argument to look up.</param>
+		/// <returns>
+		/// <see langword="true"/> if this set of constructor arguments
+		/// contains a named argument matching the supplied
+		/// <paramref name="argument"/> name.
+		/// </returns>
+		public bool ContainsNamedArgument(string argument)
+		{
+			return NamedArgumentValues.Contains(GetCanonicalNamedArgument(argument));
+		}
+
+		/// <summary>
+		/// Add generic argument value to be matched by type.
+		/// </summary>
+		/// <param name="value">
+		/// The argument value.
+		/// </param>
+		public virtual void AddGenericArgumentValue(object value)
+		{
+			GenericArgumentValues.Add(new ValueHolder(value));
+		}
+
+		/// <summary>
+		/// Add generic argument value to be matched by type.
+		/// </summary>
+		/// <param name="value">The argument value.</param>
+		/// <param name="type">
+		/// The <see cref="System.Type.FullName"/> of the argument
+		/// <see cref="System.Type"/>.
+		/// </param>
+		public virtual void AddGenericArgumentValue(object value, string type)
+		{
+			GenericArgumentValues.Add(new ValueHolder(value, type));
+		}
+
+		/// <summary>
+		/// Look for a generic argument value that matches the given
+		/// <see cref="System.Type"/>.
+		/// </summary>
+		/// <param name="requiredType">
+		/// The <see cref="System.Type"/> to match.
+		/// </param>
+		/// <returns>
+		/// The
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+		/// for the argument, or <see langword="null"/> if none set.
+		/// </returns>
+		public virtual ValueHolder GetGenericArgumentValue(Type requiredType)
+		{
+			return GetGenericArgumentValue(requiredType, null);
+		}
+
+		/// <summary>
+		/// Look for a generic argument value that matches the given
+		/// <see cref="System.Type"/>.
+		/// </summary>
+		/// <param name="requiredType">
+		/// The <see cref="System.Type"/> to match.
+		/// </param>
+		/// <param name="usedValues">
+		/// A <see cref="Spring.Collections.ISet"/> of
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+		/// objects that have already been used in the current resolution
+		/// process and should therefore not be returned again; this allows one
+		/// to return the next generic argument match in the case of multiple
+		/// generic argument values of the same type.
+		/// </param>
+		/// <returns>
+		/// The
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+		/// for the argument, or <see langword="null"/> if none set.
+		/// </returns>
+		public virtual ValueHolder GetGenericArgumentValue(
+			Type requiredType, ISet usedValues)
+		{
+			foreach (ValueHolder valueHolder in GenericArgumentValues)
+			{
+				if (usedValues == null || !usedValues.Contains(valueHolder))
+				{
+					if (requiredType != null)
+					{
+						if (StringUtils.HasText(valueHolder.Type))
+						{
+							if (valueHolder.Type.Equals(requiredType.FullName)
+								|| valueHolder.Type.Equals(requiredType.AssemblyQualifiedName))
+							{
+								return valueHolder;
+							}
+						}
+						else if (requiredType.IsInstanceOfType(valueHolder.Value)
+							|| (requiredType.IsArray
+								&& typeof (IList).IsInstanceOfType(valueHolder.Value)))
+						{
+							return valueHolder;
+						}
+					}
+						// if the value holder is (pretty much) untyped, that's ok to return...
+					else if (StringUtils.IsNullOrEmpty(valueHolder.Type))
+					{
+						return valueHolder;
+					}
+				}
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Look for an argument value that either corresponds to the given index
+		/// in the constructor argument list or generically matches by
+		/// <see cref="System.Type"/>.
+		/// </summary>
+		/// <param name="index">
+		/// The index in the constructor argument list.
+		/// </param>
+		/// <param name="requiredType">
+		/// The <see cref="System.Type"/> to match.
+		/// </param>
+		/// <returns>
+		/// The
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+		/// for the argument, or <see langword="null"/> if none is set.
+		/// </returns>
+		public virtual ValueHolder GetArgumentValue(int index, Type requiredType)
+		{
+			return GetArgumentValue(index, string.Empty, requiredType, null);
+		}
+
+		/// <summary>
+		/// Look for an argument value that either corresponds to the given index
+		/// in the constructor argument list or generically matches by
+		/// <see cref="System.Type"/>.
+		/// </summary>
+		/// <param name="index">
+		/// The index in the constructor argument list.
+		/// </param>
+		/// <param name="requiredType">
+		/// The <see cref="System.Type"/> to match.
+		/// </param>
+		/// <param name="usedValues">
+		/// A <see cref="Spring.Collections.ISet"/> of
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+		/// objects that have already been used in the current resolution
+		/// process and should therefore not be returned again; this allows one
+		/// to return the next generic argument match in the case of multiple
+		/// generic argument values of the same type.
+		/// </param>
+		/// <returns>
+		/// The
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+		/// for the argument, or <see langword="null"/> if none is set.
+		/// </returns>
+		public virtual ValueHolder GetArgumentValue(int index, Type requiredType, ISet usedValues)
+		{
+			return GetArgumentValue(index, string.Empty, requiredType, usedValues);
+		}
+
+		/// <summary>
+		/// Look for an argument value that either corresponds to the given index
+		/// in the constructor argument list or generically matches by
+		/// <see cref="System.Type"/>.
+		/// </summary>
+		/// <param name="name">
+		/// The name of the argument in the constructor argument list. May be
+		/// <see langword="null"/>, in which case generic matching by 
+		/// <see cref="System.Type"/> is assumed.
+		/// </param>
+		/// <param name="requiredType">
+		/// The <see cref="System.Type"/> to match.
+		/// </param>
+		/// <returns>
+		/// The
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+		/// for the argument, or <see langword="null"/> if none is set.
+		/// </returns>
+		public virtual ValueHolder GetArgumentValue(string name, Type requiredType)
+		{
+			return GetArgumentValue(NoIndex, name, requiredType, null);
+		}
+
+		/// <summary>
+		/// Look for an argument value that either corresponds to the given index
+		/// in the constructor argument list or generically matches by
+		/// <see cref="System.Type"/>.
+		/// </summary>
+		/// <param name="name">
+		/// The name of the argument in the constructor argument list. May be
+		/// <see langword="null"/>, in which case generic matching by 
+		/// <see cref="System.Type"/> is assumed.
+		/// </param>
+		/// <param name="requiredType">
+		/// The <see cref="System.Type"/> to match.
+		/// </param>
+		/// <param name="usedValues">
+		/// A <see cref="Spring.Collections.ISet"/> of
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+		/// objects that have already been used in the current resolution
+		/// process and should therefore not be returned again; this allows one
+		/// to return the next generic argument match in the case of multiple
+		/// generic argument values of the same type.
+		/// </param>
+		/// <returns>
+		/// The
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+		/// for the argument, or <see langword="null"/> if none is set.
+		/// </returns>
+		public virtual ValueHolder GetArgumentValue(
+			string name, Type requiredType, ISet usedValues)
+		{
+			return GetArgumentValue(NoIndex, name, requiredType, usedValues);
+		}
+
+		/// <summary>
+		/// Look for an argument value that either corresponds to the given index
+		/// in the constructor argument list, or to the named argument, or
+		/// generically matches by <see cref="System.Type"/>.
+		/// </summary>
+		/// <param name="index">
+		/// The index of the argument in the constructor argument list. May be
+		/// negative, to denote the fact that we are not looking for an
+		/// argument by index (see
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.NoIndex"/>.
+		/// </param>
+		/// <param name="name">
+		/// The name of the argument in the constructor argument list. May be
+		/// <see langword="null"/>.
+		/// </param>
+		/// <param name="requiredType">
+		/// The <see cref="System.Type"/> to match.
+		/// </param>
+		/// <param name="usedValues">
+		/// A <see cref="Spring.Collections.ISet"/> of
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+		/// objects that have already been used in the current resolution
+		/// process and should therefore not be returned again; this allows one
+		/// to return the next generic argument match in the case of multiple
+		/// generic argument values of the same type.
+		/// </param>
+		/// <returns>
+		/// The
+		/// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+		/// for the argument, or <see langword="null"/> if none is set.
+		/// </returns>
+		public virtual ValueHolder GetArgumentValue(
+			int index, string name, Type requiredType, ISet usedValues)
+		{
+			ValueHolder valueHolder = null;
+			if(index != NoIndex) 
+			{
+				valueHolder = GetIndexedArgumentValue(index, requiredType);
+			}
+			if (valueHolder == null)
+			{
+				valueHolder = GetNamedArgumentValue(name);
+				if (valueHolder == null)
+				{
+					valueHolder = GetGenericArgumentValue(requiredType, usedValues);
+				}
+			}
+			return valueHolder;
+		}
+
+		private string GetCanonicalNamedArgument(string argument)
+		{
+            return argument != null ? argument.ToLower(enUSCultureInfo) : argument;
+		}
+
+	    #endregion
+
+		#region Inner Class : ValueHolder
+
+		/// <summary>
+		/// Holder for a constructor argument value, with an optional
+		/// <see cref="System.Type"/> attribute indicating the target
+		/// <see cref="System.Type"/> of the actual constructor argument.
+		/// </summary>
+		[Serializable]
+		public class ValueHolder
+		{
+			#region Constructor (s) / Destructor
+
+			/// <summary>
+			/// Creates a new instance of the ValueHolder class.
+			/// </summary>
+			/// <param name="value">
+			/// The value of the constructor argument.
+			/// </param>
+			internal ValueHolder(object value)
+			{
+				Value = value;
+			}
+
+			/// <summary>
+			/// Creates a new instance of the ValueHolder class.
+			/// </summary>
+			/// <param name="value">
+			/// The value of the constructor argument.
+			/// </param>
+			/// <param name="typeName">
+			/// The <see cref="System.Type.FullName"/> of the argument
+			/// <see cref="System.Type"/>. Can also be one of the common
+			/// <see cref="System.Type"/> aliases (<c>int</c>, <c>bool</c>,
+			/// <c>float</c>, etc).
+			/// </param>
+			internal ValueHolder(object value, string typeName)
+			{
+				Value = value;
+				this.typeName = typeName;
+			}
+
+			#endregion
+
+			#region Methods
+
+			/// <summary>
+			/// A <see cref="System.String"/> that represents the current
+			/// <see cref="System.Object"/>.
+			/// </summary>
+			/// <returns>
+			/// A <see cref="System.String"/> that represents the current
+			/// <see cref="System.Object"/>.
+			/// </returns>
+			public override string ToString()
+			{
+				return string.Format(CultureInfo.InvariantCulture,
+				                     "'{0}' [{1}]", Value, Type);
+			}
+
+			#endregion
+
+			#region Properties
+
+			/// <summary>
+			/// Gets and sets the value for the constructor argument.
+			/// </summary>
+			/// <remarks>
+			/// <p>
+			/// Only necessary for manipulating a registered value, for example in
+			/// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>s.
+			/// </p>
+			/// </remarks>
+			public object Value
+			{
+				get { return _ctorValue; }
+				set { _ctorValue = value; }
+			}
+
+			/// <summary>
+			/// Return the <see cref="System.Type.FullName"/> of the constructor
+			/// argument.
+			/// </summary>
+			public string Type
+			{
+				get { return typeName; }
+			}
+
+			#endregion
+
+			#region Fields
+
+			private object _ctorValue;
+			private string typeName;
+
+			#endregion
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/CustomConverterConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/CustomConverterConfigurer.cs
new file mode 100644
index 00000000..22e44910
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/CustomConverterConfigurer.cs
@@ -0,0 +1,304 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+	/// implementation that allows for convenient registration of custom
+	/// <see cref="System.ComponentModel.TypeConverter"/>s.
+	/// </summary>
+	/// <remarks>
+	/// <note>
+	/// The use of this class is <i>typically</i> not required; the .NET
+	/// mechanism of associating a
+	/// <see cref="System.ComponentModel.TypeConverter"/> with a
+	/// <see cref="System.Type"/>  via the use of the
+	/// <see cref="System.ComponentModel.TypeConverterAttribute"/> is the
+	/// recommended (and standard) way. This class primarily exists to cover
+	/// those cases where third party classes to which one does not have the
+	/// source need to be exposed to the type conversion mechanism.
+	/// </note>
+	/// <p>
+	/// Because the
+	/// <see cref="Spring.Objects.Factory.Config.CustomConverterConfigurer"/>
+	/// class implements the
+	/// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+	/// interface, instances of this class that have been exposed in the
+	/// scope of an
+	/// <see cref="Spring.Context.IApplicationContext"/> will
+	/// <i>automatically</i> be picked up by the application context and made
+	/// available to the IoC container whenever type conversion is required. If
+	/// one is using a
+	/// <see cref="Spring.Objects.Factory.Config.CustomConverterConfigurer"/>
+	/// object definition within the scope of an
+	/// <see cref="Spring.Objects.Factory.IObjectFactory"/>, no such automatic
+	/// pickup of the
+	/// <see cref="Spring.Objects.Factory.Config.CustomConverterConfigurer"/>
+	/// is performed (custom converters will have to be added manually using the
+	/// <see cref="Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterCustomConverter(Type, TypeConverter)"/>
+	/// method). For <i>most</i> application scenarios, one will get better
+	/// mileage using the <see cref="Spring.Context.IApplicationContext"/>
+	/// abstraction.
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <p>
+	/// The following examples all assume XML based configuration, and use
+	/// inner object definitions to define the custom
+	/// <see cref="System.ComponentModel.TypeConverter"/> objects (nominally to
+	/// avoid polluting the object name space, but also because the
+	/// configuration simply reads better that way).
+	/// </p>
+	/// <code escaped="true">
+	/// <object id="customConverterConfigurer"
+	///	  type="Spring.Objects.Factory.Config.CustomConverterConfigurer, Spring.Core">
+	///   <property name="CustomConverters">
+	///     <dictionary>
+	///       <entry key="System.Date">
+	///         <object type="MyNamespace.MyCustomDateEditor"/>
+	///       </entry>
+	///       <entry key="MyNamespace.MyObject, MyAssembly">
+	///         <object id="myConverter"
+	///           type="MyNamespace.MObjectConverter, MyOtherAssembly">
+	///           <property name="aProperty" value="..."/>
+	///         </object>
+	///       </entry>
+	///     </dictionary>
+	///   </property>
+	/// </object>
+	/// </code>
+	/// <p>
+	/// The following example illustrates a complete (albeit naieve) use case
+	/// for this class, including a custom
+	/// <see cref="System.ComponentModel.TypeConverter"/> implementation, said
+	/// converters domain class, and the XML configuration that hooks the
+	/// converter in place and makes it available to a Spring.NET container for
+	/// use during object resolution.
+	/// </p>
+	/// <p>
+	/// The domain class is a simple data-only object that contains the data
+	/// required to send an email message (such as the host and user account
+	/// name). A developer would prefer to use a string of the form
+	/// <c>UserName=administrator,Password=r1l0k1l3y,Host=localhost</c> to
+	/// configure the mail settings and just let the container take care of the
+	/// conversion.
+	/// </p>
+	/// <code language="C#">
+	/// namespace ExampleNamespace
+	/// {
+	///		public sealed class MailSettings
+	///		{
+	///			private string _userName;
+	///			private string _password;
+	///			private string _host;
+	/// 
+	///			public string Host
+	///			{
+	///				get { return _host; }
+	///				set { _host = value; }
+	///			}
+	/// 
+	///		 	public string UserName
+	///			{
+	///				get { return _userName; }
+	///				set { _userName = value; }
+	///			}
+	/// 
+	///			public string Password
+	///			{
+	///				get { return _password; }
+	///				set { _password = value; }
+	///			}
+	///		}
+	/// 
+	///		public sealed class MailSettingsConverter : TypeConverter
+	///		{
+	///			public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+	///		 	{
+	/// 			if (typeof (string) == sourceType)
+	/// 			{
+	/// 				return true;
+	/// 			}
+	/// 			return base.CanConvertFrom(context, sourceType);
+	///			}
+	/// 
+	/// 		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+	/// 		{
+	/// 			string text = value as string;
+	/// 			if(text != null) 
+	/// 			{
+	/// 				MailSettings mailSettings = new MailSettings();
+	/// 				string[] tokens = text.Split(',');
+	/// 				for (int i = 0; i &lt; tokens.Length; ++i)
+	/// 				{
+	/// 					string token = tokens[i];
+	/// 					string[] settings = token.Split('=');
+	/// 					typeof(MailSettings).GetProperty(settings[0])
+	/// 						.SetValue(mailSettings, settings[1], null);
+	/// 				}
+	/// 				return mailSettings;
+	///				}
+	///				return base.ConvertFrom(context, culture, value);
+	///			}
+	///		}
+	///		
+	///		// a very naieve class that uses the MailSettings class...
+	///		public sealed class ExceptionLogger
+	///		{
+	///			private MailSettings _mailSettings;
+	///			
+	///			public MailSettings MailSettings {
+	///			{
+	///				set { _mailSettings = value; }
+	///			}
+	///			
+	///			public void Log(object value)
+	///			{
+	///				Exception ex = value as Exception;
+	///				if(ex != null) 
+	///				{
+	///					// use _mailSettings instance...
+	///				}
+	///			}
+	///		}
+	///	}
+	/// </code>
+	/// <p>
+	/// The attendant XML configuration for the above classes would be...
+	/// </p>
+	/// <code escaped="true">
+	/// <object id="emailingExceptionLogger" type="ExampleNamespace.ExceptionLogger, MyAssembly">
+	/// 	<property name="MailSettings" value="UserName=administrator,Password=r1l0k1l3y,Host=localhost" />
+	/// </object>
+	/// <object id="customConverterConfigurer" type="Spring.Objects.Factory.Config.CustomConverterConfigurer, Spring.Core">
+	/// 	<property name="CustomConverters">
+	/// 		<dictionary>
+	/// 			<entry key="ExampleNamespace.MailSettings, MyAssembly">
+	/// 				<object type="ExampleNamespace.MailSettingsConverter, MyAssembly" />
+	/// 			</entry>
+	/// 		</dictionary>
+	/// 	</property>
+	/// </object>
+	/// </code>
+	/// </example>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: CustomConverterConfigurer.cs,v 1.14 2007/05/11 02:32:14 markpollack Exp $</version>
+	/// <seealso cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+	/// <seealso cref="Spring.Context.IApplicationContext"/>
+	/// <seealso cref="Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterCustomConverter(Type, TypeConverter)"/>
+    [Serializable]
+    public class CustomConverterConfigurer : AbstractConfigurer
+	{
+		private IDictionary _customConverters;
+
+		/// <summary>
+		/// The custom converters to register.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The <see cref="System.Collections.IDictionary"/> uses the type name
+		/// of the class that requires conversion as the key, and an
+		/// <b>instance</b> of the
+		/// <see cref="System.ComponentModel.TypeConverter"/> that will effect
+		/// the conversion. Alternatively, the actual
+		/// <see cref="System.Type"/> of the class that requires conversion
+		/// can be used as the key.
+		/// </p>
+		/// </remarks>
+		/// <example>
+		/// <p>
+		/// <code language="C#">
+		/// IDictionary converters = new Hashtable();
+		/// converters.Add( "System.Date", new MyCustomDateConverter() );
+		/// // a System.Type instance can also be used as the key...
+		/// converters.Add( typeof(Color), new MyCustomRBGColorConverter() );
+		/// </code>
+		/// </p>
+		/// </example>
+		public IDictionary CustomConverters
+		{
+			set { this._customConverters = value; }
+		}
+
+		/// <summary>
+		/// Registers any custom converters with the supplied
+		/// <paramref name="factory"/>.
+		/// </summary>
+		/// <param name="factory">
+		/// The object factory to register the converters with.
+		/// </param>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In case of errors.
+		/// </exception>
+		public override void PostProcessObjectFactory(
+			IConfigurableListableObjectFactory factory)
+		{
+			if (_customConverters != null)
+			{
+				foreach (DictionaryEntry entry in _customConverters)
+				{
+					Type requiredType = ResolveRequiredType(entry.Key, "key", "custom type converter");
+					TypeConverter converter = ResolveConverter(entry.Value);
+					factory.RegisterCustomConverter(requiredType, converter);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Resolves the supplied <paramref name="value"/> into a
+		/// <see cref="System.ComponentModel.TypeConverter"/> instance.
+		/// </summary>
+		/// <param name="value">
+		/// The object that is to be resolved into a
+		/// <see cref="System.ComponentModel.TypeConverter"/> instance.
+		/// </param>
+		/// <returns>
+		/// A resolved <see cref="System.ComponentModel.TypeConverter"/> instance.
+		/// </returns>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If the supplied <paramref name="value"/> is <see langword="null"/>,
+		/// or the supplied <paramref name="value"/> cannot be resolved.
+		/// </exception>
+		protected virtual TypeConverter ResolveConverter(object value)
+		{
+			TypeConverter converter = value as TypeConverter;
+			if (converter == null)
+			{
+				throw new ObjectInitializationException(
+					"Mapped value for custom converter is not a " +
+						"[System.ComponentModel.TypeConverter] instance.");
+			}
+			return converter;
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/DelegateFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/DelegateFactoryObject.cs
new file mode 100644
index 00000000..7f6d7627
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/DelegateFactoryObject.cs
@@ -0,0 +1,179 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// <see cref="Spring.Objects.Factory.IFactoryObject"/> implementation that
+	/// creates delegates.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Supports the creation of <see cref="System.Delegate"/>s for both
+	/// instance and <see langword="static"/> methods.
+	/// </p>
+	/// </remarks>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: DelegateFactoryObject.cs,v 1.6 2007/03/16 04:01:35 aseovic Exp $</version>
+    [Serializable]
+    public class DelegateFactoryObject : AbstractFactoryObject
+	{
+		/// <summary>
+		/// Callback method called once all factory properties have been set.
+		/// </summary>
+		/// <exception cref="System.Exception">
+		/// In the event of misconfiguration (such as failure to set an essential
+		/// property) or if initialization fails.
+		/// </exception>
+		/// <seealso cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/> 
+		public override void AfterPropertiesSet()
+		{
+			if (DelegateType == null)
+			{
+				throw new ArgumentException(
+					"The 'DelegateType' property is required.");
+			}
+			if (!typeof (Delegate).IsAssignableFrom(DelegateType))
+			{
+				throw new ArgumentException(
+					"The 'DelegateType' property must (obviously) be a Type derived from [System.Delegate].");
+			}
+			if (TargetType == null && TargetObject == null)
+			{
+				throw new ArgumentException(
+					"Exactly one of either the 'TargetType' or 'TargetObject' properties is required.");
+			}
+			if (TargetType != null && TargetObject != null)
+			{
+				throw new ArgumentException(
+					"Exactly one of either the 'TargetType' or 'TargetObject' properties is required (not both).");
+			}
+			if (StringUtils.IsNullOrEmpty(MethodName))
+			{
+				throw new ArgumentException(
+					"The 'MethodName' property is required.");
+			}
+			base.AfterPropertiesSet();
+		}
+
+		/// <summary>
+		/// Creates the delegate.
+		/// </summary>
+		/// <exception cref="System.Exception">
+		/// If an exception occured during object creation.
+		/// </exception>
+		/// <returns>The object returned by this factory.</returns>
+		/// <seealso cref="Spring.Objects.Factory.Config.AbstractFactoryObject.CreateInstance()"/> 
+		protected override object CreateInstance()
+		{
+			Delegate instance = null;
+			if (TargetType != null)
+			{
+				instance = Delegate.CreateDelegate(DelegateType, TargetType, MethodName);
+			}
+			else
+			{
+				instance = Delegate.CreateDelegate(DelegateType, TargetObject, MethodName);
+			}
+			return instance;
+		}
+
+		#region Properties
+
+		/// <summary>
+		/// The <see cref="System.Type"/> of <see cref="System.Delegate"/>
+		/// created by this factory.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Returns the <see cref="System.Delegate"/> <see cref="System.Type"/>
+		/// if accessed prior to the <see cref="AfterPropertiesSet"/> method
+		/// being called.
+		/// </p>
+		/// </remarks>
+		public override Type ObjectType
+		{
+			get
+			{
+				return (DelegateType != null)
+				       	? DelegateType
+				       	: typeof (Delegate);
+			}
+		}
+
+		/// <summary>
+		/// The <see cref="System.Type"/> of the <see cref="System.Delegate"/>
+		/// created by this factory.
+		/// </summary>
+		public Type DelegateType
+		{
+			get { return _delegateType; }
+			set { _delegateType = value; }
+		}
+
+		/// <summary>
+		/// The name of the method that is to be invoked by the created
+		/// delegate.
+		/// </summary>
+		public string MethodName
+		{
+			get { return _methodName; }
+			set { _methodName = value; }
+		}
+
+		/// <summary>
+		/// The target <see cref="System.Type"/> if the <see cref="MethodName"/>
+		/// refers to a <see langword="static"/> method.
+		/// </summary>
+		public Type TargetType
+		{
+			get { return _targetType; }
+			set { _targetType = value; }
+		}
+
+		/// <summary>
+		/// The target object if the <see cref="MethodName"/>
+		/// refers to an instance method.
+		/// </summary>
+		public object TargetObject
+		{
+			get { return _targetObject; }
+			set { _targetObject = value; }
+		}
+
+		#endregion
+
+		#region Fields
+
+		private Type _delegateType;
+		private string _methodName;
+		private Type _targetType;
+		private object _targetObject;
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryFactoryObject.cs
new file mode 100644
index 00000000..b427b9d0
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryFactoryObject.cs
@@ -0,0 +1,132 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Collections;
+using System.Globalization;
+using Spring.Core;
+using Spring.Util;
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Simple factory for shared <see cref="System.Collections.IDictionary"/> instances.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: DictionaryFactoryObject.cs,v 1.7 2007/07/31 03:47:39 markpollack Exp $</version>
+    [Serializable]
+    public class DictionaryFactoryObject : AbstractFactoryObject
+	{
+		private IDictionary _sourceDictionary;
+		private Type _targetDictionaryType = typeof (Hashtable);
+
+		/// <summary>
+		/// Set the source <see cref="System.Collections.IDictionary"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This value will be used to populate the <see cref="System.Collections.IDictionary"/>
+		/// returned by this factory.
+		/// </p>
+		/// </remarks>
+		public IDictionary SourceDictionary
+		{
+			set { this._sourceDictionary = value; }
+		}
+
+		/// <summary>
+		/// Set the <see cref="System.Type"/> of the <see cref="System.Collections.IDictionary"/>
+		/// implementation to use.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The default is the <see cref="System.Collections.Hashtable"/> <see cref="System.Type"/>.
+		/// </p>
+		/// </remarks>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the <c>value</c> is <see langword="null"/>.
+		/// </exception>
+		/// <exception cref="System.ArgumentException">
+		/// If the <c>value</c> is an <see langword="abstract"/> <see cref="System.Type"/>.
+		/// </exception>
+		/// <exception cref="System.ArgumentException">
+		/// If the <c>value</c> is an interface.
+		/// </exception>
+		public Type TargetDictionaryType
+		{
+			set
+			{
+				AssertUtils.ArgumentNotNull(value, "value");
+				if (!typeof (IDictionary).IsAssignableFrom(value))
+				{
+					throw new ArgumentException(
+						string.Format(CultureInfo.InvariantCulture,
+						              "The Type passed to the TargetDictionaryType property must implement the '{0}' interface.",
+						              ObjectType.FullName));
+				}
+				if (value.IsInterface) 
+				{
+					throw new ArgumentException(
+						string.Format(CultureInfo.InvariantCulture,
+						"The Type passed to the TargetDictionaryType property cannot be an interface; it must be a concrete class that implements the '{0}' interface.",
+						ObjectType.FullName));
+				}
+				if (value.IsAbstract) 
+				{
+					throw new ArgumentException(
+						string.Format(CultureInfo.InvariantCulture,
+						"The Type passed to the TargetDictionaryType property cannot be abstract (MustInherit in VisualBasic.NET); it must be a concrete class that implements the '{0}' interface.",
+						ObjectType.FullName));
+				}
+				this._targetDictionaryType = value;
+			}
+		}
+
+		/// <summary>
+		/// The <see cref="System.Type"/> of objects created by this factory.
+		/// </summary>
+		/// <value>
+		/// Always returns the <see cref="System.Collections.IDictionary"/> <see cref="System.Type"/>.
+		/// </value>
+		public override Type ObjectType
+		{
+			get { return typeof (IDictionary); }
+		}
+
+		/// <summary>
+		/// Constructs a new instance of the target dictionary.
+		/// </summary>
+		/// <returns>The new <see cref="System.Collections.IDictionary"/> instance.</returns>
+		protected override object CreateInstance()
+		{
+			if (this._sourceDictionary == null)
+			{
+				throw new ArgumentException("The 'SourceDictionary' property cannot be null (Nothing in Visual Basic.NET).");
+			}
+			IDictionary result = (IDictionary) ObjectUtils.InstantiateType(this._targetDictionaryType);
+			foreach (DictionaryEntry de in _sourceDictionary)
+			{
+				result[de.Key] = de.Value;
+			}
+			return result;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableMode.cs b/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableMode.cs
new file mode 100644
index 00000000..eb81471c
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableMode.cs
@@ -0,0 +1,52 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Specifies how instances of the
+	/// <see cref="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+	/// class must apply environment variables when replacing values.
+	/// </summary>
+	/// <author>Mark Pollack</author>
+	/// <version>$Id: EnvironmentVariableMode.cs,v 1.6 2007/03/16 04:01:35 aseovic Exp $</version>
+    [Serializable]
+    public enum EnvironmentVariableMode
+	{
+		/// <summary>
+		/// Never replace environment variables.
+		/// </summary>
+		Never = 1,
+
+		/// <summary>
+		/// If properties are not specified via a resource, 
+		/// then resolve using environment variables.
+		/// </summary>
+		Fallback = 2,
+
+		/// <summary>
+		/// Apply environment variables first before applying properties from a
+		/// resource.
+		/// </summary>
+		Override = 3
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableSource.cs
new file mode 100644
index 00000000..dcf59a82
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableSource.cs
@@ -0,0 +1,48 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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;
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Implementation of <see cref="IVariableSource"/> that
+    /// resolves variable name against environment variables.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: EnvironmentVariableSource.cs,v 1.3 2007/08/02 22:18:32 markpollack Exp $</version>
+    [Serializable]
+    public class EnvironmentVariableSource : IVariableSource
+    {
+        /// <summary>
+        /// Resolves variable value for the specified variable name.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the variable to resolve.
+        /// </param>
+        /// <returns>
+        /// The variable value if able to resolve, <c>null</c> otherwise.
+        /// </returns>
+        public string ResolveVariable(string name)
+        {
+            return Environment.GetEnvironmentVariable(name);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/EventValues.cs b/src/Spring/Spring.Core/Objects/Factory/Config/EventValues.cs
new file mode 100644
index 00000000..9555be8f
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/EventValues.cs
@@ -0,0 +1,151 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Holder for event handler values for an object.
+    /// </summary>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: EventValues.cs,v 1.8 2007/03/16 04:01:38 aseovic Exp $</version>
+    [Serializable]
+    public class EventValues 
+    {
+        #region Constants
+        /// <summary>
+        /// The empty array of <see cref="Spring.Objects.IEventHandlerValue"/>s.
+        /// </summary>
+        private static readonly IEventHandlerValue [] EmptyHandlers
+            = new IEventHandlerValue [] {};
+        #endregion
+
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Config.EventValues"/> class.
+        /// </summary>
+        public EventValues() {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Config.EventValues"/> class.
+        /// </summary>
+        /// <param name="other">
+        /// The <see cref="Spring.Objects.Factory.Config.EventValues"/>
+        /// to be used to populate this instance.
+        /// </param>
+        public EventValues(EventValues other)
+        {
+            AddAll (other);
+        }
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// The mapping of event names to an
+        /// <see cref="System.Collections.ICollection"/> of
+        /// <see cref="Spring.Objects.IEventHandlerValue"/>s.
+        /// </summary>
+        protected IDictionary EventHandlers 
+        {
+            get 
+            {
+                return _eventHandlers;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="System.Collections.ICollection"/> of events
+        /// that have handlers associated with them.
+        /// </summary>
+        public ICollection Events 
+        {
+            get 
+            {
+                return EventHandlers.Keys;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="System.Collections.ICollection"/> of
+        /// <see cref="Spring.Objects.IEventHandlerValue"/>s for the supplied
+        /// event name.
+        /// </summary>
+        public ICollection this [string eventName] 
+        {
+            get 
+            {
+                return EventHandlers.Contains (eventName) ?
+                    EventHandlers [eventName] as ICollection :
+                    EventValues.EmptyHandlers;
+            }
+        }
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Copy all given argument values into this object.
+        /// </summary>
+        /// <param name="other">
+        /// The <see cref="Spring.Objects.Factory.Config.EventValues"/>
+        /// to be used to populate this instance.
+        /// </param>
+        public void AddAll (EventValues other) 
+        {
+            if (other != null) 
+            {
+                foreach (IList handlers in other.EventHandlers.Values) 
+                {
+                    foreach (IEventHandlerValue handler in handlers) 
+                    {
+                        AddHandler (handler);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds the supplied handler to the collection of event handlers.
+        /// </summary>
+        /// <param name="handler">The handler to be added.</param>
+        public void AddHandler (IEventHandlerValue handler) 
+        {
+            IList handlers = EventHandlers [handler.EventName] as IList;
+            if (handlers == null) 
+            {
+                handlers = new ArrayList ();
+                EventHandlers [handler.EventName] = handlers;
+            }
+            handlers.Add (handler);
+        }
+        #endregion
+
+        #region Fields
+        private IDictionary _eventHandlers = new Hashtable();
+        #endregion
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ExpressionHolder.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ExpressionHolder.cs
new file mode 100644
index 00000000..2ae29e8f
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ExpressionHolder.cs
@@ -0,0 +1,110 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using Spring.Expressions;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Immutable placeholder class used for the value of a
+	/// <see cref="Spring.Objects.PropertyValue"/> object when it's a reference
+	/// to a Spring <see cref="IExpression"/> that should be evaluated at runtime.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ExpressionHolder.cs,v 1.5 2007/08/21 19:28:33 markpollack Exp $</version>
+    [Serializable]
+    public class ExpressionHolder
+	{
+        #region Fields
+
+        private IExpression expression;
+        private string expressionString;
+	    private MutablePropertyValues properties;
+
+        #endregion
+        
+        #region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Config.ExpressionHolder"/>
+		/// class.
+		/// </summary>
+		/// <param name="expression">The expression to resolve.</param>
+		public ExpressionHolder(string expression)
+		{
+            expressionString = expression;
+            this.expression = Spring.Expressions.Expression.Parse(expression);
+		}
+
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Gets or sets the expression string.  Setting the expression string will cause
+        /// the expression to be parsed.
+        /// </summary>
+        /// <value>The expression string.</value>
+	    public string ExpressionString
+	    {
+	        get { return expressionString; }
+	    }
+
+	    /// <summary>
+		/// Return the expression.
+		/// </summary>
+		public IExpression Expression
+		{
+			get { return expression; }
+		}
+
+        /// <summary>
+        /// Properties for this expression node.
+        /// </summary>
+	    public MutablePropertyValues Properties
+	    {
+	        get { return properties; }
+	        set { properties = value; }
+	    }
+
+	    #endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Returns a string representation of this instance.
+		/// </summary>
+		/// <returns>A string representation of this instance.</returns>
+		public override string ToString()
+		{
+			return string.Format(
+			    CultureInfo.InvariantCulture, "<{0}>", expressionString);
+		}
+
+		#endregion
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/FieldRetrievingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/FieldRetrievingFactoryObject.cs
new file mode 100644
index 00000000..645cc7a8
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/FieldRetrievingFactoryObject.cs
@@ -0,0 +1,311 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Reflection;
+using System.Text;
+
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// <see cref="Spring.Objects.Factory.IFactoryObject"/> implementation that
+    /// retrieves a static or non-static <b>public</b> field value.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Typically used for retrieving <b>public</b> constants.
+    /// </p>
+    /// </remarks>
+    /// <example>
+    /// <p>
+    /// The following example retrieves the <see cref="System.DBNull.Value"/> field value...
+    /// </p>
+    /// <code escaped="true">
+    /// <object id="dbnull" type="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject, Spring.Core">
+    ///     <property name="TargetType" value="System.DBNull"/>
+    ///     <property name="TargetField" value="Value"/>
+    /// </object>
+    /// </code>
+    /// <p>
+    /// The previous example could also have been written using the convenience
+    /// <see cref="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.StaticField"/>
+    /// property, like so...
+    /// </p>
+    /// <code escaped="true">
+    /// <object id="dbnull" type="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject, Spring.Core">
+    ///     <property name="StaticField" value="System.DBNull.Value"/>
+    /// </object>
+    /// </code>
+    /// <p>
+    /// This class also implements the <see cref="Spring.Objects.Factory.IObjectNameAware"/>
+    /// interface
+    /// (<see cref="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.ObjectName"/>).
+    /// If the id (or name) of one's
+    /// <see cref="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject"/>
+    /// object definition is set to the <see cref="System.Type.AssemblyQualifiedName"/>
+    /// of the <see langword="static"/> field to be retrieved, then the id (or
+    /// name) of one's object definition will be used for the name of the
+    /// <see langword="static"/> field lookup. See below for an example of this
+    /// concise style of definition.
+    /// </p>
+    /// <code escaped="true">
+    /// <!-- returns the value of the DBNull.Value field -->
+    /// <object id="System.DBNull.Value"
+    ///         type="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject, Spring.Core"/>
+    ///
+    /// <!-- returns the value of the Type.Delimiter field -->
+    /// <object id="System.Type.Delimiter"
+    ///         type="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject, Spring.Core"/>
+    /// </code>
+    /// <p>
+    /// The usage for retrieving instance fields is similar. No example is shown
+    /// because public instance fields are <i>generally</i> bad practice; but if
+    /// you have some legacy code that exposes public instance fields, or if you
+    /// just really like coding public instance fields, then you can use this
+    /// <see cref="Spring.Objects.Factory.IFactoryObject"/> implementation to
+    /// retrieve such field values.
+    /// </p>
+    /// </example>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: FieldRetrievingFactoryObject.cs,v 1.8 2007/07/31 18:16:49 bbaia Exp $</version>
+    [Serializable]
+    public class FieldRetrievingFactoryObject : IFactoryObject, IInitializingObject, IObjectNameAware
+    {
+        private string targetField;
+        private object targetObject;
+        private Type targetType;
+        private FieldInfo field;
+        private string objectName;
+        private string staticField;
+
+        /// <summary>
+        /// The <see cref="System.Type.AssemblyQualifiedName"/> of the
+        /// <see langword="static"/> field to be retrieved.
+        /// </summary>
+        public string StaticField
+        {
+            set { this.staticField = value; }
+        }
+
+        /// <summary>
+        /// Set the name of the object in the object factory that created this object.
+        /// </summary>
+        /// <value>
+        /// The name of the object in the factory.
+        /// </value>
+        /// <remarks>
+        /// <p>
+        /// In the context of the
+        /// <see cref="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject"/>
+        /// class, the
+        /// <see cref="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.ObjectName"/>
+        /// value will be interepreted as the value of the
+        /// <see cref="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.StaticField"/>
+        /// property if no value has been explicitly assigned to the
+        /// <see cref="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.StaticField"/>
+        /// property. This allows for concise object definitions with just an id or name;
+        /// see the class documentation for
+        /// <see cref="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject"/>
+        /// for an example of this style of usage.
+        /// </p>
+        /// </remarks>
+        public string ObjectName
+        {
+            set { this.objectName = value; }
+        }
+
+        /// <summary>
+        /// The name of the field the value of which is to be retrieved.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the
+        /// <see cref="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.TargetObject"/>
+        /// has been set (and is not <cref lang="null"/>), then the value of this property
+        /// refers to an instance field name; it otherwise refers to a <see langword="static"/>
+        /// field name.
+        /// </p>
+        /// </remarks>
+        public string TargetField
+        {
+            get { return targetField; }
+            set { targetField = value; }
+        }
+
+        /// <summary>
+        /// The object instance on which the field is defined.
+        /// </summary>
+        public object TargetObject
+        {
+            get { return targetObject; }
+            set { targetObject = value; }
+        }
+
+        /// <summary>
+        /// The <see cref="System.Type"/> on which the field is defined.
+        /// </summary>
+        public Type TargetType
+        {
+            get { return targetType; }
+            set { targetType = value; }
+        }
+
+        /// <summary>
+        /// The <see cref="System.Type"/> of object that this
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/> creates, or
+        /// <cref lang="null"/> if not known in advance.
+        /// </summary>
+        public Type ObjectType
+        {
+            get { return (this.field == null) ? null : this.field.FieldType; }
+        }
+
+        /// <summary>
+        /// Is the object managed by this factory a singleton or a prototype?
+        /// </summary>
+        public bool IsSingleton
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has set all object properties supplied
+        /// (and satisfied <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and ApplicationContextAware).
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method allows the object instance to perform initialization only
+        /// possible when all object properties have been set and to throw an
+        /// exception in the event of misconfiguration.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as failure to set an essential
+        /// property) or if initialization fails.
+        /// </exception>
+        public void AfterPropertiesSet()
+        {
+            if (TargetType != null && TargetObject != null)
+            {
+                throw new ArgumentException(
+                    "Only one of the TargetType or TargetObject properties can be set, not both.");
+            }
+            if (TargetType == null && TargetObject == null)
+            {
+                if (TargetField != null)
+                {
+                    throw new ArgumentException(
+                        "Specify the TargetType or TargetObject property in combination with the TargetField property.");
+                }
+
+                // if no other property specified, use the object name for the static field expression...
+                if (StringUtils.IsNullOrEmpty(this.staticField))
+                {
+                    this.staticField = this.objectName;
+                }
+                ParseAndSetFromStaticFieldValue();
+            }
+            if (TargetField == null)
+            {
+                throw new ArgumentException("The TargetField property is required.");
+            }
+            BindingFlags fieldFlags = BindingFlags.Public | BindingFlags.IgnoreCase;
+            if (TargetObject == null)
+            {
+                // a static field...
+                fieldFlags |= BindingFlags.Static;
+            }
+            else
+            {
+                // an instance field...
+                fieldFlags |= BindingFlags.Instance;
+                TargetType = TargetObject.GetType();
+            }
+            this.field = targetType.GetField(TargetField, fieldFlags);
+            if (this.field == null)
+            {
+                throw new ObjectDefinitionStoreException(
+                    string.Format(
+                        CultureInfo.InvariantCulture,
+                        "No such field '{0}' on [{1}].", TargetField,
+                        TargetObject == null ? TargetType : TargetObject));
+            }
+        }
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the object
+        /// managed by this factory.
+        /// </summary>
+        /// <returns>
+        /// An instance (possibly shared or independent) of the object managed by
+        /// this factory.
+        /// </returns>
+        /// <see cref="Spring.Objects.Factory.IFactoryObject.GetObject"/>
+        public object GetObject()
+        {
+            if (TargetObject != null)
+            {
+                return this.field.GetValue(TargetObject);
+            }
+            else
+            {
+                return this.field.GetValue(null);
+            }
+        }
+
+        private void ParseAndSetFromStaticFieldValue()
+        {
+            TypeAssemblyHolder info = new TypeAssemblyHolder(this.staticField);
+            // the info.TypeName should now contains the Type name, followed by a
+            // period, followed by the name of the field
+            int lastDotIndex = info.TypeName.LastIndexOf('.');
+            if (lastDotIndex == -1
+                || lastDotIndex == info.TypeName.Length)
+            {
+                throw new ArgumentException(
+                    "The value passed to the StaticField property must be a fully " +
+                    "qualified Type plus field name: " +
+                    "e.g. 'Example.MyExampleClass.MyField, MyAssembly'");
+            }
+            string typeName = info.TypeName.Substring(0, lastDotIndex);
+            string fieldName = info.TypeName.Substring(lastDotIndex + 1);
+            StringBuilder buffer = new StringBuilder(typeName);
+            if (info.IsAssemblyQualified)
+            {
+                buffer.Append(TypeAssemblyHolder.TypeAssemblySeparator);
+                buffer.Append(info.AssemblyName);
+            }
+            TargetType = TypeResolutionUtils.ResolveType(buffer.ToString());
+            TargetField = fieldName;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IAutowireCapableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IAutowireCapableObjectFactory.cs
new file mode 100644
index 00000000..74924aff
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IAutowireCapableObjectFactory.cs
@@ -0,0 +1,134 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+    /// Extension of the <see cref="Spring.Objects.Factory.IObjectFactory"/>
+    /// interface to be implemented by object factories that are capable of
+    /// autowiring and expose this functionality for existing object instances.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+	public interface IAutowireCapableObjectFactory : IObjectFactory
+    {
+        /// <summary>
+        /// Create a new object instance of the given class with the specified
+        /// autowire strategy.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> of the object to instantiate.
+        /// </param>
+        /// <param name="autowireMode">
+        /// The desired autowiring mode.
+        /// </param>
+        /// <param name="dependencyCheck">
+        /// Whether to perform a dependency check for objects (not applicable to
+        /// autowiring a constructor, thus ignored there).
+        /// </param>
+        /// <returns>The new object instance.</returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the wiring fails.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.Config.AutoWiringMode"/>
+        object Autowire (
+            Type type, AutoWiringMode autowireMode, bool dependencyCheck);
+		
+        /// <summary>
+        /// Autowire the object properties of the given object instance by name or
+        /// <see cref="System.Type"/>.
+        /// </summary>
+        /// <param name="instance">
+        /// The existing object instance.
+        /// </param>
+        /// <param name="autowireMode">
+        /// The desired autowiring mode.
+        /// </param>
+        /// <param name="dependencyCheck">
+        /// Whether to perform a dependency check for the object.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the wiring fails.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.Config.AutoWiringMode"/>
+        void AutowireObjectProperties (
+            object instance, AutoWiringMode autowireMode, bool dependencyCheck);
+		
+        /// <summary>
+        /// Apply <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+        /// to the given existing object instance, invoking their
+        /// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization"/>
+        /// methods.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The returned object instance may be a wrapper around the original.
+        /// </p>
+        /// </remarks>
+        /// <param name="instance">
+        /// The existing object instance.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object.
+        /// </param>
+        /// <returns>
+        /// The object instance to use, either the original or a wrapped one.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If any post-processing failed.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization"/>
+        object ApplyObjectPostProcessorsBeforeInitialization (
+            object instance, string name);
+		
+        /// <summary>
+        /// Apply <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+        /// to the given existing object instance, invoking their
+        /// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization"/>
+        /// methods.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The returned object instance may be a wrapper around the original.
+        /// </p>
+        /// </remarks>
+        /// <param name="instance">
+        /// The existing object instance.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object.
+        /// </param>
+        /// <returns>
+        /// The object instance to use, either the original or a wrapped one.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If any post-processing failed.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization"/>
+        object ApplyObjectPostProcessorsAfterInitialization (
+            object instance, string name);
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableFactoryObject.cs
new file mode 100644
index 00000000..a84e3e12
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableFactoryObject.cs
@@ -0,0 +1,43 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using Spring.Objects.Factory;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Extension of the <see cref="Spring.Objects.Factory.IFactoryObject"/> interface 
+    /// that injects dependencies into the object managed by the factory.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: IConfigurableFactoryObject.cs,v 1.1 2007/07/29 19:39:27 markpollack Exp $</version>
+    public interface IConfigurableFactoryObject : IFactoryObject
+    {
+        /// <summary>
+        /// Gets the template object definition that should be used 
+        /// to configure the instance of the object managed by this factory.
+        /// </summary>
+        IObjectDefinition ProductTemplate { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableListableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableListableObjectFactory.cs
new file mode 100644
index 00000000..e0d16c2d
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableListableObjectFactory.cs
@@ -0,0 +1,123 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+    /// SPI interface to be implemented by most if not all listable object factories.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Allows for framework-internal plug'n'play, e.g. in
+    /// <see cref="Spring.Context.Support.AbstractApplicationContext"/>.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+	public interface IConfigurableListableObjectFactory
+        : IListableObjectFactory,
+          IConfigurableObjectFactory,
+          IAutowireCapableObjectFactory
+    {
+        /// <summary>
+        /// Return the registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+        /// given object, allowing access to its property values and constructor
+        /// argument values.
+        /// </summary>
+        /// <param name="name">The name of the object.</param>
+        /// <returns>
+        /// The registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>.
+        /// </returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there is no object with the given name.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of errors.
+        /// </exception>
+        IObjectDefinition GetObjectDefinition(string name);
+
+        /// <summary>
+        /// Return the registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+        /// given object, allowing access to its property values and constructor
+        /// argument values.
+        /// </summary>
+        /// <param name="name">The name of the object.</param>
+        /// <param name="includeAncestors">Whether to search parent object factories.</param>
+        /// <returns>
+        /// The registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>.
+        /// </returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there is no object with the given name.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of errors.
+        /// </exception>
+        IObjectDefinition GetObjectDefinition(string name, bool includeAncestors);
+
+
+        /// <summary>
+        /// Injects dependencies into the supplied <paramref name="target"/> instance
+        /// using the supplied <paramref name="definition"/>.
+        /// </summary>
+        /// <param name="target">
+        /// The object instance that is to be so configured.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object definition expressing the dependencies that are to
+        /// be injected into the supplied <parameref name="target"/> instance.
+        /// </param>
+        /// <param name="definition">
+        /// An object definition that should be used to configure object.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.ConfigureObject(object, string)"/>
+        object ConfigureObject(object target, string name, IObjectDefinition definition);
+
+        /// <summary>
+        /// Ensure that all non-lazy-init singletons are instantiated, also
+        /// considering <see cref="Spring.Objects.Factory.IFactoryObject"/>s.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Typically invoked at the end of factory setup, if desired.
+        /// </p>
+        /// <p>
+        /// As this is a startup method, it should destroy already created singletons if
+        /// it fails, to avoid dangling resources. In other words, after invocation
+        /// of that method, either all or no singletons at all should be
+        /// instantiated.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If one of the singleton objects could not be created.
+        /// </exception>
+        void PreInstantiateSingletons ();
+
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableObjectFactory.cs
new file mode 100644
index 00000000..9ac4faab
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableObjectFactory.cs
@@ -0,0 +1,235 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Configuration interface to be implemented by most if not all object
+	/// factories.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+    /// Provides the means to configure an object factory in addition to the
+    /// object factory client methods in the
+    /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface.
+	/// </p>
+	/// <p>
+    /// Allows for framework-internal plug'n'play even when needing access to object
+    /// factory configuration methods.
+	/// </p>
+	/// <p>
+	/// When disposed, it will destroy all cached singletons in this factory. Call
+	/// <see cref="System.IDisposable.Dispose()"/> when you want to shutdown
+	/// the factory.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: IConfigurableObjectFactory.cs,v 1.14 2007/07/16 21:06:21 markpollack Exp $</version>
+	public interface IConfigurableObjectFactory : IHierarchicalObjectFactory
+	{
+		/// <summary>
+		/// Set the parent of this object factory.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Note that the parent shouldn't be changed: it should only be set outside
+		/// a constructor if it isn't available when an object of this class is
+		/// created.
+		/// </p>
+		/// </remarks>
+		new IObjectFactory ParentObjectFactory { set; }
+
+		/// <summary>
+		/// Ignore the given dependency type for autowiring.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// To be invoked during factory configuration.
+		/// </p>
+		/// <p>
+		/// This will typically be used for dependencies that are resolved
+		/// in other ways, like <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// through <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>.
+		/// </p>
+		/// </remarks>
+		/// <param name="type">
+		/// The <see cref="System.Type"/> to be ignored.
+		/// </param>
+		void IgnoreDependencyType(Type type);
+
+
+        /// <summary>
+        /// Determines whether the specified object name is currently in creation..
+        /// </summary>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified object name is currently in creation; otherwise, <c>false</c>.
+        /// </returns>
+	    bool IsCurrentlyInCreation(string objectName);
+
+		/// <summary>
+		/// Add a new <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+		/// that will get applied to objects created by this factory.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// To be invoked during factory configuration.
+		/// </p>
+		/// </remarks>
+		/// <param name="processor">
+		/// The <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+		/// to register.
+		/// </param>
+		void AddObjectPostProcessor(IObjectPostProcessor processor);
+
+		/// <summary>
+		/// Returns the current number of registered
+		/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>s.
+		/// </summary>
+		/// <value>
+		/// The current number of registered
+		/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>s.
+		/// </value>
+		int ObjectPostProcessorCount 
+		{
+			get;
+		}
+
+		/// <summary>
+		/// Given an object name, create an alias.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is typically used to support names that are illegal within
+		/// XML ids (which are used for object names).
+		/// </p>
+		/// <p>
+		/// Typically invoked during factory configuration, but can also be
+		/// used for runtime registration of aliases. Therefore, a factory
+		/// implementation should synchronize alias access.
+		/// </p>
+		/// </remarks>
+		/// <param name="name">The name of the object.
+		/// </param>
+		/// <param name="theAlias">
+		/// The alias that will behave the same as the object name.
+		/// </param>
+		/// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+		/// If there is no object with the given name.
+		/// </exception>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If the alias is already in use.
+		/// </exception>
+		void RegisterAlias(string name, string theAlias);
+
+		/// <summary>
+		/// Register the given existing object as singleton in the object factory,
+		/// under the given object name.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Typically invoked during factory configuration, but can also be
+		/// used for runtime registration of singletons. Therefore, a factory
+		/// implementation should synchronize singleton access; it will have
+		/// to do this anyway if it supports lazy initialization of singletons.
+		/// </p>
+		/// </remarks>
+		/// <param name="name">
+		/// The name of the object.
+		/// </param>
+		/// <param name="singleton">The existing object.</param>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If the singleton could not be registered.
+		/// </exception>
+		void RegisterSingleton(string name, object singleton);
+
+		/// <summary>
+		/// Register the given custom <see cref="System.ComponentModel.TypeConverter"/>
+		/// for all properties of the given <see cref="System.Type"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// To be invoked during factory configuration.
+		/// </p>
+		/// </remarks>
+		/// <param name="requiredType">
+		/// The required <see cref="System.Type"/> of the property.
+		/// </param>
+		/// <param name="converter">
+		/// The <see cref="System.ComponentModel.TypeConverter"/> to register.
+		/// </param>
+		void RegisterCustomConverter(Type requiredType, TypeConverter converter);
+
+		/// <summary>
+		/// Does this object factory contains a singleton instance with the
+		/// supplied <paramref name="name"/>?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Only checks already instantiated singletons; does not return
+		/// <see langword="true"/> for singleton object definitions that have
+		/// not been instantiated yet.
+		/// </p>
+		/// <p>
+		/// The main purpose of this method is to check manually registered
+		/// singletons (<see cref="RegisterSingleton(string, object)"/>). This
+		/// method can also be used to check whether a singleton defined by an
+		/// object definition has already been created.
+		/// </p>
+		/// <p>
+		/// To check whether an object factory contains an object definition
+		/// with a given name, use the
+		/// <see cref="Spring.Objects.Factory.IListableObjectFactory.ContainsObjectDefinition(string)"/>
+		/// method. Calling both
+		/// <see cref="Spring.Objects.Factory.IListableObjectFactory.ContainsObjectDefinition(string)"/>
+		/// and <see cref="ContainsSingleton(string)"/> definitively answers
+		/// the question of whether a specific object factory contains a
+		/// singleton object with the given name.
+		/// </p>
+		/// <p>
+		/// Use the
+		/// <see cref="Spring.Objects.Factory.IObjectFactory.ContainsObject(string)"/>
+		/// method for general checks as to whether a factory knows about an
+		/// object with a given name (regrdless of whether the object in
+		/// question is a manually registed singleton instance or created by
+		/// an object definition)... this also has the happy bonus of also
+		/// checking any ancestor factories.
+		/// </p>
+		/// </remarks>
+		/// <param name="name">
+		/// The name of the (singleton) object to look for.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if this object factory contains a singleton
+		/// instance with the given <paramref name="name"/>.
+		/// </returns>
+		/// <seealso cref="Spring.Objects.Factory.IObjectFactory.ContainsObject(string)"/>
+		/// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.ContainsObjectDefinition(string)"/>
+		bool ContainsSingleton(string name);
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IDestructionAwareObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IDestructionAwareObjectPostProcessor.cs
new file mode 100644
index 00000000..8e72247e
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IDestructionAwareObjectPostProcessor.cs
@@ -0,0 +1,56 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Subinterface of
+	/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/> that adds
+	/// a before-destruction callback.
+	/// </summary>
+	/// <remarks>
+	/// The typical usage will be to invoke custom destruction callbacks on
+	/// specific object types, matching corresponding initialization callbacks.
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: IDestructionAwareObjectPostProcessor.cs,v 1.4 2006/04/09 07:18:47 markpollack Exp $</version>
+	public interface IDestructionAwareObjectPostProcessor : IObjectPostProcessor
+	{
+		/// <summary>
+		/// Apply this
+		/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/> to the
+		/// given new object instance before its destruction. Can invoke custom
+		/// destruction callbacks.
+		/// </summary>
+		/// <param name="instance">The new object instance.</param>
+		/// <param name="name">The name of the object.</param>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In case of errors.
+		/// </exception>
+		void PostProcessBeforeDestruction (object instance, string name);
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs
new file mode 100644
index 00000000..fca758e3
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs
@@ -0,0 +1,125 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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;
+using Spring.Objects.Factory.Support;
+
+namespace Spring.Objects.Factory.Config {
+
+	/// <summary>
+	/// Subinterface of
+	/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+	/// that adds a before-instantiation callback.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Typical use cases might include being used to suppress the default
+	/// instantiation of specific target objects, perhaps in favour of creating
+	/// proxies with special <c>Spring.Aop.ITargetSource</c>s (pooling targets,
+	/// lazily initializing targets, etc).
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: IInstantiationAwareObjectPostProcessor.cs,v 1.4 2007/08/22 08:49:39 markpollack Exp $</version>
+	public interface IInstantiationAwareObjectPostProcessor : IObjectPostProcessor
+	{
+		/// <summary>
+		/// Apply this
+		/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+		/// <i>before the target object gets instantiated</i>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The returned object may be a proxy to use instead of the target
+		/// object, effectively suppressing the default instantiation of the
+		/// target object.
+		/// </p>
+		/// <p>
+		/// If the object is returned by this method is not
+		/// <see langword="null"/>, the object creation process will be
+		/// short-circuited. The returned object will not be processed any
+		/// further; in particular, no further
+		/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+		/// callbacks will be applied to it. This mechanism is mainly intended
+		/// for exposing a proxy instead of an actual target object.
+		/// </p>
+		/// <p>
+		/// This callback will only be applied to object definitions with an
+		/// object class. In particular, it will <b>not</b> be applied to
+		/// objects with a "factory-method" (i.e. objects that are to be
+		/// instantiated via a layer of indirection anyway).
+		/// </p>
+		/// </remarks>
+		/// <param name="objectType">
+		/// The <see cref="System.Type"/> of the target object that is to be
+		/// instantiated.
+		/// </param>
+		/// <param name="objectName">
+		/// The name of the target object.
+		/// </param>
+		/// <returns>
+		/// The object to expose instead of a default instance of the target
+		/// object.
+		/// </returns>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In the case of any errors.
+		/// </exception>
+		/// <seealso cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.HasObjectType"/>
+		/// <seealso cref="IConfigurableObjectDefinition.FactoryMethodName"/>
+		object PostProcessBeforeInstantiation(Type objectType, string objectName);
+
+
+        /// <summary>
+        /// Perform operations after the object has been instantiated, via a constructor or factory method,
+        /// but before Spring property population (from explicit properties or autowiring) occurs.
+        /// </summary>
+        /// <param name="objectInstance">The object instance created, but whose properties have not yet been set</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>true if properties should be set on the object; false if property population
+        /// should be skipped.  Normal implementations should return true.  Returning false will also
+        /// prevent any subsequent InstantiationAwareObjectPostProcessor instances from being 
+        /// invoked on this object instance.</returns>
+        bool PostProcessAfterInstantiation(object objectInstance, string objectName);
+
+        /// <summary>
+        /// Post-process the given property values before the factory applies them
+        /// to the given object.
+        /// </summary>
+        /// <remarks>Allows for checking whether all dependencies have been
+        /// satisfied, for example based on a "Required" annotation on bean property setters.
+        /// <para>Also allows for replacing the property values to apply, typically through
+        /// creating a new MutablePropertyValues instance based on the original PropertyValues,
+        /// adding or removing specific values.
+        /// </para>
+        /// </remarks>
+        /// <param name="pvs">The property values that the factory is about to apply (never <code>null</code>).</param>
+        /// <param name="pis">he relevant property infos for the target object (with ignored
+        /// dependency types - which the factory handles specifically - already filtered out)</param>
+        /// <param name="objectInstance">The object instance created, but whose properties have not yet 
+        /// been set.</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>The actual property values to apply to the given object (can be the 
+        /// passed-in PropertyValues instances0 or null to skip property population.</returns>
+	    IPropertyValues PostProcessPropertyValues(IPropertyValues pvs, PropertyInfo[] pis, object objectInstance,
+	                                              string objectName);
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs
new file mode 100644
index 00000000..a570193e
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs
@@ -0,0 +1,208 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Describes an object instance, which has property values, constructor
+	/// argument values, and further information supplied by concrete implementations.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This is just a minimal interface: the main intention is to allow
+	/// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+	/// (like PropertyPlaceholderConfigurer) to access and modify property values.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: IObjectDefinition.cs,v 1.14 2007/07/30 17:52:22 markpollack Exp $</version>
+	public interface IObjectDefinition
+	{
+		/// <summary>
+		/// Return the property values to be applied to a new instance of the object.
+		/// </summary>
+		MutablePropertyValues PropertyValues { get; }
+
+		/// <summary>
+		/// Return the constructor argument values for this object.
+		/// </summary>
+		ConstructorArgumentValues ConstructorArgumentValues { get; }
+
+		/// <summary>
+		/// Return the event handlers for any events exposed by this object.
+		/// </summary>
+		EventValues EventHandlerValues { get; }
+
+		/// <summary>
+		/// Return a description of the resource that this object definition
+		/// came from (for the purpose of showing context in case of errors).
+		/// </summary>
+		string ResourceDescription { get; }
+
+        /// <summary>
+        /// Is this object definition a "template", i.e. not meant to be instantiated
+        /// itself but rather just serving as an object definition for configuration 
+        /// templates used by <see cref="Spring.Objects.Factory.IObjectFactory.ConfigureObject(object, string)"/>.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if this object definition is a "template".
+        /// </value>
+        bool IsTemplate { get; }
+
+		/// <summary>
+		/// Is this object definition "abstract", i.e. not meant to be instantiated
+		/// itself but rather just serving as parent for concrete child object
+		/// definitions.
+		/// </summary>
+		/// <value>
+		/// <see langword="true"/> if this object definition is "abstract".
+		/// </value>
+		bool IsAbstract { get; }
+
+		/// <summary>
+		/// Return whether this a <b>Singleton</b>, with a single, shared instance
+		/// returned on all calls.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If <see langword="false"/>, an object factory will apply the <b>Prototype</b>
+		/// design pattern, with each caller requesting an instance getting an
+		/// independent instance. How this is defined will depend on the
+		/// object factory implementation. <b>Singletons</b> are the commoner type.
+		/// </p>
+		/// </remarks>
+		bool IsSingleton { get; }
+
+        /// <summary>
+        /// Is this object lazily initialized?</summary>
+        /// <remarks>
+        /// <p>
+        /// Only applicable to a singleton object.
+        /// </p>
+        /// <p>
+        /// If <see langword="false"/>, it will get instantiated on startup by object factories
+        /// that perform eager initialization of singletons.
+        /// </p>
+        /// </remarks>
+        bool IsLazyInit { get; }
+
+		/// <summary>
+		/// Returns the <see cref="System.Type"/> of the object definition (if any).
+		/// </summary>
+		/// <value>
+		/// A resolved object <see cref="System.Type"/>.
+		/// </value>
+		/// <exception cref="ApplicationException">
+		/// If the <see cref="System.Type"/> of the object definition is not a
+		/// resolved <see cref="System.Type"/> or <see langword="null"/>.
+		/// </exception>
+		Type ObjectType { get; }
+
+        /// <summary>
+        /// Returns the <see cref="System.Type.FullName"/> of the
+        /// <see cref="System.Type"/> of the object definition.
+        /// </summary>
+        /// <remarks>Note that this does not have to be the actual type name used at runtime,
+        /// in case of a child definition overrding/inheriting the the type name from its
+        /// parent.  It can be modifed during object factory post-processing, typically 
+        /// replacing the original class name with a parsed variant of it.
+        /// Hence, do not consider this to be the definitive bean type at runtime
+        /// but rather only use it for parsing purposes at the individual object
+        /// definition level. 
+        /// </remarks>
+        string ObjectTypeName { get; set;}
+
+        /// <summary>
+        /// The autowire mode as specified in the object definition.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This determines whether any automagical detection and setting of
+        /// object references will happen. Default is
+        /// <see cref="Spring.Objects.Factory.Config.AutoWiringMode.No"/>,
+        /// which means there's no autowire.
+        /// </p>
+        /// </remarks>
+        AutoWiringMode AutowireMode { get; }
+
+        /// <summary>
+        /// The object names that this object depends on.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The object factory will guarantee that these objects get initialized
+        /// before.
+        /// </p>
+        /// <p>
+        /// Note that dependencies are normally expressed through object properties
+        /// or constructor arguments. This property should just be necessary for
+        /// other kinds of dependencies like statics (*ugh*) or database
+        /// preparation on startup.
+        /// </p>
+        /// </remarks>
+        string[] DependsOn { get; }
+
+        /// <summary>
+        /// The name of the initializer method.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The default is <see langword="null"/>, in which case there is no initializer method.
+        /// </p>
+        /// </remarks>
+        string InitMethodName { get; }
+
+        /// <summary>
+        /// Return the name of the destroy method.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The default is <see langword="null"/>, in which case there is no destroy method.
+        /// </p>
+        /// </remarks>
+        string DestroyMethodName { get; }
+
+        /// <summary>
+        /// The name of the factory method to use (if any).
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method will be invoked with constructor arguments, or with no
+        /// arguments if none are specified. The static method will be invoked on
+        /// the specified <see cref="Spring.Objects.Factory.Config.IObjectDefinition.ObjectType"/>.
+        /// </p>
+        /// </remarks>
+        string FactoryMethodName { get; }
+
+        /// <summary>
+        /// The name of the factory object to use (if any).
+        /// </summary>
+        string FactoryObjectName { get; }
+
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectFactoryPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectFactoryPostProcessor.cs
new file mode 100644
index 00000000..f9d00094
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectFactoryPostProcessor.cs
@@ -0,0 +1,72 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Allows for custom modification of an application context's object
+	/// definitions, adapting the object property values of the context's
+	/// underlying object factory.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Application contexts can auto-detect
+    /// <c>IObjectFactoryPostProcessor</c> objects in their object definitions and
+    /// apply them before any other objects get created.
+    /// </p>
+    /// <p>
+    /// Useful for custom config files targeted at system administrators that
+    /// override object properties configured in the application context.
+    /// </p>
+    /// <p>
+    /// See PropertyResourceConfigurer and its concrete implementations for
+    /// out-of-the-box solutions that address such configuration needs.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.Net)</author>
+	public interface IObjectFactoryPostProcessor 
+    {
+        /// <summary>
+        /// Modify the application context's internal object factory after its
+        /// standard initialization.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// All object definitions will have been loaded, but no objects will have
+        /// been instantiated yet. This allows for overriding or adding properties
+        /// even to eager-initializing objects.
+        /// </p>
+        /// </remarks>
+        /// <param name="factory">
+        /// The object factory used by the application context.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        void PostProcessObjectFactory (IConfigurableListableObjectFactory factory);
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectPostProcessor.cs
new file mode 100644
index 00000000..aef66001
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectPostProcessor.cs
@@ -0,0 +1,99 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Allows for custom modification of new object instances, e.g.
+	/// checking for marker interfaces or wrapping them with proxies.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Application contexts can auto-detect
+	/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+	/// objects in their object definitions and apply them before any other
+	/// objects get created. Plain object factories allow for programmatic
+	/// registration of post-processors.
+	/// </p>
+	/// <p>
+	/// Typically, post-processors that populate objects via marker interfaces
+	/// or the like will implement
+	/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization"/>,
+	/// and post-processors that wrap objects with proxies will normally implement
+	/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization"/>.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: IObjectPostProcessor.cs,v 1.9 2007/08/22 08:49:39 markpollack Exp $</version>
+	/// <see cref="Spring.Objects.Factory.Config.IInstantiationAwareObjectPostProcessor"/>
+	public interface IObjectPostProcessor
+	{
+		/// <summary>
+		/// Apply this <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+		/// to the given new object instance <i>before</i> any object initialization callbacks.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The object will already be populated with property values.
+		/// The returned object instance may be a wrapper around the original.
+		/// </p>
+		/// </remarks>
+		/// <param name="instance">
+		/// The new object instance.
+		/// </param>
+		/// <param name="name">
+		/// The name of the object.
+		/// </param>
+		/// <returns>
+		/// The object instance to use, either the original or a wrapped one.
+		/// </returns>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In case of errors.
+		/// </exception>
+		object PostProcessBeforeInitialization(object instance, string name);
+
+		/// <summary>
+		/// Apply this <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/> to the
+		/// given new object instance <i>after</i> any object initialization callbacks.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The object will already be populated with property values. The returned object
+		/// instance may be a wrapper around the original.
+		/// </p>
+		/// </remarks>
+		/// <param name="instance">
+		/// The new object instance.
+		/// </param>
+		/// <param name="objectName">
+		/// The name of the object.
+		/// </param>
+		/// <returns>
+		/// The object instance to use, either the original or a wrapped one.
+		/// </returns>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In case of errors.
+		/// </exception>
+		object PostProcessAfterInitialization(object instance, string objectName);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IVariableSource.cs
new file mode 100644
index 00000000..6494a0c8
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/IVariableSource.cs
@@ -0,0 +1,60 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Defines contract that different variable sources have to implement.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// The "variable sources" are objects containing name-value pairs
+    /// that allow a variable value to be retrieved for the given name.</p>
+    /// <p>
+    /// Out of the box, Spring.NET supports a number of variable sources, 
+    /// that allow users to obtain variable values from .NET config files,
+    /// Java-style property files, environment, registry, etc.</p>
+    /// <p>
+    /// Users can always write their own variable sources implementations,
+    /// that will allow them to load variable values from the database or 
+    /// other proprietary data source.</p>
+    /// </remarks>
+    /// <seealso cref="ConfigSectionVariableSource"/>
+    /// <seealso cref="PropertyFileVariableSource"/>
+    /// <seealso cref="EnvironmentVariableSource"/>
+    /// <seealso cref="CommandLineArgsVariableSource"/>
+    /// <seealso cref="RegistryVariableSource"/>
+    /// <seealso cref="SpecialFolderVariableSource"/>
+	/// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IVariableSource.cs,v 1.3 2007/08/02 22:18:32 markpollack Exp $</version>
+    public interface IVariableSource
+    {
+        /// <summary>
+        /// Resolves variable value for the specified variable name.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the variable to resolve.
+        /// </param>
+        /// <returns>
+        /// The variable value if able to resolve, <c>null</c> otherwise.
+        /// </returns>
+        string ResolveVariable(string name);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/InstantiationAwareObjectPostProcessorAdapter.cs b/src/Spring/Spring.Core/Objects/Factory/Config/InstantiationAwareObjectPostProcessorAdapter.cs
new file mode 100644
index 00000000..f69ad6b1
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/InstantiationAwareObjectPostProcessorAdapter.cs
@@ -0,0 +1,224 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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;
+using Spring.Objects.Factory.Support;
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Adapter that implements all methods on <see cref="SmartInstantiationAwareObjectPostProcessor"/>
+    /// as no-ops, which will not change normal processing of each object instantiated
+    /// by the container. Subclasses may override merely those methods that they are
+    /// actually interested in.
+    /// </summary>
+    /// <remarks>
+    /// Note that this base class is only recommendable if you actually require
+    /// <see cref="IInstantiationAwareObjectPostProcessor"/> functionality.  If all you need
+    /// is plain <see cref="IObjectPostProcessor"/> functionality, prefer a straight
+    /// implementation of that (simpler) interface.
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: InstantiationAwareObjectPostProcessorAdapter.cs,v 1.1 2008/04/02 18:02:24 markpollack Exp $</version>
+    public abstract class InstantiationAwareObjectPostProcessorAdapter : SmartInstantiationAwareObjectPostProcessor
+    {
+        #region SmartInstantiationAwareObjectPostProcessor Members
+
+        /// <summary>
+        /// Predicts the type of the object to be eventually returned from this
+        /// processors PostProcessBeforeInstantiation callback.
+        /// </summary>
+        /// <param name="objectType">The raw Type of the object.</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>The type of the object, or <code>null</code> if not predictable.</returns>
+        /// <exception cref="ObjectsException">in case of errors</exception>
+        public virtual Type PredictObjectType(Type objectType, string objectName)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Determines the candidate constructors to use for the given object.
+        /// </summary>
+        /// <param name="objectType">The raw Type of the object.</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>The candidate constructors, or <code>null</code> if none specified</returns>
+        /// <exception cref="ObjectsException">in case of errors</exception>
+        public virtual ConstructorInfo[] DetermineCandidateConstructors(Type objectType, string objectName)
+        {
+            return null;
+        }
+
+        #endregion
+
+        #region IInstantiationAwareObjectPostProcessor Members
+
+        /// <summary>
+        /// Apply this
+        /// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+        /// <i>before the target object gets instantiated</i>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The returned object may be a proxy to use instead of the target
+        /// object, effectively suppressing the default instantiation of the
+        /// target object.
+        /// </p>
+        /// <p>
+        /// If the object is returned by this method is not
+        /// <see langword="null"/>, the object creation process will be
+        /// short-circuited. The returned object will not be processed any
+        /// further; in particular, no further
+        /// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+        /// callbacks will be applied to it. This mechanism is mainly intended
+        /// for exposing a proxy instead of an actual target object.
+        /// </p>
+        /// <p>
+        /// This callback will only be applied to object definitions with an
+        /// object class. In particular, it will <b>not</b> be applied to
+        /// objects with a "factory-method" (i.e. objects that are to be
+        /// instantiated via a layer of indirection anyway).
+        /// </p>
+        /// </remarks>
+        /// <param name="objectType">
+        /// The <see cref="System.Type"/> of the target object that is to be
+        /// instantiated.
+        /// </param>
+        /// <param name="objectName">
+        /// The name of the target object.
+        /// </param>
+        /// <returns>
+        /// The object to expose instead of a default instance of the target
+        /// object.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of any errors.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.HasObjectType"/>
+        /// <seealso cref="IConfigurableObjectDefinition.FactoryMethodName"/>
+        public virtual object PostProcessBeforeInstantiation(Type objectType, string objectName)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Perform operations after the object has been instantiated, via a constructor or factory method,
+        /// but before Spring property population (from explicit properties or autowiring) occurs.
+        /// </summary>
+        /// <param name="objectInstance">The object instance created, but whose properties have not yet been set</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>true if properties should be set on the object; false if property population
+        /// should be skipped.  Normal implementations should return true.  Returning false will also
+        /// prevent any subsequent InstantiationAwareObjectPostProcessor instances from being 
+        /// invoked on this object instance.</returns>
+        public virtual bool PostProcessAfterInstantiation(object objectInstance, string objectName)
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// Post-process the given property values before the factory applies them
+        /// to the given object.
+        /// </summary>
+        /// <remarks>Allows for checking whether all dependencies have been
+        /// satisfied, for example based on a "Required" annotation on bean property setters.
+        /// <para>Also allows for replacing the property values to apply, typically through
+        /// creating a new MutablePropertyValues instance based on the original PropertyValues,
+        /// adding or removing specific values.
+        /// </para>
+        /// </remarks>
+        /// <param name="pvs">The property values that the factory is about to apply (never <code>null</code>).</param>
+        /// <param name="pis">he relevant property infos for the target object (with ignored
+        /// dependency types - which the factory handles specifically - already filtered out)</param>
+        /// <param name="objectInstance">The object instance created, but whose properties have not yet 
+        /// been set.</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>The actual property values to apply to the given object (can be the 
+        /// passed-in PropertyValues instances0 or null to skip property population.</returns>
+        public virtual IPropertyValues PostProcessPropertyValues(IPropertyValues pvs, PropertyInfo[] pis, object objectInstance,
+                                                         string objectName)
+        {
+            return pvs;
+        }
+
+        #endregion
+
+        #region IObjectPostProcessor Members
+
+        /// <summary>
+        /// Apply this <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+        /// to the given new object instance <i>before</i> any object initialization callbacks.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The object will already be populated with property values.
+        /// The returned object instance may be a wrapper around the original.
+        /// </p>
+        /// </remarks>
+        /// <param name="instance">
+        /// The new object instance.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object.
+        /// </param>
+        /// <returns>
+        /// The object instance to use, either the original or a wrapped one.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        public virtual object PostProcessBeforeInitialization(object instance, string name)
+        {
+            return instance;
+        }
+
+        /// <summary>
+        /// Apply this <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/> to the
+        /// given new object instance <i>after</i> any object initialization callbacks.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The object will already be populated with property values. The returned object
+        /// instance may be a wrapper around the original.
+        /// </p>
+        /// </remarks>
+        /// <param name="instance">
+        /// The new object instance.
+        /// </param>
+        /// <param name="objectName">
+        /// The name of the object.
+        /// </param>
+        /// <returns>
+        /// The object instance to use, either the original or a wrapped one.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        public virtual object PostProcessAfterInitialization(object instance, string objectName)
+        {
+            return instance;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ListFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ListFactoryObject.cs
new file mode 100644
index 00000000..db1ededc
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ListFactoryObject.cs
@@ -0,0 +1,131 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Simple factory for shared <see cref="System.Collections.IList"/> instances.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: ListFactoryObject.cs,v 1.8 2007/07/31 03:47:39 markpollack Exp $</version>
+    [Serializable]
+    public class ListFactoryObject : AbstractFactoryObject
+	{
+		private IList _sourceList;
+		private Type _targetListType = typeof (ArrayList);
+
+		#region Properties
+
+		/// <summary>
+		/// Set the source <see cref="System.Collections.IList"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This value will be used to populate the <see cref="System.Collections.IList"/>
+		/// returned by this factory.
+		/// </p>
+		/// </remarks>
+		public IList SourceList
+		{
+			set { this._sourceList = value; }
+		}
+
+		/// <summary>
+		/// Set the <see cref="System.Type"/> of the <see cref="System.Collections.IList"/>
+		/// implementation to use.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The default is the <see cref="System.Collections.ArrayList"/> <see cref="System.Type"/>.
+		/// </p>
+		/// </remarks>
+		public Type TargetListType
+		{
+			set
+			{
+				AssertUtils.ArgumentNotNull(value, "value");
+				if (!typeof (IList).IsAssignableFrom(value))
+				{
+					throw new ArgumentException(
+						string.Format(CultureInfo.InvariantCulture,
+						              "The Type passed to the TargetListType property must implement the '{0}' interface.",
+						              ObjectType.FullName));
+				}
+				if (value.IsInterface)
+				{
+					throw new ArgumentException(
+						string.Format(CultureInfo.InvariantCulture,
+						              "The Type passed to the TargetListType property cannot be an interface; it must be a concrete class that implements the '{0}' interface.",
+						              ObjectType.FullName));
+				}
+				if (value.IsAbstract)
+				{
+					throw new ArgumentException(
+						string.Format(CultureInfo.InvariantCulture,
+						              "The Type passed to the TargetListType property cannot be abstract (MustInherit in VisualBasic.NET); it must be a concrete class that implements the '{0}' interface.",
+						              ObjectType.FullName));
+				}
+				this._targetListType = value;
+			}
+		}
+
+		/// <summary>
+		/// The <see cref="System.Type"/> of objects created by this factory.
+		/// </summary>
+		/// <value>
+		/// Always returns the <see cref="System.Collections.IList"/> <see cref="System.Type"/>.
+		/// </value>
+		public override Type ObjectType
+		{
+			get { return typeof (IList); }
+		}
+
+		#endregion
+
+		/// <summary>
+		/// Constructs a new instance of the target dictionary.
+		/// </summary>
+		/// <returns>The new <see cref="System.Collections.IList"/> instance.</returns>
+		protected override object CreateInstance()
+		{
+			if (this._sourceList == null)
+			{
+				throw new ArgumentException("The 'SourceList' property cannot be null (Nothing in Visual Basic.NET).");
+			}
+			IList result = (IList) ObjectUtils.InstantiateType(this._targetListType);
+			foreach (object obj in this._sourceList)
+			{
+				result.Add(obj);
+			}
+			return result;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs
new file mode 100644
index 00000000..01901ade
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs
@@ -0,0 +1,171 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Common.Logging;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// <see cref="Spring.Objects.Factory.IFactoryObject"/> implementation that
+	/// creates instances of the <see cref="Common.Logging.ILog"/> class.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Typically used for retrieving shared <see cref="Common.Logging.ILog"/>
+	/// instances for common topics (such as the 'DAL', 'BLL', etc). The
+	/// <see cref="LogFactoryObject.LogName"/>
+	/// property determines the name of the
+    /// <a href="http://netcommon.sourceforge.net/">Common.Logging</a> logger.  
+	/// </p>
+	/// </remarks>
+	/// <author>Rick Evans</author>
+	/// <seealso cref="Common.Logging.LogManager.GetLogger(string)"/>
+	/// <version>$Id: LogFactoryObject.cs,v 1.3 2007/10/21 18:17:41 markpollack Exp $</version>
+    [Serializable]
+    public class LogFactoryObject : IFactoryObject, IInitializingObject
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="LogFactoryObject"/>
+		/// class.
+		/// </summary>
+		public LogFactoryObject()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="LogFactoryObject"/>
+		/// class.
+		/// </summary>
+		/// <param name="logName">
+		/// The name of the <see cref="Common.Logging.ILog"/> instance served up by
+		/// this factory.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="logName"/> is
+		/// <see langword="null"/> or contains only whitespace character(s).
+		/// </exception>
+		public LogFactoryObject(string logName)
+		{
+			LogName = logName;
+		}
+
+		#endregion
+
+		/// <summary>
+		/// The name of the <see cref="Common.Logging.ILog"/> instance served up by
+		/// this factory.
+		/// </summary>
+		/// <value>
+		/// The name of the <see cref="Common.Logging.ILog"/> instance served up by
+		/// this factory.
+		/// </value>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the <see langword="value"/> supplied to the setter is
+		/// <see langword="null"/> or contains only whitespace character(s).
+		/// </exception>
+		public string LogName
+		{
+			get { return this.logName; }
+			set
+			{
+				AssertUtils.ArgumentHasText(value, "The 'LogName' property must have a value.");
+				this.logName = value.Trim();
+			}
+		}
+
+		/// <summary>
+		/// Return an instance (possibly shared or independent) of the object
+		/// managed by this factory.
+		/// </summary>
+		/// <returns>
+		/// An instance (possibly shared or independent) of the object
+		/// managed by this factory.
+		/// </returns>
+		/// <seealso cref="Spring.Objects.Factory.IFactoryObject.GetObject"/>
+		public object GetObject()
+		{
+			if (this.log == null)
+			{
+				ValidateProperties();
+				this.log = LogManager.GetLogger(LogName);
+			}
+			return this.log;
+		}
+
+		/// <summary>
+		/// Return the type of object that this
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/> creates, or
+		/// <cref lang="null"/> if not known in advance.
+		/// </summary>
+		/// <seealso cref="Spring.Objects.Factory.IFactoryObject.ObjectType"/>
+		public Type ObjectType
+		{
+			get { return typeof(ILog); }
+		}
+
+		/// <summary>
+		/// Is the object managed by this factory a singleton or a prototype?
+		/// </summary>
+		/// <seealso cref="Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+		public bool IsSingleton
+		{
+			get { return true; }
+		}
+
+		/// <summary>
+		/// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// after it has set all object properties supplied
+		/// (and satisfied the
+		/// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+		/// and <see cref="Spring.Context.IApplicationContextAware"/>
+		/// interfaces).
+		/// </summary>
+		/// <exception cref="System.Exception">
+		/// In the event of misconfiguration (such as failure to set an essential
+		/// property) or if initialization fails.
+		/// </exception>
+		/// <seealso cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+		public void AfterPropertiesSet()
+		{
+			ValidateProperties();
+		}
+
+		private void ValidateProperties()
+		{
+			if (StringUtils.IsNullOrEmpty(LogName))
+			{
+				throw new ArgumentException("The 'LogName' property has not been set.");
+			}
+		}
+
+		private ILog log;
+		private string logName;
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/MethodInvokingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/MethodInvokingFactoryObject.cs
new file mode 100644
index 00000000..fc85033f
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/MethodInvokingFactoryObject.cs
@@ -0,0 +1,271 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Objects.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// An <see cref="Spring.Objects.Factory.IFactoryObject"/> that returns a value
+	/// that is the result of a <see langword="static"/> or instance method invocation.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Note that this class generally is expected to be used for accessing factory methods,
+	/// and as such defaults to operating in singleton mode. The first request to
+	/// <see cref="Spring.Objects.Factory.Config.MethodInvokingFactoryObject.GetObject()"/>
+	/// by the owning object factory will cause a method invocation, the return
+	/// value of which will be cached for all subsequent requests. The
+	/// <see cref="MethodInvokingFactoryObject.IsSingleton"/> property may be set to
+	/// <see langword="false"/>, to cause this factory to invoke the target method each
+	/// time it is asked for an object.
+	/// </p>
+	/// <p>
+	/// A <see langword="static"/> target method may be specified by setting the
+	/// <see cref="Spring.Objects.Support.MethodInvoker.TargetMethod"/> property to a string representing
+	/// the <see langword="static"/> method name, with <see cref="Spring.Objects.Support.MethodInvoker.TargetType"/> specifying
+	/// the <see cref="System.Type"/> that the <see langword="static"/> method is defined on.
+	/// Alternatively, a target instance method may be specified, by setting the
+	/// <see cref="Spring.Objects.Support.MethodInvoker.TargetObject"/> property as the target object, and
+	/// the <see cref="Spring.Objects.Support.MethodInvoker.TargetMethod"/> property as the name of the
+	/// method to call on that target object. Arguments for the method invocation may be
+	/// specified by setting the <see cref="Spring.Objects.Support.MethodInvoker.Arguments"/> property.
+	/// </p>
+	/// <p>
+	/// Another (esoteric) use case for this factory object is when one needs to call a method
+	/// that doesn't return any value (for example, a <see langword="static"/> class method to
+	/// force some sort of initialization to happen)... this use case is not supported by
+	/// factory-methods, since a return value is needed to become the object.
+	/// </p>
+	/// <p>
+	/// <note>
+	/// This class depends on the
+	/// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet()"/>
+	/// method being called after all properties have been set, as per the
+	/// <see cref="Spring.Objects.Factory.IInitializingObject"/> contract. If you are
+	/// using this class outside of a Spring.NET IoC container, you must call one of either
+	/// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet()"/> or
+	/// <see cref="Spring.Objects.Support.MethodInvoker.Prepare()"/> yourself to ready the object's internal
+	/// state, or you will get a nasty <see cref="System.NullReferenceException"/>.
+	/// </note>
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <p>
+	/// The following example uses an instance of this class to call a <see langword="static"/>
+	/// factory method...
+	/// </p>
+	/// <code escaped="true">
+	/// <object id="myObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core">
+	///   <property name="TargetType" value="Whatever.MyClassFactory, MyAssembly"/>
+	///   <property name="TargetMethod" value="Instance"/>
+	///   <!-- the ordering of arguments is significant -->
+	///   <property name="Arguments">
+	///		<list>
+	///			<value>1st</value>
+	///			<value>2nd</value>
+	///			<value>and 3rd arguments</value>
+	///		</list>
+	///   </property>
+	/// </object>
+	/// </code>
+	/// <p>
+	/// The following example is similar to the preceding example; the only pertinent difference is the fact that
+	/// a number of different objects are passed as arguments, demonstrating that not only simple value types
+	/// are valid as elements of the argument list...
+	/// </p>
+	/// <code language="C#">
+	/// </code>
+	/// <code escaped="true">
+	/// <object id="myObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core">
+	///   <property name="TargetType" value="Whatever.MyClassFactory, MyAssembly"/>
+	///   <property name="TargetMethod" value="Instance"/>
+	///   <!-- the ordering of arguments is significant -->
+	///   <property name="Arguments">
+	///		<list>
+	///			<!-- a primitive type (a string) -->
+	///			<value>1st</value>
+	///			<!-- an inner object definition is passed as the second argument -->
+	///			<object type="Whatever.SomeClass, MyAssembly"/>
+	///			<!-- a reference to another objects is passed as the third argument -->
+	///			<ref object="someOtherObject"/>
+	///			<!-- another list is passed as the fourth argument -->
+	///			<list>
+	///				<value>http://www.springframework.net/</value>
+	///			</list>
+	///		</list>
+	///   </property>
+	/// </object>
+	/// </code>
+	/// <p>
+	/// Named parameters are also supported... this next example yields the same results as
+	/// the preceding example (that did not use named arguments).
+	/// </p>
+	/// <code escaped="true">
+	/// <object id="myObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core">
+	///   <property name="TargetObject">
+	///     <object type="Whatever.MyClassFactory, MyAssembly"/>
+	///   </property>
+	///   <property name="TargetMethod" value="Execute"/>
+	///   <!-- the ordering of named arguments is not significant -->
+	///   <property name="NamedArguments">
+	///		<dictionary>
+	///			<entry key="argumentName"><value>1st</value></entry>
+	///			<entry key="finalArgumentName"><value>and 3rd arguments</value></entry>
+	///			<entry key="anotherArgumentName"><value>2nd</value></entry>
+	///		</dictionary>
+	///   </property>
+	/// </object>
+	/// </code>
+	/// <p>
+	/// Similarly, the following example uses an instance of this class to call an instance method...
+	/// </p>
+	/// <code escaped="true">
+	/// <object id="myMethodObject" type="Whatever.MyClassFactory, MyAssembly" />
+	/// <object id="myObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core">
+	///   <property name="TargetObject">
+	///     <ref local="myMethodObject"/>
+	///   </property>
+	///   <property name="TargetMethod" value="Execute"/>
+	/// </object>
+	/// </code>
+	/// <p>
+	/// The above example could also have been written using an anonymous inner object definition... if the
+	/// object on which the method is to be invoked is not going to be used outside of the factory object
+	/// definition, then this is the preferred idiom because it limits the scope of the object on which the
+	/// method is to be invoked to the surrounding factory object.
+	/// </p>
+	/// <code escaped="true">
+	/// <object id="myObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core">
+	///   <property name="TargetObject">
+	///     <object type="Whatever.MyClassFactory, MyAssembly"/>
+	///   </property>
+	///   <property name="TargetMethod" value="Execute"/>
+	/// </object>
+	/// </code>
+	/// </example>
+	/// <author>Colin Sampaleanu</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: MethodInvokingFactoryObject.cs,v 1.15 2007/03/16 04:01:38 aseovic Exp $</version>
+	/// <seealso cref="Spring.Objects.Support.MethodInvoker"/>
+	/// <seealso cref="Spring.Objects.Support.ArgumentConvertingMethodInvoker"/>
+    [Serializable]
+    public class MethodInvokingFactoryObject : ArgumentConvertingMethodInvoker, IFactoryObject, IInitializingObject
+	{
+		private bool singleton = true;
+		private object singletonObject;
+
+		/// <summary>
+		/// If a singleton should be created, or a new object on each request.
+		/// Defaults to <see langword="true"/>.
+		/// </summary>
+		public bool IsSingleton
+		{
+			get { return singleton; }
+			set { singleton = value; }
+		}
+
+		/// <summary>
+		/// Return the return value <see cref="System.Type"/> of the method
+		/// that this factory invokes, or <see langword="null"/> if not
+		/// known in advance.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If the return value of the method that this factory is to invoke is
+		/// <see langword="void"/>, then the <see cref="System.Reflection.Missing"/>
+		/// <see cref="System.Type"/> will be returned (in accordance with the
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/> contract that
+		/// treats a <see langword="null"/> value as a configuration error).
+		/// </p>
+		/// </remarks>
+		/// <seealso cref="Spring.Objects.Factory.IFactoryObject.ObjectType"/>
+		public Type ObjectType
+		{
+			get
+			{
+				Type objectType = null;
+				if (GetPreparedMethod() != null)
+				{
+					objectType = GetPreparedMethod().ReturnType;
+					if (objectType.Equals(typeof (void)))
+					{
+						objectType = Void.GetType();
+					}
+				}
+				return objectType;
+			}
+		}
+
+		/// <summary>
+		/// Return an instance (possibly shared or independent) of the object
+		/// managed by this factory.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Returns the return value of the method that is to be invoked.
+		/// </p>
+		/// <p>
+		/// Will return the same value each time if the
+		/// <see cref="Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+		/// property value is <see langword="true"/>.
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// An instance (possibly shared or independent) of the object managed by
+		/// this factory.
+		/// </returns>
+		/// <seealso cref="Spring.Objects.Factory.IFactoryObject.GetObject"/>
+		public object GetObject()
+		{
+			if (singleton)
+			{
+				if (singletonObject == null)
+				{
+					singletonObject = Invoke();
+				}
+				return singletonObject;
+			}
+			return Invoke();
+		}
+
+		/// <summary>
+		/// Prepares this method invoker.
+		/// </summary>
+		/// <exception cref="System.ArgumentException">
+		/// If all required properties are not set.
+		/// </exception>
+		/// <exception cref="System.MissingMethodException">
+		/// If the specified method could not be found.
+		/// </exception>
+		/// <seealso cref="Spring.Objects.Support.ArgumentConvertingMethodInvoker.Prepare()"/>
+		public void AfterPropertiesSet()
+		{
+			Prepare();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionHolder.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionHolder.cs
new file mode 100644
index 00000000..d631eeb7
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionHolder.cs
@@ -0,0 +1,137 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Xml;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Holder for an <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> with
+    /// name and aliases.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Recognized by
+    /// <see cref="Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory"/>
+    /// for inner object definitions. Registered by
+    /// <see cref="ObjectsNamespaceParser"/>,
+    /// which also uses it as general holder for a parsed object definition.
+    /// </p>
+    /// <p>
+    /// Can also be used for programmatic registration of inner object
+    /// definitions. If you don't care about the functionality offered by the
+    /// <see cref="Spring.Objects.Factory.IObjectNameAware"/> interface and the like,
+    /// registering <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+    /// or <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/> is good enough.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Simon White (.NET)</author>
+    /// <version>$Id: ObjectDefinitionHolder.cs,v 1.2 2007/08/07 22:05:20 markpollack Exp $</version>
+    [Serializable]
+    public class ObjectDefinitionHolder
+    {
+        private IObjectDefinition objectDefinition;
+        private string objectName;
+        private string[] aliases;
+
+        #region Constructor () / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="ObjectDefinitionHolder"/> class.
+        /// </summary>
+        /// <param name="definition">
+        /// The object definition to be held by this instance.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object definition.
+        /// </param>
+        public ObjectDefinitionHolder(IObjectDefinition definition, string name)
+            : this(definition, name, StringUtils.EmptyStrings)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="ObjectDefinitionHolder"/> class.
+        /// </summary>
+        /// <param name="definition">
+        /// The object definition to be held by this instance.
+        /// </param>
+        /// <param name="name">The name of the object.</param>
+        /// <param name="aliases">
+        /// Any aliases for the supplied <paramref name="definition"/>
+        /// </param>
+        public ObjectDefinitionHolder(
+            IObjectDefinition definition, string name, string[] aliases)
+        {
+            this.objectDefinition = definition;
+            this.objectName = name;
+            this.aliases = aliases == null ? StringUtils.EmptyStrings : aliases;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> held by this
+        /// instance.
+        /// </summary>
+        public IObjectDefinition ObjectDefinition
+        {
+            get { return objectDefinition; }
+        }
+
+        /// <summary>
+        /// The name of the object definition.
+        /// </summary>
+        public string ObjectName
+        {
+            get { return objectName; }
+        }
+
+        /// <summary>
+        /// Any aliases for the object definition.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Guaranteed to never return <cref lang="null"/>; if the associated
+        /// <see cref="ObjectDefinition"/>
+        /// does not have any aliases associated with it, then an empty
+        /// <see cref="System.String"/> array will be returned.
+        /// </p>
+        /// </remarks>
+        public string[] Aliases
+        {
+            get { return aliases; }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionVisitor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionVisitor.cs
new file mode 100644
index 00000000..007edef0
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionVisitor.cs
@@ -0,0 +1,380 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+
+using Spring.Collections;
+using Spring.Util;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Visitor class for traversing <see cref="IObjectDefinition"/> objects, in particular
+    /// the property values and constructor arguments contained in them resolving
+    /// object metadata values.
+    /// </summary>
+    /// <remarks>
+    /// Used by <see cref="PropertyPlaceholderConfigurer"/> and <see cref="VariablePlaceholderConfigurer"/>
+    /// to parse all string values contained in a ObjectDefinition, resolving any placeholders found.
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: ObjectDefinitionVisitor.cs,v 1.9 2008/02/18 00:02:27 bbaia Exp $</version>
+    public class ObjectDefinitionVisitor
+    {
+        private IVariableSource variableSource;
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObjectDefinitionVisitor"/> class, 
+        /// applying the specified IVariableSource to all object metadata values.
+        /// </summary>
+        /// <param name="variableSource">The variable source.</param>
+        public ObjectDefinitionVisitor(IVariableSource variableSource)
+        {
+            this.variableSource = variableSource;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObjectDefinitionVisitor"/> class
+        /// for subclassing
+        /// </summary>
+        /// <remarks>Subclasses should override the <code>ResolveStringValue</code> method</remarks>
+        protected ObjectDefinitionVisitor()
+        {           
+        }
+
+        /// <summary>
+        /// Traverse the given ObjectDefinition object and the MutablePropertyValues
+        /// and ConstructorArgumentValues contained in them.
+        /// </summary>
+        /// <param name="definition">The object definition to traverse.</param>
+        public virtual void VisitObjectDefinition(IObjectDefinition definition)
+        {
+            VisitObjectTypeName(definition);
+            VisitPropertyValues(definition);
+
+			ConstructorArgumentValues cas = definition.ConstructorArgumentValues;
+            if (cas != null)
+            {
+                VisitIndexedArgumentValues(cas.IndexedArgumentValues);
+                VisitNamedArgumentValues(cas.NamedArgumentValues);
+                VisitGenericArgumentValues(cas.GenericArgumentValues);
+            }
+        }
+
+        /// <summary>
+        /// Visits the ObjectDefinition property ObjectTypeName, replacing string values using 
+        /// the specified IVariableSource.
+        /// </summary>
+        /// <param name="objectDefinition">The object definition.</param>
+        protected virtual void VisitObjectTypeName(IObjectDefinition objectDefinition)
+        {
+            string objectTypeName = objectDefinition.ObjectTypeName;
+            if (objectTypeName != null)
+            {
+                string resolvedName = ResolveStringValue(objectTypeName).ToString();
+                if (!objectTypeName.Equals(resolvedName))
+                {
+                    objectDefinition.ObjectTypeName = resolvedName;
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Visits the property values of the ObjectDefinition, replacing string values
+        /// using the specified IVariableSource.
+        /// </summary>
+        /// <param name="objectDefinition">The object definition.</param>
+        protected virtual void VisitPropertyValues(IObjectDefinition objectDefinition)
+        {
+            MutablePropertyValues pvs = objectDefinition.PropertyValues;
+            if (pvs != null)
+            {
+                for (int j = 0; j < pvs.PropertyValues.Length; j++)
+                {
+                    PropertyValue pv = pvs.PropertyValues[j];
+                    object newVal = ResolveValue(pv.Value);
+                    if (!ObjectUtils.NullSafeEquals(newVal, pv.Value))
+                    {
+                        pvs.Add(pv.Name, newVal);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits the indexed constructor argument values, replacing string values using the
+        /// specified IVariableSource.
+        /// </summary>
+        /// <param name="ias">The indexed argument values.</param>
+        protected virtual void VisitIndexedArgumentValues(IDictionary ias)
+        {
+            foreach (ConstructorArgumentValues.ValueHolder valueHolder in ias.Values)
+            {
+                ConfigureConstructorArgument(valueHolder);
+            }
+        }
+
+        /// <summary>
+        /// Visits the named constructor argument values, replacing string values using the
+        /// specified IVariableSource.
+        /// </summary>
+        /// <param name="nav">The named argument values.</param>
+        protected virtual void VisitNamedArgumentValues(IDictionary nav)
+        {
+            foreach (ConstructorArgumentValues.ValueHolder valueHolder in nav.Values)
+            {
+                ConfigureConstructorArgument(valueHolder);
+            }
+        }
+
+        /// <summary>
+        /// Visits the generic constructor argument values, replacing string values using
+        /// the specified IVariableSource.
+        /// </summary>
+        /// <param name="gav">The genreic argument values.</param>
+        protected virtual void VisitGenericArgumentValues(IList gav)
+        {
+            foreach (ConstructorArgumentValues.ValueHolder valueHolder in gav)
+            {
+                ConfigureConstructorArgument(valueHolder);
+            }
+        }
+
+        /// <summary>
+        /// Configures the constructor argument ValueHolder.
+        /// </summary>
+        /// <param name="valueHolder">The vconstructor alue holder.</param>
+        protected void ConfigureConstructorArgument(ConstructorArgumentValues.ValueHolder valueHolder)
+        {
+            object newVal = ResolveValue(valueHolder.Value);
+            if (!ObjectUtils.NullSafeEquals(newVal, valueHolder.Value))
+            {
+                valueHolder.Value = newVal;
+            }
+        }
+
+        /// <summary>
+        /// Resolves the given value taken from an object definition according to its type
+        /// </summary>
+        /// <param name="value">the value to resolve</param>
+        /// <returns>the resolved value</returns>
+        protected virtual object ResolveValue(object value)
+        {
+            if (value is IObjectDefinition)
+            {
+                VisitObjectDefinition((IObjectDefinition)value);
+            }
+            else if (value is ObjectDefinitionHolder)
+            {
+                VisitObjectDefinition( ((ObjectDefinitionHolder)value).ObjectDefinition);
+            }
+            else if (value is RuntimeObjectReference)
+            {
+                RuntimeObjectReference ror = (RuntimeObjectReference)value;
+                //name has to be of string type.
+                string newObjectName = ResolveStringValue(ror.ObjectName).ToString();
+                if (!newObjectName.Equals(ror.ObjectName))
+                {
+                    return new RuntimeObjectReference(newObjectName);
+                }
+            }
+            else if (value is ManagedList)
+            {
+                VisitManagedList((ManagedList)value);
+            }
+            else if (value is ManagedSet)
+            {
+                VisitManagedSet((ManagedSet)value);
+            }
+            else if (value is ManagedDictionary)
+            {
+                VisitManagedDictionary((ManagedDictionary)value);
+            }
+            else if (value is NameValueCollection)
+            {
+                VisitNameValueCollection((NameValueCollection)value);
+            }
+            else if (value is TypedStringValue)
+            {
+                TypedStringValue typedStringValue = (TypedStringValue)value;
+                String stringValue = typedStringValue.Value;
+                if (stringValue != null)
+                {
+                    String visitedString = ResolveStringValue(stringValue).ToString();
+                    typedStringValue.Value = visitedString;
+                }
+            }
+            else if (value is string)
+            {
+                return ResolveStringValue((string)value);
+            }
+            else if (value is ExpressionHolder)
+            {
+                ExpressionHolder holder = (ExpressionHolder)value;
+                string newExpressionString = ResolveStringValue(holder.ExpressionString).ToString();
+                return new ExpressionHolder(newExpressionString);
+            }
+            return value;
+        }
+
+        /// <summary>
+        /// Visits the ManagedList property ElementTypeName and 
+        /// calls <see cref="ResolveValue"/> for list element.
+        /// </summary>
+        protected virtual void VisitManagedList(ManagedList listVal)
+        {
+            string elementTypeName = listVal.ElementTypeName;
+            if (elementTypeName != null)
+            {
+                string resolvedName = ResolveStringValue(elementTypeName).ToString();
+                if (!elementTypeName.Equals(resolvedName))
+                {
+                    listVal.ElementTypeName = resolvedName;
+                }
+            }
+
+            for (int i = 0; i < listVal.Count; ++i)
+            {
+                object oldValue = listVal[i];
+                object newValue = ResolveValue(oldValue);
+                if (!ObjectUtils.NullSafeEquals(newValue, oldValue))
+                {
+                    listVal[i] = newValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits the ManagedSet property ElementTypeName and 
+        /// calls <see cref="ResolveValue"/> for list element.
+        /// </summary>
+        protected virtual void VisitManagedSet(ManagedSet setVal)
+        {
+            string elementTypeName = setVal.ElementTypeName;
+            if (elementTypeName != null)
+            {
+                string resolvedName = ResolveStringValue(elementTypeName).ToString();
+                if (!elementTypeName.Equals(resolvedName))
+                {
+                    setVal.ElementTypeName = resolvedName;
+                }
+            }
+
+            ISet clone = (ISet)setVal.Clone();
+            foreach (object oldValue in clone)
+            {
+                object newValue = ResolveValue(oldValue);
+                if (!ObjectUtils.NullSafeEquals(newValue, oldValue))
+                {
+                    setVal.Remove(oldValue);
+                    setVal.Add(newValue);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Visits the ManagedSet properties KeyTypeName and ValueTypeName and 
+        /// calls <see cref="ResolveValue"/> for dictionary's value element.
+        /// </summary>
+        protected virtual void VisitManagedDictionary(ManagedDictionary dictVal)
+        {
+            string keyTypeName = dictVal.KeyTypeName;
+            if (keyTypeName != null)
+            {
+                string resolvedName = ResolveStringValue(keyTypeName).ToString();
+                if (!keyTypeName.Equals(resolvedName))
+                {
+                    dictVal.KeyTypeName = resolvedName;
+                }
+            }
+
+            string valueTypeName = dictVal.ValueTypeName;
+            if (valueTypeName != null)
+            {
+                string resolvedName = ResolveStringValue(valueTypeName).ToString();
+                if (!valueTypeName.Equals(resolvedName))
+                {
+                    dictVal.ValueTypeName = resolvedName;
+                }
+            }
+
+            Hashtable mods = new Hashtable();
+            foreach (DictionaryEntry entry in dictVal)
+            {
+                object oldValue = entry.Value;
+                object newValue = ResolveValue(oldValue);
+                if (!ObjectUtils.NullSafeEquals(newValue, oldValue))
+                {
+                    mods[entry.Key] = newValue;
+                }
+            }
+            foreach (DictionaryEntry entry in mods)
+            {
+                dictVal[entry.Key] = entry.Value;
+            }
+        }
+
+        /// <summary>
+        /// Visits the elements of a NameValueCollection and calls
+        /// <see cref="ResolveValue"/> for value of each element.
+        /// </summary>
+        protected virtual void VisitNameValueCollection(NameValueCollection collection)
+        {
+            foreach (string key in collection.AllKeys)
+            {
+                string oldValue = collection[key];
+                string newValue = ResolveValue(oldValue) as string;
+                if (!ObjectUtils.NullSafeEquals(newValue, oldValue))
+                {
+                    collection[key] = newValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Looks up the value of the given variable name in the configured <see cref="IVariableSource"/>.
+        /// </summary>
+        /// <param name="variableName">The name of the variable to be looked up</param>
+        /// <returns>
+        /// The value of this variable, as returned from the <see cref="IVariableSource"/> passed 
+        /// into the constructor <see cref="ObjectDefinitionVisitor(IVariableSource)"/>
+        /// </returns>
+        /// <exception cref="InvalidOperationException">If no <see cref="IVariableSource"/> has been configured.</exception>
+        protected virtual object ResolveStringValue(string variableName)
+        {
+            if (variableSource == null)
+            {
+                throw new InvalidOperationException("No IVariableSource specified - pass an instance " +
+                                                    "of this object into the constructor or override the 'ResolveStringValue' method");
+            }
+            return variableSource.ResolveVariable(variableName);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectFactoryCreatingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectFactoryCreatingFactoryObject.cs
new file mode 100644
index 00000000..3c894ab9
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectFactoryCreatingFactoryObject.cs
@@ -0,0 +1,178 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Returns a value that is an
+	/// <see cref="Spring.Objects.Factory.IGenericObjectFactory"/> that
+	/// returns an object from an
+	/// <see cref="Spring.Objects.Factory.IObjectFactory"/>.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The primary motivation of this class is to avoid having a client object
+	/// directly calling the
+	/// <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>
+	/// method to get a prototype object out of an
+	/// <see cref="Spring.Objects.Factory.IObjectFactory"/>, which would be a
+	/// violation of the inversion of control principle. With the use of this
+	/// class, the client object can be fed an
+	/// <see cref="Spring.Objects.Factory.IObjectFactory"/> as a property
+	/// that directly returns one target <b>prototype</b> object.
+	/// </p>
+	/// <p>
+	/// The object referred to by the value of the
+	/// <see cref="Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject.TargetObjectName"/>
+	/// property does not have to be a prototype object, but there is little
+	/// to no point in using this class in conjunction with a singleton object.
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <p>
+	/// The following XML configuration snippet illustrates the use of this
+	/// class...
+	/// </p>
+	/// <code escaped="true">
+	/// <objects>
+	///   <!-- prototype object since we have state -->
+	///   <object id="MyService" type="A.B.C.MyService" singleton="false"/>
+	///   
+	///   <object id="MyServiceFactory"
+	///		type="Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject">
+	///     <property name="TargetObjectName"><idref local="MyService"/></property>
+	///   </object>
+	///   
+	///   <object id="MyClientObject" type="A.B.C.MyClientObject">
+	///     <property name="MyServiceFactory" ref="MyServiceFactory"/>
+	///   </object>
+	/// </objects>
+	/// </code>
+	/// </example>
+	/// <author>Colin Sampaleanu</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: ObjectFactoryCreatingFactoryObject.cs,v 1.9 2007/03/16 04:01:38 aseovic Exp $</version>
+    [Serializable]
+    public class ObjectFactoryCreatingFactoryObject
+		: AbstractFactoryObject, IObjectFactoryAware
+	{
+		private string _targetObjectName;
+		private IObjectFactory _objectFactory;
+
+		#region Properties
+
+		/// <summary>
+		/// Sets the name of the target object.
+		/// </summary>
+		public string TargetObjectName
+		{
+			set { _targetObjectName = value; }
+		}
+
+		/// <summary>
+		/// The target factory that will be used to perform the lookup
+		/// of the object referred to by the <see cref="TargetObjectName"/>
+		/// property.
+		/// </summary>
+		/// <value>
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// (will never be <see langword="null"/>).
+		/// </value>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In case of initialization errors.
+		/// </exception>
+		/// <seealso cref="Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/>
+		public IObjectFactory ObjectFactory
+		{
+			set { this._objectFactory = value; }
+		}
+
+		/// <summary>
+		/// The <see cref="System.Type"/> of object created by this factory.
+		/// </summary>
+		public override Type ObjectType
+		{
+			get { return typeof (IGenericObjectFactory); }
+		}
+
+		#endregion
+
+		/// <summary>
+		/// Returns an instance of the object factory.
+		/// </summary>
+		/// <returns>The object factory.</returns>
+		protected override object CreateInstance()
+		{
+			return new GenericObjectFactory(this);
+		}
+
+		/// <summary>
+		/// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// after it has set all supplied object properties.
+		/// </summary>
+		/// <exception cref="System.Exception">
+		/// In the event of misconfiguration (such as failure to set an essential
+		/// property) or if initialization fails.
+		/// </exception>
+		/// <seealso cref="Spring.Objects.Factory.Config.AbstractFactoryObject.AfterPropertiesSet"/>
+		public override void AfterPropertiesSet()
+		{
+			if(StringUtils.IsNullOrEmpty(_targetObjectName)) 
+			{
+				throw new ArgumentException("The 'TargetObjectName' property must have a value.");
+			}
+			base.AfterPropertiesSet ();
+		}
+
+		private sealed class GenericObjectFactory : IGenericObjectFactory
+		{
+			private ObjectFactoryCreatingFactoryObject _enclosing;
+
+			/// <summary>
+			/// Creates a new instance of the GenericObjectFactory class.
+			/// </summary>
+			/// <param name="enclosing">
+			/// The enclosing
+			/// <see cref="Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject"/>.
+			/// </param>
+			public GenericObjectFactory(
+				ObjectFactoryCreatingFactoryObject enclosing)
+			{
+				_enclosing = enclosing;
+			}
+
+			/// <summary>
+			/// Returns the object created by the enclosed object factory.
+			/// </summary>
+			/// <returns>The created object.</returns>
+			public object GetObject()
+			{
+				return _enclosing._objectFactory.GetObject(_enclosing._targetObjectName);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectReferenceFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectReferenceFactoryObject.cs
new file mode 100644
index 00000000..66ac0df3
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectReferenceFactoryObject.cs
@@ -0,0 +1,134 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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 Spring.Util;
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// An <see cref="Spring.Objects.Factory.IFactoryObject"/> implementation
+	/// that exposes an arbitrary target object under a different name.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Usually, the target object will reside in a different object
+	/// definition file, using this
+	/// <see cref="Spring.Objects.Factory.IFactoryObject"/> to link it in
+	/// and expose it under a different name. Effectively, this corresponds
+	/// to an alias for the target object.
+	/// </p>
+	/// <note>
+	/// For XML based object definition files, a <code>&lt;alias&gt;</code>
+	/// tag is available that effectively achieves the same.
+	/// </note>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: ObjectReferenceFactoryObject.cs,v 1.3 2007/03/16 04:01:38 aseovic Exp $</version>
+	/// <seealso cref="Spring.Objects.Factory.IFactoryObject"/>
+    [Serializable]
+    public sealed class ObjectReferenceFactoryObject
+		: IFactoryObject, IObjectFactoryAware
+	{
+		private string _targetObjectName;
+		private IObjectFactory _objectFactory;
+
+		/// <summary>
+		/// The name of the target object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The target object may potentially be defined in a different object
+		/// definition file.
+		/// </p>
+		/// </remarks>
+		/// <value>The name of the target object.</value>
+		public string TargetObjectName
+		{
+			set { _targetObjectName = value; }
+		}
+
+		/// <summary>
+		/// Return an instance (possibly shared or independent) of the object
+		/// managed by this factory.
+		/// </summary>
+		/// <returns>
+		/// An instance (possibly shared or independent) of the object managed by
+		/// this factory.
+		/// </returns>
+		/// <seealso cref="Spring.Objects.Factory.IFactoryObject.GetObject()"/>
+		public object GetObject()
+		{
+			return _objectFactory.GetObject(_targetObjectName);
+		}
+
+		/// <summary>
+		/// Return the type of object that this
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/> creates, or
+		/// <see langword="null"/> if not known in advance.
+		/// </summary>
+		/// <seealso cref="Spring.Objects.Factory.IFactoryObject.ObjectType"/>
+		public Type ObjectType
+		{
+			get { return _objectFactory.GetType(_targetObjectName); }
+		}
+
+		/// <summary>
+		/// Is the object managed by this factory a singleton or a prototype?
+		/// </summary>
+		/// <seealso cref="Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+		public bool IsSingleton
+		{
+			get { return _objectFactory.IsSingleton(_targetObjectName); }
+		}
+
+		/// <summary>
+		/// Callback that supplies the owning factory to an object instance.
+		/// </summary>
+		/// <value>
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// (may not be <see langword="null"/>). The object can immediately
+		/// call methods on the factory.
+		/// </value>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In case of initialization errors.
+		/// </exception>
+		/// <seealso cref="Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/>
+		public IObjectFactory ObjectFactory
+		{
+			set
+			{
+				// the call to set this property occurs 'after' all properties have been set...
+				_objectFactory = value;
+				if (StringUtils.IsNullOrEmpty(_targetObjectName))
+				{
+					throw new ArgumentException(
+						"The 'TargetObjectName' property is required.");
+				}
+				if (!_objectFactory.ContainsObject(_targetObjectName))
+				{
+					throw new NoSuchObjectDefinitionException(
+						_targetObjectName, _objectFactory.ToString());
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyFileVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyFileVariableSource.cs
new file mode 100644
index 00000000..9dae39c1
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyFileVariableSource.cs
@@ -0,0 +1,102 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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.Collections;
+using System.IO;
+using Spring.Core.IO;
+using Spring.Util;
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Implementation of <see cref="IVariableSource"/> that
+    /// resolves variable name against Java-style property file.
+    /// </summary>
+    /// <seealso cref="Properties"/>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: PropertyFileVariableSource.cs,v 1.5 2007/08/08 17:47:13 bbaia Exp $</version>
+    [Serializable]
+    public class PropertyFileVariableSource : IVariableSource
+    {
+        private IResource[] locations;
+        private Properties properties;
+
+        /// <summary>
+        /// Gets or sets the locations of the property files 
+        /// to read properties from.
+        /// </summary>
+        /// <value>
+        /// The locations of the property files 
+        /// to read properties from.
+        /// </value>
+        public IResource[] Locations
+        {
+            get { return locations; }
+            set { locations = value; }
+        }
+
+        /// <summary>
+        /// Convinience property. Gets or sets a single location
+        /// to read properties from.
+        /// </summary>
+        /// <value>
+        /// A location to read properties from.
+        /// </value>
+        public IResource Location
+        {
+            set { locations = new IResource[] { value} ;}
+        }
+
+        /// <summary>
+        /// Resolves variable value for the specified variable name.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the variable to resolve.
+        /// </param>
+        /// <returns>
+        /// The variable value if able to resolve, <c>null</c> otherwise.
+        /// </returns>
+        public string ResolveVariable(string name)
+        {
+            if (properties == null)
+            {
+                InitProperties();
+            }
+            return properties.GetProperty(name);
+        }
+
+        /// <summary>
+        /// Initializes properties based on the specified 
+        /// property file locations.
+        /// </summary>
+        private void InitProperties()
+        {
+            properties = new Properties();
+            foreach (IResource location in locations)
+            {
+                using (Stream input = location.InputStream)
+                {
+                    properties.Load(input);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs
new file mode 100644
index 00000000..116c4bad
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs
@@ -0,0 +1,203 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using System.Globalization;
+using Common.Logging;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Overrides default values in one or more object definitions.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Instances of this class <b>override</b> already existing values, and is
+	/// thus best suited to replacing defaults. If you need to <i>replace</i>
+	/// placeholder values, consider using the
+	/// <seea cref="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+	/// class instead.
+	/// </p>
+	/// <p>
+	/// In contrast to the
+	/// <see cref="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+	/// class, the original object definition can have default
+	/// values or no values at all for such object properties. If an overriding
+	/// configuration file does not have an entry for a certain object property,
+	/// the default object value is left as is. Also note that it is not
+	/// immediately obvious to discern which object definitions will be mutated by
+	/// one or more
+	/// <see cref="Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>s
+	/// simply by looking at the object configuration.
+	/// </p>
+	/// <p>
+	/// Each line in a referenced configuration file is expected to take the
+	/// following form...
+	/// </p>
+	/// <code escaped="true">
+	///		<add key="name.property" value="the override"/>
+	/// </code>
+	/// <p>
+	/// The <c>name.property</c> key refers to the object name and the
+	/// property that is to be overridden; and the value is the overridding
+	/// value that will be inserted into the appropriate object definition's
+	/// named property.
+	/// </p>
+	/// <p>
+	/// Please note that in the case of multiple
+	/// <see cref="Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>s
+	/// that define different values for the same object definition value, the
+	/// <b>last</b> overridden value will win (due to the fact that the values
+	/// supplied by previous
+	/// <see cref="Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>s
+	/// will be overridden).
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <p>
+	/// The following XML context definition defines an object that has a number
+	/// of properties, all of which have <b>default</b> values...
+	/// </p>
+	/// <code escaped="true">
+	/// <object id="connStringProvider"
+	///		type="MyNamespace.OracleConnectionStringProvider, MyAssembly">
+	///		<property name="dataSource" value="MyOracleDB"/>
+	///		<property name="userId" value="sa"/>
+	///		<property name="password" value="g0ly4dk1n"/>
+	///		<property name="integratedSecurity"	value="true"/>
+	/// </object>
+	/// </code>
+	/// <p>
+	/// What follows is a .NET config file snippet for the above example (assuming
+	/// the need to override one of the default values)...
+	/// </p>
+	/// <code escaped="true">
+	///	<name-values>
+	///		<add key="database.userid" value="test"/>
+	///		<add key="database.password" value="0bl0m0v"/>
+	/// </name-values>
+	/// </code>
+	/// </example>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: PropertyOverrideConfigurer.cs,v 1.11 2007/10/10 16:31:39 bbaia Exp $</version>
+	/// <seealso cref="Spring.Objects.Factory.Config.PropertyResourceConfigurer"/>
+	/// <seealso cref="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+	/// <seealso cref="Spring.Objects.Factory.Config.IObjectDefinition"/>
+    [Serializable]
+    public class PropertyOverrideConfigurer : PropertyResourceConfigurer
+	{
+		private ILog _logger = LogManager.GetLogger(typeof (PropertyOverrideConfigurer));
+
+		/// <summary>
+		/// Apply the given properties to the supplied
+		/// <see cref="Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>.
+		/// </summary>
+		/// <param name="factory">
+		/// The <see cref="Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>
+		/// used by the application context.
+		/// </param>
+		/// <param name="props">The properties to apply.</param>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If an error occured.
+		/// </exception>
+		protected override void ProcessProperties(
+			IConfigurableListableObjectFactory factory, NameValueCollection props)
+		{
+			foreach (string key in props.AllKeys)
+			{
+				ProcessKey(factory, key, props[key]);
+			}
+		}
+
+		/// <summary>
+		/// Process the given key as 'name.property' entry.
+		/// </summary>
+		/// <param name="factory">
+		/// The object factory containing the object definitions that are to be
+		/// processed.
+		/// </param>
+		/// <param name="key">The key.</param>
+		/// <param name="value">The value.</param>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If an error occurs.
+		/// </exception>
+		/// <exception cref="Spring.Objects.FatalObjectException">
+		/// If the property was not well formed (i.e. not in the format "name.property").
+		/// </exception>
+		protected virtual void ProcessKey(
+			IConfigurableListableObjectFactory factory, string key, string value)
+		{
+			int dotIndex = key.IndexOf('.');
+			if (dotIndex == -1)
+			{
+				throw new FatalObjectException(
+					string.Format(CultureInfo.InvariantCulture,
+					              "Invalid key '{0}': expected 'objectName.property' form.", key));
+			}
+			string name = key.Substring(0, dotIndex);
+			string objectProperty = key.Substring(dotIndex + 1);
+			IObjectDefinition definition = factory.GetObjectDefinition(name);
+			if(definition != null) 
+			{
+                PropertyValue pv = definition.PropertyValues.GetPropertyValue(objectProperty);
+                if (pv != null && pv.Value is RuntimeObjectReference)
+                {
+                    definition.PropertyValues.Add(objectProperty, new RuntimeObjectReference(value));
+                }
+                else if (pv != null && pv.Value is ExpressionHolder)
+                {
+                    definition.PropertyValues.Add(objectProperty, new ExpressionHolder(value));
+                }
+                else
+                {
+                    definition.PropertyValues.Add(objectProperty, value);
+                }
+			}
+			else 
+			{
+				#region Instrumentation
+
+				if (_logger.IsWarnEnabled)
+				{
+					_logger.Warn(string.Format(CultureInfo.InvariantCulture,
+						"Cannot find object '{0}' when overriding properties; check configuration.", name));
+				}
+
+				#endregion
+			}
+
+			#region Instrumentation
+
+			if (_logger.IsDebugEnabled)
+			{
+				_logger.Debug(string.Format(CultureInfo.InvariantCulture,
+				                            "Property '{0}' set to '{1}'.", key, value));
+			}
+
+			#endregion
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPathFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPathFactoryObject.cs
new file mode 100644
index 00000000..e5616d6d
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPathFactoryObject.cs
@@ -0,0 +1,337 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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;
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// <see cref="Spring.Objects.Factory.IFactoryObject"/> implementation that
+	/// evaluates a property path on a given target object.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The target object can be specified directly or via an object name (see
+	/// example below).
+	/// </p>
+	/// <p>
+	/// Please note that the <see cref="Spring.Objects.Factory.Config.PropertyPathFactoryObject"/>
+	/// is an <see cref="Spring.Objects.Factory.IFactoryObject"/> implementation, and as such has
+	/// to comply with the contract of the <see cref="Spring.Objects.Factory.IFactoryObject"/>
+	/// interface; more specifically, this means that the end result of the property lookup path
+	/// evaluation cannot be <see lang="null"/> (<see cref="Spring.Objects.Factory.IFactoryObject"/>
+	/// implementations are not permitted to return <see lang="null"/>). If the resut of a
+	/// property lookup path evaluates to <see lang="null"/>, an exception will be thrown.
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <code escaped="true">
+	/// <!-- this is the target object -->
+	/// <object id="foo" type="Whatever.MyClass, MyAssembly" singleton="false">
+	///		<!-- a System.String typed property -->
+	///		<property name="name" value="Chinua Achebe"/>
+	/// </object>
+	/// 
+	/// <!--
+	///		will result in "Chinua Achebe", which is the value of the 'name' property of the 'foo' object
+	///	-->
+	/// <object id="consumer"
+	///			type="Spring.Objects.Factory.Config.PropertyPathFactoryObject, Spring.Core">
+	///		<property name="targetObject" ref="foo"/>
+	///		<property name="propertyPath" value="name"/>
+	/// </object>
+	/// 
+	/// <!--
+	///		will result in "Chinua Achebe", which is the value of the 'name' property of the 'foo' object
+	///	-->
+	/// <object id="foo.name"
+	///			type="Spring.Objects.Factory.Config.PropertyPathFactoryObject, Spring.Core"/>
+	/// 
+	/// <!--
+	///		will result in "Chinua Achebe", which is the value of the 'name' property of the 'foo' object
+	/// -->
+	/// <object id="consumer"
+	///			type="Spring.Objects.Factory.Config.PropertyPathFactoryObject, Spring.Core">
+	///		<property name="targetObjectName" value="foo"/>
+	///		<property name="propertyPath" value="name"/>
+	/// </object>
+	/// 
+	/// <!--
+	///		will result in (the int value) '13', which is the value of the length property of the 'name'
+	///		property of the 'foo' object.
+	///		
+	///		in this case, the first 'part' of the id is taken to be the name of the target object ('foo');
+	///		the remainder of the name is taken to be the property lookup path
+	///	-->
+	/// <object id="foo.name.length"
+	///			type="Spring.Objects.Factory.Config.PropertyPathFactoryObject, Spring.Core"/>
+	/// </code>
+	/// </example>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: PropertyPathFactoryObject.cs,v 1.3 2007/03/16 04:01:39 aseovic Exp $</version>
+    [Serializable]
+    public class PropertyPathFactoryObject : IFactoryObject, IObjectNameAware, IObjectFactoryAware
+	{
+		private IObjectWrapper targetObjectWrapper;
+		private string targetObjectName;
+		private string propertyPath;
+		private Type resultType;
+		private string objectName;
+		private IObjectFactory objectFactory;
+
+		/// <summary>
+		/// The target object that the property path lookup is to be applied to.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This would most likely be an inner object, but can of course be
+		/// any object reference.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The target object that the property path lookup is to be applied to.
+		/// </value>
+		/// <seealso cref="Spring.Objects.Factory.Config.PropertyPathFactoryObject.TargetObjectName"/> 
+		public object TargetObject
+		{
+			set { this.targetObjectWrapper = new ObjectWrapper(value); }
+		}
+
+		/// <summary>
+		/// The (object) name of the target object that the property path lookup
+		/// is to be applied to.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Please note that any leading or trailing whitespace <b>will</b> be
+		/// trimmed from this name prior to resolution. The implication of this is that
+		/// one cannot use the <see cref="Spring.Objects.Factory.Config.PropertyPathFactoryObject"/>
+		/// class in conjunction with object names that start or end with whitespace.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The (object) name of the target object that the property path lookup
+		/// is to be applied to.
+		/// </value>
+		/// <seealso cref="Spring.Objects.Factory.Config.PropertyPathFactoryObject.TargetObject"/> 
+		public string TargetObjectName
+		{
+			set
+			{
+				if (value != null)
+				{
+					value = value.Trim();
+				}
+				this.targetObjectName = value;
+			}
+		}
+
+		/// <summary>
+		/// The property (lookup) path to be applied to the target object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Please note that any leading or trailing whitespace <b>will</b> be
+		/// trimmed from this path prior to resolution. Whitespace is not a valid
+		/// identifier for property names (in part or whole) in CLS-based languages,
+		/// so this is a not unreasonable action. Please also note that whitespace
+		/// that is embedded within the property path will be left as-is (which may
+		/// or may not result in an error being thrown, depending on the context of
+		/// the whitespace).
+		/// </p>
+		/// </remarks>
+		/// <example>
+		/// <p>
+		/// Examples of such property lookup paths can be seen below; note that
+		/// property lookup paths can be nested to an arbitrary level.
+		/// </p>
+		/// <code escaped="true">
+		/// name.length
+		/// accountManager.account['the key'].name
+		/// accounts[0].name
+		/// </code>
+		/// </example>
+		/// <value>
+		/// The property (lookup) path to be applied to the target object.
+		/// </value>
+		public string PropertyPath
+		{
+			set
+			{
+				if (value != null)
+				{
+					value = value.Trim();
+				}
+				this.propertyPath = value;
+			}
+		}
+
+		/// <summary>
+		/// The 'expected' <see cref="System.Type"/> of the result from evaluating the
+		/// property path.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is not necessary for directly specified target objects, or
+		/// singleton target objects, where the <see cref="System.Type"/> can
+		/// be determined via reflection. Just specify this in case of a
+		/// prototype target, provided that you need matching by type (for
+		/// example, for autowiring).
+		/// </p>
+		/// <p>
+		/// It is permissable to set the value of this property to
+		/// <see lang="null"/> (which in any case is the default value).
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The 'expected' <see cref="System.Type"/> of the result from evaluating the
+		/// property path.
+		/// </value>
+		public Type ResultType
+		{
+			set { this.resultType = value; }
+		}
+
+		/// <summary>
+		/// Return an instance (possibly shared or independent) of the object
+		/// managed by this factory.
+		/// </summary>
+		/// <returns>
+		/// An instance (possibly shared or independent) of the object managed by
+		/// this factory.
+		/// </returns>
+		/// <see cref="Spring.Objects.Factory.IFactoryObject.GetObject()"/>
+		public object GetObject()
+		{
+			IObjectWrapper target = this.targetObjectWrapper;
+			if (target == null)
+			{
+				// fetch the prototype object object...
+				target = new ObjectWrapper(this.objectFactory[this.targetObjectName]);
+			}
+			object value = target.GetPropertyValue(this.propertyPath);
+			if (value == null)
+			{
+				throw new FatalObjectException("PropertyPathFactoryObject is not allowed to return null, " +
+					"but property value for path '" + this.propertyPath + "' is null.");
+			}
+			return value;
+		}
+
+		/// <summary>
+		/// Return the <see cref="System.Type"/> of object that this
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/> creates, or
+		/// <see langword="null"/> if not known in advance.
+		/// </summary>
+		/// <see cref="Spring.Objects.Factory.IFactoryObject.ObjectType"/>
+		public Type ObjectType
+		{
+			get { return this.resultType; }
+		}
+
+		/// <summary>
+		/// Is the object managed by this factory a singleton or a prototype?
+		/// </summary>
+		/// <see cref="Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+		public bool IsSingleton
+		{
+			get { return false; }
+		}
+
+		/// <summary>
+		/// Set the name of the object in the object factory that created this object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The object name of this
+		/// <see cref="Spring.Objects.Factory.Config.PropertyPathFactoryObject"/>
+		/// will be interpreted as "objectName.property" pattern, if neither the
+		/// <see cref="Spring.Objects.Factory.Config.PropertyPathFactoryObject.TargetObjectName"/>
+		/// <see cref="Spring.Objects.Factory.Config.PropertyPathFactoryObject.TargetObject"/>
+		/// have been supplied (set).
+		/// </p>
+		/// <p>
+		/// This allows for concise object definitions with just an id or name.
+		/// </p>
+		/// </remarks>
+		/// <value>
+		/// The name of the object in the factory.
+		/// </value>
+		public string ObjectName
+		{
+			set { this.objectName = value; }
+		}
+
+		/// <summary>
+		/// Callback that supplies the owning factory to an object instance.
+		/// </summary>
+		/// <value>
+		/// Owning <see cref="IInitializingObject.AfterPropertiesSet"/>
+		/// (may not be <see langword="null"/>). The object can immediately
+		/// call methods on the factory.
+		/// </value>
+		/// <exception cref="IInitializingObject">
+		/// In case of initialization errors.
+		/// </exception>
+		public IObjectFactory ObjectFactory
+		{
+			set
+			{
+				this.objectFactory = value;
+				if (this.targetObjectWrapper != null && this.targetObjectName != null)
+				{
+					throw new ArgumentException("Only one of the TargetObjectName or TargetObject properties can be set, not both.");
+				}
+				if (this.targetObjectWrapper == null && this.targetObjectName == null)
+				{
+					if (this.propertyPath != null)
+					{
+						throw new ArgumentException(
+							"Specify TargetObject or TargetObjectName property in combination with PropertyPath.");
+					}
+					// no other properties specified: check object name...
+					string strippedObjectname = this.objectName.Trim();
+					int dotIndex = strippedObjectname.IndexOf('.');
+					if (dotIndex <= 0)
+					{
+						throw new ArgumentException(
+							"Neither TargetObject nor TargetObjectName specified, and PropertyPathFactoryObject " +
+								"object name '" + this.objectName + "' does not follow 'objectName.property' syntax.");
+					}
+					this.targetObjectName = strippedObjectname.Substring(0, dotIndex);
+					this.propertyPath = strippedObjectname.Substring(dotIndex + 1);
+				}
+				else if (this.propertyPath == null)
+				{
+					throw new ArgumentException("The 'PropertyPath' property has not been set.");
+				}
+				if (this.targetObjectWrapper == null
+					&& this.objectFactory.IsSingleton(this.targetObjectName))
+				{
+					// eagerly fetch singleton target object, and determine result type...
+					this.targetObjectWrapper
+						= new ObjectWrapper(this.objectFactory.GetObject(this.targetObjectName));
+					this.resultType = this.targetObjectWrapper.GetPropertyType(this.propertyPath);
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs
new file mode 100644
index 00000000..1064dca0
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs
@@ -0,0 +1,414 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Globalization;
+using Common.Logging;
+using Spring.Collections;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Resolves placeholder values in one or more object definitions.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The default placeholder syntax follows the NAnt style: <c>${...}</c>.
+	/// Instances of this class can be configured in the same way as any other
+	/// object in a Spring.NET container, and so custom placeholder prefix
+	/// and suffix values can be set via the <see cref="PlaceholderPrefix"/>
+	/// and <see cref="PlaceholderSuffix"/> properties.
+	/// </p>
+	/// <example>
+	/// <p>
+	/// The following example XML context definition defines an object that has
+	/// a number of placeholders. The placeholders can easily be distinguished
+	/// by the presence of the <c>${}</c> characters.
+	/// </p>
+	/// <code escaped="true">
+	/// <object id="connStringProvider"
+	///		type="MyNamespace.OracleConnectionStringProvider, MyAssembly">
+	///		<property name="dataSource" value="${database.datasource}"/>
+	///		<property name="userId" value="${database.userid}"/>
+	///		<property name="password" value="${database.password}"/>
+	///		<property name="integratedSecurity"
+	///			value="${database.integratedsecurity}"/>
+	/// </object>
+	/// </code>
+	/// <p>
+	/// The associated XML configuration file for the above example containing the
+	/// values for the placeholders would contain a snippet such as ..
+	/// </p>
+	/// <code escaped="true">
+	///	<name-values>
+	///		<add key="database.datasource" value="MyOracleDB"/>
+	///		<add key="database.userid" value="sa"/>
+	///		<add key="database.password" value="g0ly4dk1n"/>
+	///		<add key="database.integratedsecurity" value="true"/>
+	/// </name-values>
+	/// </code>
+	/// <p>
+	/// The preceding XML snippet listing the various property keys and their
+	/// associated values needs to be inserted into the .NET config file of
+	/// your application (or Web.config file for your ASP.NET web application,
+	/// as the case may be), like so...
+	/// </p>
+	/// <code escaped="true">
+	///	<name-values>
+	///		<add key="database.datasource" value="MyOracleDB"/>
+	///		<add key="database.userid" value="sa"/>
+	///		<add key="database.password" value="g0ly4dk1n"/>
+	///		<add key="database.integratedsecurity" value="true"/>
+	/// </name-values>
+	/// </code>
+	/// </example>
+	/// <p>
+	/// <see cref="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+	/// checks simple property values, lists, dictionaries, sets, constructor
+	/// values, object type name, and object names in
+	/// runtime object references (
+	/// <see cref="Spring.Objects.Factory.Config.RuntimeObjectReference"/>).
+	/// Furthermore, placeholder values can also cross-reference other
+	/// placeholders, in the manner of the following example where the
+	/// <c>rootPath</c> property is cross-referenced by the <c>subPath</c>
+	/// property.
+	/// </p>
+	/// <example>
+	/// <code escaped="true">
+	/// <name-values>
+	///		<add key="rootPath" value="myrootdir"/>
+	///		<add key="subPath" value="${rootPath}/subdir"/>
+	/// </name-values>
+	/// </code>
+	/// </example>
+	/// <p>
+	/// In contrast to the
+	/// <see cref="Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>
+	/// class, this configurer only permits the replacement of explicit
+	/// placeholders in object definitions. Therefore, the original definition
+	/// cannot specify any default values for its object properties, and the
+	/// placeholder configuration file is expected to contain an entry for each
+	/// defined placeholder. That is, if an object definition contains a
+	/// placeholder <c>${foo}</c>, there should be an associated
+	/// <c>&lt;add key="foo" value="..."/&gt;</c> entry in the
+	/// referenced placeholder configuration file. Default property values
+	/// can be defined via the inherited
+	/// <see cref="Spring.Objects.Factory.Config.PropertyResourceConfigurer.Properties"/>
+	/// collection to overcome any perceived limitation of this feature.
+	/// </p>
+	/// <p>
+	/// If a configurer cannot resolve a placeholder, and the value of the
+	/// <see cref="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.IgnoreUnresolvablePlaceholders"/>
+	/// property is currently set to <see langword="false"/>, an
+	/// <see cref="Spring.Objects.Factory.ObjectDefinitionStoreException"/>
+	/// will be thrown. If you want to resolve properties from multiple configuration
+	/// resources, simply specify multiple resources via the
+	/// <see cref="Spring.Objects.Factory.Config.PropertyResourceConfigurer.Locations"/>
+	/// property. Finally, please note that you can also define multiple
+	/// <see cref="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+	/// instances, each with their own custom placeholder syntax.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: PropertyPlaceholderConfigurer.cs,v 1.23 2007/08/02 22:18:32 markpollack Exp $</version>
+	/// <seealso cref="Spring.Objects.Factory.Config.PropertyResourceConfigurer"/>
+	/// <seealso cref="Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>
+	/// <seealso cref="Spring.Objects.Factory.Config.IObjectDefinition"/>
+    [Serializable]
+    public class PropertyPlaceholderConfigurer : PropertyResourceConfigurer
+	{
+		/// <summary>
+		/// The default placeholder prefix.
+		/// </summary>
+		public const string DefaultPlaceholderPrefix = "${";
+
+		/// <summary>
+		/// The default placeholder suffix.
+		/// </summary>
+		public const string DefaultPlaceholderSuffix = "}";
+
+		private ILog logger = LogManager.GetLogger(typeof (PropertyPlaceholderConfigurer));
+		private bool ignoreUnresolvablePlaceholders = false;
+		private string placeholderPrefix = DefaultPlaceholderPrefix;
+		private string placeholderSuffix = DefaultPlaceholderSuffix;
+
+		private EnvironmentVariableMode environmentVariableMode = EnvironmentVariableMode.Fallback;
+
+
+        #region Properties 
+        /// <summary>
+		/// The placeholder prefix (the default is <c>${</c>).
+		/// </summary>
+		/// <seealso cref="DefaultPlaceholderPrefix"/>
+		public string PlaceholderPrefix
+		{
+			set { placeholderPrefix = value; }
+		}
+
+		/// <summary>
+		/// The placeholder suffix (the default is <c>}</c>)
+		/// </summary>
+		/// <seealso cref="DefaultPlaceholderSuffix"/>
+		public string PlaceholderSuffix
+		{
+			set { placeholderSuffix = value; }
+		}
+
+		/// <summary>
+		/// Indicates whether unresolved placeholders should be ignored.
+		/// </summary>
+		public bool IgnoreUnresolvablePlaceholders
+		{
+            get { return ignoreUnresolvablePlaceholders; }
+            set { ignoreUnresolvablePlaceholders = value; }
+		}
+
+		/// <summary>
+		/// Controls how environment variables will be used to 
+		/// replace property placeholders.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// See the overview of the
+		/// <see cref="Spring.Objects.Factory.Config.EnvironmentVariableMode"/>
+		/// enumeration for the available options.
+		/// </p>
+		/// </remarks>
+		public EnvironmentVariableMode EnvironmentVariableMode
+		{
+			set { environmentVariableMode = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+		/// Apply the given properties to the supplied
+		/// <see cref="Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>.
+		/// </summary>
+		/// <param name="factory">
+		/// The <see cref="Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>
+		/// used by the application context.
+		/// </param>
+		/// <param name="props">The properties to apply.</param>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If an error occured.
+		/// </exception>
+		protected override void ProcessProperties(
+			IConfigurableListableObjectFactory factory, NameValueCollection props)
+		{
+		    IVariableSource variableSource = new PlaceholderResolvingStringVariableSource(this, props);
+            ObjectDefinitionVisitor visitor = new ObjectDefinitionVisitor(variableSource);
+
+			string[] objectDefinitionNames = factory.GetObjectDefinitionNames();
+			for (int i = 0; i < objectDefinitionNames.Length; ++i)
+			{
+				string name = objectDefinitionNames[i];
+				IObjectDefinition definition = factory.GetObjectDefinition(name);
+				try
+				{
+                    visitor.VisitObjectDefinition(definition);
+				}
+				catch (ObjectDefinitionStoreException ex)
+				{
+					throw new ObjectDefinitionStoreException(
+						definition.ResourceDescription, name, ex.Message);
+				}
+			}
+		}
+
+
+
+
+
+
+		/// <summary>
+		/// Parse values recursively to be able to resolve cross-references between
+		/// placeholder values.
+		/// </summary>
+		/// <param name="properties">
+		/// The map of constructor arguments / property values.
+		/// </param>
+		/// <param name="strVal">The string to be resolved.</param>
+        /// <param name="visitedPlaceholders">The placeholders that have already been visited
+        /// during the current resolution attempt (used to detect circular references
+        /// between placeholders). Only non-null if we're parsing a nested placeholder.</param>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If an error occurs.
+		/// </exception>
+		/// <returns>The resolved string.</returns>
+		public virtual string ParseString(
+			NameValueCollection properties, string strVal, ISet visitedPlaceholders)
+		{
+			int startIndex = strVal.IndexOf(placeholderPrefix);
+			while (startIndex != -1)
+			{
+				int endIndex = strVal.IndexOf(
+					placeholderSuffix, startIndex + placeholderPrefix.Length);
+				if (endIndex != -1)
+				{
+					int pos = startIndex + placeholderPrefix.Length;
+					string placeholder = strVal.Substring(pos, endIndex - pos);
+                    if (visitedPlaceholders.Contains(placeholder))
+                    {
+                        throw new ObjectDefinitionStoreException(
+                                    string.Format(
+                                        CultureInfo.InvariantCulture,
+                                        "Circular placeholder reference '{0}' detected " +
+                                            "in property definitions [{1}].",
+                                        placeholder, properties));
+                    }
+				    visitedPlaceholders.Add(placeholder);
+					string resolvedValue = ResolvePlaceholder(placeholder, properties, environmentVariableMode);
+					if (resolvedValue != null)
+					{
+                        resolvedValue = ParseString(properties, resolvedValue, visitedPlaceholders);
+
+						#region Instrumentation
+
+						if (logger.IsDebugEnabled)
+						{
+							logger.Debug(string.Format(
+								CultureInfo.InvariantCulture,
+								"Resolving placeholder '{0}' to '{1}'.", placeholder, resolvedValue));
+						}
+
+						#endregion
+
+						strVal = strVal.Substring(0, startIndex) + resolvedValue + strVal.Substring(endIndex + 1);
+						startIndex = strVal.IndexOf(placeholderPrefix, startIndex + resolvedValue.Length);
+					}
+					else if (ignoreUnresolvablePlaceholders)
+					{
+						// simply return the unprocessed value...
+						return strVal;
+					}
+					else
+					{
+						throw new ObjectDefinitionStoreException(string.Format(
+								CultureInfo.InvariantCulture,
+								"Could not resolve placeholder '{0}'.", placeholder));
+					}
+				    visitedPlaceholders.Remove(placeholder);
+				}
+				else
+				{
+					startIndex = -1;
+				}
+			}
+			return strVal;
+		}
+
+		/// <summary>
+		/// Resolve the given placeholder using the given name value collection,
+		/// performing an environment variables check according to the given mode.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The default implementation delegates to 
+		/// <see cref="ResolvePlaceholder(string, NameValueCollection)"/>
+		/// before/afer the environment variable check. Subclasses can override
+		/// this for custom resolution strategies, including customized points
+		/// for the environment properties check.
+		/// </p>
+		/// </remarks>
+		/// <param name="placeholder">The placeholder to resolve</param>
+		/// <param name="props">
+		/// The merged name value collection of this configurer.
+		/// </param>
+		/// <param name="mode">The environment variable mode.</param>
+		/// <returns>
+		/// The resolved value or <see langword="null"/> if none.
+		/// </returns>
+		/// <seelso cref="Spring.Objects.Factory.Config.EnvironmentVariableMode"/>
+		protected virtual string ResolvePlaceholder(string placeholder,
+		                                            NameValueCollection props,
+		                                            EnvironmentVariableMode mode)
+		{
+			string propertyValue = null;
+			if (mode == Spring.Objects.Factory.Config.EnvironmentVariableMode.Override)
+			{
+				propertyValue = Environment.GetEnvironmentVariable(placeholder);
+			}
+			if (propertyValue == null)
+			{
+				propertyValue = ResolvePlaceholder(placeholder, props);
+			}
+			if (propertyValue == null
+				&& mode == Spring.Objects.Factory.Config.EnvironmentVariableMode.Fallback)
+			{
+				propertyValue = Environment.GetEnvironmentVariable(placeholder);
+			}
+			return propertyValue;
+		}
+
+		/// <summary>
+		/// Resolve the given placeholder using the given name value collection.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This (the default) implementation simply looks up the value of the
+		/// supplied <paramref name="placeholder"/> key.
+		/// </p>
+		/// <p>
+		/// Subclasses can override this for customized placeholder-to-key
+		/// mappings or custom resolution strategies, possibly just using the
+		/// given name value collection as fallback.
+		/// </p>
+		/// </remarks>
+		/// <param name="placeholder">The placeholder to resolve.</param>
+		/// <param name="props">
+		/// The merged name value collection of this configurer.
+		/// </param>
+		/// <returns>The resolved value.</returns>
+		protected virtual string ResolvePlaceholder(
+			string placeholder, NameValueCollection props)
+		{
+			return props[placeholder];
+		}
+    }
+
+    #region Helper class
+
+    internal class PlaceholderResolvingStringVariableSource : IVariableSource
+    {
+        private PropertyPlaceholderConfigurer ppc;
+        private NameValueCollection props;
+
+        public PlaceholderResolvingStringVariableSource(PropertyPlaceholderConfigurer outerPPC, NameValueCollection props)
+        {
+            ppc = outerPPC;
+            this.props = props;
+        }
+
+        public string ResolveVariable(string name)
+        {
+            return ppc.ParseString(props, name, new HashedSet());
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs
new file mode 100644
index 00000000..2bbcd427
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs
@@ -0,0 +1,393 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using System.Globalization;
+using Common.Logging;
+using Spring.Core;
+using Spring.Core.IO;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Allows for the configuration of individual object property values from
+    /// a .NET .config file.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Useful for custom .NET .config files targetted at system administrators
+    /// that override object properties configured in the application context.
+    /// </p>
+    /// <p>
+    /// Two concrete implementations are provided in the Spring.NET core library:
+    /// <list type="bullet">
+    /// <item>
+    /// <description>
+    /// <see cref="Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>
+    /// for <c>&lt;add key="placeholderKey" value="..."/&gt;</c> style
+    /// overriding (pushing values from a .NET .config file into object
+    /// definitions).
+    /// </description>
+    /// </item>
+    /// <item>
+    /// <description>
+    /// <see cref="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+    /// for replacing "${...}" placeholders (pulling values from a .NET .config
+    /// file into object definitions).
+    /// </description>
+    /// </item>
+    /// </list>
+    /// </p>
+    /// <p>
+    /// Please refer to the API documentation for the concrete implementations
+    /// listed above for example usage.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Simon White (.NET)</author>
+    /// <seealso cref="Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>
+    /// <seealso cref="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+    /// <version>$Id: PropertyResourceConfigurer.cs,v 1.19 2007/08/27 14:49:42 oakinger Exp $</version>
+    [Serializable]
+    public abstract class PropertyResourceConfigurer
+        : IObjectFactoryPostProcessor, IOrdered
+    {
+        /// <summary>
+        /// The default configuration section name to use if none is explictly supplied. 
+        /// </summary>
+        /// <seealso cref="Spring.Objects.Factory.Config.PropertyResourceConfigurer.ConfigSections"/>
+        public const string DefaultConfigSectionName = "spring-config";
+
+        #region Fields
+
+        private static readonly ILog _log = LogManager.GetLogger(typeof(PropertyResourceConfigurer));
+
+        private int _order = Int32.MaxValue; // default: same as non-Ordered
+        private NameValueCollection _defaultProperties;
+        private IResource[] _locations;
+        private string[] _configSections;
+        private bool _ignoreResourceNotFound = false;
+        private bool _lastLocationOverrides = true;
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Config.PropertyResourceConfigurer"/>
+        /// class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes no
+        /// public constructors.
+        /// </p>
+        /// </remarks>
+        protected PropertyResourceConfigurer()
+        {
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The policy for resolving conflicting property overrides from
+        /// several resources.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// When merging conflicting property overrides from several resources,
+        /// should append an override with the same key be appended to the
+        /// current value, or should the property override from the last resource
+        /// processed override previous values?
+        /// </p>
+        /// <p>
+        /// The default value is <see langword="true"/>; i.e. a property
+        /// override from the last resource to be processed overrides previous
+        /// values.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// <see langword="true"/> if the property override from the last resource
+        /// processed overrides previous values.
+        /// </value>
+        public bool LastLocationOverrides
+        {
+            set { _lastLocationOverrides = value; }
+        }
+
+        /// <summary>
+        /// Return the order value of this object, where a higher value means greater in
+        /// terms of sorting.
+        /// </summary>
+        /// <returns>The order value.</returns>
+        /// <seealso cref="Spring.Core.IOrdered.Order"/>
+        public int Order
+        {
+            get { return _order; }
+            set { _order = value; }
+        }
+
+        /// <summary>
+        /// The default properties to be applied.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// These are to be considered defaults, to be overridden by values
+        /// loaded from other resources.
+        /// </p>
+        /// </remarks>
+        public NameValueCollection Properties
+        {
+            get { return _defaultProperties; }
+            set { _defaultProperties = value; }
+        }
+
+        /// <summary>
+        /// The location of the .NET .config file that contains the property
+        /// overrides that are to be applied.
+        /// </summary>
+        public IResource Location
+        {
+            set { _locations = new IResource[] {value}; }
+        }
+
+        /// <summary>
+        /// The locations of the .NET .config files containing the property
+        /// overrides that are to be applied.
+        /// </summary>
+        public IResource[] Locations
+        {
+            set { _locations = value; }
+        }
+
+        /// <summary>
+        /// The configuration sections to look for within the .config files.
+        /// </summary>
+        /// <seealso cref="Spring.Objects.Factory.Config.PropertyResourceConfigurer.Location"/>
+        /// <seealso cref="Spring.Objects.Factory.Config.PropertyResourceConfigurer.Locations"/>
+        public string[] ConfigSections
+        {
+            get
+            {
+                if (_configSections == null
+                    || _configSections.Length == 0)
+                {
+                    _configSections = new string[] {DefaultConfigSectionName};
+                }
+                return _configSections;
+            }
+            set { _configSections = value; }
+        }
+
+        /// <summary>
+        /// Should a failure to find a .config file be ignored?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// <see langword="true"/> is only appropriate if the .config file is
+        /// completely optional. The default is <see langword="false"/>.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// <see langword="true"/> if a failure to find a .config file is to be
+        /// ignored.
+        /// </value>
+        public bool IgnoreResourceNotFound
+        {
+            set { _ignoreResourceNotFound = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Modify the application context's internal object factory after its
+        /// standard initialization.
+        /// </summary>
+        /// <param name="factory">
+        /// The object factory used by the application context.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor.PostProcessObjectFactory(IConfigurableListableObjectFactory)"/>
+        public void PostProcessObjectFactory(IConfigurableListableObjectFactory factory)
+        {
+            try
+            {
+                NameValueCollection properties = new NameValueCollection();
+                InitializeWithDefaultProperties(properties);
+                LoadProperties(properties);
+                ProcessProperties(factory, properties);
+            }
+            catch (Exception ex)
+            {
+                if (typeof(ObjectsException).IsInstanceOfType(ex))
+                {
+                    throw;
+                }
+                else
+                {
+                    throw new ObjectsException(
+                        "Errored while postprocessing an object factory.", ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Loads properties from the configuration sections 
+        /// specified in <see cref="ConfigSections"/> into <paramref name="properties"/>.
+        /// </summary>
+        /// <param name="properties">The <see cref="NameValueCollection"/> instance to be filled with properties.</param>
+        protected virtual void LoadProperties(NameValueCollection properties)
+        {
+            string[] configSections = ConfigSections;
+            if (_locations != null)
+            {
+                ValidateConfigSections(configSections);
+                bool usingMultipleConfigSections = configSections.Length > 1;
+                int sectionNameIndex = 0;
+                foreach (IResource resource in _locations)
+                {
+                    #region Instrumentation
+
+                    if (_log.IsDebugEnabled)
+                    {
+                        _log.Debug(string.Format(
+                                       CultureInfo.InvariantCulture,
+                                       "Loading configuration from '{0}'.", resource));
+                    }
+
+                    #endregion
+
+                    string sectionName = configSections[sectionNameIndex];
+                    if (resource is ConfigSectionResource)
+                    {
+                        ConfigurationReader.PopulateFromAppConfig(
+                            properties, sectionName, _lastLocationOverrides);
+                    }
+                    else
+                    {
+                        if (resource.Exists)
+                        {
+                            ConfigurationReader.Read(
+                                resource, sectionName, properties, _lastLocationOverrides);
+                        }
+                        else
+                        {
+                            string errorMessage = "Could not load configuration from " + resource;
+                            if (_ignoreResourceNotFound)
+                            {
+                                #region Instrumentation
+
+                                if (_log.IsWarnEnabled)
+                                {
+                                    _log.Warn(errorMessage);
+                                }
+
+                                #endregion
+                            }
+                            else
+                            {
+                                throw new ObjectInitializationException(errorMessage);
+                            }
+                        }
+                    }
+                    if (usingMultipleConfigSections)
+                    {
+                        ++sectionNameIndex;
+                    }
+                }
+            }
+            else
+            {
+                foreach (string sectionName in configSections)
+                {
+                    ConfigurationReader.PopulateFromAppConfig(
+                        properties, sectionName, _lastLocationOverrides);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Apply the given properties to the supplied
+        /// <see cref="Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>.
+        /// </summary>
+        /// <param name="factory">
+        /// The <see cref="Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>
+        /// used by the application context.
+        /// </param>
+        /// <param name="props">The properties to apply.</param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If an error occured.
+        /// </exception>
+        protected abstract void ProcessProperties(
+            IConfigurableListableObjectFactory factory,
+            NameValueCollection props);
+
+        /// <summary>
+        /// Validates the supplied <paramref name="configSections"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Basically, if external locations are specified, ensure that either
+        /// one or a like number of config sections are also specified.
+        /// </p>
+        /// </remarks>
+        /// <param name="configSections">
+        /// The <paramref name="configSections"/> to be validated.
+        /// </param>
+        private void ValidateConfigSections(string[] configSections)
+        {
+            if (_locations.Length != configSections.Length)
+            {
+                // if only one config section is specified for all locations that's cool...
+                if (configSections.Length != 1)
+                {
+                    throw new ObjectInitializationException(
+                        "Invalid number of config sections specified.");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Simply initializes the supplied <paramref name="properties"/>
+        /// collection with this instances default <see cref="Properties"/>
+        /// (if any).
+        /// </summary>
+        /// <param name="properties">
+        /// The collection to be so initialized.
+        /// </param>
+        private void InitializeWithDefaultProperties(NameValueCollection properties)
+        {
+            if (Properties != null)
+            {
+                properties.Add(Properties);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyRetrievingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyRetrievingFactoryObject.cs
new file mode 100644
index 00000000..a598f64b
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyRetrievingFactoryObject.cs
@@ -0,0 +1,302 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Text;
+
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// <see cref="Spring.Objects.Factory.IFactoryObject"/> implementation that
+	/// retrieves a <see lang="static"/> or non-static <b>public</b> property value.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Typically used for retrieving <b>public</b> property values.
+	/// </p>
+	/// </remarks>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: PropertyRetrievingFactoryObject.cs,v 1.12 2007/07/31 18:16:49 bbaia Exp $</version>
+    [Serializable]
+    public class PropertyRetrievingFactoryObject : AbstractFactoryObject, IInitializingObject
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject"/> class.
+		/// </summary>
+		public PropertyRetrievingFactoryObject()
+		{
+			Arguments = new object[] {};
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// The <see cref="System.Type.AssemblyQualifiedName"/> of the static property
+		/// to be retrieved.
+		/// </summary>
+		public string StaticProperty
+		{
+			set
+			{
+				AssertUtils.ArgumentNotNull(value, "StaticProperty");
+                TypeAssemblyHolder info = new TypeAssemblyHolder(value);
+				string typeName = info.TypeName;
+				int indexWherePropertyStarts = 0;
+				do
+				{
+					try
+					{
+						indexWherePropertyStarts = typeName.LastIndexOf('.');
+
+						#region Sanity Check
+
+						if (indexWherePropertyStarts == -1
+							|| indexWherePropertyStarts == typeName.Length)
+						{
+							throw new ArgumentException(
+								"The value passed to the StaticProperty property must be a fully " +
+									"qualified Type plus property name: " +
+									"e.g. 'Example.MyExampleClass.MyProperty, MyAssembly'");
+						}
+
+						#endregion
+
+						typeName = typeName.Substring(0, indexWherePropertyStarts);
+						StringBuilder buffer = new StringBuilder(typeName);
+						if (info.IsAssemblyQualified)
+						{
+                            buffer.Append(TypeAssemblyHolder.TypeAssemblySeparator);
+							buffer.Append(info.AssemblyName);
+						}
+						TargetType = TypeResolutionUtils.ResolveType(buffer.ToString());
+					}
+					catch (TypeLoadException)
+					{
+					}
+				} while (TargetType == null);
+				TargetProperty = info.TypeName.Substring(indexWherePropertyStarts + 1);
+			}
+		}
+
+		/// <summary>
+		/// Arguments for the property invocation.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If this property is not set, or the value passed to the setter invocation
+		/// is a null or zero-length array, a property with no arguments is assumed.
+		/// </p>
+		/// </remarks>
+		public object[] Arguments
+		{
+			get { return _arguments; }
+			set
+			{
+				if (value != null)
+				{
+					this._arguments = value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// The name of the property the value of which is to be retrieved.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Refers to either a <see lang="static"/> property or a non-static property,
+		/// depending on a target object being set.
+		/// </p>
+		/// </remarks>
+		public string TargetProperty
+		{
+			get { return _targetProperty; }
+			set { _targetProperty = value; }
+		}
+
+		/// <summary>
+		/// The object instance on which the property is defined.
+		/// </summary>
+		public object TargetObject
+		{
+			get { return _targetObject; }
+			set
+			{
+				_targetObject = value;
+				_targetObjectWrapper = new ObjectWrapper(_targetObject);
+			}
+		}
+
+		/// <summary>
+		/// The <see cref="System.Type"/> on which the property is defined.
+		/// </summary>
+		public Type TargetType
+		{
+			get { return _targetType; }
+			set { _targetType = value; }
+		}
+
+		/// <summary>
+		/// Return the type of object that this
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/> creates, or
+		/// <see lang="null"/> if not known in advance.
+		/// </summary>
+		public override Type ObjectType
+		{
+			get { return (Property == null) ? null : Property.PropertyType; }
+		}
+
+		private PropertyInfo Property
+		{
+			get { return _property; }
+			set { _property = value; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// after it has set all object properties supplied
+		/// (and satisfied <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+		/// and ApplicationContextAware).
+		/// </summary>
+		/// <exception cref="System.Exception">
+		/// In the event of misconfiguration (such as failure to set an essential
+		/// property) or if initialization fails.
+		/// </exception>
+		public override void AfterPropertiesSet()
+		{
+			if (TargetType == null
+				&& TargetObject == null)
+			{
+				throw new ArgumentException("One of the TargetType or TargetObject properties must be set.");
+			}
+			if (TargetProperty == null)
+			{
+				throw new ArgumentException("The TargetProperty property is required.");
+			}
+			Type targetType = null;
+			BindingFlags propertyFlags = BindingFlags.Public | BindingFlags.IgnoreCase;
+			if (TargetObject == null)
+			{
+				// a static property...
+				propertyFlags |= BindingFlags.Static;
+				targetType = TargetType;
+				if (TargetProperty.IndexOf(".") == -1)
+				{
+					Property = targetType.GetProperty(TargetProperty, propertyFlags);
+				}
+				else
+				{
+					// $£%#@! a nested static property... recurse to the end property
+					string property = TargetProperty;
+					int propertyIndex = property.IndexOf(".");
+					string startProperty = property.Substring(0, propertyIndex);
+					Property = targetType.GetProperty(startProperty, propertyFlags);
+					TargetObject = Property.GetValue(null, new object[] {});
+					TargetProperty = property.Substring(propertyIndex + 1);
+					AfterPropertiesSet();
+				}
+			}
+			else
+			{
+				// an instance property...
+				propertyFlags |= BindingFlags.Instance;
+				targetType = TargetObject.GetType();
+
+				// using the object wrapper does nested property lookup
+				Property = _targetObjectWrapper.GetPropertyInfo(TargetProperty);
+			}
+			if (Property == null)
+			{
+				throw new InvalidPropertyException(targetType, TargetProperty);
+			}
+			if (!Property.CanRead)
+			{
+				throw new NotWritablePropertyException(TargetProperty, targetType);
+			}
+			base.AfterPropertiesSet();
+		}
+
+		/// <summary>
+		/// Template method that subclasses must override to construct the object
+		/// returned by this factory.
+		/// </summary>
+		/// <exception cref="System.Exception">
+		/// If an exception occured during object creation.
+		/// </exception>
+		/// <returns>The object returned by this factory.</returns>
+		protected override object CreateInstance()
+		{
+			object instance = null;
+			object target = null;
+			if (TargetObject != null)
+			{
+				target = TargetObject;
+			}
+			try
+			{
+				if (Arguments.Length == 0 && target != null)
+				{
+					// using object wrapper supports nested property lookup...               
+					instance = _targetObjectWrapper.GetPropertyValue(_targetProperty);
+				}
+				else
+				{
+					instance = Property.GetValue(target, Arguments);
+				}
+			}
+			catch (Exception ex)
+			{
+				throw new FatalObjectException("Error reading property value.", ex);
+			}
+			return instance;
+		}
+
+		#endregion
+
+		#region Fields
+
+		private string _targetProperty;
+		private ObjectWrapper _targetObjectWrapper;
+		private object _targetObject;
+		private Type _targetType;
+		private PropertyInfo _property;
+		private object[] _arguments;
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/RegistryVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/RegistryVariableSource.cs
new file mode 100644
index 00000000..f35d3238
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/RegistryVariableSource.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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.Collections.Specialized;
+using Microsoft.Win32;
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Implementation of <see cref="IVariableSource"/> that
+    /// resolves variable name against registry key.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: RegistryVariableSource.cs,v 1.3 2007/08/03 08:31:24 oakinger Exp $</version>
+    public class RegistryVariableSource : IVariableSource
+    {
+        private RegistryKey key;
+
+        /// <summary>
+        /// Gets or sets the registry key to obtain variable values from.
+        /// </summary>
+        /// <value>
+        /// The registry key to obtain variable values from.
+        /// </value>
+        public RegistryKey Key
+        {
+            get { return key; }
+            set { key = value; }
+        }
+
+        /// <summary>
+        /// Resolves variable value for the specified variable name.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the variable to resolve.
+        /// </param>
+        /// <remarks>
+        /// This implementation resolves REG_SZ as well as REG_MULTI_SZ values. In case of a REG_MULTI_SZ value,
+        /// strings are concatenated to a comma-separated list following <see cref="NameValueCollection.Get(string)"/>
+        /// </remarks>
+        /// <returns>
+        /// The variable value if able to resolve, <c>null</c> otherwise.
+        /// </returns>
+        public string ResolveVariable(string name)
+        {
+			object res = Key.GetValue(name);
+			if (res is string)
+			{
+				return (string) res;
+			}
+			else if (res is string[])
+			{
+				NameValueCollection tmp = new NameValueCollection();
+				foreach(string val in (string[])res)
+				{
+					tmp.Add(name, val);
+				}
+				return tmp.Get(name);
+			}
+            else if (res is int)
+            {
+                return res.ToString();
+            }
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ResourceHandlerConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceHandlerConfigurer.cs
new file mode 100644
index 00000000..50f1b8cb
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceHandlerConfigurer.cs
@@ -0,0 +1,103 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Core.IO;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+    /// implementation that allows for convenient registration of custom
+    /// IResource implementations.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Because the <see cref="ResourceHandlerConfigurer"/>
+    /// class implements the
+    /// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+    /// interface, instances of this class that have been exposed in the
+    /// scope of an
+    /// <see cref="Spring.Context.IApplicationContext"/> will
+    /// <i>automatically</i> be picked up by the application context and made
+    /// available to the IoC container whenever resolution of IResources is required. 
+    /// </p>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: ResourceHandlerConfigurer.cs,v 1.3 2007/08/08 17:47:13 bbaia Exp $</version>
+    /// <seealso cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+    /// <seealso cref="Spring.Context.IApplicationContext"/>	
+    [Serializable]
+    public class ResourceHandlerConfigurer : AbstractConfigurer
+    {
+        private IDictionary resourceHandlers;
+
+        /// <summary>
+        /// The IResource implementations, i.e. resource handlers, to register.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The <see cref="System.Collections.IDictionary"/> has the
+        /// contains the resource protocol name as the key and type as the value.
+        /// The key name can either be a string or an object, in which case
+        /// ToString() will be used to obtain the string name.
+        /// The value can be the fully qualified name of the IResource 
+        /// implementation, a string, or
+        /// an actual <see cref="System.Type"/> of the IResource class
+        /// 
+        /// </p>
+        /// </remarks>
+        public IDictionary ResourceHandlers
+        {
+            set { resourceHandlers = value; }
+        }
+
+        /// <summary>
+        /// Registers custom IResource implementations.  The supplied
+        /// <paramref name="factory"/> is not used since IResourse implementations
+        /// are registered with a global <see cref="Spring.Core.IO.ResourceHandlerRegistry"/>
+        /// </summary>
+        /// <param name="factory">
+        /// The object factory.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        public override void PostProcessObjectFactory(
+            IConfigurableListableObjectFactory factory)
+        {
+            if (resourceHandlers != null)
+            {
+                foreach (DictionaryEntry entry in resourceHandlers)
+                {
+                    string protocolName = entry.Key.ToString();
+                    Type type = ResolveRequiredType(entry.Value, "value", "custom IResource implementation");
+                    ResourceHandlerRegistry.RegisterResourceHandler(protocolName, type);
+
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs
new file mode 100644
index 00000000..03c75d40
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs
@@ -0,0 +1,155 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Resources;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// A convenience class to create a
+    /// <see cref="System.Resources.ResourceManager"/> given the resource base
+    /// name and assembly name.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This is currently the preferred way of injecting resources into view
+    /// tier components (such as Windows Forms GUIs and ASP.NET ASPX pages).
+    /// A GUI component (typically a Windows Form) is injected with
+    /// an <see cref="System.Resources.ResourceManager"/> instance, and can
+    /// then proceed to use the various <c>GetXxx()</c> methods on the
+    /// <see cref="System.Resources.ResourceManager"/> to retrieve images,
+    /// strings, custom resources, etc.
+    /// </p>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: ResourceManagerFactoryObject.cs,v 1.11 2007/03/16 04:01:39 aseovic Exp $</version>
+    /// <seealso cref="Spring.Objects.Factory.Config.AbstractFactoryObject.GetObject"/>
+    /// <seealso cref="Spring.Objects.Factory.Config.AbstractFactoryObject.CreateInstance"/>
+    /// <seealso cref="System.Resources.ResourceManager"/>
+    [Serializable]
+    public class ResourceManagerFactoryObject : AbstractFactoryObject
+    {
+        private string _baseName;
+        private string _assemblyName;
+
+        /// <summary>
+        /// The root name of the resources.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// For example, the root name for the resource file named
+        /// "MyResource.en-US.resources" is "MyResource".
+        /// </p>
+        /// <note>
+        /// The namespace is also prefixed before the resource file name.
+        /// </note>
+        /// </remarks>
+        public string BaseName
+        {
+            get { return _baseName; }
+            set { _baseName = value; }
+        }
+
+        /// <summary>
+        /// The string representation of the assembly that contains the resource.
+        /// </summary>
+        public string AssemblyName
+        {
+            get { return _assemblyName; }
+            set { _assemblyName = value; }
+        }
+
+        /// <summary>
+        /// The <see cref="System.Resources.ResourceManager"/> <see cref="System.Type"/>.
+        /// </summary>
+        public override Type ObjectType
+        {
+            get { return typeof(ResourceManager); }
+        }
+
+        /// <summary>
+        /// Creates a <see cref="System.Resources.ResourceManager"/>.
+        /// </summary>
+        /// <exception cref="System.Exception">
+        /// If an exception occured during object creation.
+        /// </exception>
+        /// <returns>The object returned by this factory.</returns>
+        /// <seealso cref="Spring.Objects.Factory.Config.AbstractFactoryObject.GetObject"/>
+        /// <seealso cref="Spring.Objects.Factory.Config.AbstractFactoryObject.CreateInstance"/>
+        protected override object CreateInstance()
+        {
+            Assembly assembly;
+            try
+            {
+#if NET_2_0
+                assembly = Assembly.Load(AssemblyName);
+#else
+                assembly = Assembly.LoadWithPartialName(AssemblyName);
+#endif
+            }
+            catch (FileLoadException)
+            {
+                throw new ArgumentException("Not able to load assembly with a given name [" + _assemblyName + "]");
+            }
+
+            if (assembly == null)
+            {
+                throw new ArgumentException("Not able to load assembly with a given name [" + _assemblyName + "]");
+            }
+
+            return new ResourceManager(_baseName, assembly);
+        }
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has set all object properties supplied
+        /// (and satisfied the
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and <see cref="Spring.Context.IApplicationContextAware"/>
+        /// interfaces).
+        /// </summary>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as failure to set an essential
+        /// property) or if initialization fails.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        public override void AfterPropertiesSet()
+        {
+            if (StringUtils.IsNullOrEmpty(BaseName))
+            {
+                throw new ArgumentException("The 'BaseName' property for the resource is required.");
+            }
+            if (StringUtils.IsNullOrEmpty(AssemblyName))
+            {
+                throw new ArgumentException("The 'AssemblyName' property for the resource is required.");
+            }
+            base.AfterPropertiesSet();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/RuntimeObjectReference.cs b/src/Spring/Spring.Core/Objects/Factory/Config/RuntimeObjectReference.cs
new file mode 100644
index 00000000..d8a74092
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/RuntimeObjectReference.cs
@@ -0,0 +1,130 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Immutable placeholder class used for the value of a
+    /// <see cref="Spring.Objects.PropertyValue"/> object when it's a reference
+    /// to another object in this factory to be resolved at runtime.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Rick Evans (.NET)</author>
+    [Serializable]
+    public class RuntimeObjectReference
+    {
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Config.RuntimeObjectReference"/>
+        /// class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This does <b>not</b> mark this object as being a reference to
+        /// another object in any parent factory.
+        /// </p>
+        /// </remarks>
+        /// <param name="objectName">The name of the target object.</param>
+        public RuntimeObjectReference(string objectName)
+            : this(objectName, false)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Config.RuntimeObjectReference"/>
+        /// class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This variant constructor allows a client to specifiy whether or not
+        /// this object is a reference to another object in a parent factory.
+        /// </p>
+        /// </remarks>
+        /// <param name="objectName">The name of the target object.</param>
+        /// <param name="isToParent">
+        /// Whether this object is an explicit reference to an object in a
+        /// parent factory.
+        /// </param>
+        public RuntimeObjectReference(string objectName, bool isToParent)
+        {
+            _objectName = objectName;
+            _isToParent = isToParent;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Return the target object name.
+        /// </summary>
+        public string ObjectName
+        {
+            get { return _objectName; }
+        }
+
+        /// <summary>
+        /// Is this is an explicit reference to an object in the parent
+        /// factory?
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if this is an explicit reference to an
+        /// object in the parent factory.
+        /// </value>
+        public bool IsToParent
+        {
+            get { return _isToParent; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Returns a string representation of this instance.
+        /// </summary>
+        /// <returns>A string representation of this instance.</returns>
+        public override string ToString()
+        {
+            return string.Format(
+                CultureInfo.InvariantCulture, "<{0}>", ObjectName);
+        }
+
+        #endregion
+
+        #region Fields
+
+        private string _objectName;
+
+        private bool _isToParent;
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/SetFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/SetFactoryObject.cs
new file mode 100644
index 00000000..d77ce6e9
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/SetFactoryObject.cs
@@ -0,0 +1,124 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using Spring.Collections;
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Simple factory object for shared <see cref="Spring.Collections.ISet"/> instances.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: SetFactoryObject.cs,v 1.10 2007/07/31 03:47:39 markpollack Exp $</version>
+    [Serializable]
+    public class SetFactoryObject : AbstractFactoryObject
+	{
+		private ISet _sourceSet;
+		private Type _targetSetType = typeof (HybridSet);
+
+		/// <summary>
+		/// Set the source <see cref="Spring.Collections.ISet"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This value will be used to populate the <see cref="Spring.Collections.ISet"/>
+		/// returned by this factory.
+		/// </p>
+		/// </remarks>
+		public ISet SourceSet
+		{
+			set { this._sourceSet = value; }
+		}
+
+		/// <summary>
+		/// Set the <see cref="System.Type"/> of the <see cref="Spring.Collections.ISet"/>
+		/// implementation to use.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The default is the <see cref="Spring.Collections.HybridSet"/> <see cref="System.Type"/>.
+		/// </p>
+		/// </remarks>
+		public Type TargetSetType
+		{
+			set
+			{
+				AssertUtils.ArgumentNotNull(value, "value");
+				if (!typeof (ISet).IsAssignableFrom(value))
+				{
+					throw new ArgumentException(
+						string.Format(CultureInfo.InvariantCulture,
+						              "The Type passed to the TargetSetType property must implement the '{0}' interface.",
+						              typeof (ISet).FullName));
+				}
+				if (value.IsInterface)
+				{
+					throw new ArgumentException(
+						string.Format(CultureInfo.InvariantCulture,
+						"The Type passed to the TargetSetType property cannot be an interface; it must be a concrete class that implements the '{0}' interface.",
+						ObjectType.FullName));
+				}
+				if (value.IsAbstract)
+				{
+					throw new ArgumentException(
+						string.Format(CultureInfo.InvariantCulture,
+						"The Type passed to the TargetSetType property cannot be abstract (MustInherit in VisualBasic.NET); it must be a concrete class that implements the '{0}' interface.",
+						ObjectType.FullName));
+				}
+				this._targetSetType = value;
+			}
+		}
+
+		/// <summary>
+		/// The <see cref="System.Type"/> of objects created by this factory.
+		/// </summary>
+		/// <value>
+		/// Always returns the <see cref="Spring.Collections.ISet"/> <see cref="System.Type"/>.
+		/// </value>
+		public override Type ObjectType
+		{
+			get { return typeof (ISet); }
+		}
+
+		/// <summary>
+		/// Constructs a new instance of the target set.
+		/// </summary>
+		/// <returns>The new <see cref="Spring.Collections.ISet"/> instance.</returns>
+		protected override object CreateInstance()
+		{
+			if (this._sourceSet == null)
+			{
+				throw new ArgumentException("The 'SourceSet' property cannot be null (Nothing in Visual Basic.NET).");
+			}
+			Set result = (Set) ObjectUtils.InstantiateType(this._targetSetType);
+			result.AddAll(this._sourceSet);
+			return result;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/SmartInstantiationAwareObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/SmartInstantiationAwareObjectPostProcessor.cs
new file mode 100644
index 00000000..b056b0ee
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/SmartInstantiationAwareObjectPostProcessor.cs
@@ -0,0 +1,63 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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;
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Extension of the <see cref="IInstantiationAwareObjectPostProcessor"/> interface,
+    /// adding a callback for predicting the eventual type of a processed object.
+    /// </summary>
+    /// <remarks>This interface is a special purpose interface, mainly for
+    /// internal use within the framework. In general, application-provided
+    /// post-processors should simply implement the plain <see cref="IObjectPostProcessor"/>
+    /// interface or derive from the <see cref="InstantiationAwareObjectPostProcessorAdapter"/>
+    /// class.  New methods might be added to this interface even in point releases.
+    /// </remarks>
+    /// <seealso cref="InstantiationAwareObjectPostProcessorAdapter"/>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: SmartInstantiationAwareObjectPostProcessor.cs,v 1.1 2008/04/02 18:02:24 markpollack Exp $</version>
+    public interface SmartInstantiationAwareObjectPostProcessor : IInstantiationAwareObjectPostProcessor
+    {
+        /// <summary>
+        /// Predicts the type of the object to be eventually returned from this
+        /// processors <see cref="IInstantiationAwareObjectPostProcessor.PostProcessBeforeInstantiation"/> callback.
+        /// </summary>
+        /// <param name="objectType">The raw Type of the object.</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>The type of the object, or <code>null</code> if not predictable.</returns>
+        /// <exception cref="ObjectsException">in case of errors</exception>
+        Type PredictObjectType(Type objectType, string objectName);
+
+
+        /// <summary>
+        /// Determines the candidate constructors to use for the given object.
+        /// </summary>
+        /// <param name="objectType">The raw Type of the object.</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>The candidate constructors, or <code>null</code> if none specified</returns>
+        /// <exception cref="ObjectsException">in case of errors</exception>
+        ConstructorInfo[] DetermineCandidateConstructors(Type objectType, string objectName);
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/SpecialFolderVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/SpecialFolderVariableSource.cs
new file mode 100644
index 00000000..7ee95226
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/SpecialFolderVariableSource.cs
@@ -0,0 +1,60 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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;
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Implementation of <see cref="IVariableSource"/> that
+    /// resolves variable name against special folders (as defined by
+    /// <see cref="Environment.SpecialFolder"/> enumeration).
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SpecialFolderVariableSource.cs,v 1.3 2007/08/02 22:18:32 markpollack Exp $</version>
+    [Serializable]
+    public class SpecialFolderVariableSource : IVariableSource
+    {
+        /// <summary>
+        /// Resolves specified special folder to its full path.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the special folder to resolve. Should be one of the values
+        /// defined by the <see cref="Environment.SpecialFolder"/> enumeration.
+        /// </param>
+        /// <returns>
+        /// The folder path if able to resolve, <c>null</c> otherwise.
+        /// </returns>
+        public string ResolveVariable(string name)
+        {
+            try
+            {
+                Environment.SpecialFolder folder =
+                    (Environment.SpecialFolder) Enum.Parse(typeof (Environment.SpecialFolder), name, true);
+
+                return Environment.GetFolderPath(folder);
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/TypeAliasConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/TypeAliasConfigurer.cs
new file mode 100644
index 00000000..48fe82ba
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/TypeAliasConfigurer.cs
@@ -0,0 +1,106 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Core.TypeResolution;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+    /// implementation that allows for convenient registration of custom
+    /// type aliases.
+    /// </summary>
+    /// <remarks>
+    /// Type aliases can be used instead of fully qualified type names anywhere
+    /// a type name is expected in a Spring.NET configuration file.
+    /// <p>
+    /// Because the <see cref="Spring.Objects.Factory.Config.TypeAliasConfigurer"/>
+    /// class implements the
+    /// <see cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+    /// interface, instances of this class that have been exposed in the
+    /// scope of an
+    /// <see cref="Spring.Context.IApplicationContext"/> will
+    /// <i>automatically</i> be picked up by the application context and made
+    /// available to the IoC container whenever resolution of type aliases is required. 
+    /// </p>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: TypeAliasConfigurer.cs,v 1.6 2007/07/31 18:16:49 bbaia Exp $</version>
+    /// <seealso cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+    /// <seealso cref="Spring.Context.IApplicationContext"/>	
+    [Serializable]
+    public class TypeAliasConfigurer : AbstractConfigurer
+    {
+        private IDictionary types;
+
+
+        /// <summary>
+        /// The type aliases to register.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The <see cref="System.Collections.IDictionary"/> has the
+        /// contains the alias name as the key and type as the value.
+        /// The key name can either be a string or an object, in which case
+        /// ToString() will be used to obtain the string name.
+        /// the value can be the fully qualified name of the type as a string or
+        /// an actual <see cref="System.Type"/> of the class that 
+        /// being aliased.
+        /// </p>
+        /// </remarks>
+        public IDictionary TypeAliases
+        {
+            set { types = value; }
+        }
+
+        /// <summary>
+        /// Registers any type aliases.  The supplied
+        /// <paramref name="factory"/> is not used since type aliases
+        /// are registered with a global <see cref="TypeRegistry"/>
+        /// </summary>
+        /// <param name="factory">
+        /// The object factory.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        public override void PostProcessObjectFactory(
+            IConfigurableListableObjectFactory factory)
+        {
+            if (types != null)
+            {
+                foreach (DictionaryEntry entry in types)
+                {
+                    string alias = entry.Key.ToString();
+                    Type type = ResolveRequiredType(entry.Value, "value", "custom type alias");
+                    TypeRegistry.RegisterType(alias, type);
+                }
+            }
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/TypedStringValue.cs b/src/Spring/Spring.Core/Objects/Factory/Config/TypedStringValue.cs
new file mode 100644
index 00000000..4c4ae743
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/TypedStringValue.cs
@@ -0,0 +1,143 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Holder for a typed <see cref="System.String"/> value.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Can be added to object definitions to explicitly specify
+	/// a target type for a <see cref="System.String"/> value,
+	/// for example for collection
+	/// elements.
+	/// </p>
+	/// <p>
+	/// This holder just stores the <see cref="System.String"/> value and the target
+	/// <see cref="System.Type"/>. The actual conversion will be performed by
+	/// the surrounding object factory.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: TypedStringValue.cs,v 1.5 2007/05/29 20:00:20 markpollack Exp $</version>
+	[Serializable]
+	public class TypedStringValue
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Config.TypedStringValue"/>
+		/// class.
+		/// </summary>
+		public TypedStringValue()
+		{
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TypedStringValue"/> class.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public TypedStringValue(string value)
+        {
+            Value = value;
+        }
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Config.TypedStringValue"/>
+		/// class.
+		/// </summary>
+		/// <param name="value">
+		/// The value that is to be converted.
+		/// </param>
+		/// <param name="targetType">
+		/// The <see cref="System.Type"/> to convert to.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="targetType"/> is
+		/// <see langword="null"/>.
+		/// </exception>
+		public TypedStringValue(string value, Type targetType)
+		{
+			Value = value;
+			TargetType = targetType;
+		}
+
+		#endregion
+
+		/// <summary>
+		/// The value that is to be converted. 
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Obviously if the
+		/// <see cref="Spring.Objects.Factory.Config.TypedStringValue.TargetType"/>
+		/// is the <see cref="System.String"/> <see cref="System.Type"/>, no conversion
+		/// will actually be performed.
+		/// </p>
+		/// </remarks>
+		public string Value
+		{
+		    get { return theValue; }
+		    set { this.theValue = value; }
+		}
+
+	    /// <summary>
+	    /// The <see cref="System.Type"/> to convert to.
+	    /// </summary>
+	    /// <exception cref="System.ArgumentNullException">
+	    /// If the setter is supplied with a <see langword="null"/> value.
+	    /// </exception>
+	    public Type TargetType
+	    {
+	        get { return targetType; }
+	        set
+	        {
+	            AssertUtils.ArgumentNotNull(value, "TargetType");
+	            targetType = value;
+	        }
+	    }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance has target type.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance has target type; otherwise, <c>false</c>.
+        /// </value>
+	    public bool HasTargetType
+	    {
+	        get { return targetType != null; }
+	    }
+
+	    private string theValue;
+	    private Type targetType;
+	}
+
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/VariableAccessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/VariableAccessor.cs
new file mode 100644
index 00000000..f5bef872
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/VariableAccessor.cs
@@ -0,0 +1,788 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Provides methods for type-safe accessing <see cref="IVariableSource"/>s.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: VariableAccessor.cs,v 1.2 2007/08/27 14:49:42 oakinger Exp $</version>
+    public class VariableAccessor
+    {
+        private readonly IVariableSource variableSource;
+
+        /// <summary>
+        /// Initialize a new instance of an <see cref="VariableAccessor"/>
+        /// </summary>
+        /// <param name="variableSource">The underlying <see cref="IVariableSource"/> to read values from.</param>
+        public VariableAccessor(IVariableSource variableSource)
+        {
+            this.variableSource = variableSource;
+        }
+
+        /// <summary>
+        /// Returns a <see cref="float"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="float"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public float GetFloat(string name, float defaultValue)
+        {
+            return GetFloat(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="float"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="float"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public float GetFloat(string name, float defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                return float.Parse(text);
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="double"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="double"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public double GetDouble(string name, double defaultValue)
+        {
+            return GetDouble(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="double"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="double"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public double GetDouble(string name, double defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                return double.Parse(text);
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="decimal"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="decimal"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public decimal GetDecimal(string name, decimal defaultValue)
+        {
+            return GetDecimal(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="decimal"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="decimal"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public decimal GetDecimal(string name, decimal defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                return decimal.Parse(text);
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="long"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="long"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public long GetInt64(string name, long defaultValue)
+        {
+            return GetInt64(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="long"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="long"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public long GetInt64(string name, long defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                return Int64.Parse(text);
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="ulong"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="ulong"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public ulong GetUInt64(string name, ulong defaultValue)
+        {
+            return GetUInt64(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="ulong"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="ulong"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public ulong GetUInt64(string name, ulong defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                return UInt64.Parse(text);
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="int"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="int"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public int GetInt32(string name, int defaultValue)
+        {
+            return GetInt32(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="int"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="int"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public int GetInt32(string name, int defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                return Int32.Parse(text);
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            }            
+        }
+
+        /// <summary>
+        /// Returns a <see cref="uint"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="uint"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public uint GetUInt32(string name, uint defaultValue)
+        {
+            return GetUInt32(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="uint"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="uint"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public uint GetUInt32(string name, uint defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                return UInt32.Parse(text);
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="short"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="short"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public short GetInt16(string name, short defaultValue)
+        {
+            return GetInt16(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="short"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="short"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public short GetInt16(string name, short defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                return Int16.Parse(text);
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="short"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="short"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public ushort GetUInt16(string name, ushort defaultValue)
+        {
+            return GetUInt16(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="short"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="short"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public ushort GetUInt16(string name, ushort defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                return UInt16.Parse(text);
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="byte"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="byte"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public byte GetByte(string name, byte defaultValue)
+        {
+            return GetByte(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="byte"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="byte"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public byte GetByte(string name, byte defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                return byte.Parse(text);
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="Guid"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="Guid"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public Guid GetGuid(string name, Guid defaultValue)
+        {
+            return GetGuid(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="Guid"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="Guid"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public Guid GetGuid(string name, Guid defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                return new Guid(text);
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="DateTime"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="format">The expected format of the variable's value</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="DateTime"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public DateTime GetDateTime(string name, string format, DateTime defaultValue)
+        {
+            return GetDateTime(name, format, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="DateTime"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="format">The expected format of the variable's value</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="DateTime"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public DateTime GetDateTime(string name, string format, DateTime defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                if (format == null)
+                {
+                    return DateTime.Parse(text);
+                }
+                else
+                {
+                    return DateTime.ParseExact(text, format, CultureInfo.InvariantCulture);
+                }
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="char"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="char"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public char GetChar(string name, char defaultValue)
+        {
+            return GetChar(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="char"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="char"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public char GetChar(string name, char defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                if (text.Length != 1)
+                {
+                    throw new ArgumentException("string '{0}' can't be converted to char", text);
+                }
+                return text[0];
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="bool"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// A <see cref="bool"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public bool GetBoolean(string name, bool defaultValue)
+        {
+            return GetBoolean(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="bool"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// A <see cref="bool"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public bool GetBoolean(string name, bool defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                string text = GetString(name, defaultValue.ToString());
+                return bool.Parse(text);
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                }
+                else
+                {
+                    return defaultValue;
+                }                
+            }
+        }
+
+        /// <summary>
+        /// Returns an <see cref="Enum"/> of type <paramref name="defaultValue.GetType()"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <returns>
+        /// An <see cref="Enum"/> of type <paramref name="defaultValue.GetType()"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public Enum GetEnum(string name, Enum defaultValue)
+        {
+            return GetEnum(name, defaultValue, true);
+        }
+
+        /// <summary>
+        /// Returns an <see cref="Enum"/> of type <paramref name="defaultValue.GetType()"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.</param>
+        /// <param name="throwOnInvalidValue">
+        /// If <c>false</c>, suppresses exceptions if the result 
+        /// of <see cref="IVariableSource.ResolveVariable"/> cannot be parsed
+        /// and returns <paramref name="defaultValue"/> instead.</param>
+        /// <returns>
+        /// An <see cref="Enum"/> of type <paramref name="defaultValue.GetType()"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> cannot be parsed.
+        /// </returns>
+        public Enum GetEnum(string name, Enum defaultValue, bool throwOnInvalidValue)
+        {
+            try
+            {
+                return (Enum)Enum.Parse(defaultValue.GetType(), GetString(name, defaultValue.ToString()), true);
+            }
+            catch
+            {
+                if (throwOnInvalidValue)
+                {
+                    throw;
+                } 
+                else
+                {
+                    return defaultValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="string"/> that contains the value of the specified variable.
+        /// </summary>
+        /// <param name="name">The name of the variable to be read.</param>
+        /// <param name="defaultValue">The value to be returned if <see cref="IVariableSource.ResolveVariable"/> returns <see lang="null"/> or <see cref="String.Empty"/>.</param>
+        /// <returns>
+        /// A <see cref="string"/> that contains the value of the specified variable 
+        /// or <paramref name="defaultValue"/>, if <see cref="IVariableSource.ResolveVariable"/> returns <c>null</c>.
+        /// </returns>
+        public string GetString(string name, string defaultValue)
+        {
+            string value = (variableSource == null) ? defaultValue : variableSource.ResolveVariable(name);
+
+            if (!StringUtils.HasLength(value))
+            {
+                return defaultValue;
+            }
+
+            return value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/VariablePlaceholderConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/VariablePlaceholderConfigurer.cs
new file mode 100644
index 00000000..bf8e83cb
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Config/VariablePlaceholderConfigurer.cs
@@ -0,0 +1,316 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+using System.Globalization;
+using Common.Logging;
+using Spring.Collections;
+using Spring.Core;
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Resolves placeholder values in one or more object definitions
+    /// </summary>
+    /// <remarks>
+    /// The placeholder syntax follows the NAnt style: <c>${...}</c>.
+    /// Placeholders values are resolved against a list of 
+    /// <see cref="IVariableSource"/>s.  In case of multiple definitions
+    /// for the same property placeholder name, the first one in the 
+    /// list is used.
+    /// <para>Variable substitution is performed on simple property values, 
+    /// lists, dictionaries, sets, constructor
+    /// values, object type name, and object names in
+    /// runtime object references (
+    /// <see cref="Spring.Objects.Factory.Config.RuntimeObjectReference"/>).</para>
+    /// <para>Furthermore, placeholder values can also cross-reference other
+    /// placeholders, in the manner of the following example where the
+    /// <c>rootPath</c> property is cross-referenced by the <c>subPath</c>
+    /// property.
+    /// </para>
+    /// <example>
+    /// <code escaped="true">
+    /// <name-values>
+    ///		<add key="rootPath" value="myrootdir"/>
+    ///		<add key="subPath" value="${rootPath}/subdir"/>
+    /// </name-values>
+    /// </code>
+    /// </example>
+    /// <para>If a configurer cannot resolve a placeholder, and the value of the
+    /// <see cref="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.IgnoreUnresolvablePlaceholders"/>
+    /// property is currently set to <see langword="false"/>, an
+    /// <see cref="Spring.Objects.Factory.ObjectDefinitionStoreException"/>
+    /// will be thrown. </para>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: VariablePlaceholderConfigurer.cs,v 1.2 2007/08/02 22:18:32 markpollack Exp $</version>
+    public class VariablePlaceholderConfigurer : IObjectFactoryPostProcessor, IOrdered
+    {
+        #region Fields
+        private int order = Int32.MaxValue; // default: same as non-Ordered
+
+        private bool ignoreUnresolvablePlaceholders;
+
+        private IList variableSourceList;
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Sets the list of <see cref="IVariableSource"/>s that will be used to resolve placeholder names.
+        /// </summary>
+        /// <value>A list of <see cref="IVariableSource"/>s.</value>
+        public IList VariableSources
+        {
+            set { variableSourceList = value; }
+        }
+
+        /// <summary>
+        /// Sets <see cref="IVariableSource"/> that will be used to resolve placeholder names.
+        /// </summary>
+        /// <value>A <see cref="IVariableSource"/> instance.</value>
+        public IVariableSource VariableSource
+        {
+            set
+            {
+                variableSourceList = new ArrayList();
+                variableSourceList.Add(value);
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether unresolved placeholders should be ignored.
+        /// </summary>
+        public bool IgnoreUnresolvablePlaceholders
+        {
+            set { ignoreUnresolvablePlaceholders = value; }
+        }
+
+        #endregion
+
+        #region IObjectFactoryPostProcessor Members
+
+        /// <summary>
+        /// Modify the application context's internal object factory after its
+        /// standard initialization.
+        /// </summary>
+        /// <param name="factory">The object factory used by the application context.</param>
+        /// <remarks>
+        /// <p>
+        /// All object definitions will have been loaded, but no objects will have
+        /// been instantiated yet. This allows for overriding or adding properties
+        /// even to eager-initializing objects.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        public void PostProcessObjectFactory(IConfigurableListableObjectFactory factory)
+        {
+            try
+            {
+                ProcessProperties(factory);
+            }
+            catch (Exception ex)
+            {
+                if (typeof (ObjectsException).IsInstanceOfType(ex))
+                {
+                    throw;
+                }
+                else
+                {
+                    throw new ObjectsException(
+                        "Errored while postprocessing an object factory.", ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IOrdered Members
+
+        /// <summary>
+        /// Return the order value of this object, where a higher value means greater in
+        /// terms of sorting.
+        /// </summary>
+        /// <returns>The order value.</returns>
+        /// <seealso cref="Spring.Core.IOrdered.Order"/>
+        public int Order
+        {
+            get { return order; }
+            set { order = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Apply the property replacement using the specified <see cref="IVariableSource"/>s for all
+        /// object in the supplied
+        /// <see cref="Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>.
+        /// </summary>
+        /// <param name="factory">
+        /// The <see cref="Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>
+        /// used by the application context.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If an error occured.
+        /// </exception>
+        protected virtual void ProcessProperties(IConfigurableListableObjectFactory factory)
+        {
+            IVariableSource compositeVariableSource =
+                new PlaceholderResolvingCompositeVariableSource(variableSourceList, ignoreUnresolvablePlaceholders);
+            ObjectDefinitionVisitor visitor = new ObjectDefinitionVisitor(compositeVariableSource);
+
+            string[] objectDefinitionNames = factory.GetObjectDefinitionNames();
+            for (int i = 0; i < objectDefinitionNames.Length; ++i)
+            {
+                string name = objectDefinitionNames[i];
+                IObjectDefinition definition = factory.GetObjectDefinition(name);
+                try
+                {
+                    visitor.VisitObjectDefinition(definition);
+                }
+                catch (ObjectDefinitionStoreException ex)
+                {
+                    throw new ObjectDefinitionStoreException(
+                        definition.ResourceDescription, name, ex.Message);
+                }
+            }
+        }
+    }
+
+    #region Helper class
+    internal class PlaceholderResolvingCompositeVariableSource : IVariableSource
+    {
+        private string placeholderPrefix = "${";
+        private string placeholderSuffix = "}";
+        private bool ignoreUnresolvablePlaceholders;
+
+        private ILog logger = LogManager.GetLogger(typeof (PlaceholderResolvingCompositeVariableSource));
+
+        private IList variableSourceList;
+
+        public PlaceholderResolvingCompositeVariableSource(IList variableSourceList, bool ignoreUnresolvablePlaceholders)
+        {
+            this.variableSourceList = variableSourceList;
+            this.ignoreUnresolvablePlaceholders = ignoreUnresolvablePlaceholders;
+        }
+
+        #region IVariableSource Members
+
+        public string ResolveVariable(string rawStringValue)
+        {
+            return ParseAndResolveVariable(rawStringValue, new HashedSet());
+        }
+
+
+        //TODO handle resolved values at are not string - identify this case as only 1 placeholder present?
+
+        private string ParseAndResolveVariable(string strVal, ISet visitedPlaceholders)
+        {
+            int startIndex = strVal.IndexOf(placeholderPrefix);
+            while (startIndex != -1)
+            {
+                int endIndex = strVal.IndexOf(
+                    placeholderSuffix, startIndex + placeholderPrefix.Length);
+                if (endIndex != -1)
+                {
+                    int pos = startIndex + placeholderPrefix.Length;
+                    string placeholder = strVal.Substring(pos, endIndex - pos);
+                    if (visitedPlaceholders.Contains(placeholder))
+                    {
+                        throw new ObjectDefinitionStoreException(
+                            string.Format(
+                                CultureInfo.InvariantCulture,
+                                "Circular placeholder reference '{0}' detected. ",
+                                placeholder));
+                    }
+                    visitedPlaceholders.Add(placeholder);
+                    string resolvedValue = ResolvePlaceholderVariable(placeholder);
+                    if (resolvedValue != null)
+                    {
+                        resolvedValue = ParseAndResolveVariable(resolvedValue, visitedPlaceholders);
+
+                        #region Instrumentation
+
+                        if (logger.IsDebugEnabled)
+                        {
+                            logger.Debug(string.Format(
+                                             CultureInfo.InvariantCulture,
+                                             "Resolving placeholder '{0}' to '{1}'.", placeholder, resolvedValue));
+                        }
+
+                        #endregion
+
+                        strVal = strVal.Substring(0, startIndex) + resolvedValue + strVal.Substring(endIndex + 1);
+                        startIndex = strVal.IndexOf(placeholderPrefix, startIndex + resolvedValue.Length);
+                    }
+                    else if (ignoreUnresolvablePlaceholders)
+                    {
+                        // simply return the unprocessed value...
+                        return strVal;
+                    }
+                    else
+                    {
+                        throw new ObjectDefinitionStoreException(string.Format(
+                                                                     CultureInfo.InvariantCulture,
+                                                                     "Could not resolve placeholder '{0}'.", placeholder));
+                    }
+                    visitedPlaceholders.Remove(placeholder);
+                }
+                else
+                {
+                    startIndex = -1;
+                }
+            }
+            return strVal;
+        }
+
+        private string ResolvePlaceholderVariable(string variableName)
+        {
+            foreach (IVariableSource variableSource in variableSourceList)
+            {
+                //TODO handle resolved values at are not strings?
+
+                object resolvedValue = variableSource.ResolveVariable(variableName);
+                if (resolvedValue is string)
+                {
+                }
+                if (resolvedValue != null)
+                {
+                    if (resolvedValue is string)
+                    {
+                        return resolvedValue as string;
+                    }
+                    else
+                    {
+                        logger.Warn("Placeholder " + variableSource + " resolved to object type [" + resolvedValue.GetType() + "].  Only string type currently supported");
+                    }
+                }
+            }
+            return null;
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/FactoryObjectNotInitializedException.cs b/src/Spring/Spring.Core/Objects/Factory/FactoryObjectNotInitializedException.cs
new file mode 100644
index 00000000..1dd3f524
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/FactoryObjectNotInitializedException.cs
@@ -0,0 +1,124 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Exception thrown if an
+	/// <see cref="Spring.Objects.Factory.IFactoryObject"/> is not fully
+	/// initialized, for example if it is involved in a circular reference.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This is usually indicated by any of the variants of the
+	/// <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>
+	/// method returning <see langword="null"/>.
+	/// </p>
+	/// <p>
+	/// A circular reference with an <see cref="Spring.Objects.Factory.IFactoryObject"/>
+	/// cannot be solved by eagerly caching singleton instances (as is the
+	/// case with normal objects. The reason is that every
+	/// <see cref="Spring.Objects.Factory.IFactoryObject"/> needs to be fully
+	/// initialized before it can return the created object, while only specific
+	/// normal objects need to be initialized - that is, if a collaborating object
+	/// actually invokes them on initialization instead of just storing the reference.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: FactoryObjectNotInitializedException.cs,v 1.4 2007/12/05 00:28:04 bbaia Exp $</version>
+	[Serializable]
+	public class FactoryObjectNotInitializedException : ObjectCreationException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// FactoryObjectNotInitializedException class.
+		/// </summary>
+		public FactoryObjectNotInitializedException()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the FactoryObjectNotInitializedException class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public FactoryObjectNotInitializedException(string message)
+			: base(message)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the FactoryObjectNotInitializedException class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public FactoryObjectNotInitializedException(string message, Exception rootCause)
+			: base(message, rootCause)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// FactoryObjectCircularReferenceException class.
+		/// </summary>
+        /// <param name="objectName">
+		/// The name of the object that triggered the exception.
+		/// </param>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public FactoryObjectNotInitializedException(string objectName, string message)
+            : base(objectName, StringUtils.HasText(message) ? message :
+				"Circular dependency chain detected for factory object.")
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the FactoryObjectCircularReferenceException class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected FactoryObjectNotInitializedException(
+			SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{
+		}
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/IFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/IFactoryObject.cs
new file mode 100644
index 00000000..8721cdab
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/IFactoryObject.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Interface to be implemented by objects used within an
+	/// <see cref="Spring.Objects.Factory.IObjectFactory"/> that are themselves
+	/// factories.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// If an object implements this interface, it is used as a factory,
+	/// not directly as an object. <see cref="Spring.Objects.Factory.IFactoryObject"/>s
+	/// can support singletons and prototypes
+	/// (<see cref="Spring.Objects.Factory.IFactoryObject.IsSingleton"/>)...
+	/// please note that an <see cref="Spring.Objects.Factory.IFactoryObject"/>
+	/// itself can only ever be a singleton. It is a logic error to configure an
+	/// <see cref="Spring.Objects.Factory.IFactoryObject"/> itself to be a prototype.
+	/// </p>
+	/// <note type="caution">
+	/// An object that implements this interface cannot be used as a normal object.
+	/// </note>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: IFactoryObject.cs,v 1.6 2006/04/09 07:18:48 markpollack Exp $</version>
+	public interface IFactoryObject
+	{
+	    /// <summary>
+	    /// Return an instance (possibly shared or independent) of the object
+	    /// managed by this factory.
+	    /// </summary>
+	    /// <remarks>
+	    /// <note type="caution">
+	    /// If this method is being called in the context of an enclosing IoC container and
+	    /// returns <see langword="null"/>, the IoC container will consider this factory
+	    /// object as not being fully initialized and throw a corresponding (and most
+	    /// probably fatal) exception.
+	    /// </note>
+	    /// </remarks>
+	    /// <returns>
+	    /// An instance (possibly shared or independent) of the object managed by
+	    /// this factory.
+	    /// </returns>
+	    object GetObject();
+
+	    /// <summary>
+	    /// Return the <see cref="System.Type"/> of object that this
+	    /// <see cref="Spring.Objects.Factory.IFactoryObject"/> creates, or
+	    /// <see langword="null"/> if not known in advance.
+	    /// </summary>
+	    Type ObjectType { get; }
+
+	    /// <summary>
+	    /// Is the object managed by this factory a singleton or a prototype?
+	    /// </summary>
+	    bool IsSingleton { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/IGenericObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IGenericObjectFactory.cs
new file mode 100644
index 00000000..88d52e32
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/IGenericObjectFactory.cs
@@ -0,0 +1,52 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Interface defining a factory which can return an object instance
+	/// (possibly shared or independent) when invoked. 
+	/// </summary>
+	/// <remarks>
+	/// This interface is typically used to encapsulate a generic factory 
+	/// which returns a new instance (prototype) on each invocation.
+	/// It is similar to the <see cref="Spring.Objects.Factory.IFactoryObject"/>, but
+	/// implementations of the aforementioned interface are normally meant to be defined
+	/// as instances by the user in an <see cref="Spring.Objects.Factory.IObjectFactory"/>,
+	/// while implementations of this class are normally meant to be fed as a property to
+	/// other objects; as such, the
+	/// <see cref="Spring.Objects.Factory.IGenericObjectFactory.GetObject"/> method
+	/// has different exception handling behavior.
+	/// </remarks>
+	/// <author>Colin Sampaleanu</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: IGenericObjectFactory.cs,v 1.6 2006/04/09 07:18:48 markpollack Exp $</version>
+	public interface IGenericObjectFactory
+	{
+		/// <summary>
+		/// Return an instance (possibly shared or independent)
+		/// of the object managed by this factory.
+		/// </summary>
+		/// <returns>
+		/// An instance of the object (should never be <see langword="null"/>).
+		/// </returns>
+		object GetObject();
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/IHierarchicalObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IHierarchicalObjectFactory.cs
new file mode 100644
index 00000000..2074728b
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/IHierarchicalObjectFactory.cs
@@ -0,0 +1,48 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Sub-interface implemented by object factories that can be part
+	/// of a hierarchy.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: IHierarchicalObjectFactory.cs,v 1.6 2006/04/09 07:18:48 markpollack Exp $</version>
+	public interface IHierarchicalObjectFactory : IObjectFactory
+	{
+		/// <summary>
+		/// Return the parent object factory, or <see langword="null"/>
+		/// if this factory does not have a parent.
+		/// </summary>
+		/// <value>
+		/// The parent object factory, or <see langword="null"/>
+		/// if this factory does not have a parent.
+		/// </value>
+		IObjectFactory ParentObjectFactory { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/IInitializingObject.cs b/src/Spring/Spring.Core/Objects/Factory/IInitializingObject.cs
new file mode 100644
index 00000000..ff0b52bb
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/IInitializingObject.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Defines a simple initialization callback for objects that need to to some
+	/// post-initialization logic after all of their dependencies have been injected.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// An implementation of the
+	/// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet()"/>
+	/// method might perform some additional custom initialization (over and above that
+	/// performed by the constructor), or merely check that all mandatory properties
+	/// have been set (this last example is a very typical use case of this interface).
+	/// </p>
+	/// <note>
+	/// The use of the
+	/// <see cref="Spring.Objects.Factory.IInitializingObject"/> interface
+	/// by non-Spring.NET framework code can be avoided (and is generally
+	/// discouraged). The Spring.NET container provides support for a generic
+	/// initialization method given to the object definition in the object
+	/// configuration store (be it XML, or a database, etc). This requires
+	/// slightly more configuration (one attribute-value pair in the case of
+	/// XML configuration), but removes any dependency on Spring.NET from the
+	/// class definition.
+	/// </note>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: IInitializingObject.cs,v 1.8 2006/04/09 07:18:48 markpollack Exp $</version>
+	/// <seealso cref="Spring.Objects.Factory.IObjectFactory"/>
+	public interface IInitializingObject
+	{
+		/// <summary>
+		/// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// after it has injected all of an object's dependencies.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This method allows the object instance to perform the kind of
+		/// initialization only possible when all of it's dependencies have
+		/// been injected (set), and to throw an appropriate exception in the
+		/// event of misconfiguration.
+		/// </p>
+		/// <p>
+		/// Please do consult the class level documentation for the
+		/// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+		/// description of exactly <i>when</i> this method is invoked. In
+		/// particular, it is worth noting that the
+		/// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+		/// and <see cref="Spring.Context.IApplicationContextAware"/>
+		/// callbacks will have been invoked <i>prior</i> to this method being
+		/// called.
+		/// </p>
+		/// </remarks>
+		/// <exception cref="System.Exception">
+		/// In the event of misconfiguration (such as the failure to set a
+		/// required property) or if initialization fails.
+		/// </exception>
+		void AfterPropertiesSet();
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs
new file mode 100644
index 00000000..f4af15f7
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs
@@ -0,0 +1,217 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Extension of the <see cref="Spring.Objects.Factory.IObjectFactory"/> interface
+	/// to be implemented by object factories that can enumerate all their object instances,
+	/// rather than attempting object lookup by name one by one as requested by clients.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// <see cref="Spring.Objects.Factory.IObjectFactory"/> implementations that preload
+	/// all their objects (for example, DOM-based XML factories) may implement this
+	/// interface. This interface is discussed in
+	/// "Expert One-on-One J2EE Design and Development", by Rod Johnson.
+	/// </p>
+	/// <p>
+	/// If this is an <see cref="Spring.Objects.Factory.IHierarchicalObjectFactory"/>,
+	/// the return values will not take any
+	/// <see cref="Spring.Objects.Factory.IObjectFactory"/> hierarchy into account, but
+	/// will relate only to the objects defined in the current factory.
+	/// Use the <see cref="Spring.Objects.Factory.ObjectFactoryUtils"/> helper class to
+	/// get all objects.
+	/// </p>
+	/// <p>
+	/// With the exception of
+	/// <see cref="Spring.Objects.Factory.IListableObjectFactory.ObjectDefinitionCount"/>,
+	/// the methods and properties in this interface are not designed for frequent
+	/// invocation. Implementations may be slow.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: IListableObjectFactory.cs,v 1.12 2007/07/29 19:39:27 markpollack Exp $</version>
+	public interface IListableObjectFactory : IObjectFactory
+	{
+		/// <summary>
+		/// Check if this object factory contains an object definition with the given name.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Does not consider any hierarchy this factory may participate in.
+		/// </p>
+		/// <note>
+		/// Ignores any singleton objects that have been registered by other means
+		/// than object definitions.
+		/// </note>
+		/// </remarks>
+		/// <param name="name">The name of the object to look for.</param>
+		/// <returns>
+		/// <see langword="true"/> if this object factory contains an object
+		/// definition with the given name.
+		/// </returns>
+		bool ContainsObjectDefinition(string name);
+
+		/// <summary>
+		/// Return the number of objects defined in the factory.
+		/// </summary>
+		/// <value>
+		/// The number of objects defined in the factory.
+		/// </value>
+		int ObjectDefinitionCount { get; }
+
+       
+        /// <summary>
+		/// Return the names of all objects defined in this factory.
+		/// </summary>
+		/// <returns>
+		/// The names of all objects defined in this factory, or an empty array if none
+		/// are defined.
+		/// </returns>
+		string[] GetObjectDefinitionNames();
+
+		/// <summary>
+		/// Return the names of objects matching the given <see cref="System.Type"/>
+		/// (including subclasses), judging from the object definitions.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Does consider objects created by <see cref="Spring.Objects.Factory.IFactoryObject"/>s,
+		/// or rather it considers the type of objects created by
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/> (which means that
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/>s will be instantiated).
+		/// </p>
+		/// <p>
+		/// Does not consider any hierarchy this factory may participate in.
+		/// </p>
+		/// </remarks>
+		/// <param name="type">
+		/// The <see cref="System.Type"/> (class or interface) to match, or <see langword="null"/>
+		/// for all object names.
+		/// </param>
+		/// <returns>
+		/// The names of all objects defined in this factory, or an empty array if none
+		/// are defined.
+		/// </returns>
+		string[] GetObjectNamesForType(Type type);
+
+		/// <summary>
+		/// Return the names of objects matching the given <see cref="System.Type"/>
+		/// (including subclasses), judging from the object definitions.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Does consider objects created by <see cref="Spring.Objects.Factory.IFactoryObject"/>s,
+		/// or rather it considers the type of objects created by
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/> (which means that
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/>s will be instantiated).
+		/// </p>
+		/// <p>
+		/// Does not consider any hierarchy this factory may participate in.
+		/// </p>
+		/// </remarks>
+		/// <param name="type">
+		/// The <see cref="System.Type"/> (class or interface) to match, or <see langword="null"/>
+		/// for all object names.
+		/// </param>
+		/// <param name="includePrototypes">
+		/// Whether to include prototype objects too or just singletons (also applies to
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/>s).
+		/// </param>
+		/// <param name="includeFactoryObjects">
+		/// Whether to include <see cref="Spring.Objects.Factory.IFactoryObject"/>s too
+		/// or just normal objects.
+		/// </param>
+		/// <returns>
+		/// The names of all objects defined in this factory, or an empty array if none
+		/// are defined.
+		/// </returns>
+		string[] GetObjectNamesForType(Type type, bool includePrototypes, bool includeFactoryObjects);
+
+		/// <summary>
+		/// Return the object instances that match the given object
+		/// <see cref="System.Type"/> (including subclasses), judging from either object
+		/// definitions or the value of
+		/// <see cref="Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/>s.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This version of the <see cref="IListableObjectFactory.GetObjectsOfType(Type,bool,bool)"/>
+		/// method matches all kinds of object definitions, be they singletons, prototypes, or
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/>s. Typically, the results
+		/// of this method call will be the same as a call to
+		/// <code>IListableObjectFactory.GetObjectsOfType(type,true,true)</code> .
+		/// </p>
+		/// </remarks>
+		/// <param name="type">
+		/// The <see cref="System.Type"/> (class or interface) to match.
+		/// </param>
+		/// <returns>
+		/// A <see cref="System.Collections.IDictionary"/> of the matching objects,
+		/// containing the object names as keys and the corresponding object instances
+		/// as values.
+		/// </returns>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If the objects could not be created.
+		/// </exception>
+		IDictionary GetObjectsOfType(Type type);
+
+		/// <summary>
+		/// Return the object instances that match the given object
+		/// <see cref="System.Type"/> (including subclasses), judging from either object
+		/// definitions or the value of
+		/// <see cref="Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/>s.
+		/// </summary>
+		/// <param name="type">
+		/// The <see cref="System.Type"/> (class or interface) to match.
+		/// </param>
+		/// <param name="includePrototypes">
+		/// Whether to include prototype objects too or just singletons (also applies to
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/>s).
+		/// </param>
+		/// <param name="includeFactoryObjects">
+		/// Whether to include <see cref="Spring.Objects.Factory.IFactoryObject"/>s too
+		/// or just normal objects.
+		/// </param>
+		/// <returns>
+		/// A <see cref="System.Collections.IDictionary"/> of the matching objects,
+		/// containing the object names as keys and the corresponding object instances
+		/// as values.
+		/// </returns>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If the objects could not be created.
+		/// </exception>
+		IDictionary GetObjectsOfType(
+			Type type, bool includePrototypes, bool includeFactoryObjects);
+
+
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/IObjectDefinitionFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IObjectDefinitionFactory.cs
new file mode 100644
index 00000000..1d06f8cf
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/IObjectDefinitionFactory.cs
@@ -0,0 +1,68 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Central interface for factories that can create
+    /// <see cref="IConfigurableObjectDefinition"/>
+    /// instances.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Allows for replaceable object definition factories using the Strategy
+    /// pattern.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IObjectDefinitionFactory.cs,v 1.10 2007/07/30 18:00:01 markpollack Exp $</version>
+    public interface IObjectDefinitionFactory
+    {
+
+        /// <summary>
+        /// Factory style method for getting concrete
+        /// <see cref="IConfigurableObjectDefinition"/>
+        /// instances.
+        /// </summary>
+        /// <param name="typeName">
+        /// The FullName of the <see cref="System.Type"/> of the defined object.
+        /// </param>
+        /// <param name="parent">The name of the parent object definition (if any).</param>
+        /// <param name="domain">
+        /// The <see cref="System.AppDomain"/> against which any class names
+        /// will be resolved into <see cref="System.Type"/> instances.  It can be null to register the
+        /// object class just by name.
+        /// </param>
+        /// <returns>
+        /// An
+        /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition"/>
+        /// instance.
+        /// </returns>
+        AbstractObjectDefinition CreateObjectDefinition(string typeName, string parent, AppDomain domain);
+
+
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/IObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IObjectFactory.cs
new file mode 100644
index 00000000..11a43768
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/IObjectFactory.cs
@@ -0,0 +1,491 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// The root interface for accessing a Spring.NET IoC container.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This is the basic client view of a Spring.NET IoC container; further interfaces
+	/// such as <see cref="Spring.Objects.Factory.IListableObjectFactory"/> and
+	/// <see cref="Spring.Objects.Factory.Config.IConfigurableObjectFactory"/>
+	/// are available for specific purposes such as enumeration and configuration.
+	/// </p>
+	/// <p>
+	/// This is the root interface to be implemented by objects that can hold a number
+	/// of object definitions, each uniquely identified by a <see cref="System.String"/>
+	/// name. An independent instance of any of these objects can be obtained
+	/// (the Prototype design pattern), or a single shared instance can be obtained
+	/// (a superior alternative to the Singleton design pattern, in which the instance is a
+	/// singleton in the scope of the factory). Which type of instance
+	/// will be returned depends on the object factory configuration - the API is the same.
+	/// The Singleton approach is more useful and hence more common in practice.
+	/// </p>
+	/// <p>
+	/// The point of this approach is that the IObjectFactory is a central registry of
+	/// application components, and centralizes the configuring of application components
+	/// (no more do individual objects need to read properties files, for example).
+	/// See chapters 4 and 11 of "Expert One-on-One J2EE Design and Development" for a
+	/// discussion of the benefits of this approach.
+	/// </p>
+	/// <p>
+	/// Normally an IObjectFactory will load object definitions stored in a configuration
+	/// source (such as an XML document), and use the <see cref="Spring.Objects"/>
+	/// namespace to configure the objects. However, an implementation could simply return
+	/// .NET objects it creates as necessary directly in .NET code. There are no
+	/// constraints on how the definitions could be stored: LDAP, RDBMS, XML, properties
+	/// file etc. Implementations are encouraged to support references amongst objects,
+	/// to either Singletons or Prototypes.
+	/// </p>
+	/// <p>
+	/// In contrast to the methods in
+	/// <see cref="Spring.Objects.Factory.IListableObjectFactory"/>, all of the methods
+	/// in this interface will also check parent factories if this is an
+	/// <see cref="Spring.Objects.Factory.IHierarchicalObjectFactory"/>. If an object is
+	/// not found in this factory instance, the immediate parent is asked. Objects in
+	/// this factory instance are supposed to override objects of the same name in any
+	/// parent factory.
+	/// </p>
+	/// <p>
+	/// Object factories are supposed to support the standard object lifecycle interfaces
+	/// as far as possible. The maximum set of initialization methods and their standard
+	/// order is:
+	/// </p>
+	/// <p>
+	/// <list type="bullet">
+	/// <item>
+	/// <description>
+	/// <see cref="Spring.Objects.Factory.IObjectNameAware"/>'s
+	/// <see cref="Spring.Objects.Factory.IObjectNameAware.ObjectName"/> property.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>'s
+	/// <see cref="Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/> property.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// <see cref="Spring.Context.IApplicationContextAware.ApplicationContext"/>
+	/// (only applicable if running within an <see cref="Spring.Context.IApplicationContext"/>).
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// The
+	/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization"/>
+	/// method of
+	/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>s.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+	/// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/> method.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// A custom init-method definition.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// The
+	/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization"/>
+	/// method of
+	/// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>s.
+	/// </description>
+	/// </item>
+	/// </list>
+	/// </p>
+	/// <p/>
+	/// <p>
+	/// On shutdown of an object factory, the following lifecycle methods apply:
+	/// </p>
+	/// <p>
+	/// <list type="bullet">
+	/// <item>
+	/// <description>
+	/// <see cref="System.IDisposable"/>'s
+	/// <see cref="System.IDisposable.Dispose"/> method.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// A custom destroy-method definition.
+	/// </description>
+	/// </item>
+	/// </list>
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: IObjectFactory.cs,v 1.17 2007/07/30 15:41:32 markpollack Exp $</version>
+	public interface IObjectFactory : IDisposable
+	{
+		/// <summary>
+		/// Is this object a singleton?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// That is, will <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>
+		/// always return the same object?
+		/// </p>
+		/// <p>
+		/// Will ask the parent factory if the object cannot be found in this factory
+		/// instance.
+		/// </p>
+		/// </remarks>
+		/// <param name="name">The name of the object to query.</param>
+		/// <returns>True if the named object is a singleton.</returns>
+		/// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+		/// If there's no such object definition.
+		/// </exception>
+		bool IsSingleton(string name);
+
+
+        /// <summary>
+        /// Determines whether the specified object name is prototype.  That is, will GetObject
+        /// always return independent instances?
+        /// </summary>
+        /// <remarks>This method returning false does not clearly indicate a singleton object.
+        /// It indicated non-independent instances, which may correspond to a scoped object as 
+        /// well.  use the IsSingleton property to explicitly check for a shared 
+        /// singleton instance.
+        /// <para>Translates aliases back to the corresponding canonical object name.  Will ask the
+        /// parent factory if the object can not be found in this factory instance.
+        /// </para>
+        /// </remarks>
+        /// 
+        /// <param name="name">The name of the object to query</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified object name will always deliver independent instances; otherwise, <c>false</c>.
+        /// </returns>
+        /// <exception cref="NoSuchObjectDefinitionException">if there is no object with the given name.</exception>
+	    bool IsPrototype(string name);
+
+		/// <summary>
+		/// Does this object factory contain an object with the given name?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Will ask the parent factory if the object cannot be found in this factory
+		/// instance.
+		/// </p>
+		/// </remarks>
+		/// <param name="name">The name of the object to query.</param>
+		/// <returns>True if an object with the given name is defined.</returns>
+		bool ContainsObject(string name);
+
+		/// <summary>
+		/// Return the aliases for the given object name, if defined.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Will ask the parent factory if the object cannot be found in this factory
+		/// instance.
+		/// </p>
+		/// </remarks>
+		/// <param name="name">The object name to check for aliases.</param>
+		/// <returns>The aliases, or an empty array if none.</returns>
+		/// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+		/// If there's no such object definition.
+		/// </exception>
+		string[] GetAliases(string name);
+
+		/// <summary>
+		/// Return an instance (possibly shared or independent) of the given object name.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This method allows an object factory to be used as a replacement for the
+		/// Singleton or Prototype design pattern.
+		/// </p>
+		/// <p>
+		/// Note that callers should retain references to returned objects. There is no
+		/// guarantee that this method will be implemented to be efficient. For example,
+		/// it may be synchronized, or may need to run an RDBMS query.
+		/// </p>
+		/// <p>
+		/// Will ask the parent factory if the object cannot be found in this factory
+		/// instance.
+		/// </p>
+		/// <p>
+		/// This is the indexer for the <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// interface.
+		/// </p>
+		/// </remarks>
+		/// <param name="name">The name of the object to return.</param>
+		/// <returns>The instance of the object.</returns>
+		/// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+		/// If there's no such object definition.
+		/// </exception>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If the object could not be created.
+		/// </exception>
+		object this[string name] { get; }
+
+		/// <summary>
+		/// Return an instance (possibly shared or independent) of the given object name.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This method allows an object factory to be used as a replacement for the
+		/// Singleton or Prototype design pattern.
+		/// </p>
+		/// <p>
+		/// Note that callers should retain references to returned objects. There is no
+		/// guarantee that this method will be implemented to be efficient. For example,
+		/// it may be synchronized, or may need to run an RDBMS query.
+		/// </p>
+		/// <p>
+		/// Will ask the parent factory if the object cannot be found in this factory
+		/// instance.
+		/// </p>
+		/// </remarks>
+		/// <param name="name">The name of the object to return.</param>
+		/// <returns>The instance of the object.</returns>
+		/// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+		/// If there's no such object definition.
+		/// </exception>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If the object could not be created.
+		/// </exception>
+		object GetObject(string name);
+	    
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the given object name.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method allows an object factory to be used as a replacement for the
+        /// Singleton or Prototype design pattern.
+        /// </p>
+        /// <p>
+        /// Note that callers should retain references to returned objects. There is no
+        /// guarantee that this method will be implemented to be efficient. For example,
+        /// it may be synchronized, or may need to run an RDBMS query.
+        /// </p>
+        /// <p>
+        /// Will ask the parent factory if the object cannot be found in this factory
+        /// instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">The name of the object to return.</param>
+        /// <param name="arguments">
+        /// The arguments to use if creating a prototype using explicit arguments to
+        /// a static factory method. If there is no factory method and the
+        /// arguments are not null, then match the argument values by type and
+        /// call the object's constructor.
+        /// </param>
+        /// <returns>The instance of the object.</returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there's no such object definition.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object could not be created.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="name"/> is <see langword="null"/>.
+        /// </exception>
+        object GetObject(string name, object[] arguments);
+	    
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the given object name.
+        /// </summary>
+        /// <param name="name">The name of the object to return.</param>
+        /// <param name="requiredType">
+        /// The <see cref="System.Type"/> the object may match. Can be an interface or
+        /// superclass of the actual class. For example, if the value is the
+        /// <see cref="System.Object"/> class, this method will succeed whatever the
+        /// class of the returned instance.
+        /// </param>
+        /// <param name="arguments">
+        /// The arguments to use if creating a prototype using explicit arguments to
+        /// a <see lang="static"/> factory method. If there is no factory method and the
+        /// supplied <paramref name="arguments"/> array is not <see lang="null"/>, then
+        /// match the argument values by type and call the object's constructor.
+        /// </param>
+        /// <returns>The instance of the object.</returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there's no such object definition.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object could not be created.
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectNotOfRequiredTypeException">
+        /// If the object is not of the required type.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="name"/> is <see langword="null"/>.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.GetObject(string, Type)"/>
+        object GetObject(string name, Type requiredType, object[] arguments);
+
+		/// <summary>
+		/// Return an instance (possibly shared or independent) of the given object name.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Provides a measure of type safety by throwing an exception if the object is
+		/// not of the required <see cref="System.Type"/>.
+		/// </p>
+		/// <p>
+		/// This method allows an object factory to be used as a replacement for the
+		/// Singleton or Prototype design pattern.
+		/// </p>
+		/// <p>
+		/// Note that callers should retain references to returned objects. There is no
+		/// guarantee that this method will be implemented to be efficient. For example,
+		/// it may be synchronized, or may need to run an RDBMS query.
+		/// </p>
+		/// <p>
+		/// Will ask the parent factory if the object cannot be found in this factory
+		/// instance.
+		/// </p>
+		/// </remarks>
+		/// <param name="name">The name of the object to return.</param>
+		/// <param name="requiredType">
+		/// <see cref="System.Type"/> the object may match. Can be an interface or
+		/// superclass of the actual class. For example, if the value is the
+		/// <see cref="System.Object"/> class, this method will succeed whatever the
+		/// class of the returned instance.
+		/// </param>
+		/// <returns>The instance of the object.</returns>
+		/// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+		/// If there's no such object definition.
+		/// </exception>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If the object could not be created.
+		/// </exception>
+		/// <exception cref="Spring.Objects.Factory.ObjectNotOfRequiredTypeException">
+		/// If the object is not of the required type.
+		/// </exception>
+		object GetObject(string name, Type requiredType);
+
+		/// <summary>
+		/// Determine the type of the object with the given name.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// More specifically, checks the type of object that
+		/// <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/> would return.
+		/// For an <see cref="Spring.Objects.Factory.IFactoryObject"/>, returns the type
+		/// of object that the <see cref="Spring.Objects.Factory.IFactoryObject"/> creates.
+		/// </p>
+		/// </remarks>
+		/// <param name="name">The name of the object to query.</param>
+		/// <returns>
+        /// The type of the object or <cref lang="null"/> if not determinable.
+        /// </returns>
+		Type GetType(string name);
+
+
+
+        /// <summary>
+        /// Determines whether the object with the given name matches the specified type.
+        /// </summary>
+        /// <remarks>More specifically, check whether a GetObject call for the given name
+        /// would return an object that is assignable to the specified target type.
+        /// Translates aliases back to the corresponding canonical bean name.
+        /// Will ask the parent factory if the bean cannot be found in this factory instance.
+        /// </remarks>
+        /// <param name="name">The name of the object to query.</param>
+        /// <param name="targetType">Type of the target to match against.</param>
+        /// <returns>
+        /// 	<c>true</c> if the object type matches; otherwise, <c>false</c>
+        /// if it doesn't match or cannot be determined yet.
+        /// </returns>
+        /// <exception cref="NoSuchObjectDefinitionException">Ff there is no object with the given name
+        /// </exception>
+	    bool IsTypeMatch(string name, Type targetType);
+
+		/// <summary>
+		/// Injects dependencies into the supplied <paramref name="target"/> instance
+		/// using the named object definition.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// In addition to being generally useful, typically this method is used to provide
+		/// dependency injection functionality for objects that are instantiated outwith the
+		/// control of a developer. A case in point is the way that the current (1.1)
+		/// ASP.NET classes instantiate web controls... the instantiation takes place within
+		/// a private method of a compiled page, and thus cannot be hooked into the
+		/// typical Spring.NET IOC container lifecycle for dependency injection.
+		/// </p>
+		/// </remarks>
+		/// <example>
+		/// The following code snippet assumes that the instantiated factory instance
+		/// has been configured with an object definition named
+		/// '<i>ExampleNamespace.BusinessObject</i>' that has been configured to set the
+		/// <c>Dao</c> property of any <c>ExampleNamespace.BusinessObject</c> instance
+		/// to an instance of an appropriate implementation...
+		/// <code language="C#">
+		/// namespace ExampleNamespace
+		/// {
+		///     public class BusinessObject
+		///     {
+		///         private IDao _dao;
+		/// 		
+		///         public BusinessObject() {}
+		/// 
+		///         public IDao Dao
+		///         {
+		///			    get { return _dao;	}
+		///             set { _dao = value; }
+		///         }
+		///     }
+		/// }
+		/// </code>
+		/// with the corresponding driver code looking like so...
+		/// <code language="C#">
+		/// IObjectFactory factory = GetAnIObjectFactoryImplementation();
+		/// BusinessObject instance = new BusinessObject();
+		/// factory.ConfigureObject(instance, "object_definition_name");
+		/// // at this point the dependencies for the 'instance' object will have been resolved...
+		/// </code>
+		/// </example>
+		/// <param name="target">
+		/// The object instance that is to be so configured.
+		/// </param>
+		/// <param name="name">
+		/// The name of the object definition expressing the dependencies that are to
+		/// be injected into the supplied <parameref name="target"/> instance.
+		/// </param>
+		/// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+		/// If there is no object definition for the supplied <paramref name="name"/>.
+		/// </exception>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If any of the target object's dependencies could not be created.
+		/// </exception>
+		object ConfigureObject(object target, string name);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/IObjectFactoryAware.cs b/src/Spring/Spring.Core/Objects/Factory/IObjectFactoryAware.cs
new file mode 100644
index 00000000..f66b7128
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/IObjectFactoryAware.cs
@@ -0,0 +1,72 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Interface to be implemented by objects that wish to be aware of their owning
+	/// <see cref="Spring.Objects.Factory.IObjectFactory"/>.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// For example, objects can look up collaborating objects via the factory.
+	/// </p>
+	/// <p>
+	/// Note that most objects will choose to receive references to collaborating
+	/// objects via respective properties and / or an appropriate constructor.
+	/// </p>
+	/// <p>
+	/// For a list of all object lifecycle methods, see the
+	/// <see cref="Spring.Objects.Factory.IObjectFactory"/> API documentation.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: IObjectFactoryAware.cs,v 1.6 2006/04/09 07:18:48 markpollack Exp $</version>
+	public interface IObjectFactoryAware
+	{
+		/// <summary>
+		/// Callback that supplies the owning factory to an object instance.
+		/// </summary>
+		/// <value>
+		/// Owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// (may not be <see langword="null"/>). The object can immediately
+		/// call methods on the factory.
+		/// </value>
+		/// <remarks>
+		/// <p>
+		/// Invoked after population of normal object properties but before an init
+		/// callback like <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+		/// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+		/// method or a custom init-method.
+		/// </p>
+		/// </remarks>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In case of initialization errors.
+		/// </exception>
+		IObjectFactory ObjectFactory { set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/IObjectNameAware.cs b/src/Spring/Spring.Core/Objects/Factory/IObjectNameAware.cs
new file mode 100644
index 00000000..86077897
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/IObjectNameAware.cs
@@ -0,0 +1,68 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+
+    /// <summary>
+    /// Interface to be implemented by objects that wish to be aware of their object
+    /// name in an <see cref="Spring.Objects.Factory.IObjectFactory"/>.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Note that most objects will choose to receive references to collaborating
+    /// objects via respective properties.
+    /// </p>
+    /// <p>
+    /// For a list of all object lifecycle methods, see the
+    /// <see cref="Spring.Objects.Factory.IObjectFactory"/> API documentation.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+	public interface IObjectNameAware
+    {
+
+        /// <summary>
+        /// Set the name of the object in the object factory that created this object.
+        /// </summary>
+        /// <value>
+        /// The name of the object in the factory.
+        /// </value>
+        /// <remarks>
+        /// <p>
+        /// Invoked after population of normal object properties but before an init
+        /// callback like <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// method or a custom init-method.
+        /// </p>
+        /// </remarks>
+        string ObjectName
+        {
+            set;
+        }
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/NoSuchObjectDefinitionException.cs b/src/Spring/Spring.Core/Objects/Factory/NoSuchObjectDefinitionException.cs
new file mode 100644
index 00000000..1c9a1e9e
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/NoSuchObjectDefinitionException.cs
@@ -0,0 +1,195 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Exception thrown when an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+	/// is asked for an object instance name for which it cannot find a definition.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: NoSuchObjectDefinitionException.cs,v 1.8 2006/04/09 07:18:48 markpollack Exp $</version>
+	[Serializable]
+	public class NoSuchObjectDefinitionException : ObjectsException
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.NoSuchObjectDefinitionException"/> class.
+		/// </summary>
+		public NoSuchObjectDefinitionException()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.NoSuchObjectDefinitionException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public NoSuchObjectDefinitionException(string message)
+			: base(message)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.NoSuchObjectDefinitionException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public NoSuchObjectDefinitionException(string message, Exception rootCause)
+			: base(message, rootCause)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.NoSuchObjectDefinitionException"/> class.
+		/// </summary>
+		/// <param name="name">
+		/// Name of the missing object.
+		/// </param>
+		/// <param name="message">
+		/// A further, detailed message describing the problem.
+		/// </param>
+		public NoSuchObjectDefinitionException(string name, string message)
+			: base(string.Format(
+				CultureInfo.CurrentCulture,
+				"No object named '{0}' is defined : {1}",
+				name,
+				StringUtils.HasText(message) ? message : "not found."))
+		{
+			_objectName = name;
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.NoSuchObjectDefinitionException"/> class.
+		/// </summary>
+		/// <param name="type">
+		/// The <see cref="System.Type"/> of the missing object.
+		/// </param>
+		/// <param name="message">
+		/// A further, detailed message describing the problem.
+		/// </param>
+		public NoSuchObjectDefinitionException(Type type, string message)
+			: base(string.Format(
+				CultureInfo.CurrentCulture,
+				"No unique object of type [{0}] is defined : {1}",
+				type != null ? type.FullName : "<< no Type specified >>",
+				StringUtils.HasText(message) ? message : "not found."))
+		{
+			_objectType = type;
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.NoSuchObjectDefinitionException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected NoSuchObjectDefinitionException(SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{
+			_objectName = info.GetString("ObjectName");
+			_objectType = info.GetValue("ObjectType", typeof (Type)) as Type;
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+		/// the data needed to serialize the target object.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+		/// with data.
+		/// </param>
+		/// <param name="context">
+		/// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+		/// for this serialization.
+		/// </param>
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter=true)]
+		public override void GetObjectData(
+			SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData(info, context);
+			info.AddValue("ObjectName", ObjectName);
+			info.AddValue("ObjectType", ObjectType);
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Return the required <see cref="System.Type"/> of object, if it was a
+		/// lookup by <see cref="System.Type"/> that failed.
+		/// </summary>
+		public Type ObjectType
+		{
+			get { return _objectType; }
+		}
+
+		/// <summary>
+		/// Return the name of the missing object, if it was a lookup by name that
+		/// failed.
+		/// </summary>
+		public string ObjectName
+		{
+			get { return _objectName; }
+		}
+
+		#endregion
+
+		#region Fields
+
+		private Type _objectType;
+		private string _objectName;
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectCreationException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectCreationException.cs
new file mode 100644
index 00000000..bcf70314
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/ObjectCreationException.cs
@@ -0,0 +1,333 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+using System.Text;
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Thrown when an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+	/// encounters an error when attempting to create an object from an object
+	/// definition.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: ObjectCreationException.cs,v 1.15 2007/12/05 00:28:04 bbaia Exp $</version>
+	[Serializable]
+	public class ObjectCreationException : FatalObjectException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.ObjectCreationException"/> class.
+		/// </summary>
+		public ObjectCreationException()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the 
+		/// <see cref="Spring.Objects.Factory.ObjectCreationException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public ObjectCreationException(string message)
+			: base(message)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the 
+		/// <see cref="Spring.Objects.Factory.ObjectCreationException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+        /// <param name="objectName">
+		/// The name of the object that triggered the exception.
+		/// </param>
+		public ObjectCreationException(string objectName, string message)
+            : this(null, objectName, message, null)
+		{
+		}
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="Spring.Objects.Factory.ObjectCreationException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public ObjectCreationException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+		/// <summary>
+		/// Creates a new instance of the 
+		/// <see cref="Spring.Objects.Factory.ObjectCreationException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+        /// <param name="objectName">
+		/// The name of the object that triggered the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public ObjectCreationException(
+            string objectName, string message, Exception rootCause)
+            : this(null, objectName, message, rootCause)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the 
+		/// <see cref="Spring.Objects.Factory.ObjectCreationException"/> class.
+		/// </summary>
+		/// <param name="resourceDescription">
+		/// The description of the resource associated with the object.
+		/// </param>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+        /// <param name="objectName">
+		/// The name of the object that triggered the exception.
+		/// </param>
+		public ObjectCreationException(
+			string resourceDescription,
+            string objectName,
+			string message)
+            : this(resourceDescription, objectName, message, null)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the 
+		/// <see cref="Spring.Objects.Factory.ObjectCreationException"/> class.
+		/// </summary>
+		/// <param name="resourceDescription">
+		/// The description of the resource associated with the object.
+		/// </param>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+        /// <param name="objectName">
+		/// The name of the object that triggered the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public ObjectCreationException(
+			string resourceDescription,
+            string objectName,
+			string message,
+			Exception rootCause)
+			: base(message, rootCause)
+		{
+			_resourceDescription = resourceDescription;
+            _objectName = objectName;
+		}
+
+		/// <summary>
+		/// Creates a new instance of the 
+		/// <see cref="Spring.Objects.Factory.ObjectCreationException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected ObjectCreationException(
+			SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{
+			_resourceDescription = (string) info.GetValue("_resourceDescription", typeof (string));
+			_objectName = (string) info.GetValue("_objectName", typeof (string));
+			_callStack = (string) info.GetValue("_callStack", typeof (string));
+		}
+
+		/// <summary>
+		/// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+		/// the data needed to serialize the target object.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+		/// with data.
+		/// </param>
+		/// <param name="context">
+		/// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+		/// for this serialization.
+		/// </param>
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter=true)]
+		public override void GetObjectData(
+			SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData(info, context);
+			info.AddValue("_resourceDescription", ResourceDescription);
+			info.AddValue("_objectName", ObjectName);
+			info.AddValue("_callStack", _callStack);
+		}
+
+		/// <summary>
+		/// The name of the object that triggered the exception (if any).
+		/// </summary>
+		public string ObjectName
+		{
+			get { return _objectName; }
+		}
+
+		/// <summary>
+		/// The description of the resource associated with the object (if any).
+		/// </summary>
+		public string ResourceDescription
+		{
+			get { return _resourceDescription; }
+		}
+
+		/// <summary>
+		/// Describes the creation failure trace of this exception.
+		/// </summary>
+		public override string Message
+		{
+			get
+			{
+				string message = ObjectCreationException.FormatMessage(
+					_resourceDescription,
+					_objectName,
+					base.Message,
+					_callStack);
+				return message;
+			}
+		}
+
+		private static string FormatMessage(
+			string resourceDescription,
+            string objectName,
+			string message,
+			string callStack)
+		{
+			if (StringUtils.IsNullOrEmpty(callStack))
+			{
+				return StringUtils.IsNullOrEmpty(resourceDescription) ?
+					string.Format(						
+						"Error creating object with name '{0}' : {1}",
+                        objectName,
+						message)
+					:
+					string.Format(						
+						"Error creating object with name '{0}' defined in '{1}' : {2}",
+                        objectName,
+						resourceDescription,
+						message);
+			}
+			else
+			{
+				return StringUtils.IsNullOrEmpty(resourceDescription) ?
+					string.Format(
+						"Error thrown by a dependency of object '{0}' : {1}{2}",
+                        objectName,
+						message,
+						callStack)
+					:
+					string.Format(
+						"Error thrown by a dependency of object '{0}' defined in '{1}' : {2}{3}",
+                        objectName,
+						resourceDescription,
+						message,
+						callStack);
+			}
+		}
+
+		internal static ObjectCreationException GetObjectCreationException(
+			Exception ex, string objectName, string propertyName,
+			string resourceDescription, string referenceName)
+		{
+			ObjectCreationException ocex = ex as ObjectCreationException;
+			if (ocex != null)
+			{
+				StringBuilder newCause = new StringBuilder();
+				newCause.AppendFormat("{0} while resolving '{1}' to '{2}' ",
+				                      Environment.NewLine, propertyName, ocex._objectName);
+				if (StringUtils.HasText(ocex._resourceDescription))
+				{
+					newCause.Append("defined in '")
+						.Append(ocex._resourceDescription)
+						.Append("'");
+				}
+				if (StringUtils.IsNullOrEmpty(ocex._callStack))
+				{
+					ocex._callStack = newCause.ToString();
+				}
+				else
+				{
+					ocex._callStack = newCause.Append(ocex._callStack).ToString();
+				}
+				ocex._objectName = objectName;
+				ocex._resourceDescription = resourceDescription;
+				return ocex;
+			}
+			else if (ex is PropertyAccessExceptionsException
+				&& ex.InnerException is TypeMismatchException)
+			{
+				return new ObjectCreationException(
+					resourceDescription,
+					objectName,
+					string.Format(
+						CultureInfo.InvariantCulture,
+						"Invalid type for property '{0}' of object '{1}' in '{2}'.",
+						propertyName,
+						objectName,
+						resourceDescription),
+					ex);
+			}
+			return new ObjectCreationException(
+				resourceDescription,
+				objectName,
+				string.Format(
+					CultureInfo.InvariantCulture,
+					"Can't resolve reference to object '{0}' while setting '{1}'.",
+					referenceName,
+					propertyName),
+				ex);
+		}
+
+		private string _callStack;
+		private string _resourceDescription = string.Empty;
+		private string _objectName = string.Empty;
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectCurrentlyInCreationException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectCurrentlyInCreationException.cs
new file mode 100644
index 00000000..419c2d48
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/ObjectCurrentlyInCreationException.cs
@@ -0,0 +1,184 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Thrown in case of a reference to an object that is currently in creation.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Typically happens when constructor autowiring matches the currently
+	/// constructed object.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: ObjectCurrentlyInCreationException.cs,v 1.7 2008/05/29 12:13:27 oakinger Exp $</version>
+	[Serializable]
+	public class ObjectCurrentlyInCreationException : ObjectCreationException
+	{
+        /// <summary>
+        /// The default error message text to be used, if none is specified.
+        /// </summary>
+        public const string DEFAULTMESSAGE = "Requested object is currently in creation: Is there an unresolvable circular reference?";
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+        /// </summary>
+		public ObjectCurrentlyInCreationException()
+		{
+		}
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+        /// </summary>
+		/// <param name="objectName">
+		/// The name of the object that triggered the exception.
+		/// </param>
+		public ObjectCurrentlyInCreationException(string objectName) 
+            : this(null, objectName, null, null)
+		{
+		}
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+        /// </summary>
+        /// <param name="objectName">
+		/// The name of the object that triggered the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public ObjectCurrentlyInCreationException(string objectName, Exception rootCause)
+            : this(null, objectName, null, rootCause)
+        {
+        }
+
+        /// <summary>
+		/// Creates a new instance of the 
+        /// <see cref="Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+        /// <param name="objectName">
+		/// The name of the object that triggered the exception.
+		/// </param>
+        public ObjectCurrentlyInCreationException(string objectName, string message)
+            : this(null, objectName, message, null)
+		{
+		}
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+        /// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+        /// <param name="objectName">
+		/// The name of the object that triggered the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+        public ObjectCurrentlyInCreationException(string objectName, string message, Exception rootCause)
+            : this(null, objectName, message, rootCause)
+		{
+		}
+
+        /// <summary>
+		/// Creates a new instance of the 
+		/// <see cref="Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+		/// </summary>
+		/// <param name="resourceDescription">
+		/// The description of the resource associated with the object.
+		/// </param>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+        /// <param name="objectName">
+		/// The name of the object that triggered the exception.
+		/// </param>
+        public ObjectCurrentlyInCreationException(
+			string resourceDescription,
+            string objectName,
+			string message)
+            : this(resourceDescription, objectName, message, null)
+		{
+		}
+
+        /// <summary>
+		/// Creates a new instance of the 
+		/// <see cref="Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+		/// </summary>
+		/// <param name="resourceDescription">
+		/// The description of the resource associated with the object.
+		/// </param>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+        /// <param name="objectName">
+		/// The name of the object that triggered the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+        public ObjectCurrentlyInCreationException(
+			string resourceDescription,
+            string objectName,
+			string message,
+			Exception rootCause)
+            : base(resourceDescription,
+                objectName, 
+                StringUtils.HasText(message) ? message : DEFAULTMESSAGE, 
+                rootCause)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the ObjectCurrentlyInCreationException class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected ObjectCurrentlyInCreationException(SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionException.cs
new file mode 100644
index 00000000..fcd0fa20
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionException.cs
@@ -0,0 +1,134 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+    /// <summary>
+    /// Exception thrown when an <see cref="INamespaceParser"/>
+    /// encounters an error when attempting to parse an object
+    /// definition.
+    /// </summary>
+    /// <author>Federico Spinazzi (.NET)</author>
+    [Serializable]
+    public class ObjectDefinitionException : Exception
+    {
+        #region Fields
+        private string _className;
+        #endregion
+
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the ObjectDefinitionException class.
+        /// </summary>
+        public ObjectDefinitionException ()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectDefinitionException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public ObjectDefinitionException (string message, Exception rootCause)
+            : base (message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectDefinitionException class.
+        /// </summary>
+        /// <param name="name">
+        /// The value of the xml <code>class</code> attribute thet can be resolved
+        /// as a type
+        /// </param>
+        public ObjectDefinitionException (string name)
+        {
+            _className = name;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectDefinitionException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected ObjectDefinitionException (
+            SerializationInfo info, StreamingContext context)
+            : base (info, context)
+        {
+            _className = info.GetString ("MyClassName");
+        }
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// The message about the exception.
+        /// </summary>
+        public override string Message
+        {
+            get
+            {
+                return String.Format("The specified name ('{0}') cannot be used to resolve any System.Type instance", _className);
+            }
+        }
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+        /// the data needed to serialize the target object.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+        /// with data.
+        /// </param>
+        /// <param name="context">
+        /// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+        /// for this serialization.
+        /// </param>
+        [SecurityPermission (SecurityAction.Demand,SerializationFormatter=true)]
+        public override void GetObjectData (
+            SerializationInfo info, StreamingContext context)
+        {
+            base.GetObjectData (info, context);
+            info.AddValue ("MyClassName", _className);
+        }
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionStoreException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionStoreException.cs
new file mode 100644
index 00000000..e978f42a
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionStoreException.cs
@@ -0,0 +1,260 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+using Spring.Core.IO;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Thrown when an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+	/// encounters an internal error, and its definitions are invalid.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// An example of a situation when this exception would be thrown is
+	/// in the case of an XML document containing object definitions being
+	/// malformed.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	[Serializable]
+	public class ObjectDefinitionStoreException : FatalObjectException
+	{
+		/// <summary>
+		/// Creates a new instance of the ObjectDefinitionStoreException class.
+		/// </summary>
+		public ObjectDefinitionStoreException()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the ObjectDefinitionStoreException class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public ObjectDefinitionStoreException(string message)
+			: base(message)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the ObjectDefinitionStoreException class.
+		/// </summary>
+        /// <param name="resourceDescription">
+        /// The description of the resource that the object definition came from
+        /// </param>
+		/// <param name="name">
+		/// The name of the object that triggered the exception.
+		/// </param>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public ObjectDefinitionStoreException(
+			string resourceDescription, string name, string message)
+			: this(resourceDescription, name, message, null)
+		{
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObjectDefinitionStoreException"/> class.
+        /// </summary>
+        /// <param name="resourceDescription">
+        /// The description of the resource that the object definition came from
+        /// </param>
+        /// <param name="msg">The detail message (used as exception message as-is)</param>
+        /// <param name="cause">The root cause. (may be <code>null</code></param>
+        public ObjectDefinitionStoreException(string resourceDescription, string msg, Exception cause)
+            : this(msg, cause)  
+        {
+            _resourceDescription = resourceDescription;
+        }
+
+		/// <summary>
+		/// Creates a new instance of the ObjectDefinitionStoreException class.
+		/// </summary>
+		/// <param name="resourceLocation">
+		/// The resource location (e.g. an XML object definition file) associated
+		/// with the offending object definition.
+		/// </param>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="name">
+		/// The name of the object that triggered the exception.
+		/// </param>
+		public ObjectDefinitionStoreException(
+			IResource resourceLocation,
+			string name,
+			string message) : this
+			(resourceLocation == null ? string.Empty : resourceLocation.Description,
+			name, message)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the ObjectDefinitionStoreException class.
+		/// </summary>
+		/// <param name="resourceLocation">
+		/// The resource location (e.g. an XML object definition file) associated
+		/// with the offending object definition.
+		/// </param>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="name">
+		/// The name of the object that triggered the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public ObjectDefinitionStoreException(
+			IResource resourceLocation,
+			string name,
+			string message,
+			Exception rootCause) : this
+			(resourceLocation == null ? string.Empty : resourceLocation.Description,
+			name, message, rootCause)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the ObjectDefinitionStoreException class.
+		/// </summary>
+        /// <param name="resourceDescription">
+        /// The description of the resource that the object definition came from
+        /// </param>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="name">
+		/// The name of the object that triggered the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public ObjectDefinitionStoreException(
+			string resourceDescription,
+			string name,
+			string message,
+			Exception rootCause)
+			: base(
+				string.Format(
+					"Error registering object with name '{0}' defined in '{1}' : {2}",
+					name,
+					resourceDescription,
+					message),
+				rootCause)
+		{
+			_resourceDescription = resourceDescription;
+			_objectName = name;
+		}
+
+		/// <summary>
+		/// Creates a new instance of the ObjectDefinitionStoreException class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public ObjectDefinitionStoreException(string message, Exception rootCause)
+			: base(message, rootCause)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the ObjectDefinitionStoreException class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected ObjectDefinitionStoreException(
+		    SerializationInfo info, StreamingContext context)
+			: base(info, context)		
+		{
+			_resourceDescription = info.GetValue ("_resourceDescription", typeof (object)) as string;
+			_objectName = info.GetValue ("_objectName", typeof (object)) as string;
+		}
+
+		/// <summary>
+		/// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+		/// the data needed to serialize the target object.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+		/// with data.
+		/// </param>
+		/// <param name="context">
+		/// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+		/// for this serialization.
+		/// </param>
+		[SecurityPermission (SecurityAction.Demand,SerializationFormatter=true)]
+		public override void GetObjectData (
+			SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+			info.AddValue ("_resourceDescription", ResourceDescription);
+			info.AddValue ("_objectName", ObjectName);
+		}
+
+		/// <summary>
+		/// The name of the object that triggered the exception (if any).
+		/// </summary>
+		public string ObjectName
+		{
+			get { return _objectName; }
+		}
+
+		/// <summary>
+		/// The description of the resource associated with the object (if any).
+		/// </summary>
+		public string ResourceDescription
+		{
+			get { return _resourceDescription; }
+		}
+
+        /// <summary>
+        /// The description of the resource associated with the object
+        /// </summary>
+		protected string _resourceDescription = string.Empty;
+
+        /// <summary>
+        /// The name of the object that trigger the exception.
+        /// </summary>
+		protected string _objectName = string.Empty;
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectFactoryUtils.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectFactoryUtils.cs
new file mode 100644
index 00000000..71afa378
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/ObjectFactoryUtils.cs
@@ -0,0 +1,467 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Collections;
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Convenience methods operating on object factories, returning object instances,
+	/// names, or counts.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The nesting hierarchy of an object factory is taken into account by the various methods
+	/// exposed by this class.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: ObjectFactoryUtils.cs,v 1.17 2007/07/31 03:47:39 markpollack Exp $</version>
+	public sealed class ObjectFactoryUtils
+	{
+		#region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.ObjectFactoryUtils"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such has no publicly visible
+		/// constructors.
+		/// </p>
+		/// </remarks>
+		private ObjectFactoryUtils()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+
+		/// <summary>
+		/// Used to dereference an <see cref="Spring.Objects.Factory.IFactoryObject"/>
+		/// and distinguish it from managed objects <i>created by</i> the factory.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// For example, if the managed object identified as <code>foo</code> is a
+		/// factory, getting <code>&amp;foo</code> will return the factory, not the
+		/// instance returned by the factory.
+		/// </p>
+		/// </remarks>
+		public const string FactoryObjectPrefix = "&";
+
+		/// <summary>
+		/// Count all object definitions in any hierarchy in which this
+		/// factory participates.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Includes counts of ancestor object factories.
+		/// </p>
+		/// <p>
+		/// Objects that are "overridden" (specified in a descendant factory
+		/// with the same name) are counted only once.
+		/// </p>
+		/// </remarks>
+		/// <param name="factory">The object factory.</param>
+		/// <returns>
+		/// The count of objects including those defined in ancestor factories.
+		/// </returns>
+		public static int CountObjectsIncludingAncestors(IListableObjectFactory factory)
+		{
+			return ObjectNamesIncludingAncestors(factory).Length;
+		}
+
+		/// <summary>
+		/// Return all object names in the factory, including ancestor factories.
+		/// </summary>
+		/// <param name="factory">The object factory.</param>
+		/// <returns>The array of object names, or an empty array if none.</returns>
+		public static string[] ObjectNamesIncludingAncestors(IListableObjectFactory factory)
+		{
+			Set result = new HashedSet();
+			result.AddAll(factory.GetObjectDefinitionNames());
+			IListableObjectFactory pof = GetParentFactoryIfAny(factory);
+			if (pof != null)
+			{
+				string[] parentsResult = ObjectNamesIncludingAncestors(pof);
+				result.AddAll(parentsResult);
+			}
+			return ToArrayOfObjectNames(result);
+		}
+
+		private static string[] ToArrayOfObjectNames(Set result)
+		{
+			Array resultArray = Array.CreateInstance(typeof (string), result.Count);
+			result.CopyTo(resultArray, 0);
+			return (string[]) resultArray;
+		}
+
+		/// <summary>
+		/// Get all object names for the given type, including those defined in ancestor
+		/// factories.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Will return unique names in case of overridden object definitions.
+		/// </p>
+		/// <p>
+		/// Does consider objects created by <see cref="Spring.Objects.Factory.IFactoryObject"/>s 
+        /// if <paramref name="includeFactoryObjects"/> is set to true, 
+        /// which means that <see cref="Spring.Objects.Factory.IFactoryObject"/>s will get initialized.
+		/// </p>
+		/// </remarks>
+		/// <param name="factory">
+		/// If this isn't also an
+		/// <see cref="Spring.Objects.Factory.IHierarchicalObjectFactory"/>,
+		/// this method will return the same as it's own
+		/// <see cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectDefinitionNames"/>
+		/// method.
+		/// </param>
+		/// <param name="type">
+		/// The <see cref="System.Type"/> that objects must match.
+		/// </param>
+        /// <param name="includePrototypes">
+		/// Whether to include prototype objects too or just singletons
+		/// (also applies to <see cref="Spring.Objects.Factory.IFactoryObject"/> instances).
+		/// </param>
+		/// <param name="includeFactoryObjects">
+		/// Whether to include <see cref="Spring.Objects.Factory.IFactoryObject"/> instances
+		/// too or just normal objects.
+		/// </param>
+		/// <returns>
+		/// The array of object names, or an empty array if none.
+		/// </returns>
+		public static string[] ObjectNamesForTypeIncludingAncestors(
+			IListableObjectFactory factory, Type type,
+            bool includePrototypes, bool includeFactoryObjects)
+		{
+			Set result = new HashedSet();
+			result.AddAll(factory.GetObjectNamesForType(type, includePrototypes, includeFactoryObjects));
+			IListableObjectFactory pof = GetParentFactoryIfAny(factory);
+			if (pof != null)
+			{
+                string[] parentsResult = ObjectNamesForTypeIncludingAncestors(pof, type, includePrototypes, includeFactoryObjects);
+				result.AddAll(parentsResult);
+			}
+			return ToArrayOfObjectNames(result);
+		}
+
+        /// <summary>
+        /// Get all object names for the given type, including those defined in ancestor
+        /// factories.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Will return unique names in case of overridden object definitions.
+        /// </p>
+        /// <p>
+        /// Does consider objects created by <see cref="Spring.Objects.Factory.IFactoryObject"/>s,
+        /// or rather it considers the type of objects created by
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/> (which means that
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s will be instantiated).
+        /// </p>
+        /// </remarks>
+        /// <param name="factory">
+        /// If this isn't also an
+        /// <see cref="Spring.Objects.Factory.IHierarchicalObjectFactory"/>,
+        /// this method will return the same as it's own
+        /// <see cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectDefinitionNames"/>
+        /// method.
+        /// </param>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> that objects must match.
+        /// </param>
+        /// <returns>
+        /// The array of object names, or an empty array if none.
+        /// </returns>
+        public static string[] ObjectNamesForTypeIncludingAncestors(
+            IListableObjectFactory factory, Type type)
+        {
+            Set result = new HashedSet();
+            result.AddAll(factory.GetObjectNamesForType(type));
+            IListableObjectFactory pof = GetParentFactoryIfAny(factory);
+            if (pof != null)
+            {
+                string[] parentsResult = ObjectNamesForTypeIncludingAncestors(pof, type);
+                result.AddAll(parentsResult);
+            }
+            return ToArrayOfObjectNames(result);
+        }
+
+		private static IListableObjectFactory GetParentFactoryIfAny(IListableObjectFactory factory)
+		{
+			IHierarchicalObjectFactory hierFactory = factory as IHierarchicalObjectFactory;
+			if (hierFactory != null)
+			{
+				return
+					hierFactory.ParentObjectFactory as IListableObjectFactory;
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Return all objects of the given type or subtypes, also picking up objects
+		/// defined in ancestor object factories if the current object factory is an
+		/// <see cref="Spring.Objects.Factory.IHierarchicalObjectFactory"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The return list will only contain objects of this type.
+		/// Useful convenience method when we don't care about object names.
+		/// </p>
+		/// </remarks>
+		/// <param name="factory">The object factory.</param>
+		/// <param name="type">The <see cref="System.Type"/> of object to match.</param>
+		/// <param name="includePrototypes">
+		/// Whether to include prototype objects too or just singletons
+		/// (also applies to <see cref="Spring.Objects.Factory.IFactoryObject"/> instances).
+		/// </param>
+		/// <param name="includeFactoryObjects">
+		/// Whether to include <see cref="Spring.Objects.Factory.IFactoryObject"/> instances
+		/// too or just normal objects.
+		/// </param>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If the objects could not be created.
+		/// </exception>
+		/// <returns>
+		/// The <see cref="System.Collections.IDictionary"/> of object instances, or an
+		/// empty <see cref="System.Collections.IDictionary"/> if none.
+		/// </returns>
+		public static IDictionary ObjectsOfTypeIncludingAncestors(
+			IListableObjectFactory factory, Type type,
+			bool includePrototypes, bool includeFactoryObjects)
+		{
+			Hashtable result = new Hashtable();
+			foreach (DictionaryEntry entry in
+				factory.GetObjectsOfType(type, includePrototypes, includeFactoryObjects))
+			{
+				result.Add(entry.Key, entry.Value);
+			}
+			IListableObjectFactory pof = GetParentFactoryIfAny(factory);
+			if (pof != null)
+			{
+				IDictionary parentResult
+					= ObjectsOfTypeIncludingAncestors(
+						pof, type, includePrototypes, includeFactoryObjects);
+				foreach (object instance in parentResult.Keys)
+				{
+					if (!result.ContainsKey(instance))
+					{
+						result.Add(instance, parentResult[instance]);
+					}
+				}
+			}
+			return result;
+		}
+
+		/// <summary>
+		/// Return a single object of the given type or subtypes, also picking up objects defined
+		/// in ancestor object factories if the current object factory is an
+		/// <see cref="Spring.Objects.Factory.IHierarchicalObjectFactory"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Useful convenience method when we expect a single object and don't care
+		/// about the object name.
+		/// </p>
+		/// </remarks>
+		/// <param name="factory">The object factory.</param>
+		/// <param name="type">The <see cref="System.Type"/> of object to match.</param>
+		/// <param name="includePrototypes">
+		/// Whether to include prototype objects too or just singletons
+		/// (also applies to <see cref="Spring.Objects.Factory.IFactoryObject"/> instances).
+		/// </param>
+		/// <param name="includeFactoryObjects">
+		/// Whether to include <see cref="Spring.Objects.Factory.IFactoryObject"/> instances
+		/// too or just normal objects.
+		/// </param>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If the object could not be created.
+		/// </exception>
+		/// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+		/// If more than one instance of an object was found.
+		/// </exception>
+		/// <returns>
+		/// A single object of the given type or subtypes.
+		/// </returns>
+		public static object ObjectOfTypeIncludingAncestors(
+			IListableObjectFactory factory, Type type,
+			bool includePrototypes, bool includeFactoryObjects)
+		{
+			IDictionary objectsOfType
+				= ObjectsOfTypeIncludingAncestors(
+					factory, type, includePrototypes, includeFactoryObjects);
+			return GrabTheOnlyObject(objectsOfType, type);
+		}
+
+		private static object GrabTheOnlyObject(IDictionary objectsOfType, Type type)
+		{
+			if (objectsOfType.Count == 1)
+			{
+				return ObjectUtils.EnumerateFirstElement(objectsOfType.Values);
+			}
+			else
+			{
+				throw new NoSuchObjectDefinitionException(type, "Expected single object but found " + objectsOfType.Count);
+			}
+		}
+
+		/// <summary>
+		/// Return a single object of the given type or subtypes, not looking in
+		/// ancestor factories.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Useful convenience method when we expect a single object and don't care
+		/// about the object name.
+		/// </p>
+		/// </remarks>
+		/// <param name="factory">The object factory.</param>
+		/// <param name="type">The <see cref="System.Type"/> of object to match.</param>
+		/// <param name="includePrototypes">
+		/// Whether to include prototype objects too or just singletons
+		/// (also applies to <see cref="Spring.Objects.Factory.IFactoryObject"/> instances).
+		/// </param>
+		/// <param name="includeFactoryObjects">
+		/// Whether to include <see cref="Spring.Objects.Factory.IFactoryObject"/> instances
+		/// too or just normal objects.
+		/// </param>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If the object could not be created.
+		/// </exception>
+		/// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+		/// If not exactly one instance of an object was found.
+		/// </exception>
+		/// <returns>
+		/// A single object of the given type or subtypes.
+		/// </returns>
+		public static object ObjectOfType(IListableObjectFactory factory, Type type,
+		                                  bool includePrototypes, bool includeFactoryObjects)
+		{
+			IDictionary objectsOfType
+				= factory.GetObjectsOfType(type, includePrototypes, includeFactoryObjects);
+			return GrabTheOnlyObject(objectsOfType, type);
+		}
+
+		/// <summary>
+		/// Return a single object of the given type or subtypes, not looking in
+		/// ancestor factories.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Useful convenience method when we expect a single object and don't care
+		/// about the object name.
+		/// This version of <c>ObjectOfType</c> automatically includes prototypes and
+		/// <see cref="Spring.Objects.Factory.IFactoryObject"/> instances.
+		/// </p>
+		/// </remarks>
+		/// <param name="factory">The object factory.</param>
+		/// <param name="type">The <see cref="System.Type"/> of object to match.</param>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// If the object could not be created.
+		/// </exception>
+		/// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+		/// If not exactly one instance of an object was found.
+		/// </exception>
+		/// <returns>
+		/// A single object of the given type or subtypes.
+		/// </returns>
+		public static object ObjectOfType(IListableObjectFactory factory, Type type)
+		{
+			return ObjectOfType(factory, type, true, true);
+		}
+
+		/// <summary>
+		/// Return the object name, stripping out the factory dereference prefix if necessary.
+		/// </summary>
+		/// <param name="name">The name of the object.</param>
+		/// <returns>The object name sans any factory dereference prefix.</returns>
+		public static string TransformedObjectName(string name)
+		{
+			AssertUtils.ArgumentNotNull(name, "name", "Object name must not be null.");
+			string objectName = name;
+			if (ObjectFactoryUtils.IsFactoryDereference(objectName))
+			{
+				objectName = objectName.Substring(ObjectFactoryUtils.FactoryObjectPrefix.Length);
+			}
+			return objectName;
+		}
+
+		/// <summary>
+		/// Given an (object) name, builds a corresponding factory object name such that
+		/// the return value can be used as a lookup name for a factory object.
+		/// </summary>
+		/// <param name="objectName">
+		/// The name to be used to build the resulting factory object name.
+		/// </param>
+		/// <returns>
+		/// The <paramref name="objectName"/> transformed into its factory object name
+		/// equivalent.
+		/// </returns>
+		/// <seealso cref="Spring.Objects.Factory.ObjectFactoryUtils.TransformedObjectName"/>
+		/// <seealso cref="Spring.Objects.Factory.ObjectFactoryUtils.FactoryObjectPrefix"/>
+		public static string BuildFactoryObjectName(string objectName)
+		{
+			return ObjectFactoryUtils.FactoryObjectPrefix + objectName;
+		}
+
+		/// <summary>
+		/// Is the supplied <paramref name="name"/> a factory dereference?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// That is, does the supplied <paramref name="name"/> begin with
+		/// the
+		/// <see cref="Spring.Objects.Factory.ObjectFactoryUtils.FactoryObjectPrefix"/>?
+		/// </p>
+		/// </remarks>
+		/// <param name="name">The name to check.</param>
+		/// <returns>
+		/// <see langword="true"/> if the supplied <paramref name="name"/> is a
+		/// factory dereference; <see langword="false"/> if not, or the
+		/// aupplied <paramref name="name"/> is <see langword="null"/> or
+		/// consists solely of the
+		/// <see cref="Spring.Objects.Factory.ObjectFactoryUtils.FactoryObjectPrefix"/>
+		/// value.
+		/// </returns>
+		/// <seealso cref="Spring.Objects.Factory.ObjectFactoryUtils.FactoryObjectPrefix"/>
+		public static bool IsFactoryDereference(string name)
+		{
+			return name != null
+				&& name.StartsWith(ObjectFactoryUtils.FactoryObjectPrefix)
+				&& name.Length > ObjectFactoryUtils.FactoryObjectPrefix.Length;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectInitializationException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectInitializationException.cs
new file mode 100644
index 00000000..d6ea606d
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/ObjectInitializationException.cs
@@ -0,0 +1,98 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+    /// <summary>
+    /// Exception that an object implementation is suggested to throw if its own
+    /// factory-aware initialization code fails.
+    /// <see cref="Spring.Objects.ObjectsException"/> thrown by object factory methods
+    /// themselves should simply be propagated as-is.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Note that non-factory-aware initialization methods like AfterPropertiesSet ()
+    /// or a custom "init-method" can throw any exception.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    [Serializable]
+    public class ObjectInitializationException : FatalObjectException
+    {
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the ObjectInitializationException class.
+        /// </summary>
+        public ObjectInitializationException ()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectInitializationException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public ObjectInitializationException (string message)
+            : base (message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectInitializationException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public ObjectInitializationException (string message, Exception rootCause)
+            : base (message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectInitializationException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected ObjectInitializationException (
+            SerializationInfo info, StreamingContext context)
+            : base (info, context)
+        {
+        }
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectIsNotAFactoryException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectIsNotAFactoryException.cs
new file mode 100644
index 00000000..8acd1f33
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/ObjectIsNotAFactoryException.cs
@@ -0,0 +1,115 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+    /// <summary>
+    /// Thrown in response to an attempt to lookup a factory object, and
+    /// the object identified by the lookup key is not a factory.
+    /// </summary>
+	/// <remarks>
+	/// <p>
+	/// An object is a factory if it implements (either directly or indirectly
+	/// via inheritance) the <see cref="Spring.Objects.Factory.IFactoryObject"/>
+	/// interface.
+	/// </p>
+	/// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: ObjectIsNotAFactoryException.cs,v 1.5 2006/04/09 07:18:49 markpollack Exp $</version>
+    [Serializable]
+    public class ObjectIsNotAFactoryException : ObjectNotOfRequiredTypeException
+    {
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="ObjectIsNotAFactoryException"/> class.
+        /// </summary>
+        public ObjectIsNotAFactoryException()
+        {
+        }
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="ObjectIsNotAFactoryException"/> class.
+		/// </summary>
+    	/// <param name="message">
+    	/// A message about the exception.
+    	/// </param>
+    	public ObjectIsNotAFactoryException(string message)
+    		: base(message)
+    	{
+    	}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="ObjectIsNotAFactoryException"/> class.
+		/// </summary>
+    	/// <param name="message">
+    	/// A message about the exception.
+    	/// </param>
+    	/// <param name="rootCause">
+    	/// The root exception that is being wrapped.
+    	/// </param>
+    	public ObjectIsNotAFactoryException(string message, Exception rootCause)
+    		: base(message, rootCause)
+    	{
+    	}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="ObjectIsNotAFactoryException"/> class.
+		/// </summary>
+    	/// <param name="name">
+    	/// The name of the object that was being retrieved from the factory.
+    	/// </param>
+    	/// <param name="actualInstance">
+    	/// The object instance that was retrieved.
+    	/// </param>
+    	public ObjectIsNotAFactoryException(string name, object actualInstance)
+    		: base(name, typeof (IFactoryObject), actualInstance)
+    	{
+    	}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="ObjectIsNotAFactoryException"/> class.
+		/// </summary>
+    	/// <param name="info">
+    	/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+    	/// that holds the serialized object data about the exception being thrown.
+    	/// </param>
+    	/// <param name="context">
+    	/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+    	/// that contains contextual information about the source or destination.
+    	/// </param>
+    	protected ObjectIsNotAFactoryException(
+    		SerializationInfo info, StreamingContext context)
+    		: base(info, context)
+    	{
+    	}
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectNotOfRequiredTypeException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectNotOfRequiredTypeException.cs
new file mode 100644
index 00000000..16ecfd47
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/ObjectNotOfRequiredTypeException.cs
@@ -0,0 +1,185 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+
+#endregion
+
+namespace Spring.Objects.Factory {
+    /// <summary>
+    /// Thrown when an object doesn't match the required <see cref="System.Type"/>.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Rick Evans (.NET)</author>
+    [Serializable]
+    public class ObjectNotOfRequiredTypeException : ObjectsException {
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the ObjectNotOfRequiredTypeException class.
+        /// </summary>
+        public ObjectNotOfRequiredTypeException () {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectNotOfRequiredTypeException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public ObjectNotOfRequiredTypeException (string message)
+            : base (message) {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectNotOfRequiredTypeException class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public ObjectNotOfRequiredTypeException (string message, Exception rootCause)
+            : base (message, rootCause) {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectNotOfRequiredTypeException class.
+        /// </summary>
+        /// <param name="name">
+        /// Name of the object requested.
+        /// </param>
+        /// <param name="requiredType">
+        /// The required <see cref="System.Type"/> of the actual object
+        /// instance that was retrieved.
+        /// </param>
+        /// <param name="actualInstance">
+        /// The instance actually returned, whose class did not match the
+        /// expected <see cref="System.Type"/>.
+        /// </param>
+        public ObjectNotOfRequiredTypeException (
+            string name, Type requiredType, object actualInstance)
+            : base (
+            string.Format (
+            "Object named '{0}' must be of type [{1}], but was actually of type [{2}]",
+            name,
+            requiredType.Name,
+            actualInstance.GetType ().Name)) {
+            this.name = name;
+            this.actualInstance = actualInstance;
+            this.requiredType = requiredType;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectNotOfRequiredTypeException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected ObjectNotOfRequiredTypeException (
+            SerializationInfo info, StreamingContext context)
+            : base (info, context)
+        {
+            requiredType = info.GetValue ("RequiredType", typeof (Type)) as Type;
+            actualInstance = info.GetValue ("ActualInstance", typeof (object));
+            name = info.GetString ("Name");
+        }
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// The actual <see cref="System.Type"/> of the actual object
+        /// instance that was retrieved.
+        /// </summary>
+        public Type ActualType {
+            get {
+                return ActualInstance.GetType ();
+            }
+        }
+        /// <summary>
+        /// The required <see cref="System.Type"/> of the actual object
+        /// instance that was retrieved.
+        /// </summary>
+        public Type RequiredType {
+            get {
+                return requiredType;
+            }
+        }
+
+        /// <summary>
+        /// The instance actually returned, whose class did not match the
+        /// expected <see cref="System.Type"/>.
+        /// </summary>
+        public object ActualInstance {
+            get {
+                return actualInstance;
+            }
+        }
+
+        /// <summary>
+        /// The name of the object requested.
+        /// </summary>
+        public string ObjectName {
+            get {
+                return name;
+            }
+        }
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+        /// the data needed to serialize the target object.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+        /// with data.
+        /// </param>
+        /// <param name="context">
+        /// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+        /// for this serialization.
+        /// </param>
+        [SecurityPermission (SecurityAction.Demand,SerializationFormatter=true)]
+        public override void GetObjectData (
+            SerializationInfo info, StreamingContext context) {
+            base.GetObjectData (info, context);
+            info.AddValue ("RequiredType", requiredType);
+            info.AddValue ("ActualInstance", actualInstance);
+            info.AddValue ("Name", name);
+        }
+        #endregion
+
+        #region Fields
+        private Type requiredType;
+        private object actualInstance;
+        private string name;
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/ReaderContext.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/ReaderContext.cs
new file mode 100644
index 00000000..f14ad51f
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/ReaderContext.cs
@@ -0,0 +1,56 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 Spring.Core.IO;
+
+namespace Spring.Objects.Factory.Parsing
+{
+    /// <summary>
+    /// Context that gets passed along an object definition reading process,
+    /// encapsulating all relevant configuraiton as well as state.
+    /// </summary>
+    /// <author>Rob Harrop</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ReaderContext.cs,v 1.3 2007/08/08 17:47:13 bbaia Exp $</version>
+    public class ReaderContext
+    {
+        private IResource resource;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReaderContext"/> class.
+        /// </summary>
+        /// <param name="resource">The resource.</param>
+        public ReaderContext(IResource resource)
+        {
+            this.resource = resource;
+        }
+
+
+        /// <summary>
+        /// Gets the resource.
+        /// </summary>
+        /// <value>The resource.</value>
+        public IResource Resource
+        {
+            get { return resource; }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs
new file mode 100644
index 00000000..cfc35767
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs
@@ -0,0 +1,2435 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Reflection;
+
+using Common.Logging;
+using Spring.Collections;
+using Spring.Core;
+using Spring.Core.TypeConversion;
+using Spring.Core.TypeResolution;
+using Spring.Expressions;
+using Spring.Objects;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Abstract <see cref="Spring.Objects.Factory.IObjectFactory"/> superclass
+    /// that implements default object creation.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Provides object creation, initialization and wiring, supporting
+    /// autowiring and constructor resolution. Handles runtime object
+    /// references, managed collections, and object destruction.
+    /// </p>
+    /// <p>
+    /// The main template method to be implemented by subclasses is
+    /// <see cref="Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.FindMatchingObjects"/>,
+    /// used for autowiring by type. Note that this class does not implement object
+    /// definition registry capabilities
+    /// (<see cref="Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>
+    /// does).
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: AbstractAutowireCapableObjectFactory.cs,v 1.90 2008/05/29 12:13:27 oakinger Exp $</version>
+    [Serializable]
+    public abstract class AbstractAutowireCapableObjectFactory : AbstractObjectFactory, IAutowireCapableObjectFactory
+    {
+        #region Constants
+
+        /// <summary>
+        /// The <see cref="System.Reflection.BindingFlags"/> used during the invocation and
+        /// searching for of methods.
+        /// </summary>
+        protected const BindingFlags MethodResolutionFlags =
+                BindingFlags.Public | BindingFlags.InvokeMethod | BindingFlags.Static | BindingFlags.Instance | BindingFlags.IgnoreCase;
+
+        #endregion
+
+        /// <summary>
+        /// The <see cref="Common.Logging.ILog"/> instance for this class.
+        /// </summary>
+        private readonly ILog log = LogManager.GetLogger(typeof(AbstractAutowireCapableObjectFactory));
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory"/>
+        /// class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+        /// </p>
+        /// </remarks>
+        /// <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+        protected AbstractAutowireCapableObjectFactory(bool caseSensitive)
+            : this(caseSensitive, null)
+        { }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory"/>
+        /// class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+        /// </p>
+        /// </remarks>
+        /// <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+        /// <param name="parentFactory">The parent object factory, or <see langword="null"/> if none.</param>
+        protected AbstractAutowireCapableObjectFactory(bool caseSensitive, IObjectFactory parentFactory)
+            : base(caseSensitive, parentFactory)
+        {
+            this.IgnoreDependencyInterface(typeof(IObjectFactoryAware));
+            this.IgnoreDependencyInterface(typeof(IObjectNameAware));
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The <see cref="Spring.Objects.Factory.Support.IInstantiationStrategy"/>
+        /// implementation to be used to instantiate managed objects.
+        /// </summary>
+        protected IInstantiationStrategy InstantiationStrategy
+        {
+            get { return instantiationStrategy; }
+            set { instantiationStrategy = value; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Predict the eventual object type (of the processed object instance) for the
+        /// specified object.
+        /// </summary>
+        /// <param name="objectName">Name of the object.</param>
+        /// <param name="mod">The merged object definition to determine the type for.</param>
+        /// <returns>
+        /// The type of the object, or <code>null</code> if not predictable
+        /// </returns>
+        protected override Type PredictObjectType(string objectName, RootObjectDefinition mod)
+        {
+            Type objectType;
+            if (StringUtils.HasText(mod.FactoryMethodName))
+            {
+                objectType = GetTypeForFactoryMethod(objectName, mod);
+            }
+            else
+            {
+                objectType = ResolveObjectType(mod, objectName);
+            }
+            return objectType;
+        }
+
+        /// <summary>
+        /// Determines the <see cref="System.Type"/> of the object defined
+        /// by the supplied object <paramref name="definition"/>. 
+        /// </summary>
+        /// <param name="objectName">
+        /// The name associated with the supplied object <paramref name="definition"/>.
+        /// </param>
+        /// <param name="definition">
+        /// The <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+        /// that the <see cref="System.Type"/> is to be determined for. 
+        /// </param>
+        /// <returns>
+        /// The <see cref="System.Type"/> of the object defined by the supplied
+        /// object <paramref name="definition"/>; or <see lang="null"/> if the
+        /// <see cref="System.Type"/> cannot be determined.
+        /// </returns>
+        protected override Type GetTypeForFactoryMethod(string objectName, RootObjectDefinition definition)
+        {
+            if (StringUtils.HasText(definition.FactoryObjectName) && definition.IsSingleton && !definition.IsLazyInit)
+            {
+                return GetObject(objectName).GetType();
+            }
+
+            Type factoryType = null;
+            bool isStatic = true;
+
+            if (StringUtils.HasText(definition.FactoryObjectName))
+            {
+                // check declared factory method return type on factory type...
+                factoryType = GetType(definition.FactoryObjectName);
+                isStatic = false;
+            }
+            else
+            {
+                factoryType = ResolveObjectType(definition, objectName);
+            }
+            if (factoryType == null)
+            {
+                return null;
+            }
+
+            // If all factory methods have the same return type, return that type.
+            // Can't clearly figure out exact method due to type converting / autowiring!
+            int minNrOfArgs = definition.ConstructorArgumentValues.GenericArgumentValues.Count;
+            MethodInfo[] candidates = factoryType.GetMethods();
+            ISet returnTypes = new HybridSet();
+            foreach (MethodInfo factoryMethod in candidates)
+            {
+#if NET_2_0
+                GenericArgumentsHolder genericArgsInfo = new GenericArgumentsHolder(definition.FactoryMethodName);
+                if (factoryMethod.IsStatic == isStatic && factoryMethod.Name.Equals(genericArgsInfo.GenericMethodName)
+                    && ReflectionUtils.GetParameterTypes(factoryMethod).Length >= minNrOfArgs
+                    && factoryMethod.GetGenericArguments().Length == genericArgsInfo.GetGenericArguments().Length)
+                {
+                    if (genericArgsInfo.ContainsGenericArguments)
+                    {
+                        string[] unresolvedGenericArgs = genericArgsInfo.GetGenericArguments();
+                        Type[] genericArgs = new Type[unresolvedGenericArgs.Length];
+                        for (int j = 0; j < unresolvedGenericArgs.Length; j++)
+                        {
+                            genericArgs[j] = TypeResolutionUtils.ResolveType(unresolvedGenericArgs[j]);
+                        }
+                        returnTypes.Add(factoryMethod.MakeGenericMethod(genericArgs).ReturnType);
+                    }
+                    else
+                    {
+                        returnTypes.Add(factoryMethod.ReturnType);
+                    }
+                }
+#else
+                if (factoryMethod.IsStatic == isStatic && factoryMethod.Name.Equals(definition.FactoryMethodName)
+                    && ReflectionUtils.GetParameterTypes(factoryMethod).Length >= minNrOfArgs)
+                {
+                    returnTypes.Add(factoryMethod.ReturnType);
+                }
+#endif
+            }
+            if (returnTypes.Count == 1)
+            {
+                // clear return type found: all factory methods return same type...
+                return (Type)ObjectUtils.EnumerateFirstElement(returnTypes);
+            }
+            else
+            {
+                // ambiguous return types found: return null to indicate "not determinable"...
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Apply the property values of the object definition with the supplied
+        /// <paramref name="name"/> to the supplied <paramref name="instance"/>.
+        /// </summary>
+        /// <param name="instance">
+        /// The existing object that the property values for the named object will
+        /// be applied to.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object definition associated with the property values that are
+        /// to be applied.
+        /// </param>
+        public override void ApplyObjectPropertyValues(object instance, string name)
+        {
+            RootObjectDefinition definition = GetMergedObjectDefinition(name, true);
+            if (definition != null)
+            {
+                log.Debug(string.Format("configuring object '{0}' using definition '{1}'", instance, name));
+                ApplyPropertyValues(name, definition, new ObjectWrapper(instance), definition.PropertyValues);
+            }
+        }
+
+        /// <summary>
+        /// Apply any
+        /// <see cref="Spring.Objects.Factory.Config.IInstantiationAwareObjectPostProcessor"/>s.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The returned instance may be a wrapper around the original.
+        /// </p>
+        /// </remarks>
+        /// <param name="objectType">
+        /// The <see cref="System.Type"/> of the object that is to be
+        /// instantiated.
+        /// </param>
+        /// <param name="objectName">
+        /// The name of the object that is to be instantiated.
+        /// </param>
+        /// <returns>
+        /// An instance to use in place of the original instance.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        protected object ApplyObjectPostProcessorsBeforeInstantiation(Type objectType, string objectName)
+        {
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(string.Format("Invoking IInstantiationAwareObjectPostProcessors before " + "the instantiation of '{0}'.", objectName));
+            }
+
+            #endregion
+
+            foreach (IObjectPostProcessor processor in ObjectPostProcessors)
+            {
+                IInstantiationAwareObjectPostProcessor inProc = processor as IInstantiationAwareObjectPostProcessor;
+                if (inProc != null)
+                {
+                    object theObject = inProc.PostProcessBeforeInstantiation(objectType, objectName);
+                    if (theObject != null)
+                    {
+                        return theObject;
+                    }
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Apply the given property values, resolving any runtime references
+        /// to other objects in this object factory.
+        /// </summary>
+        /// <param name="name">
+        /// The object name passed for better exception information.
+        /// </param>
+        /// <param name="definition">
+        /// The definition of the named object.
+        /// </param>
+        /// <param name="wrapper">
+        /// The <see cref="Spring.Objects.IObjectWrapper"/> wrapping the target object.
+        /// </param>
+        /// <param name="properties">
+        /// The new property values.
+        /// </param>
+        /// <remarks>
+        /// <p>
+        /// Must use deep copy, so that we don't permanently modify this property.
+        /// </p>
+        /// </remarks>
+        protected void ApplyPropertyValues(string name, RootObjectDefinition definition, IObjectWrapper wrapper, IPropertyValues properties)
+        {
+            if (properties == null || properties.PropertyValues.Length == 0)
+            {
+                return;
+            }
+            MutablePropertyValues deepCopy = new MutablePropertyValues(properties);
+            PropertyValue[] copiedProperties = deepCopy.PropertyValues;
+            for (int i = 0; i < copiedProperties.Length; ++i)
+            {
+                PropertyValue copiedProperty = copiedProperties[i];
+                object value = ResolveValueIfNecessary(name, definition, copiedProperty.Name, copiedProperty.Value);
+                PropertyValue propertyValue = new PropertyValue(copiedProperty.Name, value, copiedProperty.Expression);
+                // update mutable copy...
+                deepCopy.SetPropertyValueAt(propertyValue, i);
+            }
+            // set the (possibly resolved) deep copy properties...
+            try
+            {
+                wrapper.SetPropertyValues(deepCopy);
+            }
+            catch (ObjectsException ex)
+            {
+                // improve the message by showing the context...
+                throw new ObjectCreationException(definition.ResourceDescription, name, "Error setting property values: " + ex.Message, ex);
+            }
+        }
+
+        /// <summary>
+        /// Return an array of object-type property names that are unsatisfied.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// These are probably unsatisfied references to other objects in the
+        /// factory. Does not include simple properties like primitives or
+        /// <see cref="System.String"/>s.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// An array of object-type property names that are unsatisfied.
+        /// </returns>
+        /// <param name="definition">
+        /// The definition of the named object.
+        /// </param>
+        /// <param name="wrapper">
+        /// The <see cref="Spring.Objects.IObjectWrapper"/> wrapping the target object.
+        /// </param>
+        protected string[] UnsatisfiedObjectProperties(RootObjectDefinition definition, IObjectWrapper wrapper)
+        {
+            ArrayList result = new ArrayList();
+            ISet ignoredTypes = IgnoredDependencyTypes;
+            PropertyInfo[] properties = wrapper.GetPropertyInfos();
+            foreach (PropertyInfo property in properties)
+            {
+                string name = property.Name;
+                if (property.CanWrite && !ignoredTypes.Contains(property.PropertyType) && !result.Contains(name)
+                    && !ObjectUtils.IsSimpleProperty(property.PropertyType))
+                {
+                    result.Add(name);
+                }
+            }
+            return (string[])result.ToArray(typeof(string));
+        }
+
+        /// <summary>
+        /// Destroy all cached singletons in this factory.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// To be called on shutdown of a factory.
+        /// </p>
+        /// </remarks>
+        public override void Dispose()
+        {
+            base.Dispose();
+            foreach (object o in _disposableInnerObjects)
+            {
+                DestroyObject(string.Format(CultureInfo.InvariantCulture, "(Inner object of Type '{0}')", o.GetType().FullName), o);
+            }
+            _disposableInnerObjects.Clear();
+        }
+
+        /// <summary>
+        /// Populate the object instance in the given
+        /// <see cref="Spring.Objects.IObjectWrapper"/> with the property values from the
+        /// object definition.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object.
+        /// </param>
+        /// <param name="definition">
+        /// The definition of the named object.
+        /// </param>
+        /// <param name="wrapper">
+        /// The <see cref="Spring.Objects.IObjectWrapper"/> wrapping the target object.
+        /// </param>
+        protected void PopulateObject(string name, RootObjectDefinition definition, IObjectWrapper wrapper)
+        {
+            // Give any InstantiationAwareBeanPostProcessors the opportunity to modify the
+            // state of the bean before properties are set. This can be used, for example,
+            // to support styles of field injection.
+            bool continueWithPropertyPopulation = true;
+
+            if (HasInstantiationAwareBeanPostProcessors)
+            {
+                foreach (IObjectPostProcessor processor in ObjectPostProcessors)
+                {
+                    IInstantiationAwareObjectPostProcessor inProc = processor as IInstantiationAwareObjectPostProcessor;
+                    if (inProc != null)
+                    {
+                        if (!inProc.PostProcessAfterInstantiation(wrapper.WrappedInstance, name))
+                        {
+                            continueWithPropertyPopulation = false;
+                            break;
+                        }
+                    }
+                }
+            }
+            if (!continueWithPropertyPopulation)
+            {
+                return;
+            }
+
+            IPropertyValues properties = definition.PropertyValues;
+
+            if (wrapper == null)
+            {
+                if (properties.PropertyValues.Length > 0)
+                {
+                    throw new ObjectCreationException(definition.ResourceDescription,
+                        name, "Cannot apply property values to null instance.");
+                }
+                else
+                {
+                    // skip property population phase for null instance
+                    return;
+                }
+            }
+
+            if (definition.ResolvedAutowireMode == AutoWiringMode.ByName || definition.ResolvedAutowireMode == AutoWiringMode.ByType)
+            {
+                MutablePropertyValues mpvs = new MutablePropertyValues(properties);
+                // add property values based on autowire by name if it's applied
+                if (definition.ResolvedAutowireMode == AutoWiringMode.ByName)
+                {
+                    AutowireByName(name, definition, wrapper, mpvs);
+                }
+                // add property values based on autowire by type if it's applied
+                if (definition.ResolvedAutowireMode == AutoWiringMode.ByType)
+                {
+                    AutowireByType(name, definition, wrapper, mpvs);
+                }
+                properties = mpvs;
+            }
+            //DependencyCheck(name, definition, wrapper, properties);
+
+
+            bool hasInstAwareOpps = HasInstantiationAwareBeanPostProcessors;
+            bool needsDepCheck = (definition.DependencyCheck != DependencyCheckingMode.None);
+
+
+            if (hasInstAwareOpps || needsDepCheck)
+            {
+                PropertyInfo[] filteredPropInfo = FilterPropertyInfoForDependencyCheck(wrapper);
+                if (hasInstAwareOpps)
+                {
+                    foreach (IObjectPostProcessor processor in ObjectPostProcessors)
+                    {
+                        IInstantiationAwareObjectPostProcessor instantiationAwareObjectPostProcessor =
+                            processor as IInstantiationAwareObjectPostProcessor;
+                        if (instantiationAwareObjectPostProcessor != null)
+                        {
+                            properties =
+                                instantiationAwareObjectPostProcessor.PostProcessPropertyValues(properties, filteredPropInfo, wrapper.WrappedInstance,
+                                                                 name);
+                            if (properties == null)
+                            {
+                                return;
+                            }
+                        }
+                    }
+                }
+
+                if (needsDepCheck)
+                {
+                    CheckDependencies(name, definition, filteredPropInfo, properties);
+                }
+
+            }
+
+            ApplyPropertyValues(name, definition, wrapper, properties);
+        }
+
+        /// <summary>
+        /// Wires up any exposed events in the object instance in the given
+        /// <see cref="Spring.Objects.IObjectWrapper"/> with any event handler
+        /// values from the <paramref name="definition"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object.
+        /// </param>
+        /// <param name="definition">
+        /// The definition of the named object.
+        /// </param>
+        /// <param name="wrapper">
+        /// The <see cref="Spring.Objects.IObjectWrapper"/> wrapping the target object.
+        /// </param>
+        protected void WireEvents(string name, IConfigurableObjectDefinition definition, IObjectWrapper wrapper)
+        {
+            foreach (string eventName in definition.EventHandlerValues.Events)
+            {
+                foreach (IEventHandlerValue handlerValue
+                        in definition.EventHandlerValues[eventName])
+                {
+                    object handler = null;
+                    if (handlerValue.Source is RuntimeObjectReference)
+                    {
+                        RuntimeObjectReference roref = (RuntimeObjectReference)handlerValue.Source;
+                        handler = ResolveReference(definition, name, eventName, roref);
+                    }
+                    else if (handlerValue.Source is Type)
+                    {
+                        // a static Type event is being wired up; simply pass on the Type
+                        handler = handlerValue.Source;
+                    }
+                    else if (handlerValue.Source is string)
+                    {
+                        // a static Type event is being wired up; we need to resolve the Type
+                        handler = TypeResolutionUtils.ResolveType(handlerValue.Source as string);
+                    }
+                    else
+                    {
+                        throw new FatalObjectException("Currently, only references to other objects and Types are " + "supported as event sources.");
+                    }
+                    handlerValue.Wire(handler, wrapper.WrappedInstance);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Fills in any missing property values with references to
+        /// other objects in this factory if autowire is set to
+        /// <see cref="Spring.Objects.Factory.Config.AutoWiringMode.ByName"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The object name to be autowired by <see cref="System.Type"/>.
+        /// </param>
+        /// <param name="definition">
+        /// The definition of the named object to update through autowiring.
+        /// </param>
+        /// <param name="wrapper">
+        /// The <see cref="Spring.Objects.IObjectWrapper"/> wrapping the target object (and
+        /// from which we can rip out information concerning the object).
+        /// </param>
+        /// <param name="properties">
+        /// The property values to register wired objects with.
+        /// </param>
+        protected void AutowireByName(string name, RootObjectDefinition definition, IObjectWrapper wrapper, MutablePropertyValues properties)
+        {
+            string[] propertyNames = UnsatisfiedObjectProperties(definition, wrapper);
+            foreach (string propertyName in propertyNames)
+            {
+                // look for a matching type
+                if (ContainsObject(propertyName))
+                {
+                    object o = GetObject(propertyName);
+                    properties.Add(propertyName, o);
+
+                    #region Instrumentation
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(
+                                string.Format(CultureInfo.InvariantCulture,
+                                              "Added autowiring by name from object name '{0}' via " + "property '{1}' to object named '{1}'.", name,
+                                              propertyName));
+                    }
+
+                    #endregion
+                }
+                else
+                {
+                    #region Instrumentation
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(
+                                string.Format(CultureInfo.InvariantCulture,
+                                              "Not autowiring property '{0}' of object '{1}' by name: " + "no matching object found.", propertyName, name));
+                    }
+
+                    #endregion
+                }
+            }
+        }
+
+        /// <summary>
+        /// Defines "autowire by type" (object properties by type) behavior.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is like PicoContainer default, in which there must be exactly one object
+        /// of the property type in the object factory. This makes object factories simple
+        /// to configure for small namespaces, but doesn't work as well as standard Spring
+        /// behavior for bigger applications.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">
+        /// The object name to be autowired by <see cref="System.Type"/>.
+        /// </param>
+        /// <param name="definition">
+        /// The definition of the named object to update through autowiring.
+        /// </param>
+        /// <param name="wrapper">
+        /// The <see cref="Spring.Objects.IObjectWrapper"/> wrapping the target object (and
+        /// from which we can rip out information concerning the object).
+        /// </param>
+        /// <param name="properties">
+        /// The property values to register wired objects with.
+        /// </param>
+        protected void AutowireByType(string name, RootObjectDefinition definition, IObjectWrapper wrapper, MutablePropertyValues properties)
+        {
+            string[] propertyNames = UnsatisfiedObjectProperties(definition, wrapper);
+            foreach (string propertyName in propertyNames)
+            {
+                // look for a matching type
+                Type requiredType = wrapper.GetPropertyType(propertyName);
+                IDictionary matchingObjects = FindMatchingObjects(requiredType);
+                if (matchingObjects != null && matchingObjects.Count == 1)
+                {
+                    properties.Add(propertyName, ObjectUtils.EnumerateFirstElement(matchingObjects.Values));
+
+                    #region Instrumentation
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(
+                                string.Format(CultureInfo.InvariantCulture,
+                                              "Autowiring by type from object name '{0}' via property " + "'{1}' to object named '{2}'.", name,
+                                              propertyName, ObjectUtils.EnumerateFirstElement(matchingObjects.Keys)));
+                    }
+
+                    #endregion
+                }
+                else if (matchingObjects != null && matchingObjects.Count > 1)
+                {
+                    throw new UnsatisfiedDependencyException(string.Empty, name, propertyName,
+                                                             string.Format(CultureInfo.InvariantCulture,
+                                                                           "There are {0} objects of Type [{1}] for autowire by "
+                                                                           + "type, when there should have been just 1 to be able to "
+                                                                           + "autowire property '{2}' of object '{3}'.", matchingObjects.Count,
+                                                                           requiredType, propertyName, name));
+                }
+                else
+                {
+                    #region Instrumentation
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(
+                                string.Format(CultureInfo.InvariantCulture, "Not autowiring property '{0}' of object '{1}': no matching object found.",
+                                              propertyName, name));
+                    }
+
+                    #endregion
+                }
+            }
+        }
+
+        /// <summary>
+        /// Ignore the given dependency type for autowiring
+        /// </summary>
+        /// <remarks>
+        /// This will typically be used by application contexts to register
+        /// dependencies that are resolved in other ways, like IOjbectFactory through
+        /// IObjectFactoryAware or IApplicationContext through IApplicationContextAware.
+        /// By default, IObjectFactoryAware and IObjectName interfaces are ignored.
+        /// For further types to ignore, invoke this method for each type.
+        /// </remarks>
+        /// <seealso cref="Spring.Objects.Factory.Config.IConfigurableObjectFactory.IgnoreDependencyType"/>.
+        public void IgnoreDependencyInterface(Type type)
+        {
+            ignoredDependencyInterfaces.Add(type);
+        }
+
+        /// <summary>
+        /// Create an object instance for the given object definition.
+        /// </summary>
+        /// <param name="name">The name of the object.</param>
+        /// <param name="definition">
+        /// The object definition for the object that is to be instantiated.
+        /// </param>
+        /// <param name="arguments">
+        /// The arguments to use if creating a prototype using explicit arguments to
+        /// a static factory method. It is invalid to use a non-<see langword="null"/> arguments value
+        /// in any other case.
+        /// </param>
+        /// <returns>
+        /// A new instance of the object.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        /// <remarks>
+        /// <p>
+        /// Delegates to the
+        /// <see cref="Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.CreateObject (string,RootObjectDefinition,object[],bool)"/>
+        /// method version with the <c>allowEagerCaching</c> parameter set to <b>true</b>.
+        /// </p>
+        /// <p>
+        /// The object definition will already have been merged with the parent
+        /// definition in case of a child definition.
+        /// </p>
+        /// <p>
+        /// All the other methods in this class invoke this method, although objects
+        /// may be cached after being instantiated by this method. All object
+        /// instantiation within this class is performed by this method.
+        /// </p>
+        /// </remarks>
+        protected override object CreateObject(string name, RootObjectDefinition definition, object[] arguments)
+        {
+            return CreateObject(name, definition, arguments, true);
+        }
+
+        /// <summary>
+        /// Create an object instance for the given object definition.
+        /// </summary>
+        /// <param name="name">The name of the object.</param>
+        /// <param name="definition">
+        /// The object definition for the object that is to be instantiated.
+        /// </param>
+        /// <param name="arguments">
+        /// The arguments to use if creating a prototype using explicit arguments to
+        /// a static factory method. It is invalid to use a non-<see langword="null"/> arguments value
+        /// in any other case.
+        /// </param>
+        /// <param name="allowEagerCaching">
+        /// Whether eager caching of singletons is allowed... typically true for
+        /// singlton objects, but never true for inner object definitions.
+        /// </param>
+        /// <returns>
+        /// A new instance of the object.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        /// <remarks>
+        /// <p>
+        /// The object definition will already have been merged with the parent
+        /// definition in case of a child definition.
+        /// </p>
+        /// <p>
+        /// All the other methods in this class invoke this method, although objects
+        /// may be cached after being instantiated by this method. All object
+        /// instantiation within this class is performed by this method.
+        /// </p>
+        /// </remarks>
+        protected virtual object CreateObject(string name, RootObjectDefinition definition, object[] arguments, bool allowEagerCaching)
+        {
+            // guarantee the initialization of objects that the current one depends on..
+            if (definition.DependsOn != null && definition.DependsOn.Length > 0)
+            {
+                foreach (string dependant in definition.DependsOn)
+                {
+                    GetObject(dependant);
+                }
+            }
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(string.Format(CultureInfo.InvariantCulture, "Creating instance of Object '{0}' with merged definition [{1}].", name, definition));
+            }
+
+            #endregion
+
+            // Make sure object type is actually resolved at this point.
+            ResolveObjectType(definition, name);
+
+            try
+            {
+                definition.PrepareMethodOverrides();
+            }
+            catch (ObjectDefinitionValidationException ex)
+            {
+                throw new ObjectDefinitionStoreException(definition.ResourceDescription, name,
+                                                         "Validation of method overrides failed.  " + ex.Message, ex);
+            }
+
+            // return IObjectDefinition instance itself for an abstract object-definition
+            if (definition.IsTemplate)
+            {
+                return definition;
+            }
+
+
+
+            object instance = null;
+
+
+            IObjectWrapper instanceWrapper = null;
+            bool eagerlyCached = false;
+            try
+            {
+                // Give IInstantiationAwareObjectPostProcessors a chance to return a proxy instead of the target instance....
+                if (definition.HasObjectType)
+                {
+                    instance = ApplyObjectPostProcessorsBeforeInstantiation(definition.ObjectType, name);
+                    if (instance != null)
+                    {
+                        return instance;
+                    }
+                }
+
+
+                instanceWrapper = CreateObjectInstance(name, definition, arguments);
+                instance = instanceWrapper.WrappedInstance;
+
+                // eagerly cache singletons to be able to resolve circular references
+                // even when triggered by lifecycle interfaces like IObjectFactoryAware.
+                if (allowEagerCaching && definition.IsSingleton)
+                {
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug("Eagerly caching object '" + name + "' to allow for resolving potential circular references");
+                    }
+                    AddEagerlyCachedSingleton(name, definition, instance);
+                    eagerlyCached = true;
+                }
+
+                instance = ConfigureObject(name, definition, instanceWrapper);
+            }
+            catch (ObjectCreationException)
+            {
+                if (eagerlyCached)
+                {
+                    RemoveEagerlyCachedSingleton(name, definition);
+                }
+                throw;
+            }
+            catch (Exception ex)
+            {
+                if (eagerlyCached)
+                {
+                    RemoveEagerlyCachedSingleton(name, definition);
+                }
+                throw new ObjectCreationException(definition.ResourceDescription, name, "Initialization of object failed : " + ex.Message, ex);
+            }
+            return instance;
+        }
+
+        /// <summary>
+        /// Add the created, but yet unpopulated singleton to the singleton cache
+        /// to be able to resolve circular references
+        /// </summary>
+        /// <param name="objectName">the name of the object to add to the cache.</param>
+        /// <param name="objectDefinition">the definition used to create and populated the object.</param>
+        /// <param name="rawSingletonInstance">the raw object instance.</param>
+        /// <remarks>
+        /// Derived classes may override this method to select the right cache based on the object definition.
+        /// </remarks>
+        protected virtual void AddEagerlyCachedSingleton(string objectName, IObjectDefinition objectDefinition, object rawSingletonInstance)
+        {
+            base.AddSingleton(objectName, rawSingletonInstance);
+        }
+
+        /// <summary>
+        /// Remove the specified singleton from the singleton cache that has 
+        /// been added before by a call to <see cref="AddEagerlyCachedSingleton"/>
+        /// </summary>
+        /// <param name="objectName">the name of the object to remove from the cache.</param>
+        /// <param name="objectDefinition">the definition used to create and populated the object.</param>
+        /// <remarks>
+        /// Derived classes may override this method to select the right cache based on the object definition.
+        /// </remarks>
+        protected virtual void RemoveEagerlyCachedSingleton(string objectName, IObjectDefinition objectDefinition)
+        {
+            base.RemoveSingleton(objectName);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="IObjectWrapper"/> instance from the <see cref="RootObjectDefinition"/> passed in <paramref name="definition"/>
+        /// using constructor <paramref name="arguments"/>
+        /// </summary>
+        /// <param name="name">The name of the object to create - used for error messages.</param>
+        /// <param name="definition">The <see cref="RootObjectDefinition"/> describing the object to be created.</param>
+        /// <param name="arguments">optional arguments to pass to the constructor</param>
+        /// <returns>An <see cref="IObjectWrapper"/> wrapping the already instantiated object</returns>
+        protected IObjectWrapper CreateObjectInstance(string name, RootObjectDefinition definition, object[] arguments)
+        {
+            IObjectWrapper instanceWrapper;
+            if (StringUtils.HasText(definition.FactoryMethodName))
+            {
+                instanceWrapper = InstantiateUsingFactoryMethod(name, definition, arguments);
+            }
+            //Handle case when arguments are passed in explicitly.
+            else if (arguments != null && arguments.Length > 0)
+            {
+                instanceWrapper = AutowireConstructor(name, definition, arguments);
+            }
+            else if (definition.ResolvedAutowireMode == AutoWiringMode.Constructor ||
+                     definition.HasConstructorArgumentValues)
+            {
+                instanceWrapper = AutowireConstructor(name, definition);
+            }
+            else
+            {
+                instanceWrapper = new ObjectWrapper(InstantiationStrategy.Instantiate(definition, name, this));
+                InitObjectWrapper(instanceWrapper);
+            }
+            return instanceWrapper;
+        }
+
+        /// <summary>
+        /// Instantiate an object instance using a named factory method.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The method may be static, if the <paramref name="definition"/>
+        /// parameter specifies a class, rather than a
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/> instance, or an
+        /// instance variable on a factory object itself configured using Dependency
+        /// Injection.
+        /// </p>
+        /// <p>
+        /// Implementation requires iterating over the static or instance methods
+        /// with the name specified in the supplied <paramref name="definition"/>
+        /// (the method may be overloaded) and trying to match with the parameters.
+        /// We don't have the types attached to constructor args, so trial and error
+        /// is the only way to go here.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">
+        /// The name associated with the supplied <paramref name="definition"/>.
+        /// </param>
+        /// <param name="definition">
+        /// The definition describing the instance that is to be instantiated.
+        /// </param>
+        /// <param name="arguments">
+        /// Any arguments to the factory method that is to be invoked.
+        /// </param>
+        /// <returns>
+        /// The result of the factory method invocation (the instance).
+        /// </returns>
+        protected virtual IObjectWrapper InstantiateUsingFactoryMethod(string name, RootObjectDefinition definition, object[] arguments)
+        {
+            ConstructorArgumentValues cargs = definition.ConstructorArgumentValues;
+            ConstructorArgumentValues resolvedValues = new ConstructorArgumentValues();
+            int expectedArgCount = 0;
+
+            // we don't have arguments passed in programmatically, so we need to resolve the
+            // arguments specified in the constructor arguments held in the object definition...
+            if (arguments == null || arguments.Length == 0)
+            {
+                expectedArgCount = cargs.ArgumentCount;
+                ResolveConstructorArguments(name, definition, resolvedValues);
+            }
+            else
+            {
+                // if we have constructor args, don't need to resolve them...
+                expectedArgCount = arguments.Length;
+            }
+            ObjectWrapper wrapper = new ObjectWrapper();
+            InitObjectWrapper(wrapper);
+            bool isStatic = true;
+            Type factoryClass = null;
+            if (StringUtils.HasText(definition.FactoryObjectName))
+            {
+                // it's an instance method on the factory object's class...
+                factoryClass = GetObject(definition.FactoryObjectName).GetType();
+                isStatic = false;
+            }
+            else
+            {
+                // it's a static factory method on the object class...
+                factoryClass = definition.ObjectType;
+            }
+
+#if NET_2_0
+            GenericArgumentsHolder genericArgsInfo = new GenericArgumentsHolder(definition.FactoryMethodName);
+
+            MethodInfo[] factoryMethods = FindMethods(genericArgsInfo.GenericMethodName, expectedArgCount, isStatic, factoryClass);
+            UnsatisfiedDependencyExceptionData unsatisfiedDependencyExceptionData = null;
+            // try all matching methods to see if they match the constructor arguments...
+            for (int i = 0; i < factoryMethods.Length; i++)
+            {
+                unsatisfiedDependencyExceptionData = null;
+                MethodInfo factoryMethod = factoryMethods[i];
+
+                if (genericArgsInfo.ContainsGenericArguments)
+                {
+                    string[] unresolvedGenericArgs = genericArgsInfo.GetGenericArguments();
+                    if (factoryMethod.GetGenericArguments().Length != unresolvedGenericArgs.Length)
+                        continue;
+
+                    Type[] genericArgs = new Type[unresolvedGenericArgs.Length];
+                    for (int j = 0; j < unresolvedGenericArgs.Length; j++)
+                    {
+                        genericArgs[j] = TypeResolutionUtils.ResolveType(unresolvedGenericArgs[j]);
+                    }
+                    factoryMethod = factoryMethod.MakeGenericMethod(genericArgs);
+                }
+#else
+            MethodInfo[] factoryMethods = FindMethods(definition.FactoryMethodName, expectedArgCount, isStatic, factoryClass);
+            UnsatisfiedDependencyExceptionData unsatisfiedDependencyExceptionData = null;            
+            // try all matching methods to see if they match the constructor arguments...
+            foreach(MethodInfo factoryMethod in factoryMethods)
+            {
+#endif
+                if (arguments == null || arguments.Length == 0)
+                {
+                    // try to create the required arguments...
+                    arguments = CreateArgumentArray(name, definition, resolvedValues, factoryMethod, out unsatisfiedDependencyExceptionData);
+                    if (arguments == null)
+                    {
+                        // if we failed to match this method, keep
+                        // trying new overloaded factory methods...
+                        continue;
+                    }
+                }
+                // if we get here, we found a factory method...
+
+                if (ReflectionUtils.GetMethodByArgumentValues(new MethodInfo[] { factoryMethod }, arguments) == null)
+                {
+                    continue;
+                }
+
+
+                object objectInstance = InstantiationStrategy.Instantiate(definition, name, this, factoryMethod, arguments);
+                wrapper.WrappedInstance = objectInstance;
+
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(string.Format(CultureInfo.InvariantCulture, "Object '{0}' instantiated via factory method [{1}].", name, factoryMethod));
+                }
+
+                #endregion
+
+                return wrapper;
+            }
+
+
+
+            // if we get here, we didn't match any method...
+            throw new ObjectDefinitionStoreException(
+                    string.Format(CultureInfo.InvariantCulture, "Cannot find matching factory method '{0} on Type [{1}].", definition.FactoryMethodName,
+                                  factoryClass));
+        }
+
+        /// <summary>
+        /// Returns an array of all of those
+        /// <see cref="System.Reflection.MethodInfo">methods</see> exposed on the
+        /// <paramref name="searchType"/> that match the supplied criteria.
+        /// </summary>
+        /// <param name="methodName">
+        /// Methods that have this name (can be in the form of a regular expression).
+        /// </param>
+        /// <param name="expectedArgumentCount">
+        /// Methods that have exactly this many arguments.
+        /// </param>
+        /// <param name="isStatic">
+        /// Methods that are static / instance.
+        /// </param>
+        /// <param name="searchType">
+        /// The <see cref="System.Type"/> on which the methods (if any) are to be found.
+        /// </param>
+        /// <returns>
+        /// An array of all of those
+        /// <see cref="System.Reflection.MethodInfo">methods</see> exposed on the
+        /// <paramref name="searchType"/> that match the supplied criteria.
+        /// </returns>
+        private static MethodInfo[] FindMethods(string methodName, int expectedArgumentCount, bool isStatic, Type searchType)
+        {
+            ComposedCriteria methodCriteria = new ComposedCriteria();
+            methodCriteria.Add(new MethodNameMatchCriteria(methodName));
+            methodCriteria.Add(new MethodParametersCountCriteria(expectedArgumentCount));
+            BindingFlags methodFlags = BindingFlags.Public | BindingFlags.IgnoreCase | (isStatic ? BindingFlags.Static : BindingFlags.Instance);
+            MemberInfo[] methods =
+                    searchType.FindMembers(MemberTypes.Method, methodFlags, new MemberFilter(new CriteriaMemberFilter().FilterMemberByCriteria),
+                                           methodCriteria);
+            return (MethodInfo[])ArrayList.Adapter(methods).ToArray(typeof(MethodInfo));
+        }
+
+        /// <summary>
+        /// Create an array of arguments to invoke a constructor or static factory method,
+        /// given the resolved constructor arguments values.
+        /// </summary>
+        /// <remarks>When return value is null the out parameter UnsatisfiedDependencyExceptionData will contain
+        /// information for use in throwing a UnsatisfiedDependencyException by the caller.  This avoids using
+        /// exceptions for flow control as in the original implementation.</remarks>
+        private object[] CreateArgumentArray(string name, RootObjectDefinition definition,
+            ConstructorArgumentValues resolvedValues, MethodBase methodOrCtor, out UnsatisfiedDependencyExceptionData unsatisfiedDependencyExceptionData)
+        {
+            string methodType = (methodOrCtor is ConstructorInfo) ? "constructor" : "factory method";
+            unsatisfiedDependencyExceptionData = null;
+            ParameterInfo[] argTypes = methodOrCtor.GetParameters();
+            object[] args = new object[argTypes.Length];
+            ISet alreadyUsedValues = new HybridSet();
+            for (int j = 0; j < argTypes.Length; ++j)
+            {
+                Type parameterType = argTypes[j].ParameterType;
+                string parameterName = argTypes[j].Name;
+                ConstructorArgumentValues.ValueHolder valueHolder = null;
+                if (resolvedValues.GetNamedArgumentValue(parameterName) != null)
+                {
+                    valueHolder = resolvedValues.GetArgumentValue(parameterName, parameterType, alreadyUsedValues);
+                }
+                else
+                {
+                    valueHolder = resolvedValues.GetArgumentValue(j, parameterType, alreadyUsedValues);
+                }
+                if (valueHolder != null)
+                {
+                    try
+                    {
+                        args[j] = TypeConversionUtils.ConvertValueIfNecessary(parameterType, valueHolder.Value, null);
+                        alreadyUsedValues.Add(valueHolder);
+                    }
+                    catch (TypeMismatchException ex)
+                    {
+                        string errorMessage = String.Format(CultureInfo.InvariantCulture,
+                                                           "Could not convert {0} argument value [{1}] to required type [{2}] : {3}",
+                                                           methodType, valueHolder.Value,
+                                                           parameterType, ex.Message);
+                        unsatisfiedDependencyExceptionData = new UnsatisfiedDependencyExceptionData(j, parameterType, errorMessage);
+
+
+                        return null;
+                    }
+                }
+                else
+                {
+                    if (definition.ResolvedAutowireMode != AutoWiringMode.Constructor)
+                    {
+                        string errorMessage = String.Format(CultureInfo.InvariantCulture,
+                                                          "Ambiguous {0} argument types - " +
+                                                          "Did you specify the correct object references as {0} arguments?",
+                                                          methodType);
+                        unsatisfiedDependencyExceptionData = new UnsatisfiedDependencyExceptionData(j, parameterType, errorMessage);
+
+                        return null;
+                    }
+                    IDictionary matchingObjects = FindMatchingObjects(parameterType);
+                    if (matchingObjects == null || matchingObjects.Count != 1)
+                    {
+                        string errorMessage = String.Format(CultureInfo.InvariantCulture,
+                                                           "There are '{0}' objects of type [{1}] for autowiring "
+                                                           +
+                                                           "{2}. There should have been exactly 1 to be able to "
+                                                           +
+                                                           "autowire the '{3}' argument on the {2} of object '{4}'.",
+                                                           (matchingObjects == null
+                                                                ? 0
+                                                                : matchingObjects.Count),
+                                                           parameterType, methodType,
+                                                           parameterName, name);
+                        unsatisfiedDependencyExceptionData = new UnsatisfiedDependencyExceptionData(j, parameterType, errorMessage);
+
+                        return null;
+                    }
+                    DictionaryEntry entry = (DictionaryEntry)ObjectUtils.EnumerateFirstElement(matchingObjects);
+                    args[j] = entry.Value;
+
+                    #region Instrumentation
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(
+                                string.Format(CultureInfo.InvariantCulture,
+                                              "Autowiring '{0}' argument by type from object name '{1}' via {2} to "
+                                              + "object named '{3}'.", parameterName, name, methodType, entry.Key));
+                    }
+
+                    #endregion
+                }
+            }
+
+            return args;
+        }
+
+        /// <summary>
+        /// Explicitly construct the object using the supplied constructor arguments.
+        /// Constructor arguments are matched by type.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object to autowire by type.
+        /// </param>
+        /// <param name="definition">
+        /// The object definition to update through autowiring.
+        /// </param>
+        /// <param name="args">Array of constructor argument values.</param>
+        /// <returns>
+        /// An <see cref="Spring.Objects.IObjectWrapper"/> for the new instance.
+        /// </returns>
+        protected IObjectWrapper AutowireConstructor(string name, RootObjectDefinition definition, object[] args)
+        {
+            ConstructorArgumentValues resolvedValues = new ConstructorArgumentValues();
+            for (int i = 0; i < args.Length; i++)
+            {
+                //This is assigning ctor arguments by type.
+                resolvedValues.AddGenericArgumentValue(args[i]);
+            }
+            return AutowireConstructor(name, definition, resolvedValues);
+        }
+
+        /// <summary>
+        /// "autowire constructor" (with constructor arguments by type) behaviour.
+        /// </summary>
+        /// <remarks>Passes an empty collection of constructor argument values
+        /// to overloaded method.
+        /// </remarks>
+        /// <param name="name">
+        /// The name of the object to autowire by type.
+        /// </param>
+        /// <param name="definition">
+        /// The object definition to update through autowiring.
+        /// </param>
+        /// <returns>
+        /// An <see cref="Spring.Objects.IObjectWrapper"/> for the new instance.
+        /// </returns>
+        protected IObjectWrapper AutowireConstructor(string name, RootObjectDefinition definition)
+        {
+            return AutowireConstructor(name, definition, new ConstructorArgumentValues());
+        }
+
+        /// <summary>
+        /// "autowire constructor" (with constructor arguments by type) behaviour.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Also applied if explicit constructor argument values are specified,
+        /// matching all remaining arguments with objects from the object factory.
+        /// </p>
+        /// <p>
+        /// This corresponds to constructor injection: in this mode, a Spring.NET
+        /// object factory is able to host components that expect constructor-based
+        /// dependency resolution.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">
+        /// The name of the object to autowire by type.
+        /// </param>
+        /// <param name="definition">
+        /// The object definition to update through autowiring.
+        /// </param>
+        /// <param name="argumentValues">
+        /// The collection on constructor argument values.
+        /// </param>
+        /// <returns>
+        /// An <see cref="Spring.Objects.IObjectWrapper"/> for the new instance.
+        /// </returns>
+        protected IObjectWrapper AutowireConstructor(string name, RootObjectDefinition definition, ConstructorArgumentValues argumentValues)
+        {
+            int minNrOfArgs = ResolveConstructorArguments(name, definition, argumentValues);
+            ConstructorInfo[] constructors = AutowireUtils.GetConstructors(definition, minNrOfArgs);
+            if (constructors == null || constructors.Length == 0)
+            {
+                throw new ObjectCreationException(definition.ResourceDescription, name,
+                                                  string.Format(CultureInfo.InvariantCulture,
+                                                                "'{0}' constructor arguments specified but no matching constructor found "
+                                                                + "in object '{1}' (hint: specify argument indexes, names, or "
+                                                                + "types to avoid ambiguities).", minNrOfArgs, name));
+            }
+            ObjectWrapper wrapper = new ObjectWrapper();
+            InitObjectWrapper(wrapper);
+            ConstructorInfo constructorToUse = null;
+            object[] argsToUse = null;
+            int weighting = Int32.MaxValue;
+            UnsatisfiedDependencyExceptionData unsatisfiedDependencyExceptionData = null;
+            for (int i = 0; i < constructors.Length; ++i)
+            {
+                unsatisfiedDependencyExceptionData = null;
+                ConstructorInfo constructor = constructors[i];
+                if (constructorToUse != null &&
+                    constructorToUse.GetParameters().Length > constructor.GetParameters().Length)
+                {
+                    // already found greedy constructor that can be satisfied, so
+                    // don't look any further, there are only less greedy constructors left...
+                    break;
+                }
+
+                object[] args = CreateArgumentArray(name, definition, argumentValues, constructor, out unsatisfiedDependencyExceptionData);
+                if (args == null)
+                {
+                    if (i == constructors.Length - 1 && constructorToUse == null)
+                    {
+                        throw new UnsatisfiedDependencyException(definition.ResourceDescription,
+                                                                    name,
+                                                                    unsatisfiedDependencyExceptionData.ParameterIndex,
+                                                                    unsatisfiedDependencyExceptionData.ParameterType,
+                                                                    unsatisfiedDependencyExceptionData.ErrorMessage);
+                    }
+                    // try next constructor...
+                    continue;
+                }
+
+                int typeDiffWeight = AutowireUtils.GetTypeDifferenceWeight(constructor.GetParameters(), args);
+                if (typeDiffWeight < weighting)
+                {
+                    constructorToUse = constructor;
+                    argsToUse = args;
+                    weighting = typeDiffWeight;
+                }
+            }
+
+            if (constructorToUse == null)
+            {
+                throw new ObjectCreationException(definition.ResourceDescription, name, "Could not resolve matching constructor.");
+            }
+            wrapper.WrappedInstance = InstantiationStrategy.Instantiate(definition, name, this, constructorToUse, argsToUse);
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(string.Format(CultureInfo.InvariantCulture, "Object '{0}' instantiated via constructor [{1}].", name, constructorToUse));
+            }
+
+            #endregion
+
+            return wrapper;
+        }
+
+        /// <summary>
+        /// Resolves the <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+        /// of the supplied <paramref name="definition"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// 'Resolve' can be taken to mean that all of the <paramref name="definition"/>s
+        /// constructor arguments is resolved into a concrete object that can be plugged
+        /// into one of the <paramref name="definition"/>s constructors. Runtime object
+        /// references to other objects in this (or a parent) factory are resolved,
+        /// type conversion is performed, etc.
+        /// </p>
+        /// <p>
+        /// These resolved values are plugged into the supplied
+        /// <paramref name="resolvedValues"/> object, because we wouldn't want to touch
+        /// the <paramref name="definition"/>s constructor arguments in case it (or any of
+        /// its constructor arguments) is a prototype object definition.
+        /// </p>
+        /// <p>
+        /// This method is also used for handling invocations of static factory methods.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">
+        /// The name of the object that is being resolved by this factory.
+        /// </param>
+        /// <param name="definition">
+        /// The definition associated with the above <paramref name="name"/>.
+        /// </param>
+        /// <param name="resolvedValues">
+        /// Where the resolved constructor arguments will be placed.
+        /// </param>
+        /// <returns>
+        /// The minimum number of arguments that any constructor for the supplied
+        /// <paramref name="definition"/> must have.
+        /// </returns>
+        private int ResolveConstructorArguments(string name, RootObjectDefinition definition, ConstructorArgumentValues resolvedValues)
+        {
+            int minNrOfArgs = 0;
+            if (definition.ConstructorArgumentValues != null)
+            {
+                minNrOfArgs = definition.ConstructorArgumentValues.ArgumentCount;
+                foreach (DictionaryEntry de in definition.ConstructorArgumentValues.IndexedArgumentValues)
+                {
+                    int index = (int)de.Key;
+                    if (index < 0)
+                    {
+                        throw new ObjectCreationException(definition.ResourceDescription, name, "Invalid constructor argument index: " + index);
+                    }
+                    if (index > minNrOfArgs)
+                    {
+                        minNrOfArgs = index + 1;
+                    }
+                    string argName = "constructor argument with index " + index;
+                    ConstructorArgumentValues.ValueHolder valueHolder = (ConstructorArgumentValues.ValueHolder)de.Value;
+                    object resolvedValue = ResolveValueIfNecessary(name, definition, argName, valueHolder.Value);
+                    resolvedValues.AddIndexedArgumentValue(index, resolvedValue,
+                        StringUtils.HasText(valueHolder.Type)
+                            ? TypeResolutionUtils.ResolveType(valueHolder.Type).AssemblyQualifiedName
+                            : null);
+                }
+                foreach (ConstructorArgumentValues.ValueHolder valueHolder in definition.ConstructorArgumentValues.GenericArgumentValues)
+                {
+                    string argName = "constructor argument";
+                    object resolvedValue = ResolveValueIfNecessary(name, definition, argName, valueHolder.Value);
+                    resolvedValues.AddGenericArgumentValue(resolvedValue,
+                        StringUtils.HasText(valueHolder.Type)
+                            ? TypeResolutionUtils.ResolveType(valueHolder.Type).AssemblyQualifiedName
+                            : null);
+                }
+                foreach (DictionaryEntry namedArgumentEntry in definition.ConstructorArgumentValues.NamedArgumentValues)
+                {
+                    string argumentName = (string)namedArgumentEntry.Key;
+                    string syntheticArgumentName = "constructor argument with name " + argumentName;
+                    ConstructorArgumentValues.ValueHolder valueHolder = (ConstructorArgumentValues.ValueHolder)namedArgumentEntry.Value;
+                    object resolvedValue = ResolveValueIfNecessary(name, definition, syntheticArgumentName, valueHolder.Value);
+                    resolvedValues.AddNamedArgumentValue(argumentName, resolvedValue);
+                }
+            }
+            return minNrOfArgs;
+        }
+
+        /// <summary>
+        /// Perform a dependency check that all properties exposed have been set, if desired.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Dependency checks can be objects (collaborating objects), simple (primitives
+        /// and <see cref="System.String"/>), or all (both).
+        /// </p>
+        /// </remarks>
+        /// <param name="name">
+        /// The name of the object.
+        /// </param>
+        /// <param name="definition">
+        /// The definition of the named object.
+        /// </param>
+        /// <param name="wrapper">
+        /// The <see cref="Spring.Objects.IObjectWrapper"/> wrapping the target object.
+        /// </param>
+        /// <param name="properties">
+        /// The property values to be checked.
+        /// </param>
+        /// <exception cref="Spring.Objects.Factory.UnsatisfiedDependencyException">
+        /// If all of the checked dependencies were not satisfied.
+        /// </exception>
+        protected void DependencyCheck(string name, IConfigurableObjectDefinition definition, IObjectWrapper wrapper, IPropertyValues properties)
+        {
+            DependencyCheckingMode dependencyCheck = definition.DependencyCheck;
+            if (dependencyCheck == DependencyCheckingMode.None)
+            {
+                return;
+            }
+
+            PropertyInfo[] filteredPropInfo = FilterPropertyInfoForDependencyCheck(wrapper);
+            if (HasInstantiationAwareBeanPostProcessors)
+            {
+                foreach (IObjectPostProcessor processor in ObjectPostProcessors)
+                {
+                    IInstantiationAwareObjectPostProcessor inProc = processor as IInstantiationAwareObjectPostProcessor;
+                    if (inProc != null)
+                    {
+                        properties =
+                            inProc.PostProcessPropertyValues(properties, filteredPropInfo, wrapper.WrappedInstance, name);
+                        if (properties == null)
+                        {
+                            return;
+                        }
+                    }
+                }
+            }
+
+
+            CheckDependencies(name, definition, filteredPropInfo, properties);
+        }
+
+        private static void CheckDependencies(string name, IConfigurableObjectDefinition definition, PropertyInfo[] filteredPropInfo, IPropertyValues properties)
+        {
+            DependencyCheckingMode dependencyCheck = definition.DependencyCheck;
+            foreach (PropertyInfo property in filteredPropInfo)
+            {
+                if (property.CanWrite && properties.GetPropertyValue(property.Name) == null)
+                {
+                    bool isSimple = ObjectUtils.IsSimpleProperty(property.PropertyType);
+                    bool unsatisfied = (dependencyCheck == DependencyCheckingMode.All) || (isSimple && dependencyCheck == DependencyCheckingMode.Simple)
+                                       || (!isSimple && dependencyCheck == DependencyCheckingMode.Objects);
+                    if (unsatisfied)
+                    {
+                        throw new UnsatisfiedDependencyException(definition.ResourceDescription, name, property.Name,
+                            "Set this property value or disable dependency checking for this object.");
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Extract a filtered set of PropertyInfos from the given IObjectWrapper, excluding
+        /// ignored dependency types.
+        /// </summary>
+        /// <param name="wrapper">The object wrapper the object was created with.</param>
+        /// <returns>The filtered PropertyInfos</returns>
+        private PropertyInfo[] FilterPropertyInfoForDependencyCheck(IObjectWrapper wrapper)
+        {
+            lock (filteredPropertyDescriptorsCache)
+            {
+                PropertyInfo[] filtered = (PropertyInfo[])filteredPropertyDescriptorsCache[wrapper.WrappedType];
+                if (filtered == null)
+                {
+
+                    ArrayList list = new ArrayList(wrapper.GetPropertyInfos());
+                    for (int i = list.Count - 1; i >= 0; i--)
+                    {
+                        PropertyInfo pi = (PropertyInfo)list[i];
+                        if (IsExcludedFromDependencyCheck(pi))
+                        {
+                            list.RemoveAt(i);
+                        }
+                    }
+
+                    filtered = (PropertyInfo[])list.ToArray(typeof(PropertyInfo));
+                    filteredPropertyDescriptorsCache.Add(wrapper.WrappedType, filtered);
+                }
+                return filtered;
+            }
+
+        }
+
+        private bool IsExcludedFromDependencyCheck(PropertyInfo pi)
+        {
+            bool b1 = !pi.CanWrite; //AutowireUtils.IsExcludedFromDependencyCheck(pi);
+            bool b2 = IgnoredDependencyTypes.Contains(pi.PropertyType);
+            bool b3 = AutowireUtils.IsSetterDefinedInInterface(pi, ignoredDependencyInterfaces);
+            return b1 || b2 || b3;
+            /*
+            return AutowireUtils.IsExcludedFromDependencyCheck(pi) ||
+                   IgnoredDependencyTypes.Contains(pi.PropertyType) ||
+                   AutowireUtils.IsSetterDefinedInInterface(pi, ignoredDependencyInterfaces);
+             */
+        }
+
+        /// <summary>
+        /// Give an object a chance to react now all its properties are set,
+        /// and a chance to know about its owning object factory (this object).
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This means checking whether the object implements
+        /// <see cref="Spring.Objects.Factory.IInitializingObject"/> and  / or
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>, and invoking the
+        /// necessary callback(s) if it does.
+        /// </p>
+        /// <p>
+        /// Custom init methods are resolved in a <b>case-insensitive</b> manner.
+        /// </p>
+        /// </remarks>
+        /// <param name="target">
+        /// The new object instance we may need to initialise.
+        /// </param>
+        /// <param name="name">
+        /// The name the object has in the factory. Used for logging output.
+        /// </param>
+        /// <param name="definition">
+        /// The definition of the target object instance.
+        /// </param>
+        protected virtual void InvokeInitMethods(object target, string name, IConfigurableObjectDefinition definition)
+        {
+            if (ObjectUtils.IsAssignableAndNotTransparentProxy(typeof(IInitializingObject), target))
+            {
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(string.Format(CultureInfo.InvariantCulture, "Calling AfterPropertiesSet() on object with name '{0}'.", name));
+                }
+
+                #endregion
+
+                ((IInitializingObject)target).AfterPropertiesSet();
+            }
+            if (StringUtils.HasText(definition.InitMethodName))
+            {
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(
+                            string.Format(CultureInfo.InvariantCulture, "Calling custom init method '{0} on object with name '{1}'.",
+                                          definition.InitMethodName, name));
+                }
+
+                #endregion
+
+                try
+                {
+                    MethodInfo targetMethod = target.GetType().GetMethod(definition.InitMethodName, MethodResolutionFlags, null, Type.EmptyTypes, null);
+                    if (targetMethod == null)
+                    {
+                        throw new ObjectCreationException(definition.ResourceDescription, name,
+                                                          "Could not find the named initialization method '" + definition.InitMethodName + "'.");
+                    }
+                    targetMethod.Invoke(target, ObjectUtils.EmptyObjects);
+                }
+                catch (TargetInvocationException ex)
+                {
+                    throw new ObjectCreationException(definition.ResourceDescription, name,
+                                                      "Initialization method '" + definition.InitMethodName + "' threw exception", ex.GetBaseException());
+                }
+                catch (Exception ex)
+                {
+                    throw new ObjectCreationException(definition.ResourceDescription, name,
+                                                      "Invocation of initialization method '" + definition.InitMethodName + "' failed", ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Invoke the specified custom destroy method on the given object.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation invokes a no-arg method if found, else checking
+        /// for a method with a single boolean argument (passing in "true",
+        /// assuming a "force" parameter), else logging an error.
+        /// </p>
+        /// <p>
+        /// Can be overridden in subclasses for custom resolution of destroy
+        /// methods with arguments.
+        /// </p>
+        /// <p>
+        /// Custom destroy methods are resolved in a <b>case-insensitive</b> manner.
+        /// </p>
+        /// </remarks>
+        protected virtual void InvokeCustomDestroyMethod(string name, object target, string destroyMethodName)
+        {
+            bool usingForcingVersion = false;
+            MethodInfo targetMethod = target.GetType().GetMethod(destroyMethodName, MethodResolutionFlags, null, Type.EmptyTypes, null);
+            if (targetMethod == null)
+            {
+                // #%&^! try to find the method with a boolean "force" parameter
+                targetMethod = target.GetType().GetMethod(destroyMethodName, MethodResolutionFlags, null, new Type[] { typeof(bool) }, null);
+                if (targetMethod != null)
+                {
+                    usingForcingVersion = true;
+                }
+            }
+            if (targetMethod == null)
+            {
+                #region Instrumentation
+
+                log.Error("Couldn't find a method named '" + destroyMethodName + "' on object with name '" + name + "'");
+
+                #endregion
+            }
+            else
+            {
+                object[] args = usingForcingVersion ? new object[] { true } : ObjectUtils.EmptyObjects;
+                try
+                {
+                    targetMethod.Invoke(target, args);
+                }
+                catch (TargetInvocationException ex)
+                {
+                    #region Instrumentation
+
+                    log.Error("Couldn't invoke destroy method '" + destroyMethodName + "' of object with name '" + name + "'", ex.GetBaseException());
+
+                    #endregion
+                }
+                catch (Exception ex)
+                {
+                    LogExceptionRaisedByCustomDestroyMethodInvocation(destroyMethodName, name, ex);
+                }
+            }
+        }
+
+        private void LogExceptionRaisedByCustomDestroyMethodInvocation(string destroyMethodName, string name, Exception ex)
+        {
+            log.Error(
+                    string.Format(CultureInfo.InvariantCulture, "Couldn't invoke destroy method '{0}' of object with name '{1}'.", destroyMethodName, name),
+                    ex);
+        }
+
+        /// <summary>
+        /// Destroy the target object.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Must destroy objects that depend on the given object before the object itself.
+        /// Should not throw any exceptions.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">
+        /// The name of the object.
+        /// </param>
+        /// <param name="target">
+        /// The target object instance to destroyed.
+        /// </param>
+        protected override void DestroyObject(string name, object target)
+        {
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug("Destroying dependant objects for object '" + name + "'");
+            }
+
+            #endregion
+
+            DestroyDependantObjects(name);
+            if (target is IDisposable)
+            {
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(string.Format(CultureInfo.InvariantCulture, "Calling Dispose () on object with name '{0}'.", name));
+                }
+
+                #endregion
+
+                try
+                {
+                    ((IDisposable)target).Dispose();
+                }
+                catch (Exception ex)
+                {
+                    #region Instrumentation
+
+                    log.Error("Destroy() on object with name '" + name + "' threw an exception.", ex);
+
+                    #endregion
+                }
+            }
+            RootObjectDefinition rootDefinition = GetMergedObjectDefinition(name, false);
+            if (rootDefinition != null && StringUtils.HasText(rootDefinition.DestroyMethodName))
+            {
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug("Calling custom destroy method '" + rootDefinition.DestroyMethodName + "' on object with name '" + name + "'.");
+                }
+
+                #endregion
+
+                InvokeCustomDestroyMethod(name, target, rootDefinition.DestroyMethodName);
+            }
+        }
+
+        /// <summary>
+        /// Destroys all of the objects registered as dependant on the 
+        /// object (definition) identified by the supplied <paramref name="name"/>. 
+        /// </summary>
+        /// <param name="name">
+        /// The name of the root object (definition) that is itself being destroyed.
+        /// </param>
+        private void DestroyDependantObjects(string name)
+        {
+            string[] dependingObjects = GetDependingObjectNames(name);
+            foreach (string doName in dependingObjects)
+            {
+                DestroySingleton(doName);
+            }
+        }
+
+        /// <summary>
+        /// Given a property value, return a value, resolving any references to other
+        /// objects in the factory if necessary.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The value could be :
+        /// <list type="bullet">
+        /// <item>
+        /// <p>
+        /// An <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>,
+        /// which leads to the creation of a corresponding new object instance.
+        /// Singleton flags and names of such "inner objects" are always ignored: inner objects
+        /// are anonymous prototypes.
+        /// </p>
+        /// </item>
+        /// <item>
+        /// <p>
+        /// A <see cref="Spring.Objects.Factory.Config.RuntimeObjectReference"/>, which must
+        /// be resolved.
+        /// </p>
+        /// </item>
+        /// <item>
+        /// <p>
+        /// An <see cref="Spring.Objects.Factory.Support.IManagedCollection"/>. This is a
+        /// special placeholder collection that may contain
+        /// <see cref="Spring.Objects.Factory.Config.RuntimeObjectReference"/>s or
+        /// collections that will need to be resolved.
+        /// </p>
+        /// </item>
+        /// <item>
+        /// <p>
+        /// An ordinary object or <see langword="null"/>, in which case it's left alone.
+        /// </p>
+        /// </item>
+        /// </list>
+        /// </p>
+        /// </remarks>
+        /// <param name="name">
+        /// The name of the object that is having the value of one of its properties resolved.
+        /// </param>
+        /// <param name="definition">
+        /// The definition of the named object.
+        /// </param>
+        /// <param name="argumentName">
+        /// The name of the property the value of which is being resolved.
+        /// </param>
+        /// <param name="argumentValue">
+        /// The value of the property that is being resolved.
+        /// </param>
+        protected object ResolveValueIfNecessary(string name, RootObjectDefinition definition, string argumentName, object argumentValue)
+        {
+            object resolvedValue = null;
+            // we must check the argument value to see whether it requires a runtime
+            // reference to another object to be resolved.
+            // if it does, we'll attempt to instantiate the object and set the reference.
+            if (argumentValue is ObjectDefinitionHolder)
+            {
+                // contains an IObjectDefinition with name and aliases...
+                ObjectDefinitionHolder holder = (ObjectDefinitionHolder)argumentValue;
+                resolvedValue = ResolveInnerObjectDefinition(name, holder.ObjectName, argumentName, holder.ObjectDefinition, definition.IsSingleton);
+            }
+            else if (argumentValue is IObjectDefinition)
+            {
+                // resolve plain IObjectDefinition, without contained name: use dummy name... 
+                IObjectDefinition def = (IObjectDefinition)argumentValue;
+                resolvedValue = ResolveInnerObjectDefinition(name, "(inner object)", argumentName, def, definition.IsSingleton);
+
+            }
+            else if (argumentValue is RuntimeObjectReference)
+            {
+                RuntimeObjectReference roref = (RuntimeObjectReference)argumentValue;
+                resolvedValue = ResolveReference(definition, name, argumentName, roref);
+            }
+            else if (argumentValue is ExpressionHolder)
+            {
+                ExpressionHolder expHolder = (ExpressionHolder)argumentValue;
+                object context = null;
+                IDictionary variables = null;
+
+                if (expHolder.Properties != null)
+                {
+                    PropertyValue contextProperty = expHolder.Properties.GetPropertyValue("Context");
+                    context = contextProperty == null
+                                         ? null
+                                         : ResolveValueIfNecessary(name, definition, "Context",
+                                                                   contextProperty.Value);
+                    PropertyValue variablesProperty = expHolder.Properties.GetPropertyValue("Variables");
+                    object vars = (variablesProperty == null
+                                                   ? null
+                                                   : ResolveValueIfNecessary(name, definition, "Variables",
+                                                                             variablesProperty.Value));
+                    if (vars is IDictionary)
+                    {
+                        variables = (IDictionary)vars;
+                    }
+                    else
+                    {
+                        if (vars != null) throw new ArgumentException("'Variables' must resolve to an IDictionary");
+                    }
+                }
+
+                if (variables == null) variables = CollectionsUtil.CreateCaseInsensitiveHashtable();
+                // add 'this' objectfactory reference to variables
+                variables.Add(Expression.ReservedVariableNames.CurrentObjectFactory, this);
+
+                resolvedValue = expHolder.Expression.GetValue(context, variables);
+            }
+            else if (argumentValue is IManagedCollection)
+            {
+                resolvedValue =
+                        ((IManagedCollection)argumentValue).Resolve(name, definition, argumentName,
+                                                                     new ManagedCollectionElementResolver(ResolveValueIfNecessary));
+            }
+            else if (argumentValue is TypedStringValue)
+            {
+                TypedStringValue tsv = (TypedStringValue)argumentValue;
+                try
+                {
+                    Type resolvedTargetType = ResolveTargetType(tsv);
+                    if (resolvedTargetType != null)
+                    {
+                        resolvedValue = TypeConversionUtils.ConvertValueIfNecessary(tsv.TargetType, tsv.Value, null);
+                    }
+                    else
+                    {
+                        resolvedValue = tsv.Value;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    throw new ObjectCreationException(definition.ResourceDescription, name,
+                                                      "Error converted typed String value for " + argumentName, ex);
+                }
+
+            }
+            else
+            {
+                // no need to resolve value...
+                resolvedValue = argumentValue;
+            }
+            return resolvedValue;
+        }
+
+        /// <summary>
+        /// Resolve the target type of the passed <see cref="TypedStringValue"/>.
+        /// </summary>
+        /// <param name="value">The <see cref="TypedStringValue"/> who's target type is to be resolved</param>
+        /// <returns>The resolved target type, if any. <see lang="null" /> otherwise.</returns>
+        protected virtual Type ResolveTargetType(TypedStringValue value)
+        {
+            if (value.HasTargetType)
+            {
+                return value.TargetType;
+            }
+            else
+            {
+                return null;
+            }
+        }
+        /// <summary>
+        /// Resolves an inner object definition.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object that surrounds this inner object definition.
+        /// </param>
+        /// <param name="innerObjectName">
+        /// The name of the inner object definition... note: this is a synthetic
+        /// name assigned by the factory (since it makes no sense for inner object
+        /// definitions to have names).
+        /// </param>
+        /// <param name="argumentName">
+        /// The name of the property the value of which is being resolved.
+        /// </param>
+        /// <param name="definition">
+        /// The definition of the inner object that is to be resolved.
+        /// </param>
+        /// <param name="singletonOwner">
+        /// <see langword="true"/> if the owner of the property is a singleton.
+        /// </param>
+        /// <returns>
+        /// The resolved object as defined by the inner object definition.
+        /// </returns>
+        protected object ResolveInnerObjectDefinition(string name, string innerObjectName, string argumentName, IObjectDefinition definition,
+                                                      bool singletonOwner)
+        {
+            RootObjectDefinition mod = GetMergedObjectDefinition(innerObjectName, definition);
+            mod.IsSingleton = singletonOwner;
+            object instance;
+            object result;
+            try
+            {
+                instance = CreateObject(innerObjectName, mod, ObjectUtils.EmptyObjects, false);
+                result = GetObjectForInstance(innerObjectName, instance);
+            }
+            catch (ObjectsException ex)
+            {
+                throw ObjectCreationException.GetObjectCreationException(ex, name, argumentName, definition.ResourceDescription, innerObjectName);
+            }
+            if (singletonOwner && instance is IDisposable)
+            {
+                // keep a reference to the inner object instance, to be able to destroy
+                // it on factory shutdown...
+                _disposableInnerObjects.Add(instance);
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Resolve a reference to another object in the factory.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object that is having the value of one of its properties resolved.
+        /// </param>
+        /// <param name="definition">
+        /// The definition of the named object.
+        /// </param>
+        /// <param name="argumentName">
+        /// The name of the property the value of which is being resolved.
+        /// </param>
+        /// <param name="reference">
+        /// The runtime reference containing the value of the property.
+        /// </param>
+        /// <returns>A reference to another object in the factory.</returns>
+        protected object ResolveReference(IConfigurableObjectDefinition definition, string name, string argumentName, RuntimeObjectReference reference)
+        {
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(
+                        string.Format(CultureInfo.InvariantCulture, "Resolving reference from property '{0}' in object '{1}' to object '{2}'.",
+                                      argumentName, name, reference.ObjectName));
+            }
+
+            #endregion
+
+            try
+            {
+                if (reference.IsToParent)
+                {
+                    if (null == ParentObjectFactory)
+                    {
+                        throw new ObjectCreationException(definition.ResourceDescription, name,
+                                                          string.Format(
+                                                                  "Can't resolve reference to '{0}' in parent factory: " + "no parent factory available.",
+                                                                  reference.ObjectName));
+                    }
+                    return ParentObjectFactory.GetObject(reference.ObjectName);
+                }
+                return GetObject(reference.ObjectName);
+            }
+            catch (ObjectsException ex)
+            {
+                throw ObjectCreationException.GetObjectCreationException(ex, name, argumentName, definition.ResourceDescription, reference.ObjectName);
+            }
+        }
+
+        /// <summary>
+        /// Find object instances that match the required <see cref="System.Type"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Called by autowiring. If a subclass cannot obtain information about object
+        /// names by <see cref="System.Type"/>, a corresponding exception should be thrown.
+        /// </p>
+        /// </remarks>
+        /// <param name="requiredType">
+        /// The <see cref="System.Type"/> of the objects to look up.
+        /// </param>
+        /// <returns>
+        /// An <see cref="IDictionary"/> of object names and object
+        /// instances that match the required <see cref="System.Type"/>, or
+        /// <see langword="null"/> if none are found.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        protected abstract IDictionary FindMatchingObjects(Type requiredType);
+
+        /// <summary>
+        /// Return the names of the objects that depend on the given object.
+        /// Called by DestroyObject, to be able to destroy depending objects first.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object to find depending objects for.
+        /// </param>
+        /// <returns>
+        /// The array of names of depending objects, or the empty string array if none.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        protected abstract string[] GetDependingObjectNames(string name);
+
+        /// <summary>
+        /// Injects dependencies into the supplied <paramref name="target"/> instance
+        /// using the named object definition.
+        /// </summary>
+        /// <param name="target">
+        /// The object instance that is to be so configured.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object definition expressing the dependencies that are to
+        /// be injected into the supplied <parameref name="target"/> instance.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.ConfigureObject(object, string)"/>
+        public override object ConfigureObject(object target, string name)
+        {
+            RootObjectDefinition definition = GetMergedObjectDefinition(name, true);
+            if (definition != null)
+            {
+                return ConfigureObject(name, definition, new ObjectWrapper(target));
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Injects dependencies into the supplied <paramref name="target"/> instance
+        /// using the supplied <paramref name="definition"/>.
+        /// </summary>
+        /// <param name="target">
+        /// The object instance that is to be so configured.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object definition expressing the dependencies that are to
+        /// be injected into the supplied <parameref name="target"/> instance.
+        /// </param>
+        /// <param name="definition">
+        /// An object definition that should be used to configure object.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.ConfigureObject(object, string)"/>
+        public override object ConfigureObject(object target, string name, IObjectDefinition definition)
+        {
+            return ConfigureObject(name, new RootObjectDefinition(definition), new ObjectWrapper(target));
+        }
+
+        /// <summary>
+        /// Configures object instance by injecting dependencies, satisfying Spring lifecycle
+        /// interfaces and applying object post-processors.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object definition expressing the dependencies that are to
+        /// be injected into the supplied <parameref name="target"/> instance.
+        /// </param>
+        /// <param name="definition">
+        /// An object definition that should be used to configure object.
+        /// </param>
+        /// <param name="wrapper">
+        /// A wrapped object instance that is to be so configured.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.ConfigureObject(object, string)"/>
+        protected virtual object ConfigureObject(string name, RootObjectDefinition definition, IObjectWrapper wrapper)
+        {
+            object instance = wrapper.WrappedInstance;
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(string.Format("configuring object '{0}' using definition '{1}'", instance, name));
+            }
+
+            #endregion
+
+            PopulateObject(name, definition, wrapper);
+            WireEvents(name, definition, wrapper);
+
+            if (ObjectUtils.IsAssignableAndNotTransparentProxy(typeof(IObjectNameAware), instance))
+            {
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(string.Format(CultureInfo.InvariantCulture, "Setting the name property on the IObjectNameAware object '{0}'.", name));
+                }
+
+                #endregion
+
+                ((IObjectNameAware)instance).ObjectName = name;
+            }
+
+            if (ObjectUtils.IsAssignableAndNotTransparentProxy(typeof(IObjectFactoryAware), instance))
+            {
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(
+                            string.Format(CultureInfo.InvariantCulture, "Setting the ObjectFactory property on the IObjectFactoryAware object '{0}'.",
+                                          name));
+                }
+
+                #endregion
+
+                ((IObjectFactoryAware)instance).ObjectFactory = this;
+            }
+
+            instance = ApplyObjectPostProcessorsBeforeInitialization(instance, name);
+            InvokeInitMethods(instance, name, definition);
+            instance = ApplyObjectPostProcessorsAfterInitialization(instance, name);
+
+            return instance;
+        }
+
+
+        /// <summary>
+        /// Applies the <code>PostProcessAfterInitialization</code> callback of all
+        /// registered IObjectPostProcessors, giving them a chance to post-process
+        /// the object obtained from IFactoryObjects (for example, to auto-proxy them)
+        /// </summary>
+        /// <param name="instance">The instance obtained from the IFactoryObject.</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>The object instance to expose</returns>
+        /// <exception cref="ObjectsException">if any post-processing failed.</exception>
+        protected override object PostProcessObjectFromFactoryObject(object instance, string objectName)
+        {
+            return ApplyObjectPostProcessorsAfterInitialization(instance, objectName);
+        }
+
+        #endregion
+
+        #region IAutowireCapableObjectFactory Members
+
+        /// <summary>
+        /// Create a new object instance of the given class with the specified
+        /// autowire strategy.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> of the object to instantiate.
+        /// </param>
+        /// <param name="autowireMode">
+        /// The desired autowiring mode.
+        /// </param>
+        /// <param name="dependencyCheck">
+        /// Whether to perform a dependency check for objects (not applicable to
+        /// autowiring a constructor, thus ignored there).
+        /// </param>
+        /// <returns>The new object instance.</returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the wiring fails.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.Config.AutoWiringMode"/>
+        public virtual object Autowire(Type type, AutoWiringMode autowireMode, bool dependencyCheck)
+        {
+            RootObjectDefinition rod = new RootObjectDefinition(type, autowireMode, dependencyCheck);
+            if (rod.ResolvedAutowireMode == AutoWiringMode.Constructor)
+            {
+                return AutowireConstructor(type.Name, rod).WrappedInstance;
+            }
+            else
+            {
+                object obj = InstantiationStrategy.Instantiate(rod, string.Empty, this);
+                PopulateObject(obj.GetType().Name, rod, new ObjectWrapper(obj));
+                return obj;
+            }
+        }
+
+        /// <summary>
+        /// Autowire the object properties of the given object instance by name or
+        /// <see cref="System.Type"/>.
+        /// </summary>
+        /// <param name="instance">
+        /// The existing object instance.
+        /// </param>
+        /// <param name="autowireMode">
+        /// The desired autowiring mode.
+        /// </param>
+        /// <param name="dependencyCheck">
+        /// Whether to perform a dependency check for the object.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the wiring fails.
+        /// </exception>
+        /// <exception cref="System.ArgumentException">
+        /// If the supplied <paramref name="autowireMode"/> is not one of the
+        /// <seealso cref="Spring.Objects.Factory.Config.AutoWiringMode.ByName"/> or
+        /// <seealso cref="Spring.Objects.Factory.Config.AutoWiringMode.ByType"/>
+        /// values.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.Config.AutoWiringMode"/>
+        public virtual void AutowireObjectProperties(object instance, AutoWiringMode autowireMode, bool dependencyCheck)
+        {
+            if (autowireMode != AutoWiringMode.ByName && autowireMode != AutoWiringMode.ByType)
+            {
+                throw new ArgumentException("Just AutoWiringMode.ByName and AutoWiringMode.ByType allowed.");
+            }
+            RootObjectDefinition rod = new RootObjectDefinition(instance.GetType(), autowireMode, dependencyCheck);
+            PopulateObject(instance.GetType().Name, rod, new ObjectWrapper(instance));
+        }
+
+        /// <summary>
+        /// Apply <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+        /// to the given existing object instance, invoking their
+        /// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization"/>
+        /// methods.
+        /// </summary>
+        /// <param name="instance">
+        /// The existing object instance.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object.
+        /// </param>
+        /// <returns>
+        /// The object instance to use, either the original or a wrapped one.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If any post-processing failed.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization"/>
+        public virtual object ApplyObjectPostProcessorsBeforeInitialization(object instance, string name)
+        {
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug("Invoking IObjectPostProcessors before initialization of object '" + name + "'");
+            }
+
+            #endregion
+
+            object result = instance;
+            foreach (IObjectPostProcessor objectProcessor in ObjectPostProcessors)
+            {
+                result = objectProcessor.PostProcessBeforeInitialization(result, name);
+                if (result == null)
+                {
+                    throw new ObjectCreationException(name,
+                            string.Format(CultureInfo.InvariantCulture,
+                                          "PostProcessBeforeInitialization method of IObjectPostProcessor [{0}] "
+                                          + " returned null for object [{1}] with name '{2}'.", objectProcessor, instance, name));
+                }
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Apply <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+        /// to the given existing object instance, invoking their
+        /// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization"/>
+        /// methods.
+        /// </summary>
+        /// <param name="instance">
+        /// The existing object instance.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object.
+        /// </param>
+        /// <returns>
+        /// The object instance to use, either the original or a wrapped one.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If any post-processing failed.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization"/>
+        public virtual object ApplyObjectPostProcessorsAfterInitialization(object instance, string name)
+        {
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug("Invoking IObjectPostProcessors after initialization of object '" + name + "'");
+            }
+
+            #endregion
+
+            object result = instance;
+            foreach (IObjectPostProcessor objectProcessor in ObjectPostProcessors)
+            {
+                result = objectProcessor.PostProcessAfterInitialization(result, name);
+                if (result == null)
+                {
+                    throw new ObjectCreationException(name,
+                            string.Format(CultureInfo.InvariantCulture,
+                                          "PostProcessAfterInitialization method of IObjectPostProcessor [{0}] "
+                                          + " returned null for object [{1}] with name [{2}].", objectProcessor, instance, name));
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region Fields
+
+        /// <summary>
+        /// Set that holds all inner objects created by this factory that implement the IDisposable
+        /// interface, to be destroyed on call to Dispose.
+        /// </summary>
+        private ISet _disposableInnerObjects = new SynchronizedSet(new HybridSet());
+
+        private IInstantiationStrategy instantiationStrategy = new MethodInjectingInstantiationStrategy();
+
+        /// <summary>
+        /// Cache of unfinished IFactoryObject instances: IFactoryObject name --> IObjectWrapper */
+        /// </summary>
+        private IDictionary factoryObjectInstanceCache = new Hashtable();
+
+        /// <summary>
+        /// Cache of filtered PropertyInfos: object Type -> PropertyInfo array 
+        /// </summary>
+        private IDictionary filteredPropertyDescriptorsCache = new Hashtable();
+
+        /// <summary>
+        /// Dependency interfaces to ignore on dependency check and autowire, as Set of
+        /// Class objects. By default, only the IObjectFactoryAware and IObjectNameAware 
+        /// interfaces are ignored.
+        /// </summary>
+        private ISet ignoredDependencyInterfaces = new HybridSet();
+
+        #endregion
+    }
+
+    internal class UnsatisfiedDependencyExceptionData
+    {
+        private int parameterIndex;
+        private Type parameterType;
+        private string errorMessage;
+
+        public UnsatisfiedDependencyExceptionData(int parameterIndex, Type parameterType, string errorMessage)
+        {
+            this.parameterIndex = parameterIndex;
+            this.parameterType = parameterType;
+            this.errorMessage = errorMessage;
+        }
+
+        public int ParameterIndex
+        {
+            get { return parameterIndex; }
+        }
+
+        public Type ParameterType
+        {
+            get { return parameterType; }
+        }
+
+        public string ErrorMessage
+        {
+            get { return errorMessage; }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractMethodReplacer.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractMethodReplacer.cs
new file mode 100644
index 00000000..f1815983
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractMethodReplacer.cs
@@ -0,0 +1,128 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// An <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/>
+	/// implementation that provides some convenience support for
+	/// derived classes.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This class is reserved for internal use within the framework; it is
+	/// not intended to be used by application developers using Spring.NET.
+	/// </p>
+	/// </remarks>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: AbstractMethodReplacer.cs,v 1.3 2007/07/30 17:52:22 markpollack Exp $</version>
+	public abstract class AbstractMethodReplacer : IMethodReplacer
+	{
+		private IConfigurableObjectDefinition objectDefinition;
+		private IObjectFactory objectFactory;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="ArgumentNullException"/>
+		/// class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an <see lang="abstract"/> class, and as such has no
+		/// publicly visible constructors.
+		/// </p>
+		/// </remarks>
+		/// <param name="objectDefinition">
+		/// The object definition that is the target of the method replacement.
+		/// </param>
+		/// <param name="objectFactory">
+		/// The enclosing IoC container with which the above
+		/// <paramref name="objectDefinition"/> is associated.
+		/// </param>
+		/// <exception cref="AbstractMethodReplacer">
+		/// If either of the supplied arguments is <see langword="null"/>.
+		/// </exception>
+		protected AbstractMethodReplacer(
+            IConfigurableObjectDefinition objectDefinition, IObjectFactory objectFactory)
+		{
+			AssertUtils.ArgumentNotNull(objectDefinition, "objectDefinition");
+			AssertUtils.ArgumentNotNull(objectFactory, "objectFactory");
+			this.objectDefinition = objectDefinition;
+			this.objectFactory = objectFactory;
+		}
+
+		/// <summary>
+		/// Is <see lang="abstract"/>; derived classes must supply an implementation.
+		/// </summary>
+		/// <param name="target">
+		/// The instance whose <paramref name="method"/> is to be
+		/// (re)implemented.
+		/// </param>
+		/// <param name="method">
+		/// The method that is to be (re)implemented.
+		/// </param>
+		/// <param name="arguments">The target method's arguments.</param>
+		/// <returns>The result of the object lookup.</returns>
+		public abstract object Implement(object target, MethodInfo method, object[] arguments);
+
+		/// <summary>
+		/// Helper method for subclasses to retrieve the appropriate
+		/// <see cref="Spring.Objects.Factory.Support.MethodOverride"/> for the
+		/// supplied <paramref name="method"/>.  
+		/// </summary>
+		/// <param name="method">
+		/// The <see cref="System.Reflection.MethodInfo"/> to use to retrieve
+		/// the appropriate
+		/// <see cref="Spring.Objects.Factory.Support.MethodOverride"/>.
+		/// </param>
+		/// <returns>
+		/// The appropriate
+		/// <see cref="Spring.Objects.Factory.Support.MethodOverride"/>.
+		/// </returns>
+		protected MethodOverride GetOverride(MethodInfo method)
+		{
+			return this.objectDefinition.MethodOverrides.GetOverride(method);
+		}
+
+		/// <summary>
+		/// Helper method for subclasses to lookup an object from an enclosing
+		/// IoC container.
+		/// </summary>
+		/// <param name="objectName">
+		/// The name of the object that is to be looked up.
+		/// </param>
+		/// <returns>
+		/// The named object.
+		/// </returns>
+		protected object GetObject(string objectName)
+		{
+			return this.objectFactory.GetObject(objectName);
+		}
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinition.cs
new file mode 100644
index 00000000..54728959
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinition.cs
@@ -0,0 +1,747 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Reflection;
+using System.Text;
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Common base class for object definitions, factoring out common
+    /// functionality from
+    /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> and
+    /// <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/>.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: AbstractObjectDefinition.cs,v 1.31 2007/08/27 13:57:43 oakinger Exp $</version>
+    [Serializable]
+    public abstract class AbstractObjectDefinition : IConfigurableObjectDefinition
+    {
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition"/>
+        /// class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes no
+        /// public constructors.
+        /// </p>
+        /// </remarks>
+        protected AbstractObjectDefinition() : this(null, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition"/>
+        /// class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes no
+        /// public constructors.
+        /// </p>
+        /// </remarks>
+        protected AbstractObjectDefinition(ConstructorArgumentValues arguments, MutablePropertyValues properties)
+        {
+            constructorArgumentValues =
+                (arguments != null) ? arguments : new ConstructorArgumentValues();
+            propertyValues =
+                (properties != null) ? properties : new MutablePropertyValues();
+            eventHandlerValues = new EventValues();
+            DependsOn = StringUtils.EmptyStrings;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition"/>
+        /// class.
+        /// </summary>
+        /// <param name="other">
+        /// The object definition used to initialise the member fields of this
+        /// instance.
+        /// </param>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes no
+        /// public constructors.
+        /// </p>
+        /// </remarks>
+        protected AbstractObjectDefinition(IObjectDefinition other)
+        {
+            AssertUtils.ArgumentNotNull(other, "other");
+            AbstractObjectDefinition aod = other as AbstractObjectDefinition;
+            if (aod != null)
+            {
+                if (aod.HasObjectType)
+                {
+                    ObjectType = other.ObjectType;
+                }
+                else
+                {
+                    ObjectTypeName = other.ObjectTypeName;
+                }
+                MethodOverrides = new MethodOverrides(aod.MethodOverrides);
+                DependencyCheck = aod.DependencyCheck;
+            }
+            IsAbstract = other.IsAbstract;
+            IsSingleton = other.IsSingleton;
+            IsLazyInit = other.IsLazyInit;
+            ConstructorArgumentValues
+                = new ConstructorArgumentValues(other.ConstructorArgumentValues);
+            PropertyValues = new MutablePropertyValues(other.PropertyValues);
+            EventHandlerValues = new EventValues(other.EventHandlerValues);
+
+            InitMethodName = other.InitMethodName;
+            DestroyMethodName = other.DestroyMethodName;
+            DependsOn = new string[other.DependsOn.Length];
+            Array.Copy(other.DependsOn, DependsOn, other.DependsOn.Length);
+            FactoryMethodName = other.FactoryMethodName;
+            FactoryObjectName = other.FactoryObjectName;
+            AutowireMode = other.AutowireMode;
+            ResourceDescription = other.ResourceDescription;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The property values that are to be applied to the object
+        /// upon creation.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Setting the value of this property to <see langword="null"/>
+        /// will merely result in a new (and empty)
+        /// <see cref="Spring.Objects.MutablePropertyValues"/>
+        /// collection being assigned to the property value.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The property values (if any) for this object; may be an
+        /// empty collection but is guaranteed not to be
+        /// <see langword="null"/>.
+        /// </value>
+        public MutablePropertyValues PropertyValues
+        {
+            get { return propertyValues; }
+            set { propertyValues = value == null ? new MutablePropertyValues() : value; }
+        }
+
+        /// <summary>
+        /// Does this definition have any
+        /// <see cref="Spring.Objects.Factory.Support.MethodOverrides"/>?
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if this definition has at least one
+        /// <see cref="Spring.Objects.Factory.Support.MethodOverride"/>.
+        /// </value>
+        public bool HasMethodOverrides
+        {
+            get { return !MethodOverrides.IsEmpty; }
+        }
+
+        /// <summary>
+        /// The constructor argument values for this object.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Setting the value of this property to <see langword="null"/>
+        /// will merely result in a new (and empty)
+        /// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+        /// collection being assigned.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The constructor argument values (if any) for this object; may be an
+        /// empty collection but is guaranteed not to be
+        /// <see langword="null"/>.
+        /// </value>
+        public ConstructorArgumentValues ConstructorArgumentValues
+        {
+            get { return constructorArgumentValues; }
+            set { constructorArgumentValues = value == null ? new ConstructorArgumentValues() : value; }
+        }
+
+        /// <summary>
+        /// The event handler values for this object.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Setting the value of this property to <see langword="null"/>
+        /// will merely result in a new (and empty)
+        /// <see cref="Spring.Objects.Factory.Config.EventValues"/>
+        /// collection being assigned.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The event handler values (if any) for this object; may be an
+        /// empty collection but is guaranteed not to be
+        /// <see langword="null"/>.
+        /// </value>
+        public EventValues EventHandlerValues
+        {
+            get { return eventHandlerValues; }
+            set { eventHandlerValues = value == null ? new EventValues() : value; }
+        }
+
+        /// <summary>
+        /// The method overrides (if any) for this object.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Setting the value of this property to <see langword="null"/>
+        /// will merely result in a new (and empty)
+        /// <see cref="Spring.Objects.Factory.Support.MethodOverrides"/>
+        /// collection being assigned to the property value.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The method overrides (if any) for this object; may be an
+        /// empty collection but is guaranteed not to be
+        /// <see langword="null"/>.
+        /// </value>
+        public MethodOverrides MethodOverrides
+        {
+            get { return methodOverrides; }
+            set { methodOverrides = value == null ? new MethodOverrides() : value; }
+        }
+
+        /// <summary>
+        /// Is this definition a <b>singleton</b>, with
+        /// a single, shared instance returned on all calls to an enclosing
+        /// container (typically an
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> or
+        /// <see cref="Spring.Context.IApplicationContext"/>).
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If <see langword="false"/>, an object factory will apply the
+        /// <b>prototype</b> design pattern, with each caller requesting an
+        /// instance getting an independent instance. How this is defined
+        /// will depend on the object factory implementation. <b>singletons</b>
+        /// are the commoner type.
+        /// </p>
+        /// </remarks>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory"/>
+        public virtual bool IsSingleton
+        {
+            get { return isSingleton; }
+            set
+            {
+                isSingleton = value;
+                isPrototype = !value;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is prototype, with an independent instance
+        /// returned for each call.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance is prototype; otherwise, <c>false</c>.
+        /// </value>
+        public virtual bool IsPrototype
+        {
+            get { return isPrototype; }
+        }
+
+        /// <summary>
+        /// Is this object lazily initialized?</summary>
+        /// <remarks>
+        /// <p>
+        /// Only applicable to a singleton object.
+        /// </p>
+        /// <p>
+        /// If <see langword="false"/>, it will get instantiated on startup
+        /// by object factories that perform eager initialization of
+        /// singletons.
+        /// </p>
+        /// </remarks>
+        public bool IsLazyInit
+        {
+            get { return isLazyInit; }
+            set { isLazyInit = value; }
+        }
+
+        /// <summary>
+        /// Is this object definition a "template", i.e. not meant to be instantiated
+        /// itself but rather just serving as an object definition for configuration 
+        /// templates used by <see cref="Spring.Objects.Factory.IObjectFactory.ConfigureObject(object, string)"/>.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if this object definition is a "template".
+        /// </value>
+        public bool IsTemplate
+        {
+            get
+            {
+                return (
+                           isAbstract ||
+                           (objectType == null && StringUtils.IsNullOrEmpty(factoryObjectName))
+                       );
+            }
+        }
+
+        /// <summary>
+        /// Is this object definition "abstract", i.e. not meant to be
+        /// instantiated itself but rather just serving as a parent for concrete
+        /// child object definitions.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if this object definition is "abstract".
+        /// </value>
+        public bool IsAbstract
+        {
+            get { return isAbstract; }
+            set { isAbstract = value; }
+        }
+
+        /// <summary>
+        /// The <see cref="System.Type"/> of the object definition (if any).
+        /// </summary>
+        /// <value>
+        /// A resolved object <see cref="System.Type"/>.
+        /// </value>
+        /// <exception cref="ApplicationException">
+        /// If the <see cref="System.Type"/> of the object definition is not a
+        /// resolved <see cref="System.Type"/> or <see langword="null"/>.
+        /// </exception>
+        /// <seealso cref="AbstractObjectDefinition.HasObjectType"/>
+        public Type ObjectType
+        {
+            get
+            {
+                if (!HasObjectType)
+                {
+                    throw new ApplicationException(
+                        "Object definition does not carry a resolved System.Type");
+                }
+                return (Type) objectType;
+            }
+            set { objectType = value; }
+        }
+
+        /// <summary>
+        /// Is the <see cref="System.Type"/> of the object definition a resolved
+        /// <see cref="System.Type"/>?
+        /// </summary>
+        public bool HasObjectType
+        {
+            get { return objectType is Type; }
+        }
+
+        /// <summary>
+        /// Returns the <see cref="System.Type.FullName"/> of the
+        /// <see cref="System.Type"/> of the object definition (if any).
+        /// </summary>
+        public string ObjectTypeName
+        {
+            get
+            {
+                if (objectType is Type)
+                {
+                    return ((Type) objectType).FullName;
+                }
+                else
+                {
+                    return objectType as string;
+                }
+            }
+            set { objectType = value; }
+        }
+
+        /// <summary>
+        /// A description of the resource that this object definition
+        /// came from (for the purpose of showing context in case of errors).
+        /// </summary>
+        public string ResourceDescription
+        {
+            get { return resourceDescription; }
+            set { resourceDescription = value; }
+        }
+
+        /// <summary>
+        /// The autowire mode as specified in the object definition.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This determines whether any automagical detection and setting of
+        /// object references will happen. The default is
+        /// <see cref="Spring.Objects.Factory.Config.AutoWiringMode.No"/>,
+        /// which means that no autowiring will be performed.
+        /// </p>
+        /// </remarks>
+        public AutoWiringMode AutowireMode
+        {
+            get { return autowireMode; }
+            set { autowireMode = value; }
+        }
+
+        /// <summary>
+        /// Gets the resolved autowire mode.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This resolves
+        /// <see cref="Spring.Objects.Factory.Config.AutoWiringMode.AutoDetect"/>
+        /// to one of 
+        /// <see cref="Spring.Objects.Factory.Config.AutoWiringMode.Constructor"/>
+        /// or
+        /// <see cref="Spring.Objects.Factory.Config.AutoWiringMode.ByType"/>.
+        /// </p>
+        /// </remarks>
+        public AutoWiringMode ResolvedAutowireMode
+        {
+            get
+            {
+                if (AutowireMode == AutoWiringMode.AutoDetect)
+                {
+                    // Work out whether to apply setter autowiring or constructor autowiring.
+                    // If it has a no-arg constructor it's deemed to be setter autowiring,
+                    // otherwise we'll try constructor autowiring.
+                    ConstructorInfo[] constructors =
+                        ObjectType.GetConstructors();
+                    foreach (ConstructorInfo ctor in constructors)
+                    {
+                        if (ctor.GetParameters().Length == 0)
+                        {
+                            return AutoWiringMode.ByType;
+                        }
+                    }
+                    return AutoWiringMode.Constructor;
+                }
+                else
+                {
+                    return AutowireMode;
+                }
+            }
+        }
+
+        /// <summary>
+        /// The dependency checking mode.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The default is
+        /// <see cref="Spring.Objects.Factory.Support.DependencyCheckingMode.None"/>.
+        /// </p>
+        /// </remarks>
+        public DependencyCheckingMode DependencyCheck
+        {
+            get { return dependencyCheck; }
+            set { dependencyCheck = value; }
+        }
+
+        /// <summary>
+        /// The object names that this object depends on.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The object factory will guarantee that these objects get initialized
+        /// before this object definition.
+        /// </p>
+        /// <note>
+        /// Dependencies are normally expressed through object properties
+        /// or constructor arguments. This property should just be necessary for
+        /// other kinds of dependencies such as statics (*ugh*) or database
+        /// preparation on startup.
+        /// </note>
+        /// </remarks>
+        public string[] DependsOn
+        {
+            get { return dependsOn; }
+            set { dependsOn = value == null ? StringUtils.EmptyStrings : value; }
+        }
+
+        /// <summary>
+        /// The name of the initializer method.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The default value is the <see cref="String.Empty"/> constant,
+        /// in which case there is no initializer method.
+        /// </p>
+        /// </remarks>
+        public string InitMethodName
+        {
+            get { return initMethodName; }
+            set { initMethodName = value; }
+        }
+
+        /// <summary>
+        /// Return the name of the destroy method.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The default value is the <see cref="String.Empty"/> constant,
+        /// in which case there is no destroy method.
+        /// </p>
+        /// </remarks>
+        public string DestroyMethodName
+        {
+            get { return destroyMethodName; }
+            set { destroyMethodName = value; }
+        }
+
+        /// <summary>
+        /// The name of the factory method to use (if any).
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method will be invoked with constructor arguments, or with no
+        /// arguments if none are specified. The <see langword="static"/>
+        /// method will be invoked on the specified
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition.ObjectType"/>.
+        /// </p>
+        /// </remarks>
+        public string FactoryMethodName
+        {
+            get { return factoryMethodName; }
+            set { factoryMethodName = value; }
+        }
+
+        /// <summary>
+        /// The name of the factory object to use (if any).
+        /// </summary>
+        public string FactoryObjectName
+        {
+            get { return factoryObjectName; }
+            set { factoryObjectName = value; }
+        }
+
+        /// <summary>
+        /// Does this object definition have any constructor argument values?
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if his object definition has at least one
+        /// element in it's
+        /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.ConstructorArgumentValues"/>
+        /// property.
+        /// </value>
+        public virtual bool HasConstructorArgumentValues
+        {
+            get
+            {
+                return ConstructorArgumentValues != null
+                       && !ConstructorArgumentValues.Empty;
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Resolves the type of the object, resolving it from a specified
+        /// object type name if necessary. 
+        /// </summary>
+        /// <returns>
+        /// A resolved <see cref="System.Type"/> instance.
+        /// </returns>
+        /// <exception cref="System.TypeLoadException">
+        /// If the type cannot be resolved.
+        /// </exception>
+        public Type ResolveObjectType()
+        {
+            string typeName = ObjectTypeName;
+            if (typeName == null)
+            {
+                return null;
+            }
+            Type resolvedType = TypeResolutionUtils.ResolveType(typeName);
+            this.ObjectType = resolvedType;
+            return resolvedType;
+        }
+
+        /// <summary>
+        /// Validate this object definition.
+        /// </summary>
+        /// <exception cref="Spring.Objects.Factory.Support.ObjectDefinitionValidationException">
+        /// In the case of a validation failure.
+        /// </exception>
+        public virtual void Validate()
+        {
+            if (IsLazyInit && !IsSingleton)
+            {
+                throw new ObjectDefinitionValidationException(
+                    "Lazy initialization is only applicable to singleton objects.");
+            }
+            if (HasMethodOverrides && StringUtils.HasText(FactoryMethodName))
+            {
+                throw new ObjectDefinitionValidationException(
+                    "Cannot combine static factory method with method overrides: " +
+                    "the static factory method must create the instance.");
+            }
+            if (HasObjectType)
+            {
+                PrepareMethodOverrides();
+            }
+        }
+
+        /// <summary>
+        /// Validates all <see cref="MethodOverrides"/> 
+        /// </summary>
+        public virtual void PrepareMethodOverrides()
+        {
+            // ascertain that the various lookup methods exist...
+            foreach (MethodOverride mo in MethodOverrides.Overrides)
+            {
+                PrepareMethodOverride(mo);
+            }
+        }
+
+        /// <summary>
+        /// Validate the supplied <paramref name="methodOverride"/>.
+        /// </summary>
+        /// <param name="methodOverride">
+        /// The <see cref="Spring.Objects.Factory.Support.MethodOverride"/>
+        /// to be validated.
+        /// </param>
+        protected void PrepareMethodOverride(MethodOverride methodOverride)
+        {
+            if (!ReflectionUtils.HasAtLeastOneMethodWithName(ObjectType, methodOverride.MethodName))
+            {
+                throw new ObjectDefinitionValidationException(
+                    string.Format(
+                        CultureInfo.InvariantCulture,
+                        "Invalid method override: no method with name '{0}' on class [{1}].",
+                        methodOverride.MethodName, ObjectTypeName));
+            }
+            //TODO investigate setting overloaded at this point using MethodCountForName...
+            //Test SunnyDayReplaceMethod_WithArgumentAcceptingReplacerWithNoTypeFragmentsSpecified
+            // will fail if doing this optimization.
+        }
+
+        /// <summary>
+        /// Override settings in this object definition from the supplied
+        /// <paramref name="other"/> object definition.
+        /// </summary>
+        /// <param name="other">
+        /// The object definition used to override the member fields of this instance.
+        /// </param>
+        public virtual void OverrideFrom(IObjectDefinition other)
+        {
+            AbstractObjectDefinition aod = other as AbstractObjectDefinition;
+            if (aod != null)
+            {
+                if (aod.HasObjectType)
+                {
+                    ObjectType = other.ObjectType;
+                }
+                MethodOverrides.AddAll(aod.MethodOverrides);
+                DependencyCheck = aod.DependencyCheck;
+            }
+            IsAbstract = other.IsAbstract;
+            IsSingleton = other.IsSingleton;
+            IsLazyInit = other.IsLazyInit;
+            ConstructorArgumentValues.AddAll(other.ConstructorArgumentValues);
+            PropertyValues.AddAll(other.PropertyValues.PropertyValues);
+            EventHandlerValues.AddAll(other.EventHandlerValues);
+            if (StringUtils.HasText(other.InitMethodName))
+            {
+                InitMethodName = other.InitMethodName;
+            }
+            if (StringUtils.HasText(other.DestroyMethodName))
+            {
+                DestroyMethodName = other.DestroyMethodName;
+            }
+            if (StringUtils.HasText(other.FactoryObjectName))
+            {
+                FactoryObjectName = other.FactoryObjectName;
+            }
+            if (StringUtils.HasText(other.FactoryMethodName))
+            {
+                FactoryMethodName = other.FactoryMethodName;
+            }
+            DependsOn = new string[other.DependsOn.Length];
+            Array.Copy(other.DependsOn, DependsOn, other.DependsOn.Length);
+            AutowireMode = other.AutowireMode;
+            ResourceDescription = other.ResourceDescription;
+        }
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> that represents the current
+        /// <see cref="System.Object"/>. 
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents the current
+        /// <see cref="System.Object"/>. 
+        /// </returns>
+        public override string ToString()
+        {
+            StringBuilder buffer = new StringBuilder();
+            buffer.Append("Abstract = ").Append(IsAbstract);
+            buffer.Append("; Singleton = ").Append(IsSingleton);
+            buffer.Append("; LazyInit = ").Append(IsLazyInit);
+            buffer.Append("; Autowire = ").Append(AutowireMode);
+            buffer.Append("; DependencyCheck = ").Append(DependencyCheck);
+            buffer.Append("; InitMethodName = ").Append(InitMethodName);
+            buffer.Append("; DestroyMethodName = ").Append(DestroyMethodName);
+            buffer.Append("; FactoryMethodName = ").Append(FactoryMethodName);
+            buffer.Append("; FactoryObjectName = ").Append(FactoryObjectName);
+            if (StringUtils.HasText(ResourceDescription))
+            {
+                buffer.Append("; defined in = ").Append(ResourceDescription);
+            }
+            return buffer.ToString();
+        }
+
+        #endregion
+
+        #region Fields
+
+        private ConstructorArgumentValues constructorArgumentValues = new ConstructorArgumentValues();
+        private MutablePropertyValues propertyValues = new MutablePropertyValues();
+        private EventValues eventHandlerValues = new EventValues();
+        private MethodOverrides methodOverrides = new MethodOverrides();
+        private string resourceDescription = string.Empty;
+        private bool isSingleton = true;
+        private bool isPrototype = false;
+        private bool isLazyInit = false;
+        private bool isAbstract = false;
+        private object objectType;
+        private AutoWiringMode autowireMode = AutoWiringMode.No;
+        private DependencyCheckingMode dependencyCheck = DependencyCheckingMode.None;
+        private string[] dependsOn;
+        private string initMethodName = string.Empty;
+        private string destroyMethodName = string.Empty;
+        private string factoryMethodName = string.Empty;
+        private string factoryObjectName = string.Empty;
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs
new file mode 100644
index 00000000..0f9e7222
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs
@@ -0,0 +1,272 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Common.Logging;
+using Spring.Core.IO;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Abstract base class for object definition readers.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Provides common properties like the object registry to work on.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: AbstractObjectDefinitionReader.cs,v 1.14 2008/01/10 14:32:24 bbaia Exp $</version>
+	public abstract class AbstractObjectDefinitionReader : IObjectDefinitionReader
+	{
+		#region Constants
+
+		/// <summary>
+		/// The shared <see cref="Common.Logging.ILog"/> instance for this class (and derived classes).
+		/// </summary>
+		protected static readonly ILog log =
+			LogManager.GetLogger(typeof (AbstractObjectDefinitionReader));
+
+		#endregion
+
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinitionReader"/>
+		/// class.
+		/// </summary>
+		/// <param name="registry">
+		/// The <see cref="Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+		/// instance that this reader works on.
+		/// </param>
+		/// <remarks>
+		/// <p>
+		/// This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+		/// </p>
+		/// </remarks>
+		protected AbstractObjectDefinitionReader(IObjectDefinitionRegistry registry)
+			: this(registry, AppDomain.CurrentDomain)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinitionReader"/>
+		/// class.
+		/// </summary>
+		/// <param name="registry">
+		/// The <see cref="Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+		/// instance that this reader works on.
+		/// </param>
+		/// <param name="domain">
+		/// The <see cref="System.AppDomain"/> against which any class names
+		/// will be resolved into <see cref="System.Type"/> instances.
+		/// </param>
+		/// <remarks>
+		/// <p>
+		/// This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+		/// </p>
+		/// </remarks>
+		protected AbstractObjectDefinitionReader(
+			IObjectDefinitionRegistry registry,
+			AppDomain domain)
+		{
+		    AssertUtils.ArgumentNotNull(registry, "registry", "IObjectDefinitionRegistry must not be null");
+			_registry = registry;
+			_domain = domain;
+            if (registry is IResourceLoader)
+            {
+                _resourceLoader = registry as IResourceLoader;
+            }
+            else
+            {
+                _resourceLoader = new ConfigurableResourceLoader();
+            }
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets the
+		/// <see cref="Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+		/// instance that this reader works on.
+		/// </summary>
+		public IObjectDefinitionRegistry Registry
+		{
+			get { return _registry; }
+		}
+
+
+        /// <summary>
+        /// The <see cref="IObjectNameGenerator"/> to use for anonymous
+        /// objects (wihtout explicit object name specified).
+        /// </summary>
+        /// <value></value>
+	    public IObjectNameGenerator ObjectNameGenerator
+	    {
+	        get { return _objectNameGenerator; }
+	        set
+	        {
+                if (value != null)
+                {
+                    _objectNameGenerator = value;
+                }
+                else
+                {
+                    _objectNameGenerator = new DefaultObjectNameGenerator();
+                }
+	        }
+	    }
+
+	    /// <summary>
+		/// The <see cref="System.AppDomain"/> against which any class names
+		/// will be resolved into <see cref="System.Type"/> instances.
+		/// </summary>
+		public AppDomain Domain
+		{
+			get { return _domain; }
+		}
+
+
+        /// <summary>
+        /// Gets or sets the resource loader to use for resource locations.
+        /// </summary>
+        /// <value>The resource loader.</value>
+	    public IResourceLoader ResourceLoader
+	    {
+	        get { return _resourceLoader; }
+	        set { _resourceLoader = value; }
+	    }
+
+	    #endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Load object definitions from the supplied <paramref name="resource"/>.
+		/// </summary>
+		/// <param name="resource">
+		/// The resource for the object definitions that are to be loaded.
+		/// </param>
+		/// <returns>
+		/// The number of object definitions that were loaded.
+		/// </returns>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In the case of loading or parsing errors.
+		/// </exception>
+		public abstract int LoadObjectDefinitions(IResource resource);
+
+	    /// <summary>
+	    /// Load object definitions from the supplied <paramref name="resources"/>.
+	    /// </summary>
+	    /// <param name="resources">
+	    /// The resources for the object definitions that are to be loaded.
+	    /// </param>
+	    /// <returns>
+	    /// The number of object definitions found
+	    /// </returns>
+	    /// <exception cref="Spring.Objects.ObjectsException">
+	    /// In the case of loading or parsing errors.
+	    /// </exception>
+	    public int LoadObjectDefinitions(IResource[] resources)
+	    {
+	        AssertUtils.ArgumentNotNull(resources, "resources");
+	        int counter = 0;
+	        foreach (IResource resource in resources)
+	        {
+	            counter += LoadObjectDefinitions(resource);
+	        }
+	        return counter;
+	    }
+
+        /// <summary>
+        /// Loads the object definitions from the specified resource location.
+        /// </summary>
+        /// <param name="location">The resource location, to be loaded with the 
+        /// IResourceLoader location .</param>
+        /// <returns>
+        /// The number of object definitions found        
+        /// </returns>
+        public int LoadObjectDefinitions(string location)
+	    {
+            if (ResourceLoader == null)
+            {
+                throw new ObjectDefinitionStoreException("Cannot import object definitions from location [" + location +
+                                                         "]:" +
+                                                         " no ResourceLoader available");
+            }
+            IResource resource;
+            try
+            {
+                resource = ResourceLoader.GetResource(location);
+            } catch (Exception e)
+            {
+                throw new ObjectDefinitionStoreException("Could not resolve resource location [" + location + "]",e);
+            }
+            int loadCount = LoadObjectDefinitions(resource);
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug("Loaded " + loadCount + " bean definitions from location [" + location + "]");
+            }
+            return loadCount;
+	    }
+
+
+	    /// <summary>
+	    /// Loads the object definitions from the specified resource locations.
+	    /// </summary>
+	    /// <param name="locations">The the resource locations to be loaded with the
+	    /// IResourceLoader of this object definition reader.</param>
+	    /// <returns>
+	    /// The number of object definitions found        
+	    /// </returns>
+	    public int LoadObjectDefinitions(string[] locations)
+	    {
+            AssertUtils.ArgumentNotNull(locations, "location");
+            int counter = 0;
+            foreach (string location in locations)
+            {
+                counter += LoadObjectDefinitions(location);
+            }
+            return counter;
+	    }
+
+	    #endregion
+
+		#region Fields
+
+		private IObjectDefinitionRegistry _registry;
+		private AppDomain _domain;
+	    private IResourceLoader _resourceLoader;
+	    private IObjectNameGenerator _objectNameGenerator = new DefaultObjectNameGenerator();
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs
new file mode 100644
index 00000000..8fd9db1a
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs
@@ -0,0 +1,1978 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.ComponentModel;
+
+using Common.Logging;
+
+using Spring.Collections;
+using Spring.Core;
+using Spring.Core.TypeConversion;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Abstract superclass for <see cref="Spring.Objects.Factory.IObjectFactory"/>
+    /// implementations.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This class provides singleton / prototype determination, singleton caching,
+    /// object definition aliasing, <see cref="Spring.Objects.Factory.IFactoryObject"/>
+    /// handling, and object definition merging for child object definitions.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: AbstractObjectFactory.cs,v 1.77 2008/05/29 12:13:27 oakinger Exp $</version>
+    [Serializable]
+    public abstract class AbstractObjectFactory : IConfigurableObjectFactory
+    {
+        /// <summary>
+        /// Marker object to be temporarily registered in the singleton cache,
+        /// while instantiating an object (in order to be able to detect circular references).
+        /// </summary>
+        private static readonly object CURRENTLY_IN_CREATION = new Object();
+
+        /// <summary>
+        /// The <see cref="Common.Logging.ILog"/> instance for this class.
+        /// </summary>
+        private readonly ILog log = LogManager.GetLogger(typeof(AbstractObjectFactory));
+
+        /// <summary>
+        /// Used as value in hashtable that keeps track of singleton names currently in the
+        /// process of being created.  Would not be necessary if we created a case insensitive implementation of
+        /// ISet.
+        /// </summary>
+        private static object emptyObject = new object();
+
+
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.AbstractObjectFactory"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This constructor implicitly creates an
+        /// <see cref="Spring.Objects.Factory.Support.AbstractObjectFactory"/>
+        /// that treats the names of objects in this factory in a case-sensitive fashion.
+        /// </p>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+        /// </p>
+        /// </remarks>
+        protected AbstractObjectFactory() : this(true)
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.AbstractObjectFactory"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+        /// </p>
+        /// </remarks>
+        /// <param name="caseSensitive">
+        /// <see lang="true"/> if the names of objects in this factory are to be treated in a
+        /// case-sensitive fashion.
+        /// </param>
+        protected AbstractObjectFactory(bool caseSensitive)
+        {
+            this.log = LogManager.GetLogger(this.GetType());
+            if (caseSensitive)
+            {
+                this.aliasMap = new SynchronizedHashtable();
+                this.singletonCache = new Hashtable();
+                this.singletonsInCreation = new Hashtable();
+            }
+            else
+            {
+                this.aliasMap = new SynchronizedHashtable(CollectionsUtil.CreateCaseInsensitiveHashtable());
+                this.singletonCache = CollectionsUtil.CreateCaseInsensitiveHashtable();                
+                this.singletonsInCreation = CollectionsUtil.CreateCaseInsensitiveHashtable();
+            }
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.AbstractObjectFactory"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+        /// </p>
+        /// </remarks>
+        /// <param name="caseSensitive">
+        /// <see lang="true"/> if the names of objects in this factory are to be treated in a
+        /// case-sensitive fashion.
+        /// </param>
+        /// <param name="parentFactory">
+        /// Any parent object factory; may be <see lang="null"/>.
+        /// </param>
+        protected AbstractObjectFactory(bool caseSensitive, IObjectFactory parentFactory) : this(caseSensitive)
+        {
+            ParentObjectFactory = parentFactory;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the <see cref="System.Collections.IList"/> of
+        /// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+        /// that will be applied to objects created by this factory.
+        /// </summary>
+        public IList ObjectPostProcessors
+        {
+            get { return objectPostProcessors; }
+        }
+
+        /// <summary>
+        /// Gets the set of classes that will be ignored for autowiring.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The elements of this <see cref="Spring.Collections.ISet"/> are
+        /// <see cref="System.Type"/>s.
+        /// </p>
+        /// </remarks>
+        public ISet IgnoredDependencyTypes
+        {
+            get { return ignoreDependencyTypes; }
+        }
+
+        /// <summary>
+        /// Returns, whether this object factory instance contains <see cref="IInstantiationAwareObjectPostProcessor"/> objects.
+        /// </summary>
+        protected bool HasInstantiationAwareBeanPostProcessors
+        {
+            get { return hasInstantiationAwareBeanPostProcessors; }
+        }
+
+        /// <summary>
+        /// Returns, whether this object factory instance contains <see cref="IDestructionAwareObjectPostProcessor"/> objects.
+        /// </summary>
+        protected bool HasDestructionAwareBeanPostProcessors
+        {
+            get { return hasDestructionAwareBeanPostProcessors; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the given object name.
+        /// </summary>
+        /// <param name="name">The name of the object to return.</param>
+        /// <param name="requiredType">
+        /// The <see cref="System.Type"/> the object may match. Can be an interface or
+        /// superclass of the actual class. For example, if the value is the
+        /// <see cref="System.Object"/> class, this method will succeed whatever the
+        /// class of the returned instance.
+        /// </param>
+        /// <param name="arguments">
+        /// The arguments to use if creating a prototype using explicit arguments to
+        /// a <see lang="static"/> factory method. If there is no factory method and the
+        /// supplied <paramref name="arguments"/> array is not <see lang="null"/>, then
+        /// match the argument values by type and call the object's constructor.
+        /// </param>
+        /// <returns>The instance of the object.</returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there's no such object definition.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object could not be created.
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectNotOfRequiredTypeException">
+        /// If the object is not of the required type.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="name"/> is <see langword="null"/>.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.GetObject(string, Type)"/>
+        public object GetObject(string name, Type requiredType, object[] arguments)
+        {
+            string objectName = TransformedObjectName(name);
+            object instance = null;
+            // eagerly check singleton cache for manually registered singletons...                       
+            object sharedInstance = GetSingleton(objectName);  
+       
+            if (sharedInstance != null)
+            {   
+                #region Instrumentation
+
+                if (IsSingletonCurrentlyInCreation(objectName))
+                {
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug("Returning eagerly cached instance of singleton object '" + objectName +
+                                "' that is not fully initialized yet - a consequence of a circular reference");
+                    }
+                }
+                else
+                {
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(string.Format("Returning cached instance of singleton object '{0}'.", objectName));
+                    }
+                }
+
+                #endregion
+
+                instance = GetObjectForInstance(name, sharedInstance);
+            }
+            else
+            {
+                // check if object definition exists
+                RootObjectDefinition mergedObjectDefinition = null;
+                mergedObjectDefinition = GetMergedObjectDefinition(objectName, false);
+                if (mergedObjectDefinition == null)
+                {
+                    if (ParentObjectFactory != null)
+                    {
+                        return ParentObjectFactory.GetObject(name, requiredType, arguments);
+                    }
+                    throw new NoSuchObjectDefinitionException(name, "Cannot find definition for object [" + name + "]");
+                }
+
+                CheckMergedObjectDefinition(mergedObjectDefinition, objectName, requiredType, arguments);
+
+                // return IObjectDefinition instance itself for an abstract object-definition
+                if (mergedObjectDefinition.IsAbstract)
+                {
+                    instance = mergedObjectDefinition;
+                }
+                else if (mergedObjectDefinition.IsSingleton)
+                {
+                    // create object instance...
+                    sharedInstance = CreateAndCacheSingletonInstance(objectName, mergedObjectDefinition, arguments);
+                    instance = GetObjectForInstance(name, sharedInstance);
+                }
+                else
+                {
+                    // it's a prototype, so create a new instance...
+                    instance = CreateObject(name, mergedObjectDefinition, arguments);
+                }
+            }
+            // check that any required type matches the type of the actual object instance...
+            if (requiredType != null && !requiredType.IsAssignableFrom(instance.GetType()))
+            {
+                throw new ObjectNotOfRequiredTypeException(name, requiredType, instance);
+            }
+            return instance;
+        }
+
+        
+        
+        /// <summary>
+        /// Apply the property values of the object definition with the supplied
+        /// <paramref name="name"/> to the supplied <paramref name="instance"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The object definition can either define a fully self-contained object,
+        /// reusing it's property values, or just property values meant to be used
+        /// for existing object instances.
+        /// </p>
+        /// </remarks>
+        /// <param name="instance">
+        /// The existing object that the property values for the named object will
+        /// be applied to.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object definition associated with the property values that are
+        /// to be applied.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        public virtual void ApplyObjectPropertyValues(object instance, string name)
+        {
+            // explicit no-op...
+        }
+
+        /// <summary>
+        /// Initializes the given <see cref="Spring.Objects.IObjectWrapper"/> with the
+        /// custom <see cref="System.ComponentModel.TypeConverter"/>s registered with
+        /// this factory.
+        /// </summary>
+        /// <param name="wrapper">
+        /// The <see cref="Spring.Objects.IObjectWrapper"/> to initialise.
+        /// </param>
+        protected void InitObjectWrapper(IObjectWrapper wrapper)
+        {
+        }
+
+        /// <summary>
+        /// Create an object instance for the given object definition.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The object definition will already have been merged with the parent
+        /// definition in case of a child definition.
+        /// </p>
+        /// <p>
+        /// All the other methods in this class invoke this method, although objects
+        /// may be cached after being instantiated by this method. All object
+        /// instantiation within this class is performed by this method.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">The name of the object.</param>
+        /// <param name="definition">
+        /// The object definition for the object that is to be instantiated.
+        /// </param>
+        /// <param name="arguments">
+        /// The arguments to use if creating a prototype using explicit arguments to
+        /// a <see lang="static"/>  factory method. If there is no factory method and the
+        /// supplied <paramref name="arguments"/> array is not <see lang="null"/>,
+        /// then match the argument values by type and call the object's constructor.
+        /// </param>
+        /// <returns>
+        /// A new instance of the object.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        protected abstract object CreateObject(string name, RootObjectDefinition definition, object[] arguments);
+
+        /// <summary>
+        /// Destroy the target object.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Must destroy objects that depend on the given object before the object itself,
+        /// nor throw an exception.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">
+        /// The name of the object.
+        /// </param>
+        /// <param name="target">
+        /// The target object instance to destroyed.
+        /// </param>
+        protected abstract void DestroyObject(string name, object target);
+
+        /// <summary>
+        /// Does this object factory contain an object definition with the
+        /// supplied <paramref name="name"/>?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Does not consider any hierarchy this factory may participate in.
+        /// Invoked by
+        /// <see cref="Spring.Objects.Factory.Support.AbstractObjectFactory.ContainsObject"/>
+        /// when no cached singleton instance is found.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">
+        /// The name of the object to look for.
+        /// </param>
+        /// <returns>
+        /// <see lang="true"/> if this object factory contains an object
+        /// definition with the supplied <paramref name="name"/>.
+        /// </returns>
+        public abstract bool ContainsObjectDefinition(string name);
+
+        /// <summary>
+        /// Adds the supplied <paramref name="singleton"/> (object) to this factory's
+        /// singleton cache.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// To be called for eager registration of singletons, e.g. to be able to
+        /// resolve circular references.
+        /// </p>
+        /// <note>
+        /// If a singleton has already been registered under the same name as
+        /// the supplied <paramref name="name"/>, then the old singleton will
+        /// be replaced.
+        /// </note>
+        /// </remarks>
+        /// <param name="name">The name of the object.</param>
+        /// <param name="singleton">The singleton object.</param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the <paramref name="name"/> argument is <see langword="null"/>
+        /// or consists wholly of whitespace characters; or if the
+        /// <paramref name="singleton"/> is <see langword="null"/>.
+        /// </exception>
+        protected virtual void AddSingleton(string name, object singleton)
+        {
+            AssertUtils.ArgumentHasText(name, "The object name must not be empty.");
+            AssertUtils.ArgumentNotNull(singleton, "singleton");
+            lock (singletonCache)
+            {
+                singletonCache[name] = singleton;
+            }
+        }
+
+        /// <summary>
+        /// Return the object name, stripping out the factory dereference prefix if
+        /// necessary, and resolving aliases to canonical names.
+        /// </summary>
+        /// <param name="name">
+        /// The transformed name of the object.
+        /// </param>
+        protected string TransformedObjectName(string name)
+        {
+            string objectName = ObjectFactoryUtils.TransformedObjectName(name);
+            // handle aliasing...
+            lock (aliasMap)
+            {
+                string canonicalName = (string) aliasMap[objectName];
+                return canonicalName != null ? canonicalName : objectName;
+            }
+        }
+
+        /// <summary>
+        /// Ensures, that the given name is prefixed with <see cref="ObjectFactoryUtils.FactoryObjectPrefix"/> 
+        /// if it incidentially already starts with this prefix. This avoids troubles when dereferencing 
+        /// the object name during <see cref="ObjectFactoryUtils.TransformedObjectName"/>
+        /// </summary>
+        protected string OriginalObjectName(string name)
+        {
+            string objectName = TransformedObjectName(name);
+            if (name.StartsWith(ObjectFactoryUtils.FactoryObjectPrefix))
+            {
+                objectName = ObjectFactoryUtils.FactoryObjectPrefix + objectName;
+            }
+            return objectName;
+        }
+
+        /// <summary>
+        /// Determines whether the specified name is defined as an alias as opposed
+        /// to the name of an actual object definition.
+        /// </summary>
+        /// <param name="name">The object name to check.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified name is alias; otherwise, <c>false</c>.
+        /// </returns>
+        protected bool IsAlias(string name)
+        {
+            lock (aliasMap)
+            {
+                return aliasMap.Contains(name);
+            }
+        }
+
+        /// <summary>
+        /// Return a <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>,
+        /// even by traversing parent if the parameter is a child definition.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object.
+        /// </param>
+        /// <param name="includingAncestors">
+        /// Are ancestors to be included in the merge?
+        /// </param>
+        /// <remarks>
+        /// <p>
+        /// Will ask the parent object factory if not found in this instance.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// A merged <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+        /// with overridden properties.
+        /// </returns>
+        public virtual RootObjectDefinition GetMergedObjectDefinition(string name, bool includingAncestors)
+        {
+            return GetMergedObjectDefinition(name, GetObjectDefinition(name, includingAncestors));
+        }
+
+        /// <summary>
+        /// Return a <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>,
+        /// even by traversing parent if the parameter is a child definition.
+        /// </summary>
+        /// <returns>
+        /// A merged <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+        /// with overridden properties.
+        /// </returns>
+        protected virtual RootObjectDefinition GetMergedObjectDefinition(string name, IObjectDefinition definition)
+        {
+            if (definition == null)
+            {
+                return null;
+            }
+            else if (definition is RootObjectDefinition)
+            {
+                return (RootObjectDefinition) definition;
+            }
+            else if (definition is ChildObjectDefinition)
+            {
+                ChildObjectDefinition childDefinition = (ChildObjectDefinition) definition;
+                RootObjectDefinition parentDefinition = null;
+                if (!name.Equals(childDefinition.ParentName))
+                {
+                    parentDefinition =
+                        GetMergedObjectDefinition(TransformedObjectName(childDefinition.ParentName), true);
+                }
+                else
+                {
+                    if (ParentObjectFactory is AbstractObjectFactory)
+                    {
+                        parentDefinition =
+                            ((AbstractObjectFactory) ParentObjectFactory).GetMergedObjectDefinition(
+                            childDefinition.ParentName, true);
+                    }
+                }
+                if (parentDefinition == null)
+                {
+                    throw new NoSuchObjectDefinitionException(childDefinition.ParentName,
+                                                                string.Format(
+                                                                        "Parent name '{0}' is equal to object name '{1}' - "
+                                                                        +
+                                                                        "cannot be resolved without an AbstractObjectFactory parent.",
+                                                                        childDefinition.ParentName, name));
+                }
+                
+                RootObjectDefinition rootDefinition = CreateRootObjectDefinition(parentDefinition);
+                rootDefinition.OverrideFrom(childDefinition);
+                return rootDefinition;
+            }
+            else
+            {
+                throw new ObjectDefinitionStoreException(definition.ResourceDescription, name,
+                                                         "Definition is neither a RootObjectDefinition nor a ChildObjectDefinition.");
+            }
+        }
+/*
+        /// <summary>
+        /// Merges the object definitions.
+        /// </summary>
+        /// <param name="name">Object definition name.</param>
+        /// <param name="parentDefinition">The parent definition.</param>
+        /// <param name="childDefinition">The child definition.</param>
+        /// <returns>Merged object definition.</returns>
+        protected virtual RootObjectDefinition MergeObjectDefinitions(string name, IObjectDefinition parentDefinition,
+                                                                      IObjectDefinition childDefinition)
+        {
+            RootObjectDefinition rootDefinition = CreateRootObjectDefinition(parentDefinition);
+            rootDefinition.OverrideFrom(childDefinition);
+            return rootDefinition;
+        }
+*/
+        /// <summary>
+        /// Creates the root object definition.
+        /// </summary>
+        /// <param name="templateDefinition">The template definition to base root definition on.</param>
+        /// <returns>Root object definition.</returns>
+        protected virtual RootObjectDefinition CreateRootObjectDefinition(IObjectDefinition templateDefinition)
+        {
+            return new RootObjectDefinition(templateDefinition);
+        }
+
+        /// <summary>
+        /// Return the registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+        /// given object, allowing access to its property values and constructor
+        /// argument values.
+        /// </summary>
+        /// <param name="name">The name of the object.</param>
+        /// <returns>
+        /// The registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>.
+        /// </returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there is no object with the given name.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of errors.
+        /// </exception>
+        public abstract IObjectDefinition GetObjectDefinition(string name);
+
+        /// <summary>
+        /// Return the registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+        /// given object, allowing access to its property values and constructor
+        /// argument values.
+        /// </summary>
+        /// <param name="name">The name of the object.</param>
+        /// <param name="includeAncestors">Whether to search parent object factories.</param>
+        /// <returns>
+        /// The registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>.
+        /// </returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there is no object with the given name.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of errors.
+        /// </exception>
+        public abstract IObjectDefinition GetObjectDefinition(string name, bool includeAncestors);
+
+        /// <summary>
+        /// Gets the type for the given FactoryObject.
+        /// </summary>
+        /// <param name="factoryObject">The factory object instance to check.</param>
+        /// <returns>the FactoryObject's object type</returns>
+        protected virtual Type GetTypeForFactoryObject(IFactoryObject factoryObject)
+        {
+            try
+            {
+                return factoryObject.ObjectType;
+            }
+            catch (Exception ex)
+            {
+                log.Warn("FactoryObject threw exception from ObjectType, despite the contract saying " +
+					"that it should return null if the type of its object cannot be determined yet", ex);
+                return null;
+            }    
+        }
+
+        /// <summary>
+        /// Gets the object type for the given FactoryObject definition, as far as possible.
+        /// Only called if there is no singleton instance registered for the target object already.
+        /// </summary>
+        /// <remarks>
+        /// The default implementation creates the FactoryObject via <code>GetObject</code>
+        /// to call its <code>ObjectType</code> property. Subclasses are encouraged to optimize
+        /// this, typically by just instantiating the FactoryObject but not populating it yet,
+        /// trying whether its <code>ObjectType</code> property already returns a type.
+        /// If no type found, a full FactoryObject creation as performed by this implementation
+        /// should be used as fallback.
+        /// </remarks>
+        /// <param name="objectName">Name of the object.</param>
+        /// <param name="mod">The merged object definition for the object.</param>
+        /// <returns>The type for the object if determinable, or <code>null</code> otherwise</returns>
+        protected virtual Type GetTypeForFactoryObject(string objectName, RootObjectDefinition mod)
+        {
+            if (!mod.IsSingleton)
+            {
+                return null;
+            }
+            try
+            {
+                IFactoryObject factoryObject = GetFactoryObject(objectName);
+                return GetTypeForFactoryObject(factoryObject);
+            } catch (ObjectCreationException ex)
+            {
+                // Can only happen when getting a FactoryObject.
+                log.Debug("Ignoring object creation exception on FactoryObject type check", ex);
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Predict the eventual object type (of the processed object instance) for the
+        /// specified object.
+        /// </summary>
+        /// <remarks>
+        /// Does not need to handle FactoryObjects specifically, since it is only
+        /// supposed to operate on the raw object type.
+        /// This implementation is simplistic in that it is not able to
+        /// handle factory methods and InstantiationAwareBeanPostProcessors.
+        /// It only predicts the object type correctly for a standard object.
+        /// To be overridden in subclasses, applying more sophisticated type detection.
+        /// </remarks>
+        /// <param name="objectName">Name of the object.</param>
+        /// <param name="mod">The merged object definition to determine the type for.</param>
+        /// <returns>The type of the object, or <code>null</code> if not predictable</returns>
+        protected virtual Type PredictObjectType(string objectName, RootObjectDefinition mod)
+        {
+            if (StringUtils.HasText(mod.FactoryObjectName))
+            {
+                return null;
+            }
+            return ResolveObjectType(mod, objectName);
+        }
+
+        /// <summary>
+        /// Get the object for the given object instance, either the object
+        /// instance itself or its created object in case of an
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The name that may include the factory dereference prefix.
+        /// </param>
+        /// <param name="instance">The object instance.</param>
+        /// <returns>
+        /// The singleton instance of the object.
+        /// </returns>
+        protected virtual object GetObjectForInstance(string name, object instance)
+        {
+            //string objectName = TransformedObjectName(name);
+
+            // don't let calling code try to dereference the
+            // object factory if the object isn't a factory
+            if (IsFactoryDereference(name) && !(instance is IFactoryObject))
+            {
+                throw new ObjectIsNotAFactoryException(TransformedObjectName(name), instance);
+            }
+
+            // now we have the object instance, which may be a normal object
+            // or an IFactoryObject. If it's an IFactoryObject, we use it to
+            // create an object instance, unless the caller actually wants
+            // a reference to the factory.
+            if (ObjectUtils.IsAssignableAndNotTransparentProxy(typeof(IFactoryObject), instance))
+            {
+                if (!IsFactoryDereference(name))
+                {
+
+                    // return object instance from factory...
+                    IFactoryObject factory = (IFactoryObject) instance;
+                    string objectName = TransformedObjectName(name);
+
+                    #region Instrumentation
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(string.Format("Object with name '{0}' is a factory object.", objectName));
+                    }
+
+                    #endregion
+
+                    RootObjectDefinition rod =
+                        (ContainsObjectDefinition(objectName) ? GetMergedObjectDefinition(objectName,true) : null);
+                    instance = GetObjectFromFactoryObject(factory, objectName, rod);
+
+                    if (instance == null)
+                    {
+                        throw new FactoryObjectNotInitializedException(TransformedObjectName(name),
+                                                                       "Factory object returned null object - "
+                                                                       + "possible cause: not fully initialized due to "
+                                                                       + "circular object reference.");
+                    }
+                }
+                else
+                {
+                    // the user wants the factory itself...
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(
+                                string.Format("Calling code asked for IFactoryObject instance for name '{0}'.",
+                                              TransformedObjectName(name)));
+                    }
+                }
+            }
+            return instance;
+        }
+
+        /// <summary>
+        /// Obtain an object to expose from the given IFactoryObject.
+        /// </summary>
+        /// <param name="factory">The IFactoryObject instance.</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <param name="rod">The merged object definition.</param>
+        /// <returns>The object obtained from the IFactoryObject</returns>
+        /// <exception cref="ObjectCreationException">If IFactoryObject object creation failed.</exception>
+        private object GetObjectFromFactoryObject(IFactoryObject factory, string objectName, RootObjectDefinition rod)
+        {
+            object instance;
+            
+            try
+            {
+                instance = factory.GetObject();
+            }
+            catch (FactoryObjectNotInitializedException ex) 
+            {
+                throw new ObjectCurrentlyInCreationException(
+                    rod.ResourceDescription, objectName, ex);
+		    }
+            catch (Exception ex)
+            {
+                throw new ObjectCreationException(rod.ResourceDescription, objectName, 
+                    "FactoryObject threw exception on object creation.", ex);
+            }
+
+            // Do not accept a null value for a FactoryBean that's not fully
+		    // initialized yet: Many FactoryBeans just return null then.
+		    if (instance == null && IsSingletonCurrentlyInCreation(objectName)) {
+                throw new ObjectCurrentlyInCreationException(rod.ResourceDescription, objectName, 
+                    "FactoryObject which is currently in creation returned null from GetObject.");
+            }
+
+            if (factory is IConfigurableFactoryObject)
+            {
+                IConfigurableFactoryObject configurableFactory = (IConfigurableFactoryObject)factory;
+
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(string.Format("Factory object with name '{0}' is configurable.", TransformedObjectName(objectName)));
+                }
+
+                #endregion
+
+                if (configurableFactory.ProductTemplate != null)
+                {
+                    instance = ConfigureObject(instance,
+                        String.Format("{0}.ProductTemplate", objectName),
+                        configurableFactory.ProductTemplate);
+                }
+            }
+
+            if (instance != null)
+            {
+                try 
+                {
+				    instance = PostProcessObjectFromFactoryObject(instance, objectName);
+			    }
+			    catch (Exception ex) {
+				    throw new ObjectCreationException(rod.ResourceDescription, objectName,
+					        	"Post-processing of the FactoryObject's object failed.", ex);
+			    }   
+            }
+
+            return instance;
+        }
+
+        /// <summary>
+        /// Post-process the given object that has been obtained from the FactoryObject.
+        /// The resulting object will be exposed for object references.
+        /// </summary>
+        /// <remarks>The default implementation simply returns the given object
+        /// as-is.  Subclasses may override this, for example, to apply
+        /// post-processors.</remarks>
+        /// <param name="instance">The instance obtained from the IFactoryObject.</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>The object instance to expose</returns>
+        /// <exception cref="ObjectsException">if any post-processing failed.</exception>
+        protected virtual object PostProcessObjectFromFactoryObject(object instance, string objectName)
+        {
+            return instance;
+        }
+
+        /// <summary>
+        /// Convenience method to pull an <see cref="Spring.Objects.Factory.IFactoryObject"/>
+        /// from this factory.
+        /// </summary>
+        /// <param name="objectName">
+        /// The name of the factory object to be retrieved. If this name is not a valid
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/> name, it will be converted
+        /// into one.
+        /// </param>
+        /// <returns>
+        /// The <see cref="Spring.Objects.Factory.IFactoryObject"/> associated with the
+        /// supplied <paramref name="objectName"/>.
+        /// </returns>
+        protected IFactoryObject GetFactoryObject(string objectName)
+        {
+            if (!ObjectFactoryUtils.IsFactoryDereference(objectName))
+            {
+                objectName = ObjectFactoryUtils.BuildFactoryObjectName(objectName);
+            }
+            return (IFactoryObject) GetObject(objectName);
+        }
+
+        /// <summary>
+        /// Is the supplied <paramref name="name"/> a factory object dereference?
+        /// </summary>
+        protected bool IsFactoryDereference(string name)
+        {
+            return ObjectFactoryUtils.IsFactoryDereference(name);
+        }
+
+        /// <summary>
+        /// Determines whether the type of the given object definition matches the
+        /// specified target type.
+        /// </summary>
+        /// <remarks>Allows for lazy load of the actual object type, provided that the
+        /// type match can be determined otherwise.
+        /// <para>The default implementation simply delegates to the standard
+        /// <code>ResolveObjectType</code> method.  Subclasses may override this to use
+        /// a differnt strategy.</para>
+        /// </remarks>
+        /// <param name="objectName">Name of the object (for error handling purposes).</param>
+        /// <param name="rod">The merged object definition to determine the type for.</param>
+        /// <param name="targetType">Type to match against (never null).</param>
+        /// <returns>
+        /// 	<c>true</c> if object definition matches tye specified target type; otherwise, <c>false</c>.
+        /// </returns>
+        /// <exception cref="CannotLoadObjectTypeException">if we failed to load the type.</exception>"
+        protected bool IsObjectTypeMatch(string objectName, RootObjectDefinition rod, Type targetType)
+        {
+            Type objectType = ResolveObjectType(rod, objectName);
+            return (objectType != null && targetType.IsAssignableFrom(objectType));
+        }
+
+        /// <summary>
+        /// Resolves the type of the object for the specified object definition resolving
+        /// an object type name to a Type (if necessary) and storing the resolved Type
+        /// in the object definition for further use.
+        /// </summary>
+        /// <param name="rod">The merged object definition to dertermine the type for.</param>
+        /// <param name="objectName">Name of the object (for error handling purposes).</param>
+        /// <returns></returns>
+        protected Type ResolveObjectType(RootObjectDefinition rod, string objectName)
+        {
+            try
+            {
+                if (rod.HasObjectType)
+                {
+                    return rod.ObjectType;
+                }
+                return rod.ResolveObjectType();
+            } catch (TypeLoadException e)
+            {
+                throw new CannotLoadObjectTypeException(rod.ResourceDescription, objectName, rod.ObjectTypeName, e);
+            }
+        }
+
+        /// <summary>
+        /// Is the object (definition) with the supplied <paramref name="name"/> an
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/>?
+        /// </summary>
+        /// <param name="name">The name of the object to be checked.</param>
+        /// <returns>
+        /// <see lang="true"/> the object (definition) with the supplied
+        /// <paramref name="name"/> an <see cref="Spring.Objects.Factory.IFactoryObject"/>?
+        /// </returns>
+        protected bool IsFactoryObject(string name)
+        {
+            string objectName = TransformedObjectName(name);
+            object objectInstance = GetSingleton(objectName);
+            //TODO investigate
+            if (IsSingletonCurrentlyInCreation(name))
+            {
+                throw new ObjectCurrentlyInCreationException(objectName);
+            }
+
+            if (objectInstance != null)
+            {
+                return (objectInstance is IFactoryObject);
+            }
+            else
+            {
+                RootObjectDefinition definition = GetMergedObjectDefinition(objectName, false);
+                if (definition != null)
+                {
+                    return (definition.HasObjectType && typeof(IFactoryObject).IsAssignableFrom(definition.ObjectType));
+                }
+                else
+                {
+                    if (parentObjectFactory != null)
+                    {
+                        return ((AbstractObjectFactory) parentObjectFactory).IsFactoryObject(name);
+                    }
+                    else
+                    {
+                        throw new NoSuchObjectDefinitionException(objectName,
+                                                                  "Cannot find definition for object [" + objectName
+                                                                  + "]");
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Remove the object identified by the supplied <paramref name="name"/>
+        /// from this factory's singleton cache.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object that is to be removed from the singleton
+        /// cache.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the <paramref name="name"/> argument is <see langword="null"/> or
+        /// consists wholly of whitespace characters.
+        /// </exception>
+        protected void RemoveSingleton(string name)
+        {
+            AssertUtils.ArgumentHasText(name, "name");
+            lock (singletonCache)
+            {
+                this.singletonCache.Remove(name);
+            }
+        }
+
+        /// <summary>
+        /// Return the names of objects in the singleton cache that match the given
+        /// object type (including subclasses).
+        /// </summary>
+        /// <param name="type">
+        /// The class or interface to match, or <see langword="null"/> for all object names.
+        /// </param>
+        /// <remarks>
+        /// <p>
+        /// Will <i>not</i> consider <see cref="Spring.Objects.Factory.IFactoryObject"/>s
+        /// as the type of their created objects is not known before instantiation.
+        /// </p>
+        /// <p>
+        /// Does not consider any hierarchy this factory may participate in.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// The names of objects in the singleton cache that match the given
+        /// object type (including subclasses), or an empty array if none.
+        /// </returns>
+        public virtual string[] GetSingletonNames(Type type)
+        {
+            lock (singletonCache)
+            {
+                ArrayList matches = new ArrayList();
+                foreach (string name in singletonCache.Keys)
+                {
+                    object singletonObject = singletonCache[name];
+                    if (singletonObject != null && type.IsAssignableFrom(singletonObject.GetType())
+                        && !matches.Contains(name))
+                    {
+                        matches.Add(name);
+                    }
+                }            
+                return (string[]) matches.ToArray(typeof(string));
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the object with the given name matches the specified type.
+        /// </summary>
+        /// <remarks>More specifically, check whether a GetObject call for the given name
+        /// would return an object that is assignable to the specified target type.
+        /// Translates aliases back to the corresponding canonical bean name.
+        /// Will ask the parent factory if the bean cannot be found in this factory instance.
+        /// </remarks>
+        /// <param name="name">The name of the object to query.</param>
+        /// <param name="targetType">Type of the target to match against.</param>
+        /// <returns>
+        /// 	<c>true</c> if the object type matches; otherwise, <c>false</c>
+        /// if it doesn't match or cannot be determined yet.
+        /// </returns>
+        /// <exception cref="NoSuchObjectDefinitionException">Ff there is no object with the given name
+        /// </exception>
+        public bool IsTypeMatch(string name, Type targetType)
+        {
+            string objectName = TransformedObjectName(name);
+            Type typeToMatch = (targetType != null ? targetType : typeof (object));
+
+            //Check manually registered singletons.
+            object objectInstance = GetSingleton(objectName);
+            if (objectInstance != null)
+            {
+                if (objectInstance is IFactoryObject)
+                {
+                    if (!IsFactoryDereference(name))
+                    {
+                        Type type = GetTypeForFactoryObject((IFactoryObject)objectInstance);
+                        return (type != null && typeToMatch.IsAssignableFrom(type));
+                    }
+                    else
+                    {
+                        return typeToMatch.IsAssignableFrom(objectInstance.GetType());
+                    }
+                }
+                else
+                {
+                    return !IsFactoryDereference(name) && typeToMatch.IsAssignableFrom(objectInstance.GetType());
+                }
+            }
+            else
+            {
+                // No singleton instance found -> check object definition
+                IObjectFactory parentFactory = ParentObjectFactory;
+                if (parentFactory != null && !ContainsObjectDefinition(name))
+                {
+                    // No object definition found in this factory -> delegate to parent
+                    return parentFactory.IsTypeMatch(OriginalObjectName(name), targetType);
+                }
+
+                RootObjectDefinition mod = GetMergedObjectDefinition(objectName, false);
+                Type objectType = PredictObjectType(objectName, mod);
+
+                if (objectType == null)
+                {
+                    return false;
+                }
+
+                // Check object class whether we're dealing with a FactoryObject
+                if (typeof(IFactoryObject).IsAssignableFrom(objectType))
+                {
+                    if (!IsFactoryDereference(name))
+                    {
+                        // If it's a FactoryObject, we want to look at what it creates, not the factory class.
+                        Type type = GetTypeForFactoryObject(objectName, mod);
+                        return (type != null && typeToMatch.IsAssignableFrom(type));
+                    }
+                    else
+                    {
+                        return typeToMatch.IsAssignableFrom(objectType);
+                    }
+                }
+                else
+                {
+                    return !IsFactoryDereference(name) && typeToMatch.IsAssignableFrom(objectType);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines the <see cref="System.Type"/> of the object with the
+        /// supplied <paramref name="name"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// More specifically, checks the <see cref="System.Type"/> of object that
+        /// <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/> would return.
+        /// For an <see cref="Spring.Objects.Factory.IFactoryObject"/>, returns the
+        /// <see cref="System.Type"/> of object that the
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/> creates.
+        /// </p>
+        /// <p>
+        /// Please note that (prototype) objects created via a factory method or
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/> objects are handled
+        /// slightly differently, in that we <b>don't</b> want to needlessly create
+        /// instances of such objects just to determine the <see cref="System.Type"/>
+        /// of object that they create.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">The name of the object to query.</param>
+        /// <returns>
+        /// The <see cref="System.Type"/> of the object or <see langword="null"/>
+        /// if not determinable.
+        /// </returns>
+        public virtual Type GetType(string name)
+        {
+            string objectName = TransformedObjectName(name);
+
+            // check manually registered singletons...
+            object objectInstance = GetSingleton(objectName);
+
+            if (objectInstance != null)
+            {
+                IFactoryObject factoryObject = objectInstance as IFactoryObject;
+                if (factoryObject != null & !IsFactoryDereference(objectName))
+                {
+                    return GetTypeForFactoryObject(factoryObject);
+                }
+                else
+                {
+                    return objectInstance.GetType();
+                }
+            }
+            else
+            {
+                // No singleton instance found -> check bean definition.
+                IObjectFactory parentFactory = ParentObjectFactory;
+                if (parentFactory != null && !ContainsObjectDefinition(objectName))
+                {
+                    // No bean definition found in this factory -> delegate to parent.
+                    return parentFactory.GetType(this.OriginalObjectName(name));
+                }
+
+                RootObjectDefinition mod = this.GetMergedObjectDefinition(objectName, false);
+                Type objectType = PredictObjectType(objectName, mod);
+
+                if (objectType != null && typeof (IFactoryObject).IsAssignableFrom(objectType))
+                {
+                    if (!IsFactoryDereference(name))
+                    {
+                        // If it's a FactoryBean, we want to look at what it creates, not the factory class.
+                        return GetTypeForFactoryObject(objectName, mod);
+                    }
+                    else
+                    {
+                        return objectType;
+                    }
+                }
+                else
+                {
+                    return (!IsFactoryDereference(name) ? objectType : null);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines the <see cref="System.Type"/> of the object defined
+        /// by the supplied object <paramref name="definition"/>. 
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This, the default, implementation returns <see lang="null"/>
+        /// to indicate that the type cannot be determined. Subclasses are
+        /// encouraged to try to determine the actual return
+        /// <see cref="System.Type"/> here, matching their strategy of resolving
+        /// factory methods in the
+        /// <see cref="Spring.Objects.Factory.Support.AbstractObjectFactory.CreateObject"/>
+        /// implementation.
+        /// </p>
+        /// </remarks>
+        /// <param name="objectName">
+        /// The name associated with the supplied object <paramref name="definition"/>.
+        /// </param>
+        /// <param name="definition">
+        /// The <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+        /// that the <see cref="System.Type"/> is to be determined for. 
+        /// </param>
+        /// <returns>
+        /// The <see cref="System.Type"/> of the object defined by the supplied
+        /// object <paramref name="definition"/>; or <see lang="null"/> if the
+        /// <see cref="System.Type"/> cannot be determined.
+        /// </returns>
+        protected virtual Type GetTypeForFactoryMethod(string objectName, RootObjectDefinition definition)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the names of the objects in the singleton cache.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Does not consider any hierarchy this factory may participate in.
+        /// </p>
+        /// </remarks>
+        /// <returns>The names of the objects in the singleton cache.</returns>
+        public virtual string[] GetSingletonNames()
+        {
+            lock (singletonCache)
+            {
+                return (string[]) new ArrayList(singletonCache.Keys).ToArray(typeof(string));
+            }
+        }
+
+        /// <summary>
+        /// Returns the number of objects in the singleton cache.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Does not consider any hierarchy this factory may participate in.
+        /// </p>
+        /// </remarks>
+        /// <returns>The number of objects in the singleton cache.</returns>
+        public virtual int GetSingletonCount()
+        {
+            lock (singletonCache)
+            {
+                return singletonCache.Count;
+            }
+        }
+
+        /// <summary>
+        /// Destroys the named singleton object.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Delegates to
+        /// <see cref="Spring.Objects.Factory.Support.AbstractObjectFactory.DestroyObject"/>
+        /// if a corresponding singleton instance is found.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">
+        /// The name of the singleton object that is to be destroyed.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Factory.Support.AbstractObjectFactory.DestroyObject"/>
+        protected virtual void DestroySingleton(string name)
+        {
+            lock (singletonCache)
+            {
+                object tempObject = singletonCache[name];
+                singletonCache.Remove(name);
+            
+                object singletonInstance = tempObject;
+                if (singletonInstance != null)
+                {
+                    DestroyObject(name, singletonInstance);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Check the supplied merged object definition for any possible
+        /// validation errors.
+        /// </summary>
+        /// <param name="mergedObjectDefinition">
+        /// The object definition to be checked for validation errors.
+        /// </param>
+        /// <param name="objectName">
+        /// The name of the object associated with the supplied object definition.
+        /// </param>
+        /// <param name="requiredType">
+        /// The <see cref="System.Type"/> the object may match. Can be an interface or
+        /// superclass of the actual class. For example, if the value is the
+        /// <see cref="System.Object"/> class, this method will succeed whatever the
+        /// class of the returned instance.
+        /// </param>
+        /// <param name="arguments">
+        /// The arguments to use if creating a prototype using explicit arguments to
+        /// a <see lang="static"/> factory method. If there is no factory method and the
+        /// supplied <paramref name="arguments"/> array is not <see lang="null"/>, then
+        /// match the argument values by type and call the object's constructor.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of object validation errors.
+        /// </exception>
+        protected void CheckMergedObjectDefinition(RootObjectDefinition mergedObjectDefinition, String objectName,
+                                                   Type requiredType, params object[] arguments)
+        {
+            // check if required type can match according to the object definition;
+            // this is only possible at this early stage for conventional objects!
+            if (mergedObjectDefinition.HasObjectType)
+            {
+                Type objectType = mergedObjectDefinition.ObjectType;
+                if (requiredType != null && StringUtils.IsNullOrEmpty(mergedObjectDefinition.FactoryMethodName)
+                    && !typeof(IFactoryObject).IsAssignableFrom(objectType)
+                    && !requiredType.IsAssignableFrom(objectType))
+                {
+                    throw new ObjectNotOfRequiredTypeException(objectName, requiredType, objectType);
+                }
+            }
+            // check validity of the usage of the args parameter; this can
+            // only be used for prototypes constructed via a factory method...
+            if (arguments != null && arguments.Length > 0)
+            {
+                if (mergedObjectDefinition.IsSingleton)
+                {
+                    throw new ObjectDefinitionStoreException("Cannot specify arguments in the GetObject () method when "
+                                                             + "referring to a singleton object definition.");
+                }
+                //MLP lets skip this check for now.
+                /*
+				else if (StringUtils.IsNullOrEmpty(mergedObjectDefinition.FactoryMethodName))
+				{
+					throw new ObjectDefinitionStoreException(
+						"Can only specify arguments in the GetObject () method in " +
+							"conjunction with a factory method.");
+				}
+                */
+            }
+        }
+
+        /// <summary>
+        /// Gets the temporary object that is placed 
+        /// into the singleton cache during object resolution.
+        /// </summary>
+        protected object TemporarySingletonPlaceHolder
+        {
+            get { return CURRENTLY_IN_CREATION; }
+        }  
+
+        #endregion
+
+        #region Fields
+
+        /// <summary>
+        /// Parent object factory, for object inheritance support
+        /// </summary>
+        private IObjectFactory parentObjectFactory;
+
+        /// <summary>
+        /// Dependency types to ignore on dependency check and autowire, as Set of
+        /// Type objects: for example, string.  Default is none.
+        /// </summary>
+        private ISet ignoreDependencyTypes = new HybridSet();
+
+
+        /// <summary>
+        /// ObjectPostProcessors to apply in CreateObject
+        /// </summary>
+        private IList objectPostProcessors = new ArrayList();
+
+        /// <summary>
+        /// Indicates whether any IInstantiationAwareBeanPostProcessors have been registered
+        /// </summary>
+        private bool hasInstantiationAwareBeanPostProcessors;
+
+        /// <summary>
+        /// Indicates whether any IDestructionAwareBeanPostProcessors have been registered 
+        /// </summary>
+        private bool hasDestructionAwareBeanPostProcessors;
+
+        private IDictionary aliasMap;
+        private IDictionary singletonCache;
+        private IDictionary singletonsInCreation;
+
+        #endregion
+
+        #region IHierarchicalObjectFactory Members
+
+        /// <summary>
+        /// The parent object factory, or <see langword="null"/> if there is none.
+        /// </summary>
+        /// <value>
+        /// The parent object factory, or <see langword="null"/> if there is none.
+        /// </value>
+        public IObjectFactory ParentObjectFactory
+        {
+            get { return parentObjectFactory; }
+            set { parentObjectFactory = value; }
+        }
+
+        #endregion
+
+        #region IObjectFactory Members
+
+        /// <summary>
+        /// Is this object a singleton?
+        /// </summary>
+        /// <see cref="Spring.Objects.Factory.IObjectFactory.IsSingleton"/> 
+        public bool IsSingleton(string name)
+        {
+            string objectName = TransformedObjectName(name);
+            object objectInstance = this.GetSingleton(objectName);
+            if (objectInstance != null)
+            {
+                IFactoryObject factoryObject = objectInstance as IFactoryObject;
+                if (factoryObject != null)
+                {
+                    return IsFactoryDereference(name) || factoryObject.IsSingleton;
+                }
+                else
+                {
+                    return !IsFactoryDereference(name);
+                }
+            }
+            else
+            {
+                // No singleton instance found -> check object definition
+                IObjectFactory pof = ParentObjectFactory;
+                if (pof != null && !ContainsObjectDefinition(objectName))
+                {
+                    // No object definition found in this factory -> delegate to parent
+                    return pof.IsSingleton(OriginalObjectName(name));
+                }
+                RootObjectDefinition od = GetMergedObjectDefinition(objectName, false);
+
+                // In case of IFactoryObject, return singleton status of created object if not a dereference
+                if (od.IsSingleton)
+                {
+                    if (IsObjectTypeMatch(objectName, od, typeof(IFactoryObject)))
+                    {
+                        if (IsFactoryDereference(name))
+                        {
+                            return true;
+                        }
+                        IFactoryObject factoryObject =
+                            (IFactoryObject) GetObject(ObjectFactoryUtils.BuildFactoryObjectName(objectName));
+                        return factoryObject.IsSingleton;
+                    }
+                    else
+                    {
+                        return !IsFactoryDereference(name);
+                    }
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified object name is prototype.  That is, will GetObject
+        /// always return independent instances?
+        /// </summary>
+        /// <param name="name">The name of the object to query</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified object name will always deliver independent instances; otherwise, <c>false</c>.
+        /// </returns>
+        /// <remarks>This method returning false does not clearly indicate a singleton object.
+        /// It indicated non-independent instances, which may correspond to a scoped object as
+        /// well.  use the IsSingleton property to explicitly check for a shared
+        /// singleton instance.
+        /// <para>Translates aliases back to the corresponding canonical object name.  Will ask the
+        /// parent factory if the object can not be found in this factory instance.
+        /// </para>
+        /// </remarks>
+        /// <exception cref="NoSuchObjectDefinitionException">if there is no object with the given name.</exception>
+        public bool IsPrototype(string name)
+        {
+            string objectName = TransformedObjectName(name);
+            IObjectFactory parentFactory = ParentObjectFactory;
+            if (parentFactory != null && !this.ContainsObjectDefinition(objectName))
+            {
+                // No object definition found in this factory -> delegate to parent   
+                return parentFactory.IsPrototype(OriginalObjectName(name));
+            }
+
+            RootObjectDefinition od = GetMergedObjectDefinition(objectName, false);
+
+            // In case of FactoryObject, return singleton status of created object if not a dereference
+            if (od.IsPrototype)
+            {
+                return (!IsFactoryDereference(name) || IsObjectTypeMatch(objectName, od, typeof(IFactoryObject)));
+            }
+            else
+            {
+                // not a prototype, however factory object may still produce a prototype object
+                if (IsFactoryDereference(name) && IsObjectTypeMatch(objectName, od, typeof (IFactoryObject)))
+                {
+                    IFactoryObject factoryObject = GetFactoryObject(objectName);
+                    return (!factoryObject.IsSingleton);
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Does this object factory contain an object with the given name?
+        /// </summary>
+        /// <remarks>
+        /// This method does not (and it should not) check if the specified
+        /// object exists in one of the parent object factories. If it did,
+        /// message sources and event registries within application context 
+        /// hierarchy would have circular references, which would cause stack
+        /// overflows during message lookup, for example. (A. Seovic)
+        /// </remarks>
+        /// <see cref="Spring.Objects.Factory.IObjectFactory.ContainsObject"/>.
+        public bool ContainsObject(string name)
+        {
+            string objectName = TransformedObjectName(name);
+            lock (singletonCache)
+            {
+                if (singletonCache.Contains(objectName))
+                {
+                    return true;
+                }
+            }
+            if (ContainsObjectDefinition(objectName))
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Return the aliases for the given object name, if defined.
+        /// </summary>
+        /// <see cref="Spring.Objects.Factory.IObjectFactory.GetAliases"/>.
+        public string[] GetAliases(string name)
+        {
+            string objectName = TransformedObjectName(name);
+            // check if object actually exists in this object factory...
+            bool isInSingletonCache = false;
+            lock(singletonCache)
+            {
+                isInSingletonCache = singletonCache.Contains(objectName);
+            }
+            if (isInSingletonCache || ContainsObjectDefinition(objectName))
+            {
+                // if found, gather aliases...
+                ArrayList matches = new ArrayList();
+                lock (aliasMap)
+                {
+                    foreach (DictionaryEntry aliasEntry in aliasMap)
+                    {
+                        if (aliasEntry.Value.Equals(objectName))
+                        {
+                            matches.Add(aliasEntry.Key);
+                        }
+                    }
+                }
+                return (string[]) matches.ToArray(typeof(string));
+            }
+            else
+            {
+                // not found, so check parent...
+                if (ParentObjectFactory != null)
+                {
+                    return ParentObjectFactory.GetAliases(objectName);
+                }
+                throw new NoSuchObjectDefinitionException(objectName, ToString());
+            }
+        }
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the given object name.
+        /// </summary>
+        /// <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>.
+        public object this[string name]
+        {
+            get { return GetObject(name); }
+        }
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the given object name.
+        /// </summary>
+        /// <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>.
+        public object GetObject(string name)
+        {
+            return GetObject(name, typeof(object), ObjectUtils.EmptyObjects);
+        }
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the given object name.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method allows an object factory to be used as a replacement for the
+        /// Singleton or Prototype design pattern.
+        /// </p>
+        /// <p>
+        /// Note that callers should retain references to returned objects. There is no
+        /// guarantee that this method will be implemented to be efficient. For example,
+        /// it may be synchronized, or may need to run an RDBMS query.
+        /// </p>
+        /// <p>
+        /// Will ask the parent factory if the object cannot be found in this factory
+        /// instance.
+        /// </p>
+        /// </remarks>
+        /// <param name="name">The name of the object to return.</param>
+        /// <param name="arguments">
+        /// The arguments to use if creating a prototype using explicit arguments to
+        /// a static factory method. If there is no factory method and the
+        /// arguments are not null, then match the argument values by type and
+        /// call the object's constructor.
+        /// </param>
+        /// <returns>The instance of the object.</returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there's no such object definition.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object could not be created.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="name"/> is <see langword="null"/>.
+        /// </exception>
+        public object GetObject(string name, object[] arguments)
+        {
+            object instance = null;
+            string objectName = TransformedObjectName(name);
+
+            // check if object definition exists
+            RootObjectDefinition mergedObjectDefinition = null;
+            mergedObjectDefinition = GetMergedObjectDefinition(objectName, false);
+            if (mergedObjectDefinition == null)
+            {
+                if (ParentObjectFactory != null)
+                {
+                    return ParentObjectFactory.GetObject(name, arguments);
+                }
+                throw new NoSuchObjectDefinitionException(name, "Cannot find definition for object [" + name + "]");
+            }
+
+            // Override constructor values and configure as a prototype
+            RootObjectDefinition tmpObjectDefinition = new RootObjectDefinition(mergedObjectDefinition);
+            tmpObjectDefinition.ConstructorArgumentValues = null;
+            tmpObjectDefinition.IsSingleton = false;
+
+            // create a new instance...
+            instance = CreateObject(name, tmpObjectDefinition, arguments);
+
+            return GetObjectForInstance(name, instance);
+        }
+
+        /// <summary>
+        /// Tries to find a cached object for the specified name. 
+        /// </summary>
+        /// <param name="objectName">Teh object name to look for.</param>
+        /// <returns>The cached object if found, <see langword="null"/> otherwise.</returns>
+        protected virtual object GetSingleton(string objectName)
+        {
+            lock (singletonCache)
+            {
+                return singletonCache[objectName];
+            }
+        }
+
+        /// <summary>
+        /// Creates a singleton instance for the specified object name and definition.
+        /// </summary>
+        /// <param name="objectName">
+        /// The object name (will be used as the key in the singleton cache key).
+        /// </param>
+        /// <param name="objectDefinition">The object definition.</param>
+        /// <param name="arguments">
+        /// The arguments to use if creating a prototype using explicit arguments to
+        /// a static factory method. If there is no factory method and the
+        /// arguments are not null, then match the argument values by type and
+        /// call the object's constructor.
+        /// </param>
+        /// <returns>The created object instance.</returns>
+        protected virtual object CreateAndCacheSingletonInstance(string objectName,
+                                                                 RootObjectDefinition objectDefinition,
+                                                                 object[] arguments)
+        {
+            lock (singletonCache)
+            {
+                object sharedInstance = singletonCache[objectName];
+                if (sharedInstance == null)
+                {
+                    #region Instrumentation
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug("Creating shared instance of singleton object '" + objectName + "'");
+                    }
+
+                    #endregion
+
+                    BeforeSingletonCreation(objectName);                    
+                    try
+                    {
+                        sharedInstance = CreateObject(objectName, objectDefinition, arguments);
+                    }
+                    finally
+                    {
+                        AfterSingletonCreation(objectName);
+                    }
+                    AddSingleton(objectName, sharedInstance);
+                }
+                return sharedInstance;
+            }
+        }
+
+        private void AfterSingletonCreation(string name)
+        {
+            if (!singletonsInCreation.Contains(name))
+            {
+                throw new InvalidOperationException("Singleton " + name + " isn't currently in creation.");
+            }
+            singletonsInCreation.Remove(name);
+        }
+
+        private void BeforeSingletonCreation(string name)
+        {
+            if (this.singletonsInCreation.Contains(name))
+            {
+                throw new ObjectCurrentlyInCreationException(name);
+            }
+            singletonsInCreation.Add(name, emptyObject);
+        }
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the given object name.
+        /// </summary>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.GetObject(string, Type)"/>
+        public object GetObject(string name, Type requiredType)
+        {
+            return GetObject(name, requiredType, ObjectUtils.EmptyObjects);
+        }
+
+        /// <summary>
+        /// Injects dependencies into the supplied <paramref name="target"/> instance
+        /// using the named object definition.
+        /// </summary>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.ConfigureObject(object, string)"/>
+        public abstract object ConfigureObject(object target, string name);
+
+        /// <summary>
+        /// Injects dependencies into the supplied <paramref name="target"/> instance
+        /// using the supplied <paramref name="definition"/>.
+        /// </summary>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.ConfigureObject(object, string)"/>
+        public abstract object ConfigureObject(object target, string name, IObjectDefinition definition);
+
+        #endregion
+
+        #region IConfigurableObjectFactory Members
+
+        /// <summary>
+        /// Destroy all cached singletons in this factory.
+        /// </summary>
+        public virtual void Dispose()
+        {
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(string.Format("Destroying singletons in factory [{0}].", this));
+            }
+
+            #endregion
+
+            lock (singletonCache)
+            {
+                // copy the keys into a new set, 'cos we are going to modifying the
+                // original collection (_singletonCache) as we destroy each singleton.
+                ISet keys = new HashedSet(singletonCache.Keys);
+                foreach (string name in keys)
+                {
+                    DestroySingleton(name);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Ignore the given dependency type for autowiring
+        /// </summary>
+        /// <seealso cref="Spring.Objects.Factory.Config.IConfigurableObjectFactory.IgnoreDependencyType"/>.
+        public void IgnoreDependencyType(Type type)
+        {
+            IgnoredDependencyTypes.Add(type);
+        }
+
+        /// <summary>
+        /// Determines whether the specified object name is currently in creation..
+        /// </summary>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified object name is currently in creation; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsCurrentlyInCreation(string objectName)
+        {
+            return IsSingletonCurrentlyInCreation(objectName) || IsPrototypeCurrentlyInCreation(objectName);
+        }
+
+        private bool IsPrototypeCurrentlyInCreation(string name)
+        {
+            //TODO 
+            return false;
+        }
+
+        private bool IsSingletonCurrentlyInCreation(string name)
+        {
+            if (this.singletonsInCreation.Contains(name))
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Add a new <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+        /// that will get applied to objects created by this factory.
+        /// </summary>
+        /// <param name="objectPostProcessor">
+        /// The <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+        /// to register.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Factory.Config.IConfigurableObjectFactory.AddObjectPostProcessor"/>.
+        public void AddObjectPostProcessor(IObjectPostProcessor objectPostProcessor)
+        {
+			// ensure the same instance doesn't get registered twice
+			if (!ObjectPostProcessors.Contains(objectPostProcessor))
+			{
+				ObjectPostProcessors.Add(objectPostProcessor);
+			}
+            if (typeof (IInstantiationAwareObjectPostProcessor).IsInstanceOfType(objectPostProcessor))
+            {
+                hasInstantiationAwareBeanPostProcessors = true;
+            }
+            if (typeof (IDestructionAwareObjectPostProcessor).IsInstanceOfType(objectPostProcessor))
+            {
+                hasDestructionAwareBeanPostProcessors = true;
+            }
+        }
+
+        /// <summary>
+        /// Returns the current number of registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>s.
+        /// </summary>
+        /// <value>
+        /// The current number of registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectPostProcessor"/>s.
+        /// </value>
+        /// <seealso cref="Spring.Objects.Factory.Config.IConfigurableObjectFactory.ObjectPostProcessorCount"/>.
+        public int ObjectPostProcessorCount
+        {
+            get { return ObjectPostProcessors.Count; }
+        }
+
+        /// <summary>
+        /// Given an object name, create an alias.
+        /// </summary>
+        /// <seealso cref="Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterAlias"/>.
+        public void RegisterAlias(string name, string alias)
+        {
+            #region Sanity Checks
+
+            AssertUtils.ArgumentHasText(name, "The object name must not be empty.");
+            AssertUtils.ArgumentHasText(alias, "The alias must not be empty.");
+
+            #endregion
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(string.Format("Registering alias '{0}' for object with name '{1}'.", alias, name));
+            }
+
+            #endregion
+
+            lock (aliasMap)
+            {
+                object registeredName = aliasMap[alias];
+                if (registeredName != null)
+                {
+                    throw new ObjectDefinitionStoreException(
+                            string.Format(
+                                    "Cannot register alias '{0}' for object with name '{1}': it's already registered for object name '{2}'.",
+                                    alias, name, registeredName));
+                }
+                aliasMap[alias] = name;
+            }
+        }
+
+        /// <summary>
+        /// Register the given existing object as singleton in the object factory,
+        /// under the given object name.
+        /// </summary>
+        /// <seealso cref="Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterSingleton"/>.
+        public void RegisterSingleton(string name, object singletonObject)
+        {
+            AssertUtils.ArgumentHasText(name, "name", "The singleton object cannot be registered under an empty name.");
+            lock (singletonCache)
+            {
+                object oldObject = singletonCache[name];
+                if (oldObject != null)
+                {
+                    throw new ObjectDefinitionStoreException(
+                            string.Format(
+                                    "Could not register object [{0}] under object name '{1}': there's already object [{2}] bound.",
+                                    singletonObject, name, oldObject));
+                }
+                AddSingleton(name, singletonObject);
+            }
+        }
+
+        /// <summary>
+        /// Register the given custom <see cref="System.ComponentModel.TypeConverter"/>
+        /// for all properties of the given <see cref="System.Type"/>.
+        /// </summary>
+        /// <seealso cref="Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterCustomConverter"/>.
+        public void RegisterCustomConverter(Type requiredType, TypeConverter converter)
+        {
+            AssertUtils.ArgumentNotNull(requiredType, "requiredType");
+            TypeConverterRegistry.RegisterConverter(requiredType, converter);
+        }
+
+        /// <summary>
+        /// Does this object factory contains a singleton instance with the
+        /// supplied <paramref name="name"/>?
+        /// </summary>
+        /// <seealso cref="Spring.Objects.Factory.Config.IConfigurableObjectFactory.ContainsSingleton(string)"/>
+        public bool ContainsSingleton(string name)
+        {
+            AssertUtils.ArgumentHasText(name, "name");
+            lock (singletonCache)
+            {
+                return singletonCache.Contains(name);
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AutowireUtils.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AutowireUtils.cs
new file mode 100644
index 00000000..73005c0a
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/AutowireUtils.cs
@@ -0,0 +1,286 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using Spring.Collections;
+using Spring.Core;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Utility class that contains various methods useful for the implementation of
+	/// autowire-capable object factories.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: AutowireUtils.cs,v 1.7 2008/04/02 18:02:24 markpollack Exp $</version>
+	public sealed class AutowireUtils
+	{
+		#region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the AutowireUtils class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such has no publicly
+		/// visible constructors.
+		/// </p>
+		/// </remarks>
+		private AutowireUtils()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+
+		/// <summary>
+		/// Gets those <see cref="System.Reflection.ConstructorInfo"/>s
+		/// that are applicable for autowiring the supplied <paramref name="definition"/>.
+		/// </summary>
+		/// <param name="definition">
+		/// The <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>
+		/// (definition) that is being autowired by constructor.
+		/// </param>
+		/// <param name="minimumArgumentCount">
+		/// The absolute minimum number of arguments that any returned constructor
+		/// must have. If this parameter is equal to zero (0), then all constructors
+		/// are valid (regardless of their argument count), including any default
+		/// constructor.
+		/// </param>
+		/// <returns>
+		/// Those <see cref="System.Reflection.ConstructorInfo"/>s
+		/// that are applicable for autowiring the supplied <paramref name="definition"/>.
+		/// </returns>
+		public static ConstructorInfo[] GetConstructors(
+			IObjectDefinition definition, int minimumArgumentCount)
+		{
+			const BindingFlags flags =
+					  BindingFlags.Public | BindingFlags.NonPublic
+					  | BindingFlags.Instance | BindingFlags.DeclaredOnly;
+			ConstructorInfo[] constructors = null;
+			if (minimumArgumentCount > 0)
+			{
+				MemberInfo[] ctors = definition.ObjectType.FindMembers(
+					MemberTypes.Constructor,
+					flags,
+					new MemberFilter(new CriteriaMemberFilter().FilterMemberByCriteria),
+					new MinimumArgumentCountCriteria(minimumArgumentCount));
+				constructors = (ConstructorInfo[]) ArrayList.Adapter(ctors).ToArray(typeof (ConstructorInfo));
+			}
+			else
+			{
+				constructors = definition.ObjectType.GetConstructors(flags);
+			}
+			AutowireUtils.SortConstructors(constructors);
+			return constructors;
+		}
+
+		/// <summary>
+		/// Determine a weight that represents the class hierarchy difference between types and
+		/// arguments.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// A direct match, i.e. type MyInteger -> arg of class MyInteger, does not increase
+		/// the result - all direct matches means weight zero (0). A match between the argument type
+		/// <see cref="System.Object"/> and a MyInteger instance argument would increase the weight by
+		/// 1, due to the superclass (<see cref="System.Object"/>) being one (1) steps up in the
+		/// class hierarchy being the last one that still matches the required type.
+		/// </p>
+		/// <p>
+		/// Therefore, with an argument of type <see cref="System.Collections.Hashtable"/>, a
+		/// constructor taking a <see cref="System.Collections.Hashtable"/> argument would be
+		/// preferred to a constructor taking an <see cref="System.Collections.IDictionary"/> argument
+		/// which would be preferred to a constructor taking an
+		/// <see cref="System.Collections.ICollection"/> argument which would in turn be preferred
+		/// to a constructor taking an <see cref="System.Object"/> argument.
+		/// </p>
+		/// <p>
+		/// All argument weights get accumulated.
+		/// </p>
+		/// </remarks>
+		/// <param name="argTypes">
+		/// The argument <see cref="System.Type"/>s to match.
+		/// </param>
+		/// <param name="args">The arguments to match.</param>
+		/// <returns>The accumulated weight for all arguments.</returns>
+		public static int GetTypeDifferenceWeight(ParameterInfo[] argTypes, object[] args)
+		{
+			if (argTypes.Length != args.Length)
+			{
+				throw new ArgumentException("Cannot calculate the type difference weight for argument types and arguments with differing lengths.");
+			}
+			int result = 0;
+			for (int i = 0; i < argTypes.Length; i++)
+			{
+				Type theParameterType = argTypes[i].ParameterType;
+				if (!ObjectUtils.IsAssignable(theParameterType, args[i]))
+				{
+					return Int32.MaxValue;
+				}
+				if (args[i] != null
+					&& !(args[i].GetType().Equals(theParameterType)))
+				{
+					Type superType = args[i].GetType().BaseType;
+					while (superType != null)
+					{
+						if (theParameterType.IsAssignableFrom(superType))
+						{
+							++result;
+							superType = superType.BaseType;
+						}
+						else
+						{
+							superType = null;
+						}
+					}
+				}
+			}
+			return result;
+		}
+
+        /// <summary>
+        /// Determines whether the given object property is excluded from dependency checks.
+        /// </summary>
+        /// <param name="pi">The PropertyInfo of the object property.</param>
+        /// <returns>
+        /// 	<c>true</c> if is excluded from dependency check; otherwise, <c>false</c>.
+        /// </returns>
+        public static Boolean IsExcludedFromDependencyCheck(PropertyInfo pi)
+        {
+            return (pi.GetSetMethod() == null) ? false : true;
+        }
+
+		/// <summary>
+		/// Sorts the supplied <paramref name="constructors"/>, preferring
+		/// public constructors and "greedy" ones (that have lots of arguments).
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The result will contain public constructors first, with a decreasing number
+		/// of arguments, then non-public constructors, again with a decreasing number
+		/// of arguments.
+		/// </p>
+		/// </remarks>
+		/// <param name="constructors">
+		/// The <see cref="System.Reflection.ConstructorInfo"/> array to be sorted.
+		/// </param>
+		public static void SortConstructors(ConstructorInfo[] constructors)
+		{
+			if (constructors != null
+				&& constructors.Length > 0)
+			{
+				Array.Sort(constructors, new ConstructorComparer());
+			}
+		}
+
+		#region Inner Class : ConstructorComparer
+
+		private sealed class ConstructorComparer : IComparer
+		{
+			public int Compare(object lhs, object rhs)
+			{
+				ConstructorInfo lhsCtor = (ConstructorInfo) lhs;
+				ConstructorInfo rhsCtor = (ConstructorInfo) rhs;
+				if (lhsCtor.IsPublic != rhsCtor.IsPublic)
+				{
+					return (lhsCtor.IsPublic ? -1 : 1);
+				}
+				int lhsParams = lhsCtor.GetParameters().Length;
+				int rhsParams = rhsCtor.GetParameters().Length;
+
+				if (lhsParams < rhsParams)
+				{
+					return 1;
+				}
+				else if (lhsParams > rhsParams)
+				{
+					return -1;
+				}
+				else
+				{
+					return 0;
+				}
+			}
+		}
+
+		#endregion
+
+		#region Inner Class : MinimumArgumentCountCriteria
+
+		private sealed class MinimumArgumentCountCriteria : ICriteria
+		{
+			public MinimumArgumentCountCriteria(int minimumArgumentCount)
+			{
+				_minimumArgumentCount = minimumArgumentCount;
+			}
+
+			public bool IsSatisfied(object datum)
+			{
+				bool satisfied = false;
+				satisfied = ((MethodBase) datum).GetParameters().Length >= _minimumArgumentCount;
+				return satisfied;
+			}
+
+			private int _minimumArgumentCount;
+		}
+
+		#endregion
+
+        /// <summary>
+        /// Determines whether the setter property is defined in any of the given interfaces.
+        /// </summary>
+        /// <param name="propertyInfo">The PropertyInfo of the object property</param>
+        /// <param name="interfaces">The ISet of interfaces.</param>
+        /// <returns>
+        /// 	<c>true</c> if setter property is defined in interface; otherwise, <c>false</c>.
+        /// </returns>
+	    public static bool IsSetterDefinedInInterface(PropertyInfo propertyInfo, ISet interfaces)
+	    {
+	        MethodInfo setter = propertyInfo.GetSetMethod();
+            if (setter != null)
+            {
+                Type targetType = setter.DeclaringType;
+                foreach (Type interfaceType in interfaces)
+                {
+                    if (interfaceType.IsAssignableFrom(targetType) &&
+                        ReflectionUtils.GetMethod(interfaceType, setter.Name, ReflectionUtils.GetParameterTypes(setter)) != null)                    
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+	    }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ChildObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ChildObjectDefinition.cs
new file mode 100644
index 00000000..917b43ee
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/ChildObjectDefinition.cs
@@ -0,0 +1,255 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Text;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Object definition for definitions that inherit settings from their
+    /// parent (object definition).
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Will use the <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.ObjectType"/>
+    /// of the parent object definition if none is specified, but can also
+    /// override it. In the latter case, the child's
+    /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.ObjectType"/>
+    /// must be compatible with the parent, i.e. accept the parent's property values
+    /// and constructor argument values (if any).
+    /// </p>
+    /// <p>
+    /// A <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/> will
+    /// inherit all of the <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>,
+    /// <see cref="Spring.Objects.IPropertyValues"/>, and
+    /// <see cref="Spring.Objects.Factory.Config.EventValues"/> from it's parent
+    /// object definition, with the option to add new values. If the
+    /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.InitMethodName"/>,
+    /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.DestroyMethodName"/>,
+    /// and / or <see langword="static"/>
+    /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.FactoryMethodName"/>
+    /// properties are specified, they will override the corresponding parent settings.
+    /// </p>
+    /// <p>
+    /// The remaining settings will <i>always</i> be taken from the child definition:
+    /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.DependsOn"/>,
+    /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.AutowireMode"/>,
+    /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.DependencyCheck"/>,
+    /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.IsSingleton"/>,
+    /// and
+    /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.IsLazyInit"/>
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <seealso cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+    [Serializable]
+    public class ChildObjectDefinition : AbstractObjectDefinition
+    {
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+        /// class.
+        /// </summary>
+        /// <param name="parentName">
+        /// The name of the parent object.
+        /// </param>
+        public ChildObjectDefinition(string parentName)
+        {
+            this.parentName = parentName;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+        /// class.
+        /// </summary>
+        /// <param name="parentName">
+        /// The name of the parent object.
+        /// </param>
+        /// <param name="properties">
+        /// The additional property values (if any) of the child.
+        /// </param>
+        public ChildObjectDefinition(string parentName, MutablePropertyValues properties)
+            : base(null, properties)
+        {
+            this.parentName = parentName;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+        /// class.
+        /// </summary>
+        /// <param name="parentName">
+        /// The name of the parent object.
+        /// </param>
+        /// <param name="arguments">
+        /// The <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+        /// to be applied to a new instance of the object.
+        /// </param>
+        /// <param name="properties">
+        /// The additional property values (if any) of the child.
+        /// </param>
+        public ChildObjectDefinition(
+            string parentName, ConstructorArgumentValues arguments, MutablePropertyValues properties)
+            : base(arguments, properties)
+        {
+            this.parentName = parentName;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+        /// class.
+        /// </summary>
+        /// <param name="parentName">
+        /// The name of the parent object.
+        /// </param>
+        /// <param name="type">
+        /// The class of the object to instantiate.
+        /// </param>
+        /// <param name="arguments">
+        /// The <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+        /// to be applied to a new instance of the object.
+        /// </param>
+        /// <param name="properties">
+        /// The additional property values (if any) of the child.
+        /// </param>
+        public ChildObjectDefinition(
+            string parentName, Type type, ConstructorArgumentValues arguments, MutablePropertyValues properties)
+            : base(arguments, properties)
+        {
+            this.parentName = parentName;
+            ObjectType = type;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+        /// class.
+        /// </summary>
+        /// <param name="parentName">
+        /// The name of the parent object.
+        /// </param>
+        /// <param name="typeName">
+        /// The <see cref="System.Type.AssemblyQualifiedName"/> of the object to
+        /// instantiate.
+        /// </param>
+        /// <param name="arguments">
+        /// The <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+        /// to be applied to a new instance of the object.
+        /// </param>
+        /// <param name="properties">
+        /// The additional property values (if any) of the child.
+        /// </param>
+        public ChildObjectDefinition(
+            string parentName, string typeName, ConstructorArgumentValues arguments, MutablePropertyValues properties)
+            : base(arguments, properties)
+        {
+            this.parentName = parentName;
+            ObjectTypeName = typeName;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The name of the parent object definition.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This value is <b>required</b>.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The name of the parent object definition.
+        /// </value>
+        public string ParentName
+        {
+            get { return parentName; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Validate this object definition.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// A common cause of validation failures is a missing value for the
+        /// <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition.ParentName"/>
+        /// property; <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/> by
+        /// their very nature <b>require</b> that the
+        /// <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition.ParentName"/>
+        /// be set.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Objects.Factory.Support.ObjectDefinitionValidationException">
+        /// In the case of a validation failure.
+        /// </exception>
+        public override void Validate()
+        {
+            base.Validate();
+            if (StringUtils.IsNullOrEmpty(parentName))
+            {
+                throw new ObjectDefinitionValidationException(
+                    "The 'ParentName' property must be set in ChildObjectDefinition.");
+            }
+        }
+
+        /// <summary>
+        /// A <see cref="System.String"/> that represents the current
+        /// <see cref="System.Object"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents the current
+        /// <see cref="System.Object"/>.
+        /// </returns>
+        public override string ToString()
+        {
+            StringBuilder buffer = new StringBuilder();
+            buffer.Append(GetType().Name).Append(" with parent '");
+            buffer.Append(ParentName).Append("' : ").Append(base.ToString());
+            return buffer.ToString();
+        }
+
+        #endregion
+
+        #region Fields
+
+        private string parentName;
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DefaultListableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultListableObjectFactory.cs
new file mode 100644
index 00000000..8b34d12b
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultListableObjectFactory.cs
@@ -0,0 +1,893 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Globalization;
+using Common.Logging;
+using Spring.Core;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Concrete implementation of the
+    /// <see cref="Spring.Objects.Factory.IListableObjectFactory"/> and
+    /// <see cref="Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+    /// interfaces.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This class is a full-fledged object factory based on object definitions
+    /// that is usable straight out of the box.
+    /// </p>
+    /// <p>
+    /// Can be used as an object factory in and of itself, or as a superclass
+    /// for custom object factory implementations. Note that readers for
+    /// specific object definition formats are typically implemented separately
+    /// rather than as object factory subclasses.
+    /// </p>
+    /// <p>
+    /// For an alternative implementation of the
+    /// <see cref="Spring.Objects.Factory.IListableObjectFactory"/> interface,
+    /// have a look at the
+    /// <see cref="Spring.Objects.Factory.Support.StaticListableObjectFactory"/>
+    /// class, which manages existing object instances rather than creating new
+    /// ones based on object definitions.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <seealso cref="Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/>
+    /// <version>$Id: DefaultListableObjectFactory.cs,v 1.42 2007/10/10 19:17:07 bbaia Exp $</version>
+    [Serializable]
+    public class DefaultListableObjectFactory :
+        AbstractAutowireCapableObjectFactory,
+        IConfigurableListableObjectFactory,
+        IObjectDefinitionRegistry
+    {
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.DefaultListableObjectFactory"/> class.
+        /// </summary>
+        public DefaultListableObjectFactory() : this(true, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.DefaultListableObjectFactory"/> class.
+        /// </summary>
+        /// <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+        public DefaultListableObjectFactory(bool caseSensitive) : this(caseSensitive, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.DefaultListableObjectFactory"/> class.
+        /// </summary>
+        /// <param name="parentFactory">The parent object factory.</param>
+        public DefaultListableObjectFactory(IObjectFactory parentFactory)
+            : this(true, parentFactory)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.DefaultListableObjectFactory"/> class.
+        /// </summary>
+        /// <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+        /// <param name="parentFactory">The parent object factory.</param>
+        public DefaultListableObjectFactory(bool caseSensitive, IObjectFactory parentFactory)
+            : base(caseSensitive, parentFactory)
+        {
+            if (caseSensitive)
+            {
+                objectDefinitionMap = new Hashtable();
+            }
+            else
+            {
+                objectDefinitionMap = CollectionsUtil.CreateCaseInsensitiveHashtable();
+            }
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Should object definitions registered under the same name as an
+        /// existing object definition be allowed?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If <see langword="true"/>, then the new object definition will
+        /// replace (override) the existing object definition. If
+        /// <see langword="false"/>, an exception will be thrown when
+        /// an attempt is made to register an object definition under the same
+        /// name as an already existing object definition.
+        /// </p>
+        /// <p>
+        /// The default is <see langword="true"/>.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// <see langword="true"/> is the registration of an object definition
+        /// under the same name as an existing object definition is allowed.
+        /// </value>
+        public bool AllowObjectDefinitionOverriding
+        {
+            get { return allowObjectDefinitionOverriding; }
+            set { allowObjectDefinitionOverriding = value; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Find object instances that match the <paramref name="requiredType"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Called by autowiring. If a subclass cannot obtain information about object
+        /// names by <see cref="System.Type"/>, a corresponding exception should be thrown.
+        /// </p>
+        /// </remarks>
+        /// <param name="requiredType">
+        /// The type of the objects to look up.
+        /// </param>
+        /// <returns>
+        /// An <see cref="System.Collections.IDictionary"/> of object names and object
+        /// instances that match the <paramref name="requiredType"/>, or
+        /// <see langword="null"/> if none is found.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        protected override IDictionary FindMatchingObjects(Type requiredType)
+        {
+            return ObjectFactoryUtils.ObjectsOfTypeIncludingAncestors(
+                this, requiredType, true, true);
+        }
+
+        /// <summary>
+        /// Return the names of the objects that depend on the given object.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Called by the
+        /// <see cref="Spring.Objects.Factory.Support.AbstractObjectFactory.DestroyObject"/>
+        /// so that dependant objects are able to be disposed of first.
+        /// </p>
+        /// </remarks>
+        /// <param name="objectName">
+        /// The name of the object to find depending objects for.
+        /// </param>
+        /// <returns>
+        /// The array of names of depending objects, or the empty string array if none.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        protected override string[] GetDependingObjectNames(string objectName)
+        {
+            ArrayList dependingObjectNames = new ArrayList();
+            string[] allObjectDefinitionNames = GetObjectDefinitionNames();
+            foreach (string name in allObjectDefinitionNames)
+            {
+                if (ContainsObjectDefinition(name))
+                {
+                    RootObjectDefinition rod
+                        = GetMergedObjectDefinition(name, false);
+                    if (rod.DependsOn != null)
+                    {
+                        IList dependsOn = new ArrayList(rod.DependsOn);
+                        if (dependsOn.Contains(objectName))
+                        {
+                            #region Instrumentation
+
+                            if (log.IsDebugEnabled)
+                            {
+                                log.Debug(string.Format(
+                                              CultureInfo.InvariantCulture,
+                                              "Found depending object '{0}' for object '{1}'.",
+                                              name, objectName));
+                            }
+
+                            #endregion
+
+                            dependingObjectNames.Add(name);
+                        }
+                    }
+                }
+            }
+            return (string[]) dependingObjectNames.ToArray(typeof(string));
+        }
+
+        /// <summary>
+        /// Check whether the specified object matches the supplied <paramref name="type"/>.
+        /// </summary>
+        /// <param name="objectName">The name of the object to check.</param>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> to check for.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the object matches the supplied <paramref name="type"/>,
+        /// or if the supplied <paramref name="type"/> is <see langword="null"/>.
+        /// </returns>
+        private bool IsObjectTypeMatch(string objectName, Type type)
+        {
+            if (type == null)
+            {
+                return true;
+            }
+            Type objectType = GetType(objectName);
+            return (objectType != null && type.IsAssignableFrom(objectType));
+        }
+
+        private bool IsObjectDefinitionTypeMatch(string name, Type checkedType)
+        {
+            if (checkedType == null)
+            {
+                return true;
+            }
+            RootObjectDefinition rod = GetMergedObjectDefinition(name, false);
+            return (rod.HasObjectType && checkedType.IsAssignableFrom(rod.ObjectType));
+        }
+/*
+        /// <summary>
+        /// Merges the object definitions.
+        /// </summary>
+        /// <param name="name">Object definition name.</param>
+        /// <param name="parentDefinition">The parent definition.</param>
+        /// <param name="childDefinition">The child definition.</param>
+        /// <returns>Merged object definition.</returns>
+        protected override RootObjectDefinition MergeObjectDefinitions(string name, IObjectDefinition parentDefinition,
+                                                                       IObjectDefinition childDefinition)
+        {
+            RootObjectDefinition rootDefinition = base.MergeObjectDefinitions(name, parentDefinition, childDefinition);
+            RegisterObjectDefinition(name, rootDefinition);
+            return rootDefinition;
+        }
+*/
+        #endregion
+
+        #region Fields
+
+        /// <summary>
+        /// The <see cref="Common.Logging.ILog"/> instance for this class.
+        /// </summary>
+        private readonly ILog log = LogManager.GetLogger(typeof(DefaultListableObjectFactory));
+
+        /// <summary>
+        /// Whether to allow re-registration of a different definition with the
+        /// same name.
+        /// </summary>
+        private bool allowObjectDefinitionOverriding = true;
+
+        /// <summary>
+        /// The mapping of object definition objects, keyed by object name.
+        /// </summary>
+        private readonly IDictionary objectDefinitionMap;
+
+        /// <summary>
+        /// List of object definition names, in registration order.
+        /// </summary>
+        private readonly IList objectDefinitionNames = new ArrayList();
+
+        #endregion
+
+        #region IObjectDefinitionRegistry Members
+
+        /// <summary>
+        /// Return the number of objects defined in this registry.
+        /// </summary>
+        /// <value>
+        /// The number of objects defined in this registry.
+        /// </value>
+        /// <seealso cref="Spring.Objects.Factory.Support.IObjectDefinitionRegistry.ObjectDefinitionCount"/>
+        public int ObjectDefinitionCount
+        {
+            get { return objectDefinitionMap.Count; }
+        }
+
+        /// <summary>
+        /// Check if this registry contains a object definition with the given
+        /// name.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object to look for.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if this object factory contains an object
+        /// definition with the given name.
+        /// </returns>
+        /// <seealso cref="Spring.Objects.Factory.Support.IObjectDefinitionRegistry.ContainsObjectDefinition(string)"/>
+        public override bool ContainsObjectDefinition(string name)
+        {
+            return objectDefinitionMap.Contains(name);
+        }
+
+        /// <summary>
+        /// Register a new object definition with this registry.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object instance to register.
+        /// </param>
+        /// <param name="objectDefinition">
+        /// The definition of the object instance to register.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object definition is invalid.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.Support.IObjectDefinitionRegistry.RegisterObjectDefinition(string, IObjectDefinition)"/>
+        public void RegisterObjectDefinition(
+            string name, IObjectDefinition objectDefinition)
+        {
+            if (objectDefinition is AbstractObjectDefinition)
+            {
+                try
+                {
+                    ((AbstractObjectDefinition) objectDefinition).Validate();
+                }
+                catch (ObjectDefinitionValidationException ex)
+                {
+                    throw new ObjectDefinitionStoreException(
+                        objectDefinition.ResourceDescription,
+                        name,
+                        "Validation of object definition failed.",
+                        ex);
+                }
+            }
+            object oldObjectDefinition = objectDefinitionMap[name];
+            if (oldObjectDefinition != null)
+            {
+                if (!AllowObjectDefinitionOverriding)
+                {
+                    throw new ObjectDefinitionStoreException(
+                        string.Format(
+                            "Cannot register object definition [{0}] for object '{1}': there's already [{2}] bound.",
+                            objectDefinition, name, oldObjectDefinition));
+                }
+                else
+                {
+                    #region Instrumentation
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(
+                            string.Format(
+                                "Overriding object definition for object '{0}': replacing [{1}] with [{2}].",
+                                name, oldObjectDefinition, objectDefinition));
+                    }
+
+                    #endregion
+                }
+            }
+            else
+            {
+                objectDefinitionNames.Add(name);
+            }
+            objectDefinitionMap[name] = objectDefinition;
+        }
+
+        #endregion
+
+        #region IConfigurableListableObjectFactory Members
+
+        /// <summary>
+        /// Ensure that all non-lazy-init singletons are instantiated, also
+        /// considering <see cref="Spring.Objects.Factory.IFactoryObject"/>s.
+        /// </summary>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If one of the singleton objects could not be created.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.Config.IConfigurableListableObjectFactory.PreInstantiateSingletons"/>
+        public void PreInstantiateSingletons()
+        {
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug("Pre-instantiating singletons in factory [" + this + "]");
+            }
+
+            #endregion
+
+            try
+            {
+                int definitionCount = objectDefinitionNames.Count;
+                for (int i = 0; i < definitionCount; i++)
+                {
+                    string name = (string) objectDefinitionNames[i];
+                    if (!ContainsSingleton(name) && ContainsObjectDefinition(name))
+                    {
+                        RootObjectDefinition definition
+                            = GetMergedObjectDefinition(name, false);
+                        if (!definition.IsAbstract
+                            && definition.IsSingleton
+                            && !definition.IsLazyInit)
+                        {
+                            Type objectType = ResolveObjectType(definition, name);
+                            if (objectType != null
+                                && typeof(IFactoryObject).IsAssignableFrom(definition.ObjectType))
+                            {
+                                IFactoryObject factoryObject = (IFactoryObject) GetObject(
+                                                                                    ObjectFactoryUtils.
+                                                                                        BuildFactoryObjectName(name));
+                                if (factoryObject.IsSingleton)
+                                {
+                                    GetObject(name);
+                                }
+                            }
+                            else
+                            {
+                                GetObject(name);
+                            }
+                        }
+                    }
+                }
+            }
+            catch (ObjectsException)
+            {
+                // destroy already created singletons to avoid dangling resources...
+                try
+                {
+                    Dispose();
+                }
+                catch (Exception ex)
+                {
+                    log.Error(
+                        "PreInstantiateSingletons failed but couldn't destroy any already-created singletons.",
+                        ex);
+                }
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Return the registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+        /// given object, allowing access to its property values and constructor
+        /// argument values.
+        /// </summary>
+        /// <param name="name">The name of the object.</param>
+        /// <returns>
+        /// The registered <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>, 
+        /// or <c>null</c>, if specified object definitions does not exist.
+        /// </returns>
+        /// <exception cref="System.ArgumentException">
+        /// If <paramref name="name"/> is <c>null</c> or empty string.
+        /// </exception>
+        /// <seealso cref="IConfigurableListableObjectFactory.GetObjectDefinition(string)"/>
+        public override IObjectDefinition GetObjectDefinition(string name)
+        {
+            return GetObjectDefinition(name, false);
+        }
+
+        /// <summary>
+        /// Return the registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+        /// given object, allowing access to its property values and constructor
+        /// argument values.
+        /// </summary>
+        /// <param name="name">The name of the object.</param>
+        /// <param name="includeAncestors">Whether to search parent object factories.</param>
+        /// <returns>
+        /// The registered <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>, 
+        /// or <c>null</c>, if specified object definitions does not exist.
+        /// </returns>
+        /// <exception cref="System.ArgumentException">
+        /// If <paramref name="name"/> is <c>null</c> or empty string.
+        /// </exception>
+        /// <seealso cref="IConfigurableListableObjectFactory.GetObjectDefinition(string)"/>
+        public override IObjectDefinition GetObjectDefinition(string name, bool includeAncestors)
+        {
+            if (StringUtils.IsNullOrEmpty(name))
+            {
+                throw new ArgumentException(
+                    "Cannot get an object definition with a null or zero length object name string.");
+            }
+
+            name = TransformedObjectName(name);
+            IObjectDefinition definition = (IObjectDefinition) objectDefinitionMap[name];
+            if (definition == null)
+            {
+                if (!includeAncestors || ParentObjectFactory == null)
+                {
+                    return null;
+                }
+                else if (ParentObjectFactory is AbstractObjectFactory)
+                {
+                    definition =
+                        ((AbstractObjectFactory) ParentObjectFactory).GetObjectDefinition(name, includeAncestors);
+                }
+            }
+            return definition;
+        }
+
+        #endregion
+
+        #region IListableObjectFactory Members
+
+        /// <summary>
+        /// Return the names of all objects defined in this factory.
+        /// </summary>
+        /// <returns>
+        /// The names of all objects defined in this factory, or an empty array if none
+        /// are defined.
+        /// </returns>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectDefinitionNames()"/>
+        public string[] GetObjectDefinitionNames()
+        {
+            return (string[]) ((ArrayList) objectDefinitionNames).ToArray(typeof(string));
+        }
+
+        /// <summary>
+        /// Return the names of objects matching the given <see cref="System.Type"/>
+        /// (including subclasses), judging from the object definitions.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> (class or interface) to match, or <see langword="null"/>
+        /// for all object names.
+        /// </param>
+        /// <returns>
+        /// The names of all objects defined in this factory, or an empty array if none
+        /// are defined.
+        /// </returns>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectDefinitionNames()"/>
+        public string[] GetObjectDefinitionNames(Type type)
+        {
+            ArrayList matches = new ArrayList();
+            foreach (string name in objectDefinitionNames)
+            {
+                if (IsObjectDefinitionTypeMatch(name, type))
+                {
+                    matches.Add(name);
+                }
+            }
+            return (string[]) matches.ToArray(typeof(string));
+        }
+
+        /// <summary>
+        /// Return the names of objects matching the given <see cref="System.Type"/>
+        /// (including subclasses), judging from the object definitions.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> (class or interface) to match, or <see langword="null"/>
+        /// for all object names.
+        /// </param>
+        /// <returns>
+        /// The names of all objects defined in this factory, or an empty array if none
+        /// are defined.
+        /// </returns>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectNamesForType(Type)"/>
+        public string[] GetObjectNamesForType(Type type)
+        {
+            return GetObjectNamesForType(type, true, true);
+        }
+
+        /// <summary>
+        /// Return the names of objects matching the given <see cref="System.Type"/>
+        /// (including subclasses), judging from the object definitions.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> (class or interface) to match, or <see langword="null"/>
+        /// for all object names.
+        /// </param>
+        /// <param name="includePrototypes">
+        /// Whether to include prototype objects too or just singletons (also applies to
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s).
+        /// </param>
+        /// <param name="includeFactoryObjects">
+        /// Whether to include <see cref="Spring.Objects.Factory.IFactoryObject"/>s too
+        /// or just normal objects.
+        /// </param>
+        /// <returns>
+        /// The names of all objects defined in this factory, or an empty array if none
+        /// are defined.
+        /// </returns>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectNamesForType(Type, bool, bool)"/>
+        public string[] GetObjectNamesForType(
+            Type type, bool includePrototypes, bool includeFactoryObjects)
+        {
+            IList objectNames = DoGetObjectNamesForType(type, includePrototypes, includeFactoryObjects);
+            return (string[]) ArrayList.Adapter(objectNames).ToArray(typeof(string));
+        }
+
+        /// <summary>
+        /// Return the object instances that match the given object
+        /// <see cref="System.Type"/> (including subclasses), judging from either object
+        /// definitions or the value of
+        /// <see cref="Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> (class or interface) to match.
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.Collections.IDictionary"/> of the matching objects,
+        /// containing the object names as keys and the corresponding object instances
+        /// as values.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the objects could not be created.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(Type)"/>
+        public IDictionary GetObjectsOfType(Type type)
+        {
+            return GetObjectsOfType(type, true, true);
+        }
+
+        /// <summary>
+        /// Return the object instances that match the given object
+        /// <see cref="System.Type"/> (including subclasses).
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> (class or interface) to match.
+        /// </param>
+        /// <param name="includePrototypes">
+        /// Whether to include prototype objects too or just singletons (also applies to
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s).
+        /// </param>
+        /// <param name="includeFactoryObjects">
+        /// Whether to include <see cref="Spring.Objects.Factory.IFactoryObject"/>s too
+        /// or just normal objects.
+        /// </param>
+        /// <returns>
+        /// An <see cref="System.Collections.IDictionary"/> of the matching objects,
+        /// containing the object names as keys and the corresponding object instances
+        /// as values.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If any of the objects could not be created.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(Type, bool, bool)"/>
+        public IDictionary GetObjectsOfType(
+            Type type, bool includePrototypes, bool includeFactoryObjects)
+        {
+            IDictionary result = new Hashtable();
+            IList objectNames = DoGetObjectNamesForType(type, includePrototypes, includeFactoryObjects);
+            foreach (string objectName in objectNames)
+            {
+                try
+                {
+                    result.Add(objectName, GetObject(objectName));
+                }
+                catch (ObjectCreationException ex)
+                {
+                    if (ex.InnerException != null
+                        && ex.GetBaseException().GetType().Equals(typeof(ObjectCurrentlyInCreationException)))
+                    {
+                        // ignoring this is ok... it indicates a circular reference when autowiring
+                        // constructors; we want to find matches other than the currently
+                        // created object itself...
+                        if (log.IsDebugEnabled)
+                        {
+                            log.Debug(string.Format(
+                                          CultureInfo.InvariantCulture,
+                                          "Ignoring match to currently created object '{0}'.",
+                                          objectName), ex);
+                        }
+                    }
+                    else
+                    {
+                        throw;
+                    }
+                }
+            }
+            return result;
+        }
+
+        // TODO: (ee) What's this method for? It's never used.
+/*
+        protected IList DoGetObjectNamesForTypeNew(Type type, bool includePrototypes, bool includeFactoryObjects)
+        {
+            IList result = new ArrayList();
+            string[] objectNames = GetObjectDefinitionNames();
+            foreach (string objectNam in objectNames)
+            {
+                string objectName = objectNam;
+                if (!IsAlias(objectName))
+                {
+                    RootObjectDefinition mod = GetMergedObjectDefinition(objectName, false);
+                    // Only check object definition if it is complete
+                    if (!mod.IsAbstract &&
+                        (mod.HasObjectType || !mod.IsLazyInit))
+                    {
+                        // In case of FactoryObject, match object created by FactoryObject
+                    }
+                    try
+                    {
+                        bool isFactoryObject = IsObjectTypeMatch(objectName, mod, typeof(IFactoryObject));
+                        bool matchFound = (includePrototypes || mod.IsSingleton) && IsTypeMatch(objectName, type);
+                        if (!matchFound && isFactoryObject)
+                        {
+                            objectName = ObjectFactoryUtils.BuildFactoryObjectName(objectName);
+                            matchFound = (includePrototypes || mod.IsSingleton) && IsTypeMatch(objectName, type);
+                        }
+                        if (matchFound)
+                        {
+                            result.Add(objectName);
+                        }
+                    }
+                    catch (CannotLoadObjectTypeException ex)
+                    {
+                        // Probably contains a placeholder; lets ignore it for type matching purposes.
+                        if (log.IsDebugEnabled)
+                        {
+                            log.Debug("Ignoring object class loading failure for object '" + objectName + "'", ex);
+                        }
+                    }
+                }
+            }
+            // check singletons too, to catch manually registered singletons...
+            string[] singletonNames = GetSingletonNames();
+            foreach (string objectNam in singletonNames)
+            {
+                string objectName = objectNam;
+                // only check if manually registered...
+                if (!ContainsObjectDefinition(objectName))
+                {
+                    // in the case of an IFactoryObject, match the object created by the IFactoryObject...
+                    if (IsFactoryObject(objectName))
+                    {
+                        if ((includePrototypes || IsSingleton(objectName)) && IsTypeMatch(objectName, type))
+                        {
+                            result.Add(objectName);
+                            continue;
+                        }
+                        objectName = ObjectFactoryUtils.BuildFactoryObjectName(objectName);
+                    }
+                    if (IsTypeMatch(objectName, type))
+                    {
+                        result.Add(objectName);
+                    }
+                }
+            }
+            return result;
+        }
+*/
+
+        /// <summary>
+        /// Return the object instances that match the given object
+        /// <see cref="System.Type"/> (including subclasses).
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> (class or interface) to match.
+        /// </param>
+        /// <param name="includePrototypes">
+        /// Whether to include prototype objects too or just singletons (also applies to
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s).
+        /// </param>
+        /// <param name="includeFactoryObjects">
+        /// Whether to include <see cref="Spring.Objects.Factory.IFactoryObject"/>s too
+        /// or just normal objects.
+        /// </param>
+        /// <returns>
+        /// An <see cref="System.Collections.IDictionary"/> of the matching objects,
+        /// containing the object names as keys and the corresponding object instances
+        /// as values.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If any of the objects could not be created.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(Type, bool, bool)"/>
+        protected IList DoGetObjectNamesForType(
+            Type type, bool includePrototypes, bool includeFactoryObjects)
+        {
+            bool isFactoryType = (type != null && typeof(IFactoryObject).IsAssignableFrom(type));
+            IList result = new ArrayList();
+            if (type != null)
+            {
+                string[] objectNames = GetObjectDefinitionNames();
+                foreach (string objectName in objectNames)
+                {
+                    RootObjectDefinition rod = GetMergedObjectDefinition(objectName, false);
+                    // only check complete object definitions...
+                    if (!rod.IsAbstract && rod.HasObjectType)
+                    {
+                        // return the return type of an object created via a factory method...
+                        if (StringUtils.HasText(rod.FactoryMethodName))
+                        {
+                            Type methodType = GetTypeForFactoryMethod(objectName, rod);
+                            if (methodType != null
+                                && type.IsAssignableFrom(methodType))
+                            {
+                                result.Add(objectName);
+                            }
+                        }
+                            // in the case of an IFactoryObject, match the object created by the IFactoryObject...
+                        else if (typeof(IFactoryObject).IsAssignableFrom(rod.ObjectType) && !isFactoryType)
+                        {
+                            if (includeFactoryObjects && (includePrototypes || IsSingleton(objectName)) &&
+                                IsObjectTypeMatch(objectName, type))
+                            {
+                                result.Add(objectName);
+                            }
+                        }
+                        else
+                        {
+                            string factoryObjectName = objectName;
+                            // if type to match is an IFactoryObject, match the IFactoryObject itself;
+                            // else, match the object instance...
+                            if (isFactoryType)
+                            {
+                                factoryObjectName = ObjectFactoryUtils.BuildFactoryObjectName(objectName);
+                            }
+                            if ((includePrototypes || rod.IsSingleton) && //MLP
+                                (type.IsAssignableFrom(rod.ObjectType)))
+                            {
+                                result.Add(factoryObjectName);
+                            }
+                        }
+                    }
+                }
+
+                // check singletons too, to catch manually registered singletons...
+                string[] singletonNames = GetSingletonNames();
+                foreach (string objectName in singletonNames)
+                {
+                    // only check if manually registered...
+                    if (!ContainsObjectDefinition(objectName))
+                    {
+                        // in the case of an IFactoryObject, match the object created by the IFactoryObject...
+                        if (IsFactoryObject(objectName) && !isFactoryType)
+                        {
+                            if (includeFactoryObjects && (includePrototypes || IsSingleton(objectName)) &&
+                                IsObjectTypeMatch(objectName, type))
+                            {
+                                result.Add(objectName);
+                            }
+                        }
+                        else
+                        {
+                            string factoryObjectName = objectName;
+                            // if type to match is an IFactoryObject, match the IFactoryObject itself...
+                            // else, match the object instance...
+                            if (isFactoryType)
+                            {
+                                factoryObjectName = ObjectFactoryUtils.BuildFactoryObjectName(objectName);
+                            }
+                            if (IsObjectTypeMatch(factoryObjectName, type))
+                            {
+                                result.Add(factoryObjectName);
+                            }
+                        }
+                    }
+                }
+            }
+            return result;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectDefinitionFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectDefinitionFactory.cs
new file mode 100644
index 00000000..e1e914c8
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectDefinitionFactory.cs
@@ -0,0 +1,114 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Default implementation of the
+	/// <see cref="IObjectDefinitionFactory"/>
+	/// interface.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Does <b>not</b> support per <see cref="System.AppDomain"/>
+	/// <see cref="System.Type"/> loading.
+	/// </p>
+	/// </remarks>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: DefaultObjectDefinitionFactory.cs,v 1.13 2007/08/01 12:29:43 bbaia Exp $</version>
+    [Serializable]
+    public class DefaultObjectDefinitionFactory : IObjectDefinitionFactory
+	{
+	    #region IObjectDefinitionFactory Members
+
+        /// <summary>
+        /// Factory style method for getting concrete
+        /// <see cref="IConfigurableObjectDefinition"/>
+        /// instances.
+        /// </summary>
+        /// /// <remarks>If no parent is specified, a RootObjectDefinition is created, otherwise a 
+        /// ChildObjectDefinition.</remarks>
+        /// <param name="typeName">The <see cref="System.Type"/> of the defined object.</param>
+        /// <param name="parent">The name of the parent object definition (if any).</param>
+        /// <param name="domain">The <see cref="System.AppDomain"/> against which any class names
+        /// will be resolved into <see cref="System.Type"/> instances.</param>
+        /// <returns>
+        /// An
+        /// <see cref="IConfigurableObjectDefinition"/>
+        /// instance.
+        /// </returns>
+	    public virtual AbstractObjectDefinition CreateObjectDefinition(string typeName, string parent, AppDomain domain)
+	    {
+            Type objectType = null;
+            if (StringUtils.HasText(typeName) && domain != null)
+            {
+                try
+                {
+                    objectType = TypeResolutionUtils.ResolveType(typeName);
+                }
+                // try later....
+                catch { }
+            }
+            if (StringUtils.IsNullOrEmpty(parent))
+            {
+                if (objectType != null)
+                {                    
+                    return new RootObjectDefinition(objectType);
+
+                }
+                else
+                {
+                    RootObjectDefinition rootObjectDefinition = new RootObjectDefinition();
+                    rootObjectDefinition.ObjectTypeName = typeName;
+                    return rootObjectDefinition;
+                }
+            }
+            else
+            {
+                if (objectType != null)
+                {
+                    ChildObjectDefinition childObjectDefinition = new ChildObjectDefinition(parent);
+                    childObjectDefinition.ObjectType = objectType;
+                    return childObjectDefinition;
+                }
+                else
+                {
+                    ChildObjectDefinition childObjectDefinition = new ChildObjectDefinition(parent);
+                    childObjectDefinition.ObjectTypeName = typeName;
+                    return childObjectDefinition;
+                }
+            }
+	    }
+
+	    #endregion
+
+
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectNameGenerator.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectNameGenerator.cs
new file mode 100644
index 00000000..87a3cb75
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectNameGenerator.cs
@@ -0,0 +1,62 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 Spring.Objects.Factory.Config;
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Default implementation of the <see cref="IObjectNameGenerator"/> interface, deleagting to
+    /// <see cref="ObjectDefinitionReaderUtils.GenerateObjectName"/>.
+    /// </summary>
+    /// <remarks>Note that this implementation is only able to handle
+    /// <see cref="IConfigurableObjectDefinition"/> subclasses such as
+    /// <see cref="RootObjectDefinition"/> and <see cref="ChildObjectDefinition"/>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: DefaultObjectNameGenerator.cs,v 1.1 2007/05/23 20:16:13 markpollack Exp $</version>
+    public class DefaultObjectNameGenerator : IObjectNameGenerator
+    {
+        #region IObjectNameGenerator Members
+
+        /// <summary>
+        /// Generates an object name for the given object definition.
+        /// </summary>
+        /// <param name="definition">The object definition to generate a name for.</param>
+        /// <param name="registry">The object definitions registry that the given definition is
+        /// supposed to be registerd with</param>
+        /// <returns>the generated object name</returns>
+        public string GenerateObjectName(IObjectDefinition definition, IObjectDefinitionRegistry registry)
+        {
+            IConfigurableObjectDefinition objectDef = definition as IConfigurableObjectDefinition;
+            if (objectDef == null)
+            {
+                throw new ArgumentException(
+                    "DefaultObjectNameGenerator is only able to handle IConfigurableObjectDefinition subclasses: " +
+                    definition);
+            }
+            return ObjectDefinitionReaderUtils.GenerateObjectName(objectDef, registry);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingMethodReplacer.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingMethodReplacer.cs
new file mode 100644
index 00000000..1a4815ab
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingMethodReplacer.cs
@@ -0,0 +1,91 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// An <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/>
+	/// implementation that delegates to an
+	/// <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/> that is
+	/// obtained as the result of a lookup in an associated IoC container.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This class is reserved for internal use within the framework; it is
+	/// not intended to be used by application developers using Spring.NET.
+	/// </p>
+	/// </remarks>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: DelegatingMethodReplacer.cs,v 1.3 2007/07/30 17:52:22 markpollack Exp $</version>
+	public sealed class DelegatingMethodReplacer : AbstractMethodReplacer
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="ArgumentNullException"/>
+		/// class.
+		/// </summary>
+		/// <param name="objectDefinition">
+		/// The object definition that is the target of the method replacement.
+		/// </param>
+		/// <param name="objectFactory">
+		/// The enclosing IoC container with which the above
+		/// <paramref name="objectDefinition"/> is associated.
+		/// </param>
+		/// <exception cref="DelegatingMethodReplacer">
+		/// If either of the supplied arguments is <see langword="null"/>.
+		/// </exception>
+		public DelegatingMethodReplacer(IConfigurableObjectDefinition objectDefinition, IObjectFactory objectFactory)
+			: base(objectDefinition, objectFactory)
+		{
+		}
+
+		/// <summary>
+		/// Reimplements the supplied <paramref name="method"/> by delegating to
+		/// another <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/>
+		/// looked up in an enclosing IoC container.
+		/// </summary>
+		/// <param name="target">
+		/// The instance whose <paramref name="method"/> is to be
+		/// (re)implemented.
+		/// </param>
+		/// <param name="method">
+		/// The method that is to be (re)implemented.
+		/// </param>
+		/// <param name="arguments">The target method's arguments.</param>
+		/// <returns>
+		/// The result of the delegated call to the looked up
+		/// <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/>.
+		/// </returns>
+		public override object Implement(object target, MethodInfo method, object[] arguments)
+		{
+			ReplacedMethodOverride ovr = (ReplacedMethodOverride) GetOverride(method);
+			IMethodReplacer methodReplacement = (IMethodReplacer) GetObject(ovr.MethodReplacerObjectName);
+			return methodReplacement.Implement(target, method, arguments);
+		}
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DependencyCheckingMode.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DependencyCheckingMode.cs
new file mode 100644
index 00000000..2a9acdc9
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/DependencyCheckingMode.cs
@@ -0,0 +1,58 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+
+
+#endregion
+
+using System;
+
+namespace Spring.Objects.Factory.Support {
+
+	/// <summary>
+	/// The various modes of dependency checking.
+    /// </summary>
+    /// <author>Rick Evans (.NET)</author>
+    [Serializable]
+    public enum DependencyCheckingMode 
+    {
+        /// <summary>
+        /// DO not do any dependency checking.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Check object references.
+        /// </summary>
+        Objects = 1,
+
+        /// <summary>
+        /// Just check primitive (string, int, etc) values.
+        /// </summary>
+        Simple = 2,
+
+        /// <summary>
+        /// Check everything.
+        /// </summary>
+        All = 3
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IConfigurableObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IConfigurableObjectDefinition.cs
new file mode 100644
index 00000000..5afc8051
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/IConfigurableObjectDefinition.cs
@@ -0,0 +1,197 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Describes a configurable object instance, which has property values,
+    /// constructor argument values, and further information supplied by concrete
+    /// implementations.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: IConfigurableObjectDefinition.cs,v 1.1 2007/07/30 17:52:22 markpollack Exp $</version>
+    public interface IConfigurableObjectDefinition : IObjectDefinition
+    {
+        /// <summary>
+        /// Return the property values to be applied to a new instance of the object.
+        /// </summary>
+        new MutablePropertyValues PropertyValues { get; set; }
+
+        /// <summary>
+        /// Return the constructor argument values for this object.
+        /// </summary>
+        new ConstructorArgumentValues ConstructorArgumentValues { get; set; }
+		
+        /// <summary>
+        /// The method overrides (if any) for this object.
+        /// </summary>
+        /// <value>
+        /// The method overrides (if any) for this object; may be an
+        /// empty collection but is guaranteed not to be
+        /// <see langword="null"/>.
+        /// </value>
+        MethodOverrides MethodOverrides { get; set; }
+
+        /// <summary>
+        /// Return the event handlers for any events exposed by this object.
+        /// </summary>
+        new EventValues EventHandlerValues { get; set; }
+
+        /// <summary>
+        /// Return a description of the resource that this object definition
+        /// came from (for the purpose of showing context in case of errors).
+        /// </summary>
+        new string ResourceDescription { get; set; }
+
+        /// <summary>
+        /// Is this object definition "abstract", i.e. not meant to be instantiated
+        /// itself but rather just serving as parent for concrete child object
+        /// definitions.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if this object definition is "abstract".
+        /// </value>
+        new bool IsAbstract { get; set; }
+
+        /// <summary>
+        /// Returns the <see cref="System.Type"/> of the object definition (if any).
+        /// </summary>
+        /// <value>
+        /// A resolved object <see cref="System.Type"/>.
+        /// </value>
+        /// <exception cref="ApplicationException">
+        /// If the <see cref="System.Type"/> of the object definition is not a
+        /// resolved <see cref="System.Type"/> or <see langword="null"/>.
+        /// </exception>
+        new Type ObjectType { get; set; }
+
+        /// <summary>
+        /// Returns the <see cref="System.Type.FullName"/> of the
+        /// <see cref="System.Type"/> of the object definition (if any).
+        /// </summary>
+        new string ObjectTypeName { get; set; }
+        
+        /// <summary>
+        /// Return whether this a <b>Singleton</b>, with a single, shared instance
+        /// returned on all calls.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If <see langword="false"/>, an object factory will apply the <b>Prototype</b>
+        /// design pattern, with each caller requesting an instance getting an
+        /// independent instance. How this is defined will depend on the
+        /// object factory implementation. <b>Singletons</b> are the commoner type.
+        /// </p>
+        /// </remarks>
+        new bool IsSingleton { get; set; }
+
+        /// <summary>
+        /// Is this object lazily initialized?</summary>
+        /// <remarks>
+        /// <p>
+        /// Only applicable to a singleton object.
+        /// </p>
+        /// <p>
+        /// If <see langword="false"/>, it will get instantiated on startup by object factories
+        /// that perform eager initialization of singletons.
+        /// </p>
+        /// </remarks>
+        new bool IsLazyInit { get; set; }
+
+        /// <summary>
+        /// The autowire mode as specified in the object definition.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This determines whether any automagical detection and setting of
+        /// object references will happen. Default is
+        /// <see cref="Spring.Objects.Factory.Config.AutoWiringMode.No"/>,
+        /// which means there's no autowire.
+        /// </p>
+        /// </remarks>
+        new AutoWiringMode AutowireMode { get; set; }
+
+        /// <summary>
+        /// The dependency check code.
+        /// </summary>
+        DependencyCheckingMode DependencyCheck { get; set; }
+
+        /// <summary>
+        /// The object names that this object depends on.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The object factory will guarantee that these objects get initialized
+        /// before.
+        /// </p>
+        /// <p>
+        /// Note that dependencies are normally expressed through object properties
+        /// or constructor arguments. This property should just be necessary for
+        /// other kinds of dependencies like statics (*ugh*) or database
+        /// preparation on startup.
+        /// </p>
+        /// </remarks>
+        new string[] DependsOn { get; set; }
+
+        /// <summary>
+        /// The name of the initializer method.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The default is <see langword="null"/>, in which case there is no initializer method.
+        /// </p>
+        /// </remarks>
+        new string InitMethodName { get; set; }
+
+        /// <summary>
+        /// Return the name of the destroy method.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The default is <see langword="null"/>, in which case there is no destroy method.
+        /// </p>
+        /// </remarks>
+        new string DestroyMethodName { get; set; }
+
+        /// <summary>
+        /// The name of the factory method to use (if any).
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method will be invoked with constructor arguments, or with no
+        /// arguments if none are specified. The static method will be invoked on
+        /// the specified <see cref="Spring.Objects.Factory.Config.IObjectDefinition.ObjectType"/>.
+        /// </p>
+        /// </remarks>
+        new string FactoryMethodName { get; set; }
+
+        /// <summary>
+        /// The name of the factory object to use (if any).
+        /// </summary>
+        new string FactoryObjectName { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IInstantiationStrategy.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IInstantiationStrategy.cs
new file mode 100644
index 00000000..756f02f9
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/IInstantiationStrategy.cs
@@ -0,0 +1,119 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Responsible for creating instances corresponding to a
+	/// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: IInstantiationStrategy.cs,v 1.6 2006/04/09 07:18:49 markpollack Exp $</version>
+	public interface IInstantiationStrategy
+	{
+		/// <summary>
+		/// Instantiate an instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </summary>
+		/// <param name="definition">
+		/// The definition of the object that is to be instantiated.
+		/// </param>
+		/// <param name="name">
+		/// The name associated with the object definition. The name can be the null
+		/// or zero length string if we're autowiring an object that doesn't belong
+		/// to the supplied <paramref name="factory"/>.
+		/// </param>
+		/// <param name="factory">
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// </param>
+		/// <returns>
+		/// An instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </returns>
+		object Instantiate(
+			RootObjectDefinition definition, string name, IObjectFactory factory);
+
+		/// <summary>
+		/// Instantiate an instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </summary>
+		/// <param name="definition">
+		/// The definition of the object that is to be instantiated.
+		/// </param>
+		/// <param name="name">
+		/// The name associated with the object definition. The name can be the null
+		/// or zero length string if we're autowiring an object that doesn't belong
+		/// to the supplied <paramref name="factory"/>.
+		/// </param>
+		/// <param name="factory">
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// </param>
+		/// <param name="constructor">
+		/// The <see cref="System.Reflection.ConstructorInfo"/> to be used to instantiate
+		/// the object.
+		/// </param>
+		/// <param name="arguments">
+		/// Any arguments to the supplied <paramref name="constructor"/>. May be null.
+		/// </param>
+		/// <returns>
+		/// An instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </returns>
+		object Instantiate(
+			RootObjectDefinition definition, string name, IObjectFactory factory,
+			ConstructorInfo constructor, object[] arguments);
+
+		/// <summary>
+		/// Instantiate an instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </summary>
+		/// <param name="definition">
+		/// The definition of the object that is to be instantiated.
+		/// </param>
+		/// <param name="name">
+		/// The name associated with the object definition. The name can be the null
+		/// or zero length string if we're autowiring an object that doesn't belong
+		/// to the supplied <paramref name="factory"/>.
+		/// </param>
+		/// <param name="factory">
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// </param>
+		/// <param name="factoryMethod">
+		/// The <see cref="System.Reflection.MethodInfo"/> to be used to get the object.
+		/// </param>
+		/// <param name="arguments">
+		/// Any arguments to the supplied <paramref name="factoryMethod"/>. May be null.
+		/// </param>
+		/// <returns>
+		/// An instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </returns>
+		object Instantiate(
+			RootObjectDefinition definition, string name, IObjectFactory factory,
+			MethodInfo factoryMethod, object[] arguments);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IManagedCollection.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IManagedCollection.cs
new file mode 100644
index 00000000..fe86b352
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/IManagedCollection.cs
@@ -0,0 +1,165 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Denotes a special placeholder collection that may contain
+	/// <see cref="Spring.Objects.Factory.Config.RuntimeObjectReference"/>s or
+	/// other placeholder objects that will need to be resolved.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// <c>'A special placeholder collection'</c> means that the elements of this
+	/// collection can be placeholders for objects that will be resolved later by
+	/// a Spring.NET IoC container, i.e. the elements themselves will be
+	/// resolved at runtime by the enclosing IoC container.
+	/// </p>
+	/// <p>
+	/// The core Spring.NET library already provides three implementations of this interface
+	/// straight out of the box; they are...
+	/// </p>
+	/// <list type="bullet">
+	/// <item>
+	/// <description>
+	/// <see cref="Spring.Objects.Factory.Support.ManagedList"/>.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// <see cref="Spring.Objects.Factory.Support.ManagedDictionary"/>.
+	/// </description>
+	/// </item>
+	/// <item>
+	/// <description>
+	/// <see cref="Spring.Objects.Factory.Support.ManagedSet"/>.
+	/// </description>
+	/// </item>
+	/// </list>
+	/// <p>
+	/// If you have a custom collection class (i.e. a class that either implements the
+	/// <see cref="System.Collections.ICollection"/> directly or derives from a class that does)
+	/// that you would like to expose as a special placeholder collection (i.e. one that can
+	/// have <see cref="Spring.Objects.Factory.Config.RuntimeObjectReference"/>s as elements
+	/// that will be resolved at runtime by an appropriate Spring.NET IoC container, just
+	/// implement this interface.
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <p>
+	/// Lets say one has a <c>Bag</c> class (i.e. a collection that supports bag style semantics).
+	/// </p>
+	/// <code language="C#">
+	/// using System;
+	/// 
+	/// using Spring.Objects.Factory.Support;
+	/// 
+	/// namespace MyNamespace
+	/// {
+	///		public sealed class Bag : ICollection
+	///		{
+	///			// ICollection implementation elided for clarity...
+	///			
+	///			public void Add(object o)
+	///			{
+	///				// implementation elided for clarity...
+	///			}
+	///		}
+	///		
+	///		public class ManagedBag : Bag, IManagedCollection
+	///		{
+	///			public ICollection Resolve(
+	///				string objectName, RootObjectDefinition definition,
+	///				string propertyName, ManagedCollectionElementResolver resolver)
+	///			{
+	///				Bag newBag = new Bag();
+	///				string elementName = propertyName + "[bag-element]";
+	///				foreach(object element in this)
+	///				{
+	///					object resolvedElement = resolver(objectName, definition, elementName, element);
+	///					newBag.Add(resolvedElement);
+	///				}
+	///				return newBag;
+	///			}
+	///		}
+	/// }
+	/// </code>
+	/// </example>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: IManagedCollection.cs,v 1.5 2007/03/16 03:05:37 bbaia Exp $</version>
+	public interface IManagedCollection : ICollection
+	{
+		/// <summary>
+		/// Resolves this managed collection at runtime.
+		/// </summary>
+		/// <param name="objectName">
+		/// The name of the top level object that is having the value of one of it's
+		/// collection properties resolved.
+		/// </param>
+		/// <param name="definition">
+		/// The definition of the named top level object.
+		/// </param>
+		/// <param name="propertyName">
+		/// The name of the property the value of which is being resolved.
+		/// </param>
+		/// <param name="resolver">
+		/// The callback that will actually do the donkey work of resolving
+		/// this managed collection.
+		/// </param>
+		/// <returns>A fully resolved collection.</returns>
+		ICollection Resolve(string objectName, RootObjectDefinition definition,
+			string propertyName, ManagedCollectionElementResolver resolver);
+	}
+
+	/// <summary>
+	/// Resolves a single element value of a managed collection.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// If the <paramref name="element"/> does not need to be resolved or
+	/// converted to an appropriate <see cref="System.Type"/>, the
+	/// <paramref name="element"/> will be returned as-is.
+	/// </p>
+	/// </remarks>
+	/// <param name="name">
+	/// The name of the top level object that is having the value of one of it's
+	/// collection properties resolved.
+	/// </param>
+	/// <param name="definition">
+	/// The definition of the named top level object.
+	/// </param>
+	/// <param name="argumentName">
+	/// The name of the property the value of which is being resolved.
+	/// </param>
+	/// <param name="element">
+	/// That element of a managed collection that may need to be resolved
+	/// to a concrete value.
+	/// </param>
+	/// <returns>A fully resolved element.</returns>
+	public delegate object ManagedCollectionElementResolver(
+		string name, RootObjectDefinition definition, string argumentName, object element);
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IMethodReplacer.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IMethodReplacer.cs
new file mode 100644
index 00000000..e61a5634
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/IMethodReplacer.cs
@@ -0,0 +1,71 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Permits the (re)implementation of an arbitrary method on a Spring.NET
+	/// IoC container managed object.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Encapsulates the notion of the Method-Injection form of Dependency
+	/// Injection.
+	/// </p>
+	/// <p>
+	/// Methods that are dependency injected with implementations of this
+	/// interface may be (but need not be) <see lang="abstract"/>, in which
+	/// case the container will create a concrete subclass of the
+	/// <see lang="abstract"/> class prior to instantiation.
+	/// </p>
+	/// <p>
+	/// Do <b>not</b> use this mechanism as a means of AOP. See the reference
+	/// manual for examples of appropriate usages of this interface.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: IMethodReplacer.cs,v 1.2 2006/04/09 07:18:49 markpollack Exp $</version>
+	public interface IMethodReplacer
+	{
+		/// <summary>
+		/// Reimplement the supplied <paramref name="method"/>.
+		/// </summary>
+		/// <param name="target">
+		/// The instance whose <paramref name="method"/> is to be
+		/// (re)implemented.
+		/// </param>
+		/// <param name="method">
+		/// The method that is to be (re)implemented.
+		/// </param>
+		/// <param name="arguments">The target method's arguments.</param>
+		/// <returns>
+		/// The result of the (re)implementation of the method call.
+		/// </returns>
+		object Implement(object target, MethodInfo method, object[] arguments);
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionReader.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionReader.cs
new file mode 100644
index 00000000..4295649f
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionReader.cs
@@ -0,0 +1,127 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Core.IO;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support {
+
+	/// <summary>
+	/// Simple interface for object definition readers.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: IObjectDefinitionReader.cs,v 1.8 2007/08/08 17:47:13 bbaia Exp $</version>
+	public interface IObjectDefinitionReader 
+    {
+        /// <summary>
+        /// Gets the
+        /// <see cref="Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+        /// instance that this reader works on.
+        /// </summary>
+        IObjectDefinitionRegistry Registry 
+        {
+            get;
+        }
+
+        /// <summary>
+        /// The <see cref="System.AppDomain"/> against which any class names
+        /// will be resolved into <see cref="System.Type"/> instances.
+        /// </summary>
+        AppDomain Domain 
+        {
+            get;
+        }
+
+        /// <summary>
+        /// The <see cref="IObjectNameGenerator"/> to use for anonymous
+        /// objects (wihtout explicit object name specified).
+        /// </summary>
+        IObjectNameGenerator ObjectNameGenerator
+        { 
+            get;
+        }
+
+	    /// <summary>
+	    /// Gets the resource loader to use for resource locations.
+	    /// </summary>
+	    /// <remarks>There is also a <see cref="LoadObjectDefinitions(string)"/> method
+	    /// available for loading object definitions from a resource location.  This is
+	    /// a convenience to avoid explicit ResourceLoader handling.</remarks>
+	    /// <value>The resource loader.</value>
+        IResourceLoader ResourceLoader
+        { 
+            get;
+        }
+
+        /// <summary>
+        /// Load object definitions from the supplied <paramref name="resource"/>.
+        /// </summary>
+        /// <param name="resource">
+        /// The resource for the object definitions that are to be loaded.
+        /// </param>
+        /// <returns>
+        /// The number of object definitions found
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of loading or parsing errors.
+        /// </exception>
+        int LoadObjectDefinitions (IResource resource);
+
+        /// <summary>
+        /// Load object definitions from the supplied <paramref name="resources"/>.
+        /// </summary>
+        /// <param name="resources">
+        /// The resources for the object definitions that are to be loaded.
+        /// </param>
+        /// <returns>
+        /// The number of object definitions found
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of loading or parsing errors.
+        /// </exception>
+	    int LoadObjectDefinitions(IResource[] resources);
+
+
+        /// <summary>
+        /// Loads the object definitions from the specified resource location.
+        /// </summary>
+        /// <param name="location">The resource location, to be loaded with the 
+        /// IResourceLoader location .</param>
+        /// <returns>
+        /// The number of object definitions found        
+        /// </returns>
+        int LoadObjectDefinitions(string location);
+
+        /// <summary>
+        /// Loads the object definitions from the specified resource locations.
+        /// </summary>
+        /// <param name="locations">The the resource locations to be loaded with the
+        /// IResourceLoader of this object definition reader.</param>
+        /// <returns>
+        /// The number of object definitions found        
+        /// </returns>
+        int LoadObjectDefinitions(string[] locations);
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistry.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistry.cs
new file mode 100644
index 00000000..24098cfc
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistry.cs
@@ -0,0 +1,161 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Interface for registries that hold object definitions, i.e. 
+    /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+    /// and
+    /// <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+    /// instances.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Typically implemented by object factories that work with the
+	/// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition"/>
+	/// hierarchy internally.
+	/// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+	public interface IObjectDefinitionRegistry 
+    {
+        /// <summary>
+        /// Return the number of objects defined in the registry.
+        /// </summary>
+        /// <value>
+        /// The number of objects defined in the registry.
+        /// </value>
+        int ObjectDefinitionCount
+        {
+            get;
+        }
+		
+        /// <summary>
+        /// Return the names of all objects defined in this registry.
+        /// </summary>
+        /// <returns>
+        /// The names of all objects defined in this registry, or an empty array
+        /// if none defined
+        /// </returns>
+        string [] GetObjectDefinitionNames ();
+		
+        /// <summary>
+        /// Check if this registry contains a object definition with the given name.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object to look for.
+        /// </param>
+        /// <returns>
+        /// True if this object factory contains an object definition with the
+        /// given name.
+        /// </returns>
+        bool ContainsObjectDefinition (string name);
+		
+        /// <summary>
+        /// Returns the
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>
+        /// for the given object name.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object to find a definition for.
+        /// </param>
+        /// <returns>
+        /// The <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> for
+        /// the given name (never null).
+        /// </returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If the object definition cannot be resolved.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of errors.
+        /// </exception>
+        IObjectDefinition GetObjectDefinition (string name);
+		
+        /// <summary>
+        /// Register a new object definition with this registry.
+        /// Must support
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+        /// and <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/>.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object instance to register.
+        /// </param>
+        /// <param name="definition">
+        /// The definition of the object instance to register.
+        /// </param>
+        /// <remarks>
+        /// <p>
+        /// Must support
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> and
+        /// <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/>.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the object definition is invalid.
+        /// </exception>
+        void RegisterObjectDefinition (string name, IObjectDefinition definition);
+		
+        /// <summary>
+        /// Return the aliases for the given object name, if defined.
+        /// </summary>
+        /// <param name="name">the object name to check for aliases
+        /// </param>
+        /// <remarks>
+        /// <p>
+        /// Will ask the parent factory if the object cannot be found in this
+        /// factory instance.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// The aliases, or an empty array if none.
+        /// </returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there's no such object definition.
+        /// </exception>
+        string [] GetAliases (string name);
+		
+        /// <summary>
+        /// Given a object name, create an alias. We typically use this method to
+        /// support names that are illegal within XML ids (used for object names).
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object.
+        /// </param>
+        /// <param name="theAlias">
+        /// The alias that will behave the same as the object name.
+        /// </param>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there is no object with the given name.
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectDefinitionStoreException">
+        /// If the alias is already in use.
+        /// </exception>
+        void RegisterAlias (string name, string theAlias);
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectNameGenerator.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectNameGenerator.cs
new file mode 100644
index 00000000..5ac7b471
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectNameGenerator.cs
@@ -0,0 +1,43 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 Spring.Objects.Factory.Config;
+
+namespace Spring.Objects.Factory.Support
+{
+
+    /// <summary>
+    /// Strategy interface for generating object names for object definitions
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: IObjectNameGenerator.cs,v 1.1 2007/05/23 20:16:13 markpollack Exp $</version>
+    public interface IObjectNameGenerator
+    {
+        /// <summary>
+        /// Generates an object name for the given object definition.
+        /// </summary>
+        /// <param name="definition">The object definition to generate a name for.</param>
+        /// <param name="registry">The object definitions registry that the given definition is
+        /// supposed to be registerd with</param>
+        /// <returns>the generated object name</returns>
+        string GenerateObjectName(IObjectDefinition definition, IObjectDefinitionRegistry registry);
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodOverride.cs b/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodOverride.cs
new file mode 100644
index 00000000..f1662ea8
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodOverride.cs
@@ -0,0 +1,116 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Text;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Represents an override of a method that looks up an object in the same IoC context.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Methods eligible for lookup override must not have arguments.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: LookupMethodOverride.cs,v 1.3 2007/03/16 04:01:41 aseovic Exp $</version>
+    [Serializable]
+    public sealed class LookupMethodOverride : MethodOverride
+	{
+		private readonly string objectName;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Support.LookupMethodOverride"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Methods eligible for lookup override must not have arguments.
+		/// </p>
+		/// </remarks>
+		/// <param name="methodName">
+		/// The name of the method that is to be overridden.
+		/// </param>
+		/// <param name="objectName">
+		/// The name of the object in the current IoC context that the
+		/// dependency injected method must return.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If either of the supplied arguments is <see langword="null"/> or
+		/// contains only whitespace character(s).
+		/// </exception>
+		public LookupMethodOverride(string methodName, string objectName)
+			: base(methodName)
+		{
+			AssertUtils.ArgumentHasText(objectName, "objectName");
+			this.objectName = objectName;
+		}
+
+		/// <summary>
+		/// The name of the object in the current IoC context that the
+		/// dependency injected method must return.
+		/// </summary>
+		public string ObjectName
+		{
+			get { return objectName; }
+		}
+
+		/// <summary>
+		/// Does this <see cref="Spring.Objects.Factory.Support.MethodOverride"/>
+		/// match the supplied <paramref name="method"/>?
+		/// </summary>
+		/// <param name="method">The method to be checked.</param>
+		/// <returns>
+		/// <see lang="true"/> if this override matches the supplied <paramref name="method"/>.
+		/// </returns>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="method"/> is <see langword="null"/>.
+		/// </exception>
+		public override bool Matches(MethodInfo method)
+		{
+			AssertUtils.ArgumentNotNull(method, "method");
+			return MethodName == method.Name || method.Name.EndsWith(MethodName);
+		}
+
+		/// <summary>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="System.Object"/>.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="System.Object"/>.
+		/// </returns>
+		public override string ToString()
+		{
+			return new StringBuilder(GetType().Name).Append(" for method '")
+				.Append(MethodName).Append("'; will return object '").Append(this.objectName)
+				.Append("'.").ToString();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodReplacer.cs b/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodReplacer.cs
new file mode 100644
index 00000000..f17e677f
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodReplacer.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// An <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/>
+	/// implementation that simply returns the result of a lookup in an
+	/// associated IoC container.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This class is Spring.NET's implementation of Dependency Lookup via
+	/// Method Injection.
+	/// </p>
+	/// <p>
+	/// This class is reserved for internal use within the framework; it is
+	/// not intended to be used by application developers using Spring.NET.
+	/// </p>
+	/// </remarks>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: LookupMethodReplacer.cs,v 1.3 2007/07/30 17:52:22 markpollack Exp $</version>
+	public sealed class LookupMethodReplacer : AbstractMethodReplacer
+	{
+		/// <summary>
+		/// Creates a new instance of the <see cref="LookupMethodReplacer"/>
+		/// class.
+		/// </summary>
+		/// <param name="objectDefinition">
+		/// The object definition that is the target of the method replacement.
+		/// </param>
+		/// <param name="objectFactory">
+		/// The enclosing IoC container with which the above
+		/// <paramref name="objectDefinition"/> is associated.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If either of the supplied arguments is <see langword="null"/>.
+		/// </exception>
+		public LookupMethodReplacer(IConfigurableObjectDefinition objectDefinition, IObjectFactory objectFactory)
+			: base(objectDefinition, objectFactory)
+		{
+		}
+
+		/// <summary>
+		/// Reimplements the supplied <paramref name="method"/> by returning the
+		/// result of an object lookup in an enclosing IoC container.
+		/// </summary>
+		/// <param name="target">
+		/// The instance whose <paramref name="method"/> is to be
+		/// (re)implemented.
+		/// </param>
+		/// <param name="method">
+		/// The method that is to be (re)implemented.
+		/// </param>
+		/// <param name="arguments">The target method's arguments.</param>
+		/// <returns>
+		/// The result of the object lookup.
+		/// </returns>
+		public override object Implement(object target, MethodInfo method, object[] arguments)
+		{
+			return GetObject(((LookupMethodOverride) GetOverride(method)).ObjectName);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ManagedDictionary.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ManagedDictionary.cs
new file mode 100644
index 00000000..017e1e8a
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/ManagedDictionary.cs
@@ -0,0 +1,171 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+#if NET_2_0
+using System.Collections.Generic;
+#endif
+using System.Collections.Specialized;
+using System.Globalization;
+
+using Spring.Core;
+using Spring.Core.TypeConversion;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Tag subclass used to hold a dictionary of managed elements.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: ManagedDictionary.cs,v 1.14 2007/11/26 14:15:54 bbaia Exp $</version>
+    [Serializable]
+    public class ManagedDictionary : Hashtable, IManagedCollection
+	{
+        private string keyTypeName;
+        private string valueTypeName;
+
+        /// <summary>
+        /// Gets or sets the unresolved name for the <see cref="System.Type"/> 
+        /// of the keys of this managed dictionary.
+        /// </summary>
+        /// <value>The unresolved name for the type of the keys of this managed dictionary.</value>
+        public string KeyTypeName
+        {
+            get { return this.keyTypeName; }
+            set { this.keyTypeName = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the unresolved name for the <see cref="System.Type"/> 
+        /// of the values of this managed dictionary.
+        /// </summary>
+        /// <value>The unresolved name for the type of the values of this managed dictionary.</value>
+        public string ValueTypeName
+        {
+            get { return this.valueTypeName; }
+            set { this.valueTypeName = value; }
+        }
+	    
+		/// <summary>
+		/// Resolves this managed collection at runtime.
+		/// </summary>
+		/// <param name="objectName">
+		/// The name of the top level object that is having the value of one of it's
+		/// collection properties resolved.
+		/// </param>
+		/// <param name="definition">
+		/// The definition of the named top level object.
+		/// </param>
+		/// <param name="propertyName">
+		/// The name of the property the value of which is being resolved.
+		/// </param>
+		/// <param name="resolver">
+		/// The callback that will actually do the donkey work of resolving
+		/// this managed collection.
+		/// </param>
+		/// <returns>A fully resolved collection.</returns>
+		public ICollection Resolve(
+			string objectName, RootObjectDefinition definition,
+			string propertyName, ManagedCollectionElementResolver resolver)
+		{
+            IDictionary dictionary;
+
+            Type keyType = null;
+            if (StringUtils.HasText(this.keyTypeName))
+            {
+                keyType = TypeResolutionUtils.ResolveType(this.keyTypeName);
+            }
+
+            Type valueType = null;
+            if (StringUtils.HasText(this.valueTypeName))
+            {
+                valueType = TypeResolutionUtils.ResolveType(this.valueTypeName);
+            }
+#if NET_2_0
+            if ((keyType == null) && (valueType == null))
+            {
+                dictionary = new HybridDictionary();
+            }
+            else
+            {
+                Type type = typeof(Dictionary<,>);
+                Type[] genericArgs = new Type[2] { 
+                    (keyType == null) ? typeof(object) : keyType,
+                    (valueType == null) ? typeof(object) : valueType };
+                type = type.MakeGenericType(genericArgs);
+
+                dictionary = (IDictionary)ObjectUtils.InstantiateType(type);
+            }
+#else
+            dictionary = new HybridDictionary();
+#endif
+            foreach (object key in this.Keys)
+			{
+				string elementName = string.Format(CultureInfo.InvariantCulture, "{0}[{1}]", propertyName, key);
+				object resolvedKey = resolver(objectName, definition, elementName, key);
+				object resolvedValue = resolver(objectName, definition, elementName, this[key]);
+
+                if (keyType != null)
+                {
+                    try
+                    {
+                        resolvedKey = TypeConversionUtils.ConvertValueIfNecessary(keyType, resolvedKey, propertyName);
+                    }
+                    catch (TypeMismatchException)
+                    {
+                        throw new TypeMismatchException(
+                            String.Format(
+                                    "Unable to convert managed dictionary key '{0}' from [{1}] into [{2}] during initialization"
+                                    + " of property '{3}' for object '{4}'. Do you have an appropriate type converter registered?", 
+                                    resolvedKey, resolvedKey.GetType(), keyType, propertyName, objectName));
+                    }
+                }
+
+                if (valueType != null)
+                {
+                    try
+                    {
+                        resolvedValue = TypeConversionUtils.ConvertValueIfNecessary(valueType, resolvedValue, propertyName + "[" + resolvedKey + "]");
+                    }
+                    catch (TypeMismatchException)
+                    {
+                        throw new TypeMismatchException(
+                           String.Format(
+                                   "Unable to convert managed dictionary value '{0}' from [{1}] into [{2}] during initialization"
+                                   + " of property '{3}' for object '{4}'. Do you have an appropriate type converter registered?", 
+                                   resolvedValue, resolvedValue.GetType(), valueType, propertyName, objectName));
+                    }
+                }
+
+                dictionary.Add(resolvedKey, resolvedValue);
+			}
+
+            return dictionary;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ManagedList.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ManagedList.cs
new file mode 100644
index 00000000..2315f496
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/ManagedList.cs
@@ -0,0 +1,134 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+#if NET_2_0
+using System.Collections.Generic;
+#endif
+using System.Globalization;
+
+using Spring.Core;
+using Spring.Core.TypeConversion;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Tag subclass used to hold a list of managed elements.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: ManagedList.cs,v 1.15 2007/11/26 14:15:54 bbaia Exp $</version>
+    [Serializable]
+    public class ManagedList : ArrayList, IManagedCollection
+    {
+        private string elementTypeName;
+
+        /// <summary>
+        /// Gets or sets the unresolved name for the <see cref="System.Type"/> 
+        /// of the elements of this managed list.
+        /// </summary>
+        /// <value>The unresolved name for the type of the elements of this managed list.</value>
+        public string ElementTypeName
+        {
+            get { return this.elementTypeName; }
+            set { this.elementTypeName = value; }
+        }
+
+        /// <summary>
+        /// Resolves this managed collection at runtime.
+        /// </summary>
+        /// <param name="objectName">
+        /// The name of the top level object that is having the value of one of it's
+        /// collection properties resolved.
+        /// </param>
+        /// <param name="definition">
+        /// The definition of the named top level object.
+        /// </param>
+        /// <param name="propertyName">
+        /// The name of the property the value of which is being resolved.
+        /// </param>
+        /// <param name="resolver">
+        /// The callback that will actually do the donkey work of resolving
+        /// this managed collection.
+        /// </param>
+        /// <returns>A fully resolved collection.</returns>
+        public ICollection Resolve(string objectName, RootObjectDefinition definition, string propertyName, ManagedCollectionElementResolver resolver)
+        {
+            IList list;
+
+            Type elementType = null;
+            if (StringUtils.HasText(this.elementTypeName))
+            {
+                elementType = TypeResolutionUtils.ResolveType(this.elementTypeName);
+            }
+#if NET_2_0
+            if (elementType == null)
+            {
+                list = new ArrayList();
+            }
+            else
+            {
+                // CLOVER:ON
+                Type type = typeof(List<>);
+                Type[] genericArgs = new Type[1] { elementType };
+                type = type.MakeGenericType(genericArgs);
+
+                list = (IList)ObjectUtils.InstantiateType(type);
+                // CLOVER:OFF
+            }
+#else
+            list = new ArrayList();
+#endif
+            for (int i = 0; i < Count; ++i)
+            {
+                object element = this[i];
+                object resolvedElement =
+                        resolver(objectName, definition, String.Format(CultureInfo.InvariantCulture, "{0}[{1}]", propertyName, i), element);
+
+                if (elementType != null)
+                {
+                    try
+                    {
+                        resolvedElement = TypeConversionUtils.ConvertValueIfNecessary(elementType, resolvedElement, propertyName + "[" + i + "]");
+                    }
+                    catch (TypeMismatchException)
+                    {
+                        throw new TypeMismatchException(
+                            String.Format(
+                                    "Unable to convert managed list element '{0}' from [{1}] into [{2}] during initialization"
+                                    + " of property '{3}' for object '{4}'. Do you have an appropriate type converter registered?", 
+                                    resolvedElement, resolvedElement.GetType(), elementType, propertyName, objectName));
+                    }
+                }
+
+                list.Add(resolvedElement);
+            }
+
+            return list;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ManagedSet.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ManagedSet.cs
new file mode 100644
index 00000000..db493212
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/ManagedSet.cs
@@ -0,0 +1,112 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using Spring.Collections;
+using Spring.Core;
+using Spring.Core.TypeConversion;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Tag subclass used to hold a set of managed elements.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    [Serializable]
+    public class ManagedSet : HybridSet, IManagedCollection
+    {
+        private string elementTypeName;
+
+        /// <summary>
+        /// Gets or sets the unresolved name for the <see cref="System.Type"/> 
+        /// of the elements of this managed set.
+        /// </summary>
+        /// <value>The unresolved name for the type of the elements of this managed set.</value>
+        public string ElementTypeName
+        {
+            get { return this.elementTypeName; }
+            set { this.elementTypeName = value; }
+        }
+
+        /// <summary>
+        /// Resolves this managed collection at runtime.
+        /// </summary>
+        /// <param name="objectName">
+        /// The name of the top level object that is having the value of one of it's
+        /// collection properties resolved.
+        /// </param>
+        /// <param name="definition">
+        /// The definition of the named top level object.
+        /// </param>
+        /// <param name="propertyName">
+        /// The name of the property the value of which is being resolved.
+        /// </param>
+        /// <param name="resolver">
+        /// The callback that will actually do the donkey work of resolving
+        /// this managed collection.
+        /// </param>
+        /// <returns>A fully resolved collection.</returns>
+        public ICollection Resolve(string objectName, RootObjectDefinition definition, string propertyName, ManagedCollectionElementResolver resolver)
+        {
+            ISet set = new HybridSet();
+            
+            Type elementType = null;
+            if (StringUtils.HasText(this.elementTypeName))
+            {
+                elementType = TypeResolutionUtils.ResolveType(this.elementTypeName);
+            }
+
+            string elementName = propertyName + "[(set-element)]";
+            foreach (object element in this)
+            {
+                object resolvedElement = resolver(objectName, definition, elementName, element);
+
+                if (elementType != null)
+                {
+                    try
+                    {
+                        resolvedElement = TypeConversionUtils.ConvertValueIfNecessary(elementType, resolvedElement, propertyName);
+                    }
+                    catch (TypeMismatchException)
+                    {
+                        throw new TypeMismatchException(
+                            String.Format(
+                                    "Unable to convert managed set element '{0}' from [{1}] into [{2}] during initialization"
+                                    + " of property '{3}' for object '{4}'. Do you have an appropriate type converter registered?", 
+                                    resolvedElement, resolvedElement.GetType(), elementType, propertyName, objectName));
+                    }
+                }
+
+                set.Add(resolvedElement);
+            }
+
+            return set;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/MethodInjectingInstantiationStrategy.cs b/src/Spring/Spring.Core/Objects/Factory/Support/MethodInjectingInstantiationStrategy.cs
new file mode 100644
index 00000000..0b2a43a5
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/MethodInjectingInstantiationStrategy.cs
@@ -0,0 +1,617 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Text;
+using Spring.Collections;
+using Spring.Core;
+using Spring.Util;
+using Spring.Reflection.Dynamic;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// An <see cref="Spring.Objects.Factory.Support.IInstantiationStrategy"/>
+	/// implementation that supports method injection.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Classes that want to take advantage of method injection must meet some
+	/// stringent criteria. Every method that is to be method injected
+	/// <b>must</b> be defined as either <see lang="virtual"/> or
+	/// <see lang="abstract"/>. An <see cref="Spring.Objects.ObjectsException"/>
+	/// will be thrown if these criteria are not met.
+	/// </p>
+	/// </remarks>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: MethodInjectingInstantiationStrategy.cs,v 1.13 2008/05/02 16:44:44 markpollack Exp $</version>
+    [Serializable]
+    public class MethodInjectingInstantiationStrategy : SimpleInstantiationStrategy
+	{
+	    /// <summary>
+	    /// The name of the dynamic assembly that holds dynamically created code
+	    /// </summary>
+        private const string DYNAMIC_ASSEMBLY_NAME = "Spring.MethodInjected";
+	    
+		/// <summary>
+		/// A cache of generated <see cref="System.Type"/> instances, keyed on
+		/// the object name for which the <see cref="System.Type"/> was generated.
+		/// </summary>
+		private IDictionary typeCache = new Hashtable();
+
+		/// <summary>
+		/// Instantiate an instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>,
+		/// injecting methods as appropriate.
+		/// </summary>
+		/// <param name="definition">
+		/// The definition of the object that is to be instantiated.
+		/// </param>
+		/// <param name="objectName">
+		/// The name associated with the object definition. The name can be the
+		/// <see lang="null"/> or zero length string if we're autowiring an
+		/// object that doesn't belong to the supplied
+		/// <paramref name="factory"/>.
+		/// </param>
+		/// <param name="factory">
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// </param>
+		/// <returns>
+		/// An instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </returns>
+		/// <seealso cref="Spring.Objects.Factory.Support.SimpleInstantiationStrategy.InstantiateWithMethodInjection(RootObjectDefinition, string, IObjectFactory)"/> 
+		protected override object InstantiateWithMethodInjection(
+			RootObjectDefinition definition, string objectName, IObjectFactory factory)
+		{
+			return DoInstantiate(definition, objectName, factory, Type.EmptyTypes, ObjectUtils.EmptyObjects);
+		}
+
+		/// <summary>
+		/// Instantiate an instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>,
+		/// injecting methods as appropriate.
+		/// </summary>
+		/// <param name="definition">
+		/// The definition of the object that is to be instantiated.
+		/// </param>
+		/// <param name="objectName">
+		/// The name associated with the object definition. The name can be the
+		/// <see lang="null"/> or zero length string if we're autowiring an
+		/// object that doesn't belong to the supplied
+		/// <paramref name="factory"/>.
+		/// </param>
+		/// <param name="factory">
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// </param>
+		/// <param name="constructor">
+		/// The <see cref="System.Reflection.ConstructorInfo"/> to be used to instantiate
+		/// the object.
+		/// </param>
+		/// <param name="arguments">
+		/// Any arguments to the supplied <paramref name="constructor"/>. May be null.
+		/// </param>
+		/// <returns>
+		/// An instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </returns>
+		/// <seealso cref="Spring.Objects.Factory.Support.SimpleInstantiationStrategy.InstantiateWithMethodInjection(RootObjectDefinition, string, IObjectFactory, ConstructorInfo, object[])"/> 
+		protected override object InstantiateWithMethodInjection(
+			RootObjectDefinition definition, string objectName, IObjectFactory factory, ConstructorInfo constructor, object[] arguments)
+		{
+			return DoInstantiate(definition, objectName, factory, ReflectionUtils.GetParameterTypes(constructor), arguments);
+		}
+
+		/// <summary>
+		/// Instantiate an instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>,
+		/// injecting methods as appropriate.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This method dynamically generates a subclass that supports method
+		/// injection for the supplied <paramref name="definition"/>. It then
+		/// instantiates an new instance of said type using the constructor
+		/// identified by the supplied <paramref name="ctorParameterTypes"/>,
+		/// passing the supplied <paramref name="arguments"/> to said
+		/// constructor. It then manually injects (generic) method replacement
+		/// and method lookup instances (of <see cref="System.Type"/>
+		/// <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/>) into
+		/// the new instance: those methods that are 'method-injected' will
+		/// then delegate to the approriate
+		/// <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/>
+		/// instance to effect the actual method injection.
+		/// </p>
+		/// </remarks>
+		/// <param name="definition">
+		/// The definition of the object that is to be instantiated.
+		/// </param>
+		/// <param name="objectName">
+		/// The name associated with the object definition. The name can be the
+		/// <see lang="null"/> or zero length string if we're autowiring an
+		/// object that doesn't belong to the supplied
+		/// <paramref name="factory"/>.
+		/// </param>
+		/// <param name="factory">
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// </param>
+		/// <param name="ctorParameterTypes">
+		/// The parameter <see cref="System.Type"/>s to use to find the
+		/// appropriate constructor to invoke.
+		/// </param>
+		/// <param name="arguments">
+		/// The aguments that are to be passed to the appropriate constructor
+		/// when the object is being instantiated.
+		/// </param>
+		/// <returns>
+		/// A new instance of the <see cref="System.Type"/> defined by the
+		/// supplied <paramref name="definition"/>.
+		/// </returns>
+		private object DoInstantiate(
+			RootObjectDefinition definition, string objectName, IObjectFactory factory, Type[] ctorParameterTypes, object[] arguments)
+		{
+			Type type = GetGeneratedType(objectName, definition);
+			object instance = type.GetConstructor(ctorParameterTypes).Invoke(arguments);
+			IObjectWrapper wrapper = new ObjectWrapper(instance);
+			wrapper.SetPropertyValue(
+				MethodInjectingTypeBuilder.MethodReplacementPropertyName,
+				new DelegatingMethodReplacer(definition, factory));
+			wrapper.SetPropertyValue(
+				MethodInjectingTypeBuilder.MethodLookupPropertyName,
+				new LookupMethodReplacer(definition, factory));
+			return instance;
+		}
+
+		private Type GetGeneratedType(string objectName, RootObjectDefinition definition)
+		{
+			lock (typeCache.SyncRoot)
+			{
+                Type generatedType = (Type) typeCache[objectName];			    
+				if (generatedType == null)
+				{
+					#region Instrumentation
+
+					if (log.IsDebugEnabled)
+					{
+						log.Debug(string.Format(CultureInfo.InvariantCulture,
+						                        "Generating a subclass of the [{0}] class for the '{1}' " +
+						                        	"object definition for the purposes of method injection.",
+						                        definition.ObjectType, objectName));
+					}
+
+					#endregion
+
+                    ModuleBuilder module = DynamicCodeManager.GetModuleBuilder(DYNAMIC_ASSEMBLY_NAME);
+                    generatedType = new MethodInjectingTypeBuilder(module, definition).BuildType();
+					typeCache[objectName] = generatedType;
+				}
+                return generatedType;
+            }
+		}
+
+		#region Inner Class : MethodInjectingTypeBuilder
+
+		/// <summary>
+		/// A <see cref="System.Type"/> factory that generates subclasses of those
+		/// classes that have been configured for the Method-Injection form of
+		/// Dependency Injection.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This class is designed as for <c>one-shot</c> usage; i.e. it must
+		/// be used to generate <i>exactly</i> one method injected subclass and
+		/// then discarded (it maintains state in instance fields).
+		/// </p>
+		/// </remarks>
+		private sealed class MethodInjectingTypeBuilder
+		{
+			/// <summary>
+			/// The name of the generated <see cref="IMethodReplacer"/>
+			/// property (for method replacement).
+			/// </summary>
+			/// <remarks>
+			/// <p>
+			/// Exists so that clients of this class can use this name to set properties reflectively
+			/// on the dynamically generated subclass.
+			/// </p>
+			/// </remarks>
+			internal const string MethodReplacementPropertyName = "MethodReplacement";
+
+			/// <summary>
+			/// The name of the generated <see cref="IMethodReplacer"/>
+			/// property (for method lookup).
+			/// </summary>
+			/// <remarks>
+			/// <p>
+			/// Exists so that clients of this class can use this name to set properties reflectively
+			/// on the dynamically generated subclass.
+			/// </p>
+			/// </remarks>
+			internal const string MethodLookupPropertyName = "MethodLookup";
+
+			private RootObjectDefinition objectDefinition;
+			private FieldBuilder methodReplacementField;
+			private FieldBuilder methodLookupField;
+			private ModuleBuilder module;
+
+			private readonly MethodInfo MethodReplacerImplementMethod
+				= typeof (IMethodReplacer).GetMethod("Implement", new Type[] {typeof (object), typeof (MethodInfo), typeof (object[])});
+
+			/// <summary>
+			/// Creates a new instance of the
+			/// <see cref="MethodInjectingTypeBuilder"/> class.
+			/// </summary>
+			/// <param name="module">
+			/// The <see cref="System.Reflection.Emit.ModuleBuilder"/> in which
+			/// the generated <see cref="System.Type"/> is to be defined.
+			/// </param>
+			/// <param name="objectDefinition">
+			/// The object definition that is the target of the method injection.
+			/// </param>
+			/// <exception cref="System.ArgumentNullException">
+			/// If either of the supplied arguments is <see langword="null"/>.
+			/// </exception>
+			public MethodInjectingTypeBuilder(ModuleBuilder module, RootObjectDefinition objectDefinition)
+			{
+				AssertUtils.ArgumentNotNull(module, "module");
+				AssertUtils.ArgumentNotNull(objectDefinition, "objectDefinition");
+				this.module = module;
+				this.objectDefinition = objectDefinition;
+			}
+
+			/// <summary>
+			/// Builds a <see cref="System.Type"/> suitable for Method-Injection. 
+			/// </summary>
+			/// <returns>
+			/// A <see cref="System.Type"/> suitable for Method-Injection. 
+			/// </returns>
+			public Type BuildType()
+			{
+				TypeBuilder typeBuilder = DefineType();
+				DefineFields(typeBuilder);
+				DefineConstructors(typeBuilder);
+				DefineProperties(typeBuilder);
+				DefineMethods(typeBuilder);
+				return typeBuilder.CreateType();
+			}
+
+			private Type BaseType
+			{
+				get { return this.objectDefinition.ObjectType; }
+			}
+
+			private TypeBuilder DefineProperties(TypeBuilder typeBuilder)
+			{
+				DefineWritePropertyForMethodReplacement(typeBuilder, MethodReplacementPropertyName, this.methodReplacementField);
+				DefineWritePropertyForMethodReplacement(typeBuilder, MethodLookupPropertyName, this.methodLookupField);
+				return typeBuilder;
+			}
+
+			private TypeBuilder DefineType()
+			{
+                // Generates unique type name
+                string generatedSubclassName = String.Format("{0}_{1}",
+                    BaseType.FullName, Guid.NewGuid().ToString("N"));
+				return this.module.DefineType(
+					generatedSubclassName, TypeAttributes.BeforeFieldInit | TypeAttributes.Public, BaseType);
+			}
+
+			private TypeBuilder DefineFields(TypeBuilder typeBuilder)
+			{
+				methodReplacementField = typeBuilder.DefineField("methodReplacement", typeof (IMethodReplacer), FieldAttributes.Private);
+				methodLookupField = typeBuilder.DefineField("methodLookup", typeof (IMethodReplacer), FieldAttributes.Private);
+				return typeBuilder;
+			}
+
+			private TypeBuilder DefineConstructors(TypeBuilder typeBuilder)
+			{
+				ConstructorInfo[] constructors = BaseType.GetConstructors(
+					BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+				for (int i = 0; i < constructors.Length; ++i)
+				{
+					ConstructorInfo constructor = constructors[i];
+					if (constructor.IsPublic || constructor.IsFamily)
+					{
+						MethodAttributes attributes = MethodAttributes.Public |
+							MethodAttributes.HideBySig | MethodAttributes.SpecialName |
+							MethodAttributes.RTSpecialName;
+						ConstructorBuilder cb = typeBuilder.DefineConstructor(attributes,
+						                                                      constructor.CallingConvention,
+						                                                      ReflectionUtils.GetParameterTypes(constructor.GetParameters()));
+						ILGenerator il = cb.GetILGenerator();
+						int paramCount = constructor.GetParameters().Length;
+						il.Emit(OpCodes.Ldarg_0);
+						for (int j = 1; j <= paramCount; ++j)
+						{
+							il.Emit(OpCodes.Ldarg_S, j);
+						}
+						il.Emit(OpCodes.Call, constructor);
+						il.Emit(OpCodes.Ret);
+					}
+				}
+				return typeBuilder;
+			}
+
+			/// <summary>
+			/// Defines overrides for those methods that are configured with an appropriate
+			/// <see cref="Spring.Objects.Factory.Support.MethodOverride"/>.
+			/// </summary>
+			/// <param name="typeBuilder">
+			/// The overarching <see cref="System.Reflection.Emit.TypeBuilder"/> that is defining
+			/// the generated <see cref="System.Type"/>.
+			/// </param>
+			private TypeBuilder DefineMethods(TypeBuilder typeBuilder)
+			{
+				MethodInfo[] methods = BaseType.GetMethods(
+					BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic);
+				for (int i = 0; i < methods.Length; ++i)
+				{
+					MethodInfo method = methods[i];
+					MethodOverride methodOverride
+						= this.objectDefinition.MethodOverrides.GetOverride(method);
+					if (methodOverride != null)
+					{
+						if (!method.IsVirtual || method.IsFinal)
+						{
+							throw new ObjectCreationException(
+								"A replaced method must be marked as either abstract or virtual.");
+						}
+						FieldBuilder field = null;
+						if (methodOverride is ReplacedMethodOverride)
+						{
+							field = this.methodReplacementField;
+						}
+						else
+						{
+							// lookup methods cannot have any arguments...
+							if (method.GetParameters().Length > 0)
+							{
+								throw new ObjectCreationException(
+									"The signature of a lookup method cannot have any arguments.");
+							}
+							// lookup methods cannot return void...
+							if (method.ReturnType == typeof (void))
+							{
+								throw new ObjectCreationException(
+									"A lookup method cannot be declared with a void return type.");
+							}
+							field = this.methodLookupField;
+						}
+						DefineReplacedMethod(typeBuilder, method, field);
+					}
+				}
+				return typeBuilder;
+			}
+
+			/// <summary>
+			/// Override the supplied <paramref name="method"/> with the logic
+			/// encapsulated by the
+			/// <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/>
+			/// defined by the supplied <paramref name="field"/>.
+			/// </summary>
+			/// <param name="typeBuilder">
+			/// The builder for the subclass that is being generated.
+			/// </param>
+			/// <param name="method">
+			/// The method on the superclass that is to be overridden.
+			/// </param>
+			/// <param name="field">
+			/// The field defining the
+			/// <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/>
+			/// that the overridden method will delegate to to do the 'actual'
+			/// method injection logic.
+			/// </param>
+			private void DefineReplacedMethod(TypeBuilder typeBuilder, MethodInfo method, FieldBuilder field)
+			{
+				ParameterInfo[] methodParameters = method.GetParameters();
+				MethodBuilder methodBuilder
+					= typeBuilder.DefineMethod(method.Name,
+					                           CalculateMethodAttributes(method),
+					                           method.CallingConvention,
+					                           method.ReturnType,
+					                           ReflectionUtils.GetParameterTypes(methodParameters));
+				DefineOverrideMethodParameters(methodParameters, methodBuilder);
+				ILGenerator il = methodBuilder.GetILGenerator();
+				LocalBuilder returnValue = DefineReturnValueIfAny(method, il);
+				// prepare the invocation of the 'Implement' method for the 'field' (an IMethodReplacer)...
+				il.Emit(OpCodes.Ldarg_0);
+				il.Emit(OpCodes.Ldfld, field);
+				PushArguments(methodParameters, il);
+				// invoke the 'Implement' method of the IMethodReplacer in the 'field'...
+				il.Emit(OpCodes.Callvirt, MethodReplacerImplementMethod);
+				SetupTheReturnValueIfAny(returnValue, il);
+				il.Emit(OpCodes.Ret);
+			}
+
+			/// <summary>
+			/// Defines the parameters to the method that is being overridden.
+			/// </summary>
+			/// <remarks>
+			/// <p>
+			/// Since we are simply overridding a method (in this method
+			/// injection context), all we do here is simply copy the
+			/// parameters (since we want a method with the exact same parameters).
+			/// </p>
+			/// </remarks>
+			/// <param name="methodParameters">
+			/// The parameters to the original method that is being overridden.
+			/// </param>
+			/// <param name="methodBuilder">
+			/// The builder we are using to define the new overridden method.
+			/// </param>
+			private static void DefineOverrideMethodParameters(
+				ParameterInfo[] methodParameters, MethodBuilder methodBuilder)
+			{
+				for (int i = 0; i < methodParameters.Length; ++i)
+				{
+					ParameterInfo parameter = methodParameters[i];
+					methodBuilder.DefineParameter(i + 1, parameter.Attributes, parameter.Name);
+				}
+			}
+
+			/// <summary>
+			/// Generates the MSIL for actually returning a return value if the
+			/// supplied <paramref name="returnValue"/> is not
+			/// <see lang="null"/>.
+			/// </summary>
+			/// <param name="returnValue">
+			/// The definition of the return value; if <see lang="null"/>, it
+			/// means that no return value is to required (a <c>void</c>
+			/// return type).
+			/// </param>
+			/// <param name="il">
+			/// The <see cref="System.Reflection.Emit.ILGenerator"/> to emit
+			/// the MSIL to.
+			/// </param>
+			private static void SetupTheReturnValueIfAny(LocalBuilder returnValue, ILGenerator il)
+			{
+				if (returnValue != null)
+				{
+					il.Emit(OpCodes.Castclass, returnValue.LocalType);
+					il.Emit(OpCodes.Stloc, returnValue);
+					il.Emit(OpCodes.Ldloc, returnValue);
+				}
+				else
+				{
+					il.Emit(OpCodes.Pop);
+				}
+			}
+
+			/// <summary>
+			/// Generates the MSIL for a return value if the supplied
+			/// <paramref name="method"/> returns a value.
+			/// </summary>
+			/// <param name="method">
+			/// The method to be checked.
+			/// </param>
+			/// <param name="il">
+			/// The <see cref="System.Reflection.Emit.ILGenerator"/> to emit
+			/// the MSIL to.
+			/// </param>
+			/// <returns>
+			/// The return value, or <see lang="null"/> if the method does not
+			/// return a value (has a <c>void</c> return type).
+			/// </returns>
+			private static LocalBuilder DefineReturnValueIfAny(MethodInfo method, ILGenerator il)
+			{
+				LocalBuilder returnValue = null;
+				if (method.ReturnType != typeof (void))
+				{
+					returnValue = il.DeclareLocal(method.ReturnType);
+				}
+				return returnValue;
+			}
+
+			/// <summary>
+			/// Pushes (sets up) the arguments for a call to the
+			/// <see cref="Spring.Objects.Factory.Support.IMethodReplacer.Implement(object, MethodInfo, object[])"/>
+			/// method of an appropriate
+			/// <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/>.
+			/// </summary>
+			/// <param name="methodParameters">
+			/// The parameters to the <i>original</i> method (will be bundled
+			/// up into a generic <c>object[]</c> and passed as the third
+			/// argument to the
+			/// <see cref="Spring.Objects.Factory.Support.IMethodReplacer.Implement(object, MethodInfo, object[])"/>
+			/// invocation.
+			/// </param>
+			/// <param name="il">
+			/// The <see cref="System.Reflection.Emit.ILGenerator"/> to emit
+			/// the MSIL to.
+			/// </param>
+			private static void PushArguments(ParameterInfo[] methodParameters, ILGenerator il)
+			{
+				// push 'this' (1st arg)...
+				il.Emit(OpCodes.Ldarg_0);
+				// push the currently executing method (2nd arg)...
+				il.Emit(OpCodes.Call, typeof (MethodBase).GetMethod("GetCurrentMethod", BindingFlags.Static | BindingFlags.Public));
+				il.Emit(OpCodes.Castclass, typeof (MethodInfo));
+				// push the arguments to the currently executing method as an object [] (3rd arg)...
+				il.Emit(OpCodes.Ldc_I4, methodParameters.Length);
+				LocalBuilder args = il.DeclareLocal(typeof (object[]));
+				il.Emit(OpCodes.Newarr, typeof (object));
+				il.Emit(OpCodes.Stloc, args);
+				for (int i = 0; i < methodParameters.Length; ++i)
+				{
+					il.Emit(OpCodes.Ldloc, args);
+					il.Emit(OpCodes.Ldc_I4, i);
+					il.Emit(OpCodes.Ldarg_S, i + 1);
+					ParameterInfo parameter = methodParameters[i];
+					if (parameter.ParameterType.IsEnum || parameter.ParameterType.IsValueType)
+					{
+						il.Emit(OpCodes.Box, parameter.ParameterType);
+					}
+					il.Emit(OpCodes.Stelem_Ref);
+				}
+				il.Emit(OpCodes.Ldloc, args);
+			}
+
+			/// <summary>
+			/// Simply generates the IL for a write only property for the
+			/// <see cref="IMethodReplacer"/> <see cref="System.Type"/>. 
+			/// </summary>
+			/// <param name="typeBuilder">
+			/// The <see cref="System.Type"/> in which the property is defined.
+			/// </param>
+			/// <param name="propertyName">
+			/// The name of the (to be) generated property.
+			/// </param>
+			/// <param name="field">
+			/// The (instance) field that the property is to 'set'.
+			/// </param>
+			private void DefineWritePropertyForMethodReplacement(
+				TypeBuilder typeBuilder, string propertyName, FieldBuilder field)
+			{
+				MethodBuilder setMethodBuilder = typeBuilder.DefineMethod(
+					"set_" + propertyName, MethodAttributes.Public | MethodAttributes.SpecialName,
+					typeof (void), new Type[] {typeof (IMethodReplacer)});
+				ILGenerator il = setMethodBuilder.GetILGenerator();
+				il.Emit(OpCodes.Ldarg_0);
+				il.Emit(OpCodes.Ldarg_1);
+				il.Emit(OpCodes.Stfld, field);
+				il.Emit(OpCodes.Ret);
+				PropertyBuilder propertyBuilder = typeBuilder.DefineProperty(
+					propertyName, PropertyAttributes.None, typeof (IMethodReplacer), Type.EmptyTypes);
+				propertyBuilder.SetSetMethod(setMethodBuilder);
+			}
+
+			private MethodAttributes CalculateMethodAttributes(MethodInfo method)
+			{
+                MethodAttributes attributes = MethodAttributes.Public | MethodAttributes.ReuseSlot
+                    | MethodAttributes.HideBySig | MethodAttributes.Virtual;
+				if (method.IsSpecialName)
+				{
+					return attributes | MethodAttributes.SpecialName;
+				}
+				return attributes;
+			}
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverride.cs b/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverride.cs
new file mode 100644
index 00000000..3710c8e5
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverride.cs
@@ -0,0 +1,123 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Represents the override of a method on a managed object by the IoC container.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Note that the override mechanism is <i>not</i> intended as a generic means of
+	/// inserting crosscutting code: use AOP for that.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: MethodOverride.cs,v 1.9 2007/08/22 08:52:03 markpollack Exp $</version>
+    [Serializable]
+    public abstract class MethodOverride
+	{
+		private readonly string methodName;
+		private bool isOverloaded = true;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Support.MethodOverride"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an <see langword="abstract"/> class, and as such exposes no
+		/// public constructors.
+		/// </p>
+		/// </remarks>
+		/// <param name="methodName">
+		/// The name of the method that is to be overridden.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="methodName"/> is <see langword="null"/> or
+		/// contains only whitespace character(s).
+		/// </exception>
+		protected MethodOverride(string methodName)
+		{
+			AssertUtils.ArgumentHasText(methodName, "methodName");
+			this.methodName = methodName.Trim();
+		}
+
+		/// <summary>
+		/// The name of the method that is to be overridden.
+		/// </summary>
+		public string MethodName
+		{
+			get { return methodName; }
+		}
+
+		/// <summary>
+		/// Is the method that is ot be injected
+		/// (<see cref="Spring.Objects.Factory.Support.MethodOverride.MethodName"/>)
+		/// to be considered as overloaded?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If <see lang="true"/> (the default), then argument type matching
+		/// will be performed (because one would not want to override the wrong
+		/// method).
+		/// </p>
+		/// <p>
+		/// Setting the value of this property to <see lang="false"/> can be used
+		/// to optimize runtime performance (ever so slightly).
+		/// </p>
+		/// </remarks>
+		public bool IsOverloaded
+		{
+			get { return isOverloaded; }
+			set { isOverloaded = value; }
+		}
+
+		/// <summary>
+		/// Does this <see cref="Spring.Objects.Factory.Support.MethodOverride"/>
+		/// match the supplied <paramref name="method"/>?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// By 'match' one means does this particular
+		/// <see cref="Spring.Objects.Factory.Support.MethodOverride"/>
+		/// instance apply to the supplied <paramref name="method"/>?
+		/// </p>
+		/// <p>
+		/// This allows for argument list checking as well as method name checking.
+		/// </p>
+		/// </remarks>
+		/// <param name="method">The method to be checked.</param>
+		/// <returns>
+		/// <see lang="true"/> if this override matches the supplied
+		/// <paramref name="method"/>.
+		/// </returns>
+		public abstract bool Matches(MethodInfo method);
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverrides.cs b/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverrides.cs
new file mode 100644
index 00000000..f177105e
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverrides.cs
@@ -0,0 +1,200 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using Spring.Collections;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// A collection (with set semantics) of method overrides, determining which, if any,
+	/// methods on a managed object the Spring.NET IoC container will override at runtime.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: MethodOverrides.cs,v 1.8 2007/03/16 04:01:42 aseovic Exp $</version>
+    [Serializable]
+    public class MethodOverrides : IEnumerable
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Support.MethodOverrides"/> class.
+		/// </summary>
+		public MethodOverrides()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Support.MethodOverrides"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Deep copy constructoe.
+		/// </p>
+		/// </remarks>
+		/// <param name="other">
+		/// The instance supplying initial overrides for this new instance.
+		/// </param>
+		public MethodOverrides(MethodOverrides other)
+		{
+			AddAll(other);
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// The collection of method overrides.
+		/// </summary>
+		public ISet Overrides
+		{
+			get { return _overrides; }
+		}
+
+		/// <summary>
+		/// Returns true if this instance contains no overrides.
+		/// </summary>
+		public bool IsEmpty
+		{
+			get { return Overrides.IsEmpty; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Copy all given method overrides into this object.
+		/// </summary>
+		/// <param name="other">
+		/// The overrides to be copied into this object.
+		/// </param>
+		public void AddAll(MethodOverrides other)
+		{
+			if (other != null)
+			{
+				Overrides.AddAll(other.Overrides);
+				_overloadedMethodNames.AddAll(other._overloadedMethodNames);
+			}
+		}
+
+		/// <summary>
+		/// Adds the supplied <paramref name="theOverride"/> to the overrides contained
+		/// within this instance.
+		/// </summary>
+		/// <param name="theOverride">
+		/// The <see cref="Spring.Objects.Factory.Support.MethodOverride"/> to be
+		/// added.
+		/// </param>
+		public void Add(MethodOverride theOverride)
+		{
+			Overrides.Add(theOverride);
+		}
+
+		/// <summary>
+		/// Adds the supplied <paramref name="methodName"/> to the overloaded method names
+		/// contained within this instance.
+		/// </summary>
+		/// <param name="methodName">
+		/// The overloaded method name to be added.
+		/// </param>
+		public void AddOverloadedMethodName(string methodName)
+		{
+			_overloadedMethodNames.Add(methodName);
+		}
+
+		/// <summary>
+		/// Returns true if the supplied <paramref name="methodName"/> is present within
+		/// the overloaded method names contained within this instance.
+		/// </summary>
+		/// <param name="methodName">
+		/// The overloaded method name to be checked.
+		/// </param>
+		/// <returns>
+		/// True if the supplied <paramref name="methodName"/> is present within
+		/// the overloaded method names contained within this instance.
+		/// </returns>
+		public bool IsOverloadedMethodName(string methodName)
+		{
+			return _overloadedMethodNames.Contains(methodName);
+		}
+
+		/// <summary>
+		/// Return the override for the given method, if any.
+		/// </summary>
+		/// <param name="method">
+		/// The method to check for overrides for.
+		/// </param>
+		/// <returns>
+		/// the override for the given method, if any.
+		/// </returns>
+		public MethodOverride GetOverride(MethodInfo method)
+		{
+			foreach (MethodOverride ovr in Overrides)
+			{
+				if (ovr.Matches(method))
+				{
+					return ovr;
+				}
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Returns an <see cref="System.Collections.IEnumerator"/> that can iterate
+		/// through a collection.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The returned <see cref="System.Collections.IEnumerator"/> is the
+		/// <see cref="System.Collections.IEnumerator"/> exposed by the
+		/// <see cref="Spring.Objects.Factory.Support.MethodOverrides.Overrides"/>
+		/// property.
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// An <see cref="System.Collections.IEnumerator"/> that can iterate through a
+		/// collection.
+		/// </returns>
+		public IEnumerator GetEnumerator()
+		{
+			return Overrides.GetEnumerator();
+		}
+
+		#endregion
+
+		#region Fields
+
+		private ISet _overrides = new HybridSet();
+		private ISet _overloadedMethodNames = new HybridSet();
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionBuilder.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionBuilder.cs
new file mode 100644
index 00000000..034e386a
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionBuilder.cs
@@ -0,0 +1,374 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+using System;
+using System.Collections;
+using Spring.Objects.Factory.Config;
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Programmatic means of constructing a <see cref="IObjectDefinition"/> using the builder pattern.  Intended primarily
+    /// for use when implementing custom namespace parsers.
+    /// </summary>
+    /// <remarks>Set methods are used instead of properties, so that chaining of methods can be used to create
+    /// 'one-liner'definitions that set multiple properties at one.</remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Rob Harrop</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ObjectDefinitionBuilder.cs,v 1.4 2007/05/29 20:00:20 markpollack Exp $</version>
+    public class ObjectDefinitionBuilder
+    {
+        #region Fields
+        private AbstractObjectDefinition objectDefinition;
+
+        private IObjectDefinitionFactory objectDefinitionFactory;
+
+        private int constructorArgIndex;
+
+        #endregion
+
+        #region Constructor(s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObjectDefinitionBuilder"/> class, private
+        /// to force use of factory methods.
+        /// </summary>
+        private ObjectDefinitionBuilder()
+        {
+        }
+
+        #endregion
+
+        #region Factory Methods
+
+       
+        /// <summary>
+        /// Create a new <code>ObjectDefinitionBuilder</code> used to construct a root object definition.
+        /// </summary>
+        /// <param name="objectDefinitionFactory">The object definition factory.</param>
+        /// <param name="objectTypeName">The type name of the object.</param>
+        /// <returns>A new <code>ObjectDefinitionBuilder</code> instance.</returns>
+        public static ObjectDefinitionBuilder RootObjectDefinition(IObjectDefinitionFactory objectDefinitionFactory,
+                                                                   string objectTypeName)
+        {
+            return RootObjectDefinition(objectDefinitionFactory, objectTypeName, null);
+        }
+
+        /// <summary>
+        /// Create a new <code>ObjectDefinitionBuilder</code> used to construct a root object definition.
+        /// </summary>
+        /// <param name="objectDefinitionFactory">The object definition factory.</param>
+        /// <param name="objectTypeName">Name of the object type.</param>
+        /// <param name="factoryMethodName">Name of the factory method.</param>
+        /// <returns>A new <code>ObjectDefinitionBuilder</code> instance.</returns>
+        public static ObjectDefinitionBuilder RootObjectDefinition(IObjectDefinitionFactory objectDefinitionFactory,
+                                                                   string objectTypeName,
+                                                                   string factoryMethodName)
+        {
+            ObjectDefinitionBuilder builder = new ObjectDefinitionBuilder();
+
+            builder.objectDefinitionFactory = objectDefinitionFactory;
+
+            // Pass in null for parent name and also AppDomain to force object definition to be register by name and not type.
+            builder.objectDefinition =
+                           objectDefinitionFactory.CreateObjectDefinition(objectTypeName, null, null);
+
+            builder.objectDefinition.FactoryMethodName = factoryMethodName;
+
+            return builder;
+
+        }        
+
+        /// <summary>
+        /// Create a new <code>ObjectDefinitionBuilder</code> used to construct a root object definition.
+        /// </summary>
+        /// <param name="objectDefinitionFactory">The object definition factory.</param>
+        /// <param name="objectType">Type of the object.</param>
+        /// <returns>A new <code>ObjectDefinitionBuilder</code> instance.</returns>
+        public static ObjectDefinitionBuilder RootObjectDefinition(IObjectDefinitionFactory objectDefinitionFactory,
+                                                                   Type objectType) 
+        {
+            return RootObjectDefinition(objectDefinitionFactory, objectType, null);
+        }
+
+        /// <summary>
+        /// Create a new <code>ObjectDefinitionBuilder</code> used to construct a root object definition.
+        /// </summary>
+        /// <param name="objectDefinitionFactory">The object definition factory.</param>
+        /// <param name="objectType">Type of the object.</param>
+        /// <param name="factoryMethodName">Name of the factory method.</param>
+        /// <returns>A new <code>ObjectDefinitionBuilder</code> instance.</returns>
+        public static ObjectDefinitionBuilder RootObjectDefinition(IObjectDefinitionFactory objectDefinitionFactory,
+                                                                   Type objectType, string factoryMethodName)
+        {
+            ObjectDefinitionBuilder builder = new ObjectDefinitionBuilder();
+            
+            builder.objectDefinitionFactory = objectDefinitionFactory;
+
+            builder.objectDefinition =
+                objectDefinitionFactory.CreateObjectDefinition(objectType.FullName, null, AppDomain.CurrentDomain);
+
+            builder.objectDefinition.ObjectType = objectType;
+            builder.objectDefinition.FactoryMethodName = factoryMethodName;
+            return builder;
+        }
+
+        /// <summary>
+        /// Create a new <code>ObjectDefinitionBuilder</code> used to construct a child object definition..
+        /// </summary>
+        /// <param name="objectDefinitionFactory">The object definition factory.</param>
+        /// <param name="parentObjectName">Name of the parent object.</param>
+        /// <returns></returns>
+        public static ObjectDefinitionBuilder ChildObjectDefinition(IObjectDefinitionFactory objectDefinitionFactory,
+                                                                    string parentObjectName)
+        {
+            ObjectDefinitionBuilder builder = new ObjectDefinitionBuilder();
+
+            builder.objectDefinitionFactory = objectDefinitionFactory;
+
+            builder.objectDefinition =
+              objectDefinitionFactory.CreateObjectDefinition(null, parentObjectName, AppDomain.CurrentDomain);
+
+            return builder;
+        }
+
+        #endregion 
+
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the current object definition in its raw (unvalidated) form.
+        /// </summary>
+        /// <value>The raw object definition.</value>
+        public AbstractObjectDefinition RawObjectDefinition
+        {
+            get { return objectDefinition; }
+
+        }
+
+        /// <summary>
+        /// Validate and gets the object definition.
+        /// </summary>
+        /// <value>The object definition.</value>
+        public AbstractObjectDefinition ObjectDefinition
+        {
+            get
+            {
+                objectDefinition.Validate();
+                return objectDefinition;
+            }
+        }
+
+
+        #endregion
+
+        #region Methods
+        //TODO add expression support.
+
+        /// <summary>
+        /// Adds the property value under the given name.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="value">The value.</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder AddPropertyValue(string name, object value)
+        {
+           objectDefinition.PropertyValues.Add(new PropertyValue(name, value));
+           return this;
+        }
+
+        /// <summary>
+        /// Adds a reference to the specified object name under the property specified.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder AddPropertyReference(string name, string objectName)
+        {
+            objectDefinition.PropertyValues.Add(new PropertyValue(name, new RuntimeObjectReference(objectName)));
+            return this;
+        }
+
+
+        /// <summary>
+        /// Adds an index constructor arg value.  The current index is tracked internally and all addtions are
+        /// at the present point
+        /// </summary>
+        /// <param name="value">The constructor arg value.</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder AddConstructorArg(object value)
+        {
+            objectDefinition.ConstructorArgumentValues.AddIndexedArgumentValue(constructorArgIndex++,value);
+            return this;
+        }
+
+        /// <summary>
+        /// Adds a reference to the named object as a constructor argument.
+        /// </summary>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns></returns>
+        public ObjectDefinitionBuilder AddConstructorArgReference(string objectName)
+        {
+            return AddConstructorArg(new RuntimeObjectReference(objectName));
+        }
+
+
+        /// <summary>
+        /// Sets the name of the factory method to use for this definition.
+        /// </summary>
+        /// <param name="factoryMethod">The factory method.</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder SetFactoryMethod(string factoryMethod)
+        {
+            objectDefinition.FactoryMethodName = factoryMethod;
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the name of the factory object to use for this definition.
+        /// </summary>
+        /// <param name="factoryObject">The factory object.</param>
+        /// <param name="factoryMethod">The factory method.</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder SetFactoryObject(string factoryObject, string factoryMethod)
+        {
+            objectDefinition.FactoryObjectName = factoryObject;
+            objectDefinition.FactoryMethodName = factoryMethod;
+            return this;
+        }
+
+        /// <summary>
+        /// Sets whether or not this definition describes a singleton object.
+        /// </summary>
+        /// <param name="singleton">if set to <c>true</c> [singleton].</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder SetSingleton(bool singleton)
+        {
+            objectDefinition.IsSingleton = singleton;
+            return this;
+        }
+
+        /// <summary>
+        /// Sets whether objects or not this definition is abstract.
+        /// </summary>
+        /// <param name="flag">if set to <c>true</c> [flag].</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder SetAbstract(bool flag)
+        {
+            objectDefinition.IsAbstract = flag;
+            return this;
+        }
+
+        /// <summary>
+        /// Sets whether objects for this definition should be lazily initialized or not.
+        /// </summary>
+        /// <param name="lazy">if set to <c>true</c> [lazy].</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder SetLazyInit(bool lazy)
+        {
+            objectDefinition.IsLazyInit = lazy;
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the autowire mode for this definition.
+        /// </summary>
+        /// <param name="autowireMode">The autowire mode.</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder SetAutowireMode(AutoWiringMode autowireMode)
+        {
+            objectDefinition.AutowireMode = autowireMode;
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the dependency check mode for this definition.
+        /// </summary>
+        /// <param name="dependencyCheck">The dependency check.</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder SetDependencyCheck(DependencyCheckingMode dependencyCheck)
+        {
+            objectDefinition.DependencyCheck = dependencyCheck;
+            return this;
+        }
+
+
+        /// <summary>
+        /// Sets the name of the destroy method for this definition.
+        /// </summary>
+        /// <param name="methodName">Name of the method.</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder SetDestroyMethodName(string methodName)
+        {
+            objectDefinition.DestroyMethodName = methodName;
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the name of the init method for this definition.
+        /// </summary>
+        /// <param name="methodName">Name of the method.</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder SetInitMethodName(string methodName)
+        {
+            objectDefinition.InitMethodName = methodName;
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the resource description for this definition.
+        /// </summary>
+        /// <param name="resourceDescription">The resource description.</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder SetResourceDescription(string resourceDescription)
+        {
+            objectDefinition.ResourceDescription = resourceDescription;
+            return this;
+        }
+
+        /// <summary>
+        /// Adds the specified object name to the list of objects that this definition depends on.
+        /// </summary>
+        /// <param name="objectName">Name of the object.</param>
+        /// <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        public ObjectDefinitionBuilder AddDependsOn(string objectName)
+        {
+            if (objectDefinition.DependsOn == null)
+            {
+                objectDefinition.DependsOn = new string[] {objectName};
+            }
+            else
+            {
+                ArrayList arrayList = new ArrayList();
+                arrayList.AddRange(objectDefinition.DependsOn);
+                arrayList.AddRange(new string[]{ objectName});
+                objectDefinition.DependsOn = (string[])arrayList.ToArray(typeof(string));
+            }
+            return this;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionReaderUtils.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionReaderUtils.cs
new file mode 100644
index 00000000..8bc1d134
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionReaderUtils.cs
@@ -0,0 +1,257 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Xml;
+using Spring.Objects.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Utility methods that are useful for
+    /// <see cref="Spring.Objects.Factory.Support.IObjectDefinitionReader"/>
+    /// implementations.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <seealso cref="ObjectsNamespaceParser"/>
+    /// <version>$Id: ObjectDefinitionReaderUtils.cs,v 1.13 2007/08/07 22:05:20 markpollack Exp $</version>
+    public sealed class ObjectDefinitionReaderUtils
+    {
+        /// <summary>
+        /// The string used as a separator in the generation of synthetic id's
+        /// for those object definitions explicitly that aren't assigned one.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If a <see cref="System.Type"/>  name or parent object definition
+        /// name is not unique, "#1", "#2" etc will be appended, until such
+        /// time that the name becomes unique.
+        /// </p>
+        /// </remarks>
+        public const string GeneratedObjectIdSeparator = "#";
+
+        /// <summary>
+        /// Registers the supplied <paramref name="objectDefinition"/> with the
+        /// supplied <paramref name="registry"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is a convenience method that registers the
+        /// <see cref="Spring.Objects.Factory.Config.ObjectDefinitionHolder.ObjectDefinition"/>
+        /// of the supplied <paramref name="objectDefinition"/> under the 
+        /// <see cref="Spring.Objects.Factory.Config.ObjectDefinitionHolder.ObjectName"/>
+        /// property value of said <paramref name="objectDefinition"/>. If the
+        /// supplied <paramref name="objectDefinition"/> has any
+        /// <see cref="Spring.Objects.Factory.Config.ObjectDefinitionHolder.Aliases"/>,
+        /// then those aliases will also be registered with the supplied
+        /// <paramref name="registry"/>.
+        /// </p>
+        /// </remarks>
+        /// <param name="objectDefinition">
+        /// The object definition holder containing the
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> that
+        /// is to be registered.
+        /// </param>
+        /// <param name="registry">
+        /// The registry that the supplied <paramref name="objectDefinition"/>
+        /// is to be registered with.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If either of the supplied arguments is <see langword="null"/>.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If the <paramref name="objectDefinition"/> could not be registered
+        /// with the <paramref name="registry"/>.
+        /// </exception>
+        public static void RegisterObjectDefinition(
+            ObjectDefinitionHolder objectDefinition, IObjectDefinitionRegistry registry)
+        {
+            AssertUtils.ArgumentNotNull(objectDefinition, "objectDefinition");
+            AssertUtils.ArgumentNotNull(registry, "registry");
+
+            registry.RegisterObjectDefinition(objectDefinition.ObjectName, objectDefinition.ObjectDefinition);
+            string[] aliases = objectDefinition.Aliases;
+            for (int i = 0; i < aliases.Length; ++i)
+            {
+                string alias = aliases[i];
+                registry.RegisterAlias(objectDefinition.ObjectName, alias);
+            }
+        }
+
+        /// <summary>
+        /// Generates an object definition name for the supplied
+        /// <paramref name="objectDefinition"/> that is guaranteed to be unique
+        /// within the scope of the supplied <paramref name="registry"/>.
+        /// </summary>
+        /// <param name="objectDefinition">
+        /// The <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>
+        /// that requires a generated name.
+        /// </param>
+        /// <param name="registry">
+        /// The
+        /// <see cref="Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+        /// that the supplied <paramref name="objectDefinition"/> is to be
+        /// registered with (needed so that the uniqueness of any generated
+        /// name can be guaranteed).
+        /// </param>
+        /// <returns>
+        /// An object definition name for the supplied
+        /// <paramref name="objectDefinition"/> that is guaranteed to be unique
+        /// within the scope of the supplied <paramref name="registry"/> and
+        /// never <cref lang="null"/>.
+        /// </returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// If either of the <paramref name="objectDefinition"/> or
+        /// <paramref name="registry"/> arguments is <see langword="null"/>.
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectDefinitionStoreException">
+        /// If a unique name cannot be generated.
+        /// </exception>
+        public static string GenerateObjectName(
+            IConfigurableObjectDefinition objectDefinition, IObjectDefinitionRegistry registry)
+        {
+            AssertUtils.ArgumentNotNull(objectDefinition, "objectDefinition");
+            AssertUtils.ArgumentNotNull(registry, "registry");
+
+            string starterName = objectDefinition.ObjectTypeName;
+            if (StringUtils.IsNullOrEmpty(starterName))
+            {
+                if (objectDefinition is ChildObjectDefinition)
+                {
+                    starterName = ((ChildObjectDefinition) objectDefinition).ParentName + "$child";
+                }
+                else if (objectDefinition.FactoryObjectName != null)
+                {
+                    starterName = objectDefinition.FactoryObjectName + "$created";
+                }
+            }
+            if (StringUtils.IsNullOrEmpty(starterName))
+            {
+                throw new ObjectDefinitionStoreException(
+                    objectDefinition.ResourceDescription, String.Empty,
+                    "Unnamed object definition specifies neither 'Type' nor 'Parent' " +
+                    "nor 'FactoryObject' property values so a unique name cannot be generated.");
+            }
+            String generatedName = starterName;
+            int counter = 0;
+            while (registry.ContainsObjectDefinition(generatedName))
+            {
+                generatedName = new StringBuilder(starterName)
+                    .Append(GeneratedObjectIdSeparator).Append(++counter).ToString();
+            }
+            return generatedName;
+        }
+
+        /// <summary>
+        /// Factory method for getting concrete
+        /// <see cref="Spring.Objects.IEventHandlerValue"/> instances.
+        /// </summary>
+        /// <param name="methodName">
+        /// The name of the event handler method. This may be straight text, a regular
+        /// expression, <see langword="null"/>, or empty.
+        /// </param>
+        /// <param name="eventName">
+        /// The name of the event being wired. This too may be straight text, a regular
+        /// expression, <see langword="null"/>, or empty.
+        /// </param>
+        /// <returns>
+        /// A concrete <see cref="Spring.Objects.IEventHandlerValue"/>
+        /// instance.
+        /// </returns>
+        public static IEventHandlerValue CreateEventHandlerValue(
+            string methodName, string eventName)
+        {
+            bool weAreAutowiring = false;
+            if (StringUtils.HasText(eventName))
+            {
+                // does the value contain regular expression characters? mmm, totally trent...
+                if (Regex.IsMatch(eventName, @"[\*\.\[\]\{\},\(\)\$\^\+]+"))
+                {
+                    // wildcarded event name
+                    weAreAutowiring = true;
+                }
+            }
+            else
+            {
+                // we're definitely autowiring based on the event name
+                weAreAutowiring = true;
+            }
+            if (!weAreAutowiring)
+            {
+                if (StringUtils.HasText(methodName))
+                {
+                    // does the value contain the string ${event}?
+                    if (methodName.IndexOf("${event}") >= 0)
+                    {
+                        // wildcarded method name
+                        weAreAutowiring = true;
+                    }
+                }
+                else
+                {
+                    // we're definitely autowiring based on the method name
+                    weAreAutowiring = true;
+                }
+            }
+            IEventHandlerValue myHandler;
+            if (weAreAutowiring)
+            {
+                myHandler = new AutoWiringEventHandlerValue();
+            }
+            else
+            {
+                myHandler = new InstanceEventHandlerValue();
+            }
+            myHandler.EventName = eventName;
+            myHandler.MethodName = methodName;
+            return myHandler;
+        }
+
+        #region Constructor (s) / Destructor
+
+        // CLOVER:OFF
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.ObjectDefinitionReaderUtils"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is a utility class, and as such exposes no public constructors.
+        /// </p>
+        /// </remarks>
+        private ObjectDefinitionReaderUtils()
+        {
+        }
+
+        // CLOVER:ON
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValidationException.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValidationException.cs
new file mode 100644
index 00000000..e52c19c8
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValidationException.cs
@@ -0,0 +1,93 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support 
+{
+    /// <summary>
+    /// Thrown when the validation of an object definition failed.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    [Serializable]
+    public class ObjectDefinitionValidationException : FatalObjectException
+    {
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.ObjectDefinitionValidationException"/>
+        /// class.
+        /// </summary>
+        public ObjectDefinitionValidationException ()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.ObjectDefinitionValidationException"/>
+        /// class.
+        /// </summary>
+        /// <param name="message">The detail message.</param>
+        public ObjectDefinitionValidationException (string message)
+            : base (message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.ObjectDefinitionValidationException"/>
+        /// class.
+        /// </summary>
+        /// <param name="message">
+        /// The detail message.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public ObjectDefinitionValidationException (string message, Exception rootCause)
+            : base (message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectDefinitionValidationException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected ObjectDefinitionValidationException (
+            SerializationInfo info, StreamingContext context)
+            : base (info, context)
+        {
+        }
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/PropertiesObjectDefinitionReader.cs b/src/Spring/Spring.Core/Objects/Factory/Support/PropertiesObjectDefinitionReader.cs
new file mode 100644
index 00000000..c1da557b
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/PropertiesObjectDefinitionReader.cs
@@ -0,0 +1,517 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+using System.Resources;
+
+using Spring.Core.IO;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Object definition reader for a simple properties format.
+    /// </summary>
+    /// <remarks>
+    /// Provides object definition registration methods for
+    /// <see cref="System.Collections.IDictionary"/> and
+    /// <see cref="System.Resources.ResourceSet"/> instances. Typically applied to a
+    /// <see cref="Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>.
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Simon White (.NET)</author>
+    public class PropertiesObjectDefinitionReader : AbstractObjectDefinitionReader
+    {
+        /// <summary>
+        /// Value of a T/F attribute that represents true.
+        /// Anything else represents false. Case seNsItive.
+        /// </summary>
+        public const string TrueValue = "true";
+
+        /// <summary>
+        /// Separator between object name and property name.
+        /// </summary>
+        public const string Separator = ".";
+
+        /// <summary>
+        /// Prefix for the class property of a root object definition.
+        /// </summary>
+        public const string ClassKey = "class";
+
+        /// <summary>
+        /// Special string added to distinguish if the object will be
+        /// a singleton.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Default is true.
+        /// </p>
+        /// </remarks>
+        /// <example>
+        /// <p>
+        /// owner.(singleton)=true
+        /// </p>
+        /// </example>
+        public const string SingletonKey = "(singleton)";
+
+        /// <summary>
+        /// Special string added to distinguish if the object will be
+        /// lazily initialised.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Default is false.
+        /// </p>
+        /// </remarks>
+        /// <example>
+        /// <p>
+        /// owner.(lazy-init)=true
+        /// </p>
+        /// </example>
+        public const string LazyInitKey = "(lazy-init)";
+
+        /// <summary>
+        /// Reserved "property" to indicate the parent of a child object definition.
+        /// </summary>
+        public const string ParentKey = "parent";
+
+        /// <summary>
+        /// Property suffix for references to other objects in the current
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/>: e.g.
+        /// owner.dog(ref)=fido.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Whether this is a reference to a singleton or a prototype
+        /// will depend on the definition of the target object.
+        /// </p>
+        /// </remarks>
+        public const string RefSuffix = "(ref)";
+
+        /// <summary>
+        /// Prefix before values referencing other objects.
+        /// </summary>
+        public const string RefPrefix = "*";
+
+        private string _defaultParentObject = string.Empty;
+
+        private IObjectDefinitionFactory _objectDefinitionFactory = new DefaultObjectDefinitionFactory();
+
+        /// <summary>
+        /// Name of default parent object
+        /// </summary>
+        public string DefaultParentObject
+        {
+            get { return _defaultParentObject; }
+            set { this._defaultParentObject = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets object definition factory to use.
+        /// </summary>
+        public IObjectDefinitionFactory ObjectDefinitionFactory
+        {
+            get { return _objectDefinitionFactory; }
+            set { _objectDefinitionFactory = value; }
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader"/>
+        /// class.
+        /// </summary>
+        /// <param name="registry">
+        /// The <see cref="Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+        /// instance that this reader works on.
+        /// </param>
+        public PropertiesObjectDefinitionReader(IObjectDefinitionRegistry registry)
+            : base(registry)
+        {}
+
+        /// <summary>
+        /// Load object definitions from the supplied <paramref name="resource"/>.
+        /// </summary>
+        /// <param name="resource">
+        /// The resource for the object definitions that are to be loaded.
+        /// </param>
+        /// <returns>
+        /// The number of object definitions that were loaded.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of loading or parsing errors.
+        /// </exception>
+        public override int LoadObjectDefinitions(IResource resource)
+        {
+            return LoadObjectDefinitions(resource, string.Empty);
+        }
+
+        /// <summary>
+        /// Load object definitions from the specified properties file.
+        /// </summary>
+        /// <param name="resource">
+        /// The resource descriptor for the properties file.
+        /// </param>
+        /// <param name="prefix">
+        /// The match or filter for object definition names, e.g. 'objects.'
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">in case of loading or parsing errors</exception>
+        /// <returns>the number of object definitions found</returns>
+        public int LoadObjectDefinitions(IResource resource, string prefix)
+        {
+            Properties props = new Properties();
+            try
+            {
+                Stream str = resource.InputStream;
+                try
+                {
+                    props.Load(str);
+                }
+                finally
+                {
+                    str.Close();
+                }
+                return RegisterObjectDefinitions(props, prefix, resource.Description);
+            }
+            catch (IOException ex)
+            {
+                throw new ObjectDefinitionStoreException("IOException parsing properties from " + resource, ex);
+            }
+        }
+
+        /// <summary>
+        /// Register object definitions contained in a
+        /// <see cref="System.Resources.ResourceSet"/>, using all property keys (i.e.
+        /// not filtering by prefix).
+        /// </summary>
+        /// <param name="rs">
+        /// The <see cref="System.Resources.ResourceSet"/> containing object definitions.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of loading or parsing errors.
+        /// </exception>
+        /// <returns>The number of object definitions registered.</returns>
+        public int RegisterObjectDefinitions(ResourceSet rs)
+        {
+            return RegisterObjectDefinitions(rs, string.Empty);
+        }
+
+        /// <summary>
+        /// Register object definitions contained in a
+        /// <see cref="System.Resources.ResourceSet"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Similar syntax as for an <see cref="System.Collections.IDictionary"/>.
+        /// This method is useful to enable standard .NET internationalization support.
+        /// </p>
+        /// </remarks>
+        /// <param name="rs">
+        /// The <see cref="System.Resources.ResourceSet"/> containing object definitions.
+        /// </param>
+        /// <param name="prefix">
+        /// The match or filter for object definition names, e.g. 'objects.'
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of loading or parsing errors.
+        /// </exception>
+        /// <returns>The number of object definitions registered.</returns>
+        public int RegisterObjectDefinitions(ResourceSet rs, string prefix)
+        {
+#if ! NET_1_0
+            // Simply create a map and call overloaded method
+            IDictionary id = new Hashtable();
+            foreach (DictionaryEntry de in rs)
+            {
+                id.Add(de.Key, de.Value);
+            }
+            return RegisterObjectDefinitions(id, prefix);
+#else
+			throw new NotSupportedException("Operation not supported on NET 1.0");
+#endif
+        }
+
+        /// <summary>
+        /// Register object definitions contained in an
+        /// <see cref="System.Collections.IDictionary"/>, using all property keys
+        /// (i.e. not filtering by prefix).
+        /// </summary>
+        /// <param name="id">
+        /// The <see cref="System.Collections.IDictionary"/> containing object definitions.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of loading or parsing errors.
+        /// </exception>
+        /// <returns>The number of object definitions registered.</returns>
+        public int RegisterObjectDefinitions(IDictionary id)
+        {
+            return RegisterObjectDefinitions(id, string.Empty);
+        }
+
+        /// <summary>
+        /// Registers object definitions contained in an <see cref="System.Collections.Specialized.NameValueCollection"/> 
+        /// using all property keys ( i.e. not filtering by prefix )
+        /// </summary>
+        /// <param name="nameValueCollection">The <see cref="System.Collections.Specialized.NameValueCollection"/> containing 
+        /// object definitions.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of loading or parsing errors.
+        /// </exception>
+        /// <returns>The number of object definitions registered.</returns>
+        public int RegisterObjectDefinitions(NameValueCollection nameValueCollection)
+        {
+            IDictionary id = new Hashtable();
+            foreach (DictionaryEntry de in nameValueCollection)
+            {
+                id.Add(de.Key, de.Value);
+            }
+
+            return RegisterObjectDefinitions(id);
+        }
+
+        /// <summary>
+        /// Register object definitions contained in a
+        /// <see cref="System.Collections.IDictionary"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Ignores ineligible properties.
+        /// </p>
+        /// </remarks>
+        /// <param name="id">IDictionary name -> property (String or Object). Property values
+        /// will be strings if coming from a Properties file etc. Property names
+        /// (keys) must be strings. Type keys must be strings.
+        /// </param>
+        /// <param name="prefix">
+        /// The match or filter within the keys in the map: e.g. 'objects.'
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of loading or parsing errors.
+        /// </exception>
+        /// <returns>The number of object definitions found.</returns>
+        public int RegisterObjectDefinitions(IDictionary id, string prefix)
+        {
+            return RegisterObjectDefinitions(id, prefix, "(no description)");
+        }
+
+        /// <summary>
+        /// Register object definitions contained in a
+        /// <see cref="System.Collections.IDictionary"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Ignores ineligible properties.
+        /// </p>
+        /// </remarks>
+        /// <param name="id">IDictionary name -> property (String or Object). Property values
+        /// will be strings if coming from a Properties file etc. Property names
+        /// (keys) must be strings. Type keys must be strings.
+        /// </param>
+        /// <param name="prefix">
+        /// The match or filter within the keys in the map: e.g. 'objects.'
+        /// </param>
+        /// <param name="resourceDescription">
+        /// The description of the resource that the
+        /// <see cref="System.Collections.IDictionary"/> came from (for logging purposes).
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of loading or parsing errors.
+        /// </exception>
+        /// <returns>The number of object definitions found.</returns>
+        public int RegisterObjectDefinitions(
+            IDictionary id, string prefix, string resourceDescription)
+        {
+            if (prefix == null)
+            {
+                prefix = string.Empty;
+            }
+            int objectCount = 0;
+            foreach (string key in id.Keys)
+            {
+                if (key.StartsWith(prefix))
+                {
+                    // Key is of form prefix<name>.property
+                    string nameAndProperty = key.Substring(prefix.Length);
+                    int sepIndx = nameAndProperty.IndexOf(Separator);
+                    if (sepIndx != -1)
+                    {
+                        string name = nameAndProperty.Substring(0, sepIndx);
+
+                        #region Instrumentation
+
+                        if (log.IsDebugEnabled)
+                        {
+                            log.Debug("Found object name '" + name + "'");
+                        }
+
+                        #endregion
+
+                        if (!Registry.ContainsObjectDefinition(name))
+                        {
+                            ++objectCount;
+                        }
+                        RegisterObjectDefinition(name, id, prefix + name, resourceDescription);
+                    }
+                    else
+                    {
+                        // Ignore it: it wasn't a valid object name and property,
+                        // although it did start with the required prefix
+
+                        #region Instrumentation
+
+                        if (log.IsDebugEnabled)
+                        {
+                            log.Debug("Invalid object name and property [" + nameAndProperty + "]");
+                        }
+
+                        #endregion
+                    }
+                } // if the key started with the prefix we're looking for
+            } // while there are more keys
+            return objectCount;
+        }
+
+        /// <summary>
+        /// Get all property values, given a prefix (which will be stripped)
+        /// and add the object they define to the factory with the given name
+        /// </summary>
+        /// <param name="name">The name of the object to define.</param>
+        /// <param name="id">
+        /// The <see cref="System.Collections.IDictionary"/> containing string pairs.
+        /// </param>
+        /// <param name="prefix">The prefix of each entry, which will be stripped.</param>
+        /// <param name="resourceDescription">
+        /// The description of the resource that the
+        /// <see cref="System.Collections.IDictionary"/> came from (for logging purposes).
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of loading or parsing errors.
+        /// </exception>
+        protected void RegisterObjectDefinition(
+            string name, IDictionary id, string prefix, string resourceDescription)
+        {
+            string typeName = null;
+            string parent = null;
+            bool singleton = true;
+            bool lazyInit = false;
+
+            MutablePropertyValues pvs = new MutablePropertyValues();
+            foreach (string key in id.Keys)
+            {
+                if (key.StartsWith(prefix + Separator))
+                {
+                    string property = key.Substring(prefix.Length + Separator.Length);
+                    if (property.Equals(ClassKey))
+                    {
+                        typeName = (string) id[key];
+                    }
+                    else if (property.Equals(SingletonKey))
+                    {
+                        string val = (string) id[key];
+                        singleton = (val == null) || val.Equals(TrueValue);
+                    }
+                    else if (property.Equals(LazyInitKey))
+                    {
+                        string val = (string) id[key];
+                        lazyInit = val.Equals(TrueValue);
+                    }
+                    else if (property.Equals(ParentKey))
+                    {
+                        parent = (string) id[key];
+                    }
+                    else if (property.EndsWith(RefSuffix))
+                    {
+                        // This isn't a real property, but a reference to another prototype
+                        // Extract property name: property is of form dog(ref)
+                        property = property.Substring(0, property.Length - RefSuffix.Length);
+                        string reference = (String) id[key];
+
+                        // It doesn't matter if the referenced object hasn't yet been registered:
+                        // this will ensure that the reference is resolved at runtime
+                        // Default is not to use singleton
+                        object val = new RuntimeObjectReference(reference);
+                        pvs.Add(new PropertyValue(property, val));
+                    }
+                    else
+                    {
+                        // normal object property
+                        object val = id[key];
+                        if (val is String)
+                        {
+                            string strVal = (string) val;
+                            // if it starts with a reference prefix...
+                            if (strVal.StartsWith(RefPrefix))
+                            {
+                                // expand reference
+                                string targetName = strVal.Substring(1);
+                                if (targetName.StartsWith(RefPrefix))
+                                {
+                                    // escaped prefix -> use plain value
+                                    val = targetName;
+                                }
+                                else
+                                {
+                                    val = new RuntimeObjectReference(targetName);
+                                }
+                            }
+                        }
+                        pvs.Add(new PropertyValue(property, val));
+                    }
+                }
+            }
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(pvs.ToString());
+            }
+            if (parent == null)
+            {
+                log.Debug(this.DefaultParentObject);
+                parent = this.DefaultParentObject;
+            }
+            if (typeName == null && parent == null)
+            {
+                throw new ObjectDefinitionStoreException(resourceDescription, name,
+                                                         "Either 'type' or 'parent' is required");
+            }
+            try
+            {
+                IConfigurableObjectDefinition objectDefinition = ObjectDefinitionFactory.CreateObjectDefinition(typeName, parent, Domain);
+                objectDefinition.PropertyValues = pvs;
+                objectDefinition.IsSingleton = singleton;
+                objectDefinition.IsLazyInit = lazyInit;
+                Registry.RegisterObjectDefinition(name, objectDefinition);
+            }
+            catch (Exception ex)
+            {
+                throw new ObjectDefinitionStoreException(
+                    resourceDescription, name, "Unable to load type [" + typeName + "]", ex);
+            }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ReplacedMethodOverride.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ReplacedMethodOverride.cs
new file mode 100644
index 00000000..771bae93
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/ReplacedMethodOverride.cs
@@ -0,0 +1,160 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using System.Reflection;
+using System.Text;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Represents the replacement of a method on a managed object by the IoC
+	/// container.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Note that this mechanism is <i>not</i> intended as a generic means of
+	/// inserting crosscutting code: use AOP for that.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: ReplacedMethodOverride.cs,v 1.3 2007/03/16 04:01:42 aseovic Exp $</version>
+    [Serializable]
+    public sealed class ReplacedMethodOverride : MethodOverride
+	{
+		private readonly string methodReplacerObjectName;
+		private StringCollection typeIdentifiers = new StringCollection();
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="ReplacedMethodOverride"/> class.
+		/// </summary>
+		/// <param name="methodName">
+		/// The name of the method that is to be overridden.
+		/// </param>
+		/// <param name="methodReplacerObjectName">
+		/// The object name of the <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/>
+		/// instance in the surrounding IoC container. 
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If either of the supplied arguments is <see langword="null"/> or
+		/// contains only whitespace character(s).
+		/// </exception>
+		public ReplacedMethodOverride(string methodName, string methodReplacerObjectName)
+			: base(methodName)
+		{
+			AssertUtils.ArgumentHasText(methodReplacerObjectName, "methodReplacerObjectName");
+			this.methodReplacerObjectName = methodReplacerObjectName;
+		}
+
+		/// <summary>
+		/// Add a fragment of a <see cref="System.Type"/> instance's <see cref="System.Type.FullName"/>
+		/// such as <c>'Exception</c> or <c>System.Excep</c> to identify an argument
+		/// <see cref="System.Type"/> for a dependency injected method.
+		/// </summary>
+		/// <param name="identifier">
+		/// A (sub) string of a <see cref="System.Type"/> instance's <see cref="System.Type.FullName"/>.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="identifier"/> is <see langword="null"/> or
+		/// contains only whitespace character(s).
+		/// </exception>
+		/// <seeaso cref="Spring.Objects.Factory.Support.MethodOverride.Matches(MethodInfo)"/> 
+		public void AddTypeIdentifier(string identifier)
+		{
+			AssertUtils.ArgumentHasText(identifier, "identifier");
+			this.typeIdentifiers.Add(identifier);
+		}
+
+		/// <summary>
+		/// The object name of the <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/>
+		/// instance in the surrounding IoC container. 
+		/// </summary>
+		public string MethodReplacerObjectName
+		{
+			get { return methodReplacerObjectName; }
+		}
+
+		/// <summary>
+		/// Does this <see cref="Spring.Objects.Factory.Support.MethodOverride"/>
+		/// match the supplied <paramref name="method"/>?
+		/// </summary>
+		/// <param name="method">The method to be checked.</param>
+		/// <returns>
+		/// <see lang="true"/> if this override matches the supplied <paramref name="method"/>.
+		/// </returns>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="method"/> is <see langword="null"/>.
+		/// </exception>
+		public override bool Matches(MethodInfo method)
+		{
+			AssertUtils.ArgumentNotNull(method, "method");
+			if (MethodName != method.Name && !(method.Name.EndsWith(MethodName)))
+			{
+				// can't ever match...
+				return false;
+			}
+			if (!IsOverloaded)
+			{
+				// no need to worry about overloading...
+				return true;
+			}
+			// if we get to here, we need to insist on precise argument matching...
+			ParameterInfo[] parameters = method.GetParameters();
+			if (this.typeIdentifiers.Count != parameters.Length)
+			{
+				return false;
+			}
+			for (int i = 0; i < typeIdentifiers.Count; ++i)
+			{
+				string identifier = this.typeIdentifiers[i];
+				ParameterInfo parameter = parameters[i];
+				if (parameter.ParameterType.FullName.IndexOf(identifier) == -1)
+				{
+					// this parameter cannot match, so neither can the whole override...
+					return false;
+				}
+			}
+			return true;
+		}
+
+		/// <summary>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="System.Object"/>.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> that represents the current
+		/// <see cref="System.Object"/>.
+		/// </returns>
+		public override string ToString()
+		{
+			return new StringBuilder(GetType().Name).Append(" for method '")
+				.Append(MethodName).Append("'; will call object '").Append(this.methodReplacerObjectName)
+				.Append("'.").ToString();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/RootObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Support/RootObjectDefinition.cs
new file mode 100644
index 00000000..1eec0f07
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/RootObjectDefinition.cs
@@ -0,0 +1,293 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// A plain-vanilla object definition.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This is the most common type of object definition;
+    /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> instances
+    /// do not derive from a parent
+    /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>, and usually
+    /// (but not always - see below) have an
+    /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.ObjectType"/>
+    /// and (optionally) some
+    /// <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/> and
+    /// <see cref="Spring.Objects.IPropertyValues"/>.
+    /// </p>
+    /// <p>
+    /// Note that <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+    /// instances do not have to specify an
+    /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.ObjectType"/> :
+    /// This can be useful for deriving
+    /// <see cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/> instances
+    /// from such definitions, each with it's own
+    /// <see cref="Spring.Objects.Factory.Support.AbstractObjectDefinition.ObjectType"/>,
+    /// inheriting common property values and other settings from the parent.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: RootObjectDefinition.cs,v 1.20 2007/03/16 04:01:43 aseovic Exp $</version>
+    /// <seealso cref="Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+    [Serializable]
+    public class RootObjectDefinition : AbstractObjectDefinition
+    {
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> class.
+        /// </summary>
+        public RootObjectDefinition()
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+        /// class.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> of the object to instantiate.
+        /// </param>
+        public RootObjectDefinition(Type type)
+        {
+            ObjectType = type;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+        /// class.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> of the object to instantiate.
+        /// </param>
+        /// <param name="singleton">
+        /// <see langword="true"/> if this object definition defines a singleton object.
+        /// </param>
+        public RootObjectDefinition(Type type, bool singleton)
+        {
+            ObjectType = type;
+            IsSingleton = singleton;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+        /// for a singleton, providing property values and constructor arguments.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> of the object to instantiate.
+        /// </param>
+        /// <param name="arguments">
+        /// The <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+        /// to be applied to a new instance of the object.
+        /// </param>
+        /// <param name="properties">
+        /// The <see cref="Spring.Objects.MutablePropertyValues"/> to be applied to
+        /// a new instance of the object.
+        /// </param>
+        public RootObjectDefinition(
+            Type type, ConstructorArgumentValues arguments, MutablePropertyValues properties)
+            : base(arguments, properties)
+        {
+            ObjectType = type;
+        }
+
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+        /// for a singleton using the supplied
+        /// <see cref="Spring.Objects.Factory.Config.AutoWiringMode"/>.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> of the object to instantiate.
+        /// </param>
+        /// <param name="autowireMode">
+        /// The autowiring mode.
+        /// </param>
+        public RootObjectDefinition(Type type, AutoWiringMode autowireMode)
+        {
+            ObjectType = type;
+            AutowireMode = autowireMode;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+        /// for a singleton using the supplied
+        /// <see cref="Spring.Objects.Factory.Config.AutoWiringMode"/>.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> of the object to instantiate.
+        /// </param>
+        /// <param name="autowireMode">
+        /// The autowiring mode.
+        /// </param>
+        /// <param name="dependencyCheck">
+        /// Whether to perform a dependency check for objects (not
+        /// applicable to autowiring a constructor, thus ignored there)
+        /// </param>
+        public RootObjectDefinition(
+            Type type, AutoWiringMode autowireMode, bool dependencyCheck)
+        {
+            ObjectType = type;
+            AutowireMode = autowireMode;
+            if (dependencyCheck
+                && ResolvedAutowireMode != AutoWiringMode.Constructor)
+            {
+                DependencyCheck = DependencyCheckingMode.Objects;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+        /// with the given singleton status, providing property values.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> of the object to instantiate.
+        /// </param>
+        /// <param name="properties">
+        /// The <see cref="Spring.Objects.MutablePropertyValues"/> to be applied to
+        /// a new instance of the object.
+        /// </param>
+        public RootObjectDefinition(
+            Type type, MutablePropertyValues properties) : base(null, properties)
+        {
+            ObjectType = type;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+        /// with the given singleton status, providing property values.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> of the object to instantiate.
+        /// </param>
+        /// <param name="properties">
+        /// The <see cref="Spring.Objects.MutablePropertyValues"/> to be applied to
+        /// a new instance of the object.
+        /// </param>
+        /// <param name="singleton">
+        /// <see langword="true"/> if this object definition defines a singleton object.
+        /// </param>
+        public RootObjectDefinition(
+            Type type, MutablePropertyValues properties, bool singleton) : base(null, properties)
+        {
+            ObjectType = type;
+            IsSingleton = singleton;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+        /// for a singleton, providing property values and constructor arguments.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Takes an object class name to avoid eager loading of the object class.
+        /// </p>
+        /// </remarks>
+        /// <param name="typeName">
+        /// The assembly qualified <see cref="System.Type.FullName"/> of the object to instantiate.
+        /// </param>
+        /// <param name="properties">
+        /// The <see cref="Spring.Objects.MutablePropertyValues"/> to be applied to
+        /// a new instance of the object.
+        /// </param>
+        /// <param name="arguments">
+        /// The <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+        /// to be applied to a new instance of the object.
+        /// </param>
+        public RootObjectDefinition(
+            string typeName, ConstructorArgumentValues arguments, MutablePropertyValues properties)
+            : base(arguments, properties)
+        {
+            ObjectTypeName = typeName;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Deep copy constructor.
+        /// </p>
+        /// </remarks>
+        /// <param name="other">
+        /// The definition that is to be copied.
+        /// </param>
+        public RootObjectDefinition(IObjectDefinition other) : base(other)
+        {}
+
+        #endregion
+
+        /// <summary>
+        /// Validate this object definition.
+        /// </summary>
+        /// <exception cref="Spring.Objects.Factory.Support.ObjectDefinitionValidationException">
+        /// In the case of a validation failure.
+        /// </exception>
+        public override void Validate()
+        {
+            base.Validate();
+            if (HasObjectType)
+            {
+                if (typeof(IFactoryObject).IsAssignableFrom(ObjectType)
+                    && !IsSingleton)
+                {
+                    throw new ObjectDefinitionValidationException(
+                        "IFactoryObject must be defined as a singleton - " +
+                            "IFactoryObjects themselves are not allowed to be prototypes.");
+                }
+            }
+        }
+
+        /// <summary>
+        /// A <see cref="System.String"/> that represents the current
+        /// <see cref="System.Object"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents the current
+        /// <see cref="System.Object"/>.
+        /// </returns>
+        public override string ToString()
+        {
+            return String.Format("{0} : {1}", GetType().Name, base.ToString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs b/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs
new file mode 100644
index 00000000..24546a17
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs
@@ -0,0 +1,308 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Reflection;
+
+using Common.Logging;
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Simple object instantiation strategy for use in
+	/// <see cref="Spring.Objects.Factory.IObjectFactory"/> implementations.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Does not support method injection, although it provides hooks for subclasses
+	/// to override to add method injection support, for example by overriding methods.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: SimpleInstantiationStrategy.cs,v 1.18 2008/04/07 00:30:34 bbaia Exp $</version>
+	/// <seealso cref="Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy"/> 
+    [Serializable]
+    public class SimpleInstantiationStrategy : IInstantiationStrategy
+	{
+		/// <summary>
+		/// The shared <see cref="Common.Logging.ILog"/> instance for this class (and derived classes).
+		/// </summary>
+		protected static readonly ILog log =
+			LogManager.GetLogger(typeof (SimpleInstantiationStrategy));
+
+		/// <summary>
+		/// Instantiate an instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </summary>
+		/// <param name="definition">
+		/// The definition of the object that is to be instantiated.
+		/// </param>
+		/// <param name="name">
+		/// The name associated with the object definition. The name can be the null
+		/// or zero length string if we're autowiring an object that doesn't belong
+		/// to the supplied <paramref name="factory"/>.
+		/// </param>
+		/// <param name="factory">
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// </param>
+		/// <returns>
+		/// An instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </returns>
+		public virtual object Instantiate(
+			RootObjectDefinition definition, string name, IObjectFactory factory)
+		{
+			AssertUtils.ArgumentNotNull(definition, "definition");
+			AssertUtils.ArgumentNotNull(factory, "factory");
+			if (definition.HasMethodOverrides)
+			{
+				return InstantiateWithMethodInjection(definition, name, factory);
+			}
+			else
+			{
+                Type objectType = definition.HasObjectType 
+                    ? definition.ObjectType 
+                    : TypeResolutionUtils.ResolveType(definition.ObjectTypeName);
+                ConstructorInfo constructor = GetZeroArgConstructorInfo(objectType);
+                return ObjectUtils.InstantiateType(constructor, ObjectUtils.EmptyObjects);
+			}
+		}
+
+        /// <summary>
+        /// Gets the zero arg ConstructorInfo object, if the type offers such functionality.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <returns>Zero argument ConstructorInfo</returns>
+        /// <exception cref="FatalReflectionException">
+        /// If the type does not have a zero-arg constructor.
+        /// </exception>
+        private ConstructorInfo GetZeroArgConstructorInfo(Type type)
+        {
+            const BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic |
+                BindingFlags.Instance | BindingFlags.DeclaredOnly;
+
+            ConstructorInfo constructor = type.GetConstructor(flags, null, Type.EmptyTypes, null);
+            if (constructor == null)
+            {
+                throw new FatalReflectionException(string.Format(
+                    CultureInfo.InvariantCulture, "Cannot instantiate a class that does not have a no-argument constructor [{0}].", type));
+            }
+            return constructor;
+        }
+
+		/// <summary>
+		/// Instantiate an instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </summary>
+		/// <param name="definition">
+		/// The definition of the object that is to be instantiated.
+		/// </param>
+		/// <param name="name">
+		/// The name associated with the object definition. The name can be the null
+		/// or zero length string if we're autowiring an object that doesn't belong
+		/// to the supplied <paramref name="factory"/>.
+		/// </param>
+		/// <param name="factory">
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// </param>
+		/// <param name="constructor">
+		/// The <see cref="System.Reflection.ConstructorInfo"/> to be used to instantiate
+		/// the object.
+		/// </param>
+		/// <param name="arguments">
+		/// Any arguments to the supplied <paramref name="constructor"/>. May be null.
+		/// </param>
+		/// <returns>
+		/// An instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </returns>
+		public virtual object Instantiate(
+			RootObjectDefinition definition, string name, IObjectFactory factory,
+			ConstructorInfo constructor, object[] arguments)
+		{
+			if (definition.HasMethodOverrides)
+			{
+				return InstantiateWithMethodInjection(definition, name, factory, constructor, arguments);
+			}
+			else
+			{
+				return ObjectUtils.InstantiateType(constructor, arguments);
+			}
+		}
+
+		/// <summary>
+		/// Instantiate an instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </summary>
+		/// <param name="definition">
+		/// The definition of the object that is to be instantiated.
+		/// </param>
+		/// <param name="name">
+		/// The name associated with the object definition. The name can be the null
+		/// or zero length string if we're autowiring an object that doesn't belong
+		/// to the supplied <paramref name="factory"/>.
+		/// </param>
+		/// <param name="factory">
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// </param>
+		/// <param name="factoryMethod">
+		/// The <see cref="System.Reflection.MethodInfo"/> to be used to get the object.
+		/// </param>
+		/// <param name="arguments">
+		/// Any arguments to the supplied <paramref name="factoryMethod"/>. May be null.
+		/// </param>
+		/// <returns>
+		/// An instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </returns>
+		public virtual object Instantiate(
+			RootObjectDefinition definition, string name, IObjectFactory factory,
+			MethodInfo factoryMethod, object[] arguments)
+		{
+			object instance = null;
+			object target = null;
+			if (StringUtils.HasText(definition.FactoryObjectName))
+			{
+				target = factory[definition.FactoryObjectName];
+			}
+			try
+			{
+				// the target will be null if using a static factory method
+				instance = factoryMethod.Invoke(target, arguments);
+			}
+			catch (TargetInvocationException ex)
+			{
+				string msg = string.Format(
+					CultureInfo.InvariantCulture,
+					"Factory method '{0}' threw an Exception.", factoryMethod);
+
+				#region Instrumentation
+
+				if (log.IsWarnEnabled)
+				{
+					log.Warn(msg, ex.InnerException);
+				}
+
+				#endregion
+
+				throw new ObjectDefinitionStoreException(msg, ex.InnerException);
+			}
+			catch (Exception ex)
+			{
+				throw new ObjectDefinitionStoreException(string.Format(
+					CultureInfo.InvariantCulture,
+					"Factory method '{0}' threw an Exception.", factoryMethod), ex);
+			}
+			return instance;
+		}
+
+		/// <summary>
+		/// Instantiate an instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>,
+		/// injecting methods as appropriate.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The default implementation of this method is to throw a
+        /// <see cref="System.InvalidOperationException"/>.
+		/// </p>
+		/// <p>
+		/// Derived classes can override this method if they can instantiate an object
+		/// with the Method Injection specified in the supplied
+		/// <paramref name="definition"/>. Instantiation should use a no-arg constructor.
+		/// </p>
+		/// </remarks>
+		/// <param name="definition">
+		/// The definition of the object that is to be instantiated.
+		/// </param>
+		/// <param name="objectName">
+		/// The name associated with the object definition. The name can be a
+		/// <see lang="null"/> or zero length string if we're autowiring an object that
+		/// doesn't belong to the supplied <paramref name="factory"/>.
+		/// </param>
+		/// <param name="factory">
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// </param>
+		/// <returns>
+		/// An instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </returns>
+		protected virtual object InstantiateWithMethodInjection(
+			RootObjectDefinition definition, string objectName, IObjectFactory factory)
+		{
+            throw new InvalidOperationException("Method Injection not supported in SimpleInstantiationStrategy");
+		}
+
+		/// <summary>
+		/// Instantiate an instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>,
+		/// injecting methods as appropriate.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The default implementation of this method is to throw a
+        /// <see cref="System.InvalidOperationException"/>.
+		/// </p>
+		/// <p>
+		/// Derived classes can override this method if they can instantiate an object
+		/// with the Method Injection specified in the supplied
+		/// <paramref name="definition"/>. Instantiation should use the supplied
+		/// <paramref name="constructor"/> and attendant <paramref name="arguments"/>.
+		/// </p>
+		/// </remarks>
+		/// <param name="definition">
+		/// The definition of the object that is to be instantiated.
+		/// </param>
+		/// <param name="objectName">
+		/// The name associated with the object definition. The name can be the null
+		/// or zero length string if we're autowiring an object that doesn't belong
+		/// to the supplied <paramref name="factory"/>.
+		/// </param>
+		/// <param name="factory">
+		/// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+		/// </param>
+		/// <param name="constructor">
+		/// The <see cref="System.Reflection.ConstructorInfo"/> to be used to instantiate
+		/// the object.
+		/// </param>
+		/// <param name="arguments">
+		/// Any arguments to the supplied <paramref name="constructor"/>. May be null.
+		/// </param>
+		/// <returns>
+		/// An instance of the object described by the supplied
+		/// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+		/// </returns>
+		protected virtual object InstantiateWithMethodInjection(
+			RootObjectDefinition definition, string objectName, IObjectFactory factory,
+			ConstructorInfo constructor, object[] arguments)
+		{
+		    throw new InvalidOperationException("Method Injection not supported in SimpleInstantiationStrategy");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/StaticListableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/StaticListableObjectFactory.cs
new file mode 100644
index 00000000..dae2bfad
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/StaticListableObjectFactory.cs
@@ -0,0 +1,692 @@
+#region License
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Static factory that permits the registration of existing singleton instances.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Does not have support for prototype objects, aliases, and post startup object
+	/// configuration.
+	/// </p>
+	/// <p>
+	/// Serves as a simple example implementation of the <see cref="IListableObjectFactory"/>
+	/// interface, that manages existing object instances as opposed to creating new ones
+	/// based on object definitions.
+	/// </p>
+	/// <p>
+	/// The <see cref="Spring.Objects.Factory.Support.StaticListableObjectFactory.ConfigureObject(object, string)"/>
+	/// method is not supported by this class; this class deals exclusively with
+	/// existing singleton instances, thus the methods mentioned previously make little sense in this context.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: StaticListableObjectFactory.cs,v 1.24 2007/12/05 00:28:05 bbaia Exp $</version>
+    [Serializable]
+    public class StaticListableObjectFactory : IListableObjectFactory
+	{
+	    /// <summary>
+	    /// Map from object name to object instance.
+	    /// </summary>
+	    private Hashtable objects = new Hashtable();
+
+	    /// <summary>
+	    /// Return the number of objects defined in the factory.
+	    /// </summary>
+	    /// <value>
+	    /// The number of objects defined in the factory.
+	    /// </value>
+	    public int ObjectDefinitionCount
+	    {
+	        get { return objects.Count; }
+	    }
+
+	    /// <summary>
+	    /// Return an instance of the given object name.
+	    /// </summary>
+	    /// <param name="name">The name of the object to return.</param>
+	    /// <returns>The instance of the object.</returns>
+	    /// <seealso cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>
+	    public object this[string name]
+	    {
+	        get { return GetObject(name); }
+	    }
+
+	    /// <summary>
+	    /// Return an instance of the given object name.
+	    /// </summary>
+	    /// <param name="name">The name of the object to return.</param>
+	    /// <returns>The instance of the object.</returns>
+        /// <exception cref="System.NotSupportedException">
+        /// <see cref="Spring.Objects.Factory.Config.IConfigurableFactoryObject"/> is not currently supported.
+        /// </exception>
+	    /// <seealso cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>
+	    public object GetObject(string name)
+	    {
+	        object instance = objects[name];
+	        if (instance is IFactoryObject)
+	        {
+                if (instance is IConfigurableFactoryObject)
+                {
+                    throw new NotSupportedException();
+                }
+	            try
+	            {
+	                return ((IFactoryObject) instance).GetObject();
+	            }
+	            catch (Exception ex)
+	            {
+	                throw new ObjectCreationException(name, 
+	                    "IFactoryObject threw an exception on object creation", ex);
+	            }
+	        }
+	        if (instance == null)
+	        {
+	            throw new NoSuchObjectDefinitionException(name, GrabDefinedObjectsString());
+	        }
+	        return instance;
+	    }
+
+	    /// <summary>
+	    /// Return an instance (possibly shared or independent) of the given object name.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// This method allows an object factory to be used as a replacement for the
+	    /// Singleton or Prototype design pattern.
+	    /// </p>
+	    /// <p>
+	    /// Note that callers should retain references to returned objects. There is no
+	    /// guarantee that this method will be implemented to be efficient. For example,
+	    /// it may be synchronized, or may need to run an RDBMS query.
+	    /// </p>
+	    /// <p>
+	    /// Will ask the parent factory if the object cannot be found in this factory
+	    /// instance.
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="name">The name of the object to return.</param>
+	    /// <param name="arguments">
+	    /// The arguments to use if creating a prototype using explicit arguments to
+	    /// a static factory method. If there is no factory method and the
+	    /// arguments are not null, then match the argument values by type and
+	    /// call the object's constructor.
+	    /// </param>
+	    /// <returns>The instance of the object.</returns>
+	    /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+	    /// If there's no such object definition.
+	    /// </exception>
+	    /// <exception cref="Spring.Objects.ObjectsException">
+	    /// If the object could not be created.
+	    /// </exception>
+	    /// <exception cref="System.ArgumentNullException">
+	    /// If the supplied <paramref name="name"/> is <see langword="null"/>.
+	    /// </exception>
+	    public object GetObject(string name, object[] arguments)
+	    {
+	         throw new NotSupportedException("StaticListableObjectFactory does not support this method.");
+	    }
+
+	    /// <summary>
+	    /// Return an instance (possibly shared or independent) of the given object name.
+	    /// </summary>
+	    /// <param name="name">The name of the object to return.</param>
+	    /// <param name="requiredType">
+	    /// The <see cref="System.Type"/> the object may match. Can be an interface or
+	    /// superclass of the actual class. For example, if the value is the
+	    /// <see cref="System.Object"/> class, this method will succeed whatever the
+	    /// class of the returned instance.
+	    /// </param>
+	    /// <param name="arguments">
+	    /// The arguments to use if creating a prototype using explicit arguments to
+	    /// a <see lang="static"/> factory method. If there is no factory method and the
+	    /// supplied <paramref name="arguments"/> array is not <see lang="null"/>, then
+	    /// match the argument values by type and call the object's constructor.
+	    /// </param>
+	    /// <returns>The instance of the object.</returns>
+	    /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+	    /// If there's no such object definition.
+	    /// </exception>
+	    /// <exception cref="Spring.Objects.ObjectsException">
+	    /// If the object could not be created.
+	    /// </exception>
+	    /// <exception cref="Spring.Objects.Factory.ObjectNotOfRequiredTypeException">
+	    /// If the object is not of the required type.
+	    /// </exception>
+	    /// <exception cref="System.ArgumentNullException">
+	    /// If the supplied <paramref name="name"/> is <see langword="null"/>.
+	    /// </exception>
+	    /// <seealso cref="Spring.Objects.Factory.IObjectFactory.GetObject(string, Type)"/>
+	    public object GetObject(string name, Type requiredType, object[] arguments)
+	    {
+	         throw new NotSupportedException("StaticListableObjectFactory does not support this method.");
+	    }
+
+	    /// <summary>
+	    /// Return an instance of the given object name.
+	    /// </summary>
+	    /// <param name="name">The name of the object to return.</param>
+	    /// <param name="requiredType">
+	    /// <see cref="System.Type"/> the object may match. Can be an interface or
+	    /// superclass of the actual class. For example, if the value is the
+	    /// <see cref="System.Object"/> class, this method will succeed whatever the
+	    /// class of the returned instance.
+	    /// </param>
+	    /// <returns>The instance of the object.</returns>
+	    /// <seealso cref="Spring.Objects.Factory.IObjectFactory.GetObject(string, System.Type)"/>
+	    public object GetObject(string name, Type requiredType)
+	    {
+	        object instance = GetObject(name);
+	        if (!requiredType.IsAssignableFrom(instance.GetType()))
+	        {
+	            throw new ObjectNotOfRequiredTypeException(name, requiredType, instance);
+	        }
+	        return instance;
+	    }
+
+	    /// <summary>
+	    /// Does this object factory contain an object with the given name?
+	    /// </summary>
+	    /// <param name="name">The name of the object to query.</param>
+	    /// <returns>True if an object with the given name is defined.</returns>
+	    public bool ContainsObject(string name)
+	    {
+	        return objects.ContainsKey(name);
+	    }
+
+	    /// <summary>
+	    /// Is this object a singleton?
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// That is, will <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>
+        /// or <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string, Type)"/>
+	    /// always return the same object?
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="name">The name of the object to query.</param>
+	    /// <returns>True if the named object is a singleton.</returns>
+	    /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+	    /// If there's no such object definition.
+	    /// </exception>
+	    public bool IsSingleton(string name)
+	    {
+	        bool isSingleton = true;
+	        object instance = GetObject(name);
+	        // in case of IFactoryObject, return singleton status of created object
+	        if (instance is IFactoryObject)
+	        {
+	            isSingleton = ((IFactoryObject) instance).IsSingleton;
+	        }
+	        return isSingleton;
+	    }
+
+
+	    /// <summary>
+	    /// Determines whether the specified object name is prototype.  That is, will GetObject
+	    /// always return independent instances?
+	    /// </summary>
+	    /// <remarks>This method returning false does not clearly indicate a singleton object.
+	    /// It indicated non-independent instances, which may correspond to a scoped object as 
+	    /// well.  use the IsSingleton property to explicitly check for a shared 
+	    /// singleton instance.
+	    /// <para>Translates aliases back to the corresponding canonical object name.  Will ask the
+	    /// parent factory if the object can not be found in this factory instance.
+	    /// </para>
+	    /// </remarks>
+	    /// 
+	    /// <param name="name">The name of the object to query</param>
+	    /// <returns>
+	    /// 	<c>true</c> if the specified object name will always deliver independent instances; otherwise, <c>false</c>.
+	    /// </returns>
+	    /// <exception cref="NoSuchObjectDefinitionException">if there is no object with the given name.</exception>
+	    public bool IsPrototype(string name)
+	    {
+	        bool isPrototype = true;
+	        object instance = GetObject(name);
+            if (instance is IFactoryObject)
+            {
+                isPrototype = !((IFactoryObject) instance).IsSingleton;
+            }
+	        return isPrototype;
+
+	    }
+
+	    /// <summary>
+	    /// Determine the type of the object with the given name.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// More specifically, checks the type of object that
+	    /// <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/> would return.
+	    /// For an <see cref="Spring.Objects.Factory.IFactoryObject"/>, returns the type
+	    /// of object that the <see cref="Spring.Objects.Factory.IFactoryObject"/> creates.
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="name">The name of the object to query.</param>
+	    /// <returns>
+	    /// The <see cref="System.Type"/> of the object or <see langword="null"/> if
+	    /// not determinable.
+	    /// </returns>
+	    public Type GetType(string name)
+	    {
+	        string objectName = ObjectFactoryUtils.TransformedObjectName(name);
+	        object instance = objects[objectName];
+	        if (instance == null)
+	        {
+	            throw new NoSuchObjectDefinitionException(name, GrabDefinedObjectsString());
+	        }
+	        if (instance is IFactoryObject && !ObjectFactoryUtils.IsFactoryDereference(name))
+	        {
+	            return ((IFactoryObject) instance).ObjectType;
+	        }
+	        return instance.GetType();
+	    }
+
+
+	    /// <summary>
+	    /// Determines whether the object with the given name matches the specified type.
+	    /// </summary>
+	    /// <param name="name">The name of the object to query.</param>
+	    /// <param name="targetType">Type of the target to match against.</param>
+	    /// <returns>
+	    /// 	<c>true</c> if the object type matches; otherwise, <c>false</c>
+	    /// if it doesn't match or cannot be determined yet.
+	    /// </returns>
+	    /// <exception cref="NoSuchObjectDefinitionException">Ff there is no object with the given name
+	    /// </exception>
+	    public bool IsTypeMatch(string name, Type targetType)
+	    {
+	        Type type = GetType(name);            
+            return (targetType == null || (type != null && targetType.IsAssignableFrom(type)));
+	    }
+
+	    private string GrabDefinedObjectsString()
+	    {
+	        return "Defined objects are [" +
+	               StringUtils.CollectionToDelimitedString(objects.Keys, ",") + "]";
+	    }
+
+	    /// <summary>
+	    /// Return the aliases for the given object name, if defined.
+	    /// </summary>
+	    /// <param name="name">The object name to check for aliases.</param>
+	    /// <returns>The aliases, or an empty array if none.</returns>
+	    /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+	    /// If there's no such object definition.
+	    /// </exception>
+	    public string[] GetAliases(string name)
+	    {
+	        return StringUtils.EmptyStrings;
+	    }
+
+        /// <summary>
+        /// Not supported.
+        /// </summary>
+        /// <param name="name">The name of the object.</param>
+        /// <returns>
+        /// The registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>.
+        /// </returns>
+        /// <exception cref="T:System.NotSupportedException">
+        /// Always, as object definitions are not supported by this <see cref="IObjectFactory"/>
+        /// implementation.
+        /// </exception>
+        public IObjectDefinition GetObjectDefinition(string name)
+        {
+            throw new NotSupportedException("StaticListableObjectFactory does not contain object definitions.");
+        }
+
+        /// <summary>
+        /// Return the registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+        /// given object, allowing access to its property values and constructor
+        /// argument values.
+        /// </summary>
+        /// <param name="name">The name of the object.</param>
+        /// <param name="includeAncestors">Whether to search parent object factories.</param>
+        /// <returns>
+        /// The registered
+        /// <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>.
+        /// </returns>
+        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
+        /// If there is no object with the given name.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of errors.
+        /// </exception>
+        public IObjectDefinition GetObjectDefinition(string name, bool includeAncestors)
+        {
+            throw new NotSupportedException("StaticListableObjectFactory does not contain object definitions.");
+        }
+
+
+        /// <summary>
+	    /// Return the names of all objects defined in this factory.
+	    /// </summary>
+	    /// <returns>
+	    /// The names of all objects defined in this factory, or an empty array if none
+	    /// are defined.
+	    /// </returns>
+	    public string[] GetObjectDefinitionNames()
+	    {
+	        ArrayList names = new ArrayList(objects.Keys);
+	        return (string[]) names.ToArray(typeof (string));
+	    }
+
+	    /// <summary>
+	    /// Return the names of objects matching the given <see cref="System.Type"/>
+	    /// (including subclasses), judging from the object definitions.
+	    /// </summary>
+	    /// <param name="type">
+	    /// The <see cref="System.Type"/> (class or interface) to match, or
+	    /// <see langword="null"/> for all object names.
+	    /// </param>
+	    /// <remarks>
+	    /// <p>
+	    /// Will not consider <see cref="Spring.Objects.Factory.IFactoryObject"/>s,
+	    /// as the type of their created objects is not known before instantiation.
+	    /// </p>
+	    /// </remarks>
+	    /// <returns>
+	    /// The names of all objects defined in this factory, or an empty array if none
+	    /// are defined.
+	    /// </returns>
+	    public string[] GetObjectDefinitionNames(Type type)
+	    {
+	        ArrayList matches = new ArrayList();
+	        foreach (string name in objects.Keys)
+	        {
+	            Type t = objects[name].GetType();
+	            if (type.IsAssignableFrom(t))
+	            {
+	                matches.Add(name);
+	            }
+	        }
+	        return (string[]) matches.ToArray(typeof (string));
+	    }
+
+	    /// <summary>
+	    /// Return the names of objects matching the given <see cref="System.Type"/>
+	    /// (including subclasses), judging from the object definitions.
+	    /// </summary>
+	    /// <param name="type">
+	    /// The <see cref="System.Type"/> (class or interface) to match, or
+	    /// <see langword="null"/> for all object names.
+	    /// </param>
+	    /// <remarks>
+	    /// <p>
+	    /// Does consider objects created by <see cref="Spring.Objects.Factory.IFactoryObject"/>s,
+	    /// or rather it considers the type of objects created by
+	    /// <see cref="Spring.Objects.Factory.IFactoryObject"/> (which means that
+	    /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s will be instantiated).
+	    /// </p>
+	    /// <p>
+	    /// Does not consider any hierarchy this factory may participate in.
+	    /// </p>
+	    /// </remarks>
+	    /// <returns>
+	    /// The names of all objects defined in this factory, or an empty array if none
+	    /// are defined.
+	    /// </returns>
+	    public string[] GetObjectNamesForType(Type type) 
+	    {
+	        return GetObjectNamesForType(type, true, true);
+	    }
+
+	    /// <summary>
+	    /// Return the names of objects matching the given <see cref="System.Type"/>
+	    /// (including subclasses), judging from the object definitions.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// Since this implementation of the
+	    /// <see cref="Spring.Objects.Factory.IListableObjectFactory"/>
+	    /// interface does not support the notion of ptototype objects, the
+	    /// <paramref name="includePrototypes"/> parameter is ignored.
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="type">
+	    /// The <see cref="System.Type"/> (class or interface) to match, or <see langword="null"/>
+	    /// for all object names.
+	    /// </param>
+	    /// <param name="includePrototypes">
+	    /// Whether to include prototype objects too or just singletons (also applies to
+	    /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s). Ignored.
+	    /// </param>
+	    /// <param name="includeFactoryObjects">
+	    /// Whether to include <see cref="Spring.Objects.Factory.IFactoryObject"/>s too
+	    /// or just normal objects.
+	    /// </param>
+	    /// <returns>
+	    /// The names of all objects defined in this factory, or an empty array if none
+	    /// are defined.
+	    /// </returns>
+	    /// <seealso cref="Spring.Objects.Factory.IListableObjectFactory.GetObjectNamesForType(Type, bool, bool)"/>
+	    public string[] GetObjectNamesForType(
+	        Type type, bool includePrototypes, bool includeFactoryObjects)
+	    {
+	        bool isFactoryType = (type != null && typeof(IFactoryObject).IsAssignableFrom(type));
+	        IList matches = new ArrayList();
+	        foreach (string name in objects.Keys) 
+	        {
+	            object instance = objects[name];
+	            if (instance is IFactoryObject && !isFactoryType) 
+	            {
+	                if(includeFactoryObjects) 
+	                {
+	                    Type objectType = ((IFactoryObject) instance).ObjectType;
+	                    if (objectType != null && type.IsAssignableFrom(objectType)) 
+	                    {
+	                        matches.Add(name);
+	                    }
+	                }
+	            }
+	            else 
+	            {
+	                if (type.IsInstanceOfType(instance)) 
+	                {
+	                    matches.Add(name);
+	                }
+	            }
+	        }
+	        return (string[]) ArrayList.Adapter(matches).ToArray(typeof(string));
+	    }
+
+	    /// <summary>
+	    /// Tests whether this object factory contains an object definition for the
+	    /// specified object name.
+	    /// </summary>
+	    /// <param name="name">The object name to query.</param>
+	    /// <returns>
+	    /// <b>True</b> if an object defintion is contained within this object factory.
+	    /// </returns>
+	    public bool ContainsObjectDefinition(string name)
+	    {
+	        return objects.ContainsKey(name);
+	    }
+
+	    /// <summary>
+	    /// Return the object instances that match the given object
+	    /// <see cref="System.Type"/> (including subclasses), judging from either object
+	    /// definitions or the value of
+	    /// <see cref="Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+	    /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// This version of the <see cref="IListableObjectFactory.GetObjectsOfType(Type,bool,bool)"/>
+	    /// method matches all kinds of object definitions, be they singletons, prototypes, or
+	    /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s. Typically, the results
+	    /// of this method call will be the same as a call to
+	    /// <code>IListableObjectFactory.GetObjectsOfType(type,true,true)</code> .
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="type">
+	    /// The <see cref="System.Type"/> (class or interface) to match.
+	    /// </param>
+	    /// <returns>
+	    /// A <see cref="System.Collections.IDictionary"/> of the matching objects,
+	    /// containing the object names as keys and the corresponding object instances
+	    /// as values.
+	    /// </returns>
+	    /// <exception cref="Spring.Objects.ObjectsException">
+	    /// If the objects could not be created.
+	    /// </exception>
+	    public IDictionary GetObjectsOfType(Type type)
+	    {
+	        return GetObjectsOfType(type, true, true);
+	    }
+
+	    /// <summary>
+	    /// Return the object instances that match the given object
+	    /// <see cref="System.Type"/> (including subclasses), judging from either object
+	    /// definitions or the value of
+	    /// <see cref="Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+	    /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s.
+	    /// </summary>
+	    /// <param name="type">
+	    /// The <see cref="System.Type"/> (class or interface) to match.
+	    /// </param>
+	    /// <param name="includePrototypes">
+	    /// Whether to include prototype objects too or just singletons (also applies to
+	    /// <see cref="Spring.Objects.Factory.IFactoryObject"/>s).
+	    /// </param>
+	    /// <param name="includeFactoryObjects">
+	    /// Whether to include <see cref="Spring.Objects.Factory.IFactoryObject"/>s too
+	    /// or just normal objects.
+	    /// </param>
+	    /// <returns>
+	    /// A <see cref="System.Collections.IDictionary"/> of the matching objects,
+	    /// containing the object names as keys and the corresponding object instances
+	    /// as values.
+	    /// </returns>
+	    /// <exception cref="Spring.Objects.ObjectsException">
+	    /// If the objects could not be created.
+	    /// </exception>
+	    public IDictionary GetObjectsOfType(Type type, bool includePrototypes, bool includeFactoryObjects)
+	    {
+	        bool isFactoryType = (type != null && typeof(IFactoryObject).IsAssignableFrom(type));
+	        IDictionary matches = new Hashtable();
+	        foreach (string name in objects.Keys)
+	        {
+	            object instance = objects[name];
+	            if (instance is IFactoryObject && includeFactoryObjects)
+	            {
+	                IFactoryObject factory = (IFactoryObject) instance;
+	                Type objectType = factory.ObjectType;
+	                if ((objectType == null && factory.IsSingleton) ||
+	                    ((factory.IsSingleton || includePrototypes) &&
+	                     objectType != null && type.IsAssignableFrom(objectType)))
+	                {
+	                    object createdObject = GetObject(name);
+	                    if (type.IsInstanceOfType(createdObject))
+	                    {
+	                        matches[name] = createdObject;
+	                    }
+	                }
+	            }
+	            else if (type.IsAssignableFrom(instance.GetType()))
+	            {
+	                if (isFactoryType) 
+	                {
+	                    matches[ObjectFactoryUtils.BuildFactoryObjectName(name)] = instance;
+	                }
+	                else 
+	                {
+	                    matches[name] = instance;
+	                }
+	            }
+	        }
+	        return matches;
+	    }
+
+	    /// <summary>
+	    /// Add a new singleton object.
+	    /// </summary>
+	    /// <param name="name">
+	    /// The name to be associated with the object name.
+	    /// </param>
+	    /// <param name="instance">The singleton object.</param>
+	    public void AddObject(string name, object instance)
+	    {
+	        objects[name] = instance;
+	    }
+
+	    /// <summary>
+	    /// Injects dependencies into the supplied <paramref name="target"/> instance
+	    /// using the named object definition.
+	    /// </summary>
+	    /// <param name="target">
+	    /// The object instance that is to be so configured.
+	    /// </param>
+	    /// <param name="name">
+	    /// The name of the object definition expressing the dependencies that are to
+	    /// be injected into the supplied <parameref name="target"/> instance.
+        /// </param>
+        /// <exception cref="System.NotSupportedException">
+        /// This feature is not currently supported.
+        /// </exception>
+	    /// <seealso cref="Spring.Objects.Factory.IObjectFactory.ConfigureObject(object, string)"/>
+	    public object ConfigureObject(object target, string name)
+	    {
+	        throw new NotSupportedException();
+	    }
+
+        /// <summary>
+        /// Injects dependencies into the supplied <paramref name="target"/> instance
+        /// using the supplied <paramref name="definition"/>.
+        /// </summary>
+        /// <param name="target">
+        /// The object instance that is to be so configured.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object definition expressing the dependencies that are to
+        /// be injected into the supplied <parameref name="target"/> instance.
+        /// </param>
+        /// <param name="definition">
+        /// An object definition that should be used to configure object.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.ConfigureObject(object, string)"/>
+        public object ConfigureObject(object target, string name, IObjectDefinition definition)
+        {
+            throw new NotSupportedException();
+        }
+
+	    /// <summary>
+	    /// Defines a method to release allocated unmanaged resources.
+	    /// </summary>
+	    public virtual void Dispose()
+	    {
+	    }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/UnsatisfiedDependencyException.cs b/src/Spring/Spring.Core/Objects/Factory/UnsatisfiedDependencyException.cs
new file mode 100644
index 00000000..a32dcd70
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/UnsatisfiedDependencyException.cs
@@ -0,0 +1,160 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Exception thrown when an object depends on other objects or simple properties
+	/// that were not specified in the object factory definition, although dependency
+	/// checking was enabled.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: UnsatisfiedDependencyException.cs,v 1.8 2006/04/09 07:18:49 markpollack Exp $</version>
+	[Serializable]
+	public class UnsatisfiedDependencyException : ObjectCreationException
+	{
+		/// <summary>
+		/// Creates a new instance of the UnsatisfiedDependencyException class.
+		/// </summary>
+		public UnsatisfiedDependencyException()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the UnsatisfiedDependencyException class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public UnsatisfiedDependencyException(string message)
+			: base(message)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the UnsatisfiedDependencyException class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public UnsatisfiedDependencyException(string message, Exception rootCause)
+			: base(message, rootCause)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the UnsatisfiedDependencyException class.
+		/// </summary>
+		/// <param name="resourceDescription">
+		/// The description of the resource associated with the object.
+		/// </param>
+		/// <param name="name">
+		/// The name of the object that has the unsatisfied dependency.
+		/// </param>
+		/// <param name="argumentIndex">
+		/// The constructor argument index at which the dependency is
+		/// unsatisfied.
+		/// </param>
+		/// <param name="argumentType">
+		/// The <see cref="System.Type"/> of the constructor argument at
+		/// which the dependency is unsatisfied.
+		/// </param>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public UnsatisfiedDependencyException(
+			string resourceDescription,
+			string name,
+			int argumentIndex,
+			Type argumentType,
+			string message)
+			: base(
+				resourceDescription,
+				name,
+				string.Format(
+					"Unsatisfied dependency expressed through constructor argument with index {0} of type [{1}] : {2}",
+					argumentIndex,
+					argumentType,
+					message))
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the UnsatisfiedDependencyException class.
+		/// </summary>
+		/// <param name="resourceDescription">
+		/// The description of the resource associated with the object.
+		/// </param>
+		/// <param name="name">
+		/// The name of the object that has the unsatisfied dependency.
+		/// </param>
+		/// <param name="propertyName">
+		/// The name identifying the property on which the dependency is
+		/// unsatisfied.
+		/// </param>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public UnsatisfiedDependencyException(
+			string resourceDescription,
+			string name,
+			string propertyName,
+			string message)
+			: base(
+				resourceDescription,
+				name,
+				string.Format(
+					"Unsatisfied dependency expressed through object property '{0}': {1}",
+					propertyName,
+					message))
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the UnsatisfiedDependencyException class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected UnsatisfiedDependencyException(
+			SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractObjectDefinitionParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractObjectDefinitionParser.cs
new file mode 100644
index 00000000..2d15e7d0
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractObjectDefinitionParser.cs
@@ -0,0 +1,212 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports 
+using System.Xml;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Util;
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+
+
+    /// <summary>
+    /// Abstract <see cref="IObjectDefinitionParser"/> implementation providing
+    /// a number of convenience methods and a
+    /// <see cref="AbstractObjectDefinitionParser.ParseInternal"/> template method
+    /// that subclasses must override to provide the actual parsing logic.
+    /// </summary>
+    /// <remarks>
+    /// Use this <see cref="IObjectDefinitionParser"/> implementation when you want
+    /// to parse some arbitrarily complex XML into one or more
+    /// <see cref="IObjectDefinition"/> ObjectDefinitions. If you just want to parse some
+    /// XML into a single <code>IObjectDefinition</code>, you may wish to consider
+    /// the simpler convenience extensions of this class, namely
+    /// <see cref="AbstractSingleObjectDefinitionParser"/> and
+    /// <see cref="AbstractSimpleObjectDefinitionParser"/>
+    /// </remarks>
+    /// <author>Rob Harrop</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AbstractObjectDefinitionParser.cs,v 1.4 2007/05/26 19:25:54 markpollack Exp $</version>
+    public abstract class AbstractObjectDefinitionParser : IObjectDefinitionParser
+    {
+        /// <summary>
+        /// Constant for the ID attribute
+        /// </summary>
+        public static readonly string ID_ATTRIBUTE = "id";
+
+        #region Properties
+
+        /// <summary>
+        /// Gets a value indicating whether an ID should be generated instead of read 
+        /// from the passed in XmlElement.
+        /// </summary>
+        /// <remarks>Note that this flag is about always generating an ID; the parser
+        /// won't even check for an "id" attribute in this case.
+        /// </remarks>
+        /// <value><c>true</c> if should generate id; otherwise, <c>false</c>.</value>
+        protected virtual bool ShouldGenerateId
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether an ID should be generated instead if the
+        /// passed in XmlElement does not specify an "id" attribute explicitly.
+        /// </summary>
+        /// <remarks>Disabled by default; subclasses can override this to enable ID generation
+        /// as fallback: The parser will first check for an "id" attribute in this case,
+        /// only falling back to a generated ID if no value was specified.</remarks>
+        /// <value>
+        /// 	<c>true</c> if should generate id if no value was specified; otherwise, <c>false</c>.
+        /// </value>
+        protected virtual bool ShouldGenerateIdAsFallback
+        {
+            get { return false; }
+        }
+
+        #endregion
+
+        #region IObjectDefinitionParser Members
+
+
+        /// <summary>
+        /// Parse the specified XmlElement and register the resulting
+        /// ObjectDefinitions with the <see cref="ParserContext.Registry"/> IObjectDefinitionRegistry
+        /// embedded in the supplied <see cref="ParserContext"/>
+        /// </summary>
+        /// <param name="element">The element to be parsed.</param>
+        /// <param name="parserContext">TThe object encapsulating the current state of the parsing process.
+        /// Provides access to a IObjectDefinitionRegistry</param>
+        /// <returns>The primary object definition.</returns>
+        /// <remarks>
+        /// 	<p>
+        /// This method is never invoked if the parser is namespace aware
+        /// and was called to process the root node.
+        /// </p>
+        /// </remarks>
+        public IObjectDefinition ParseElement(XmlElement element, ParserContext parserContext)
+        {
+            AbstractObjectDefinition definition = ParseInternal(element, parserContext);
+
+            if (!parserContext.IsNested)
+            {
+                string id = null;
+                try
+                {
+                    id = ResolveId(element, definition, parserContext);
+                    if (!StringUtils.HasText(id))
+                    {
+                        parserContext.ReaderContext.ReportException(element, "null",
+                                "Id is required for element '" + element.LocalName + "' when used as a top-level tag", null);
+                    }
+                    ObjectDefinitionHolder holder = new ObjectDefinitionHolder(definition, id);
+                    RegisterObjectDefinition(holder, parserContext.Registry);
+                }
+                catch (ObjectDefinitionStoreException ex)
+                {
+                    parserContext.ReaderContext.ReportException(element, id, ex.Message);
+                    return null;
+                }
+            }
+            return definition;
+
+
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Resolves the ID for the supplied <see cref="IObjectDefinition"/>.
+        /// </summary>
+        /// <remarks>
+        /// When using <see cref="ShouldGenerateId"/> generation, a name is generated automatically.
+        /// Otherwise, the ID is extracted from the "id" attribute, potentially with a
+        /// <see cref="ShouldGenerateIdAsFallback"/> fallback to a generated id.
+        /// </remarks>
+        /// <param name="element">The element that the object definition has been built from.</param>
+        /// <param name="definition">The object definition to be registered.</param>
+        /// <param name="parserContext">The the object encapsulating the current state of the parsing process;
+        /// provides access to a <see cref="IObjectDefinitionRegistry"/> </param>
+        /// <returns>the resolved id</returns>
+        /// <exception cref="ObjectDefinitionStoreException">
+        /// if no unique name could be generated for the given object definition
+        /// </exception>
+        protected virtual string ResolveId(XmlElement element, AbstractObjectDefinition definition, ParserContext parserContext)
+	    {
+
+		    if (ShouldGenerateId) {
+			    return parserContext.ReaderContext.GenerateObjectName(definition);
+		    }
+		    else {
+			    string id = element.GetAttribute(ID_ATTRIBUTE);
+			    if (!StringUtils.HasText(id) && ShouldGenerateIdAsFallback) {
+				    id = parserContext.ReaderContext.GenerateObjectName(definition);
+			    }
+			    return id;
+		    }
+	    }
+
+        /// <summary>
+        /// Registers the supplied <see cref="ObjectDefinitionHolder"/> with the supplied
+        /// <see cref="IObjectDefinitionRegistry"/>.
+        /// </summary>
+        /// <remarks>Subclasses can override this method to control whether or not the supplied
+        /// <see cref="ObjectDefinitionHolder"/> is actually even registered, or to
+        /// register even more objects.
+        /// <para>
+        /// The default implementation registers the supplied <see cref="ObjectDefinitionHolder"/>
+        /// with the supplied <see cref="ObjectDefinitionHolder"/> only if the <code>IsNested</code>
+        /// parameter is <code>false</code>, because one typically does not want inner objects
+        /// to be registered as top level objects.
+        /// </para>
+        /// </remarks>
+        /// 
+        /// <param name="definition">The object definition to be registered.</param>
+        /// <param name="registry">The registry that the bean is to be registered with.</param>
+        protected virtual void RegisterObjectDefinition(ObjectDefinitionHolder definition, IObjectDefinitionRegistry registry)
+        {
+            ObjectDefinitionReaderUtils.RegisterObjectDefinition(definition, registry);
+        }
+
+        #endregion
+
+
+        #region Abstract Methods
+
+        /// <summary>
+        /// Central template method to actually parse the supplied XmlElement 
+        /// into one or more IObjectDefinitions.
+        /// </summary>
+        /// <param name="element">The element that is to be parsed into one or more <see cref="IObjectDefinition"/>s</param>
+        /// <param name="parserContext">The the object encapsulating the current state of the parsing process;
+        /// provides access to a <see cref="IObjectDefinitionRegistry"/> </param>
+        /// <returns>The primary IObjectDefinition resulting from the parsing of the supplied XmlElement</returns>
+        protected abstract AbstractObjectDefinition ParseInternal(XmlElement element, ParserContext parserContext);
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSimpleObjectDefinitionParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSimpleObjectDefinitionParser.cs
new file mode 100644
index 00000000..7e45a7d6
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSimpleObjectDefinitionParser.cs
@@ -0,0 +1,37 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Convenient base class for when there exists a one-to-one mapping
+    /// between attribute names on the element that is to be parsed and
+    /// the property names on the Type being configured. 
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AbstractSimpleObjectDefinitionParser.cs,v 1.1 2007/05/26 19:25:54 markpollack Exp $</version>
+    public class AbstractSimpleObjectDefinitionParser : AbstractSingleObjectDefinitionParser
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSingleObjectDefinitionParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSingleObjectDefinitionParser.cs
new file mode 100644
index 00000000..56fba856
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/AbstractSingleObjectDefinitionParser.cs
@@ -0,0 +1,143 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Xml;
+using Spring.Objects.Factory.Support;
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Base Type for those <see cref="IObjectDefinitionParser"/> implementations that
+    /// need to parse and define just a single IObjectDefinition.
+    /// </summary>
+    /// <remarks>
+    /// Extend this parser Type when you want to create a single object definition
+    /// from an arbitrarily complex XML element. You may wish to consider extending
+    /// the <see cref="AbstractSingleObjectDefinitionParser"/> when you want to create a
+    /// single Object definition from a relatively simple custom XML element.
+    /// <para>The resulting ObjectDefinition will be automatically registered
+    /// with the ObjectDefinitionRegistry.  Your job simply is to parse the
+    /// custom XML element into a single ObjectDefinition</para>
+    /// </remarks>
+    /// <author>Rob Harrop</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AbstractSingleObjectDefinitionParser.cs,v 1.3 2007/05/29 14:42:20 markpollack Exp $</version>
+    public class AbstractSingleObjectDefinitionParser : AbstractObjectDefinitionParser
+    {
+        #region Methods
+
+        /// <summary>
+        /// Central template method to actually parse the supplied XmlElement
+        /// into one or more IObjectDefinitions.
+        /// </summary>
+        /// <param name="element">The element that is to be parsed into one or more <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/>s</param>
+        /// <param name="parserContext">The the object encapsulating the current state of the parsing process;
+        /// provides access to a <see cref="IObjectDefinitionRegistry"/></param>
+        /// <returns>
+        /// The primary IObjectDefinition resulting from the parsing of the supplied XmlElement
+        /// </returns>
+        protected override AbstractObjectDefinition ParseInternal(XmlElement element, ParserContext parserContext)
+        {
+            ObjectDefinitionBuilder builder;
+            Type objectType = GetObjectType(element);
+            if (objectType != null)
+            {
+                builder =
+                    ObjectDefinitionBuilder.RootObjectDefinition(parserContext.ReaderContext.ObjectDefinitionFactory,
+                                                                 objectType);
+            }
+            else
+            {
+                throw new NotSupportedException("Need to refactor IObjectDefinitionFactory to not resolve object type names");
+            }
+            if (parserContext.IsNested)
+            {
+                // Inner object definition must receive same singleton status as containing object.
+                builder.SetSingleton(parserContext.ContainingObjectDefinition.IsSingleton);
+            }
+            if (parserContext.IsDefaultLazyInit)
+            {
+                // Default-lazy-init applies to custom object definitions as well.
+                builder.SetLazyInit(true);
+            }
+            DoParse(element, parserContext, builder);
+            return builder.ObjectDefinition;
+
+        }
+
+        /// <summary>
+        /// Gets the type of the object corresponding to the supplied XmlElement.
+        /// </summary>
+        /// <remarks>Note that, for application classes, it is generally preferable to override
+        /// <code>GetObjectTypeName</code> instad, in order to avoid a direct
+        /// dependence on the object implementation class.  The ObjectDefinitionParser
+        /// and its IXmlObjectDefinitionParser (namespace parser) can be used within an
+        /// IDE add-in then, even if the application classses are not available in the add-ins
+        /// AppDomain.
+        /// </remarks>
+        /// <param name="element">The element.</param>
+        /// <returns>The Type of the class that is being defined via parsing the supplied
+        /// Element.</returns>
+        protected virtual Type GetObjectType(XmlElement element)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the name of the object type name (FullName) corresponding to the supplied XmlElement.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        /// <returns>The type name of the object that is being defined via parsing the supplied
+        /// XmlElement.</returns>
+        protected virtual string GetObjectTypeName(XmlElement element)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Parse the supplied XmlElement and populate the supplied ObjectDefinitionBuilder as required.
+        /// </summary>
+        /// <remarks>The default implementation delegates to the <code>DoParse</code> version without 
+        /// ParameterContext argument.</remarks>
+        /// <param name="element">The element.</param>
+        /// <param name="parserContext">The parser context.</param>
+        /// <param name="builder">The builder used to define the <code>IObjectDefinition</code>.</param>
+        protected virtual void DoParse(XmlElement element, ParserContext parserContext, ObjectDefinitionBuilder builder)
+        {
+            DoParse(element, builder);
+        }
+
+        /// <summary>
+        /// Parse the supplied XmlElement and populate the supplied ObjectDefinitionBuilder as required. 
+        /// </summary>
+        /// <remarks>The default implementation does nothing.</remarks>
+        /// <param name="element">The element.</param>
+        /// <param name="builder">The builder used to define the <code>IObjectDefinition</code>.</param>
+        protected virtual void DoParse(XmlElement element, ObjectDefinitionBuilder builder)
+        {
+
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/DefaultObjectDefinitionDocumentReader.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/DefaultObjectDefinitionDocumentReader.cs
new file mode 100644
index 00000000..794f2837
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/DefaultObjectDefinitionDocumentReader.cs
@@ -0,0 +1,341 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Xml;
+using Common.Logging;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// XML resource reader. 
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Navigates through an XML resource and invokes parsers registered
+    /// with the <see cref="NamespaceParserRegistry"/>.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: DefaultObjectDefinitionDocumentReader.cs,v 1.9 2007/08/27 14:49:43 oakinger Exp $</version>
+    public class DefaultObjectDefinitionDocumentReader : IObjectDefinitionDocumentReader
+    {
+        #region Constants
+
+        /// <summary>
+        /// The shared <see cref="Common.Logging.ILog"/> instance for this class (and derived classes). 
+        /// </summary>
+        protected static readonly ILog log =
+            LogManager.GetLogger(typeof(DefaultObjectDefinitionDocumentReader));
+
+        #endregion
+
+        #region Fields
+
+        private XmlReaderContext readerContext;
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the DefaultObjectDefinitionDocumentReader class.
+        /// </summary>
+        public DefaultObjectDefinitionDocumentReader()
+        {
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the reader context.
+        /// </summary>
+        /// <value>The reader context.</value>
+        public XmlReaderContext ReaderContext
+        {
+            get { return readerContext; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Read object definitions from the given DOM element, and register
+        /// them with the given object registry.
+        /// </summary>
+        /// <param name="doc">The DOM element containing object definitions, usually the
+        /// root (document) element.</param>
+        /// <param name="readerContext">The current context of the reader.  Includes
+        /// the resource being parsed</param>
+        /// <returns>
+        /// The number of object definitions that were loaded.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of parsing errors.
+        /// </exception>
+        public void RegisterObjectDefinitions(XmlDocument doc, XmlReaderContext readerContext)
+        {
+            //int objectDefinitionCounter = 0;
+
+            this.readerContext = readerContext;
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug("Loading object definitions.");
+            }
+
+            #endregion
+
+            XmlElement root = doc.DocumentElement;
+
+            ObjectDefinitionParserHelper parserHelper = CreateHelper(readerContext, root);
+
+
+            PreProcessXml(root);
+
+            ParseObjectDefinitions(root, parserHelper);
+
+            PostProcessXml(root);
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(
+                    string.Format(
+                        "Found {0} <{1}> elements defining objects.",
+                        readerContext.Registry.ObjectDefinitionCount,
+                        ObjectDefinitionConstants.ObjectElement));
+            }
+
+            #endregion
+        }
+
+        /// <summary>
+        /// Parses object definitions starting at the given <see cref="XmlElement"/> 
+        /// using the passed <see cref="ObjectDefinitionParserHelper"/>.
+        /// </summary>
+        /// <param name="root">The root element to start parsing from.</param>
+        /// <param name="helper">The <see cref="ObjectDefinitionParserHelper"/> instance to use.</param>
+        protected virtual void ParseObjectDefinitions(XmlElement root, ObjectDefinitionParserHelper helper)
+        {
+            foreach (XmlNode node in root.ChildNodes)
+            {
+                if (node.NodeType == XmlNodeType.Element)
+                {
+                    XmlElement element = (XmlElement) node;
+                    INamespaceParser parser = GetNamespaceParser(element, helper);
+                    ParserContext parserContext = new ParserContext(helper.ReaderContext, helper);
+                    parser.ParseElement(element, parserContext);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Parses the default element.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        /// <param name="helper">The helper.</param>
+        private void ParseDefaultElement(XmlElement element, ObjectDefinitionParserHelper helper)
+        {
+            if (element.LocalName == ObjectDefinitionConstants.ImportElement)
+            {
+                ImportObjectDefinitionResource(element);
+            }
+            else if (element.LocalName == ObjectDefinitionConstants.AliasElement)
+            {
+                ParseAlias(element, ReaderContext.Registry);
+            }
+            else if (element.LocalName == ObjectDefinitionConstants.ObjectElement)
+            {
+                RegisterObjectDefinition(element, helper);
+            }
+        }
+
+        /// <summary>
+        /// Loads external XML object definitions from the resource described by the supplied
+        /// <paramref name="resource"/>.
+        /// </summary>
+        /// <param name="resource">The XML element describing the resource.</param>
+        /// <exception cref="Spring.Objects.Factory.ObjectDefinitionStoreException">
+        /// If the resource could not be imported.
+        /// </exception>
+        protected virtual void ImportObjectDefinitionResource(XmlElement resource)
+        {
+            string location = resource.GetAttribute(ObjectDefinitionConstants.ImportResourceAttribute);
+            try
+            {
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(string.Format(
+                                  CultureInfo.InvariantCulture,
+                                  "Attempting to import object definitions from '{0}'.", location));
+                }
+
+                #endregion
+
+                IResource importResource = ReaderContext.Resource.CreateRelative(location);
+                ReaderContext.Reader.LoadObjectDefinitions(importResource);
+            }
+            catch (IOException ex)
+            {
+                ReaderContext.ReportException(resource, null, string.Format(
+                                                                  CultureInfo.InvariantCulture,
+                                                                  "Invalid relative resource location '{0}' to import object definitions from.",
+                                                                  location), ex);
+            }
+        }
+
+        /// <summary>
+        /// Parses the given alias element, registering the alias with the registry.
+        /// </summary>
+        /// <param name="aliasElement">The alias element.</param>
+        /// <param name="registry">The registry.</param>
+        protected virtual void ParseAlias(XmlElement aliasElement, IObjectDefinitionRegistry registry)
+        {
+            string name = aliasElement.GetAttribute(ObjectDefinitionConstants.NameAttribute);
+            string alias = aliasElement.GetAttribute(ObjectDefinitionConstants.AliasAttribute);
+            registry.RegisterAlias(name, alias);
+        }
+
+        /// <summary>
+        /// Parse an object definition and register it with the object factory..
+        /// </summary>
+        /// <param name="element">The element containing the object definition.</param>
+        /// <param name="helper">The helper.</param>
+        /// <seealso cref="Spring.Objects.Factory.Support.ObjectDefinitionReaderUtils.RegisterObjectDefinition"/>
+        protected virtual void RegisterObjectDefinition(XmlElement element, ObjectDefinitionParserHelper helper)
+        {
+            ObjectDefinitionHolder holder = null;
+            try
+            {
+                INamespaceParser parser = GetNamespaceParser(element, helper);
+
+                //holder = ParseObjectDefinition(element, parserContext);
+                //holder = helper.ParseObjectDefinitionElement(element);
+                if (holder == null)
+                {
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new ObjectDefinitionStoreException(
+                    string.Format("Failed parsing object definition '{0}'", element.OuterXml), ex);
+            }
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(
+                    string.Format(
+                        CultureInfo.InvariantCulture,
+                        "Registering object definition with id '{0}'.", holder.ObjectName));
+            }
+
+            #endregion
+
+            ObjectDefinitionReaderUtils.RegisterObjectDefinition(holder, ReaderContext.Registry);
+        }
+
+        /// <summary>
+        /// <para>
+        /// Allow the XML to be extensible by processing any custom element types last,
+        /// after we finished processing the objct definitions. This method is a natural
+        /// extension point for any other custom post-processing of the XML.
+        /// </para><para>
+        /// The default implementation is empty. Subclasses can override this method to
+        /// convert custom elements into standard Spring object definitions, for example.
+        /// Implementors have access to the parser's object definition reader and the
+        /// underlying XML resource, through the corresponding properties.
+        /// </para>
+        /// </summary>
+        /// <param name="root">The root.</param>
+        protected virtual void PostProcessXml(XmlElement root)
+        {
+        }
+
+        /// <summary>
+        /// Allow the XML to be extensible by processing any custom element types first,
+        /// before we start to process the object definitions.
+        /// </summary>
+        /// <remarks>This method is a natural
+        /// extension point for any other custom pre-processing of the XML.
+        /// <p>The default implementation is empty. Subclasses can override this method to
+        /// convert custom elements into standard Spring object definitions, for example.
+        /// Implementors have access to the parser's object definition reader and the
+        /// underlying XML resource, through the corresponding properties.
+        /// </p>
+        /// </remarks>
+        /// <param name="root">The root element of the XML document.</param>
+        protected virtual void PreProcessXml(XmlElement root)
+        {
+        }
+
+        /// <summary>
+        /// Creates an <see cref="ObjectDefinitionParserHelper"/> instance for the given <paramref name="readerContext"/> and <paramref name="root"/> element.
+        /// </summary>
+        /// <param name="readerContext">the <see cref="XmlReaderContext"/> to create the <see cref="ObjectDefinitionParserHelper"/> </param>
+        /// <param name="root">the root <see cref="XmlElement"/> to start reading from</param>
+        /// <returns>a new <see cref="ObjectDefinitionParserHelper"/> instance</returns>
+        protected virtual ObjectDefinitionParserHelper CreateHelper(XmlReaderContext readerContext, XmlElement root)
+        {
+            ObjectDefinitionParserHelper helper = new ObjectDefinitionParserHelper(readerContext);
+            helper.InitDefaults(root);
+            return helper;
+        }
+
+        private INamespaceParser GetNamespaceParser(XmlElement element, ObjectDefinitionParserHelper helper)
+        {
+            INamespaceParser parser = NamespaceParserRegistry.GetParser(element.NamespaceURI);
+            if (parser == null)
+            {
+                helper.ReaderContext.ReportException(element, null, GetNoParserForNamespaceMessage(element.NamespaceURI));
+            }
+            return parser;
+        }
+
+        private string GetNoParserForNamespaceMessage(string namespaceURI)
+        {
+            return "There is no parser registered for namespace '" + namespaceURI + "'";
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/DocumentDefaultsDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/DocumentDefaultsDefinition.cs
new file mode 100644
index 00000000..bfe2372c
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/DocumentDefaultsDefinition.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Simple class that holds the defaults specified at the <code>&lt;objects&gt;</code> 
+    /// level in a standard Spring XML object definition document:
+    /// <code>default-lazy-init</code>, <code>default-autowire</code>, etc.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    public class DocumentDefaultsDefinition
+    {
+        private string autowire;
+        private string dependencyCheck;
+        private string lazyInit;
+
+        /// <summary>
+        /// Gets or sets the autowire setting for the document that's currently parsed.
+        /// </summary>
+        /// <value>The autowire.</value>
+        public string Autowire
+        {
+            get { return autowire; }
+            set { autowire = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the dependency-check setting for the document that's currently parsed
+        /// </summary>
+        /// <value>The dependency check.</value>
+        public string DependencyCheck
+        {
+            get { return dependencyCheck; }
+            set { dependencyCheck = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the lazy-init flag for the document that's currently parsed.
+        /// </summary>
+        /// <value>The lazy init.</value>
+        public string LazyInit
+        {
+            get { return lazyInit; }
+            set { lazyInit = value; }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParser.cs
new file mode 100644
index 00000000..478696d1
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParser.cs
@@ -0,0 +1,100 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Xml;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+
+	/// <summary>
+	/// Strategy interface for parsing XML object definitions.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Used by <see cref="DefaultObjectDefinitionDocumentReader"/>
+	/// for actually parsing a DOM document or
+	/// <see cref="System.Xml.XmlElement"/> fragment.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <author>Sandu Turcan (.NET)</author>
+	/// <version>$Id: INamespaceParser.cs,v 1.1 2007/08/07 21:23:37 markpollack Exp $</version>
+	public interface INamespaceParser
+	{
+
+        /// <summary>
+        /// Invoked by <see cref="NamespaceParserRegistry"/> after construction but before any
+        /// elements have been parsed.
+        /// </summary>
+        void Init();
+
+
+        /// <summary>
+        /// Parse the specified element and register any resulting
+        /// IObjectDefinitions with the IObjectDefinitionRegistry that is
+        /// embedded in the supplied ParserContext.
+        /// </summary>
+        /// <remarks>
+        /// Implementations should return the primary IObjectDefinition
+        /// that results from the parse phase if they wish to used nested
+        /// inside (for example) a <code>&lt;property&gt;</code> tag.
+        /// <para>Implementations may return null if they will not
+        /// be used in a nested scenario.
+        /// </para>
+        /// </remarks>
+        /// <param name="element">The element to be parsed into one or more IObjectDefinitions</param>
+        /// <param name="parserContext">The object encapsulating the current state of the parsing
+        /// process.</param>
+        /// <returns>
+        /// The primary IObjectDefinition (can be null as explained above)
+        /// </returns>
+        IObjectDefinition ParseElement(XmlElement element,  ParserContext parserContext);
+
+
+        /// <summary>
+        /// Parse the specified XmlNode and decorate the supplied ObjectDefinitionHolder,
+        /// returning the decorated definition.
+        /// </summary>
+        /// <remarks>The XmlNode may either be an XmlAttribute or an XmlElement, depending on
+        /// whether a custom attribute or element is being parsed.
+        /// <para>Implementations may choose to return a completely new definition,
+        /// which will replace the original definition in the resulting IApplicationContext/IObjectFactory.
+        /// </para>
+        /// <para>The supplied ParserContext can be used to register any additional objects needed to support
+        /// the main definition.</para>
+        /// </remarks>
+        /// <param name="node">The source element or attribute that is to be parsed.</param>
+        /// <param name="definition">The current object definition.</param>
+        /// <param name="parserContext">The object encapsulating the current state of the parsing
+        /// process.</param>
+        /// <returns>The decorated definition (to be registered in the IApplicationContext/IObjectFactory),
+        /// or simply the original object definition if no decoration is required.  A null value is strickly
+        /// speaking invalid, but will leniently treated like the case where the original object definition
+        /// gets returned.</returns>
+	    ObjectDefinitionHolder Decorate(XmlNode node, ObjectDefinitionHolder definition, ParserContext parserContext);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionDocumentReader.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionDocumentReader.cs
new file mode 100644
index 00000000..c7b098ac
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionDocumentReader.cs
@@ -0,0 +1,57 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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.Xml;
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// SPI for parsing an XML document that contains Spring object definitions.
+    /// Used by <see cref="XmlObjectDefinitionReader"/> for actually parsing a DOM
+    /// document.
+    /// </summary>
+    /// <remarks>Instantiated per document to parse:  Implementations can hold state in
+    /// instance variables during the execution of the <code>RegisterObjectDefinitions</code>
+    /// method, for example global settings that are defined for all object definitions
+    /// in the document.
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rob Harrop</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// 
+    public interface IObjectDefinitionDocumentReader
+    {
+        /// <summary>
+        /// Read object definitions from the given DOM element, and register
+        /// them with the given object registry.
+        /// </summary>
+        /// <param name="doc">The DOM element containing object definitions, usually the
+        /// root (document) element.</param>
+        /// <param name="readerContext">The current context of the reader.  Includes 
+        /// the resource being parsed</param>
+        /// <returns>
+        /// The number of object definitions that were loaded.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of parsing errors.
+        /// </exception>
+        void RegisterObjectDefinitions(XmlDocument doc, XmlReaderContext readerContext);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionParser.cs
new file mode 100644
index 00000000..af799065
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionParser.cs
@@ -0,0 +1,59 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Xml;
+using Spring.Objects.Factory.Config;
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Interface used to handle custom, top-level tags.
+    /// </summary>
+    /// <remarks>Implementations are free to turn the metadata in the custom tag into as
+    /// many <see cref="Spring.Objects.Factory.Config.IObjectDefinition"/> as required.
+    /// </remarks>
+    /// <author>Rob Harrop</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: IObjectDefinitionParser.cs,v 1.3 2007/05/25 03:23:21 markpollack Exp $</version>
+    public interface IObjectDefinitionParser
+    {
+        /// <summary>
+        /// Parse the specified XmlElement and register the resulting
+        /// ObjectDefinitions with the <see cref="ParserContext.Registry"/> IObjectDefinitionRegistry
+        /// embedded in the supplied <see cref="ParserContext"/>
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method is never invoked if the parser is namespace aware
+        /// and was called to process the root node.
+        /// </p>
+        /// </remarks>
+        /// <param name="element">
+        /// The element to be parsed.
+        /// </param>
+        /// <param name="parserContext">
+        /// TThe object encapsulating the current state of the parsing process. 
+        /// Provides access to a IObjectDefinitionRegistry
+        /// </param>
+        /// <returns>
+        /// The primary object definition.
+        /// </returns>
+        IObjectDefinition ParseElement(XmlElement element, ParserContext parserContext);
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserAttribute.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserAttribute.cs
new file mode 100644
index 00000000..d389175b
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserAttribute.cs
@@ -0,0 +1,100 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Attribute that should be used to specify the default namespace
+    /// and schema location for a custom namespace parser.
+    /// </summary>
+    /// <remarks>
+    /// If 
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: NamespaceParserAttribute.cs,v 1.1 2007/08/08 00:34:06 bbaia Exp $</version>
+    [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
+    public class NamespaceParserAttribute : Attribute
+    {
+        private string ns;
+        private string schemaLocation;
+		private Type schemaLocationAssemblyHint;
+    	
+        /// <summary>
+        /// Creates a new instance of <see cref="NamespaceParserAttribute"/>.
+        /// </summary>
+        public NamespaceParserAttribute()
+        {}
+
+        /// <summary>
+        /// Gets or sets the default namespace for the configuration parser.
+        /// </summary>
+        /// <value>
+        /// The default namespace for the configuration parser.
+        /// </value>
+        public string Namespace
+        {
+            get { return ns; }
+            set { ns = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the default schema location for the configuration parser.
+        /// </summary>
+        /// <value>
+        /// The default schema location for the configuration parser.
+        /// </value>
+        /// <remarks>
+		/// If the <see cref="SchemaLocationAssemblyHint"/>  property is set, the <see cref="SchemaLocation"/> will always resolve to an assembly-resource 
+		/// and the set <see cref="SchemaLocation"/> will be interpreted relative to this assembly.
+		/// </remarks>
+        public string SchemaLocation
+        {
+            get
+            {
+            	if (schemaLocationAssemblyHint != null)
+            	{
+            		return "assembly://" + schemaLocationAssemblyHint.Assembly.FullName + schemaLocation;
+            	}
+            	return schemaLocation;
+            }
+            set { schemaLocation = value; }
+        }
+
+    	/// <summary>
+    	/// Gets or sets a type from the assembly containing the schema
+    	/// </summary>
+    	/// <remarks>
+    	/// If this property is set, the <see cref="SchemaLocation"/> will always resolve to an assembly-resource 
+    	/// and the <see cref="SchemaLocation"/> will be interpreted relative to this assembly.
+    	/// </remarks>
+    	public Type SchemaLocationAssemblyHint
+    	{
+    		get { return schemaLocationAssemblyHint; }
+    		set { schemaLocationAssemblyHint = value; }
+    	}
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs
new file mode 100644
index 00000000..9716a8d0
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs
@@ -0,0 +1,287 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Xml;
+using System.Xml.Schema;
+using Spring.Core;
+using Spring.Core.IO;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+using Spring.Validation;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Provides a resolution mechanism for configuration parsers.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// The <see cref="DefaultObjectDefinitionDocumentReader"/> uses this registry
+    /// class to find the parser handling a specific namespace.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: NamespaceParserRegistry.cs,v 1.7 2007/09/17 01:12:48 bbaia Exp $</version>
+    public class NamespaceParserRegistry
+    {
+        /// <summary>
+        /// Name of the .Net config section that contains definitions 
+        /// for custom config parsers.
+        /// </summary>
+        private const string ConfigParsersSectionName = "spring/parsers";
+
+        #region Fields
+
+        private static IDictionary parsers = new HybridDictionary();
+
+#if !NET_2_0
+        private static XmlSchemaCollection schemas = new XmlSchemaCollection();
+#else
+        private static XmlSchemaSet schemas = new XmlSchemaSet();
+#endif
+
+        #endregion
+
+        /// <summary>
+        /// Creates a new instance of the NamespaceParserRegistry class.
+        /// </summary>
+        static NamespaceParserRegistry()
+        {
+            lock (parsers.SyncRoot)
+            lock (schemas)
+            {
+                //TODO - externalize default list of parsers.
+                RegisterParser(new ObjectsNamespaceParser());
+                //This is done simple as a means to avoid cyclic dependencies with Factory.Xml
+                //which implementations of parsers typically use.
+                RegisterParser(ObjectUtils.InstantiateType(typeof(NamespaceParserRegistry).Assembly, 
+                    "Spring.Validation.Config.ValidationNamespaceParser") as INamespaceParser);
+
+                // register custom config parsers
+                ConfigurationUtils.GetSection(ConfigParsersSectionName);
+            }
+        }
+
+        /// <summary>
+        /// Returns a parser for the given namespace.
+        /// </summary>
+        /// <param name="namespaceURI">
+        /// The namespace for which to lookup the parser implementation.
+        /// </param>
+        /// <returns>
+        /// A parser for a given <paramref name="namespaceURI"/>, or
+        /// <see langword="null"/> if no parser was found.
+        /// </returns>
+        public static INamespaceParser GetParser(string namespaceURI)
+        {
+            return (INamespaceParser) parsers[namespaceURI];
+        }
+
+        /// <summary>
+        /// Returns a schema collection containing validation schemas for all registered parsers.
+        /// </summary>
+        /// <returns>
+        /// A schema collection containing validation schemas for all registered parsers.
+        /// </returns>
+#if !NET_2_0
+        public static XmlSchemaCollection GetSchemas()
+#else
+        public static XmlSchemaSet GetSchemas()
+#endif
+        {
+            return schemas;
+        }
+
+        /// <summary>
+        /// Pegisters parser, using default namespace and schema location
+        /// as defined by the <see cref="NamespaceParserAttribute"/>.
+        /// </summary>
+        /// <param name="parserType">
+        /// The <see cref="System.Type"/> of the parser that will be activated
+        /// when an element in its default namespace is encountered.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If <paramref name="parserType"/> is <see langword="null"/>.
+        /// </exception>
+        public static void RegisterParser(Type parserType)
+        {
+            RegisterParser(parserType, null, null);
+        }
+
+        /// <summary>
+        /// Associates a parser with a namespace.
+        /// </summary>
+        /// <remarks>
+        /// <note>
+        /// Parsers registered with the same <paramref name="namespaceUri"/> as that
+        /// of a parser that has previously been registered will overwrite the existing
+        /// parser.
+        /// </note>
+        /// </remarks>
+        /// <param name="parserType">
+        /// The <see cref="System.Type"/> of the parser that will be activated
+        /// when the attendant <paramref name="namespaceUri"/> is
+        /// encountered.
+        /// </param>
+        /// <param name="namespaceUri">
+        /// The namespace with which to associate instance of the parser.
+        /// </param>
+        /// <param name="schemaLocation">
+        /// The location of the XML schema that should be used for validation 
+        /// of the XML elements that belong to the specified namespace 
+        /// (can be any valid Spring.NET resource URI).
+        /// </param>
+        /// <exception cref="System.ArgumentException">
+        /// If the <paramref name="parserType"/> is not a <see cref="System.Type"/>
+        /// that implements the <see cref="INamespaceParser"/>
+        /// interface.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If <paramref name="parserType"/> is <see langword="null"/>.
+        /// </exception>
+        public static void RegisterParser(Type parserType, string namespaceUri, string schemaLocation)
+        {
+            AssertUtils.ArgumentNotNull(parserType, "parserType");
+
+            if (!(typeof(INamespaceParser)).IsAssignableFrom(parserType))
+            {
+                throw new ArgumentException(string.Format("The [{0}] Type must implement the IXmlObjectDefinitionParser interface.",
+                                                          parserType.Name), "parserType");
+            }
+
+            RegisterParser((INamespaceParser) ObjectUtils.InstantiateType(parserType), namespaceUri, schemaLocation);
+        }
+
+        /// <summary>
+        /// Pegisters parser, using default namespace and schema location
+        /// as defined by the <see cref="NamespaceParserAttribute"/>.
+        /// </summary>
+        /// <param name="parser">
+        /// The parser instance.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If <paramref name="parser"/> is <see langword="null"/>.
+        /// </exception>
+        public static void RegisterParser(INamespaceParser parser)
+        {
+            RegisterParser(parser, null, null);
+        }
+        
+        /// <summary>
+        /// Associates a parser with a namespace.
+        /// </summary>
+        /// <remarks>
+        /// <note>
+        /// Parsers registered with the same <paramref name="namespaceUri"/> as that
+        /// of a parser that has previously been registered will overwrite the existing
+        /// parser.
+        /// </note>
+        /// </remarks>
+        /// <param name="namespaceUri">
+        /// The namespace with which to associate instance of the parser.
+        /// </param>
+        /// <param name="parser">
+        /// The parser instance.
+        /// </param>
+        /// <param name="schemaLocation">
+        /// The location of the XML schema that should be used for validation 
+        /// of the XML elements that belong to the specified namespace 
+        /// (can be any valid Spring.NET resource URI).
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If <paramref name="parser"/> is <see langword="null"/>, or if 
+        /// <paramref name="namespaceUri"/> is not specified and parser class
+        /// does not have default value defined using <see cref="NamespaceParserAttribute"/>.
+        /// </exception>
+        public static void RegisterParser(INamespaceParser parser, string namespaceUri, string schemaLocation)
+        {
+            AssertUtils.ArgumentNotNull(parser, "parser");
+            
+            // determine and use defaults for the namespace and schema location, if necessary
+            if (StringUtils.IsNullOrEmpty(namespaceUri) || StringUtils.IsNullOrEmpty(schemaLocation))
+            {
+                NamespaceParserAttribute defaults = GetDefaults(parser);
+                if (defaults == null)
+                {
+                    throw new ArgumentNullException(
+                        "Either default or an explicit namespace value must be specified for a configuration parser.");
+                }
+                if (StringUtils.IsNullOrEmpty(namespaceUri))
+                {
+                    namespaceUri = defaults.Namespace;
+                }
+                if (StringUtils.IsNullOrEmpty(schemaLocation))
+                {
+                    schemaLocation = defaults.SchemaLocation;
+                }
+            }
+
+            // initialize the parser
+            parser.Init();
+
+            // register parser
+            lock (parsers.SyncRoot)
+            lock (schemas)
+            {
+                parsers[namespaceUri] = parser;
+                if (StringUtils.HasText(schemaLocation) && !schemas.Contains(namespaceUri))
+                {
+                    IResourceLoader resourceLoader = new ConfigurableResourceLoader();
+                    IResource schema = resourceLoader.GetResource(schemaLocation);
+                    try {
+                        schemas.Add(namespaceUri, new XmlTextReader(schema.InputStream));
+                    } catch (Exception e)
+                    {
+                        throw new ArgumentException("Could not load schema from resource = " + schema, e);
+                    }
+                    
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns default values for the parser namespace and schema location as 
+        /// defined by the <see cref="NamespaceParserAttribute"/>.
+        /// </summary>
+        /// <param name="parser">
+        /// A parser instance.
+        /// </param>
+        /// <returns>
+        /// A <see cref="NamespaceParserAttribute"/> instance containing
+        /// default values for the parser namsepace and schema location
+        /// </returns>
+        private static NamespaceParserAttribute GetDefaults(INamespaceParser parser)
+        {
+            object[] attrs = parser.GetType().GetCustomAttributes(typeof(NamespaceParserAttribute), true);
+            if (attrs.Length > 0)
+            {
+                return (NamespaceParserAttribute)attrs[0];
+            }
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserSupport.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserSupport.cs
new file mode 100644
index 00000000..81aab2aa
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserSupport.cs
@@ -0,0 +1,120 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+using System.Xml;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Support class for implementing custom namespace parsers.
+    /// </summary>
+    /// <remarks>Parsing of individual elements is done via a ObjectDefintionParser.
+    /// Provides the RegisterObjectDefinitionParser for registering a ObjectDefintionParser
+    /// to handle a specific element.</remarks>
+    /// <author>Rob Harrop</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: NamespaceParserSupport.cs,v 1.9 2008/02/20 14:29:22 bbaia Exp $</version>
+    public abstract class NamespaceParserSupport : INamespaceParser
+    {
+
+        private readonly IDictionary objectParsers = new Hashtable();
+
+        #region IXmlObjectDefinitionParser Members
+
+        /// <summary>
+        /// Invoked by <see cref="NamespaceParserRegistry"/> after construction but before any
+        /// elements have been parsed.
+        /// </summary>
+        public abstract void Init();
+
+        /// <summary>
+        /// Parses an element under the root node, typically
+        /// an object definition or import statement.
+        /// </summary>
+        /// <param name="element">
+        /// The element to be parsed.
+        /// </param>
+        /// <param name="parserContext">
+        /// The parser context.
+        /// </param>
+        /// <returns>
+        /// The number of object defintions created from this element.
+        /// </returns>
+        public virtual IObjectDefinition ParseElement(XmlElement element, ParserContext parserContext)
+        {
+            return FindParserForElement(element, parserContext).ParseElement(element, parserContext);
+        }
+
+
+        /// <summary>
+        /// Parse the specified XmlNode and decorate the supplied ObjectDefinitionHolder,
+        /// returning the decorated definition.
+        /// </summary>
+        /// <remarks>The XmlNode may either be an XmlAttribute or an XmlElement, depending on
+        /// whether a custom attribute or element is being parsed.
+        /// <para>Implementations may choose to return a completely new definition,
+        /// which will replace the original definition in the resulting IApplicationContext/IObjectFactory.
+        /// </para>
+        /// <para>The supplied ParserContext can be used to register any additional objects needed to support
+        /// the main definition.</para>
+        /// </remarks>
+        /// <param name="node">The source element or attribute that is to be parsed.</param>
+        /// <param name="definition">The current object definition.</param>
+        /// <param name="parserContext">The object encapsulating the current state of the parsing
+        /// process.</param>
+        /// <returns>The decorated definition (to be registered in the IApplicationContext/IObjectFactory),
+        /// or simply the original object definition if no decoration is required.  A null value is strickly
+        /// speaking invalid, but will leniently treated like the case where the original object definition
+        /// gets returned.</returns>
+        public ObjectDefinitionHolder Decorate(XmlNode node, ObjectDefinitionHolder definition,
+                                               ParserContext parserContext)
+        {
+            return null;
+        }
+
+        private IObjectDefinitionParser FindParserForElement(XmlElement element, ParserContext parserContext)
+        {
+            IObjectDefinitionParser parser = objectParsers[element.LocalName] as IObjectDefinitionParser;
+            if (parser == null)
+            {
+                parserContext.ReaderContext.ReportException(element, "unknown object name", "Cannot locate IObjectDefinitionParser for element ["
+                    + element.LocalName + "]");
+            }
+            return parser;
+
+        }
+
+        /// <summary>
+        /// Register the specified <see cref="IObjectDefinitionParser"/> for the given <paramref name="elementName"/>
+        /// </summary>
+        protected virtual void RegisterObjectDefinitionParser(string elementName, IObjectDefinitionParser parser)
+        {
+            AssertUtils.ArgumentNotNull(elementName, "elementName");
+            AssertUtils.ArgumentNotNull(parser, "parser");
+            objectParsers[elementName] = parser;
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionConstants.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionConstants.cs
new file mode 100644
index 00000000..4f7a2dc0
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionConstants.cs
@@ -0,0 +1,772 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+	/// <summary>
+	/// Constants defining the structure and values associated with the
+	/// Spring.NET XML object definition format.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: ObjectDefinitionConstants.cs,v 1.8 2006/11/17 20:41:39 aseovic Exp $</version>
+	public sealed class ObjectDefinitionConstants
+	{
+		/// <summary>
+		/// Value of a boolean attribute that represents
+		/// <see langword="true"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Anything else represents <see langword="false"/>.
+		/// </p>
+		/// </remarks>
+		public const string TrueValue = "true";
+
+		/// <summary>
+		/// Signifies that a default value is to be applied.
+		/// </summary>
+		public const string DefaultValue = "default";
+
+		/// <summary>
+		/// Defines an external XML object definition resource.
+		/// </summary>
+		public const string ImportElement = "import";
+
+		/// <summary>
+		/// Specifies the relative path to an external XML object definition
+		/// resource.
+		/// </summary>
+		public const string ImportResourceAttribute = "resource";
+
+		/// <summary>
+		/// Defines an alias for an object definition.
+		/// </summary>
+		public const string AliasElement = "alias";
+
+		/// <summary>
+		/// Specifies the alias of an object definition.
+		/// </summary>
+		public const string AliasAttribute = "alias";
+
+		/// <summary>
+		/// Specifies the default lazy initialization mode.
+		/// </summary>
+		public const string DefaultLazyInitAttribute = "default-lazy-init";
+
+		/// <summary>
+		/// Specifies the default dependency checking mode.
+		/// </summary>
+		public const string DefaultDependencyCheckAttribute
+			= "default-dependency-check";
+
+		/// <summary>
+		/// Specifies the default autowire mode.
+		/// </summary>
+		public const string DefaultAutowireAttribute = "default-autowire";
+
+		/// <summary>
+		/// Defines a single named object.
+		/// </summary>
+		public const string ObjectElement = "object";
+
+		/// <summary>
+		/// Element containing informative text describing the purpose of the
+		/// enclosing element.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Always optional.
+		/// </p>
+		/// <p>
+		/// Used primarily for user documentation of XML object definition
+		/// documents.
+		/// </p>
+		/// </remarks>
+		public const string DescriptionElement = "description";
+
+		/// <summary>
+		/// Specifies a <see cref="System.Type"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Does not have to be fully assembly qualified, but it is recommended
+		/// that the <see cref="System.Type"/> names of one's objects are
+		/// specified explicitly.
+		/// </p>
+		/// </remarks>
+		public const string TypeAttribute = "type";
+
+		/// <summary>
+		/// The name or alias of the parent object definition that a child
+		/// object definition inherits from.
+		/// </summary>
+		public const string ParentAttribute = "parent";
+
+		/// <summary>
+		/// Objects can be identified by an id, to enable reference checking.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// There are constraints on a valid XML id: if you want to reference
+		/// your object in .NET code using a name that's illegal as an XML id,
+		/// use the optional <c>"name"</c> attribute
+		/// (<see cref="ObjectDefinitionConstants.NameAttribute"/>).
+		/// If neither given, the objects <see cref="System.Type"/> name is
+		/// used as id.
+		/// </p>
+		/// </remarks>
+		public const string IdAttribute = "id";
+
+		/// <summary>
+		/// Can be used to create one or more aliases illegal in an id.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Multiple aliases can be separated by any number of spaces,
+		/// semicolons, or commas
+		/// (<see cref="Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ObjectNameDelimiters"/>).
+		/// </p>
+		/// <p>
+		/// Always optional.
+		/// </p>
+		/// </remarks>
+		public const string NameAttribute = "name";
+
+		/// <summary>
+		/// Is this object a "singleton" (one shared instance, which will
+		/// be returned by all calls to
+		/// <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/> with the id), or a
+		/// "prototype" (independent instance resulting from each call to
+		/// <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>).
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Singletons are most commonly used, and are ideal for multi-threaded
+		/// service objects.
+		/// </p>
+		/// </remarks>
+		/// <seealso cref="Spring.Objects.Factory.IObjectFactory"/>
+		public const string SingletonAttribute = "singleton";
+
+		/// <summary>
+		/// Controls object scope. Only applicable to ASP.NET web applications.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Scope can be defined as either application, session or request. It
+		/// defines when "singleton" instances are initialized, but has no
+		/// effect on prototype definitions.
+		/// </p>
+		/// </remarks>
+		public const string ScopeAttribute = "scope";
+
+		/// <summary>
+		/// The names of the objects that this object depends on being
+		/// initialized.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The object factory will guarantee that these objects
+		/// get initialized before this object definition.
+		/// </p>
+		/// <note>
+		/// Dependencies are normally expressed through object properties or
+		/// constructor arguments. This property should just be necessary for
+		/// other kinds of dependencies such as statics (*ugh*) or database
+		/// preparation on startup.
+		/// </note>
+		/// </remarks>
+		public const string DependsOnAttribute = "depends-on";
+
+		/// <summary>
+		/// Optional attribute for the name of the custom initialization method
+		/// to invoke after setting object properties.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The method <b>must</b> have no arguments.
+		/// </p>
+		/// </remarks>
+		public const string InitMethodAttribute = "init-method";
+
+		/// <summary>
+		/// Optional attribute for the name of the custom destroy method to
+		/// invoke on object factory shutdown.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Valid destroy methods have either of the following signatures...
+		/// <list type="bullet">
+		/// <item><c>void MethodName()</c></item>
+		/// <item><c>void MethodName(bool force)</c></item>
+		/// </list>
+		/// </p>
+		/// <note>
+		/// Only invoked on singleton objects!
+		/// </note>
+		/// </remarks>
+		public const string DestroyMethodAttribute = "destroy-method";
+
+		/// <summary>
+		/// A constructor argument : the constructor-arg tag can have an
+		/// optional type attribute, to specify the exact type of the
+		/// constructor argument
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Only needed  to avoid ambiguities, e.g. in case of 2 single
+		/// argument constructors that can both be converted from a
+		/// <see cref="System.String"/>.
+		/// </p>
+		/// </remarks>
+		public const string ConstructorArgElement = "constructor-arg";
+
+		/// <summary>
+		/// The constructor-arg tag can have an optional index attribute,
+		/// to specify the exact index in the constructor argument list.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Only needed to avoid ambiguities, e.g. in case of 2 arguments of
+		/// the same type.
+		/// </p>
+		/// </remarks>
+		public const string IndexAttribute = "index";
+
+		/// <summary>
+		/// The constructor-arg tag can have an optional named parameter
+		/// attribute, to specify a named parameter in the constructor
+		/// argument list.
+		/// </summary>
+		public const string ArgumentNameAttribute = "name";
+
+		/// <summary>
+		/// Is this object "abstract", i.e. not meant to be instantiated itself
+		/// but rather just serving as parent for concrete child object
+		/// definitions?
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Default is <see langword="false"/>. Specify <see langword="true"/>
+		/// to tell the object factory to not try to instantiate that
+		/// particular object in any case.
+		/// </p>
+		/// </remarks>
+		public const string AbstractAttribute = "abstract";
+
+		/// <summary>
+		/// A property definition : object definitions can have zero or more
+		/// properties.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Spring.NET supports primitives, references to other objects in the
+		/// same or related factories, lists, dictionaries, and name value
+		/// collections.
+		/// </p>
+		/// </remarks>
+		public const string PropertyElement = "property";
+
+		/// <summary>
+		/// A reference to another managed object or static
+		/// <see cref="System.Type"/>.
+		/// </summary>
+		public const string RefElement = "ref";
+
+		/// <summary>
+		/// ID refs must specify a name of the target object.
+		/// </summary>
+		public const string IdRefElement = "idref";
+
+		/// <summary>
+		/// A reference to the name of another managed object in the same
+		/// context.
+		/// </summary>
+		public const string ObjectRefAttribute = "object";
+
+		/// <summary>
+		/// A reference to the name of another managed object in the same
+		/// context.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Local references, using the "local" attribute, have to use object
+		/// ids; they can be checked by a parser, thus should be preferred for
+		/// references within the same object factory XML file.
+		/// </p>
+		/// </remarks>
+		public const string LocalRefAttribute = "local";
+
+		/// <summary>
+		/// Alternative to type attribute for factory-method usage.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If this is specified, no type attribute should be used. This should
+		/// be set to the name of an object in the current or ancestor
+		/// factories that contains the relevant factory method. This allows
+		/// the factory itself to be configured using Dependency Injection, and
+		/// an instance (rather than static) method to be used.
+		/// </p>
+		/// </remarks>
+		public const string FactoryObjectAttribute = "factory-object";
+
+		/// <summary>
+		/// Optional attribute specifying the name of a factory method to use
+		/// to create this object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Use constructor-arg elements to specify arguments to the factory
+		/// method, if it takes arguments. Autowiring does <b>not</b> apply to
+		/// factory methods.
+		/// </p>
+		/// <p>
+		/// If the "type" attribute is present, the factory method will be a
+		/// static method on the type specified by the "type" attribute on
+		/// this object definition. Often this will be the same type as that
+		/// of the constructed object - for example, when the factory method
+		/// is used as an alternative to a constructor. However, it may be on
+		/// a different type. In that case, the created object will *not* be
+		/// of the type specified in the "type" attribute. This is analogous
+		/// to <see cref="Spring.Objects.Factory.IFactoryObject"/> behaviour.
+		/// </p>
+		/// <p>
+		/// If the "factory-object" attribute is present, the "type" attribute
+		/// is not used, and the factory method will be an instance method on
+		/// the object returned from a
+		/// <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>
+		/// call with the specified object name. The factory object may be
+		/// defined as a singleton or a prototype.
+		/// </p>
+		/// <p>
+		/// The factory method can have any number of arguments. Use indexed
+		/// constructor-arg elements in conjunction with the factory-method
+		/// attribute.
+		/// </p>
+		/// <p>
+		/// Setter Injection can be used in conjunction with a factory method.
+		/// Method Injection cannot, as the factory method returns an instance,
+		/// which will be used when the container creates the object.
+		/// </p>
+		/// </remarks>
+		public const string FactoryMethodAttribute = "factory-method";
+
+		/// <summary>
+		/// A list can contain multiple inner object, ref, collection, or
+		/// value elements.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Lists are untyped, pending generics support, although references
+		/// will be strongly typed.
+		/// </p>
+		/// <p>
+		/// A list can also map to an array type. The necessary conversion is
+		/// automatically performed by the
+		/// <see cref="Spring.Objects.Factory.Support.AbstractObjectFactory"/>.
+		/// </p>
+		/// </remarks>
+		public const string ListElement = "list";
+
+		/// <summary>
+		/// A set can contain multiple inner object, ref, collection, or value
+		/// elements.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Sets are untyped, pending generics support, although references
+		/// will be strongly typed.
+		/// </p>
+		/// </remarks>
+		public const string SetElement = "set";
+
+		/// <summary>
+		/// A Spring.NET map is a mapping from a string key to object (a .NET
+		/// <see cref="System.Collections.IDictionary"/>).
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Dictionaries may be empty.
+		/// </p>
+		/// </remarks>
+		public const string DictionaryElement = "dictionary";
+
+		/// <summary>
+		/// A lookup key (for a dictionary or name / value collection).
+		/// </summary>
+		public const string KeyAttribute = "key";
+
+		/// <summary>
+		/// A lookup key (for a dictionary or name / value collection).
+		/// </summary>
+		public const string KeyElement = "key";
+
+        /// <summary>
+        /// Contains a string representation of a value.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is used by name-value, ctor argument, and property elements.
+        /// </p>
+        /// </remarks>
+        public const string ValueAttribute = "value";
+        
+        /// <summary>
+        /// Contains delimiters that should be used to split delimited string values.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is used by name-value element.
+        /// </p>
+        /// </remarks>
+        public const string DelimitersAttribute = "delimiters";
+        
+	    /// <summary>
+		/// A reference to another objects.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Used as a convenience shortcut on property and constructor-arg
+		/// elements to refer to other objects.
+		/// </p>
+		/// </remarks>
+		public const string RefAttribute = "ref";
+
+        /// <summary>
+        /// Contains a string representation of an expression.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is used by ctor argument and property elements.
+        /// </p>
+        /// </remarks>
+        public const string ExpressionAttribute = "expression";
+        
+	    /// <summary>
+		/// A map entry can be an inner object, ref, collection, or value.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The name of the property is given by the "key" attribute.
+		/// </p>
+		/// </remarks>
+		public const string EntryElement = "entry";
+
+		/// <summary>
+		/// Contains a string representation of a property value.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The property may be a string, or may be converted to the
+		/// required <see cref="System.Type"/> using the
+		/// <see cref="System.ComponentModel.TypeConverter"/> 
+		/// machinery. This makes it possible for application developers to
+		/// write custom <see cref="System.ComponentModel.TypeConverter"/>
+		/// implementations that can convert strings to objects.
+		/// </p>
+		/// <note>
+		/// This is recommended for simple objects only. Configure more complex
+		/// objects by setting properties to references to other objects.
+		/// </note>
+		/// </remarks>
+		public const string ValueElement = "value";
+
+        /// <summary>
+        /// Contains a string representation of an expression.
+        /// </summary>
+        public const string ExpressionElement = "expression";
+        
+	    /// <summary>
+		/// Denotes <see langword="null"/>  value.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Necessary because an empty "value" tag will resolve to an empty
+		/// <see cref="System.String"/>, which will not be resolved to
+		/// <see langword="null"/> value unless a special
+		/// <see cref="System.ComponentModel.TypeConverter"/> does so.
+		/// </p>
+		/// </remarks>
+		public const string NullElement = "null";
+
+		/// <summary>
+		/// 'name-values' elements differ from dictionary elements in that
+		/// values must be strings.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// May be empty.
+		/// </p>
+		/// </remarks>
+		public const string NameValuesElement = "name-values";
+
+		/// <summary>
+		/// Element content is the string value of the property.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The "key" attribute is the name of the property.
+		/// </p>
+		/// </remarks>
+		public const string AddElement = "add";
+
+		/// <summary>
+		/// The lazy initialization mode for an individual object definition.
+		/// </summary>
+		public const string LazyInitAttribute = "lazy-init";
+
+		/// <summary>
+		/// The dependency checking mode for an individual object definition.
+		/// </summary>
+		public const string DependencyCheckAttribute = "dependency-check";
+
+		/// <summary>
+		/// Defines a subscription to one or more events published by one or
+		/// more event sources.
+		/// </summary>
+		public const string ListenerElement = "listener";
+
+		/// <summary>
+		/// The name of an event handling method.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Defaults to <c>On${event}</c>.
+		/// <b>Note : this default will probably change before the first 1.0
+		/// release.</b>
+		/// </p>
+		/// </remarks>
+		public const string ListenerMethodAttribute = "method";
+
+		/// <summary>
+		/// The name of an event.
+		/// </summary>
+		public const string ListenerEventAttribute = "event";
+
+		/// <summary>
+		/// The autowiring mode for an individual object definition.
+		/// </summary>
+		public const string AutowireAttribute = "autowire";
+
+		/// <summary>
+		/// Shortcut alternative to specifying a key element in a
+		/// dictionary entry element with <c>&lt;ref object="..."/&gt;</c>.
+		/// </summary>
+		public const string DictionaryKeyRefShortcutAttribute = "key-ref";
+
+		/// <summary>
+		/// Shortcut alternative to specifying a value element in a
+		/// dictionary entry element with <c>&lt;ref object="..."/&gt;</c>.
+		/// </summary>
+		public const string DictionaryValueRefShortcutAttribute = "value-ref";
+
+		/// <summary>
+		/// The string of characters that delimit object names.
+		/// </summary>
+		public const string ObjectNameDelimiters = ",; ";
+
+		/// <summary>
+		/// A lookup method causes the IoC container to override a given method and return
+		/// the object with the name given in the attendant <c>object</c> attribute.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a form of Method Injection.
+		/// </p>
+		/// <p>
+		/// It's particularly useful as an alternative to implementing the
+		/// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/> interface,
+		/// in order to be able to make
+		/// <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>
+		/// calls for non-singleton instances at runtime. In this case, Method Injection
+		/// is a less invasive alternative.
+		/// </p>
+		/// </remarks>
+		public const string LookupMethodElement = "lookup-method";
+
+		/// <summary>
+		/// The name of a lookup method. This method <b>must</b> take no arguments.
+		/// </summary>
+		public const string LookupMethodNameAttribute = "name";
+
+		/// <summary>
+		/// The name of the object in the IoC container that the lookup method
+		/// must resolve to.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Often this object will be a prototype, in which case the lookup method
+		/// will return a distinct instance on every invocation. This is useful
+		/// for single-threaded objects.
+		/// </p>
+		/// </remarks>
+		public const string LookupMethodObjectNameAttribute = "object";
+
+		/// <summary>
+		/// A replaced method causes the IoC container to override a given method
+		/// with an (arbitrary) implementation at runtime.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This (again) is a form of Method Injection.
+		/// </p>
+		/// </remarks>
+		public const string ReplacedMethodElement = "replaced-method";
+
+		/// <summary>
+		/// Name of the method whose implementation should be replaced by the
+		/// IoC container.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If this method is not overloaded, there's no need to use arg-type 
+		/// subelements.
+		/// </p>
+		/// <p>
+		/// If this method is overloaded, <c>arg-type</c> subelements must be
+		/// used for all override definitions for the method.
+		/// </p>
+		/// </remarks>
+		public const string ReplacedMethodNameAttribute = "name";
+
+		/// <summary>
+		/// The object name of an implementation of the
+		/// <see cref="Spring.Objects.Factory.Support.IMethodReplacer"/> interface.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This may be a singleton or prototype. If it's a prototype, a new
+		/// instance will be used for each method replacement. Singleton usage
+		/// is the norm.
+		/// </p>
+		/// </remarks>
+		public const string ReplacedMethodReplacerNameAttribute = "replacer";
+
+		/// <summary>
+		/// Subelement of <c>replaced-method</c> identifying an argument for a
+		/// replaced method in the event of method overloading.
+		/// </summary>
+		/// <seealso cref="Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ReplacedMethodReplacerNameAttribute"/> 
+		public const string ReplacedMethodArgumentTypeElement = "arg-type";
+
+		/// <summary>
+		/// Specification of the <see cref="System.Type"/> of an overloaded method
+		/// argument as a <see cref="System.String"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// For convenience, this may be a substring of the FQN. E.g. all the following would match
+		/// <see cref="System.String"/>:
+		/// </p>
+		/// <p>
+		/// <list type="bullet">
+		/// <item>
+		/// <description>System.String</description>
+		/// </item>
+		/// <item>
+		/// <description>string</description>
+		/// </item>
+		/// <item>
+		/// <description>str</description>
+		/// </item>
+		/// </list>
+		/// </p>
+		/// </remarks>
+		/// <seealso cref="Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ReplacedMethodArgumentTypeElement"/> 
+		public const string ReplacedMethodArgumentTypeMatchAttribute = "match";
+
+		/// <summary>
+		/// Check everything.
+		/// </summary>
+		public static readonly string DependencyCheckAllAttributeValue
+			= Enum.GetName(typeof (DependencyCheckingMode), DependencyCheckingMode.All);
+
+		/// <summary>
+		/// Just check primitive (string, int, etc) values.
+		/// </summary>
+		public static readonly string DependencyCheckSimpleAttributeValue
+			= Enum.GetName(typeof (DependencyCheckingMode), DependencyCheckingMode.Simple);
+
+		/// <summary>
+		/// Check object references.
+		/// </summary>
+		public static readonly string DependencyCheckObjectsAttributeValue
+			= Enum.GetName(typeof (DependencyCheckingMode), DependencyCheckingMode.Objects);
+
+		/// <summary>
+		/// Autowire by name.
+		/// </summary>
+		public static readonly string AutowireByNameValue
+			= Enum.GetName(typeof (AutoWiringMode), AutoWiringMode.ByName);
+
+		/// <summary>
+		/// Autowire by <see cref="System.Type"/>.
+		/// </summary>
+		public static readonly string AutowireByTypeValue
+			= Enum.GetName(typeof (AutoWiringMode), AutoWiringMode.ByType);
+
+		/// <summary>
+		/// Autowiring by constructor.
+		/// </summary>
+		public static readonly string AutowireConstructorValue
+			= Enum.GetName(typeof (AutoWiringMode), AutoWiringMode.Constructor);
+
+		/// <summary>
+		/// The autowiring strategy is to be determined by introspection
+		/// of the object's <see cref="System.Type"/>.
+		/// </summary>
+		public static readonly string AutowireAutoDetectValue
+			= Enum.GetName(typeof (AutoWiringMode), AutoWiringMode.AutoDetect);
+
+		#region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Xml.ObjectDefinitionConstants"/>
+		/// class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such has no publicly visible
+		/// constructors.
+		/// </p>
+		/// </remarks>
+		private ObjectDefinitionConstants()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs
new file mode 100644
index 00000000..3696697f
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs
@@ -0,0 +1,210 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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.Globalization;
+using System.Xml;
+using Common.Logging;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Util;
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Sateful class used to parse XML object definitions.
+    /// </summary>
+    /// <remarks>Not all parsing code has been refactored into this class.</remarks>
+    /// <author>Rob Harrop</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ObjectDefinitionParserHelper.cs,v 1.7 2007/08/07 22:05:20 markpollack Exp $</version>
+    public class ObjectDefinitionParserHelper
+    {
+
+        #region Fields
+        /// <summary>
+        /// The shared <see cref="Common.Logging.ILog"/> instance for this class (and derived classes).
+        /// </summary>
+        protected static readonly ILog log =
+            LogManager.GetLogger(typeof(ObjectDefinitionParserHelper));
+
+        private DocumentDefaultsDefinition defaults;
+
+        private XmlReaderContext readerContext;
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObjectDefinitionParserHelper"/> class.
+        /// </summary>
+        /// <param name="readerContext">The reader context.</param>
+        public ObjectDefinitionParserHelper(XmlReaderContext readerContext)
+        {
+            AssertUtils.ArgumentNotNull(readerContext, "readerContext");
+            this.readerContext = readerContext;
+        }
+
+        /// <summary>
+        /// Gets the defaults definition object, or <code>null</code> if the 
+        /// default have not yet been initialized.
+        /// </summary>
+        /// <value>The defaults.</value>
+        public DocumentDefaultsDefinition Defaults
+        {
+            get { return defaults; }
+        }
+
+
+        /// <summary>
+        /// Gets the reader context.
+        /// </summary>
+        /// <value>The reader context.</value>
+        public XmlReaderContext ReaderContext
+        {
+            get { return readerContext; }
+        }
+
+        /// <summary>
+        /// Initialize the default lazy-init, dependency check, and autowire settings.
+        /// </summary>
+        /// <param name="root">The root element</param>
+        public void InitDefaults(XmlElement root)
+        {
+            DocumentDefaultsDefinition ddd = new DocumentDefaultsDefinition();
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug("Loading object definitions...");
+            }
+
+            #endregion
+
+            ddd.LazyInit = root.GetAttribute(ObjectDefinitionConstants.DefaultLazyInitAttribute);
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(
+                    string.Format(
+                        "Default lazy init '{0}'.",
+                        ddd.LazyInit));
+            }
+
+            #endregion
+
+            ddd.DependencyCheck = root.GetAttribute(ObjectDefinitionConstants.DefaultDependencyCheckAttribute);
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(
+                    string.Format(
+                        "Default dependency check '{0}'.",
+                        ddd.DependencyCheck));
+            }
+
+            #endregion
+
+            ddd.Autowire = root.GetAttribute(ObjectDefinitionConstants.DefaultAutowireAttribute);
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(
+                    string.Format(
+                        "Default autowire '{0}'.",
+                        ddd.Autowire));
+            }
+
+            #endregion
+
+            defaults = ddd;
+        }
+
+
+        /// <summary>
+        /// Determines whether the Spring object namespace is equal to the the specified namespace URI.
+        /// </summary>
+        /// <param name="namespaceUri">The namespace URI.</param>
+        /// <returns>
+        /// 	<c>true</c> if is the default Spring namespace; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsDefaultNamespace(string namespaceUri)
+        {
+            return
+                (!StringUtils.HasLength(namespaceUri) || ObjectsNamespaceParser.Namespace.Equals(namespaceUri));
+        }
+
+
+        /// <summary>
+        /// Decorates the object definition if required.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        /// <param name="holder">The holder.</param>
+        /// <returns></returns>
+        public ObjectDefinitionHolder DecorateObjectDefinitionIfRequired(XmlElement element, ObjectDefinitionHolder holder)
+        {
+
+            //TODO decoration processing.
+            return holder;
+        }
+
+
+        /// <summary>
+        /// Determines whether the string represents a 'true' boolean value.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>
+        /// 	<c>true</c> if is 'true' string value; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsTrueStringValue(string value)
+        {
+            return ObjectDefinitionConstants.TrueValue.Equals(value.ToLower(CultureInfo.CurrentCulture));
+        }
+
+        /// <summary>
+        /// Convenience method to create a builder for a root object definition.
+        /// </summary>
+        /// <param name="objectTypeName">Name of the object type.</param>
+        /// <returns>A builder for a root object definition.</returns>
+        public ObjectDefinitionBuilder CreateRootObjectDefinitionBuilder(string objectTypeName)
+        {
+            return ObjectDefinitionBuilder.RootObjectDefinition(this.readerContext.ObjectDefinitionFactory, objectTypeName);
+        }
+
+        /// <summary>
+        /// Convenience method to create a builder for a root object definition.
+        /// </summary>
+        /// <param name="objectType">Type of the object.</param>
+        /// <returns>a builder for a root object definition</returns>
+        public ObjectDefinitionBuilder CreateRootObjectDefinitionBuilder(Type objectType)
+        {
+            return ObjectDefinitionBuilder.RootObjectDefinition(this.readerContext.ObjectDefinitionFactory, objectType);
+        }
+
+
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectFactorySectionHandler.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectFactorySectionHandler.cs
new file mode 100644
index 00000000..47cf97c1
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectFactorySectionHandler.cs
@@ -0,0 +1,92 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Configuration;
+using System.Xml;
+
+using Spring.Core.IO;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Creates an <see cref="Spring.Objects.Factory.IObjectFactory"/> instance
+    /// populated with the object definitions supplied in the configuration
+    /// section. 
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Applications will typically want to use an
+    /// <see cref="Spring.Context.IApplicationContext"/>, and instantiate it
+    /// via the use of the <see cref="Spring.Context.Support.ContextHandler"/>
+    /// class (which is similar in functionality to this class). This class is
+    /// provided for those times when only an
+    /// <see cref="Spring.Objects.Factory.IObjectFactory"/> is required.
+    /// </p>
+    /// <para>Creates an instance of the class XmlObjectFactory</para>
+    /// </remarks>
+    /// <example>
+    /// <p>
+    /// 
+    /// </p>
+    /// </example>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ObjectFactorySectionHandler.cs,v 1.3 2007/08/08 17:47:13 bbaia Exp $</version>
+    public class ObjectFactorySectionHandler : IConfigurationSectionHandler
+    {
+        /// <summary>
+        /// Creates a new instance of the <see cref="ObjectFactorySectionHandler"/>
+        /// class.
+        /// </summary>
+        public ObjectFactorySectionHandler()
+        {}
+
+        /// <summary>
+        /// Creates a <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// instance populated with the object definitions supplied in the
+        /// configuration section.
+        /// </summary>
+        /// <param name="parent">
+        /// The configuration settings in a corresponding parent configuration
+        /// section.
+        /// </param>
+        /// <param name="configContext">
+        /// The configuration context when called from the ASP.NET
+        /// configuration system. Otherwise, this parameter is reserved and
+        /// is <see langword="null"/>.
+        /// </param>
+        /// <param name="section">
+        /// The <see cref="System.Xml.XmlNode"/> for the section.
+        /// </param>
+        /// <returns>
+        /// A <see cref="Spring.Objects.Factory.IObjectFactory"/> instance
+        /// populated with the object definitions supplied in the configuration
+        /// section.
+        /// </returns>
+        public object Create(
+            object parent, object configContext, XmlNode section)
+        {
+            return new XmlObjectFactory(new ConfigSectionResource(section as XmlElement), true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectsNamespaceParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectsNamespaceParser.cs
new file mode 100644
index 00000000..221da168
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectsNamespaceParser.cs
@@ -0,0 +1,1421 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Xml;
+
+using Common.Logging;
+
+using Spring.Collections;
+using Spring.Core;
+using Spring.Core.IO;
+using Spring.Core.TypeResolution;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Default implementation of the
+    /// <see cref="INamespaceParser"/> interface.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Parses object definitions according to the standard Spring.NET schema.
+    /// </p>
+    /// <p>
+    /// This schema is <b>typically</b> located at
+    /// <a href="http://www.springframework.net/xsd/spring-objects.xsd">http://www.springframework.net/xsd/spring-objects.xsd</a>.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: ObjectsNamespaceParser.cs,v 1.7 2007/11/26 14:15:54 bbaia Exp $</version>
+    [
+        NamespaceParser(
+            Namespace = "http://www.springframework.net",
+			SchemaLocationAssemblyHint = typeof(ObjectsNamespaceParser),
+			SchemaLocation = "/Spring.Objects.Factory.Xml/spring-objects-1.1.xsd"
+        )			
+    ]
+    public class ObjectsNamespaceParser : INamespaceParser
+    {
+        /// <summary>
+        /// The namespace URI for the standard Spring.NET object definition schema.
+        /// </summary>
+        public const string Namespace = "http://www.springframework.net";
+
+        /// <summary>
+        /// The shared <see cref="Common.Logging.ILog"/> instance for this class (and derived classes).
+        /// </summary>
+        protected static readonly ILog log =
+            LogManager.GetLogger(typeof(ObjectsNamespaceParser));
+
+        #region IXmlObjectDefinitionParser Members
+
+        /// <summary>
+        /// Invoked by <see cref="NamespaceParserRegistry"/> after construction but before any
+        /// elements have been parsed.
+        /// </summary>
+        /// <remarks>This is a NoOp</remarks>
+        public void Init()
+        {
+            
+        }
+
+        #endregion
+
+
+        /// <summary>
+        /// Parse the specified element and register any resulting
+        /// IObjectDefinitions with the IObjectDefinitionRegistry that is
+        /// embedded in the supplied ParserContext.
+        /// </summary>
+        /// <param name="element">The element to be parsed into one or more IObjectDefinitions</param>
+        /// <param name="parserContext">The object encapsulating the current state of the parsing
+        /// process.</param>
+        /// <returns>
+        /// The primary IObjectDefinition (can be null as explained above)
+        /// </returns>
+        /// <remarks>
+        /// Implementations should return the primary IObjectDefinition
+        /// that results from the parse phase if they wish to used nested
+        /// inside (for example) a <code>&lt;property&gt;</code> tag.
+        /// <para>Implementations may return null if they will not
+        /// be used in a nested scenario.
+        /// </para>
+        /// </remarks>
+        public virtual IObjectDefinition ParseElement(XmlElement element, ParserContext parserContext)
+        {
+            
+            if (element.LocalName == ObjectDefinitionConstants.ImportElement)
+            {
+                ImportObjectDefinitionResource(element, parserContext);
+            }
+            else if (element.LocalName == ObjectDefinitionConstants.AliasElement)
+            {
+                ParseAlias(element, parserContext.ReaderContext.Registry);
+            }
+            else if (element.LocalName == ObjectDefinitionConstants.ObjectElement)
+            {
+                RegisterObjectDefinition(element, parserContext);
+            }
+                        
+            return null;
+        }
+
+
+        /// <summary>
+        /// Parse the specified XmlNode and decorate the supplied ObjectDefinitionHolder,
+        /// returning the decorated definition.
+        /// </summary>
+        /// <remarks>The XmlNode may either be an XmlAttribute or an XmlElement, depending on
+        /// whether a custom attribute or element is being parsed.
+        /// <para>Implementations may choose to return a completely new definition,
+        /// which will replace the original definition in the resulting IApplicationContext/IObjectFactory.
+        /// </para>
+        /// <para>The supplied ParserContext can be used to register any additional objects needed to support
+        /// the main definition.</para>
+        /// </remarks>
+        /// <param name="node">The source element or attribute that is to be parsed.</param>
+        /// <param name="definition">The current object definition.</param>
+        /// <param name="parserContext">The object encapsulating the current state of the parsing
+        /// process.</param>
+        /// <returns>The decorated definition (to be registered in the IApplicationContext/IObjectFactory),
+        /// or simply the original object definition if no decoration is required.  A null value is strickly
+        /// speaking invalid, but will leniently treated like the case where the original object definition
+        /// gets returned.</returns>
+        public ObjectDefinitionHolder Decorate(XmlNode node, ObjectDefinitionHolder definition,
+                                               ParserContext parserContext)
+        {
+            return null;
+        }
+
+        private void ParseAlias(XmlElement aliasElement, IObjectDefinitionRegistry registry)
+        {
+            string name = aliasElement.GetAttribute(ObjectDefinitionConstants.NameAttribute);
+            string alias = aliasElement.GetAttribute(ObjectDefinitionConstants.AliasAttribute);            
+            registry.RegisterAlias(name, alias);
+        }
+         
+
+        
+
+        /// <summary>
+        /// Loads external XML object definitions from the resource described by the supplied
+        /// <paramref name="resource"/>.
+        /// </summary>
+        /// <param name="resource">The XML element describing the resource.</param>
+        /// <param name="parserContext">The parser context.</param>
+        /// <exception cref="Spring.Objects.Factory.ObjectDefinitionStoreException">
+        /// If the resource could not be imported.
+        /// </exception>
+        protected virtual void ImportObjectDefinitionResource(XmlElement resource, ParserContext parserContext)
+        {
+            string location = resource.GetAttribute(ObjectDefinitionConstants.ImportResourceAttribute);
+            try
+            {
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(string.Format(
+                        CultureInfo.InvariantCulture,
+                        "Attempting to import object definitions from '{0}'.", location));
+                }
+
+                #endregion
+
+                IResource importResource = parserContext.ReaderContext.Resource.CreateRelative(location);
+                parserContext.ReaderContext.Reader.LoadObjectDefinitions(importResource);
+            }
+            catch (IOException ex)
+            {
+                parserContext.ReaderContext.ReportException(resource, null, string.Format(
+                    CultureInfo.InvariantCulture,
+                    "Invalid relative resource location '{0}' to import object definitions from.",
+                    location), ex);
+            }
+        }
+        
+
+        /// <summary>Parses an event listener definition.</summary>
+        /// <param name="name">
+        /// The name associated with the object that the event handler is being defined on.
+        /// </param>
+        /// <param name="events">The events being populated.</param>
+        /// <param name="element">
+        /// The element containing the event listener definition.
+        /// </param>
+        /// <param name="parserHelper">
+        /// The namespace-aware parser.
+        /// </param>
+        protected virtual void ParseEventListenerDefinition(
+            string name, EventValues events, XmlElement element, ObjectDefinitionParserHelper parserHelper)
+        {
+            // get an appropriate IEventHandlerValue instance based upon the
+            // attribute values of the listener element...
+            IEventHandlerValue myHandler = ObjectDefinitionReaderUtils.CreateEventHandlerValue(
+                element.GetAttribute(ObjectDefinitionConstants.ListenerMethodAttribute),
+                element.GetAttribute(ObjectDefinitionConstants.ListenerEventAttribute));
+
+            // and then get the source of the event (another managed object instance
+            // or a Type reference (i.e. a static event exposed on a class)...
+            XmlElement sourceElement = this.SelectSingleNode(element, ObjectDefinitionConstants.RefElement) as XmlElement;
+
+            XmlAttribute sourceAtt = sourceElement.Attributes[0];
+            if (StringUtils.IsNullOrEmpty(sourceAtt.Value))
+            {
+                parserHelper.ReaderContext.ReportFatalException(sourceElement, string.Format(
+                    CultureInfo.InvariantCulture,
+                    "The single attribute of the <{0}/> element cannot be empty. Specify the " +
+                        "object id (alias) or the full, assembly qualified Type name that is the " +
+                        "source of the event.",
+                    ObjectDefinitionConstants.RefElement));
+                return;
+            }
+            switch (sourceAtt.LocalName)
+            {
+                case ObjectDefinitionConstants.LocalRefAttribute:
+                case ObjectDefinitionConstants.ObjectRefAttribute:
+                    // we're wiring up to an event exposed on another managed object (instance)
+                    RuntimeObjectReference ror = new RuntimeObjectReference(sourceAtt.Value);
+                    myHandler.Source = ror;
+                    break;
+                case ObjectDefinitionConstants.TypeAttribute:
+                    // we're wiring up to a static event exposed on a Type (class)
+                    myHandler.Source = parserHelper.ReaderContext.Reader.Domain == null ?
+                        (object) sourceAtt.Value :
+                        (object)TypeResolutionUtils.ResolveType(sourceAtt.Value);
+                    break;
+            }
+            events.AddHandler(myHandler);
+        }
+
+        
+
+        /// <summary>
+        /// Parse an object definition and register it with the object factory..
+        /// </summary>
+        /// <param name="element">The element containing the object definition.</param>
+        /// <param name="parserContext">The parser context.</param>
+        /// <seealso cref="Spring.Objects.Factory.Support.ObjectDefinitionReaderUtils.RegisterObjectDefinition"/>
+        protected void RegisterObjectDefinition(XmlElement element, ParserContext parserContext)
+        {
+            ObjectDefinitionHolder holder = null;
+            try
+            {
+                holder = ParseObjectDefinition(element, parserContext);
+                if (holder == null)
+                {
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+              throw new ObjectDefinitionStoreException(string.Format("Failed parsing object definition '{0}'", element.OuterXml), ex);
+            }
+
+
+            holder = parserContext.ParserHelper.DecorateObjectDefinitionIfRequired(element, holder);
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(
+                    string.Format(
+                        CultureInfo.InvariantCulture,
+                        "Registering object definition with id '{0}'.", holder.ObjectName));
+            }
+
+            #endregion
+
+            ObjectDefinitionReaderUtils.RegisterObjectDefinition(holder, parserContext.ReaderContext.Registry);
+        }
+        
+
+        /// <summary>
+        /// Parse a standard object definition into a
+        /// <see cref="Spring.Objects.Factory.Config.ObjectDefinitionHolder"/>,
+        /// including object name and aliases.
+        /// </summary>
+        /// <param name="element">The element containing the object definition.</param>
+        /// <param name="parserContext">The parser context.</param>
+        /// <returns>
+        /// The object (definition) wrapped within an
+        /// <see cref="Spring.Objects.Factory.Config.ObjectDefinitionHolder"/>
+        /// instance.
+        /// </returns>
+        /// <remarks>
+        /// 	<p>
+        /// Object elements specify their canonical name via the "id" attribute
+        /// and their aliases as a delimited "name" attribute.
+        /// </p>
+        /// 	<p>
+        /// If no "id" is specified, uses the first name in the "name" attribute
+        /// as the canonical name, registering all others as aliases.
+        /// </p>
+        /// </remarks>
+        protected ObjectDefinitionHolder ParseObjectDefinition(XmlElement element, ParserContext parserContext)
+        {
+            string id = element.GetAttribute(ObjectDefinitionConstants.IdAttribute);
+            string name = element.GetAttribute(ObjectDefinitionConstants.NameAttribute);
+            ArrayList aliases = new ArrayList();
+            if (StringUtils.HasText(name))
+            {
+                aliases.AddRange(GetObjectNames(name));
+            }
+            // if we ain't got an id, check if object is page definition or assign any existing (first) alias...
+            if (StringUtils.IsNullOrEmpty(id))
+            {
+                id = CalculateId(element, aliases);
+            }
+            
+
+            IConfigurableObjectDefinition definition = ParseObjectDefinition(element, id, parserContext.ParserHelper);
+            if (StringUtils.IsNullOrEmpty(id))
+            {
+                id = ObjectDefinitionReaderUtils.GenerateObjectName(definition, parserContext.Registry);
+
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(string.Format(
+                        "Neither XML '{0}' nor '{1}' specified - using object " +
+                            "class name [{2}] as the id.",
+                        id, ObjectDefinitionConstants.IdAttribute, ObjectDefinitionConstants.NameAttribute));
+                }
+
+                #endregion
+            }
+            string[] aliasesArray = (string[]) aliases.ToArray(typeof(string));
+            return new ObjectDefinitionHolder(definition, id, aliasesArray);
+        }
+
+        /// <summary>
+        /// Calculates an id for an object definition.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Called when an object definition has not been explicitly defined
+        /// with an id.
+        /// </p>
+        /// </remarks>
+        /// <param name="element">
+        /// The element containing the object definition.
+        /// </param>
+        /// <param name="aliases">
+        /// The list of names defined for the object; may be <see lang="null"/>
+        /// or even empty.
+        /// </param>
+        /// <returns>
+        /// A calculated object definition id.
+        /// </returns>
+        protected virtual string CalculateId(XmlElement element, ArrayList aliases)
+        {
+            string id = null;
+            if (aliases.Count > 0)
+            {
+                string firstAlias = aliases[0] as string;
+                aliases.RemoveAt(0);
+                id = firstAlias;
+            }
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                StringBuilder buffer = new StringBuilder();
+                foreach (string alias in aliases)
+                {
+                    buffer.Append(alias).Append(",");
+                }
+                log.Debug(string.Format("No XML 'id' specified - using '{0}' as the id and '{1}' as aliases.",
+                                        id, buffer.ToString()));
+            }
+
+            #endregion
+
+            return id;
+        }
+
+        /// <summary>
+        /// Parse a standard object definition.
+        /// </summary>
+        /// <param name="element">The element containing the object definition.</param>
+        /// <param name="id">The id of the object definition.</param>
+        /// <param name="parserHelper">parsing state holder</param>
+        /// <returns>The object (definition).</returns>
+        protected virtual IConfigurableObjectDefinition ParseObjectDefinition(
+            XmlElement element, string id, ObjectDefinitionParserHelper parserHelper)
+        {
+            string typeName = null;
+            try
+            {
+                if (element.HasAttribute(ObjectDefinitionConstants.TypeAttribute))
+                {
+                    typeName = element.GetAttribute(ObjectDefinitionConstants.TypeAttribute);
+                    if (StringUtils.IsNullOrEmpty(typeName))
+                    {
+                        throw new ObjectDefinitionStoreException(
+                            parserHelper.ReaderContext.Resource, id,
+                            "The 'type' attribute does not need to be present, but if it is it must not be empty: got '" + typeName + "'.");
+                    }
+                }
+                string parent = element.GetAttribute(ObjectDefinitionConstants.ParentAttribute);
+
+
+                AbstractObjectDefinition od
+                    = parserHelper.ReaderContext.ObjectDefinitionFactory.CreateObjectDefinition(
+                        typeName, parent, parserHelper.ReaderContext.Reader.Domain);
+
+
+                MutablePropertyValues pvs = GetPropertyValueSubElements(id, element, parserHelper);
+                ConstructorArgumentValues arguments
+                    = GetConstructorArgSubElements(id, element, parserHelper);
+                EventValues events = GetEventHandlerSubElements(id, element, parserHelper);
+                MethodOverrides methodOverrides = GetMethodOverrideSubElements(id, element, parserHelper);
+
+                bool isPage = StringUtils.HasText(typeName) && typeName!= null && typeName.ToLower().EndsWith(".aspx");
+                if (!isPage)
+                {
+                    od.ConstructorArgumentValues = arguments;
+                }
+
+                od.PropertyValues = pvs;
+                od.MethodOverrides = methodOverrides;
+                od.EventHandlerValues = events;
+                if (element.HasAttribute(ObjectDefinitionConstants.DependsOnAttribute))
+                {
+                    string dependsOn = element.GetAttribute(ObjectDefinitionConstants.DependsOnAttribute);
+                    od.DependsOn = GetObjectNames(dependsOn);
+                }
+                od.FactoryMethodName = element.GetAttribute(ObjectDefinitionConstants.FactoryMethodAttribute);
+                od.FactoryObjectName = element.GetAttribute(ObjectDefinitionConstants.FactoryObjectAttribute);
+                string dependencyCheck = element.GetAttribute(ObjectDefinitionConstants.DependencyCheckAttribute);
+                if (ObjectDefinitionConstants.DefaultValue.Equals(dependencyCheck))
+                {
+                    dependencyCheck = parserHelper.Defaults.DependencyCheck;
+                }
+                od.DependencyCheck = GetDependencyCheck(dependencyCheck);
+                string autowire = element.GetAttribute(ObjectDefinitionConstants.AutowireAttribute);
+                if (ObjectDefinitionConstants.DefaultValue.Equals(autowire))
+                {
+                    autowire = parserHelper.Defaults.Autowire;
+                }
+                od.AutowireMode = GetAutowireMode(autowire);
+                string initMethodName = element.GetAttribute(ObjectDefinitionConstants.InitMethodAttribute);
+                if (StringUtils.HasText(initMethodName))
+                {
+                    od.InitMethodName = initMethodName;
+                }
+                string destroyMethodName = element.GetAttribute(ObjectDefinitionConstants.DestroyMethodAttribute);
+                if (StringUtils.HasText(destroyMethodName))
+                {
+                    od.DestroyMethodName = destroyMethodName;
+                }
+                if (element.HasAttribute(ObjectDefinitionConstants.SingletonAttribute))
+                {
+                    od.IsSingleton = IsTrueStringValue(element.GetAttribute(ObjectDefinitionConstants.SingletonAttribute).ToLower(CultureInfo.CurrentCulture));
+                }
+                string lazyInit = element.GetAttribute(ObjectDefinitionConstants.LazyInitAttribute);
+                if (ObjectDefinitionConstants.DefaultValue.Equals(lazyInit) && od.IsSingleton)
+                {
+                    // just apply default to singletons, as lazy-init has no meaning for prototypes...
+                    lazyInit = parserHelper.Defaults.LazyInit;
+                }
+                od.IsLazyInit = IsTrueStringValue(lazyInit);
+
+                // try to get the line info
+                string resourceDescription = parserHelper.ReaderContext.Resource.Description;
+                if (StringUtils.HasText(resourceDescription))
+                {
+                    int line = ConfigurationUtils.GetLineNumber(element);
+                    if (line > 0)
+                    {
+                        resourceDescription += " line " + line;
+                    }
+                }
+                od.ResourceDescription = resourceDescription;
+
+                string isAbstract = element.GetAttribute(ObjectDefinitionConstants.AbstractAttribute);
+                if (StringUtils.HasText(isAbstract))
+                {
+                    od.IsAbstract = IsTrueStringValue(isAbstract);
+                }
+                return od;
+            }
+            catch (TypeLoadException ex)
+            {
+                parserHelper.ReaderContext.ReportException(
+                    element,
+                    id,
+                    string.Format(
+                        "Object class [{0}] not found.",
+                        typeName),
+                    ex);
+            }
+            catch (ApplicationException ex)
+            {
+                parserHelper.ReaderContext.ReportException(element, id, string.Empty, ex);
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Parse method override argument subelements of the given object element.
+        /// </summary>
+        protected MethodOverrides GetMethodOverrideSubElements(
+            string name, XmlElement element, ObjectDefinitionParserHelper parserHelper)
+        {
+            MethodOverrides overrides = new MethodOverrides();
+            foreach (XmlNode node in this.SelectNodes(element, ObjectDefinitionConstants.LookupMethodElement))
+            {
+                ParseLookupMethodElement(name, overrides, (XmlElement) node, parserHelper);
+            }
+            foreach (XmlNode node in this.SelectNodes(element, ObjectDefinitionConstants.ReplacedMethodElement))
+            {
+                ParseReplacedMethodElement(name, overrides, (XmlElement) node, parserHelper);
+            }
+            return overrides;
+        }
+
+        /// <summary>
+        /// Parse <see cref="ObjectDefinitionConstants.LookupMethodElement"/> element and add parsed element to <paramref name="overrides"/>
+        /// </summary>
+        protected void ParseLookupMethodElement(
+            string name, MethodOverrides overrides, XmlElement element, ObjectDefinitionParserHelper parserHelper)
+        {
+            string methodName = element.GetAttribute(ObjectDefinitionConstants.LookupMethodNameAttribute);
+            string targetObjectName = element.GetAttribute(ObjectDefinitionConstants.LookupMethodObjectNameAttribute);
+            if (StringUtils.IsNullOrEmpty(methodName))
+            {
+                throw new ObjectDefinitionStoreException(
+                    parserHelper.ReaderContext.Resource, name,
+                    string.Format("The '{0}' attribute is required for the '{1}' element.",
+                                  ObjectDefinitionConstants.LookupMethodNameAttribute, ObjectDefinitionConstants.LookupMethodElement));
+            }
+            if (StringUtils.IsNullOrEmpty(targetObjectName))
+            {
+                throw new ObjectDefinitionStoreException(
+                    parserHelper.ReaderContext.Resource, name,
+                    string.Format("The '{0}' attribute is required for the '{1}' element.",
+                                  ObjectDefinitionConstants.LookupMethodObjectNameAttribute, ObjectDefinitionConstants.LookupMethodElement));
+            }
+            overrides.Add(new LookupMethodOverride(methodName, targetObjectName));
+        }
+
+        /// <summary>
+        /// Parse <see cref="ObjectDefinitionConstants.ReplacedMethodElement"/> element and add parsed element to <paramref name="overrides"/>
+        /// </summary>
+        protected void ParseReplacedMethodElement(
+            string name, MethodOverrides overrides, XmlElement element, ObjectDefinitionParserHelper parserHelper)
+        {
+            string methodName = element.GetAttribute(ObjectDefinitionConstants.ReplacedMethodNameAttribute);
+            string targetReplacerObjectName = element.GetAttribute(ObjectDefinitionConstants.ReplacedMethodReplacerNameAttribute);
+            if (StringUtils.IsNullOrEmpty(methodName))
+            {
+                throw new ObjectDefinitionStoreException(
+                    parserHelper.ReaderContext.Resource, name,
+                    string.Format("The '{0}' attribute is required for the '{1}' element.",
+                                  ObjectDefinitionConstants.ReplacedMethodNameAttribute, ObjectDefinitionConstants.ReplacedMethodElement));
+            }
+            if (StringUtils.IsNullOrEmpty(targetReplacerObjectName))
+            {
+                throw new ObjectDefinitionStoreException(
+                    parserHelper.ReaderContext.Resource, name,
+                    string.Format("The '{0}' attribute is required for the '{1}' element.",
+                                  ObjectDefinitionConstants.ReplacedMethodReplacerNameAttribute, ObjectDefinitionConstants.ReplacedMethodElement));
+            }
+            ReplacedMethodOverride theOverride = new ReplacedMethodOverride(methodName, targetReplacerObjectName);
+            foreach (XmlNode node in this.SelectNodes(element, ObjectDefinitionConstants.ReplacedMethodArgumentTypeElement))
+            {
+                XmlElement argElement = (XmlElement) node;
+                string match = argElement.GetAttribute(ObjectDefinitionConstants.ReplacedMethodArgumentTypeMatchAttribute);
+                if (StringUtils.IsNullOrEmpty(match))
+                {
+                    throw new ObjectDefinitionStoreException(
+                        parserHelper.ReaderContext.Resource, name,
+                        string.Format("The '{0}' attribute is required for the '{1}' element.",
+                                      ObjectDefinitionConstants.ReplacedMethodArgumentTypeMatchAttribute, ObjectDefinitionConstants.ReplacedMethodArgumentTypeElement));
+                }
+                theOverride.AddTypeIdentifier(match);
+            }
+            overrides.Add(theOverride);
+        }
+
+        /// <summary>
+        /// Parse constructor argument subelements of the given object element.
+        /// </summary>
+        protected ConstructorArgumentValues GetConstructorArgSubElements(
+            string name, XmlElement element, ObjectDefinitionParserHelper parserHelper)
+        {
+            ConstructorArgumentValues arguments = new ConstructorArgumentValues();
+            foreach (XmlNode node in this.SelectNodes(element, ObjectDefinitionConstants.ConstructorArgElement))
+            {
+                ParseConstructorArgElement(name, arguments, (XmlElement) node, parserHelper);
+            }
+            return arguments;
+        }
+
+        /// <summary>
+        /// Parse event handler subelements of the given object element.
+        /// </summary>
+        protected EventValues GetEventHandlerSubElements(
+            string name, XmlElement element, ObjectDefinitionParserHelper parserHelper)
+        {
+            EventValues events = new EventValues();
+            foreach (XmlNode node in this.SelectNodes(element, ObjectDefinitionConstants.ListenerElement))
+            {
+                ParseEventListenerDefinition(name, events, (XmlElement) node, parserHelper);
+            }
+            return events;
+        }
+
+        /// <summary>
+        /// Parse property value subelements of the given object element.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object (definition) associated with the property element (s)
+        /// </param>
+        /// <param name="element">
+        /// The element containing the top level object definition.
+        /// </param>
+        /// <param name="parserHelper">
+        /// The namespace-aware parser.
+        /// </param>
+        /// <returns>
+        /// The property (s) associated with the object (definition).
+        /// </returns>
+        protected virtual MutablePropertyValues GetPropertyValueSubElements(
+            string name, XmlElement element, ObjectDefinitionParserHelper parserHelper)
+        {
+            MutablePropertyValues properties = new MutablePropertyValues();
+            foreach (XmlNode node in this.SelectNodes(element, ObjectDefinitionConstants.PropertyElement))
+            {
+                ParsePropertyElement(name, properties, (XmlElement) node, parserHelper);
+            }
+            return properties;
+        }
+
+        /// <summary>
+        /// Parse a constructor-arg element.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object (definition) associated with the ctor arg.
+        /// </param>
+        /// <param name="arguments">
+        /// The list of constructor args associated with the object (definition).
+        /// </param>
+        /// <param name="element">
+        /// The name of the element containing the ctor arg definition.
+        /// </param>
+        /// <param name="parserHelper">
+        /// The namespace-aware parser.
+        /// </param>
+        protected virtual void ParseConstructorArgElement(
+            string name, ConstructorArgumentValues arguments, XmlElement element, ObjectDefinitionParserHelper parserHelper)
+        {
+            object val = GetPropertyValue(element, name, parserHelper);
+            string indexAttr = element.GetAttribute(ObjectDefinitionConstants.IndexAttribute);
+            string typeAttr = element.GetAttribute(ObjectDefinitionConstants.TypeAttribute);
+            string nameAttr = element.GetAttribute(ObjectDefinitionConstants.ArgumentNameAttribute);
+
+            // only one of the 'index' or 'name' attributes can be present
+            if (StringUtils.HasText(indexAttr)
+                && StringUtils.HasText(nameAttr))
+            {
+                throw new ObjectDefinitionStoreException(
+                    parserHelper.ReaderContext.Resource, name,
+                    "Only one of the 'index' or 'name' attributes can be present per constructor argument.");
+            }
+            if (StringUtils.HasText(indexAttr))
+            {
+                try
+                {
+                    int index = int.Parse(indexAttr, CultureInfo.CurrentCulture);
+                    if (index < 0)
+                    {
+                        throw new ObjectDefinitionStoreException(
+                            parserHelper.ReaderContext.Resource, name,
+                            "'index' cannot be lower than 0");
+                    }
+                    if (StringUtils.HasText(typeAttr))
+                    {
+                        arguments.AddIndexedArgumentValue(index, val, typeAttr);
+                    }
+                    else
+                    {
+                        arguments.AddIndexedArgumentValue(index, val);
+                    }
+                }
+                catch (FormatException)
+                {
+                    throw new ObjectDefinitionStoreException(
+                        parserHelper.ReaderContext.Resource, name,
+                        "Attribute 'index' of tag 'constructor-arg' must be an integer value.");
+                }
+            }
+            else if (StringUtils.HasText(nameAttr))
+            {
+                if (StringUtils.HasText(typeAttr))
+                {
+                    if (log.IsWarnEnabled)
+                    {
+                        log.Warn("The 'type' attribute is redundant when the 'name' attribute has been used on a constructor argument element.");
+                    }
+                }
+                arguments.AddNamedArgumentValue(nameAttr, val);
+            }
+            else
+            {
+                if (StringUtils.HasText(typeAttr))
+                {
+                    arguments.AddGenericArgumentValue(val, typeAttr);
+                }
+                else
+                {
+                    arguments.AddGenericArgumentValue(val);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Parse a property element.
+        /// </summary>
+        /// <param name="name">
+        /// The name of the object (definition) associated with the property.
+        /// </param>
+        /// <param name="properties">
+        /// The list of properties associated with the object (definition).
+        /// </param>
+        /// <param name="element">
+        /// The name of the element containing the property definition.
+        /// </param>
+        /// <param name="parserHelper">
+        /// The namespace-aware parser.
+        /// </param>
+        protected void ParsePropertyElement(
+            string name, MutablePropertyValues properties, XmlElement element, ObjectDefinitionParserHelper parserHelper)
+        {
+            string propertyName = element.GetAttribute(ObjectDefinitionConstants.NameAttribute);
+            if (StringUtils.IsNullOrEmpty(propertyName))
+            {
+                throw new ObjectDefinitionStoreException(
+                    parserHelper.ReaderContext.Resource,
+                    name,
+                    "The 'property' element must have a 'name' attribute");
+            }
+            object val = GetPropertyValue(element, name, parserHelper);
+            properties.Add(new PropertyValue(propertyName, val));
+        }
+
+        /// <summary>
+        /// Get the value of a property element (may be a list).</summary>
+        /// <remarks>
+        /// <p>
+        /// Please note that even though this method is named Get<b>Property</b>Value,
+        /// it is called by both the property and constructor argument element
+        /// handlers.
+        /// </p>
+        /// </remarks>
+        /// <param name="element">The property element.</param>
+        /// <param name="name">
+        /// The name of the object associated with the property.
+        /// </param>
+        /// <param name="parserHelper">
+        /// The namespace-aware parser.
+        /// </param>
+        protected virtual object GetPropertyValue(
+            XmlElement element, string name, ObjectDefinitionParserHelper parserHelper)
+        {
+            XmlAttribute inlineValueAtt = element.Attributes[ObjectDefinitionConstants.ValueAttribute];
+            if (inlineValueAtt != null)
+            {
+                return inlineValueAtt.Value;
+            }
+            XmlAttribute inlineRefAtt = element.Attributes[ObjectDefinitionConstants.RefAttribute];
+            if (inlineRefAtt != null)
+            {
+                return new RuntimeObjectReference(inlineRefAtt.Value);
+            }
+            XmlAttribute inlineExpressionAtt = element.Attributes[ObjectDefinitionConstants.ExpressionAttribute];
+            if (inlineExpressionAtt != null)
+            {
+                return new ExpressionHolder(inlineExpressionAtt.Value);
+            }
+            
+            // should only have one element child: value, ref, collection...
+            XmlNodeList nodes = element.ChildNodes;
+            XmlElement valueRefOrCollectionElement = null;
+            for (int i = 0; i < nodes.Count; ++i)
+            {
+                XmlElement candidateEle = nodes.Item(i) as XmlElement;
+                if (candidateEle != null)
+                {
+                    if (ObjectDefinitionConstants.DescriptionElement.Equals(candidateEle.Name))
+                    {
+                        // keep going: we don't use this value for now...
+                    }
+                    else
+                    {
+                        // child element is what we're looking for...
+                        valueRefOrCollectionElement = candidateEle;
+                    }
+                }
+            }
+            if (valueRefOrCollectionElement == null)
+            {
+                throw new ObjectDefinitionStoreException(
+                    parserHelper.ReaderContext.Resource,
+                    name,
+                    "The '<property/>' element must have a subelement such as 'value' or 'ref'.");
+            }
+            return ParsePropertySubElement(valueRefOrCollectionElement, name, parserHelper);
+        }
+
+        /// <summary>
+        /// Parse a value, ref or collection subelement of a property element.
+        /// </summary>
+        /// <param name="element">
+        /// Subelement of property element; we don't know which yet.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object (definition) associated with the top level property.
+        /// </param>
+        /// <param name="parserHelper">
+        /// The namespace-aware parser.
+        /// </param>
+        protected virtual object ParsePropertySubElement(
+            XmlElement element, string name, ObjectDefinitionParserHelper parserHelper)
+        {
+            if (element.Name.Equals(ObjectDefinitionConstants.ObjectElement))
+            {
+                return ParseObjectDefinition(element, "(inner object definition)", parserHelper);
+            }
+            else if (element.Name.Equals(ObjectDefinitionConstants.RefElement))
+            {
+                return GetReference(element, parserHelper, name);
+            }
+            else if (element.Name.Equals(ObjectDefinitionConstants.IdRefElement))
+            {
+                return GetObjectReference(element, parserHelper, name);
+            }
+            else if (element.Name.Equals(ObjectDefinitionConstants.ListElement))
+            {
+                return GetList(element, name, parserHelper);
+            }
+            else if (element.Name.Equals(ObjectDefinitionConstants.SetElement))
+            {
+                return GetSet(element, name, parserHelper);
+            }
+            else if (element.Name.Equals(ObjectDefinitionConstants.DictionaryElement))
+            {
+                return GetDictionary(element, name, parserHelper);
+            }
+            else if (element.Name.Equals(ObjectDefinitionConstants.NameValuesElement))
+            {
+                return GetNameValues(element, name);
+            }
+            else if (element.Name.Equals(ObjectDefinitionConstants.ValueElement))
+            {
+                return GetValue(element, name);
+            }
+            else if (element.Name.Equals(ObjectDefinitionConstants.ExpressionElement))
+            {
+                return GetExpression(element, name, parserHelper);
+            }
+            else if (element.Name.Equals(ObjectDefinitionConstants.NullElement))
+            {
+                // it's a distinguished null value...
+                return null;
+            }
+            else
+            {
+                // it may match another Parser
+                INamespaceParser otherParser = GetParser(element.NamespaceURI);
+                if (otherParser != null)
+                {
+                    // The other parser uses nestings tags and thus returns the definition
+                    // of the parsed object.
+                    return otherParser.ParseElement(element, new ParserContext(parserHelper.ReaderContext, parserHelper));
+                }
+            }
+            throw new ObjectDefinitionStoreException(
+                parserHelper.ReaderContext.Resource,
+                name,
+                "Unknown subelement of <property>: <" + element.Name + ">");
+        }
+
+        private static INamespaceParser GetParser(string nspace)
+        {
+            // finds the configuration parser for the given namespace
+            try
+            {
+                return NamespaceParserRegistry.GetParser(nspace);
+            }
+            catch (Exception)
+            {
+                // The parser for the given namespace is not found
+                return null;
+            }
+        }
+        
+        private static object GetObjectReference(XmlElement element, ObjectDefinitionParserHelper parserHelper, string name)
+        {
+            // a generic reference to any name of any object
+            string objectRef = element.GetAttribute(ObjectDefinitionConstants.ObjectRefAttribute);
+            if (StringUtils.IsNullOrEmpty(objectRef))
+            {
+                // a reference to the id of another object in the same XML file
+                objectRef = element.GetAttribute(ObjectDefinitionConstants.LocalRefAttribute);
+                if (StringUtils.IsNullOrEmpty(objectRef))
+                {
+                    throw new ObjectDefinitionStoreException(
+                        parserHelper.ReaderContext.Resource,
+                        name,
+                        "Either 'object' or 'local' is required for an idref");
+                }
+            }
+            return objectRef;
+        }
+
+        private object GetReference(XmlElement element, ObjectDefinitionParserHelper parserHelper, string name)
+        {
+            // is it a generic reference to any name of any object?
+            string objectRef = element.GetAttribute(ObjectDefinitionConstants.ObjectRefAttribute);
+            if (StringUtils.IsNullOrEmpty(objectRef))
+            {
+                // is it a reference to the id of another object in the same XML file?
+                objectRef = element.GetAttribute(ObjectDefinitionConstants.LocalRefAttribute);
+                if (StringUtils.IsNullOrEmpty(objectRef))
+                {
+                    // is it a reference to the id of another object in a parent context?
+                    objectRef = element.GetAttribute(ObjectDefinitionConstants.ParentAttribute);
+                    if (StringUtils.IsNullOrEmpty(objectRef))
+                    {
+                        throw new ObjectDefinitionStoreException(
+                            parserHelper.ReaderContext.Resource,
+                            name,
+                            "Either 'object' or 'local' is required for a reference");
+                    }
+                    return new RuntimeObjectReference(objectRef, true);
+                }
+            }
+            return new RuntimeObjectReference(objectRef);
+        }
+
+        private object GetValue(XmlElement element, string name)
+        {
+            string valueType = element.GetAttribute(ObjectDefinitionConstants.TypeAttribute);
+            if (StringUtils.IsNullOrEmpty(valueType))
+            {
+                return GetTextValue(element, name);
+            }
+            else
+            {
+                Type resolvedValueType = TypeResolutionUtils.ResolveType(valueType);
+                if (resolvedValueType == typeof(string))
+                {
+                    return GetTextValue(element, name);
+                }
+                else
+                {
+                    return new TypedStringValue(GetTextValue(element, name), resolvedValueType);
+                }
+            }
+        }
+
+        private object GetExpression(XmlElement element, string name, ObjectDefinitionParserHelper parserHelper)
+        {
+            string expression = element.GetAttribute(ObjectDefinitionConstants.ValueAttribute);
+            ExpressionHolder holder = new ExpressionHolder(expression);
+            holder.Properties = GetPropertyValueSubElements(name, element, parserHelper);
+            return holder;
+        }
+
+        /// <summary>
+        /// Gets a list definition.
+        /// </summary>
+        /// <param name="element">
+        /// The element describing the list definition.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object (definition) associated with the list definition.
+        /// </param>
+        /// <param name="parserHelper">
+        /// The namespace-aware parser.
+        /// </param>
+        /// <returns>The list definition.</returns>
+        protected virtual IList GetList(XmlElement element, string name, ObjectDefinitionParserHelper parserHelper)
+        {
+            ManagedList list = new ManagedList();
+
+            string elementTypeName = element.GetAttribute("element-type");
+            if (StringUtils.HasText(elementTypeName))
+            {
+                list.ElementTypeName = elementTypeName;
+            }
+            
+            foreach (XmlNode node in element.ChildNodes)
+            {
+                XmlElement ele = node as XmlElement;
+                if (ele != null)
+                {
+                    list.Add(ParsePropertySubElement(ele, name, parserHelper));
+                }
+            }
+            return list;
+        }
+
+        /// <summary>
+        /// Gets a set definition.
+        /// </summary>
+        /// <param name="element">
+        /// The element describing the set definition.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object (definition) associated with the set definition.
+        /// </param>
+        /// <param name="parserHelper">
+        /// The namespace-aware parser.
+        /// </param>
+        /// <returns>The set definition.</returns>
+        protected Set GetSet(XmlElement element, string name, ObjectDefinitionParserHelper parserHelper)
+        {
+            ManagedSet theSet = new ManagedSet();
+            string elementTypeName = element.GetAttribute("element-type");
+            if (StringUtils.HasText(elementTypeName))
+            {
+                theSet.ElementTypeName = elementTypeName;
+            }
+            foreach (XmlNode node in element.ChildNodes)
+            {
+                XmlElement ele = node as XmlElement;
+                if (ele != null)
+                {
+                    object sub = ParsePropertySubElement(ele, name, parserHelper);
+                    theSet.Add(sub);
+                }
+            }
+            return theSet;
+        }
+
+        /// <summary>
+        /// Gets a dictionary definition.
+        /// </summary>
+        /// <param name="element">
+        /// The element describing the dictionary definition.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object (definition) associated with the dictionary definition.
+        /// </param>
+        /// <param name="parserHelper">
+        /// The namespace-aware parser.
+        /// </param>
+        /// <returns>The dictionary definition.</returns>
+        protected IDictionary GetDictionary(XmlElement element, string name, ObjectDefinitionParserHelper parserHelper)
+        {
+            ManagedDictionary dictionary = new ManagedDictionary();
+            string keyTypeName = element.GetAttribute("key-type");
+            string valueTypeName = element.GetAttribute("value-type");
+            if (StringUtils.HasText(keyTypeName))
+            {
+                dictionary.KeyTypeName = keyTypeName;
+            }
+            if (StringUtils.HasText(valueTypeName))
+            {
+                dictionary.ValueTypeName = valueTypeName;
+            }
+
+            XmlNodeList entryElements = SelectNodes(element, ObjectDefinitionConstants.EntryElement);
+            foreach (XmlElement entryEle in entryElements)
+            {
+                #region Key
+
+                object key = null;
+
+                XmlAttribute keyAtt = entryEle.Attributes[ObjectDefinitionConstants.KeyAttribute];
+                if (keyAtt != null)
+                {
+                    key = keyAtt.Value;
+                }
+                else
+                {
+                    // ok, we're not using the 'key' attribute; lets check for the ref shortcut...
+                    XmlAttribute keyRefAtt = entryEle.Attributes[ObjectDefinitionConstants.DictionaryKeyRefShortcutAttribute];
+                    if (keyRefAtt != null)
+                    {
+                        key = new RuntimeObjectReference(keyRefAtt.Value);
+                    }
+                    else
+                    {
+                        // so check for the 'key' element...
+                        XmlNode keyNode = SelectSingleNode(entryEle, ObjectDefinitionConstants.KeyElement);
+                        if (keyNode == null)
+                        {
+                            throw new ObjectDefinitionStoreException(
+                                parserHelper.ReaderContext.Resource, name,
+                                string.Format("One of either the '{0}' element, or the the '{1}' or '{2}' attributes " +
+                                              "is required for the <{3}/> element.",
+                                              ObjectDefinitionConstants.KeyElement,
+                                              ObjectDefinitionConstants.KeyAttribute,
+                                              ObjectDefinitionConstants.DictionaryKeyRefShortcutAttribute,
+                                              ObjectDefinitionConstants.EntryElement));
+                        }
+                        XmlElement keyElement = (XmlElement) keyNode;
+                        XmlNodeList keyNodes = keyElement.GetElementsByTagName("*");
+                        if (keyNodes == null || keyNodes.Count == 0)
+                        {
+                            throw new ObjectDefinitionStoreException(
+                                parserHelper.ReaderContext.Resource, name,
+                                string.Format("Malformed <{0}/> element... the value of the key must be " +
+                                    "specified as a child value-style element.",
+                                              ObjectDefinitionConstants.KeyElement));
+                        }
+                        key = ParsePropertySubElement((XmlElement) keyNodes.Item(0), name, parserHelper);
+                    }
+                }
+
+                #endregion
+
+                #region Value
+
+                XmlAttribute inlineValueAtt = entryEle.Attributes[ObjectDefinitionConstants.ValueAttribute];
+                if (inlineValueAtt != null)
+                {
+                    // ok, we're using the value attribute shortcut...
+                    dictionary[key] = inlineValueAtt.Value;
+                }
+                else if (entryEle.Attributes[ObjectDefinitionConstants.DictionaryValueRefShortcutAttribute] != null)
+                {
+                    // ok, we're using the value-ref attribute shortcut...
+                    XmlAttribute inlineValueRefAtt = entryEle.Attributes[ObjectDefinitionConstants.DictionaryValueRefShortcutAttribute];
+                    RuntimeObjectReference ror = new RuntimeObjectReference(inlineValueRefAtt.Value);
+                    dictionary[key] = ror;
+                }
+                else if (entryEle.Attributes[ObjectDefinitionConstants.ExpressionAttribute] != null)
+                {
+                    // ok, we're using the expression attribute shortcut...
+                    XmlAttribute inlineExpressionAtt = entryEle.Attributes[ObjectDefinitionConstants.ExpressionAttribute];
+                    ExpressionHolder expHolder = new ExpressionHolder(inlineExpressionAtt.Value);
+                    dictionary[key] = expHolder;
+                }
+                else
+                {
+                    XmlNode keyNode = SelectSingleNode(entryEle, ObjectDefinitionConstants.KeyElement);
+                    if (keyNode != null)
+                    {
+                        entryEle.RemoveChild(keyNode);
+                    }
+                    // ok, we're using the original full-on value element...
+                    XmlNodeList valueElements = entryEle.GetElementsByTagName("*");
+                    if (valueElements == null || valueElements.Count == 0)
+                    {
+                        throw new ObjectDefinitionStoreException(
+                            parserHelper.ReaderContext.Resource, name,
+                            string.Format("One of either the '{0}' or '{1}' attributes, or a value-style element " +
+                                "is required for the <{2}/> element.",
+                                          ObjectDefinitionConstants.ValueAttribute, ObjectDefinitionConstants.DictionaryValueRefShortcutAttribute, ObjectDefinitionConstants.EntryElement));
+                    }
+                    dictionary[key] = ParsePropertySubElement((XmlElement)valueElements.Item(0), name, parserHelper);
+                }
+
+                #endregion
+            }
+            return dictionary;
+        }
+
+        /// <summary>
+        /// Selects sub-elements with a given
+        /// <paramref name="childElementName">name</paramref>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Uses a namespace manager if necessary.
+        /// </p>
+        /// </remarks>
+        /// <param name="element">
+        /// The element to be searched in.
+        /// </param>
+        /// <param name="childElementName">
+        /// The name of the child nodes to look for.
+        /// </param>
+        /// <returns>
+        /// The child <see cref="System.Xml.XmlNode"/>s of the supplied
+        /// <paramref name="element"/> with the supplied
+        /// <paramref name="childElementName"/>.
+        /// </returns>
+        protected XmlNodeList SelectNodes(XmlElement element, string childElementName)
+        {
+            XmlNamespaceManager nsManager = new XmlNamespaceManager(new NameTable());
+            nsManager.AddNamespace(GetNamespacePrefix(element), element.NamespaceURI);
+            return element.SelectNodes(GetNamespacePrefix(element) + ":" + childElementName, nsManager);
+        }
+
+        /// <summary>
+        /// Selects a single sub-element with a given
+        /// <paramref name="childElementName">name</paramref>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Uses a namespace manager if necessary.
+        /// </p>
+        /// </remarks>
+        /// <param name="element">
+        /// The element to be searched in.
+        /// </param>
+        /// <param name="childElementName">
+        /// The name of the child node to look for.
+        /// </param>
+        /// <returns>
+        /// The first child <see cref="System.Xml.XmlNode"/> of the supplied
+        /// <paramref name="element"/> with the supplied
+        /// <paramref name="childElementName"/>.
+        /// </returns>
+        protected XmlNode SelectSingleNode(XmlElement element, string childElementName)
+        {
+            XmlNamespaceManager nsManager = new XmlNamespaceManager(new NameTable());
+            nsManager.AddNamespace(GetNamespacePrefix(element), element.NamespaceURI);
+            return element.SelectSingleNode(GetNamespacePrefix(element) + ":" + childElementName, nsManager);
+        }
+
+        /// <summary>
+        /// Gets a name value collection mapping definition.
+        /// </summary>
+        /// <param name="element">
+        /// The element describing the name value collection mapping definition.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object (definition) associated with the
+        /// name value collection mapping definition.
+        /// </param>
+        /// <returns>The name value collection definition.</returns>
+        protected NameValueCollection GetNameValues(XmlElement element, string name)
+        {
+            NameValueCollection nvc = new NameValueCollection();
+            XmlNodeList addElements = element.GetElementsByTagName(ObjectDefinitionConstants.AddElement);
+            foreach (XmlElement addElement in addElements)
+            {
+                string key = addElement.GetAttribute(ObjectDefinitionConstants.KeyAttribute);
+                string value = addElement.GetAttribute(ObjectDefinitionConstants.ValueAttribute);
+                string delimiters = addElement.GetAttribute(ObjectDefinitionConstants.DelimitersAttribute);
+
+                if (StringUtils.HasText(delimiters))
+                {
+                    string[] values = value.Split(delimiters.ToCharArray());
+                    foreach (string v in values)
+                    {
+                        nvc.Add(key, v);
+                    }
+                }
+                else
+                {
+                    nvc[key] = value;
+                }
+            }
+            return nvc;
+        }
+
+        /// <summary>
+        /// Returns the text of the supplied <paramref name="element"/>,
+        /// or the empty string value if said <paramref name="element"/> is empty.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the supplied <paramref name="element"/> is <see langword="null"/>,
+        /// then the empty string value will be returned.
+        /// </p>
+        /// </remarks>
+        protected string GetTextValue(XmlElement element, string name)
+        {
+            if (element == null || StringUtils.IsNullOrEmpty(element.InnerText))
+            {
+                return String.Empty;
+            }
+            return element.InnerText;
+        }
+
+        /// <summary>
+        /// Strips the dependency check value out of the supplied string.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the supplied <paramref name="value"/> is an invalid dependency
+        /// checking mode, the invalid value will be logged and this method will
+        /// return the <see cref="DependencyCheckingMode.None"/> value.
+        /// No exception will be raised.
+        /// </p>
+        /// </remarks>
+        /// <param name="value">
+        /// The string containing the dependency check value.
+        /// </param>
+        /// <returns>The dependency check value.</returns>
+        /// <seealso cref="DependencyCheckingMode"/>
+        protected DependencyCheckingMode GetDependencyCheck(string value)
+        {
+            DependencyCheckingMode code = DependencyCheckingMode.None;
+            if (StringUtils.HasText(value))
+            {
+                try
+                {
+                    code = (DependencyCheckingMode) Enum.Parse(
+                        typeof(DependencyCheckingMode), value, true);
+                }
+                catch (ArgumentException ex)
+                {
+                    #region Instrumentation
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(
+                            string.Format("Error while parsing dependency checking mode : '{0}' is an invalid value.",
+                                          value), ex);
+                    }
+
+                    #endregion
+                }
+            }
+            return code;
+        }
+
+        /// <summary>
+        /// Strips the autowiring mode out of the supplied string.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the supplied <paramref name="value"/> is an invalid autowiring mode,
+        /// the invalid value will be logged and this method will return the
+        /// <see cref="AutoWiringMode.No"/> value. No exception will be raised.
+        /// </p>
+        /// </remarks>
+        /// <param name="value">
+        /// The string containing the autowiring mode definition.
+        /// </param>
+        /// <returns>The autowiring mode.</returns>
+        /// <seealso cref="AutoWiringMode"/>
+        protected AutoWiringMode GetAutowireMode(string value)
+        {
+            AutoWiringMode mode = AutoWiringMode.No;
+            if (StringUtils.HasText(value))
+            {
+                try
+                {
+                    mode = (AutoWiringMode) Enum.Parse(
+                        typeof(AutoWiringMode), value, true);
+                }
+                catch (ArgumentException ex)
+                {
+                    #region Instrumentation
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(
+                            string.Format("Error while parsing autowire mode : '{0}' is an invalid value.",
+                                          value), ex);
+                    }
+
+                    #endregion
+                }
+            }
+            return mode;
+        }
+
+        /// <summary>
+        /// Given a string containing delimited object names, returns
+        /// a string array split on the object name delimeter.
+        /// </summary>
+        /// <param name="value">
+        /// The string containing delimited object names.
+        /// </param>
+        /// <returns>
+        /// A string array split on the object name delimeter.
+        /// </returns>
+        /// <seealso cref="ObjectDefinitionConstants.ObjectNameDelimiters"/>
+        private string[] GetObjectNames(string value)
+        {
+            return StringUtils.Split(
+                value, ObjectDefinitionConstants.ObjectNameDelimiters, true, true);
+        }
+
+        private static bool IsTrueStringValue(string value)
+        {
+            return ObjectDefinitionConstants.TrueValue.Equals(value);
+        }
+
+        private string GetNamespacePrefix(XmlElement element)
+        {
+            return StringUtils.HasText(element.Prefix) ? element.Prefix : "spring";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ParserContext.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ParserContext.cs
new file mode 100644
index 00000000..ed05a8a7
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ParserContext.cs
@@ -0,0 +1,128 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Context that gets passed along an object definition parsing process, encapsulating
+    /// all relevant configuraiton as well as state.
+    /// </summary>
+    public class ParserContext
+    {
+        private XmlReaderContext readerContext;
+
+        private ObjectDefinitionParserHelper parserHelper;
+
+        private IObjectDefinition containingObjectDefinition;
+
+        private Stack containingComponents = new Stack();
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ParserContext"/> class.
+        /// </summary>
+        /// <param name="readerContext">The reader context.</param>
+        /// <param name="parserHelper">The parser helper.</param>
+        public ParserContext(XmlReaderContext readerContext, ObjectDefinitionParserHelper parserHelper)
+        {
+            this.readerContext = readerContext;
+            this.parserHelper = parserHelper;
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ParserContext"/> class.
+        /// </summary>
+        /// <param name="readerContext">The reader context.</param>
+        /// <param name="parserHelper">The parser helper.</param>
+        /// <param name="containingObjectDefinition">The containing object definition.</param>
+        public ParserContext(XmlReaderContext readerContext, ObjectDefinitionParserHelper parserHelper, IObjectDefinition containingObjectDefinition)
+        {
+            this.readerContext = readerContext;
+            this.parserHelper = parserHelper;
+            this.containingObjectDefinition = containingObjectDefinition;
+        }
+
+
+        /// <summary>
+        /// Gets the reader context.
+        /// </summary>
+        /// <value>The reader context.</value>
+        public XmlReaderContext ReaderContext
+        {
+            get { return readerContext; }
+        }
+
+        /// <summary>
+        /// Gets the registry.
+        /// </summary>
+        /// <value>The registry.</value>
+        public IObjectDefinitionRegistry Registry
+        {
+            get { return readerContext.Registry; }
+        }
+
+
+        /// <summary>
+        /// Gets the parser helper.
+        /// </summary>
+        /// <value>The parser helper.</value>
+        public ObjectDefinitionParserHelper ParserHelper
+        {
+            get { return parserHelper; }
+        }
+
+
+        /// <summary>
+        /// Gets the containing object definition.
+        /// </summary>
+        /// <value>The containing object definition.</value>
+        public IObjectDefinition ContainingObjectDefinition
+        {
+            get { return containingObjectDefinition; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is nested.
+        /// </summary>
+        /// <value><c>true</c> if this instance is nested; otherwise, <c>false</c>.</value>
+        public bool IsNested
+        {
+            get { return containingObjectDefinition != null; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is default lazy init.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance is default lazy init; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsDefaultLazyInit
+        {
+            get { return ObjectDefinitionConstants.TrueValue.Equals(ParserHelper.Defaults.LazyInit); }
+        }
+
+
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionReader.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionReader.cs
new file mode 100644
index 00000000..b2bd456f
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionReader.cs
@@ -0,0 +1,329 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Xml;
+using System.Xml.Schema;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Object definition reader for Spring's default XML object definition format.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Typically applied to a
+    /// <see cref="Spring.Objects.Factory.Support.DefaultListableObjectFactory"/> instance.
+    /// </p>
+    /// <p>
+    /// This class registers each object definition with the given object factory superclass,
+    /// and relies on the latter's implementation of the
+    /// <see cref="Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/> interface.
+    /// </p>
+    /// <p>
+    /// It supports singletons, prototypes, and references to either of these kinds of object.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: XmlObjectDefinitionReader.cs,v 1.33 2008/02/04 22:44:03 markpollack Exp $</version>
+    public class XmlObjectDefinitionReader : AbstractObjectDefinitionReader
+    {
+        #region Fields
+
+        [NonSerialized]
+        private XmlResolver resolver;
+
+        private Type documentReaderType = typeof (DefaultObjectDefinitionDocumentReader);
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/> class.
+        /// </summary>
+        /// <param name="registry">
+        /// The <see cref="Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+        /// instance that this reader works on.
+        /// </param>
+        public XmlObjectDefinitionReader(IObjectDefinitionRegistry registry)
+            : this(registry, new XmlUrlResolver())
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/> class.
+        /// </summary>
+        /// <param name="registry">
+        /// The <see cref="Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+        /// instance that this reader works on.
+        /// </param>
+        /// <param name="resolver">
+        /// The <see cref="System.Xml.XmlResolver"/>to be used for parsing.
+        /// </param>
+        public XmlObjectDefinitionReader(IObjectDefinitionRegistry registry, XmlResolver resolver) : base(registry)
+        {
+            Resolver = resolver;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The <see cref="System.Xml.XmlResolver"/>to be used for parsing.
+        /// </summary>
+        public XmlResolver Resolver
+        {
+            get { return resolver; }
+            set { resolver = value; }
+        }
+
+
+        /// <summary>
+        /// Sets the IObjectDefinitionDocumentReader implementation to use, responsible for
+        /// the actual reading of the XML object definition document.stype of the document reader.
+        /// </summary>
+        /// <value>The type of the document reader.</value>
+        public Type DocumentReaderType
+        {
+            set
+            {
+                if (value == null || !typeof(IObjectDefinitionDocumentReader).IsAssignableFrom(value))
+                {
+                    throw new ArgumentException(
+                        "DocumentReaderType must be an implementation of the IObjectDefinitionReader interface.");
+                }
+                documentReaderType = value;
+            }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Load object definitions from the supplied XML <paramref name="resource"/>.
+        /// </summary>
+        /// <param name="resource">
+        /// The XML resource for the object definitions that are to be loaded.
+        /// </param>
+        /// <returns>
+        /// The number of object definitions that were loaded.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of loading or parsing errors.
+        /// </exception>
+        public override int LoadObjectDefinitions(IResource resource)
+        {
+            if (resource == null)
+            {
+                throw new ObjectDefinitionStoreException
+                    ("Resource cannot be null: expected an XML resource.");
+            }
+
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug("Loading XML object definitions from " + resource);
+            }
+
+            #endregion
+
+            try
+            {
+                Stream stream = resource.InputStream;
+                if (stream == null)
+                {
+                    throw new ObjectDefinitionStoreException(
+                        "InputStream is null from Resource = [" + resource + "]");
+                }
+                try
+                {
+                    return DoLoadObjectDefinitions(stream, resource);
+                }
+                finally
+                {
+                    #region Close stream
+                    try
+                    {
+                        stream.Close();
+                    }
+                    catch (IOException ex)
+                    {
+                        #region Instrumentation
+
+                        if (log.IsWarnEnabled)
+                        {
+                            log.Warn("Could not close stream.", ex);
+                        }
+
+                        #endregion
+                    }
+                    #endregion 
+                }                
+            }
+            catch (IOException ex)
+            {
+                throw new ObjectDefinitionStoreException(
+                    "IOException parsing XML document from " + resource.Description, ex);
+            }
+
+        }
+
+        /// <summary>
+        /// Actually load object definitions from the specified XML file.
+        /// </summary>
+        /// <param name="stream">The input stream to read from.</param>
+        /// <param name="resource">The resource for the XML data.</param>
+        /// <returns></returns>
+        protected virtual int DoLoadObjectDefinitions(Stream stream, IResource resource)
+        {
+            try
+            {
+                XmlReader reader = null;
+
+                if (SystemUtils.MonoRuntime)
+                {
+                    reader = XmlUtils.CreateReader(stream);
+                }
+                else
+                {
+                    reader =
+                        XmlUtils.CreateValidatingReader(stream, Resolver, NamespaceParserRegistry.GetSchemas(),
+                                                        new ValidationEventHandler(HandleValidation));
+                }
+
+                #region Instrumentation
+
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug("Using the following XmlReader implementation : " + reader.GetType());
+                }
+
+                #endregion
+
+                XmlDocument doc = new XmlDocument();
+                doc.Load(reader);
+                return RegisterObjectDefinitions(doc, resource);
+            }
+            catch (XmlException ex)
+            {
+                throw new XmlObjectDefinitionStoreException(resource.Description,
+                                                            "Line " + ex.LineNumber + " in XML document from " +
+                                                            resource + " is invalid.  " + ex.Message, ex);
+            }
+            catch (Exception ex)
+            {
+                throw new ObjectDefinitionStoreException("Unexpected exception parsing XML document from " + resource.Description + "Inner exception message= " + ex.Message, ex);
+            }
+        }
+
+        /// <summary>
+        /// Validation callback for a validating XML reader.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="args">Any data pertinent to the event.</param>
+        private void HandleValidation(object sender, ValidationEventArgs args)
+        {
+            if (args.Severity == XmlSeverityType.Error)
+            {
+#if !NET_1_0
+                throw new XmlException(args.Message, args.Exception, args.Exception.LineNumber, args.Exception.LinePosition);
+#else
+				throw new XmlException(args.Message, args.Exception);
+#endif
+            }
+            else
+            {
+                #region Instrumentation
+
+                if (log.IsWarnEnabled)
+                {
+                    log.Warn(
+                        "Ignored XML validation warning: " + args.Message,
+                        args.Exception);
+                }
+
+                #endregion
+            }
+        }
+
+        /// <summary>
+        /// Register the object definitions contained in the given DOM document.
+        /// </summary>
+        /// <param name="doc">The DOM document.</param>
+        /// <param name="resource">
+        /// The original resource from where the <see cref="System.Xml.XmlDocument"/>
+        /// was read.
+        /// </param>
+        /// <returns>
+        /// The number of object definitions that were registered.
+        /// </returns>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of parsing errors.
+        /// </exception>
+        public int RegisterObjectDefinitions(
+            XmlDocument doc, IResource resource)
+        {
+            IObjectDefinitionDocumentReader documentReader = CreateObjectDefinitionDocumentReader();
+
+            //TODO make void return and get object count from registry.
+            int countBefore = Registry.ObjectDefinitionCount;
+            documentReader.RegisterObjectDefinitions(doc, CreateReaderContext(resource));
+            return Registry.ObjectDefinitionCount - countBefore;
+        }
+
+        /// <summary>
+        /// Creates the <see cref="IObjectDefinitionDocumentReader"/> to use for actually
+        /// reading object definitions from an XML document.
+        /// </summary>
+        /// <remarks>Default implementation instantiates the specified 'documentReaderType'.</remarks>
+        /// <returns></returns>
+        protected virtual IObjectDefinitionDocumentReader CreateObjectDefinitionDocumentReader()
+        {
+            return (IObjectDefinitionDocumentReader) ObjectUtils.InstantiateType(documentReaderType);
+        }
+
+		/// <summary>
+		/// Creates the <see cref="XmlReaderContext"/> to be passed along 
+		/// during the object definition reading process.
+		/// </summary>
+		/// <param name="resource">The underlying <see cref="IResource"/> that is currently processed.</param>
+		/// <returns>A new <see cref="XmlReaderContext"/></returns>
+        protected virtual XmlReaderContext CreateReaderContext(IResource resource)
+        {
+            return new XmlReaderContext(resource, this);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionStoreException.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionStoreException.cs
new file mode 100644
index 00000000..26b92f36
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionStoreException.cs
@@ -0,0 +1,121 @@
+
+
+using System;
+using System.Runtime.Serialization;
+using System.Xml;
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// XML-specific ObjectDefinitionStoreException subclass that wraps a XmlException, which
+    /// contains information about the error location.
+    /// </summary>
+    [Serializable]
+    public class XmlObjectDefinitionStoreException : ObjectDefinitionStoreException
+    {
+
+        #region Required for Standards Compliance
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XmlObjectDefinitionStoreException"/> class.
+        /// </summary>
+        public XmlObjectDefinitionStoreException()
+        {
+        }
+
+        /// <summary>
+		/// Creates a new instance of the XmlObjectDefinitionStoreException class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+        public XmlObjectDefinitionStoreException(string message)
+			: base(message)
+		{
+        }
+
+        /// <summary>
+		/// Creates a new instance of the XmlObjectDefinitionStoreException class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+        public XmlObjectDefinitionStoreException(string message, Exception rootCause)
+			: base(message, rootCause)
+		{
+		}
+
+        /// <summary>
+		/// Creates a new instance of the XmlObjectDefinitionStoreException class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+        protected XmlObjectDefinitionStoreException(
+		    SerializationInfo info, StreamingContext context)
+			: base(info, context)
+       	{
+       	}
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XmlObjectDefinitionStoreException"/> class.
+        /// </summary>
+        /// <param name="resourceDescription">The description of the resource that the object definition came from</param>
+        /// <param name="msg">The detail message (used as exception message as-is).</param>
+        /// <param name="cause">The XmlException root cause.</param>
+        public XmlObjectDefinitionStoreException(string resourceDescription, string msg, XmlException cause)
+            : base(resourceDescription, msg, cause)
+        {
+            
+        }
+
+        /// <summary>
+        /// Gets the line number in the XML resource that failed.
+        /// </summary>
+        /// <value>The line number if available (in case of a XmlException); -1 else.</value>
+        public int LineNumber
+        {
+            get
+            {
+                XmlException cause = InnerException as XmlException;
+                if (cause != null)
+                {
+                    return (cause.LineNumber);
+                }
+                else
+                {
+                    return -1;
+                }
+            }
+        }
+
+		/// <summary>
+		/// Gets the line position in the XML resource that failed.
+		/// </summary>
+        /// <value>The line position if available (in case of a XmlException); -1 else.</value>
+		public int LinePosition
+        {
+            get
+            {
+                XmlException cause = InnerException as XmlException;
+                if (cause != null)
+                {
+                    return (cause.LinePosition);
+                }
+                else
+                {
+                    return -1;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectFactory.cs
new file mode 100644
index 00000000..b2f25884
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectFactory.cs
@@ -0,0 +1,150 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+	/// <summary>
+	/// Convenience extension of
+	/// <see cref="Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>
+	/// that reads object definitions from an XML document or element.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Delegates to
+	/// <see cref="Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/>
+	/// underneath; effectively equivalent to using a
+	/// <see cref="Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/> for a
+	/// <see cref="Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>.
+	/// </p>
+	/// <note>
+	/// <i>objects</i> doesn't need to be the root element of
+	/// the XML document: this class will parse all object definition elements in the
+	/// XML stream.
+	/// </note>
+	/// <p>
+	/// This class registers each object definition with the
+	/// <see cref="Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>
+	/// superclass, and relies on the latter's implementation of the
+	/// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface. It supports
+	/// singletons, prototypes and references to either of these kinds of object.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: XmlObjectFactory.cs,v 1.13 2007/08/08 17:47:13 bbaia Exp $</version>
+	/// <see cref="Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/>
+    [Serializable]
+    public class XmlObjectFactory : DefaultListableObjectFactory
+	{
+		#region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="XmlObjectFactory"/> class,
+        /// with the given resource, which must be parsable using DOM.
+        /// </summary>
+        /// <param name="resource">
+        /// The XML resource to load object definitions from.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of loading or parsing errors.
+        /// </exception>
+        public XmlObjectFactory(IResource resource) : this(resource, true, null)
+        {
+        }
+        
+        /// <summary>
+		/// Creates a new instance of the <see cref="XmlObjectFactory"/> class,
+		/// with the given resource, which must be parsable using DOM.
+		/// </summary>
+		/// <param name="resource">
+		/// The XML resource to load object definitions from.
+		/// </param>
+        /// <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+		/// In the case of loading or parsing errors.
+		/// </exception>
+		public XmlObjectFactory(IResource resource, bool caseSensitive) : this(resource, caseSensitive, null)
+		{
+		}
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="XmlObjectFactory"/> class,
+        /// with the given resource, which must be parsable using DOM, and the
+        /// given parent factory.
+        /// </summary>
+        /// <param name="resource">
+        /// The XML resource to load object definitions from.
+        /// </param>
+        /// <param name="parentFactory">The parent object factory (may be <see langword="null"/>).</param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of loading or parsing errors.
+        /// </exception>
+        public XmlObjectFactory(
+            IResource resource, IObjectFactory parentFactory)
+            : this(resource, true, parentFactory)
+        {}
+        
+        /// <summary>
+		/// Creates a new instance of the <see cref="XmlObjectFactory"/> class,
+		/// with the given resource, which must be parsable using DOM, and the
+		/// given parent factory.
+		/// </summary>
+		/// <param name="resource">
+		/// The XML resource to load object definitions from.
+		/// </param>
+        /// <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+        /// <param name="parentFactory">The parent object factory (may be <see langword="null"/>).</param>
+		/// <exception cref="Spring.Objects.ObjectsException">
+		/// In the case of loading or parsing errors.
+		/// </exception>
+		public XmlObjectFactory(
+			IResource resource, bool caseSensitive, IObjectFactory parentFactory)
+			: base(caseSensitive, parentFactory)
+		{
+			ObjectDefinitionReader.LoadObjectDefinitions(resource);
+		}
+
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Gets object definition reader to use.
+        /// </summary>
+	    protected virtual IObjectDefinitionReader ObjectDefinitionReader
+	    {
+	        get
+	        {
+                return new XmlObjectDefinitionReader(this);
+	        }
+	    }
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/XmlReaderContext.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlReaderContext.cs
new file mode 100644
index 00000000..2cc7a2a0
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlReaderContext.cs
@@ -0,0 +1,239 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Xml;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Parsing;
+using Spring.Objects.Factory.Support;
+using Spring.Util;
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Extension of <see cref="ReaderContext"/> specific to use with an 
+    /// XmlObjectDefinitionReader.
+    /// </summary>
+    /// <remarks>In future will contain access to IXmlParserRegistry</remarks>
+    /// <version>$Id: XmlReaderContext.cs,v 1.6 2007/08/27 13:57:43 oakinger Exp $</version>
+    public class XmlReaderContext : ReaderContext
+    {
+
+        //TODO: Should have a ref to NamespaceParserRegistry, i.e. NamespaceHandlerResolver here....
+
+        private IObjectDefinitionReader reader;
+
+        private IObjectDefinitionFactory objectDefinitionFactory = new DefaultObjectDefinitionFactory();
+
+        /// <summary>
+        /// The maximum length of any XML fragment displayed in the error message
+        /// reporting.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Hopefully this will display enough context so that a user
+        /// can pinpoint the cause of the error.
+        /// </p>
+        /// </remarks>
+        private const int MaxXmlErrorFragmentLength = 255;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XmlReaderContext"/> class.
+        /// </summary>
+        /// <param name="resource">The resource.</param>
+        /// <param name="reader">The reader.</param>
+        public XmlReaderContext(IResource resource, IObjectDefinitionReader reader) : base(resource)
+        {
+            this.reader = reader;
+           
+        }
+
+
+        /// <summary>
+        /// Gets the reader.
+        /// </summary>
+        /// <value>The reader.</value>
+        public IObjectDefinitionReader Reader
+        {
+            get { return reader; }
+        }
+
+        /// <summary>
+        /// Gets the resource loader.
+        /// </summary>
+        /// <value>The resource loader.</value>
+        public IResourceLoader ResourceLoader
+        {
+            get { return reader.ResourceLoader;  }
+        }
+
+        /// <summary>
+        /// Gets the registry.
+        /// </summary>
+        /// <value>The registry.</value>
+        public IObjectDefinitionRegistry Registry
+        {
+            get
+            {
+                return reader.Registry;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the object definition factory.
+        /// </summary>
+        /// <value>The object definition factory.</value>
+        public IObjectDefinitionFactory ObjectDefinitionFactory
+        {
+            get { return objectDefinitionFactory; }
+            set { objectDefinitionFactory = value; }
+        }
+
+
+
+        /// <summary>
+        /// Generates the name of the object.
+        /// </summary>
+        /// <param name="objectDefinition">The object definition.</param>
+        /// <returns>the generated object name</returns>
+        public string GenerateObjectName(IObjectDefinition objectDefinition)
+        {
+            return reader.ObjectNameGenerator.GenerateObjectName(objectDefinition, Registry);
+        }
+
+        /// <summary>
+        /// Registers the name of the with generated.
+        /// </summary>
+        /// <param name="objectDefinition">The object definition.</param>
+        /// <returns>the generated object name</returns>
+        public string RegisterWithGeneratedName(IObjectDefinition objectDefinition)
+        {
+            string generatedName = GenerateObjectName(objectDefinition);
+            Registry.RegisterObjectDefinition(generatedName, objectDefinition);
+            return generatedName;
+        }
+
+        /// <summary>
+        /// Reports a parse error by loading a
+        /// <see cref="Spring.Objects.ObjectsException"/> with helpful contextual
+        /// information and throwing said exception.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Derived classes can of course override this method in order to implement
+        /// validators capable of displaying a full list of errors found in the
+        /// definition.
+        /// </p>
+        /// </remarks>
+        /// <param name="node">
+        /// The node that triggered the parse error.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object that triggered the exception.
+        /// </param>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// <b>Always</b> throws an instance of this exception class, that will
+        /// contain helpful contextual infomation about the parse error.
+        /// </exception>
+        /// <seealso cref="ReportException(XmlNode,string,string,Exception)"/>
+        public void ReportException(XmlNode node, string name, string message)
+        {
+            ReportException(node, name, message, null);
+        }
+
+        /// <summary>
+        /// Reports a parse error by loading a
+        /// <see cref="Spring.Objects.ObjectsException"/> with helpful contextual
+        /// information and throwing said exception.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Derived classes can of course override this method in order to implement
+        /// validators capable of displaying a full list of errors found in the
+        /// definition.
+        /// </p>
+        /// </remarks>
+        /// <param name="node">
+        /// The node that triggered the parse error.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object that triggered the exception.
+        /// </param>
+        /// <param name="message">
+        /// A message about the error.
+        /// </param>
+        /// <param name="cause">
+        /// The root cause of the parse error (if any - may be <see langword="null"/>).
+        /// </param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// <b>Always</b> throws an instance of this exception class, that will
+        /// contain helpful contextual infomation about the parse error.
+        /// </exception>
+        public virtual void ReportException(
+            XmlNode node, string name, string message, Exception cause)
+        {
+            string xmlFragment;
+
+            if (node is XmlAttribute)
+            {
+                xmlFragment = ((XmlAttribute)node).OwnerElement.OuterXml;
+            }
+            else
+            {
+                xmlFragment = node.OuterXml;
+            }
+            if (xmlFragment.Length > MaxXmlErrorFragmentLength)
+            {
+                xmlFragment = xmlFragment.Substring(0, MaxXmlErrorFragmentLength) + "...";
+            }
+
+            string resourceDescription = Resource.Description;
+            int line = ConfigurationUtils.GetLineNumber(node);
+            if (line > 0)
+            {
+                string atLine = " at line " + line;
+                resourceDescription += atLine;
+            }
+            throw new ObjectDefinitionStoreException(
+                resourceDescription, name, message + Environment.NewLine + xmlFragment, cause);
+        }
+
+        /// <summary>
+        /// This method can be overwritten in order to implement validators
+        /// capable of displaying a full list of errors found in the definition.
+        /// </summary>
+        /// <param name="node">
+        /// The node that triggered the parse error.
+        /// </param>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public virtual void ReportFatalException(XmlNode node, string message)
+        {
+            throw new FatalObjectException(message);
+        }
+        
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-1.1.xsd b/src/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-1.1.xsd
new file mode 100644
index 00000000..71178b7a
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-1.1.xsd
@@ -0,0 +1,544 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsd:schema xmlns="http://www.springframework.net" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:vs="http://schemas.microsoft.com/Visual-Studio-Intellisense" targetNamespace="http://www.springframework.net" elementFormDefault="qualified" attributeFormDefault="unqualified" vs:friendlyname="Spring.NET Configuration" vs:ishtmlschema="false" vs:iscasesensitive="true" vs:requireattributequotes="true" vs:defaultnamespacequalifier="" vs:defaultnsprefix="">
+    <xsd:annotation>
+        <xsd:documentation>
+            Spring Objects XML Schema Definition
+            Based on Spring Beans DTD, authored by Rod Johnson &amp; Juergen Hoeller
+            
+            Author: Griffin Caprio
+            
+            This defines a simple and consistent way of creating a namespace
+            of managed objects configured by a Spring XmlObjectFactory.
+            This document type is used by most Spring functionality, including
+            web application contexts, which are based on object factories.
+            
+            Each object element in this document defines an object.
+            Typically the object type (System.Type is specified, along with plain vanilla
+            object properties.
+            
+            Object instances can be "singletons" (shared instances) or "prototypes"
+            (independent instances).
+            
+            References among objects are supported, i.e. setting an object property
+            to refer to another object in the same factory or an ancestor factory.
+            
+            As alternative to object references, "inner object definitions" can be used.
+            Singleton flags and names of such "inner object" are always ignored:
+            Inner object are anonymous prototypes.
+            
+            There is also support for lists, dictionaries, and sets.
+        </xsd:documentation>
+    </xsd:annotation>
+  
+  <!-- base types -->
+  <xsd:complexType name="identifiedType" abstract="true">
+    <xsd:annotation>
+      <xsd:documentation>
+        <![CDATA[
+	The unique identifier for a bean. The scope of the identifier
+	is the enclosing object factory.
+			]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="id" type="xsd:ID">
+      <xsd:annotation>
+        <xsd:documentation>
+          <![CDATA[
+	The unique identifier for an object.
+				]]>
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+
+  <xsd:annotation>
+        <xsd:documentation>Defines a base type for any required string.  Defines a string with a minimum length of 0</xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleType name="nonNullString">
+        <xsd:restriction base="xsd:string">
+            <xsd:minLength value="0"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:annotation>
+        <xsd:documentation>
+            Element containing informative text describing the purpose of the enclosing
+            element. Always optional.
+            Used primarily for user documentation of XML object definition documents.
+        </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleType name="description">
+        <xsd:restriction base="nonNullString"/>
+    </xsd:simpleType>
+    <xsd:complexType name="valueObject">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="type" type="nonNullString" use="optional"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:complexType name="expression">
+      <xsd:sequence>
+        <xsd:element name="property" type="property" minOccurs="0" maxOccurs="2"/>
+      </xsd:sequence>
+      <xsd:attribute name="value" type="nonNullString" use="required"/>
+    </xsd:complexType>
+    <!--
+         Defines a reference to another object in this factory or an external
+         factory (parent or included factory).
+    -->
+    <xsd:complexType name="objectReference">
+        <xsd:attribute name="object" type="nonNullString" use="optional"/>
+        <xsd:attribute name="local" type="xsd:IDREF" use="optional"/>
+        <xsd:attribute name="parent" type="nonNullString" use="optional"/>
+        <!--
+             References must specify a name of the target object.
+             The "object" attribute can reference any name from any object in the context,
+             to be checked at runtime.
+             Local references, using the "local" attribute, have to use object ids;
+             they can be checked by this DTD, thus should be preferred for references
+             within the same object factory XML file.
+        -->
+    </xsd:complexType>
+    <!-- Defines a reference to another object or a type. -->
+    <xsd:complexType name="objectOrClassReference">
+        <xsd:attribute name="object" type="nonNullString" use="optional"/>
+        <xsd:attribute name="local" type="xsd:IDREF" use="optional"/>
+        <xsd:attribute name="type" type="nonNullString" use="optional"/>
+    </xsd:complexType>
+    <xsd:group name="objectList">
+        <xsd:sequence>
+            <xsd:element name="description" type="description" minOccurs="0"/>
+            <xsd:choice>
+                <xsd:element name="object" type="vanillaObject"/>
+                <!--
+                     Defines a reference to another object in this factory or an external
+                     factory (parent or included factory).
+                -->
+                <xsd:element name="ref" type="objectReference"/>
+                <!--
+                     Defines a string property value, which must also be the id of another
+                     object in this factory or an external factory (parent or included factory).
+                     While a regular 'value' element could instead be used for the same effect,
+                     using idref in this case allows validation of local object ids by the xml
+                     parser, and name completion by helper tools.
+                -->
+                <xsd:element name="idref" type="objectReference"/>
+                <!--
+                     A objectList can contain multiple inner object, ref, collection, or value elements.
+                     Lists are untyped, pending generics support, although references will be
+                     strongly typed.
+                     A objectList can also map to an array type. The necessary conversion
+                     is automatically performed by AbstractObjectFactory.
+                -->
+                <xsd:element name="list">
+                    <xsd:complexType>
+                        <xsd:group ref="objectList" minOccurs="0" maxOccurs="unbounded"/>
+                        <xsd:attribute name="element-type" type="nonNullString" use="optional"/>
+                    </xsd:complexType>
+                </xsd:element>
+                <!--
+                     A set can contain multiple inner object, ref, collection, or value elements.
+                     Sets are untyped, pending generics support, although references will be
+                     strongly typed.
+                -->
+                <xsd:element name="set">
+                    <xsd:complexType>
+                        <xsd:group ref="objectList" minOccurs="0" maxOccurs="unbounded"/>
+                        <xsd:attribute name="element-type" type="nonNullString" use="optional"/>
+                    </xsd:complexType>
+                </xsd:element>
+                <!--
+                     A Spring map is a mapping from a string key to object (a .NET IDictionary).
+                     Maps may be empty.
+                -->
+                <xsd:element name="dictionary" type="objectMap"/>
+                <!--
+                     Name-values elements differ from map elements in that values must be strings.
+                     Name-values may be empty.
+                -->
+                <xsd:element name="name-values" type="objectNameValues"/>
+                <!--
+                     Contains a string representation of a property value.
+                     The property may be a string, or may be converted to the
+                     required type using the System.ComponentModel.TypeConverter
+                     machinery. This makes it possible for application developers
+                     to write custom TypeConverter implementations that can
+                     convert strings to objects.
+                     
+                     Note that this is recommended for simple objects only.
+                     Configure more complex objects by setting properties to references
+                     to other objects.
+                -->
+                <xsd:element name="value" type="valueObject"/>
+                <!--
+                     Contains a string representation of an expression.
+                -->
+                <xsd:element name="expression" type="expression"/>
+                <!--
+                     Denotes a .NET null value. Necessary because an empty "value" tag
+                     will resolve to an empty String, which will not be resolved to a
+                     null value unless a special TypeConverter does so.
+                -->
+        <xsd:element name="null" />
+        <xsd:any namespace="##other" processContents="strict" />
+      </xsd:choice>
+    </xsd:sequence>
+  </xsd:group>
+  <xsd:complexType name="objectNameValues">
+    <xsd:sequence>
+      <!--
+                 The "value" attribute is the string value of the property. The "key"
+                 attribute is the name of the property.
+            -->
+            <xsd:element name="add" minOccurs="0" maxOccurs="unbounded">
+                <xsd:complexType mixed="true">
+                    <xsd:attribute name="key" type="nonNullString" use="required"/>
+                    <xsd:attribute name="value" use="required" type="xsd:string"/>
+                    <xsd:attribute name="delimiters" use="optional" type="xsd:string"/>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="importElement">
+        <xsd:attribute name="resource" type="nonNullString" use="required"/>
+    </xsd:complexType>
+    <xsd:complexType name="aliasElement">
+        <xsd:attribute name="name" type="nonNullString" use="required"/>
+        <xsd:attribute name="alias" type="nonNullString" use="required"/>
+    </xsd:complexType>
+    <xsd:complexType name="objectMap">
+        <xsd:sequence>
+            <xsd:element type="mapEntryElement" name="entry" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="key-type" type="nonNullString" use="optional"/>
+        <xsd:attribute name="value-type" type="nonNullString" use="optional"/>
+    </xsd:complexType>
+    <xsd:complexType name="mapEntryElement">
+        <xsd:sequence>
+            <xsd:element type="mapKeyElement" name="key" minOccurs="0" maxOccurs="1"/>
+            <xsd:group ref="objectList" minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+        <xsd:attribute name="key" type="nonNullString" use="optional"/>
+        <xsd:attribute name="value" type="nonNullString" use="optional"/>
+        <xsd:attribute name="expression" type="nonNullString" use="optional"/>
+        <xsd:attribute name="key-ref" type="nonNullString" use="optional"/>
+        <xsd:attribute name="value-ref" type="nonNullString" use="optional"/>
+    </xsd:complexType>
+    <xsd:complexType name="mapKeyElement">
+        <xsd:group ref="objectList" minOccurs="1"/>
+    </xsd:complexType>
+    <xsd:annotation>
+        <xsd:documentation>Defines constructor argument.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType name="lookupMethod">
+        <xsd:attribute name="name" type="nonNullString" use="required"/>
+        <xsd:attribute name="object" type="nonNullString" use="required"/>
+    </xsd:complexType>
+    <xsd:complexType name="constructorArgument">
+        <xsd:group ref="objectList" minOccurs="0"/>
+        <!--
+              The constructor-arg tag can have an optional named parameter attribute,
+              to specify a named parameter in the constructor argument list.
+        -->
+        <xsd:attribute name="name" type="nonNullString" use="optional"/>
+        <!--
+              The constructor-arg tag can have an optional index attribute,
+              to specify the exact index in the constructor argument list. Only needed
+              to avoid ambiguities, e.g. in case of 2 arguments of the same type.
+        -->
+        <xsd:attribute name="index" type="nonNullString" use="optional"/>
+       <!--
+              The constructor-arg tag can have an optional type attribute,
+              to specify the exact type of the constructor argument. Only needed
+              to avoid ambiguities, e.g. in case of 2 single argument constructors
+              that can both be converted from a String.
+        -->
+        <xsd:attribute name="type" type="nonNullString" use="optional"/>
+        <xsd:attribute name="value" type="nonNullString" use="optional"/>
+        <xsd:attribute name="expression" type="nonNullString" use="optional"/>
+        <xsd:attribute name="ref" type="nonNullString" use="optional"/>
+    </xsd:complexType>
+    <xsd:annotation>
+        <xsd:documentation>Defines property.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType name="property">
+        <xsd:group ref="objectList" minOccurs="0"/>
+        <!-- The property name attribute is the name of the objects property. -->
+        <xsd:attribute name="name" type="nonNullString" use="required"/>
+        <xsd:attribute name="value" type="nonNullString" use="optional"/>
+        <xsd:attribute name="expression" type="nonNullString" use="optional"/>
+        <xsd:attribute name="ref" type="nonNullString" use="optional"/>
+    </xsd:complexType>
+    <xsd:annotation>
+        <xsd:documentation>Defines a single named object.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType name="vanillaObject">
+        <xsd:sequence>
+            <xsd:element name="description" type="description" minOccurs="0" maxOccurs="1"/>
+            <!--
+                 Object definitions can specify zero or more constructor arguments.
+                 They correspond to either a specific index of the constructor argument list
+                 or are supposed to be matched generically by type.
+                 This is an alternative to "autowire constructor".
+            -->
+            <xsd:element name="constructor-arg" type="constructorArgument" minOccurs="0" maxOccurs="unbounded"/>
+            <!--
+                 Object definitions can have zero or more properties.
+                 Spring supports primitives, references to other objects in the same or
+                 related factories, lists, dictionaries and properties.
+            -->
+            <xsd:element name="property" type="property" minOccurs="0" maxOccurs="unbounded"/>
+            <!--
+                 Object definitions can specify zero or more lookup-methods.
+            -->
+            <xsd:element name="lookup-method" type="lookupMethod" minOccurs="0" maxOccurs="unbounded"/>
+            <!-- Object definitions can have zero or more replaced-methods. -->
+            <xsd:element name="replaced-method" minOccurs="0" maxOccurs="unbounded">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="arg-type" minOccurs="0" maxOccurs="unbounded">
+                             <xsd:complexType>
+                                  <xsd:attribute name="match" type="nonNullString" use="required"/>
+                             </xsd:complexType>
+                        </xsd:element>
+                    </xsd:sequence>
+                    <xsd:attribute name="name" type="nonNullString" use="required"/>
+                    <xsd:attribute name="replacer" type="nonNullString" use="required"/>
+                </xsd:complexType>
+            </xsd:element>
+            <!-- Object definitions can have zero or more subscriptions. -->
+            <xsd:element name="listener" minOccurs="0" maxOccurs="unbounded">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="ref" type="objectOrClassReference" minOccurs="0" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                    <!-- The event(s) the object is interested in. -->
+                    <xsd:attribute name="event" type="nonNullString" use="optional"/>
+                    <!-- The name or name pattern of the method that will handle the event(s). -->
+                    <xsd:attribute name="method" type="nonNullString" use="required"/>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+        <!--
+             Objects can be identified by an id, to enable reference checking.
+             There are constraints on a valid XML id: if you want to reference your object
+             in .NET code using a name that's illegal as an XML id, use the optional
+             "name" attribute. If neither given, the object type name is used as id.
+        -->
+        <xsd:attribute name="id" type="xsd:ID" use="optional"/>
+        <!--
+             Optional. Can be used to create one or more aliases illegal in an id.
+             Multiple aliases can be separated by any number of spaces or commas.
+        -->
+        <xsd:attribute name="name" type="nonNullString" use="optional"/>
+        <!--
+             Each object definition must specify the full, assembly qualified of the type,
+             or the name of the parent object from which the type can be worked out.
+             
+             Note that a child object definition that references a parent will just
+             add respectively override property values and be able to change the
+             singleton status. It will inherit all of the parent's other parameters
+             like lazy initialization or autowire settings.
+        -->
+        <xsd:attribute name="type" type="nonNullString" use="optional"/>
+        <xsd:attribute name="parent" type="nonNullString" use="optional"/>
+        <!--
+             Is this object "abstract", i.e. not meant to be instantiated itself but
+             rather just serving as parent for concrete child object definitions?
+             Default is false. Specify true to tell the object factory to not try to
+             instantiate that particular object in any case.
+        -->
+        <xsd:attribute name="abstract" type="xsd:boolean" use="optional" default="false"/>
+        <!--
+             Is this object a "singleton" (one shared instance, which will
+             be returned by all calls to GetObject() with the id),
+             or a "prototype" (independent instance resulting from each call to
+             getObject(). Default is singleton.
+             
+             Singletons are most commonly used, and are ideal for multi-threaded
+             service objects.
+        -->
+        <xsd:attribute name="singleton" type="xsd:boolean" use="optional" default="true"/>
+        <!--
+             Optional attribute controlling the scope of singleton instances. It is
+             only applicable to ASP.Net web applications and it has no effect on prototype
+             objects. Applications other than ASP.Net web applications simply ignore this attribute.
+             It has 3 possible values:
+             1. "application"
+             Default object scope. Objects defined with application scope will behave like
+             traditional singleton objects. Same instance will be returned from every call
+             to IApplicationContext.GetObject()
+             
+             2. "session"
+             Objects with this scope will be stored within user's HTTP session. Session scope
+             is typically used for objects such as shopping cart, user profile, etc.
+             
+             3. "request"
+             Object with this scope will be initialized for each HTTP request, but unlike with prototype
+             objects, same instance will be returned from all calls to IApplicationContext.GetObject()
+             within the same HTTP request. For example, if one ASP page forwards request to another using
+             Server.Transfer method, they can easily share the state by configuring dependency to the same
+             request-scoped object.
+        -->
+        <xsd:attribute name="scope" use="optional" default="application">
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:enumeration value="application"/>
+                    <xsd:enumeration value="session"/>
+                    <xsd:enumeration value="request"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <!--
+             Is this object to be lazily initialized?
+             If false, it will get instantiated on startup by object factories
+             that perform eager initialization of singletons.
+        -->
+        <xsd:attribute name="lazy-init" use="optional" default="default">
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:enumeration value="true"/>
+                    <xsd:enumeration value="false"/>
+                    <xsd:enumeration value="default"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <!--
+             Optional attribute controlling whether to "autowire" object properties.
+             This is an automagical process in which object references don't need to be coded
+             explicitly in the XML object definition file, but Spring works out dependencies.
+             
+             There are 5 modes:
+             
+             1. "no"
+             The traditional Spring default. No automagical wiring. Object references
+             must be defined in the XML file via the <ref> element. We recommend this
+             in most cases as it makes documentation more explicit.
+             
+             2. "byName"
+             Autowiring by property name. If a object of class Cat exposes a dog property,
+             Spring will try to set this to the value of the object "dog" in the current factory.
+             
+             3. "byType"
+             Autowiring if there is exactly one object of the property type in the object factory.
+             If there is more than one, a fatal error is raised, and you can't use byType
+             autowiring for that object. If there is none, nothing special happens - use
+             dependency-check="objects" to raise an error in that case.
+             
+             4. "constructor"
+             Analogous to "byType" for constructor arguments. If there isn't exactly one object
+             of the constructor argument type in the object factory, a fatal error is raised.
+             
+             5. "autodetect"
+             Chooses "constructor" or "byType" through introspection of the object class.
+             If a default constructor is found, "byType" gets applied.
+             
+             The latter two are similar to PicoContainer and make object factories simple to
+             configure for small namespaces, but doesn't work as well as standard Spring
+             behaviour for bigger applications.
+             
+             Note that explicit dependencies, i.e. "property" and "constructor-arg" elements,
+             always override autowiring. Autowire behaviour can be combined with dependency
+             checking, which will be performed after all autowiring has been completed.
+        -->
+        <xsd:attribute name="autowire" use="optional" default="default">
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:enumeration value="no"/>
+                    <xsd:enumeration value="byName"/>
+                    <xsd:enumeration value="byType"/>
+                    <xsd:enumeration value="constructor"/>
+                    <xsd:enumeration value="autodetect"/>
+                    <xsd:enumeration value="default"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <!--
+             Optional attribute controlling whether to check whether all this
+             objects dependencies, expressed in its properties, are satisfied.
+             Default is no dependency checking.
+             
+             "simple" type dependency checking includes primitives and String
+             "object" includes collaborators (other objects in the factory)
+             "all" includes both types of dependency checking
+        -->
+        <xsd:attribute name="dependency-check" use="optional" default="default">
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:enumeration value="none"/>
+                    <xsd:enumeration value="objects"/>
+                    <xsd:enumeration value="simple"/>
+                    <xsd:enumeration value="all"/>
+                    <xsd:enumeration value="default"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <!--
+             The names of the objects that this object depends on being initialized.
+             The object factory will guarantee that these objects get initialized before.
+             
+             Note that dependencies are normally expressed through object properties or
+             constructor arguments. This property should just be necessary for other kinds
+             of dependencies like statics (*ugh*) or database preparation on startup.
+        -->
+        <xsd:attribute name="depends-on" type="nonNullString" use="optional"/>
+        <!--
+             Optional attribute for the name of the custom initialization method
+             to invoke after setting object properties. The method must have no arguments,
+             but may throw any exception.
+        -->
+        <xsd:attribute name="init-method" type="nonNullString" use="optional"/>
+        <!--
+             Optional attribute for the name of the custom destroy method to invoke
+             on object factory shutdown. The method must have no arguments,
+             but may throw any exception. Note: Only invoked on singleton objects!
+        -->
+        <xsd:attribute name="destroy-method" type="nonNullString" use="optional"/>
+        <xsd:attribute name="factory-method" type="nonNullString" use="optional"/>
+        <xsd:attribute name="factory-object" type="nonNullString" use="optional"/>
+    </xsd:complexType>
+    
+    <xsd:annotation>
+        <xsd:documentation>The document root.  At least one object definition is required.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:element name="objects">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="description" type="description" minOccurs="0" maxOccurs="1"/>
+                <xsd:choice minOccurs="0" maxOccurs="unbounded">
+                    <xsd:element name="import" type="importElement"/>
+                    <xsd:element name="alias" type="aliasElement"/>
+                    <xsd:element name="object" type="vanillaObject"/>
+                    <xsd:any namespace="##other" processContents="strict"/>
+                </xsd:choice>
+            </xsd:sequence>
+            <!--
+                 Default values for all object definitions. Can be overridden at
+                 the "object" level. See those attribute definitions for details.
+            -->
+            <xsd:attribute name="default-lazy-init" type="xsd:boolean" use="optional" default="false"/>
+            <xsd:attribute name="default-dependency-check" use="optional" default="none">
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:string">
+                        <xsd:enumeration value="none"/>
+                        <xsd:enumeration value="objects"/>
+                        <xsd:enumeration value="simple"/>
+                        <xsd:enumeration value="all"/>
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:attribute>
+            <xsd:attribute name="default-autowire" use="optional" default="no">
+                <xsd:simpleType>
+                    <xsd:restriction base="xsd:string">
+                        <xsd:enumeration value="no"/>
+                        <xsd:enumeration value="byName"/>
+                        <xsd:enumeration value="byType"/>
+                        <xsd:enumeration value="constructor"/>
+                        <xsd:enumeration value="autodetect"/>
+                    </xsd:restriction>
+                </xsd:simpleType>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
+    
+</xsd:schema>
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-1.1.xsx b/src/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-1.1.xsx
new file mode 100644
index 00000000..d79bfd40
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-1.1.xsx
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.-->
+<XSDDesignerLayout Style="LeftRight" layoutVersion="2" viewPortLeft="0" viewPortTop="0" zoom="100">
+    <identifiedType_XmlComplexType left="1317" top="167061" width="5292" height="3757" selected="0" zOrder="8" index="0" expanded="1" />
+    <nonNullString_XmlSimpleType left="1317" top="1254" width="5292" height="3625" selected="0" zOrder="5" index="1" expanded="1" />
+    <description_XmlSimpleType left="1317" top="5387" width="5292" height="3625" selected="0" zOrder="6" index="2" expanded="1" />
+    <valueObject_XmlComplexType left="1317" top="9520" width="5292" height="3625" selected="0" zOrder="7" index="3" expanded="1" />
+    <expression_XmlComplexType left="1317" top="13653" width="5292" height="3625" selected="0" zOrder="9" index="4" expanded="1">
+        <property_XmlElement left="7243" top="13653" width="5292" height="3625" selected="0" zOrder="10" index="0" expanded="0" />
+    </expression_XmlComplexType>
+    <objectReference_XmlComplexType left="1317" top="17786" width="5292" height="3757" selected="0" zOrder="12" index="5" expanded="1" />
+    <objectOrClassReference_XmlComplexType left="1317" top="22051" width="5292" height="3757" selected="0" zOrder="13" index="6" expanded="1" />
+    <objectList_XmlGroup left="1317" top="43376" width="5292" height="3757" selected="0" zOrder="14" index="7" expanded="1">
+        <_x0028_group1_x0029__XmlChoice left="7243" top="43376" width="5292" height="3757" selected="0" zOrder="15" index="1" expanded="1">
+            <object_XmlElement left="13169" top="26316" width="5292" height="3757" selected="0" zOrder="17" index="0" expanded="0" />
+            <ref_XmlElement left="13169" top="30581" width="5292" height="3757" selected="0" zOrder="19" index="1" expanded="0" />
+            <idref_XmlElement left="13169" top="34846" width="5292" height="3757" selected="0" zOrder="21" index="2" expanded="0" />
+            <list_XmlElement left="13169" top="39111" width="5292" height="3757" selected="0" zOrder="23" index="3" expanded="1">
+                <_x0028_group1_x0029__XmlChoice left="19095" top="39111" width="5292" height="3757" selected="0" zOrder="25" index="1" expanded="0" />
+            </list_XmlElement>
+            <set_XmlElement left="13169" top="43376" width="5292" height="3757" selected="0" zOrder="27" index="4" expanded="1">
+                <_x0028_group1_x0029__XmlChoice left="19095" top="43376" width="5292" height="3757" selected="0" zOrder="29" index="1" expanded="0" />
+            </set_XmlElement>
+            <dictionary_XmlElement left="13169" top="47641" width="5292" height="3757" selected="0" zOrder="31" index="5" expanded="0" />
+            <name-values_XmlElement left="13169" top="51906" width="5292" height="3757" selected="0" zOrder="33" index="6" expanded="0" />
+            <value_XmlElement left="13169" top="56171" width="5292" height="3757" selected="0" zOrder="35" index="7" expanded="0" />
+            <expression_XmlElement left="13169" top="60436" width="5292" height="3757" selected="0" zOrder="37" index="8" expanded="0" />
+        </_x0028_group1_x0029__XmlChoice>
+    </objectList_XmlGroup>
+    <objectNameValues_XmlComplexType left="1317" top="64701" width="5292" height="3757" selected="0" zOrder="39" index="8" expanded="1">
+        <add_XmlElement left="7243" top="64701" width="5292" height="3757" selected="0" zOrder="40" index="0" expanded="1" />
+    </objectNameValues_XmlComplexType>
+    <importElement_XmlComplexType left="1317" top="68966" width="5292" height="3757" selected="0" zOrder="42" index="9" expanded="1" />
+    <aliasElement_XmlComplexType left="1317" top="73231" width="5292" height="3757" selected="0" zOrder="43" index="10" expanded="1" />
+    <objectMap_XmlComplexType left="1317" top="77496" width="5292" height="3757" selected="0" zOrder="44" index="11" expanded="1">
+        <entry_XmlElement left="7243" top="77496" width="5292" height="3757" selected="0" zOrder="45" index="0" expanded="0" />
+    </objectMap_XmlComplexType>
+    <mapEntryElement_XmlComplexType left="1317" top="83893" width="5292" height="3757" selected="0" zOrder="47" index="12" expanded="1">
+        <key_XmlElement left="7243" top="81761" width="5292" height="3757" selected="0" zOrder="48" index="0" expanded="0" />
+        <ref_x003D_objectList_XmlGroup left="7243" top="86026" width="5292" height="3757" selected="0" zOrder="50" index="1" expanded="0" />
+    </mapEntryElement_XmlComplexType>
+    <mapKeyElement_XmlComplexType left="1317" top="90291" width="5292" height="3757" selected="0" zOrder="52" index="13" expanded="1">
+        <_x0028_group1_x0029__XmlChoice left="7243" top="90291" width="5292" height="3757" selected="0" zOrder="53" index="1" expanded="0" />
+    </mapKeyElement_XmlComplexType>
+    <lookupMethod_XmlComplexType left="1317" top="94556" width="5292" height="3757" selected="0" zOrder="55" index="14" expanded="1" />
+    <constructorArgument_XmlComplexType left="1317" top="98821" width="5292" height="3757" selected="0" zOrder="56" index="15" expanded="1">
+        <_x0028_group1_x0029__XmlChoice left="7243" top="98821" width="5292" height="3757" selected="0" zOrder="57" index="1" expanded="0" />
+    </constructorArgument_XmlComplexType>
+    <property_XmlComplexType left="1317" top="103086" width="5292" height="3757" selected="0" zOrder="59" index="16" expanded="1">
+        <_x0028_group1_x0029__XmlChoice left="7243" top="103086" width="5292" height="3757" selected="0" zOrder="60" index="1" expanded="0" />
+    </property_XmlComplexType>
+    <vanillaObject_XmlComplexType left="1317" top="123716" width="5292" height="3757" selected="0" zOrder="62" index="17" expanded="1">
+        <constructor-arg_XmlElement left="7243" top="107351" width="5292" height="3757" selected="0" zOrder="63" index="1" expanded="0" />
+        <property_XmlElement left="7243" top="111616" width="5292" height="3757" selected="0" zOrder="65" index="2" expanded="0" />
+        <lookup-method_XmlElement left="7243" top="115881" width="5292" height="3757" selected="0" zOrder="67" index="3" expanded="0" />
+        <replaced-method_XmlElement left="7243" top="120146" width="5292" height="3757" selected="0" zOrder="69" index="4" expanded="1">
+            <arg-type_XmlElement left="13169" top="120146" width="5292" height="3757" selected="0" zOrder="71" index="0" expanded="1" />
+        </replaced-method_XmlElement>
+        <listener_XmlElement left="7243" top="124411" width="5292" height="3757" selected="0" zOrder="73" index="5" expanded="1">
+            <ref_XmlElement left="13169" top="124411" width="5292" height="3757" selected="0" zOrder="75" index="0" expanded="0" />
+        </listener_XmlElement>
+        <scope_XmlAttribute left="7243" top="130065" width="5292" height="979" selected="0" zOrder="77" index="12" expanded="1">
+            <_x0028_scope_x0029__XmlSimpleType left="13169" top="128676" width="5292" height="3757" selected="0" zOrder="79" index="0" expanded="1" />
+        </scope_XmlAttribute>
+        <lazy-init_XmlAttribute left="7243" top="134330" width="5292" height="979" selected="0" zOrder="81" index="13" expanded="1">
+            <_x0028_lazy-init_x0029__XmlSimpleType left="13169" top="132941" width="5292" height="3757" selected="0" zOrder="83" index="0" expanded="1" />
+        </lazy-init_XmlAttribute>
+        <autowire_XmlAttribute left="7243" top="138595" width="5292" height="979" selected="0" zOrder="85" index="14" expanded="1">
+            <_x0028_autowire_x0029__XmlSimpleType left="13169" top="137206" width="5292" height="3757" selected="0" zOrder="87" index="0" expanded="1" />
+        </autowire_XmlAttribute>
+        <dependency-check_XmlAttribute left="7243" top="142860" width="5292" height="979" selected="0" zOrder="89" index="15" expanded="1">
+            <_x0028_dependency-check_x0029__XmlSimpleType left="13169" top="141471" width="5292" height="3757" selected="0" zOrder="91" index="0" expanded="1" />
+        </dependency-check_XmlAttribute>
+    </vanillaObject_XmlComplexType>
+    <objects_XmlElement left="1317" top="155704" width="5292" height="3757" selected="0" zOrder="93" index="18" expanded="1">
+        <_x0028_group1_x0029__XmlChoice left="7243" top="150001" width="5292" height="3757" selected="0" zOrder="94" index="1" expanded="1">
+            <import_XmlElement left="13169" top="145736" width="5292" height="3757" selected="0" zOrder="96" index="0" expanded="0" />
+            <alias_XmlElement left="13169" top="150001" width="5292" height="3757" selected="0" zOrder="98" index="1" expanded="0" />
+            <object_XmlElement left="13169" top="154266" width="5292" height="3757" selected="0" zOrder="100" index="2" expanded="0" />
+        </_x0028_group1_x0029__XmlChoice>
+        <default-dependency-check_XmlAttribute left="7243" top="159920" width="5292" height="979" selected="0" zOrder="102" index="3" expanded="1">
+            <_x0028_default-dependency-check_x0029__XmlSimpleType left="13169" top="158531" width="5292" height="3757" selected="0" zOrder="104" index="0" expanded="1" />
+        </default-dependency-check_XmlAttribute>
+        <default-autowire_XmlAttribute left="7243" top="164185" width="5292" height="979" selected="0" zOrder="106" index="4" expanded="1">
+            <_x0028_default-autowire_x0029__XmlSimpleType left="13169" top="162796" width="5292" height="3757" selected="0" zOrder="108" index="0" expanded="1" />
+        </default-autowire_XmlAttribute>
+    </objects_XmlElement>
+</XSDDesignerLayout>
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/spring-tool-1.1.xsd b/src/Spring/Spring.Core/Objects/Factory/Xml/spring-tool-1.1.xsd
new file mode 100644
index 00000000..009b5891
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Factory/Xml/spring-tool-1.1.xsd
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://www.springframework.net/tool"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		targetNamespace="http://www.springframework.net/tool"
+		elementFormDefault="qualified">
+
+	<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+
+	<xsd:annotation>
+		<xsd:documentation><![CDATA[
+	Defines the tool support annotations for Spring's configuration namespaces.
+	Used in other namespace XSD files; not intended for direct use in config files.
+		]]></xsd:documentation>
+	</xsd:annotation>
+
+	<xsd:element name="annotation">
+		<xsd:complexType>
+			<xsd:sequence minOccurs="0">
+				<xsd:element name="expected-type" type="typedParameterType" minOccurs="0" maxOccurs="1"/>
+				<xsd:element name="assignable-to" type="typedParameterType" minOccurs="0" maxOccurs="1"/>
+				<xsd:element name="exports" type="exportsType" minOccurs="0" maxOccurs="1"/>
+			</xsd:sequence>
+			<xsd:attribute name="kind" default="direct">
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:string">
+						<xsd:enumeration value="ref"/>
+						<xsd:enumeration value="direct"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:complexType name="typedParameterType">
+		<xsd:attribute name="type" type="xsd:string" use="required"/>
+	</xsd:complexType>
+
+	<xsd:complexType name="exportsType">
+		<xsd:annotation>
+			<xsd:documentation>
+				Indicates that an annotated type exports an application visible component.
+			</xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="type" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+					The type of the exported component. May be null if the type is not known until runtime.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="identifier" type="xsd:string" default="@id">
+			<xsd:annotation>
+				<xsd:documentation>
+					Defines an XPath query that can be executed against the node annotated with this
+					type to determine the identifier of any exported component.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+</xsd:schema>
diff --git a/src/Spring/Spring.Core/Objects/FatalObjectException.cs b/src/Spring/Spring.Core/Objects/FatalObjectException.cs
new file mode 100644
index 00000000..d2b51009
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/FatalObjectException.cs
@@ -0,0 +1,91 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Objects
+{
+    /// <summary>
+    /// Thrown on an unrecoverable problem encountered in the
+    /// objects namespace or sub-namespaces, e.g. bad class or field.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: FatalObjectException.cs,v 1.7 2006/04/09 07:18:49 markpollack Exp $
+    /// </version>
+    [Serializable]
+    public class FatalObjectException : ObjectsException
+    {
+        /// <summary>
+        /// Creates a new instance of the FatalObjectException class.
+        /// </summary>
+        public FatalObjectException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the FatalObjectException class with the
+        /// specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public FatalObjectException(string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the FatalObjectException class with the
+        /// specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public FatalObjectException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the FatalObjectException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected FatalObjectException (
+            SerializationInfo info, StreamingContext context)
+            : base (info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/IEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/IEventHandlerValue.cs
new file mode 100644
index 00000000..7b1ff97e
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/IEventHandlerValue.cs
@@ -0,0 +1,72 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Describes an event handler.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: IEventHandlerValue.cs,v 1.6 2006/04/09 07:18:49 markpollack Exp $</version>
+	public interface IEventHandlerValue 
+    {
+        /// <summary>
+        /// The source of the event.
+        /// </summary>
+        object Source 
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The name of the method that is going to handle the event.
+        /// </summary>
+        string MethodName 
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// The name of the event that is being wired up.
+        /// </summary>
+        string EventName 
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Wires up the specified handler to the named event on the
+        /// supplied event source.
+        /// </summary>
+        /// <param name="source">
+        /// The object (an object instance, a <see cref="System.Type"/>, etc)
+        /// exposing the named event.
+        /// </param>
+        /// <param name="handler">
+        /// The handler for the event (an object instance, a
+        /// <see cref="System.Type"/>, etc).
+        /// </param>
+        void Wire (object source, object handler);
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/IObjectWrapper.cs b/src/Spring/Spring.Core/Objects/IObjectWrapper.cs
new file mode 100644
index 00000000..3081fc97
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/IObjectWrapper.cs
@@ -0,0 +1,208 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Objects
+{
+    /// <summary> 
+    /// The central interface of Spring.NET's low-level object infrastructure.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Typically not directly used by application code but rather implicitly
+    /// via an <see cref="Spring.Objects.Factory.IObjectFactory"/>.
+    /// </p>
+    /// <p>
+    /// Implementing classes have the ability to get and set property values
+    /// (individually or in bulk), get property descriptors and query the
+    /// readability and writability of properties.
+    /// </p>
+    /// <p>
+    /// This interface supports <b>nested properties</b> enabling the setting
+    /// of properties on subproperties to an unlimited depth.
+    /// </p>
+    /// <p>
+    /// If a property update causes an exception, a
+    /// <see cref="PropertyAccessException"/> will be thrown. Bulk
+    /// updates continue after exceptions are encountered, throwing an exception
+    /// wrapping <b>all</b> exceptions encountered during the update.
+    /// </p>
+    /// <p>
+    /// <see cref="Spring.Objects.IObjectWrapper"/> implementations can be used
+    /// repeatedly, with their "target" or wrapped object changed.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: IObjectWrapper.cs,v 1.15 2007/07/31 21:43:52 markpollack Exp $
+    /// </version>
+    public interface IObjectWrapper
+    {
+        /// <summary>
+        /// The object wrapped by the wrapper (cannot be <see lang="null"/>).
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Implementations are required to allow the type of the wrapped 
+        /// object to change.
+        /// </p>
+        /// </remarks>
+        /// <returns>The object wrapped by this wrapper.</returns>
+        object WrappedInstance { get; set; }
+
+    	/// <summary>
+    	/// Convenience method to return the <see cref="System.Type"/>
+    	/// of the wrapped object.
+    	/// </summary>
+    	/// <returns>The <see cref="System.Type"/> of the wrapped object.</returns>
+    	Type WrappedType { get; }
+
+    	/// <summary>Get the value of a property.</summary>
+    	/// <param name="theProperty">
+    	/// The name of the property to get the value of. May be nested.
+    	/// </param>
+    	/// <returns>The value of the property.</returns>
+    	/// <exception cref="Spring.Objects.FatalObjectException">
+    	/// if the property isn't readable, or if the getting the value throws
+    	/// an exception.
+    	/// </exception>
+    	object GetPropertyValue(string theProperty);
+
+    	/// <summary>
+    	/// Get the <see cref="System.Reflection.PropertyInfo"/> for a particular
+    	/// property.
+    	/// </summary>
+    	/// <param name="theProperty">
+    	/// The property to be retrieved.
+    	/// </param>
+    	/// <returns>
+    	/// The <see cref="System.Reflection.PropertyInfo"/> for the particular
+    	/// property.
+    	/// </returns>
+		PropertyInfo GetPropertyInfo(string theProperty);
+
+		/// <summary>
+		/// Get the <see cref="System.Type"/> for a particular property.
+		/// </summary>
+		/// <param name="theProperty">
+		/// The property the <see cref="System.Type"/> of which is to be retrieved.
+		/// </param>
+		/// <returns>
+		/// The <see cref="System.Type"/> for a particular property..
+		/// </returns>
+		Type GetPropertyType(string theProperty);
+
+    	/// <summary>
+    	/// Get all of the <see cref="System.Reflection.PropertyInfo"/> instances for
+    	/// all of the properties of the wrapped object.
+    	/// </summary>
+    	/// <returns>
+    	/// An array of <see cref="System.Reflection.PropertyInfo"/> instances.
+    	/// </returns>
+    	PropertyInfo[] GetPropertyInfos();
+
+    	/// <summary>
+    	/// Set a property value.
+    	/// </summary>
+    	/// <remarks>
+    	/// <p>
+    	/// <b>This is the preferred way to update an individual property.</b>
+    	/// </p>
+    	/// </remarks>
+    	/// <param name="propertyValue">The new property value.</param>
+    	void SetPropertyValue(PropertyValue propertyValue);
+
+    	/// <summary>
+    	/// Set a property value.
+    	/// </summary>
+    	/// <remarks>
+    	/// <p>
+    	/// This method is provided for convenience only. The
+    	/// <see cref="Spring.Objects.IObjectWrapper.SetPropertyValue(PropertyValue)"/>
+    	/// method is more powerful.
+    	/// </p>
+    	/// </remarks>
+    	/// <param name="theProperty">
+    	/// The name of the property to set value of.
+    	/// </param>
+    	/// <param name="propertyValue">The new property value.</param>
+    	void SetPropertyValue(string theProperty, object propertyValue);
+
+    	/// <summary>Set a number of property values in bulk.</summary>
+    	/// <remarks>
+    	/// <p>
+    	/// This is the preferred way to perform a bulk update.
+    	/// </p>
+    	/// <p>
+    	/// Note that performing a bulk update differs from performing a single update,
+    	/// in that an implementation of this class will continue to update properties
+    	/// if a <b>recoverable</b> error (such as a vetoed property change or a type
+    	/// mismatch, but <b>not</b> an invalid property name or the like) is
+    	/// encountered, throwing a
+    	/// <see cref="Spring.Objects.PropertyAccessExceptionsException"/> containing
+    	/// all the individual errors. This exception can be examined later to see all
+    	/// binding errors. Properties that were successfully updated stay changed.
+    	/// </p>
+    	/// <p>
+    	/// Does not allow the setting of unknown fields. Equivalent to
+    	/// <see cref="Spring.Objects.IObjectWrapper.SetPropertyValues(IPropertyValues,bool)"/>
+    	/// with an argument of <c>false</c> for the second parameter.
+    	/// </p>
+    	/// </remarks>
+    	/// <param name="values">
+    	/// The collection of <see cref="Spring.Objects.PropertyValue"/> instances to
+    	/// set on the wrapped object.
+    	/// </param>
+    	void SetPropertyValues(IPropertyValues values);
+
+    	/// <summary>
+    	/// Set a number of property values in bulk with full control over behavior.
+    	/// </summary>
+    	/// <remarks>
+    	/// <p>
+    	/// Note that performing a bulk update differs from performing a single update,
+    	/// in that an implementation of this class will continue to update properties
+    	/// if a <b>recoverable</b> error (such as a vetoed property change or a type
+    	/// mismatch, but <b>not</b> an invalid property name or the like) is
+    	/// encountered, throwing a
+    	/// <see cref="Spring.Objects.PropertyAccessExceptionsException"/> containing
+    	/// all the individual errors. This exception can be examined later to see all
+    	/// binding errors. Properties that were successfully updated stay changed.
+    	/// </p>
+    	/// <p>Does not allow the setting of unknown fields.
+    	/// </p>
+    	/// </remarks>
+    	/// <param name="values">
+    	/// The <see cref="Spring.Objects.IPropertyValues"/> to set on the target object
+    	/// </param>
+    	/// <param name="ignoreUnknown">
+    	/// Should we ignore unknown values (not found in the object!?)
+    	/// </param>
+    	void SetPropertyValues(IPropertyValues values, bool ignoreUnknown);
+
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/IPropertyValues.cs b/src/Spring/Spring.Core/Objects/IPropertyValues.cs
new file mode 100644
index 00000000..da6e032b
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/IPropertyValues.cs
@@ -0,0 +1,90 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+
+#endregion
+
+namespace Spring.Objects
+{
+    /// <summary>
+    /// A collection style container for <see cref="Spring.Objects.PropertyValue"/>
+    /// instances.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET) </author>
+    /// <version>$Id: IPropertyValues.cs,v 1.7 2006/04/09 07:18:49 markpollack Exp $</version>
+    public interface IPropertyValues : IEnumerable
+    {
+        /// <summary>
+        /// Return an array of the <see cref="Spring.Objects.PropertyValue"/> objects
+        /// held in this object.</summary>
+        /// <returns>
+        /// An array of the <see cref="Spring.Objects.PropertyValue"/> objects held
+        /// in this object.
+        /// </returns>
+        PropertyValue [] PropertyValues
+        {
+            get;
+        }
+		
+        /// <summary>
+        /// Return the <see cref="Spring.Objects.PropertyValue"/> instance with the
+        /// given name.
+        /// </summary>
+        /// <param name="propertyName">The name to search for.</param>
+        /// <returns>the <see cref="Spring.Objects.PropertyValue"/>, or null if a 
+        /// the <see cref="Spring.Objects.PropertyValue"/> with the supplied
+        /// <paramref name="propertyName"/> did not exist in this collection.
+        /// </returns>
+        PropertyValue GetPropertyValue(string propertyName);
+		
+        /// <summary>
+        /// Is there a <see cref="Spring.Objects.PropertyValue"/> instance for this
+        /// property name?
+        /// </summary>
+        /// <param name="propertyName">The name to search for.</param>
+        /// <returns>
+        /// True if there is a <see cref="Spring.Objects.PropertyValue"/> instance for
+        /// the supplied <paramref name="propertyName"/>.
+        /// </returns>
+        bool Contains(string propertyName);
+		
+        /// <summary>
+        /// Return the difference (changes, additions, but not removals) of
+        /// property values between the supplied argument and the values
+        /// contained in the collection.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Subclasses should also override <c>Equals</c>.
+        /// </p>
+        /// </remarks>
+        /// <param name="old">The old property values.</param>
+        /// <returns>
+        /// An <see cref="Spring.Objects.IPropertyValues"/> containing any changes, or
+        /// an empty <see cref="Spring.Objects.IPropertyValues"/> instance if there were
+        /// no changes.
+        /// </returns>
+        IPropertyValues ChangesSince (IPropertyValues old);
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/MutablePropertyValues.cs b/src/Spring/Spring.Core/Objects/MutablePropertyValues.cs
new file mode 100644
index 00000000..296813f7
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/MutablePropertyValues.cs
@@ -0,0 +1,348 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Text;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects
+{
+    /// <summary>
+    /// Default implementation of the <see cref="Spring.Objects.IPropertyValues"/>
+    /// interface.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Allows simple manipulation of properties, and provides constructors to
+    /// support deep copy and construction from a number of collection types such as
+    /// <see cref="System.Collections.IDictionary"/> and
+    /// <see cref="System.Collections.IList"/>.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: MutablePropertyValues.cs,v 1.15 2007/03/16 04:01:29 aseovic Exp $</version>
+    [Serializable]
+    public class MutablePropertyValues : IPropertyValues
+    {
+        #region Fields
+
+        /// <summary>
+        /// The list of <see cref="Spring.Objects.PropertyValue"/> objects.
+        /// </summary>
+        private IList propertyValuesList = new ArrayList();
+
+        #endregion
+		
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Objects.MutablePropertyValues"/>
+        /// class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The returned instance is initially empty...
+        /// <see cref="Spring.Objects.PropertyValue"/>s can be added with the various
+        /// overloaded <see cref="Spring.Objects.MutablePropertyValues.Add(PropertyValue)"/>,
+        /// <see cref="Spring.Objects.MutablePropertyValues.Add(string, object)"/>,
+        /// <see cref="Spring.Objects.MutablePropertyValues.AddAll(IDictionary)"/>,
+        /// and <see cref="Spring.Objects.MutablePropertyValues.AddAll(IList)"/>
+        /// methods.
+        /// </p>
+        /// </remarks>
+        /// <seealso cref="Spring.Objects.MutablePropertyValues.Add (PropertyValue)"/>
+        /// <seealso cref="Spring.Objects.MutablePropertyValues.Add (string, object)"/>
+        public MutablePropertyValues ()
+        {
+        }
+        
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Objects.MutablePropertyValues"/>
+        /// class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Deep copy constructor. Guarantees <see cref="Spring.Objects.PropertyValue"/>
+        /// references are independent, although it can't deep copy objects currently
+        /// referenced by individual <see cref="Spring.Objects.PropertyValue"/> objects.
+        /// </p>
+        /// </remarks>
+        public MutablePropertyValues (IPropertyValues other)
+        {
+            if (other != null)
+            {
+                AddAll (other.PropertyValues);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Objects.MutablePropertyValues"/>
+        /// class.
+        /// </summary>
+        /// <param name="map">
+        /// The <see cref="System.Collections.IDictionary"/> with property values
+        /// keyed by property name, which must be a <see cref="System.String"/>.
+        /// </param>
+        public MutablePropertyValues (IDictionary map)
+        {
+            AddAll (map);
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Property to retrieve the array of property values.
+        /// </summary>
+        public PropertyValue[] PropertyValues
+        {
+            get { return (PropertyValue[]) ArrayList.Adapter (propertyValuesList).ToArray (typeof (PropertyValue)); }
+        }
+
+        #endregion
+		
+        #region Methods
+
+        /// <summary>
+        /// Overloaded version of <c>Add</c> that takes a property name and a property value.
+        /// </summary>
+        /// <param name="propertyName">
+        /// The name of the property.
+        /// </param>
+        /// <param name="propertyValue">
+        /// The value of the property.
+        /// </param>
+        public void Add (string propertyName, object propertyValue)
+        {
+            Add (new PropertyValue (propertyName, propertyValue));
+        }
+
+        /// <summary>
+        /// Add the supplied <see cref="Spring.Objects.PropertyValue"/> object,
+        /// replacing any existing one for the respective property.
+        /// </summary>
+        /// <param name="pv">
+        /// The <see cref="Spring.Objects.PropertyValue"/> object to add.
+        /// </param>
+        public void Add (PropertyValue pv)
+        {
+            for (int i = 0; i < propertyValuesList.Count; ++i)
+            {
+                PropertyValue currentPv = (PropertyValue) propertyValuesList [i];
+                if (currentPv.Name.Equals (pv.Name))
+                {
+                    propertyValuesList[i] = pv;
+                    return ;
+                }
+            }
+            propertyValuesList.Add (pv);
+        }
+
+        /// <summary>
+        /// Add all property values from the given
+        /// <see cref="System.Collections.IDictionary"/>.
+        /// </summary>
+        /// <param name="map">
+        /// The map of property values, the keys of which must be
+        /// <see cref="System.String"/>s.
+        /// </param>
+        public void AddAll (IDictionary map) 
+        {
+            if (map != null) 
+            {
+                foreach (string key in map.Keys) 
+                {
+                    Add (new PropertyValue (key, map [key]));
+                }
+            }
+        }
+        
+        /// <summary>
+        /// Add all property values from the given
+        /// <see cref="System.Collections.IList"/>.
+        /// </summary>
+        /// <param name="values">
+        /// The list of <see cref="Spring.Objects.PropertyValue"/>s to be added.
+        /// </param>
+        public void AddAll (IList values) 
+        {
+            if (values != null) 
+            {
+                foreach (PropertyValue value in values) 
+                {
+                    Add (value);
+                }
+            }
+        }
+		
+        /// <summary>
+        /// Remove the given <see cref="Spring.Objects.PropertyValue"/>, if contained.
+        /// </summary>
+        /// <param name="pv">
+        /// The <see cref="Spring.Objects.PropertyValue"/> to remove.
+        /// </param>
+        public void Remove (PropertyValue pv)
+        {
+            propertyValuesList.Remove (pv);
+        }
+		
+        /// <summary>
+        /// Removes the named <see cref="Spring.Objects.PropertyValue"/>, if contained.
+        /// </summary>
+        /// <param name="propertyName">
+        /// The name of the property.
+        /// </param>
+        public void Remove (string propertyName)
+        {
+            Remove (GetPropertyValue (propertyName));
+        }
+		
+        /// <summary>
+        /// Modify a <see cref="Spring.Objects.PropertyValue"/> object held in this object. Indexed from 0.
+        /// </summary>
+        public void SetPropertyValueAt (PropertyValue pv, int i)
+        {
+            propertyValuesList [i] = pv;
+        }
+		
+        /// <summary>
+        /// Return the property value given the name.
+        /// </summary>
+        /// <remarks>
+        /// The property name is checked in a <c>case-insensitive</c> fashion.
+        /// </remarks>
+        /// <param name="propertyName">
+        /// The name of the property.
+        /// </param>
+        /// <returns>
+        /// The property value.
+        /// </returns>
+        public PropertyValue GetPropertyValue (string propertyName)
+        {
+            string propertyNameLowered = propertyName.ToLower (CultureInfo.CurrentCulture);
+            foreach (PropertyValue pv in propertyValuesList)
+            {
+                if (pv.Name.ToLower(CultureInfo.CurrentCulture).Equals (propertyNameLowered))
+                {
+                    return pv;
+                }
+            }
+            return null;
+        }
+		
+        /// <summary>
+        /// Does the container of properties contain one of this name.
+        /// </summary>
+        /// <param name="propertyName">The name of the property to search for.</param>
+        /// <returns>
+        /// True if the property is contained in this collection, false otherwise.
+        /// </returns>
+        public bool Contains (string propertyName)
+        {
+            return GetPropertyValue (propertyName) != null;
+        }
+		
+        /// <summary>
+        /// Return the difference (changes, additions, but not removals) of
+        /// property values between the supplied argument and the values
+        /// contained in the collection.
+        /// </summary>
+        /// <param name="old">Another property values collection.</param>
+        /// <returns>
+        /// The collection of property values that are different than the supplied one.
+        /// </returns>
+        public IPropertyValues ChangesSince (IPropertyValues old)
+        {
+            MutablePropertyValues changes = new MutablePropertyValues ();
+            if (old == this) 
+            {
+                return changes;
+            }			
+            // for each property value in this (the newer set)
+            foreach (PropertyValue newProperty in propertyValuesList)
+            {
+                PropertyValue oldProperty = old.GetPropertyValue (newProperty.Name);
+                if (oldProperty == null)
+                {
+                    // if there wasn't an old one, add it
+                    changes.Add (newProperty);
+                }
+                else if (!oldProperty.Equals (newProperty))
+                {
+                    // it's changed
+                    changes.Add (newProperty);
+                }
+            }
+            return changes;
+        }
+
+        /// <summary>
+        /// Returns an <see cref="System.Collections.IEnumerator"/> that can iterate
+        /// through a collection.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The returned <see cref="System.Collections.IEnumerator"/> is the
+        /// <see cref="System.Collections.IEnumerator"/> exposed by the
+        /// <see cref="Spring.Objects.MutablePropertyValues.PropertyValues"/>
+        /// property.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// An <see cref="System.Collections.IEnumerator"/> that can iterate through a
+        /// collection.
+        /// </returns>
+        public IEnumerator GetEnumerator () 
+        {
+            return PropertyValues.GetEnumerator ();
+        }
+		
+        // CLOVER:OFF
+
+        /// <summary>
+        /// Convert the object to a string representation.
+        /// </summary>
+        /// <returns>
+        /// A string representation of the object.
+        /// </returns>
+        public override string ToString ()
+        {
+            PropertyValue[] pvs = PropertyValues;
+            StringBuilder sb
+                = new StringBuilder (
+                    "MutablePropertyValues: length=").Append (pvs.Length).Append ("; ");
+            sb.Append (StringUtils.ArrayToDelimitedString (pvs, ","));
+            return sb.ToString ();
+        }
+
+        // CLOVER:ON
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/ObjectWrapper.cs b/src/Spring/Spring.Core/Objects/ObjectWrapper.cs
new file mode 100644
index 00000000..53409a96
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/ObjectWrapper.cs
@@ -0,0 +1,547 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Reflection;
+using System.Text;
+
+using antlr;
+using Common.Logging;
+using Spring.Core;
+using Spring.Expressions;
+using Spring.Util;
+using StringUtils=Spring.Util.StringUtils;
+
+#endregion
+
+namespace Spring.Objects
+{
+    /// <summary>
+    /// Default implementation of the <see cref="Spring.Objects.IObjectWrapper"/>
+    /// interface that should be sufficient for all normal uses.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// <see cref="Spring.Objects.ObjectWrapper"/> will convert
+    /// <see cref="System.Collections.IList"/> and array
+    /// values to the corresponding target arrays, if necessary. Custom
+    /// <see cref="System.ComponentModel.TypeConverter"/>s that deal with
+    /// <see cref="System.Collections.IList"/>s or arrays can be written against a
+    /// comma delimited <see cref="System.String"/> as <see cref="System.String"/>
+    /// arrays are converted in such a format if the array itself is not assignable.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller </author>
+    /// <author>Jean-Pierre Pawlak</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <author>Aleksandar Seovic(.NET)</author>
+    /// <version>$Id: ObjectWrapper.cs,v 1.72 2007/07/31 08:18:20 markpollack Exp $</version>
+    [Serializable]
+    public class ObjectWrapper : IObjectWrapper
+    {
+        private ILog Log = LogManager.GetLogger(typeof(ObjectWrapper));
+
+        #region Fields
+
+        /// <summary>The wrapped object.</summary>
+        private object wrappedObject;
+
+        /// <summary>
+        /// The ILog instance for this class. We'll create a lot of these objects,
+        /// so we don't want a new instance every time.
+        /// </summary>
+        private static readonly ILog log = LogManager.GetLogger(typeof(ObjectWrapper));
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Objects.ObjectWrapper"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The wrapped target instance will need to be set afterwards.
+        /// </p>
+        /// </remarks>
+        /// <seealso cref="Spring.Objects.ObjectWrapper.WrappedInstance"/>
+        public ObjectWrapper()
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Objects.ObjectWrapper"/> class.
+        /// </summary>
+        /// <param name="instance">
+        /// The object wrapped by this <see cref="Spring.Objects.ObjectWrapper"/>.
+        /// </param>
+        /// <exception cref="Spring.Objects.FatalObjectException">
+        /// If the supplied <paramref name="instance"/> is <see lang="null"/>.
+        /// </exception>
+        public ObjectWrapper(object instance)
+        {
+            WrappedInstance = instance;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Objects.ObjectWrapper"/> class,
+        /// instantiating a new instance of the specified <see cref="System.Type"/> and using
+        /// it as the <see cref="Spring.Objects.ObjectWrapper.WrappedInstance"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Please note that the <see cref="System.Type"/> passed as the
+        /// <paramref name="type"/> argument must have a no-argument constructor.
+        /// If it does not, an exception will be thrown when this class attempts
+        /// to instantiate the supplied <paramref name="type"/> using it's
+        /// (non-existent) constructor.
+        /// </p>
+        /// </remarks>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> to instantiate and wrap.
+        /// </param>
+        /// <exception cref="Spring.Objects.FatalObjectException">
+        /// If the <paramref name="type"/> is <see langword="null"/>, or if the
+        /// invocation of the <paramref name="type"/>s default (no-arg) constructor
+        /// fails (due to invalid arguments, insufficient permissions, etc).
+        /// </exception>
+        public ObjectWrapper(Type type) : this(true)
+        {
+            try
+            {
+                WrappedInstance = ObjectUtils.InstantiateType(type);
+            } catch (FatalReflectionException e)
+            {
+                throw new FatalObjectException(e.Message, e);
+            }
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The object wrapped by this <see cref="Spring.Objects.ObjectWrapper"/>.
+        /// </summary>
+        /// <exception cref="Spring.Objects.FatalObjectException">
+        /// If the object cannot be changed; or an attempt is made to set the
+        /// value of this property to <see langword="null"/>.
+        /// </exception>
+        public object WrappedInstance
+        {
+            get { return wrappedObject; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new FatalObjectException("Wraped instance cannot be null.");
+                }
+                this.wrappedObject = value;
+            }
+        }
+
+        /// <summary>
+        /// Convenience method to return the <see cref="System.Type"/> of the wrapped object.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Do <b>not</b> use this (convenience) method prior to setting the
+        /// <see cref="Spring.Objects.ObjectWrapper.WrappedInstance"/> property.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// The <see cref="System.Type"/> of the wrapped object.
+        /// </returns>
+        /// <exception cref="System.NullReferenceException">
+        /// If the <see cref="Spring.Objects.ObjectWrapper.WrappedInstance"/> property
+        /// is <see lang="null"/>.
+        /// </exception>
+        public Type WrappedType
+        {
+            get { return WrappedInstance.GetType(); }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>Gets the value of a property.</summary>
+        /// <param name="propertyName">
+        /// The name of the property to get the value of.
+        /// </param>
+        /// <returns>The value of the property.</returns>
+        /// <exception cref="Spring.Objects.FatalObjectException">
+        /// If there is no such property, if the property isn't readable, or
+        /// if getting the property value throws an exception.
+        /// </exception>
+        public virtual object GetPropertyValue(string propertyName)
+        {
+            try
+            {
+                IExpression propertyExpression = GetPropertyExpression(propertyName);
+                return GetPropertyValue(propertyExpression);
+            }
+            catch (RecognitionException e)
+            {
+                throw new InvalidPropertyException("Failed to parse property name '" + propertyName + "'.", e);
+            }
+            catch (TokenStreamRecognitionException e)
+            {
+                throw new InvalidPropertyException("Failed to parse property name '" + propertyName + "'.", e);
+            }
+        }
+
+        /// <summary>Gets the value of a property.</summary>
+        /// <param name="propertyExpression">
+        /// The property expression that should be used to retrieve the property value.
+        /// </param>
+        /// <returns>The value of the property.</returns>
+        /// <exception cref="Spring.Objects.FatalObjectException">
+        /// If there is no such property, if the property isn't readable, or
+        /// if getting the property value throws an exception.
+        /// </exception>
+        public virtual object GetPropertyValue(IExpression propertyExpression)
+        {
+            return propertyExpression.GetValue(this.wrappedObject);
+        }
+
+        /// <summary>
+        /// Sets a property value.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method is provided for convenience only. The
+        /// <see cref="Spring.Objects.ObjectWrapper.SetPropertyValue(PropertyValue)"/>
+        /// method is more powerful.
+        /// </p>
+        /// </remarks>
+        /// <param name="propertyName">
+        /// The name of the property to set value of.
+        /// </param>
+        /// <param name="val">The new value.</param>
+        public virtual void SetPropertyValue(string propertyName, object val)
+        {
+            try
+            {
+                IExpression propertyExpression = GetPropertyExpression(propertyName);
+                SetPropertyValue(propertyExpression, val);
+            }
+            catch (RecognitionException e)
+            {
+                throw new InvalidPropertyException("Failed to parse property name '" + propertyName + "'.", e);
+            }
+            catch (TokenStreamRecognitionException e)
+            {
+                throw new InvalidPropertyException("Failed to parse property name '" + propertyName + "'.", e);
+            }
+        }
+
+        /// <summary>
+        /// Sets a property value.
+        /// </summary>
+        /// <param name="propertyExpression">
+        /// The property expression that should be used to set the property value.
+        /// </param>
+        /// <param name="val">The new value.</param>
+        public virtual void SetPropertyValue(IExpression propertyExpression, object val)
+        {
+            propertyExpression.SetValue(this.wrappedObject, val);
+        }
+
+        /// <summary>
+        /// Sets a property value.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// <b>This is the preferred way to update an individual property.</b>
+        /// </p>
+        /// </remarks>
+        /// <param name="pv">
+        /// The object containing new property value.
+        /// </param>
+        public virtual void SetPropertyValue(PropertyValue pv)
+        {
+            SetPropertyValue(pv.Expression, pv.Value);
+        }
+
+        /// <summary>Set a number of property values in bulk.</summary>
+        /// <remarks>
+        /// <p>
+        /// Does not allow unknown fields. Equivalent to
+        /// <see cref="Spring.Objects.ObjectWrapper.SetPropertyValues(IPropertyValues, bool)"/>
+        /// with <see langword="null"/> and <cref lang="false"/> for
+        /// arguments.
+        /// </p>
+        /// </remarks>
+        /// <param name="pvs">
+        /// The <see cref="Spring.Objects.IPropertyValues"/> to set on the target
+        /// object.
+        /// </param>
+        /// <exception cref="Spring.Core.NotWritablePropertyException">
+        /// If an error is encountered while setting a property.
+        /// </exception>
+        /// <exception cref="Spring.Objects.PropertyAccessExceptionsException">
+        /// On a <see cref="System.Type"/> mismatch while setting a property, insufficient permissions, etc.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.IObjectWrapper.SetPropertyValues(IPropertyValues, bool)"/>
+        public virtual void SetPropertyValues(IPropertyValues pvs)
+        {
+            SetPropertyValues(pvs, false);
+        }
+
+        /// <summary>
+        /// Perform a bulk update with full control over behavior.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method may throw a reflection-based exception, if there is a critical
+        /// failure such as no matching field... less serious exceptions will be accumulated
+        /// and thrown as a single <see cref="Spring.Objects.PropertyAccessExceptionsException"/>.
+        /// </p>
+        /// </remarks>
+        /// <param name="propertyValues">
+        /// The <see cref="Spring.Objects.PropertyValue"/>s to set on the target object.
+        /// </param>
+        /// <param name="ignoreUnknown">
+        /// Should we ignore unknown values (not found in the object!?).
+        /// </param>
+        /// <exception cref="NotWritablePropertyException">
+        /// If an error is encountered while setting a property (only thrown if the
+        /// <paramref name="ignoreUnknown"/> parameter is set to <see langword="false"/>).
+        /// </exception>
+        /// <exception cref="Spring.Objects.PropertyAccessExceptionsException">
+        /// On a <see cref="System.Type"/> mismatch while setting a property, insufficient permissions, etc.
+        /// </exception>
+        /// <seealso cref="Spring.Objects.IObjectWrapper.SetPropertyValues(IPropertyValues, bool)"/>
+        public virtual void SetPropertyValues(IPropertyValues propertyValues, bool ignoreUnknown)
+        {
+            ArrayList propertyAccessExceptions = new ArrayList();
+            foreach (PropertyValue pv in propertyValues)
+            {
+                try
+                {
+                    SetPropertyValue(pv);
+                }
+                catch (NotWritablePropertyException ex)
+                {
+                    if (!ignoreUnknown)
+                    {
+                        Log.Error(string.Format("Failed setting property '{0}'", pv.Name), ex);
+                        throw;
+                    }
+                }
+                catch (InvalidPropertyException ex)
+                {
+                    if (!ignoreUnknown)
+                    {
+                        Log.Error(string.Format("Failed setting property '{0}'", pv.Name), ex);
+                        throw;
+                    }
+                }
+                catch (TypeMismatchException ex) // otherwise, just ignore it and continue...
+                {
+                    Log.Error(string.Format("Failed setting property '{0}'", pv.Name), ex);
+                    propertyAccessExceptions.Add(ex);
+                }
+                catch (MethodInvocationException ex)
+                {
+                    Log.Error(string.Format("Failed setting property '{0}'", pv.Name), ex);
+                    propertyAccessExceptions.Add(ex);
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(string.Format("Failed setting property '{0}' on instance of type '{1}'", pv.Name, this.WrappedType.FullName), ex);
+                    throw;
+                }
+            }
+
+            // if we encountered individual exceptions, throw the composite exception...
+            if (propertyAccessExceptions.Count > 0)
+            {
+                throw new PropertyAccessExceptionsException(this,
+                                                            (PropertyAccessException[]) propertyAccessExceptions.ToArray(typeof(PropertyAccessException)));
+            }
+        }
+
+        /// <summary>
+        /// Returns PropertyInfo for the specified property
+        /// </summary>
+        /// <param name="propertyName">The name of the property to search for.</param>
+        /// <returns>The <see cref="PropertyInfo"/> for the specified property.</returns>
+        /// <exception cref="FatalObjectException">If <see cref="PropertyInfo"/> cannot be determined.</exception>
+        public PropertyInfo GetPropertyInfo(string propertyName)
+        {
+            return (PropertyInfo) this.GetPropertyOrFieldInfo(propertyName);
+        }
+
+        /// <summary>
+        /// Get the <see cref="System.Type"/> for a particular property.
+        /// </summary>
+        /// <param name="propertyName">
+        /// The property the <see cref="System.Type"/> of which is to be retrieved.
+        /// </param>
+        /// <returns>
+        /// The <see cref="System.Type"/> for a particular property..
+        /// </returns>
+        public Type GetPropertyType(string propertyName)
+        {
+            MemberInfo memberInfo = this.GetPropertyOrFieldInfo(propertyName);
+            switch(memberInfo.MemberType)
+            {
+                case MemberTypes.Property:
+                    return ((PropertyInfo) memberInfo).PropertyType;
+                case MemberTypes.Field:
+                    return ((FieldInfo) memberInfo).FieldType;
+                default:
+                    throw new FatalObjectException("'" + propertyName + "' is not a valid property expression.");
+            }
+        }
+
+        /// <summary>
+        /// Returns MemberInfo for the specified property or field
+        /// </summary>
+        /// <param name="propertyOrFieldName">The name of the property or field to search for.</param>
+        /// <returns>The <see cref="PropertyInfo"/> or <see cref="FieldInfo"/> for the specified property or field.</returns>
+        /// <exception cref="FatalObjectException">If <paramref name="propertyOrFieldName"/> does not resolve to a property or field.</exception>
+        private MemberInfo GetPropertyOrFieldInfo(string propertyOrFieldName)
+        {
+            if(StringUtils.IsNullOrEmpty(propertyOrFieldName))
+            {
+                throw new FatalObjectException("Can't find property or field info for null or zero length property name.");
+            }
+
+            try
+            {
+                IExpression propertyExpression = GetPropertyExpression(propertyOrFieldName);
+                if(propertyExpression is PropertyOrFieldNode)
+                {
+                    return ((PropertyOrFieldNode)propertyExpression).GetMemberInfo(this.wrappedObject);
+                }
+                else if(propertyExpression is IndexerNode)
+                {
+                    return ((IndexerNode)propertyExpression).GetPropertyInfo(this.wrappedObject, null);
+                }
+                else if(propertyExpression is Expression)
+                {
+                    return ((Expression)propertyExpression).GetPropertyInfo(this.wrappedObject, null);
+                }
+                else
+                {
+                    throw new FatalObjectException("'" + propertyOrFieldName + "' is not a valid property or field expression.");
+                }
+            }
+            catch(RecognitionException e)
+            {
+                throw new FatalObjectException("Failed to parse property or field name '" + propertyOrFieldName + "'.", e);
+            }
+            catch(TokenStreamRecognitionException e)
+            {
+                throw new FatalObjectException("Failed to parse property or field name '" + propertyOrFieldName + "'.", e);
+            }
+        }
+
+
+        /// <summary>
+        /// Get the properties of the wrapped object.
+        /// </summary>
+        /// <returns>
+        /// An array of <see cref="System.Reflection.PropertyInfo"/>s.
+        /// </returns>
+        public PropertyInfo[] GetPropertyInfos()
+        {
+            return WrappedType.GetProperties();
+        }
+
+        /// <summary>
+        /// Return the collection of property descriptors.
+        /// </summary>
+        public PropertyDescriptorCollection PropertyDescriptors
+        {
+            get { return TypeDescriptor.GetProperties(WrappedInstance); }
+        }
+
+        /// <summary>
+        /// This method is expensive! Only call for diagnostics and debugging reasons,
+        /// not in production.
+        /// </summary>
+        /// <returns>
+        /// A string describing the state of this object.
+        /// </returns>
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+            try
+            {
+                sb.Append("ObjectWrapper: wrapping class [");
+                sb.Append(WrappedType.FullName);
+                sb.Append("]; ");
+                foreach (PropertyDescriptor p in PropertyDescriptors)
+                {
+                    object val = GetPropertyValue(p.Name);
+                    string valStr = (val != null) ? val.ToString() : "null";
+                    sb.Append(p.Name).Append("={").Append(valStr).Append("}");
+                }
+            }
+            catch (Exception ex)
+            {
+                sb.Append("Exception encountered: ").Append(ex.ToString());
+            }
+            return sb.ToString();
+        }
+
+        #endregion
+
+        #region Helper methods
+
+        /// <summary>
+        /// Attempts to parse property expression first and falls back to full expression
+        /// if that fails. Performance optimization.
+        /// </summary>
+        /// <param name="propertyName">Property expression to parse.</param>
+        /// <returns>Parsed proeprty expression.</returns>
+        internal static IExpression GetPropertyExpression(string propertyName)
+        {
+            IExpression propertyExpression = null;
+            if (propertyName.IndexOfAny(new char[] { '.', '[', '(', ' ', '{' }) < 0)
+            {
+                try
+                {
+                    propertyExpression = Expression.ParseProperty(propertyName);
+                }
+                catch (Exception)
+                {
+                    propertyExpression = Expression.ParsePrimary(propertyName);
+                }
+            }
+            else
+            {
+                propertyExpression = Expression.ParsePrimary(propertyName);
+            }
+
+            return propertyExpression;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/ObjectsException.cs b/src/Spring/Spring.Core/Objects/ObjectsException.cs
new file mode 100644
index 00000000..0e490690
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/ObjectsException.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Objects
+{
+    /// <summary>
+    /// Superclass for all exceptions thrown in the Objects namespace and sub-namespaces.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ObjectsException.cs,v 1.8 2006/04/09 07:18:49 markpollack Exp $
+    /// </version>
+    [Serializable]
+    public class ObjectsException : ApplicationException
+    {
+        #region Constructor (s) / Destructor
+        /// <summary>Creates a new instance of the ObjectsException class.</summary>
+        public ObjectsException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectsException class. with the specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public ObjectsException (string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectsException class with the specified message
+        /// and root cause.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public ObjectsException (string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectsException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected ObjectsException (
+            SerializationInfo info, StreamingContext context)
+            : base (info, context)
+        {
+        }
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Objects/PropertyAccessExceptionsException.cs b/src/Spring/Spring.Core/Objects/PropertyAccessExceptionsException.cs
new file mode 100644
index 00000000..6de65983
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/PropertyAccessExceptionsException.cs
@@ -0,0 +1,259 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
+using System.Text;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Combined exception, composed of individual binding
+	/// <see cref="PropertyAccessException"/>s.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// An object of this class is created at the beginning of the binding
+	/// process, and errors added to it as necessary.
+	/// </p>
+	/// <p>
+	/// The binding process continues when it encounters application-level
+	/// <see cref="PropertyAccessException"/>s, applying those changes
+	/// that can be applied and storing rejected changes in an instance of this class.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: PropertyAccessExceptionsException.cs,v 1.15 2007/07/31 00:26:30 markpollack Exp $</version>
+	[Serializable]
+	public class PropertyAccessExceptionsException : ObjectsException
+	{
+		#region Constants
+
+		private static PropertyAccessException[] EmptyPropertyAccessExceptions
+			= new PropertyAccessException[] {};
+
+		#endregion
+
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the PropertyAccessExceptionsException class.
+		/// </summary>
+		public PropertyAccessExceptionsException()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the PropertyAccessExceptionsException class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public PropertyAccessExceptionsException(string message)
+			: base(message)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the PropertyAccessExceptionsException class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public PropertyAccessExceptionsException(string message, Exception rootCause)
+			: base(message, rootCause)
+		{
+		}
+
+		/// <summary>
+		/// Create new empty PropertyAccessExceptionsException.
+		/// We'll add errors to it as we attempt to bind properties.
+		/// </summary>
+		public PropertyAccessExceptionsException(
+			IObjectWrapper objectWrapper,
+			PropertyAccessException[] propertyAccessExceptions)
+			: base(string.Empty)
+		{
+			_objectWrapper = objectWrapper;
+			_propertyAccessExceptions
+				= propertyAccessExceptions == null ?
+					EmptyPropertyAccessExceptions :
+					propertyAccessExceptions;
+		}
+
+		/// <summary>
+		/// Creates a new instance of the PropertyAccessExceptionsException class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected PropertyAccessExceptionsException(SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{
+		}
+
+		#endregion
+
+		/// <summary>
+		/// Return the <see cref="Spring.Objects.IObjectWrapper"/> that generated
+		/// this exception.
+		/// </summary>
+		public IObjectWrapper ObjectWrapper
+		{
+			get { return _objectWrapper; }
+		}
+
+		/// <summary>
+		/// Return the object we're binding to.
+		/// </summary>
+		public object BindObject
+		{
+			get { return ObjectWrapper.WrappedInstance; }
+		}
+
+		/// <summary>
+		/// If this returns zero (0), no errors were encountered during binding.
+		/// </summary>
+		public int ExceptionCount
+		{
+			get { return PropertyAccessExceptions.Length; }
+		}
+
+		/// <summary>
+		/// Return an array of the <see cref="PropertyAccessException"/>s
+		/// stored in this object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Will return the empty array (not <see langword="null"/>) if there were no errors.
+		/// </p>
+		/// </remarks>
+		public virtual PropertyAccessException[] PropertyAccessExceptions
+		{
+			get { return _propertyAccessExceptions; }
+		}
+
+		/// <summary>
+		/// Describe the group of exceptions. 
+		/// </summary>
+		public override string Message
+		{
+			get
+			{
+				StringBuilder sb = new StringBuilder();
+				sb.Append("PropertyAccessExceptionsException (")
+				.Append(ExceptionCount)
+				.Append(" errors)")
+				.Append("; nested PropertyAccessExceptions are: \n");
+				for (int i = 0; i < PropertyAccessExceptions.Length; ++i)
+				{
+					PropertyAccessException pae = PropertyAccessExceptions[i];
+					sb.Append("[");
+					sb.Append(pae.GetType().FullName);
+					sb.Append(": ");
+					sb.Append(pae.Message);
+					if (pae.InnerException != null) 
+					{
+						sb.Append(", Inner Exception: ");
+						sb.Append(pae.InnerException.ToString());
+					}
+					sb.Append(']');
+					if (i < PropertyAccessExceptions.Length - 1)
+					{
+						sb.Append(", ");
+					}
+				}
+				return sb.ToString();
+			}
+		}
+
+		/// <summary>
+		/// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
+		/// the data needed to serialize the target object.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
+		/// with data.
+		/// </param>
+		/// <param name="context">
+		/// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
+		/// for this serialization.
+		/// </param>
+		[SecurityPermission(SecurityAction.Demand, SerializationFormatter=true)]
+		public override void GetObjectData(
+			SerializationInfo info, StreamingContext context)
+		{
+			// TODO serialize me
+			base.GetObjectData(info, context);
+		}
+
+		/// <summary>
+		/// The IObjectWrapper wrapping the target object at the root of the exception.
+		/// </summary>
+		private IObjectWrapper _objectWrapper;
+
+		/// <summary>The list of PropertyAccessException objects.</summary>
+		private PropertyAccessException[] _propertyAccessExceptions
+			= EmptyPropertyAccessExceptions;
+
+		/// <summary>
+		/// Return the <see cref="PropertyAccessException"/>
+		/// for the supplied <paramref name="propertyName"/>, or <see langword="null"/>
+		/// if there isn't one.
+		/// </summary>
+		public PropertyAccessException GetPropertyAccessException(
+			string propertyName)
+		{
+			foreach (PropertyAccessException pae in PropertyAccessExceptions)
+			{
+				if (propertyName.Equals(pae.PropertyChangeArgs.PropertyName))
+				{
+					return pae;
+				}
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Describe the number of exceptions contained in this container class.
+		/// </summary>
+		/// <returns>A description of the instance contents.</returns>
+		public override string ToString()
+		{
+			return Message;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/PropertyValue.cs b/src/Spring/Spring.Core/Objects/PropertyValue.cs
new file mode 100644
index 00000000..4d013d34
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/PropertyValue.cs
@@ -0,0 +1,199 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+
+using antlr;
+using Spring.Core;
+using Spring.Expressions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects
+{
+    /// <summary>
+    /// Holds information and value for an individual property.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Using an object here, rather than just storing all properties in a
+    /// map keyed by property name, allows for more flexibility, and the
+    /// ability to handle indexed properties in a special way if necessary.
+    /// </p>
+    /// <p>
+    /// Note that the value doesn't need to be the final required
+    /// <see cref="System.Type"/>: an
+    /// <see cref="Spring.Objects.IObjectWrapper"/> implementation must
+    /// handle any necessary conversion, as this object doesn't know anything
+    /// about the objects it will be applied to.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: PropertyValue.cs,v 1.15 2007/07/31 00:08:42 markpollack Exp $</version>
+    [Serializable]
+    public class PropertyValue
+    {
+        private string propertyName;
+        private IExpression propertyExpression;
+        private object propertyValue;
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.PropertyValue"/> class.
+        /// </summary>
+        /// <param name="name">The name of the property.</param>
+        /// <param name="val">
+        /// The value of the property (possibly before type conversion).
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="name"/> is <see langword="null"/> or
+        /// contains only whitespace character(s).
+        /// </exception>
+        public PropertyValue(string name, object val)
+        {
+            AssertUtils.ArgumentHasText(name, "name");
+
+            propertyName = name;
+            propertyValue = val;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.PropertyValue"/> class.
+        /// </summary>
+        /// <param name="name">The name of the property.</param>
+        /// <param name="val">
+        /// The value of the property (possibly before type conversion).
+        /// </param>
+        /// <param name="expression">Pre-parsed property name.</param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="name"/> or <paramref name="name"/> 
+        /// is <see langword="null"/>, or if the name contains only whitespace characters.
+        /// </exception>
+        public PropertyValue(string name, object val, IExpression expression)
+        {
+            AssertUtils.ArgumentHasText(name, "name");
+
+            propertyName = name;
+            propertyExpression = expression;
+            propertyValue = val;
+        }
+
+        /// <summary>The name of the property.</summary>
+        /// <value>The name of the property.</value>
+        public string Name
+        {
+            get { return propertyName; }
+        }
+
+        /// <summary>
+        /// Parsed property expression.
+        /// </summary>
+        public IExpression Expression
+        {
+            get
+            {
+                if (propertyExpression == null)
+                {
+                    try
+                    {
+                        propertyExpression = ObjectWrapper.GetPropertyExpression(propertyName);
+                    }
+                    catch (RecognitionException e)
+                    {
+                        throw new InvalidPropertyException("Failed to parse property name '" + propertyName + "'.", e);
+                    }
+                    catch (TokenStreamRecognitionException e)
+                    {
+                        throw new InvalidPropertyException("Failed to parse property name '" + propertyName + "'.", e);
+                    }
+                }
+                return propertyExpression;
+            }
+        }
+
+        /// <summary>
+        /// Return the value of the property.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Note that type conversion will <i>not</i> have occurred here.
+        /// It is the responsibility of the
+        /// <see cref="Spring.Objects.IObjectWrapper"/> implementation to
+        /// perform type conversion.
+        /// </p>
+        /// </remarks>
+        /// <value>The (possibly unresolved) value of the property.</value>
+        public object Value
+        {
+            get { return propertyValue; }
+        }
+
+        /// <summary>
+        /// Print a string representation of the property.
+        /// </summary>
+        /// <returns>A string representation of the property.</returns>
+        public override string ToString()
+        {
+            return string.Format(CultureInfo.InvariantCulture, "PropertyValue: name='{0}'; value=[{1}].", propertyName, propertyValue);
+        }
+
+        /// <summary>
+        /// Determines whether the supplied <see cref="System.Object"/>
+        /// is equal to the current <see cref="Spring.Objects.PropertyValue"/>.  
+        /// </summary>
+        /// <param name="other">The other instance.</param>
+        /// <returns>
+        /// <see langword="true"/> if they are equal in content.
+        /// </returns>
+        public override bool Equals(object other)
+        {
+            if (this == other)
+            {
+                return true;
+            }
+            if (!(other is PropertyValue))
+            {
+                return false;
+            }
+            PropertyValue otherPv = (PropertyValue) other;
+            return
+                    (propertyName.Equals(otherPv.propertyName)
+                     && ((propertyValue == null && otherPv.propertyValue == null) || propertyValue.Equals(otherPv.propertyValue)));
+        }
+
+        /// <summary>
+        /// Serves as a hash function for a particular type, suitable for use
+        /// in hashing algorithms and data structures like a hash table. 
+        /// </summary>
+        /// <returns>
+        /// A hash code for the current <see cref="Spring.Objects.PropertyValue"/>.  
+        /// </returns>
+        public override int GetHashCode()
+        {
+            return propertyName.GetHashCode() * 29 + (propertyValue != null ? propertyValue.GetHashCode() : 0);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Support/AbstractEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/AbstractEventHandlerValue.cs
new file mode 100644
index 00000000..feb03e9a
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Support/AbstractEventHandlerValue.cs
@@ -0,0 +1,153 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Globalization;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+	/// <summary>
+	/// Base class implementation for classes that describe an event handler.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: AbstractEventHandlerValue.cs,v 1.7 2006/04/09 07:19:00 markpollack Exp $</version>
+    public abstract class AbstractEventHandlerValue : IEventHandlerValue
+    {
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Support.AbstractEventHandlerValue"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+        /// </p>
+        /// </remarks>
+        protected AbstractEventHandlerValue() {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Support.AbstractEventHandlerValue"/> class.
+        /// </summary>
+        /// <param name="source">
+        /// The object (possibly unresolved) that is exposing the event.
+        /// </param>
+        /// <param name="methodName">
+        /// The name of the method on the handler that is going to handle the event.
+        /// </param>
+        /// <remarks>
+        /// <p>
+        /// This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+        /// </p>
+        /// </remarks>
+        protected AbstractEventHandlerValue (object source, string methodName) 
+        {
+            _source = source;
+            _methodName = methodName;
+        }
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// The source of the event (may be unresolved, as in the case
+        /// of a <see cref="Spring.Objects.Factory.Config.RuntimeObjectReference"/>
+        /// value).
+        /// </summary>
+        public virtual object Source 
+        {
+            get 
+            {
+                return _source;
+            }
+            set 
+            {
+                _source = value;
+            }
+        }
+
+        /// <summary>
+        /// The name of the method that is going to handle the event.
+        /// </summary>
+        public virtual string MethodName 
+        {
+            get 
+            {
+                return _methodName;
+            }
+            set 
+            {
+                _methodName = StringUtils.HasText (value) ? value.Trim () : string.Empty;
+            }
+        }
+
+        /// <summary>
+        /// The name of the event that is being wired up.
+        /// </summary>
+        public virtual string EventName 
+        {
+            get 
+            {
+                return _eventName;
+            }
+            set 
+            {
+                _eventName = StringUtils.HasText (value) ? value.Trim () : string.Empty;
+            }
+        }
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Wires up the specified handler to the named event on the
+        /// supplied event source.
+        /// </summary>
+        /// <param name="source">
+        /// The object (an object instance, a <see cref="System.Type"/>, etc)
+        /// exposing the named event.
+        /// </param>
+        /// <param name="handler">
+        /// The handler for the event (an object instance, a
+        /// <see cref="System.Type"/>, etc).
+        /// </param>
+        public abstract void Wire (object source, object handler);
+
+        /// <summary>
+        /// Returns a stringified representation of this object.
+        /// </summary>
+        /// <returns>A stringified representation of this object.</returns>
+        public override string ToString()
+        {
+            return string.Format (
+                CultureInfo.InvariantCulture,
+                "{0} [Source = '{1}', Method = '{2}']", GetType ().FullName, Source, MethodName);
+        }
+        #endregion
+
+        #region Fields
+        private object _source;
+        private string _methodName;
+        private string _eventName;
+        #endregion
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Support/AbstractWiringEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/AbstractWiringEventHandlerValue.cs
new file mode 100644
index 00000000..8a9c7146
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Support/AbstractWiringEventHandlerValue.cs
@@ -0,0 +1,159 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Reflection;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+	/// <summary>
+	/// Base class for all <see cref="Spring.Objects.IEventHandlerValue"/>
+	/// implemenations that actually perform event wiring.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: AbstractWiringEventHandlerValue.cs,v 1.8 2006/04/09 07:19:00 markpollack Exp $</version>
+	public abstract class AbstractWiringEventHandlerValue : AbstractEventHandlerValue
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Support.AbstractWiringEventHandlerValue"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+		/// </p>
+		/// </remarks>
+		protected AbstractWiringEventHandlerValue()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Support.AbstractWiringEventHandlerValue"/> class.
+		/// </summary>
+		/// <param name="source">
+		/// The object (possibly unresolved) that is exposing the event.
+		/// </param>
+		/// <param name="methodName">
+		/// The name of the method on the handler that is going to handle the event.
+		/// </param>
+		/// <remarks>
+		/// <p>
+		/// This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+		/// </p>
+		/// </remarks>
+		protected AbstractWiringEventHandlerValue(object source, string methodName)
+			: base(source, methodName)
+		{
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Wires up the specified handler to the named event on the
+		/// supplied event source.
+		/// </summary>
+		/// <param name="source">
+		/// The object (an object instance, a <see cref="System.Type"/>, etc)
+		/// exposing the named event.
+		/// </param>
+		/// <param name="handler">
+		/// The handler for the event (an object instance, a
+		/// <see cref="System.Type"/>, etc).
+		/// </param>
+		public override void Wire(object source, object handler)
+		{
+			Type sourceType = ReflectionUtils.TypeOfOrType(source);
+			EventInfo eventInfo = sourceType.GetEvent(EventName);
+			Delegate callback = GetHandler(handler, eventInfo);
+			eventInfo.AddEventHandler(source, callback);
+		}
+
+		/// <summary>
+		/// Gets the event handler.
+		/// </summary>
+		/// <param name="instance">
+		/// The instance that is registering for the event notification.
+		/// </param>
+		/// <param name="info">
+		/// Event metadata about the event.
+		/// </param>
+		/// <returns>
+		/// The event handler.
+		/// </returns>
+		protected abstract Delegate GetHandler(object instance, EventInfo info);
+
+		/// <summary>
+		/// Resolves the method metadata that describes the method that is to be used
+		/// as the argument to a delegate constructor.
+		/// </summary>
+		/// <param name="handlerType">
+		/// The <see cref="System.Type"/> exposing the method.
+		/// </param>
+		/// <param name="delegateType">
+		/// The <see cref="System.Type"/> of the delegate (e.g. System.EventHandler).
+		/// </param>
+		/// <param name="flags">
+		/// The custom binding flags to use when searching for the method.
+		/// </param>
+		/// <returns>The method metadata.</returns>
+		/// <exception cref="Spring.Objects.FatalObjectException">
+		/// If the method could not be found.
+		/// </exception>
+		protected virtual MethodInfo ResolveHandlerMethod(
+			Type handlerType, Type delegateType, BindingFlags flags)
+		{
+			MethodInfo method = handlerType.GetMethod(
+				MethodName,
+				flags,
+				Type.DefaultBinder,
+				CallingConventions.Standard,
+				// cache this? for EventHandler types, we're always gonna get the same parameters
+				new DelegateInfo(delegateType).GetParameterTypes(),
+				null);
+
+			#region Sanity Check
+
+			if (method == null)
+			{
+				throw new FatalObjectException(string.Format(
+					CultureInfo.InvariantCulture,
+					"The '{0}' method could not be found on this object [{1}]",
+					MethodName, handlerType));
+			}
+
+			#endregion
+
+			return method;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Support/ArgumentConvertingMethodInvoker.cs b/src/Spring/Spring.Core/Objects/Support/ArgumentConvertingMethodInvoker.cs
new file mode 100644
index 00000000..4e7ab959
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Support/ArgumentConvertingMethodInvoker.cs
@@ -0,0 +1,120 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+
+using Spring.Core;
+using Spring.Core.TypeConversion;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+	/// <summary>
+	/// Specialisation of the <see cref="MethodInvoker"/> class that tries
+	/// to convert the given arguments for the actual target method via an
+	/// appropriate <see cref="Spring.Objects.IObjectWrapper"/> implementation.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: ArgumentConvertingMethodInvoker.cs,v 1.10 2007/07/31 18:17:08 bbaia Exp $</version>
+	/// <seealso cref="MethodInvoker"/>
+	public class ArgumentConvertingMethodInvoker : MethodInvoker
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Support.ArgumentConvertingMethodInvoker"/> class.
+		/// </summary>
+		public ArgumentConvertingMethodInvoker()
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		private ObjectWrapper Wrapper
+		{
+			get { return _wrapper; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Prepare the specified method.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The method can be invoked any number of times afterwards.
+		/// </p>
+		/// </remarks>
+		/// <exception cref="System.ArgumentException">
+		/// If all required properties are not set.
+		/// </exception>
+		/// <exception cref="System.MissingMethodException">
+		/// If the specified method could not be found.
+		/// </exception>
+		public override void Prepare()
+		{
+			base.Prepare();
+			// try to convert the arguments for the chosen method
+		    Type[] requiredTypes = ReflectionUtils.GetParameterTypes(GetPreparedMethod());
+			object[] arguments = PreparedArguments;
+			object[] convertedArguments = new object[arguments.Length];
+			for (int i = 0; i < arguments.Length; ++i)
+			{
+				convertedArguments[i] = TypeConversionUtils.ConvertValueIfNecessary(requiredTypes[i], arguments[i], null);
+			}
+			PreparedArguments = convertedArguments;
+		}
+
+		/// <summary>
+		/// Register the given custom <see cref="System.ComponentModel.TypeConverter"/>
+		/// for all properties of the given <see cref="System.Type"/>.
+		/// </summary>
+		/// <param name="requiredType">
+		/// The <see cref="System.Type"/> of property.
+		/// </param>
+		/// <param name="typeConverter">
+		/// The <see cref="System.ComponentModel.TypeConverter"/> to register.
+		/// </param>
+		public virtual void RegisterCustomConverter(
+			Type requiredType, TypeConverter typeConverter)
+		{
+			TypeConverterRegistry.RegisterConverter(requiredType, typeConverter);
+		}
+
+		#endregion
+
+		#region Fields
+
+		private readonly ObjectWrapper _wrapper = new ObjectWrapper();
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs
new file mode 100644
index 00000000..20df3c63
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs
@@ -0,0 +1,321 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Reflection;
+using Common.Logging;
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+	/// <summary>
+	/// Describes an <see cref="Spring.Objects.IEventHandlerValue"/> implementation
+	/// that autowires events to handler methods.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: AutoWiringEventHandlerValue.cs,v 1.11 2006/11/13 07:04:41 markpollack Exp $</version>
+	public class AutoWiringEventHandlerValue : AbstractEventHandlerValue
+	{
+		#region Constants
+
+		private const string EventNamePlaceHolder = "${event}";
+
+		private const string DefaultMethodPrefix = "On";
+
+		private const string DefaultMethodName = DefaultMethodPrefix + EventNamePlaceHolder;
+
+		private static readonly ILog log
+			= LogManager.GetLogger(typeof (AutoWiringEventHandlerValue));
+
+		#endregion
+
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Support.AutoWiringEventHandlerValue"/> class.
+		/// </summary>
+		public AutoWiringEventHandlerValue()
+		{
+			MethodName = DefaultMethodName;
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// The name of the method that is going to handle the event.
+		/// </summary>
+		public override string MethodName
+		{
+			get { return base.MethodName; }
+			set { base.MethodName = StringUtils.HasText(value) ? value.Trim() : DefaultMethodName; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Wires up the specified handler to the named event on the supplied event source.
+		/// </summary>
+		/// <param name="source">
+		/// The object (an object instance, a <see cref="System.Type"/>, etc)
+		/// exposing the named event.
+		/// </param>
+		/// <param name="handler">
+		/// The handler for the event (an object instance, a <see cref="System.Type"/>,
+		/// etc).
+		/// </param>
+		public override void Wire(object source, object handler)
+		{
+			AssertUtils.ArgumentNotNull(source, "source");
+			AssertUtils.ArgumentNotNull(handler, "handler");
+			// simply delegate so that after wiring, state is wiped clean...
+			AutoWirer wirer = new AutoWirer(source, EventName, handler, MethodName);
+			wirer.Wire();
+		}
+
+		#endregion
+
+		#region Inner Class : AutoWirer
+
+		/// <summary>
+		/// Performs the matching up of handler methods to one or more source events.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This class merely marshals the matching of handler methods to the events exposed
+		/// by an event source, and then delegates to a concrete
+		/// <see cref="Spring.Objects.IEventHandlerValue"/> implementation (such as
+		/// <see cref="Spring.Objects.Support.InstanceEventHandlerValue"/> or
+		/// <see cref="Spring.Objects.Support.StaticEventHandlerValue"/>) to do the heavy lifting of
+		/// actually wiring a handler method to an event.
+		/// </p>
+		/// <p>
+		/// Note : the order in which handler's are wired up to events is non-deterministic.
+		/// </p>
+		/// </remarks>
+		private sealed class AutoWirer
+		{
+			#region Constructor (s) / Destructor
+
+			/// <summary>
+			/// Creates a new instance of the
+			/// <see cref="Spring.Objects.Support.AutoWiringEventHandlerValue.AutoWirer"/> class.
+			/// </summary>
+			/// <param name="source">
+			/// The object exposing the event (s) being wired up.
+			/// </param>
+			/// <param name="eventName">
+			/// The name of the event that is being wired up.
+			/// </param>
+			/// <param name="handler">
+			/// The object exposing the method (s) being wired to the event.
+			/// </param>
+			/// <param name="methodName">
+			/// The name of the method that is going to handle the event.
+			/// </param>
+			public AutoWirer(
+				object source, string eventName, object handler, string methodName)
+			{
+				Source = source;
+				EventName = eventName;
+				Handler = handler;
+				MethodName = methodName;
+			}
+
+			#endregion
+
+			#region Methods
+
+			/// <summary>
+			/// Wires up events on the source to methods exposed on the handler.
+			/// </summary>
+			public void Wire()
+			{
+				Type sourceType = ReflectionUtils.TypeOfOrType(Source);
+				// create the criteria for the event search...
+				ICriteria criteria = new RegularExpressionEventNameCriteria(EventName);
+				// and grab the events that satisfy the criteria...
+				BindingFlags eventFlags = BindingFlags.Instance | BindingFlags.Static
+					| BindingFlags.Public;
+				MemberInfo[] events = sourceType.FindMembers(
+					MemberTypes.Event,
+					eventFlags,
+					new MemberFilter(new CriteriaMemberFilter().FilterMemberByCriteria),
+					criteria);
+				// and for each event that satisfied the criteria...
+				foreach (EventInfo evt in events)
+				{
+					WireEvent(evt);
+				}
+			}
+
+			/// <summary>
+			/// Wires up the supplied event to any handler methods that match the event
+			/// signature.
+			/// </summary>
+			/// <param name="theEvent">The event being wired up.</param>
+			private void WireEvent(EventInfo theEvent)
+			{
+				// grab some info (such as the delegate's method signature) about the event
+				DelegateInfo eventDelegate = new DelegateInfo(theEvent);
+				// if the method name needs to be customised on a per event basis, do so
+				string customMethodName = GetMethodNameCustomisedForEvent(theEvent.Name);
+
+				// create the criteria for the handler method search...
+				ComposedCriteria methodCriteria = new ComposedCriteria();
+				// a candidate handlers method name must match the custom method name
+				methodCriteria.Add(new RegularExpressionMethodNameCriteria(customMethodName));
+				// the return Type of a candidate handlers method must be the same as the return type of the event
+				methodCriteria.Add(new MethodReturnTypeCriteria(eventDelegate.GetReturnType()));
+				// a candidate handlers method parameters must match the event's parameters
+				methodCriteria.Add(new MethodParametersCriteria(eventDelegate.GetParameterTypes()));
+
+				// and grab the methods that satisfy the criteria...
+				BindingFlags methodFlags = BindingFlags.Instance | BindingFlags.Static
+					| BindingFlags.NonPublic | BindingFlags.Public;
+				MemberInfo[] methods = HandlerType.FindMembers(
+					MemberTypes.Method,
+					methodFlags,
+					new MemberFilter(new CriteriaMemberFilter().FilterMemberByCriteria),
+					methodCriteria);
+
+				// and for each method that satisfied the criteria...
+				foreach (MethodInfo method in methods)
+				{
+					#region Instrumentation
+
+					if (log.IsDebugEnabled)
+					{
+						log.Debug(string.Format(
+							CultureInfo.InvariantCulture,
+							"Wiring up this method '{0}' to this event '{1}'",
+							method.Name,
+							theEvent.Name));
+					}
+
+					#endregion
+
+					IEventHandlerValue myHandler = method.IsStatic ?
+						(IEventHandlerValue) new StaticEventHandlerValue() :
+						(IEventHandlerValue) new InstanceEventHandlerValue();
+					myHandler.EventName = theEvent.Name;
+					myHandler.MethodName = method.Name;
+					myHandler.Wire(Source, Handler);
+				}
+			}
+
+			/// <summary>
+			/// Only replaces the <b>first</b> occurrence of the placeholder.
+			/// </summary>
+			/// <param name="eventName">The event whose name is going to be used.</param>
+			/// <returns>
+			/// The method name customised for the name of the supplied event.
+			/// </returns>
+			private string GetMethodNameCustomisedForEvent(string eventName)
+			{
+				string methodName = MethodName;
+				if (MethodName.IndexOf(EventNamePlaceHolder) >= 0)
+				{
+					methodName = MethodName.Replace(EventNamePlaceHolder, eventName);
+				}
+				return methodName;
+			}
+
+			#endregion
+
+			#region Properties
+
+			/// <summary>
+			/// The object exposing the event (s) being wired up.
+			/// </summary>
+			private object Source
+			{
+				get { return _source; }
+				set { _source = value; }
+			}
+
+			/// <summary>
+			/// The object exposing the method (s) being wired to an event source.
+			/// </summary>
+			private object Handler
+			{
+				get { return _handler; }
+				set { _handler = value; }
+			}
+
+			/// <summary>
+			/// The <see cref="Type"/> of the object that is handling any events.
+			/// </summary>
+			private Type HandlerType
+			{
+				get
+				{
+					if (_handlerType == null)
+					{
+						_handlerType = ReflectionUtils.TypeOfOrType(Handler);
+					}
+					return _handlerType;
+				}
+			}
+
+			/// <summary>
+			/// The name of the method that is going to handle the event.
+			/// </summary>
+			private string MethodName
+			{
+				get { return _methodName; }
+				set { _methodName = value; }
+			}
+
+			/// <summary>
+			/// The name of the event that is being wired up.
+			/// </summary>
+			private string EventName
+			{
+				get { return _eventName; }
+				set { _eventName = value; }
+			}
+
+			#endregion
+
+			#region Fields
+
+			private object _source;
+			private object _handler;
+			private string _methodName;
+			private string _eventName;
+			private Type _handlerType;
+
+			#endregion
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Support/ISortDefinition.cs b/src/Spring/Spring.Core/Objects/Support/ISortDefinition.cs
new file mode 100644
index 00000000..c996cbba
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Support/ISortDefinition.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+	/// <summary>
+	/// Definition for sorting object instances by a property.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	public interface ISortDefinition
+	{
+		/// <summary>
+		/// The name of the property to sort by.
+		/// </summary>
+		string Property
+		{
+			get;
+		}
+
+		/// <summary>
+		/// Whether upper and lower case in string values should be ignored.
+		/// </summary>
+		/// <value>
+		/// True if the sorting should be performed in a case-insensitive fashion.
+		/// </value>
+		bool IgnoreCase
+		{
+			get;
+		}
+
+		/// <summary>
+		/// If the sorting should be ascending or descending.
+		/// </summary>
+		/// <value>
+		/// True if the sorting should be in the ascending order.
+		/// </value>
+		bool Ascending
+		{
+			get;
+		}
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Support/InstanceEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/InstanceEventHandlerValue.cs
new file mode 100644
index 00000000..869bf081
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Support/InstanceEventHandlerValue.cs
@@ -0,0 +1,116 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+	/// <summary>
+	/// Describes an event handler for an object instance.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: InstanceEventHandlerValue.cs,v 1.7 2006/04/09 07:19:00 markpollack Exp $</version>
+	public class InstanceEventHandlerValue : AbstractWiringEventHandlerValue
+	{
+		#region Constants
+
+		private static readonly BindingFlags InstanceMethodFlags =
+			BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic |
+				BindingFlags.IgnoreCase | BindingFlags.Static;
+
+		#endregion
+
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Support.InstanceEventHandlerValue"/> class.
+		/// </summary>
+		public InstanceEventHandlerValue()
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Support.InstanceEventHandlerValue"/> class.
+		/// </summary>
+		/// <param name="source">
+		/// The object (possibly unresolved) that is exposing the event.
+		/// </param>
+		/// <param name="methodName">
+		/// The name of the method on the handler that is going to handle the event.
+		/// </param>
+		public InstanceEventHandlerValue(object source, string methodName)
+			: base(source, methodName)
+		{
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Gets the event handler.
+		/// </summary>
+		/// <param name="instance">
+		/// The instance that is registering for the event notification.
+		/// </param>
+		/// <param name="info">
+		/// Event metadata about the event.
+		/// </param>
+		/// <returns>
+		/// The event handler.
+		/// </returns>
+		protected override Delegate GetHandler(object instance, EventInfo info)
+		{
+			MethodInfo methodMeta = ResolveHandlerMethod(
+				ReflectionUtils.TypeOfOrType(instance),
+				info.EventHandlerType,
+				InstanceEventHandlerValue.InstanceMethodFlags);
+			Delegate callback = null;
+			if (methodMeta.IsStatic)
+			{
+				// case insensitive binding to a static method on an (irrelevant) instance
+				callback = Delegate.CreateDelegate(
+					info.EventHandlerType,
+					methodMeta);
+			}
+			else
+			{
+				// case insensitive binding to an instance method on an instance
+				callback =
+					Delegate.CreateDelegate(
+						info.EventHandlerType,
+						instance,
+						MethodName,
+						true);
+			}
+			return callback;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs b/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs
new file mode 100644
index 00000000..e35523ed
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs
@@ -0,0 +1,555 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Reflection;
+
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Objects;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+	/// <summary>
+	/// Helper class allowing one to declaratively specify a method call for later invocation.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Typically not used directly but via its subclasses such as
+	/// <see cref="Spring.Objects.Factory.Config.MethodInvokingFactoryObject"/>.
+	/// </p>
+	/// <p>
+	/// Usage: specify either the <see cref="MethodInvoker.TargetType"/> and 
+	/// <see cref="MethodInvoker.TargetMethod"/> or the
+	/// <see cref="MethodInvoker.TargetObject"/> and
+	/// <see cref="MethodInvoker.TargetMethod"/> properties respectively, and
+	/// (optionally) any arguments to the method. Then call the
+	/// <see cref="MethodInvoker.Prepare"/> method to prepare the invoker.
+	/// Once prepared, the invoker can be invoked any number of times.
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <p>
+	/// The following example uses the <see cref="MethodInvoker"/> class to invoke the
+	/// <c>ToString()</c> method on the <c>Foo</c> class using a mixture of both named and unnamed
+	/// arguments.
+	/// </p>
+	/// <code language="C#">
+	/// public class Foo 
+	/// {
+	///     public string ToString(string name, int age, string address)
+	///     {
+	///			return string.Format("{0}, {1} years old, {2}", name, age, address);
+	///     }
+	///     
+	///     public static void Main()
+	///     {
+	///			Foo foo = new Foo();
+	///			MethodInvoker invoker = new MethodInvoker();
+	///			invoker.Arguments = new object [] {"Kaneda", "18 Kaosu Gardens, Nakatani Drive, Okinanawa"};
+	///			invoker.AddNamedArgument("age", 29);
+	///			invoker.Prepare();
+	///			// at this point, the arguments that will be passed to the method invocation
+	///			// will have been resolved into the following ordered array : {"Kaneda", 29, "18 Kaosu Gardens, Nakatani Drive, Okinanawa"}
+	///			string details = (string) invoker.Invoke();
+	///			Console.WriteLine (details);
+	///			// will print out 'Kaneda, 29 years old, 18 Kaosu Gardens, Nakatani Drive, Okinanawa'
+	///     }
+	/// }
+	/// </code>
+	/// </example>
+	/// <author>Colin Sampaleanu</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	/// <version>$Id: MethodInvoker.cs,v 1.7 2007/08/04 01:05:15 bbaia Exp $</version>
+	public class MethodInvoker
+	{
+		#region Fields
+
+		/// <summary>
+		/// The value returned from the invocation of a method that returns void.
+		/// </summary>
+		public static readonly Missing Void = Missing.Value;
+
+		private Type _targetType;
+		private object _targetObject;
+		private string _targetMethod;
+		private object[] _arguments;
+		private IDictionary _namedArguments;
+		private object[] _preparedArguments;
+
+		/// <summary>
+		/// The method that will be invoked.
+		/// </summary>
+		private MethodInfo _methodObject;
+
+		/// <summary>
+		/// The <see cref="System.Reflection.BindingFlags"/> used to search for
+		/// the method to be invoked.
+		/// </summary>
+		private const BindingFlags MethodSearchingFlags =
+			BindingFlags.Instance |
+				BindingFlags.Static |
+				BindingFlags.Public |
+				BindingFlags.NonPublic |
+				BindingFlags.IgnoreCase;
+
+		#endregion
+
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="Spring.Objects.Support.MethodInvoker"/> class.
+		/// </summary>
+		public MethodInvoker()
+		{
+			Arguments = new object[] {};
+			NamedArguments = new Hashtable();
+			PreparedArguments = new object[] {};
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// The target <see cref="System.Type"/> on which to call the target method.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Only necessary when the target method is <see langword="static"/>;
+		/// else, a target object needs to be specified.
+		/// </p>
+		/// </remarks>
+		public Type TargetType
+		{
+			get { return _targetType; }
+			set { this._targetType = value; }
+		}
+
+		/// <summary>
+		/// The target object on which to call the target method.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Only necessary when the target method is not <see langword="static"/>;
+		/// else, a target class is sufficient.
+		/// </p>
+		/// </remarks>
+		public object TargetObject
+		{
+			get { return _targetObject; }
+			set { this._targetObject = value; }
+		}
+
+		/// <summary>
+		/// The name of the method to be invoked.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Refers to either a <see langword="static"/> method
+		/// or a non-<see langword="static"/> method, depending on
+		/// whether or not a target object has been set.
+		/// </p>
+		/// </remarks>
+		/// <seealso cref="Spring.Objects.Support.MethodInvoker.TargetObject"/>
+		public string TargetMethod
+		{
+			get { return _targetMethod; }
+			set { this._targetMethod = value; }
+		}
+
+		/// <summary>
+		/// Arguments for the method invocation.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Ordering <b>is</b> significant... the order of the arguments in this
+		/// property must match the ordering of the various parameters on the target
+		/// method. There does however exist a small possibility for confusion when
+		/// the arguments in this property are supplied in addition to one or more named
+		/// arguments. In this case, each named argument is slotted into the index position
+		/// corresponding to the named argument... once once all named arguments have been
+		/// resolved, the arguments in this property are slotted into any remaining (empty)
+		/// slots in the method parameter list (see the example in the overview of the
+		/// <see cref="Spring.Objects.Support.MethodInvoker"/> class if this is not clear).
+		/// </p>
+		/// <p>
+		/// If this property is not set, or the value passed to the setter invocation
+		/// is <see langword="null"/> or a zero-length array, a method with no (un-named) arguments is assumed.
+		/// </p>
+		/// </remarks>
+		/// <seealso cref="Spring.Objects.Support.MethodInvoker.NamedArguments"/>
+		public object[] Arguments
+		{
+			get { return _arguments; }
+			set
+			{
+				if (value != null)
+				{
+					this._arguments = value;
+				}
+				else
+				{
+					this._arguments = new object[] {};
+				}
+			}
+		}
+
+		/// <summary>
+		/// The resolved arguments for the method invocation.
+		/// </summary>
+		/// <remarks>
+		/// <note type="caution">
+		/// This property is not set until the target method has been resolved via a call to the
+		/// <see cref="Spring.Objects.Support.MethodInvoker.Prepare"/> method). It is a combination of the
+		/// named and plain vanilla arguments properties, and it is this object array that
+		/// will actually be passed to the invocation of the target method.
+		/// </note>
+		/// <p>
+		/// Setting the value of this property to <see langword="null"/> results in basically clearing out any
+		/// previously prepared arguments... another call to the <see cref="Spring.Objects.Support.MethodInvoker.Prepare"/>
+		/// method will then be required to prepare the arguments again (or the prepared arguments
+		/// can be set explicitly if so desired).
+		/// </p>
+		/// </remarks>
+		/// <seealso cref="Spring.Objects.Support.MethodInvoker.Arguments"/>
+		/// <seealso cref="Spring.Objects.Support.MethodInvoker.NamedArguments"/>
+		protected object[] PreparedArguments
+		{
+			get { return _preparedArguments; }
+			set
+			{
+				if (value != null)
+				{
+					this._preparedArguments = value;
+				}
+				else
+				{
+					this._preparedArguments = new object[] {};
+				}
+			}
+		}
+
+		/// <summary>
+		/// Named arguments for the method invocation.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The keys of this dictionary are the (<see cref="System.String"/>) names of the
+		/// method arguments, and the (<see cref="System.Object"/>) values are the actual
+		/// argument values themselves.
+		/// </p>
+		/// <p>
+		/// If this property is not set, or the value passed to the setter invocation
+		/// is a <see langword="null"/> reference, a method with no named arguments is assumed.
+		/// </p>
+		/// </remarks>
+		/// <seealso cref="Spring.Objects.Support.MethodInvoker.Arguments"/>
+		public IDictionary NamedArguments
+		{
+			get { return _namedArguments; }
+			set
+			{
+				if (value != null)
+				{
+					this._namedArguments = value;
+				}
+				else
+				{
+					this._namedArguments.Clear();
+				}
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Prepare the specified method.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The method can be invoked any number of times afterwards.
+		/// </p>
+		/// </remarks>
+		/// <exception cref="System.ArgumentException">
+		/// If all required properties are not set, or a matching argument could not be found
+		/// for a named argument (typically down to a typo).
+		/// </exception>
+		/// <exception cref="System.MissingMethodException">
+		/// If the specified method could not be found.
+		/// </exception>
+		public virtual void Prepare()
+		{
+			if (_targetMethod == null)
+			{
+				throw new ArgumentException("The 'TargetMethod' property is required.");
+			}
+			if (_targetType == null && _targetObject == null)
+			{
+				throw new ArgumentException("One of either the 'TargetType' or 'TargetObject' properties is required.");
+			}
+			_methodObject = FindTheMethodToInvoke();
+			if (TargetObject == null && !_methodObject.IsStatic)
+			{
+				throw new ArgumentException(
+					"The target method cannot be an instance method without a corresponding target instance on which to invoke it.");
+			}
+			PrepareArguments();
+		}
+
+		private void PrepareArguments()
+		{
+			_preparedArguments = new object[ArgumentCount];
+			// ok, lets prepare any named arguments first...
+			if (NamedArguments.Count > 0)
+			{
+				// lets slot in all of the named arguments first...
+				ParameterInfo[] parameters = _methodObject.GetParameters();
+				// lets figure out the index og each of the method parameters...
+				IDictionary argumentNamesToIndexes = new Hashtable();
+				for (int i = 0; i < parameters.Length; ++i)
+				{
+					ParameterInfo parameter = parameters[i];
+					argumentNamesToIndexes[parameter.Name.ToLower(CultureInfo.InvariantCulture)] = i;
+				}
+				int THE_ARGUMENT_IS_PREPARED = -12;
+				foreach (DictionaryEntry namedArgument in NamedArguments)
+				{
+					string argumentName = ((string) namedArgument.Key).ToLower(CultureInfo.InvariantCulture);
+					object argumentValue = namedArgument.Value;
+					if (!argumentNamesToIndexes.Contains(argumentName))
+					{
+						// whoa (Nelly); the named argument does not exist on the method...
+						throw new ArgumentException(string.Format(
+							CultureInfo.InvariantCulture,
+							"The named argument '{0}' could not be found on the '{1}' method of class [{2}].",
+							argumentName, _methodObject.Name, _methodObject.DeclaringType.FullName));
+
+					}
+					// look up the index of where in the prepared args array we're gonna stick the named argument value
+					int namedArgumentsIndex = (int) argumentNamesToIndexes[argumentName];
+					PreparedArguments[namedArgumentsIndex] = argumentValue;
+					// we've prepped this index position, so mark it as so...
+					argumentNamesToIndexes[argumentName] = THE_ARGUMENT_IS_PREPARED;
+				}
+				// and then fill in any remaining blanks with the plain vanilla arguments...
+				int plainVanillaIndex = 0;
+				int[] sortedIndexes = (int[]) new ArrayList(argumentNamesToIndexes.Values).ToArray(typeof (int));
+				Array.Sort(sortedIndexes);
+				foreach (int argumentIndex in sortedIndexes)
+				{
+					// have we previously prepped a named argument at this index position?
+					if (argumentIndex == THE_ARGUMENT_IS_PREPARED)
+					{
+						continue;
+					}
+					// lets stick a plain vanilla argument in at this index position (in the order that they have been supplied)...
+					PreparedArguments[argumentIndex] = Arguments[plainVanillaIndex++];
+				}
+			}
+			else
+			{
+				PreparedArguments = Arguments;
+			}
+		}
+
+		/// <summary>
+		/// Searches for and returns the method that is to be invoked.
+		/// </summary>
+		/// <remarks>
+		/// The return value of this method call will subsequently be returned from the
+		/// <see cref="Spring.Objects.Support.MethodInvoker.GetPreparedMethod()"/>.
+		/// </remarks>
+		/// <returns>The method that is to be invoked.</returns>
+		/// <exception cref="System.MissingMethodException">
+		/// If no method could be found.
+		/// </exception>
+		/// <exception cref="System.ArgumentException">
+		/// If more than one method was found.
+		/// </exception>
+        protected virtual MethodInfo FindTheMethodToInvoke()
+        {
+            MethodInfo theMethod = null;
+            Type targetType = (TargetObject != null) ? TargetObject.GetType() : TargetType;
+#if NET_2_0
+            GenericArgumentsHolder genericInfo = new GenericArgumentsHolder(TargetMethod);
+#endif
+            // if we don't have any named arguments, we can try to get the exact method first...
+			if (NamedArguments.Count == 0)
+			{
+                ComposedCriteria searchCriteria = new ComposedCriteria();
+#if NET_2_0
+                searchCriteria.Add(new MethodNameMatchCriteria(genericInfo.GenericMethodName));
+                searchCriteria.Add(new MethodParametersCountCriteria(ArgumentCount));
+                searchCriteria.Add(new MethodGenericArgumentsCountCriteria(
+                    genericInfo.GetGenericArguments().Length));
+#else
+                searchCriteria.Add(new MethodNameMatchCriteria(TargetMethod));
+                searchCriteria.Add(new MethodParametersCountCriteria(ArgumentCount));
+#endif
+                searchCriteria.Add(new MethodParametersCriteria(ReflectionUtils.GetTypes(Arguments)));
+
+                MemberInfo[] matchingMethods = targetType.FindMembers(
+                    MemberTypes.Method,
+                    MethodSearchingFlags,
+                    new MemberFilter(new CriteriaMemberFilter().FilterMemberByCriteria),
+                    searchCriteria);
+
+                if (matchingMethods != null && matchingMethods.Length == 1)
+                {
+                    theMethod = matchingMethods[0] as MethodInfo;
+                }
+			}
+            if (theMethod == null)
+            {
+                // search for a method with a matching signature... 
+                ComposedCriteria searchCriteria = new ComposedCriteria();
+#if NET_2_0
+                searchCriteria.Add(new MethodNameMatchCriteria(genericInfo.GenericMethodName));
+                searchCriteria.Add(new MethodParametersCountCriteria(ArgumentCount));
+                searchCriteria.Add(new MethodGenericArgumentsCountCriteria(
+                    genericInfo.GetGenericArguments().Length));
+#else
+                searchCriteria.Add(new MethodNameMatchCriteria(TargetMethod));
+                searchCriteria.Add(new MethodParametersCountCriteria(ArgumentCount));
+#endif
+                MemberInfo[] matchingMethods = targetType.FindMembers(
+                    MemberTypes.Method,
+                    MethodSearchingFlags,
+                    new MemberFilter(new CriteriaMemberFilter().FilterMemberByCriteria),
+                    searchCriteria);
+
+                if (matchingMethods == null
+                    || matchingMethods.Length == 0)
+                {
+                    throw new MissingMethodException(targetType.Name, TargetMethod);
+                }
+                if (matchingMethods.Length > 1)
+                {
+                    throw new ArgumentException(string.Format(
+                        CultureInfo.InvariantCulture,
+                        "Unable to determine which exact method to call; found '{0}' matches.",
+                        matchingMethods.Length));
+                }
+                theMethod = matchingMethods[0] as MethodInfo;
+            }
+#if NET_2_0
+            if (genericInfo.ContainsGenericArguments)
+            {
+                string[] unresolvedGenericArgs = genericInfo.GetGenericArguments();
+                Type[] genericArgs = new Type[unresolvedGenericArgs.Length];
+                for (int j = 0; j < unresolvedGenericArgs.Length; j++)
+                {
+                    genericArgs[j] = TypeResolutionUtils.ResolveType(unresolvedGenericArgs[j]);
+                }
+                theMethod = theMethod.MakeGenericMethod(genericArgs);
+            }
+#endif
+            return theMethod;
+        }
+
+		/// <summary>
+		/// Adds the named argument to this instances mapping of argument names to argument values.
+		/// </summary>
+		/// <param name="argumentName">
+		/// The name of an argument on the method that is to be invoked.
+		/// </param>
+		/// <param name="argument">
+		/// The value of the named argument on the method that is to be invoked.
+		/// </param>
+		public void AddNamedArgument(string argumentName, object argument)
+		{
+			if (NamedArguments.Contains(argumentName))
+			{
+				NamedArguments.Remove(argumentName);
+			}
+			NamedArguments.Add(argumentName, argument);
+		}
+
+		private int ArgumentCount
+		{
+			get { return Arguments.Length + NamedArguments.Count; }
+		}
+
+		/// <summary>
+		/// Returns the prepared <see cref="System.Reflection.MethodInfo"/> object that
+		/// will be invoked.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// A possible use case is to determine the return <see cref="System.Type"/> of the method.
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// The prepared <see cref="System.Reflection.MethodInfo"/> object that
+		/// will be invoked.
+		/// </returns>
+		public MethodInfo GetPreparedMethod()
+		{
+			return this._methodObject;
+		}
+
+		/// <summary>
+		/// Invoke the specified method.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The invoker needs to have been prepared beforehand (via a call to the
+		/// <see cref="Spring.Objects.Support.MethodInvoker.Prepare"/> method).
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// The object returned by the method invocation, or
+		/// <see cref="Spring.Objects.Support.MethodInvoker.Void"/> if the method returns void.
+		/// </returns>
+		/// <exception cref="MethodInvocationException">
+		/// If at least one of the arguments passed to this <see cref="Spring.Objects.Support.MethodInvoker"/>
+		/// was incompatible with the signature of the invoked method.
+		/// </exception>
+		public virtual object Invoke()
+		{
+			object result = null;
+			try
+			{
+				result = this._methodObject.Invoke(TargetObject, PreparedArguments);
+			}
+			catch (ArgumentException ex)
+			{
+				throw new MethodInvocationException(
+					string.Format(CultureInfo.InvariantCulture,
+					              "At least one of the arguments passed to this {0} was " +
+					              	"incompatible with the signature of the invoked method.", GetType().Name), ex);
+			}
+			return (result == null ? Void : result);
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Support/MutableSortDefinition.cs b/src/Spring/Spring.Core/Objects/Support/MutableSortDefinition.cs
new file mode 100644
index 00000000..452b3db3
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Support/MutableSortDefinition.cs
@@ -0,0 +1,217 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+	/// <summary>
+	/// Mutable implementation of the
+	/// <see cref="Spring.Objects.Support.ISortDefinition"/> interface that
+    /// supports toggling the ascending value on setting the same property again.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Jean-Pierre Pawlak</author>
+	/// <author>Simon White (.NET)</author>
+	[Serializable]
+	public class MutableSortDefinition : ISortDefinition
+	{
+		private string _property = string.Empty;
+		private bool _ignoreCase = true;
+		private bool _ascending = true;
+		private bool _toggleAscendingOnProperty = false;
+
+		#region Properties
+		private bool ToggleAscendingOnProperty 
+		{
+			get
+			{
+				return _toggleAscendingOnProperty;
+			}
+			set
+			{
+				this._toggleAscendingOnProperty = value;
+			}
+		}
+		#endregion
+
+		#region ISortDefinition Properties
+        /// <summary>
+        /// The name of the property to sort by.
+        /// </summary>
+		public string Property
+		{
+			get
+			{
+				return _property;
+			}
+			set
+			{
+				if (!StringUtils.HasText (value)) 
+				{
+					_property = string.Empty;
+				}
+				else 
+				{
+					// implicit toggling of ascending?
+					if (ToggleAscendingOnProperty) 
+					{
+						if (value.Equals(_property)) 
+						{
+							_ascending = !_ascending;
+						}
+					}
+					_property = value;
+				}
+			}
+		}
+
+        /// <summary>
+        /// Whether upper and lower case in string values should be ignored.
+        /// </summary>
+        /// <value>
+        /// True if the sorting should be performed in a case-insensitive fashion.
+        /// </value>
+		public bool IgnoreCase
+		{
+			get
+			{
+				return _ignoreCase;
+			}
+		}
+
+        /// <summary>
+        /// If the sorting should be ascending or descending.
+        /// </summary>
+        /// <value>
+        /// True if the sorting should be in the ascending order.
+        /// </value>
+		public bool Ascending
+		{
+			get
+			{
+				return _ascending;
+			}
+		}
+		#endregion
+
+		#region Constructors
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Support.MutableSortDefinition"/> class.
+		/// </summary>
+		public MutableSortDefinition ()
+		{
+		}
+
+		/// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Support.MutableSortDefinition"/> class using
+        /// the specified <see cref="Spring.Objects.Support.ISortDefinition"/>.
+		/// </summary>
+		/// <param name="source">
+		/// The <see cref="Spring.Objects.Support.ISortDefinition"/> to use
+		/// as a source for initial property values.
+		/// </param>
+		public MutableSortDefinition (ISortDefinition source)
+		{
+			this._property = source.Property;
+			this._ignoreCase = source.IgnoreCase;
+			this._ascending = source.Ascending;
+		}
+
+		/// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Support.MutableSortDefinition"/> class.
+		/// </summary>
+		/// <param name="name">
+		/// The name of the property to sort by.
+		/// </param>
+		/// <param name="ignoreCase">
+		/// Whether upper and lower case in string values should be ignored.
+		/// </param>
+		/// <param name="ascending">
+		/// Whether or not the sorting should be ascending or descending.
+		/// </param>
+		public MutableSortDefinition(string name, bool ignoreCase, bool ascending)
+		{
+			this._property = name;
+			this._ignoreCase = ignoreCase;
+			this._ascending = ascending;
+		}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Support.MutableSortDefinition"/> class.
+        /// </summary>
+		/// <param name="toggleAscendingOnSameProperty">
+		/// Whether or not the
+		/// <see cref="Spring.Objects.Support.MutableSortDefinition.Ascending"/>
+		/// property should be toggled if the same name is set on the
+		/// <see cref="Spring.Objects.Support.MutableSortDefinition.Property"/>
+		/// property.
+		/// </param>
+		public MutableSortDefinition (bool toggleAscendingOnSameProperty)
+		{
+			this.ToggleAscendingOnProperty = toggleAscendingOnSameProperty;
+		}
+		#endregion
+
+		#region Methods
+		/// <summary>
+		/// Overrides the default <see cref="System.Object.Equals(object)"/> method
+		/// </summary>
+		/// <param name="obj">
+		/// The object to test against this instance for equality.
+		/// </param>
+		/// <returns>
+		/// True if the supplied <paramref name="obj"/> is equal to this instance.
+		/// </returns>
+		public override bool Equals(object obj) 
+		{
+			if (!(obj is ISortDefinition)) 
+			{
+				return false;
+			}
+			ISortDefinition sd = (ISortDefinition) obj;
+			return (this.Property.Equals(sd.Property) &&
+					this.Ascending == sd.Ascending && this.IgnoreCase == sd.IgnoreCase);
+		}
+
+		/// <summary>
+		/// Overrides the default <see cref="System.Object.GetHashCode"/> method.
+		/// </summary>
+		/// <returns>The hashcode for this instance.</returns>
+		public override int GetHashCode() 
+		{
+			int result = 0;
+			result = this.Property.GetHashCode();
+			result = 29 * result + (this.IgnoreCase ? 1 : 0);
+			result = 29 * result + (this.Ascending ? 1 : 0);
+			return result;
+		}
+		#endregion
+	}
+}
diff --git a/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs b/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs
new file mode 100644
index 00000000..69f12f27
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs
@@ -0,0 +1,198 @@
+#region License
+
+/*
+* Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using Common.Logging;
+using Spring.Core;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+    /// <summary>
+    /// Performs a comparison of two objects, using the specified object property via
+    /// an <see cref="Spring.Objects.IObjectWrapper"/>.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Jean-Pierre Pawlak</author>
+    /// <author>Simon White (.NET)</author>
+    /// <version>$Id: PropertyComparator.cs,v 1.12 2007/07/31 00:09:03 markpollack Exp $</version>
+    public class PropertyComparator : IComparer
+    {
+        private static readonly ILog logger
+            = LogManager.GetLogger(typeof (PropertyComparator));
+
+        private ISortDefinition sortDefinition;
+        private readonly IDictionary cachedObjectWrappers = new Hashtable();
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Support.PropertyComparator"/> class.
+        /// </summary>
+        /// <param name="definition">
+        /// The <see cref="Spring.Objects.Support.ISortDefinition"/> to use for any
+        /// sorting.
+        /// </param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="definition"/> is <cref lang="null"/>.
+        /// </exception>
+        public PropertyComparator(ISortDefinition definition)
+        {
+            AssertUtils.ArgumentNotNull(definition, "definition");
+            this.sortDefinition = definition;
+        }
+
+        /// <summary>
+        ///	Gets the <see cref="Spring.Objects.Support.ISortDefinition"/> to
+        ///	use for any sorting.
+        /// </summary>
+        /// <value>
+        /// The <see cref="Spring.Objects.Support.ISortDefinition"/> to	use for
+        /// any sorting.
+        /// </value>
+        public ISortDefinition SortDefinition
+        {
+            get { return this.sortDefinition; }
+        }
+
+        /// <summary>
+        /// Compares two objects and returns a value indicating whether one is less
+        /// than, equal to or greater than the other.
+        /// </summary>
+        /// <param name="o1">The first object to compare.</param>
+        /// <param name="o2">The second object to compare.</param>
+        /// <returns><see cref="System.Collections.IComparer.Compare"/></returns>
+        public virtual int Compare(object o1, object o2)
+        {
+            object v1 = GetPropertyValue(o1);
+            object v2 = GetPropertyValue(o2);
+            if (this.sortDefinition.IgnoreCase
+                && (v1 is string)
+                && (v2 is string))
+            {
+                v1 = ((string) v1).ToLower(CultureInfo.CurrentCulture);
+                v2 = ((string) v2).ToLower(CultureInfo.CurrentCulture);
+            }
+            int result = 0;
+            try
+            {
+                if (v1 != null)
+                {
+                    if (v2 != null)
+                    {
+                        result = ((IComparable) v1).CompareTo(v2);
+                    }
+                    else
+                    {
+                        result = -1;
+                    }
+                }
+                else
+                {
+                    if (v2 != null)
+                    {
+                        result = 1;
+                    }
+                    else
+                    {
+                        result = 0;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                #region Instrumentation
+
+                if (logger.IsWarnEnabled)
+                {
+                    logger.Warn("Could not sort objects [" + o1 + "] and [" + o2 + "]",
+                                ex);
+                }
+
+                #endregion
+
+                return 0;
+            }
+            return (this.sortDefinition.Ascending ? result : -result);
+        }
+
+        /// <summary>
+        /// Get the <see cref="Spring.Objects.Support.ISortDefinition"/>'s property
+        /// value for the given object.
+        /// </summary>
+        /// <param name="obj">The object to get the property value for.</param>
+        /// <returns>The property value.</returns>
+        private object GetPropertyValue(object obj)
+        {
+            object propertyValue = null;
+            if (obj != null)
+            {
+                IObjectWrapper ow = (IObjectWrapper) this.cachedObjectWrappers[obj];
+                if (ow == null)
+                {
+                    ow = new ObjectWrapper(obj);
+                    this.cachedObjectWrappers.Add(obj, ow);
+                }
+                try
+                {
+                    propertyValue = ow.GetPropertyValue(this.sortDefinition.Property);
+                }
+                catch (InvalidPropertyException ex)
+                {
+                    // the property doesn't exist in the first place, so let exception through...
+                    throw ex;
+                }
+                catch (ObjectsException ex)
+                {
+                    // if a nested property cannot be read, simply return null...
+                    if (logger.IsDebugEnabled)
+                    {
+                        logger.Debug("Could not access property - treating as null for sorting.", ex);
+                    }
+                }
+            }
+            return propertyValue;
+        }
+
+        /// <summary>
+        /// Sort the given <see cref="System.Collections.IList"/> according to the
+        /// given sort definition.
+        /// </summary>
+        /// <param name="source">
+        /// The <see cref="System.Collections.IList"/> to be sorted.
+        /// </param>
+        /// <param name="sortDefinition">The parameters to sort by.</param>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In the case of a missing property name.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="sortDefinition"/> is <cref lang="null"/>.
+        /// </exception>
+        public static void Sort(IList source, ISortDefinition sortDefinition)
+        {
+            ArrayList.Adapter(source).Sort(new PropertyComparator(sortDefinition));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Objects/Support/StaticEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/StaticEventHandlerValue.cs
new file mode 100644
index 00000000..3c85ab6d
--- /dev/null
+++ b/src/Spring/Spring.Core/Objects/Support/StaticEventHandlerValue.cs
@@ -0,0 +1,98 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+	/// <summary>
+	/// Describes an event handler for a static class method.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: StaticEventHandlerValue.cs,v 1.5 2006/04/09 07:19:00 markpollack Exp $</version>
+    public class StaticEventHandlerValue : AbstractWiringEventHandlerValue
+    {
+        #region Constants
+        private static readonly BindingFlags StaticMethodFlags =
+            BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic |
+            BindingFlags.IgnoreCase;
+        #endregion
+
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Support.StaticEventHandlerValue"/> class.
+        /// </summary>
+        public StaticEventHandlerValue ()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Support.StaticEventHandlerValue"/> class.
+        /// </summary>
+        /// <param name="source">
+        /// The object (possibly unresolved) that is exposing the event.
+        /// </param>
+        /// <param name="methodName">
+        /// The name of the method on the handler that is going to handle the event.
+        /// </param>
+        public StaticEventHandlerValue (object source, string methodName)
+            : base (source, methodName) {}
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Gets the event handler.
+        /// </summary>
+        /// <param name="instance">
+        /// The instance that is registering for the event notification.
+        /// </param>
+        /// <param name="info">
+        /// Event metadata about the event.
+        /// </param>
+        /// <returns>
+        /// The event handler.
+        /// </returns>
+        protected override Delegate GetHandler(object instance, EventInfo info)
+        {
+            Type type = instance as Type;
+            if (type == null) 
+            {
+                throw new FatalObjectException (string.Format (
+                    CultureInfo.InvariantCulture,
+                    "Only 'System.Type' instances can be wired by instances of " +
+                    "the StaticEventHandlerValue class; got '{0}'", instance));
+            }
+            MethodInfo method = ResolveHandlerMethod (
+                type,
+                info.EventHandlerType,
+                StaticEventHandlerValue.StaticMethodFlags);
+            return Delegate.CreateDelegate (info.EventHandlerType, method);
+        }
+        #endregion
+	}
+}
diff --git a/src/Spring/Spring.Core/Pool/IObjectPool.cs b/src/Spring/Spring.Core/Pool/IObjectPool.cs
new file mode 100644
index 00000000..07ccc58c
--- /dev/null
+++ b/src/Spring/Spring.Core/Pool/IObjectPool.cs
@@ -0,0 +1,150 @@
+#region License
+
+/*
+* Copyright © 2002-2005 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;
+
+namespace Spring.Pool
+{
+	/// <summary>
+	/// A simple pooling interface for managing and monitoring a pool
+	/// of objects.  
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Based on the Jakarta Commons Pool API.
+	/// </p>
+	/// </remarks>
+	/// <author>Federico Spinazzi</author>
+	/// <version>$Id: IObjectPool.cs,v 1.5 2005/08/13 18:04:54 springboy Exp $</version>
+	/// <seealso cref="Spring.Pool.IPoolableObjectFactory"/>
+	public interface IObjectPool
+	{
+		/// <summary>
+		/// Obtain an instance from the pool.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// By contract, clients <b>must</b> return the borrowed 
+		/// instance using <see cref="Spring.Pool.IObjectPool.ReturnObject"/>
+		/// or a related method as defined in an implementation or
+		/// sub-interface.
+		/// </p>
+		/// </remarks>
+		/// <returns>An instance from the pool.</returns>
+		/// <exception cref="Spring.Pool.PoolException">
+		/// In case the pool is unusable.
+		/// </exception>
+		/// <seealso cref="Spring.Pool.IPoolableObjectFactory.ActivateObject"/>
+		object BorrowObject();
+
+		/// <summary>
+		/// Return an instance to the pool.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// By contract, the object <b>must</b> have been obtained using 
+		/// <see cref="Spring.Pool.IObjectPool.BorrowObject"/>
+		/// or a related method as defined in an implementation or sub-interface.
+		/// </p>
+		/// </remarks>
+		/// <param name="target">The instance to be returned to the pool.</param>
+		/// <seealso cref="Spring.Pool.IPoolableObjectFactory.PassivateObject"/>
+		void ReturnObject(object target);
+
+        /// <summary>
+        /// Create an object using the factory set by
+        /// the <see cref="PoolableObjectFactory"/> property
+        /// or other implementation dependent mechanism
+        /// and place it into the pool. 
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an optional operation. AddObject is useful for "pre-loading" a 
+        /// pool with idle objects.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="NotSupportedException">
+        /// If the implementation does not support the operation.
+        /// </exception>
+        void AddObject();
+
+        /// <summary>
+        /// Close the pool and free any resources associated with it.
+        /// </summary>
+        void Close();
+
+        /// <summary>
+        /// Clear objects sitting idle in the pool, releasing any
+        /// associated resources.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an optional operation.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="NotSupportedException">
+        /// If the implementation does not support the operation.
+        /// </exception>
+        void Clear();
+
+		/// <summary>
+		/// Gets the number of instances currently borrowed from the pool. 
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an optional operation.
+		/// </p>
+		/// </remarks>
+        /// <exception cref="NotSupportedException">
+        /// If the implementation does not support the operation.
+        /// </exception>       
+        int NumActive { get; }        
+        
+        /// <summary>
+		/// Gets the number of instances currently idle in the pool.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an optional operation.
+		/// </p>
+		/// <p>
+		/// This may be considered an <i>approximation</i> of the number of objects
+		/// that can be borrowed without creating any new instances.
+		/// </p>
+		/// </remarks>
+        /// <exception cref="NotSupportedException">
+        /// If the implementation does not support the operation.
+        /// </exception>
+        int NumIdle { get; }
+
+        /// <summary>
+        /// Set the factory used to create new instances.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an optional operation.
+		/// </p>
+		/// </remarks>
+        /// <exception cref="NotSupportedException">
+        /// If the implementation does not support the operation.
+        /// </exception>
+        IPoolableObjectFactory PoolableObjectFactory { set; }
+    }
+}
diff --git a/src/Spring/Spring.Core/Pool/IPoolableObjectFactory.cs b/src/Spring/Spring.Core/Pool/IPoolableObjectFactory.cs
new file mode 100644
index 00000000..500e1605
--- /dev/null
+++ b/src/Spring/Spring.Core/Pool/IPoolableObjectFactory.cs
@@ -0,0 +1,125 @@
+#region License
+
+/*
+* Copyright © 2002-2005 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
+
+namespace Spring.Pool
+{
+	/// <summary>
+	/// Defines lifecycle methods for objects that are to be used in an
+	/// <see cref="Spring.Pool.IObjectPool"/> implementation.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The following methods summarize the contract between an
+	/// <see cref="Spring.Pool.IObjectPool"/> and an
+	/// an <see cref="Spring.Pool.IPoolableObjectFactory"/>.
+	/// </p>
+	/// <list type="number">
+	///   <item>
+	///		<see cref="Spring.Pool.IPoolableObjectFactory.MakeObject"/>
+	///		is called whenever a new instance is needed.
+	///   </item>
+	///   <item>
+	///		<see cref="Spring.Pool.IPoolableObjectFactory.ActivateObject"/>
+	///		is invoked on every instance before it is returned from
+	///		the pool.
+	///   </item>
+	///   <item>
+	///		<see cref="Spring.Pool.IPoolableObjectFactory.PassivateObject"/>
+	///		is invoked on every instance when it is returned to the pool.
+	///   </item>
+	///   <item>
+	///		<see cref="Spring.Pool.IPoolableObjectFactory.DestroyObject"/>
+	///		is invoked on every instance when it is being dropped from the
+	///		pool (see
+	///		<see cref="Spring.Pool.IPoolableObjectFactory.ValidateObject"/>
+	///   </item>
+	/// </list>
+	/// <p>
+	/// Based on the Jakarta Commons Pool API.
+	/// </p>
+	/// </remarks>
+	/// <author>Federico Spinazzi</author>
+	/// <version>$Id: IPoolableObjectFactory.cs,v 1.5 2005/11/18 17:29:32 gcaprio Exp $</version>
+	/// <seealso cref="Spring.Pool.IObjectPool"/>
+	public interface IPoolableObjectFactory
+	{
+		/// <summary>
+		/// Creates an instance that can be returned by the pool.
+		/// </summary>
+		/// <returns>
+		/// An instance that can be returned by the pool.
+		/// </returns>
+		object MakeObject();
+
+		/// <summary>
+		/// Destroys an instance no longer needed by the pool.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Invoked on every instance when it is being "dropped" 
+		/// from the pool (whether due to the return value from a call to the
+		/// <see cref="Spring.Pool.IPoolableObjectFactory.ValidateObject"/>
+		/// method, or for reasons specific to the pool implementation.)
+		/// </p>
+		/// </remarks>
+		/// <param name="obj">The instance to be destroyed.</param>
+		void DestroyObject(object obj);
+
+		/// <summary>
+		/// Ensures that the instance is safe to be returned by the pool. 
+		/// Returns false if this object should be destroyed. 
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Invoked in an implementation-specific fashion to determine if an 
+		/// instance is still valid to be returned by the pool. 
+		/// It will only be invoked on an "activated" instance.
+		/// </p>
+		/// </remarks>
+		/// <param name="obj">The instance to validate.</param>
+		/// <returns>
+		/// <see langword="false"/> if this object is not valid and
+		/// should be dropped from the pool, otherwise <see langword="true"/>.
+		/// </returns>
+		bool ValidateObject(object obj);
+
+		/// <summary>
+		/// Reinitialize an instance to be returned by the pool. 
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Invoked on every instance before it is returned from the pool.
+		/// </p>
+		/// </remarks>
+		/// <param name="obj">The instance to be activated.</param>
+		void ActivateObject(object obj);
+
+		/// <summary>
+		/// Uninitialize an instance to be returned to the pool.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Invoked on every instance when it is returned to the pool.
+		/// </p>
+		/// </remarks>
+		/// <param name="obj">The instance returned to the pool.</param>
+		void PassivateObject(object obj);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Pool/PoolException.cs b/src/Spring/Spring.Core/Pool/PoolException.cs
new file mode 100644
index 00000000..8d6c3467
--- /dev/null
+++ b/src/Spring/Spring.Core/Pool/PoolException.cs
@@ -0,0 +1,81 @@
+#region License
+/*
+* Copyright © 2002-2005 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.Runtime.Serialization;
+
+namespace Spring.Pool
+{
+    /// <summary>
+    /// Base class for all pooling exceptions.
+    /// </summary>
+    /// <author>Federico Spinazzi</author>
+    /// <version>$Id: PoolException.cs,v 1.4 2005/08/07 04:59:47 markpollack Exp $</version>
+    [Serializable]
+    public class PoolException : Exception
+    {
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Pool.PoolException"/> class.
+        /// </summary>
+        public PoolException ()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Pool.PoolException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public PoolException (string message) : base (message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Pool.PoolException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="innerException">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public PoolException (string message, Exception innerException) : base (message, innerException)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Pool.PoolException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected PoolException (SerializationInfo info, StreamingContext context) : base (info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Pool/Support/SimplePool.cs b/src/Spring/Spring.Core/Pool/Support/SimplePool.cs
new file mode 100644
index 00000000..34175bd9
--- /dev/null
+++ b/src/Spring/Spring.Core/Pool/Support/SimplePool.cs
@@ -0,0 +1,294 @@
+#region License
+
+/*
+* Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Util;
+using Spring.Threading;
+
+#endregion
+
+namespace Spring.Pool.Support
+{
+	/// <summary>
+	/// A simple pool implementation
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Based on the implementation found in Concurrent Programming in Java,
+	/// 2nd ed., by <a href="http://gee.cs.oswego.edu/dl/">Doug Lea</a>.
+	/// </p>
+	/// </remarks>
+	/// <author>Doug Lea</author>
+	/// <author>Federico Spinazzi</author>
+	/// <author>Mark Pollack</author>
+	/// <version>$Id: SimplePool.cs,v 1.4 2006/09/15 19:06:07 markpollack Exp $</version>
+	public class SimplePool : IObjectPool
+	{
+		private readonly IPoolableObjectFactory factory;
+		private bool closed;
+		private IList free = new ArrayList();
+		private IList busy = new ArrayList(); // linear search !!
+
+		/// <summary>
+		/// Set of permits
+		/// </summary>
+		internal readonly Semaphore available;
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="Spring.Pool.Support.SimplePool"/>
+		/// class.
+		/// </summary>
+		/// <param name="factory">
+		/// The factory used to instantiate and manage the lifecycle of pooled objects.
+		/// </param>
+		/// <param name="size">The initial size of the pool.</param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="factory"/> is <see langword="null"/>.
+		/// </exception>
+		/// <exception cref="System.ArgumentException">
+		/// If the supplied <paramref name="size"/> is less than or equal to zero.
+		/// </exception>
+		public SimplePool(IPoolableObjectFactory factory, int size)
+		{
+			AssertUtils.ArgumentNotNull(factory, "factory");
+			this.available = new Semaphore(size);
+			this.factory = factory;
+			InitItems(size);
+		}
+
+		/// <summary>
+		/// Obtain an instance from the pool.
+		/// </summary>
+		/// <exception cref="Spring.Pool.PoolException">
+		/// In case the pool is unusable.
+		/// </exception>
+		/// <seealso cref="Spring.Pool.IPoolableObjectFactory.ActivateObject"/>
+		/// <seealso cref="Spring.Pool.IObjectPool.BorrowObject"/>
+		public object BorrowObject()
+		{
+			available.Acquire();
+			return DoBorrow();
+		}
+
+		/// <summary>
+		/// Return an instance to the pool.
+		/// </summary>
+		/// <param name="target">The instance to be returned to the pool.</param>
+		/// <seealso cref="Spring.Pool.IPoolableObjectFactory.PassivateObject"/>
+		/// <seealso cref="Spring.Pool.IObjectPool.ReturnObject"/>
+		public void ReturnObject(object target)
+		{
+			if (DoReturn(target))
+			{
+				available.Release();
+			}
+		}
+
+		/// <summary>
+		/// Create an object using the factory set by
+		/// the <see cref="PoolableObjectFactory"/> property
+		/// or other implementation dependent mechanism
+		/// and place it into the pool.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This implementation <b>always</b> throws a
+		/// <see cref="System.NotSupportedException"/>.
+		/// </p>
+		/// </remarks>
+		/// <exception cref="NotSupportedException">
+		/// If the implementation does not support the operation.
+		/// </exception>
+		public void AddObject()
+		{
+			throw new NotSupportedException();
+		}
+
+		/// <summary>
+		/// Synchronized borrow logic.
+		/// </summary>
+		/// <seealso cref="Spring.Pool.Support.SimplePool.BorrowObject"/>
+		protected object DoBorrow()
+		{
+			lock (this)
+			{
+				while (free.Count > 0)
+				{
+					int i = free.Count - 1;
+					object o = free[i];
+					free.RemoveAt(i);
+					factory.ActivateObject(o);
+					if (factory.ValidateObject(o))
+					{
+						busy.Add(o);
+						return o;
+					}
+				}
+				if (!closed)
+				{
+					throw new PoolException("No more valid objects in pool.");
+				}
+				else
+				{
+					throw new PoolException("Pool was closed and is unusable.");
+				}
+			}
+		}
+
+		/// <summary>
+		/// Synchronized release logic.
+		/// </summary>
+		/// <param name="target">
+		/// The object to release to the pool.
+		/// </param>
+		/// <returns>
+		/// <see langword="false"/> if the object was not a busy one.
+		/// </returns>
+		protected bool DoReturn(object target)
+		{
+			lock (this)
+			{
+				if (busy.Contains(target))
+				{
+					busy.Remove(target);
+					factory.PassivateObject(target);
+					free.Add(target);
+					return true;
+				}
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Instantiates the supplied number of instances and adds
+		/// them to the pool.
+		/// </summary>
+		/// <param name="initialInstances">
+		/// The initial number of objects to build.
+		/// </param>
+		/// <exception cref="System.ArgumentException">
+		/// If the supplied number of <paramref name="initialInstances"/> is
+		/// less than or equal to zero.
+		/// </exception>
+		protected void InitItems(int initialInstances)
+		{
+			if(initialInstances <= 0)
+			{
+				throw new ArgumentException("Cannot pool a negative number of instances.", "initialInstances");
+			}
+			for (int i = 0; i < initialInstances; ++i)
+			{
+				free.Add(factory.MakeObject());
+			}
+		}
+
+		/// <summary>
+		/// Close the pool and free any resources associated with it.
+		/// </summary>
+		public void Close()
+		{
+			lock (this)
+			{
+				for (IEnumerator e = busy.GetEnumerator();
+				     e.MoveNext();
+				     e = busy.GetEnumerator())
+				{
+					ReturnObject(e.Current);
+				}
+				foreach (object o in free)
+				{
+					factory.DestroyObject(o);
+				}
+				MakeNotUsable();
+			}
+		}
+
+		/// <summary>
+		/// Clear objects sitting idle in the pool, releasing any
+		/// associated resources.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This implementation <b>always</b> throws a
+		/// <see cref="System.NotSupportedException"/>.
+		/// </p>
+		/// </remarks>
+		/// <exception cref="NotSupportedException">
+		/// If the implementation does not support the operation.
+		/// </exception>
+		public void Clear()
+		{
+			throw new NotSupportedException();
+		}
+
+		/// <summary>
+		/// Change the state of the pool to unusable.
+		/// </summary>
+		private void MakeNotUsable()
+		{
+			free = busy = new ArrayList();
+			closed = true;
+		}
+
+		/// <summary>
+		/// Gets the number of instances currently borrowed from the pool.
+		/// </summary>
+		/// <exception cref="NotSupportedException">
+		/// If the implementation does not support the operation.
+		/// </exception>
+		/// <seealso cref="Spring.Pool.IObjectPool.NumActive"/>
+		public int NumActive
+		{
+			get { return this.busy.Count; }
+		}
+
+		/// <summary>
+		/// Gets the number of instances currently idle in the pool.
+		/// </summary>
+		/// <exception cref="NotSupportedException">
+		/// If the implementation does not support the operation.
+		/// </exception>
+		/// <seealso cref="Spring.Pool.IObjectPool.NumIdle"/>
+		public int NumIdle
+		{
+			get { return this.free.Count; }
+		}
+
+		/// <summary>
+		/// Set the factory used to create new instances.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This implementation <b>always</b> throws a
+		/// <see cref="System.NotSupportedException"/>.
+		/// </p>
+		/// </remarks>
+		/// <exception cref="NotSupportedException">
+		/// If the implementation does not support the operation.
+		/// </exception>
+		public IPoolableObjectFactory PoolableObjectFactory
+		{
+			set { throw new NotSupportedException(); }
+		}
+	}
+}
diff --git a/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs b/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs
new file mode 100644
index 00000000..288ea069
--- /dev/null
+++ b/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs
@@ -0,0 +1,349 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Proxy
+{
+    /// <summary>
+    /// Base class for method builders that contains common functionalities.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: AbstractProxyMethodBuilder.cs,v 1.7 2008/02/06 18:26:42 bbaia Exp $</version>
+    public abstract class AbstractProxyMethodBuilder : IProxyMethodBuilder
+    {
+        #region Fields
+
+        /// <summary>
+        /// The type builder to use.
+        /// </summary>
+        protected TypeBuilder typeBuilder;
+
+        /// <summary>
+        /// The <see cref="IProxyTypeGenerator"/> implementation to use.
+        /// </summary>
+        protected IProxyTypeGenerator proxyGenerator;
+
+        /// <summary>
+        /// Indicates whether interfaces should be implemented explicitly.
+        /// </summary>
+        protected bool explicitImplementation;
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the method builder.
+        /// </summary>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        /// <param name="proxyGenerator">
+        /// The <see cref="IProxyTypeGenerator"/> implementation to use.
+        /// </param>
+        /// <param name="explicitImplementation">
+        /// <see langword="true"/> if the interface is to be
+        /// implemented explicitly; otherwise <see langword="false"/>.
+        /// </param>
+        public AbstractProxyMethodBuilder(TypeBuilder typeBuilder, 
+            IProxyTypeGenerator proxyGenerator, bool explicitImplementation)
+        {
+            this.typeBuilder = typeBuilder;
+            this.proxyGenerator = proxyGenerator;
+            this.explicitImplementation = explicitImplementation;
+        }
+
+        #endregion
+
+        #region IProxyMethodBuilder Members
+
+        /// <summary>
+        /// Dynamically builds proxy method.
+        /// </summary>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="interfaceMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        /// <returns>
+        /// The <see cref="System.Reflection.Emit.MethodBuilder"/> for the proxy method.
+        /// </returns>
+        public virtual MethodBuilder BuildProxyMethod(MethodInfo method, MethodInfo interfaceMethod)
+        {
+            MethodBuilder methodBuilder = 
+                DefineMethod(method, interfaceMethod, explicitImplementation);
+
+            ILGenerator il = methodBuilder.GetILGenerator();
+
+            GenerateMethod(il, method, interfaceMethod);
+
+            il.Emit(OpCodes.Ret);
+
+			if (interfaceMethod != null)
+			{
+				typeBuilder.DefineMethodOverride(methodBuilder, interfaceMethod);
+			}
+
+            return methodBuilder;
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the proxy instance on stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        protected virtual void PushProxy(ILGenerator il)
+        {
+            proxyGenerator.PushProxy(il);
+        }
+
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the target instance on which calls should be delegated to.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        protected virtual void PushTarget(ILGenerator il)
+        {
+            proxyGenerator.PushTarget(il);
+        }
+
+        /// <summary>
+        /// Defines proxy method for the target object.
+        /// </summary>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="intfMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        /// <param name="explicitImplementation">
+        /// <see langword="true"/> if the supplied <paramref name="intfMethod"/> is to be
+        /// implemented explicitly; otherwise <see langword="false"/>.
+        /// </param>
+        /// <returns>
+        /// The <see cref="System.Reflection.Emit.MethodBuilder"/> for the proxy method.
+        /// </returns>
+        protected virtual MethodBuilder DefineMethod(
+            MethodInfo method, MethodInfo intfMethod, bool explicitImplementation)
+        {
+            MethodBuilder methodBuilder;
+            string name;
+            MethodAttributes attributes;
+
+            if (intfMethod == null)
+            {
+                name = method.Name;
+                attributes = MethodAttributes.Public | MethodAttributes.ReuseSlot
+                    | MethodAttributes.HideBySig | MethodAttributes.Virtual;
+            }
+            else
+            {
+                attributes = MethodAttributes.HideBySig
+                    | MethodAttributes.NewSlot | MethodAttributes.Virtual
+                    | MethodAttributes.Final;
+
+                if (explicitImplementation || method.Name.IndexOf('.') != -1)
+                {
+                    name = String.Format("{0}.{1}", 
+                        intfMethod.DeclaringType.FullName, intfMethod.Name);
+                    attributes |= MethodAttributes.Private;
+                }
+                else
+                {
+                    name = intfMethod.Name;
+                    attributes |= MethodAttributes.Public;
+                }
+            }
+
+            if ((intfMethod != null && intfMethod.IsSpecialName) || method.IsSpecialName)
+            {
+                attributes |= MethodAttributes.SpecialName;
+            }
+
+            methodBuilder = typeBuilder.DefineMethod(name, attributes,
+                method.CallingConvention, method.ReturnType,
+                ReflectionUtils.GetParameterTypes(method.GetParameters()));
+
+#if NET_2_0
+            DefineGenericParameters(methodBuilder, method);
+#endif
+            DefineParameters(methodBuilder, method);
+
+            return methodBuilder;
+        }
+
+        /// <summary>
+        /// Defines method parameters based on proxied method metadata.
+        /// </summary>
+        /// <param name="methodBuilder">
+        /// The <see cref="System.Reflection.Emit.MethodBuilder"/> to use.
+        /// </param>
+        /// <param name="method">The method to proxy.</param>
+        protected void DefineParameters(MethodBuilder methodBuilder, MethodInfo method)
+        {
+            int n = 1;
+            foreach (ParameterInfo param in method.GetParameters())
+            {
+                ParameterBuilder pb = methodBuilder.DefineParameter(n, param.Attributes, param.Name);
+                n++;
+            }
+        }
+
+#if NET_2_0
+        /// <summary>
+        /// Defines generic method parameters based on proxied method metadata.
+        /// </summary>
+        /// <param name="methodBuilder">
+        /// The <see cref="System.Reflection.Emit.MethodBuilder"/> to use.
+        /// </param>
+        /// <param name="method">The method to proxy.</param>
+        protected void DefineGenericParameters(MethodBuilder methodBuilder, MethodInfo method)
+        {
+            if (method.IsGenericMethodDefinition)
+            {
+                Type[] genericArguments = method.GetGenericArguments();
+
+                // define generic parameters
+                GenericTypeParameterBuilder[] gtpBuilders =
+                    methodBuilder.DefineGenericParameters(ReflectionUtils.GetGenericParameterNames(genericArguments));
+
+                // define constraints for each generic parameter
+                for (int i = 0; i < genericArguments.Length; i++)
+                {
+                    gtpBuilders[i].SetGenericParameterAttributes(genericArguments[i].GenericParameterAttributes);
+
+                    Type[] constraints = genericArguments[i].GetGenericParameterConstraints();
+                    System.Collections.Generic.List<Type> interfaces = new System.Collections.Generic.List<Type>(constraints.Length);
+                    foreach (Type constraint in constraints)
+                    {
+                        if (constraint.IsClass)
+                            gtpBuilders[i].SetBaseTypeConstraint(constraint);
+                        else
+                            interfaces.Add(constraint);
+                    }
+                    gtpBuilders[i].SetInterfaceConstraints(interfaces.ToArray());
+                }
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Generates the proxy method.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="interfaceMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        protected abstract void GenerateMethod(
+            ILGenerator il, MethodInfo method, MethodInfo interfaceMethod);
+
+        /// <summary>
+        /// Calls target method directly.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="interfaceMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        protected virtual void CallDirectTargetMethod(
+            ILGenerator il, MethodInfo interfaceMethod)
+        {
+            // setup target object for call
+            PushTarget(il);
+
+            // cast to type method is on
+            il.Emit(OpCodes.Castclass, interfaceMethod.DeclaringType);
+
+            // setup parameters for call
+            ParameterInfo[] paramArray = interfaceMethod.GetParameters();
+            for (int i = 0; i < paramArray.Length; i++)
+            {
+                il.Emit(OpCodes.Ldarg_S, i + 1);
+            }
+
+            // call method
+            il.EmitCall(OpCodes.Callvirt, interfaceMethod, null);
+        }
+
+        /// <summary>
+        /// Calls base method directly.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        protected virtual void CallDirectBaseMethod(ILGenerator il, MethodInfo method)
+        {
+            // setup proxy instance for call
+            PushProxy(il);
+
+            // setup parameters for call
+            ParameterInfo[] paramArray = method.GetParameters();
+            for (int i = 0; i < paramArray.Length; i++)
+            {
+                il.Emit(OpCodes.Ldarg_S, i + 1);
+            }
+
+            // call method
+            il.EmitCall(OpCodes.Call, method, null);
+        }
+
+        /// <summary>
+        /// Replaces a raw reference with a reference to a proxy.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the target object returns reference to itself -- 'this' --
+        /// we need to treat it as a special case and return a reference
+        /// to a proxy object instead.
+        /// </p>
+        /// </remarks>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="returnValue">The location of the return value.</param>
+        protected virtual void ProcessReturnValue(ILGenerator il, LocalBuilder returnValue)
+        {
+            Label jmpMethodReturn = il.DefineLabel();
+
+            // check if target method returned 'this', reference to target
+            PushTarget(il);
+            il.Emit(OpCodes.Ldloc, returnValue);
+            il.Emit(OpCodes.Bne_Un_S, jmpMethodReturn);
+
+            // check if proxy can be casted to the return type
+            PushProxy(il);
+            il.Emit(OpCodes.Isinst, returnValue.LocalType);
+            il.Emit(OpCodes.Brfalse_S, jmpMethodReturn);
+
+            // if it did, return reference to this proxy instead
+            PushProxy(il);
+            il.Emit(OpCodes.Stloc, returnValue);
+
+            il.MarkLabel(jmpMethodReturn);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs
new file mode 100644
index 00000000..469cf539
--- /dev/null
+++ b/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs
@@ -0,0 +1,996 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.Serialization;
+
+using Common.Logging;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Proxy
+{
+	/// <summary>
+	/// Base class for proxy builders that can be used 
+    /// to create a proxy for any class.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This <see langword="abstract"/> class provides a set of template
+	/// methods that derived classes can override to provide custom behaviour
+	/// appropriate to the type of proxy that is being generated (one of
+	/// inheritance or composition-based proxying).
+	/// </p>
+	/// </remarks>
+	/// <author>Aleksandar Seovic</author>
+    /// <author>Bruno Baia</author>
+	/// <version>$Id: AbstractProxyTypeBuilder.cs,v 1.33 2007/12/07 17:59:20 bbaia Exp $</version>
+	public abstract class AbstractProxyTypeBuilder : IProxyTypeBuilder, IProxyTypeGenerator
+	{
+        #region Fields
+
+        /// <summary>
+        /// The shared <see cref="Common.Logging.ILog"/> instance for this class (and derived classes).
+        /// </summary>
+        protected static readonly ILog log = LogManager.GetLogger(typeof(AbstractProxyTypeBuilder));
+
+        private const string DEFAULT_PROXY_TYPE_NAME = "Proxy";
+        
+        private string _name;
+		private Type _targetType;
+		private Type _baseType = typeof (object);
+        private Type[] _interfaces;
+        private bool _proxyTargetAttributes = true;
+		private IList _typeAttributes = new ArrayList();
+		private IDictionary _memberAttributes = new Hashtable();
+
+        #endregion
+
+        #region IProxyTypeBuilder Members
+
+        /// <summary>
+        /// Creates the proxy type.
+        /// </summary>
+        /// <returns>The generated proxy class.</returns>
+        public abstract Type BuildProxyType();
+
+        /// <summary>
+        /// The name of the proxy <see cref="System.Type"/>.
+        /// </summary>
+        /// <value>The name of the proxy <see cref="System.Type"/>.</value>
+        public string Name
+        {
+            get 
+            {
+                if (StringUtils.IsNullOrEmpty(_name))
+                {
+                    _name = DEFAULT_PROXY_TYPE_NAME;
+                }
+                return _name; 
+            }
+            set { _name = value; }
+        }
+
+        /// <summary>
+        /// The <see cref="System.Type"/> of the target object.
+        /// </summary>
+        public Type TargetType
+        {
+            get { return _targetType; }
+            set { _targetType = value; }
+        }
+
+        /// <summary>
+        /// The <see cref="System.Type"/> of the class that the proxy must
+        /// inherit from.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The default value of this property is the
+        /// <see cref="System.Object"/> <see cref="System.Type"/>.
+        /// </p>
+        /// </remarks>
+        public Type BaseType
+        {
+            get { return _baseType; }
+            set { _baseType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the list of interfaces proxy should implement.
+        /// </summary>
+        /// <remarks>
+        /// The default value of this property is all the interfaces 
+        /// implemented or inherited by the target type.
+        /// </remarks>
+        public Type[] Interfaces
+        {
+            get
+            {
+                if (_interfaces == null)
+                {
+                    _interfaces = GetProxiableInterfaces(TargetType.GetInterfaces());
+                }
+                return _interfaces;
+            }
+            set { _interfaces = value; }
+        }
+
+        /// <summary>
+        /// Should we proxy target attributes?
+        /// </summary>
+        /// <see cref="IProxyTypeBuilder.ProxyTargetAttributes"/>
+        public bool ProxyTargetAttributes
+        {
+            get { return _proxyTargetAttributes; }
+            set { _proxyTargetAttributes = value; }
+        }
+
+        /// <summary>
+        /// The list of custom <see cref="System.Attribute"/>s that the proxy
+        /// class must be decorated with.
+        /// </summary>
+        /// <see cref="IProxyTypeBuilder.TypeAttributes"/>
+        public IList TypeAttributes
+        {
+            get { return _typeAttributes; }
+            set { _typeAttributes = value; }
+        }
+
+        /// <summary>
+        /// The custom <see cref="System.Attribute"/>s that the proxy
+        /// members must be decorated with.
+        /// </summary>
+        /// <see cref="IProxyTypeBuilder.MemberAttributes"/>
+        public IDictionary MemberAttributes
+        {
+            get { return _memberAttributes; }
+            set { _memberAttributes = value; }
+        }
+
+        #endregion
+
+        #region IProxyTypeGenerator Members
+
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the proxy instance on stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        public virtual void PushProxy(ILGenerator il)
+        {
+            il.Emit(OpCodes.Ldarg_0);
+        }
+
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the target instance on which calls should be delegated to.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        public abstract void PushTarget(ILGenerator il);
+
+        #endregion
+
+        #region Protected Methods
+
+        #region Type generation
+
+        /// <summary>
+        /// Creates an appropriate type builder.
+        /// </summary>
+        /// <param name="name">The name to use for the proxy type name.</param>
+        /// <param name="baseType">The type to extends if provided.</param>
+        /// <returns>The type builder to use.</returns>
+        protected virtual TypeBuilder CreateTypeBuilder(string name, Type baseType)
+        {
+            // Generates unique type name
+            string typeName = String.Format("{0}_{1}", 
+                name, Guid.NewGuid().ToString("N"));
+
+            return DynamicProxyManager.CreateTypeBuilder(typeName, baseType);
+        }
+
+        #endregion
+
+        #region Attributes generation
+
+        /// <summary>
+		/// Applies attributes to the proxy class.
+		/// </summary>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        /// <param name="targetType">The proxied class.</param>
+        /// <see cref="IProxyTypeBuilder.ProxyTargetAttributes"/>
+        /// <see cref="IProxyTypeBuilder.TypeAttributes"/>
+		protected virtual void ApplyTypeAttributes(TypeBuilder typeBuilder, Type targetType)
+		{
+            foreach (object attr in GetTypeAttributes(targetType))
+			{
+				if (attr is CustomAttributeBuilder)
+				{
+                    typeBuilder.SetCustomAttribute((CustomAttributeBuilder)attr);
+				}
+#if NET_2_0
+                else if (attr is CustomAttributeData)
+                {
+                    typeBuilder.SetCustomAttribute(
+                        ReflectionUtils.CreateCustomAttribute((CustomAttributeData)attr));
+                }
+#endif
+				else if (attr is Attribute)
+				{
+                    typeBuilder.SetCustomAttribute(
+                        ReflectionUtils.CreateCustomAttribute((Attribute)attr));
+				}
+			}
+		}
+
+		/// <summary>
+		/// Applies attributes to the proxied method.
+		/// </summary>
+        /// <param name="methodBuilder">The method builder to use.</param>
+        /// <param name="targetMethod">The proxied method.</param>
+        /// <see cref="IProxyTypeBuilder.ProxyTargetAttributes"/>
+        /// <see cref="IProxyTypeBuilder.MemberAttributes"/>
+        protected virtual void ApplyMethodAttributes(MethodBuilder methodBuilder, MethodInfo targetMethod)
+		{
+            foreach (object attr in GetMethodAttributes(targetMethod))
+            {
+                if (attr is CustomAttributeBuilder)
+                {
+                    methodBuilder.SetCustomAttribute((CustomAttributeBuilder)attr);
+                }
+#if NET_2_0
+                else if (attr is CustomAttributeData)
+                {
+                    methodBuilder.SetCustomAttribute(
+                        ReflectionUtils.CreateCustomAttribute((CustomAttributeData)attr));
+                }
+#endif
+                else if (attr is Attribute)
+                {
+                    methodBuilder.SetCustomAttribute(
+                        ReflectionUtils.CreateCustomAttribute((Attribute)attr));
+                }
+            }
+
+#if NET_2_0
+            ApplyMethodReturnTypeAttributes(methodBuilder, targetMethod);
+#endif
+            ApplyMethodParameterAttributes(methodBuilder, targetMethod);
+        }
+
+#if NET_2_0
+        /// <summary>
+        /// Applies attributes to the proxied method's return type.
+        /// </summary>
+        /// <param name="methodBuilder">The method builder to use.</param>
+        /// <param name="targetMethod">The proxied method.</param>
+        /// <see cref="IProxyTypeBuilder.ProxyTargetAttributes"/>
+        protected virtual void ApplyMethodReturnTypeAttributes(MethodBuilder methodBuilder, MethodInfo targetMethod)
+        {
+            foreach (object attr in GetMethodReturnTypeAttributes(targetMethod))
+            {
+                ParameterBuilder parameterBuilder = methodBuilder.DefineParameter(0, ParameterAttributes.Retval, null);
+                if (attr is CustomAttributeBuilder)
+                {
+                    parameterBuilder.SetCustomAttribute((CustomAttributeBuilder)attr);
+                }
+                else if (attr is CustomAttributeData)
+                {
+                    parameterBuilder.SetCustomAttribute(
+                        ReflectionUtils.CreateCustomAttribute((CustomAttributeData)attr));
+                }
+                else if (attr is Attribute)
+                {
+                    parameterBuilder.SetCustomAttribute(
+                        ReflectionUtils.CreateCustomAttribute((Attribute)attr));
+                }
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Applies attributes to proxied method's parameters.
+        /// </summary>
+        /// <param name="methodBuilder">The method builder to use.</param>
+        /// <param name="targetMethod">The proxied method.</param>
+        /// <see cref="IProxyTypeBuilder.ProxyTargetAttributes"/>
+        protected virtual void ApplyMethodParameterAttributes(MethodBuilder methodBuilder, MethodInfo targetMethod)
+        {
+            foreach (ParameterInfo paramInfo in targetMethod.GetParameters())
+            {
+                foreach (object attr in GetMethodParameterAttributes(targetMethod, paramInfo))
+                {
+                    ParameterBuilder parameterBuilder = methodBuilder.DefineParameter(
+                        (paramInfo.Position + 1), paramInfo.Attributes, paramInfo.Name);
+                    if (attr is CustomAttributeBuilder)
+                    {
+                        parameterBuilder.SetCustomAttribute((CustomAttributeBuilder)attr);
+                    }
+#if NET_2_0
+                    else if (attr is CustomAttributeData)
+                    {
+                        parameterBuilder.SetCustomAttribute(
+                            ReflectionUtils.CreateCustomAttribute((CustomAttributeData)attr));
+                    }
+#endif
+                    else if (attr is Attribute)
+                    {
+                        parameterBuilder.SetCustomAttribute(
+                            ReflectionUtils.CreateCustomAttribute((Attribute)attr));
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Calculates and returns the list of attributes that apply to the
+        /// specified type.
+        /// </summary>
+        /// <param name="type">The type to find attributes for.</param>
+        /// <returns>
+        /// A list of custom attributes that should be applied to type.
+        /// </returns>
+        /// <see cref="IProxyTypeBuilder.ProxyTargetAttributes"/>
+        /// <see cref="IProxyTypeBuilder.TypeAttributes"/>
+        protected virtual IList GetTypeAttributes(Type type)
+        {
+            ArrayList attributes = new ArrayList();
+
+            if (this.ProxyTargetAttributes)
+            {
+                // add attributes that apply to the target type
+#if NET_2_0
+                object[] attrs = type.GetCustomAttributes(false);
+                try
+                {
+                    System.Collections.Generic.IList<CustomAttributeData> attrsData  = 
+                        CustomAttributeData.GetCustomAttributes(type);
+                    
+                    if (attrs.Length != attrsData.Count)
+                    {
+                        // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=94803
+                        attributes.AddRange(attrs);
+                    }
+                    else
+                    {
+                        foreach (CustomAttributeData cad in attrsData)
+                        {
+                            attributes.Add(cad);
+                        }
+                    }
+                }
+                catch (ArgumentException)
+                {
+                    // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=296032
+                    attributes.AddRange(attrs);
+                }
+                catch (CustomAttributeFormatException)
+                {
+                    // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=161522
+                    attributes.AddRange(attrs);
+                }
+#else
+                attributes.AddRange(type.GetCustomAttributes(false));
+#endif
+            }
+
+            // add attributes defined by configuration
+            attributes.AddRange(TypeAttributes);
+
+            return attributes;
+        }
+
+        /// <summary>
+        /// Calculates and returns the list of attributes that apply to the
+        /// specified method.
+        /// </summary>
+        /// <param name="method">The method to find attributes for.</param>
+        /// <returns>
+        /// A list of custom attributes that should be applied to method.
+        /// </returns>
+        /// <see cref="IProxyTypeBuilder.ProxyTargetAttributes"/>
+        /// <see cref="IProxyTypeBuilder.MemberAttributes"/>
+        protected virtual IList GetMethodAttributes(MethodInfo method)
+        {
+            ArrayList attributes = new ArrayList();
+
+            if (this.ProxyTargetAttributes)
+            {
+                // add attributes that apply to the target method
+#if NET_2_0
+                object[] attrs = method.GetCustomAttributes(false);
+                try
+                {
+                    System.Collections.Generic.IList<CustomAttributeData> attrsData = 
+                        CustomAttributeData.GetCustomAttributes(method);
+                    
+                    if (attrs.Length != attrsData.Count)
+                    {
+                        // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=94803
+                        attributes.AddRange(attrs);
+                    }
+                    else
+                    {
+                        foreach (CustomAttributeData cad in attrsData)
+                        {
+                            attributes.Add(cad);
+                        }
+                    }
+                }
+                catch (ArgumentException)
+                {
+                    // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=296032
+                    attributes.AddRange(attrs);
+                }
+#else
+                attributes.AddRange(method.GetCustomAttributes(false));
+#endif
+            }
+
+            // add attributes defined by configuration
+            foreach (DictionaryEntry entry in MemberAttributes)
+            {
+                if (TypeResolutionUtils.MethodMatch((string)entry.Key, method))
+                {
+                    if (entry.Value is Attribute)
+                    {
+                        attributes.Add(entry.Value);
+                    }
+                    else if (entry.Value is IList)
+                    {
+                        attributes.AddRange(entry.Value as IList);
+                    }
+                }
+            }
+
+            return attributes;
+        }
+
+#if NET_2_0
+        /// <summary>
+        /// Calculates and returns the list of attributes that apply to the
+        /// specified method's return type.
+        /// </summary>
+        /// <param name="method">The method to find attributes for.</param>
+        /// <returns>
+        /// A list of custom attributes that should be applied to method's return type.
+        /// </returns>
+        /// <see cref="IProxyTypeBuilder.ProxyTargetAttributes"/>
+        protected virtual IList GetMethodReturnTypeAttributes(MethodInfo method)
+        {
+            ArrayList attributes = new ArrayList();
+
+            if (this.ProxyTargetAttributes)
+            {
+                // add attributes that apply to the target method' return type
+                object[] attrs = method.ReturnTypeCustomAttributes.GetCustomAttributes(false);
+                try
+                {
+                    System.Collections.Generic.IList<CustomAttributeData> attrsData = 
+                        CustomAttributeData.GetCustomAttributes(method.ReturnParameter);
+                    
+                    if (attrs.Length != attrsData.Count)
+                    {
+                        // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=94803
+                        attributes.AddRange(attrs);
+                    }
+                    else
+                    {
+                        foreach (CustomAttributeData cad in attrsData)
+                        {
+                            attributes.Add(cad);
+                        }
+                    }
+                }
+                catch (ArgumentException)
+                {
+                    // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=296032
+                    attributes.AddRange(attrs);
+                }
+            }
+
+            // TODO: add attributes defined by configuration
+
+            return attributes;
+        }
+#endif
+
+        /// <summary>
+        /// Calculates and returns the list of attributes that apply to the
+        /// specified method's parameters.
+        /// </summary>
+        /// <param name="method">The method to find attributes for.</param>
+        /// <param name="paramInfo">The method's parameter to find attributes for.</param>
+        /// <returns>
+        /// A list of custom attributes that should be applied to the specified method's parameter.
+        /// </returns>
+        /// <see cref="IProxyTypeBuilder.ProxyTargetAttributes"/>
+        protected virtual IList GetMethodParameterAttributes(MethodInfo method, ParameterInfo paramInfo)
+        {
+            ArrayList attributes = new ArrayList();
+
+            if (this.ProxyTargetAttributes)
+            {
+                // add attributes that apply to the target method's parameter
+#if NET_2_0
+                object[] attrs = paramInfo.GetCustomAttributes(false);
+                try
+                {
+                    System.Collections.Generic.IList<CustomAttributeData> attrsData =
+                        CustomAttributeData.GetCustomAttributes(paramInfo);
+                    
+                    if (attrs.Length != attrsData.Count)
+                    {
+                        // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=94803
+                        attributes.AddRange(attrs);
+                    }
+                    else
+                    {
+                        foreach (CustomAttributeData cad in attrsData)
+                        {
+                            attributes.Add(cad);
+                        }
+                    }
+                }
+                catch (ArgumentException)
+                {
+                    // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=296032
+                    attributes.AddRange(attrs);
+                }
+#else
+                attributes.AddRange(paramInfo.GetCustomAttributes(false));
+#endif
+            }
+
+            // TODO: add attributes defined by configuration
+
+            return attributes;
+        }
+
+        /// <summary>
+        /// Check that the specified object is matching the passed attribute type.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The specified object can be of different type :
+        /// </p>
+        /// <list type="bullet">
+        /// <item>
+        /// <see cref="System.Attribute"/>
+        /// </item>
+        /// <item>
+        /// System.Reflection.CustomAttributeData (Only with .NET 2.0)
+        /// </item>
+        /// <item>
+        /// <see cref="System.Reflection.Emit.CustomAttributeBuilder"/>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// <param name="attr">The object instance to check.</param>
+        /// <param name="attrType">The attribute type to test against.</param>
+        /// <returns>
+        /// <see langword="true"/> if the object instance matches the attribute type;
+        /// otherwise <see langword="false"/>.
+        /// </returns>
+        protected virtual bool IsAttributeMatchingType(object attr, Type attrType)
+        {
+            if (attr is Attribute)
+            {
+                return (attrType == attr.GetType());
+            }
+#if NET_2_0
+            else if (attr is CustomAttributeData)
+            {
+                return (attrType == ((CustomAttributeData)attr).Constructor.DeclaringType);
+            }
+#endif
+            else if (attr is CustomAttributeBuilder)
+            {
+                return (attrType == ((ConstructorInfo)CustomAttributeConstructorField.GetValue(attr)).DeclaringType);
+            }
+            return false;
+        }
+
+        private static readonly FieldInfo CustomAttributeConstructorField = 
+            typeof(CustomAttributeBuilder).GetField("m_con", BindingFlags.Instance | BindingFlags.NonPublic);
+
+        #endregion
+
+        #region Constructors generation
+
+        /// <summary>
+        /// Defines the types of the parameters for the specified constructor.
+        /// </summary>
+        /// <param name="constructor">The constructor to use.</param>
+        /// <returns>The types for constructor's parameters.</returns>
+        protected virtual Type[] DefineConstructorParameters(ConstructorInfo constructor)
+        {
+            return ReflectionUtils.GetParameterTypes(constructor.GetParameters());
+        }
+
+        /// <summary>
+        /// Implements constructors for the proxy class.
+        /// </summary>
+        /// <param name="typeBuilder">
+        /// The <see cref="System.Type"/> builder to use.
+        /// </param>
+        protected virtual void ImplementConstructors(TypeBuilder typeBuilder)
+        {
+            ConstructorInfo[] constructors = TargetType.GetConstructors(
+                BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+
+            foreach (ConstructorInfo constructor in constructors)
+            {
+                if (constructor.IsPublic || constructor.IsFamily)
+                {
+                    ConstructorBuilder cb = typeBuilder.DefineConstructor(
+                        constructor.Attributes,
+                        constructor.CallingConvention, 
+                        DefineConstructorParameters(constructor));
+
+                    ILGenerator il = cb.GetILGenerator();
+                    GenerateConstructor(cb, il, constructor);
+                    il.Emit(OpCodes.Ret);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Generates the proxy constructor.
+        /// </summary>
+        /// <param name="builder">The constructor builder to use.</param>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="constructor">The constructor to use.</param>
+        protected virtual void GenerateConstructor(
+            ConstructorBuilder builder, ILGenerator il, ConstructorInfo constructor)
+        {
+        }
+
+        #endregion
+
+        #region Members generation
+
+        /// <summary>
+        /// Implements an interface.
+		/// </summary>
+        /// <remarks>
+        /// Generates proxy methods that belongs to the interface 
+        /// using the specified <paramref name="proxyMethodBuilder"/>.
+        /// </remarks>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        /// <param name="proxyMethodBuilder">
+        /// The <see cref="IProxyMethodBuilder"/> implementation to use
+        /// </param>
+        /// <param name="intf">The interface to implement.</param>
+        /// <param name="targetType">
+        /// The <see cref="System.Type"/> of the target object.
+        /// </param>
+        protected virtual void ImplementInterface(TypeBuilder typeBuilder, 
+            IProxyMethodBuilder proxyMethodBuilder, Type intf, Type targetType)
+        {
+            ImplementInterface(typeBuilder, proxyMethodBuilder, intf, targetType, true);
+        }
+
+        /// <summary>
+        /// Implements an interface.
+		/// </summary>
+        /// <remarks>
+        /// Generates proxy methods that belongs to the interface 
+        /// using the specified <paramref name="proxyMethodBuilder"/>.
+        /// </remarks>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        /// <param name="proxyMethodBuilder">
+        /// The <see cref="IProxyMethodBuilder"/> implementation to use
+        /// </param>
+        /// <param name="intf">The interface to implement.</param>
+        /// <param name="targetType">
+        /// The <see cref="System.Type"/> of the target object.
+        /// </param>
+        /// <param name="proxyVirtualMethods">
+        /// <see langword="false"/> if target virtual methods should not be proxied;
+        /// otherwise <see langword="true"/>.
+        /// </param>
+		protected virtual void ImplementInterface(TypeBuilder typeBuilder,
+            IProxyMethodBuilder proxyMethodBuilder, Type intf, 
+            Type targetType, bool proxyVirtualMethods)
+		{
+            IDictionary methodMap = new Hashtable();
+
+            InterfaceMapping mapping = GetInterfaceMapping(targetType, intf);
+
+            typeBuilder.AddInterfaceImplementation(intf);
+
+            for (int i = 0; i < mapping.InterfaceMethods.Length; i++)
+			{
+                if (!proxyVirtualMethods && 
+                    !mapping.TargetMethods[i].DeclaringType.IsInterface &&
+                    mapping.TargetMethods[i].IsVirtual &&
+                    !mapping.TargetMethods[i].IsFinal)
+                    continue;
+
+                MethodBuilder methodBuilder = proxyMethodBuilder.BuildProxyMethod(
+                    mapping.TargetMethods[i], mapping.InterfaceMethods[i]);
+
+                ApplyMethodAttributes(methodBuilder, mapping.TargetMethods[i]);
+
+                methodMap[mapping.InterfaceMethods[i].Name] = methodBuilder;
+			}
+			foreach (PropertyInfo property in intf.GetProperties())
+			{
+                ImplementProperty(typeBuilder, intf, property, methodMap);
+			}
+			foreach (EventInfo evt in intf.GetEvents())
+			{
+                ImplementEvent(typeBuilder, intf, evt, methodMap);
+			}
+		}
+
+        /// <summary>
+        /// Gets the mapping of the interface to proxy 
+        /// into the actual methods on the target type 
+        /// that does not need to implement that interface.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the target type does not implement the interface, 
+        /// we return the interfaces methods as the target methods for many reasons :
+        /// <ul>
+        /// <li>
+        /// The target object can change for an object that implements the interface.
+        /// (See 'Spring.Aop.Framework.DynamicProxy.IAdvisedProxyMethodBuilder' 
+        /// implementation in the Spring AOP framework for an example)
+        /// </li>
+        /// <li>
+        /// Allow Transparent proxies to be proxied.
+        /// (See Spring Remoting framework for an example)
+        /// </li>
+        /// <li>
+        /// Allow null target to be proxied.
+        /// (See Spring AOP framework which avoid calls to the target object 
+        /// by intercepting all methods. Think "dynamic mock")
+        /// (See 'Spring.Web.Services.WebServiceProxyFactory' implementation for another example)
+        /// </li>
+        /// </ul>
+        /// </p>
+        /// </remarks>
+        /// <param name="targetType">
+        /// The <see cref="System.Type"/> of the target object.
+        /// </param>
+        /// <param name="intf">The interface to implement.</param>
+        /// <returns>
+        /// An interface mapping for the interface to proxy.
+        /// </returns>
+        protected virtual InterfaceMapping GetInterfaceMapping(
+            Type targetType, Type intf)
+        {
+            InterfaceMapping mapping;
+
+            if (intf.IsAssignableFrom(targetType))
+            {
+                // target type implements the interface
+                mapping = targetType.GetInterfaceMap(intf);
+            }
+            else
+            {
+                // target type does not implement the interface
+                mapping.TargetType = targetType;
+                mapping.InterfaceType = intf;
+                mapping.InterfaceMethods = intf.GetMethods();
+                mapping.TargetMethods = mapping.InterfaceMethods;
+            }
+
+            return mapping;
+        }
+
+        /// <summary>
+		/// Inherit from a type.
+		/// </summary>
+        /// <remarks>
+        /// Generates proxy methods for base virtual methods 
+        /// using the specified <paramref name="proxyMethodBuilder"/>.
+        /// </remarks>
+        /// <param name="typeBuilder">
+		/// The <see cref="System.Type"/> builder to use for code generation.
+		/// </param>
+        /// <param name="proxyMethodBuilder">
+        /// The <see cref="IProxyMethodBuilder"/> implementation to use to override base virtual methods.
+        /// </param>
+        /// <param name="type">The <see cref="System.Type"/> to inherit from.</param>
+        protected virtual void InheritType(TypeBuilder typeBuilder, 
+            IProxyMethodBuilder proxyMethodBuilder, Type type)
+        {
+            InheritType(typeBuilder, proxyMethodBuilder, type, false);
+        }
+
+        /// <summary>
+		/// Inherit from a type.
+		/// </summary>
+        /// <remarks>
+        /// Generates proxy methods for base virtual methods 
+        /// using the specified <paramref name="proxyMethodBuilder"/>.
+        /// </remarks>
+        /// <param name="typeBuilder">
+		/// The <see cref="System.Type"/> builder to use for code generation.
+		/// </param>
+        /// <param name="proxyMethodBuilder">
+        /// The <see cref="IProxyMethodBuilder"/> implementation to use to override base virtual methods.
+        /// </param>
+        /// <param name="type">The <see cref="System.Type"/> to inherit from.</param>
+        /// <param name="declaredMembersOnly">
+        /// <see langword="true"/> if only members declared at the level 
+        /// of the supplied <paramref name="type"/>'s hierarchy should be proxied; 
+        /// otherwise <see langword="false"/>.
+        /// </param>
+        protected virtual void InheritType(TypeBuilder typeBuilder,
+            IProxyMethodBuilder proxyMethodBuilder, Type type, bool declaredMembersOnly)
+        {
+            IDictionary methodMap = new Hashtable();
+            IList finalMethods = new ArrayList();
+
+            BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.Instance;
+
+            if (declaredMembersOnly)
+            {
+                bindingFlags |= BindingFlags.DeclaredOnly;
+            }
+
+            // override virtual methods
+            MethodInfo[] methods = type.GetMethods(bindingFlags);
+            foreach (MethodInfo method in methods)
+            {
+                if (method.IsVirtual && !method.IsFinal)
+                {
+                    MethodBuilder methodBuilder = proxyMethodBuilder.BuildProxyMethod(method, null);
+                    ApplyMethodAttributes(methodBuilder, method);
+                    methodMap[method.Name] = methodBuilder;
+                }
+            }
+            // override virtual properties
+            foreach (PropertyInfo property in type.GetProperties(bindingFlags))
+            {
+                ImplementProperty(typeBuilder, type, property, methodMap);
+            }
+            // override virtual events
+            foreach (EventInfo evt in type.GetEvents(bindingFlags))
+            {
+                ImplementEvent(typeBuilder, type, evt, methodMap);
+            }
+        }
+
+		/// <summary>
+		/// Implements the specified <paramref name="property"/>.
+		/// </summary>
+		/// <param name="typeBuilder">The type builder to use.</param>
+		/// <param name="type">The type the property is defined on.</param>
+		/// <param name="property">The property to proxy.</param>
+		/// <param name="methodMap">The implemented methods map.</param>
+		protected virtual void ImplementProperty(
+			TypeBuilder typeBuilder, Type type, PropertyInfo property, IDictionary methodMap)
+		{
+            MethodBuilder getMethod = methodMap["get_" + property.Name] as MethodBuilder;
+            MethodBuilder setMethod = methodMap["set_" + property.Name] as MethodBuilder;
+
+            if (getMethod != null || setMethod != null)
+            {
+                string propertyName = (type.IsInterface && 
+                                      ((getMethod != null && getMethod.IsPrivate) || (setMethod != null && setMethod.IsPrivate)))
+                                        ? type.FullName + "." + property.Name
+                                        : property.Name;
+                PropertyBuilder pb = typeBuilder.DefineProperty(propertyName, PropertyAttributes.None,
+                                                property.PropertyType, Type.EmptyTypes);
+
+                // set get/set methods
+                if (property.CanRead && getMethod != null)
+                {
+                    pb.SetGetMethod(getMethod);
+                }
+                if (property.CanWrite && setMethod != null)
+                {
+                    pb.SetSetMethod(setMethod);
+                }
+            }
+		}
+
+		/// <summary>
+		/// Implements the specified event.
+		/// </summary>
+		/// <param name="typeBuilder">The type builder to use.</param>
+        /// <param name="type">The type the event is defined on.</param>
+		/// <param name="evt">The event to proxy.</param>
+		/// <param name="methodMap">The implemented methods map.</param>
+		protected virtual void ImplementEvent(
+            TypeBuilder typeBuilder, Type type, EventInfo evt, IDictionary methodMap)
+		{
+            MethodBuilder addOnMethod = methodMap["add_" + evt.Name] as MethodBuilder;
+            MethodBuilder removeOnMethod = methodMap["remove_" + evt.Name] as MethodBuilder;
+
+            if (addOnMethod != null && removeOnMethod != null)
+            {
+                string eventName = (addOnMethod.IsPrivate) 
+                    ? addOnMethod.DeclaringType.FullName + "." + evt.Name 
+                    : evt.Name;
+
+                EventBuilder eb = typeBuilder.DefineEvent(
+                    eventName, EventAttributes.None, evt.EventHandlerType);
+                
+                // set add/remove methods
+                eb.SetAddOnMethod(addOnMethod);
+                eb.SetRemoveOnMethod(removeOnMethod);
+            }		
+		}
+
+        #endregion
+
+        /// <summary>
+        /// Returns an array of <see cref="System.Type"/>s that represent 
+        /// the proxiable interfaces.
+        /// </summary>
+        /// <remarks>
+        /// An interface is proxiable if it's not marked with the 
+        /// <see cref="ProxyIgnoreAttribute"/>.
+        /// </remarks>
+        /// <param name="interfaces">
+        /// The array of interfaces from which 
+        /// we want to get the proxiable interfaces.
+        /// </param>
+        /// <returns>
+        /// An array containing the interface <see cref="System.Type"/>s.
+        /// </returns>
+        protected virtual Type[] GetProxiableInterfaces(Type[] interfaces)
+        {
+            ArrayList proxiableInterfaces = new ArrayList();
+
+            foreach(Type intf in interfaces)
+            {
+                if (!Attribute.IsDefined(intf, typeof(ProxyIgnoreAttribute), false) &&
+                    !IsSpecialInterface(intf) &&
+                    ReflectionUtils.IsTypeVisible(intf, DynamicProxyManager.ASSEMBLY_NAME))
+                {
+                    proxiableInterfaces.Add(intf);
+                }
+            }
+
+            return (Type[]) proxiableInterfaces.ToArray(typeof(Type));
+        }
+
+        /// <summary>
+        /// Checks if specified interface is of a special type 
+        /// that should never be proxied (i.e. ISerializable).
+        /// </summary>
+        /// <param name="intf">Interface type to check.</param>
+        /// <returns>
+        /// <c>true</c> if it is, <c>false</c> otherwise.
+        /// </returns>
+        private bool IsSpecialInterface(Type intf)
+	    {
+	        return intf == typeof(ISerializable);
+	    }
+
+	    #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Proxy/BaseProxyMethodBuilder.cs b/src/Spring/Spring.Core/Proxy/BaseProxyMethodBuilder.cs
new file mode 100644
index 00000000..75b5bc58
--- /dev/null
+++ b/src/Spring/Spring.Core/Proxy/BaseProxyMethodBuilder.cs
@@ -0,0 +1,79 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Proxy
+{
+    /// <summary>
+    /// Implementation of IProxyMethodBuilder that delegates method calls to the base class.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: BaseProxyMethodBuilder.cs,v 1.1 2006/08/10 18:45:55 bbaia Exp $</version>
+    public class BaseProxyMethodBuilder : AbstractProxyMethodBuilder
+    {
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the method builder.
+        /// </summary>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        /// <param name="proxyGenerator">
+        /// The <see cref="IProxyTypeGenerator"/> implementation to use.
+        /// </param>
+        /// <param name="explicitImplementation">
+        /// <see langword="true"/> if the interface is to be
+        /// implemented explicitly; otherwise <see langword="false"/>.
+        /// </param>
+        public BaseProxyMethodBuilder(TypeBuilder typeBuilder,
+            IProxyTypeGenerator proxyGenerator, bool explicitImplementation)
+            : base(typeBuilder, proxyGenerator, explicitImplementation)
+        {
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Generates the proxy method.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="interfaceMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        protected override void GenerateMethod(
+            ILGenerator il, MethodInfo method, MethodInfo interfaceMethod)
+        {
+            CallDirectBaseMethod(il, method);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Proxy/CompositionProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/CompositionProxyTypeBuilder.cs
new file mode 100644
index 00000000..0ff70f9e
--- /dev/null
+++ b/src/Spring/Spring.Core/Proxy/CompositionProxyTypeBuilder.cs
@@ -0,0 +1,192 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Proxy
+{
+	/// <summary>
+	/// Builds a proxy type using composition.
+	/// </summary>
+	/// <remarks>
+	/// <note>
+	/// In order for this builder to work, the target <b>must</b> implement
+	/// one or more interfaces.
+	/// </note>
+	/// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: CompositionProxyTypeBuilder.cs,v 1.12 2007/03/27 02:27:43 bbaia Exp $</version>
+    public class CompositionProxyTypeBuilder : AbstractProxyTypeBuilder
+    {
+        #region Fields
+
+        private bool explicitInterfaceImplementation = false;
+
+        /// <summary>
+        /// Target instance calls should be delegated to.
+        /// </summary>
+        protected FieldBuilder targetInstance;
+
+        #endregion
+
+        #region Properties
+
+	    /// <summary>
+        /// Gets or sets a value indicating whether interfaces should be implemented explicitly.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if they should be; otherwise, <see langword="false"/>.
+        /// </value>
+	    public bool ExplicitInterfaceImplementation
+	    {
+	        get { return explicitInterfaceImplementation; }
+	        set { explicitInterfaceImplementation = value; }
+	    }
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="CompositionProxyTypeBuilder"/> class.
+        /// </summary>
+        public CompositionProxyTypeBuilder()
+        {
+            Name = "CompositionProxy";
+        }
+
+        #endregion
+
+        #region IProxyTypeBuilder Members
+        
+        /// <summary>
+		/// Creates a proxy that delegates calls to an instance of the
+		/// target object.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Only interfaces can be proxied using composition, so the target
+		/// <b>must</b> implement one or more interfaces.
+		/// </p>
+		/// </remarks>
+        /// <returns>The generated proxy class.</returns>
+		/// <exception cref="System.ArgumentException">
+		/// If the <see cref="IProxyTypeBuilder.TargetType"/>
+		/// does not implement any interfaces.
+		/// </exception>
+        public override Type BuildProxyType()
+        {
+            if (Interfaces == null || Interfaces.Length == 0)
+            {
+                throw new ArgumentException(
+					"Composition proxy target must implement at least one interface.");
+            }
+
+            TypeBuilder typeBuilder = CreateTypeBuilder(Name, BaseType);
+            
+            // apply custom attributes to the proxy type.
+            ApplyTypeAttributes(typeBuilder, TargetType);
+
+            // declare fields
+            DeclareTargetInstanceField(typeBuilder);
+
+            // create constructors
+            ImplementConstructors(typeBuilder);
+
+            // implement interfaces
+            foreach (Type intf in Interfaces)
+            {
+                ImplementInterface(typeBuilder,
+                    new TargetProxyMethodBuilder(typeBuilder, this, explicitInterfaceImplementation), 
+                    intf, TargetType);
+            }
+
+            return typeBuilder.CreateType();
+        }
+
+        #endregion
+
+        #region IProxyTypeGenerator Members
+
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the target instance on which calls should be delegated to.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        public override void PushTarget(ILGenerator il)
+        {
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldfld, targetInstance);
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Deaclares a field that holds the target object instance.
+        /// </summary>
+        /// <param name="builder">
+        /// The <see cref="System.Type"/> builder to use for code generation.
+        /// </param>
+        protected virtual void DeclareTargetInstanceField(TypeBuilder builder)
+        {
+            targetInstance = builder.DefineField("__proxyTarget", TargetType, FieldAttributes.Private);
+        }
+
+        /// <summary>
+        /// Generates the proxy constructor.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation creates instance of the target object for delegation
+        /// using constructor arguments.
+        /// </p>
+        /// </remarks>
+        /// <param name="builder">The constructor builder to use.</param>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="constructor">The constructor to delegate the creation to.</param>
+        protected override void GenerateConstructor(
+            ConstructorBuilder builder, ILGenerator il, ConstructorInfo constructor)
+        {
+            int paramCount = constructor.GetParameters().Length;
+            il.Emit(OpCodes.Ldarg_0);
+            for (int i = 1; i <= paramCount; i++)
+            {
+                il.Emit(OpCodes.Ldarg_S, i);
+            }
+            il.Emit(OpCodes.Newobj, TargetType.GetConstructor(
+                ReflectionUtils.GetParameterTypes(constructor.GetParameters())));
+            il.Emit(OpCodes.Stfld, targetInstance);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Proxy/DynamicProxyManager.cs b/src/Spring/Spring.Core/Proxy/DynamicProxyManager.cs
new file mode 100644
index 00000000..ede6f5dd
--- /dev/null
+++ b/src/Spring/Spring.Core/Proxy/DynamicProxyManager.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using System.Reflection.Emit;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Proxy
+{
+	/// <summary>
+    /// Allows easy access to existing and creation of new dynamic proxies.
+	/// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Bruno Baia</author>
+	/// <version>$Id: DynamicProxyManager.cs,v 1.6 2007/05/30 17:32:05 oakinger Exp $</version>
+    public sealed class DynamicProxyManager
+    {
+        #region Fields
+
+        /// <summary>
+        /// The name of the assembly that defines proxy types created.
+        /// </summary>
+        public const string ASSEMBLY_NAME = "Spring.Proxy";
+        
+        /// <summary>
+        /// The attributes of the proxy type to generate.
+        /// </summary>
+        private const TypeAttributes TYPE_ATTRIBUTES = TypeAttributes.BeforeFieldInit | TypeAttributes.Public;
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Creates an appropriate type builder.
+        /// </summary>
+        /// <param name="typeName">The proxy type name.</param>
+        /// <param name="baseType">The type to extends if provided.</param>
+        /// <returns>The type builder to use.</returns>
+        public static TypeBuilder CreateTypeBuilder(string typeName, Type baseType)
+        {
+            ModuleBuilder module = DynamicCodeManager.GetModuleBuilder(ASSEMBLY_NAME);
+            
+            if (baseType == null)
+            {
+                return module.DefineType(typeName, TYPE_ATTRIBUTES);
+            }
+            else
+            {
+                return module.DefineType(typeName, TYPE_ATTRIBUTES, baseType);
+            }
+        }
+
+        /// <summary>
+        /// Saves dynamically generated assembly to disk.
+        /// Can only be called in DEBUG_DYNAMIC mode, per ConditionalAttribute rules.
+        /// </summary>
+        [Conditional("DEBUG_DYNAMIC")]
+        public static void SaveAssembly()
+        {
+            DynamicCodeManager.SaveAssembly( ASSEMBLY_NAME );
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Proxy/IProxyMethodBuilder.cs b/src/Spring/Spring.Core/Proxy/IProxyMethodBuilder.cs
new file mode 100644
index 00000000..1619674f
--- /dev/null
+++ b/src/Spring/Spring.Core/Proxy/IProxyMethodBuilder.cs
@@ -0,0 +1,51 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+#endregion
+
+namespace Spring.Proxy
+{
+    /// <summary>
+    /// Defines interface that proxy method builders have to implement.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: IProxyMethodBuilder.cs,v 1.1 2006/08/10 18:45:55 bbaia Exp $</version>
+    public interface IProxyMethodBuilder
+    {
+        /// <summary>
+        /// Dynamically builds proxy method.
+        /// </summary>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="intfMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        /// <returns>
+        /// The <see cref="System.Reflection.Emit.MethodBuilder"/> for the proxy method.
+        /// </returns>
+        MethodBuilder BuildProxyMethod(MethodInfo method, MethodInfo intfMethod);
+    }
+}
diff --git a/src/Spring/Spring.Core/Proxy/IProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/IProxyTypeBuilder.cs
new file mode 100644
index 00000000..afc6b50a
--- /dev/null
+++ b/src/Spring/Spring.Core/Proxy/IProxyTypeBuilder.cs
@@ -0,0 +1,173 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Proxy
+{
+	/// <summary>
+	/// Describes the operations for a generic proxy type builder that can be
+	/// used to create a proxy type for any class.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: IProxyTypeBuilder.cs,v 1.8 2007/06/20 15:59:54 bbaia Exp $</version>
+	public interface IProxyTypeBuilder
+	{
+		/// <summary>
+        /// Creates the proxy type.
+        /// </summary>
+        /// <returns>The generated proxy class.</returns>
+        Type BuildProxyType();
+
+		/// <summary>
+		/// The name of the proxy <see cref="System.Type"/>.
+		/// </summary>
+		/// <value>The name of the proxy <see cref="IProxyTypeBuilder.TargetType"/>.</value>
+		string Name { get; set; }
+
+		/// <summary>
+		/// The <see cref="System.Type"/> of the target object.
+		/// </summary>
+		Type TargetType { get; set; }
+
+		/// <summary>
+		/// The <see cref="object"/> of the class that the proxy must
+		/// inherit from.
+		/// </summary>
+		Type BaseType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the list of interfaces proxy should implement.
+        /// </summary>
+        Type[] Interfaces { get; set; }
+
+        /// <summary>
+        /// Should we proxy target attributes?
+        /// </summary>
+        /// <remarks>
+        /// <see langword="True"/> by default.
+        /// Target type attributes, method attributes, method's return type attributes 
+        /// and method's parameter attributes are copied to the proxy.
+        /// </remarks>
+        bool ProxyTargetAttributes { get; set; }
+
+		/// <summary>
+		/// The list of custom <see cref="System.Attribute"/>s that the proxy
+		/// class must be decorated with.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Note that the list is composed of instances of the actual
+		/// <see cref="System.Attribute"/>s that are to be applied, not the
+		/// <see cref="Attribute"/>s of the <see cref="Type"/>s.
+		/// </p>
+		/// </remarks>
+		/// <example>
+		/// <p>
+		/// The following code snippets show examples of how to decorate the
+		/// the proxied class with one or more <see cref="System.Attribute"/>s.
+		/// </p>
+		/// <code language="C#">
+		/// // get a concrete implementation of an IProxyTypeBuilder...
+		/// IProxyTypeBuilder builder = ... ;
+		/// builder.TargetType = typeof( ... );
+		/// 
+		/// IDictionary typeAtts = new Hashtable();
+        /// builder.TypeAttributes = typeAtts;
+		/// 
+		/// // applies a single Attribute to the proxied class...
+		/// typeAtts = new Attribute[] { new MyCustomAttribute() });
+		/// 
+		/// // applies a number of Attributes to the proxied class...
+		/// typeAtts = new Attribute[]
+		///     {
+		///			new MyCustomAttribute(),
+		///			new AnotherAttribute(),
+		///     });
+		/// </code>
+		/// </example>
+        IList TypeAttributes { get; set; }
+
+		/// <summary>
+		/// The custom <see cref="System.Attribute"/>s that the proxy
+		/// members must be decorated with.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This dictionary must use simple <see cref="System.String"/>s for keys
+		/// (denoting the member names that the attributes are to be applied to),
+		/// with the corresponding values being
+		/// <see cref="System.Collections.IList"/>s.
+		/// </p>
+		/// <p>
+		/// The key may be wildcarded using the <c>'*'</c> character... if so,
+		/// then those proxy members that match against the key will be
+		/// decorated with the attendant list of
+		/// <see cref="System.Attribute"/>s. This naturally implies that using
+		/// the <c>'*'</c> character as a key will result in the attendant list
+		/// of <see cref="System.Attribute"/>s being applied to every member of
+		/// the proxied class.
+		/// </p>
+		/// </remarks>
+		/// <example>
+		/// <p>
+		/// The following code snippets show examples of how to decorate the
+		/// members of a proxied class with one or more
+		/// <see cref="System.Attribute"/>s.
+		/// </p>
+		/// <code language="C#">
+		/// // get a concrete implementation of an IProxyTypeBuilder...
+		/// IProxyTypeBuilder builder = ... ;
+		/// builder.TargetType = typeof( ... );
+		/// 
+		/// IDictionary memAtts = new Hashtable();
+		/// builder.MemberAttributes = memAtts;
+		/// 
+		/// // applies a single Attribute to all members of the proxied class...
+		/// memAtts ["*"] = new Attribute[] { new MyCustomAttribute() });
+		/// 
+		/// // applies a number of Attributes to all members of the proxied class...
+		/// memAtts ["*"] = new Attribute[]
+		///     {
+		///			new MyCustomAttribute(),
+		///			new AnotherAttribute(),
+		///     });
+		/// 
+		/// // applies a single Attribute to those members of the proxied class
+		/// //     that have identifiers starting with 'Do' ...
+		/// memAtts ["Do*"] = new Attribute[] { new MyCustomAttribute() });
+		/// 
+		/// // applies a number of Attributes to those members of the proxied class
+		/// //     that have identifiers starting with 'Do' ...
+		/// memAtts ["Do*"] = new Attribute[]
+		///     {
+		///			new MyCustomAttribute(),
+		///			new AnotherAttribute(),
+		///     }); 
+		/// </code>
+		/// </example>
+		IDictionary MemberAttributes { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Proxy/IProxyTypeGenerator.cs b/src/Spring/Spring.Core/Proxy/IProxyTypeGenerator.cs
new file mode 100644
index 00000000..995c4478
--- /dev/null
+++ b/src/Spring/Spring.Core/Proxy/IProxyTypeGenerator.cs
@@ -0,0 +1,59 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection.Emit;
+
+#endregion
+
+namespace Spring.Proxy
+{
+	/// <summary>
+    /// Describes the operations that generates IL instructions 
+    /// used to build the proxy type.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: IProxyTypeGenerator.cs,v 1.3 2006/11/12 01:37:47 bbaia Exp $</version>
+	public interface IProxyTypeGenerator
+	{
+        // TODO : Why not ?
+/*
+        /// <summary>
+        /// Gets the <see cref="TypeBuilder"/> used to build the proxy type.
+        /// </summary>
+        TypeBuilder ProxyTypeBuilder { get; }
+*/
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the proxy instance on stack.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        void PushProxy(ILGenerator il);
+
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the target instance on which calls should be delegated to.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        void PushTarget(ILGenerator il);        
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Proxy/InheritanceProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/InheritanceProxyTypeBuilder.cs
new file mode 100644
index 00000000..eb00f213
--- /dev/null
+++ b/src/Spring/Spring.Core/Proxy/InheritanceProxyTypeBuilder.cs
@@ -0,0 +1,175 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+
+#endregion
+
+namespace Spring.Proxy
+{
+	/// <summary>
+	/// Builds a proxy type using inheritance.
+	/// </summary>
+	/// <remarks>
+	/// <note>
+	/// In order for this builder to work, target methods have to be either
+	/// <see langword="virtual"/>, or belong to an interface.
+	/// </note>
+	/// </remarks>
+	/// <author>Aleksandar Seovic</author>
+    /// <author>Bruno Baia</author>
+	/// <version>$Id: InheritanceProxyTypeBuilder.cs,v 1.14 2007/12/04 18:38:02 bbaia Exp $</version>
+	public class InheritanceProxyTypeBuilder : AbstractProxyTypeBuilder
+	{
+        #region Fields
+
+        private bool declaredMembersOnly = false;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a value indicating whether inherited members should be proxied.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if they should be; otherwise, <see langword="false"/>.
+        /// </value>
+        public bool DeclaredMembersOnly
+        {
+            get { return declaredMembersOnly; }
+            set { declaredMembersOnly = value; }
+        }
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="InheritanceProxyTypeBuilder"/> class.
+        /// </summary>
+        public InheritanceProxyTypeBuilder()
+        {
+            Name = "InheritanceProxy";
+            //ProxyTargetAttributes = false;
+        }
+
+        #endregion
+
+        #region IProxyTypeBuilder Members
+
+        /// <summary>
+		/// Creates a proxy that inherits the proxied object's class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Only <see langword="virtual"/> (non-final) methods can be proxied,
+		/// unless they are members of one of the interfaces that target class
+		/// implements. In that case, methods will be proxied using explicit
+		/// interface implementation, which means that client code will have
+		/// to cast the proxy to a specific interface in order to invoke the
+		/// methods.
+		/// </p>
+		/// </remarks>
+		/// <returns>The generated proxy class.</returns>
+		public override Type BuildProxyType()
+		{
+			BaseType = TargetType;
+            if (BaseType.IsSealed)
+            {
+                throw new ArgumentException("Inheritance proxy cannot be created for a sealed class [" + BaseType.FullName + "]");
+            }
+
+            TypeBuilder typeBuilder = CreateTypeBuilder(Name, BaseType);
+
+            // apply custom attributes to the proxy type.
+            ApplyTypeAttributes(typeBuilder, BaseType);
+
+            // create constructors
+            ImplementConstructors(typeBuilder);
+
+            // proxy only final methods that are members of one of the interfaces
+            foreach (Type intf in Interfaces)
+            {
+                ImplementInterface(typeBuilder,
+                    new BaseProxyMethodBuilder(typeBuilder, this, true),
+                    intf, TargetType, false);
+            }
+
+            // proxy base virtual methods
+            InheritType(typeBuilder,
+                new BaseProxyMethodBuilder(typeBuilder, this, false),
+                BaseType, declaredMembersOnly);
+
+            return typeBuilder.CreateType();
+        }
+
+        #endregion
+
+        #region IProxyTypeGenerator Members
+
+        /// <summary>
+        /// Generates the IL instructions that pushes 
+        /// the target instance on which calls should be delegated to.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        public override void PushTarget(ILGenerator il)
+        {
+            PushProxy(il);
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Generates the proxy constructor.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation delegates the call to a base class constructor.
+        /// </p>
+        /// </remarks>
+        /// <param name="builder">The constructor builder to use.</param>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="constructor">
+        /// The base class constructor to delegate the call to.
+        /// </param>
+        protected override void GenerateConstructor(
+            ConstructorBuilder builder, ILGenerator il, ConstructorInfo constructor)
+        {
+            int paramCount = constructor.GetParameters().Length;
+            il.Emit(OpCodes.Ldarg_0);
+            for (int i = 1; i <= paramCount; i++)
+            {
+                il.Emit(OpCodes.Ldarg_S, i);
+            }
+            il.Emit(OpCodes.Call, constructor);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Proxy/ProxyIgnoreAttribute.cs b/src/Spring/Spring.Core/Proxy/ProxyIgnoreAttribute.cs
new file mode 100644
index 00000000..79c294c8
--- /dev/null
+++ b/src/Spring/Spring.Core/Proxy/ProxyIgnoreAttribute.cs
@@ -0,0 +1,46 @@
+#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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Proxy
+{
+    /// <summary>
+    /// This attribute can be used to mark interfaces that should not be proxied
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: ProxyIgnoreAttribute.cs,v 1.1 2006/11/16 02:30:50 bbaia Exp $</version>
+    [AttributeUsage(AttributeTargets.Interface, AllowMultiple = false, Inherited = false)]
+    [Serializable]
+    public sealed class ProxyIgnoreAttribute : Attribute
+    {
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Proxy.ProxyIgnoreAttribute"/> class.
+        /// </summary>
+        public ProxyIgnoreAttribute()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Proxy/TargetProxyMethodBuilder.cs b/src/Spring/Spring.Core/Proxy/TargetProxyMethodBuilder.cs
new file mode 100644
index 00000000..e85a62c7
--- /dev/null
+++ b/src/Spring/Spring.Core/Proxy/TargetProxyMethodBuilder.cs
@@ -0,0 +1,97 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Proxy
+{
+    /// <summary>
+    /// Implementation of IProxyMethodBuilder that delegates method calls to target object.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: TargetProxyMethodBuilder.cs,v 1.1 2006/08/10 18:45:55 bbaia Exp $</version>
+    public class TargetProxyMethodBuilder : AbstractProxyMethodBuilder
+    {
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the method builder.
+        /// </summary>
+        /// <param name="typeBuilder">The type builder to use.</param>
+        /// <param name="proxyGenerator">
+        /// The <see cref="IProxyTypeGenerator"/> implementation to use.
+        /// </param>
+        /// <param name="explicitImplementation">
+        /// <see langword="true"/> if the interface is to be
+        /// implemented explicitly; otherwise <see langword="false"/>.
+        /// </param>
+        public TargetProxyMethodBuilder(
+            TypeBuilder typeBuilder, IProxyTypeGenerator proxyGenerator, bool explicitImplementation)
+            : base(typeBuilder, proxyGenerator, explicitImplementation)
+        {
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Generates the proxy method.
+        /// </summary>
+        /// <param name="il">The IL generator to use.</param>
+        /// <param name="method">The method to proxy.</param>
+        /// <param name="interfaceMethod">
+        /// The interface definition of the method, if applicable.
+        /// </param>
+        protected override void GenerateMethod(
+            ILGenerator il, MethodInfo method, MethodInfo interfaceMethod)
+        {
+            LocalBuilder returnValue = null;
+            if (method.ReturnType != typeof(void))
+            {
+                returnValue = il.DeclareLocal(method.ReturnType);
+            }
+
+            CallDirectTargetMethod(il, interfaceMethod);
+
+            // unboxing is not necessary because we called the method directly
+            if (returnValue != null)
+            {
+                il.Emit(OpCodes.Stloc, returnValue);
+
+                if (!method.ReturnType.IsValueType)
+                {
+                    ProcessReturnValue(il, returnValue);
+                }
+                il.Emit(OpCodes.Ldloc, returnValue);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs b/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs
new file mode 100644
index 00000000..e592f377
--- /dev/null
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs
@@ -0,0 +1,147 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+    /// <summary>
+    /// Base class for dynamic members.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: BaseDynamicMember.cs,v 1.1 2007/08/08 04:05:37 bbaia Exp $</version>
+    public class BaseDynamicMember
+    {
+        /// <summary>
+        /// Method attributes constant.
+        /// </summary>
+        protected const MethodAttributes METHOD_ATTRIBUTES =
+            MethodAttributes.Public | MethodAttributes.HideBySig
+            | MethodAttributes.NewSlot | MethodAttributes.Virtual
+            | MethodAttributes.Final;
+
+        private static ConstructorInfo invalidOperationException = 
+            typeof(InvalidOperationException).GetConstructor(new Type[] { typeof(string) });
+
+        /// <summary>
+        /// Sets up target instance for invocation.
+        /// </summary>
+        /// <param name="il">IL generator to use.</param>
+        /// <param name="targetType">Type of target instance.</param>
+        protected static void SetupTargetInstance(ILGenerator il, Type targetType)
+        {
+            il.Emit(OpCodes.Ldarg_1);
+            if (targetType.IsValueType)
+            {
+                LocalBuilder target = il.DeclareLocal(targetType);
+#if NET_2_0 
+                il.Emit(OpCodes.Unbox_Any, targetType);
+#else
+            	il.Emit(OpCodes.Unbox, targetType);
+            	il.Emit(OpCodes.Ldobj, targetType);
+#endif          
+            	il.Emit(OpCodes.Stloc, target);
+                il.Emit(OpCodes.Ldloca, target);
+            }
+            else
+            {
+                il.Emit(OpCodes.Castclass, targetType);
+            }
+        }
+
+        /// <summary>
+        /// Sets up invocation argument.
+        /// </summary>
+        /// <param name="il">IL generator to use.</param>
+        /// <param name="argumentType">Argument type.</param>
+        /// <param name="argumentPosition">Argument position.</param>
+        protected static void SetupArgument(ILGenerator il, Type argumentType, int argumentPosition)
+        {
+            il.Emit(OpCodes.Ldarg, argumentPosition);
+            if (argumentType.IsValueType)
+            {
+#if NET_2_0 
+				il.Emit(OpCodes.Unbox_Any, argumentType);
+#else
+				il.Emit(OpCodes.Unbox, argumentType);
+				il.Emit(OpCodes.Ldobj, argumentType);
+#endif          
+            }
+            else
+            {
+                il.Emit(OpCodes.Castclass, argumentType);
+            }
+        }
+
+        /// <summary>
+        /// Generates method invocation code.
+        /// </summary>
+        /// <param name="il">IL generator to use.</param>
+        /// <param name="isStatic">Flag specifying whether method is static.</param>
+        /// <param name="isValueType">Flag specifying whether method is on the value type.</param>
+        /// <param name="method">Method to invoke.</param>
+        protected static void InvokeMethod(ILGenerator il, bool isStatic, bool isValueType, MethodInfo method)
+        {
+            if (isStatic || isValueType)
+            {
+                il.EmitCall(OpCodes.Call, method, null);
+            }
+            else
+            {
+                il.EmitCall(OpCodes.Callvirt, method, null);
+            }
+        }
+
+        /// <summary>
+        /// Generates code to process return value if necessary.
+        /// </summary>
+        /// <param name="il">IL generator to use.</param>
+        /// <param name="returnValueType">Type of the return value.</param>
+        protected static void ProcessReturnValue(ILGenerator il, Type returnValueType)
+        {
+            if (returnValueType == typeof(void))
+            {
+                il.Emit(OpCodes.Ldnull);
+            }
+            else if (returnValueType.IsValueType)
+            {
+                il.Emit(OpCodes.Box, returnValueType);
+            }
+        }
+
+        /// <summary>
+        /// Generates code that throws <see cref="InvalidOperationException"/>.
+        /// </summary>
+        /// <param name="il">IL generator to use.</param>
+        /// <param name="message">Error message to use.</param>
+        protected static void ThrowInvalidOperationException(ILGenerator il, string message)
+        {
+            il.Emit(OpCodes.Ldstr, message);
+            il.Emit(OpCodes.Newobj, invalidOperationException);
+            il.Emit(OpCodes.Throw);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs
new file mode 100644
index 00000000..64adb46c
--- /dev/null
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs
@@ -0,0 +1,199 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+    #region IDynamicConstructor interface
+
+    /// <summary>
+    /// Defines constructors that dynamic constructor class has to implement.
+    /// </summary>
+    public interface IDynamicConstructor
+    {
+        /// <summary>
+        /// Invokes dynamic constructor.
+        /// </summary>
+        /// <param name="arguments">
+        /// Constructor arguments.
+        /// </param>
+        /// <returns>
+        /// A constructor value.
+        /// </returns>
+        object Invoke(object[] arguments);
+    }
+
+    #endregion
+
+    #region Safe wrapper
+
+    /// <summary>
+    /// Safe wrapper for the dynamic constructor.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="SafeConstructor"/> will attempt to use dynamic
+    /// constructor if possible, but it will fall back to standard
+    /// reflection if necessary.
+    /// </remarks>
+    public class SafeConstructor : IDynamicConstructor
+    {
+        private ConstructorInfo constructor;
+        private IDynamicConstructor dynamicConstructor;
+        private bool isOptimized = false;
+        
+        /// <summary>
+        /// Creates a new instance of the safe constructor wrapper.
+        /// </summary>
+        /// <param name="constructor">Constructor to wrap.</param>
+        public SafeConstructor(ConstructorInfo constructor)
+        {
+            this.constructor = constructor;
+            if (constructor.IsPublic &&
+                ReflectionUtils.IsTypeVisible(constructor.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
+            {
+                this.dynamicConstructor = DynamicConstructor.Create(constructor);
+                this.isOptimized = true;
+            }
+        }
+        
+        /// <summary>
+        /// Invokes dynamic constructor.
+        /// </summary>
+        /// <param name="arguments">
+        /// Constructor arguments.
+        /// </param>
+        /// <returns>
+        /// A constructor value.
+        /// </returns>
+        public object Invoke(object[] arguments)
+        {
+            if (isOptimized)
+            {
+                // try dynamic constructor first but fall back to standard reflection 
+                // if arguments are causing InvalidCastExceptions
+                try
+                {
+                    return dynamicConstructor.Invoke(arguments);
+                }
+                catch (InvalidCastException)
+                {
+                    isOptimized = false;
+                    return constructor.Invoke(arguments);
+                }
+            }
+            else
+            {
+                return constructor.Invoke(arguments);
+            }
+        }
+    }
+
+    #endregion
+    
+    /// <summary>
+    /// Factory class for dynamic constructors.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DynamicConstructor.cs,v 1.1 2007/08/08 04:05:37 bbaia Exp $</version>
+    public class DynamicConstructor : BaseDynamicMember
+    {
+        private static readonly CreateConstructorCallback s_createCallback = new CreateConstructorCallback(CreateInternal);
+
+        #region Create Constructor
+
+        /// <summary>
+        /// Creates dynamic constructor instance for the specified <see cref="ConstructorInfo"/>.
+        /// </summary>
+        /// <param name="constructor">Constructor info to create dynamic constructor for.</param>
+        /// <returns>Dynamic constructor for the specified <see cref="ConstructorInfo"/>.</returns>
+        public static IDynamicConstructor Create(ConstructorInfo constructor)
+        {
+            AssertUtils.ArgumentNotNull(constructor, "You cannot create a dynamic constructor for a null value.");
+
+            IDynamicConstructor dynamicConstructor = DynamicReflectionManager.GetDynamicConstructor(constructor, s_createCallback);
+            return dynamicConstructor;
+        }
+
+        private static IDynamicConstructor CreateInternal(ConstructorInfo constructor)
+        {
+            IDynamicConstructor dynamicConstructor = null;
+
+            TypeBuilder tb = DynamicReflectionManager.CreateTypeBuilder("Ctor_" + constructor.DeclaringType.Name);
+            tb.AddInterfaceImplementation(typeof(IDynamicConstructor));
+
+            GenerateInvoke(tb, constructor);
+
+            Type dynamicConstructorType = tb.CreateType();
+            ConstructorInfo ctor = dynamicConstructorType.GetConstructor(Type.EmptyTypes);
+            dynamicConstructor = (IDynamicConstructor) ctor.Invoke(ObjectUtils.EmptyObjects);
+            
+            return dynamicConstructor;
+        }
+
+        private static void GenerateInvoke(TypeBuilder tb, ConstructorInfo constructor)
+        {
+            MethodBuilder invokeMethod = 
+                tb.DefineMethod("Invoke", METHOD_ATTRIBUTES, typeof(object), new Type[] {typeof(object[])});
+            invokeMethod.DefineParameter(1, ParameterAttributes.None, "args");
+
+            ILGenerator il = invokeMethod.GetILGenerator();
+
+            Type[] argTypes = ReflectionUtils.GetParameterTypes(constructor);
+            for (int i = 0; i < argTypes.Length; i++)
+            {
+                SetupConstructorArgument(il, argTypes[i], i);
+            }
+            
+            il.Emit(OpCodes.Newobj, constructor);
+            ProcessReturnValue(il, constructor.DeclaringType);
+            il.Emit(OpCodes.Ret);
+        }
+
+        private static void SetupConstructorArgument(ILGenerator il, Type argumentType, int argumentPosition)
+        {
+            il.Emit(OpCodes.Ldarg_1);
+            il.Emit(OpCodes.Ldc_I4, argumentPosition);
+            il.Emit(OpCodes.Ldelem_Ref);
+            if (argumentType.IsValueType)
+            {
+#if NET_2_0 
+                il.Emit(OpCodes.Unbox_Any, argumentType);
+#else
+            	il.Emit(OpCodes.Unbox, argumentType);
+				il.Emit(OpCodes.Ldobj, argumentType);
+#endif
+            }
+            else
+            {
+                il.Emit(OpCodes.Castclass, argumentType);
+            }
+        }
+        
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs
new file mode 100644
index 00000000..18596835
--- /dev/null
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs
@@ -0,0 +1,487 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+    #region IDynamicField interface
+
+    /// <summary>
+    /// Defines methods that dynamic field class has to implement.
+    /// </summary>
+    public interface IDynamicField
+    {
+        /// <summary>
+        /// Gets the value of the dynamic field for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to get field value from.
+        /// </param>
+        /// <returns>
+        /// A field value.
+        /// </returns>
+        object GetValue(object target);
+
+        /// <summary>
+        /// Gets the value of the dynamic field for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to set field value on.
+        /// </param>
+        /// <param name="value">
+        /// A new field value.
+        /// </param>
+        void SetValue(object target, object value);
+    }
+
+    #endregion
+
+    #region Safe wrapper
+
+    /// <summary>
+    /// Safe wrapper for the dynamic field.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="SafeField"/> will attempt to use dynamic
+    /// field if possible, but it will fall back to standard
+    /// reflection if necessary.
+    /// </remarks>
+    public class SafeField : IDynamicField
+    {
+        private readonly FieldInfo fieldInfo;
+#if NET_2_0
+        #region Cache
+
+        private static readonly IDictionary fieldCache = new Hashtable();
+
+        /// <summary>
+        /// Holds cached Getter/Setter delegates for a Field
+        /// </summary>
+        private class DynamicFieldCacheEntry
+        {
+            public readonly GetterDelegate Getter;
+            public readonly SetterDelegate Setter;
+
+            public DynamicFieldCacheEntry(GetterDelegate getter, SetterDelegate setter)
+            {
+                Getter = getter;
+                Setter = setter;
+            }
+        }
+
+        /// <summary>
+        /// Obtains cached fieldInfo or creates a new entry, if none is found.
+        /// </summary>
+        private static DynamicFieldCacheEntry GetOrCreateDynamicField(FieldInfo field)
+        {
+            DynamicFieldCacheEntry fieldInfo = (DynamicFieldCacheEntry)fieldCache[field];
+            if (fieldInfo == null)
+            {
+                fieldInfo = new DynamicFieldCacheEntry(DynamicReflectionManager.CreateFieldGetter(field), DynamicReflectionManager.CreateFieldSetter(field));
+                lock (fieldCache)
+                {
+                    fieldCache[field] = fieldInfo;
+                }
+            }
+            return fieldInfo;
+        }
+
+        #endregion
+
+        private readonly GetterDelegate getter;
+        private readonly SetterDelegate setter;
+
+        /// <summary>
+        /// Creates a new instance of the safe field wrapper.
+        /// </summary>
+        /// <param name="field">Field to wrap.</param>
+        public SafeField(FieldInfo field)
+        {
+            AssertUtils.ArgumentNotNull(field, "You cannot create a dynamic field for a null value.");
+
+            fieldInfo = field;
+            DynamicFieldCacheEntry fi = GetOrCreateDynamicField(field);
+            getter = fi.Getter;
+            setter = fi.Setter;
+        }
+
+        /// <summary>
+        /// Gets the value of the dynamic field for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to get field value from.
+        /// </param>
+        /// <returns>
+        /// A field value.
+        /// </returns>
+        public object GetValue(object target)
+        {
+            return getter(target);
+        }
+
+        /// <summary>
+        /// Gets the value of the dynamic field for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to set field value on.
+        /// </param>
+        /// <param name="value">
+        /// A new field value.
+        /// </param>
+        public void SetValue(object target, object value)
+        {
+            setter(target, value);
+        }
+
+#else
+        /// <summary>
+        /// Returns a <see cref="IDynamicField"/> implementation
+        /// by determining the fastest possible dynamic access strategy 
+        /// </summary>
+        /// <param name="field">the field to be wrapped</param>
+        /// <returns>an <see cref="IDynamicField"/> instance for accessing the 
+        /// field represented by the given <see cref="FieldInfo"/></returns>
+        public static IDynamicField CreateFrom(FieldInfo field)
+        {
+            AssertUtils.ArgumentNotNull(field, "You cannot create a dynamic field for a null value.");
+
+            IDynamicField dynamicField;
+
+            if (field.IsPublic &&
+               ReflectionUtils.IsTypeVisible(field.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
+            {
+                dynamicField = DynamicField.Create(field);
+            }
+            else
+            {
+                dynamicField = new SafeField(field);
+            }
+
+            return dynamicField;
+        }
+
+        private readonly IDynamicField dynamicField;
+        private readonly bool isOptimizedGet = false;
+        private bool isOptimizedSet = false;
+        private readonly bool canSet;
+
+        /// <summary>
+        /// Creates a new instance of the safe field wrapper.
+        /// </summary>
+        /// <param name="field">Field to wrap.</param>
+        public SafeField(FieldInfo field)
+        {
+            AssertUtils.ArgumentNotNull(field, "You cannot create a dynamic field for a null value.");
+
+            this.fieldInfo = field;
+            this.canSet = (!fieldInfo.IsLiteral
+                && !fieldInfo.IsInitOnly
+                && !(fieldInfo.DeclaringType.IsValueType && !fieldInfo.IsStatic));
+
+            if (fieldInfo.IsPublic &&
+                ReflectionUtils.IsTypeVisible(fieldInfo.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
+            {
+                dynamicField = DynamicField.Create(fieldInfo);
+                isOptimizedGet = isOptimizedSet = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets the value of the dynamic field for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to get field value from.
+        /// </param>
+        /// <returns>
+        /// A field value.
+        /// </returns>
+        public object GetValue(object target)
+        {
+            if (isOptimizedGet)
+            {
+                return dynamicField.GetValue(target);
+            }
+            else
+            {
+                return fieldInfo.GetValue(target);
+            }
+        }
+
+        /// <summary>
+        /// Gets the value of the dynamic field for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to set field value on.
+        /// </param>
+        /// <param name="value">
+        /// A new field value.
+        /// </param>
+        public void SetValue(object target, object value)
+        {
+            if (isOptimizedSet)
+            {
+                try
+                {
+                    dynamicField.SetValue(target, value);
+                }
+                catch (InvalidCastException)
+                {
+                    isOptimizedSet = false;
+                    if (!canSet)
+                    {
+                        throw new InvalidOperationException("Cannot set value of a read-only field or a constant.");
+                    }
+
+                    fieldInfo.SetValue(target, value);
+                }
+            }
+            else
+            {
+                if (!canSet)
+                {
+                    throw new InvalidOperationException("Cannot set value of a read-only field or a constant.");
+                }
+                fieldInfo.SetValue(target, value);
+            }
+        }
+#endif
+        internal FieldInfo FieldInfo
+        {
+            get { return fieldInfo; }
+        }
+    }
+
+    #endregion
+
+#if NET_2_0
+    /// <summary>
+    /// Factory class for dynamic fields.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DynamicField.cs,v 1.4 2008/05/16 10:02:39 oakinger Exp $</version>
+    public class DynamicField : BaseDynamicMember
+    {
+        /// <summary>
+        /// Creates dynamic field instance for the specified <see cref="FieldInfo"/>.
+        /// </summary>
+        /// <param name="field">Field info to create dynamic field for.</param>
+        /// <returns>Dynamic field for the specified <see cref="FieldInfo"/>.</returns>
+        public static IDynamicField Create(FieldInfo field)
+        {
+            AssertUtils.ArgumentNotNull(field, "You cannot create a dynamic field for a null value.");
+
+            IDynamicField dynamicField = new SafeField(field);
+            return dynamicField;
+        }
+    }
+#else
+    /// <summary>
+    /// Factory class for dynamic fields.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DynamicField.cs,v 1.4 2008/05/16 10:02:39 oakinger Exp $</version>
+    public class DynamicField : BaseDynamicMember
+    {
+        private static readonly CreateFieldCallback s_createCallback = new CreateFieldCallback(CreateInternal);
+
+        #region Create Method
+
+        /// <summary>
+        /// Creates dynamic field instance for the specified <see cref="FieldInfo"/>.
+        /// </summary>
+        /// <param name="field">Field info to create dynamic field for.</param>
+        /// <returns>Dynamic field for the specified <see cref="FieldInfo"/>.</returns>
+        public static IDynamicField Create(FieldInfo field)
+        {
+            AssertUtils.ArgumentNotNull(field, "You cannot create a dynamic field for a null value.");
+
+            IDynamicField dynamicField = DynamicReflectionManager.GetDynamicField(field, s_createCallback);
+            return dynamicField;
+        }
+
+        private static IDynamicField CreateInternal(FieldInfo field)
+        {
+            IDynamicField dynamicField = null;
+
+            TypeBuilder tb = DynamicReflectionManager.CreateTypeBuilder("Field_" + field.Name);
+            tb.AddInterfaceImplementation(typeof(IDynamicField));
+
+            GenerateGetValue(tb, field);
+            GenerateSetValue(tb, field);
+
+            Type dynamicFieldType = tb.CreateType();
+            ConstructorInfo ctor = dynamicFieldType.GetConstructor(Type.EmptyTypes);
+            dynamicField = (IDynamicField)ctor.Invoke(ObjectUtils.EmptyObjects);
+
+            return dynamicField;
+        }
+
+        private static void GenerateGetValue(TypeBuilder tb, FieldInfo field)
+        {
+            MethodBuilder getValueMethod =
+                tb.DefineMethod("GetValue", METHOD_ATTRIBUTES, typeof(object), new Type[] { typeof(object) });
+            getValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
+
+            ILGenerator il = getValueMethod.GetILGenerator();
+            if (field.IsLiteral)
+            {
+                EmitConstant(il, field.GetValue(field.FieldType));
+            }
+            else if (field.IsStatic)
+            {
+                il.Emit(OpCodes.Ldsfld, field);
+            }
+            else
+            {
+                SetupTargetInstance(il, field.DeclaringType);
+                il.Emit(OpCodes.Ldfld, field);
+            }
+            ProcessReturnValue(il, field.FieldType);
+            il.Emit(OpCodes.Ret);
+        }
+
+        private static void EmitConstant(ILGenerator il, object value)
+        {
+            if (value is String)
+            {
+                il.Emit(OpCodes.Ldstr, (string)value);
+                return;
+            }
+
+            if (value is bool)
+            {
+                if ((bool)value)
+                {
+                    il.Emit(OpCodes.Ldc_I4_1);
+                }
+                else
+                {
+                    il.Emit(OpCodes.Ldc_I4_0);
+                }
+                return;
+            }
+
+            if (value is Char)
+            {
+                il.Emit(OpCodes.Ldc_I4, (Char)value);
+                il.Emit(OpCodes.Conv_I2);
+                return;
+            }
+
+            if (value is byte)
+            {
+                il.Emit(OpCodes.Ldc_I4, (byte)value);
+                il.Emit(OpCodes.Conv_I1);
+            }
+            else if (value is Int16)
+            {
+                il.Emit(OpCodes.Ldc_I4, (Int16)value);
+                il.Emit(OpCodes.Conv_I2);
+            }
+            else if (value is Int32)
+            {
+                il.Emit(OpCodes.Ldc_I4, (Int32)value);
+            }
+            else if (value is Int64)
+            {
+                il.Emit(OpCodes.Ldc_I8, (Int64)value);
+            }
+            else if (value is UInt16)
+            {
+                il.Emit(OpCodes.Ldc_I4, (UInt16)value);
+                il.Emit(OpCodes.Conv_U2);
+            }
+            else if (value is UInt32)
+            {
+                il.Emit(OpCodes.Ldc_I4, (UInt32)value);
+                il.Emit(OpCodes.Conv_U4);
+            }
+            else if (value is UInt64)
+            {
+                il.Emit(OpCodes.Ldc_I8, (UInt64)value);
+                il.Emit(OpCodes.Conv_U8);
+            }
+            else if (value is Single)
+            {
+                il.Emit(OpCodes.Ldc_R4, (Single)value);
+            }
+            else if (value is Double)
+            {
+                il.Emit(OpCodes.Ldc_R8, (Double)value);
+            }
+        }
+
+        private static void GenerateSetValue(TypeBuilder tb, FieldInfo field)
+        {
+            MethodBuilder setValueMethod =
+                tb.DefineMethod("SetValue", METHOD_ATTRIBUTES, typeof(void),
+                                new Type[] { typeof(object), typeof(object) });
+            setValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
+            setValueMethod.DefineParameter(2, ParameterAttributes.None, "value");
+
+            ILGenerator il = setValueMethod.GetILGenerator();
+            if (!(field.IsInitOnly || field.IsLiteral))
+            {
+                bool isValueType = field.DeclaringType.IsValueType;
+                if (isValueType && !field.IsStatic)
+                {
+                    ThrowInvalidOperationException(il, "Cannot set field value on a value type due to boxing.");
+                }
+                else
+                {
+                    bool isStatic = field.IsStatic;
+
+                    if (!isStatic)
+                    {
+                        SetupTargetInstance(il, field.DeclaringType);
+                    }
+
+                    SetupArgument(il, field.FieldType, 2);
+                    if (!isStatic)
+                    {
+                        il.Emit(OpCodes.Stfld, field);
+                    }
+                    else
+                    {
+                        il.Emit(OpCodes.Stsfld, field);
+                    }
+                    il.Emit(OpCodes.Ret);
+                }
+            }
+            else
+            {
+                ThrowInvalidOperationException(il, "Cannot set value of a read-only field or a constant.");
+            }
+        }
+
+        #endregion
+    }
+#endif // NET_2_0
+}
+
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs
new file mode 100644
index 00000000..f55f68c4
--- /dev/null
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs
@@ -0,0 +1,519 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+    #region IDynamicIndexer interface
+
+    /// <summary>
+    /// Defines methods that dynamic indexer class has to implement.
+    /// </summary>
+    public interface IDynamicIndexer
+    {
+        /// <summary>
+        /// Gets the value of the dynamic indexer for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to get the indexer value from.
+        /// </param>
+        /// <param name="index">
+        /// Indexer argument.
+        /// </param>
+        /// <returns>
+        /// A indexer value.
+        /// </returns>
+        object GetValue(object target, int index);
+
+        /// <summary>
+        /// Gets the value of the dynamic indexer for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to get the indexer value from.
+        /// </param>
+        /// <param name="index">
+        /// Indexer argument.
+        /// </param>
+        /// <returns>
+        /// A indexer value.
+        /// </returns>
+        object GetValue(object target, object index);
+
+        /// <summary>
+        /// Gets the value of the dynamic indexer for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to get the indexer value from.
+        /// </param>
+        /// <param name="index">
+        /// Indexer arguments.
+        /// </param>
+        /// <returns>
+        /// A indexer value.
+        /// </returns>
+        object GetValue(object target, object[] index);
+
+        /// <summary>
+        /// Gets the value of the dynamic indexer for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to set the indexer value on.
+        /// </param>
+        /// <param name="index">
+        /// Indexer argument.
+        /// </param>
+        /// <param name="value">
+        /// A new indexer value.
+        /// </param>
+        void SetValue(object target, int index, object value);
+
+        /// <summary>
+        /// Gets the value of the dynamic indexer for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to set the indexer value on.
+        /// </param>
+        /// <param name="index">
+        /// Indexer argument.
+        /// </param>
+        /// <param name="value">
+        /// A new indexer value.
+        /// </param>
+        void SetValue(object target, object index, object value);
+
+        /// <summary>
+        /// Gets the value of the dynamic indexer for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to set the indexer value on.
+        /// </param>
+        /// <param name="index">
+        /// Indexer arguments.
+        /// </param>
+        /// <param name="value">
+        /// A new indexer value.
+        /// </param>
+        void SetValue(object target, object[] index, object value);
+    }
+
+    #endregion
+
+    #region Safe wrapper
+
+    /// <summary>
+    /// Safe wrapper for the dynamic indexer.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="SafeIndexer"/> will attempt to use dynamic
+    /// indexer if possible, but it will fall back to standard
+    /// reflection if necessary.
+    /// </remarks>
+    public class SafeIndexer : IDynamicIndexer
+    {
+        private PropertyInfo indexerProperty;
+        private IDynamicIndexer dynamicIndexer;
+        private bool isOptimizedGet = false;
+        private bool isOptimizedSet = false;
+
+        /// <summary>
+        /// Creates a new instance of the safe indexer wrapper.
+        /// </summary>
+        /// <param name="indexer">Indexer to wrap.</param>
+        public SafeIndexer(PropertyInfo indexer)
+        {
+            this.indexerProperty = indexer;
+
+            if (indexer.CanRead 
+                && indexer.GetGetMethod() != null 
+                && ReflectionUtils.IsTypeVisible(indexer.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
+            {
+                dynamicIndexer = DynamicIndexer.Create(indexer);
+                isOptimizedGet = true;
+            }
+            if (indexer.CanWrite 
+                && indexer.GetSetMethod() != null
+                && ReflectionUtils.IsTypeVisible(indexer.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
+            {
+                if (dynamicIndexer == null)
+                {
+                    dynamicIndexer = DynamicIndexer.Create(indexer);
+                }
+                isOptimizedSet = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets the value of the dynamic indexer for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to get indexer value from.
+        /// </param>
+        /// <param name="index">
+        /// Indexer arguments.
+        /// </param>
+        /// <returns>
+        /// A indexer value.
+        /// </returns>
+        public object GetValue(object target, int index)
+        {
+            if (isOptimizedGet)
+            {
+                return dynamicIndexer.GetValue(target, index);
+            }
+            else
+            {
+                return indexerProperty.GetValue(target, new object[] { index });
+            }
+        }
+
+        /// <summary>
+        /// Gets the value of the dynamic indexer for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to get the indexer value from.
+        /// </param>
+        /// <param name="index">
+        /// Indexer argument.
+        /// </param>
+        /// <returns>
+        /// A indexer value.
+        /// </returns>
+        public object GetValue(object target, object index)
+        {
+            if (isOptimizedGet)
+            {
+                return dynamicIndexer.GetValue(target, index);
+            }
+            else
+            {
+                return indexerProperty.GetValue(target, new object[] { index });
+            }
+        }
+        
+        /// <summary>
+        /// Gets the value of the dynamic indexer for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to get indexer value from.
+        /// </param>
+        /// <param name="index">
+        /// Indexer arguments.
+        /// </param>
+        /// <returns>
+        /// A indexer value.
+        /// </returns>
+        public object GetValue(object target, object[] index)
+        {
+            if (isOptimizedGet)
+            {
+                return dynamicIndexer.GetValue(target, index);
+            }
+            else
+            {
+                return indexerProperty.GetValue(target, index);
+            }
+        }
+
+        /// <summary>
+        /// Sets the value of the dynamic indexer for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to set indexer value on.
+        /// </param>
+        /// <param name="index">
+        /// Indexer arguments.
+        /// </param>
+        /// <param name="value">
+        /// A new indexer value.
+        /// </param>
+        public void SetValue(object target, int index, object value)
+        {
+            if (isOptimizedSet)
+            {
+                try
+                {
+                    dynamicIndexer.SetValue(target, index, value);
+                }
+                catch (InvalidCastException)
+                {
+                    isOptimizedSet = false;
+                    indexerProperty.SetValue(target, value, new object[] { index });
+                }
+            }
+            else
+            {
+                indexerProperty.SetValue(target, value, new object[] { index });
+            }
+        }
+
+        /// <summary>
+        /// Sets the value of the dynamic indexer for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to set indexer value on.
+        /// </param>
+        /// <param name="index">
+        /// Indexer arguments.
+        /// </param>
+        /// <param name="value">
+        /// A new indexer value.
+        /// </param>
+        public void SetValue(object target, object index, object value)
+        {
+            if (isOptimizedSet)
+            {
+                try
+                {
+                    dynamicIndexer.SetValue(target, index, value);
+                }
+                catch (InvalidCastException)
+                {
+                    isOptimizedSet = false;
+                    indexerProperty.SetValue(target, value, new object[] { index });
+                }
+            }
+            else
+            {
+                indexerProperty.SetValue(target, value, new object[] { index });
+            }
+        }
+
+        /// <summary>
+        /// Sets the value of the dynamic indexer for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to set indexer value on.
+        /// </param>
+        /// <param name="index">
+        /// Indexer arguments.
+        /// </param>
+        /// <param name="value">
+        /// A new indexer value.
+        /// </param>
+        public void SetValue(object target, object[] index, object value)
+        {
+            if (isOptimizedSet)
+            {
+                try
+                {
+                    dynamicIndexer.SetValue(target, index, value);
+                }
+                catch (InvalidCastException)
+                {
+                    isOptimizedSet = false;
+                    indexerProperty.SetValue(target, value, index);
+                }
+            }
+            else
+            {
+                indexerProperty.SetValue(target, value, index);
+            }
+        }
+
+        /// <summary>
+        /// Internal PropertyInfo accessor.
+        /// </summary>
+        internal PropertyInfo IndexerProperty
+        {
+            get { return indexerProperty; }
+        }
+    }
+
+    #endregion
+    
+    /// <summary>
+    /// Factory class for dynamic indexers.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DynamicIndexer.cs,v 1.1 2007/08/08 04:05:37 bbaia Exp $</version>
+    public class DynamicIndexer : BaseDynamicMember
+    {
+        private static readonly CreateIndexerCallback s_createCallback = new CreateIndexerCallback(CreateInternal);
+
+        #region Create Method
+
+        /// <summary>
+        /// Creates dynamic indexer instance for the specified <see cref="PropertyInfo"/>.
+        /// </summary>
+        /// <param name="indexer">Indexer info to create dynamic indexer for.</param>
+        /// <returns>Dynamic indexer for the specified <see cref="PropertyInfo"/>.</returns>
+        public static IDynamicIndexer Create(PropertyInfo indexer)
+        {
+            AssertUtils.ArgumentNotNull(indexer, "You cannot create a dynamic indexer for a null value.");
+
+            IDynamicIndexer dynamicIndexer = DynamicReflectionManager.GetDynamicIndexer(indexer, s_createCallback);
+            return dynamicIndexer;
+        }
+
+        private static IDynamicIndexer CreateInternal(PropertyInfo indexer)
+        {
+            IDynamicIndexer dynamicIndexer = null;
+
+            TypeBuilder tb = DynamicReflectionManager.CreateTypeBuilder("Indexer_" + indexer.DeclaringType.Name);
+            tb.AddInterfaceImplementation(typeof(IDynamicIndexer));
+
+            GenerateGetValue(tb, indexer, typeof(int));
+            GenerateGetValue(tb, indexer, typeof(object));
+            GenerateGetValue(tb, indexer, typeof(object[]));
+            GenerateSetValue(tb, indexer, typeof(int));
+            GenerateSetValue(tb, indexer, typeof(object));
+            GenerateSetValue(tb, indexer, typeof(object[]));
+
+            Type dynamicIndexerType = tb.CreateType();
+            ConstructorInfo ctor = dynamicIndexerType.GetConstructor(Type.EmptyTypes);
+            dynamicIndexer = (IDynamicIndexer) ctor.Invoke(ObjectUtils.EmptyObjects);
+            
+            return dynamicIndexer;
+        }
+
+        private static void GenerateGetValue(TypeBuilder tb, PropertyInfo indexer, Type indexType)
+        {
+            MethodBuilder getValueMethod =
+                tb.DefineMethod("GetValue", METHOD_ATTRIBUTES, typeof(object), new Type[] { typeof(object), indexType });
+            getValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
+            getValueMethod.DefineParameter(2, ParameterAttributes.None, "index");
+            
+            ILGenerator il = getValueMethod.GetILGenerator();
+            if (indexer.CanRead)
+            {
+                MethodInfo getMethod = indexer.GetGetMethod();
+                bool isValueType = indexer.DeclaringType.IsValueType;
+                bool isStatic = getMethod.IsStatic;
+                
+                if (!isStatic)
+                {
+                    SetupTargetInstance(il, indexer.DeclaringType);
+                }
+
+                if (indexType != typeof(object) && indexType != typeof(object[]))
+                {
+                    il.Emit(OpCodes.Ldarg_2);
+                }
+                else if (indexType == typeof(object))
+                {
+                    Type argumentType = ReflectionUtils.GetParameterTypes(getMethod)[0];
+                    SetupIndexerArgument(il, argumentType, 0, false);
+                }
+                else
+                {
+                    Type[] argTypes = ReflectionUtils.GetParameterTypes(getMethod);
+                    for (int i = 0; i < argTypes.Length; i++)
+                    {
+                        SetupIndexerArgument(il, argTypes[i], i, true);
+                    }
+                }
+                InvokeMethod(il, isStatic, isValueType, getMethod);
+                ProcessReturnValue(il, indexer.PropertyType);
+                il.Emit(OpCodes.Ret);
+            }
+            else
+            {
+                ThrowInvalidOperationException(il, "Cannot get value of a non-readable indexer");
+            }
+        }
+
+        private static void GenerateSetValue(TypeBuilder tb, PropertyInfo indexer, Type indexType)
+        {
+            MethodBuilder setValueMethod =
+                tb.DefineMethod("SetValue", METHOD_ATTRIBUTES, typeof(void),
+                                new Type[] { typeof(object), indexType, typeof(object) });
+            setValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
+            setValueMethod.DefineParameter(2, ParameterAttributes.None, "value");
+
+            ILGenerator il = setValueMethod.GetILGenerator();
+            if (indexer.CanWrite)
+            {
+                bool isValueType = indexer.DeclaringType.IsValueType;
+                if (isValueType)
+                {
+                    ThrowInvalidOperationException(il, "Cannot set indexer value on a value type due to boxing.");
+                }
+                else
+                {
+                    MethodInfo setMethod = indexer.GetSetMethod();
+                    bool isStatic = setMethod.IsStatic;
+
+                    if (!isStatic)
+                    {
+                        SetupTargetInstance(il, indexer.DeclaringType);
+                    }
+
+                    if (indexType != typeof(object) && indexType != typeof(object[]))
+                    {
+                        il.Emit(OpCodes.Ldarg_2);
+                    }
+                    else if (indexType == typeof(object))
+                    {
+                        Type argumentType = ReflectionUtils.GetParameterTypes(setMethod)[0];
+                        SetupIndexerArgument(il, argumentType, 0, false);
+                    }
+                    else
+                    {
+                        Type[] argTypes = ReflectionUtils.GetParameterTypes(setMethod);
+                        for (int i = 0; i < argTypes.Length - 1; i++)
+                        {
+                            SetupIndexerArgument(il, argTypes[i], i, true);
+                        }
+                    }
+                    SetupArgument(il, indexer.PropertyType, 3);
+                    InvokeMethod(il, isStatic, isValueType, setMethod);
+                    il.Emit(OpCodes.Ret);
+                }
+            }
+            else
+            {
+                ThrowInvalidOperationException(il, "Cannot set value of a read-only indexer");
+            }
+        }
+
+        private static void SetupIndexerArgument(ILGenerator il, Type argumentType, int argumentPosition, bool isObjectArray)
+        {
+            il.Emit(OpCodes.Ldarg_2);
+            if (isObjectArray)
+            {
+                il.Emit(OpCodes.Ldc_I4, argumentPosition);
+                il.Emit(OpCodes.Ldelem_Ref);
+            }
+            if (argumentType.IsValueType)
+            {
+#if NET_2_0
+                il.Emit(OpCodes.Unbox_Any, argumentType);
+#else
+				il.Emit(OpCodes.Unbox, argumentType);
+				il.Emit(OpCodes.Ldobj, argumentType);
+#endif
+            }
+            else
+            {
+                il.Emit(OpCodes.Castclass, argumentType);
+            }
+        }
+        
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs
new file mode 100644
index 00000000..ee58a323
--- /dev/null
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs
@@ -0,0 +1,291 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+    #region IDynamicMethod interface
+
+    /// <summary>
+    /// Defines methods that dynamic method class has to implement.
+    /// </summary>
+    public interface IDynamicMethod
+    {
+        /// <summary>
+        /// Invokes dynamic method on the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to invoke method on.
+        /// </param>
+        /// <param name="arguments">
+        /// Method arguments.
+        /// </param>
+        /// <returns>
+        /// A method return value.
+        /// </returns>
+        object Invoke(object target, object[] arguments);
+    }
+
+    #endregion
+
+    #region Safe wrapper
+
+    /// <summary>
+    /// Safe wrapper for the dynamic method.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="SafeMethod"/> will attempt to use dynamic
+    /// method if possible, but it will fall back to standard
+    /// reflection if necessary.
+    /// </remarks>
+    public class SafeMethod : IDynamicMethod
+    {
+        private MethodInfo method;
+        private IDynamicMethod dynamicMethod;
+        private bool isOptimized = false;
+
+        /// <summary>
+        /// Creates a new instance of the safe method wrapper.
+        /// </summary>
+        /// <param name="method">Method to wrap.</param>
+        public SafeMethod(MethodInfo method)
+        {
+            this.method = method;
+            if (method.IsPublic && 
+                ReflectionUtils.IsTypeVisible(method.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
+            {
+                this.dynamicMethod = DynamicMethod.Create(method);
+                this.isOptimized = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets the class, that declares this method
+        /// </summary>
+        public Type DeclaringType
+        {
+            get { return method.DeclaringType; }
+        }
+
+        /// <summary>
+        /// Invokes dynamic method.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to invoke method on.
+        /// </param>
+        /// <param name="arguments">
+        /// Method arguments.
+        /// </param>
+        /// <returns>
+        /// A method return value.
+        /// </returns>
+        public object Invoke(object target, object[] arguments)
+        {
+            if (isOptimized)
+            {
+                // try dynamic method first but fall back to standard reflection 
+                // if arguments are causing InvalidCastExceptions
+                try
+                {
+                    return dynamicMethod.Invoke(target, arguments);
+                }
+                catch (InvalidCastException e)
+                {
+                    // Only attempt if DynamicReflection code itself threw the exception.
+                    if (!ExceptionFromDynamicReflection(e))
+                    {
+                        throw;
+                    }
+                    isOptimized = false;
+                    return method.Invoke(target, arguments);
+                }
+            }
+            else
+            {
+                return method.Invoke(target, arguments);
+            }
+        }
+
+        private bool ExceptionFromDynamicReflection(InvalidCastException e)
+        {
+            return e.TargetSite.DeclaringType.FullName.IndexOf(DynamicReflectionManager.ASSEMBLY_NAME) >= 0;
+        }
+    }
+
+    #endregion
+    
+    /// <summary>
+    /// Factory class for dynamic methods.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DynamicMethod.cs,v 1.2 2008/03/06 20:20:37 oakinger Exp $</version>
+    public class DynamicMethod : BaseDynamicMember
+    {
+        private static readonly CreateMethodCallback s_createMethodCallback = new CreateMethodCallback(CreateInternal);
+
+        #region Create Method
+
+        /// <summary>
+        /// Creates dynamic method instance for the specified <see cref="MethodInfo"/>.
+        /// </summary>
+        /// <param name="method">Method info to create dynamic method for.</param>
+        /// <returns>Dynamic method for the specified <see cref="MethodInfo"/>.</returns>
+        public static IDynamicMethod Create(MethodInfo method)
+        {
+            AssertUtils.ArgumentNotNull(method, "You cannot create a dynamic method for a null value.");
+
+            IDynamicMethod dynamicMethod = DynamicReflectionManager.GetDynamicMethod(method, s_createMethodCallback);
+            return dynamicMethod;
+        }
+
+        private static IDynamicMethod CreateInternal(MethodInfo method)
+        {
+            IDynamicMethod dynamicMethod = null;
+
+            TypeBuilder tb = DynamicReflectionManager.CreateTypeBuilder("Method_" + method.Name);
+            tb.AddInterfaceImplementation(typeof(IDynamicMethod));
+
+            GenerateInvoke(tb, method);
+
+            Type dynamicMethodType = tb.CreateType();
+            ConstructorInfo ctor = dynamicMethodType.GetConstructor(Type.EmptyTypes);
+            dynamicMethod = (IDynamicMethod) ctor.Invoke(ObjectUtils.EmptyObjects);
+
+            return dynamicMethod;
+        }
+
+        private static void GenerateInvoke(TypeBuilder tb, MethodInfo method)
+        {
+            MethodBuilder invokeMethod = 
+                tb.DefineMethod("Invoke", METHOD_ATTRIBUTES, typeof(object), new Type[] {typeof(object), typeof(object[])});
+            invokeMethod.DefineParameter(1, ParameterAttributes.None, "target");
+            invokeMethod.DefineParameter(2, ParameterAttributes.None, "args");
+
+            ILGenerator il = invokeMethod.GetILGenerator();
+            bool isValueType = method.DeclaringType.IsValueType;
+            bool isStatic = method.IsStatic;
+
+            IDictionary outArgs = new Hashtable();
+            ParameterInfo[] args = method.GetParameters();
+            for (int i = 0; i < args.Length; i++)
+            {
+                if (IsOutputOrRefArgument(args[i]))
+                {
+                    SetupOutputArgument(il, args[i], outArgs);
+                }
+            }
+
+            if (!isStatic)
+            {
+                SetupTargetInstance(il, method.DeclaringType);
+            }
+
+            for (int i = 0; i < args.Length; i++)
+            {
+                SetupMethodArgument(il, args[i], outArgs);
+            }
+            InvokeMethod(il, isStatic, isValueType, method);
+            for (int i = 0; i < args.Length; i++)
+            {
+                if (IsOutputOrRefArgument(args[i]))
+                {
+                    ProcessOutputArgument(il, args[i], outArgs);
+                }
+            }
+            ProcessReturnValue(il, method.ReturnType);
+            il.Emit(OpCodes.Ret);
+        }
+
+        private static bool IsOutputOrRefArgument(ParameterInfo argInfo)
+        {
+            return argInfo.IsOut || argInfo.ParameterType.Name.EndsWith("&");
+        }
+
+        private static void SetupOutputArgument(ILGenerator il, ParameterInfo argInfo, IDictionary outArgs)
+        {
+            Type argType = argInfo.ParameterType.GetElementType();
+
+            LocalBuilder lb = il.DeclareLocal(argType);
+            if (!argInfo.IsOut)
+            {
+                PushArgumentValue(il, argType, argInfo.Position);
+                il.Emit(OpCodes.Stloc, lb);
+            }
+            outArgs[argInfo.Position] = lb;
+        }
+
+        private static void ProcessOutputArgument(ILGenerator il, ParameterInfo argInfo, IDictionary outArgs)
+        {
+            Type argType = argInfo.ParameterType.GetElementType();
+
+            il.Emit(OpCodes.Ldarg_2);
+            il.Emit(OpCodes.Ldc_I4, argInfo.Position);
+            il.Emit(OpCodes.Ldloc, (LocalBuilder)outArgs[argInfo.Position]);
+            if (argType.IsValueType)
+            {
+                il.Emit(OpCodes.Box, argType);
+            }
+            il.Emit(OpCodes.Stelem_Ref);
+        }
+
+        private static void SetupMethodArgument(ILGenerator il, ParameterInfo argInfo, IDictionary outArgs)
+        {
+            if (IsOutputOrRefArgument(argInfo))
+            {
+                il.Emit(OpCodes.Ldloca_S, (LocalBuilder)outArgs[argInfo.Position]);
+            }
+            else
+            {
+                PushArgumentValue(il, argInfo.ParameterType, argInfo.Position);
+            }
+        }
+
+        private static void PushArgumentValue(ILGenerator il, Type argumentType, int argumentPosition)
+        {
+            il.Emit(OpCodes.Ldarg_2);
+            il.Emit(OpCodes.Ldc_I4, argumentPosition);
+            il.Emit(OpCodes.Ldelem_Ref);
+            if (argumentType.IsValueType)
+            {
+#if NET_2_0
+                il.Emit(OpCodes.Unbox_Any, argumentType);
+#else
+				il.Emit(OpCodes.Unbox, argumentType);
+				il.Emit(OpCodes.Ldobj, argumentType);
+#endif
+            }
+            else
+            {
+                il.Emit(OpCodes.Castclass, argumentType);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs
new file mode 100644
index 00000000..be833b55
--- /dev/null
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs
@@ -0,0 +1,449 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Common.Logging;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+    #region IDynamicProperty interface
+
+    /// <summary>
+    /// Defines methods that dynamic property class has to implement.
+    /// </summary>
+    public interface IDynamicProperty
+    {
+        /// <summary>
+        /// Gets the value of the dynamic property for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to get property value from.
+        /// </param>
+        /// <returns>
+        /// A property value.
+        /// </returns>
+        object GetValue(object target);
+
+        /// <summary>
+        /// Gets the value of the dynamic property for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to set property value on.
+        /// </param>
+        /// <param name="value">
+        /// A new property value.
+        /// </param>
+        void SetValue(object target, object value);
+    }
+
+    #endregion
+
+    #region Safe wrapper
+
+    /// <summary>
+    /// Safe wrapper for the dynamic property.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="SafeProperty"/> will attempt to use dynamic
+    /// property if possible, but it will fall back to standard
+    /// reflection if necessary.
+    /// </remarks>
+    public class SafeProperty : IDynamicProperty
+    {
+        private static readonly ILog Log = LogManager.GetLogger(typeof(SafeProperty));
+
+        private readonly PropertyInfo propertyInfo;
+
+#if NET_2_0
+
+        #region Cache
+
+        private static readonly IDictionary propertyCache = new Hashtable();
+
+        /// <summary>
+        /// Holds cached Getter/Setter delegates for a Property
+        /// </summary>
+        private class DynamicPropertyCacheEntry
+        {
+            public readonly GetterDelegate Getter;
+            public readonly SetterDelegate Setter;
+
+            public DynamicPropertyCacheEntry(GetterDelegate getter, SetterDelegate setter)
+            {
+                Getter = getter;
+                Setter = setter;
+            }
+        }
+
+        /// <summary>
+        /// Obtains cached property info or creates a new entry, if none is found.
+        /// </summary>
+        private static DynamicPropertyCacheEntry GetOrCreateDynamicProperty(PropertyInfo property)
+        {
+            DynamicPropertyCacheEntry propertyInfo = (DynamicPropertyCacheEntry)propertyCache[property];
+            if (propertyInfo == null)
+            {
+                propertyInfo = new DynamicPropertyCacheEntry(DynamicReflectionManager.CreatePropertyGetter(property), DynamicReflectionManager.CreatePropertySetter(property));
+                lock (propertyCache)
+                {
+                    propertyCache[property] = propertyInfo;
+                }
+            }
+            return propertyInfo;
+        }
+
+        #endregion
+
+        private readonly GetterDelegate getter;
+        private readonly SetterDelegate setter;
+
+        /// <summary>
+        /// Creates a new instance of the safe property wrapper.
+        /// </summary>
+        /// <param name="propertyInfo">Property to wrap.</param>
+        public SafeProperty(PropertyInfo propertyInfo)
+        {
+            AssertUtils.ArgumentNotNull(propertyInfo, "You cannot create a dynamic property for a null value.");
+
+            this.propertyInfo = propertyInfo;
+            DynamicPropertyCacheEntry pi = GetOrCreateDynamicProperty(propertyInfo);
+            getter = pi.Getter;
+            setter = pi.Setter;
+        }
+
+        /// <summary>
+        /// Gets the value of the dynamic property for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to get property value from.
+        /// </param>
+        /// <returns>
+        /// A property value.
+        /// </returns>
+        public object GetValue(object target)
+        {
+            return getter(target);
+        }
+
+        /// <summary>
+        /// Gets the value of the dynamic property for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to set property value on.
+        /// </param>
+        /// <param name="value">
+        /// A new property value.
+        /// </param>
+        public void SetValue(object target, object value)
+        {
+            setter(target, value);
+        }
+
+#else
+        private readonly IDynamicProperty dynamicProperty;
+        private readonly bool isOptimizedGet = false;
+        private bool isOptimizedSet = false;
+        private readonly bool canSet;
+
+        /// <summary>
+        /// Creates a new instance of the safe property wrapper.
+        /// </summary>
+        /// <param name="property">Property to wrap.</param>
+        public SafeProperty(PropertyInfo property)
+        {
+            this.propertyInfo = property;
+
+            if (property.CanRead
+                && property.GetGetMethod() != null
+                && ReflectionUtils.IsTypeVisible(property.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
+            {
+                dynamicProperty = DynamicProperty.Create(property);
+                isOptimizedGet = true;
+            }
+
+            canSet = property.CanWrite && !(propertyInfo.DeclaringType.IsValueType && !propertyInfo.GetSetMethod(true).IsStatic);
+            if (property.GetSetMethod() != null
+                && ReflectionUtils.IsTypeVisible(property.DeclaringType, DynamicReflectionManager.ASSEMBLY_NAME))
+            {
+                if (dynamicProperty == null)
+                {
+                    dynamicProperty = DynamicProperty.Create(property);
+                }
+                isOptimizedSet = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets the value of the dynamic property for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to get property value from.
+        /// </param>
+        /// <returns>
+        /// A property value.
+        /// </returns>
+        public object GetValue(object target)
+        {
+            if (isOptimizedGet)
+            {
+                return dynamicProperty.GetValue(target);
+            }
+            else
+            {
+                return propertyInfo.GetValue(target, null);
+            }
+        }
+
+        /// <summary>
+        /// Gets the value of the dynamic property for the specified target object.
+        /// </summary>
+        /// <param name="target">
+        /// Target object to set property value on.
+        /// </param>
+        /// <param name="value">
+        /// A new property value.
+        /// </param>
+        public void SetValue(object target, object value)
+        {
+            try
+            {
+                if (isOptimizedSet)
+                {
+                    try
+                    {
+                        dynamicProperty.SetValue(target, value);
+                    }
+                    catch (InvalidCastException)
+                    {
+                        isOptimizedSet = false;
+                        propertyInfo.SetValue(target, value, null);
+                    }
+                }
+                else
+                {
+                    if (!canSet)
+                    {
+                        throw (propertyInfo.DeclaringType.IsValueType)
+                            ? new InvalidOperationException("Cannot set property value on a value type due to boxing.")
+                            : new InvalidOperationException("Cannot set value of a read-only property.");
+                    }
+
+                    propertyInfo.SetValue(target, value, null);
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(
+                    string.Format("Failed setting value '{0}' on property '{2}.{1}' on instance of type '{3}'",
+                                  (value != null ? value.GetType().FullName : "<null>"), 
+                                  propertyInfo.Name, 
+                                  propertyInfo.DeclaringType.FullName,
+                                  (target != null ? target.GetType().FullName : "<null>")), ex);
+                throw;
+            }
+        }
+#endif
+        /// <summary>
+        /// Internal PropertyInfo accessor.
+        /// </summary>
+        internal PropertyInfo PropertyInfo
+        {
+            get { return propertyInfo; }
+        }
+    }
+
+    #endregion
+
+#if NET_2_0
+    /// <summary>
+    /// Factory class for dynamic properties.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DynamicProperty.cs,v 1.3 2008/05/17 11:05:26 oakinger Exp $</version>
+    public class DynamicProperty : BaseDynamicMember
+    {
+        /// <summary>
+        /// Creates safe dynamic property instance for the specified <see cref="PropertyInfo"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>This factory method will create a dynamic property with a "safe" wrapper.</p>
+        /// <p>Safe wrapper will attempt to use generated dynamic property if possible,
+        /// but it will fall back to standard reflection if necessary.</p>
+        /// </remarks>
+        /// <param name="property">Property info to create dynamic property for.</param>
+        /// <returns>Safe dynamic property for the specified <see cref="PropertyInfo"/>.</returns>
+        /// <seealso cref="SafeProperty"/>
+        public static IDynamicProperty CreateSafe(PropertyInfo property)
+        {
+            return new SafeProperty(property);
+        }
+
+        /// <summary>
+        /// Creates dynamic property instance for the specified <see cref="PropertyInfo"/>.
+        /// </summary>
+        /// <param name="property">Property info to create dynamic property for.</param>
+        /// <returns>Dynamic property for the specified <see cref="PropertyInfo"/>.</returns>
+        public static IDynamicProperty Create(PropertyInfo property)
+        {
+            AssertUtils.ArgumentNotNull(property, "You cannot create a dynamic property for a null value.");
+
+            IDynamicProperty dynamicProperty = new SafeProperty(property);
+            return dynamicProperty;
+        }
+    }
+#else
+    /// <summary>
+    /// Factory class for dynamic properties.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DynamicProperty.cs,v 1.3 2008/05/17 11:05:26 oakinger Exp $</version>
+    public class DynamicProperty : BaseDynamicMember
+    {
+        private readonly static CreatePropertyCallback s_createPropertyCallback = new CreatePropertyCallback(CreateInternal);
+
+        #region Create Method
+
+        /// <summary>
+        /// Creates safe dynamic property instance for the specified <see cref="PropertyInfo"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>This factory method will create a dynamic property with a "safe" wrapper.</p>
+        /// <p>Safe wrapper will attempt to use generated dynamic property if possible,
+        /// but it will fall back to standard reflection if necessary.</p>
+        /// </remarks>
+        /// <param name="property">Property info to create dynamic property for.</param>
+        /// <returns>Safe dynamic property for the specified <see cref="PropertyInfo"/>.</returns>
+        /// <seealso cref="SafeProperty"/>
+        public static IDynamicProperty CreateSafe(PropertyInfo property)
+        {
+            return new SafeProperty(property);
+        }
+
+        /// <summary>
+        /// Creates dynamic property instance for the specified <see cref="PropertyInfo"/>.
+        /// </summary>
+        /// <param name="property">Property info to create dynamic property for.</param>
+        /// <returns>Dynamic property for the specified <see cref="PropertyInfo"/>.</returns>
+        public static IDynamicProperty Create(PropertyInfo property)
+        {
+            AssertUtils.ArgumentNotNull(property, "You cannot create a dynamic property for a null value.");
+
+            IDynamicProperty dynamicProperty = DynamicReflectionManager.GetDynamicProperty(property, s_createPropertyCallback);
+            return dynamicProperty;
+        }
+
+        private static IDynamicProperty CreateInternal(PropertyInfo property)
+        {
+            IDynamicProperty dynamicProperty = null;
+
+            TypeBuilder tb = DynamicReflectionManager.CreateTypeBuilder("Property_" + property.Name);
+            tb.AddInterfaceImplementation(typeof(IDynamicProperty));
+
+            GenerateGetValue(tb, property);
+            GenerateSetValue(tb, property);
+
+            Type dynamicPropertyType = tb.CreateType();
+            ConstructorInfo ctor = dynamicPropertyType.GetConstructor(Type.EmptyTypes);
+            dynamicProperty = (IDynamicProperty)ctor.Invoke(ObjectUtils.EmptyObjects);
+
+            return dynamicProperty;
+        }
+
+        private static void GenerateGetValue(TypeBuilder tb, PropertyInfo property)
+        {
+            MethodBuilder getValueMethod =
+                tb.DefineMethod("GetValue", METHOD_ATTRIBUTES, typeof(object), new Type[] { typeof(object) });
+            getValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
+
+            ILGenerator il = getValueMethod.GetILGenerator();
+            if (property.CanRead)
+            {
+                MethodInfo getMethod = property.GetGetMethod(true);
+                bool isValueType = property.DeclaringType.IsValueType;
+                bool isStatic = getMethod.IsStatic;
+
+                if (!isStatic)
+                {
+                    SetupTargetInstance(il, property.DeclaringType);
+                }
+
+                InvokeMethod(il, isStatic, isValueType, getMethod);
+                ProcessReturnValue(il, property.PropertyType);
+                il.Emit(OpCodes.Ret);
+            }
+            else
+            {
+                ThrowInvalidOperationException(il, "Cannot get value of a non-readable property");
+            }
+        }
+
+        private static void GenerateSetValue(TypeBuilder tb, PropertyInfo property)
+        {
+            MethodBuilder setValueMethod =
+                tb.DefineMethod("SetValue", METHOD_ATTRIBUTES, typeof(void),
+                                new Type[] { typeof(object), typeof(object) });
+            setValueMethod.DefineParameter(1, ParameterAttributes.None, "target");
+            setValueMethod.DefineParameter(2, ParameterAttributes.None, "value");
+
+            ILGenerator il = setValueMethod.GetILGenerator();
+            if (property.CanWrite)
+            {
+                bool isValueType = property.DeclaringType.IsValueType;
+                // we can't set nonstatic properties on value types (due to boxing)
+                bool canSet = !(isValueType && !property.GetSetMethod(true).IsStatic);
+                if (!canSet)
+                {
+                    ThrowInvalidOperationException(il, "Cannot set property value on a value type due to boxing.");
+                }
+                else
+                {
+                    MethodInfo setMethod = property.GetSetMethod(true);
+                    bool isStatic = setMethod.IsStatic;
+
+                    if (!isStatic)
+                    {
+                        SetupTargetInstance(il, property.DeclaringType);
+                    }
+
+                    SetupArgument(il, property.PropertyType, 2);
+                    InvokeMethod(il, isStatic, property.DeclaringType.IsValueType, setMethod);
+                    il.Emit(OpCodes.Ret);
+                }
+            }
+            else
+            {
+                ThrowInvalidOperationException(il, "Cannot set value of a read-only property");
+            }
+        }
+
+        #endregion
+    }
+
+#endif
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs
new file mode 100644
index 00000000..4f83b80a
--- /dev/null
+++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs
@@ -0,0 +1,557 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Reflection;
+using System.Reflection.Emit;
+using Spring.Util;
+
+#if NET_2_0
+using NetDynamicMethod = System.Reflection.Emit.DynamicMethod;
+#endif
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+    /// <summary>
+    /// Represents a Get method
+    /// </summary>
+    /// <param name="target">the target instance when calling an instance method</param>
+    /// <returns>the value return by the Get method</returns>
+    public delegate object GetterDelegate(object target);
+
+    /// <summary>
+    /// Represents a Set method
+    /// </summary>
+    /// <param name="target">the target instance when calling an instance method</param>
+    /// <param name="value">the value to be set</param>
+    public delegate void SetterDelegate(object target, object value);
+
+    /// <summary>
+    /// Represents a method
+    /// </summary>
+    /// <param name="target">the target instance when calling an instance method</param>
+    /// <param name="args">arguments to be passed to the method</param>
+    /// <returns>the value return by the method. <value>null</value> when calling a void method</returns>
+    public delegate object FunctionDelegate(object target, params object[] args);
+
+    /// <summary>
+    /// Represents a callback method used to create an <see cref="IDynamicProperty"/> from a <see cref="PropertyInfo"/> instance.
+    /// </summary>
+    internal delegate IDynamicProperty CreatePropertyCallback(PropertyInfo property);
+    /// <summary>
+    /// Represents a callback method used to create an <see cref="IDynamicField"/> from a <see cref="FieldInfo"/> instance.
+    /// </summary>
+    internal delegate IDynamicField CreateFieldCallback(FieldInfo property);
+    /// <summary>
+    /// Represents a callback method used to create an <see cref="IDynamicMethod"/> from a <see cref="MethodInfo"/> instance.
+    /// </summary>
+    internal delegate IDynamicMethod CreateMethodCallback(MethodInfo method);
+    /// <summary>
+    /// Represents a callback method used to create an <see cref="IDynamicConstructor"/> from a <see cref="ConstructorInfo"/> instance.
+    /// </summary>
+    internal delegate IDynamicConstructor CreateConstructorCallback(ConstructorInfo constructor);
+    /// <summary>
+    /// Represents a callback method used to create an <see cref="IDynamicIndexer"/> from a <see cref="PropertyInfo"/> instance.
+    /// </summary>
+    internal delegate IDynamicIndexer CreateIndexerCallback(PropertyInfo indexer);
+
+    /// <summary>
+    /// Allows easy access to existing and creation of new dynamic relection members.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DynamicReflectionManager.cs,v 1.5 2008/05/17 11:05:26 oakinger Exp $</version>
+    public sealed class DynamicReflectionManager
+    {
+        #region Fields
+
+        /// <summary>
+        /// The name of the assembly that defines reflection types created.
+        /// </summary>
+        public const string ASSEMBLY_NAME = "Spring.DynamicReflection";
+
+        /// <summary>
+        /// The attributes of the reflection type to generate.
+        /// </summary>
+        private const TypeAttributes TYPE_ATTRIBUTES = TypeAttributes.BeforeFieldInit | TypeAttributes.Public;
+
+        /// <summary>
+        /// Cache for dynamic property types.
+        /// </summary>
+        private readonly static IDictionary propertyCache = new Hashtable();
+
+        /// <summary>
+        /// Cache for dynamic field types.
+        /// </summary>
+        private readonly static IDictionary fieldCache = new Hashtable();
+
+        /// <summary>
+        /// Cache for dynamic indexer types.
+        /// </summary>
+        private readonly static IDictionary indexerCache = new Hashtable();
+
+        /// <summary>
+        /// Cache for dynamic method types.
+        /// </summary>
+        private readonly static IDictionary methodCache = new Hashtable();
+
+        /// <summary>
+        /// Cache for dynamic constructor types.
+        /// </summary>
+        private readonly static IDictionary constructorCache = new Hashtable();
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Creates an appropriate type builder.
+        /// </summary>
+        /// <param name="name">
+        /// The base name to use for the reflection type name.
+        /// </param>
+        /// <returns>The type builder to use.</returns>
+        internal static TypeBuilder CreateTypeBuilder(string name)
+        {
+            // Generates type name
+            string typeName = String.Format("{0}.{1}_{2}",
+                ASSEMBLY_NAME, name, Guid.NewGuid().ToString("N"));
+
+            ModuleBuilder module = DynamicCodeManager.GetModuleBuilder(ASSEMBLY_NAME);
+            return module.DefineType(typeName, TYPE_ATTRIBUTES);
+        }
+
+        /// <summary>
+        /// Returns dynamic property if one exists.
+        /// </summary>
+        /// <param name="property">Property to look up.</param>
+        /// <param name="createCallback">callback function that will be called to create the dynamic property</param>
+        /// <returns>An <see cref="IDynamicProperty"/> for the given property info.</returns>
+        internal static IDynamicProperty GetDynamicProperty(PropertyInfo property, CreatePropertyCallback createCallback)
+        {
+            lock (propertyCache.SyncRoot)
+            {
+                IDynamicProperty dynamicProperty = (IDynamicProperty)propertyCache[property];
+                if (dynamicProperty == null)
+                {
+                    dynamicProperty = createCallback(property);
+                    propertyCache[property] = dynamicProperty;
+                }
+                return dynamicProperty;
+            }
+        }
+
+        /// <summary>
+        /// Returns dynamic field if one exists.
+        /// </summary>
+        /// <param name="field">Field to look up.</param>
+        /// <param name="createCallback">callback function that will be called to create the dynamic field</param>
+        /// <returns>An <see cref="IDynamicField"/> for the given field info.</returns>
+        internal static IDynamicField GetDynamicField(FieldInfo field, CreateFieldCallback createCallback)
+        {
+            lock (fieldCache.SyncRoot)
+            {
+                IDynamicField dynamicField = (IDynamicField)fieldCache[field];
+                if (dynamicField == null)
+                {
+                    dynamicField = createCallback(field);
+                    fieldCache[field] = dynamicField;
+                }
+                return dynamicField;
+            }
+        }
+
+        /// <summary>
+        /// Returns dynamic indexer if one exists.
+        /// </summary>
+        /// <param name="indexer">Indexer to look up.</param>
+        /// <param name="createCallback">callback function that will be called to create the dynamic indexer</param>
+        /// <returns>An <see cref="IDynamicIndexer"/> for the given indexer.</returns>
+        internal static IDynamicIndexer GetDynamicIndexer(PropertyInfo indexer, CreateIndexerCallback createCallback)
+        {
+            lock (indexerCache.SyncRoot)
+            {
+                IDynamicIndexer dynamicIndexer = (IDynamicIndexer)indexerCache[indexer];
+                if (dynamicIndexer == null)
+                {
+                    dynamicIndexer = createCallback(indexer);
+                    indexerCache[indexer] = dynamicIndexer;
+                }
+                return dynamicIndexer;
+            }
+        }
+
+        /// <summary>
+        /// Returns dynamic method if one exists.
+        /// </summary>
+        /// <param name="method">Method to look up.</param>
+        /// <param name="createCallback">callback function that will be called to create the dynamic method</param>
+        /// <returns>An <see cref="IDynamicMethod"/> for the given method.</returns>
+        internal static IDynamicMethod GetDynamicMethod(MethodInfo method, CreateMethodCallback createCallback)
+        {
+            lock (methodCache.SyncRoot)
+            {
+                IDynamicMethod dynamicMethod = (IDynamicMethod)methodCache[method];
+                if (dynamicMethod == null)
+                {
+                    dynamicMethod = createCallback(method);
+                    methodCache[method] = dynamicMethod;
+                }
+                return dynamicMethod;
+            }
+        }
+
+        /// <summary>
+        /// Returns dynamic constructor if one exists.
+        /// </summary>
+        /// <param name="constructor">Constructor to look up.</param>
+        /// <param name="createCallback">callback function that will be called to create the dynamic constructor</param>
+        /// <returns>An <see cref="IDynamicConstructor"/> for the given constructor.</returns>
+        internal static IDynamicConstructor GetDynamicConstructor(ConstructorInfo constructor, CreateConstructorCallback createCallback)
+        {
+            lock (constructorCache.SyncRoot)
+            {
+                IDynamicConstructor dynamicConstructor = (IDynamicConstructor)constructorCache[constructor];
+                if (dynamicConstructor == null)
+                {
+                    dynamicConstructor = createCallback(constructor);
+                    constructorCache[constructor] = dynamicConstructor;
+                }
+                return dynamicConstructor;
+            }
+        }
+
+        /// <summary>
+        /// Saves dynamically generated assembly to disk.
+        /// Can only be called in DEBUG mode, per ConditionalAttribute rules.
+        /// </summary>
+        [Conditional("DEBUG_DYNAMIC")]
+        public static void SaveAssembly()
+        {
+            DynamicCodeManager.SaveAssembly(ASSEMBLY_NAME);
+        }
+
+        #endregion
+
+#if NET_2_0
+        private static readonly ConstructorInfo NewInvalidOperationException =
+            typeof(InvalidOperationException).GetConstructor(new Type[] { typeof(string) });
+
+        /// <summary>
+        /// Create a new Get method delegate for the specified field using <see cref="System.Reflection.Emit.DynamicMethod"/>
+        /// </summary>
+        /// <param name="fieldInfo">the field to create the delegate for</param>
+        /// <returns>a delegate that can be used to read the field</returns>
+        public static GetterDelegate CreateFieldGetter(FieldInfo fieldInfo)
+        {
+            AssertUtils.ArgumentNotNull(fieldInfo, "You cannot create a delegate for a null value.");
+
+            System.Reflection.Emit.DynamicMethod dmGetter = new System.Reflection.Emit.DynamicMethod("getter", typeof(object), new Type[] { typeof(object) }, fieldInfo.DeclaringType.Module, true);
+            ILGenerator il = dmGetter.GetILGenerator();
+            if (fieldInfo.IsLiteral)
+            {
+                object value = fieldInfo.GetValue(null);
+                EmitConstant(il, value);
+            }
+            else if (fieldInfo.IsStatic)
+            {
+                il.Emit(OpCodes.Ldsfld, fieldInfo);
+            }
+            else
+            {
+                EmitTarget(il, fieldInfo.DeclaringType);
+                il.Emit(OpCodes.Ldfld, fieldInfo);
+            }
+
+            if (fieldInfo.FieldType.IsValueType)
+            {
+                il.Emit(OpCodes.Box, fieldInfo.FieldType);
+            }
+            il.Emit(OpCodes.Ret);
+            return (GetterDelegate)dmGetter.CreateDelegate(typeof(GetterDelegate));
+        }
+
+        /// <summary>
+        /// Create a new Set method delegate for the specified field using <see cref="System.Reflection.Emit.DynamicMethod"/>
+        /// </summary>
+        /// <param name="fieldInfo">the field to create the delegate for</param>
+        /// <returns>a delegate that can be used to read the field.</returns>
+        /// <remarks>
+        /// If the field's <see cref="FieldInfo.IsLiteral"/> returns true, the returned method 
+        /// will throw an <see cref="InvalidOperationException"/> when called.
+        /// </remarks>
+        public static SetterDelegate CreateFieldSetter(FieldInfo fieldInfo)
+        {
+            AssertUtils.ArgumentNotNull(fieldInfo, "You cannot create a delegate for a null value.");
+
+            System.Reflection.Emit.DynamicMethod dmSetter = new System.Reflection.Emit.DynamicMethod("setter", null, new Type[] { typeof(object), typeof(object) }, fieldInfo.DeclaringType.Module, true);
+            ILGenerator il = dmSetter.GetILGenerator();
+
+            if (!fieldInfo.IsLiteral
+                && !fieldInfo.IsInitOnly
+                && !(fieldInfo.DeclaringType.IsValueType && !fieldInfo.IsStatic))
+            {
+                if (!fieldInfo.IsStatic)
+                {
+                    EmitTarget(il, fieldInfo.DeclaringType);
+                }
+                il.Emit(OpCodes.Ldarg_1);
+                if (fieldInfo.FieldType.IsValueType)
+                {
+                    il.Emit(OpCodes.Unbox_Any, fieldInfo.FieldType);
+                }
+                if (fieldInfo.IsStatic)
+                {
+                    il.Emit(OpCodes.Stsfld, fieldInfo);
+                }
+                else
+                {
+                    il.Emit(OpCodes.Stfld, fieldInfo);
+                }
+                il.Emit(OpCodes.Ret);
+            }
+            else
+            {
+                EmitThrowInvalidOperationException(il, string.Format("Cannot write to constant field '{0}.{1}'", fieldInfo.DeclaringType.FullName, fieldInfo.Name));
+            }
+            return (SetterDelegate)dmSetter.CreateDelegate(typeof(SetterDelegate));
+        }
+
+        /// <summary>
+        /// Create a new Get method delegate for the specified property using <see cref="System.Reflection.Emit.DynamicMethod"/>
+        /// </summary>
+        /// <param name="propertyInfo">the property to create the delegate for</param>
+        /// <returns>a delegate that can be used to read the property.</returns>
+        /// <remarks>
+        /// If the property's <see cref="PropertyInfo.CanRead"/> returns false, the returned method 
+        /// will throw an <see cref="InvalidOperationException"/> when called.
+        /// </remarks>
+        public static GetterDelegate CreatePropertyGetter(PropertyInfo propertyInfo)
+        {
+            AssertUtils.ArgumentNotNull(propertyInfo, "You cannot create a delegate for a null value.");
+
+            NetDynamicMethod dm = new NetDynamicMethod(string.Empty, typeof(object), new Type[] { typeof(object) }, propertyInfo.DeclaringType.Module, true);
+            ILGenerator il = dm.GetILGenerator();
+
+            if (propertyInfo.CanRead)
+            {
+                MethodInfo method = propertyInfo.GetGetMethod(true);
+                if (!method.IsStatic)
+                {
+                    EmitTarget(il, method.DeclaringType);
+                }
+                EmitCall(il, method);
+                if (propertyInfo.PropertyType.IsValueType)
+                {
+                    il.Emit(OpCodes.Box, propertyInfo.PropertyType);
+                }
+                il.Emit(OpCodes.Ret);
+            }
+            else
+            {
+                EmitThrowInvalidOperationException(il, string.Format("Cannot read from write-only property '{0}.{1}'", propertyInfo.DeclaringType.FullName, propertyInfo.Name));
+            }
+            return (GetterDelegate)dm.CreateDelegate(typeof(GetterDelegate));
+        }
+
+        /// <summary>
+        /// Create a new Set method delegate for the specified property using <see cref="System.Reflection.Emit.DynamicMethod"/>
+        /// </summary>
+        /// <param name="propertyInfo">the property to create the delegate for</param>
+        /// <returns>a delegate that can be used to write the property.</returns>
+        /// <remarks>
+        /// If the property's <see cref="PropertyInfo.CanWrite"/> returns false, the returned method 
+        /// will throw an <see cref="InvalidOperationException"/> when called.
+        /// </remarks>
+        public static SetterDelegate CreatePropertySetter(PropertyInfo propertyInfo)
+        {
+            AssertUtils.ArgumentNotNull(propertyInfo, "You cannot create a delegate for a null value.");
+
+            NetDynamicMethod dm = new NetDynamicMethod(string.Empty, null, new Type[] { typeof(object), typeof(object) }, propertyInfo.DeclaringType.Module, true);
+            ILGenerator il = dm.GetILGenerator();
+
+            if (propertyInfo.CanWrite
+                && !(propertyInfo.DeclaringType.IsValueType && !propertyInfo.GetSetMethod(true).IsStatic))
+            {
+                MethodInfo method = propertyInfo.GetSetMethod(true);
+                if (!method.IsStatic)
+                {
+                    EmitTarget(il, method.DeclaringType);
+                }
+
+                il.Emit(OpCodes.Ldarg_1);
+                if (propertyInfo.PropertyType.IsValueType)
+                {
+                    il.Emit(OpCodes.Unbox_Any, propertyInfo.PropertyType);
+                }
+                EmitCall(il, method);
+                il.Emit(OpCodes.Ret);
+            }
+            else
+            {
+                EmitThrowInvalidOperationException(il, string.Format("Cannot write to read-only property '{0}.{1}'", propertyInfo.DeclaringType.FullName, propertyInfo.Name));
+            }
+
+            return (SetterDelegate)dm.CreateDelegate(typeof(SetterDelegate));
+        }
+
+        /// <summary>
+        /// Create a new method delegate for the specified method using <see cref="System.Reflection.Emit.DynamicMethod"/>
+        /// </summary>
+        /// <param name="method">the method to create the delegate for</param>
+        /// <returns>a delegate that can be used to invoke the method.</returns>
+        private static FunctionDelegate CreateFunctionDelegate(MethodInfo method)
+        {
+            NetDynamicMethod dm = new NetDynamicMethod(string.Empty, typeof(object), new Type[] { typeof(object), typeof(object[]) }, method.DeclaringType.Module, true);
+            ILGenerator il = dm.GetILGenerator();
+            ParameterInfo[] parameters = method.GetParameters();
+            for (int i = 0; i < parameters.Length; i++)
+            {
+                ParameterInfo p = parameters[i];
+                il.Emit(OpCodes.Ldarg_1);
+                il.Emit(OpCodes.Ldc_I4, i);
+                il.Emit(OpCodes.Ldelem_Ref);
+                if (p.ParameterType.IsValueType)
+                {
+                    il.Emit(OpCodes.Unbox_Any, p.ParameterType);
+                }
+            }
+
+            if (!method.IsStatic)
+            {
+                EmitTarget(il, method.DeclaringType);
+            }
+            EmitCall(il, method);
+
+            if (method.ReturnType == typeof(void))
+            {
+                il.Emit(OpCodes.Ldnull);
+            }
+            il.Emit(OpCodes.Ret);
+            return (FunctionDelegate)dm.CreateDelegate(typeof(FunctionDelegate));
+        }
+
+        private static void EmitTarget(ILGenerator il, Type targetType)
+        {
+            il.Emit(OpCodes.Ldarg_0);
+            if (targetType.IsValueType)
+            {
+                LocalBuilder local = il.DeclareLocal(targetType);
+                il.Emit(OpCodes.Unbox_Any, targetType);
+                il.Emit(OpCodes.Stloc_0);
+                il.Emit(OpCodes.Ldloca_S, 0);
+            }
+        }
+
+        private static void EmitCall(ILGenerator il, MethodInfo method)
+        {
+            il.Emit((method.IsVirtual) ? OpCodes.Callvirt : OpCodes.Call, method);
+        }
+
+        private static void EmitConstant(ILGenerator il, object value)
+        {
+            if (value is String)
+            {
+                il.Emit(OpCodes.Ldstr, (string)value);
+                return;
+            }
+
+            if (value is bool)
+            {
+                if ((bool)value)
+                {
+                    il.Emit(OpCodes.Ldc_I4_1);
+                }
+                else
+                {
+                    il.Emit(OpCodes.Ldc_I4_0);
+                }
+                return;
+            }
+
+            if (value is Char)
+            {
+                il.Emit(OpCodes.Ldc_I4, (Char)value);
+                il.Emit(OpCodes.Conv_I2);
+                return;
+            }
+
+            if (value is byte)
+            {
+                il.Emit(OpCodes.Ldc_I4, (byte)value);
+                il.Emit(OpCodes.Conv_I1);
+            }
+            else if (value is Int16)
+            {
+                il.Emit(OpCodes.Ldc_I4, (Int16)value);
+                il.Emit(OpCodes.Conv_I2);
+            }
+            else if (value is Int32)
+            {
+                il.Emit(OpCodes.Ldc_I4, (Int32)value);
+            }
+            else if (value is Int64)
+            {
+                il.Emit(OpCodes.Ldc_I8, (Int64)value);
+            }
+            else if (value is UInt16)
+            {
+                il.Emit(OpCodes.Ldc_I4, (UInt16)value);
+                il.Emit(OpCodes.Conv_U2);
+            }
+            else if (value is UInt32)
+            {
+                il.Emit(OpCodes.Ldc_I4, (UInt32)value);
+                il.Emit(OpCodes.Conv_U4);
+            }
+            else if (value is UInt64)
+            {
+                il.Emit(OpCodes.Ldc_I8, (UInt64)value);
+                il.Emit(OpCodes.Conv_U8);
+            }
+            else if (value is Single)
+            {
+                il.Emit(OpCodes.Ldc_R4, (Single)value);
+            }
+            else if (value is Double)
+            {
+                il.Emit(OpCodes.Ldc_R8, (Double)value);
+            }
+        }
+
+        /// <summary>
+        /// Generates code that throws <see cref="InvalidOperationException"/>.
+        /// </summary>
+        /// <param name="il">IL generator to use.</param>
+        /// <param name="message">Error message to use.</param>
+        private static void EmitThrowInvalidOperationException(ILGenerator il, string message)
+        {
+            il.Emit(OpCodes.Ldstr, message);
+            il.Emit(OpCodes.Newobj, NewInvalidOperationException);
+            il.Emit(OpCodes.Throw);
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Resources/Strings.resx b/src/Spring/Spring.Core/Resources/Strings.resx
new file mode 100644
index 00000000..88d19390
--- /dev/null
+++ b/src/Spring/Spring.Core/Resources/Strings.resx
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Spring.Core.2002.csproj b/src/Spring/Spring.Core/Spring.Core.2002.csproj
new file mode 100644
index 00000000..16bc2540
--- /dev/null
+++ b/src/Spring/Spring.Core/Spring.Core.2002.csproj
@@ -0,0 +1,2383 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.0.9955"
+        SchemaVersion = "1.0"
+        ProjectGuid = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Core"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                RootNamespace = "Spring"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_0"
+                    DocumentationFile = "Spring.Core.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2002\Spring.Core\Debug-1.0\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "3"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2002\Spring.Core\Release-1.0\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
+                />
+                <Reference
+                    Name = "system.web"
+                    AssemblyName = "System.Web"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\system.web.dll"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "antlr.runtime"
+                    AssemblyName = "antlr.runtime"
+                    HintPath = "..\..\..\lib\Net\1.0\antlr.runtime.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.0\Common.Logging.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Core.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Caching\AbstractCache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\BaseCacheAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\CacheParameterAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\CacheResultAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\CacheResultItemsAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\ICache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\InvalidateCacheAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\NonExpiringCache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\AbstractQueue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\DictionarySet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\HashedSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\HybridSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\ImmutableSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\IQueue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\ISet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\LinkedList.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\ListSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\NoElementsException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\PriorityQueue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\Set.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SortedSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SynchronizedDictionaryEnumerator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SynchronizedEnumerator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SynchronizedHashtable.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SynchronizedSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\ApplicationContextException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\ApplicationEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\EventListenerAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IApplicationContextAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IApplicationEventListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IApplicationEventPublisher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IConfigurableApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IHierarchicalMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IMessageSourceAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IMessageSourceResolvable.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IResourceLoaderAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\NoSuchMessageException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Events\ConsoleListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Events\ContextEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\AbstractApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\AbstractMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\AbstractXmlApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ApplicationContextAwareProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ApplicationObjectSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ContextHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ContextRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\DefaultMessageSourceResolvable.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\DefaultSectionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\DelegatingMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\GenericApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\MessageSourceAccessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\MessageSourceResolvableVisitor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\NamespaceParsersSectionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\NullMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ResourceHandlersSectionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ResourceSetMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\StaticApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\StaticMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\TypeAliasesSectionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\TypeConvertersSectionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\XmlApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\CannotLoadObjectTypeException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\ComposedCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\ControlFlowFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\Conventions.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\CriteriaMemberFilter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IControlFlow.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\ICriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IErrorCoded.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\InvalidPropertyException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IOrdered.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodGenericArgumentsCountCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodInvocationException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodNameMatchCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodParametersCountCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodParametersCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodReturnTypeCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\NotReadablePropertyException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\NotWritablePropertyException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\NullValueInNestedPathException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\OrderComparator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\PropertyAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\PropertyChangeEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\RegularExpressionCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\RegularExpressionEventNameCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\RegularExpressionMethodNameCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeMismatchException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\AbstractResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\AssemblyResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ConfigSectionResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ConfigurableResourceLoader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\FileSystemResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\IInputStreamSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\InputStreamResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\IResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\IResourceLoader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ResourceConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ResourceHandlerRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\UrlResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\CredentialConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\CustomNumberConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\FileInfoConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\NameValueConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RegexConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RegistryKeyConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\ResourceManagerConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RGBColorConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RuntimeTypeConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\StreamConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\StringArrayConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\TimeSpanConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\TypeConversionUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\TypeConverterRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\UriConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\CachedTypeResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\GenericArgumentsHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\GenericTypeResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\ITypeResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeAssemblyHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeResolutionUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\AbstractBinding.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\AbstractSimpleBinding.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\BaseBindingContainer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\BaseBindingManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\BindingDirection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\IBinding.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\IBindingContainer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\IDataBound.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\ListBinding.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\SimpleExpressionBinding.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\.cvsignore"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Expressions\ArrayConstructorNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\AssignNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\AttributeNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\BaseNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\BinaryOperator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\BooleanLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ConstructorNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\DateLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\DefaultNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Expression.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Expression.g"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Expressions\ExpressionConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ExpressionEvaluator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ExpressionListNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\FunctionNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\HexLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\IExpression.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\IndexerNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\IntLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\LambdaExpressionNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ListInitializerNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\LocalFunctionNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\LocalVariableNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\MapEntryNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\MapInitializerNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\MethodNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\NamedArgumentNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\NodeWithArguments.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\NullLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpADD.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpAND.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpBetween.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpDIVIDE.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpEqual.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpGreater.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpGreaterOrEqual.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpIn.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpIs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpLess.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpLessOrEqual.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpLike.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpMatches.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpMODULUS.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpMULTIPLY.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpNOT.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpNotEqual.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpOR.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpPOWER.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpSUBTRACT.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpUnaryMinus.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpUnaryPlus.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ProjectionNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\PropertyOrFieldNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\QualifiedIdentifier.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\RealLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ReferenceNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\SelectionFirstNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\SelectionLastNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\SelectionNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\SpringAST.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\StringLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\TernaryNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\TypeNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\UnaryOperator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\VariableNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\ExpressionLexer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\ExpressionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\ExpressionParserTokenTypes.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\ExpressionParserTokenTypes.txt"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Expressions\Processors\AverageAggregator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\CountAggregator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\DistinctProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\ICollectionProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\MaxAggregator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\MinAggregator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\NonNullProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\OrderByProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\SortProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\SumAggregator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\AbstractLocalizer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\AbstractResourceCache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\ICultureResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\IFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\ILocalizer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\IResourceCache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\NullResourceCache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Resource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\CurrencyFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\DateTimeFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\FloatFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\IntegerFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\NumberFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\PercentFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Localizers\ResourceSetLocalizer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Resolvers\DefaultCultureResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\FatalObjectException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\IEventHandlerValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\IObjectWrapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\IPropertyValues.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\MutablePropertyValues.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\ObjectsException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\ObjectWrapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\PropertyAccessExceptionsException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\PropertyValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Events\IEventRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Events\IEventRegistryAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Events\Support\EventManipulationUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Events\Support\EventRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\FactoryObjectNotInitializedException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IGenericObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IHierarchicalObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IInitializingObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IListableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IObjectDefinitionFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IObjectFactoryAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IObjectNameAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\NoSuchObjectDefinitionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectCreationException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectCurrentlyInCreationException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectDefinitionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectDefinitionStoreException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectFactoryUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectInitializationException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectIsNotAFactoryException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectNotOfRequiredTypeException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\UnsatisfiedDependencyException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\AbstractConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\AbstractFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\AutoWiringMode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\CommandLineArgsVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConfigSectionVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConfigurationReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConnectionStringsVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConstructorArgumentValues.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\CustomConverterConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\DelegateFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\DictionaryFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\EnvironmentVariableMode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\EnvironmentVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\EventValues.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ExpressionHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\FieldRetrievingFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IAutowireCapableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IConfigurableFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IConfigurableListableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IConfigurableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IDestructionAwareObjectPostProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IInstantiationAwareObjectPostProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IObjectDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IObjectFactoryPostProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IObjectPostProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ListFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\LogFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\MethodInvokingFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectDefinitionHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectDefinitionVisitor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectFactoryCreatingFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectReferenceFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyFileVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyOverrideConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyPathFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyPlaceholderConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyResourceConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyRetrievingFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\RegistryVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ResourceHandlerConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ResourceManagerFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\RuntimeObjectReference.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\SetFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\SpecialFolderVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\TypeAliasConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\TypedStringValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\VariablePlaceholderConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Parsing\ReaderContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AbstractAutowireCapableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AbstractMethodReplacer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AbstractObjectDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AbstractObjectDefinitionReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AbstractObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AutowireUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ChildObjectDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DefaultListableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DefaultObjectDefinitionFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DefaultObjectNameGenerator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DelegatingMethodReplacer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DependencyCheckingMode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IConfigurableObjectDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IInstantiationStrategy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IManagedCollection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IMethodReplacer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IObjectDefinitionReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IObjectDefinitionRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IObjectNameGenerator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\LookupMethodOverride.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\LookupMethodReplacer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ManagedDictionary.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ManagedList.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ManagedSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\MethodInjectingInstantiationStrategy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\MethodOverride.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\MethodOverrides.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ObjectDefinitionBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ObjectDefinitionReaderUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ObjectDefinitionValidationException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\PropertiesObjectDefinitionReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ReplacedMethodOverride.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\RootObjectDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\SimpleInstantiationStrategy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\StaticListableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\AbstractObjectDefinitionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\AbstractSimpleObjectDefinitionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\AbstractSingleObjectDefinitionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DefaultObjectDefinitionDocumentReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DocumentDefaultsDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\INamespaceParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\IObjectDefinitionDocumentReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\IObjectDefinitionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\NamespaceParserAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\NamespaceParserRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\NamespaceParserSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ObjectDefinitionConstants.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ObjectDefinitionParserHelper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ObjectFactorySectionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ObjectsNamespaceParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ParserContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\spring-objects-1.1.xsd"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\spring-objects-1.1.xsx"
+                    DependentUpon = "spring-objects-1.1.xsd"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\spring-tool-1.1.xsd"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlObjectDefinitionReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlObjectDefinitionStoreException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlReaderContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\AbstractEventHandlerValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\AbstractWiringEventHandlerValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\ArgumentConvertingMethodInvoker.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\AutoWiringEventHandlerValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\InstanceEventHandlerValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\ISortDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\MethodInvoker.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\MutableSortDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\PropertyComparator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\StaticEventHandlerValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Pool\IObjectPool.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Pool\IPoolableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Pool\PoolException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Pool\Support\SimplePool.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\AbstractProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\AbstractProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\BaseProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\CompositionProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\DynamicProxyManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\InheritanceProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\IProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\IProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\IProxyTypeGenerator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\ProxyIgnoreAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\TargetProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\BaseDynamicMember.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicConstructor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicField.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicIndexer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicMethod.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicProperty.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicReflectionManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Resources\Strings.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Threading\CallContextStorage.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\ISync.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\IThreadStorage.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\Latch.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\LogicalThreadContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\Semaphore.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\SyncHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\ThreadStaticStorage.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\TimeoutException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\TimeoutSync.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\Utils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ArrayUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\AssertUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\CollectionUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\CompareUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ConfigurationUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\DelegateInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\DynamicCodeManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\EventUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\FatalReflectionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\NumberUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ObjectUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\PathMatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\PatternMatchUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\Properties.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ReflectionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ReflectionUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\StringUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\SystemUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\XmlUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\.cvsignore"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Validation\AnyValidatorGroup.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\BaseValidationAction.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\BaseValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\CollectionValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ErrorMessage.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ExclusiveValidatorGroup.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\IValidationAction.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\IValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidationErrors.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidatorGroup.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidatorReference.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Actions\ErrorMessageAction.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Actions\ExpressionAction.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Config\spring-validation-1.1.xsd"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Validation\Config\ValidationNamespaceParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\ConditionValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\CreditCardValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\EmailValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\ISBNValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\RegularExpressionValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\RequiredValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\UrlValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Core/Spring.Core.2003.csproj b/src/Spring/Spring.Core/Spring.Core.2003.csproj
new file mode 100644
index 00000000..ed343a7d
--- /dev/null
+++ b/src/Spring/Spring.Core/Spring.Core.2003.csproj
@@ -0,0 +1,2453 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Core"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = "rem $(ProjectDir)..\..\..\tools\antlr-2.7.6\antlr-2.7.6.exe -o $(ProjectDir)\Expressions\Parser $(ProjectDir)\Expressions\Expression.g"
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1;DEBUG_DYNAMIC"
+                    DocumentationFile = "Spring.Core.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = "219, 162"
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Core\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Core\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "System.Web"
+                    AssemblyName = "System.Web"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
+                />
+                <Reference
+                    Name = "antlr.runtime"
+                    AssemblyName = "antlr.runtime"
+                    HintPath = "..\..\..\lib\Net\1.1\antlr.runtime.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CommonAssemblyInfo.cs"
+                    Link = "..\CommonAssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Core.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Caching\AbstractCache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\BaseCacheAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\CacheParameterAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\CacheResultAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\CacheResultItemsAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\ICache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\InvalidateCacheAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Caching\NonExpiringCache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\AbstractQueue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\DictionarySet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\HashedSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\HybridSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\ImmutableSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\IQueue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\ISet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\LinkedList.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\ListSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\NoElementsException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\PriorityQueue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\Set.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SortedSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SynchronizedDictionaryEnumerator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SynchronizedEnumerator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SynchronizedHashtable.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SynchronizedSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\ApplicationContextException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\ApplicationEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\EventListenerAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IApplicationContextAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IApplicationEventListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IApplicationEventPublisher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IConfigurableApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IHierarchicalMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IMessageSourceAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IMessageSourceResolvable.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\IResourceLoaderAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\NoSuchMessageException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Events\ConsoleListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Events\ContextEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\AbstractApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\AbstractMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\AbstractXmlApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ApplicationContextAwareProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ApplicationObjectSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ContextHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ContextRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\DefaultMessageSourceResolvable.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\DefaultSectionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\DelegatingMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\GenericApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\MessageSourceAccessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\MessageSourceResolvableVisitor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\NamespaceParsersSectionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\NullMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ResourceHandlersSectionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ResourceSetMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\StaticApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\StaticMessageSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\TypeAliasesSectionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\TypeConvertersSectionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\XmlApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\CannotLoadObjectTypeException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\ComposedCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\ControlFlowFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\Conventions.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\CriteriaMemberFilter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IControlFlow.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\ICriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IErrorCoded.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\InvalidPropertyException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IOrdered.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodGenericArgumentsCountCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodInvocationException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodNameMatchCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodParametersCountCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodParametersCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodReturnTypeCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\NotReadablePropertyException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\NotWritablePropertyException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\NullValueInNestedPathException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\OrderComparator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\PropertyAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\PropertyChangeEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\RegularExpressionCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\RegularExpressionEventNameCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\RegularExpressionMethodNameCriteria.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeMismatchException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\AbstractResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\AssemblyResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ConfigSectionResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ConfigurableResourceLoader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\FileSystemResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\IInputStreamSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\InputStreamResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\IResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\IResourceLoader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ResourceConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ResourceHandlerRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\UrlResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\CredentialConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\CustomNumberConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\FileInfoConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\NameValueConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RegexConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RegistryKeyConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\ResourceManagerConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RGBColorConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RuntimeTypeConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\StreamConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\StringArrayConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\TimeSpanConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\TypeConversionUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\TypeConverterRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\UniqueKeyConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\UriConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\CachedTypeResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\GenericArgumentsHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\GenericTypeResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\ITypeResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeAssemblyHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeResolutionUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\AbstractBinding.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\AbstractSimpleBinding.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\BaseBindingContainer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\BaseBindingManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\BindingDirection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\IBinding.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\IBindingContainer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\IDataBound.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\ListBinding.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\SimpleExpressionBinding.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ArrayConstructorNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\AssignNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\AttributeNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\BaseNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\BinaryOperator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\BooleanLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ConstructorNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\DateLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\DefaultNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Expression.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Expression.g"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Expressions\ExpressionConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ExpressionEvaluator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ExpressionListNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\FunctionNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\HexLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\IExpression.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\IndexerNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\IntLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\LambdaExpressionNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ListInitializerNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\LocalFunctionNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\LocalVariableNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\MapEntryNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\MapInitializerNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\MethodNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\NamedArgumentNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\NodeWithArguments.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\NullLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpADD.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpAND.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpBetween.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpDIVIDE.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpEqual.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpGreater.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpGreaterOrEqual.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpIn.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpIs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpLess.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpLessOrEqual.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpLike.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpMatches.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpMODULUS.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpMULTIPLY.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpNOT.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpNotEqual.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpOR.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpPOWER.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpSUBTRACT.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpUnaryMinus.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\OpUnaryPlus.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ProjectionNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\PropertyOrFieldNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\QualifiedIdentifier.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\RealLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ReferenceNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\SelectionFirstNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\SelectionLastNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\SelectionNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\SpringAST.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\StringLiteralNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\TernaryNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\TypeNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\UnaryOperator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\VariableNode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\ExpressionLexer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\ExpressionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Parser\ExpressionParserTokenTypes.txt"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Expressions\Processors\AverageAggregator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\ConversionProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\CountAggregator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\DistinctProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\ICollectionProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\MaxAggregator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\MinAggregator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\NonNullProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\OrderByProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\ReverseProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\SortProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\Processors\SumAggregator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\AbstractLocalizer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\AbstractResourceCache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\ICultureResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\IFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\ILocalizer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\IResourceCache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\NullResourceCache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Resource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\BooleanFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\CurrencyFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\DateTimeFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\FloatFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\IntegerFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\NullFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\NumberFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\PercentFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Localizers\ResourceSetLocalizer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Resolvers\DefaultCultureResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\FatalObjectException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\IEventHandlerValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\IObjectWrapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\IPropertyValues.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\MutablePropertyValues.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\ObjectsException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\ObjectWrapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\PropertyAccessExceptionsException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\PropertyValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Events\IEventRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Events\IEventRegistryAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Events\Support\EventManipulationUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Events\Support\EventRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\FactoryObjectNotInitializedException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IGenericObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IHierarchicalObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IInitializingObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IListableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IObjectDefinitionFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IObjectFactoryAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\IObjectNameAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\NoSuchObjectDefinitionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectCreationException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectCurrentlyInCreationException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectDefinitionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectDefinitionStoreException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectFactoryUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectInitializationException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectIsNotAFactoryException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectNotOfRequiredTypeException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\UnsatisfiedDependencyException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Attributes\RequiredAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Attributes\RequiredAttributeObjectPostProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\AbstractConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\AbstractFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\AutoWiringMode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\CommandLineArgsVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConfigSectionVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConfigurationReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConnectionStringsVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConstructorArgumentValues.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\CustomConverterConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\DelegateFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\DictionaryFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\EnvironmentVariableMode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\EnvironmentVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\EventValues.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ExpressionHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\FieldRetrievingFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IAutowireCapableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IConfigurableFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IConfigurableListableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IConfigurableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IDestructionAwareObjectPostProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IInstantiationAwareObjectPostProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\InstantiationAwareObjectPostProcessorAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IObjectDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IObjectFactoryPostProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IObjectPostProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\IVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ListFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\LogFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\MethodInvokingFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectDefinitionHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectDefinitionVisitor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectFactoryCreatingFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectReferenceFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyFileVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyOverrideConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyPathFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyPlaceholderConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyResourceConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyRetrievingFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\RegistryVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ResourceHandlerConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ResourceManagerFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\RuntimeObjectReference.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\SetFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\SmartInstantiationAwareObjectPostProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\SpecialFolderVariableSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\TypeAliasConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\TypedStringValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\VariableAccessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\VariablePlaceholderConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Parsing\ReaderContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AbstractAutowireCapableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AbstractMethodReplacer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AbstractObjectDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AbstractObjectDefinitionReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AbstractObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AutowireUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ChildObjectDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DefaultListableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DefaultObjectDefinitionFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DefaultObjectNameGenerator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DelegatingMethodReplacer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DependencyCheckingMode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IConfigurableObjectDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IInstantiationStrategy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IManagedCollection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IMethodReplacer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IObjectDefinitionReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IObjectDefinitionRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IObjectNameGenerator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\LookupMethodOverride.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\LookupMethodReplacer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ManagedDictionary.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ManagedList.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ManagedSet.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\MethodInjectingInstantiationStrategy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\MethodOverride.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\MethodOverrides.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ObjectDefinitionBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ObjectDefinitionReaderUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ObjectDefinitionValidationException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\PropertiesObjectDefinitionReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ReplacedMethodOverride.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\RootObjectDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\SimpleInstantiationStrategy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\StaticListableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\AbstractObjectDefinitionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\AbstractSimpleObjectDefinitionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\AbstractSingleObjectDefinitionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DefaultObjectDefinitionDocumentReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DocumentDefaultsDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\INamespaceParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\IObjectDefinitionDocumentReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\IObjectDefinitionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\NamespaceParserAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\NamespaceParserRegistry.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\NamespaceParserSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ObjectDefinitionConstants.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ObjectDefinitionParserHelper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ObjectFactorySectionHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ObjectsNamespaceParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ParserContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\spring-objects-1.1.xsd"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\spring-tool-1.1.xsd"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlObjectDefinitionReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlObjectDefinitionStoreException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlReaderContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\AbstractEventHandlerValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\AbstractWiringEventHandlerValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\ArgumentConvertingMethodInvoker.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\AutoWiringEventHandlerValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\InstanceEventHandlerValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\ISortDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\MethodInvoker.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\MutableSortDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\PropertyComparator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\StaticEventHandlerValue.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Pool\IObjectPool.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Pool\IPoolableObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Pool\PoolException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Pool\Support\SimplePool.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\AbstractProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\AbstractProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\BaseProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\CompositionProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\DynamicProxyManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\InheritanceProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\IProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\IProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\IProxyTypeGenerator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\ProxyIgnoreAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\TargetProxyMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\BaseDynamicMember.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicConstructor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicField.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicIndexer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicMethod.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicProperty.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicReflectionManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Resources\Strings.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Threading\CallContextStorage.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\ISync.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\IThreadStorage.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\Latch.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\LogicalThreadContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\Semaphore.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\SyncHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\ThreadStaticStorage.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\TimeoutException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\TimeoutSync.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\Utils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ArrayUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\AssertUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\CollectionUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\CompareUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ConfigurationUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\DelegateInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\DynamicCodeManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\EventUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\FatalReflectionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\NumberUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ObjectUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\PathMatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\PatternMatchUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\Properties.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ReflectionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ReflectionUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\StringUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\SystemUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\UniqueKey.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\XmlUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\Generic\CollectionUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\AnyValidatorGroup.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\BaseValidationAction.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\BaseValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\CollectionValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ErrorMessage.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ExclusiveValidatorGroup.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\IValidationAction.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\IValidationErrors.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\IValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidatedAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidationErrors.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidationException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidatorGroup.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidatorReference.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Actions\ErrorMessageAction.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Actions\ExpressionAction.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Config\spring-validation-1.1.xsd"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Validation\Config\ValidationNamespaceParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\ConditionValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\CreditCardValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\EmailValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\ISBNValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\RegularExpressionValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\RequiredValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\UrlValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Core/Spring.Core.2005.csproj b/src/Spring/Spring.Core/Spring.Core.2005.csproj
new file mode 100644
index 00000000..79034c4a
--- /dev/null
+++ b/src/Spring/Spring.Core/Spring.Core.2005.csproj
@@ -0,0 +1,1066 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Core</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Core\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0;DEBUG_DYNAMIC</DefineConstants>
+    <DocumentationFile>Spring.Core.xml</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>219, 162, 618</NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningsAsErrors>1591</WarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Core\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="System" />
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Caching\BaseCacheAttribute.cs" />
+    <Compile Include="Caching\AbstractCache.cs" />
+    <Compile Include="Caching\CacheResultAttribute.cs" />
+    <Compile Include="Caching\CacheResultItemsAttribute.cs" />
+    <Compile Include="Caching\CacheParameterAttribute.cs" />
+    <Compile Include="Caching\InvalidateCacheAttribute.cs" />
+    <Compile Include="Caching\NonExpiringCache.cs" />
+    <Compile Include="Caching\ICache.cs" />
+    <Compile Include="Collections\AbstractQueue.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\DictionarySet.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\HashedSet.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\HybridSet.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\ImmutableSet.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\IQueue.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\ISet.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\LinkedList.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\ListSet.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\NoElementsException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\PriorityQueue.cs" />
+    <Compile Include="Collections\Set.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\SortedSet.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\SynchronizedDictionaryEnumerator.cs" />
+    <Compile Include="Collections\SynchronizedEnumerator.cs" />
+    <Compile Include="Collections\SynchronizedHashtable.cs" />
+    <Compile Include="Collections\SynchronizedSet.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\ApplicationContextException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\ApplicationEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\EventListenerAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Events\ConsoleListener.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Events\ContextEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\IApplicationContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\IApplicationContextAware.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\IApplicationEventListener.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\IApplicationEventPublisher.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\IConfigurableApplicationContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\IHierarchicalMessageSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\IMessageSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\IMessageSourceAware.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\IMessageSourceResolvable.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\IResourceLoaderAware.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\NoSuchMessageException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\AbstractApplicationContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\AbstractMessageSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\AbstractXmlApplicationContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\ApplicationContextAwareProcessor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\ApplicationObjectSupport.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\ContextHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\ContextRegistry.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\NamespaceParsersSectionHandler.cs" />
+    <Compile Include="Context\Support\GenericApplicationContext.cs" />
+    <Compile Include="Context\Support\TypeConvertersSectionHandler.cs" />
+    <Compile Include="Context\Support\DefaultMessageSourceResolvable.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\DefaultSectionHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\DelegatingMessageSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\MessageSourceAccessor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\MessageSourceResolvableVisitor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\NullMessageSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\ResourceSetMessageSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\ResourceHandlersSectionHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\StaticApplicationContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\StaticMessageSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\TypeAliasesSectionHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\XmlApplicationContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\CannotLoadObjectTypeException.cs" />
+    <Compile Include="Core\ComposedCriteria.cs" />
+    <Compile Include="Core\ControlFlowFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\Conventions.cs" />
+    <Compile Include="Core\IO\AbstractResource.cs" />
+    <Compile Include="Core\IO\AssemblyResource.cs" />
+    <Compile Include="Core\IO\ConfigSectionResource.cs" />
+    <Compile Include="Core\IO\ConfigurableResourceLoader.cs" />
+    <Compile Include="Core\IO\FileSystemResource.cs" />
+    <Compile Include="Core\IO\IInputStreamSource.cs" />
+    <Compile Include="Core\IO\InputStreamResource.cs" />
+    <Compile Include="Core\IO\IResource.cs" />
+    <Compile Include="Core\IO\IResourceLoader.cs" />
+    <Compile Include="Core\IO\ResourceConverter.cs" />
+    <Compile Include="Core\IO\ResourceHandlerRegistry.cs" />
+    <Compile Include="Core\IO\UrlResource.cs" />
+    <Compile Include="Core\MethodNameMatchCriteria.cs" />
+    <Compile Include="Core\MethodGenericArgumentsCountCriteria.cs" />
+    <Compile Include="Core\CriteriaMemberFilter.cs" />
+    <Compile Include="Core\IControlFlow.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\ICriteria.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\IErrorCoded.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\InvalidPropertyException.cs" />
+    <Compile Include="Core\IOrdered.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\MethodInvocationException.cs" />
+    <Compile Include="Core\MethodParametersCountCriteria.cs" />
+    <Compile Include="Core\MethodParametersCriteria.cs" />
+    <Compile Include="Core\MethodReturnTypeCriteria.cs" />
+    <Compile Include="Core\NotReadablePropertyException.cs" />
+    <Compile Include="Core\NotWritablePropertyException.cs" />
+    <Compile Include="Core\NullValueInNestedPathException.cs" />
+    <Compile Include="Core\OrderComparator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\PropertyAccessException.cs" />
+    <Compile Include="Core\PropertyChangeEventArgs.cs" />
+    <Compile Include="Core\RegularExpressionCriteria.cs" />
+    <Compile Include="Core\RegularExpressionEventNameCriteria.cs" />
+    <Compile Include="Core\RegularExpressionMethodNameCriteria.cs" />
+    <Compile Include="Core\TypeConversion\TypeConversionUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\TypeConversion\CredentialConverter.cs" />
+    <Compile Include="Core\TypeConversion\CustomNumberConverter.cs" />
+    <Compile Include="Core\TypeConversion\FileInfoConverter.cs" />
+    <Compile Include="Core\TypeConversion\NameValueConverter.cs" />
+    <Compile Include="Core\TypeConversion\RegexConverter.cs" />
+    <Compile Include="Core\TypeConversion\RegistryKeyConverter.cs" />
+    <Compile Include="Core\TypeConversion\ResourceManagerConverter.cs" />
+    <Compile Include="Core\TypeConversion\RGBColorConverter.cs" />
+    <Compile Include="Core\TypeConversion\RuntimeTypeConverter.cs" />
+    <Compile Include="Core\TypeConversion\StreamConverter.cs" />
+    <Compile Include="Core\TypeConversion\StringArrayConverter.cs" />
+    <Compile Include="Core\TypeConversion\TimeSpanConverter.cs" />
+    <Compile Include="Core\TypeConversion\TypeConverterRegistry.cs" />
+    <Compile Include="Core\TypeConversion\UriConverter.cs" />
+    <Compile Include="Core\TypeMismatchException.cs" />
+    <Compile Include="Core\TypeResolution\CachedTypeResolver.cs" />
+    <Compile Include="Core\TypeResolution\GenericArgumentsHolder.cs" />
+    <Compile Include="Core\TypeResolution\TypeAssemblyHolder.cs" />
+    <Compile Include="Core\TypeResolution\GenericTypeResolver.cs" />
+    <Compile Include="Core\TypeResolution\ITypeResolver.cs" />
+    <Compile Include="Core\TypeResolution\TypeResolutionUtils.cs" />
+    <Compile Include="Core\TypeResolution\TypeRegistry.cs" />
+    <Compile Include="Core\TypeResolution\TypeResolver.cs" />
+    <Compile Include="DataBinding\AbstractBinding.cs" />
+    <Compile Include="DataBinding\AbstractSimpleBinding.cs" />
+    <Compile Include="DataBinding\BaseBindingContainer.cs" />
+    <Compile Include="DataBinding\IBindingContainer.cs" />
+    <Compile Include="DataBinding\ListBinding.cs" />
+    <Compile Include="DataBinding\SimpleExpressionBinding.cs" />
+    <Compile Include="DataBinding\BindingDirection.cs" />
+    <Compile Include="DataBinding\BaseBindingManager.cs" />
+    <Compile Include="DataBinding\IBinding.cs" />
+    <Compile Include="DataBinding\IDataBound.cs" />
+    <Compile Include="Expressions\DefaultNode.cs" />
+    <Compile Include="Expressions\ExpressionConverter.cs" />
+    <Compile Include="Expressions\Parser\ExpressionLexer.cs" />
+    <Compile Include="Expressions\Parser\ExpressionParser.cs" />
+    <Compile Include="Expressions\Processors\AverageAggregator.cs" />
+    <Compile Include="Expressions\Processors\ConversionProcessor.cs" />
+    <Compile Include="Expressions\Processors\NonNullProcessor.cs" />
+    <Compile Include="Expressions\Processors\OrderByProcessor.cs" />
+    <Compile Include="Expressions\Processors\DistinctProcessor.cs" />
+    <Compile Include="Expressions\Processors\ReverseProcessor.cs" />
+    <Compile Include="Expressions\Processors\SortProcessor.cs" />
+    <Compile Include="Expressions\Processors\CountAggregator.cs" />
+    <Compile Include="Expressions\Processors\SumAggregator.cs" />
+    <Compile Include="Expressions\Processors\MinAggregator.cs" />
+    <Compile Include="Expressions\Processors\MaxAggregator.cs" />
+    <Compile Include="Expressions\Processors\ICollectionProcessor.cs" />
+    <Compile Include="Expressions\ArrayConstructorNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\AssignNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\BaseNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\BinaryOperator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\BooleanLiteralNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\ConstructorNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\AttributeNode.cs" />
+    <Compile Include="Expressions\LocalFunctionNode.cs" />
+    <Compile Include="Expressions\FunctionNode.cs" />
+    <Compile Include="Expressions\LocalVariableNode.cs" />
+    <Compile Include="Expressions\LambdaExpressionNode.cs" />
+    <Compile Include="Expressions\OpBetween.cs" />
+    <Compile Include="Expressions\OpMatches.cs" />
+    <Compile Include="Expressions\OpLike.cs" />
+    <Compile Include="Expressions\OpIs.cs" />
+    <Compile Include="Expressions\SelectionLastNode.cs" />
+    <Compile Include="Expressions\SelectionFirstNode.cs" />
+    <Compile Include="Expressions\SelectionNode.cs" />
+    <Compile Include="Expressions\MapEntryNode.cs" />
+    <Compile Include="Expressions\MapInitializerNode.cs" />
+    <Compile Include="Expressions\ListInitializerNode.cs" />
+    <Compile Include="Expressions\OpIn.cs" />
+    <Compile Include="Expressions\QualifiedIdentifier.cs" />
+    <Compile Include="Expressions\NamedArgumentNode.cs" />
+    <Compile Include="Expressions\DateLiteralNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\Expression.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\ExpressionEvaluator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\ExpressionListNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\HexLiteralNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\IExpression.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\IndexerNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\IntLiteralNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\MethodNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\NodeWithArguments.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\NullLiteralNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpADD.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpAND.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpDIVIDE.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpEqual.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpGreater.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpGreaterOrEqual.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpLess.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpLessOrEqual.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpMODULUS.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpMULTIPLY.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpNOT.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpNotEqual.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpOR.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpPOWER.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpSUBTRACT.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpUnaryMinus.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\OpUnaryPlus.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\ProjectionNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\PropertyOrFieldNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\RealLiteralNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\ReferenceNode.cs" />
+    <Compile Include="Expressions\SpringAST.cs" />
+    <Compile Include="Expressions\StringLiteralNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\TernaryNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\TypeNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\UnaryOperator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\VariableNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\AbstractLocalizer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\AbstractResourceCache.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\Formatters\BooleanFormatter.cs" />
+    <Compile Include="Globalization\Formatters\CurrencyFormatter.cs" />
+    <Compile Include="Globalization\Formatters\DateTimeFormatter.cs" />
+    <Compile Include="Globalization\Formatters\FilteringFormatter.cs" />
+    <Compile Include="Globalization\Formatters\FloatFormatter.cs" />
+    <Compile Include="Globalization\Formatters\HasTextFilteringFormatter.cs" />
+    <Compile Include="Globalization\Formatters\IntegerFormatter.cs" />
+    <Compile Include="Globalization\Formatters\NullFormatter.cs" />
+    <Compile Include="Globalization\Formatters\NumberFormatter.cs" />
+    <Compile Include="Globalization\Formatters\PercentFormatter.cs" />
+    <Compile Include="Globalization\ICultureResolver.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\IFormatter.cs" />
+    <Compile Include="Globalization\ILocalizer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\IResourceCache.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\Localizers\ResourceSetLocalizer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\NullResourceCache.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\Resolvers\DefaultCultureResolver.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\Resource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Attributes\RequiredAttribute.cs" />
+    <Compile Include="Objects\Factory\Attributes\RequiredAttributeObjectPostProcessor.cs" />
+    <Compile Include="Objects\Factory\Config\AbstractConfigurer.cs" />
+    <Compile Include="Objects\Factory\Config\CommandLineArgsVariableSource.cs" />
+    <Compile Include="Objects\Factory\Config\ConfigSectionVariableSource.cs" />
+    <Compile Include="Objects\Factory\Config\ConnectionStringsVariableSource.cs" />
+    <Compile Include="Objects\Factory\Config\IConfigurableFactoryObject.cs" />
+    <Compile Include="Objects\Factory\Config\InstantiationAwareObjectPostProcessorAdapter.cs" />
+    <Compile Include="Objects\Factory\Config\ObjectDefinitionHolder.cs" />
+    <Compile Include="Objects\Factory\Config\ObjectDefinitionVisitor.cs" />
+    <Compile Include="Objects\Factory\Config\ResourceHandlerConfigurer.cs" />
+    <Compile Include="Objects\Factory\Config\SmartInstantiationAwareObjectPostProcessor.cs" />
+    <Compile Include="Objects\Factory\Config\TypeAliasConfigurer.cs" />
+    <Compile Include="Objects\Factory\Config\PropertyFileVariableSource.cs" />
+    <Compile Include="Objects\Factory\Config\SpecialFolderVariableSource.cs" />
+    <Compile Include="Objects\Factory\Config\RegistryVariableSource.cs" />
+    <Compile Include="Objects\Factory\Config\EnvironmentVariableSource.cs" />
+    <Compile Include="Objects\Factory\Config\ExpressionHolder.cs" />
+    <Compile Include="Objects\Factory\Config\IVariableSource.cs" />
+    <Compile Include="Objects\Factory\Config\VariableAccessor.cs" />
+    <Compile Include="Objects\Factory\Config\VariablePlaceholderConfigurer.cs" />
+    <Compile Include="Objects\Factory\Parsing\ReaderContext.cs" />
+    <Compile Include="Objects\Factory\Support\DefaultObjectNameGenerator.cs" />
+    <Compile Include="Objects\Factory\Support\IConfigurableObjectDefinition.cs" />
+    <Compile Include="Objects\Factory\Support\IObjectNameGenerator.cs" />
+    <Compile Include="Objects\Factory\Support\ObjectDefinitionBuilder.cs" />
+    <Compile Include="Objects\Factory\Xml\AbstractObjectDefinitionParser.cs" />
+    <Compile Include="Objects\Factory\Xml\AbstractSimpleObjectDefinitionParser.cs" />
+    <Compile Include="Objects\Factory\Xml\AbstractSingleObjectDefinitionParser.cs" />
+    <Compile Include="Objects\Factory\Xml\NamespaceParserAttribute.cs" />
+    <Compile Include="Objects\Factory\Xml\ObjectFactorySectionHandler.cs" />
+    <Compile Include="Objects\Factory\Xml\DocumentDefaultsDefinition.cs" />
+    <Compile Include="Objects\Factory\Xml\IObjectDefinitionDocumentReader.cs" />
+    <Compile Include="Objects\Factory\Xml\IObjectDefinitionParser.cs" />
+    <Compile Include="Objects\Factory\Xml\NamespaceParserSupport.cs" />
+    <Compile Include="Objects\Factory\Xml\ObjectDefinitionParserHelper.cs" />
+    <Compile Include="Objects\Factory\Xml\ParserContext.cs" />
+    <Compile Include="Objects\Factory\Xml\XmlObjectDefinitionStoreException.cs" />
+    <Compile Include="Objects\Factory\Xml\XmlReaderContext.cs" />
+    <Compile Include="Objects\FatalObjectException.cs" />
+    <Compile Include="Objects\MutablePropertyValues.cs" />
+    <Compile Include="Objects\ObjectWrapper.cs" />
+    <Compile Include="Objects\Events\IEventRegistry.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Events\IEventRegistryAware.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Events\Support\EventManipulationUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Events\Support\EventRegistry.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\AbstractFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\AutoWiringMode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\ConfigurationReader.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\ConstructorArgumentValues.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\CustomConverterConfigurer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\DelegateFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\DictionaryFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\EnvironmentVariableMode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\EventValues.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\FieldRetrievingFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\IAutowireCapableObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\IConfigurableListableObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\IConfigurableObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\IDestructionAwareObjectPostProcessor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\IInstantiationAwareObjectPostProcessor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\IObjectDefinition.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\IObjectFactoryPostProcessor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\IObjectPostProcessor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\ListFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\LogFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\MethodInvokingFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\ObjectFactoryCreatingFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\ObjectReferenceFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\PropertyOverrideConfigurer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\PropertyPathFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\PropertyPlaceholderConfigurer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\PropertyResourceConfigurer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\PropertyRetrievingFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\ResourceManagerFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\RuntimeObjectReference.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\SetFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\TypedStringValue.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\FactoryObjectNotInitializedException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\IFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\IGenericObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\IHierarchicalObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\IInitializingObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\IListableObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\IObjectDefinitionFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\IObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\IObjectFactoryAware.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\IObjectNameAware.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\NoSuchObjectDefinitionException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\ObjectCreationException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\ObjectCurrentlyInCreationException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\ObjectDefinitionException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\ObjectDefinitionStoreException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\ObjectFactoryUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\ObjectInitializationException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\ObjectIsNotAFactoryException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\ObjectNotOfRequiredTypeException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\AbstractAutowireCapableObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\AbstractMethodReplacer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\AbstractObjectDefinition.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\AbstractObjectDefinitionReader.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\AbstractObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\AutowireUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\ChildObjectDefinition.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\DefaultListableObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\DefaultObjectDefinitionFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\DelegatingMethodReplacer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\DependencyCheckingMode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\IInstantiationStrategy.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\IManagedCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\IMethodReplacer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\IObjectDefinitionReader.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\IObjectDefinitionRegistry.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\LookupMethodOverride.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\LookupMethodReplacer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\ManagedDictionary.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\ManagedList.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\ManagedSet.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\MethodInjectingInstantiationStrategy.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\MethodOverride.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\MethodOverrides.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\ObjectDefinitionReaderUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\ObjectDefinitionValidationException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\PropertiesObjectDefinitionReader.cs" />
+    <Compile Include="Objects\Factory\Support\ReplacedMethodOverride.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\RootObjectDefinition.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\SimpleInstantiationStrategy.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\StaticListableObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\UnsatisfiedDependencyException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\ObjectsNamespaceParser.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\INamespaceParser.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\ObjectDefinitionConstants.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\XmlObjectDefinitionReader.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\XmlObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\NamespaceParserRegistry.cs" />
+    <Compile Include="Objects\Factory\Xml\DefaultObjectDefinitionDocumentReader.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\IEventHandlerValue.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\IObjectWrapper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\IPropertyValues.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\ObjectsException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\PropertyAccessExceptionsException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\PropertyValue.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\AbstractEventHandlerValue.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\AbstractWiringEventHandlerValue.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\ArgumentConvertingMethodInvoker.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\AutoWiringEventHandlerValue.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\InstanceEventHandlerValue.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\ISortDefinition.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\MethodInvoker.cs" />
+    <Compile Include="Objects\Support\MutableSortDefinition.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\PropertyComparator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\StaticEventHandlerValue.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Pool\IObjectPool.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Pool\IPoolableObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Pool\PoolException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Pool\Support\SimplePool.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Proxy\AbstractProxyMethodBuilder.cs" />
+    <Compile Include="Proxy\AbstractProxyTypeBuilder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Proxy\BaseProxyMethodBuilder.cs" />
+    <Compile Include="Proxy\ProxyIgnoreAttribute.cs" />
+    <Compile Include="Proxy\CompositionProxyTypeBuilder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Proxy\DynamicProxyManager.cs" />
+    <Compile Include="Proxy\InheritanceProxyTypeBuilder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Proxy\IProxyMethodBuilder.cs" />
+    <Compile Include="Proxy\IProxyTypeBuilder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Proxy\IProxyTypeGenerator.cs" />
+    <Compile Include="Proxy\TargetProxyMethodBuilder.cs" />
+    <Compile Include="Reflection\Dynamic\BaseDynamicMember.cs" />
+    <Compile Include="Reflection\Dynamic\DynamicConstructor.cs" />
+    <Compile Include="Reflection\Dynamic\DynamicField.cs" />
+    <Compile Include="Reflection\Dynamic\DynamicIndexer.cs" />
+    <Compile Include="Reflection\Dynamic\DynamicMethod.cs" />
+    <Compile Include="Reflection\Dynamic\DynamicProperty.cs" />
+    <Compile Include="Reflection\Dynamic\DynamicReflectionManager.cs" />
+    <Compile Include="Threading\CallContextStorage.cs" />
+    <Compile Include="Threading\ISync.cs" />
+    <Compile Include="Threading\IThreadStorage.cs" />
+    <Compile Include="Threading\Latch.cs" />
+    <Compile Include="Threading\LogicalThreadContext.cs" />
+    <Compile Include="Threading\Semaphore.cs" />
+    <Compile Include="Threading\SyncHolder.cs" />
+    <Compile Include="Threading\ThreadStaticStorage.cs" />
+    <Compile Include="Threading\TimeoutException.cs" />
+    <Compile Include="Threading\TimeoutSync.cs" />
+    <Compile Include="Threading\Utils.cs" />
+    <Compile Include="Util\ArrayUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\AssertUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\CollectionUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\CompareUtils.cs" />
+    <Compile Include="Util\ConfigurationUtils.cs" />
+    <Compile Include="Util\FatalReflectionException.cs" />
+    <Compile Include="Util\ObjectUtils.cs" />
+    <Compile Include="Util\ReflectionException.cs" />
+    <Compile Include="Util\SystemUtils.cs" />
+    <Compile Include="Util\DynamicCodeManager.cs" />
+    <Compile Include="Util\Generic\CollectionUtils.cs" />
+    <Compile Include="Util\PatternMatchUtils.cs" />
+    <Compile Include="Util\UniqueKey.cs" />
+    <Compile Include="Core\TypeConversion\UniqueKeyConverter.cs" />
+    <Compile Include="Util\XmlUtils.cs" />
+    <Compile Include="Util\DelegateInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\EventUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\NumberUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\PathMatcher.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\Properties.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\ReflectionUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\StringUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validation\Actions\ErrorMessageAction.cs" />
+    <Compile Include="Validation\Actions\ExpressionAction.cs" />
+    <Compile Include="Validation\AnyValidatorGroup.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validation\BaseValidationAction.cs" />
+    <Compile Include="Validation\BaseValidator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validation\Config\ValidationNamespaceParser.cs" />
+    <Compile Include="Validation\ErrorMessage.cs" />
+    <Compile Include="Validation\ExclusiveValidatorGroup.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validation\ValidatedAttribute.cs" />
+    <Compile Include="Validation\ValidationException.cs" />
+    <Compile Include="Validation\IValidationAction.cs" />
+    <Compile Include="Validation\IValidationErrors.cs" />
+    <Compile Include="Validation\IValidator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validation\ValidationErrors.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validation\ValidatorGroup.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validation\ValidatorReference.cs" />
+    <Compile Include="Validation\CollectionValidator.cs" />
+    <Compile Include="Validation\Validators\ConditionValidator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validation\Validators\CreditCardValidator.cs" />
+    <Compile Include="Validation\Validators\ISBNValidator.cs" />
+    <Compile Include="Validation\Validators\EmailValidator.cs" />
+    <Compile Include="Validation\Validators\RegularExpressionValidator.cs" />
+    <Compile Include="Validation\Validators\RequiredValidator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validation\Validators\UrlValidator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <None Include="Expressions\Expression.g" />
+    <EmbeddedResource Include="Objects\Factory\Xml\spring-tool-1.1.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Objects\Factory\Xml\spring-objects-1.1.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <None Include="Spring.Core.build" />
+    <None Include="Validation\Config\spring-validation-1.1.xsx">
+      <DependentUpon>spring-validation-1.1.xsd</DependentUpon>
+    </None>
+    <EmbeddedResource Include="Validation\Config\spring-validation-1.1.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Strings.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Expressions\Parser\ExpressionParserTokenTypes.txt" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>rem $(ProjectDir)\..\..\..\tools\antlr-2.7.6\antlr-2.7.6.exe -o $(ProjectDir)\Expressions\Parser $(ProjectDir)\Expressions\Expression.g
+</PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Spring.Core.build b/src/Spring/Spring.Core/Spring.Core.build
new file mode 100644
index 00000000..e6c26c8f
--- /dev/null
+++ b/src/Spring/Spring.Core/Spring.Core.build
@@ -0,0 +1,66 @@
+<?xml version="1.0" ?>
+<project name="Spring.Core" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+    <target name="build" depends="compileGrammar">
+        <echo message="Compiling with args ${compiler.args}" />
+        <csc target="library"
+             define="${current.build.defines.csc}"
+             warnaserror="true"
+             debug="${current.build.debug}"
+             output="${current.bin.dir}/${project::get-name()}.dll"
+             doc="${current.bin.dir}/${project::get-name()}.xml"
+            >
+            <arg line="${compiler.args}"/>
+            <nowarn>
+                <warning number="219" />
+                <warning number="162" />
+                <warning number="618" /> <!-- disable deprecation warnings (due to deprecated code generated by antlr ) -->
+                <!-- warning number="1591" / -->
+            </nowarn>
+            <sources failonempty="true">
+                <include name="**/*.cs" />
+                <include name="../GenCommonAssemblyInfo.cs" />
+<!-- not needed, but produces a lot of 1591 warnings: exclude it -->
+                <exclude name="Expressions/Parser/ExpressionParserTokenTypes.cs" />
+            </sources>
+            <resources basedir="." prefix="Spring.Objects.Factory.Xml">
+                <include name="Objects\Factory\Xml\spring-objects-1.1.xsd" />
+            </resources>
+            <resources basedir="." prefix="Spring.Objects.Factory.Xml">
+                <include name="Objects\Factory\Xml\spring-tool-1.1.xsd" />
+            </resources>
+            <resources basedir="." prefix="Spring.Validation.Config">
+                <include name="Validation\Config\spring-validation-1.1.xsd" />
+            </resources>
+            <references basedir="${current.bin.dir}">
+                <include name="Common.Logging.dll"/>
+                <include name="antlr.runtime.dll" />
+                <include name="System.Drawing.dll"/>
+                <include name="Microsoft.VisualBasic.dll"/>
+            </references>
+        </csc>
+    </target>
+
+    <!-- if on linux using mono consider using java call -->
+    <target name="compileGrammar" description="calls ANTLR to generate Lexers/Parsers">
+        <if test="${not framework::exists('mono-1.0')}">
+          <exec program="antlr-2.7.6.exe"
+                basedir="${spring.basedir}\build-support\tools\antlr-2.7.6\"
+                commandline="-o Expressions\Parser Expressions\Expression.g"
+                failonerror="true"/>
+        </if>
+        <if test="${framework::exists('mono-1.0')}">
+                <exec program="java.exe" commandline="-cp ${spring.basedir}\build-support\tools\antlr-2.7.6\antlr.jar antlr.Tool -o Expressions\Parser Expressions\Expression.g" failonerror="true"/>
+        </if>
+<!--
+        ANTLR 2.7.6 win executable has missing dependency, so we have to use JAR file
+        <exec program="java.exe" commandline="-cp ${spring.basedir}\build-support\tools\antlr-2.7.6\antlr.jar antlr.Tool -o Expressions\Parser Expressions\Expression.g" failonerror="true"/>
+-->
+    </target>
+
+</project>
diff --git a/src/Spring/Spring.Core/Spring.Core.xml b/src/Spring/Spring.Core/Spring.Core.xml
new file mode 100644
index 00000000..2ded4f5d
--- /dev/null
+++ b/src/Spring/Spring.Core/Spring.Core.xml
@@ -0,0 +1,42722 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Spring.Core</name>
+    </assembly>
+    <members>
+        <member name="T:Spring.Validation.RequiredValidator">
+            <summary>
+            Validates that required value is not empty.
+            </summary>
+            <remarks>
+            <p>
+            This validator uses following rules to determine if target value is valid:
+            <table>
+                <tr>
+                    <th>Target <see cref="T:System.Type"/></th>
+                    <th>Valid Value</th>
+                </tr>
+                <tr>
+                    <td>A <see cref="T:System.String"/>.</td>
+                    <td>Not <see lang="null"/> or an empty string.</td>
+                </tr>
+                <tr>
+                    <td>A <see cref="T:System.DateTime"/>.</td>
+                    <td>Not <see cref="F:System.DateTime.MinValue"/> and not <see cref="F:System.DateTime.MaxValue"/>.</td>
+                </tr>
+                <tr>
+                    <td>One of the number types.</td>
+                    <td>Not zero.</td>
+                </tr>
+                <tr>
+                    <td>A <see cref="T:System.Char"/>.</td>
+                    <td>Not <see cref="F:System.Char.MinValue"/> or whitespace.</td>
+                </tr>
+                <tr>
+                    <td>Any reference type other than <see cref="T:System.String"/>.</td>
+                    <td>Not <see lang="null"/>.</td>
+                </tr>
+            </table>
+            </p>
+            <p>
+            You cannot use this validator to validate any value types other than the ones
+            specified in the table above. 
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: RequiredValidator.cs,v 1.8 2008/03/21 14:12:02 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Validation.BaseValidator">
+            <summary>
+            Base class that defines common properties for all validators.
+            </summary>
+            <remarks>
+            <p>
+            Custom validators should always extend this class instead of 
+            simply implementing <see cref="T:Spring.Validation.IValidator"/> interface, in 
+            order to inherit common validator functionality.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: BaseValidator.cs,v 1.12 2008/02/05 20:40:26 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Validation.IValidator">
+            <summary>
+            An object that can validate application-specific objects.
+            </summary>
+            <remarks>
+            <p>
+            The primary motivation for this interface is to enable validation to be
+            decoupled from the (user) interface and placed in business objects.
+            </p>
+            <p>
+            Application developers writing their own custom
+            <see cref="T:Spring.Validation.IValidator"/> implementations will
+            typically not implement this interface directly. In most cases, custom
+            validators woud be better served deriving from the
+            <see lang="abstract"/> <see cref="T:Spring.Validation.BaseValidator"/> class, with the
+            custom validation ligic being implemented in an override of the
+            <see lang="abstract"/>
+            <see cref="M:Spring.Validation.BaseValidator.Validate(System.Object,Spring.Validation.IValidationErrors)"/>
+            template method.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IValidator.cs,v 1.8 2008/02/05 20:40:26 aseovic Exp $</version>
+            <seealso cref="T:Spring.Validation.BaseValidator"/>
+        </member>
+        <member name="M:Spring.Validation.IValidator.Validate(System.Object,Spring.Validation.IValidationErrors)">
+            <summary>
+            Validates the specified object.
+            </summary>
+            <param name="validationContext">The object to validate.</param>
+            <param name="errors">
+            The <see cref="T:Spring.Validation.ValidationErrors"/> instance to add any error
+            messages to in the case of validation failure.
+            </param>
+            <returns>
+            <see lang="true"/> if validation was successful.
+            </returns>
+        </member>
+        <member name="M:Spring.Validation.IValidator.Validate(System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Validates the specified object.
+            </summary>
+            <param name="validationContext">The object to validate.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors">
+            The <see cref="T:Spring.Validation.ValidationErrors"/> instance to add any error
+            messages to in the case of validation failure.
+            </param>
+            <returns>
+            <see lang="true"/> if validation was successful.
+            </returns>
+        </member>
+        <member name="M:Spring.Validation.BaseValidator.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Validation.BaseValidator"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.BaseValidator.#ctor(System.String,System.String)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Validation.BaseValidator"/> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.BaseValidator.#ctor(Spring.Expressions.IExpression,Spring.Expressions.IExpression)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Validation.BaseValidator"/> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.BaseValidator.Validate(System.Object,Spring.Validation.IValidationErrors)">
+            <summary>
+            Validates the specified object.
+            </summary>
+            <param name="validationContext">The object to validate.</param>
+            <param name="errors"><see cref="T:Spring.Validation.ValidationErrors"/> instance to add error messages to.</param>
+            <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Validation.BaseValidator.Validate(System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Validates the specified object.
+            </summary>
+            <param name="validationContext">The object to validate.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors"><see cref="T:Spring.Validation.ValidationErrors"/> instance to add error messages to.</param>
+            <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Validation.BaseValidator.Validate(System.Object)">
+            <summary>
+            Validates test object.
+            </summary>
+            <param name="objectToValidate">Object to validate.</param>
+            <returns><c>True</c> if specified object is valid, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Validation.BaseValidator.EvaluateTest(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Evaluates test expression.
+            </summary>
+            <param name="rootContext">Root context to use for expression evaluation.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <returns>Result of the test expression evaluation, or validation context if test is <c>null</c>.</returns>
+        </member>
+        <member name="M:Spring.Validation.BaseValidator.EvaluateWhen(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Evaluates when expression.
+            </summary>
+            <param name="rootContext">Root context to use for expression evaluation.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <returns><c>True</c> if the condition is true, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Validation.BaseValidator.ProcessActions(System.Boolean,System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Processes the error messages.
+            </summary>
+            <param name="isValid">Whether validator is valid or not.</param>
+            <param name="validationContext">Validation context.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors">Validation errors container.</param>
+        </member>
+        <member name="P:Spring.Validation.BaseValidator.Test">
+            <summary>
+            Gets or sets the test expression.
+            </summary>
+            <value>The test expression.</value>
+        </member>
+        <member name="P:Spring.Validation.BaseValidator.When">
+            <summary>
+            Gets or sets the expression that determines if this validator should be evaluated.
+            </summary>
+            <value>The expression that determines if this validator should be evaluated.</value>
+        </member>
+        <member name="P:Spring.Validation.BaseValidator.Actions">
+            <summary>
+            Gets or sets the validation actions.
+            </summary>
+            <value>The actions that should be executed after validation.</value>
+        </member>
+        <member name="M:Spring.Validation.RequiredValidator.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Validation.RequiredValidator"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.RequiredValidator.#ctor(System.String,System.String)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Validation.RequiredValidator"/> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.RequiredValidator.#ctor(Spring.Expressions.IExpression,Spring.Expressions.IExpression)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Validation.RequiredValidator"/> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.RequiredValidator.Validate(System.Object)">
+            <summary>
+            Validates the supplied <paramref name="objectToValidate"/>.
+            </summary>
+            <remarks>
+            In the case of the <see cref="T:Spring.Validation.RequiredValidator"/> class,
+            the test should be a variable expression that will be evaluated and the object
+            obtained as a result of this evaluation will be tested using the rules described
+            in the class overview of the <see cref="T:Spring.Validation.RequiredValidator"/>
+            class.
+            </remarks>
+            <param name="objectToValidate">The object to validate.</param>
+            <returns>
+            <see lang="true"/> if the supplied <paramref name="objectToValidate"/> is valid.
+            </returns>
+        </member>
+        <member name="T:Spring.Validation.AnyValidatorGroup">
+            <summary>
+            <see cref="T:Spring.Validation.IValidator"/> implementation that supports grouping of validators.
+            </summary>
+            <remarks>
+            <p>
+            This validator will be valid when <b>one or more</b> of the validators in the <c>Validators</c>
+            collection are valid.
+            </p>
+            <p>
+            <c>ValidationErrors</c> property will return a union of all validation error messages 
+            for the contained validators, but only if this validator is not valid (meaning, when none
+            of the contained validators are valid).
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AnyValidatorGroup.cs,v 1.9 2008/02/05 20:40:26 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Validation.ValidatorGroup">
+            <summary>
+            <see cref="T:Spring.Validation.IValidator"/> implementation that supports grouping of validators.
+            </summary>
+            <remarks>
+            <p>
+            This validator will be valid only when all of the validators in the <c>Validators</c>
+            collection are valid.
+            </p>
+            <p>
+            <c>ValidationErrors</c> property will return a union of all validation error messages 
+            for the contained validators.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ValidatorGroup.cs,v 1.10 2008/02/05 20:40:26 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Validation.ValidatorGroup.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.ValidatorGroup"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.ValidatorGroup.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.ValidatorGroup"/> class.
+            </summary>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.ValidatorGroup.#ctor(Spring.Expressions.IExpression)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.ValidatorGroup"/> class.
+            </summary>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.ValidatorGroup.Validate(System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Validates the specified object.
+            </summary>
+            <param name="validationContext">The object to validate.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors"><see cref="T:Spring.Validation.ValidationErrors"/> instance to add error messages to.</param>
+            <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Validation.ValidatorGroup.Validate(System.Object)">
+            <summary>
+            Doesn't do anything for validator group as there is no single test.
+            </summary>
+            <param name="objectToValidate">Object to validate.</param>
+            <returns><c>True</c> if specified object is valid, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="P:Spring.Validation.ValidatorGroup.Validators">
+            <summary>
+            Gets or sets the validators.
+            </summary>
+            <value>The validators.</value>
+        </member>
+        <member name="M:Spring.Validation.AnyValidatorGroup.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.AnyValidatorGroup"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.AnyValidatorGroup.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.AnyValidatorGroup"/> class.
+            </summary>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.AnyValidatorGroup.#ctor(Spring.Expressions.IExpression)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.AnyValidatorGroup"/> class.
+            </summary>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.AnyValidatorGroup.Validate(System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Validates the specified object.
+            </summary>
+            <param name="validationContext">The object to validate.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors"><see cref="T:Spring.Validation.ValidationErrors"/> instance to add error messages to.</param>
+            <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="T:Spring.Util.NumberUtils">
+            <summary>
+            Various utility methods relating to numbers.
+            </summary>
+            <remarks>
+            <p>
+            Mainly for internal use within the framework.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: NumberUtils.cs,v 1.6 2008/03/20 23:58:16 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.IsInteger(System.Object)">
+            <summary>
+            Determines whether the supplied <paramref name="number"/> is an integer.
+            </summary>
+            <param name="number">The object to check.</param>
+            <returns>
+            <see lang="true"/> if the supplied <paramref name="number"/> is an integer.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.IsDecimal(System.Object)">
+            <summary>
+            Determines whether the supplied <paramref name="number"/> is a decimal number.
+            </summary>
+            <param name="number">The object to check.</param>
+            <returns>
+            <see lang="true"/> if the supplied <paramref name="number"/> is a decimal number.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.IsNumber(System.Object)">
+            <summary>
+            Determines whether the supplied <paramref name="number"/> is of numeric type.
+            </summary>
+            <param name="number">The object to check.</param>
+            <returns>
+            	<c>true</c> if the specified object is of numeric type; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.CanConvertToInteger(System.Object)">
+            <summary>
+            Determines whether the supplied <paramref name="number"/> can be converted to an integer.
+            </summary>
+            <param name="number">The object to check.</param>
+            <returns>
+            <see lang="true"/> if the supplied <paramref name="number"/> can be converted to an integer.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.CanConvertToDecimal(System.Object)">
+            <summary>
+            Determines whether the supplied <paramref name="number"/> can be converted to an integer.
+            </summary>
+            <param name="number">The object to check.</param>
+            <returns>
+            <see lang="true"/> if the supplied <paramref name="number"/> can be converted to an integer.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.CanConvertToNumber(System.Object)">
+            <summary>
+            Determines whether the supplied <paramref name="number"/> can be converted to a number.
+            </summary>
+            <param name="number">The object to check.</param>
+            <returns>
+            	<c>true</c> if the specified object is decimal number; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.IsZero(System.Object)">
+            <summary>
+            Is the supplied <paramref name="number"/> equal to zero (0)?
+            </summary>
+            <param name="number">The number to check.</param>
+            <returns>
+            <see lang="true"/> id the supplied <paramref name="number"/> is equal to zero (0).
+            </returns>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.Negate(System.Object)">
+            <summary>
+            Negates the supplied <paramref name="number"/>.
+            </summary>
+            <param name="number">The number to negate.</param>
+            <returns>The supplied <paramref name="number"/> negated.</returns>
+            <exception cref="T:System.ArgumentException">
+            If the supplied <paramref name="number"/> is not a supported numeric type.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.Add(System.Object,System.Object)">
+            <summary>
+            Adds the specified numbers.
+            </summary>
+            <param name="m">The first number.</param>
+            <param name="n">The second number.</param>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.Subtract(System.Object,System.Object)">
+            <summary>
+            Subtracts the specified numbers.
+            </summary>
+            <param name="m">The first number.</param>
+            <param name="n">The second number.</param>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.Multiply(System.Object,System.Object)">
+            <summary>
+            Multiplies the specified numbers.
+            </summary>
+            <param name="m">The first number.</param>
+            <param name="n">The second number.</param>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.Divide(System.Object,System.Object)">
+            <summary>
+            Divides the specified numbers.
+            </summary>
+            <param name="m">The first number.</param>
+            <param name="n">The second number.</param>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.Modulus(System.Object,System.Object)">
+            <summary>
+            Calculates remainder for the specified numbers.
+            </summary>
+            <param name="m">The first number (dividend).</param>
+            <param name="n">The second number (divisor).</param>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.Power(System.Object,System.Object)">
+            <summary>
+            Raises first number to the power of the second one.
+            </summary>
+            <param name="m">The first number.</param>
+            <param name="n">The second number.</param>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.CoerceTypes(System.Object@,System.Object@)">
+            <summary>
+            Coerces the types so they can be compared.
+            </summary>
+            <param name="m">The right.</param>
+            <param name="n">The left.</param>
+        </member>
+        <member name="M:Spring.Util.NumberUtils.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Util.NumberUtils"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Util.ArrayUtils">
+            <summary>
+            Various utility methods relating to the manipulation of arrays.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ArrayUtils.cs,v 1.15 2007/02/17 08:28:12 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Util.ArrayUtils.HasLength(System.Collections.ICollection)">
+            <summary>
+            Checks if the given array or collection is null or has no elements.
+            </summary>
+            <param name="collection"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Util.ArrayUtils.AreEqual(System.Array,System.Array)">
+            <summary>
+            Tests equality of two single-dimensional arrays by checking each element
+            for equality.
+            </summary>
+            <param name="a">The first array to be checked.</param>
+            <param name="b">The second array to be checked.</param>
+            <returns>True if arrays are the same, false otherwise.</returns>
+        </member>
+        <member name="M:Spring.Util.ArrayUtils.GetHashCode(System.Array)">
+            <summary>
+            Returns hash code for an array that is generated based on the elements.
+            </summary>
+            <remarks>
+            Hash code returned by this method is guaranteed to be the same for
+            arrays with equal elements.
+            </remarks>
+            <param name="array">
+            Array to calculate hash code for.
+            </param>
+            <returns>
+            A hash code for the specified array.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.ArrayUtils.ToString(System.Array)">
+            <summary>
+            Returns string representation of an array.
+            </summary>
+            <param name="array">
+            Array to return as a string.
+            </param>
+            <returns>
+            String representation of the specified <paramref name="array"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Threading.Utils">
+            <summary>
+            Support to account for differences between java nad .NET:
+            <ul>
+            </ul>
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.Utils.FailFastIfInterrupted">
+            <summary>
+            .NET threads have not a method to check if they have been interrupted.
+            Moreover, differently from java threads, when entering <c>lock</c>ed
+            blocks, Monitor, Sleep, SpinWait and so on, a <see cref="T:System.Threading.ThreadInterruptedException"/> 
+            will be raised by the runtime.
+            <p/>Spring.Threading classes usually call this method before entering a lock block, to mirror java code
+            <p>Usually this is non issue because the same exception will be raised entering the monitor 
+            associated with the lock (<seealso href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfsystemthreadingmonitorclassentertopic.asp"/>) 
+            </p>
+            </summary>
+            <exception cref="T:System.Threading.ThreadInterruptedException">if the thread has been interrupted</exception>
+        </member>
+        <member name="M:Spring.Threading.Utils.ToTimeMillis(System.DateTime)">
+            <summary>
+            Normalize the given <see cref="T:System.DateTime"/> so that 
+            is is comparable with <see cref="P:Spring.Threading.Utils.CurrentTimeMillis"/>.
+            </summary>
+            <param name="date">Date.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Threading.Utils.DeltaTimeMillis(System.DateTime,System.DateTime)">
+            <summary>
+            
+            </summary>
+            <param name="one"></param>
+            <param name="another"></param>
+            <returns>the difference between millisecodns of the first and second date</returns>
+        </member>
+        <member name="M:Spring.Threading.Utils.CurrentNanoSeconds">
+            <summary>
+            Returns the number of nanoseconds for the current value of <see cref="P:System.DateTime.Now"/>
+            </summary>
+            <returns>Current number of nanoseconds</returns>
+        </member>
+        <member name="M:Spring.Threading.Utils.TimeSpanNanoSeconds(System.TimeSpan)">
+            <summary>
+            Returns the number of nano seconds represented by the <paramref name="timeSpan"/>
+            </summary>
+            <param name="timeSpan"><see cref="T:System.TimeSpan"/> to use</param>
+            <returns>Number of nano seconds for <parmref name="timeSpan"/></returns>
+        </member>
+        <member name="M:Spring.Threading.Utils.NanoSecondsTimeSpan(System.Int64)">
+            <summary>
+            Returns a <see cref="T:System.TimeSpan"/> representing the number of nanoseconds passed in via <paramref name="nanoSeconds"/>.
+            </summary>
+            <param name="nanoSeconds">Number of nanoseconds.</param>
+            <returns><see cref="T:System.TimeSpan"/> representing the number of nanoseconds passed in.</returns>
+        </member>
+        <member name="P:Spring.Threading.Utils.CurrentTimeMillis">
+            <summary>
+            Placeholder for <c>java.lang.System.currentTimeMillis</c>
+            </summary>
+            <returns>The current machine time in milliseconds</returns>
+        </member>
+        <member name="P:Spring.Threading.Utils.ThreadInterrupted">
+            <summary>
+            Has been interrupted this thread
+            </summary>
+        </member>
+        <member name="T:Spring.Threading.TimeoutSync">
+            <summary> A TimeoutSync is an adaptor class that transforms all
+            calls to acquire to instead invoke attempt with a predetermined
+            timeout value.
+            </summary>
+            <seealso cref="T:Spring.Threading.ISync"/>		
+        </member>
+        <member name="T:Spring.Threading.ISync">
+            <summary>
+            Acquire/Release protocol, base of many concurrency utilities.
+            </summary>
+            
+            <remarks>
+            <p><see cref="T:Spring.Threading.ISync"/> objects isolate waiting and notification for particular logical 
+            states, resource availability, events, and the like that are shared 
+            across multiple threads.</p>
+            
+            <p>Use of <see cref="T:Spring.Threading.ISync"/>s sometimes (but by no means always) adds 
+            flexibility and efficiency compared to the use of plain 
+            .Net monitor methods and locking, and are sometimes (but by no means 
+            always) simpler to program with.</p>
+            
+            <p>Used for implementation of a <see cref="T:Spring.Pool.Support.SimplePool"/></p>
+            </remarks>
+            
+            <author>Doug Lea</author>
+            <author>Federico Spinazzi (.Net)</author>
+            <version>$Id: ISync.cs,v 1.6 2006/09/15 19:06:08 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Threading.ISync.Acquire">
+            <summary>  Wait (possibly forever) until successful passage.
+            Fail only upon interuption. Interruptions always result in
+            `clean' failures. On failure,  you can be sure that it has not 
+            been acquired, and that no 
+            corresponding release should be performed. Conversely,
+            a normal return guarantees that the acquire was successful.
+            
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.ISync.Release">
+            <summary> Potentially enable others to pass.
+            <p>
+            Because release does not raise exceptions, 
+            it can be used in `finally' clauses without requiring extra
+            embedded try/catch blocks. But keep in mind that
+            as with any java method, implementations may 
+            still throw unchecked exceptions such as Error or NullPointerException
+            when faced with uncontinuable errors. However, these should normally
+            only be caught by higher-level error handlers.
+            </p>
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.ISync.Attempt(System.Int64)">
+            <summary>
+            Wait at most msecs to pass; report whether passed. 
+            <p>
+            The method has best-effort semantics:
+            The msecs bound cannot
+            be guaranteed to be a precise upper bound on wait time in Java.
+            Implementations generally can only attempt to return as soon as possible
+            after the specified bound. Also, timers in Java do not stop during garbage
+            collection, so timeouts can occur just because a GC intervened.
+            So, msecs arguments should be used in
+            a coarse-grained manner. Further,
+            implementations cannot always guarantee that this method
+            will return at all without blocking indefinitely when used in
+            unintended ways. For example, deadlocks may be encountered
+            when called in an unintended context.
+            </p>
+            </summary>
+            <param name="msecs">the number of milleseconds to wait
+            An argument less than or equal to zero means not to wait at all. 
+            However, this may still require
+            access to a synchronization lock, which can impose unbounded
+            delay if there is a lot of contention among threads.
+            </param>
+            <returns>true if acquired</returns>
+        </member>
+        <member name="F:Spring.Threading.TimeoutSync.sync_">
+            <summary>
+            the adapted sync
+            </summary>
+        </member>
+        <member name="F:Spring.Threading.TimeoutSync.timeout_">
+            <summary>
+            timeout value
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.TimeoutSync.#ctor(Spring.Threading.ISync,System.Int64)">
+            <summary> Create a TimeoutSync using the given Sync object, and
+            using the given timeout value for all calls to acquire.
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.TimeoutSync.Acquire">
+            <summary>
+            Try to acquire the sync before the timeout
+            </summary>
+            <exception cref="T:Spring.Threading.TimeoutException">In case a time out occurred</exception>
+        </member>
+        <member name="M:Spring.Threading.TimeoutSync.Attempt(System.Int64)">
+            <summary>
+            <see cref="M:Spring.Threading.ISync.Attempt(System.Int64)"/>
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.TimeoutSync.Release">
+            <summary>
+            <see cref="M:Spring.Threading.ISync.Release"/>
+            </summary>
+        </member>
+        <member name="T:Spring.Threading.SyncHolder">
+            <summary>
+            Utility class to use an <see cref="T:Spring.Threading.ISync"/> with the 
+            C# <c>using () {}</c> idiom
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.SyncHolder.#ctor(Spring.Threading.ISync)">
+            <summary>
+            Creates a new <see cref="T:Spring.Threading.SyncHolder"/> trying to <see cref="M:Spring.Threading.ISync.Acquire"/> the given 
+            <see cref="T:Spring.Threading.ISync"/>
+            </summary>
+            <param name="sync">the <see cref="T:Spring.Threading.ISync"/> to be held</param>
+        </member>
+        <member name="M:Spring.Threading.SyncHolder.#ctor(Spring.Threading.ISync,System.Int64)">
+            <summary>
+            Creates a new <see cref="T:Spring.Threading.SyncHolder"/> trying to <see cref="M:Spring.Threading.ISync.Attempt(System.Int64)"/> the given 
+            <see cref="T:Spring.Threading.ISync"/>
+            </summary>
+            <param name="sync">the <see cref="T:Spring.Threading.ISync"/> to be held</param>
+            <param name="msecs">millisecond to try to acquire the lock</param>
+        </member>
+        <member name="M:Spring.Threading.SyncHolder.Dispose">
+            <summary>
+            Releases the held <see cref="T:Spring.Threading.ISync"/>
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.SyncHolder.Init(Spring.Threading.ISync)">
+            <summary>
+            initializes and acquire access to the <see cref="T:Spring.Threading.ISync"/>
+            </summary>
+            <param name="sync"></param>
+        </member>
+        <member name="T:Spring.Proxy.IProxyMethodBuilder">
+            <summary>
+            Defines interface that proxy method builders have to implement.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Bruno Baia</author>
+            <version>$Id: IProxyMethodBuilder.cs,v 1.1 2006/08/10 18:45:55 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Proxy.IProxyMethodBuilder.BuildProxyMethod(System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Dynamically builds proxy method.
+            </summary>
+            <param name="method">The method to proxy.</param>
+            <param name="intfMethod">
+            The interface definition of the method, if applicable.
+            </param>
+            <returns>
+            The <see cref="T:System.Reflection.Emit.MethodBuilder"/> for the proxy method.
+            </returns>
+        </member>
+        <member name="T:Spring.Proxy.CompositionProxyTypeBuilder">
+            <summary>
+            Builds a proxy type using composition.
+            </summary>
+            <remarks>
+            <note>
+            In order for this builder to work, the target <b>must</b> implement
+            one or more interfaces.
+            </note>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <author>Bruno Baia</author>
+            <version>$Id: CompositionProxyTypeBuilder.cs,v 1.12 2007/03/27 02:27:43 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Proxy.AbstractProxyTypeBuilder">
+            <summary>
+            Base class for proxy builders that can be used 
+            to create a proxy for any class.
+            </summary>
+            <remarks>
+            <p>
+            This <see langword="abstract"/> class provides a set of template
+            methods that derived classes can override to provide custom behaviour
+            appropriate to the type of proxy that is being generated (one of
+            inheritance or composition-based proxying).
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <author>Bruno Baia</author>
+            <version>$Id: AbstractProxyTypeBuilder.cs,v 1.33 2007/12/07 17:59:20 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Proxy.IProxyTypeBuilder">
+            <summary>
+            Describes the operations for a generic proxy type builder that can be
+            used to create a proxy type for any class.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IProxyTypeBuilder.cs,v 1.8 2007/06/20 15:59:54 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Proxy.IProxyTypeBuilder.BuildProxyType">
+            <summary>
+            Creates the proxy type.
+            </summary>
+            <returns>The generated proxy class.</returns>
+        </member>
+        <member name="P:Spring.Proxy.IProxyTypeBuilder.Name">
+            <summary>
+            The name of the proxy <see cref="T:System.Type"/>.
+            </summary>
+            <value>The name of the proxy <see cref="P:Spring.Proxy.IProxyTypeBuilder.TargetType"/>.</value>
+        </member>
+        <member name="P:Spring.Proxy.IProxyTypeBuilder.TargetType">
+            <summary>
+            The <see cref="T:System.Type"/> of the target object.
+            </summary>
+        </member>
+        <member name="P:Spring.Proxy.IProxyTypeBuilder.BaseType">
+            <summary>
+            The <see cref="T:System.Object"/> of the class that the proxy must
+            inherit from.
+            </summary>
+        </member>
+        <member name="P:Spring.Proxy.IProxyTypeBuilder.Interfaces">
+            <summary>
+            Gets or sets the list of interfaces proxy should implement.
+            </summary>
+        </member>
+        <member name="P:Spring.Proxy.IProxyTypeBuilder.ProxyTargetAttributes">
+            <summary>
+            Should we proxy target attributes?
+            </summary>
+            <remarks>
+            <see langword="True"/> by default.
+            Target type attributes, method attributes, method's return type attributes 
+            and method's parameter attributes are copied to the proxy.
+            </remarks>
+        </member>
+        <member name="P:Spring.Proxy.IProxyTypeBuilder.TypeAttributes">
+            <summary>
+            The list of custom <see cref="T:System.Attribute"/>s that the proxy
+            class must be decorated with.
+            </summary>
+            <remarks>
+            <p>
+            Note that the list is composed of instances of the actual
+            <see cref="T:System.Attribute"/>s that are to be applied, not the
+            <see cref="T:System.Attribute"/>s of the <see cref="T:System.Type"/>s.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            The following code snippets show examples of how to decorate the
+            the proxied class with one or more <see cref="T:System.Attribute"/>s.
+            </p>
+            <code language="C#">
+            // get a concrete implementation of an IProxyTypeBuilder...
+            IProxyTypeBuilder builder = ... ;
+            builder.TargetType = typeof( ... );
+            
+            IDictionary typeAtts = new Hashtable();
+            builder.TypeAttributes = typeAtts;
+            
+            // applies a single Attribute to the proxied class...
+            typeAtts = new Attribute[] { new MyCustomAttribute() });
+            
+            // applies a number of Attributes to the proxied class...
+            typeAtts = new Attribute[]
+                {
+            		new MyCustomAttribute(),
+            		new AnotherAttribute(),
+                });
+            </code>
+            </example>
+        </member>
+        <member name="P:Spring.Proxy.IProxyTypeBuilder.MemberAttributes">
+            <summary>
+            The custom <see cref="T:System.Attribute"/>s that the proxy
+            members must be decorated with.
+            </summary>
+            <remarks>
+            <p>
+            This dictionary must use simple <see cref="T:System.String"/>s for keys
+            (denoting the member names that the attributes are to be applied to),
+            with the corresponding values being
+            <see cref="T:System.Collections.IList"/>s.
+            </p>
+            <p>
+            The key may be wildcarded using the <c>'*'</c> character... if so,
+            then those proxy members that match against the key will be
+            decorated with the attendant list of
+            <see cref="T:System.Attribute"/>s. This naturally implies that using
+            the <c>'*'</c> character as a key will result in the attendant list
+            of <see cref="T:System.Attribute"/>s being applied to every member of
+            the proxied class.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            The following code snippets show examples of how to decorate the
+            members of a proxied class with one or more
+            <see cref="T:System.Attribute"/>s.
+            </p>
+            <code language="C#">
+            // get a concrete implementation of an IProxyTypeBuilder...
+            IProxyTypeBuilder builder = ... ;
+            builder.TargetType = typeof( ... );
+            
+            IDictionary memAtts = new Hashtable();
+            builder.MemberAttributes = memAtts;
+            
+            // applies a single Attribute to all members of the proxied class...
+            memAtts ["*"] = new Attribute[] { new MyCustomAttribute() });
+            
+            // applies a number of Attributes to all members of the proxied class...
+            memAtts ["*"] = new Attribute[]
+                {
+            		new MyCustomAttribute(),
+            		new AnotherAttribute(),
+                });
+            
+            // applies a single Attribute to those members of the proxied class
+            //     that have identifiers starting with 'Do' ...
+            memAtts ["Do*"] = new Attribute[] { new MyCustomAttribute() });
+            
+            // applies a number of Attributes to those members of the proxied class
+            //     that have identifiers starting with 'Do' ...
+            memAtts ["Do*"] = new Attribute[]
+                {
+            		new MyCustomAttribute(),
+            		new AnotherAttribute(),
+                }); 
+            </code>
+            </example>
+        </member>
+        <member name="T:Spring.Proxy.IProxyTypeGenerator">
+            <summary>
+            Describes the operations that generates IL instructions 
+            used to build the proxy type.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: IProxyTypeGenerator.cs,v 1.3 2006/11/12 01:37:47 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Proxy.IProxyTypeGenerator.PushProxy(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the proxy instance on stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Proxy.IProxyTypeGenerator.PushTarget(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the target instance on which calls should be delegated to.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="F:Spring.Proxy.AbstractProxyTypeBuilder.log">
+            <summary>
+            The shared <see cref="T:Common.Logging.ILog"/> instance for this class (and derived classes).
+            </summary>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.BuildProxyType">
+            <summary>
+            Creates the proxy type.
+            </summary>
+            <returns>The generated proxy class.</returns>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.PushProxy(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the proxy instance on stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.PushTarget(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the target instance on which calls should be delegated to.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.CreateTypeBuilder(System.String,System.Type)">
+            <summary>
+            Creates an appropriate type builder.
+            </summary>
+            <param name="name">The name to use for the proxy type name.</param>
+            <param name="baseType">The type to extends if provided.</param>
+            <returns>The type builder to use.</returns>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.ApplyTypeAttributes(System.Reflection.Emit.TypeBuilder,System.Type)">
+            <summary>
+            Applies attributes to the proxy class.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="targetType">The proxied class.</param>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.ProxyTargetAttributes"/>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.TypeAttributes"/>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.ApplyMethodAttributes(System.Reflection.Emit.MethodBuilder,System.Reflection.MethodInfo)">
+            <summary>
+            Applies attributes to the proxied method.
+            </summary>
+            <param name="methodBuilder">The method builder to use.</param>
+            <param name="targetMethod">The proxied method.</param>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.ProxyTargetAttributes"/>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.MemberAttributes"/>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.ApplyMethodReturnTypeAttributes(System.Reflection.Emit.MethodBuilder,System.Reflection.MethodInfo)">
+            <summary>
+            Applies attributes to the proxied method's return type.
+            </summary>
+            <param name="methodBuilder">The method builder to use.</param>
+            <param name="targetMethod">The proxied method.</param>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.ProxyTargetAttributes"/>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.ApplyMethodParameterAttributes(System.Reflection.Emit.MethodBuilder,System.Reflection.MethodInfo)">
+            <summary>
+            Applies attributes to proxied method's parameters.
+            </summary>
+            <param name="methodBuilder">The method builder to use.</param>
+            <param name="targetMethod">The proxied method.</param>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.ProxyTargetAttributes"/>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.GetTypeAttributes(System.Type)">
+            <summary>
+            Calculates and returns the list of attributes that apply to the
+            specified type.
+            </summary>
+            <param name="type">The type to find attributes for.</param>
+            <returns>
+            A list of custom attributes that should be applied to type.
+            </returns>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.ProxyTargetAttributes"/>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.TypeAttributes"/>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.GetMethodAttributes(System.Reflection.MethodInfo)">
+            <summary>
+            Calculates and returns the list of attributes that apply to the
+            specified method.
+            </summary>
+            <param name="method">The method to find attributes for.</param>
+            <returns>
+            A list of custom attributes that should be applied to method.
+            </returns>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.ProxyTargetAttributes"/>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.MemberAttributes"/>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.GetMethodReturnTypeAttributes(System.Reflection.MethodInfo)">
+            <summary>
+            Calculates and returns the list of attributes that apply to the
+            specified method's return type.
+            </summary>
+            <param name="method">The method to find attributes for.</param>
+            <returns>
+            A list of custom attributes that should be applied to method's return type.
+            </returns>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.ProxyTargetAttributes"/>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.GetMethodParameterAttributes(System.Reflection.MethodInfo,System.Reflection.ParameterInfo)">
+            <summary>
+            Calculates and returns the list of attributes that apply to the
+            specified method's parameters.
+            </summary>
+            <param name="method">The method to find attributes for.</param>
+            <param name="paramInfo">The method's parameter to find attributes for.</param>
+            <returns>
+            A list of custom attributes that should be applied to the specified method's parameter.
+            </returns>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.ProxyTargetAttributes"/>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.IsAttributeMatchingType(System.Object,System.Type)">
+            <summary>
+            Check that the specified object is matching the passed attribute type.
+            </summary>
+            <remarks>
+            <p>
+            The specified object can be of different type :
+            </p>
+            <list type="bullet">
+            <item>
+            <see cref="T:System.Attribute"/>
+            </item>
+            <item>
+            System.Reflection.CustomAttributeData (Only with .NET 2.0)
+            </item>
+            <item>
+            <see cref="T:System.Reflection.Emit.CustomAttributeBuilder"/>
+            </item>
+            </list>
+            </remarks>
+            <param name="attr">The object instance to check.</param>
+            <param name="attrType">The attribute type to test against.</param>
+            <returns>
+            <see langword="true"/> if the object instance matches the attribute type;
+            otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.DefineConstructorParameters(System.Reflection.ConstructorInfo)">
+            <summary>
+            Defines the types of the parameters for the specified constructor.
+            </summary>
+            <param name="constructor">The constructor to use.</param>
+            <returns>The types for constructor's parameters.</returns>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.ImplementConstructors(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements constructors for the proxy class.
+            </summary>
+            <param name="typeBuilder">
+            The <see cref="T:System.Type"/> builder to use.
+            </param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.GenerateConstructor(System.Reflection.Emit.ConstructorBuilder,System.Reflection.Emit.ILGenerator,System.Reflection.ConstructorInfo)">
+            <summary>
+            Generates the proxy constructor.
+            </summary>
+            <param name="builder">The constructor builder to use.</param>
+            <param name="il">The IL generator to use.</param>
+            <param name="constructor">The constructor to use.</param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.ImplementInterface(System.Reflection.Emit.TypeBuilder,Spring.Proxy.IProxyMethodBuilder,System.Type,System.Type)">
+            <summary>
+            Implements an interface.
+            </summary>
+            <remarks>
+            Generates proxy methods that belongs to the interface 
+            using the specified <paramref name="proxyMethodBuilder"/>.
+            </remarks>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="proxyMethodBuilder">
+            The <see cref="T:Spring.Proxy.IProxyMethodBuilder"/> implementation to use
+            </param>
+            <param name="intf">The interface to implement.</param>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> of the target object.
+            </param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.ImplementInterface(System.Reflection.Emit.TypeBuilder,Spring.Proxy.IProxyMethodBuilder,System.Type,System.Type,System.Boolean)">
+            <summary>
+            Implements an interface.
+            </summary>
+            <remarks>
+            Generates proxy methods that belongs to the interface 
+            using the specified <paramref name="proxyMethodBuilder"/>.
+            </remarks>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="proxyMethodBuilder">
+            The <see cref="T:Spring.Proxy.IProxyMethodBuilder"/> implementation to use
+            </param>
+            <param name="intf">The interface to implement.</param>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> of the target object.
+            </param>
+            <param name="proxyVirtualMethods">
+            <see langword="false"/> if target virtual methods should not be proxied;
+            otherwise <see langword="true"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.GetInterfaceMapping(System.Type,System.Type)">
+            <summary>
+            Gets the mapping of the interface to proxy 
+            into the actual methods on the target type 
+            that does not need to implement that interface.
+            </summary>
+            <remarks>
+            <p>
+            If the target type does not implement the interface, 
+            we return the interfaces methods as the target methods for many reasons :
+            <ul>
+            <li>
+            The target object can change for an object that implements the interface.
+            (See 'Spring.Aop.Framework.DynamicProxy.IAdvisedProxyMethodBuilder' 
+            implementation in the Spring AOP framework for an example)
+            </li>
+            <li>
+            Allow Transparent proxies to be proxied.
+            (See Spring Remoting framework for an example)
+            </li>
+            <li>
+            Allow null target to be proxied.
+            (See Spring AOP framework which avoid calls to the target object 
+            by intercepting all methods. Think "dynamic mock")
+            (See 'Spring.Web.Services.WebServiceProxyFactory' implementation for another example)
+            </li>
+            </ul>
+            </p>
+            </remarks>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> of the target object.
+            </param>
+            <param name="intf">The interface to implement.</param>
+            <returns>
+            An interface mapping for the interface to proxy.
+            </returns>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.InheritType(System.Reflection.Emit.TypeBuilder,Spring.Proxy.IProxyMethodBuilder,System.Type)">
+            <summary>
+            Inherit from a type.
+            </summary>
+            <remarks>
+            Generates proxy methods for base virtual methods 
+            using the specified <paramref name="proxyMethodBuilder"/>.
+            </remarks>
+            <param name="typeBuilder">
+            The <see cref="T:System.Type"/> builder to use for code generation.
+            </param>
+            <param name="proxyMethodBuilder">
+            The <see cref="T:Spring.Proxy.IProxyMethodBuilder"/> implementation to use to override base virtual methods.
+            </param>
+            <param name="type">The <see cref="T:System.Type"/> to inherit from.</param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.InheritType(System.Reflection.Emit.TypeBuilder,Spring.Proxy.IProxyMethodBuilder,System.Type,System.Boolean)">
+            <summary>
+            Inherit from a type.
+            </summary>
+            <remarks>
+            Generates proxy methods for base virtual methods 
+            using the specified <paramref name="proxyMethodBuilder"/>.
+            </remarks>
+            <param name="typeBuilder">
+            The <see cref="T:System.Type"/> builder to use for code generation.
+            </param>
+            <param name="proxyMethodBuilder">
+            The <see cref="T:Spring.Proxy.IProxyMethodBuilder"/> implementation to use to override base virtual methods.
+            </param>
+            <param name="type">The <see cref="T:System.Type"/> to inherit from.</param>
+            <param name="declaredMembersOnly">
+            <see langword="true"/> if only members declared at the level 
+            of the supplied <paramref name="type"/>'s hierarchy should be proxied; 
+            otherwise <see langword="false"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.ImplementProperty(System.Reflection.Emit.TypeBuilder,System.Type,System.Reflection.PropertyInfo,System.Collections.IDictionary)">
+            <summary>
+            Implements the specified <paramref name="property"/>.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="type">The type the property is defined on.</param>
+            <param name="property">The property to proxy.</param>
+            <param name="methodMap">The implemented methods map.</param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.ImplementEvent(System.Reflection.Emit.TypeBuilder,System.Type,System.Reflection.EventInfo,System.Collections.IDictionary)">
+            <summary>
+            Implements the specified event.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="type">The type the event is defined on.</param>
+            <param name="evt">The event to proxy.</param>
+            <param name="methodMap">The implemented methods map.</param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.GetProxiableInterfaces(System.Type[])">
+            <summary>
+            Returns an array of <see cref="T:System.Type"/>s that represent 
+            the proxiable interfaces.
+            </summary>
+            <remarks>
+            An interface is proxiable if it's not marked with the 
+            <see cref="T:Spring.Proxy.ProxyIgnoreAttribute"/>.
+            </remarks>
+            <param name="interfaces">
+            The array of interfaces from which 
+            we want to get the proxiable interfaces.
+            </param>
+            <returns>
+            An array containing the interface <see cref="T:System.Type"/>s.
+            </returns>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyTypeBuilder.IsSpecialInterface(System.Type)">
+            <summary>
+            Checks if specified interface is of a special type 
+            that should never be proxied (i.e. ISerializable).
+            </summary>
+            <param name="intf">Interface type to check.</param>
+            <returns>
+            <c>true</c> if it is, <c>false</c> otherwise.
+            </returns>
+        </member>
+        <member name="P:Spring.Proxy.AbstractProxyTypeBuilder.Name">
+            <summary>
+            The name of the proxy <see cref="T:System.Type"/>.
+            </summary>
+            <value>The name of the proxy <see cref="T:System.Type"/>.</value>
+        </member>
+        <member name="P:Spring.Proxy.AbstractProxyTypeBuilder.TargetType">
+            <summary>
+            The <see cref="T:System.Type"/> of the target object.
+            </summary>
+        </member>
+        <member name="P:Spring.Proxy.AbstractProxyTypeBuilder.BaseType">
+            <summary>
+            The <see cref="T:System.Type"/> of the class that the proxy must
+            inherit from.
+            </summary>
+            <remarks>
+            <p>
+            The default value of this property is the
+            <see cref="T:System.Object"/> <see cref="T:System.Type"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Proxy.AbstractProxyTypeBuilder.Interfaces">
+            <summary>
+            Gets or sets the list of interfaces proxy should implement.
+            </summary>
+            <remarks>
+            The default value of this property is all the interfaces 
+            implemented or inherited by the target type.
+            </remarks>
+        </member>
+        <member name="P:Spring.Proxy.AbstractProxyTypeBuilder.ProxyTargetAttributes">
+            <summary>
+            Should we proxy target attributes?
+            </summary>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.ProxyTargetAttributes"/>
+        </member>
+        <member name="P:Spring.Proxy.AbstractProxyTypeBuilder.TypeAttributes">
+            <summary>
+            The list of custom <see cref="T:System.Attribute"/>s that the proxy
+            class must be decorated with.
+            </summary>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.TypeAttributes"/>
+        </member>
+        <member name="P:Spring.Proxy.AbstractProxyTypeBuilder.MemberAttributes">
+            <summary>
+            The custom <see cref="T:System.Attribute"/>s that the proxy
+            members must be decorated with.
+            </summary>
+            <see cref="P:Spring.Proxy.IProxyTypeBuilder.MemberAttributes"/>
+        </member>
+        <member name="F:Spring.Proxy.CompositionProxyTypeBuilder.targetInstance">
+            <summary>
+            Target instance calls should be delegated to.
+            </summary>
+        </member>
+        <member name="M:Spring.Proxy.CompositionProxyTypeBuilder.#ctor">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Proxy.CompositionProxyTypeBuilder"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Proxy.CompositionProxyTypeBuilder.BuildProxyType">
+            <summary>
+            Creates a proxy that delegates calls to an instance of the
+            target object.
+            </summary>
+            <remarks>
+            <p>
+            Only interfaces can be proxied using composition, so the target
+            <b>must</b> implement one or more interfaces.
+            </p>
+            </remarks>
+            <returns>The generated proxy class.</returns>
+            <exception cref="T:System.ArgumentException">
+            If the <see cref="P:Spring.Proxy.IProxyTypeBuilder.TargetType"/>
+            does not implement any interfaces.
+            </exception>
+        </member>
+        <member name="M:Spring.Proxy.CompositionProxyTypeBuilder.PushTarget(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the target instance on which calls should be delegated to.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Proxy.CompositionProxyTypeBuilder.DeclareTargetInstanceField(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Deaclares a field that holds the target object instance.
+            </summary>
+            <param name="builder">
+            The <see cref="T:System.Type"/> builder to use for code generation.
+            </param>
+        </member>
+        <member name="M:Spring.Proxy.CompositionProxyTypeBuilder.GenerateConstructor(System.Reflection.Emit.ConstructorBuilder,System.Reflection.Emit.ILGenerator,System.Reflection.ConstructorInfo)">
+            <summary>
+            Generates the proxy constructor.
+            </summary>
+            <remarks>
+            <p>
+            This implementation creates instance of the target object for delegation
+            using constructor arguments.
+            </p>
+            </remarks>
+            <param name="builder">The constructor builder to use.</param>
+            <param name="il">The IL generator to use.</param>
+            <param name="constructor">The constructor to delegate the creation to.</param>
+        </member>
+        <member name="P:Spring.Proxy.CompositionProxyTypeBuilder.ExplicitInterfaceImplementation">
+            <summary>
+            Gets or sets a value indicating whether interfaces should be implemented explicitly.
+            </summary>
+            <value>
+            <see langword="true"/> if they should be; otherwise, <see langword="false"/>.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.Support.PropertyComparator">
+            <summary>
+            Performs a comparison of two objects, using the specified object property via
+            an <see cref="T:Spring.Objects.IObjectWrapper"/>.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Jean-Pierre Pawlak</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: PropertyComparator.cs,v 1.12 2007/07/31 00:09:03 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Support.PropertyComparator.#ctor(Spring.Objects.Support.ISortDefinition)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.PropertyComparator"/> class.
+            </summary>
+            <param name="definition">
+            The <see cref="T:Spring.Objects.Support.ISortDefinition"/> to use for any
+            sorting.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="definition"/> is <cref lang="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Support.PropertyComparator.Compare(System.Object,System.Object)">
+            <summary>
+            Compares two objects and returns a value indicating whether one is less
+            than, equal to or greater than the other.
+            </summary>
+            <param name="o1">The first object to compare.</param>
+            <param name="o2">The second object to compare.</param>
+            <returns><see cref="M:System.Collections.IComparer.Compare(System.Object,System.Object)"/></returns>
+        </member>
+        <member name="M:Spring.Objects.Support.PropertyComparator.GetPropertyValue(System.Object)">
+            <summary>
+            Get the <see cref="T:Spring.Objects.Support.ISortDefinition"/>'s property
+            value for the given object.
+            </summary>
+            <param name="obj">The object to get the property value for.</param>
+            <returns>The property value.</returns>
+        </member>
+        <member name="M:Spring.Objects.Support.PropertyComparator.Sort(System.Collections.IList,Spring.Objects.Support.ISortDefinition)">
+            <summary>
+            Sort the given <see cref="T:System.Collections.IList"/> according to the
+            given sort definition.
+            </summary>
+            <param name="source">
+            The <see cref="T:System.Collections.IList"/> to be sorted.
+            </param>
+            <param name="sortDefinition">The parameters to sort by.</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of a missing property name.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="sortDefinition"/> is <cref lang="null"/>.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Support.PropertyComparator.SortDefinition">
+            <summary>
+            Gets the <see cref="T:Spring.Objects.Support.ISortDefinition"/> to
+            use for any sorting.
+            </summary>
+            <value>
+            The <see cref="T:Spring.Objects.Support.ISortDefinition"/> to	use for
+            any sorting.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.Support.MethodInvoker">
+            <summary>
+            Helper class allowing one to declaratively specify a method call for later invocation.
+            </summary>
+            <remarks>
+            <p>
+            Typically not used directly but via its subclasses such as
+            <see cref="T:Spring.Objects.Factory.Config.MethodInvokingFactoryObject"/>.
+            </p>
+            <p>
+            Usage: specify either the <see cref="P:Spring.Objects.Support.MethodInvoker.TargetType"/> and 
+            <see cref="P:Spring.Objects.Support.MethodInvoker.TargetMethod"/> or the
+            <see cref="P:Spring.Objects.Support.MethodInvoker.TargetObject"/> and
+            <see cref="P:Spring.Objects.Support.MethodInvoker.TargetMethod"/> properties respectively, and
+            (optionally) any arguments to the method. Then call the
+            <see cref="M:Spring.Objects.Support.MethodInvoker.Prepare"/> method to prepare the invoker.
+            Once prepared, the invoker can be invoked any number of times.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            The following example uses the <see cref="T:Spring.Objects.Support.MethodInvoker"/> class to invoke the
+            <c>ToString()</c> method on the <c>Foo</c> class using a mixture of both named and unnamed
+            arguments.
+            </p>
+            <code language="C#">
+            public class Foo 
+            {
+                public string ToString(string name, int age, string address)
+                {
+            		return string.Format("{0}, {1} years old, {2}", name, age, address);
+                }
+                
+                public static void Main()
+                {
+            		Foo foo = new Foo();
+            		MethodInvoker invoker = new MethodInvoker();
+            		invoker.Arguments = new object [] {"Kaneda", "18 Kaosu Gardens, Nakatani Drive, Okinanawa"};
+            		invoker.AddNamedArgument("age", 29);
+            		invoker.Prepare();
+            		// at this point, the arguments that will be passed to the method invocation
+            		// will have been resolved into the following ordered array : {"Kaneda", 29, "18 Kaosu Gardens, Nakatani Drive, Okinanawa"}
+            		string details = (string) invoker.Invoke();
+            		Console.WriteLine (details);
+            		// will print out 'Kaneda, 29 years old, 18 Kaosu Gardens, Nakatani Drive, Okinanawa'
+                }
+            }
+            </code>
+            </example>
+            <author>Colin Sampaleanu</author>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: MethodInvoker.cs,v 1.7 2007/08/04 01:05:15 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Support.MethodInvoker.MethodSearchingFlags">
+            <summary>
+            The <see cref="T:System.Reflection.BindingFlags"/> used to search for
+            the method to be invoked.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Support.MethodInvoker.Void">
+            <summary>
+            The value returned from the invocation of a method that returns void.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Support.MethodInvoker._methodObject">
+            <summary>
+            The method that will be invoked.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Support.MethodInvoker.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Objects.Support.MethodInvoker"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Support.MethodInvoker.Prepare">
+            <summary>
+            Prepare the specified method.
+            </summary>
+            <remarks>
+            <p>
+            The method can be invoked any number of times afterwards.
+            </p>
+            </remarks>
+            <exception cref="T:System.ArgumentException">
+            If all required properties are not set, or a matching argument could not be found
+            for a named argument (typically down to a typo).
+            </exception>
+            <exception cref="T:System.MissingMethodException">
+            If the specified method could not be found.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Support.MethodInvoker.FindTheMethodToInvoke">
+            <summary>
+            Searches for and returns the method that is to be invoked.
+            </summary>
+            <remarks>
+            The return value of this method call will subsequently be returned from the
+            <see cref="M:Spring.Objects.Support.MethodInvoker.GetPreparedMethod"/>.
+            </remarks>
+            <returns>The method that is to be invoked.</returns>
+            <exception cref="T:System.MissingMethodException">
+            If no method could be found.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If more than one method was found.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Support.MethodInvoker.AddNamedArgument(System.String,System.Object)">
+            <summary>
+            Adds the named argument to this instances mapping of argument names to argument values.
+            </summary>
+            <param name="argumentName">
+            The name of an argument on the method that is to be invoked.
+            </param>
+            <param name="argument">
+            The value of the named argument on the method that is to be invoked.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Support.MethodInvoker.GetPreparedMethod">
+            <summary>
+            Returns the prepared <see cref="T:System.Reflection.MethodInfo"/> object that
+            will be invoked.
+            </summary>
+            <remarks>
+            <p>
+            A possible use case is to determine the return <see cref="T:System.Type"/> of the method.
+            </p>
+            </remarks>
+            <returns>
+            The prepared <see cref="T:System.Reflection.MethodInfo"/> object that
+            will be invoked.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Support.MethodInvoker.Invoke">
+            <summary>
+            Invoke the specified method.
+            </summary>
+            <remarks>
+            <p>
+            The invoker needs to have been prepared beforehand (via a call to the
+            <see cref="M:Spring.Objects.Support.MethodInvoker.Prepare"/> method).
+            </p>
+            </remarks>
+            <returns>
+            The object returned by the method invocation, or
+            <see cref="F:Spring.Objects.Support.MethodInvoker.Void"/> if the method returns void.
+            </returns>
+            <exception cref="T:Spring.Core.MethodInvocationException">
+            If at least one of the arguments passed to this <see cref="T:Spring.Objects.Support.MethodInvoker"/>
+            was incompatible with the signature of the invoked method.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Support.MethodInvoker.TargetType">
+            <summary>
+            The target <see cref="T:System.Type"/> on which to call the target method.
+            </summary>
+            <remarks>
+            <p>
+            Only necessary when the target method is <see langword="static"/>;
+            else, a target object needs to be specified.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Support.MethodInvoker.TargetObject">
+            <summary>
+            The target object on which to call the target method.
+            </summary>
+            <remarks>
+            <p>
+            Only necessary when the target method is not <see langword="static"/>;
+            else, a target class is sufficient.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Support.MethodInvoker.TargetMethod">
+            <summary>
+            The name of the method to be invoked.
+            </summary>
+            <remarks>
+            <p>
+            Refers to either a <see langword="static"/> method
+            or a non-<see langword="static"/> method, depending on
+            whether or not a target object has been set.
+            </p>
+            </remarks>
+            <seealso cref="P:Spring.Objects.Support.MethodInvoker.TargetObject"/>
+        </member>
+        <member name="P:Spring.Objects.Support.MethodInvoker.Arguments">
+            <summary>
+            Arguments for the method invocation.
+            </summary>
+            <remarks>
+            <p>
+            Ordering <b>is</b> significant... the order of the arguments in this
+            property must match the ordering of the various parameters on the target
+            method. There does however exist a small possibility for confusion when
+            the arguments in this property are supplied in addition to one or more named
+            arguments. In this case, each named argument is slotted into the index position
+            corresponding to the named argument... once once all named arguments have been
+            resolved, the arguments in this property are slotted into any remaining (empty)
+            slots in the method parameter list (see the example in the overview of the
+            <see cref="T:Spring.Objects.Support.MethodInvoker"/> class if this is not clear).
+            </p>
+            <p>
+            If this property is not set, or the value passed to the setter invocation
+            is <see langword="null"/> or a zero-length array, a method with no (un-named) arguments is assumed.
+            </p>
+            </remarks>
+            <seealso cref="P:Spring.Objects.Support.MethodInvoker.NamedArguments"/>
+        </member>
+        <member name="P:Spring.Objects.Support.MethodInvoker.PreparedArguments">
+            <summary>
+            The resolved arguments for the method invocation.
+            </summary>
+            <remarks>
+            <note type="caution">
+            This property is not set until the target method has been resolved via a call to the
+            <see cref="M:Spring.Objects.Support.MethodInvoker.Prepare"/> method). It is a combination of the
+            named and plain vanilla arguments properties, and it is this object array that
+            will actually be passed to the invocation of the target method.
+            </note>
+            <p>
+            Setting the value of this property to <see langword="null"/> results in basically clearing out any
+            previously prepared arguments... another call to the <see cref="M:Spring.Objects.Support.MethodInvoker.Prepare"/>
+            method will then be required to prepare the arguments again (or the prepared arguments
+            can be set explicitly if so desired).
+            </p>
+            </remarks>
+            <seealso cref="P:Spring.Objects.Support.MethodInvoker.Arguments"/>
+            <seealso cref="P:Spring.Objects.Support.MethodInvoker.NamedArguments"/>
+        </member>
+        <member name="P:Spring.Objects.Support.MethodInvoker.NamedArguments">
+            <summary>
+            Named arguments for the method invocation.
+            </summary>
+            <remarks>
+            <p>
+            The keys of this dictionary are the (<see cref="T:System.String"/>) names of the
+            method arguments, and the (<see cref="T:System.Object"/>) values are the actual
+            argument values themselves.
+            </p>
+            <p>
+            If this property is not set, or the value passed to the setter invocation
+            is a <see langword="null"/> reference, a method with no named arguments is assumed.
+            </p>
+            </remarks>
+            <seealso cref="P:Spring.Objects.Support.MethodInvoker.Arguments"/>
+        </member>
+        <member name="T:Spring.Objects.Support.ArgumentConvertingMethodInvoker">
+            <summary>
+            Specialisation of the <see cref="T:Spring.Objects.Support.MethodInvoker"/> class that tries
+            to convert the given arguments for the actual target method via an
+            appropriate <see cref="T:Spring.Objects.IObjectWrapper"/> implementation.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans</author>
+            <version>$Id: ArgumentConvertingMethodInvoker.cs,v 1.10 2007/07/31 18:17:08 bbaia Exp $</version>
+            <seealso cref="T:Spring.Objects.Support.MethodInvoker"/>
+        </member>
+        <member name="M:Spring.Objects.Support.ArgumentConvertingMethodInvoker.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.ArgumentConvertingMethodInvoker"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Support.ArgumentConvertingMethodInvoker.Prepare">
+            <summary>
+            Prepare the specified method.
+            </summary>
+            <remarks>
+            <p>
+            The method can be invoked any number of times afterwards.
+            </p>
+            </remarks>
+            <exception cref="T:System.ArgumentException">
+            If all required properties are not set.
+            </exception>
+            <exception cref="T:System.MissingMethodException">
+            If the specified method could not be found.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Support.ArgumentConvertingMethodInvoker.RegisterCustomConverter(System.Type,System.ComponentModel.TypeConverter)">
+            <summary>
+            Register the given custom <see cref="T:System.ComponentModel.TypeConverter"/>
+            for all properties of the given <see cref="T:System.Type"/>.
+            </summary>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> of property.
+            </param>
+            <param name="typeConverter">
+            The <see cref="T:System.ComponentModel.TypeConverter"/> to register.
+            </param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.IObjectDefinitionReader">
+            <summary>
+            Simple interface for object definition readers.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans</author>
+            <version>$Id: IObjectDefinitionReader.cs,v 1.8 2007/08/08 17:47:13 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IObjectDefinitionReader.LoadObjectDefinitions(Spring.Core.IO.IResource)">
+            <summary>
+            Load object definitions from the supplied <paramref name="resource"/>.
+            </summary>
+            <param name="resource">
+            The resource for the object definitions that are to be loaded.
+            </param>
+            <returns>
+            The number of object definitions found
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of loading or parsing errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IObjectDefinitionReader.LoadObjectDefinitions(Spring.Core.IO.IResource[])">
+            <summary>
+            Load object definitions from the supplied <paramref name="resources"/>.
+            </summary>
+            <param name="resources">
+            The resources for the object definitions that are to be loaded.
+            </param>
+            <returns>
+            The number of object definitions found
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of loading or parsing errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IObjectDefinitionReader.LoadObjectDefinitions(System.String)">
+            <summary>
+            Loads the object definitions from the specified resource location.
+            </summary>
+            <param name="location">The resource location, to be loaded with the 
+            IResourceLoader location .</param>
+            <returns>
+            The number of object definitions found        
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IObjectDefinitionReader.LoadObjectDefinitions(System.String[])">
+            <summary>
+            Loads the object definitions from the specified resource locations.
+            </summary>
+            <param name="locations">The the resource locations to be loaded with the
+            IResourceLoader of this object definition reader.</param>
+            <returns>
+            The number of object definitions found        
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IObjectDefinitionReader.Registry">
+            <summary>
+            Gets the
+            <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+            instance that this reader works on.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IObjectDefinitionReader.Domain">
+            <summary>
+            The <see cref="T:System.AppDomain"/> against which any class names
+            will be resolved into <see cref="T:System.Type"/> instances.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IObjectDefinitionReader.ObjectNameGenerator">
+            <summary>
+            The <see cref="T:Spring.Objects.Factory.Support.IObjectNameGenerator"/> to use for anonymous
+            objects (wihtout explicit object name specified).
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IObjectDefinitionReader.ResourceLoader">
+            <summary>
+            Gets the resource loader to use for resource locations.
+            </summary>
+            <remarks>There is also a <see cref="M:Spring.Objects.Factory.Support.IObjectDefinitionReader.LoadObjectDefinitions(System.String)"/> method
+            available for loading object definitions from a resource location.  This is
+            a convenience to avoid explicit ResourceLoader handling.</remarks>
+            <value>The resource loader.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.IInstantiationStrategy">
+            <summary>
+            Responsible for creating instances corresponding to a
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IInstantiationStrategy.cs,v 1.6 2006/04/09 07:18:49 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IInstantiationStrategy.Instantiate(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Instantiate an instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </summary>
+            <param name="definition">
+            The definition of the object that is to be instantiated.
+            </param>
+            <param name="name">
+            The name associated with the object definition. The name can be the null
+            or zero length string if we're autowiring an object that doesn't belong
+            to the supplied <paramref name="factory"/>.
+            </param>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            </param>
+            <returns>
+            An instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IInstantiationStrategy.Instantiate(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory,System.Reflection.ConstructorInfo,System.Object[])">
+            <summary>
+            Instantiate an instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </summary>
+            <param name="definition">
+            The definition of the object that is to be instantiated.
+            </param>
+            <param name="name">
+            The name associated with the object definition. The name can be the null
+            or zero length string if we're autowiring an object that doesn't belong
+            to the supplied <paramref name="factory"/>.
+            </param>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            </param>
+            <param name="constructor">
+            The <see cref="T:System.Reflection.ConstructorInfo"/> to be used to instantiate
+            the object.
+            </param>
+            <param name="arguments">
+            Any arguments to the supplied <paramref name="constructor"/>. May be null.
+            </param>
+            <returns>
+            An instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IInstantiationStrategy.Instantiate(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory,System.Reflection.MethodInfo,System.Object[])">
+            <summary>
+            Instantiate an instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </summary>
+            <param name="definition">
+            The definition of the object that is to be instantiated.
+            </param>
+            <param name="name">
+            The name associated with the object definition. The name can be the null
+            or zero length string if we're autowiring an object that doesn't belong
+            to the supplied <paramref name="factory"/>.
+            </param>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            </param>
+            <param name="factoryMethod">
+            The <see cref="T:System.Reflection.MethodInfo"/> to be used to get the object.
+            </param>
+            <param name="arguments">
+            Any arguments to the supplied <paramref name="factoryMethod"/>. May be null.
+            </param>
+            <returns>
+            An instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader">
+            <summary>
+            Abstract base class for object definition readers.
+            </summary>
+            <remarks>
+            <p>
+            Provides common properties like the object registry to work on.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: AbstractObjectDefinitionReader.cs,v 1.14 2008/01/10 14:32:24 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader.log">
+            <summary>
+            The shared <see cref="T:Common.Logging.ILog"/> instance for this class (and derived classes).
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader.#ctor(Spring.Objects.Factory.Support.IObjectDefinitionRegistry)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader"/>
+            class.
+            </summary>
+            <param name="registry">
+            The <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+            instance that this reader works on.
+            </param>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader.#ctor(Spring.Objects.Factory.Support.IObjectDefinitionRegistry,System.AppDomain)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader"/>
+            class.
+            </summary>
+            <param name="registry">
+            The <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+            instance that this reader works on.
+            </param>
+            <param name="domain">
+            The <see cref="T:System.AppDomain"/> against which any class names
+            will be resolved into <see cref="T:System.Type"/> instances.
+            </param>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader.LoadObjectDefinitions(Spring.Core.IO.IResource)">
+            <summary>
+            Load object definitions from the supplied <paramref name="resource"/>.
+            </summary>
+            <param name="resource">
+            The resource for the object definitions that are to be loaded.
+            </param>
+            <returns>
+            The number of object definitions that were loaded.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of loading or parsing errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader.LoadObjectDefinitions(Spring.Core.IO.IResource[])">
+            <summary>
+            Load object definitions from the supplied <paramref name="resources"/>.
+            </summary>
+            <param name="resources">
+            The resources for the object definitions that are to be loaded.
+            </param>
+            <returns>
+            The number of object definitions found
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of loading or parsing errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader.LoadObjectDefinitions(System.String)">
+            <summary>
+            Loads the object definitions from the specified resource location.
+            </summary>
+            <param name="location">The resource location, to be loaded with the 
+            IResourceLoader location .</param>
+            <returns>
+            The number of object definitions found        
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader.LoadObjectDefinitions(System.String[])">
+            <summary>
+            Loads the object definitions from the specified resource locations.
+            </summary>
+            <param name="locations">The the resource locations to be loaded with the
+            IResourceLoader of this object definition reader.</param>
+            <returns>
+            The number of object definitions found        
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader.Registry">
+            <summary>
+            Gets the
+            <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+            instance that this reader works on.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader.ObjectNameGenerator">
+            <summary>
+            The <see cref="T:Spring.Objects.Factory.Support.IObjectNameGenerator"/> to use for anonymous
+            objects (wihtout explicit object name specified).
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader.Domain">
+            <summary>
+            The <see cref="T:System.AppDomain"/> against which any class names
+            will be resolved into <see cref="T:System.Type"/> instances.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinitionReader.ResourceLoader">
+            <summary>
+            Gets or sets the resource loader to use for resource locations.
+            </summary>
+            <value>The resource loader.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.MethodInvokingFactoryObject">
+            <summary>
+            An <see cref="T:Spring.Objects.Factory.IFactoryObject"/> that returns a value
+            that is the result of a <see langword="static"/> or instance method invocation.
+            </summary>
+            <remarks>
+            <p>
+            Note that this class generally is expected to be used for accessing factory methods,
+            and as such defaults to operating in singleton mode. The first request to
+            <see cref="M:Spring.Objects.Factory.Config.MethodInvokingFactoryObject.GetObject"/>
+            by the owning object factory will cause a method invocation, the return
+            value of which will be cached for all subsequent requests. The
+            <see cref="P:Spring.Objects.Factory.Config.MethodInvokingFactoryObject.IsSingleton"/> property may be set to
+            <see langword="false"/>, to cause this factory to invoke the target method each
+            time it is asked for an object.
+            </p>
+            <p>
+            A <see langword="static"/> target method may be specified by setting the
+            <see cref="P:Spring.Objects.Support.MethodInvoker.TargetMethod"/> property to a string representing
+            the <see langword="static"/> method name, with <see cref="P:Spring.Objects.Support.MethodInvoker.TargetType"/> specifying
+            the <see cref="T:System.Type"/> that the <see langword="static"/> method is defined on.
+            Alternatively, a target instance method may be specified, by setting the
+            <see cref="P:Spring.Objects.Support.MethodInvoker.TargetObject"/> property as the target object, and
+            the <see cref="P:Spring.Objects.Support.MethodInvoker.TargetMethod"/> property as the name of the
+            method to call on that target object. Arguments for the method invocation may be
+            specified by setting the <see cref="P:Spring.Objects.Support.MethodInvoker.Arguments"/> property.
+            </p>
+            <p>
+            Another (esoteric) use case for this factory object is when one needs to call a method
+            that doesn't return any value (for example, a <see langword="static"/> class method to
+            force some sort of initialization to happen)... this use case is not supported by
+            factory-methods, since a return value is needed to become the object.
+            </p>
+            <p>
+            <note>
+            This class depends on the
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            method being called after all properties have been set, as per the
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/> contract. If you are
+            using this class outside of a Spring.NET IoC container, you must call one of either
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/> or
+            <see cref="M:Spring.Objects.Support.MethodInvoker.Prepare"/> yourself to ready the object's internal
+            state, or you will get a nasty <see cref="T:System.NullReferenceException"/>.
+            </note>
+            </p>
+            </remarks>
+            <example>
+            <p>
+            The following example uses an instance of this class to call a <see langword="static"/>
+            factory method...
+            </p>
+            <code escaped="true">
+            <object id="myObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core">
+              <property name="TargetType" value="Whatever.MyClassFactory, MyAssembly"/>
+              <property name="TargetMethod" value="Instance"/>
+              <!-- the ordering of arguments is significant -->
+              <property name="Arguments">
+            	<list>
+            		<value>1st</value>
+            		<value>2nd</value>
+            		<value>and 3rd arguments</value>
+            	</list>
+              </property>
+            </object>
+            </code>
+            <p>
+            The following example is similar to the preceding example; the only pertinent difference is the fact that
+            a number of different objects are passed as arguments, demonstrating that not only simple value types
+            are valid as elements of the argument list...
+            </p>
+            <code language="C#">
+            </code>
+            <code escaped="true">
+            <object id="myObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core">
+              <property name="TargetType" value="Whatever.MyClassFactory, MyAssembly"/>
+              <property name="TargetMethod" value="Instance"/>
+              <!-- the ordering of arguments is significant -->
+              <property name="Arguments">
+            	<list>
+            		<!-- a primitive type (a string) -->
+            		<value>1st</value>
+            		<!-- an inner object definition is passed as the second argument -->
+            		<object type="Whatever.SomeClass, MyAssembly"/>
+            		<!-- a reference to another objects is passed as the third argument -->
+            		<ref object="someOtherObject"/>
+            		<!-- another list is passed as the fourth argument -->
+            		<list>
+            			<value>http://www.springframework.net/</value>
+            		</list>
+            	</list>
+              </property>
+            </object>
+            </code>
+            <p>
+            Named parameters are also supported... this next example yields the same results as
+            the preceding example (that did not use named arguments).
+            </p>
+            <code escaped="true">
+            <object id="myObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core">
+              <property name="TargetObject">
+                <object type="Whatever.MyClassFactory, MyAssembly"/>
+              </property>
+              <property name="TargetMethod" value="Execute"/>
+              <!-- the ordering of named arguments is not significant -->
+              <property name="NamedArguments">
+            	<dictionary>
+            		<entry key="argumentName"><value>1st</value></entry>
+            		<entry key="finalArgumentName"><value>and 3rd arguments</value></entry>
+            		<entry key="anotherArgumentName"><value>2nd</value></entry>
+            	</dictionary>
+              </property>
+            </object>
+            </code>
+            <p>
+            Similarly, the following example uses an instance of this class to call an instance method...
+            </p>
+            <code escaped="true">
+            <object id="myMethodObject" type="Whatever.MyClassFactory, MyAssembly"/>
+            <object id="myObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core">
+              <property name="TargetObject">
+                <ref local="myMethodObject"/>
+              </property>
+              <property name="TargetMethod" value="Execute"/>
+            </object>
+            </code>
+            <p>
+            The above example could also have been written using an anonymous inner object definition... if the
+            object on which the method is to be invoked is not going to be used outside of the factory object
+            definition, then this is the preferred idiom because it limits the scope of the object on which the
+            method is to be invoked to the surrounding factory object.
+            </p>
+            <code escaped="true">
+            <object id="myObject" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core">
+              <property name="TargetObject">
+                <object type="Whatever.MyClassFactory, MyAssembly"/>
+              </property>
+              <property name="TargetMethod" value="Execute"/>
+            </object>
+            </code>
+            </example>
+            <author>Colin Sampaleanu</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: MethodInvokingFactoryObject.cs,v 1.15 2007/03/16 04:01:38 aseovic Exp $</version>
+            <seealso cref="T:Spring.Objects.Support.MethodInvoker"/>
+            <seealso cref="T:Spring.Objects.Support.ArgumentConvertingMethodInvoker"/>
+        </member>
+        <member name="T:Spring.Objects.Factory.IFactoryObject">
+            <summary>
+            Interface to be implemented by objects used within an
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> that are themselves
+            factories.
+            </summary>
+            <remarks>
+            <p>
+            If an object implements this interface, it is used as a factory,
+            not directly as an object. <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s
+            can support singletons and prototypes
+            (<see cref="P:Spring.Objects.Factory.IFactoryObject.IsSingleton"/>)...
+            please note that an <see cref="T:Spring.Objects.Factory.IFactoryObject"/>
+            itself can only ever be a singleton. It is a logic error to configure an
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> itself to be a prototype.
+            </p>
+            <note type="caution">
+            An object that implements this interface cannot be used as a normal object.
+            </note>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IFactoryObject.cs,v 1.6 2006/04/09 07:18:48 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.IFactoryObject.GetObject">
+            <summary>
+            Return an instance (possibly shared or independent) of the object
+            managed by this factory.
+            </summary>
+            <remarks>
+            <note type="caution">
+            If this method is being called in the context of an enclosing IoC container and
+            returns <see langword="null"/>, the IoC container will consider this factory
+            object as not being fully initialized and throw a corresponding (and most
+            probably fatal) exception.
+            </note>
+            </remarks>
+            <returns>
+            An instance (possibly shared or independent) of the object managed by
+            this factory.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.IFactoryObject.ObjectType">
+            <summary>
+            Return the <see cref="T:System.Type"/> of object that this
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> creates, or
+            <see langword="null"/> if not known in advance.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.IFactoryObject.IsSingleton">
+            <summary>
+            Is the object managed by this factory a singleton or a prototype?
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.IInitializingObject">
+            <summary>
+            Defines a simple initialization callback for objects that need to to some
+            post-initialization logic after all of their dependencies have been injected.
+            </summary>
+            <remarks>
+            <p>
+            An implementation of the
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            method might perform some additional custom initialization (over and above that
+            performed by the constructor), or merely check that all mandatory properties
+            have been set (this last example is a very typical use case of this interface).
+            </p>
+            <note>
+            The use of the
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/> interface
+            by non-Spring.NET framework code can be avoided (and is generally
+            discouraged). The Spring.NET container provides support for a generic
+            initialization method given to the object definition in the object
+            configuration store (be it XML, or a database, etc). This requires
+            slightly more configuration (one attribute-value pair in the case of
+            XML configuration), but removes any dependency on Spring.NET from the
+            class definition.
+            </note>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IInitializingObject.cs,v 1.8 2006/04/09 07:18:48 markpollack Exp $</version>
+            <seealso cref="T:Spring.Objects.Factory.IObjectFactory"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has injected all of an object's dependencies.
+            </summary>
+            <remarks>
+            <p>
+            This method allows the object instance to perform the kind of
+            initialization only possible when all of it's dependencies have
+            been injected (set), and to throw an appropriate exception in the
+            event of misconfiguration.
+            </p>
+            <p>
+            Please do consult the class level documentation for the
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> interface for a
+            description of exactly <i>when</i> this method is invoked. In
+            particular, it is worth noting that the
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            and <see cref="T:Spring.Context.IApplicationContextAware"/>
+            callbacks will have been invoked <i>prior</i> to this method being
+            called.
+            </p>
+            </remarks>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as the failure to set a
+            required property) or if initialization fails.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.MethodInvokingFactoryObject.GetObject">
+            <summary>
+            Return an instance (possibly shared or independent) of the object
+            managed by this factory.
+            </summary>
+            <remarks>
+            <p>
+            Returns the return value of the method that is to be invoked.
+            </p>
+            <p>
+            Will return the same value each time if the
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+            property value is <see langword="true"/>.
+            </p>
+            </remarks>
+            <returns>
+            An instance (possibly shared or independent) of the object managed by
+            this factory.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IFactoryObject.GetObject"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.MethodInvokingFactoryObject.AfterPropertiesSet">
+            <summary>
+            Prepares this method invoker.
+            </summary>
+            <exception cref="T:System.ArgumentException">
+            If all required properties are not set.
+            </exception>
+            <exception cref="T:System.MissingMethodException">
+            If the specified method could not be found.
+            </exception>
+            <seealso cref="M:Spring.Objects.Support.ArgumentConvertingMethodInvoker.Prepare"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.MethodInvokingFactoryObject.IsSingleton">
+            <summary>
+            If a singleton should be created, or a new object on each request.
+            Defaults to <see langword="true"/>.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.MethodInvokingFactoryObject.ObjectType">
+            <summary>
+            Return the return value <see cref="T:System.Type"/> of the method
+            that this factory invokes, or <see langword="null"/> if not
+            known in advance.
+            </summary>
+            <remarks>
+            <p>
+            If the return value of the method that this factory is to invoke is
+            <see langword="void"/>, then the <see cref="T:System.Reflection.Missing"/>
+            <see cref="T:System.Type"/> will be returned (in accordance with the
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> contract that
+            treats a <see langword="null"/> value as a configuration error).
+            </p>
+            </remarks>
+            <seealso cref="P:Spring.Objects.Factory.IFactoryObject.ObjectType"/>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory">
+            <summary>
+            SPI interface to be implemented by most if not all listable object factories.
+            </summary>
+            <remarks>
+            <p>
+            Allows for framework-internal plug'n'play, e.g. in
+            <see cref="T:Spring.Context.Support.AbstractApplicationContext"/>.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+        </member>
+        <member name="T:Spring.Objects.Factory.IListableObjectFactory">
+            <summary>
+            Extension of the <see cref="T:Spring.Objects.Factory.IObjectFactory"/> interface
+            to be implemented by object factories that can enumerate all their object instances,
+            rather than attempting object lookup by name one by one as requested by clients.
+            </summary>
+            <remarks>
+            <p>
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> implementations that preload
+            all their objects (for example, DOM-based XML factories) may implement this
+            interface. This interface is discussed in
+            "Expert One-on-One J2EE Design and Development", by Rod Johnson.
+            </p>
+            <p>
+            If this is an <see cref="T:Spring.Objects.Factory.IHierarchicalObjectFactory"/>,
+            the return values will not take any
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> hierarchy into account, but
+            will relate only to the objects defined in the current factory.
+            Use the <see cref="T:Spring.Objects.Factory.ObjectFactoryUtils"/> helper class to
+            get all objects.
+            </p>
+            <p>
+            With the exception of
+            <see cref="P:Spring.Objects.Factory.IListableObjectFactory.ObjectDefinitionCount"/>,
+            the methods and properties in this interface are not designed for frequent
+            invocation. Implementations may be slow.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IListableObjectFactory.cs,v 1.12 2007/07/29 19:39:27 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.IObjectFactory">
+            <summary>
+            The root interface for accessing a Spring.NET IoC container.
+            </summary>
+            <remarks>
+            <p>
+            This is the basic client view of a Spring.NET IoC container; further interfaces
+            such as <see cref="T:Spring.Objects.Factory.IListableObjectFactory"/> and
+            <see cref="T:Spring.Objects.Factory.Config.IConfigurableObjectFactory"/>
+            are available for specific purposes such as enumeration and configuration.
+            </p>
+            <p>
+            This is the root interface to be implemented by objects that can hold a number
+            of object definitions, each uniquely identified by a <see cref="T:System.String"/>
+            name. An independent instance of any of these objects can be obtained
+            (the Prototype design pattern), or a single shared instance can be obtained
+            (a superior alternative to the Singleton design pattern, in which the instance is a
+            singleton in the scope of the factory). Which type of instance
+            will be returned depends on the object factory configuration - the API is the same.
+            The Singleton approach is more useful and hence more common in practice.
+            </p>
+            <p>
+            The point of this approach is that the IObjectFactory is a central registry of
+            application components, and centralizes the configuring of application components
+            (no more do individual objects need to read properties files, for example).
+            See chapters 4 and 11 of "Expert One-on-One J2EE Design and Development" for a
+            discussion of the benefits of this approach.
+            </p>
+            <p>
+            Normally an IObjectFactory will load object definitions stored in a configuration
+            source (such as an XML document), and use the <see cref="N:Spring.Objects"/>
+            namespace to configure the objects. However, an implementation could simply return
+            .NET objects it creates as necessary directly in .NET code. There are no
+            constraints on how the definitions could be stored: LDAP, RDBMS, XML, properties
+            file etc. Implementations are encouraged to support references amongst objects,
+            to either Singletons or Prototypes.
+            </p>
+            <p>
+            In contrast to the methods in
+            <see cref="T:Spring.Objects.Factory.IListableObjectFactory"/>, all of the methods
+            in this interface will also check parent factories if this is an
+            <see cref="T:Spring.Objects.Factory.IHierarchicalObjectFactory"/>. If an object is
+            not found in this factory instance, the immediate parent is asked. Objects in
+            this factory instance are supposed to override objects of the same name in any
+            parent factory.
+            </p>
+            <p>
+            Object factories are supposed to support the standard object lifecycle interfaces
+            as far as possible. The maximum set of initialization methods and their standard
+            order is:
+            </p>
+            <p>
+            <list type="bullet">
+            <item>
+            <description>
+            <see cref="T:Spring.Objects.Factory.IObjectNameAware"/>'s
+            <see cref="P:Spring.Objects.Factory.IObjectNameAware.ObjectName"/> property.
+            </description>
+            </item>
+            <item>
+            <description>
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>'s
+            <see cref="P:Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/> property.
+            </description>
+            </item>
+            <item>
+            <description>
+            <see cref="P:Spring.Context.IApplicationContextAware.ApplicationContext"/>
+            (only applicable if running within an <see cref="T:Spring.Context.IApplicationContext"/>).
+            </description>
+            </item>
+            <item>
+            <description>
+            The
+            <see cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization(System.Object,System.String)"/>
+            method of
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s.
+            </description>
+            </item>
+            <item>
+            <description>
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/> method.
+            </description>
+            </item>
+            <item>
+            <description>
+            A custom init-method definition.
+            </description>
+            </item>
+            <item>
+            <description>
+            The
+            <see cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization(System.Object,System.String)"/>
+            method of
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s.
+            </description>
+            </item>
+            </list>
+            </p>
+            <p/>
+            <p>
+            On shutdown of an object factory, the following lifecycle methods apply:
+            </p>
+            <p>
+            <list type="bullet">
+            <item>
+            <description>
+            <see cref="T:System.IDisposable"/>'s
+            <see cref="M:System.IDisposable.Dispose"/> method.
+            </description>
+            </item>
+            <item>
+            <description>
+            A custom destroy-method definition.
+            </description>
+            </item>
+            </list>
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IObjectFactory.cs,v 1.17 2007/07/30 15:41:32 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.IObjectFactory.IsSingleton(System.String)">
+            <summary>
+            Is this object a singleton?
+            </summary>
+            <remarks>
+            <p>
+            That is, will <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>
+            always return the same object?
+            </p>
+            <p>
+            Will ask the parent factory if the object cannot be found in this factory
+            instance.
+            </p>
+            </remarks>
+            <param name="name">The name of the object to query.</param>
+            <returns>True if the named object is a singleton.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.IObjectFactory.IsPrototype(System.String)">
+            <summary>
+            Determines whether the specified object name is prototype.  That is, will GetObject
+            always return independent instances?
+            </summary>
+            <remarks>This method returning false does not clearly indicate a singleton object.
+            It indicated non-independent instances, which may correspond to a scoped object as 
+            well.  use the IsSingleton property to explicitly check for a shared 
+            singleton instance.
+            <para>Translates aliases back to the corresponding canonical object name.  Will ask the
+            parent factory if the object can not be found in this factory instance.
+            </para>
+            </remarks>
+            
+            <param name="name">The name of the object to query</param>
+            <returns>
+            	<c>true</c> if the specified object name will always deliver independent instances; otherwise, <c>false</c>.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">if there is no object with the given name.</exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.IObjectFactory.ContainsObject(System.String)">
+            <summary>
+            Does this object factory contain an object with the given name?
+            </summary>
+            <remarks>
+            <p>
+            Will ask the parent factory if the object cannot be found in this factory
+            instance.
+            </p>
+            </remarks>
+            <param name="name">The name of the object to query.</param>
+            <returns>True if an object with the given name is defined.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.IObjectFactory.GetAliases(System.String)">
+            <summary>
+            Return the aliases for the given object name, if defined.
+            </summary>
+            <remarks>
+            <p>
+            Will ask the parent factory if the object cannot be found in this factory
+            instance.
+            </p>
+            </remarks>
+            <param name="name">The object name to check for aliases.</param>
+            <returns>The aliases, or an empty array if none.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <remarks>
+            <p>
+            This method allows an object factory to be used as a replacement for the
+            Singleton or Prototype design pattern.
+            </p>
+            <p>
+            Note that callers should retain references to returned objects. There is no
+            guarantee that this method will be implemented to be efficient. For example,
+            it may be synchronized, or may need to run an RDBMS query.
+            </p>
+            <p>
+            Will ask the parent factory if the object cannot be found in this factory
+            instance.
+            </p>
+            </remarks>
+            <param name="name">The name of the object to return.</param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String,System.Object[])">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <remarks>
+            <p>
+            This method allows an object factory to be used as a replacement for the
+            Singleton or Prototype design pattern.
+            </p>
+            <p>
+            Note that callers should retain references to returned objects. There is no
+            guarantee that this method will be implemented to be efficient. For example,
+            it may be synchronized, or may need to run an RDBMS query.
+            </p>
+            <p>
+            Will ask the parent factory if the object cannot be found in this factory
+            instance.
+            </p>
+            </remarks>
+            <param name="name">The name of the object to return.</param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a static factory method. If there is no factory method and the
+            arguments are not null, then match the argument values by type and
+            call the object's constructor.
+            </param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String,System.Type,System.Object[])">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <param name="name">The name of the object to return.</param>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> the object may match. Can be an interface or
+            superclass of the actual class. For example, if the value is the
+            <see cref="T:System.Object"/> class, this method will succeed whatever the
+            class of the returned instance.
+            </param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a <see lang="static"/> factory method. If there is no factory method and the
+            supplied <paramref name="arguments"/> array is not <see lang="null"/>, then
+            match the argument values by type and call the object's constructor.
+            </param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectNotOfRequiredTypeException">
+            If the object is not of the required type.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> is <see langword="null"/>.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String,System.Type)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String,System.Type)">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <remarks>
+            <p>
+            Provides a measure of type safety by throwing an exception if the object is
+            not of the required <see cref="T:System.Type"/>.
+            </p>
+            <p>
+            This method allows an object factory to be used as a replacement for the
+            Singleton or Prototype design pattern.
+            </p>
+            <p>
+            Note that callers should retain references to returned objects. There is no
+            guarantee that this method will be implemented to be efficient. For example,
+            it may be synchronized, or may need to run an RDBMS query.
+            </p>
+            <p>
+            Will ask the parent factory if the object cannot be found in this factory
+            instance.
+            </p>
+            </remarks>
+            <param name="name">The name of the object to return.</param>
+            <param name="requiredType">
+            <see cref="T:System.Type"/> the object may match. Can be an interface or
+            superclass of the actual class. For example, if the value is the
+            <see cref="T:System.Object"/> class, this method will succeed whatever the
+            class of the returned instance.
+            </param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectNotOfRequiredTypeException">
+            If the object is not of the required type.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.IObjectFactory.GetType(System.String)">
+            <summary>
+            Determine the type of the object with the given name.
+            </summary>
+            <remarks>
+            <p>
+            More specifically, checks the type of object that
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/> would return.
+            For an <see cref="T:Spring.Objects.Factory.IFactoryObject"/>, returns the type
+            of object that the <see cref="T:Spring.Objects.Factory.IFactoryObject"/> creates.
+            </p>
+            </remarks>
+            <param name="name">The name of the object to query.</param>
+            <returns>
+            The type of the object or <cref lang="null"/> if not determinable.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.IObjectFactory.IsTypeMatch(System.String,System.Type)">
+            <summary>
+            Determines whether the object with the given name matches the specified type.
+            </summary>
+            <remarks>More specifically, check whether a GetObject call for the given name
+            would return an object that is assignable to the specified target type.
+            Translates aliases back to the corresponding canonical bean name.
+            Will ask the parent factory if the bean cannot be found in this factory instance.
+            </remarks>
+            <param name="name">The name of the object to query.</param>
+            <param name="targetType">Type of the target to match against.</param>
+            <returns>
+            	<c>true</c> if the object type matches; otherwise, <c>false</c>
+            if it doesn't match or cannot be determined yet.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">Ff there is no object with the given name
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)">
+            <summary>
+            Injects dependencies into the supplied <paramref name="target"/> instance
+            using the named object definition.
+            </summary>
+            <remarks>
+            <p>
+            In addition to being generally useful, typically this method is used to provide
+            dependency injection functionality for objects that are instantiated outwith the
+            control of a developer. A case in point is the way that the current (1.1)
+            ASP.NET classes instantiate web controls... the instantiation takes place within
+            a private method of a compiled page, and thus cannot be hooked into the
+            typical Spring.NET IOC container lifecycle for dependency injection.
+            </p>
+            </remarks>
+            <example>
+            The following code snippet assumes that the instantiated factory instance
+            has been configured with an object definition named
+            '<i>ExampleNamespace.BusinessObject</i>' that has been configured to set the
+            <c>Dao</c> property of any <c>ExampleNamespace.BusinessObject</c> instance
+            to an instance of an appropriate implementation...
+            <code language="C#">
+            namespace ExampleNamespace
+            {
+                public class BusinessObject
+                {
+                    private IDao _dao;
+            		
+                    public BusinessObject() {}
+            
+                    public IDao Dao
+                    {
+            		    get { return _dao;	}
+                        set { _dao = value; }
+                    }
+                }
+            }
+            </code>
+            with the corresponding driver code looking like so...
+            <code language="C#">
+            IObjectFactory factory = GetAnIObjectFactoryImplementation();
+            BusinessObject instance = new BusinessObject();
+            factory.ConfigureObject(instance, "object_definition_name");
+            // at this point the dependencies for the 'instance' object will have been resolved...
+            </code>
+            </example>
+            <param name="target">
+            The object instance that is to be so configured.
+            </param>
+            <param name="name">
+            The name of the object definition expressing the dependencies that are to
+            be injected into the supplied <parameref name="target"/> instance.
+            </param>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there is no object definition for the supplied <paramref name="name"/>.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If any of the target object's dependencies could not be created.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.IObjectFactory.Item(System.String)">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <remarks>
+            <p>
+            This method allows an object factory to be used as a replacement for the
+            Singleton or Prototype design pattern.
+            </p>
+            <p>
+            Note that callers should retain references to returned objects. There is no
+            guarantee that this method will be implemented to be efficient. For example,
+            it may be synchronized, or may need to run an RDBMS query.
+            </p>
+            <p>
+            Will ask the parent factory if the object cannot be found in this factory
+            instance.
+            </p>
+            <p>
+            This is the indexer for the <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            interface.
+            </p>
+            </remarks>
+            <param name="name">The name of the object to return.</param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.IListableObjectFactory.ContainsObjectDefinition(System.String)">
+            <summary>
+            Check if this object factory contains an object definition with the given name.
+            </summary>
+            <remarks>
+            <p>
+            Does not consider any hierarchy this factory may participate in.
+            </p>
+            <note>
+            Ignores any singleton objects that have been registered by other means
+            than object definitions.
+            </note>
+            </remarks>
+            <param name="name">The name of the object to look for.</param>
+            <returns>
+            <see langword="true"/> if this object factory contains an object
+            definition with the given name.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectDefinitionNames">
+            <summary>
+            Return the names of all objects defined in this factory.
+            </summary>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectNamesForType(System.Type)">
+            <summary>
+            Return the names of objects matching the given <see cref="T:System.Type"/>
+            (including subclasses), judging from the object definitions.
+            </summary>
+            <remarks>
+            <p>
+            Does consider objects created by <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s,
+            or rather it considers the type of objects created by
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> (which means that
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s will be instantiated).
+            </p>
+            <p>
+            Does not consider any hierarchy this factory may participate in.
+            </p>
+            </remarks>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match, or <see langword="null"/>
+            for all object names.
+            </param>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectNamesForType(System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Return the names of objects matching the given <see cref="T:System.Type"/>
+            (including subclasses), judging from the object definitions.
+            </summary>
+            <remarks>
+            <p>
+            Does consider objects created by <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s,
+            or rather it considers the type of objects created by
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> (which means that
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s will be instantiated).
+            </p>
+            <p>
+            Does not consider any hierarchy this factory may participate in.
+            </p>
+            </remarks>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match, or <see langword="null"/>
+            for all object names.
+            </param>
+            <param name="includePrototypes">
+            Whether to include prototype objects too or just singletons (also applies to
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s).
+            </param>
+            <param name="includeFactoryObjects">
+            Whether to include <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s too
+            or just normal objects.
+            </param>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(System.Type)">
+            <summary>
+            Return the object instances that match the given object
+            <see cref="T:System.Type"/> (including subclasses), judging from either object
+            definitions or the value of
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s.
+            </summary>
+            <remarks>
+            <p>
+            This version of the <see cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(System.Type,System.Boolean,System.Boolean)"/>
+            method matches all kinds of object definitions, be they singletons, prototypes, or
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s. Typically, the results
+            of this method call will be the same as a call to
+            <code>IListableObjectFactory.GetObjectsOfType(type,true,true)</code> .
+            </p>
+            </remarks>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match.
+            </param>
+            <returns>
+            A <see cref="T:System.Collections.IDictionary"/> of the matching objects,
+            containing the object names as keys and the corresponding object instances
+            as values.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the objects could not be created.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Return the object instances that match the given object
+            <see cref="T:System.Type"/> (including subclasses), judging from either object
+            definitions or the value of
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match.
+            </param>
+            <param name="includePrototypes">
+            Whether to include prototype objects too or just singletons (also applies to
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s).
+            </param>
+            <param name="includeFactoryObjects">
+            Whether to include <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s too
+            or just normal objects.
+            </param>
+            <returns>
+            A <see cref="T:System.Collections.IDictionary"/> of the matching objects,
+            containing the object names as keys and the corresponding object instances
+            as values.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the objects could not be created.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.IListableObjectFactory.ObjectDefinitionCount">
+            <summary>
+            Return the number of objects defined in the factory.
+            </summary>
+            <value>
+            The number of objects defined in the factory.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.IConfigurableObjectFactory">
+            <summary>
+            Configuration interface to be implemented by most if not all object
+            factories.
+            </summary>
+            <remarks>
+            <p>
+            Provides the means to configure an object factory in addition to the
+            object factory client methods in the
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> interface.
+            </p>
+            <p>
+            Allows for framework-internal plug'n'play even when needing access to object
+            factory configuration methods.
+            </p>
+            <p>
+            When disposed, it will destroy all cached singletons in this factory. Call
+            <see cref="M:System.IDisposable.Dispose"/> when you want to shutdown
+            the factory.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IConfigurableObjectFactory.cs,v 1.14 2007/07/16 21:06:21 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.IHierarchicalObjectFactory">
+            <summary>
+            Sub-interface implemented by object factories that can be part
+            of a hierarchy.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IHierarchicalObjectFactory.cs,v 1.6 2006/04/09 07:18:48 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Objects.Factory.IHierarchicalObjectFactory.ParentObjectFactory">
+            <summary>
+            Return the parent object factory, or <see langword="null"/>
+            if this factory does not have a parent.
+            </summary>
+            <value>
+            The parent object factory, or <see langword="null"/>
+            if this factory does not have a parent.
+            </value>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.IgnoreDependencyType(System.Type)">
+            <summary>
+            Ignore the given dependency type for autowiring.
+            </summary>
+            <remarks>
+            <p>
+            To be invoked during factory configuration.
+            </p>
+            <p>
+            This will typically be used for dependencies that are resolved
+            in other ways, like <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            through <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>.
+            </p>
+            </remarks>
+            <param name="type">
+            The <see cref="T:System.Type"/> to be ignored.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.IsCurrentlyInCreation(System.String)">
+            <summary>
+            Determines whether the specified object name is currently in creation..
+            </summary>
+            <param name="objectName">Name of the object.</param>
+            <returns>
+            	<c>true</c> if the specified object name is currently in creation; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.AddObjectPostProcessor(Spring.Objects.Factory.Config.IObjectPostProcessor)">
+            <summary>
+            Add a new <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            that will get applied to objects created by this factory.
+            </summary>
+            <remarks>
+            <p>
+            To be invoked during factory configuration.
+            </p>
+            </remarks>
+            <param name="processor">
+            The <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            to register.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterAlias(System.String,System.String)">
+            <summary>
+            Given an object name, create an alias.
+            </summary>
+            <remarks>
+            <p>
+            This is typically used to support names that are illegal within
+            XML ids (which are used for object names).
+            </p>
+            <p>
+            Typically invoked during factory configuration, but can also be
+            used for runtime registration of aliases. Therefore, a factory
+            implementation should synchronize alias access.
+            </p>
+            </remarks>
+            <param name="name">The name of the object.
+            </param>
+            <param name="theAlias">
+            The alias that will behave the same as the object name.
+            </param>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there is no object with the given name.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the alias is already in use.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterSingleton(System.String,System.Object)">
+            <summary>
+            Register the given existing object as singleton in the object factory,
+            under the given object name.
+            </summary>
+            <remarks>
+            <p>
+            Typically invoked during factory configuration, but can also be
+            used for runtime registration of singletons. Therefore, a factory
+            implementation should synchronize singleton access; it will have
+            to do this anyway if it supports lazy initialization of singletons.
+            </p>
+            </remarks>
+            <param name="name">
+            The name of the object.
+            </param>
+            <param name="singleton">The existing object.</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the singleton could not be registered.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterCustomConverter(System.Type,System.ComponentModel.TypeConverter)">
+            <summary>
+            Register the given custom <see cref="T:System.ComponentModel.TypeConverter"/>
+            for all properties of the given <see cref="T:System.Type"/>.
+            </summary>
+            <remarks>
+            <p>
+            To be invoked during factory configuration.
+            </p>
+            </remarks>
+            <param name="requiredType">
+            The required <see cref="T:System.Type"/> of the property.
+            </param>
+            <param name="converter">
+            The <see cref="T:System.ComponentModel.TypeConverter"/> to register.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.ContainsSingleton(System.String)">
+            <summary>
+            Does this object factory contains a singleton instance with the
+            supplied <paramref name="name"/>?
+            </summary>
+            <remarks>
+            <p>
+            Only checks already instantiated singletons; does not return
+            <see langword="true"/> for singleton object definitions that have
+            not been instantiated yet.
+            </p>
+            <p>
+            The main purpose of this method is to check manually registered
+            singletons (<see cref="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterSingleton(System.String,System.Object)"/>). This
+            method can also be used to check whether a singleton defined by an
+            object definition has already been created.
+            </p>
+            <p>
+            To check whether an object factory contains an object definition
+            with a given name, use the
+            <see cref="M:Spring.Objects.Factory.IListableObjectFactory.ContainsObjectDefinition(System.String)"/>
+            method. Calling both
+            <see cref="M:Spring.Objects.Factory.IListableObjectFactory.ContainsObjectDefinition(System.String)"/>
+            and <see cref="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.ContainsSingleton(System.String)"/> definitively answers
+            the question of whether a specific object factory contains a
+            singleton object with the given name.
+            </p>
+            <p>
+            Use the
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.ContainsObject(System.String)"/>
+            method for general checks as to whether a factory knows about an
+            object with a given name (regrdless of whether the object in
+            question is a manually registed singleton instance or created by
+            an object definition)... this also has the happy bonus of also
+            checking any ancestor factories.
+            </p>
+            </remarks>
+            <param name="name">
+            The name of the (singleton) object to look for.
+            </param>
+            <returns>
+            <see langword="true"/> if this object factory contains a singleton
+            instance with the given <paramref name="name"/>.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.ContainsObject(System.String)"/>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.ContainsObjectDefinition(System.String)"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IConfigurableObjectFactory.ParentObjectFactory">
+            <summary>
+            Set the parent of this object factory.
+            </summary>
+            <remarks>
+            <p>
+            Note that the parent shouldn't be changed: it should only be set outside
+            a constructor if it isn't available when an object of this class is
+            created.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IConfigurableObjectFactory.ObjectPostProcessorCount">
+            <summary>
+            Returns the current number of registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s.
+            </summary>
+            <value>
+            The current number of registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.IAutowireCapableObjectFactory">
+            <summary>
+            Extension of the <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            interface to be implemented by object factories that are capable of
+            autowiring and expose this functionality for existing object instances.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IAutowireCapableObjectFactory.Autowire(System.Type,Spring.Objects.Factory.Config.AutoWiringMode,System.Boolean)">
+            <summary>
+            Create a new object instance of the given class with the specified
+            autowire strategy.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> of the object to instantiate.
+            </param>
+            <param name="autowireMode">
+            The desired autowiring mode.
+            </param>
+            <param name="dependencyCheck">
+            Whether to perform a dependency check for objects (not applicable to
+            autowiring a constructor, thus ignored there).
+            </param>
+            <returns>The new object instance.</returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the wiring fails.
+            </exception>
+            <seealso cref="T:Spring.Objects.Factory.Config.AutoWiringMode"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IAutowireCapableObjectFactory.AutowireObjectProperties(System.Object,Spring.Objects.Factory.Config.AutoWiringMode,System.Boolean)">
+            <summary>
+            Autowire the object properties of the given object instance by name or
+            <see cref="T:System.Type"/>.
+            </summary>
+            <param name="instance">
+            The existing object instance.
+            </param>
+            <param name="autowireMode">
+            The desired autowiring mode.
+            </param>
+            <param name="dependencyCheck">
+            Whether to perform a dependency check for the object.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the wiring fails.
+            </exception>
+            <seealso cref="T:Spring.Objects.Factory.Config.AutoWiringMode"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IAutowireCapableObjectFactory.ApplyObjectPostProcessorsBeforeInitialization(System.Object,System.String)">
+            <summary>
+            Apply <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+            to the given existing object instance, invoking their
+            <see cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization(System.Object,System.String)"/>
+            methods.
+            </summary>
+            <remarks>
+            <p>
+            The returned object instance may be a wrapper around the original.
+            </p>
+            </remarks>
+            <param name="instance">
+            The existing object instance.
+            </param>
+            <param name="name">
+            The name of the object.
+            </param>
+            <returns>
+            The object instance to use, either the original or a wrapped one.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If any post-processing failed.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IAutowireCapableObjectFactory.ApplyObjectPostProcessorsAfterInitialization(System.Object,System.String)">
+            <summary>
+            Apply <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+            to the given existing object instance, invoking their
+            <see cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization(System.Object,System.String)"/>
+            methods.
+            </summary>
+            <remarks>
+            <p>
+            The returned object instance may be a wrapper around the original.
+            </p>
+            </remarks>
+            <param name="instance">
+            The existing object instance.
+            </param>
+            <param name="name">
+            The name of the object.
+            </param>
+            <returns>
+            The object instance to use, either the original or a wrapped one.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If any post-processing failed.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory.GetObjectDefinition(System.String)">
+            <summary>
+            Return the registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+            given object, allowing access to its property values and constructor
+            argument values.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <returns>
+            The registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there is no object with the given name.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory.GetObjectDefinition(System.String,System.Boolean)">
+            <summary>
+            Return the registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+            given object, allowing access to its property values and constructor
+            argument values.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <param name="includeAncestors">Whether to search parent object factories.</param>
+            <returns>
+            The registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there is no object with the given name.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory.ConfigureObject(System.Object,System.String,Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Injects dependencies into the supplied <paramref name="target"/> instance
+            using the supplied <paramref name="definition"/>.
+            </summary>
+            <param name="target">
+            The object instance that is to be so configured.
+            </param>
+            <param name="name">
+            The name of the object definition expressing the dependencies that are to
+            be injected into the supplied <parameref name="target"/> instance.
+            </param>
+            <param name="definition">
+            An object definition that should be used to configure object.
+            </param>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory.PreInstantiateSingletons">
+            <summary>
+            Ensure that all non-lazy-init singletons are instantiated, also
+            considering <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s.
+            </summary>
+            <remarks>
+            <p>
+            Typically invoked at the end of factory setup, if desired.
+            </p>
+            <p>
+            As this is a startup method, it should destroy already created singletons if
+            it fails, to avoid dangling resources. In other words, after invocation
+            of that method, either all or no singletons at all should be
+            instantiated.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If one of the singleton objects could not be created.
+            </exception>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.EventValues">
+            <summary>
+            Holder for event handler values for an object.
+            </summary>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: EventValues.cs,v 1.8 2007/03/16 04:01:38 aseovic Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Config.EventValues.EmptyHandlers">
+            <summary>
+            The empty array of <see cref="T:Spring.Objects.IEventHandlerValue"/>s.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.EventValues.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.EventValues"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.EventValues.#ctor(Spring.Objects.Factory.Config.EventValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.EventValues"/> class.
+            </summary>
+            <param name="other">
+            The <see cref="T:Spring.Objects.Factory.Config.EventValues"/>
+            to be used to populate this instance.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.EventValues.AddAll(Spring.Objects.Factory.Config.EventValues)">
+            <summary>
+            Copy all given argument values into this object.
+            </summary>
+            <param name="other">
+            The <see cref="T:Spring.Objects.Factory.Config.EventValues"/>
+            to be used to populate this instance.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.EventValues.AddHandler(Spring.Objects.IEventHandlerValue)">
+            <summary>
+            Adds the supplied handler to the collection of event handlers.
+            </summary>
+            <param name="handler">The handler to be added.</param>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.EventValues.EventHandlers">
+            <summary>
+            The mapping of event names to an
+            <see cref="T:System.Collections.ICollection"/> of
+            <see cref="T:Spring.Objects.IEventHandlerValue"/>s.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.EventValues.Events">
+            <summary>
+            Gets the <see cref="T:System.Collections.ICollection"/> of events
+            that have handlers associated with them.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.EventValues.Item(System.String)">
+            <summary>
+            Gets the <see cref="T:System.Collections.ICollection"/> of
+            <see cref="T:Spring.Objects.IEventHandlerValue"/>s for the supplied
+            event name.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.ConfigurationReader">
+            <summary>
+            Various utility methods for .NET style .config files. 
+            </summary>
+            <remarks>
+            <p>
+            Currently supports reading custom configuration sections and returning them as 
+            <see cref="T:System.Collections.Specialized.NameValueCollection"/> objects.
+            </p>
+            </remarks>
+            <author>Simon White</author>
+            <author>Mark Pollack</author>
+            <version>$Id: ConfigurationReader.cs,v 1.18 2007/08/08 17:47:13 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConfigurationReader.Read(Spring.Core.IO.IResource,System.String)">
+            <summary>
+            Reads the specified configuration section into a
+            <see cref="T:System.Collections.Specialized.NameValueCollection"/>.
+            </summary>
+            <param name="resource">The resource to read.</param>
+            <param name="configSection">The section name.</param>
+            <returns>
+            A newly populated
+            <see cref="T:System.Collections.Specialized.NameValueCollection"/>.
+            </returns>
+            <exception cref="T:System.IO.IOException">
+            If any errors are encountered while attempting to open a stream
+            from the supplied <paramref name="resource"/>.
+            </exception>
+            <exception cref="T:System.Xml.XmlException">
+            If any errors are encountered while loading or reading (this only applies to
+            v1.1 and greater of the .NET Framework) the actual XML.
+            </exception>
+            <exception cref="T:System.Exception">
+            If any errors are encountered while loading or reading (this only applies to
+            v1.0 of the .NET Framework).
+            </exception>
+            <exception cref="T:Spring.Objects.FatalObjectException">
+            If the configuration section was otherwise invalid.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConfigurationReader.Read(Spring.Core.IO.IResource,System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Reads the specified configuration section into the supplied
+            <see cref="T:System.Collections.Specialized.NameValueCollection"/>.
+            </summary>
+            <param name="resource">The resource to read.</param>
+            <param name="configSection">The section name.</param>
+            <param name="properties">
+            The collection that is to be populated. May be
+            <see langword="null"/>.
+            </param>
+            <returns>
+            A newly populated
+            <see cref="T:System.Collections.Specialized.NameValueCollection"/>.
+            </returns>
+            <exception cref="T:System.IO.IOException">
+            If any errors are encountered while attempting to open a stream
+            from the supplied <paramref name="resource"/>.
+            </exception>
+            <exception cref="T:System.Xml.XmlException">
+            If any errors are encountered while loading or reading (this only applies to
+            v1.1 and greater of the .NET Framework) the actual XML.
+            </exception>
+            <exception cref="T:System.Exception">
+            If any errors are encountered while loading or reading (this only applies to
+            v1.0 of the .NET Framework).
+            </exception>
+            <exception cref="T:Spring.Objects.FatalObjectException">
+            If the configuration section was otherwise invalid.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConfigurationReader.Read(Spring.Core.IO.IResource,System.String,System.Collections.Specialized.NameValueCollection,System.Boolean)">
+            <summary>
+            Reads the specified configuration section into the supplied
+            <see cref="T:System.Collections.Specialized.NameValueCollection"/>.
+            </summary>
+            <param name="resource">The resource to read.</param>
+            <param name="configSection">The section name.</param>
+            <param name="properties">
+            The collection that is to be populated. May be
+            <see langword="null"/>.
+            </param>
+            <param name="overrideValues">
+            If a key already exists, is its value to be appended to the current
+            value or replaced?
+            </param>
+            <returns>
+            The populated
+            <see cref="T:System.Collections.Specialized.NameValueCollection"/>.
+            </returns>
+            <exception cref="T:System.IO.IOException">
+            If any errors are encountered while attempting to open a stream
+            from the supplied <paramref name="resource"/>.
+            </exception>
+            <exception cref="T:System.Xml.XmlException">
+            If any errors are encountered while loading or reading (this only applies to
+            v1.1 and greater of the .NET Framework) the actual XML.
+            </exception>
+            <exception cref="T:System.Exception">
+            If any errors are encountered while loading or reading (this only applies to
+            v1.0 of the .NET Framework).
+            </exception>
+            <exception cref="T:Spring.Objects.FatalObjectException">
+            If the configuration section was otherwise invalid.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConfigurationReader.ReadFromXmlDocument(System.Xml.XmlDocument,System.String)">
+            <summary>
+            Read from the specified configuration from the supplied XML
+            <paramref name="document"/> into a
+            <see cref="T:System.Collections.Specialized.NameValueCollection"/>.
+            </summary>
+            <remarks>
+            <note>
+            Does <b>not</b> support section grouping. The supplied XML
+            <paramref name="document"/> must already be loaded.
+            </note>
+            </remarks>
+            <param name="document">
+            The <see cref="T:System.Xml.XmlDocument"/> to read from.
+            </param>
+            <param name="configSectionName">
+            The configuration section name to read.
+            </param>
+            <returns>
+            A newly populated
+            <see cref="T:System.Collections.Specialized.NameValueCollection"/>.
+            </returns>
+            <exception cref="T:System.Xml.XmlException">
+            If any errors are encountered while reading (this only applies to
+            v1.1 and greater of the .NET Framework).
+            </exception>
+            <exception cref="T:System.Exception">
+            If any errors are encountered while reading (this only applies to
+            v1.0 of the .NET Framework).
+            </exception>
+            <exception cref="T:Spring.Objects.FatalObjectException">
+            If the configuration section was otherwise invalid.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConfigurationReader.PopulateFromAppConfig(System.Collections.Specialized.NameValueCollection,System.String,System.Boolean)">
+            <summary>
+            Populates the supplied <paramref name="properties"/> with values from
+            a .NET application configuration file.
+            </summary>
+            <param name="properties">
+            The <see cref="T:System.Collections.Specialized.NameValueCollection"/>
+            to add any key-value pairs to.
+            </param>
+            <param name="configSectionName">
+            The configuration section name in the a .NET application configuration
+            file.
+            </param>
+            <param name="overrideValues">
+            If a key already exists, is its value to be appended to the current
+            value or replaced?
+            </param>
+            <returns>
+            <see langword="true"/> if the supplied
+            <paramref name="configSectionName"/> was found.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConfigurationReader.#ctor">
+            <summary>
+            Creates a new instance of the ConfigurationReader class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly visible
+            constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Objects.Events.Support.EventManipulationUtils">
+            <summary>
+            Utility class to aid in the manipulation of events and delegates.
+            </summary>
+            <author>Griffin Caprio</author>
+            <version>$Id: EventManipulationUtils.cs,v 1.3 2007/07/31 01:35:12 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Events.Support.EventManipulationUtils.GetHandlerDelegate(System.Type,System.Object,System.Reflection.MethodInfo)">
+            <summary>
+            Returns a new instance of the requested <see cref="T:System.Delegate"/>.
+            </summary>
+            <remarks>
+            <p>
+            Often used to wire subscribers to event publishers.
+            </p>
+            </remarks>
+            <param name="delegateType">
+            The <see cref="T:System.Type"/> of delegate to create.
+            </param>
+            <param name="targetSubscriber">
+            The target subscriber object that contains the delegate implementation.
+            </param>
+            <param name="targetSubscriberDelegateMethod">
+            <see cref="T:System.Reflection.MethodInfo"/> referencing the delegate method on the subscriber.
+            </param>
+            <returns>
+            A delegate handler that can be added to an events list of handlers, or called directly.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Events.Support.EventManipulationUtils.GetMethodInfoMatchingSignature(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Queries the input type for a <see cref="T:System.Reflection.MethodInfo"/> signature matching the input
+            <see cref="T:System.Reflection.MethodInfo"/> signature.
+            </summary>
+            <remarks>
+            Typically used to query a potential subscriber to see if they implement an event handler.
+            </remarks>
+            <param name="invoke"><see cref="T:System.Reflection.MethodInfo"/> to match against</param>
+            <param name="subscriberType"><see cref="T:System.Type"/> to query</param>
+            <returns>
+            <see cref="T:System.Reflection.MethodInfo"/> matching input <see cref="T:System.Reflection.MethodInfo"/>
+            signature, or <see langword="null"/> if there is no match.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Events.Support.EventManipulationUtils.#ctor">
+            <summary>
+            Creates a new instance of the EventManipulationUtilities class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Expressions.IndexerNode">
+            <summary>
+            Represents parsed indexer node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IndexerNode.cs,v 1.16 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Expressions.NodeWithArguments">
+            <summary>
+            Base type for nodes that accept arguments.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: NodeWithArguments.cs,v 1.15 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Expressions.BaseNode">
+            <summary>
+            Base type for all expression nodes.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: BaseNode.cs,v 1.24 2007/09/07 03:01:21 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Expressions.SpringAST">
+            <summary>
+            For internal purposes only. Use <see cref="T:Spring.Expressions.BaseNode"/> for expression node implementations.
+            </summary>
+            <remarks>
+            This class is only required to enable serialization of parsed Spring expressions since antlr.CommonAST
+            unfortunately is not marked as [Serializable].<br/>
+            <br/>
+            <b>Note:</b>Since SpringAST implements <see cref="T:System.Runtime.Serialization.ISerializable"/>, deriving classes 
+            have to explicitely override <see cref="M:Spring.Expressions.SpringAST.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)"/> if they need to persist additional
+            data during serialization.
+            </remarks>
+        </member>
+        <member name="F:Spring.Expressions.SpringAST.Creator">
+            <summary>
+            The global SpringAST node factory
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SpringAST.#ctor">
+            <summary>
+            Create an instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SpringAST.#ctor(antlr.IToken)">
+            <summary>
+            Create an instance from a token
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SpringAST.initialize(antlr.collections.AST)">
+            <summary>
+            initialize this instance from an AST
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SpringAST.initialize(antlr.IToken)">
+            <summary>
+            initialize this instance from an IToken
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SpringAST.initialize(System.Int32,System.String)">
+            <summary>
+            initialize this instance from a token type number and a text
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SpringAST.setText(System.String)">
+            <summary>
+            sets the text of this node
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SpringAST.getText">
+            <summary>
+            gets the text of this node
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SpringAST.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SpringAST.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            populate SerializationInfo from this instance
+            </summary>
+        </member>
+        <member name="P:Spring.Expressions.SpringAST.Type">
+            <summary>
+            gets or sets the token type of this node
+            </summary>
+        </member>
+        <member name="P:Spring.Expressions.SpringAST.Text">
+            <summary>
+            gets or sets the text of this node
+            </summary>
+        </member>
+        <member name="T:Spring.Expressions.IExpression">
+            <summary>
+            Interface that all navigation expression nodes have to implement.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IExpression.cs,v 1.5 2007/07/31 08:18:20 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.IExpression.GetValue">
+            <summary>
+            Returns expression value.
+            </summary>
+            <returns>Value of the expression.</returns>
+        </member>
+        <member name="M:Spring.Expressions.IExpression.GetValue(System.Object)">
+            <summary>
+            Returns expression value.
+            </summary>
+            <param name="context">Object to evaluate expression against.</param>
+            <returns>Value of the expression.</returns>
+        </member>
+        <member name="M:Spring.Expressions.IExpression.GetValue(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Returns expression value.
+            </summary>
+            <param name="context">Object to evaluate expression against.</param>
+            <param name="variables">Expression variables map.</param>
+            <returns>Value of the expression.</returns>
+        </member>
+        <member name="M:Spring.Expressions.IExpression.SetValue(System.Object,System.Object)">
+            <summary>
+            Sets expression value.
+            </summary>
+            <param name="context">Object to evaluate expression against.</param>
+            <param name="newValue">New value for the last node of the expression.</param>
+        </member>
+        <member name="M:Spring.Expressions.IExpression.SetValue(System.Object,System.Collections.IDictionary,System.Object)">
+            <summary>
+            Sets expression value.
+            </summary>
+            <param name="context">Object to evaluate expression against.</param>
+            <param name="variables">Expression variables map.</param>
+            <param name="newValue">New value for the last node of the expression.</param>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.Spring#Expressions#IExpression#GetValue">
+            <summary>
+            Returns node's value.
+            </summary>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.Spring#Expressions#IExpression#GetValue(System.Object)">
+            <summary>
+            Returns node's value for the given context.
+            </summary>
+            <param name="context">Object to evaluate node against.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.Spring#Expressions#IExpression#GetValue(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Returns node's value for the given context.
+            </summary>
+            <param name="context">Object to evaluate node against.</param>
+            <param name="variables">Expression variables map.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.GetValue(System.Object,System.Collections.IDictionary)">
+            <summary>
+            This is the entrypoint into evaluating this expression.
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.GetValueInternal(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Called internally during expression evaluation
+            </summary>
+            <param name="context">Object to evaluate node against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns node's value for the given context.
+            </summary>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.Spring#Expressions#IExpression#SetValue(System.Object,System.Object)">
+            <summary>
+            Sets node's value for the given context.
+            </summary>
+            <param name="context">Object to evaluate node against.</param>
+            <param name="newValue">New value for this node.</param>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.Spring#Expressions#IExpression#SetValue(System.Object,System.Collections.IDictionary,System.Object)">
+            <summary>
+            Sets node's value for the given context.
+            </summary>
+            <param name="context">Object to evaluate node against.</param>
+            <param name="variables">Expression variables map.</param>
+            <param name="newValue">New value for this node.</param>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.SetValue(System.Object,System.Collections.IDictionary,System.Object)">
+            <summary>
+            This is the entrypoint into evaluating this expression.
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.SetValueInternal(System.Object,Spring.Expressions.BaseNode.EvaluationContext,System.Object)">
+            <summary>
+            Called internally during expression evaluation.
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.Set(System.Object,Spring.Expressions.BaseNode.EvaluationContext,System.Object)">
+            <summary>
+            Sets node's value for the given context.
+            </summary>
+            <remarks>
+            <p>
+            This is a default implementation of <c>Set</c> method, which
+            simply throws <see cref="T:System.NotSupportedException"/>. 
+            </p>
+            <p>
+            This was done in order to avoid redundant <c>Set</c> method implementations,
+            because most of the node types do not support value setting.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.ToString">
+            <summary>
+            Returns a string representation of this node instance.
+            </summary>
+        </member>
+        <member name="T:Spring.Expressions.BaseNode.EvaluationContext">
+            <summary>
+            Holds the state during evaluating an expression.
+            </summary>
+        </member>
+        <member name="F:Spring.Expressions.BaseNode.EvaluationContext.RootContext">
+            <summary>
+            Gets/Sets the root context of the current evaluation
+            </summary>
+        </member>
+        <member name="F:Spring.Expressions.BaseNode.EvaluationContext.ThisContext">
+            <summary>
+            Gets/Sets the current context of the current evaluation
+            </summary>
+        </member>
+        <member name="F:Spring.Expressions.BaseNode.EvaluationContext.Variables">
+            <summary>
+            Gets/Sets global variables of the current evaluation
+            </summary>
+        </member>
+        <member name="F:Spring.Expressions.BaseNode.EvaluationContext.LocalVariables">
+            <summary>
+            Gets/Sets local variables of the current evaluation
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.EvaluationContext.#ctor(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Initializes a new EvaluationContext instance.
+            </summary>
+            <param name="rootContext">The root context for this evaluation</param>
+            <param name="globalVariables">dictionary of global variables used during this evaluation</param>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.EvaluationContext.SwitchThisContext">
+            <summary>
+            Switches current ThisContext.
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.BaseNode.EvaluationContext.SwitchLocalVariables(System.Collections.IDictionary)">
+            <summary>
+            Switches current LocalVariables.
+            </summary>
+        </member>
+        <member name="P:Spring.Expressions.BaseNode.EvaluationContext.RootContextType">
+            <summary>
+            Gets the type of the <see cref="F:Spring.Expressions.BaseNode.EvaluationContext.RootContext"/>
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.NodeWithArguments.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.NodeWithArguments.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.NodeWithArguments.InitializeNode">
+            <summary>
+            Initializes the node. 
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.NodeWithArguments.AssertArgumentCount(System.Int32)">
+            <summary>
+            Asserts the argument count.
+            </summary>
+            <param name="requiredCount">The required count.</param>
+        </member>
+        <member name="M:Spring.Expressions.NodeWithArguments.ResolveArguments(Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Resolves the arguments.
+            </summary>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>An array of argument values</returns>
+        </member>
+        <member name="M:Spring.Expressions.NodeWithArguments.ResolveNamedArguments(Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Resolves the named arguments.
+            </summary>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>A dictionary of argument name to value mappings.</returns>
+        </member>
+        <member name="M:Spring.Expressions.NodeWithArguments.ResolveArgument(System.Int32,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Resolves the argument.
+            </summary>
+            <param name="position">Argument position.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Resolved argument value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.NodeWithArguments.ResolveNamedArgument(System.String,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Resolves the named argument.
+            </summary>
+            <param name="name">Argument name.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Resolved named argument value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.IndexerNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.IndexerNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.IndexerNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns node's value for the given context.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.IndexerNode.Set(System.Object,Spring.Expressions.BaseNode.EvaluationContext,System.Object)">
+            <summary>
+            Sets node's value for the given context.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <param name="newValue">New value for this node.</param>
+        </member>
+        <member name="M:Spring.Expressions.IndexerNode.GetPropertyInfo(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Utility method that is needed by ObjectWrapper and AbstractAutowireCapableObjectFactory.
+            </summary>
+            <param name="context">Context to resolve property against.</param>
+            <param name="variables">Expression variables map.</param>
+            <returns>PropertyInfo for this node.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpMatches">
+            <summary>
+            Represents logical MATCHES operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpMatches.cs,v 1.5 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Expressions.BinaryOperator">
+            <summary>
+            Base class for unary operators.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: BinaryOperator.cs,v 1.8 2007/09/07 03:01:21 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.BinaryOperator.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.BinaryOperator.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="P:Spring.Expressions.BinaryOperator.Left">
+            <summary>
+            Gets the left operand.
+            </summary>
+            <value>The left operand.</value>
+        </member>
+        <member name="P:Spring.Expressions.BinaryOperator.Right">
+            <summary>
+            Gets the right operand.
+            </summary>
+            <value>The right operand.</value>
+        </member>
+        <member name="M:Spring.Expressions.OpMatches.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpMatches.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpMatches.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical MATCHES operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>
+            true if the left operand matches the right operand, false otherwise.
+            </returns>
+        </member>
+        <member name="T:Spring.Expressions.LocalVariableNode">
+            <summary>
+            Represents parsed variable node.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: LocalVariableNode.cs,v 1.4 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.LocalVariableNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.LocalVariableNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.LocalVariableNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns value of the local variable represented by this node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.LocalVariableNode.Set(System.Object,Spring.Expressions.BaseNode.EvaluationContext,System.Object)">
+            <summary>
+            Sets value of the local variable represented by this node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <param name="newValue">New value for this node.</param>
+        </member>
+        <member name="T:Spring.Expressions.Processors.ICollectionProcessor">
+            <summary>
+            Defines an interface that should be implemented
+            by all collection processors and aggregators.
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.Processors.ICollectionProcessor.Process(System.Collections.ICollection,System.Object[])">
+            <summary>
+            Processes a list of source items and returns a result.
+            </summary>
+            <param name="source">
+            The source list to process.
+            </param>
+            <param name="args">
+            An optional processor arguments array.
+            </param>
+            <returns>
+            The processing result.
+            </returns>
+        </member>
+        <member name="T:Spring.Expressions.Processors.ReverseProcessor">
+            <summary>
+            Reverts order of elements in the list
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: ReverseProcessor.cs,v 1.1 2008/03/20 23:58:16 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.Processors.ReverseProcessor.Process(System.Collections.ICollection,System.Object[])">
+            <summary>
+            Processes a list of source items and returns a result.
+            </summary>
+            <param name="source">
+            The source list to process.
+            </param>
+            <param name="args">
+            An optional processor arguments array.
+            </param>
+            <returns>
+            The processing result.
+            </returns>
+        </member>
+        <member name="T:Spring.Expressions.DefaultNode">
+            <summary>
+            Represents parsed default node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DefaultNode.cs,v 1.3 2007/09/07 03:01:24 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.DefaultNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.DefaultNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.DefaultNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns left operand if it is not null, or the right operand if it is.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Core.TypeMismatchException">
+            <summary>
+            Exception thrown on a <see cref="T:System.Type"/> mismatch when trying to set a property
+            or resolve an argument to a method invocation.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: TypeMismatchException.cs,v 1.1 2007/07/31 00:08:42 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Core.PropertyAccessException">
+            <summary>
+            Superclass for exceptions related to a property access, such as a <see cref="T:System.Type"/>
+            mismatch or a target invocation exception.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: PropertyAccessException.cs,v 1.2 2007/07/31 03:47:22 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Util.ReflectionException">
+            <summary>
+            Superclass for all exceptions thrown in the Objects namespace and sub-namespaces.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ReflectionException.cs,v 1.1 2007/07/31 03:47:23 markpollack Exp $
+            </version>
+        </member>
+        <member name="M:Spring.Util.ReflectionException.#ctor">
+            <summary>Creates a new instance of the ObjectsException class.</summary>
+        </member>
+        <member name="M:Spring.Util.ReflectionException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the ObjectsException class. with the specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Util.ReflectionException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the ObjectsException class with the specified message
+            and root cause.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Util.ReflectionException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the ObjectsException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Core.IErrorCoded">
+            <summary>
+            Interface that can be implemented by exceptions etc that are error coded.
+            </summary>
+            <remarks>
+            <p>
+            The error code is a <see cref="T:System.String"/>, rather than a number, so it can
+            be given user-readable values, such as "object.failureDescription".
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.Net)</author>
+            <version>$Id: IErrorCoded.cs,v 1.6 2006/04/09 07:18:38 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Core.IErrorCoded.ErrorCode">
+            <summary>
+            Return the error code associated with this failure.
+            </summary>
+            <remarks>
+            <p>
+            The GUI can render this anyway it pleases, allowing for I18n etc.
+            </p>
+            </remarks>
+            <returns>
+            The <see cref="T:System.String"/> error code associated with this failure,
+            or the empty string instance if not error-coded.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.PropertyAccessException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="M:Spring.Core.PropertyAccessException.#ctor(System.String,Spring.Core.PropertyChangeEventArgs)">
+            <summary>
+            Create a new instance of the PropertyAccessException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="propertyChangeEvent">Describes the change attempted on the property.</param>
+        </member>
+        <member name="M:Spring.Core.PropertyAccessException.#ctor(System.String,Spring.Core.PropertyChangeEventArgs,System.Exception)">
+            <summary>
+            Create a new instance of the PropertyAccessException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="propertyChangeEvent">Describes the change attempted on the property.</param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Core.PropertyAccessException.#ctor">
+            <summary>
+            Creates a new instance of the PropertyAccessException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.PropertyAccessException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the PropertyAccessException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Core.PropertyAccessException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the PropertyAccessExceptionsException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Core.PropertyAccessException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the PropertyAccessExceptionsException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="P:Spring.Core.PropertyAccessException.PropertyChangeArgs">
+            <summary>
+            Returns the PropertyChangeEventArgs that resulted in the problem.
+            </summary>
+        </member>
+        <member name="P:Spring.Core.PropertyAccessException.ErrorCode">
+            <summary>
+            The string error code used to classify the error.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeMismatchException.#ctor">
+            <summary>
+            Creates a new instance of the TypeMismatchException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeMismatchException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the TypeMismatchException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Core.TypeMismatchException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the TypeMismatchException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Core.TypeMismatchException.#ctor(Spring.Core.PropertyChangeEventArgs,System.Type)">
+            <summary>
+            Creates a new instance of the TypeMismatchException class describing the
+            property and required type that could not used to set a property on the target object.
+            </summary>
+            <param name="propertyChangeEventArgs">
+            The description of the property that was to be changed.
+            </param>
+            <param name="requiredType">The target conversion type.</param>
+        </member>
+        <member name="M:Spring.Core.TypeMismatchException.#ctor(Spring.Core.PropertyChangeEventArgs,System.Type,System.Exception)">
+            <summary>
+            Creates a new instance of the TypeMismatchException class describing the
+            property, required type, and underlying exception that could not be used
+            to set a property on the target object.
+            </summary>
+            <param name="propertyChangeEventArgs">
+            The description of the property that was to be changed.
+            </param>
+            <param name="requiredType">The target conversion type.</param>
+            <param name="rootCause">The underlying exception.</param>
+        </member>
+        <member name="M:Spring.Core.TypeMismatchException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the TypeMismatchException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="P:Spring.Core.TypeMismatchException.ErrorCode">
+            <summary>
+            The string error code used to classify the exception.
+            </summary>
+        </member>
+        <member name="T:Spring.Core.MethodParametersCriteria">
+            <summary>
+            Criteria that is satisfied if the <see cref="T:System.Type"/> of each of the
+            parameters of a given <see cref="T:System.Reflection.MethodInfo"/> matches each
+            of the parameter <see cref="T:System.Type"/>s of a given
+            <see cref="T:System.Reflection.MethodInfo"/>.
+            </summary>
+            <remarks>
+            <p>
+            If no <see cref="T:System.Type"/> array is passed to the overloaded constructor,
+            any method that has no parameters will satisfy an instance of this
+            class. The same effect could be achieved by passing the
+            <see cref="F:System.Type.EmptyTypes"/> array to the overloaded constructor.
+            </p>
+            </remarks>
+            <author>Rick Evans</author>
+            <version>$Id: MethodParametersCriteria.cs,v 1.2 2007/09/20 14:20:46 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Core.ICriteria">
+            <summary>
+            The criteria for an arbitrary filter.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: ICriteria.cs,v 1.6 2006/04/09 07:18:38 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Core.ICriteria.IsSatisfied(System.Object)">
+            <summary>
+            Does the supplied <paramref name="datum"/> satisfy the criteria
+            encapsulated by this instance?
+            </summary>
+            <param name="datum">
+            The datum to be checked by this criteria instance.
+            </param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="datum"/>
+            satisfies the criteria encapsulated by this instance;
+            <see langword="false"/> if not, or the supplied
+            <paramref name="datum"/> is <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.MethodParametersCriteria.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.MethodParametersCriteria"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.MethodParametersCriteria.#ctor(System.Type[])">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.MethodParametersCriteria"/> class.
+            </summary>
+            <remarks>
+            <p>
+            If the supplied <paramref name="parameters"/> array is null, then this
+            constructor uses the <see cref="F:System.Type.EmptyTypes"/> array.
+            </p>
+            </remarks>
+            <param name="parameters">
+            The <see cref="T:System.Type"/> array that this criteria will use to
+            check parameter <see cref="T:System.Type"/>s.
+            </param>
+        </member>
+        <member name="M:Spring.Core.MethodParametersCriteria.IsSatisfied(System.Object)">
+            <summary>
+            Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+            this instance?
+            </summary>
+            <remarks>
+            <p>
+            This implementation respects the inheritance chain of any parameter
+            <see cref="T:System.Type"/>s... i.e. methods that have a base type (or
+            interface) that is assignable to the <see cref="T:System.Type"/> in the
+            same corresponding index of the parameter types will satisfy this
+            criteria instance.
+            </p>
+            </remarks>
+            <param name="datum">The datum to be checked by this criteria instance.</param>
+            <returns>
+            True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+            by this instance; false if not or the supplied <paramref name="datum"/> is null.
+            </returns>
+        </member>
+        <member name="T:Spring.Context.Support.TypeAliasesSectionHandler">
+            <summary>
+            Configuration section handler for the Spring.NET <c>typeAliases</c>
+            config section.
+            </summary>
+            <remarks>
+            <p>
+            Type aliases can be used instead of fully qualified type names anywhere
+            a type name is expected in a Spring.NET configuration file.
+            </p>
+            <p>
+            This includes type names specified within an object definition, as well
+            as values of the properties or constructor arguments that expect
+            <see cref="T:System.Type"/> instances.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            The following example shows how to configure both this section handler and
+            how to define type aliases within a Spring.NET config section:
+            </p>
+            <code escaped="true">
+            <configuration>
+                <configSections>
+            	    <sectionGroup name="spring">
+            		    <section name="typeAliases" type="Spring.Context.Support.TypeAliasesSectionHandler, Spring.Core"/>
+            	    </sectionGroup>
+                </configSections>
+                <spring>
+            	    <typeAliases>
+            		    <alias name="WebServiceExporter" type="Spring.Web.Services.WebServiceExporter, Spring.Web"/>
+            		    <alias name="MyType" type="MyCompany.MyProject.MyNamespace.MyType, MyAssembly"/>
+            		    ...
+            	    </typeAliases>
+            	    ...
+                </spring>
+            </configuration>
+            </code>
+            </example>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: TypeAliasesSectionHandler.cs,v 1.8 2007/07/31 18:15:50 bbaia Exp $</version>
+            <seealso cref="T:Spring.Core.TypeResolution.TypeRegistry"/>
+        </member>
+        <member name="M:Spring.Context.Support.TypeAliasesSectionHandler.Create(System.Object,System.Object,System.Xml.XmlNode)">
+            <summary>
+            Populates <see cref="T:Spring.Core.TypeResolution.TypeRegistry"/> using values specified in
+            the <c>typeAliases</c> config section.
+            </summary>
+            <param name="parent">
+            The configuration settings in a corresponding parent
+            configuration section.
+            </param>
+            <param name="configContext">
+            The configuration context when called from the ASP.NET
+            configuration system. Otherwise, this parameter is reserved and
+            is <see langword="null"/>.
+            </param>
+            <param name="section">
+            The <see cref="T:System.Xml.XmlNode"/> for the section.
+            </param>
+            <returns>
+            This method always returns <see langword="null"/>, because the
+            <see cref="T:Spring.Core.TypeResolution.TypeRegistry"/> is populated as a side-effect of this
+            object's execution and thus there is no need to return anything.
+            </returns>
+        </member>
+        <member name="T:Spring.Context.Support.ResourceHandlersSectionHandler">
+            <summary>
+            Handler for Spring.NET <c>resourceHandlers</c> config section.
+            </summary>
+            <remarks>
+            <p>
+            Spring allows registration of custom resource handlers that can be used to load
+            object definitions from.
+            </p>
+            <p>
+            For example, if you wanted to store your object definitions in a database instead
+            of in the config file, you could write a custom <see cref="T:Spring.Core.IO.IResource"/> implementation
+            and register it with Spring using 'db' as a protocol name.
+            </p>
+            <p>
+            Afterwards, you would simply specify resource URI within the <c>context</c> config element
+            using your custom resource handler.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            The following example shows how to configure both this section handler,
+            how to define custom resource within Spring config section, and how to load
+            object definitions using custom resource handler:
+            </p>
+            <code escaped="true">
+            <configuration>
+                <configSections>
+            	    <sectionGroup name="spring">
+            		    <section name="resourceHandlers" type="Spring.Context.Support.ResourceHandlersSectionHandler, Spring.Core"/>
+            	    </sectionGroup>
+                </configSections>
+                <spring>
+            	    <resourceHandlers>
+            		    <handler protocol="db" type="MyCompany.MyApp.Resources.MyDbResource, MyAssembly"/>
+            	    </resourceHandlers>
+            	    <context>
+            	        <resource uri="db://user:pass@dbName/MyDefinitionsTable"/>
+            	    </context>
+                </spring>
+            </configuration>
+            </code>
+            </example>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ResourceHandlersSectionHandler.cs,v 1.3 2007/08/08 17:46:37 bbaia Exp $</version>
+            <seealso cref="T:Spring.Core.IO.IResource"/>
+        </member>
+        <member name="M:Spring.Context.Support.ResourceHandlersSectionHandler.Create(System.Object,System.Object,System.Xml.XmlNode)">
+            <summary>
+            Registers resource handlers that are specified in
+            the <c>resources</c> config section with the <see cref="T:Spring.Core.IO.ResourceHandlerRegistry"/>.
+            </summary>
+            <param name="parent">
+            The configuration settings in a corresponding parent
+            configuration section. Ignored.
+            </param>
+            <param name="configContext">
+            The configuration context when called from the ASP.NET
+            configuration system. Otherwise, this parameter is reserved and
+            is <see langword="null"/>.
+            </param>
+            <param name="section">
+            The <see cref="T:System.Xml.XmlNode"/> for the section.
+            </param>
+            <returns>
+            This method always returns <c>null</c>, because resource handlers are registered
+            as a sideffect of its execution and there is no need to return anything.
+            </returns>
+        </member>
+        <member name="T:Spring.Context.IConfigurableApplicationContext">
+            <summary>
+            Provides the means to configure an application context in addition to
+            the methods exposed on the
+            <see cref="T:Spring.Context.IApplicationContext"/> interface.
+            </summary>
+            <remarks>
+            <p>
+            This interface is to be implemented by most (if not all)
+            <see cref="T:Spring.Context.IApplicationContext"/> implementations.
+            </p>
+            <p>
+            Configuration and lifecycle methods are encapsulated here to avoid
+            making them obvious to <see cref="T:Spring.Context.IApplicationContext"/>
+            client code.
+            </p>
+            <p>
+            Calling <see cref="M:System.IDisposable.Dispose"/> will close this
+            application context, releasing all resources and locks that the
+            implementation might hold. This includes disposing all cached
+            <b>singleton</b> objects.
+            </p>
+            <note type="caution">
+            <see cref="M:System.IDisposable.Dispose"/> does <i>not</i> invoke the
+            attendant <see cref="M:System.IDisposable.Dispose"/> on any parent
+            context.
+            </note>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IConfigurableApplicationContext.cs,v 1.10 2006/04/09 07:18:38 markpollack Exp $</version>
+            <seealso cref="T:System.IDisposable"/>
+            <seealso cref="T:Spring.Context.IApplicationContext"/>
+        </member>
+        <member name="T:Spring.Context.IApplicationContext">
+            <summary>
+            The central interface to Spring.NET's IoC container.
+            </summary>
+            <remarks>
+            <p>
+            <see cref="T:Spring.Context.IApplicationContext"/> implementations
+            provide:
+            <list type="bullet">
+            <item>
+            <description>
+            Object factory functionality inherited from the
+            <see cref="T:Spring.Objects.Factory.IListableObjectFactory"/>
+            and <see cref="T:Spring.Objects.Factory.IHierarchicalObjectFactory"/>
+            interfaces.
+            </description>
+            </item>
+            <item>
+            <description>
+            The ability to resolve messages, supporting internationalization.
+            Inherited from the <see cref="T:Spring.Context.IMessageSource"/>
+            interface.
+            </description>
+            </item>
+            <item>
+            <description>
+            The ability to load file resources in a generic fashion.
+            Inherited from the <see cref="T:Spring.Core.IO.IResourceLoader"/>
+            interface.
+            </description>
+            </item>
+            <item>
+            <description>
+            Acts an an event registry for supporting loosely coupled eventing
+            between objecs. Inherited from the
+            <see cref="T:Spring.Objects.Events.IEventRegistry"/> interface.
+            </description>
+            </item>
+            <item>
+            <description>
+            The ability to raise events related to the context lifecycle. Inherited
+            from the <see cref="T:Spring.Context.IApplicationEventPublisher"/>
+            interface.
+            </description>
+            </item>
+            <item>
+            <description>
+            Inheritance from a parent context. Definitions in a descendant context
+            will always take priority.
+            </description>
+            </item>
+            </list>
+            </p>
+            <p>
+            In addition to standard object factory lifecycle capabilities,
+            <see cref="T:Spring.Context.IApplicationContext"/> implementations need
+            to detect
+            <see cref="T:Spring.Context.IApplicationContextAware"/>,
+            <see cref="T:Spring.Objects.Events.IEventRegistryAware"/>, and
+            <see cref="T:Spring.Context.IMessageSourceAware"/> objects and supply
+            their attendant dependencies accordingly.
+            </p>
+            <p>
+            This interface is the central client interface in Spring.NET's IoC
+            container implementation. As such it does inherit a quite sizeable
+            number of interfaces; implementations are strongly encouraged to use
+            composition to satisfy each of the inherited interfaces (where
+            appropriate of course).
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <seealso cref="T:Spring.Context.Support.AbstractApplicationContext"/>
+            <seealso cref="T:Spring.Context.Support.XmlApplicationContext"/>
+            <seealso cref="T:Spring.Context.Support.DelegatingMessageSource"/>
+            <seealso cref="T:Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>
+            <version>$Id: IApplicationContext.cs,v 1.15 2007/08/08 17:46:37 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Context.IMessageSource">
+            <summary>
+            Describes an object that can resolve messages.
+            </summary>
+            <remarks>
+            <p> 
+            This enables the parameterization and internationalization of messages.
+            </p>
+            <p>
+            Spring.NET provides one out-of-the-box implementation for production
+            use:
+            <ul>
+            <li><see cref="T:Spring.Context.Support.ResourceSetMessageSource"/>.</li>
+            </ul>
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IMessageSource.cs,v 1.13 2007/07/02 21:24:39 markpollack Exp $</version>
+            <seealso cref="T:Spring.Context.Support.ResourceSetMessageSource"/>
+        </member>
+        <member name="M:Spring.Context.IMessageSource.GetMessage(System.String)">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <remarks>
+            <p>
+            If the lookup is not successful, implementations are permitted to
+            take one of two actions.
+            </p>
+            <list type="bullet">
+            <item>
+            <description>Throw an exception.</description>
+            </item>
+            <item>
+            <description>
+            Return the supplied <paramref name="name"/> as is.
+            </description>
+            </item>
+            </list>
+            </remarks>
+            <param name="name">The name of the message to resolve.</param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+        </member>
+        <member name="M:Spring.Context.IMessageSource.GetMessage(System.String,System.Object[])">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <remarks>
+            <p>
+            If the lookup is not successful, implementations are permitted to
+            take one of two actions.
+            </p>
+            <list type="bullet">
+            <item>
+            <description>Throw an exception.</description>
+            </item>
+            <item>
+            <description>
+            Return the supplied <paramref name="name"/> as is.
+            </description>
+            </item>
+            </list>
+            </remarks>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="arguments">
+            The array of arguments that will be filled in for parameters within
+            the message, or <see langword="null"/> if there are no parameters
+            within the message. Parameters within a message should be
+            referenced using the same syntax as the format string for the
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> method.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+        </member>
+        <member name="M:Spring.Context.IMessageSource.GetMessage(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <remarks>
+            Note that the fallback behavior based on CultureInfo seem to 
+            have a bug that is fixed by installed .NET 1.1 Service Pack 1.  
+            <p>
+            If the lookup is not successful, implementations are permitted to
+            take one of two actions.
+            </p>
+            <list type="bullet">
+            <item>
+            <description>Throw an exception.</description>
+            </item>
+            <item>
+            <description>
+            Return the supplied <paramref name="name"/> as is.
+            </description>
+            </item>
+            </list>
+            </remarks>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+        </member>
+        <member name="M:Spring.Context.IMessageSource.GetMessage(System.String,System.Globalization.CultureInfo,System.Object[])">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <remarks>
+            Note that the fallback behavior based on CultureInfo seem to 
+            have a bug that is fixed by installed .NET 1.1 Service Pack 1.      
+            <p>
+            If the lookup is not successful, implementations are permitted to
+            take one of two actions.
+            </p>
+            <list type="bullet">
+            <item>
+            <description>Throw an exception.</description>
+            </item>
+            <item>
+            <description>
+            Return the supplied <paramref name="name"/> as is.
+            </description>
+            </item>
+            </list>
+            </remarks>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.
+            </param>
+            <param name="arguments">
+            The array of arguments that will be filled in for parameters within
+            the message, or <see langword="null"/> if there are no parameters
+            within the message. Parameters within a message should be
+            referenced using the same syntax as the format string for the
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> method.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+        </member>
+        <member name="M:Spring.Context.IMessageSource.GetMessage(System.String,System.String,System.Globalization.CultureInfo,System.Object[])">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <remarks>
+            Note that the fallback behavior based on CultureInfo seem to 
+            have a bug that is fixed by installed .NET 1.1 Service Pack 1.      
+            <p>
+            If the lookup is not successful, implementations are permitted to
+            take one of two actions.
+            </p>
+            <list type="bullet">
+            <item>
+            <description>Throw an exception.</description>
+            </item>
+            <item>
+            <description>
+            Return the supplied <paramref name="name"/> as is.
+            </description>
+            </item>
+            </list>
+            </remarks>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="defaultMessage">The default message if name is not found.</param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.
+            </param>
+            <param name="arguments">
+            The array of arguments that will be filled in for parameters within
+            the message, or <see langword="null"/> if there are no parameters
+            within the message. Parameters within a message should be
+            referenced using the same syntax as the format string for the
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> method.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+        </member>
+        <member name="M:Spring.Context.IMessageSource.GetMessage(Spring.Context.IMessageSourceResolvable,System.Globalization.CultureInfo)">
+            <summary>
+            Resolve the message using all of the attributes contained within
+            the supplied <see cref="T:Spring.Context.IMessageSourceResolvable"/>
+            argument.
+            </summary>
+            <param name="resolvable">
+            The value object storing those attributes that are required to
+            properly resolve a message.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be resolved.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.IMessageSource.GetResourceObject(System.String)">
+            <summary>
+            Gets a localized resource object identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <remarks>
+            <p>
+            This method must use the
+            <see cref="P:System.Globalization.CultureInfo.CurrentUICulture"/>
+            value to obtain a resource.
+            </p>
+            <p>
+            Examples of resources that may be resolved by this method include
+            (but are not limited to) objects such as icons and bitmaps.
+            </p>
+            </remarks>
+            <param name="name">
+            The name of the resource object to resolve.
+            </param>
+            <returns>
+            The resolved object, or <see langword="null"/> if not found.
+            </returns>
+        </member>
+        <member name="M:Spring.Context.IMessageSource.GetResourceObject(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Gets a localized resource object identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <remarks>
+            <p>
+            Examples of resources that may be resolved by this method include
+            (but are not limited to) objects such as icons and bitmaps.
+            </p>
+            </remarks>
+            <param name="name">
+            The name of the resource object to resolve.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.
+            </param>
+            <returns>
+            The resolved object, or <see langword="null"/> if not found.
+            </returns>
+        </member>
+        <member name="M:Spring.Context.IMessageSource.ApplyResources(System.Object,System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Applies resources to object properties.
+            </summary>
+            <remarks>
+            <p>
+            Resource key names are of the form <c>objectName.propertyName</c>.
+            </p>
+            </remarks>
+            <param name="value">
+            An object that contains the property values to be applied.
+            </param>
+            <param name="objectName">
+            The base name of the object to use for key lookup.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.
+            </param>
+        </member>
+        <member name="T:Spring.Context.IApplicationEventPublisher">
+            <summary>
+            Encapsulates event publication functionality.
+            </summary>
+            <remarks>
+            <p>
+            Serves as a super-interface for the
+            <see cref="T:Spring.Context.IApplicationContext"/> interface.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IApplicationEventPublisher.cs,v 1.2 2006/04/09 07:18:38 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Context.IApplicationEventPublisher.PublishEvent(System.Object,Spring.Context.ApplicationEventArgs)">
+            <summary>
+            Publishes an application context event.
+            </summary>
+            <param name="sender">
+            The source of the event. May be <see langword="null"/>.
+            </param>
+            <param name="e">
+            The event that is to be raised.
+            </param>
+        </member>
+        <member name="T:Spring.Core.IO.IResourceLoader">
+            <summary>
+            Describes an object that can load
+            <see cref="T:Spring.Core.IO.IResource"/>s.
+            </summary>
+            <remarks>
+            <p>
+            An <see cref="T:Spring.Context.IApplicationContext"/> implementation is
+            generally required to support the functionality described by this
+            interface.
+            </p>
+            <p>
+            The <see cref="T:Spring.Core.IO.ConfigurableResourceLoader"/> class is a
+            standalone implementation that is usable outside an
+            <see cref="T:Spring.Context.IApplicationContext"/>; the aforementioned
+            class is also used by the
+            <see cref="T:Spring.Core.IO.ResourceConverter"/> class.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IResourceLoader.cs,v 1.12 2007/08/08 17:46:55 bbaia Exp $</version>
+            <seealso cref="T:Spring.Core.IO.IResource"/>
+            <seealso cref="T:Spring.Core.IO.ResourceConverter"/>
+            <seealso cref="T:Spring.Core.IO.ConfigurableResourceLoader"/>
+        </member>
+        <member name="M:Spring.Core.IO.IResourceLoader.GetResource(System.String)">
+            <summary>
+            Return an <see cref="T:Spring.Core.IO.IResource"/> handle for the
+            specified resource.
+            </summary>
+            <remarks>
+            <p>
+            The handle should always be a reusable resource descriptor; this
+            allows one to make repeated calls to the underlying
+            <see cref="P:Spring.Core.IO.IInputStreamSource.InputStream"/>.
+            </p>
+            <p>
+            <ul>
+            <li>
+            <b>Must</b> support fully qualified URLs, e.g. "file:C:/test.dat".
+            </li>
+            <li>
+            Should support relative file paths, e.g. "test.dat" (this will be
+            implementation-specific, typically provided by an
+            <see cref="T:Spring.Context.IApplicationContext"/> implementation).
+            </li>
+            </ul>
+            </p>
+            <note>
+            An <see cref="T:Spring.Core.IO.IResource"/> handle does not imply an
+            existing resource; you need to check the value of an
+            <see cref="T:Spring.Core.IO.IResource"/>'s
+            <see cref="P:Spring.Core.IO.IResource.Exists"/> property to determine
+            conclusively whether or not the resource actually exists.
+            </note>
+            </remarks>
+            <param name="location">The resource location.</param>
+            <returns>
+            An appropriate <see cref="T:Spring.Core.IO.IResource"/> handle.
+            </returns>
+            <seealso cref="T:Spring.Core.IO.IResource"/>
+            <seealso cref="P:Spring.Core.IO.IResource.Exists"/>
+            <seealso cref="T:Spring.Context.IApplicationContext"/>
+        </member>
+        <member name="T:Spring.Objects.Events.IEventRegistry">
+            <summary>
+            A registry that manages subscriptions to and the
+            publishing of events.
+            </summary>
+            <author>Griffin Caprio</author>
+            <version>$Id: IEventRegistry.cs,v 1.5 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Events.IEventRegistry.PublishEvents(System.Object)">
+            <summary>
+            Publishes <b>all</b> events of the source object.
+            </summary>
+            <param name="sourceObject">
+            The source object containing events to publish.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Events.IEventRegistry.Subscribe(System.Object)">
+            <summary>
+            Subscribes to <b>all</b> events published, if the subscriber
+            implements compatible handler methods.
+            </summary>
+            <param name="subscriber">The subscriber to use.</param>
+        </member>
+        <member name="M:Spring.Objects.Events.IEventRegistry.Subscribe(System.Object,System.Type)">
+            <summary>
+            Subscribes to the published events of all objects of a given
+            <see cref="T:System.Type"/>, if the subscriber implements
+            compatible handler methods.
+            </summary>
+            <param name="subscriber">The subscriber to use.</param>
+            <param name="targetSourceType">
+            The target <see cref="T:System.Type"/> to subscribe to.
+            </param>
+        </member>
+        <member name="E:Spring.Context.IApplicationContext.ContextEvent">
+            <summary>
+            Raised in response to an application context event.
+            </summary>
+        </member>
+        <member name="P:Spring.Context.IApplicationContext.StartupDate">
+            <summary>
+            Returns the date and time this context was loaded.
+            </summary>
+            <remarks>
+            <p>
+            This is to be set immediately after an 
+            <see cref="T:Spring.Context.IApplicationContext"/> has been
+            instantiated and its configuration has been loaded. Implementations
+            are permitted to update this value if the context is reset or
+            refreshed in some way.
+            </p>
+            </remarks>
+            <returns>
+            The <see cref="T:System.DateTime"/> representing when this context
+            was loaded.
+            </returns>
+            <seealso cref="M:Spring.Context.IConfigurableApplicationContext.Refresh"/>
+        </member>
+        <member name="P:Spring.Context.IApplicationContext.ParentContext">
+            <summary>
+            Gets the parent context, or <see langword="null"/> if there is no
+            parent context.
+            </summary>
+            <remarks>
+            <p>
+            If the parent context is <see langword="null"/>, then this context
+            is the root of any context hierarchy.
+            </p>
+            </remarks>
+            <returns>
+            The parent context, or <see langword="null"/>  if there is no
+            parent.
+            </returns>
+        </member>
+        <member name="P:Spring.Context.IApplicationContext.Name">
+            <summary>
+            Gets and sets a name for this context.
+            </summary>
+            <returns>
+            A name for this context.
+            </returns>
+        </member>
+        <member name="M:Spring.Context.IConfigurableApplicationContext.AddObjectFactoryPostProcessor(Spring.Objects.Factory.Config.IObjectFactoryPostProcessor)">
+            <summary>
+            Add an
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            that will get applied to the internal object factory of this
+            application context on refresh, before any of the object
+            definitions are evaluated.
+            </summary>
+            <remarks>
+            <p>
+            To be invoked during context configuration.
+            </p>
+            </remarks>
+            <param name="objectFactoryPostProcessor">
+            The factory processor to register.
+            </param>
+            <seealso cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+        </member>
+        <member name="M:Spring.Context.IConfigurableApplicationContext.Refresh">
+            <summary>
+            Load or refresh the persistent representation of the configuration,
+            which might an XML file, properties file, or relational database schema.
+            </summary>
+            <exception cref="T:Spring.Context.ApplicationContextException">
+            If the configuration cannot be loaded.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object factory could not be initialized.
+            </exception>
+        </member>
+        <member name="P:Spring.Context.IConfigurableApplicationContext.ObjectFactory">
+            <summary>
+            Return the internal object factory of this application context.
+            </summary>
+            <remarks>
+            <p>
+            Can be used to access specific functionality of the factory.
+            </p>
+            <note type="caution">
+            This is just guaranteed to return an instance that is not 
+            <see langword="null"/> <i>after</i> the context has been refreshed
+            at least once.
+            </note>
+            <note type="caution">
+            Do not use this to post-process the object factory; singletons
+            will already have been instantiated. Use an
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            to intercept the object factory setup process before objects even
+            get touched.
+            </note>
+            </remarks>
+            <seealso cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+        </member>
+        <member name="P:Spring.Context.IConfigurableApplicationContext.ParentContext">
+            <summary>
+            Sets the parent of this application context.
+            </summary>
+            <remarks>
+            <note>
+            The parent should <b>not</b> be changed: it should only be set
+            outside a constructor if it isn't available when an instance of
+            this class is created.
+            </note>
+            </remarks>
+            <value>
+            The parent context.
+            </value>
+        </member>
+        <member name="T:Spring.Collections.ImmutableSet">
+            <summary>
+            Implements an immutable (read-only)
+            <see cref="T:Spring.Collections.ISet"/> wrapper.
+            </summary>
+            <remarks>
+            <p>
+            Although this class is advertised as immutable, it really isn't.
+            Anyone with access to the wrapped <see cref="T:Spring.Collections.ISet"/>
+            can still change the data. So <see cref="M:System.Object.GetHashCode"/>
+            is not implemented for this <see cref="T:Spring.Collections.ISet"/>, as
+            is the case for all <see cref="T:Spring.Collections.ISet"/>
+            implementations in this library. This design decision was based on the
+            efficiency of not having to <b>clone</b> the wrapped
+            <see cref="T:Spring.Collections.ISet"/> every time you wrap a mutable
+            <see cref="T:Spring.Collections.ISet"/>.
+            </p>
+            </remarks>
+            <version>$Id: ImmutableSet.cs,v 1.6 2007/03/16 04:01:28 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Collections.Set">
+            <summary>
+            A collection that contains no duplicate elements.
+            </summary>
+            <seealso cref="T:Spring.Collections.ISet"/>
+            <version>$Id: Set.cs,v 1.7 2007/03/16 04:01:28 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Collections.ISet">
+            <summary>
+            A collection that contains no duplicate elements.
+            </summary>
+            <remarks>
+            <p>
+            This interface models the mathematical
+            <see cref="T:Spring.Collections.ISet"/> abstraction. The order of
+            elements in a set is dependant on (a)the data-structure implementation, and 
+            (b)the implementation of the various
+            <see cref="T:Spring.Collections.ISet"/> methods, and thus is not
+            guaranteed.
+            </p>
+            <p>
+            <see cref="T:Spring.Collections.ISet"/> overrides the
+            <see cref="M:System.Object.Equals(System.Object)"/> method to test for "equivalency":
+            whether the two sets contain the same elements. The "==" and "!="
+            operators are not overridden by design, since it is often desirable to
+            compare object references for equality.
+            </p>
+            <p>
+            Also, the <see cref="M:System.Object.GetHashCode"/> method is not
+            implemented on any of the set implementations, since none of them are
+            truly immutable. This is by design, and it is the way almost all
+            collections in the .NET framework function. So as a general rule, don't
+            store collection objects inside <see cref="T:Spring.Collections.ISet"/>
+            instances. You would typically want to use a keyed
+            <see cref="T:System.Collections.IDictionary"/> instead.
+            </p>
+            <p>
+            None of the <see cref="T:Spring.Collections.ISet"/> implementations in
+            this library are guaranteed to be thread-safe in any way unless wrapped
+            in a <see cref="T:Spring.Collections.SynchronizedSet"/>.
+            </p>
+            <p>
+            The following table summarizes the binary operators that are supported
+            by the <see cref="T:Spring.Collections.ISet"/> class.
+            </p>
+            <list type="table">
+            	<listheader>
+            		<term>Operation</term>
+            		<term>Description</term>
+            		<term>Method</term>
+            	</listheader>
+            	<item>
+            		<term>Union (OR)</term>
+            		<term>
+            		Element included in result if it exists in either <c>A</c> OR
+            		<c>B</c>.
+            		</term>
+            		<term><c>Union()</c></term>
+            	</item>
+            	<item>
+            		<term>Intersection (AND)</term>
+            		<term>
+            		Element included in result if it exists in both <c>A</c> AND
+            		<c>B</c>.
+            		</term>
+            		<term><c>InterSect()</c></term>
+            	</item>
+            	<item>
+            		<term>Exclusive Or (XOR)</term>
+            		<term>
+            		Element included in result if it exists in one, but not both,
+            		of <c>A</c> and <c>B</c>.
+            		</term>
+            		<term><c>ExclusiveOr()</c></term>
+            	</item>
+            	<item>
+            		<term>Minus (n/a)</term>
+            		<term>
+            		Take all the elements in <c>A</c>. Now, if any of them exist in
+            		 <c>B</c>, remove them. Note that unlike the other operators,
+            		 <c>A - B</c> is not the same as <c>B - A</c>.
+            		 </term>
+            		<term><c>Minus()</c></term>
+            	</item>
+            </list>
+            </remarks>
+            <version>$Id: ISet.cs,v 1.5 2006/04/09 07:18:37 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Collections.ISet.Union(Spring.Collections.ISet)">
+            <summary>
+            Performs a "union" of the two sets, where all the elements
+            in both sets are present. 
+            </summary>
+            <remarks>
+            <p>
+            That is, the element is included if it is in either
+            <paramref name="setOne"/> or this set. Neither this set nor the input
+            set are modified during the operation. The return value is a
+            <b>clone</b> of this set with the extra elements added in.
+            </p>
+            </remarks>
+            <param name="setOne">A collection of elements.</param>
+            <returns>
+            A new <see cref="T:Spring.Collections.ISet"/> containing the union of
+            this <see cref="T:Spring.Collections.ISet"/> with the specified
+            collection. Neither of the input objects is modified by the union.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ISet.Intersect(Spring.Collections.ISet)">
+            <summary>
+            Performs an "intersection" of the two sets, where only the elements
+            that are present in both sets remain.
+            </summary>
+            <remarks>
+            <p>
+            That is, the element is included if it exists in both sets. The
+            <c>Intersect()</c> operation does not modify the input sets. It
+            returns a <b>clone</b> of this set with the appropriate elements
+            removed.
+            </p>
+            </remarks>
+            <param name="setOne">A set of elements.</param>
+            <returns>
+            The intersection of this set with <paramref name="setOne"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ISet.Minus(Spring.Collections.ISet)">
+            <summary>
+            Performs a "minus" of this set from the <paramref name="setOne"/>
+            set.
+            </summary>
+            <remarks>
+            <p>
+            This returns a set of all the elements in set
+            <paramref name="setOne"/>, removing the elements that are also in
+            this set. The original sets are not modified during this operation.
+            The result set is a <b>clone</b> of this
+            <see cref="T:Spring.Collections.ISet"/> containing the elements from
+            the operation.
+            </p>
+            </remarks>
+            <param name="setOne">A set of elements.</param>
+            <returns>
+            A set containing the elements from this set with the elements in
+            <paramref name="setOne"/> removed.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ISet.ExclusiveOr(Spring.Collections.ISet)">
+            <summary>
+            Performs an "exclusive-or" of the two sets, keeping only those
+            elements that are in one of the sets, but not in both.
+            </summary>
+            <remarks>
+            <p>
+            The original sets are not modified during this operation. The
+            result set is a <b>clone</b> of this set containing the elements
+            from the exclusive-or operation.
+            </p>
+            </remarks>
+            <param name="setOne">A set of elements.</param>
+            <returns>
+            A set containing the result of
+            <c><paramref name="setOne"/> ^ this</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ISet.Contains(System.Object)">
+            <summary>
+            Returns <see langword="true"/> if this set contains the specified
+            element.
+            </summary>
+            <param name="element">The element to look for.</param>
+            <returns>
+            <see langword="true"/> if this set contains the specified element.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ISet.ContainsAll(System.Collections.ICollection)">
+            <summary>
+            Returns <see langword="true"/> if the set contains all the
+            elements in the specified collection.
+            </summary>
+            <param name="collection">A collection of objects.</param>
+            <returns>
+            <see langword="true"/> if the set contains all the elements in the
+            specified collection.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ISet.Add(System.Object)">
+            <summary>
+            Adds the specified element to this set if it is not already present.
+            </summary>
+            <param name="element">The object to add to the set.</param>
+            <returns>
+            <see langword="true"/> is the object was added,
+            <see langword="true"/> if the object was already present.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ISet.AddAll(System.Collections.ICollection)">
+            <summary>
+            Adds all the elements in the specified collection to the set if
+            they are not already present.
+            </summary>
+            <param name="collection">A collection of objects to add to the set.</param>
+            <returns>
+            <see langword="true"/> is the set changed as a result of this
+            operation.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ISet.Remove(System.Object)">
+            <summary>
+            Removes the specified element from the set.
+            </summary>
+            <param name="element">The element to be removed.</param>
+            <returns>
+            <see langword="true"/> if the set contained the specified element.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ISet.RemoveAll(System.Collections.ICollection)">
+            <summary>
+            Remove all the specified elements from this set, if they exist in
+            this set.
+            </summary>
+            <param name="collection">A collection of elements to remove.</param>
+            <returns>
+            <see langword="true"/> if the set was modified as a result of this
+            operation.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ISet.RetainAll(System.Collections.ICollection)">
+            <summary>
+            Retains only the elements in this set that are contained in the
+            specified collection.
+            </summary>
+            <param name="collection">
+            The collection that defines the set of elements to be retained.
+            </param>
+            <returns>
+            <see langword="true"/> if this set changed as a result of this
+            operation.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ISet.Clear">
+            <summary>
+            Removes all objects from this set.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.ISet.IsEmpty">
+            <summary>
+            Returns <see langword="true"/> if this set contains no elements.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.Set.Union(Spring.Collections.ISet)">
+            <summary>
+            Performs a "union" of the two sets, where all the elements
+            in both sets are present. 
+            </summary>
+            <param name="setOne">A collection of elements.</param>
+            <returns>
+            A new <see cref="T:Spring.Collections.ISet"/> containing the union of
+            this <see cref="T:Spring.Collections.ISet"/> with the specified
+            collection. Neither of the input objects is modified by the union.
+            </returns>
+            <see cref="M:Spring.Collections.ISet.Union(Spring.Collections.ISet)"/>
+        </member>
+        <member name="M:Spring.Collections.Set.Union(Spring.Collections.ISet,Spring.Collections.ISet)">
+            <summary>
+            Performs a "union" of two sets, where all the elements in both are
+            present.
+            </summary>
+            <remarks>
+            <p>
+            That is, the element is included if it is in either
+            <paramref name="setOne"/> or <paramref name="anotherSet"/>. The return
+            value is a <b>clone</b> of one of the sets (<paramref name="setOne"/>
+            if it is not <see langword="null"/>) with elements of the other set
+            added in. Neither of the input sets is modified by the operation.
+            </p>
+            </remarks>
+            <param name="setOne">A set of elements.</param>
+            <param name="anotherSet">A set of elements.</param>
+            <returns>
+            A set containing the union of the input sets;
+            <see langword="null"/> if both sets are <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.Set.op_BitwiseOr(Spring.Collections.Set,Spring.Collections.Set)">
+            <summary>
+            Performs a "union" of two sets, where all the elements in both are
+            present.
+            </summary>
+            <param name="setOne">A set of elements.</param>
+            <param name="anotherSet">A set of elements.</param>
+            <returns>
+            A set containing the union of the input sets;
+            <see langword="null"/> if both sets are <see langword="null"/>.
+            </returns>
+            <seealso cref="M:Spring.Collections.Set.Union(Spring.Collections.ISet,Spring.Collections.ISet)"/>
+        </member>
+        <member name="M:Spring.Collections.Set.Intersect(Spring.Collections.ISet)">
+            <summary>
+            Performs an "intersection" of the two sets, where only the elements
+            that are present in both sets remain.
+            </summary>
+            <param name="setOne">A set of elements.</param>
+            <returns>
+            The intersection of this set with <paramref name="setOne"/>.
+            </returns>
+            <see cref="M:Spring.Collections.ISet.Intersect(Spring.Collections.ISet)"/>
+        </member>
+        <member name="M:Spring.Collections.Set.Intersect(Spring.Collections.ISet,Spring.Collections.ISet)">
+            <summary>
+            Performs an "intersection" of the two sets, where only the elements
+            that are present in both sets remain. 
+            </summary>
+            <remarks>
+            <p>
+            That is, the element is included only if it exists in both
+            <paramref name="setOne"/> and <paramref name="anotherSet"/>. Neither input
+            object is modified by the operation. The result object is a
+            <b>clone</b> of one of the input objects (<paramref name="setOne"/>
+            if it is not <see langword="null"/>) containing the elements from
+            the intersect operation.
+            </p>
+            </remarks>
+            <param name="setOne">A set of elements.</param>
+            <param name="anotherSet">A set of elements.</param>
+            <returns>
+            The intersection of the two input sets; <see langword="null"/> if
+            both sets are <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.Set.op_BitwiseAnd(Spring.Collections.Set,Spring.Collections.Set)">
+            <summary>
+            Performs an "intersection" of the two sets, where only the elements
+            that are present in both sets remain. 
+            </summary>
+            <param name="setOne">A set of elements.</param>
+            <param name="anotherSet">A set of elements.</param>
+            <returns>
+            The intersection of the two input sets; <see langword="null"/> if
+            both sets are <see langword="null"/>.
+            </returns>
+            <seealso cref="M:Spring.Collections.Set.Intersect(Spring.Collections.ISet,Spring.Collections.ISet)"/>
+        </member>
+        <member name="M:Spring.Collections.Set.Minus(Spring.Collections.ISet)">
+            <summary>
+            Performs a "minus" of this set from the <paramref name="setOne"/>
+            set.
+            </summary>
+            <param name="setOne">A set of elements.</param>
+            <returns>
+            A set containing the elements from this set with the elements in
+            <paramref name="setOne"/> removed.
+            </returns>
+            <seealso cref="M:Spring.Collections.ISet.Minus(Spring.Collections.ISet)"/>
+        </member>
+        <member name="M:Spring.Collections.Set.Minus(Spring.Collections.ISet,Spring.Collections.ISet)">
+            <summary>
+            Performs a "minus" of set <paramref name="anotherSet"/> from set
+            <paramref name="setOne"/>.
+            </summary>
+            <remarks>
+            <p>
+            This returns a set of all the elements in set
+            <paramref name="setOne"/>, removing the elements that are also in
+            set <paramref name="anotherSet"/>. The original sets are not modified
+            during this operation. The result set is a <b>clone</b> of set
+            <paramref name="setOne"/> containing the elements from the operation. 
+            </p>
+            </remarks>
+            <param name="setOne">A set of elements.</param>
+            <param name="anotherSet">A set of elements.</param>
+            <returns>
+            A set containing
+            <c><paramref name="setOne"/> - <paramref name="anotherSet"/></c> elements.
+            <see langword="null"/> if <paramref name="setOne"/> is
+            <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.Set.op_Subtraction(Spring.Collections.Set,Spring.Collections.Set)">
+            <summary>
+            Performs a "minus" of set <paramref name="anotherSet"/> from set
+            <paramref name="setOne"/>.
+            </summary>
+            <param name="setOne">A set of elements.</param>
+            <param name="anotherSet">A set of elements.</param>
+            <returns>
+            A set containing
+            <c><paramref name="setOne"/> - <paramref name="anotherSet"/></c> elements.
+            <see langword="null"/> if <paramref name="setOne"/> is
+            <see langword="null"/>.
+            </returns>
+            <seealso cref="M:Spring.Collections.Set.Minus(Spring.Collections.ISet,Spring.Collections.ISet)"/>
+        </member>
+        <member name="M:Spring.Collections.Set.ExclusiveOr(Spring.Collections.ISet)">
+            <summary>
+            Performs an "exclusive-or" of the two sets, keeping only those
+            elements that are in one of the sets, but not in both.
+            </summary>
+            <param name="setOne">A set of elements.</param>
+            <returns>
+            A set containing the result of
+            <c><paramref name="setOne"/> ^ this</c>.
+            </returns>
+            <seealso cref="M:Spring.Collections.ISet.ExclusiveOr(Spring.Collections.ISet)"/>
+        </member>
+        <member name="M:Spring.Collections.Set.ExclusiveOr(Spring.Collections.ISet,Spring.Collections.ISet)">
+            <summary>
+            Performs an "exclusive-or" of the two sets, keeping only those
+            elements that are in one of the sets, but not in both.
+            </summary>
+            <remarks>
+            <p>
+            The original sets are not modified during this operation. The
+            result set is a <b>clone</b> of one of the sets (
+            <paramref name="setOne"/> if it is not <see langword="null"/>)
+            containing the elements from the exclusive-or operation.
+            </p>
+            </remarks>
+            <param name="setOne">A set of elements.</param>
+            <param name="anotherSet">A set of elements.</param>
+            <returns>
+            A set containing the result of
+            <c><paramref name="setOne"/> ^ <paramref name="anotherSet"/></c>.
+            <see langword="null"/> if both sets are <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.Set.op_ExclusiveOr(Spring.Collections.Set,Spring.Collections.Set)">
+            <summary>
+            Performs an "exclusive-or" of the two sets, keeping only those
+            elements that are in one of the sets, but not in both.
+            </summary>
+            <param name="setOne">A set of elements.</param>
+            <param name="anotherSet">A set of elements.</param>
+            <returns>
+            A set containing the result of
+            <c><paramref name="setOne"/> ^ <paramref name="anotherSet"/></c>.
+            <see langword="null"/> if both sets are <see langword="null"/>.
+            </returns>
+            <seealso cref="M:Spring.Collections.Set.ExclusiveOr(Spring.Collections.ISet,Spring.Collections.ISet)"/>
+        </member>
+        <member name="M:Spring.Collections.Set.Add(System.Object)">
+            <summary>
+            Adds the specified element to this set if it is not already present.
+            </summary>
+            <param name="element">The object to add to the set.</param>
+            <returns>
+            <see langword="true"/> is the object was added,
+            <see langword="true"/> if the object was already present.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.Set.AddAll(System.Collections.ICollection)">
+            <summary>
+            Adds all the elements in the specified collection to the set if
+            they are not already present.
+            </summary>
+            <param name="collection">A collection of objects to add to the set.</param>
+            <returns>
+            <see langword="true"/> is the set changed as a result of this
+            operation.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.Set.Clear">
+            <summary>
+            Removes all objects from this set.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.Set.Contains(System.Object)">
+            <summary>
+            Returns <see langword="true"/> if this set contains the specified
+            element.
+            </summary>
+            <param name="element">The element to look for.</param>
+            <returns>
+            <see langword="true"/> if this set contains the specified element.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.Set.ContainsAll(System.Collections.ICollection)">
+            <summary>
+            Returns <see langword="true"/> if the set contains all the
+            elements in the specified collection.
+            </summary>
+            <param name="collection">A collection of objects.</param>
+            <returns>
+            <see langword="true"/> if the set contains all the elements in the
+            specified collection.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.Set.Remove(System.Object)">
+            <summary>
+            Removes the specified element from the set.
+            </summary>
+            <param name="element">The element to be removed.</param>
+            <returns>
+            <see langword="true"/> if the set contained the specified element.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.Set.RemoveAll(System.Collections.ICollection)">
+            <summary>
+            Remove all the specified elements from this set, if they exist in
+            this set.
+            </summary>
+            <param name="collection">A collection of elements to remove.</param>
+            <returns>
+            <see langword="true"/> if the set was modified as a result of this
+            operation.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.Set.RetainAll(System.Collections.ICollection)">
+            <summary>
+            Retains only the elements in this set that are contained in the
+            specified collection.
+            </summary>
+            <param name="collection">
+            The collection that defines the set of elements to be retained.
+            </param>
+            <returns>
+            <see langword="true"/> if this set changed as a result of this
+            operation.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.Set.Clone">
+            <summary>
+            Returns a clone of the <see cref="T:Spring.Collections.ISet"/>
+            instance.
+            </summary>
+            <remarks>
+            <p>
+            This will work for derived <see cref="T:Spring.Collections.ISet"/>
+            classes if the derived class implements a constructor that takes no
+            arguments.
+            </p>
+            </remarks>
+            <returns>A clone of this object.</returns>
+        </member>
+        <member name="M:Spring.Collections.Set.CopyTo(System.Array,System.Int32)">
+            <summary>
+            Copies the elements in the <see cref="T:Spring.Collections.ISet"/> to
+            an array.
+            </summary>
+            <remarks>
+            <p>
+            The type of array needs to be compatible with the objects in the
+            <see cref="T:Spring.Collections.ISet"/>, obviously.
+            </p>
+            </remarks>
+            <param name="array">
+            An array that will be the target of the copy operation.
+            </param>
+            <param name="index">
+            The zero-based index where copying will start.
+            </param>
+        </member>
+        <member name="M:Spring.Collections.Set.GetEnumerator">
+            <summary>
+            Gets an enumerator for the elements in the
+            <see cref="T:Spring.Collections.ISet"/>.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> over the elements
+            in the <see cref="T:Spring.Collections.ISet"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.Set.Equals(System.Object)">
+            <summary>
+            This method will test the <see cref="T:Spring.Collections.ISet"/>
+            against another <see cref="T:Spring.Collections.ISet"/> for
+            "equality".
+            </summary>
+            <remarks>
+            <p>
+            In this case, "equality" means that the two sets contain the same
+            elements. The "==" and "!=" operators are not overridden by design.
+            If you wish to check for "equivalent"
+            <see cref="T:Spring.Collections.ISet"/> instances, use
+            <c>Equals()</c>. If you wish to check to see if two references are
+            actually the same object, use "==" and "!=".  
+            </p>
+            </remarks>
+            <param name="obj">
+            A <see cref="T:Spring.Collections.ISet"/> object to compare to.
+            </param>
+            <returns>
+            <see langword="true"/> if the two sets contain the same elements.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.Set.GetHashCode">
+            <summary>
+            Gets the hashcode for the object.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.Set.IsEmpty">
+            <summary>
+            Returns <see langword="true"/> if this set contains no elements.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.Set.Count">
+            <summary>
+            The number of elements currently contained in this collection.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.Set.IsSynchronized">
+            <summary>
+            Returns <see langword="true"/> if the
+            <see cref="T:Spring.Collections.ISet"/> is synchronized across
+            threads.
+            </summary>
+            <remarks>
+            <p>
+            Note that enumeration is inherently not thread-safe. Use the
+            <see cref="P:Spring.Collections.Set.SyncRoot"/> to lock the object during enumeration.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Collections.Set.SyncRoot">
+            <summary>
+            An object that can be used to synchronize this collection to make
+            it thread-safe.
+            </summary>
+            <remarks>
+            <p>
+            When implementing this, if your object uses a base object, like an
+            <see cref="T:System.Collections.IDictionary"/>, or anything that has
+            a <c>SyncRoot</c>, return that object instead of "<c>this</c>".
+            </p>
+            </remarks>
+            <value>
+            An object that can be used to synchronize this collection to make
+            it thread-safe.
+            </value>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.#ctor(Spring.Collections.ISet)">
+            <summary>
+            Constructs an immutable (read-only)
+            <see cref="T:Spring.Collections.ISet"/> wrapper.
+            </summary>
+            <param name="basisSet">
+            The <see cref="T:Spring.Collections.ISet"/> that is to be wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.Add(System.Object)">
+            <summary>
+            Adds the specified element to this set if it is not already present.
+            </summary>
+            <param name="element">The object to add to the set.</param>
+            <returns>
+            <see langword="true"/> is the object was added,
+            <see langword="true"/> if the object was already present.
+            </returns>
+            <exception cref="T:System.NotSupportedException"/>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.AddAll(System.Collections.ICollection)">
+            <summary>
+            Adds all the elements in the specified collection to the set if
+            they are not already present.
+            </summary>
+            <param name="collection">A collection of objects to add to the set.</param>
+            <returns>
+            <see langword="true"/> is the set changed as a result of this
+            operation.
+            </returns>
+            <exception cref="T:System.NotSupportedException"/>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.Clear">
+            <summary>
+            Removes all objects from this set.
+            </summary>
+            <exception cref="T:System.NotSupportedException"/>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.Contains(System.Object)">
+            <summary>
+            Returns <see langword="true"/> if this set contains the specified
+            element.
+            </summary>
+            <param name="element">The element to look for.</param>
+            <returns>
+            <see langword="true"/> if this set contains the specified element.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.ContainsAll(System.Collections.ICollection)">
+            <summary>
+            Returns <see langword="true"/> if the set contains all the
+            elements in the specified collection.
+            </summary>
+            <param name="collection">A collection of objects.</param>
+            <returns>
+            <see langword="true"/> if the set contains all the elements in the
+            specified collection.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.Remove(System.Object)">
+            <summary>
+            Removes the specified element from the set.
+            </summary>
+            <param name="element">The element to be removed.</param>
+            <returns>
+            <see langword="true"/> if the set contained the specified element.
+            </returns>
+            <exception cref="T:System.NotSupportedException"/>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.RemoveAll(System.Collections.ICollection)">
+            <summary>
+            Remove all the specified elements from this set, if they exist in
+            this set.
+            </summary>
+            <param name="collection">A collection of elements to remove.</param>
+            <returns>
+            <see langword="true"/> if the set was modified as a result of this
+            operation.
+            </returns>
+            <exception cref="T:System.NotSupportedException"/>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.RetainAll(System.Collections.ICollection)">
+            <summary>
+            Retains only the elements in this set that are contained in the
+            specified collection.
+            </summary>
+            <param name="collection">
+            The collection that defines the set of elements to be retained.
+            </param>
+            <returns>
+            <see langword="true"/> if this set changed as a result of this
+            operation.
+            </returns>
+            <exception cref="T:System.NotSupportedException"/>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.CopyTo(System.Array,System.Int32)">
+            <summary>
+            Copies the elements in the <see cref="T:Spring.Collections.ISet"/> to
+            an array.
+            </summary>
+            <remarks>
+            <p>
+            The type of array needs to be compatible with the objects in the
+            <see cref="T:Spring.Collections.ISet"/>, obviously.
+            </p>
+            </remarks>
+            <param name="array">
+            An array that will be the target of the copy operation.
+            </param>
+            <param name="index">
+            The zero-based index where copying will start.
+            </param>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.GetEnumerator">
+            <summary>
+            Gets an enumerator for the elements in the
+            <see cref="T:Spring.Collections.ISet"/>.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> over the elements
+            in the <see cref="T:Spring.Collections.ISet"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.Clone">
+            <summary>
+            Returns a clone of the <see cref="T:Spring.Collections.ISet"/>
+            instance.
+            </summary>
+            <returns>A clone of this object.</returns>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.Union(Spring.Collections.ISet)">
+            <summary>
+            Performs a "union" of the two sets, where all the elements
+            in both sets are present. 
+            </summary>
+            <param name="setOne">A collection of elements.</param>
+            <returns>
+            A new <see cref="T:Spring.Collections.ISet"/> containing the union of
+            this <see cref="T:Spring.Collections.ISet"/> with the specified
+            collection. Neither of the input objects is modified by the union.
+            </returns>
+            <see cref="M:Spring.Collections.ISet.Union(Spring.Collections.ISet)"/>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.Intersect(Spring.Collections.ISet)">
+            <summary>
+            Performs an "intersection" of the two sets, where only the elements
+            that are present in both sets remain.
+            </summary>
+            <param name="setOne">A set of elements.</param>
+            <returns>
+            The intersection of this set with <paramref name="setOne"/>.
+            </returns>
+            <see cref="M:Spring.Collections.ISet.Intersect(Spring.Collections.ISet)"/>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.Minus(Spring.Collections.ISet)">
+            <summary>
+            Performs a "minus" of this set from the <paramref name="setOne"/>
+            set.
+            </summary>
+            <param name="setOne">A set of elements.</param>
+            <returns>
+            A set containing the elements from this set with the elements in
+            <paramref name="setOne"/> removed.
+            </returns>
+            <seealso cref="M:Spring.Collections.ISet.Minus(Spring.Collections.ISet)"/>
+        </member>
+        <member name="M:Spring.Collections.ImmutableSet.ExclusiveOr(Spring.Collections.ISet)">
+            <summary>
+            Performs an "exclusive-or" of the two sets, keeping only those
+            elements that are in one of the sets, but not in both.
+            </summary>
+            <param name="setOne">A set of elements.</param>
+            <returns>
+            A set containing the result of
+            <c><paramref name="setOne"/> ^ this</c>.
+            </returns>
+            <seealso cref="M:Spring.Collections.ISet.ExclusiveOr(Spring.Collections.ISet)"/>
+        </member>
+        <member name="P:Spring.Collections.ImmutableSet.IsEmpty">
+            <summary>
+            Returns <see langword="true"/> if this set contains no elements.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.ImmutableSet.Count">
+            <summary>
+            The number of elements currently contained in this collection.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.ImmutableSet.IsSynchronized">
+            <summary>
+            Returns <see langword="true"/> if the
+            <see cref="T:Spring.Collections.ISet"/> is synchronized across
+            threads.
+            </summary>
+            <remarks>
+            <p>
+            Note that enumeration is inherently not thread-safe. Use the
+            <see cref="P:Spring.Collections.ImmutableSet.SyncRoot"/> to lock the object during enumeration.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Collections.ImmutableSet.SyncRoot">
+            <summary>
+            An object that can be used to synchronize this collection to make
+            it thread-safe.
+            </summary>
+            <value>
+            An object that can be used to synchronize this collection to make
+            it thread-safe.
+            </value>
+        </member>
+        <member name="T:Spring.Collections.DictionarySet">
+            <summary>
+            <see cref="T:Spring.Collections.DictionarySet"/> is an
+            <see langword="abstract"/> class that supports the creation of new
+            <see cref="T:Spring.Collections.ISet"/> types where the underlying data
+            store is an <see cref="T:System.Collections.IDictionary"/> instance.
+            </summary>
+            <remarks>
+            <p>
+            You can use any object that implements the
+            <see cref="T:System.Collections.IDictionary"/> interface to hold set
+            data. You can define your own, or you can use one of the objects
+            provided in the framework. The type of
+            <see cref="T:System.Collections.IDictionary"/> you
+            choose will affect both the performance and the behavior of the
+            <see cref="T:Spring.Collections.ISet"/> using it.
+            </p>
+            <p>
+            This object overrides the <see cref="M:System.Object.Equals(System.Object)"/> method,
+            but not the <see cref="M:System.Object.GetHashCode"/> method, because
+            the <see cref="T:Spring.Collections.DictionarySet"/> class is mutable.
+            Therefore, it is not safe to use as a key value in a dictionary.
+            </p>
+            <p>
+            To make a <see cref="T:Spring.Collections.ISet"/> typed based on your
+            own <see cref="T:System.Collections.IDictionary"/>, simply derive a new
+            class with a constructor that takes no parameters. Some
+            <see cref="T:Spring.Collections.ISet"/> implmentations cannot be defined
+            with a default constructor. If this is the case for your class, you
+            will need to override <b>clone</b> as well.
+            </p>
+            <p>
+            It is also standard practice that at least one of your constructors
+            takes an <see cref="T:System.Collections.ICollection"/> or an
+            <see cref="T:Spring.Collections.ISet"/> as an argument.
+            </p>
+            </remarks>
+            <seealso cref="T:Spring.Collections.ISet"/>
+            <version>$Id: DictionarySet.cs,v 1.7 2007/03/16 04:01:27 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Collections.DictionarySet.Add(System.Object)">
+            <summary>
+            Adds the specified element to this set if it is not already present.
+            </summary>
+            <param name="element">The object to add to the set.</param>
+            <returns>
+            <see langword="true"/> is the object was added,
+            <see langword="true"/> if the object was already present.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.DictionarySet.AddAll(System.Collections.ICollection)">
+            <summary>
+            Adds all the elements in the specified collection to the set if
+            they are not already present.
+            </summary>
+            <param name="collection">A collection of objects to add to the set.</param>
+            <returns>
+            <see langword="true"/> is the set changed as a result of this
+            operation.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.DictionarySet.Clear">
+            <summary>
+            Removes all objects from this set.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.DictionarySet.Contains(System.Object)">
+            <summary>
+            Returns <see langword="true"/> if this set contains the specified
+            element.
+            </summary>
+            <param name="element">The element to look for.</param>
+            <returns>
+            <see langword="true"/> if this set contains the specified element.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.DictionarySet.ContainsAll(System.Collections.ICollection)">
+            <summary>
+            Returns <see langword="true"/> if the set contains all the
+            elements in the specified collection.
+            </summary>
+            <param name="collection">A collection of objects.</param>
+            <returns>
+            <see langword="true"/> if the set contains all the elements in the
+            specified collection; also <see langword="false"/> if the
+            supplied <paramref name="collection"/> is <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.DictionarySet.Remove(System.Object)">
+            <summary>
+            Removes the specified element from the set.
+            </summary>
+            <param name="element">The element to be removed.</param>
+            <returns>
+            <see langword="true"/> if the set contained the specified element.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.DictionarySet.RemoveAll(System.Collections.ICollection)">
+            <summary>
+            Remove all the specified elements from this set, if they exist in
+            this set.
+            </summary>
+            <param name="collection">A collection of elements to remove.</param>
+            <returns>
+            <see langword="true"/> if the set was modified as a result of this
+            operation.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.DictionarySet.RetainAll(System.Collections.ICollection)">
+            <summary>
+            Retains only the elements in this set that are contained in the
+            specified collection.
+            </summary>
+            <param name="collection">
+            The collection that defines the set of elements to be retained.
+            </param>
+            <returns>
+            <see langword="true"/> if this set changed as a result of this
+            operation.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.DictionarySet.CopyTo(System.Array,System.Int32)">
+            <summary>
+            Copies the elements in the <see cref="T:Spring.Collections.ISet"/> to
+            an array.
+            </summary>
+            <remarks>
+            <p>
+            The type of array needs to be compatible with the objects in the
+            <see cref="T:Spring.Collections.ISet"/>, obviously.
+            </p>
+            </remarks>
+            <param name="array">
+            An array that will be the target of the copy operation.
+            </param>
+            <param name="index">
+            The zero-based index where copying will start.
+            </param>
+        </member>
+        <member name="M:Spring.Collections.DictionarySet.GetEnumerator">
+            <summary>
+            Gets an enumerator for the elements in the
+            <see cref="T:Spring.Collections.ISet"/>.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> over the elements
+            in the <see cref="T:Spring.Collections.ISet"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.DictionarySet.InternalDictionary">
+            <summary>
+            Provides the storage for elements in the
+            <see cref="T:Spring.Collections.ISet"/>, stored as the key-set
+            of the <see cref="T:System.Collections.IDictionary"/> object.  
+            </summary>
+            <remarks>
+            <p>
+            Set this object in the constructor if you create your own
+            <see cref="T:Spring.Collections.ISet"/> class.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Collections.DictionarySet.Placeholder">
+            <summary>
+            The placeholder object used as the value for the
+            <see cref="T:System.Collections.IDictionary"/> instance.
+            </summary>
+            <remarks>
+            There is a single instance of this object globally, used for all
+            <see cref="T:Spring.Collections.ISet"/>s.
+            </remarks>
+        </member>
+        <member name="P:Spring.Collections.DictionarySet.IsEmpty">
+            <summary>
+            Returns <see langword="true"/> if this set contains no elements.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.DictionarySet.Count">
+            <summary>
+            The number of elements currently contained in this collection.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.DictionarySet.IsSynchronized">
+            <summary>
+            Returns <see langword="true"/> if the
+            <see cref="T:Spring.Collections.ISet"/> is synchronized across
+            threads.
+            </summary>
+            <seealso cref="P:Spring.Collections.Set.IsSynchronized"/>
+        </member>
+        <member name="P:Spring.Collections.DictionarySet.SyncRoot">
+            <summary>
+            An object that can be used to synchronize this collection to make
+            it thread-safe.
+            </summary>
+            <value>
+            An object that can be used to synchronize this collection to make
+            it thread-safe.
+            </value>
+            <seealso cref="P:Spring.Collections.Set.SyncRoot"/>
+        </member>
+        <member name="T:Spring.Validation.ValidatorReference">
+            <summary>
+            Represents a reference to an externally defined validator object
+            </summary>
+            <remarks>
+            <p>
+            This class allows validation groups to reference validators that
+            are defined outside of the group itself.
+            </p>
+            <p>
+            It also allows users to narrow the context for the referenced validator
+            by specifying value for the <c>Context</c> property.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ValidatorReference.cs,v 1.5 2008/02/05 20:40:26 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.IObjectFactoryAware">
+            <summary>
+            Interface to be implemented by objects that wish to be aware of their owning
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/>.
+            </summary>
+            <remarks>
+            <p>
+            For example, objects can look up collaborating objects via the factory.
+            </p>
+            <p>
+            Note that most objects will choose to receive references to collaborating
+            objects via respective properties and / or an appropriate constructor.
+            </p>
+            <p>
+            For a list of all object lifecycle methods, see the
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> API documentation.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IObjectFactoryAware.cs,v 1.6 2006/04/09 07:18:48 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory">
+            <summary>
+            Callback that supplies the owning factory to an object instance.
+            </summary>
+            <value>
+            Owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            (may not be <see langword="null"/>). The object can immediately
+            call methods on the factory.
+            </value>
+            <remarks>
+            <p>
+            Invoked after population of normal object properties but before an init
+            callback like <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            method or a custom init-method.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of initialization errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Validation.ValidatorReference.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.ValidatorReference"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.ValidatorReference.Validate(System.Object,Spring.Validation.IValidationErrors)">
+            <summary>
+            Validates the specified object.
+            </summary>
+            <param name="validationContext">The object to validate.</param>
+            <param name="errors"><see cref="T:Spring.Validation.ValidationErrors"/> instance to add error messages to.</param>
+            <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Validation.ValidatorReference.Validate(System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Validates the specified object.
+            </summary>
+            <param name="validationContext">The object to validate.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors"><see cref="T:Spring.Validation.ValidationErrors"/> instance to add error messages to.</param>
+            <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="P:Spring.Validation.ValidatorReference.Name">
+            <summary>
+            Gets or sets the name of the referenced validator.
+            </summary>
+            <value>The name of the referenced validator.</value>
+        </member>
+        <member name="P:Spring.Validation.ValidatorReference.Context">
+            <summary>
+            Gets or sets the expression that should be used to narrow validation context.
+            </summary>
+            <value>The expression that should be used to narrow validation context.</value>
+        </member>
+        <member name="P:Spring.Validation.ValidatorReference.ObjectFactory">
+            <summary>
+            Callback that supplies the owning factory to an object instance.
+            </summary>
+            <value>
+            Owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            (may not be <see langword="null"/>). The object can immediately
+            call methods on the factory.
+            </value>
+            <remarks>
+            <p>
+            Invoked after population of normal object properties but before an init
+            callback like <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            method or a custom init-method.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of initialization errors.
+            </exception>
+        </member>
+        <member name="T:Spring.Util.PatternMatchUtils">
+            <summary> Utility methods for simple pattern matching, in particular for
+            Spring's typical "xxx*", "*xxx" and "*xxx*" pattern styles.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack</author>
+            <version>$Id: PatternMatchUtils.cs,v 1.4 2007/07/31 18:16:25 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Util.PatternMatchUtils.SimpleMatch(System.String,System.String)">
+            <summary> Match a String against the given pattern, supporting the following simple
+            pattern styles: "xxx*", "*xxx" and "*xxx*" matches, as well as direct equality.
+            </summary>
+            <param name="pattern">the pattern to match against
+            </param>
+            <param name="str">the String to match
+            </param>
+            <returns> whether the String matches the given pattern
+            </returns>
+        </member>
+        <member name="M:Spring.Util.PatternMatchUtils.SimpleMatch(System.String[],System.String)">
+            <summary> Match a String against the given patterns, supporting the following simple
+            pattern styles: "xxx*", "*xxx" and "*xxx*" matches, as well as direct equality.
+            </summary>
+            <param name="patterns">the patterns to match against
+            </param>
+            <param name="str">the String to match
+            </param>
+            <returns> whether the String matches any of the given patterns
+            </returns>
+        </member>
+        <member name="T:Spring.Util.FatalReflectionException">
+            <summary>
+            Thrown on an unrecoverable problem encountered in the
+            objects namespace or sub-namespaces, e.g. bad class or field.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: FatalReflectionException.cs,v 1.1 2007/07/31 03:47:23 markpollack Exp $
+            </version>
+        </member>
+        <member name="M:Spring.Util.FatalReflectionException.#ctor">
+            <summary>
+            Creates a new instance of the FatalObjectException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Util.FatalReflectionException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the FatalObjectException class with the
+            specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Util.FatalReflectionException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the FatalObjectException class with the
+            specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Util.FatalReflectionException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the FatalObjectException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Objects.Support.AbstractEventHandlerValue">
+            <summary>
+            Base class implementation for classes that describe an event handler.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: AbstractEventHandlerValue.cs,v 1.7 2006/04/09 07:19:00 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.IEventHandlerValue">
+            <summary>
+            Describes an event handler.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: IEventHandlerValue.cs,v 1.6 2006/04/09 07:18:49 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.IEventHandlerValue.Wire(System.Object,System.Object)">
+            <summary>
+            Wires up the specified handler to the named event on the
+            supplied event source.
+            </summary>
+            <param name="source">
+            The object (an object instance, a <see cref="T:System.Type"/>, etc)
+            exposing the named event.
+            </param>
+            <param name="handler">
+            The handler for the event (an object instance, a
+            <see cref="T:System.Type"/>, etc).
+            </param>
+        </member>
+        <member name="P:Spring.Objects.IEventHandlerValue.Source">
+            <summary>
+            The source of the event.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.IEventHandlerValue.MethodName">
+            <summary>
+            The name of the method that is going to handle the event.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.IEventHandlerValue.EventName">
+            <summary>
+            The name of the event that is being wired up.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Support.AbstractEventHandlerValue.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.AbstractEventHandlerValue"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Support.AbstractEventHandlerValue.#ctor(System.Object,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.AbstractEventHandlerValue"/> class.
+            </summary>
+            <param name="source">
+            The object (possibly unresolved) that is exposing the event.
+            </param>
+            <param name="methodName">
+            The name of the method on the handler that is going to handle the event.
+            </param>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Support.AbstractEventHandlerValue.Wire(System.Object,System.Object)">
+            <summary>
+            Wires up the specified handler to the named event on the
+            supplied event source.
+            </summary>
+            <param name="source">
+            The object (an object instance, a <see cref="T:System.Type"/>, etc)
+            exposing the named event.
+            </param>
+            <param name="handler">
+            The handler for the event (an object instance, a
+            <see cref="T:System.Type"/>, etc).
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Support.AbstractEventHandlerValue.ToString">
+            <summary>
+            Returns a stringified representation of this object.
+            </summary>
+            <returns>A stringified representation of this object.</returns>
+        </member>
+        <member name="P:Spring.Objects.Support.AbstractEventHandlerValue.Source">
+            <summary>
+            The source of the event (may be unresolved, as in the case
+            of a <see cref="T:Spring.Objects.Factory.Config.RuntimeObjectReference"/>
+            value).
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Support.AbstractEventHandlerValue.MethodName">
+            <summary>
+            The name of the method that is going to handle the event.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Support.AbstractEventHandlerValue.EventName">
+            <summary>
+            The name of the event that is being wired up.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.ManagedSet">
+            <summary>
+            Tag subclass used to hold a set of managed elements.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+        </member>
+        <member name="T:Spring.Collections.HybridSet">
+            <summary>
+            Implements an <see cref="T:Spring.Collections.ISet"/> that automatically
+            changes from a list based implementation to a hashtable based
+            implementation when the size reaches a certain threshold.
+            </summary>
+            <remarks>
+            <p>
+            This is good if you are unsure about whether you data-set will be tiny
+            or huge.
+            </p>
+            <note>
+            Because this uses a dual implementation, iteration order is <b>not</b>
+            guaranteed!
+            </note>
+            </remarks>
+            <seealso cref="T:Spring.Collections.ISet"/>
+            <version>$Id: HybridSet.cs,v 1.6 2007/03/16 04:01:28 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Collections.HybridSet.#ctor">
+            <summary>
+            Creates a new set instance based on either a list or a hash table,
+            depending on which will be more efficient based on the data-set
+            size.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.HybridSet.#ctor(System.Collections.ICollection)">
+            <summary>
+            Creates a new set instance based on either a list or a hash table,
+            depending on which will be more efficient based on the data-set
+            size, and initializes it based on a collection of elements.
+            </summary>
+            <param name="initialValues">
+            A collection of elements that defines the initial set contents.
+            </param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.IManagedCollection">
+            <summary>
+            Denotes a special placeholder collection that may contain
+            <see cref="T:Spring.Objects.Factory.Config.RuntimeObjectReference"/>s or
+            other placeholder objects that will need to be resolved.
+            </summary>
+            <remarks>
+            <p>
+            <c>'A special placeholder collection'</c> means that the elements of this
+            collection can be placeholders for objects that will be resolved later by
+            a Spring.NET IoC container, i.e. the elements themselves will be
+            resolved at runtime by the enclosing IoC container.
+            </p>
+            <p>
+            The core Spring.NET library already provides three implementations of this interface
+            straight out of the box; they are...
+            </p>
+            <list type="bullet">
+            <item>
+            <description>
+            <see cref="T:Spring.Objects.Factory.Support.ManagedList"/>.
+            </description>
+            </item>
+            <item>
+            <description>
+            <see cref="T:Spring.Objects.Factory.Support.ManagedDictionary"/>.
+            </description>
+            </item>
+            <item>
+            <description>
+            <see cref="T:Spring.Objects.Factory.Support.ManagedSet"/>.
+            </description>
+            </item>
+            </list>
+            <p>
+            If you have a custom collection class (i.e. a class that either implements the
+            <see cref="T:System.Collections.ICollection"/> directly or derives from a class that does)
+            that you would like to expose as a special placeholder collection (i.e. one that can
+            have <see cref="T:Spring.Objects.Factory.Config.RuntimeObjectReference"/>s as elements
+            that will be resolved at runtime by an appropriate Spring.NET IoC container, just
+            implement this interface.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            Lets say one has a <c>Bag</c> class (i.e. a collection that supports bag style semantics).
+            </p>
+            <code language="C#">
+            using System;
+            
+            using Spring.Objects.Factory.Support;
+            
+            namespace MyNamespace
+            {
+            	public sealed class Bag : ICollection
+            	{
+            		// ICollection implementation elided for clarity...
+            		
+            		public void Add(object o)
+            		{
+            			// implementation elided for clarity...
+            		}
+            	}
+            	
+            	public class ManagedBag : Bag, IManagedCollection
+            	{
+            		public ICollection Resolve(
+            			string objectName, RootObjectDefinition definition,
+            			string propertyName, ManagedCollectionElementResolver resolver)
+            		{
+            			Bag newBag = new Bag();
+            			string elementName = propertyName + "[bag-element]";
+            			foreach(object element in this)
+            			{
+            				object resolvedElement = resolver(objectName, definition, elementName, element);
+            				newBag.Add(resolvedElement);
+            			}
+            			return newBag;
+            		}
+            	}
+            }
+            </code>
+            </example>
+            <author>Rick Evans</author>
+            <version>$Id: IManagedCollection.cs,v 1.5 2007/03/16 03:05:37 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IManagedCollection.Resolve(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.Support.ManagedCollectionElementResolver)">
+            <summary>
+            Resolves this managed collection at runtime.
+            </summary>
+            <param name="objectName">
+            The name of the top level object that is having the value of one of it's
+            collection properties resolved.
+            </param>
+            <param name="definition">
+            The definition of the named top level object.
+            </param>
+            <param name="propertyName">
+            The name of the property the value of which is being resolved.
+            </param>
+            <param name="resolver">
+            The callback that will actually do the donkey work of resolving
+            this managed collection.
+            </param>
+            <returns>A fully resolved collection.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ManagedSet.Resolve(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.Support.ManagedCollectionElementResolver)">
+            <summary>
+            Resolves this managed collection at runtime.
+            </summary>
+            <param name="objectName">
+            The name of the top level object that is having the value of one of it's
+            collection properties resolved.
+            </param>
+            <param name="definition">
+            The definition of the named top level object.
+            </param>
+            <param name="propertyName">
+            The name of the property the value of which is being resolved.
+            </param>
+            <param name="resolver">
+            The callback that will actually do the donkey work of resolving
+            this managed collection.
+            </param>
+            <returns>A fully resolved collection.</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.ManagedSet.ElementTypeName">
+            <summary>
+            Gets or sets the unresolved name for the <see cref="T:System.Type"/> 
+            of the elements of this managed set.
+            </summary>
+            <value>The unresolved name for the type of the elements of this managed set.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.ObjectFactoryUtils">
+            <summary>
+            Convenience methods operating on object factories, returning object instances,
+            names, or counts.
+            </summary>
+            <remarks>
+            <p>
+            The nesting hierarchy of an object factory is taken into account by the various methods
+            exposed by this class.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: ObjectFactoryUtils.cs,v 1.17 2007/07/31 03:47:39 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.ObjectFactoryUtils.FactoryObjectPrefix">
+            <summary>
+            Used to dereference an <see cref="T:Spring.Objects.Factory.IFactoryObject"/>
+            and distinguish it from managed objects <i>created by</i> the factory.
+            </summary>
+            <remarks>
+            <p>
+            For example, if the managed object identified as <code>foo</code> is a
+            factory, getting <code>&amp;foo</code> will return the factory, not the
+            instance returned by the factory.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectFactoryUtils.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.ObjectFactoryUtils"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly visible
+            constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectFactoryUtils.CountObjectsIncludingAncestors(Spring.Objects.Factory.IListableObjectFactory)">
+            <summary>
+            Count all object definitions in any hierarchy in which this
+            factory participates.
+            </summary>
+            <remarks>
+            <p>
+            Includes counts of ancestor object factories.
+            </p>
+            <p>
+            Objects that are "overridden" (specified in a descendant factory
+            with the same name) are counted only once.
+            </p>
+            </remarks>
+            <param name="factory">The object factory.</param>
+            <returns>
+            The count of objects including those defined in ancestor factories.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectFactoryUtils.ObjectNamesIncludingAncestors(Spring.Objects.Factory.IListableObjectFactory)">
+            <summary>
+            Return all object names in the factory, including ancestor factories.
+            </summary>
+            <param name="factory">The object factory.</param>
+            <returns>The array of object names, or an empty array if none.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(Spring.Objects.Factory.IListableObjectFactory,System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Get all object names for the given type, including those defined in ancestor
+            factories.
+            </summary>
+            <remarks>
+            <p>
+            Will return unique names in case of overridden object definitions.
+            </p>
+            <p>
+            Does consider objects created by <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s 
+            if <paramref name="includeFactoryObjects"/> is set to true, 
+            which means that <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s will get initialized.
+            </p>
+            </remarks>
+            <param name="factory">
+            If this isn't also an
+            <see cref="T:Spring.Objects.Factory.IHierarchicalObjectFactory"/>,
+            this method will return the same as it's own
+            <see cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectDefinitionNames"/>
+            method.
+            </param>
+            <param name="type">
+            The <see cref="T:System.Type"/> that objects must match.
+            </param>
+            <param name="includePrototypes">
+            Whether to include prototype objects too or just singletons
+            (also applies to <see cref="T:Spring.Objects.Factory.IFactoryObject"/> instances).
+            </param>
+            <param name="includeFactoryObjects">
+            Whether to include <see cref="T:Spring.Objects.Factory.IFactoryObject"/> instances
+            too or just normal objects.
+            </param>
+            <returns>
+            The array of object names, or an empty array if none.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(Spring.Objects.Factory.IListableObjectFactory,System.Type)">
+            <summary>
+            Get all object names for the given type, including those defined in ancestor
+            factories.
+            </summary>
+            <remarks>
+            <p>
+            Will return unique names in case of overridden object definitions.
+            </p>
+            <p>
+            Does consider objects created by <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s,
+            or rather it considers the type of objects created by
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> (which means that
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s will be instantiated).
+            </p>
+            </remarks>
+            <param name="factory">
+            If this isn't also an
+            <see cref="T:Spring.Objects.Factory.IHierarchicalObjectFactory"/>,
+            this method will return the same as it's own
+            <see cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectDefinitionNames"/>
+            method.
+            </param>
+            <param name="type">
+            The <see cref="T:System.Type"/> that objects must match.
+            </param>
+            <returns>
+            The array of object names, or an empty array if none.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectFactoryUtils.ObjectsOfTypeIncludingAncestors(Spring.Objects.Factory.IListableObjectFactory,System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Return all objects of the given type or subtypes, also picking up objects
+            defined in ancestor object factories if the current object factory is an
+            <see cref="T:Spring.Objects.Factory.IHierarchicalObjectFactory"/>.
+            </summary>
+            <remarks>
+            <p>
+            The return list will only contain objects of this type.
+            Useful convenience method when we don't care about object names.
+            </p>
+            </remarks>
+            <param name="factory">The object factory.</param>
+            <param name="type">The <see cref="T:System.Type"/> of object to match.</param>
+            <param name="includePrototypes">
+            Whether to include prototype objects too or just singletons
+            (also applies to <see cref="T:Spring.Objects.Factory.IFactoryObject"/> instances).
+            </param>
+            <param name="includeFactoryObjects">
+            Whether to include <see cref="T:Spring.Objects.Factory.IFactoryObject"/> instances
+            too or just normal objects.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the objects could not be created.
+            </exception>
+            <returns>
+            The <see cref="T:System.Collections.IDictionary"/> of object instances, or an
+            empty <see cref="T:System.Collections.IDictionary"/> if none.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectFactoryUtils.ObjectOfTypeIncludingAncestors(Spring.Objects.Factory.IListableObjectFactory,System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Return a single object of the given type or subtypes, also picking up objects defined
+            in ancestor object factories if the current object factory is an
+            <see cref="T:Spring.Objects.Factory.IHierarchicalObjectFactory"/>.
+            </summary>
+            <remarks>
+            <p>
+            Useful convenience method when we expect a single object and don't care
+            about the object name.
+            </p>
+            </remarks>
+            <param name="factory">The object factory.</param>
+            <param name="type">The <see cref="T:System.Type"/> of object to match.</param>
+            <param name="includePrototypes">
+            Whether to include prototype objects too or just singletons
+            (also applies to <see cref="T:Spring.Objects.Factory.IFactoryObject"/> instances).
+            </param>
+            <param name="includeFactoryObjects">
+            Whether to include <see cref="T:Spring.Objects.Factory.IFactoryObject"/> instances
+            too or just normal objects.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If more than one instance of an object was found.
+            </exception>
+            <returns>
+            A single object of the given type or subtypes.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectFactoryUtils.ObjectOfType(Spring.Objects.Factory.IListableObjectFactory,System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Return a single object of the given type or subtypes, not looking in
+            ancestor factories.
+            </summary>
+            <remarks>
+            <p>
+            Useful convenience method when we expect a single object and don't care
+            about the object name.
+            </p>
+            </remarks>
+            <param name="factory">The object factory.</param>
+            <param name="type">The <see cref="T:System.Type"/> of object to match.</param>
+            <param name="includePrototypes">
+            Whether to include prototype objects too or just singletons
+            (also applies to <see cref="T:Spring.Objects.Factory.IFactoryObject"/> instances).
+            </param>
+            <param name="includeFactoryObjects">
+            Whether to include <see cref="T:Spring.Objects.Factory.IFactoryObject"/> instances
+            too or just normal objects.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If not exactly one instance of an object was found.
+            </exception>
+            <returns>
+            A single object of the given type or subtypes.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectFactoryUtils.ObjectOfType(Spring.Objects.Factory.IListableObjectFactory,System.Type)">
+            <summary>
+            Return a single object of the given type or subtypes, not looking in
+            ancestor factories.
+            </summary>
+            <remarks>
+            <p>
+            Useful convenience method when we expect a single object and don't care
+            about the object name.
+            This version of <c>ObjectOfType</c> automatically includes prototypes and
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> instances.
+            </p>
+            </remarks>
+            <param name="factory">The object factory.</param>
+            <param name="type">The <see cref="T:System.Type"/> of object to match.</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If not exactly one instance of an object was found.
+            </exception>
+            <returns>
+            A single object of the given type or subtypes.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectFactoryUtils.TransformedObjectName(System.String)">
+            <summary>
+            Return the object name, stripping out the factory dereference prefix if necessary.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <returns>The object name sans any factory dereference prefix.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectFactoryUtils.BuildFactoryObjectName(System.String)">
+            <summary>
+            Given an (object) name, builds a corresponding factory object name such that
+            the return value can be used as a lookup name for a factory object.
+            </summary>
+            <param name="objectName">
+            The name to be used to build the resulting factory object name.
+            </param>
+            <returns>
+            The <paramref name="objectName"/> transformed into its factory object name
+            equivalent.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.ObjectFactoryUtils.TransformedObjectName(System.String)"/>
+            <seealso cref="F:Spring.Objects.Factory.ObjectFactoryUtils.FactoryObjectPrefix"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectFactoryUtils.IsFactoryDereference(System.String)">
+            <summary>
+            Is the supplied <paramref name="name"/> a factory dereference?
+            </summary>
+            <remarks>
+            <p>
+            That is, does the supplied <paramref name="name"/> begin with
+            the
+            <see cref="F:Spring.Objects.Factory.ObjectFactoryUtils.FactoryObjectPrefix"/>?
+            </p>
+            </remarks>
+            <param name="name">The name to check.</param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="name"/> is a
+            factory dereference; <see langword="false"/> if not, or the
+            aupplied <paramref name="name"/> is <see langword="null"/> or
+            consists solely of the
+            <see cref="F:Spring.Objects.Factory.ObjectFactoryUtils.FactoryObjectPrefix"/>
+            value.
+            </returns>
+            <seealso cref="F:Spring.Objects.Factory.ObjectFactoryUtils.FactoryObjectPrefix"/>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.SpecialFolderVariableSource">
+            <summary>
+            Implementation of <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/> that
+            resolves variable name against special folders (as defined by
+            <see cref="T:System.Environment.SpecialFolder"/> enumeration).
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SpecialFolderVariableSource.cs,v 1.3 2007/08/02 22:18:32 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.IVariableSource">
+            <summary>
+            Defines contract that different variable sources have to implement.
+            </summary>
+            <remarks>
+            <p>
+            The "variable sources" are objects containing name-value pairs
+            that allow a variable value to be retrieved for the given name.</p>
+            <p>
+            Out of the box, Spring.NET supports a number of variable sources, 
+            that allow users to obtain variable values from .NET config files,
+            Java-style property files, environment, registry, etc.</p>
+            <p>
+            Users can always write their own variable sources implementations,
+            that will allow them to load variable values from the database or 
+            other proprietary data source.</p>
+            </remarks>
+            <seealso cref="T:Spring.Objects.Factory.Config.ConfigSectionVariableSource"/>
+            <seealso cref="T:Spring.Objects.Factory.Config.PropertyFileVariableSource"/>
+            <seealso cref="T:Spring.Objects.Factory.Config.EnvironmentVariableSource"/>
+            <seealso cref="T:Spring.Objects.Factory.Config.CommandLineArgsVariableSource"/>
+            <seealso cref="T:Spring.Objects.Factory.Config.RegistryVariableSource"/>
+            <seealso cref="T:Spring.Objects.Factory.Config.SpecialFolderVariableSource"/>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IVariableSource.cs,v 1.3 2007/08/02 22:18:32 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)">
+            <summary>
+            Resolves variable value for the specified variable name.
+            </summary>
+            <param name="name">
+            The name of the variable to resolve.
+            </param>
+            <returns>
+            The variable value if able to resolve, <c>null</c> otherwise.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.SpecialFolderVariableSource.ResolveVariable(System.String)">
+            <summary>
+            Resolves specified special folder to its full path.
+            </summary>
+            <param name="name">
+            The name of the special folder to resolve. Should be one of the values
+            defined by the <see cref="T:System.Environment.SpecialFolder"/> enumeration.
+            </param>
+            <returns>
+            The folder path if able to resolve, <c>null</c> otherwise.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.PropertyFileVariableSource">
+            <summary>
+            Implementation of <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/> that
+            resolves variable name against Java-style property file.
+            </summary>
+            <seealso cref="T:Spring.Util.Properties"/>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: PropertyFileVariableSource.cs,v 1.5 2007/08/08 17:47:13 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyFileVariableSource.ResolveVariable(System.String)">
+            <summary>
+            Resolves variable value for the specified variable name.
+            </summary>
+            <param name="name">
+            The name of the variable to resolve.
+            </param>
+            <returns>
+            The variable value if able to resolve, <c>null</c> otherwise.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyFileVariableSource.InitProperties">
+            <summary>
+            Initializes properties based on the specified 
+            property file locations.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyFileVariableSource.Locations">
+            <summary>
+            Gets or sets the locations of the property files 
+            to read properties from.
+            </summary>
+            <value>
+            The locations of the property files 
+            to read properties from.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyFileVariableSource.Location">
+            <summary>
+            Convinience property. Gets or sets a single location
+            to read properties from.
+            </summary>
+            <value>
+            A location to read properties from.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.AbstractConfigurer">
+            <summary>
+            Base class that provides common functionality needed for several IObjectFactoryPostProcessor
+            implementations
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: AbstractConfigurer.cs,v 1.3 2007/07/31 18:16:49 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Core.IOrdered">
+            <summary>
+            Interface that can be implemented by objects that should be orderable, e.g. in an
+            <see cref="T:System.Collections.ICollection"/>.
+            </summary>
+            <remarks>
+            <p>
+            The actual order can be interpreted as prioritization, the first object (with the
+            lowest order value) having the highest priority.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Aleksandar Seovic (.Net)</author>
+            <version>$Id: IOrdered.cs,v 1.6 2007/05/26 00:42:36 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Core.IOrdered.Order">
+            <summary>
+            Return the order value of this object, where a higher value means greater in
+            terms of sorting.
+            </summary>
+            <remarks>
+            <p>
+            Normally starting with 0 or 1, with <see cref="F:System.Int32.MaxValue"/> indicating
+            greatest. Same order values will result in arbitrary positions for the affected
+            objects.
+            </p>
+            <p>
+            Higher value can be interpreted as lower priority, consequently the first object
+            has highest priority.
+            </p>
+            </remarks>
+            <returns>The order value.</returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor">
+            <summary>
+            Allows for custom modification of an application context's object
+            definitions, adapting the object property values of the context's
+            underlying object factory.
+            </summary>
+            <remarks>
+            <p>
+            Application contexts can auto-detect
+            <c>IObjectFactoryPostProcessor</c> objects in their object definitions and
+            apply them before any other objects get created.
+            </p>
+            <p>
+            Useful for custom config files targeted at system administrators that
+            override object properties configured in the application context.
+            </p>
+            <p>
+            See PropertyResourceConfigurer and its concrete implementations for
+            out-of-the-box solutions that address such configuration needs.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.Net)</author>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor.PostProcessObjectFactory(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)">
+            <summary>
+            Modify the application context's internal object factory after its
+            standard initialization.
+            </summary>
+            <remarks>
+            <p>
+            All object definitions will have been loaded, but no objects will have
+            been instantiated yet. This allows for overriding or adding properties
+            even to eager-initializing objects.
+            </p>
+            </remarks>
+            <param name="factory">
+            The object factory used by the application context.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.AbstractConfigurer.PostProcessObjectFactory(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)">
+            <summary>
+            Modify the application context's internal object factory after its
+            standard initialization.
+            </summary>
+            <param name="factory">The object factory used by the application context.</param>
+            <remarks>
+            	<p>
+            All object definitions will have been loaded, but no objects will have
+            been instantiated yet. This allows for overriding or adding properties
+            even to eager-initializing objects.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.AbstractConfigurer.ResolveRequiredType(System.Object,System.String,System.String)">
+            <summary>
+            Resolves the supplied <paramref name="value"/> into a
+            <see cref="T:System.Type"/> instance.
+            </summary>
+            <param name="value">The object that is to be resolved into a <see cref="T:System.Type"/>
+            instance.</param>
+            <param name="errorContextSource">The error context source.</param>
+            <param name="errorContext">The error context string.</param>
+            <returns>A resolved <see cref="T:System.Type"/>.</returns>
+            <remarks>
+            	<p>
+            This (default) implementation supports resolving
+            <see cref="T:System.String"/>s and <see cref="T:System.Type"/>s.
+            Only override this method if you want to key your type alias
+            on something other than <see cref="T:System.String"/>s
+            and <see cref="T:System.Type"/>s.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the supplied <paramref name="value"/> is <see langword="null"/>,
+            or the supplied <paramref name="value"/> cannot be resolved.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.AbstractConfigurer.Order">
+            <summary>
+            Return the order value of this object, with a higher value meaning
+            greater in terms of sorting.
+            </summary>
+            <returns>The order value.</returns>
+            <seealso cref="P:Spring.Core.IOrdered.Order"/>
+        </member>
+        <member name="T:Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor">
+            <summary>
+             A <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/> implementation that enforces required properties to have been configured.
+            Required properties are detected through an attribute, by default, Spring's <see cref="T:Spring.Objects.Factory.Attributes.RequiredAttribute"/>
+            attribute.
+            </summary>
+            <remarks>
+            <para>The motivation for the existence of this IObjectPostProcessor is to allow
+            developers to annotate the setter properties of their own classes with an
+            arbitrary attribute to indicate that the container must check
+            for the configuration of a dependency injected value. This neatly pushes
+            responsibility for such checking onto the container (where it arguably belongs),
+            and obviates the need (<b>in part</b>) for a developer to code a method that
+            simply checks that all required properties have actually been set.
+            </para>
+            <para>Please note that an 'init' method may still need to implemented (and may
+            still be desirable), because all that this class does is enforce that a
+            'required' property has actually been configured with a value. It does
+            <b>not</b> check anything else... In particular, it does not check that a
+            configured value is not <code>null</code>.
+            </para>
+            </remarks>
+            <author>Rob Harrop</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: RequiredAttributeObjectPostProcessor.cs,v 1.2 2008/04/08 19:29:07 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.InstantiationAwareObjectPostProcessorAdapter">
+            <summary>
+            Adapter that implements all methods on <see cref="T:Spring.Objects.Factory.Config.SmartInstantiationAwareObjectPostProcessor"/>
+            as no-ops, which will not change normal processing of each object instantiated
+            by the container. Subclasses may override merely those methods that they are
+            actually interested in.
+            </summary>
+            <remarks>
+            Note that this base class is only recommendable if you actually require
+            <see cref="T:Spring.Objects.Factory.Config.IInstantiationAwareObjectPostProcessor"/> functionality.  If all you need
+            is plain <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/> functionality, prefer a straight
+            implementation of that (simpler) interface.
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: InstantiationAwareObjectPostProcessorAdapter.cs,v 1.1 2008/04/02 18:02:24 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.SmartInstantiationAwareObjectPostProcessor">
+            <summary>
+            Extension of the <see cref="T:Spring.Objects.Factory.Config.IInstantiationAwareObjectPostProcessor"/> interface,
+            adding a callback for predicting the eventual type of a processed object.
+            </summary>
+            <remarks>This interface is a special purpose interface, mainly for
+            internal use within the framework. In general, application-provided
+            post-processors should simply implement the plain <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            interface or derive from the <see cref="T:Spring.Objects.Factory.Config.InstantiationAwareObjectPostProcessorAdapter"/>
+            class.  New methods might be added to this interface even in point releases.
+            </remarks>
+            <seealso cref="T:Spring.Objects.Factory.Config.InstantiationAwareObjectPostProcessorAdapter"/>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: SmartInstantiationAwareObjectPostProcessor.cs,v 1.1 2008/04/02 18:02:24 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.IInstantiationAwareObjectPostProcessor">
+            <summary>
+            Subinterface of
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            that adds a before-instantiation callback.
+            </summary>
+            <remarks>
+            <p>
+            Typical use cases might include being used to suppress the default
+            instantiation of specific target objects, perhaps in favour of creating
+            proxies with special <c>Spring.Aop.ITargetSource</c>s (pooling targets,
+            lazily initializing targets, etc).
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IInstantiationAwareObjectPostProcessor.cs,v 1.4 2007/08/22 08:49:39 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.IObjectPostProcessor">
+            <summary>
+            Allows for custom modification of new object instances, e.g.
+            checking for marker interfaces or wrapping them with proxies.
+            </summary>
+            <remarks>
+            <p>
+            Application contexts can auto-detect
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            objects in their object definitions and apply them before any other
+            objects get created. Plain object factories allow for programmatic
+            registration of post-processors.
+            </p>
+            <p>
+            Typically, post-processors that populate objects via marker interfaces
+            or the like will implement
+            <see cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization(System.Object,System.String)"/>,
+            and post-processors that wrap objects with proxies will normally implement
+            <see cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization(System.Object,System.String)"/>.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: IObjectPostProcessor.cs,v 1.9 2007/08/22 08:49:39 markpollack Exp $</version>
+            <see cref="T:Spring.Objects.Factory.Config.IInstantiationAwareObjectPostProcessor"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization(System.Object,System.String)">
+            <summary>
+            Apply this <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            to the given new object instance <i>before</i> any object initialization callbacks.
+            </summary>
+            <remarks>
+            <p>
+            The object will already be populated with property values.
+            The returned object instance may be a wrapper around the original.
+            </p>
+            </remarks>
+            <param name="instance">
+            The new object instance.
+            </param>
+            <param name="name">
+            The name of the object.
+            </param>
+            <returns>
+            The object instance to use, either the original or a wrapped one.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization(System.Object,System.String)">
+            <summary>
+            Apply this <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/> to the
+            given new object instance <i>after</i> any object initialization callbacks.
+            </summary>
+            <remarks>
+            <p>
+            The object will already be populated with property values. The returned object
+            instance may be a wrapper around the original.
+            </p>
+            </remarks>
+            <param name="instance">
+            The new object instance.
+            </param>
+            <param name="objectName">
+            The name of the object.
+            </param>
+            <returns>
+            The object instance to use, either the original or a wrapped one.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IInstantiationAwareObjectPostProcessor.PostProcessBeforeInstantiation(System.Type,System.String)">
+            <summary>
+            Apply this
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            <i>before the target object gets instantiated</i>.
+            </summary>
+            <remarks>
+            <p>
+            The returned object may be a proxy to use instead of the target
+            object, effectively suppressing the default instantiation of the
+            target object.
+            </p>
+            <p>
+            If the object is returned by this method is not
+            <see langword="null"/>, the object creation process will be
+            short-circuited. The returned object will not be processed any
+            further; in particular, no further
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            callbacks will be applied to it. This mechanism is mainly intended
+            for exposing a proxy instead of an actual target object.
+            </p>
+            <p>
+            This callback will only be applied to object definitions with an
+            object class. In particular, it will <b>not</b> be applied to
+            objects with a "factory-method" (i.e. objects that are to be
+            instantiated via a layer of indirection anyway).
+            </p>
+            </remarks>
+            <param name="objectType">
+            The <see cref="T:System.Type"/> of the target object that is to be
+            instantiated.
+            </param>
+            <param name="objectName">
+            The name of the target object.
+            </param>
+            <returns>
+            The object to expose instead of a default instance of the target
+            object.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of any errors.
+            </exception>
+            <seealso cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.HasObjectType"/>
+            <seealso cref="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.FactoryMethodName"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IInstantiationAwareObjectPostProcessor.PostProcessAfterInstantiation(System.Object,System.String)">
+            <summary>
+            Perform operations after the object has been instantiated, via a constructor or factory method,
+            but before Spring property population (from explicit properties or autowiring) occurs.
+            </summary>
+            <param name="objectInstance">The object instance created, but whose properties have not yet been set</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>true if properties should be set on the object; false if property population
+            should be skipped.  Normal implementations should return true.  Returning false will also
+            prevent any subsequent InstantiationAwareObjectPostProcessor instances from being 
+            invoked on this object instance.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IInstantiationAwareObjectPostProcessor.PostProcessPropertyValues(Spring.Objects.IPropertyValues,System.Reflection.PropertyInfo[],System.Object,System.String)">
+            <summary>
+            Post-process the given property values before the factory applies them
+            to the given object.
+            </summary>
+            <remarks>Allows for checking whether all dependencies have been
+            satisfied, for example based on a "Required" annotation on bean property setters.
+            <para>Also allows for replacing the property values to apply, typically through
+            creating a new MutablePropertyValues instance based on the original PropertyValues,
+            adding or removing specific values.
+            </para>
+            </remarks>
+            <param name="pvs">The property values that the factory is about to apply (never <code>null</code>).</param>
+            <param name="pis">he relevant property infos for the target object (with ignored
+            dependency types - which the factory handles specifically - already filtered out)</param>
+            <param name="objectInstance">The object instance created, but whose properties have not yet 
+            been set.</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>The actual property values to apply to the given object (can be the 
+            passed-in PropertyValues instances0 or null to skip property population.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.SmartInstantiationAwareObjectPostProcessor.PredictObjectType(System.Type,System.String)">
+            <summary>
+            Predicts the type of the object to be eventually returned from this
+            processors <see cref="M:Spring.Objects.Factory.Config.IInstantiationAwareObjectPostProcessor.PostProcessBeforeInstantiation(System.Type,System.String)"/> callback.
+            </summary>
+            <param name="objectType">The raw Type of the object.</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>The type of the object, or <code>null</code> if not predictable.</returns>
+            <exception cref="T:Spring.Objects.ObjectsException">in case of errors</exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.SmartInstantiationAwareObjectPostProcessor.DetermineCandidateConstructors(System.Type,System.String)">
+            <summary>
+            Determines the candidate constructors to use for the given object.
+            </summary>
+            <param name="objectType">The raw Type of the object.</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>The candidate constructors, or <code>null</code> if none specified</returns>
+            <exception cref="T:Spring.Objects.ObjectsException">in case of errors</exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.InstantiationAwareObjectPostProcessorAdapter.PredictObjectType(System.Type,System.String)">
+            <summary>
+            Predicts the type of the object to be eventually returned from this
+            processors PostProcessBeforeInstantiation callback.
+            </summary>
+            <param name="objectType">The raw Type of the object.</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>The type of the object, or <code>null</code> if not predictable.</returns>
+            <exception cref="T:Spring.Objects.ObjectsException">in case of errors</exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.InstantiationAwareObjectPostProcessorAdapter.DetermineCandidateConstructors(System.Type,System.String)">
+            <summary>
+            Determines the candidate constructors to use for the given object.
+            </summary>
+            <param name="objectType">The raw Type of the object.</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>The candidate constructors, or <code>null</code> if none specified</returns>
+            <exception cref="T:Spring.Objects.ObjectsException">in case of errors</exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.InstantiationAwareObjectPostProcessorAdapter.PostProcessBeforeInstantiation(System.Type,System.String)">
+            <summary>
+            Apply this
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            <i>before the target object gets instantiated</i>.
+            </summary>
+            <remarks>
+            <p>
+            The returned object may be a proxy to use instead of the target
+            object, effectively suppressing the default instantiation of the
+            target object.
+            </p>
+            <p>
+            If the object is returned by this method is not
+            <see langword="null"/>, the object creation process will be
+            short-circuited. The returned object will not be processed any
+            further; in particular, no further
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            callbacks will be applied to it. This mechanism is mainly intended
+            for exposing a proxy instead of an actual target object.
+            </p>
+            <p>
+            This callback will only be applied to object definitions with an
+            object class. In particular, it will <b>not</b> be applied to
+            objects with a "factory-method" (i.e. objects that are to be
+            instantiated via a layer of indirection anyway).
+            </p>
+            </remarks>
+            <param name="objectType">
+            The <see cref="T:System.Type"/> of the target object that is to be
+            instantiated.
+            </param>
+            <param name="objectName">
+            The name of the target object.
+            </param>
+            <returns>
+            The object to expose instead of a default instance of the target
+            object.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of any errors.
+            </exception>
+            <seealso cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.HasObjectType"/>
+            <seealso cref="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.FactoryMethodName"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.InstantiationAwareObjectPostProcessorAdapter.PostProcessAfterInstantiation(System.Object,System.String)">
+            <summary>
+            Perform operations after the object has been instantiated, via a constructor or factory method,
+            but before Spring property population (from explicit properties or autowiring) occurs.
+            </summary>
+            <param name="objectInstance">The object instance created, but whose properties have not yet been set</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>true if properties should be set on the object; false if property population
+            should be skipped.  Normal implementations should return true.  Returning false will also
+            prevent any subsequent InstantiationAwareObjectPostProcessor instances from being 
+            invoked on this object instance.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.InstantiationAwareObjectPostProcessorAdapter.PostProcessPropertyValues(Spring.Objects.IPropertyValues,System.Reflection.PropertyInfo[],System.Object,System.String)">
+            <summary>
+            Post-process the given property values before the factory applies them
+            to the given object.
+            </summary>
+            <remarks>Allows for checking whether all dependencies have been
+            satisfied, for example based on a "Required" annotation on bean property setters.
+            <para>Also allows for replacing the property values to apply, typically through
+            creating a new MutablePropertyValues instance based on the original PropertyValues,
+            adding or removing specific values.
+            </para>
+            </remarks>
+            <param name="pvs">The property values that the factory is about to apply (never <code>null</code>).</param>
+            <param name="pis">he relevant property infos for the target object (with ignored
+            dependency types - which the factory handles specifically - already filtered out)</param>
+            <param name="objectInstance">The object instance created, but whose properties have not yet 
+            been set.</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>The actual property values to apply to the given object (can be the 
+            passed-in PropertyValues instances0 or null to skip property population.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.InstantiationAwareObjectPostProcessorAdapter.PostProcessBeforeInitialization(System.Object,System.String)">
+            <summary>
+            Apply this <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            to the given new object instance <i>before</i> any object initialization callbacks.
+            </summary>
+            <remarks>
+            <p>
+            The object will already be populated with property values.
+            The returned object instance may be a wrapper around the original.
+            </p>
+            </remarks>
+            <param name="instance">
+            The new object instance.
+            </param>
+            <param name="name">
+            The name of the object.
+            </param>
+            <returns>
+            The object instance to use, either the original or a wrapped one.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.InstantiationAwareObjectPostProcessorAdapter.PostProcessAfterInitialization(System.Object,System.String)">
+            <summary>
+            Apply this <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/> to the
+            given new object instance <i>after</i> any object initialization callbacks.
+            </summary>
+            <remarks>
+            <p>
+            The object will already be populated with property values. The returned object
+            instance may be a wrapper around the original.
+            </p>
+            </remarks>
+            <param name="instance">
+            The new object instance.
+            </param>
+            <param name="objectName">
+            The name of the object.
+            </param>
+            <returns>
+            The object instance to use, either the original or a wrapped one.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="F:Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor.validatedObjectNames">
+            <summary>
+            Cache for validated object names, skipping re-validation for the same object
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor.PostProcessPropertyValues(Spring.Objects.IPropertyValues,System.Reflection.PropertyInfo[],System.Object,System.String)">
+            <summary>
+            Post-process the given property values before the factory applies them
+            to the given object.  Checks for the attribute specified by this PostProcessor's RequiredAttributeType.
+            </summary>
+            <param name="pvs">The property values that the factory is about to apply (never <code>null</code>).</param>
+            <param name="pis">The relevant property infos for the target object (with ignored
+            dependency types - which the factory handles specifically - already filtered out)</param>
+            <param name="objectInstance">The object instance created, but whose properties have not yet
+            been set.</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>
+            The actual property values to apply to the given object (can be the
+            passed-in PropertyValues instances or null to skip property population.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.ObjectInitializationException">If a required property value has not been specified
+            in the configuration metadata.</exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor.IsRequiredProperty(System.Reflection.PropertyInfo)">
+            <summary>
+            Determines whether the supplied property is required to have a value, that is to be dependency injected.
+            </summary>
+            <remarks>
+            This implementation looks for the existence of a "required" attribute on the supplied PropertyInfo and that
+            the property has a setter method.
+            </remarks>
+            <param name="pi">The target PropertyInfo</param>
+            <returns>
+            	<c>true</c> if the supplied property has been marked as being required;; otherwise, <c>false</c> if
+            not or if the supplied property does not have a setter method
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor.BuildExceptionMessage(System.String[],System.ICloneable)">
+            <summary>
+            Builds an exception message for the given list of invalid properties.
+            </summary>
+            <param name="invalidProperties">The list of names of invalid properties.</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>The exception message</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor.RequiredAttributeType">
+            <summary>
+            Sets the type of the required attribute, to be used on a property setter
+            </summary>
+            <remarks>
+            The default required attribute type is the Spring-provided <see cref="T:Spring.Objects.Factory.Attributes.RequiredAttribute"/> attribute.
+            This setter property exists so that developers can provide their own 
+            (non-Spring-specific) annotation type to indicate that a property value is required.
+            </remarks>
+            <value>The type of the required attribute.</value>
+        </member>
+        <member name="T:Spring.Globalization.Formatters.IntegerFormatter">
+            <summary>
+            Implementation of <see cref="T:Spring.Globalization.IFormatter"/> that can be used to
+            format and parse integer numbers.
+            </summary>
+            <remarks>
+            <para>
+            This formatter allows you to format and parse numbers that conform 
+            to <see cref="F:System.Globalization.NumberStyles.Integer"/> number style (leading and trailing 
+            white space, leading sign).
+            </para>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IntegerFormatter.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Globalization.IFormatter">
+            <summary>
+            Interface that should be implemented by all formatters.
+            </summary>
+            <remarks>
+            <para>
+            Formatters assume that source value is a string, and make no assumptions
+            about the target value's type, which means that <c>Parse</c> method can return
+            object of any type. 
+            </para>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IFormatter.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.IFormatter.Format(System.Object)">
+            <summary>
+            Formats the specified value.
+            </summary>
+            <param name="value">The value to format.</param>
+            <returns>Formatted <paramref name="value"/>.</returns>
+        </member>
+        <member name="M:Spring.Globalization.IFormatter.Parse(System.String)">
+            <summary>
+            Parses the specified value.
+            </summary>
+            <param name="value">The value to parse.</param>
+            <returns>Parsed <paramref name="value"/>.</returns>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.IntegerFormatter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.IntegerFormatter"/> class,
+            using default format string of '{0:D}'.
+            </summary>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.IntegerFormatter.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.IntegerFormatter"/> class,
+            using specified format string.
+            </summary>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.IntegerFormatter.Format(System.Object)">
+            <summary>
+            Formats the specified integer value.
+            </summary>
+            <param name="value">The value to format.</param>
+            <returns>Formatted integer number.</returns>
+            <exception cref="T:System.ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+            <exception cref="T:System.ArgumentException">If <paramref name="value"/> is not an integer number.</exception>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.IntegerFormatter.Parse(System.String)">
+            <summary>
+            Parses the specified integer value.
+            </summary>
+            <param name="value">The integer value to parse.</param>
+            <returns>Parsed number value as a <see cref="T:System.Int32"/>.</returns>
+        </member>
+        <member name="T:Spring.Globalization.AbstractLocalizer">
+            <summary>
+            Abstract base class that all localizers should extend
+            </summary>
+            <remarks>
+            <p>
+            This class contains the bulk of the localizer logic, including implementation
+            of the <c>ApplyResources</c> methods that are defined in <see cref="T:Spring.Globalization.ILocalizer"/>
+            interface.
+            </p>
+            <p>
+            All specific localizers need to do is inherit this class and implement 
+            <c>GetResources</c> method that will return a list of <see cref="T:Spring.Globalization.Resource"/>
+            objects that should be applied to a specified <c>target</c>.
+            </p>
+            <p>
+            Custom implementations can use whatever type of resource storage they want,
+            such as standard .NET resource sets, custom XML files, database, etc.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AbstractLocalizer.cs,v 1.5 2007/07/24 17:26:25 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Globalization.ILocalizer">
+            <summary>
+            Defines an interface that localizers have to implement.
+            </summary>
+            <remarks>
+            <p>
+            Localizers are used to automatically apply resources to object's members
+            using reflection.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ILocalizer.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.ILocalizer.ApplyResources(System.Object,Spring.Context.IMessageSource,System.Globalization.CultureInfo)">
+            <summary>
+            Applies resources of the specified culture to the specified target object.
+            </summary>
+            <param name="target">Target object to apply resources to.</param>
+            <param name="messageSource"><see cref="T:Spring.Context.IMessageSource"/> instance to retrieve resources from.</param>
+            <param name="culture">Resource culture to use for resource lookup.</param>
+        </member>
+        <member name="M:Spring.Globalization.ILocalizer.ApplyResources(System.Object,Spring.Context.IMessageSource)">
+            <summary>
+            Applies resources to the specified target object, using current thread's culture to resolve resources.
+            </summary>
+            <param name="target">Target object to apply resources to.</param>
+            <param name="messageSource"><see cref="T:Spring.Context.IMessageSource"/> instance to retrieve resources from.</param>
+        </member>
+        <member name="P:Spring.Globalization.ILocalizer.ResourceCache">
+            <summary>
+            Gets or sets the resource cache instance.
+            </summary>
+            <value>The resource cache instance.</value>
+        </member>
+        <member name="M:Spring.Globalization.AbstractLocalizer.ApplyResources(System.Object,Spring.Context.IMessageSource,System.Globalization.CultureInfo)">
+            <summary>
+            Applies resources of the specified culture to the specified target object.
+            </summary>
+            <param name="target">Target object to apply resources to.</param>
+            <param name="messageSource"><see cref="T:Spring.Context.IMessageSource"/> instance to retrieve resources from.</param>
+            <param name="culture">Resource culture to use for resource lookup.</param>
+        </member>
+        <member name="M:Spring.Globalization.AbstractLocalizer.ApplyResources(System.Object,Spring.Context.IMessageSource)">
+            <summary>
+            Applies resources to the specified target object, using current thread's uiCulture to resolve resources.
+            </summary>
+            <param name="target">Target object to apply resources to.</param>
+            <param name="messageSource"><see cref="T:Spring.Context.IMessageSource"/> instance to retrieve resources from.</param>
+        </member>
+        <member name="M:Spring.Globalization.AbstractLocalizer.GetResources(System.Object,Spring.Context.IMessageSource,System.Globalization.CultureInfo)">
+            <summary>
+            Returns a list of <see cref="T:Spring.Globalization.Resource"/> instances that should be applied to the target.
+            </summary>
+            <param name="target">Target to get a list of resources for.</param>
+            <param name="messageSource"><see cref="T:Spring.Context.IMessageSource"/> instance to retrieve resources from.</param>
+            <param name="culture">Resource locale.</param>
+            <returns>A list of resources to apply.</returns>
+        </member>
+        <member name="M:Spring.Globalization.AbstractLocalizer.LoadResources(System.Object,Spring.Context.IMessageSource,System.Globalization.CultureInfo)">
+            <summary>
+            Loads resources from the storage and creates a list of <see cref="T:Spring.Globalization.Resource"/> instances that should be applied to the target.
+            </summary>
+            <param name="target">Target to get a list of resources for.</param>
+            <param name="messageSource"><see cref="T:Spring.Context.IMessageSource"/> instance to retrieve resources from.</param>
+            <param name="culture">Resource locale.</param>
+            <returns>A list of resources to apply.</returns>
+        </member>
+        <member name="P:Spring.Globalization.AbstractLocalizer.ResourceCache">
+            <summary>
+            Gets or sets the resource cache instance.
+            </summary>
+            <value>The resource cache instance.</value>
+        </member>
+        <member name="T:Spring.Expressions.OpLessOrEqual">
+            <summary>
+            Represents logical "less than or equal" operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpLessOrEqual.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpLessOrEqual.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpLessOrEqual.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpLessOrEqual.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical "less than or equal" operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpIn">
+            <summary>
+            Represents logical IN operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpIn.cs,v 1.5 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpIn.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpIn.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpIn.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical IN operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>
+            true if the left operand is contained within the right operand, false otherwise.
+            </returns>
+        </member>
+        <member name="T:Spring.Expressions.SelectionLastNode">
+            <summary>
+            Represents parsed selection node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SelectionLastNode.cs,v 1.5 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.SelectionLastNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SelectionLastNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SelectionLastNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns the last context item that matches selection expression.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.Processors.MinAggregator">
+            <summary>
+            Implementation of the minimum aggregator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: MinAggregator.cs,v 1.2 2006/12/04 08:58:33 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.Processors.MinAggregator.Process(System.Collections.ICollection,System.Object[])">
+            <summary>
+            Returns the smallest item in the source collection.
+            </summary>
+            <param name="source">
+            The source collection to process.
+            </param>
+            <param name="args">
+            Ignored.
+            </param>
+            <returns>
+            The smallest item in the source collection.
+            </returns>
+        </member>
+        <member name="T:Spring.DataBinding.BaseBindingContainer">
+            <summary>
+            Base implementation of the <see cref="T:Spring.DataBinding.IBindingContainer"/>.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: BaseBindingContainer.cs,v 1.2 2008/02/05 20:40:25 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.DataBinding.IBindingContainer">
+            <summary>
+            An interface that has to be implemented by all data binding containers.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IBindingContainer.cs,v 1.1 2006/11/21 05:46:57 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.DataBinding.IBinding">
+            <summary>
+            An interface that defines the methods that have to be implemented by all data bindings.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IBinding.cs,v 1.3 2008/02/05 20:40:25 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.DataBinding.IBinding.BindSourceToTarget(System.Object,System.Object,Spring.Validation.IValidationErrors)">
+            <summary>
+            Binds source object to target object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.IBinding.BindSourceToTarget(System.Object,System.Object,Spring.Validation.IValidationErrors,System.Collections.IDictionary)">
+            <summary>
+            Binds source object to target object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.IBinding.BindTargetToSource(System.Object,System.Object,Spring.Validation.IValidationErrors)">
+            <summary>
+            Binds target object to source object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.IBinding.BindTargetToSource(System.Object,System.Object,Spring.Validation.IValidationErrors,System.Collections.IDictionary)">
+            <summary>
+            Binds target object to source object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.IBinding.SetErrorMessage(System.String,System.String[])">
+            <summary>
+            Sets error message that should be displayed in the case 
+            of a non-fatal binding error.
+            </summary>
+            <param name="messageId">
+            Resource ID of the error message.
+            </param>
+            <param name="errorProviders">
+            List of error providers message should be added to.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.IBindingContainer.AddBinding(Spring.DataBinding.IBinding)">
+            <summary>
+            Adds the binding.
+            </summary>
+            <param name="binding">
+            Binding definition to add.
+            </param>
+            <returns>
+            Added <see cref="T:Spring.DataBinding.IBinding"/> instance.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.IBindingContainer.AddBinding(System.String,System.String)">
+            <summary>
+            Adds the <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> binding with a default 
+            binding direction of <see cref="F:Spring.DataBinding.BindingDirection.Bidirectional"/>.
+            </summary>
+            <remarks>
+            This is a convinience method for adding <b>SimpleExpressionBinding</b>,
+            one of the most often used binding types, to the bindings list.
+            </remarks>
+            <param name="sourceExpression">
+            The source expression.
+            </param>
+            <param name="targetExpression">
+            The target expression.
+            </param>
+            <returns>
+            Added <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> instance.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.IBindingContainer.AddBinding(System.String,System.String,Spring.DataBinding.BindingDirection)">
+            <summary>
+            Adds the <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> binding.
+            </summary>
+            <remarks>
+            This is a convinience method for adding <b>SimpleExpressionBinding</b>,
+            one of the most often used binding types, to the bindings list.
+            </remarks>
+            <param name="sourceExpression">
+            The source expression.
+            </param>
+            <param name="targetExpression">
+            The target expression.
+            </param>
+            <param name="direction">
+            Binding direction.
+            </param>
+            <returns>
+            Added <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> instance.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.IBindingContainer.AddBinding(System.String,System.String,Spring.Globalization.IFormatter)">
+            <summary>
+            Adds the <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> binding with a default 
+            binding direction of <see cref="F:Spring.DataBinding.BindingDirection.Bidirectional"/>.
+            </summary>
+            <remarks>
+            This is a convinience method for adding <b>SimpleExpressionBinding</b>,
+            one of the most often used binding types, to the bindings list.
+            </remarks>
+            <param name="sourceExpression">
+            The source expression.
+            </param>
+            <param name="targetExpression">
+            The target expression.
+            </param>
+            <param name="formatter">
+            <see cref="T:Spring.Globalization.IFormatter"/> to use for value formatting and parsing.
+            </param>
+            <returns>
+            Added <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> instance.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.IBindingContainer.AddBinding(System.String,System.String,Spring.DataBinding.BindingDirection,Spring.Globalization.IFormatter)">
+            <summary>
+            Adds the <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> binding.
+            </summary>
+            <remarks>
+            This is a convinience method for adding <b>SimpleExpressionBinding</b>,
+            one of the most often used binding types, to the bindings list.
+            </remarks>
+            <param name="sourceExpression">
+            The source expression.
+            </param>
+            <param name="targetExpression">
+            The target expression.
+            </param>
+            <param name="direction">
+            Binding direction.
+            </param>
+            <param name="formatter">
+            <see cref="T:Spring.Globalization.IFormatter"/> to use for value formatting and parsing.
+            </param>
+            <returns>
+            Added <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> instance.
+            </returns>
+        </member>
+        <member name="P:Spring.DataBinding.IBindingContainer.HasBindings">
+            <summary>
+            Gets a value indicating whether this data binding container 
+            has bindings.
+            </summary>
+            <value>
+            	<c>true</c> if this data binding container has bindings; 
+                <c>false</c> otherwise.
+            </value>
+        </member>
+        <member name="M:Spring.DataBinding.BaseBindingContainer.#ctor">
+            <summary>
+            Creates a new instance of <see cref="T:Spring.DataBinding.BaseBindingContainer"/>.
+            </summary>
+        </member>
+        <member name="M:Spring.DataBinding.BaseBindingContainer.AddBinding(Spring.DataBinding.IBinding)">
+            <summary>
+            Adds the binding.
+            </summary>
+            <param name="binding">
+            Binding definition to add.
+            </param>
+            <returns>
+            Added <see cref="T:Spring.DataBinding.IBinding"/> instance.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.BaseBindingContainer.AddBinding(System.String,System.String)">
+            <summary>
+            Adds the <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> binding with a default 
+            binding direction of <see cref="F:Spring.DataBinding.BindingDirection.Bidirectional"/>.
+            </summary>
+            <param name="sourceExpression">
+            The source expression.
+            </param>
+            <param name="targetExpression">
+            The target expression.
+            </param>
+            <returns>
+            Added <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> instance.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.BaseBindingContainer.AddBinding(System.String,System.String,Spring.DataBinding.BindingDirection)">
+            <summary>
+            Adds the <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> binding.
+            </summary>
+            <param name="sourceExpression">
+            The source expression.
+            </param>
+            <param name="targetExpression">
+            The target expression.
+            </param>
+            <param name="direction">
+            Binding direction.
+            </param>
+            <returns>
+            Added <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> instance.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.BaseBindingContainer.AddBinding(System.String,System.String,Spring.Globalization.IFormatter)">
+            <summary>
+            Adds the <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> binding with a default 
+            binding direction of <see cref="F:Spring.DataBinding.BindingDirection.Bidirectional"/>.
+            </summary>
+            <param name="sourceExpression">
+            The source expression.
+            </param>
+            <param name="targetExpression">
+            The target expression.
+            </param>
+            <param name="formatter">
+            <see cref="T:Spring.Globalization.IFormatter"/> to use for value formatting and parsing.
+            </param>
+            <returns>
+            Added <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> instance.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.BaseBindingContainer.AddBinding(System.String,System.String,Spring.DataBinding.BindingDirection,Spring.Globalization.IFormatter)">
+            <summary>
+            Adds the <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> binding.
+            </summary>
+            <param name="sourceExpression">
+            The source expression.
+            </param>
+            <param name="targetExpression">
+            The target expression.
+            </param>
+            <param name="direction">
+            Binding direction.
+            </param>
+            <param name="formatter">
+            <see cref="T:Spring.Globalization.IFormatter"/> to use for value formatting and parsing.
+            </param>
+            <returns>
+            Added <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> instance.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.BaseBindingContainer.BindSourceToTarget(System.Object,System.Object,Spring.Validation.IValidationErrors)">
+            <summary>
+            Binds source object to target object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.BaseBindingContainer.BindSourceToTarget(System.Object,System.Object,Spring.Validation.IValidationErrors,System.Collections.IDictionary)">
+            <summary>
+            Binds source object to target object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.BaseBindingContainer.BindTargetToSource(System.Object,System.Object,Spring.Validation.IValidationErrors)">
+            <summary>
+            Binds target object to source object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.BaseBindingContainer.BindTargetToSource(System.Object,System.Object,Spring.Validation.IValidationErrors,System.Collections.IDictionary)">
+            <summary>
+            Binds target object to source object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.BaseBindingContainer.SetErrorMessage(System.String,System.String[])">
+            <summary>
+            Sets error message that should be displayed in the case 
+            of a non-fatal binding error.
+            </summary>
+            <param name="messageId">
+            Resource ID of the error message.
+            </param>
+            <param name="errorProviders">
+            List of error providers message should be added to.
+            </param>
+        </member>
+        <member name="P:Spring.DataBinding.BaseBindingContainer.Bindings">
+            <summary>
+            Gets a list of bindings for this container.
+            </summary>
+            <value>
+            A list of bindings for this container.
+            </value>
+        </member>
+        <member name="P:Spring.DataBinding.BaseBindingContainer.HasBindings">
+            <summary>
+            Gets a value indicating whether this instance has bindings.
+            </summary>
+            <value>
+            	<c>true</c> if this instance has bindings; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.StreamConverter">
+            <summary>
+            Converter for <see cref="T:System.IO.Stream"/> to directly set a
+            <see cref="T:System.IO.Stream"/> property.
+            </summary>
+            <author>Jurgen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.StreamConverter.#ctor">
+            <summary>
+            Create a new StreamConverter using the default
+            <see cref="T:Spring.Core.IO.ResourceConverter"/>.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.StreamConverter.#ctor(Spring.Core.IO.ResourceConverter)">
+            <summary>
+            Create a new StreamConverter using the given
+            <see cref="T:Spring.Core.IO.ResourceConverter"/>.
+            </summary>
+            <param name="resourceConverter">
+            The <see cref="T:Spring.Core.IO.ResourceConverter"/> to use.</param>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.StreamConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Returns whether this converter can convert an object of one
+            <see cref="T:System.Type"/> to a <see cref="T:System.IO.Stream"/>
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from a
+            <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns>True if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.StreamConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Convert from a string value to a <see cref="T:System.IO.Stream"/> instance.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture. 
+            </param>
+            <param name="val">
+            The value that is to be converted.
+            </param>
+            <returns>
+            A <see cref="T:System.IO.Stream"/> if successful. 
+            </returns>
+        </member>
+        <member name="T:Spring.Core.MethodGenericArgumentsCountCriteria">
+            <summary>
+            Criteria that is satisfied if the number of generic arguments to a given
+            <see cref="T:System.Reflection.MethodBase"/> matches an arbitrary number.
+            </summary>
+            <remarks>
+            <p>
+            This class supports checking the generic arguments count of both 
+            generic methods and constructors.
+            </p>
+            </remarks>
+            <author>Bruno Baia</author>
+            <version>$Id: MethodGenericArgumentsCountCriteria.cs,v 1.1 2007/08/04 01:04:33 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.MethodGenericArgumentsCountCriteria.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.MethodGenericArgumentsCountCriteria"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This constructor sets the
+            <see cref="P:Spring.Core.MethodGenericArgumentsCountCriteria.ExpectedGenericArgumentCount"/>
+            property to zero (0).
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Core.MethodGenericArgumentsCountCriteria.#ctor(System.Int32)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.MethodGenericArgumentsCountCriteria"/> class.
+            </summary>
+            <param name="expectedGenericArgumentCount">
+            The number of generic arguments that a <see cref="T:System.Reflection.MethodInfo"/> 
+            must have to satisfy this criteria.
+            </param>
+            <exception cref="T:System.ArgumentException">
+            If the supplied <paramref name="expectedParameterCount"/> is less
+            than zero.
+            </exception>
+        </member>
+        <member name="M:Spring.Core.MethodGenericArgumentsCountCriteria.IsSatisfied(System.Object)">
+            <summary>
+            Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+            this instance?
+            </summary>
+            <param name="datum">The datum to be checked by this criteria instance.</param>
+            <returns>
+            True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+            by this instance; false if not or the supplied <paramref name="datum"/> is null.
+            </returns>
+        </member>
+        <member name="P:Spring.Core.MethodGenericArgumentsCountCriteria.ExpectedGenericArgumentCount">
+            <summary>
+            The number of generic arguments that a <see cref="T:System.Reflection.MethodInfo"/> 
+            must have to satisfy this criteria.
+            </summary>
+            <exception cref="T:System.ArgumentException">
+            If the supplied value is less than zero.
+            </exception>
+        </member>
+        <member name="T:Spring.Core.CannotLoadObjectTypeException">
+            <summary>
+            Exception thrown when the ObjectFactory cannot load the specified type of a given object.
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: CannotLoadObjectTypeException.cs,v 1.4 2007/08/01 23:24:11 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.CannotLoadObjectTypeException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Core.CannotLoadObjectTypeException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.CannotLoadObjectTypeException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.CannotLoadObjectTypeException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Core.CannotLoadObjectTypeException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.CannotLoadObjectTypeException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Core.CannotLoadObjectTypeException.#ctor(System.String,System.String,System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Core.CannotLoadObjectTypeException"/> class.
+            </summary>
+            <param name="resourceDescription">The resource description that the object definition came from.</param>
+            <param name="objectName">Name of the object requested</param>
+            <param name="objectTypeName">Name of the object type.</param>
+            <param name="rootCause">The root cause.</param>
+        </member>
+        <member name="M:Spring.Core.CannotLoadObjectTypeException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.InvalidPropertyException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Core.CannotLoadObjectTypeException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="P:Spring.Core.CannotLoadObjectTypeException.ObjectName">
+            <summary>
+            Gets he name of the object we are trying to load.
+            </summary>
+            <value>The name of the object.</value>
+        </member>
+        <member name="P:Spring.Core.CannotLoadObjectTypeException.ObjectTypeName">
+            <summary>
+            Gets the name of the object type we are trying to load.
+            </summary>
+            <value>The name of the object type.</value>
+        </member>
+        <member name="P:Spring.Core.CannotLoadObjectTypeException.ResourceDescription">
+            <summary>
+            Gets the resource description that the object definition came from
+            </summary>
+            <value>The resource description.</value>
+        </member>
+        <member name="T:Spring.Context.Support.ContextHandler">
+            <summary>
+            Creates an <see cref="T:Spring.Context.IApplicationContext"/> instance
+            using context definitions supplied in a custom configuration and
+            configures the <see cref="T:Spring.Context.Support.ContextRegistry"/> with that instance.
+            </summary>
+            <remarks>
+            Implementations of the <see cref="T:Spring.Context.IApplicationContext"/>
+            interface <b>must</b> provide the following two constructors:
+            <list type="number">
+            <item>
+            <description>
+            A constructor that takes a string array of resource locations.
+            </description>
+            </item>
+            <item>
+            <description>
+            A constructor that takes a reference to a parent application context
+            and a string array of resource locations (and in that order).
+            </description>
+            </item>
+            </list>
+            <p>
+            Note that if the <c>type</c> attribute is not present in the declaration
+            of a particular context, then a default
+            <see cref="T:Spring.Context.IApplicationContext"/> <see cref="T:System.Type"/>
+            is assumed. This default
+            <see cref="T:Spring.Context.IApplicationContext"/> <see cref="T:System.Type"/>
+            is currently the <see cref="T:Spring.Context.Support.XmlApplicationContext"/>
+            <see cref="T:System.Type"/>; please note the exact <see cref="T:System.Type"/>
+            of this default <see cref="T:Spring.Context.IApplicationContext"/> is an
+            implementation detail, that, while unlikely, may do so in the future.
+            to
+            </p>
+            </remarks>
+            <example>
+            <p>
+            This is an example of specifying a context that reads its resources from
+            an embedded Spring.NET XML object configuration file...
+            </p>
+            <code escaped="true">
+            <configuration>
+                <configSections>
+            	    <sectionGroup name="spring">
+            		    <section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/>
+            	    </sectionGroup>
+                </configSections>
+                <spring>
+            	    <context>
+            		    <resource uri="assembly://MyAssemblyName/MyResourceNamespace/MyObjects.xml"/>
+            	    </context>
+                </spring>
+            </configuration>
+            </code>
+            <p>
+            This is an example of specifying a context that reads its resources from
+            a custom configuration section within the same application / web
+            configuration file and uses case insensitive object lookups. 
+            </p>
+            <p>
+            Please note that you <b>must</b> adhere to the naming
+            of the various sections (i.e. '&lt;sectionGroup name="spring"&gt;' and
+            '&lt;section name="context"&gt;'.
+            </p>
+            <code escaped="true">
+            <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"/>
+            	    </sectionGroup>
+                </configSections>
+                <spring>
+            	    <context caseSensitive="false" type="Spring.Context.Support.XmlApplicationContext, Spring.Core">
+            		    <resource uri="config://spring/objects"/>
+            	    </context>
+            	    <objects xmlns="http://www.springframework.net">
+            		    <!-- object definitions... -->
+            	    </objects>
+                </spring>
+            </configuration>
+            </code>
+            <p>
+            And this is an example of specifying a hierarchy of contexts. The
+            hierarchy in this case is only a simple parent-&gt;child hierarchy, but
+            hopefully it illustrates the nesting of context configurations. This
+            nesting of contexts can be arbitrarily deep, and is one way... child
+            contexts know about their parent contexts, but parent contexts do not
+            know how many child contexts they have (if any), or have references
+            to any such child contexts.
+            </p>
+            <code escaped="true">
+            <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"/>
+                        <sectionGroup name="child">
+            			    <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
+                        </sectionGroup>
+            		</sectionGroup>
+            	</configSections>
+            	
+                <spring>
+            		<context name="Parent">
+            			<resource uri="config://spring/objects"/>
+            		    <context name="Child">
+            			    <resource uri="config://spring/childObjects"/>
+            		    </context>
+            		</context>
+            		<!-- parent context's objects -->
+            		<objects xmlns="http://www.springframework.net">
+            			<object id="Parent" type="Spring.Objects.TestObject,Spring.Core.Tests">
+                            <property name="name" value="Parent"/>
+                        </object>
+            		</objects>
+            		<!-- child context's objects -->
+                    <child>
+            		    <objects xmlns="http://www.springframework.net">
+            			    <object id="Child" type="Spring.Objects.TestObject,Spring.Core.Tests">
+                                <property name="name" value="Child"/>
+                            </object>
+            		    </objects>
+                    </child>
+                </spring>
+            </configuration>
+            </code>
+            </example>
+            <author>Mark Pollack</author>
+            <author>Aleksandar Seovic</author>
+            <author>Rick Evans</author>
+            <version>$Id: ContextHandler.cs,v 1.36 2008/03/13 20:07:33 bbaia Exp $</version>
+            <seealso cref="T:Spring.Context.Support.ContextRegistry"/>
+        </member>
+        <member name="M:Spring.Context.Support.ContextHandler.Create(System.Object,System.Object,System.Xml.XmlNode)">
+            <summary>
+            Creates an <see cref="T:Spring.Context.IApplicationContext"/> instance
+            using the context definitions supplied in a custom
+            configuration section.
+            </summary>
+            <remarks>
+            <p>
+            This <see cref="T:Spring.Context.IApplicationContext"/> instance is
+            also used to configure the <see cref="T:Spring.Context.Support.ContextRegistry"/>.
+            </p>
+            </remarks>
+            <param name="parent">
+            The configuration settings in a corresponding parent
+            configuration section.
+            </param>
+            <param name="configContext">
+            The configuration context when called from the ASP.NET
+            configuration system. Otherwise, this parameter is reserved and
+            is <see langword="null"/>.
+            </param>
+            <param name="section">
+            The <see cref="T:System.Xml.XmlNode"/> for the section.
+            </param>
+            <returns>
+            An <see cref="T:Spring.Context.IApplicationContext"/> instance
+            populated with the object definitions supplied in the configuration
+            section.
+            </returns>
+        </member>
+        <member name="M:Spring.Context.Support.ContextHandler.CreateChildContexts(Spring.Context.IApplicationContext,System.Object,System.Xml.XmlNode[])">
+            <summary>
+            Create all child-contexts in the given <see cref="T:System.Xml.XmlNodeList"/> for the given context.
+            </summary>
+            <param name="parentContext">The parent context to use</param>
+            <param name="configContext">The current configContext <see cref="M:System.Configuration.IConfigurationSectionHandler.Create(System.Object,System.Object,System.Xml.XmlNode)"/></param>
+            <param name="childContexts">The list of child context elements</param>
+        </member>
+        <member name="M:Spring.Context.Support.ContextHandler.InstantiateContext(Spring.Context.IApplicationContext,System.Object,System.String,System.Type,System.Boolean,System.String[])">
+            <summary>
+            Instantiates a new context.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.ContextHandler.GetContextName(System.Object,System.Xml.XmlElement)">
+            <summary>
+            Gets the context's name specified in the name attribute of the context element.
+            </summary>
+            <param name="configContext">The current configContext <see cref="M:System.Configuration.IConfigurationSectionHandler.Create(System.Object,System.Object,System.Xml.XmlNode)"/></param>
+            <param name="contextElement">The context element</param>
+        </member>
+        <member name="M:Spring.Context.Support.ContextHandler.GetContextType(System.Xml.XmlElement,Spring.Context.IApplicationContext)">
+            <summary>
+            Extracts the context-type from the context element. 
+            If none is specified, returns the parent's type.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.ContextHandler.GetCaseSensitivity(System.Xml.XmlElement)">
+            <summary>
+            Extracts the case-sensitivity attribute from the context element
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.ContextHandler.GetConfiguredContextType(System.Xml.XmlElement,System.Type)">
+            <summary>
+            Gets the context <see cref="T:System.Type"/> specified in the type
+            attribute of the context element.
+            </summary>
+            <remarks>
+            <p>
+            If this attribute is not defined it defaults to the
+            <see cref="T:Spring.Context.Support.XmlApplicationContext"/> type.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Core.TypeMismatchException">
+            If the context type does not implement the
+            <see cref="T:Spring.Context.IApplicationContext"/> interface.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.ContextHandler.GetResources(System.Xml.XmlElement)">
+            <summary>
+            Returns the array of resources containing object definitions for
+            this context.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.ContextHandler.GetChildContexts(System.Xml.XmlElement)">
+            <summary>
+            Returns the array of child contexts for this context.
+            </summary>
+        </member>
+        <member name="P:Spring.Context.Support.ContextHandler.DefaultApplicationContextType">
+            <summary>
+            The <see cref="T:System.Type"/> of <see cref="T:Spring.Context.IApplicationContext"/>
+            created if no <c>type</c> attribute is specified on a <c>context</c> element.
+            </summary>
+            <seealso cref="M:Spring.Context.Support.ContextHandler.GetContextType(System.Xml.XmlElement,Spring.Context.IApplicationContext)"/>
+        </member>
+        <member name="P:Spring.Context.Support.ContextHandler.DefaultCaseSensitivity">
+            <summary>
+            Get the context's case-sensitivity to use if none is specified
+            </summary>
+            <remarks>
+            <p>
+            Derived handlers may override this property to change their default case-sensitivity.
+            </p>
+            <p>
+            Defaults to 'true'.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Context.Support.ContextHandler.IsLazy">
+            <summary>
+            Returns <see langword="true"/> if the context should be lazily
+            initialized.
+            </summary>
+        </member>
+        <member name="T:Spring.Context.Support.ContextHandler.ContextSchema">
+            <summary>
+            Constants defining the structure and values associated with the
+            schema for laying out Spring.NET contexts in XML.
+            </summary>
+        </member>
+        <member name="F:Spring.Context.Support.ContextHandler.ContextSchema.ContextElement">
+            <summary>
+            Defines a single
+            <see cref="T:Spring.Context.IApplicationContext"/>.
+            </summary>
+        </member>
+        <member name="F:Spring.Context.Support.ContextHandler.ContextSchema.NameAttribute">
+            <summary>
+            Specifies a context name.
+            </summary>
+        </member>
+        <member name="F:Spring.Context.Support.ContextHandler.ContextSchema.CaseSensitiveAttribute">
+            <summary>
+            Specifies if context should be case sensitive or not. Default is <c>true</c>.
+            </summary>
+        </member>
+        <member name="F:Spring.Context.Support.ContextHandler.ContextSchema.TypeAttribute">
+            <summary>
+            Specifies a <see cref="T:System.Type"/>.
+            </summary>
+            <remarks>
+            <p>
+            Does not have to be fully assembly qualified, but its generally regarded
+            as better form if the <see cref="T:System.Type"/> names of one's objects
+            are specified explicitly.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Context.Support.ContextHandler.ContextSchema.LazyAttribute">
+            <summary>
+            Specifies whether context should be lazy initialized.
+            </summary>
+        </member>
+        <member name="F:Spring.Context.Support.ContextHandler.ContextSchema.ResourceElement">
+            <summary>
+            Defines an <see cref="T:Spring.Core.IO.IResource"/>
+            </summary>
+        </member>
+        <member name="F:Spring.Context.Support.ContextHandler.ContextSchema.URIAttribute">
+            <summary>
+            Specifies the URI for an
+            <see cref="T:Spring.Core.IO.IResource"/>.
+            </summary>
+        </member>
+        <member name="T:Spring.Context.IApplicationContextAware">
+            <summary>
+            To be implemented by any object that wishes to be notified
+            of the <see cref="T:Spring.Context.IApplicationContext"/> that it runs in.
+            </summary>
+            <remarks>
+            <p>
+            Implementing this interface makes sense when an object requires access
+            to a set of collaborating objects. Note that configuration via object
+            references is preferable to implementing this interface just for object
+            lookup purposes.
+            </p>
+            <p>
+            This interface can also be implemented if an object needs access to
+            file resources, i.e. wants to call
+            <see cref="M:Spring.Core.IO.IResourceLoader.GetResource(System.String)"/>, or access to
+            the <see cref="T:Spring.Context.IMessageSource"/>. However, it is
+            preferable to implement the more specific
+            <see cref="T:Spring.Context.IResourceLoaderAware"/>
+            interface to receive a reference to the
+            <see cref="T:Spring.Context.IMessageSource"/> object in that scenario.
+            </p>
+            <p>
+            Note that <see cref="T:Spring.Core.IO.IResource"/> dependencies can also
+            be exposed as object properties of the
+            <see cref="T:Spring.Core.IO.IResource"/> type, populated via strings with
+            automatic type conversion performed by an object factory. This obviates
+            the need for implementing any callback interface just for the purpose
+            of accessing a specific file resource.
+            </p>
+            <p>
+            <see cref="T:Spring.Context.Support.ApplicationObjectSupport"/>
+            is a convenience implementation of this interface for your
+            application objects.
+            </p>
+            <p>
+            For a list of all object lifecycle methods, see the overview for the 
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> interface.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IApplicationContextAware.cs,v 1.8 2007/08/08 17:46:37 bbaia Exp $</version>
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/>
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            <version>$Id: IApplicationContextAware.cs,v 1.8 2007/08/08 17:46:37 bbaia Exp $</version>
+        </member>
+        <member name="P:Spring.Context.IApplicationContextAware.ApplicationContext">
+            <summary>
+            Set the <see cref="T:Spring.Context.IApplicationContext"/> that this
+            object runs in.
+            </summary>
+            <remarks>
+            <p>
+            Normally this call will be used to initialize the object.
+            </p>
+            <p>
+            Invoked after population of normal object properties but before an
+            init callback such as
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            or a custom init-method. Invoked after the setting of any
+            <see cref="T:Spring.Context.IResourceLoaderAware"/>'s
+            <see cref="P:Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+            property.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Context.ApplicationContextException">
+            In the case of application context initialization errors.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If thrown by any application context methods.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectInitializationException"/>
+        </member>
+        <member name="T:Spring.Validation.Validators.EmailValidator">
+            <summary>
+            Perform email validations.
+            </summary>
+            <remarks>
+            <p/>
+            This implementation is not guaranteed to catch all possible errors in an 
+            email address. For example, an address like nobody@noplace.nowhere will 
+            pass validator, even though there is no TLD "nowhere".
+            </remarks>
+            <author>Goran Milosavljevic</author>    
+        </member>
+        <member name="M:Spring.Validation.Validators.EmailValidator.#ctor">
+            <summary>
+            Creates a new instance of the <b>EmailValidator</b> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.Validators.EmailValidator.#ctor(System.String,System.String)">
+            <summary>
+            Creates a new instance of the <b>EmailValidator</b> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.Validators.EmailValidator.#ctor(Spring.Expressions.IExpression,Spring.Expressions.IExpression)">
+            <summary>
+            Creates a new instance of the <b>EmailValidator</b> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.Validators.EmailValidator.Validate(System.Object)">
+            <summary>
+            Validates the supplied <paramref name="objectToValidate"/>.
+            </summary>
+            <remarks>
+            In the case of the <see cref="T:Spring.Validation.Validators.EmailValidator"/> class,
+            the test should be a string variable that will be evaluated and the object
+            obtained as a result of this evaluation will be checked if it is
+            a valid e-mail address.
+            </remarks>
+            <param name="objectToValidate">The object to validate.</param>
+            <returns>
+            <see lang="true"/> if the supplied <paramref name="objectToValidate"/> is valid 
+            e-mail address.
+            </returns>
+        </member>
+        <member name="F:Spring.Validation.Validators.EmailValidator.emailCheck">
+            <summary>
+            Regular expression used for validation of object passed to this <see cref="T:Spring.Validation.Validators.EmailValidator"/>.
+            </summary>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.UniqueKeyConverter">
+            <summary>
+            Converts between instances of <see cref="T:Spring.Util.UniqueKey"/> and their string representations.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: UniqueKeyConverter.cs,v 1.1 2007/08/22 20:17:35 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.UniqueKeyConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Can we convert from the sourcetype to a <see cref="T:Spring.Util.UniqueKey"/>?
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from a <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/> that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns><see langword="true"/> if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.UniqueKeyConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+             <summary>
+             Convert from a <see cref="T:System.String"/> value to an <see cref="T:Spring.Util.UniqueKey"/> instance.
+             </summary>
+             <param name="context">
+             A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+             that provides a format context.
+             </param>
+             <param name="culture">
+             The <see cref="T:System.Globalization.CultureInfo"/> to use
+             as the current culture.
+             </param>
+             <param name="value">
+             The value that is to be converted.
+             </param>
+             <returns>
+             A <see cref="T:Spring.Util.UniqueKey"/> if successful, <see langword="null"/> otherwise.
+             </returns>        
+            <exception cref="T:System.NotSupportedException">The conversion cannot be performed. </exception>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.UniqueKeyConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Returns whether this converter can convert the object to the specified type, using the specified context.
+            </summary>
+            <param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext"></see> that provides a format context. </param>
+            <param name="destinationType">A <see cref="T:System.Type"></see> that represents the type you want to convert to. </param>
+            <returns>
+            true if this converter can perform the conversion; otherwise, false.
+            </returns>
+             <remarks>
+             At the moment only conversion to string is supported.
+             </remarks>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.UniqueKeyConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)">
+            <summary>
+            Converts the given value object to the specified type, using the specified context and culture information.
+            </summary>
+            
+            <returns>
+            An <see cref="T:System.Object"></see> that represents the converted value.
+            </returns>
+            
+            <param name="culture">A <see cref="T:System.Globalization.CultureInfo"></see>. If null is passed, the current culture is assumed. </param>
+            <param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext"></see> that provides a format context. </param>
+            <param name="destinationType">The <see cref="T:System.Type"></see> to convert the value parameter to. </param>
+            <param name="value">The <see cref="T:System.Object"></see> to convert. </param>
+            <exception cref="T:System.NotSupportedException">The conversion cannot be performed. </exception>
+            <exception cref="T:System.ArgumentNullException">The destinationType parameter is null. </exception>
+        </member>
+        <member name="T:Spring.Pool.IObjectPool">
+            <summary>
+            A simple pooling interface for managing and monitoring a pool
+            of objects.  
+            </summary>
+            <remarks>
+            <p>
+            Based on the Jakarta Commons Pool API.
+            </p>
+            </remarks>
+            <author>Federico Spinazzi</author>
+            <version>$Id: IObjectPool.cs,v 1.5 2005/08/13 18:04:54 springboy Exp $</version>
+            <seealso cref="T:Spring.Pool.IPoolableObjectFactory"/>
+        </member>
+        <member name="M:Spring.Pool.IObjectPool.BorrowObject">
+            <summary>
+            Obtain an instance from the pool.
+            </summary>
+            <remarks>
+            <p>
+            By contract, clients <b>must</b> return the borrowed 
+            instance using <see cref="M:Spring.Pool.IObjectPool.ReturnObject(System.Object)"/>
+            or a related method as defined in an implementation or
+            sub-interface.
+            </p>
+            </remarks>
+            <returns>An instance from the pool.</returns>
+            <exception cref="T:Spring.Pool.PoolException">
+            In case the pool is unusable.
+            </exception>
+            <seealso cref="M:Spring.Pool.IPoolableObjectFactory.ActivateObject(System.Object)"/>
+        </member>
+        <member name="M:Spring.Pool.IObjectPool.ReturnObject(System.Object)">
+            <summary>
+            Return an instance to the pool.
+            </summary>
+            <remarks>
+            <p>
+            By contract, the object <b>must</b> have been obtained using 
+            <see cref="M:Spring.Pool.IObjectPool.BorrowObject"/>
+            or a related method as defined in an implementation or sub-interface.
+            </p>
+            </remarks>
+            <param name="target">The instance to be returned to the pool.</param>
+            <seealso cref="M:Spring.Pool.IPoolableObjectFactory.PassivateObject(System.Object)"/>
+        </member>
+        <member name="M:Spring.Pool.IObjectPool.AddObject">
+            <summary>
+            Create an object using the factory set by
+            the <see cref="P:Spring.Pool.IObjectPool.PoolableObjectFactory"/> property
+            or other implementation dependent mechanism
+            and place it into the pool. 
+            </summary>
+            <remarks>
+            <p>
+            This is an optional operation. AddObject is useful for "pre-loading" a 
+            pool with idle objects.
+            </p>
+            </remarks>
+            <exception cref="T:System.NotSupportedException">
+            If the implementation does not support the operation.
+            </exception>
+        </member>
+        <member name="M:Spring.Pool.IObjectPool.Close">
+            <summary>
+            Close the pool and free any resources associated with it.
+            </summary>
+        </member>
+        <member name="M:Spring.Pool.IObjectPool.Clear">
+            <summary>
+            Clear objects sitting idle in the pool, releasing any
+            associated resources.
+            </summary>
+            <remarks>
+            <p>
+            This is an optional operation.
+            </p>
+            </remarks>
+            <exception cref="T:System.NotSupportedException">
+            If the implementation does not support the operation.
+            </exception>
+        </member>
+        <member name="P:Spring.Pool.IObjectPool.NumActive">
+            <summary>
+            Gets the number of instances currently borrowed from the pool. 
+            </summary>
+            <remarks>
+            <p>
+            This is an optional operation.
+            </p>
+            </remarks>
+            <exception cref="T:System.NotSupportedException">
+            If the implementation does not support the operation.
+            </exception>       
+        </member>
+        <member name="P:Spring.Pool.IObjectPool.NumIdle">
+            <summary>
+            Gets the number of instances currently idle in the pool.
+            </summary>
+            <remarks>
+            <p>
+            This is an optional operation.
+            </p>
+            <p>
+            This may be considered an <i>approximation</i> of the number of objects
+            that can be borrowed without creating any new instances.
+            </p>
+            </remarks>
+            <exception cref="T:System.NotSupportedException">
+            If the implementation does not support the operation.
+            </exception>
+        </member>
+        <member name="P:Spring.Pool.IObjectPool.PoolableObjectFactory">
+            <summary>
+            Set the factory used to create new instances.
+            </summary>
+            <remarks>
+            <p>
+            This is an optional operation.
+            </p>
+            </remarks>
+            <exception cref="T:System.NotSupportedException">
+            If the implementation does not support the operation.
+            </exception>
+        </member>
+        <member name="T:Spring.Objects.IPropertyValues">
+            <summary>
+            A collection style container for <see cref="T:Spring.Objects.PropertyValue"/>
+            instances.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET) </author>
+            <version>$Id: IPropertyValues.cs,v 1.7 2006/04/09 07:18:49 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.IPropertyValues.GetPropertyValue(System.String)">
+            <summary>
+            Return the <see cref="T:Spring.Objects.PropertyValue"/> instance with the
+            given name.
+            </summary>
+            <param name="propertyName">The name to search for.</param>
+            <returns>the <see cref="T:Spring.Objects.PropertyValue"/>, or null if a 
+            the <see cref="T:Spring.Objects.PropertyValue"/> with the supplied
+            <paramref name="propertyName"/> did not exist in this collection.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.IPropertyValues.Contains(System.String)">
+            <summary>
+            Is there a <see cref="T:Spring.Objects.PropertyValue"/> instance for this
+            property name?
+            </summary>
+            <param name="propertyName">The name to search for.</param>
+            <returns>
+            True if there is a <see cref="T:Spring.Objects.PropertyValue"/> instance for
+            the supplied <paramref name="propertyName"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.IPropertyValues.ChangesSince(Spring.Objects.IPropertyValues)">
+            <summary>
+            Return the difference (changes, additions, but not removals) of
+            property values between the supplied argument and the values
+            contained in the collection.
+            </summary>
+            <remarks>
+            <p>
+            Subclasses should also override <c>Equals</c>.
+            </p>
+            </remarks>
+            <param name="old">The old property values.</param>
+            <returns>
+            An <see cref="T:Spring.Objects.IPropertyValues"/> containing any changes, or
+            an empty <see cref="T:Spring.Objects.IPropertyValues"/> instance if there were
+            no changes.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.IPropertyValues.PropertyValues">
+            <summary>
+            Return an array of the <see cref="T:Spring.Objects.PropertyValue"/> objects
+            held in this object.</summary>
+            <returns>
+            An array of the <see cref="T:Spring.Objects.PropertyValue"/> objects held
+            in this object.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader">
+            <summary>
+            Object definition reader for Spring's default XML object definition format.
+            </summary>
+            <remarks>
+            <p>
+            Typically applied to a
+            <see cref="T:Spring.Objects.Factory.Support.DefaultListableObjectFactory"/> instance.
+            </p>
+            <p>
+            This class registers each object definition with the given object factory superclass,
+            and relies on the latter's implementation of the
+            <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/> interface.
+            </p>
+            <p>
+            It supports singletons, prototypes, and references to either of these kinds of object.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: XmlObjectDefinitionReader.cs,v 1.33 2008/02/04 22:44:03 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader.#ctor(Spring.Objects.Factory.Support.IObjectDefinitionRegistry)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/> class.
+            </summary>
+            <param name="registry">
+            The <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+            instance that this reader works on.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader.#ctor(Spring.Objects.Factory.Support.IObjectDefinitionRegistry,System.Xml.XmlResolver)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/> class.
+            </summary>
+            <param name="registry">
+            The <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+            instance that this reader works on.
+            </param>
+            <param name="resolver">
+            The <see cref="T:System.Xml.XmlResolver"/>to be used for parsing.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader.LoadObjectDefinitions(Spring.Core.IO.IResource)">
+            <summary>
+            Load object definitions from the supplied XML <paramref name="resource"/>.
+            </summary>
+            <param name="resource">
+            The XML resource for the object definitions that are to be loaded.
+            </param>
+            <returns>
+            The number of object definitions that were loaded.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of loading or parsing errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader.DoLoadObjectDefinitions(System.IO.Stream,Spring.Core.IO.IResource)">
+            <summary>
+            Actually load object definitions from the specified XML file.
+            </summary>
+            <param name="stream">The input stream to read from.</param>
+            <param name="resource">The resource for the XML data.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader.HandleValidation(System.Object,System.Xml.Schema.ValidationEventArgs)">
+            <summary>
+            Validation callback for a validating XML reader.
+            </summary>
+            <param name="sender">The source of the event.</param>
+            <param name="args">Any data pertinent to the event.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader.RegisterObjectDefinitions(System.Xml.XmlDocument,Spring.Core.IO.IResource)">
+            <summary>
+            Register the object definitions contained in the given DOM document.
+            </summary>
+            <param name="doc">The DOM document.</param>
+            <param name="resource">
+            The original resource from where the <see cref="T:System.Xml.XmlDocument"/>
+            was read.
+            </param>
+            <returns>
+            The number of object definitions that were registered.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of parsing errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader.CreateObjectDefinitionDocumentReader">
+            <summary>
+            Creates the <see cref="T:Spring.Objects.Factory.Xml.IObjectDefinitionDocumentReader"/> to use for actually
+            reading object definitions from an XML document.
+            </summary>
+            <remarks>Default implementation instantiates the specified 'documentReaderType'.</remarks>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader.CreateReaderContext(Spring.Core.IO.IResource)">
+            <summary>
+            Creates the <see cref="T:Spring.Objects.Factory.Xml.XmlReaderContext"/> to be passed along 
+            during the object definition reading process.
+            </summary>
+            <param name="resource">The underlying <see cref="T:Spring.Core.IO.IResource"/> that is currently processed.</param>
+            <returns>A new <see cref="T:Spring.Objects.Factory.Xml.XmlReaderContext"/></returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader.Resolver">
+            <summary>
+            The <see cref="T:System.Xml.XmlResolver"/>to be used for parsing.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader.DocumentReaderType">
+            <summary>
+            Sets the IObjectDefinitionDocumentReader implementation to use, responsible for
+            the actual reading of the XML object definition document.stype of the document reader.
+            </summary>
+            <value>The type of the document reader.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.UnsatisfiedDependencyException">
+            <summary>
+            Exception thrown when an object depends on other objects or simple properties
+            that were not specified in the object factory definition, although dependency
+            checking was enabled.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: UnsatisfiedDependencyException.cs,v 1.8 2006/04/09 07:18:49 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.ObjectCreationException">
+            <summary>
+            Thrown when an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            encounters an error when attempting to create an object from an object
+            definition.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: ObjectCreationException.cs,v 1.15 2007/12/05 00:28:04 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.FatalObjectException">
+            <summary>
+            Thrown on an unrecoverable problem encountered in the
+            objects namespace or sub-namespaces, e.g. bad class or field.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: FatalObjectException.cs,v 1.7 2006/04/09 07:18:49 markpollack Exp $
+            </version>
+        </member>
+        <member name="T:Spring.Objects.ObjectsException">
+            <summary>
+            Superclass for all exceptions thrown in the Objects namespace and sub-namespaces.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ObjectsException.cs,v 1.8 2006/04/09 07:18:49 markpollack Exp $
+            </version>
+        </member>
+        <member name="M:Spring.Objects.ObjectsException.#ctor">
+            <summary>Creates a new instance of the ObjectsException class.</summary>
+        </member>
+        <member name="M:Spring.Objects.ObjectsException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the ObjectsException class. with the specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.ObjectsException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the ObjectsException class with the specified message
+            and root cause.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.ObjectsException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the ObjectsException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.FatalObjectException.#ctor">
+            <summary>
+            Creates a new instance of the FatalObjectException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.FatalObjectException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the FatalObjectException class with the
+            specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.FatalObjectException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the FatalObjectException class with the
+            specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.FatalObjectException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the FatalObjectException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCreationException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.ObjectCreationException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCreationException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCreationException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCreationException.#ctor(System.String,System.String)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCreationException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="objectName">
+            The name of the object that triggered the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCreationException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCreationException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCreationException.#ctor(System.String,System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCreationException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="objectName">
+            The name of the object that triggered the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCreationException.#ctor(System.String,System.String,System.String)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCreationException"/> class.
+            </summary>
+            <param name="resourceDescription">
+            The description of the resource associated with the object.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="objectName">
+            The name of the object that triggered the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCreationException.#ctor(System.String,System.String,System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCreationException"/> class.
+            </summary>
+            <param name="resourceDescription">
+            The description of the resource associated with the object.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="objectName">
+            The name of the object that triggered the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCreationException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCreationException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCreationException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="P:Spring.Objects.Factory.ObjectCreationException.ObjectName">
+            <summary>
+            The name of the object that triggered the exception (if any).
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.ObjectCreationException.ResourceDescription">
+            <summary>
+            The description of the resource associated with the object (if any).
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.ObjectCreationException.Message">
+            <summary>
+            Describes the creation failure trace of this exception.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.UnsatisfiedDependencyException.#ctor">
+            <summary>
+            Creates a new instance of the UnsatisfiedDependencyException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.UnsatisfiedDependencyException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the UnsatisfiedDependencyException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.UnsatisfiedDependencyException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the UnsatisfiedDependencyException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.UnsatisfiedDependencyException.#ctor(System.String,System.String,System.Int32,System.Type,System.String)">
+            <summary>
+            Creates a new instance of the UnsatisfiedDependencyException class.
+            </summary>
+            <param name="resourceDescription">
+            The description of the resource associated with the object.
+            </param>
+            <param name="name">
+            The name of the object that has the unsatisfied dependency.
+            </param>
+            <param name="argumentIndex">
+            The constructor argument index at which the dependency is
+            unsatisfied.
+            </param>
+            <param name="argumentType">
+            The <see cref="T:System.Type"/> of the constructor argument at
+            which the dependency is unsatisfied.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.UnsatisfiedDependencyException.#ctor(System.String,System.String,System.String,System.String)">
+            <summary>
+            Creates a new instance of the UnsatisfiedDependencyException class.
+            </summary>
+            <param name="resourceDescription">
+            The description of the resource associated with the object.
+            </param>
+            <param name="name">
+            The name of the object that has the unsatisfied dependency.
+            </param>
+            <param name="propertyName">
+            The name identifying the property on which the dependency is
+            unsatisfied.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.UnsatisfiedDependencyException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the UnsatisfiedDependencyException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.TypedStringValue">
+            <summary>
+            Holder for a typed <see cref="T:System.String"/> value.
+            </summary>
+            <remarks>
+            <p>
+            Can be added to object definitions to explicitly specify
+            a target type for a <see cref="T:System.String"/> value,
+            for example for collection
+            elements.
+            </p>
+            <p>
+            This holder just stores the <see cref="T:System.String"/> value and the target
+            <see cref="T:System.Type"/>. The actual conversion will be performed by
+            the surrounding object factory.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: TypedStringValue.cs,v 1.5 2007/05/29 20:00:20 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.TypedStringValue.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.TypedStringValue"/>
+            class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.TypedStringValue.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Objects.Factory.Config.TypedStringValue"/> class.
+            </summary>
+            <param name="value">The value.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.TypedStringValue.#ctor(System.String,System.Type)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.TypedStringValue"/>
+            class.
+            </summary>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> to convert to.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="targetType"/> is
+            <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.TypedStringValue.Value">
+            <summary>
+            The value that is to be converted. 
+            </summary>
+            <remarks>
+            <p>
+            Obviously if the
+            <see cref="P:Spring.Objects.Factory.Config.TypedStringValue.TargetType"/>
+            is the <see cref="T:System.String"/> <see cref="T:System.Type"/>, no conversion
+            will actually be performed.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.TypedStringValue.TargetType">
+            <summary>
+            The <see cref="T:System.Type"/> to convert to.
+            </summary>
+            <exception cref="T:System.ArgumentNullException">
+            If the setter is supplied with a <see langword="null"/> value.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.TypedStringValue.HasTargetType">
+            <summary>
+            Gets a value indicating whether this instance has target type.
+            </summary>
+            <value>
+            	<c>true</c> if this instance has target type; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.DocumentDefaultsDefinition">
+            <summary>
+            Simple class that holds the defaults specified at the <code>&lt;objects&gt;</code> 
+            level in a standard Spring XML object definition document:
+            <code>default-lazy-init</code>, <code>default-autowire</code>, etc.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.DocumentDefaultsDefinition.Autowire">
+            <summary>
+            Gets or sets the autowire setting for the document that's currently parsed.
+            </summary>
+            <value>The autowire.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.DocumentDefaultsDefinition.DependencyCheck">
+            <summary>
+            Gets or sets the dependency-check setting for the document that's currently parsed
+            </summary>
+            <value>The dependency check.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.DocumentDefaultsDefinition.LazyInit">
+            <summary>
+            Gets or sets the lazy-init flag for the document that's currently parsed.
+            </summary>
+            <value>The lazy init.</value>
+        </member>
+        <member name="T:Spring.Globalization.ICultureResolver">
+            <summary>
+            Strategy interface for <see cref="T:System.Globalization.CultureInfo"/>
+            resolution.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ICultureResolver.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.ICultureResolver.ResolveCulture">
+            <summary>
+            Resolves the <see cref="T:System.Globalization.CultureInfo"/>
+            from some context.
+            </summary>
+            <remarks>
+            <p>
+            The 'context' is determined by the appropriate implementation class.
+            An example of such a context might be a thread local bound
+            <see cref="T:System.Globalization.CultureInfo"/>, or a
+            <see cref="T:System.Globalization.CultureInfo"/> sourced from an HTTP
+            session.
+            </p>
+            </remarks>
+            <returns>
+            The <see cref="T:System.Globalization.CultureInfo"/> that should be used
+            by the caller.
+             </returns>
+        </member>
+        <member name="M:Spring.Globalization.ICultureResolver.SetCulture(System.Globalization.CultureInfo)">
+            <summary>
+            Sets the <see cref="T:System.Globalization.CultureInfo"/>.
+            </summary>
+            <remarks>
+            <p>
+            This is an optional operation and does not need to be implemented
+            such that it actually does anything useful (i.e. it can be a no-op).
+            </p>
+            </remarks>
+            <param name="culture">
+            The new <see cref="T:System.Globalization.CultureInfo"/> or
+            <cref lang="null"/> to clear the current <see cref="T:System.Globalization.CultureInfo"/>.
+            </param>
+        </member>
+        <member name="T:Spring.Expressions.RealLiteralNode">
+            <summary>
+            Represents parsed real literal node.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: RealLiteralNode.cs,v 1.11 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.RealLiteralNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.RealLiteralNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.RealLiteralNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the real literal node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpNOT">
+            <summary>
+            Represents logical NOT operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpNOT.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Expressions.UnaryOperator">
+            <summary>
+            Base class for unary operators.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: UnaryOperator.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.UnaryOperator.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.UnaryOperator.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="P:Spring.Expressions.UnaryOperator.Operand">
+            <summary>
+            Gets the operand.
+            </summary>
+            <value>The operand.</value>
+        </member>
+        <member name="M:Spring.Expressions.OpNOT.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpNOT.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpNOT.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical NOT operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.HexLiteralNode">
+            <summary>
+            Represents parsed hexadecimal integer literal node.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: HexLiteralNode.cs,v 1.9 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.HexLiteralNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.HexLiteralNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.HexLiteralNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the hexadecimal integer literal node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.LambdaExpressionNode">
+            <summary>
+            Represents lambda expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: LambdaExpressionNode.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Expressions.LambdaExpressionNode.argumentNames">
+            <summary>
+            caches argumentNames of this instance
+            </summary>
+        </member>
+        <member name="F:Spring.Expressions.LambdaExpressionNode.bodyExpression">
+            <summary>
+            caches body expression of this lambda function
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.LambdaExpressionNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.LambdaExpressionNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.LambdaExpressionNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Assigns value of the right operand to the left one.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.LambdaExpressionNode.GetValueInternal(System.Object,Spring.Expressions.BaseNode.EvaluationContext,System.Collections.IDictionary)">
+            <summary>
+            Returns Lambda Expression's value for the given context.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <param name="arguments">A dictionary containing argument map for this lambda expression.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="P:Spring.Expressions.LambdaExpressionNode.ArgumentNames">
+            <summary>
+            Gets argument names for this lambda expression.
+            </summary>
+        </member>
+        <member name="T:Spring.Expressions.AssignNode">
+            <summary>
+            Represents parsed assignment node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AssignNode.cs,v 1.9 2007/09/07 03:01:21 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.AssignNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.AssignNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.AssignNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Assigns value of the right operand to the left one.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.DataBinding.AbstractSimpleBinding">
+            <summary>
+            Abstract base class for simple, one-to-one <see cref="T:Spring.DataBinding.IBinding"/> implementations.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AbstractSimpleBinding.cs,v 1.4 2008/02/05 20:40:25 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.DataBinding.AbstractBinding">
+            <summary>
+            Abstract base class for <see cref="T:Spring.DataBinding.IBinding"/> implementations.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AbstractBinding.cs,v 1.2 2008/02/05 20:40:25 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractBinding.BindSourceToTarget(System.Object,System.Object,Spring.Validation.IValidationErrors)">
+            <summary>
+            Binds source object to target object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractBinding.BindTargetToSource(System.Object,System.Object,Spring.Validation.IValidationErrors)">
+            <summary>
+            Binds target object to source object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractBinding.BindSourceToTarget(System.Object,System.Object,Spring.Validation.IValidationErrors,System.Collections.IDictionary)">
+            <summary>
+            Binds source object to target object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractBinding.BindTargetToSource(System.Object,System.Object,Spring.Validation.IValidationErrors,System.Collections.IDictionary)">
+            <summary>
+            Binds target object to source object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractBinding.SetErrorMessage(System.String,System.String[])">
+            <summary>
+            Sets error message that should be displayed in the case 
+            of a non-fatal binding error.
+            </summary>
+            <param name="messageId">
+            Resource ID of the error message.
+            </param>
+            <param name="errorProviders">
+            List of error providers message should be added to.
+            </param>
+        </member>
+        <member name="P:Spring.DataBinding.AbstractBinding.IsValid">
+            <summary>
+            Gets or sets a flag specifying whether this binding is valid.
+            </summary>
+            <value>
+                <c>true</c> if this binding evaluated without errors;
+                <c>false</c> otherwise.
+            </value>
+        </member>
+        <member name="P:Spring.DataBinding.AbstractBinding.Direction">
+            <summary>
+            Gets or sets the <see cref="T:Spring.DataBinding.BindingDirection"/>.
+            </summary>
+            <value>The binding direction.</value>
+        </member>
+        <member name="P:Spring.DataBinding.AbstractBinding.ErrorMessage">
+            <summary>
+            Gets the error message.
+            </summary>
+            <value>The error message.</value>
+        </member>
+        <member name="P:Spring.DataBinding.AbstractBinding.ErrorProviders">
+            <summary>
+            Gets the error providers.
+            </summary>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractSimpleBinding.#ctor">
+            <summary>
+            Initialize a new instance of <see cref="T:Spring.DataBinding.AbstractSimpleBinding"/> without any <see cref="T:Spring.Globalization.IFormatter"/>
+            </summary>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractSimpleBinding.#ctor(Spring.Globalization.IFormatter)">
+            <summary>
+            Initialize a new instance of <see cref="T:Spring.DataBinding.AbstractSimpleBinding"/> with the 
+            specified <see cref="T:Spring.Globalization.IFormatter"/>.
+            </summary>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractSimpleBinding.BindSourceToTarget(System.Object,System.Object,Spring.Validation.IValidationErrors,System.Collections.IDictionary)">
+            <summary>
+            Binds source object to target object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractSimpleBinding.DoBindSourceToTarget(System.Object,System.Object,System.Collections.IDictionary)">
+            <summary>
+            Concrete implementation if source to target binding.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractSimpleBinding.BindTargetToSource(System.Object,System.Object,Spring.Validation.IValidationErrors,System.Collections.IDictionary)">
+            <summary>
+            Binds target object to source object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractSimpleBinding.DoBindTargetToSource(System.Object,System.Object,System.Collections.IDictionary)">
+            <summary>
+            Concrete implementation of target to source binding.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractSimpleBinding.GetSourceValue(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Gets the source value for the binding.
+            </summary>
+            <param name="source">
+            Source object to extract value from.
+            </param>
+            <param name="variables">
+            Variables for expression evaluation.
+            </param>
+            <returns>
+            The source value for the binding.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractSimpleBinding.SetSourceValue(System.Object,System.Object,System.Collections.IDictionary)">
+            <summary>
+            Sets the source value for the binding.
+            </summary>
+            <param name="source">
+            The source object to set the value on.
+            </param>
+            <param name="value">
+            The value to set.
+            </param>
+            <param name="variables">
+            Variables for expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractSimpleBinding.GetTargetValue(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Gets the target value for the binding.
+            </summary>
+            <param name="target">
+            Source object to extract value from.
+            </param>
+            <param name="variables">
+            Variables for expression evaluation.
+            </param>
+            <returns>
+            The target value for the binding.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.AbstractSimpleBinding.SetTargetValue(System.Object,System.Object,System.Collections.IDictionary)">
+            <summary>
+            Sets the target value for the binding.
+            </summary>
+            <param name="target">
+            The target object to set the value on.
+            </param>
+            <param name="value">
+            The value to set.
+            </param>
+            <param name="variables">
+            Variables for expression evaluation.
+            </param>
+        </member>
+        <member name="P:Spring.DataBinding.AbstractSimpleBinding.Formatter">
+            <summary>
+            Gets or sets the <see cref="T:Spring.Globalization.IFormatter"/> to use.
+            </summary>
+            <value>The formatter to use.</value>
+        </member>
+        <member name="T:Spring.Core.TypeResolution.TypeResolutionUtils">
+            <summary>
+            Helper methods with regard to type resolution.
+            </summary>
+            <remarks>
+            <p>
+            Not intended to be used directly by applications.
+            </p>
+            </remarks>
+            <author>Bruno Baia</author>
+            <version>$Id: TypeResolutionUtils.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeResolutionUtils.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Core.TypeResolution.TypeResolutionUtils"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeResolutionUtils.ResolveType(System.String)">
+            <summary>
+            Resolves the supplied type name into a <see cref="T:System.Type"/>
+            instance.
+            </summary>
+            <remarks>
+            <p>
+            If you require special <see cref="T:System.Type"/> resolution, do
+            <b>not</b> use this method, but rather instantiate
+            your own <see cref="T:Spring.Core.TypeResolution.TypeResolver"/>.
+            </p>
+            </remarks>
+            <param name="typeName">
+            The (possibly partially assembly qualified) name of a
+            <see cref="T:System.Type"/>.
+            </param>
+            <returns>
+            A resolved <see cref="T:System.Type"/> instance.
+            </returns>
+            <exception cref="T:System.TypeLoadException">
+            If the type cannot be resolved.
+            </exception>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeResolutionUtils.ResolveInterfaceArray(System.String[])">
+            <summary>
+            Resolves a string array of interface names to
+            a <see cref="T:System.Type"/> array.
+            </summary>
+            <param name="interfaceNames">
+            An array of valid interface names. Each name must include the full
+            interface and assembly name.
+            </param>
+            <returns>An array of interface <see cref="T:System.Type"/>s.</returns>
+            <exception cref="T:System.TypeLoadException">
+            If any of the interfaces can't be loaded.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If any of the <see cref="T:System.Type"/>s specified is not an interface.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If <paramref name="interfaceNames"/> (or any of its elements ) is
+            <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeResolutionUtils.MethodMatch(System.String,System.Reflection.MethodInfo)">
+            <summary>
+            Match a method against the given pattern.
+            </summary>
+            <param name="pattern">the pattern to match against.</param>
+            <param name="method">the method to match.</param>
+            <returns>
+            <see lang="true"/> if the method matches the given pattern; otherwise <see lang="false"/>.
+            </returns>
+            <exception cref="T:System.ArgumentException">
+            If the supplied <paramref name="pattern"/> is invalid.
+            </exception>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.TypeConverterRegistry">
+            <summary>
+            Registry class that allows users to register and retrieve type converters.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: TypeConverterRegistry.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Core.TypeConversion.TypeConverterRegistry.TypeConvertersSectionName">
+            <summary>
+            Name of the .Net config section that contains Spring.Net type aliases.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.TypeConverterRegistry.#cctor">
+            <summary>
+            Registers standard and configured type converters.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.TypeConverterRegistry.GetConverter(System.Type)">
+            <summary>
+            Returns <see cref="T:System.ComponentModel.TypeConverter"/> for the specified type.
+            </summary>
+            <param name="type">Type to get the converter for.</param>
+            <returns>a type converter for the specified type.</returns>
+            <exception cref="T:System.ArgumentNullException">If <paramref name="type"/> is <c>null</c>.</exception>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.TypeConverterRegistry.RegisterConverter(System.Type,System.ComponentModel.TypeConverter)">
+            <summary>
+            Registers <see cref="T:System.ComponentModel.TypeConverter"/> for the specified type.
+            </summary>
+            <param name="type">Type to register the converter for.</param>
+            <param name="converter">Type converter to register.</param>
+            <exception cref="T:System.ArgumentNullException">If either of arguments is <c>null</c>.</exception>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.TypeConverterRegistry.RegisterConverter(System.String,System.String)">
+            <summary>
+            Registers <see cref="T:System.ComponentModel.TypeConverter"/> for the specified type.
+            </summary>
+            <remarks>
+            This is a convinience method that accepts the names of both
+            type to register converter for and the converter itself,
+            resolves them using <see cref="T:Spring.Core.TypeResolution.TypeRegistry"/>, creates an
+            instance of type converter and calls overloaded
+            <see cref="M:Spring.Core.TypeConversion.TypeConverterRegistry.RegisterConverter(System.Type,System.ComponentModel.TypeConverter)"/> method.
+            </remarks>
+            <param name="typeName">Type name of the type to register the converter for (can be a type alias).</param>
+            <param name="converterTypeName">Type name of the type converter to register (can be a type alias).</param>
+            <exception cref="T:System.ArgumentNullException">If either of arguments is <c>null</c> or empty string.</exception>
+            <exception cref="T:System.TypeLoadException">
+            If either of arguments fails to resolve to a valid <see cref="T:System.Type"/>.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If type converter does not derive from <see cref="T:System.ComponentModel.TypeConverter"/> or if it cannot be instantiated.
+            </exception>
+        </member>
+        <member name="T:Spring.Core.IControlFlow">
+            <summary> 
+            Interface to be implemented by objects that can return information about
+            the current call stack.
+            </summary>
+            <remarks>
+            <p>
+            Useful in AOP (as an expression of the AspectJ <c>cflow</c> concept) but not AOP-specific.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.Net)</author>
+            <version>$Id: IControlFlow.cs,v 1.4 2006/04/09 07:18:38 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Core.IControlFlow.Under(System.Type)">
+            <summary>
+            Detects whether the caller is under the supplied <see cref="T:System.Type"/>,
+            according to the current stacktrace.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> to look for.
+            </param>
+            <returns>
+            <see langword="true"/> if the caller is under the supplied <see cref="T:System.Type"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IControlFlow.Under(System.Type,System.String)">
+            <summary>
+            Detects whether the caller is under the supplied <see cref="T:System.Type"/>
+            and <paramref name="methodName"/>, according to the current stacktrace.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> to look for.
+            </param>
+            <param name="methodName">The name of the method to look for.</param>
+            <returns>
+            <see langword="true"/> if the caller is under the supplied <see cref="T:System.Type"/>
+            and <paramref name="methodName"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IControlFlow.UnderToken(System.String)">
+            <summary>
+            Does the current stack trace contain the supplied <paramref name="token"/>?
+            </summary>
+            <param name="token">The token to match against.</param>
+            <returns>
+            <see langword="true"/> if the current stack trace contains the supplied
+            <paramref name="token"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Context.Support.MessageSourceAccessor">
+            <summary>
+            Helper class for easy access to messages from an
+            <see cref="T:Spring.Context.IMessageSource"/>, providing various
+            overloaded <c>GetMessage</c> methods.
+            </summary>
+            <remarks>
+            <p>
+            Available from
+            <see cref="T:Spring.Context.Support.ApplicationObjectSupport"/>, but also
+            reusable as a standalone helper to delegate to in application objects.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: MessageSourceAccessor.cs,v 1.8 2007/08/23 14:30:50 oakinger Exp $</version>
+            <seealso cref="T:Spring.Context.IMessageSource"/>
+            <seealso cref="T:Spring.Context.Support.ApplicationObjectSupport"/>
+        </member>
+        <member name="M:Spring.Context.Support.MessageSourceAccessor.#ctor(Spring.Context.IMessageSource)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.MessageSourceAccessor"/> class
+            that uses the current <see cref="P:System.Globalization.CultureInfo.CurrentUICulture"/>
+            for all locale specific lookups.
+            </summary>
+            <param name="messageSource">
+            The <see cref="T:Spring.Context.IMessageSource"/> to use to locate messages.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.MessageSourceAccessor.#ctor(Spring.Context.IMessageSource,System.Globalization.CultureInfo)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.MessageSourceAccessor"/> class
+            </summary>
+            <param name="messageSource">
+            The <see cref="T:Spring.Context.IMessageSource"/> to use to locate
+            messages.
+            </param>
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use for
+            locale specific messages.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.MessageSourceAccessor.GetMessage(System.String)">
+            <summary>
+            Retrieve the message for the given code and the default
+            <see cref="T:System.Globalization.CultureInfo"/>.
+            </summary>
+            <param name="code">The code of the message.</param>
+            <returns>The message.</returns>
+        </member>
+        <member name="M:Spring.Context.Support.MessageSourceAccessor.GetMessage(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Retrieve the message for the given code and the given
+            <see cref="T:System.Globalization.CultureInfo"/>.
+            </summary>
+            <param name="code">The code of the message.</param>       
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use for
+            lookups.
+            </param>
+            <returns>The message.</returns>
+        </member>
+        <member name="M:Spring.Context.Support.MessageSourceAccessor.GetMessage(System.String,System.Object[])">
+            <summary>
+            Retrieve the message for the given code and the default
+            <see cref="T:System.Globalization.CultureInfo"/>.
+            </summary>
+            <param name="code">The code of the message.</param>
+            <param name="args">
+            The arguments for the message, or <see langword="null"/> if none.
+            </param>
+            <returns>The message.</returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be found.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.MessageSourceAccessor.GetMessage(System.String,System.Globalization.CultureInfo,System.Object[])">
+            <summary>
+            Retrieve the message for the given code and the given
+            <see cref="T:System.Globalization.CultureInfo"/>.
+            </summary>
+            <param name="code">The code of the message.</param>      
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use for
+            lookups.
+            </param>
+            <param name="args">
+            The arguments for the message, or <see langword="null"/> if none.
+            </param>
+            <returns>The message.</returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be found.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.MessageSourceAccessor.GetMessage(Spring.Context.IMessageSourceResolvable)">
+            <summary>
+            Retrieve a mesage using the given
+            <see cref="T:Spring.Context.IMessageSourceResolvable"/>.
+            </summary>
+            <param name="resolvable">
+            The <see cref="T:Spring.Context.IMessageSourceResolvable"/>.
+            </param>
+            <returns>The message.</returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be found.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.MessageSourceAccessor.GetMessage(Spring.Context.IMessageSourceResolvable,System.Globalization.CultureInfo)">
+            <summary>
+            Retrieve a mesage using the given
+            <see cref="T:Spring.Context.IMessageSourceResolvable"/> in the given
+            <see cref="T:System.Globalization.CultureInfo"/>.
+            </summary>
+            <param name="resolvable">
+            The <see cref="T:Spring.Context.IMessageSourceResolvable"/>.
+            </param>     
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use for
+            lookups.
+            </param>
+            <returns>The message</returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be found.
+            </exception>
+        </member>
+        <member name="T:Spring.Context.Support.ContextRegistry">
+            <summary> 
+            Provides access to a central registry of 
+            <see cref="T:Spring.Context.IApplicationContext"/>s.
+            </summary>
+            <remarks>
+            <p>
+            A singleton implementation to access one or more application contexts.  Application
+            context instances are cached.
+            </p>
+            <p>Note that the use of this class or similar is unnecessary except (sometimes) for
+            a small amount of glue code.  Excessive usage will lead to code that is more tightly
+            coupled, and harder to modify or test.  Consider refactoring your code to use standard
+            Dependency Injection techniques or implement the interface IApplicationContextAware to
+            obtain a reference to an application context.</p>
+            </remarks>
+            <author>Mark Pollack</author>
+            <author>Aleksandar Seovic</author>
+            <seealso cref="T:Spring.Context.IApplicationContext"/>
+            <version>$Id: ContextRegistry.cs,v 1.28 2008/03/21 10:49:37 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Context.Support.ContextRegistry.log">
+            <summary>
+            The shared <see cref="T:Common.Logging.ILog"/> instance for this class (and derived classes).
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.ContextRegistry.#cctor">
+            <summary>
+            Creates a new instance of the ContextRegistry class.
+            </summary>
+            <remarks>
+            <p>
+            Explicit static constructor to tell C# compiler
+            not to mark type as beforefieldinit.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.ContextRegistry.RegisterContext(Spring.Context.IApplicationContext)">
+            <summary> 
+            Registers an instance of an
+            <see cref="T:Spring.Context.IApplicationContext"/>. 
+            </summary> 
+            <remarks>
+            <p>
+            This is usually called via a
+            <see cref="T:Spring.Context.Support.ContextHandler"/> inside a .NET
+            application configuration file. 
+            </p>
+            </remarks>
+            <param name="context">The application context to be registered.</param>
+            <exception cref="T:Spring.Context.ApplicationContextException">
+            If a context has previously been registered using the same name
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.ContextRegistry.GetContext">
+            <summary>
+            Returns the root application context.
+            </summary>
+            <remarks>
+            <p>
+            The first call to GetContext will create the context 
+            as specified in the .NET application configuration file 
+            under the location spring/context.
+            </p>
+            </remarks>
+            <returns>The root application context.</returns>
+        </member>
+        <member name="M:Spring.Context.Support.ContextRegistry.GetContext(System.String)">
+            <summary>
+            Returns context based on specified name.
+            </summary>
+            <remarks>
+            <p>
+            The first call to GetContext will create the context 
+            as specified in the .NET application configuration file 
+            under the location spring/context.
+            </p>
+            </remarks>
+            <param name="name">The context name.</param>
+            <returns>The specified context, or null, if context with that name doesn't exists.</returns>
+            <exception cref="T:System.ArgumentException">
+            If the context name is null or empty
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.ContextRegistry.Clear">
+            <summary>
+            Removes all registered
+            <see cref="T:Spring.Context.IApplicationContext"/>s from this
+            registry.
+            </summary>
+            <remarks>
+            Raises the <see cref="E:Spring.Context.Support.ContextRegistry.Cleared"/> event while still holding a lock on <see cref="P:Spring.Context.Support.ContextRegistry.SyncRoot"/>
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.ContextRegistry.IsContextRegistered(System.String)">
+            <summary>
+            Allows to check, if a context is already registered
+            </summary>
+            <param name="name">The context name.</param>
+            <returns>true, if the context is already registered. false otherwise</returns>
+        </member>
+        <member name="E:Spring.Context.Support.ContextRegistry.Cleared">
+            <summary>
+            This event is fired, if ContextRegistry.Clear() is called.<br/>
+            Clients may register to get informed
+            </summary>
+            <remarks>
+            This event is fired while still holding a lock on the Registry.<br/>
+            'sender' parameter is sent as typeof(ContextRegistry), EventArgs are not used
+            </remarks>
+        </member>
+        <member name="P:Spring.Context.Support.ContextRegistry.SyncRoot">
+            <summary>
+            Gets an object that should be used to synchronize access to ContextRegistry
+            from the calling code.
+            </summary>
+        </member>
+        <member name="T:Spring.Context.IResourceLoaderAware">
+            <summary>
+            Interface to be implemented by any object that wishes to be notified
+            of the <see cref="T:Spring.Core.IO.IResourceLoader"/> (typically the
+            <see cref="T:Spring.Context.IApplicationContext"/>) that it runs in.
+            </summary>
+            <remarks>
+            <p>
+            Note that <see cref="T:Spring.Core.IO.IResource"/> dependencies can also
+            be exposed as object properties of type
+            <see cref="T:Spring.Core.IO.IResource"/>, populated via strings with
+            automatic type conversion by the object factory. This obviates the
+            need for implementing any callback interface just for the purpose of
+            accessing a specific resource.
+            </p>
+            <p>
+            You typically need an <see cref="T:Spring.Core.IO.IResourceLoader"/>
+            when your application object has to access a variety of file resources
+            whose names are calculated. A good strategy is to make the object use
+            a default resource loader but still implement the
+            <see cref="T:Spring.Context.IResourceLoaderAware"/> interface to allow
+            for overriding when running in an
+            <see cref="T:Spring.Context.IApplicationContext"/>.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IResourceLoaderAware.cs,v 1.8 2007/08/08 17:46:37 bbaia Exp $</version>
+            <see cref="T:Spring.Context.IApplicationContextAware"/>
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/>
+            <see cref="T:Spring.Core.IO.IResourceLoader"/>
+        </member>
+        <member name="P:Spring.Context.IResourceLoaderAware.ResourceLoader">
+            <summary>
+            Gets and sets the <see cref="T:Spring.Core.IO.IResourceLoader"/>
+            that this object runs in.
+            </summary>
+            <remarks>
+            <p>
+            Invoked <b>after</b> population of normal objects properties but
+            before an init callback such as
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s 
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            or a custom init-method. Invoked <b>before</b> setting 
+            <see cref="T:Spring.Context.IApplicationContextAware"/>'s
+            <see cref="P:Spring.Context.IApplicationContextAware.ApplicationContext"/>
+            property.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Collections.SynchronizedDictionaryEnumerator">
+            <summary>
+            Synchronized <see cref="T:System.Collections.IDictionaryEnumerator"/> that should be returned by synchronized
+            dictionary implementations in order to ensure that the enumeration is thread safe.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SynchronizedDictionaryEnumerator.cs,v 1.1 2006/05/03 01:13:41 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Collections.SynchronizedEnumerator">
+            <summary>
+            Synchronized <see cref="T:System.Collections.IEnumerator"/> that should be returned by synchronized
+            collections in order to ensure that the enumeration is thread safe.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SynchronizedEnumerator.cs,v 1.1 2006/05/03 01:13:41 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Validation.ValidationErrors">
+            <summary>
+            A container for validation errors.
+            </summary>
+            <remarks>
+            <p>
+            This class groups validation errors by validator names and allows
+            access to both the complete errors collection and to the errors for a
+            certain validator.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <author>Goran Milosavljevic</author>
+            <version>$Id: ValidationErrors.cs,v 1.9 2008/02/05 20:40:26 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Validation.IValidationErrors">
+            <summary>
+            An interface that validation errors containers have to implement.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IValidationErrors.cs,v 1.1 2008/02/05 20:40:26 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Validation.IValidationErrors.AddError(System.String,Spring.Validation.ErrorMessage)">
+            <summary>
+            Adds the supplied <paramref name="message"/> to this
+            instance's collection of errors.
+            </summary>
+            <param name="provider">
+            The provider that should be used for message grouping; can't be
+            <see lang="null"/>.
+            </param>
+            <param name="message">The error message to add.</param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="provider"/> or <paramref name="message"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Validation.IValidationErrors.MergeErrors(Spring.Validation.ValidationErrors)">
+            <summary>
+            Merges another instance of <see cref="T:Spring.Validation.ValidationErrors"/> into this one.
+            </summary>
+            <remarks>
+            <p>
+            If the supplied <paramref name="errorsToMerge"/> is <see lang="null"/>,
+            then no errors will be added to this instance, and this method will
+            (silently) return.
+            </p>
+            </remarks>
+            <param name="errorsToMerge">
+            The validation errors to merge; can be <see lang="null"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Validation.IValidationErrors.GetErrors(System.String)">
+            <summary>
+            Gets the list of errors for the supplied error <paramref name="provider"/>.
+            </summary>
+            <remarks>
+            <p>
+            If there are no errors for the supplied <paramref name="provider"/>,
+            an <b>empty</b> <see cref="T:System.Collections.IList"/> will be returned.
+            </p>
+            </remarks>
+            <param name="provider">Error key that was used to group messages.</param>
+            <returns>
+            A list of all <see cref="T:Spring.Validation.ErrorMessage"/>s for the supplied lookup <paramref name="provider"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Validation.IValidationErrors.GetResolvedErrors(System.String,Spring.Context.IMessageSource)">
+            <summary>
+            Gets the list of resolved error messages for the supplied lookup <paramref name="provider"/>.
+            </summary>
+            <remarks>
+            <p>
+            If there are no errors for the supplied lookup <paramref name="provider"/>,
+            an <b>empty</b> <see cref="T:System.Collections.IList"/> will be returned.
+            </p>
+            </remarks>
+            <param name="provider">Error key that was used to group messages.</param>
+            <param name="messageSource"><see cref="T:Spring.Context.IMessageSource"/> to resolve messages against.</param>
+            <returns>
+            A list of resolved error messages for the supplied lookup <paramref name="provider"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Validation.IValidationErrors.IsEmpty">
+            <summary>
+            Does this instance contain any validation errors?
+            </summary>
+            <remarks>
+            <p>
+            If this returns <see lang="true"/>, this means that it (obviously)
+            contains no validation errors.
+            </p>
+            </remarks>
+            <value><see lang="true"/> if this instance is empty.</value>
+        </member>
+        <member name="P:Spring.Validation.IValidationErrors.Providers">
+            <summary>
+            Gets the list of all error providers.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.ValidationErrors.#ctor">
+            <summary>
+            Default constructor.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.ValidationErrors.GetSchema">
+            <summary>
+            This property is reserved, apply the 
+            <see cref="T:System.Xml.Serialization.XmlSchemaProviderAttribute" />
+            to the class instead. 
+            </summary>
+            <returns>
+            An <see cref="T:System.Xml.Schema.XmlSchema" /> that describes the 
+            XML representation of the object that is produced by 
+            the <see cref="M:System.Xml.Serialization.IXmlSerializable.WriteXml(System.Xml.XmlWriter)" /> 
+            method and consumed by the 
+            <see cref="M:System.Xml.Serialization.IXmlSerializable.ReadXml(System.Xml.XmlReader)" /> 
+            method.
+            </returns>
+        </member>
+        <member name="M:Spring.Validation.ValidationErrors.ReadXml(System.Xml.XmlReader)">
+            <summary>
+            Generates an object from its XML representation.
+            </summary>
+            <param name="reader">
+            The <see cref="T:System.Xml.XmlReader"></see> stream 
+            from which the object is deserialized. 
+            </param>
+        </member>
+        <member name="M:Spring.Validation.ValidationErrors.WriteXml(System.Xml.XmlWriter)">
+            <summary>
+            Converts an object into its XML representation.
+            </summary>
+            <param name="writer">
+            The <see cref="T:System.Xml.XmlWriter"></see> stream 
+            to which the object is serialized. 
+            </param>
+        </member>
+        <member name="M:Spring.Validation.ValidationErrors.AddError(System.String,Spring.Validation.ErrorMessage)">
+            <summary>
+            Adds the supplied <paramref name="message"/> to this
+            instance's collection of errors.
+            </summary>
+            <param name="provider">
+            The provider that should be used for message grouping; can't be
+            <see lang="null"/>.
+            </param>
+            <param name="message">The error message to add.</param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="provider"/> or <paramref name="message"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Validation.ValidationErrors.MergeErrors(Spring.Validation.ValidationErrors)">
+            <summary>
+            Merges another instance of <see cref="T:Spring.Validation.ValidationErrors"/> into this one.
+            </summary>
+            <remarks>
+            <p>
+            If the supplied <paramref name="errorsToMerge"/> is <see lang="null"/>,
+            then no errors will be added to this instance, and this method will
+            (silently) return.
+            </p>
+            </remarks>
+            <param name="errorsToMerge">
+            The validation errors to merge; can be <see lang="null"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Validation.ValidationErrors.GetErrors(System.String)">
+            <summary>
+            Gets the list of errors for the supplied lookup <paramref name="provider"/>.
+            </summary>
+            <remarks>
+            <p>
+            If there are no errors for the supplied lookup <paramref name="provider"/>,
+            an <b>empty</b> <see cref="T:System.Collections.IList"/> will be returned.
+            </p>
+            </remarks>
+            <param name="provider">Error key that was used to group messages.</param>
+            <returns>
+            A list of all <see cref="T:Spring.Validation.ErrorMessage"/>s for the supplied lookup <paramref name="provider"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Validation.ValidationErrors.GetResolvedErrors(System.String,Spring.Context.IMessageSource)">
+            <summary>
+            Gets the list of resolved error messages for the supplied lookup <paramref name="provider"/>.
+            </summary>
+            <remarks>
+            <p>
+            If there are no errors for the supplied lookup <paramref name="provider"/>,
+            an <b>empty</b> <see cref="T:System.Collections.IList"/> will be returned.
+            </p>
+            </remarks>
+            <param name="provider">Error key that was used to group messages.</param>
+            <param name="messageSource"><see cref="T:Spring.Context.IMessageSource"/> to resolve messages against.</param>
+            <returns>
+            A list of resolved error messages for the supplied lookup <paramref name="provider"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Validation.ValidationErrors.IsEmpty">
+            <summary>
+            Does this instance contain any validation errors?
+            </summary>
+            <remarks>
+            <p>
+            If this returns <see lang="true"/>, this means that it (obviously)
+            contains no validation errors.
+            </p>
+            </remarks>
+            <value><see lang="true"/> if this instance is empty.</value>
+        </member>
+        <member name="P:Spring.Validation.ValidationErrors.Providers">
+            <summary>
+            Gets the list of all providers.
+            </summary>
+        </member>
+        <member name="T:Spring.Util.XmlUtils">
+            <summary>
+            XML utility methods.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: XmlUtils.cs,v 1.5 2007/04/22 00:02:38 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Util.XmlUtils.CreateValidatingReader(System.IO.Stream,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler)">
+            <summary>
+            Gets an appropriate <see cref="T:System.Xml.XmlReader"/> implementation
+            for the supplied <see cref="T:System.IO.Stream"/>.
+            </summary>
+            <param name="stream">The XML <see cref="T:System.IO.Stream"/> that is going to be read.</param>
+            <param name="schemas">XML schemas that should be used for validation.</param>
+            <param name="eventHandler">Validation event handler.</param>
+            <returns>
+            A validating <see cref="T:System.Xml.XmlReader"/> implementation.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.XmlUtils.CreateValidatingReader(System.IO.Stream,System.Xml.XmlResolver,System.Xml.Schema.XmlSchemaSet,System.Xml.Schema.ValidationEventHandler)">
+            <summary>
+            Gets an appropriate <see cref="T:System.Xml.XmlReader"/> implementation
+            for the supplied <see cref="T:System.IO.Stream"/>.
+            </summary>
+            <param name="stream">The XML <see cref="T:System.IO.Stream"/> that is going to be read.</param>
+            <param name="xmlResolver"><see cref="T:System.Xml.XmlResolver"/> to be used for resolving external references</param>
+            <param name="schemas">XML schemas that should be used for validation.</param>
+            <param name="eventHandler">Validation event handler.</param>
+            <returns>
+            A validating <see cref="T:System.Xml.XmlReader"/> implementation.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.XmlUtils.CreateReader(System.IO.Stream)">
+            <summary>
+            Gets an appropriate <see cref="T:System.Xml.XmlReader"/> implementation 
+            for the supplied <see cref="T:System.IO.Stream"/>.
+            </summary>
+            <param name="stream">The XML <see cref="T:System.IO.Stream"/> that is going to be read.</param>
+            <returns>
+            A non-validating <see cref="T:System.Xml.XmlReader"/> implementation.
+            </returns>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.IDynamicProperty">
+            <summary>
+            Defines methods that dynamic property class has to implement.
+            </summary>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.IDynamicProperty.GetValue(System.Object)">
+            <summary>
+            Gets the value of the dynamic property for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to get property value from.
+            </param>
+            <returns>
+            A property value.
+            </returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.IDynamicProperty.SetValue(System.Object,System.Object)">
+            <summary>
+            Gets the value of the dynamic property for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to set property value on.
+            </param>
+            <param name="value">
+            A new property value.
+            </param>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.SafeProperty">
+            <summary>
+            Safe wrapper for the dynamic property.
+            </summary>
+            <remarks>
+            <see cref="T:Spring.Reflection.Dynamic.SafeProperty"/> will attempt to use dynamic
+            property if possible, but it will fall back to standard
+            reflection if necessary.
+            </remarks>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeProperty.GetOrCreateDynamicProperty(System.Reflection.PropertyInfo)">
+            <summary>
+            Obtains cached property info or creates a new entry, if none is found.
+            </summary>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeProperty.#ctor(System.Reflection.PropertyInfo)">
+            <summary>
+            Creates a new instance of the safe property wrapper.
+            </summary>
+            <param name="propertyInfo">Property to wrap.</param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeProperty.GetValue(System.Object)">
+            <summary>
+            Gets the value of the dynamic property for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to get property value from.
+            </param>
+            <returns>
+            A property value.
+            </returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeProperty.SetValue(System.Object,System.Object)">
+            <summary>
+            Gets the value of the dynamic property for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to set property value on.
+            </param>
+            <param name="value">
+            A new property value.
+            </param>
+        </member>
+        <member name="P:Spring.Reflection.Dynamic.SafeProperty.PropertyInfo">
+            <summary>
+            Internal PropertyInfo accessor.
+            </summary>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.SafeProperty.DynamicPropertyCacheEntry">
+            <summary>
+            Holds cached Getter/Setter delegates for a Property
+            </summary>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.DynamicProperty">
+            <summary>
+            Factory class for dynamic properties.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DynamicProperty.cs,v 1.3 2008/05/17 11:05:26 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.BaseDynamicMember">
+            <summary>
+            Base class for dynamic members.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: BaseDynamicMember.cs,v 1.1 2007/08/08 04:05:37 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Reflection.Dynamic.BaseDynamicMember.METHOD_ATTRIBUTES">
+            <summary>
+            Method attributes constant.
+            </summary>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.BaseDynamicMember.SetupTargetInstance(System.Reflection.Emit.ILGenerator,System.Type)">
+            <summary>
+            Sets up target instance for invocation.
+            </summary>
+            <param name="il">IL generator to use.</param>
+            <param name="targetType">Type of target instance.</param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.BaseDynamicMember.SetupArgument(System.Reflection.Emit.ILGenerator,System.Type,System.Int32)">
+            <summary>
+            Sets up invocation argument.
+            </summary>
+            <param name="il">IL generator to use.</param>
+            <param name="argumentType">Argument type.</param>
+            <param name="argumentPosition">Argument position.</param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.BaseDynamicMember.InvokeMethod(System.Reflection.Emit.ILGenerator,System.Boolean,System.Boolean,System.Reflection.MethodInfo)">
+            <summary>
+            Generates method invocation code.
+            </summary>
+            <param name="il">IL generator to use.</param>
+            <param name="isStatic">Flag specifying whether method is static.</param>
+            <param name="isValueType">Flag specifying whether method is on the value type.</param>
+            <param name="method">Method to invoke.</param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.BaseDynamicMember.ProcessReturnValue(System.Reflection.Emit.ILGenerator,System.Type)">
+            <summary>
+            Generates code to process return value if necessary.
+            </summary>
+            <param name="il">IL generator to use.</param>
+            <param name="returnValueType">Type of the return value.</param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.BaseDynamicMember.ThrowInvalidOperationException(System.Reflection.Emit.ILGenerator,System.String)">
+            <summary>
+            Generates code that throws <see cref="T:System.InvalidOperationException"/>.
+            </summary>
+            <param name="il">IL generator to use.</param>
+            <param name="message">Error message to use.</param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicProperty.CreateSafe(System.Reflection.PropertyInfo)">
+            <summary>
+            Creates safe dynamic property instance for the specified <see cref="T:System.Reflection.PropertyInfo"/>.
+            </summary>
+            <remarks>
+            <p>This factory method will create a dynamic property with a "safe" wrapper.</p>
+            <p>Safe wrapper will attempt to use generated dynamic property if possible,
+            but it will fall back to standard reflection if necessary.</p>
+            </remarks>
+            <param name="property">Property info to create dynamic property for.</param>
+            <returns>Safe dynamic property for the specified <see cref="T:System.Reflection.PropertyInfo"/>.</returns>
+            <seealso cref="T:Spring.Reflection.Dynamic.SafeProperty"/>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicProperty.Create(System.Reflection.PropertyInfo)">
+            <summary>
+            Creates dynamic property instance for the specified <see cref="T:System.Reflection.PropertyInfo"/>.
+            </summary>
+            <param name="property">Property info to create dynamic property for.</param>
+            <returns>Dynamic property for the specified <see cref="T:System.Reflection.PropertyInfo"/>.</returns>
+        </member>
+        <member name="T:Spring.Objects.Support.AutoWiringEventHandlerValue">
+            <summary>
+            Describes an <see cref="T:Spring.Objects.IEventHandlerValue"/> implementation
+            that autowires events to handler methods.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: AutoWiringEventHandlerValue.cs,v 1.11 2006/11/13 07:04:41 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Support.AutoWiringEventHandlerValue.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.AutoWiringEventHandlerValue"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Support.AutoWiringEventHandlerValue.Wire(System.Object,System.Object)">
+            <summary>
+            Wires up the specified handler to the named event on the supplied event source.
+            </summary>
+            <param name="source">
+            The object (an object instance, a <see cref="T:System.Type"/>, etc)
+            exposing the named event.
+            </param>
+            <param name="handler">
+            The handler for the event (an object instance, a <see cref="T:System.Type"/>,
+            etc).
+            </param>
+        </member>
+        <member name="P:Spring.Objects.Support.AutoWiringEventHandlerValue.MethodName">
+            <summary>
+            The name of the method that is going to handle the event.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Support.AutoWiringEventHandlerValue.AutoWirer">
+            <summary>
+            Performs the matching up of handler methods to one or more source events.
+            </summary>
+            <remarks>
+            <p>
+            This class merely marshals the matching of handler methods to the events exposed
+            by an event source, and then delegates to a concrete
+            <see cref="T:Spring.Objects.IEventHandlerValue"/> implementation (such as
+            <see cref="T:Spring.Objects.Support.InstanceEventHandlerValue"/> or
+            <see cref="T:Spring.Objects.Support.StaticEventHandlerValue"/>) to do the heavy lifting of
+            actually wiring a handler method to an event.
+            </p>
+            <p>
+            Note : the order in which handler's are wired up to events is non-deterministic.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Support.AutoWiringEventHandlerValue.AutoWirer.#ctor(System.Object,System.String,System.Object,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.AutoWiringEventHandlerValue.AutoWirer"/> class.
+            </summary>
+            <param name="source">
+            The object exposing the event (s) being wired up.
+            </param>
+            <param name="eventName">
+            The name of the event that is being wired up.
+            </param>
+            <param name="handler">
+            The object exposing the method (s) being wired to the event.
+            </param>
+            <param name="methodName">
+            The name of the method that is going to handle the event.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Support.AutoWiringEventHandlerValue.AutoWirer.Wire">
+            <summary>
+            Wires up events on the source to methods exposed on the handler.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Support.AutoWiringEventHandlerValue.AutoWirer.WireEvent(System.Reflection.EventInfo)">
+            <summary>
+            Wires up the supplied event to any handler methods that match the event
+            signature.
+            </summary>
+            <param name="theEvent">The event being wired up.</param>
+        </member>
+        <member name="M:Spring.Objects.Support.AutoWiringEventHandlerValue.AutoWirer.GetMethodNameCustomisedForEvent(System.String)">
+            <summary>
+            Only replaces the <b>first</b> occurrence of the placeholder.
+            </summary>
+            <param name="eventName">The event whose name is going to be used.</param>
+            <returns>
+            The method name customised for the name of the supplied event.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Support.AutoWiringEventHandlerValue.AutoWirer.Source">
+            <summary>
+            The object exposing the event (s) being wired up.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Support.AutoWiringEventHandlerValue.AutoWirer.Handler">
+            <summary>
+            The object exposing the method (s) being wired to an event source.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Support.AutoWiringEventHandlerValue.AutoWirer.HandlerType">
+            <summary>
+            The <see cref="T:System.Type"/> of the object that is handling any events.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Support.AutoWiringEventHandlerValue.AutoWirer.MethodName">
+            <summary>
+            The name of the method that is going to handle the event.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Support.AutoWiringEventHandlerValue.AutoWirer.EventName">
+            <summary>
+            The name of the event that is being wired up.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.RootObjectDefinition">
+            <summary>
+            A plain-vanilla object definition.
+            </summary>
+            <remarks>
+            <p>
+            This is the most common type of object definition;
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> instances
+            do not derive from a parent
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>, and usually
+            (but not always - see below) have an
+            <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.ObjectType"/>
+            and (optionally) some
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/> and
+            <see cref="T:Spring.Objects.IPropertyValues"/>.
+            </p>
+            <p>
+            Note that <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+            instances do not have to specify an
+            <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.ObjectType"/> :
+            This can be useful for deriving
+            <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/> instances
+            from such definitions, each with it's own
+            <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.ObjectType"/>,
+            inheriting common property values and other settings from the parent.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: RootObjectDefinition.cs,v 1.20 2007/03/16 04:01:43 aseovic Exp $</version>
+            <seealso cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.AbstractObjectDefinition">
+            <summary>
+            Common base class for object definitions, factoring out common
+            functionality from
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> and
+            <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/>.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: AbstractObjectDefinition.cs,v 1.31 2007/08/27 13:57:43 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.IConfigurableObjectDefinition">
+            <summary>
+            Describes a configurable object instance, which has property values,
+            constructor argument values, and further information supplied by concrete
+            implementations.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: IConfigurableObjectDefinition.cs,v 1.1 2007/07/30 17:52:22 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.IObjectDefinition">
+            <summary>
+            Describes an object instance, which has property values, constructor
+            argument values, and further information supplied by concrete implementations.
+            </summary>
+            <remarks>
+            <p>
+            This is just a minimal interface: the main intention is to allow
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            (like PropertyPlaceholderConfigurer) to access and modify property values.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IObjectDefinition.cs,v 1.14 2007/07/30 17:52:22 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.PropertyValues">
+            <summary>
+            Return the property values to be applied to a new instance of the object.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.ConstructorArgumentValues">
+            <summary>
+            Return the constructor argument values for this object.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.EventHandlerValues">
+            <summary>
+            Return the event handlers for any events exposed by this object.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.ResourceDescription">
+            <summary>
+            Return a description of the resource that this object definition
+            came from (for the purpose of showing context in case of errors).
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.IsTemplate">
+            <summary>
+            Is this object definition a "template", i.e. not meant to be instantiated
+            itself but rather just serving as an object definition for configuration 
+            templates used by <see cref="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)"/>.
+            </summary>
+            <value>
+            <see langword="true"/> if this object definition is a "template".
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.IsAbstract">
+            <summary>
+            Is this object definition "abstract", i.e. not meant to be instantiated
+            itself but rather just serving as parent for concrete child object
+            definitions.
+            </summary>
+            <value>
+            <see langword="true"/> if this object definition is "abstract".
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.IsSingleton">
+            <summary>
+            Return whether this a <b>Singleton</b>, with a single, shared instance
+            returned on all calls.
+            </summary>
+            <remarks>
+            <p>
+            If <see langword="false"/>, an object factory will apply the <b>Prototype</b>
+            design pattern, with each caller requesting an instance getting an
+            independent instance. How this is defined will depend on the
+            object factory implementation. <b>Singletons</b> are the commoner type.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.IsLazyInit">
+            <summary>
+            Is this object lazily initialized?</summary>
+            <remarks>
+            <p>
+            Only applicable to a singleton object.
+            </p>
+            <p>
+            If <see langword="false"/>, it will get instantiated on startup by object factories
+            that perform eager initialization of singletons.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.ObjectType">
+            <summary>
+            Returns the <see cref="T:System.Type"/> of the object definition (if any).
+            </summary>
+            <value>
+            A resolved object <see cref="T:System.Type"/>.
+            </value>
+            <exception cref="T:System.ApplicationException">
+            If the <see cref="T:System.Type"/> of the object definition is not a
+            resolved <see cref="T:System.Type"/> or <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.ObjectTypeName">
+            <summary>
+            Returns the <see cref="P:System.Type.FullName"/> of the
+            <see cref="T:System.Type"/> of the object definition.
+            </summary>
+            <remarks>Note that this does not have to be the actual type name used at runtime,
+            in case of a child definition overrding/inheriting the the type name from its
+            parent.  It can be modifed during object factory post-processing, typically 
+            replacing the original class name with a parsed variant of it.
+            Hence, do not consider this to be the definitive bean type at runtime
+            but rather only use it for parsing purposes at the individual object
+            definition level. 
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.AutowireMode">
+            <summary>
+            The autowire mode as specified in the object definition.
+            </summary>
+            <remarks>
+            <p>
+            This determines whether any automagical detection and setting of
+            object references will happen. Default is
+            <see cref="F:Spring.Objects.Factory.Config.AutoWiringMode.No"/>,
+            which means there's no autowire.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.DependsOn">
+            <summary>
+            The object names that this object depends on.
+            </summary>
+            <remarks>
+            <p>
+            The object factory will guarantee that these objects get initialized
+            before.
+            </p>
+            <p>
+            Note that dependencies are normally expressed through object properties
+            or constructor arguments. This property should just be necessary for
+            other kinds of dependencies like statics (*ugh*) or database
+            preparation on startup.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.InitMethodName">
+            <summary>
+            The name of the initializer method.
+            </summary>
+            <remarks>
+            <p>
+            The default is <see langword="null"/>, in which case there is no initializer method.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.DestroyMethodName">
+            <summary>
+            Return the name of the destroy method.
+            </summary>
+            <remarks>
+            <p>
+            The default is <see langword="null"/>, in which case there is no destroy method.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.FactoryMethodName">
+            <summary>
+            The name of the factory method to use (if any).
+            </summary>
+            <remarks>
+            <p>
+            This method will be invoked with constructor arguments, or with no
+            arguments if none are specified. The static method will be invoked on
+            the specified <see cref="P:Spring.Objects.Factory.Config.IObjectDefinition.ObjectType"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IObjectDefinition.FactoryObjectName">
+            <summary>
+            The name of the factory object to use (if any).
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.PropertyValues">
+            <summary>
+            Return the property values to be applied to a new instance of the object.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.ConstructorArgumentValues">
+            <summary>
+            Return the constructor argument values for this object.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.MethodOverrides">
+            <summary>
+            The method overrides (if any) for this object.
+            </summary>
+            <value>
+            The method overrides (if any) for this object; may be an
+            empty collection but is guaranteed not to be
+            <see langword="null"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.EventHandlerValues">
+            <summary>
+            Return the event handlers for any events exposed by this object.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.ResourceDescription">
+            <summary>
+            Return a description of the resource that this object definition
+            came from (for the purpose of showing context in case of errors).
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.IsAbstract">
+            <summary>
+            Is this object definition "abstract", i.e. not meant to be instantiated
+            itself but rather just serving as parent for concrete child object
+            definitions.
+            </summary>
+            <value>
+            <see langword="true"/> if this object definition is "abstract".
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.ObjectType">
+            <summary>
+            Returns the <see cref="T:System.Type"/> of the object definition (if any).
+            </summary>
+            <value>
+            A resolved object <see cref="T:System.Type"/>.
+            </value>
+            <exception cref="T:System.ApplicationException">
+            If the <see cref="T:System.Type"/> of the object definition is not a
+            resolved <see cref="T:System.Type"/> or <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.ObjectTypeName">
+            <summary>
+            Returns the <see cref="P:System.Type.FullName"/> of the
+            <see cref="T:System.Type"/> of the object definition (if any).
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.IsSingleton">
+            <summary>
+            Return whether this a <b>Singleton</b>, with a single, shared instance
+            returned on all calls.
+            </summary>
+            <remarks>
+            <p>
+            If <see langword="false"/>, an object factory will apply the <b>Prototype</b>
+            design pattern, with each caller requesting an instance getting an
+            independent instance. How this is defined will depend on the
+            object factory implementation. <b>Singletons</b> are the commoner type.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.IsLazyInit">
+            <summary>
+            Is this object lazily initialized?</summary>
+            <remarks>
+            <p>
+            Only applicable to a singleton object.
+            </p>
+            <p>
+            If <see langword="false"/>, it will get instantiated on startup by object factories
+            that perform eager initialization of singletons.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.AutowireMode">
+            <summary>
+            The autowire mode as specified in the object definition.
+            </summary>
+            <remarks>
+            <p>
+            This determines whether any automagical detection and setting of
+            object references will happen. Default is
+            <see cref="F:Spring.Objects.Factory.Config.AutoWiringMode.No"/>,
+            which means there's no autowire.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.DependencyCheck">
+            <summary>
+            The dependency check code.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.DependsOn">
+            <summary>
+            The object names that this object depends on.
+            </summary>
+            <remarks>
+            <p>
+            The object factory will guarantee that these objects get initialized
+            before.
+            </p>
+            <p>
+            Note that dependencies are normally expressed through object properties
+            or constructor arguments. This property should just be necessary for
+            other kinds of dependencies like statics (*ugh*) or database
+            preparation on startup.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.InitMethodName">
+            <summary>
+            The name of the initializer method.
+            </summary>
+            <remarks>
+            <p>
+            The default is <see langword="null"/>, in which case there is no initializer method.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.DestroyMethodName">
+            <summary>
+            Return the name of the destroy method.
+            </summary>
+            <remarks>
+            <p>
+            The default is <see langword="null"/>, in which case there is no destroy method.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.FactoryMethodName">
+            <summary>
+            The name of the factory method to use (if any).
+            </summary>
+            <remarks>
+            <p>
+            This method will be invoked with constructor arguments, or with no
+            arguments if none are specified. The static method will be invoked on
+            the specified <see cref="P:Spring.Objects.Factory.Config.IObjectDefinition.ObjectType"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IConfigurableObjectDefinition.FactoryObjectName">
+            <summary>
+            The name of the factory object to use (if any).
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinition.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.AbstractObjectDefinition"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no
+            public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinition.#ctor(Spring.Objects.Factory.Config.ConstructorArgumentValues,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.AbstractObjectDefinition"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no
+            public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinition.#ctor(Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.AbstractObjectDefinition"/>
+            class.
+            </summary>
+            <param name="other">
+            The object definition used to initialise the member fields of this
+            instance.
+            </param>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no
+            public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinition.ResolveObjectType">
+            <summary>
+            Resolves the type of the object, resolving it from a specified
+            object type name if necessary. 
+            </summary>
+            <returns>
+            A resolved <see cref="T:System.Type"/> instance.
+            </returns>
+            <exception cref="T:System.TypeLoadException">
+            If the type cannot be resolved.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinition.Validate">
+            <summary>
+            Validate this object definition.
+            </summary>
+            <exception cref="T:Spring.Objects.Factory.Support.ObjectDefinitionValidationException">
+            In the case of a validation failure.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinition.PrepareMethodOverrides">
+            <summary>
+            Validates all <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.MethodOverrides"/> 
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinition.PrepareMethodOverride(Spring.Objects.Factory.Support.MethodOverride)">
+            <summary>
+            Validate the supplied <paramref name="methodOverride"/>.
+            </summary>
+            <param name="methodOverride">
+            The <see cref="T:Spring.Objects.Factory.Support.MethodOverride"/>
+            to be validated.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinition.OverrideFrom(Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Override settings in this object definition from the supplied
+            <paramref name="other"/> object definition.
+            </summary>
+            <param name="other">
+            The object definition used to override the member fields of this instance.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectDefinition.ToString">
+            <summary>
+            Returns a <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>. 
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>. 
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.PropertyValues">
+            <summary>
+            The property values that are to be applied to the object
+            upon creation.
+            </summary>
+            <remarks>
+            <p>
+            Setting the value of this property to <see langword="null"/>
+            will merely result in a new (and empty)
+            <see cref="T:Spring.Objects.MutablePropertyValues"/>
+            collection being assigned to the property value.
+            </p>
+            </remarks>
+            <value>
+            The property values (if any) for this object; may be an
+            empty collection but is guaranteed not to be
+            <see langword="null"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.HasMethodOverrides">
+            <summary>
+            Does this definition have any
+            <see cref="T:Spring.Objects.Factory.Support.MethodOverrides"/>?
+            </summary>
+            <value>
+            <see langword="true"/> if this definition has at least one
+            <see cref="T:Spring.Objects.Factory.Support.MethodOverride"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.ConstructorArgumentValues">
+            <summary>
+            The constructor argument values for this object.
+            </summary>
+            <remarks>
+            <p>
+            Setting the value of this property to <see langword="null"/>
+            will merely result in a new (and empty)
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            collection being assigned.
+            </p>
+            </remarks>
+            <value>
+            The constructor argument values (if any) for this object; may be an
+            empty collection but is guaranteed not to be
+            <see langword="null"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.EventHandlerValues">
+            <summary>
+            The event handler values for this object.
+            </summary>
+            <remarks>
+            <p>
+            Setting the value of this property to <see langword="null"/>
+            will merely result in a new (and empty)
+            <see cref="T:Spring.Objects.Factory.Config.EventValues"/>
+            collection being assigned.
+            </p>
+            </remarks>
+            <value>
+            The event handler values (if any) for this object; may be an
+            empty collection but is guaranteed not to be
+            <see langword="null"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.MethodOverrides">
+            <summary>
+            The method overrides (if any) for this object.
+            </summary>
+            <remarks>
+            <p>
+            Setting the value of this property to <see langword="null"/>
+            will merely result in a new (and empty)
+            <see cref="T:Spring.Objects.Factory.Support.MethodOverrides"/>
+            collection being assigned to the property value.
+            </p>
+            </remarks>
+            <value>
+            The method overrides (if any) for this object; may be an
+            empty collection but is guaranteed not to be
+            <see langword="null"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.IsSingleton">
+            <summary>
+            Is this definition a <b>singleton</b>, with
+            a single, shared instance returned on all calls to an enclosing
+            container (typically an
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> or
+            <see cref="T:Spring.Context.IApplicationContext"/>).
+            </summary>
+            <remarks>
+            <p>
+            If <see langword="false"/>, an object factory will apply the
+            <b>prototype</b> design pattern, with each caller requesting an
+            instance getting an independent instance. How this is defined
+            will depend on the object factory implementation. <b>singletons</b>
+            are the commoner type.
+            </p>
+            </remarks>
+            <seealso cref="T:Spring.Objects.Factory.IObjectFactory"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.IsPrototype">
+            <summary>
+            Gets a value indicating whether this instance is prototype, with an independent instance
+            returned for each call.
+            </summary>
+            <value>
+            	<c>true</c> if this instance is prototype; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.IsLazyInit">
+            <summary>
+            Is this object lazily initialized?</summary>
+            <remarks>
+            <p>
+            Only applicable to a singleton object.
+            </p>
+            <p>
+            If <see langword="false"/>, it will get instantiated on startup
+            by object factories that perform eager initialization of
+            singletons.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.IsTemplate">
+            <summary>
+            Is this object definition a "template", i.e. not meant to be instantiated
+            itself but rather just serving as an object definition for configuration 
+            templates used by <see cref="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)"/>.
+            </summary>
+            <value>
+            <see langword="true"/> if this object definition is a "template".
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.IsAbstract">
+            <summary>
+            Is this object definition "abstract", i.e. not meant to be
+            instantiated itself but rather just serving as a parent for concrete
+            child object definitions.
+            </summary>
+            <value>
+            <see langword="true"/> if this object definition is "abstract".
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.ObjectType">
+            <summary>
+            The <see cref="T:System.Type"/> of the object definition (if any).
+            </summary>
+            <value>
+            A resolved object <see cref="T:System.Type"/>.
+            </value>
+            <exception cref="T:System.ApplicationException">
+            If the <see cref="T:System.Type"/> of the object definition is not a
+            resolved <see cref="T:System.Type"/> or <see langword="null"/>.
+            </exception>
+            <seealso cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.HasObjectType"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.HasObjectType">
+            <summary>
+            Is the <see cref="T:System.Type"/> of the object definition a resolved
+            <see cref="T:System.Type"/>?
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.ObjectTypeName">
+            <summary>
+            Returns the <see cref="P:System.Type.FullName"/> of the
+            <see cref="T:System.Type"/> of the object definition (if any).
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.ResourceDescription">
+            <summary>
+            A description of the resource that this object definition
+            came from (for the purpose of showing context in case of errors).
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.AutowireMode">
+            <summary>
+            The autowire mode as specified in the object definition.
+            </summary>
+            <remarks>
+            <p>
+            This determines whether any automagical detection and setting of
+            object references will happen. The default is
+            <see cref="F:Spring.Objects.Factory.Config.AutoWiringMode.No"/>,
+            which means that no autowiring will be performed.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.ResolvedAutowireMode">
+            <summary>
+            Gets the resolved autowire mode.
+            </summary>
+            <remarks>
+            <p>
+            This resolves
+            <see cref="F:Spring.Objects.Factory.Config.AutoWiringMode.AutoDetect"/>
+            to one of 
+            <see cref="F:Spring.Objects.Factory.Config.AutoWiringMode.Constructor"/>
+            or
+            <see cref="F:Spring.Objects.Factory.Config.AutoWiringMode.ByType"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.DependencyCheck">
+            <summary>
+            The dependency checking mode.
+            </summary>
+            <remarks>
+            <p>
+            The default is
+            <see cref="F:Spring.Objects.Factory.Support.DependencyCheckingMode.None"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.DependsOn">
+            <summary>
+            The object names that this object depends on.
+            </summary>
+            <remarks>
+            <p>
+            The object factory will guarantee that these objects get initialized
+            before this object definition.
+            </p>
+            <note>
+            Dependencies are normally expressed through object properties
+            or constructor arguments. This property should just be necessary for
+            other kinds of dependencies such as statics (*ugh*) or database
+            preparation on startup.
+            </note>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.InitMethodName">
+            <summary>
+            The name of the initializer method.
+            </summary>
+            <remarks>
+            <p>
+            The default value is the <see cref="F:System.String.Empty"/> constant,
+            in which case there is no initializer method.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.DestroyMethodName">
+            <summary>
+            Return the name of the destroy method.
+            </summary>
+            <remarks>
+            <p>
+            The default value is the <see cref="F:System.String.Empty"/> constant,
+            in which case there is no destroy method.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.FactoryMethodName">
+            <summary>
+            The name of the factory method to use (if any).
+            </summary>
+            <remarks>
+            <p>
+            This method will be invoked with constructor arguments, or with no
+            arguments if none are specified. The <see langword="static"/>
+            method will be invoked on the specified
+            <see cref="P:Spring.Objects.Factory.Config.IObjectDefinition.ObjectType"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.FactoryObjectName">
+            <summary>
+            The name of the factory object to use (if any).
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.HasConstructorArgumentValues">
+            <summary>
+            Does this object definition have any constructor argument values?
+            </summary>
+            <value>
+            <see langword="true"/> if his object definition has at least one
+            element in it's
+            <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.ConstructorArgumentValues"/>
+            property.
+            </value>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootObjectDefinition.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootObjectDefinition.#ctor(System.Type)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+            class.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> of the object to instantiate.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootObjectDefinition.#ctor(System.Type,System.Boolean)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+            class.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> of the object to instantiate.
+            </param>
+            <param name="singleton">
+            <see langword="true"/> if this object definition defines a singleton object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootObjectDefinition.#ctor(System.Type,Spring.Objects.Factory.Config.ConstructorArgumentValues,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+            for a singleton, providing property values and constructor arguments.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> of the object to instantiate.
+            </param>
+            <param name="arguments">
+            The <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            to be applied to a new instance of the object.
+            </param>
+            <param name="properties">
+            The <see cref="T:Spring.Objects.MutablePropertyValues"/> to be applied to
+            a new instance of the object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootObjectDefinition.#ctor(System.Type,Spring.Objects.Factory.Config.AutoWiringMode)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+            for a singleton using the supplied
+            <see cref="T:Spring.Objects.Factory.Config.AutoWiringMode"/>.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> of the object to instantiate.
+            </param>
+            <param name="autowireMode">
+            The autowiring mode.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootObjectDefinition.#ctor(System.Type,Spring.Objects.Factory.Config.AutoWiringMode,System.Boolean)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+            for a singleton using the supplied
+            <see cref="T:Spring.Objects.Factory.Config.AutoWiringMode"/>.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> of the object to instantiate.
+            </param>
+            <param name="autowireMode">
+            The autowiring mode.
+            </param>
+            <param name="dependencyCheck">
+            Whether to perform a dependency check for objects (not
+            applicable to autowiring a constructor, thus ignored there)
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootObjectDefinition.#ctor(System.Type,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+            with the given singleton status, providing property values.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> of the object to instantiate.
+            </param>
+            <param name="properties">
+            The <see cref="T:Spring.Objects.MutablePropertyValues"/> to be applied to
+            a new instance of the object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootObjectDefinition.#ctor(System.Type,Spring.Objects.MutablePropertyValues,System.Boolean)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+            with the given singleton status, providing property values.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> of the object to instantiate.
+            </param>
+            <param name="properties">
+            The <see cref="T:Spring.Objects.MutablePropertyValues"/> to be applied to
+            a new instance of the object.
+            </param>
+            <param name="singleton">
+            <see langword="true"/> if this object definition defines a singleton object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootObjectDefinition.#ctor(System.String,Spring.Objects.Factory.Config.ConstructorArgumentValues,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+            for a singleton, providing property values and constructor arguments.
+            </summary>
+            <remarks>
+            <p>
+            Takes an object class name to avoid eager loading of the object class.
+            </p>
+            </remarks>
+            <param name="typeName">
+            The assembly qualified <see cref="P:System.Type.FullName"/> of the object to instantiate.
+            </param>
+            <param name="properties">
+            The <see cref="T:Spring.Objects.MutablePropertyValues"/> to be applied to
+            a new instance of the object.
+            </param>
+            <param name="arguments">
+            The <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            to be applied to a new instance of the object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootObjectDefinition.#ctor(Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Deep copy constructor.
+            </p>
+            </remarks>
+            <param name="other">
+            The definition that is to be copied.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootObjectDefinition.Validate">
+            <summary>
+            Validate this object definition.
+            </summary>
+            <exception cref="T:Spring.Objects.Factory.Support.ObjectDefinitionValidationException">
+            In the case of a validation failure.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootObjectDefinition.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.LookupMethodReplacer">
+            <summary>
+            An <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>
+            implementation that simply returns the result of a lookup in an
+            associated IoC container.
+            </summary>
+            <remarks>
+            <p>
+            This class is Spring.NET's implementation of Dependency Lookup via
+            Method Injection.
+            </p>
+            <p>
+            This class is reserved for internal use within the framework; it is
+            not intended to be used by application developers using Spring.NET.
+            </p>
+            </remarks>
+            <author>Rick Evans</author>
+            <version>$Id: LookupMethodReplacer.cs,v 1.3 2007/07/30 17:52:22 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.AbstractMethodReplacer">
+            <summary>
+            An <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>
+            implementation that provides some convenience support for
+            derived classes.
+            </summary>
+            <remarks>
+            <p>
+            This class is reserved for internal use within the framework; it is
+            not intended to be used by application developers using Spring.NET.
+            </p>
+            </remarks>
+            <author>Rick Evans</author>
+            <version>$Id: AbstractMethodReplacer.cs,v 1.3 2007/07/30 17:52:22 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.IMethodReplacer">
+            <summary>
+            Permits the (re)implementation of an arbitrary method on a Spring.NET
+            IoC container managed object.
+            </summary>
+            <remarks>
+            <p>
+            Encapsulates the notion of the Method-Injection form of Dependency
+            Injection.
+            </p>
+            <p>
+            Methods that are dependency injected with implementations of this
+            interface may be (but need not be) <see lang="abstract"/>, in which
+            case the container will create a concrete subclass of the
+            <see lang="abstract"/> class prior to instantiation.
+            </p>
+            <p>
+            Do <b>not</b> use this mechanism as a means of AOP. See the reference
+            manual for examples of appropriate usages of this interface.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IMethodReplacer.cs,v 1.2 2006/04/09 07:18:49 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IMethodReplacer.Implement(System.Object,System.Reflection.MethodInfo,System.Object[])">
+            <summary>
+            Reimplement the supplied <paramref name="method"/>.
+            </summary>
+            <param name="target">
+            The instance whose <paramref name="method"/> is to be
+            (re)implemented.
+            </param>
+            <param name="method">
+            The method that is to be (re)implemented.
+            </param>
+            <param name="arguments">The target method's arguments.</param>
+            <returns>
+            The result of the (re)implementation of the method call.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractMethodReplacer.#ctor(Spring.Objects.Factory.Support.IConfigurableObjectDefinition,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:System.ArgumentNullException"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see lang="abstract"/> class, and as such has no
+            publicly visible constructors.
+            </p>
+            </remarks>
+            <param name="objectDefinition">
+            The object definition that is the target of the method replacement.
+            </param>
+            <param name="objectFactory">
+            The enclosing IoC container with which the above
+            <paramref name="objectDefinition"/> is associated.
+            </param>
+            <exception cref="T:Spring.Objects.Factory.Support.AbstractMethodReplacer">
+            If either of the supplied arguments is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractMethodReplacer.Implement(System.Object,System.Reflection.MethodInfo,System.Object[])">
+            <summary>
+            Is <see lang="abstract"/>; derived classes must supply an implementation.
+            </summary>
+            <param name="target">
+            The instance whose <paramref name="method"/> is to be
+            (re)implemented.
+            </param>
+            <param name="method">
+            The method that is to be (re)implemented.
+            </param>
+            <param name="arguments">The target method's arguments.</param>
+            <returns>The result of the object lookup.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractMethodReplacer.GetOverride(System.Reflection.MethodInfo)">
+            <summary>
+            Helper method for subclasses to retrieve the appropriate
+            <see cref="T:Spring.Objects.Factory.Support.MethodOverride"/> for the
+            supplied <paramref name="method"/>.  
+            </summary>
+            <param name="method">
+            The <see cref="T:System.Reflection.MethodInfo"/> to use to retrieve
+            the appropriate
+            <see cref="T:Spring.Objects.Factory.Support.MethodOverride"/>.
+            </param>
+            <returns>
+            The appropriate
+            <see cref="T:Spring.Objects.Factory.Support.MethodOverride"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractMethodReplacer.GetObject(System.String)">
+            <summary>
+            Helper method for subclasses to lookup an object from an enclosing
+            IoC container.
+            </summary>
+            <param name="objectName">
+            The name of the object that is to be looked up.
+            </param>
+            <returns>
+            The named object.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.LookupMethodReplacer.#ctor(Spring.Objects.Factory.Support.IConfigurableObjectDefinition,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Objects.Factory.Support.LookupMethodReplacer"/>
+            class.
+            </summary>
+            <param name="objectDefinition">
+            The object definition that is the target of the method replacement.
+            </param>
+            <param name="objectFactory">
+            The enclosing IoC container with which the above
+            <paramref name="objectDefinition"/> is associated.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If either of the supplied arguments is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.LookupMethodReplacer.Implement(System.Object,System.Reflection.MethodInfo,System.Object[])">
+            <summary>
+            Reimplements the supplied <paramref name="method"/> by returning the
+            result of an object lookup in an enclosing IoC container.
+            </summary>
+            <param name="target">
+            The instance whose <paramref name="method"/> is to be
+            (re)implemented.
+            </param>
+            <param name="method">
+            The method that is to be (re)implemented.
+            </param>
+            <param name="arguments">The target method's arguments.</param>
+            <returns>
+            The result of the object lookup.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.PropertyResourceConfigurer">
+            <summary>
+            Allows for the configuration of individual object property values from
+            a .NET .config file.
+            </summary>
+            <remarks>
+            <p>
+            Useful for custom .NET .config files targetted at system administrators
+            that override object properties configured in the application context.
+            </p>
+            <p>
+            Two concrete implementations are provided in the Spring.NET core library:
+            <list type="bullet">
+            <item>
+            <description>
+            <see cref="T:Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>
+            for <c>&lt;add key="placeholderKey" value="..."/&gt;</c> style
+            overriding (pushing values from a .NET .config file into object
+            definitions).
+            </description>
+            </item>
+            <item>
+            <description>
+            <see cref="T:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+            for replacing "${...}" placeholders (pulling values from a .NET .config
+            file into object definitions).
+            </description>
+            </item>
+            </list>
+            </p>
+            <p>
+            Please refer to the API documentation for the concrete implementations
+            listed above for example usage.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+            <seealso cref="T:Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>
+            <seealso cref="T:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+            <version>$Id: PropertyResourceConfigurer.cs,v 1.19 2007/08/27 14:49:42 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Config.PropertyResourceConfigurer.DefaultConfigSectionName">
+            <summary>
+            The default configuration section name to use if none is explictly supplied. 
+            </summary>
+            <seealso cref="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.ConfigSections"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyResourceConfigurer.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.PropertyResourceConfigurer"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no
+            public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyResourceConfigurer.PostProcessObjectFactory(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)">
+            <summary>
+            Modify the application context's internal object factory after its
+            standard initialization.
+            </summary>
+            <param name="factory">
+            The object factory used by the application context.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor.PostProcessObjectFactory(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyResourceConfigurer.LoadProperties(System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Loads properties from the configuration sections 
+            specified in <see cref="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.ConfigSections"/> into <paramref name="properties"/>.
+            </summary>
+            <param name="properties">The <see cref="T:System.Collections.Specialized.NameValueCollection"/> instance to be filled with properties.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyResourceConfigurer.ProcessProperties(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Apply the given properties to the supplied
+            <see cref="T:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>.
+            </summary>
+            <param name="factory">
+            The <see cref="T:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>
+            used by the application context.
+            </param>
+            <param name="props">The properties to apply.</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If an error occured.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyResourceConfigurer.ValidateConfigSections(System.String[])">
+            <summary>
+            Validates the supplied <paramref name="configSections"/>.
+            </summary>
+            <remarks>
+            <p>
+            Basically, if external locations are specified, ensure that either
+            one or a like number of config sections are also specified.
+            </p>
+            </remarks>
+            <param name="configSections">
+            The <paramref name="configSections"/> to be validated.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyResourceConfigurer.InitializeWithDefaultProperties(System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Simply initializes the supplied <paramref name="properties"/>
+            collection with this instances default <see cref="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.Properties"/>
+            (if any).
+            </summary>
+            <param name="properties">
+            The collection to be so initialized.
+            </param>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.LastLocationOverrides">
+            <summary>
+            The policy for resolving conflicting property overrides from
+            several resources.
+            </summary>
+            <remarks>
+            <p>
+            When merging conflicting property overrides from several resources,
+            should append an override with the same key be appended to the
+            current value, or should the property override from the last resource
+            processed override previous values?
+            </p>
+            <p>
+            The default value is <see langword="true"/>; i.e. a property
+            override from the last resource to be processed overrides previous
+            values.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if the property override from the last resource
+            processed overrides previous values.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.Order">
+            <summary>
+            Return the order value of this object, where a higher value means greater in
+            terms of sorting.
+            </summary>
+            <returns>The order value.</returns>
+            <seealso cref="P:Spring.Core.IOrdered.Order"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.Properties">
+            <summary>
+            The default properties to be applied.
+            </summary>
+            <remarks>
+            <p>
+            These are to be considered defaults, to be overridden by values
+            loaded from other resources.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.Location">
+            <summary>
+            The location of the .NET .config file that contains the property
+            overrides that are to be applied.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.Locations">
+            <summary>
+            The locations of the .NET .config files containing the property
+            overrides that are to be applied.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.ConfigSections">
+            <summary>
+            The configuration sections to look for within the .config files.
+            </summary>
+            <seealso cref="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.Location"/>
+            <seealso cref="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.Locations"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.IgnoreResourceNotFound">
+            <summary>
+            Should a failure to find a .config file be ignored?
+            </summary>
+            <remarks>
+            <p>
+            <see langword="true"/> is only appropriate if the .config file is
+            completely optional. The default is <see langword="false"/>.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if a failure to find a .config file is to be
+            ignored.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.ObjectReferenceFactoryObject">
+            <summary>
+            An <see cref="T:Spring.Objects.Factory.IFactoryObject"/> implementation
+            that exposes an arbitrary target object under a different name.
+            </summary>
+            <remarks>
+            <p>
+            Usually, the target object will reside in a different object
+            definition file, using this
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> to link it in
+            and expose it under a different name. Effectively, this corresponds
+            to an alias for the target object.
+            </p>
+            <note>
+            For XML based object definition files, a <code>&lt;alias&gt;</code>
+            tag is available that effectively achieves the same.
+            </note>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: ObjectReferenceFactoryObject.cs,v 1.3 2007/03/16 04:01:38 aseovic Exp $</version>
+            <seealso cref="T:Spring.Objects.Factory.IFactoryObject"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectReferenceFactoryObject.GetObject">
+            <summary>
+            Return an instance (possibly shared or independent) of the object
+            managed by this factory.
+            </summary>
+            <returns>
+            An instance (possibly shared or independent) of the object managed by
+            this factory.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IFactoryObject.GetObject"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ObjectReferenceFactoryObject.TargetObjectName">
+            <summary>
+            The name of the target object.
+            </summary>
+            <remarks>
+            <p>
+            The target object may potentially be defined in a different object
+            definition file.
+            </p>
+            </remarks>
+            <value>The name of the target object.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ObjectReferenceFactoryObject.ObjectType">
+            <summary>
+            Return the type of object that this
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> creates, or
+            <see langword="null"/> if not known in advance.
+            </summary>
+            <seealso cref="P:Spring.Objects.Factory.IFactoryObject.ObjectType"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ObjectReferenceFactoryObject.IsSingleton">
+            <summary>
+            Is the object managed by this factory a singleton or a prototype?
+            </summary>
+            <seealso cref="P:Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ObjectReferenceFactoryObject.ObjectFactory">
+            <summary>
+            Callback that supplies the owning factory to an object instance.
+            </summary>
+            <value>
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            (may not be <see langword="null"/>). The object can immediately
+            call methods on the factory.
+            </value>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of initialization errors.
+            </exception>
+            <seealso cref="P:Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.LogFactoryObject">
+            <summary>
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> implementation that
+            creates instances of the <see cref="T:Common.Logging.ILog"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Typically used for retrieving shared <see cref="T:Common.Logging.ILog"/>
+            instances for common topics (such as the 'DAL', 'BLL', etc). The
+            <see cref="P:Spring.Objects.Factory.Config.LogFactoryObject.LogName"/>
+            property determines the name of the
+            <a href="http://netcommon.sourceforge.net/">Common.Logging</a> logger.  
+            </p>
+            </remarks>
+            <author>Rick Evans</author>
+            <seealso cref="M:Common.Logging.LogManager.GetLogger(System.String)"/>
+            <version>$Id: LogFactoryObject.cs,v 1.3 2007/10/21 18:17:41 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.LogFactoryObject.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.LogFactoryObject"/>
+            class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.LogFactoryObject.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.LogFactoryObject"/>
+            class.
+            </summary>
+            <param name="logName">
+            The name of the <see cref="T:Common.Logging.ILog"/> instance served up by
+            this factory.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="logName"/> is
+            <see langword="null"/> or contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.LogFactoryObject.GetObject">
+            <summary>
+            Return an instance (possibly shared or independent) of the object
+            managed by this factory.
+            </summary>
+            <returns>
+            An instance (possibly shared or independent) of the object
+            managed by this factory.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IFactoryObject.GetObject"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.LogFactoryObject.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has set all object properties supplied
+            (and satisfied the
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            and <see cref="T:Spring.Context.IApplicationContextAware"/>
+            interfaces).
+            </summary>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as failure to set an essential
+            property) or if initialization fails.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.LogFactoryObject.LogName">
+            <summary>
+            The name of the <see cref="T:Common.Logging.ILog"/> instance served up by
+            this factory.
+            </summary>
+            <value>
+            The name of the <see cref="T:Common.Logging.ILog"/> instance served up by
+            this factory.
+            </value>
+            <exception cref="T:System.ArgumentNullException">
+            If the <see langword="value"/> supplied to the setter is
+            <see langword="null"/> or contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.LogFactoryObject.ObjectType">
+            <summary>
+            Return the type of object that this
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> creates, or
+            <cref lang="null"/> if not known in advance.
+            </summary>
+            <seealso cref="P:Spring.Objects.Factory.IFactoryObject.ObjectType"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.LogFactoryObject.IsSingleton">
+            <summary>
+            Is the object managed by this factory a singleton or a prototype?
+            </summary>
+            <seealso cref="P:Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.AutoWiringMode">
+            <summary>
+            The various autowiring modes.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: AutoWiringMode.cs,v 1.8 2007/03/16 04:01:34 aseovic Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Config.AutoWiringMode.No">
+            <summary>
+            Do not autowire.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Config.AutoWiringMode.ByName">
+            <summary>
+            Autowire by name.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Config.AutoWiringMode.ByType">
+            <summary>
+            Autowire by <see cref="T:System.Type"/>.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Config.AutoWiringMode.Constructor">
+            <summary>
+            Autowiring by constructor.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Config.AutoWiringMode.AutoDetect">
+            <summary>
+            The autowiring strategy is to be determined by introspection
+            of the object's <see cref="T:System.Type"/>.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Events.Support.EventRegistry">
+            <summary>
+            Default implementation of the <see cref="T:Spring.Objects.Events.IEventRegistry"/>
+            interface.
+            </summary>
+            <author>Griffin Caprio</author>
+            <version>$Id: EventRegistry.cs,v 1.7 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Events.Support.EventRegistry.#ctor">
+            <summary>
+            Creates a new instance of the EventRegistry class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Events.Support.EventRegistry.PublishEvents(System.Object)">
+            <summary>
+            Adds the input object to the list of publishers.
+            </summary>
+            <remarks>
+            This publishes <b>all</b> events of the source object to any object
+            wishing to subscribe
+            </remarks>
+            <param name="source">The source object to publish.</param>
+        </member>
+        <member name="M:Spring.Objects.Events.Support.EventRegistry.Subscribe(System.Object)">
+            <summary>
+            Subscribes to <b>all</b> events published, if the subscriber implements
+            compatible handler methods.
+            </summary>
+            <param name="subscriber">The subscriber to use.</param>
+        </member>
+        <member name="M:Spring.Objects.Events.Support.EventRegistry.Subscribe(System.Object,System.Type)">
+            <summary>
+            Subscribes to published events of all objects of a given type, if the
+            subscriber implements compatible handler methods.
+            </summary>
+            <param name="subscriber">The subscriber to use.</param>
+            <param name="sourceType">
+            The target <see cref="T:System.Type"/> to subscribe to.
+            </param>
+        </member>
+        <member name="P:Spring.Objects.Events.Support.EventRegistry.Publishers">
+            <summary>
+            The list of event publishers.
+            </summary>
+            <value>The list of event publishers.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.ResourceHandlerConfigurer">
+            <summary>
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            implementation that allows for convenient registration of custom
+            IResource implementations.
+            </summary>
+            <remarks>
+            <p>
+            Because the <see cref="T:Spring.Objects.Factory.Config.ResourceHandlerConfigurer"/>
+            class implements the
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            interface, instances of this class that have been exposed in the
+            scope of an
+            <see cref="T:Spring.Context.IApplicationContext"/> will
+            <i>automatically</i> be picked up by the application context and made
+            available to the IoC container whenever resolution of IResources is required. 
+            </p>
+            </remarks>
+            <author>Mark Pollack</author>
+            <version>$Id: ResourceHandlerConfigurer.cs,v 1.3 2007/08/08 17:47:13 bbaia Exp $</version>
+            <seealso cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            <seealso cref="T:Spring.Context.IApplicationContext"/>	
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ResourceHandlerConfigurer.PostProcessObjectFactory(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)">
+            <summary>
+            Registers custom IResource implementations.  The supplied
+            <paramref name="factory"/> is not used since IResourse implementations
+            are registered with a global <see cref="T:Spring.Core.IO.ResourceHandlerRegistry"/>
+            </summary>
+            <param name="factory">
+            The object factory.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ResourceHandlerConfigurer.ResourceHandlers">
+            <summary>
+            The IResource implementations, i.e. resource handlers, to register.
+            </summary>
+            <remarks>
+            <p>
+            The <see cref="T:System.Collections.IDictionary"/> has the
+            contains the resource protocol name as the key and type as the value.
+            The key name can either be a string or an object, in which case
+            ToString() will be used to obtain the string name.
+            The value can be the fully qualified name of the IResource 
+            implementation, a string, or
+            an actual <see cref="T:System.Type"/> of the IResource class
+            
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Globalization.IResourceCache">
+            <summary>
+            Defines an interface that resource cache adapters have to implement.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IResourceCache.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.IResourceCache.GetResources(System.Object,System.Globalization.CultureInfo)">
+            <summary>
+            Gets the list of resources from cache.
+            </summary>
+            <param name="target">Target to get a list of resources for.</param>
+            <param name="culture">Resource culture.</param>
+            <returns>A list of cached resources for the specified target object and culture.</returns>
+        </member>
+        <member name="M:Spring.Globalization.IResourceCache.PutResources(System.Object,System.Globalization.CultureInfo,System.Collections.IList)">
+            <summary>
+            Puts the list of resources in the cache.
+            </summary>
+            <param name="target">Target to cache a list of resources for.</param>
+            <param name="culture">Resource culture.</param>
+            <param name="resources">A list of resources to cache.</param>
+            <returns>A list of cached resources for the specified target object and culture.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpOR">
+            <summary>
+            Represents logical OR operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpOR.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpOR.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpOR.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpOR.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical OR operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpADD">
+            <summary>
+            Represents arithmetic addition operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpADD.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpADD.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpADD.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpADD.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the arithmetic addition operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.ListInitializerNode">
+            <summary>
+            Represents parsed list initializer node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ListInitializerNode.cs,v 1.4 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.ListInitializerNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.ListInitializerNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.ListInitializerNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Creates new instance of the list defined by this node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.Processors.DistinctProcessor">
+            <summary>
+            Implementation of the distinct processor.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DistinctProcessor.cs,v 1.1 2006/12/04 08:58:33 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.Processors.DistinctProcessor.Process(System.Collections.ICollection,System.Object[])">
+            <summary>
+            Returns distinct items from the collection.
+            </summary>
+            <param name="source">
+            The source collection to process.
+            </param>
+            <param name="args">
+            0: boolean flag specifying whether to include <c>null</c>
+            in the results or not. Default is false, which means that
+            <c>null</c> values will not be included in the results.
+            </param>
+            <returns>
+            A collection containing distinct source collection elements.
+            </returns>
+            <exception cref="T:System.ArgumentException">
+            If there is more than one argument, or if the single optional argument 
+            is not <b>Boolean</b>.
+            </exception>
+        </member>
+        <member name="T:Spring.Expressions.Processors.NonNullProcessor">
+            <summary>
+            Implementation of the non-null processor.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: NonNullProcessor.cs,v 1.2 2007/07/31 21:43:52 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.Processors.NonNullProcessor.Process(System.Collections.ICollection,System.Object[])">
+            <summary>
+            Returns non-null items from the collection.
+            </summary>
+            <param name="source">
+            The source collection to process.
+            </param>
+            <param name="args">
+            Ignored.
+            </param>
+            <returns>
+            A collection containing non-null source collection elements.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.MethodInvocationException">
+            <summary>
+            Thrown when a method (typically a property getter or setter invoked via reflection)
+            throws an exception, analogous to a <see cref="T:System.Reflection.TargetInvocationException"/>.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: MethodInvocationException.cs,v 1.1 2007/07/31 00:08:42 markpollack Exp $
+            </version>
+        </member>
+        <member name="M:Spring.Core.MethodInvocationException.#ctor">
+            <summary>
+            Creates a new instance of the MethodInvocationException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.MethodInvocationException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the MethodInvocationException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Core.MethodInvocationException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the MethodInvocationException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Core.MethodInvocationException.#ctor(System.Exception,Spring.Core.PropertyChangeEventArgs)">
+            <summary>
+            Constructor to use when an exception results from a
+            <see cref="T:System.ComponentModel.PropertyChangedEventArgs"/>.
+            </summary>
+            <param name="ex">
+            The <see cref="T:System.Exception"/> raised by the invoked property.
+            </param>
+            <param name="argument">
+            The <see cref="T:System.ComponentModel.PropertyChangedEventArgs"/> that
+            resulted in an exception.
+            </param>
+        </member>
+        <member name="M:Spring.Core.MethodInvocationException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the MethodInvocationException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="P:Spring.Core.MethodInvocationException.ErrorCode">
+            <summary>
+            The error code string for this exception.
+            </summary>
+        </member>
+        <member name="T:Spring.Core.IO.AbstractResource">
+            <summary>
+            Convenience base class for <see cref="T:Spring.Core.IO.IResource"/>
+            implementations, pre-implementing typical behavior.
+            </summary>
+            <remarks>
+            <p>
+            The <see cref="P:Spring.Core.IO.AbstractResource.Exists"/> method will
+            check whether a <see cref="T:System.IO.FileInfo"/> or
+            <see cref="T:System.IO.Stream"/> can be opened;
+            <see cref="P:Spring.Core.IO.AbstractResource.IsOpen"/> will always return
+            <see langword="false"/>;
+            <see cref="P:Spring.Core.IO.AbstractResource.Uri"/> and
+            <see cref="P:Spring.Core.IO.AbstractResource.File"/> throw an exception;
+            and <see cref="M:Spring.Core.IO.AbstractResource.ToString"/> will
+            return the value of the
+            <see cref="P:Spring.Core.IO.IResource.Description"/> property.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: AbstractResource.cs,v 1.25 2007/12/06 22:08:47 markpollack Exp $</version>
+            <seealso cref="T:Spring.Core.IO.IResource"/>
+        </member>
+        <member name="T:Spring.Core.IO.IResource">
+            <summary>
+            The central abstraction for Spring.NET's access to resources such as
+            <see cref="T:System.IO.Stream"/>s.
+            </summary>
+            <remarks>
+            <p>
+            This interface encapsulates a resource descriptor that abstracts away
+            from the underlying type of resource; possible resource types include
+            files, memory streams, and databases (this list is not exhaustive).
+            </p>
+            <p>
+            A <see cref="T:System.IO.Stream"/> can definitely be opened and accessed
+            for every such resource; if the resource exists in a physical form (for
+            example, the resource is not an in-memory stream or one that has been
+            extracted from an assembly or ZIP file), a <see cref="T:System.Uri"/> or
+            <see cref="T:System.IO.FileInfo"/> can also be accessed. The actual
+            behavior is implementation-specific.
+            </p>
+            <p>
+            This interface, when used in tandem with the
+            <see cref="T:Spring.Core.IO.IResourceLoader"/> interface, forms the backbone of
+            Spring.NET's resource handling. Third party extensions or libraries
+            that want to integrate external resources with Spring.NET's IoC
+            container are encouraged expose such resources via this abstraction.
+            </p>
+            <p>
+            Interfaces cannot obviously mandate implementation, but derived classes
+            are <b>strongly</b> encouraged to expose a constructor that takes a
+            single <see cref="T:System.String"/> as it's sole argument (see example).
+            Exposing such a constructor will make your custom
+            <see cref="T:Spring.Core.IO.IResource"/> implementation integrate nicely
+            with the <see cref="T:Spring.Core.IO.ConfigurableResourceLoader"/> class.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IResource.cs,v 1.12 2007/08/08 17:46:55 bbaia Exp $</version>
+            <seealso cref="T:Spring.Core.IO.IResourceLoader"/>
+            <seealso cref="T:Spring.Core.IO.ConfigurableResourceLoader"/>
+        </member>
+        <member name="T:Spring.Core.IO.IInputStreamSource">
+            <summary>
+            Simple interface for objects that are sources for
+            <see cref="T:System.IO.Stream"/>s.
+            </summary>
+            <remarks>
+            <p>
+            This is the base interface for the abstraction encapsulated by
+            Spring.NET's <see cref="T:Spring.Core.IO.IResource"/> interface.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IInputStreamSource.cs,v 1.10 2007/08/08 17:46:55 bbaia Exp $</version>
+            <seealso cref="T:Spring.Core.IO.IResource"/>
+        </member>
+        <member name="P:Spring.Core.IO.IInputStreamSource.InputStream">
+            <summary>
+            Return an <see cref="T:System.IO.Stream"/> for this resource.
+            </summary>
+            <remarks>
+            <note type="caution">
+            Clients of this interface must be aware that every access of this
+            property will create a <i>fresh</i> <see cref="T:System.IO.Stream"/>;
+            it is the responsibility of the calling code to close any such
+            <see cref="T:System.IO.Stream"/>.
+            </note>
+            </remarks>
+            <value>
+            An <see cref="T:System.IO.Stream"/>.
+            </value>
+            <exception cref="T:System.IO.IOException">
+            If the stream could not be opened.
+            </exception>
+        </member>
+        <member name="M:Spring.Core.IO.IResource.CreateRelative(System.String)">
+            <summary>
+            Creates a resource relative to this resource.
+            </summary>
+            <param name="relativePath">
+            The path (always resolved as relative to this resource).
+            </param>
+            <returns>
+            The relative resource.
+            </returns>
+            <exception cref="T:System.IO.IOException">
+            If the relative resource could not be created from the supplied
+            path.
+            </exception>
+            <exception cref="T:System.NotSupportedException">
+            If the resource does not support the notion of a relative path.
+            </exception>
+        </member>
+        <member name="P:Spring.Core.IO.IResource.IsOpen">
+            <summary>
+            Does this resource represent a handle with an open stream?
+            </summary>
+            <remarks>
+            <p>
+            If <see langword="true"/>, the <see cref="T:System.IO.Stream"/>
+            cannot be read multiple times, and must be read and then closed to
+            avoid resource leaks.
+            </p>
+            <p>
+            Will be <see langword="false"/> for all usual resource descriptors.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if this resource represents a handle with an
+            open stream.
+            </value>
+            <seealso cref="P:Spring.Core.IO.IInputStreamSource.InputStream"/>
+        </member>
+        <member name="P:Spring.Core.IO.IResource.Uri">
+            <summary>
+            Returns the <see cref="T:System.Uri"/> handle for this resource.
+            </summary>
+            <remarks>
+            <p>
+            For safety, always check the value of the
+            <see cref="P:Spring.Core.IO.IResource.Exists"/> property prior to
+            accessing this property; resources that cannot be exposed as 
+            a <see cref="T:System.Uri"/> will typically return
+            <see langword="false"/> from a call to the
+            <see cref="P:Spring.Core.IO.IResource.Exists"/> property.
+            </p>
+            </remarks>
+            <value>
+            The <see cref="T:System.Uri"/> handle for this resource.
+            </value>
+            <exception cref="T:System.IO.IOException">
+            If the resource is not available or cannot be exposed as a
+            <see cref="T:System.Uri"/>.
+            </exception>
+            <seealso cref="T:Spring.Core.IO.IResource"/>
+            <seealso cref="P:Spring.Core.IO.IResource.Exists"/>
+        </member>
+        <member name="P:Spring.Core.IO.IResource.File">
+            <summary>
+            Returns a <see cref="T:System.IO.FileInfo"/> handle for this resource.
+            </summary>
+            <remarks>
+            <p>
+            For safety, always check the value of the
+            <see cref="P:Spring.Core.IO.IResource.Exists"/> property prior to
+            accessing this property; resources that cannot be exposed as 
+            a <see cref="T:System.IO.FileInfo"/> will typically return
+            <see langword="false"/> from a call to the
+            <see cref="P:Spring.Core.IO.IResource.Exists"/> property.
+            </p>
+            </remarks>
+            <value>
+            The <see cref="T:System.IO.FileInfo"/> handle for this resource.
+            </value>
+            <exception cref="T:System.IO.IOException">
+            If the resource is not available on a filesystem, or cannot be
+            exposed as a <see cref="T:System.IO.FileInfo"/> handle.
+            </exception>
+            <seealso cref="T:Spring.Core.IO.IResource"/>
+            <seealso cref="P:Spring.Core.IO.IResource.Exists"/>
+        </member>
+        <member name="P:Spring.Core.IO.IResource.Description">
+            <summary>
+            Returns a description for this resource.
+            </summary>
+            <remarks>
+            <p>
+            The description is typically used for diagnostics and other such
+            logging when working with the resource.
+            </p>
+            <p>
+            Implementations are also encouraged to return this value from their
+            <see cref="M:System.Object.ToString"/> method.
+            </p>
+            </remarks>
+            <value>
+            A description for this resource.
+            </value>
+        </member>
+        <member name="P:Spring.Core.IO.IResource.Exists">
+            <summary>
+            Does this resource actually exist in physical form?
+            </summary>
+            <remarks>
+            <p>
+            An example of a resource that physically exists would be a
+            file on a local filesystem. An example of a resource that does not
+            physically exist would be an in-memory stream.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if this resource actually exists in physical
+            form (for example on a filesystem).
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.File"/>
+            <seealso cref="P:Spring.Core.IO.IResource.Uri"/>
+        </member>
+        <member name="F:Spring.Core.IO.AbstractResource.DefaultBasePathPlaceHolder">
+            <summary>
+            The default special character that denotes the base (home, or root)
+            path.
+            </summary>
+            <remarks>
+            <p>
+            Will be resolved (by those <see cref="T:Spring.Core.IO.IResource"/>
+            implementations that support it) to the home (or root) path for
+            the specific <see cref="T:Spring.Core.IO.IResource"/> implementation.
+            </p>
+            <p>
+            For example, in the case of a web application this will (probably)
+            resolve to the virtual directory of said web application.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Core.IO.AbstractResource.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.IO.AbstractResource"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no
+            public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Core.IO.AbstractResource.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.IO.AbstractResource"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no
+            public constructors.
+            </p>
+            </remarks>
+            <param name="resourceName">
+            A string representation of the resource.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="resourceName"/> is
+            <see langword="null"/> or contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Core.IO.AbstractResource.GetResourceNameWithoutProtocol(System.String)">
+            <summary>
+            Strips any protocol name from the supplied
+            <paramref name="resourceName"/>.
+            </summary>
+            <remarks>
+            <p>
+            If the supplied <paramref name="resourceName"/> does not
+            have any protocol associated with it, then the supplied
+            <paramref name="resourceName"/> will be returned as-is.
+            </p>
+            </remarks>
+            <example>
+            <code language="C#">
+            GetResourceNameWithoutProtocol("http://www.mycompany.com/resource.txt");
+            	// returns www.mycompany.com/resource.txt
+            </code>
+            </example>
+            <param name="resourceName">
+            The name of the resource.
+            </param>
+            <returns>
+            The name of the resource without the protocol name.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.AbstractResource.ResolveResourceNameWithoutProtocol(System.String)">
+            <summary>
+            Resolves the supplied <paramref name="resourceName"/> to its value
+            sans any leading protocol.
+            </summary>
+            <param name="resourceName">
+            The name of the resource.
+            </param>
+            <returns>
+            The name of the resource without the protocol name.
+            </returns>
+            <see cref="M:Spring.Core.IO.AbstractResource.GetResourceNameWithoutProtocol(System.String)"/>
+        </member>
+        <member name="M:Spring.Core.IO.AbstractResource.ResolveBasePathPlaceHolder(System.String,System.String)">
+            <summary>
+            Resolves the presence of the
+            <paramref name="basePathPlaceHolder"/> value
+            in the supplied <paramref name="resourceName"/> into a path.
+            </summary>
+            <remarks>
+            <p>
+            The default implementation simply returns the supplied
+            <paramref name="resourceName"/> as is.
+            </p>
+            </remarks>
+            <param name="resourceName">
+            The name of the resource.
+            </param>
+            <param name="basePathPlaceHolder">
+            The string that is a placeholder for a base path.
+            </param>
+            <returns>
+            The name of the resource with any <paramref name="basePathPlaceHolder"/>
+            value having been resolved into an actual path.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.AbstractResource.ToString">
+            <summary>
+            This implementation returns the
+            <see cref="P:Spring.Core.IO.AbstractResource.Description"/> of this resource.
+            </summary>
+            <seealso cref="P:Spring.Core.IO.IResource.Description"/>
+        </member>
+        <member name="M:Spring.Core.IO.AbstractResource.Equals(System.Object)">
+            <summary>
+            Determines whether the specified <see cref="T:System.Object"/> is
+            equal to the current <see cref="T:System.Object"/>.
+            </summary>
+            <remarks>
+            <p>
+            This implementation compares <see cref="P:Spring.Core.IO.AbstractResource.Description"/> values.
+            </p>
+            </remarks>
+            <seealso cref="P:Spring.Core.IO.IResource.Description"/>
+        </member>
+        <member name="M:Spring.Core.IO.AbstractResource.GetHashCode">
+            <summary>
+            Serves as a hash function for a particular type, suitable for use
+            in hashing algorithms and data structures like a hash table. 
+            </summary>
+            <remarks>
+            <p>
+            This implementation returns the hashcode of the
+            <see cref="P:Spring.Core.IO.AbstractResource.Description"/> property.
+            </p>
+            </remarks>
+            <seealso cref="P:Spring.Core.IO.IResource.Description"/>
+        </member>
+        <member name="M:Spring.Core.IO.AbstractResource.CreateResourceInstance(System.String)">
+            <summary>
+            Factory Method. Create a new instance of the current resource type using the given resourceName
+            </summary>
+        </member>
+        <member name="M:Spring.Core.IO.AbstractResource.GetResourceLoader">
+            <summary>
+            The ResourceLoader to be used for resolving relative resources
+            </summary>
+        </member>
+        <member name="M:Spring.Core.IO.AbstractResource.IsRelativeResource(System.String)">
+            <summary>
+            Does the supplied <paramref name="resourceName"/> relative ?
+            </summary>
+            <param name="resourceName">
+            The name of the resource to test.
+            </param>
+            <returns>
+            <see langword="true"/> if resource name is relative; 
+            otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.AbstractResource.CreateRelative(System.String)">
+            <summary>
+            Creates a new resource that is relative to this resource based on the
+            supplied <paramref name="resourceName"/>.
+            </summary>
+            <remarks>
+            <p>
+            This method can accept either a fully qualified resource name or a
+            relative resource name as it's parameter.
+            </p>
+            <p>
+            A fully qualified resource is one that has a protocol prefix and
+            all elements of the resource name. All other resources are treated
+            as relative to this resource, and the following rules are used to
+            locate a relative resource:
+            </p>
+            <list type="bullet">
+                <item>
+                If the <paramref name="resourceName"/> starts with <c>'..'</c>,
+                the current resource path is navigated backwards before the
+                <paramref name="resourceName"/> is concatenated to the current
+                <see cref="P:Spring.Core.IO.AbstractResource.ResourcePath"/> of
+                this resource.
+                </item>
+                <item>
+                If the <paramref name="resourceName"/> starts with '/', the
+                current resource path is ignored and a new resource name is
+                appended to the
+                <see cref="P:Spring.Core.IO.AbstractResource.RootLocation"/> of
+                this resource.
+                </item>
+                <item>
+                If the <paramref name="resourceName"/> starts with '.' or a
+                letter, a new path is appended to the current 
+                <see cref="P:Spring.Core.IO.AbstractResource.ResourcePath"/> of
+                this resource.
+                </item>
+            </list>
+            </remarks>
+            <param name="resourceName">
+            The name of the resource to create.
+            </param>
+            <returns>The relative resource.</returns>
+            <exception cref="T:System.UriFormatException">
+            If the process of resolving the relative resource yielded an
+            invalid URI.
+            </exception>
+            <exception cref="T:System.NotSupportedException">
+            If this resource does not support the resolution of relative
+            resources (as determined by the value of the
+            <see cref="P:Spring.Core.IO.AbstractResource.SupportsRelativeResources"/>
+            property).
+            </exception>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.ResourcePath"/>
+        </member>
+        <member name="M:Spring.Core.IO.AbstractResource.CalculateResourcePath(System.String)">
+            <summary>
+            Calculates a new resource path based on the supplied
+            <paramref name="relativePath"/>.
+            </summary>
+            <param name="relativePath">
+            The relative path to evaluate.
+            </param>
+            <returns>The newly calculated resource path.</returns>
+        </member>
+        <member name="P:Spring.Core.IO.AbstractResource.BasePathPlaceHolder">
+            <summary>
+            The special character that denotes the base (home, or root)
+            path.
+            </summary>
+            <remarks>
+            <p>
+            Will be resolved (by those <see cref="T:Spring.Core.IO.IResource"/>
+            implementations that support it) to the home (or root) path for
+            the specific <see cref="T:Spring.Core.IO.IResource"/> implementation.
+            </p>
+            <p>
+            For example, in the case of a web application this will (probably)
+            resolve to the virtual directory of said web application.
+            </p>
+            </remarks>
+            <seealso cref="F:Spring.Core.IO.AbstractResource.DefaultBasePathPlaceHolder"/>
+        </member>
+        <member name="P:Spring.Core.IO.AbstractResource.InputStream">
+            <summary>
+            Return an <see cref="T:System.IO.Stream"/> for this resource.
+            </summary>
+            <value>
+            An <see cref="T:System.IO.Stream"/>.
+            </value>
+            <exception cref="T:System.IO.IOException">
+            If the stream could not be opened.
+            </exception>
+            <seealso cref="P:Spring.Core.IO.IInputStreamSource.InputStream"/>
+        </member>
+        <member name="P:Spring.Core.IO.AbstractResource.Description">
+            <summary>
+            Returns a description for this resource.
+            </summary>
+            <value>
+            A description for this resource.
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.Description"/>
+        </member>
+        <member name="P:Spring.Core.IO.AbstractResource.Protocol">
+            <summary>
+            Returns the protocol associated with this resource (if any).
+            </summary>
+            <remarks>
+            <p>
+            The value of this property may be <see langword="null"/> if no
+            protocol is associated with the resource type (for example if the
+            resource is a memory stream).
+            </p>
+            </remarks>
+            <value>
+            The protocol associated with this resource (if any).
+            </value>
+        </member>
+        <member name="P:Spring.Core.IO.AbstractResource.IsOpen">
+            <summary>
+            Does this resource represent a handle with an open stream?
+            </summary>
+            <remarks>
+            <p>
+            This, the default implementation, always returns
+            <see langword="false"/>.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if this resource represents a handle with an
+            open stream.
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.IsOpen"/>
+        </member>
+        <member name="P:Spring.Core.IO.AbstractResource.Uri">
+            <summary>
+            Returns the <see cref="T:System.Uri"/> handle for this resource.
+            </summary>
+            <remarks>
+            <p>
+            This, the default implementation, always throws a
+            <see cref="T:System.IO.FileNotFoundException"/>, assuming that the
+            resource cannot be exposed as a <see cref="T:System.Uri"/>.
+            </p>
+            </remarks>
+            <value>
+            The <see cref="T:System.Uri"/> handle for this resource.
+            </value>
+            <exception cref="T:System.IO.FileNotFoundException">
+            This, the default implementation, <b>always</b> throws a
+            <see cref="T:System.IO.FileNotFoundException"/>.
+            </exception>
+            <seealso cref="P:Spring.Core.IO.IResource.Uri"/>
+        </member>
+        <member name="P:Spring.Core.IO.AbstractResource.File">
+            <summary>
+            Returns a <see cref="T:System.IO.FileInfo"/> handle for this resource.
+            </summary>
+            <remarks>
+            <p>
+            This, the default implementation, always throws a
+            <see cref="T:System.IO.FileNotFoundException"/>, assuming that the
+            resource cannot be resolved to an absolute file path.
+            </p>
+            </remarks>
+            <value>
+            The <see cref="T:System.IO.FileInfo"/> handle for this resource.
+            </value>
+            <exception cref="T:System.IO.FileNotFoundException">
+            This implementation <b>always</b> throws a
+            <see cref="T:System.IO.FileNotFoundException"/>.
+            </exception>
+            <seealso cref="T:Spring.Core.IO.IResource"/>
+            <see cref="P:Spring.Core.IO.IResource.Exists"/>
+        </member>
+        <member name="P:Spring.Core.IO.AbstractResource.Exists">
+            <summary>
+            Does this resource actually exist in physical form?
+            </summary>
+            <remarks>
+            <p>
+            This implementation checks whether a <see cref="T:System.IO.FileInfo"/>
+            can be opened, falling back to whether a
+            <see cref="T:System.IO.Stream"/> can be opened.
+            </p>
+            <p>
+            This will cover both directories and content resources.
+            </p>
+            <p>
+            This implementation will also return <see langword="false"/> if
+            permission to the (file's) path is denied.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if this resource actually exists in physical
+            form (for example on a filesystem).
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.Exists"/>
+            <seealso cref="P:Spring.Core.IO.IResource.File"/>
+        </member>
+        <member name="P:Spring.Core.IO.AbstractResource.SupportsRelativeResources">
+            <summary>
+            Does this <see cref="T:Spring.Core.IO.IResource"/> support relative
+            resource retrieval?
+            </summary>
+            <remarks>
+            <p>
+            This property is generally to be consulted prior to attempting
+            to attempting to access a resource that is relative to this
+            resource (via a call to
+            <see cref="M:Spring.Core.IO.IResource.CreateRelative(System.String)"/>).
+            </p>
+            <p>
+            This, the default implementation, always returns
+            <see langword="false"/>.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if this
+            <see cref="T:Spring.Core.IO.IResource"/> supports relative resource
+            retrieval.
+            </value>
+        </member>
+        <member name="P:Spring.Core.IO.AbstractResource.RootLocation">
+            <summary>
+            Gets the root location of the resource.
+            </summary>
+            <remarks>
+            <p>
+            Where root resource can be taken to mean that part of the resource
+            descriptor that doesn't change when a relative resource is looked
+            up. Examples of such a root location would include a drive letter,
+            a web server name, an assembly name, etc.
+            </p>
+            </remarks>
+            <value>
+            The root location of the resource.
+            </value>
+            <exception cref="T:System.NotSupportedException">
+            This, the default implementation, <b>always</b> throws a
+            <see cref="T:System.NotSupportedException"/>.
+            </exception>
+        </member>
+        <member name="P:Spring.Core.IO.AbstractResource.ResourcePath">
+            <summary>
+            Gets the current path of the resource.
+            </summary>
+            <remarks>
+            <p>
+            An example value of this property would be the name of the
+            directory containing a filesystem based resource.
+            </p>
+            </remarks>
+            <value>
+            The current path of the resource.
+            </value>
+            <exception cref="T:System.NotSupportedException">
+            This, the default implementation, <b>always</b> throws a
+            <see cref="T:System.NotSupportedException"/>.
+            </exception>
+        </member>
+        <member name="P:Spring.Core.IO.AbstractResource.PathSeparatorChars">
+            <summary>
+            Gets those characters that are valid path separators for the
+            resource type.
+            </summary>
+            <remarks>
+            <p>
+            An example value of this property would be the
+            <see cref="F:System.IO.Path.DirectorySeparatorChar"/> and
+            <see cref="F:System.IO.Path.AltDirectorySeparatorChar"/> values for a
+            filesystem based resource.
+            </p>
+            <p>
+            Any derived classes that override this method are expected to
+            return a new array for each access of this property.
+            </p>
+            </remarks>
+            <value>
+            Those characters that are valid path separators for the resource
+            type.
+            </value>
+            <exception cref="T:System.NotSupportedException">
+            This, the default implementation, <b>always</b> throws a
+            <see cref="T:System.NotSupportedException"/>.
+            </exception>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader">
+            <summary>
+            XML resource reader. 
+            </summary>
+            <remarks>
+            <p>
+            Navigates through an XML resource and invokes parsers registered
+            with the <see cref="T:Spring.Objects.Factory.Xml.NamespaceParserRegistry"/>.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: DefaultObjectDefinitionDocumentReader.cs,v 1.9 2007/08/27 14:49:43 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.IObjectDefinitionDocumentReader">
+            <summary>
+            SPI for parsing an XML document that contains Spring object definitions.
+            Used by <see cref="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/> for actually parsing a DOM
+            document.
+            </summary>
+            <remarks>Instantiated per document to parse:  Implementations can hold state in
+            instance variables during the execution of the <code>RegisterObjectDefinitions</code>
+            method, for example global settings that are defined for all object definitions
+            in the document.
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rob Harrop</author>
+            <author>Mark Pollack (.NET)</author>
+            
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.IObjectDefinitionDocumentReader.RegisterObjectDefinitions(System.Xml.XmlDocument,Spring.Objects.Factory.Xml.XmlReaderContext)">
+            <summary>
+            Read object definitions from the given DOM element, and register
+            them with the given object registry.
+            </summary>
+            <param name="doc">The DOM element containing object definitions, usually the
+            root (document) element.</param>
+            <param name="readerContext">The current context of the reader.  Includes 
+            the resource being parsed</param>
+            <returns>
+            The number of object definitions that were loaded.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of parsing errors.
+            </exception>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader.log">
+            <summary>
+            The shared <see cref="T:Common.Logging.ILog"/> instance for this class (and derived classes). 
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader.#ctor">
+            <summary>
+            Creates a new instance of the DefaultObjectDefinitionDocumentReader class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader.RegisterObjectDefinitions(System.Xml.XmlDocument,Spring.Objects.Factory.Xml.XmlReaderContext)">
+            <summary>
+            Read object definitions from the given DOM element, and register
+            them with the given object registry.
+            </summary>
+            <param name="doc">The DOM element containing object definitions, usually the
+            root (document) element.</param>
+            <param name="readerContext">The current context of the reader.  Includes
+            the resource being parsed</param>
+            <returns>
+            The number of object definitions that were loaded.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of parsing errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader.ParseObjectDefinitions(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parses object definitions starting at the given <see cref="T:System.Xml.XmlElement"/> 
+            using the passed <see cref="T:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper"/>.
+            </summary>
+            <param name="root">The root element to start parsing from.</param>
+            <param name="helper">The <see cref="T:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper"/> instance to use.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader.ParseDefaultElement(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parses the default element.
+            </summary>
+            <param name="element">The element.</param>
+            <param name="helper">The helper.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader.ImportObjectDefinitionResource(System.Xml.XmlElement)">
+            <summary>
+            Loads external XML object definitions from the resource described by the supplied
+            <paramref name="resource"/>.
+            </summary>
+            <param name="resource">The XML element describing the resource.</param>
+            <exception cref="T:Spring.Objects.Factory.ObjectDefinitionStoreException">
+            If the resource could not be imported.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader.ParseAlias(System.Xml.XmlElement,Spring.Objects.Factory.Support.IObjectDefinitionRegistry)">
+            <summary>
+            Parses the given alias element, registering the alias with the registry.
+            </summary>
+            <param name="aliasElement">The alias element.</param>
+            <param name="registry">The registry.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader.RegisterObjectDefinition(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parse an object definition and register it with the object factory..
+            </summary>
+            <param name="element">The element containing the object definition.</param>
+            <param name="helper">The helper.</param>
+            <seealso cref="M:Spring.Objects.Factory.Support.ObjectDefinitionReaderUtils.RegisterObjectDefinition(Spring.Objects.Factory.Config.ObjectDefinitionHolder,Spring.Objects.Factory.Support.IObjectDefinitionRegistry)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader.PostProcessXml(System.Xml.XmlElement)">
+            <summary>
+            <para>
+            Allow the XML to be extensible by processing any custom element types last,
+            after we finished processing the objct definitions. This method is a natural
+            extension point for any other custom post-processing of the XML.
+            </para><para>
+            The default implementation is empty. Subclasses can override this method to
+            convert custom elements into standard Spring object definitions, for example.
+            Implementors have access to the parser's object definition reader and the
+            underlying XML resource, through the corresponding properties.
+            </para>
+            </summary>
+            <param name="root">The root.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader.PreProcessXml(System.Xml.XmlElement)">
+            <summary>
+            Allow the XML to be extensible by processing any custom element types first,
+            before we start to process the object definitions.
+            </summary>
+            <remarks>This method is a natural
+            extension point for any other custom pre-processing of the XML.
+            <p>The default implementation is empty. Subclasses can override this method to
+            convert custom elements into standard Spring object definitions, for example.
+            Implementors have access to the parser's object definition reader and the
+            underlying XML resource, through the corresponding properties.
+            </p>
+            </remarks>
+            <param name="root">The root element of the XML document.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader.CreateHelper(Spring.Objects.Factory.Xml.XmlReaderContext,System.Xml.XmlElement)">
+            <summary>
+            Creates an <see cref="T:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper"/> instance for the given <paramref name="readerContext"/> and <paramref name="root"/> element.
+            </summary>
+            <param name="readerContext">the <see cref="T:Spring.Objects.Factory.Xml.XmlReaderContext"/> to create the <see cref="T:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper"/> </param>
+            <param name="root">the root <see cref="T:System.Xml.XmlElement"/> to start reading from</param>
+            <returns>a new <see cref="T:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper"/> instance</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader.ReaderContext">
+            <summary>
+            Gets the reader context.
+            </summary>
+            <value>The reader context.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy">
+            <summary>
+            An <see cref="T:Spring.Objects.Factory.Support.IInstantiationStrategy"/>
+            implementation that supports method injection.
+            </summary>
+            <remarks>
+            <p>
+            Classes that want to take advantage of method injection must meet some
+            stringent criteria. Every method that is to be method injected
+            <b>must</b> be defined as either <see lang="virtual"/> or
+            <see lang="abstract"/>. An <see cref="T:Spring.Objects.ObjectsException"/>
+            will be thrown if these criteria are not met.
+            </p>
+            </remarks>
+            <author>Rick Evans</author>
+            <version>$Id: MethodInjectingInstantiationStrategy.cs,v 1.13 2008/05/02 16:44:44 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.SimpleInstantiationStrategy">
+            <summary>
+            Simple object instantiation strategy for use in
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> implementations.
+            </summary>
+            <remarks>
+            <p>
+            Does not support method injection, although it provides hooks for subclasses
+            to override to add method injection support, for example by overriding methods.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: SimpleInstantiationStrategy.cs,v 1.18 2008/04/07 00:30:34 bbaia Exp $</version>
+            <seealso cref="T:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy"/> 
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.SimpleInstantiationStrategy.log">
+            <summary>
+            The shared <see cref="T:Common.Logging.ILog"/> instance for this class (and derived classes).
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.SimpleInstantiationStrategy.Instantiate(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Instantiate an instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </summary>
+            <param name="definition">
+            The definition of the object that is to be instantiated.
+            </param>
+            <param name="name">
+            The name associated with the object definition. The name can be the null
+            or zero length string if we're autowiring an object that doesn't belong
+            to the supplied <paramref name="factory"/>.
+            </param>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            </param>
+            <returns>
+            An instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.SimpleInstantiationStrategy.GetZeroArgConstructorInfo(System.Type)">
+            <summary>
+            Gets the zero arg ConstructorInfo object, if the type offers such functionality.
+            </summary>
+            <param name="type">The type.</param>
+            <returns>Zero argument ConstructorInfo</returns>
+            <exception cref="T:Spring.Util.FatalReflectionException">
+            If the type does not have a zero-arg constructor.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.SimpleInstantiationStrategy.Instantiate(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory,System.Reflection.ConstructorInfo,System.Object[])">
+            <summary>
+            Instantiate an instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </summary>
+            <param name="definition">
+            The definition of the object that is to be instantiated.
+            </param>
+            <param name="name">
+            The name associated with the object definition. The name can be the null
+            or zero length string if we're autowiring an object that doesn't belong
+            to the supplied <paramref name="factory"/>.
+            </param>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            </param>
+            <param name="constructor">
+            The <see cref="T:System.Reflection.ConstructorInfo"/> to be used to instantiate
+            the object.
+            </param>
+            <param name="arguments">
+            Any arguments to the supplied <paramref name="constructor"/>. May be null.
+            </param>
+            <returns>
+            An instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.SimpleInstantiationStrategy.Instantiate(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory,System.Reflection.MethodInfo,System.Object[])">
+            <summary>
+            Instantiate an instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </summary>
+            <param name="definition">
+            The definition of the object that is to be instantiated.
+            </param>
+            <param name="name">
+            The name associated with the object definition. The name can be the null
+            or zero length string if we're autowiring an object that doesn't belong
+            to the supplied <paramref name="factory"/>.
+            </param>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            </param>
+            <param name="factoryMethod">
+            The <see cref="T:System.Reflection.MethodInfo"/> to be used to get the object.
+            </param>
+            <param name="arguments">
+            Any arguments to the supplied <paramref name="factoryMethod"/>. May be null.
+            </param>
+            <returns>
+            An instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.SimpleInstantiationStrategy.InstantiateWithMethodInjection(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Instantiate an instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>,
+            injecting methods as appropriate.
+            </summary>
+            <remarks>
+            <p>
+            The default implementation of this method is to throw a
+            <see cref="T:System.InvalidOperationException"/>.
+            </p>
+            <p>
+            Derived classes can override this method if they can instantiate an object
+            with the Method Injection specified in the supplied
+            <paramref name="definition"/>. Instantiation should use a no-arg constructor.
+            </p>
+            </remarks>
+            <param name="definition">
+            The definition of the object that is to be instantiated.
+            </param>
+            <param name="objectName">
+            The name associated with the object definition. The name can be a
+            <see lang="null"/> or zero length string if we're autowiring an object that
+            doesn't belong to the supplied <paramref name="factory"/>.
+            </param>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            </param>
+            <returns>
+            An instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.SimpleInstantiationStrategy.InstantiateWithMethodInjection(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory,System.Reflection.ConstructorInfo,System.Object[])">
+            <summary>
+            Instantiate an instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>,
+            injecting methods as appropriate.
+            </summary>
+            <remarks>
+            <p>
+            The default implementation of this method is to throw a
+            <see cref="T:System.InvalidOperationException"/>.
+            </p>
+            <p>
+            Derived classes can override this method if they can instantiate an object
+            with the Method Injection specified in the supplied
+            <paramref name="definition"/>. Instantiation should use the supplied
+            <paramref name="constructor"/> and attendant <paramref name="arguments"/>.
+            </p>
+            </remarks>
+            <param name="definition">
+            The definition of the object that is to be instantiated.
+            </param>
+            <param name="objectName">
+            The name associated with the object definition. The name can be the null
+            or zero length string if we're autowiring an object that doesn't belong
+            to the supplied <paramref name="factory"/>.
+            </param>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            </param>
+            <param name="constructor">
+            The <see cref="T:System.Reflection.ConstructorInfo"/> to be used to instantiate
+            the object.
+            </param>
+            <param name="arguments">
+            Any arguments to the supplied <paramref name="constructor"/>. May be null.
+            </param>
+            <returns>
+            An instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </returns>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.DYNAMIC_ASSEMBLY_NAME">
+            <summary>
+            The name of the dynamic assembly that holds dynamically created code
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.typeCache">
+            <summary>
+            A cache of generated <see cref="T:System.Type"/> instances, keyed on
+            the object name for which the <see cref="T:System.Type"/> was generated.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.InstantiateWithMethodInjection(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Instantiate an instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>,
+            injecting methods as appropriate.
+            </summary>
+            <param name="definition">
+            The definition of the object that is to be instantiated.
+            </param>
+            <param name="objectName">
+            The name associated with the object definition. The name can be the
+            <see lang="null"/> or zero length string if we're autowiring an
+            object that doesn't belong to the supplied
+            <paramref name="factory"/>.
+            </param>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            </param>
+            <returns>
+            An instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.Support.SimpleInstantiationStrategy.InstantiateWithMethodInjection(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory)"/> 
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.InstantiateWithMethodInjection(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory,System.Reflection.ConstructorInfo,System.Object[])">
+            <summary>
+            Instantiate an instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>,
+            injecting methods as appropriate.
+            </summary>
+            <param name="definition">
+            The definition of the object that is to be instantiated.
+            </param>
+            <param name="objectName">
+            The name associated with the object definition. The name can be the
+            <see lang="null"/> or zero length string if we're autowiring an
+            object that doesn't belong to the supplied
+            <paramref name="factory"/>.
+            </param>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            </param>
+            <param name="constructor">
+            The <see cref="T:System.Reflection.ConstructorInfo"/> to be used to instantiate
+            the object.
+            </param>
+            <param name="arguments">
+            Any arguments to the supplied <paramref name="constructor"/>. May be null.
+            </param>
+            <returns>
+            An instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.Support.SimpleInstantiationStrategy.InstantiateWithMethodInjection(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory,System.Reflection.ConstructorInfo,System.Object[])"/> 
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.DoInstantiate(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory,System.Type[],System.Object[])">
+            <summary>
+            Instantiate an instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>,
+            injecting methods as appropriate.
+            </summary>
+            <remarks>
+            <p>
+            This method dynamically generates a subclass that supports method
+            injection for the supplied <paramref name="definition"/>. It then
+            instantiates an new instance of said type using the constructor
+            identified by the supplied <paramref name="ctorParameterTypes"/>,
+            passing the supplied <paramref name="arguments"/> to said
+            constructor. It then manually injects (generic) method replacement
+            and method lookup instances (of <see cref="T:System.Type"/>
+            <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>) into
+            the new instance: those methods that are 'method-injected' will
+            then delegate to the approriate
+            <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>
+            instance to effect the actual method injection.
+            </p>
+            </remarks>
+            <param name="definition">
+            The definition of the object that is to be instantiated.
+            </param>
+            <param name="objectName">
+            The name associated with the object definition. The name can be the
+            <see lang="null"/> or zero length string if we're autowiring an
+            object that doesn't belong to the supplied
+            <paramref name="factory"/>.
+            </param>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            </param>
+            <param name="ctorParameterTypes">
+            The parameter <see cref="T:System.Type"/>s to use to find the
+            appropriate constructor to invoke.
+            </param>
+            <param name="arguments">
+            The aguments that are to be passed to the appropriate constructor
+            when the object is being instantiated.
+            </param>
+            <returns>
+            A new instance of the <see cref="T:System.Type"/> defined by the
+            supplied <paramref name="definition"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.MethodInjectingTypeBuilder">
+            <summary>
+            A <see cref="T:System.Type"/> factory that generates subclasses of those
+            classes that have been configured for the Method-Injection form of
+            Dependency Injection.
+            </summary>
+            <remarks>
+            <p>
+            This class is designed as for <c>one-shot</c> usage; i.e. it must
+            be used to generate <i>exactly</i> one method injected subclass and
+            then discarded (it maintains state in instance fields).
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.MethodInjectingTypeBuilder.MethodReplacementPropertyName">
+            <summary>
+            The name of the generated <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>
+            property (for method replacement).
+            </summary>
+            <remarks>
+            <p>
+            Exists so that clients of this class can use this name to set properties reflectively
+            on the dynamically generated subclass.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.MethodInjectingTypeBuilder.MethodLookupPropertyName">
+            <summary>
+            The name of the generated <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>
+            property (for method lookup).
+            </summary>
+            <remarks>
+            <p>
+            Exists so that clients of this class can use this name to set properties reflectively
+            on the dynamically generated subclass.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.MethodInjectingTypeBuilder.#ctor(System.Reflection.Emit.ModuleBuilder,Spring.Objects.Factory.Support.RootObjectDefinition)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.MethodInjectingTypeBuilder"/> class.
+            </summary>
+            <param name="module">
+            The <see cref="T:System.Reflection.Emit.ModuleBuilder"/> in which
+            the generated <see cref="T:System.Type"/> is to be defined.
+            </param>
+            <param name="objectDefinition">
+            The object definition that is the target of the method injection.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If either of the supplied arguments is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.MethodInjectingTypeBuilder.BuildType">
+            <summary>
+            Builds a <see cref="T:System.Type"/> suitable for Method-Injection. 
+            </summary>
+            <returns>
+            A <see cref="T:System.Type"/> suitable for Method-Injection. 
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.MethodInjectingTypeBuilder.DefineMethods(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Defines overrides for those methods that are configured with an appropriate
+            <see cref="T:Spring.Objects.Factory.Support.MethodOverride"/>.
+            </summary>
+            <param name="typeBuilder">
+            The overarching <see cref="T:System.Reflection.Emit.TypeBuilder"/> that is defining
+            the generated <see cref="T:System.Type"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.MethodInjectingTypeBuilder.DefineReplacedMethod(System.Reflection.Emit.TypeBuilder,System.Reflection.MethodInfo,System.Reflection.Emit.FieldBuilder)">
+            <summary>
+            Override the supplied <paramref name="method"/> with the logic
+            encapsulated by the
+            <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>
+            defined by the supplied <paramref name="field"/>.
+            </summary>
+            <param name="typeBuilder">
+            The builder for the subclass that is being generated.
+            </param>
+            <param name="method">
+            The method on the superclass that is to be overridden.
+            </param>
+            <param name="field">
+            The field defining the
+            <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>
+            that the overridden method will delegate to to do the 'actual'
+            method injection logic.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.MethodInjectingTypeBuilder.DefineOverrideMethodParameters(System.Reflection.ParameterInfo[],System.Reflection.Emit.MethodBuilder)">
+            <summary>
+            Defines the parameters to the method that is being overridden.
+            </summary>
+            <remarks>
+            <p>
+            Since we are simply overridding a method (in this method
+            injection context), all we do here is simply copy the
+            parameters (since we want a method with the exact same parameters).
+            </p>
+            </remarks>
+            <param name="methodParameters">
+            The parameters to the original method that is being overridden.
+            </param>
+            <param name="methodBuilder">
+            The builder we are using to define the new overridden method.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.MethodInjectingTypeBuilder.SetupTheReturnValueIfAny(System.Reflection.Emit.LocalBuilder,System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the MSIL for actually returning a return value if the
+            supplied <paramref name="returnValue"/> is not
+            <see lang="null"/>.
+            </summary>
+            <param name="returnValue">
+            The definition of the return value; if <see lang="null"/>, it
+            means that no return value is to required (a <c>void</c>
+            return type).
+            </param>
+            <param name="il">
+            The <see cref="T:System.Reflection.Emit.ILGenerator"/> to emit
+            the MSIL to.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.MethodInjectingTypeBuilder.DefineReturnValueIfAny(System.Reflection.MethodInfo,System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the MSIL for a return value if the supplied
+            <paramref name="method"/> returns a value.
+            </summary>
+            <param name="method">
+            The method to be checked.
+            </param>
+            <param name="il">
+            The <see cref="T:System.Reflection.Emit.ILGenerator"/> to emit
+            the MSIL to.
+            </param>
+            <returns>
+            The return value, or <see lang="null"/> if the method does not
+            return a value (has a <c>void</c> return type).
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.MethodInjectingTypeBuilder.PushArguments(System.Reflection.ParameterInfo[],System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Pushes (sets up) the arguments for a call to the
+            <see cref="M:Spring.Objects.Factory.Support.IMethodReplacer.Implement(System.Object,System.Reflection.MethodInfo,System.Object[])"/>
+            method of an appropriate
+            <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>.
+            </summary>
+            <param name="methodParameters">
+            The parameters to the <i>original</i> method (will be bundled
+            up into a generic <c>object[]</c> and passed as the third
+            argument to the
+            <see cref="M:Spring.Objects.Factory.Support.IMethodReplacer.Implement(System.Object,System.Reflection.MethodInfo,System.Object[])"/>
+            invocation.
+            </param>
+            <param name="il">
+            The <see cref="T:System.Reflection.Emit.ILGenerator"/> to emit
+            the MSIL to.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy.MethodInjectingTypeBuilder.DefineWritePropertyForMethodReplacement(System.Reflection.Emit.TypeBuilder,System.String,System.Reflection.Emit.FieldBuilder)">
+            <summary>
+            Simply generates the IL for a write only property for the
+            <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/> <see cref="T:System.Type"/>. 
+            </summary>
+            <param name="typeBuilder">
+            The <see cref="T:System.Type"/> in which the property is defined.
+            </param>
+            <param name="propertyName">
+            The name of the (to be) generated property.
+            </param>
+            <param name="field">
+            The (instance) field that the property is to 'set'.
+            </param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.DependencyCheckingMode">
+            <summary>
+            The various modes of dependency checking.
+            </summary>
+            <author>Rick Evans (.NET)</author>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.DependencyCheckingMode.None">
+            <summary>
+            DO not do any dependency checking.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.DependencyCheckingMode.Objects">
+            <summary>
+            Check object references.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.DependencyCheckingMode.Simple">
+            <summary>
+            Just check primitive (string, int, etc) values.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.DependencyCheckingMode.All">
+            <summary>
+            Check everything.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            <summary>
+            Exception thrown when an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            is asked for an object instance name for which it cannot find a definition.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: NoSuchObjectDefinitionException.cs,v 1.8 2006/04/09 07:18:48 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.NoSuchObjectDefinitionException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.NoSuchObjectDefinitionException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.NoSuchObjectDefinitionException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.NoSuchObjectDefinitionException.#ctor(System.String,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException"/> class.
+            </summary>
+            <param name="name">
+            Name of the missing object.
+            </param>
+            <param name="message">
+            A further, detailed message describing the problem.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.NoSuchObjectDefinitionException.#ctor(System.Type,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException"/> class.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> of the missing object.
+            </param>
+            <param name="message">
+            A further, detailed message describing the problem.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.NoSuchObjectDefinitionException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.NoSuchObjectDefinitionException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="P:Spring.Objects.Factory.NoSuchObjectDefinitionException.ObjectType">
+            <summary>
+            Return the required <see cref="T:System.Type"/> of object, if it was a
+            lookup by <see cref="T:System.Type"/> that failed.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.NoSuchObjectDefinitionException.ObjectName">
+            <summary>
+            Return the name of the missing object, if it was a lookup by name that
+            failed.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.DictionaryFactoryObject">
+            <summary>
+            Simple factory for shared <see cref="T:System.Collections.IDictionary"/> instances.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: DictionaryFactoryObject.cs,v 1.7 2007/07/31 03:47:39 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.AbstractFactoryObject">
+            <summary>
+            Simple template superclass for <see cref="T:Spring.Objects.Factory.IFactoryObject"/>
+            implementations that allows for the creation of a singleton or a prototype
+            instance (depending on a flag).
+            </summary>
+            <remarks>
+            If the value of the 
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+            property is <see langword="true"/> (this is the default), this class
+            will create a single instance of it's object upon initialization and
+            subsequently return the singleton instance; else, this class will
+            create a new instance each time (prototype mode). Subclasses must
+            implement the <see langword="abstract"/>
+            <see cref="M:Spring.Objects.Factory.Config.AbstractFactoryObject.CreateInstance"/>
+            template method to actually create objects.
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Keith Donald</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: AbstractFactoryObject.cs,v 1.13 2007/03/16 04:01:34 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.AbstractFactoryObject.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has injected all of an object's dependencies.
+            </summary>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as the failure to set a
+            required property) or if initialization fails.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.AbstractFactoryObject.GetObject">
+            <summary>
+            Return an instance (possibly shared or independent) of the object
+            managed by this factory.
+            </summary>
+            <returns>
+            An instance (possibly shared or independent) of the object managed by
+            this factory.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IFactoryObject.GetObject"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.AbstractFactoryObject.CreateInstance">
+            <summary>
+            Template method that subclasses must override to construct
+            the object returned by this factory.
+            </summary>
+            <remarks>
+            Invoked once immediately after the initialization of this
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> in the case of
+            a singleton; else, on each call to the
+            <see cref="M:Spring.Objects.Factory.IFactoryObject.GetObject"/>
+            method.
+            </remarks>
+            <exception cref="T:System.Exception">
+            If an exception occured during object creation.
+            </exception>
+            <returns>
+            A distinct instance of the object created by this factory.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.AbstractFactoryObject.Dispose">
+            <summary>
+            Performs cleanup on any cached singleton object.
+            </summary>
+            <remarks>
+            <p>
+            Only makes sense in the context of a singleton object.
+            </p>
+            </remarks>
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+            <seealso cref="M:System.IDisposable.Dispose"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.AbstractFactoryObject.IsSingleton">
+            <summary>
+            Is the object managed by this factory a singleton or a prototype?
+            </summary>
+            <remarks>
+            <p>
+            Please note that changing the value of this property <b>after</b>
+            this factory object instance has been created by an enclosing
+            Spring.NET IoC container really is a programming error. This
+            property should really only be set once, prior to the invocation
+            of the
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            callback method.
+            </p>
+            </remarks>
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.AbstractFactoryObject.ObjectType">
+            <summary>
+            Return the <see cref="T:System.Type"/> of object that this
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> creates, or
+            <see langword="null"/> if not known in advance.
+            </summary>
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.ObjectType"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.DictionaryFactoryObject.CreateInstance">
+            <summary>
+            Constructs a new instance of the target dictionary.
+            </summary>
+            <returns>The new <see cref="T:System.Collections.IDictionary"/> instance.</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.DictionaryFactoryObject.SourceDictionary">
+            <summary>
+            Set the source <see cref="T:System.Collections.IDictionary"/>.
+            </summary>
+            <remarks>
+            <p>
+            This value will be used to populate the <see cref="T:System.Collections.IDictionary"/>
+            returned by this factory.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.DictionaryFactoryObject.TargetDictionaryType">
+            <summary>
+            Set the <see cref="T:System.Type"/> of the <see cref="T:System.Collections.IDictionary"/>
+            implementation to use.
+            </summary>
+            <remarks>
+            <p>
+            The default is the <see cref="T:System.Collections.Hashtable"/> <see cref="T:System.Type"/>.
+            </p>
+            </remarks>
+            <exception cref="T:System.ArgumentNullException">
+            If the <c>value</c> is <see langword="null"/>.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If the <c>value</c> is an <see langword="abstract"/> <see cref="T:System.Type"/>.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If the <c>value</c> is an interface.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.DictionaryFactoryObject.ObjectType">
+            <summary>
+            The <see cref="T:System.Type"/> of objects created by this factory.
+            </summary>
+            <value>
+            Always returns the <see cref="T:System.Collections.IDictionary"/> <see cref="T:System.Type"/>.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.ObjectWrapper">
+            <summary>
+            Default implementation of the <see cref="T:Spring.Objects.IObjectWrapper"/>
+            interface that should be sufficient for all normal uses.
+            </summary>
+            <remarks>
+            <p>
+            <see cref="T:Spring.Objects.ObjectWrapper"/> will convert
+            <see cref="T:System.Collections.IList"/> and array
+            values to the corresponding target arrays, if necessary. Custom
+            <see cref="T:System.ComponentModel.TypeConverter"/>s that deal with
+            <see cref="T:System.Collections.IList"/>s or arrays can be written against a
+            comma delimited <see cref="T:System.String"/> as <see cref="T:System.String"/>
+            arrays are converted in such a format if the array itself is not assignable.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller </author>
+            <author>Jean-Pierre Pawlak</author>
+            <author>Mark Pollack (.NET)</author>
+            <author>Aleksandar Seovic(.NET)</author>
+            <version>$Id: ObjectWrapper.cs,v 1.72 2007/07/31 08:18:20 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.IObjectWrapper">
+            <summary> 
+            The central interface of Spring.NET's low-level object infrastructure.
+            </summary>
+            <remarks>
+            <p>
+            Typically not directly used by application code but rather implicitly
+            via an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>.
+            </p>
+            <p>
+            Implementing classes have the ability to get and set property values
+            (individually or in bulk), get property descriptors and query the
+            readability and writability of properties.
+            </p>
+            <p>
+            This interface supports <b>nested properties</b> enabling the setting
+            of properties on subproperties to an unlimited depth.
+            </p>
+            <p>
+            If a property update causes an exception, a
+            <see cref="T:Spring.Core.PropertyAccessException"/> will be thrown. Bulk
+            updates continue after exceptions are encountered, throwing an exception
+            wrapping <b>all</b> exceptions encountered during the update.
+            </p>
+            <p>
+            <see cref="T:Spring.Objects.IObjectWrapper"/> implementations can be used
+            repeatedly, with their "target" or wrapped object changed.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IObjectWrapper.cs,v 1.15 2007/07/31 21:43:52 markpollack Exp $
+            </version>
+        </member>
+        <member name="M:Spring.Objects.IObjectWrapper.GetPropertyValue(System.String)">
+            <summary>Get the value of a property.</summary>
+            <param name="theProperty">
+            The name of the property to get the value of. May be nested.
+            </param>
+            <returns>The value of the property.</returns>
+            <exception cref="T:Spring.Objects.FatalObjectException">
+            if the property isn't readable, or if the getting the value throws
+            an exception.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.IObjectWrapper.GetPropertyInfo(System.String)">
+            <summary>
+            Get the <see cref="T:System.Reflection.PropertyInfo"/> for a particular
+            property.
+            </summary>
+            <param name="theProperty">
+            The property to be retrieved.
+            </param>
+            <returns>
+            The <see cref="T:System.Reflection.PropertyInfo"/> for the particular
+            property.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.IObjectWrapper.GetPropertyType(System.String)">
+            <summary>
+            Get the <see cref="T:System.Type"/> for a particular property.
+            </summary>
+            <param name="theProperty">
+            The property the <see cref="T:System.Type"/> of which is to be retrieved.
+            </param>
+            <returns>
+            The <see cref="T:System.Type"/> for a particular property..
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.IObjectWrapper.GetPropertyInfos">
+            <summary>
+            Get all of the <see cref="T:System.Reflection.PropertyInfo"/> instances for
+            all of the properties of the wrapped object.
+            </summary>
+            <returns>
+            An array of <see cref="T:System.Reflection.PropertyInfo"/> instances.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.IObjectWrapper.SetPropertyValue(Spring.Objects.PropertyValue)">
+            <summary>
+            Set a property value.
+            </summary>
+            <remarks>
+            <p>
+            <b>This is the preferred way to update an individual property.</b>
+            </p>
+            </remarks>
+            <param name="propertyValue">The new property value.</param>
+        </member>
+        <member name="M:Spring.Objects.IObjectWrapper.SetPropertyValue(System.String,System.Object)">
+            <summary>
+            Set a property value.
+            </summary>
+            <remarks>
+            <p>
+            This method is provided for convenience only. The
+            <see cref="M:Spring.Objects.IObjectWrapper.SetPropertyValue(Spring.Objects.PropertyValue)"/>
+            method is more powerful.
+            </p>
+            </remarks>
+            <param name="theProperty">
+            The name of the property to set value of.
+            </param>
+            <param name="propertyValue">The new property value.</param>
+        </member>
+        <member name="M:Spring.Objects.IObjectWrapper.SetPropertyValues(Spring.Objects.IPropertyValues)">
+            <summary>Set a number of property values in bulk.</summary>
+            <remarks>
+            <p>
+            This is the preferred way to perform a bulk update.
+            </p>
+            <p>
+            Note that performing a bulk update differs from performing a single update,
+            in that an implementation of this class will continue to update properties
+            if a <b>recoverable</b> error (such as a vetoed property change or a type
+            mismatch, but <b>not</b> an invalid property name or the like) is
+            encountered, throwing a
+            <see cref="T:Spring.Objects.PropertyAccessExceptionsException"/> containing
+            all the individual errors. This exception can be examined later to see all
+            binding errors. Properties that were successfully updated stay changed.
+            </p>
+            <p>
+            Does not allow the setting of unknown fields. Equivalent to
+            <see cref="M:Spring.Objects.IObjectWrapper.SetPropertyValues(Spring.Objects.IPropertyValues,System.Boolean)"/>
+            with an argument of <c>false</c> for the second parameter.
+            </p>
+            </remarks>
+            <param name="values">
+            The collection of <see cref="T:Spring.Objects.PropertyValue"/> instances to
+            set on the wrapped object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.IObjectWrapper.SetPropertyValues(Spring.Objects.IPropertyValues,System.Boolean)">
+            <summary>
+            Set a number of property values in bulk with full control over behavior.
+            </summary>
+            <remarks>
+            <p>
+            Note that performing a bulk update differs from performing a single update,
+            in that an implementation of this class will continue to update properties
+            if a <b>recoverable</b> error (such as a vetoed property change or a type
+            mismatch, but <b>not</b> an invalid property name or the like) is
+            encountered, throwing a
+            <see cref="T:Spring.Objects.PropertyAccessExceptionsException"/> containing
+            all the individual errors. This exception can be examined later to see all
+            binding errors. Properties that were successfully updated stay changed.
+            </p>
+            <p>Does not allow the setting of unknown fields.
+            </p>
+            </remarks>
+            <param name="values">
+            The <see cref="T:Spring.Objects.IPropertyValues"/> to set on the target object
+            </param>
+            <param name="ignoreUnknown">
+            Should we ignore unknown values (not found in the object!?)
+            </param>
+        </member>
+        <member name="P:Spring.Objects.IObjectWrapper.WrappedInstance">
+            <summary>
+            The object wrapped by the wrapper (cannot be <see lang="null"/>).
+            </summary>
+            <remarks>
+            <p>
+            Implementations are required to allow the type of the wrapped 
+            object to change.
+            </p>
+            </remarks>
+            <returns>The object wrapped by this wrapper.</returns>
+        </member>
+        <member name="P:Spring.Objects.IObjectWrapper.WrappedType">
+            <summary>
+            Convenience method to return the <see cref="T:System.Type"/>
+            of the wrapped object.
+            </summary>
+            <returns>The <see cref="T:System.Type"/> of the wrapped object.</returns>
+        </member>
+        <member name="F:Spring.Objects.ObjectWrapper.wrappedObject">
+            <summary>The wrapped object.</summary>
+        </member>
+        <member name="F:Spring.Objects.ObjectWrapper.log">
+            <summary>
+            The ILog instance for this class. We'll create a lot of these objects,
+            so we don't want a new instance every time.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Objects.ObjectWrapper"/> class.
+            </summary>
+            <remarks>
+            <p>
+            The wrapped target instance will need to be set afterwards.
+            </p>
+            </remarks>
+            <seealso cref="P:Spring.Objects.ObjectWrapper.WrappedInstance"/>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.#ctor(System.Object)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Objects.ObjectWrapper"/> class.
+            </summary>
+            <param name="instance">
+            The object wrapped by this <see cref="T:Spring.Objects.ObjectWrapper"/>.
+            </param>
+            <exception cref="T:Spring.Objects.FatalObjectException">
+            If the supplied <paramref name="instance"/> is <see lang="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.#ctor(System.Type)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Objects.ObjectWrapper"/> class,
+            instantiating a new instance of the specified <see cref="T:System.Type"/> and using
+            it as the <see cref="P:Spring.Objects.ObjectWrapper.WrappedInstance"/>.
+            </summary>
+            <remarks>
+            <p>
+            Please note that the <see cref="T:System.Type"/> passed as the
+            <paramref name="type"/> argument must have a no-argument constructor.
+            If it does not, an exception will be thrown when this class attempts
+            to instantiate the supplied <paramref name="type"/> using it's
+            (non-existent) constructor.
+            </p>
+            </remarks>
+            <param name="type">
+            The <see cref="T:System.Type"/> to instantiate and wrap.
+            </param>
+            <exception cref="T:Spring.Objects.FatalObjectException">
+            If the <paramref name="type"/> is <see langword="null"/>, or if the
+            invocation of the <paramref name="type"/>s default (no-arg) constructor
+            fails (due to invalid arguments, insufficient permissions, etc).
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.GetPropertyValue(System.String)">
+            <summary>Gets the value of a property.</summary>
+            <param name="propertyName">
+            The name of the property to get the value of.
+            </param>
+            <returns>The value of the property.</returns>
+            <exception cref="T:Spring.Objects.FatalObjectException">
+            If there is no such property, if the property isn't readable, or
+            if getting the property value throws an exception.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.GetPropertyValue(Spring.Expressions.IExpression)">
+            <summary>Gets the value of a property.</summary>
+            <param name="propertyExpression">
+            The property expression that should be used to retrieve the property value.
+            </param>
+            <returns>The value of the property.</returns>
+            <exception cref="T:Spring.Objects.FatalObjectException">
+            If there is no such property, if the property isn't readable, or
+            if getting the property value throws an exception.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.SetPropertyValue(System.String,System.Object)">
+            <summary>
+            Sets a property value.
+            </summary>
+            <remarks>
+            <p>
+            This method is provided for convenience only. The
+            <see cref="M:Spring.Objects.ObjectWrapper.SetPropertyValue(Spring.Objects.PropertyValue)"/>
+            method is more powerful.
+            </p>
+            </remarks>
+            <param name="propertyName">
+            The name of the property to set value of.
+            </param>
+            <param name="val">The new value.</param>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.SetPropertyValue(Spring.Expressions.IExpression,System.Object)">
+            <summary>
+            Sets a property value.
+            </summary>
+            <param name="propertyExpression">
+            The property expression that should be used to set the property value.
+            </param>
+            <param name="val">The new value.</param>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.SetPropertyValue(Spring.Objects.PropertyValue)">
+            <summary>
+            Sets a property value.
+            </summary>
+            <remarks>
+            <p>
+            <b>This is the preferred way to update an individual property.</b>
+            </p>
+            </remarks>
+            <param name="pv">
+            The object containing new property value.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.SetPropertyValues(Spring.Objects.IPropertyValues)">
+            <summary>Set a number of property values in bulk.</summary>
+            <remarks>
+            <p>
+            Does not allow unknown fields. Equivalent to
+            <see cref="M:Spring.Objects.ObjectWrapper.SetPropertyValues(Spring.Objects.IPropertyValues,System.Boolean)"/>
+            with <see langword="null"/> and <cref lang="false"/> for
+            arguments.
+            </p>
+            </remarks>
+            <param name="pvs">
+            The <see cref="T:Spring.Objects.IPropertyValues"/> to set on the target
+            object.
+            </param>
+            <exception cref="T:Spring.Core.NotWritablePropertyException">
+            If an error is encountered while setting a property.
+            </exception>
+            <exception cref="T:Spring.Objects.PropertyAccessExceptionsException">
+            On a <see cref="T:System.Type"/> mismatch while setting a property, insufficient permissions, etc.
+            </exception>
+            <seealso cref="M:Spring.Objects.IObjectWrapper.SetPropertyValues(Spring.Objects.IPropertyValues,System.Boolean)"/>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.SetPropertyValues(Spring.Objects.IPropertyValues,System.Boolean)">
+            <summary>
+            Perform a bulk update with full control over behavior.
+            </summary>
+            <remarks>
+            <p>
+            This method may throw a reflection-based exception, if there is a critical
+            failure such as no matching field... less serious exceptions will be accumulated
+            and thrown as a single <see cref="T:Spring.Objects.PropertyAccessExceptionsException"/>.
+            </p>
+            </remarks>
+            <param name="propertyValues">
+            The <see cref="T:Spring.Objects.PropertyValue"/>s to set on the target object.
+            </param>
+            <param name="ignoreUnknown">
+            Should we ignore unknown values (not found in the object!?).
+            </param>
+            <exception cref="T:Spring.Core.NotWritablePropertyException">
+            If an error is encountered while setting a property (only thrown if the
+            <paramref name="ignoreUnknown"/> parameter is set to <see langword="false"/>).
+            </exception>
+            <exception cref="T:Spring.Objects.PropertyAccessExceptionsException">
+            On a <see cref="T:System.Type"/> mismatch while setting a property, insufficient permissions, etc.
+            </exception>
+            <seealso cref="M:Spring.Objects.IObjectWrapper.SetPropertyValues(Spring.Objects.IPropertyValues,System.Boolean)"/>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.GetPropertyInfo(System.String)">
+            <summary>
+            Returns PropertyInfo for the specified property
+            </summary>
+            <param name="propertyName">The name of the property to search for.</param>
+            <returns>The <see cref="T:System.Reflection.PropertyInfo"/> for the specified property.</returns>
+            <exception cref="T:Spring.Objects.FatalObjectException">If <see cref="T:System.Reflection.PropertyInfo"/> cannot be determined.</exception>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.GetPropertyType(System.String)">
+            <summary>
+            Get the <see cref="T:System.Type"/> for a particular property.
+            </summary>
+            <param name="propertyName">
+            The property the <see cref="T:System.Type"/> of which is to be retrieved.
+            </param>
+            <returns>
+            The <see cref="T:System.Type"/> for a particular property..
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.GetPropertyOrFieldInfo(System.String)">
+            <summary>
+            Returns MemberInfo for the specified property or field
+            </summary>
+            <param name="propertyOrFieldName">The name of the property or field to search for.</param>
+            <returns>The <see cref="T:System.Reflection.PropertyInfo"/> or <see cref="T:System.Reflection.FieldInfo"/> for the specified property or field.</returns>
+            <exception cref="T:Spring.Objects.FatalObjectException">If <paramref name="propertyOrFieldName"/> does not resolve to a property or field.</exception>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.GetPropertyInfos">
+            <summary>
+            Get the properties of the wrapped object.
+            </summary>
+            <returns>
+            An array of <see cref="T:System.Reflection.PropertyInfo"/>s.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.ToString">
+            <summary>
+            This method is expensive! Only call for diagnostics and debugging reasons,
+            not in production.
+            </summary>
+            <returns>
+            A string describing the state of this object.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.ObjectWrapper.GetPropertyExpression(System.String)">
+            <summary>
+            Attempts to parse property expression first and falls back to full expression
+            if that fails. Performance optimization.
+            </summary>
+            <param name="propertyName">Property expression to parse.</param>
+            <returns>Parsed proeprty expression.</returns>
+        </member>
+        <member name="P:Spring.Objects.ObjectWrapper.WrappedInstance">
+            <summary>
+            The object wrapped by this <see cref="T:Spring.Objects.ObjectWrapper"/>.
+            </summary>
+            <exception cref="T:Spring.Objects.FatalObjectException">
+            If the object cannot be changed; or an attempt is made to set the
+            value of this property to <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.ObjectWrapper.WrappedType">
+            <summary>
+            Convenience method to return the <see cref="T:System.Type"/> of the wrapped object.
+            </summary>
+            <remarks>
+            <p>
+            Do <b>not</b> use this (convenience) method prior to setting the
+            <see cref="P:Spring.Objects.ObjectWrapper.WrappedInstance"/> property.
+            </p>
+            </remarks>
+            <returns>
+            The <see cref="T:System.Type"/> of the wrapped object.
+            </returns>
+            <exception cref="T:System.NullReferenceException">
+            If the <see cref="P:Spring.Objects.ObjectWrapper.WrappedInstance"/> property
+            is <see lang="null"/>.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.ObjectWrapper.PropertyDescriptors">
+            <summary>
+            Return the collection of property descriptors.
+            </summary>
+        </member>
+        <member name="T:Spring.Globalization.Formatters.FloatFormatter">
+            <summary>
+            Implementation of <see cref="T:Spring.Globalization.IFormatter"/> that can be used to
+            format and parse floating point numbers.
+            </summary>
+            <remarks>
+            <para>
+            This formatter allows you to format and parse numbers that conform 
+            to <see cref="F:System.Globalization.NumberStyles.Float"/> number style (leading and trailing 
+            white space, leading sign, decimal point, exponent).
+            </para>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: FloatFormatter.cs,v 1.4 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Globalization.Formatters.FloatFormatter.DefaultFormat">
+            <summary>
+            Default format string.
+            </summary>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.FloatFormatter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.FloatFormatter"/> class,
+            using default format string of '{0:F}' and current thread's culture.
+            </summary>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.FloatFormatter.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.FloatFormatter"/> class,
+            using specified format string and current thread's culture.
+            </summary>
+            <param name="format">The format string.</param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.FloatFormatter.#ctor(System.Globalization.CultureInfo)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.FloatFormatter"/> class,
+            using default format string of '{0:F}' and specified culture.
+            </summary>
+            <param name="culture">The culture.</param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.FloatFormatter.#ctor(System.String,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.FloatFormatter"/> class,
+            using specified format string and current thread's culture.
+            </summary>
+            <param name="format">The format string.</param>
+            <param name="cultureName">The culture name.</param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.FloatFormatter.#ctor(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.FloatFormatter"/> class,
+            using specified format string and culture.
+            </summary>
+            <param name="format">The format string.</param>
+            <param name="culture">The culture.</param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.FloatFormatter.Format(System.Object)">
+            <summary>
+            Formats the specified float value.
+            </summary>
+            <param name="value">The value to format.</param>
+            <returns>Formatted floating point number.</returns>
+            <exception cref="T:System.ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+            <exception cref="T:System.ArgumentException">If <paramref name="value"/> is not a number.</exception>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.FloatFormatter.Parse(System.String)">
+            <summary>
+            Parses the specified float value.
+            </summary>
+            <param name="value">The float value to parse.</param>
+            <returns>Parsed float value as a <see cref="T:System.Double"/>.</returns>
+        </member>
+        <member name="T:Spring.Expressions.ProjectionNode">
+            <summary>
+            Represents parsed projection node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ProjectionNode.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.ProjectionNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.ProjectionNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.ProjectionNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a <see cref="T:System.Collections.IList"/> containing results of evaluation
+            of projection expression against each node in the context.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.DataBinding.BaseBindingManager">
+            <summary>
+            BaseBindingManager keeps track of all registered bindings and 
+            represents an entry point for the binding and unbinding process.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: BaseBindingManager.cs,v 1.1 2006/11/21 05:46:57 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.DataBinding.BaseBindingManager.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.DataBinding.BaseBindingManager"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.DataBinding.SimpleExpressionBinding">
+            <summary>
+            Simple, expression-based implementation of <see cref="T:Spring.DataBinding.IBinding"/> that
+            binds source to target one-to-one.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SimpleExpressionBinding.cs,v 1.3 2007/03/19 16:05:52 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.DataBinding.SimpleExpressionBinding.#ctor(System.String,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> class.
+            </summary>
+            <param name="sourceExpression">
+            The source expression.
+            </param>
+            <param name="targetExpression">
+            The target expression.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.SimpleExpressionBinding.#ctor(System.String,System.String,Spring.Globalization.IFormatter)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> class.
+            </summary>
+            <param name="sourceExpression">
+            The source expression.
+            </param>
+            <param name="targetExpression">
+            The target expression.
+            </param>
+            <param name="formatter">
+            The formatter to use.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.SimpleExpressionBinding.GetSourceValue(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Gets the source value for the binding.
+            </summary>
+            <param name="source">
+            Source object to extract value from.
+            </param>
+            <param name="variables">
+            Variables for expression evaluation.
+            </param>
+            <returns>
+            The source value for the binding.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.SimpleExpressionBinding.SetSourceValue(System.Object,System.Object,System.Collections.IDictionary)">
+            <summary>
+            Sets the source value for the binding.
+            </summary>
+            <param name="source">
+            The source object to set the value on.
+            </param>
+            <param name="value">
+            The value to set.
+            </param>
+            <param name="variables">
+            Variables for expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.SimpleExpressionBinding.GetTargetValue(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Gets the target value for the binding.
+            </summary>
+            <param name="target">
+            Source object to extract value from.
+            </param>
+            <param name="variables">
+            Variables for expression evaluation.
+            </param>
+            <returns>
+            The target value for the binding.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.SimpleExpressionBinding.SetTargetValue(System.Object,System.Object,System.Collections.IDictionary)">
+            <summary>
+            Sets the target value for the binding.
+            </summary>
+            <param name="target">
+            The target object to set the value on.
+            </param>
+            <param name="value">
+            The value to set.
+            </param>
+            <param name="variables">
+            Variables for expression evaluation.
+            </param>
+        </member>
+        <member name="P:Spring.DataBinding.SimpleExpressionBinding.SourceExpression">
+            <summary>
+            Gets the source expression.
+            </summary>
+            <value>The source expression.</value>
+        </member>
+        <member name="P:Spring.DataBinding.SimpleExpressionBinding.TargetExpression">
+            <summary>
+            Gets the target expression.
+            </summary>
+            <value>The target expression.</value>
+        </member>
+        <member name="T:Spring.Core.TypeResolution.CachedTypeResolver">
+            <summary>
+            Resolves (instantiates) a <see cref="T:System.Type"/> by it's (possibly
+            assembly qualified) name, and caches the <see cref="T:System.Type"/>
+            instance against the type name.
+            </summary>
+            <author>Rick Evans</author>
+            <author>Bruno Baia</author>
+            <author>Erich Eichinger</author>
+            <version>$Id: CachedTypeResolver.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Core.TypeResolution.ITypeResolver">
+            <summary>
+            Resolves a <see cref="T:System.Type"/> by name.
+            </summary>
+            <remarks>
+            <p>
+            The rationale behind the creation of this interface is to centralise
+            the resolution of type names to <see cref="T:System.Type"/> instances
+            beyond that offered by the plain vanilla
+            <see cref="M:System.Type.GetType(System.String)"/> method call.
+            </p>
+            </remarks>
+            <author>Rick Evans</author>
+            <version>$Id: ITypeResolver.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.ITypeResolver.Resolve(System.String)">
+            <summary>
+            Resolves the supplied <paramref name="typeName"/> to a
+            <see cref="T:System.Type"/>
+            instance.
+            </summary>
+            <param name="typeName">
+            The (possibly partially assembly qualified) name of a
+            <see cref="T:System.Type"/>.
+            </param>
+            <returns>
+            A resolved <see cref="T:System.Type"/> instance.
+            </returns>
+            <exception cref="T:System.TypeLoadException">
+            If the supplied <paramref name="typeName"/> could not be resolved
+            to a <see cref="T:System.Type"/>.
+            </exception>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.CachedTypeResolver.typeCache">
+            <summary>
+            The cache, mapping type names (<see cref="T:System.String"/> instances) against
+            <see cref="T:System.Type"/> instances.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.CachedTypeResolver.#ctor(Spring.Core.TypeResolution.ITypeResolver)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Core.TypeResolution.CachedTypeResolver"/> class.
+            </summary>
+            <param name="typeResolver">
+            The <see cref="T:Spring.Core.TypeResolution.ITypeResolver"/> that this instance will delegate
+            actual <see cref="T:System.Type"/> resolution to if a <see cref="T:System.Type"/>
+            cannot be found in this instance's <see cref="T:System.Type"/> cache.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="typeResolver"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.CachedTypeResolver.Resolve(System.String)">
+            <summary>
+            Resolves the supplied <paramref name="typeName"/> to a
+            <see cref="T:System.Type"/>
+            instance.
+            </summary>
+            <param name="typeName">
+            The (possibly partially assembly qualified) name of a
+            <see cref="T:System.Type"/>.
+            </param>
+            <returns>
+            A resolved <see cref="T:System.Type"/> instance.
+            </returns>
+            <exception cref="T:System.TypeLoadException">
+            If the supplied <paramref name="typeName"/> could not be resolved
+            to a <see cref="T:System.Type"/>.
+            </exception>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.ResourceManagerConverter">
+            <summary>
+            Converts a two part string, (resource name, assembly name)
+            to a ResourceManager instance.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeConversion.ResourceManagerConverter.APP_GLOBALRESOURCES_ASSEMBLYNAME">
+            <summary>
+            This constant represents the name of the folder/assembly containing global resources.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.ResourceManagerConverter.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.TypeConversion.ResourceManagerConverter"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.ResourceManagerConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Returns whether this converter can convert an object of one
+            <see cref="T:System.Type"/> to a
+            <see cref="T:System.Resources.ResourceManager"/>
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from a
+            <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns>True if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.ResourceManagerConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Convert from a string value to a
+            <see cref="T:System.Resources.ResourceManager"/> instance.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture. 
+            </param>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <returns>
+            A <see cref="T:System.Resources.ResourceManager"/>
+            if successful. 
+            </returns>
+            <exception cref="T:System.ArgumentException">If the specified <paramref name="value"/> does not denote a valid resource</exception>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.NameValueConverter">
+            <summary>
+            Custom <see cref="T:System.ComponentModel.TypeConverter"/> implementation for
+            <see cref="T:System.Collections.Specialized.NameValueCollection"/> objects.
+            </summary>
+            <remarks>
+            <p>
+            Handles conversion from an <b>XML formatted string</b> to a
+            <see cref="T:System.Collections.Specialized.NameValueCollection"/> object
+            (see below for an example of the expected XML format).
+            </p>
+            <p>
+            This converter must be registered before it will be available. Standard
+            converters in this namespace are automatically registered by the
+            <see cref="T:Spring.Objects.ObjectWrapper"/> class.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            Find below some examples of the XML formatted strings that this
+            converter will sucessfully convert. Note that the name of the top level
+            (document) element is quite arbitrary... it is only the content that
+            matters (and which must be in the format
+            <c>&lt;add key="..." value="..."/&gt;</c>. For your continued sanity
+            though, you may wish to standardize on the top level name of
+            <c>'dictionary'</c> (although you are of course free to not do so).
+            </p>
+            <code escaped="true">
+            <dictionary>
+            	<add key="host" value="localhost"/>
+            	<add key="port" value="8080"/>
+            </dictionary>
+            </code>
+            <p>
+            The following example uses a different top level (document) element
+            name, but is equivalent to the first example.
+            </p>
+            <code escaped="true">
+            <web-configuration-parameters>
+            	<add key="host" value="localhost"/>
+            	<add key="port" value="8080"/>
+            </web-configuration-parameters>
+            </code>
+            </example>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: NameValueConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.NameValueConverter.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.TypeConversion.NameValueConverter"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.NameValueConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Returns whether this converter can convert an object of one
+            <see cref="T:System.Type"/> to a
+            <see cref="T:System.Collections.Specialized.NameValueCollection"/>
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from an
+            <b>XML formatted</b> <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns>True if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.NameValueConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Convert from a string value to a
+            <see cref="T:System.Collections.Specialized.NameValueCollection"/> instance.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture. 
+            </param>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <returns>
+            A <see cref="T:System.Collections.Specialized.NameValueCollection"/>
+            if successful. 
+            </returns>
+        </member>
+        <member name="T:Spring.Context.Support.ResourceSetMessageSource">
+            <summary>
+            An <see cref="T:Spring.Context.IMessageSource"/> implementation that
+            accesses resources from .resx / .resource files.
+            </summary>
+            <remarks>Note that for the method 
+            GetResourceObject if the resource name resolves to null, then in 
+            .NET 1.1 the return value will be String.Empty whereas 
+            in .NET 2.0 it will return null.</remarks>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: ResourceSetMessageSource.cs,v 1.23 2007/07/31 18:15:50 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Context.Support.AbstractMessageSource">
+            <summary>
+            Abstract implementation of the <see cref="T:Spring.Context.IHierarchicalMessageSource"/> interface,
+            implementing common handling of message variants, making it easy
+            to implement a specific strategy for a concrete <see cref="T:Spring.Context.IMessageSource"/>.
+            </summary>
+            <remarks>
+            <p>Subclasses must implement the abstract <code>ResolveObject</code>
+            method.</p>
+            <p><b>Note:</b> By default, message texts are only parsed through
+            String.Format if arguments have been passed in for the message. In case
+            of no arguments, message texts will be returned as-is. As a consequence,
+            you should only use String.Format escaping for messages with actual
+            arguments, and keep all other messages unescaped.
+            </p>
+            <p>Supports not only IMessageSourceResolvables as primary messages
+            but also resolution of message arguments that are in turn
+            IMessageSourceResolvables themselves.
+            </p>
+            <p>This class does not implement caching of messages per code, thus
+            subclasses can dynamically change messages over time. Subclasses are
+            encouraged to cache their messages in a modification-aware fashion,
+            allowing for hot deployment of updated messages.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Harald Radi (.NET)</author>
+            <version>$Id: AbstractMessageSource.cs,v 1.23 2007/08/28 14:16:15 oakinger Exp $</version>
+            <seealso cref="T:Spring.Context.IMessageSourceResolvable"/>
+            <seealso cref="T:Spring.Context.IMessageSource"/>
+            <seealso cref="T:Spring.Context.IHierarchicalMessageSource"/>
+        </member>
+        <member name="T:Spring.Context.IHierarchicalMessageSource">
+            <summary>
+            Sub-interface of <see cref="T:Spring.Context.IMessageSource"/> to be
+            implemented by objects that can resolve messages hierarchically.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IHierarchicalMessageSource.cs,v 1.6 2006/04/09 07:18:38 markpollack Exp $</version>
+            <seealso cref="T:Spring.Context.IMessageSource"/>
+        </member>
+        <member name="P:Spring.Context.IHierarchicalMessageSource.ParentMessageSource">
+            <summary>
+            The parent message source used to try and resolve messages that
+            this object can't resolve.
+            </summary>
+            <remarks>
+            <p>
+            If the value of this property is <see langword="null"/> then no
+            further resolution is possible.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Context.Support.AbstractMessageSource.log">
+            <summary>
+            holds the logger instance shared with subclasses.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.#ctor">
+            <summary>
+            Initializes this instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.GetMessage(System.String)">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <remarks>
+            If the lookup is not successful throw NoSuchMessageException
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.GetMessage(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="culture">The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.</param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <remarks>
+            Note that the fallback behavior based on CultureInfo seem to
+            have a bug that is fixed by installed .NET 1.1 Service Pack 1.
+            <p>
+            If the lookup is not successful, implementations are permitted to
+            take one of two actions.
+            </p>
+            If the lookup is not successful throw NoSuchMessageException
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.GetMessage(System.String,System.Object[])">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="arguments">The array of arguments that will be filled in for parameters within
+            the message, or <see langword="null"/> if there are no parameters
+            within the message. Parameters within a message should be
+            referenced using the same syntax as the format string for the
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> method.</param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <remarks>
+            If the lookup is not successful throw NoSuchMessageException
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.GetMessage(System.String,System.Globalization.CultureInfo,System.Object[])">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="culture">The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.</param>
+            <param name="arguments">The array of arguments that will be filled in for parameters within
+            the message, or <see langword="null"/> if there are no parameters
+            within the message. Parameters within a message should be
+            referenced using the same syntax as the format string for the
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> method.</param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <remarks>
+            Note that the fallback behavior based on CultureInfo seem to
+            have a bug that is fixed by installed .NET 1.1 Service Pack 1.
+            <p>
+            If the lookup is not successful throw NoSuchMessageException.
+            </p>
+            </remarks>        
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.GetMessage(System.String,System.String,System.Globalization.CultureInfo,System.Object[])">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="defaultMessage">The default message if name is not found.</param>
+            <param name="culture">The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.</param>
+            <param name="arguments">The array of arguments that will be filled in for parameters within
+            the message, or <see langword="null"/> if there are no parameters
+            within the message. Parameters within a message should be
+            referenced using the same syntax as the format string for the
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> method.</param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <remarks>
+            Note that the fallback behavior based on CultureInfo seem to
+            have a bug that is fixed by installed .NET 1.1 Service Pack 1.
+            <p>
+            If the lookup is not successful throw NoSuchMessageException
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.GetMessage(Spring.Context.IMessageSourceResolvable,System.Globalization.CultureInfo)">
+            <summary>
+            Resolve the message using all of the attributes contained within
+            the supplied <see cref="T:Spring.Context.IMessageSourceResolvable"/>
+            argument.
+            </summary>
+            <param name="resolvable">The value object storing those attributes that are required to
+            properly resolve a message.</param>
+            <param name="culture">The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.</param>
+            <returns>
+            The resolved message if the lookup was successful.
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be resolved.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.GetResourceObject(System.String)">
+            <summary>
+            Gets a localized resource object identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">
+            The name of the resource object to resolve.
+            </param>
+            <returns>
+            The resolved object, or <see langword="null"/> if not found.
+            </returns>
+            <seealso cref="M:Spring.Context.IMessageSource.GetResourceObject(System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.GetResourceObject(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Gets a localized resource object identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <remarks>
+            Note that the fallback behavior based on CultureInfo seem to 
+            have a bug that is fixed by installed .NET 1.1 Service Pack 1.  
+            </remarks>	    
+            <param name="name">
+            The name of the resource object to resolve.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.
+            </param>
+            <returns>
+            The resolved object, or <see langword="null"/> if not found.  If
+            the resource name resolves to null, then in .NET 1.1 the return
+            value will be String.Empty whereas in .NET 2.0 it will return
+            null.
+            </returns>
+            <seealso cref="M:Spring.Context.IMessageSource.GetResourceObject(System.String,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.ApplyResources(System.Object,System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Applies resources to object properties.
+            </summary>
+            <param name="value">
+            An object that contains the property values to be applied.
+            </param>
+            <param name="objectName">
+            The base name of the object to use for key lookup.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.
+            </param>
+            <seealso cref="M:Spring.Context.IMessageSource.ApplyResources(System.Object,System.String,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.GetMessageInternal(System.String,System.Object[],System.Globalization.CultureInfo)">
+            <summary>Resolve the given code and arguments as message in the given culture,
+            returning null if not found. Does <i>not</i> fall back to the code
+            as default message. Invoked by GetMessage methods.
+            </summary>
+            <param name="code">The code to lookup up, such as 'calculator.noRateSet'.</param>
+            <param name="args"> array of arguments that will be filled in for params
+            within the message.</param>
+            <param name="culture">The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.</param>
+            <returns>
+            The resolved message if the lookup was successful.
+            </returns>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.GetMessageFromParent(System.String,System.Object[],System.Globalization.CultureInfo)">
+            <summary>
+            Try to retrieve the given message from the parent MessageSource, if any.
+            </summary>
+            <param name="code">The code to lookup up, such as 'calculator.noRateSet'.</param>
+            <param name="args"> array of arguments that will be filled in for params
+            within the message.</param>
+            <param name="culture">The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.</param>
+            <returns>
+            The resolved message if the lookup was successful.
+            </returns>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.GetDefaultMessage(System.String)">
+            <summary>
+            Return a fallback default message for the given code, if any.
+            </summary>
+            <remarks>
+            Default is to return the code itself if "UseCodeAsDefaultMessage"
+            is activated, or return no fallback else. In case of no fallback,
+            the caller will usually receive a NoSuchMessageException from GetMessage
+            </remarks>
+            <param name="code">The code to lookup up, such as 'calculator.noRateSet'.</param>
+            <returns>The default message to use, or null if none.</returns>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.RenderDefaultMessage(System.String,System.Object[],System.Globalization.CultureInfo)">
+            <summary>
+            Renders the default message string.  The default message is passed in as specified by the
+            caller and can be rendered into a fully formatted default message shown to the user.
+            </summary>
+            <remarks>Default implementation passed he String for String.Format resolving any 
+            argument placeholders found in them.  Subclasses may override this method to plug
+            in custom processing of default messages.
+            </remarks>
+            <param name="defaultMessage">The default message.</param>
+            <param name="args">The array of agruments that will be filled in for parameter
+            placeholders within the message, or null if none.</param>
+            <param name="culture">The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.</param>
+            <returns>The rendered default message (with resolved arguments)</returns>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.FormatMessage(System.String,System.Object[],System.Globalization.CultureInfo)">
+            <summary>
+            Format the given default message String resolving any 
+            agrument placeholders found in them.
+            </summary>
+            <param name="msg">The message to format.</param>
+            <param name="args">The array of agruments that will be filled in for parameter
+            placeholders within the message, or null if none.</param>
+            <param name="culture">The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.</param>
+            <returns>The formatted message (with resolved arguments)</returns>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.ResolveArguments(System.Object[],System.Globalization.CultureInfo)">
+            <summary>
+            Search through the given array of objects, find any
+            MessageSourceResolvable objects and resolve them.
+            </summary>
+            <remarks>
+            Allows for messages to have MessageSourceResolvables as arguments.
+            </remarks>
+            
+            <param name="args">The array of arguments for a message.</param>
+            <param name="culture">The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.</param>
+            <returns>An array of arguments with any IMessageSourceResolvables resolved</returns>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.GetResourceInternal(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Gets the specified resource (e.g. Icon or Bitmap).
+            </summary>
+            <param name="name">The name of the resource to resolve.</param>
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to resolve the
+            code for.
+            </param>
+            <returns>The resource if found. <see langword="null"/> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.ApplyResourcesInternal(System.Object,System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Applies resources from the given name on the specified object.
+            </summary>
+            <param name="value">
+            An object that contains the property values to be applied.
+            </param>
+            <param name="objectName">
+            The base name of the object to use for key lookup.
+            </param>
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.ResolveMessage(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Subclasses must implement this method to resolve a message.
+            </summary>
+            <param name="code">The code to lookup up, such as 'calculator.noRateSet'.</param>
+            <param name="cultureInfo">The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.</param>
+            <returns>The resolved message from the backing store of message data.</returns>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.ResolveObject(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Resolves an object (typically an icon or bitmap).
+            </summary>
+            <remarks>
+            <p>
+            Subclasses must implement this method to resolve an object.
+            </p>
+            </remarks>
+            <param name="code">The code of the object to resolve.</param>
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to resolve the
+            code for.
+            </param>
+            <returns>
+            The resolved object or <see langword="null"/> if not found.
+            </returns>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractMessageSource.ApplyResourcesToObject(System.Object,System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Applies resources to object properties.
+            </summary>
+            <remarks>
+            <p>
+            Subclasses must implement this method to apply resources
+            to an arbitrary object.
+            </p>
+            </remarks>
+            <param name="value">
+            An object that contains the property values to be applied.
+            </param>
+            <param name="objectName">
+            The base name of the object to use for key lookup.
+            </param>
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.
+            </param>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractMessageSource.UseCodeAsDefaultMessage">
+            <summary>Gets or Sets a value indicating whether to use the message code as 
+            default message instead of throwing a NoSuchMessageException. 
+            Useful for development and debugging. Default is "false".
+            </summary>
+            <remarks>
+            <p>Note: In case of a IMessageSourceResolvable with multiple codes
+            (like a FieldError) and a MessageSource that has a parent MessageSource,
+            do <i>not</i> activate "UseCodeAsDefaultMessage" in the <i>parent</i>:
+            Else, you'll get the first code returned as message by the parent,
+            without attempts to check further codes.</p>
+            <p>To be able to work with "UseCodeAsDefaultMessage" turned on in the parent,
+            AbstractMessageSource contains special checks
+            to delegate to the internal <code>GetMessageInternal</code> method if available.
+            In general, it is recommended to just use "UseCodeAsDefaultMessage" during
+            development and not rely on it in production in the first place, though.</p>
+            <p>Alternatively, consider overriding the <code>GetDefaultMessage</code>
+            method to return a custom fallback message for an unresolvable code.</p>
+            </remarks>
+            <value>
+            	<c>true</c> if use the message code as default message instead of 
+            throwing a NoSuchMessageException; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractMessageSource.ParentMessageSource">
+            <summary>
+            The parent message source used to try and resolve messages that
+            this object can't resolve.
+            </summary>
+            <value></value>
+            <remarks>
+            	<p>
+            If the value of this property is <see langword="null"/> then no
+            further resolution is possible.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.ResourceSetMessageSource.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.ResourceSetMessageSource"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.ResourceSetMessageSource.ResolveMessage(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Resolves a given code by searching through each assembly name in
+            the base names array.
+            </summary>
+            <param name="code">The code to resolve.</param>      
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use for lookups.
+            </param>
+            <returns>The message from the resource set.</returns>
+        </member>
+        <member name="M:Spring.Context.Support.ResourceSetMessageSource.ResolveObject(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Resolves a given code by searching through each assembly name in the array.
+            </summary>
+            <param name="code">The code to resolve.</param>      
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use for lookups.
+            </param>
+            <returns>The object from the resource set.</returns>
+        </member>
+        <member name="M:Spring.Context.Support.ResourceSetMessageSource.ApplyResourcesToObject(System.Object,System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Uses a System.ComponentModel.ComponentResourceManager
+            to apply resources to object properties.
+            Resource key names are of the form objectName.propertyName
+            </summary>
+            <remarks>
+            This feature is not currently supported on version 1.0 of the .NET platform.
+            </remarks>
+            <param name="value">
+            An object that contains the property values to be applied.
+            </param>
+            <param name="objectName">
+            The base name of the object to use for the key lookup.
+            </param>      
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use for lookups.
+            If <cref lang="null"/>, uses the
+            <see cref="P:System.Globalization.CultureInfo.CurrentUICulture"/> value.
+            </param>
+            <exception cref="T:System.NotSupportedException">
+            This feature is not currently supported on version 1.0 of the .NET platform.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.ResourceSetMessageSource.ResolveObject(System.Resources.ResourceManager,System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Resolves a code into an object given a base name.
+            </summary>
+            <param name="resourceManager">The <see cref="T:System.Resources.ResourceManager"/> to search.</param>
+            <param name="code">The code to resolve.</param>      
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use for lookups.
+            </param>
+            <returns>The object from the resource file.</returns>
+        </member>
+        <member name="M:Spring.Context.Support.ResourceSetMessageSource.ToString">
+            <summary>
+            Returns a <see cref="T:System.String"/> representation of the
+            <see cref="T:Spring.Context.Support.ResourceSetMessageSource"/>.
+            </summary>
+            <returns>A <see cref="T:System.String"/> representation of the
+            <see cref="T:Spring.Context.Support.ResourceSetMessageSource"/>.</returns>
+        </member>
+        <member name="M:Spring.Context.Support.ResourceSetMessageSource.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has set all object properties supplied.
+            </summary>
+            <remarks>
+            <p>
+            The list may contain objects of type <see cref="T:System.String"/> or
+            <see cref="T:System.Resources.ResourceManager"/>. <see cref="T:System.String"/> types
+            are converted to <see cref="T:System.Resources.ResourceManager"/> instances using the notation
+            resourcename, assembly partial name.
+            </p>
+            </remarks>
+            <exception cref="T:System.ArgumentException">
+            If the conversion from a <see cref="T:System.String"/> to a
+            <see cref="T:System.Resources.ResourceManager"/> can't be performed.
+            </exception>
+        </member>
+        <member name="P:Spring.Context.Support.ResourceSetMessageSource.ResourceManagers">
+            <summary>
+            The collection of <see cref="T:System.Resources.ResourceManager"/>s
+            in this <see cref="T:Spring.Context.Support.ResourceSetMessageSource"/>.
+            </summary>
+        </member>
+        <member name="T:Spring.Context.NoSuchMessageException">
+            <summary>
+            Thrown when a message cannot be resolved.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <seealso cref="T:Spring.Context.IMessageSource"/>
+            <seealso cref="T:Spring.Context.IMessageSourceResolvable"/>
+            <version>$Id: NoSuchMessageException.cs,v 1.8 2007/07/17 14:51:13 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Context.NoSuchMessageException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.NoSuchMessageException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.NoSuchMessageException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.NoSuchMessageException"/> class with the
+            specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Context.NoSuchMessageException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.NoSuchMessageException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being
+            thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or
+            destination.
+            </param>
+        </member>
+        <member name="M:Spring.Context.NoSuchMessageException.#ctor(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.NoSuchMessageException"/> class.
+            </summary>
+            <param name="code">
+            The code that could not be resolved for given culture.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> that was used
+            to search for the code.
+            </param>
+        </member>
+        <member name="M:Spring.Context.NoSuchMessageException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.NoSuchMessageException"/> class.
+            </summary>
+            <param name="code">
+            The code that could not be resolved for the current UI culture.
+            </param>
+        </member>
+        <member name="T:Spring.Context.IMessageSourceResolvable">
+            <summary>
+            Describes objects that are suitable for message resolution in a
+            <see cref="T:Spring.Context.IMessageSource"/>.
+            </summary>
+            <remarks>
+            <p>
+            Spring.NET's own validation error classes implement this interface.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IMessageSourceResolvable.cs,v 1.6 2006/04/09 07:18:38 markpollack Exp $</version>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(Spring.Context.IMessageSourceResolvable,System.Globalization.CultureInfo)"/>
+            <seealso cref="T:Spring.Context.Support.DefaultMessageSourceResolvable"/>
+        </member>
+        <member name="M:Spring.Context.IMessageSourceResolvable.GetCodes">
+            <summary>
+            Return the codes to be used to resolve this message, in the order
+            that they are to be tried.
+            </summary>
+            <remarks>
+            <p>
+            The last code will therefore be the default one.
+            </p>
+            </remarks>
+            <returns>
+            A <see cref="T:System.String"/> array of codes which are associated
+            with this message.
+            </returns>
+        </member>
+        <member name="M:Spring.Context.IMessageSourceResolvable.GetArguments">
+            <summary>
+            Return the array of arguments to be used to resolve this message.
+            </summary>
+            <returns>
+            An array of objects to be used as parameters to replace
+            placeholders within the message text.
+            </returns>
+        </member>
+        <member name="P:Spring.Context.IMessageSourceResolvable.DefaultMessage">
+            <summary>
+            Return the default message to be used to resolve this message.
+            </summary>
+            <returns>
+            The default message, or <see langword="null"/> if there is no
+            default.
+            </returns>
+        </member>
+        <member name="T:Spring.Threading.ThreadStaticStorage">
+            <summary>
+            Implements <see cref="T:Spring.Threading.IThreadStorage"/> by using a <see cref="T:System.ThreadStaticAttribute"/> hashtable.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: ThreadStaticStorage.cs,v 1.1 2007/02/02 21:30:34 oakinger Exp $</version>  
+        </member>
+        <member name="T:Spring.Threading.IThreadStorage">
+            <summary>
+            Specifies the contract a strategy must be implement to store and 
+            retrieve data that is specific to the executing thread.
+            </summary>
+            <remarks>
+            All implementations of this interface must treat keys case-sensitive.
+            </remarks>
+            <author>Erich Eichinger</author>
+            <version>$Id: IThreadStorage.cs,v 1.1 2007/02/02 21:30:34 oakinger Exp $</version>  
+        </member>
+        <member name="M:Spring.Threading.IThreadStorage.GetData(System.String)">
+            <summary>
+            Retrieves an object with the specified <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the item.</param>
+            <returns>
+            The object in the current thread's context associated with the 
+            specified <paramref name="name"/> or null if no object has been stored previously
+            </returns>
+        </member>
+        <member name="M:Spring.Threading.IThreadStorage.SetData(System.String,System.Object)">
+            <summary>
+            Stores a given object and associates it with the specified <paramref name="name"/>.
+            </summary>
+            <param name="name">The name with which to associate the new item.</param>
+            <param name="value">The object to store in the current thread's context.</param>
+        </member>
+        <member name="M:Spring.Threading.IThreadStorage.FreeNamedDataSlot(System.String)">
+            <summary>
+            Empties a data slot with the specified name.
+            </summary>
+            <remarks>
+            If the object with the specified <paramref name="name"/> is not found, the method does nothing.
+            </remarks>
+            <param name="name">The name of the object to remove.</param>
+        </member>
+        <member name="M:Spring.Threading.ThreadStaticStorage.GetData(System.String)">
+            <summary>
+            Retrieves an object with the specified name.
+            </summary>
+            <param name="name">The name of the item.</param>
+            <returns>The object in the call context associated with the specified name or null if no object has been stored previously</returns>
+        </member>
+        <member name="M:Spring.Threading.ThreadStaticStorage.SetData(System.String,System.Object)">
+            <summary>
+            Stores a given object and associates it with the specified name.
+            </summary>
+            <param name="name">The name with which to associate the new item.</param>
+            <param name="value">The object to store in the call context.</param>
+        </member>
+        <member name="M:Spring.Threading.ThreadStaticStorage.FreeNamedDataSlot(System.String)">
+            <summary>
+            Empties a data slot with the specified name.
+            </summary>
+            <param name="name">The name of the data slot to empty.</param>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.GetterDelegate">
+            <summary>
+            Represents a Get method
+            </summary>
+            <param name="target">the target instance when calling an instance method</param>
+            <returns>the value return by the Get method</returns>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.SetterDelegate">
+            <summary>
+            Represents a Set method
+            </summary>
+            <param name="target">the target instance when calling an instance method</param>
+            <param name="value">the value to be set</param>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.FunctionDelegate">
+            <summary>
+            Represents a method
+            </summary>
+            <param name="target">the target instance when calling an instance method</param>
+            <param name="args">arguments to be passed to the method</param>
+            <returns>the value return by the method. <value>null</value> when calling a void method</returns>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.CreatePropertyCallback">
+            <summary>
+            Represents a callback method used to create an <see cref="T:Spring.Reflection.Dynamic.IDynamicProperty"/> from a <see cref="T:System.Reflection.PropertyInfo"/> instance.
+            </summary>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.CreateFieldCallback">
+            <summary>
+            Represents a callback method used to create an <see cref="T:Spring.Reflection.Dynamic.IDynamicField"/> from a <see cref="T:System.Reflection.FieldInfo"/> instance.
+            </summary>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.CreateMethodCallback">
+            <summary>
+            Represents a callback method used to create an <see cref="T:Spring.Reflection.Dynamic.IDynamicMethod"/> from a <see cref="T:System.Reflection.MethodInfo"/> instance.
+            </summary>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.CreateConstructorCallback">
+            <summary>
+            Represents a callback method used to create an <see cref="T:Spring.Reflection.Dynamic.IDynamicConstructor"/> from a <see cref="T:System.Reflection.ConstructorInfo"/> instance.
+            </summary>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.CreateIndexerCallback">
+            <summary>
+            Represents a callback method used to create an <see cref="T:Spring.Reflection.Dynamic.IDynamicIndexer"/> from a <see cref="T:System.Reflection.PropertyInfo"/> instance.
+            </summary>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.DynamicReflectionManager">
+            <summary>
+            Allows easy access to existing and creation of new dynamic relection members.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DynamicReflectionManager.cs,v 1.5 2008/05/17 11:05:26 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Reflection.Dynamic.DynamicReflectionManager.ASSEMBLY_NAME">
+            <summary>
+            The name of the assembly that defines reflection types created.
+            </summary>
+        </member>
+        <member name="F:Spring.Reflection.Dynamic.DynamicReflectionManager.TYPE_ATTRIBUTES">
+            <summary>
+            The attributes of the reflection type to generate.
+            </summary>
+        </member>
+        <member name="F:Spring.Reflection.Dynamic.DynamicReflectionManager.propertyCache">
+            <summary>
+            Cache for dynamic property types.
+            </summary>
+        </member>
+        <member name="F:Spring.Reflection.Dynamic.DynamicReflectionManager.fieldCache">
+            <summary>
+            Cache for dynamic field types.
+            </summary>
+        </member>
+        <member name="F:Spring.Reflection.Dynamic.DynamicReflectionManager.indexerCache">
+            <summary>
+            Cache for dynamic indexer types.
+            </summary>
+        </member>
+        <member name="F:Spring.Reflection.Dynamic.DynamicReflectionManager.methodCache">
+            <summary>
+            Cache for dynamic method types.
+            </summary>
+        </member>
+        <member name="F:Spring.Reflection.Dynamic.DynamicReflectionManager.constructorCache">
+            <summary>
+            Cache for dynamic constructor types.
+            </summary>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicReflectionManager.CreateTypeBuilder(System.String)">
+            <summary>
+            Creates an appropriate type builder.
+            </summary>
+            <param name="name">
+            The base name to use for the reflection type name.
+            </param>
+            <returns>The type builder to use.</returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicReflectionManager.GetDynamicProperty(System.Reflection.PropertyInfo,Spring.Reflection.Dynamic.CreatePropertyCallback)">
+            <summary>
+            Returns dynamic property if one exists.
+            </summary>
+            <param name="property">Property to look up.</param>
+            <param name="createCallback">callback function that will be called to create the dynamic property</param>
+            <returns>An <see cref="T:Spring.Reflection.Dynamic.IDynamicProperty"/> for the given property info.</returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicReflectionManager.GetDynamicField(System.Reflection.FieldInfo,Spring.Reflection.Dynamic.CreateFieldCallback)">
+            <summary>
+            Returns dynamic field if one exists.
+            </summary>
+            <param name="field">Field to look up.</param>
+            <param name="createCallback">callback function that will be called to create the dynamic field</param>
+            <returns>An <see cref="T:Spring.Reflection.Dynamic.IDynamicField"/> for the given field info.</returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicReflectionManager.GetDynamicIndexer(System.Reflection.PropertyInfo,Spring.Reflection.Dynamic.CreateIndexerCallback)">
+            <summary>
+            Returns dynamic indexer if one exists.
+            </summary>
+            <param name="indexer">Indexer to look up.</param>
+            <param name="createCallback">callback function that will be called to create the dynamic indexer</param>
+            <returns>An <see cref="T:Spring.Reflection.Dynamic.IDynamicIndexer"/> for the given indexer.</returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicReflectionManager.GetDynamicMethod(System.Reflection.MethodInfo,Spring.Reflection.Dynamic.CreateMethodCallback)">
+            <summary>
+            Returns dynamic method if one exists.
+            </summary>
+            <param name="method">Method to look up.</param>
+            <param name="createCallback">callback function that will be called to create the dynamic method</param>
+            <returns>An <see cref="T:Spring.Reflection.Dynamic.IDynamicMethod"/> for the given method.</returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicReflectionManager.GetDynamicConstructor(System.Reflection.ConstructorInfo,Spring.Reflection.Dynamic.CreateConstructorCallback)">
+            <summary>
+            Returns dynamic constructor if one exists.
+            </summary>
+            <param name="constructor">Constructor to look up.</param>
+            <param name="createCallback">callback function that will be called to create the dynamic constructor</param>
+            <returns>An <see cref="T:Spring.Reflection.Dynamic.IDynamicConstructor"/> for the given constructor.</returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicReflectionManager.SaveAssembly">
+            <summary>
+            Saves dynamically generated assembly to disk.
+            Can only be called in DEBUG mode, per ConditionalAttribute rules.
+            </summary>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicReflectionManager.CreateFieldGetter(System.Reflection.FieldInfo)">
+            <summary>
+            Create a new Get method delegate for the specified field using <see cref="T:System.Reflection.Emit.DynamicMethod"/>
+            </summary>
+            <param name="fieldInfo">the field to create the delegate for</param>
+            <returns>a delegate that can be used to read the field</returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicReflectionManager.CreateFieldSetter(System.Reflection.FieldInfo)">
+            <summary>
+            Create a new Set method delegate for the specified field using <see cref="T:System.Reflection.Emit.DynamicMethod"/>
+            </summary>
+            <param name="fieldInfo">the field to create the delegate for</param>
+            <returns>a delegate that can be used to read the field.</returns>
+            <remarks>
+            If the field's <see cref="P:System.Reflection.FieldInfo.IsLiteral"/> returns true, the returned method 
+            will throw an <see cref="T:System.InvalidOperationException"/> when called.
+            </remarks>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicReflectionManager.CreatePropertyGetter(System.Reflection.PropertyInfo)">
+            <summary>
+            Create a new Get method delegate for the specified property using <see cref="T:System.Reflection.Emit.DynamicMethod"/>
+            </summary>
+            <param name="propertyInfo">the property to create the delegate for</param>
+            <returns>a delegate that can be used to read the property.</returns>
+            <remarks>
+            If the property's <see cref="P:System.Reflection.PropertyInfo.CanRead"/> returns false, the returned method 
+            will throw an <see cref="T:System.InvalidOperationException"/> when called.
+            </remarks>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicReflectionManager.CreatePropertySetter(System.Reflection.PropertyInfo)">
+            <summary>
+            Create a new Set method delegate for the specified property using <see cref="T:System.Reflection.Emit.DynamicMethod"/>
+            </summary>
+            <param name="propertyInfo">the property to create the delegate for</param>
+            <returns>a delegate that can be used to write the property.</returns>
+            <remarks>
+            If the property's <see cref="P:System.Reflection.PropertyInfo.CanWrite"/> returns false, the returned method 
+            will throw an <see cref="T:System.InvalidOperationException"/> when called.
+            </remarks>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicReflectionManager.CreateFunctionDelegate(System.Reflection.MethodInfo)">
+            <summary>
+            Create a new method delegate for the specified method using <see cref="T:System.Reflection.Emit.DynamicMethod"/>
+            </summary>
+            <param name="method">the method to create the delegate for</param>
+            <returns>a delegate that can be used to invoke the method.</returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicReflectionManager.EmitThrowInvalidOperationException(System.Reflection.Emit.ILGenerator,System.String)">
+            <summary>
+            Generates code that throws <see cref="T:System.InvalidOperationException"/>.
+            </summary>
+            <param name="il">IL generator to use.</param>
+            <param name="message">Error message to use.</param>
+        </member>
+        <member name="T:Spring.Proxy.DynamicProxyManager">
+            <summary>
+            Allows easy access to existing and creation of new dynamic proxies.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Bruno Baia</author>
+            <version>$Id: DynamicProxyManager.cs,v 1.6 2007/05/30 17:32:05 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Proxy.DynamicProxyManager.ASSEMBLY_NAME">
+            <summary>
+            The name of the assembly that defines proxy types created.
+            </summary>
+        </member>
+        <member name="F:Spring.Proxy.DynamicProxyManager.TYPE_ATTRIBUTES">
+            <summary>
+            The attributes of the proxy type to generate.
+            </summary>
+        </member>
+        <member name="M:Spring.Proxy.DynamicProxyManager.CreateTypeBuilder(System.String,System.Type)">
+            <summary>
+            Creates an appropriate type builder.
+            </summary>
+            <param name="typeName">The proxy type name.</param>
+            <param name="baseType">The type to extends if provided.</param>
+            <returns>The type builder to use.</returns>
+        </member>
+        <member name="M:Spring.Proxy.DynamicProxyManager.SaveAssembly">
+            <summary>
+            Saves dynamically generated assembly to disk.
+            Can only be called in DEBUG_DYNAMIC mode, per ConditionalAttribute rules.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.ManagedList">
+            <summary>
+            Tag subclass used to hold a list of managed elements.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: ManagedList.cs,v 1.15 2007/11/26 14:15:54 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ManagedList.Resolve(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.Support.ManagedCollectionElementResolver)">
+            <summary>
+            Resolves this managed collection at runtime.
+            </summary>
+            <param name="objectName">
+            The name of the top level object that is having the value of one of it's
+            collection properties resolved.
+            </param>
+            <param name="definition">
+            The definition of the named top level object.
+            </param>
+            <param name="propertyName">
+            The name of the property the value of which is being resolved.
+            </param>
+            <param name="resolver">
+            The callback that will actually do the donkey work of resolving
+            this managed collection.
+            </param>
+            <returns>A fully resolved collection.</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.ManagedList.ElementTypeName">
+            <summary>
+            Gets or sets the unresolved name for the <see cref="T:System.Type"/> 
+            of the elements of this managed list.
+            </summary>
+            <value>The unresolved name for the type of the elements of this managed list.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject">
+            <summary>
+            Returns a value that is an
+            <see cref="T:Spring.Objects.Factory.IGenericObjectFactory"/> that
+            returns an object from an
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/>.
+            </summary>
+            <remarks>
+            <p>
+            The primary motivation of this class is to avoid having a client object
+            directly calling the
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>
+            method to get a prototype object out of an
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/>, which would be a
+            violation of the inversion of control principle. With the use of this
+            class, the client object can be fed an
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> as a property
+            that directly returns one target <b>prototype</b> object.
+            </p>
+            <p>
+            The object referred to by the value of the
+            <see cref="P:Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject.TargetObjectName"/>
+            property does not have to be a prototype object, but there is little
+            to no point in using this class in conjunction with a singleton object.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            The following XML configuration snippet illustrates the use of this
+            class...
+            </p>
+            <code escaped="true">
+            <objects>
+              <!-- prototype object since we have state -->
+              <object id="MyService" type="A.B.C.MyService" singleton="false"/>
+              
+              <object id="MyServiceFactory" type="Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject">
+                <property name="TargetObjectName"><idref local="MyService"/></property>
+              </object>
+              
+              <object id="MyClientObject" type="A.B.C.MyClientObject">
+                <property name="MyServiceFactory" ref="MyServiceFactory"/>
+              </object>
+            </objects>
+            </code>
+            </example>
+            <author>Colin Sampaleanu</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: ObjectFactoryCreatingFactoryObject.cs,v 1.9 2007/03/16 04:01:38 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject.CreateInstance">
+            <summary>
+            Returns an instance of the object factory.
+            </summary>
+            <returns>The object factory.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has set all supplied object properties.
+            </summary>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as failure to set an essential
+            property) or if initialization fails.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.Config.AbstractFactoryObject.AfterPropertiesSet"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject.TargetObjectName">
+            <summary>
+            Sets the name of the target object.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject.ObjectFactory">
+            <summary>
+            The target factory that will be used to perform the lookup
+            of the object referred to by the <see cref="P:Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject.TargetObjectName"/>
+            property.
+            </summary>
+            <value>
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            (will never be <see langword="null"/>).
+            </value>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of initialization errors.
+            </exception>
+            <seealso cref="P:Spring.Objects.Factory.IObjectFactoryAware.ObjectFactory"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject.ObjectType">
+            <summary>
+            The <see cref="T:System.Type"/> of object created by this factory.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.IGenericObjectFactory">
+            <summary>
+            Interface defining a factory which can return an object instance
+            (possibly shared or independent) when invoked. 
+            </summary>
+            <remarks>
+            This interface is typically used to encapsulate a generic factory 
+            which returns a new instance (prototype) on each invocation.
+            It is similar to the <see cref="T:Spring.Objects.Factory.IFactoryObject"/>, but
+            implementations of the aforementioned interface are normally meant to be defined
+            as instances by the user in an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>,
+            while implementations of this class are normally meant to be fed as a property to
+            other objects; as such, the
+            <see cref="M:Spring.Objects.Factory.IGenericObjectFactory.GetObject"/> method
+            has different exception handling behavior.
+            </remarks>
+            <author>Colin Sampaleanu</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: IGenericObjectFactory.cs,v 1.6 2006/04/09 07:18:48 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.IGenericObjectFactory.GetObject">
+            <summary>
+            Return an instance (possibly shared or independent)
+            of the object managed by this factory.
+            </summary>
+            <returns>
+            An instance of the object (should never be <see langword="null"/>).
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject.GenericObjectFactory.#ctor(Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject)">
+            <summary>
+            Creates a new instance of the GenericObjectFactory class.
+            </summary>
+            <param name="enclosing">
+            The enclosing
+            <see cref="T:Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectFactoryCreatingFactoryObject.GenericObjectFactory.GetObject">
+            <summary>
+            Returns the object created by the enclosed object factory.
+            </summary>
+            <returns>The created object.</returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.CustomConverterConfigurer">
+            <summary>
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            implementation that allows for convenient registration of custom
+            <see cref="T:System.ComponentModel.TypeConverter"/>s.
+            </summary>
+            <remarks>
+            <note>
+            The use of this class is <i>typically</i> not required; the .NET
+            mechanism of associating a
+            <see cref="T:System.ComponentModel.TypeConverter"/> with a
+            <see cref="T:System.Type"/>  via the use of the
+            <see cref="T:System.ComponentModel.TypeConverterAttribute"/> is the
+            recommended (and standard) way. This class primarily exists to cover
+            those cases where third party classes to which one does not have the
+            source need to be exposed to the type conversion mechanism.
+            </note>
+            <p>
+            Because the
+            <see cref="T:Spring.Objects.Factory.Config.CustomConverterConfigurer"/>
+            class implements the
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            interface, instances of this class that have been exposed in the
+            scope of an
+            <see cref="T:Spring.Context.IApplicationContext"/> will
+            <i>automatically</i> be picked up by the application context and made
+            available to the IoC container whenever type conversion is required. If
+            one is using a
+            <see cref="T:Spring.Objects.Factory.Config.CustomConverterConfigurer"/>
+            object definition within the scope of an
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/>, no such automatic
+            pickup of the
+            <see cref="T:Spring.Objects.Factory.Config.CustomConverterConfigurer"/>
+            is performed (custom converters will have to be added manually using the
+            <see cref="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterCustomConverter(System.Type,System.ComponentModel.TypeConverter)"/>
+            method). For <i>most</i> application scenarios, one will get better
+            mileage using the <see cref="T:Spring.Context.IApplicationContext"/>
+            abstraction.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            The following examples all assume XML based configuration, and use
+            inner object definitions to define the custom
+            <see cref="T:System.ComponentModel.TypeConverter"/> objects (nominally to
+            avoid polluting the object name space, but also because the
+            configuration simply reads better that way).
+            </p>
+            <code escaped="true">
+            <object id="customConverterConfigurer" type="Spring.Objects.Factory.Config.CustomConverterConfigurer, Spring.Core">
+              <property name="CustomConverters">
+                <dictionary>
+                  <entry key="System.Date">
+                    <object type="MyNamespace.MyCustomDateEditor"/>
+                  </entry>
+                  <entry key="MyNamespace.MyObject, MyAssembly">
+                    <object id="myConverter" type="MyNamespace.MObjectConverter, MyOtherAssembly">
+                      <property name="aProperty" value="..."/>
+                    </object>
+                  </entry>
+                </dictionary>
+              </property>
+            </object>
+            </code>
+            <p>
+            The following example illustrates a complete (albeit naieve) use case
+            for this class, including a custom
+            <see cref="T:System.ComponentModel.TypeConverter"/> implementation, said
+            converters domain class, and the XML configuration that hooks the
+            converter in place and makes it available to a Spring.NET container for
+            use during object resolution.
+            </p>
+            <p>
+            The domain class is a simple data-only object that contains the data
+            required to send an email message (such as the host and user account
+            name). A developer would prefer to use a string of the form
+            <c>UserName=administrator,Password=r1l0k1l3y,Host=localhost</c> to
+            configure the mail settings and just let the container take care of the
+            conversion.
+            </p>
+            <code language="C#">
+            namespace ExampleNamespace
+            {
+            	public sealed class MailSettings
+            	{
+            		private string _userName;
+            		private string _password;
+            		private string _host;
+            
+            		public string Host
+            		{
+            			get { return _host; }
+            			set { _host = value; }
+            		}
+            
+            	 	public string UserName
+            		{
+            			get { return _userName; }
+            			set { _userName = value; }
+            		}
+            
+            		public string Password
+            		{
+            			get { return _password; }
+            			set { _password = value; }
+            		}
+            	}
+            
+            	public sealed class MailSettingsConverter : TypeConverter
+            	{
+            		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+            	 	{
+            			if (typeof (string) == sourceType)
+            			{
+            				return true;
+            			}
+            			return base.CanConvertFrom(context, sourceType);
+            		}
+            
+            		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+            		{
+            			string text = value as string;
+            			if(text != null) 
+            			{
+            				MailSettings mailSettings = new MailSettings();
+            				string[] tokens = text.Split(',');
+            				for (int i = 0; i &lt; tokens.Length; ++i)
+            				{
+            					string token = tokens[i];
+            					string[] settings = token.Split('=');
+            					typeof(MailSettings).GetProperty(settings[0])
+            						.SetValue(mailSettings, settings[1], null);
+            				}
+            				return mailSettings;
+            			}
+            			return base.ConvertFrom(context, culture, value);
+            		}
+            	}
+            	
+            	// a very naieve class that uses the MailSettings class...
+            	public sealed class ExceptionLogger
+            	{
+            		private MailSettings _mailSettings;
+            		
+            		public MailSettings MailSettings {
+            		{
+            			set { _mailSettings = value; }
+            		}
+            		
+            		public void Log(object value)
+            		{
+            			Exception ex = value as Exception;
+            			if(ex != null) 
+            			{
+            				// use _mailSettings instance...
+            			}
+            		}
+            	}
+            }
+            </code>
+            <p>
+            The attendant XML configuration for the above classes would be...
+            </p>
+            <code escaped="true">
+            <object id="emailingExceptionLogger" type="ExampleNamespace.ExceptionLogger, MyAssembly">
+            	<property name="MailSettings" value="UserName=administrator,Password=r1l0k1l3y,Host=localhost"/>
+            </object>
+            <object id="customConverterConfigurer" type="Spring.Objects.Factory.Config.CustomConverterConfigurer, Spring.Core">
+            	<property name="CustomConverters">
+            		<dictionary>
+            			<entry key="ExampleNamespace.MailSettings, MyAssembly">
+            				<object type="ExampleNamespace.MailSettingsConverter, MyAssembly"/>
+            			</entry>
+            		</dictionary>
+            	</property>
+            </object>
+            </code>
+            </example>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: CustomConverterConfigurer.cs,v 1.14 2007/05/11 02:32:14 markpollack Exp $</version>
+            <seealso cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            <seealso cref="T:Spring.Context.IApplicationContext"/>
+            <seealso cref="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterCustomConverter(System.Type,System.ComponentModel.TypeConverter)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.CustomConverterConfigurer.PostProcessObjectFactory(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)">
+            <summary>
+            Registers any custom converters with the supplied
+            <paramref name="factory"/>.
+            </summary>
+            <param name="factory">
+            The object factory to register the converters with.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.CustomConverterConfigurer.ResolveConverter(System.Object)">
+            <summary>
+            Resolves the supplied <paramref name="value"/> into a
+            <see cref="T:System.ComponentModel.TypeConverter"/> instance.
+            </summary>
+            <param name="value">
+            The object that is to be resolved into a
+            <see cref="T:System.ComponentModel.TypeConverter"/> instance.
+            </param>
+            <returns>
+            A resolved <see cref="T:System.ComponentModel.TypeConverter"/> instance.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the supplied <paramref name="value"/> is <see langword="null"/>,
+            or the supplied <paramref name="value"/> cannot be resolved.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.CustomConverterConfigurer.CustomConverters">
+            <summary>
+            The custom converters to register.
+            </summary>
+            <remarks>
+            <p>
+            The <see cref="T:System.Collections.IDictionary"/> uses the type name
+            of the class that requires conversion as the key, and an
+            <b>instance</b> of the
+            <see cref="T:System.ComponentModel.TypeConverter"/> that will effect
+            the conversion. Alternatively, the actual
+            <see cref="T:System.Type"/> of the class that requires conversion
+            can be used as the key.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            <code language="C#">
+            IDictionary converters = new Hashtable();
+            converters.Add( "System.Date", new MyCustomDateConverter() );
+            // a System.Type instance can also be used as the key...
+            converters.Add( typeof(Color), new MyCustomRBGColorConverter() );
+            </code>
+            </p>
+            </example>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.ObjectDefinitionBuilder">
+            <summary>
+            Programmatic means of constructing a <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> using the builder pattern.  Intended primarily
+            for use when implementing custom namespace parsers.
+            </summary>
+            <remarks>Set methods are used instead of properties, so that chaining of methods can be used to create
+            'one-liner'definitions that set multiple properties at one.</remarks>
+            <author>Rod Johnson</author>
+            <author>Rob Harrop</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ObjectDefinitionBuilder.cs,v 1.4 2007/05/29 20:00:20 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Objects.Factory.Support.ObjectDefinitionBuilder"/> class, private
+            to force use of factory methods.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.RootObjectDefinition(Spring.Objects.Factory.Support.IObjectDefinitionFactory,System.String)">
+            <summary>
+            Create a new <code>ObjectDefinitionBuilder</code> used to construct a root object definition.
+            </summary>
+            <param name="objectDefinitionFactory">The object definition factory.</param>
+            <param name="objectTypeName">The type name of the object.</param>
+            <returns>A new <code>ObjectDefinitionBuilder</code> instance.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.RootObjectDefinition(Spring.Objects.Factory.Support.IObjectDefinitionFactory,System.String,System.String)">
+            <summary>
+            Create a new <code>ObjectDefinitionBuilder</code> used to construct a root object definition.
+            </summary>
+            <param name="objectDefinitionFactory">The object definition factory.</param>
+            <param name="objectTypeName">Name of the object type.</param>
+            <param name="factoryMethodName">Name of the factory method.</param>
+            <returns>A new <code>ObjectDefinitionBuilder</code> instance.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.RootObjectDefinition(Spring.Objects.Factory.Support.IObjectDefinitionFactory,System.Type)">
+            <summary>
+            Create a new <code>ObjectDefinitionBuilder</code> used to construct a root object definition.
+            </summary>
+            <param name="objectDefinitionFactory">The object definition factory.</param>
+            <param name="objectType">Type of the object.</param>
+            <returns>A new <code>ObjectDefinitionBuilder</code> instance.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.RootObjectDefinition(Spring.Objects.Factory.Support.IObjectDefinitionFactory,System.Type,System.String)">
+            <summary>
+            Create a new <code>ObjectDefinitionBuilder</code> used to construct a root object definition.
+            </summary>
+            <param name="objectDefinitionFactory">The object definition factory.</param>
+            <param name="objectType">Type of the object.</param>
+            <param name="factoryMethodName">Name of the factory method.</param>
+            <returns>A new <code>ObjectDefinitionBuilder</code> instance.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.ChildObjectDefinition(Spring.Objects.Factory.Support.IObjectDefinitionFactory,System.String)">
+            <summary>
+            Create a new <code>ObjectDefinitionBuilder</code> used to construct a child object definition..
+            </summary>
+            <param name="objectDefinitionFactory">The object definition factory.</param>
+            <param name="parentObjectName">Name of the parent object.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.AddPropertyValue(System.String,System.Object)">
+            <summary>
+            Adds the property value under the given name.
+            </summary>
+            <param name="name">The name.</param>
+            <param name="value">The value.</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.AddPropertyReference(System.String,System.String)">
+            <summary>
+            Adds a reference to the specified object name under the property specified.
+            </summary>
+            <param name="name">The name.</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.AddConstructorArg(System.Object)">
+            <summary>
+            Adds an index constructor arg value.  The current index is tracked internally and all addtions are
+            at the present point
+            </summary>
+            <param name="value">The constructor arg value.</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.AddConstructorArgReference(System.String)">
+            <summary>
+            Adds a reference to the named object as a constructor argument.
+            </summary>
+            <param name="objectName">Name of the object.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.SetFactoryMethod(System.String)">
+            <summary>
+            Sets the name of the factory method to use for this definition.
+            </summary>
+            <param name="factoryMethod">The factory method.</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.SetFactoryObject(System.String,System.String)">
+            <summary>
+            Sets the name of the factory object to use for this definition.
+            </summary>
+            <param name="factoryObject">The factory object.</param>
+            <param name="factoryMethod">The factory method.</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.SetSingleton(System.Boolean)">
+            <summary>
+            Sets whether or not this definition describes a singleton object.
+            </summary>
+            <param name="singleton">if set to <c>true</c> [singleton].</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.SetAbstract(System.Boolean)">
+            <summary>
+            Sets whether objects or not this definition is abstract.
+            </summary>
+            <param name="flag">if set to <c>true</c> [flag].</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.SetLazyInit(System.Boolean)">
+            <summary>
+            Sets whether objects for this definition should be lazily initialized or not.
+            </summary>
+            <param name="lazy">if set to <c>true</c> [lazy].</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.SetAutowireMode(Spring.Objects.Factory.Config.AutoWiringMode)">
+            <summary>
+            Sets the autowire mode for this definition.
+            </summary>
+            <param name="autowireMode">The autowire mode.</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.SetDependencyCheck(Spring.Objects.Factory.Support.DependencyCheckingMode)">
+            <summary>
+            Sets the dependency check mode for this definition.
+            </summary>
+            <param name="dependencyCheck">The dependency check.</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.SetDestroyMethodName(System.String)">
+            <summary>
+            Sets the name of the destroy method for this definition.
+            </summary>
+            <param name="methodName">Name of the method.</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.SetInitMethodName(System.String)">
+            <summary>
+            Sets the name of the init method for this definition.
+            </summary>
+            <param name="methodName">Name of the method.</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.SetResourceDescription(System.String)">
+            <summary>
+            Sets the resource description for this definition.
+            </summary>
+            <param name="resourceDescription">The resource description.</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.AddDependsOn(System.String)">
+            <summary>
+            Adds the specified object name to the list of objects that this definition depends on.
+            </summary>
+            <param name="objectName">Name of the object.</param>
+            <returns>The current <code>ObjectDefinitionBuilder</code>.</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.RawObjectDefinition">
+            <summary>
+            Gets the current object definition in its raw (unvalidated) form.
+            </summary>
+            <value>The raw object definition.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.ObjectDefinitionBuilder.ObjectDefinition">
+            <summary>
+            Validate and gets the object definition.
+            </summary>
+            <value>The object definition.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.EnvironmentVariableSource">
+            <summary>
+            Implementation of <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/> that
+            resolves variable name against environment variables.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: EnvironmentVariableSource.cs,v 1.3 2007/08/02 22:18:32 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.EnvironmentVariableSource.ResolveVariable(System.String)">
+            <summary>
+            Resolves variable value for the specified variable name.
+            </summary>
+            <param name="name">
+            The name of the variable to resolve.
+            </param>
+            <returns>
+            The variable value if able to resolve, <c>null</c> otherwise.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.RegistryVariableSource">
+            <summary>
+            Implementation of <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/> that
+            resolves variable name against registry key.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: RegistryVariableSource.cs,v 1.3 2007/08/03 08:31:24 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.RegistryVariableSource.ResolveVariable(System.String)">
+            <summary>
+            Resolves variable value for the specified variable name.
+            </summary>
+            <param name="name">
+            The name of the variable to resolve.
+            </param>
+            <remarks>
+            This implementation resolves REG_SZ as well as REG_MULTI_SZ values. In case of a REG_MULTI_SZ value,
+            strings are concatenated to a comma-separated list following <see cref="M:System.Collections.Specialized.NameValueCollection.Get(System.String)"/>
+            </remarks>
+            <returns>
+            The variable value if able to resolve, <c>null</c> otherwise.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.RegistryVariableSource.Key">
+            <summary>
+            Gets or sets the registry key to obtain variable values from.
+            </summary>
+            <value>
+            The registry key to obtain variable values from.
+            </value>
+        </member>
+        <member name="T:Spring.Globalization.Formatters.NumberFormatter">
+            <summary>
+            Implementation of <see cref="T:Spring.Globalization.IFormatter"/> that can be used to
+            format and parse numbers.
+            </summary>
+            <remarks>
+            <para>
+            <c>NumberFormatter</c> uses number-related properties of the
+            <see cref="T:System.Globalization.NumberFormatInfo"/> to format and parse numbers. 
+            </para>
+            <para>
+            This formatter works with both integer and decimal numbers and allows
+            you to format and parse numbers that conform to <see cref="F:System.Globalization.NumberStyles.Number"/>
+            number style (leading and trailing white space and/or sign, thousands separator,
+            decimal point)
+            </para>
+            <para>
+            If you use one of the constructors that accept culture as a parameter
+            to create an instance of <c>NumberFormatter</c>, default <c>NumberFormatInfo</c>
+            for the specified culture will be used.
+            </para>
+            <para>
+            You can also use properties exposed by the <c>NumberFormatter</c> in order
+            to override some of the default number formatting parameters.
+            </para>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: NumberFormatter.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.NumberFormatter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.NumberFormatter"/> class
+            using default <see cref="T:System.Globalization.NumberFormatInfo"/> for the current thread's culture.
+            </summary>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.NumberFormatter.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.NumberFormatter"/> class
+            using default <see cref="T:System.Globalization.NumberFormatInfo"/> for the specified culture.
+            </summary>
+            <param name="cultureName">The culture name.</param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.NumberFormatter.#ctor(System.Globalization.CultureInfo)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.NumberFormatter"/> class
+            using default <see cref="T:System.Globalization.NumberFormatInfo"/> for the specified culture.
+            </summary>
+            <param name="culture">The culture.</param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.NumberFormatter.#ctor(System.Globalization.NumberFormatInfo)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.NumberFormatter"/> class
+            using specified <see cref="T:System.Globalization.NumberFormatInfo"/>.
+            </summary>
+            <param name="formatInfo">
+            The <see cref="T:System.Globalization.NumberFormatInfo"/> instance that defines how 
+            numbers are formatted and parsed.
+            </param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.NumberFormatter.Format(System.Object)">
+            <summary>
+            Formats the specified number value.
+            </summary>
+            <param name="value">The value to format.</param>
+            <returns>Formatted number <paramref name="value"/>.</returns>
+            <exception cref="T:System.ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+            <exception cref="T:System.ArgumentException">If <paramref name="value"/> is not a number.</exception>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.NumberFormatter.Parse(System.String)">
+            <summary>
+            Parses the specified number value.
+            </summary>
+            <param name="value">The number value to parse.</param>
+            <returns>Parsed number value as a <see cref="T:System.Double"/>.</returns>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.NumberFormatter.DecimalDigits">
+            <summary>
+            Gets or sets the number of decimal digits.
+            </summary>
+            <value>The number of decimal digits.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.NumberDecimalDigits"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.NumberFormatter.DecimalSeparator">
+            <summary>
+            Gets or sets the decimal separator.
+            </summary>
+            <value>The decimal separator.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.NumberDecimalSeparator"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.NumberFormatter.GroupSizes">
+            <summary>
+            Gets or sets the number group sizes.
+            </summary>
+            <value>The number group sizes.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.NumberGroupSizes"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.NumberFormatter.GroupSeparator">
+            <summary>
+            Gets or sets the number group separator.
+            </summary>
+            <value>The number group separator.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.NumberGroupSeparator"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.NumberFormatter.NegativePattern">
+            <summary>
+            Gets or sets the negative pattern.
+            </summary>
+            <value>The number negative pattern.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.NumberNegativePattern"/>
+        </member>
+        <member name="T:Spring.Globalization.Formatters.BooleanFormatter">
+            <summary>
+            Implementation of <see cref="T:Spring.Globalization.IFormatter"/> that can be used to
+            format and parse boolean values.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: BooleanFormatter.cs,v 1.1 2007/06/01 08:59:31 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.BooleanFormatter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.BooleanFormatter"/> class
+            using default values
+            </summary>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.BooleanFormatter.#ctor(System.Boolean,System.String,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.BooleanFormatter"/> class
+            </summary>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.BooleanFormatter.Format(System.Object)">
+            <summary>
+            Formats the specified boolean value.
+            </summary>
+            <param name="value">The value to format.</param>
+            <returns>Formatted boolean value.</returns>
+            <exception cref="T:System.ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+            <exception cref="T:System.ArgumentException">If <paramref name="value"/> is not of type <see cref="T:System.Boolean"/>.</exception>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.BooleanFormatter.Parse(System.String)">
+            <summary>
+            Parses the specified boolean value according to settings of <see cref="P:Spring.Globalization.Formatters.BooleanFormatter.TrueString"/> and <see cref="P:Spring.Globalization.Formatters.BooleanFormatter.FalseString"/>
+            </summary>
+            <param name="value">The boolean value to parse.</param>
+            <returns>Parsed boolean value as a <see cref="T:System.Boolean"/>.</returns>
+            <exception cref="T:System.ArgumentException">If <paramref name="value"/> does not match <see cref="P:Spring.Globalization.Formatters.BooleanFormatter.TrueString"/> or <see cref="P:Spring.Globalization.Formatters.BooleanFormatter.FalseString"/>.</exception>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.BooleanFormatter.IgnoreCase">
+            <summary>
+            Set/Get value to control casesensitivity of <see cref="M:Spring.Globalization.Formatters.BooleanFormatter.Parse(System.String)"/>
+            </summary>
+            <remarks>
+            Defaults to <value>true</value>
+            </remarks>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.BooleanFormatter.TrueString">
+            <summary>
+            Set/Get value to recognize as boolean "true" value
+            </summary>
+            <remarks>
+            Defaults to <see cref="F:System.Boolean.TrueString"/>
+            </remarks>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.BooleanFormatter.FalseString">
+            <summary>
+            Set/Get value to recognize as boolean "false" value
+            </summary>
+            <remarks>
+            Defaults to <see cref="F:System.Boolean.FalseString"/>
+            </remarks>
+        </member>
+        <member name="T:Spring.Expressions.StringLiteralNode">
+            <summary>
+            Represents parsed string literal node.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: StringLiteralNode.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.StringLiteralNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.StringLiteralNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.StringLiteralNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the string literal node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.ExpressionListNode">
+            <summary>
+            Represents parsed expression list node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ExpressionListNode.cs,v 1.6 2007/09/07 03:01:24 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.ExpressionListNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.ExpressionListNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.ExpressionListNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a result of the last expression in a list.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Result of the last expression in a list</returns>
+        </member>
+        <member name="T:Spring.Expressions.SelectionFirstNode">
+            <summary>
+            Represents parsed selection node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SelectionFirstNode.cs,v 1.5 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.SelectionFirstNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SelectionFirstNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SelectionFirstNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns the first context item that matches selection expression.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpBetween">
+            <summary>
+            Represents logical BETWEEN operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpBetween.cs,v 1.5 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpBetween.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpBetween.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpBetween.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical IN operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>
+            true if the left operand is contained within the right operand, false otherwise.
+            </returns>
+        </member>
+        <member name="T:Spring.Expressions.Processors.SumAggregator">
+            <summary>
+            Implementation of the sum aggregator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SumAggregator.cs,v 1.2 2006/12/04 08:58:33 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.Processors.SumAggregator.Process(System.Collections.ICollection,System.Object[])">
+            <summary>
+            Returns the sum of the numeric values in the source collection.
+            </summary>
+            <param name="source">
+            The source collection to process.
+            </param>
+            <param name="args">
+            Ignored.
+            </param>
+            <returns>
+            The sum of the numeric values in the source collection.
+            </returns>
+        </member>
+        <member name="T:Spring.Expressions.Processors.OrderByProcessor">
+            <summary>
+            Implementation of the 'order by' processor.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Erich Eichinger</author>
+            <version>$Id: OrderByProcessor.cs,v 1.2 2008/03/20 23:58:16 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.Processors.OrderByProcessor.Process(System.Collections.ICollection,System.Object[])">
+            <summary>
+            Sorts the source collection using custom sort criteria.
+            </summary>
+            <remarks>
+            Please not that your compare function needs to take care about
+            proper conversion of types to be comparable!
+            </remarks>
+            <param name="source">
+            The source collection to sort.
+            </param>
+            <param name="args">
+            Sort criteria to use.
+            </param>
+            <returns>
+            A sorted array containing collection elements.
+            </returns>
+        </member>
+        <member name="T:Spring.Expressions.Processors.ConversionProcessor">
+            <summary>
+            Converts all elements in the input list to a given target type.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: ConversionProcessor.cs,v 1.1 2008/03/20 23:58:16 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.Processors.ConversionProcessor.Process(System.Collections.ICollection,System.Object[])">
+            <summary>
+            Processes a list of source items and returns a result.
+            </summary>
+            <param name="source">
+            The source list to process.
+            </param>
+            <param name="args">
+            An optional processor arguments array.
+            </param>
+            <returns>
+            The processing result.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.TypeResolution.TypeAssemblyHolder">
+            <summary>
+            Holds data about a <see cref="T:System.Type"/> and it's
+            attendant <see cref="T:System.Reflection.Assembly"/>.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeAssemblyHolder.TypeAssemblySeparator">
+            <summary>
+            The string that separates a <see cref="T:System.Type"/> name
+            from the name of it's attendant <see cref="T:System.Reflection.Assembly"/>
+            in an assembly qualified type name.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeAssemblyHolder.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the TypeAssemblyHolder class.
+            </summary>
+            <param name="unresolvedTypeName">
+            The unresolved name of a <see cref="T:System.Type"/>.
+            </param>
+        </member>
+        <member name="P:Spring.Core.TypeResolution.TypeAssemblyHolder.TypeName">
+            <summary>
+            The (unresolved) type name portion of the original type name.
+            </summary>
+        </member>
+        <member name="P:Spring.Core.TypeResolution.TypeAssemblyHolder.AssemblyName">
+            <summary>
+            The (unresolved, possibly partial) name of the attandant assembly.
+            </summary>
+        </member>
+        <member name="P:Spring.Core.TypeResolution.TypeAssemblyHolder.IsAssemblyQualified">
+            <summary>
+            Is the type name being resolved assembly qualified?
+            </summary>
+        </member>
+        <member name="T:Spring.Core.RegularExpressionEventNameCriteria">
+            <summary>
+            Criteria that is satisfied if the <c>Name</c> property of an
+            <see cref="T:System.Reflection.EventInfo"/> instance matches a
+            supplied regular expression pattern.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: RegularExpressionEventNameCriteria.cs,v 1.1 2007/07/31 01:35:07 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Core.RegularExpressionCriteria">
+            <summary>
+            A base class for all <see cref="T:Spring.Core.ICriteria"/>
+            implementations that are regular expression based.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: RegularExpressionCriteria.cs,v 1.1 2007/07/31 01:35:07 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Core.RegularExpressionCriteria.MatchAnyThingPattern">
+            <summary>
+            The default pattern... matches absolutely anything.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.RegularExpressionCriteria.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.RegularExpressionCriteria"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.RegularExpressionCriteria.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.RegularExpressionCriteria"/> class.
+            </summary>
+            <param name="pattern">
+            The regular expression pattern to be applied.
+            </param>
+        </member>
+        <member name="M:Spring.Core.RegularExpressionCriteria.IsSatisfied(System.Object)">
+            <summary>
+            Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+            this instance?
+            </summary>
+            <param name="datum">The datum to be checked by this criteria instance.</param>
+            <returns>
+            True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+            by this instance; false if not or the supplied <paramref name="datum"/> is null.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.RegularExpressionCriteria.IsMatch(System.String)">
+            <summary>
+            Convenience method that calls the
+            <see cref="M:System.Text.RegularExpressions.Regex.IsMatch(System.String)"/>
+            on the supplied <paramref name="input"/>.
+            </summary>
+            <param name="input">The input to match against.</param>
+            <returns>True if the <paramref name="input"/> matches.</returns>
+        </member>
+        <member name="P:Spring.Core.RegularExpressionCriteria.Pattern">
+            <summary>
+            The regular expression pattern to be applied.
+            </summary>
+        </member>
+        <member name="P:Spring.Core.RegularExpressionCriteria.Options">
+            <summary>
+            The regular expression options to be applied.
+            </summary>
+        </member>
+        <member name="P:Spring.Core.RegularExpressionCriteria.Expression">
+            <summary>
+            The regular expression to be applied.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.RegularExpressionEventNameCriteria.MatchAnyEventNamePattern">
+            <summary>
+            The default event name pattern... matches pretty much any event name.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.RegularExpressionEventNameCriteria.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.RegularExpressionEventNameCriteria"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.RegularExpressionEventNameCriteria.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.RegularExpressionEventNameCriteria"/> class.
+            </summary>
+            <param name="eventNamePattern">
+            The pattern that <see cref="T:System.Reflection.EventInfo"/> names
+            must match against in order to satisfy this criteria.
+            </param>
+        </member>
+        <member name="M:Spring.Core.RegularExpressionEventNameCriteria.IsSatisfied(System.Object)">
+            <summary>
+            Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+            this instance?
+            </summary>
+            <param name="datum">The datum to be checked by this criteria instance.</param>
+            <returns>
+            True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+            by this instance; false if not or the supplied <paramref name="datum"/> is null.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.MethodNameMatchCriteria">
+            <summary>
+            Criteria that is satisfied if the method <c>Name</c> of an
+            <see cref="T:System.Reflection.MethodInfo"/> instance matches a
+            supplied string pattern.
+            </summary>
+            <remarks>
+            <para>
+            Supports the following simple pattern styles: 
+            "xxx*", "*xxx" and "*xxx*" matches, as well as direct equality.
+            </para>
+            </remarks>
+            <author>Bruno Baia</author>
+            <version>$Id: MethodNameMatchCriteria.cs,v 1.1 2007/08/04 01:04:34 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.MethodNameMatchCriteria.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.MethodNameMatchCriteria"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This constructor sets the
+            <see cref="P:Spring.Core.MethodNameMatchCriteria.Pattern"/>
+            property to * (any method name).
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Core.MethodNameMatchCriteria.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.MethodNameMatchCriteria"/> class.
+            </summary>
+            The pattern that <see cref="T:System.Reflection.MethodInfo"/> names
+            must match against in order to satisfy this criteria.
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="pattern"/> is null or resolve to an empty string.
+            </exception>
+        </member>
+        <member name="M:Spring.Core.MethodNameMatchCriteria.IsSatisfied(System.Object)">
+            <summary>
+            Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+            this instance?
+            </summary>
+            <param name="datum">The datum to be checked by this criteria instance.</param>
+            <returns>
+            True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+            by this instance; false if not or the supplied <paramref name="datum"/> is null.
+            </returns>
+        </member>
+        <member name="P:Spring.Core.MethodNameMatchCriteria.Pattern">
+            <summary>
+            The number of parameters that a <see cref="T:System.Reflection.MethodInfo"/>
+            must have to satisfy this criteria.
+            </summary>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied value is null or resolve to an empty string.
+            </exception>
+        </member>
+        <member name="T:Spring.Core.Conventions">
+            <summary>
+            Provides methods to support various naming and other conventions used throughout the framework.
+            Mainly for internal use within the framework.
+            </summary>
+            <author>Rob Harrop</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: Conventions.cs,v 1.1 2007/05/26 00:42:36 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Core.Conventions.AttributeNameToPropertyName(System.String)">
+            <summary> Convert <code>String</code>s in attribute name format (lowercase, hyphens separating words)
+            into property name format (camel-cased). For example, <code>transaction-manager</code> is
+            converted into <code>transactionManager</code>.
+            </summary>
+        </member>
+        <member name="T:Spring.Collections.PriorityQueue">
+            <summary> 
+            An unbounded priority <see cref="T:Spring.Collections.IQueue"/> based on a priority
+            heap.  This queue orders elements according to an order specified
+            at construction time, which is specified either according to their
+            <i>natural order</i> (see <see cref="T:System.IComparable"/>, or according to a
+            <see cref="T:System.Collections.IComparer"/>, depending on which constructor is
+            used. A priority queue does not permit <see lang="null"/> elements.
+            A priority queue relying on natural ordering also does not
+            permit insertion of non-comparable objects (doing so will result
+            <see cref="T:System.InvalidCastException"/>.
+            
+            <p/>
+            The <i>head</i> of this queue is the <i>lowest</i> element
+            with respect to the specified ordering.  If multiple elements are
+            tied for lowest value, the head is one of those elements -- ties are
+            broken arbitrarily. 
+            
+            <p/>
+            A priority queue is unbounded, but has an internal
+            <i>capacity</i> governing the size of an array used to store the
+            elements on the queue.  It is always at least as large as the queue
+            size.  As elements are added to a priority queue, its capacity
+            grows automatically.  The details of the growth policy are not
+            specified.
+            
+            <p/>
+            This class and its enumerator implement all of the
+            <i>optional</i> methods of the <see cref="T:System.Collections.ICollection"/> and
+            <see cref="T:System.Collections.IEnumerator"/> interfaces.
+            The enumerator provided in method <see cref="M:System.Collections.IEnumerable.GetEnumerator"/> 
+            is <b>not</b> guaranteed to traverse the elements of the PriorityQueue in any
+            particular order.
+            
+            <p/> 
+            Note that this implementation is <b>NOT</b> synchronized.
+            Multiple threads should not access a <see cref="T:Spring.Collections.PriorityQueue"/>
+            instance concurrently if any of the threads modifies the list
+            structurally. Instead, use the thread-safe PriorityBlockingQueue.
+            </summary>
+            <author>Josh Bloch</author>
+            <author>Griffin Caprio (.NET)</author>
+        </member>
+        <member name="T:Spring.Collections.AbstractQueue">
+            <summary> 
+            This class provides skeletal implementations of some
+            <see cref="T:Spring.Collections.IQueue"/> operations.
+            </summary>
+            <remarks>
+            <p>
+            The implementations in this class are appropriate when the base
+            implementation does not allow <see lang="null"/> elements. The methods
+            <see cref="M:Spring.Collections.AbstractQueue.Add(System.Object)"/>,
+            <see cref="M:Spring.Collections.AbstractQueue.Remove"/>, and
+            <see cref="M:Spring.Collections.AbstractQueue.Element"/> are based on
+            the <see cref="M:Spring.Collections.AbstractQueue.Offer(System.Object)"/>,
+            <see cref="M:Spring.Collections.AbstractQueue.Poll"/>, and
+            <see cref="M:Spring.Collections.AbstractQueue.Peek"/> methods
+            respectively but throw exceptions instead of indicating failure via
+            <see lang="false"/> or <see lang="null"/> returns.
+            <p/> 
+            An <see cref="T:Spring.Collections.IQueue"/> implementation that extends this class must
+            minimally define a method
+            <see cref="M:Spring.Collections.AbstractQueue.Offer(System.Object)"/> which does
+            not permit the insertion of <see lang="null"/> elements, along with methods 
+            <see cref="M:Spring.Collections.AbstractQueue.Poll"/>, and
+            <see cref="M:Spring.Collections.AbstractQueue.Peek"/>. Typically,
+            additional methods will be overridden as well. If these requirements
+            cannot be met, consider instead subclassing
+            <see cref="T:System.Collections.CollectionBase"/>}.
+            </p>
+            </remarks>
+            <author>Doug Lea</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: AbstractQueue.cs,v 1.8 2007/08/27 09:38:11 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Collections.IQueue">
+            <summary>
+            A collection designed for holding elements prior to processing.
+            </summary>
+            <remarks>
+            <p>
+            Besides basic <see cref="T:System.Collections.ICollection"/> operations,
+            queues provide additional insertion, extraction, and inspection
+            operations.
+            </p>
+            <p>
+            Each of these methods exists in two forms: one throws
+            an exception if the operation fails, the other returns a special
+            value (either <see lang="null"/> or <see lang="false"/>, depending on the
+            operation). The latter form of the insert operation is designed
+            specifically for use with capacity-restricted <see cref="T:Spring.Collections.IQueue"/>
+            implementations; in most implementations, insert operations cannot
+            fail.
+            </p>
+            <p>
+            Queues typically, but do not necessarily, order elements in a
+            FIFO (first-in-first-out) manner. Among the exceptions are
+            priority queues, which order elements according to a supplied
+            comparator, or the elements' natural ordering, and LIFO queues (or
+            stacks) which order the elements LIFO (last-in-first-out).
+            Whatever the ordering used, the head of the queue is that
+            element which would be removed by a call to
+            <see cref="M:Spring.Collections.IQueue.Remove"/> or
+            <see cref="M:Spring.Collections.IQueue.Poll"/>. In a FIFO queue, all new
+            elements are inserted at the tail of the queue. Other kinds of queues may
+            use different placement rules. Every <see cref="T:Spring.Collections.IQueue"/> implementation
+            must specify its ordering properties.
+            </p>
+            <p>
+            The <see cref="M:Spring.Collections.IQueue.Offer(System.Object)"/> method inserts an
+            element if possible, otherwise returning <see lang="false"/>. This differs from the 
+            <see cref="M:Spring.Collections.IQueue.Add(System.Object)"/> method, which can fail to
+            add an element only by throwing an exception. The
+            <see cref="M:Spring.Collections.IQueue.Offer(System.Object)"/> method is designed for
+            use when failure is a normal, rather than exceptional occurrence, for example,
+            in fixed-capacity (or "bounded" queues.
+            </p>
+            <p>
+            The <see cref="M:Spring.Collections.IQueue.Remove"/>
+            <see cref="M:Spring.Collections.IQueue.Poll"/> methods remove and
+            return the head of the queue. Exactly which element is removed from the
+            queue is a function of the queue's ordering policy, which differs from
+            implementation to implementation. The
+            <see cref="M:Spring.Collections.IQueue.Remove"/> and
+            <see cref="M:Spring.Collections.IQueue.Poll"/> methods differ only in their
+            behavior when the queue is empty: the
+            <see cref="M:Spring.Collections.IQueue.Remove"/> method throws an exception,
+            while the <see cref="M:Spring.Collections.IQueue.Poll"/> method returns
+            <see lang="null"/>.
+            </p>
+            <p>
+            The <see cref="M:Spring.Collections.IQueue.Element"/> and
+            <see cref="M:Spring.Collections.IQueue.Peek"/> methods return, but do
+            not remove, the head of the queue.
+            </p>
+            <p>
+            The <see cref="T:Spring.Collections.IQueue"/> interface does not define the blocking queue
+            methods, which are common in concurrent programming.
+            </p>
+            <p>
+            <see cref="T:Spring.Collections.IQueue"/> implementations generally do not allow insertion
+            of <see lang="null"/> elements, although some implementations, such as
+            a linked list, do not prohibit the insertion of <see lang="null"/>.
+            Even in the implementations that permit it, <see lang="null"/> should
+            not be inserted into a <see cref="T:Spring.Collections.IQueue"/>, as <see lang="null"/> is also
+            used as a special return value by the
+            <see cref="M:Spring.Collections.IQueue.Poll"/> method to
+            indicate that the queue contains no elements.
+            </p>
+            <p>
+            <see cref="T:Spring.Collections.IQueue"/> implementations generally do not define
+            element-based versions of methods <see cref="M:System.Object.Equals(System.Object)"/> 
+            and <see cref="M:System.Object.GetHashCode"/>, but instead inherit the
+            identity based versions from the class object, because element-based equality
+            is not always well-defined for queues with the same elements but different
+            ordering properties.
+            </p>
+            <p>
+            Based on the back port of JCP JSR-166.
+            </p>
+            </remarks>
+            <author>Doug Lea</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: IQueue.cs,v 1.7 2006/09/30 18:39:24 gcaprio Exp $</version>
+        </member>
+        <member name="M:Spring.Collections.IQueue.Add(System.Object)">
+            <summary> 
+            Inserts the specified element into this queue if it is possible to do so
+            immediately without violating capacity restrictions, returning
+            <see lang="true"/> upon success and throwing an
+            <see cref="T:System.InvalidOperationException"/> if no space is
+            currently available.
+            </summary>
+            <param name="objectToAdd">
+            The element to add.
+            </param>
+            <returns> 
+            <see lang="true"/> if successful.
+            </returns>
+            <exception cref="T:System.InvalidOperationException">
+            If the element cannot be added at this time due to capacity restrictions.
+            </exception>
+            <exception cref="T:System.InvalidCastException">
+            If the class of the supplied <paramref name="objectToAdd"/> prevents it
+            from being added to this queue.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the specified element is <see lang="null"/> and this queue does not
+            permit <see lang="null"/> elements.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If some property of the supplied <paramref name="objectToAdd"/> prevents
+            it from being added to this queue.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.IQueue.Offer(System.Object)">
+            <summary> 
+            Inserts the specified element into this queue if it is possible to do
+            so immediately without violating capacity restrictions.
+            </summary>
+            <remarks>
+            <p>
+            When using a capacity-restricted queue, this method is generally
+            preferable to <see cref="M:Spring.Collections.IQueue.Add(System.Object)"/>,
+            which can fail to insert an element only by throwing an exception.
+            </p>
+            </remarks>
+            <param name="objectToAdd">
+            The element to add.
+            </param>
+            <returns>
+            <see lang="true"/> if the element was added to this queue.
+            </returns>
+            <exception cref="T:System.InvalidOperationException">
+            If the element cannot be added at this time due to capacity restrictions.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="objectToAdd"/> is
+            <see lang="null"/>.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If some property of the supplied <paramref name="objectToAdd"/> prevents
+            it from being added to this queue.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.IQueue.Remove">
+            <summary> 
+            Retrieves and removes the head of this queue.
+            </summary>
+            <remarks>
+            <p>
+            This method differs from <see cref="M:Spring.Collections.IQueue.Poll"/>
+            only in that it throws an exception if this queue is empty.
+            </p>
+            </remarks>
+            <returns> 
+            The head of this queue
+            </returns>
+            <exception cref="T:Spring.Collections.NoElementsException">if this queue is empty</exception>
+        </member>
+        <member name="M:Spring.Collections.IQueue.Poll">
+            <summary> 
+            Retrieves and removes the head of this queue,
+            or returns <see lang="null"/> if this queue is empty.
+            </summary>
+            <returns> 
+            The head of this queue, or <see lang="null"/> if this queue is empty.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.IQueue.Element">
+            <summary> 
+            Retrieves, but does not remove, the head of this queue.
+            </summary>
+            <remarks>
+            <p>
+            This method differs from <see cref="M:Spring.Collections.IQueue.Peek"/>
+            only in that it throws an exception if this queue is empty.
+            </p>
+            </remarks>
+            <returns> 
+            The head of this queue.
+            </returns>
+            <exception cref="T:Spring.Collections.NoElementsException">If this queue is empty.</exception>
+        </member>
+        <member name="M:Spring.Collections.IQueue.Peek">
+            <summary> 
+            Retrieves, but does not remove, the head of this queue,
+            or returns <see lang="null"/> if this queue is empty.
+            </summary>
+            <returns> 
+            The head of this queue, or <see lang="null"/> if this queue is empty.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.IQueue.IsEmpty">
+            <summary>
+            Returns <see lang="true"/> if there are no elements in the <see cref="T:Spring.Collections.IQueue"/>, <see lang="false"/> otherwise.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.AbstractQueue.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Collections.AbstractQueue"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is an abstract class, and as such has no publicly
+            visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Collections.AbstractQueue.Add(System.Object)">
+            <summary> 
+            Inserts the specified element into this queue if it is possible
+            to do so immediately without violating capacity restrictions.
+            </summary>
+            <param name="objectToAdd">
+            The element to add.
+            </param>
+            <returns> 
+            <see lang="true"/> if successful.
+            </returns>
+            <exception cref="T:System.InvalidOperationException">
+            If the element cannot be added at this time due to capacity restrictions.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.AbstractQueue.Remove">
+            <summary> 
+            Retrieves and removes the head of this queue.
+            </summary>
+            <remarks>
+            <p>
+            This method differs from
+            <see cref="M:Spring.Collections.AbstractQueue.Poll"/> only in that
+            it throws an exception if this queue is empty.
+            </p>
+            </remarks>
+            <returns> 
+            The head of this queue
+            </returns>
+            <exception cref="T:Spring.Collections.NoElementsException">
+            If this queue is empty.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.AbstractQueue.Element">
+            <summary> 
+            Retrieves, but does not remove, the head of this queue.
+            </summary>
+            <remarks>
+            <p>
+            This method differs from <see cref="M:Spring.Collections.AbstractQueue.Peek"/>
+            only in that it throws an exception if this queue is empty.
+            </p>
+            <p>
+            ALso note that this implementation returns the result of
+            <see cref="M:Spring.Collections.AbstractQueue.Peek"/> unless the queue
+            is empty.
+            </p>
+            </remarks>
+            <returns>The head of this queue.</returns>
+            <exception cref="T:Spring.Collections.NoElementsException">
+            If this queue is empty.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.AbstractQueue.Clear">
+            <summary> 
+            Removes all of the elements from this queue.
+            </summary>
+            <remarks>
+            <p>
+            The queue will be empty after this call returns.
+            </p>
+            <p>
+            This implementation repeatedly invokes
+            <see cref="M:Spring.Collections.AbstractQueue.Poll"/> until it
+            returns <see lang="null"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Collections.AbstractQueue.AddAll(System.Collections.ICollection)">
+            <summary> 
+            Adds all of the elements in the supplied <paramref name="collection"/>
+            to this queue.
+            </summary>
+            <remarks>
+            <p>
+            Attempts to
+            <see cref="M:Spring.Collections.AbstractQueue.AddAll(System.Collections.ICollection)"/>
+            of a queue to itself result in <see cref="T:System.ArgumentException"/>.
+            Further, the behavior of this operation is undefined if the specified
+            collection is modified while the operation is in progress.
+            </p>
+            <p>
+            This implementation iterates over the specified collection,
+            and adds each element returned by the iterator to this queue, in turn.
+            An exception encountered while trying to add an element (including,
+            in particular, a <see lang="null"/> element) may result in only some
+            of the elements having been successfully added when the associated
+            exception is thrown.
+            </p>
+            </remarks>
+            <param name="collection">
+            The collection containing the elements to be added to this queue.
+            </param>
+            <returns>
+            <see lang="true"/> if this queue changed as a result of the call.
+            </returns>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="collection"/> or any one of its elements are <see lang="null"/>.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If the collection is the current <see cref="T:Spring.Collections.IQueue"/> or 
+            the collection size is greater than the queue capacity.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.AbstractQueue.Offer(System.Object)">
+            <summary> 
+            Inserts the specified element into this queue if it is possible to do
+            so immediately without violating capacity restrictions.
+            </summary>
+            <remarks>
+            <p>
+            When using a capacity-restricted queue, this method is generally
+            preferable to <see cref="M:Spring.Collections.IQueue.Add(System.Object)"/>,
+            which can fail to insert an element only by throwing an exception.
+            </p>
+            </remarks>
+            <param name="objectToAdd">
+            The element to add.
+            </param>
+            <returns>
+            <see lang="true"/> if the element was added to this queue.
+            </returns>
+            <exception cref="T:System.InvalidOperationException">
+            If the element cannot be added at this time due to capacity restrictions.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="objectToAdd"/> is
+            <see lang="null"/>.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If some property of the supplied <paramref name="objectToAdd"/> prevents
+            it from being added to this queue.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.AbstractQueue.Peek">
+            <summary> 
+            Retrieves, but does not remove, the head of this queue,
+            or returns <see lang="null"/> if this queue is empty.
+            </summary>
+            <returns> 
+            The head of this queue, or <see lang="null"/> if this queue is empty.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.AbstractQueue.Poll">
+            <summary> 
+            Retrieves and removes the head of this queue,
+            or returns <see lang="null"/> if this queue is empty.
+            </summary>
+            <returns> 
+            The head of this queue, or <see lang="null"/> if this queue is empty.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.AbstractQueue.CopyTo(System.Array,System.Int32)">
+            <summary>
+            Copies the elements of the <see cref="T:System.Collections.ICollection"></see> to an <see cref="T:System.Array"></see>, starting at a particular <see cref="T:System.Array"></see> index.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:System.Array"></see> that is the destination of the elements copied from <see cref="T:System.Collections.ICollection"></see>. The <see cref="T:System.Array"></see> must have zero-based indexing. </param>
+            <param name="index">The zero-based index in array at which copying begins. </param>
+            <exception cref="T:System.ArgumentNullException">array is null. </exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">index is less than zero. </exception>
+            <exception cref="T:System.ArgumentException">array is multidimensional.-or- index is equal to or greater than the length of array.-or- The number of elements in the source <see cref="T:System.Collections.ICollection"></see> is greater than the available space from index to the end of the destination array. </exception>
+            <exception cref="T:System.InvalidCastException">The type of the source <see cref="T:System.Collections.ICollection"></see> cannot be cast automatically to the type of the destination array. </exception><filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Spring.Collections.AbstractQueue.GetEnumerator">
+            <summary>
+            Returns an enumerator that iterates through a collection.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"></see> object that can be used to iterate through the collection.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.AbstractQueue.IsEmpty">
+            <summary>
+            Returns <see lang="true"/> if there are no elements in the <see cref="T:Spring.Collections.IQueue"/>, <see lang="false"/> otherwise.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.AbstractQueue.Capacity">
+            <summary>
+            Returns the current capacity of this queue.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.AbstractQueue.Count">
+            <summary>
+            Gets the number of elements contained in the <see cref="T:System.Collections.ICollection"></see>.
+            </summary>
+            <returns>
+            The number of elements contained in the <see cref="T:System.Collections.ICollection"></see>.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.AbstractQueue.SyncRoot">
+            <summary>
+            Gets an object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"></see>.
+            </summary>
+            <returns>
+            An object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"></see>.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.AbstractQueue.IsSynchronized">
+            <summary>
+            Gets a value indicating whether access to the <see cref="T:System.Collections.ICollection"></see> is synchronized (thread safe).
+            </summary>
+            <returns>
+            true if access to the <see cref="T:System.Collections.ICollection"></see> is synchronized (thread safe); otherwise, false.
+            </returns>
+        </member>
+        <member name="F:Spring.Collections.PriorityQueue._queue">
+            <summary> 
+            Priority queue represented as a balanced binary heap: the two children
+            of queue[n] are queue[2*n] and queue[2*n + 1].  The priority queue is
+            ordered by comparator, or by the elements' natural ordering, if
+            comparator is null:  For each node n in the heap and each descendant d
+            of n, n &lt;= d.
+            
+            The element with the lowest value is in queue[1], assuming the queue is
+            nonempty.  (A one-based array is used in preference to the traditional
+            zero-based array to simplify parent and child calculations.)
+            
+            queue.length must be >= 2, even if size == 0.
+            </summary>
+        </member>
+        <member name="F:Spring.Collections.PriorityQueue._priorityQueueSize">
+            <summary> The number of elements in the priority queue.</summary>
+        </member>
+        <member name="F:Spring.Collections.PriorityQueue._comparator">
+            <summary> 
+            The comparator, or null if priority queue uses elements'
+            natural ordering.
+            </summary>
+        </member>
+        <member name="F:Spring.Collections.PriorityQueue._queueModificationCount">
+            <summary> 
+            The number of times this priority queue has been
+            <i>structurally modified</i>.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.#ctor">
+            <summary>
+            Creates a <see cref="T:Spring.Collections.PriorityQueue"/> with the default initial capacity
+            (11) that orders its elements according to their natural
+            ordering (using <see cref="T:System.IComparable"/>).
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.#ctor(System.Int32)">
+            <summary> 
+            Creates a <see cref="T:Spring.Collections.PriorityQueue"/> with the specified initial capacity
+            that orders its elements according to their natural ordering
+            (using <see cref="T:System.IComparable"/>).
+            </summary>
+            <param name="initialCapacity">the initial capacity for this priority queue.
+            </param>
+            <exception cref="T:System.ArgumentException">if <paramref name="initialCapacity"/> is less than 1.</exception>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.#ctor(System.Int32,System.Collections.IComparer)">
+            <summary> 
+            Creates a <see cref="T:Spring.Collections.PriorityQueue"/> with the specified initial capacity
+            that orders its elements according to the specified comparator.
+            </summary>
+            <param name="initialCapacity">the initial capacity for this priority queue.</param>
+            <param name="comparator">the comparator used to order this priority queue.
+            If <see lang="null"/> then the order depends on the elements' natural ordering.
+            </param>
+            <exception cref="T:System.ArgumentException">if <paramref name="initialCapacity"/> is less than 1.</exception>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.#ctor(System.Collections.ICollection)">
+            <summary> 
+            Creates a <see cref="T:Spring.Collections.PriorityQueue"/> containing the elements in the
+            specified collection.  The priority queue has an initial
+            capacity of 110% of the size of the specified collection or 1
+            if the collection is empty.  If the specified collection is an
+            instance of a <see cref="T:Spring.Collections.PriorityQueue"/>, the priority queue will be sorted
+            according to the same comparator, or according to its elements'
+            natural order if the collection is sorted according to its
+            elements' natural order.  Otherwise, the priority queue is
+            ordered according to its elements' natural order.
+            </summary>
+            <param name="collection">the collection whose elements are to be placed into this priority queue.</param>
+            <exception cref="T:System.InvalidCastException">if elements of <paramref name="collection"/> cannot be 
+            compared to one another according to the priority queue's ordering</exception>
+            <exception cref="T:System.ArgumentNullException">if <paramref name="collection"/> or any element with it is
+            <see lang="null"/>
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.initializeArray(System.Collections.ICollection)">
+            <summary> 
+            Common code to initialize underlying queue array across
+            constructors below.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.urShift(System.Int32,System.Int32)">
+            <summary>
+            Performs an unsigned bitwise right shift with the specified number
+            </summary>
+            <param name="number">Number to operate on</param>
+            <param name="bits">Ammount of bits to shift</param>
+            <returns>The resulting number from the shift operation</returns>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.fixUp(System.Int32)">
+            <summary> 
+            Establishes the heap invariant assuming the heap
+            satisfies the invariant except possibly for the leaf-node indexed by k
+            (which may have a nextExecutionTime less than its parent's).
+            </summary>
+            <remarks>
+            This method functions by "promoting" queue[k] up the hierarchy
+            (by swapping it with its parent) repeatedly until queue[k]
+            is greater than or equal to its parent.
+            </remarks>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.fixDown(System.Int32)">
+            <summary> 
+            Establishes the heap invariant (described above) in the subtree
+            rooted at k, which is assumed to satisfy the heap invariant except
+            possibly for node k itself (which may be greater than its children).
+            </summary>
+            <remarks>
+            This method functions by "demoting" queue[k] down the hierarchy
+            (by swapping it with its smaller child) repeatedly until queue[k]
+            is less than or equal to its children.
+            </remarks>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.heapify">
+            <summary> 
+            Establishes the heap invariant in the entire tree,
+            assuming nothing about the order of the elements prior to the call.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.getQueueSizeBasedOnPercentage(System.Int32,System.Int64)">
+            <summary>
+            Returns the <paramref name="percentage"/> of <paramref name="size"/> or <see cref="F:System.Int32.MaxValue"/> - 1,
+            whichever is smaller. 
+            </summary>
+            <param name="size">base size</param>
+            <param name="percentage">percentage to return</param>
+            <returns><paramref name="percentage"/> of <paramref name="size"/></returns>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.fillFromSorted(System.Collections.ICollection)">
+            <summary> 
+            Initially fill elements of the queue array under the
+            knowledge that it is sorted or is another <see cref="T:Spring.Collections.PriorityQueue"/>, in which
+            case we can just place the elements in the order presented.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.fillFromUnsorted(System.Collections.ICollection)">
+            <summary> 
+            Initially fill elements of the queue array that is not to our knowledge
+            sorted, so we must rearrange the elements to guarantee the heap
+            invariant.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.removeAt(System.Int32)">
+            <summary> 
+            Removes and returns element located at <paramref name="index"/> from queue.  (Recall that the queue
+            is one-based, so 1 &lt;= i &lt;= size.)
+            </summary>
+            <remarks>
+            Normally this method leaves the elements at positions from 1 up to i-1,
+            inclusive, untouched.  Under these circumstances, it returns <see lang="null"/>.
+            Occasionally, in order to maintain the heap invariant, it must move
+            the last element of the list to some index in the range [2, i-1],
+            and move the element previously at position (i/2) to position i.
+            Under these circumstances, this method returns the element that was
+            previously at the end of the list and is now at some position between
+            2 and i-1 inclusive.
+            </remarks>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.grow(System.Int32)">
+            <summary> Resize array, if necessary, to be able to hold given index</summary>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.Offer(System.Object)">
+            <summary> 
+            Inserts the specified element into this queue if it is possible to do
+            so immediately without violating capacity restrictions.
+            </summary>
+            <remarks>
+            <p>
+            When using a capacity-restricted queue, this method is generally
+            preferable to <see cref="M:Spring.Collections.IQueue.Add(System.Object)"/>,
+            which can fail to insert an element only by throwing an exception.
+            </p>
+            </remarks>
+            <param name="objectToAdd">
+            The element to add.
+            </param>
+            <returns>
+            <see lang="true"/> if the element was added to this queue.
+            </returns>
+            <exception cref="T:System.InvalidCastException">
+            if the specified element cannot be compared
+            with elements currently in the priority queue according
+            to the priority queue's ordering.
+            </exception>
+            <exception cref="T:System.InvalidOperationException">
+            If the element cannot be added at this time due to capacity restrictions.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="objectToAdd"/> is
+            <see lang="null"/> and this queue does not permit <see lang="null"/>
+            elements.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If some property of the supplied <paramref name="objectToAdd"/> prevents
+            it from being added to this queue.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.Peek">
+            <summary> 
+            Retrieves, but does not remove, the head of this queue,
+            or returns <see lang="null"/> if this queue is empty.
+            </summary>
+            <returns> 
+            The head of this queue, or <see lang="null"/> if this queue is empty.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.Add(System.Object)">
+            <summary> 
+            Inserts the specified element into this queue if it is possible to do so
+            immediately without violating capacity restrictions, returning
+            <see lang="true"/> upon success and throwing an
+            <see cref="T:System.InvalidOperationException"/> if no space is
+            currently available.
+            </summary>
+            <param name="objectToAdd">
+            The element to add.
+            </param>
+            <returns> 
+            <see lang="true"/> if successful.
+            </returns>
+            <exception cref="T:System.InvalidOperationException">
+            If the element cannot be added at this time due to capacity restrictions.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the specified element is <see lang="null"/> and this queue does not
+            permit <see lang="null"/> elements.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If some property of the supplied <paramref name="objectToAdd"/> prevents
+            it from being added to this queue.
+            </exception>
+            <exception cref="T:System.InvalidCastException">
+            if the specified element cannot be compared
+            with elements currently in the priority queue according
+            to the priority queue's ordering.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.Remove(System.Object)">
+            <summary> 
+            Removes a single instance of the specified element from this
+            queue, if it is present.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.GetEnumerator">
+            <summary> 
+            Returns an <see cref="T:System.Collections.IEnumerator"/> over the elements in this queue. 
+            The enumeratoar does not return the elements in any particular order.
+            </summary>
+            <returns> an enumerator over the elements in this queue.</returns>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.Clear">
+            <summary> 
+            Removes all elements from the priority queue.
+            The queue will be empty after this call returns.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.Poll">
+            <summary> 
+            Retrieves and removes the head of this queue,
+            or returns <see lang="null"/> if this queue is empty.
+            </summary>
+            <returns> 
+            The head of this queue, or <see lang="null"/> if this queue is empty.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.Contains(System.Object)">
+            <summary>
+            Queries the queue to see if it contains the specified <pararef name="element"/>
+            </summary>
+            <param name="element">element to look for.</param>
+            <returns><see lang="true"/> if the queue contains the <pararef name="element"/>, 
+            <see lang="false"/> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.Comparator">
+            <summary> Returns the comparator used to order this collection, or <see lang="null"/>
+            if this collection is sorted according to its elements natural ordering
+            (using <see cref="T:System.IComparable"/>).
+            
+            </summary>
+            <returns> the comparator used to order this collection, or <see lang="null"/>
+            if this collection is sorted according to its elements natural ordering.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary> 
+            Save the state of the instance to a stream (that
+            is, serialize it).
+            </summary>
+            <serialData> The length of the array backing the instance is
+            emitted (int), followed by all of its elements (each an
+            <see cref="T:System.Object"/>) in the proper order.
+            </serialData>
+            <param name="serializationInfo">the stream</param>
+            <param name="context">the context</param>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary> 
+            Reconstitute the <see cref="T:Spring.Collections.PriorityQueue"/> instance from a stream (that is,
+            deserialize it).
+            </summary>
+            <param name="serializationInfo">the stream</param>
+            <param name="context">the context</param>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.CopyTo(System.Array,System.Int32)">
+            <summary>
+            Copies the elements of the <see cref="T:System.Collections.ICollection"></see> to an <see cref="T:System.Array"></see>, starting at a particular <see cref="T:System.Array"></see> index.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:System.Array"></see> that is the destination of the elements copied from <see cref="T:System.Collections.ICollection"></see>. The <see cref="T:System.Array"></see> must have zero-based indexing. </param>
+            <param name="index">The zero-based index in array at which copying begins. </param>
+            <exception cref="T:System.ArgumentNullException">array is null. </exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">index is less than zero. </exception>
+            <exception cref="T:System.ArgumentException">array is multidimensional.-or- index is equal to or greater than the length of array.-or- The number of elements in the source <see cref="T:System.Collections.ICollection"></see> is greater than the available space from index to the end of the destination array. </exception>
+            <exception cref="T:System.InvalidCastException">The type of the source <see cref="T:System.Collections.ICollection"></see> cannot be cast automatically to the type of the destination array. </exception><filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Spring.Collections.PriorityQueue.CopyTo(System.Array)">
+            <summary>
+            Copies the elements of the <see cref="T:System.Collections.ICollection"></see> to an <see cref="T:System.Array"></see>, starting at index 0.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:System.Array"></see> that is the destination of the elements copied from <see cref="T:System.Collections.ICollection"></see>. The <see cref="T:System.Array"></see> must have zero-based indexing. </param>
+            <exception cref="T:System.ArgumentNullException">array is null. </exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">index is less than zero. </exception>
+            <exception cref="T:System.ArgumentException">array is multidimensional.-or- index is equal to or greater than the length of array.-or- The number of elements in the source <see cref="T:System.Collections.ICollection"></see> is greater than the available space from index to the end of the destination array. </exception>
+            <exception cref="T:System.InvalidCastException">The type of the source <see cref="T:System.Collections.ICollection"></see> cannot be cast automatically to the type of the destination array. </exception><filterpriority>2</filterpriority>
+        </member>
+        <member name="P:Spring.Collections.PriorityQueue.Capacity">
+            <summary>
+            Gets the Capacity of this queue.  Will equal <see cref="P:System.Collections.ICollection.Count"/>
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.PriorityQueue.Count">
+            <summary>
+            Returns the queue count.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.PriorityQueue.SyncRoot">
+            <summary>
+            Gets an object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"></see>.
+            </summary>
+            <returns>
+            An object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"></see>.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.PriorityQueue.IsSynchronized">
+            <summary>
+            Gets a value indicating whether access to the <see cref="T:System.Collections.ICollection"></see> is synchronized (thread safe).
+            </summary>
+            <returns>
+            true if access to the <see cref="T:System.Collections.ICollection"></see> is synchronized (thread safe); otherwise, false.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.PriorityQueue.IsEmpty">
+            <summary>
+            Returns <see lang="true"/> if there are no elements in the <see cref="T:Spring.Collections.IQueue"/>, <see lang="false"/> otherwise.
+            </summary>
+        </member>
+        <member name="F:Spring.Collections.PriorityQueue.PriorityQueueEnumerator._cursorIndex">
+            <summary> 
+            Index (into queue array) of element to be returned by subsequent call to next.
+            </summary>
+        </member>
+        <member name="T:Spring.Caching.CacheResultItemsAttribute">
+            <summary>
+            This attribute should be used with methods that return an <see cref="T:System.Collections.ICollection"/>
+            in order to cache each item separately.
+            </summary>
+            <remarks>
+            <p>
+            This attribute allows application developers to specify that each item
+            from the collection returned by the method should be cached, 
+            but it will not do any caching by itself.
+            </p>
+            <p>
+            In order to actually cache the result, an application developer
+            must apply a <c>Spring.Aspects.Cache.CacheResultAdvice</c> to
+            all of the members that have this attribute defined.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CacheResultItemsAttribute.cs,v 1.2 2007/03/31 02:59:48 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Caching.BaseCacheAttribute">
+            <summary>
+            Abstract base class containing shared properties for all cache attributes.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: BaseCacheAttribute.cs,v 1.5 2007/08/29 17:29:10 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Caching.BaseCacheAttribute.TimeSpanConverter">
+            <summary>
+            The <see cref="F:Spring.Caching.BaseCacheAttribute.TimeSpanConverter"/> instance used to parse <see cref="T:System.TimeSpan"/> values.
+            </summary>
+            <see cref="P:Spring.Caching.BaseCacheAttribute.TimeToLive"/>
+            <see cref="P:Spring.Caching.BaseCacheAttribute.TimeToLiveTimeSpan"/>
+        </member>
+        <member name="M:Spring.Caching.BaseCacheAttribute.#ctor">
+            <summary>
+            Creates an attribute instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Caching.BaseCacheAttribute.#ctor(System.String,System.String)">
+            <summary>
+            Creates an attribute instance.
+            </summary>
+            <param name="cacheName">
+            The name of the cache to use.
+            </param>
+            <param name="key">
+            An expression string that should be evaluated in order to determine
+            the cache key for the item.
+            </param>
+        </member>
+        <member name="P:Spring.Caching.BaseCacheAttribute.CacheName">
+            <summary>
+            Gets or sets the name of the cache to use.
+            </summary>
+            <value>
+            The name of the cache to use.
+            </value>
+        </member>
+        <member name="P:Spring.Caching.BaseCacheAttribute.Key">
+            <summary>
+            Gets or sets a SpEL expression that should be evaluated in order 
+            to determine the cache key for the item.
+            </summary>
+            <value>
+            An expression string that should be evaluated in order to determine
+            the cache key for the item.
+            </value>
+        </member>
+        <member name="P:Spring.Caching.BaseCacheAttribute.KeyExpression">
+            <summary>
+            Gets an expression instance that should be evaluated in order 
+            to determine the cache key for the item.
+            </summary>
+            <value>
+            An expression instance that should be evaluated in order to determine
+            the cache key for the item.
+            </value>
+        </member>
+        <member name="P:Spring.Caching.BaseCacheAttribute.Condition">
+            <summary>
+            Gets or sets a SpEL expression that should be evaluated in order 
+            to determine whether the item should be cached.
+            </summary>
+            <value>
+            An expression string that should be evaluated in order to determine
+            whether the item should be cached.
+            </value>
+        </member>
+        <member name="P:Spring.Caching.BaseCacheAttribute.ConditionExpression">
+            <summary>
+            Gets an expression instance that should be evaluated in order 
+            to determine whether the item should be cached.
+            </summary>
+            <value>
+            An expression instance that should be evaluated in order to determine
+            whether the item should be cached.
+            </value>
+        </member>
+        <member name="P:Spring.Caching.BaseCacheAttribute.TimeToLive">
+            <summary>
+            The amount of time an object should remain in the cache.
+            </summary>
+            <remarks>
+            If no TTL is specified, the default TTL defined by the 
+            cache's policy will be applied.
+            </remarks>
+            <value>
+            The amount of time object should remain in the cache 
+            formatted to be recognizable by <see cref="M:System.TimeSpan.Parse(System.String)"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Caching.BaseCacheAttribute.TimeToLiveTimeSpan">
+            <summary>
+            The amount of time an object should remain in the cache (in seconds).
+            </summary>
+            <remarks>
+            If no TTL is specified, the default TTL defined by the 
+            cache's policy will be applied.
+            </remarks>
+            <value>
+            The amount of time object should remain in the cache (in seconds).
+            </value>
+        </member>
+        <member name="M:Spring.Caching.CacheResultItemsAttribute.#ctor">
+            <summary>
+            Creates an attribute instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Caching.CacheResultItemsAttribute.#ctor(System.String,System.String)">
+            <summary>
+            Creates an attribute instance.
+            </summary>
+            <param name="cacheName">
+            The name of the cache to use.
+            </param>
+            <param name="key">
+            An expression string that should be evaluated in order to determine
+            the cache key for the item.
+            </param>
+        </member>
+        <member name="T:Spring.Validation.ConditionValidator">
+            <summary>
+            Evaluates validator test using condition evaluator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ConditionValidator.cs,v 1.5 2006/04/09 07:19:04 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Validation.ConditionValidator.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Validation.ConditionValidator"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.ConditionValidator.#ctor(System.String,System.String)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Validation.ConditionValidator"/> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.ConditionValidator.#ctor(Spring.Expressions.IExpression,Spring.Expressions.IExpression)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Validation.ConditionValidator"/> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.ConditionValidator.Validate(System.Object)">
+            <summary>
+            Evaluates the test using condition evaluator.
+            </summary>
+            <remarks>
+            <p>
+            Test can be any logical expression that is supported by the Spring.NET logical
+            expression evaluation engine, and can use any variables that can be resolved 
+            by the variable resolver used by the validation engine.
+            </p>
+            </remarks>
+            <param name="objectToValidate">The object to validate.</param>
+            <returns>
+            <see lang="true"/> if the supplied <paramref name="objectToValidate"/> is valid.
+            </returns>
+        </member>
+        <member name="T:Spring.Util.UniqueKey">
+            <summary>
+            UniqueKey allows for generating keys unique to a type or particular instance and a partial name, 
+            that can e.g. be used as keys in <see cref="T:System.Collections.Hashtable"/>.
+            </summary>
+            <example>
+            // shows usage type-scoped keys
+            UniqueKey classAKey = UniqueKey.GetTypeScoped(typeof(ClassA), "myKey");
+            UniqueKey classBKey = UniqueKey.GetTypeScoped(typeof(ClassB), "myKey");
+            
+            HttpContext.Current.Items.Add( classAKey, "some value unqiue for class A having key 'myKey'");
+            object value = HttpContext.Current.Items[ UniqueKey.GetTypeScoped(typeof(ClassA), "myKey") ];
+            Assert.AreEqual( "some value unique for class A having key 'myKey'", value);
+            
+            HttpContext.Current.Items.Add( classBKey, "some value unqiue for class B having key 'myKey'");
+            object value = HttpContext.Current.Items[ UniqueKey.GetTypeScoped(typeof(ClassB), "myKey") ];
+            Assert.AreEqual( "some value unique for class B having key 'myKey'", value);
+            </example>
+        </member>
+        <member name="M:Spring.Util.UniqueKey.#ctor(System.String)">
+            <summary>
+            Initialize a new instance of <see cref="T:Spring.Util.UniqueKey"/> from its string representation.  
+            See <see cref="M:Spring.Util.UniqueKey.GetInstanceScoped(System.Object,System.String)"/> and See <see cref="M:Spring.Util.UniqueKey.GetTypeScoped(System.Type,System.String)"/> for details.
+            </summary>
+            <param name="key">The string representation of the new <see cref="T:Spring.Util.UniqueKey"/> instance.</param>
+        </member>
+        <member name="M:Spring.Util.UniqueKey.Equals(Spring.Util.UniqueKey)">
+            <summary>
+            Compares this instance to another.
+            </summary>
+        </member>
+        <member name="M:Spring.Util.UniqueKey.Equals(System.Object)">
+            <summary>
+            Compares this instance to another.
+            </summary>
+        </member>
+        <member name="M:Spring.Util.UniqueKey.GetHashCode">
+            <summary>
+            Returns the hash code for this key.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Util.UniqueKey.ToString">
+            <summary>
+            Returns a string representation of this key.
+            </summary>
+        </member>
+        <member name="M:Spring.Util.UniqueKey.GetInstanceScoped(System.Object,System.String)">
+            <summary>
+            Creates a new key instance unique to the given instance.
+            </summary>
+            <param name="instance">The instance the key shall be unique to</param>
+            <param name="partialKey">The partial key to be made unique</param>
+            <remarks>
+            </remarks>
+            <exception cref="T:System.ArgumentException">If <paramref name="instance"/> is of type <see cref="T:System.Type"/></exception>
+        </member>
+        <member name="M:Spring.Util.UniqueKey.GetTypeScoped(System.Type,System.String)">
+            <summary>
+            Creates a new key instance unique to the given type.
+            </summary>
+            <param name="type">The type the key shall be unique to</param>
+            <param name="partialKey">The partial key to be made unique</param>
+        </member>
+        <member name="M:Spring.Util.UniqueKey.GetInstanceScopedString(System.Object,System.String)">
+            <summary>
+            Returns a key unique for the given instance.
+            </summary>
+            <param name="instance">The instance the key shall be unique to</param>
+            <param name="partialKey">The partial key to be made unique</param>
+            <returns>A key formatted as <i>typename[instance-id].partialkey</i></returns>
+        </member>
+        <member name="M:Spring.Util.UniqueKey.GetTypeScopedString(System.Type,System.String)">
+            <summary>
+            Returns a key unique for the given type.
+            </summary>
+            <param name="type">The type the key shall be unique to</param>
+            <param name="partialKey">The partial key to be made unique</param>
+            <returns>A key formatted as <i>typename.partialkey</i></returns>
+        </member>
+        <member name="T:Spring.Util.Generic.CollectionUtils">
+            <summary>
+            Miscellaneous generic collection utility methods.
+            </summary>
+            <remarks>
+            Mainly for internal use within the framework.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: CollectionUtils.cs,v 1.2 2006/12/02 07:51:28 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Util.Generic.CollectionUtils.HasUniqueObject``1(System.Collections.Generic.ICollection{``0})">
+            <summary>
+            Determine whether a given collection only contains
+            a single unique object
+            </summary>
+            <param name="coll"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Util.Generic.CollectionUtils.Contains``1(System.Collections.Generic.ICollection{``0},System.Object)">
+            <summary>
+            Determines whether the <paramref name="collection"/> contains the specified <paramref name="element"/>.
+            </summary>
+            <param name="collection">The collection to check.</param>
+            <param name="element">The object to locate in the collection.</param>
+            <returns><see lang="true"/> if the element is in the collection, <see lang="false"/> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Util.Generic.CollectionUtils.ContainsAll``1(System.Collections.Generic.ICollection{``0},System.Collections.Generic.ICollection{``0})">
+            <summary>
+            Determines whether the collection contains all the elements in the specified collection.
+            </summary>
+            <param name="targetCollection">The collection to check.</param>
+            <param name="sourceCollection">Collection whose elements would be checked for containment.</param>
+            <returns>true if the target collection contains all the elements of the specified collection.</returns>
+        </member>
+        <member name="T:Spring.Threading.TimeoutException">
+            <summary> Thrown by synchronization classes that report
+            timeouts via exceptions. The exception is treated
+            as a form (subclass) of InterruptedException. This both
+            simplifies handling, and conceptually reflects the fact that
+            timed-out operations are artificially interrupted by timers.
+            
+            </summary>
+        </member>
+        <member name="F:Spring.Threading.TimeoutException._duration">
+            <summary> The approximate time that the operation lasted before 
+            this timeout exception was thrown.
+            
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.TimeoutException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Threading.TimeoutException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.TimeoutException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Threading.TimeoutException"/> class with the
+            specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Threading.TimeoutException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Threading.TimeoutException"/> class with the
+            specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="innerException">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Threading.TimeoutException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Threading.TimeoutException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Threading.TimeoutException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Override of GetObjectData to allow for private serialization
+            </summary>
+            <param name="info">serialization info</param>
+            <param name="context">streaming context</param>
+        </member>
+        <member name="M:Spring.Threading.TimeoutException.#ctor(System.Int64)">
+            <summary> Constructs a TimeoutException with given duration value.
+            
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.TimeoutException.#ctor(System.Int64,System.String)">
+            <summary> Constructs a TimeoutException with the
+            specified duration value and detail message.
+            </summary>
+        </member>
+        <member name="P:Spring.Threading.TimeoutException.Duration">
+            <summary> 
+            Gets the approximate time that the operation lasted before 
+            this timeout exception was thrown.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.PropertyAccessExceptionsException">
+            <summary>
+            Combined exception, composed of individual binding
+            <see cref="T:Spring.Core.PropertyAccessException"/>s.
+            </summary>
+            <remarks>
+            <p>
+            An object of this class is created at the beginning of the binding
+            process, and errors added to it as necessary.
+            </p>
+            <p>
+            The binding process continues when it encounters application-level
+            <see cref="T:Spring.Core.PropertyAccessException"/>s, applying those changes
+            that can be applied and storing rejected changes in an instance of this class.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: PropertyAccessExceptionsException.cs,v 1.15 2007/07/31 00:26:30 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.PropertyAccessExceptionsException.#ctor">
+            <summary>
+            Creates a new instance of the PropertyAccessExceptionsException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.PropertyAccessExceptionsException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the PropertyAccessExceptionsException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.PropertyAccessExceptionsException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the PropertyAccessExceptionsException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.PropertyAccessExceptionsException.#ctor(Spring.Objects.IObjectWrapper,Spring.Core.PropertyAccessException[])">
+            <summary>
+            Create new empty PropertyAccessExceptionsException.
+            We'll add errors to it as we attempt to bind properties.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.PropertyAccessExceptionsException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the PropertyAccessExceptionsException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.PropertyAccessExceptionsException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="F:Spring.Objects.PropertyAccessExceptionsException._objectWrapper">
+            <summary>
+            The IObjectWrapper wrapping the target object at the root of the exception.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.PropertyAccessExceptionsException._propertyAccessExceptions">
+            <summary>The list of PropertyAccessException objects.</summary>
+        </member>
+        <member name="M:Spring.Objects.PropertyAccessExceptionsException.GetPropertyAccessException(System.String)">
+            <summary>
+            Return the <see cref="T:Spring.Core.PropertyAccessException"/>
+            for the supplied <paramref name="propertyName"/>, or <see langword="null"/>
+            if there isn't one.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.PropertyAccessExceptionsException.ToString">
+            <summary>
+            Describe the number of exceptions contained in this container class.
+            </summary>
+            <returns>A description of the instance contents.</returns>
+        </member>
+        <member name="P:Spring.Objects.PropertyAccessExceptionsException.ObjectWrapper">
+            <summary>
+            Return the <see cref="T:Spring.Objects.IObjectWrapper"/> that generated
+            this exception.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.PropertyAccessExceptionsException.BindObject">
+            <summary>
+            Return the object we're binding to.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.PropertyAccessExceptionsException.ExceptionCount">
+            <summary>
+            If this returns zero (0), no errors were encountered during binding.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.PropertyAccessExceptionsException.PropertyAccessExceptions">
+            <summary>
+            Return an array of the <see cref="T:Spring.Core.PropertyAccessException"/>s
+            stored in this object.
+            </summary>
+            <remarks>
+            <p>
+            Will return the empty array (not <see langword="null"/>) if there were no errors.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.PropertyAccessExceptionsException.Message">
+            <summary>
+            Describe the group of exceptions. 
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.ReplacedMethodOverride">
+            <summary>
+            Represents the replacement of a method on a managed object by the IoC
+            container.
+            </summary>
+            <remarks>
+            <p>
+            Note that this mechanism is <i>not</i> intended as a generic means of
+            inserting crosscutting code: use AOP for that.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: ReplacedMethodOverride.cs,v 1.3 2007/03/16 04:01:42 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.MethodOverride">
+            <summary>
+            Represents the override of a method on a managed object by the IoC container.
+            </summary>
+            <remarks>
+            <p>
+            Note that the override mechanism is <i>not</i> intended as a generic means of
+            inserting crosscutting code: use AOP for that.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: MethodOverride.cs,v 1.9 2007/08/22 08:52:03 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodOverride.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.MethodOverride"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no
+            public constructors.
+            </p>
+            </remarks>
+            <param name="methodName">
+            The name of the method that is to be overridden.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="methodName"/> is <see langword="null"/> or
+            contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodOverride.Matches(System.Reflection.MethodInfo)">
+            <summary>
+            Does this <see cref="T:Spring.Objects.Factory.Support.MethodOverride"/>
+            match the supplied <paramref name="method"/>?
+            </summary>
+            <remarks>
+            <p>
+            By 'match' one means does this particular
+            <see cref="T:Spring.Objects.Factory.Support.MethodOverride"/>
+            instance apply to the supplied <paramref name="method"/>?
+            </p>
+            <p>
+            This allows for argument list checking as well as method name checking.
+            </p>
+            </remarks>
+            <param name="method">The method to be checked.</param>
+            <returns>
+            <see lang="true"/> if this override matches the supplied
+            <paramref name="method"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.MethodOverride.MethodName">
+            <summary>
+            The name of the method that is to be overridden.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.MethodOverride.IsOverloaded">
+            <summary>
+            Is the method that is ot be injected
+            (<see cref="P:Spring.Objects.Factory.Support.MethodOverride.MethodName"/>)
+            to be considered as overloaded?
+            </summary>
+            <remarks>
+            <p>
+            If <see lang="true"/> (the default), then argument type matching
+            will be performed (because one would not want to override the wrong
+            method).
+            </p>
+            <p>
+            Setting the value of this property to <see lang="false"/> can be used
+            to optimize runtime performance (ever so slightly).
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ReplacedMethodOverride.#ctor(System.String,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.ReplacedMethodOverride"/> class.
+            </summary>
+            <param name="methodName">
+            The name of the method that is to be overridden.
+            </param>
+            <param name="methodReplacerObjectName">
+            The object name of the <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>
+            instance in the surrounding IoC container. 
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If either of the supplied arguments is <see langword="null"/> or
+            contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ReplacedMethodOverride.AddTypeIdentifier(System.String)">
+            <summary>
+            Add a fragment of a <see cref="T:System.Type"/> instance's <see cref="P:System.Type.FullName"/>
+            such as <c>'Exception</c> or <c>System.Excep</c> to identify an argument
+            <see cref="T:System.Type"/> for a dependency injected method.
+            </summary>
+            <param name="identifier">
+            A (sub) string of a <see cref="T:System.Type"/> instance's <see cref="P:System.Type.FullName"/>.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="identifier"/> is <see langword="null"/> or
+            contains only whitespace character(s).
+            </exception>
+            <seeaso cref="M:Spring.Objects.Factory.Support.MethodOverride.Matches(System.Reflection.MethodInfo)"/> 
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ReplacedMethodOverride.Matches(System.Reflection.MethodInfo)">
+            <summary>
+            Does this <see cref="T:Spring.Objects.Factory.Support.MethodOverride"/>
+            match the supplied <paramref name="method"/>?
+            </summary>
+            <param name="method">The method to be checked.</param>
+            <returns>
+            <see lang="true"/> if this override matches the supplied <paramref name="method"/>.
+            </returns>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="method"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ReplacedMethodOverride.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.ReplacedMethodOverride.MethodReplacerObjectName">
+            <summary>
+            The object name of the <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>
+            instance in the surrounding IoC container. 
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.ObjectDefinitionReaderUtils">
+            <summary>
+            Utility methods that are useful for
+            <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionReader"/>
+            implementations.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <seealso cref="T:Spring.Objects.Factory.Xml.ObjectsNamespaceParser"/>
+            <version>$Id: ObjectDefinitionReaderUtils.cs,v 1.13 2007/08/07 22:05:20 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.ObjectDefinitionReaderUtils.GeneratedObjectIdSeparator">
+            <summary>
+            The string used as a separator in the generation of synthetic id's
+            for those object definitions explicitly that aren't assigned one.
+            </summary>
+            <remarks>
+            <p>
+            If a <see cref="T:System.Type"/>  name or parent object definition
+            name is not unique, "#1", "#2" etc will be appended, until such
+            time that the name becomes unique.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionReaderUtils.RegisterObjectDefinition(Spring.Objects.Factory.Config.ObjectDefinitionHolder,Spring.Objects.Factory.Support.IObjectDefinitionRegistry)">
+            <summary>
+            Registers the supplied <paramref name="objectDefinition"/> with the
+            supplied <paramref name="registry"/>.
+            </summary>
+            <remarks>
+            <p>
+            This is a convenience method that registers the
+            <see cref="P:Spring.Objects.Factory.Config.ObjectDefinitionHolder.ObjectDefinition"/>
+            of the supplied <paramref name="objectDefinition"/> under the 
+            <see cref="P:Spring.Objects.Factory.Config.ObjectDefinitionHolder.ObjectName"/>
+            property value of said <paramref name="objectDefinition"/>. If the
+            supplied <paramref name="objectDefinition"/> has any
+            <see cref="P:Spring.Objects.Factory.Config.ObjectDefinitionHolder.Aliases"/>,
+            then those aliases will also be registered with the supplied
+            <paramref name="registry"/>.
+            </p>
+            </remarks>
+            <param name="objectDefinition">
+            The object definition holder containing the
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> that
+            is to be registered.
+            </param>
+            <param name="registry">
+            The registry that the supplied <paramref name="objectDefinition"/>
+            is to be registered with.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If either of the supplied arguments is <see langword="null"/>.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the <paramref name="objectDefinition"/> could not be registered
+            with the <paramref name="registry"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionReaderUtils.GenerateObjectName(Spring.Objects.Factory.Support.IConfigurableObjectDefinition,Spring.Objects.Factory.Support.IObjectDefinitionRegistry)">
+            <summary>
+            Generates an object definition name for the supplied
+            <paramref name="objectDefinition"/> that is guaranteed to be unique
+            within the scope of the supplied <paramref name="registry"/>.
+            </summary>
+            <param name="objectDefinition">
+            The <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>
+            that requires a generated name.
+            </param>
+            <param name="registry">
+            The
+            <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+            that the supplied <paramref name="objectDefinition"/> is to be
+            registered with (needed so that the uniqueness of any generated
+            name can be guaranteed).
+            </param>
+            <returns>
+            An object definition name for the supplied
+            <paramref name="objectDefinition"/> that is guaranteed to be unique
+            within the scope of the supplied <paramref name="registry"/> and
+            never <cref lang="null"/>.
+            </returns>
+            <exception cref="T:System.ArgumentNullException">
+            If either of the <paramref name="objectDefinition"/> or
+            <paramref name="registry"/> arguments is <see langword="null"/>.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectDefinitionStoreException">
+            If a unique name cannot be generated.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionReaderUtils.CreateEventHandlerValue(System.String,System.String)">
+            <summary>
+            Factory method for getting concrete
+            <see cref="T:Spring.Objects.IEventHandlerValue"/> instances.
+            </summary>
+            <param name="methodName">
+            The name of the event handler method. This may be straight text, a regular
+            expression, <see langword="null"/>, or empty.
+            </param>
+            <param name="eventName">
+            The name of the event being wired. This too may be straight text, a regular
+            expression, <see langword="null"/>, or empty.
+            </param>
+            <returns>
+            A concrete <see cref="T:Spring.Objects.IEventHandlerValue"/>
+            instance.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionReaderUtils.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.ObjectDefinitionReaderUtils"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.AbstractObjectFactory">
+            <summary>
+            Abstract superclass for <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            implementations.
+            </summary>
+            <remarks>
+            <p>
+            This class provides singleton / prototype determination, singleton caching,
+            object definition aliasing, <see cref="T:Spring.Objects.Factory.IFactoryObject"/>
+            handling, and object definition merging for child object definitions.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: AbstractObjectFactory.cs,v 1.76 2008/04/05 13:35:35 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractObjectFactory.CURRENTLY_IN_CREATION">
+            <summary>
+            Marker object to be temporarily registered in the singleton cache,
+            while instantiating an object (in order to be able to detect circular references).
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractObjectFactory.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractObjectFactory.emptyObject">
+            <summary>
+            Used as value in hashtable that keeps track of singleton names currently in the
+            process of being created.  Would not be necessary if we created a case insensitive implementation of
+            ISet.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.AbstractObjectFactory"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This constructor implicitly creates an
+            <see cref="T:Spring.Objects.Factory.Support.AbstractObjectFactory"/>
+            that treats the names of objects in this factory in a case-sensitive fashion.
+            </p>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.#ctor(System.Boolean)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.AbstractObjectFactory"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+            <param name="caseSensitive">
+            <see lang="true"/> if the names of objects in this factory are to be treated in a
+            case-sensitive fashion.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.#ctor(System.Boolean,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.AbstractObjectFactory"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+            <param name="caseSensitive">
+            <see lang="true"/> if the names of objects in this factory are to be treated in a
+            case-sensitive fashion.
+            </param>
+            <param name="parentFactory">
+            Any parent object factory; may be <see lang="null"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetObject(System.String,System.Type,System.Object[])">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <param name="name">The name of the object to return.</param>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> the object may match. Can be an interface or
+            superclass of the actual class. For example, if the value is the
+            <see cref="T:System.Object"/> class, this method will succeed whatever the
+            class of the returned instance.
+            </param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a <see lang="static"/> factory method. If there is no factory method and the
+            supplied <paramref name="arguments"/> array is not <see lang="null"/>, then
+            match the argument values by type and call the object's constructor.
+            </param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectNotOfRequiredTypeException">
+            If the object is not of the required type.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> is <see langword="null"/>.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String,System.Type)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.ApplyObjectPropertyValues(System.Object,System.String)">
+            <summary>
+            Apply the property values of the object definition with the supplied
+            <paramref name="name"/> to the supplied <paramref name="instance"/>.
+            </summary>
+            <remarks>
+            <p>
+            The object definition can either define a fully self-contained object,
+            reusing it's property values, or just property values meant to be used
+            for existing object instances.
+            </p>
+            </remarks>
+            <param name="instance">
+            The existing object that the property values for the named object will
+            be applied to.
+            </param>
+            <param name="name">
+            The name of the object definition associated with the property values that are
+            to be applied.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.InitObjectWrapper(Spring.Objects.IObjectWrapper)">
+            <summary>
+            Initializes the given <see cref="T:Spring.Objects.IObjectWrapper"/> with the
+            custom <see cref="T:System.ComponentModel.TypeConverter"/>s registered with
+            this factory.
+            </summary>
+            <param name="wrapper">
+            The <see cref="T:Spring.Objects.IObjectWrapper"/> to initialise.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.CreateObject(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.Object[])">
+            <summary>
+            Create an object instance for the given object definition.
+            </summary>
+            <remarks>
+            <p>
+            The object definition will already have been merged with the parent
+            definition in case of a child definition.
+            </p>
+            <p>
+            All the other methods in this class invoke this method, although objects
+            may be cached after being instantiated by this method. All object
+            instantiation within this class is performed by this method.
+            </p>
+            </remarks>
+            <param name="name">The name of the object.</param>
+            <param name="definition">
+            The object definition for the object that is to be instantiated.
+            </param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a <see lang="static"/>  factory method. If there is no factory method and the
+            supplied <paramref name="arguments"/> array is not <see lang="null"/>,
+            then match the argument values by type and call the object's constructor.
+            </param>
+            <returns>
+            A new instance of the object.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.DestroyObject(System.String,System.Object)">
+            <summary>
+            Destroy the target object.
+            </summary>
+            <remarks>
+            <p>
+            Must destroy objects that depend on the given object before the object itself,
+            nor throw an exception.
+            </p>
+            </remarks>
+            <param name="name">
+            The name of the object.
+            </param>
+            <param name="target">
+            The target object instance to destroyed.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.ContainsObjectDefinition(System.String)">
+            <summary>
+            Does this object factory contain an object definition with the
+            supplied <paramref name="name"/>?
+            </summary>
+            <remarks>
+            <p>
+            Does not consider any hierarchy this factory may participate in.
+            Invoked by
+            <see cref="M:Spring.Objects.Factory.Support.AbstractObjectFactory.ContainsObject(System.String)"/>
+            when no cached singleton instance is found.
+            </p>
+            </remarks>
+            <param name="name">
+            The name of the object to look for.
+            </param>
+            <returns>
+            <see lang="true"/> if this object factory contains an object
+            definition with the supplied <paramref name="name"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.AddSingleton(System.String,System.Object)">
+            <summary>
+            Adds the supplied <paramref name="singleton"/> (object) to this factory's
+            singleton cache.
+            </summary>
+            <remarks>
+            <p>
+            To be called for eager registration of singletons, e.g. to be able to
+            resolve circular references.
+            </p>
+            <note>
+            If a singleton has already been registered under the same name as
+            the supplied <paramref name="name"/>, then the old singleton will
+            be replaced.
+            </note>
+            </remarks>
+            <param name="name">The name of the object.</param>
+            <param name="singleton">The singleton object.</param>
+            <exception cref="T:System.ArgumentNullException">
+            If the <paramref name="name"/> argument is <see langword="null"/>
+            or consists wholly of whitespace characters; or if the
+            <paramref name="singleton"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.TransformedObjectName(System.String)">
+            <summary>
+            Return the object name, stripping out the factory dereference prefix if
+            necessary, and resolving aliases to canonical names.
+            </summary>
+            <param name="name">
+            The transformed name of the object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.OriginalObjectName(System.String)">
+            <summary>
+            Ensures, that the given name is prefixed with <see cref="F:Spring.Objects.Factory.ObjectFactoryUtils.FactoryObjectPrefix"/> 
+            if it incidentially already starts with this prefix. This avoids troubles when dereferencing 
+            the object name during <see cref="M:Spring.Objects.Factory.ObjectFactoryUtils.TransformedObjectName(System.String)"/>
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.IsAlias(System.String)">
+            <summary>
+            Determines whether the specified name is defined as an alias as opposed
+            to the name of an actual object definition.
+            </summary>
+            <param name="name">The object name to check.</param>
+            <returns>
+            	<c>true</c> if the specified name is alias; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetMergedObjectDefinition(System.String,System.Boolean)">
+            <summary>
+            Return a <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>,
+            even by traversing parent if the parameter is a child definition.
+            </summary>
+            <param name="name">
+            The name of the object.
+            </param>
+            <param name="includingAncestors">
+            Are ancestors to be included in the merge?
+            </param>
+            <remarks>
+            <p>
+            Will ask the parent object factory if not found in this instance.
+            </p>
+            </remarks>
+            <returns>
+            A merged <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+            with overridden properties.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetMergedObjectDefinition(System.String,Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Return a <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>,
+            even by traversing parent if the parameter is a child definition.
+            </summary>
+            <returns>
+            A merged <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+            with overridden properties.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.CreateRootObjectDefinition(Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Creates the root object definition.
+            </summary>
+            <param name="templateDefinition">The template definition to base root definition on.</param>
+            <returns>Root object definition.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetObjectDefinition(System.String)">
+            <summary>
+            Return the registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+            given object, allowing access to its property values and constructor
+            argument values.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <returns>
+            The registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there is no object with the given name.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetObjectDefinition(System.String,System.Boolean)">
+            <summary>
+            Return the registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+            given object, allowing access to its property values and constructor
+            argument values.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <param name="includeAncestors">Whether to search parent object factories.</param>
+            <returns>
+            The registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there is no object with the given name.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetTypeForFactoryObject(Spring.Objects.Factory.IFactoryObject)">
+            <summary>
+            Gets the type for the given FactoryObject.
+            </summary>
+            <param name="factoryObject">The factory object instance to check.</param>
+            <returns>the FactoryObject's object type</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetTypeForFactoryObject(System.String,Spring.Objects.Factory.Support.RootObjectDefinition)">
+            <summary>
+            Gets the object type for the given FactoryObject definition, as far as possible.
+            Only called if there is no singleton instance registered for the target object already.
+            </summary>
+            <remarks>
+            The default implementation creates the FactoryObject via <code>GetObject</code>
+            to call its <code>ObjectType</code> property. Subclasses are encouraged to optimize
+            this, typically by just instantiating the FactoryObject but not populating it yet,
+            trying whether its <code>ObjectType</code> property already returns a type.
+            If no type found, a full FactoryObject creation as performed by this implementation
+            should be used as fallback.
+            </remarks>
+            <param name="objectName">Name of the object.</param>
+            <param name="mod">The merged object definition for the object.</param>
+            <returns>The type for the object if determinable, or <code>null</code> otherwise</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.PredictObjectType(System.String,Spring.Objects.Factory.Support.RootObjectDefinition)">
+            <summary>
+            Predict the eventual object type (of the processed object instance) for the
+            specified object.
+            </summary>
+            <remarks>
+            Does not need to handle FactoryObjects specifically, since it is only
+            supposed to operate on the raw object type.
+            This implementation is simplistic in that it is not able to
+            handle factory methods and InstantiationAwareBeanPostProcessors.
+            It only predicts the object type correctly for a standard object.
+            To be overridden in subclasses, applying more sophisticated type detection.
+            </remarks>
+            <param name="objectName">Name of the object.</param>
+            <param name="mod">The merged object definition to determine the type for.</param>
+            <returns>The type of the object, or <code>null</code> if not predictable</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetObjectForInstance(System.String,System.Object)">
+            <summary>
+            Get the object for the given object instance, either the object
+            instance itself or its created object in case of an
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>.
+            </summary>
+            <param name="name">
+            The name that may include the factory dereference prefix.
+            </param>
+            <param name="instance">The object instance.</param>
+            <returns>
+            The singleton instance of the object.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetObjectFromFactoryObject(Spring.Objects.Factory.IFactoryObject,System.String,Spring.Objects.Factory.Support.RootObjectDefinition)">
+            <summary>
+            Obtain an object to expose from the given IFactoryObject.
+            </summary>
+            <param name="factory">The IFactoryObject instance.</param>
+            <param name="objectName">Name of the object.</param>
+            <param name="rod">The merged object definition.</param>
+            <returns>The object obtained from the IFactoryObject</returns>
+            <exception cref="T:Spring.Objects.Factory.ObjectCreationException">If IFactoryObject object creation failed.</exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.PostProcessObjectFromFactoryObject(System.Object,System.String)">
+            <summary>
+            Post-process the given object that has been obtained from the FactoryObject.
+            The resulting object will be exposed for object references.
+            </summary>
+            <remarks>The default implementation simply returns the given object
+            as-is.  Subclasses may override this, for example, to apply
+            post-processors.</remarks>
+            <param name="instance">The instance obtained from the IFactoryObject.</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>The object instance to expose</returns>
+            <exception cref="T:Spring.Objects.ObjectsException">if any post-processing failed.</exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetFactoryObject(System.String)">
+            <summary>
+            Convenience method to pull an <see cref="T:Spring.Objects.Factory.IFactoryObject"/>
+            from this factory.
+            </summary>
+            <param name="objectName">
+            The name of the factory object to be retrieved. If this name is not a valid
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> name, it will be converted
+            into one.
+            </param>
+            <returns>
+            The <see cref="T:Spring.Objects.Factory.IFactoryObject"/> associated with the
+            supplied <paramref name="objectName"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.IsFactoryDereference(System.String)">
+            <summary>
+            Is the supplied <paramref name="name"/> a factory object dereference?
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.IsObjectTypeMatch(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.Type)">
+            <summary>
+            Determines whether the type of the given object definition matches the
+            specified target type.
+            </summary>
+            <remarks>Allows for lazy load of the actual object type, provided that the
+            type match can be determined otherwise.
+            <para>The default implementation simply delegates to the standard
+            <code>ResolveObjectType</code> method.  Subclasses may override this to use
+            a differnt strategy.</para>
+            </remarks>
+            <param name="objectName">Name of the object (for error handling purposes).</param>
+            <param name="rod">The merged object definition to determine the type for.</param>
+            <param name="targetType">Type to match against (never null).</param>
+            <returns>
+            	<c>true</c> if object definition matches tye specified target type; otherwise, <c>false</c>.
+            </returns>
+            <exception cref="T:Spring.Core.CannotLoadObjectTypeException">if we failed to load the type.</exception>"
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.ResolveObjectType(Spring.Objects.Factory.Support.RootObjectDefinition,System.String)">
+            <summary>
+            Resolves the type of the object for the specified object definition resolving
+            an object type name to a Type (if necessary) and storing the resolved Type
+            in the object definition for further use.
+            </summary>
+            <param name="rod">The merged object definition to dertermine the type for.</param>
+            <param name="objectName">Name of the object (for error handling purposes).</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.IsFactoryObject(System.String)">
+            <summary>
+            Is the object (definition) with the supplied <paramref name="name"/> an
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>?
+            </summary>
+            <param name="name">The name of the object to be checked.</param>
+            <returns>
+            <see lang="true"/> the object (definition) with the supplied
+            <paramref name="name"/> an <see cref="T:Spring.Objects.Factory.IFactoryObject"/>?
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.RemoveSingleton(System.String)">
+            <summary>
+            Remove the object identified by the supplied <paramref name="name"/>
+            from this factory's singleton cache.
+            </summary>
+            <param name="name">
+            The name of the object that is to be removed from the singleton
+            cache.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the <paramref name="name"/> argument is <see langword="null"/> or
+            consists wholly of whitespace characters.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetSingletonNames(System.Type)">
+            <summary>
+            Return the names of objects in the singleton cache that match the given
+            object type (including subclasses).
+            </summary>
+            <param name="type">
+            The class or interface to match, or <see langword="null"/> for all object names.
+            </param>
+            <remarks>
+            <p>
+            Will <i>not</i> consider <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s
+            as the type of their created objects is not known before instantiation.
+            </p>
+            <p>
+            Does not consider any hierarchy this factory may participate in.
+            </p>
+            </remarks>
+            <returns>
+            The names of objects in the singleton cache that match the given
+            object type (including subclasses), or an empty array if none.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.IsTypeMatch(System.String,System.Type)">
+            <summary>
+            Determines whether the object with the given name matches the specified type.
+            </summary>
+            <remarks>More specifically, check whether a GetObject call for the given name
+            would return an object that is assignable to the specified target type.
+            Translates aliases back to the corresponding canonical bean name.
+            Will ask the parent factory if the bean cannot be found in this factory instance.
+            </remarks>
+            <param name="name">The name of the object to query.</param>
+            <param name="targetType">Type of the target to match against.</param>
+            <returns>
+            	<c>true</c> if the object type matches; otherwise, <c>false</c>
+            if it doesn't match or cannot be determined yet.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">Ff there is no object with the given name
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetType(System.String)">
+            <summary>
+            Determines the <see cref="T:System.Type"/> of the object with the
+            supplied <paramref name="name"/>.
+            </summary>
+            <remarks>
+            <p>
+            More specifically, checks the <see cref="T:System.Type"/> of object that
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/> would return.
+            For an <see cref="T:Spring.Objects.Factory.IFactoryObject"/>, returns the
+            <see cref="T:System.Type"/> of object that the
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> creates.
+            </p>
+            <p>
+            Please note that (prototype) objects created via a factory method or
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> objects are handled
+            slightly differently, in that we <b>don't</b> want to needlessly create
+            instances of such objects just to determine the <see cref="T:System.Type"/>
+            of object that they create.
+            </p>
+            </remarks>
+            <param name="name">The name of the object to query.</param>
+            <returns>
+            The <see cref="T:System.Type"/> of the object or <see langword="null"/>
+            if not determinable.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetTypeForFactoryMethod(System.String,Spring.Objects.Factory.Support.RootObjectDefinition)">
+            <summary>
+            Determines the <see cref="T:System.Type"/> of the object defined
+            by the supplied object <paramref name="definition"/>. 
+            </summary>
+            <remarks>
+            <p>
+            This, the default, implementation returns <see lang="null"/>
+            to indicate that the type cannot be determined. Subclasses are
+            encouraged to try to determine the actual return
+            <see cref="T:System.Type"/> here, matching their strategy of resolving
+            factory methods in the
+            <see cref="M:Spring.Objects.Factory.Support.AbstractObjectFactory.CreateObject(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.Object[])"/>
+            implementation.
+            </p>
+            </remarks>
+            <param name="objectName">
+            The name associated with the supplied object <paramref name="definition"/>.
+            </param>
+            <param name="definition">
+            The <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+            that the <see cref="T:System.Type"/> is to be determined for. 
+            </param>
+            <returns>
+            The <see cref="T:System.Type"/> of the object defined by the supplied
+            object <paramref name="definition"/>; or <see lang="null"/> if the
+            <see cref="T:System.Type"/> cannot be determined.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetSingletonNames">
+            <summary>
+            Returns the names of the objects in the singleton cache.
+            </summary>
+            <remarks>
+            <p>
+            Does not consider any hierarchy this factory may participate in.
+            </p>
+            </remarks>
+            <returns>The names of the objects in the singleton cache.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetSingletonCount">
+            <summary>
+            Returns the number of objects in the singleton cache.
+            </summary>
+            <remarks>
+            <p>
+            Does not consider any hierarchy this factory may participate in.
+            </p>
+            </remarks>
+            <returns>The number of objects in the singleton cache.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.DestroySingleton(System.String)">
+            <summary>
+            Destroys the named singleton object.
+            </summary>
+            <remarks>
+            <p>
+            Delegates to
+            <see cref="M:Spring.Objects.Factory.Support.AbstractObjectFactory.DestroyObject(System.String,System.Object)"/>
+            if a corresponding singleton instance is found.
+            </p>
+            </remarks>
+            <param name="name">
+            The name of the singleton object that is to be destroyed.
+            </param>
+            <seealso cref="M:Spring.Objects.Factory.Support.AbstractObjectFactory.DestroyObject(System.String,System.Object)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.CheckMergedObjectDefinition(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,System.Type,System.Object[])">
+            <summary>
+            Check the supplied merged object definition for any possible
+            validation errors.
+            </summary>
+            <param name="mergedObjectDefinition">
+            The object definition to be checked for validation errors.
+            </param>
+            <param name="objectName">
+            The name of the object associated with the supplied object definition.
+            </param>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> the object may match. Can be an interface or
+            superclass of the actual class. For example, if the value is the
+            <see cref="T:System.Object"/> class, this method will succeed whatever the
+            class of the returned instance.
+            </param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a <see lang="static"/> factory method. If there is no factory method and the
+            supplied <paramref name="arguments"/> array is not <see lang="null"/>, then
+            match the argument values by type and call the object's constructor.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of object validation errors.
+            </exception>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractObjectFactory.parentObjectFactory">
+            <summary>
+            Parent object factory, for object inheritance support
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractObjectFactory.ignoreDependencyTypes">
+            <summary>
+            Dependency types to ignore on dependency check and autowire, as Set of
+            Type objects: for example, string.  Default is none.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractObjectFactory.objectPostProcessors">
+            <summary>
+            ObjectPostProcessors to apply in CreateObject
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractObjectFactory.hasInstantiationAwareBeanPostProcessors">
+            <summary>
+            Indicates whether any IInstantiationAwareBeanPostProcessors have been registered
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractObjectFactory.hasDestructionAwareBeanPostProcessors">
+            <summary>
+            Indicates whether any IDestructionAwareBeanPostProcessors have been registered 
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.IsSingleton(System.String)">
+            <summary>
+            Is this object a singleton?
+            </summary>
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.IsSingleton(System.String)"/> 
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.IsPrototype(System.String)">
+            <summary>
+            Determines whether the specified object name is prototype.  That is, will GetObject
+            always return independent instances?
+            </summary>
+            <param name="name">The name of the object to query</param>
+            <returns>
+            	<c>true</c> if the specified object name will always deliver independent instances; otherwise, <c>false</c>.
+            </returns>
+            <remarks>This method returning false does not clearly indicate a singleton object.
+            It indicated non-independent instances, which may correspond to a scoped object as
+            well.  use the IsSingleton property to explicitly check for a shared
+            singleton instance.
+            <para>Translates aliases back to the corresponding canonical object name.  Will ask the
+            parent factory if the object can not be found in this factory instance.
+            </para>
+            </remarks>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">if there is no object with the given name.</exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.ContainsObject(System.String)">
+            <summary>
+            Does this object factory contain an object with the given name?
+            </summary>
+            <remarks>
+            This method does not (and it should not) check if the specified
+            object exists in one of the parent object factories. If it did,
+            message sources and event registries within application context 
+            hierarchy would have circular references, which would cause stack
+            overflows during message lookup, for example. (A. Seovic)
+            </remarks>
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.ContainsObject(System.String)"/>.
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetAliases(System.String)">
+            <summary>
+            Return the aliases for the given object name, if defined.
+            </summary>
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.GetAliases(System.String)"/>.
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetObject(System.String)">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>.
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetObject(System.String,System.Object[])">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <remarks>
+            <p>
+            This method allows an object factory to be used as a replacement for the
+            Singleton or Prototype design pattern.
+            </p>
+            <p>
+            Note that callers should retain references to returned objects. There is no
+            guarantee that this method will be implemented to be efficient. For example,
+            it may be synchronized, or may need to run an RDBMS query.
+            </p>
+            <p>
+            Will ask the parent factory if the object cannot be found in this factory
+            instance.
+            </p>
+            </remarks>
+            <param name="name">The name of the object to return.</param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a static factory method. If there is no factory method and the
+            arguments are not null, then match the argument values by type and
+            call the object's constructor.
+            </param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetSingleton(System.String)">
+            <summary>
+            Tries to find a cached object for the specified name. 
+            </summary>
+            <param name="objectName">Teh object name to look for.</param>
+            <returns>The cached object if found, <see langword="null"/> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.CreateAndCacheSingletonInstance(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.Object[])">
+            <summary>
+            Creates a singleton instance for the specified object name and definition.
+            </summary>
+            <param name="objectName">
+            The object name (will be used as the key in the singleton cache key).
+            </param>
+            <param name="objectDefinition">The object definition.</param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a static factory method. If there is no factory method and the
+            arguments are not null, then match the argument values by type and
+            call the object's constructor.
+            </param>
+            <returns>The created object instance.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.GetObject(System.String,System.Type)">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String,System.Type)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.ConfigureObject(System.Object,System.String)">
+            <summary>
+            Injects dependencies into the supplied <paramref name="target"/> instance
+            using the named object definition.
+            </summary>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.ConfigureObject(System.Object,System.String,Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Injects dependencies into the supplied <paramref name="target"/> instance
+            using the supplied <paramref name="definition"/>.
+            </summary>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.Dispose">
+            <summary>
+            Destroy all cached singletons in this factory.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.IgnoreDependencyType(System.Type)">
+            <summary>
+            Ignore the given dependency type for autowiring
+            </summary>
+            <seealso cref="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.IgnoreDependencyType(System.Type)"/>.
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.IsCurrentlyInCreation(System.String)">
+            <summary>
+            Determines whether the specified object name is currently in creation..
+            </summary>
+            <param name="objectName">Name of the object.</param>
+            <returns>
+            	<c>true</c> if the specified object name is currently in creation; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.AddObjectPostProcessor(Spring.Objects.Factory.Config.IObjectPostProcessor)">
+            <summary>
+            Add a new <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            that will get applied to objects created by this factory.
+            </summary>
+            <param name="objectPostProcessor">
+            The <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            to register.
+            </param>
+            <seealso cref="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.AddObjectPostProcessor(Spring.Objects.Factory.Config.IObjectPostProcessor)"/>.
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.RegisterAlias(System.String,System.String)">
+            <summary>
+            Given an object name, create an alias.
+            </summary>
+            <seealso cref="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterAlias(System.String,System.String)"/>.
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.RegisterSingleton(System.String,System.Object)">
+            <summary>
+            Register the given existing object as singleton in the object factory,
+            under the given object name.
+            </summary>
+            <seealso cref="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterSingleton(System.String,System.Object)"/>.
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.RegisterCustomConverter(System.Type,System.ComponentModel.TypeConverter)">
+            <summary>
+            Register the given custom <see cref="T:System.ComponentModel.TypeConverter"/>
+            for all properties of the given <see cref="T:System.Type"/>.
+            </summary>
+            <seealso cref="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.RegisterCustomConverter(System.Type,System.ComponentModel.TypeConverter)"/>.
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractObjectFactory.ContainsSingleton(System.String)">
+            <summary>
+            Does this object factory contains a singleton instance with the
+            supplied <paramref name="name"/>?
+            </summary>
+            <seealso cref="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.ContainsSingleton(System.String)"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectFactory.ObjectPostProcessors">
+            <summary>
+            Gets the <see cref="T:System.Collections.IList"/> of
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+            that will be applied to objects created by this factory.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectFactory.IgnoredDependencyTypes">
+            <summary>
+            Gets the set of classes that will be ignored for autowiring.
+            </summary>
+            <remarks>
+            <p>
+            The elements of this <see cref="T:Spring.Collections.ISet"/> are
+            <see cref="T:System.Type"/>s.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectFactory.HasInstantiationAwareBeanPostProcessors">
+            <summary>
+            Returns, whether this object factory instance contains <see cref="T:Spring.Objects.Factory.Config.IInstantiationAwareObjectPostProcessor"/> objects.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectFactory.HasDestructionAwareBeanPostProcessors">
+            <summary>
+            Returns, whether this object factory instance contains <see cref="T:Spring.Objects.Factory.Config.IDestructionAwareObjectPostProcessor"/> objects.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectFactory.TemporarySingletonPlaceHolder">
+            <summary>
+            Gets the temporary object that is placed 
+            into the singleton cache during object resolution.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectFactory.ParentObjectFactory">
+            <summary>
+            The parent object factory, or <see langword="null"/> if there is none.
+            </summary>
+            <value>
+            The parent object factory, or <see langword="null"/> if there is none.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectFactory.Item(System.String)">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>.
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractObjectFactory.ObjectPostProcessorCount">
+            <summary>
+            Returns the current number of registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s.
+            </summary>
+            <value>
+            The current number of registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s.
+            </value>
+            <seealso cref="P:Spring.Objects.Factory.Config.IConfigurableObjectFactory.ObjectPostProcessorCount"/>.
+        </member>
+        <member name="T:Spring.Objects.Factory.ObjectDefinitionException">
+            <summary>
+            Exception thrown when an <see cref="T:Spring.Objects.Factory.Xml.INamespaceParser"/>
+            encounters an error when attempting to parse an object
+            definition.
+            </summary>
+            <author>Federico Spinazzi (.NET)</author>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionException.#ctor">
+            <summary>
+            Creates a new instance of the ObjectDefinitionException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the ObjectDefinitionException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the ObjectDefinitionException class.
+            </summary>
+            <param name="name">
+            The value of the xml <code>class</code> attribute thet can be resolved
+            as a type
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the ObjectDefinitionException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="P:Spring.Objects.Factory.ObjectDefinitionException.Message">
+            <summary>
+            The message about the exception.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.ObjectCurrentlyInCreationException">
+            <summary>
+            Thrown in case of a reference to an object that is currently in creation.
+            </summary>
+            <remarks>
+            <p>
+            Typically happens when constructor autowiring matches the currently
+            constructed object.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans</author>
+            <version>$Id: ObjectCurrentlyInCreationException.cs,v 1.6 2007/12/05 00:28:04 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCurrentlyInCreationException.#ctor">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCurrentlyInCreationException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCurrentlyInCreationException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCurrentlyInCreationException.#ctor(System.String,System.String)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="objectName">
+            The name of the object that triggered the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCurrentlyInCreationException.#ctor(System.String,System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="objectName">
+            The name of the object that triggered the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCurrentlyInCreationException.#ctor(System.String,System.String,System.String)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+            </summary>
+            <param name="resourceDescription">
+            The description of the resource associated with the object.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="objectName">
+            The name of the object that triggered the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCurrentlyInCreationException.#ctor(System.String,System.String,System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Objects.Factory.ObjectCurrentlyInCreationException"/> class.
+            </summary>
+            <param name="resourceDescription">
+            The description of the resource associated with the object.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="objectName">
+            The name of the object that triggered the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectCurrentlyInCreationException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the ObjectCurrentlyInCreationException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.RuntimeObjectReference">
+            <summary>
+            Immutable placeholder class used for the value of a
+            <see cref="T:Spring.Objects.PropertyValue"/> object when it's a reference
+            to another object in this factory to be resolved at runtime.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.RuntimeObjectReference.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.RuntimeObjectReference"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This does <b>not</b> mark this object as being a reference to
+            another object in any parent factory.
+            </p>
+            </remarks>
+            <param name="objectName">The name of the target object.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.RuntimeObjectReference.#ctor(System.String,System.Boolean)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.RuntimeObjectReference"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This variant constructor allows a client to specifiy whether or not
+            this object is a reference to another object in a parent factory.
+            </p>
+            </remarks>
+            <param name="objectName">The name of the target object.</param>
+            <param name="isToParent">
+            Whether this object is an explicit reference to an object in a
+            parent factory.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.RuntimeObjectReference.ToString">
+            <summary>
+            Returns a string representation of this instance.
+            </summary>
+            <returns>A string representation of this instance.</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.RuntimeObjectReference.ObjectName">
+            <summary>
+            Return the target object name.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.RuntimeObjectReference.IsToParent">
+            <summary>
+            Is this is an explicit reference to an object in the parent
+            factory?
+            </summary>
+            <value>
+            <see langword="true"/> if this is an explicit reference to an
+            object in the parent factory.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.MutablePropertyValues">
+            <summary>
+            Default implementation of the <see cref="T:Spring.Objects.IPropertyValues"/>
+            interface.
+            </summary>
+            <remarks>
+            <p>
+            Allows simple manipulation of properties, and provides constructors to
+            support deep copy and construction from a number of collection types such as
+            <see cref="T:System.Collections.IDictionary"/> and
+            <see cref="T:System.Collections.IList"/>.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: MutablePropertyValues.cs,v 1.15 2007/03/16 04:01:29 aseovic Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.MutablePropertyValues.propertyValuesList">
+            <summary>
+            The list of <see cref="T:Spring.Objects.PropertyValue"/> objects.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Objects.MutablePropertyValues"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            The returned instance is initially empty...
+            <see cref="T:Spring.Objects.PropertyValue"/>s can be added with the various
+            overloaded <see cref="M:Spring.Objects.MutablePropertyValues.Add(Spring.Objects.PropertyValue)"/>,
+            <see cref="M:Spring.Objects.MutablePropertyValues.Add(System.String,System.Object)"/>,
+            <see cref="M:Spring.Objects.MutablePropertyValues.AddAll(System.Collections.IDictionary)"/>,
+            and <see cref="M:Spring.Objects.MutablePropertyValues.AddAll(System.Collections.IList)"/>
+            methods.
+            </p>
+            </remarks>
+            <seealso cref="M:Spring.Objects.MutablePropertyValues.Add(Spring.Objects.PropertyValue)"/>
+            <seealso cref="M:Spring.Objects.MutablePropertyValues.Add(System.String,System.Object)"/>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.#ctor(Spring.Objects.IPropertyValues)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Objects.MutablePropertyValues"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            Deep copy constructor. Guarantees <see cref="T:Spring.Objects.PropertyValue"/>
+            references are independent, although it can't deep copy objects currently
+            referenced by individual <see cref="T:Spring.Objects.PropertyValue"/> objects.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.#ctor(System.Collections.IDictionary)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Objects.MutablePropertyValues"/>
+            class.
+            </summary>
+            <param name="map">
+            The <see cref="T:System.Collections.IDictionary"/> with property values
+            keyed by property name, which must be a <see cref="T:System.String"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.Add(System.String,System.Object)">
+            <summary>
+            Overloaded version of <c>Add</c> that takes a property name and a property value.
+            </summary>
+            <param name="propertyName">
+            The name of the property.
+            </param>
+            <param name="propertyValue">
+            The value of the property.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.Add(Spring.Objects.PropertyValue)">
+            <summary>
+            Add the supplied <see cref="T:Spring.Objects.PropertyValue"/> object,
+            replacing any existing one for the respective property.
+            </summary>
+            <param name="pv">
+            The <see cref="T:Spring.Objects.PropertyValue"/> object to add.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.AddAll(System.Collections.IDictionary)">
+            <summary>
+            Add all property values from the given
+            <see cref="T:System.Collections.IDictionary"/>.
+            </summary>
+            <param name="map">
+            The map of property values, the keys of which must be
+            <see cref="T:System.String"/>s.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.AddAll(System.Collections.IList)">
+            <summary>
+            Add all property values from the given
+            <see cref="T:System.Collections.IList"/>.
+            </summary>
+            <param name="values">
+            The list of <see cref="T:Spring.Objects.PropertyValue"/>s to be added.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.Remove(Spring.Objects.PropertyValue)">
+            <summary>
+            Remove the given <see cref="T:Spring.Objects.PropertyValue"/>, if contained.
+            </summary>
+            <param name="pv">
+            The <see cref="T:Spring.Objects.PropertyValue"/> to remove.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.Remove(System.String)">
+            <summary>
+            Removes the named <see cref="T:Spring.Objects.PropertyValue"/>, if contained.
+            </summary>
+            <param name="propertyName">
+            The name of the property.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.SetPropertyValueAt(Spring.Objects.PropertyValue,System.Int32)">
+            <summary>
+            Modify a <see cref="T:Spring.Objects.PropertyValue"/> object held in this object. Indexed from 0.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.GetPropertyValue(System.String)">
+            <summary>
+            Return the property value given the name.
+            </summary>
+            <remarks>
+            The property name is checked in a <c>case-insensitive</c> fashion.
+            </remarks>
+            <param name="propertyName">
+            The name of the property.
+            </param>
+            <returns>
+            The property value.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.Contains(System.String)">
+            <summary>
+            Does the container of properties contain one of this name.
+            </summary>
+            <param name="propertyName">The name of the property to search for.</param>
+            <returns>
+            True if the property is contained in this collection, false otherwise.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.ChangesSince(Spring.Objects.IPropertyValues)">
+            <summary>
+            Return the difference (changes, additions, but not removals) of
+            property values between the supplied argument and the values
+            contained in the collection.
+            </summary>
+            <param name="old">Another property values collection.</param>
+            <returns>
+            The collection of property values that are different than the supplied one.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.GetEnumerator">
+            <summary>
+            Returns an <see cref="T:System.Collections.IEnumerator"/> that can iterate
+            through a collection.
+            </summary>
+            <remarks>
+            <p>
+            The returned <see cref="T:System.Collections.IEnumerator"/> is the
+            <see cref="T:System.Collections.IEnumerator"/> exposed by the
+            <see cref="P:Spring.Objects.MutablePropertyValues.PropertyValues"/>
+            property.
+            </p>
+            </remarks>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> that can iterate through a
+            collection.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.MutablePropertyValues.ToString">
+            <summary>
+            Convert the object to a string representation.
+            </summary>
+            <returns>
+            A string representation of the object.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.MutablePropertyValues.PropertyValues">
+            <summary>
+            Property to retrieve the array of property values.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.ObjectDefinitionHolder">
+            <summary>
+            Holder for an <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> with
+            name and aliases.
+            </summary>
+            <remarks>
+            <p>
+            Recognized by
+            <see cref="T:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory"/>
+            for inner object definitions. Registered by
+            <see cref="T:Spring.Objects.Factory.Xml.ObjectsNamespaceParser"/>,
+            which also uses it as general holder for a parsed object definition.
+            </p>
+            <p>
+            Can also be used for programmatic registration of inner object
+            definitions. If you don't care about the functionality offered by the
+            <see cref="T:Spring.Objects.Factory.IObjectNameAware"/> interface and the like,
+            registering <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+            or <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/> is good enough.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: ObjectDefinitionHolder.cs,v 1.2 2007/08/07 22:05:20 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionHolder.#ctor(Spring.Objects.Factory.Config.IObjectDefinition,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.ObjectDefinitionHolder"/> class.
+            </summary>
+            <param name="definition">
+            The object definition to be held by this instance.
+            </param>
+            <param name="name">
+            The name of the object definition.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionHolder.#ctor(Spring.Objects.Factory.Config.IObjectDefinition,System.String,System.String[])">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.ObjectDefinitionHolder"/> class.
+            </summary>
+            <param name="definition">
+            The object definition to be held by this instance.
+            </param>
+            <param name="name">The name of the object.</param>
+            <param name="aliases">
+            Any aliases for the supplied <paramref name="definition"/>
+            </param>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ObjectDefinitionHolder.ObjectDefinition">
+            <summary>
+            The <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> held by this
+            instance.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ObjectDefinitionHolder.ObjectName">
+            <summary>
+            The name of the object definition.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ObjectDefinitionHolder.Aliases">
+            <summary>
+            Any aliases for the object definition.
+            </summary>
+            <remarks>
+            <p>
+            Guaranteed to never return <cref lang="null"/>; if the associated
+            <see cref="P:Spring.Objects.Factory.Config.ObjectDefinitionHolder.ObjectDefinition"/>
+            does not have any aliases associated with it, then an empty
+            <see cref="T:System.String"/> array will be returned.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.IConfigurableFactoryObject">
+            <summary>
+            Extension of the <see cref="T:Spring.Objects.Factory.IFactoryObject"/> interface 
+            that injects dependencies into the object managed by the factory.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: IConfigurableFactoryObject.cs,v 1.1 2007/07/29 19:39:27 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.IConfigurableFactoryObject.ProductTemplate">
+            <summary>
+            Gets the template object definition that should be used 
+            to configure the instance of the object managed by this factory.
+            </summary>
+        </member>
+        <member name="T:Spring.Expressions.OpUnaryPlus">
+            <summary>
+            Represents unary plus operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpUnaryPlus.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpUnaryPlus.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpUnaryPlus.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpUnaryPlus.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the unary plus operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpDIVIDE">
+            <summary>
+            Represents arithmetic division operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpDIVIDE.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpDIVIDE.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpDIVIDE.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpDIVIDE.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the arithmetic division operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.MethodNode">
+            <summary>
+            Represents parsed method node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: MethodNode.cs,v 1.21 2008/03/20 23:58:16 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.MethodNode.#cctor">
+            <summary>
+            Static constructor. Initializes a map of special collection processor methods.
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.MethodNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.MethodNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.MethodNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns node's value for the given context.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.MethodNode.GetBestMethod(System.Type,System.String,System.Reflection.BindingFlags,System.Object[])">
+            <summary>
+            Gets the best method given the name, argument values, for a given type.
+            </summary>
+            <param name="type">The type on which to search for the method.</param>
+            <param name="methodName">Name of the method.</param>
+            <param name="bindingFlags">The binding flags.</param>
+            <param name="argValues">The arg values.</param>
+            <returns>Best matching method or null if none found.</returns>
+        </member>
+        <member name="T:Spring.Expressions.Expression">
+            <summary>
+            Container object for the parsed expression.
+            </summary>
+            <remarks>
+            <p>
+            Preparing this object once and reusing it many times for expression
+            evaluation can result in significant performance improvements, as 
+            expression parsing and reflection lookups are only performed once. 
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: Expression.cs,v 1.19 2008/03/20 10:35:54 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.Expression.Parse(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Expressions.Expression"/> class
+            by parsing specified expression string.
+            </summary>
+            <param name="expression">Expression to parse.</param>
+        </member>
+        <member name="M:Spring.Expressions.Expression.RegisterFunction(System.String,System.String,System.Collections.IDictionary)">
+            <summary>
+            Registers lambda expression under the specified <paramref name="functionName"/>.
+            </summary>
+            <param name="functionName">Function name to register expression as.</param>
+            <param name="lambdaExpression">Lambda expression to register.</param>
+            <param name="variables">Variables dictionary that the function will be registered in.</param>
+        </member>
+        <member name="M:Spring.Expressions.Expression.ParsePrimary(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Expressions.Expression"/> class
+            by parsing specified primary expression string.
+            </summary>
+            <param name="expression">Primary expression to parse.</param>
+        </member>
+        <member name="M:Spring.Expressions.Expression.ParseProperty(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Expressions.Expression"/> class
+            by parsing specified property expression string.
+            </summary>
+            <param name="expression">Property expression to parse.</param>
+        </member>
+        <member name="M:Spring.Expressions.Expression.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Expressions.Expression"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.Expression.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.Expression.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Evaluates this expression for the specified root object and returns 
+            value of the last node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Value of the last node.</returns>
+        </member>
+        <member name="M:Spring.Expressions.Expression.Set(System.Object,Spring.Expressions.BaseNode.EvaluationContext,System.Object)">
+            <summary>
+            Evaluates this expression for the specified root object and sets 
+            value of the last node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <param name="newValue">Value to set last node to.</param>
+            <exception cref="T:System.NotSupportedException">If navigation expression is empty.</exception>
+        </member>
+        <member name="M:Spring.Expressions.Expression.GetPropertyInfo(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Evaluates this expression for the specified root object and returns 
+            <see cref="T:System.Reflection.PropertyInfo"/> of the last node, if possible.
+            </summary>
+            <param name="context">Context to evaluate expression against.</param>
+            <param name="variables">Expression variables map.</param>
+            <returns>Value of the last node.</returns>
+        </member>
+        <member name="T:Spring.Expressions.Expression.ReservedVariableNames">
+            <summary>
+            Contains a list of reserved variable names.
+            You must not use any variable names with the reserved prefix!
+            </summary>
+        </member>
+        <member name="F:Spring.Expressions.Expression.ReservedVariableNames.RESERVEDPREFIX">
+            <summary>
+            Variable Names using this prefix are reserved for internal framework use
+            </summary>
+        </member>
+        <member name="F:Spring.Expressions.Expression.ReservedVariableNames.CurrentObjectFactory">
+            <summary>
+            variable name of the currently processed object factory, if any
+            </summary>
+        </member>
+        <member name="T:Spring.Expressions.AttributeNode">
+            <summary>
+            Represents parsed attribute node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AttributeNode.cs,v 1.9 2007/09/07 03:01:21 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Expressions.ConstructorNode">
+            <summary>
+            Represents parsed method node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ConstructorNode.cs,v 1.16 2007/09/07 03:01:21 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.ConstructorNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.ConstructorNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.ConstructorNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Creates new instance of the type defined by this node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.ConstructorNode.GetObjectType(System.String)">
+            <summary>
+            Determines the type of object that should be instantiated.
+            </summary>
+            <param name="typeName">
+            The type name to resolve.
+            </param>
+            <returns>
+            The type of object that should be instantiated.
+            </returns>
+            <exception cref="T:System.TypeLoadException">
+            If the type cannot be resolved.
+            </exception>
+        </member>
+        <member name="M:Spring.Expressions.ConstructorNode.InitializeNode(System.Object[],System.Collections.IDictionary)">
+            <summary>
+            Initializes this node by caching necessary constructor and property info.
+            </summary>
+            <param name="argValues"></param>
+            <param name="namedArgValues"></param>
+        </member>
+        <member name="M:Spring.Expressions.ConstructorNode.SetNamedArguments(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Sets the named arguments (properties).
+            </summary>
+            <param name="instance">Instance to set property values on.</param>
+            <param name="namedArgValues">Argument (property) name to value mappings.</param>
+        </member>
+        <member name="M:Spring.Expressions.AttributeNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.AttributeNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.AttributeNode.GetObjectType(System.String)">
+            <summary>
+            Tries to determine attribute type based on the specified
+            attribute type name.
+            </summary>
+            <param name="typeName">
+            Attribute type name to resolve.
+            </param>
+            <returns>
+            Resolved attribute type.
+            </returns>
+            <exception cref="T:System.TypeLoadException">
+            If type cannot be resolved.
+            </exception>
+        </member>
+        <member name="T:Spring.Expressions.ExpressionConverter">
+            <summary>
+            Converts string representation of expression into an instance of <see cref="T:Spring.Expressions.IExpression"/>.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ExpressionConverter.cs,v 1.1 2007/07/31 02:13:52 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.ExpressionConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Can we convert from a the sourcetype to a <see cref="T:Spring.Expressions.IExpression"/>?
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from a <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns><see langword="true"/> if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Expressions.ExpressionConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Convert from a <see cref="T:System.String"/> value to an
+            <see cref="T:Spring.Expressions.IExpression"/> instance.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture.
+            </param>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <returns>
+            A <see cref="T:System.String"/> array if successful.
+            </returns>        
+        </member>
+        <member name="T:Spring.Core.TypeConversion.TypeConversionUtils">
+            <summary>
+            Utility methods that are used to convert objects from one type into another.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: TypeConversionUtils.cs,v 1.4 2008/03/20 23:58:16 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.TypeConversionUtils.ConvertValueIfNecessary(System.Type,System.Object,System.String)">
+            <summary>
+            Convert the value to the required <see cref="T:System.Type"/> (if necessary from a string).
+            </summary>
+            <param name="newValue">The proposed change value.</param>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> we must convert to.
+            </param>
+            <param name="propertyName">Property name, used for error reporting purposes...</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If there is an internal error.
+            </exception>
+            <returns>The new value, possibly the result of type conversion.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.TypeConversionUtils.CreatePropertyChangeEventArgs(System.String,System.Object,System.Object)">
+            <summary>
+            Utility method to create a property change event.
+            </summary>
+            <param name="fullPropertyName">
+            The full name of the property that has changed.
+            </param>
+            <param name="oldValue">The property old value</param>
+            <param name="newValue">The property new value</param>
+            <returns>
+            A new <see cref="T:Spring.Core.PropertyChangeEventArgs"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Context.Support.MessageSourceResolvableVisitor">
+            <summary>
+            Visitor class to represent
+            <see cref="T:Spring.Context.IMessageSourceResolvable"/> instances.
+            </summary>
+            <remarks>
+            <p>
+            Used in the first instance to supply stringified versions of
+            <see cref="T:Spring.Context.IMessageSourceResolvable"/> instances. 
+            </p>
+            <p>
+            Other methods can be added here to return different representations,
+            including XML, CSV, etc..
+            </p>
+            </remarks>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: MessageSourceResolvableVisitor.cs,v 1.6 2006/04/09 07:18:38 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Context.Support.MessageSourceResolvableVisitor.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.MessageSourceResolvableVisitor"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.MessageSourceResolvableVisitor.VisitMessageSourceResolvableString(Spring.Context.IMessageSourceResolvable)">
+            <summary>
+            Outputs the supplied <see cref="T:Spring.Context.IMessageSourceResolvable"/>
+            as a nicely formatted <see cref="T:System.String"/>.
+            </summary>
+            <param name="resolvable">
+            The <see cref="T:Spring.Context.IMessageSourceResolvable"/> to output.
+            </param>
+        </member>
+        <member name="T:Spring.Context.Support.ApplicationObjectSupport">
+            <summary>
+            Convenient superclass for application objects that want to be aware of
+            the application context, e.g. for custom lookup of collaborating object
+            or for context-specific resource access. 
+            </summary>
+            <remarks>
+            <p>
+            It saves the application context reference and provides an
+            initialization callback method. Furthermore, it offers numerous
+            convenience methods for message lookup.
+            </p>
+            <p>
+            There is no requirement to subclass this class: it just makes things
+            a little easier if you need access to the context, e.g. for access to
+            file resources or to the message source. Note that many application
+            objects do not need to be aware of the application context at all,
+            as they can receive collaborating objects via object references.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: ApplicationObjectSupport.cs,v 1.8 2007/07/17 14:51:14 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Context.Support.ApplicationObjectSupport.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.ApplicationObjectSupport"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no
+            public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.ApplicationObjectSupport.#ctor(Spring.Context.IApplicationContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.ApplicationObjectSupport"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no
+            public constructors.
+            </p>
+            </remarks>
+            <param name="applicationContext">
+            The <see cref="T:Spring.Context.IApplicationContext"/> that this
+            object runs in.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.ApplicationObjectSupport.InitApplicationContext">
+            <summary>
+            Intializes the wrapped
+            <see cref="T:Spring.Context.IApplicationContext"/>.
+            </summary>
+            <remarks>
+            <p>
+            This is a template method that subclasses can override for custom
+            initialization behavior.
+            </p>
+            <p>
+            Gets called by the
+            <see cref="P:Spring.Context.Support.ApplicationObjectSupport.ApplicationContext"/>
+            instance directly after setting the context instance.
+            </p>
+            <note type="caution">
+            Does not get called on reinitialization of the context.
+            </note>
+            </remarks>
+            <exception cref="T:Spring.Context.ApplicationContextException">
+            In the case of any initialization errors.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If thrown by application context methods.
+            </exception>
+        </member>
+        <member name="P:Spring.Context.Support.ApplicationObjectSupport.RequiredType">
+            <summary>
+            The context class that any context passed to the
+            <see cref="P:Spring.Context.Support.ApplicationObjectSupport.ApplicationContext"/>
+            must be an instance of.
+            </summary>
+            <value>
+            The <see cref="T:Spring.Context.IApplicationContext"/>
+            <see cref="T:System.Type"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Context.Support.ApplicationObjectSupport.MessageSourceAccessor">
+            <summary>
+            Return a <see cref="T:Spring.Context.Support.MessageSourceAccessor"/> for the
+            application context used by this object, for easy message access.
+            </summary>
+        </member>
+        <member name="P:Spring.Context.Support.ApplicationObjectSupport.ApplicationContext">
+            <summary>
+            Set the <see cref="T:Spring.Context.IApplicationContext"/> that this
+            object runs in.
+            </summary>
+            <exception cref="T:Spring.Context.ApplicationContextException">
+            When passed an unexpected
+            <see cref="T:Spring.Context.IApplicationContext"/> implementation
+            instance that is not compatible with the <see cref="T:System.Type"/>
+            defined by the value of the
+            <see cref="P:Spring.Context.Support.ApplicationObjectSupport.RequiredType"/>. 
+            property. Also, thrown when trying to re-initialize with a
+            different <see cref="T:Spring.Context.IApplicationContext"/> than was
+            originally used.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If thrown by any application context methods.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectInitializationException"/>
+            <seealso cref="P:Spring.Context.IApplicationContextAware.ApplicationContext"/>
+        </member>
+        <member name="T:Spring.Context.Support.AbstractXmlApplicationContext">
+            <summary>
+            Convenient abstract superclass for
+            <see cref="T:Spring.Context.IApplicationContext"/> implementations that
+            draw their configuration from XML documents containing object
+            definitions as understood by an 
+            <see cref="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/>.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: AbstractXmlApplicationContext.cs,v 1.20 2007/07/20 11:37:55 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Context.Support.AbstractApplicationContext">
+            <summary>
+            Partial implementation of the
+            <see cref="T:Spring.Context.IApplicationContext"/> interface.
+            </summary>
+            <remarks>
+            <p>
+            Does not mandate the type of storage used for configuration, but does
+            implement common functionality. Uses the Template Method design
+            pattern, requiring concrete subclasses to implement
+            <see langword="abstract"/> methods.
+            </p>
+            <p>
+            In contrast to a plain vanilla
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/>, an
+            <see cref="T:Spring.Context.IApplicationContext"/> is supposed
+            to detect special objects defined in its object factory: therefore,
+            this class automatically registers
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>s,
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+            and <see cref="T:Spring.Context.IApplicationEventListener"/>s that are
+            defined as objects in the context.
+            </p>
+            <p>
+            An <see cref="T:Spring.Context.IMessageSource"/> may be also supplied as
+            an object in the context, with the special, well-known-name of
+            <c>"messageSource"</c>. Else, message resolution is delegated to the
+            parent context.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergan Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: AbstractApplicationContext.cs,v 1.74 2007/08/27 09:38:28 oakinger Exp $</version>
+            <seealso cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            <seealso cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+        </member>
+        <member name="T:Spring.Core.IO.ConfigurableResourceLoader">
+            <summary>
+            Configurable implementation of the
+            <see cref="T:Spring.Core.IO.IResourceLoader"/> interface.
+            </summary>
+            <remarks>
+            <p>
+            This <see cref="T:Spring.Core.IO.IResourceLoader"/> implementation
+            supports the configuration of resource access protocols and the
+            corresponding .NET types that know how to handle those protocols.
+            </p>
+            <p>
+            Basic protocol-to-resource type mappings are also defined by this class,
+            while others can be added either internally, by application contexts
+            extending this class, or externally, by the end user configuring the
+            context.
+            </p>
+            <p>
+            Only one resource type can be defined for each protocol, but multiple
+            protocols can map to the same resource type (for example, the
+            <c>"http"</c> and <c>"ftp"</c> protocols both map to the
+            <see cref="T:Spring.Core.IO.UrlResource"/> type. The protocols that are
+            mapped by default can be found in the following list.
+            </p>
+            <p>
+            <list type="bullet">
+            <item>
+            <description>assembly</description>
+            </item>
+            <item>
+            <description>config</description>
+            </item>
+            <item>
+            <description>file</description>
+            </item>
+            <item>
+            <description>http</description>
+            </item>
+            <item>
+            <description>https</description>
+            </item>
+            </list>
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ConfigurableResourceLoader.cs,v 1.25 2007/08/08 17:46:55 bbaia Exp $</version>
+            <seealso cref="T:Spring.Core.IO.IResource"/>
+            <seealso cref="T:Spring.Core.IO.ResourceConverter"/>
+            <seealso cref="T:Spring.Context.IApplicationContext"/>
+        </member>
+        <member name="F:Spring.Core.IO.ConfigurableResourceLoader.ProtocolSeparator">
+            <summary>
+            The separator between the protocol name and the resource name.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.IO.ConfigurableResourceLoader.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.IO.ConfigurableResourceLoader"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.IO.ConfigurableResourceLoader.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.IO.ConfigurableResourceLoader"/> class using the specified default protocol for unqualified resources.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.IO.ConfigurableResourceLoader.GetResource(System.String)">
+            <summary>
+            Returns a <see cref="T:Spring.Core.IO.IResource"/> that has been
+            mapped to the protocol of the supplied <paramref name="resourceName"/>.
+            </summary>
+            <param name="resourceName">The name of the resource.</param>
+            <returns>
+            A new <see cref="T:Spring.Core.IO.IResource"/> instance for the
+            supplied <paramref name="resourceName"/>.
+            </returns>
+            <exception cref="T:System.UriFormatException">
+            If a <see cref="T:Spring.Core.IO.IResource"/> <see cref="T:System.Type"/>
+            mapping does not exist for the supplied <paramref name="resourceName"/>.
+            </exception>
+            <exception cref="T:System.Exception">
+            In the case of any errors arising from the instantiation of the
+            returned <see cref="T:Spring.Core.IO.IResource"/> instance.
+            </exception>
+            <seealso cref="M:Spring.Core.IO.ResourceHandlerRegistry.RegisterResourceHandler(System.String,System.Type)"/>
+        </member>
+        <member name="M:Spring.Core.IO.ConfigurableResourceLoader.HasProtocol(System.String)">
+            <summary>
+            Checks that the supplied <paramref name="resourceName"/> starts
+            with one of the protocol names currently mapped by this
+            <see cref="T:Spring.Core.IO.ConfigurableResourceLoader"/> instance.
+            </summary>
+            <param name="resourceName">The name of the resource.</param>
+            <returns>
+            <see langword="true"/> if the supplied
+            <paramref name="resourceName"/> starts with one of the known
+            protocols; <see langword="false"/> if not, or if the supplied
+            <paramref name="resourceName"/> is itself <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.ConfigurableResourceLoader.GetProtocol(System.String)">
+            <summary>
+            Extracts the protocol name from the supplied
+            <paramref name="resourceName"/>.
+            </summary>
+            <param name="resourceName">The name of the resource.</param>
+            <returns>
+            The extracted protocol name or <see langword="null"/> if the
+            supplied <paramref name="resourceName"/> is unqualified (or
+            is itself <see langword="null"/>).
+            </returns>
+        </member>
+        <member name="P:Spring.Core.IO.ConfigurableResourceLoader.DefaultResourceProtocol">
+            <summary>
+            The default protocol to use for unqualified resources.
+            </summary>
+            <remarks>
+            <p>
+            The initial value is <c>"file"</c>.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Context.Support.AbstractApplicationContext.ContextSectionName">
+            <summary>
+            Name of the .Net config section that contains Spring.Net context definition.
+            </summary>
+        </member>
+        <member name="F:Spring.Context.Support.AbstractApplicationContext.DefaultRootContextName">
+            <summary>
+            Default name of the root context.
+            </summary>
+        </member>
+        <member name="F:Spring.Context.Support.AbstractApplicationContext.MessageSourceObjectName">
+            <summary>
+            The special, well-known-name of the default
+            <see cref="T:Spring.Context.IMessageSource"/> in the context.
+            </summary>
+            <remarks>
+            <p>
+            If no <see cref="T:Spring.Context.IMessageSource"/> can be found
+            in the context using this lookup key, then message resolution
+            will be delegated to the parent context (if any).
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Context.Support.AbstractApplicationContext.EventRegistryObjectName">
+            <summary>
+            The special, well-known-name of the default
+            <see cref="T:Spring.Objects.Events.IEventRegistry"/> in the context.
+            </summary>
+            <remarks>
+            <p>
+            If no <see cref="T:Spring.Objects.Events.IEventRegistry"/> can be found
+            in the context using this lookup key, then a default
+            <see cref="T:Spring.Objects.Events.IEventRegistry"/> will be used.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Context.Support.AbstractApplicationContext.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class.
+            </summary>
+        </member>
+        <member name="F:Spring.Context.Support.AbstractApplicationContext._messageSource">
+            <summary>
+            The <see cref="T:Spring.Context.IMessageSource"/> instance we delegate
+            our implementation of said interface to.
+            </summary>
+        </member>
+        <member name="F:Spring.Context.Support.AbstractApplicationContext._eventRegistry">
+            <summary>
+            The <see cref="T:Spring.Objects.Events.IEventRegistry"/> instance we
+            delegate our implementation of said interface to.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Context.Support.AbstractApplicationContext"/>
+            with no parent context.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes
+            no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.#ctor(System.Boolean)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Context.Support.AbstractApplicationContext"/>
+            with no parent context.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes
+            no public constructors.
+            </p>
+            </remarks>
+            <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.#ctor(System.String,System.Boolean,Spring.Context.IApplicationContext)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Context.Support.AbstractApplicationContext"/>
+            with the supplied parent context.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes
+            no public constructors.
+            </p>
+            </remarks>
+            <param name="name">The application context name.</param>
+            <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+            <param name="parentApplicationContext">The parent application context.</param>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.AddDefaultObjectPostProcessor(Spring.Objects.Factory.Config.IObjectPostProcessor)">
+            <summary>
+            Adds the given <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/> to the list of standard
+            processors being added to the underlying <see cref="T:Spring.Objects.Factory.Config.IConfigurableObjectFactory"/>
+            </summary>
+            <remarks>
+            Each time <see cref="M:Spring.Context.Support.AbstractApplicationContext.Refresh"/> is called on this context, the context ensures, that 
+            all default <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s are registered with the underlying <see cref="T:Spring.Objects.Factory.Config.IConfigurableObjectFactory"/>.
+            </remarks>
+            <param name="defaultObjectPostProcessor">The <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/> instance.</param>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.Dispose">
+            <summary>
+            Closes this context and disposes of any resources (such as
+            singleton objects in the wrapped
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/>).
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.RefreshObjectFactory">
+            <summary>
+            Subclasses must implement this method to perform the actual
+            configuration loading.
+            </summary>
+            <remarks>
+            <p>
+            This method is invoked by
+            <see cref="M:Spring.Context.Support.AbstractApplicationContext.Refresh"/>,
+            before any other initialization occurs.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of errors encountered while refreshing the object factory.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetInternalParentObjectFactory">
+            <summary>
+            Returns the internal object factory of the parent context if it implements
+            <see cref="T:Spring.Context.IConfigurableApplicationContext"/>; else,
+            returns the parent context itself.
+            </summary>
+            <returns>
+            The parent context's object factory, or the parent itself.
+            </returns>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.OnContextEvent(Spring.Context.ApplicationEventArgs)">
+            <summary>
+            Raises an application context event.
+            </summary>
+            <param name="e">
+            Any arguments to the event. May be <see langword="null"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.OnContextEvent(System.Object,Spring.Context.ApplicationEventArgs)">
+            <summary>
+            Raises an application context event.
+            </summary>
+            <param name="source">
+            The source of the event.
+            </param>
+            <param name="e">
+            Any arguments to the event. May be <see langword="null"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.PostProcessObjectFactory(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)">
+            <summary>
+            Modify the application context's internal object factory after its standard
+            initialization.
+            </summary>
+            <remarks>
+            <p>
+            All object definitions will have been loaded, but no objects
+            will have been instantiated yet. This allows for the registration
+            of special
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+            in certain
+            <see cref="T:Spring.Context.IApplicationContext"/> implementations.
+            </p>
+            </remarks>
+            <param name="objectFactory">
+            The object factory used by the application context.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of errors.
+            </exception>.
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.OnRefresh">
+            <summary>
+            Template method which can be overridden to add context-specific
+            refresh work.
+            </summary>
+            <remarks>
+            <p>
+            Called on initialization of special objects, before instantiation
+            of singletons.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.InvokeObjectFactoryPostProcessors">
+            <summary>
+            Instantiate and invoke all registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            objects, respecting any explicit ordering.
+            </summary>
+            <remarks>
+            <note type="caution">
+            <b>Must</b> be called before singleton instantiation.
+            </note>
+            </remarks>
+            <exception cref="T:Spring.Objects.ObjectsException">In the case of errors.</exception>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.RegisterObjectPostProcessorChecker(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)">
+            <summary>
+            Register an IObjectPostProcessorChecker that logs an info
+            message when an object is created during IObjectPostProcessor
+            instantiation, i.e. when an object is not eligible for being
+            processed by all IObjectPostProcessors.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.InitEventRegistry">
+            <summary>
+            Initializes the default event registry for this context.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetInternalParentMessageSource">
+            <summary>
+            Returns the internal message source of the parent context if said
+            parent context is an <see cref="T:Spring.Context.Support.AbstractApplicationContext"/>, else
+            simply the parent context itself.
+            </summary>
+            <returns>
+            The internal message source of the parent context if said
+            parent context is an <see cref="T:Spring.Context.Support.AbstractApplicationContext"/>, else
+            simply the parent context itself.
+            </returns>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.InitMessageSource">
+            <summary>
+            Initializes the default message source for this context.
+            </summary>
+            <remarks>
+            <p>
+            Uses any parent context's message source if one is not available
+            in this context.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.AddObjectFactoryPostProcessor(Spring.Objects.Factory.Config.IObjectFactoryPostProcessor)">
+            <summary>
+            Add a new <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            that will get applied to the internal object factory of this application context
+            on refresh, before any of the object definitions are evaluated.
+            </summary>
+            <param name="objectFactoryPostProcessor">
+            The factory processor to register.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.Refresh">
+            <summary>
+            Load or refresh the persistent representation of the configuration,
+            which might an XML file, properties file, or relational database schema.
+            </summary>
+            <exception cref="T:Spring.Context.ApplicationContextException">
+            If the configuration cannot be loaded.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object factory could not be initialized.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.EnsureKnownObjectPostProcessors(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)">
+            <summary>
+            Ensures, that predefined ObjectPostProcessors are registered with this ObjectFactory
+            </summary>
+            <param name="objectFactory"></param>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetObjectNamesForType(System.Type)">
+            <summary>
+            Return the names of objects matching the given <see cref="T:System.Type"/>
+            (including subclasses), judging from the object definitions.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match, or <see langword="null"/>
+            for all object names.
+            </param>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectNamesForType(System.Type)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetObjectNamesForType(System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Return the names of objects matching the given <see cref="T:System.Type"/>
+            (including subclasses), judging from the object definitions.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match, or <see langword="null"/>
+            for all object names.
+            </param>
+            <param name="includePrototypes">
+            Whether to include prototype objects too or just singletons (also applies to
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s).
+            </param>
+            <param name="includeFactoryObjects">
+            Whether to include <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s too
+            or just normal objects.
+            </param>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectNamesForType(System.Type,System.Boolean,System.Boolean)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetObjectDefinitionNames">
+            <summary>
+            Return the names of all objects defined in this factory.
+            </summary>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectDefinitionNames"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetObjectDefinition(System.String)">
+            <summary>
+            Return the registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+            given object, allowing access to its property values and constructor
+            argument values.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <returns>
+            The registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there is no object with the given name.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of errors.
+            </exception>        
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetObjectDefinition(System.String,System.Boolean)">
+            <summary>
+            Return the registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+            given object, allowing access to its property values and constructor
+            argument values.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <param name="includeAncestors">Whether to search parent object factories.</param>
+            <returns>
+            The registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there is no object with the given name.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of errors.
+            </exception>       
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetObjectsOfType(System.Type)">
+            <summary>
+            Return the object instances that match the given object
+            <see cref="T:System.Type"/> (including subclasses), judging from either object
+            definitions or the value of
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match.
+            </param>
+            <returns>
+            A <see cref="T:System.Collections.IDictionary"/> of the matching objects,
+            containing the object names as keys and the corresponding object instances
+            as values.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the objects could not be created.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(System.Type)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetObjectsOfType(System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Return the object instances that match the given object
+            <see cref="T:System.Type"/> (including subclasses), judging from either object
+            definitions or the value of
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match.
+            </param>
+            <param name="includePrototypes">
+            Whether to include prototype objects too or just singletons (also applies to
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s).
+            </param>
+            <param name="includeFactoryObjects">
+            Whether to include <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s too
+            or just normal objects.
+            </param>
+            <returns>
+            A <see cref="T:System.Collections.IDictionary"/> of the matching objects,
+            containing the object names as keys and the corresponding object instances
+            as values.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the objects could not be created.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(System.Type,System.Boolean,System.Boolean)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.ContainsObjectDefinition(System.String)">
+            <summary>
+            Check if this object factory contains an object definition with the given name.
+            </summary>
+            <param name="name">The name of the object to look for.</param>
+            <returns>
+            True if this object factory contains an object definition with the given name.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.ContainsObjectDefinition(System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.ContainsObject(System.String)">
+            <summary>
+            Does this object factory contain an object with the given name?
+            </summary>
+            <param name="name">The name of the object to query.</param>
+            <returns>
+            <see langword="true"/> if an object with the given name is defined.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.ContainsObject(System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetAliases(System.String)">
+            <summary>
+            Return the aliases for the given object name, if defined.
+            </summary>
+            <param name="name">The object name to check for aliases.</param>
+            <returns>The aliases, or an empty array if none.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.GetAliases(System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetObject(System.String,System.Type)">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <param name="name">The name of the object to return.</param>
+            <param name="requiredType">
+            <see cref="T:System.Type"/> the object may match. Can be an interface or
+            superclass of the actual class. For example, if the value is the
+            <see cref="T:System.Object"/> class, this method will succeed whatever the
+            class of the returned instance.
+            </param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectNotOfRequiredTypeException">
+            If the object is not of the required type.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String,System.Type)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetObject(System.String)">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <param name="name">The name of the object to return.</param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetObject(System.String,System.Object[])">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <remarks>
+            <p>
+            This method allows an object factory to be used as a replacement for the
+            Singleton or Prototype design pattern.
+            </p>
+            <p>
+            Note that callers should retain references to returned objects. There is no
+            guarantee that this method will be implemented to be efficient. For example,
+            it may be synchronized, or may need to run an RDBMS query.
+            </p>
+            <p>
+            Will ask the parent factory if the object cannot be found in this factory
+            instance.
+            </p>
+            </remarks>
+            <param name="name">The name of the object to return.</param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a static factory method. If there is no factory method and the
+            arguments are not null, then match the argument values by type and
+            call the object's constructor.
+            </param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetObject(System.String,System.Type,System.Object[])">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <param name="name">The name of the object to return.</param>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> the object may match. Can be an interface or
+            superclass of the actual class. For example, if the value is the
+            <see cref="T:System.Object"/> class, this method will succeed whatever the
+            class of the returned instance.
+            </param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a <see lang="static"/> factory method. If there is no factory method and the
+            supplied <paramref name="arguments"/> array is not <see lang="null"/>, then
+            match the argument values by type and call the object's constructor.
+            </param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectNotOfRequiredTypeException">
+            If the object is not of the required type.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> is <see langword="null"/>.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String,System.Type)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.IsSingleton(System.String)">
+            <summary>
+            Is this object a singleton?
+            </summary>
+            <param name="name">The name of the object to query.</param>
+            <returns>True if the named object is a singleton.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.IsSingleton(System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.IsPrototype(System.String)">
+            <summary>
+            Determines whether the specified object name is prototype.  That is, will GetObject
+            always return independent instances?
+            </summary>
+            <param name="name">The name of the object to query</param>
+            <returns>
+            	<c>true</c> if the specified object name will always deliver independent instances; otherwise, <c>false</c>.
+            </returns>
+            <remarks>This method returning false does not clearly indicate a singleton object.
+            It indicated non-independent instances, which may correspond to a scoped object as
+            well.  use the IsSingleton property to explicitly check for a shared
+            singleton instance.
+            <para>Translates aliases back to the corresponding canonical object name.  Will ask the
+            parent factory if the object can not be found in this factory instance.
+            </para>
+            </remarks>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">if there is no object with the given name.</exception>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.IsTypeMatch(System.String,System.Type)">
+            <summary>
+            Determines whether the object with the given name matches the specified type.
+            </summary>
+            <remarks>More specifically, check whether a GetObject call for the given name
+            would return an object that is assignable to the specified target type.
+            Translates aliases back to the corresponding canonical bean name.
+            Will ask the parent factory if the bean cannot be found in this factory instance.
+            </remarks>
+            <param name="name">The name of the object to query.</param>
+            <param name="targetType">Type of the target to match against.</param>
+            <returns>
+            	<c>true</c> if the object type matches; otherwise, <c>false</c>
+            if it doesn't match or cannot be determined yet.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">Ff there is no object with the given name
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetType(System.String)">
+            <summary>
+            Determine the <see cref="T:System.Type"/>  of the object with the
+            given name.
+            </summary>
+            <param name="name">The name of the object to query.</param>
+            <returns>
+            The <see cref="T:System.Type"/> of the object, or <see langword="null"/>
+            if not determinable.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.GetType(System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.ConfigureObject(System.Object,System.String)">
+            <summary>
+            Injects dependencies into the supplied <paramref name="target"/> instance
+            using the named object definition.
+            </summary>
+            <param name="target">
+            The object instance that is to be so configured.
+            </param>
+            <param name="name">
+            The name of the object definition expressing the dependencies that are to
+            be injected into the supplied <parameref name="target"/> instance.
+            </param>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.ConfigureObject(System.Object,System.String,Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Injects dependencies into the supplied <paramref name="target"/> instance
+            using the supplied <paramref name="definition"/>.
+            </summary>
+            <param name="target">
+            The object instance that is to be so configured.
+            </param>
+            <param name="name">
+            The name of the object definition expressing the dependencies that are to
+            be injected into the supplied <parameref name="target"/> instance.
+            </param>
+            <param name="definition">
+            An object definition that should be used to configure object.
+            </param>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetMessage(System.String,System.Globalization.CultureInfo,System.Object[])">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.
+            </param>
+            <param name="arguments">
+            The array of arguments that will be filled in for parameters within
+            the message, or <see langword="null"/> if there are no parameters
+            within the message. Parameters within a message should be
+            referenced using the same syntax as the format string for the
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> method.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If no message could be resolved.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> is <see langword="null"/>.
+            </exception>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(System.String,System.Globalization.CultureInfo,System.Object[])"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetMessage(System.String,System.String,System.Globalization.CultureInfo,System.Object[])">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="defaultMessage">The default message.</param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.
+            </param>
+            <param name="arguments">
+            The array of arguments that will be filled in for parameters within
+            the message, or <see langword="null"/> if there are no parameters
+            within the message. Parameters within a message should be
+            referenced using the same syntax as the format string for the
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> method.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If no message could be resolved.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> is <see langword="null"/>.
+            </exception>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(System.String,System.Globalization.CultureInfo,System.Object[])"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetMessage(System.String)">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <returns>
+            The resolved message if the lookup was successful.
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If no message could be resolved.
+            </exception>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetMessage(System.String,System.Object[])">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="arguments">
+            The array of arguments that will be filled in for parameters within
+            the message, or <see langword="null"/> if there are no parameters
+            within the message. Parameters within a message should be
+            referenced using the same syntax as the format string for the
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> method.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful.
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If no message could be resolved.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> is <see langword="null"/>.
+            </exception>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(System.String,System.Object[])"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetMessage(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If no message could be resolved.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> is <see langword="null"/>.
+            </exception>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(System.String,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetMessage(Spring.Context.IMessageSourceResolvable,System.Globalization.CultureInfo)">
+            <summary>
+            Resolve the message using all of the attributes contained within
+            the supplied <see cref="T:Spring.Context.IMessageSourceResolvable"/>
+            argument.
+            </summary>
+            <param name="resolvable">
+            The value object storing those attributes that are required to
+            properly resolve a message.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be resolved.
+            </exception>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(Spring.Context.IMessageSourceResolvable,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.Spring#Context#IMessageSource#GetResourceObject(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Gets a localized resource object identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">
+            The name of the resource object to resolve.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.
+            </param>
+            <returns>
+            The resolved object, or <see langword="null"/> if not found.
+            </returns>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(System.String,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.Spring#Context#IMessageSource#GetResourceObject(System.String)">
+            <summary>
+            Gets a localized resource object identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">
+            The name of the resource object to resolve.
+            </param>
+            <returns>
+            The resolved object, or <see langword="null"/> if not found.
+            </returns>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetResourceObject(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Gets a localized resource object identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">
+            The name of the resource object to resolve.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.
+            </param>
+            <returns>
+            The resolved object, or <see langword="null"/> if not found.
+            </returns>
+            <seealso cref="M:Spring.Context.IMessageSource.GetResourceObject(System.String,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.GetResourceObject(System.String)">
+            <summary>
+            Gets a localized resource object identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">
+            The name of the resource object to resolve.
+            </param>
+            <returns>
+            The resolved object, or <see langword="null"/> if not found.
+            </returns>
+            <seealso cref="M:Spring.Context.IMessageSource.GetResourceObject(System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.ApplyResources(System.Object,System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Applies resources to object properties.
+            </summary>
+            <param name="value">
+            An object that contains the property values to be applied.
+            </param>
+            <param name="objectName">
+            The base name of the object to use for key lookup.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.
+            </param>
+            <seealso cref="M:Spring.Context.IMessageSource.ApplyResources(System.Object,System.String,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.PublishEvents(System.Object)">
+            <summary>
+            Publishes <b>all</b> events of the source object.
+            </summary>
+            <param name="sourceObject">
+            The source object containing events to publish.
+            </param>
+            <seealso cref="M:Spring.Objects.Events.IEventRegistry.PublishEvents(System.Object)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.Subscribe(System.Object)">
+            <summary>
+            Subscribes to <b>all</b> events published, if the subscriber
+            implements compatible handler methods.
+            </summary>
+            <param name="subscriber">The subscriber to use.</param>
+            <seealso cref="M:Spring.Objects.Events.IEventRegistry.Subscribe(System.Object)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.Subscribe(System.Object,System.Type)">
+            <summary>
+            Subscribes to published events of a all objects of a given
+            <see cref="T:System.Type"/>, if the subscriber implements
+            compatible handler methods.
+            </summary>
+            <param name="subscriber">The subscriber to use.</param>
+            <param name="targetSourceType">
+            The target <see cref="T:System.Type"/> to subscribe to.
+            </param>
+            <seealso cref="M:Spring.Objects.Events.IEventRegistry.Subscribe(System.Object,System.Type)"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractApplicationContext.PublishEvent(System.Object,Spring.Context.ApplicationEventArgs)">
+            <summary>
+            Publishes an application context event.
+            </summary>
+            <remarks>
+            <p>
+            
+            </p>
+            </remarks>
+            <param name="sender">
+            The source of the event. May be <see langword="null"/>.
+            </param>
+            <param name="e">
+            The event that is to be raised.
+            </param>
+            <seealso cref="M:Spring.Context.IApplicationEventPublisher.PublishEvent(System.Object,Spring.Context.ApplicationEventArgs)"/>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractApplicationContext.SyncRoot">
+            <summary>
+            An object that can be used to synchronize access to the <see cref="T:Spring.Context.Support.AbstractXmlApplicationContext"/>
+            </summary>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractApplicationContext.StartupDateMilliseconds">
+            <summary>
+            The timestamp when this context was first loaded.
+            </summary>
+            <returns>
+            The timestamp (milliseconds) when this context was first loaded.
+            </returns>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractApplicationContext.CaseSensitive">
+            <summary>
+            Gets a flag indicating whether context should be case sensitive.
+            </summary>
+            <value><c>true</c> if object lookups are case sensitive; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractApplicationContext.MessageSource">
+            <summary>
+            The <see cref="T:Spring.Context.IMessageSource"/> for this context.
+            </summary>
+            <exception cref="T:System.InvalidOperationException">
+            If the context has not been initialized yet.
+            </exception>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractApplicationContext.EventRegistry">
+            <summary>
+            The <see cref="T:Spring.Objects.Events.IEventRegistry"/> for this context.
+            </summary>
+            <exception cref="T:System.InvalidOperationException">
+            If the context has not been initialized yet.
+            </exception>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractApplicationContext.ObjectFactoryPostProcessors">
+            <summary>
+            Returns the list of the
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>s
+            that will be applied to the objects created with this factory.
+            </summary>
+            <remarks>
+            <p>
+            The elements of this list are instances of implementations of the
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            interface.
+            </p>
+            </remarks>
+            <value>
+            The list of the
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>s
+            that will be applied to the objects created with this factory.
+            </value>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractApplicationContext.ObjectFactory">
+            <summary>
+            Return the internal object factory of this application context.
+            </summary>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractApplicationContext.ParentContext">
+            <summary>
+            Gets the parent context, or <see langword="null"/> if there is no
+            parent context.
+            </summary>
+            <returns>
+            The parent context, or <see langword="null"/>  if there is no
+            parent.
+            </returns>
+            <seealso cref="P:Spring.Context.IApplicationContext.ParentContext"/>
+        </member>
+        <member name="E:Spring.Context.Support.AbstractApplicationContext.ContextEvent">
+            <summary>
+            Raised in response to an implementation-dependant application
+            context event.
+            </summary>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractApplicationContext.StartupDate">
+            <summary>
+            The date and time this context was first loaded.
+            </summary>
+            <returns>
+            The <see cref="T:System.DateTime"/> representing when this context
+            was first loaded.
+            </returns>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractApplicationContext.Name">
+            <summary>
+            A name for this context.
+            </summary>
+            <returns>
+            A name for this context.
+            </returns>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractApplicationContext.ObjectDefinitionCount">
+            <summary>
+            Return the number of objects defined in the factory.
+            </summary>
+            <value>
+            The number of objects defined in the factory.
+            </value>
+            <seealso cref="P:Spring.Objects.Factory.IListableObjectFactory.ObjectDefinitionCount"/>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractApplicationContext.Item(System.String)">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <param name="name">The name of the object to return.</param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractApplicationContext.ParentObjectFactory">
+            <summary>
+            Return the parent object factory, or <see langword="null"/> if there is none.
+            </summary>
+            <value>
+            The parent object factory, or <see langword="null"/> if there is none.
+            </value>
+            <seealso cref="P:Spring.Objects.Factory.IHierarchicalObjectFactory.ParentObjectFactory"/>
+        </member>
+        <member name="F:Spring.Context.Support.AbstractXmlApplicationContext.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractXmlApplicationContext.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.AbstractXmlApplicationContext"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes
+            no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractXmlApplicationContext.#ctor(System.String,System.Boolean,Spring.Context.IApplicationContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.AbstractXmlApplicationContext"/> class
+            with the given parent context.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes
+            no public constructors.
+            </p>
+            </remarks>
+            <param name="name">The application context name.</param>
+            <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+            <param name="parentContext">The parent context.</param>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractXmlApplicationContext.RefreshObjectFactory">
+            <summary>
+            Instantiates and populates the underlying
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> with the object
+            definitions yielded up by the <see cref="P:Spring.Context.Support.AbstractXmlApplicationContext.ConfigurationLocations"/>
+            method.
+            </summary>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of errors encountered while refreshing the object factory.
+            </exception>
+            <exception cref="T:Spring.Context.ApplicationContextException">
+            In the case of errors encountered reading any of the resources
+            yielded by the <see cref="P:Spring.Context.Support.AbstractXmlApplicationContext.ConfigurationLocations"/> method.
+            </exception>
+            <seealso cref="M:Spring.Context.Support.AbstractApplicationContext.RefreshObjectFactory"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractXmlApplicationContext.InitObjectDefinitionReader(Spring.Objects.Factory.Xml.XmlObjectDefinitionReader)">
+            <summary>
+            Initialize the object definition reader used for loading the object
+            definitions of this context.
+            </summary>
+            <remarks>
+            <p>
+            The default implementation of this method is a no-op; i.e. it does
+            nothing. Can be overridden in subclasses to provide custom
+            initialization of the supplied
+            <paramref name="objectDefinitionReader"/>; for example, a derived
+            class may want to turn off XML validation.
+            </p>
+            </remarks>
+            <param name="objectDefinitionReader">
+            The object definition reader used by this context.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractXmlApplicationContext.LoadObjectDefinitions(Spring.Objects.Factory.Xml.XmlObjectDefinitionReader)">
+            <summary>
+            Load the object definitions with the given 
+            <see cref="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/>.
+            </summary>
+            <remarks>
+            <p>
+            The lifecycle of the object factory is handled by
+            <see cref="M:Spring.Context.Support.AbstractXmlApplicationContext.RefreshObjectFactory"/>;
+            therefore this method is just supposed to load and / or register
+            object definitions.
+            </p>
+            </remarks>
+            <param name="objectDefinitionReader">
+            The reader containing object definitions.</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of object registration errors.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of errors encountered reading any of the resources
+            yielded by the <see cref="P:Spring.Context.Support.AbstractXmlApplicationContext.ConfigurationLocations"/> method.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractXmlApplicationContext.LoadObjectDefinitions(Spring.Objects.Factory.Support.DefaultListableObjectFactory)">
+            <summary>
+            Loads the object definitions into the given object factory, typically through
+            delegating to one or more object definition readers.
+            </summary>
+            <param name="objectFactory">The object factory to lead object definitions into</param>
+            <see cref="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/>
+            <see cref="T:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader"/>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractXmlApplicationContext.CustomizeObjectFactory(Spring.Objects.Factory.Support.DefaultListableObjectFactory)">
+            <summary>
+            Customizes the internal object factory used by this context.
+            </summary>
+            <remarks>Called for each <see cref="M:Spring.Context.Support.AbstractApplicationContext.Refresh"/> attempt.
+            <p>
+            The default implementation is empty.  Can be overriden in subclassses to customize
+            DefaultListableBeanFatory's standard settings.
+            </p></remarks>
+            <param name="objectFactory">The newly created object factory for this context</param>
+        </member>
+        <member name="M:Spring.Context.Support.AbstractXmlApplicationContext.CreateObjectFactory">
+            <summary>
+            Create an internal object factory for this context.
+            </summary>
+            <remarks>
+            <p>
+            Called for each <see cref="M:Spring.Context.Support.AbstractApplicationContext.Refresh"/> attempt.
+            This default implementation creates a
+            <see cref="T:Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>
+            with the internal object factory of this context's parent serving
+            as the parent object factory.  Can be overridden in subclasse,s 
+            for example to customize DefaultListableBeanFactory's settings.
+            </p>
+            </remarks>
+            <returns>The object factory for this context.</returns>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractXmlApplicationContext.ConfigurationLocations">
+            <summary>
+            An array of resource locations, referring to the XML object
+            definition files that this context is to be built with.
+            </summary>
+            <remarks>
+            <p>
+            Examples of the format of the various strings that would be
+            returned by accessing this property can be found in the overview
+            documentation of with the <see cref="T:Spring.Context.Support.XmlApplicationContext"/>
+            class.
+            </p>
+            </remarks>
+            <returns>
+            An array of resource locations, or <see langword="null"/> if none.
+            </returns>
+        </member>
+        <member name="P:Spring.Context.Support.AbstractXmlApplicationContext.ObjectFactory">
+            <summary>
+            Subclasses must return their internal object factory here.
+            </summary>
+            <returns>
+            The internal object factory for the application context.
+            </returns>
+            <seealso cref="P:Spring.Context.Support.AbstractApplicationContext.ObjectFactory"/>
+        </member>
+        <member name="T:Spring.Context.Events.ConsoleListener">
+            <summary>
+            Simple listener that logs application events to the console.
+            </summary>
+            <remarks>
+            <p>
+            Intended for use during debugging only.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: ConsoleListener.cs,v 1.6 2006/04/09 07:18:38 markpollack Exp $</version>
+            <seealso cref="T:Spring.Context.IApplicationEventListener"/>
+        </member>
+        <member name="T:Spring.Context.IApplicationEventListener">
+            <summary>
+            A listener for application events.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: IApplicationEventListener.cs,v 1.2 2006/04/09 07:18:38 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Context.IApplicationEventListener.HandleApplicationEvent(System.Object,Spring.Context.ApplicationEventArgs)">
+            <summary>
+            Handle an application event.
+            </summary>
+            <param name="sender">
+            The source of the event.
+            </param>
+            <param name="e">
+            The event that is to be handled.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Events.ConsoleListener.#ctor">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Context.Events.ConsoleListener"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Events.ConsoleListener.HandleApplicationEvent(System.Object,Spring.Context.ApplicationEventArgs)">
+            <summary>
+            Handle an application event.
+            </summary>
+            <param name="sender">
+            The source of the event.
+            </param>
+            <param name="e">
+            The event that is to be handled.
+            </param>
+        </member>
+        <member name="T:Spring.Context.EventListenerAttribute">
+            <summary>
+            Marks an interface as being an application event listener.
+            </summary>
+            <author>Griffin Caprio</author>
+            <version>$Id: EventListenerAttribute.cs,v 1.5 2006/04/09 07:18:38 markpollack Exp $</version>
+            <see cref="T:Spring.Context.IApplicationEventListener"/>
+        </member>
+        <member name="M:Spring.Context.EventListenerAttribute.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.EventListenerAttribute"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.Collections.NoElementsException">
+            <summary>
+            Thrown when an element is requested from an empty <see cref="T:Spring.Collections.IQueue"/>.
+            </summary>
+            <author>Griffin Caprio</author>
+            <version>$Id: NoElementsException.cs,v 1.4 2006/04/09 07:18:37 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Collections.NoElementsException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Collections.NoElementsException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.NoElementsException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Collections.NoElementsException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Collections.NoElementsException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Collections.NoElementsException"/> class with the
+            specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Collections.NoElementsException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Collections.NoElementsException"/> class with the
+            specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="T:Spring.Caching.AbstractCache">
+            <summary>
+            An abstract <see cref="T:Spring.Caching.ICache"/> implementation that can
+            be used as base class for concrete implementations.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Erich Eichinger</author>
+            <version>$Id: AbstractCache.cs,v 1.7 2007/10/11 01:29:49 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Caching.ICache">
+            <summary>
+            Defines a contract that all cache implementations have to fulfill.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Erich Eichinger</author>
+            <version>$Id: ICache.cs,v 1.5 2007/08/27 09:38:11 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Caching.ICache.Get(System.Object)">
+            <summary>
+            Retrieves an item from the cache.
+            </summary>
+            <param name="key">
+            Item key.
+            </param>
+            <returns>
+            Item for the specified <paramref name="key"/>, or <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Caching.ICache.Remove(System.Object)">
+            <summary>
+            Removes an item from the cache.
+            </summary>
+            <param name="key">
+            Item key.
+            </param>
+        </member>
+        <member name="M:Spring.Caching.ICache.RemoveAll(System.Collections.ICollection)">
+            <summary>
+            Removes collection of items from the cache.
+            </summary>
+            <param name="keys">
+            Collection of keys to remove.
+            </param>
+        </member>
+        <member name="M:Spring.Caching.ICache.Clear">
+            <summary>
+            Removes all items from the cache.
+            </summary>
+        </member>
+        <member name="M:Spring.Caching.ICache.Insert(System.Object,System.Object)">
+            <summary>
+            Inserts an item into the cache.
+            </summary>
+            <remarks>
+            Items inserted using this method have no expiration time
+            and default cache priority.
+            </remarks>
+            <param name="key">
+            Item key.
+            </param>
+            <param name="value">
+            Item value.
+            </param>
+        </member>
+        <member name="M:Spring.Caching.ICache.Insert(System.Object,System.Object,System.TimeSpan)">
+            <summary>
+            Inserts an item into the cache.
+            </summary>
+            <remarks>
+            Items inserted using this method have default cache priority.
+            </remarks>
+            <param name="key">
+            Item key.
+            </param>
+            <param name="value">
+            Item value.
+            </param>
+            <param name="timeToLive">
+            Item's time-to-live.
+            </param>
+        </member>
+        <member name="P:Spring.Caching.ICache.Count">
+            <summary>
+            Gets the number of items in the cache.
+            </summary>
+        </member>
+        <member name="P:Spring.Caching.ICache.Keys">
+            <summary>
+            Gets a collection of all cache item keys.
+            </summary>
+        </member>
+        <member name="M:Spring.Caching.AbstractCache.Get(System.Object)">
+            <summary>
+            Retrieves an item from the cache.
+            </summary>
+            <param name="key">
+            Item key.
+            </param>
+            <returns>
+            Item for the specified <paramref name="key"/>, or <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Caching.AbstractCache.Remove(System.Object)">
+            <summary>
+            Removes an item from the cache.
+            </summary>
+            <param name="key">
+            Item key.
+            </param>
+        </member>
+        <member name="M:Spring.Caching.AbstractCache.RemoveAll(System.Collections.ICollection)">
+            <summary>
+            Removes collection of items from the cache.
+            </summary>
+            <param name="keys">
+            Collection of keys to remove.
+            </param>
+        </member>
+        <member name="M:Spring.Caching.AbstractCache.Clear">
+            <summary>
+            Removes all items from the cache.
+            </summary>
+        </member>
+        <member name="M:Spring.Caching.AbstractCache.Insert(System.Object,System.Object)">
+            <summary>
+            Inserts an item into the cache.
+            </summary>
+            <remarks>
+            Items inserted using this method use the default
+            </remarks>
+            <param name="key">
+            Item key.
+            </param>
+            <param name="value">
+            Item value.
+            </param>
+        </member>
+        <member name="M:Spring.Caching.AbstractCache.Insert(System.Object,System.Object,System.TimeSpan)">
+            <summary>
+            Inserts an item into the cache.
+            </summary>
+            <remarks>
+            If <paramref name="timeToLive"/> equals <see cref="F:System.TimeSpan.MinValue"/>, 
+            or <see cref="P:Spring.Caching.AbstractCache.EnforceTimeToLive"/> is <value>true</value>, this cache 
+            instance's <see cref="P:Spring.Caching.AbstractCache.TimeToLive"/> value will be applied.
+            </remarks>
+            <param name="key">
+            Item key.
+            </param>
+            <param name="value">
+            Item value.
+            </param>
+            <param name="timeToLive">
+            Item's time-to-live (TTL).
+            </param>
+        </member>
+        <member name="M:Spring.Caching.AbstractCache.DoInsert(System.Object,System.Object,System.TimeSpan)">
+            <summary>
+            Actually does the cache implementation specific insert operation into the cache.
+            </summary>
+            <remarks>
+            Items inserted using this method have default cache priority.
+            </remarks>
+            <param name="key">
+            Item key.
+            </param>
+            <param name="value">
+            Item value.
+            </param>
+            <param name="timeToLive">
+            Item's time-to-live (TTL).
+            </param>
+        </member>
+        <member name="P:Spring.Caching.AbstractCache.TimeToLive">
+            <summary>
+            Gets/Set the Default time-to-live (TTL) for items inserted into this cache. 
+            Used by <see cref="M:Spring.Caching.AbstractCache.Insert(System.Object,System.Object)"/>
+            </summary>
+        </member>
+        <member name="P:Spring.Caching.AbstractCache.EnforceTimeToLive">
+            <summary>
+            Gets/Sets a value, whether the this cache instance's <see cref="P:Spring.Caching.AbstractCache.TimeToLive"/> 
+            shall be applied to all items, regardless of their individual TTL 
+            when <see cref="M:Spring.Caching.AbstractCache.Insert(System.Object,System.Object,System.TimeSpan)"/> is called.
+            </summary>
+        </member>
+        <member name="P:Spring.Caching.AbstractCache.Count">
+            <summary>
+            Gets the number of items in the cache.
+            </summary>
+            <remarks>
+            May be overridden by subclasses for cache-specific efficient implementation.
+            </remarks>
+        </member>
+        <member name="P:Spring.Caching.AbstractCache.Keys">
+            <summary>
+            Gets a collection of all cache item keys.
+            </summary>
+        </member>
+        <member name="T:Spring.Validation.Validators.ISBNValidator">
+            <summary>
+            Validates that the object is valid ISBN-10 or ISBN-13 value.
+            </summary>
+            <author>Goran Milosavljevic</author>
+        </member>
+        <member name="M:Spring.Validation.Validators.ISBNValidator.#ctor">
+            <summary>
+            Creates a new instance of the <b>ISBNValidator</b> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.Validators.ISBNValidator.#ctor(System.String,System.String)">
+            <summary>
+            Creates a new instance of the <b>ISBNValidator</b> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.Validators.ISBNValidator.#ctor(Spring.Expressions.IExpression,Spring.Expressions.IExpression)">
+            <summary>
+            Creates a new instance of the <b>ISBNValidator</b> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.Validators.ISBNValidator.Validate(System.Object)">
+            <summary>
+            Validates the supplied <paramref name="objectToValidate"/>.
+            </summary>
+            <remarks>
+            In the case of the <see cref="T:Spring.Validation.Validators.ISBNValidator"/> class,
+            the test should be a string variable that will be evaluated and the object
+            obtained as a result of this evaluation will be tested using the ISBN-10 or
+            ISBN-13 validation rules.
+            </remarks>
+            <param name="objectToValidate">The object to validate.</param>
+            <returns>
+            <see lang="true"/> if the supplied <paramref name="objectToValidate"/> is valid ISBN.
+            </returns>
+        </member>
+        <member name="M:Spring.Validation.Validators.ISBNValidator.IsValid(System.String)">
+            <summary>
+            Validates <paramref name="isbn"/> against ISBN-10 or ISBN-13 validation 
+            rules.
+            </summary>
+            <param name="isbn">
+            ISBN string to validate.
+            </param>
+            <returns>
+            <b>true</b> if <paramref name="isbn"/> is a valid ISBN-10 or ISBN-13 code.
+            </returns>
+        </member>
+        <member name="F:Spring.Validation.Validators.ISBNValidator.ISBN10_PATTERN">
+            <summary>
+            ISBN-10 consists of 4 groups of numbers separated by either 
+            dashes (-) or spaces.  
+            </summary>
+            <remarks>
+            The first group is 1-5 characters, second 1-7, third 1-6, 
+            and fourth is 1 digit or an X.
+            </remarks>
+        </member>
+        <member name="F:Spring.Validation.Validators.ISBNValidator.ISBN13_PATTERN">
+            <summary>
+            ISBN-13 consists of 5 groups of numbers separated by either 
+            dashes (-) or spaces.  
+            </summary>
+            <remarks>
+            The first group is 978 or 979, the second group is 
+            1-5 characters, third 1-7, fourth 1-6, and fifth is 1 digit.
+            </remarks>
+        </member>
+        <member name="T:Spring.Validation.ErrorMessage">
+            <summary>
+            Represents a single validation error message.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Goran Milosavljevic</author>
+            <version>$Id: ErrorMessage.cs,v 1.5 2007/02/19 17:56:42 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Validation.ErrorMessage.#ctor">
+            <summary>
+            Default constructor.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.ErrorMessage.#ctor(System.String,System.Object[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.ErrorMessage"/> class.
+            </summary>
+            <param name="id">Error message resource identifier.</param>
+            <param name="parameters">Parameters that should be used for message resolution.</param>
+        </member>
+        <member name="M:Spring.Validation.ErrorMessage.GetSchema">
+             <summary>
+             This property is reserved, apply the 
+             <see cref="T:System.Xml.Serialization.XmlSchemaProviderAttribute" />
+             to the class instead. 
+             </summary>
+             <returns>
+             An <see cref="T:System.Xml.Schema.XmlSchema" /> 
+             that describes the XML representation of the object that 
+             is produced by the 
+             <see cref="M:System.Xml.Serialization.IXmlSerializable.WriteXml(System.Xml.XmlWriter)" />
+             method and consumed by the 
+             <see cref="M:System.Xml.Serialization.IXmlSerializable.ReadXml(System.Xml.XmlReader)" />
+             method.
+             </returns>
+            
+        </member>
+        <member name="M:Spring.Validation.ErrorMessage.ReadXml(System.Xml.XmlReader)">
+            <summary>
+            Generates an object from its XML representation.
+            </summary>
+            <param name="reader">
+            The <see cref="T:System.Xml.XmlReader"></see> stream 
+            from which the object is deserialized. 
+            </param>
+        </member>
+        <member name="M:Spring.Validation.ErrorMessage.WriteXml(System.Xml.XmlWriter)">
+            <summary>
+            Converts an object into its XML representation.
+            </summary>
+            <param name="writer">
+            The <see cref="T:System.Xml.XmlWriter"></see> stream 
+            to which the object is serialized. 
+            </param>
+        </member>
+        <member name="M:Spring.Validation.ErrorMessage.GetMessage(Spring.Context.IMessageSource)">
+            <summary>
+            Resolves the message against specified <see cref="T:Spring.Context.IMessageSource"/>.
+            </summary>
+            <param name="messageSource">Message source to resolve this error message against.</param>
+            <returns>Resolved error message.</returns>
+        </member>
+        <member name="P:Spring.Validation.ErrorMessage.Id">
+            <summary>
+            Gets or sets the resource identifier for this message.
+            </summary>
+            <value>The resource identifier for this message.</value>
+        </member>
+        <member name="P:Spring.Validation.ErrorMessage.Parameters">
+            <summary>
+            Gets or sets the message parameters.
+            </summary>
+            <value>The message parameters.</value>   
+        </member>
+        <member name="T:Spring.Util.SystemUtils">
+            <summary>
+            Utility class containing miscellaneous system-level functionality.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SystemUtils.cs,v 1.5 2007/09/07 02:46:49 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Util.SystemUtils.RegisterLoadedAssemblyResolver">
+            <summary>
+            Registers assembly resolver that iterates over the
+            assemblies loaded into the current <see cref="T:System.AppDomain"/>
+            in order to find an assembly that cannot be resolved.
+            </summary>
+            <remarks>
+            This method has to be called if you need to serialize dynamically
+            generated types in transient assemblies, such as Spring AOP proxies,
+            because standard .NET serialization engine always tries to load
+            assembly from the disk.
+            </remarks>
+        </member>
+        <member name="P:Spring.Util.SystemUtils.MonoRuntime">
+            <summary>
+            Returns true if running on Mono
+            </summary>
+            <remarks>Tests for the presence of the type Mono.Runtime</remarks>
+        </member>
+        <member name="P:Spring.Util.SystemUtils.ThreadId">
+            <summary>
+            Gets the thread id for the current thread. Use thread name is available,
+            otherwise use CurrentThread.GetHashCode() for .NET 1.0/1.1 and 
+            CurrentThread.ManagedThreadId otherwise.
+            </summary>
+            <value>The thread id.</value>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.IDynamicMethod">
+            <summary>
+            Defines methods that dynamic method class has to implement.
+            </summary>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.IDynamicMethod.Invoke(System.Object,System.Object[])">
+            <summary>
+            Invokes dynamic method on the specified target object.
+            </summary>
+            <param name="target">
+            Target object to invoke method on.
+            </param>
+            <param name="arguments">
+            Method arguments.
+            </param>
+            <returns>
+            A method return value.
+            </returns>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.SafeMethod">
+            <summary>
+            Safe wrapper for the dynamic method.
+            </summary>
+            <remarks>
+            <see cref="T:Spring.Reflection.Dynamic.SafeMethod"/> will attempt to use dynamic
+            method if possible, but it will fall back to standard
+            reflection if necessary.
+            </remarks>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeMethod.#ctor(System.Reflection.MethodInfo)">
+            <summary>
+            Creates a new instance of the safe method wrapper.
+            </summary>
+            <param name="method">Method to wrap.</param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeMethod.Invoke(System.Object,System.Object[])">
+            <summary>
+            Invokes dynamic method.
+            </summary>
+            <param name="target">
+            Target object to invoke method on.
+            </param>
+            <param name="arguments">
+            Method arguments.
+            </param>
+            <returns>
+            A method return value.
+            </returns>
+        </member>
+        <member name="P:Spring.Reflection.Dynamic.SafeMethod.DeclaringType">
+            <summary>
+            Gets the class, that declares this method
+            </summary>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.DynamicMethod">
+            <summary>
+            Factory class for dynamic methods.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DynamicMethod.cs,v 1.2 2008/03/06 20:20:37 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicMethod.Create(System.Reflection.MethodInfo)">
+            <summary>
+            Creates dynamic method instance for the specified <see cref="T:System.Reflection.MethodInfo"/>.
+            </summary>
+            <param name="method">Method info to create dynamic method for.</param>
+            <returns>Dynamic method for the specified <see cref="T:System.Reflection.MethodInfo"/>.</returns>
+        </member>
+        <member name="T:Spring.Proxy.InheritanceProxyTypeBuilder">
+            <summary>
+            Builds a proxy type using inheritance.
+            </summary>
+            <remarks>
+            <note>
+            In order for this builder to work, target methods have to be either
+            <see langword="virtual"/>, or belong to an interface.
+            </note>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <author>Bruno Baia</author>
+            <version>$Id: InheritanceProxyTypeBuilder.cs,v 1.14 2007/12/04 18:38:02 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Proxy.InheritanceProxyTypeBuilder.#ctor">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Proxy.InheritanceProxyTypeBuilder"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Proxy.InheritanceProxyTypeBuilder.BuildProxyType">
+            <summary>
+            Creates a proxy that inherits the proxied object's class.
+            </summary>
+            <remarks>
+            <p>
+            Only <see langword="virtual"/> (non-final) methods can be proxied,
+            unless they are members of one of the interfaces that target class
+            implements. In that case, methods will be proxied using explicit
+            interface implementation, which means that client code will have
+            to cast the proxy to a specific interface in order to invoke the
+            methods.
+            </p>
+            </remarks>
+            <returns>The generated proxy class.</returns>
+        </member>
+        <member name="M:Spring.Proxy.InheritanceProxyTypeBuilder.PushTarget(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the target instance on which calls should be delegated to.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Proxy.InheritanceProxyTypeBuilder.GenerateConstructor(System.Reflection.Emit.ConstructorBuilder,System.Reflection.Emit.ILGenerator,System.Reflection.ConstructorInfo)">
+            <summary>
+            Generates the proxy constructor.
+            </summary>
+            <remarks>
+            <p>
+            This implementation delegates the call to a base class constructor.
+            </p>
+            </remarks>
+            <param name="builder">The constructor builder to use.</param>
+            <param name="il">The IL generator to use.</param>
+            <param name="constructor">
+            The base class constructor to delegate the call to.
+            </param>
+        </member>
+        <member name="P:Spring.Proxy.InheritanceProxyTypeBuilder.DeclaredMembersOnly">
+            <summary>
+            Gets or sets a value indicating whether inherited members should be proxied.
+            </summary>
+            <value>
+            <see langword="true"/> if they should be; otherwise, <see langword="false"/>.
+            </value>
+        </member>
+        <member name="T:Spring.Pool.Support.SimplePool">
+            <summary>
+            A simple pool implementation
+            </summary>
+            <remarks>
+            <p>
+            Based on the implementation found in Concurrent Programming in Java,
+            2nd ed., by <a href="http://gee.cs.oswego.edu/dl/">Doug Lea</a>.
+            </p>
+            </remarks>
+            <author>Doug Lea</author>
+            <author>Federico Spinazzi</author>
+            <author>Mark Pollack</author>
+            <version>$Id: SimplePool.cs,v 1.4 2006/09/15 19:06:07 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Pool.Support.SimplePool.available">
+            <summary>
+            Set of permits
+            </summary>
+        </member>
+        <member name="M:Spring.Pool.Support.SimplePool.#ctor(Spring.Pool.IPoolableObjectFactory,System.Int32)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Pool.Support.SimplePool"/>
+            class.
+            </summary>
+            <param name="factory">
+            The factory used to instantiate and manage the lifecycle of pooled objects.
+            </param>
+            <param name="size">The initial size of the pool.</param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="factory"/> is <see langword="null"/>.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If the supplied <paramref name="size"/> is less than or equal to zero.
+            </exception>
+        </member>
+        <member name="M:Spring.Pool.Support.SimplePool.BorrowObject">
+            <summary>
+            Obtain an instance from the pool.
+            </summary>
+            <exception cref="T:Spring.Pool.PoolException">
+            In case the pool is unusable.
+            </exception>
+            <seealso cref="M:Spring.Pool.IPoolableObjectFactory.ActivateObject(System.Object)"/>
+            <seealso cref="M:Spring.Pool.IObjectPool.BorrowObject"/>
+        </member>
+        <member name="M:Spring.Pool.Support.SimplePool.ReturnObject(System.Object)">
+            <summary>
+            Return an instance to the pool.
+            </summary>
+            <param name="target">The instance to be returned to the pool.</param>
+            <seealso cref="M:Spring.Pool.IPoolableObjectFactory.PassivateObject(System.Object)"/>
+            <seealso cref="M:Spring.Pool.IObjectPool.ReturnObject(System.Object)"/>
+        </member>
+        <member name="M:Spring.Pool.Support.SimplePool.AddObject">
+            <summary>
+            Create an object using the factory set by
+            the <see cref="P:Spring.Pool.Support.SimplePool.PoolableObjectFactory"/> property
+            or other implementation dependent mechanism
+            and place it into the pool.
+            </summary>
+            <remarks>
+            <p>
+            This implementation <b>always</b> throws a
+            <see cref="T:System.NotSupportedException"/>.
+            </p>
+            </remarks>
+            <exception cref="T:System.NotSupportedException">
+            If the implementation does not support the operation.
+            </exception>
+        </member>
+        <member name="M:Spring.Pool.Support.SimplePool.DoBorrow">
+            <summary>
+            Synchronized borrow logic.
+            </summary>
+            <seealso cref="M:Spring.Pool.Support.SimplePool.BorrowObject"/>
+        </member>
+        <member name="M:Spring.Pool.Support.SimplePool.DoReturn(System.Object)">
+            <summary>
+            Synchronized release logic.
+            </summary>
+            <param name="target">
+            The object to release to the pool.
+            </param>
+            <returns>
+            <see langword="false"/> if the object was not a busy one.
+            </returns>
+        </member>
+        <member name="M:Spring.Pool.Support.SimplePool.InitItems(System.Int32)">
+            <summary>
+            Instantiates the supplied number of instances and adds
+            them to the pool.
+            </summary>
+            <param name="initialInstances">
+            The initial number of objects to build.
+            </param>
+            <exception cref="T:System.ArgumentException">
+            If the supplied number of <paramref name="initialInstances"/> is
+            less than or equal to zero.
+            </exception>
+        </member>
+        <member name="M:Spring.Pool.Support.SimplePool.Close">
+            <summary>
+            Close the pool and free any resources associated with it.
+            </summary>
+        </member>
+        <member name="M:Spring.Pool.Support.SimplePool.Clear">
+            <summary>
+            Clear objects sitting idle in the pool, releasing any
+            associated resources.
+            </summary>
+            <remarks>
+            <p>
+            This implementation <b>always</b> throws a
+            <see cref="T:System.NotSupportedException"/>.
+            </p>
+            </remarks>
+            <exception cref="T:System.NotSupportedException">
+            If the implementation does not support the operation.
+            </exception>
+        </member>
+        <member name="M:Spring.Pool.Support.SimplePool.MakeNotUsable">
+            <summary>
+            Change the state of the pool to unusable.
+            </summary>
+        </member>
+        <member name="P:Spring.Pool.Support.SimplePool.NumActive">
+            <summary>
+            Gets the number of instances currently borrowed from the pool.
+            </summary>
+            <exception cref="T:System.NotSupportedException">
+            If the implementation does not support the operation.
+            </exception>
+            <seealso cref="P:Spring.Pool.IObjectPool.NumActive"/>
+        </member>
+        <member name="P:Spring.Pool.Support.SimplePool.NumIdle">
+            <summary>
+            Gets the number of instances currently idle in the pool.
+            </summary>
+            <exception cref="T:System.NotSupportedException">
+            If the implementation does not support the operation.
+            </exception>
+            <seealso cref="P:Spring.Pool.IObjectPool.NumIdle"/>
+        </member>
+        <member name="P:Spring.Pool.Support.SimplePool.PoolableObjectFactory">
+            <summary>
+            Set the factory used to create new instances.
+            </summary>
+            <remarks>
+            <p>
+            This implementation <b>always</b> throws a
+            <see cref="T:System.NotSupportedException"/>.
+            </p>
+            </remarks>
+            <exception cref="T:System.NotSupportedException">
+            If the implementation does not support the operation.
+            </exception>
+        </member>
+        <member name="T:Spring.Pool.PoolException">
+            <summary>
+            Base class for all pooling exceptions.
+            </summary>
+            <author>Federico Spinazzi</author>
+            <version>$Id: PoolException.cs,v 1.4 2005/08/07 04:59:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Pool.PoolException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Pool.PoolException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Pool.PoolException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Pool.PoolException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Pool.PoolException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Pool.PoolException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="innerException">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Pool.PoolException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Pool.PoolException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Objects.Support.InstanceEventHandlerValue">
+            <summary>
+            Describes an event handler for an object instance.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: InstanceEventHandlerValue.cs,v 1.7 2006/04/09 07:19:00 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Support.AbstractWiringEventHandlerValue">
+            <summary>
+            Base class for all <see cref="T:Spring.Objects.IEventHandlerValue"/>
+            implemenations that actually perform event wiring.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: AbstractWiringEventHandlerValue.cs,v 1.8 2006/04/09 07:19:00 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Support.AbstractWiringEventHandlerValue.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.AbstractWiringEventHandlerValue"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Support.AbstractWiringEventHandlerValue.#ctor(System.Object,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.AbstractWiringEventHandlerValue"/> class.
+            </summary>
+            <param name="source">
+            The object (possibly unresolved) that is exposing the event.
+            </param>
+            <param name="methodName">
+            The name of the method on the handler that is going to handle the event.
+            </param>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Support.AbstractWiringEventHandlerValue.Wire(System.Object,System.Object)">
+            <summary>
+            Wires up the specified handler to the named event on the
+            supplied event source.
+            </summary>
+            <param name="source">
+            The object (an object instance, a <see cref="T:System.Type"/>, etc)
+            exposing the named event.
+            </param>
+            <param name="handler">
+            The handler for the event (an object instance, a
+            <see cref="T:System.Type"/>, etc).
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Support.AbstractWiringEventHandlerValue.GetHandler(System.Object,System.Reflection.EventInfo)">
+            <summary>
+            Gets the event handler.
+            </summary>
+            <param name="instance">
+            The instance that is registering for the event notification.
+            </param>
+            <param name="info">
+            Event metadata about the event.
+            </param>
+            <returns>
+            The event handler.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Support.AbstractWiringEventHandlerValue.ResolveHandlerMethod(System.Type,System.Type,System.Reflection.BindingFlags)">
+            <summary>
+            Resolves the method metadata that describes the method that is to be used
+            as the argument to a delegate constructor.
+            </summary>
+            <param name="handlerType">
+            The <see cref="T:System.Type"/> exposing the method.
+            </param>
+            <param name="delegateType">
+            The <see cref="T:System.Type"/> of the delegate (e.g. System.EventHandler).
+            </param>
+            <param name="flags">
+            The custom binding flags to use when searching for the method.
+            </param>
+            <returns>The method metadata.</returns>
+            <exception cref="T:Spring.Objects.FatalObjectException">
+            If the method could not be found.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Support.InstanceEventHandlerValue.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.InstanceEventHandlerValue"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Support.InstanceEventHandlerValue.#ctor(System.Object,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.InstanceEventHandlerValue"/> class.
+            </summary>
+            <param name="source">
+            The object (possibly unresolved) that is exposing the event.
+            </param>
+            <param name="methodName">
+            The name of the method on the handler that is going to handle the event.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Support.InstanceEventHandlerValue.GetHandler(System.Object,System.Reflection.EventInfo)">
+            <summary>
+            Gets the event handler.
+            </summary>
+            <param name="instance">
+            The instance that is registering for the event notification.
+            </param>
+            <param name="info">
+            Event metadata about the event.
+            </param>
+            <returns>
+            The event handler.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.PropertyPathFactoryObject">
+            <summary>
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> implementation that
+            evaluates a property path on a given target object.
+            </summary>
+            <remarks>
+            <p>
+            The target object can be specified directly or via an object name (see
+            example below).
+            </p>
+            <p>
+            Please note that the <see cref="T:Spring.Objects.Factory.Config.PropertyPathFactoryObject"/>
+            is an <see cref="T:Spring.Objects.Factory.IFactoryObject"/> implementation, and as such has
+            to comply with the contract of the <see cref="T:Spring.Objects.Factory.IFactoryObject"/>
+            interface; more specifically, this means that the end result of the property lookup path
+            evaluation cannot be <see lang="null"/> (<see cref="T:Spring.Objects.Factory.IFactoryObject"/>
+            implementations are not permitted to return <see lang="null"/>). If the resut of a
+            property lookup path evaluates to <see lang="null"/>, an exception will be thrown.
+            </p>
+            </remarks>
+            <example>
+            <code escaped="true">
+            <!-- this is the target object -->
+            <object id="foo" type="Whatever.MyClass, MyAssembly" singleton="false">
+            	<!-- a System.String typed property -->
+            	<property name="name" value="Chinua Achebe"/>
+            </object>
+            
+            <!--
+            	will result in "Chinua Achebe", which is the value of the 'name' property of the 'foo' object
+            -->
+            <object id="consumer" type="Spring.Objects.Factory.Config.PropertyPathFactoryObject, Spring.Core">
+            	<property name="targetObject" ref="foo"/>
+            	<property name="propertyPath" value="name"/>
+            </object>
+            
+            <!--
+            	will result in "Chinua Achebe", which is the value of the 'name' property of the 'foo' object
+            -->
+            <object id="foo.name" type="Spring.Objects.Factory.Config.PropertyPathFactoryObject, Spring.Core"/>
+            
+            <!--
+            	will result in "Chinua Achebe", which is the value of the 'name' property of the 'foo' object
+            -->
+            <object id="consumer" type="Spring.Objects.Factory.Config.PropertyPathFactoryObject, Spring.Core">
+            	<property name="targetObjectName" value="foo"/>
+            	<property name="propertyPath" value="name"/>
+            </object>
+            
+            <!--
+            	will result in (the int value) '13', which is the value of the length property of the 'name'
+            	property of the 'foo' object.
+            	
+            	in this case, the first 'part' of the id is taken to be the name of the target object ('foo');
+            	the remainder of the name is taken to be the property lookup path
+            -->
+            <object id="foo.name.length" type="Spring.Objects.Factory.Config.PropertyPathFactoryObject, Spring.Core"/>
+            </code>
+            </example>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: PropertyPathFactoryObject.cs,v 1.3 2007/03/16 04:01:39 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.IObjectNameAware">
+            <summary>
+            Interface to be implemented by objects that wish to be aware of their object
+            name in an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>.
+            </summary>
+            <remarks>
+            <p>
+            Note that most objects will choose to receive references to collaborating
+            objects via respective properties.
+            </p>
+            <p>
+            For a list of all object lifecycle methods, see the
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> API documentation.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+        </member>
+        <member name="P:Spring.Objects.Factory.IObjectNameAware.ObjectName">
+            <summary>
+            Set the name of the object in the object factory that created this object.
+            </summary>
+            <value>
+            The name of the object in the factory.
+            </value>
+            <remarks>
+            <p>
+            Invoked after population of normal object properties but before an init
+            callback like <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            method or a custom init-method.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyPathFactoryObject.GetObject">
+            <summary>
+            Return an instance (possibly shared or independent) of the object
+            managed by this factory.
+            </summary>
+            <returns>
+            An instance (possibly shared or independent) of the object managed by
+            this factory.
+            </returns>
+            <see cref="M:Spring.Objects.Factory.IFactoryObject.GetObject"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyPathFactoryObject.TargetObject">
+            <summary>
+            The target object that the property path lookup is to be applied to.
+            </summary>
+            <remarks>
+            <p>
+            This would most likely be an inner object, but can of course be
+            any object reference.
+            </p>
+            </remarks>
+            <value>
+            The target object that the property path lookup is to be applied to.
+            </value>
+            <seealso cref="P:Spring.Objects.Factory.Config.PropertyPathFactoryObject.TargetObjectName"/> 
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyPathFactoryObject.TargetObjectName">
+            <summary>
+            The (object) name of the target object that the property path lookup
+            is to be applied to.
+            </summary>
+            <remarks>
+            <p>
+            Please note that any leading or trailing whitespace <b>will</b> be
+            trimmed from this name prior to resolution. The implication of this is that
+            one cannot use the <see cref="T:Spring.Objects.Factory.Config.PropertyPathFactoryObject"/>
+            class in conjunction with object names that start or end with whitespace.
+            </p>
+            </remarks>
+            <value>
+            The (object) name of the target object that the property path lookup
+            is to be applied to.
+            </value>
+            <seealso cref="P:Spring.Objects.Factory.Config.PropertyPathFactoryObject.TargetObject"/> 
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyPathFactoryObject.PropertyPath">
+            <summary>
+            The property (lookup) path to be applied to the target object.
+            </summary>
+            <remarks>
+            <p>
+            Please note that any leading or trailing whitespace <b>will</b> be
+            trimmed from this path prior to resolution. Whitespace is not a valid
+            identifier for property names (in part or whole) in CLS-based languages,
+            so this is a not unreasonable action. Please also note that whitespace
+            that is embedded within the property path will be left as-is (which may
+            or may not result in an error being thrown, depending on the context of
+            the whitespace).
+            </p>
+            </remarks>
+            <example>
+            <p>
+            Examples of such property lookup paths can be seen below; note that
+            property lookup paths can be nested to an arbitrary level.
+            </p>
+            <code escaped="true">
+            name.length
+            accountManager.account['the key'].name
+            accounts[0].name
+            </code>
+            </example>
+            <value>
+            The property (lookup) path to be applied to the target object.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyPathFactoryObject.ResultType">
+            <summary>
+            The 'expected' <see cref="T:System.Type"/> of the result from evaluating the
+            property path.
+            </summary>
+            <remarks>
+            <p>
+            This is not necessary for directly specified target objects, or
+            singleton target objects, where the <see cref="T:System.Type"/> can
+            be determined via reflection. Just specify this in case of a
+            prototype target, provided that you need matching by type (for
+            example, for autowiring).
+            </p>
+            <p>
+            It is permissable to set the value of this property to
+            <see lang="null"/> (which in any case is the default value).
+            </p>
+            </remarks>
+            <value>
+            The 'expected' <see cref="T:System.Type"/> of the result from evaluating the
+            property path.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyPathFactoryObject.ObjectType">
+            <summary>
+            Return the <see cref="T:System.Type"/> of object that this
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> creates, or
+            <see langword="null"/> if not known in advance.
+            </summary>
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.ObjectType"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyPathFactoryObject.IsSingleton">
+            <summary>
+            Is the object managed by this factory a singleton or a prototype?
+            </summary>
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.IsSingleton"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyPathFactoryObject.ObjectName">
+            <summary>
+            Set the name of the object in the object factory that created this object.
+            </summary>
+            <remarks>
+            <p>
+            The object name of this
+            <see cref="T:Spring.Objects.Factory.Config.PropertyPathFactoryObject"/>
+            will be interpreted as "objectName.property" pattern, if neither the
+            <see cref="P:Spring.Objects.Factory.Config.PropertyPathFactoryObject.TargetObjectName"/>
+            <see cref="P:Spring.Objects.Factory.Config.PropertyPathFactoryObject.TargetObject"/>
+            have been supplied (set).
+            </p>
+            <p>
+            This allows for concise object definitions with just an id or name.
+            </p>
+            </remarks>
+            <value>
+            The name of the object in the factory.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyPathFactoryObject.ObjectFactory">
+            <summary>
+            Callback that supplies the owning factory to an object instance.
+            </summary>
+            <value>
+            Owning <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            (may not be <see langword="null"/>). The object can immediately
+            call methods on the factory.
+            </value>
+            <exception cref="T:Spring.Objects.Factory.IInitializingObject">
+            In case of initialization errors.
+            </exception>
+        </member>
+        <member name="T:Spring.Objects.Events.IEventRegistryAware">
+            <summary>
+            To be implemented by any object that wishes to receive a reference to
+            an <see cref="T:Spring.Objects.Events.IEventRegistry"/>.
+            </summary>
+            <remarks>
+            <p>
+            This interface only applies to objects that have been instantiated
+            within the context of an
+            <see cref="T:Spring.Context.IApplicationContext"/>. This interface does
+            not typically need to be implemented by application code, but is rather
+            used by classes internal to Spring.NET.
+            </p>
+            </remarks>
+            <author>Mark Pollack</author>
+            <author>Rick Evans</author>
+            <version>$Id: IEventRegistryAware.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Objects.Events.IEventRegistryAware.EventRegistry">
+            <summary>
+            Set the <see cref="T:Spring.Objects.Events.IEventRegistry"/>
+            associated with the
+            <see cref="T:Spring.Context.IApplicationContext"/> that created this
+            object.
+            </summary>
+            <remarks>
+            <p>
+            This property will be set by the relevant
+            <see cref="T:Spring.Context.IApplicationContext"/> after all of this
+            object's dependencies have been resolved. This object can use the
+            supplied <see cref="T:Spring.Objects.Events.IEventRegistry"/>
+            immediately to publish or subscribe to one or more events.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.AbstractSingleObjectDefinitionParser">
+            <summary>
+            Base Type for those <see cref="T:Spring.Objects.Factory.Xml.IObjectDefinitionParser"/> implementations that
+            need to parse and define just a single IObjectDefinition.
+            </summary>
+            <remarks>
+            Extend this parser Type when you want to create a single object definition
+            from an arbitrarily complex XML element. You may wish to consider extending
+            the <see cref="T:Spring.Objects.Factory.Xml.AbstractSingleObjectDefinitionParser"/> when you want to create a
+            single Object definition from a relatively simple custom XML element.
+            <para>The resulting ObjectDefinition will be automatically registered
+            with the ObjectDefinitionRegistry.  Your job simply is to parse the
+            custom XML element into a single ObjectDefinition</para>
+            </remarks>
+            <author>Rob Harrop</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AbstractSingleObjectDefinitionParser.cs,v 1.3 2007/05/29 14:42:20 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.AbstractObjectDefinitionParser">
+            <summary>
+            Abstract <see cref="T:Spring.Objects.Factory.Xml.IObjectDefinitionParser"/> implementation providing
+            a number of convenience methods and a
+            <see cref="M:Spring.Objects.Factory.Xml.AbstractObjectDefinitionParser.ParseInternal(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)"/> template method
+            that subclasses must override to provide the actual parsing logic.
+            </summary>
+            <remarks>
+            Use this <see cref="T:Spring.Objects.Factory.Xml.IObjectDefinitionParser"/> implementation when you want
+            to parse some arbitrarily complex XML into one or more
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> ObjectDefinitions. If you just want to parse some
+            XML into a single <code>IObjectDefinition</code>, you may wish to consider
+            the simpler convenience extensions of this class, namely
+            <see cref="T:Spring.Objects.Factory.Xml.AbstractSingleObjectDefinitionParser"/> and
+            <see cref="T:Spring.Objects.Factory.Xml.AbstractSimpleObjectDefinitionParser"/>
+            </remarks>
+            <author>Rob Harrop</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AbstractObjectDefinitionParser.cs,v 1.4 2007/05/26 19:25:54 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.IObjectDefinitionParser">
+            <summary>
+            Interface used to handle custom, top-level tags.
+            </summary>
+            <remarks>Implementations are free to turn the metadata in the custom tag into as
+            many <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> as required.
+            </remarks>
+            <author>Rob Harrop</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IObjectDefinitionParser.cs,v 1.3 2007/05/25 03:23:21 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.IObjectDefinitionParser.ParseElement(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parse the specified XmlElement and register the resulting
+            ObjectDefinitions with the <see cref="P:Spring.Objects.Factory.Xml.ParserContext.Registry"/> IObjectDefinitionRegistry
+            embedded in the supplied <see cref="T:Spring.Objects.Factory.Xml.ParserContext"/>
+            </summary>
+            <remarks>
+            <p>
+            This method is never invoked if the parser is namespace aware
+            and was called to process the root node.
+            </p>
+            </remarks>
+            <param name="element">
+            The element to be parsed.
+            </param>
+            <param name="parserContext">
+            TThe object encapsulating the current state of the parsing process. 
+            Provides access to a IObjectDefinitionRegistry
+            </param>
+            <returns>
+            The primary object definition.
+            </returns>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.AbstractObjectDefinitionParser.ID_ATTRIBUTE">
+            <summary>
+            Constant for the ID attribute
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.AbstractObjectDefinitionParser.ParseElement(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parse the specified XmlElement and register the resulting
+            ObjectDefinitions with the <see cref="P:Spring.Objects.Factory.Xml.ParserContext.Registry"/> IObjectDefinitionRegistry
+            embedded in the supplied <see cref="T:Spring.Objects.Factory.Xml.ParserContext"/>
+            </summary>
+            <param name="element">The element to be parsed.</param>
+            <param name="parserContext">TThe object encapsulating the current state of the parsing process.
+            Provides access to a IObjectDefinitionRegistry</param>
+            <returns>The primary object definition.</returns>
+            <remarks>
+            	<p>
+            This method is never invoked if the parser is namespace aware
+            and was called to process the root node.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.AbstractObjectDefinitionParser.ResolveId(System.Xml.XmlElement,Spring.Objects.Factory.Support.AbstractObjectDefinition,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Resolves the ID for the supplied <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>.
+            </summary>
+            <remarks>
+            When using <see cref="P:Spring.Objects.Factory.Xml.AbstractObjectDefinitionParser.ShouldGenerateId"/> generation, a name is generated automatically.
+            Otherwise, the ID is extracted from the "id" attribute, potentially with a
+            <see cref="P:Spring.Objects.Factory.Xml.AbstractObjectDefinitionParser.ShouldGenerateIdAsFallback"/> fallback to a generated id.
+            </remarks>
+            <param name="element">The element that the object definition has been built from.</param>
+            <param name="definition">The object definition to be registered.</param>
+            <param name="parserContext">The the object encapsulating the current state of the parsing process;
+            provides access to a <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/> </param>
+            <returns>the resolved id</returns>
+            <exception cref="T:Spring.Objects.Factory.ObjectDefinitionStoreException">
+            if no unique name could be generated for the given object definition
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.AbstractObjectDefinitionParser.RegisterObjectDefinition(Spring.Objects.Factory.Config.ObjectDefinitionHolder,Spring.Objects.Factory.Support.IObjectDefinitionRegistry)">
+            <summary>
+            Registers the supplied <see cref="T:Spring.Objects.Factory.Config.ObjectDefinitionHolder"/> with the supplied
+            <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>.
+            </summary>
+            <remarks>Subclasses can override this method to control whether or not the supplied
+            <see cref="T:Spring.Objects.Factory.Config.ObjectDefinitionHolder"/> is actually even registered, or to
+            register even more objects.
+            <para>
+            The default implementation registers the supplied <see cref="T:Spring.Objects.Factory.Config.ObjectDefinitionHolder"/>
+            with the supplied <see cref="T:Spring.Objects.Factory.Config.ObjectDefinitionHolder"/> only if the <code>IsNested</code>
+            parameter is <code>false</code>, because one typically does not want inner objects
+            to be registered as top level objects.
+            </para>
+            </remarks>
+            
+            <param name="definition">The object definition to be registered.</param>
+            <param name="registry">The registry that the bean is to be registered with.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.AbstractObjectDefinitionParser.ParseInternal(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Central template method to actually parse the supplied XmlElement 
+            into one or more IObjectDefinitions.
+            </summary>
+            <param name="element">The element that is to be parsed into one or more <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>s</param>
+            <param name="parserContext">The the object encapsulating the current state of the parsing process;
+            provides access to a <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/> </param>
+            <returns>The primary IObjectDefinition resulting from the parsing of the supplied XmlElement</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.AbstractObjectDefinitionParser.ShouldGenerateId">
+            <summary>
+            Gets a value indicating whether an ID should be generated instead of read 
+            from the passed in XmlElement.
+            </summary>
+            <remarks>Note that this flag is about always generating an ID; the parser
+            won't even check for an "id" attribute in this case.
+            </remarks>
+            <value><c>true</c> if should generate id; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.AbstractObjectDefinitionParser.ShouldGenerateIdAsFallback">
+            <summary>
+            Gets a value indicating whether an ID should be generated instead if the
+            passed in XmlElement does not specify an "id" attribute explicitly.
+            </summary>
+            <remarks>Disabled by default; subclasses can override this to enable ID generation
+            as fallback: The parser will first check for an "id" attribute in this case,
+            only falling back to a generated ID if no value was specified.</remarks>
+            <value>
+            	<c>true</c> if should generate id if no value was specified; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.AbstractSingleObjectDefinitionParser.ParseInternal(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Central template method to actually parse the supplied XmlElement
+            into one or more IObjectDefinitions.
+            </summary>
+            <param name="element">The element that is to be parsed into one or more <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>s</param>
+            <param name="parserContext">The the object encapsulating the current state of the parsing process;
+            provides access to a <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/></param>
+            <returns>
+            The primary IObjectDefinition resulting from the parsing of the supplied XmlElement
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.AbstractSingleObjectDefinitionParser.GetObjectType(System.Xml.XmlElement)">
+            <summary>
+            Gets the type of the object corresponding to the supplied XmlElement.
+            </summary>
+            <remarks>Note that, for application classes, it is generally preferable to override
+            <code>GetObjectTypeName</code> instad, in order to avoid a direct
+            dependence on the object implementation class.  The ObjectDefinitionParser
+            and its IXmlObjectDefinitionParser (namespace parser) can be used within an
+            IDE add-in then, even if the application classses are not available in the add-ins
+            AppDomain.
+            </remarks>
+            <param name="element">The element.</param>
+            <returns>The Type of the class that is being defined via parsing the supplied
+            Element.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.AbstractSingleObjectDefinitionParser.GetObjectTypeName(System.Xml.XmlElement)">
+            <summary>
+            Gets the name of the object type name (FullName) corresponding to the supplied XmlElement.
+            </summary>
+            <param name="element">The element.</param>
+            <returns>The type name of the object that is being defined via parsing the supplied
+            XmlElement.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.AbstractSingleObjectDefinitionParser.DoParse(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext,Spring.Objects.Factory.Support.ObjectDefinitionBuilder)">
+            <summary>
+            Parse the supplied XmlElement and populate the supplied ObjectDefinitionBuilder as required.
+            </summary>
+            <remarks>The default implementation delegates to the <code>DoParse</code> version without 
+            ParameterContext argument.</remarks>
+            <param name="element">The element.</param>
+            <param name="parserContext">The parser context.</param>
+            <param name="builder">The builder used to define the <code>IObjectDefinition</code>.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.AbstractSingleObjectDefinitionParser.DoParse(System.Xml.XmlElement,Spring.Objects.Factory.Support.ObjectDefinitionBuilder)">
+            <summary>
+            Parse the supplied XmlElement and populate the supplied ObjectDefinitionBuilder as required. 
+            </summary>
+            <remarks>The default implementation does nothing.</remarks>
+            <param name="element">The element.</param>
+            <param name="builder">The builder used to define the <code>IObjectDefinition</code>.</param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.DefaultObjectNameGenerator">
+            <summary>
+            Default implementation of the <see cref="T:Spring.Objects.Factory.Support.IObjectNameGenerator"/> interface, deleagting to
+            <see cref="M:Spring.Objects.Factory.Support.ObjectDefinitionReaderUtils.GenerateObjectName(Spring.Objects.Factory.Support.IConfigurableObjectDefinition,Spring.Objects.Factory.Support.IObjectDefinitionRegistry)"/>.
+            </summary>
+            <remarks>Note that this implementation is only able to handle
+            <see cref="T:Spring.Objects.Factory.Support.IConfigurableObjectDefinition"/> subclasses such as
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> and <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: DefaultObjectNameGenerator.cs,v 1.1 2007/05/23 20:16:13 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.IObjectNameGenerator">
+            <summary>
+            Strategy interface for generating object names for object definitions
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IObjectNameGenerator.cs,v 1.1 2007/05/23 20:16:13 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IObjectNameGenerator.GenerateObjectName(Spring.Objects.Factory.Config.IObjectDefinition,Spring.Objects.Factory.Support.IObjectDefinitionRegistry)">
+            <summary>
+            Generates an object name for the given object definition.
+            </summary>
+            <param name="definition">The object definition to generate a name for.</param>
+            <param name="registry">The object definitions registry that the given definition is
+            supposed to be registerd with</param>
+            <returns>the generated object name</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultObjectNameGenerator.GenerateObjectName(Spring.Objects.Factory.Config.IObjectDefinition,Spring.Objects.Factory.Support.IObjectDefinitionRegistry)">
+            <summary>
+            Generates an object name for the given object definition.
+            </summary>
+            <param name="definition">The object definition to generate a name for.</param>
+            <param name="registry">The object definitions registry that the given definition is
+            supposed to be registerd with</param>
+            <returns>the generated object name</returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Attributes.RequiredAttribute">
+            <summary>
+            Marks a property as being 'required': that is, the setter property 
+            must be configured to be dependency-injected with a value.
+            </summary>
+            <remarks>Consult the SDK documentation for <see cref="T:Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor"/>, 
+            which, by default, checks for the presence of this annotation.
+            </remarks>
+            <author>Rob Harrop</author>
+            <author>Mark Pollack</author>
+            <version>$Id: RequiredAttribute.cs,v 1.1 2008/04/02 18:02:24 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Globalization.AbstractResourceCache">
+            <summary>
+            Abstract base class that all resource cache implementations should extend.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AbstractResourceCache.cs,v 1.3 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.AbstractResourceCache.GetResources(System.Object,System.Globalization.CultureInfo)">
+            <summary>
+            Gets the list of resources from the cache.
+            </summary>
+            <param name="target">Target to get a list of resources for.</param>
+            <param name="culture">Resource culture.</param>
+            <returns>A list of cached resources for the specified target object and culture.</returns>
+        </member>
+        <member name="M:Spring.Globalization.AbstractResourceCache.PutResources(System.Object,System.Globalization.CultureInfo,System.Collections.IList)">
+            <summary>
+            Puts the list of resources in the cache.
+            </summary>
+            <param name="target">Target to cache a list of resources for.</param>
+            <param name="culture">Resource culture.</param>
+            <param name="resources">A list of resources to cache.</param>
+            <returns>A list of cached resources for the specified target object and culture.</returns>
+        </member>
+        <member name="M:Spring.Globalization.AbstractResourceCache.CreateCacheKey(System.Object,System.Globalization.CultureInfo)">
+            <summary>
+            Crates resource cache key for the specified target object and culture.
+            </summary>
+            <param name="target">Target object to apply resources to.</param>
+            <param name="culture">Resource culture to use for resource lookup.</param>
+        </member>
+        <member name="M:Spring.Globalization.AbstractResourceCache.GetResources(System.String)">
+            <summary>
+            Gets the list of resources from cache.
+            </summary>
+            <param name="cacheKey">Cache key to use for lookup.</param>
+            <returns>A list of cached resources for the specified target object and culture.</returns>
+        </member>
+        <member name="M:Spring.Globalization.AbstractResourceCache.PutResources(System.String,System.Collections.IList)">
+            <summary>
+            Puts the list of resources in the cache.
+            </summary>
+            <param name="cacheKey">Cache key to use for the specified resources.</param>
+            <param name="resources">A list of resources to cache.</param>
+            <returns>A list of cached resources for the specified target object and culture.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpPOWER">
+            <summary>
+            Represents arithmetic exponent operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpPOWER.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpPOWER.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpPOWER.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpPOWER.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the arithmetic exponent operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpGreaterOrEqual">
+            <summary>
+            Represents logical "greater than or equal" operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpGreaterOrEqual.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpGreaterOrEqual.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpGreaterOrEqual.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpGreaterOrEqual.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical "greater than or equal" operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.FunctionNode">
+            <summary>
+            Represents parsed function node.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: FunctionNode.cs,v 1.7 2008/03/20 23:58:16 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.FunctionNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.FunctionNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.FunctionNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Evaluates function represented by this node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Result of the function evaluation.</returns>
+        </member>
+        <member name="T:Spring.Core.TypeResolution.TypeResolver">
+            <summary>
+            Resolves a <see cref="T:System.Type"/> by name.
+            </summary>
+            <author>Rick Evans</author>
+            <author>Aleksandar Seovic</author>
+            <author>Bruno Baia</author>
+            <version>$Id: TypeResolver.cs,v 1.3 2007/08/27 15:18:24 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeResolver.Resolve(System.String)">
+            <summary>
+            Resolves the supplied <paramref name="typeName"/> to a
+            <see cref="T:System.Type"/> instance.
+            </summary>
+            <param name="typeName">
+            The unresolved (possibly partially assembly qualified) name 
+            of a <see cref="T:System.Type"/>.
+            </param>
+            <returns>
+            A resolved <see cref="T:System.Type"/> instance.
+            </returns>
+            <exception cref="T:System.TypeLoadException">
+            If the supplied <paramref name="typeName"/> could not be resolved
+            to a <see cref="T:System.Type"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeResolver.LoadTypeDirectlyFromAssembly(Spring.Core.TypeResolution.TypeAssemblyHolder)">
+            <summary>
+            Uses <see cref="M:System.Reflection.Assembly.LoadWithPartialName(System.String)"/>
+            to load an <see cref="T:System.Reflection.Assembly"/> and then the attendant
+            <see cref="T:System.Type"/> referred to by the <paramref name="typeInfo"/>
+            parameter.
+            </summary>
+            <remarks>
+            <p>
+            <see cref="M:System.Reflection.Assembly.LoadWithPartialName(System.String)"/> is
+            deprecated in .NET 2.0, but is still used here (even when this class is
+            compiled for .NET 2.0);
+            <see cref="M:System.Reflection.Assembly.LoadWithPartialName(System.String)"/> will
+            still resolve (non-.NET Framework) local assemblies when given only the
+            display name of an assembly (the behaviour for .NET Framework assemblies
+            and strongly named assemblies is documented in the docs for the
+            <see cref="M:System.Reflection.Assembly.LoadWithPartialName(System.String)"/> method).
+            </p>
+            </remarks>
+            <param name="typeInfo">
+            The assembly and type to be loaded.
+            </param>
+            <returns>
+            A <see cref="T:System.Type"/>, or <see lang="null"/>.
+            </returns>
+            <exception cref="T:System.Exception">
+            <see cref="M:System.Reflection.Assembly.LoadWithPartialName(System.String)"/>
+            </exception>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeResolver.LoadTypeByIteratingOverAllLoadedAssemblies(Spring.Core.TypeResolution.TypeAssemblyHolder)">
+            <summary>
+            Uses <see cref="M:System.AppDomain.CurrentDomain.GetAssemblies()"/>
+            to load the attendant <see cref="T:System.Type"/> referred to by 
+            the <paramref name="typeInfo"/> parameter.
+            </summary>
+            <param name="typeInfo">
+            The type to be loaded.
+            </param>
+            <returns>
+            A <see cref="T:System.Type"/>, or <see lang="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeResolver.BuildTypeLoadException(System.String)">
+            <summary>
+            Creates a new <see cref="T:System.TypeLoadException"/> instance 
+            from the given <paramref name="typeName"/>
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeResolver.BuildTypeLoadException(System.String,System.Exception)">
+            <summary>
+            Creates a new <see cref="T:System.TypeLoadException"/> instance
+            from the given <paramref name="typeName"/> with the given inner <see cref="T:System.Exception"/> 
+            </summary>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.RGBColorConverter">
+            <summary>
+            Converter for <see cref="T:System.Drawing.Color"/> from a comma separated
+            list of RBG values.
+            </summary>
+            <remarks>
+            <p>
+            Please note that this class does <b>not</b> implement converting
+            to a comma separated list of RBG values from a
+            <see cref="T:System.Drawing.Color"/>.
+            </p>
+            </remarks>
+            <author>Federico Spinazzi</author>
+            <version>$Id: RGBColorConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.RGBColorConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Returns whether this converter can convert an object of one
+            <see cref="T:System.Type"/> to a 
+            <see cref="T:System.Drawing.Color"/>.
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from a
+            <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns><see langword="true"/> if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.RGBColorConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Converts the specified object (a string) a <see cref="T:System.Drawing.Color"/>
+            instance.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture: currently ignored.
+            </param>
+            <param name="value">
+            The value that is to be converted, in "R,G,B", "A,R,G,B", or 
+            symbolic color name (<see cref="T:System.Drawing.KnownColor"/>).
+            </param>
+            <returns>
+            A <see cref="T:System.Drawing.Color"/> representation of the string value.
+            </returns>
+            <exception cref="T:System.FormatException">
+            If the input string is not in a supported format, or is not one of the
+            predefined system colors (<see cref="T:System.Drawing.KnownColor"/>).
+            </exception>
+        </member>
+        <member name="T:Spring.Core.RegularExpressionMethodNameCriteria">
+            <summary>
+            Criteria that is satisfied if the <c>Name</c> property of an
+            <see cref="T:System.Reflection.MethodInfo"/> instance matches a
+            supplied regular expression pattern.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: RegularExpressionMethodNameCriteria.cs,v 1.1 2007/07/31 01:35:07 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Core.RegularExpressionMethodNameCriteria.MatchAnyMethodNamePattern">
+            <summary>
+            The default method name pattern... matches pretty much any method name.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.RegularExpressionMethodNameCriteria.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.RegularExpressionMethodNameCriteria"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.RegularExpressionMethodNameCriteria.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.RegularExpressionMethodNameCriteria"/> class.
+            </summary>
+            <param name="methodNamePattern">
+            The pattern that <see cref="T:System.Reflection.MethodInfo"/> names
+            must match against in order to satisfy this criteria.
+            </param>
+        </member>
+        <member name="M:Spring.Core.RegularExpressionMethodNameCriteria.IsSatisfied(System.Object)">
+            <summary>
+            Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+            this instance?
+            </summary>
+            <param name="datum">The datum to be checked by this criteria instance.</param>
+            <returns>
+            True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+            by this instance; false if not or the supplied <paramref name="datum"/> is null.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.MethodReturnTypeCriteria">
+            <summary>
+            Criteria that is satisfied if the return <see cref="T:System.Type"/> of a given
+            <see cref="T:System.Reflection.MethodInfo"/> matches a given <see cref="T:System.Type"/>.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: MethodReturnTypeCriteria.cs,v 1.1 2007/07/31 02:03:36 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Core.MethodReturnTypeCriteria.DefaultType">
+            <summary>
+            The return <see cref="T:System.Type"/> to match against if no
+            <see cref="T:System.Type"/> is provided explictly.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.MethodReturnTypeCriteria.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.MethodReturnTypeCriteria"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.MethodReturnTypeCriteria.#ctor(System.Type)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.MethodReturnTypeCriteria"/> class.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> that the return type of a given
+            <see cref="T:System.Reflection.MethodInfo"/> must match in order to satisfy
+            this criteria.
+            </param>
+        </member>
+        <member name="M:Spring.Core.MethodReturnTypeCriteria.IsSatisfied(System.Object)">
+            <summary>
+            Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+            this instance?
+            </summary>
+            <param name="datum">The datum to be checked by this criteria instance.</param>
+            <returns>
+            True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+            by this instance; false if not or the supplied <paramref name="datum"/> is null.
+            </returns>
+        </member>
+        <member name="P:Spring.Core.MethodReturnTypeCriteria.ReturnType">
+            <summary>
+            The <see cref="T:System.Type"/> that the return type of a given
+            <see cref="T:System.Reflection.MethodInfo"/> must match in order to satisfy
+            this criteria.
+            </summary>
+        </member>
+        <member name="T:Spring.Core.IO.UrlResource">
+            <summary>
+            A <see cref="T:System.Uri"/> backed resource 
+            on top of <see cref="T:System.Net.WebRequest"/>
+            </summary>
+            <remarks>
+            <p>
+            Obviously supports resolution as a <see cref="T:System.Uri"/>, and also
+            as a <see cref="T:System.IO.FileInfo"/> in the case of the <c>"file:"</c>
+            protocol.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            Some examples of the strings that can be used to initialize a new
+            instance of the <see cref="T:Spring.Core.IO.UrlResource"/> class
+            include...
+            <list type="bullet">
+            <item>
+            <description>file:///Config/objects.xml</description>
+            </item>
+            <item>
+            <description>http://www.mycompany.com/services.txt</description>
+            </item>
+            </list>
+            </p>
+            </example>
+            <author>Juergen Hoeller</author>
+            <author>Leonardo Susatyo (.NET)</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: UrlResource.cs,v 1.15 2007/08/08 17:46:55 bbaia Exp $</version>
+            <seealso cref="T:Spring.Core.IO.IResource"/>
+            <seealso cref="T:Spring.Core.IO.IResourceLoader"/>
+            <seealso cref="T:Spring.Core.IO.ConfigurableResourceLoader"/>
+        </member>
+        <member name="M:Spring.Core.IO.UrlResource.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.IO.UrlResource"/> class.
+            </summary>
+            <example>
+            <p>
+            Some examples of the values that the <paramref name="resourceName"/>
+            can typically be expected to hold include...
+            <list type="bullet">
+            <item>
+            <description>file:///Config/objects.xml</description>
+            </item>
+            <item>
+            <description>http://www.mycompany.com/services.txt</description>
+            </item>
+            </list>
+            </p>
+            </example>
+            <param name="resourceName">
+            A string representation of the <see cref="T:System.Uri"/> resource.
+            </param>
+        </member>
+        <member name="M:Spring.Core.IO.UrlResource.IsRelativeResource(System.String)">
+            <summary>
+            Does the supplied <paramref name="resourceName"/> relative ?
+            </summary>
+            <param name="resourceName">
+            The name of the resource to test.
+            </param>
+            <returns>
+            <see langword="true"/> if resource name is relative; 
+            otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Core.IO.UrlResource.WebRequest">
+            <summary>
+            Returns the <see cref="T:System.Net.WebRequest"/> instance 
+            used for the resource resolution.
+            </summary>
+            <value>
+            A <see cref="T:System.Net.WebRequest"/> instance.
+            </value>
+            <seealso cref="T:System.Net.HttpWebRequest"/>
+            <seealso cref="T:System.Net.FileWebRequest"/>
+        </member>
+        <member name="P:Spring.Core.IO.UrlResource.InputStream">
+            <summary>
+            Return an <see cref="T:System.IO.Stream"/> for this resource.
+            </summary>
+            <value>
+            An <see cref="T:System.IO.Stream"/>.
+            </value>
+            <exception cref="T:System.IO.IOException">
+            If the stream could not be opened.
+            </exception>
+            <seealso cref="T:Spring.Core.IO.IInputStreamSource"/>
+        </member>
+        <member name="P:Spring.Core.IO.UrlResource.Uri">
+            <summary>
+            Returns the <see cref="T:System.Uri"/> handle for this resource.
+            </summary>
+            <value>
+            The <see cref="T:System.Uri"/> handle for this resource.
+            </value>
+            <exception cref="T:System.IO.IOException">
+            If the resource is not available or cannot be exposed as a
+            <see cref="T:System.Uri"/>.
+            </exception>
+            <seealso cref="P:Spring.Core.IO.IResource.Uri"/>
+        </member>
+        <member name="P:Spring.Core.IO.UrlResource.File">
+            <summary>
+            Returns a <see cref="T:System.IO.FileInfo"/> handle for this resource.
+            </summary>
+            <value>
+            The <see cref="T:System.IO.FileInfo"/> handle for this resource.
+            </value>
+            <exception cref="T:System.IO.FileNotFoundException">
+            If the resource is not available on a filesystem.
+            </exception>
+            <seealso cref="P:Spring.Core.IO.IResource.File"/>
+        </member>
+        <member name="P:Spring.Core.IO.UrlResource.SupportsRelativeResources">
+            <summary>
+            Does this <see cref="T:Spring.Core.IO.IResource"/> support relative
+            resource retrieval?
+            </summary>
+            <remarks>
+            <p>
+            This implementation does support relative resource retrieval, and
+            so will always return <see langword="true"/>.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if this
+            <see cref="T:Spring.Core.IO.IResource"/> supports relative resource
+            retrieval.
+            </value>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.SupportsRelativeResources"/>
+        </member>
+        <member name="P:Spring.Core.IO.UrlResource.RootLocation">
+            <summary>
+            Gets the root location of the resource.
+            </summary>
+            <value>
+            The root location of the resource.
+            </value>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.RootLocation"/>
+        </member>
+        <member name="P:Spring.Core.IO.UrlResource.ResourcePath">
+            <summary>
+            Gets the current path of the resource.
+            </summary>
+            <value>
+            The current path of the resource.
+            </value>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.ResourcePath"/>
+        </member>
+        <member name="P:Spring.Core.IO.UrlResource.PathSeparatorChars">
+            <summary>
+            Gets those characters that are valid path separators for the
+            resource type.
+            </summary>
+            <value>
+            Those characters that are valid path separators for the resource
+            type.
+            </value>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.PathSeparatorChars"/>
+        </member>
+        <member name="P:Spring.Core.IO.UrlResource.Description">
+            <summary>
+            Returns a description for this resource.
+            </summary>
+            <value>
+            A description for this resource.
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.Description"/>
+        </member>
+        <member name="T:Spring.Context.Support.StaticMessageSource">
+            <summary>
+            Simple implementation of <see cref="T:Spring.Context.IMessageSource"/>
+            that allows messages to be held in an object and added programmatically.
+            </summary>
+            <remarks>
+            <p>
+            Mainly useful for testing.
+            </p>
+            <p>
+            This <see cref="T:Spring.Context.IMessageSource"/> supports internationalization.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <seealso cref="T:Spring.Context.Support.DelegatingMessageSource"/>
+            <version>$Id: StaticMessageSource.cs,v 1.16 2007/08/27 13:57:27 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Context.Support.StaticMessageSource.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.StaticMessageSource"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.StaticMessageSource.ResolveMessage(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Returns a format string.
+            </summary>
+            <param name="code">The code of the message to resolve.</param>
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to resolve the
+            code for.
+            </param>
+            <returns>
+            A format string or <see langword="null"/> if not found.
+            </returns>
+            <seealso cref="M:Spring.Context.Support.AbstractMessageSource.ResolveMessage(System.String,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.StaticMessageSource.ResolveObject(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Resolves an object (typically an icon or bitmap).
+            </summary>
+            <param name="code">The code of the object to resolve.</param>
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to resolve the
+            code for.
+            </param>
+            <returns>
+            The resolved object or <see langword="null"/> if not found.
+            </returns>
+            <seealso cref="M:Spring.Context.Support.AbstractMessageSource.ResolveObject(System.String,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.StaticMessageSource.ApplyResourcesToObject(System.Object,System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Applies resources to object properties.
+            </summary>
+            <remarks>
+            <p>
+            Uses a System.ComponentModel.ComponentResourceManager
+            internally to apply resources to object properties. Resource key
+            names are of the form <c>objectName.propertyName</c>.
+            </p>
+            <p>
+            This feature is not currently supported on version 1.0 of the .NET platform.
+            </p>
+            </remarks>
+            <param name="value">
+            An object that contains the property values to be applied.
+            </param>
+            <param name="objectName">
+            The base name of the object to use for key lookup.
+            </param>
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.
+            </param>
+            <exception cref="T:System.NotSupportedException">
+            This feature is not currently supported on version 1.0 of the .NET platform.
+            </exception>
+            <seealso cref="M:Spring.Context.Support.AbstractMessageSource.ApplyResourcesToObject(System.Object,System.String,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.StaticMessageSource.AddMessage(System.String,System.Globalization.CultureInfo,System.String)">
+            <summary>
+            Associate the supplied <paramref name="messageFormat"/> with the
+            supplied <paramref name="code"/>.
+            </summary>
+            <param name="code">The lookup code.</param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to resolve the
+            code for.
+            </param>
+            <param name="messageFormat">
+            The message format associated with this lookup code.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.StaticMessageSource.AddObject(System.String,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Associate the supplied <paramref name="value"/> with the
+            supplied <paramref name="code"/>.
+            </summary>
+            <param name="code">The lookup code.</param>
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to resolve the
+            code for.
+            </param>
+            <param name="value">
+            The object associated with this lookup code.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.StaticMessageSource.ToString">
+            <summary>
+            Returns a <see cref="T:System.String"/> representation of this
+            message source.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> containing all of this message
+            source's messages.
+            </returns>
+        </member>
+        <member name="T:Spring.Context.Support.TypeConvertersSectionHandler">
+            <summary>
+            Configuration section handler for the Spring.NET <c>typeConverters</c>
+            config section.
+            </summary>
+            <remarks>
+            <p>
+            Type converters are used to convert objects from one type into another
+            when injecting property values, evaluating expressions, performing data
+            binding, etc.
+            </p>
+            <p>
+            They are a very powerful mechanism as they allow Spring.NET to automatically
+            convert string-based property values from the configuration file into the appropriate
+            type based on the target property's type or to convert string values submitted
+            via a web form into a type that is used by your data model when Spring.NET data
+            binding is used. Because they offer such tremendous help, you should always provide
+            a type converter implementation for your custom types that you want to be able to use
+            for injected properties or for data binding.
+            </p>
+            <p>
+            The standard .NET mechanism for specifying type converter for a particular type is
+            to decorate the type with a <see cref="T:System.ComponentModel.TypeConverterAttribute"/>, passing the type
+            of the <see cref="T:System.ComponentModel.TypeConverter"/>-derived class as a parameter.
+            </p>
+            <p>
+            This mechanism will still work and is a preferred way of defining type converters if
+            you control the source code for the type that you want to define a converter for. However, 
+            this configuration section allows you to specify converters for the types that you don't 
+            control and it also allows you to override some of the standard type converters, such as
+            the ones that are defined for some of the types in the .NET Base Class Library.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            The following example shows how to configure both this section handler and
+            how to define type converters within a Spring.NET config section:
+            </p>
+            <code escaped="true">
+            <configuration>
+                <configSections>
+            	    <sectionGroup name="spring">
+            		    <section name="typeConverters" type="Spring.Context.Support.TypeConvertersSectionHandler, Spring.Core"/>
+            	    </sectionGroup>
+                </configSections>
+                <spring>
+            	    <typeConverters>
+            		    <converter for="Spring.Expressions.IExpression, Spring.Core" type="Spring.Expressions.ExpressionConverter, Spring.Core"/>
+            		    <converter for="MyTypeAlias" type="MyCompany.MyProject.Converters.MyTypeConverter, MyAssembly"/>
+            		    ...
+            	    </typeConverters>
+            	    ...
+                </spring>
+            </configuration>
+            </code>
+            </example>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: TypeConvertersSectionHandler.cs,v 1.6 2007/07/31 18:15:50 bbaia Exp $</version>
+            <seealso cref="T:Spring.Core.TypeResolution.TypeRegistry"/>
+        </member>
+        <member name="M:Spring.Context.Support.TypeConvertersSectionHandler.Create(System.Object,System.Object,System.Xml.XmlNode)">
+            <summary>
+            Populates <see cref="T:Spring.Core.TypeConversion.TypeConverterRegistry"/> using values specified in
+            the <c>typeConverters</c> config section.
+            </summary>
+            <param name="parent">
+            The configuration settings in a corresponding parent
+            configuration section.
+            </param>
+            <param name="configContext">
+            The configuration context when called from the ASP.NET
+            configuration system. Otherwise, this parameter is reserved and
+            is <see langword="null"/>.
+            </param>
+            <param name="section">
+            The <see cref="T:System.Xml.XmlNode"/> for the section.
+            </param>
+            <returns>
+            This method always returns <see langword="null"/>, because the
+            <see cref="T:Spring.Core.TypeConversion.TypeConverterRegistry"/> is populated as a side-effect of 
+            its execution and thus there is no need to return anything.
+            </returns>
+        </member>
+        <member name="T:Spring.Context.ApplicationEventHandler">
+            <summary>
+            The callback for application events.
+            </summary>
+        </member>
+        <member name="T:Spring.Context.ApplicationEventArgs">
+            <summary>
+            Encapsulates the data associated with an event raised by an
+            <see cref="T:Spring.Context.IApplicationContext"/>.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <author>Griffin Caprio (.NET)</author>
+            <seealso cref="T:Spring.Context.IApplicationEventListener"/>
+            <version>$Id: ApplicationEventArgs.cs,v 1.5 2006/04/09 07:18:38 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Context.ApplicationEventArgs.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.ApplicationEventArgs"/> class.
+            </summary>
+        </member>
+        <member name="P:Spring.Context.ApplicationEventArgs.TimeStamp">
+            <summary>
+            The date and time when the event occured.
+            </summary>
+            <value>
+            The date and time when the event occured.
+            </value>
+        </member>
+        <member name="P:Spring.Context.ApplicationEventArgs.EventTimeMilliseconds">
+            <summary>
+            The system time in milliseconds when the event happened.
+            </summary>
+            <value>
+            The system time in milliseconds when the event happened.
+            </value>
+        </member>
+        <member name="T:Spring.Validation.Validators.CreditCardValidator">
+            <summary>
+            Perform credit card validations.
+            </summary>
+            <remarks>
+            By default, all supported card types are allowed. You can specify
+            which credit card type validator should be used by setting
+            the value of <see cref="P:Spring.Validation.Validators.CreditCardValidator.CardType"/> property to a concrete <see cref="T:Spring.Validation.Validators.ICreditCardType"/>
+            instance.
+            </remarks>
+        </member>
+        <member name="M:Spring.Validation.Validators.CreditCardValidator.#ctor">
+            <summary>
+            Creates a new instance of the <b>UrlValidator</b> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.Validators.CreditCardValidator.#ctor(System.String,System.String,Spring.Validation.Validators.ICreditCardType)">
+            <summary>
+            Creates a new instance of the <b>UrlValidator</b> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+            <param name="cardType">Credit Card type validator to use.</param>
+        </member>
+        <member name="M:Spring.Validation.Validators.CreditCardValidator.#ctor(Spring.Expressions.IExpression,Spring.Expressions.IExpression,Spring.Validation.Validators.ICreditCardType)">
+            <summary>
+            Creates a new instance of the <b>UrlValidator</b> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+            <param name="cardType">Credit Card type validator to use.</param>
+        </member>
+        <member name="M:Spring.Validation.Validators.CreditCardValidator.Validate(System.Object)">
+            <summary>
+            Validates the supplied <paramref name="objectToValidate"/>.
+            </summary>
+            <remarks>
+            In the case of the <see cref="T:Spring.Validation.Validators.CreditCardValidator"/> class,
+            the test should be a string variable that will be evaluated and the object
+            obtained as a result of this evaluation will be checked if it is
+            a valid credit card number.
+            </remarks>
+            <param name="objectToValidate">The object to validate.</param>
+            <returns>
+            <see lang="true"/> if the supplied <paramref name="objectToValidate"/> is valid 
+            credit card number.
+            </returns>
+        </member>
+        <member name="M:Spring.Validation.Validators.CreditCardValidator.IsValid(System.String)">
+            <summary>
+            Checks if the <paramref name="card"/> is a valid credit card number.
+            </summary>
+            <param name="card">
+            The card number to validate.
+            </param>
+            <returns>
+            <b>true</b> if the card number is valid.
+            </returns>
+        </member>
+        <member name="M:Spring.Validation.Validators.CreditCardValidator.ValidateCard(System.String)">
+            <summary>
+            Validates card number with the specified <see cref="P:Spring.Validation.Validators.CreditCardValidator.CardType"/> validator.
+            </summary>
+            <param name="cardNumber">
+            Credit card number to validate.
+            </param>
+            <returns>
+            <b>true</b> if credit card number is a valid number of credit card type specified.
+            </returns>
+        </member>
+        <member name="M:Spring.Validation.Validators.CreditCardValidator.LuhnCheck(System.String)">
+            <summary>
+            Checks for a valid credit card number.
+            </summary>
+            <param name="cardNumber">
+            Credit Card Number.
+            </param>
+            <returns>
+            <b>true</b> if the card number passes the LuhnCheck.
+            </returns>
+        </member>
+        <member name="P:Spring.Validation.Validators.CreditCardValidator.CardType">
+            <summary>
+            Credit card type validator to use.
+            </summary>
+            <remarks>
+            Can be concrete implementations of <see cref="T:Spring.Validation.Validators.ICreditCardType"/> 
+            interface. The following are available implementations:
+            <see cref="T:Spring.Validation.Validators.Visa"/>, <see cref="T:Spring.Validation.Validators.Mastercard"/>, <see cref="T:Spring.Validation.Validators.Amex"/>, 
+            <see cref="T:Spring.Validation.Validators.Discover"/>.
+            </remarks>
+        </member>
+        <member name="T:Spring.Validation.Validators.ICreditCardType">
+            <summary>
+            CreditCardType interface defines how validation is performed
+            for one type/brand of credit card.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.Validators.ICreditCardType.Matches(System.String)">
+            <summary>
+            Returns true if the card number matches this type of 
+            credit card.
+            </summary>
+            <param name="card">
+            The card number, never null.
+            </param>
+            <returns>
+            <b>true</b> if the number matches.
+            </returns>
+        </member>
+        <member name="T:Spring.Validation.Validators.Visa">
+            <summary>
+            Visa credit card type validation support.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.Validators.Visa.Matches(System.String)">
+            <summary>
+            Indicates, wheter the given credit card number matches a visa number.
+            </summary>
+        </member>
+        <member name="T:Spring.Validation.Validators.Amex">
+            <summary>
+            American Express credit card type validation support.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.Validators.Amex.Matches(System.String)">
+            <summary>
+            Indicates, wheter the given credit card number matches an amex number.
+            </summary>
+        </member>
+        <member name="T:Spring.Validation.Validators.Discover">
+            <summary>
+            Discover credit card type validation support.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.Validators.Discover.Matches(System.String)">
+            <summary>
+            Indicates, wheter the given credit card number matches a discover number.
+            </summary>
+        </member>
+        <member name="T:Spring.Validation.Validators.Mastercard">
+            <summary>
+            Mastercard credit card type validation support.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.Validators.Mastercard.Matches(System.String)">
+            <summary>
+            Indicates, wheter the given credit card number matches a mastercard number.
+            </summary>
+        </member>
+        <member name="T:Spring.Validation.ValidationException">
+            <summary>
+            Thrown by the validation advice if the method parameters validation fails.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ValidationException.cs,v 1.1 2008/02/05 20:40:26 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Validation.ValidationException.#ctor">
+            <summary>
+            Creates a new instance of the ValidationException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.ValidationException.#ctor(Spring.Validation.IValidationErrors)">
+            <summary>
+            Creates a new instance of the ValidationException class with
+            specified validation errors.
+            </summary>
+            <param name="errors">
+            Validation errors.
+            </param>
+        </member>
+        <member name="M:Spring.Validation.ValidationException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the ValidationException class with the
+            specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Validation.ValidationException.#ctor(System.String,Spring.Validation.IValidationErrors)">
+            <summary>
+            Creates a new instance of the ValidationException class with the
+            specified message and validation errors.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="errors">
+            Validation errors.
+            </param>
+        </member>
+        <member name="M:Spring.Validation.ValidationException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the ValidationException class with the
+            specified message and root cause.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Validation.ValidationException.#ctor(System.String,System.Exception,Spring.Validation.IValidationErrors)">
+            <summary>
+            Creates a new instance of the ValidationException class with the
+            specified message, root cause and validation errors.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+            <param name="errors">
+            Validation errors.
+            </param>
+        </member>
+        <member name="M:Spring.Validation.ValidationException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the ValidationException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Validation.ValidationException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Implements object serialization.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="P:Spring.Validation.ValidationException.ValidationErrors">
+            <summary>
+            Gets validation errors.
+            </summary>
+            <value>Validation errors.</value>
+        </member>
+        <member name="T:Spring.Util.EventRaiser">
+            <summary>
+            A utility  class for raising events in a generic and consistent fashion.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: EventUtils.cs,v 1.5 2006/04/09 07:19:00 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Util.EventRaiser.Raise(System.Delegate,System.Object[])">
+            <summary>
+            Raises the event encapsulated by the supplied
+            <paramref name="source"/>, passing the supplied <paramref name="arguments"/>
+            to the event.
+            </summary>
+            <param name="source">The event to be raised.</param>
+            <param name="arguments">The arguments to the event.</param>
+        </member>
+        <member name="M:Spring.Util.EventRaiser.Invoke(System.Delegate,System.Object[])">
+            <summary>
+            Invokes the supplied <paramref name="sink"/>, passing the supplied
+            <paramref name="arguments"/> to the sink.
+            </summary>
+            <param name="sink">The sink to be invoked.</param>
+            <param name="arguments">The arguments to the sink.</param>
+        </member>
+        <member name="T:Spring.Util.DefensiveEventRaiser">
+            <summary>
+            Raises events <b>defensively</b>.
+            </summary>
+            <remarks>
+            <p>
+            Raising events defensively means that as the raised event is passed to each handler,
+            any <see cref="T:System.Exception"/> thrown by a handler will be caught and silently
+            ignored.
+            </p>
+            </remarks>
+            <author>Rick Evans</author>
+            <version>$Id: EventUtils.cs,v 1.5 2006/04/09 07:19:00 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Util.DefensiveEventRaiser.Invoke(System.Delegate,System.Object[])">
+            <summary>
+            <b>Defensively</b> invokes the supplied <paramref name="sink"/>, passing the
+            supplied <paramref name="arguments"/> to the sink.
+            </summary>
+            <param name="sink">The sink to be invoked.</param>
+            <param name="arguments">The arguments to the sink.</param>
+        </member>
+        <member name="T:Spring.Threading.Latch">
+             <summary> A latch is a boolean condition that is set at most once, ever.
+             Once a single release is issued, all acquires will pass.
+             <p>
+             <b>Sample usage.</b> Here are a set of classes that use
+             a latch as a start signal for a group of worker threads that
+             are created and started beforehand, and then later enabled.
+             </p>
+             <example>
+             class Worker implements IRunnable {
+               private readonly Latch startSignal;
+               Worker(Latch l) 
+               { 
+                 startSignal = l; 
+               }
+            
+               public void Run() {
+                 startSignal.acquire();
+                 DoWork();
+               }
+               
+               void DoWork() { ... }
+               }
+             
+               class Driver { // ...
+                 void Main() {
+                   Latch go = new Latch();
+                   for (int i = 0; i &lt; N; ++i) // make threads
+                   new Thread(new ThreadStart(new Worker(go)).Start();
+                   DoSomethingElse();         // don't let run yet 
+                   go.Release();              // let all threads proceed
+             } 
+             }
+             </example>
+             </summary>
+             <author>Doug Lea</author>
+             <author>Federico Spinazzi (.Net)</author>
+             <version>$Id: Latch.cs,v 1.11 2006/09/15 19:06:08 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Threading.Latch.latched_">
+            <summary>
+            can acquire ?
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.Latch.Acquire">
+            <summary>
+            Method mainly used by clients who are trying to get the latch
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.Latch.Attempt(System.Int64)">
+            <summary>Wait at most msecs millisconds for a permit</summary>
+        </member>
+        <member name="M:Spring.Threading.Latch.Release">
+            <summary>
+            Enable all current and future acquires to pass 
+            </summary>
+        </member>
+        <member name="T:Spring.Threading.CallContextStorage">
+            <summary>
+            Implements <see cref="T:Spring.Threading.IThreadStorage"/> by using <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/>.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: CallContextStorage.cs,v 1.1 2007/02/02 21:30:34 oakinger Exp $</version>  
+        </member>
+        <member name="M:Spring.Threading.CallContextStorage.GetData(System.String)">
+            <summary>
+            Retrieves an object with the specified name.
+            </summary>
+            <param name="name">The name of the item.</param>
+            <returns>The object in the call context associated with the specified name or null if no object has been stored previously</returns>
+        </member>
+        <member name="M:Spring.Threading.CallContextStorage.SetData(System.String,System.Object)">
+            <summary>
+            Stores a given object and associates it with the specified name.
+            </summary>
+            <param name="name">The name with which to associate the new item.</param>
+            <param name="value">The object to store in the call context.</param>
+        </member>
+        <member name="M:Spring.Threading.CallContextStorage.FreeNamedDataSlot(System.String)">
+            <summary>
+            Empties a data slot with the specified name.
+            </summary>
+            <param name="name">The name of the data slot to empty.</param>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.IDynamicIndexer">
+            <summary>
+            Defines methods that dynamic indexer class has to implement.
+            </summary>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.IDynamicIndexer.GetValue(System.Object,System.Int32)">
+            <summary>
+            Gets the value of the dynamic indexer for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to get the indexer value from.
+            </param>
+            <param name="index">
+            Indexer argument.
+            </param>
+            <returns>
+            A indexer value.
+            </returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.IDynamicIndexer.GetValue(System.Object,System.Object)">
+            <summary>
+            Gets the value of the dynamic indexer for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to get the indexer value from.
+            </param>
+            <param name="index">
+            Indexer argument.
+            </param>
+            <returns>
+            A indexer value.
+            </returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.IDynamicIndexer.GetValue(System.Object,System.Object[])">
+            <summary>
+            Gets the value of the dynamic indexer for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to get the indexer value from.
+            </param>
+            <param name="index">
+            Indexer arguments.
+            </param>
+            <returns>
+            A indexer value.
+            </returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.IDynamicIndexer.SetValue(System.Object,System.Int32,System.Object)">
+            <summary>
+            Gets the value of the dynamic indexer for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to set the indexer value on.
+            </param>
+            <param name="index">
+            Indexer argument.
+            </param>
+            <param name="value">
+            A new indexer value.
+            </param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.IDynamicIndexer.SetValue(System.Object,System.Object,System.Object)">
+            <summary>
+            Gets the value of the dynamic indexer for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to set the indexer value on.
+            </param>
+            <param name="index">
+            Indexer argument.
+            </param>
+            <param name="value">
+            A new indexer value.
+            </param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.IDynamicIndexer.SetValue(System.Object,System.Object[],System.Object)">
+            <summary>
+            Gets the value of the dynamic indexer for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to set the indexer value on.
+            </param>
+            <param name="index">
+            Indexer arguments.
+            </param>
+            <param name="value">
+            A new indexer value.
+            </param>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.SafeIndexer">
+            <summary>
+            Safe wrapper for the dynamic indexer.
+            </summary>
+            <remarks>
+            <see cref="T:Spring.Reflection.Dynamic.SafeIndexer"/> will attempt to use dynamic
+            indexer if possible, but it will fall back to standard
+            reflection if necessary.
+            </remarks>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeIndexer.#ctor(System.Reflection.PropertyInfo)">
+            <summary>
+            Creates a new instance of the safe indexer wrapper.
+            </summary>
+            <param name="indexer">Indexer to wrap.</param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeIndexer.GetValue(System.Object,System.Int32)">
+            <summary>
+            Gets the value of the dynamic indexer for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to get indexer value from.
+            </param>
+            <param name="index">
+            Indexer arguments.
+            </param>
+            <returns>
+            A indexer value.
+            </returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeIndexer.GetValue(System.Object,System.Object)">
+            <summary>
+            Gets the value of the dynamic indexer for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to get the indexer value from.
+            </param>
+            <param name="index">
+            Indexer argument.
+            </param>
+            <returns>
+            A indexer value.
+            </returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeIndexer.GetValue(System.Object,System.Object[])">
+            <summary>
+            Gets the value of the dynamic indexer for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to get indexer value from.
+            </param>
+            <param name="index">
+            Indexer arguments.
+            </param>
+            <returns>
+            A indexer value.
+            </returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeIndexer.SetValue(System.Object,System.Int32,System.Object)">
+            <summary>
+            Sets the value of the dynamic indexer for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to set indexer value on.
+            </param>
+            <param name="index">
+            Indexer arguments.
+            </param>
+            <param name="value">
+            A new indexer value.
+            </param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeIndexer.SetValue(System.Object,System.Object,System.Object)">
+            <summary>
+            Sets the value of the dynamic indexer for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to set indexer value on.
+            </param>
+            <param name="index">
+            Indexer arguments.
+            </param>
+            <param name="value">
+            A new indexer value.
+            </param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeIndexer.SetValue(System.Object,System.Object[],System.Object)">
+            <summary>
+            Sets the value of the dynamic indexer for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to set indexer value on.
+            </param>
+            <param name="index">
+            Indexer arguments.
+            </param>
+            <param name="value">
+            A new indexer value.
+            </param>
+        </member>
+        <member name="P:Spring.Reflection.Dynamic.SafeIndexer.IndexerProperty">
+            <summary>
+            Internal PropertyInfo accessor.
+            </summary>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.DynamicIndexer">
+            <summary>
+            Factory class for dynamic indexers.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DynamicIndexer.cs,v 1.1 2007/08/08 04:05:37 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicIndexer.Create(System.Reflection.PropertyInfo)">
+            <summary>
+            Creates dynamic indexer instance for the specified <see cref="T:System.Reflection.PropertyInfo"/>.
+            </summary>
+            <param name="indexer">Indexer info to create dynamic indexer for.</param>
+            <returns>Dynamic indexer for the specified <see cref="T:System.Reflection.PropertyInfo"/>.</returns>
+        </member>
+        <member name="T:Spring.Pool.IPoolableObjectFactory">
+            <summary>
+            Defines lifecycle methods for objects that are to be used in an
+            <see cref="T:Spring.Pool.IObjectPool"/> implementation.
+            </summary>
+            <remarks>
+            <p>
+            The following methods summarize the contract between an
+            <see cref="T:Spring.Pool.IObjectPool"/> and an
+            an <see cref="T:Spring.Pool.IPoolableObjectFactory"/>.
+            </p>
+            <list type="number">
+              <item>
+            	<see cref="M:Spring.Pool.IPoolableObjectFactory.MakeObject"/>
+            	is called whenever a new instance is needed.
+              </item>
+              <item>
+            	<see cref="M:Spring.Pool.IPoolableObjectFactory.ActivateObject(System.Object)"/>
+            	is invoked on every instance before it is returned from
+            	the pool.
+              </item>
+              <item>
+            	<see cref="M:Spring.Pool.IPoolableObjectFactory.PassivateObject(System.Object)"/>
+            	is invoked on every instance when it is returned to the pool.
+              </item>
+              <item>
+            	<see cref="M:Spring.Pool.IPoolableObjectFactory.DestroyObject(System.Object)"/>
+            	is invoked on every instance when it is being dropped from the
+            	pool (see
+            	<see cref="M:Spring.Pool.IPoolableObjectFactory.ValidateObject(System.Object)"/>
+              </item>
+            </list>
+            <p>
+            Based on the Jakarta Commons Pool API.
+            </p>
+            </remarks>
+            <author>Federico Spinazzi</author>
+            <version>$Id: IPoolableObjectFactory.cs,v 1.5 2005/11/18 17:29:32 gcaprio Exp $</version>
+            <seealso cref="T:Spring.Pool.IObjectPool"/>
+        </member>
+        <member name="M:Spring.Pool.IPoolableObjectFactory.MakeObject">
+            <summary>
+            Creates an instance that can be returned by the pool.
+            </summary>
+            <returns>
+            An instance that can be returned by the pool.
+            </returns>
+        </member>
+        <member name="M:Spring.Pool.IPoolableObjectFactory.DestroyObject(System.Object)">
+            <summary>
+            Destroys an instance no longer needed by the pool.
+            </summary>
+            <remarks>
+            <p>
+            Invoked on every instance when it is being "dropped" 
+            from the pool (whether due to the return value from a call to the
+            <see cref="M:Spring.Pool.IPoolableObjectFactory.ValidateObject(System.Object)"/>
+            method, or for reasons specific to the pool implementation.)
+            </p>
+            </remarks>
+            <param name="obj">The instance to be destroyed.</param>
+        </member>
+        <member name="M:Spring.Pool.IPoolableObjectFactory.ValidateObject(System.Object)">
+            <summary>
+            Ensures that the instance is safe to be returned by the pool. 
+            Returns false if this object should be destroyed. 
+            </summary>
+            <remarks>
+            <p>
+            Invoked in an implementation-specific fashion to determine if an 
+            instance is still valid to be returned by the pool. 
+            It will only be invoked on an "activated" instance.
+            </p>
+            </remarks>
+            <param name="obj">The instance to validate.</param>
+            <returns>
+            <see langword="false"/> if this object is not valid and
+            should be dropped from the pool, otherwise <see langword="true"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Pool.IPoolableObjectFactory.ActivateObject(System.Object)">
+            <summary>
+            Reinitialize an instance to be returned by the pool. 
+            </summary>
+            <remarks>
+            <p>
+            Invoked on every instance before it is returned from the pool.
+            </p>
+            </remarks>
+            <param name="obj">The instance to be activated.</param>
+        </member>
+        <member name="M:Spring.Pool.IPoolableObjectFactory.PassivateObject(System.Object)">
+            <summary>
+            Uninitialize an instance to be returned to the pool.
+            </summary>
+            <remarks>
+            <p>
+            Invoked on every instance when it is returned to the pool.
+            </p>
+            </remarks>
+            <param name="obj">The instance returned to the pool.</param>
+        </member>
+        <member name="T:Spring.Objects.Support.MutableSortDefinition">
+            <summary>
+            Mutable implementation of the
+            <see cref="T:Spring.Objects.Support.ISortDefinition"/> interface that
+            supports toggling the ascending value on setting the same property again.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Jean-Pierre Pawlak</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="T:Spring.Objects.Support.ISortDefinition">
+            <summary>
+            Definition for sorting object instances by a property.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="P:Spring.Objects.Support.ISortDefinition.Property">
+            <summary>
+            The name of the property to sort by.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Support.ISortDefinition.IgnoreCase">
+            <summary>
+            Whether upper and lower case in string values should be ignored.
+            </summary>
+            <value>
+            True if the sorting should be performed in a case-insensitive fashion.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Support.ISortDefinition.Ascending">
+            <summary>
+            If the sorting should be ascending or descending.
+            </summary>
+            <value>
+            True if the sorting should be in the ascending order.
+            </value>
+        </member>
+        <member name="M:Spring.Objects.Support.MutableSortDefinition.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.MutableSortDefinition"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Support.MutableSortDefinition.#ctor(Spring.Objects.Support.ISortDefinition)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.MutableSortDefinition"/> class using
+            the specified <see cref="T:Spring.Objects.Support.ISortDefinition"/>.
+            </summary>
+            <param name="source">
+            The <see cref="T:Spring.Objects.Support.ISortDefinition"/> to use
+            as a source for initial property values.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Support.MutableSortDefinition.#ctor(System.String,System.Boolean,System.Boolean)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.MutableSortDefinition"/> class.
+            </summary>
+            <param name="name">
+            The name of the property to sort by.
+            </param>
+            <param name="ignoreCase">
+            Whether upper and lower case in string values should be ignored.
+            </param>
+            <param name="ascending">
+            Whether or not the sorting should be ascending or descending.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Support.MutableSortDefinition.#ctor(System.Boolean)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.MutableSortDefinition"/> class.
+            </summary>
+            <param name="toggleAscendingOnSameProperty">
+            Whether or not the
+            <see cref="P:Spring.Objects.Support.MutableSortDefinition.Ascending"/>
+            property should be toggled if the same name is set on the
+            <see cref="P:Spring.Objects.Support.MutableSortDefinition.Property"/>
+            property.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Support.MutableSortDefinition.Equals(System.Object)">
+            <summary>
+            Overrides the default <see cref="M:System.Object.Equals(System.Object)"/> method
+            </summary>
+            <param name="obj">
+            The object to test against this instance for equality.
+            </param>
+            <returns>
+            True if the supplied <paramref name="obj"/> is equal to this instance.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Support.MutableSortDefinition.GetHashCode">
+            <summary>
+            Overrides the default <see cref="M:System.Object.GetHashCode"/> method.
+            </summary>
+            <returns>The hashcode for this instance.</returns>
+        </member>
+        <member name="P:Spring.Objects.Support.MutableSortDefinition.Property">
+            <summary>
+            The name of the property to sort by.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Support.MutableSortDefinition.IgnoreCase">
+            <summary>
+            Whether upper and lower case in string values should be ignored.
+            </summary>
+            <value>
+            True if the sorting should be performed in a case-insensitive fashion.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Support.MutableSortDefinition.Ascending">
+            <summary>
+            If the sorting should be ascending or descending.
+            </summary>
+            <value>
+            True if the sorting should be in the ascending order.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.Factory.ObjectNotOfRequiredTypeException">
+            <summary>
+            Thrown when an object doesn't match the required <see cref="T:System.Type"/>.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectNotOfRequiredTypeException.#ctor">
+            <summary>
+            Creates a new instance of the ObjectNotOfRequiredTypeException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectNotOfRequiredTypeException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the ObjectNotOfRequiredTypeException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectNotOfRequiredTypeException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the ObjectNotOfRequiredTypeException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectNotOfRequiredTypeException.#ctor(System.String,System.Type,System.Object)">
+            <summary>
+            Creates a new instance of the ObjectNotOfRequiredTypeException class.
+            </summary>
+            <param name="name">
+            Name of the object requested.
+            </param>
+            <param name="requiredType">
+            The required <see cref="T:System.Type"/> of the actual object
+            instance that was retrieved.
+            </param>
+            <param name="actualInstance">
+            The instance actually returned, whose class did not match the
+            expected <see cref="T:System.Type"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectNotOfRequiredTypeException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the ObjectNotOfRequiredTypeException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectNotOfRequiredTypeException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="P:Spring.Objects.Factory.ObjectNotOfRequiredTypeException.ActualType">
+            <summary>
+            The actual <see cref="T:System.Type"/> of the actual object
+            instance that was retrieved.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.ObjectNotOfRequiredTypeException.RequiredType">
+            <summary>
+            The required <see cref="T:System.Type"/> of the actual object
+            instance that was retrieved.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.ObjectNotOfRequiredTypeException.ActualInstance">
+            <summary>
+            The instance actually returned, whose class did not match the
+            expected <see cref="T:System.Type"/>.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.ObjectNotOfRequiredTypeException.ObjectName">
+            <summary>
+            The name of the object requested.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject">
+            <summary>
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> implementation that
+            retrieves a <see lang="static"/> or non-static <b>public</b> property value.
+            </summary>
+            <remarks>
+            <p>
+            Typically used for retrieving <b>public</b> property values.
+            </p>
+            </remarks>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: PropertyRetrievingFactoryObject.cs,v 1.12 2007/07/31 18:16:49 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has set all object properties supplied
+            (and satisfied <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            and ApplicationContextAware).
+            </summary>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as failure to set an essential
+            property) or if initialization fails.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject.CreateInstance">
+            <summary>
+            Template method that subclasses must override to construct the object
+            returned by this factory.
+            </summary>
+            <exception cref="T:System.Exception">
+            If an exception occured during object creation.
+            </exception>
+            <returns>The object returned by this factory.</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject.StaticProperty">
+            <summary>
+            The <see cref="P:System.Type.AssemblyQualifiedName"/> of the static property
+            to be retrieved.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject.Arguments">
+            <summary>
+            Arguments for the property invocation.
+            </summary>
+            <remarks>
+            <p>
+            If this property is not set, or the value passed to the setter invocation
+            is a null or zero-length array, a property with no arguments is assumed.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject.TargetProperty">
+            <summary>
+            The name of the property the value of which is to be retrieved.
+            </summary>
+            <remarks>
+            <p>
+            Refers to either a <see lang="static"/> property or a non-static property,
+            depending on a target object being set.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject.TargetObject">
+            <summary>
+            The object instance on which the property is defined.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject.TargetType">
+            <summary>
+            The <see cref="T:System.Type"/> on which the property is defined.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject.ObjectType">
+            <summary>
+            Return the type of object that this
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> creates, or
+            <see lang="null"/> if not known in advance.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionStoreException">
+            <summary>
+            XML-specific ObjectDefinitionStoreException subclass that wraps a XmlException, which
+            contains information about the error location.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.ObjectDefinitionStoreException">
+            <summary>
+            Thrown when an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            encounters an internal error, and its definitions are invalid.
+            </summary>
+            <remarks>
+            <p>
+            An example of a situation when this exception would be thrown is
+            in the case of an XML document containing object definitions being
+            malformed.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionStoreException.#ctor">
+            <summary>
+            Creates a new instance of the ObjectDefinitionStoreException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionStoreException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the ObjectDefinitionStoreException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionStoreException.#ctor(System.String,System.String,System.String)">
+            <summary>
+            Creates a new instance of the ObjectDefinitionStoreException class.
+            </summary>
+            <param name="resourceDescription">
+            The description of the resource that the object definition came from
+            </param>
+            <param name="name">
+            The name of the object that triggered the exception.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionStoreException.#ctor(System.String,System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Objects.Factory.ObjectDefinitionStoreException"/> class.
+            </summary>
+            <param name="resourceDescription">
+            The description of the resource that the object definition came from
+            </param>
+            <param name="msg">The detail message (used as exception message as-is)</param>
+            <param name="cause">The root cause. (may be <code>null</code></param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionStoreException.#ctor(Spring.Core.IO.IResource,System.String,System.String)">
+            <summary>
+            Creates a new instance of the ObjectDefinitionStoreException class.
+            </summary>
+            <param name="resourceLocation">
+            The resource location (e.g. an XML object definition file) associated
+            with the offending object definition.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="name">
+            The name of the object that triggered the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionStoreException.#ctor(Spring.Core.IO.IResource,System.String,System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the ObjectDefinitionStoreException class.
+            </summary>
+            <param name="resourceLocation">
+            The resource location (e.g. an XML object definition file) associated
+            with the offending object definition.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="name">
+            The name of the object that triggered the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionStoreException.#ctor(System.String,System.String,System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the ObjectDefinitionStoreException class.
+            </summary>
+            <param name="resourceDescription">
+            The description of the resource that the object definition came from
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="name">
+            The name of the object that triggered the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionStoreException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the ObjectDefinitionStoreException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionStoreException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the ObjectDefinitionStoreException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectDefinitionStoreException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="F:Spring.Objects.Factory.ObjectDefinitionStoreException._resourceDescription">
+            <summary>
+            The description of the resource associated with the object
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.ObjectDefinitionStoreException._objectName">
+            <summary>
+            The name of the object that trigger the exception.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.ObjectDefinitionStoreException.ObjectName">
+            <summary>
+            The name of the object that triggered the exception (if any).
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.ObjectDefinitionStoreException.ResourceDescription">
+            <summary>
+            The description of the resource associated with the object (if any).
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectDefinitionStoreException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionStoreException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectDefinitionStoreException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the XmlObjectDefinitionStoreException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectDefinitionStoreException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the XmlObjectDefinitionStoreException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectDefinitionStoreException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the XmlObjectDefinitionStoreException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectDefinitionStoreException.#ctor(System.String,System.String,System.Xml.XmlException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionStoreException"/> class.
+            </summary>
+            <param name="resourceDescription">The description of the resource that the object definition came from</param>
+            <param name="msg">The detail message (used as exception message as-is).</param>
+            <param name="cause">The XmlException root cause.</param>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.XmlObjectDefinitionStoreException.LineNumber">
+            <summary>
+            Gets the line number in the XML resource that failed.
+            </summary>
+            <value>The line number if available (in case of a XmlException); -1 else.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.XmlObjectDefinitionStoreException.LinePosition">
+            <summary>
+            Gets the line position in the XML resource that failed.
+            </summary>
+            <value>The line position if available (in case of a XmlException); -1 else.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.ParserContext">
+            <summary>
+            Context that gets passed along an object definition parsing process, encapsulating
+            all relevant configuraiton as well as state.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ParserContext.#ctor(Spring.Objects.Factory.Xml.XmlReaderContext,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Objects.Factory.Xml.ParserContext"/> class.
+            </summary>
+            <param name="readerContext">The reader context.</param>
+            <param name="parserHelper">The parser helper.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ParserContext.#ctor(Spring.Objects.Factory.Xml.XmlReaderContext,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper,Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Objects.Factory.Xml.ParserContext"/> class.
+            </summary>
+            <param name="readerContext">The reader context.</param>
+            <param name="parserHelper">The parser helper.</param>
+            <param name="containingObjectDefinition">The containing object definition.</param>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.ParserContext.ReaderContext">
+            <summary>
+            Gets the reader context.
+            </summary>
+            <value>The reader context.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.ParserContext.Registry">
+            <summary>
+            Gets the registry.
+            </summary>
+            <value>The registry.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.ParserContext.ParserHelper">
+            <summary>
+            Gets the parser helper.
+            </summary>
+            <value>The parser helper.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.ParserContext.ContainingObjectDefinition">
+            <summary>
+            Gets the containing object definition.
+            </summary>
+            <value>The containing object definition.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.ParserContext.IsNested">
+            <summary>
+            Gets a value indicating whether this instance is nested.
+            </summary>
+            <value><c>true</c> if this instance is nested; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.ParserContext.IsDefaultLazyInit">
+            <summary>
+            Gets a value indicating whether this instance is default lazy init.
+            </summary>
+            <value>
+            	<c>true</c> if this instance is default lazy init; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.TypeAliasConfigurer">
+            <summary>
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            implementation that allows for convenient registration of custom
+            type aliases.
+            </summary>
+            <remarks>
+            Type aliases can be used instead of fully qualified type names anywhere
+            a type name is expected in a Spring.NET configuration file.
+            <p>
+            Because the <see cref="T:Spring.Objects.Factory.Config.TypeAliasConfigurer"/>
+            class implements the
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            interface, instances of this class that have been exposed in the
+            scope of an
+            <see cref="T:Spring.Context.IApplicationContext"/> will
+            <i>automatically</i> be picked up by the application context and made
+            available to the IoC container whenever resolution of type aliases is required. 
+            </p>
+            </remarks>
+            <author>Mark Pollack</author>
+            <version>$Id: TypeAliasConfigurer.cs,v 1.6 2007/07/31 18:16:49 bbaia Exp $</version>
+            <seealso cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>
+            <seealso cref="T:Spring.Context.IApplicationContext"/>	
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.TypeAliasConfigurer.PostProcessObjectFactory(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)">
+            <summary>
+            Registers any type aliases.  The supplied
+            <paramref name="factory"/> is not used since type aliases
+            are registered with a global <see cref="T:Spring.Core.TypeResolution.TypeRegistry"/>
+            </summary>
+            <param name="factory">
+            The object factory.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.TypeAliasConfigurer.TypeAliases">
+            <summary>
+            The type aliases to register.
+            </summary>
+            <remarks>
+            <p>
+            The <see cref="T:System.Collections.IDictionary"/> has the
+            contains the alias name as the key and type as the value.
+            The key name can either be a string or an object, in which case
+            ToString() will be used to obtain the string name.
+            the value can be the fully qualified name of the type as a string or
+            an actual <see cref="T:System.Type"/> of the class that 
+            being aliased.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Globalization.Formatters.PercentFormatter">
+            <summary>
+            Implementation of <see cref="T:Spring.Globalization.IFormatter"/> that can be used to
+            format and parse numbers.
+            </summary>
+            <remarks>
+            <para>
+            <c>PercentFormatter</c> uses percent-related properties of the
+            <see cref="T:System.Globalization.NumberFormatInfo"/> to format and parse percentages. 
+            </para>
+            <para>
+            If you use one of the constructors that accept culture as a parameter
+            to create an instance of <c>PercentFormatter</c>, default <c>NumberFormatInfo</c>
+            for the specified culture will be used.
+            </para>
+            <para>
+            You can also use properties exposed by the <c>PercentFormatter</c> in order
+            to override some of the default number formatting parameters.
+            </para>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: PercentFormatter.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.PercentFormatter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.PercentFormatter"/> class
+            using default <see cref="T:System.Globalization.NumberFormatInfo"/> for the current thread's culture.
+            </summary>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.PercentFormatter.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.PercentFormatter"/> class
+            using default <see cref="T:System.Globalization.NumberFormatInfo"/> for the specified culture.
+            </summary>
+            <param name="cultureName">The culture name.</param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.PercentFormatter.#ctor(System.Globalization.CultureInfo)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.PercentFormatter"/> class
+            using default <see cref="T:System.Globalization.NumberFormatInfo"/> for the specified culture.
+            </summary>
+            <param name="culture">The culture.</param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.PercentFormatter.#ctor(System.Globalization.NumberFormatInfo)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.PercentFormatter"/> class
+            using specified <see cref="T:System.Globalization.NumberFormatInfo"/>.
+            </summary>
+            <param name="formatInfo">
+            The <see cref="T:System.Globalization.NumberFormatInfo"/> instance that defines how 
+            numbers are formatted and parsed.
+            </param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.PercentFormatter.Format(System.Object)">
+            <summary>
+            Formats the specified percentage value.
+            </summary>
+            <param name="value">The value to format.</param>
+            <returns>Formatted percentage.</returns>
+            <exception cref="T:System.ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+            <exception cref="T:System.ArgumentException">If <paramref name="value"/> is not a number.</exception>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.PercentFormatter.Parse(System.String)">
+            <summary>
+            Parses the specified percentage value.
+            </summary>
+            <param name="value">The percentage value to parse.</param>
+            <returns>Parsed percentage value as a <see cref="T:System.Double"/>.</returns>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.PercentFormatter.DecimalDigits">
+            <summary>
+            Gets or sets the number of decimal digits.
+            </summary>
+            <value>The number of decimal digits.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.PercentDecimalDigits"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.PercentFormatter.DecimalSeparator">
+            <summary>
+            Gets or sets the decimal separator.
+            </summary>
+            <value>The decimal separator.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.PercentDecimalSeparator"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.PercentFormatter.GroupSizes">
+            <summary>
+            Gets or sets the percent group sizes.
+            </summary>
+            <value>The percent group sizes.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.PercentGroupSizes"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.PercentFormatter.GroupSeparator">
+            <summary>
+            Gets or sets the percent group separator.
+            </summary>
+            <value>The percent group separator.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.PercentGroupSeparator"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.PercentFormatter.NegativePattern">
+            <summary>
+            Gets or sets the negative pattern.
+            </summary>
+            <value>The percent negative pattern.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.PercentNegativePattern"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.PercentFormatter.PositivePattern">
+            <summary>
+            Gets or sets the positive pattern.
+            </summary>
+            <value>The percent positive pattern.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.PercentPositivePattern"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.PercentFormatter.PercentSymbol">
+            <summary>
+            Gets or sets the percent symbol.
+            </summary>
+            <value>The percent symbol.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.PercentSymbol"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.PercentFormatter.PerMilleSymbol">
+            <summary>
+            Gets or sets the per mille symbol.
+            </summary>
+            <value>The per mille symbol.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.PerMilleSymbol"/>
+        </member>
+        <member name="T:Spring.Expressions.ExpressionEvaluator">
+            <summary>
+            Utility class that enables easy expression evaluation.
+            </summary>
+            <remarks>
+            <p>
+            This class allows users to get or set properties, execute methods, and evaluate
+            logical and arithmetic expressions.
+            </p>
+            <p>
+            Methods in this class parse expression on every invocation.
+            If you plan to reuse the same expression many times, you should prepare
+            the expression once using the static <see cref="M:Spring.Expressions.Expression.Parse(System.String)"/> method,
+            and then call <see cref="M:Spring.Expressions.IExpression.GetValue(System.Object,System.Collections.IDictionary)"/> to evaluate it.
+            </p>
+            <p>
+            This can result in significant performance improvements as it avoids expression
+            parsing and node resolution every time it is called. 
+            </p>
+            <p>
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ExpressionEvaluator.cs,v 1.2 2006/04/09 07:18:39 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.ExpressionEvaluator.GetValue(System.Object,System.String)">
+            <summary>
+            Parses and evaluates specified expression.
+            </summary>
+            <param name="root">Root object.</param>
+            <param name="expression">Expression to evaluate.</param>
+            <returns>Value of the last node in the expression.</returns>
+        </member>
+        <member name="M:Spring.Expressions.ExpressionEvaluator.GetValue(System.Object,System.String,System.Collections.IDictionary)">
+            <summary>
+            Parses and evaluates specified expression.
+            </summary>
+            <param name="root">Root object.</param>
+            <param name="expression">Expression to evaluate.</param>
+            <param name="variables">Expression variables map.</param>
+            <returns>Value of the last node in the expression.</returns>
+        </member>
+        <member name="M:Spring.Expressions.ExpressionEvaluator.SetValue(System.Object,System.String,System.Object)">
+            <summary>
+            Parses and specified expression and sets the value of the
+            last node to the value of the <c>newValue</c> parameter.
+            </summary>
+            <param name="root">Root object.</param>
+            <param name="expression">Expression to evaluate.</param>
+            <param name="newValue">Value to set last node to.</param>
+        </member>
+        <member name="M:Spring.Expressions.ExpressionEvaluator.SetValue(System.Object,System.String,System.Collections.IDictionary,System.Object)">
+            <summary>
+            Parses and specified expression and sets the value of the
+            last node to the value of the <c>newValue</c> parameter.
+            </summary>
+            <param name="root">Root object.</param>
+            <param name="expression">Expression to evaluate.</param>
+            <param name="variables">Expression variables map.</param>
+            <param name="newValue">Value to set last node to.</param>
+        </member>
+        <member name="T:Spring.Expressions.LocalFunctionNode">
+            <summary>
+            Represents local function node.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: LocalFunctionNode.cs,v 1.7 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.LocalFunctionNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.LocalFunctionNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.LocalFunctionNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Evaluates function represented by this node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Result of the function evaluation.</returns>
+        </member>
+        <member name="T:Spring.DataBinding.IDataBound">
+            <summary>
+            Interface that should be implemented by data bound objects, such as 
+            web pages, user controls, windows forms, etc.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IDataBound.cs,v 1.3 2006/11/21 05:46:57 aseovic Exp $</version>
+        </member>
+        <member name="P:Spring.DataBinding.IDataBound.BindingManager">
+            <summary>
+            Gets the binding manager.
+            </summary>
+            <value>The binding manager.</value>
+        </member>
+        <member name="T:Spring.Core.TypeResolution.TypeRegistry">
+            <summary> 
+            Provides access to a central registry of aliased <see cref="T:System.Type"/>s.
+            </summary>
+            <remarks>
+            <p>
+            Simplifies configuration by allowing aliases to be used instead of
+            fully qualified type names.
+            </p>
+            <p>
+            Comes 'pre-loaded' with a number of convenience alias' for the more
+            common types; an example would be the '<c>int</c>' (or '<c>Integer</c>'
+            for Visual Basic.NET developers) alias for the <see cref="T:System.Int32"/>
+            type.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <seealso cref="T:Spring.Context.Support.TypeAliasesSectionHandler"/>
+            <version>$Id: TypeRegistry.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.TypeAliasesSectionName">
+            <summary>
+            Name of the .Net config section that contains Spring.Net type aliases.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.Int32Alias">
+            <summary>
+            The alias around the 'int' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.Int32AliasVB">
+            <summary>
+            The alias around the 'Integer' type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.Int32ArrayAlias">
+            <summary>
+            The alias around the 'int[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.Int32ArrayAliasVB">
+            <summary>
+            The alias around the 'Integer()' array type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DecimalAlias">
+            <summary>
+            The alias around the 'decimal' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DecimalAliasVB">
+            <summary>
+            The alias around the 'Decimal' type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DecimalArrayAlias">
+            <summary>
+            The alias around the 'decimal[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DecimalArrayAliasVB">
+            <summary>
+            The alias around the 'Decimal()' array type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.CharAlias">
+            <summary>
+            The alias around the 'char' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.CharAliasVB">
+            <summary>
+            The alias around the 'Char' type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.CharArrayAlias">
+            <summary>
+            The alias around the 'char[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.CharArrayAliasVB">
+            <summary>
+            The alias around the 'Char()' array type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.Int64Alias">
+            <summary>
+            The alias around the 'long' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.Int64AliasVB">
+            <summary>
+            The alias around the 'Long' type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.Int64ArrayAlias">
+            <summary>
+            The alias around the 'long[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.Int64ArrayAliasVB">
+            <summary>
+            The alias around the 'Long()' array type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.Int16Alias">
+            <summary>
+            The alias around the 'short' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.Int16AliasVB">
+            <summary>
+            The alias around the 'Short' type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.Int16ArrayAlias">
+            <summary>
+            The alias around the 'short[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.Int16ArrayAliasVB">
+            <summary>
+            The alias around the 'Short()' array type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.UInt32Alias">
+            <summary>
+            The alias around the 'unsigned int' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.UInt64Alias">
+            <summary>
+            The alias around the 'unsigned long' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.UInt64ArrayAlias">
+            <summary>
+            The alias around the 'ulong[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.UInt32ArrayAlias">
+            <summary>
+            The alias around the 'uint[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.UInt16Alias">
+            <summary>
+            The alias around the 'unsigned short' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.UInt16ArrayAlias">
+            <summary>
+            The alias around the 'ushort[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DoubleAlias">
+            <summary>
+            The alias around the 'double' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DoubleAliasVB">
+            <summary>
+            The alias around the 'Double' type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DoubleArrayAlias">
+            <summary>
+            The alias around the 'double[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DoubleArrayAliasVB">
+            <summary>
+            The alias around the 'Double()' array type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.FloatAlias">
+            <summary>
+            The alias around the 'float' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.SingleAlias">
+            <summary>
+            The alias around the 'Single' type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.FloatArrayAlias">
+            <summary>
+            The alias around the 'float[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.SingleArrayAliasVB">
+            <summary>
+            The alias around the 'Single()' array type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DateTimeAlias">
+            <summary>
+            The alias around the 'DateTime' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DateAlias">
+            <summary>
+            The alias around the 'DateTime' type (C# style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DateAliasVB">
+            <summary>
+            The alias around the 'DateTime' type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DateTimeArrayAlias">
+            <summary>
+            The alias around the 'DateTime[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DateTimeArrayAliasCSharp">
+            <summary>
+            The alias around the 'DateTime[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.DateTimeArrayAliasVB">
+            <summary>
+            The alias around the 'DateTime()' array type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.BoolAlias">
+            <summary>
+            The alias around the 'bool' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.BoolAliasVB">
+            <summary>
+            The alias around the 'Boolean' type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.BoolArrayAlias">
+            <summary>
+            The alias around the 'bool[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.BoolArrayAliasVB">
+            <summary>
+            The alias around the 'Boolean()' array type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.StringAlias">
+            <summary>
+            The alias around the 'string' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.StringAliasVB">
+            <summary>
+            The alias around the 'string' type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.StringArrayAlias">
+            <summary>
+            The alias around the 'string[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.StringArrayAliasVB">
+            <summary>
+            The alias around the 'string[]' array type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.ObjectAlias">
+            <summary>
+            The alias around the 'object' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.ObjectAliasVB">
+            <summary>
+            The alias around the 'object' type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.ObjectArrayAlias">
+            <summary>
+            The alias around the 'object[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.ObjectArrayAliasVB">
+            <summary>
+            The alias around the 'object[]' array type (Visual Basic.NET style).
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableInt32Alias">
+            <summary>
+            The alias around the 'int?' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableInt32ArrayAlias">
+            <summary>
+            The alias around the 'int?[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableDecimalAlias">
+            <summary>
+            The alias around the 'decimal?' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableDecimalArrayAlias">
+            <summary>
+            The alias around the 'decimal?[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableCharAlias">
+            <summary>
+            The alias around the 'char?' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableCharArrayAlias">
+            <summary>
+            The alias around the 'char?[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableInt64Alias">
+            <summary>
+            The alias around the 'long?' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableInt64ArrayAlias">
+            <summary>
+            The alias around the 'long?[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableInt16Alias">
+            <summary>
+            The alias around the 'short?' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableInt16ArrayAlias">
+            <summary>
+            The alias around the 'short?[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableUInt32Alias">
+            <summary>
+            The alias around the 'unsigned int?' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableUInt64Alias">
+            <summary>
+            The alias around the 'unsigned long?' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableUInt64ArrayAlias">
+            <summary>
+            The alias around the 'ulong?[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableUInt32ArrayAlias">
+            <summary>
+            The alias around the 'uint?[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableUInt16Alias">
+            <summary>
+            The alias around the 'unsigned short?' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableUInt16ArrayAlias">
+            <summary>
+            The alias around the 'ushort?[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableDoubleAlias">
+            <summary>
+            The alias around the 'double?' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableDoubleArrayAlias">
+            <summary>
+            The alias around the 'double?[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableFloatAlias">
+            <summary>
+            The alias around the 'float?' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableFloatArrayAlias">
+            <summary>
+            The alias around the 'float?[]' array type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableBoolAlias">
+            <summary>
+            The alias around the 'bool?' type.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.TypeRegistry.NullableBoolArrayAlias">
+            <summary>
+            The alias around the 'bool?[]' array type.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeRegistry.#cctor">
+            <summary>
+            Registers standard and user-configured type aliases.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeRegistry.RegisterType(System.String,System.String)">
+            <summary> 
+            Registers an alias for the specified <see cref="T:System.Type"/>. 
+            </summary>
+            <remarks>
+            <p>
+            This overload does eager resolution of the <see cref="T:System.Type"/>
+            referred to by the <paramref name="typeName"/> parameter. It will throw a
+            <see cref="T:System.TypeLoadException"/> if the <see cref="T:System.Type"/> referred
+            to by the <paramref name="typeName"/> parameter cannot be resolved.
+            </p>
+            </remarks>
+            <param name="alias">
+            A string that will be used as an alias for the specified
+            <see cref="T:System.Type"/>.
+            </param>
+            <param name="typeName">
+            The (possibly partially assembly qualified) name of the
+            <see cref="T:System.Type"/> to register the alias for.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If either of the supplied parameters is <see langword="null"/> or
+            contains only whitespace character(s).
+            </exception>
+            <exception cref="T:System.TypeLoadException">
+            If the <see cref="T:System.Type"/> referred to by the supplied
+            <paramref name="typeName"/> cannot be loaded.
+            </exception>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeRegistry.RegisterType(System.Type)">
+            <summary> 
+            Registers short type name as an alias for 
+            the supplied <see cref="T:System.Type"/>. 
+            </summary> 
+            <param name="type">
+            The <see cref="T:System.Type"/> to register.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="type"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeRegistry.RegisterType(System.String,System.Type)">
+            <summary> 
+            Registers an alias for the supplied <see cref="T:System.Type"/>. 
+            </summary> 
+            <param name="alias">
+            The alias for the supplied <see cref="T:System.Type"/>.
+            </param>
+            <param name="type">
+            The <see cref="T:System.Type"/> to register the supplied <paramref name="alias"/> under.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="type"/> is <see langword="null"/>; or if
+            the supplied <paramref name="alias"/> is <see langword="null"/> or
+            contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeRegistry.ResolveType(System.String)">
+            <summary> 
+            Resolves the supplied <paramref name="alias"/> to a <see cref="T:System.Type"/>. 
+            </summary> 
+            <param name="alias">
+            The alias to resolve.
+            </param>
+            <returns>
+            The <see cref="T:System.Type"/> the supplied <paramref name="alias"/> was
+            associated with, or <see lang="null"/> if no <see cref="T:System.Type"/> 
+            was previously registered for the supplied <paramref name="alias"/>.
+            </returns>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="alias"/> is <see langword="null"/> or
+            contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.TypeRegistry.ContainsAlias(System.String)">
+            <summary>
+            Returns a flag specifying whether <b>TypeRegistry</b> contains
+            specified alias or not.
+            </summary>
+            <param name="alias">
+            Alias to check.
+            </param>
+            <returns>
+            <c>true</c> if the specified type alias is registered, 
+            <c>false</c> otherwise.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.TypeResolution.GenericTypeResolver">
+            <summary>
+            Resolves a generic <see cref="T:System.Type"/> by name.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: GenericTypeResolver.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.GenericTypeResolver.Resolve(System.String)">
+            <summary>
+            Resolves the supplied generic <paramref name="typeName"/> to a
+            <see cref="T:System.Type"/> instance.
+            </summary>
+            <param name="typeName">
+            The unresolved (possibly generic) name of a <see cref="T:System.Type"/>.
+            </param>
+            <returns>
+            A resolved <see cref="T:System.Type"/> instance.
+            </returns>
+            <exception cref="T:System.TypeLoadException">
+            If the supplied <paramref name="typeName"/> could not be resolved
+            to a <see cref="T:System.Type"/>.
+            </exception>
+        </member>
+        <member name="T:Spring.Core.NotReadablePropertyException">
+            <summary>
+            Thrown in response to a failed attempt to read a property.
+            </summary>
+            <remarks>
+            <p>
+            Typically thrown when attempting to read the value of a write-only
+            property via reflection.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: NotReadablePropertyException.cs,v 1.2 2007/07/31 00:26:30 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Core.InvalidPropertyException">
+            <summary>
+            Thrown in response to referring to an invalid property (most often via reflection).
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: InvalidPropertyException.cs,v 1.2 2007/07/31 03:47:22 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Core.InvalidPropertyException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.InvalidPropertyException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.InvalidPropertyException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.InvalidPropertyException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Core.InvalidPropertyException.#ctor(System.Type,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.InvalidPropertyException"/> class.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> that is (or rather was) the source of the
+            offending property.
+            </param>
+            <param name="propertyName">
+            The name of the offending property.
+            </param>
+        </member>
+        <member name="M:Spring.Core.InvalidPropertyException.#ctor(System.Type,System.String,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.InvalidPropertyException"/> class.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> that is (or rather was) the source of the
+            offending property.
+            </param>
+            <param name="propertyName">
+            The name of the offending property.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Core.InvalidPropertyException.#ctor(System.Type,System.String,System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the InvalidPropertyException class.
+            </summary>
+            <param name="offendingType">
+            The <see cref="T:System.Type"/> that is (or rather was) the source of the
+            offending property.
+            </param>
+            <param name="offendingProperty">
+            The name of the offending property.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Core.InvalidPropertyException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.InvalidPropertyException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Core.InvalidPropertyException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.InvalidPropertyException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Core.InvalidPropertyException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="P:Spring.Core.InvalidPropertyException.ObjectType">
+            <summary>
+            The <see cref="T:System.Type"/> that is (or rather was) the source of the
+            offending property.
+            </summary>
+        </member>
+        <member name="P:Spring.Core.InvalidPropertyException.OffendingPropertyName">
+            <summary>
+            The name of the offending property.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.NotReadablePropertyException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.NotReadablePropertyException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.NotReadablePropertyException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.NotReadablePropertyException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Core.NotReadablePropertyException.#ctor(System.Type,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.NotReadablePropertyException"/> class.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> that is (or rather was) the source of the
+            offending property.
+            </param>
+            <param name="propertyName">
+            The name of the offending property.
+            </param>
+        </member>
+        <member name="M:Spring.Core.NotReadablePropertyException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.NotReadablePropertyException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Core.NotReadablePropertyException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.NotReadablePropertyException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Core.CriteriaMemberFilter">
+            <summary>
+            Convenience class that exposes a signature that matches the
+            <see cref="T:System.Reflection.MemberFilter"/> delegate.
+            </summary>
+            <remarks>
+            <p>
+            Useful when filtering <see cref="T:System.Type"/> members via the
+            <see cref="T:Spring.Core.ICriteria"/> mechanism.
+            </p>
+            </remarks>
+            <author>Rick Evans</author>
+            <version>$Id: CriteriaMemberFilter.cs,v 1.1 2007/07/31 21:43:52 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Core.CriteriaMemberFilter.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.CriteriaMemberFilter"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.CriteriaMemberFilter.FilterMemberByCriteria(System.Reflection.MemberInfo,System.Object)">
+            <summary>
+            Returns true if the supplied <see cref="T:System.Reflection.MemberInfo"/> instance
+            satisfies the supplied <paramref name="filterCriteria"/> (which must be an
+            <see cref="T:Spring.Core.ICriteria"/> implementation).
+            </summary>
+            <param name="member">
+            The <see cref="T:System.Reflection.MemberInfo"/> instance that will be checked to see if
+            it matches the supplied <paramref name="filterCriteria"/>.
+            </param>
+            <param name="filterCriteria">
+            The criteria against which to filter the supplied
+            <see cref="T:System.Reflection.MemberInfo"/> instance.
+            </param>
+            <returns>
+            True if the supplied <see cref="T:System.Reflection.MemberInfo"/> instance
+            satisfies the supplied <paramref name="filterCriteria"/> (which must be an
+            <see cref="T:Spring.Core.ICriteria"/> implementation); false if not or the
+            supplied <paramref name="filterCriteria"/> is not an
+            <see cref="T:Spring.Core.ICriteria"/> implementation or is null.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.IO.ResourceConverter">
+            <summary>
+            Custom type converter for <see cref="T:Spring.Core.IO.IResource"/> instances.
+            </summary>
+            <remarks>
+            <p>
+            A resource path may contain placeholder variables of the form <c>${...}</c>
+            that will be expended to <b>environment variables</b>.
+            </p>
+            <p>
+            Currently only supports conversion from a <see cref="T:System.String"/>
+            instance.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            On Win9x boxes, this resource path, <c>${userprofile}\objects.xml</c> will
+            be expanded at runtime with the value of the <c>'userprofile'</c> environment
+            variable substituted for the <c>'${userprofile}'</c> portion of the path.
+            </p>
+            <code escaped="true">
+            // assuming a user called Rick, running on a plain vanilla Windows XP setup...
+            // this resource path...
+            
+            ${userprofile}\objects.xml
+            
+            // will become (after expansion)...
+            
+            C:\Documents and Settings\Rick\objects.xml
+            </code>
+            </example>
+            <author>Mark Pollack</author>
+            <version>$Id: ResourceConverter.cs,v 1.14 2007/08/08 17:46:55 bbaia Exp $</version>
+            <seealso cref="T:Spring.Core.IO.IResourceLoader"/>
+            <seealso cref="T:System.ComponentModel.TypeConverter"/>
+        </member>
+        <member name="M:Spring.Core.IO.ResourceConverter.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.IO.ResourceConverter"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.IO.ResourceConverter.#ctor(Spring.Core.IO.IResourceLoader)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.IO.ResourceConverter"/> class using the specified resourceLoader.
+            </summary>
+            <param name="resourceLoader">the underlying IResourceLoader to be used to resolve resources</param>
+        </member>
+        <member name="M:Spring.Core.IO.ResourceConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Returns whether this converter can convert an object of one
+            <see cref="T:System.Type"/> to a <see cref="T:Spring.Core.IO.IResource"/>
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns>
+            <see langword="true"/> if the conversion is possible.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.ResourceConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Convert from a string value to a
+            <see cref="T:Spring.Core.IO.IResource"/> instance.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture. 
+            </param>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <returns>
+            An <see cref="T:Spring.Core.IO.IResource"/> if successful. 
+            </returns>
+            <exception cref="T:System.UriFormatException">
+            If the resource name objectained form the supplied
+            <paramref name="value"/> is malformed.
+            </exception>
+            <exception cref="T:System.Exception">
+            In the case of any errors arising from the instantiation of the
+            returned <see cref="T:Spring.Core.IO.IResource"/> instance.
+            </exception>
+        </member>
+        <member name="M:Spring.Core.IO.ResourceConverter.ResolvePath(System.String)">
+            <summary>
+            Resolve the given path, replacing placeholder values with
+            corresponding property values if necessary.
+            </summary>
+            <remarks>
+            <p>
+            This implementation resolves environment variables only.
+            </p>
+            </remarks>
+            <param name="path">The original resource path.</param>
+            <returns>The resolved resource path.</returns>
+        </member>
+        <member name="M:Spring.Core.IO.ResourceConverter.GetResourceLoader">
+            <summary>
+            Return the <see cref="T:Spring.Core.IO.IResourceLoader"/> used to
+            resolve the string.
+            </summary>
+            <returns>
+            The <see cref="T:Spring.Core.IO.IResourceLoader"/> used to resolve
+            the string.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.ComposedCriteria">
+            <summary>
+            A <see cref="T:Spring.Core.ICriteria"/> implementation that represents
+            a composed collection of <see cref="T:Spring.Core.ICriteria"/> instances.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.ComposedCriteria.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.ComposedCriteria"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.ComposedCriteria.#ctor(Spring.Core.ICriteria)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.ComposedCriteria"/> class.
+            </summary>
+            <param name="criteria">
+            A user-defined (child) criteria that will be composed into this instance.
+            </param>
+        </member>
+        <member name="M:Spring.Core.ComposedCriteria.IsSatisfied(System.Object)">
+            <summary>
+            Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+            this instance?
+            </summary>
+            <param name="datum">The data to be checked by this criteria instance.</param>
+            <returns>
+            True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+            by this instance; false if not or the supplied <paramref name="datum"/> is null.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.ComposedCriteria.Add(Spring.Core.ICriteria)">
+            <summary>
+            Adds the supplied <parameref name="criteria"/> into the criteria
+            composed within this instance.
+            </summary>
+            <param name="criteria">
+            The <see cref="T:Spring.Core.ICriteria"/> to be added.
+            </param>
+        </member>
+        <member name="P:Spring.Core.ComposedCriteria.Criteria">
+            <summary>
+            The list of <see cref="T:Spring.Core.ICriteria"/> composing this
+            instance.
+            </summary>
+        </member>
+        <member name="T:Spring.Context.ApplicationContextException">
+            <summary>Exception thrown during application context initialization.</summary>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ApplicationContextException.cs,v 1.5 2006/04/09 07:18:38 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Context.ApplicationContextException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.ApplicationContextException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.ApplicationContextException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.ApplicationContextException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Context.ApplicationContextException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.ApplicationContextException"/> class with the
+            specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Context.ApplicationContextException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.ApplicationContextException"/> class with the
+            specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="T:Spring.Collections.ListSet">
+            <summary>
+            Implements a <see cref="T:Spring.Collections.ISet"/> based on a list.
+            </summary>
+            <remarks>
+            <p>
+            Performance is much better for very small lists than either
+            <see cref="T:Spring.Collections.HashedSet"/> or <see cref="T:Spring.Collections.SortedSet"/>.
+            However, performance degrades rapidly as the data-set gets bigger. Use a
+            <see cref="T:Spring.Collections.HybridSet"/> instead if you are not sure your data-set
+            will always remain very small. Iteration produces elements in the order they were added.
+            However, element order is not guaranteed to be maintained by the various
+            <see cref="T:Spring.Collections.ISet"/> mathematical operators.  
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Collections.ListSet.#ctor">
+            <summary>
+            Creates a new set instance based on a list.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.ListSet.#ctor(System.Collections.ICollection)">
+            <summary>
+            Creates a new set instance based on a list and initializes it based on a
+            collection of elements.
+            </summary>
+            <param name="initialValues">
+            A collection of elements that defines the initial set contents.
+            </param>
+        </member>
+        <member name="T:Spring.Validation.Validators.UrlValidator">
+            <summary>
+            Validates that the value is valid URL.
+            </summary>
+            <author>Goran Milosavljevic</author>
+        </member>
+        <member name="M:Spring.Validation.Validators.UrlValidator.#ctor">
+            <summary>
+            Creates a new instance of the <b>UrlValidator</b> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.Validators.UrlValidator.#ctor(System.String,System.String)">
+            <summary>
+            Creates a new instance of the <b>UrlValidator</b> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.Validators.UrlValidator.#ctor(Spring.Expressions.IExpression,Spring.Expressions.IExpression)">
+            <summary>
+            Creates a new instance of the <b>UrlValidator</b> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.Validators.UrlValidator.Validate(System.Object)">
+            <summary>
+            Validates the supplied <paramref name="objectToValidate"/>.
+            </summary>
+            <remarks>
+            In the case of the <see cref="T:Spring.Validation.Validators.UrlValidator"/> class,
+            the test should be a string variable that will be evaluated and the object
+            obtained as a result of this evaluation will be tested using the URL validation rules.
+            </remarks>
+            <param name="objectToValidate">The object to validate.</param>
+            <returns>
+            <see lang="true"/> if the supplied <paramref name="objectToValidate"/> is valid.
+            </returns>
+        </member>
+        <member name="F:Spring.Validation.Validators.UrlValidator.urlCheck">
+            <summary>
+            Regular expression used for validation of object passed to this <see cref="T:Spring.Validation.Validators.UrlValidator"/>.
+            </summary>
+        </member>
+        <member name="T:Spring.Util.ReflectionUtils">
+            <summary>
+            Various reflection related methods that are missing from the standard library.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <author>Stan Dvoychenko (.NET)</author>
+            <author>Bruno Baia (.NET)</author>
+            <version>$Id: ReflectionUtils.cs,v 1.59 2008/05/13 14:22:46 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Util.ReflectionUtils.AllMembersCaseInsensitiveFlags">
+            <summary>
+            Convenience <see cref="T:System.Reflection.BindingFlags"/> value that will
+            match all private and public, static and instance members on a class
+            in a case inSenSItivE fashion.
+            </summary>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetSignature(System.Type,System.String,System.Type[])">
+            <summary>
+            Returns signature for the specified <see cref="T:System.Type"/>, method name and argument
+            <see cref="T:System.Type"/>s.
+            </summary>
+            <param name="type">The <see cref="T:System.Type"/> the method is in.</param>
+            <param name="method">The method name.</param>
+            <param name="argumentTypes">
+            The argument <see cref="T:System.Type"/>s.
+            </param>
+            <returns>The method signature.</returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetMethod(System.Type,System.String,System.Type[])">
+            <summary>
+            Returns method for the specified <see cref="T:System.Type"/>, method
+            name and argument
+            <see cref="T:System.Type"/>s.
+            </summary>
+            <remarks>Searches with BindingFlags  </remarks>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/> to find the method on.
+            </param>
+            <param name="method">The method to find.</param>
+            <param name="argumentTypes">
+            The argument <see cref="T:System.Type"/>s. May be
+            <see langword="null"/> if the method has no arguments.
+            </param>
+            <returns>The target method.</returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetParameterTypes(System.Reflection.MethodBase)">
+            <summary>
+            Returns an array of parameter <see cref="T:System.Type"/>s for the specified method
+            or constructor.
+            </summary>
+            <param name="method">The method (or constructor).</param>
+            <returns>An array containing the parameter <see cref="T:System.Type"/>s.</returns>
+            <exception cref="T:System.ArgumentNullException">
+            If <paramref name="method"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetParameterTypes(System.Reflection.ParameterInfo[])">
+            <summary>
+            Returns an array of parameter <see cref="T:System.Type"/>s for the
+            specified parameter info array.
+            </summary>
+            <param name="args">The parameter info array.</param>
+            <returns>An array containing parameter <see cref="T:System.Type"/>s.</returns>
+            <exception cref="T:System.ArgumentNullException">
+            If <paramref name="args"/> is <see langword="null"/> or any of the
+            elements <paramref name="args"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetGenericParameterNames(System.Reflection.MethodInfo)">
+            <summary>
+            Returns an array of <see langword="string"/>s that represent 
+            the names of the generic type parameter.
+            </summary>
+            <param name="method">The method.</param>
+            <returns>An array containing the parameter names.</returns>
+            <exception cref="T:System.ArgumentNullException">
+            If <paramref name="method"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetGenericParameterNames(System.Type[])">
+            <summary>
+            Returns an array of <see langword="string"/>s that represent 
+            the names of the generic type parameter.
+            </summary>
+            <param name="args">The parameter info array.</param>
+            <returns>An array containing parameter names.</returns>
+            <exception cref="T:System.ArgumentNullException">
+            If <paramref name="args"/> is <see langword="null"/> or any of the
+            elements <paramref name="args"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetMethodByArgumentValues(System.Reflection.MethodInfo[],System.Object[])">
+            <summary>
+            From a given list of methods, selects the method having an exact match on the given <paramref name="argValues"/>' types.
+            </summary>
+            <param name="methods">the list of methods to choose from</param>
+            <param name="argValues">the arguments to the method</param>
+            <returns>the method matching exactly the passed <paramref name="argValues"/>' types</returns>
+            <exception cref="T:System.Reflection.AmbiguousMatchException">
+            If more than 1 matching methods are found in the <paramref name="methods"/> list.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetMethodBaseByArgumentValues(System.String,System.Reflection.MethodBase[],System.Object[])">
+            <summary>
+            From a given list of methods, selects the method having an exact match on the given <paramref name="argValues"/>' types.
+            </summary>
+            <param name="methodTypeName">the type of method (used for exception reporting only)</param>
+            <param name="methods">the list of methods to choose from</param>
+            <param name="argValues">the arguments to the method</param>
+            <returns>the method matching exactly the passed <paramref name="argValues"/>' types</returns>
+            <exception cref="T:System.Reflection.AmbiguousMatchException">
+            If more than 1 matching methods are found in the <paramref name="methods"/> list.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetConstructorByArgumentValues(System.Reflection.ConstructorInfo[],System.Object[])">
+            <summary>
+            From a given list of constructors, selects the constructor having an exact match on the given <paramref name="argValues"/>' types.
+            </summary>
+            <param name="methods">the list of constructors to choose from</param>
+            <param name="argValues">the arguments to the method</param>
+            <returns>the constructor matching exactly the passed <paramref name="argValues"/>' types</returns>
+            <exception cref="T:System.Reflection.AmbiguousMatchException">
+            If more than 1 matching methods are found in the <paramref name="methods"/> list.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.PackageParamArray(System.Object[],System.Int32,System.Type)">
+            <summary>
+            Packages arguments into argument list containing parameter array as a last argument.
+            </summary>
+            <param name="argValues">Argument vaklues to package.</param>
+            <param name="argCount">Total number of oarameters.</param>
+            <param name="elementType">Type of the param array element.</param>
+            <returns>Packaged arguments.</returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.ToInterfaceArray(System.Type)">
+            <summary>
+            Convenience method to convert an interface <see cref="T:System.Type"/> 
+            to a <see cref="T:System.Type"/> array that contains 
+            all the interfaces inherited and the specified interface.
+            </summary>
+            <param name="intf">The interface to convert.</param>
+            <returns>An array of interface <see cref="T:System.Type"/>s.</returns>
+            <exception cref="T:System.ArgumentException">
+            If the <see cref="T:System.Type"/> specified is not an interface.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If <paramref name="intf"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.PropertyIsIndexer(System.String,System.Type)">
+            <summary>
+            Is the supplied <paramref name="propertyName"/> the default indexer for the
+            supplied <paramref name="type"/>?
+            </summary>
+            <param name="propertyName">
+            The name of the property on the supplied <paramref name="type"/> to be checked.
+            </param>
+            <param name="type">
+            The <see cref="T:System.Type"/>  to be checked.
+            </param>
+            <returns>
+            <see lang="true"/> if the supplied <paramref name="propertyName"/> is the
+            default indexer for the supplied <paramref name="type"/>.
+            </returns>
+            <exception cref="T:System.NullReferenceException">
+            If the supplied <paramref name="type"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.MethodIsOnOneOfTheseInterfaces(System.Reflection.MethodBase,System.Type[])">
+            <summary>
+            Is the supplied <paramref name="method"/> declared on one of these interfaces?
+            </summary>
+            <param name="method">The method to check.</param>
+            <param name="interfaces">The array of interfaces we want to check.</param>
+            <returns>
+            <see lang="true"/> if the method is declared on one of these interfaces.
+            </returns>
+            <exception cref="T:System.ArgumentException">
+            If any of the <see cref="T:System.Type"/>s specified is not an interface.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If <paramref name="method"/> or any of the specified interfaces is
+            <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetDefaultValue(System.Type)">
+            <summary>
+            Returns the default value for the specified <see cref="T:System.Type"/>
+            </summary>
+            <remarks>
+            <p>
+            Follows the standard .NET conventions for default values where
+            relevant; for example, all numeric types default to the value
+            <c>0</c>.
+            </p>
+            </remarks>
+            <param name="type">
+            The <see cref="T:System.Type"/> to return default value for.
+            </param>
+            <returns>
+            The default value for the specified <see cref="T:System.Type"/>.
+            </returns>
+            <exception cref="T:System.ArgumentException">
+            If the supplied <paramref name="type"/> is an enumerated type that
+            has no values.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetDefaultValues(System.Type[])">
+            <summary>
+            Returns an array consisting of the default values for the supplied
+            <paramref name="types"/>.
+            </summary>
+            <param name="types">
+            The array of <see cref="T:System.Type"/>s to return default values for.
+            </param>
+            <returns>
+            An array consisting of the default values for the supplied
+            <paramref name="types"/>.
+            </returns>
+            <exception cref="T:System.ArgumentException">
+            If any of the elements in the supplied <paramref name="types"/>
+            array is an enumerated type that has no values.
+            </exception>
+            <seealso cref="M:Spring.Util.ReflectionUtils.GetDefaultValue(System.Type)"/>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.ParameterTypesMatch(System.Reflection.MethodInfo,System.Type[])">
+            <summary>
+            Checks that the parameter <see cref="T:System.Type"/>s of the
+            supplied <paramref name="candidate"/> match the parameter
+            <see cref="T:System.Type"/>s of the supplied
+            <paramref name="parameterTypes"/>.
+            </summary>
+            <param name="candidate">The method to be checked.</param>
+            <param name="parameterTypes">
+            The array of parameter <see cref="T:System.Type"/>s to check against.
+            </param>
+            <returns>
+            <see langword="true"/> if the parameter <see cref="T:System.Type"/>s
+            match.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetTypes(System.Object[])">
+            <summary>
+            Returns an array containing the <see cref="T:System.Type"/>s of the
+            objects in the supplied array.
+            </summary>
+            <param name="args">
+            The objects array for which the corresponding <see cref="T:System.Type"/>s
+            are needed.
+            </param>
+            <returns>
+            An array containing the <see cref="T:System.Type"/>s of the objects
+            in the supplied array; this array will be empty (but not
+            <see langword="null"/> if the supplied <paramref name="args"/>
+            is null or has no elements.
+            </returns>
+            <example>
+            <p>
+            [C#]<br/>
+            Given an array containing the following objects,
+            <code>[83, "Foo", new object ()]</code>, the <see cref="T:System.Type"/>
+            array returned from this method call would consist of the following
+            <see cref="T:System.Type"/> elements...
+            <code>[Int32, String, Object]</code>.
+            </p>
+            </example>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.HasAtLeastOneMethodWithName(System.Type,System.String)">
+            <summary>
+            Does the given <see cref="T:System.Type"/> and/or it's superclasses
+            have at least one or more methods with the given name (with any
+            argument types)?
+            </summary>
+            <remarks>
+            <p>
+            Includes non-public methods in the methods searched.
+            </p>
+            </remarks>
+            <param name="type">
+            The <see cref="T:System.Type"/> to be checked.
+            </param>
+            <param name="name">
+            The name of the method to be searched for. Case inSenSItivE.
+            </param>
+            <returns>
+            <see langword="true"/> if the given <see cref="T:System.Type"/> or / and it's
+            superclasses have at least one or more methods (with any argument types);
+            <see langword="false"/> if not, or either of the parameters is <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.MethodCountForName(System.Type,System.String)">
+            <summary>
+             Within <paramref name="type"/>, counts the number of overloads for the method with the given (case-insensitive!) <paramref name="name"/> 
+            </summary>
+            <param name="type">The type to be searched</param>
+            <param name="name">the name of the method for which overloads shall be counted</param>
+            <returns>The number of overloads for method <paramref name="name"/> within type <paramref name="type"/></returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.CreateCustomAttribute(System.Type,System.Object[],System.Attribute)">
+            <summary>
+            Creates a <see cref="T:System.Reflection.Emit.CustomAttributeBuilder"/>.
+            </summary>
+            <remarks>
+            <p>
+            Note that if a non-<see langword="null"/> <paramref name="sourceAttribute"/>
+            is supplied, any read write properties exposed by the <paramref name="sourceAttribute"/>
+            will be used to overwrite values that may have been passed in via the
+            <paramref name="ctorArgs"/>. That is, the <paramref name="ctorArgs"/> will be used
+            to initialize the custom attribute, and then any read-write properties on the
+            <paramref name="sourceAttribute"/> will be plugged in.
+            </p>
+            </remarks>
+            <param name="type">
+            The desired <see cref="T:System.Attribute"/> <see cref="T:System.Type"/>.
+            </param>
+            <param name="ctorArgs">
+            Any constructor arguments for the attribute (may be <see langword="null"/>
+            in the case of no arguments).
+            </param>
+            <param name="sourceAttribute">
+            Source attribute to copy properties from (may be <see langword="null"/>).
+            </param>
+            <returns>A custom attribute builder.</returns>
+            <exception cref="T:System.ArgumentNullException">
+            If the <paramref name="type"/> parameter is <see langword="null"/>.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the <paramref name="type"/> parameter is not a <see cref="T:System.Type"/>
+            that derives from the <see cref="T:System.Attribute"/> class.
+            </exception>
+            <seealso cref="T:System.Reflection.Emit.CustomAttributeBuilder"/>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.CreateCustomAttribute(System.Type,System.Attribute)">
+            <summary>
+            Creates a <see cref="T:System.Reflection.Emit.CustomAttributeBuilder"/>.
+            </summary>
+            <param name="type">
+            The desired <see cref="T:System.Attribute"/> <see cref="T:System.Type"/>.
+            </param>
+            <param name="sourceAttribute">
+            Source attribute to copy properties from (may be <see langword="null"/>).
+            </param>
+            <returns>A custom attribute builder.</returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.CreateCustomAttribute(System.Attribute)">
+            <summary>
+            Creates a <see cref="T:System.Reflection.Emit.CustomAttributeBuilder"/>.
+            </summary>
+            <param name="sourceAttribute">
+            The source attribute to copy properties from.
+            </param>
+            <returns>A custom attribute builder.</returns>
+            <exception cref="T:System.NullReferenceException">
+            If the supplied <paramref name="sourceAttribute"/> is
+            <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.CreateCustomAttribute(System.Type)">
+            <summary>
+            Creates a <see cref="T:System.Reflection.Emit.CustomAttributeBuilder"/>.
+            </summary>
+            <param name="type">
+            The desired <see cref="T:System.Attribute"/> <see cref="T:System.Type"/>.
+            </param>
+            <returns>A custom attribute builder.</returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.CreateCustomAttribute(System.Type,System.Object[])">
+            <summary>
+            Creates a <see cref="T:System.Reflection.Emit.CustomAttributeBuilder"/>.
+            </summary>
+            <param name="type">
+            The desired <see cref="T:System.Attribute"/> <see cref="T:System.Type"/>.
+            </param>
+            <param name="ctorArgs">
+            Any constructor arguments for the attribute (may be <see langword="null"/>
+            in the case of no arguments).
+            </param>
+            <returns>A custom attribute builder.</returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.CreateCustomAttribute(System.Reflection.CustomAttributeData)">
+            <summary>
+            Creates a <see cref="T:System.Reflection.Emit.CustomAttributeBuilder"/>.
+            </summary>
+            <param name="attributeData">
+            The <see cref="T:System.Reflection.CustomAttributeData"/> to create 
+            the custom attribute builder from.
+            </param>
+            <returns>A custom attribute builder.</returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetMatchingMethods(System.Type,System.Reflection.MethodInfo[],System.Boolean)">
+            <summary>
+            Tries to find matching methods in the specified <see cref="T:System.Type"/>
+            for each method in the supplied <paramref name="methods"/> list.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> to look for matching methods in.
+            </param>
+            <param name="methods">The methods to match.</param>
+            <param name="strict">
+            A flag that specifies whether to throw an exception if a matching
+            method is not found.
+            </param>
+            <returns>A list of the matched methods.</returns>
+            <exception cref="T:System.ArgumentNullException">
+            If either of the <paramref name="type"/> or
+            <paramref name="methods"/> parameters are <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.TypeOfOrType(System.Object)">
+            <summary>
+            Returns the <see cref="T:System.Type"/> of the supplied
+            <paramref name="source"/>.
+            </summary>
+            <remarks>
+            <p>
+            If the <paramref name="source"/> is a <see cref="T:System.Type"/>
+            instance, the return value of this method call with be the
+            <paramref name="source"/> parameter cast to a
+            <see cref="T:System.Type"/>. If the <paramref name="source"/> is
+            anything other than a <see cref="T:System.Type"/>, the return value
+            will be the result of invoking the <paramref name="source"/>'s
+            <see cref="M:System.Object.GetType"/> method.
+            </p>
+            </remarks>
+            <param name="source">
+            A <see cref="T:System.Type"/> or <see cref="T:System.Object"/> instance.
+            </param>
+            <returns>
+            The <paramref name="source"/>argument if it is a
+            <see cref="T:System.Type"/> or the result of invoking
+            <see cref="M:System.Object.GetType"/> on the argument if it
+            is an <see cref="T:System.Object"/>.
+            </returns>
+            <exception cref="T:System.NullReferenceException">
+            If the <paramref name="source"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.UnwrapTargetInvocationException(System.Reflection.TargetInvocationException)">
+            <summary>
+            Unwraps the supplied <see cref="T:System.Reflection.TargetInvocationException"/> 
+            and returns the inner exception preserving the stack trace.
+            </summary>
+            <param name="ex">
+            The <see cref="T:System.Reflection.TargetInvocationException"/> to unwrap.
+            </param>
+            <returns>The unwrapped exception.</returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.IsTypeVisible(System.Type)">
+            <summary>
+            Is the supplied <paramref name="type"/> can be accessed outside the assembly ?
+            </summary>
+            <param name="type">The type to check.</param>
+            <returns>
+            <see langword="true"/> if the type can be accessed outside the assembly;
+            Otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.IsTypeVisible(System.Type,System.String)">
+            <summary>
+            Is the supplied <paramref name="type"/> can be accessed 
+            from the supplied friendly assembly ?
+            </summary>
+            <param name="type">The type to check.</param>
+            <param name="friendlyAssemblyName">The friendly assembly name.</param>
+            <returns>
+            <see langword="true"/> if the type can be accessed 
+            from the supplied friendly assembly; Otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetInterfaces(System.Type)">
+            <summary>
+            Gets all of the interfaces implemented by 
+            the specified <see cref="T:System.Type"/>.
+            </summary>
+            <param name="type">
+            The object to get the interfaces of.
+            </param>
+            <returns>
+            All of the interfaces implemented by the
+            <see cref="T:System.Type"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.GetExplicitBaseException(System.Exception)">
+            <summary>
+            Returns the explicit <see cref="T:System.Exception"/> that is the root cause of an exception.
+            </summary>
+            <remarks>
+            If the InnerException property of the current exception is a null reference 
+            or a <see cref="T:System.NullReferenceException"/>, returns the current exception.
+            </remarks>
+            <param name="ex">The last exception thrown.</param>
+            <returns>
+            The first explicit exception thrown in a chain of exceptions.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.MemberwiseCopy(System.Object,System.Object)">
+            <summary>
+            Copies all fields from one object to another. 
+            </summary>
+            <remarks>
+            The types of both objects must be related. This means, that either of the following is true:
+            <list type="bullet">
+            	<item><description>fromObject.GetType() == toObject.GetType()</description></item>
+            	<item><description>fromObject.GetType() is derived from toObject.GetType()</description></item>
+            	<item><description>toObject.GetType() is derived from fromObject.GetType()</description></item>
+            </list>
+            </remarks>
+            <param name="fromObject">The source object</param>
+            <param name="toObject">The object, who's fields will be populated with values from the source object</param>
+            <exception cref="T:System.ArgumentException">If the object's types are not related</exception>
+        </member>
+        <member name="T:Spring.Util.ReflectionUtils.CustomAttributeBuilderBuilder">
+            <summary>
+            Creates a <see cref="T:System.Reflection.Emit.CustomAttributeBuilder"/>.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: ReflectionUtils.cs,v 1.59 2008/05/13 14:22:46 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.CustomAttributeBuilderBuilder.#ctor(System.Type)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Util.ReflectionUtils.CustomAttributeBuilderBuilder"/> class.
+            </summary>
+            <param name="attributeType">The custom attribute type.</param>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.CustomAttributeBuilderBuilder.#ctor(System.Type,System.Object[])">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Util.ReflectionUtils.CustomAttributeBuilderBuilder"/> class.
+            </summary>
+            <param name="attributeType">The custom attribute type.</param>
+            <param name="constructorArgs">The custom attribute constructor arguments.</param>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.CustomAttributeBuilderBuilder.AddContructorArgument(System.Object[])">
+            <summary>
+            Adds the specified values to the constructor argument list 
+            used to create the custom attribute.
+            </summary>
+            <param name="values">An array of argument values.</param>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.CustomAttributeBuilderBuilder.AddPropertyValue(System.String,System.Object)">
+            <summary>
+            Adds a property value to the custom attribute.
+            </summary>
+            <param name="name">The property name.</param>
+            <param name="value">The property value.</param>
+        </member>
+        <member name="M:Spring.Util.ReflectionUtils.CustomAttributeBuilderBuilder.Build">
+            <summary>
+            Creates the <see cref="T:Spring.Util.ReflectionUtils.CustomAttributeBuilderBuilder"/>.
+            </summary>
+            <returns>The created <see cref="T:Spring.Util.ReflectionUtils.CustomAttributeBuilderBuilder"/>.</returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.INamespaceParser">
+            <summary>
+            Strategy interface for parsing XML object definitions.
+            </summary>
+            <remarks>
+            <p>
+            Used by <see cref="T:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader"/>
+            for actually parsing a DOM document or
+            <see cref="T:System.Xml.XmlElement"/> fragment.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <author>Sandu Turcan (.NET)</author>
+            <version>$Id: INamespaceParser.cs,v 1.1 2007/08/07 21:23:37 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.INamespaceParser.Init">
+            <summary>
+            Invoked by <see cref="T:Spring.Objects.Factory.Xml.NamespaceParserRegistry"/> after construction but before any
+            elements have been parsed.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.INamespaceParser.ParseElement(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parse the specified element and register any resulting
+            IObjectDefinitions with the IObjectDefinitionRegistry that is
+            embedded in the supplied ParserContext.
+            </summary>
+            <remarks>
+            Implementations should return the primary IObjectDefinition
+            that results from the parse phase if they wish to used nested
+            inside (for example) a <code>&lt;property&gt;</code> tag.
+            <para>Implementations may return null if they will not
+            be used in a nested scenario.
+            </para>
+            </remarks>
+            <param name="element">The element to be parsed into one or more IObjectDefinitions</param>
+            <param name="parserContext">The object encapsulating the current state of the parsing
+            process.</param>
+            <returns>
+            The primary IObjectDefinition (can be null as explained above)
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.INamespaceParser.Decorate(System.Xml.XmlNode,Spring.Objects.Factory.Config.ObjectDefinitionHolder,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parse the specified XmlNode and decorate the supplied ObjectDefinitionHolder,
+            returning the decorated definition.
+            </summary>
+            <remarks>The XmlNode may either be an XmlAttribute or an XmlElement, depending on
+            whether a custom attribute or element is being parsed.
+            <para>Implementations may choose to return a completely new definition,
+            which will replace the original definition in the resulting IApplicationContext/IObjectFactory.
+            </para>
+            <para>The supplied ParserContext can be used to register any additional objects needed to support
+            the main definition.</para>
+            </remarks>
+            <param name="node">The source element or attribute that is to be parsed.</param>
+            <param name="definition">The current object definition.</param>
+            <param name="parserContext">The object encapsulating the current state of the parsing
+            process.</param>
+            <returns>The decorated definition (to be registered in the IApplicationContext/IObjectFactory),
+            or simply the original object definition if no decoration is required.  A null value is strickly
+            speaking invalid, but will leniently treated like the case where the original object definition
+            gets returned.</returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader">
+            <summary>
+            Object definition reader for a simple properties format.
+            </summary>
+            <remarks>
+            Provides object definition registration methods for
+            <see cref="T:System.Collections.IDictionary"/> and
+            <see cref="T:System.Resources.ResourceSet"/> instances. Typically applied to a
+            <see cref="T:Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>.
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.TrueValue">
+            <summary>
+            Value of a T/F attribute that represents true.
+            Anything else represents false. Case seNsItive.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.Separator">
+            <summary>
+            Separator between object name and property name.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.ClassKey">
+            <summary>
+            Prefix for the class property of a root object definition.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.SingletonKey">
+            <summary>
+            Special string added to distinguish if the object will be
+            a singleton.
+            </summary>
+            <remarks>
+            <p>
+            Default is true.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            owner.(singleton)=true
+            </p>
+            </example>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.LazyInitKey">
+            <summary>
+            Special string added to distinguish if the object will be
+            lazily initialised.
+            </summary>
+            <remarks>
+            <p>
+            Default is false.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            owner.(lazy-init)=true
+            </p>
+            </example>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.ParentKey">
+            <summary>
+            Reserved "property" to indicate the parent of a child object definition.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.RefSuffix">
+            <summary>
+            Property suffix for references to other objects in the current
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/>: e.g.
+            owner.dog(ref)=fido.
+            </summary>
+            <remarks>
+            <p>
+            Whether this is a reference to a singleton or a prototype
+            will depend on the definition of the target object.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.RefPrefix">
+            <summary>
+            Prefix before values referencing other objects.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.#ctor(Spring.Objects.Factory.Support.IObjectDefinitionRegistry)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader"/>
+            class.
+            </summary>
+            <param name="registry">
+            The <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+            instance that this reader works on.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.LoadObjectDefinitions(Spring.Core.IO.IResource)">
+            <summary>
+            Load object definitions from the supplied <paramref name="resource"/>.
+            </summary>
+            <param name="resource">
+            The resource for the object definitions that are to be loaded.
+            </param>
+            <returns>
+            The number of object definitions that were loaded.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of loading or parsing errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.LoadObjectDefinitions(Spring.Core.IO.IResource,System.String)">
+            <summary>
+            Load object definitions from the specified properties file.
+            </summary>
+            <param name="resource">
+            The resource descriptor for the properties file.
+            </param>
+            <param name="prefix">
+            The match or filter for object definition names, e.g. 'objects.'
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">in case of loading or parsing errors</exception>
+            <returns>the number of object definitions found</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.RegisterObjectDefinitions(System.Resources.ResourceSet)">
+            <summary>
+            Register object definitions contained in a
+            <see cref="T:System.Resources.ResourceSet"/>, using all property keys (i.e.
+            not filtering by prefix).
+            </summary>
+            <param name="rs">
+            The <see cref="T:System.Resources.ResourceSet"/> containing object definitions.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of loading or parsing errors.
+            </exception>
+            <returns>The number of object definitions registered.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.RegisterObjectDefinitions(System.Resources.ResourceSet,System.String)">
+            <summary>
+            Register object definitions contained in a
+            <see cref="T:System.Resources.ResourceSet"/>.
+            </summary>
+            <remarks>
+            <p>
+            Similar syntax as for an <see cref="T:System.Collections.IDictionary"/>.
+            This method is useful to enable standard .NET internationalization support.
+            </p>
+            </remarks>
+            <param name="rs">
+            The <see cref="T:System.Resources.ResourceSet"/> containing object definitions.
+            </param>
+            <param name="prefix">
+            The match or filter for object definition names, e.g. 'objects.'
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of loading or parsing errors.
+            </exception>
+            <returns>The number of object definitions registered.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.RegisterObjectDefinitions(System.Collections.IDictionary)">
+            <summary>
+            Register object definitions contained in an
+            <see cref="T:System.Collections.IDictionary"/>, using all property keys
+            (i.e. not filtering by prefix).
+            </summary>
+            <param name="id">
+            The <see cref="T:System.Collections.IDictionary"/> containing object definitions.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of loading or parsing errors.
+            </exception>
+            <returns>The number of object definitions registered.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.RegisterObjectDefinitions(System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Registers object definitions contained in an <see cref="T:System.Collections.Specialized.NameValueCollection"/> 
+            using all property keys ( i.e. not filtering by prefix )
+            </summary>
+            <param name="nameValueCollection">The <see cref="T:System.Collections.Specialized.NameValueCollection"/> containing 
+            object definitions.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of loading or parsing errors.
+            </exception>
+            <returns>The number of object definitions registered.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.RegisterObjectDefinitions(System.Collections.IDictionary,System.String)">
+            <summary>
+            Register object definitions contained in a
+            <see cref="T:System.Collections.IDictionary"/>.
+            </summary>
+            <remarks>
+            <p>
+            Ignores ineligible properties.
+            </p>
+            </remarks>
+            <param name="id">IDictionary name -&gt; property (String or Object). Property values
+            will be strings if coming from a Properties file etc. Property names
+            (keys) must be strings. Type keys must be strings.
+            </param>
+            <param name="prefix">
+            The match or filter within the keys in the map: e.g. 'objects.'
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of loading or parsing errors.
+            </exception>
+            <returns>The number of object definitions found.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.RegisterObjectDefinitions(System.Collections.IDictionary,System.String,System.String)">
+            <summary>
+            Register object definitions contained in a
+            <see cref="T:System.Collections.IDictionary"/>.
+            </summary>
+            <remarks>
+            <p>
+            Ignores ineligible properties.
+            </p>
+            </remarks>
+            <param name="id">IDictionary name -&gt; property (String or Object). Property values
+            will be strings if coming from a Properties file etc. Property names
+            (keys) must be strings. Type keys must be strings.
+            </param>
+            <param name="prefix">
+            The match or filter within the keys in the map: e.g. 'objects.'
+            </param>
+            <param name="resourceDescription">
+            The description of the resource that the
+            <see cref="T:System.Collections.IDictionary"/> came from (for logging purposes).
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of loading or parsing errors.
+            </exception>
+            <returns>The number of object definitions found.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.RegisterObjectDefinition(System.String,System.Collections.IDictionary,System.String,System.String)">
+            <summary>
+            Get all property values, given a prefix (which will be stripped)
+            and add the object they define to the factory with the given name
+            </summary>
+            <param name="name">The name of the object to define.</param>
+            <param name="id">
+            The <see cref="T:System.Collections.IDictionary"/> containing string pairs.
+            </param>
+            <param name="prefix">The prefix of each entry, which will be stripped.</param>
+            <param name="resourceDescription">
+            The description of the resource that the
+            <see cref="T:System.Collections.IDictionary"/> came from (for logging purposes).
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of loading or parsing errors.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.DefaultParentObject">
+            <summary>
+            Name of default parent object
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.PropertiesObjectDefinitionReader.ObjectDefinitionFactory">
+            <summary>
+            Gets or sets object definition factory to use.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.ObjectDefinitionValidationException">
+            <summary>
+            Thrown when the validation of an object definition failed.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionValidationException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.ObjectDefinitionValidationException"/>
+            class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionValidationException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.ObjectDefinitionValidationException"/>
+            class.
+            </summary>
+            <param name="message">The detail message.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionValidationException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.ObjectDefinitionValidationException"/>
+            class.
+            </summary>
+            <param name="message">
+            The detail message.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ObjectDefinitionValidationException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the ObjectDefinitionValidationException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.AutowireUtils">
+            <summary>
+            Utility class that contains various methods useful for the implementation of
+            autowire-capable object factories.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: AutowireUtils.cs,v 1.7 2008/04/02 18:02:24 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AutowireUtils.#ctor">
+            <summary>
+            Creates a new instance of the AutowireUtils class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly
+            visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AutowireUtils.GetConstructors(Spring.Objects.Factory.Config.IObjectDefinition,System.Int32)">
+            <summary>
+            Gets those <see cref="T:System.Reflection.ConstructorInfo"/>s
+            that are applicable for autowiring the supplied <paramref name="definition"/>.
+            </summary>
+            <param name="definition">
+            The <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>
+            (definition) that is being autowired by constructor.
+            </param>
+            <param name="minimumArgumentCount">
+            The absolute minimum number of arguments that any returned constructor
+            must have. If this parameter is equal to zero (0), then all constructors
+            are valid (regardless of their argument count), including any default
+            constructor.
+            </param>
+            <returns>
+            Those <see cref="T:System.Reflection.ConstructorInfo"/>s
+            that are applicable for autowiring the supplied <paramref name="definition"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AutowireUtils.GetTypeDifferenceWeight(System.Reflection.ParameterInfo[],System.Object[])">
+            <summary>
+            Determine a weight that represents the class hierarchy difference between types and
+            arguments.
+            </summary>
+            <remarks>
+            <p>
+            A direct match, i.e. type MyInteger -&gt; arg of class MyInteger, does not increase
+            the result - all direct matches means weight zero (0). A match between the argument type
+            <see cref="T:System.Object"/> and a MyInteger instance argument would increase the weight by
+            1, due to the superclass (<see cref="T:System.Object"/>) being one (1) steps up in the
+            class hierarchy being the last one that still matches the required type.
+            </p>
+            <p>
+            Therefore, with an argument of type <see cref="T:System.Collections.Hashtable"/>, a
+            constructor taking a <see cref="T:System.Collections.Hashtable"/> argument would be
+            preferred to a constructor taking an <see cref="T:System.Collections.IDictionary"/> argument
+            which would be preferred to a constructor taking an
+            <see cref="T:System.Collections.ICollection"/> argument which would in turn be preferred
+            to a constructor taking an <see cref="T:System.Object"/> argument.
+            </p>
+            <p>
+            All argument weights get accumulated.
+            </p>
+            </remarks>
+            <param name="argTypes">
+            The argument <see cref="T:System.Type"/>s to match.
+            </param>
+            <param name="args">The arguments to match.</param>
+            <returns>The accumulated weight for all arguments.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AutowireUtils.IsExcludedFromDependencyCheck(System.Reflection.PropertyInfo)">
+            <summary>
+            Determines whether the given object property is excluded from dependency checks.
+            </summary>
+            <param name="pi">The PropertyInfo of the object property.</param>
+            <returns>
+            	<c>true</c> if is excluded from dependency check; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AutowireUtils.SortConstructors(System.Reflection.ConstructorInfo[])">
+            <summary>
+            Sorts the supplied <paramref name="constructors"/>, preferring
+            public constructors and "greedy" ones (that have lots of arguments).
+            </summary>
+            <remarks>
+            <p>
+            The result will contain public constructors first, with a decreasing number
+            of arguments, then non-public constructors, again with a decreasing number
+            of arguments.
+            </p>
+            </remarks>
+            <param name="constructors">
+            The <see cref="T:System.Reflection.ConstructorInfo"/> array to be sorted.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AutowireUtils.IsSetterDefinedInInterface(System.Reflection.PropertyInfo,Spring.Collections.ISet)">
+            <summary>
+            Determines whether the setter property is defined in any of the given interfaces.
+            </summary>
+            <param name="propertyInfo">The PropertyInfo of the object property</param>
+            <param name="interfaces">The ISet of interfaces.</param>
+            <returns>
+            	<c>true</c> if setter property is defined in interface; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.ConfigSectionVariableSource">
+            <summary>
+            Implementation of <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/> that
+            resolves variable name against name-value sections in
+            the standard .NET configuration file.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ConfigSectionVariableSource.cs,v 1.4 2007/08/22 20:16:27 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConfigSectionVariableSource.#ctor">
+            <summary>
+            Initializes a new instance of <see cref="T:Spring.Objects.Factory.Config.ConfigSectionVariableSource"/>
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConfigSectionVariableSource.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of <see cref="T:Spring.Objects.Factory.Config.ConfigSectionVariableSource"/> from the given <paramref name="sectionName"/>
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConfigSectionVariableSource.#ctor(System.String[])">
+            <summary>
+            Initializes a new instance of <see cref="T:Spring.Objects.Factory.Config.ConfigSectionVariableSource"/> from the given <paramref name="sectionNames"/>
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConfigSectionVariableSource.ResolveVariable(System.String)">
+            <summary>
+            Resolves variable value for the specified variable name.
+            </summary>
+            <param name="name">
+            The name of the variable to resolve.
+            </param>
+            <returns>
+            The variable value if able to resolve, <c>null</c> otherwise.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConfigSectionVariableSource.InitVariables">
+            <summary>
+            Initializes properties based on the specified 
+            property file locations.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ConfigSectionVariableSource.SectionNames">
+            <summary>
+            Gets or sets a list of section names variables should be loaded from.
+            </summary>
+            <remarks>
+            All sections specified need to be handled by the <see cref="T:System.Configuration.NameValueSectionHandler"/>
+            in order to be processed successfully.
+            </remarks>
+            <value>
+            A list of section names variables should be loaded from.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ConfigSectionVariableSource.SectionName">
+            <summary>
+            Convinience property. Gets or sets a single section
+            to read properties from.
+            </summary>
+            <remarks>
+            The section specified needs to be handled by the <see cref="T:System.Configuration.NameValueSectionHandler"/>
+            in order to be processed successfully.
+            </remarks>
+            <value>
+            A section to read properties from.
+            </value>
+        </member>
+        <member name="T:Spring.Globalization.Formatters.NullFormatter">
+            <summary>
+            Implementation of <see cref="T:Spring.Globalization.IFormatter"/> that simply calls <see cref="M:System.Object.ToString"/>.
+            </summary>
+            <remarks>
+            This formatter is a no-operation implementation.
+            </remarks>
+            <author>Erich Eichinger</author>
+            <version>$Id: NullFormatter.cs,v 1.1 2007/05/19 00:23:18 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.NullFormatter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.NullFormatter"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.NullFormatter.Format(System.Object)">
+            <summary>
+            Converts the passed value to a string by calling <see cref="M:System.Object.ToString"/>.
+            </summary>
+            <param name="value">The value to convert.</param>
+            <returns>to string converted value.</returns>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.NullFormatter.Parse(System.String)">
+            <summary>
+            Returns the passed string "as is".
+            </summary>
+            <param name="value">The value to return.</param>
+            <returns>The value passed into this method.</returns>
+        </member>
+        <member name="T:Spring.Globalization.Formatters.DateTimeFormatter">
+            <summary>
+            Implementation of <see cref="T:Spring.Globalization.IFormatter"/> that can be used to
+            format and parse <see cref="T:System.DateTime"/> values.
+            </summary>
+            <remarks>
+            <para>
+            <c>DateTimeFormatter</c> uses properties of the
+            <see cref="T:System.Globalization.DateTimeFormatInfo"/> to format and parse <see cref="T:System.DateTime"/> values. 
+            </para>
+            <para>
+            If you use one of the constructors that accept culture as a parameter
+            to create an instance of <c>DateTimeFormatter</c>, default <c>DateTimeFormatInfo</c>
+            for the specified culture will be used.
+            </para>
+            <para>
+            You can also use properties exposed by the <c>DateTimeFormatter</c> in order
+            to override some of the default formatting parameters.
+            </para>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DateTimeFormatter.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.DateTimeFormatter.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.DateTimeFormatter"/> class
+            using default <see cref="T:System.Globalization.DateTimeFormatInfo"/> for the current thread's culture.
+            </summary>
+            <param name="format">Date/time format string.</param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.DateTimeFormatter.#ctor(System.String,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.DateTimeFormatter"/> class
+            using default <see cref="T:System.Globalization.DateTimeFormatInfo"/> for the specified culture.
+            </summary>
+            <param name="format">Date/time format string.</param>
+            <param name="cultureName">The culture name.</param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.DateTimeFormatter.#ctor(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.DateTimeFormatter"/> class
+            using default <see cref="T:System.Globalization.DateTimeFormatInfo"/> for the specified culture.
+            </summary>
+            <param name="format">Date/time format string.</param>
+            <param name="culture">The culture.</param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.DateTimeFormatter.Format(System.Object)">
+            <summary>
+            Formats the specified <see cref="T:System.DateTime"/> value.
+            </summary>
+            <param name="value">The value to format.</param>
+            <returns>Formatted <see cref="T:System.DateTime"/> value.</returns>
+            <exception cref="T:System.ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+            <exception cref="T:System.ArgumentException">If <paramref name="value"/> is not an instance of <see cref="T:System.DateTime"/>.</exception>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.DateTimeFormatter.Parse(System.String)">
+            <summary>
+            Parses the specified value.
+            </summary>
+            <param name="value">The string to parse.</param>
+            <returns>Parsed <see cref="T:System.DateTime"/> value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpUnaryMinus">
+            <summary>
+            Represents unary minus operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpUnaryMinus.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpUnaryMinus.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpUnaryMinus.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpUnaryMinus.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the unary plus operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpLess">
+            <summary>
+            Represents logical "less than" operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpLess.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpLess.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpLess.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpLess.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical "less than" operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.MapInitializerNode">
+            <summary>
+            Represents parsed map initializer node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: MapInitializerNode.cs,v 1.4 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.MapInitializerNode.#ctor">
+            <summary>
+            Creates a new instance of <see cref="T:Spring.Expressions.MapInitializerNode"/>.
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.MapInitializerNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.MapInitializerNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Creates new instance of the map defined by this node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.Processors.SortProcessor">
+            <summary>
+            Implementation of the sort processor.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SortProcessor.cs,v 1.4 2008/03/20 23:58:16 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.Processors.SortProcessor.Process(System.Collections.ICollection,System.Object[])">
+            <summary>
+            Sorts the source collection.
+            </summary>
+            <remarks>
+            Please not that this processor requires that collection elements
+            are of a uniform type and that they implement <see cref="T:System.IComparable"/>
+            interface.
+            <p/>
+            If you want to perform custom sorting based on element properties
+            you should consider using <see cref="T:Spring.Expressions.Processors.OrderByProcessor"/> instead.
+            </remarks>
+            <param name="source">
+            The source collection to sort.
+            </param>
+            <param name="args">
+            Ignored.
+            </param>
+            <returns>
+            An array containing sorted collection elements.
+            </returns>
+            <exception cref="T:System.ArgumentException">
+            If <paramref name="source"/> collection is not empty and it is 
+            neither <see cref="T:System.Collections.IList"/> nor <see cref="T:Spring.Collections.ISet"/>.
+            </exception>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.RegistryKeyConverter">
+            <summary>
+            Converts string representation of the registry key
+            into <see cref="T:Microsoft.Win32.RegistryKey"/> instance.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: RegistryKeyConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.RegistryKeyConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Can we convert from a the sourcetype to a <see cref="T:Microsoft.Win32.RegistryKey"/>?
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from a <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns><see langword="true"/> if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.RegistryKeyConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Convert from a <see cref="T:System.String"/> value to an
+            <see cref="T:Microsoft.Win32.RegistryKey"/> instance.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture.
+            </param>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <returns>
+            A <see cref="T:System.String"/> array if successful.
+            </returns>        
+        </member>
+        <member name="M:Spring.Core.TypeConversion.RegistryKeyConverter.GetPartialKeyName(System.String[],System.Int32)">
+            <summary>
+            Generates partial registry key name.
+            </summary>
+            <param name="keys">
+            Key elements.
+            </param>
+            <param name="index">
+            Index of the last element to use.
+            </param>
+            <returns>
+            Friendly key name containing key element from 
+            0 to <paramref name="index"/>, inclusive.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.RegistryKeyConverter.GetRootKey(System.String)">
+            <summary>
+            Returns <see cref="T:Microsoft.Win32.RegistryKey"/> for the specified
+            root hive name.
+            </summary>
+            <param name="name">
+            Root hive name.
+            </param>
+            <returns>
+            Registry key for the specified name.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.RegexConverter">
+            <summary>
+            Converts string representation of a regular expression into an instance of <see cref="T:System.Text.RegularExpressions.Regex"/>.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: RegexConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.RegexConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Can we convert from the sourcetype to a <see cref="T:System.Text.RegularExpressions.Regex"/>?
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from a <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns><see langword="true"/> if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.RegexConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Convert from a <see cref="T:System.String"/> value to an
+            <see cref="T:System.Text.RegularExpressions.Regex"/> instance.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture.
+            </param>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <returns>
+            A <see cref="T:System.Text.RegularExpressions.Regex"/> if successful.
+            </returns>        
+        </member>
+        <member name="T:Spring.Core.TypeConversion.CustomNumberConverter">
+            <summary>
+            A custom <see cref="T:System.ComponentModel.TypeConverter"/> for any
+            primitive numeric type such as <see cref="T:System.Int32"/>,
+            <see cref="T:System.Single"/>, <see cref="T:System.Double"/>, etc.
+            </summary>
+            <remarks>
+            <p>
+            Can use a given <see cref="T:System.Globalization.NumberFormatInfo"/> for
+            (locale-specific) parsing and rendering.
+            </p>
+            <p>
+            This is not meant to be used as a system
+            <see cref="T:System.ComponentModel.TypeConverter"/> but rather as a
+            locale-specific number converter within custom controller code, to
+            parse user-entered number strings into number properties of objects,
+            and render them in a UI form.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: CustomNumberConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.CustomNumberConverter.#ctor(System.Type,System.Globalization.NumberFormatInfo,System.Boolean)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Core.TypeConversion.CustomNumberConverter"/>
+            class.
+            </summary>
+            <param name="type">
+            The primitive numeric <see cref="T:System.Type"/> to convert to.
+            </param>
+            <param name="format">
+            The <see cref="T:System.Globalization.NumberFormatInfo"/> to use for
+            (locale-specific) parsing and rendering
+            </param>
+            <param name="allowEmpty">
+            Is an empty string allowed to be converted? If
+            <see langword="true"/>, an empty string value will be converted to
+            numeric 0.</param>
+            <exception cref="T:System.ArgumentException">
+            Id the supplied <paramref name="type"/> is not a primitive
+            <see cref="T:System.Type"/>.
+            </exception>
+            <seealso cref="P:System.Type.IsPrimitive"/>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.CustomNumberConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Returns whether this converter can convert an object of one
+            <see cref="T:System.Type"/> to a <see cref="T:System.IO.FileInfo"/>
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from a
+            <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns>
+            <see langword="true"/> if the conversion is possible.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.CustomNumberConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Converts the specified object (a string) to the required primitive
+            type.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture. 
+            </param>
+            <param name="val">
+            The value that is to be converted.
+            </param>
+            <returns>A primitive representation of the string value.</returns>
+        </member>
+        <member name="T:Spring.Core.IO.ResourceHandlerRegistry">
+            <summary>
+            Registry class that allows users to register and retrieve protocol handlers.
+            </summary>
+            <remarks>
+            <para>
+            Resource handler is an implementation of <see cref="T:Spring.Core.IO.IResource"/> interface
+            that should be used to process resources with the specified protocol.
+            </para>
+            <para>
+            They are used throughout the framework to access resources from various 
+            sources. For example, application context loads object definitions from the resources
+            that are processed using one of the registered resource handlers.
+            </para>
+            <para>Following resource handlers are registered by default:</para>
+            <list type="table">
+                <listheader>
+                    <term>Protocol</term>
+                    <term>Handler Type</term>
+                    <term>Description</term>
+                </listheader>
+                <item>
+                    <description>config</description>
+                    <description><see cref="T:Spring.Core.IO.ConfigSectionResource"/></description>
+                    <description>Resolves the resources by loading specified configuration section from the standard .NET config file.</description>
+                </item>
+                <item>
+                    <description>file</description>
+                    <description><see cref="T:Spring.Core.IO.FileSystemResource"/></description>
+                    <description>Resolves filesystem resources.</description>
+                </item>
+                <item>
+                    <description>http</description>
+                    <description><see cref="T:Spring.Core.IO.UrlResource"/></description>
+                    <description>Resolves remote web resources.</description>
+                </item>
+                <item>
+                    <description>https</description>
+                    <description><see cref="T:Spring.Core.IO.UrlResource"/></description>
+                    <description>Resolves remote web resources via HTTPS.</description>
+                </item>
+                <item>
+                    <description>ftp</description>
+                    <description><see cref="T:Spring.Core.IO.UrlResource"/></description>
+                    <description>Resolves ftp resources.</description>
+                </item>
+                <item>
+                    <description>assembly</description>
+                    <description><see cref="T:Spring.Core.IO.AssemblyResource"/></description>
+                    <description>Resolves resources that are embedded into an assembly.</description>
+                </item>
+                <item>
+                    <description>web</description>
+                    <description><c>Spring.Core.IO.WebResource, Spring.Web</c>*</description>
+                    <description>Resolves resources relative to the web application's virtual directory.</description>
+                </item>
+            </list>
+            * only available in web applications.
+            <para>
+            Users can create and register their own protocol handlers by implementing <see cref="T:Spring.Core.IO.IResource"/> interface
+            and mapping custom protocol name to that implementation. See <see cref="T:Spring.Context.Support.ResourceHandlersSectionHandler"/> for details
+            on how to register custom protocol handler.
+            </para>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ResourceHandlerRegistry.cs,v 1.7 2007/08/08 17:46:55 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Core.IO.ResourceHandlerRegistry.ResourcesSectionName">
+            <summary>
+            Name of the .Net config section that contains definitions 
+            for custom resource handlers.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.IO.ResourceHandlerRegistry.#cctor">
+            <summary>
+            Registers standard and user-configured resource handlers.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.IO.ResourceHandlerRegistry.GetResourceHandler(System.String)">
+            <summary>
+            Returns resource handler for the specified protocol name.
+            </summary>
+            <remarks>
+            <para>
+            This method returns <see cref="T:System.Reflection.ConstructorInfo"/> object that should be used
+            to create an instance of the <see cref="T:Spring.Core.IO.IResource"/>-derived type by passing
+            resource location as a parameter.
+            </para>
+            </remarks>
+            <param name="protocolName">Name of the protocol to get the handler for.</param>
+            <returns>Resource handler constructor for the specified protocol name.</returns>
+            <exception cref="T:System.ArgumentNullException">If <paramref name="protocolName"/> is <c>null</c>.</exception>
+        </member>
+        <member name="M:Spring.Core.IO.ResourceHandlerRegistry.IsHandlerRegistered(System.String)">
+            <summary>
+            Returns <c>true</c> if a handler is registered for the specified protocol, 
+            <c>false</c> otherwise.
+            </summary>
+            <param name="protocolName">Name of the protocol.</param>
+            <returns>
+                <c>true</c> if a handler is registered for the specified protocol, <c>false</c> otherwise.
+            </returns>
+            <exception cref="T:System.ArgumentNullException">If <paramref name="protocolName"/> is <c>null</c>.</exception>
+        </member>
+        <member name="M:Spring.Core.IO.ResourceHandlerRegistry.RegisterResourceHandler(System.String,System.String)">
+            <summary>
+            Registers resource handler and maps it to the specified protocol name.
+            </summary>
+            <remarks>
+            <p>
+            If the mapping already exists, the existing mapping will be
+            silently overwritten with the new mapping.
+            </p>
+            </remarks>
+            <param name="protocolName">
+            The protocol to add (or override).
+            </param>
+            <param name="handlerTypeName">
+            The type name of the concrete implementation of the
+            <see cref="T:Spring.Core.IO.IResource"/> interface that will handle
+            the specified protocol.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="protocolName"/> is
+            <see langword="null"/> or contains only whitespace character(s); or
+            if the supplied <paramref name="handlerTypeName"/> is
+            <see langword="null"/>.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If the supplied <paramref name="handlerTypeName"/> is not a 
+            <see cref="T:System.Type"/> that derives from the
+            <see cref="T:Spring.Core.IO.IResource"/> interface; or (having passed
+            this first check), the supplied <paramref name="handlerTypeName"/>
+            does not expose a constructor that takes a single
+            <see cref="T:System.String"/> parameter.
+            </exception>
+        </member>
+        <member name="M:Spring.Core.IO.ResourceHandlerRegistry.RegisterResourceHandler(System.String,System.Type)">
+            <summary>
+            Registers resource handler and maps it to the specified protocol name.
+            </summary>
+            <remarks>
+            <p>
+            If the mapping already exists, the existing mapping will be
+            silently overwritten with the new mapping.
+            </p>
+            </remarks>
+            <param name="protocolName">
+            The protocol to add (or override).
+            </param>
+            <param name="handlerType">
+            The concrete implementation of the
+            <see cref="T:Spring.Core.IO.IResource"/> interface that will handle
+            the specified protocol.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="protocolName"/> is
+            <see langword="null"/> or contains only whitespace character(s); or
+            if the supplied <paramref name="handlerType"/> is
+            <see langword="null"/>.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If the supplied <paramref name="handlerType"/> is not a 
+            <see cref="T:System.Type"/> that derives from the
+            <see cref="T:Spring.Core.IO.IResource"/> interface; or (having passed
+            this first check), the supplied <paramref name="handlerType"/>
+            does not expose a constructor that takes a single
+            <see cref="T:System.String"/> parameter.
+            </exception>
+        </member>
+        <member name="T:Spring.Core.IO.FileSystemResource">
+            <summary>
+            A <see cref="T:System.IO.File"/> backed resource.
+            </summary>
+            <remarks>
+            <p>
+            Supports resolution as both a <see cref="T:System.IO.FileInfo"/> and a
+            <see cref="T:System.Uri"/>.
+            </p>
+            <p>
+            Also supports the use of the <c>~</c> character. If the <c>~</c> character
+            is the first character in a resource path (sans protocol), the <c>~</c>
+            character will be replaced with the value of the
+            <c>System.AppDomain.CurrentDomain.BaseDirectory</c> property (an example of
+            this can be seen in the examples below).
+            </p>
+            </remarks>
+            <example>
+            <p>
+            Consider the example of an application that is running (has been launched
+            from) the <c>C:\App\</c> directory. The following resource paths will map
+            to the following resources on the filesystem...
+            </p>
+            <code escaped="true">
+                strings.txt              C:\App\strings.txt
+                ~/strings.txt            C:\App\strings.txt
+                file://~/strings.txt     C:\App\strings.txt
+                file://~/../strings.txt  C:\strings.txt
+                ../strings.txt           C:\strings.txt
+                ~/../strings.txt         C:\strings.txt
+                
+                // note that only a leading ~ character is resolved to the executing directory...
+                stri~ngs.txt              C:\App\stri~ngs.txt
+            </code>
+            </example>
+            <author>Juergen Hoeller</author>
+            <author>Leonardo Susatyo (.NET)</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: FileSystemResource.cs,v 1.23 2007/08/08 17:46:55 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.IO.FileSystemResource.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.IO.FileSystemResource"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.IO.FileSystemResource.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Core.IO.FileSystemResource"/> class.
+            </summary>
+            <param name="resourceName">
+            The name of the file system resource.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="resourceName"/> is
+            <see langword="null"/> or contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Core.IO.FileSystemResource.#ctor(System.String,System.Boolean)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Core.IO.FileSystemResource"/> class.
+            </summary>
+            <param name="resourceName">
+            The name of the file system resource.
+            </param>
+            <param name="suppressInitialize">
+            Supresses initialization of this instance. Used from derived classes.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="resourceName"/> is
+            <see langword="null"/> or contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Core.IO.FileSystemResource.Initialize(System.String)">
+            <summary>
+            Initializes this instance.
+            </summary>
+            <param name="resourceName"></param>
+        </member>
+        <member name="M:Spring.Core.IO.FileSystemResource.ResolveFileHandle(System.String)">
+            <summary>
+            Resolves the <see cref="T:System.IO.FileInfo"/> handle 
+            for the supplied <paramref name="resourceName"/>.
+            </summary>
+            <param name="resourceName">
+            The name of the file system resource.
+            </param>
+            <returns>
+            The <see cref="T:System.IO.FileInfo"/> handle for this resource.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.FileSystemResource.ResolveRootLocation(System.String)">
+            <summary>
+            Resolves the root location for the supplied <paramref name="resourceName"/>.
+            </summary>
+            <param name="resourceName">
+            The name of the file system resource.
+            </param>
+            <returns>
+            The root location of the resource.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.FileSystemResource.ResolveResourcePath(System.String)">
+            <summary>
+            Resolves the path for the supplied <paramref name="resourceName"/>.
+            </summary>
+            <param name="resourceName">
+            The name of the file system resource.
+            </param>
+            <returns>
+            The current path of the resource.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.FileSystemResource.ResolveBasePathPlaceHolder(System.String,System.String)">
+            <summary>
+            Resolves the presence of the
+            <paramref name="basePathPlaceHolder"/> value
+            in the supplied <paramref name="resourceName"/> into a path.
+            </summary>
+            <param name="resourceName">
+            The name of the resource.
+            </param>
+            <param name="basePathPlaceHolder">
+            The string that is a placeholder for a base path.
+            </param>
+            <returns>
+            The name of the resource with any <paramref name="basePathPlaceHolder"/>
+            value having been resolved into an actual path.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.FileSystemResource.IsRelativeResource(System.String)">
+            <summary>
+            Does the supplied <paramref name="resourceName"/> relative ?
+            </summary>
+            <param name="resourceName">
+            The name of the resource to test.
+            </param>
+            <returns>
+            <see langword="true"/> if resource name is relative; 
+            otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Core.IO.FileSystemResource.File">
+            <summary>
+            Returns the underlying <see cref="T:System.IO.FileInfo"/> handle for
+            this resource.
+            </summary>
+            <value>
+            The <see cref="T:System.IO.FileInfo"/> handle for this resource.
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.File"/>
+        </member>
+        <member name="P:Spring.Core.IO.FileSystemResource.SupportsRelativeResources">
+            <summary>
+            Does this <see cref="T:Spring.Core.IO.IResource"/> support relative
+            resource retrieval?
+            </summary>
+            <remarks>
+            <p>
+            This implementation does support relative resource retrieval, and
+            so will always return <see langword="true"/>.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if this
+            <see cref="T:Spring.Core.IO.IResource"/> supports relative resource
+            retrieval.
+            </value>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.SupportsRelativeResources"/>
+        </member>
+        <member name="P:Spring.Core.IO.FileSystemResource.RootLocation">
+            <summary>
+            Gets the root location of the resource (a drive or UNC file share
+            name in this case).
+            </summary>
+            <value>
+            The root location of the resource.
+            </value>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.RootLocation"/>
+        </member>
+        <member name="P:Spring.Core.IO.FileSystemResource.ResourcePath">
+            <summary>
+            Gets the current path of the resource.
+            </summary>
+            <value>
+            The current path of the resource.
+            </value>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.ResourcePath"/>
+        </member>
+        <member name="P:Spring.Core.IO.FileSystemResource.PathSeparatorChars">
+            <summary>
+            Gets those characters that are valid path separators for the
+            resource type.
+            </summary>
+            <value>
+            Those characters that are valid path separators for the resource
+            type.
+            </value>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.PathSeparatorChars"/>
+            <seealso cref="T:System.IO.Path"/>
+        </member>
+        <member name="P:Spring.Core.IO.FileSystemResource.InputStream">
+            <summary>
+            Return an <see cref="T:System.IO.Stream"/> for this resource.
+            </summary>
+            <value>
+            An <see cref="T:System.IO.Stream"/>.
+            </value>
+            <exception cref="T:System.IO.IOException">
+            If the stream could not be opened.
+            </exception>
+            <exception cref="T:System.IO.FileNotFoundException">
+            If the underlying file could not be found.
+            </exception>
+            <seealso cref="T:Spring.Core.IO.IInputStreamSource"/>
+        </member>
+        <member name="P:Spring.Core.IO.FileSystemResource.Description">
+            <summary>
+            Returns a description for this resource.
+            </summary>
+            <value>
+            A description for this resource.
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.Description"/>
+        </member>
+        <member name="P:Spring.Core.IO.FileSystemResource.Uri">
+            <summary>
+            Returns the <see cref="T:System.Uri"/> handle for this resource.
+            </summary>
+            <value>
+            The <see cref="T:System.Uri"/> handle for this resource.
+            </value>
+            <exception cref="T:System.IO.IOException">
+            If the resource is not available or cannot be exposed as a
+            <see cref="T:System.Uri"/>.
+            </exception>
+            <seealso cref="P:Spring.Core.IO.IResource.Uri"/>
+        </member>
+        <member name="T:Spring.Context.Support.DefaultSectionHandler">
+            <summary>
+            Default section handler that can handle any configuration section.
+            </summary>
+            <remarks>
+            <p>
+            Simply returns the configuration section as an <see cref="T:System.Xml.XmlElement"/>.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DefaultSectionHandler.cs,v 1.4 2006/04/09 07:18:38 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Context.Support.DefaultSectionHandler.Create(System.Object,System.Object,System.Xml.XmlNode)">
+            <summary>
+            Returns the configuration section as an <see cref="T:System.Xml.XmlElement"/>
+            </summary>
+            <param name="parent">
+            The configuration settings in a corresponding parent
+            configuration section.
+            </param>
+            <param name="configContext">
+            The configuration context when called from the ASP.NET
+            configuration system. Otherwise, this parameter is reserved and
+            is a null reference.
+            </param>
+            <param name="section">
+            The <see cref="T:System.Xml.XmlNode"/> for the section.
+            </param>
+            <returns>Config section as XmlElement.</returns>
+        </member>
+        <member name="T:Spring.Context.Support.ApplicationContextAwareProcessor">
+            <summary>
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            implementation that passes the application context to object that
+            implement the
+            <see cref="T:Spring.Context.IApplicationContextAware"/>,
+            <see cref="T:Spring.Context.IMessageSourceAware"/>, and
+            <see cref="T:Spring.Context.IResourceLoaderAware"/> interfaces. 
+            </summary>
+            <remarks>
+            <p>
+            If an object's class implements more than one of the
+            <see cref="T:Spring.Context.IApplicationContextAware"/>,
+            <see cref="T:Spring.Context.IMessageSourceAware"/>, and
+            <see cref="T:Spring.Context.IResourceLoaderAware"/> interfaces, then the
+            order in which the interfaces are satisfied is as follows...
+            <list type="bullet">
+            <item><description>
+            <see cref="T:Spring.Context.IResourceLoaderAware"/>
+            </description></item>
+            <item><description>
+            <see cref="T:Spring.Context.IMessageSourceAware"/>
+            </description></item>
+            <item><description>
+            <see cref="T:Spring.Context.IApplicationContextAware"/>
+            </description></item>
+            </list>
+            </p>
+            <p>
+            Application contexts will automatically register this with their
+            underlying object factory. Applications should thus never need to use
+            this class directly.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: ApplicationContextAwareProcessor.cs,v 1.8 2007/08/22 08:49:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Context.Support.ApplicationContextAwareProcessor.#ctor(Spring.Context.IApplicationContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.ApplicationContextAwareProcessor"/> class.
+            </summary>
+            <param name="applicationContext">
+            The <see cref="T:Spring.Context.IApplicationContext"/> that this
+            instance will work with.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.ApplicationContextAwareProcessor.PostProcessAfterInitialization(System.Object,System.String)">
+            <summary>
+            Apply this <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>
+            to the given new object instance <i>before</i> any object
+            initialization callbacks.
+            </summary>
+            <param name="obj">
+            The new object instance.
+            </param>
+            <param name="objectName">
+            The name of the object.
+            </param>
+            <returns>
+            The the object instance to use, either the original or a wrapped one.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.ApplicationContextAwareProcessor.PostProcessBeforeInitialization(System.Object,System.String)">
+            <summary>
+            Apply this <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/> to the
+            given new object instance <i>after</i> any object initialization
+            callbacks.
+            </summary>
+            <param name="obj">
+            The new object instance.
+            </param>
+            <param name="name">
+            The name of the object.
+            </param>
+            <returns>
+            The object instance to use, either the original or a wrapped one.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization(System.Object,System.String)"/>
+        </member>
+        <member name="T:Spring.Context.IMessageSourceAware">
+            <summary>
+            To be implemented by any object that wishes to be notified
+            of the <see cref="T:Spring.Context.IMessageSource"/> associated with it.
+            </summary>
+            <remarks>
+            <p>
+            In the current implementation, the
+            <see cref="T:Spring.Context.IMessageSource"/> will typically be the
+            associated <see cref="T:Spring.Context.IApplicationContext"/> that
+            spawned the implementing object.
+            </p>
+            <p>
+            The <see cref="T:Spring.Context.IMessageSource"/> can usually also be
+            passed on as an object reference to arbitrary object properties or
+            constructor arguments, because a
+            <see cref="T:Spring.Context.IMessageSource"/> is typically defined as an
+            object with the well known name <c>"messageSource"</c> in the
+            associated application context.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: IMessageSourceAware.cs,v 1.4 2006/04/09 07:18:38 markpollack Exp $</version>
+            <seealso cref="T:Spring.Objects.Factory.IInitializingObject"/>
+        </member>
+        <member name="P:Spring.Context.IMessageSourceAware.MessageSource">
+            <summary>
+            Sets the <see cref="T:Spring.Context.IMessageSource"/> associated
+            with this object.
+            </summary>
+            <remarks>
+            <p>
+            Invoked <b>after</b> population of normal object properties but
+            <b>before</b> an initializing callback such as the
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            method of the
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/> interface
+            or a custom init-method.
+            </p>
+            <p>
+            It is also invoked <b>before</b> the
+            <see cref="P:Spring.Context.IApplicationContextAware.ApplicationContext"/>
+            property of any
+            <see cref="T:Spring.Context.IApplicationContextAware"/>
+            implementation.
+            </p>
+            </remarks>
+            <value>
+            The <see cref="T:Spring.Context.IMessageSource"/> associated
+            with this object.
+            </value>
+        </member>
+        <member name="T:Spring.Caching.CacheParameterAttribute">
+            <summary>
+            This attribute should be used to mark methods whose argument(s) 
+            need to be cached.
+            </summary>
+            <remarks>
+            <p>
+            This attribute allows application developers to specify that an argument 
+            of the method should be cached, but it will not do any caching by itself.
+            </p>
+            <p>
+            In order to actually cache the result, an application developer
+            must apply a <c>Spring.Aspects.Cache.CacheParameterAdvice</c> to
+            all of the members that have this attribute defined.
+            </p>
+            <p>
+            You can specify this attribute multiple times on the same method in order to
+            cache several method parameters.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CacheParameterAttribute.cs,v 1.2 2007/03/31 01:07:26 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Caching.CacheParameterAttribute.#ctor">
+            <summary>
+            Creates an attribute instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Caching.CacheParameterAttribute.#ctor(System.String,System.String)">
+            <summary>
+            Creates an attribute instance.
+            </summary>
+            <param name="cacheName">
+            The name of the cache to use.
+            </param>
+            <param name="key">
+            An expression string that should be evaluated in order to determine
+            the cache key for the item.
+            </param>
+        </member>
+        <member name="T:Spring.Validation.Actions.ErrorMessageAction">
+            <summary>
+            Implementation of <see cref="T:Spring.Validation.IValidationAction"/> that adds error message
+            to the validation errors container.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ErrorMessageAction.cs,v 1.5 2008/02/05 20:40:25 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Validation.BaseValidationAction">
+            <summary>
+            Abstract base class that should be extended by all
+            validation actions.
+            </summary>
+            <remarks>
+            <p>
+            This class implements template <c>Execute</c> method
+            and defines <c>OnValid</c> and <c>OnInvalid</c> methods that 
+            can be overriden
+            by specific validation actions.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: BaseValidationAction.cs,v 1.6 2008/02/05 20:40:26 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Validation.IValidationAction">
+            <summary>
+            An action that should be executed after validator is evaluated.
+            </summary>
+            <remarks>
+            <p>
+            This interface allows us to define the actions that should be executed
+            after validation in a generic fashion.
+            </p>
+            <p>
+            For example, addition of error messages to validation errors collection
+            is performed by one specific implementation of this interface, <see cref="T:Spring.Validation.Actions.ErrorMessageAction"/>.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IValidationAction.cs,v 1.4 2008/02/05 20:40:26 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Validation.IValidationAction.Execute(System.Boolean,System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Executes the action.
+            </summary>
+            <param name="isValid">Whether associated validator is valid or not.</param>
+            <param name="validationContext">Validation context.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors">Validation errors container.</param>
+        </member>
+        <member name="M:Spring.Validation.BaseValidationAction.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.BaseValidationAction"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.BaseValidationAction.Execute(System.Boolean,System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Executes the action.
+            </summary>
+            <param name="isValid">Whether associated validator is valid or not.</param>
+            <param name="validationContext">Validation context.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors">Validation errors container.</param>
+        </member>
+        <member name="M:Spring.Validation.BaseValidationAction.OnValid(System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Called when associated validator is valid.
+            </summary>
+            <param name="validationContext">Validation context.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors">Validation errors container.</param>
+        </member>
+        <member name="M:Spring.Validation.BaseValidationAction.OnInvalid(System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Called when associated validator is not valid.
+            </summary>
+            <param name="validationContext">Validation context.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors">Validation errors container.</param>
+        </member>
+        <member name="M:Spring.Validation.BaseValidationAction.EvaluateWhen(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Evaluates 'when' expression.
+            </summary>
+            <param name="rootContext">Root context to use for expression evaluation.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <returns><c>True</c> if the condition is true, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="P:Spring.Validation.BaseValidationAction.When">
+            <summary>
+            Gets or sets the expression that determines if this validator should be evaluated.
+            </summary>
+            <value>The expression that determines if this validator should be evaluated.</value>
+        </member>
+        <member name="M:Spring.Validation.Actions.ErrorMessageAction.#ctor(System.String,System.String[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.Actions.ErrorMessageAction"/> class.
+            </summary>
+            <param name="messageId">Error message resource identifier.</param>
+            <param name="providers">Names of the error providers this message should be added to.</param>
+        </member>
+        <member name="M:Spring.Validation.Actions.ErrorMessageAction.OnInvalid(System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Called when associated validator is invalid.
+            </summary>
+            <param name="validationContext">Validation context.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors">Validation errors container.</param>
+        </member>
+        <member name="M:Spring.Validation.Actions.ErrorMessageAction.CreateErrorMessage(System.Object,System.Collections.IDictionary)">
+            <summary>
+            Resolves the error message.
+            </summary>
+            <param name="validationContext">Validation context to resolve message parameters against.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <returns>Resolved error message</returns>
+        </member>
+        <member name="M:Spring.Validation.Actions.ErrorMessageAction.ResolveMessageParameters(System.Collections.IList,System.Object,System.Collections.IDictionary)">
+            <summary>
+            Resolves the message parameters.
+            </summary>
+            <param name="messageParams">List of parameters to resolve.</param>
+            <param name="validationContext">Validation context to resolve parameters against.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <returns>Resolved message parameters.</returns>
+        </member>
+        <member name="P:Spring.Validation.Actions.ErrorMessageAction.Parameters">
+            <summary>
+            Sets the expressions that should be resolved to error message parameters.
+            </summary>
+            <value>The expressions that should be resolved to error message parameters.</value>
+        </member>
+        <member name="T:Spring.Util.DelegateInfo">
+            <summary>
+            Discovers the attributes of a <see cref="T:System.Delegate"/>
+            <see cref="T:System.Type"/> and provides access to the
+            <see cref="T:System.Delegate"/> <see cref="T:System.Type"/>s metadata.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: DelegateInfo.cs,v 1.9 2006/04/09 07:19:00 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Util.DelegateInfo.InvocationMethod">
+            <summary>
+            The method name associated with a delegate invocation.
+            </summary>
+        </member>
+        <member name="M:Spring.Util.DelegateInfo.#ctor(System.Reflection.EventInfo)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Util.DelegateInfo"/> class.
+            </summary>
+            <param name="eventMeta">
+            The event used to extract the delegate <see cref="T:System.Type"/>
+            from.
+            </param>
+            <exception cref="T:System.NullReferenceException">
+            if the supplied <paramref name="eventMeta"/> is
+            <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.DelegateInfo.#ctor(System.Type)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Util.DelegateInfo"/> class.
+            </summary>
+            <param name="type">
+            The delegate <see cref="T:System.Type"/>.
+            </param>
+            <exception cref="T:System.ArgumentException">
+            If the supplied <see cref="T:System.Type"/> is not a subclass of the
+            <see cref="T:System.Delegate"/> class, or is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.DelegateInfo.IsSignatureCompatible(System.Reflection.MethodInfo)">
+            <summary>
+            Checks to see if the method encapsulated by the supplied method
+            metadata is compatible with the method signature associated with
+            this delegate type.
+            </summary>
+            <param name="method">The method to be checked.</param>
+            <returns>
+            <see langword="true"/> if the method signature is compatible with
+            the signature of this delegate; <see langword="false"/> if not, or
+            if the supplied <paramref name="method"/> parameter is
+            <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.DelegateInfo.GetParameterTypes">
+            <summary>
+            Gets the <see cref="T:System.Type"/>s of the parameters of the
+            method signature associated with this delegate type.
+            </summary>
+            <remarks>
+            <p>
+            This method will never return <see langword="null"/>; the returned
+            <see cref="T:System.Type"/> array may be empty, but it most certainly
+            will not be <see langword="null"/>.
+            </p>
+            </remarks>
+            <returns>
+            A <see cref="T:System.Type"/> array of the parameter
+            <see cref="T:System.Type"/>s; or the <see cref="F:System.Type.EmptyTypes"/>
+            array if the method signature has no parameters.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.DelegateInfo.GetReturnType">
+            <summary>
+            Gets the return <see cref="T:System.Type"/> of the 
+            method signature associated with this delegate type.
+            </summary>
+            <returns>The return <see cref="T:System.Type"/>.</returns>
+        </member>
+        <member name="M:Spring.Util.DelegateInfo.GetMethod">
+            <summary>
+            Gets the metadata about the method signature associated
+            with this delegate type.
+            </summary>
+            <returns>
+            The metadata about the method signature associated
+            with this delegate type.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.DelegateInfo.IsDelegate(System.Type)">
+            <summary>
+            Determines whether the supplied <see cref="T:System.Type"/>
+            is a <see cref="T:System.Delegate"/> type.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> to be checked.
+            </param>
+            <returns>
+            <see langword="true"/> if the supplied <see cref="T:System.Type"/>
+            is a <see cref="T:System.Delegate"/> <see cref="T:System.Type"/>;
+            <see langword="false"/> if not or the supplied
+            <paramref name="type"/> is <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.DelegateInfo.IsSignatureCompatible(System.Reflection.EventInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Checks if the signature of the supplied <paramref name="handlerMethod"/>
+            is compatible with the signature expected by the supplied
+            <paramref name="eventMeta"/>.
+            </summary>
+            <param name="eventMeta">The event to be checked against.</param>
+            <param name="handlerMethod">
+            The method signature to check for compatibility.
+            </param>
+            <returns>
+            <see langword="true"/> if the signature of the supplied
+            <paramref name="handlerMethod"/> is compatible with the signature
+            expected by the supplied <paramref name="eventMeta"/>;
+            <see langword="false"/> if not or either of the supplied
+            parameters is <see langword="null"/>. 
+            </returns>
+            <seealso cref="M:Spring.Util.DelegateInfo.IsSignatureCompatible(System.Reflection.MethodInfo)"/>
+        </member>
+        <member name="P:Spring.Util.DelegateInfo.DelegateType">
+            <summary>
+            The <see cref="T:System.Type"/> of the delegate.
+            </summary>
+        </member>
+        <member name="T:Spring.Util.ConfigurationUtils">
+            <summary>
+            Utility class for .NET configuration files management.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ConfigurationUtils.cs,v 1.5 2008/01/10 16:37:43 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Util.ConfigurationUtils.GetSection(System.String)">
+            <summary>
+            Parses the configuration section.
+            </summary>
+            <remarks>
+            <p>
+            Primary purpose of this method is to allow us to parse and 
+            load configuration sections using the same API regardless
+            of the .NET framework version.
+            </p>
+            <p>
+            If Microsoft paid a bit more attention to preserving backwards
+            compatibility we would not even need it, but... :(
+            </p>
+            </remarks>
+            <param name="sectionName">Name of the configuration section.</param>
+            <returns>Object created by a corresponding <see cref="T:System.Configuration.IConfigurationSectionHandler"/>.</returns>
+        </member>
+        <member name="M:Spring.Util.ConfigurationUtils.RefreshSection(System.String)">
+            <summary>
+            Refresh the configuration section.
+            </summary>
+            <remarks>
+            <p>
+            Primary purpose of this method is to allow us to parse and 
+            load configuration sections using the same API regardless
+            of the .NET framework version.
+            </p>
+            <p>
+            If Microsoft paid a bit more attention to preserving backwards
+            compatibility we would not even need it, but... :(
+            </p>
+            </remarks>
+            <param name="sectionName">Name of the configuration section.</param>
+        </member>
+        <member name="M:Spring.Util.ConfigurationUtils.CreateConfigurationException(System.String,System.Exception,System.String,System.Int32)">
+            <summary>
+            Creates the configuration exception.
+            </summary>
+            <param name="message">The message to display to the client when the exception is thrown.</param>
+            <param name="inner">The inner exception.</param>
+            <param name="fileName">Name of the configuration file.</param>
+            <param name="line">The line where exception occured.</param>
+            <returns>Configuration exception.</returns>
+        </member>
+        <member name="M:Spring.Util.ConfigurationUtils.CreateConfigurationException(System.String,System.String,System.Int32)">
+            <summary>
+            Creates the configuration exception.
+            </summary>
+            <param name="message">The message to display to the client when the exception is thrown.</param>
+            <param name="fileName">Name of the configuration file.</param>
+            <param name="line">The line where exception occured.</param>
+            <returns>Configuration exception.</returns>
+        </member>
+        <member name="M:Spring.Util.ConfigurationUtils.CreateConfigurationException(System.String,System.Exception,System.Xml.XmlNode)">
+            <summary>
+            Creates the configuration exception.
+            </summary>
+            <param name="message">The message to display to the client when the exception is thrown.</param>
+            <param name="inner">The inner exception.</param>
+            <param name="node">XML node where exception occured.</param>
+            <returns>Configuration exception.</returns>
+        </member>
+        <member name="M:Spring.Util.ConfigurationUtils.CreateConfigurationException(System.String,System.Xml.XmlNode)">
+            <summary>
+            Creates the configuration exception.
+            </summary>
+            <param name="message">The message to display to the client when the exception is thrown.</param>
+            <param name="node">XML node where exception occured.</param>
+            <returns>Configuration exception.</returns>
+        </member>
+        <member name="M:Spring.Util.ConfigurationUtils.CreateConfigurationException(System.String,System.Exception)">
+            <summary>
+            Creates the configuration exception.
+            </summary>
+            <param name="message">The message to display to the client when the exception is thrown.</param>
+            <param name="inner">The inner exception.</param>
+            <returns>Configuration exception.</returns>
+        </member>
+        <member name="M:Spring.Util.ConfigurationUtils.CreateConfigurationException(System.String)">
+            <summary>
+            Creates the configuration exception.
+            </summary>
+            <param name="message">The message to display to the client when the exception is thrown.</param>
+            <returns>Configuration exception.</returns>
+        </member>
+        <member name="M:Spring.Util.ConfigurationUtils.CreateConfigurationException">
+            <summary>
+            Creates the configuration exception.
+            </summary>
+            <returns>Configuration exception.</returns>
+        </member>
+        <member name="M:Spring.Util.ConfigurationUtils.IsConfigurationException(System.Exception)">
+            <summary>
+            Determines whether the specified exception is configuration exception.
+            </summary>
+            <param name="exception">The exception to check.</param>
+            <returns>
+            	<c>true</c> if the specified exception is configuration exception; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.ConfigurationUtils.GetLineNumber(System.Xml.XmlNode)">
+            <summary>
+            Returns the line number of the specified node.
+            </summary>
+            <param name="node">Node to get the line number for.</param>
+            <returns>The line number of the specified node.</returns>
+        </member>
+        <member name="M:Spring.Util.ConfigurationUtils.GetFileName(System.Xml.XmlNode)">
+            <summary>
+            Returns the name of the file specified node is defined in.
+            </summary>
+            <param name="node">Node to get the file name for.</param>
+            <returns>The name of the file specified node is defined in.</returns>
+        </member>
+        <member name="T:Spring.Util.CompareUtils">
+            <summary>
+            Utility class containing helper methods for object comparison.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CompareUtils.cs,v 1.2 2007/02/17 08:28:12 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Util.CompareUtils.Compare(System.Object,System.Object)">
+            <summary>Compares two objects.</summary>
+            <param name="first">First object.</param>
+            <param name="second">Second object.</param>
+            <returns>
+            0, if objects are equal; 
+            less than zero, if the first object is smaller than the second one;
+            greater than zero, if the first object is greater than the second one.</returns>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.IDynamicConstructor">
+            <summary>
+            Defines constructors that dynamic constructor class has to implement.
+            </summary>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.IDynamicConstructor.Invoke(System.Object[])">
+            <summary>
+            Invokes dynamic constructor.
+            </summary>
+            <param name="arguments">
+            Constructor arguments.
+            </param>
+            <returns>
+            A constructor value.
+            </returns>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.SafeConstructor">
+            <summary>
+            Safe wrapper for the dynamic constructor.
+            </summary>
+            <remarks>
+            <see cref="T:Spring.Reflection.Dynamic.SafeConstructor"/> will attempt to use dynamic
+            constructor if possible, but it will fall back to standard
+            reflection if necessary.
+            </remarks>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeConstructor.#ctor(System.Reflection.ConstructorInfo)">
+            <summary>
+            Creates a new instance of the safe constructor wrapper.
+            </summary>
+            <param name="constructor">Constructor to wrap.</param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeConstructor.Invoke(System.Object[])">
+            <summary>
+            Invokes dynamic constructor.
+            </summary>
+            <param name="arguments">
+            Constructor arguments.
+            </param>
+            <returns>
+            A constructor value.
+            </returns>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.DynamicConstructor">
+            <summary>
+            Factory class for dynamic constructors.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DynamicConstructor.cs,v 1.1 2007/08/08 04:05:37 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicConstructor.Create(System.Reflection.ConstructorInfo)">
+            <summary>
+            Creates dynamic constructor instance for the specified <see cref="T:System.Reflection.ConstructorInfo"/>.
+            </summary>
+            <param name="constructor">Constructor info to create dynamic constructor for.</param>
+            <returns>Dynamic constructor for the specified <see cref="T:System.Reflection.ConstructorInfo"/>.</returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.ObjectsNamespaceParser">
+            <summary>
+            Default implementation of the
+            <see cref="T:Spring.Objects.Factory.Xml.INamespaceParser"/> interface.
+            </summary>
+            <remarks>
+            <p>
+            Parses object definitions according to the standard Spring.NET schema.
+            </p>
+            <p>
+            This schema is <b>typically</b> located at
+            <a href="http://www.springframework.net/xsd/spring-objects.xsd">http://www.springframework.net/xsd/spring-objects.xsd</a>.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: ObjectsNamespaceParser.cs,v 1.7 2007/11/26 14:15:54 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.Namespace">
+            <summary>
+            The namespace URI for the standard Spring.NET object definition schema.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.log">
+            <summary>
+            The shared <see cref="T:Common.Logging.ILog"/> instance for this class (and derived classes).
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.Init">
+            <summary>
+            Invoked by <see cref="T:Spring.Objects.Factory.Xml.NamespaceParserRegistry"/> after construction but before any
+            elements have been parsed.
+            </summary>
+            <remarks>This is a NoOp</remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.ParseElement(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parse the specified element and register any resulting
+            IObjectDefinitions with the IObjectDefinitionRegistry that is
+            embedded in the supplied ParserContext.
+            </summary>
+            <param name="element">The element to be parsed into one or more IObjectDefinitions</param>
+            <param name="parserContext">The object encapsulating the current state of the parsing
+            process.</param>
+            <returns>
+            The primary IObjectDefinition (can be null as explained above)
+            </returns>
+            <remarks>
+            Implementations should return the primary IObjectDefinition
+            that results from the parse phase if they wish to used nested
+            inside (for example) a <code>&lt;property&gt;</code> tag.
+            <para>Implementations may return null if they will not
+            be used in a nested scenario.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.Decorate(System.Xml.XmlNode,Spring.Objects.Factory.Config.ObjectDefinitionHolder,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parse the specified XmlNode and decorate the supplied ObjectDefinitionHolder,
+            returning the decorated definition.
+            </summary>
+            <remarks>The XmlNode may either be an XmlAttribute or an XmlElement, depending on
+            whether a custom attribute or element is being parsed.
+            <para>Implementations may choose to return a completely new definition,
+            which will replace the original definition in the resulting IApplicationContext/IObjectFactory.
+            </para>
+            <para>The supplied ParserContext can be used to register any additional objects needed to support
+            the main definition.</para>
+            </remarks>
+            <param name="node">The source element or attribute that is to be parsed.</param>
+            <param name="definition">The current object definition.</param>
+            <param name="parserContext">The object encapsulating the current state of the parsing
+            process.</param>
+            <returns>The decorated definition (to be registered in the IApplicationContext/IObjectFactory),
+            or simply the original object definition if no decoration is required.  A null value is strickly
+            speaking invalid, but will leniently treated like the case where the original object definition
+            gets returned.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.ImportObjectDefinitionResource(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Loads external XML object definitions from the resource described by the supplied
+            <paramref name="resource"/>.
+            </summary>
+            <param name="resource">The XML element describing the resource.</param>
+            <param name="parserContext">The parser context.</param>
+            <exception cref="T:Spring.Objects.Factory.ObjectDefinitionStoreException">
+            If the resource could not be imported.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.ParseEventListenerDefinition(System.String,Spring.Objects.Factory.Config.EventValues,System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>Parses an event listener definition.</summary>
+            <param name="name">
+            The name associated with the object that the event handler is being defined on.
+            </param>
+            <param name="events">The events being populated.</param>
+            <param name="element">
+            The element containing the event listener definition.
+            </param>
+            <param name="parserHelper">
+            The namespace-aware parser.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.RegisterObjectDefinition(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parse an object definition and register it with the object factory..
+            </summary>
+            <param name="element">The element containing the object definition.</param>
+            <param name="parserContext">The parser context.</param>
+            <seealso cref="M:Spring.Objects.Factory.Support.ObjectDefinitionReaderUtils.RegisterObjectDefinition(Spring.Objects.Factory.Config.ObjectDefinitionHolder,Spring.Objects.Factory.Support.IObjectDefinitionRegistry)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.ParseObjectDefinition(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parse a standard object definition into a
+            <see cref="T:Spring.Objects.Factory.Config.ObjectDefinitionHolder"/>,
+            including object name and aliases.
+            </summary>
+            <param name="element">The element containing the object definition.</param>
+            <param name="parserContext">The parser context.</param>
+            <returns>
+            The object (definition) wrapped within an
+            <see cref="T:Spring.Objects.Factory.Config.ObjectDefinitionHolder"/>
+            instance.
+            </returns>
+            <remarks>
+            	<p>
+            Object elements specify their canonical name via the "id" attribute
+            and their aliases as a delimited "name" attribute.
+            </p>
+            	<p>
+            If no "id" is specified, uses the first name in the "name" attribute
+            as the canonical name, registering all others as aliases.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.CalculateId(System.Xml.XmlElement,System.Collections.ArrayList)">
+            <summary>
+            Calculates an id for an object definition.
+            </summary>
+            <remarks>
+            <p>
+            Called when an object definition has not been explicitly defined
+            with an id.
+            </p>
+            </remarks>
+            <param name="element">
+            The element containing the object definition.
+            </param>
+            <param name="aliases">
+            The list of names defined for the object; may be <see lang="null"/>
+            or even empty.
+            </param>
+            <returns>
+            A calculated object definition id.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.ParseObjectDefinition(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parse a standard object definition.
+            </summary>
+            <param name="element">The element containing the object definition.</param>
+            <param name="id">The id of the object definition.</param>
+            <param name="parserHelper">parsing state holder</param>
+            <returns>The object (definition).</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.GetMethodOverrideSubElements(System.String,System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parse method override argument subelements of the given object element.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.ParseLookupMethodElement(System.String,Spring.Objects.Factory.Support.MethodOverrides,System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parse <see cref="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.LookupMethodElement"/> element and add parsed element to <paramref name="overrides"/>
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.ParseReplacedMethodElement(System.String,Spring.Objects.Factory.Support.MethodOverrides,System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parse <see cref="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ReplacedMethodElement"/> element and add parsed element to <paramref name="overrides"/>
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.GetConstructorArgSubElements(System.String,System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parse constructor argument subelements of the given object element.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.GetEventHandlerSubElements(System.String,System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parse event handler subelements of the given object element.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.GetPropertyValueSubElements(System.String,System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parse property value subelements of the given object element.
+            </summary>
+            <param name="name">
+            The name of the object (definition) associated with the property element (s)
+            </param>
+            <param name="element">
+            The element containing the top level object definition.
+            </param>
+            <param name="parserHelper">
+            The namespace-aware parser.
+            </param>
+            <returns>
+            The property (s) associated with the object (definition).
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.ParseConstructorArgElement(System.String,Spring.Objects.Factory.Config.ConstructorArgumentValues,System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parse a constructor-arg element.
+            </summary>
+            <param name="name">
+            The name of the object (definition) associated with the ctor arg.
+            </param>
+            <param name="arguments">
+            The list of constructor args associated with the object (definition).
+            </param>
+            <param name="element">
+            The name of the element containing the ctor arg definition.
+            </param>
+            <param name="parserHelper">
+            The namespace-aware parser.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.ParsePropertyElement(System.String,Spring.Objects.MutablePropertyValues,System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parse a property element.
+            </summary>
+            <param name="name">
+            The name of the object (definition) associated with the property.
+            </param>
+            <param name="properties">
+            The list of properties associated with the object (definition).
+            </param>
+            <param name="element">
+            The name of the element containing the property definition.
+            </param>
+            <param name="parserHelper">
+            The namespace-aware parser.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.GetPropertyValue(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Get the value of a property element (may be a list).</summary>
+            <remarks>
+            <p>
+            Please note that even though this method is named Get<b>Property</b>Value,
+            it is called by both the property and constructor argument element
+            handlers.
+            </p>
+            </remarks>
+            <param name="element">The property element.</param>
+            <param name="name">
+            The name of the object associated with the property.
+            </param>
+            <param name="parserHelper">
+            The namespace-aware parser.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.ParsePropertySubElement(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parse a value, ref or collection subelement of a property element.
+            </summary>
+            <param name="element">
+            Subelement of property element; we don't know which yet.
+            </param>
+            <param name="name">
+            The name of the object (definition) associated with the top level property.
+            </param>
+            <param name="parserHelper">
+            The namespace-aware parser.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.GetList(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Gets a list definition.
+            </summary>
+            <param name="element">
+            The element describing the list definition.
+            </param>
+            <param name="name">
+            The name of the object (definition) associated with the list definition.
+            </param>
+            <param name="parserHelper">
+            The namespace-aware parser.
+            </param>
+            <returns>The list definition.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.GetSet(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Gets a set definition.
+            </summary>
+            <param name="element">
+            The element describing the set definition.
+            </param>
+            <param name="name">
+            The name of the object (definition) associated with the set definition.
+            </param>
+            <param name="parserHelper">
+            The namespace-aware parser.
+            </param>
+            <returns>The set definition.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.GetDictionary(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Gets a dictionary definition.
+            </summary>
+            <param name="element">
+            The element describing the dictionary definition.
+            </param>
+            <param name="name">
+            The name of the object (definition) associated with the dictionary definition.
+            </param>
+            <param name="parserHelper">
+            The namespace-aware parser.
+            </param>
+            <returns>The dictionary definition.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.SelectNodes(System.Xml.XmlElement,System.String)">
+            <summary>
+            Selects sub-elements with a given
+            <paramref name="childElementName">name</paramref>.
+            </summary>
+            <remarks>
+            <p>
+            Uses a namespace manager if necessary.
+            </p>
+            </remarks>
+            <param name="element">
+            The element to be searched in.
+            </param>
+            <param name="childElementName">
+            The name of the child nodes to look for.
+            </param>
+            <returns>
+            The child <see cref="T:System.Xml.XmlNode"/>s of the supplied
+            <paramref name="element"/> with the supplied
+            <paramref name="childElementName"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.SelectSingleNode(System.Xml.XmlElement,System.String)">
+            <summary>
+            Selects a single sub-element with a given
+            <paramref name="childElementName">name</paramref>.
+            </summary>
+            <remarks>
+            <p>
+            Uses a namespace manager if necessary.
+            </p>
+            </remarks>
+            <param name="element">
+            The element to be searched in.
+            </param>
+            <param name="childElementName">
+            The name of the child node to look for.
+            </param>
+            <returns>
+            The first child <see cref="T:System.Xml.XmlNode"/> of the supplied
+            <paramref name="element"/> with the supplied
+            <paramref name="childElementName"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.GetNameValues(System.Xml.XmlElement,System.String)">
+            <summary>
+            Gets a name value collection mapping definition.
+            </summary>
+            <param name="element">
+            The element describing the name value collection mapping definition.
+            </param>
+            <param name="name">
+            The name of the object (definition) associated with the
+            name value collection mapping definition.
+            </param>
+            <returns>The name value collection definition.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.GetTextValue(System.Xml.XmlElement,System.String)">
+            <summary>
+            Returns the text of the supplied <paramref name="element"/>,
+            or the empty string value if said <paramref name="element"/> is empty.
+            </summary>
+            <remarks>
+            <p>
+            If the supplied <paramref name="element"/> is <see langword="null"/>,
+            then the empty string value will be returned.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.GetDependencyCheck(System.String)">
+            <summary>
+            Strips the dependency check value out of the supplied string.
+            </summary>
+            <remarks>
+            <p>
+            If the supplied <paramref name="value"/> is an invalid dependency
+            checking mode, the invalid value will be logged and this method will
+            return the <see cref="F:Spring.Objects.Factory.Support.DependencyCheckingMode.None"/> value.
+            No exception will be raised.
+            </p>
+            </remarks>
+            <param name="value">
+            The string containing the dependency check value.
+            </param>
+            <returns>The dependency check value.</returns>
+            <seealso cref="T:Spring.Objects.Factory.Support.DependencyCheckingMode"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.GetAutowireMode(System.String)">
+            <summary>
+            Strips the autowiring mode out of the supplied string.
+            </summary>
+            <remarks>
+            <p>
+            If the supplied <paramref name="value"/> is an invalid autowiring mode,
+            the invalid value will be logged and this method will return the
+            <see cref="F:Spring.Objects.Factory.Config.AutoWiringMode.No"/> value. No exception will be raised.
+            </p>
+            </remarks>
+            <param name="value">
+            The string containing the autowiring mode definition.
+            </param>
+            <returns>The autowiring mode.</returns>
+            <seealso cref="T:Spring.Objects.Factory.Config.AutoWiringMode"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.GetObjectNames(System.String)">
+            <summary>
+            Given a string containing delimited object names, returns
+            a string array split on the object name delimeter.
+            </summary>
+            <param name="value">
+            The string containing delimited object names.
+            </param>
+            <returns>
+            A string array split on the object name delimeter.
+            </returns>
+            <seealso cref="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ObjectNameDelimiters"/>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.LookupMethodOverride">
+            <summary>
+            Represents an override of a method that looks up an object in the same IoC context.
+            </summary>
+            <remarks>
+            <p>
+            Methods eligible for lookup override must not have arguments.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: LookupMethodOverride.cs,v 1.3 2007/03/16 04:01:41 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.LookupMethodOverride.#ctor(System.String,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.LookupMethodOverride"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Methods eligible for lookup override must not have arguments.
+            </p>
+            </remarks>
+            <param name="methodName">
+            The name of the method that is to be overridden.
+            </param>
+            <param name="objectName">
+            The name of the object in the current IoC context that the
+            dependency injected method must return.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If either of the supplied arguments is <see langword="null"/> or
+            contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.LookupMethodOverride.Matches(System.Reflection.MethodInfo)">
+            <summary>
+            Does this <see cref="T:Spring.Objects.Factory.Support.MethodOverride"/>
+            match the supplied <paramref name="method"/>?
+            </summary>
+            <param name="method">The method to be checked.</param>
+            <returns>
+            <see lang="true"/> if this override matches the supplied <paramref name="method"/>.
+            </returns>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="method"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.LookupMethodOverride.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.LookupMethodOverride.ObjectName">
+            <summary>
+            The name of the object in the current IoC context that the
+            dependency injected method must return.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.ObjectIsNotAFactoryException">
+            <summary>
+            Thrown in response to an attempt to lookup a factory object, and
+            the object identified by the lookup key is not a factory.
+            </summary>
+            <remarks>
+            <p>
+            An object is a factory if it implements (either directly or indirectly
+            via inheritance) the <see cref="T:Spring.Objects.Factory.IFactoryObject"/>
+            interface.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: ObjectIsNotAFactoryException.cs,v 1.5 2006/04/09 07:18:49 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectIsNotAFactoryException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.ObjectIsNotAFactoryException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectIsNotAFactoryException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.ObjectIsNotAFactoryException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectIsNotAFactoryException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.ObjectIsNotAFactoryException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectIsNotAFactoryException.#ctor(System.String,System.Object)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.ObjectIsNotAFactoryException"/> class.
+            </summary>
+            <param name="name">
+            The name of the object that was being retrieved from the factory.
+            </param>
+            <param name="actualInstance">
+            The object instance that was retrieved.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectIsNotAFactoryException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.ObjectIsNotAFactoryException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer">
+            <summary>
+            Resolves placeholder values in one or more object definitions.
+            </summary>
+            <remarks>
+            <p>
+            The default placeholder syntax follows the NAnt style: <c>${...}</c>.
+            Instances of this class can be configured in the same way as any other
+            object in a Spring.NET container, and so custom placeholder prefix
+            and suffix values can be set via the <see cref="P:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.PlaceholderPrefix"/>
+            and <see cref="P:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.PlaceholderSuffix"/> properties.
+            </p>
+            <example>
+            <p>
+            The following example XML context definition defines an object that has
+            a number of placeholders. The placeholders can easily be distinguished
+            by the presence of the <c>${}</c> characters.
+            </p>
+            <code escaped="true">
+            <object id="connStringProvider" type="MyNamespace.OracleConnectionStringProvider, MyAssembly">
+            	<property name="dataSource" value="${database.datasource}"/>
+            	<property name="userId" value="${database.userid}"/>
+            	<property name="password" value="${database.password}"/>
+            	<property name="integratedSecurity" value="${database.integratedsecurity}"/>
+            </object>
+            </code>
+            <p>
+            The associated XML configuration file for the above example containing the
+            values for the placeholders would contain a snippet such as ..
+            </p>
+            <code escaped="true">
+            <name-values>
+            	<add key="database.datasource" value="MyOracleDB"/>
+            	<add key="database.userid" value="sa"/>
+            	<add key="database.password" value="g0ly4dk1n"/>
+            	<add key="database.integratedsecurity" value="true"/>
+            </name-values>
+            </code>
+            <p>
+            The preceding XML snippet listing the various property keys and their
+            associated values needs to be inserted into the .NET config file of
+            your application (or Web.config file for your ASP.NET web application,
+            as the case may be), like so...
+            </p>
+            <code escaped="true">
+            <name-values>
+            	<add key="database.datasource" value="MyOracleDB"/>
+            	<add key="database.userid" value="sa"/>
+            	<add key="database.password" value="g0ly4dk1n"/>
+            	<add key="database.integratedsecurity" value="true"/>
+            </name-values>
+            </code>
+            </example>
+            <p>
+            <see cref="T:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+            checks simple property values, lists, dictionaries, sets, constructor
+            values, object type name, and object names in
+            runtime object references (
+            <see cref="T:Spring.Objects.Factory.Config.RuntimeObjectReference"/>).
+            Furthermore, placeholder values can also cross-reference other
+            placeholders, in the manner of the following example where the
+            <c>rootPath</c> property is cross-referenced by the <c>subPath</c>
+            property.
+            </p>
+            <example>
+            <code escaped="true">
+            <name-values>
+            	<add key="rootPath" value="myrootdir"/>
+            	<add key="subPath" value="${rootPath}/subdir"/>
+            </name-values>
+            </code>
+            </example>
+            <p>
+            In contrast to the
+            <see cref="T:Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>
+            class, this configurer only permits the replacement of explicit
+            placeholders in object definitions. Therefore, the original definition
+            cannot specify any default values for its object properties, and the
+            placeholder configuration file is expected to contain an entry for each
+            defined placeholder. That is, if an object definition contains a
+            placeholder <c>${foo}</c>, there should be an associated
+            <c>&lt;add key="foo" value="..."/&gt;</c> entry in the
+            referenced placeholder configuration file. Default property values
+            can be defined via the inherited
+            <see cref="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.Properties"/>
+            collection to overcome any perceived limitation of this feature.
+            </p>
+            <p>
+            If a configurer cannot resolve a placeholder, and the value of the
+            <see cref="P:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.IgnoreUnresolvablePlaceholders"/>
+            property is currently set to <see langword="false"/>, an
+            <see cref="T:Spring.Objects.Factory.ObjectDefinitionStoreException"/>
+            will be thrown. If you want to resolve properties from multiple configuration
+            resources, simply specify multiple resources via the
+            <see cref="P:Spring.Objects.Factory.Config.PropertyResourceConfigurer.Locations"/>
+            property. Finally, please note that you can also define multiple
+            <see cref="T:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+            instances, each with their own custom placeholder syntax.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: PropertyPlaceholderConfigurer.cs,v 1.23 2007/08/02 22:18:32 markpollack Exp $</version>
+            <seealso cref="T:Spring.Objects.Factory.Config.PropertyResourceConfigurer"/>
+            <seealso cref="T:Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>
+            <seealso cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>
+        </member>
+        <member name="F:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.DefaultPlaceholderPrefix">
+            <summary>
+            The default placeholder prefix.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.DefaultPlaceholderSuffix">
+            <summary>
+            The default placeholder suffix.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.ProcessProperties(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Apply the given properties to the supplied
+            <see cref="T:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>.
+            </summary>
+            <param name="factory">
+            The <see cref="T:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>
+            used by the application context.
+            </param>
+            <param name="props">The properties to apply.</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If an error occured.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.ParseString(System.Collections.Specialized.NameValueCollection,System.String,Spring.Collections.ISet)">
+            <summary>
+            Parse values recursively to be able to resolve cross-references between
+            placeholder values.
+            </summary>
+            <param name="properties">
+            The map of constructor arguments / property values.
+            </param>
+            <param name="strVal">The string to be resolved.</param>
+            <param name="visitedPlaceholders">The placeholders that have already been visited
+            during the current resolution attempt (used to detect circular references
+            between placeholders). Only non-null if we're parsing a nested placeholder.</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If an error occurs.
+            </exception>
+            <returns>The resolved string.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.ResolvePlaceholder(System.String,System.Collections.Specialized.NameValueCollection,Spring.Objects.Factory.Config.EnvironmentVariableMode)">
+            <summary>
+            Resolve the given placeholder using the given name value collection,
+            performing an environment variables check according to the given mode.
+            </summary>
+            <remarks>
+            <p>
+            The default implementation delegates to 
+            <see cref="M:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.ResolvePlaceholder(System.String,System.Collections.Specialized.NameValueCollection)"/>
+            before/afer the environment variable check. Subclasses can override
+            this for custom resolution strategies, including customized points
+            for the environment properties check.
+            </p>
+            </remarks>
+            <param name="placeholder">The placeholder to resolve</param>
+            <param name="props">
+            The merged name value collection of this configurer.
+            </param>
+            <param name="mode">The environment variable mode.</param>
+            <returns>
+            The resolved value or <see langword="null"/> if none.
+            </returns>
+            <seelso cref="T:Spring.Objects.Factory.Config.EnvironmentVariableMode"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.ResolvePlaceholder(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Resolve the given placeholder using the given name value collection.
+            </summary>
+            <remarks>
+            <p>
+            This (the default) implementation simply looks up the value of the
+            supplied <paramref name="placeholder"/> key.
+            </p>
+            <p>
+            Subclasses can override this for customized placeholder-to-key
+            mappings or custom resolution strategies, possibly just using the
+            given name value collection as fallback.
+            </p>
+            </remarks>
+            <param name="placeholder">The placeholder to resolve.</param>
+            <param name="props">
+            The merged name value collection of this configurer.
+            </param>
+            <returns>The resolved value.</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.PlaceholderPrefix">
+            <summary>
+            The placeholder prefix (the default is <c>${</c>).
+            </summary>
+            <seealso cref="F:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.DefaultPlaceholderPrefix"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.PlaceholderSuffix">
+            <summary>
+            The placeholder suffix (the default is <c>}</c>)
+            </summary>
+            <seealso cref="F:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.DefaultPlaceholderSuffix"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.IgnoreUnresolvablePlaceholders">
+            <summary>
+            Indicates whether unresolved placeholders should be ignored.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.EnvironmentVariableMode">
+            <summary>
+            Controls how environment variables will be used to 
+            replace property placeholders.
+            </summary>
+            <remarks>
+            <p>
+            See the overview of the
+            <see cref="T:Spring.Objects.Factory.Config.EnvironmentVariableMode"/>
+            enumeration for the available options.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.IDestructionAwareObjectPostProcessor">
+            <summary>
+            Subinterface of
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/> that adds
+            a before-destruction callback.
+            </summary>
+            <remarks>
+            The typical usage will be to invoke custom destruction callbacks on
+            specific object types, matching corresponding initialization callbacks.
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: IDestructionAwareObjectPostProcessor.cs,v 1.4 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.IDestructionAwareObjectPostProcessor.PostProcessBeforeDestruction(System.Object,System.String)">
+            <summary>
+            Apply this
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/> to the
+            given new object instance before its destruction. Can invoke custom
+            destruction callbacks.
+            </summary>
+            <param name="instance">The new object instance.</param>
+            <param name="name">The name of the object.</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.NamespaceParserSupport">
+            <summary>
+            Support class for implementing custom namespace parsers.
+            </summary>
+            <remarks>Parsing of individual elements is done via a ObjectDefintionParser.
+            Provides the RegisterObjectDefinitionParser for registering a ObjectDefintionParser
+            to handle a specific element.</remarks>
+            <author>Rob Harrop</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: NamespaceParserSupport.cs,v 1.9 2008/02/20 14:29:22 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.NamespaceParserSupport.Init">
+            <summary>
+            Invoked by <see cref="T:Spring.Objects.Factory.Xml.NamespaceParserRegistry"/> after construction but before any
+            elements have been parsed.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.NamespaceParserSupport.ParseElement(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parses an element under the root node, typically
+            an object definition or import statement.
+            </summary>
+            <param name="element">
+            The element to be parsed.
+            </param>
+            <param name="parserContext">
+            The parser context.
+            </param>
+            <returns>
+            The number of object defintions created from this element.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.NamespaceParserSupport.Decorate(System.Xml.XmlNode,Spring.Objects.Factory.Config.ObjectDefinitionHolder,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parse the specified XmlNode and decorate the supplied ObjectDefinitionHolder,
+            returning the decorated definition.
+            </summary>
+            <remarks>The XmlNode may either be an XmlAttribute or an XmlElement, depending on
+            whether a custom attribute or element is being parsed.
+            <para>Implementations may choose to return a completely new definition,
+            which will replace the original definition in the resulting IApplicationContext/IObjectFactory.
+            </para>
+            <para>The supplied ParserContext can be used to register any additional objects needed to support
+            the main definition.</para>
+            </remarks>
+            <param name="node">The source element or attribute that is to be parsed.</param>
+            <param name="definition">The current object definition.</param>
+            <param name="parserContext">The object encapsulating the current state of the parsing
+            process.</param>
+            <returns>The decorated definition (to be registered in the IApplicationContext/IObjectFactory),
+            or simply the original object definition if no decoration is required.  A null value is strickly
+            speaking invalid, but will leniently treated like the case where the original object definition
+            gets returned.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.NamespaceParserSupport.RegisterObjectDefinitionParser(System.String,Spring.Objects.Factory.Xml.IObjectDefinitionParser)">
+            <summary>
+            Register the specified <see cref="T:Spring.Objects.Factory.Xml.IObjectDefinitionParser"/> for the given <paramref name="elementName"/>
+            </summary>
+        </member>
+        <member name="T:Spring.Expressions.TernaryNode">
+            <summary>
+            Represents ternary expression node.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: TernaryNode.cs,v 1.9 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.TernaryNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.TernaryNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.TernaryNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the string literal node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.PropertyOrFieldNode">
+            <summary>
+            Represents node that navigates to object's property or public field.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: PropertyOrFieldNode.cs,v 1.28 2007/09/14 13:48:53 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.PropertyOrFieldNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.PropertyOrFieldNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.PropertyOrFieldNode.InitializeNode(System.Object)">
+            <summary>
+            Initializes the node.
+            </summary>
+            <param name="context">The parent.</param>
+        </member>
+        <member name="M:Spring.Expressions.PropertyOrFieldNode.GetPropertyOrFieldAccessor(System.Type,System.String,System.Reflection.BindingFlags)">
+            <summary>
+            Attempts to resolve property or field.
+            </summary>
+            <param name="contextType">
+            Type to search for a property or a field.
+            </param>
+            <param name="memberName">
+            Property or field name.
+            </param>
+            <param name="bindingFlags">
+            Binding flags to use.
+            </param>
+            <returns>
+            Resolved property or field accessor, or <c>null</c> 
+            if specified <paramref name="memberName"/> cannot be resolved.
+            </returns>
+        </member>
+        <member name="M:Spring.Expressions.PropertyOrFieldNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns node's value for the given context.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.PropertyOrFieldNode.Set(System.Object,Spring.Expressions.BaseNode.EvaluationContext,System.Object)">
+            <summary>
+            Sets node's value for the given context.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <param name="newValue">New value for this node.</param>
+        </member>
+        <member name="M:Spring.Expressions.PropertyOrFieldNode.GetPropertyOrFieldValue(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Retrieves property or field value.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Property or field value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.PropertyOrFieldNode.SetPropertyOrFieldValue(System.Object,Spring.Expressions.BaseNode.EvaluationContext,System.Object)">
+            <summary>
+            Sets property value, doing any type conversions that are necessary along the way.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <param name="newValue">New value for this node.</param>
+        </member>
+        <member name="M:Spring.Expressions.PropertyOrFieldNode.SetPropertyOrFieldValueInternal(System.Object,System.Object)">
+            <summary>
+            Sets property or field value using either dynamic or standard reflection.
+            </summary>
+            <param name="context">Object to evaluate node against.</param>
+            <param name="newValue">New value for this node, converted to appropriate type.</param>
+        </member>
+        <member name="M:Spring.Expressions.PropertyOrFieldNode.AddToCollections(System.Object,Spring.Expressions.BaseNode.EvaluationContext,System.Object)">
+            <summary>
+            In the case of read only collections or custom collections that are not assignable from
+            IList, try to add to the collection.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <param name="newValue">New value for this node.</param>
+            <returns>true if was able add to IList, IDictionary, or ISet</returns>
+        </member>
+        <member name="M:Spring.Expressions.PropertyOrFieldNode.GetMemberInfo(System.Object)">
+            <summary>
+            Utility method that is needed by ObjectWrapper and AbstractAutowireCapableObjectFactory.
+            We try as hard as we can, but there are instances when we won't be able to obtain PropertyInfo...
+            </summary>
+            <param name="context">Context to resolve property against.</param>
+            <returns>PropertyInfo for this node.</returns>
+        </member>
+        <member name="P:Spring.Expressions.PropertyOrFieldNode.IsProperty">
+            <summary>
+            Gets a value indicating whether this node represents a property.
+            </summary>
+            <value>
+            	<c>true</c> if this node is a property; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Expressions.PropertyOrFieldNode.IsField">
+            <summary>
+            Gets a value indicating whether this node represents a field.
+            </summary>
+            <value>
+            	<c>true</c> if this node is a field; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="T:Spring.Expressions.OpMULTIPLY">
+            <summary>
+            Represents arithmetic multiplication operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpMULTIPLY.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpMULTIPLY.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpMULTIPLY.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpMULTIPLY.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the arithmetic multiplication operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.NamedArgumentNode">
+            <summary>
+            Represents parsed named argument node in the expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: NamedArgumentNode.cs,v 1.4 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.NamedArgumentNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.NamedArgumentNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.NamedArgumentNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns the value of the named argument defined by this node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.SelectionNode">
+            <summary>
+            Represents parsed selection node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SelectionNode.cs,v 1.6 2008/03/25 22:33:04 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.SelectionNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SelectionNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.SelectionNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a <see cref="T:System.Collections.IList"/> containing results of evaluation
+            of selection expression against each node in the context.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.Processors.MaxAggregator">
+            <summary>
+            Implementation of the maximum aggregator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: MaxAggregator.cs,v 1.2 2006/12/04 08:58:33 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.Processors.MaxAggregator.Process(System.Collections.ICollection,System.Object[])">
+            <summary>
+            Returns the largest item in the source collection.
+            </summary>
+            <param name="source">
+            The source collection to process.
+            </param>
+            <param name="args">
+            Ignored.
+            </param>
+            <returns>
+            The largest item in the source collection.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.StringArrayConverter">
+             <summary>
+             Converts a separated <see cref="T:System.String"/> to a <see cref="T:System.String"/>
+             array.
+             </summary>
+             <remarks>
+             <p>
+             Defaults to using the <c>,</c> (comma) as the list separator. Note that the value
+             of the current <see cref="P:System.Globalization.CultureInfo.CurrentCulture"/> is
+             <b>not</b> used.
+             </p>
+             <p>
+             If you want to provide your own list separator, you can set the value of the
+             <see cref="P:Spring.Core.TypeConversion.StringArrayConverter.ListSeparator"/>
+             property to the value that you want. Please note that this value will be used
+             for <i>all</i> future conversions in preference to the default list separator.
+             </p>
+             <p>
+             Please note that the individual elements of a string will be passed
+             through <i>as is</i> (i.e. no conversion or trimming of surrounding
+             whitespace will be performed).
+             </p>
+             <p>
+             This <see cref="T:System.ComponentModel.TypeConverter"/> should be
+             automatically registered with any <see cref="T:Spring.Objects.IObjectWrapper"/>
+             implementations.
+             </p>
+             </remarks>
+             <example>
+             <code language="C#">
+             public class StringArrayConverterExample 
+             {     
+                 public static void Main()
+                 {
+                     StringArrayConverter converter = new StringArrayConverter();
+            			
+            			string csvWords = "This,Is,It";
+            			string[] frankBoothWords = converter.ConvertFrom(csvWords);
+            
+            			// the 'frankBoothWords' array will have 3 elements, namely
+            			// "This", "Is", "It".
+            			
+            			// please note that extraneous whitespace is NOT trimmed off
+            			// in the current implementation...
+            			string csv = "  Cogito ,ergo ,sum ";
+            			string[] descartesWords = converter.ConvertFrom(csv);
+            			
+            			// the 'descartesWords' array will have 3 elements, namely
+            			// "  Cogito ", "ergo ", "sum ".
+            			// notice how the whitespace has NOT been trimmed.
+                 }
+             }
+             </code>
+             </example>
+             <author></author>
+             <version>$Id: StringArrayConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.StringArrayConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Can we convert from a the sourcetype to a <see cref="T:System.String"/> array?
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from a <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns><see langword="true"/> if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.StringArrayConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Convert from a <see cref="T:System.String"/> value to a
+            <see cref="T:System.String"/> array.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture.
+            </param>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <returns>
+            A <see cref="T:System.String"/> array if successful.
+            </returns>        
+        </member>
+        <member name="P:Spring.Core.TypeConversion.StringArrayConverter.ListSeparator">
+            <summary>
+            The value that will be used as the list separator when performing
+            conversions.
+            </summary>
+            <value>
+            A 'single' string character that will be used as the list separator
+            when performing conversions.
+            </value>
+            <exception cref="T:System.ArgumentException">
+            If the supplied value is not <cref lang="null"/> and is an empty
+            string, or has more than one character.
+            </exception>
+        </member>
+        <member name="T:Spring.Context.Support.NamespaceParsersSectionHandler">
+            <summary>
+            Configuration section handler for the (recommended, Spring.NET standard) <c>parsers</c>
+            config section.
+            </summary>
+            <remarks>
+            <p>
+            Spring.NET allows the registration of custom configuration parsers that
+            can be used to create simplified configuration schemas that better
+            describe object definitions.
+            </p>
+            <p>
+            For example, Spring.NET uses this facility internally in order to
+            define simplified schemas for various AOP, Data and Services definitions.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            The following example shows how to configure both this section handler
+            and how to define custom configuration parsers within a Spring.NET
+            config section.
+            </p>
+            <code escaped="true">
+            <configuration>
+                <configSections>
+            	    <sectionGroup name="spring">
+            		    <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
+            	    </sectionGroup>
+                </configSections>
+                <spring>
+            	    <parsers>
+            		    <parser type="Spring.Aop.Config.AopNamespaceParser, Spring.Aop"/>
+            		    <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>
+            		    ...
+            	    </parsers>
+            	    ...
+                </spring>
+            </configuration>
+            </code>
+            </example>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: NamespaceParsersSectionHandler.cs,v 1.1 2007/08/08 01:53:43 bbaia Exp $</version>
+            <seealso cref="T:Spring.Objects.Factory.Xml.NamespaceParserRegistry"/>
+        </member>
+        <member name="M:Spring.Context.Support.NamespaceParsersSectionHandler.Create(System.Object,System.Object,System.Xml.XmlNode)">
+            <summary>
+            Registers parsers specified in the (recommended, Spring.NET standard)
+            <c>parsers</c> config section with the <see cref="T:Spring.Objects.Factory.Xml.NamespaceParserRegistry"/>.
+            </summary>
+            <param name="parent">
+            The configuration settings in a corresponding parent
+            configuration section.
+            </param>
+            <param name="configContext">
+            The configuration context when called from the ASP.NET
+            configuration system. Otherwise, this parameter is reserved and
+            is <see langword="null"/>.
+            </param>
+            <param name="section">
+            The <see cref="T:System.Xml.XmlNode"/> for the section.
+            </param>
+            <returns>
+            This method always returns <see langword="null"/>, because parsers
+            are registered as a side-effect of this object's execution and there
+            is thus no need to return anything.
+            </returns>
+        </member>
+        <member name="T:Spring.Collections.SynchronizedSet">
+            <summary>
+            Implements a thread-safe <see cref="T:Spring.Collections.ISet"/> wrapper.
+            </summary>
+            <remarks>
+            <p>
+            The implementation is extremely conservative, serializing critical
+            sections to prevent possible deadlocks, and locking on everything. The
+            one exception is for enumeration, which is inherently not thread-safe.
+            For this, you have to <c>lock</c> the <c>SyncRoot</c> object for the
+            duration of the enumeration.
+            </p>
+            </remarks>
+            <seealso cref="T:Spring.Collections.ISet"/>
+            <version>$Id: SynchronizedSet.cs,v 1.6 2007/03/16 04:01:29 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedSet.#ctor(Spring.Collections.ISet)">
+            <summary>
+            Constructs a thread-safe <see cref="T:Spring.Collections.ISet"/>
+            wrapper.
+            </summary>
+            <param name="basisSet">
+            The <see cref="T:Spring.Collections.ISet"/> object that this object
+            will wrap.
+            </param>
+            <exception cref="T:System.NullReferenceException">
+            If the supplied <paramref name="basisSet"/> ecposes a
+            <see langword="null"/> <c>SyncRoot</c> value.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedSet.Add(System.Object)">
+            <summary>
+            Adds the specified element to this set if it is not already present.
+            </summary>
+            <param name="element">The object to add to the set.</param>
+            <returns>
+            <see langword="true"/> is the object was added,
+            <see langword="true"/> if the object was already present.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedSet.AddAll(System.Collections.ICollection)">
+            <summary>
+            Adds all the elements in the specified collection to the set if
+            they are not already present.
+            </summary>
+            <param name="collection">A collection of objects to add to the set.</param>
+            <returns>
+            <see langword="true"/> is the set changed as a result of this
+            operation.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedSet.Clear">
+            <summary>
+            Removes all objects from this set.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedSet.Contains(System.Object)">
+            <summary>
+            Returns <see langword="true"/> if this set contains the specified
+            element.
+            </summary>
+            <param name="element">The element to look for.</param>
+            <returns>
+            <see langword="true"/> if this set contains the specified element.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedSet.ContainsAll(System.Collections.ICollection)">
+            <summary>
+            Returns <see langword="true"/> if the set contains all the
+            elements in the specified collection.
+            </summary>
+            <param name="collection">A collection of objects.</param>
+            <returns>
+            <see langword="true"/> if the set contains all the elements in the
+            specified collection; also <see langword="false"/> if the
+            supplied <paramref name="collection"/> is <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedSet.Remove(System.Object)">
+            <summary>
+            Removes the specified element from the set.
+            </summary>
+            <param name="element">The element to be removed.</param>
+            <returns>
+            <see langword="true"/> if the set contained the specified element.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedSet.RemoveAll(System.Collections.ICollection)">
+            <summary>
+            Remove all the specified elements from this set, if they exist in
+            this set.
+            </summary>
+            <param name="collection">A collection of elements to remove.</param>
+            <returns>
+            <see langword="true"/> if the set was modified as a result of this
+            operation.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedSet.RetainAll(System.Collections.ICollection)">
+            <summary>
+            Retains only the elements in this set that are contained in the
+            specified collection.
+            </summary>
+            <param name="c">
+            The collection that defines the set of elements to be retained.
+            </param>
+            <returns>
+            <see langword="true"/> if this set changed as a result of this
+            operation.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedSet.CopyTo(System.Array,System.Int32)">
+            <summary>
+            Copies the elements in the <see cref="T:Spring.Collections.ISet"/> to
+            an array.
+            </summary>
+            <remarks>
+            <p>
+            The type of array needs to be compatible with the objects in the
+            <see cref="T:Spring.Collections.ISet"/>, obviously.
+            </p>
+            </remarks>
+            <param name="array">
+            An array that will be the target of the copy operation.
+            </param>
+            <param name="index">
+            The zero-based index where copying will start.
+            </param>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedSet.GetEnumerator">
+            <summary>
+            Gets an enumerator for the elements in the
+            <see cref="T:Spring.Collections.ISet"/>.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> over the elements
+            in the <see cref="T:Spring.Collections.ISet"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedSet.Clone">
+            <summary>
+            Returns a clone of the <see cref="T:Spring.Collections.ISet"/> instance.  
+            </summary>
+            <returns>A clone of this object.</returns>
+        </member>
+        <member name="P:Spring.Collections.SynchronizedSet.IsEmpty">
+            <summary>
+            Returns <see langword="true"/> if this set contains no elements.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.SynchronizedSet.Count">
+            <summary>
+            The number of elements currently contained in this collection.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.SynchronizedSet.IsSynchronized">
+            <summary>
+            Returns <see langword="true"/> if the
+            <see cref="T:Spring.Collections.ISet"/> is synchronized across
+            threads.
+            </summary>
+            <seealso cref="P:Spring.Collections.Set.IsSynchronized"/>
+        </member>
+        <member name="P:Spring.Collections.SynchronizedSet.SyncRoot">
+            <summary>
+            An object that can be used to synchronize this collection to make
+            it thread-safe.
+            </summary>
+            <value>
+            An object that can be used to synchronize this collection to make
+            it thread-safe.
+            </value>
+            <seealso cref="P:Spring.Collections.Set.SyncRoot"/>
+        </member>
+        <member name="T:Spring.Collections.SynchronizedHashtable">
+            <summary>
+            Synchronized <see cref="T:System.Collections.Hashtable"/> that, unlike hashtable created
+            using <see cref="M:System.Collections.Hashtable.Synchronized(System.Collections.Hashtable)"/> method, synchronizes 
+            reads from the underlying hashtable in addition to writes.
+            </summary>
+            <remarks>
+            <p>
+            In addition to synchronizing reads, this implementation also fixes
+            IEnumerator/ICollection issue described at 
+            http://msdn.microsoft.com/netframework/programming/breakingchanges/runtime/clr.aspx
+            (search for SynchronizedHashtable for issue description), by implementing 
+            <see cref="T:System.Collections.IEnumerator"/> interface explicitly, and returns thread safe enumerator
+            implementations as well.
+            </p>
+            <p>
+            This class should be used whenever a truly synchronized <see cref="T:System.Collections.Hashtable"/>
+            is needed.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SynchronizedHashtable.cs,v 1.2 2007/08/27 13:57:17 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedHashtable.#ctor">
+            <summary>
+            Initializes a new instance of <see cref="T:Spring.Collections.SynchronizedHashtable"/>
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedHashtable.#ctor(System.Collections.IDictionary)">
+            <summary>
+            Initializes a new instance of <see cref="T:Spring.Collections.SynchronizedHashtable"/>, copying inital entries from <param name="dictionary"/>.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedHashtable.Add(System.Object,System.Object)">
+            <summary>
+            Adds an element with the provided key and value to the <see cref="T:System.Collections.IDictionary"></see> object.
+            </summary>
+            <param name="value">The <see cref="T:System.Object"></see> to use as the value of the element to add. </param>
+            <param name="key">The <see cref="T:System.Object"></see> to use as the key of the element to add. </param>
+            <exception cref="T:System.ArgumentException">An element with the same key already exists in the <see cref="T:System.Collections.IDictionary"></see> object. </exception>
+            <exception cref="T:System.ArgumentNullException">key is null. </exception>
+            <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.IDictionary"></see> is read-only.-or- The <see cref="T:System.Collections.IDictionary"></see> has a fixed size. </exception><filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedHashtable.Clear">
+            <summary>
+            Removes all elements from the <see cref="T:System.Collections.IDictionary"></see> object.
+            </summary>
+            <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.IDictionary"></see> object is read-only. </exception><filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedHashtable.Clone">
+            <summary>
+            Creates a new object that is a copy of the current instance.
+            </summary>
+            <returns>
+            A new object that is a copy of this instance.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedHashtable.Contains(System.Object)">
+            <summary>
+            Determines whether the <see cref="T:System.Collections.IDictionary"></see> object contains an element with the specified key.
+            </summary>
+            <returns>
+            true if the <see cref="T:System.Collections.IDictionary"></see> contains an element with the key; otherwise, false.
+            </returns>
+            <param name="key">The key to locate in the <see cref="T:System.Collections.IDictionary"></see> object.</param>
+            <exception cref="T:System.ArgumentNullException">key is null. </exception><filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedHashtable.ContainsKey(System.Object)">
+            <summary>
+             Returns, whether this <see cref="T:System.Collections.IDictionary"/> contains an entry with the specified <paramref name="key"/>.
+            </summary>
+            <param name="key">The key to look for</param>
+            <returns><see lang="true"/>, if this <see cref="T:System.Collections.IDictionary"/> contains an entry with this <paramref name="key"/></returns>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedHashtable.ContainsValue(System.Object)">
+            <summary>
+             Returns, whether this <see cref="T:System.Collections.IDictionary"/> contains an entry with the specified <paramref name="value"/>.
+            </summary>
+            <param name="value">The valúe to look for</param>
+            <returns><see lang="true"/>, if this <see cref="T:System.Collections.IDictionary"/> contains an entry with this <paramref name="value"/></returns>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedHashtable.CopyTo(System.Array,System.Int32)">
+            <summary>
+            Copies the elements of the <see cref="T:System.Collections.ICollection"></see> to an <see cref="T:System.Array"></see>, starting at a particular <see cref="T:System.Array"></see> index.
+            </summary>
+            <param name="array">The one-dimensional <see cref="T:System.Array"></see> that is the destination of the elements copied from <see cref="T:System.Collections.ICollection"></see>. The <see cref="T:System.Array"></see> must have zero-based indexing. </param>
+            <param name="index">The zero-based index in array at which copying begins. </param>
+            <exception cref="T:System.ArgumentNullException">array is null. </exception>
+            <exception cref="T:System.ArgumentException">The type of the source <see cref="T:System.Collections.ICollection"></see> cannot be cast automatically to the type of the destination array. </exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">index is less than zero. </exception>
+            <exception cref="T:System.ArgumentException">array is multidimensional.-or- index is equal to or greater than the length of array.-or- The number of elements in the source <see cref="T:System.Collections.ICollection"></see> is greater than the available space from index to the end of the destination array. </exception><filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedHashtable.GetEnumerator">
+            <summary>
+            Returns an <see cref="T:System.Collections.IDictionaryEnumerator"></see> object for the <see cref="T:System.Collections.IDictionary"></see> object.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IDictionaryEnumerator"></see> object for the <see cref="T:System.Collections.IDictionary"></see> object.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedHashtable.Remove(System.Object)">
+            <summary>
+            Removes the element with the specified key from the <see cref="T:System.Collections.IDictionary"></see> object.
+            </summary>
+            <param name="key">The key of the element to remove. </param>
+            <exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.IDictionary"></see> object is read-only.-or- The <see cref="T:System.Collections.IDictionary"></see> has a fixed size. </exception>
+            <exception cref="T:System.ArgumentNullException">key is null. </exception><filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Spring.Collections.SynchronizedHashtable.System#Collections#IEnumerable#GetEnumerator">
+            <summary>
+            Returns an enumerator that iterates through a collection.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"></see> object that can be used to iterate through the collection.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.SynchronizedHashtable.IsReadOnly">
+            <summary>
+            Gets a value indicating whether the <see cref="T:System.Collections.IDictionary"></see> object is read-only.
+            </summary>
+            <returns>
+            true if the <see cref="T:System.Collections.IDictionary"></see> object is read-only; otherwise, false.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.SynchronizedHashtable.IsFixedSize">
+            <summary>
+            Gets a value indicating whether the <see cref="T:System.Collections.IDictionary"></see> object has a fixed size.
+            </summary>
+            <returns>
+            true if the <see cref="T:System.Collections.IDictionary"></see> object has a fixed size; otherwise, false.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.SynchronizedHashtable.IsSynchronized">
+            <summary>
+            Gets a value indicating whether access to the <see cref="T:System.Collections.ICollection"></see> is synchronized (thread safe).
+            </summary>
+            <returns>
+            true if access to the <see cref="T:System.Collections.ICollection"></see> is synchronized (thread safe); otherwise, false.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.SynchronizedHashtable.Keys">
+            <summary>
+            Gets an <see cref="T:System.Collections.ICollection"></see> object containing the keys of the <see cref="T:System.Collections.IDictionary"></see> object.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.ICollection"></see> object containing the keys of the <see cref="T:System.Collections.IDictionary"></see> object.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.SynchronizedHashtable.Values">
+            <summary>
+            Gets an <see cref="T:System.Collections.ICollection"></see> object containing the values in the <see cref="T:System.Collections.IDictionary"></see> object.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.ICollection"></see> object containing the values in the <see cref="T:System.Collections.IDictionary"></see> object.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.SynchronizedHashtable.SyncRoot">
+            <summary>
+            Gets an object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"></see>.
+            </summary>
+            <returns>
+            An object that can be used to synchronize access to the <see cref="T:System.Collections.ICollection"></see>.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.SynchronizedHashtable.Count">
+            <summary>
+            Gets the number of elements contained in the <see cref="T:System.Collections.ICollection"></see>.
+            </summary>
+            <returns>
+            The number of elements contained in the <see cref="T:System.Collections.ICollection"></see>.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.SynchronizedHashtable.Item(System.Object)">
+            <summary>
+            Gets or sets the element with the specified key.
+            </summary>
+            <returns>
+            The element with the specified key.
+            </returns>
+            <param name="key">The key of the element to get or set. </param>
+            <exception cref="T:System.NotSupportedException">The property is set and the <see cref="T:System.Collections.IDictionary"></see> object is read-only.-or- The property is set, key does not exist in the collection, and the <see cref="T:System.Collections.IDictionary"></see> has a fixed size. </exception>
+            <exception cref="T:System.ArgumentNullException">key is null. </exception><filterpriority>2</filterpriority>
+        </member>
+        <member name="T:Spring.Collections.LinkedList">
+            <summary>
+            Simple linked list implementation.
+            </summary>
+            <author>Simon White</author>
+            <version>$Id: LinkedList.cs,v 1.9 2007/03/16 04:01:28 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Collections.LinkedList"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.#ctor(System.Collections.IList)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Collections.LinkedList"/> class that contains all
+             elements of the specified list.
+            </summary>
+            <param name="list">
+            A list of elements that defines the initial contents.
+            </param>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.RemoveAt(System.Int32)">
+            <summary>
+            Removes the object at the specified index.
+            </summary>
+            <param name="index">The lookup index.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            If the specified <paramref name="index"/> is greater than the
+            number of objects within the list.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.Insert(System.Int32,System.Object)">
+            <summary>
+            Inserts an object at the specified index.
+            </summary>
+            <param name="index">The lookup index.</param>
+            <param name="value">The object to be inserted.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            If the specified <paramref name="index"/> is greater than the
+            number of objects within the list.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.Remove(System.Object)">
+            <summary>
+            Removes the first instance of the specified object found.
+            </summary>
+            <param name="value">The object to remove</param>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.Contains(System.Object)">
+            <summary>
+            Returns <see langword="true"/> if this list contains the specified
+            element.
+            </summary>
+            <param name="value">The element to look for.</param>
+            <returns>
+            <see langword="true"/> if this list contains the specified element.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.Clear">
+            <summary>
+            Removes all objects from the list.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.IndexOf(System.Object)">
+            <summary>
+            Returns the index of the first instance of the specified
+            <paramref name="value"/> found.
+            </summary>
+            <param name="value">The object to search for</param>
+            <returns>
+            The index of the first instance found, or -1 if the element was not
+            found.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.Add(System.Object)">
+            <summary>
+            Adds the specified object to the end of the list.
+            </summary>
+            <param name="value">The object to add</param>
+            <returns>The index that the object was added at.</returns>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.AddAll(System.Collections.IList)">
+            <summary>
+            Adds all of the elements of the supplied
+            <paramref name="elements"/>list to the end of this list.
+            </summary>
+            <param name="elements">The list of objects to add.</param>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.CheckUpdateState">
+            <summary>
+            Checks whether the list can be modified.
+            </summary>
+            <exception cref="T:System.NotSupportedException">
+            If the list cannot be modified.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.ValidateIndex(System.Int32)">
+            <summary>
+            Validates the specified index.
+            </summary>
+            <param name="index">The lookup index.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            If the index is invalid.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.GetNode(System.Int32)">
+            <summary>
+            Returns the node at the specified index.
+            </summary>
+            <param name="index">The lookup index.</param>
+            <returns>The node at the specified index.</returns>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            If the specified <paramref name="index"/> is greater than the
+            number of objects within the list.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.GetNode(System.Object)">
+            <summary>
+            Returns the node (and index) of the first node that contains
+            the specified value.
+            </summary>
+            <param name="value">The value to search for.</param>
+            <returns>
+            The node, or <see langword="null"/> if not found.
+            </returns>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.RemoveNode(Spring.Collections.LinkedList.Node)">
+            <summary>
+            Removes the specified node.
+            </summary>
+            <param name="node">The node to be removed.</param>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.CopyTo(System.Array,System.Int32)">
+            <summary>
+            Copies the elements in this list to an array.
+            </summary>
+            <remarks>
+            <p>
+            The type of array needs to be compatible with the objects in this
+            list, obviously.
+            </p>
+            </remarks>
+            <param name="array">
+            An array that will be the target of the copy operation.
+            </param>
+            <param name="index">
+            The zero-based index where copying will start.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="array"/> is <see langword="null"/>.
+            </exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            If the supplied <paramref name="index"/> is less than zero
+            or is greater than the length of <paramref name="array"/>.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If the supplied <paramref name="array"/> is of insufficient size.
+            </exception>
+        </member>
+        <member name="M:Spring.Collections.LinkedList.GetEnumerator">
+            <summary>
+            Gets an enumerator for the elements in the
+            <see cref="T:Spring.Collections.LinkedList"/>.
+            </summary>
+            <remarks>
+            <p>
+            Enumerators are fail fast.
+            </p>
+            </remarks>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> over the elements
+            in the <see cref="T:Spring.Collections.LinkedList"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Collections.LinkedList.IsReadOnly">
+            <summary>
+            Is list read only?
+            </summary>
+            <value>
+            <see langword="true"/> if the list is read only.
+            </value>
+        </member>
+        <member name="P:Spring.Collections.LinkedList.Item(System.Int32)">
+            <summary>
+            Returns the node at the specified index.
+            </summary>
+            <remarks>
+            <p>
+            This is the indexer for the
+            <see cref="T:Spring.Collections.LinkedList"/> class.
+            </p>
+            </remarks>
+            <seealso cref="M:Spring.Collections.LinkedList.GetNode(System.Int32)"/>
+        </member>
+        <member name="P:Spring.Collections.LinkedList.IsFixedSize">
+            <summary>
+            Is the list a fixed size?
+            </summary>
+            <value>
+            <see langword="true"/> if the list is a fixed size list.
+            </value>
+        </member>
+        <member name="P:Spring.Collections.LinkedList.IsSynchronized">
+            <summary>
+            Returns <see langword="true"/> if the list is synchronized across
+            threads.
+            </summary>
+            <remarks>
+            <note>
+            This implementation <b>always</b> returns <see langword="false"/>.
+            </note>
+            <p>
+            Note that enumeration is inherently not thread-safe. Use the
+            <see cref="P:Spring.Collections.LinkedList.SyncRoot"/> to lock the object during enumeration.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Collections.LinkedList.Count">
+            <summary>
+            The number of objects within the list.
+            </summary>
+        </member>
+        <member name="P:Spring.Collections.LinkedList.SyncRoot">
+            <summary>
+            An object that can be used to synchronize this
+            <see cref="T:Spring.Collections.LinkedList"/> to make it thread-safe.
+            </summary>
+            <value>
+            An object that can be used to synchronize this
+            <see cref="T:Spring.Collections.LinkedList"/> to make it thread-safe.
+            </value>
+        </member>
+        <member name="T:Spring.Validation.CollectionValidator">
+            <summary>
+            <see cref="T:Spring.Validation.IValidator"/> implementation that supports validating collections.
+            </summary>
+            <remarks>
+            <p>
+            This validator will be valid only when all of the validators in the <c>Validators</c>
+            collection are valid for all of the objects in the specified collection.
+            </p>
+            <p>
+            You can specify if you want to validate all of the collection elements regardless of the errors, by
+            setting the <c>ValidateAll</c> property to true.
+            </p>
+            <p>
+            If you set the <c>IncludeElementErrors</c> property to <c>true</c>, 
+            <c>ValidationErrors</c> collection will contain a union of all validation error messages 
+            for the contained validators; 
+            Otherwise it will contain only error messages that were set for this Validator.
+            </p>
+            </remarks>
+            <author>Damjan Tomic</author>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CollectionValidator.cs,v 1.5 2008/02/05 20:40:26 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Validation.CollectionValidator.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.CollectionValidator"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.CollectionValidator.#ctor(System.Boolean,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.CollectionValidator"/> class.
+            </summary>
+            <param name="validateAll">The bool that determines if all elements of the collection should be evaluated.
+            regardless of the Errors
+            </param>
+            <param name="includeElementErrors">The bool that determines whether Validate method should collect 
+            all error messages returned by the item validators</param>        
+        </member>
+        <member name="M:Spring.Validation.CollectionValidator.#ctor(Spring.Expressions.IExpression,System.Boolean,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.CollectionValidator"/> class.
+            </summary>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+            <param name="validateAll">The bool that determines if this all elements of the collection should be evaluated.
+            regardless of the Errors
+            </param>
+            <param name="includeElementErrors">The bool that determines whether Validate method should collect 
+            all error messages returned by the item validators</param>
+        </member>
+        <member name="M:Spring.Validation.CollectionValidator.#ctor(System.String,System.Boolean,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.CollectionValidator"/> class.
+            </summary>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+            <param name="validateAll">The bool that determines if this all elements of the collection should be evaluated.
+            regardless of the Errors
+            </param>
+            <param name="includeElementErrors">The bool that determines whether Validate method should collect 
+            all error messages returned by the item validators</param>
+        </member>
+        <member name="M:Spring.Validation.CollectionValidator.Validate(System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Validates the specified collection of objects.
+            If the <c>IncludeElementErrors</c> property was set to <c>true</c>, 
+            <paramref name="errors"/> collection will contain a union of all validation error messages 
+            for the contained validators; 
+            Otherwise it will contain only error messages that were set for this Validator.
+            </summary>
+            <param name="validationContext">The collection to validate.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors"><see cref="T:Spring.Validation.ValidationErrors"/> instance to add error messages to.</param>
+            <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="P:Spring.Validation.CollectionValidator.ValidateAll">
+            <summary>
+            Gets or sets the value that indicates whether to validate all elements of the collection
+            regardless of the errors.
+            </summary>        
+        </member>
+        <member name="P:Spring.Validation.CollectionValidator.IncludeElementErrors">
+            <summary>
+            Gets or sets the value that indicates whether to capture all the errors of the specific 
+            elements of the collection
+            </summary>        
+        </member>
+        <member name="P:Spring.Validation.CollectionValidator.Context">
+            <summary>
+            Gets or sets the expression that should be used to narrow validation context.
+            </summary>
+            <value>The expression that should be used to narrow validation context.</value>
+        </member>
+        <member name="T:Spring.Util.DynamicCodeManager">
+             <summary>
+             Use this class for obtaining <see cref="T:System.Reflection.Emit.ModuleBuilder"/> instances for dynamic code generation.
+             </summary>
+             <remarks>
+             <p>
+             The purpose of this class is to provide a simple abstraction for creating and managing dynamic assemblies. 
+             </p>
+             <note>
+             Using this factory you can't define several modules within a single dynamic assembly - only a simple one2one relation between assembly/module is used.
+             </note>
+             </remarks>
+             <example>
+             <p>The following excerpt from <see cref="T:Spring.Proxy.DynamicProxyManager"/> demonstrates usage:</p>
+             <code language="c#">
+             public class DynamicProxyManager
+             {
+               public const string PROXY_ASSEMBLY_NAME = "Spring.Proxy";
+            
+               public static TypeBuilder CreateTypeBuilder(string name, Type baseType)
+               {
+                 // Generates type name
+                 string typeName = String.Format("{0}.{1}_{2}", PROXY_ASSEMBLY_NAME, name, Guid.NewGuid().ToString("N"));
+                 ModuleBuilder module = DynamicCodeManager.GetModuleBuilder(PROXY_ASSEMBLY_NAME);
+                 return module.DefineType(typeName, PROXY_TYPE_ATTRIBUTES);
+               }
+             }
+             </code>
+             </example>
+             <author>Erich Eichinger</author>
+             <version>$Id: DynamicCodeManager.cs,v 1.6 2007/08/08 04:00:16 bbaia Exp $</version>
+             <seealso cref="T:Spring.Reflection.Dynamic.DynamicReflectionManager"/>
+             <seealso cref="T:Spring.Proxy.DynamicProxyManager"/>
+             <seealso cref="T:Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy"/>
+        </member>
+        <member name="M:Spring.Util.DynamicCodeManager.#ctor">
+            <summary>
+            prevent instantiation
+            </summary>
+        </member>
+        <member name="M:Spring.Util.DynamicCodeManager.GetModuleBuilder(System.String)">
+            <summary>
+            Returns the <see cref="T:System.Reflection.Emit.ModuleBuilder"/> for the dynamic module within the specified assembly.
+            </summary>
+            <remarks>
+            If the assembly does not exist yet, it will be created.<br/>
+            This factory caches any dynamic assembly it creates - calling GetModule() twice with 
+            the same name will *not* create 2 distinct modules!
+            </remarks>
+            <param name="assemblyName">The assembly-name of the module to be returned</param>
+            <returns>the <see cref="T:System.Reflection.Emit.ModuleBuilder"/> that can be used to define new types within the specified assembly</returns>
+        </member>
+        <member name="M:Spring.Util.DynamicCodeManager.SaveAssembly(System.String)">
+            <summary>
+            Persists the specified dynamic assembly to the file-system
+            </summary>
+            <param name="assemblyName">the name of the dynamic assembly to persist</param>
+            <remarks>
+            Can only be called in DEBUG_DYNAMIC mode, per ConditionalAttribute rules.
+            </remarks>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.IDynamicField">
+            <summary>
+            Defines methods that dynamic field class has to implement.
+            </summary>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.IDynamicField.GetValue(System.Object)">
+            <summary>
+            Gets the value of the dynamic field for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to get field value from.
+            </param>
+            <returns>
+            A field value.
+            </returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.IDynamicField.SetValue(System.Object,System.Object)">
+            <summary>
+            Gets the value of the dynamic field for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to set field value on.
+            </param>
+            <param name="value">
+            A new field value.
+            </param>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.SafeField">
+            <summary>
+            Safe wrapper for the dynamic field.
+            </summary>
+            <remarks>
+            <see cref="T:Spring.Reflection.Dynamic.SafeField"/> will attempt to use dynamic
+            field if possible, but it will fall back to standard
+            reflection if necessary.
+            </remarks>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeField.GetOrCreateDynamicField(System.Reflection.FieldInfo)">
+            <summary>
+            Obtains cached fieldInfo or creates a new entry, if none is found.
+            </summary>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeField.#ctor(System.Reflection.FieldInfo)">
+            <summary>
+            Creates a new instance of the safe field wrapper.
+            </summary>
+            <param name="field">Field to wrap.</param>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeField.GetValue(System.Object)">
+            <summary>
+            Gets the value of the dynamic field for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to get field value from.
+            </param>
+            <returns>
+            A field value.
+            </returns>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.SafeField.SetValue(System.Object,System.Object)">
+            <summary>
+            Gets the value of the dynamic field for the specified target object.
+            </summary>
+            <param name="target">
+            Target object to set field value on.
+            </param>
+            <param name="value">
+            A new field value.
+            </param>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.SafeField.DynamicFieldCacheEntry">
+            <summary>
+            Holds cached Getter/Setter delegates for a Field
+            </summary>
+        </member>
+        <member name="T:Spring.Reflection.Dynamic.DynamicField">
+            <summary>
+            Factory class for dynamic fields.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DynamicField.cs,v 1.4 2008/05/16 10:02:39 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Reflection.Dynamic.DynamicField.Create(System.Reflection.FieldInfo)">
+            <summary>
+            Creates dynamic field instance for the specified <see cref="T:System.Reflection.FieldInfo"/>.
+            </summary>
+            <param name="field">Field info to create dynamic field for.</param>
+            <returns>Dynamic field for the specified <see cref="T:System.Reflection.FieldInfo"/>.</returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry">
+            <summary>
+            Interface for registries that hold object definitions, i.e. 
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+            and
+            <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+            instances.
+            </summary>
+            <remarks>
+            <p>
+            Typically implemented by object factories that work with the
+            <see cref="T:Spring.Objects.Factory.Support.AbstractObjectDefinition"/>
+            hierarchy internally.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IObjectDefinitionRegistry.GetObjectDefinitionNames">
+            <summary>
+            Return the names of all objects defined in this registry.
+            </summary>
+            <returns>
+            The names of all objects defined in this registry, or an empty array
+            if none defined
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IObjectDefinitionRegistry.ContainsObjectDefinition(System.String)">
+            <summary>
+            Check if this registry contains a object definition with the given name.
+            </summary>
+            <param name="name">
+            The name of the object to look for.
+            </param>
+            <returns>
+            True if this object factory contains an object definition with the
+            given name.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IObjectDefinitionRegistry.GetObjectDefinition(System.String)">
+            <summary>
+            Returns the
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>
+            for the given object name.
+            </summary>
+            <param name="name">
+            The name of the object to find a definition for.
+            </param>
+            <returns>
+            The <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> for
+            the given name (never null).
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If the object definition cannot be resolved.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IObjectDefinitionRegistry.RegisterObjectDefinition(System.String,Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Register a new object definition with this registry.
+            Must support
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+            and <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/>.
+            </summary>
+            <param name="name">
+            The name of the object instance to register.
+            </param>
+            <param name="definition">
+            The definition of the object instance to register.
+            </param>
+            <remarks>
+            <p>
+            Must support
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> and
+            <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/>.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object definition is invalid.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IObjectDefinitionRegistry.GetAliases(System.String)">
+            <summary>
+            Return the aliases for the given object name, if defined.
+            </summary>
+            <param name="name">the object name to check for aliases
+            </param>
+            <remarks>
+            <p>
+            Will ask the parent factory if the object cannot be found in this
+            factory instance.
+            </p>
+            </remarks>
+            <returns>
+            The aliases, or an empty array if none.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IObjectDefinitionRegistry.RegisterAlias(System.String,System.String)">
+            <summary>
+            Given a object name, create an alias. We typically use this method to
+            support names that are illegal within XML ids (used for object names).
+            </summary>
+            <param name="name">
+            The name of the object.
+            </param>
+            <param name="theAlias">
+            The alias that will behave the same as the object name.
+            </param>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there is no object with the given name.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectDefinitionStoreException">
+            If the alias is already in use.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IObjectDefinitionRegistry.ObjectDefinitionCount">
+            <summary>
+            Return the number of objects defined in the registry.
+            </summary>
+            <value>
+            The number of objects defined in the registry.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.Factory.ObjectInitializationException">
+            <summary>
+            Exception that an object implementation is suggested to throw if its own
+            factory-aware initialization code fails.
+            <see cref="T:Spring.Objects.ObjectsException"/> thrown by object factory methods
+            themselves should simply be propagated as-is.
+            </summary>
+            <remarks>
+            <p>
+            Note that non-factory-aware initialization methods like AfterPropertiesSet ()
+            or a custom "init-method" can throw any exception.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectInitializationException.#ctor">
+            <summary>
+            Creates a new instance of the ObjectInitializationException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectInitializationException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the ObjectInitializationException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectInitializationException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the ObjectInitializationException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.ObjectInitializationException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the ObjectInitializationException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.PropertyOverrideConfigurer">
+            <summary>
+            Overrides default values in one or more object definitions.
+            </summary>
+            <remarks>
+            <p>
+            Instances of this class <b>override</b> already existing values, and is
+            thus best suited to replacing defaults. If you need to <i>replace</i>
+            placeholder values, consider using the
+            <seea cref="T:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+            class instead.
+            </p>
+            <p>
+            In contrast to the
+            <see cref="T:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+            class, the original object definition can have default
+            values or no values at all for such object properties. If an overriding
+            configuration file does not have an entry for a certain object property,
+            the default object value is left as is. Also note that it is not
+            immediately obvious to discern which object definitions will be mutated by
+            one or more
+            <see cref="T:Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>s
+            simply by looking at the object configuration.
+            </p>
+            <p>
+            Each line in a referenced configuration file is expected to take the
+            following form...
+            </p>
+            <code escaped="true">
+            	<add key="name.property" value="the override"/>
+            </code>
+            <p>
+            The <c>name.property</c> key refers to the object name and the
+            property that is to be overridden; and the value is the overridding
+            value that will be inserted into the appropriate object definition's
+            named property.
+            </p>
+            <p>
+            Please note that in the case of multiple
+            <see cref="T:Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>s
+            that define different values for the same object definition value, the
+            <b>last</b> overridden value will win (due to the fact that the values
+            supplied by previous
+            <see cref="T:Spring.Objects.Factory.Config.PropertyOverrideConfigurer"/>s
+            will be overridden).
+            </p>
+            </remarks>
+            <example>
+            <p>
+            The following XML context definition defines an object that has a number
+            of properties, all of which have <b>default</b> values...
+            </p>
+            <code escaped="true">
+            <object id="connStringProvider" type="MyNamespace.OracleConnectionStringProvider, MyAssembly">
+            	<property name="dataSource" value="MyOracleDB"/>
+            	<property name="userId" value="sa"/>
+            	<property name="password" value="g0ly4dk1n"/>
+            	<property name="integratedSecurity" value="true"/>
+            </object>
+            </code>
+            <p>
+            What follows is a .NET config file snippet for the above example (assuming
+            the need to override one of the default values)...
+            </p>
+            <code escaped="true">
+            <name-values>
+            	<add key="database.userid" value="test"/>
+            	<add key="database.password" value="0bl0m0v"/>
+            </name-values>
+            </code>
+            </example>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: PropertyOverrideConfigurer.cs,v 1.11 2007/10/10 16:31:39 bbaia Exp $</version>
+            <seealso cref="T:Spring.Objects.Factory.Config.PropertyResourceConfigurer"/>
+            <seealso cref="T:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+            <seealso cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyOverrideConfigurer.ProcessProperties(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Apply the given properties to the supplied
+            <see cref="T:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>.
+            </summary>
+            <param name="factory">
+            The <see cref="T:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>
+            used by the application context.
+            </param>
+            <param name="props">The properties to apply.</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If an error occured.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.PropertyOverrideConfigurer.ProcessKey(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory,System.String,System.String)">
+            <summary>
+            Process the given key as 'name.property' entry.
+            </summary>
+            <param name="factory">
+            The object factory containing the object definitions that are to be
+            processed.
+            </param>
+            <param name="key">The key.</param>
+            <param name="value">The value.</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If an error occurs.
+            </exception>
+            <exception cref="T:Spring.Objects.FatalObjectException">
+            If the property was not well formed (i.e. not in the format "name.property").
+            </exception>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.NamespaceParserAttribute">
+            <summary>
+            Attribute that should be used to specify the default namespace
+            and schema location for a custom namespace parser.
+            </summary>
+            <remarks>
+            If 
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: NamespaceParserAttribute.cs,v 1.1 2007/08/08 00:34:06 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.NamespaceParserAttribute.#ctor">
+            <summary>
+            Creates a new instance of <see cref="T:Spring.Objects.Factory.Xml.NamespaceParserAttribute"/>.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.NamespaceParserAttribute.Namespace">
+            <summary>
+            Gets or sets the default namespace for the configuration parser.
+            </summary>
+            <value>
+            The default namespace for the configuration parser.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.NamespaceParserAttribute.SchemaLocation">
+            <summary>
+            Gets or sets the default schema location for the configuration parser.
+            </summary>
+            <value>
+            The default schema location for the configuration parser.
+            </value>
+            <remarks>
+            If the <see cref="P:Spring.Objects.Factory.Xml.NamespaceParserAttribute.SchemaLocationAssemblyHint"/>  property is set, the <see cref="P:Spring.Objects.Factory.Xml.NamespaceParserAttribute.SchemaLocation"/> will always resolve to an assembly-resource 
+            and the set <see cref="P:Spring.Objects.Factory.Xml.NamespaceParserAttribute.SchemaLocation"/> will be interpreted relative to this assembly.
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.NamespaceParserAttribute.SchemaLocationAssemblyHint">
+            <summary>
+            Gets or sets a type from the assembly containing the schema
+            </summary>
+            <remarks>
+            If this property is set, the <see cref="P:Spring.Objects.Factory.Xml.NamespaceParserAttribute.SchemaLocation"/> will always resolve to an assembly-resource 
+            and the <see cref="P:Spring.Objects.Factory.Xml.NamespaceParserAttribute.SchemaLocation"/> will be interpreted relative to this assembly.
+            </remarks>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.VariablePlaceholderConfigurer">
+            <summary>
+            Resolves placeholder values in one or more object definitions
+            </summary>
+            <remarks>
+            The placeholder syntax follows the NAnt style: <c>${...}</c>.
+            Placeholders values are resolved against a list of 
+            <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/>s.  In case of multiple definitions
+            for the same property placeholder name, the first one in the 
+            list is used.
+            <para>Variable substitution is performed on simple property values, 
+            lists, dictionaries, sets, constructor
+            values, object type name, and object names in
+            runtime object references (
+            <see cref="T:Spring.Objects.Factory.Config.RuntimeObjectReference"/>).</para>
+            <para>Furthermore, placeholder values can also cross-reference other
+            placeholders, in the manner of the following example where the
+            <c>rootPath</c> property is cross-referenced by the <c>subPath</c>
+            property.
+            </para>
+            <example>
+            <code escaped="true">
+            <name-values>
+            	<add key="rootPath" value="myrootdir"/>
+            	<add key="subPath" value="${rootPath}/subdir"/>
+            </name-values>
+            </code>
+            </example>
+            <para>If a configurer cannot resolve a placeholder, and the value of the
+            <see cref="P:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer.IgnoreUnresolvablePlaceholders"/>
+            property is currently set to <see langword="false"/>, an
+            <see cref="T:Spring.Objects.Factory.ObjectDefinitionStoreException"/>
+            will be thrown. </para>
+            </remarks>
+            <author>Mark Pollack</author>
+            <version>$Id: VariablePlaceholderConfigurer.cs,v 1.2 2007/08/02 22:18:32 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariablePlaceholderConfigurer.PostProcessObjectFactory(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)">
+            <summary>
+            Modify the application context's internal object factory after its
+            standard initialization.
+            </summary>
+            <param name="factory">The object factory used by the application context.</param>
+            <remarks>
+            <p>
+            All object definitions will have been loaded, but no objects will have
+            been instantiated yet. This allows for overriding or adding properties
+            even to eager-initializing objects.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariablePlaceholderConfigurer.ProcessProperties(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)">
+            <summary>
+            Apply the property replacement using the specified <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/>s for all
+            object in the supplied
+            <see cref="T:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>.
+            </summary>
+            <param name="factory">
+            The <see cref="T:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory"/>
+            used by the application context.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If an error occured.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.VariablePlaceholderConfigurer.VariableSources">
+            <summary>
+            Sets the list of <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/>s that will be used to resolve placeholder names.
+            </summary>
+            <value>A list of <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/>s.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.VariablePlaceholderConfigurer.VariableSource">
+            <summary>
+            Sets <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/> that will be used to resolve placeholder names.
+            </summary>
+            <value>A <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/> instance.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.VariablePlaceholderConfigurer.IgnoreUnresolvablePlaceholders">
+            <summary>
+            Indicates whether unresolved placeholders should be ignored.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.VariablePlaceholderConfigurer.Order">
+            <summary>
+            Return the order value of this object, where a higher value means greater in
+            terms of sorting.
+            </summary>
+            <returns>The order value.</returns>
+            <seealso cref="P:Spring.Core.IOrdered.Order"/>
+        </member>
+        <member name="T:Spring.Globalization.Formatters.HasTextFilteringFormatter">
+            <summary>
+            Replaces input strings with a given default value, 
+            if they are null or contain whitespaces only,
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: HasTextFilteringFormatter.cs,v 1.1 2008/03/20 13:19:47 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Globalization.Formatters.FilteringFormatter">
+            <summary>
+            Provides base functionality for filtering values before they actually get parsed/formatted.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: FilteringFormatter.cs,v 1.1 2008/03/20 13:19:47 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.FilteringFormatter.#ctor(Spring.Globalization.IFormatter)">
+            <summary>
+             Creates a new instance of this FilteringFormatter.
+            </summary>
+            <param name="underlyingFormatter">an optional underlying formatter</param>
+             <remarks>
+             If no underlying formatter is specified, the values 
+             get passed through "as-is" after being filtered
+             </remarks>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.FilteringFormatter.Parse(System.String)">
+            <summary>
+            Parses the specified value.
+            </summary>
+            <param name="value">The value to parse.</param>
+            <returns>Parsed <paramref name="value"/>.</returns>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.FilteringFormatter.Format(System.Object)">
+            <summary>
+            Formats the specified value.
+            </summary>
+            <param name="value">The value to format.</param>
+            <returns>Formatted <paramref name="value"/>.</returns>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.FilteringFormatter.FilterValueToParse(System.String)">
+            <summary>
+            Allows to rewrite a value before it gets parsed by the underlying formatter
+            </summary>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.FilteringFormatter.FilterValueToFormat(System.Object)">
+            <summary>
+            Allows to change a value before it gets formatted by the underlying formatter
+            </summary>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.HasTextFilteringFormatter.#ctor(Spring.Globalization.IFormatter)">
+            <summary>
+             Creates a new instance of this HasTextFilteringFormatter using null as default value.
+            </summary>
+            <param name="underlyingFormatter">an optional underlying formatter</param>
+             <remarks>
+             If no underlying formatter is specified, the values 
+             get passed through "as-is" after being filtered
+             </remarks>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.HasTextFilteringFormatter.#ctor(System.String,Spring.Globalization.IFormatter)">
+            <summary>
+             Creates a new instance of this HasTextFilteringFormatter.
+            </summary>
+             <param name="defaultValue">the default value to be returned, if input text doesn't contain text</param>
+            <param name="underlyingFormatter">an optional underlying formatter</param>
+             <remarks>
+             If no underlying formatter is specified, the values 
+             get passed through "as-is" after being filtered
+             </remarks>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.HasTextFilteringFormatter.FilterValueToParse(System.String)">
+            <summary>
+            If value contains no text, it will be replaced by a defaultValue.
+            </summary>
+        </member>
+        <member name="T:Spring.Expressions.OpSUBTRACT">
+            <summary>
+            Represents arithmetic subtraction operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpSUBTRACT.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpSUBTRACT.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpSUBTRACT.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpSUBTRACT.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the arithmetic subtraction operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpNotEqual">
+            <summary>
+            Represents logical inequality operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpNotEqual.cs,v 1.11 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpNotEqual.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpNotEqual.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpNotEqual.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical inequality operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpLike">
+            <summary>
+            Represents VB-style logical LIKE operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpLike.cs,v 1.5 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpLike.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpLike.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpLike.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical LIKE operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>
+            true if the left operand matches the right operand, false otherwise.
+            </returns>
+        </member>
+        <member name="T:Spring.Expressions.ArrayConstructorNode">
+            <summary>
+            Represents parsed method node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ArrayConstructorNode.cs,v 1.11 2007/09/07 03:01:21 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.ArrayConstructorNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.ArrayConstructorNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.ArrayConstructorNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Creates new instance of the type defined by this node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.Processors.AverageAggregator">
+            <summary>
+            Implementation of the average aggregator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AverageAggregator.cs,v 1.2 2006/12/04 08:58:33 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.Processors.AverageAggregator.Process(System.Collections.ICollection,System.Object[])">
+            <summary>
+            Returns the average of the numeric values in the source collection.
+            </summary>
+            <param name="source">
+            The source collection to process.
+            </param>
+            <param name="args">
+            Ignored.
+            </param>
+            <returns>
+            The average of the numeric values in the source collection.
+            </returns>
+        </member>
+        <member name="T:Spring.DataBinding.BindingDirection">
+            <summary>
+            Enumeration that defines possible values for data binding direction.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: BindingDirection.cs,v 1.2 2006/04/09 07:18:39 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.DataBinding.BindingDirection.SourceToTarget">
+            <summary>
+            Specifies that value from the control property should be bound to a data model.
+            </summary>
+        </member>
+        <member name="F:Spring.DataBinding.BindingDirection.TargetToSource">
+            <summary>
+            Specifies that value from the data model should be bound to control property.
+            </summary>
+        </member>
+        <member name="F:Spring.DataBinding.BindingDirection.Bidirectional">
+            <summary>
+            Specifies that binding is bidirectional.
+            </summary>
+        </member>
+        <member name="T:Spring.Core.PropertyChangeEventArgs">
+            <summary>
+            Provides additional data for the <c>PropertyChanged</c> event.
+            </summary>
+            <remarks>
+            <p>
+            Provides some additional properties over and above the name of the
+            property that has changed (which is inherited from the
+            <see cref="T:System.ComponentModel.PropertyChangedEventArgs"/> base class).
+            This allows calling code to determine whether or not a property has
+            actually changed (i.e. a <c>PropertyChanged</c> event may have been
+            raised, but the value itself may be equivalent).
+            </p>
+            </remarks>
+            <seealso cref="T:System.ComponentModel.PropertyChangedEventArgs"/>
+        </member>
+        <member name="M:Spring.Core.PropertyChangeEventArgs.#ctor(System.String,System.Object,System.Object)">
+            <summary>
+            Create a new instance of the
+            <see cref="T:Spring.Core.PropertyChangeEventArgs"/> class.
+            </summary>
+            <param name="propertyName">
+            The name of the property that was changed.</param>
+            <param name="oldValue">The old value of the property.</param>
+            <param name="newValue">the new value of the property.</param>
+        </member>
+        <member name="P:Spring.Core.PropertyChangeEventArgs.OldValue">
+            <summary>
+            Get the old value for the property.
+            </summary>
+            <seealso cref="P:System.ComponentModel.PropertyChangedEventArgs.PropertyName"/>
+        </member>
+        <member name="P:Spring.Core.PropertyChangeEventArgs.NewValue">
+            <summary>
+            Get the new value of the property.
+            </summary>
+            <seealso cref="P:System.ComponentModel.PropertyChangedEventArgs.PropertyName"/>
+        </member>
+        <member name="T:Spring.Core.NotWritablePropertyException">
+            <summary>
+            Thrown in response to a failed attempt to write a property.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: NotWritablePropertyException.cs,v 1.1 2007/07/31 00:08:42 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Core.NotWritablePropertyException.#ctor">
+            <summary>
+            Creates a new instance of the NotWritablePropertyException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.NotWritablePropertyException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the NotWritablePropertyException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Core.NotWritablePropertyException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the NotWritablePropertyException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Core.NotWritablePropertyException.#ctor(System.Type,System.String,System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the NotWritablePropertyException class.
+            </summary>
+            <param name="offendingType">
+            The <see cref="T:System.Type"/> that is (or rather was) the source of the
+            offending property.
+            </param>
+            <param name="offendingProperty">
+            The name of the offending property.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Core.NotWritablePropertyException.#ctor(System.String,System.Type)">
+            <summary>
+            Creates a new instance of the NotWritablePropertyException class
+            summarizing what property was not writable.
+            </summary>
+            <param name="offendingProperty">
+            The name of the property that is not writable.
+            </param>
+            <param name="offendingType">
+            The <see cref="T:System.Type"/> in which the property is not writable.
+            </param>
+        </member>
+        <member name="M:Spring.Core.NotWritablePropertyException.#ctor(System.String,System.Type,System.Exception)">
+            <summary>
+            Creates new NotWritablePropertyException with a root cause.
+            </summary>
+            <param name="offendingProperty">
+            The name of the property that is not writable.
+            </param>
+            <param name="offendingType">
+            The <see cref="T:System.Type"/> in which the property is not writable.
+            </param>
+            <param name="rootCause">
+            The root cause indicating why the property was not writable.
+            </param>
+        </member>
+        <member name="M:Spring.Core.NotWritablePropertyException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the NotWritablePropertyException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Context.Support.GenericApplicationContext">
+            <summary>
+            Generic ApplicationContext implementation that holds a single internal
+            <see cref="P:Spring.Context.Support.GenericApplicationContext.DefaultListableObjectFactory"/>  instance and does not 
+            assume a specific object definition format.
+            </summary>
+            <remarks>
+            Implements the <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/> interface in order
+            to allow for aplying any object definition readers to it.
+            <para>Typical usage is to register a variety of object definitions via the
+            <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/> interface and then call 
+            <see cref="M:Spring.Context.IConfigurableApplicationContext.Refresh"/> to initialize those
+            objects with application context semantics (handling 
+            <see cref="T:Spring.Context.IApplicationContextAware"/>, auto-detecting 
+            <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/> ObjectFactoryPostProcessors, etc).
+            </para>
+            <para>In contrast to other IApplicationContext implementations that create a new internal
+            IObjectFactory instance for each refresh, the internal IObjectFactory of this context
+            is available right from the start, to be able to register object definitions on it.
+            <see cref="M:Spring.Context.IConfigurableApplicationContext.Refresh"/> may only be called once</para>
+            <para>Usage examples</para>
+            <example>
+            GenericApplicationContext ctx = new GenericApplicationContext();
+            
+            </example>
+            </remarks>
+            <author>Mark Pollack</author>
+            <version>$Id: GenericApplicationContext.cs,v 1.5 2008/02/17 13:34:44 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Context.Support.GenericApplicationContext.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Context.Support.GenericApplicationContext"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.GenericApplicationContext.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Context.Support.GenericApplicationContext"/> class.
+            </summary>
+            <param name="caseSensitive">if set to <c>true</c> names in the context are case sensitive.</param>
+        </member>
+        <member name="M:Spring.Context.Support.GenericApplicationContext.#ctor(Spring.Objects.Factory.Support.DefaultListableObjectFactory)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Context.Support.GenericApplicationContext"/> class.
+            </summary>
+            <param name="objectFactory">The object factory instance to use for this context.</param>
+        </member>
+        <member name="M:Spring.Context.Support.GenericApplicationContext.#ctor(Spring.Context.IApplicationContext)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Context.Support.GenericApplicationContext"/> class.
+            </summary>
+            <param name="parent">The parent application context.</param>
+        </member>
+        <member name="M:Spring.Context.Support.GenericApplicationContext.#ctor(System.String,System.Boolean,Spring.Context.IApplicationContext)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Context.Support.GenericApplicationContext"/> class.
+            </summary>
+            <param name="name">The name of the application context.</param>
+            <param name="caseSensitive">if set to <c>true</c> names in the context are case sensitive.</param>
+            <param name="parent">The parent application context.</param>
+        </member>
+        <member name="M:Spring.Context.Support.GenericApplicationContext.#ctor(Spring.Objects.Factory.Support.DefaultListableObjectFactory,Spring.Context.IApplicationContext)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Context.Support.GenericApplicationContext"/> class.
+            </summary>
+            <param name="objectFactory">The object factory to use for this context</param>
+            <param name="parent">The parent applicaiton context.</param>
+        </member>
+        <member name="M:Spring.Context.Support.GenericApplicationContext.RefreshObjectFactory">
+            <summary>
+            Do nothing operation.  We hold a single internal ObjectFactory and rely on callers
+            to register objects throug our public methods (or the ObjectFactory's).
+            </summary>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of errors encountered while refreshing the object factory.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.GenericApplicationContext.GetObjectDefinition(System.String)">
+            <summary>
+            Returns the
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>
+            for the given object name.
+            </summary>
+            <param name="name">The name of the object to find a definition for.</param>
+            <returns>
+            The <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> for
+            the given name (never null).
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If the object definition cannot be resolved.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.GenericApplicationContext.RegisterObjectDefinition(System.String,Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Register a new object definition with this registry.
+            Must support
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+            and <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/>.
+            </summary>
+            <param name="name">The name of the object instance to register.</param>
+            <param name="definition">The definition of the object instance to register.</param>
+            <remarks>
+            	<p>
+            Must support
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> and
+            <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/>.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object definition is invalid.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.GenericApplicationContext.RegisterAlias(System.String,System.String)">
+            <summary>
+            Given a object name, create an alias. We typically use this method to
+            support names that are illegal within XML ids (used for object names).
+            </summary>
+            <param name="name">The name of the object.</param>
+            <param name="theAlias">The alias that will behave the same as the object name.</param>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there is no object with the given name.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectDefinitionStoreException">
+            If the alias is already in use.
+            </exception>
+        </member>
+        <member name="P:Spring.Context.Support.GenericApplicationContext.ParentContext">
+            <summary>
+            Gets the parent context, or <see langword="null"/> if there is no
+            parent context.  Set the parent of this application context also setting
+            the parent of the interanl ObjectFactory accordingly.
+            </summary>
+            <value>The parent context</value>
+            <returns>
+            The parent context, or <see langword="null"/>  if there is no
+            parent.
+            </returns>
+            <seealso cref="P:Spring.Context.IApplicationContext.ParentContext"/>
+        </member>
+        <member name="P:Spring.Context.Support.GenericApplicationContext.ObjectFactory">
+            <summary>
+            Return the internal object factory of this application context.
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Spring.Context.Support.GenericApplicationContext.DefaultListableObjectFactory">
+            <summary>
+            Gets the underlying object factory of this context, available for 
+            registering object definitions.
+            </summary>
+            <remarks>You need to call <code>Refresh</code> to initialize the
+            objects factory and its contained objects with application context
+            semantics (autodecting IObjectFactoryPostProcessors, etc).</remarks>
+            <value>The internal object factory (as DefaultListableObjectFactory).</value>
+        </member>
+        <member name="T:Spring.Collections.SortedSet">
+            <summary>
+            Implements an <see cref="T:Spring.Collections.ISet"/> based on a sorted
+            tree.
+            </summary>
+            <remarks>
+            <p>
+            This gives good performance for operations on very large data-sets,
+            though not as good - asymptotically - as a
+            <see cref="T:Spring.Collections.HashedSet"/>. However, iteration occurs
+            in order.
+            </p>
+            <p>
+            Elements that you put into this type of collection must implement
+            <see cref="T:System.IComparable"/>, and they must actually be comparable.
+            You can't mix <see cref="T:System.String"/> and
+            <see cref="T:System.Int32"/> values, for example.
+            </p>
+            <p>
+            This <see cref="T:Spring.Collections.ISet"/> implementation does
+            <b>not</b> support elements that are <see langword="null"/>.
+            </p>
+            </remarks>
+            <seealso cref="T:Spring.Collections.ISet"/>
+            <version>$Id: SortedSet.cs,v 1.6 2007/03/16 04:01:29 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Collections.SortedSet.#ctor">
+            <summary>
+            Creates a new set instance based on a sorted tree.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.SortedSet.#ctor(System.Collections.ICollection)">
+            <summary>
+            Creates a new set instance based on a sorted tree and initializes
+            it based on a collection of elements.
+            </summary>
+            <param name="initialValues">
+            A collection of elements that defines the initial set contents.
+            </param>
+        </member>
+        <member name="T:Spring.Caching.InvalidateCacheAttribute">
+            <summary>
+            This attribute should be used to mark method that should 
+            invalidate one or more cache items when invoked.
+            </summary>
+            <remarks>
+            <p>
+            This attribute allows application developers to specify that some
+            cache items should be evicted from cache when the method is invoked, 
+            but it will not do any eviction by itself.
+            </p>
+            <p>
+            In order to actually evict cache items, an application developer
+            must apply a <c>Spring.Aspects.Cache.InvalidateCacheAdvice</c> to
+            all of the members that have this attribute defined.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: InvalidateCacheAttribute.cs,v 1.2 2007/04/01 15:04:39 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Caching.InvalidateCacheAttribute.#ctor">
+            <summary>
+            Creates an attribute instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Caching.InvalidateCacheAttribute.#ctor(System.String)">
+            <summary>
+            Creates an attribute instance.
+            </summary>
+            <param name="cacheName">
+            The name of the cache to use.
+            </param>
+        </member>
+        <member name="P:Spring.Caching.InvalidateCacheAttribute.CacheName">
+            <summary>
+            Gets or sets the name of the cache to use.
+            </summary>
+            <value>
+            The name of the cache to use.
+            </value>
+        </member>
+        <member name="P:Spring.Caching.InvalidateCacheAttribute.Keys">
+            <summary>
+            Gets or sets a SpEL expression that should be evaluated in order 
+            to determine the keys for the items that should be evicted.
+            </summary>
+            <value>
+            An expression string that should be evaluated in order 
+            to determine the keys for the items that should be evicted.
+            </value>
+        </member>
+        <member name="P:Spring.Caching.InvalidateCacheAttribute.KeysExpression">
+            <summary>
+            Gets an expression instance that should be evaluated in order 
+            to determine the keys for the items that should be evicted.
+            </summary>
+            <value>
+            An expression instance that should be evaluated in order 
+            to determine the keys for the items that should be evicted.
+            </value>
+        </member>
+        <member name="P:Spring.Caching.InvalidateCacheAttribute.Condition">
+            <summary>
+            Gets or sets a SpEL expression that should be evaluated in order 
+            to determine whether items should be evicted.
+            </summary>
+            <value>
+            An expression string that should be evaluated in order to determine 
+            whether items should be evicted.
+            </value>
+        </member>
+        <member name="P:Spring.Caching.InvalidateCacheAttribute.ConditionExpression">
+            <summary>
+            Gets an expression instance that should be evaluated in order 
+            to determine whether items should be evicted.
+            </summary>
+            <value>
+            An expression instance that should be evaluated in order to determine 
+            whether items should be evicted.
+            </value>
+        </member>
+        <member name="T:Spring.Validation.Actions.ExpressionAction">
+            <summary>
+            Implementation of <see cref="T:Spring.Validation.IValidationAction"/> that allows you
+            to define Spring.NET expressions that should be evaluated after
+            validation.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ExpressionAction.cs,v 1.6 2008/02/05 20:40:25 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Validation.Actions.ExpressionAction.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.Actions.ExpressionAction"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.Actions.ExpressionAction.#ctor(System.String,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.Actions.ExpressionAction"/> class.
+            </summary>
+            <param name="onValid">Expression to execute when validator is valid.</param>
+            <param name="onInvalid">Expression to execute when validator is not valid.</param>
+        </member>
+        <member name="M:Spring.Validation.Actions.ExpressionAction.#ctor(Spring.Expressions.IExpression,Spring.Expressions.IExpression)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.Actions.ExpressionAction"/> class.
+            </summary>
+            <param name="onValid">Expression to execute when validator is valid.</param>
+            <param name="onInvalid">Expression to execute when validator is not valid.</param>
+        </member>
+        <member name="M:Spring.Validation.Actions.ExpressionAction.OnValid(System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Called when associated validator is valid.
+            </summary>
+            <param name="validationContext">Validation context.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors">Validation errors container.</param>
+        </member>
+        <member name="M:Spring.Validation.Actions.ExpressionAction.OnInvalid(System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Called when associated validator is invalid.
+            </summary>
+            <param name="validationContext">Validation context.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors">Validation errors container.</param>
+        </member>
+        <member name="P:Spring.Validation.Actions.ExpressionAction.Valid">
+            <summary>
+            Gets or sets the expression to execute when validator is valid.
+            </summary>
+            <value>The expression to execute when validator is valid.</value>
+        </member>
+        <member name="P:Spring.Validation.Actions.ExpressionAction.Invalid">
+            <summary>
+            Gets or sets the expression to execute when validator is not valid.
+            </summary>
+            <value>The expression to execute when validator is not valid.</value>
+        </member>
+        <member name="T:Spring.Proxy.AbstractProxyMethodBuilder">
+            <summary>
+            Base class for method builders that contains common functionalities.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: AbstractProxyMethodBuilder.cs,v 1.7 2008/02/06 18:26:42 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Proxy.AbstractProxyMethodBuilder.typeBuilder">
+            <summary>
+            The type builder to use.
+            </summary>
+        </member>
+        <member name="F:Spring.Proxy.AbstractProxyMethodBuilder.proxyGenerator">
+            <summary>
+            The <see cref="T:Spring.Proxy.IProxyTypeGenerator"/> implementation to use.
+            </summary>
+        </member>
+        <member name="F:Spring.Proxy.AbstractProxyMethodBuilder.explicitImplementation">
+            <summary>
+            Indicates whether interfaces should be implemented explicitly.
+            </summary>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyMethodBuilder.#ctor(System.Reflection.Emit.TypeBuilder,Spring.Proxy.IProxyTypeGenerator,System.Boolean)">
+            <summary>
+            Creates a new instance of the method builder.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="proxyGenerator">
+            The <see cref="T:Spring.Proxy.IProxyTypeGenerator"/> implementation to use.
+            </param>
+            <param name="explicitImplementation">
+            <see langword="true"/> if the interface is to be
+            implemented explicitly; otherwise <see langword="false"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyMethodBuilder.BuildProxyMethod(System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Dynamically builds proxy method.
+            </summary>
+            <param name="method">The method to proxy.</param>
+            <param name="interfaceMethod">
+            The interface definition of the method, if applicable.
+            </param>
+            <returns>
+            The <see cref="T:System.Reflection.Emit.MethodBuilder"/> for the proxy method.
+            </returns>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyMethodBuilder.PushProxy(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the proxy instance on stack.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyMethodBuilder.PushTarget(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the target instance on which calls should be delegated to.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyMethodBuilder.DefineMethod(System.Reflection.MethodInfo,System.Reflection.MethodInfo,System.Boolean)">
+            <summary>
+            Defines proxy method for the target object.
+            </summary>
+            <param name="method">The method to proxy.</param>
+            <param name="intfMethod">
+            The interface definition of the method, if applicable.
+            </param>
+            <param name="explicitImplementation">
+            <see langword="true"/> if the supplied <paramref name="intfMethod"/> is to be
+            implemented explicitly; otherwise <see langword="false"/>.
+            </param>
+            <returns>
+            The <see cref="T:System.Reflection.Emit.MethodBuilder"/> for the proxy method.
+            </returns>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyMethodBuilder.DefineParameters(System.Reflection.Emit.MethodBuilder,System.Reflection.MethodInfo)">
+            <summary>
+            Defines method parameters based on proxied method metadata.
+            </summary>
+            <param name="methodBuilder">
+            The <see cref="T:System.Reflection.Emit.MethodBuilder"/> to use.
+            </param>
+            <param name="method">The method to proxy.</param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyMethodBuilder.DefineGenericParameters(System.Reflection.Emit.MethodBuilder,System.Reflection.MethodInfo)">
+            <summary>
+            Defines generic method parameters based on proxied method metadata.
+            </summary>
+            <param name="methodBuilder">
+            The <see cref="T:System.Reflection.Emit.MethodBuilder"/> to use.
+            </param>
+            <param name="method">The method to proxy.</param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyMethodBuilder.GenerateMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Generates the proxy method.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+            <param name="interfaceMethod">
+            The interface definition of the method, if applicable.
+            </param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyMethodBuilder.CallDirectTargetMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo)">
+            <summary>
+            Calls target method directly.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="interfaceMethod">
+            The interface definition of the method, if applicable.
+            </param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyMethodBuilder.CallDirectBaseMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo)">
+            <summary>
+            Calls base method directly.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+        </member>
+        <member name="M:Spring.Proxy.AbstractProxyMethodBuilder.ProcessReturnValue(System.Reflection.Emit.ILGenerator,System.Reflection.Emit.LocalBuilder)">
+            <summary>
+            Replaces a raw reference with a reference to a proxy.
+            </summary>
+            <remarks>
+            <p>
+            If the target object returns reference to itself -- 'this' --
+            we need to treat it as a special case and return a reference
+            to a proxy object instead.
+            </p>
+            </remarks>
+            <param name="il">The IL generator to use.</param>
+            <param name="returnValue">The location of the return value.</param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.ManagedCollectionElementResolver">
+            <summary>
+            Resolves a single element value of a managed collection.
+            </summary>
+            <remarks>
+            <p>
+            If the <paramref name="element"/> does not need to be resolved or
+            converted to an appropriate <see cref="T:System.Type"/>, the
+            <paramref name="element"/> will be returned as-is.
+            </p>
+            </remarks>
+            <param name="name">
+            The name of the top level object that is having the value of one of it's
+            collection properties resolved.
+            </param>
+            <param name="definition">
+            The definition of the named top level object.
+            </param>
+            <param name="argumentName">
+            The name of the property the value of which is being resolved.
+            </param>
+            <param name="element">
+            That element of a managed collection that may need to be resolved
+            to a concrete value.
+            </param>
+            <returns>A fully resolved element.</returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.DelegatingMethodReplacer">
+            <summary>
+            An <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>
+            implementation that delegates to an
+            <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/> that is
+            obtained as the result of a lookup in an associated IoC container.
+            </summary>
+            <remarks>
+            <p>
+            This class is reserved for internal use within the framework; it is
+            not intended to be used by application developers using Spring.NET.
+            </p>
+            </remarks>
+            <author>Rick Evans</author>
+            <version>$Id: DelegatingMethodReplacer.cs,v 1.3 2007/07/30 17:52:22 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DelegatingMethodReplacer.#ctor(Spring.Objects.Factory.Support.IConfigurableObjectDefinition,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:System.ArgumentNullException"/>
+            class.
+            </summary>
+            <param name="objectDefinition">
+            The object definition that is the target of the method replacement.
+            </param>
+            <param name="objectFactory">
+            The enclosing IoC container with which the above
+            <paramref name="objectDefinition"/> is associated.
+            </param>
+            <exception cref="T:Spring.Objects.Factory.Support.DelegatingMethodReplacer">
+            If either of the supplied arguments is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DelegatingMethodReplacer.Implement(System.Object,System.Reflection.MethodInfo,System.Object[])">
+            <summary>
+            Reimplements the supplied <paramref name="method"/> by delegating to
+            another <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>
+            looked up in an enclosing IoC container.
+            </summary>
+            <param name="target">
+            The instance whose <paramref name="method"/> is to be
+            (re)implemented.
+            </param>
+            <param name="method">
+            The method that is to be (re)implemented.
+            </param>
+            <param name="arguments">The target method's arguments.</param>
+            <returns>
+            The result of the delegated call to the looked up
+            <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.IObjectDefinitionFactory">
+            <summary>
+            Central interface for factories that can create
+            <see cref="T:Spring.Objects.Factory.Support.IConfigurableObjectDefinition"/>
+            instances.
+            </summary>
+            <remarks>
+            <p>
+            Allows for replaceable object definition factories using the Strategy
+            pattern.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IObjectDefinitionFactory.cs,v 1.10 2007/07/30 18:00:01 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.IObjectDefinitionFactory.CreateObjectDefinition(System.String,System.String,System.AppDomain)">
+            <summary>
+            Factory style method for getting concrete
+            <see cref="T:Spring.Objects.Factory.Support.IConfigurableObjectDefinition"/>
+            instances.
+            </summary>
+            <param name="typeName">
+            The FullName of the <see cref="T:System.Type"/> of the defined object.
+            </param>
+            <param name="parent">The name of the parent object definition (if any).</param>
+            <param name="domain">
+            The <see cref="T:System.AppDomain"/> against which any class names
+            will be resolved into <see cref="T:System.Type"/> instances.  It can be null to register the
+            object class just by name.
+            </param>
+            <returns>
+            An
+            <see cref="T:Spring.Objects.Factory.Support.AbstractObjectDefinition"/>
+            instance.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper">
+            <summary>
+            Sateful class used to parse XML object definitions.
+            </summary>
+            <remarks>Not all parsing code has been refactored into this class.</remarks>
+            <author>Rob Harrop</author>
+            <author>Juergen Hoeller</author>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ObjectDefinitionParserHelper.cs,v 1.7 2007/08/07 22:05:20 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper.log">
+            <summary>
+            The shared <see cref="T:Common.Logging.ILog"/> instance for this class (and derived classes).
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper.#ctor(Spring.Objects.Factory.Xml.XmlReaderContext)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper"/> class.
+            </summary>
+            <param name="readerContext">The reader context.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper.InitDefaults(System.Xml.XmlElement)">
+            <summary>
+            Initialize the default lazy-init, dependency check, and autowire settings.
+            </summary>
+            <param name="root">The root element</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper.IsDefaultNamespace(System.String)">
+            <summary>
+            Determines whether the Spring object namespace is equal to the the specified namespace URI.
+            </summary>
+            <param name="namespaceUri">The namespace URI.</param>
+            <returns>
+            	<c>true</c> if is the default Spring namespace; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper.DecorateObjectDefinitionIfRequired(System.Xml.XmlElement,Spring.Objects.Factory.Config.ObjectDefinitionHolder)">
+            <summary>
+            Decorates the object definition if required.
+            </summary>
+            <param name="element">The element.</param>
+            <param name="holder">The holder.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper.IsTrueStringValue(System.String)">
+            <summary>
+            Determines whether the string represents a 'true' boolean value.
+            </summary>
+            <param name="value">The value.</param>
+            <returns>
+            	<c>true</c> if is 'true' string value; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper.CreateRootObjectDefinitionBuilder(System.String)">
+            <summary>
+            Convenience method to create a builder for a root object definition.
+            </summary>
+            <param name="objectTypeName">Name of the object type.</param>
+            <returns>A builder for a root object definition.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper.CreateRootObjectDefinitionBuilder(System.Type)">
+            <summary>
+            Convenience method to create a builder for a root object definition.
+            </summary>
+            <param name="objectType">Type of the object.</param>
+            <returns>a builder for a root object definition</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper.Defaults">
+            <summary>
+            Gets the defaults definition object, or <code>null</code> if the 
+            default have not yet been initialized.
+            </summary>
+            <value>The defaults.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper.ReaderContext">
+            <summary>
+            Gets the reader context.
+            </summary>
+            <value>The reader context.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.VariableAccessor">
+            <summary>
+            Provides methods for type-safe accessing <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/>s.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: VariableAccessor.cs,v 1.2 2007/08/27 14:49:42 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.#ctor(Spring.Objects.Factory.Config.IVariableSource)">
+            <summary>
+            Initialize a new instance of an <see cref="T:Spring.Objects.Factory.Config.VariableAccessor"/>
+            </summary>
+            <param name="variableSource">The underlying <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/> to read values from.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetFloat(System.String,System.Single)">
+            <summary>
+            Returns a <see cref="T:System.Single"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.Single"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetFloat(System.String,System.Single,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.Single"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.Single"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetDouble(System.String,System.Double)">
+            <summary>
+            Returns a <see cref="T:System.Double"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.Double"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetDouble(System.String,System.Double,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.Double"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.Double"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetDecimal(System.String,System.Decimal)">
+            <summary>
+            Returns a <see cref="T:System.Decimal"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.Decimal"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetDecimal(System.String,System.Decimal,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.Decimal"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.Decimal"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetInt64(System.String,System.Int64)">
+            <summary>
+            Returns a <see cref="T:System.Int64"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.Int64"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetInt64(System.String,System.Int64,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.Int64"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.Int64"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetUInt64(System.String,System.UInt64)">
+            <summary>
+            Returns a <see cref="T:System.UInt64"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.UInt64"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetUInt64(System.String,System.UInt64,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.UInt64"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.UInt64"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetInt32(System.String,System.Int32)">
+            <summary>
+            Returns a <see cref="T:System.Int32"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.Int32"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetInt32(System.String,System.Int32,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.Int32"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.Int32"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetUInt32(System.String,System.UInt32)">
+            <summary>
+            Returns a <see cref="T:System.UInt32"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.UInt32"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetUInt32(System.String,System.UInt32,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.UInt32"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.UInt32"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetInt16(System.String,System.Int16)">
+            <summary>
+            Returns a <see cref="T:System.Int16"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.Int16"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetInt16(System.String,System.Int16,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.Int16"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.Int16"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetUInt16(System.String,System.UInt16)">
+            <summary>
+            Returns a <see cref="T:System.Int16"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.Int16"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetUInt16(System.String,System.UInt16,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.Int16"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.Int16"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetByte(System.String,System.Byte)">
+            <summary>
+            Returns a <see cref="T:System.Byte"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.Byte"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetByte(System.String,System.Byte,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.Byte"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.Byte"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetGuid(System.String,System.Guid)">
+            <summary>
+            Returns a <see cref="T:System.Guid"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.Guid"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetGuid(System.String,System.Guid,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.Guid"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.Guid"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetDateTime(System.String,System.String,System.DateTime)">
+            <summary>
+            Returns a <see cref="T:System.DateTime"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="format">The expected format of the variable's value</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.DateTime"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetDateTime(System.String,System.String,System.DateTime,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.DateTime"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="format">The expected format of the variable's value</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.DateTime"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetChar(System.String,System.Char)">
+            <summary>
+            Returns a <see cref="T:System.Char"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.Char"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetChar(System.String,System.Char,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.Char"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.Char"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetBoolean(System.String,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.Boolean"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            A <see cref="T:System.Boolean"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetBoolean(System.String,System.Boolean,System.Boolean)">
+            <summary>
+            Returns a <see cref="T:System.Boolean"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            A <see cref="T:System.Boolean"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetEnum(System.String,System.Enum)">
+            <summary>
+            Returns an <see cref="T:System.Enum"/> of type <paramref name="defaultValue.GetType()"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <returns>
+            An <see cref="T:System.Enum"/> of type <paramref name="defaultValue.GetType()"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetEnum(System.String,System.Enum,System.Boolean)">
+            <summary>
+            Returns an <see cref="T:System.Enum"/> of type <paramref name="defaultValue.GetType()"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.</param>
+            <param name="throwOnInvalidValue">
+            If <c>false</c>, suppresses exceptions if the result 
+            of <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed
+            and returns <paramref name="defaultValue"/> instead.</param>
+            <returns>
+            An <see cref="T:System.Enum"/> of type <paramref name="defaultValue.GetType()"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> cannot be parsed.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.VariableAccessor.GetString(System.String,System.String)">
+            <summary>
+            Returns a <see cref="T:System.String"/> that contains the value of the specified variable.
+            </summary>
+            <param name="name">The name of the variable to be read.</param>
+            <param name="defaultValue">The value to be returned if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <see lang="null"/> or <see cref="F:System.String.Empty"/>.</param>
+            <returns>
+            A <see cref="T:System.String"/> that contains the value of the specified variable 
+            or <paramref name="defaultValue"/>, if <see cref="M:Spring.Objects.Factory.Config.IVariableSource.ResolveVariable(System.String)"/> returns <c>null</c>.
+            </returns>
+        </member>
+        <member name="T:Spring.Globalization.Formatters.CurrencyFormatter">
+            <summary>
+            Implementation of <see cref="T:Spring.Globalization.IFormatter"/> that can be used to
+            format and parse currency values.
+            </summary>
+            <remarks>
+            <para>
+            <c>CurrencyFormatter</c> uses currency related properties of the
+            <see cref="T:System.Globalization.NumberFormatInfo"/> to format and parse currency values. 
+            </para>
+            <para>
+            If you use one of the constructors that accept culture as a parameter
+            to create an instance of <c>CurrencyFormatter</c>, default <c>NumberFormatInfo</c>
+            for the specified culture will be used.
+            </para>
+            <para>
+            You can also use properties exposed by the <c>CurrencyFormatter</c> in order
+            to override some of the default currency formatting parameters.
+            </para>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CurrencyFormatter.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.CurrencyFormatter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.CurrencyFormatter"/> class
+            using default <see cref="T:System.Globalization.NumberFormatInfo"/> for the current thread's culture.
+            </summary>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.CurrencyFormatter.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.CurrencyFormatter"/> class
+            using default <see cref="T:System.Globalization.NumberFormatInfo"/> for the specified culture.
+            </summary>
+            <param name="cultureName">The culture name.</param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.CurrencyFormatter.#ctor(System.Globalization.CultureInfo)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.CurrencyFormatter"/> class
+            using default <see cref="T:System.Globalization.NumberFormatInfo"/> for the specified culture.
+            </summary>
+            <param name="culture">The culture.</param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.CurrencyFormatter.#ctor(System.Globalization.NumberFormatInfo)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Globalization.Formatters.CurrencyFormatter"/> class
+            using specified <see cref="T:System.Globalization.NumberFormatInfo"/>.
+            </summary>
+            <param name="formatInfo">
+            The <see cref="T:System.Globalization.NumberFormatInfo"/> instance that defines how 
+            currency values are formatted.
+            </param>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.CurrencyFormatter.Format(System.Object)">
+            <summary>
+            Formats the specified currency value.
+            </summary>
+            <param name="value">The value to format.</param>
+            <returns>Formatted currency <paramref name="value"/>.</returns>
+            <exception cref="T:System.ArgumentNullException">If <paramref name="value"/> is <c>null</c>.</exception>
+            <exception cref="T:System.ArgumentException">If <paramref name="value"/> is not a number.</exception>
+        </member>
+        <member name="M:Spring.Globalization.Formatters.CurrencyFormatter.Parse(System.String)">
+            <summary>
+            Parses the specified currency value.
+            </summary>
+            <param name="value">The currency value to parse.</param>
+            <returns>Parsed currency value as a <see cref="T:System.Double"/>.</returns>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.CurrencyFormatter.DecimalDigits">
+            <summary>
+            Gets or sets the currency decimal digits.
+            </summary>
+            <value>The currency decimal digits.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.CurrencyDecimalDigits"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.CurrencyFormatter.DecimalSeparator">
+            <summary>
+            Gets or sets the currency decimal separator.
+            </summary>
+            <value>The currency decimal separator.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.CurrencyDecimalSeparator"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.CurrencyFormatter.GroupSizes">
+            <summary>
+            Gets or sets the currency group sizes.
+            </summary>
+            <value>The currency group sizes.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.CurrencyGroupSizes"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.CurrencyFormatter.GroupSeparator">
+            <summary>
+            Gets or sets the currency group separator.
+            </summary>
+            <value>The currency group separator.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.CurrencyGroupSeparator"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.CurrencyFormatter.CurrencySymbol">
+            <summary>
+            Gets or sets the currency symbol.
+            </summary>
+            <value>The currency symbol.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.CurrencySymbol"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.CurrencyFormatter.NegativePattern">
+            <summary>
+            Gets or sets the currency negative pattern.
+            </summary>
+            <value>The currency negative pattern.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.CurrencyNegativePattern"/>
+        </member>
+        <member name="P:Spring.Globalization.Formatters.CurrencyFormatter.PositivePattern">
+            <summary>
+            Gets or sets the currency positive pattern.
+            </summary>
+            <value>The currency positive pattern.</value>
+            <seealso cref="P:System.Globalization.NumberFormatInfo.CurrencyPositivePattern"/>
+        </member>
+        <member name="T:Spring.Expressions.OpGreater">
+            <summary>
+            Represents logical "greater than" operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpGreater.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpGreater.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpGreater.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpGreater.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical "greater than" operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.NullLiteralNode">
+            <summary>
+            Represents parsed null literal node.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: NullLiteralNode.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.NullLiteralNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.NullLiteralNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.NullLiteralNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the null literal node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.MapEntryNode">
+            <summary>
+            Represents parsed map entry node.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: MapEntryNode.cs,v 1.4 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.MapEntryNode.#ctor">
+            <summary>
+            Creates a new instance of <see cref="T:Spring.Expressions.MapEntryNode"/>.
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.MapEntryNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.MapEntryNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Creates new instance of the map entry defined by this node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.DataBinding.ListBinding">
+            <summary>
+            <see cref="T:Spring.DataBinding.IBindingContainer"/> implementation that allows
+            data binding between collections that implement <see cref="T:System.Collections.IList"/>
+            interface.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ListBinding.cs,v 1.2 2008/02/05 20:40:25 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.DataBinding.ListBinding.BindSourceToTarget(System.Object,System.Object,Spring.Validation.IValidationErrors,System.Collections.IDictionary)">
+            <summary>
+            Binds source object to target object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.ListBinding.BindTargetToSource(System.Object,System.Object,Spring.Validation.IValidationErrors,System.Collections.IDictionary)">
+            <summary>
+            Binds target object to source object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.FileInfoConverter">
+            <summary>
+            Converter for <see cref="T:System.IO.FileInfo"/> instances.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.FileInfoConverter.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.TypeConversion.FileInfoConverter"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.FileInfoConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Returns whether this converter can convert an object of one
+            <see cref="T:System.Type"/> to a <see cref="T:System.IO.FileInfo"/>
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from a
+            <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns>True if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.FileInfoConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Convert from a string value to a <see cref="T:System.IO.FileInfo"/> instance.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture. 
+            </param>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <returns>
+            A <see cref="T:System.IO.FileInfo"/> if successful. 
+            </returns>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.CredentialConverter">
+            <summary>
+            Converts string representation of a credential for Web client authentication 
+            into an instance of <see cref="T:System.Net.NetworkCredential"/>.
+            </summary>
+            <example>
+            <p>
+            Find below some examples of the XML formatted strings that this
+            converter will sucessfully convert.
+            </p>
+            <code escaped="true">
+            <property name="credentials" value="Spring\bbaia:sprnet"/>
+            </code>
+            <code escaped="true">
+            <property name="credentials" value="bbaia:sprnet"/>
+            </code>
+            </example>
+            <author>Bruno Baia</author>
+            <version>$Id: CredentialConverter.cs,v 1.2 2007/12/07 15:14:40 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.CredentialConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Can we convert from the sourcetype 
+            to a <see cref="T:System.Net.NetworkCredential"/> instance ?
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from a <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns><see langword="true"/> if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.CredentialConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Convert from a <see cref="T:System.String"/> value to an
+            <see cref="T:System.Net.NetworkCredential"/> instance.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture.
+            </param>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <returns>
+            A <see cref="T:System.Net.NetworkCredential"/> instance if successful.
+            </returns>        
+        </member>
+        <member name="T:Spring.Core.OrderComparator">
+            <summary>
+            Comparator implementation for <see cref="T:Spring.Core.IOrdered"/> objects, sorting by
+            order value ascending (resp. by priority descending).
+            </summary>
+            <remarks>
+            <p>
+            Non-<see cref="T:Spring.Core.IOrdered"/> objects are treated as greatest order values,
+            thus ending up at the end of a list, in arbitrary order (just like same order values of
+            <see cref="T:Spring.Core.IOrdered"/> objects).
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Aleksandar Seovic (.Net)</author>
+            <version>$Id: OrderComparator.cs,v 1.5 2006/04/09 07:18:38 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Core.OrderComparator.Compare(System.Object,System.Object)">
+            <summary>
+            Compares two objects and returns a value indicating whether one is less than,
+            equal to or greater than the other.
+            </summary>
+            <remarks>
+            <p>
+            Uses direct evaluation instead of <see cref="M:System.Int32.CompareTo(System.Object)"/>
+            to avoid unnecessary boxing.
+            </p>
+            </remarks>
+            <param name="o1">The first object to compare.</param>
+            <param name="o2">The second object to compare.</param>
+            <returns>
+            -1 if first object is less then second, 1 if it is greater, or 0 if they are equal.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.IO.ConfigSectionResource">
+            <summary>
+            Used when retrieving information from the standard .NET configuration
+            files (App.config / Web.config).
+            </summary>
+            <remarks>
+            <p>
+            If created with the name of a configuration section, then all methods
+            aside from the description return <see langword="null"/>,
+            <see langword="false"/>, or throw an exception. If created with an
+            <see cref="T:System.Xml.XmlElement"/>, then the
+            <see cref="P:Spring.Core.IO.ConfigSectionResource.InputStream"/> property
+            will return a corresponding <see cref="T:System.IO.Stream"/> to parse.
+            </p>
+            </remarks>
+            <author>Mark Pollack</author>
+            <author>Rick Evans</author>
+            <version>$Id: ConfigSectionResource.cs,v 1.27 2007/12/05 00:57:31 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.IO.ConfigSectionResource.#ctor(System.Xml.XmlElement)">
+            <summary>
+            Creates new instance of the
+            <see cref="T:Spring.Core.IO.ConfigSectionResource"/> class.
+            </summary>
+            <param name="configSection">
+            The actual XML configuration section.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="configSection"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Core.IO.ConfigSectionResource.#ctor(System.String)">
+            <summary>
+            Creates new instance of the
+            <see cref="T:Spring.Core.IO.ConfigSectionResource"/> class.
+            </summary>
+            <param name="resourceName">
+            The name of the configuration section.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="resourceName"/> is
+            <see langword="null"/> or contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="P:Spring.Core.IO.ConfigSectionResource.Uri">
+            <summary>
+            Returns the <see cref="T:System.Uri"/> handle for this resource.
+            </summary>
+            <remarks>
+            <p>
+            This implementation always returns <see langword="null"/>.
+            </p>
+            </remarks>
+            <value>
+            <see langword="null"/>.
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.Uri"/>
+        </member>
+        <member name="P:Spring.Core.IO.ConfigSectionResource.File">
+            <summary>
+            Returns a <see cref="T:System.IO.FileInfo"/> handle for this resource.
+            </summary>
+            <remarks>
+            <p>
+            This implementation always returns <see langword="null"/>.
+            </p>
+            </remarks>
+            <value>
+            <see langword="null"/>.
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.File"/>
+        </member>
+        <member name="P:Spring.Core.IO.ConfigSectionResource.Description">
+            <summary>
+            Returns a description for this resource (the name of the
+            configuration section in this case).
+            </summary>
+            <value>
+            A description for this resource.
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.Description"/>
+        </member>
+        <member name="P:Spring.Core.IO.ConfigSectionResource.Exists">
+            <summary>
+            Does this resource actually exist in physical form?
+            </summary>
+            <remarks>
+            <p>
+            This implementation always returns <see langword="false"/>.
+            </p>
+            </remarks>
+            <value>
+            <see langword="false"/>
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.Exists"/>
+            <seealso cref="P:Spring.Core.IO.IResource.File"/>
+        </member>
+        <member name="P:Spring.Core.IO.ConfigSectionResource.InputStream">
+            <summary>
+            Return an <see cref="T:System.IO.Stream"/> for this resource.
+            </summary>
+            <value>
+            An <see cref="T:System.IO.Stream"/>.
+            </value>
+            <exception cref="T:System.IO.IOException">
+            If the stream could not be opened.
+            </exception>
+            <seealso cref="T:Spring.Core.IO.IInputStreamSource"/>
+        </member>
+        <member name="P:Spring.Core.IO.ConfigSectionResource.ConfigElement">
+            <summary>
+            Exposes the actual <see cref="T:System.Xml.XmlElement"/> for the
+            configuration section.
+            </summary>
+            <remarks>
+            <p>
+            Introduced to accomodate line info tracking during parsing.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Context.Support.StaticApplicationContext">
+            <summary>
+            <see cref="T:Spring.Context.IApplicationContext"/> that allows concrete registration of
+            objects and messages in code, rather than from external configuration sources.
+            </summary>
+            <remarks>
+            <p>
+            Mainly useful for testing.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: StaticApplicationContext.cs,v 1.9 2007/07/10 05:48:03 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Context.Support.StaticApplicationContext.#ctor">
+            <summary>
+            Creates a new instance of the StaticApplicationContext class.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.StaticApplicationContext.#ctor(Spring.Context.IApplicationContext)">
+            <summary>
+            Creates a new instance of the StaticApplicationContext class.
+            </summary>
+            <param name="parentContext">The parent application context.</param>
+        </member>
+        <member name="M:Spring.Context.Support.StaticApplicationContext.RefreshObjectFactory">
+            <summary>
+            Do nothing: we rely on callers to update our public methods.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.StaticApplicationContext.RegisterSingleton(System.String,System.Type,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Register a singleton object with the default object factory.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <param name="classType">The <see cref="T:System.Type"/> of the object.</param>
+            <param name="propertyValues">The property values for the singleton instance.</param>
+        </member>
+        <member name="M:Spring.Context.Support.StaticApplicationContext.RegisterPrototype(System.String,System.Type,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Registers a prototype object with the default object factory.
+            </summary>
+            <param name="name">The name of the prototype object.</param>
+            <param name="classType">The <see cref="T:System.Type"/> of the prototype object.</param>
+            <param name="propertyValues">The property values for the prototype instance.</param>
+        </member>
+        <member name="M:Spring.Context.Support.StaticApplicationContext.AddMessage(System.String,System.Globalization.CultureInfo,System.String)">
+            <summary>
+            Associate the given message with the given code.
+            </summary>
+            <param name="code">The lookup code.</param>
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> that the message should be found within.
+            </param>
+            <param name="defaultMessage">The message associated with the lookup code.</param>
+        </member>
+        <member name="T:Spring.Validation.ExclusiveValidatorGroup">
+            <summary>
+            <see cref="T:Spring.Validation.IValidator"/> implementation that supports grouping of validators.
+            </summary>
+            <remarks>
+            <p>
+            This validator will be valid when <b>one and only one</b> of the validators in the <c>Validators</c> collection are valid
+            </p>
+            <p>
+            <c>ValidationErrors</c> property will return a union of all validation error messages 
+            for the contained validators, but only if this validator is not valid (meaning, when none
+            of the contained validators are valid).
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ExclusiveValidatorGroup.cs,v 1.8 2008/02/05 20:40:26 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Validation.ExclusiveValidatorGroup.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.ExclusiveValidatorGroup"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.ExclusiveValidatorGroup.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.ExclusiveValidatorGroup"/> class.
+            </summary>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.ExclusiveValidatorGroup.#ctor(Spring.Expressions.IExpression)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.ExclusiveValidatorGroup"/> class.
+            </summary>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+        </member>
+        <member name="M:Spring.Validation.ExclusiveValidatorGroup.Validate(System.Object,System.Collections.IDictionary,Spring.Validation.IValidationErrors)">
+            <summary>
+            Validates the specified object.
+            </summary>
+            <param name="validationContext">The object to validate.</param>
+            <param name="contextParams">Additional context parameters.</param>
+            <param name="errors"><see cref="T:Spring.Validation.ValidationErrors"/> instance to add error messages to.</param>
+            <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="T:Spring.Validation.Config.ValidationNamespaceParser">
+            <summary>
+            Implementation of the custom configuration parser for validator definitions.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ValidationNamespaceParser.cs,v 1.2 2007/08/08 00:34:17 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Validation.Config.ValidationNamespaceParser.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Validation.Config.ValidationNamespaceParser"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.Config.ValidationNamespaceParser.ParseElement(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parse the specified element and register any resulting
+            IObjectDefinitions with the IObjectDefinitionRegistry that is
+            embedded in the supplied ParserContext.
+            </summary>
+            <param name="element">The element to be parsed into one or more IObjectDefinitions</param>
+            <param name="parserContext">The object encapsulating the current state of the parsing
+            process.</param>
+            <returns>
+            The primary IObjectDefinition (can be null as explained above)
+            </returns>
+            <remarks>
+            Implementations should return the primary IObjectDefinition
+            that results from the parse phase if they wish to used nested
+            inside (for example) a <code>&lt;property&gt;</code> tag.
+            <para>Implementations may return null if they will not
+            be used in a nested scenario.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:Spring.Validation.Config.ValidationNamespaceParser.ParseValidator(System.String,System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parses the validator definition.
+            </summary>
+            <param name="id">Validator's identifier.</param>
+            <param name="element">The element to parse.</param>
+            <param name="parserHelper">The parser helper.</param>
+            <returns>Validator object definition.</returns>
+        </member>
+        <member name="M:Spring.Validation.Config.ValidationNamespaceParser.ParseAndRegisterValidator(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parses and potentially registers a validator.
+            </summary>
+            <remarks>
+            Only validators that have <code>id</code> attribute specified are registered 
+            as separate object definitions within application context.
+            </remarks>
+            <param name="element">Validator XML element.</param>
+            <param name="parserHelper">The parser helper.</param>
+            <returns>Validator object definition.</returns>
+        </member>
+        <member name="M:Spring.Validation.Config.ValidationNamespaceParser.GetTypeName(System.Xml.XmlElement)">
+            <summary>
+            Gets the name of the object type for the specified element.
+            </summary>
+            <param name="element">The element.</param>
+            <returns>The name of the object type.</returns>
+        </member>
+        <member name="M:Spring.Validation.Config.ValidationNamespaceParser.ParseErrorMessageAction(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Creates an error message action based on the specified message element.
+            </summary>
+            <param name="message">The message element.</param>
+            <param name="parserHelper">The parser helper.</param>
+            <returns>The error message action definition.</returns>
+        </member>
+        <member name="M:Spring.Validation.Config.ValidationNamespaceParser.ParseGenericAction(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Creates a generic action based on the specified element.
+            </summary>
+            <param name="element">The action definition element.</param>
+            <param name="parserHelper">The parser helper.</param>
+            <returns>Generic validation action definition.</returns>
+        </member>
+        <member name="M:Spring.Validation.Config.ValidationNamespaceParser.ParseValidatorReference(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Creates object definition for the validator reference.
+            </summary>
+            <param name="element">The action definition element.</param>
+            <param name="parserHelper">The parser helper.</param>
+            <returns>Generic validation action definition.</returns>
+        </member>
+        <member name="T:Spring.Proxy.TargetProxyMethodBuilder">
+            <summary>
+            Implementation of IProxyMethodBuilder that delegates method calls to target object.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: TargetProxyMethodBuilder.cs,v 1.1 2006/08/10 18:45:55 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Proxy.TargetProxyMethodBuilder.#ctor(System.Reflection.Emit.TypeBuilder,Spring.Proxy.IProxyTypeGenerator,System.Boolean)">
+            <summary>
+            Creates a new instance of the method builder.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="proxyGenerator">
+            The <see cref="T:Spring.Proxy.IProxyTypeGenerator"/> implementation to use.
+            </param>
+            <param name="explicitImplementation">
+            <see langword="true"/> if the interface is to be
+            implemented explicitly; otherwise <see langword="false"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Proxy.TargetProxyMethodBuilder.GenerateMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Generates the proxy method.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+            <param name="interfaceMethod">
+            The interface definition of the method, if applicable.
+            </param>
+        </member>
+        <member name="T:Spring.Proxy.ProxyIgnoreAttribute">
+            <summary>
+            This attribute can be used to mark interfaces that should not be proxied
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: ProxyIgnoreAttribute.cs,v 1.1 2006/11/16 02:30:50 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Proxy.ProxyIgnoreAttribute.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Proxy.ProxyIgnoreAttribute"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Support.StaticEventHandlerValue">
+            <summary>
+            Describes an event handler for a static class method.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: StaticEventHandlerValue.cs,v 1.5 2006/04/09 07:19:00 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Support.StaticEventHandlerValue.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.StaticEventHandlerValue"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Support.StaticEventHandlerValue.#ctor(System.Object,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Support.StaticEventHandlerValue"/> class.
+            </summary>
+            <param name="source">
+            The object (possibly unresolved) that is exposing the event.
+            </param>
+            <param name="methodName">
+            The name of the method on the handler that is going to handle the event.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Support.StaticEventHandlerValue.GetHandler(System.Object,System.Reflection.EventInfo)">
+            <summary>
+            Gets the event handler.
+            </summary>
+            <param name="instance">
+            The instance that is registering for the event notification.
+            </param>
+            <param name="info">
+            Event metadata about the event.
+            </param>
+            <returns>
+            The event handler.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.ListFactoryObject">
+            <summary>
+            Simple factory for shared <see cref="T:System.Collections.IList"/> instances.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: ListFactoryObject.cs,v 1.8 2007/07/31 03:47:39 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ListFactoryObject.CreateInstance">
+            <summary>
+            Constructs a new instance of the target dictionary.
+            </summary>
+            <returns>The new <see cref="T:System.Collections.IList"/> instance.</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ListFactoryObject.SourceList">
+            <summary>
+            Set the source <see cref="T:System.Collections.IList"/>.
+            </summary>
+            <remarks>
+            <p>
+            This value will be used to populate the <see cref="T:System.Collections.IList"/>
+            returned by this factory.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ListFactoryObject.TargetListType">
+            <summary>
+            Set the <see cref="T:System.Type"/> of the <see cref="T:System.Collections.IList"/>
+            implementation to use.
+            </summary>
+            <remarks>
+            <p>
+            The default is the <see cref="T:System.Collections.ArrayList"/> <see cref="T:System.Type"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ListFactoryObject.ObjectType">
+            <summary>
+            The <see cref="T:System.Type"/> of objects created by this factory.
+            </summary>
+            <value>
+            Always returns the <see cref="T:System.Collections.IList"/> <see cref="T:System.Type"/>.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.ConstructorArgumentValues">
+            <summary>
+            Holder for constructor argument values for an object.
+            </summary>
+            <remarks>
+            <p>
+            Supports values for a specific index or parameter name (case
+            insensitive) in the constructor argument list, and generic matches by
+            <see cref="P:System.Type.FullName"/>.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: ConstructorArgumentValues.cs,v 1.16 2008/03/03 09:29:07 bbaia Exp $</version>
+            <see cref="P:Spring.Objects.Factory.Config.IObjectDefinition.ConstructorArgumentValues"/>
+        </member>
+        <member name="F:Spring.Objects.Factory.Config.ConstructorArgumentValues.NoIndex">
+            <summary>
+            Can be used as an argument filler for the
+            <see cref="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.GetArgumentValue(System.Int32,System.String,System.Type,Spring.Collections.ISet)"/>
+            overload when one is not looking for an argument by index.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.#ctor(Spring.Objects.Factory.Config.ConstructorArgumentValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            class.
+            </summary>
+            <param name="other">
+            The <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            to be used to populate this instance.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.AddAll(Spring.Objects.Factory.Config.ConstructorArgumentValues)">
+            <summary>
+            Copy all given argument values into this object.
+            </summary>
+            <param name="other">
+            The <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            to be used to populate this instance.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.AddIndexedArgumentValue(System.Int32,System.Object)">
+            <summary>
+            Add argument value for the given index in the constructor argument list.
+            </summary>
+            <param name="index">
+            The index in the constructor argument list.
+            </param>
+            <param name="value">
+            The argument value.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.AddIndexedArgumentValue(System.Int32,System.Object,System.String)">
+            <summary>
+            Add argument value for the given index in the constructor argument list.
+            </summary>
+            <param name="index">The index in the constructor argument list.</param>
+            <param name="value">The argument value.</param>
+            <param name="type">
+            The <see cref="P:System.Type.FullName"/> of the argument
+            <see cref="T:System.Type"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.AddNamedArgumentValue(System.String,System.Object)">
+            <summary>
+            Add argument value for the given name in the constructor argument list.
+            </summary>
+            <param name="name">The name in the constructor argument list.</param>
+            <param name="value">The argument value.</param>
+            <exception cref="T:System.ArgumentException">
+            If the supplied <paramref name="name"/> is <see langword="null"/>
+            or is composed wholly of whitespace.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.GetIndexedArgumentValue(System.Int32,System.Type)">
+            <summary>
+            Get argument value for the given index in the constructor argument list.
+            </summary>
+            <param name="index">The index in the constructor argument list.</param>
+            <param name="requiredType">
+            The required <see cref="T:System.Type"/> of the argument.
+            </param>
+            <returns>
+            The
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+            for the argument, or <see langword="null"/> if none set.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.GetNamedArgumentValue(System.String)">
+            <summary>
+            Get argument value for the given name in the constructor argument list.
+            </summary>
+            <param name="name">The name in the constructor argument list.</param>
+            <returns>
+            The
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+            for the argument, or <see langword="null"/> if none set.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.ContainsNamedArgument(System.String)">
+            <summary>
+            Does this set of constructor arguments contain a named argument matching the
+            supplied <paramref name="argument"/> name?
+            </summary>
+            <remarks>
+            <note>
+            The comparison is performed in a case-insensitive fashion.
+            </note>
+            </remarks>
+            <param name="argument">The named argument to look up.</param>
+            <returns>
+            <see langword="true"/> if this set of constructor arguments
+            contains a named argument matching the supplied
+            <paramref name="argument"/> name.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.AddGenericArgumentValue(System.Object)">
+            <summary>
+            Add generic argument value to be matched by type.
+            </summary>
+            <param name="value">
+            The argument value.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.AddGenericArgumentValue(System.Object,System.String)">
+            <summary>
+            Add generic argument value to be matched by type.
+            </summary>
+            <param name="value">The argument value.</param>
+            <param name="type">
+            The <see cref="P:System.Type.FullName"/> of the argument
+            <see cref="T:System.Type"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.GetGenericArgumentValue(System.Type)">
+            <summary>
+            Look for a generic argument value that matches the given
+            <see cref="T:System.Type"/>.
+            </summary>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> to match.
+            </param>
+            <returns>
+            The
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+            for the argument, or <see langword="null"/> if none set.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.GetGenericArgumentValue(System.Type,Spring.Collections.ISet)">
+            <summary>
+            Look for a generic argument value that matches the given
+            <see cref="T:System.Type"/>.
+            </summary>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> to match.
+            </param>
+            <param name="usedValues">
+            A <see cref="T:Spring.Collections.ISet"/> of
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+            objects that have already been used in the current resolution
+            process and should therefore not be returned again; this allows one
+            to return the next generic argument match in the case of multiple
+            generic argument values of the same type.
+            </param>
+            <returns>
+            The
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+            for the argument, or <see langword="null"/> if none set.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.GetArgumentValue(System.Int32,System.Type)">
+            <summary>
+            Look for an argument value that either corresponds to the given index
+            in the constructor argument list or generically matches by
+            <see cref="T:System.Type"/>.
+            </summary>
+            <param name="index">
+            The index in the constructor argument list.
+            </param>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> to match.
+            </param>
+            <returns>
+            The
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+            for the argument, or <see langword="null"/> if none is set.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.GetArgumentValue(System.Int32,System.Type,Spring.Collections.ISet)">
+            <summary>
+            Look for an argument value that either corresponds to the given index
+            in the constructor argument list or generically matches by
+            <see cref="T:System.Type"/>.
+            </summary>
+            <param name="index">
+            The index in the constructor argument list.
+            </param>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> to match.
+            </param>
+            <param name="usedValues">
+            A <see cref="T:Spring.Collections.ISet"/> of
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+            objects that have already been used in the current resolution
+            process and should therefore not be returned again; this allows one
+            to return the next generic argument match in the case of multiple
+            generic argument values of the same type.
+            </param>
+            <returns>
+            The
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+            for the argument, or <see langword="null"/> if none is set.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.GetArgumentValue(System.String,System.Type)">
+            <summary>
+            Look for an argument value that either corresponds to the given index
+            in the constructor argument list or generically matches by
+            <see cref="T:System.Type"/>.
+            </summary>
+            <param name="name">
+            The name of the argument in the constructor argument list. May be
+            <see langword="null"/>, in which case generic matching by 
+            <see cref="T:System.Type"/> is assumed.
+            </param>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> to match.
+            </param>
+            <returns>
+            The
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+            for the argument, or <see langword="null"/> if none is set.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.GetArgumentValue(System.String,System.Type,Spring.Collections.ISet)">
+            <summary>
+            Look for an argument value that either corresponds to the given index
+            in the constructor argument list or generically matches by
+            <see cref="T:System.Type"/>.
+            </summary>
+            <param name="name">
+            The name of the argument in the constructor argument list. May be
+            <see langword="null"/>, in which case generic matching by 
+            <see cref="T:System.Type"/> is assumed.
+            </param>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> to match.
+            </param>
+            <param name="usedValues">
+            A <see cref="T:Spring.Collections.ISet"/> of
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+            objects that have already been used in the current resolution
+            process and should therefore not be returned again; this allows one
+            to return the next generic argument match in the case of multiple
+            generic argument values of the same type.
+            </param>
+            <returns>
+            The
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+            for the argument, or <see langword="null"/> if none is set.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.GetArgumentValue(System.Int32,System.String,System.Type,Spring.Collections.ISet)">
+            <summary>
+            Look for an argument value that either corresponds to the given index
+            in the constructor argument list, or to the named argument, or
+            generically matches by <see cref="T:System.Type"/>.
+            </summary>
+            <param name="index">
+            The index of the argument in the constructor argument list. May be
+            negative, to denote the fact that we are not looking for an
+            argument by index (see
+            <see cref="F:Spring.Objects.Factory.Config.ConstructorArgumentValues.NoIndex"/>.
+            </param>
+            <param name="name">
+            The name of the argument in the constructor argument list. May be
+            <see langword="null"/>.
+            </param>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> to match.
+            </param>
+            <param name="usedValues">
+            A <see cref="T:Spring.Collections.ISet"/> of
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+            objects that have already been used in the current resolution
+            process and should therefore not be returned again; this allows one
+            to return the next generic argument match in the case of multiple
+            generic argument values of the same type.
+            </param>
+            <returns>
+            The
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>
+            for the argument, or <see langword="null"/> if none is set.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ConstructorArgumentValues.IndexedArgumentValues">
+            <summary>
+            Return the map of indexed argument values.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IDictionary"/> with
+            <see cref="T:System.Int32"/> indices as keys and
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>s
+            as values.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ConstructorArgumentValues.NamedArgumentValues">
+            <summary>
+            Return the map of named argument values.
+            </summary>
+            <returns>
+            An <see cref="T:System.Collections.IDictionary"/> with
+            <see cref="T:System.String"/> named arguments as keys and
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>s
+            as values.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ConstructorArgumentValues.GenericArgumentValues">
+            <summary>
+            Return the set of generic argument values.
+            </summary>
+            <returns>
+            A <see cref="T:System.Collections.IList"/> of
+            <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder"/>s.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ConstructorArgumentValues.ArgumentCount">
+            <summary>
+            Return the number of arguments held in this instance.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ConstructorArgumentValues.Empty">
+            <summary>
+            Returns true if this holder does not contain any argument values,
+            neither indexed ones nor generic ones.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder">
+            <summary>
+            Holder for a constructor argument value, with an optional
+            <see cref="T:System.Type"/> attribute indicating the target
+            <see cref="T:System.Type"/> of the actual constructor argument.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder.#ctor(System.Object)">
+            <summary>
+            Creates a new instance of the ValueHolder class.
+            </summary>
+            <param name="value">
+            The value of the constructor argument.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder.#ctor(System.Object,System.String)">
+            <summary>
+            Creates a new instance of the ValueHolder class.
+            </summary>
+            <param name="value">
+            The value of the constructor argument.
+            </param>
+            <param name="typeName">
+            The <see cref="P:System.Type.FullName"/> of the argument
+            <see cref="T:System.Type"/>. Can also be one of the common
+            <see cref="T:System.Type"/> aliases (<c>int</c>, <c>bool</c>,
+            <c>float</c>, etc).
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder.Value">
+            <summary>
+            Gets and sets the value for the constructor argument.
+            </summary>
+            <remarks>
+            <p>
+            Only necessary for manipulating a registered value, for example in
+            <see cref="T:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor"/>s.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder.Type">
+            <summary>
+            Return the <see cref="P:System.Type.FullName"/> of the constructor
+            argument.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.ObjectFactorySectionHandler">
+            <summary>
+            Creates an <see cref="T:Spring.Objects.Factory.IObjectFactory"/> instance
+            populated with the object definitions supplied in the configuration
+            section. 
+            </summary>
+            <remarks>
+            <p>
+            Applications will typically want to use an
+            <see cref="T:Spring.Context.IApplicationContext"/>, and instantiate it
+            via the use of the <see cref="T:Spring.Context.Support.ContextHandler"/>
+            class (which is similar in functionality to this class). This class is
+            provided for those times when only an
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> is required.
+            </p>
+            <para>Creates an instance of the class XmlObjectFactory</para>
+            </remarks>
+            <example>
+            <p>
+            
+            </p>
+            </example>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ObjectFactorySectionHandler.cs,v 1.3 2007/08/08 17:47:13 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectFactorySectionHandler.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Objects.Factory.Xml.ObjectFactorySectionHandler"/>
+            class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectFactorySectionHandler.Create(System.Object,System.Object,System.Xml.XmlNode)">
+            <summary>
+            Creates a <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            instance populated with the object definitions supplied in the
+            configuration section.
+            </summary>
+            <param name="parent">
+            The configuration settings in a corresponding parent configuration
+            section.
+            </param>
+            <param name="configContext">
+            The configuration context when called from the ASP.NET
+            configuration system. Otherwise, this parameter is reserved and
+            is <see langword="null"/>.
+            </param>
+            <param name="section">
+            The <see cref="T:System.Xml.XmlNode"/> for the section.
+            </param>
+            <returns>
+            A <see cref="T:Spring.Objects.Factory.IObjectFactory"/> instance
+            populated with the object definitions supplied in the configuration
+            section.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.ExpressionHolder">
+            <summary>
+            Immutable placeholder class used for the value of a
+            <see cref="T:Spring.Objects.PropertyValue"/> object when it's a reference
+            to a Spring <see cref="T:Spring.Expressions.IExpression"/> that should be evaluated at runtime.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ExpressionHolder.cs,v 1.5 2007/08/21 19:28:33 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ExpressionHolder.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Config.ExpressionHolder"/>
+            class.
+            </summary>
+            <param name="expression">The expression to resolve.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ExpressionHolder.ToString">
+            <summary>
+            Returns a string representation of this instance.
+            </summary>
+            <returns>A string representation of this instance.</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ExpressionHolder.ExpressionString">
+            <summary>
+            Gets or sets the expression string.  Setting the expression string will cause
+            the expression to be parsed.
+            </summary>
+            <value>The expression string.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ExpressionHolder.Expression">
+            <summary>
+            Return the expression.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ExpressionHolder.Properties">
+            <summary>
+            Properties for this expression node.
+            </summary>
+        </member>
+        <member name="T:Spring.Globalization.Resolvers.DefaultCultureResolver">
+            <summary>
+            <see cref="T:Spring.Globalization.ICultureResolver"/> implementation
+            that simply returns the <see cref="T:System.Globalization.CultureInfo"/>
+            value of the
+            <see cref="P:Spring.Globalization.Resolvers.DefaultCultureResolver.DefaultCulture"/>
+            property (if said property value is not <cref lang="null"/>), or the
+            <see cref="T:System.Globalization.CultureInfo"/> of the current thread if it is
+            <cref lang="null"/>.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DefaultCultureResolver.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.DefaultCultureResolver.GetDefaultLocale">
+            <summary>
+            Returns the default <see cref="T:System.Globalization.CultureInfo"/>. 
+            </summary>
+            <remarks>
+            <p>
+            It tries to get the <see cref="T:System.Globalization.CultureInfo"/>
+            from the value of the
+            <see cref="P:Spring.Globalization.Resolvers.DefaultCultureResolver.DefaultCulture"/>
+            property and falls back to the <see cref="T:System.Globalization.CultureInfo"/> of the
+            current thread if the
+            <see cref="P:Spring.Globalization.Resolvers.DefaultCultureResolver.DefaultCulture"/>
+            is <cref lang="null"/>.
+            </p>
+            </remarks>
+            <returns>
+            The default <see cref="T:System.Globalization.CultureInfo"/>
+            </returns>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.DefaultCultureResolver.ResolveCulture">
+            <summary>
+            Resolves the <see cref="T:System.Globalization.CultureInfo"/>
+            from some context.
+            </summary>
+            <remarks>
+            <p>
+            The 'context' in this implementation is the
+            <see cref="T:System.Globalization.CultureInfo"/> value of the
+            <see cref="P:Spring.Globalization.Resolvers.DefaultCultureResolver.DefaultCulture"/>
+            property (if said property value is not <cref lang="null"/>), or the
+            <see cref="T:System.Globalization.CultureInfo"/> of the current thread if it is
+            <cref lang="null"/>.
+            </p>
+            </remarks>
+            <returns>
+            The <see cref="T:System.Globalization.CultureInfo"/> that should be used
+            by the caller.
+             </returns>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.DefaultCultureResolver.SetCulture(System.Globalization.CultureInfo)">
+            <summary>
+            Sets the <see cref="T:System.Globalization.CultureInfo"/>.
+            </summary>
+            <param name="culture">
+            The new <see cref="T:System.Globalization.CultureInfo"/> or
+            <cref lang="null"/> to clear the current <see cref="T:System.Globalization.CultureInfo"/>.
+            </param>
+            <seealso cref="P:Spring.Globalization.Resolvers.DefaultCultureResolver.DefaultCulture"/>
+            <seealso cref="M:Spring.Globalization.ICultureResolver.SetCulture(System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="P:Spring.Globalization.Resolvers.DefaultCultureResolver.DefaultCulture">
+            <summary>
+            The default <see cref="T:System.Globalization.CultureInfo"/>.
+            </summary>
+            <value>
+            The default <see cref="T:System.Globalization.CultureInfo"/>.
+            </value>
+        </member>
+        <member name="T:Spring.Globalization.NullResourceCache">
+            <summary>
+            Resource cache implementation that doesn't cache resources.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: NullResourceCache.cs,v 1.2 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.NullResourceCache.GetResources(System.String)">
+            <summary>
+            Gets the list of resources from cache.
+            </summary>
+            <param name="cacheKey">Cache key to use for lookup.</param>
+            <returns>Always returns <c>null</c>.</returns>
+        </member>
+        <member name="M:Spring.Globalization.NullResourceCache.PutResources(System.String,System.Collections.IList)">
+            <summary>
+            Puts the list of resources in the cache.
+            </summary>
+            <param name="cacheKey">Cache key to use for the specified resources.</param>
+            <param name="resources">A list of resources to cache.</param>
+        </member>
+        <member name="T:Spring.Expressions.OpAND">
+            <summary>
+            Represents logical AND operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpAND.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpAND.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpAND.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpAND.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical AND operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpIs">
+            <summary>
+            Represents logical IS operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpIs.cs,v 1.4 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpIs.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpIs.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpIs.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical IS operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>
+            true if the left operand is contained within the right operand, false otherwise.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.IO.InputStreamResource">
+            <summary>
+            <see cref="T:Spring.Core.IO.IResource"/> adapter implementation for a
+            <see cref="T:System.IO.Stream"/>.
+            </summary>
+            <remarks>
+            <p>
+            Should only be used if no other <see cref="T:Spring.Core.IO.IResource"/>
+            implementation is applicable.
+            </p>
+            <p>
+            In contrast to other <see cref="T:Spring.Core.IO.IResource"/>
+            implementations, this is an adapter for an <i>already opened</i>
+            resource - the <see cref="P:Spring.Core.IO.InputStreamResource.IsOpen"/>
+            therefore always returns <see langword="true"/>. Do not use this class
+            if you need to keep the resource descriptor somewhere, or if you need
+            to read a stream multiple times.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: InputStreamResource.cs,v 1.10 2007/12/06 22:08:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Core.IO.InputStreamResource.#ctor(System.IO.Stream,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.IO.InputStreamResource"/> class.
+            </summary>
+            <param name="inputStream">
+            The input <see cref="T:System.IO.Stream"/> to use.
+            </param>
+            <param name="description">
+            Where the input <see cref="T:System.IO.Stream"/> comes from.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="inputStream"/> is
+            <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="P:Spring.Core.IO.InputStreamResource.InputStream">
+            <summary>
+            The input <see cref="T:System.IO.Stream"/> to use.
+            </summary>
+            <exception cref="T:System.InvalidOperationException">
+            If the underlying <see cref="T:System.IO.Stream"/> has already
+            been read.
+            </exception>
+        </member>
+        <member name="P:Spring.Core.IO.InputStreamResource.Description">
+            <summary>
+            Returns a description for this resource.
+            </summary>
+            <value>
+            A description for this resource.
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.Description"/>
+        </member>
+        <member name="P:Spring.Core.IO.InputStreamResource.IsOpen">
+            <summary>
+            This implementation always returns true
+            </summary>
+        </member>
+        <member name="P:Spring.Core.IO.InputStreamResource.Exists">
+            <summary>
+            This implemementation always returns true
+            </summary>
+        </member>
+        <member name="T:Spring.Core.IO.AssemblyResource">
+            <summary>
+            An <see cref="T:Spring.Core.IO.IResource"/> implementation for
+            resources stored within assemblies.
+            </summary>
+            <remarks>
+            <p>
+            This implementation expects any resource name passed to the
+            constructor to adhere to the following format:
+            </p>
+            <p>
+            assembly://<i>assemblyName</i>/<i>namespace</i>/<i>resourceName</i>
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic (.NET)</author>
+            <author>Federico Spinazzi (.NET)</author>
+            <version>$Id: AssemblyResource.cs,v 1.16 2007/08/08 17:46:55 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.IO.AssemblyResource.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.IO.AssemblyResource"/> class.
+            </summary>
+            <param name="resourceName">
+            The name of the assembly resource.
+            </param>
+            <exception cref="T:System.UriFormatException">
+            If the supplied <paramref name="resourceName"/> did not conform
+            to the expected format.
+            </exception>
+            <exception cref="T:System.IO.FileLoadException">
+            If the assembly specified in the supplied
+            <paramref name="resourceName"/> was loaded twice with two
+            different evidences.
+            </exception>
+            <exception cref="T:System.IO.FileNotFoundException">
+            If the assembly specified in the supplied
+            <paramref name="resourceName"/> could not be found.
+            </exception>
+            <exception cref="T:System.Security.SecurityException">
+            If the caller does not have the required permission to load
+            the assembly specified in the supplied
+            <paramref name="resourceName"/>.
+            </exception>
+            <see cref="M:System.Reflection.Assembly.LoadWithPartialName(System.String)"/>
+        </member>
+        <member name="M:Spring.Core.IO.AssemblyResource.IsRelativeResource(System.String)">
+            <summary>
+            Does the supplied <paramref name="resourceName"/> relative ?
+            </summary>
+            <param name="resourceName">
+            The name of the resource to test.
+            </param>
+            <returns>
+            <see langword="true"/> if resource name is relative; 
+            otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Core.IO.AssemblyResource.InputStream">
+            <summary>
+            Return an <see cref="T:System.IO.Stream"/> for this resource.
+            </summary>
+            <value>
+            An <see cref="T:System.IO.Stream"/>.
+            </value>
+            <exception cref="T:System.IO.IOException">
+            If the stream could not be opened.
+            </exception>
+            <exception cref="T:System.Security.SecurityException">
+            If the caller does not have the required permission to load
+            the underlying assembly's manifest.
+            </exception>
+            <seealso cref="T:Spring.Core.IO.IInputStreamSource"/>
+            <see cref="M:System.Reflection.Assembly.GetManifestResourceStream(System.String)"/> 
+        </member>
+        <member name="P:Spring.Core.IO.AssemblyResource.Exists">
+            <summary>
+            Does the embedded resource specified in the value passed to the
+            constructor exist?
+            </summary>
+            <value>
+            <see langword="true"/> if this resource actually exists in physical
+            form (for example on a filesystem).
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.Exists"/>
+            <seealso cref="P:Spring.Core.IO.IResource.File"/>
+            <see cref="M:System.Reflection.Assembly.GetManifestResourceNames"/> 
+        </member>
+        <member name="P:Spring.Core.IO.AssemblyResource.SupportsRelativeResources">
+            <summary>
+            Does this <see cref="T:Spring.Core.IO.IResource"/> support relative
+            resource retrieval?
+            </summary>
+            <remarks>
+            <p>
+            This implementation does support relative resource retrieval, and
+            so will always return <see langword="true"/>.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> if this
+            <see cref="T:Spring.Core.IO.IResource"/> supports relative resource
+            retrieval.
+            </value>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.SupportsRelativeResources"/>
+        </member>
+        <member name="P:Spring.Core.IO.AssemblyResource.RootLocation">
+            <summary>
+            Gets the root location of the resource (the assembly name in this
+            case).
+            </summary>
+            <value>
+            The root location of the resource.
+            </value>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.RootLocation"/>
+        </member>
+        <member name="P:Spring.Core.IO.AssemblyResource.ResourcePath">
+            <summary>
+            Gets the current path of the resource (the namespace in which the
+            target resource was embedded in this case).
+            </summary>
+            <value>
+            The current path of the resource.
+            </value>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.ResourcePath"/>
+        </member>
+        <member name="P:Spring.Core.IO.AssemblyResource.PathSeparatorChars">
+            <summary>
+            Gets those characters that are valid path separators for the
+            resource type.
+            </summary>
+            <value>
+            Those characters that are valid path separators for the resource
+            type.
+            </value>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.PathSeparatorChars"/>
+        </member>
+        <member name="P:Spring.Core.IO.AssemblyResource.Description">
+            <summary>
+            Returns a description for this resource.
+            </summary>
+            <value>
+            A description for this resource.
+            </value>
+            <seealso cref="P:Spring.Core.IO.IResource.Description"/>
+        </member>
+        <member name="T:Spring.Threading.Semaphore">
+            <summary>
+            <p>Base class for counting semaphores based on Semaphore implementation
+            from Doug Lea.</p>
+            </summary>
+            <remarks> 
+            
+            <p>Conceptually, a semaphore 
+            maintains a set of permits. Each acquire() blocks if 
+            necessary until a permit is available, and then takes it.</p>
+            
+            <p>Each release adds a permit. However, no actual permit objects are used; 
+            the Semaphore just keeps a count of the number available 
+            and acts accordingly.</p>
+            
+            <p>A semaphore initialized to 1 can serve as a mutual exclusion lock. </p>
+            
+            Used for implementation of a <see cref="T:Spring.Pool.Support.SimplePool"/>
+            </remarks>
+            <author>Doug Lea</author>
+            <author>Federico Spinazzi (.Net)</author>
+            <version>$Id: Semaphore.cs,v 1.10 2006/09/15 21:30:09 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Threading.Semaphore.nPermits">
+            <summary>
+            current number of available permits
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.Semaphore.#ctor(System.Int64)">
+            <summary>
+            <p>Create a Semaphore with the given initial number of permits.</p>
+            <p>Using a seed of 1 makes the semaphore act as a mutual 
+            exclusion lock.</p>
+            
+            <p>Negative seeds are also allowed, 
+            in which case no acquires will proceed until the number of 
+            releases has pushed the number of permits past 0.</p>
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.Semaphore.Release">
+            <summary>
+            Release a permit
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.Semaphore.Acquire">
+            <summary>
+            Acquire a permit
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.Semaphore.Attempt(System.Int64)">
+            <summary>
+            Wait at most msecs millisconds for a permit
+            </summary>
+            <param name="msecs">number of ms to wait</param>
+            <returns>true if aquired</returns>
+        </member>
+        <member name="M:Spring.Threading.Semaphore.Release(System.Int64)">
+            <summary> Release N permits. <code>release(n)</code> is
+            equivalent in effect to:
+            <pre>
+            for (int i = 0; i &lt; n; ++i) release();
+            </pre>
+            But may be more efficient in some semaphore implementations.
+            </summary>
+            <exception cref="T:System.ArgumentOutOfRangeException">  if n is negative.
+            
+            </exception>
+        </member>
+        <member name="P:Spring.Threading.Semaphore.Permits">
+            <summary> Return the current number of available permits.
+            Returns an accurate, but possibly unstable value,
+            that may change immediately after returning.
+            </summary>
+        </member>
+        <member name="T:Spring.Threading.LogicalThreadContext">
+            <summary>
+            An abstraction to safely store "ThreadStatic" data.
+            </summary>
+            <remarks>
+            By default, <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/> is used to store thread-specific data. 
+            You may switch the storage strategy by calling <see cref="M:Spring.Threading.LogicalThreadContext.SetStorage(Spring.Threading.IThreadStorage)"/>.<p/>
+            <b>NOTE:</b> Access to the underlying storage is not synchronized for performance reasons. 
+            You should call <see cref="M:Spring.Threading.LogicalThreadContext.SetStorage(Spring.Threading.IThreadStorage)"/> only once at application startup!
+            </remarks>
+            <author>Erich Eichinger</author>
+            <version>$Id: LogicalThreadContext.cs,v 1.3 2007/07/03 22:32:04 markpollack Exp $</version>  
+        </member>
+        <member name="F:Spring.Threading.LogicalThreadContext.threadStorage">
+            <summary>
+            Holds the current <see cref="T:Spring.Threading.IThreadStorage"/> strategy.
+            </summary>
+            <remarks>
+            Access to this variable is not synchronized on purpose for performance reasons. 
+            Setting a different <see cref="T:Spring.Threading.IThreadStorage"/> strategy should happen only once
+            at application startup.
+            </remarks>
+        </member>
+        <member name="M:Spring.Threading.LogicalThreadContext.SetStorage(Spring.Threading.IThreadStorage)">
+            <summary>
+            Set the new <see cref="T:Spring.Threading.IThreadStorage"/> strategy.
+            </summary>
+        </member>
+        <member name="M:Spring.Threading.LogicalThreadContext.GetData(System.String)">
+            <summary>
+            Retrieves an object with the specified name.
+            </summary>
+            <param name="name">The name of the item.</param>
+            <returns>The object in the context associated with the specified name or null if no object has been stored previously</returns>
+        </member>
+        <member name="M:Spring.Threading.LogicalThreadContext.SetData(System.String,System.Object)">
+            <summary>
+            Stores a given object and associates it with the specified name.
+            </summary>
+            <param name="name">The name with which to associate the new item.</param>
+            <param name="value">The object to store in the current thread's context.</param>
+        </member>
+        <member name="M:Spring.Threading.LogicalThreadContext.FreeNamedDataSlot(System.String)">
+            <summary>
+            Empties a data slot with the specified name.
+            </summary>
+            <param name="name">The name of the data slot to empty.</param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.NamespaceParserRegistry">
+            <summary>
+            Provides a resolution mechanism for configuration parsers.
+            </summary>
+            <remarks>
+            <p>
+            The <see cref="T:Spring.Objects.Factory.Xml.DefaultObjectDefinitionDocumentReader"/> uses this registry
+            class to find the parser handling a specific namespace.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: NamespaceParserRegistry.cs,v 1.7 2007/09/17 01:12:48 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.NamespaceParserRegistry.ConfigParsersSectionName">
+            <summary>
+            Name of the .Net config section that contains definitions 
+            for custom config parsers.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.NamespaceParserRegistry.#cctor">
+            <summary>
+            Creates a new instance of the NamespaceParserRegistry class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.NamespaceParserRegistry.GetParser(System.String)">
+            <summary>
+            Returns a parser for the given namespace.
+            </summary>
+            <param name="namespaceURI">
+            The namespace for which to lookup the parser implementation.
+            </param>
+            <returns>
+            A parser for a given <paramref name="namespaceURI"/>, or
+            <see langword="null"/> if no parser was found.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.NamespaceParserRegistry.GetSchemas">
+            <summary>
+            Returns a schema collection containing validation schemas for all registered parsers.
+            </summary>
+            <returns>
+            A schema collection containing validation schemas for all registered parsers.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.NamespaceParserRegistry.RegisterParser(System.Type)">
+            <summary>
+            Pegisters parser, using default namespace and schema location
+            as defined by the <see cref="T:Spring.Objects.Factory.Xml.NamespaceParserAttribute"/>.
+            </summary>
+            <param name="parserType">
+            The <see cref="T:System.Type"/> of the parser that will be activated
+            when an element in its default namespace is encountered.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If <paramref name="parserType"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.NamespaceParserRegistry.RegisterParser(System.Type,System.String,System.String)">
+            <summary>
+            Associates a parser with a namespace.
+            </summary>
+            <remarks>
+            <note>
+            Parsers registered with the same <paramref name="namespaceUri"/> as that
+            of a parser that has previously been registered will overwrite the existing
+            parser.
+            </note>
+            </remarks>
+            <param name="parserType">
+            The <see cref="T:System.Type"/> of the parser that will be activated
+            when the attendant <paramref name="namespaceUri"/> is
+            encountered.
+            </param>
+            <param name="namespaceUri">
+            The namespace with which to associate instance of the parser.
+            </param>
+            <param name="schemaLocation">
+            The location of the XML schema that should be used for validation 
+            of the XML elements that belong to the specified namespace 
+            (can be any valid Spring.NET resource URI).
+            </param>
+            <exception cref="T:System.ArgumentException">
+            If the <paramref name="parserType"/> is not a <see cref="T:System.Type"/>
+            that implements the <see cref="T:Spring.Objects.Factory.Xml.INamespaceParser"/>
+            interface.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If <paramref name="parserType"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.NamespaceParserRegistry.RegisterParser(Spring.Objects.Factory.Xml.INamespaceParser)">
+            <summary>
+            Pegisters parser, using default namespace and schema location
+            as defined by the <see cref="T:Spring.Objects.Factory.Xml.NamespaceParserAttribute"/>.
+            </summary>
+            <param name="parser">
+            The parser instance.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If <paramref name="parser"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.NamespaceParserRegistry.RegisterParser(Spring.Objects.Factory.Xml.INamespaceParser,System.String,System.String)">
+            <summary>
+            Associates a parser with a namespace.
+            </summary>
+            <remarks>
+            <note>
+            Parsers registered with the same <paramref name="namespaceUri"/> as that
+            of a parser that has previously been registered will overwrite the existing
+            parser.
+            </note>
+            </remarks>
+            <param name="namespaceUri">
+            The namespace with which to associate instance of the parser.
+            </param>
+            <param name="parser">
+            The parser instance.
+            </param>
+            <param name="schemaLocation">
+            The location of the XML schema that should be used for validation 
+            of the XML elements that belong to the specified namespace 
+            (can be any valid Spring.NET resource URI).
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If <paramref name="parser"/> is <see langword="null"/>, or if 
+            <paramref name="namespaceUri"/> is not specified and parser class
+            does not have default value defined using <see cref="T:Spring.Objects.Factory.Xml.NamespaceParserAttribute"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.NamespaceParserRegistry.GetDefaults(Spring.Objects.Factory.Xml.INamespaceParser)">
+            <summary>
+            Returns default values for the parser namespace and schema location as 
+            defined by the <see cref="T:Spring.Objects.Factory.Xml.NamespaceParserAttribute"/>.
+            </summary>
+            <param name="parser">
+            A parser instance.
+            </param>
+            <returns>
+            A <see cref="T:Spring.Objects.Factory.Xml.NamespaceParserAttribute"/> instance containing
+            default values for the parser namsepace and schema location
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.XmlObjectFactory">
+            <summary>
+            Convenience extension of
+            <see cref="T:Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>
+            that reads object definitions from an XML document or element.
+            </summary>
+            <remarks>
+            <p>
+            Delegates to
+            <see cref="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/>
+            underneath; effectively equivalent to using a
+            <see cref="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/> for a
+            <see cref="T:Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>.
+            </p>
+            <note>
+            <i>objects</i> doesn't need to be the root element of
+            the XML document: this class will parse all object definition elements in the
+            XML stream.
+            </note>
+            <p>
+            This class registers each object definition with the
+            <see cref="T:Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>
+            superclass, and relies on the latter's implementation of the
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> interface. It supports
+            singletons, prototypes and references to either of these kinds of object.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: XmlObjectFactory.cs,v 1.13 2007/08/08 17:47:13 bbaia Exp $</version>
+            <see cref="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.DefaultListableObjectFactory">
+            <summary>
+            Concrete implementation of the
+            <see cref="T:Spring.Objects.Factory.IListableObjectFactory"/> and
+            <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/>
+            interfaces.
+            </summary>
+            <remarks>
+            <p>
+            This class is a full-fledged object factory based on object definitions
+            that is usable straight out of the box.
+            </p>
+            <p>
+            Can be used as an object factory in and of itself, or as a superclass
+            for custom object factory implementations. Note that readers for
+            specific object definition formats are typically implemented separately
+            rather than as object factory subclasses.
+            </p>
+            <p>
+            For an alternative implementation of the
+            <see cref="T:Spring.Objects.Factory.IListableObjectFactory"/> interface,
+            have a look at the
+            <see cref="T:Spring.Objects.Factory.Support.StaticListableObjectFactory"/>
+            class, which manages existing object instances rather than creating new
+            ones based on object definitions.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <seealso cref="T:Spring.Objects.Factory.Xml.XmlObjectDefinitionReader"/>
+            <version>$Id: DefaultListableObjectFactory.cs,v 1.42 2007/10/10 19:17:07 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory">
+            <summary>
+            Abstract <see cref="T:Spring.Objects.Factory.IObjectFactory"/> superclass
+            that implements default object creation.
+            </summary>
+            <remarks>
+            <p>
+            Provides object creation, initialization and wiring, supporting
+            autowiring and constructor resolution. Handles runtime object
+            references, managed collections, and object destruction.
+            </p>
+            <p>
+            The main template method to be implemented by subclasses is
+            <see cref="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.FindMatchingObjects(System.Type)"/>,
+            used for autowiring by type. Note that this class does not implement object
+            definition registry capabilities
+            (<see cref="T:Spring.Objects.Factory.Support.DefaultListableObjectFactory"/>
+            does).
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: AbstractAutowireCapableObjectFactory.cs,v 1.89 2008/05/05 22:42:17 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.MethodResolutionFlags">
+            <summary>
+            The <see cref="T:System.Reflection.BindingFlags"/> used during the invocation and
+            searching for of methods.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.#ctor(System.Boolean)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+            <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.#ctor(System.Boolean,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+            <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+            <param name="parentFactory">The parent object factory, or <see langword="null"/> if none.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.PredictObjectType(System.String,Spring.Objects.Factory.Support.RootObjectDefinition)">
+            <summary>
+            Predict the eventual object type (of the processed object instance) for the
+            specified object.
+            </summary>
+            <param name="objectName">Name of the object.</param>
+            <param name="mod">The merged object definition to determine the type for.</param>
+            <returns>
+            The type of the object, or <code>null</code> if not predictable
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.GetTypeForFactoryMethod(System.String,Spring.Objects.Factory.Support.RootObjectDefinition)">
+            <summary>
+            Determines the <see cref="T:System.Type"/> of the object defined
+            by the supplied object <paramref name="definition"/>. 
+            </summary>
+            <param name="objectName">
+            The name associated with the supplied object <paramref name="definition"/>.
+            </param>
+            <param name="definition">
+            The <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+            that the <see cref="T:System.Type"/> is to be determined for. 
+            </param>
+            <returns>
+            The <see cref="T:System.Type"/> of the object defined by the supplied
+            object <paramref name="definition"/>; or <see lang="null"/> if the
+            <see cref="T:System.Type"/> cannot be determined.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ApplyObjectPropertyValues(System.Object,System.String)">
+            <summary>
+            Apply the property values of the object definition with the supplied
+            <paramref name="name"/> to the supplied <paramref name="instance"/>.
+            </summary>
+            <param name="instance">
+            The existing object that the property values for the named object will
+            be applied to.
+            </param>
+            <param name="name">
+            The name of the object definition associated with the property values that are
+            to be applied.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ApplyObjectPostProcessorsBeforeInstantiation(System.Type,System.String)">
+            <summary>
+            Apply any
+            <see cref="T:Spring.Objects.Factory.Config.IInstantiationAwareObjectPostProcessor"/>s.
+            </summary>
+            <remarks>
+            <p>
+            The returned instance may be a wrapper around the original.
+            </p>
+            </remarks>
+            <param name="objectType">
+            The <see cref="T:System.Type"/> of the object that is to be
+            instantiated.
+            </param>
+            <param name="objectName">
+            The name of the object that is to be instantiated.
+            </param>
+            <returns>
+            An instance to use in place of the original instance.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ApplyPropertyValues(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,Spring.Objects.IObjectWrapper,Spring.Objects.IPropertyValues)">
+            <summary>
+            Apply the given property values, resolving any runtime references
+            to other objects in this object factory.
+            </summary>
+            <param name="name">
+            The object name passed for better exception information.
+            </param>
+            <param name="definition">
+            The definition of the named object.
+            </param>
+            <param name="wrapper">
+            The <see cref="T:Spring.Objects.IObjectWrapper"/> wrapping the target object.
+            </param>
+            <param name="properties">
+            The new property values.
+            </param>
+            <remarks>
+            <p>
+            Must use deep copy, so that we don't permanently modify this property.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.UnsatisfiedObjectProperties(Spring.Objects.Factory.Support.RootObjectDefinition,Spring.Objects.IObjectWrapper)">
+            <summary>
+            Return an array of object-type property names that are unsatisfied.
+            </summary>
+            <remarks>
+            <p>
+            These are probably unsatisfied references to other objects in the
+            factory. Does not include simple properties like primitives or
+            <see cref="T:System.String"/>s.
+            </p>
+            </remarks>
+            <returns>
+            An array of object-type property names that are unsatisfied.
+            </returns>
+            <param name="definition">
+            The definition of the named object.
+            </param>
+            <param name="wrapper">
+            The <see cref="T:Spring.Objects.IObjectWrapper"/> wrapping the target object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.Dispose">
+            <summary>
+            Destroy all cached singletons in this factory.
+            </summary>
+            <remarks>
+            <p>
+            To be called on shutdown of a factory.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.PopulateObject(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,Spring.Objects.IObjectWrapper)">
+            <summary>
+            Populate the object instance in the given
+            <see cref="T:Spring.Objects.IObjectWrapper"/> with the property values from the
+            object definition.
+            </summary>
+            <param name="name">
+            The name of the object.
+            </param>
+            <param name="definition">
+            The definition of the named object.
+            </param>
+            <param name="wrapper">
+            The <see cref="T:Spring.Objects.IObjectWrapper"/> wrapping the target object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.WireEvents(System.String,Spring.Objects.Factory.Support.IConfigurableObjectDefinition,Spring.Objects.IObjectWrapper)">
+            <summary>
+            Wires up any exposed events in the object instance in the given
+            <see cref="T:Spring.Objects.IObjectWrapper"/> with any event handler
+            values from the <paramref name="definition"/>.
+            </summary>
+            <param name="name">
+            The name of the object.
+            </param>
+            <param name="definition">
+            The definition of the named object.
+            </param>
+            <param name="wrapper">
+            The <see cref="T:Spring.Objects.IObjectWrapper"/> wrapping the target object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.AutowireByName(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,Spring.Objects.IObjectWrapper,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Fills in any missing property values with references to
+            other objects in this factory if autowire is set to
+            <see cref="F:Spring.Objects.Factory.Config.AutoWiringMode.ByName"/>.
+            </summary>
+            <param name="name">
+            The object name to be autowired by <see cref="T:System.Type"/>.
+            </param>
+            <param name="definition">
+            The definition of the named object to update through autowiring.
+            </param>
+            <param name="wrapper">
+            The <see cref="T:Spring.Objects.IObjectWrapper"/> wrapping the target object (and
+            from which we can rip out information concerning the object).
+            </param>
+            <param name="properties">
+            The property values to register wired objects with.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.AutowireByType(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,Spring.Objects.IObjectWrapper,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Defines "autowire by type" (object properties by type) behavior.
+            </summary>
+            <remarks>
+            <p>
+            This is like PicoContainer default, in which there must be exactly one object
+            of the property type in the object factory. This makes object factories simple
+            to configure for small namespaces, but doesn't work as well as standard Spring
+            behavior for bigger applications.
+            </p>
+            </remarks>
+            <param name="name">
+            The object name to be autowired by <see cref="T:System.Type"/>.
+            </param>
+            <param name="definition">
+            The definition of the named object to update through autowiring.
+            </param>
+            <param name="wrapper">
+            The <see cref="T:Spring.Objects.IObjectWrapper"/> wrapping the target object (and
+            from which we can rip out information concerning the object).
+            </param>
+            <param name="properties">
+            The property values to register wired objects with.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.IgnoreDependencyInterface(System.Type)">
+            <summary>
+            Ignore the given dependency type for autowiring
+            </summary>
+            <remarks>
+            This will typically be used by application contexts to register
+            dependencies that are resolved in other ways, like IOjbectFactory through
+            IObjectFactoryAware or IApplicationContext through IApplicationContextAware.
+            By default, IObjectFactoryAware and IObjectName interfaces are ignored.
+            For further types to ignore, invoke this method for each type.
+            </remarks>
+            <seealso cref="M:Spring.Objects.Factory.Config.IConfigurableObjectFactory.IgnoreDependencyType(System.Type)"/>.
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.CreateObject(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.Object[])">
+            <summary>
+            Create an object instance for the given object definition.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <param name="definition">
+            The object definition for the object that is to be instantiated.
+            </param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a static factory method. It is invalid to use a non-<see langword="null"/> arguments value
+            in any other case.
+            </param>
+            <returns>
+            A new instance of the object.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+            <remarks>
+            <p>
+            Delegates to the
+            <see cref="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.CreateObject(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.Object[],System.Boolean)"/>
+            method version with the <c>allowEagerCaching</c> parameter set to <b>true</b>.
+            </p>
+            <p>
+            The object definition will already have been merged with the parent
+            definition in case of a child definition.
+            </p>
+            <p>
+            All the other methods in this class invoke this method, although objects
+            may be cached after being instantiated by this method. All object
+            instantiation within this class is performed by this method.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.CreateObject(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.Object[],System.Boolean)">
+            <summary>
+            Create an object instance for the given object definition.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <param name="definition">
+            The object definition for the object that is to be instantiated.
+            </param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a static factory method. It is invalid to use a non-<see langword="null"/> arguments value
+            in any other case.
+            </param>
+            <param name="allowEagerCaching">
+            Whether eager caching of singletons is allowed... typically true for
+            singlton objects, but never true for inner object definitions.
+            </param>
+            <returns>
+            A new instance of the object.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+            <remarks>
+            <p>
+            The object definition will already have been merged with the parent
+            definition in case of a child definition.
+            </p>
+            <p>
+            All the other methods in this class invoke this method, although objects
+            may be cached after being instantiated by this method. All object
+            instantiation within this class is performed by this method.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.CreateObjectInstance(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.Object[])">
+            <summary>
+            Creates an <see cref="T:Spring.Objects.IObjectWrapper"/> instance from the <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> passed in <paramref name="definition"/>
+            using constructor <paramref name="arguments"/>
+            </summary>
+            <param name="name">The name of the object to create - used for error messages.</param>
+            <param name="definition">The <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> describing the object to be created.</param>
+            <param name="arguments">optional arguments to pass to the constructor</param>
+            <returns>An <see cref="T:Spring.Objects.IObjectWrapper"/> wrapping the already instantiated object</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.InstantiateUsingFactoryMethod(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.Object[])">
+            <summary>
+            Instantiate an object instance using a named factory method.
+            </summary>
+            <remarks>
+            <p>
+            The method may be static, if the <paramref name="definition"/>
+            parameter specifies a class, rather than a
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> instance, or an
+            instance variable on a factory object itself configured using Dependency
+            Injection.
+            </p>
+            <p>
+            Implementation requires iterating over the static or instance methods
+            with the name specified in the supplied <paramref name="definition"/>
+            (the method may be overloaded) and trying to match with the parameters.
+            We don't have the types attached to constructor args, so trial and error
+            is the only way to go here.
+            </p>
+            </remarks>
+            <param name="name">
+            The name associated with the supplied <paramref name="definition"/>.
+            </param>
+            <param name="definition">
+            The definition describing the instance that is to be instantiated.
+            </param>
+            <param name="arguments">
+            Any arguments to the factory method that is to be invoked.
+            </param>
+            <returns>
+            The result of the factory method invocation (the instance).
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.FindMethods(System.String,System.Int32,System.Boolean,System.Type)">
+            <summary>
+            Returns an array of all of those
+            <see cref="T:System.Reflection.MethodInfo">methods</see> exposed on the
+            <paramref name="searchType"/> that match the supplied criteria.
+            </summary>
+            <param name="methodName">
+            Methods that have this name (can be in the form of a regular expression).
+            </param>
+            <param name="expectedArgumentCount">
+            Methods that have exactly this many arguments.
+            </param>
+            <param name="isStatic">
+            Methods that are static / instance.
+            </param>
+            <param name="searchType">
+            The <see cref="T:System.Type"/> on which the methods (if any) are to be found.
+            </param>
+            <returns>
+            An array of all of those
+            <see cref="T:System.Reflection.MethodInfo">methods</see> exposed on the
+            <paramref name="searchType"/> that match the supplied criteria.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.CreateArgumentArray(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,Spring.Objects.Factory.Config.ConstructorArgumentValues,System.Reflection.MethodBase,Spring.Objects.Factory.Support.UnsatisfiedDependencyExceptionData@)">
+            <summary>
+            Create an array of arguments to invoke a constructor or static factory method,
+            given the resolved constructor arguments values.
+            </summary>
+            <remarks>When return value is null the out parameter UnsatisfiedDependencyExceptionData will contain
+            information for use in throwing a UnsatisfiedDependencyException by the caller.  This avoids using
+            exceptions for flow control as in the original implementation.</remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.AutowireConstructor(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.Object[])">
+            <summary>
+            Explicitly construct the object using the supplied constructor arguments.
+            Constructor arguments are matched by type.
+            </summary>
+            <param name="name">
+            The name of the object to autowire by type.
+            </param>
+            <param name="definition">
+            The object definition to update through autowiring.
+            </param>
+            <param name="args">Array of constructor argument values.</param>
+            <returns>
+            An <see cref="T:Spring.Objects.IObjectWrapper"/> for the new instance.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.AutowireConstructor(System.String,Spring.Objects.Factory.Support.RootObjectDefinition)">
+            <summary>
+            "autowire constructor" (with constructor arguments by type) behaviour.
+            </summary>
+            <remarks>Passes an empty collection of constructor argument values
+            to overloaded method.
+            </remarks>
+            <param name="name">
+            The name of the object to autowire by type.
+            </param>
+            <param name="definition">
+            The object definition to update through autowiring.
+            </param>
+            <returns>
+            An <see cref="T:Spring.Objects.IObjectWrapper"/> for the new instance.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.AutowireConstructor(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,Spring.Objects.Factory.Config.ConstructorArgumentValues)">
+            <summary>
+            "autowire constructor" (with constructor arguments by type) behaviour.
+            </summary>
+            <remarks>
+            <p>
+            Also applied if explicit constructor argument values are specified,
+            matching all remaining arguments with objects from the object factory.
+            </p>
+            <p>
+            This corresponds to constructor injection: in this mode, a Spring.NET
+            object factory is able to host components that expect constructor-based
+            dependency resolution.
+            </p>
+            </remarks>
+            <param name="name">
+            The name of the object to autowire by type.
+            </param>
+            <param name="definition">
+            The object definition to update through autowiring.
+            </param>
+            <param name="argumentValues">
+            The collection on constructor argument values.
+            </param>
+            <returns>
+            An <see cref="T:Spring.Objects.IObjectWrapper"/> for the new instance.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ResolveConstructorArguments(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,Spring.Objects.Factory.Config.ConstructorArgumentValues)">
+            <summary>
+            Resolves the <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            of the supplied <paramref name="definition"/>.
+            </summary>
+            <remarks>
+            <p>
+            'Resolve' can be taken to mean that all of the <paramref name="definition"/>s
+            constructor arguments is resolved into a concrete object that can be plugged
+            into one of the <paramref name="definition"/>s constructors. Runtime object
+            references to other objects in this (or a parent) factory are resolved,
+            type conversion is performed, etc.
+            </p>
+            <p>
+            These resolved values are plugged into the supplied
+            <paramref name="resolvedValues"/> object, because we wouldn't want to touch
+            the <paramref name="definition"/>s constructor arguments in case it (or any of
+            its constructor arguments) is a prototype object definition.
+            </p>
+            <p>
+            This method is also used for handling invocations of static factory methods.
+            </p>
+            </remarks>
+            <param name="name">
+            The name of the object that is being resolved by this factory.
+            </param>
+            <param name="definition">
+            The definition associated with the above <paramref name="name"/>.
+            </param>
+            <param name="resolvedValues">
+            Where the resolved constructor arguments will be placed.
+            </param>
+            <returns>
+            The minimum number of arguments that any constructor for the supplied
+            <paramref name="definition"/> must have.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.DependencyCheck(System.String,Spring.Objects.Factory.Support.IConfigurableObjectDefinition,Spring.Objects.IObjectWrapper,Spring.Objects.IPropertyValues)">
+            <summary>
+            Perform a dependency check that all properties exposed have been set, if desired.
+            </summary>
+            <remarks>
+            <p>
+            Dependency checks can be objects (collaborating objects), simple (primitives
+            and <see cref="T:System.String"/>), or all (both).
+            </p>
+            </remarks>
+            <param name="name">
+            The name of the object.
+            </param>
+            <param name="definition">
+            The definition of the named object.
+            </param>
+            <param name="wrapper">
+            The <see cref="T:Spring.Objects.IObjectWrapper"/> wrapping the target object.
+            </param>
+            <param name="properties">
+            The property values to be checked.
+            </param>
+            <exception cref="T:Spring.Objects.Factory.UnsatisfiedDependencyException">
+            If all of the checked dependencies were not satisfied.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.FilterPropertyInfoForDependencyCheck(Spring.Objects.IObjectWrapper)">
+            <summary>
+            Extract a filtered set of PropertyInfos from the given IObjectWrapper, excluding
+            ignored dependency types.
+            </summary>
+            <param name="wrapper">The object wrapper the object was created with.</param>
+            <returns>The filtered PropertyInfos</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.InvokeInitMethods(System.Object,System.String,Spring.Objects.Factory.Support.IConfigurableObjectDefinition)">
+            <summary>
+            Give an object a chance to react now all its properties are set,
+            and a chance to know about its owning object factory (this object).
+            </summary>
+            <remarks>
+            <p>
+            This means checking whether the object implements
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/> and  / or
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>, and invoking the
+            necessary callback(s) if it does.
+            </p>
+            <p>
+            Custom init methods are resolved in a <b>case-insensitive</b> manner.
+            </p>
+            </remarks>
+            <param name="target">
+            The new object instance we may need to initialise.
+            </param>
+            <param name="name">
+            The name the object has in the factory. Used for logging output.
+            </param>
+            <param name="definition">
+            The definition of the target object instance.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.InvokeCustomDestroyMethod(System.String,System.Object,System.String)">
+            <summary>
+            Invoke the specified custom destroy method on the given object.
+            </summary>
+            <remarks>
+            <p>
+            This implementation invokes a no-arg method if found, else checking
+            for a method with a single boolean argument (passing in "true",
+            assuming a "force" parameter), else logging an error.
+            </p>
+            <p>
+            Can be overridden in subclasses for custom resolution of destroy
+            methods with arguments.
+            </p>
+            <p>
+            Custom destroy methods are resolved in a <b>case-insensitive</b> manner.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.DestroyObject(System.String,System.Object)">
+            <summary>
+            Destroy the target object.
+            </summary>
+            <remarks>
+            <p>
+            Must destroy objects that depend on the given object before the object itself.
+            Should not throw any exceptions.
+            </p>
+            </remarks>
+            <param name="name">
+            The name of the object.
+            </param>
+            <param name="target">
+            The target object instance to destroyed.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.DestroyDependantObjects(System.String)">
+            <summary>
+            Destroys all of the objects registered as dependant on the 
+            object (definition) identified by the supplied <paramref name="name"/>. 
+            </summary>
+            <param name="name">
+            The name of the root object (definition) that is itself being destroyed.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ResolveValueIfNecessary(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.String,System.Object)">
+            <summary>
+            Given a property value, return a value, resolving any references to other
+            objects in the factory if necessary.
+            </summary>
+            <remarks>
+            <p>
+            The value could be :
+            <list type="bullet">
+            <item>
+            <p>
+            An <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>,
+            which leads to the creation of a corresponding new object instance.
+            Singleton flags and names of such "inner objects" are always ignored: inner objects
+            are anonymous prototypes.
+            </p>
+            </item>
+            <item>
+            <p>
+            A <see cref="T:Spring.Objects.Factory.Config.RuntimeObjectReference"/>, which must
+            be resolved.
+            </p>
+            </item>
+            <item>
+            <p>
+            An <see cref="T:Spring.Objects.Factory.Support.IManagedCollection"/>. This is a
+            special placeholder collection that may contain
+            <see cref="T:Spring.Objects.Factory.Config.RuntimeObjectReference"/>s or
+            collections that will need to be resolved.
+            </p>
+            </item>
+            <item>
+            <p>
+            An ordinary object or <see langword="null"/>, in which case it's left alone.
+            </p>
+            </item>
+            </list>
+            </p>
+            </remarks>
+            <param name="name">
+            The name of the object that is having the value of one of its properties resolved.
+            </param>
+            <param name="definition">
+            The definition of the named object.
+            </param>
+            <param name="argumentName">
+            The name of the property the value of which is being resolved.
+            </param>
+            <param name="argumentValue">
+            The value of the property that is being resolved.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ResolveTargetType(Spring.Objects.Factory.Config.TypedStringValue)">
+            <summary>
+            Resolve the target type of the passed <see cref="T:Spring.Objects.Factory.Config.TypedStringValue"/>.
+            </summary>
+            <param name="value">The <see cref="T:Spring.Objects.Factory.Config.TypedStringValue"/> who's target type is to be resolved</param>
+            <returns>The resolved target type, if any. <see lang="null"/> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ResolveInnerObjectDefinition(System.String,System.String,System.String,Spring.Objects.Factory.Config.IObjectDefinition,System.Boolean)">
+            <summary>
+            Resolves an inner object definition.
+            </summary>
+            <param name="name">
+            The name of the object that surrounds this inner object definition.
+            </param>
+            <param name="innerObjectName">
+            The name of the inner object definition... note: this is a synthetic
+            name assigned by the factory (since it makes no sense for inner object
+            definitions to have names).
+            </param>
+            <param name="argumentName">
+            The name of the property the value of which is being resolved.
+            </param>
+            <param name="definition">
+            The definition of the inner object that is to be resolved.
+            </param>
+            <param name="singletonOwner">
+            <see langword="true"/> if the owner of the property is a singleton.
+            </param>
+            <returns>
+            The resolved object as defined by the inner object definition.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ResolveReference(Spring.Objects.Factory.Support.IConfigurableObjectDefinition,System.String,System.String,Spring.Objects.Factory.Config.RuntimeObjectReference)">
+            <summary>
+            Resolve a reference to another object in the factory.
+            </summary>
+            <param name="name">
+            The name of the object that is having the value of one of its properties resolved.
+            </param>
+            <param name="definition">
+            The definition of the named object.
+            </param>
+            <param name="argumentName">
+            The name of the property the value of which is being resolved.
+            </param>
+            <param name="reference">
+            The runtime reference containing the value of the property.
+            </param>
+            <returns>A reference to another object in the factory.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.FindMatchingObjects(System.Type)">
+            <summary>
+            Find object instances that match the required <see cref="T:System.Type"/>.
+            </summary>
+            <remarks>
+            <p>
+            Called by autowiring. If a subclass cannot obtain information about object
+            names by <see cref="T:System.Type"/>, a corresponding exception should be thrown.
+            </p>
+            </remarks>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> of the objects to look up.
+            </param>
+            <returns>
+            An <see cref="T:System.Collections.IDictionary"/> of object names and object
+            instances that match the required <see cref="T:System.Type"/>, or
+            <see langword="null"/> if none are found.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.GetDependingObjectNames(System.String)">
+            <summary>
+            Return the names of the objects that depend on the given object.
+            Called by DestroyObject, to be able to destroy depending objects first.
+            </summary>
+            <param name="name">
+            The name of the object to find depending objects for.
+            </param>
+            <returns>
+            The array of names of depending objects, or the empty string array if none.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ConfigureObject(System.Object,System.String)">
+            <summary>
+            Injects dependencies into the supplied <paramref name="target"/> instance
+            using the named object definition.
+            </summary>
+            <param name="target">
+            The object instance that is to be so configured.
+            </param>
+            <param name="name">
+            The name of the object definition expressing the dependencies that are to
+            be injected into the supplied <parameref name="target"/> instance.
+            </param>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ConfigureObject(System.Object,System.String,Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Injects dependencies into the supplied <paramref name="target"/> instance
+            using the supplied <paramref name="definition"/>.
+            </summary>
+            <param name="target">
+            The object instance that is to be so configured.
+            </param>
+            <param name="name">
+            The name of the object definition expressing the dependencies that are to
+            be injected into the supplied <parameref name="target"/> instance.
+            </param>
+            <param name="definition">
+            An object definition that should be used to configure object.
+            </param>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ConfigureObject(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,Spring.Objects.IObjectWrapper)">
+            <summary>
+            Configures object instance by injecting dependencies, satisfying Spring lifecycle
+            interfaces and applying object post-processors.
+            </summary>
+            <param name="name">
+            The name of the object definition expressing the dependencies that are to
+            be injected into the supplied <parameref name="target"/> instance.
+            </param>
+            <param name="definition">
+            An object definition that should be used to configure object.
+            </param>
+            <param name="wrapper">
+            A wrapped object instance that is to be so configured.
+            </param>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.PostProcessObjectFromFactoryObject(System.Object,System.String)">
+            <summary>
+            Applies the <code>PostProcessAfterInitialization</code> callback of all
+            registered IObjectPostProcessors, giving them a chance to post-process
+            the object obtained from IFactoryObjects (for example, to auto-proxy them)
+            </summary>
+            <param name="instance">The instance obtained from the IFactoryObject.</param>
+            <param name="objectName">Name of the object.</param>
+            <returns>The object instance to expose</returns>
+            <exception cref="T:Spring.Objects.ObjectsException">if any post-processing failed.</exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.Autowire(System.Type,Spring.Objects.Factory.Config.AutoWiringMode,System.Boolean)">
+            <summary>
+            Create a new object instance of the given class with the specified
+            autowire strategy.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> of the object to instantiate.
+            </param>
+            <param name="autowireMode">
+            The desired autowiring mode.
+            </param>
+            <param name="dependencyCheck">
+            Whether to perform a dependency check for objects (not applicable to
+            autowiring a constructor, thus ignored there).
+            </param>
+            <returns>The new object instance.</returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the wiring fails.
+            </exception>
+            <seealso cref="T:Spring.Objects.Factory.Config.AutoWiringMode"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.AutowireObjectProperties(System.Object,Spring.Objects.Factory.Config.AutoWiringMode,System.Boolean)">
+            <summary>
+            Autowire the object properties of the given object instance by name or
+            <see cref="T:System.Type"/>.
+            </summary>
+            <param name="instance">
+            The existing object instance.
+            </param>
+            <param name="autowireMode">
+            The desired autowiring mode.
+            </param>
+            <param name="dependencyCheck">
+            Whether to perform a dependency check for the object.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the wiring fails.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+            If the supplied <paramref name="autowireMode"/> is not one of the
+            <seealso cref="F:Spring.Objects.Factory.Config.AutoWiringMode.ByName"/> or
+            <seealso cref="F:Spring.Objects.Factory.Config.AutoWiringMode.ByType"/>
+            values.
+            </exception>
+            <seealso cref="T:Spring.Objects.Factory.Config.AutoWiringMode"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ApplyObjectPostProcessorsBeforeInitialization(System.Object,System.String)">
+            <summary>
+            Apply <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+            to the given existing object instance, invoking their
+            <see cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization(System.Object,System.String)"/>
+            methods.
+            </summary>
+            <param name="instance">
+            The existing object instance.
+            </param>
+            <param name="name">
+            The name of the object.
+            </param>
+            <returns>
+            The object instance to use, either the original or a wrapped one.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If any post-processing failed.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessBeforeInitialization(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ApplyObjectPostProcessorsAfterInitialization(System.Object,System.String)">
+            <summary>
+            Apply <see cref="T:Spring.Objects.Factory.Config.IObjectPostProcessor"/>s
+            to the given existing object instance, invoking their
+            <see cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization(System.Object,System.String)"/>
+            methods.
+            </summary>
+            <param name="instance">
+            The existing object instance.
+            </param>
+            <param name="name">
+            The name of the object.
+            </param>
+            <returns>
+            The object instance to use, either the original or a wrapped one.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If any post-processing failed.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.Config.IObjectPostProcessor.PostProcessAfterInitialization(System.Object,System.String)"/>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory._disposableInnerObjects">
+            <summary>
+            Set that holds all inner objects created by this factory that implement the IDisposable
+            interface, to be destroyed on call to Dispose.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.factoryObjectInstanceCache">
+            <summary>
+            Cache of unfinished IFactoryObject instances: IFactoryObject name --> IObjectWrapper */
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.filteredPropertyDescriptorsCache">
+            <summary>
+            Cache of filtered PropertyInfos: object Type -> PropertyInfo array 
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.ignoredDependencyInterfaces">
+            <summary>
+            Dependency interfaces to ignore on dependency check and autowire, as Set of
+            Class objects. By default, only the IObjectFactoryAware and IObjectNameAware 
+            interfaces are ignored.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.AbstractAutowireCapableObjectFactory.InstantiationStrategy">
+            <summary>
+            The <see cref="T:Spring.Objects.Factory.Support.IInstantiationStrategy"/>
+            implementation to be used to instantiate managed objects.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.DefaultListableObjectFactory"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.#ctor(System.Boolean)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.DefaultListableObjectFactory"/> class.
+            </summary>
+            <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.#ctor(Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.DefaultListableObjectFactory"/> class.
+            </summary>
+            <param name="parentFactory">The parent object factory.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.#ctor(System.Boolean,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.DefaultListableObjectFactory"/> class.
+            </summary>
+            <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+            <param name="parentFactory">The parent object factory.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.FindMatchingObjects(System.Type)">
+            <summary>
+            Find object instances that match the <paramref name="requiredType"/>.
+            </summary>
+            <remarks>
+            <p>
+            Called by autowiring. If a subclass cannot obtain information about object
+            names by <see cref="T:System.Type"/>, a corresponding exception should be thrown.
+            </p>
+            </remarks>
+            <param name="requiredType">
+            The type of the objects to look up.
+            </param>
+            <returns>
+            An <see cref="T:System.Collections.IDictionary"/> of object names and object
+            instances that match the <paramref name="requiredType"/>, or
+            <see langword="null"/> if none is found.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.GetDependingObjectNames(System.String)">
+            <summary>
+            Return the names of the objects that depend on the given object.
+            </summary>
+            <remarks>
+            <p>
+            Called by the
+            <see cref="M:Spring.Objects.Factory.Support.AbstractObjectFactory.DestroyObject(System.String,System.Object)"/>
+            so that dependant objects are able to be disposed of first.
+            </p>
+            </remarks>
+            <param name="objectName">
+            The name of the object to find depending objects for.
+            </param>
+            <returns>
+            The array of names of depending objects, or the empty string array if none.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.IsObjectTypeMatch(System.String,System.Type)">
+            <summary>
+            Check whether the specified object matches the supplied <paramref name="type"/>.
+            </summary>
+            <param name="objectName">The name of the object to check.</param>
+            <param name="type">
+            The <see cref="T:System.Type"/> to check for.
+            </param>
+            <returns>
+            <see langword="true"/> if the object matches the supplied <paramref name="type"/>,
+            or if the supplied <paramref name="type"/> is <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.DefaultListableObjectFactory.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.DefaultListableObjectFactory.allowObjectDefinitionOverriding">
+            <summary>
+            Whether to allow re-registration of a different definition with the
+            same name.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.DefaultListableObjectFactory.objectDefinitionMap">
+            <summary>
+            The mapping of object definition objects, keyed by object name.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.DefaultListableObjectFactory.objectDefinitionNames">
+            <summary>
+            List of object definition names, in registration order.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.ContainsObjectDefinition(System.String)">
+            <summary>
+            Check if this registry contains a object definition with the given
+            name.
+            </summary>
+            <param name="name">
+            The name of the object to look for.
+            </param>
+            <returns>
+            <see langword="true"/> if this object factory contains an object
+            definition with the given name.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.Support.IObjectDefinitionRegistry.ContainsObjectDefinition(System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.RegisterObjectDefinition(System.String,Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Register a new object definition with this registry.
+            </summary>
+            <param name="name">
+            The name of the object instance to register.
+            </param>
+            <param name="objectDefinition">
+            The definition of the object instance to register.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object definition is invalid.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.Support.IObjectDefinitionRegistry.RegisterObjectDefinition(System.String,Spring.Objects.Factory.Config.IObjectDefinition)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.PreInstantiateSingletons">
+            <summary>
+            Ensure that all non-lazy-init singletons are instantiated, also
+            considering <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s.
+            </summary>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If one of the singleton objects could not be created.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory.PreInstantiateSingletons"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.GetObjectDefinition(System.String)">
+            <summary>
+            Return the registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+            given object, allowing access to its property values and constructor
+            argument values.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <returns>
+            The registered <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>, 
+            or <c>null</c>, if specified object definitions does not exist.
+            </returns>
+            <exception cref="T:System.ArgumentException">
+            If <paramref name="name"/> is <c>null</c> or empty string.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory.GetObjectDefinition(System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.GetObjectDefinition(System.String,System.Boolean)">
+            <summary>
+            Return the registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+            given object, allowing access to its property values and constructor
+            argument values.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <param name="includeAncestors">Whether to search parent object factories.</param>
+            <returns>
+            The registered <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>, 
+            or <c>null</c>, if specified object definitions does not exist.
+            </returns>
+            <exception cref="T:System.ArgumentException">
+            If <paramref name="name"/> is <c>null</c> or empty string.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.Config.IConfigurableListableObjectFactory.GetObjectDefinition(System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.GetObjectDefinitionNames">
+            <summary>
+            Return the names of all objects defined in this factory.
+            </summary>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectDefinitionNames"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.GetObjectDefinitionNames(System.Type)">
+            <summary>
+            Return the names of objects matching the given <see cref="T:System.Type"/>
+            (including subclasses), judging from the object definitions.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match, or <see langword="null"/>
+            for all object names.
+            </param>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectDefinitionNames"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.GetObjectNamesForType(System.Type)">
+            <summary>
+            Return the names of objects matching the given <see cref="T:System.Type"/>
+            (including subclasses), judging from the object definitions.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match, or <see langword="null"/>
+            for all object names.
+            </param>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectNamesForType(System.Type)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.GetObjectNamesForType(System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Return the names of objects matching the given <see cref="T:System.Type"/>
+            (including subclasses), judging from the object definitions.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match, or <see langword="null"/>
+            for all object names.
+            </param>
+            <param name="includePrototypes">
+            Whether to include prototype objects too or just singletons (also applies to
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s).
+            </param>
+            <param name="includeFactoryObjects">
+            Whether to include <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s too
+            or just normal objects.
+            </param>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectNamesForType(System.Type,System.Boolean,System.Boolean)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.GetObjectsOfType(System.Type)">
+            <summary>
+            Return the object instances that match the given object
+            <see cref="T:System.Type"/> (including subclasses), judging from either object
+            definitions or the value of
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match.
+            </param>
+            <returns>
+            A <see cref="T:System.Collections.IDictionary"/> of the matching objects,
+            containing the object names as keys and the corresponding object instances
+            as values.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the objects could not be created.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(System.Type)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.GetObjectsOfType(System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Return the object instances that match the given object
+            <see cref="T:System.Type"/> (including subclasses).
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match.
+            </param>
+            <param name="includePrototypes">
+            Whether to include prototype objects too or just singletons (also applies to
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s).
+            </param>
+            <param name="includeFactoryObjects">
+            Whether to include <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s too
+            or just normal objects.
+            </param>
+            <returns>
+            An <see cref="T:System.Collections.IDictionary"/> of the matching objects,
+            containing the object names as keys and the corresponding object instances
+            as values.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If any of the objects could not be created.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(System.Type,System.Boolean,System.Boolean)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultListableObjectFactory.DoGetObjectNamesForType(System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Return the object instances that match the given object
+            <see cref="T:System.Type"/> (including subclasses).
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match.
+            </param>
+            <param name="includePrototypes">
+            Whether to include prototype objects too or just singletons (also applies to
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s).
+            </param>
+            <param name="includeFactoryObjects">
+            Whether to include <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s too
+            or just normal objects.
+            </param>
+            <returns>
+            An <see cref="T:System.Collections.IDictionary"/> of the matching objects,
+            containing the object names as keys and the corresponding object instances
+            as values.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If any of the objects could not be created.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(System.Type,System.Boolean,System.Boolean)"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.DefaultListableObjectFactory.AllowObjectDefinitionOverriding">
+            <summary>
+            Should object definitions registered under the same name as an
+            existing object definition be allowed?
+            </summary>
+            <remarks>
+            <p>
+            If <see langword="true"/>, then the new object definition will
+            replace (override) the existing object definition. If
+            <see langword="false"/>, an exception will be thrown when
+            an attempt is made to register an object definition under the same
+            name as an already existing object definition.
+            </p>
+            <p>
+            The default is <see langword="true"/>.
+            </p>
+            </remarks>
+            <value>
+            <see langword="true"/> is the registration of an object definition
+            under the same name as an existing object definition is allowed.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.DefaultListableObjectFactory.ObjectDefinitionCount">
+            <summary>
+            Return the number of objects defined in this registry.
+            </summary>
+            <value>
+            The number of objects defined in this registry.
+            </value>
+            <seealso cref="P:Spring.Objects.Factory.Support.IObjectDefinitionRegistry.ObjectDefinitionCount"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectFactory.#ctor(Spring.Core.IO.IResource)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Objects.Factory.Xml.XmlObjectFactory"/> class,
+            with the given resource, which must be parsable using DOM.
+            </summary>
+            <param name="resource">
+            The XML resource to load object definitions from.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of loading or parsing errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectFactory.#ctor(Spring.Core.IO.IResource,System.Boolean)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Objects.Factory.Xml.XmlObjectFactory"/> class,
+            with the given resource, which must be parsable using DOM.
+            </summary>
+            <param name="resource">
+            The XML resource to load object definitions from.
+            </param>
+            <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of loading or parsing errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectFactory.#ctor(Spring.Core.IO.IResource,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Objects.Factory.Xml.XmlObjectFactory"/> class,
+            with the given resource, which must be parsable using DOM, and the
+            given parent factory.
+            </summary>
+            <param name="resource">
+            The XML resource to load object definitions from.
+            </param>
+            <param name="parentFactory">The parent object factory (may be <see langword="null"/>).</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of loading or parsing errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlObjectFactory.#ctor(Spring.Core.IO.IResource,System.Boolean,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Objects.Factory.Xml.XmlObjectFactory"/> class,
+            with the given resource, which must be parsable using DOM, and the
+            given parent factory.
+            </summary>
+            <param name="resource">
+            The XML resource to load object definitions from.
+            </param>
+            <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+            <param name="parentFactory">The parent object factory (may be <see langword="null"/>).</param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of loading or parsing errors.
+            </exception>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.XmlObjectFactory.ObjectDefinitionReader">
+            <summary>
+            Gets object definition reader to use.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.ObjectDefinitionConstants">
+            <summary>
+            Constants defining the structure and values associated with the
+            Spring.NET XML object definition format.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: ObjectDefinitionConstants.cs,v 1.8 2006/11/17 20:41:39 aseovic Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.TrueValue">
+            <summary>
+            Value of a boolean attribute that represents
+            <see langword="true"/>.
+            </summary>
+            <remarks>
+            <p>
+            Anything else represents <see langword="false"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DefaultValue">
+            <summary>
+            Signifies that a default value is to be applied.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ImportElement">
+            <summary>
+            Defines an external XML object definition resource.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ImportResourceAttribute">
+            <summary>
+            Specifies the relative path to an external XML object definition
+            resource.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.AliasElement">
+            <summary>
+            Defines an alias for an object definition.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.AliasAttribute">
+            <summary>
+            Specifies the alias of an object definition.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DefaultLazyInitAttribute">
+            <summary>
+            Specifies the default lazy initialization mode.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DefaultDependencyCheckAttribute">
+            <summary>
+            Specifies the default dependency checking mode.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DefaultAutowireAttribute">
+            <summary>
+            Specifies the default autowire mode.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ObjectElement">
+            <summary>
+            Defines a single named object.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DescriptionElement">
+            <summary>
+            Element containing informative text describing the purpose of the
+            enclosing element.
+            </summary>
+            <remarks>
+            <p>
+            Always optional.
+            </p>
+            <p>
+            Used primarily for user documentation of XML object definition
+            documents.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.TypeAttribute">
+            <summary>
+            Specifies a <see cref="T:System.Type"/>.
+            </summary>
+            <remarks>
+            <p>
+            Does not have to be fully assembly qualified, but it is recommended
+            that the <see cref="T:System.Type"/> names of one's objects are
+            specified explicitly.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ParentAttribute">
+            <summary>
+            The name or alias of the parent object definition that a child
+            object definition inherits from.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.IdAttribute">
+            <summary>
+            Objects can be identified by an id, to enable reference checking.
+            </summary>
+            <remarks>
+            <p>
+            There are constraints on a valid XML id: if you want to reference
+            your object in .NET code using a name that's illegal as an XML id,
+            use the optional <c>"name"</c> attribute
+            (<see cref="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.NameAttribute"/>).
+            If neither given, the objects <see cref="T:System.Type"/> name is
+            used as id.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.NameAttribute">
+            <summary>
+            Can be used to create one or more aliases illegal in an id.
+            </summary>
+            <remarks>
+            <p>
+            Multiple aliases can be separated by any number of spaces,
+            semicolons, or commas
+            (<see cref="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ObjectNameDelimiters"/>).
+            </p>
+            <p>
+            Always optional.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.SingletonAttribute">
+            <summary>
+            Is this object a "singleton" (one shared instance, which will
+            be returned by all calls to
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/> with the id), or a
+            "prototype" (independent instance resulting from each call to
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>).
+            </summary>
+            <remarks>
+            <p>
+            Singletons are most commonly used, and are ideal for multi-threaded
+            service objects.
+            </p>
+            </remarks>
+            <seealso cref="T:Spring.Objects.Factory.IObjectFactory"/>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ScopeAttribute">
+            <summary>
+            Controls object scope. Only applicable to ASP.NET web applications.
+            </summary>
+            <remarks>
+            <p>
+            Scope can be defined as either application, session or request. It
+            defines when "singleton" instances are initialized, but has no
+            effect on prototype definitions.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DependsOnAttribute">
+            <summary>
+            The names of the objects that this object depends on being
+            initialized.
+            </summary>
+            <remarks>
+            <p>
+            The object factory will guarantee that these objects
+            get initialized before this object definition.
+            </p>
+            <note>
+            Dependencies are normally expressed through object properties or
+            constructor arguments. This property should just be necessary for
+            other kinds of dependencies such as statics (*ugh*) or database
+            preparation on startup.
+            </note>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.InitMethodAttribute">
+            <summary>
+            Optional attribute for the name of the custom initialization method
+            to invoke after setting object properties.
+            </summary>
+            <remarks>
+            <p>
+            The method <b>must</b> have no arguments.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DestroyMethodAttribute">
+            <summary>
+            Optional attribute for the name of the custom destroy method to
+            invoke on object factory shutdown.
+            </summary>
+            <remarks>
+            <p>
+            Valid destroy methods have either of the following signatures...
+            <list type="bullet">
+            <item><c>void MethodName()</c></item>
+            <item><c>void MethodName(bool force)</c></item>
+            </list>
+            </p>
+            <note>
+            Only invoked on singleton objects!
+            </note>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ConstructorArgElement">
+            <summary>
+            A constructor argument : the constructor-arg tag can have an
+            optional type attribute, to specify the exact type of the
+            constructor argument
+            </summary>
+            <remarks>
+            <p>
+            Only needed  to avoid ambiguities, e.g. in case of 2 single
+            argument constructors that can both be converted from a
+            <see cref="T:System.String"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.IndexAttribute">
+            <summary>
+            The constructor-arg tag can have an optional index attribute,
+            to specify the exact index in the constructor argument list.
+            </summary>
+            <remarks>
+            <p>
+            Only needed to avoid ambiguities, e.g. in case of 2 arguments of
+            the same type.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ArgumentNameAttribute">
+            <summary>
+            The constructor-arg tag can have an optional named parameter
+            attribute, to specify a named parameter in the constructor
+            argument list.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.AbstractAttribute">
+            <summary>
+            Is this object "abstract", i.e. not meant to be instantiated itself
+            but rather just serving as parent for concrete child object
+            definitions?
+            </summary>
+            <remarks>
+            <p>
+            Default is <see langword="false"/>. Specify <see langword="true"/>
+            to tell the object factory to not try to instantiate that
+            particular object in any case.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.PropertyElement">
+            <summary>
+            A property definition : object definitions can have zero or more
+            properties.
+            </summary>
+            <remarks>
+            <p>
+            Spring.NET supports primitives, references to other objects in the
+            same or related factories, lists, dictionaries, and name value
+            collections.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.RefElement">
+            <summary>
+            A reference to another managed object or static
+            <see cref="T:System.Type"/>.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.IdRefElement">
+            <summary>
+            ID refs must specify a name of the target object.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ObjectRefAttribute">
+            <summary>
+            A reference to the name of another managed object in the same
+            context.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.LocalRefAttribute">
+            <summary>
+            A reference to the name of another managed object in the same
+            context.
+            </summary>
+            <remarks>
+            <p>
+            Local references, using the "local" attribute, have to use object
+            ids; they can be checked by a parser, thus should be preferred for
+            references within the same object factory XML file.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.FactoryObjectAttribute">
+            <summary>
+            Alternative to type attribute for factory-method usage.
+            </summary>
+            <remarks>
+            <p>
+            If this is specified, no type attribute should be used. This should
+            be set to the name of an object in the current or ancestor
+            factories that contains the relevant factory method. This allows
+            the factory itself to be configured using Dependency Injection, and
+            an instance (rather than static) method to be used.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.FactoryMethodAttribute">
+            <summary>
+            Optional attribute specifying the name of a factory method to use
+            to create this object.
+            </summary>
+            <remarks>
+            <p>
+            Use constructor-arg elements to specify arguments to the factory
+            method, if it takes arguments. Autowiring does <b>not</b> apply to
+            factory methods.
+            </p>
+            <p>
+            If the "type" attribute is present, the factory method will be a
+            static method on the type specified by the "type" attribute on
+            this object definition. Often this will be the same type as that
+            of the constructed object - for example, when the factory method
+            is used as an alternative to a constructor. However, it may be on
+            a different type. In that case, the created object will *not* be
+            of the type specified in the "type" attribute. This is analogous
+            to <see cref="T:Spring.Objects.Factory.IFactoryObject"/> behaviour.
+            </p>
+            <p>
+            If the "factory-object" attribute is present, the "type" attribute
+            is not used, and the factory method will be an instance method on
+            the object returned from a
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>
+            call with the specified object name. The factory object may be
+            defined as a singleton or a prototype.
+            </p>
+            <p>
+            The factory method can have any number of arguments. Use indexed
+            constructor-arg elements in conjunction with the factory-method
+            attribute.
+            </p>
+            <p>
+            Setter Injection can be used in conjunction with a factory method.
+            Method Injection cannot, as the factory method returns an instance,
+            which will be used when the container creates the object.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ListElement">
+            <summary>
+            A list can contain multiple inner object, ref, collection, or
+            value elements.
+            </summary>
+            <remarks>
+            <p>
+            Lists are untyped, pending generics support, although references
+            will be strongly typed.
+            </p>
+            <p>
+            A list can also map to an array type. The necessary conversion is
+            automatically performed by the
+            <see cref="T:Spring.Objects.Factory.Support.AbstractObjectFactory"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.SetElement">
+            <summary>
+            A set can contain multiple inner object, ref, collection, or value
+            elements.
+            </summary>
+            <remarks>
+            <p>
+            Sets are untyped, pending generics support, although references
+            will be strongly typed.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DictionaryElement">
+            <summary>
+            A Spring.NET map is a mapping from a string key to object (a .NET
+            <see cref="T:System.Collections.IDictionary"/>).
+            </summary>
+            <remarks>
+            <p>
+            Dictionaries may be empty.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.KeyAttribute">
+            <summary>
+            A lookup key (for a dictionary or name / value collection).
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.KeyElement">
+            <summary>
+            A lookup key (for a dictionary or name / value collection).
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ValueAttribute">
+            <summary>
+            Contains a string representation of a value.
+            </summary>
+            <remarks>
+            <p>
+            This is used by name-value, ctor argument, and property elements.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DelimitersAttribute">
+            <summary>
+            Contains delimiters that should be used to split delimited string values.
+            </summary>
+            <remarks>
+            <p>
+            This is used by name-value element.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.RefAttribute">
+            <summary>
+            A reference to another objects.
+            </summary>
+            <remarks>
+            <p>
+            Used as a convenience shortcut on property and constructor-arg
+            elements to refer to other objects.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ExpressionAttribute">
+            <summary>
+            Contains a string representation of an expression.
+            </summary>
+            <remarks>
+            <p>
+            This is used by ctor argument and property elements.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.EntryElement">
+            <summary>
+            A map entry can be an inner object, ref, collection, or value.
+            </summary>
+            <remarks>
+            <p>
+            The name of the property is given by the "key" attribute.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ValueElement">
+            <summary>
+            Contains a string representation of a property value.
+            </summary>
+            <remarks>
+            <p>
+            The property may be a string, or may be converted to the
+            required <see cref="T:System.Type"/> using the
+            <see cref="T:System.ComponentModel.TypeConverter"/> 
+            machinery. This makes it possible for application developers to
+            write custom <see cref="T:System.ComponentModel.TypeConverter"/>
+            implementations that can convert strings to objects.
+            </p>
+            <note>
+            This is recommended for simple objects only. Configure more complex
+            objects by setting properties to references to other objects.
+            </note>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ExpressionElement">
+            <summary>
+            Contains a string representation of an expression.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.NullElement">
+            <summary>
+            Denotes <see langword="null"/>  value.
+            </summary>
+            <remarks>
+            <p>
+            Necessary because an empty "value" tag will resolve to an empty
+            <see cref="T:System.String"/>, which will not be resolved to
+            <see langword="null"/> value unless a special
+            <see cref="T:System.ComponentModel.TypeConverter"/> does so.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.NameValuesElement">
+            <summary>
+            'name-values' elements differ from dictionary elements in that
+            values must be strings.
+            </summary>
+            <remarks>
+            <p>
+            May be empty.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.AddElement">
+            <summary>
+            Element content is the string value of the property.
+            </summary>
+            <remarks>
+            <p>
+            The "key" attribute is the name of the property.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.LazyInitAttribute">
+            <summary>
+            The lazy initialization mode for an individual object definition.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DependencyCheckAttribute">
+            <summary>
+            The dependency checking mode for an individual object definition.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ListenerElement">
+            <summary>
+            Defines a subscription to one or more events published by one or
+            more event sources.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ListenerMethodAttribute">
+            <summary>
+            The name of an event handling method.
+            </summary>
+            <remarks>
+            <p>
+            Defaults to <c>On${event}</c>.
+            <b>Note : this default will probably change before the first 1.0
+            release.</b>
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ListenerEventAttribute">
+            <summary>
+            The name of an event.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.AutowireAttribute">
+            <summary>
+            The autowiring mode for an individual object definition.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DictionaryKeyRefShortcutAttribute">
+            <summary>
+            Shortcut alternative to specifying a key element in a
+            dictionary entry element with <c>&lt;ref object="..."/&gt;</c>.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DictionaryValueRefShortcutAttribute">
+            <summary>
+            Shortcut alternative to specifying a value element in a
+            dictionary entry element with <c>&lt;ref object="..."/&gt;</c>.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ObjectNameDelimiters">
+            <summary>
+            The string of characters that delimit object names.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.LookupMethodElement">
+            <summary>
+            A lookup method causes the IoC container to override a given method and return
+            the object with the name given in the attendant <c>object</c> attribute.
+            </summary>
+            <remarks>
+            <p>
+            This is a form of Method Injection.
+            </p>
+            <p>
+            It's particularly useful as an alternative to implementing the
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/> interface,
+            in order to be able to make
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>
+            calls for non-singleton instances at runtime. In this case, Method Injection
+            is a less invasive alternative.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.LookupMethodNameAttribute">
+            <summary>
+            The name of a lookup method. This method <b>must</b> take no arguments.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.LookupMethodObjectNameAttribute">
+            <summary>
+            The name of the object in the IoC container that the lookup method
+            must resolve to.
+            </summary>
+            <remarks>
+            <p>
+            Often this object will be a prototype, in which case the lookup method
+            will return a distinct instance on every invocation. This is useful
+            for single-threaded objects.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ReplacedMethodElement">
+            <summary>
+            A replaced method causes the IoC container to override a given method
+            with an (arbitrary) implementation at runtime.
+            </summary>
+            <remarks>
+            <p>
+            This (again) is a form of Method Injection.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ReplacedMethodNameAttribute">
+            <summary>
+            Name of the method whose implementation should be replaced by the
+            IoC container.
+            </summary>
+            <remarks>
+            <p>
+            If this method is not overloaded, there's no need to use arg-type 
+            subelements.
+            </p>
+            <p>
+            If this method is overloaded, <c>arg-type</c> subelements must be
+            used for all override definitions for the method.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ReplacedMethodReplacerNameAttribute">
+            <summary>
+            The object name of an implementation of the
+            <see cref="T:Spring.Objects.Factory.Support.IMethodReplacer"/> interface.
+            </summary>
+            <remarks>
+            <p>
+            This may be a singleton or prototype. If it's a prototype, a new
+            instance will be used for each method replacement. Singleton usage
+            is the norm.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ReplacedMethodArgumentTypeElement">
+            <summary>
+            Subelement of <c>replaced-method</c> identifying an argument for a
+            replaced method in the event of method overloading.
+            </summary>
+            <seealso cref="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ReplacedMethodReplacerNameAttribute"/> 
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ReplacedMethodArgumentTypeMatchAttribute">
+            <summary>
+            Specification of the <see cref="T:System.Type"/> of an overloaded method
+            argument as a <see cref="T:System.String"/>.
+            </summary>
+            <remarks>
+            <p>
+            For convenience, this may be a substring of the FQN. E.g. all the following would match
+            <see cref="T:System.String"/>:
+            </p>
+            <p>
+            <list type="bullet">
+            <item>
+            <description>System.String</description>
+            </item>
+            <item>
+            <description>string</description>
+            </item>
+            <item>
+            <description>str</description>
+            </item>
+            </list>
+            </p>
+            </remarks>
+            <seealso cref="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.ReplacedMethodArgumentTypeElement"/> 
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DependencyCheckAllAttributeValue">
+            <summary>
+            Check everything.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DependencyCheckSimpleAttributeValue">
+            <summary>
+            Just check primitive (string, int, etc) values.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.DependencyCheckObjectsAttributeValue">
+            <summary>
+            Check object references.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.AutowireByNameValue">
+            <summary>
+            Autowire by name.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.AutowireByTypeValue">
+            <summary>
+            Autowire by <see cref="T:System.Type"/>.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.AutowireConstructorValue">
+            <summary>
+            Autowiring by constructor.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.AutowireAutoDetectValue">
+            <summary>
+            The autowiring strategy is to be determined by introspection
+            of the object's <see cref="T:System.Type"/>.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.ObjectDefinitionConstants.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Xml.ObjectDefinitionConstants"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such has no publicly visible
+            constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.StaticListableObjectFactory">
+            <summary>
+            Static factory that permits the registration of existing singleton instances.
+            </summary>
+            <remarks>
+            <p>
+            Does not have support for prototype objects, aliases, and post startup object
+            configuration.
+            </p>
+            <p>
+            Serves as a simple example implementation of the <see cref="T:Spring.Objects.Factory.IListableObjectFactory"/>
+            interface, that manages existing object instances as opposed to creating new ones
+            based on object definitions.
+            </p>
+            <p>
+            The <see cref="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.ConfigureObject(System.Object,System.String)"/>
+            method is not supported by this class; this class deals exclusively with
+            existing singleton instances, thus the methods mentioned previously make little sense in this context.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: StaticListableObjectFactory.cs,v 1.24 2007/12/05 00:28:05 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.StaticListableObjectFactory.objects">
+            <summary>
+            Map from object name to object instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetObject(System.String)">
+            <summary>
+            Return an instance of the given object name.
+            </summary>
+            <param name="name">The name of the object to return.</param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:System.NotSupportedException">
+            <see cref="T:Spring.Objects.Factory.Config.IConfigurableFactoryObject"/> is not currently supported.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetObject(System.String,System.Object[])">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <remarks>
+            <p>
+            This method allows an object factory to be used as a replacement for the
+            Singleton or Prototype design pattern.
+            </p>
+            <p>
+            Note that callers should retain references to returned objects. There is no
+            guarantee that this method will be implemented to be efficient. For example,
+            it may be synchronized, or may need to run an RDBMS query.
+            </p>
+            <p>
+            Will ask the parent factory if the object cannot be found in this factory
+            instance.
+            </p>
+            </remarks>
+            <param name="name">The name of the object to return.</param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a static factory method. If there is no factory method and the
+            arguments are not null, then match the argument values by type and
+            call the object's constructor.
+            </param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetObject(System.String,System.Type,System.Object[])">
+            <summary>
+            Return an instance (possibly shared or independent) of the given object name.
+            </summary>
+            <param name="name">The name of the object to return.</param>
+            <param name="requiredType">
+            The <see cref="T:System.Type"/> the object may match. Can be an interface or
+            superclass of the actual class. For example, if the value is the
+            <see cref="T:System.Object"/> class, this method will succeed whatever the
+            class of the returned instance.
+            </param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a <see lang="static"/> factory method. If there is no factory method and the
+            supplied <paramref name="arguments"/> array is not <see lang="null"/>, then
+            match the argument values by type and call the object's constructor.
+            </param>
+            <returns>The instance of the object.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the object could not be created.
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectNotOfRequiredTypeException">
+            If the object is not of the required type.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> is <see langword="null"/>.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String,System.Type)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetObject(System.String,System.Type)">
+            <summary>
+            Return an instance of the given object name.
+            </summary>
+            <param name="name">The name of the object to return.</param>
+            <param name="requiredType">
+            <see cref="T:System.Type"/> the object may match. Can be an interface or
+            superclass of the actual class. For example, if the value is the
+            <see cref="T:System.Object"/> class, this method will succeed whatever the
+            class of the returned instance.
+            </param>
+            <returns>The instance of the object.</returns>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String,System.Type)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.ContainsObject(System.String)">
+            <summary>
+            Does this object factory contain an object with the given name?
+            </summary>
+            <param name="name">The name of the object to query.</param>
+            <returns>True if an object with the given name is defined.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.IsSingleton(System.String)">
+            <summary>
+            Is this object a singleton?
+            </summary>
+            <remarks>
+            <p>
+            That is, will <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>
+            or <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String,System.Type)"/>
+            always return the same object?
+            </p>
+            </remarks>
+            <param name="name">The name of the object to query.</param>
+            <returns>True if the named object is a singleton.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.IsPrototype(System.String)">
+            <summary>
+            Determines whether the specified object name is prototype.  That is, will GetObject
+            always return independent instances?
+            </summary>
+            <remarks>This method returning false does not clearly indicate a singleton object.
+            It indicated non-independent instances, which may correspond to a scoped object as 
+            well.  use the IsSingleton property to explicitly check for a shared 
+            singleton instance.
+            <para>Translates aliases back to the corresponding canonical object name.  Will ask the
+            parent factory if the object can not be found in this factory instance.
+            </para>
+            </remarks>
+            
+            <param name="name">The name of the object to query</param>
+            <returns>
+            	<c>true</c> if the specified object name will always deliver independent instances; otherwise, <c>false</c>.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">if there is no object with the given name.</exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetType(System.String)">
+            <summary>
+            Determine the type of the object with the given name.
+            </summary>
+            <remarks>
+            <p>
+            More specifically, checks the type of object that
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/> would return.
+            For an <see cref="T:Spring.Objects.Factory.IFactoryObject"/>, returns the type
+            of object that the <see cref="T:Spring.Objects.Factory.IFactoryObject"/> creates.
+            </p>
+            </remarks>
+            <param name="name">The name of the object to query.</param>
+            <returns>
+            The <see cref="T:System.Type"/> of the object or <see langword="null"/> if
+            not determinable.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.IsTypeMatch(System.String,System.Type)">
+            <summary>
+            Determines whether the object with the given name matches the specified type.
+            </summary>
+            <param name="name">The name of the object to query.</param>
+            <param name="targetType">Type of the target to match against.</param>
+            <returns>
+            	<c>true</c> if the object type matches; otherwise, <c>false</c>
+            if it doesn't match or cannot be determined yet.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">Ff there is no object with the given name
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetAliases(System.String)">
+            <summary>
+            Return the aliases for the given object name, if defined.
+            </summary>
+            <param name="name">The object name to check for aliases.</param>
+            <returns>The aliases, or an empty array if none.</returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there's no such object definition.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetObjectDefinition(System.String)">
+            <summary>
+            Not supported.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <returns>
+            The registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>.
+            </returns>
+            <exception cref="T:System.NotSupportedException">
+            Always, as object definitions are not supported by this <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            implementation.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetObjectDefinition(System.String,System.Boolean)">
+            <summary>
+            Return the registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> for the
+            given object, allowing access to its property values and constructor
+            argument values.
+            </summary>
+            <param name="name">The name of the object.</param>
+            <param name="includeAncestors">Whether to search parent object factories.</param>
+            <returns>
+            The registered
+            <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>.
+            </returns>
+            <exception cref="T:Spring.Objects.Factory.NoSuchObjectDefinitionException">
+            If there is no object with the given name.
+            </exception>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In the case of errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetObjectDefinitionNames">
+            <summary>
+            Return the names of all objects defined in this factory.
+            </summary>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetObjectDefinitionNames(System.Type)">
+            <summary>
+            Return the names of objects matching the given <see cref="T:System.Type"/>
+            (including subclasses), judging from the object definitions.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match, or
+            <see langword="null"/> for all object names.
+            </param>
+            <remarks>
+            <p>
+            Will not consider <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s,
+            as the type of their created objects is not known before instantiation.
+            </p>
+            </remarks>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetObjectNamesForType(System.Type)">
+            <summary>
+            Return the names of objects matching the given <see cref="T:System.Type"/>
+            (including subclasses), judging from the object definitions.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match, or
+            <see langword="null"/> for all object names.
+            </param>
+            <remarks>
+            <p>
+            Does consider objects created by <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s,
+            or rather it considers the type of objects created by
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> (which means that
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s will be instantiated).
+            </p>
+            <p>
+            Does not consider any hierarchy this factory may participate in.
+            </p>
+            </remarks>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetObjectNamesForType(System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Return the names of objects matching the given <see cref="T:System.Type"/>
+            (including subclasses), judging from the object definitions.
+            </summary>
+            <remarks>
+            <p>
+            Since this implementation of the
+            <see cref="T:Spring.Objects.Factory.IListableObjectFactory"/>
+            interface does not support the notion of ptototype objects, the
+            <paramref name="includePrototypes"/> parameter is ignored.
+            </p>
+            </remarks>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match, or <see langword="null"/>
+            for all object names.
+            </param>
+            <param name="includePrototypes">
+            Whether to include prototype objects too or just singletons (also applies to
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s). Ignored.
+            </param>
+            <param name="includeFactoryObjects">
+            Whether to include <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s too
+            or just normal objects.
+            </param>
+            <returns>
+            The names of all objects defined in this factory, or an empty array if none
+            are defined.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectNamesForType(System.Type,System.Boolean,System.Boolean)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.ContainsObjectDefinition(System.String)">
+            <summary>
+            Tests whether this object factory contains an object definition for the
+            specified object name.
+            </summary>
+            <param name="name">The object name to query.</param>
+            <returns>
+            <b>True</b> if an object defintion is contained within this object factory.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetObjectsOfType(System.Type)">
+            <summary>
+            Return the object instances that match the given object
+            <see cref="T:System.Type"/> (including subclasses), judging from either object
+            definitions or the value of
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s.
+            </summary>
+            <remarks>
+            <p>
+            This version of the <see cref="M:Spring.Objects.Factory.IListableObjectFactory.GetObjectsOfType(System.Type,System.Boolean,System.Boolean)"/>
+            method matches all kinds of object definitions, be they singletons, prototypes, or
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s. Typically, the results
+            of this method call will be the same as a call to
+            <code>IListableObjectFactory.GetObjectsOfType(type,true,true)</code> .
+            </p>
+            </remarks>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match.
+            </param>
+            <returns>
+            A <see cref="T:System.Collections.IDictionary"/> of the matching objects,
+            containing the object names as keys and the corresponding object instances
+            as values.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the objects could not be created.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.GetObjectsOfType(System.Type,System.Boolean,System.Boolean)">
+            <summary>
+            Return the object instances that match the given object
+            <see cref="T:System.Type"/> (including subclasses), judging from either object
+            definitions or the value of
+            <see cref="P:Spring.Objects.Factory.IFactoryObject.ObjectType"/> in the case of
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> (class or interface) to match.
+            </param>
+            <param name="includePrototypes">
+            Whether to include prototype objects too or just singletons (also applies to
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s).
+            </param>
+            <param name="includeFactoryObjects">
+            Whether to include <see cref="T:Spring.Objects.Factory.IFactoryObject"/>s too
+            or just normal objects.
+            </param>
+            <returns>
+            A <see cref="T:System.Collections.IDictionary"/> of the matching objects,
+            containing the object names as keys and the corresponding object instances
+            as values.
+            </returns>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            If the objects could not be created.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.AddObject(System.String,System.Object)">
+            <summary>
+            Add a new singleton object.
+            </summary>
+            <param name="name">
+            The name to be associated with the object name.
+            </param>
+            <param name="instance">The singleton object.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.ConfigureObject(System.Object,System.String)">
+            <summary>
+            Injects dependencies into the supplied <paramref name="target"/> instance
+            using the named object definition.
+            </summary>
+            <param name="target">
+            The object instance that is to be so configured.
+            </param>
+            <param name="name">
+            The name of the object definition expressing the dependencies that are to
+            be injected into the supplied <parameref name="target"/> instance.
+            </param>
+            <exception cref="T:System.NotSupportedException">
+            This feature is not currently supported.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.ConfigureObject(System.Object,System.String,Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Injects dependencies into the supplied <paramref name="target"/> instance
+            using the supplied <paramref name="definition"/>.
+            </summary>
+            <param name="target">
+            The object instance that is to be so configured.
+            </param>
+            <param name="name">
+            The name of the object definition expressing the dependencies that are to
+            be injected into the supplied <parameref name="target"/> instance.
+            </param>
+            <param name="definition">
+            An object definition that should be used to configure object.
+            </param>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.StaticListableObjectFactory.Dispose">
+            <summary>
+            Defines a method to release allocated unmanaged resources.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.StaticListableObjectFactory.ObjectDefinitionCount">
+            <summary>
+            Return the number of objects defined in the factory.
+            </summary>
+            <value>
+            The number of objects defined in the factory.
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.StaticListableObjectFactory.Item(System.String)">
+            <summary>
+            Return an instance of the given object name.
+            </summary>
+            <param name="name">The name of the object to return.</param>
+            <returns>The instance of the object.</returns>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.MethodOverrides">
+            <summary>
+            A collection (with set semantics) of method overrides, determining which, if any,
+            methods on a managed object the Spring.NET IoC container will override at runtime.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Rick Evans</author>
+            <version>$Id: MethodOverrides.cs,v 1.8 2007/03/16 04:01:42 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodOverrides.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.MethodOverrides"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodOverrides.#ctor(Spring.Objects.Factory.Support.MethodOverrides)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.MethodOverrides"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Deep copy constructoe.
+            </p>
+            </remarks>
+            <param name="other">
+            The instance supplying initial overrides for this new instance.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodOverrides.AddAll(Spring.Objects.Factory.Support.MethodOverrides)">
+            <summary>
+            Copy all given method overrides into this object.
+            </summary>
+            <param name="other">
+            The overrides to be copied into this object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodOverrides.Add(Spring.Objects.Factory.Support.MethodOverride)">
+            <summary>
+            Adds the supplied <paramref name="theOverride"/> to the overrides contained
+            within this instance.
+            </summary>
+            <param name="theOverride">
+            The <see cref="T:Spring.Objects.Factory.Support.MethodOverride"/> to be
+            added.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodOverrides.AddOverloadedMethodName(System.String)">
+            <summary>
+            Adds the supplied <paramref name="methodName"/> to the overloaded method names
+            contained within this instance.
+            </summary>
+            <param name="methodName">
+            The overloaded method name to be added.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodOverrides.IsOverloadedMethodName(System.String)">
+            <summary>
+            Returns true if the supplied <paramref name="methodName"/> is present within
+            the overloaded method names contained within this instance.
+            </summary>
+            <param name="methodName">
+            The overloaded method name to be checked.
+            </param>
+            <returns>
+            True if the supplied <paramref name="methodName"/> is present within
+            the overloaded method names contained within this instance.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodOverrides.GetOverride(System.Reflection.MethodInfo)">
+            <summary>
+            Return the override for the given method, if any.
+            </summary>
+            <param name="method">
+            The method to check for overrides for.
+            </param>
+            <returns>
+            the override for the given method, if any.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.MethodOverrides.GetEnumerator">
+            <summary>
+            Returns an <see cref="T:System.Collections.IEnumerator"/> that can iterate
+            through a collection.
+            </summary>
+            <remarks>
+            <p>
+            The returned <see cref="T:System.Collections.IEnumerator"/> is the
+            <see cref="T:System.Collections.IEnumerator"/> exposed by the
+            <see cref="P:Spring.Objects.Factory.Support.MethodOverrides.Overrides"/>
+            property.
+            </p>
+            </remarks>
+            <returns>
+            An <see cref="T:System.Collections.IEnumerator"/> that can iterate through a
+            collection.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.MethodOverrides.Overrides">
+            <summary>
+            The collection of method overrides.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.MethodOverrides.IsEmpty">
+            <summary>
+            Returns true if this instance contains no overrides.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.DefaultObjectDefinitionFactory">
+            <summary>
+            Default implementation of the
+            <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionFactory"/>
+            interface.
+            </summary>
+            <remarks>
+            <p>
+            Does <b>not</b> support per <see cref="T:System.AppDomain"/>
+            <see cref="T:System.Type"/> loading.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DefaultObjectDefinitionFactory.cs,v 1.13 2007/08/01 12:29:43 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.DefaultObjectDefinitionFactory.CreateObjectDefinition(System.String,System.String,System.AppDomain)">
+            <summary>
+            Factory style method for getting concrete
+            <see cref="T:Spring.Objects.Factory.Support.IConfigurableObjectDefinition"/>
+            instances.
+            </summary>
+            /// <remarks>If no parent is specified, a RootObjectDefinition is created, otherwise a 
+            ChildObjectDefinition.</remarks>
+            <param name="typeName">The <see cref="T:System.Type"/> of the defined object.</param>
+            <param name="parent">The name of the parent object definition (if any).</param>
+            <param name="domain">The <see cref="T:System.AppDomain"/> against which any class names
+            will be resolved into <see cref="T:System.Type"/> instances.</param>
+            <returns>
+            An
+            <see cref="T:Spring.Objects.Factory.Support.IConfigurableObjectDefinition"/>
+            instance.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.SetFactoryObject">
+            <summary>
+            Simple factory object for shared <see cref="T:Spring.Collections.ISet"/> instances.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: SetFactoryObject.cs,v 1.10 2007/07/31 03:47:39 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.SetFactoryObject.CreateInstance">
+            <summary>
+            Constructs a new instance of the target set.
+            </summary>
+            <returns>The new <see cref="T:Spring.Collections.ISet"/> instance.</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.SetFactoryObject.SourceSet">
+            <summary>
+            Set the source <see cref="T:Spring.Collections.ISet"/>.
+            </summary>
+            <remarks>
+            <p>
+            This value will be used to populate the <see cref="T:Spring.Collections.ISet"/>
+            returned by this factory.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.SetFactoryObject.TargetSetType">
+            <summary>
+            Set the <see cref="T:System.Type"/> of the <see cref="T:Spring.Collections.ISet"/>
+            implementation to use.
+            </summary>
+            <remarks>
+            <p>
+            The default is the <see cref="T:Spring.Collections.HybridSet"/> <see cref="T:System.Type"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.SetFactoryObject.ObjectType">
+            <summary>
+            The <see cref="T:System.Type"/> of objects created by this factory.
+            </summary>
+            <value>
+            Always returns the <see cref="T:Spring.Collections.ISet"/> <see cref="T:System.Type"/>.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.EnvironmentVariableMode">
+            <summary>
+            Specifies how instances of the
+            <see cref="T:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/>
+            class must apply environment variables when replacing values.
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: EnvironmentVariableMode.cs,v 1.6 2007/03/16 04:01:35 aseovic Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Config.EnvironmentVariableMode.Never">
+            <summary>
+            Never replace environment variables.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Config.EnvironmentVariableMode.Fallback">
+            <summary>
+            If properties are not specified via a resource, 
+            then resolve using environment variables.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Config.EnvironmentVariableMode.Override">
+            <summary>
+            Apply environment variables first before applying properties from a
+            resource.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Parsing.ReaderContext">
+            <summary>
+            Context that gets passed along an object definition reading process,
+            encapsulating all relevant configuraiton as well as state.
+            </summary>
+            <author>Rob Harrop</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ReaderContext.cs,v 1.3 2007/08/08 17:47:13 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Parsing.ReaderContext.#ctor(Spring.Core.IO.IResource)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Objects.Factory.Parsing.ReaderContext"/> class.
+            </summary>
+            <param name="resource">The resource.</param>
+        </member>
+        <member name="P:Spring.Objects.Factory.Parsing.ReaderContext.Resource">
+            <summary>
+            Gets the resource.
+            </summary>
+            <value>The resource.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.CommandLineArgsVariableSource">
+            <summary>
+            Implementation of <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/> that
+            resolves variable name against command line arguments.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CommandLineArgsVariableSource.cs,v 1.3 2007/08/02 22:18:32 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.CommandLineArgsVariableSource.#ctor">
+            <summary>
+            Default constructor. 
+            Initializes command line arguments from the environment.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.CommandLineArgsVariableSource.#ctor(System.String[])">
+            <summary>
+            Constructor that allows arguments to be passed externally.
+            Useful for testing.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.CommandLineArgsVariableSource.ResolveVariable(System.String)">
+            <summary>
+            Resolves variable value for the specified variable name.
+            </summary>
+            <param name="name">
+            The name of the variable to resolve.
+            </param>
+            <returns>
+            The variable value if able to resolve, <c>null</c> otherwise.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.CommandLineArgsVariableSource.InitArguments">
+            <summary>
+            Initializes command line arguments dictionary.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.CommandLineArgsVariableSource.ArgumentPrefix">
+            <summary>
+            Gets or sets a prefix that should be used to 
+            identify arguments to extract values from.
+            </summary>
+            <value>
+            A prefix that should be used to identify arguments 
+            to extract values from. Defaults to slash ("/").
+            </value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.CommandLineArgsVariableSource.ValueSeparator">
+            <summary>
+            Gets or sets a character that should be used to
+            separate argument name from its value.
+            </summary>
+            <value>
+            A character that should be used to separate argument 
+            name from its value. Defaults to colon (":").
+            </value>
+        </member>
+        <member name="T:Spring.Expressions.TypeNode">
+            <summary>
+            Represents parsed type node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: TypeNode.cs,v 1.11 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.TypeNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.TypeNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.TypeNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns node's value for the given context.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpEqual">
+            <summary>
+            Represents logical equality operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpEqual.cs,v 1.12 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpEqual.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpEqual.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpEqual.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the logical equality operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.UriConverter">
+            <summary>
+            Converter for <see cref="T:System.Uri"/> instances.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: UriConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.UriConverter.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.TypeConversion.UriConverter"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.UriConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Returns whether this converter can convert an object of one
+            <see cref="T:System.Type"/> to a <see cref="T:System.Uri"/>
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from a
+            <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns>True if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.UriConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Convert from a string value to a <see cref="T:System.Uri"/> instance.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture. 
+            </param>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <returns>
+            A <see cref="T:System.Uri"/> if successful. 
+            </returns>
+        </member>
+        <member name="T:Spring.Context.Events.ContextEventArgs">
+            <summary>
+            Event object sent to listeners registered with an
+            <see cref="T:Spring.Context.IApplicationContext"/> to inform them of
+            context lifecycle events.
+            </summary>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: ContextEventArgs.cs,v 1.8 2007/07/31 08:18:11 markpollack Exp $</version>
+            <seealso cref="T:Spring.Context.IApplicationContext"/>
+            <seealso cref="T:Spring.Context.IApplicationEventListener"/>
+            <seealso cref="T:Spring.Context.EventListenerAttribute"/>
+        </member>
+        <member name="M:Spring.Context.Events.ContextEventArgs.#ctor(Spring.Context.Events.ContextEventArgs.ContextEvent)">
+            <summary>
+            Creates a new instance of the ContextEventArgs class to represent the
+            supplied context event.
+            </summary>
+            <param name="e">The type of context event.</param>
+        </member>
+        <member name="M:Spring.Context.Events.ContextEventArgs.ToString">
+            <summary>
+            Returns a string representation of this object.
+            </summary>
+            <returns>A string representation of this object.</returns>
+        </member>
+        <member name="P:Spring.Context.Events.ContextEventArgs.Event">
+            <summary>
+            The event type.
+            </summary>
+        </member>
+        <member name="T:Spring.Context.Events.ContextEventArgs.ContextEvent">
+            <summary>
+            The various context event types.
+            </summary>
+        </member>
+        <member name="F:Spring.Context.Events.ContextEventArgs.ContextEvent.Refreshed">
+            <summary>
+            The event type when the context is refreshed or created.
+            </summary>
+        </member>
+        <member name="F:Spring.Context.Events.ContextEventArgs.ContextEvent.Closed">
+            <summary>
+            The event type when the context is closed.
+            </summary>
+        </member>
+        <member name="T:Spring.Collections.HashedSet">
+            <summary>
+            Implements an <see cref="T:Spring.Collections.ISet"/> based on a
+            hash table.
+            </summary>
+            <remarks>
+            <p>
+            This will give the best lookup, add, and remove performance for very
+            large data-sets, but iteration will occur in no particular order.
+            </p>
+            </remarks>
+            <seealso cref="T:Spring.Collections.ISet"/>
+            <version>$Id: HashedSet.cs,v 1.6 2007/03/16 04:01:27 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Collections.HashedSet.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Collections.HashedSet"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Collections.HashedSet.#ctor(System.Collections.ICollection)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Collections.HashedSet"/> class, and
+            initializes it based on a collection of elements.
+            </summary>
+            <param name="initialValues">
+            A collection of elements that defines the initial set contents.
+            </param>
+        </member>
+        <member name="T:Spring.Util.StringUtils">
+            <summary>
+            Miscellaneous <see cref="T:System.String"/> utility methods.
+            </summary>
+            <remarks>
+            <p>
+            Mainly for internal use within the framework.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Keith Donald</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: StringUtils.cs,v 1.29 2006/04/09 07:19:00 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Util.StringUtils.AntExpressionPrefix">
+            <summary>
+            The string that signals the start of an Ant-style expression.
+            </summary>
+        </member>
+        <member name="F:Spring.Util.StringUtils.AntExpressionSuffix">
+            <summary>
+            The string that signals the end of an Ant-style expression.
+            </summary>
+        </member>
+        <member name="F:Spring.Util.StringUtils.EmptyStrings">
+            <summary>
+            An empty array of <see cref="T:System.String"/> instances.
+            </summary>
+        </member>
+        <member name="M:Spring.Util.StringUtils.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Util.StringUtils"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Util.StringUtils.Split(System.String,System.String,System.Boolean,System.Boolean)">
+            <summary>
+            Tokenize the given <see cref="T:System.String"/> into a
+            <see cref="T:System.String"/> array.
+            </summary>
+            <remarks>
+            <p>
+            If <paramref name="s"/> is <see langword="null"/>, returns an empty
+            <see cref="T:System.String"/> array.
+            </p>
+            <p>
+            If <paramref name="delimiters"/> is <see langword="null"/> or the empty
+            <see cref="T:System.String"/>, returns a <see cref="T:System.String"/> array with one
+            element: <paramref name="s"/> itself.
+            </p>
+            </remarks>
+            <param name="s">The <see cref="T:System.String"/> to tokenize.</param>
+            <param name="delimiters">
+            The delimiter characters, assembled as a <see cref="T:System.String"/>.
+            </param>
+            <param name="trimTokens">
+            Trim the tokens via <see cref="M:System.String.Trim"/>.
+            </param>
+            <param name="ignoreEmptyTokens">
+            Omit empty tokens from the result array.</param>
+            <returns>An array of the tokens.</returns>
+        </member>
+        <member name="M:Spring.Util.StringUtils.CommaDelimitedListToStringArray(System.String)">
+            <summary>
+            Convert a CSV list into an array of <see cref="T:System.String"/>s.
+            </summary>
+            <param name="s">A CSV list.</param>
+            <returns>
+            An array of <see cref="T:System.String"/>s, or the empty array
+            if <paramref name="s"/> is <see langword="null"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.StringUtils.DelimitedListToStringArray(System.String,System.String)">
+            <summary>
+            Take a <see cref="T:System.String"/> which is a delimited list
+            and convert it to a <see cref="T:System.String"/> array.
+            </summary>
+            <remarks>
+            <p>
+            If the supplied <paramref name="delimiter"/> is a
+            <cref lang="null"/> or zero-length string, then a single element
+            <see cref="T:System.String"/> array composed of the supplied
+            <paramref name="input"/> <see cref="T:System.String"/> will be 
+            eturned. If the supplied <paramref name="input"/>
+            <see cref="T:System.String"/> is <cref lang="null"/>, then an empty,
+            zero-length <see cref="T:System.String"/> array will be returned.
+            </p>
+            </remarks>
+            <param name="input">
+            The <see cref="T:System.String"/> to be parsed.
+            </param>
+            <param name="delimiter">
+            The delimeter (this will not be returned). Note that only the first
+            character of the supplied <paramref name="delimiter"/> is used.
+            </param>
+            <returns>
+            An array of the tokens in the list.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.StringUtils.CollectionToDelimitedString(System.Collections.ICollection,System.String)">
+            <summary>
+            Convenience method to return an
+            <see cref="T:System.Collections.ICollection"/> as a delimited
+            (e.g. CSV) <see cref="T:System.String"/>.
+            </summary>
+            <param name="c">
+            The <see cref="T:System.Collections.ICollection"/> to parse.
+            </param>
+            <param name="delimiter">
+            The delimiter to use (probably a ',').
+            </param>
+            <returns>The delimited string representation.</returns>
+        </member>
+        <member name="M:Spring.Util.StringUtils.CollectionToCommaDelimitedString(System.Collections.ICollection)">
+            <summary>
+            Convenience method to return an
+            <see cref="T:System.Collections.ICollection"/> as a CSV
+            <see cref="T:System.String"/>.
+            </summary>
+            <param name="collection">
+            The <see cref="T:System.Collections.ICollection"/> to display.
+            </param>
+            <returns>The delimited string representation.</returns>
+        </member>
+        <member name="M:Spring.Util.StringUtils.ArrayToCommaDelimitedString(System.Object[])">
+            <summary>
+            Convenience method to return an array as a CSV
+            <see cref="T:System.String"/>.
+            </summary>
+            <param name="source">
+            The array to parse. Elements may be of any type (
+            <see cref="M:System.Object.ToString"/> will be called on each
+            element).
+            </param>
+        </member>
+        <member name="M:Spring.Util.StringUtils.ArrayToDelimitedString(System.Object[],System.String)">
+            <summary>
+            Convenience method to return a <see cref="T:System.String"/>
+            array as a delimited (e.g. CSV) <see cref="T:System.String"/>.
+            </summary>
+            <param name="source">
+            The array to parse. Elements may be of any type (
+            <see cref="M:System.Object.ToString"/> will be called on each
+            element).
+            </param>
+            <param name="delimiter">
+            The delimiter to use (probably a ',').
+            </param>
+        </member>
+        <member name="M:Spring.Util.StringUtils.HasLength(System.String)">
+            <summary>Checks if a string has length.</summary>
+            <param name="target">
+            The string to check, may be <see langword="null"/>.
+            </param>
+            <returns>
+            <see langword="true"/> if the string has length and is not
+            <see langword="null"/>.
+            </returns>
+            <example>
+            <code lang="C#">
+            StringUtils.HasLength(null) = false
+            StringUtils.HasLength("") = false
+            StringUtils.HasLength(" ") = true
+            StringUtils.HasLength("Hello") = true
+            </code>
+            </example>
+        </member>
+        <member name="M:Spring.Util.StringUtils.HasText(System.String)">
+            <summary>
+            Checks if a <see cref="T:System.String"/> has text.
+            </summary>
+            <remarks>
+            <p>
+            More specifically, returns <see langword="true"/> if the string is
+            not <see langword="null"/>, it's <see cref="P:System.String.Length"/> is &gt;
+            zero <c>(0)</c>, and it has at least one non-whitespace character.
+            </p>
+            </remarks>
+            <param name="target">
+            The string to check, may be <see langword="null"/>.
+            </param>
+            <returns>
+            <see langword="true"/> if the <paramref name="target"/> is not
+            <see langword="null"/>,
+            <see cref="P:System.String.Length"/> &gt; zero <c>(0)</c>, and does not consist
+            solely of whitespace.
+            </returns>
+            <example>
+            <code language="C#">
+            StringUtils.HasText(null) = false
+            StringUtils.HasText("") = false
+            StringUtils.HasText(" ") = false
+            StringUtils.HasText("12345") = true
+            StringUtils.HasText(" 12345 ") = true
+            </code>
+            </example>
+        </member>
+        <member name="M:Spring.Util.StringUtils.IsNullOrEmpty(System.String)">
+            <summary>
+            Checks if a <see cref="T:System.String"/> is <see langword="null"/>
+            or an empty string.
+            </summary>
+            <remarks>
+            <p>
+            More specifically, returns <see langword="false"/> if the string is
+            <see langword="null"/>, it's <see cref="P:System.String.Length"/> is equal
+            to zero <c>(0)</c>, or it is composed entirely of whitespace
+            characters.
+            </p>
+            </remarks>
+            <param name="target">
+            The string to check, may (obviously) be <see langword="null"/>.
+            </param>
+            <returns>
+            <see langword="true"/> if the <paramref name="target"/> is
+            <see langword="null"/>, has a length equal to zero <c>(0)</c>, or
+            is composed entirely of whitespace characters.
+            </returns>
+            <example>
+            <code language="C#">
+            StringUtils.IsNullOrEmpty(null) = true
+            StringUtils.IsNullOrEmpty("") = true
+            StringUtils.IsNullOrEmpty(" ") = true
+            StringUtils.IsNullOrEmpty("12345") = false
+            StringUtils.IsNullOrEmpty(" 12345 ") = false
+            </code>
+            </example>
+        </member>
+        <member name="M:Spring.Util.StringUtils.StripFirstAndLastCharacter(System.String)">
+            <summary>
+            Strips first and last character off the string.
+            </summary>
+            <param name="text">The string to strip.</param>
+            <returns>The stripped string.</returns>
+        </member>
+        <member name="M:Spring.Util.StringUtils.GetAntExpressions(System.String)">
+            <summary>
+            Returns a list of Ant-style expressions from the specified text.
+            </summary>
+            <param name="text">The text to inspect.</param>
+            <returns>
+            A list of expressions that exist in the specified text.
+            </returns>
+            <exception cref="T:System.FormatException">
+            If any of the expressions in the supplied <paramref name="text"/>
+            is empty (<c>${}</c>).
+            </exception>
+        </member>
+        <member name="M:Spring.Util.StringUtils.SetAntExpression(System.String,System.String,System.Object)">
+            <summary>
+            Replaces Ant-style expression placeholder with expression value.
+            </summary>
+            <remarks>
+            <p>
+            
+            </p>
+            </remarks>
+            <param name="text">The string to set the value in.</param>
+            <param name="expression">The name of the expression to set.</param>
+            <param name="expValue">The expression value.</param>
+            <returns>
+            A new string with the expression value set; the
+            <see cref="F:System.String.Empty"/> value if the supplied
+            <paramref name="text"/> is <see langword="null"/>, has a length
+            equal to zero <c>(0)</c>, or is composed entirely of whitespace
+            characters.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.StringUtils.Surround(System.Object,System.Object)">
+            <summary>
+            Surrounds (prepends and appends) the string value of the supplied
+            <paramref name="fix"/> to the supplied <paramref name="target"/>.
+            </summary>
+            <remarks>
+            <p>
+            The return value of this method call is always guaranteed to be non
+            <see langword="null"/>. If every value passed as a parameter to this method is
+            <see langword="null"/>, the <see cref="F:System.String.Empty"/> string will be returned.
+            </p>
+            </remarks>
+            <param name="fix">
+            The pre<b>fix</b> and suf<b>fix</b> that respectively will be prepended and
+            appended to the target <paramref name="target"/>. If this value
+            is not a <see cref="T:System.String"/> value, it's attendant
+            <see cref="M:System.Object.ToString"/> value will be used.
+            </param>
+            <param name="target">
+            The target that is to be surrounded. If this value is not a
+            <see cref="T:System.String"/> value, it's attendant
+            <see cref="M:System.Object.ToString"/> value will be used.
+            </param>
+            <returns>The surrounded string.</returns>
+        </member>
+        <member name="M:Spring.Util.StringUtils.Surround(System.Object,System.Object,System.Object)">
+            <summary>
+            Surrounds (prepends and appends) the string values of the supplied
+            <paramref name="prefix"/> and <paramref name="suffix"/> to the supplied
+            <paramref name="target"/>.
+            </summary>
+            <remarks>
+            <p>
+            The return value of this method call is always guaranteed to be non
+            <see langword="null"/>. If every value passed as a parameter to this method is
+            <see langword="null"/>, the <see cref="F:System.String.Empty"/> string will be returned.
+            </p>
+            </remarks>
+            <param name="prefix">
+            The value that will be prepended to the <paramref name="target"/>. If this value
+            is not a <see cref="T:System.String"/> value, it's attendant
+            <see cref="M:System.Object.ToString"/> value will be used.
+            </param>
+            <param name="target">
+            The target that is to be surrounded. If this value is not a
+            <see cref="T:System.String"/> value, it's attendant
+            <see cref="M:System.Object.ToString"/> value will be used.
+            </param>
+            <param name="suffix">
+            The value that will be appended to the <paramref name="target"/>. If this value
+            is not a <see cref="T:System.String"/> value, it's attendant
+            <see cref="M:System.Object.ToString"/> value will be used.
+            </param>
+            <returns>The surrounded string.</returns>
+        </member>
+        <member name="M:Spring.Util.StringUtils.ConvertEscapedCharacters(System.String)">
+            <summary>
+            Converts escaped characters (for example "\t") within a string
+            to their real character.
+            </summary>
+            <param name="inputString">The string to convert.</param>
+            <returns>The converted string.</returns>
+        </member>
+        <member name="T:Spring.Util.PathMatcher">
+            <summary>
+            Support matching of file system paths in a manner similar to that of the
+            <see href="http://nant.sourceforge.net">NAnt</see> <c>FileSet</c>.
+            </summary>
+            <remarks>
+            <p>
+            Any (back)slashes are converted to forward slashes.
+            </p>
+            </remarks>
+            <example>
+            <code>
+            // true
+            PathMatcher.Match("c:/*.bat", @"c:\autoexec.bat");
+            PathMatcher.Match("c:\fo*\*.bat", @"c:/foobar/autoexec.bat");
+            PathMatcher.Match("c:\fo?\*.bat", @"c:/foo/autoexec.bat");
+            // false
+            PathMatcher.Match("c:\fo?\*.bat", @"c:/fo/autoexec.bat");
+            </code>
+            </example>
+            <author>Federico Spinazzi</author>
+            <version>$Id: PathMatcher.cs,v 1.7 2007/02/23 18:46:41 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Util.PathMatcher.Match(System.String,System.String,System.Boolean)">
+            <summary>
+            Determines if a given path matches a <c>NAnt</c>-like pattern.
+            </summary>
+            <param name="pattern">
+            A forward or back-slashed fileset-like pattern.
+            </param>
+            <param name="path">A forward or back-slashed full path.</param>
+            <param name="ignoreCase">should the match consider the case</param>
+            <returns>
+            <see langword="true"/> if the path is matched by the pattern;
+            otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.PathMatcher.Match(System.String,System.String)">
+            <summary>
+            Determines if a given path matches a <c>NAnt</c>-like pattern.
+            </summary>
+            <param name="pattern">
+            A forward or back-slashed fileset-like pattern.
+            </param>
+            <param name="path">A forward or back-slashed full path.</param>
+            <returns>
+            <see langword="true"/> if the path is matched by the pattern;
+            otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.PathMatcher.ForwardifySlashes(System.String)">
+            <summary>
+            Replaces back(slashes) with forward slashes.
+            </summary>
+            <param name="path">
+            The path or the pattern to modify.
+            </param>
+            <returns>A forward-slashed string.</returns>
+        </member>
+        <member name="M:Spring.Util.PathMatcher.BuildRegex(System.String)">
+            <summary>
+            Helper method to convert a <c>NAnt</c>-like pattern into the
+            appropriate pattern for a regular expression.
+            </summary>
+            <param name="pattern">The <c>NAnt</c>-like pattern.</param>
+            <returns>A regex-compatible pattern.</returns>
+        </member>
+        <member name="M:Spring.Util.PathMatcher.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Util.PathMatcher"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Util.ObjectUtils">
+            <summary>
+            Helper methods with regard to objects, types, properties, etc.
+            </summary>
+            <remarks>
+            <p>
+            Not intended to be used directly by applications.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: ObjectUtils.cs,v 1.9 2007/12/29 00:31:00 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Util.ObjectUtils.EmptyObjects">
+            <summary>
+            An empty object array.
+            </summary>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Util.ObjectUtils"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.InstantiateType(System.Reflection.Assembly,System.String)">
+            <summary>
+            Instantiates the type using the assembly specified to load the type.
+            </summary>
+            <remarks>This is a convenience in the case of needing to instantiate a type but not
+            wanting to specify in the string the version, culture and public key token.</remarks>
+            <param name="assembly">The assembly.</param>
+            <param name="typeName">Name of the type.</param>
+            <returns></returns>
+            <exception cref="T:System.ArgumentNullException"> 
+            If the <paramref name="assembly"/> or <paramref name="typeName"/> is <see langword="null"/>
+            </exception>
+            <exception cref="T:Spring.Util.FatalReflectionException">
+            If cannot load the type from the assembly or the call to <code>InstantiateType(Type)</code> fails.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.InstantiateType(System.Type)">
+            <summary>
+            Convenience method to instantiate a <see cref="T:System.Type"/> using
+            its no-arg constructor.
+            </summary>
+            <remarks>
+            <p>
+            As this method doesn't try to instantiate <see cref="T:System.Type"/>s
+            by name, it should avoid <see cref="T:System.Type"/> loading issues.
+            </p>
+            </remarks>
+            <param name="type">
+            The <see cref="T:System.Type"/> to instantiate*
+            </param>
+            <returns>A new instance of the <see cref="T:System.Type"/>.</returns>
+            <exception cref="T:System.ArgumentNullException"> 
+            If the <paramref name="type"/> is <see langword="null"/>
+            </exception>
+            <exception cref="T:Spring.Util.FatalReflectionException">
+            If the <paramref name="type"/> is an abstract class, an interface, 
+            an open generic type or does not have a public no-argument constructor.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.GetZeroArgConstructorInfo(System.Type)">
+            <summary>
+            Gets the zero arg ConstructorInfo object, if the type offers such functionality.
+            </summary>
+            <param name="type">The type.</param>
+            <returns>Zero argument ConstructorInfo</returns>
+            <exception cref="T:Spring.Util.FatalReflectionException">
+            If the type is an interface, abstract, open generic type, or does not have a zero-arg constructor.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.IsInstantiable(System.Type)">
+            <summary>
+            Determines whether the specified type is instantiable, i.e. not an interface, abstract class or contains
+            open generic type parameters.
+            </summary>
+            <param name="type">The type.</param>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.InstantiateType(System.Reflection.ConstructorInfo,System.Object[])">
+            <summary>
+            Convenience method to instantiate a <see cref="T:System.Type"/> using
+            the given constructor.
+            </summary>
+            <remarks>
+            <p>
+            As this method doesn't try to instantiate <see cref="T:System.Type"/>s
+            by name, it should avoid <see cref="T:System.Type"/> loading issues.
+            </p>
+            </remarks>
+            <param name="constructor">
+            The constructor to use for the instantiation.
+            </param>
+            <param name="arguments">
+            The arguments to be passed to the constructor.
+            </param>
+            <returns>A new instance.</returns>
+            <exception cref="T:System.ArgumentNullException"> 
+            If the <paramref name="constructor"/> is <see langword="null"/>
+            </exception>
+            <exception cref="T:Spring.Util.FatalReflectionException">
+            If the <paramref name="constructor"/>'s declaring type is an abstract class, 
+            an interface, an open generic type or does not have a public no-argument constructor.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.IsAssignableAndNotTransparentProxy(System.Type,System.Object)">
+            <summary>
+            Checks whether the supplied <paramref name="instance"/> is not a transparent proxy and is
+            assignable to the supplied <paramref name="type"/>. 
+            </summary>
+            <remarks>
+            <p>
+            Neccessary when dealing with server-activated remote objects, because the
+            object is of the type TransparentProxy and regular <c>is</c> testing for assignable
+            types does not work.
+            </p>
+            <p>
+            Transparent proxy instances always return <see langword="true"/> when tested
+            with the <c>'is'</c> operator (C#). This method only checks if the object
+            is assignable to the type if it is not a transparent proxy.
+            </p>
+            </remarks>
+            <param name="type">The target <see cref="T:System.Type"/> to be checked.</param>
+            <param name="instance">The value that should be assigned to the type.</param>
+            <returns>
+            <see langword="true"/> if the supplied <paramref name="instance"/> is not a
+            transparent proxy and is assignable to the supplied <paramref name="type"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.IsAssignable(System.Type,System.Object)">
+            <summary>
+            Determine if the given <see cref="T:System.Type"/> is assignable from the
+            given value, assuming setting by reflection.
+            </summary>
+            <remarks>
+            <p>
+            Considers primitive wrapper classes as assignable to the
+            corresponding primitive types.
+            </p>
+            <p>
+            For example used in an object factory's constructor resolution.
+            </p>
+            </remarks>
+            <param name="type">The target <see cref="T:System.Type"/>.</param>
+            <param name="obj">The value that should be assigned to the type.</param>
+            <returns>True if the type is assignable from the value.</returns>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.IsSimpleProperty(System.Type)">
+            <summary>
+            Check if the given <see cref="T:System.Type"/> represents a
+            "simple" property,
+            i.e. a primitive, a <see cref="T:System.String"/>, a
+            <see cref="T:System.Type"/>, or a corresponding array.
+            </summary>
+            <remarks>
+            <p>
+            Used to determine properties to check for a "simple" dependency-check.
+            </p>
+            </remarks>
+            <param name="type">
+            The <see cref="T:System.Type"/> to check.
+            </param>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.IsPrimitiveArray(System.Type)">
+            <summary>
+            Check if the given class represents a primitive array,
+            i.e. boolean, byte, char, short, int, long, float, or double.
+            </summary>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.NullSafeEquals(System.Object,System.Object)">
+            <summary>
+            Determine if the given objects are equal, returning <see langword="true"/>
+            if both are <see langword="null"/> respectively <see langword="false"/>
+            if only one is <see langword="null"/>.
+            </summary>
+            <param name="o1">The first object to compare.</param>
+            <param name="o2">The second object to compare.</param>
+            <returns>
+            <see langword="true"/> if the given objects are equal.
+            </returns>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.EnumerateFirstElement(System.Collections.IEnumerator)">
+            <summary>
+            Returns the first element in the supplied <paramref name="enumerator"/>.
+            </summary>
+            <param name="enumerator">
+            The <see cref="T:System.Collections.IEnumerator"/> to use to enumerate
+            elements.
+            </param>
+            <returns>
+            The first element in the supplied <paramref name="enumerator"/>.
+            </returns>
+            <exception cref="T:System.IndexOutOfRangeException">
+            If the supplied <paramref name="enumerator"/> did not have any elements.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.EnumerateFirstElement(System.Collections.IEnumerable)">
+            <summary>
+            Returns the first element in the supplied <paramref name="enumerable"/>.
+            </summary>
+            <param name="enumerable">
+            The <see cref="T:System.Collections.IEnumerable"/> to use to enumerate
+            elements.
+            </param>
+            <returns>
+            The first element in the supplied <paramref name="enumerable"/>.
+            </returns>
+            <exception cref="T:System.IndexOutOfRangeException">
+            If the supplied <paramref name="enumerable"/> did not have any elements.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="enumerable"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.EnumerateElementAtIndex(System.Collections.IEnumerator,System.Int32)">
+            <summary>
+            Returns the element at the specified index using the supplied
+            <paramref name="enumerator"/>.
+            </summary>
+            <param name="enumerator">
+            The <see cref="T:System.Collections.IEnumerator"/> to use to enumerate
+            elements until the supplied <paramref name="index"/> is reached.
+            </param>
+            <param name="index">
+            The index of the element in the enumeration to return.
+            </param>
+            <returns>
+            The element at the specified index using the supplied
+            <paramref name="enumerator"/>.
+            </returns>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            If the supplied <paramref name="index"/> was less than zero, or the
+            supplied <paramref name="enumerator"/> did not contain enough elements
+            to be able to reach the supplied <paramref name="index"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.EnumerateElementAtIndex(System.Collections.IEnumerable,System.Int32)">
+            <summary>
+            Returns the element at the specified index using the supplied
+            <paramref name="enumerable"/>.
+            </summary>
+            <param name="enumerable">
+            The <see cref="T:System.Collections.IEnumerable"/> to use to enumerate
+            elements until the supplied <paramref name="index"/> is reached.
+            </param>
+            <param name="index">
+            The index of the element in the enumeration to return.
+            </param>
+            <returns>
+            The element at the specified index using the supplied
+            <paramref name="enumerable"/>.
+            </returns>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            If the supplied <paramref name="index"/> was less than zero, or the
+            supplied <paramref name="enumerable"/> did not contain enough elements
+            to be able to reach the supplied <paramref name="index"/>.
+            </exception>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="enumerable"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.ObjectUtils.GetQualifiedMethodName(System.Reflection.MethodInfo)">
+            <summary>
+            Gets the qualified name of the given method, consisting of 
+            fully qualified interface/class name + "." method name.
+            </summary>
+            <param name="method">The method.</param>
+            <returns>qualified name of the method.</returns>
+        </member>
+        <member name="T:Spring.Util.AssertUtils">
+            <summary>
+            Assertion utility methods that simplify things such as argument checks.
+            </summary>
+            <remarks>
+            <p>
+            Not intended to be used directly by applications.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AssertUtils.cs,v 1.13 2008/03/14 10:45:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Util.AssertUtils.ArgumentNotNull(System.Object,System.String)">
+            <summary>
+            Checks the value of the supplied <paramref name="argument"/> and throws an
+            <see cref="T:System.ArgumentNullException"/> if it is <see langword="null"/>.
+            </summary>
+            <param name="argument">The object to check.</param>
+            <param name="name">The argument name.</param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="argument"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.AssertUtils.ArgumentNotNull(System.Object,System.String,System.String)">
+            <summary>
+            Checks the value of the supplied <paramref name="argument"/> and throws an
+            <see cref="T:System.ArgumentNullException"/> if it is <see langword="null"/>.
+            </summary>
+            <param name="argument">The object to check.</param>
+            <param name="name">The argument name.</param>
+            <param name="message">
+            An arbitrary message that will be passed to any thrown
+            <see cref="T:System.ArgumentNullException"/>.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="argument"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.AssertUtils.ArgumentHasText(System.String,System.String)">
+            <summary>
+            Checks the value of the supplied string <paramref name="argument"/> and throws an
+            <see cref="T:System.ArgumentNullException"/> if it is <see langword="null"/> or
+            contains only whitespace character(s).
+            </summary>
+            <param name="argument">The string to check.</param>
+            <param name="name">The argument name.</param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="argument"/> is <see langword="null"/> or
+            contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Util.AssertUtils.ArgumentHasText(System.String,System.String,System.String)">
+            <summary>
+            Checks the value of the supplied string <paramref name="argument"/> and throws an
+            <see cref="T:System.ArgumentNullException"/> if it is <see langword="null"/> or
+            contains only whitespace character(s).
+            </summary>
+            <param name="argument">The string to check.</param>
+            <param name="name">The argument name.</param>
+            <param name="message">
+            An arbitrary message that will be passed to any thrown
+            <see cref="T:System.ArgumentNullException"/>.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="argument"/> is <see langword="null"/> or
+            contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Util.AssertUtils.ArgumentHasLength(System.Collections.ICollection,System.String)">
+            <summary>
+            Checks the value of the supplied <see cref="T:System.Collections.ICollection"/> <paramref name="argument"/> and throws
+            an <see cref="T:System.ArgumentNullException"/> if it is <see langword="null"/> or contains no elements.
+            </summary>
+            <param name="argument">The array or collection to check.</param>
+            <param name="name">The argument name.</param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="argument"/> is <see langword="null"/> or
+            contains no elements.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.AssertUtils.ArgumentHasLength(System.Collections.ICollection,System.String,System.String)">
+            <summary>
+            Checks the value of the supplied <see cref="T:System.Collections.ICollection"/> <paramref name="argument"/> and throws
+            an <see cref="T:System.ArgumentNullException"/> if it is <see langword="null"/> or contains no elements.
+            </summary>
+            <param name="argument">The array or collection to check.</param>
+            <param name="name">The argument name.</param>
+            <param name="message">An arbitrary message that will be passed to any thrown <see cref="T:System.ArgumentNullException"/>.</param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="argument"/> is <see langword="null"/> or
+            contains no elements.
+            </exception>
+        </member>
+        <member name="M:Spring.Util.AssertUtils.AssertArgumentType(System.Object,System.String,System.Type,System.String)">
+            <summary>
+            Checks whether the specified <paramref name="argument"/> can be cast 
+            into the <paramref name="requiredType"/>.
+            </summary>
+            <param name="argument">
+            The argument to check.
+            </param>
+            <param name="argumentName">
+            The name of the argument to check.
+            </param>
+            <param name="requiredType">
+            The required type for the argument.
+            </param>
+            <param name="message">
+            An arbitrary message that will be passed to any thrown
+            <see cref="T:System.ArgumentException"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Util.AssertUtils.State(System.Boolean,System.String)">
+            <summary>
+            Assert a bool expression, throwing <code>InvalidOperationException</code>
+            if the expression is <code>false</code>.
+            </summary>
+            <param name="expression">a boolean expression.</param>
+            <param name="message">The exception message to use if the assertion fails</param>
+            <exception cref="T:System.InvalidOperationException">if expression is <code>false</code></exception>
+        </member>
+        <member name="M:Spring.Util.AssertUtils.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Util.AssertUtils"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Proxy.BaseProxyMethodBuilder">
+            <summary>
+            Implementation of IProxyMethodBuilder that delegates method calls to the base class.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: BaseProxyMethodBuilder.cs,v 1.1 2006/08/10 18:45:55 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Proxy.BaseProxyMethodBuilder.#ctor(System.Reflection.Emit.TypeBuilder,Spring.Proxy.IProxyTypeGenerator,System.Boolean)">
+            <summary>
+            Creates a new instance of the method builder.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="proxyGenerator">
+            The <see cref="T:Spring.Proxy.IProxyTypeGenerator"/> implementation to use.
+            </param>
+            <param name="explicitImplementation">
+            <see langword="true"/> if the interface is to be
+            implemented explicitly; otherwise <see langword="false"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Proxy.BaseProxyMethodBuilder.GenerateMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Generates the proxy method.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+            <param name="interfaceMethod">
+            The interface definition of the method, if applicable.
+            </param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.ManagedDictionary">
+            <summary>
+            Tag subclass used to hold a dictionary of managed elements.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: ManagedDictionary.cs,v 1.14 2007/11/26 14:15:54 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ManagedDictionary.Resolve(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.Support.ManagedCollectionElementResolver)">
+            <summary>
+            Resolves this managed collection at runtime.
+            </summary>
+            <param name="objectName">
+            The name of the top level object that is having the value of one of it's
+            collection properties resolved.
+            </param>
+            <param name="definition">
+            The definition of the named top level object.
+            </param>
+            <param name="propertyName">
+            The name of the property the value of which is being resolved.
+            </param>
+            <param name="resolver">
+            The callback that will actually do the donkey work of resolving
+            this managed collection.
+            </param>
+            <returns>A fully resolved collection.</returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.ManagedDictionary.KeyTypeName">
+            <summary>
+            Gets or sets the unresolved name for the <see cref="T:System.Type"/> 
+            of the keys of this managed dictionary.
+            </summary>
+            <value>The unresolved name for the type of the keys of this managed dictionary.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.ManagedDictionary.ValueTypeName">
+            <summary>
+            Gets or sets the unresolved name for the <see cref="T:System.Type"/> 
+            of the values of this managed dictionary.
+            </summary>
+            <value>The unresolved name for the type of the values of this managed dictionary.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.ChildObjectDefinition">
+            <summary>
+            Object definition for definitions that inherit settings from their
+            parent (object definition).
+            </summary>
+            <remarks>
+            <p>
+            Will use the <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.ObjectType"/>
+            of the parent object definition if none is specified, but can also
+            override it. In the latter case, the child's
+            <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.ObjectType"/>
+            must be compatible with the parent, i.e. accept the parent's property values
+            and constructor argument values (if any).
+            </p>
+            <p>
+            A <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/> will
+            inherit all of the <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>,
+            <see cref="T:Spring.Objects.IPropertyValues"/>, and
+            <see cref="T:Spring.Objects.Factory.Config.EventValues"/> from it's parent
+            object definition, with the option to add new values. If the
+            <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.InitMethodName"/>,
+            <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.DestroyMethodName"/>,
+            and / or <see langword="static"/>
+            <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.FactoryMethodName"/>
+            properties are specified, they will override the corresponding parent settings.
+            </p>
+            <p>
+            The remaining settings will <i>always</i> be taken from the child definition:
+            <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.DependsOn"/>,
+            <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.AutowireMode"/>,
+            <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.DependencyCheck"/>,
+            <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.IsSingleton"/>,
+            and
+            <see cref="P:Spring.Objects.Factory.Support.AbstractObjectDefinition.IsLazyInit"/>
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <seealso cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ChildObjectDefinition.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+            class.
+            </summary>
+            <param name="parentName">
+            The name of the parent object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ChildObjectDefinition.#ctor(System.String,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+            class.
+            </summary>
+            <param name="parentName">
+            The name of the parent object.
+            </param>
+            <param name="properties">
+            The additional property values (if any) of the child.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ChildObjectDefinition.#ctor(System.String,Spring.Objects.Factory.Config.ConstructorArgumentValues,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+            class.
+            </summary>
+            <param name="parentName">
+            The name of the parent object.
+            </param>
+            <param name="arguments">
+            The <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            to be applied to a new instance of the object.
+            </param>
+            <param name="properties">
+            The additional property values (if any) of the child.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ChildObjectDefinition.#ctor(System.String,System.Type,Spring.Objects.Factory.Config.ConstructorArgumentValues,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+            class.
+            </summary>
+            <param name="parentName">
+            The name of the parent object.
+            </param>
+            <param name="type">
+            The class of the object to instantiate.
+            </param>
+            <param name="arguments">
+            The <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            to be applied to a new instance of the object.
+            </param>
+            <param name="properties">
+            The additional property values (if any) of the child.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ChildObjectDefinition.#ctor(System.String,System.String,Spring.Objects.Factory.Config.ConstructorArgumentValues,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/>
+            class.
+            </summary>
+            <param name="parentName">
+            The name of the parent object.
+            </param>
+            <param name="typeName">
+            The <see cref="P:System.Type.AssemblyQualifiedName"/> of the object to
+            instantiate.
+            </param>
+            <param name="arguments">
+            The <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            to be applied to a new instance of the object.
+            </param>
+            <param name="properties">
+            The additional property values (if any) of the child.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ChildObjectDefinition.Validate">
+            <summary>
+            Validate this object definition.
+            </summary>
+            <remarks>
+            <p>
+            A common cause of validation failures is a missing value for the
+            <see cref="P:Spring.Objects.Factory.Support.ChildObjectDefinition.ParentName"/>
+            property; <see cref="T:Spring.Objects.Factory.Support.ChildObjectDefinition"/> by
+            their very nature <b>require</b> that the
+            <see cref="P:Spring.Objects.Factory.Support.ChildObjectDefinition.ParentName"/>
+            be set.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Objects.Factory.Support.ObjectDefinitionValidationException">
+            In the case of a validation failure.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ChildObjectDefinition.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.ChildObjectDefinition.ParentName">
+            <summary>
+            The name of the parent object definition.
+            </summary>
+            <remarks>
+            <p>
+            This value is <b>required</b>.
+            </p>
+            </remarks>
+            <value>
+            The name of the parent object definition.
+            </value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.XmlReaderContext">
+            <summary>
+            Extension of <see cref="T:Spring.Objects.Factory.Parsing.ReaderContext"/> specific to use with an 
+            XmlObjectDefinitionReader.
+            </summary>
+            <remarks>In future will contain access to IXmlParserRegistry</remarks>
+            <version>$Id: XmlReaderContext.cs,v 1.6 2007/08/27 13:57:43 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Xml.XmlReaderContext.MaxXmlErrorFragmentLength">
+            <summary>
+            The maximum length of any XML fragment displayed in the error message
+            reporting.
+            </summary>
+            <remarks>
+            <p>
+            Hopefully this will display enough context so that a user
+            can pinpoint the cause of the error.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlReaderContext.#ctor(Spring.Core.IO.IResource,Spring.Objects.Factory.Support.IObjectDefinitionReader)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Objects.Factory.Xml.XmlReaderContext"/> class.
+            </summary>
+            <param name="resource">The resource.</param>
+            <param name="reader">The reader.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlReaderContext.GenerateObjectName(Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Generates the name of the object.
+            </summary>
+            <param name="objectDefinition">The object definition.</param>
+            <returns>the generated object name</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlReaderContext.RegisterWithGeneratedName(Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Registers the name of the with generated.
+            </summary>
+            <param name="objectDefinition">The object definition.</param>
+            <returns>the generated object name</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlReaderContext.ReportException(System.Xml.XmlNode,System.String,System.String)">
+            <summary>
+            Reports a parse error by loading a
+            <see cref="T:Spring.Objects.ObjectsException"/> with helpful contextual
+            information and throwing said exception.
+            </summary>
+            <remarks>
+            <p>
+            Derived classes can of course override this method in order to implement
+            validators capable of displaying a full list of errors found in the
+            definition.
+            </p>
+            </remarks>
+            <param name="node">
+            The node that triggered the parse error.
+            </param>
+            <param name="name">
+            The name of the object that triggered the exception.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            <b>Always</b> throws an instance of this exception class, that will
+            contain helpful contextual infomation about the parse error.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.Xml.XmlReaderContext.ReportException(System.Xml.XmlNode,System.String,System.String,System.Exception)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlReaderContext.ReportException(System.Xml.XmlNode,System.String,System.String,System.Exception)">
+            <summary>
+            Reports a parse error by loading a
+            <see cref="T:Spring.Objects.ObjectsException"/> with helpful contextual
+            information and throwing said exception.
+            </summary>
+            <remarks>
+            <p>
+            Derived classes can of course override this method in order to implement
+            validators capable of displaying a full list of errors found in the
+            definition.
+            </p>
+            </remarks>
+            <param name="node">
+            The node that triggered the parse error.
+            </param>
+            <param name="name">
+            The name of the object that triggered the exception.
+            </param>
+            <param name="message">
+            A message about the error.
+            </param>
+            <param name="cause">
+            The root cause of the parse error (if any - may be <see langword="null"/>).
+            </param>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            <b>Always</b> throws an instance of this exception class, that will
+            contain helpful contextual infomation about the parse error.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.XmlReaderContext.ReportFatalException(System.Xml.XmlNode,System.String)">
+            <summary>
+            This method can be overwritten in order to implement validators
+            capable of displaying a full list of errors found in the definition.
+            </summary>
+            <param name="node">
+            The node that triggered the parse error.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.XmlReaderContext.Reader">
+            <summary>
+            Gets the reader.
+            </summary>
+            <value>The reader.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.XmlReaderContext.ResourceLoader">
+            <summary>
+            Gets the resource loader.
+            </summary>
+            <value>The resource loader.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.XmlReaderContext.Registry">
+            <summary>
+            Gets the registry.
+            </summary>
+            <value>The registry.</value>
+        </member>
+        <member name="P:Spring.Objects.Factory.Xml.XmlReaderContext.ObjectDefinitionFactory">
+            <summary>
+            Gets or sets the object definition factory.
+            </summary>
+            <value>The object definition factory.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.AbstractSimpleObjectDefinitionParser">
+             <summary>
+             Convenient base class for when there exists a one-to-one mapping
+             between attribute names on the element that is to be parsed and
+             the property names on the Type being configured. 
+             </summary>
+             <remarks>
+            
+             </remarks>
+             <author>Mark Pollack</author>
+             <version>$Id: AbstractSimpleObjectDefinitionParser.cs,v 1.1 2007/05/26 19:25:54 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.ConnectionStringsVariableSource">
+            <summary>
+            Implementation of <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/> that
+            resolves variable name connection strings defined in
+            the standard .NET configuration file.
+            </summary>
+            <remarks>
+            <p>
+            When the &lt;connectionStrings&gt; configuration section is processed by this class,
+            two variables are defined for each connection string: one for connection string and
+            the second one for the provider name.</p>
+            <p>
+            Variable names are generated by appending '.connectionString' and '.providerName'
+            literals to the value of the <c>name</c> attribute of the connection string element.
+            For example:</p>
+            <pre>
+            <connectionStrings>
+               <add name="myConn" connectionString="..." providerName="..."/>
+            </connectionStrings>
+            </pre>
+            <p>
+            will result in two variables being created: <b>myConn.connectionString</b> and <b>myConn.providerName</b>.
+            You can reference these variables within your object definitions, just like any other variable.</p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ConnectionStringsVariableSource.cs,v 1.4 2007/08/02 22:18:32 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConnectionStringsVariableSource.ResolveVariable(System.String)">
+            <summary>
+            Resolves variable value for the specified variable name.
+            </summary>
+            <param name="name">
+            The name of the variable to resolve.
+            </param>
+            <returns>
+            The variable value if able to resolve, <c>null</c> otherwise.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ConnectionStringsVariableSource.InitVariables">
+            <summary>
+            Initializes properties based on the specified 
+            property file locations.
+            </summary>
+        </member>
+        <member name="T:Spring.Globalization.Resource">
+            <summary>
+            Holds mapping between control property and it's value 
+            as read from the resource file.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: Resource.cs,v 1.3 2006/04/09 07:18:47 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.Resource.#ctor(Spring.Expressions.IExpression,System.Object)">
+            <summary>
+            Creates instance of resource mapper.
+            </summary>
+            <param name="target">Target property.</param>
+            <param name="resourceValue">Resource value.</param>
+        </member>
+        <member name="P:Spring.Globalization.Resource.Target">
+            <summary>
+            Gets parsed target property expression. See <see cref="T:Spring.Expressions.IExpression"/>
+            for more information on object navigation expressions.
+            </summary>
+        </member>
+        <member name="P:Spring.Globalization.Resource.Value">
+            <summary>
+            Value of the resource that target property should be set to.
+            </summary>
+        </member>
+        <member name="T:Spring.Context.Support.ReferenceNode">
+            <summary>
+            Represents a reference to a Spring-managed object.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ReferenceNode.cs,v 1.13 2008/03/20 10:35:54 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Context.Support.ReferenceNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.ReferenceNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.ReferenceNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the integer literal node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.OpMODULUS">
+            <summary>
+            Represents arithmetic modulus operator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: OpMODULUS.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.OpMODULUS.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpMODULUS.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.OpMODULUS.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the arithmetic modulus operator node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.DateLiteralNode">
+            <summary>
+            Represents parsed node in the navigation expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DateLiteralNode.cs,v 1.7 2007/09/07 03:01:21 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.DateLiteralNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.DateLiteralNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.DateLiteralNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns node's value for the given context.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.Processors.CountAggregator">
+            <summary>
+            Implementation of the count aggregator.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CountAggregator.cs,v 1.2 2006/12/04 08:58:33 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.Processors.CountAggregator.Process(System.Collections.ICollection,System.Object[])">
+            <summary>
+            Returns the number of items in the source collection.
+            </summary>
+            <param name="source">
+            The source collection to process.
+            </param>
+            <param name="args">
+            Ignored.
+            </param>
+            <returns>
+            The number of items in the source collection, 
+            or zero if the collection is empty or <c>null</c>.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.TypeResolution.GenericArgumentsHolder">
+            <summary>
+            Holder for the generic arguments when using type parameters.
+            </summary>
+            <remarks>
+            <p>
+            Type parameters can be applied to classes, interfaces, 
+            structures, methods, delegates, etc...
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.GenericArgumentsHolder.GenericArgumentsPrefix">
+            <summary>
+            The generic arguments prefix.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.GenericArgumentsHolder.GenericArgumentsSuffix">
+            <summary>
+            The generic arguments suffix.
+            </summary>
+        </member>
+        <member name="F:Spring.Core.TypeResolution.GenericArgumentsHolder.GenericArgumentsSeparator">
+            <summary>
+            The character that separates a list of generic arguments.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.GenericArgumentsHolder.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the GenericArgumentsHolder class.
+            </summary>
+            <param name="value">
+            The string value to parse looking for a generic definition
+            and retrieving its generic arguments.
+            </param>
+        </member>
+        <member name="M:Spring.Core.TypeResolution.GenericArgumentsHolder.GetGenericArguments">
+            <summary>
+            Returns an array of unresolved generic arguments types.
+            </summary>
+            <remarks>
+            <p>
+            A empty string represents a type parameter that 
+            did not have been substituted by a specific type.
+            </p>
+            </remarks>
+            <returns>
+            An array of strings that represents the unresolved generic 
+            arguments types or an empty array if not generic.
+            </returns>
+        </member>
+        <member name="P:Spring.Core.TypeResolution.GenericArgumentsHolder.GenericTypeName">
+            <summary>
+            The (unresolved) generic type name portion 
+            of the original value when parsing a generic type.
+            </summary>
+        </member>
+        <member name="P:Spring.Core.TypeResolution.GenericArgumentsHolder.GenericMethodName">
+            <summary>
+            The (unresolved) generic method name portion 
+            of the original value when parsing a generic method.
+            </summary>
+        </member>
+        <member name="P:Spring.Core.TypeResolution.GenericArgumentsHolder.ContainsGenericArguments">
+            <summary>
+            Is the string value contains generic arguments ?
+            </summary>
+            <remarks>
+            <p>
+            A generic argument can be a type parameter or a type argument.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Core.TypeResolution.GenericArgumentsHolder.IsGenericDefinition">
+            <summary>
+            Is generic arguments only contains type parameters ?
+            </summary>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.TimeSpanConverter">
+            <summary>
+            Converter for <see cref="T:System.TimeSpan"/> instances.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: TimeSpanConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.TimeSpanConverter.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.TypeConversion.TimeSpanConverter"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.TimeSpanConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Convert from a string value to a <see cref="T:System.TimeSpan"/> instance.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture. 
+            </param>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <returns>
+            A <see cref="T:System.TimeSpan"/> if successful. 
+            </returns>
+        </member>
+        <member name="T:Spring.Core.TypeConversion.RuntimeTypeConverter">
+            <summary>
+            A custom <see cref="T:System.ComponentModel.TypeConverter"/> for
+            runtime type references.
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion to and from a
+            <see cref="T:System.String"/>.
+            </p>
+            </remarks>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: RuntimeTypeConverter.cs,v 1.1 2007/07/31 18:16:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.RuntimeTypeConverter.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.TypeConversion.RuntimeTypeConverter"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.RuntimeTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Returns whether this converter can convert an object of one
+            <see cref="T:System.Type"/> to the <see cref="T:System.Type"/>
+            of this converter.
+            </summary>
+            <remarks>
+            <p>
+            Currently only supports conversion from a
+            <see cref="T:System.String"/> instance.
+            </p>
+            </remarks>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="sourceType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert from.
+            </param>
+            <returns>True if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.RuntimeTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Returns whether this converter can convert the object to the specified
+            <see cref="T:System.Type"/>.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="destinationType">
+            A <see cref="T:System.Type"/> that represents the
+            <see cref="T:System.Type"/> you want to convert to.
+            </param>
+            <returns>True if the conversion is possible.</returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.RuntimeTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Converts the given value to the type of this converter.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture. 
+            </param>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <returns>
+            An <see cref="T:System.Object"/> that represents the converted value.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.TypeConversion.RuntimeTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)">
+            <summary>
+            Converts the given value object to the specified type,
+            using the specified context and culture information.
+            </summary>
+            <param name="context">
+            A <see cref="T:System.ComponentModel.ITypeDescriptorContext"/>
+            that provides a format context.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> to use
+            as the current culture. 
+            </param>
+            <param name="value">
+            The value that is to be converted.
+            </param>
+            <param name="destinationType">
+            The <see cref="T:System.Type"/> to convert the
+            <paramref name="value"/> parameter to.
+            </param>
+            <returns>
+            An <see cref="T:System.Object"/> that represents the converted value.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.NullValueInNestedPathException">
+            <summary>
+            Thrown in response to encountering a <see langword="null"/> value
+            when traversing a nested path expression.
+            </summary>
+            <version>$Id: NullValueInNestedPathException.cs,v 1.2 2007/07/31 03:47:22 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Core.NullValueInNestedPathException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.NullValueInNestedPathException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.NullValueInNestedPathException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.NullValueInNestedPathException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Core.NullValueInNestedPathException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.NullValueInNestedPathException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Core.NullValueInNestedPathException.#ctor(System.Type,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.NullValueInNestedPathException"/> class.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> of the object where the property was not found.
+            </param>
+            <param name="theProperty">The name of the property not found.</param>
+        </member>
+        <member name="M:Spring.Core.NullValueInNestedPathException.#ctor(System.Type,System.String,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.NullValueInNestedPathException"/> class.
+            </summary>
+            <param name="type">
+            The <see cref="T:System.Type"/> of the object where the property was not found.
+            </param>
+            <param name="theProperty">The name of the property not found.</param>
+            <param name="message">A message about the exception.</param>
+        </member>
+        <member name="M:Spring.Core.NullValueInNestedPathException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.NullValueInNestedPathException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Core.NullValueInNestedPathException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"/> with
+            the data needed to serialize the target object.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> to populate
+            with data.
+            </param>
+            <param name="context">
+            The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"/>)
+            for this serialization.
+            </param>
+        </member>
+        <member name="P:Spring.Core.NullValueInNestedPathException.PropertyName">
+            <summary>
+            The name of the offending property.
+            </summary>
+        </member>
+        <member name="P:Spring.Core.NullValueInNestedPathException.ObjectType">
+            <summary>
+            The <see cref="T:System.Type"/> of the class where the property was last looked for.
+            </summary>
+        </member>
+        <member name="T:Spring.Core.MethodParametersCountCriteria">
+            <summary>
+            Criteria that is satisfied if the number of parameters to a given
+            <see cref="T:System.Reflection.MethodBase"/> matches an arbitrary number.
+            </summary>
+            <remarks>
+            <p>
+            This class supports checking the parameter count of both methods and
+            constructors.
+            </p>
+            <p>
+            Default parameters, etc need to taken into account.
+            </p>
+            </remarks>
+            <author>Rick Evans</author>
+            <version>$Id: MethodParametersCountCriteria.cs,v 1.2 2007/09/20 14:20:45 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Core.MethodParametersCountCriteria.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.MethodParametersCountCriteria"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This constructor sets the
+            <see cref="P:Spring.Core.MethodParametersCountCriteria.ExpectedParameterCount"/>
+            property to zero (0).
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Core.MethodParametersCountCriteria.#ctor(System.Int32)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.MethodParametersCountCriteria"/> class.
+            </summary>
+            <param name="expectedParameterCount">
+            The number of parameters that a <see cref="T:System.Reflection.MethodInfo"/>
+            must have to satisfy this criteria.
+            </param>
+            <exception cref="T:System.ArgumentException">
+            If the supplied <paramref name="expectedParameterCount"/> is less
+            than zero.
+            </exception>
+        </member>
+        <member name="M:Spring.Core.MethodParametersCountCriteria.IsSatisfied(System.Object)">
+            <summary>
+            Does the supplied <paramref name="datum"/> satisfy the criteria encapsulated by
+            this instance?
+            </summary>
+            <param name="datum">The datum to be checked by this criteria instance.</param>
+            <returns>
+            True if the supplied <paramref name="datum"/> satisfies the criteria encapsulated
+            by this instance; false if not or the supplied <paramref name="datum"/> is null.
+            </returns>
+        </member>
+        <member name="P:Spring.Core.MethodParametersCountCriteria.ExpectedParameterCount">
+            <summary>
+            The number of parameters that a <see cref="T:System.Reflection.MethodInfo"/>
+            must have to satisfy this criteria.
+            </summary>
+            <exception cref="T:System.ArgumentException">
+            If the supplied value is less than zero.
+            </exception>
+        </member>
+        <member name="T:Spring.Context.Support.XmlApplicationContext">
+            <summary>
+            An <see cref="T:Spring.Context.IApplicationContext"/> implementation that
+            reads context definitions from XML based resources.
+            </summary>
+            <remarks>
+            <p>
+            Currently, the resources that are supported are the <c>file</c>,
+            <c>http</c>, <c>ftp</c>, <c>config</c> and <c>assembly</c> resource
+            types.
+            </p>
+            <p>
+            You can provide custom implementations of the
+            <see cref="T:Spring.Core.IO.IResource"/> interface and and register them
+            with any <see cref="T:Spring.Context.IApplicationContext"/> that inherits
+            from the
+            <see cref="T:Spring.Context.Support.AbstractApplicationContext"/>
+            interface.
+            </p>
+            <note>
+            In case of multiple config locations, later object definitions will
+            override ones defined in previously loaded resources. This can be
+            leveraged to deliberately override certain object definitions via an
+            extra XML file.
+            </note>
+            </remarks>
+            <example>
+            <p>
+            Find below some examples of instantiating an
+            <see cref="T:Spring.Context.Support.XmlApplicationContext"/> using a
+            variety of different XML resources.
+            </p>
+            <code language="C#">
+            // an XmlApplicationContext that reads its object definitions from an
+            //    XML file that has been embedded in an assembly...
+            IApplicationContext context = new XmlApplicationContext
+            	(
+            		"assembly://AssemblyName/NameSpace/ResourceName"
+            	);
+            	
+            // an XmlApplicationContext that reads its object definitions from a
+            //    number of disparate XML resources...
+            IApplicationContext context = new XmlApplicationContext
+            	(
+            		// from an XML file that has been embedded in an assembly...
+            		"assembly://AssemblyName/NameSpace/ResourceName",
+            		// and from a (relative) filesystem-based resource...
+            		"file://Objects/services.xml",
+            		// and from an App.config / Web.config resource...
+            		"config://spring/objects"
+            	);
+            </code>
+            </example>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: XmlApplicationContext.cs,v 1.18 2007/08/08 17:46:37 bbaia Exp $</version>
+            <seealso cref="T:Spring.Core.IO.IResource"/>
+            <seealso cref="T:Spring.Core.IO.IResourceLoader"/>
+            <seealso cref="T:Spring.Core.IO.ConfigurableResourceLoader"/>
+        </member>
+        <member name="M:Spring.Context.Support.XmlApplicationContext.#ctor(System.String[])">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.XmlApplicationContext"/> class,
+            loading the definitions from the supplied XML resource locations.
+            </summary>
+            <remarks>The created context will be case sensitive.</remarks>
+            <param name="configurationLocations">
+            Any number of XML based object definition resource locations.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.XmlApplicationContext.#ctor(System.Boolean,System.String[])">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.XmlApplicationContext"/> class,
+            loading the definitions from the supplied XML resource locations.
+            </summary>
+            <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+            <param name="configurationLocations">
+            Any number of XML based object definition resource locations.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.XmlApplicationContext.#ctor(System.String,System.Boolean,System.String[])">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.XmlApplicationContext"/> class,
+            loading the definitions from the supplied XML resource locations.
+            </summary>
+            <param name="name">The application context name.</param>
+            <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+            <param name="configurationLocations">
+            Any number of XML based object definition resource locations.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.XmlApplicationContext.#ctor(Spring.Context.IApplicationContext,System.String[])">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.XmlApplicationContext"/> class,
+            loading the definitions from the supplied XML resource locations,
+            with the given <paramref name="parentContext"/>.
+            </summary>
+            <param name="parentContext">
+            The parent context (may be <see langword="null"/>).
+            </param>
+            <param name="configurationLocations">
+            Any number of XML based object definition resource locations.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.XmlApplicationContext.#ctor(System.Boolean,Spring.Context.IApplicationContext,System.String[])">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.XmlApplicationContext"/> class,
+            loading the definitions from the supplied XML resource locations,
+            with the given <paramref name="parentContext"/>.
+            </summary>
+            <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+            <param name="parentContext">
+            The parent context (may be <see langword="null"/>).
+            </param>
+            <param name="configurationLocations">
+            Any number of XML based object definition resource locations.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.XmlApplicationContext.#ctor(System.String,System.Boolean,Spring.Context.IApplicationContext,System.String[])">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.XmlApplicationContext"/> class,
+            loading the definitions from the supplied XML resource locations,
+            with the given <paramref name="parentContext"/>.
+            </summary>
+            <param name="name">The application context name.</param>
+            <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+            <param name="parentContext">
+            The parent context (may be <see langword="null"/>).
+            </param>
+            <param name="configurationLocations">
+            Any number of XML based object definition resource locations.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.XmlApplicationContext.#ctor(System.Boolean,System.String,System.Boolean,Spring.Context.IApplicationContext,System.String[])">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.XmlApplicationContext"/> class,
+            loading the definitions from the supplied XML resource locations,
+            with the given <paramref name="parentContext"/>.
+            </summary>
+            <remarks>
+            This constructor is meant to be used by derived classes. By passing <paramref name="refresh"/>=false, it is
+            the responsibility of the deriving class to call <see cref="M:Spring.Context.Support.AbstractApplicationContext.Refresh"/> to initialize the context instance.
+            </remarks>
+            <param name="refresh">if true, <see cref="M:Spring.Context.Support.AbstractApplicationContext.Refresh"/> is called automatically.</param>
+            <param name="name">The application context name.</param>
+            <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+            <param name="parentContext">
+            The parent context (may be <see langword="null"/>).
+            </param>
+            <param name="configurationLocations">
+            Any number of XML based object definition resource locations.
+            </param>
+        </member>
+        <member name="P:Spring.Context.Support.XmlApplicationContext.ConfigurationLocations">
+            <summary>
+            An array of resource locations, referring to the XML object
+            definition files that this context is to be built with.
+            </summary>
+            <returns>
+            An array of resource locations, or <see langword="null"/> if none.
+            </returns>
+            <seealso cref="P:Spring.Context.Support.AbstractXmlApplicationContext.ConfigurationLocations"/>
+        </member>
+        <member name="T:Spring.Context.Support.NullMessageSource">
+            <summary>
+            An <see cref="T:Spring.Context.IMessageSource"/> that doesn't do a whole lot.
+            </summary>
+            <remarks>
+            <p>
+            <see cref="T:Spring.Context.Support.NullMessageSource"/> is an implementation of
+            the <c>NullObject</c> pattern. It should be used in those situations where a
+            <see cref="T:Spring.Context.IMessageSource"/> needs to be passed (say to a
+            method) but where the resolution of messages is not required.
+            </p>
+            <p>
+            There should not (typically) be a need to instantiate instances of this class;
+            <see cref="T:Spring.Context.Support.NullMessageSource"/> does not maintan any state
+            and the <see cref="F:Spring.Context.Support.NullMessageSource.Null"/> instance is
+            thus safe to pass around. 
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: NullMessageSource.cs,v 1.5 2007/08/27 09:38:29 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Context.Support.NullMessageSource.Null">
+            <summary>
+            The canonical instance of the
+            <see cref="T:Spring.Context.Support.NullMessageSource"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.NullMessageSource.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Context.Support.NullMessageSource"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Consider using <see cref="F:Spring.Context.Support.NullMessageSource.Null"/>
+            instead.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.NullMessageSource.ResolveMessage(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Simply returns the supplied message <paramref name="code"/> as-is.
+            </summary>
+            <param name="code">The code of the message to resolve.</param>
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to resolve the
+            code for.
+            </param>
+            <returns>
+            The supplied message <paramref name="code"/> as-is.
+            </returns>
+        </member>
+        <member name="M:Spring.Context.Support.NullMessageSource.ResolveObject(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Always returns <see lang="null"/>.
+            </summary>
+            <param name="code">The code of the object to resolve.</param>
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> to resolve the
+            code for.
+            </param>
+            <returns>
+            <see lang="null"/> (always).
+            </returns>
+        </member>
+        <member name="M:Spring.Context.Support.NullMessageSource.ApplyResourcesToObject(System.Object,System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Does nothing.
+            </summary>
+            <param name="value">
+            An object that contains the property values to be applied.
+            </param>
+            <param name="objectName">
+            The base name of the object to use for key lookup.
+            </param>
+            <param name="cultureInfo">
+            The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.
+            </param>
+        </member>
+        <member name="T:Spring.Context.Support.DefaultMessageSourceResolvable">
+            <summary>
+            Default implementation of the
+            <see cref="T:Spring.Context.IMessageSourceResolvable"/> interface.
+            </summary>
+            <remarks>
+            <p>
+            Provides easy ways to store all the necessary values needed to resolve
+            messages from an <see cref="T:Spring.Context.IMessageSource"/>.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: DefaultMessageSourceResolvable.cs,v 1.4 2007/07/02 21:24:39 markpollack Exp $</version>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(Spring.Context.IMessageSourceResolvable,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.DefaultMessageSourceResolvable.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.DefaultMessageSourceResolvable"/> class
+            using a single code.
+            </summary>
+            <param name="code">The message code to be resolved.</param>
+        </member>
+        <member name="M:Spring.Context.Support.DefaultMessageSourceResolvable.#ctor(System.String[])">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Context.Support.DefaultMessageSourceResolvable"/> class.
+            </summary>
+            <param name="codes">The codes to be used to resolve this message</param>
+        </member>
+        <member name="M:Spring.Context.Support.DefaultMessageSourceResolvable.#ctor(System.String[],System.Object[])">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.DefaultMessageSourceResolvable"/> class
+            using multiple codes.
+            </summary>
+            <param name="codes">The message codes to be resolved.</param>
+            <param name="arguments">
+            The arguments used to resolve the supplied <paramref name="codes"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.DefaultMessageSourceResolvable.#ctor(System.String[],System.Object[],System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.DefaultMessageSourceResolvable"/> class
+            using multiple codes and a default message.
+            </summary>
+            <param name="codes">The message codes to be resolved.</param>
+            <param name="arguments">
+            The arguments used to resolve the supplied <paramref name="codes"/>.
+            </param>
+            <param name="defaultMessage">
+            The default message used if no code could be resolved.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.DefaultMessageSourceResolvable.#ctor(Spring.Context.IMessageSourceResolvable)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.DefaultMessageSourceResolvable"/> class
+            from another resolvable.
+            </summary>
+            <remarks>
+            <p>
+            This is the <i>copy constructor</i> for the
+            <see cref="T:Spring.Context.Support.DefaultMessageSourceResolvable"/> class.
+            </p>
+            </remarks>
+            <param name="resolvable">
+            The <see cref="T:Spring.Context.IMessageSourceResolvable"/> to be copied.
+            </param>
+            <exception cref="T:System.NullReferenceException">
+            If the supplied <paramref name="resolvable"/> is <see langword="null"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Context.Support.DefaultMessageSourceResolvable.ToString">
+            <summary>
+            Returns a <see cref="T:System.String"/> representation of this
+            <see cref="T:Spring.Context.IMessageSourceResolvable"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> representation of this
+            <see cref="T:Spring.Context.IMessageSourceResolvable"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Context.Support.DefaultMessageSourceResolvable.Accept(Spring.Context.Support.MessageSourceResolvableVisitor)">
+            <summary>
+            Calls the visit method on the supplied <paramref name="visitor"/>
+            to output a <see cref="T:System.String"/> version of this class.
+            </summary>
+            <param name="visitor">The visitor to use.</param>
+            <returns>
+            A <see cref="T:System.String"/> representation of this
+            <see cref="T:Spring.Context.IMessageSourceResolvable"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Context.Support.DefaultMessageSourceResolvable.GetCodes">
+            <summary>
+            Return the codes to be used to resolve this message, in the order
+            that they are to be tried.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> array of codes which are associated
+            with this message.
+            </returns>
+            <seealso cref="M:Spring.Context.IMessageSourceResolvable.GetCodes"/>
+        </member>
+        <member name="M:Spring.Context.Support.DefaultMessageSourceResolvable.GetArguments">
+            <summary>
+            Return the array of arguments to be used to resolve this message.
+            </summary>
+            <returns>
+            An array of objects to be used as parameters to replace
+            placeholders within the message text.
+            </returns>
+            <seealso cref="M:Spring.Context.IMessageSourceResolvable.GetArguments"/>
+        </member>
+        <member name="P:Spring.Context.Support.DefaultMessageSourceResolvable.LastCode">
+            <summary>
+            Return the default code for this resolvable.
+            </summary>
+            <returns>
+            The default code of this resolvable; this will be the last code in
+            the codes array, or <see langword="null"/> if this instance has no
+            codes.
+            </returns>
+            <seealso cref="M:Spring.Context.Support.DefaultMessageSourceResolvable.GetCodes"/>
+        </member>
+        <member name="P:Spring.Context.Support.DefaultMessageSourceResolvable.DefaultMessage">
+            <summary>
+            Return the default message to be used to resolve this message.
+            </summary>
+            <returns>
+            The default message, or <see langword="null"/> if there is no
+            default.
+            </returns>
+            <seealso cref="P:Spring.Context.IMessageSourceResolvable.DefaultMessage"/>
+        </member>
+        <member name="T:Spring.Validation.RegularExpressionValidator">
+            <summary>
+            Validates that object matches specified regular expression.
+            </summary>
+            <remarks>
+            <p>
+            The test expression must evaluate to a <see cref="T:System.String"/>;
+            otherwise, an exception is thrown.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: RegularExpressionValidator.cs,v 1.2 2006/04/09 07:19:04 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Validation.RegularExpressionValidator.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Validation.RegularExpressionValidator"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Validation.RegularExpressionValidator.#ctor(System.String,System.String,System.String)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Validation.RegularExpressionValidator"/> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+            <param name="expression">The regular expression to match against.</param>
+        </member>
+        <member name="M:Spring.Validation.RegularExpressionValidator.#ctor(Spring.Expressions.IExpression,Spring.Expressions.IExpression,System.String)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Validation.RegularExpressionValidator"/> class.
+            </summary>
+            <param name="test">The expression to validate.</param>
+            <param name="when">The expression that determines if this validator should be evaluated.</param>
+            <param name="expression">The regular expression to match against.</param>
+        </member>
+        <member name="M:Spring.Validation.RegularExpressionValidator.Validate(System.Object)">
+            <summary>
+            Validates an object.
+            </summary>
+            <param name="objectToValidate">Object to validate.</param>
+            <returns>
+            <see lang="true"/> if the supplied <paramref name="objectToValidate"/>
+            object is valid.
+            </returns>
+            <exception cref="T:System.ArgumentException">
+            If the supplied <paramref name="objectToValidate"/> is not a
+            <see cref="T:System.String"/>
+            </exception>
+        </member>
+        <member name="P:Spring.Validation.RegularExpressionValidator.Expression">
+            <summary>
+            The regular expression <b>text</b> to match against.
+            </summary>
+            <value>The regular expression <b>text</b>.</value>
+        </member>
+        <member name="P:Spring.Validation.RegularExpressionValidator.Options">
+            <summary>
+            The <see cref="T:System.Text.RegularExpressions.RegexOptions"/> for the regular expression evaluation.
+            </summary>
+            <value>The regular expression evaluation options.</value>
+            <seealso cref="T:System.Text.RegularExpressions.RegexOptions"/> 
+        </member>
+        <member name="T:Spring.Validation.ValidatedAttribute">
+            <summary>
+            Allows developers to specify which validator should be used
+            to validate method argument.
+            </summary>
+            <author>Damjan Tomic</author>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ValidatedAttribute.cs,v 1.1 2008/04/02 23:02:36 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Validation.ValidatedAttribute.#ctor(System.String)">
+            <summary>
+            Creates an attribute instance.
+            </summary>
+            <param name="validatorName">
+            The name of the validator to use (must be defined within
+            Spring application context).
+            </param>
+        </member>
+        <member name="P:Spring.Validation.ValidatedAttribute.ValidatorName">
+            <summary>
+            Gets the name of the validator to use.
+            </summary>
+            <value>The name of the validator to use.</value>
+        </member>
+        <member name="T:Spring.Util.Properties">
+            <summary>
+            An implementation of the Java Properties class.
+            </summary>
+            <author>Simon White</author>
+            <version>$Id: Properties.cs,v 1.16 2007/07/31 18:16:26 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Util.Properties.#ctor">
+            <summary>
+            Creates an empty property list with no default values.
+            </summary>
+        </member>
+        <member name="M:Spring.Util.Properties.#ctor(Spring.Util.Properties)">
+            <summary>
+            Creates a property list with the specified initial properties.
+            </summary>
+            <param name="p">The initial properties.</param>
+        </member>
+        <member name="M:Spring.Util.Properties.Load(System.IO.Stream)">
+            <summary>
+            Reads a property list (key and element pairs) from the input stream.
+            </summary>
+            <param name="stream">The stream to load from.</param>
+        </member>
+        <member name="M:Spring.Util.Properties.Load(System.IO.TextReader)">
+            <summary>
+            Reads a property list (key and element pairs) from a text reader.
+            </summary>
+            <param name="textReader">The text reader to load from.</param>
+        </member>
+        <member name="M:Spring.Util.Properties.Load(System.Collections.IDictionary,System.IO.Stream)">
+            <summary>
+            Reads a property list (key and element pairs) from the input stream.
+            </summary>
+            <param name="dictionary">the dictionary to put it in</param>
+            <param name="stream">The stream to load from.</param>
+        </member>
+        <member name="M:Spring.Util.Properties.Load(System.Collections.IDictionary,System.IO.TextReader)">
+            <summary>
+            Reads a property list (key and element pairs) from a text reader.
+            </summary>
+            <param name="dictionary">the dictionary to put it in</param>
+            <param name="textReader">The text reader to load from.</param>
+        </member>
+        <member name="M:Spring.Util.Properties.RemoveLeadingWhitespace(System.String)">
+            <summary>
+            Strips whitespace from the front of the specified string.
+            </summary>
+            <param name="line">The string.</param>
+            <returns>The string with all leading whitespace removed.</returns>
+        </member>
+        <member name="M:Spring.Util.Properties.SplitLine(System.String)">
+            <summary>
+            Splits the specified string into a key / value pair.
+            </summary>
+            <param name="line">The line to split.</param>
+            <returns>An array containing the key / value pair.</returns>
+        </member>
+        <member name="M:Spring.Util.Properties.GetProperty(System.String)">
+            <summary>
+            Searches for the property with the specified key in this property list.
+            </summary>
+            <param name="key">The key.</param>
+            <returns>The property, or null if the key was not found.</returns>
+        </member>
+        <member name="M:Spring.Util.Properties.GetProperty(System.String,System.String)">
+            <summary>
+            Searches for the property with the specified key in this property list.
+            </summary>
+            <param name="key">The key.</param>
+            <param name="def">
+            The default value to be returned if the key is not found.
+            </param>
+            <returns>The property, or the default value.</returns>
+        </member>
+        <member name="M:Spring.Util.Properties.List(System.IO.Stream)">
+            <summary>
+            Writes this property list out to the specified stream.
+            </summary>
+            <param name="stream">The stream to write to.</param>
+        </member>
+        <member name="M:Spring.Util.Properties.SetProperty(System.String,System.String)">
+            <summary>
+            Sets the specified property key / value pair.
+            </summary>
+            <param name="key">The key.</param>
+            <param name="theValue">The value.</param>
+        </member>
+        <member name="M:Spring.Util.Properties.Store(System.IO.Stream,System.String)">
+            <summary>
+            Writes the properties in this instance out to the supplied stream.
+            </summary>
+            <param name="stream">The stream to write to.</param>
+            <param name="header">Arbitrary header information.</param>
+        </member>
+        <member name="M:Spring.Util.Properties.Remove(System.Object)">
+            <summary>
+            Removes the key / value pair identified by the supplied key.
+            </summary>
+            <param name="key">
+            The key identifying the key / value pair to be removed.
+            </param>
+        </member>
+        <member name="M:Spring.Util.Properties.Add(System.Object,System.Object)">
+            <summary>
+            Adds the specified key / object pair to this collection.
+            </summary>
+            <param name="key">The key.</param>
+            <param name="value">The value.</param>
+        </member>
+        <member name="P:Spring.Util.Properties.Item(System.Object)">
+            <summary>
+            Adds the specified key / object pair to this collection.
+            </summary>
+        </member>
+        <member name="T:Spring.Util.CollectionUtils">
+            <summary>
+            Miscellaneous collection utility methods.
+            </summary>
+            <remarks>
+            Mainly for internal use within the framework.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: CollectionUtils.cs,v 1.9 2006/04/09 07:19:00 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Util.CollectionUtils.HasUniqueObject(System.Collections.ICollection)">
+            <summary>
+            Determine whether a given collection only contains
+            a single unique object
+            </summary>
+            <param name="coll"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Util.CollectionUtils.Contains(System.Collections.ICollection,System.Object)">
+            <summary>
+            Determines whether the <paramref name="collection"/> contains the specified <paramref name="element"/>.
+            </summary>
+            <param name="collection">The collection to check.</param>
+            <param name="element">The object to locate in the collection.</param>
+            <returns><see lang="true"/> if the element is in the collection, <see lang="false"/> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Util.CollectionUtils.Add(System.Collections.ICollection,System.Object)">
+            <summary>
+            Adds the specified <paramref name="element"/> to the specified <paramref name="collection"/> .
+            </summary>
+            <param name="collection">The collection to add the element to.</param>
+            <param name="element">The object to add to the collection.</param>
+        </member>
+        <member name="M:Spring.Util.CollectionUtils.ContainsAll(System.Collections.ICollection,System.Collections.ICollection)">
+            <summary>
+            Determines whether the collection contains all the elements in the specified collection.
+            </summary>
+            <param name="targetCollection">The collection to check.</param>
+            <param name="sourceCollection">Collection whose elements would be checked for containment.</param>
+            <returns>true if the target collection contains all the elements of the specified collection.</returns>
+        </member>
+        <member name="M:Spring.Util.CollectionUtils.RemoveAll(System.Collections.ICollection,System.Collections.ICollection)">
+            <summary>
+            Removes all the elements from the target collection that are contained in the source collection.
+            </summary>
+            <param name="targetCollection">Collection where the elements will be removed.</param>
+            <param name="sourceCollection">Elements to remove from the target collection.</param>
+        </member>
+        <member name="M:Spring.Util.CollectionUtils.ToArrayList(System.Collections.ICollection)">
+            <summary>
+            Converts an <see cref="T:System.Collections.ICollection"/>instance to an <see cref="T:System.Collections.ArrayList"/> instance.
+            </summary>
+            <param name="inputCollection">The <see cref="T:System.Collections.ICollection"/> instance to be converted.</param>
+            <returns>An <see cref="T:System.Collections.ArrayList"/> instance in which its elements are the elements of the <see cref="T:System.Collections.ICollection"/> instance.</returns>
+            <exception cref="T:System.ArgumentNullException">if the <paramref name="inputCollection"/> is null.</exception>
+        </member>
+        <member name="T:Spring.Objects.PropertyValue">
+            <summary>
+            Holds information and value for an individual property.
+            </summary>
+            <remarks>
+            <p>
+            Using an object here, rather than just storing all properties in a
+            map keyed by property name, allows for more flexibility, and the
+            ability to handle indexed properties in a special way if necessary.
+            </p>
+            <p>
+            Note that the value doesn't need to be the final required
+            <see cref="T:System.Type"/>: an
+            <see cref="T:Spring.Objects.IObjectWrapper"/> implementation must
+            handle any necessary conversion, as this object doesn't know anything
+            about the objects it will be applied to.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: PropertyValue.cs,v 1.15 2007/07/31 00:08:42 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.PropertyValue.#ctor(System.String,System.Object)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.PropertyValue"/> class.
+            </summary>
+            <param name="name">The name of the property.</param>
+            <param name="val">
+            The value of the property (possibly before type conversion).
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> is <see langword="null"/> or
+            contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.PropertyValue.#ctor(System.String,System.Object,Spring.Expressions.IExpression)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.PropertyValue"/> class.
+            </summary>
+            <param name="name">The name of the property.</param>
+            <param name="val">
+            The value of the property (possibly before type conversion).
+            </param>
+            <param name="expression">Pre-parsed property name.</param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="name"/> or <paramref name="name"/> 
+            is <see langword="null"/>, or if the name contains only whitespace characters.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.PropertyValue.ToString">
+            <summary>
+            Print a string representation of the property.
+            </summary>
+            <returns>A string representation of the property.</returns>
+        </member>
+        <member name="M:Spring.Objects.PropertyValue.Equals(System.Object)">
+            <summary>
+            Determines whether the supplied <see cref="T:System.Object"/>
+            is equal to the current <see cref="T:Spring.Objects.PropertyValue"/>.  
+            </summary>
+            <param name="other">The other instance.</param>
+            <returns>
+            <see langword="true"/> if they are equal in content.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.PropertyValue.GetHashCode">
+            <summary>
+            Serves as a hash function for a particular type, suitable for use
+            in hashing algorithms and data structures like a hash table. 
+            </summary>
+            <returns>
+            A hash code for the current <see cref="T:Spring.Objects.PropertyValue"/>.  
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.PropertyValue.Name">
+            <summary>The name of the property.</summary>
+            <value>The name of the property.</value>
+        </member>
+        <member name="P:Spring.Objects.PropertyValue.Expression">
+            <summary>
+            Parsed property expression.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.PropertyValue.Value">
+            <summary>
+            Return the value of the property.
+            </summary>
+            <remarks>
+            <p>
+            Note that type conversion will <i>not</i> have occurred here.
+            It is the responsibility of the
+            <see cref="T:Spring.Objects.IObjectWrapper"/> implementation to
+            perform type conversion.
+            </p>
+            </remarks>
+            <value>The (possibly unresolved) value of the property.</value>
+        </member>
+        <member name="T:Spring.Objects.Factory.FactoryObjectNotInitializedException">
+            <summary>
+            Exception thrown if an
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> is not fully
+            initialized, for example if it is involved in a circular reference.
+            </summary>
+            <remarks>
+            <p>
+            This is usually indicated by any of the variants of the
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>
+            method returning <see langword="null"/>.
+            </p>
+            <p>
+            A circular reference with an <see cref="T:Spring.Objects.Factory.IFactoryObject"/>
+            cannot be solved by eagerly caching singleton instances (as is the
+            case with normal objects. The reason is that every
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> needs to be fully
+            initialized before it can return the created object, while only specific
+            normal objects need to be initialized - that is, if a collaborating object
+            actually invokes them on initialization instead of just storing the reference.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: FactoryObjectNotInitializedException.cs,v 1.4 2007/12/05 00:28:04 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.FactoryObjectNotInitializedException.#ctor">
+            <summary>
+            Creates a new instance of the
+            FactoryObjectNotInitializedException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.FactoryObjectNotInitializedException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the FactoryObjectNotInitializedException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.FactoryObjectNotInitializedException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the FactoryObjectNotInitializedException class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.FactoryObjectNotInitializedException.#ctor(System.String,System.String)">
+            <summary>
+            Creates a new instance of the
+            FactoryObjectCircularReferenceException class.
+            </summary>
+            <param name="objectName">
+            The name of the object that triggered the exception.
+            </param>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.FactoryObjectNotInitializedException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the FactoryObjectCircularReferenceException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.ResourceManagerFactoryObject">
+            <summary>
+            A convenience class to create a
+            <see cref="T:System.Resources.ResourceManager"/> given the resource base
+            name and assembly name.
+            </summary>
+            <remarks>
+            <p>
+            This is currently the preferred way of injecting resources into view
+            tier components (such as Windows Forms GUIs and ASP.NET ASPX pages).
+            A GUI component (typically a Windows Form) is injected with
+            an <see cref="T:System.Resources.ResourceManager"/> instance, and can
+            then proceed to use the various <c>GetXxx()</c> methods on the
+            <see cref="T:System.Resources.ResourceManager"/> to retrieve images,
+            strings, custom resources, etc.
+            </p>
+            </remarks>
+            <author>Mark Pollack</author>
+            <version>$Id: ResourceManagerFactoryObject.cs,v 1.11 2007/03/16 04:01:39 aseovic Exp $</version>
+            <seealso cref="M:Spring.Objects.Factory.Config.AbstractFactoryObject.GetObject"/>
+            <seealso cref="M:Spring.Objects.Factory.Config.AbstractFactoryObject.CreateInstance"/>
+            <seealso cref="T:System.Resources.ResourceManager"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ResourceManagerFactoryObject.CreateInstance">
+            <summary>
+            Creates a <see cref="T:System.Resources.ResourceManager"/>.
+            </summary>
+            <exception cref="T:System.Exception">
+            If an exception occured during object creation.
+            </exception>
+            <returns>The object returned by this factory.</returns>
+            <seealso cref="M:Spring.Objects.Factory.Config.AbstractFactoryObject.GetObject"/>
+            <seealso cref="M:Spring.Objects.Factory.Config.AbstractFactoryObject.CreateInstance"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ResourceManagerFactoryObject.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has set all object properties supplied
+            (and satisfied the
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            and <see cref="T:Spring.Context.IApplicationContextAware"/>
+            interfaces).
+            </summary>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as failure to set an essential
+            property) or if initialization fails.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ResourceManagerFactoryObject.BaseName">
+            <summary>
+            The root name of the resources.
+            </summary>
+            <remarks>
+            <p>
+            For example, the root name for the resource file named
+            "MyResource.en-US.resources" is "MyResource".
+            </p>
+            <note>
+            The namespace is also prefixed before the resource file name.
+            </note>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ResourceManagerFactoryObject.AssemblyName">
+            <summary>
+            The string representation of the assembly that contains the resource.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.ResourceManagerFactoryObject.ObjectType">
+            <summary>
+            The <see cref="T:System.Resources.ResourceManager"/> <see cref="T:System.Type"/>.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject">
+             <summary>
+             <see cref="T:Spring.Objects.Factory.IFactoryObject"/> implementation that
+             retrieves a static or non-static <b>public</b> field value.
+             </summary>
+             <remarks>
+             <p>
+             Typically used for retrieving <b>public</b> constants.
+             </p>
+             </remarks>
+             <example>
+             <p>
+             The following example retrieves the <see cref="F:System.DBNull.Value"/> field value...
+             </p>
+             <code escaped="true">
+             <object id="dbnull" type="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject, Spring.Core">
+                 <property name="TargetType" value="System.DBNull"/>
+                 <property name="TargetField" value="Value"/>
+             </object>
+             </code>
+             <p>
+             The previous example could also have been written using the convenience
+             <see cref="P:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.StaticField"/>
+             property, like so...
+             </p>
+             <code escaped="true">
+             <object id="dbnull" type="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject, Spring.Core">
+                 <property name="StaticField" value="System.DBNull.Value"/>
+             </object>
+             </code>
+             <p>
+             This class also implements the <see cref="T:Spring.Objects.Factory.IObjectNameAware"/>
+             interface
+             (<see cref="P:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.ObjectName"/>).
+             If the id (or name) of one's
+             <see cref="T:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject"/>
+             object definition is set to the <see cref="P:System.Type.AssemblyQualifiedName"/>
+             of the <see langword="static"/> field to be retrieved, then the id (or
+             name) of one's object definition will be used for the name of the
+             <see langword="static"/> field lookup. See below for an example of this
+             concise style of definition.
+             </p>
+             <code escaped="true">
+             <!-- returns the value of the DBNull.Value field -->
+             <object id="System.DBNull.Value" type="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject, Spring.Core"/>
+            
+             <!-- returns the value of the Type.Delimiter field -->
+             <object id="System.Type.Delimiter" type="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject, Spring.Core"/>
+             </code>
+             <p>
+             The usage for retrieving instance fields is similar. No example is shown
+             because public instance fields are <i>generally</i> bad practice; but if
+             you have some legacy code that exposes public instance fields, or if you
+             just really like coding public instance fields, then you can use this
+             <see cref="T:Spring.Objects.Factory.IFactoryObject"/> implementation to
+             retrieve such field values.
+             </p>
+             </example>
+             <author>Juergen Hoeller</author>
+             <author>Rick Evans (.NET)</author>
+             <version>$Id: FieldRetrievingFactoryObject.cs,v 1.8 2007/07/31 18:16:49 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has set all object properties supplied
+            (and satisfied <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            and ApplicationContextAware).
+            </summary>
+            <remarks>
+            <p>
+            This method allows the object instance to perform initialization only
+            possible when all object properties have been set and to throw an
+            exception in the event of misconfiguration.
+            </p>
+            </remarks>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as failure to set an essential
+            property) or if initialization fails.
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.GetObject">
+            <summary>
+            Return an instance (possibly shared or independent) of the object
+            managed by this factory.
+            </summary>
+            <returns>
+            An instance (possibly shared or independent) of the object managed by
+            this factory.
+            </returns>
+            <see cref="M:Spring.Objects.Factory.IFactoryObject.GetObject"/>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.StaticField">
+            <summary>
+            The <see cref="P:System.Type.AssemblyQualifiedName"/> of the
+            <see langword="static"/> field to be retrieved.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.ObjectName">
+            <summary>
+            Set the name of the object in the object factory that created this object.
+            </summary>
+            <value>
+            The name of the object in the factory.
+            </value>
+            <remarks>
+            <p>
+            In the context of the
+            <see cref="T:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject"/>
+            class, the
+            <see cref="P:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.ObjectName"/>
+            value will be interepreted as the value of the
+            <see cref="P:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.StaticField"/>
+            property if no value has been explicitly assigned to the
+            <see cref="P:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.StaticField"/>
+            property. This allows for concise object definitions with just an id or name;
+            see the class documentation for
+            <see cref="T:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject"/>
+            for an example of this style of usage.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.TargetField">
+            <summary>
+            The name of the field the value of which is to be retrieved.
+            </summary>
+            <remarks>
+            <p>
+            If the
+            <see cref="P:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.TargetObject"/>
+            has been set (and is not <cref lang="null"/>), then the value of this property
+            refers to an instance field name; it otherwise refers to a <see langword="static"/>
+            field name.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.TargetObject">
+            <summary>
+            The object instance on which the field is defined.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.TargetType">
+            <summary>
+            The <see cref="T:System.Type"/> on which the field is defined.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.ObjectType">
+            <summary>
+            The <see cref="T:System.Type"/> of object that this
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> creates, or
+            <cref lang="null"/> if not known in advance.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.FieldRetrievingFactoryObject.IsSingleton">
+            <summary>
+            Is the object managed by this factory a singleton or a prototype?
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.DelegateFactoryObject">
+            <summary>
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> implementation that
+            creates delegates.
+            </summary>
+            <remarks>
+            <p>
+            Supports the creation of <see cref="T:System.Delegate"/>s for both
+            instance and <see langword="static"/> methods.
+            </p>
+            </remarks>
+            <author>Rick Evans</author>
+            <version>$Id: DelegateFactoryObject.cs,v 1.6 2007/03/16 04:01:35 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.DelegateFactoryObject.AfterPropertiesSet">
+            <summary>
+            Callback method called once all factory properties have been set.
+            </summary>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as failure to set an essential
+            property) or if initialization fails.
+            </exception>
+            <seealso cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/> 
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.DelegateFactoryObject.CreateInstance">
+            <summary>
+            Creates the delegate.
+            </summary>
+            <exception cref="T:System.Exception">
+            If an exception occured during object creation.
+            </exception>
+            <returns>The object returned by this factory.</returns>
+            <seealso cref="M:Spring.Objects.Factory.Config.AbstractFactoryObject.CreateInstance"/> 
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.DelegateFactoryObject.ObjectType">
+            <summary>
+            The <see cref="T:System.Type"/> of <see cref="T:System.Delegate"/>
+            created by this factory.
+            </summary>
+            <remarks>
+            <p>
+            Returns the <see cref="T:System.Delegate"/> <see cref="T:System.Type"/>
+            if accessed prior to the <see cref="M:Spring.Objects.Factory.Config.DelegateFactoryObject.AfterPropertiesSet"/> method
+            being called.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.DelegateFactoryObject.DelegateType">
+            <summary>
+            The <see cref="T:System.Type"/> of the <see cref="T:System.Delegate"/>
+            created by this factory.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.DelegateFactoryObject.MethodName">
+            <summary>
+            The name of the method that is to be invoked by the created
+            delegate.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.DelegateFactoryObject.TargetType">
+            <summary>
+            The target <see cref="T:System.Type"/> if the <see cref="P:Spring.Objects.Factory.Config.DelegateFactoryObject.MethodName"/>
+            refers to a <see langword="static"/> method.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Config.DelegateFactoryObject.TargetObject">
+            <summary>
+            The target object if the <see cref="P:Spring.Objects.Factory.Config.DelegateFactoryObject.MethodName"/>
+            refers to an instance method.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Config.ObjectDefinitionVisitor">
+            <summary>
+            Visitor class for traversing <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/> objects, in particular
+            the property values and constructor arguments contained in them resolving
+            object metadata values.
+            </summary>
+            <remarks>
+            Used by <see cref="T:Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer"/> and <see cref="T:Spring.Objects.Factory.Config.VariablePlaceholderConfigurer"/>
+            to parse all string values contained in a ObjectDefinition, resolving any placeholders found.
+            </remarks>
+            <author>Mark Pollack</author>
+            <version>$Id: ObjectDefinitionVisitor.cs,v 1.9 2008/02/18 00:02:27 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.#ctor(Spring.Objects.Factory.Config.IVariableSource)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Objects.Factory.Config.ObjectDefinitionVisitor"/> class, 
+            applying the specified IVariableSource to all object metadata values.
+            </summary>
+            <param name="variableSource">The variable source.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Objects.Factory.Config.ObjectDefinitionVisitor"/> class
+            for subclassing
+            </summary>
+            <remarks>Subclasses should override the <code>ResolveStringValue</code> method</remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.VisitObjectDefinition(Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Traverse the given ObjectDefinition object and the MutablePropertyValues
+            and ConstructorArgumentValues contained in them.
+            </summary>
+            <param name="definition">The object definition to traverse.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.VisitObjectTypeName(Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Visits the ObjectDefinition property ObjectTypeName, replacing string values using 
+            the specified IVariableSource.
+            </summary>
+            <param name="objectDefinition">The object definition.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.VisitPropertyValues(Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Visits the property values of the ObjectDefinition, replacing string values
+            using the specified IVariableSource.
+            </summary>
+            <param name="objectDefinition">The object definition.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.VisitIndexedArgumentValues(System.Collections.IDictionary)">
+            <summary>
+            Visits the indexed constructor argument values, replacing string values using the
+            specified IVariableSource.
+            </summary>
+            <param name="ias">The indexed argument values.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.VisitNamedArgumentValues(System.Collections.IDictionary)">
+            <summary>
+            Visits the named constructor argument values, replacing string values using the
+            specified IVariableSource.
+            </summary>
+            <param name="nav">The named argument values.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.VisitGenericArgumentValues(System.Collections.IList)">
+            <summary>
+            Visits the generic constructor argument values, replacing string values using
+            the specified IVariableSource.
+            </summary>
+            <param name="gav">The genreic argument values.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.ConfigureConstructorArgument(Spring.Objects.Factory.Config.ConstructorArgumentValues.ValueHolder)">
+            <summary>
+            Configures the constructor argument ValueHolder.
+            </summary>
+            <param name="valueHolder">The vconstructor alue holder.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.ResolveValue(System.Object)">
+            <summary>
+            Resolves the given value taken from an object definition according to its type
+            </summary>
+            <param name="value">the value to resolve</param>
+            <returns>the resolved value</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.VisitManagedList(Spring.Objects.Factory.Support.ManagedList)">
+            <summary>
+            Visits the ManagedList property ElementTypeName and 
+            calls <see cref="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.ResolveValue(System.Object)"/> for list element.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.VisitManagedSet(Spring.Objects.Factory.Support.ManagedSet)">
+            <summary>
+            Visits the ManagedSet property ElementTypeName and 
+            calls <see cref="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.ResolveValue(System.Object)"/> for list element.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.VisitManagedDictionary(Spring.Objects.Factory.Support.ManagedDictionary)">
+            <summary>
+            Visits the ManagedSet properties KeyTypeName and ValueTypeName and 
+            calls <see cref="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.ResolveValue(System.Object)"/> for dictionary's value element.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.VisitNameValueCollection(System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Visits the elements of a NameValueCollection and calls
+            <see cref="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.ResolveValue(System.Object)"/> for value of each element.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.ResolveStringValue(System.String)">
+            <summary>
+            Looks up the value of the given variable name in the configured <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/>.
+            </summary>
+            <param name="variableName">The name of the variable to be looked up</param>
+            <returns>
+            The value of this variable, as returned from the <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/> passed 
+            into the constructor <see cref="M:Spring.Objects.Factory.Config.ObjectDefinitionVisitor.#ctor(Spring.Objects.Factory.Config.IVariableSource)"/>
+            </returns>
+            <exception cref="T:System.InvalidOperationException">If no <see cref="T:Spring.Objects.Factory.Config.IVariableSource"/> has been configured.</exception>
+        </member>
+        <member name="T:Spring.Globalization.Localizers.ResourceSetLocalizer">
+            <summary>
+            Loads a list of resources that should be applied from the .NET <see cref="T:System.Resources.ResourceSet"/>.
+            </summary>
+            <remarks>
+            <p>
+            This <see cref="T:Spring.Globalization.ILocalizer"/> implementation will iterate over all resource managers 
+            within the message source and return a list of all the resources whose name starts with '$this'.
+            </p>
+            <p>
+            All other resources will be ignored, but you can retrieve them by calling one of 
+            <c>GetMessage</c> methods on the message source directly.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ResourceSetLocalizer.cs,v 1.11 2007/07/24 17:26:25 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.Localizers.ResourceSetLocalizer.LoadResources(System.Object,Spring.Context.IMessageSource,System.Globalization.CultureInfo)">
+            <summary>
+            Loads resources from the storage and creates a list of <see cref="T:Spring.Globalization.Resource"/> instances that should be applied to the target.
+            </summary>
+            <remarks>
+            This feature is not currently supported on version 1.0 of the .NET platform.
+            </remarks>
+            <param name="target">Target to get a list of resources for.</param>
+            <param name="messageSource"><see cref="T:Spring.Context.IMessageSource"/> instance to retrieve resources from.</param>
+            <param name="culture">Resource locale.</param>
+            <returns>A list of resources to apply.</returns>
+        </member>
+        <member name="T:Spring.Expressions.VariableNode">
+            <summary>
+            Represents parsed variable node.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: VariableNode.cs,v 1.8 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.VariableNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.VariableNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.VariableNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns value of the variable represented by this node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.VariableNode.Set(System.Object,Spring.Expressions.BaseNode.EvaluationContext,System.Object)">
+            <summary>
+            Sets value of the variable represented by this node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <param name="newValue">New value for this node.</param>
+        </member>
+        <member name="T:Spring.Expressions.IntLiteralNode">
+            <summary>
+            Represents parsed integer literal node.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IntLiteralNode.cs,v 1.10 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.IntLiteralNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.IntLiteralNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.IntLiteralNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the integer literal node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Expressions.QualifiedIdentifier">
+            <summary>
+            Represents parsed named argument node in the expression.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: QualifiedIdentifier.cs,v 1.7 2007/09/07 03:01:26 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.QualifiedIdentifier.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.QualifiedIdentifier.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.QualifiedIdentifier.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns the value of the named argument defined by this node.
+            </summary>
+            <param name="context">Context to evaluate expressions against.</param>
+            <param name="evalContext">Current expression evaluation context.</param>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="M:Spring.Expressions.QualifiedIdentifier.getText">
+            <summary>
+            Overrides getText to allow easy way to get fully 
+            qualified identifier.
+            </summary>
+            <returns>
+            Fully qualified identifier as a string.
+            </returns>
+        </member>
+        <member name="T:Spring.Expressions.BooleanLiteralNode">
+            <summary>
+            Represents parsed boolean literal node.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: BooleanLiteralNode.cs,v 1.9 2007/09/07 03:01:21 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Expressions.BooleanLiteralNode.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.BooleanLiteralNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Create a new instance from SerializationInfo
+            </summary>
+        </member>
+        <member name="M:Spring.Expressions.BooleanLiteralNode.Get(System.Object,Spring.Expressions.BaseNode.EvaluationContext)">
+            <summary>
+            Returns a value for the boolean literal node.
+            </summary>
+            <summary>
+            This is the entrypoint into evaluating this expression.
+            </summary>
+            <returns>Node's value.</returns>
+        </member>
+        <member name="T:Spring.Core.ControlFlowFactory">
+            <summary>
+            Factory class to conceal any default <see cref="T:Spring.Core.IControlFlow"/> implementation.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Simon White (.NET)</author>
+            <version>$Id: ControlFlowFactory.cs,v 1.9 2007/07/31 01:35:07 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Core.ControlFlowFactory.CreateControlFlow">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Core.IControlFlow"/>
+            implementation provided by this factory.
+            </summary>
+            <returns>
+            A new instance of the <see cref="T:Spring.Core.IControlFlow"/>
+            implementation provided by this factory.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.ControlFlowFactory.DefaultControlFlow.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Core.ControlFlowFactory.DefaultControlFlow"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Core.ControlFlowFactory.DefaultControlFlow.Spring#Core#IControlFlow#Under(System.Type)">
+            <summary>
+            Detects whether the caller is under the supplied <see cref="T:System.Type"/>,
+            according to the current stacktrace.
+            </summary>
+            <seealso cref="M:Spring.Core.IControlFlow.Under(System.Type)"/>
+        </member>
+        <member name="M:Spring.Core.ControlFlowFactory.DefaultControlFlow.Spring#Core#IControlFlow#Under(System.Type,System.String)">
+            <summary>
+            Detects whether the caller is under the supplied <see cref="T:System.Type"/>
+            and <paramref name="methodName"/>, according to the current stacktrace.
+            </summary>
+            <remarks>
+            <p>
+            Matches the whole method name.
+            </p>
+            </remarks>
+            <seealso cref="M:Spring.Core.IControlFlow.Under(System.Type,System.String)"/>
+        </member>
+        <member name="M:Spring.Core.ControlFlowFactory.DefaultControlFlow.Spring#Core#IControlFlow#UnderToken(System.String)">
+            <summary>
+            Does the current stack trace contain the supplied <paramref name="token"/>?
+            </summary>
+            <remarks>
+            <p>
+            This leaves it up to the caller to decide what matches, but is obviously less of
+            an abstraction because the caller must know the exact format of the underlying
+            stack trace.
+            </p>
+            </remarks>
+            <seealso cref="M:Spring.Core.IControlFlow.UnderToken(System.String)"/>
+        </member>
+        <member name="T:Spring.Context.Support.DelegatingMessageSource">
+            <summary>
+            Empty <see cref="T:Spring.Context.IMessageSource"/> implementation that
+            simply delegates all method calls to it's parent
+            <see cref="T:Spring.Context.IMessageSource"/>.
+            </summary>
+            <remarks>
+            <p>
+            If no parent <see cref="T:Spring.Context.IMessageSource"/> is available,
+            no messages will be resolved (and a
+            <see cref="T:Spring.Context.NoSuchMessageException"/> will be thrown).
+            </p>
+            <p>
+            Used as placeholder <see cref="T:Spring.Context.IMessageSource"/> by the
+            <see cref="T:Spring.Context.Support.AbstractApplicationContext"/> class,
+            if the context definition doesn't define its own
+            <see cref="T:Spring.Context.IMessageSource"/>. Not intended for direct use
+            in applications.
+            </p>
+            </remarks>
+            <author>Juergan Hoeller</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: DelegatingMessageSource.cs,v 1.5 2007/07/02 21:24:39 markpollack Exp $</version>
+            <seealso cref="T:Spring.Context.Support.AbstractApplicationContext"/>
+        </member>
+        <member name="M:Spring.Context.Support.DelegatingMessageSource.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.DelegatingMessageSource"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.DelegatingMessageSource.#ctor(Spring.Context.IMessageSource)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Context.Support.DelegatingMessageSource"/> class.
+            </summary>
+            <param name="parentMessageSource">
+            The parent message source used to try and resolve messages that
+            this object can't resolve.
+            </param>
+        </member>
+        <member name="M:Spring.Context.Support.DelegatingMessageSource.GetMessage(System.String)">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be resolved.
+            </exception>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.DelegatingMessageSource.GetMessage(System.String,System.Object[])">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="arguments">
+            The array of arguments that will be filled in for parameters within
+            the message, or <see langword="null"/> if there are no parameters
+            within the message. Parameters within a message should be
+            referenced using the same syntax as the format string for the
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> method.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be resolved.
+            </exception>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(System.String,System.Object[])"/>
+        </member>
+        <member name="M:Spring.Context.Support.DelegatingMessageSource.GetMessage(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be resolved.
+            </exception>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(System.String,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.DelegatingMessageSource.GetMessage(System.String,System.Globalization.CultureInfo,System.Object[])">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.
+            </param>
+            <param name="arguments">
+            The array of arguments that will be filled in for parameters within
+            the message, or <see langword="null"/> if there are no parameters
+            within the message. Parameters within a message should be
+            referenced using the same syntax as the format string for the
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> method.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be resolved.
+            </exception>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(System.String,System.Globalization.CultureInfo,System.Object[])"/>
+        </member>
+        <member name="M:Spring.Context.Support.DelegatingMessageSource.GetMessage(System.String,System.String,System.Globalization.CultureInfo,System.Object[])">
+            <summary>
+            Resolve the message identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">The name of the message to resolve.</param>
+            <param name="defaultMessage">The default message.</param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.
+            </param>
+            <param name="arguments">
+            The array of arguments that will be filled in for parameters within
+            the message, or <see langword="null"/> if there are no parameters
+            within the message. Parameters within a message should be
+            referenced using the same syntax as the format string for the
+            <see cref="M:System.String.Format(System.String,System.Object[])"/> method.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be resolved.
+            </exception>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(System.String,System.Globalization.CultureInfo,System.Object[])"/>
+        </member>
+        <member name="M:Spring.Context.Support.DelegatingMessageSource.GetMessage(Spring.Context.IMessageSourceResolvable,System.Globalization.CultureInfo)">
+            <summary>
+            Resolve the message using all of the attributes contained within
+            the supplied <see cref="T:Spring.Context.IMessageSourceResolvable"/>
+            argument.
+            </summary>
+            <param name="resolvable">
+            The value object storing those attributes that are required to
+            properly resolve a message.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> that represents
+            the culture for which the resource is localized.
+            </param>
+            <returns>
+            The resolved message if the lookup was successful (see above for
+            the return value in the case of an unsuccessful lookup).
+            </returns>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be resolved.
+            </exception>
+            <exception cref="T:Spring.Context.NoSuchMessageException">
+            If the message could not be resolved.
+            </exception>
+            <seealso cref="M:Spring.Context.IMessageSource.GetMessage(Spring.Context.IMessageSourceResolvable,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.DelegatingMessageSource.GetResourceObject(System.String)">
+            <summary>
+            Gets a localized resource object identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">
+            The name of the resource object to resolve.
+            </param>
+            <returns>
+            The resolved object, or <see langword="null"/> if not found.
+            </returns>
+            <seealso cref="M:Spring.Context.IMessageSource.GetResourceObject(System.String)"/>
+        </member>
+        <member name="M:Spring.Context.Support.DelegatingMessageSource.GetResourceObject(System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Gets a localized resource object identified by the supplied
+            <paramref name="name"/>.
+            </summary>
+            <param name="name">
+            The name of the resource object to resolve.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.
+            </param>
+            <returns>
+            The resolved object, or <see langword="null"/> if not found.
+            </returns>
+            <seealso cref="M:Spring.Context.IMessageSource.GetResourceObject(System.String,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="M:Spring.Context.Support.DelegatingMessageSource.ApplyResources(System.Object,System.String,System.Globalization.CultureInfo)">
+            <summary>
+            Applies resources to object properties.
+            </summary>
+            <param name="value">
+            An object that contains the property values to be applied.
+            </param>
+            <param name="objectName">
+            The base name of the object to use for key lookup.
+            </param>
+            <param name="culture">
+            The <see cref="T:System.Globalization.CultureInfo"/> with which the
+            resource is associated.
+            </param>
+            <seealso cref="M:Spring.Context.IMessageSource.ApplyResources(System.Object,System.String,System.Globalization.CultureInfo)"/>
+        </member>
+        <member name="P:Spring.Context.Support.DelegatingMessageSource.ParentMessageSource">
+            <summary>
+            The parent message source used to try and resolve messages that
+            this object can't resolve.
+            </summary>
+            <seealso cref="P:Spring.Context.IHierarchicalMessageSource.ParentMessageSource"/>
+        </member>
+        <member name="T:Spring.Caching.NonExpiringCache">
+            <summary>
+            A simple <see cref="T:Spring.Caching.ICache"/> implementation backed by a dictionary that
+            never expires cache items.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: NonExpiringCache.cs,v 1.4 2007/08/24 22:43:55 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Caching.NonExpiringCache.Get(System.Object)">
+            <summary>
+            Retrieves an item from the cache.
+            </summary>
+            <param name="key">
+            Item key.
+            </param>
+            <returns>
+            Item for the specified <paramref name="key"/>, or <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Caching.NonExpiringCache.Remove(System.Object)">
+            <summary>
+            Removes an item from the cache.
+            </summary>
+            <param name="key">
+            Item key.
+            </param>
+        </member>
+        <member name="M:Spring.Caching.NonExpiringCache.RemoveAll(System.Collections.ICollection)">
+            <summary>
+            Removes collection of items from the cache.
+            </summary>
+            <param name="keys">
+            Collection of keys to remove.
+            </param>
+        </member>
+        <member name="M:Spring.Caching.NonExpiringCache.Clear">
+            <summary>
+            Removes all items from the cache.
+            </summary>
+        </member>
+        <member name="M:Spring.Caching.NonExpiringCache.DoInsert(System.Object,System.Object,System.TimeSpan)">
+            <summary>
+            Inserts an item into the cache.
+            </summary>
+            <param name="key">
+            Item key.
+            </param>
+            <param name="value">
+            Item value.
+            </param>
+            <param name="timeToLive">
+            Item's time-to-live (TTL) in milliseconds.
+            </param>
+        </member>
+        <member name="P:Spring.Caching.NonExpiringCache.Count">
+            <summary>
+            Gets the number of items in the cache.
+            </summary>
+        </member>
+        <member name="P:Spring.Caching.NonExpiringCache.Keys">
+            <summary>
+            Gets a collection of all cache item keys.
+            </summary>
+        </member>
+        <member name="T:Spring.Caching.CacheResultAttribute">
+            <summary>
+            This attribute should be used to mark methods whose result 
+            needs to be cached.
+            </summary>
+            <remarks>
+            <p>
+            This attribute allows application developers to mark that a result 
+            of the method invocation should be cached, but it will not do any
+            caching by itself.
+            </p>
+            <p>
+            In order to actually cache the result, an application developer
+            must apply a <c>Spring.Aspects.Cache.CacheResultAdvice</c> to
+            all of the members that have this attribute defined.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CacheResultAttribute.cs,v 1.1 2007/02/09 07:12:23 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.Caching.CacheResultAttribute.#ctor">
+            <summary>
+            Creates an attribute instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Caching.CacheResultAttribute.#ctor(System.String,System.String)">
+            <summary>
+            Creates an attribute instance.
+            </summary>
+            <param name="cacheName">
+            The name of the cache to use.
+            </param>
+            <param name="key">
+            An expression string that should be evaluated in order to determine
+            the cache key for the item.
+            </param>
+        </member>
+    </members>
+</doc>
diff --git a/src/Spring/Spring.Core/Threading/CallContextStorage.cs b/src/Spring/Spring.Core/Threading/CallContextStorage.cs
new file mode 100644
index 00000000..c56b046f
--- /dev/null
+++ b/src/Spring/Spring.Core/Threading/CallContextStorage.cs
@@ -0,0 +1,41 @@
+using System.Runtime.Remoting.Messaging;
+
+namespace Spring.Threading
+{
+    /// <summary>
+    /// Implements <see cref="IThreadStorage"/> by using <see cref="CallContext"/>.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: CallContextStorage.cs,v 1.1 2007/02/02 21:30:34 oakinger Exp $</version>  
+    public class CallContextStorage : IThreadStorage
+    {
+        /// <summary>
+        /// Retrieves an object with the specified name.
+        /// </summary>
+        /// <param name="name">The name of the item.</param>
+        /// <returns>The object in the call context associated with the specified name or null if no object has been stored previously</returns>
+        public object GetData(string name)
+        {
+            return CallContext.GetData(name);
+        }
+
+        /// <summary>
+        /// Stores a given object and associates it with the specified name.
+        /// </summary>
+        /// <param name="name">The name with which to associate the new item.</param>
+        /// <param name="value">The object to store in the call context.</param>
+        public void SetData(string name, object value)
+        {
+            CallContext.SetData(name, value);
+        }
+
+        /// <summary>
+        /// Empties a data slot with the specified name.
+        /// </summary>
+        /// <param name="name">The name of the data slot to empty.</param>
+        public void FreeNamedDataSlot(string name)
+        {
+            CallContext.FreeNamedDataSlot(name);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Threading/ISync.cs b/src/Spring/Spring.Core/Threading/ISync.cs
new file mode 100644
index 00000000..e0deeee2
--- /dev/null
+++ b/src/Spring/Spring.Core/Threading/ISync.cs
@@ -0,0 +1,92 @@
+#region License
+/*
+* Copyright © 2002-2005 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
+
+namespace Spring.Threading
+{
+    /// <summary>
+    /// Acquire/Release protocol, base of many concurrency utilities.
+    /// </summary>
+    /// 
+    /// <remarks>
+    /// <p><see cref="ISync"/> objects isolate waiting and notification for particular logical 
+    /// states, resource availability, events, and the like that are shared 
+    /// across multiple threads.</p>
+    /// 
+    /// <p>Use of <see cref="ISync"/>s sometimes (but by no means always) adds 
+    /// flexibility and efficiency compared to the use of plain 
+    /// .Net monitor methods and locking, and are sometimes (but by no means 
+    /// always) simpler to program with.</p>
+    /// 
+    /// <p>Used for implementation of a <see cref="Spring.Pool.Support.SimplePool"/></p>
+    /// </remarks>
+    /// 
+    /// <author>Doug Lea</author>
+    /// <author>Federico Spinazzi (.Net)</author>
+    /// <version>$Id: ISync.cs,v 1.6 2006/09/15 19:06:08 markpollack Exp $</version>
+    public interface ISync
+	{
+        /// <summary>  Wait (possibly forever) until successful passage.
+        /// Fail only upon interuption. Interruptions always result in
+        /// `clean' failures. On failure,  you can be sure that it has not 
+        /// been acquired, and that no 
+        /// corresponding release should be performed. Conversely,
+        /// a normal return guarantees that the acquire was successful.
+        /// 
+        /// </summary>
+        void Acquire();
+
+        /// <summary> Potentially enable others to pass.
+        /// <p>
+        /// Because release does not raise exceptions, 
+        /// it can be used in `finally' clauses without requiring extra
+        /// embedded try/catch blocks. But keep in mind that
+        /// as with any java method, implementations may 
+        /// still throw unchecked exceptions such as Error or NullPointerException
+        /// when faced with uncontinuable errors. However, these should normally
+        /// only be caught by higher-level error handlers.
+        /// </p>
+        /// </summary>
+        void Release ();
+        
+        /// <summary>
+        /// Wait at most msecs to pass; report whether passed. 
+        /// <p>
+        /// The method has best-effort semantics:
+        /// The msecs bound cannot
+        /// be guaranteed to be a precise upper bound on wait time in Java.
+        /// Implementations generally can only attempt to return as soon as possible
+        /// after the specified bound. Also, timers in Java do not stop during garbage
+        /// collection, so timeouts can occur just because a GC intervened.
+        /// So, msecs arguments should be used in
+        /// a coarse-grained manner. Further,
+        /// implementations cannot always guarantee that this method
+        /// will return at all without blocking indefinitely when used in
+        /// unintended ways. For example, deadlocks may be encountered
+        /// when called in an unintended context.
+        /// </p>
+        /// </summary>
+        /// <param name="msecs">the number of milleseconds to wait
+        /// An argument less than or equal to zero means not to wait at all. 
+        /// However, this may still require
+        /// access to a synchronization lock, which can impose unbounded
+        /// delay if there is a lot of contention among threads.
+        /// </param>
+        /// <returns>true if acquired</returns>
+        bool Attempt(long msecs);
+    }
+}
diff --git a/src/Spring/Spring.Core/Threading/IThreadStorage.cs b/src/Spring/Spring.Core/Threading/IThreadStorage.cs
new file mode 100644
index 00000000..13199766
--- /dev/null
+++ b/src/Spring/Spring.Core/Threading/IThreadStorage.cs
@@ -0,0 +1,40 @@
+namespace Spring.Threading
+{
+    /// <summary>
+    /// Specifies the contract a strategy must be implement to store and 
+    /// retrieve data that is specific to the executing thread.
+    /// </summary>
+    /// <remarks>
+    /// All implementations of this interface must treat keys case-sensitive.
+    /// </remarks>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: IThreadStorage.cs,v 1.1 2007/02/02 21:30:34 oakinger Exp $</version>  
+    public interface IThreadStorage
+    {
+        /// <summary>
+        /// Retrieves an object with the specified <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name of the item.</param>
+        /// <returns>
+        /// The object in the current thread's context associated with the 
+        /// specified <paramref name="name"/> or null if no object has been stored previously
+        /// </returns>
+        object GetData(string name);
+
+        /// <summary>
+        /// Stores a given object and associates it with the specified <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The name with which to associate the new item.</param>
+        /// <param name="value">The object to store in the current thread's context.</param>
+        void SetData(string name, object value);
+
+        /// <summary>
+        /// Empties a data slot with the specified name.
+        /// </summary>
+        /// <remarks>
+        /// If the object with the specified <paramref name="name"/> is not found, the method does nothing.
+        /// </remarks>
+        /// <param name="name">The name of the object to remove.</param>
+        void FreeNamedDataSlot(string name);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Threading/Latch.cs b/src/Spring/Spring.Core/Threading/Latch.cs
new file mode 100644
index 00000000..17ba51ff
--- /dev/null
+++ b/src/Spring/Spring.Core/Threading/Latch.cs
@@ -0,0 +1,132 @@
+#region License
+/*
+* Copyright © 2002-2005 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.Threading;
+
+namespace Spring.Threading
+{
+    /// <summary> A latch is a boolean condition that is set at most once, ever.
+    /// Once a single release is issued, all acquires will pass.
+    /// <p>
+    /// <b>Sample usage.</b> Here are a set of classes that use
+    /// a latch as a start signal for a group of worker threads that
+    /// are created and started beforehand, and then later enabled.
+    /// </p>
+    /// <example>
+    /// class Worker implements IRunnable {
+    ///   private readonly Latch startSignal;
+    ///   Worker(Latch l) 
+    ///   { 
+    ///     startSignal = l; 
+    ///   }
+    ///
+    ///   public void Run() {
+    ///     startSignal.acquire();
+    ///     DoWork();
+    ///   }
+    ///   
+    ///   void DoWork() { ... }
+    ///   }
+    /// 
+    ///   class Driver { // ...
+    ///     void Main() {
+    ///       Latch go = new Latch();
+    ///       for (int i = 0; i &lt; N; ++i) // make threads
+    ///       new Thread(new ThreadStart(new Worker(go)).Start();
+    ///       DoSomethingElse();         // don't let run yet 
+    ///       go.Release();              // let all threads proceed
+    /// } 
+    /// }
+    /// </example>
+    /// </summary>
+    /// <author>Doug Lea</author>
+    /// <author>Federico Spinazzi (.Net)</author>
+    /// <version>$Id: Latch.cs,v 1.11 2006/09/15 19:06:08 markpollack Exp $</version>
+    public class Latch : ISync
+    {
+        /// <summary>
+        /// can acquire ?
+        /// </summary>
+        protected bool latched_ = false;
+
+        /// <summary>
+        /// Method mainly used by clients who are trying to get the latch
+        /// </summary>
+        public void Acquire ()
+        {
+            lock (this)
+            {
+                while (!latched_)
+                {
+                    Monitor.Wait (this);
+                }
+            }
+        }
+
+        /// <summary>Wait at most msecs millisconds for a permit</summary>
+        public bool Attempt (long msecs)
+        {
+            lock (this)
+            {
+                if (latched_)
+                {
+                    return true;
+                }
+                else if (msecs <= 0)
+                {
+                    return false;
+                }
+                else
+                {
+                    long waitTime = msecs;
+                    //double start = new TimeSpan(DateTime.UtcNow.Ticks).TotalMilliseconds;
+                    double start = Utils.CurrentTimeMillis;
+                    for (;;)
+                    {
+                        Monitor.Wait (this, TimeSpan.FromMilliseconds(waitTime));
+                        if (latched_)
+                        {
+                            return true;
+                        }
+                        else
+                        {
+                            waitTime = (long) (msecs - (Utils.CurrentTimeMillis - start));
+                            if (waitTime <= 0)
+                            {
+                                return false;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Enable all current and future acquires to pass 
+        /// </summary>
+        public void Release ()
+        {
+            lock (this)
+            {
+                latched_ = true;
+                Monitor.PulseAll(this);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Threading/LogicalThreadContext.cs b/src/Spring/Spring.Core/Threading/LogicalThreadContext.cs
new file mode 100644
index 00000000..fc471af4
--- /dev/null
+++ b/src/Spring/Spring.Core/Threading/LogicalThreadContext.cs
@@ -0,0 +1,97 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Remoting.Messaging;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Threading
+{
+    /// <summary>
+    /// An abstraction to safely store "ThreadStatic" data.
+    /// </summary>
+    /// <remarks>
+    /// By default, <see cref="CallContext"/> is used to store thread-specific data. 
+    /// You may switch the storage strategy by calling <see cref="SetStorage(IThreadStorage)"/>.<p/>
+    /// <b>NOTE:</b> Access to the underlying storage is not synchronized for performance reasons. 
+    /// You should call <see cref="SetStorage(IThreadStorage)"/> only once at application startup!
+    /// </remarks>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: LogicalThreadContext.cs,v 1.3 2007/07/03 22:32:04 markpollack Exp $</version>  
+    public sealed class LogicalThreadContext
+    {
+        /// <summary>
+        /// Holds the current <see cref="IThreadStorage"/> strategy.
+        /// </summary>
+        /// <remarks>
+        /// Access to this variable is not synchronized on purpose for performance reasons. 
+        /// Setting a different <see cref="IThreadStorage"/> strategy should happen only once
+        /// at application startup.
+        /// </remarks>
+        private static IThreadStorage threadStorage = new CallContextStorage();
+
+        /// <summary>
+        /// Set the new <see cref="IThreadStorage"/> strategy.
+        /// </summary>
+        public static void SetStorage(IThreadStorage storage)
+        {
+            AssertUtils.ArgumentNotNull(storage, "storage");
+            threadStorage = storage;
+        }
+
+        private LogicalThreadContext()
+        {
+            throw new NotSupportedException("must not be instantiated");
+        }
+
+        /// <summary>
+        /// Retrieves an object with the specified name.
+        /// </summary>
+        /// <param name="name">The name of the item.</param>
+        /// <returns>The object in the context associated with the specified name or null if no object has been stored previously</returns>
+        public static object GetData(string name)
+        {
+            return threadStorage.GetData(name);
+        }
+
+        /// <summary>
+        /// Stores a given object and associates it with the specified name.
+        /// </summary>
+        /// <param name="name">The name with which to associate the new item.</param>
+        /// <param name="value">The object to store in the current thread's context.</param>
+        public static void SetData(string name, object value)
+        {
+            threadStorage.SetData(name, value);
+        }
+
+        /// <summary>
+        /// Empties a data slot with the specified name.
+        /// </summary>
+        /// <param name="name">The name of the data slot to empty.</param>
+        public static void FreeNamedDataSlot(string name)
+        {
+            threadStorage.FreeNamedDataSlot(name);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Threading/Semaphore.cs b/src/Spring/Spring.Core/Threading/Semaphore.cs
new file mode 100644
index 00000000..9541ab64
--- /dev/null
+++ b/src/Spring/Spring.Core/Threading/Semaphore.cs
@@ -0,0 +1,187 @@
+#region License
+/*
+* Copyright © 2002-2005 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.Threading;
+
+namespace Spring.Threading
+{
+	/// <summary>
+    /// <p>Base class for counting semaphores based on Semaphore implementation
+    /// from Doug Lea.</p>
+    /// </summary>
+    /// <remarks> 
+    /// 
+    /// <p>Conceptually, a semaphore 
+    /// maintains a set of permits. Each acquire() blocks if 
+    /// necessary until a permit is available, and then takes it.</p>
+    /// 
+    /// <p>Each release adds a permit. However, no actual permit objects are used; 
+    /// the Semaphore just keeps a count of the number available 
+    /// and acts accordingly.</p>
+    /// 
+    /// <p>A semaphore initialized to 1 can serve as a mutual exclusion lock. </p>
+    /// 
+	/// Used for implementation of a <see cref="Spring.Pool.Support.SimplePool"/>
+    /// </remarks>
+    /// <author>Doug Lea</author>
+    /// <author>Federico Spinazzi (.Net)</author>
+    /// <version>$Id: Semaphore.cs,v 1.10 2006/09/15 21:30:09 markpollack Exp $</version>
+    public class Semaphore : ISync
+	{
+        /// <summary>
+        /// current number of available permits
+        /// </summary>
+		protected long nPermits;
+
+        /// <summary>
+        /// <p>Create a Semaphore with the given initial number of permits.</p>
+        /// <p>Using a seed of 1 makes the semaphore act as a mutual 
+        /// exclusion lock.</p>
+        /// 
+        /// <p>Negative seeds are also allowed, 
+        /// in which case no acquires will proceed until the number of 
+        /// releases has pushed the number of permits past 0.</p>
+        /// </summary>
+		public Semaphore(long initialPermits)
+		{
+            nPermits = initialPermits;
+		}
+		
+        /// <summary>
+        /// Release a permit
+        /// </summary>
+		public virtual void Release () 
+		{
+			lock (this) 
+			{
+				++nPermits;
+			    Monitor.Pulse(this);
+			}
+		}
+		
+        /// <summary>
+        /// Acquire a permit
+        /// </summary>
+		public virtual void Acquire () 
+		{
+			lock (this) 
+			{
+				try 
+				{
+					while (nPermits <= 0) 
+						Monitor.Wait(this);
+					--nPermits;
+				}
+				catch (ThreadInterruptedException ex)
+				{
+					Monitor.Pulse(this);
+					throw ex;
+				}
+			}
+		}
+
+        /// <summary>
+        /// Wait at most msecs millisconds for a permit
+        /// </summary>
+        /// <param name="msecs">number of ms to wait</param>
+        /// <returns>true if aquired</returns>
+        public virtual bool Attempt(long msecs)
+        {
+            lock (this)
+            {
+                if (nPermits > 0)
+                {
+                    --nPermits;
+                    return true;
+                }
+                else if (msecs <= 0)
+                    return false;
+                else
+                {
+                    try
+                    {
+                        double startTime = Utils.CurrentTimeMillis;
+                        long waitTime = msecs;
+						
+                        for (; ; )
+                        {
+                            Monitor.Wait(this, TimeSpan.FromMilliseconds(waitTime));
+                            if (nPermits > 0)
+                            {
+                                --nPermits;
+                                return true;
+                            }
+                            else
+                            {
+                                waitTime = (long) (msecs - (Utils.CurrentTimeMillis - startTime));
+                                if (waitTime <= 0)
+                                    return false;
+                            }
+                        }
+                    }
+                    catch (ThreadInterruptedException ex)
+                    {
+                        Monitor.Pulse(this);
+                        throw ex;
+                    }
+                }
+            }
+        }
+
+        /// <summary> Release N permits. <code>release(n)</code> is
+        /// equivalent in effect to:
+        /// <pre>
+        /// for (int i = 0; i &lt; n; ++i) release();
+        /// </pre>
+        /// But may be more efficient in some semaphore implementations.
+        /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">  if n is negative.
+        /// 
+        /// </exception>
+        public virtual void Release(long n)
+        {
+            lock (this)
+            {
+                if (n < 0)
+                    throw new ArgumentOutOfRangeException("n", n, "Negative argument");
+				
+                nPermits += n;
+                for (long i = 0; i < n; ++i)
+                    Monitor.Pulse(this);
+            }
+        }
+
+        /// <summary> Return the current number of available permits.
+        /// Returns an accurate, but possibly unstable value,
+        /// that may change immediately after returning.
+        /// </summary>
+        public virtual long Permits
+	    {
+	        get
+	        {
+	            lock (this)
+	            {
+	                return nPermits;
+	            }
+	        }
+	    }
+
+
+	}
+}
diff --git a/src/Spring/Spring.Core/Threading/SyncHolder.cs b/src/Spring/Spring.Core/Threading/SyncHolder.cs
new file mode 100644
index 00000000..fe03a134
--- /dev/null
+++ b/src/Spring/Spring.Core/Threading/SyncHolder.cs
@@ -0,0 +1,70 @@
+#region License
+/*
+* Copyright © 2002-2005 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;
+
+namespace Spring.Threading
+{
+	/// <summary>
+	/// Utility class to use an <see cref="ISync"/> with the 
+	/// C# <c>using () {}</c> idiom
+	/// </summary>
+	public class SyncHolder : IDisposable
+	{
+        ISync _sync;
+
+        /// <summary>
+        /// Creates a new <see cref="SyncHolder"/> trying to <see cref="ISync.Acquire"/> the given 
+        /// <see cref="ISync"/>
+        /// </summary>
+        /// <param name="sync">the <see cref="ISync"/> to be held</param>
+	    public SyncHolder (ISync sync)
+	    {
+            Init (sync);
+	    }
+
+	    /// <summary>
+        /// Creates a new <see cref="SyncHolder"/> trying to <see cref="ISync.Attempt"/> the given 
+        /// <see cref="ISync"/>
+        /// </summary>
+        /// <param name="sync">the <see cref="ISync"/> to be held</param>
+        /// <param name="msecs">millisecond to try to acquire the lock</param>
+	    public SyncHolder (ISync sync, long msecs)
+	    {
+            Init(new TimeoutSync(sync, msecs));
+	    }
+
+	    /// <summary>
+        /// Releases the held <see cref="ISync"/>
+        /// </summary>
+	    public void Dispose ()
+        {
+	        _sync.Release();
+        }
+
+        /// <summary>
+        /// initializes and acquire access to the <see cref="ISync"/>
+        /// </summary>
+        /// <param name="sync"></param>
+        private void Init (ISync sync)
+        {
+            this._sync = sync;
+            _sync.Acquire();
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Threading/ThreadStaticStorage.cs b/src/Spring/Spring.Core/Threading/ThreadStaticStorage.cs
new file mode 100644
index 00000000..ab79444d
--- /dev/null
+++ b/src/Spring/Spring.Core/Threading/ThreadStaticStorage.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections;
+
+namespace Spring.Threading
+{
+    /// <summary>
+    /// Implements <see cref="IThreadStorage"/> by using a <see cref="ThreadStaticAttribute"/> hashtable.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ThreadStaticStorage.cs,v 1.1 2007/02/02 21:30:34 oakinger Exp $</version>  
+    public class ThreadStaticStorage : IThreadStorage
+    {
+        [ThreadStatic]
+        private static Hashtable data;
+
+        private static Hashtable Data
+        {
+            get
+            {
+                if (data == null) data = new Hashtable();
+                return data;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves an object with the specified name.
+        /// </summary>
+        /// <param name="name">The name of the item.</param>
+        /// <returns>The object in the call context associated with the specified name or null if no object has been stored previously</returns>
+        public object GetData(string name)
+        {
+            return Data[name];
+        }
+
+        /// <summary>
+        /// Stores a given object and associates it with the specified name.
+        /// </summary>
+        /// <param name="name">The name with which to associate the new item.</param>
+        /// <param name="value">The object to store in the call context.</param>
+        public void SetData(string name, object value)
+        {
+            Data[name] = value;
+        }
+
+        /// <summary>
+        /// Empties a data slot with the specified name.
+        /// </summary>
+        /// <param name="name">The name of the data slot to empty.</param>
+        public void FreeNamedDataSlot(string name)
+        {
+            Data.Remove(name);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Threading/TimeoutException.cs b/src/Spring/Spring.Core/Threading/TimeoutException.cs
new file mode 100644
index 00000000..0b129e83
--- /dev/null
+++ b/src/Spring/Spring.Core/Threading/TimeoutException.cs
@@ -0,0 +1,128 @@
+#region License
+
+/*
+* Copyright © 2002-2005 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.Runtime.Serialization;
+using System.Threading;
+
+
+/*
+Originally written by Doug Lea and released into the public domain.
+This may be used for any purposes whatsoever without acknowledgment.
+Thanks for the assistance and support of Sun Microsystems Labs,
+and everyone contributing, testing, and using this code.
+*/
+namespace Spring.Threading
+{
+	/// <summary> Thrown by synchronization classes that report
+	/// timeouts via exceptions. The exception is treated
+	/// as a form (subclass) of InterruptedException. This both
+	/// simplifies handling, and conceptually reflects the fact that
+	/// timed-out operations are artificially interrupted by timers.
+	/// 
+	/// </summary>
+	[Serializable]
+	public class TimeoutException : ThreadInterruptedException
+	{
+		/// <summary> The approximate time that the operation lasted before 
+		/// this timeout exception was thrown.
+		/// 
+		/// </summary>
+		private readonly long _duration;
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Threading.TimeoutException"/> class.
+		/// </summary>
+		public TimeoutException( ) : base(){}
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Threading.TimeoutException"/> class with the
+		/// specified message.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public TimeoutException( string message ) : base( message ){}
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Threading.TimeoutException"/> class with the
+		/// specified message.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="innerException">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public TimeoutException( string message, Exception innerException ) : base( message, innerException ){}
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Threading.TimeoutException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected TimeoutException( SerializationInfo info, StreamingContext context )
+			: base( info, context )
+		{
+			_duration = info.GetInt32( "duration" );
+		}
+		/// <summary>
+		/// Override of GetObjectData to allow for private serialization
+		/// </summary>
+		/// <param name="info">serialization info</param>
+		/// <param name="context">streaming context</param>
+		public override void GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+			info.AddValue( "duration", _duration );
+			base.GetObjectData( info, context );
+		}
+		/// <summary> Constructs a TimeoutException with given duration value.
+		/// 
+		/// </summary>
+		public TimeoutException( long time )
+		{
+			_duration = time;
+		}
+		/// <summary> Constructs a TimeoutException with the
+		/// specified duration value and detail message.
+		/// </summary>
+		public TimeoutException( long time, String message ) : base( message )
+		{
+			_duration = time;
+		}
+		/// <summary> 
+		/// Gets the approximate time that the operation lasted before 
+		/// this timeout exception was thrown.
+		/// </summary>
+		public long Duration
+		{
+			get
+			{
+				return _duration;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Threading/TimeoutSync.cs b/src/Spring/Spring.Core/Threading/TimeoutSync.cs
new file mode 100644
index 00000000..b28cc7fb
--- /dev/null
+++ b/src/Spring/Spring.Core/Threading/TimeoutSync.cs
@@ -0,0 +1,79 @@
+#region License
+/*
+* Copyright © 2002-2005 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
+/*
+Originally written by Doug Lea and released into the public domain.
+This may be used for any purposes whatsoever without acknowledgment.
+Thanks for the assistance and support of Sun Microsystems Labs,
+and everyone contributing, testing, and using this code.
+*/
+
+namespace Spring.Threading
+{
+	
+	/// <summary> A TimeoutSync is an adaptor class that transforms all
+	/// calls to acquire to instead invoke attempt with a predetermined
+	/// timeout value.
+	/// </summary>
+	/// <seealso cref="ISync"/>		
+	public class TimeoutSync : ISync
+	{
+		/// <summary>
+		/// the adapted sync
+		/// </summary>
+		protected readonly internal ISync sync_; 
+        /// <summary>
+        /// timeout value
+        /// </summary>
+		protected readonly internal long timeout_; 
+		
+		/// <summary> Create a TimeoutSync using the given Sync object, and
+		/// using the given timeout value for all calls to acquire.
+		/// </summary>
+		public TimeoutSync(ISync sync, long timeout)
+		{
+			sync_ = sync;
+			timeout_ = timeout;
+		}
+		
+        /// <summary>
+        /// Try to acquire the sync before the timeout
+        /// </summary>
+        /// <exception cref="TimeoutException">In case a time out occurred</exception>
+		public virtual void  Acquire()
+		{
+			if (!sync_.Attempt(timeout_))
+				throw new TimeoutException(timeout_);
+		}
+
+		/// <summary>
+		/// <see cref="ISync.Attempt"/>
+		/// </summary>
+		public virtual bool Attempt(long msecs)
+		{
+			return sync_.Attempt(msecs);
+		}
+		
+        /// <summary>
+        /// <see cref="ISync.Release"/>
+        /// </summary>
+		public virtual void  Release()
+		{
+			sync_.Release();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Threading/Utils.cs b/src/Spring/Spring.Core/Threading/Utils.cs
new file mode 100644
index 00000000..97a61aa0
--- /dev/null
+++ b/src/Spring/Spring.Core/Threading/Utils.cs
@@ -0,0 +1,136 @@
+#region License
+
+/*
+* Copyright © 2002-2005 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.Threading;
+
+namespace Spring.Threading
+{
+	/// <summary>
+	/// Support to account for differences between java nad .NET:
+	/// <ul>
+	/// </ul>
+	/// </summary>
+	public class Utils
+	{
+		private Utils()
+		{
+		}
+
+		/// <summary>
+		/// .NET threads have not a method to check if they have been interrupted.
+		/// Moreover, differently from java threads, when entering <c>lock</c>ed
+		/// blocks, Monitor, Sleep, SpinWait and so on, a <see cref="ThreadInterruptedException"/> 
+		/// will be raised by the runtime.
+		/// <p/>Spring.Threading classes usually call this method before entering a lock block, to mirror java code
+		/// <p>Usually this is non issue because the same exception will be raised entering the monitor 
+		/// associated with the lock (<seealso href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfsystemthreadingmonitorclassentertopic.asp"/>) 
+		/// </p>
+		/// </summary>
+		/// <exception cref="ThreadInterruptedException">if the thread has been interrupted</exception>
+		public static void FailFastIfInterrupted()
+		{
+			Thread.Sleep(0);
+		}
+
+		/// <summary>
+		/// Placeholder for <c>java.lang.System.currentTimeMillis</c>
+		/// </summary>
+		/// <returns>The current machine time in milliseconds</returns>
+		public static long CurrentTimeMillis
+		{
+			get { return ToTimeMillis(DateTime.Now); }
+		}
+
+		/// <summary>
+		/// Normalize the given <see cref="System.DateTime"/> so that 
+		/// is is comparable with <see cref="Utils.CurrentTimeMillis"/>.
+		/// </summary>
+		/// <param name="date">Date.</param>
+		/// <returns></returns>
+		public static long ToTimeMillis(DateTime date)
+		{
+			// may be also new TimeSpan(DateTime.UtcNow.Ticks).TotalMilliseconds;
+			// see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dv_jlca/html/vberrjavalangsystemcurrenttimemillis.asp
+			return (date.Ticks - 621355968000000000)/10000;
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="one"></param>
+		/// <param name="another"></param>
+		/// <returns>the difference between millisecodns of the first and second date</returns>
+		public static long DeltaTimeMillis(DateTime one, DateTime another)
+		{
+			return (one.Ticks - another.Ticks)/10000;
+		}
+
+		/// <summary>
+		/// Returns the number of nanoseconds for the current value of <see cref="System.DateTime.Now"/>
+		/// </summary>
+		/// <returns>Current number of nanoseconds</returns>
+		public static long CurrentNanoSeconds()
+		{
+			return (DateTime.Now.Ticks - 621355968000000000)/10000*1000000;
+		}
+
+		/// <summary>
+		/// Returns the number of nano seconds represented by the <paramref name="timeSpan"/>
+		/// </summary>
+		/// <param name="timeSpan"><see cref="System.TimeSpan"/> to use</param>
+		/// <returns>Number of nano seconds for <parmref name="timeSpan"/></returns>
+		public static long TimeSpanNanoSeconds(TimeSpan timeSpan)
+		{
+			return (timeSpan.Ticks - 621355968000000000)/10000*1000000;
+		}
+		/// <summary>
+		/// Returns a <see cref="System.TimeSpan"/> representing the number of nanoseconds passed in via <paramref name="nanoSeconds"/>.
+		/// </summary>
+		/// <param name="nanoSeconds">Number of nanoseconds.</param>
+		/// <returns><see cref="System.TimeSpan"/> representing the number of nanoseconds passed in.</returns>
+		public static TimeSpan NanoSecondsTimeSpan(long nanoSeconds )
+		{
+			int milliseconds = Convert.ToInt32(nanoSeconds / 1000000);
+			return new TimeSpan(0,0,0,0, milliseconds);	
+		}
+
+		/// <summary>
+		/// Has been interrupted this thread
+		/// </summary>
+		public static bool ThreadInterrupted
+		{
+			get
+			{
+				bool interrupted = false;
+				try
+				{
+					Utils.FailFastIfInterrupted();
+				}
+				catch (ThreadInterruptedException)
+				{
+					Thread.CurrentThread.Interrupt();
+					interrupted = true;
+				}
+				return interrupted;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/ArrayUtils.cs b/src/Spring/Spring.Core/Util/ArrayUtils.cs
new file mode 100644
index 00000000..2428ebc0
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/ArrayUtils.cs
@@ -0,0 +1,163 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Text;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Various utility methods relating to the manipulation of arrays.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ArrayUtils.cs,v 1.15 2007/02/17 08:28:12 bbaia Exp $</version>
+    public sealed class ArrayUtils
+    {
+        /// <summary>
+        /// Checks if the given array or collection is null or has no elements.
+        /// </summary>
+        /// <param name="collection"></param>
+        /// <returns></returns>
+        public static bool HasLength(ICollection collection)
+        {
+            return !( (collection == null) || (collection.Count == 0) );
+        }
+
+        /// <summary>
+        /// Tests equality of two single-dimensional arrays by checking each element
+        /// for equality.
+        /// </summary>
+        /// <param name="a">The first array to be checked.</param>
+        /// <param name="b">The second array to be checked.</param>
+        /// <returns>True if arrays are the same, false otherwise.</returns>
+        public static bool AreEqual(Array a, Array b)
+        {
+            if (a == null && b == null)
+            {
+                return true;
+            }
+
+            if (a != null && b != null)
+            {
+                if (a.Length == b.Length)
+                {
+                    for (int i = 0; i < a.Length; i++)
+                    {
+                        object elemA = a.GetValue(i);
+                        object elemB = b.GetValue(i);
+                        
+                        if (elemA is Array && elemB is Array)
+                        {
+                            if (!AreEqual(elemA as Array, elemB as Array))
+                            {
+                                return false;
+                            }
+                        }
+                        else if (!Equals(elemA, elemB))
+                        {
+                            return false;
+                        }
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns hash code for an array that is generated based on the elements.
+        /// </summary>
+        /// <remarks>
+        /// Hash code returned by this method is guaranteed to be the same for
+        /// arrays with equal elements.
+        /// </remarks>
+        /// <param name="array">
+        /// Array to calculate hash code for.
+        /// </param>
+        /// <returns>
+        /// A hash code for the specified array.
+        /// </returns>
+        public static int GetHashCode(Array array)
+        {
+            int hashCode = 0;
+
+            if (array != null)
+            {
+                for (int i = 0; i < array.Length; i++)
+                {
+                    object el = array.GetValue(i);
+                    if (el != null)
+                    {
+                        if (el is Array)
+                        {
+                            hashCode += 17 * GetHashCode(el as Array);
+                        }
+                        else
+                        {
+                            hashCode += 13 * el.GetHashCode();
+                        }
+                    }
+                }
+            }
+
+            return hashCode;
+        }
+
+        /// <summary>
+        /// Returns string representation of an array.
+        /// </summary>
+        /// <param name="array">
+        /// Array to return as a string.
+        /// </param>
+        /// <returns>
+        /// String representation of the specified <paramref name="array"/>.
+        /// </returns>
+        public static string ToString(Array array)
+        {
+            if (array == null)
+            {
+                return "null";
+            }
+
+            StringBuilder sb = new StringBuilder();
+            sb.Append('{');
+
+            for (int i = 0; i < array.Length; i++)
+            {
+                object val = array.GetValue(i);
+                sb.Append(val == null ? "null" : val.ToString());
+                
+                if (i < array.Length - 1)
+                {
+                    sb.Append(", ");    
+                }
+            }
+
+            sb.Append('}');
+
+            return sb.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/AssertUtils.cs b/src/Spring/Spring.Core/Util/AssertUtils.cs
new file mode 100644
index 00000000..6c2664e7
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/AssertUtils.cs
@@ -0,0 +1,233 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Assertion utility methods that simplify things such as argument checks.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Not intended to be used directly by applications.
+	/// </p>
+	/// </remarks>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: AssertUtils.cs,v 1.13 2008/03/14 10:45:08 bbaia Exp $</version>
+	public sealed class AssertUtils
+	{
+		/// <summary>
+		/// Checks the value of the supplied <paramref name="argument"/> and throws an
+		/// <see cref="System.ArgumentNullException"/> if it is <see langword="null"/>.
+		/// </summary>
+		/// <param name="argument">The object to check.</param>
+		/// <param name="name">The argument name.</param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="argument"/> is <see langword="null"/>.
+		/// </exception>
+		public static void ArgumentNotNull(object argument, string name)
+		{
+			if (argument == null)
+			{
+				throw new ArgumentNullException (
+					name,
+					string.Format (
+						CultureInfo.InvariantCulture,
+					"Argument '{0}' cannot be null.", name));
+			}
+		}
+
+		/// <summary>
+		/// Checks the value of the supplied <paramref name="argument"/> and throws an
+		/// <see cref="System.ArgumentNullException"/> if it is <see langword="null"/>.
+		/// </summary>
+		/// <param name="argument">The object to check.</param>
+		/// <param name="name">The argument name.</param>
+		/// <param name="message">
+		/// An arbitrary message that will be passed to any thrown
+		/// <see cref="System.ArgumentNullException"/>.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="argument"/> is <see langword="null"/>.
+		/// </exception>
+		public static void ArgumentNotNull(object argument, string name, string message)
+		{
+			if (argument == null)
+			{
+				throw new ArgumentNullException(name, message);
+			}
+		}
+
+		/// <summary>
+		/// Checks the value of the supplied string <paramref name="argument"/> and throws an
+        /// <see cref="System.ArgumentNullException"/> if it is <see langword="null"/> or
+		/// contains only whitespace character(s).
+		/// </summary>
+		/// <param name="argument">The string to check.</param>
+		/// <param name="name">The argument name.</param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="argument"/> is <see langword="null"/> or
+		/// contains only whitespace character(s).
+		/// </exception>
+		public static void ArgumentHasText(string argument, string name)
+		{
+			if (StringUtils.IsNullOrEmpty(argument))
+			{
+				throw new ArgumentNullException (
+					name,
+					string.Format (
+					CultureInfo.InvariantCulture,
+					"Argument '{0}' cannot be null or resolve to an empty string : '{1}'.", name, argument));
+			}
+		}
+
+		/// <summary>
+		/// Checks the value of the supplied string <paramref name="argument"/> and throws an
+		/// <see cref="System.ArgumentNullException"/> if it is <see langword="null"/> or
+		/// contains only whitespace character(s).
+		/// </summary>
+		/// <param name="argument">The string to check.</param>
+		/// <param name="name">The argument name.</param>
+		/// <param name="message">
+		/// An arbitrary message that will be passed to any thrown
+		/// <see cref="System.ArgumentNullException"/>.
+		/// </param>
+		/// <exception cref="System.ArgumentNullException">
+		/// If the supplied <paramref name="argument"/> is <see langword="null"/> or
+		/// contains only whitespace character(s).
+		/// </exception>
+		public static void ArgumentHasText(string argument, string name, string message)
+		{
+			if (StringUtils.IsNullOrEmpty(argument))
+			{
+				throw new ArgumentNullException(name, message);
+			}
+		}
+
+        /// <summary>
+        /// Checks the value of the supplied <see cref="ICollection"/> <paramref name="argument"/> and throws
+        /// an <see cref="ArgumentNullException"/> if it is <see langword="null"/> or contains no elements.
+        /// </summary>
+        /// <param name="argument">The array or collection to check.</param>
+        /// <param name="name">The argument name.</param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="argument"/> is <see langword="null"/> or
+        /// contains no elements.
+        /// </exception>
+        public static void ArgumentHasLength(ICollection argument, string name)
+        {
+            if (!ArrayUtils.HasLength(argument))
+            {
+                throw new ArgumentNullException(
+                    name,
+                    string.Format(
+                    CultureInfo.InvariantCulture,
+                    "Argument '{0}' cannot be null or resolve to an empty array", name));
+            }
+        }
+
+        /// <summary>
+        /// Checks the value of the supplied <see cref="ICollection"/> <paramref name="argument"/> and throws
+        /// an <see cref="ArgumentNullException"/> if it is <see langword="null"/> or contains no elements.
+        /// </summary>
+        /// <param name="argument">The array or collection to check.</param>
+        /// <param name="name">The argument name.</param>
+        /// <param name="message">An arbitrary message that will be passed to any thrown <see cref="System.ArgumentNullException"/>.</param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="argument"/> is <see langword="null"/> or
+        /// contains no elements.
+        /// </exception>
+        public static void ArgumentHasLength(ICollection argument, string name, string message)
+        {
+            if(!ArrayUtils.HasLength(argument))
+            {
+                throw new ArgumentNullException(name, message);
+            }
+        }
+
+	    /// <summary>
+	    /// Checks whether the specified <paramref name="argument"/> can be cast 
+	    /// into the <paramref name="requiredType"/>.
+	    /// </summary>
+	    /// <param name="argument">
+	    /// The argument to check.
+	    /// </param>
+	    /// <param name="argumentName">
+	    /// The name of the argument to check.
+	    /// </param>
+	    /// <param name="requiredType">
+	    /// The required type for the argument.
+	    /// </param>
+        /// <param name="message">
+        /// An arbitrary message that will be passed to any thrown
+        /// <see cref="System.ArgumentException"/>.
+        /// </param>
+        public static void AssertArgumentType(object argument, string argumentName, Type requiredType, string message)
+        {
+            if (argument != null && requiredType != null && !requiredType.IsAssignableFrom(argument.GetType()))
+            {
+                throw new ArgumentException(message, argumentName);
+            }
+        }
+
+        /// <summary>
+        /// Assert a bool expression, throwing <code>InvalidOperationException</code>
+        /// if the expression is <code>false</code>.
+        /// </summary>
+        /// <param name="expression">a boolean expression.</param>
+        /// <param name="message">The exception message to use if the assertion fails</param>
+        /// <exception cref="InvalidOperationException">if expression is <code>false</code></exception>
+        public static void State(bool expression, string message)
+        {
+            if (!expression)
+            {
+                throw new InvalidOperationException(message);
+            }
+        }
+        
+	    #region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="Spring.Util.AssertUtils"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such exposes no public constructors.
+		/// </p>
+		/// </remarks>
+		private AssertUtils()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/CollectionUtils.cs b/src/Spring/Spring.Core/Util/CollectionUtils.cs
new file mode 100644
index 00000000..266edabc
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/CollectionUtils.cs
@@ -0,0 +1,207 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Miscellaneous collection utility methods.
+	/// </summary>
+	/// <remarks>
+	/// Mainly for internal use within the framework.
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: CollectionUtils.cs,v 1.9 2006/04/09 07:19:00 markpollack Exp $</version>
+	public sealed class CollectionUtils
+	{
+		#region Methods
+
+		/// <summary>
+		/// Determine whether a given collection only contains
+		/// a single unique object
+		/// </summary>
+		/// <param name="coll"></param>
+		/// <returns></returns>
+		public static bool HasUniqueObject(ICollection coll)
+		{
+			if (coll.Count == 0)
+			{
+				return false;
+			}
+			object candidate = null;
+			foreach (object elem in coll)
+			{
+				if (candidate == null)
+				{
+					candidate = elem;
+				}
+				else if (candidate != elem)
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+
+		/// <summary>
+		/// Determines whether the <paramref name="collection"/> contains the specified <paramref name="element"/>.
+		/// </summary>
+		/// <param name="collection">The collection to check.</param>
+		/// <param name="element">The object to locate in the collection.</param>
+		/// <returns><see lang="true"/> if the element is in the collection, <see lang="false"/> otherwise.</returns>
+		public static bool Contains(ICollection collection, Object element)
+		{
+			if (collection == null)
+			{
+				throw new ArgumentNullException("Collection cannot be null.");
+			}
+			MethodInfo method;
+			method = collection.GetType().GetMethod("contains", BindingFlags.IgnoreCase | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public);
+			if (null == method)
+			{
+				throw new InvalidOperationException("Collection type " + collection.GetType() + " does not implement a Contains() method.");
+			}
+			return (bool) method.Invoke(collection, new Object[] {element});
+		}
+
+		/// <summary>
+		/// Adds the specified <paramref name="element"/> to the specified <paramref name="collection"/> .
+		/// </summary>
+		/// <param name="collection">The collection to add the element to.</param>
+		/// <param name="element">The object to add to the collection.</param>
+		public static void Add(ICollection collection, object element)
+		{
+			if (collection == null)
+			{
+				throw new ArgumentNullException("Collection cannot be null.");
+			}
+			MethodInfo method;
+			method = collection.GetType().GetMethod("add", BindingFlags.IgnoreCase | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public);
+			if (null == method)
+			{
+				throw new InvalidOperationException("Collection type " + collection.GetType() + " does not implement a Add() method.");
+			}
+			method.Invoke(collection, new Object[] {element});
+		}
+
+		/// <summary>
+		/// Determines whether the collection contains all the elements in the specified collection.
+		/// </summary>
+		/// <param name="targetCollection">The collection to check.</param>
+		/// <param name="sourceCollection">Collection whose elements would be checked for containment.</param>
+		/// <returns>true if the target collection contains all the elements of the specified collection.</returns>
+		public static bool ContainsAll(ICollection targetCollection, ICollection sourceCollection)
+		{
+			if (targetCollection == null || sourceCollection == null)
+			{
+				throw new ArgumentNullException("Collection cannot be null.");
+			}
+			if ( sourceCollection.Count == 0 && targetCollection.Count > 1 )
+				return true;
+
+			IEnumerator sourceCollectionEnumerator = sourceCollection.GetEnumerator();
+
+			bool contains = false;
+
+			MethodInfo method;
+			method = targetCollection.GetType().GetMethod("containsAll", BindingFlags.IgnoreCase | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public);
+
+			if (method != null)
+				contains = (bool) method.Invoke(targetCollection, new Object[] {sourceCollection});
+			else
+			{
+				method = targetCollection.GetType().GetMethod("Contains", BindingFlags.IgnoreCase | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public);
+				if (method == null)
+				{
+					throw new InvalidOperationException("Target collection does not implment a Contains() or ContainsAll() method.");
+				}
+				while (sourceCollectionEnumerator.MoveNext() == true)
+				{
+					if ((contains = (bool) method.Invoke(targetCollection, new Object[] {sourceCollectionEnumerator.Current})) == false)
+						break;
+				}
+			}
+			return contains;
+		}
+
+		/// <summary>
+		/// Removes all the elements from the target collection that are contained in the source collection.
+		/// </summary>
+		/// <param name="targetCollection">Collection where the elements will be removed.</param>
+		/// <param name="sourceCollection">Elements to remove from the target collection.</param>
+		public static void RemoveAll(ICollection targetCollection, ICollection sourceCollection)
+		{
+			if (targetCollection == null || sourceCollection == null)
+			{
+				throw new ArgumentNullException("Collection cannot be null.");
+			}
+			ArrayList al = ToArrayList(sourceCollection);
+
+			MethodInfo method;
+				method = targetCollection.GetType().GetMethod("removeAll", BindingFlags.IgnoreCase | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public);
+
+				if (method != null)
+					method.Invoke(targetCollection, new Object[] {al});
+				else
+				{
+					method = targetCollection.GetType().GetMethod("Remove", BindingFlags.IgnoreCase | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public, null, new Type[1] {typeof(object)}, null );
+					MethodInfo methodContains = targetCollection.GetType().GetMethod("Contains", BindingFlags.IgnoreCase | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public);
+					if ( method == null )
+					{
+						throw new InvalidOperationException("Target Collection must implement either a RemoveAll() or Remove() method.");
+					}
+					if ( methodContains == null )
+					{
+						throw new InvalidOperationException("TargetCollection must implement a Contains() method.");
+					}
+					IEnumerator e = al.GetEnumerator();
+					while (e.MoveNext() == true)
+					{
+						while ((bool) methodContains.Invoke(targetCollection, new Object[] {e.Current}) == true)
+							method.Invoke(targetCollection, new Object[] {e.Current});
+					}
+				}
+		}
+
+		/// <summary>
+		/// Converts an <see cref="System.Collections.ICollection"/>instance to an <see cref="System.Collections.ArrayList"/> instance.
+		/// </summary>
+		/// <param name="inputCollection">The <see cref="System.Collections.ICollection"/> instance to be converted.</param>
+		/// <returns>An <see cref="System.Collections.ArrayList"/> instance in which its elements are the elements of the <see cref="System.Collections.ICollection"/> instance.</returns>
+		/// <exception cref="System.ArgumentNullException">if the <paramref name="inputCollection"/> is null.</exception>
+		public static ArrayList ToArrayList(ICollection inputCollection)
+		{
+			if ( inputCollection == null )
+			{
+				throw new ArgumentNullException("Collection cannot be null.");
+			}
+			return new ArrayList(inputCollection);
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/CompareUtils.cs b/src/Spring/Spring.Core/Util/CompareUtils.cs
new file mode 100644
index 00000000..16c8e756
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/CompareUtils.cs
@@ -0,0 +1,90 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Utility class containing helper methods for object comparison.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CompareUtils.cs,v 1.2 2007/02/17 08:28:12 bbaia Exp $</version>
+    public class CompareUtils
+    {
+        /// <summary>Compares two objects.</summary>
+        /// <param name="first">First object.</param>
+        /// <param name="second">Second object.</param>
+        /// <returns>
+        /// 0, if objects are equal; 
+        /// less than zero, if the first object is smaller than the second one;
+        /// greater than zero, if the first object is greater than the second one.</returns>
+        public static int Compare(object first, object second)
+        {
+            // anything is greater than null, unless both operands are null
+            if (first == null)
+            {
+                return (second == null ? 0 : -1);
+            }
+            else if (second == null)
+            {
+                return 1;
+            }
+
+            if (!first.GetType().Equals(second.GetType()))
+            {
+                if (!CoerceTypes(ref first, ref second))
+                {
+                    throw new ArgumentException("Cannot compare instances of ["
+                        + first.GetType().FullName
+                        + "] and ["
+                        + second.GetType().FullName
+                        + "] because they cannot be coerced to the same type.");
+                }
+            }
+
+            if (first is IComparable)
+            {
+                return ((IComparable)first).CompareTo(second);
+            }
+            else
+            {
+                throw new ArgumentException("Cannot compare instances of the type ["
+                    + first.GetType().FullName
+                    + "] because it doesn't implement IComparable");
+            }
+        }
+
+        private static bool CoerceTypes(ref object left, ref object right)
+        {
+            if (NumberUtils.IsNumber(left) && NumberUtils.IsNumber(right))
+            {
+                NumberUtils.CoerceTypes(ref right, ref left);
+                return true;
+            }
+            return false;
+        }
+
+    }
+}
diff --git a/src/Spring/Spring.Core/Util/ConfigurationUtils.cs b/src/Spring/Spring.Core/Util/ConfigurationUtils.cs
new file mode 100644
index 00000000..a544b76d
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/ConfigurationUtils.cs
@@ -0,0 +1,222 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Configuration;
+using System.Xml;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Utility class for .NET configuration files management.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ConfigurationUtils.cs,v 1.5 2008/01/10 16:37:43 bbaia Exp $</version>
+    public class ConfigurationUtils
+    {
+        /// <summary>
+        /// Parses the configuration section.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Primary purpose of this method is to allow us to parse and 
+        /// load configuration sections using the same API regardless
+        /// of the .NET framework version.
+        /// </p>
+        /// <p>
+        /// If Microsoft paid a bit more attention to preserving backwards
+        /// compatibility we would not even need it, but... :(
+        /// </p>
+        /// </remarks>
+        /// <param name="sectionName">Name of the configuration section.</param>
+        /// <returns>Object created by a corresponding <see cref="IConfigurationSectionHandler"/>.</returns>
+        public static object GetSection(string sectionName)
+        {
+#if !NET_2_0
+            return ConfigurationSettings.GetConfig(sectionName.TrimEnd('/'));
+#else
+            return ConfigurationManager.GetSection(sectionName.TrimEnd('/'));
+#endif
+        }
+
+        /// <summary>
+        /// Refresh the configuration section.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Primary purpose of this method is to allow us to parse and 
+        /// load configuration sections using the same API regardless
+        /// of the .NET framework version.
+        /// </p>
+        /// <p>
+        /// If Microsoft paid a bit more attention to preserving backwards
+        /// compatibility we would not even need it, but... :(
+        /// </p>
+        /// </remarks>
+        /// <param name="sectionName">Name of the configuration section.</param>
+        public static void RefreshSection(string sectionName)
+        {
+#if !NET_2_0
+            // TODO : Add support for .NET 1.x
+#else
+            ConfigurationManager.RefreshSection(sectionName);
+#endif
+        }
+
+        /// <summary>
+        /// Creates the configuration exception.
+        /// </summary>
+        /// <param name="message">The message to display to the client when the exception is thrown.</param>
+        /// <param name="inner">The inner exception.</param>
+        /// <param name="fileName">Name of the configuration file.</param>
+        /// <param name="line">The line where exception occured.</param>
+        /// <returns>Configuration exception.</returns>
+        public static Exception CreateConfigurationException(string message, Exception inner, string fileName, int line)
+        {
+#if !NET_2_0
+            return new ConfigurationException(message, inner, fileName, line);
+#else
+            return new ConfigurationErrorsException(message, inner, fileName, line);
+#endif
+        }
+
+        /// <summary>
+        /// Creates the configuration exception.
+        /// </summary>
+        /// <param name="message">The message to display to the client when the exception is thrown.</param>
+        /// <param name="fileName">Name of the configuration file.</param>
+        /// <param name="line">The line where exception occured.</param>
+        /// <returns>Configuration exception.</returns>
+        public static Exception CreateConfigurationException(string message, string fileName, int line)
+        {
+            return CreateConfigurationException(message, null, fileName, line);
+        }
+
+        /// <summary>
+        /// Creates the configuration exception.
+        /// </summary>
+        /// <param name="message">The message to display to the client when the exception is thrown.</param>
+        /// <param name="inner">The inner exception.</param>
+        /// <param name="node">XML node where exception occured.</param>
+        /// <returns>Configuration exception.</returns>
+        public static Exception CreateConfigurationException(string message, Exception inner, XmlNode node)
+        {
+#if !NET_2_0
+            return new ConfigurationException(message, inner, node);
+#else
+            return new ConfigurationErrorsException(message, inner, node);
+#endif
+        }
+
+        /// <summary>
+        /// Creates the configuration exception.
+        /// </summary>
+        /// <param name="message">The message to display to the client when the exception is thrown.</param>
+        /// <param name="node">XML node where exception occured.</param>
+        /// <returns>Configuration exception.</returns>
+        public static Exception CreateConfigurationException(string message, XmlNode node)
+        {
+            return CreateConfigurationException(message, null, node);
+        }
+
+        /// <summary>
+        /// Creates the configuration exception.
+        /// </summary>
+        /// <param name="message">The message to display to the client when the exception is thrown.</param>
+        /// <param name="inner">The inner exception.</param>
+        /// <returns>Configuration exception.</returns>
+        public static Exception CreateConfigurationException(string message, Exception inner)
+        {
+#if !NET_2_0
+            return new ConfigurationException(message, inner);
+#else
+            return new ConfigurationErrorsException(message, inner);
+#endif
+        }
+
+        /// <summary>
+        /// Creates the configuration exception.
+        /// </summary>
+        /// <param name="message">The message to display to the client when the exception is thrown.</param>
+        /// <returns>Configuration exception.</returns>
+        public static Exception CreateConfigurationException(string message)
+        {
+            return CreateConfigurationException(message, (Exception) null);
+        }
+
+        /// <summary>
+        /// Creates the configuration exception.
+        /// </summary>
+        /// <returns>Configuration exception.</returns>
+        public static Exception CreateConfigurationException()
+        {
+            return CreateConfigurationException(null, (Exception) null);
+        }
+
+        /// <summary>
+        /// Determines whether the specified exception is configuration exception.
+        /// </summary>
+        /// <param name="exception">The exception to check.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified exception is configuration exception; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool IsConfigurationException(Exception exception)
+        {
+#if !NET_2_0
+            return exception is ConfigurationException;
+#else
+            return exception is ConfigurationErrorsException;
+#endif
+        }
+
+        /// <summary>
+        /// Returns the line number of the specified node.
+        /// </summary>
+        /// <param name="node">Node to get the line number for.</param>
+        /// <returns>The line number of the specified node.</returns>
+        public static int GetLineNumber(XmlNode node)
+        {
+#if !NET_2_0
+            return ConfigurationException.GetXmlNodeLineNumber(node);
+#else
+            return ConfigurationErrorsException.GetLineNumber(node);
+#endif
+        }
+
+        /// <summary>
+        /// Returns the name of the file specified node is defined in.
+        /// </summary>
+        /// <param name="node">Node to get the file name for.</param>
+        /// <returns>The name of the file specified node is defined in.</returns>
+        public static string GetFileName(XmlNode node)
+        {
+#if !NET_2_0
+            return ConfigurationException.GetXmlNodeFilename(node);
+#else
+            return ConfigurationErrorsException.GetFilename(node);
+#endif
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/DelegateInfo.cs b/src/Spring/Spring.Core/Util/DelegateInfo.cs
new file mode 100644
index 00000000..7ebdbe57
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/DelegateInfo.cs
@@ -0,0 +1,255 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Discovers the attributes of a <see cref="System.Delegate"/>
+	/// <see cref="System.Type"/> and provides access to the
+	/// <see cref="System.Delegate"/> <see cref="System.Type"/>s metadata.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: DelegateInfo.cs,v 1.9 2006/04/09 07:19:00 markpollack Exp $</version>
+	public sealed class DelegateInfo
+	{
+		#region Constants
+
+		/// <summary>
+		/// The method name associated with a delegate invocation.
+		/// </summary>
+		private const string InvocationMethod = "Invoke";
+
+		#endregion
+
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Util.DelegateInfo"/> class.
+		/// </summary>
+		/// <param name="eventMeta">
+		/// The event used to extract the delegate <see cref="System.Type"/>
+		/// from.
+		/// </param>
+		/// <exception cref="System.NullReferenceException">
+		/// if the supplied <paramref name="eventMeta"/> is
+		/// <see langword="null"/>.
+		/// </exception>
+		public DelegateInfo(EventInfo eventMeta) : this(eventMeta.EventHandlerType)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Util.DelegateInfo"/> class.
+		/// </summary>
+		/// <param name="type">
+		/// The delegate <see cref="System.Type"/>.
+		/// </param>
+		/// <exception cref="System.ArgumentException">
+		/// If the supplied <see cref="System.Type"/> is not a subclass of the
+		/// <see cref="System.Delegate"/> class, or is <see langword="null"/>.
+		/// </exception>
+		public DelegateInfo(Type type)
+		{
+			DelegateType = type;
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// The <see cref="System.Type"/> of the delegate.
+		/// </summary>
+		private Type DelegateType
+		{
+			get { return _delegateType; }
+			set
+			{
+				if (!DelegateInfo.IsDelegate(value))
+				{
+					throw new ArgumentException("Not a delegate Type");
+				}
+				_delegateType = value;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Checks to see if the method encapsulated by the supplied method
+		/// metadata is compatible with the method signature associated with
+		/// this delegate type.
+		/// </summary>
+		/// <param name="method">The method to be checked.</param>
+		/// <returns>
+		/// <see langword="true"/> if the method signature is compatible with
+		/// the signature of this delegate; <see langword="false"/> if not, or
+		/// if the supplied <paramref name="method"/> parameter is
+		/// <see langword="null"/>.
+		/// </returns>
+		public bool IsSignatureCompatible(MethodInfo method)
+		{
+			if (method != null &&
+				method.ReturnType.Equals(GetReturnType()))
+			{
+				ParameterInfo[] methodParameters =
+					method.GetParameters();
+				Type[] delegateParameters = GetParameterTypes();
+				if (methodParameters.Length == delegateParameters.Length)
+				{
+					for (int i = 0; i < methodParameters.Length; ++i)
+					{
+						if (!methodParameters[i].ParameterType.
+							Equals(delegateParameters[i]))
+						{
+							return false;
+						}
+					}
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/// <summary>
+		/// Gets the <see cref="System.Type"/>s of the parameters of the
+		/// method signature associated with this delegate type.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This method will never return <see langword="null"/>; the returned
+		/// <see cref="System.Type"/> array may be empty, but it most certainly
+		/// will not be <see langword="null"/>.
+		/// </p>
+		/// </remarks>
+		/// <returns>
+		/// A <see cref="System.Type"/> array of the parameter
+		/// <see cref="System.Type"/>s; or the <see cref="System.Type.EmptyTypes"/>
+		/// array if the method signature has no parameters.
+		/// </returns>
+		public Type[] GetParameterTypes()
+		{
+			ParameterInfo[] parameters = GetMethod().GetParameters();
+			if (parameters != null
+				&& parameters.Length > 0)
+			{
+				Type[] types = new Type[parameters.Length];
+				for (int i = 0; i < parameters.Length; ++i)
+				{
+					types[i] = parameters[i].ParameterType;
+				}
+				return types;
+			}
+			return Type.EmptyTypes;
+		}
+
+		/// <summary>
+		/// Gets the return <see cref="System.Type"/> of the 
+		/// method signature associated with this delegate type.
+		/// </summary>
+		/// <returns>The return <see cref="System.Type"/>.</returns>
+		public Type GetReturnType()
+		{
+			return GetMethod().ReturnType;
+		}
+
+		/// <summary>
+		/// Gets the metadata about the method signature associated
+		/// with this delegate type.
+		/// </summary>
+		/// <returns>
+		/// The metadata about the method signature associated
+		/// with this delegate type.
+		/// </returns>
+		public MethodInfo GetMethod()
+		{
+			return DelegateType.GetMethod(DelegateInfo.InvocationMethod);
+		}
+
+		/// <summary>
+		/// Determines whether the supplied <see cref="System.Type"/>
+		/// is a <see cref="System.Delegate"/> type.
+		/// </summary>
+		/// <param name="type">
+		/// The <see cref="System.Type"/> to be checked.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if the supplied <see cref="System.Type"/>
+		/// is a <see cref="System.Delegate"/> <see cref="System.Type"/>;
+		/// <see langword="false"/> if not or the supplied
+		/// <paramref name="type"/> is <see langword="null"/>.
+		/// </returns>
+		public static bool IsDelegate(Type type)
+		{
+			return type == null ?
+				false :
+				type.IsSubclassOf(typeof (Delegate));
+		}
+
+		/// <summary>
+		/// Checks if the signature of the supplied <paramref name="handlerMethod"/>
+		/// is compatible with the signature expected by the supplied
+		/// <paramref name="eventMeta"/>.
+		/// </summary>
+		/// <param name="eventMeta">The event to be checked against.</param>
+		/// <param name="handlerMethod">
+		/// The method signature to check for compatibility.
+		/// </param>
+		/// <returns>
+		/// <see langword="true"/> if the signature of the supplied
+		/// <paramref name="handlerMethod"/> is compatible with the signature
+		/// expected by the supplied <paramref name="eventMeta"/>;
+		/// <see langword="false"/> if not or either of the supplied
+		/// parameters is <see langword="null"/>. 
+		/// </returns>
+		/// <seealso cref="Spring.Util.DelegateInfo.IsSignatureCompatible(MethodInfo)"/>
+		public static bool IsSignatureCompatible(
+			EventInfo eventMeta, MethodInfo handlerMethod)
+		{
+			bool compatible = false;
+			if (eventMeta != null
+				&& DelegateInfo.IsDelegate(eventMeta.EventHandlerType))
+			{
+				compatible = new DelegateInfo(eventMeta.EventHandlerType)
+					.IsSignatureCompatible(handlerMethod);
+			}
+			return compatible;
+		}
+
+		#endregion
+
+		#region Fields
+
+		private Type _delegateType;
+
+		#endregion
+	}
+}
diff --git a/src/Spring/Spring.Core/Util/DynamicCodeManager.cs b/src/Spring/Spring.Core/Util/DynamicCodeManager.cs
new file mode 100644
index 00000000..cfceb9d6
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/DynamicCodeManager.cs
@@ -0,0 +1,144 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Reflection;
+using System.Reflection.Emit;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Use this class for obtaining <see cref="ModuleBuilder"/> instances for dynamic code generation.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// The purpose of this class is to provide a simple abstraction for creating and managing dynamic assemblies. 
+    /// </p>
+    /// <note>
+    /// Using this factory you can't define several modules within a single dynamic assembly - only a simple one2one relation between assembly/module is used.
+    /// </note>
+    /// </remarks>
+    /// <example>
+    /// <p>The following excerpt from <see cref="Spring.Proxy.DynamicProxyManager"/> demonstrates usage:</p>
+    /// <code language="c#">
+    /// public class DynamicProxyManager
+    /// {
+    ///   public const string PROXY_ASSEMBLY_NAME = "Spring.Proxy";
+    ///
+    ///   public static TypeBuilder CreateTypeBuilder(string name, Type baseType)
+    ///   {
+    ///     // Generates type name
+    ///     string typeName = String.Format("{0}.{1}_{2}", PROXY_ASSEMBLY_NAME, name, Guid.NewGuid().ToString("N"));
+    ///     ModuleBuilder module = DynamicCodeManager.GetModuleBuilder(PROXY_ASSEMBLY_NAME);
+    ///     return module.DefineType(typeName, PROXY_TYPE_ATTRIBUTES);
+    ///   }
+    /// }
+    /// </code>
+    /// </example>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: DynamicCodeManager.cs,v 1.6 2007/08/08 04:00:16 bbaia Exp $</version>
+    /// <seealso cref="Spring.Reflection.Dynamic.DynamicReflectionManager"/>
+    /// <seealso cref="Spring.Proxy.DynamicProxyManager"/>
+    /// <seealso cref="Spring.Objects.Factory.Support.MethodInjectingInstantiationStrategy"/>
+    public sealed class DynamicCodeManager
+    {
+        private static readonly Hashtable s_moduleCache = CollectionsUtil.CreateCaseInsensitiveHashtable();
+        
+        /// <summary>
+        /// prevent instantiation
+        /// </summary>
+        private DynamicCodeManager()
+        {
+            throw new InvalidOperationException();
+        }
+        
+        /// <summary>
+        /// Returns the <see cref="ModuleBuilder"/> for the dynamic module within the specified assembly.
+        /// </summary>
+        /// <remarks>
+        /// If the assembly does not exist yet, it will be created.<br/>
+        /// This factory caches any dynamic assembly it creates - calling GetModule() twice with 
+        /// the same name will *not* create 2 distinct modules!
+        /// </remarks>
+        /// <param name="assemblyName">The assembly-name of the module to be returned</param>
+        /// <returns>the <see cref="ModuleBuilder"/> that can be used to define new types within the specified assembly</returns>
+        public static ModuleBuilder GetModuleBuilder( string assemblyName )
+        {
+            lock(s_moduleCache.SyncRoot)
+            {
+                ModuleBuilder module = (ModuleBuilder) s_moduleCache[assemblyName];
+                if (module == null)
+                {
+                    AssemblyName an = new AssemblyName();
+                    an.Name = assemblyName;
+                    
+                    AssemblyBuilder assembly;
+#if DEBUG_DYNAMIC
+                    assembly = AppDomain.CurrentDomain.DefineDynamicAssembly(an, AssemblyBuilderAccess.RunAndSave, null, null, null, null,null, true );
+                    module = assembly.DefineDynamicModule(an.Name, an.Name + ".dll", true);
+#else
+                    assembly = AppDomain.CurrentDomain.DefineDynamicAssembly(an, AssemblyBuilderAccess.Run, null, null, null, null,null, true );
+#if DEBUG                    
+                    module = assembly.DefineDynamicModule(an.Name, true);
+#else
+			        module = assembly.DefineDynamicModule(an.Name, false);
+#endif
+#endif
+                    s_moduleCache[assemblyName] = module;
+                }
+                return module;
+            }
+        }
+        
+        /// <summary>
+        /// Persists the specified dynamic assembly to the file-system
+        /// </summary>
+        /// <param name="assemblyName">the name of the dynamic assembly to persist</param>
+        /// <remarks>
+        /// Can only be called in DEBUG_DYNAMIC mode, per ConditionalAttribute rules.
+        /// </remarks>
+        [Conditional("DEBUG_DYNAMIC")]        
+        public static void SaveAssembly( string assemblyName )
+        {
+            AssertUtils.ArgumentHasText(assemblyName, "assemblyName");
+            
+            ModuleBuilder module = null;
+            lock(s_moduleCache.SyncRoot)
+            {
+                module = (ModuleBuilder) s_moduleCache[assemblyName];
+            }
+            
+            if(module == null)
+            {
+                throw new ArgumentException(string.Format("'{0}' is not a valid dynamic assembly name", assemblyName), "assemblyName");
+            }
+
+            AssemblyBuilder assembly = (AssemblyBuilder) module.Assembly;
+            assembly.Save(assembly.GetName().Name + ".dll");            
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/EventUtils.cs b/src/Spring/Spring.Core/Util/EventUtils.cs
new file mode 100644
index 00000000..a2561a94
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/EventUtils.cs
@@ -0,0 +1,108 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// A utility  class for raising events in a generic and consistent fashion.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: EventUtils.cs,v 1.5 2006/04/09 07:19:00 markpollack Exp $</version>
+    public class EventRaiser
+    {
+        /// <summary>
+        /// Raises the event encapsulated by the supplied
+        /// <paramref name="source"/>, passing the supplied <paramref name="arguments"/>
+        /// to the event.
+        /// </summary>
+        /// <param name="source">The event to be raised.</param>
+        /// <param name="arguments">The arguments to the event.</param>
+        public virtual void Raise (Delegate source, params object [] arguments)  
+        {
+            if (source == null) 
+            {
+                return;
+            }
+            Delegate [] delegates = source.GetInvocationList ();
+            foreach (Delegate sink in delegates) 
+            {
+                Invoke (sink, arguments);
+            }
+        }
+
+        /// <summary>
+        /// Invokes the supplied <paramref name="sink"/>, passing the supplied
+        /// <paramref name="arguments"/> to the sink.
+        /// </summary>
+        /// <param name="sink">The sink to be invoked.</param>
+        /// <param name="arguments">The arguments to the sink.</param>
+        protected virtual void Invoke (Delegate sink, object [] arguments) 
+        {
+            try 
+            {
+                sink.DynamicInvoke (arguments);
+            } 
+            catch (TargetInvocationException ex) 
+            {
+                // unwrap the exception that actually caused the TargetInvocationException and throw that...
+                throw ex.GetBaseException();
+            }
+        }
+    }
+
+    /// <summary>
+    /// Raises events <b>defensively</b>.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Raising events defensively means that as the raised event is passed to each handler,
+    /// any <see cref="System.Exception"/> thrown by a handler will be caught and silently
+    /// ignored.
+    /// </p>
+    /// </remarks>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: EventUtils.cs,v 1.5 2006/04/09 07:19:00 markpollack Exp $</version>
+    public class DefensiveEventRaiser : EventRaiser
+    {
+        /// <summary>
+        /// <b>Defensively</b> invokes the supplied <paramref name="sink"/>, passing the
+        /// supplied <paramref name="arguments"/> to the sink.
+        /// </summary>
+        /// <param name="sink">The sink to be invoked.</param>
+        /// <param name="arguments">The arguments to the sink.</param>
+        protected override void Invoke (Delegate sink, object [] arguments) 
+        {
+            try 
+            {
+                sink.DynamicInvoke (arguments);
+            }
+            catch
+            {
+            }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Core/Util/FatalReflectionException.cs b/src/Spring/Spring.Core/Util/FatalReflectionException.cs
new file mode 100644
index 00000000..747563a5
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/FatalReflectionException.cs
@@ -0,0 +1,92 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Thrown on an unrecoverable problem encountered in the
+    /// objects namespace or sub-namespaces, e.g. bad class or field.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: FatalReflectionException.cs,v 1.1 2007/07/31 03:47:23 markpollack Exp $
+    /// </version>
+    [Serializable]
+    public class FatalReflectionException : ReflectionException
+    {
+        /// <summary>
+        /// Creates a new instance of the FatalObjectException class.
+        /// </summary>
+        public FatalReflectionException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the FatalObjectException class with the
+        /// specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public FatalReflectionException(string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the FatalObjectException class with the
+        /// specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public FatalReflectionException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the FatalObjectException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected FatalReflectionException (
+            SerializationInfo info, StreamingContext context)
+            : base (info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs b/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs
new file mode 100644
index 00000000..c83f977e
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs
@@ -0,0 +1,137 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Util.Generic
+{
+	/// <summary>
+	/// Miscellaneous generic collection utility methods.
+	/// </summary>
+	/// <remarks>
+	/// Mainly for internal use within the framework.
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: CollectionUtils.cs,v 1.2 2006/12/02 07:51:28 markpollack Exp $</version>
+	public sealed class CollectionUtils
+	{
+		#region Methods
+
+		/// <summary>
+		/// Determine whether a given collection only contains
+		/// a single unique object
+		/// </summary>
+		/// <param name="coll"></param>
+		/// <returns></returns>
+		public static bool HasUniqueObject<T>(ICollection<T> coll)
+		{
+			if (coll.Count == 0)
+			{
+				return false;
+			}
+			object candidate = null;
+			foreach (object elem in coll)
+			{
+				if (candidate == null)
+				{
+					candidate = elem;
+				}
+				else if (candidate != elem)
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+
+		/// <summary>
+		/// Determines whether the <paramref name="collection"/> contains the specified <paramref name="element"/>.
+		/// </summary>
+		/// <param name="collection">The collection to check.</param>
+		/// <param name="element">The object to locate in the collection.</param>
+		/// <returns><see lang="true"/> if the element is in the collection, <see lang="false"/> otherwise.</returns>
+		public static bool Contains<T>(ICollection<T> collection, Object element)
+		{
+			if (collection == null)
+			{
+				throw new ArgumentNullException("Collection cannot be null.");
+			}
+			MethodInfo method;
+			method = collection.GetType().GetMethod("contains", BindingFlags.IgnoreCase | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public);
+			if (null == method)
+			{
+				throw new InvalidOperationException("Collection type " + collection.GetType() + " does not implement a Contains() method.");
+			}
+			return (bool) method.Invoke(collection, new Object[] {element});
+		}
+
+		/// <summary>
+		/// Determines whether the collection contains all the elements in the specified collection.
+		/// </summary>
+		/// <param name="targetCollection">The collection to check.</param>
+		/// <param name="sourceCollection">Collection whose elements would be checked for containment.</param>
+		/// <returns>true if the target collection contains all the elements of the specified collection.</returns>
+		public static bool ContainsAll<T>(ICollection<T> targetCollection, ICollection<T> sourceCollection)
+		{
+			if (targetCollection == null || sourceCollection == null)
+			{
+				throw new ArgumentNullException("Collection cannot be null.");
+			}
+			if ( sourceCollection.Count == 0 && targetCollection.Count > 1 )
+				return true;
+
+			IEnumerator sourceCollectionEnumerator = sourceCollection.GetEnumerator();
+
+			bool contains = false;
+
+			MethodInfo method;
+			method = targetCollection.GetType().GetMethod("containsAll", BindingFlags.IgnoreCase | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public);
+
+			if (method != null)
+				contains = (bool) method.Invoke(targetCollection, new Object[] {sourceCollection});
+			else
+			{
+				method = targetCollection.GetType().GetMethod("Contains", BindingFlags.IgnoreCase | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public);
+				if (method == null)
+				{
+					throw new InvalidOperationException("Target collection does not implment a Contains() or ContainsAll() method.");
+				}
+				while (sourceCollectionEnumerator.MoveNext())
+				{
+					if ((contains = (bool) method.Invoke(targetCollection, new Object[] {sourceCollectionEnumerator.Current})) == false)
+						break;
+				}
+			}
+			return contains;
+		}
+
+		#endregion
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/NumberUtils.cs b/src/Spring/Spring.Core/Util/NumberUtils.cs
new file mode 100644
index 00000000..79faf987
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/NumberUtils.cs
@@ -0,0 +1,349 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using Spring.Core.TypeConversion;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Various utility methods relating to numbers.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Mainly for internal use within the framework.
+	/// </p>
+	/// </remarks>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: NumberUtils.cs,v 1.6 2008/03/20 23:58:16 oakinger Exp $</version>
+	public sealed class NumberUtils
+	{
+		/// <summary>
+		/// Determines whether the supplied <paramref name="number"/> is an integer.
+		/// </summary>
+		/// <param name="number">The object to check.</param>
+		/// <returns>
+		/// <see lang="true"/> if the supplied <paramref name="number"/> is an integer.
+		/// </returns>
+		public static bool IsInteger(object number)
+		{
+			return (number is Int32 || number is Int16 || number is Int64 || number is UInt32
+				|| number is UInt16 || number is UInt64 || number is Byte || number is SByte);
+		}
+
+		/// <summary>
+		/// Determines whether the supplied <paramref name="number"/> is a decimal number.
+		/// </summary>
+		/// <param name="number">The object to check.</param>
+		/// <returns>
+		/// <see lang="true"/> if the supplied <paramref name="number"/> is a decimal number.
+		/// </returns>
+		public static bool IsDecimal(object number)
+		{
+            
+			return (number is Single || number is Double || number is Decimal);
+		}
+
+		/// <summary>
+		/// Determines whether the supplied <paramref name="number"/> is of numeric type.
+		/// </summary>
+		/// <param name="number">The object to check.</param>
+		/// <returns>
+		/// 	<c>true</c> if the specified object is of numeric type; otherwise, <c>false</c>.
+		/// </returns>
+		public static bool IsNumber(object number)
+		{
+			return (IsInteger(number) || IsDecimal(number));
+		}
+
+        /// <summary>
+        /// Determines whether the supplied <paramref name="number"/> can be converted to an integer.
+        /// </summary>
+        /// <param name="number">The object to check.</param>
+        /// <returns>
+        /// <see lang="true"/> if the supplied <paramref name="number"/> can be converted to an integer.
+        /// </returns>
+        public static bool CanConvertToInteger(object number)
+        {
+            TypeConverter converter = TypeDescriptor.GetConverter(number);
+            return (converter.CanConvertTo(typeof(Int32))
+                || converter.CanConvertTo(typeof(Int16))
+                || converter.CanConvertTo(typeof(Int64))
+                || converter.CanConvertTo(typeof(UInt16))
+                || converter.CanConvertTo(typeof(UInt64))
+                || converter.CanConvertTo(typeof(Byte))
+                || converter.CanConvertTo(typeof(SByte))
+                   );
+        }
+
+        /// <summary>
+        /// Determines whether the supplied <paramref name="number"/> can be converted to an integer.
+        /// </summary>
+        /// <param name="number">The object to check.</param>
+        /// <returns>
+        /// <see lang="true"/> if the supplied <paramref name="number"/> can be converted to an integer.
+        /// </returns>
+        public static bool CanConvertToDecimal(object number)
+        {
+            TypeConverter converter = TypeDescriptor.GetConverter(number);
+            return (converter.CanConvertTo(typeof(Single))
+                || converter.CanConvertTo(typeof(Double))
+                || converter.CanConvertTo(typeof(Decimal))
+                   );
+        }
+
+        /// <summary>
+        /// Determines whether the supplied <paramref name="number"/> can be converted to a number.
+        /// </summary>
+        /// <param name="number">The object to check.</param>
+        /// <returns>
+        /// 	<c>true</c> if the specified object is decimal number; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool CanConvertToNumber(object number)
+        {
+            return (CanConvertToInteger(number) || CanConvertToDecimal(number));
+        }
+
+		/// <summary>
+		/// Is the supplied <paramref name="number"/> equal to zero (0)?
+		/// </summary>
+		/// <param name="number">The number to check.</param>
+		/// <returns>
+		/// <see lang="true"/> id the supplied <paramref name="number"/> is equal to zero (0).
+		/// </returns>
+		public static bool IsZero(object number) 
+		{
+			if (number is Int32) return ((Int32) number) == 0;
+			else if (number is Int16) return ((Int16) number) == 0;
+			else if (number is Int64) return ((Int64) number) == 0;
+			else if (number is UInt16) return ((Int32) number) == 0;
+			else if (number is UInt32) return ((Int64) number) == 0;
+			else if (number is UInt64) return (Convert.ToDecimal(number) == 0);
+			else if (number is Byte) return ((Int16) number) == 0;
+			else if (number is SByte) return ((Int16) number) == 0;
+			else if (number is Single) return ((Single) number) == 0f;
+			else if (number is Double) return ((Double) number) == 0d;
+			else if (number is Decimal) return ((Decimal) number) == 0m;
+			return false;
+		}
+
+		/// <summary>
+		/// Negates the supplied <paramref name="number"/>.
+		/// </summary>
+		/// <param name="number">The number to negate.</param>
+		/// <returns>The supplied <paramref name="number"/> negated.</returns>
+		/// <exception cref="System.ArgumentException">
+		/// If the supplied <paramref name="number"/> is not a supported numeric type.
+		/// </exception>
+		public static object Negate(object number)
+		{
+			if (number is Int32) return -((Int32) number);
+			else if (number is Int16) return -((Int16) number);
+			else if (number is Int64) return -((Int64) number);
+			else if (number is UInt16) return -((Int32) number);
+			else if (number is UInt32) return -((Int64) number);
+			else if (number is UInt64) return -(Convert.ToDecimal(number));
+			else if (number is Byte) return -((Int16) number);
+			else if (number is SByte) return -((Int16) number);
+			else if (number is Single) return -((Single) number);
+			else if (number is Double) return -((Double) number);
+			else if (number is Decimal) return -((Decimal) number);
+			else
+			{
+				throw new ArgumentException(string.Format("'{0}' is not one of the supported numeric types.", number));
+			}
+		}
+
+		/// <summary>
+		/// Adds the specified numbers.
+		/// </summary>
+		/// <param name="m">The first number.</param>
+		/// <param name="n">The second number.</param>
+		public static object Add(object m, object n)
+		{
+			CoerceTypes(ref m, ref n);
+
+			if (n is Int32) return (Int32) m + (Int32) n;
+			else if (n is Int16) return (Int16) m + (Int16) n;
+			else if (n is Int64) return (Int64) m + (Int64) n;
+			else if (n is UInt16) return (UInt16) m + (UInt16) n;
+			else if (n is UInt32) return (UInt32) m + (UInt32) n;
+			else if (n is UInt64) return (UInt64) m + (UInt64) n;
+			else if (n is Byte) return (Byte) m + (Byte) n;
+			else if (n is SByte) return (SByte) m + (SByte) n;
+			else if (n is Single) return (Single) m + (Single) n;
+			else if (n is Double) return (Double) m + (Double) n;
+			else if (n is Decimal) return (Decimal) m + (Decimal) n;
+
+			return null;
+		}
+
+		/// <summary>
+		/// Subtracts the specified numbers.
+		/// </summary>
+		/// <param name="m">The first number.</param>
+		/// <param name="n">The second number.</param>
+		public static object Subtract(object m, object n)
+		{
+			CoerceTypes(ref m, ref n);
+
+			if (n is Int32) return (Int32) m - (Int32) n;
+			else if (n is Int16) return (Int16) m - (Int16) n;
+			else if (n is Int64) return (Int64) m - (Int64) n;
+			else if (n is UInt16) return (UInt16) m - (UInt16) n;
+			else if (n is UInt32) return (UInt32) m - (UInt32) n;
+			else if (n is UInt64) return (UInt64) m - (UInt64) n;
+			else if (n is Byte) return (Byte) m - (Byte) n;
+			else if (n is SByte) return (SByte) m - (SByte) n;
+			else if (n is Single) return (Single) m - (Single) n;
+			else if (n is Double) return (Double) m - (Double) n;
+			else if (n is Decimal) return (Decimal) m - (Decimal) n;
+
+			return null;
+		}
+
+		/// <summary>
+		/// Multiplies the specified numbers.
+		/// </summary>
+		/// <param name="m">The first number.</param>
+		/// <param name="n">The second number.</param>
+		public static object Multiply(object m, object n)
+		{
+			CoerceTypes(ref m, ref n);
+
+			if (n is Int32) return (Int32) m*(Int32) n;
+			else if (n is Int16) return (Int16) m*(Int16) n;
+			else if (n is Int64) return (Int64) m*(Int64) n;
+			else if (n is UInt16) return (UInt16) m*(UInt16) n;
+			else if (n is UInt32) return (UInt32) m*(UInt32) n;
+			else if (n is UInt64) return (UInt64) m*(UInt64) n;
+			else if (n is Byte) return (Byte) m*(Byte) n;
+			else if (n is SByte) return (SByte) m*(SByte) n;
+			else if (n is Single) return (Single) m*(Single) n;
+			else if (n is Double) return (Double) m*(Double) n;
+			else if (n is Decimal) return (Decimal) m*(Decimal) n;
+
+			return null;
+		}
+
+		/// <summary>
+		/// Divides the specified numbers.
+		/// </summary>
+		/// <param name="m">The first number.</param>
+		/// <param name="n">The second number.</param>
+		public static object Divide(object m, object n)
+		{
+			CoerceTypes(ref m, ref n);
+
+			if (n is Int32) return (Int32) m/(Int32) n;
+			else if (n is Int16) return (Int16) m/(Int16) n;
+			else if (n is Int64) return (Int64) m/(Int64) n;
+			else if (n is UInt16) return (UInt16) m/(UInt16) n;
+			else if (n is UInt32) return (UInt32) m/(UInt32) n;
+			else if (n is UInt64) return (UInt64) m/(UInt64) n;
+			else if (n is Byte) return (Byte) m/(Byte) n;
+			else if (n is SByte) return (SByte) m/(SByte) n;
+			else if (n is Single) return (Single) m/(Single) n;
+			else if (n is Double) return (Double) m/(Double) n;
+			else if (n is Decimal) return (Decimal) m/(Decimal) n;
+
+			return null;
+		}
+
+		/// <summary>
+		/// Calculates remainder for the specified numbers.
+		/// </summary>
+		/// <param name="m">The first number (dividend).</param>
+		/// <param name="n">The second number (divisor).</param>
+		public static object Modulus(object m, object n)
+		{
+			CoerceTypes(ref m, ref n);
+
+			if (n is Int32) return (Int32) m%(Int32) n;
+			else if (n is Int16) return (Int16) m%(Int16) n;
+			else if (n is Int64) return (Int64) m%(Int64) n;
+			else if (n is UInt16) return (UInt16) m%(UInt16) n;
+			else if (n is UInt32) return (UInt32) m%(UInt32) n;
+			else if (n is UInt64) return (UInt64) m%(UInt64) n;
+			else if (n is Byte) return (Byte) m%(Byte) n;
+			else if (n is SByte) return (SByte) m%(SByte) n;
+			else if (n is Single) return (Single) m%(Single) n;
+			else if (n is Double) return (Double) m%(Double) n;
+			else if (n is Decimal) return (Decimal) m%(Decimal) n;
+
+			return null;
+		}
+
+		/// <summary>
+		/// Raises first number to the power of the second one.
+		/// </summary>
+		/// <param name="m">The first number.</param>
+		/// <param name="n">The second number.</param>
+		public static object Power(object m, object n)
+		{
+			return Math.Pow(Convert.ToDouble(m), Convert.ToDouble(n));
+		}
+
+		/// <summary>
+		/// Coerces the types so they can be compared.
+		/// </summary>
+		/// <param name="m">The right.</param>
+		/// <param name="n">The left.</param>
+		public static void CoerceTypes(ref object m, ref object n)
+		{
+			TypeCode leftTypeCode = Convert.GetTypeCode(m);
+			TypeCode rightTypeCode = Convert.GetTypeCode(n);
+
+			if (leftTypeCode > rightTypeCode)
+			{
+				n = Convert.ChangeType(n, leftTypeCode);
+			}
+			else
+			{
+				m = Convert.ChangeType(m, rightTypeCode);
+			}
+		}
+
+		#region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="Spring.Util.NumberUtils"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such exposes no public constructors.
+		/// </p>
+		/// </remarks>
+		private NumberUtils()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/ObjectUtils.cs b/src/Spring/Spring.Core/Util/ObjectUtils.cs
new file mode 100644
index 00000000..9596fe6b
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/ObjectUtils.cs
@@ -0,0 +1,492 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Reflection;
+using System.Runtime.Remoting;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Helper methods with regard to objects, types, properties, etc.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Not intended to be used directly by applications.
+    /// </p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: ObjectUtils.cs,v 1.9 2007/12/29 00:31:00 markpollack Exp $</version>
+    public sealed class ObjectUtils
+    {
+        #region Constants
+
+        /// <summary>
+        /// An empty object array.
+        /// </summary>
+        public static readonly object[] EmptyObjects = new object[] {};
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        // CLOVER:OFF
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Util.ObjectUtils"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is a utility class, and as such exposes no public constructors.
+        /// </p>
+        /// </remarks>
+        private ObjectUtils()
+        {
+        }
+
+        // CLOVER:ON
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Instantiates the type using the assembly specified to load the type.
+        /// </summary>
+        /// <remarks>This is a convenience in the case of needing to instantiate a type but not
+        /// wanting to specify in the string the version, culture and public key token.</remarks>
+        /// <param name="assembly">The assembly.</param>
+        /// <param name="typeName">Name of the type.</param>
+        /// <returns></returns>
+        /// <exception cref="System.ArgumentNullException"> 
+        /// If the <paramref name="assembly"/> or <paramref name="typeName"/> is <see langword="null"/>
+        /// </exception>
+        /// <exception cref="Spring.Util.FatalReflectionException">
+        /// If cannot load the type from the assembly or the call to <code>InstantiateType(Type)</code> fails.
+        /// </exception>
+        public static object InstantiateType(Assembly assembly, string typeName)
+        {
+            AssertUtils.ArgumentNotNull(assembly, "assembly");
+            AssertUtils.ArgumentNotNull(typeName, "typeName");
+            Type resolvedType = assembly.GetType(typeName, false, false);
+            if (resolvedType == null)
+            {
+                throw new FatalReflectionException(
+                    string.Format(
+                        CultureInfo.InvariantCulture, "Cannot load type named [{0}] from assembly [{1}].", typeName, assembly));
+            }
+            return InstantiateType(resolvedType);
+        }
+        /// <summary>
+        /// Convenience method to instantiate a <see cref="System.Type"/> using
+        /// its no-arg constructor.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// As this method doesn't try to instantiate <see cref="System.Type"/>s
+        /// by name, it should avoid <see cref="System.Type"/> loading issues.
+        /// </p>
+        /// </remarks>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> to instantiate*
+        /// </param>
+        /// <returns>A new instance of the <see cref="System.Type"/>.</returns>
+        /// <exception cref="System.ArgumentNullException"> 
+        /// If the <paramref name="type"/> is <see langword="null"/>
+        /// </exception>
+        /// <exception cref="Spring.Util.FatalReflectionException">
+        /// If the <paramref name="type"/> is an abstract class, an interface, 
+        /// an open generic type or does not have a public no-argument constructor.
+        /// </exception>
+        public static object InstantiateType(Type type)
+        {
+            AssertUtils.ArgumentNotNull(type, "type");
+
+            ConstructorInfo constructor = GetZeroArgConstructorInfo(type);
+            return ObjectUtils.InstantiateType(constructor, ObjectUtils.EmptyObjects);
+        }
+
+        /// <summary>
+        /// Gets the zero arg ConstructorInfo object, if the type offers such functionality.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <returns>Zero argument ConstructorInfo</returns>
+        /// <exception cref="FatalReflectionException">
+        /// If the type is an interface, abstract, open generic type, or does not have a zero-arg constructor.
+        /// </exception>
+        public static ConstructorInfo GetZeroArgConstructorInfo(Type type)
+        {
+            IsInstantiable(type);
+            ConstructorInfo constructor = type.GetConstructor(Type.EmptyTypes);
+            if (constructor == null)
+            {
+                throw new FatalReflectionException(
+                    string.Format(
+                        CultureInfo.InvariantCulture, "Cannot instantiate a class that does not have a public no-argument constructor [{0}].", type));
+            }
+            return constructor;
+        }
+
+        /// <summary>
+        /// Determines whether the specified type is instantiable, i.e. not an interface, abstract class or contains
+        /// open generic type parameters.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        public static void IsInstantiable(Type type)
+        {
+            if (type.IsInterface)
+            {
+                throw new FatalReflectionException(
+                    string.Format(
+                        CultureInfo.InvariantCulture, "Cannot instantiate an interface [{0}].", type));
+            }
+            if (type.IsAbstract)
+            {
+                throw new FatalReflectionException(
+                    string.Format(
+                        CultureInfo.InvariantCulture, "Cannot instantiate an abstract class [{0}].", type));
+            }
+#if NET_2_0
+            if (type.ContainsGenericParameters)
+            {
+                throw new FatalReflectionException(
+                    string.Format(
+                        CultureInfo.InvariantCulture, "Cannot instantiate an open generic type [{0}].", type));
+            }
+#endif
+        }
+
+        /// <summary>
+        /// Convenience method to instantiate a <see cref="System.Type"/> using
+        /// the given constructor.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// As this method doesn't try to instantiate <see cref="System.Type"/>s
+        /// by name, it should avoid <see cref="System.Type"/> loading issues.
+        /// </p>
+        /// </remarks>
+        /// <param name="constructor">
+        /// The constructor to use for the instantiation.
+        /// </param>
+        /// <param name="arguments">
+        /// The arguments to be passed to the constructor.
+        /// </param>
+        /// <returns>A new instance.</returns>
+        /// <exception cref="System.ArgumentNullException"> 
+        /// If the <paramref name="constructor"/> is <see langword="null"/>
+        /// </exception>
+        /// <exception cref="Spring.Util.FatalReflectionException">
+        /// If the <paramref name="constructor"/>'s declaring type is an abstract class, 
+        /// an interface, an open generic type or does not have a public no-argument constructor.
+        /// </exception>
+        public static object InstantiateType(ConstructorInfo constructor, object[] arguments)
+        {
+            AssertUtils.ArgumentNotNull(constructor, "constructor");
+
+            if (constructor.DeclaringType.IsInterface)
+            {
+                throw new FatalReflectionException(
+                    string.Format(
+                        CultureInfo.InvariantCulture, "Cannot instantiate an interface [{0}].", constructor.DeclaringType));
+            }
+            if (constructor.DeclaringType.IsAbstract)
+            {
+                throw new FatalReflectionException(
+                    string.Format(
+                        CultureInfo.InvariantCulture, "Cannot instantiate an abstract class [{0}].", constructor.DeclaringType));
+            }
+#if NET_2_0
+            if (constructor.DeclaringType.ContainsGenericParameters)
+            {
+                throw new FatalReflectionException(
+                    string.Format(
+                        CultureInfo.InvariantCulture, "Cannot instantiate an open generic type [{0}].", constructor.DeclaringType));
+            }
+#endif
+            try
+            {
+                return constructor.Invoke(arguments);
+            }
+            catch (Exception ex)
+            {
+                Type ctorType = constructor.DeclaringType;
+                throw new FatalReflectionException(
+                    string.Format(
+                        CultureInfo.InvariantCulture,
+                        "Cannot instantiate Type [{0}] using ctor [{1}] : '{2}'",
+                        constructor.DeclaringType, constructor, ex.Message),
+                    ex);
+            }
+        }
+
+        /// <summary>
+        /// Checks whether the supplied <paramref name="instance"/> is not a transparent proxy and is
+        /// assignable to the supplied <paramref name="type"/>. 
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Neccessary when dealing with server-activated remote objects, because the
+        /// object is of the type TransparentProxy and regular <c>is</c> testing for assignable
+        /// types does not work.
+        /// </p>
+        /// <p>
+        /// Transparent proxy instances always return <see langword="true"/> when tested
+        /// with the <c>'is'</c> operator (C#). This method only checks if the object
+        /// is assignable to the type if it is not a transparent proxy.
+        /// </p>
+        /// </remarks>
+        /// <param name="type">The target <see cref="System.Type"/> to be checked.</param>
+        /// <param name="instance">The value that should be assigned to the type.</param>
+        /// <returns>
+        /// <see langword="true"/> if the supplied <paramref name="instance"/> is not a
+        /// transparent proxy and is assignable to the supplied <paramref name="type"/>.
+        /// </returns>
+        public static bool IsAssignableAndNotTransparentProxy(Type type, object instance)
+        {
+            if (!RemotingServices.IsTransparentProxy(instance))
+            {
+                return IsAssignable(type, instance);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Determine if the given <see cref="System.Type"/> is assignable from the
+        /// given value, assuming setting by reflection.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Considers primitive wrapper classes as assignable to the
+        /// corresponding primitive types.
+        /// </p>
+        /// <p>
+        /// For example used in an object factory's constructor resolution.
+        /// </p>
+        /// </remarks>
+        /// <param name="type">The target <see cref="System.Type"/>.</param>
+        /// <param name="obj">The value that should be assigned to the type.</param>
+        /// <returns>True if the type is assignable from the value.</returns>
+        public static bool IsAssignable(Type type, object obj)
+        {
+            return (type.IsInstanceOfType(obj) ||
+                    (!type.IsPrimitive && obj == null) ||
+                    (type.Equals(typeof (bool)) && obj is Boolean) ||
+                    (type.Equals(typeof (byte)) && obj is Byte) ||
+                    (type.Equals(typeof (char)) && obj is Char) ||
+                    (type.Equals(typeof (sbyte)) && obj is SByte) ||
+                    (type.Equals(typeof (int)) && obj is Int32) ||
+                    (type.Equals(typeof (short)) && obj is Int16) ||
+                    (type.Equals(typeof (long)) && obj is Int64) ||
+                    (type.Equals(typeof (float)) && obj is Single) ||
+                    (type.Equals(typeof (double)) && obj is Double));
+        }
+
+        /// <summary>
+        /// Check if the given <see cref="System.Type"/> represents a
+        /// "simple" property,
+        /// i.e. a primitive, a <see cref="System.String"/>, a
+        /// <see cref="System.Type"/>, or a corresponding array.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Used to determine properties to check for a "simple" dependency-check.
+        /// </p>
+        /// </remarks>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> to check.
+        /// </param>
+        public static bool IsSimpleProperty(Type type)
+        {
+            return type.IsPrimitive
+                   || type.Equals(typeof (string))
+                   || type.Equals(typeof (string[]))
+                   || IsPrimitiveArray(type)
+                   || type.Equals(typeof (Type))
+                   || type.Equals(typeof (Type[]));
+        }
+
+        /// <summary>
+        /// Check if the given class represents a primitive array,
+        /// i.e. boolean, byte, char, short, int, long, float, or double.
+        /// </summary>
+        public static bool IsPrimitiveArray(Type type)
+        {
+            return typeof (bool[]).Equals(type)
+                   || typeof (sbyte[]).Equals(type)
+                   || typeof (char[]).Equals(type)
+                   || typeof (short[]).Equals(type)
+                   || typeof (int[]).Equals(type)
+                   || typeof (long[]).Equals(type)
+                   || typeof (float[]).Equals(type)
+                   || typeof (double[]).Equals(type);
+        }
+
+        /// <summary>
+        /// Determine if the given objects are equal, returning <see langword="true"/>
+        /// if both are <see langword="null"/> respectively <see langword="false"/>
+        /// if only one is <see langword="null"/>.
+        /// </summary>
+        /// <param name="o1">The first object to compare.</param>
+        /// <param name="o2">The second object to compare.</param>
+        /// <returns>
+        /// <see langword="true"/> if the given objects are equal.
+        /// </returns>
+        public static bool NullSafeEquals(object o1, object o2)
+        {
+            return (o1 == o2 || (o1 != null && o1.Equals(o2)));
+        }
+
+        /// <summary>
+        /// Returns the first element in the supplied <paramref name="enumerator"/>.
+        /// </summary>
+        /// <param name="enumerator">
+        /// The <see cref="System.Collections.IEnumerator"/> to use to enumerate
+        /// elements.
+        /// </param>
+        /// <returns>
+        /// The first element in the supplied <paramref name="enumerator"/>.
+        /// </returns>
+        /// <exception cref="System.IndexOutOfRangeException">
+        /// If the supplied <paramref name="enumerator"/> did not have any elements.
+        /// </exception>
+        public static object EnumerateFirstElement(IEnumerator enumerator)
+        {
+            return ObjectUtils.EnumerateElementAtIndex(enumerator, 0);
+        }
+
+        /// <summary>
+        /// Returns the first element in the supplied <paramref name="enumerable"/>.
+        /// </summary>
+        /// <param name="enumerable">
+        /// The <see cref="System.Collections.IEnumerable"/> to use to enumerate
+        /// elements.
+        /// </param>
+        /// <returns>
+        /// The first element in the supplied <paramref name="enumerable"/>.
+        /// </returns>
+        /// <exception cref="System.IndexOutOfRangeException">
+        /// If the supplied <paramref name="enumerable"/> did not have any elements.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="enumerable"/> is <see langword="null"/>.
+        /// </exception>
+        public static object EnumerateFirstElement(IEnumerable enumerable)
+        {
+            AssertUtils.ArgumentNotNull(enumerable, "enumerable");
+            return ObjectUtils.EnumerateElementAtIndex(enumerable.GetEnumerator(), 0);
+        }
+
+        /// <summary>
+        /// Returns the element at the specified index using the supplied
+        /// <paramref name="enumerator"/>.
+        /// </summary>
+        /// <param name="enumerator">
+        /// The <see cref="System.Collections.IEnumerator"/> to use to enumerate
+        /// elements until the supplied <paramref name="index"/> is reached.
+        /// </param>
+        /// <param name="index">
+        /// The index of the element in the enumeration to return.
+        /// </param>
+        /// <returns>
+        /// The element at the specified index using the supplied
+        /// <paramref name="enumerator"/>.
+        /// </returns>
+        /// <exception cref="System.ArgumentOutOfRangeException">
+        /// If the supplied <paramref name="index"/> was less than zero, or the
+        /// supplied <paramref name="enumerator"/> did not contain enough elements
+        /// to be able to reach the supplied <paramref name="index"/>.
+        /// </exception>
+        public static object EnumerateElementAtIndex(IEnumerator enumerator, int index)
+        {
+            if (index < 0)
+            {
+                throw new ArgumentOutOfRangeException();
+            }
+            object element = null;
+            int i = 0;
+            while (enumerator.MoveNext())
+            {
+                element = enumerator.Current;
+                if (++i > index)
+                {
+                    break;
+                }
+            }
+            if (i < index)
+            {
+                throw new ArgumentOutOfRangeException();
+            }
+            return element;
+        }
+
+        /// <summary>
+        /// Returns the element at the specified index using the supplied
+        /// <paramref name="enumerable"/>.
+        /// </summary>
+        /// <param name="enumerable">
+        /// The <see cref="System.Collections.IEnumerable"/> to use to enumerate
+        /// elements until the supplied <paramref name="index"/> is reached.
+        /// </param>
+        /// <param name="index">
+        /// The index of the element in the enumeration to return.
+        /// </param>
+        /// <returns>
+        /// The element at the specified index using the supplied
+        /// <paramref name="enumerable"/>.
+        /// </returns>
+        /// <exception cref="System.ArgumentOutOfRangeException">
+        /// If the supplied <paramref name="index"/> was less than zero, or the
+        /// supplied <paramref name="enumerable"/> did not contain enough elements
+        /// to be able to reach the supplied <paramref name="index"/>.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="enumerable"/> is <see langword="null"/>.
+        /// </exception>
+        public static object EnumerateElementAtIndex(IEnumerable enumerable, int index)
+        {
+            AssertUtils.ArgumentNotNull(enumerable, "enumerable");
+            return ObjectUtils.EnumerateElementAtIndex(enumerable.GetEnumerator(), index);
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Gets the qualified name of the given method, consisting of 
+        /// fully qualified interface/class name + "." method name.
+        /// </summary>
+        /// <param name="method">The method.</param>
+        /// <returns>qualified name of the method.</returns>
+        public static string GetQualifiedMethodName(MethodInfo method)
+        {
+            AssertUtils.ArgumentNotNull(method,"method", "MethodInfo must not be null");
+            return method.DeclaringType.FullName + "." + method.Name;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/PathMatcher.cs b/src/Spring/Spring.Core/Util/PathMatcher.cs
new file mode 100644
index 00000000..f604275e
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/PathMatcher.cs
@@ -0,0 +1,229 @@
+//// <fragments>
+#region License
+
+/*
+* Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Support matching of file system paths in a manner similar to that of the
+	/// <see href="http://nant.sourceforge.net">NAnt</see> <c>FileSet</c>.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Any (back)slashes are converted to forward slashes.
+	/// </p>
+	/// </remarks>
+	/// <example>
+	/// <code>
+	/// // true
+	/// PathMatcher.Match("c:/*.bat", @"c:\autoexec.bat");
+	/// PathMatcher.Match("c:\fo*\*.bat", @"c:/foobar/autoexec.bat");
+	/// PathMatcher.Match("c:\fo?\*.bat", @"c:/foo/autoexec.bat");
+	/// // false
+	/// PathMatcher.Match("c:\fo?\*.bat", @"c:/fo/autoexec.bat");
+	/// </code>
+	/// </example>
+	/// <author>Federico Spinazzi</author>
+	/// <version>$Id: PathMatcher.cs,v 1.7 2007/02/23 18:46:41 markpollack Exp $</version>
+	public sealed class PathMatcher
+	{
+		private const string AllFilesInThisDirectory = "*.*";
+
+		/// <summary>
+		/// Determines if a given path matches a <c>NAnt</c>-like pattern.
+		/// </summary>
+		/// <param name="pattern">
+		/// A forward or back-slashed fileset-like pattern.
+		/// </param>
+		/// <param name="path">A forward or back-slashed full path.</param>
+		/// <param name="ignoreCase">should the match consider the case</param>
+		/// <returns>
+		/// <see langword="true"/> if the path is matched by the pattern;
+		/// otherwise <see langword="false"/>.
+		/// </returns>
+                //// <fragment name="match-method-nocase">
+		public static bool Match(string pattern, string path, bool ignoreCase)
+	        //// </fragment>
+		{
+            return Match(ToLower(pattern), ToLower(path));
+		}
+
+	    /// <summary>
+		/// Determines if a given path matches a <c>NAnt</c>-like pattern.
+		/// </summary>
+		/// <param name="pattern">
+		/// A forward or back-slashed fileset-like pattern.
+		/// </param>
+		/// <param name="path">A forward or back-slashed full path.</param>
+		/// <returns>
+		/// <see langword="true"/> if the path is matched by the pattern;
+		/// otherwise <see langword="false"/>.
+		/// </returns>
+                //// <fragment name="match-method">
+		public static bool Match(string pattern, string path)
+	        //// </fragment>
+		{
+			pattern = ForwardifySlashes(pattern);
+			path = ForwardifySlashes(path);
+
+			if (MatchAll(pattern))
+				return true;
+
+			String regex = BuildRegex(pattern);
+			return Regex.Match(path, regex).Success;
+		}
+
+		/// <summary>
+		/// Replaces back(slashes) with forward slashes.
+		/// </summary>
+		/// <param name="path">
+		/// The path or the pattern to modify.
+		/// </param>
+		/// <returns>A forward-slashed string.</returns>
+		public static string ForwardifySlashes(string path)
+		{
+			return path.Replace("\\", "/");
+		}
+
+		/// <summary>
+		/// Helper method to convert a <c>NAnt</c>-like pattern into the
+		/// appropriate pattern for a regular expression.
+		/// </summary>
+		/// <param name="pattern">The <c>NAnt</c>-like pattern.</param>
+		/// <returns>A regex-compatible pattern.</returns>
+		public static String BuildRegex(string pattern)
+		{
+			if (AllFilesInThisDirectory.Equals(pattern))
+			{
+				return "^[^/]*$";
+			}
+			string[] parts = pattern.Split('/');
+			int indexOfLastSplittedPart = parts.Length - 1;
+			int indexOfTheCurrentSplittedPart = 0;
+			StringBuilder regex = new StringBuilder();
+			foreach (string currentSplittedPart in parts)
+			{
+				bool currentPartIsTheLast = indexOfTheCurrentSplittedPart == indexOfLastSplittedPart;
+				string partToAdd = currentSplittedPart;
+				switch (currentSplittedPart)
+				{
+					case "**":
+						partToAdd = TranslateDoubleAsterisk(currentPartIsTheLast);
+						break;
+					default:
+						partToAdd = TranslateDot(partToAdd);
+						partToAdd = TranslateAsterisk(partToAdd);
+						partToAdd = TranslateQuestionMark(partToAdd);
+						partToAdd = TranslateLiteral(partToAdd, currentPartIsTheLast);
+						break;
+				}
+				regex.Append(partToAdd);
+				indexOfTheCurrentSplittedPart++;
+			}
+			return regex.ToString();
+		}
+
+        private static string ToLower(string pattern)
+        {
+            return pattern == null ? pattern : pattern.ToLower();
+        }
+
+        private static string TranslateLiteral(string part, bool isLastPart)
+		{
+			if (isLastPart)
+			{
+				return part + "$";
+			}
+			else
+			{
+				return part + "/?";
+			}
+		}
+
+		private static string TranslateDoubleAsterisk(bool isLastPart)
+		{
+			string slashTerminated = "(.*/?(?<=/))";
+			if (isLastPart)
+				slashTerminated = String.Format("($|(?<=/){0}*)", slashTerminated);
+			return slashTerminated;
+		}
+
+		private static string TranslateQuestionMark(string thisPart)
+		{
+			return thisPart.Replace("?", "[^./]");
+		}
+
+		private static string TranslateAsterisk(string thisPart)
+		{
+			return thisPart.Replace("*", "[^/]*");
+		}
+
+		private static string TranslateDot(string thisPart)
+		{
+			return thisPart.Replace(".", @"\.");
+		}
+
+		private static bool MatchAll(string pattern)
+		{
+			if (AllFilesInThisDirectory.Equals(pattern))
+			{
+				return false;
+			}
+
+			foreach (char c in pattern)
+			{
+				if (c != '*' && c != '/' && c != '.')
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+
+		#region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="Spring.Util.PathMatcher"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such exposes no public constructors.
+		/// </p>
+		/// </remarks>
+		private PathMatcher()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+	}
+}
+//// </fragments>
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/PatternMatchUtils.cs b/src/Spring/Spring.Core/Util/PatternMatchUtils.cs
new file mode 100644
index 00000000..74a53a7d
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/PatternMatchUtils.cs
@@ -0,0 +1,99 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Text.RegularExpressions;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary> Utility methods for simple pattern matching, in particular for
+    /// Spring's typical "xxx*", "*xxx" and "*xxx*" pattern styles.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: PatternMatchUtils.cs,v 1.4 2007/07/31 18:16:25 bbaia Exp $</version>
+    public abstract class PatternMatchUtils
+    {
+        /// <summary> Match a String against the given pattern, supporting the following simple
+        /// pattern styles: "xxx*", "*xxx" and "*xxx*" matches, as well as direct equality.
+        /// </summary>
+        /// <param name="pattern">the pattern to match against
+        /// </param>
+        /// <param name="str">the String to match
+        /// </param>
+        /// <returns> whether the String matches the given pattern
+        /// </returns>
+        public static bool SimpleMatch(System.String pattern, System.String str)
+        {
+            if (ObjectUtils.NullSafeEquals(pattern, str) || "*".Equals(pattern))
+            {
+                return true;
+            }
+            if (pattern == null || str == null)
+            {
+                return false;
+            }
+            if (pattern.StartsWith("*") && pattern.EndsWith("*") &&
+                str.IndexOf(pattern.Substring(1, (pattern.Length - 1) - (1))) != -1)
+            {
+                return true;
+            }
+            if (pattern.StartsWith("*") && str.EndsWith(pattern.Substring(1, (pattern.Length) - (1))))
+            {
+                return true;
+            }
+            if (pattern.EndsWith("*") && str.StartsWith(pattern.Substring(0, (pattern.Length - 1) - (0))))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary> Match a String against the given patterns, supporting the following simple
+        /// pattern styles: "xxx*", "*xxx" and "*xxx*" matches, as well as direct equality.
+        /// </summary>
+        /// <param name="patterns">the patterns to match against
+        /// </param>
+        /// <param name="str">the String to match
+        /// </param>
+        /// <returns> whether the String matches any of the given patterns
+        /// </returns>
+        public static bool SimpleMatch(System.String[] patterns, System.String str)
+        {
+            if (patterns != null)
+            {
+                for (int i = 0; i < patterns.Length; i++)
+                {
+                    
+                    if (SimpleMatch(patterns[i], str))
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/Properties.cs b/src/Spring/Spring.Core/Util/Properties.cs
new file mode 100644
index 00000000..6a10b56f
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/Properties.cs
@@ -0,0 +1,325 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.IO;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// An implementation of the Java Properties class.
+	/// </summary>
+	/// <author>Simon White</author>
+    /// <version>$Id: Properties.cs,v 1.16 2007/07/31 18:16:26 bbaia Exp $</version>
+    [Serializable]
+    public class Properties : Hashtable
+	{
+		#region Constants
+
+		private const string Comments = "#!";
+		private const string Separators = ":=";
+		private const string Whitespace = " \t\r\n";
+		private const string WhitespaceWithSeparators = Whitespace + Separators;
+
+		#endregion
+
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates an empty property list with no default values.
+		/// </summary>
+		public Properties()
+		{
+		}
+
+		/// <summary>
+		/// Creates a property list with the specified initial properties.
+		/// </summary>
+		/// <param name="p">The initial properties.</param>
+		public Properties(Properties p) : base(p)
+		{
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Reads a property list (key and element pairs) from the input stream.
+		/// </summary>
+		/// <param name="stream">The stream to load from.</param>
+		public void Load(Stream stream)
+		{
+			Load(this, stream);
+		}
+
+		/// <summary>
+		/// Reads a property list (key and element pairs) from a text reader.
+		/// </summary>
+		/// <param name="textReader">The text reader to load from.</param>
+		public void Load(TextReader textReader)
+		{
+			Load(this, textReader);
+		}
+
+		/// <summary>
+		/// Reads a property list (key and element pairs) from the input stream.
+		/// </summary>
+		/// <param name="dictionary">the dictionary to put it in</param>
+		/// <param name="stream">The stream to load from.</param>
+		public static void Load(IDictionary dictionary, Stream stream)
+		{
+			using (StreamReader streamReader = new StreamReader(stream))
+			{
+				Load(dictionary, streamReader);
+			}
+		}
+
+		/// <summary>
+		/// Reads a property list (key and element pairs) from a text reader.
+		/// </summary>
+		/// <param name="dictionary">the dictionary to put it in</param>
+		/// <param name="textReader">The text reader to load from.</param>
+		public static void Load(IDictionary dictionary, TextReader textReader)
+		{
+			bool isContinuation = false;
+			string key = null;
+			string value = null;
+			string line = null;
+			while ((line = textReader.ReadLine()) != null)
+			{
+				line = RemoveLeadingWhitespace(line);
+				if (line != null && Comments.IndexOf(line[0]) == -1)
+				{
+					if (!isContinuation)
+					{
+						string[] keyvalue = SplitLine(line);
+						if (keyvalue == null)
+						{
+							continue;
+						}
+						key = keyvalue[0];
+						value = keyvalue[1];
+
+						if (value.EndsWith("\\"))
+						{
+							value = value.Substring(0, value.Length - 1);
+							isContinuation = true;
+						}
+						else
+						{
+							dictionary[key] = StringUtils.ConvertEscapedCharacters(value);
+						}
+					}
+					else
+					{
+						if (line.EndsWith("\\"))
+						{
+							value += line.Substring(0, line.Length - 1);
+						}
+						else
+						{
+							value += line;
+							isContinuation = false;
+							dictionary[key] = StringUtils.ConvertEscapedCharacters(value);
+						}
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Strips whitespace from the front of the specified string.
+		/// </summary>
+		/// <param name="line">The string.</param>
+		/// <returns>The string with all leading whitespace removed.</returns>
+		private static string RemoveLeadingWhitespace(string line)
+		{
+			string trimmed = null;
+			for (int i = 0; i < line.Length; i++)
+			{
+				if (Whitespace.IndexOf(line[i]) == -1)
+				{
+					trimmed = line.Substring(i);
+					break;
+				}
+			}
+			return trimmed;
+		}
+
+		/// <summary>
+		/// Splits the specified string into a key / value pair.
+		/// </summary>
+		/// <param name="line">The line to split.</param>
+		/// <returns>An array containing the key / value pair.</returns>
+		private static string[] SplitLine(string line)
+		{
+			string key = null;
+			string value = null;
+
+			int index = 0;
+			int len = line.Length;
+			for (; index < len; index++)
+			{
+				if (WhitespaceWithSeparators.IndexOf(line[index]) != -1)
+				{
+					if (line[index - 1].Equals('\\'))
+					{
+						line = line.Remove(index - 1, 1);
+						len--;
+						index--;
+					}
+					else
+					{
+						key = line.Substring(0, index);
+						break;
+					}
+				}
+			}
+
+			// got key, now find the start of the value
+			// first ignore leading whitespace and initial separator
+			// (if one's there)
+			index++;
+			if (index >= len)
+			{
+				return null;
+			}
+			value = line.Substring(index);
+			value = RemoveLeadingWhitespace(value);
+
+			if (Separators.IndexOf(value[0]) != -1)
+			{
+				value = value.Substring(1);
+				value = RemoveLeadingWhitespace(value);
+			}
+
+			return new string[] {key, value};
+		}
+
+		/// <summary>
+		/// Searches for the property with the specified key in this property list.
+		/// </summary>
+		/// <param name="key">The key.</param>
+		/// <returns>The property, or null if the key was not found.</returns>
+		public string GetProperty(string key)
+		{
+			return this[key] as string;
+		}
+
+		/// <summary>
+		/// Searches for the property with the specified key in this property list.
+		/// </summary>
+		/// <param name="key">The key.</param>
+		/// <param name="def">
+		/// The default value to be returned if the key is not found.
+		/// </param>
+		/// <returns>The property, or the default value.</returns>
+		public string GetProperty(string key, string def)
+		{
+			string val = this[key] as string;
+			return (val != null ? val : def);
+		}
+
+		/// <summary>
+		/// Writes this property list out to the specified stream.
+		/// </summary>
+		/// <param name="stream">The stream to write to.</param>
+		public void List(Stream stream)
+		{
+			using (StreamWriter sw = new StreamWriter(stream))
+			{
+				foreach (DictionaryEntry de in this)
+				{
+					sw.WriteLine(de.Key + "=" + de.Value);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Sets the specified property key / value pair.
+		/// </summary>
+		/// <param name="key">The key.</param>
+		/// <param name="theValue">The value.</param>
+		public void SetProperty(string key, string theValue)
+		{
+			this[key] = theValue;
+		}
+
+		/// <summary>
+		/// Writes the properties in this instance out to the supplied stream.
+		/// </summary>
+		/// <param name="stream">The stream to write to.</param>
+		/// <param name="header">Arbitrary header information.</param>
+		public void Store(Stream stream, string header)
+		{
+			using (StreamWriter sw = new StreamWriter(stream))
+			{
+				sw.WriteLine(header);
+
+				foreach (DictionaryEntry de in this)
+				{
+					sw.WriteLine(de.Key + "=" + de.Value);
+				}
+			}
+		}
+
+		#endregion
+
+		#region IDictionary Members
+
+		/// <summary>
+		/// Adds the specified key / object pair to this collection.
+		/// </summary>
+		public override object this[object key]
+		{
+			get { return base[key as string]; }
+			set { base[key as string] = value as string; }
+		}
+
+		/// <summary>
+		/// Removes the key / value pair identified by the supplied key.
+		/// </summary>
+		/// <param name="key">
+		/// The key identifying the key / value pair to be removed.
+		/// </param>
+		public override void Remove(object key)
+		{
+			base.Remove(key as string);
+		}
+
+		/// <summary>
+		/// Adds the specified key / object pair to this collection.
+		/// </summary>
+		/// <param name="key">The key.</param>
+		/// <param name="value">The value.</param>
+		public override void Add(object key, object value)
+		{
+			base.Add(key as string, value as string);
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/ReflectionException.cs b/src/Spring/Spring.Core/Util/ReflectionException.cs
new file mode 100644
index 00000000..5c069dc3
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/ReflectionException.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Superclass for all exceptions thrown in the Objects namespace and sub-namespaces.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ReflectionException.cs,v 1.1 2007/07/31 03:47:23 markpollack Exp $
+    /// </version>
+    [Serializable]
+    public class ReflectionException : ApplicationException
+    {
+        #region Constructor (s) / Destructor
+        /// <summary>Creates a new instance of the ObjectsException class.</summary>
+        public ReflectionException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectsException class. with the specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public ReflectionException (string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectsException class with the specified message
+        /// and root cause.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public ReflectionException (string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ObjectsException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected ReflectionException (
+            SerializationInfo info, StreamingContext context)
+            : base (info, context)
+        {
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/ReflectionUtils.cs b/src/Spring/Spring.Core/Util/ReflectionUtils.cs
new file mode 100644
index 00000000..f0c07c7b
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/ReflectionUtils.cs
@@ -0,0 +1,1474 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+#if NET_2_0
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+#endif
+using System.Globalization;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Text;
+using System.Runtime.CompilerServices;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Various reflection related methods that are missing from the standard library.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <author>Stan Dvoychenko (.NET)</author>
+    /// <author>Bruno Baia (.NET)</author>
+    /// <version>$Id: ReflectionUtils.cs,v 1.59 2008/05/13 14:22:46 oakinger Exp $</version>
+    public sealed class ReflectionUtils
+    {
+        /// <summary>
+        /// Convenience <see cref="System.Reflection.BindingFlags"/> value that will
+        /// match all private and public, static and instance members on a class
+        /// in a case inSenSItivE fashion.
+        /// </summary>
+        public const BindingFlags AllMembersCaseInsensitiveFlags = BindingFlags.Public |
+                                                                   BindingFlags.NonPublic | BindingFlags.Instance
+                                                                   | BindingFlags.Static
+                                                                   | BindingFlags.IgnoreCase;
+
+        /// <summary>
+        /// Returns signature for the specified <see cref="System.Type"/>, method name and argument
+        /// <see cref="System.Type"/>s.
+        /// </summary>
+        /// <param name="type">The <see cref="System.Type"/> the method is in.</param>
+        /// <param name="method">The method name.</param>
+        /// <param name="argumentTypes">
+        /// The argument <see cref="System.Type"/>s.
+        /// </param>
+        /// <returns>The method signature.</returns>
+        public static string GetSignature(
+            Type type, string method, Type[] argumentTypes)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append(type.FullName).Append("::").Append(method).Append("(");
+            string separator = "";
+            for (int i = 0; i < argumentTypes.Length; i++)
+            {
+                sb.Append(separator).Append(argumentTypes[i].FullName);
+                separator = ",";
+            }
+            sb.Append(")");
+            return sb.ToString();
+        }
+
+
+        /// <summary>
+        /// Returns method for the specified <see cref="System.Type"/>, method
+        /// name and argument
+        /// <see cref="System.Type"/>s.
+        /// </summary>
+        /// <remarks>Searches with BindingFlags  </remarks>
+        /// <param name="targetType">
+        /// The target <see cref="System.Type"/> to find the method on.
+        /// </param>
+        /// <param name="method">The method to find.</param>
+        /// <param name="argumentTypes">
+        /// The argument <see cref="System.Type"/>s. May be
+        /// <see langword="null"/> if the method has no arguments.
+        /// </param>
+        /// <returns>The target method.</returns>
+        public static MethodInfo GetMethod(
+            Type targetType, string method, Type[] argumentTypes)
+        {
+            AssertUtils.ArgumentNotNull(targetType, "Type must not be null");
+            // try method exactly as specified first...
+            MethodInfo retMethod = targetType.GetMethod(
+                method,
+                ReflectionUtils.AllMembersCaseInsensitiveFlags,
+                null,
+                argumentTypes == null ? Type.EmptyTypes : argumentTypes,
+                null);
+
+            if (retMethod == null)
+            {
+                // try explicit interface implementation...
+                int idx = method.LastIndexOf('.');
+                if (idx > -1)
+                {
+                    method = method.Substring(idx + 1);
+                    retMethod = ReflectionUtils.GetMethod(targetType, method, argumentTypes);
+                }
+            }
+            return retMethod;
+        }
+
+        /// <summary>
+        /// Returns an array of parameter <see cref="System.Type"/>s for the specified method
+        /// or constructor.
+        /// </summary>
+        /// <param name="method">The method (or constructor).</param>
+        /// <returns>An array containing the parameter <see cref="System.Type"/>s.</returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// If <paramref name="method"/> is <see langword="null"/>.
+        /// </exception>
+        public static Type[] GetParameterTypes(MethodBase method)
+        {
+            AssertUtils.ArgumentNotNull(method, "method");
+            return GetParameterTypes(method.GetParameters());
+        }
+
+        /// <summary>
+        /// Returns an array of parameter <see cref="System.Type"/>s for the
+        /// specified parameter info array.
+        /// </summary>
+        /// <param name="args">The parameter info array.</param>
+        /// <returns>An array containing parameter <see cref="System.Type"/>s.</returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// If <paramref name="args"/> is <see langword="null"/> or any of the
+        /// elements <paramref name="args"/> is <see langword="null"/>.
+        /// </exception>
+        public static Type[] GetParameterTypes(ParameterInfo[] args)
+        {
+            AssertUtils.ArgumentNotNull(args, "args");
+            Type[] types = new Type[args.Length];
+            for (int i = 0; i < args.Length; i++)
+            {
+                types[i] = args[i].ParameterType;
+            }
+            return types;
+        }
+
+#if NET_2_0
+        /// <summary>
+        /// Returns an array of <see langword="string"/>s that represent 
+        /// the names of the generic type parameter.
+        /// </summary>
+        /// <param name="method">The method.</param>
+        /// <returns>An array containing the parameter names.</returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// If <paramref name="method"/> is <see langword="null"/>.
+        /// </exception>
+        public static string[] GetGenericParameterNames(MethodInfo method)
+        {
+            AssertUtils.ArgumentNotNull(method, "method");
+            return GetGenericParameterNames(method.GetGenericArguments());
+        }
+
+        /// <summary>
+        /// Returns an array of <see langword="string"/>s that represent 
+        /// the names of the generic type parameter.
+        /// </summary>
+        /// <param name="args">The parameter info array.</param>
+        /// <returns>An array containing parameter names.</returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// If <paramref name="args"/> is <see langword="null"/> or any of the
+        /// elements <paramref name="args"/> is <see langword="null"/>.
+        /// </exception>
+        public static string[] GetGenericParameterNames(Type[] args)
+        {
+            AssertUtils.ArgumentNotNull(args, "args");
+            string[] names = new string[args.Length];
+            for (int i = 0; i < args.Length; i++)
+            {
+                names[i] = args[i].Name;
+            }
+            return names;
+        }
+#endif
+
+        /// <summary>
+        /// From a given list of methods, selects the method having an exact match on the given <paramref name="argValues"/>' types.
+        /// </summary>
+        /// <param name="methods">the list of methods to choose from</param>
+        /// <param name="argValues">the arguments to the method</param>
+        /// <returns>the method matching exactly the passed <paramref name="argValues"/>' types</returns>
+        /// <exception cref="AmbiguousMatchException">
+        /// If more than 1 matching methods are found in the <paramref name="methods"/> list.
+        /// </exception>
+        public static MethodInfo GetMethodByArgumentValues(MethodInfo[] methods, object[] argValues)
+        {
+            return (MethodInfo)GetMethodBaseByArgumentValues("method", methods, argValues);
+        }
+
+        /// <summary>
+        /// From a given list of methods, selects the method having an exact match on the given <paramref name="argValues"/>' types.
+        /// </summary>
+        /// <param name="methodTypeName">the type of method (used for exception reporting only)</param>
+        /// <param name="methods">the list of methods to choose from</param>
+        /// <param name="argValues">the arguments to the method</param>
+        /// <returns>the method matching exactly the passed <paramref name="argValues"/>' types</returns>
+        /// <exception cref="AmbiguousMatchException">
+        /// If more than 1 matching methods are found in the <paramref name="methods"/> list.
+        /// </exception>
+        private static MethodBase GetMethodBaseByArgumentValues(string methodTypeName, MethodBase[] methods,
+                                                                object[] argValues)
+        {
+            MethodBase match = null;
+            int matchCount = 0;
+
+            foreach (MethodBase m in methods)
+            {
+                ParameterInfo[] parameters = m.GetParameters();
+                bool isMatch = true;
+                bool isExactMatch = true;
+                object[] paramValues = argValues;
+
+                try
+                {
+                    if (parameters.Length > 0)
+                    {
+                        ParameterInfo lastParameter = parameters[parameters.Length - 1];
+                        if (lastParameter.GetCustomAttributes(typeof(ParamArrayAttribute), false).Length > 0)
+                        {
+                            paramValues =
+                                PackageParamArray(argValues, parameters.Length,
+                                                  lastParameter.ParameterType.GetElementType());
+                        }
+                    }
+
+                    for (int i = 0; i < parameters.Length; i++)
+                    {
+                        Type paramType = parameters[i].ParameterType;
+                        object paramValue = paramValues[i];
+                        if ((paramValue == null && paramType.IsValueType)
+                            || (paramValue != null && !paramType.IsAssignableFrom(paramValue.GetType())))
+                        {
+                            isMatch = false;
+                            break;
+                        }
+                        if (paramValue == null || paramType != paramValue.GetType())
+                        {
+                            isExactMatch = false;
+                        }
+                    }
+                }
+                catch (InvalidCastException)
+                {
+                    isMatch = false;
+                }
+
+                if (isMatch)
+                {
+                    if (isExactMatch)
+                    {
+                        return m;
+                    }
+
+                    matchCount++;
+                    if (matchCount == 1)
+                    {
+                        match = m;
+                    }
+                    else
+                    {
+                        throw new AmbiguousMatchException(
+                            string.Format("Ambiguous match for {0} '{1}' for the specified number and types of arguments.", methodTypeName,
+                                          m.Name));
+                    }
+                }
+            }
+
+            return match;
+        }
+
+        /// <summary>
+        /// From a given list of constructors, selects the constructor having an exact match on the given <paramref name="argValues"/>' types.
+        /// </summary>
+        /// <param name="methods">the list of constructors to choose from</param>
+        /// <param name="argValues">the arguments to the method</param>
+        /// <returns>the constructor matching exactly the passed <paramref name="argValues"/>' types</returns>
+        /// <exception cref="AmbiguousMatchException">
+        /// If more than 1 matching methods are found in the <paramref name="methods"/> list.
+        /// </exception>
+        public static ConstructorInfo GetConstructorByArgumentValues(ConstructorInfo[] methods, object[] argValues)
+        {
+            return (ConstructorInfo)GetMethodBaseByArgumentValues("constructor", methods, argValues);
+        }
+
+
+        /// <summary>
+        /// Packages arguments into argument list containing parameter array as a last argument.
+        /// </summary>
+        /// <param name="argValues">Argument vaklues to package.</param>
+        /// <param name="argCount">Total number of oarameters.</param>
+        /// <param name="elementType">Type of the param array element.</param>
+        /// <returns>Packaged arguments.</returns>
+        public static object[] PackageParamArray(object[] argValues, int argCount, Type elementType)
+        {
+            object[] values = new object[argCount];
+            int i = 0;
+
+            // copy regular arguments
+            while (i < argCount - 1)
+            {
+                values[i] = argValues[i];
+                i++;
+            }
+
+            // package param array into last argument
+            Array paramArray = Array.CreateInstance(elementType, argValues.Length - i);
+            int j = 0;
+            while (i < argValues.Length)
+            {
+                paramArray.SetValue(argValues[i++], j++);
+            }
+            values[values.Length - 1] = paramArray;
+
+            return values;
+        }
+
+        /// <summary>
+        /// Convenience method to convert an interface <see cref="System.Type"/> 
+        /// to a <see cref="System.Type"/> array that contains 
+        /// all the interfaces inherited and the specified interface.
+        /// </summary>
+        /// <param name="intf">The interface to convert.</param>
+        /// <returns>An array of interface <see cref="System.Type"/>s.</returns>
+        /// <exception cref="System.ArgumentException">
+        /// If the <see cref="System.Type"/> specified is not an interface.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If <paramref name="intf"/> is <see langword="null"/>.
+        /// </exception>
+        public static Type[] ToInterfaceArray(Type intf)
+        {
+            AssertUtils.ArgumentNotNull(intf, "intf");
+
+            if (!intf.IsInterface)
+            {
+                throw new ArgumentException(
+                    string.Format(CultureInfo.InvariantCulture,
+                                  "[{0}] is a class.",
+                                  intf.FullName));
+            }
+
+            ArrayList interfaces = new ArrayList(intf.GetInterfaces());
+            interfaces.Add(intf);
+
+            return (Type[])interfaces.ToArray(typeof(Type));
+        }
+
+        /// <summary>
+        /// Is the supplied <paramref name="propertyName"/> the default indexer for the
+        /// supplied <paramref name="type"/>?
+        /// </summary>
+        /// <param name="propertyName">
+        /// The name of the property on the supplied <paramref name="type"/> to be checked.
+        /// </param>
+        /// <param name="type">
+        /// The <see cref="System.Type"/>  to be checked.
+        /// </param>
+        /// <returns>
+        /// <see lang="true"/> if the supplied <paramref name="propertyName"/> is the
+        /// default indexer for the supplied <paramref name="type"/>.
+        /// </returns>
+        /// <exception cref="System.NullReferenceException">
+        /// If the supplied <paramref name="type"/> is <see langword="null"/>.
+        /// </exception>
+        public static bool PropertyIsIndexer(string propertyName, Type type)
+        {
+            DefaultMemberAttribute[] attribs =
+                (DefaultMemberAttribute[])type.GetCustomAttributes(typeof(DefaultMemberAttribute), true);
+            if (attribs.Length != 0)
+            {
+                foreach (DefaultMemberAttribute attrib in attribs)
+                {
+                    if (attrib.MemberName.Equals(propertyName))
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Is the supplied <paramref name="method"/> declared on one of these interfaces?
+        /// </summary>
+        /// <param name="method">The method to check.</param>
+        /// <param name="interfaces">The array of interfaces we want to check.</param>
+        /// <returns>
+        /// <see lang="true"/> if the method is declared on one of these interfaces.
+        /// </returns>
+        /// <exception cref="System.ArgumentException">
+        /// If any of the <see cref="System.Type"/>s specified is not an interface.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If <paramref name="method"/> or any of the specified interfaces is
+        /// <see langword="null"/>.
+        /// </exception>
+        public static bool MethodIsOnOneOfTheseInterfaces(MethodBase method, Type[] interfaces)
+        {
+            AssertUtils.ArgumentNotNull(method, "method");
+            if (interfaces == null)
+            {
+                return false;
+            }
+            Type[] paramTypes = GetParameterTypes(method.GetParameters());
+            for (int i = 0; i < interfaces.Length; i++)
+            {
+                Type interfaceType = interfaces[i];
+                AssertUtils.ArgumentNotNull(interfaceType, StringUtils.Surround("interfaces[", i, "]"));
+                if (!interfaceType.IsInterface)
+                {
+                    throw new ArgumentException(interfaces[i].FullName + " is not an interface");
+                }
+                try
+                {
+                    MethodInfo mi = interfaceType.GetMethod(
+                        method.Name,
+                        BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly,
+                        null, paramTypes, null);
+                    if (mi != null)
+                    {
+                        // found it...
+                        return true;
+                    }
+                }
+                catch
+                {
+                    // didn't find it, so keep going...
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns the default value for the specified <see cref="System.Type"/>
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Follows the standard .NET conventions for default values where
+        /// relevant; for example, all numeric types default to the value
+        /// <c>0</c>.
+        /// </p>
+        /// </remarks>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> to return default value for.
+        /// </param>
+        /// <returns>
+        /// The default value for the specified <see cref="System.Type"/>.
+        /// </returns>
+        /// <exception cref="System.ArgumentException">
+        /// If the supplied <paramref name="type"/> is an enumerated type that
+        /// has no values.
+        /// </exception>
+        public static object GetDefaultValue(Type type)
+        {
+            if (!type.IsValueType)
+            {
+                return null;
+            }
+            if (type == typeof(Boolean))
+            {
+                return false;
+            }
+            if (type == typeof(DateTime))
+            {
+                return DateTime.MinValue;
+            }
+            if (type == typeof(Char))
+            {
+                return Char.MinValue;
+            }
+            if (type.IsEnum)
+            {
+                Array values = Enum.GetValues(type);
+                if (values == null || values.Length == 0)
+                {
+                    throw new ArgumentException("Bad 'enum' Type : cannot get default value because 'enum' has no values.");
+                }
+                return values.GetValue(0);
+            }
+            return 0;
+        }
+
+        /// <summary>
+        /// Returns an array consisting of the default values for the supplied
+        /// <paramref name="types"/>.
+        /// </summary>
+        /// <param name="types">
+        /// The array of <see cref="System.Type"/>s to return default values for.
+        /// </param>
+        /// <returns>
+        /// An array consisting of the default values for the supplied
+        /// <paramref name="types"/>.
+        /// </returns>
+        /// <exception cref="System.ArgumentException">
+        /// If any of the elements in the supplied <paramref name="types"/>
+        /// array is an enumerated type that has no values.
+        /// </exception>
+        /// <seealso cref="Spring.Util.ReflectionUtils.GetDefaultValue(Type)"/>
+        public static object[] GetDefaultValues(Type[] types)
+        {
+            object[] defaults = new object[types.Length];
+            for (int i = 0; i < types.Length; ++i)
+            {
+                defaults[i] = GetDefaultValue(types[i]);
+            }
+            return defaults;
+        }
+
+        /// <summary>
+        /// Checks that the parameter <see cref="System.Type"/>s of the
+        /// supplied <paramref name="candidate"/> match the parameter
+        /// <see cref="System.Type"/>s of the supplied
+        /// <paramref name="parameterTypes"/>.
+        /// </summary>
+        /// <param name="candidate">The method to be checked.</param>
+        /// <param name="parameterTypes">
+        /// The array of parameter <see cref="System.Type"/>s to check against.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the parameter <see cref="System.Type"/>s
+        /// match.
+        /// </returns>
+        public static bool ParameterTypesMatch(
+            MethodInfo candidate, Type[] parameterTypes)
+        {
+            #region Sanity Checks
+
+            AssertUtils.ArgumentNotNull(candidate, "candidate");
+            AssertUtils.ArgumentNotNull(parameterTypes, "parameterTypes");
+
+            #endregion
+
+            Type[] candidatesParameterTypes
+                = ReflectionUtils.GetParameterTypes(candidate);
+            if (candidatesParameterTypes.Length != parameterTypes.Length)
+            {
+                return false;
+            }
+            for (int i = 0; i < candidatesParameterTypes.Length; ++i)
+            {
+                if (!candidatesParameterTypes[i].Equals(parameterTypes[i]))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Returns an array containing the <see cref="System.Type"/>s of the
+        /// objects in the supplied array.
+        /// </summary>
+        /// <param name="args">
+        /// The objects array for which the corresponding <see cref="System.Type"/>s
+        /// are needed.
+        /// </param>
+        /// <returns>
+        /// An array containing the <see cref="System.Type"/>s of the objects
+        /// in the supplied array; this array will be empty (but not
+        /// <see langword="null"/> if the supplied <paramref name="args"/>
+        /// is null or has no elements.
+        /// </returns>
+        /// <example>
+        /// <p>
+        /// [C#]<br/>
+        /// Given an array containing the following objects,
+        /// <code>[83, "Foo", new object ()]</code>, the <see cref="System.Type"/>
+        /// array returned from this method call would consist of the following
+        /// <see cref="System.Type"/> elements...
+        /// <code>[Int32, String, Object]</code>.
+        /// </p>
+        /// </example>
+        public static Type[] GetTypes(object[] args)
+        {
+            if (args == null || args.Length == 0)
+            {
+                return Type.EmptyTypes;
+            }
+            Type[] paramsType = new Type[args.Length];
+            for (int i = 0; i < args.Length; ++i)
+            {
+                object arg = args[i];
+                paramsType[i] = (arg != null) ? args[i].GetType() : typeof(object);
+            }
+            return paramsType;
+        }
+
+        /// <summary>
+        /// Does the given <see cref="System.Type"/> and/or it's superclasses
+        /// have at least one or more methods with the given name (with any
+        /// argument types)?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Includes non-public methods in the methods searched.
+        /// </p>
+        /// </remarks>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> to be checked.
+        /// </param>
+        /// <param name="name">
+        /// The name of the method to be searched for. Case inSenSItivE.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if the given <see cref="System.Type"/> or / and it's
+        /// superclasses have at least one or more methods (with any argument types);
+        /// <see langword="false"/> if not, or either of the parameters is <see langword="null"/>.
+        /// </returns>
+        public static bool HasAtLeastOneMethodWithName(Type type, string name)
+        {
+            if (type == null || StringUtils.IsNullOrEmpty(name))
+            {
+                return false;
+            }
+            return MethodCountForName(type, name) > 0;
+        }
+
+        /// <summary>
+        ///  Within <paramref name="type"/>, counts the number of overloads for the method with the given (case-insensitive!) <paramref name="name"/> 
+        /// </summary>
+        /// <param name="type">The type to be searched</param>
+        /// <param name="name">the name of the method for which overloads shall be counted</param>
+        /// <returns>The number of overloads for method <paramref name="name"/> within type <paramref name="type"/></returns>
+        public static int MethodCountForName(Type type, string name)
+        {
+            AssertUtils.ArgumentNotNull(type, "type", "Type must not be null");
+            AssertUtils.ArgumentNotNull(name, "name", "Method name must not be null");
+            MemberInfo[] methods = type.FindMembers(
+                MemberTypes.Method,
+                ReflectionUtils.AllMembersCaseInsensitiveFlags,
+                new MemberFilter(ReflectionUtils.MethodNameFilter),
+                name);
+            return methods.Length;
+        }
+
+        private static bool MethodNameFilter(MemberInfo member, object criteria)
+        {
+            MethodInfo method = member as MethodInfo;
+            string name = criteria as string;
+            return String.Compare(method.Name, name, true, CultureInfo.InvariantCulture) == 0;
+        }
+
+        /// <summary>
+        /// Creates a <see cref="System.Reflection.Emit.CustomAttributeBuilder"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Note that if a non-<see langword="null"/> <paramref name="sourceAttribute"/>
+        /// is supplied, any read write properties exposed by the <paramref name="sourceAttribute"/>
+        /// will be used to overwrite values that may have been passed in via the
+        /// <paramref name="ctorArgs"/>. That is, the <paramref name="ctorArgs"/> will be used
+        /// to initialize the custom attribute, and then any read-write properties on the
+        /// <paramref name="sourceAttribute"/> will be plugged in.
+        /// </p>
+        /// </remarks>
+        /// <param name="type">
+        /// The desired <see cref="System.Attribute"/> <see cref="System.Type"/>.
+        /// </param>
+        /// <param name="ctorArgs">
+        /// Any constructor arguments for the attribute (may be <see langword="null"/>
+        /// in the case of no arguments).
+        /// </param>
+        /// <param name="sourceAttribute">
+        /// Source attribute to copy properties from (may be <see langword="null"/>).
+        /// </param>
+        /// <returns>A custom attribute builder.</returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the <paramref name="type"/> parameter is <see langword="null"/>.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the <paramref name="type"/> parameter is not a <see cref="System.Type"/>
+        /// that derives from the <see cref="System.Attribute"/> class.
+        /// </exception>
+        /// <seealso cref="System.Reflection.Emit.CustomAttributeBuilder"/>
+        public static CustomAttributeBuilder CreateCustomAttribute(
+            Type type, object[] ctorArgs, Attribute sourceAttribute)
+        {
+            #region Sanity Checks
+
+            AssertUtils.ArgumentNotNull(type, "type");
+            if (!typeof(Attribute).IsAssignableFrom(type))
+            {
+                throw new ArgumentException(
+                    string.Format("[{0}] does not derive from the [System.Attribute] class.",
+                                  type.FullName));
+            }
+
+            #endregion
+
+            ConstructorInfo ci = type.GetConstructor(ReflectionUtils.GetTypes(ctorArgs));
+            if (ci == null && ctorArgs.Length == 0)
+            {
+                ci = type.GetConstructors()[0];
+                ctorArgs = GetDefaultValues(GetParameterTypes(ci.GetParameters()));
+            }
+
+            if (sourceAttribute != null)
+            {
+                object defaultAttribute = null;
+                try
+                {
+                    defaultAttribute = ci.Invoke(ctorArgs);
+                }
+                catch
+                {
+                }
+
+                IList getSetProps = new ArrayList();
+                IList getSetValues = new ArrayList();
+                IList readOnlyProps = new ArrayList();
+                IList readOnlyValues = new ArrayList();
+                foreach (PropertyInfo pi in type.GetProperties(BindingFlags.Instance | BindingFlags.Public))
+                {
+                    if (pi.DeclaringType == typeof(Attribute))
+                        continue;
+
+                    if (pi.CanRead)
+                    {
+                        if (pi.CanWrite)
+                        {
+                            object propValue = pi.GetValue(sourceAttribute, null);
+                            if (defaultAttribute != null)
+                            {
+                                object defaultValue = pi.GetValue(defaultAttribute, null);
+                                if ((propValue == null && defaultValue == null) ||
+                                    (propValue != null && propValue.Equals(defaultValue)))
+                                    continue;
+                            }
+                            getSetProps.Add(pi);
+                            getSetValues.Add(propValue);
+                        }
+                        else
+                        {
+                            readOnlyProps.Add(pi);
+                            readOnlyValues.Add(pi.GetValue(sourceAttribute, null));
+                        }
+                    }
+                }
+
+                if (readOnlyProps.Count == 1)
+                {
+                    PropertyInfo pi = readOnlyProps[0] as PropertyInfo;
+                    ConstructorInfo ciTemp = type.GetConstructor(new Type[1] { pi.PropertyType });
+                    if (ciTemp != null)
+                    {
+                        ci = ciTemp;
+                        ctorArgs = new object[1] { readOnlyValues[0] };
+                    }
+                    else
+                    {
+                        ciTemp = type.GetConstructor(new Type[1] { readOnlyValues[0].GetType() });
+                        if (ciTemp != null)
+                        {
+                            ci = ciTemp;
+                            ctorArgs = new object[1] { readOnlyValues[0] };
+                        }
+                    }
+                }
+
+                PropertyInfo[] propertyInfos = new PropertyInfo[getSetProps.Count];
+                getSetProps.CopyTo(propertyInfos, 0);
+
+                object[] propertyValues = new object[getSetValues.Count];
+                getSetValues.CopyTo(propertyValues, 0);
+
+                return new CustomAttributeBuilder(ci, ctorArgs, propertyInfos, propertyValues);
+            }
+            else
+            {
+                return new CustomAttributeBuilder(ci, ctorArgs);
+            }
+        }
+
+        /// <summary>
+        /// Creates a <see cref="System.Reflection.Emit.CustomAttributeBuilder"/>.
+        /// </summary>
+        /// <param name="type">
+        /// The desired <see cref="System.Attribute"/> <see cref="System.Type"/>.
+        /// </param>
+        /// <param name="sourceAttribute">
+        /// Source attribute to copy properties from (may be <see langword="null"/>).
+        /// </param>
+        /// <returns>A custom attribute builder.</returns>
+        public static CustomAttributeBuilder CreateCustomAttribute(
+            Type type, Attribute sourceAttribute)
+        {
+            return CreateCustomAttribute(type, new object[] { }, sourceAttribute);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="System.Reflection.Emit.CustomAttributeBuilder"/>.
+        /// </summary>
+        /// <param name="sourceAttribute">
+        /// The source attribute to copy properties from.
+        /// </param>
+        /// <returns>A custom attribute builder.</returns>
+        /// <exception cref="System.NullReferenceException">
+        /// If the supplied <paramref name="sourceAttribute"/> is
+        /// <see langword="null"/>.
+        /// </exception>
+        public static CustomAttributeBuilder CreateCustomAttribute(Attribute sourceAttribute)
+        {
+            return CreateCustomAttribute(sourceAttribute.GetType(), sourceAttribute);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="System.Reflection.Emit.CustomAttributeBuilder"/>.
+        /// </summary>
+        /// <param name="type">
+        /// The desired <see cref="System.Attribute"/> <see cref="System.Type"/>.
+        /// </param>
+        /// <returns>A custom attribute builder.</returns>
+        public static CustomAttributeBuilder CreateCustomAttribute(Type type)
+        {
+            return CreateCustomAttribute(type, new object[] { }, null);
+        }
+
+        /// <summary>
+        /// Creates a <see cref="System.Reflection.Emit.CustomAttributeBuilder"/>.
+        /// </summary>
+        /// <param name="type">
+        /// The desired <see cref="System.Attribute"/> <see cref="System.Type"/>.
+        /// </param>
+        /// <param name="ctorArgs">
+        /// Any constructor arguments for the attribute (may be <see langword="null"/>
+        /// in the case of no arguments).
+        /// </param>
+        /// <returns>A custom attribute builder.</returns>
+        public static CustomAttributeBuilder CreateCustomAttribute(
+            Type type, params object[] ctorArgs)
+        {
+            return CreateCustomAttribute(type, ctorArgs, null);
+        }
+
+#if NET_2_0
+        /// <summary>
+        /// Creates a <see cref="System.Reflection.Emit.CustomAttributeBuilder"/>.
+        /// </summary>
+        /// <param name="attributeData">
+        /// The <see cref="System.Reflection.CustomAttributeData"/> to create 
+        /// the custom attribute builder from.
+        /// </param>
+        /// <returns>A custom attribute builder.</returns>
+        public static CustomAttributeBuilder CreateCustomAttribute(CustomAttributeData attributeData)
+        {
+            object[] parameterValues = new object[attributeData.ConstructorArguments.Count];
+            Type[] parameterTypes = new Type[attributeData.ConstructorArguments.Count];
+
+            IList namedParameterValues = new ArrayList();
+            IList namedFieldValues = new ArrayList();
+
+            // Fill arrays of the constructor parameters
+            for (int i = 0; i < attributeData.ConstructorArguments.Count; i++)
+            {
+                parameterTypes[i] = attributeData.ConstructorArguments[i].ArgumentType;
+                parameterValues[i] = ConvertValueIfNecessary(attributeData.ConstructorArguments[i].Value);
+            }
+
+            Type attributeType = attributeData.Constructor.DeclaringType;
+            PropertyInfo[] attributeProperties = attributeType.GetProperties(
+                BindingFlags.Instance | BindingFlags.Public);
+            FieldInfo[] attributeFields = attributeType.GetFields(
+                BindingFlags.Instance | BindingFlags.Public);
+
+            // Not using generics bellow as probably Spring.NET tries to keep 
+            // it on .NET1 compatibility level right now I believe (SD)
+            // In case of using List<CustomAttributesData> the above note makes
+            // no sense (SD:)
+            IList propertiesToSet = new ArrayList();
+            int k = 0;
+
+            IList fieldsToSet = new ArrayList();
+            int n = 0;
+
+
+            // Fills arrays of the constructor named parameters
+            foreach (CustomAttributeNamedArgument namedArgument in attributeData.NamedArguments)
+            {
+                bool noMatchingProperty = false;
+
+                // Now iterate through all of the PropertyInfo, find the
+                // one with the corresponding to the NamedProperty name
+                // and add it to the array of properties to set.
+                for (int j = 0; j < attributeProperties.Length; j++)
+                {
+                    if (attributeProperties[j].Name == namedArgument.MemberInfo.Name)
+                    {
+                        propertiesToSet.Add(attributeProperties[j]);
+                        namedParameterValues.Add(ConvertValueIfNecessary(namedArgument.TypedValue.Value));
+                        break;
+                    }
+                    else
+                    {
+                        if (j == attributeProperties.Length - 1)
+                        {
+                            // In case of no match, throw
+                            noMatchingProperty = true;
+                            /*
+                            throw new InvalidOperationException(
+                                String.Format(CultureInfo.InvariantCulture,
+                                "The property with name {0} can't be found in the " +
+                                "type {1}, but is present as a named property " +
+                                "on the attributeData {2}", namedArgument.MemberInfo.Name,
+                                attributeType.FullName, attributeData));
+                            */
+                        }
+                    }
+                }
+                if (noMatchingProperty)
+                {
+                    for (int j = 0; j < attributeFields.Length; j++)
+                    {
+                        if (attributeFields[j].Name == namedArgument.MemberInfo.Name)
+                        {
+                            fieldsToSet.Add(attributeFields[j]);
+                            namedFieldValues.Add(ConvertValueIfNecessary(namedArgument.TypedValue.Value));
+                            break;
+                        }
+                        else
+                        {
+                            if (j == attributeFields.Length - 1)
+                            {
+                                throw new InvalidOperationException(
+                                        String.Format(CultureInfo.InvariantCulture,
+                                        "A property or public field with name {0} can't be found in the " +
+                                        "type {1}, but is present as a named property " +
+                                        "on the attributeData {2}", namedArgument.MemberInfo.Name,
+                                        attributeType.FullName, attributeData));
+                            }
+                        }
+                    }
+                }
+            }
+            // Get constructor corresponding to the parameters and their types
+            ConstructorInfo constructor = attributeType.GetConstructor(parameterTypes);
+
+            PropertyInfo[] namedProperties = new PropertyInfo[propertiesToSet.Count];
+            propertiesToSet.CopyTo(namedProperties, 0);
+
+            object[] propertyValues = new object[namedParameterValues.Count];
+            namedParameterValues.CopyTo(propertyValues, 0);
+
+            if (fieldsToSet.Count == 0)
+            {
+                return new CustomAttributeBuilder(
+                        constructor, parameterValues, namedProperties, propertyValues);
+            }
+            else
+            {
+                FieldInfo[] namedFields = new FieldInfo[fieldsToSet.Count];
+                fieldsToSet.CopyTo(namedFields, 0);
+
+                object[] fieldValues = new object[namedFieldValues.Count];
+                namedFieldValues.CopyTo(fieldValues, 0);
+
+                return new CustomAttributeBuilder(
+                        constructor, parameterValues, namedProperties, propertyValues, namedFields, fieldValues);
+            }
+
+
+
+        }
+
+        private static object ConvertValueIfNecessary(object value)
+        {
+            if (value == null) return value;
+
+            // We are only hunting for the case of the ReadOnlyCollection<T> here.
+            ReadOnlyCollection<CustomAttributeTypedArgument> sourceArray =
+                value as ReadOnlyCollection<CustomAttributeTypedArgument>;
+
+            if (sourceArray == null) return value;
+
+            Type underlyingType = null; // type to be used for arguments
+            Array returnArray = null;
+            for (int i = 0; i < sourceArray.Count; i++)
+            {
+                if (underlyingType == null)
+                {
+                    underlyingType = sourceArray[i].ArgumentType;
+                    returnArray = Array.CreateInstance(underlyingType, sourceArray.Count);
+                }
+                if (!underlyingType.Equals(sourceArray[i].ArgumentType))
+                {
+                    throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture,
+                        "Types for the same named parameter of array type are expected to be same"));
+                }
+
+                returnArray.SetValue(sourceArray[i].Value, i);
+            }
+
+            return returnArray;
+
+        }
+#endif
+
+        /// <summary>
+        /// Tries to find matching methods in the specified <see cref="System.Type"/>
+        /// for each method in the supplied <paramref name="methods"/> list.
+        /// </summary>
+        /// <param name="type">
+        /// The <see cref="System.Type"/> to look for matching methods in.
+        /// </param>
+        /// <param name="methods">The methods to match.</param>
+        /// <param name="strict">
+        /// A flag that specifies whether to throw an exception if a matching
+        /// method is not found.
+        /// </param>
+        /// <returns>A list of the matched methods.</returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// If either of the <paramref name="type"/> or
+        /// <paramref name="methods"/> parameters are <see langword="null"/>.
+        /// </exception>
+        public static MethodInfo[] GetMatchingMethods(Type type, MethodInfo[] methods, bool strict)
+        {
+            AssertUtils.ArgumentNotNull(type, "type");
+            AssertUtils.ArgumentNotNull(methods, "methods");
+
+            BindingFlags flags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
+
+            MethodInfo[] matched = new MethodInfo[methods.Length];
+            for (int i = 0; i < methods.Length; i++)
+            {
+                MethodInfo method = methods[i];
+                MethodInfo match = type.GetMethod(method.Name, flags, null, ReflectionUtils.GetParameterTypes(method), null);
+                if ((match == null || match.ReturnType != method.ReturnType) && strict)
+                {
+                    throw new Exception(
+                        string.Format("Method '{0}' could not be matched in the target class [{1}].",
+                                      method.Name, type.FullName));
+                }
+                matched[i] = match;
+            }
+            return matched;
+        }
+
+        /// <summary>
+        /// Returns the <see cref="System.Type"/> of the supplied
+        /// <paramref name="source"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the <paramref name="source"/> is a <see cref="System.Type"/>
+        /// instance, the return value of this method call with be the
+        /// <paramref name="source"/> parameter cast to a
+        /// <see cref="System.Type"/>. If the <paramref name="source"/> is
+        /// anything other than a <see cref="System.Type"/>, the return value
+        /// will be the result of invoking the <paramref name="source"/>'s
+        /// <see cref="System.Object.GetType()"/> method.
+        /// </p>
+        /// </remarks>
+        /// <param name="source">
+        /// A <see cref="Type"/> or <see cref="object"/> instance.
+        /// </param>
+        /// <returns>
+        /// The <paramref name="source"/>argument if it is a
+        /// <see cref="Type"/> or the result of invoking
+        /// <see cref="Object.GetType"/> on the argument if it
+        /// is an <see cref="Object"/>.
+        /// </returns>
+        /// <exception cref="System.NullReferenceException">
+        /// If the <paramref name="source"/> is <see langword="null"/>.
+        /// </exception>
+        public static Type TypeOfOrType(object source)
+        {
+            return source is Type ? source as Type : source.GetType();
+        }
+
+
+#if NET_2_0
+        private static readonly MethodInfo Exception_InternalPreserveStackTrace =
+            typeof(Exception).GetMethod("InternalPreserveStackTrace", BindingFlags.Instance | BindingFlags.NonPublic);
+#else
+        private static readonly FieldInfo Exception_RemoteStackTraceString = 
+            typeof(Exception).GetField("_remoteStackTraceString", BindingFlags.Instance | BindingFlags.NonPublic);
+#endif
+
+        /// <summary>
+        /// Unwraps the supplied <see cref="System.Reflection.TargetInvocationException"/> 
+        /// and returns the inner exception preserving the stack trace.
+        /// </summary>
+        /// <param name="ex">
+        /// The <see cref="System.Reflection.TargetInvocationException"/> to unwrap.
+        /// </param>
+        /// <returns>The unwrapped exception.</returns>
+        public static Exception UnwrapTargetInvocationException(TargetInvocationException ex)
+        {
+#if NET_2_0
+            Exception_InternalPreserveStackTrace.Invoke(ex.InnerException, new Object[] { });
+#else
+            Exception_RemoteStackTraceString.SetValue(ex.InnerException, ex.InnerException.StackTrace + Environment.NewLine);
+#endif
+            return ex.InnerException;
+        }
+
+        /// <summary>
+        /// Is the supplied <paramref name="type"/> can be accessed outside the assembly ?
+        /// </summary>
+        /// <param name="type">The type to check.</param>
+        /// <returns>
+        /// <see langword="true"/> if the type can be accessed outside the assembly;
+        /// Otherwise <see langword="false"/>.
+        /// </returns>
+        public static bool IsTypeVisible(Type type)
+        {
+            return IsTypeVisible(type, null);
+        }
+
+        /// <summary>
+        /// Is the supplied <paramref name="type"/> can be accessed 
+        /// from the supplied friendly assembly ?
+        /// </summary>
+        /// <param name="type">The type to check.</param>
+        /// <param name="friendlyAssemblyName">The friendly assembly name.</param>
+        /// <returns>
+        /// <see langword="true"/> if the type can be accessed 
+        /// from the supplied friendly assembly; Otherwise <see langword="false"/>.
+        /// </returns>
+        public static bool IsTypeVisible(Type type, string friendlyAssemblyName)
+        {
+#if NET_2_0
+            if (type.IsVisible)
+            {
+                return true;
+            }
+            else
+            {
+                if (friendlyAssemblyName != null
+                    && friendlyAssemblyName.Length > 0
+                    && (!type.IsNested || type.IsNestedPublic ||
+                     (!type.IsNestedPrivate && (type.IsNestedAssembly || type.IsNestedFamORAssem))))
+                {
+                    object[] attrs = type.Assembly.GetCustomAttributes(typeof(InternalsVisibleToAttribute), false);
+                    foreach (InternalsVisibleToAttribute ivta in attrs)
+                    {
+                        if (ivta.AssemblyName == friendlyAssemblyName)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+#else
+            if (type.IsPublic || (type.IsNestedPublic && type.DeclaringType.IsPublic))
+            {
+                return true;
+            }
+#endif
+            return false;
+        }
+
+        /// <summary>
+        /// Gets all of the interfaces implemented by 
+        /// the specified <see cref="System.Type"/>.
+        /// </summary>
+        /// <param name="type">
+        /// The object to get the interfaces of.
+        /// </param>
+        /// <returns>
+        /// All of the interfaces implemented by the
+        /// <see cref="System.Type"/>.
+        /// </returns>
+        public static Type[] GetInterfaces(Type type)
+        {
+            AssertUtils.ArgumentNotNull(type, "type");
+
+            if (type.IsInterface)
+            {
+                ArrayList interfaces = new ArrayList();
+                interfaces.Add(type);
+                interfaces.AddRange(type.GetInterfaces());
+                return (Type[])interfaces.ToArray(typeof(Type));
+            }
+            else
+            {
+                return type.GetInterfaces();
+            }
+        }
+
+        /// <summary>
+        /// Returns the explicit <see cref="System.Exception"/> that is the root cause of an exception.
+        /// </summary>
+        /// <remarks>
+        /// If the InnerException property of the current exception is a null reference 
+        /// or a <see cref="System.NullReferenceException"/>, returns the current exception.
+        /// </remarks>
+        /// <param name="ex">The last exception thrown.</param>
+        /// <returns>
+        /// The first explicit exception thrown in a chain of exceptions.
+        /// </returns>
+        public static Exception GetExplicitBaseException(Exception ex)
+        {
+            Exception innerEx = ex.InnerException;
+            while (innerEx != null &&
+                !(innerEx is NullReferenceException))
+            {
+                ex = innerEx;
+                innerEx = innerEx.InnerException;
+            }
+            return ex;
+        }
+
+        /// <summary>
+        /// Copies all fields from one object to another. 
+        /// </summary>
+        /// <remarks>
+        /// The types of both objects must be related. This means, that either of the following is true:
+        /// <list type="bullet">
+        ///		<item><description>fromObject.GetType() == toObject.GetType()</description></item>
+        ///		<item><description>fromObject.GetType() is derived from toObject.GetType()</description></item>
+        ///		<item><description>toObject.GetType() is derived from fromObject.GetType()</description></item>
+        /// </list>
+        /// </remarks>
+        /// <param name="fromObject">The source object</param>
+        /// <param name="toObject">The object, who's fields will be populated with values from the source object</param>
+        /// <exception cref="ArgumentException">If the object's types are not related</exception>
+        public static void MemberwiseCopy(object fromObject, object toObject)
+        {
+            Type fromType = fromObject.GetType();
+            Type toType = toObject.GetType();
+
+            Type smallerType;
+
+            if (fromType.IsAssignableFrom(toType))
+            {
+                smallerType = fromType;
+            }
+            else if (toType.IsAssignableFrom(fromType))
+            {
+                smallerType = toType;
+            }
+            else
+            {
+                throw new ArgumentException("object types are not related");
+            }
+
+            MemberwiseCopyInternal(fromObject, toObject, smallerType);
+        }
+
+#if NET_2_0
+        private static void MemberwiseCopyInternal(object fromObject, object toObject, Type smallerType)
+        {
+            MemberwiseCopyHandler impl = GetImpl(smallerType);
+            impl(fromObject, toObject);
+        }
+
+        private delegate void MemberwiseCopyHandler(object a, object b);
+
+        private static readonly Hashtable s_handlerCache = new Hashtable();
+
+        private static MemberwiseCopyHandler GetImpl(Type type)
+        {
+            MemberwiseCopyHandler handler = s_handlerCache[type] as MemberwiseCopyHandler;
+            if (handler != null) return handler;
+
+            lock (s_handlerCache)
+            {
+                handler = s_handlerCache[type] as MemberwiseCopyHandler;
+                if (handler != null) return handler;
+
+                FieldInfo[] fields = GetFields(type);
+                DynamicMethod dm = new DynamicMethod(type.FullName + ".ShallowCopy", null, new Type[] { typeof(object), typeof(object) }, type.Module, true);
+                ILGenerator ilGen = dm.GetILGenerator();
+                ilGen.DeclareLocal(type);
+                ilGen.DeclareLocal(type);
+                ilGen.Emit(OpCodes.Ldarg_0);
+                ilGen.Emit(OpCodes.Castclass, type);
+                ilGen.Emit(OpCodes.Stloc_0);
+                ilGen.Emit(OpCodes.Ldarg_1);
+                ilGen.Emit(OpCodes.Castclass, type);
+                ilGen.Emit(OpCodes.Stloc_1);
+
+                foreach (FieldInfo field in fields)
+                {
+                    ilGen.Emit(OpCodes.Ldloc_1);
+                    ilGen.Emit(OpCodes.Ldloc_0);
+                    ilGen.Emit(OpCodes.Ldfld, field);
+                    ilGen.Emit(OpCodes.Stfld, field);
+                }
+                ilGen.Emit(OpCodes.Ret);
+
+                handler = (MemberwiseCopyHandler)dm.CreateDelegate(typeof(MemberwiseCopyHandler));
+                s_handlerCache[type] = handler;
+            }
+            return handler;
+        }
+#else
+        private static void MemberwiseCopyInternal(object fromObject, object toObject, Type smallerType)
+        {
+            FieldInfo[] fields = GetFields(smallerType);
+            for (int i = 0; i < fields.Length; i++)
+            {
+                FieldInfo field = fields[i];
+                field.SetValue(toObject, field.GetValue(fromObject));
+            }
+        }
+#endif
+
+        #region Field Cache Management for "MemberwiseCopy"
+
+        private const BindingFlags FIELDBINDINGS =
+            BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic;
+
+        private static readonly Hashtable s_fieldCache = new Hashtable();
+
+        private static FieldInfo[] GetFields(Type type)
+        {
+            lock (s_fieldCache)
+            {
+                FieldInfo[] fields = (FieldInfo[])s_fieldCache[type];
+                if (fields == null)
+                {
+                    ArrayList fieldList = new ArrayList();
+                    CollectFieldsRecursive(type, fieldList);
+                    fields = (FieldInfo[])fieldList.ToArray(typeof(FieldInfo));
+                    s_fieldCache[type] = fields;
+                }
+                return fields;
+            }
+        }
+
+        private static void CollectFieldsRecursive(Type type, ArrayList fieldList)
+        {
+            if (type == typeof(object)) return;
+
+            FieldInfo[] fields = type.GetFields(FIELDBINDINGS);
+            fieldList.AddRange(fields);
+            CollectFieldsRecursive(type.BaseType, fieldList);
+        }
+
+        #endregion Field Cache Management for "MemberwiseCopy"
+
+
+        #region CustomAttributeBuilderBuilder inner class definition
+
+        /// <summary>
+        /// Creates a <see cref=" CustomAttributeBuilder"/>.
+        /// </summary>
+        /// <author>Bruno Baia</author>
+        /// <version>$Id: ReflectionUtils.cs,v 1.59 2008/05/13 14:22:46 oakinger Exp $</version>
+        public class CustomAttributeBuilderBuilder
+        {
+            #region Fields
+
+            private Type type;
+            private ArrayList constructorArgs;
+            private ArrayList namedProperties;
+            private ArrayList propertyValues;
+
+            #endregion
+
+            #region Constructor(s) / Destructor
+
+            /// <summary>
+            /// Creates a new instance of the 
+            /// <see cref="CustomAttributeBuilderBuilder"/> class.
+            /// </summary>
+            /// <param name="attributeType">The custom attribute type.</param>
+            public CustomAttributeBuilderBuilder(Type attributeType)
+                :
+                this(attributeType, ObjectUtils.EmptyObjects)
+            {
+            }
+
+            /// <summary>
+            /// Creates a new instance of the 
+            /// <see cref="CustomAttributeBuilderBuilder"/> class.
+            /// </summary>
+            /// <param name="attributeType">The custom attribute type.</param>
+            /// <param name="constructorArgs">The custom attribute constructor arguments.</param>
+            public CustomAttributeBuilderBuilder(Type attributeType, params object[] constructorArgs)
+            {
+                AssertUtils.ArgumentNotNull(attributeType, "attributeType");
+                if (!typeof(Attribute).IsAssignableFrom(attributeType))
+                {
+                    throw new ArgumentException(
+                        string.Format("[{0}] does not derive from the [System.Attribute] class.",
+                                      attributeType.FullName));
+                }
+                this.type = attributeType;
+                this.constructorArgs = new ArrayList(constructorArgs);
+                this.namedProperties = new ArrayList();
+                this.propertyValues = new ArrayList();
+            }
+
+            #endregion
+
+            #region Public Methods
+
+            /// <summary>
+            /// Adds the specified values to the constructor argument list 
+            /// used to create the custom attribute.
+            /// </summary>
+            /// <param name="values">An array of argument values.</param>
+            public void AddContructorArgument(params object[] values)
+            {
+                this.constructorArgs.AddRange(values);
+            }
+
+            /// <summary>
+            /// Adds a property value to the custom attribute.
+            /// </summary>
+            /// <param name="name">The property name.</param>
+            /// <param name="value">The property value.</param>
+            public void AddPropertyValue(string name, object value)
+            {
+                PropertyInfo propertyInfo = this.type.GetProperty(name, BindingFlags.Instance | BindingFlags.Public);
+                if (propertyInfo == null)
+                {
+                    throw new ArgumentException(
+                        String.Format("The property '{0}' does no exist in the attribute '{1}'.", name, this.type));
+                }
+
+                this.namedProperties.Add(propertyInfo);
+                this.propertyValues.Add(value);
+            }
+
+            /// <summary>
+            /// Creates the <see cref="CustomAttributeBuilderBuilder"/>.
+            /// </summary>
+            /// <returns>The created <see cref="CustomAttributeBuilderBuilder"/>.</returns>
+            public CustomAttributeBuilder Build()
+            {
+                object[] caArray = (object[])this.constructorArgs.ToArray(typeof(object));
+                ConstructorInfo ci = this.type.GetConstructor(ReflectionUtils.GetTypes(caArray));
+                if (ci == null && caArray.Length == 0)
+                {
+                    ci = this.type.GetConstructors()[0];
+                    caArray = ReflectionUtils.GetDefaultValues(ReflectionUtils.GetParameterTypes(ci.GetParameters()));
+                }
+
+                if (namedProperties.Count > 0)
+                {
+                    PropertyInfo[] npArray = (PropertyInfo[])this.namedProperties.ToArray(typeof(PropertyInfo));
+                    object[] pvArray = (object[])this.propertyValues.ToArray(typeof(object));
+                    return new CustomAttributeBuilder(ci, caArray, npArray, pvArray);
+                }
+                else
+                {
+                    return new CustomAttributeBuilder(ci, caArray);
+                }
+
+            }
+
+            #endregion
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/StringUtils.cs b/src/Spring/Spring.Core/Util/StringUtils.cs
new file mode 100644
index 00000000..ef9ffcb3
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/StringUtils.cs
@@ -0,0 +1,575 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Text;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Miscellaneous <see cref="System.String"/> utility methods.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Mainly for internal use within the framework.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Keith Donald</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: StringUtils.cs,v 1.29 2006/04/09 07:19:00 markpollack Exp $</version>
+	public sealed class StringUtils
+	{
+		/// <summary>
+		/// An empty array of <see cref="System.String"/> instances.
+		/// </summary>
+		public static readonly string[] EmptyStrings = new string[] {};
+
+		/// <summary>
+		/// The string that signals the start of an Ant-style expression.
+		/// </summary>
+		private const string AntExpressionPrefix = "${";
+
+		/// <summary>
+		/// The string that signals the end of an Ant-style expression.
+		/// </summary>
+		private const string AntExpressionSuffix = "}";
+
+		#region Constructor (s) / Destructor
+
+		// CLOVER:OFF
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="Spring.Util.StringUtils"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is a utility class, and as such exposes no public constructors.
+		/// </p>
+		/// </remarks>
+		private StringUtils()
+		{
+		}
+
+		// CLOVER:ON
+
+		#endregion
+
+		/// <summary>
+		/// Tokenize the given <see cref="System.String"/> into a
+		/// <see cref="System.String"/> array.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If <paramref name="s"/> is <see langword="null"/>, returns an empty
+		/// <see cref="System.String"/> array.
+		/// </p>
+		/// <p>
+		/// If <paramref name="delimiters"/> is <see langword="null"/> or the empty
+		/// <see cref="System.String"/>, returns a <see cref="System.String"/> array with one
+		/// element: <paramref name="s"/> itself.
+		/// </p>
+		/// </remarks>
+		/// <param name="s">The <see cref="System.String"/> to tokenize.</param>
+		/// <param name="delimiters">
+		/// The delimiter characters, assembled as a <see cref="System.String"/>.
+		/// </param>
+		/// <param name="trimTokens">
+		/// Trim the tokens via <see cref="System.String.Trim()"/>.
+		/// </param>
+		/// <param name="ignoreEmptyTokens">
+		/// Omit empty tokens from the result array.</param>
+		/// <returns>An array of the tokens.</returns>
+		public static string[] Split(
+			string s, string delimiters, bool trimTokens, bool ignoreEmptyTokens)
+		{
+			if (s == null)
+			{
+				return new string[0];
+			}
+			if (StringUtils.IsNullOrEmpty(delimiters))
+			{
+				return new string[] {s};
+			}
+			string[] tmp = s.Split(delimiters.ToCharArray());
+			// short circuit if String.Split default behavior is ok
+			if (!trimTokens && !ignoreEmptyTokens)
+			{
+				return tmp;
+			}
+			else
+			{
+				ArrayList tokens = new ArrayList(tmp.Length);
+				for (int i = 0; i < tmp.Length; ++i)
+				{
+					string token = (trimTokens ? tmp[i].Trim() : tmp[i]);
+					if (!(ignoreEmptyTokens && token.Length == 0))
+					{
+						tokens.Add(token);
+					}
+				}
+				return (string[]) tokens.ToArray(typeof (string));
+			}
+		}
+
+		/// <summary>
+		/// Convert a CSV list into an array of <see cref="System.String"/>s.
+		/// </summary>
+		/// <param name="s">A CSV list.</param>
+		/// <returns>
+		/// An array of <see cref="System.String"/>s, or the empty array
+		/// if <paramref name="s"/> is <see langword="null"/>.
+		/// </returns>
+		public static string[] CommaDelimitedListToStringArray(string s)
+		{
+			return DelimitedListToStringArray(s, ",");
+		}
+
+		/// <summary>
+		/// Take a <see cref="System.String"/> which is a delimited list
+		/// and convert it to a <see cref="System.String"/> array.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If the supplied <paramref name="delimiter"/> is a
+		/// <cref lang="null"/> or zero-length string, then a single element
+		/// <see cref="System.String"/> array composed of the supplied
+		/// <paramref name="input"/> <see cref="System.String"/> will be 
+		/// eturned. If the supplied <paramref name="input"/>
+		/// <see cref="System.String"/> is <cref lang="null"/>, then an empty,
+		/// zero-length <see cref="System.String"/> array will be returned.
+		/// </p>
+		/// </remarks>
+		/// <param name="input">
+		/// The <see cref="System.String"/> to be parsed.
+		/// </param>
+		/// <param name="delimiter">
+		/// The delimeter (this will not be returned). Note that only the first
+		/// character of the supplied <paramref name="delimiter"/> is used.
+		/// </param>
+		/// <returns>
+		/// An array of the tokens in the list.
+		/// </returns>
+		public static string[] DelimitedListToStringArray(string input, string delimiter)
+		{
+		    if (input == null)
+		    {
+		        return new string[0];
+		    }
+		    if (!HasLength(delimiter))
+		    {
+		        return new string[] {input};
+		    }
+		    return input.Split(delimiter[0]);
+		}
+
+	    /// <summary>
+	    /// Convenience method to return an
+	    /// <see cref="System.Collections.ICollection"/> as a delimited
+	    /// (e.g. CSV) <see cref="System.String"/>.
+	    /// </summary>
+	    /// <param name="c">
+	    /// The <see cref="System.Collections.ICollection"/> to parse.
+	    /// </param>
+	    /// <param name="delimiter">
+	    /// The delimiter to use (probably a ',').
+	    /// </param>
+	    /// <returns>The delimited string representation.</returns>
+	    public static string CollectionToDelimitedString(
+	        ICollection c, string delimiter)
+	    {
+	        if (c == null)
+	        {
+	            return "null";
+	        }
+	        StringBuilder sb = new StringBuilder();
+	        int i = 0;
+	        foreach (object obj in c)
+	        {
+	            if (i++ > 0)
+	            {
+	                sb.Append(delimiter);
+	            }
+	            sb.Append(obj);
+	        }
+	        return sb.ToString();
+	    }
+
+	    /// <summary>
+	    /// Convenience method to return an
+	    /// <see cref="System.Collections.ICollection"/> as a CSV
+	    /// <see cref="System.String"/>.
+	    /// </summary>
+	    /// <param name="collection">
+	    /// The <see cref="System.Collections.ICollection"/> to display.
+	    /// </param>
+	    /// <returns>The delimited string representation.</returns>
+	    public static string CollectionToCommaDelimitedString(
+	        ICollection collection)
+	    {
+	        return CollectionToDelimitedString(collection, ",");
+	    }
+
+	    /// <summary>
+	    /// Convenience method to return an array as a CSV
+	    /// <see cref="System.String"/>.
+	    /// </summary>
+	    /// <param name="source">
+	    /// The array to parse. Elements may be of any type (
+	    /// <see cref="System.Object.ToString"/> will be called on each
+	    /// element).
+	    /// </param>
+	    public static string ArrayToCommaDelimitedString(object[] source)
+	    {
+	        return ArrayToDelimitedString(source, ",");
+	    }
+
+	    /// <summary>
+	    /// Convenience method to return a <see cref="System.String"/>
+	    /// array as a delimited (e.g. CSV) <see cref="System.String"/>.
+	    /// </summary>
+	    /// <param name="source">
+	    /// The array to parse. Elements may be of any type (
+	    /// <see cref="System.Object.ToString"/> will be called on each
+	    /// element).
+	    /// </param>
+	    /// <param name="delimiter">
+	    /// The delimiter to use (probably a ',').
+	    /// </param>
+	    public static string ArrayToDelimitedString(
+	        object[] source, string delimiter)
+	    {
+	        if (source == null)
+	        {
+	            return "null";
+	        }
+	        else
+	        {
+	            return StringUtils.CollectionToDelimitedString(source, delimiter);
+	        }
+	    }
+
+	    /// <summary>Checks if a string has length.</summary>
+	    /// <param name="target">
+	    /// The string to check, may be <see langword="null"/>.
+	    /// </param>
+	    /// <returns>
+	    /// <see langword="true"/> if the string has length and is not
+	    /// <see langword="null"/>.
+	    /// </returns>
+	    /// <example>
+	    /// <code lang="C#">
+	    /// StringUtils.HasLength(null) = false
+	    /// StringUtils.HasLength("") = false
+	    /// StringUtils.HasLength(" ") = true
+	    /// StringUtils.HasLength("Hello") = true
+	    /// </code>
+	    /// </example>
+	    public static bool HasLength(string target)
+	    {
+	        return (target != null && target.Length > 0);
+	    }
+
+	    /// <summary>
+	    /// Checks if a <see cref="System.String"/> has text.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// More specifically, returns <see langword="true"/> if the string is
+	    /// not <see langword="null"/>, it's <see cref="String.Length"/> is >
+	    /// zero <c>(0)</c>, and it has at least one non-whitespace character.
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="target">
+	    /// The string to check, may be <see langword="null"/>.
+	    /// </param>
+	    /// <returns>
+	    /// <see langword="true"/> if the <paramref name="target"/> is not
+	    /// <see langword="null"/>,
+	    /// <see cref="String.Length"/> > zero <c>(0)</c>, and does not consist
+	    /// solely of whitespace.
+	    /// </returns>
+	    /// <example>
+	    /// <code language="C#">
+	    /// StringUtils.HasText(null) = false
+	    /// StringUtils.HasText("") = false
+	    /// StringUtils.HasText(" ") = false
+	    /// StringUtils.HasText("12345") = true
+	    /// StringUtils.HasText(" 12345 ") = true
+	    /// </code>
+	    /// </example>
+	    public static bool HasText(string target)
+	    {
+	        if (target == null)
+	        {
+	            return false;
+	        }
+	        else
+	        {
+	            return HasLength(target.Trim());
+	        }
+	    }
+
+	    /// <summary>
+	    /// Checks if a <see cref="System.String"/> is <see langword="null"/>
+	    /// or an empty string.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// More specifically, returns <see langword="false"/> if the string is
+	    /// <see langword="null"/>, it's <see cref="String.Length"/> is equal
+	    /// to zero <c>(0)</c>, or it is composed entirely of whitespace
+	    /// characters.
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="target">
+	    /// The string to check, may (obviously) be <see langword="null"/>.
+	    /// </param>
+	    /// <returns>
+	    /// <see langword="true"/> if the <paramref name="target"/> is
+	    /// <see langword="null"/>, has a length equal to zero <c>(0)</c>, or
+	    /// is composed entirely of whitespace characters.
+	    /// </returns>
+	    /// <example>
+	    /// <code language="C#">
+	    /// StringUtils.IsNullOrEmpty(null) = true
+	    /// StringUtils.IsNullOrEmpty("") = true
+	    /// StringUtils.IsNullOrEmpty(" ") = true
+	    /// StringUtils.IsNullOrEmpty("12345") = false
+	    /// StringUtils.IsNullOrEmpty(" 12345 ") = false
+	    /// </code>
+	    /// </example>
+	    public static bool IsNullOrEmpty(string target)
+	    {
+	        return !HasText(target);
+	    }
+
+	    /// <summary>
+	    /// Strips first and last character off the string.
+	    /// </summary>
+	    /// <param name="text">The string to strip.</param>
+	    /// <returns>The stripped string.</returns>
+	    public static string StripFirstAndLastCharacter(string text)
+	    {
+	        if (text != null
+	            && text.Length > 2)
+	        {
+	            return text.Substring(1, text.Length - 2);
+	        }
+	        else
+	        {
+	            return String.Empty;
+	        }
+	    }
+
+	    /// <summary>
+	    /// Returns a list of Ant-style expressions from the specified text.
+	    /// </summary>
+	    /// <param name="text">The text to inspect.</param>
+	    /// <returns>
+	    /// A list of expressions that exist in the specified text.
+	    /// </returns>
+	    /// <exception cref="System.FormatException">
+	    /// If any of the expressions in the supplied <paramref name="text"/>
+	    /// is empty (<c>${}</c>).
+	    /// </exception>
+	    public static IList GetAntExpressions(string text)
+	    {
+	        IList expressions = new ArrayList();
+	        if (StringUtils.HasText(text))
+	        {
+	            int start = text.IndexOf(AntExpressionPrefix);
+	            while (start >= 0)
+	            {
+	                int end = text.IndexOf(AntExpressionSuffix, start + 2);
+	                if (end == -1)
+	                {
+	                    // terminator character not found, so let's quit...
+	                    start = -1;
+	                }
+	                else
+	                {
+	                    string exp = text.Substring(start + 2, end - start - 2);
+	                    if(StringUtils.IsNullOrEmpty(exp)) 
+	                    {
+	                        throw new FormatException(
+	                            string.Format("Empty {0}{1} value found in text : '{2}'.",
+	                                          AntExpressionPrefix,
+	                                          AntExpressionSuffix,
+	                                          text));
+	                    }
+	                    if (expressions.IndexOf(exp) < 0)
+	                    {
+	                        expressions.Add(exp);
+	                    }
+	                    start = text.IndexOf(AntExpressionPrefix, end);
+	                }
+	            }
+	        }
+	        return expressions;
+	    }
+
+	    /// <summary>
+	    /// Replaces Ant-style expression placeholder with expression value.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// 
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="text">The string to set the value in.</param>
+	    /// <param name="expression">The name of the expression to set.</param>
+	    /// <param name="expValue">The expression value.</param>
+	    /// <returns>
+	    /// A new string with the expression value set; the
+	    /// <see cref="String.Empty"/> value if the supplied
+	    /// <paramref name="text"/> is <see langword="null"/>, has a length
+	    /// equal to zero <c>(0)</c>, or is composed entirely of whitespace
+	    /// characters.
+	    /// </returns>
+	    public static string SetAntExpression(string text, string expression, object expValue)
+	    {
+	        if (StringUtils.IsNullOrEmpty(text))
+	        {
+	            return String.Empty;
+	        }
+	        if (expValue == null)
+	        {
+	            expValue = String.Empty;
+	        }
+	        return text.Replace(
+	            StringUtils.Surround(AntExpressionPrefix, expression, AntExpressionSuffix), expValue.ToString());
+	    }
+
+	    /// <summary>
+	    /// Surrounds (prepends and appends) the string value of the supplied
+	    /// <paramref name="fix"/> to the supplied <paramref name="target"/>.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// The return value of this method call is always guaranteed to be non
+	    /// <see langword="null"/>. If every value passed as a parameter to this method is
+	    /// <see langword="null"/>, the <see cref="System.String.Empty"/> string will be returned.
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="fix">
+	    /// The pre<b>fix</b> and suf<b>fix</b> that respectively will be prepended and
+	    /// appended to the target <paramref name="target"/>. If this value
+	    /// is not a <see cref="System.String"/> value, it's attendant
+	    /// <see cref="System.Object.ToString()"/> value will be used.
+	    /// </param>
+	    /// <param name="target">
+	    /// The target that is to be surrounded. If this value is not a
+	    /// <see cref="System.String"/> value, it's attendant
+	    /// <see cref="System.Object.ToString()"/> value will be used.
+	    /// </param>
+	    /// <returns>The surrounded string.</returns>
+	    public static string Surround(object fix, object target)
+	    {
+	        return StringUtils.Surround(fix, target, fix);
+	    }
+
+	    /// <summary>
+	    /// Surrounds (prepends and appends) the string values of the supplied
+	    /// <paramref name="prefix"/> and <paramref name="suffix"/> to the supplied
+	    /// <paramref name="target"/>.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// The return value of this method call is always guaranteed to be non
+	    /// <see langword="null"/>. If every value passed as a parameter to this method is
+	    /// <see langword="null"/>, the <see cref="System.String.Empty"/> string will be returned.
+	    /// </p>
+	    /// </remarks>
+	    /// <param name="prefix">
+	    /// The value that will be prepended to the <paramref name="target"/>. If this value
+	    /// is not a <see cref="System.String"/> value, it's attendant
+	    /// <see cref="System.Object.ToString()"/> value will be used.
+	    /// </param>
+	    /// <param name="target">
+	    /// The target that is to be surrounded. If this value is not a
+	    /// <see cref="System.String"/> value, it's attendant
+	    /// <see cref="System.Object.ToString()"/> value will be used.
+	    /// </param>
+	    /// <param name="suffix">
+	    /// The value that will be appended to the <paramref name="target"/>. If this value
+	    /// is not a <see cref="System.String"/> value, it's attendant
+	    /// <see cref="System.Object.ToString()"/> value will be used.
+	    /// </param>
+	    /// <returns>The surrounded string.</returns>
+	    public static string Surround(object prefix, object target, object suffix)
+	    {
+	        return string.Format(
+	            CultureInfo.InvariantCulture, "{0}{1}{2}", prefix, target, suffix);
+	    }
+
+        /// <summary>
+		/// Converts escaped characters (for example "\t") within a string
+		/// to their real character.
+		/// </summary>
+		/// <param name="inputString">The string to convert.</param>
+		/// <returns>The converted string.</returns>
+		public static string ConvertEscapedCharacters( string inputString )
+		{
+			StringBuilder sb = new StringBuilder(inputString.Length);
+			for (int i = 0 ; i < inputString.Length ; i++)
+			{
+				if (inputString[i].Equals('\\'))
+				{
+					i++;
+					if (inputString[i].Equals('t'))
+					{
+						sb.Append('\t');
+					}
+					else if (inputString[i].Equals('r'))
+					{
+						sb.Append('\r');
+					}
+					else if (inputString[i].Equals('n'))
+					{
+						sb.Append('\n');
+					} 
+					else if (inputString[i].Equals('\\'))
+					{
+						sb.Append('\\');
+					} 
+					else
+					{
+						sb.Append("\\" + inputString[i]);
+					}
+				}
+				else
+				{
+					sb.Append(inputString[i]);
+				}
+			}
+			return sb.ToString();
+		}	
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/SystemUtils.cs b/src/Spring/Spring.Core/Util/SystemUtils.cs
new file mode 100644
index 00000000..c927f2f5
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/SystemUtils.cs
@@ -0,0 +1,117 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Configuration;
+using System.Reflection;
+using System.Threading;
+using System.Xml;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Utility class containing miscellaneous system-level functionality.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SystemUtils.cs,v 1.5 2007/09/07 02:46:49 markpollack Exp $</version>
+    public sealed class SystemUtils
+    {
+        private static bool assemblyResolverRegistered = false;
+        private static object assemblyResolverLock = new object();
+
+        private static readonly bool isMono = Type.GetType("Mono.Runtime") == null ? false : true;
+
+        /// <summary>
+        /// Registers assembly resolver that iterates over the
+        /// assemblies loaded into the current <see cref="AppDomain"/>
+        /// in order to find an assembly that cannot be resolved.
+        /// </summary>
+        /// <remarks>
+        /// This method has to be called if you need to serialize dynamically
+        /// generated types in transient assemblies, such as Spring AOP proxies,
+        /// because standard .NET serialization engine always tries to load
+        /// assembly from the disk.
+        /// </remarks>
+        public static void RegisterLoadedAssemblyResolver()
+        {
+            if (!assemblyResolverRegistered)
+            {
+                lock(assemblyResolverLock)
+                {
+                    AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(LoadedAssemblyResolver);
+                    assemblyResolverRegistered = true;
+                }
+            }
+        }
+
+        private static Assembly LoadedAssemblyResolver(object sender, ResolveEventArgs args)
+        {
+            Assembly[] loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+            foreach (Assembly assembly in loadedAssemblies)
+            {
+                if (assembly.FullName == args.Name)
+                {
+                    return assembly;
+                }
+            }
+            return null;
+        }
+
+
+        /// <summary>
+        /// Returns true if running on Mono
+        /// </summary>
+        /// <remarks>Tests for the presence of the type Mono.Runtime</remarks>
+        public static bool MonoRuntime
+        {
+            get { return isMono; }
+        }
+
+        /// <summary>
+        /// Gets the thread id for the current thread. Use thread name is available,
+        /// otherwise use CurrentThread.GetHashCode() for .NET 1.0/1.1 and 
+        /// CurrentThread.ManagedThreadId otherwise.
+        /// </summary>
+        /// <value>The thread id.</value>
+        public static string ThreadId
+        {
+            get
+            {
+                string name = Thread.CurrentThread.Name;
+                if (StringUtils.HasText(name))
+                {
+                    return name;
+                }
+                else
+                {
+#if NET_1_0 || NET_1_1
+                    return Thread.CurrentThread.GetHashCode().ToString();
+#else
+                    return Thread.CurrentThread.ManagedThreadId.ToString();
+#endif
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/UniqueKey.cs b/src/Spring/Spring.Core/Util/UniqueKey.cs
new file mode 100644
index 00000000..db6213c7
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/UniqueKey.cs
@@ -0,0 +1,175 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Text;
+using Spring.Core.TypeConversion;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// UniqueKey allows for generating keys unique to a type or particular instance and a partial name, 
+	/// that can e.g. be used as keys in <see cref="Hashtable"/>.
+	/// </summary>
+	/// <example>
+	/// // shows usage type-scoped keys
+	/// UniqueKey classAKey = UniqueKey.GetTypeScoped(typeof(ClassA), "myKey");
+	/// UniqueKey classBKey = UniqueKey.GetTypeScoped(typeof(ClassB), "myKey");
+	/// 
+	/// HttpContext.Current.Items.Add( classAKey, "some value unqiue for class A having key 'myKey'");
+	/// object value = HttpContext.Current.Items[ UniqueKey.GetTypeScoped(typeof(ClassA), "myKey") ];
+	/// Assert.AreEqual( "some value unique for class A having key 'myKey'", value);
+	/// 
+	/// HttpContext.Current.Items.Add( classBKey, "some value unqiue for class B having key 'myKey'");
+	/// object value = HttpContext.Current.Items[ UniqueKey.GetTypeScoped(typeof(ClassB), "myKey") ];
+	/// Assert.AreEqual( "some value unique for class B having key 'myKey'", value);
+	/// </example>
+    [Serializable]
+    [TypeConverter(typeof(UniqueKeyConverter))]
+    public sealed class UniqueKey 
+#if NET_2_0
+        : IEquatable<UniqueKey>
+#endif
+    {
+        private readonly string _generatedKey;
+
+        /// <summary>
+        /// Initialize a new instance of <see cref="UniqueKey"/> from its string representation.  
+        /// See <see cref="GetInstanceScoped"/> and See <see cref="GetTypeScoped"/> for details.
+        /// </summary>
+        /// <param name="key">The string representation of the new <see cref="UniqueKey"/> instance.</param>
+        internal UniqueKey(string key)
+        {
+            AssertUtils.ArgumentNotNull(key, "key");
+            _generatedKey = key;
+        }
+
+        /// <summary>
+        /// Compares this instance to another.
+        /// </summary>
+        public bool Equals(UniqueKey uniqueKey)
+        {
+            if (uniqueKey == null) return false;
+            return Equals(_generatedKey, uniqueKey._generatedKey);
+        }
+
+        /// <summary>
+        /// Compares this instance to another.
+        /// </summary>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(this, obj)) return true;
+            return Equals(obj as UniqueKey);
+        }
+
+        /// <summary>
+        /// Returns the hash code for this key.
+        /// </summary>
+        /// <returns></returns>
+        public override int GetHashCode()
+        {
+            return _generatedKey.GetHashCode();
+        }
+
+        /// <summary>
+        /// Returns a string representation of this key.
+        /// </summary>
+        public override string ToString()
+        {
+            return _generatedKey;
+        }
+
+        /// <summary>
+        /// Creates a new key instance unique to the given instance.
+        /// </summary>
+        /// <param name="instance">The instance the key shall be unique to</param>
+        /// <param name="partialKey">The partial key to be made unique</param>
+        /// <remarks>
+        /// </remarks>
+        /// <exception cref="ArgumentException">If <paramref name="instance"/> is of type <see cref="Type"/></exception>
+        public static UniqueKey GetInstanceScoped(object instance, string partialKey)
+        {
+            if (instance is Type)
+            {
+                throw new ArgumentException(
+                    "please use GetTypeScoped(Type,string) for creating type specific keys", "instance");
+            }
+            return new UniqueKey(GetInstanceScopedString(instance, partialKey));
+        }
+
+        /// <summary>
+        /// Creates a new key instance unique to the given type.
+        /// </summary>
+        /// <param name="type">The type the key shall be unique to</param>
+        /// <param name="partialKey">The partial key to be made unique</param>
+        public static UniqueKey GetTypeScoped(Type type, string partialKey)
+        {
+            return new UniqueKey(GetTypeScopedString(type, partialKey));
+        }
+
+        /// <summary>
+        /// Returns a key unique for the given instance.
+        /// </summary>
+        /// <param name="instance">The instance the key shall be unique to</param>
+        /// <param name="partialKey">The partial key to be made unique</param>
+        /// <returns>A key formatted as <i>typename[instance-id].partialkey</i></returns>
+        public static string GetInstanceScopedString(object instance, string partialKey)
+        {
+            AssertUtils.ArgumentNotNull(instance, "instance");
+            AssertUtils.ArgumentHasText(partialKey, "partialKey");
+
+            if (instance is Type)
+            {
+                throw new ArgumentException(
+                    "please use GetUniqueKey(Type,string) for creating type specific keys", "instance");
+            }
+            return GetUniqueKey(instance.GetType(), instance, partialKey);
+        }
+
+        /// <summary>
+        /// Returns a key unique for the given type.
+        /// </summary>
+        /// <param name="type">The type the key shall be unique to</param>
+        /// <param name="partialKey">The partial key to be made unique</param>
+        /// <returns>A key formatted as <i>typename.partialkey</i></returns>
+        public static string GetTypeScopedString(Type type, string partialKey)
+        {
+            AssertUtils.ArgumentNotNull(type, "type");
+            AssertUtils.ArgumentHasText(partialKey, "partialKey");
+
+            return GetUniqueKey(type, null, partialKey);
+        }
+
+        private static string GetUniqueKey(Type type, object instance, string partialKey)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append(type.FullName);
+            if (instance != null) sb.Append('[').Append(instance.GetHashCode()).Append(']');
+            sb.Append('.').Append(partialKey);
+            return sb.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Util/XmlUtils.cs b/src/Spring/Spring.Core/Util/XmlUtils.cs
new file mode 100644
index 00000000..9f2778e4
--- /dev/null
+++ b/src/Spring/Spring.Core/Util/XmlUtils.cs
@@ -0,0 +1,151 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Configuration;
+using System.Xml;
+using System.IO;
+using System.Xml.Schema;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// XML utility methods.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: XmlUtils.cs,v 1.5 2007/04/22 00:02:38 oakinger Exp $</version>
+    public class XmlUtils
+    {
+#if !NET_2_0
+        /// <summary>
+        /// Gets an appropriate <see cref="System.Xml.XmlReader"/> implementation
+        /// for the supplied <see cref="System.IO.Stream"/>.
+        /// </summary>
+        /// <param name="stream">The XML <see cref="System.IO.Stream"/> that is going to be read.</param>
+        /// <param name="schemas">XML schemas that should be used for validation.</param>
+        /// <param name="eventHandler">Validation event handler.</param>
+        /// <returns>
+        /// A validating <see cref="System.Xml.XmlReader"/> implementation.
+        /// </returns>
+        public static XmlReader CreateValidatingReader(Stream stream, XmlSchemaCollection schemas, ValidationEventHandler eventHandler)
+        {
+            return CreateValidatingReader(stream, new XmlUrlResolver(), schemas, eventHandler);
+        }
+
+		/// <summary>
+		/// Gets an appropriate <see cref="System.Xml.XmlReader"/> implementation
+		/// for the supplied <see cref="System.IO.Stream"/>.
+		/// </summary>
+		/// <param name="stream">The XML <see cref="System.IO.Stream"/> that is going to be read.</param>
+		/// <param name="xmlResolver"><see cref="XmlResolver"/> to be used for resolving external references</param>
+		/// <param name="schemas">XML schemas that should be used for validation.</param>
+		/// <param name="eventHandler">Validation event handler.</param>
+		/// <returns>
+		/// A validating <see cref="System.Xml.XmlReader"/> implementation.
+		/// </returns>
+		public static XmlReader CreateValidatingReader(Stream stream, XmlResolver xmlResolver, XmlSchemaCollection schemas, ValidationEventHandler eventHandler)
+		{
+			XmlValidatingReader reader = new XmlValidatingReader(new XmlTextReader(stream));
+			reader.XmlResolver = xmlResolver;
+			reader.Schemas.Add(schemas);
+			reader.ValidationType = ValidationType.Schema;
+			if (eventHandler != null)
+			{
+				reader.ValidationEventHandler += eventHandler;
+			}
+			return reader;
+		}
+#else
+        /// <summary>
+        /// Gets an appropriate <see cref="System.Xml.XmlReader"/> implementation
+        /// for the supplied <see cref="System.IO.Stream"/>.
+        /// </summary>
+        /// <param name="stream">The XML <see cref="System.IO.Stream"/> that is going to be read.</param>
+        /// <param name="schemas">XML schemas that should be used for validation.</param>
+        /// <param name="eventHandler">Validation event handler.</param>
+        /// <returns>
+        /// A validating <see cref="System.Xml.XmlReader"/> implementation.
+        /// </returns>
+        public static XmlReader CreateValidatingReader(Stream stream, XmlSchemaSet schemas, ValidationEventHandler eventHandler)
+		{
+			return CreateValidatingReader(stream, new XmlUrlResolver(), schemas, eventHandler);
+		}
+
+        /// <summary>
+        /// Gets an appropriate <see cref="System.Xml.XmlReader"/> implementation
+        /// for the supplied <see cref="System.IO.Stream"/>.
+        /// </summary>
+        /// <param name="stream">The XML <see cref="System.IO.Stream"/> that is going to be read.</param>
+        /// <param name="xmlResolver"><see cref="XmlResolver"/> to be used for resolving external references</param>
+        /// <param name="schemas">XML schemas that should be used for validation.</param>
+        /// <param name="eventHandler">Validation event handler.</param>
+        /// <returns>
+        /// A validating <see cref="System.Xml.XmlReader"/> implementation.
+        /// </returns>
+        public static XmlReader CreateValidatingReader(Stream stream, XmlResolver xmlResolver, XmlSchemaSet schemas, ValidationEventHandler eventHandler)
+        {
+            XmlReaderSettings settings = new XmlReaderSettings();
+		    settings.XmlResolver = xmlResolver;
+            settings.Schemas.Add(schemas);
+            settings.ValidationType = ValidationType.Schema;
+            if (eventHandler != null)
+            {
+                settings.ValidationEventHandler += eventHandler;
+            }
+
+            return XmlReader.Create(stream, settings);
+        }
+#endif
+
+        
+#if !NET_2_0
+        /// <summary>
+        /// Gets an <see cref="System.Xml.XmlTextReader"/> implementation 
+        /// for the supplied <see cref="System.IO.Stream"/>.
+        /// </summary>
+        /// <param name="stream">The XML <see cref="System.IO.Stream"/> that is going to be read.</param>
+        /// <returns>
+        /// A non-validating <see cref="System.Xml.XmlReader"/> implementation.
+        /// </returns>
+        public static XmlReader CreateReader(Stream stream)
+        {
+            return new XmlTextReader(stream);
+        }
+#else
+
+        /// <summary>
+        /// Gets an appropriate <see cref="System.Xml.XmlReader"/> implementation 
+        /// for the supplied <see cref="System.IO.Stream"/>.
+        /// </summary>
+        /// <param name="stream">The XML <see cref="System.IO.Stream"/> that is going to be read.</param>
+        /// <returns>
+        /// A non-validating <see cref="System.Xml.XmlReader"/> implementation.
+        /// </returns>
+        public static XmlReader CreateReader(Stream stream)
+        {            
+            return XmlReader.Create(stream);
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/Actions/ErrorMessageAction.cs b/src/Spring/Spring.Core/Validation/Actions/ErrorMessageAction.cs
new file mode 100644
index 00000000..b58f2adc
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/Actions/ErrorMessageAction.cs
@@ -0,0 +1,121 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+using Spring.Expressions;
+using Spring.Util;
+
+namespace Spring.Validation.Actions
+{
+    /// <summary>
+    /// Implementation of <see cref="IValidationAction"/> that adds error message
+    /// to the validation errors container.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ErrorMessageAction.cs,v 1.5 2008/02/05 20:40:25 aseovic Exp $</version>
+    public class ErrorMessageAction : BaseValidationAction
+    {
+        private string messageId;
+        private IExpression[] messageParams;
+        private string[] providers;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ErrorMessageAction"/> class.
+        /// </summary>
+        /// <param name="messageId">Error message resource identifier.</param>
+        /// <param name="providers">Names of the error providers this message should be added to.</param>
+        public ErrorMessageAction(string messageId, params string[] providers)
+        {
+            AssertUtils.ArgumentHasText(messageId, "messageId");
+            if (providers == null || providers.Length == 0)
+            {
+                throw new ArgumentException("At least one error provider has to be specified.", "providers");
+            }
+
+            this.messageId = messageId;
+            this.providers = providers;
+        }
+
+        /// <summary>
+        /// Sets the expressions that should be resolved to error message parameters.
+        /// </summary>
+        /// <value>The expressions that should be resolved to error message parameters.</value>
+        public IExpression[] Parameters
+        {
+            set { messageParams = value; }
+        }
+
+        /// <summary>
+        /// Called when associated validator is invalid.
+        /// </summary>
+        /// <param name="validationContext">Validation context.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors">Validation errors container.</param>
+        protected override void OnInvalid(object validationContext, IDictionary contextParams, IValidationErrors errors)
+        {
+            ErrorMessage error = CreateErrorMessage(validationContext, contextParams);
+            foreach (string provider in this.providers)
+            {
+                errors.AddError(provider.Trim(), error);
+            }
+        }
+
+        /// <summary>
+        /// Resolves the error message.
+        /// </summary>
+        /// <param name="validationContext">Validation context to resolve message parameters against.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <returns>Resolved error message</returns>
+        private ErrorMessage CreateErrorMessage(object validationContext, IDictionary contextParams)
+        {
+            if (messageParams != null && messageParams.Length > 0)
+            {
+                object[] parameters = ResolveMessageParameters(messageParams, validationContext, contextParams);
+                return new ErrorMessage(messageId, parameters);
+            }
+            else
+            {
+                return new ErrorMessage(messageId, null);
+            }
+        }
+
+        /// <summary>
+        /// Resolves the message parameters.
+        /// </summary>
+        /// <param name="messageParams">List of parameters to resolve.</param>
+        /// <param name="validationContext">Validation context to resolve parameters against.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <returns>Resolved message parameters.</returns>
+        private object[] ResolveMessageParameters(IList messageParams, object validationContext, IDictionary contextParams)
+        {
+            object[] parameters = new object[messageParams.Count];
+            for (int i = 0; i < messageParams.Count; i++)
+            {
+                parameters[i] = ((IExpression) messageParams[i]).GetValue(validationContext, contextParams);
+            }
+
+            return parameters;
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/Actions/ExpressionAction.cs b/src/Spring/Spring.Core/Validation/Actions/ExpressionAction.cs
new file mode 100644
index 00000000..fc49b5fb
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/Actions/ExpressionAction.cs
@@ -0,0 +1,113 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+using Spring.Expressions;
+
+namespace Spring.Validation.Actions
+{
+    /// <summary>
+    /// Implementation of <see cref="IValidationAction"/> that allows you
+    /// to define Spring.NET expressions that should be evaluated after
+    /// validation.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ExpressionAction.cs,v 1.6 2008/02/05 20:40:25 aseovic Exp $</version>
+    public class ExpressionAction : BaseValidationAction
+    {
+        private IExpression onValid;
+        private IExpression onInvalid;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExpressionAction"/> class.
+        /// </summary>
+        public ExpressionAction()
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExpressionAction"/> class.
+        /// </summary>
+        /// <param name="onValid">Expression to execute when validator is valid.</param>
+        /// <param name="onInvalid">Expression to execute when validator is not valid.</param>
+        public ExpressionAction(string onValid, string onInvalid)
+            : this((onValid != null ? Expression.Parse(onValid) : null), (onInvalid != null ? Expression.Parse(onInvalid) : null))
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExpressionAction"/> class.
+        /// </summary>
+        /// <param name="onValid">Expression to execute when validator is valid.</param>
+        /// <param name="onInvalid">Expression to execute when validator is not valid.</param>
+        public ExpressionAction(IExpression onValid, IExpression onInvalid)
+        {
+            this.onValid = onValid;
+            this.onInvalid = onInvalid;
+        }
+
+        /// <summary>
+        /// Gets or sets the expression to execute when validator is valid.
+        /// </summary>
+        /// <value>The expression to execute when validator is valid.</value>
+        public IExpression Valid
+        {
+            get { return onValid; }
+            set { onValid = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the expression to execute when validator is not valid.
+        /// </summary>
+        /// <value>The expression to execute when validator is not valid.</value>
+        public IExpression Invalid
+        {
+            get { return onInvalid; }
+            set { onInvalid = value; }
+        }
+
+        /// <summary>
+        /// Called when associated validator is valid.
+        /// </summary>
+        /// <param name="validationContext">Validation context.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors">Validation errors container.</param>
+        protected override void OnValid(object validationContext, IDictionary contextParams, IValidationErrors errors)
+        {
+            if (Valid != null)
+            {
+                Valid.GetValue(validationContext, contextParams);
+            }
+        }
+
+        /// <summary>
+        /// Called when associated validator is invalid.
+        /// </summary>
+        /// <param name="validationContext">Validation context.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors">Validation errors container.</param>
+        protected override void OnInvalid(object validationContext, IDictionary contextParams, IValidationErrors errors)
+        {
+            if (Invalid != null)
+            {
+                Invalid.GetValue(validationContext, contextParams);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/AnyValidatorGroup.cs b/src/Spring/Spring.Core/Validation/AnyValidatorGroup.cs
new file mode 100644
index 00000000..0392f047
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/AnyValidatorGroup.cs
@@ -0,0 +1,103 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+using Spring.Expressions;
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// <see cref="IValidator"/> implementation that supports grouping of validators.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This validator will be valid when <b>one or more</b> of the validators in the <c>Validators</c>
+    /// collection are valid.
+    /// </p>
+    /// <p>
+    /// <c>ValidationErrors</c> property will return a union of all validation error messages 
+    /// for the contained validators, but only if this validator is not valid (meaning, when none
+    /// of the contained validators are valid).
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AnyValidatorGroup.cs,v 1.9 2008/02/05 20:40:26 aseovic Exp $</version>
+    public class AnyValidatorGroup : ValidatorGroup
+    {
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AnyValidatorGroup"/> class.
+        /// </summary>
+        public AnyValidatorGroup()
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AnyValidatorGroup"/> class.
+        /// </summary>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public AnyValidatorGroup(string when) : base(when)
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AnyValidatorGroup"/> class.
+        /// </summary>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public AnyValidatorGroup(IExpression when) : base(when)
+        {}
+
+        #endregion
+
+        /// <summary>
+        /// Validates the specified object.
+        /// </summary>
+        /// <param name="validationContext">The object to validate.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors"><see cref="ValidationErrors"/> instance to add error messages to.</param>
+        /// <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        public override bool Validate(object validationContext, IDictionary contextParams, IValidationErrors errors)
+        {
+            ValidationErrors tmpErrors = new ValidationErrors();
+            bool valid = true;
+
+            if (EvaluateWhen(validationContext, contextParams))
+            {
+                valid = false;
+                foreach (IValidator validator in Validators)
+                {
+                    valid = validator.Validate(validationContext, contextParams, tmpErrors) || valid;
+                    if (valid)
+                    {
+                        break;
+                    }
+                }
+
+                if (!valid)
+                {
+                    errors.MergeErrors(tmpErrors);
+                }
+                ProcessActions(valid, validationContext, contextParams, errors);
+            }
+
+            return valid;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/BaseValidationAction.cs b/src/Spring/Spring.Core/Validation/BaseValidationAction.cs
new file mode 100644
index 00000000..e33265f5
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/BaseValidationAction.cs
@@ -0,0 +1,142 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+using Spring.Expressions;
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// Abstract base class that should be extended by all
+    /// validation actions.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This class implements template <c>Execute</c> method
+    /// and defines <c>OnValid</c> and <c>OnInvalid</c> methods that 
+    /// can be overriden
+    /// by specific validation actions.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: BaseValidationAction.cs,v 1.6 2008/02/05 20:40:26 aseovic Exp $</version>
+    public abstract class BaseValidationAction : IValidationAction
+    {
+        #region Fields
+
+        private IExpression when;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseValidationAction"/> class.
+        /// </summary>
+        public BaseValidationAction()
+        {}
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the expression that determines if this validator should be evaluated.
+        /// </summary>
+        /// <value>The expression that determines if this validator should be evaluated.</value>
+        public IExpression When
+        {
+            get { return when; }
+            set { when = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Executes the action.
+        /// </summary>
+        /// <param name="isValid">Whether associated validator is valid or not.</param>
+        /// <param name="validationContext">Validation context.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors">Validation errors container.</param>
+        public virtual void Execute(bool isValid, object validationContext, IDictionary contextParams, IValidationErrors errors)
+        {
+            if (EvaluateWhen(validationContext, contextParams))
+            {
+                if (isValid)
+                {
+                    OnValid(validationContext, contextParams, errors);
+                }
+                else
+                {
+                    OnInvalid(validationContext, contextParams, errors);
+                }
+            }
+        }
+
+        #region Abstract methods 
+
+        // CLOVER:OFF
+
+        /// <summary>
+        /// Called when associated validator is valid.
+        /// </summary>
+        /// <param name="validationContext">Validation context.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors">Validation errors container.</param>
+        protected virtual void OnValid(object validationContext, IDictionary contextParams, IValidationErrors errors)
+        {}
+
+        /// <summary>
+        /// Called when associated validator is not valid.
+        /// </summary>
+        /// <param name="validationContext">Validation context.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors">Validation errors container.</param>
+        protected virtual void OnInvalid(object validationContext, IDictionary contextParams, IValidationErrors errors)
+        {}
+
+        // CLOVER:ON
+
+        #endregion 
+
+        #region Helper methods
+
+        /// <summary>
+        /// Evaluates 'when' expression.
+        /// </summary>
+        /// <param name="rootContext">Root context to use for expression evaluation.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <returns><c>True</c> if the condition is true, <c>False</c> otherwise.</returns>
+        protected bool EvaluateWhen(object rootContext, IDictionary contextParams)
+        {
+            if (When == null)
+            {
+                return true;
+            }
+
+            return Convert.ToBoolean(When.GetValue(rootContext, contextParams));
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/BaseValidator.cs b/src/Spring/Spring.Core/Validation/BaseValidator.cs
new file mode 100644
index 00000000..50afd40b
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/BaseValidator.cs
@@ -0,0 +1,210 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using Spring.Expressions;
+
+#endregion
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// Base class that defines common properties for all validators.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Custom validators should always extend this class instead of 
+    /// simply implementing <see cref="IValidator"/> interface, in 
+    /// order to inherit common validator functionality.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: BaseValidator.cs,v 1.12 2008/02/05 20:40:26 aseovic Exp $</version>
+    public abstract class BaseValidator : IValidator
+    {
+        #region Fields
+
+        private IList actions = new ArrayList();
+
+        private IExpression test;
+        private IExpression when;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="BaseValidator"/> class.
+        /// </summary>
+        public BaseValidator()
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="BaseValidator"/> class.
+        /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public BaseValidator(string test, string when)
+            : this((test != null ? Expression.Parse(test) : null), (when != null ? Expression.Parse(when) : null))
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="BaseValidator"/> class.
+        /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public BaseValidator(IExpression test, IExpression when)
+        {
+            this.test = test;
+            this.when = when;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the test expression.
+        /// </summary>
+        /// <value>The test expression.</value>
+        public IExpression Test
+        {
+            get { return test; }
+            set { test = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the expression that determines if this validator should be evaluated.
+        /// </summary>
+        /// <value>The expression that determines if this validator should be evaluated.</value>
+        public IExpression When
+        {
+            get { return when; }
+            set { when = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the validation actions.
+        /// </summary>
+        /// <value>The actions that should be executed after validation.</value>
+        public IList Actions
+        {
+            get { return actions; }
+            set { actions = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Validates the specified object.
+        /// </summary>
+        /// <param name="validationContext">The object to validate.</param>
+        /// <param name="errors"><see cref="ValidationErrors"/> instance to add error messages to.</param>
+        /// <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        public bool Validate(object validationContext, IValidationErrors errors)
+        {
+            return Validate(validationContext, null, errors);
+        }
+
+        /// <summary>
+        /// Validates the specified object.
+        /// </summary>
+        /// <param name="validationContext">The object to validate.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors"><see cref="ValidationErrors"/> instance to add error messages to.</param>
+        /// <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        public virtual bool Validate(object validationContext, IDictionary contextParams, IValidationErrors errors)
+        {
+            bool valid = true;
+
+            if (EvaluateWhen(validationContext, contextParams))
+            {
+                valid = Validate(EvaluateTest(validationContext, contextParams));
+                ProcessActions(valid, validationContext, contextParams, errors);
+            }
+
+            return valid;
+        }
+
+        /// <summary>
+        /// Validates test object.
+        /// </summary>
+        /// <param name="objectToValidate">Object to validate.</param>
+        /// <returns><c>True</c> if specified object is valid, <c>False</c> otherwise.</returns>
+        protected abstract bool Validate(object objectToValidate);
+
+        #region Helper Methods
+
+        /// <summary>
+        /// Evaluates test expression.
+        /// </summary>
+        /// <param name="rootContext">Root context to use for expression evaluation.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <returns>Result of the test expression evaluation, or validation context if test is <c>null</c>.</returns>
+        protected object EvaluateTest(object rootContext, IDictionary contextParams)
+        {
+            if (Test == null)
+            {
+                return rootContext;
+            }
+            return Test.GetValue(rootContext, contextParams);
+        }
+
+        /// <summary>
+        /// Evaluates when expression.
+        /// </summary>
+        /// <param name="rootContext">Root context to use for expression evaluation.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <returns><c>True</c> if the condition is true, <c>False</c> otherwise.</returns>
+        protected bool EvaluateWhen(object rootContext, IDictionary contextParams)
+        {
+            if (When == null)
+            {
+                return true;
+            }
+
+            return Convert.ToBoolean(When.GetValue(rootContext, contextParams));
+        }
+
+        /// <summary>
+        /// Processes the error messages.
+        /// </summary>
+        /// <param name="isValid">Whether validator is valid or not.</param>
+        /// <param name="validationContext">Validation context.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors">Validation errors container.</param>
+        protected void ProcessActions(bool isValid, object validationContext, IDictionary contextParams, IValidationErrors errors)
+        {
+            if (actions != null && actions.Count > 0)
+            {
+                foreach (IValidationAction action in actions)
+                {
+                    action.Execute(isValid, validationContext, contextParams, errors);
+                }
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/CollectionValidator.cs b/src/Spring/Spring.Core/Validation/CollectionValidator.cs
new file mode 100644
index 00000000..1b5c1e5b
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/CollectionValidator.cs
@@ -0,0 +1,191 @@
+using System;
+using System.Collections;
+using Spring.Expressions;
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// <see cref="IValidator"/> implementation that supports validating collections.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This validator will be valid only when all of the validators in the <c>Validators</c>
+    /// collection are valid for all of the objects in the specified collection.
+    /// </p>
+    /// <p>
+    /// You can specify if you want to validate all of the collection elements regardless of the errors, by
+    /// setting the <c>ValidateAll</c> property to true.
+    /// </p>
+    /// <p>
+    /// If you set the <c>IncludeElementErrors</c> property to <c>true</c>, 
+    /// <c>ValidationErrors</c> collection will contain a union of all validation error messages 
+    /// for the contained validators; 
+    /// Otherwise it will contain only error messages that were set for this Validator.
+    /// </p>
+    /// </remarks>
+    /// <author>Damjan Tomic</author>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CollectionValidator.cs,v 1.5 2008/02/05 20:40:26 aseovic Exp $</version>
+    public class CollectionValidator : ValidatorGroup
+    {
+        #region Fields
+
+        private bool validateAll = false;
+        private bool includeElementErrors = false;
+        private IExpression context;        
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the value that indicates whether to validate all elements of the collection
+        /// regardless of the errors.
+        /// </summary>        
+        public bool ValidateAll
+        {
+            get { return validateAll; }
+            set { validateAll = value; }
+        }
+        
+        /// <summary>
+        /// Gets or sets the value that indicates whether to capture all the errors of the specific 
+        /// elements of the collection
+        /// </summary>        
+        public bool IncludeElementErrors
+        {
+            get { return includeElementErrors; }
+            set { includeElementErrors = value; }
+        }
+        
+
+        /// <summary>
+        /// Gets or sets the expression that should be used to narrow validation context.
+        /// </summary>
+        /// <value>The expression that should be used to narrow validation context.</value>
+        public IExpression Context
+        {
+            get { return context; }
+            set { context = value; }
+        }
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CollectionValidator"/> class.
+        /// </summary>
+        public CollectionValidator()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CollectionValidator"/> class.
+        /// </summary>
+        /// <param name="validateAll">The bool that determines if all elements of the collection should be evaluated.
+        /// regardless of the Errors
+        /// </param>
+        /// <param name="includeElementErrors">The bool that determines whether Validate method should collect 
+        /// all error messages returned by the item validators</param>        
+        public CollectionValidator(bool validateAll, bool includeElementErrors)
+        {
+            this.validateAll = validateAll;
+            this.includeElementErrors = includeElementErrors;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CollectionValidator"/> class.
+        /// </summary>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        /// <param name="validateAll">The bool that determines if this all elements of the collection should be evaluated.
+        /// regardless of the Errors
+        /// </param>
+        /// <param name="includeElementErrors">The bool that determines whether Validate method should collect 
+        /// all error messages returned by the item validators</param>
+
+        public CollectionValidator(IExpression when, bool validateAll, bool includeElementErrors)
+            : base(when)
+        {
+            this.validateAll = validateAll;
+            this.includeElementErrors = includeElementErrors;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CollectionValidator"/> class.
+        /// </summary>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        /// <param name="validateAll">The bool that determines if this all elements of the collection should be evaluated.
+        /// regardless of the Errors
+        /// </param>
+        /// <param name="includeElementErrors">The bool that determines whether Validate method should collect 
+        /// all error messages returned by the item validators</param>
+        public CollectionValidator(string when, bool validateAll, bool includeElementErrors)
+            : this((when != null ? Expression.Parse(when) : null), validateAll,includeElementErrors)
+        {
+            this.validateAll = validateAll;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Validates the specified collection of objects.
+        /// If the <c>IncludeElementErrors</c> property was set to <c>true</c>, 
+        /// <paramref name="errors"/> collection will contain a union of all validation error messages 
+        /// for the contained validators; 
+        /// Otherwise it will contain only error messages that were set for this Validator.
+        /// </summary>
+        /// <param name="validationContext">The collection to validate.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors"><see cref="ValidationErrors"/> instance to add error messages to.</param>
+        /// <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        public override bool Validate(object validationContext, IDictionary contextParams, IValidationErrors errors)
+        {
+            if (Context != null)
+            {
+                validationContext = Context.GetValue(validationContext, contextParams);
+            }
+
+            if (!(validationContext is IEnumerable))
+            {
+                throw new ArgumentException("The type of the object for validation must be subtype of IEnumerable.");
+            }
+
+            bool valid = true;
+
+            if (EvaluateWhen(validationContext, contextParams))
+            {
+                IEnumerable collectionToValidate = (validationContext is IDictionary
+                                                        ? ((IDictionary) validationContext).Values
+                                                        : (IEnumerable) validationContext);
+
+                // decide whether to pass new validation errors collection 
+                //(and discard error messages returned by the item validators)
+                // OR to pass validation errors collection that was passed to this method
+                //(and collect all error messages returned by the item validators)
+                IValidationErrors err = (includeElementErrors)? errors : new ValidationErrors();
+                
+                foreach (object objectToValidate in collectionToValidate)
+                {
+                    foreach (IValidator validator in Validators)
+                    {                                                                        
+                        valid = validator.Validate(objectToValidate, contextParams, err) && valid;
+                        if (!valid && !validateAll)
+                        {
+                            break;
+                        }
+                    }
+
+                    if (!valid && !validateAll)
+                    {
+                        break;
+                    }
+                }
+                
+                ProcessActions(valid, validationContext, contextParams, errors);
+            }
+
+            return valid;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/Config/ValidationNamespaceParser.cs b/src/Spring/Spring.Core/Validation/Config/ValidationNamespaceParser.cs
new file mode 100644
index 00000000..23480a8a
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/Config/ValidationNamespaceParser.cs
@@ -0,0 +1,383 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System.Collections;
+using System.Xml;
+
+using Spring.Core.TypeResolution;
+using Spring.Context.Support;
+using Spring.Expressions;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+using Spring.Threading;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Validation.Config
+{
+    /// <summary>
+    /// Implementation of the custom configuration parser for validator definitions.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ValidationNamespaceParser.cs,v 1.2 2007/08/08 00:34:17 bbaia Exp $</version>
+    [
+        NamespaceParser(
+            Namespace = "http://www.springframework.net/validation", 
+            SchemaLocationAssemblyHint = typeof(ValidationNamespaceParser),
+            SchemaLocation = "/Spring.Validation.Config/spring-validation-1.1.xsd")
+    ]
+    public sealed class ValidationNamespaceParser : ObjectsNamespaceParser
+    {
+        private const string ValidatorTypePrefix = "validator: ";
+
+//        [ThreadStatic]
+//        private int definitionCount = 0;
+        private readonly string key_DefinitionCount;
+        private int definitionCount
+        {
+            get
+            {
+                object tmp = LogicalThreadContext.GetData(key_DefinitionCount);
+                if (tmp != null) return (int)tmp;
+                LogicalThreadContext.SetData(key_DefinitionCount, 0);
+                return 0;
+            }
+            set
+            {
+                LogicalThreadContext.SetData(key_DefinitionCount, value);
+            }
+        }
+    	
+        static ValidationNamespaceParser()
+        {
+            TypeRegistry.RegisterType(ValidatorTypePrefix + "group", typeof(ValidatorGroup));
+            TypeRegistry.RegisterType(ValidatorTypePrefix + "any", typeof(AnyValidatorGroup));
+            TypeRegistry.RegisterType(ValidatorTypePrefix + "exclusive", typeof(ExclusiveValidatorGroup));
+            
+            
+            TypeRegistry.RegisterType(ValidatorTypePrefix + "collection", typeof(CollectionValidator));            
+            TypeRegistry.RegisterType(ValidatorTypePrefix + "required", typeof(RequiredValidator));
+            TypeRegistry.RegisterType(ValidatorTypePrefix + "condition", typeof(ConditionValidator));
+            TypeRegistry.RegisterType(ValidatorTypePrefix + "regex", typeof(RegularExpressionValidator));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValidationNamespaceParser"/> class.
+        /// </summary>
+        public ValidationNamespaceParser()
+        {
+            // generate unique key for instance field to be stored in LogicalThreadContext
+            string FIELDPREFIX = typeof(ValidationNamespaceParser).FullName + base.GetHashCode();
+            key_DefinitionCount = FIELDPREFIX + ".definitionCount";
+        }
+
+
+        /// <summary>
+        /// Parse the specified element and register any resulting
+        /// IObjectDefinitions with the IObjectDefinitionRegistry that is
+        /// embedded in the supplied ParserContext.
+        /// </summary>
+        /// <param name="element">The element to be parsed into one or more IObjectDefinitions</param>
+        /// <param name="parserContext">The object encapsulating the current state of the parsing
+        /// process.</param>
+        /// <returns>
+        /// The primary IObjectDefinition (can be null as explained above)
+        /// </returns>
+        /// <remarks>
+        /// Implementations should return the primary IObjectDefinition
+        /// that results from the parse phase if they wish to used nested
+        /// inside (for example) a <code>&lt;property&gt;</code> tag.
+        /// <para>Implementations may return null if they will not
+        /// be used in a nested scenario.
+        /// </para>
+        /// </remarks>
+        public override IObjectDefinition ParseElement(XmlElement element, ParserContext parserContext)
+        {
+            if (!element.HasAttribute("id"))
+            {
+                throw new ObjectDefinitionStoreException(parserContext.ReaderContext.Resource, "validator", "Top-level validator element must have an 'id' attribute defined.");
+            }
+            this.definitionCount = 0;
+
+            //TODO pass down parserContext...
+            ParseAndRegisterValidator(element, parserContext.ParserHelper);
+
+            return null;
+            //return definitionCount;
+        }
+
+        /// <summary>
+        /// Parses the validator definition.
+        /// </summary>
+        /// <param name="id">Validator's identifier.</param>
+        /// <param name="element">The element to parse.</param>
+        /// <param name="parserHelper">The parser helper.</param>
+        /// <returns>Validator object definition.</returns>
+        private IObjectDefinition ParseValidator(string id, XmlElement element, ObjectDefinitionParserHelper parserHelper)
+        {
+            string typeName = GetTypeName(element);
+            string parent = element.GetAttribute(ObjectDefinitionConstants.ParentAttribute);
+            string test = element.GetAttribute(ValidatorDefinitionConstants.TestAttribute);
+            string when = element.GetAttribute(ValidatorDefinitionConstants.WhenAttribute);
+            string validateAll = element.GetAttribute(ValidatorDefinitionConstants.CollectionValidateAllAttribute);
+            string context = element.GetAttribute(ValidatorDefinitionConstants.CollectionContextAttribute);
+            string includeElementsErrors = element.GetAttribute(ValidatorDefinitionConstants.CollectionIncludeElementsErrors);
+            
+            string name = "validator: " + (StringUtils.HasText(id) ? id : this.definitionCount.ToString());
+            MutablePropertyValues properties = new MutablePropertyValues();
+            if (StringUtils.HasText(test))
+            {
+                properties.Add("Test", test);
+            }
+            if (StringUtils.HasText(when))
+            {
+                properties.Add("When", when);
+            }
+            if (StringUtils.HasText(validateAll))
+            {
+                properties.Add("ValidateAll", validateAll);
+            }
+            if (StringUtils.HasText(validateAll))
+            {
+                properties.Add("Context", context);
+            }
+            if (StringUtils.HasText(includeElementsErrors))
+            {
+                properties.Add("IncludeElementErrors", includeElementsErrors);
+            }
+            
+
+            ManagedList nestedValidators = new ManagedList();
+            ManagedList actions = new ManagedList();
+            foreach (XmlNode node in element.ChildNodes) 
+            {
+                XmlElement child = node as XmlElement;
+                if (child != null)
+                {
+                    switch (child.LocalName)
+                    {
+                        case ValidatorDefinitionConstants.PropertyElement:
+                            string propertyName = child.GetAttribute(ValidatorDefinitionConstants.PropertyNameAttribute);
+                            properties.Add(propertyName, base.GetPropertyValue(child, name, parserHelper));
+                            break;
+                        case ValidatorDefinitionConstants.MessageElement:
+                            actions.Add(ParseErrorMessageAction(child, parserHelper));
+                            break;
+                        case ValidatorDefinitionConstants.ActionElement:
+                            actions.Add(ParseGenericAction(child, parserHelper));
+                            break;
+                        case ValidatorDefinitionConstants.ReferenceElement:
+                            nestedValidators.Add(ParseValidatorReference(child, parserHelper));
+                            break;
+                        default:
+                            nestedValidators.Add(ParseAndRegisterValidator(child, parserHelper));
+                            break;
+                    }
+                }
+            }
+            if (nestedValidators.Count > 0)
+            {
+                properties.Add("Validators", nestedValidators);
+            }
+            if (actions.Count > 0)
+            {
+                properties.Add("Actions", actions);
+            }
+
+            IConfigurableObjectDefinition od
+                = parserHelper.ReaderContext.ObjectDefinitionFactory.CreateObjectDefinition(
+                    typeName, parent, parserHelper.ReaderContext.Reader.Domain);
+
+            od.PropertyValues = properties;
+            od.IsSingleton = true;
+            od.IsLazyInit = true;
+
+            return od;
+        }
+
+        /// <summary>
+        /// Parses and potentially registers a validator.
+        /// </summary>
+        /// <remarks>
+        /// Only validators that have <code>id</code> attribute specified are registered 
+        /// as separate object definitions within application context.
+        /// </remarks>
+        /// <param name="element">Validator XML element.</param>
+        /// <param name="parserHelper">The parser helper.</param>
+        /// <returns>Validator object definition.</returns>
+        private IObjectDefinition ParseAndRegisterValidator(XmlElement element, ObjectDefinitionParserHelper parserHelper)
+        {
+            string id = element.GetAttribute(ObjectDefinitionConstants.IdAttribute);
+            IObjectDefinition validator = ParseValidator(id, element, parserHelper);
+            if (StringUtils.HasText(id))
+            {
+                parserHelper.ReaderContext.Registry.RegisterObjectDefinition(id, validator);
+                this.definitionCount++;
+            }
+            return validator;
+        }
+
+        /// <summary>
+        /// Gets the name of the object type for the specified element.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        /// <returns>The name of the object type.</returns>
+        private string GetTypeName(XmlElement element)
+        {
+            string typeName = element.GetAttribute(ObjectDefinitionConstants.TypeAttribute);
+            if (StringUtils.IsNullOrEmpty(typeName))
+            {
+                return ValidatorTypePrefix + element.LocalName;
+            }
+            return typeName;
+        }
+
+        /// <summary>
+        /// Creates an error message action based on the specified message element.
+        /// </summary>
+        /// <param name="message">The message element.</param>
+        /// <param name="parserHelper">The parser helper.</param>
+        /// <returns>The error message action definition.</returns>
+        private static IObjectDefinition ParseErrorMessageAction(XmlElement message, ObjectDefinitionParserHelper parserHelper)
+        {
+            string messageId = message.GetAttribute(MessageConstants.IdAttribute);                        
+            string[] providers = message.GetAttribute(MessageConstants.ProvidersAttribute).Split(',');
+            ArrayList parameters = new ArrayList();
+
+            foreach (XmlElement param in message.ChildNodes)
+            {
+                IExpression paramExpression = Expression.Parse(param.GetAttribute(MessageConstants.ParameterValueAttribute));
+                parameters.Add(paramExpression);
+            }
+
+            string typeName = "Spring.Validation.Actions.ErrorMessageAction, Spring.Core";
+            ConstructorArgumentValues ctorArgs = new ConstructorArgumentValues();
+            ctorArgs.AddGenericArgumentValue(messageId);
+            ctorArgs.AddGenericArgumentValue(providers);
+
+            string when = message.GetAttribute(ValidatorDefinitionConstants.WhenAttribute);
+            MutablePropertyValues properties = new MutablePropertyValues();
+            if (StringUtils.HasText(when))
+            {
+                properties.Add("When", when);
+            }
+            if (parameters.Count > 0)
+            {
+                properties.Add("Parameters", parameters.ToArray(typeof(IExpression)));
+            }
+            
+            IConfigurableObjectDefinition action =
+                parserHelper.ReaderContext.ObjectDefinitionFactory.CreateObjectDefinition(typeName, null, parserHelper.ReaderContext.Reader.Domain);
+            action.ConstructorArgumentValues = ctorArgs;
+            action.PropertyValues = properties;
+
+            return action;
+        }
+
+        /// <summary>
+        /// Creates a generic action based on the specified element.
+        /// </summary>
+        /// <param name="element">The action definition element.</param>
+        /// <param name="parserHelper">The parser helper.</param>
+        /// <returns>Generic validation action definition.</returns>
+        private IObjectDefinition ParseGenericAction(XmlElement element, ObjectDefinitionParserHelper parserHelper)
+        {
+            string typeName = element.GetAttribute(ObjectDefinitionConstants.TypeAttribute);
+            string when = element.GetAttribute(ValidatorDefinitionConstants.WhenAttribute);
+            MutablePropertyValues properties = base.GetPropertyValueSubElements("validator:action", element, parserHelper);
+            if (StringUtils.HasText(when))
+            {
+                properties.Add("When", when);
+            }
+
+            IConfigurableObjectDefinition action =
+                parserHelper.ReaderContext.ObjectDefinitionFactory.CreateObjectDefinition(typeName, null, parserHelper.ReaderContext.Reader.Domain);
+            action.PropertyValues = properties;
+
+            return action;
+        }
+
+        /// <summary>
+        /// Creates object definition for the validator reference.
+        /// </summary>
+        /// <param name="element">The action definition element.</param>
+        /// <param name="parserHelper">The parser helper.</param>
+        /// <returns>Generic validation action definition.</returns>
+        private IObjectDefinition ParseValidatorReference(XmlElement element, ObjectDefinitionParserHelper parserHelper)
+        {
+            string typeName = "Spring.Validation.ValidatorReference, Spring.Core";
+            string name = element.GetAttribute(ValidatorDefinitionConstants.ReferenceNameAttribute);
+            string context = element.GetAttribute(ValidatorDefinitionConstants.ReferenceContextAttribute);
+            
+            MutablePropertyValues properties = new MutablePropertyValues();
+            properties.Add("Name", name);
+            if (StringUtils.HasText(context))
+            {
+                properties.Add("Context", context);
+            }
+
+            IConfigurableObjectDefinition reference =
+                parserHelper.ReaderContext.ObjectDefinitionFactory.CreateObjectDefinition(typeName, null, parserHelper.ReaderContext.Reader.Domain);
+            reference.PropertyValues = properties;
+            return reference;
+        }
+        
+        #region Element & Attribute Name Constants
+
+        private class ValidatorDefinitionConstants
+        {
+            public const string PropertyElement = "property";
+            public const string MessageElement = "message";
+            public const string ActionElement = "action";
+            public const string ReferenceElement = "ref";
+
+            public const string TypeAttribute = "type";
+            public const string TestAttribute = "test";
+            public const string NameAttribute = "name";
+            public const string WhenAttribute = "when";
+
+            public const string PropertyNameAttribute = "name";
+
+            public const string ReferenceNameAttribute = "name";
+            public const string ReferenceContextAttribute = "context";
+
+            public const string CollectionValidateAllAttribute = "validate-all";
+            public const string CollectionContextAttribute = "context";
+            public const string CollectionIncludeElementsErrors = "include-element-errors";            
+        }
+
+        private class MessageConstants
+        {
+            public const string ParamElement = "param";
+
+            public const string IdAttribute = "id";
+            public const string ProvidersAttribute = "providers";
+            public const string ParameterValueAttribute = "value";
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/Config/spring-validation-1.1.xsd b/src/Spring/Spring.Core/Validation/Config/spring-validation-1.1.xsd
new file mode 100644
index 00000000..0290b8b5
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/Config/spring-validation-1.1.xsd
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema xmlns="http://www.springframework.net/validation"
+          xmlns:objects="http://www.springframework.net" 
+          xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+          xmlns:vs="http://schemas.microsoft.com/Visual-Studio-Intellisense" 
+          targetNamespace="http://www.springframework.net/validation" 
+          elementFormDefault="qualified" attributeFormDefault="unqualified" 
+          vs:friendlyname="Spring.NET Validation Framework Configuration" vs:ishtmlschema="false" vs:iscasesensitive="true" vs:requireattributequotes="true" vs:defaultnamespacequalifier="" vs:defaultnsprefix="">
+
+  <xs:import namespace="http://www.springframework.net"/>
+
+  <xs:annotation>
+    <xs:documentation>
+      Spring.NET Validation Framework Config Schema Definition
+
+      Author: Aleksandar Seovic
+
+      This file defines a configuration schema for the validation framework
+      object definitions. Using elements from this schema instead of the
+      standard object definitions can greatly simplify validator configuration.
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:complexType name="messageType">
+    <xs:annotation>
+      <xs:documentation>Defines a message type.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="param" type="messageParamType" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="id" type="objects:nonNullString" use="required"/>
+    <xs:attribute name="providers" type="objects:nonNullString" use="required"/>
+    <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
+  </xs:complexType>
+
+  <xs:complexType name="messageParamType">
+    <xs:annotation>
+      <xs:documentation>Defines a message parameter type.</xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="value" type="objects:nonNullString" use="optional"/>
+  </xs:complexType>
+
+  <xs:complexType name="actionType">
+    <xs:annotation>
+      <xs:documentation>Defines an action type.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="property" type="objects:property" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="type" type="objects:nonNullString" use="required"/>
+    <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
+  </xs:complexType>
+
+  <xs:complexType name="referenceType">
+    <xs:annotation>
+      <xs:documentation>Defines a validator reference type.</xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="name" type="objects:nonNullString" use="required"/>
+    <xs:attribute name="context" type="objects:nonNullString" use="optional"/>
+  </xs:complexType>
+
+  <xs:complexType name="baseValidatorType">
+    <xs:annotation>
+      <xs:documentation>Defines base validator type.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="message" type="messageType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="action" type="actionType" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="id" type="xs:ID" use="optional"/>
+    <xs:attribute name="parent" type="objects:nonNullString" use="optional"/>
+    <xs:attribute name="test" type="objects:nonNullString" use="required"/>
+    <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
+  </xs:complexType>
+
+  <xs:complexType name="genericValidatorType">
+    <xs:annotation>
+      <xs:documentation>Defines a generic validator type.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>     
+      <xs:element name="property" type="objects:property" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="message" type="messageType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="action" type="actionType" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="id" type="xs:ID" use="optional"/>
+    <xs:attribute name="type" type="objects:nonNullString" use="required"/>
+    <xs:attribute name="parent" type="objects:nonNullString" use="optional"/>
+    <xs:attribute name="test" type="objects:nonNullString" use="optional"/>
+    <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
+  </xs:complexType>
+
+  <xs:complexType name="regexValidatorType">
+    <xs:annotation>
+      <xs:documentation>Defines a regex validator type.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="property" type="objects:property" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="message" type="messageType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="action" type="actionType" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="id" type="xs:ID" use="optional"/>
+    <xs:attribute name="parent" type="objects:nonNullString" use="optional"/>
+    <xs:attribute name="test" type="objects:nonNullString" use="required"/>
+    <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
+  </xs:complexType>
+
+  <xs:complexType name="validatorGroupType">
+    <xs:annotation>
+      <xs:documentation>Defines a validator group type.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence minOccurs="1" maxOccurs="unbounded">
+      <xs:choice>
+        <xs:element name="message" type="messageType"/>
+        <xs:element name="action" type="actionType"/>
+
+        <xs:element name="group" type="validatorGroupType"/>
+        <xs:element name="any" type="validatorGroupType"/>
+        <xs:element name="exclusive" type="validatorGroupType"/>
+
+        <xs:element name="validator" type="genericValidatorType"/>
+        <xs:element name="required" type="baseValidatorType"/>
+        <xs:element name="condition" type="baseValidatorType"/>
+        <xs:element name="regex" type="regexValidatorType"/>
+        <xs:element name="ref" type="referenceType"/>
+
+        <xs:element name="collection" type="collectionValidatorGroupType"/>        
+      </xs:choice>
+    </xs:sequence>
+    <xs:attribute name="id" type="xs:ID" use="optional"/>
+    <xs:attribute name="parent" type="objects:nonNullString" use="optional"/>
+    <xs:attribute name="when" type="objects:nonNullString" use="optional"/>
+  </xs:complexType>
+
+  <xs:complexType name="collectionValidatorGroupType">
+    <xs:annotation>
+      <xs:documentation>Defines a collection validator group type.</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>      
+      <xs:extension base="validatorGroupType">        
+        <xs:attribute name="validate-all" type="xs:boolean" use="optional" default="false"/>
+        <xs:attribute name="include-element-errors" type="xs:boolean" use="optional" default="false"/>
+        <xs:attribute name="context" type="objects:nonNullString" use="optional"/>        
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="validator" type="genericValidatorType"/>
+  <xs:element name="required" type="baseValidatorType"/>
+  <xs:element name="condition" type="baseValidatorType"/>
+  <xs:element name="regex" type="regexValidatorType"/>
+
+  <xs:element name="group" type="validatorGroupType"/>
+  <xs:element name="any" type="validatorGroupType"/>
+  <xs:element name="exclusive" type="validatorGroupType"/>
+
+  <xs:element name="collection" type="collectionValidatorGroupType"/>
+    
+
+
+</xs:schema>
diff --git a/src/Spring/Spring.Core/Validation/ErrorMessage.cs b/src/Spring/Spring.Core/Validation/ErrorMessage.cs
new file mode 100644
index 00000000..61d2a869
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/ErrorMessage.cs
@@ -0,0 +1,180 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+using Spring.Context;
+
+#endregion
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// Represents a single validation error message.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Goran Milosavljevic</author>
+    /// <version>$Id: ErrorMessage.cs,v 1.5 2007/02/19 17:56:42 aseovic Exp $</version>
+    [Serializable]
+    public class ErrorMessage : IXmlSerializable
+    {
+        #region Constructors
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public ErrorMessage()
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ErrorMessage"/> class.
+        /// </summary>
+        /// <param name="id">Error message resource identifier.</param>
+        /// <param name="parameters">Parameters that should be used for message resolution.</param>
+        public ErrorMessage(string id, params object[] parameters)
+        {
+            this.id = id;
+            this.parameters = parameters;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the resource identifier for this message.
+        /// </summary>
+        /// <value>The resource identifier for this message.</value>
+        public string Id
+        {
+            get { return id; }
+        }
+
+        /// <summary>
+        /// Gets or sets the message parameters.
+        /// </summary>
+        /// <value>The message parameters.</value>   
+        public object[] Parameters
+        {
+            get { return parameters; }
+        }
+
+        #endregion
+
+        #region IXmlSerializable implementations
+
+        /// <summary>
+        /// This property is reserved, apply the 
+        /// <see cref="T:System.Xml.Serialization.XmlSchemaProviderAttribute" />
+        /// to the class instead. 
+        /// </summary>
+        /// <returns>
+        /// An <see cref="T:System.Xml.Schema.XmlSchema" /> 
+        /// that describes the XML representation of the object that 
+        /// is produced by the 
+        /// <see cref="M:System.Xml.Serialization.IXmlSerializable.WriteXml(System.Xml.XmlWriter)" />
+        /// method and consumed by the 
+        /// <see cref="M:System.Xml.Serialization.IXmlSerializable.ReadXml(System.Xml.XmlReader)" />
+        /// method.
+        /// </returns>
+        ///
+        public XmlSchema GetSchema()
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Generates an object from its XML representation.
+        /// </summary>
+        /// <param name="reader">
+        /// The <see cref="T:System.Xml.XmlReader"></see> stream 
+        /// from which the object is deserialized. 
+        /// </param>
+        public void ReadXml(XmlReader reader)
+        {
+            id = reader.GetAttribute("Id");
+            if (!reader.IsEmptyElement)
+            {
+                reader.Read();
+                reader.Read();
+                XmlSerializer xs = new XmlSerializer(typeof(object[]));
+                parameters = (object[])xs.Deserialize(reader);
+                reader.Read();
+            }
+            reader.Read();
+        }
+
+        /// <summary>
+        /// Converts an object into its XML representation.
+        /// </summary>
+        /// <param name="writer">
+        /// The <see cref="T:System.Xml.XmlWriter"></see> stream 
+        /// to which the object is serialized. 
+        /// </param>
+        public void WriteXml(XmlWriter writer)
+        {
+            writer.WriteAttributeString("Id", id.ToString());
+
+            if (parameters != null)
+            {
+                writer.WriteStartElement("Parameters");
+
+                XmlSerializer xs = new XmlSerializer(parameters.GetType());
+                xs.Serialize(writer, parameters);
+
+                writer.WriteEndElement();
+            }
+        }
+
+        #endregion
+
+        #region ErrorMessage methods
+
+        /// <summary>
+        /// Resolves the message against specified <see cref="IMessageSource"/>.
+        /// </summary>
+        /// <param name="messageSource">Message source to resolve this error message against.</param>
+        /// <returns>Resolved error message.</returns>
+        public string GetMessage(IMessageSource messageSource)
+        {
+            if (Parameters == null)
+            {
+                return messageSource.GetMessage(Id);
+            }
+            else
+            {
+                return messageSource.GetMessage(Id, Parameters);
+            }
+        }
+
+        #endregion
+        
+        #region Data members
+
+        private string id;
+        private object[] parameters;
+
+        #endregion
+    } 
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/ExclusiveValidatorGroup.cs b/src/Spring/Spring.Core/Validation/ExclusiveValidatorGroup.cs
new file mode 100644
index 00000000..d8ef54c8
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/ExclusiveValidatorGroup.cs
@@ -0,0 +1,103 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+using Spring.Expressions;
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// <see cref="IValidator"/> implementation that supports grouping of validators.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This validator will be valid when <b>one and only one</b> of the validators in the <c>Validators</c> collection are valid
+    /// </p>
+    /// <p>
+    /// <c>ValidationErrors</c> property will return a union of all validation error messages 
+    /// for the contained validators, but only if this validator is not valid (meaning, when none
+    /// of the contained validators are valid).
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ExclusiveValidatorGroup.cs,v 1.8 2008/02/05 20:40:26 aseovic Exp $</version>
+    public class ExclusiveValidatorGroup : ValidatorGroup
+    {
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExclusiveValidatorGroup"/> class.
+        /// </summary>
+        public ExclusiveValidatorGroup()
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExclusiveValidatorGroup"/> class.
+        /// </summary>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public ExclusiveValidatorGroup(string when) : base(when)
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExclusiveValidatorGroup"/> class.
+        /// </summary>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public ExclusiveValidatorGroup(IExpression when) : base(when)
+        {}
+
+        #endregion
+
+        /// <summary>
+        /// Validates the specified object.
+        /// </summary>
+        /// <param name="validationContext">The object to validate.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors"><see cref="ValidationErrors"/> instance to add error messages to.</param>
+        /// <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        public override bool Validate(object validationContext, IDictionary contextParams, IValidationErrors errors)
+        {
+            IValidationErrors tmpErrors = new ValidationErrors();
+            bool valid = true;
+
+            if (EvaluateWhen(validationContext, contextParams))
+            {
+                valid = false;
+                foreach (IValidator validator in Validators)
+                {
+                    bool tmpValid = validator.Validate(validationContext, contextParams, tmpErrors);
+                    if (valid && tmpValid)
+                    {
+                        valid = false;
+                        break;
+                    }
+                    else if (tmpValid)
+                    {
+                        valid = true;
+                    }
+                }
+
+                ProcessActions(valid, validationContext, contextParams, errors);
+            }
+
+            return valid;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/IValidationAction.cs b/src/Spring/Spring.Core/Validation/IValidationAction.cs
new file mode 100644
index 00000000..418086bf
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/IValidationAction.cs
@@ -0,0 +1,57 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+
+using Spring.Validation.Actions;
+
+#endregion
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// An action that should be executed after validator is evaluated.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This interface allows us to define the actions that should be executed
+    /// after validation in a generic fashion.
+    /// </p>
+    /// <p>
+    /// For example, addition of error messages to validation errors collection
+    /// is performed by one specific implementation of this interface, <see cref="ErrorMessageAction"/>.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IValidationAction.cs,v 1.4 2008/02/05 20:40:26 aseovic Exp $</version>
+    public interface IValidationAction
+    {
+        /// <summary>
+        /// Executes the action.
+        /// </summary>
+        /// <param name="isValid">Whether associated validator is valid or not.</param>
+        /// <param name="validationContext">Validation context.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors">Validation errors container.</param>
+        void Execute(bool isValid, object validationContext, IDictionary contextParams, IValidationErrors errors);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/IValidationErrors.cs b/src/Spring/Spring.Core/Validation/IValidationErrors.cs
new file mode 100644
index 00000000..5c6b2543
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/IValidationErrors.cs
@@ -0,0 +1,90 @@
+using System.Collections;
+using Spring.Context;
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// An interface that validation errors containers have to implement.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IValidationErrors.cs,v 1.1 2008/02/05 20:40:26 aseovic Exp $</version>
+    public interface IValidationErrors
+    {
+        /// <summary>
+        /// Does this instance contain any validation errors?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If this returns <see lang="true"/>, this means that it (obviously)
+        /// contains no validation errors.
+        /// </p>
+        /// </remarks>
+        /// <value><see lang="true"/> if this instance is empty.</value>
+        bool IsEmpty { get; }
+        
+        /// <summary>
+        /// Gets the list of all error providers.
+        /// </summary>
+        IList Providers { get; }
+
+        /// <summary>
+        /// Adds the supplied <paramref name="message"/> to this
+        /// instance's collection of errors.
+        /// </summary>
+        /// <param name="provider">
+        /// The provider that should be used for message grouping; can't be
+        /// <see lang="null"/>.
+        /// </param>
+        /// <param name="message">The error message to add.</param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="provider"/> or <paramref name="message"/> is <see langword="null"/>.
+        /// </exception>
+        void AddError(string provider, ErrorMessage message);
+
+        /// <summary>
+        /// Merges another instance of <see cref="ValidationErrors"/> into this one.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the supplied <paramref name="errorsToMerge"/> is <see lang="null"/>,
+        /// then no errors will be added to this instance, and this method will
+        /// (silently) return.
+        /// </p>
+        /// </remarks>
+        /// <param name="errorsToMerge">
+        /// The validation errors to merge; can be <see lang="null"/>.
+        /// </param>
+        void MergeErrors(ValidationErrors errorsToMerge);
+
+        /// <summary>
+        /// Gets the list of errors for the supplied error <paramref name="provider"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If there are no errors for the supplied <paramref name="provider"/>,
+        /// an <b>empty</b> <see cref="System.Collections.IList"/> will be returned.
+        /// </p>
+        /// </remarks>
+        /// <param name="provider">Error key that was used to group messages.</param>
+        /// <returns>
+        /// A list of all <see cref="ErrorMessage"/>s for the supplied lookup <paramref name="provider"/>.
+        /// </returns>
+        IList GetErrors(string provider);
+
+        /// <summary>
+        /// Gets the list of resolved error messages for the supplied lookup <paramref name="provider"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If there are no errors for the supplied lookup <paramref name="provider"/>,
+        /// an <b>empty</b> <see cref="System.Collections.IList"/> will be returned.
+        /// </p>
+        /// </remarks>
+        /// <param name="provider">Error key that was used to group messages.</param>
+        /// <param name="messageSource"><see cref="IMessageSource"/> to resolve messages against.</param>
+        /// <returns>
+        /// A list of resolved error messages for the supplied lookup <paramref name="provider"/>.
+        /// </returns>
+        IList GetResolvedErrors(string provider, IMessageSource messageSource);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/IValidator.cs b/src/Spring/Spring.Core/Validation/IValidator.cs
new file mode 100644
index 00000000..48e0f5f4
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/IValidator.cs
@@ -0,0 +1,82 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+
+#endregion
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// An object that can validate application-specific objects.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// The primary motivation for this interface is to enable validation to be
+    /// decoupled from the (user) interface and placed in business objects.
+    /// </p>
+    /// <p>
+    /// Application developers writing their own custom
+    /// <see cref="Spring.Validation.IValidator"/> implementations will
+    /// typically not implement this interface directly. In most cases, custom
+    /// validators woud be better served deriving from the
+    /// <see lang="abstract"/> <see cref="BaseValidator"/> class, with the
+    /// custom validation ligic being implemented in an override of the
+    /// <see lang="abstract"/>
+    /// <see cref="BaseValidator.Validate(object, IValidationErrors)"/>
+    /// template method.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IValidator.cs,v 1.8 2008/02/05 20:40:26 aseovic Exp $</version>
+    /// <seealso cref="BaseValidator"/>
+    public interface IValidator
+    {
+        /// <summary>
+        /// Validates the specified object.
+        /// </summary>
+        /// <param name="validationContext">The object to validate.</param>
+        /// <param name="errors">
+        /// The <see cref="ValidationErrors"/> instance to add any error
+        /// messages to in the case of validation failure.
+        /// </param>
+        /// <returns>
+        /// <see lang="true"/> if validation was successful.
+        /// </returns>
+        bool Validate(object validationContext, IValidationErrors errors);
+
+        /// <summary>
+        /// Validates the specified object.
+        /// </summary>
+        /// <param name="validationContext">The object to validate.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors">
+        /// The <see cref="ValidationErrors"/> instance to add any error
+        /// messages to in the case of validation failure.
+        /// </param>
+        /// <returns>
+        /// <see lang="true"/> if validation was successful.
+        /// </returns>
+        bool Validate(object validationContext, IDictionary contextParams, IValidationErrors errors);
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/ValidatedAttribute.cs b/src/Spring/Spring.Core/Validation/ValidatedAttribute.cs
new file mode 100644
index 00000000..bdd782ad
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/ValidatedAttribute.cs
@@ -0,0 +1,39 @@
+using System;
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// Allows developers to specify which validator should be used
+    /// to validate method argument.
+    /// </summary>
+    /// <author>Damjan Tomic</author>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ValidatedAttribute.cs,v 1.1 2008/04/02 23:02:36 markpollack Exp $</version>
+    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = true)]
+    [Serializable]
+    public class ValidatedAttribute : Attribute
+    {
+        private readonly string validatorName;
+
+        /// <summary>
+        /// Creates an attribute instance.
+        /// </summary>
+        /// <param name="validatorName">
+        /// The name of the validator to use (must be defined within
+        /// Spring application context).
+        /// </param>
+        public ValidatedAttribute(string validatorName)
+        {
+            this.validatorName = validatorName;
+        }
+        
+        /// <summary>
+        /// Gets the name of the validator to use.
+        /// </summary>
+        /// <value>The name of the validator to use.</value>
+        public string ValidatorName
+        {
+            get { return validatorName; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/ValidationErrors.cs b/src/Spring/Spring.Core/Validation/ValidationErrors.cs
new file mode 100644
index 00000000..384d7e30
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/ValidationErrors.cs
@@ -0,0 +1,288 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+using Spring.Context;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// A container for validation errors.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This class groups validation errors by validator names and allows
+    /// access to both the complete errors collection and to the errors for a
+    /// certain validator.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Goran Milosavljevic</author>
+    /// <version>$Id: ValidationErrors.cs,v 1.9 2008/02/05 20:40:26 aseovic Exp $</version>
+    [Serializable]
+    public class ValidationErrors : IValidationErrors, IXmlSerializable
+    {
+        #region Constructors
+        
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public ValidationErrors()
+        {}
+
+        #endregion
+
+        #region IXmlSerializable implementations
+
+        /// <summary>
+        /// This property is reserved, apply the 
+        /// <see cref="T:System.Xml.Serialization.XmlSchemaProviderAttribute" />
+        /// to the class instead. 
+        /// </summary>
+        /// <returns>
+        /// An <see cref="T:System.Xml.Schema.XmlSchema" /> that describes the 
+        /// XML representation of the object that is produced by 
+        /// the <see cref="M:System.Xml.Serialization.IXmlSerializable.WriteXml(System.Xml.XmlWriter)" /> 
+        /// method and consumed by the 
+        /// <see cref="M:System.Xml.Serialization.IXmlSerializable.ReadXml(System.Xml.XmlReader)" /> 
+        /// method.
+        /// </returns>
+        public XmlSchema GetSchema()
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Generates an object from its XML representation.
+        /// </summary>
+        /// <param name="reader">
+        /// The <see cref="T:System.Xml.XmlReader"></see> stream 
+        /// from which the object is deserialized. 
+        /// </param>
+        public void ReadXml(XmlReader reader)
+        {
+            if (!reader.IsEmptyElement)
+            {
+                reader.Read();
+                while (reader.Name == "Provider")
+                {
+                    object key = reader.GetAttribute("Id");
+                    reader.Read();
+                    while (reader.Name == "ErrorMessage")
+                    {
+                        XmlSerializer xs = new XmlSerializer(typeof(ErrorMessage));
+                        object value = xs.Deserialize(reader);
+
+                        IList mapValue = (IList)errorMap[key];
+
+                        if (mapValue == null)
+                        {
+                            mapValue = new ArrayList();
+                            errorMap[key] = mapValue;
+                        }
+
+                        mapValue.Add(value);
+                    }
+                    reader.Read();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Converts an object into its XML representation.
+        /// </summary>
+        /// <param name="writer">
+        /// The <see cref="T:System.Xml.XmlWriter"></see> stream 
+        /// to which the object is serialized. 
+        /// </param>
+        public void WriteXml(XmlWriter writer)
+        {
+            foreach (DictionaryEntry entry in errorMap)
+            {
+                writer.WriteStartElement("Provider");
+                writer.WriteAttributeString("Id", entry.Key as String);
+
+                if (entry.Value != null)
+                {
+                    ArrayList errorsList = (ArrayList)entry.Value;
+                    foreach (object o in errorsList)
+                    {
+                        ErrorMessage error = (ErrorMessage)o;
+                        XmlSerializer xs = new XmlSerializer(typeof(ErrorMessage));
+                        xs.Serialize(writer, error);
+                    }
+                }
+
+                writer.WriteEndElement();
+            }
+        }
+
+        #endregion 
+
+        #region ValidationErrors methods
+
+        /// <summary>
+        /// Does this instance contain any validation errors?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If this returns <see lang="true"/>, this means that it (obviously)
+        /// contains no validation errors.
+        /// </p>
+        /// </remarks>
+        /// <value><see lang="true"/> if this instance is empty.</value>
+        public bool IsEmpty
+        {
+            get { return this.errorMap.Count == 0; }
+        }
+        
+        /// <summary>
+        /// Gets the list of all providers.
+        /// </summary>
+        public IList Providers
+        {
+            get { return new ArrayList(this.errorMap.Keys); }
+        }
+
+        /// <summary>
+        /// Adds the supplied <paramref name="message"/> to this
+        /// instance's collection of errors.
+        /// </summary>
+        /// <param name="provider">
+        /// The provider that should be used for message grouping; can't be
+        /// <see lang="null"/>.
+        /// </param>
+        /// <param name="message">The error message to add.</param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="provider"/> or <paramref name="message"/> is <see langword="null"/>.
+        /// </exception>
+        public void AddError(string provider, ErrorMessage message)
+        {
+            AssertUtils.ArgumentNotNull(provider, "provider");
+            AssertUtils.ArgumentNotNull(message, "errorMessage");
+
+            IList errors = (IList) errorMap[provider];
+            if (errors == null)
+            {
+                errors = new ArrayList();
+                errorMap[provider] = errors;
+            }
+            errors.Add(message);
+        }
+
+        /// <summary>
+        /// Merges another instance of <see cref="ValidationErrors"/> into this one.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the supplied <paramref name="errorsToMerge"/> is <see lang="null"/>,
+        /// then no errors will be added to this instance, and this method will
+        /// (silently) return.
+        /// </p>
+        /// </remarks>
+        /// <param name="errorsToMerge">
+        /// The validation errors to merge; can be <see lang="null"/>.
+        /// </param>
+        public void MergeErrors(ValidationErrors errorsToMerge)
+        {
+            if (errorsToMerge != null)
+            {
+                foreach (DictionaryEntry errorEntry in errorsToMerge.errorMap)
+                {
+                    ArrayList errList = (ArrayList) this.errorMap[errorEntry.Key];
+                    if (errList == null)
+                    {
+                        this.errorMap[errorEntry.Key] = errorEntry.Value;
+                    }
+                    else
+                    {
+                        errList.AddRange((IList) errorEntry.Value);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the list of errors for the supplied lookup <paramref name="provider"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If there are no errors for the supplied lookup <paramref name="provider"/>,
+        /// an <b>empty</b> <see cref="System.Collections.IList"/> will be returned.
+        /// </p>
+        /// </remarks>
+        /// <param name="provider">Error key that was used to group messages.</param>
+        /// <returns>
+        /// A list of all <see cref="ErrorMessage"/>s for the supplied lookup <paramref name="provider"/>.
+        /// </returns>
+        public IList GetErrors(string provider)
+        {
+            IList errors = (IList) errorMap[provider];
+            return errors == null ? ObjectUtils.EmptyObjects : errors;
+        }
+
+        /// <summary>
+        /// Gets the list of resolved error messages for the supplied lookup <paramref name="provider"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If there are no errors for the supplied lookup <paramref name="provider"/>,
+        /// an <b>empty</b> <see cref="System.Collections.IList"/> will be returned.
+        /// </p>
+        /// </remarks>
+        /// <param name="provider">Error key that was used to group messages.</param>
+        /// <param name="messageSource"><see cref="IMessageSource"/> to resolve messages against.</param>
+        /// <returns>
+        /// A list of resolved error messages for the supplied lookup <paramref name="provider"/>.
+        /// </returns>
+        public IList GetResolvedErrors(string provider, IMessageSource messageSource)
+        {
+            IList messages = new ArrayList();
+            IList errors = (IList) errorMap[provider];
+            
+            if (errors != null)
+            {
+                foreach (ErrorMessage error in errors)
+                {
+                    messages.Add(error.GetMessage(messageSource));
+                }
+            }
+
+            return messages;
+        }
+
+        #endregion
+        
+        #region Data members
+
+        private readonly IDictionary errorMap = new Hashtable();
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/ValidationException.cs b/src/Spring/Spring.Core/Validation/ValidationException.cs
new file mode 100644
index 00000000..68b1c789
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/ValidationException.cs
@@ -0,0 +1,165 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// Thrown by the validation advice if the method parameters validation fails.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ValidationException.cs,v 1.1 2008/02/05 20:40:26 aseovic Exp $</version>
+    [Serializable]
+    public class ValidationException : Exception
+    {
+        private readonly IValidationErrors errors;
+
+        /// <summary>
+        /// Creates a new instance of the ValidationException class.
+        /// </summary>
+        public ValidationException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ValidationException class with
+        /// specified validation errors.
+        /// </summary>
+        /// <param name="errors">
+        /// Validation errors.
+        /// </param>
+        public ValidationException(IValidationErrors errors)
+        {
+            this.errors = errors;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ValidationException class with the
+        /// specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public ValidationException(string message)
+            : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ValidationException class with the
+        /// specified message and validation errors.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="errors">
+        /// Validation errors.
+        /// </param>
+        public ValidationException(string message, IValidationErrors errors)
+            : base(message)
+        {
+            this.errors = errors;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ValidationException class with the
+        /// specified message and root cause.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public ValidationException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ValidationException class with the
+        /// specified message, root cause and validation errors.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        /// <param name="errors">
+        /// Validation errors.
+        /// </param>
+        public ValidationException(string message, Exception rootCause, IValidationErrors errors)
+            : base(message, rootCause)
+        {
+            this.errors = errors;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the ValidationException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected ValidationException (
+            SerializationInfo info, StreamingContext context)
+            : base (info, context)
+        {
+            this.errors = (IValidationErrors) info.GetValue("errors", typeof (IValidationErrors));
+        }
+
+        /// <summary>
+        /// Implements object serialization.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            base.GetObjectData(info, context);
+            info.AddValue("errors", this.errors);
+        }
+
+        /// <summary>
+        /// Gets validation errors.
+        /// </summary>
+        /// <value>Validation errors.</value>
+        public IValidationErrors ValidationErrors
+        {
+            get { return errors; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/ValidatorGroup.cs b/src/Spring/Spring.Core/Validation/ValidatorGroup.cs
new file mode 100644
index 00000000..02154c48
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/ValidatorGroup.cs
@@ -0,0 +1,122 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+using Spring.Expressions;
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// <see cref="IValidator"/> implementation that supports grouping of validators.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This validator will be valid only when all of the validators in the <c>Validators</c>
+    /// collection are valid.
+    /// </p>
+    /// <p>
+    /// <c>ValidationErrors</c> property will return a union of all validation error messages 
+    /// for the contained validators.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ValidatorGroup.cs,v 1.10 2008/02/05 20:40:26 aseovic Exp $</version>
+    public class ValidatorGroup : BaseValidator
+    {
+        #region Fields
+
+        private IList validators = new ArrayList();
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValidatorGroup"/> class.
+        /// </summary>
+        public ValidatorGroup()
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValidatorGroup"/> class.
+        /// </summary>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public ValidatorGroup(string when) : this((when != null ? Expression.Parse(when) : null))
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValidatorGroup"/> class.
+        /// </summary>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public ValidatorGroup(IExpression when) : base(null, when)
+        {}
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the validators.
+        /// </summary>
+        /// <value>The validators.</value>
+        public IList Validators
+        {
+            get { return validators; }
+            set { validators = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Validates the specified object.
+        /// </summary>
+        /// <param name="validationContext">The object to validate.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors"><see cref="ValidationErrors"/> instance to add error messages to.</param>
+        /// <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        public override bool Validate(object validationContext, IDictionary contextParams, IValidationErrors errors)
+        {
+            bool valid = true;
+
+            if (EvaluateWhen(validationContext, contextParams))
+            {
+                foreach (IValidator validator in validators)
+                {
+                    valid = validator.Validate(validationContext, contextParams, errors) && valid;
+                }
+                ProcessActions(valid, validationContext, contextParams, errors);
+            }
+
+            return valid;
+        }
+
+        /// <summary>
+        /// Doesn't do anything for validator group as there is no single test.
+        /// </summary>
+        /// <param name="objectToValidate">Object to validate.</param>
+        /// <returns><c>True</c> if specified object is valid, <c>False</c> otherwise.</returns>
+        protected override bool Validate(object objectToValidate)
+        {
+            throw new NotSupportedException("Validator group does not support this method.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/ValidatorReference.cs b/src/Spring/Spring.Core/Validation/ValidatorReference.cs
new file mode 100644
index 00000000..a710b11b
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/ValidatorReference.cs
@@ -0,0 +1,146 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+using Spring.Expressions;
+using Spring.Objects.Factory;
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// Represents a reference to an externally defined validator object
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This class allows validation groups to reference validators that
+    /// are defined outside of the group itself.
+    /// </p>
+    /// <p>
+    /// It also allows users to narrow the context for the referenced validator
+    /// by specifying value for the <c>Context</c> property.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ValidatorReference.cs,v 1.5 2008/02/05 20:40:26 aseovic Exp $</version>
+    public class ValidatorReference : IValidator, IObjectFactoryAware
+    {
+        #region Fields
+
+        private IObjectFactory objectFactory;
+
+        private string name;
+        private IExpression context;
+        private IValidator validator;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValidatorReference"/> class.
+        /// </summary>
+        public ValidatorReference()
+        {}
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the name of the referenced validator.
+        /// </summary>
+        /// <value>The name of the referenced validator.</value>
+        public string Name
+        {
+            get { return name; }
+            set { name = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the expression that should be used to narrow validation context.
+        /// </summary>
+        /// <value>The expression that should be used to narrow validation context.</value>
+        public IExpression Context
+        {
+            get { return context; }
+            set { context = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Validates the specified object.
+        /// </summary>
+        /// <param name="validationContext">The object to validate.</param>
+        /// <param name="errors"><see cref="ValidationErrors"/> instance to add error messages to.</param>
+        /// <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        public bool Validate(object validationContext, IValidationErrors errors)
+        {
+            return Validate(validationContext, null, errors);
+        }
+
+        /// <summary>
+        /// Validates the specified object.
+        /// </summary>
+        /// <param name="validationContext">The object to validate.</param>
+        /// <param name="contextParams">Additional context parameters.</param>
+        /// <param name="errors"><see cref="ValidationErrors"/> instance to add error messages to.</param>
+        /// <returns><c>True</c> if validation was successful, <c>False</c> otherwise.</returns>
+        public bool Validate(object validationContext, IDictionary contextParams, IValidationErrors errors)
+        {
+            if (Context != null)
+            {
+                validationContext = Context.GetValue(validationContext, contextParams);
+            }
+
+            if (validator == null)
+            {
+                validator = (IValidator) objectFactory.GetObject(Name);
+            }
+
+            return validator.Validate(validationContext, contextParams, errors);
+        }
+
+        /// <summary>
+        /// Callback that supplies the owning factory to an object instance.
+        /// </summary>
+        /// <value>
+        /// Owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// (may not be <see langword="null"/>). The object can immediately
+        /// call methods on the factory.
+        /// </value>
+        /// <remarks>
+        /// <p>
+        /// Invoked after population of normal object properties but before an init
+        /// callback like <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// method or a custom init-method.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of initialization errors.
+        /// </exception>
+        public IObjectFactory ObjectFactory
+        {
+            set { objectFactory = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/Validators/ConditionValidator.cs b/src/Spring/Spring.Core/Validation/Validators/ConditionValidator.cs
new file mode 100644
index 00000000..07a98cf6
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/Validators/ConditionValidator.cs
@@ -0,0 +1,88 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using Spring.Expressions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Validation
+{
+	/// <summary>
+	/// Evaluates validator test using condition evaluator.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: ConditionValidator.cs,v 1.5 2006/04/09 07:19:04 markpollack Exp $</version>
+	public class ConditionValidator : BaseValidator
+	{
+        #region Constructors
+
+	    /// <summary>
+	    /// Creates a new instance of the <see cref="ConditionValidator"/> class.
+	    /// </summary>
+	    public ConditionValidator()
+	    {}
+
+	    /// <summary>
+	    /// Creates a new instance of the <see cref="ConditionValidator"/> class.
+	    /// </summary>
+	    /// <param name="test">The expression to validate.</param>
+	    /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+	    public ConditionValidator(string test, string when) : base(test, when)
+	    {
+	        AssertUtils.ArgumentHasText(test, "test");
+	    }
+
+	    /// <summary>
+	    /// Creates a new instance of the <see cref="ConditionValidator"/> class.
+	    /// </summary>
+	    /// <param name="test">The expression to validate.</param>
+	    /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+	    public ConditionValidator(IExpression test, IExpression when) : base(test, when)
+	    {
+	        AssertUtils.ArgumentNotNull(test, "test");
+	    }
+
+	    #endregion
+
+	    /// <summary>
+		/// Evaluates the test using condition evaluator.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Test can be any logical expression that is supported by the Spring.NET logical
+		/// expression evaluation engine, and can use any variables that can be resolved 
+		/// by the variable resolver used by the validation engine.
+		/// </p>
+		/// </remarks>
+		/// <param name="objectToValidate">The object to validate.</param>
+		/// <returns>
+		/// <see lang="true"/> if the supplied <paramref name="objectToValidate"/> is valid.
+		/// </returns>
+		protected override bool Validate(object objectToValidate)
+		{
+			return Convert.ToBoolean(objectToValidate);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/Validators/CreditCardValidator.cs b/src/Spring/Spring.Core/Validation/Validators/CreditCardValidator.cs
new file mode 100644
index 00000000..e3c3c5f1
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/Validators/CreditCardValidator.cs
@@ -0,0 +1,321 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Expressions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// Perform credit card validations.
+    /// </summary>
+    /// <remarks>
+    /// By default, all supported card types are allowed. You can specify
+    /// which credit card type validator should be used by setting
+    /// the value of <see cref="CardType"/> property to a concrete <see cref="ICreditCardType"/>
+    /// instance.
+    /// </remarks>
+    public class CreditCardValidator : BaseValidator
+    {
+        #region Properties
+
+        /// <summary>
+        /// Credit card type validator to use.
+        /// </summary>
+        /// <remarks>
+        /// Can be concrete implementations of <see cref="ICreditCardType"/> 
+        /// interface. The following are available implementations:
+        /// <see cref="Visa"/>, <see cref="Mastercard"/>, <see cref="Amex"/>, 
+        /// <see cref="Discover"/>.
+        /// </remarks>
+        public ICreditCardType CardType
+        {
+            get { return m_cardType; }
+            set { m_cardType = value; }
+        }
+
+        #endregion
+        
+        #region Constructors
+               
+        /// <summary>
+        /// Creates a new instance of the <b>UrlValidator</b> class.
+        /// </summary>
+        public CreditCardValidator()
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the <b>UrlValidator</b> class.
+        /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        /// <param name="cardType">Credit Card type validator to use.</param>
+        public CreditCardValidator(string test, string when, ICreditCardType cardType)
+            : base(test, when)
+        {
+            AssertUtils.ArgumentHasText(test, "test");
+            this.m_cardType = cardType;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <b>UrlValidator</b> class.
+        /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        /// <param name="cardType">Credit Card type validator to use.</param>
+        public CreditCardValidator(IExpression test, IExpression when, ICreditCardType cardType)
+            : base(test, when)
+        {
+            AssertUtils.ArgumentNotNull(test, "test");
+            this.m_cardType = cardType;
+        }
+
+        #endregion
+
+        #region BaseValidator methods
+
+        /// <summary>
+        /// Validates the supplied <paramref name="objectToValidate"/>.
+        /// </summary>
+        /// <remarks>
+        /// In the case of the <see cref="CreditCardValidator"/> class,
+        /// the test should be a string variable that will be evaluated and the object
+        /// obtained as a result of this evaluation will be checked if it is
+        /// a valid credit card number.
+        /// </remarks>
+        /// <param name="objectToValidate">The object to validate.</param>
+        /// <returns>
+        /// <see lang="true"/> if the supplied <paramref name="objectToValidate"/> is valid 
+        /// credit card number.
+        /// </returns>
+        protected override bool Validate(object objectToValidate)
+        {
+            string text = objectToValidate as string;
+            if (StringUtils.IsNullOrEmpty(text))
+            {
+                return true;
+            }
+            
+            return IsValid(text);
+        }
+
+        #endregion
+
+        #region CreditCardValidator methods
+
+        /// <summary>
+        /// Checks if the <paramref name="card"/> is a valid credit card number.
+        /// </summary>
+        /// <param name="card">
+        /// The card number to validate.
+        /// </param>
+        /// <returns>
+        /// <b>true</b> if the card number is valid.
+        /// </returns>
+        public bool IsValid(String card)
+        {
+            // check card number length
+            if ((card == null) || (card.Length < 13) || (card.Length > 19))
+            {
+                return false;
+            }
+
+            // check if the card is a valid credit card number
+            if (!LuhnCheck(card))
+            {
+                return false;
+            }
+
+            // validate card with credit card type validator
+            if (CardType != null)
+            {
+                return ValidateCard(card);
+            } 
+            else
+            {
+                throw new ArgumentException("Property CardType cannot be null.");
+            }
+        }
+        
+        /// <summary>
+        /// Validates card number with the specified <see cref="CardType"/> validator.
+        /// </summary>
+        /// <param name="cardNumber">
+        /// Credit card number to validate.
+        /// </param>
+        /// <returns>
+        /// <b>true</b> if credit card number is a valid number of credit card type specified.
+        /// </returns>
+        private bool ValidateCard(string cardNumber)
+        {
+            String card = cardNumber == null ? null : cardNumber.Trim();
+            
+            if (card == null)
+            {
+                return false;
+            }
+            
+            return CardType.Matches(card);
+        }
+
+        /// <summary>
+        /// Checks for a valid credit card number.
+        /// </summary>
+        /// <param name="cardNumber">
+        /// Credit Card Number.
+        /// </param>
+        /// <returns>
+        /// <b>true</b> if the card number passes the LuhnCheck.
+        /// </returns>
+        private bool LuhnCheck(string cardNumber)
+        {
+            // number must be validated as 0..9 numeric first!!
+            int digits = cardNumber.Length;
+            int oddOrEven = digits & 1;
+            long sum = 0;
+            for (int count = 0; count < digits; count++)
+            {
+                int digit;
+                try
+                {
+                    digit = Int32.Parse(cardNumber[count] + "");
+                }
+                catch (FormatException)
+                {
+                    return false;
+                }
+
+                if (((count & 1) ^ oddOrEven) == 0)
+                { // not
+                    digit *= 2;
+                    if (digit > 9)
+                    {
+                        digit -= 9;
+                    }
+                }
+                sum += digit;
+            }
+
+            return (sum == 0) ? false : (sum % 10 == 0);
+        }
+
+        #endregion        
+
+        #region Data members
+
+        private ICreditCardType m_cardType;
+        
+        #endregion
+    }
+
+    #region CreditCardType classes
+
+    /// <summary>
+    /// CreditCardType interface defines how validation is performed
+    /// for one type/brand of credit card.
+    /// </summary>
+    public interface ICreditCardType
+    {
+        /// <summary>
+        /// Returns true if the card number matches this type of 
+        /// credit card.
+        /// </summary>
+        /// <param name="card">
+        /// The card number, never null.
+        /// </param>
+        /// <returns>
+        /// <b>true</b> if the number matches.
+        /// </returns>
+        bool Matches(String card);
+    }
+
+    /// <summary>
+    /// Visa credit card type validation support.
+    /// </summary>
+    public class Visa : ICreditCardType
+    {
+        private static readonly String PREFIX = "4";
+
+        /// <summary>
+        /// Indicates, wheter the given credit card number matches a visa number.
+        /// </summary>
+        public bool Matches(String card)
+        {
+            return (card.Substring(0, 1).Equals(PREFIX) && (card.Length == 13 || card.Length == 16));
+        }
+    }
+
+    /// <summary>
+    /// American Express credit card type validation support.
+    /// </summary>
+    public class Amex : ICreditCardType
+    {
+        private static readonly String PREFIX = "34,37,";
+
+        /// <summary>
+        /// Indicates, wheter the given credit card number matches an amex number.
+        /// </summary>
+        public bool Matches(String card)
+        {
+            String prefix2 = card.Substring(0, 2) + ",";
+            return ((PREFIX.IndexOf(prefix2) != -1) && (card.Length == 15));
+        }
+    }
+
+    /// <summary>
+    /// Discover credit card type validation support.
+    /// </summary>
+    public class Discover : ICreditCardType
+    {
+        private static readonly String PREFIX = "6011";
+
+        /// <summary>
+        /// Indicates, wheter the given credit card number matches a discover number.
+        /// </summary>
+        public bool Matches(String card)
+        {
+            return (card.Substring(0, 4).Equals(PREFIX) && (card.Length == 16));
+        }
+    }
+
+    /// <summary>
+    /// Mastercard credit card type validation support.
+    /// </summary>
+    public class Mastercard : ICreditCardType
+    {
+        private static readonly String PREFIX = "51,52,53,54,55,";
+
+        /// <summary>
+        /// Indicates, wheter the given credit card number matches a mastercard number.
+        /// </summary>
+        public bool Matches(String card)
+        {
+            String prefix2 = card.Substring(0, 2) + ",";
+            return ((PREFIX.IndexOf(prefix2) != -1) && (card.Length == 16));
+        }
+    }
+
+    #endregion
+}
diff --git a/src/Spring/Spring.Core/Validation/Validators/EmailValidator.cs b/src/Spring/Spring.Core/Validation/Validators/EmailValidator.cs
new file mode 100644
index 00000000..691fbb32
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/Validators/EmailValidator.cs
@@ -0,0 +1,115 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Text.RegularExpressions;
+using Spring.Expressions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// Perform email validations.
+    /// </summary>
+    /// <remarks>
+    /// <p/>
+    /// This implementation is not guaranteed to catch all possible errors in an 
+    /// email address. For example, an address like nobody@noplace.nowhere will 
+    /// pass validator, even though there is no TLD "nowhere".
+    /// </remarks>
+    /// <author>Goran Milosavljevic</author>    
+    public class EmailValidator : BaseValidator
+    {
+        #region Constructors
+        
+        /// <summary>
+        /// Creates a new instance of the <b>EmailValidator</b> class.
+        /// </summary>
+        public EmailValidator()
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the <b>EmailValidator</b> class.
+        /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public EmailValidator(string test, string when)
+            : base(test, when)
+        {
+            AssertUtils.ArgumentHasText(test, "test");
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <b>EmailValidator</b> class.
+        /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public EmailValidator(IExpression test, IExpression when)
+            : base(test, when)
+        {
+            AssertUtils.ArgumentNotNull(test, "test");
+        }
+
+        #endregion
+
+        #region BaseValidator methods
+
+        /// <summary>
+        /// Validates the supplied <paramref name="objectToValidate"/>.
+        /// </summary>
+        /// <remarks>
+        /// In the case of the <see cref="EmailValidator"/> class,
+        /// the test should be a string variable that will be evaluated and the object
+        /// obtained as a result of this evaluation will be checked if it is
+        /// a valid e-mail address.
+        /// </remarks>
+        /// <param name="objectToValidate">The object to validate.</param>
+        /// <returns>
+        /// <see lang="true"/> if the supplied <paramref name="objectToValidate"/> is valid 
+        /// e-mail address.
+        /// </returns>
+        protected override bool Validate(object objectToValidate)
+        {
+            string text = objectToValidate as string;
+            if (StringUtils.IsNullOrEmpty(text))
+            {
+                return true;
+            }
+
+            Match match = Regex.Match(text, emailCheck);
+            return match.Success && match.Index == 0 && match.Length == text.Length;
+        }
+
+        #endregion
+
+        #region Data members
+
+        /// <summary>
+        /// Regular expression used for validation of object passed to this <see cref="EmailValidator"/>.
+        /// </summary>
+        private static string emailCheck = @"^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$";
+        
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Validation/Validators/ISBNValidator.cs b/src/Spring/Spring.Core/Validation/Validators/ISBNValidator.cs
new file mode 100644
index 00000000..5c303125
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/Validators/ISBNValidator.cs
@@ -0,0 +1,167 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Text.RegularExpressions;
+using Spring.Expressions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// Validates that the object is valid ISBN-10 or ISBN-13 value.
+    /// </summary>
+    /// <author>Goran Milosavljevic</author>
+    public class ISBNValidator : BaseValidator
+    {                                                     
+        #region Constructors
+        
+        /// <summary>
+        /// Creates a new instance of the <b>ISBNValidator</b> class.
+        /// </summary>
+        public ISBNValidator()
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the <b>ISBNValidator</b> class.
+        /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public ISBNValidator(string test, string when)
+            : base(test, when)
+        {
+            AssertUtils.ArgumentHasText(test, "test");
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <b>ISBNValidator</b> class.
+        /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public ISBNValidator(IExpression test, IExpression when)
+            : base(test, when)
+        {
+            AssertUtils.ArgumentNotNull(test, "test");
+        }
+
+        #endregion
+
+        #region BaseValidator methods
+
+        /// <summary>
+        /// Validates the supplied <paramref name="objectToValidate"/>.
+        /// </summary>
+        /// <remarks>
+        /// In the case of the <see cref="ISBNValidator"/> class,
+        /// the test should be a string variable that will be evaluated and the object
+        /// obtained as a result of this evaluation will be tested using the ISBN-10 or
+        /// ISBN-13 validation rules.
+        /// </remarks>
+        /// <param name="objectToValidate">The object to validate.</param>
+        /// <returns>
+        /// <see lang="true"/> if the supplied <paramref name="objectToValidate"/> is valid ISBN.
+        /// </returns>
+        protected override bool Validate(object objectToValidate)
+        {
+            String isbn = objectToValidate as String;
+            if (StringUtils.IsNullOrEmpty(isbn))
+            {
+                return true;
+            }
+
+            return IsValid(isbn);
+        }                
+
+        #endregion
+
+        #region ISBNValidator methods
+        
+        /// <summary>
+        /// Validates <paramref name="isbn"/> against ISBN-10 or ISBN-13 validation 
+        /// rules.
+        /// </summary>
+        /// <param name="isbn">
+        /// ISBN string to validate.
+        /// </param>
+        /// <returns>
+        /// <b>true</b> if <paramref name="isbn"/> is a valid ISBN-10 or ISBN-13 code.
+        /// </returns>
+        private bool IsValid(String isbn)
+        {
+            String code = (isbn == null ? null : isbn.Trim().Replace("-", "").Replace(" ", ""));
+            
+            // check the length
+            if ((code == null) || (code.Length < 10 || code.Length>13))
+            {
+                return false;
+            }
+                                    
+            // validate/reformat using regular expression
+            Match match;
+            String pattern;
+            if (code.Length == 10)
+            {
+                pattern = ISBN10_PATTERN;
+            } 
+            else
+            {
+                pattern = ISBN13_PATTERN;
+            }
+
+            match = Regex.Match(code, pattern);
+            return match.Success && match.Index == 0 && match.Length == code.Length;
+        }                
+
+        #endregion
+
+        #region Data members
+
+        private static readonly String SEP = "(?:\\-|\\s)";
+        private static readonly String GROUP = "(\\d{1,5})";
+        private static readonly String PUBLISHER = "(\\d{1,7})";
+        private static readonly String TITLE = "(\\d{1,6})";
+        
+        /// <summary>
+        /// ISBN-10 consists of 4 groups of numbers separated by either 
+        /// dashes (-) or spaces.  
+        /// </summary>
+        /// <remarks>
+        /// The first group is 1-5 characters, second 1-7, third 1-6, 
+        /// and fourth is 1 digit or an X.
+        /// </remarks>
+        static readonly String ISBN10_PATTERN =  "^(?:(\\d{9}[0-9X])|(?:" + GROUP + SEP + PUBLISHER + SEP + TITLE + SEP + "([0-9X])))$";
+
+        /// <summary>
+        /// ISBN-13 consists of 5 groups of numbers separated by either 
+        /// dashes (-) or spaces.  
+        /// </summary>
+        /// <remarks>
+        /// The first group is 978 or 979, the second group is 
+        /// 1-5 characters, third 1-7, fourth 1-6, and fifth is 1 digit.
+        /// </remarks>
+        static readonly String ISBN13_PATTERN = "^(978|979)(?:(\\d{10})|(?:" + SEP + GROUP + SEP + PUBLISHER + SEP + TITLE + SEP + "([0-9])))$";
+        
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Core/Validation/Validators/RegularExpressionValidator.cs b/src/Spring/Spring.Core/Validation/Validators/RegularExpressionValidator.cs
new file mode 100644
index 00000000..b20bc2fc
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/Validators/RegularExpressionValidator.cs
@@ -0,0 +1,140 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Text.RegularExpressions;
+
+using Spring.Expressions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Validation
+{
+	/// <summary>
+	/// Validates that object matches specified regular expression.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The test expression must evaluate to a <see cref="System.String"/>;
+	/// otherwise, an exception is thrown.
+	/// </p>
+	/// </remarks>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: RegularExpressionValidator.cs,v 1.2 2006/04/09 07:19:04 markpollack Exp $</version>
+	public class RegularExpressionValidator : BaseValidator
+	{
+	    #region Fields
+
+	    private string expression = string.Empty;
+	    private RegexOptions options;
+
+	    #endregion
+
+        #region Constructors
+
+	    /// <summary>
+	    /// Creates a new instance of the <see cref="RegularExpressionValidator"/> class.
+	    /// </summary>
+	    public RegularExpressionValidator()
+	    {
+	    }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="RegularExpressionValidator"/> class.
+        /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        /// <param name="expression">The regular expression to match against.</param>
+        public RegularExpressionValidator(string test, string when, string expression) : base(test, when)
+	    {
+            AssertUtils.ArgumentHasText(test, "test");
+	        this.expression = expression;
+	    }
+
+	    /// <summary>
+	    /// Creates a new instance of the <see cref="RegularExpressionValidator"/> class.
+	    /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        /// <param name="expression">The regular expression to match against.</param>
+	    public RegularExpressionValidator(IExpression test, IExpression when, string expression) : base(test, when)
+	    {
+            AssertUtils.ArgumentNotNull(test, "test");
+	        this.expression = expression;
+	    }
+
+	    #endregion
+
+	    #region Properties
+
+	    /// <summary>
+	    /// The regular expression <b>text</b> to match against.
+	    /// </summary>
+	    /// <value>The regular expression <b>text</b>.</value>
+	    public string Expression
+	    {
+	        get { return expression; }
+	        set { expression = value; }
+	    }
+
+	    /// <summary>
+	    /// The <see cref="RegexOptions"/> for the regular expression evaluation.
+	    /// </summary>
+	    /// <value>The regular expression evaluation options.</value>
+	    /// <seealso cref="RegexOptions"/> 
+	    public RegexOptions Options
+	    {
+	        get { return options; }
+	        set { options = value; }
+	    }
+
+	    #endregion
+
+	    /// <summary>
+		/// Validates an object.
+		/// </summary>
+		/// <param name="objectToValidate">Object to validate.</param>
+		/// <returns>
+		/// <see lang="true"/> if the supplied <paramref name="objectToValidate"/>
+		/// object is valid.
+		/// </returns>
+		/// <exception cref="System.ArgumentException">
+		/// If the supplied <paramref name="objectToValidate"/> is not a
+		/// <see cref="System.String"/>
+		/// </exception>
+		protected override bool Validate(object objectToValidate)
+		{
+			string text = objectToValidate as string;
+			if (text == null)
+			{
+				throw new ArgumentException("Test for RegularExpressionValidator must evaluate to a string.");
+			}
+			if (!StringUtils.HasLength(text))
+			{
+				return true;
+			}
+			Match match = Regex.Match(text, this.Expression, this.Options);
+			return match.Success && match.Index == 0 && match.Length == text.Length;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/Validators/RequiredValidator.cs b/src/Spring/Spring.Core/Validation/Validators/RequiredValidator.cs
new file mode 100644
index 00000000..173e47dd
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/Validators/RequiredValidator.cs
@@ -0,0 +1,143 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using Spring.Expressions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// Validates that required value is not empty.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This validator uses following rules to determine if target value is valid:
+    /// <table>
+    ///     <tr>
+    ///         <th>Target <see cref="System.Type"/></th>
+    ///         <th>Valid Value</th>
+    ///     </tr>
+    ///     <tr>
+    ///         <td>A <see cref="System.String"/>.</td>
+    ///         <td>Not <see lang="null"/> or an empty string.</td>
+    ///     </tr>
+    ///     <tr>
+    ///         <td>A <see cref="System.DateTime"/>.</td>
+    ///         <td>Not <see cref="System.DateTime.MinValue"/> and not <see cref="System.DateTime.MaxValue"/>.</td>
+    ///     </tr>
+    ///     <tr>
+    ///         <td>One of the number types.</td>
+    ///         <td>Not zero.</td>
+    ///     </tr>
+    ///     <tr>
+    ///         <td>A <see cref="System.Char"/>.</td>
+    ///         <td>Not <see cref="System.Char.MinValue"/> or whitespace.</td>
+    ///     </tr>
+    ///     <tr>
+    ///         <td>Any reference type other than <see cref="System.String"/>.</td>
+    ///         <td>Not <see lang="null"/>.</td>
+    ///     </tr>
+    /// </table>
+    /// </p>
+    /// <p>
+    /// You cannot use this validator to validate any value types other than the ones
+    /// specified in the table above. 
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: RequiredValidator.cs,v 1.8 2008/03/21 14:12:02 markpollack Exp $</version>
+    public class RequiredValidator : BaseValidator
+    {
+        #region Constructors
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="RequiredValidator"/> class.
+        /// </summary>
+        public RequiredValidator()
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="RequiredValidator"/> class.
+        /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public RequiredValidator(string test, string when) : base(test, when)
+        {
+            AssertUtils.ArgumentHasText(test, "test");
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="RequiredValidator"/> class.
+        /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public RequiredValidator(IExpression test, IExpression when) : base(test, when)
+        {
+            AssertUtils.ArgumentNotNull(test, "test");
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Validates the supplied <paramref name="objectToValidate"/>.
+        /// </summary>
+        /// <remarks>
+        /// In the case of the <see cref="Spring.Validation.RequiredValidator"/> class,
+        /// the test should be a variable expression that will be evaluated and the object
+        /// obtained as a result of this evaluation will be tested using the rules described
+        /// in the class overview of the <see cref="Spring.Validation.RequiredValidator"/>
+        /// class.
+        /// </remarks>
+        /// <param name="objectToValidate">The object to validate.</param>
+        /// <returns>
+        /// <see lang="true"/> if the supplied <paramref name="objectToValidate"/> is valid.
+        /// </returns>
+        protected override bool Validate(object objectToValidate)
+        {
+            if (objectToValidate is String && StringUtils.IsNullOrEmpty((string) objectToValidate))
+            {
+                return false;
+            }
+            else if (objectToValidate is DateTime && (((DateTime) objectToValidate) == DateTime.MinValue || ((DateTime) objectToValidate) == DateTime.MaxValue))
+            {
+                return false;
+            }
+            else if (NumberUtils.IsInteger(objectToValidate) && NumberUtils.IsZero(objectToValidate))
+            {
+                return false;
+            }
+            else if (objectToValidate is Char && (((char) objectToValidate) == Char.MinValue || Char.IsWhiteSpace((char) objectToValidate)))
+            {
+                return false;
+            }
+            else if (NumberUtils.IsDecimal(objectToValidate) && NumberUtils.IsZero(objectToValidate))
+            {
+                return false;
+            }
+            return objectToValidate != null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Core/Validation/Validators/UrlValidator.cs b/src/Spring/Spring.Core/Validation/Validators/UrlValidator.cs
new file mode 100644
index 00000000..018bcd2f
--- /dev/null
+++ b/src/Spring/Spring.Core/Validation/Validators/UrlValidator.cs
@@ -0,0 +1,107 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Text.RegularExpressions;
+using Spring.Expressions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// Validates that the value is valid URL.
+    /// </summary>
+    /// <author>Goran Milosavljevic</author>
+    public class UrlValidator : BaseValidator
+    {
+        #region Constructors
+        
+        /// <summary>
+        /// Creates a new instance of the <b>UrlValidator</b> class.
+        /// </summary>
+        public UrlValidator()
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the <b>UrlValidator</b> class.
+        /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public UrlValidator(string test, string when)
+            : base(test, when)
+        {
+            AssertUtils.ArgumentHasText(test, "test");
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <b>UrlValidator</b> class.
+        /// </summary>
+        /// <param name="test">The expression to validate.</param>
+        /// <param name="when">The expression that determines if this validator should be evaluated.</param>
+        public UrlValidator(IExpression test, IExpression when)
+            : base(test, when)
+        {
+            AssertUtils.ArgumentNotNull(test, "test");
+        }
+
+        #endregion
+
+        #region BaseValidator methods
+
+        /// <summary>
+        /// Validates the supplied <paramref name="objectToValidate"/>.
+        /// </summary>
+        /// <remarks>
+        /// In the case of the <see cref="UrlValidator"/> class,
+        /// the test should be a string variable that will be evaluated and the object
+        /// obtained as a result of this evaluation will be tested using the URL validation rules.
+        /// </remarks>
+        /// <param name="objectToValidate">The object to validate.</param>
+        /// <returns>
+        /// <see lang="true"/> if the supplied <paramref name="objectToValidate"/> is valid.
+        /// </returns>
+        protected override bool Validate(object objectToValidate)
+        {
+            string text = objectToValidate as string;
+            if (StringUtils.IsNullOrEmpty(text))
+            {
+                return true;
+            }
+
+            Match match = Regex.Match(text, urlCheck);
+            return match.Success && match.Index == 0 && match.Length == text.Length;
+        }
+
+        #endregion
+
+        #region Data members
+
+        /// <summary>
+        /// Regular expression used for validation of object passed to this <see cref="UrlValidator"/>.
+        /// </summary>
+        private static string urlCheck = "((http|https)://)?[a-z0-9]+([-.]{1}[a-z0-9]+)*.[a-z]{2,5}(([0-9]{1,5})?/.*)?";
+        
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Data.NHibernate/AssemblyInfo.cs b/src/Spring/Spring.Data.NHibernate/AssemblyInfo.cs
new file mode 100644
index 00000000..5d721b48
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle("Spring.Net NHibernate 1.0 support")]
+[assembly: AssemblyDescription("Interfaces and classes that provide NHibernate 1.0 support in Spring.Net")]
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateAccessor.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateAccessor.cs
new file mode 100644
index 00000000..453eb164
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateAccessor.cs
@@ -0,0 +1,730 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using AopAlliance.Intercept;
+using Common.Logging;
+using NHibernate;
+using NHibernate.Impl;
+using NHibernate.Type;
+using Spring.Core.TypeResolution;
+using Spring.Dao;
+using Spring.Data.Support;
+using Spring.Objects.Factory;
+using IInterceptor=NHibernate.IInterceptor;
+using ICriteria=NHibernate.ICriteria;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+    /// Base class for HibernateTemplate defining common
+    /// properties like SessionFactory and flushing behavior.
+	/// </summary>
+	/// <remarks>
+	/// <p>Not intended to be used directly. See HibernateTemplate.
+	/// </p>
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: HibernateAccessor.cs,v 1.6 2008/01/25 15:04:39 markpollack Exp $</version>
+	public abstract class HibernateAccessor : IInitializingObject, IObjectFactoryAware
+	{
+
+        private Type criteriaType;
+	    
+	    #region Constants
+
+		/// <summary>
+		/// The <see cref="ILog"/> instance for this class. 
+		/// </summary>
+		private readonly ILog log = LogManager.GetLogger(typeof (HibernateAccessor));
+	    
+	    #endregion
+
+		#region Constructor (s)
+
+	    /// <summary>
+		/// Initializes a new instance of the <see cref="HibernateAccessor"/> class.
+        /// </summary>
+		public HibernateAccessor()
+		{
+	        
+		}
+
+		#endregion
+
+	    
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets if a new Session should be created when no transactional Session
+        /// can be found for the current thread.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if allowed to create non-transaction session;
+        /// otherwise, <c>false</c>.
+        /// </value>
+        /// <remarks>
+        /// 	<p>HibernateTemplate is aware of a corresponding Session bound to the
+        /// current thread, for example when using HibernateTransactionManager.
+        /// If allowCreate is true, a new non-transactional Session will be created
+        /// if none found, which needs to be closed at the end of the operation.
+        /// If false, an InvalidOperationException will get thrown in this case.
+        /// </p>
+        /// </remarks>
+        public abstract bool AllowCreate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to always
+        /// use a new Hibernate Session for this template.
+        /// </summary>
+        /// <value><c>true</c> if always use new session; otherwise, <c>false</c>.</value>
+        /// <remarks>
+        /// 	<p>
+        /// Default is "false"; if activated, all operations on this template will
+        /// work on a new NHibernate ISession even in case of a pre-bound ISession
+        /// (for example, within a transaction).
+        /// </p>
+        /// 	<p>Within a transaction, a new NHibernate ISession used by this template
+        /// will participate in the transaction through using the same ADO.NET
+        /// Connection. In such a scenario, multiple Sessions will participate
+        /// in the same database transaction.
+        /// </p>
+        /// 	<p>Turn this on for operations that are supposed to always execute
+        /// independently, without side effects caused by a shared NHibernate ISession.
+        /// </p>
+        /// </remarks>
+        public abstract bool AlwaysUseNewSession
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Set whether to expose the native Hibernate Session to IHibernateCallback
+        /// code. Default is "false": a Session proxy will be returned,
+        /// suppressing <code>close</code> calls and automatically applying
+        /// query cache settings and transaction timeouts.
+        /// </summary>
+        /// <value><c>true</c> if expose native session; otherwise, <c>false</c>.</value>
+        public abstract bool ExposeNativeSession
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the template flush mode.
+        /// </summary>
+        /// <remarks>
+        /// Default is Auto. Will get applied to any <b>new</b> ISession
+        /// created by the template.
+        /// </remarks>
+        /// <value>The template flush mode.</value>
+        public abstract TemplateFlushMode TemplateFlushMode
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the entity interceptor that allows to inspect and change
+        /// property values before writing to and reading from the database.
+        /// </summary>
+        /// <remarks>
+        /// Will get applied to any <b>new</b> ISession created by this object.
+        /// <p>Such an interceptor can either be set at the ISessionFactory level,
+        /// i.e. on LocalSessionFactoryObject, or at the ISession level, i.e. on
+        /// HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
+        /// It's preferable to set it on LocalSessionFactoryObject or HibernateTransactionManager
+        /// to avoid repeated configuration and guarantee consistent behavior in transactions.
+        /// </p>
+        /// </remarks>
+        /// <value>The interceptor.</value>
+        public abstract IInterceptor EntityInterceptor
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Set the object name of a Hibernate entity interceptor that allows to inspect
+        /// and change property values before writing to and reading from the database.
+        /// </summary>
+        /// <remarks>
+        /// Will get applied to any new Session created by this transaction manager.
+        /// <p>Requires the object factory to be known, to be able to resolve the object
+        /// name to an interceptor instance on session creation. Typically used for
+        /// prototype interceptors, i.e. a new interceptor instance per session.
+        /// </p>
+        /// <p>Can also be used for shared interceptor instances, but it is recommended
+        /// to set the interceptor reference directly in such a scenario.
+        /// </p>
+        /// </remarks>
+        public abstract string EntityInterceptorObjectName
+        {
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the session factory that should be used to create
+        /// NHibernate ISessions.
+        /// </summary>
+        /// <value>The session factory.</value>
+        public abstract ISessionFactory SessionFactory
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Set the object factory instance.
+        /// </summary>
+        public abstract IObjectFactory ObjectFactory
+        {
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to 
+        /// cache all queries executed by this template.
+        /// </summary>
+        /// <remarks>
+        /// If this is true, all IQuery and ICriteria objects created by
+        /// this template will be marked as cacheable (including all
+        /// queries through find methods).
+        /// <p>To specify the query region to be used for queries cached
+        /// by this template, set the QueryCacheRegion property.
+        /// </p>
+        /// </remarks>
+        /// <value><c>true</c> if cache queries; otherwise, <c>false</c>.</value>
+        public abstract bool CacheQueries
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the cache region for queries executed by this template.
+        /// </summary>
+        /// <remarks>
+        /// If this is specified, it will be applied to all IQuery and ICriteria objects
+        /// created by this template (including all queries through find methods).
+        /// <p>The cache region will not take effect unless queries created by this
+        /// template are configured to be cached via the CacheQueries property.
+        /// </p>
+        /// </remarks>
+        /// <value>The query cache region.</value>
+        public abstract string QueryCacheRegion
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the fetch size for this HibernateTemplate.
+        /// </summary>
+        /// <value>The size of the fetch.</value>
+        /// <remarks>This is important for processing
+        /// large result sets: Setting this higher than the default value will increase
+        /// processing speed at the cost of memory consumption; setting this lower can
+        /// avoid transferring row data that will never be read by the application.
+        /// <p>Default is 0, indicating to use the driver's default.</p>
+        /// </remarks>
+        public abstract int FetchSize
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum number of rows for this HibernateTemplate.
+        /// </summary>
+        /// <value>The max results.</value>
+        /// <remarks>
+        /// This is important
+        /// for processing subsets of large result sets, avoiding to read and hold
+        /// the entire result set in the database or in the ADO.NET driver if we're
+        /// never interested in the entire result in the first place (for example,
+        /// when performing searches that might return a large number of matches).
+        /// <p>Default is 0, indicating to use the driver's default.</p>
+        /// </remarks>
+        public abstract int MaxResults
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Set the ADO.NET exception translator for this instance.
+        /// Applied to System.Data.Common.DbException (or provider specific exception type
+        /// in .NET 1.1) thrown by callback code, be it direct
+        /// DbException or wrapped Hibernate ADOExceptions.
+        /// <p>The default exception translator is either a ErrorCodeExceptionTranslator
+        /// if a DbProvider is available, or a FalbackExceptionTranslator otherwise
+        /// </p>
+        /// </summary>
+        /// <value>The ADO exception translator.</value>
+        public abstract IAdoExceptionTranslator AdoExceptionTranslator
+        {
+            set;
+            get;
+        }
+	    
+        /// <summary>
+        /// Gets a Session for use by this template.
+        /// </summary>
+        /// <value>The session.</value>
+        /// <remarks>
+        /// - Returns a new Session in case of "alwaysUseNewSession" (using the same ADO.NET connection as a transaction Session, if applicable)
+        /// - a pre-bound Session in case of "AllowCreate" is set to false (not the default) 
+        /// - or a pre-bound Session or new Session if no transactional or other pre-bound Session exists.
+        /// </remarks>
+        protected ISession Session
+        {
+            get
+            {
+                if (AlwaysUseNewSession)
+                {
+                    return SessionFactoryUtils.GetNewSession(SessionFactory, EntityInterceptor);
+                }
+                else if (!AllowCreate)
+                {
+                    return SessionFactoryUtils.GetSession(SessionFactory, false);
+                }
+                else
+                {
+                    return SessionFactoryUtils.GetSession(
+                        SessionFactory, EntityInterceptor, AdoExceptionTranslator);
+                }
+
+            }
+
+        }
+	    
+    	#endregion
+
+		#region Methods
+
+        /// <summary>
+        /// Apply the flush mode that's been specified for this accessor
+        /// to the given Session.
+        /// </summary>
+        /// <param name="session">The current Hibernate Session.</param>
+        /// <param name="existingTransaction">if set to <c>true</c>
+        /// if executing within an existing transaction.</param>
+        /// <returns>
+        /// the previous flush mode to restore after the operation,
+        /// or <code>null</code> if none
+        /// </returns>
+        protected FlushModeHolder ApplyFlushMode(ISession session, bool existingTransaction) 
+        {
+            if (TemplateFlushMode == TemplateFlushMode.Never) 
+            {
+                if (existingTransaction) 
+                {
+                    FlushMode previousFlushMode = session.FlushMode;
+                    if (previousFlushMode != FlushMode.Never) 
+                    {
+                        session.FlushMode = FlushMode.Never;
+                        return new FlushModeHolder(previousFlushMode);
+                    }
+                }
+                else 
+                {
+                    session.FlushMode = FlushMode.Never;
+                }
+            }
+            else if (TemplateFlushMode == TemplateFlushMode.Eager) 
+            {
+                if (existingTransaction) 
+                {
+                    FlushMode previousFlushMode = session.FlushMode;
+                    if (previousFlushMode != FlushMode.Auto) 
+                    {
+                        session.FlushMode = FlushMode.Auto;
+                        return new FlushModeHolder(previousFlushMode);
+                    }
+                }
+                else 
+                {
+                    // rely on default FlushMode.AUTO
+                }
+            }
+            else if (TemplateFlushMode == TemplateFlushMode.Commit) 
+            {
+                if (existingTransaction) 
+                {
+                    FlushMode previousFlushMode = session.FlushMode;
+                    if (previousFlushMode == FlushMode.Auto) 
+                    {
+                        session.FlushMode = FlushMode.Commit;
+                        return new FlushModeHolder(previousFlushMode);
+                    }
+                }
+                else 
+                {
+                    session.FlushMode = FlushMode.Commit;
+                }
+            }
+            return new FlushModeHolder();
+        }
+
+	
+        /// <summary>
+        ///  Flush the given Hibernate Session if necessary.
+        /// </summary>
+        /// <param name="session">The current Hibernate Session.</param>
+        /// <param name="existingTransaction">if set to <c>true</c> 
+        /// if executing within an existing transaction.</param>
+        protected void FlushIfNecessary(ISession session, bool existingTransaction)
+        {
+            if (TemplateFlushMode == TemplateFlushMode.Eager ||
+                (!existingTransaction && TemplateFlushMode != TemplateFlushMode.Never)) 
+            {
+                log.Debug("Eagerly flushing Hibernate session");
+                session.Flush();
+            }
+        }
+
+        /// <summary>
+        /// Convert the given HibernateException to an appropriate exception from the
+        /// <code>org.springframework.dao</code> hierarchy. Will automatically detect
+        /// wrapped ADO.NET Exceptions and convert them accordingly.
+        /// </summary>
+        /// <param name="ex">HibernateException that occured.</param>
+        /// <returns>
+        /// The corresponding DataAccessException instance
+        /// </returns>
+        /// <remarks>
+        /// The default implementation delegates to SessionFactoryUtils
+        /// and convertAdoAccessException. Can be overridden in subclasses.
+        /// </remarks>
+        public virtual DataAccessException ConvertHibernateAccessException(HibernateException ex)
+        {
+            if (ex is ADOException)
+            {
+                return ConvertAdoAccessException((ADOException) ex);
+            }   
+            return SessionFactoryUtils.ConvertHibernateAccessException(ex);
+        }
+
+        /// <summary>
+        /// Converts the ADO.NET access exception to an appropriate exception from the
+        /// <code>org.springframework.dao</code> hierarchy. Can be overridden in subclasses.
+        /// </summary>
+        /// <param name="ex">ADOException that occured, wrapping underlying ADO.NET exception.</param>
+        /// <returns>
+        /// the corresponding DataAccessException instance
+        /// </returns>
+        protected virtual DataAccessException ConvertAdoAccessException(ADOException ex) 
+        {
+                return AdoExceptionTranslator.Translate(
+                    "Hibernate operation: " + ex.Message, null, ex.InnerException);            
+        }
+
+        /// <summary>
+        /// Converts the ADO.NET access exception to an appropriate exception from the
+        /// <code>org.springframework.dao</code> hierarchy. Can be overridden in subclasses.
+        /// </summary>
+        /// <remarks>
+        /// <note>
+        /// Note that a direct SQLException can just occur when callback code
+        /// performs direct ADO.NET access via <code>ISession.Connection()</code>.
+        /// </note>
+        /// </remarks>
+        /// <param name="ex">The ADO.NET exception.</param>
+        /// <returns>The corresponding DataAccessException instance</returns>
+        protected virtual DataAccessException ConvertAdoAccessException(Exception ex) 
+        {           
+            return AdoExceptionTranslator.Translate("Hibernate operation", null, ex);
+        }
+
+	    
+        /// <summary>
+        /// Prepare the given IQuery object, applying cache settings and/or
+        /// a transaction timeout.
+        /// </summary>
+        /// <param name="queryObject">The query object to prepare.</param>
+        public virtual void PrepareQuery(IQuery queryObject)
+        {
+            if (CacheQueries)
+            {
+                queryObject.SetCacheable(true);
+                if (QueryCacheRegion != null)
+                {
+                    queryObject.SetCacheRegion(QueryCacheRegion);
+                }
+            }
+                      
+            if (FetchSize > 0)
+            {
+                AbstractQueryImpl queryImpl = queryObject as AbstractQueryImpl;
+                if (queryImpl != null)
+                {
+                    queryImpl.SetFetchSize(FetchSize);
+                }
+                else
+                {
+                    log.Warn("Could not set FetchSize for IQuery.  Expected Implemention to be of type AbstractQueryImpl");
+                }
+            }
+            
+            if (MaxResults > 0)
+            {
+                queryObject.SetMaxResults(MaxResults);
+            }
+
+            SessionFactoryUtils.ApplyTransactionTimeout(queryObject, SessionFactory);
+
+        }
+
+        /// <summary>
+        /// Apply the given name parameter to the given Query object.
+        /// </summary>
+        /// <param name="queryObject">The query object.</param>
+        /// <param name="paramName">Name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">The NHibernate type of the parameter (or <code>null</code> if none specified)</param>
+        public virtual void ApplyNamedParameterToQuery(IQuery queryObject, string paramName, object value, IType type)
+        {
+
+            if (value is ICollection)
+            {
+                if (type != null)
+                {
+                    queryObject.SetParameterList(paramName, (ICollection)value, type);
+                }
+                else
+                {
+                    queryObject.SetParameterList(paramName, (ICollection)value);
+                }
+            }
+            else if (value is Object[])
+            {
+
+                //TODO investigate support for this conversion.
+                if (type != null)
+                {
+                    queryObject.SetParameterList(paramName, (Object[])value, type);
+                }
+                else
+                {
+                    queryObject.SetParameterList(paramName, (Object[])value);
+                }
+            }
+            else
+            {
+                if (type != null)
+                {
+                    queryObject.SetParameter(paramName, value, type);
+                }
+                else
+                {
+                    queryObject.SetParameter(paramName, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Prepare the given Criteria object, applying cache settings and/or
+        /// a transaction timeout.
+        /// </summary>
+        /// <remarks>
+        /// <para>Note that for NHibernate 1.2 this only works if the
+        /// implementation is of the type CriteriaImpl, which should generally
+        /// be the case.  The SetFetchSize method is not available on the
+        /// ICriteria interface
+        /// </para>
+        /// <para>This is a no-op for NHibernate 1.0.x since
+        /// the SetFetchSize method is not on the ICriteria interface and
+        /// the implementation class is has internal access.
+        /// </para>
+        /// <para>To remove the method completely for Spring's NHibernate 1.0 
+        /// support while reusing code for NHibernate 1.2 would not be 
+        /// possible.  So now this ineffectual operation is left in tact for
+        /// NHibernate 1.0.2 support.</para>
+        /// </remarks>
+        /// <param name="criteria">The criteria object to prepare</param>
+        public void PrepareCriteria(ICriteria criteria)
+        {
+            if (CacheQueries)
+            {
+                criteria.SetCacheable(true);
+                if (QueryCacheRegion != null)
+                {
+                    criteria.SetCacheRegion(QueryCacheRegion);
+                }
+            }
+
+
+
+            if (FetchSize > 0)
+            {
+                //TODO see if we can optimize performance.
+                //CriteriaImpl is internal in NH 1.0.x
+                object[] args = new object[] { FetchSize };
+                try
+                {
+                    Type t = TypeResolutionUtils.ResolveType("NHibernate.Impl.CriteriaImpl, NHibernate");
+                    if (t != null)
+                    {
+                        t.InvokeMember("SetFetchSize", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance
+                                                       | BindingFlags.InvokeMethod,
+                                       null, criteria, args);
+                    }
+                }
+                catch (TypeLoadException e)
+                {
+                    log.Warn("Can't set FetchSize for ICriteria", e);
+                }
+            }
+            
+            if (MaxResults > 0)
+            {
+                criteria.SetMaxResults(MaxResults);
+            }
+
+            SessionFactoryUtils.ApplyTransactionTimeout(criteria, SessionFactory);
+        }
+	    
+	    private void InitCriteriaType()
+	    {
+	                    
+            try
+            {
+                criteriaType = TypeResolutionUtils.ResolveType("Hibernate.Impl.CriteriaImpl, NHibernate");
+            }
+            catch (TypeLoadException e)
+            {
+                log.Warn("CriteriaImpl not available. FetchSize can not be set on ICriteria objects", e);
+            }
+	    }
+	    
+		#endregion
+
+        /// <summary>
+        /// Ensure SessionFactory is not null
+        /// </summary>
+	    public virtual void AfterPropertiesSet()
+	    {
+            if (SessionFactory == null) 
+            {
+                throw new ArgumentException("sessionFactory is required");
+            }
+	    }
+
+        #region Helper Classes
+        /// <summary>
+        /// Helper class to determine if the FlushMode enumeration
+        /// was changed from its default value
+        /// </summary>
+        protected class FlushModeHolder
+        {
+            /// <summary>
+            /// Gets or sets a value indicating whether the FlushMode
+            /// property was set..
+            /// </summary>
+            /// <value><c>true</c> if FlushMode was set; otherwise, <c>false</c>.</value>
+            public bool ModeWasSet
+            {
+                get { return modeWasSet; }
+                set { modeWasSet = value; }
+            }
+
+            /// <summary>
+            /// Gets or sets the FlushMode.
+            /// </summary>
+            /// <value>The FlushMode.</value>
+            public FlushMode Mode
+            {
+                get { return flushMode; }
+                set { flushMode = value; }
+            }
+
+            private bool modeWasSet = false;
+            private FlushMode flushMode;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="FlushModeHolder"/> class.
+            /// </summary>
+            public FlushModeHolder()
+            {                
+            }
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="FlushModeHolder"/> class.
+            /// </summary>
+            /// <param name="mode">The flush mode.</param>
+            public FlushModeHolder(FlushMode mode)
+            {
+                Mode = mode;
+                ModeWasSet = true;
+            }
+
+        }
+	    
+
+        #endregion
+	    
+
+	}
+
+    internal class CloseSuppressingMethodInterceptor : IMethodInterceptor
+    {
+        private HibernateAccessor hibernateAccessor;
+
+        public CloseSuppressingMethodInterceptor(HibernateAccessor accessor)
+        {
+            hibernateAccessor = accessor;
+        }
+
+        public object Invoke(IMethodInvocation invocation)
+        {
+            //anything special for equals/hashcode?
+            if (invocation.Method.Name.Equals("Close"))
+            {
+                return null;
+            }
+            else
+            {
+                object retValue = invocation.Proceed();
+                if (retValue is IQuery)
+                {
+                    hibernateAccessor.PrepareQuery((IQuery)retValue);
+                }
+                if (retValue is ICriteria)
+                {
+                    hibernateAccessor.PrepareCriteria((ICriteria)retValue);
+                }
+                return retValue;
+            }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateAdoException.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateAdoException.cs
new file mode 100644
index 00000000..6ec61040
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateAdoException.cs
@@ -0,0 +1,91 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using NHibernate;
+using Spring.Dao;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+    /// Hibernate-specific subclass of UncategorizedDataAccessException,
+    /// for ADO.NET exceptions that Hibernate rethrew and could not be
+    /// mapped into the DAO exception heirarchy.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: HibernateAdoException.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+	[Serializable]
+	public class HibernateAdoException : UncategorizedDataAccessException
+	{
+
+		#region Constructor (s)
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateAdoException"/> class.
+        /// </summary>
+        public HibernateAdoException() : base() {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="HibernateAdoException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public HibernateAdoException( string message ) : base( message ) {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="HibernateAdoException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception from the underlying data access API - ADO.NET
+        /// </param>        
+        public HibernateAdoException( string message, ADOException rootCause ) : base( message, rootCause ) {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="HibernateAdoException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected HibernateAdoException( SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+
+
+		#endregion
+
+
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateDelegate.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateDelegate.cs
new file mode 100644
index 00000000..b05380d8
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateDelegate.cs
@@ -0,0 +1,43 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NHibernate;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+    /// <summary>
+    /// Gets called by HibernateTemplate with an active
+    /// Hibernate Session. Does not need to care about activating or closing
+    /// the Session, or handling transactions.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Allows for returning a result object created within the callback, i.e.
+    /// a domain object or a collection of domain objects. Note that there's
+    /// special support for single step actions: see HibernateTemplate.find etc.
+    /// </p>
+    /// </remarks>
+    public delegate object HibernateDelegate(ISession session);
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateObjectRetrievalFailureException.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateObjectRetrievalFailureException.cs
new file mode 100644
index 00000000..a8953b84
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateObjectRetrievalFailureException.cs
@@ -0,0 +1,109 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using NHibernate;
+using Spring.Dao;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// Hibernate-specific subclass of ObjectRetrievalFailureException.
+	/// </summary>	 
+	/// <remarks>
+	/// Converts Hibernate's UnresolvableObjectException, ObjectNotFoundException,
+	/// ObjectDeletedException, and WrongClassException.
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: HibernateObjectRetrievalFailureException.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+	[Serializable]
+	public class HibernateObjectRetrievalFailureException : ObjectRetrievalFailureException
+	{
+
+		#region Constructor (s)
+		
+        /// <summary>
+		/// Initializes a new instance of the <see cref="HibernateObjectRetrievalFailureException"/> class.
+        /// </summary>
+		public HibernateObjectRetrievalFailureException()
+		{
+		}
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateObjectRetrievalFailureException"/> class.
+        /// </summary>
+        /// <param name="ex">The ex.</param>
+        public HibernateObjectRetrievalFailureException(UnresolvableObjectException ex) : base(ex.PersistentClass, ex.Identifier, ex.Message, ex)        
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateObjectRetrievalFailureException"/> class.
+        /// </summary>
+        /// <param name="ex">The ex.</param>
+        public HibernateObjectRetrievalFailureException(ObjectNotFoundException ex) : base(ex.PersistentClass, ex.Identifier, ex.Message, ex)
+        
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateObjectRetrievalFailureException"/> class.
+        /// </summary>
+        /// <param name="ex">The ex.</param>
+        public HibernateObjectRetrievalFailureException(ObjectDeletedException ex) : base(ex.PersistentClass, ex.Identifier, ex.Message, ex) 
+        {
+
+        }
+
+        //TODO investigate WrongClassException.Type as equivalent to ex.PersistentClass
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateObjectRetrievalFailureException"/> class.
+        /// </summary>
+        /// <param name="ex">The ex.</param>
+        public HibernateObjectRetrievalFailureException(WrongClassException ex) : base(ex.Type, ex.Identifier, ex.Message, ex)
+        {
+          
+        }
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="HibernateObjectRetrievalFailureException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected HibernateObjectRetrievalFailureException(
+            SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+
+
+		#endregion
+
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateOptimisticLockingFailureException.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateOptimisticLockingFailureException.cs
new file mode 100644
index 00000000..f2cac64e
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateOptimisticLockingFailureException.cs
@@ -0,0 +1,91 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using NHibernate;
+using Spring.Dao;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+    /// <summary>
+    /// Hibernate-specific subclass of ObjectOptimisticLockingFailureException.
+    /// </summary>
+    /// <remarks>
+    /// Converts Hibernate's StaleObjectStateException.
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: HibernateOptimisticLockingFailureException.cs,v 1.2 2008/04/08 20:26:37 markpollack Exp $</version>
+    [Serializable]
+    public class HibernateOptimisticLockingFailureException : ObjectOptimisticLockingFailureException
+    {
+        #region Fields
+
+        #endregion
+
+        #region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateOptimisticLockingFailureException"/> class.
+        /// </summary>
+        public HibernateOptimisticLockingFailureException()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateOptimisticLockingFailureException"/> class.
+        /// </summary>
+        /// <param name="ex">The StaleObjectStateException.</param>
+        public HibernateOptimisticLockingFailureException(StaleObjectStateException ex) : base(ex.PersistentType, ex.Identifier, ex.Message, ex)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="HibernateOptimisticLockingFailureException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected HibernateOptimisticLockingFailureException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+
+        #endregion
+
+        #region Properties
+
+        #endregion
+
+        #region Methods
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateQueryException.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateQueryException.cs
new file mode 100644
index 00000000..9955ff77
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateQueryException.cs
@@ -0,0 +1,85 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using NHibernate;
+using Spring.Dao;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+    /// <summary>
+    /// Hibernate-specific subclass of InvalidDataAccessResourceUsageException,
+    /// thrown on invalid HQL query syntax.
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: HibernateQueryException.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+    [Serializable]
+    public class HibernateQueryException : InvalidDataAccessResourceUsageException
+    {
+        #region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateQueryException"/> class.
+        /// </summary>
+        public HibernateQueryException()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateQueryException"/> class.
+        /// </summary>
+        /// <param name="ex">The ex.</param>
+        public HibernateQueryException(QueryException ex) : base(ex.Message, ex)
+        {
+        }
+
+        /// <summary>
+        /// Gets the query string that was invalid.
+        /// </summary>
+        /// <value>The query string that was invalid.</value>
+        public string QueryString
+        {
+            get { return ((QueryException) this.InnerException).QueryString; }
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="HibernateQueryException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected HibernateQueryException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateSystemException.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateSystemException.cs
new file mode 100644
index 00000000..ec1a79ef
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateSystemException.cs
@@ -0,0 +1,80 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using NHibernate;
+using Spring.Dao;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+    /// Hibernate-specific subclass of UncategorizedDataAccessException,
+    /// for Hibernate system errors that do not match any concrete
+    /// <code>Spring.Dao</code> exceptions.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: HibernateSystemException.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+	[Serializable]
+	public class HibernateSystemException : UncategorizedDataAccessException
+	{
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="HibernateSystemException"/> class.
+                /// </summary>
+		public 	HibernateSystemException()
+		{
+
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateSystemException"/> class.
+        /// </summary>
+        /// <param name="cause">The cause.</param>
+        public HibernateSystemException(HibernateException cause) : base(cause != null ? cause.Message : null, cause)
+        {
+            
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="HibernateSystemException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected HibernateSystemException( SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+
+
+
+		#endregion
+
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs
new file mode 100644
index 00000000..35b962fa
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs
@@ -0,0 +1,2238 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Common.Logging;
+using Spring.Aop.Framework;
+using Spring.Data.Common;
+using Spring.Data.Support;
+using IInterceptor = NHibernate.IInterceptor;
+
+using NHibernate;
+using NHibernate.Type;
+using Spring.Dao;
+using Spring.Objects.Factory;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+    /// <summary>
+    /// Helper class that simplifies NHibernate data access code
+    /// </summary>
+    /// <remarks>
+    /// <p>Typically used to implement data access or business logic services that
+    /// use NHibernate within their implementation but are Hibernate-agnostic in their
+    /// interface. The latter or code calling the latter only have to deal with
+    /// domain objects.</p>
+    ///
+    /// <p>The central method is Execute supporting Hibernate access code
+    /// implementing the HibernateCallback interface. It provides NHibernate Session
+    /// handling such that neither the IHibernateCallback implementation nor the calling
+    /// code needs to explicitly care about retrieving/closing NHibernate Sessions,
+    /// or handling Session lifecycle exceptions. For typical single step actions,
+    /// there are various convenience methods (Find, Load, SaveOrUpdate, Delete).
+    /// </p>
+    /// 
+    /// <p>Can be used within a service implementation via direct instantiation
+    /// with a ISessionFactory reference, or get prepared in an application context
+    /// and given to services as an object reference. Note: The ISessionFactory should
+    /// always be configured as an object in the application context, in the first case
+    /// given to the service directly, in the second case to the prepared template.
+    /// </p>
+    /// 
+    /// <p>This class can be considered as direct alternative to working with the raw
+    /// Hibernate Session API (through SessionFactoryUtils.Session).
+    /// </p>
+    /// 
+    /// <p>LocalSessionFactoryObject is the preferred way of obtaining a reference
+    /// to a specific NHibernate ISessionFactory.
+    /// </p>
+    /// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: HibernateTemplate.cs,v 1.3 2008/01/24 17:29:16 markpollack Exp $</version>
+	public class HibernateTemplate : HibernateAccessor, IHibernateOperations
+	{
+		#region Fields
+
+        /// <summary>
+        /// The <see cref="ILog"/> instance for this class. 
+        /// </summary>
+        private readonly ILog log = LogManager.GetLogger(typeof(HibernateTemplate));
+
+        private bool checkWriteOperations = true;
+
+
+        private bool exposeNativeSession = false;
+
+        private bool alwaysUseNewSession = false;
+        private int maxResults = 0;
+        private TemplateFlushMode templateFlushMode = TemplateFlushMode.Auto;
+        private bool allowCreate = true;
+        private ISessionFactory sessionFactory;
+        private object entityInterceptor;
+        private IObjectFactory objectFactory; 
+        private bool cacheQueries = false;
+        private string queryCacheRegion;
+        private int fetchSize = 0;
+
+        private IAdoExceptionTranslator adoExceptionTranslator;
+        
+        private readonly object syncRoot = new object();
+        private ProxyFactory sessionProxyFactory;
+
+        #endregion
+
+        #region Constructor (s)
+        /// <summary>
+		/// Initializes a new instance of the <see cref="HibernateTemplate"/> class.
+        /// </summary>
+		public 	HibernateTemplate()
+		{
+
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateTemplate"/> class.
+        /// </summary>
+        /// <remarks>The default for creating a new non-transactional
+        /// session when no transactional Session can be found for the current thread
+        /// is set to true.</remarks>
+        /// <param name="sessionFactory">The session factory to create sessions.</param>
+        public HibernateTemplate(ISessionFactory sessionFactory) 
+        {
+            SessionFactory = sessionFactory;
+            AfterPropertiesSet();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateTemplate"/> class.
+        /// </summary>
+        /// <param name="sessionFactory">The session factory to create sessions.</param>        
+        /// <param name="allowCreate">if set to <c>true</c> allow creation
+        /// of a new non-transactional when no transactional Session can be found 
+        /// for the current thread.</param>
+        public HibernateTemplate(ISessionFactory sessionFactory, bool allowCreate)
+        {
+            SessionFactory = sessionFactory;
+            AllowCreate = allowCreate;
+            AfterPropertiesSet();
+        }
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Gets or sets if a new Session should be created when no transactional Session
+        /// can be found for the current thread.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if allowed to create non-transaction session;
+        /// otherwise, <c>false</c>.
+        /// </value>
+        /// <remarks>
+        /// 	<p>HibernateTemplate is aware of a corresponding Session bound to the
+        /// current thread, for example when using HibernateTransactionManager.
+        /// If allowCreate is true, a new non-transactional Session will be created
+        /// if none found, which needs to be closed at the end of the operation.
+        /// If false, an InvalidOperationException will get thrown in this case.
+        /// </p>
+        /// </remarks>
+        public override bool AllowCreate
+        {
+            get
+            {
+
+                return allowCreate;
+            }
+            set { allowCreate = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to always
+        /// use a new Hibernate Session for this template.
+        /// </summary>
+        /// <value><c>true</c> if always use new session; otherwise, <c>false</c>.</value>
+        /// <remarks>
+        /// 	<p>
+        /// Default is "false"; if activated, all operations on this template will
+        /// work on a new NHibernate ISession even in case of a pre-bound ISession
+        /// (for example, within a transaction).
+        /// </p>
+        /// 	<p>Within a transaction, a new NHibernate ISession used by this template
+        /// will participate in the transaction through using the same ADO.NET
+        /// Connection. In such a scenario, multiple Sessions will participate
+        /// in the same database transaction.
+        /// </p>
+        /// 	<p>Turn this on for operations that are supposed to always execute
+        /// independently, without side effects caused by a shared NHibernate ISession.
+        /// </p>
+        /// </remarks>
+        public override bool AlwaysUseNewSession
+        {
+            get { return alwaysUseNewSession; }
+            set { alwaysUseNewSession = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the template flush mode.
+        /// </summary>
+        /// <remarks>
+        /// Default is Auto. Will get applied to any <b>new</b> ISession
+        /// created by the template.
+        /// </remarks>
+        /// <value>The template flush mode.</value>
+        public override TemplateFlushMode TemplateFlushMode
+        {
+            get { return templateFlushMode; }
+            set { templateFlushMode = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the entity interceptor that allows to inspect and change
+        /// property values before writing to and reading from the database.
+        /// </summary>
+        /// <remarks>
+        /// Will get applied to any <b>new</b> ISession created by this object.
+        /// <p>Such an interceptor can either be set at the ISessionFactory level,
+        /// i.e. on LocalSessionFactoryObject, or at the ISession level, i.e. on
+        /// HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
+        /// It's preferable to set it on LocalSessionFactoryObject or HibernateTransactionManager
+        /// to avoid repeated configuration and guarantee consistent behavior in transactions.
+        /// </p>
+        /// </remarks>
+        /// <value>The interceptor.</value>
+        /// <exception cref="InvalidOperationException">If object factory is not set and need to retrieve entity interceptor by name.</exception>
+        public override IInterceptor EntityInterceptor
+        {
+            get
+            {
+                if (this.entityInterceptor is string)
+                {
+                    if (this.objectFactory == null)
+                    {
+                        throw new InvalidOperationException("Cannot get entity interceptor via object name if no object factory set");
+                    }
+                    return (IInterceptor)this.objectFactory.GetObject((String)this.entityInterceptor, typeof(IInterceptor));
+                }
+
+                return (IInterceptor)entityInterceptor;
+            }
+            set
+            {
+                entityInterceptor = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the name of the cache region for queries executed by this template.
+        /// </summary>
+        /// <remarks>
+        /// If this is specified, it will be applied to all IQuery and ICriteria objects
+        /// created by this template (including all queries through find methods).
+        /// <p>The cache region will not take effect unless queries created by this
+        /// template are configured to be cached via the CacheQueries property.
+        /// </p>
+        /// </remarks>
+        /// <value>The query cache region.</value>
+        public override string QueryCacheRegion
+        {
+            get { return queryCacheRegion; }
+            set { queryCacheRegion = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to 
+        /// cache all queries executed by this template.
+        /// </summary>
+        /// <remarks>
+        /// If this is true, all IQuery and ICriteria objects created by
+        /// this template will be marked as cacheable (including all
+        /// queries through find methods).
+        /// <p>To specify the query region to be used for queries cached
+        /// by this template, set the QueryCacheRegion property.
+        /// </p>
+        /// </remarks>
+        /// <value><c>true</c> if cache queries; otherwise, <c>false</c>.</value>
+        public override bool CacheQueries
+        {
+            get { return cacheQueries; }
+            set { cacheQueries = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum number of rows for this HibernateTemplate.
+        /// </summary>
+        /// <value>The max results.</value>
+        /// <remarks>
+        /// This is important
+        /// for processing subsets of large result sets, avoiding to read and hold
+        /// the entire result set in the database or in the ADO.NET driver if we're
+        /// never interested in the entire result in the first place (for example,
+        /// when performing searches that might return a large number of matches).
+        /// <p>Default is 0, indicating to use the driver's default.</p>
+        /// </remarks>
+        public override int MaxResults
+        {
+            get { return maxResults; }
+            set { maxResults = value; }
+        }
+
+        /// <summary>
+        /// Set whether to expose the native Hibernate Session to IHibernateCallback
+        /// code. Default is "false": a Session proxy will be returned,
+        /// suppressing <code>close</code> calls and automatically applying
+        /// query cache settings and transaction timeouts.
+        /// </summary>
+        /// <value><c>true</c> if expose native session; otherwise, <c>false</c>.</value>
+        public override bool ExposeNativeSession
+        {
+            get { return exposeNativeSession; }
+            set { exposeNativeSession = value; }
+        }
+        /// <summary>
+        /// Gets or sets  whether to check that the Hibernate Session is not in read-only mode
+        /// in case of write operations (save/update/delete).
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if check that the Hibernate Session is not in read-only mode
+        /// in case of write operations; otherwise, <c>false</c>.
+        /// </value>
+        /// <remarks>
+        /// Default is "true", for fail-fast behavior when attempting write operations
+        /// within a read-only transaction. Turn this off to allow save/update/delete
+        /// on a Session with flush mode NEVER.
+        /// </remarks>
+        public virtual bool CheckWriteOperations
+        {
+            get { return checkWriteOperations; }
+            set { checkWriteOperations = value; }
+        }
+
+        /// <summary>
+        /// Set the object name of a Hibernate entity interceptor that allows to inspect
+        /// and change property values before writing to and reading from the database.
+        /// </summary>
+        /// <remarks>
+        /// Will get applied to any new Session created by this transaction manager.
+        /// <p>Requires the object factory to be known, to be able to resolve the object
+        /// name to an interceptor instance on session creation. Typically used for
+        /// prototype interceptors, i.e. a new interceptor instance per session.
+        /// </p>
+        /// <p>Can also be used for shared interceptor instances, but it is recommended
+        /// to set the interceptor reference directly in such a scenario.
+        /// </p>
+        /// </remarks>
+        /// <value>The name of the entity interceptor in the object factory/application context.</value>
+        public override string EntityInterceptorObjectName
+        {
+            set
+            {
+                this.entityInterceptor = value;
+            }
+        }
+
+        /// <summary>
+        /// Set the object factory instance.
+        /// </summary>
+        /// <value>The object factory instance</value>
+        public override IObjectFactory ObjectFactory
+        {
+            set
+            {
+                objectFactory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the session factory that should be used to create
+        /// NHibernate ISessions.
+        /// </summary>
+        /// <value>The session factory.</value>
+        public override ISessionFactory SessionFactory
+        {
+            get { return sessionFactory; }
+            set
+            {
+                sessionFactory = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the fetch size for this HibernateTemplate.
+        /// </summary>
+        /// <value>The size of the fetch.</value>
+        /// <remarks>This is important for processing
+        /// large result sets: Setting this higher than the default value will increase
+        /// processing speed at the cost of memory consumption; setting this lower can
+        /// avoid transferring row data that will never be read by the application.
+        /// <p>Default is 0, indicating to use the driver's default.</p>
+        /// </remarks>
+        public override int FetchSize
+        {
+            get { return fetchSize; }
+            set { fetchSize = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the proxy factory.
+        /// </summary>
+        /// <remarks>This may be useful to set if you create many instances of 
+        /// HibernateTemplate and/or HibernateDaoSupport.  This allows the same
+        /// ProxyFactory implementation to be used thereby limiting the
+        /// number of dynamic proxy types created in the temporary assembly, which
+        /// are never garbage collected due to .NET runtime semantics.
+        /// </remarks>
+        /// <value>The proxy factory.</value>
+        public virtual ProxyFactory ProxyFactory
+        {
+            get { return sessionProxyFactory;  }
+            set { sessionProxyFactory = value; }
+        }
+
+        #endregion
+
+        #region IHibernateOperations Members
+
+        /// <summary>
+        /// Set the ADO.NET exception translator for this instance.
+        /// Applied to System.Data.Common.DbException (or provider specific exception type
+        /// in .NET 1.1) thrown by callback code, be it direct
+        /// DbException or wrapped Hibernate ADOExceptions.
+        /// <p>The default exception translator is either a ErrorCodeExceptionTranslator
+        /// if a DbProvider is available, or a FalbackExceptionTranslator otherwise
+        /// </p>
+        /// </summary>
+        /// <value>The ADO exception translator.</value>
+        public override IAdoExceptionTranslator AdoExceptionTranslator
+        {
+            set { adoExceptionTranslator = value; }
+            get
+            {
+                if (adoExceptionTranslator == null)
+                {
+                    adoExceptionTranslator = SessionFactoryUtils.NewAdoExceptionTranslator(SessionFactory);
+                }               
+                return adoExceptionTranslator;
+            }
+        }
+
+
+        /// <summary>
+        /// Delegate function that clears the session.
+        /// </summary>
+        /// <param name="session">The hibernate session.</param>
+        /// <returns>null</returns>
+        protected object ClearAction(ISession session)
+        {
+            session.Clear();
+            return null;
+        }
+
+        /// <summary>
+        /// Flush all pending saves, updates and deletes to the database.
+        /// </summary>
+        /// <remarks>
+        /// Only invoke this for selective eager flushing, for example when ADO.NET code
+        /// needs to see certain changes within the same transaction. Else, it's preferable
+        /// to rely on auto-flushing at transaction completion.
+        /// </remarks>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Flush()
+        {
+            Execute(new HibernateDelegate(FlushAction), true);
+        }
+
+        private object FlushAction(ISession session)
+        {
+            session.Flush();
+            return null;
+        }
+
+        /// <summary>
+        /// Return the persistent instance of the given entity type
+        /// with the given identifier, or <code>null</code> if not found.
+        /// </summary>
+        /// <param name="entityType">The type.</param>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <returns>The persistent instance, or <code>null</code> if not found</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public object Get(Type entityType, object id)
+        {
+            return Get(entityType, id, null);
+        }
+
+        /// <summary>
+        /// Return the persistent instance of the given entity type
+        /// with the given identifier, or <code>null</code> if not found.
+        /// Obtains the specified lock mode if the instance exists.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <param name="id">The lock mode to obtain.</param>
+        /// <param name="lockMode">The lock mode.</param>
+        /// the persistent instance, or <code>null</code> if not found
+        /// <returns>the persistent instance, or null if not found</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public object Get(Type type, object id, LockMode lockMode)
+        {
+            return Execute(new GetByTypeHibernateCallback(type, id, lockMode),true);
+        
+        }
+
+        /// <summary>
+        /// Return the persistent instance of the given entity class
+        /// with the given identifier, throwing an exception if not found.
+        /// </summary>
+        /// <param name="entityType">Type of the entity.</param>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <returns>The persistent instance</returns>
+        /// <exception cref="ObjectRetrievalFailureException">If not found</exception>     
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception> 
+        public object Load(Type entityType, object id)
+        {
+            return Load(entityType, id, null);
+        }
+
+        /// <summary>
+        /// Return the persistent instance of the given entity class
+        ///  with the given identifier, throwing an exception if not found.
+        /// Obtains the specified lock mode if the instance exists.
+        /// </summary>
+        /// <param name="entityType">Type of the entity.</param>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <param name="lockMode">The lock mode.</param>
+        /// <returns>The persistent instance</returns>
+        /// <exception cref="ObjectRetrievalFailureException">If not found</exception>     
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception> 
+        public object Load(Type entityType, object id, LockMode lockMode)
+        {
+            return Execute(new LoadByTypeHibernateCallback(entityType, id, lockMode),true);
+        
+        }
+
+        /// <summary>
+        /// Load the persistent instance with the given identifier
+        /// into the given object, throwing an exception if not found.
+        /// </summary>
+        /// <param name="entity">Entity the object (of the target class) to load into.</param>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <exception cref="ObjectRetrievalFailureException">If object not found.</exception>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Load(object entity, object id)
+        {
+            Execute(new LoadByEntityHibernateCallback(entity, id),true);        
+        }
+
+        /// <summary>
+        /// Return all persistent instances of the given entity class.
+        /// Note: Use queries or criteria for retrieving a specific subset.
+        /// </summary>
+        /// <param name="entityType">Type of the entity.</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception> 
+        public IList LoadAll(Type entityType)
+        {
+            return (IList)Execute(new LoadAllByTypeHibernateCallback(this, entityType),true); 
+        }
+
+        /// <summary>
+        /// Re-read the state of the given persistent instance.
+        /// </summary>
+        /// <param name="entity">The persistent instance to re-read.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Refresh(object entity)
+        {
+            Refresh(entity, null);
+        }
+
+        /// <summary>
+        /// Re-read the state of the given persistent instance.
+        /// Obtains the specified lock mode for the instance.
+        /// </summary>
+        /// <param name="entity">The persistent instance to re-read.</param>
+        /// <param name="lockMode">The lock mode to obtain.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Refresh(object entity, LockMode lockMode)
+        {
+            Execute(new RefreshHibernateCallback(entity, lockMode),true); 
+        }
+
+        /// <summary>
+        /// Obtain the specified lock level upon the given object, implicitly
+        /// checking whether the corresponding database entry still exists
+        /// (throwing an OptimisticLockingFailureException if not found).
+        /// </summary>
+        /// <param name="entity">The he persistent instance to lock.</param>
+        /// <param name="lockMode">The lock mode to obtain.</param>
+        /// <exception cref="ObjectOptimisticLockingFailureException">If not found</exception>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Lock(object entity, LockMode lockMode)
+        {
+            Execute(new LockHibernateCallback(entity, lockMode),true); 
+        }
+
+        /// <summary>
+        /// Persist the given transient instance.
+        /// </summary>
+        /// <param name="entity">The transient instance to persist.</param>
+        /// <returns>The generated identifier.</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public object Save(object entity)
+        {
+            return Execute(new SaveObjectHibernateCallback(this, entity),true); 
+        }
+
+        /// <summary>
+        /// Persist the given transient instance with the given identifier.
+        /// </summary>
+        /// <param name="entity">The transient instance to persist.</param>
+        /// <param name="id">The identifier to assign.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Save(object entity, object id)
+        {
+             Execute(new SaveObjectWithIdHibernateCallback(this, entity, id),true); 
+        }
+
+        /// <summary>
+        /// Update the given persistent instance.
+        /// </summary>
+        /// <param name="entity">The persistent instance to update.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Update(object entity)
+        {
+            Update(entity, null);
+        }
+
+        /// <summary>
+        /// Update the given persistent instance.
+        /// Obtains the specified lock mode if the instance exists, implicitly
+        /// checking whether the corresponding database entry still exists
+        /// (throwing an OptimisticLockingFailureException if not found).
+        /// </summary>
+        /// <param name="entity">The persistent instance to update.</param>
+        /// <param name="lockMode">The lock mode to obtain.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Update(object entity, LockMode lockMode)
+        {
+             Execute(new UpdateObjectHibernateCallback(this, entity, lockMode),true); 
+        }
+
+        /// <summary>
+        /// Save or update the given persistent instance,
+        /// according to its id (matching the configured "unsaved-value"?).
+        /// </summary>
+        /// <param name="entity">Tthe persistent instance to save or update
+        /// (to be associated with the Hibernate Session).</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void SaveOrUpdate(object entity)
+        {
+            Execute(new SaveOrUpdateObjectHibernateCallback(this, entity),true);         
+        }
+
+        /// <summary>
+        /// Save or update all given persistent instances,
+        /// according to its id (matching the configured "unsaved-value"?).
+        /// </summary>
+        /// <param name="entities">Tthe persistent instances to save or update
+        /// (to be associated with the Hibernate Session)he entities.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void SaveOrUpdateAll(ICollection entities)
+        {
+            Execute(new SaveOrUpdateAllHibernateCallback(this, entities), true); 
+        }
+
+        /// <summary>
+        /// Save or update the contents of given persistent object,
+        /// according to its id (matching the configured "unsaved-value"?).
+        /// Will copy the contained fields to an already loaded instance
+        /// with the same id, if appropriate.
+        /// </summary>
+        /// <param name="entity">The persistent object to save or update.
+        /// (<i>not</i> necessarily to be associated with the Hibernate Session)
+        /// </param>
+        /// <returns>The actually associated persistent object.
+        /// (either an already loaded instance with the same id, or the given object)</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public object SaveOrUpdateCopy(object entity)
+        {
+              return Execute(new SaveOrUpdateCopyHibernateCallback(this, entity),true);
+        }
+
+
+        /// <summary>
+        /// Remove all objects from the Session cache, and cancel all pending saves,
+        /// updates and deletes.
+        /// </summary>
+        public void Clear()
+        {
+            Execute(new HibernateDelegate(ClearAction), true);
+        }
+
+
+
+        /// <summary>
+        /// Determines whether the given object is in the Session cache.
+        /// </summary>
+        /// <param name="entity">the persistence instance to check.</param>
+        /// <returns>
+        /// 	<c>true</c> if session cache contains the specified entity; otherwise, <c>false</c>.
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public bool Contains(object entity)
+        {
+            return (bool)Execute(new ContainsHibernateCallback(entity));
+        }
+
+        /// <summary>
+        /// Remove the given object from the Session cache.
+        /// </summary>
+        /// <param name="entity">The persistent instance to evict.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Evict(object entity)
+        {
+            Execute(new EvictHibernateCallback(entity), true);
+       
+        }
+
+
+
+        /// <summary>
+        /// Delete the given persistent instance.
+        /// </summary>
+        /// <param name="entity">The persistent instance to delete.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Delete(object entity)
+        {
+            Delete(entity, null);
+        }
+
+
+        /// <summary>
+        /// Delete the given persistent instance.
+        /// </summary>
+        /// <param name="entity">Tthe persistent instance to delete.</param>
+        /// <param name="lockMode">The lock mode to obtain.</param>
+        /// <remarks>
+        /// Obtains the specified lock mode if the instance exists, implicitly
+        /// checking whether the corresponding database entry still exists
+        /// (throwing an OptimisticLockingFailureException if not found).
+        /// </remarks>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Delete(object entity, LockMode lockMode)
+        {
+             Execute(new DeleteLockModeHibernateCallback(this, entity, lockMode), true);
+        }
+
+        /// <summary>
+        /// Delete all objects returned by the query.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language.</param>
+        /// <returns>The number of entity instances deleted.</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public int Delete(string queryString)
+        {
+            return Delete(queryString, (Object[]) null, (IType[]) null);
+        }
+
+        /// <summary>
+        ///  Delete all objects returned by the query.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language.</param>
+        /// <param name="value">The value of the parameter.</param>
+        /// <param name="type">The Hibernate type of the parameter (or <code>null</code>).</param>
+        /// <returns>The number of entity instances deleted.</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public int Delete(string queryString, object value, IType type)
+        {
+            return Delete(queryString, new Object[] {value}, new IType[] {type});
+        }
+
+        /// <summary>
+        /// Delete all objects returned by the query.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language.</param>
+        /// <param name="values">The values of the parameters.</param>
+        /// <param name="types"> Hibernate types of the parameters (or <code>null</code>)</param>
+        /// <returns>The number of entity instances deleted.</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If length for argument values and types are not equal.</exception>
+        public int Delete(String queryString, Object[] values, IType[] types)
+        {
+            if (values != null && types != null && values.Length != types.Length) 
+            {
+                throw new ArgumentOutOfRangeException("values", "Length of values array must match length of types array");
+            }
+            return (int)Execute(new DeletebyQueryHibernateCallback(this, queryString, values, types),true);
+        
+        }
+
+
+        /// <summary>
+        /// Delete all given persistent instances.
+        /// </summary>
+        /// <param name="entities">The persistent instances to delete.</param>
+        /// <remarks>
+        /// This can be combined with any of the find methods to delete by query
+        /// in two lines of code, similar to Session's delete by query methods.
+        /// </remarks>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void DeleteAll(ICollection entities)
+        {   
+            Execute(new DeleteAllHibernateCallback(this, entities),true);        
+        }
+
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <remarks>
+        /// Application exceptions thrown by the action object get propagated to the
+        /// caller (can only be unchecked). Hibernate exceptions are transformed into
+        /// appropriate DAO ones. Allows for returning a result object, i.e. a domain
+        /// object or a collection of domain objects.
+        /// <p>Note: Callback code is not supposed to handle transactions itself!
+        /// Use an appropriate transaction manager like HibernateTransactionManager.
+        /// Generally, callback code must not touch any Session lifecycle methods,
+        /// like close, disconnect, or reconnect, to let the template do its work.
+        /// </p>
+        /// </remarks>
+        /// <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+        /// <returns>a result object returned by the action, or <code>null</code>
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public object Execute(HibernateDelegate del)
+        {
+            return Execute(new ExecuteHibernateCallbackUsingDelegate(del));
+        }
+
+        /// <summary>
+        /// Execute the action specified by the delegate within a Session.
+        /// </summary>
+        /// <param name="del">The HibernateDelegate that specifies the action
+        /// to perform.</param>
+        /// <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+        /// callback code.</param>
+        /// <returns>a result object returned by the action, or <code>null</code>
+        /// </returns>
+        public object Execute(HibernateDelegate del, bool exposeNativeSession)
+        {
+            return Execute(new ExecuteHibernateCallbackUsingDelegate(del), true);
+        }
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <param name="action">The callback object that specifies the Hibernate action.</param>
+        /// <returns>
+        /// a result object returned by the action, or <code>null</code>
+        /// </returns>
+        /// <remarks>
+        /// Application exceptions thrown by the action object get propagated to the
+        /// caller (can only be unchecked). Hibernate exceptions are transformed into
+        /// appropriate DAO ones. Allows for returning a result object, i.e. a domain
+        /// object or a collection of domain objects.
+        /// <p>Note: Callback code is not supposed to handle transactions itself!
+        /// Use an appropriate transaction manager like HibernateTransactionManager.
+        /// Generally, callback code must not touch any Session lifecycle methods,
+        /// like close, disconnect, or reconnect, to let the template do its work.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public object Execute(IHibernateCallback action)
+        {
+            return Execute(action, ExposeNativeSession);
+        }
+
+        /// <summary>
+        /// Execute the specified action assuming that the result object is a List.
+        /// </summary>
+        /// <remarks>
+        /// This is a convenience method for executing Hibernate find calls or
+        /// queries within an action.
+        /// </remarks>
+        /// <param name="action">The calback object that specifies the Hibernate action.</param>
+        /// <returns>A IList returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList ExecuteFind(IHibernateCallback action)
+        {
+		    Object result = Execute(action, ExposeNativeSession);
+		    if (result != null && !(result is IList)) {
+			    throw new InvalidDataAccessApiUsageException(
+					    "Result object returned from HibernateCallback isn't a List: [" + result + "]");
+		    }
+		    return (IList) result;
+        }
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <param name="action">callback object that specifies the Hibernate action.</param>
+        /// <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+        /// callback code.</param>
+        /// <returns>
+        /// a result object returned by the action, or <code>null</code>
+        /// </returns>
+        public object Execute(IHibernateCallback action, bool exposeNativeSession)
+        {
+            ISession session = Session;
+            
+            bool existingTransaction = SessionFactoryUtils.IsSessionTransactional(session, SessionFactory);
+            if (existingTransaction) 
+            {
+                if(log.IsDebugEnabled) log.Debug("Found thread-bound Session for HibernateTemplate");
+            }
+
+            FlushModeHolder previousFlushModeHolder = new FlushModeHolder();
+            try 
+            {
+                previousFlushModeHolder = ApplyFlushMode(session, existingTransaction);
+                ISession sessionToExpose = (exposeNativeSession ? session : CreateSessionProxy(session));
+                Object result = action.DoInHibernate(sessionToExpose);
+                FlushIfNecessary(session, existingTransaction);
+                return result;
+            }
+            catch (ADOException ex)
+            {
+                IDbProvider dbProvider = SessionFactoryUtils.GetDbProvider(SessionFactory);
+                if (dbProvider != null && dbProvider.IsDataAccessException(ex.InnerException))
+                {
+                    throw ConvertAdoAccessException(ex);
+                }
+                else
+                {
+                    throw new HibernateSystemException(ex);
+                }
+            }
+            catch (HibernateException ex) 
+            {
+                throw ConvertHibernateAccessException(ex);
+            }
+            catch (Exception ex) 
+            {
+                IDbProvider dbProvider = SessionFactoryUtils.GetDbProvider(SessionFactory);
+                if (dbProvider != null && dbProvider.IsDataAccessException(ex))
+                {
+                    throw ConvertAdoAccessException(ex);
+                }
+                else
+                {
+                    // Callback code throw application exception or other non DB related exception.
+                    throw;
+                }
+            }
+            finally 
+            {
+                if (existingTransaction) 
+                {
+                    if (log.IsDebugEnabled) log.Debug("Not closing pre-bound Hibernate Session after HibernateTemplate");
+                    if (previousFlushModeHolder.ModeWasSet) 
+                    {
+                        session.FlushMode = previousFlushModeHolder.Mode;
+                    }
+                }
+                else 
+                {
+                   // Never use deferred close for an explicitly new Session.
+                    if (AlwaysUseNewSession)
+                    {
+                        SessionFactoryUtils.CloseSession(session);
+                    }
+                    else
+                    {
+                        SessionFactoryUtils.CloseSessionOrRegisterDeferredClose(session, SessionFactory);                        
+                    }                                     
+                }
+            }
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <returns>
+        /// a List containing 0 or more persistent instances
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList Find(string queryString)
+        {
+            return Find(queryString, (object[])null, (IType[])null );
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding
+        /// one value to a "?" parameter in the query string.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <param name="value">the value of the parameter</param>
+        /// <returns>
+        /// a List containing 0 or more persistent instances
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList Find(string queryString, object value)
+        {
+            return Find(queryString, new object[] {value}, (IType[]) null);
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding one value
+        /// to a "?" parameter of the given type in the query string.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <param name="value">The value of the parameter.</param>
+        /// <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+        /// <returns>
+        /// a List containing 0 or more persistent instances
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList Find(string queryString, object value, IType type)
+        {
+            return Find(queryString, new object[] {value}, new IType[] {type});
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a
+        /// number of values to "?" parameters in the query string.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <param name="values">the values of the parameters</param>
+        /// <returns>a List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList Find(string queryString, object[] values)
+        {
+            return Find(queryString, values, (IType[]) null);        
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a number of
+        /// values to "?" parameters of the given types in the query string.
+        /// </summary>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+        /// <returns>
+        /// a List containing 0 or more persistent instances
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentException">If values and types are not null and their lengths are not equal</exception>          
+        public IList Find(string queryString, object[] values, IType[] types)
+        {
+            if (values != null && types != null && values.Length != types.Length) 
+            {
+                throw new ArgumentException("Length of values array must match length of types array");                
+            }
+            return (IList)Execute(new FindHibernateCallback(this, queryString, values, types),true);
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding
+        /// one value to a named parameter in the query string.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">The name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <returns>a List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList FindByNamedParam(string queryName, string paramName, object value)
+        {
+            return FindByNamedParam(queryName, paramName, value, null);
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding
+        /// one value to a named parameter in the query string.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">The name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList FindByNamedParam(string queryName, string paramName, object value, IType type)
+        {
+            return FindByNamedParam(queryName, new string[] {paramName}, new object[] {value}, new IType[] {type});	
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a
+        /// number of values to named parameters in the query string.
+        /// </summary>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList FindByNamedParam(string queryString, string[] paramNames, object[] values)
+        {
+            return FindByNamedParam(queryString, paramNames, values, null);
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a
+        /// number of values to named parameters in the query string.
+        /// </summary>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+        /// if paramNames length is not equal to types length (when types is not null)</exception>
+        public IList FindByNamedParam(string queryString, string[] paramNames, object[] values, IType[] types)
+        {
+            if (paramNames.Length != values.Length) 
+            {
+                throw new ArgumentOutOfRangeException("paramNames","Length of paramNames array must match length of values array");
+            }
+            if (types != null && paramNames.Length != types.Length) 
+            {
+                throw new ArgumentOutOfRangeException("paramNames","Length of paramNames array must match length of types array");
+            }
+
+            return (IList)Execute(new FindByNamedParamHibernateCallback(this, queryString, paramNames, values, types),true);
+
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList FindByNamedQuery(string queryName)
+        {
+            return FindByNamedQuery(queryName, (object[]) null, (IType[]) null);
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a "?" parameter in the query string.
+        ///  A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList FindByNamedQuery(string queryName, object value)
+        {
+            return FindByNamedQuery(queryName, new object[] {value}, (IType[]) null);
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a "?" parameter in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList FindByNamedQuery(string queryName, object value, IType type)
+        {
+            return FindByNamedQuery(queryName, new object[] { value }, new IType[] { type });
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding a
+        /// number of values to "?" parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList FindByNamedQuery(string queryName, object[] values)
+        {
+            return FindByNamedQuery(queryName, values, (IType[]) null);
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding a
+        /// number of values to "?" parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If values and types are not null and their lengths differ.</exception>        
+        public IList FindByNamedQuery(string queryName, object[] values, IType[] types)
+        {
+            if (values != null && types != null && values.Length != types.Length) 
+            {
+                throw new ArgumentOutOfRangeException("Length of values array must match length of types array");
+            }
+            return (IList)Execute(new FindByNamedQueryHibernateCallback(this, queryName, values, types),true);
+
+
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a named parameter in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">Name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList FindByNamedQueryAndNamedParam(string queryName, string paramName, object value)
+        {
+            return FindByNamedQueryAndNamedParam(queryName, paramName, value, null);
+	
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a named parameter in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">Name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">The Hibernate type of the parameter (or <code>null</code>)</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        public IList FindByNamedQueryAndNamedParam(string queryName, string paramName, object value, IType type)
+        {
+            return FindByNamedQueryAndNamedParam(
+                queryName, new string[] {paramName}, new object[] {value}, new IType[] {type});
+	
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// number of values to named parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters.</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList FindByNamedQueryAndNamedParam(string queryName, string[] paramNames, object[] values)
+        {
+            return FindByNamedQueryAndNamedParam(queryName, paramNames, values, null);
+	
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// number of values to named parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters.</param>
+        /// <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+        /// if paramNames length is not equal to types length (when types is not null)</exception>                
+        public IList FindByNamedQueryAndNamedParam(string queryName, string[] paramNames, object[] values, IType[] types)
+        {
+            if (paramNames != null && values != null && paramNames.Length != values.Length) 
+            {
+                throw new ArgumentOutOfRangeException("paramNames","Length of paramNames array must match length of values array");
+            }
+            if (paramNames != null && types != null && paramNames.Length != types.Length) 
+            {
+                throw new ArgumentOutOfRangeException("paramNams","Length of paramNames array must match length of types array");
+            }
+            return (IList)Execute(new FindByNamedQueryAndNamedParamHibernateCallback(this, queryName, paramNames, values, types),true);
+
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding the properties
+        /// of the given object to  named parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="valueObject">The values of the parameters</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList FindByNamedQueryAndValueObject(string queryName, object valueObject)
+        {
+            return (IList)Execute(new FindByNamedQueryAndValueObjectHibernateCallback(this, queryName, valueObject),true);
+
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding the properties
+        /// of the given object to <i>named</i> parameters in the query string.
+        /// </summary>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>       
+        /// <param name="valueObject">The values of the parameters</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList FindByValueObject(string queryString, object valueObject)
+        {
+            return (IList)Execute(new FindByValueObjectHibernateCallback(this, queryString, valueObject), true);
+        }
+
+        #endregion
+
+        #region Methods
+
+
+        /// <summary>
+        /// Create a close-suppressing proxy for the given Hibernate Session.
+        /// The proxy also prepares returned Query and Criteria objects.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <returns>The session proxy.</returns>
+        public virtual ISession CreateSessionProxy(ISession session)
+        {
+            //TODO can move to HibernateAccessor and make protected
+            //     if issue reported with AOP+Multiple Threads resolve.
+            //     have not been able to reproduce so added lock as a precaution.
+            //     
+            lock (syncRoot)
+            {
+                if (sessionProxyFactory == null)
+                {
+                    sessionProxyFactory = new ProxyFactory();
+                    sessionProxyFactory.AddAdvice(new CloseSuppressingMethodInterceptor(this));
+                }
+
+                sessionProxyFactory.Target = session;
+
+                return (ISession)sessionProxyFactory.GetProxy();
+            }
+        }
+        
+        /// <summary>
+        /// Check whether write operations are allowed on the given Session.
+        /// </summary>
+        /// <remarks>
+        /// Default implementation throws an InvalidDataAccessApiUsageException
+        /// in case of FlushMode.Never. Can be overridden in subclasses.
+        /// </remarks>
+        /// <param name="session">The current Hibernate session.</param>
+        /// <exception cref="InvalidDataAccessApiUsageException">If write operation is attempted in read-only mode
+        /// </exception>
+        public virtual void CheckWriteOperationAllowed(ISession session) 
+        {
+          if (CheckWriteOperations && TemplateFlushMode != TemplateFlushMode.Eager &&
+                AreEqualFlushMode(TemplateFlushMode.Never, session.FlushMode)) 
+            {
+                throw new InvalidDataAccessApiUsageException(
+                      "Write operations are not allowed in read-only mode (FlushMode.NEVER) - turn your Session " +
+                      "into FlushMode.AUTO or remove 'readOnly' marker from transaction definition");
+            }
+        }
+
+ 
+        
+        /// <summary>
+        /// Compares if the flush mode enumerations, Spring's
+        /// TemplateFlushMode and NHibernates FlushMode have equal
+        /// settings.
+        /// </summary>
+        /// <param name="tfm">The template flush mode.</param>
+        /// <param name="fm">The NHibernate flush mode.</param>
+        /// <returns>
+        /// Returns true if both are Never, Auto, or Commit, false
+        /// otherwise.
+        /// </returns>
+        protected bool AreEqualFlushMode(TemplateFlushMode tfm, FlushMode fm)
+        {
+            if ( (tfm ==TemplateFlushMode.Never && fm == FlushMode.Never) ||
+                 (tfm ==TemplateFlushMode.Auto && fm == FlushMode.Auto) ||
+                 (tfm ==TemplateFlushMode.Commit && fm == FlushMode.Commit) )
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+            //TODO other combinations.
+        }
+
+        #endregion
+    }
+  
+    #region Internal Supporting Callback Classes
+
+    //TODO see if can create common base class for some callbacks.
+
+    internal class ContainsHibernateCallback : IHibernateCallback
+    {
+        private object entity;
+        public ContainsHibernateCallback(object entity)
+        {
+            this.entity = entity;
+        }
+
+        public object DoInHibernate(ISession session)
+        {
+            return session.Contains(entity);
+        }
+    }
+
+
+    internal class DeleteLockModeHibernateCallback : IHibernateCallback
+    {
+        private HibernateTemplate outer;
+        private object entity;
+        private LockMode lockMode;
+        public DeleteLockModeHibernateCallback(HibernateTemplate template, object entity, LockMode lockMode)
+        {
+            this.outer = template;
+            this.entity = entity;
+            this.lockMode = lockMode;
+        }
+
+        public object DoInHibernate(ISession session)
+        {
+            outer.CheckWriteOperationAllowed(session);
+            if (lockMode != null) 
+            {
+                session.Lock(entity, lockMode);
+            }
+            session.Delete(entity);
+            return null;
+        }
+    }
+
+
+    internal class DeletebyQueryHibernateCallback : IHibernateCallback
+    {
+        private HibernateTemplate outer;
+        private string queryString;
+        private object[] values;
+        private IType[] types;
+
+        public DeletebyQueryHibernateCallback(HibernateTemplate template, string queryString, object[] values, IType[] types)
+        {
+            this.outer = template;
+            this.queryString = queryString;
+            this.values = values;
+            this.types = types;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            outer.CheckWriteOperationAllowed(session);
+            if (values != null) 
+            {
+                return session.Delete(queryString, values, types);
+            }
+            else 
+            {
+                return session.Delete(queryString);
+            }
+        }
+    }
+
+
+
+    internal class DeleteAllHibernateCallback : IHibernateCallback
+    {
+        HibernateTemplate outer;
+        private ICollection entities;
+
+        public DeleteAllHibernateCallback(HibernateTemplate template, ICollection entities)
+        {
+            this.outer = template;
+            this.entities = entities;
+
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            outer.CheckWriteOperationAllowed(session);
+            foreach (object entity in entities)
+            {
+                session.Delete(entity);
+            }
+            return null;
+        }
+
+
+
+    }
+
+
+    internal class EvictHibernateCallback : IHibernateCallback
+    {
+        private object entity;
+
+        public EvictHibernateCallback(object entity)
+        {
+            this.entity = entity;
+
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            session.Evict(entity);
+            return null;
+        }
+
+
+
+    }
+
+
+    internal class FindHibernateCallback : IHibernateCallback
+    {
+        private HibernateTemplate outer;
+        private string queryString;
+        private object[] values;
+        private IType[] types;
+
+        public FindHibernateCallback(HibernateTemplate template, string queryString, object[] values, IType[] types)
+        {
+            this.outer = template;
+            this.queryString = queryString;
+            this.values = values;
+            this.types = types;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            IQuery queryObject = session.CreateQuery(queryString);
+            outer.PrepareQuery(queryObject);
+            if (values != null) 
+            {
+                for (int i = 0; i < values.Length; i++) 
+                {
+                    if (types != null && types[i] != null) 
+                    {
+                        queryObject.SetParameter(i, values[i], types[i]);
+                    }
+                    else 
+                    {
+                        queryObject.SetParameter(i, values[i]);
+                    }
+                }
+            }
+            
+            return queryObject.List();
+        }
+    }
+
+
+    internal class FindByNamedParamHibernateCallback : IHibernateCallback
+    {
+        HibernateTemplate outer;
+        private string queryString;
+        private string[] paramNames;
+        private object[] values;
+        private IType[] types;
+
+        public FindByNamedParamHibernateCallback(HibernateTemplate template, string queryString, string[] paramNames, object[] values, IType[] types)
+        {
+            this.outer = template;
+            this.queryString = queryString;
+            this.paramNames = paramNames;
+            this.values = values;
+            this.types = types;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            IQuery queryObject = session.CreateQuery(queryString);
+            outer.PrepareQuery(queryObject);
+            if (values != null) 
+            {
+                for (int i = 0; i < values.Length; i++) 
+                {
+                    outer.ApplyNamedParameterToQuery(queryObject, paramNames[i], values[i], (types != null ? types[i] : null));
+                }
+            }
+            return queryObject.List();
+
+        }
+    }
+
+    
+    internal class FindByNamedQueryHibernateCallback : IHibernateCallback
+    {
+        HibernateTemplate outer;
+        private string queryName;
+        private object[] values;
+        private IType[] types;
+
+        public FindByNamedQueryHibernateCallback(HibernateTemplate template, string queryName, object[] values, IType[] types)
+        {
+            this.outer = template;
+            this.queryName = queryName;
+            this.values = values;
+            this.types = types;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            IQuery queryObject = session.GetNamedQuery(queryName);
+            outer.PrepareQuery(queryObject);
+            if (values != null) 
+            {
+                for (int i = 0; i < values.Length; i++) 
+                {
+                    if (types != null && types[i] != null) 
+                    {
+                        queryObject.SetParameter(i, values[i], types[i]);
+                    }
+                    else 
+                    {
+                        queryObject.SetParameter(i, values[i]);
+                    }
+                }
+            }
+            return queryObject.List();
+
+        }
+    }
+
+    
+    internal class FindByNamedQueryAndNamedParamHibernateCallback : IHibernateCallback
+    {
+        HibernateTemplate outer;
+        private string queryName;
+        private string[] paramNames;
+        private object[] values;
+        private IType[] types;
+
+        public FindByNamedQueryAndNamedParamHibernateCallback(HibernateTemplate template, string queryName, string[] paramNames, object[] values, IType[] types)
+        {
+            this.outer = template;
+            this.queryName = queryName;
+            this.paramNames = paramNames;
+            this.values = values;
+            this.types = types;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            IQuery queryObject = session.GetNamedQuery(queryName);
+            outer.PrepareQuery(queryObject);
+            if (values != null) 
+            {
+                for (int i = 0; i < values.Length; i++) 
+                {
+                    outer.ApplyNamedParameterToQuery(queryObject, paramNames[i], values[i], (types != null ? types[i] : null));
+                }
+            }
+            return queryObject.List();
+
+        }
+    }
+
+
+    internal class FindByNamedQueryAndValueObjectHibernateCallback : IHibernateCallback
+    {
+        HibernateTemplate outer;
+        private string queryName;
+        private object valueObject;
+
+        public FindByNamedQueryAndValueObjectHibernateCallback(HibernateTemplate template, string queryName, object valueObject)
+        {
+            this.outer = template;
+            this.queryName = queryName;
+            this.valueObject = valueObject;
+
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            IQuery queryObject = session.GetNamedQuery(queryName);
+            outer.PrepareQuery(queryObject);
+            queryObject.SetProperties(valueObject);
+            return queryObject.List();
+
+        }
+
+
+
+    }
+
+    internal class FindByValueObjectHibernateCallback : IHibernateCallback
+    {
+        HibernateTemplate outer;
+        private string queryString;
+        private object valueObject;
+
+        public FindByValueObjectHibernateCallback(HibernateTemplate template, string queryString, object valueObject)
+        {
+            this.outer = template;
+            this.queryString = queryString;
+            this.valueObject = valueObject;
+
+        }
+
+        public object DoInHibernate(ISession session)
+        {
+            IQuery queryObject = session.CreateQuery(queryString);
+            outer.PrepareQuery(queryObject);
+            queryObject.SetProperties(valueObject);
+            return queryObject.List();
+
+        }
+        
+    }
+   
+    internal class ExecuteHibernateCallbackUsingDelegate : IHibernateCallback
+    {
+        private HibernateDelegate del;
+
+        public ExecuteHibernateCallbackUsingDelegate(HibernateDelegate d)
+        {
+            del = d;
+        }
+
+        public object DoInHibernate(ISession session)
+        {
+            return del(session);
+        }
+    }
+
+    
+    internal class GetByTypeHibernateCallback : IHibernateCallback
+    {
+        private Type entityType;
+        private object id;
+        private LockMode lockMode;
+
+        public GetByTypeHibernateCallback(Type entityType, object id, LockMode lockMode)
+        {
+            this.entityType = entityType;
+            this.id = id;
+            this.lockMode = lockMode;
+
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            if (lockMode != null) 
+            {
+                return session.Get(entityType, id, lockMode);
+            }
+            else 
+            {
+                return session.Get(entityType, id);
+            }
+        }
+
+
+
+    }
+
+
+    internal class LoadByTypeHibernateCallback : IHibernateCallback
+    {
+        private Type entityType;
+        private object id;
+        private LockMode lockMode;
+
+        public LoadByTypeHibernateCallback(Type entityType, object id, LockMode lockMode)
+        {
+            this.entityType = entityType;
+            this.id = id;
+            this.lockMode = lockMode;
+
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            if (lockMode != null) 
+            {
+                return session.Load(entityType, id, lockMode);
+            }
+            else 
+            {
+                return session.Load(entityType, id);
+            }
+        }
+
+
+
+    }
+
+
+    internal class LoadByEntityHibernateCallback : IHibernateCallback
+    {
+        private object entity;
+        private object id;
+
+        public LoadByEntityHibernateCallback(object entity, object id)
+        {
+            this.entity = entity;
+            this.id = id;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            session.Load(entity, id);
+            return null;
+        }
+
+
+
+    }
+
+
+    internal class LoadAllByTypeHibernateCallback : IHibernateCallback
+    {
+        private HibernateTemplate outer;
+        private Type entityType;
+
+        public LoadAllByTypeHibernateCallback(HibernateTemplate template, Type entityType)
+        {
+            outer = template;
+            this.entityType = entityType;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            ICriteria criteria = session.CreateCriteria(entityType);
+            outer.PrepareCriteria(criteria);
+            return criteria.List();
+        }
+    }
+
+
+    internal class LockHibernateCallback : IHibernateCallback
+    {
+        private object entity;
+        private LockMode lockMode;
+
+        public LockHibernateCallback(object entity, LockMode lockMode)
+        {
+            this.entity = entity;
+            this.lockMode = lockMode;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            session.Lock(entity, lockMode);
+			return null;
+        }
+    }
+
+
+    internal class RefreshHibernateCallback : IHibernateCallback
+    {
+        private object entity;
+        private LockMode lockMode;
+
+        public RefreshHibernateCallback(object entity, LockMode lockMode)
+        {
+            this.entity = entity;
+            this.lockMode = lockMode;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            if (lockMode != null) 
+            {
+                session.Refresh(entity, lockMode);
+            }
+            else 
+            {
+                session.Refresh(entity);
+            }
+            return null;
+        }
+    }
+
+
+    internal class SaveObjectHibernateCallback : IHibernateCallback
+    {
+        private HibernateTemplate outer;
+        private object entity;
+
+        public SaveObjectHibernateCallback(HibernateTemplate template, object entity)
+        {
+            this.outer = template;
+            this.entity = entity;            
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            outer.CheckWriteOperationAllowed(session);
+            return session.Save(entity);
+        }
+    }
+
+
+    internal class SaveObjectWithIdHibernateCallback : IHibernateCallback
+    {
+        private HibernateTemplate outer;
+        private object entity;
+        private object id;
+
+        public SaveObjectWithIdHibernateCallback(HibernateTemplate template, object entity, object id)
+        {
+            this.outer = template;
+            this.entity = entity;            
+            this.id = id;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            outer.CheckWriteOperationAllowed(session);
+            session.Save(entity, id);
+            return null;
+        }
+    }
+
+
+    internal class UpdateObjectHibernateCallback : IHibernateCallback
+    {
+        private HibernateTemplate outer;
+        private object entity;
+        private LockMode lockMode;
+
+        public UpdateObjectHibernateCallback(HibernateTemplate template, object entity, LockMode lockMode)
+        {
+            this.outer = template;
+            this.entity = entity;    
+            this.lockMode = lockMode;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            outer.CheckWriteOperationAllowed(session);
+            session.Update(entity);
+            if (lockMode != null) 
+            {
+                session.Lock(entity, lockMode);
+            }
+            return null;
+        }
+    }
+
+
+    internal class SaveOrUpdateObjectHibernateCallback : IHibernateCallback
+    {
+        private HibernateTemplate outer;
+        private object entity;
+
+        public SaveOrUpdateObjectHibernateCallback(HibernateTemplate template, object entity)
+        {
+            this.outer = template;
+            this.entity = entity;    
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            outer.CheckWriteOperationAllowed(session);
+            session.SaveOrUpdate(entity);
+            return null;
+        }
+    }
+
+    internal class SaveOrUpdateAllHibernateCallback : IHibernateCallback
+    {
+        private HibernateTemplate outer;
+        private ICollection entities;
+
+        public SaveOrUpdateAllHibernateCallback(HibernateTemplate template, ICollection entities)
+        {
+            this.outer = template;
+            this.entities = entities;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            outer.CheckWriteOperationAllowed(session);
+            foreach (object entity in entities)
+            {
+                session.SaveOrUpdate(entity);
+            }
+            return null;
+        }
+    }
+    internal class SaveOrUpdateCopyHibernateCallback : IHibernateCallback
+    {
+        private HibernateTemplate outer;
+        private object entity;
+
+        public SaveOrUpdateCopyHibernateCallback(HibernateTemplate template, object entity)
+        {
+            this.outer = template;
+            this.entity = entity;    
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public object DoInHibernate(ISession session)
+        {
+            outer.CheckWriteOperationAllowed(session);
+            return session.SaveOrUpdateCopy(entity);
+        }
+    }
+
+
+    #endregion
+    
+
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs
new file mode 100644
index 00000000..6dda6ef1
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs
@@ -0,0 +1,916 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using System.Reflection;
+
+using NHibernate;
+using NHibernate.Transaction;
+
+using Spring.Core.TypeResolution;
+using Spring.Dao;
+using Spring.Data.Common;
+using Spring.Data.Support;
+using Spring.Objects.Factory;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+using Spring.Util;
+using HibernateTransactionException = NHibernate.TransactionException;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// PlatformTransactionManager implementation for a single Hibernate SessionFactory.
+    /// Binds a Hibernate Session from the specified factory to the thread, potentially
+    /// allowing for one thread Session per factory
+	/// </summary>
+	/// <remarks>
+	/// SessionFactoryUtils and HibernateTemplate are aware of thread-bound Sessions and participate in such
+    /// transactions automatically. Using either of those is required for Hibernate
+    /// access code that needs to support this transaction handling mechanism.
+    /// <para>
+    /// Supports custom isolation levels at the start of the transaction
+    /// , and timeouts that get applied as appropriate
+    /// Hibernate query timeouts. To support the latter, application code must either use
+    /// <code>HibernateTemplate</code> (which by default applies the timeouts) or call
+    /// <code>SessionFactoryUtils.applyTransactionTimeout</code> for each created
+    /// Hibernate Query object.
+    /// </para>
+    /// <para>Note that you can specify a Spring IDbProvider instance which if shared with
+    /// a corresponding instance of AdoTemplate will allow for mixing ADO.NET/NHibernate
+    /// operations within a single transaction.</para>
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: HibernateTransactionManager.cs,v 1.7 2007/11/20 14:39:48 markpollack Exp $</version>
+	public class HibernateTransactionManager : AbstractPlatformTransactionManager, IObjectFactoryAware, IInitializingObject
+	{   
+		#region Fields
+        
+        private ISessionFactory sessionFactory;
+
+        private IDbProvider dbProvider;
+
+        private bool autodetectDbProvider = true;
+
+        private Object entityInterceptor;
+
+        private IAdoExceptionTranslator adoExceptionTranslator;
+
+        private IAdoExceptionTranslator defaultExceptionTranslator;
+
+        /// <summary>
+        /// Just needed for entityInterceptorBeanName. 
+        /// </summary>
+        private IObjectFactory objectFactory;
+
+		#endregion
+
+		#region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateTransactionManager"/> class.
+        /// </summary>
+	    public HibernateTransactionManager()
+	    {
+	    }
+
+	    /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateTransactionManager"/> class.
+        /// </summary>
+        /// <param name="sessionFactory">The session factory.</param>
+		public HibernateTransactionManager(ISessionFactory sessionFactory)
+		{
+            this.sessionFactory = sessionFactory;
+            AfterPropertiesSet();
+		}         
+
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Gets or sets the db provider.
+        /// </summary>
+        /// <value>The db provider.</value>
+	    public IDbProvider DbProvider
+	    {
+	        get { return dbProvider; }
+	        set { dbProvider = value; }
+	    }
+
+        /// <summary>
+        /// Gets or sets a Hibernate entity interceptor that allows to inspect and change
+        /// property values before writing to and reading from the database.
+        /// When getting, return the current Hibernate entity interceptor, or <code>null</code> if none.
+        /// </summary>
+        /// <value>The entity interceptor.</value>
+        /// <remarks>
+        /// Resolves an entity interceptor object name via the object factory,
+        /// if necessary.
+        /// Will get applied to any new Session created by this transaction manager.
+        /// Such an interceptor can either be set at the SessionFactory level,
+        /// i.e. on LocalSessionFactoryObject, or at the Session level, i.e. on
+        /// HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
+        /// It's preferable to set it on LocalSessionFactoryObject or HibernateTransactionManager
+        /// to avoid repeated configuration and guarantee consistent behavior in transactions.
+        /// </remarks>
+        /// <exception cref="InvalidOperationException">If object factory is null and need to get entity interceptor via object name.</exception>
+	    public IInterceptor EntityInterceptor
+	    {
+	        get
+	        {
+		        if (this.entityInterceptor is IInterceptor) 
+                {
+			        return (IInterceptor) entityInterceptor;
+		        }   
+		        else if (this.entityInterceptor is string) 
+                {
+			        if (this.objectFactory == null) 
+                    {
+				        throw new InvalidOperationException ("Cannot get entity interceptor via object name if no object factory set");
+			        }   
+			        String objectName = (String) this.entityInterceptor;
+			        return (IInterceptor) this.objectFactory.GetObject(objectName, typeof(IInterceptor));
+		        }       
+		        else 
+                {
+			        return null;
+		        }
+	        }
+	        set
+	        {
+	            entityInterceptor = value;
+	        }
+	    }
+
+        /// <summary>
+        /// Sets the object name of a Hibernate entity interceptor that
+        /// allows to inspect and change property values before writing to and reading from the database.
+        /// </summary>
+        /// <value>The name of the entity interceptor object.</value>
+        /// <remarks>
+        /// Will get applied to any new Session created by this transaction manager.
+        /// <p>Requires the object factory to be known, to be able to resolve the object
+        /// name to an interceptor instance on session creation. Typically used for
+        /// prototype interceptors, i.e. a new interceptor instance per session.
+        /// </p>
+        /// 	<p>Can also be used for shared interceptor instances, but it is recommended
+        /// to set the interceptor reference directly in such a scenario.
+        /// </p>
+        /// </remarks>
+        public string EntityInterceptorObjectName
+        {
+            set
+            {
+                entityInterceptor = value; 
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ADO.NET exception translator for this transaction manager.
+        /// </summary>
+        /// <remarks>
+        /// Applied to ADO.NET Exceptions (wrapped by Hibernate's ADOException)
+        /// </remarks>
+        /// <value>The ADO exception translator.</value>
+	    public IAdoExceptionTranslator AdoExceptionTranslator
+	    {
+	        get { return adoExceptionTranslator; }
+	        set { adoExceptionTranslator = value; }
+	    }
+
+        /// <summary>
+        /// Gets the default IAdoException translator, lazily creating it if nece
+        /// </summary>
+        /// <value>The default IAdoException translator.</value>
+	    public IAdoExceptionTranslator DefaultAdoExceptionTranslator
+	    {
+	        get
+	        {   lock(this)
+	            {
+	                if (defaultExceptionTranslator == null)
+	                {
+	                    if (dbProvider != null)
+	                    {
+                            defaultExceptionTranslator =  new ErrorCodeExceptionTranslator(dbProvider);
+	                    }   
+                        else
+	                    {
+	                        defaultExceptionTranslator = SessionFactoryUtils.NewAdoExceptionTranslator(SessionFactory);
+	                    }
+	                }
+	                return defaultExceptionTranslator;
+	            }
+	        }
+	    }
+
+        /// <summary>
+        /// Gets or sets the SessionFactory that this instance should manage transactions for.
+        /// </summary>
+        /// <value>The session factory.</value>
+	    public ISessionFactory SessionFactory
+	    {
+	        get { return sessionFactory; }
+	        set { sessionFactory = value; }
+	    }
+
+        /// <summary>
+        /// Set whether to autodetect a ADO.NET connection used by the Hibernate SessionFactory,
+        /// if set via LocalSessionFactoryObject's <code>DbProvider</code>. Default is "true".
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if [autodetect data source]; otherwise, <c>false</c>.
+        /// </value>
+        /// <remarks>
+        /// 	<p>Can be turned off to deliberately ignore an available IDbProvider,
+        /// to not expose Hibernate transactions as ADO.NET transactions for that IDbProvider.
+        /// </p>
+        /// </remarks>
+	    public bool AutodetectDbProvider
+	    {
+	        set { autodetectDbProvider = value; }
+	    }
+
+	    #endregion
+
+		#region Methods
+
+		#endregion
+
+
+        /// <summary>
+        /// The object factory just needs to be known for resolving entity interceptor
+        /// It does not need to be set for any other mode of operation.
+        /// </summary>
+        /// <value>
+        /// Owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+        /// (may not be <see langword="null"/>). The object can immediately
+        /// call methods on the factory.
+        /// </value>
+	    public IObjectFactory ObjectFactory
+	    {
+	        set
+	        {
+	            objectFactory = value;
+	        }
+	    }
+
+	    /// <summary>
+	    /// Return the current transaction object.
+	    /// </summary>
+	    /// <returns>The current transaction object.</returns>
+	    /// <exception cref="Spring.Transaction.CannotCreateTransactionException">
+	    /// If transaction support is not available.
+	    /// </exception>
+	    /// <exception cref="Spring.Transaction.TransactionException">
+	    /// In the case of lookup or system errors.
+	    /// </exception>
+	    protected override object DoGetTransaction()
+	    {
+    		HibernateTransactionObject txObject = new HibernateTransactionObject();
+            txObject.SavepointAllowed = NestedTransactionsAllowed;
+            if (TransactionSynchronizationManager.HasResource(SessionFactory)) 
+            {
+                SessionHolder sessionHolder =
+                    (SessionHolder) TransactionSynchronizationManager.GetResource(SessionFactory);
+                if (log.IsDebugEnabled) 
+                {
+                    log.Debug("Found thread-bound Session [" + sessionHolder.Session +
+                        "] for Hibernate transaction");
+                }	
+		        txObject.SetSessionHolder(sessionHolder, false);
+                if (DbProvider != null)
+                {
+                    ConnectionHolder conHolder = (ConnectionHolder)
+                        TransactionSynchronizationManager.GetResource(DbProvider);
+                    txObject.ConnectionHolder = conHolder;
+                }
+            }
+            return txObject;
+	    }
+
+	    /// <summary>
+	    /// Check if the given transaction object indicates an existing,
+	    /// i.e. already begun, transaction.
+	    /// </summary>
+	    /// <param name="transaction">
+	    /// Transaction object returned by
+	    /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+	    /// </param>
+	    /// <returns>True if there is an existing transaction.</returns>
+	    /// <exception cref="Spring.Transaction.TransactionException">
+	    /// In the case of system errors.
+	    /// </exception>
+	    protected override bool IsExistingTransaction(object transaction)
+	    {
+	        return ((HibernateTransactionObject) transaction).HasTransaction();
+	    }
+
+        /// <summary>
+        /// Begin a new transaction with the given transaction definition.
+        /// </summary>
+        /// <param name="transaction">
+        /// Transaction object returned by
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+        /// </param>
+        /// <param name="definition">
+        /// <see cref="Spring.Transaction.ITransactionDefinition"/> instance, describing
+        /// propagation behavior, isolation level, timeout etc.
+        /// </param>
+        /// <remarks>
+        /// Does not have to care about applying the propagation behavior,
+        /// as this has already been handled by this abstract manager.
+        /// </remarks>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of creation or system errors.
+        /// </exception>
+	    protected override void DoBegin(object transaction, ITransactionDefinition definition)
+	    {
+            HibernateTransactionObject txObject = (HibernateTransactionObject) transaction;
+
+	        if (DbProvider != null && TransactionSynchronizationManager.HasResource(DbProvider) 
+                && !txObject.ConnectionHolder.SynchronizedWithTransaction)
+	        {
+	            throw new IllegalTransactionStateException(
+	                "Pre-bound ADO.NET Connection found - HibernateTransactionManager does not support " +
+	                "running within AdoTransactionManager if told to manage the DbProvider itself. " +
+	                "It is recommended to use a single HibernateTransactionManager for all transactions " +
+	                "on a single DbProvider, no matter whether Hibernate or ADO.NET access.");
+	        }
+	        ISession session = null;
+	        try
+	        {
+
+	            if (txObject.SessionHolder == null || txObject.SessionHolder.SynchronizedWithTransaction)
+	            {
+	                IInterceptor interceptor = EntityInterceptor;
+	                ISession newSession  = (interceptor != null ?
+                            SessionFactory.OpenSession(interceptor) : SessionFactory.OpenSession());
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug("Opened new Session [" + newSession + "] for Hibernate transaction");
+                    }
+                    txObject.SetSessionHolder(new SessionHolder(newSession), true);
+	                
+	            }
+                txObject.SessionHolder.SynchronizedWithTransaction = true;
+                session = txObject.SessionHolder.Session;
+
+                IDbConnection con = session.Connection;
+                //TODO isolation level mgmt
+                //IsolationLevel previousIsolationLevel = 
+
+                if (definition.ReadOnly && txObject.NewSessionHolder)
+                {
+                    // Just set to NEVER in case of a new Session for this transaction.
+                    session.FlushMode = FlushMode.Never;
+                }
+
+                if (!definition.ReadOnly && !txObject.NewSessionHolder)
+                {
+                    // We need AUTO or COMMIT for a non-read-only transaction.
+                    FlushMode flushMode = session.FlushMode;
+                    if (FlushMode.Never == flushMode)
+                    {
+                        session.FlushMode = FlushMode.Auto;
+                        txObject.SessionHolder.PreviousFlushMode = flushMode;
+                    }
+                }
+
+                // Add the Hibernate transaction to the session holder.
+	            // for now pass in tx options isolation level.
+                ITransaction hibernateTx = session.BeginTransaction(definition.TransactionIsolationLevel);
+	            IDbTransaction adoTx = GetIDbTransaction(hibernateTx);
+
+                // Add the Hibernate transaction to the session holder.
+                txObject.SessionHolder.Transaction = hibernateTx;
+	            
+                // Register transaction timeout.
+	            int timeout = DetermineTimeout(definition);
+                if (timeout != DefaultTransactionDefinition.TIMEOUT_DEFAULT)
+                {
+                    txObject.SessionHolder.TimeoutInSeconds = timeout;
+                }
+
+                // Register the Hibernate Session's ADO.NET Connection/TX pair for the DbProvider, if set.
+                if (DbProvider != null)
+                {
+                    //investigate passing null for tx.
+                    ConnectionHolder conHolder = new ConnectionHolder(con, adoTx);
+                    if (timeout != DefaultTransactionDefinition.TIMEOUT_DEFAULT)
+                    {
+                        conHolder.TimeoutInMillis = definition.TransactionTimeout;
+                    }
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug("Exposing Hibernate transaction as ADO transaction [" + con + "]");
+                    }
+                    TransactionSynchronizationManager.BindResource(DbProvider, conHolder);
+                    txObject.ConnectionHolder = conHolder;
+                }
+
+                // Bind the session holder to the thread.
+                if (txObject.NewSessionHolder)
+                {
+                    TransactionSynchronizationManager.BindResource(SessionFactory, txObject.SessionHolder);
+                }
+	            
+	        } catch (Exception ex) 
+	        {
+                SessionFactoryUtils.CloseSession(session);
+	            throw new CannotCreateTransactionException("Could not open Hibernate Session for transaction", ex);
+	        }    
+	        
+	        
+	    }
+
+
+
+
+	    /// <summary>
+	    /// Suspend the resources of the current transaction.
+	    /// </summary>
+	    /// <param name="transaction">
+	    /// Transaction object returned by
+	    /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+	    /// </param>
+	    /// <returns>
+	    /// An object that holds suspended resources (will be kept unexamined for passing it into
+	    /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoResume"/>.)
+	    /// </returns>
+	    /// <remarks>
+	    /// Transaction synchronization will already have been suspended.
+	    /// </remarks>
+	    /// <exception cref="Spring.Transaction.IllegalTransactionStateException">
+	    /// If suspending is not supported by the transaction manager implementation.
+	    /// </exception>
+	    /// <exception cref="Spring.Transaction.TransactionException">
+	    /// in case of system errors.
+	    /// </exception>
+	    protected override object DoSuspend(object transaction)
+	    {
+            HibernateTransactionObject txObject = (HibernateTransactionObject) transaction;
+            txObject.SetSessionHolder(null, false);
+            SessionHolder sessionHolder =
+                (SessionHolder) TransactionSynchronizationManager.UnbindResource(SessionFactory);
+            ConnectionHolder connectionHolder = null;
+            if (DbProvider != null) 
+            {
+                connectionHolder = (ConnectionHolder) TransactionSynchronizationManager.UnbindResource(DbProvider);
+            }		
+            return new SuspendedResourcesHolder(sessionHolder, connectionHolder);		
+
+	    }
+
+	    /// <summary>
+	    /// Resume the resources of the current transaction.
+	    /// </summary>
+	    /// <param name="transaction">
+	    /// Transaction object returned by
+	    /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+	    /// </param>
+	    /// <param name="suspendedResources">
+	    /// The object that holds suspended resources as returned by
+	    /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoSuspend"/>.
+	    /// </param>
+	    /// <remarks>
+	    /// Transaction synchronization will be resumed afterwards.
+	    /// </remarks>
+	    /// <exception cref="Spring.Transaction.IllegalTransactionStateException">
+	    /// If suspending is not supported by the transaction manager implementation.
+	    /// </exception>
+	    /// <exception cref="Spring.Transaction.TransactionException">
+	    /// In the case of system errors.
+	    /// </exception>
+	    protected override void DoResume(object transaction, object suspendedResources)
+	    {
+            SuspendedResourcesHolder resourcesHolder = (SuspendedResourcesHolder) suspendedResources;
+            if (TransactionSynchronizationManager.HasResource(SessionFactory)) 
+            {
+                // From non-transactional code running in active transaction synchronization
+                // -> can be safely removed, will be closed on transaction completion.
+                TransactionSynchronizationManager.UnbindResource(SessionFactory);
+            }
+            TransactionSynchronizationManager.BindResource(SessionFactory, resourcesHolder.SessionHolder);
+            if (DbProvider != null) 
+            {
+                TransactionSynchronizationManager.BindResource(DbProvider, resourcesHolder.ConnectionHolder);
+            }
+	    }
+
+	    /// <summary>
+	    /// Perform an actual commit on the given transaction.
+	    /// </summary>
+	    /// <param name="status">The status representation of the transaction.</param>
+	    /// <remarks>
+	    /// <p>
+	    /// An implementation does not need to check the rollback-only flag.
+	    /// </p>
+	    /// </remarks>
+	    /// <exception cref="Spring.Transaction.TransactionException">
+	    /// In the case of system errors.
+	    /// </exception>
+	    protected override void DoCommit(DefaultTransactionStatus status)
+	    {
+            HibernateTransactionObject txObject = (HibernateTransactionObject) status.Transaction;
+            if (status.Debug) 
+            {
+                log.Debug("Committing Hibernate transaction on Session [" +
+                    txObject.SessionHolder.Session + "]");
+            }
+            try 
+            {
+                txObject.SessionHolder.Transaction.Commit();
+            }
+            // Note, unfortunate collision of namespaces/classname for NHibernate.TransactionException
+	        // and Spring.Data.NHibernate requires this wierd construct.
+            catch (Exception ex) 
+            {
+                Type nhibTxExceptiontype = TypeResolutionUtils.ResolveType("NHibernate.TransactionException, NHibernate");
+                if (ex.GetType().Equals(nhibTxExceptiontype))
+                {
+                    // assumably from commit call to the underlying ADO.NET connection
+                    throw new TransactionSystemException("Could not commit Hibernate transaction", ex);
+                }
+                HibernateException hibEx = ex as HibernateException;
+                if (hibEx != null)
+                {
+                    // assumably failed to flush changes to database
+                    throw ConvertHibernateAccessException(hibEx);
+                }
+                throw;
+            }                        
+	    }
+
+	    /// <summary>
+	    /// Perform an actual rollback on the given transaction.
+	    /// </summary>
+	    /// <param name="status">The status representation of the transaction.</param>
+	    /// <remarks>
+	    /// An implementation does not need to check the new transaction flag.
+	    /// </remarks>
+	    /// <exception cref="Spring.Transaction.TransactionException">
+	    /// In the case of system errors.
+	    /// </exception>
+	    protected override void DoRollback(DefaultTransactionStatus status)
+	    {
+            HibernateTransactionObject txObject = (HibernateTransactionObject) status.Transaction;
+            if (status.Debug) 
+            {
+                log.Debug("Rolling back Hibernate transaction on Session [" +
+                    txObject.SessionHolder.Session + "]");
+            }
+            try 
+            {
+                txObject.SessionHolder.Transaction.Rollback();
+            }
+            catch (HibernateTransactionException ex) 
+            {
+                throw new TransactionSystemException("Could not roll back Hibernate transaction", ex);
+            }
+            catch (HibernateException ex) 
+            {
+                // Shouldn't really happen, as a rollback doesn't cause a flush.
+                throw ConvertHibernateAccessException(ex);
+            }
+            finally 
+            {
+                if (!txObject.NewSessionHolder) 
+                {
+                    // Clear all pending inserts/updates/deletes in the Session.
+                    // Necessary for pre-bound Sessions, to avoid inconsistent state.
+                    txObject.SessionHolder.Session.Clear();
+                }
+            }
+
+
+
+	    }
+
+
+	    /// <summary>
+	    /// Set the given transaction rollback-only. Only called on rollback
+	    /// if the current transaction takes part in an existing one.
+	    /// </summary>
+	    /// <param name="status">The status representation of the transaction.</param>
+	    /// <exception cref="Spring.Transaction.TransactionException">
+	    /// In the case of system errors.
+	    /// </exception>
+	    protected override void DoSetRollbackOnly(DefaultTransactionStatus status)
+	    {
+            HibernateTransactionObject txObject = (HibernateTransactionObject) status.Transaction;
+            if (status.Debug) 
+            {
+                log.Debug("Setting Hibernate transaction on Session [" +
+                    txObject.SessionHolder.Session + "] rollback-only");
+            }
+            txObject.SetRollbackOnly();
+	    }
+
+
+        /// <summary>
+        /// Gets the ADO.NET IDbTransaction object from the NHibernate ITransaction object.
+        /// </summary>
+        /// <param name="hibernateTx">The hibernate transaction.</param>
+        /// <returns>The ADO.NET transaction.  Null if could not get the transaction.  Warning
+        /// messages will be logged in that case.</returns>
+        protected IDbTransaction GetIDbTransaction(ITransaction hibernateTx)
+        {
+            AdoTransaction hibernateAdoTx = hibernateTx as AdoTransaction;
+
+            IDbTransaction adoTransaction = null;
+            if (hibernateAdoTx != null)
+            {
+                try
+                {
+                    FieldInfo fi = hibernateAdoTx.GetType().GetField("trans", BindingFlags.Instance | BindingFlags.NonPublic);
+                    adoTransaction = fi.GetValue(hibernateAdoTx) as IDbTransaction;
+                }
+                catch (Exception e)
+                {
+                    log.Warn("Could not extract IDbTransaction from Hibernate AdoTransaction using field name trans.", e);
+                }
+            }
+            else
+            {
+                log.Warn("Hibernate ITransaction not of expected type AdoTransaction.  Could not extract IDbTransaction from Hibernate AdoTransaction.");
+            }
+            return adoTransaction;
+        }
+
+        /// <summary>
+        /// Convert the given HibernateException to an appropriate exception from
+        /// the Spring.Dao hierarchy. Can be overridden in subclasses.
+        /// </summary>
+        /// <param name="ex">The HibernateException that occured.</param>
+        /// <returns>The corresponding DataAccessException instance</returns>
+	    protected virtual DataAccessException ConvertHibernateAccessException(HibernateException ex) 
+        {
+            if (AdoExceptionTranslator != null && ex is ADOException) 
+            {
+                return ConvertAdoAccessException((ADOException) ex, AdoExceptionTranslator);
+            }
+            else if (ex is ADOException)
+            {
+                return ConvertAdoAccessException((ADOException)ex, DefaultAdoExceptionTranslator);
+            }
+            return SessionFactoryUtils.ConvertHibernateAccessException(ex);
+        }
+
+        /// <summary>
+        /// Convert the given ADOException to an appropriate exception from the
+        /// the Spring.Dao hierarchy. Can be overridden in subclasses.
+        /// </summary>
+        /// <param name="ex">The ADOException that occured, wrapping the underlying
+        /// ADO.NET thrown exception.</param>
+        /// <param name="translator">The translator to convert hibernate ADOExceptions.</param>
+        /// <returns>
+        /// The corresponding DataAccessException instance
+        /// </returns>
+        protected virtual DataAccessException ConvertAdoAccessException(ADOException ex, IAdoExceptionTranslator translator) 
+        {
+            return translator.Translate("Hibernate flusing: " + ex.Message, null, ex.InnerException);
+        }
+
+        /// <summary>
+        /// Cleanup resources after transaction completion.
+        /// </summary>
+        /// <param name="transaction">Transaction object returned by
+        /// <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.</param>
+        /// <remarks>
+        /// <note>
+        /// This implemenation unbinds the SessionFactory and 
+        /// DbProvider from thread local storage and closes the 
+        /// ISession.
+        /// </note>
+        /// 	<p>
+        /// Called after <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoCommit(Spring.Transaction.Support.DefaultTransactionStatus)"/>
+        /// and
+        /// <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoRollback(Spring.Transaction.Support.DefaultTransactionStatus)"/>
+        /// execution on any outcome.
+        /// </p>
+        /// 	<p>
+        /// Should not throw any exceptions but just issue warnings on errors.
+        /// </p>
+        /// </remarks>
+        protected override void DoCleanupAfterCompletion( object transaction )
+	    {
+            HibernateTransactionObject txObject = (HibernateTransactionObject) transaction;
+
+            // Remove the session holder from the thread.
+            if (txObject.NewSessionHolder) 
+            {
+                TransactionSynchronizationManager.UnbindResource(SessionFactory);
+            }
+            // Remove the ADO.NET connection holder from the thread, if exposed.
+            if (DbProvider != null) 
+            {
+                TransactionSynchronizationManager.UnbindResource(DbProvider);
+            }
+            /*
+            try 
+            {
+                //TODO investigate isolation level settings...
+                //IDbConnection con = txObject.SessionHolder.Session.Connection;
+                //AdoUtils.ResetConnectionAfterTransaction(con, txObject.PreviousIsolationLevel);
+            }
+            catch (HibernateException ex) 
+            {
+                log.Info("Could not access ADO.NET IDbConnection of Hibernate Session", ex);
+            }
+            */
+            ISession session = txObject.SessionHolder.Session;
+            if (txObject.NewSessionHolder) 
+            {
+                if (log.IsDebugEnabled) 
+                {
+                    log.Debug("Closing Hibernate Session [" + session + "] after transaction");
+                }
+                SessionFactoryUtils.CloseSessionOrRegisterDeferredClose(session, SessionFactory);
+            }
+            else 
+            {
+                if (log.IsDebugEnabled) 
+                {
+                    log.Debug("Not closing pre-bound Hibernate Session [" + session + "] after transaction");
+                }
+                if (txObject.SessionHolder.AssignedPreviousFlushMode) 
+                {                    
+                    session.FlushMode = txObject.SessionHolder.PreviousFlushMode;
+                }              
+            }
+            txObject.SessionHolder.Clear();
+
+
+	    }
+
+	    private class HibernateTransactionObject : AdoTransactionObjectSupport 
+        {
+
+            private SessionHolder sessionHolder;
+
+            private bool newSessionHolder;
+
+
+            public void SetSessionHolder(SessionHolder sessionHolder, bool newSessionHolder) 
+            {
+                this.sessionHolder = sessionHolder;
+                this.newSessionHolder = newSessionHolder;
+            }
+
+            
+            public SessionHolder SessionHolder
+            {
+                get
+                {
+                    return sessionHolder;
+                }                
+            }
+
+            public bool NewSessionHolder
+            {
+                get 
+                {
+                    return newSessionHolder;
+                }
+            }
+
+            public bool HasTransaction() 
+            {
+                return (this.sessionHolder != null && this.sessionHolder.Transaction != null);
+            }
+
+            public void SetRollbackOnly() 
+            {
+                SessionHolder.RollbackOnly = true;
+                if (ConnectionHolder != null) 
+                {
+                    ConnectionHolder.RollbackOnly = true;
+                }
+            }
+
+            /// <summary>
+            /// Return whether the transaction is internally marked as rollback-only.
+            /// </summary>
+            /// <value></value>
+            /// <returns>True of the transaction is marked as rollback-only.</returns>
+            public override bool RollbackOnly
+            {
+                get
+                {
+                    return SessionHolder.RollbackOnly ||
+                           (ConnectionHolder != null && ConnectionHolder.RollbackOnly);
+                }
+            }
+        }
+
+        private class SuspendedResourcesHolder 
+        {
+
+            private readonly SessionHolder sessionHolder;
+
+            private readonly ConnectionHolder connectionHolder;
+
+            public SuspendedResourcesHolder(SessionHolder sessionHolder, ConnectionHolder conHolder) 
+            {
+                this.sessionHolder = sessionHolder;
+                this.connectionHolder = conHolder;
+            }
+
+            public SessionHolder SessionHolder
+            {
+                get
+                {
+                    return sessionHolder;
+                }
+
+            }
+
+            public ConnectionHolder ConnectionHolder
+            {
+                get
+                {
+                    return connectionHolder;
+                }
+                
+            }
+        }
+
+	    /// <summary>
+	    /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+	    /// after it has injected all of an object's dependencies.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// This method allows the object instance to perform the kind of
+	    /// initialization only possible when all of it's dependencies have
+	    /// been injected (set), and to throw an appropriate exception in the
+	    /// event of misconfiguration.
+	    /// </p>
+	    /// <p>
+	    /// Please do consult the class level documentation for the
+	    /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+	    /// description of exactly <i>when</i> this method is invoked. In
+	    /// particular, it is worth noting that the
+	    /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+	    /// and <see cref="Spring.Context.IApplicationContextAware"/>
+	    /// callbacks will have been invoked <i>prior</i> to this method being
+	    /// called.
+	    /// </p>
+	    /// </remarks>
+        /// <exception cref="System.ArgumentException">
+	    /// In the event of misconfiguration (such as the failure to set a
+	    /// required property) or if initialization fails.
+	    /// </exception>
+	    public void AfterPropertiesSet()
+	    {
+		    if (SessionFactory == null) {
+			    throw new ArgumentException("sessionFactory is required");
+		    }
+		    if (this.entityInterceptor is string && this.objectFactory == null) {
+			    throw new ArgumentException ("objectFactory is required for entityInterceptorBeanName");
+		    }
+
+		    // Try to derive a DbProvider given the SessionFactory.
+		    if (this.autodetectDbProvider && DbProvider == null) {                
+			    IDbProvider sfDbProvider = SessionFactoryUtils.GetDbProvider(SessionFactory);
+			    if (sfDbProvider != null) {
+				    // Use the SessionFactory's DataSource for exposing transactions to ADO.NET code.
+				    if (log.IsInfoEnabled) {
+					    log.Info("Derived DbProvider [" + sfDbProvider.DbMetadata.ProductName +
+							    "] of Hibernate SessionFactory for HibernateTransactionManager");
+				    }
+				    DbProvider = sfDbProvider;
+			    }
+		        else
+			    {
+                    log.Info("Could not auto detect DbProvider from SessionFactory configuration");
+			    }
+                
+		    }
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/ICommonHibernateOperations.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/ICommonHibernateOperations.cs
new file mode 100644
index 00000000..0284b187
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/ICommonHibernateOperations.cs
@@ -0,0 +1,245 @@
+#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
+
+#region Imports
+
+using System;
+using NHibernate;
+using NHibernate.Type;
+using Spring.Dao;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+    /// <summary>
+    /// Interface that specifies a set of Hibernate operations that
+    /// are common across versions of Hibernate.
+    /// </summary>
+    /// <remarks>
+    /// Base interface for generic and non generic IHibernateOperations interfaces
+    /// Not often used, but a useful option
+    /// to enhance testability, as it can easily be mocked or stubbed.
+    /// <p>Provides HibernateTemplate's data access methods that mirror
+    /// various Session methods. See the NHibernate ISession documentation
+    /// for details on those methods.
+    /// </p>
+    /// </remarks> 
+    /// <author>Mark Pollack (.NET)</author>  
+    /// <threadsafety statis="true" instance="true"/> 
+    /// <version>$Id: ICommonHibernateOperations.cs,v 1.2 2007/09/19 22:58:22 markpollack Exp $</version>
+    public interface ICommonHibernateOperations
+    {
+        /// <summary>
+        /// Remove all objects from the Session cache, and cancel all pending saves,
+        /// updates and deletes.
+        /// </summary>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void Clear();
+
+
+        /// <summary>
+        /// Delete the given persistent instance.
+        /// </summary>
+        /// <param name="entity">The persistent instance to delete.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void Delete(object entity);
+
+        /// <summary>
+        /// Delete the given persistent instance.
+        /// </summary>
+        /// <remarks>
+        /// Obtains the specified lock mode if the instance exists, implicitly
+        /// checking whether the corresponding database entry still exists
+        /// (throwing an OptimisticLockingFailureException if not found).
+        /// </remarks>
+        /// <param name="entity">Tthe persistent instance to delete.</param>
+        /// <param name="lockMode">The lock mode to obtain.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void Delete(object entity, LockMode lockMode);
+
+
+        /// <summary>
+        /// Delete all objects returned by the query.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language.</param>
+        /// <returns>The number of entity instances deleted.</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        int Delete(string queryString);
+
+        /// <summary>
+        ///  Delete all objects returned by the query.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language.</param>
+        /// <param name="value">The value of the parameter.</param>
+        /// <param name="type">The Hibernate type of the parameter (or <code>null</code>).</param>
+        /// <returns>The number of entity instances deleted.</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        int Delete(string queryString, object value, IType type);
+
+
+        /// <summary>
+        /// Delete all objects returned by the query.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language.</param>
+        /// <param name="values">The values of the parameters.</param>
+        /// <param name="types"> Hibernate types of the parameters (or <code>null</code>)</param>
+        /// <returns>The number of entity instances deleted.</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        int Delete(String queryString, Object[] values, IType[] types);
+
+
+        /// <summary>
+        /// Flush all pending saves, updates and deletes to the database.
+        /// </summary>
+        /// <remarks>
+        /// Only invoke this for selective eager flushing, for example when ADO.NET code
+        /// needs to see certain changes within the same transaction. Else, it's preferable
+        /// to rely on auto-flushing at transaction completion.
+        /// </remarks>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void Flush();
+
+        #region Convenience methods for loading individual objects
+
+        /// <summary>
+        /// Load the persistent instance with the given identifier
+        /// into the given object, throwing an exception if not found.
+        /// </summary>
+        /// <param name="entity">Entity the object (of the target class) to load into.</param>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <exception cref="ObjectRetrievalFailureException">If object not found.</exception>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void Load(object entity, object id);
+
+
+        /// <summary>
+        /// Re-read the state of the given persistent instance.
+        /// </summary>
+        /// <param name="entity">The persistent instance to re-read.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void Refresh(object entity);
+
+        /// <summary>
+        /// Re-read the state of the given persistent instance.
+        /// Obtains the specified lock mode for the instance.
+        /// </summary>
+        /// <param name="entity">The persistent instance to re-read.</param>
+        /// <param name="lockMode">The lock mode to obtain.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void Refresh(object entity, LockMode lockMode);
+
+        /// <summary>
+        /// Determines whether the given object is in the Session cache.
+        /// </summary>
+        /// <param name="entity">the persistence instance to check.</param>
+        /// <returns>
+        /// 	<c>true</c> if session cache contains the specified entity; otherwise, <c>false</c>.
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        bool Contains(object entity);
+
+        /// <summary>
+        /// Remove the given object from the Session cache.
+        /// </summary>
+        /// <param name="entity">The persistent instance to evict.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void Evict(object entity);
+
+        #endregion
+
+        #region Convenience methods for storing individual objects
+
+
+        /// <summary>
+        /// Obtain the specified lock level upon the given object, implicitly
+        /// checking whether the corresponding database entry still exists
+        /// (throwing an OptimisticLockingFailureException if not found).
+        /// </summary>
+        /// <param name="entity">The he persistent instance to lock.</param>
+        /// <param name="lockMode">The lock mode to obtain.</param>
+        /// <exception cref="ObjectOptimisticLockingFailureException">If not found</exception>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void Lock(object entity, LockMode lockMode);
+
+
+        /// <summary>
+        /// Persist the given transient instance.
+        /// </summary>
+        /// <param name="entity">The transient instance to persist.</param>
+        /// <returns>The generated identifier.</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        object Save(object entity);
+
+        /// <summary>
+        /// Persist the given transient instance with the given identifier.
+        /// </summary>
+        /// <param name="entity">The transient instance to persist.</param>
+        /// <param name="id">The identifier to assign.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void Save(object entity, object id);
+
+        /// <summary>
+        /// Update the given persistent instance.
+        /// </summary>
+        /// <param name="entity">The persistent instance to update.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void Update(object entity);
+
+        /// <summary>
+        /// Update the given persistent instance.
+        /// Obtains the specified lock mode if the instance exists, implicitly
+        /// checking whether the corresponding database entry still exists
+        /// (throwing an OptimisticLockingFailureException if not found).
+        /// </summary>
+        /// <param name="entity">The persistent instance to update.</param>
+        /// <param name="lockMode">The lock mode to obtain.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void Update(object entity, LockMode lockMode);
+
+        /// <summary>
+        /// Save or update the given persistent instance,
+        /// according to its id (matching the configured "unsaved-value"?).
+        /// </summary>
+        /// <param name="entity">Tthe persistent instance to save or update
+        /// (to be associated with the Hibernate Session).</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void SaveOrUpdate(object entity);
+
+        /// <summary>
+        /// Save or update the contents of given persistent object,
+        /// according to its id (matching the configured "unsaved-value"?).
+        /// Will copy the contained fields to an already loaded instance
+        /// with the same id, if appropriate.
+        /// </summary>
+        /// <param name="entity">The persistent object to save or update.
+        /// (<i>not</i> necessarily to be associated with the Hibernate Session)
+        /// </param>
+        /// <returns>The actually associated persistent object.
+        /// (either an already loaded instance with the same id, or the given object)</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        object SaveOrUpdateCopy(object entity);
+        
+        
+        #endregion
+
+
+    }
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateCallback.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateCallback.cs
new file mode 100644
index 00000000..fcc87154
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateCallback.cs
@@ -0,0 +1,57 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NHibernate;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+    /// Callback interface for NHibernate code.
+    /// </summary>
+    /// <remarks>To be used with HibernateTemplate execute
+    /// method. The typical implementation will call 
+    /// Session.load/find/save/update to perform
+    /// some operations on persistent objects.
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IHibernateCallback.cs,v 1.2 2007/09/19 22:58:22 markpollack Exp $</version>
+	public interface IHibernateCallback 
+	{
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        /// <returns>A result object, or null if none.</returns>   
+        object DoInHibernate(ISession session);
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateOperations.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateOperations.cs
new file mode 100644
index 00000000..231ec17d
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateOperations.cs
@@ -0,0 +1,438 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NHibernate;
+using NHibernate.Type;
+using Spring.Dao;
+using Spring.Data.NHibernate;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+    /// Interface that specifies a basic set of Hibernate operations.
+    /// </summary>
+    /// <remarks>
+    /// Implemented by HibernateTemplate. Not often used, but a useful option
+    /// to enhance testability, as it can easily be mocked or stubbed.
+    /// <p>Provides HibernateTemplate's data access methods that mirror
+    /// various Session methods. See the NHibernate ISession documentation
+    /// for details on those methods.
+    /// </p>
+    /// </remarks>
+    /// <threadsafety statis="true" instance="true"/> 
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IHibernateOperations.cs,v 1.2 2007/09/19 22:58:22 markpollack Exp $</version>
+	public interface IHibernateOperations : ICommonHibernateOperations
+	{
+
+        /// <summary>
+        /// Delete all given persistent instances.
+        /// </summary>
+        /// <param name="entities">The persistent instances to delete.</param>
+        /// <remarks>
+        /// This can be combined with any of the find methods to delete by query
+        /// in two lines of code, similar to Session's delete by query methods.
+        /// </remarks>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void DeleteAll(ICollection entities);
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <remarks>
+        /// Application exceptions thrown by the action object get propagated to the
+        /// caller (can only be unchecked). Hibernate exceptions are transformed into
+        /// appropriate DAO ones. Allows for returning a result object, i.e. a domain
+        /// object or a collection of domain objects.
+        /// <p>Note: Callback code is not supposed to handle transactions itself!
+        /// Use an appropriate transaction manager like HibernateTransactionManager.
+        /// Generally, callback code must not touch any Session lifecycle methods,
+        /// like close, disconnect, or reconnect, to let the template do its work.
+        /// </p>
+        /// </remarks>
+        /// <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+        /// <returns>a result object returned by the action, or <code>null</code>
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        object Execute(HibernateDelegate del);
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <remarks>
+        /// Application exceptions thrown by the action object get propagated to the
+        /// caller (can only be unchecked). Hibernate exceptions are transformed into
+        /// appropriate DAO ones. Allows for returning a result object, i.e. a domain
+        /// object or a collection of domain objects.
+        /// <p>Note: Callback code is not supposed to handle transactions itself!
+        /// Use an appropriate transaction manager like HibernateTransactionManager.
+        /// Generally, callback code must not touch any Session lifecycle methods,
+        /// like close, disconnect, or reconnect, to let the template do its work.
+        /// </p>
+        /// </remarks>
+        /// <param name="action">The callback object that specifies the Hibernate action.</param>
+        /// <returns>a result object returned by the action, or <code>null</code>
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        object Execute(IHibernateCallback action);
+
+
+        /// <summary>
+        /// Execute the specified action assuming that the result object is a List.
+        /// </summary>
+        /// <remarks>
+        /// This is a convenience method for executing Hibernate find calls or
+        /// queries within an action.
+        /// </remarks>
+        /// <param name="action">The calback object that specifies the Hibernate action.</param>
+        /// <returns>A IList returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList ExecuteFind(IHibernateCallback action);
+
+        #region Finder Methods
+        /// <summary>
+        /// Execute a query for persistent instances.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <returns>a List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList Find(string queryString);
+
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding
+        /// one value to a "?" parameter in the query string.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <param name="value">the value of the parameter</param>
+        /// <returns>a List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList Find(string queryString, object value);
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding one value
+        /// to a "?" parameter of the given type in the query string.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <param name="value">The value of the parameter.</param>
+        /// <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+        /// <returns>a List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList Find(string queryString, object value, IType type);
+
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a
+        /// number of values to "?" parameters in the query string.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <param name="values">the values of the parameters</param>
+        /// <returns>a List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList Find(string queryString, object[] values);
+
+
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a number of
+        /// values to "?" parameters of the given types in the query string.
+        /// </summary>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+        /// <returns>a List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentException">If values and types are not null and their lengths are not equal</exception>          
+        IList Find(string queryString, object[] values, IType[] types);
+
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding
+        /// one value to a named parameter in the query string.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">The name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <returns>a List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList FindByNamedParam(string queryName, string paramName, object value);
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding
+        /// one value to a named parameter in the query string.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">The name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList FindByNamedParam(string queryName, string paramName, object value, IType type);
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a
+        /// number of values to named parameters in the query string.
+        /// </summary>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList FindByNamedParam(string queryString, string[] paramNames, object[] values);
+
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a
+        /// number of values to named parameters in the query string.
+        /// </summary>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+        /// if paramNames length is not equal to types length (when types is not null)</exception>        
+        IList FindByNamedParam(string queryString, string[] paramNames, object[] values, IType[] types);
+
+        /// <summary>
+        /// Execute a named query for persistent instances.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList FindByNamedQuery(string queryName);
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a "?" parameter in the query string.
+        ///  A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList FindByNamedQuery(string queryName, object value);
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a "?" parameter in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList FindByNamedQuery(string queryName, object value, IType type);
+
+        
+        /// <summary>
+        /// Execute a named query for persistent instances, binding a
+        /// number of values to "?" parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList FindByNamedQuery(string queryName, object[] values);
+
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding a
+        /// number of values to "?" parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If values and types are not null and their lengths differ.</exception>        
+        IList FindByNamedQuery(string queryName, object[] values, IType[] types);
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a named parameter in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">Name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList FindByNamedQueryAndNamedParam(string queryName, string paramName, object value);
+			
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a named parameter in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">Name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">The Hibernate type of the parameter (or <code>null</code>)</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList FindByNamedQueryAndNamedParam(string queryName, string paramName, object value, IType type);
+			
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// number of values to named parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters.</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList FindByNamedQueryAndNamedParam(string queryName, string[] paramNames, object[] values);
+
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// number of values to named parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters.</param>
+        /// <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+        /// if paramNames length is not equal to types length (when types is not null)</exception>        
+        IList FindByNamedQueryAndNamedParam(string queryName, string[] paramNames, object[] values, IType[] types);
+
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding the properties
+        /// of the given object to named parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="valueObject">The values of the parameters</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList FindByNamedQueryAndValueObject(string queryName, object valueObject);
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding the properties
+        /// of the given object to <i>named</i> parameters in the query string.
+        /// </summary>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>       
+        /// <param name="valueObject">The values of the parameters</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList FindByValueObject(string queryString, object valueObject);
+
+        #endregion
+			
+        #region Convenience methods for loading individual objects
+
+        /// <summary>
+        /// Return the persistent instance of the given entity type
+        /// with the given identifier, or <code>null</code> if not found.
+        /// </summary>
+        /// <param name="entityType">a persistent type.</param>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <returns>the persistent instance, or null if not found</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        object Get(Type entityType, object id);
+
+        /// <summary>
+        /// Return the persistent instance of the given entity type
+        /// with the given identifier, or <code>null</code> if not found.
+        /// Obtains the specified lock mode if the instance exists.
+        /// </summary>
+        /// <param name="entityType">A persistent class.</param>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <param name="lockMode">The lock mode.</param>
+        /// the persistent instance, or <code>null</code> if not found
+        /// <returns>the persistent instance, or null if not found</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        object Get(Type entityType, object id, LockMode lockMode);
+
+        /// <summary>
+        /// Return the persistent instance of the given entity class
+        ///  with the given identifier, throwing an exception if not found.
+        /// </summary>
+        /// <param name="entityType">Type of the entity.</param>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <returns>The persistent instance</returns>
+        /// <exception cref="ObjectRetrievalFailureException">If not found</exception>     
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception> 
+        object Load(Type entityType, object id);
+
+        /// <summary>
+        /// Return the persistent instance of the given entity class
+        /// with the given identifier, throwing an exception if not found.
+        /// Obtains the specified lock mode if the instance exists.
+        /// </summary>
+        /// <param name="entityType">Type of the entity.</param>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <param name="lockMode">The lock mode.</param>
+        /// <returns>The persistent instance</returns>
+        /// <exception cref="ObjectRetrievalFailureException">If not found</exception>     
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception> 
+        object Load(Type entityType, object id, LockMode lockMode);
+
+
+
+        /// <summary>
+        /// Return all persistent instances of the given entity class.
+        /// Note: Use queries or criteria for retrieving a specific subset.
+        /// </summary>
+        /// <param name="entityType">Type of the entity.</param>
+        /// <returns>A List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception> 
+        IList LoadAll(Type entityType);
+
+
+
+
+
+        #endregion
+
+        #region Convenience methods for storing individual objects
+
+        /// <summary>
+        /// Save or update all given persistent instances,
+        /// according to its id (matching the configured "unsaved-value"?).
+        /// </summary>
+        /// <param name="entities">Tthe persistent instances to save or update
+        /// (to be associated with the Hibernate Session)he entities.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        void SaveOrUpdateAll(ICollection entities);
+
+
+        #endregion 
+
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs
new file mode 100644
index 00000000..78c62118
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs
@@ -0,0 +1,391 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+using System.Data;
+using Common.Logging;
+using NHibernate;
+using NHibernate.Cfg;
+using NHibernate.Connection;
+using Spring.Core.IO;
+using Spring.Data.Common;
+using Spring.Objects.Factory;
+using Environment = NHibernate.Cfg.Environment;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// An IFactoryObject that creates a local Hibernate SessionFactory instance.
+    /// Behaves like a SessionFactory instance when used as bean reference,
+    /// e.g. for HibernateTemplate's "SessionFactory" property.
+	/// </summary>
+	/// <remarks>
+	/// The typical usage will be to register this as singleton factory 
+	/// in an application context and give objects references to application services
+	/// that need it.
+	/// <para>
+	/// Hibernate configuration settings can be set using the IDictionary property 'HibernateProperties'.
+	/// 
+	/// </para>
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: LocalSessionFactoryObject.cs,v 1.7 2008/03/21 14:12:16 markpollack Exp $</version>
+	public class LocalSessionFactoryObject : IFactoryObject, IInitializingObject, System.IDisposable
+	{
+		#region Fields
+
+        private Configuration configuration;
+
+	    private ISessionFactory sessionFactory;
+
+        private string[] mappingAssemblies;
+
+        private string[] mappingResources;
+
+        private string[] configFilenames;
+
+        /// <summary>
+        /// TODO: consider changing to NamevalueCollection for easier
+        /// cut-n-paste from existing App.config based configurations.
+        /// </summary>
+        private IDictionary hibernateProperties;
+
+        private IDbProvider dbProvider;
+
+		#endregion
+
+		#region Constants
+
+		/// <summary>
+		/// The shared <see cref="ILog"/> instance for this class (and derived classes). 
+		/// </summary>
+		protected static readonly ILog log =
+			LogManager.GetLogger(typeof (LocalSessionFactoryObject));
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="LocalSessionFactoryObject"/> class.
+                /// </summary>
+		public 	LocalSessionFactoryObject()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Sets the assemblies to load that contain mapping files.
+        /// </summary>
+        /// <value>The mapping assemblies.</value>
+	    public string[] MappingAssemblies
+	    {
+	        set { mappingAssemblies = value; }
+	    }
+
+                /// <summary>
+        /// Sets the hibernate configuration files to load, i.e. hibernate.cfg.xml.
+        /// </summary>
+	    public string[] ConfigFilenames
+	    {
+	        set { configFilenames = value; }
+	    }
+
+        /// <summary>
+        /// Sets the locations of Spring IResources that contain mapping
+        /// files.
+        /// </summary>
+        /// <value>The location of mapping resources.</value>
+	    public string[] MappingResources
+	    {
+	        set { mappingResources = value;}
+	    }
+
+        /// <summary>
+        /// Return the Configuration object used to build the SessionFactory.
+        /// Allows access to configuration metadata stored there (rarely needed).
+        /// </summary>
+        /// <value>The hibernate configuration.</value>
+	    public Configuration Configuration
+	    {
+	        get { return configuration; }
+	    }
+
+        /// <summary>
+        /// Set NHibernate configuration properties, like "hibernate.dialect".
+        /// </summary>
+        /// <value>The hibernate properties.</value>
+        /// <remarks>
+        /// 	<p>Can be used to override values in a NHibernate XML config file,
+        /// or to specify all necessary properties locally.
+        /// </p>
+        /// 	<p>Note: Do not specify a transaction provider here when using
+        /// Spring-driven transactions. It is also advisable to omit connection
+        /// provider settings and use a Spring-set IDbProvider instead.
+        /// </p>
+        /// </remarks>
+	    public IDictionary HibernateProperties
+	    {
+	        get
+	        {
+	            if (hibernateProperties == null)
+	            {
+	                hibernateProperties = new Hashtable();                    
+	            }
+                return hibernateProperties;
+	        }
+	        set
+	        {
+	            hibernateProperties = value;
+	        }
+	    }
+
+        /// <summary>
+        /// Get or set the DataSource to be used by the SessionFactory.
+        /// </summary>
+        /// <value>The db provider.</value>
+        /// <remarks>
+        /// If set, this will override corresponding settings in Hibernate properties.
+        /// <note>Note: If this is set, the Hibernate settings should not define
+        /// a connection string
+        /// (hibernate.connection.connection_string) to avoid meaningless double configuration.
+        /// </note>
+        /// </remarks>
+	    public IDbProvider DbProvider
+	    {
+	        set { dbProvider = value; }
+            get { return dbProvider;  }
+	    }
+	   
+
+	    #endregion
+
+		#region Methods
+
+		#endregion
+
+        /// <summary>
+        /// Return the singleon session factory.
+        /// </summary>
+	    public object GetObject()
+	    {
+	        return sessionFactory;
+	    }
+
+        /// <summary>
+        /// Return the type <see cref="ISessionFactory"/> or subclass.
+        /// </summary>
+        /// <value>The type created by this factory</value>
+	    public System.Type ObjectType
+	    {
+	        get
+	        {
+                return (sessionFactory != null) ? sessionFactory.GetType() : typeof(ISessionFactory);	           
+	        }
+	    }
+
+        /// <summary>
+        /// Returns true
+        /// </summary>
+        /// <value>true</value>
+	    public bool IsSingleton
+	    {
+            get
+            {
+                return true;
+            }
+	    }
+
+        /// <summary>
+        /// Initialize the SessionFactory for the given or the 
+        /// default location.
+        /// </summary>
+	    public void AfterPropertiesSet()
+	    {
+            // Create Configuration instance.
+            Configuration config = NewConfiguration();
+
+
+            if (this.dbProvider != null)
+            {
+                config.SetProperty(Environment.ConnectionString, dbProvider.ConnectionString);
+                config.SetProperty(Environment.ConnectionProvider, typeof(DbProviderWrapper).AssemblyQualifiedName);
+            }
+
+            if (this.hibernateProperties != null)
+            {
+                if (config.GetProperty(Environment.ConnectionProvider) != null &&
+                    hibernateProperties.Contains(Environment.ConnectionProvider))
+                {
+                    #region Logging
+                    if (log.IsWarnEnabled)
+                    {
+                        log.Warn("Overriding use of Spring's Hibernate Connection Provider with [" +
+                                 hibernateProperties[Environment.ConnectionProvider] + "]");
+                    }
+                    #endregion
+                    config.Properties.Remove(Environment.ConnectionProvider);
+                }
+                config.AddProperties(hibernateProperties);
+            }
+            if (this.mappingAssemblies != null)
+            {
+                foreach (string assemblyName in mappingAssemblies)
+                {
+                    config.AddAssembly(assemblyName);
+                }
+            }
+            
+            IResourceLoader resourceLoader = new ConfigurableResourceLoader();
+            
+            if (this.mappingResources != null)
+            {
+                foreach (string resourceName in mappingResources)
+                {
+                    config.AddInputStream(resourceLoader.GetResource(resourceName).InputStream);
+                }
+            }
+
+            if (configFilenames != null)
+            {
+                foreach (string configFilename in configFilenames)
+                {
+                    config.Configure(configFilename);
+                }
+            }
+
+            // Perform custom post-processing in subclasses.
+            PostProcessConfiguration(config);
+
+            // Build SessionFactory instance.
+            log.Info("Building new Hibernate SessionFactory");
+            this.configuration = config;
+            this.sessionFactory = NewSessionFactory(config);
+
+
+	    }
+
+	    /// <summary>
+        /// Close the SessionFactory on application context shutdown.
+        /// </summary>
+	    public void Dispose()
+	    {
+            if (sessionFactory != null)
+            {
+                #region Instrumentation
+                if (log.IsInfoEnabled)
+                {
+                    log.Info("Closing Hibernate SessionFactory");
+                }
+                #endregion
+                sessionFactory.Close();
+            }
+	    }
+
+        /// <summary>
+        /// Subclasses can override this method to perform custom initialization
+        /// of the Configuration instance used for ISessionFactory creation.
+        /// </summary>
+        /// <remarks>
+        /// The properties of this LocalSessionFactoryObject will be applied to
+        /// the Configuration object that gets returned here.
+        /// <p>The default implementation creates a new Configuration instance.
+        /// A custom implementation could prepare the instance in a specific way,
+        /// or use a custom Configuration subclass. 
+        /// </p>       
+        /// </remarks>
+        protected virtual Configuration NewConfiguration()
+        {
+            return new Configuration();
+        }
+
+        /// <summary>
+        /// To be implemented by subclasses that want to to perform custom
+        /// post-processing of the Configuration object after this FactoryObject
+        /// performed its default initialization.
+        /// </summary>
+        /// <param name="config">The current configuration object.</param>
+        protected virtual void PostProcessConfiguration(Configuration config)
+        {
+        }
+
+        /// <summary>
+        /// Subclasses can override this method to perform custom initialization
+        /// of the SessionFactory instance, creating it via the given Configuration
+        /// object that got prepared by this LocalSessionFactoryObject.
+        /// </summary>
+        /// <remarks>
+        /// <p>The default implementation invokes Configuration's BuildSessionFactory.
+        /// A custom implementation could prepare the instance in a specific way,
+        /// or use a custom ISessionFactory subclass.
+        /// </p>
+        /// </remarks>
+        protected virtual ISessionFactory NewSessionFactory(Configuration config) 
+        {
+            ISessionFactory sf = config.BuildSessionFactory();
+            DbProviderWrapper dbProviderWrapper = sf.ConnectionProvider as DbProviderWrapper;
+            if (dbProviderWrapper != null)
+            {
+                dbProviderWrapper.DbProvider = dbProvider;
+            }
+            return sf;
+        }
+
+        #region DbProviderWrapper Helper class
+
+        internal class DbProviderWrapper : ConnectionProvider
+        {
+            private IDbProvider _dbProvider;
+
+            public DbProviderWrapper()
+            {
+            }
+
+            public IDbProvider DbProvider
+            {
+                get { return _dbProvider; }
+                set { _dbProvider = value; }
+            }
+
+            public override void CloseConnection(IDbConnection conn)
+            {
+                base.CloseConnection(conn);
+                conn.Dispose();
+            }
+
+            public override IDbConnection GetConnection()
+            {
+                IDbConnection dbCon = _dbProvider.CreateConnection();
+                dbCon.Open();
+                return dbCon;
+            }
+        }
+
+        #endregion // DbProviderWrapper Helper class
+
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/SessionFactoryUtils.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/SessionFactoryUtils.cs
new file mode 100644
index 00000000..343347a4
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/SessionFactoryUtils.cs
@@ -0,0 +1,713 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Common.Logging;
+using NHibernate;
+using NHibernate.Connection;
+using NHibernate.Driver;
+using NHibernate.Engine;
+using Spring.Collections;
+using Spring.Context;
+using Spring.Dao;
+using Spring.Data.Common;
+using Spring.Data.Support;
+using Spring.Objects.Factory.Config;
+using Spring.Threading;
+using Spring.Transaction.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	///  Helper class featuring methods for Hibernate Session handling,
+    ///  allowing for reuse of Hibernate Session instances within transactions.
+    ///  Also provides support for exception translation.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: SessionFactoryUtils.cs,v 1.5 2008/04/08 20:26:37 markpollack Exp $</version>
+	public abstract class SessionFactoryUtils 
+	{
+		#region Fields
+
+        /// <summary>
+        /// The <see cref="ILog"/> instance for this class. 
+        /// </summary>
+        private static readonly ILog log = LogManager.GetLogger(typeof(SessionFactoryUtils));
+
+		#endregion
+
+		#region Constants
+
+        /// <summary>
+        /// The ordering value for synchronizaiton this session resources.
+        /// Set to be lower than ADO.NET synchronization.
+        /// </summary>
+        public static readonly int SESSION_SYNCHRONIZATION_ORDER =
+            AdoUtils.CONNECTION_SYNCHRONIZATION_ORDER - 100;
+
+        private static readonly string DeferredCloseHolderDataSlotName = "Spring.Data.NHibernate:deferredCloseHolder";
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SessionFactoryUtils"/> class.
+        /// </summary>
+		public SessionFactoryUtils()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+
+        /// <summary>
+        /// Get a new Hibernate Session from the given SessionFactory.
+        /// Will return a new Session even if there already is a pre-bound
+        /// Session for the given SessionFactory.
+        /// </summary>
+        /// <remarks>
+        /// Within a transaction, this method will create a new Session
+        /// that shares the transaction's ADO.NET Connection. More specifically,
+        /// it will use the same ADO.NET Connection as the pre-bound Hibernate Session.
+        /// </remarks>
+        /// <param name="sessionFactory">The session factory to create the session with.</param>
+        /// <param name="interceptor">The Hibernate entity interceptor, or <code>null</code> if none.</param>
+        /// <returns>The new session.</returns>
+        /// <exception cref="DataAccessResourceFailureException">If could not open Hibernate session</exception>
+	    public static ISession GetNewSession(ISessionFactory sessionFactory, IInterceptor interceptor)
+	    {
+            try 
+            {
+                SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.GetResource(sessionFactory);
+                if (sessionHolder != null && !sessionHolder.IsEmpty) 
+                {
+                    if (interceptor != null) 
+                    {
+                        return sessionFactory.OpenSession(sessionHolder.AnySession.Connection, interceptor);
+                    }
+                    else 
+                    {
+                        return sessionFactory.OpenSession(sessionHolder.AnySession.Connection);
+                    }
+                }
+                else 
+                {
+                    if (interceptor != null) 
+                    {
+                        return sessionFactory.OpenSession(interceptor);
+                    }
+                    else 
+                    {
+                        return sessionFactory.OpenSession();
+                    }
+                }
+            }
+            catch (HibernateException ex) 
+            {
+                throw new DataAccessResourceFailureException("Could not open Hibernate Session", ex);
+            }
+	    }
+
+        /// <summary>
+        /// Get a Hibernate Session for the given SessionFactory. Is aware of and will
+        /// return any existing corresponding Session bound to the current thread, for
+        /// example when using HibernateTransactionManager. Will always create a new
+        /// Session otherwise.
+        /// </summary>
+        /// <remarks>
+        /// Supports setting a Session-level Hibernate entity interceptor that allows
+        /// to inspect and change property values before writing to and reading from the
+        /// database. Such an interceptor can also be set at the SessionFactory level
+        /// (i.e. on LocalSessionFactoryObject), on HibernateTransactionManager, or on
+        /// HibernateInterceptor/HibernateTemplate.
+        /// </remarks>
+        /// <param name="sessionFactory">The session factory to create the
+        /// session with.</param>
+        /// <param name="entityInterceptor">Hibernate entity interceptor, or <code>null</code> if none.</param>
+        /// <param name="adoExceptionTranslator"> AdoExceptionTranslator to use for flushing the
+        /// Session on transaction synchronization (can be <code>null</code>; only used when actually
+        /// registering a transaction synchronization).</param>
+        /// <returns>The Hibernate Session</returns>
+        /// <exception cref="DataAccessResourceFailureException">
+        /// If the session couldn't be created.
+        /// </exception>
+        /// <exception cref="InvalidOperationException">
+        /// If no thread-bound Session found and allowCreate is false.
+        /// </exception>
+        public static ISession GetSession(
+            ISessionFactory sessionFactory, IInterceptor entityInterceptor,
+            IAdoExceptionTranslator adoExceptionTranslator)
+        {
+            try
+            {
+                return GetSession(sessionFactory, entityInterceptor, adoExceptionTranslator, true);
+            }
+            catch (HibernateException ex)
+            {
+                throw new DataAccessResourceFailureException("Could not open Hibernate Session", ex);
+            }
+        }   
+
+        /// <summary>
+        /// Get a Hibernate Session for the given SessionFactory. Is aware of and will
+        /// return any existing corresponding Session bound to the current thread, for
+        /// example when using <see cref="HibernateTransactionManager"/>. Will create a new Session
+        /// otherwise, if allowCreate is true.
+        /// </summary>
+        /// <param name="sessionFactory">The session factory to create the session with.</param>
+        /// <param name="allowCreate">if set to <c>true</c> create a non-transactional Session when no
+        /// transactional Session can be found for the current thread.</param>
+        /// <returns>The hibernate session</returns>
+        /// <exception cref="DataAccessResourceFailureException">
+        /// If the session couldn't be created.
+        /// </exception>
+        /// <exception cref="InvalidOperationException">
+        /// If no thread-bound Session found and allowCreate is false.
+        /// </exception>
+        public static ISession GetSession(ISessionFactory sessionFactory, bool allowCreate)
+        {
+            try
+            {
+                return GetSession(sessionFactory, null, null, allowCreate);
+            }
+            catch (HibernateException ex)
+            {
+                throw new DataAccessResourceFailureException("Could not open Hibernate Session", ex);
+            }
+        }
+
+        /// <summary>
+        /// Get a Hibernate Session for the given SessionFactory.
+        /// </summary>
+        /// <remarks>Is aware of and will return any existing corresponding
+        /// Session bound to the current thread, for example whenusing
+        /// <see cref="HibernateTransactionManager"/>.  Will create a new 
+        /// Session otherwise, if "allowCreate" is true.
+        /// <p>Throws the orginal HibernateException, in contrast to
+        /// <see cref="GetSession(ISessionFactory, bool)"/>.
+        /// </p></remarks>
+        /// <param name="sessionFactory">The session factory.</param>
+        /// <param name="allowCreate">if set to <c>true</c> [allow create].</param>
+        /// <returns>The Hibernate Session</returns>
+        /// <exception cref="HibernateException">
+        /// if the Session couldn't be created
+        /// </exception>
+        /// <exception cref="InvalidOperationException">
+        /// If no thread-bound Session found and allowCreate is false.
+        /// </exception>
+        public static ISession DoGetSession(ISessionFactory sessionFactory, bool allowCreate)
+        {
+            return DoGetSession(sessionFactory, null, null, allowCreate);
+        }
+
+        private static ISession GetSession(
+            ISessionFactory sessionFactory, IInterceptor entityInterceptor,
+            IAdoExceptionTranslator adoExceptionTranslator, bool allowCreate)
+        {
+            try
+            {
+                return DoGetSession(sessionFactory, entityInterceptor, adoExceptionTranslator, allowCreate);
+            }
+            catch (HibernateException ex)
+            {
+                throw new DataAccessResourceFailureException("Could not open Hibernate Session", ex);
+            }
+        }
+
+
+        private static ISession DoGetSession(
+            ISessionFactory sessionFactory, IInterceptor entityInterceptor,
+            IAdoExceptionTranslator adoExceptionTranslator, bool allowCreate)
+        {
+            AssertUtils.ArgumentNotNull(sessionFactory, "sessionFactory", "SessionFactory can not be null");
+
+            SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.GetResource(sessionFactory);
+            if (sessionHolder != null && !sessionHolder.IsEmpty) 
+            {
+                // pre-bound Hibernate Session
+                ISession session = null;
+                if (TransactionSynchronizationManager.SynchronizationActive &&
+                    sessionHolder.DoesNotHoldNonDefaultSession)
+                {
+                    // Spring transaction management is active ->
+                    // register pre-bound Session with it for transactional flushing.
+                    session = sessionHolder.ValidatedSession;
+                    if (!sessionHolder.SynchronizedWithTransaction) 
+                    {
+                        log.Debug("Registering Spring transaction synchronization for existing Hibernate Session");
+                        TransactionSynchronizationManager.RegisterSynchronization(
+                            new SpringSessionSynchronization(sessionHolder, sessionFactory, adoExceptionTranslator, false));
+                        sessionHolder.SynchronizedWithTransaction = true;
+                        // Switch to FlushMode.AUTO if we're not within a read-only transaction.
+                        FlushMode flushMode = session.FlushMode;
+                        if (FlushMode.Never == flushMode &&
+                            !TransactionSynchronizationManager.CurrentTransactionReadOnly) 
+                        {
+                            session.FlushMode = FlushMode.Auto;
+                            sessionHolder.PreviousFlushMode = flushMode;
+                        }
+                    }
+                }
+                else
+                {
+                   // No Spring transaction management active -> simply return default thread-bound Session, if any
+                   // (possibly from OpenSessionInViewModule)
+                    session = sessionHolder.ValidatedSession;
+                }
+                
+                if (session != null) 
+                {
+                    return session;
+                }
+                
+            }
+
+
+            ISession sess = OpenSession(sessionFactory, entityInterceptor);
+            // Set Session to FlushMode.Never if we're within a read-only transaction.
+            // Use same Session for further Hibernate actions within the transaction.
+            // Thread object will get removed by synchronization at transaction completion.
+            if (TransactionSynchronizationManager.SynchronizationActive) 
+            {
+                log.Debug("Registering Spring transaction synchronization for new Hibernate Session");
+                SessionHolder holderToUse = sessionHolder;
+                if (holderToUse == null) 
+                {
+                    holderToUse = new SessionHolder(sess);
+                }
+                else 
+                {
+                    holderToUse.AddSession(sess);
+                }
+                if (TransactionSynchronizationManager.CurrentTransactionReadOnly) 
+                {
+                    sess.FlushMode = FlushMode.Never;
+                }
+                TransactionSynchronizationManager.RegisterSynchronization(
+                    new SpringSessionSynchronization(holderToUse, sessionFactory, adoExceptionTranslator, true));
+                holderToUse.SynchronizedWithTransaction = true;
+                if (holderToUse != sessionHolder) 
+                {
+                    TransactionSynchronizationManager.BindResource(sessionFactory, holderToUse);
+                }
+            }
+
+            
+
+            // Check whether we are allowed to return the Session.
+            if (!allowCreate && !IsSessionTransactional(sess, sessionFactory)) 
+            {
+                CloseSession(sess);
+                throw new InvalidOperationException ("No Hibernate Session bound to thread, " +
+                    "and configuration does not allow creation of non-transactional one here");
+            }
+
+            return sess;
+
+
+        }
+
+	    /// <summary>
+	    /// Open a new Session from the factory.
+	    /// </summary>
+        /// <param name="sessionFactory">The session factory to create the session with.</param>
+        /// <param name="entityInterceptor">Hibernate entity interceptor, or <code>null</code> if none.</param>
+        /// <returns>the newly opened session</returns>
+        internal static ISession OpenSession(ISessionFactory sessionFactory, IInterceptor entityInterceptor)
+        {
+            log.Debug("Opening Hibernate Session");
+            ISession session = (
+                                   (entityInterceptor != null)
+                                   ? sessionFactory.OpenSession(entityInterceptor) 
+                                   : sessionFactory.OpenSession()
+                               );
+
+            return session;
+        }	         
+   
+        /// <summary>
+        /// Perform the actual closing of the Hibernate Session
+        /// catching and logging any cleanup exceptions thrown.
+        /// </summary>
+        /// <param name="session">The hibernate session to close</param>
+        public static void CloseSession(ISession session) 
+        {
+            if (session != null) 
+            {
+                log.Debug("Closing Hibernate Session");
+                try 
+                {
+                    session.Close();
+                }
+                catch (HibernateException ex) 
+                {
+                    log.Error("Could not close Hibernate Session", ex);
+                }
+                catch (Exception ex) 
+                {
+                    log.Error("Unexpected exception on closing Hibernate Session", ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Return whether the given Hibernate Session is transactional, that is,
+        /// bound to the current thread by Spring's transaction facilities.
+        /// </summary>
+        /// <param name="session">The hibernate session to check</param>
+        /// <param name="sessionFactory">The session factory that the session
+        /// was created with, can be null.</param>
+        /// <returns>
+        /// 	<c>true</c> if the session transactional; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool IsSessionTransactional(ISession session, ISessionFactory sessionFactory) 
+        {
+            if (sessionFactory == null) 
+            {
+                return false;
+            }
+            SessionHolder sessionHolder =
+                (SessionHolder) TransactionSynchronizationManager.GetResource(sessionFactory);
+            return (sessionHolder != null && sessionHolder.ContainsSession(session));
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Convert the given HibernateException to an appropriate exception from the
+        /// <code>Spring.Dao</code> hierarchy. Note that it is advisable to
+        /// handle AdoException specifically by using a AdoExceptionTranslator for the
+        /// underlying ADO.NET exception.
+        /// </summary>
+        /// <param name="ex">The Hibernate exception that occured.</param>
+        /// <returns>DataAccessException instance</returns>
+        public static DataAccessException ConvertHibernateAccessException(HibernateException ex)
+        {
+            if (ex is ADOException)
+            {
+                // ADOException during Hibernate access: only passed in here from custom code,
+                // as HibernateTemplate etc will use AdoExceptionTranslator-based handling.
+                return new HibernateAdoException("Ado Exception", (ADOException) ex);
+            }
+            if (ex is UnresolvableObjectException)
+            {
+                return new HibernateObjectRetrievalFailureException((UnresolvableObjectException) ex);
+            }
+            if (ex is ObjectDeletedException)
+            {
+                return new InvalidDataAccessApiUsageException(ex.Message, ex);
+            }
+            if (ex is WrongClassException)
+            {
+                return new HibernateObjectRetrievalFailureException((WrongClassException) ex);
+            }
+            if (ex is StaleObjectStateException)
+            {
+                return new HibernateOptimisticLockingFailureException((StaleObjectStateException) ex);
+            }
+            if (ex is QueryException)
+            {
+                return new HibernateQueryException((QueryException) ex);
+            }
+            if (ex is PersistentObjectException)
+            {
+                return new InvalidDataAccessApiUsageException(ex.Message, ex);
+            }
+            if (ex is TransientObjectException)
+            {
+                return new InvalidDataAccessApiUsageException(ex.Message, ex);
+            }
+
+            if (ex is PropertyValueException)
+            {
+                return new DataIntegrityViolationException(ex.Message, ex);
+            }
+            if (ex is PersistentObjectException)
+            {
+                return new InvalidDataAccessApiUsageException(ex.Message, ex);
+            }
+            if (ex is NonUniqueResultException)
+            {
+                return new IncorrectResultSizeDataAccessException(ex.Message, 1);
+            }
+            // fallback
+            return new HibernateSystemException(ex);
+        }
+
+        /// <summary>
+        /// Close the given Session, created via the given factory,
+        /// if it is not managed externally (i.e. not bound to the thread).
+        /// </summary>
+        /// <param name="session">The hibernate session to close</param>
+        /// <param name="sessionFactory">The hibernate SessionFactory that
+        /// the session was created with.</param>
+	    public static void ReleaseSession(ISession session, ISessionFactory sessionFactory)
+	    {
+            if (session == null) 
+            {
+                return;
+            }
+            // Only close non-transactional Sessions.
+            if (!IsSessionTransactional(session, sessionFactory)) 
+            {
+                CloseSessionOrRegisterDeferredClose(session, sessionFactory);
+            }
+	    }
+
+        /// <summary>
+        /// Close the given Session or register it for deferred close.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="sessionFactory">The session factory.</param>
+	    internal static void CloseSessionOrRegisterDeferredClose(ISession session, ISessionFactory sessionFactory)
+	    {
+            IDictionary holderDictionary = LogicalThreadContext.GetData(DeferredCloseHolderDataSlotName) as IDictionary;
+            
+            if (holderDictionary != null && sessionFactory != null && holderDictionary.Contains(sessionFactory)) 
+            {
+                log.Debug("Registering Hibernate Session for deferred close");
+                // Switch Session to FlushMode.NEVER for remaining lifetime.
+                session.FlushMode = FlushMode.Never;
+                Set sessions = (Set) holderDictionary[sessionFactory];
+                sessions.Add(session);
+            }
+            else 
+            {
+                CloseSession(session);
+            }
+	    }
+
+        /// <summary>
+	    ///Initialize deferred close for the current thread and the given SessionFactory.
+	    /// Sessions will not be actually closed on close calls then, but rather at a
+	    /// processDeferredClose call at a finishing point (like request completion).
+        /// </summary>
+        /// <param name="sessionFactory">The session factory.</param>
+        public static void InitDeferredClose(ISessionFactory sessionFactory) 
+        {
+            AssertUtils.ArgumentNotNull(sessionFactory, "No SessionFactory specified");
+
+            log.Debug("Initializing deferred close of Hibernate Sessions");
+
+            IDictionary holderDictionary = LogicalThreadContext.GetData(DeferredCloseHolderDataSlotName) as IDictionary;
+          
+            if (holderDictionary == null) 
+            {
+                holderDictionary = new Hashtable();
+                LogicalThreadContext.SetData(DeferredCloseHolderDataSlotName, holderDictionary);
+            }
+            holderDictionary.Add(sessionFactory, new ListSet());
+        }
+
+        /// <summary>
+        /// Return if deferred close is active for the current thread
+        /// and the given SessionFactory.</summary>
+        /// <param name="sessionFactory">The session factory.</param>
+        /// <returns>
+        /// 	<c>true</c> if [is deferred close active] [the specified session factory]; otherwise, <c>false</c>.
+        /// </returns>
+        /// <exception cref="ArgumentNullException">If SessionFactory argument is null.</exception>
+        public static bool IsDeferredCloseActive(ISessionFactory sessionFactory) 
+        {
+            if (sessionFactory == null)
+            {
+                throw new ArgumentNullException("sessionFactory", "No SessionFactory specified");
+            }
+            IDictionary holderDictionary = LogicalThreadContext.GetData(DeferredCloseHolderDataSlotName) as IDictionary;          
+            return (holderDictionary != null && holderDictionary.Contains(sessionFactory));
+        }
+
+        /// <summary>
+        /// Process Sessions that have been registered for deferred close
+        /// for the given SessionFactory.
+        /// </summary>
+        /// <param name="sessionFactory">The session factory.</param>
+        /// <exception cref="InvalidOperationException">If there is no session factory associated with the thread.</exception>
+        public static void ProcessDeferredClose(ISessionFactory sessionFactory) 
+        {
+            AssertUtils.ArgumentNotNull(sessionFactory, "No SessionFactory specified");
+
+            IDictionary holderDictionary = LogicalThreadContext.GetData(DeferredCloseHolderDataSlotName) as IDictionary;
+          
+            if (holderDictionary == null || !holderDictionary.Contains(sessionFactory)) 
+            {
+                throw new InvalidOperationException("Deferred close not active for SessionFactory [" + sessionFactory + "]");
+            }
+            log.Debug("Processing deferred close of Hibernate Sessions");
+            Set sessions = (Set) holderDictionary[sessionFactory];
+            holderDictionary.Remove(sessionFactory);
+            foreach (ISession session in sessions)
+            {
+                CloseSession(session);
+            }
+
+            if (holderDictionary.Count == 0)
+            {
+                LogicalThreadContext.FreeNamedDataSlot(DeferredCloseHolderDataSlotName);
+            }
+
+
+        }
+
+        /// <summary>
+        /// Applies the current transaction timeout, if any, to the given
+        /// criteria object
+        /// </summary>
+        /// <param name="criteria">The Hibernate Criteria object.</param>
+        /// <param name="sessionFactory">Hibernate SessionFactory that the Criteria was created for
+        /// (can be <code>null</code>).</param>
+        /// <exception cref="ArgumentNullException">If criteria argument is null.</exception>
+        public static void ApplyTransactionTimeout(ICriteria criteria, ISessionFactory sessionFactory) 
+        {
+            if (criteria == null)
+            {
+                throw new ArgumentNullException("criteria", "No Criteria object specified");
+            }
+
+            SessionHolder sessionHolder =
+                (SessionHolder) TransactionSynchronizationManager.GetResource(sessionFactory);
+            if (sessionHolder != null && sessionHolder.HasTimeout) 
+            {
+                criteria.SetTimeout(sessionHolder.TimeToLiveInSeconds);
+            }
+        }
+
+        /// <summary>
+        /// Applies the current transaction timeout, if any, to the given
+        /// Hibenrate query object.
+        /// </summary>
+        /// <param name="query">The Hibernate Query object.</param>
+        /// <param name="sessionFactory">Hibernate SessionFactory that the Query was created for
+        /// (can be <code>null</code>).</param>
+        /// <exception cref="ArgumentNullException">If query argument is null.</exception>
+	    public static void ApplyTransactionTimeout(IQuery query, ISessionFactory sessionFactory)
+	    {	        
+            if (query == null)
+            {
+                throw new ArgumentNullException("queryObject", "No query object specified");
+            }
+            if (sessionFactory != null) 
+            {
+                SessionHolder sessionHolder =
+                    (SessionHolder) TransactionSynchronizationManager.GetResource(sessionFactory);
+                if (sessionHolder != null && sessionHolder.HasTimeout) 
+                {
+                    query.SetTimeout(sessionHolder.TimeToLiveInSeconds);
+                }
+            }
+	    }
+        /// <summary>
+        /// Gets the Spring IDbProvider given the ISessionFactory.
+        /// </summary>
+        /// <remarks>The matching is performed by comparing the assembly qualified
+        /// name string of the hibernate Driver.ConnectionType to those in
+        /// the DbProviderFactory definitions.  No connections are created
+        /// in performing this comparison.</remarks>
+        /// <param name="sessionFactory">The session factory.</param>
+        /// <returns>The corresponding IDbProvider, null if no mapping was found.</returns>
+        /// <exception cref="InvalidOperationException">If DbProviderFactory's ApplicaitonContext is not
+        /// an instance of IConfigurableApplicaitonContext.</exception>
+	    public static IDbProvider GetDbProvider(ISessionFactory sessionFactory)
+	    {
+	        ISessionFactoryImplementor sfi = sessionFactory as ISessionFactoryImplementor;
+	        if (sfi != null)
+	        {
+	            
+                ConnectionProvider cp = sfi.ConnectionProvider as ConnectionProvider;
+	            if (cp != null)
+	            {
+                    IConfigurableApplicationContext ctx =
+	                    Spring.Data.Common.DbProviderFactory.ApplicationContext as IConfigurableApplicationContext;
+                    if (ctx == null)
+                    {
+                        throw new InvalidOperationException(
+                            "Implementations of IApplicationContext must also implement IConfigurableApplicationContext");
+                    }
+
+
+                    DriverBase db = cp.Driver as DriverBase;
+                    if (db != null)
+                    {
+                        Type hibCommandType = db.CreateCommand().GetType();
+                        //Type hibConnectionType = cp.Driver.ConnectionType;
+
+                        string[] providerNames = ctx.GetObjectNamesForType(typeof(DbProvider), true, false);
+                        string hibCommandAQN = hibCommandType.AssemblyQualifiedName;
+                        foreach (string providerName in providerNames)
+                        {
+                            IObjectDefinition objectdef = ctx.ObjectFactory.GetObjectDefinition(providerName);
+                            ConstructorArgumentValues ctorArgs = objectdef.ConstructorArgumentValues;
+                            ConstructorArgumentValues.ValueHolder vh = ctorArgs.NamedArgumentValues["dbmetadata"] as ConstructorArgumentValues.ValueHolder;
+                            IObjectDefinition od = vh.Value as IObjectDefinition;
+                            ConstructorArgumentValues dbmdCtorArgs = od.ConstructorArgumentValues;
+                            string commandType = dbmdCtorArgs.GetArgumentValue("commandType", typeof(string)).Value as string;
+                            string assemblyName = dbmdCtorArgs.GetArgumentValue("assemblyName", typeof(string)).Value as string;
+
+
+                            if (hibCommandAQN.Equals(commandType))
+                            {
+                                IDbProvider prov = Spring.Data.Common.DbProviderFactory.GetDbProvider(providerName);
+                                return prov;
+                            }
+                        }
+                    }
+	                else
+                    {
+                        log.Info("Could not derive IDbProvider from SessionFactory");
+                    }
+	            }
+	            
+	            
+	        }
+	        return null;
+	    }
+
+        /// <summary>
+        /// Create a IAdoExceptionTranslator from the given SessionFactory.
+        /// </summary>
+        /// <remarks>If a corresponding IDbProvider is found, a ErrorcodeExceptionTranslator
+        /// for the IDbProvider is created.  Otherwise, a FallbackException is created.</remarks>
+        /// <param name="sessionFactory">The session factory to create the translator for</param>
+        /// <returns>An IAdoExceptionTranslator</returns>
+	    public static IAdoExceptionTranslator NewAdoExceptionTranslator(ISessionFactory sessionFactory)
+	    {
+            IDbProvider dbProvider = GetDbProvider(sessionFactory);
+	        if (dbProvider != null)
+	        {
+                return new ErrorCodeExceptionTranslator(dbProvider);
+	        }
+	        log.Warn("Using FallbackException Translator.  Could not translate from ISessionFactory to IDbProvider");
+            return new FallbackExceptionTranslator();
+	        
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/SessionHolder.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/SessionHolder.cs
new file mode 100644
index 00000000..b821b6d7
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/SessionHolder.cs
@@ -0,0 +1,375 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using Common.Logging;
+using NHibernate;
+using Spring.Collections;
+using Spring.Transaction.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+    /// Session holder, wrapping a NHibernate ISession and a NHibernate Transaction.
+    /// HibernateTransactionManager binds instances of this class
+    /// to the thread, for a given ISessionFactory.
+	/// </summary>
+	/// <remarks>
+	/// Note: This is an SPI class, not intended to be used by applications.
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: SessionHolder.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+	public class SessionHolder : ResourceHolderSupport
+	{
+		#region Fields
+	    
+        private static readonly object DEFAULT_KEY = new object();
+
+        private readonly Hashtable sessionDictionary = new Hashtable(1);
+               
+        private IDbConnection connection;
+
+        private ITransaction transaction;
+
+        private FlushMode flushMode;
+
+	    //needed to see if we actually assigned the enum value...
+        private bool assignedPreviousFlushMode = false;
+
+		#endregion
+
+	    #region Logging Definition
+
+	    private static readonly ILog log = LogManager.GetLogger(typeof (SessionHolder));
+
+	    #endregion
+
+	    #region Constructor (s)
+
+	    /// <summary>
+	    /// May be used by derived classes to create an empty SessionHolder.
+	    /// </summary>
+	    /// <remarks>
+	    /// When using this ctor in your derived class, you MUST override <see cref="EnsureInitialized"/>!
+	    /// </remarks>
+	    protected SessionHolder()
+	    {	        
+	    }
+	    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionHolder"/> class.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        public SessionHolder(ISession session)
+        {
+            AddSession(session);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionHolder"/> class.
+        /// </summary>
+        /// <param name="key">The key to store the session under.</param>
+        /// <param name="session">The hibernate session.</param>
+        public SessionHolder(object key, ISession session)
+        {
+            AddSession(key, session);
+        }
+	    
+	    /// <summary>
+	    /// May be overridden in a derived class to e.g. lazily create a session
+	    /// </summary>
+	    protected virtual void EnsureInitialized()
+	    {	        
+	        // noop here - but may be overridden to lazily create a session
+	    }
+	    
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Gets the session using the default key
+        /// </summary>
+        /// <value>The hibernate session.</value>
+        public ISession Session
+        {
+            get
+            {
+                lock (sessionDictionary.SyncRoot)
+                {
+                    EnsureInitialized();
+                    return sessionDictionary[DEFAULT_KEY] as ISession;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the first session based on iteration over
+        /// the IDictionary storage.
+        /// </summary>
+        /// <value>Any hibernate session.</value>
+        public ISession AnySession
+        {
+            get
+            {
+                lock(sessionDictionary.SyncRoot)
+                {
+                    EnsureInitialized();                    
+                    if (sessionDictionary.Count > 0)
+                    {
+                        IEnumerator enumerator = sessionDictionary.Values.GetEnumerator();
+                        enumerator.MoveNext();
+                        return (ISession)enumerator.Current;
+                    }
+                    return null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether dictionary of
+        /// hibernate sessions is empty.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this session holder is empty; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsEmpty
+        {
+            get
+            {
+                lock(sessionDictionary.SyncRoot)
+                {
+                    EnsureInitialized();                    
+                    return (sessionDictionary.Count > 0 ? false : true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this SessionHolder
+        /// does not hold non default session.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if does not hold non default session; otherwise, <c>false</c>.
+        /// </value>
+        public bool DoesNotHoldNonDefaultSession
+        {
+            get
+            {
+                lock (sessionDictionary.SyncRoot)
+                {
+                    EnsureInitialized();                    
+                    return ( 
+                        sessionDictionary.Count == 0 ||
+                        (sessionDictionary.Count == 1 && sessionDictionary.Contains(DEFAULT_KEY)) 
+                        );
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the hibernate transaction.
+        /// </summary>
+        /// <value>The transaction.</value>
+	    public ITransaction Transaction
+	    {
+	        get { return transaction; }
+	        set { transaction = value; }
+	    }
+
+        /// <summary>
+        /// Gets or sets the ADO.NET Connection used to create the session.
+        /// </summary>
+        /// <value>The ADO.NET connection.</value>
+	    public IDbConnection Connection
+	    {
+	        get { return connection; }
+	        set { connection = value; }
+	    }
+
+	    /// <summary>
+        /// Gets or sets the previous flush mode.
+        /// </summary>
+        /// <value>The previous flush mode.</value>
+	    public FlushMode PreviousFlushMode
+	    {
+	        get { return flushMode; }
+	        set
+	        {
+	            flushMode = value;
+                assignedPreviousFlushMode = true;
+	        }
+	    }
+
+        /// <summary>
+        /// Gets a value indicating whether the PreviousFlushMode property
+        /// was set.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if assigned PreviousFlushMode property; otherwise, <c>false</c>.
+        /// </value>
+        public bool AssignedPreviousFlushMode
+        {
+            get
+            {
+                return assignedPreviousFlushMode;
+            }
+        }
+
+        /// <summary>
+        /// Gets the validated session.
+        /// </summary>
+        /// <value>The validated session.</value>
+        public ISession ValidatedSession
+        {
+            get
+            {
+                return GetValidatedSession(DEFAULT_KEY);
+            }
+        }
+
+	    #endregion
+
+		#region Methods
+
+        /// <summary>
+        /// Gets the session given key identifier
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns>A hibernate session</returns>
+        public ISession GetSession(object key)
+        {
+            lock (sessionDictionary.SyncRoot)
+            {
+                EnsureInitialized();                
+                return sessionDictionary[key] as ISession;
+            }
+        }
+
+        
+        /// <summary>
+        /// Gets the session given the key and removes the session from
+        /// the dictionary storage.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns>A hibernate session</returns>
+        public ISession GetValidatedSession(object key)
+        {
+            lock (sessionDictionary.SyncRoot)
+            {
+                EnsureInitialized();                
+                ISession session = sessionDictionary[key] as ISession;
+                // Check for dangling Session that's around but already closed.
+                // Effectively an assertion: that should never happen in practice.
+                // We'll seamlessly remove the Session here, to not let it cause
+                // any side effects.
+                if (session != null && !session.IsOpen) 
+                {
+                    sessionDictionary.Remove(key);
+                    session = null;
+                }
+                return session;
+            }
+        }
+        /// <summary>
+        /// Adds the session to the dictionary storage using the default key.
+        /// </summary>
+        /// <param name="session">The hibernate session.</param>
+        public void AddSession(ISession session)
+        {
+            AddSession(DEFAULT_KEY, session);
+        }
+
+        /// <summary>
+        /// Adds the session to the dictionary storage using the supplied key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="session">The hibernate session.</param>
+        public void AddSession(object key, ISession session)
+        {
+            AssertUtils.ArgumentNotNull(key, "key", "Key must not be null");
+            AssertUtils.ArgumentNotNull(session, "session", "Session must not be null");
+
+            lock (sessionDictionary.SyncRoot)
+            {
+                if (sessionDictionary.ContainsKey(key))
+                {
+                    log.Debug("Overwriting Session in SessionHolder with key = "+ key);
+                }
+
+                sessionDictionary[key] =  session;
+            }
+        }
+
+        /// <summary>
+        /// Removes the session from the dictionary storage for the given key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns>The session that was previously contained in the
+        /// dictionary storage.</returns>
+        public ISession RemoveSession(object key)
+        {
+            lock(sessionDictionary.SyncRoot)
+            {
+                ISession oldSession = sessionDictionary[key] as ISession;
+                sessionDictionary.Remove(key);
+                return oldSession;
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the holder the specified session.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <returns>
+        /// 	<c>true</c> if the holder contains the specified session; otherwise, <c>false</c>.
+        /// </returns>
+        public bool ContainsSession(object session)
+        {
+            lock (sessionDictionary.SyncRoot)
+            {
+                EnsureInitialized();                
+                return sessionDictionary.ContainsValue(session);
+            }
+        }
+
+        /// <summary>
+        /// Clear the transaction state of this resource holder.
+        /// </summary>
+        public override void Clear()
+        {
+            base.Clear();
+            Transaction = null;
+            assignedPreviousFlushMode = false;
+            Connection = null;
+        }
+
+		#endregion
+
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/SpringSessionSynchronization.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/SpringSessionSynchronization.cs
new file mode 100644
index 00000000..f95b4362
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/SpringSessionSynchronization.cs
@@ -0,0 +1,275 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using Common.Logging;
+using NHibernate;
+using NHibernate.Engine;
+using Spring.Core;
+using Spring.Data.Support;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// NHibnerations actions taken during the transaction lifecycle.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: SpringSessionSynchronization.cs,v 1.2 2007/08/29 03:42:06 markpollack Exp $</version>
+	public class SpringSessionSynchronization : TransactionSynchronizationAdapter, IOrdered
+	{
+		#region Fields
+
+        /// <summary>
+        /// The <see cref="ILog"/> instance for this class. 
+        /// </summary>
+        private readonly ILog log = LogManager.GetLogger(typeof(SpringSessionSynchronization));
+	    
+        private readonly SessionHolder sessionHolder;
+
+        private readonly ISessionFactory sessionFactory;
+
+        private readonly IAdoExceptionTranslator adoExceptionTranslator;
+
+        private readonly bool newSession;
+
+        private bool holderActive = true;
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SpringSessionSynchronization"/> class.
+        /// </summary>
+        public SpringSessionSynchronization(SessionHolder sessionHolder, ISessionFactory sessionFactory,
+               	                             IAdoExceptionTranslator adoExceptionTranslator, bool newSession)
+		{
+            this.sessionHolder = sessionHolder;
+            this.sessionFactory = sessionFactory;
+            this.adoExceptionTranslator = adoExceptionTranslator;
+            this.newSession = newSession;
+		}
+
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Return the order value of this object, where a higher value means greater in
+        /// terms of sorting.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Normally starting with 0 or 1, with <see cref="System.Int32.MaxValue"/> indicating
+        /// greatest. Same order values will result in arbitrary positions for the affected
+        /// objects.
+        /// </p>
+        /// <p>
+        /// Higher value can be interpreted as lower priority, consequently the first object
+        /// has highest priority.
+        /// </p>
+        /// </remarks>
+        /// <returns>The order value.</returns>
+        public int Order
+        {
+            get
+            {
+                return SessionFactoryUtils.SESSION_SYNCHRONIZATION_ORDER;
+            }
+        }
+
+		#endregion
+
+		#region Methods
+
+	    /// <summary>
+	    /// Suspend this synchronization. 
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// Unbind Hibernate resources (SessionHolder) from
+	    /// <see cref="Spring.Transaction.Support.TransactionSynchronizationManager"/>
+	    /// if managing any.
+	    /// </p>
+	    /// </remarks>
+	    public override void Suspend()
+	    {
+            if (this.holderActive) 
+            {
+                TransactionSynchronizationManager.UnbindResource(this.sessionFactory);
+            }
+	    }
+
+	    /// <summary>
+	    /// Resume this synchronization.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// Rebind Hibernate resources from 
+	    /// <see cref="Spring.Transaction.Support.TransactionSynchronizationManager"/>
+	    /// if managing any.
+	    /// </p>
+	    /// </remarks>
+	    public override void Resume()
+	    {
+            if (this.holderActive) 
+            {
+                TransactionSynchronizationManager.BindResource(this.sessionFactory, this.sessionHolder);
+            }
+	    }
+
+	    /// <summary>
+	    /// Invoked before transaction commit (before
+	    /// <see cref="Spring.Transaction.Support.ITransactionSynchronization.BeforeCompletion"/>)
+	    /// </summary>
+	    /// <param name="readOnly">
+	    /// If the transaction is defined as a read-only transaction.
+	    /// </param>
+	    /// <remarks>
+	    /// <p>
+	    /// Can flush transactional sessions to the database.
+	    /// </p>
+	    /// <p>
+	    /// Note that exceptions will get propagated to the commit caller and 
+	    /// cause a rollback of the transaction.
+	    /// </p>
+	    /// </remarks>
+	    public override void BeforeCommit(bool readOnly)
+	    {
+		    if (!readOnly)
+		    {
+                // read-write transaction -> flush the Hibernate Session
+                log.Debug("Flushing Hibernate Session on transaction synchronization");			
+                ISession session = this.sessionHolder.Session;
+                //Further check: only flush when not FlushMode.NEVER
+                if (session.FlushMode != FlushMode.Never)
+                {
+                    try 
+                    {
+                        session.Flush();
+                        //TODO can throw System.ObjectDisposedException...
+                    }
+                    catch (ADOException ex) 
+                    {
+                        if (this.adoExceptionTranslator != null) 
+                        {
+                            //TODO investigate how ADOException wraps inner exception.
+                            throw this.adoExceptionTranslator.Translate(
+                                "Hibernate transaction synchronization: " + ex.Message, null, ex.InnerException);
+                        }
+                        else 
+                        {
+                            throw new HibernateAdoException("ADO.NET Exception", ex);
+                        }
+                    }
+                    catch (HibernateException ex) 
+                    {
+                        throw SessionFactoryUtils.ConvertHibernateAccessException(ex);
+                    }
+                }
+
+		    }
+	    }
+
+        /// <summary>
+        /// Invoked before transaction commit (before
+        /// <see cref="Spring.Transaction.Support.ITransactionSynchronization.BeforeCompletion"/>)
+        /// Can e.g. flush transactional O/R Mapping sessions to the database
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This callback does not mean that the transaction will actually be
+        /// commited.  A rollback decision can still occur after this method
+        /// has been called.  This callback is rather meant to perform work 
+        /// that's only relevant if a commit still has a chance
+        /// to happen, such as flushing SQL statements to the database.
+        /// </para>
+        /// <para>
+        /// Note that exceptions will get propagated to the commit caller and cause a
+        /// rollback of the transaction.</para>
+        /// <para>
+        /// (note: do not throw TransactionException subclasses here!)
+        /// </para>
+        /// </remarks>
+	    public override void BeforeCompletion()
+	    {
+            if (this.newSession) 
+            {
+                // Default behavior: unbind and close the thread-bound Hibernate Session.
+                TransactionSynchronizationManager.UnbindResource(this.sessionFactory);
+                this.holderActive = false;
+            }
+            else if (this.sessionHolder.AssignedPreviousFlushMode == true) 
+            {
+                // In case of pre-bound Session, restore previous flush mode.
+                this.sessionHolder.Session.FlushMode = (this.sessionHolder.PreviousFlushMode);
+            }
+	    }
+
+	    /// <summary>
+	    /// Invoked after transaction commit/rollback.
+	    /// </summary>
+	    /// <param name="status">
+	    /// Status according to <see cref="Spring.Transaction.Support.TransactionSynchronizationStatus"/>
+	    /// </param>
+	    /// <remarks>
+	    /// Can e.g. perform resource cleanup, in this case after transaction completion.
+	    /// <p>
+	    /// Note that exceptions will get propagated to the commit or rollback
+	    /// caller, although they will not influence the outcome of the transaction.
+	    /// </p>
+	    /// </remarks>
+	    public override void AfterCompletion(TransactionSynchronizationStatus status)
+	    {
+
+            ISession session = sessionHolder.Session;
+
+            // Provide correct transaction status for releasing the Session's cache locks,
+            // if possible. Else, closing will release all cache locks assuming a rollback.
+            ISessionImplementor sessionImplementor = session as ISessionImplementor;
+            if (sessionImplementor != null)
+            {
+                sessionImplementor.AfterTransactionCompletion(status == TransactionSynchronizationStatus.Committed);
+            }
+
+            if (newSession)
+            {
+                SessionFactoryUtils.CloseSessionOrRegisterDeferredClose(session, sessionFactory);
+            }	            	            
+
+            if (!newSession && status != TransactionSynchronizationStatus.Committed)
+            {
+                // Clear all pending inserts/updates/deletes in the Session.
+                // Necessary for pre-bound Sessions, to avoid inconsistent state.
+                sessionHolder.Session.Clear();
+            }
+      		
+	        if (this.sessionHolder.DoesNotHoldNonDefaultSession) {
+			  sessionHolder.SynchronizedWithTransaction = false;
+		    }
+
+        }
+
+        #endregion
+
+    }
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/ConfigSectionSessionScopeSettings.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/ConfigSectionSessionScopeSettings.cs
new file mode 100644
index 00000000..698ab8c8
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/ConfigSectionSessionScopeSettings.cs
@@ -0,0 +1,121 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using NHibernate;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Support
+{
+    /// <summary>
+    /// Holds the references and configuration settings for a <see cref="SessionScope"/> instance. 
+    /// References are resolved by looking up the given object names in the root <see cref="IApplicationContext"/> obtained by <see cref="ContextRegistry.GetContext()"/>.
+    /// </summary>
+    public class ConfigSectionSessionScopeSettings 
+        : SessionScopeSettings
+    {
+        /// <summary>
+        /// The default session factory name to use when retrieving the Hibernate session factory from
+        /// the root context.
+        /// </summary>
+        public static readonly string DEFAULT_SESSION_FACTORY_OBJECT_NAME = "SessionFactory";
+
+        private readonly string sessionFactoryObjectName = DEFAULT_SESSION_FACTORY_OBJECT_NAME;
+        private readonly string entityInterceptorObjectName = null;
+
+        /// <summary>
+        /// Initializes a new <see cref="ConfigSectionSessionScopeSettings"/> instance.
+        /// </summary>
+        /// <param name="ownerType">The type, who's name will be used to prefix setting variables with</param>
+        public ConfigSectionSessionScopeSettings(Type ownerType)
+            : this(ownerType, "appSettings")
+        {
+            // noop
+        }
+
+        /// <summary>
+        /// Initializes a new <see cref="ConfigSectionSessionScopeSettings"/> instance.
+        /// </summary>
+        /// <param name="ownerType">The type, who's name will be used to prefix setting variables with</param>
+        /// <param name="sectionName">The configuration section to read setting variables from.</param>
+        public ConfigSectionSessionScopeSettings(Type ownerType, string sectionName)
+            : this(ownerType, new ConfigSectionVariableSource(sectionName))
+        {
+            // noop
+        }
+
+        /// <summary>
+        /// Initializes a new <see cref="ConfigSectionSessionScopeSettings"/> instance.
+        /// </summary>
+        /// <param name="ownerType">The type, who's name will be used to prefix setting variables with</param>
+        /// <param name="variableSource">The variable source to obtain settings from.</param>
+        public ConfigSectionSessionScopeSettings(Type ownerType, IVariableSource variableSource)
+            : base()
+        {
+            string sessionFactoryObjectNameSettingsKey = UniqueKey.GetTypeScopedString(ownerType, "SessionFactoryObjectName");
+            string entityInterceptorObjectNameSettingsKey = UniqueKey.GetTypeScopedString(ownerType, "EntityInterceptorObjectName");
+            string singleSessionSettingsKey = UniqueKey.GetTypeScopedString(ownerType, "SingleSession");
+            string defaultFlushModeSettingsKey = UniqueKey.GetTypeScopedString(ownerType, "DefaultFlushMode");
+
+            VariableAccessor variables = new VariableAccessor(variableSource);
+            this.sessionFactoryObjectName = variables.GetString(sessionFactoryObjectNameSettingsKey, DEFAULT_SESSION_FACTORY_OBJECT_NAME);
+            this.entityInterceptorObjectName = variables.GetString(entityInterceptorObjectNameSettingsKey, null);
+            this.SingleSession = variables.GetBoolean(singleSessionSettingsKey, this.SingleSession);
+            this.DefaultFlushMode = (FlushMode)variables.GetEnum(defaultFlushModeSettingsKey, this.DefaultFlushMode);
+
+            AssertUtils.ArgumentNotNull(sessionFactoryObjectName, "sessionFactoryObjectName"); // just to be sure
+        }
+
+        /// <summary>
+        /// Resolve the entityInterceptor by looking up <see cref="entityInterceptorObjectName"/> 
+        /// in the root application context.
+        /// </summary>
+        /// <returns>The resolved <see cref="IInterceptor"/> instance or <see langword="null"/></returns>
+        protected override IInterceptor ResolveEntityInterceptor()
+        {
+            if (StringUtils.HasText(entityInterceptorObjectName))
+            {
+                return (IInterceptor)ContextRegistry.GetContext().GetObject(entityInterceptorObjectName);
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Resolve the <see cref="ISessionFactory"/> by looking up <see cref="sessionFactoryObjectName"/> 
+        /// in the root application context.
+        /// </summary>
+        /// <returns>The resolved <see cref="ISessionFactory"/> instance or <see langword="null"/></returns>
+        protected override ISessionFactory ResolveSessionFactory()
+        {
+            if (StringUtils.HasText(sessionFactoryObjectName))
+            {
+                return (ISessionFactory)ContextRegistry.GetContext().GetObject(sessionFactoryObjectName);
+            }
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/HibernateDaoSupport.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/HibernateDaoSupport.cs
new file mode 100644
index 00000000..16d3e748
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/HibernateDaoSupport.cs
@@ -0,0 +1,237 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NHibernate;
+using Spring.Dao;
+using Spring.Dao.Support;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Support
+{
+	/// <summary>
+    ///  Convenient super class for Hibernate data access objects.
+	/// </summary>
+	/// <remarks>
+	/// <para>Requires a SessionFactory to be set, providing a HibernateTemplate
+    ///  based on it to subclasses. Can alternatively be initialized directly with
+    /// a HibernateTemplate, to reuse the latter's settings such as the SessionFactory,
+    ///  exception translator, flush mode, etc
+    /// </para>
+    /// This base call is mainly intended for HibernateTemplate usage.
+    /// <para>
+    /// This class will create its own HibernateTemplate if only a SessionFactory
+    /// is passed in. The "allowCreate" flag on that HibernateTemplate will be "true"
+    /// by default. A custom HibernateTemplate instance can be used through overriding
+    /// <code>CreateHibernateTemplate</code>.
+    /// </para>
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: HibernateDaoSupport.cs,v 1.2 2007/08/28 15:26:37 markpollack Exp $</version>
+	public abstract class HibernateDaoSupport : DaoSupport
+	{
+	    #region Fields
+	    
+        private HibernateTemplate hibernateTemplate;
+		
+        #endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="HibernateDaoSupport"/> class.
+                /// </summary>
+		public 	HibernateDaoSupport()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Gets or sets the hibernate template.
+        /// </summary>
+        /// <remarks>Set the HibernateTemplate for this DAO explicitly,
+        /// as an alternative to specifying a SessionFactory.
+        /// </remarks>
+        /// <value>The hibernate template.</value>
+	    public HibernateTemplate HibernateTemplate
+	    {
+	        get
+	        {
+	            return hibernateTemplate;
+	        }
+	        set
+	        {
+	            hibernateTemplate = value;
+	        }
+	    }
+
+        /// <summary>
+        /// Gets or sets the session factory to be used by this DAO.
+        /// Will automatically create a HibernateTemplate for the given SessionFactory.
+        /// </summary>
+        /// <value>The session factory.</value>
+	    public ISessionFactory SessionFactory
+        {
+            get
+            {
+                return (this.hibernateTemplate != null ? this.hibernateTemplate.SessionFactory : null);
+            }
+            set
+            {
+                hibernateTemplate = CreateHibernateTemplate(value);
+            }
+        }
+	    
+        /// <summary>
+        /// Get a Hibernate Session, either from the current transaction or a new one.
+        /// The latter is only allowed if the "allowCreate" setting of this object's
+        /// HibernateTemplate is true.
+        /// </summary>
+        /// <remarks>
+        /// <p><b>Note that this is not meant to be invoked from HibernateTemplate code
+        /// but rather just in plain Hibernate code.</b> Use it in combination with
+        /// <b>ReleaseSession</b>.
+        /// </p>
+        /// <p>In general, it is recommended to use HibernateTemplate, either with
+        /// the provided convenience operations or with a custom HibernateCallback
+        /// that provides you with a Session to work on. HibernateTemplate will care
+        /// for all resource management and for proper exception conversion.
+        /// </p>
+        /// </remarks>
+        /// <value>The Hibernate session.</value>
+	    public ISession Session
+	    {
+	        get
+	        {
+                return DoGetSession(HibernateTemplate.AllowCreate);
+	        }
+	    }
+
+
+
+	    #endregion
+
+		#region Methods
+        
+        /// <summary>
+        /// Create a HibernateTemplate for the given ISessionFactory.
+        /// </summary>
+        /// <remarks>
+        /// Only invoked if populating the DAO with a ISessionFactory reference!
+        /// <p>Can be overridden in subclasses to provide a HibernateTemplate instance
+        /// with different configuration, or a custom HibernateTemplate subclass.
+        /// </p>
+        /// </remarks>
+        protected virtual HibernateTemplate CreateHibernateTemplate(ISessionFactory sessionFactory) 
+        {
+            return new HibernateTemplate(sessionFactory);
+        }
+
+        /// <summary>
+        /// Check if the hibernate template property has been set.
+        /// </summary>
+        protected override void CheckDaoConfig()
+        {
+            if (this.hibernateTemplate == null)
+            {
+                throw new ArgumentException("sessionFactory or hibernateTemplate is required");
+            }
+        }
+
+        /// <summary>
+        /// Get a Hibernate Session, either from the current transaction or
+        /// a new one. The latter is only allowed if "allowCreate" is true.
+        /// </summary>
+        /// <remarks>Note that this is not meant to be invoked from HibernateTemplate code
+        /// but rather just in plain Hibernate code. Either rely on a thread-bound
+        /// Session (via HibernateInterceptor), or use it in combination with
+        /// ReleaseSession.
+        /// <para>
+        /// In general, it is recommended to use HibernateTemplate, either with
+        /// the provided convenience operations or with a custom HibernateCallback
+        /// that provides you with a Session to work on. HibernateTemplate will care
+        /// for all resource management and for proper exception conversion.
+        /// </para>
+        /// </remarks>
+        /// <param name="allowCreate"> if a non-transactional Session should be created when no
+	    /// transactional Session can be found for the current thread
+	    /// </param>
+        /// <returns>Hibernate session.</returns>
+        /// <exception cref="DataAccessResourceFailureException">
+        /// If the Session couldn't be created
+        /// </exception>
+        /// <exception cref="InvalidOperationException">
+        /// if no thread-bound Session found and allowCreate false
+        /// </exception>
+        /// <seealso cref="ReleaseSession"/>
+        protected ISession DoGetSession(bool allowCreate)
+        {
+            return (!allowCreate ?
+                SessionFactoryUtils.GetSession(SessionFactory, false) :
+                    SessionFactoryUtils.GetSession(
+                            SessionFactory,
+                            this.hibernateTemplate.EntityInterceptor,
+                            this.hibernateTemplate.AdoExceptionTranslator));
+        }
+
+        /// <summary>
+        /// Convert the given HibernateException to an appropriate exception from the
+        /// <code>org.springframework.dao</code> hierarchy. Will automatically detect
+        /// wrapped ADO.NET Exceptions and convert them accordingly.
+        /// </summary>
+        /// <param name="ex">HibernateException that occured.</param>
+        /// <returns>
+        /// The corresponding DataAccessException instance
+        /// </returns>
+        /// <remarks>
+        /// The default implementation delegates to SessionFactoryUtils
+        /// and convertAdoAccessException. Can be overridden in subclasses.
+        /// </remarks>
+        protected DataAccessException ConvertHibernateAccessException(HibernateException ex)
+        {
+            return hibernateTemplate.ConvertHibernateAccessException(ex);
+        }
+
+
+        /// <summary>
+        /// Close the given Hibernate Session, created via this DAO's SessionFactory,
+        /// if it isn't bound to the thread.
+        /// </summary>
+        /// <remarks>
+        /// Typically used in plain Hibernate code, in combination with the 
+        /// Session property and ConvertHibernateAccessException.
+        /// </remarks>      
+        /// <param name="session">The session to close.</param>
+    	protected void ReleaseSession(ISession session) {
+		    SessionFactoryUtils.ReleaseSession(session, SessionFactory);
+	    }
+		#endregion
+
+
+
+
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/OpenSessionInViewModule.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/OpenSessionInViewModule.cs
new file mode 100644
index 00000000..be321e60
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/OpenSessionInViewModule.cs
@@ -0,0 +1,83 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Web;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Support
+{
+    /// <summary>
+    /// Provide support for the open session in view pattern for lazily loaded hibernate objects
+    /// used in ASP.NET pages.
+    /// </summary>
+    /// <author>jjx: http://forum.springframework.net/member.php?u=29</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <author>Erich Eichinger</author>
+    /// <author>Harald Radi</author>
+    /// <version>$Id: OpenSessionInViewModule.cs,v 1.7 2008/01/21 06:39:12 oakinger Exp $</version>
+    public class OpenSessionInViewModule : SessionScope, IHttpModule
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenSessionInViewModule"/> class.  Creates a SessionScope,
+        /// but does not yet associate a session with a thread, that is lef to the lifecycle of the request.
+        /// </summary>
+        public OpenSessionInViewModule() : base("appSettings", typeof(OpenSessionInViewModule), false)
+        {
+            
+        }
+
+        #region IHttpModule Members
+
+        /// <summary>
+        /// Register context handler and look up SessionFactoryObjectName under the application configuration key,
+        /// Spring.Data.NHibernate.Support.OpenSessionInViewModule.SessionFactoryObjectName if not using the default value
+        /// (i.e. sessionFactory) and look up the SingleSession setting under the application configuration key,
+        /// Spring.Data.NHibernate.Support.OpenSessionInViewModule.SingleSession if not using the default value of true.
+        /// </summary>
+        /// <param name="context">The standard HTTP application context</param>
+        public void Init( HttpApplication context )
+        {
+            context.BeginRequest += new EventHandler(context_BeginRequest);
+            context.EndRequest += new EventHandler(context_EndRequest);
+        }
+         /// <summary>
+         /// A do nothing dispose method.
+         /// </summary>
+        public override void Dispose()
+        {
+        }
+
+        #endregion
+
+        private void context_BeginRequest(object sender, EventArgs e)
+        {
+            Open();
+        }
+
+        private void context_EndRequest(object sender, EventArgs e)
+        {
+            Close();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScope.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScope.cs
new file mode 100644
index 00000000..14bf33f9
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScope.cs
@@ -0,0 +1,508 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using System.Text;
+using Common.Logging;
+using NHibernate;
+using Spring.Threading;
+using Spring.Transaction.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Support
+{
+    /// <summary>
+    /// Implementation of SessionScope that associates a single session within the using scope.
+    /// </summary>
+    /// <remarks>
+    /// <para>It is recommended to be used in the following type of scenario:
+    /// <code>
+    /// using (new SessionScope())
+    /// {
+    ///    ... do multiple operation, possibly in multiple transactions. 
+    /// }
+    /// </code>
+    /// At the end of "using", the session is automatically closed. All transactions within the scope use the same session,
+    /// if you are using Spring's HibernateTemplate or using Spring's implementation of NHibernate 1.2's 
+    /// ICurrentSessionContext interface.  
+    /// </para>
+    /// <para>
+    /// It is assumed that the session factory object name is called "SessionFactory". In case that you named the object 
+    /// in different way you can specify your can specify it in the application settings using the key
+    /// Spring.Data.NHibernate.Support.SessionScope.SessionFactoryObjectName.  Values for EntityInterceptorObjectName
+    /// and SingleSessionMode can be specified similarly.
+    /// </para>
+    /// <para>
+    /// <b>Note:</b>
+    /// The session is managed on a per thread basis on the thread that opens the scope instance. This means that you must
+    /// never pass a reference to a <see cref="SessionScope"/> instance over to another thread!
+    /// </para>
+    /// </remarks>
+    /// <author>Robert M. (.NET)</author>
+    /// <author>Harald Radi (.NET)</author>
+    public class SessionScope : IDisposable
+    {
+        #region Fields
+
+        /// <summary>
+        /// The logging instance.
+        /// </summary>        
+        protected readonly ILog log = LogManager.GetLogger(MethodInfo.GetCurrentMethod().DeclaringType);
+
+        private readonly SessionScopeSettings settings;
+
+        // Keys into LogicalThreadContext for runtime values.
+        private readonly string PARTICIPATE_KEY;
+        private readonly string ISOPEN_KEY;
+
+        #endregion
+
+        #region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionScope"/> class in single session mode, 
+        /// associating a session with the thread.  The session is opened lazily on demand.
+        /// </summary>
+        public SessionScope() 
+            : this(true)
+        {
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionScope"/> class.
+        /// </summary>
+        /// <param name="open">
+        /// If set to <c>true</c> associate a session with the thread.  If false, another
+        /// collaborating class will associate the session with the thread, potentially by calling
+        /// the Open method on this class.
+        /// </param>
+        public SessionScope(bool open)
+            : this("appSettings", open)
+        {
+            // noop
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionScope"/> class.
+        /// </summary>
+        /// <param name="sectionName">
+        /// The name of the configuration section to read configuration settings from. 
+        /// See <see cref="ConfigSectionSessionScopeSettings"/> for more info.
+        /// </param>
+        /// <param name="open">
+        /// If set to <c>true</c> associate a session with the thread.  If false, another
+        /// collaborating class will associate the session with the thread, potentially by calling
+        /// the Open method on this class.
+        /// </param>
+        public SessionScope(string sectionName, bool open)
+            : this( sectionName, typeof(SessionScope), open)
+        {
+            // noop
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionScope"/> class.
+        /// </summary>
+        /// <param name="sectionName">
+        /// The name of the configuration section to read configuration settings from. 
+        /// See <see cref="ConfigSectionSessionScopeSettings"/> for more info.
+        /// </param>
+        /// <param name="namespaceType">The type, who's full name is used for prefixing appSetting keys</param>
+        /// <param name="open">
+        /// If set to <c>true</c> associate a session with the thread.  If false, another
+        /// collaborating class will associate the session with the thread, potentially by calling
+        /// the Open method on this class.
+        /// </param>
+        public SessionScope(string sectionName, Type namespaceType, bool open)
+          : this(new ConfigSectionSessionScopeSettings(namespaceType, sectionName), open)
+        {
+          // noop
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionScope"/> class.
+        /// </summary>
+        /// <param name="sessionFactory">
+        /// The <see cref="ISessionFactory"/> instance to be used for obtaining <see cref="ISession"/> instances.
+        /// </param>
+        /// <param name="open">
+        /// If set to <c>true</c> associate a session with the thread.  If false, another
+        /// collaborating class will associate the session with the thread, potentially by calling
+        /// the Open method on this class.
+        /// </param>
+        public SessionScope(ISessionFactory sessionFactory, bool open)
+            : this(new SessionScopeSettings(sessionFactory), open)
+        {
+            // noop
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionScope"/> class.
+        /// </summary>
+        /// <param name="sessionFactory">
+        /// The <see cref="ISessionFactory"/> instance to be used for obtaining <see cref="ISession"/> instances.
+        /// </param>
+        /// <param name="entityInterceptor">
+        /// Specify the <see cref="IInterceptor"/> to be set on each session provided by this <see cref="SessionScope"/> instance.
+        /// </param>
+        /// <param name="singleSession">
+        /// Set whether to use a single session for each request. See <see cref="SingleSession"/> property for details.
+        /// </param>
+        /// <param name="defaultFlushMode">
+        /// Specify the flushmode to be applied on each session provided by this <see cref="SessionScope"/> instance.
+        /// </param>
+        /// <param name="open">
+        /// If set to <c>true</c> associate a session with the thread.  If false, another
+        /// collaborating class will associate the session with the thread, potentially by calling
+        /// the Open method on this class.
+        /// </param>
+        public SessionScope(ISessionFactory sessionFactory, IInterceptor entityInterceptor, bool singleSession, FlushMode defaultFlushMode, bool open)
+            :this(new SessionScopeSettings(sessionFactory, entityInterceptor, singleSession, defaultFlushMode), open)
+        {
+            // noop
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionScope"/> class.
+        /// </summary>
+        /// <param name="settings">An <see cref="SessionScopeSettings"/> instance holding the scope configuration</param>
+        /// <param name="open">
+        /// If set to <c>true</c> associate a session with the thread.  If false, another
+        /// collaborating class will associate the session with the thread, potentially by calling
+        /// the Open method on this class.
+        /// </param>
+        public SessionScope(SessionScopeSettings settings, bool open)
+        {
+            log = LogManager.GetLogger(this.GetType());
+            this.settings = settings;
+
+            PARTICIPATE_KEY = UniqueKey.GetInstanceScopedString(this, "Participate");
+            ISOPEN_KEY = UniqueKey.GetInstanceScopedString(this, "IsOpen");
+
+            if (open)
+            {
+                Open();
+            }
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Set whether to use a single session for each request. Default is "true".
+        /// If set to false, each data access operation or transaction will use
+        /// its own session (like without Open Session in View). Each of those
+        /// sessions will be registered for deferred close, though, actually
+        /// processed at request completion.
+        /// </summary>
+        public bool SingleSession
+        {
+            get { return settings.SingleSession; }
+        }
+
+        /// <summary>
+        /// Gets the flushmode to be applied on each newly created session.
+        /// </summary>
+        /// <remarks>
+        /// This property defaults to <see cref="FlushMode.Never"/> to ensure that modifying objects outside the boundaries 
+        /// of a transaction will not be persisted. It is recommended to not change this value but wrap any modifying operation
+        /// within a transaction.
+        /// </remarks>
+        public FlushMode DefaultFlushMode
+        {
+            get { return settings.DefaultFlushMode; }
+        }
+
+        /// <summary>
+        /// Get or set the configured SessionFactory
+        /// </summary>
+        public ISessionFactory SessionFactory
+        {
+            get
+            {
+                return settings.SessionFactory;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the configured EntityInterceptor
+        /// </summary>
+        public IInterceptor EntityInterceptor
+        {
+            get
+            {
+                return settings.EntityInterceptor;
+            }
+        }
+
+        /// <summary>
+        /// Gets a flag, whether this scope is in "open" state on the current logical thread.
+        /// </summary>
+        public bool IsOpen
+        {
+            get
+            {
+                return (null != LogicalThreadContext.GetData(ISOPEN_KEY));
+            }
+        }
+
+        /// <summary>
+        /// Gets a flag, whether this scope manages it's own session for the current logical thread or not.
+        /// </summary>
+        public bool IsParticipating
+        {
+            get
+            {
+                return (null != LogicalThreadContext.GetData(PARTICIPATE_KEY));
+            }
+        }
+
+        /// <summary>
+        /// Sets a flag, whether this scope is in "open" state on the current logical thread.
+        /// </summary>
+        private void SetOpen(bool isOpen)
+        {
+            if (isOpen)
+            {
+                LogicalThreadContext.SetData(ISOPEN_KEY, ISOPEN_KEY);
+            }
+            else
+            {
+                LogicalThreadContext.FreeNamedDataSlot(ISOPEN_KEY);
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets a flag, whether this scope manages it's own session for the current logical thread or not.
+        /// </summary>
+        /// <value><c>false</c> if session is managed by this module. <c>false</c> otherwise</value>
+        private void SetParticipating(bool participating)
+        {
+            if (participating)
+            {
+                LogicalThreadContext.SetData(PARTICIPATE_KEY, PARTICIPATE_KEY);
+            }
+            else
+            {
+                LogicalThreadContext.FreeNamedDataSlot(PARTICIPATE_KEY);
+            }
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        /// <summary>
+        /// Call <code>Close()</code>, 
+        /// </summary>
+        public virtual void Dispose()
+        {
+            Close();
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Opens a new session or participates in an existing session and 
+        /// registers with spring's <see cref="TransactionSynchronizationManager"/>.
+        /// </summary>
+        public void Open()
+        {
+            if (IsParticipating || IsOpen)
+            {
+                throw new InvalidOperationException("This scope is already open");
+            }
+
+            bool isDebugEnabled = log.IsDebugEnabled;
+
+            if (SingleSession)
+            {
+                // single session mode
+                if (TransactionSynchronizationManager.HasResource(SessionFactory))
+                {
+                    // Do not modify the Session: just set the participate flag.
+                    if (isDebugEnabled) log.Debug("Participating in existing Hibernate SessionFactory");
+                    SetParticipating(true);
+                }
+                else
+                {
+                    if (isDebugEnabled) log.Debug("Opening single Hibernate Session in SessionScope");
+                    TransactionSynchronizationManager.BindResource(SessionFactory, new LazySessionHolder(this));
+                }
+            }
+            else
+            {
+                // deferred close mode
+                if (SessionFactoryUtils.IsDeferredCloseActive(SessionFactory))
+                {
+                    // Do not modify deferred close: just set the participate flag.
+                    if (isDebugEnabled) log.Debug("Participating in active deferred close mode");
+                    SetParticipating(true);
+                }
+                else
+                {
+                    if (isDebugEnabled) log.Debug("Initializing deferred close mode");
+                    SessionFactoryUtils.InitDeferredClose(SessionFactory);
+                }
+            }
+
+            SetOpen(true);
+        }
+
+        /// <summary>
+        /// Close the current view's session and unregisters 
+        /// from spring's <see cref="TransactionSynchronizationManager"/>.
+        /// </summary>
+        public void Close()
+        {
+            bool isDebugEnabled = log.IsDebugEnabled;
+            if (isDebugEnabled) log.Debug("Trying to close SessionScope");
+
+            if (IsOpen)
+            {
+                try
+                {
+                    DoClose(isDebugEnabled);
+                }
+                finally
+                {
+                    SetOpen(false);
+                    SetParticipating(false);                    
+                }
+            }
+            else
+            {
+                if (isDebugEnabled) log.Debug("SessionScope is already closed - doing nothing");
+            }
+        }
+
+        private void DoClose(bool isLogDebugEnabled)
+        {
+            if (!IsParticipating)
+            {
+                if (SingleSession)
+                {
+                    // single session mode
+                    if (isLogDebugEnabled) log.Debug("Closing single Hibernate Session in SessionScope");
+                    TransactionSynchronizationManager.UnbindResource(SessionFactory);
+                    LazySessionHolder.Current.Close();
+                }
+                else
+                {
+                    // deferred close mode
+                    if (isLogDebugEnabled) log.Debug("Closing all Hibernate Sessions");
+                    SessionFactoryUtils.ProcessDeferredClose(SessionFactory);
+                }
+            }
+            else
+            {
+                if (isLogDebugEnabled) log.Debug("Only participated Hibernate Session - doing nothing");
+            }
+        }
+
+        private ISession DoOpenSession()
+        {
+            ISession session = SessionFactoryUtils.OpenSession(SessionFactory, EntityInterceptor);
+            session.FlushMode = DefaultFlushMode;
+            return session;
+        }
+
+        #endregion
+
+        #region LazySessionHolder utility class
+
+        /// <summary>
+        /// This sessionHolder creates a default session only if it is needed.
+        /// </summary>
+        /// <remarks>
+        /// Although a NHibernateSession deferes creation of db-connections until they are really
+        /// needed, instantiation a session is imho still more expensive than this LazySessionHolder. (EE)
+        /// </remarks>
+        private class LazySessionHolder : SessionHolder
+        {
+            private static readonly string ThreadDataSlotKey = UniqueKey.GetTypeScopedString(typeof(LazySessionHolder), "Current");
+
+            private readonly ILog log = LogManager.GetLogger(typeof(LazySessionHolder));
+            private SessionScope owner;
+            private ISession session;
+
+            /// <summary>
+            /// Initialize a new instance.
+            /// </summary>
+            public LazySessionHolder(SessionScope owner)
+            {
+                if (log.IsDebugEnabled) log.Debug("Created LazySessionHolder");
+                this.owner = owner;
+                Current = this;
+            }
+
+            /// <summary>
+            /// Gets or sets the LazySessionHolder instance for the current request
+            /// </summary>
+            public static LazySessionHolder Current
+            {
+                get { return (LazySessionHolder) LogicalThreadContext.GetData(ThreadDataSlotKey); }
+                set { LogicalThreadContext.SetData(ThreadDataSlotKey, value); }
+            }
+
+            /// <summary>
+            /// Create a new session on demand
+            /// </summary>
+            protected override void EnsureInitialized()
+            {
+                if (session == null)
+                {
+                    if (log.IsDebugEnabled) log.Debug("session instance requested - opening new session");
+                    session = owner.DoOpenSession();
+                    AddSession(session);
+                }
+            }
+
+            /// <summary>
+            /// Ensure session is closed (if any) and remove circular references to avoid memory leaks!
+            /// </summary>
+            public void Close()
+            {
+                owner = null;
+                Current = null;
+                if (session != null)
+                {
+                    ISession tmpSession = session;
+                    session = null;
+                    SessionFactoryUtils.CloseSession(tmpSession);
+                }
+                if (log.IsDebugEnabled) log.Debug("Closed LazySessionHolder");
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScopeSettings.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScopeSettings.cs
new file mode 100644
index 00000000..76523890
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScopeSettings.cs
@@ -0,0 +1,208 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using NHibernate;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Support
+{
+    /// <summary>
+    /// Holds the references and configuration settings for a <see cref="SessionScope"/> instance.
+    /// </summary>
+    public class SessionScopeSettings
+    {
+		/// <summary>
+		/// Default value for <see cref="SingleSession"/> property.
+		/// </summary>
+        public static readonly bool SINGLESESSION_DEFAULT = true;
+		/// <summary>
+		/// Default value for <see cref="DefaultFlushMode"/> property.
+		/// </summary>
+		public static readonly FlushMode FLUSHMODE_DEFAULT = FlushMode.Never;
+
+        private ISessionFactory sessionFactory;
+        private bool sessionFactoryInitialized;
+        private IInterceptor entityInterceptor;
+        private bool entityInterceptorInitialized;
+        private bool singleSession;
+        private FlushMode defaultFlushMode;
+
+        /// <summary>
+        /// Initialize a new instance of <see cref="SessionScopeSettings"/> with default values.
+        /// </summary>
+        /// <remarks>
+        /// Calling this constructor from your derived class leaves <see cref="SessionFactory"/> and <see cref="EntityInterceptor"/>
+        /// uninitialized. See <see cref="ResolveSessionFactory"/> and <see cref="ResolveEntityInterceptor"/> for more.
+        /// </remarks>
+        protected SessionScopeSettings()
+        {
+            this.sessionFactory = null;
+            this.sessionFactoryInitialized = false;
+            this.entityInterceptor = null;
+            this.entityInterceptorInitialized = false;
+            this.singleSession = SINGLESESSION_DEFAULT;
+            this.defaultFlushMode = FLUSHMODE_DEFAULT;
+        }
+
+        /// <summary>
+        /// Initialize a new instance of <see cref="SessionScopeSettings"/> with the given sessionFactory 
+        /// and default values for all other settings.
+        /// </summary>
+        /// <param name="sessionFactory">
+        /// The <see cref="ISessionFactory"/> instance to be used for obtaining <see cref="ISession"/> instances.
+        /// </param>
+        /// <remarks>
+        /// Calling this constructor marks all properties initialized.
+        /// </remarks>
+        public SessionScopeSettings(ISessionFactory sessionFactory)
+            :this(sessionFactory, null, SINGLESESSION_DEFAULT, FLUSHMODE_DEFAULT)
+        {
+            // noop
+            this.entityInterceptorInitialized = false;
+        }
+        
+        /// <summary>
+        /// Initialize a new instance of <see cref="SessionScopeSettings"/> with the given values and references.
+        /// </summary>
+        /// <param name="sessionFactory">
+        /// The <see cref="ISessionFactory"/> instance to be used for obtaining <see cref="ISession"/> instances.
+        /// </param>
+        /// <param name="entityInterceptor">
+        /// Specify the <see cref="IInterceptor"/> to be set on each session provided by the <see cref="SessionScope"/> instance.
+        /// </param>
+        /// <param name="singleSession">
+        /// Set whether to use a single session for each request. See <see cref="SingleSession"/> property for details.
+        /// </param>
+        /// <param name="defaultFlushMode">
+        /// Specify the flushmode to be applied on each session provided by the <see cref="SessionScope"/> instance.
+        /// </param>
+        /// <remarks>
+        /// Calling this constructor marks all properties initialized.
+        /// </remarks>
+        public SessionScopeSettings(ISessionFactory sessionFactory, IInterceptor entityInterceptor, bool singleSession, FlushMode defaultFlushMode)
+        {
+            AssertUtils.ArgumentNotNull(sessionFactory, "sessionFactory");
+
+            this.sessionFactory = sessionFactory;
+            this.sessionFactoryInitialized = true;
+            this.entityInterceptor = entityInterceptor;
+            this.entityInterceptorInitialized = true;
+            this.singleSession = singleSession;
+            this.defaultFlushMode = defaultFlushMode;
+        }
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the configured <see cref="IInterceptor"/> instance to be used.
+        /// </summary>
+        /// <remarks>
+        /// If the entity interceptor is not set by the constructor, this property calls 
+        /// <see cref="ResolveEntityInterceptor"/> to obtain an instance. This allows derived classes to 
+        /// override the behaviour of how to obtain the concrete <see cref="IInterceptor"/> instance.
+        /// </remarks>
+        public IInterceptor EntityInterceptor
+        {
+            get
+            {
+                if (!entityInterceptorInitialized)
+                {
+                    return ResolveEntityInterceptor();
+                }
+                return entityInterceptor;
+            }
+        }
+
+        /// <summary>
+        /// Gets the configured <see cref="ISessionFactory"/> instance to be used.
+        /// </summary>
+        /// <remarks>
+        /// If this property is requested for the first time, <see cref="ResolveSessionFactory"/> is called. 
+        /// This allows derived classes to override the behaviour of how to obtain the concrete <see cref="ISessionFactory"/> instance.
+        /// </remarks>
+        /// <exception cref="ArgumentException">If the <see cref="ISessionFactory"/> instance cannot be resolved.</exception>
+        public ISessionFactory SessionFactory
+        {
+            get
+            {
+                if (!sessionFactoryInitialized)
+                {
+                    sessionFactoryInitialized = true;
+                    sessionFactory = ResolveSessionFactory();
+                    if (sessionFactory == null)
+                    {
+                        throw new ArgumentException(string.Format("mandatory SessionFactory not found"));
+                    }
+                }
+                return sessionFactory;
+            }
+        }
+
+        ///<summary>
+        /// Set whether to use a single session for each request. Default is "true".
+        /// If set to false, each data access operation or transaction will use
+        /// its own session (like without Open Session in View). Each of those
+        /// sessions will be registered for deferred close, though, actually
+        /// processed at request completion.
+        /// </summary>
+        public bool SingleSession
+        {
+            get { return singleSession; }
+            set { singleSession = value; }
+        }
+
+        /// <summary>
+        /// Gets or Sets the flushmode to be applied on each newly created session.
+        /// </summary>
+        /// <remarks>
+        /// This property defaults to <see cref="FlushMode.Never"/> to ensure that modifying objects outside the boundaries 
+        /// of a transaction will not be persisted. It is recommended to not change this value but wrap any modifying operation
+        /// within a transaction.
+        /// </remarks>
+        public FlushMode DefaultFlushMode
+        {
+            get { return defaultFlushMode; }
+            set { defaultFlushMode = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Override this method to resolve an <see cref="IInterceptor"/> instance according to your chosen strategy.
+        /// </summary>
+        protected virtual IInterceptor ResolveEntityInterceptor()
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Override this method to resolve an <see cref="ISessionFactory"/> instance according to your chosen strategy.
+        /// </summary>
+        protected virtual ISessionFactory ResolveSessionFactory()
+        {
+            throw new NotImplementedException("you need to override this method to resolve an ISessionFactory instance");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/TemplateFlushMode.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/TemplateFlushMode.cs
new file mode 100644
index 00000000..2f1ee184
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/TemplateFlushMode.cs
@@ -0,0 +1,98 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// Enumeration for the various Hibernate flush modes. 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TemplateFlushMode.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+	public enum TemplateFlushMode 
+	{
+        /// <summary>Never flush is a good strategy for read-only units of work.
+        /// </summary>
+        /// <remarks>
+        /// Hibernate will not track and look for changes in this case,
+        /// avoiding any overhead of modification detection.
+        /// <p>In case of an existing ISession, TemplateFlushMode.Never will turn 
+        /// the hibenrate flush mode
+        /// to FlushMode.Never for the scope of the current operation, resetting the previous
+        /// flush mode afterwards.
+        /// </p>
+        /// </remarks>
+        Never,
+
+        /// <summary>Automatic flushing is the default mode for a Hibernate Session.
+        /// </summary>
+        /// <remarks>
+        /// A session will get flushed on transaction commit, and on certain find
+        /// operations that might involve already modified instances, but not
+        /// after each unit of work like with eager flushing.
+        /// <p>In case of an existing Session, TemplateFlushMode.Auto
+        /// will participate in the existing flush mode, not modifying 
+        /// it for the current operation.
+        /// This in particular means that this setting will not modify an existing
+        /// hibernate flush mode FlushMode.Never, in contrast to TemplateFlushMode.Eager.
+        /// </p>
+        /// </remarks>
+        Auto,
+
+        /// <summary>
+        /// Eager flushing leads to immediate synchronization with the database,
+        /// even if in a transaction. 
+        /// </summary>
+        /// <remarks>
+        /// This causes inconsistencies to show up and throw
+        /// a respective exception immediately, and ADO access code that participates
+        /// in the same transaction will see the changes as the database is already
+        /// aware of them then. But the drawbacks are:
+        /// <ul>
+        /// <li>additional communication roundtrips with the database, instead of a
+        /// single batch at transaction commit;</li>
+        /// <li>the fact that an actual database rollback is needed if the Hibernate
+        /// transaction rolls back (due to already submitted SQL statements).</li>
+        /// </ul>
+        /// <p>In case of an existing Session, TemplateFlushMode.Eager
+        /// will turn the NHibernate flush mode 
+        /// to FlushMode.Auto for the scope of the current operation and issue a flush at the
+        /// end, resetting the previous flush mode afterwards.
+        /// </p>
+        /// </remarks>
+        Eager,
+
+        /// <summary>
+        /// Flushing at commit only is intended for units of work where no
+        /// intermediate flushing is desired, not even for find operations
+        /// that might involve already modified instances.
+        /// </summary>
+        /// <remarks>
+        /// <p>In case of an existing Session, TemplateFlushMode.Commit
+        /// will turn the NHibernate flush mode
+        /// to FlushMode.Commit for the scope of the current operation, resetting the previous
+        /// flush mode afterwards. The only exception is an existing flush mode
+        /// FlushMode.Never, which will not be modified through this setting.
+        /// </p>
+        /// </remarks>
+        Commit
+
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.2003.csproj b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.2003.csproj
new file mode 100644
index 00000000..75adff5b
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.2003.csproj
@@ -0,0 +1,261 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Data.NHibernate"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = "Spring.Data.NHibernate.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Data.NHibernate\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Data.NHibernate\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "System.Web"
+                    AssemblyName = "System.Web"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
+                />
+                <Reference
+                    Name = "Spring.Aop.2003"
+                    Project = "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Data.2003"
+                    Project = "{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "antlr.runtime"
+                    AssemblyName = "antlr.runtime"
+                    HintPath = "..\..\..\lib\Net\1.1\antlr.runtime.dll"
+                />
+                <Reference
+                    Name = "log4net"
+                    AssemblyName = "log4net"
+                    HintPath = "..\..\..\lib\NHibernate10\net\1.1\log4net.dll"
+                />
+                <Reference
+                    Name = "NHibernate"
+                    AssemblyName = "NHibernate"
+                    HintPath = "..\..\..\lib\NHibernate10\net\1.1\NHibernate.dll"
+                />
+                <Reference
+                    Name = "Castle.DynamicProxy"
+                    AssemblyName = "Castle.DynamicProxy"
+                    HintPath = "..\..\..\lib\NHibernate10\net\1.1\Castle.DynamicProxy.dll"
+                />
+                <Reference
+                    Name = "Iesi.Collections"
+                    AssemblyName = "Iesi.Collections"
+                    HintPath = "..\..\..\lib\NHibernate10\net\1.1\Iesi.Collections.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CommonAssemblyInfo.cs"
+                    Link = "..\CommonAssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateAccessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateAdoException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateObjectRetrievalFailureException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateOptimisticLockingFailureException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateQueryException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateSystemException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateTemplate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateTransactionManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\ICommonHibernateOperations.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\IHibernateCallback.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\IHibernateOperations.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\LocalSessionFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\SessionFactoryUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\SessionHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\SpringSessionSynchronization.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\TemplateFlushMode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\HibernateDaoSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\OpenSessionInViewModule.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\SessionScope.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\SessionScopeSettings.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.2005.csproj b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.2005.csproj
new file mode 100644
index 00000000..b13ac41a
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.2005.csproj
@@ -0,0 +1,108 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{130E1609-45A7-4F65-B112-105F2DD3E2CE}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>Spring.Data.NHibernate.xml</DocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate10\net\2.0\Castle.DynamicProxy.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate10\net\2.0\Iesi.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=1.0.4.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate10\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Data\NHibernate\HibernateAccessor.cs" />
+    <Compile Include="Data\NHibernate\HibernateAdoException.cs" />
+    <Compile Include="Data\NHibernate\HibernateDelegate.cs" />
+    <Compile Include="Data\NHibernate\HibernateObjectRetrievalFailureException.cs" />
+    <Compile Include="Data\NHibernate\HibernateOptimisticLockingFailureException.cs" />
+    <Compile Include="Data\NHibernate\HibernateQueryException.cs" />
+    <Compile Include="Data\NHibernate\HibernateSystemException.cs" />
+    <Compile Include="Data\NHibernate\HibernateTemplate.cs" />
+    <Compile Include="Data\NHibernate\HibernateTransactionManager.cs" />
+    <Compile Include="Data\NHibernate\ICommonHibernateOperations.cs" />
+    <Compile Include="Data\NHibernate\IHibernateCallback.cs" />
+    <Compile Include="Data\NHibernate\IHibernateOperations.cs" />
+    <Compile Include="Data\NHibernate\LocalSessionFactoryObject.cs" />
+    <Compile Include="Data\NHibernate\SessionFactoryUtils.cs" />
+    <Compile Include="Data\NHibernate\SessionHolder.cs" />
+    <Compile Include="Data\NHibernate\SpringSessionSynchronization.cs" />
+    <Compile Include="Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs" />
+    <Compile Include="Data\NHibernate\Support\HibernateDaoSupport.cs" />
+    <Compile Include="Data\NHibernate\Support\OpenSessionInViewModule.cs" />
+    <Compile Include="Data\NHibernate\Support\SessionScope.cs" />
+    <Compile Include="Data\NHibernate\Support\SessionScopeSettings.cs" />
+    <Compile Include="Data\NHibernate\TemplateFlushMode.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2005.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Web\Spring.Web.2005.csproj">
+      <Project>{BA4789EB-281A-48EA-8763-28B9F0596A18}</Project>
+      <Name>Spring.Web.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build
new file mode 100644
index 00000000..a957c7a4
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<project name="Spring.Data.NHibernate" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+	<target name="build">
+		<echo message="nh.lib.dir=${nh.lib.dir}"/>
+		<!-- build Spring.Data.NHibernate -->
+		<csc target="library" define="${current.build.defines.csc}"
+				warnaserror="true"
+				debug="${current.build.debug}"
+				output="${current.bin.dir}/${project::get-name()}.dll"
+				doc="${current.bin.dir}/${project::get-name()}.xml">
+			<arg line="${compiler.args}"/>
+			<nowarn>
+				<warning number="0169" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../GenCommonAssemblyInfo.cs" />
+			</sources>
+			<references basedir="${current.bin.dir}">
+				<lib>
+					<include name="${nh.lib.dir}"/>
+				</lib>
+				<include name="System.Data.dll" />
+				<include name="System.EnterpriseServices.dll" />
+				<include name="NHibernate.dll" />
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+				<exclude name="Spring.Data.NHibernate12.dll" />
+				<exclude name="CloverRuntime.dll" />
+			</references>
+		</csc>
+	</target>
+</project>
diff --git a/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.xml b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.xml
new file mode 100644
index 00000000..eab1ba6c
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.xml
@@ -0,0 +1,3906 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Spring.Data.NHibernate</name>
+    </assembly>
+    <members>
+        <member name="T:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings">
+            <summary>
+            Holds the references and configuration settings for a <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance. 
+            References are resolved by looking up the given object names in the root <see cref="T:Spring.Context.IApplicationContext"/> obtained by <see cref="M:Spring.Context.Support.ContextRegistry.GetContext"/>.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Support.SessionScopeSettings">
+            <summary>
+            Holds the references and configuration settings for a <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance.
+            </summary>
+        </member>
+        <member name="F:Spring.Data.NHibernate.Support.SessionScopeSettings.SINGLESESSION_DEFAULT">
+            <summary>
+            Default value for <see cref="P:Spring.Data.NHibernate.Support.SessionScopeSettings.SingleSession"/> property.
+            </summary>
+        </member>
+        <member name="F:Spring.Data.NHibernate.Support.SessionScopeSettings.FLUSHMODE_DEFAULT">
+            <summary>
+            Default value for <see cref="P:Spring.Data.NHibernate.Support.SessionScopeSettings.DefaultFlushMode"/> property.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScopeSettings.#ctor">
+            <summary>
+            Initialize a new instance of <see cref="T:Spring.Data.NHibernate.Support.SessionScopeSettings"/> with default values.
+            </summary>
+            <remarks>
+            Calling this constructor from your derived class leaves <see cref="P:Spring.Data.NHibernate.Support.SessionScopeSettings.SessionFactory"/> and <see cref="P:Spring.Data.NHibernate.Support.SessionScopeSettings.EntityInterceptor"/>
+            uninitialized. See <see cref="M:Spring.Data.NHibernate.Support.SessionScopeSettings.ResolveSessionFactory"/> and <see cref="M:Spring.Data.NHibernate.Support.SessionScopeSettings.ResolveEntityInterceptor"/> for more.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScopeSettings.#ctor(NHibernate.ISessionFactory)">
+            <summary>
+            Initialize a new instance of <see cref="T:Spring.Data.NHibernate.Support.SessionScopeSettings"/> with the given sessionFactory 
+            and default values for all other settings.
+            </summary>
+            <param name="sessionFactory">
+            The <see cref="T:NHibernate.ISessionFactory"/> instance to be used for obtaining <see cref="T:NHibernate.ISession"/> instances.
+            </param>
+            <remarks>
+            Calling this constructor marks all properties initialized.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScopeSettings.#ctor(NHibernate.ISessionFactory,NHibernate.IInterceptor,System.Boolean,NHibernate.FlushMode)">
+            <summary>
+            Initialize a new instance of <see cref="T:Spring.Data.NHibernate.Support.SessionScopeSettings"/> with the given values and references.
+            </summary>
+            <param name="sessionFactory">
+            The <see cref="T:NHibernate.ISessionFactory"/> instance to be used for obtaining <see cref="T:NHibernate.ISession"/> instances.
+            </param>
+            <param name="entityInterceptor">
+            Specify the <see cref="T:NHibernate.IInterceptor"/> to be set on each session provided by the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance.
+            </param>
+            <param name="singleSession">
+            Set whether to use a single session for each request. See <see cref="P:Spring.Data.NHibernate.Support.SessionScopeSettings.SingleSession"/> property for details.
+            </param>
+            <param name="defaultFlushMode">
+            Specify the flushmode to be applied on each session provided by the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance.
+            </param>
+            <remarks>
+            Calling this constructor marks all properties initialized.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScopeSettings.ResolveEntityInterceptor">
+            <summary>
+            Override this method to resolve an <see cref="T:NHibernate.IInterceptor"/> instance according to your chosen strategy.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScopeSettings.ResolveSessionFactory">
+            <summary>
+            Override this method to resolve an <see cref="T:NHibernate.ISessionFactory"/> instance according to your chosen strategy.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScopeSettings.EntityInterceptor">
+            <summary>
+            Gets the configured <see cref="T:NHibernate.IInterceptor"/> instance to be used.
+            </summary>
+            <remarks>
+            If the entity interceptor is not set by the constructor, this property calls 
+            <see cref="M:Spring.Data.NHibernate.Support.SessionScopeSettings.ResolveEntityInterceptor"/> to obtain an instance. This allows derived classes to 
+            override the behaviour of how to obtain the concrete <see cref="T:NHibernate.IInterceptor"/> instance.
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScopeSettings.SessionFactory">
+            <summary>
+            Gets the configured <see cref="T:NHibernate.ISessionFactory"/> instance to be used.
+            </summary>
+            <remarks>
+            If this property is requested for the first time, <see cref="M:Spring.Data.NHibernate.Support.SessionScopeSettings.ResolveSessionFactory"/> is called. 
+            This allows derived classes to override the behaviour of how to obtain the concrete <see cref="T:NHibernate.ISessionFactory"/> instance.
+            </remarks>
+            <exception cref="T:System.ArgumentException">If the <see cref="T:NHibernate.ISessionFactory"/> instance cannot be resolved.</exception>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScopeSettings.SingleSession">
+            <summary>
+             Set whether to use a single session for each request. Default is "true".
+             If set to false, each data access operation or transaction will use
+             its own session (like without Open Session in View). Each of those
+             sessions will be registered for deferred close, though, actually
+             processed at request completion.
+             </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScopeSettings.DefaultFlushMode">
+            <summary>
+            Gets or Sets the flushmode to be applied on each newly created session.
+            </summary>
+            <remarks>
+            This property defaults to <see cref="F:NHibernate.FlushMode.Never"/> to ensure that modifying objects outside the boundaries 
+            of a transaction will not be persisted. It is recommended to not change this value but wrap any modifying operation
+            within a transaction.
+            </remarks>
+        </member>
+        <member name="F:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.DEFAULT_SESSION_FACTORY_OBJECT_NAME">
+            <summary>
+            The default session factory name to use when retrieving the Hibernate session factory from
+            the root context.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.#ctor(System.Type)">
+            <summary>
+            Initializes a new <see cref="T:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings"/> instance.
+            </summary>
+            <param name="ownerType">The type, who's name will be used to prefix setting variables with</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.#ctor(System.Type,System.String)">
+            <summary>
+            Initializes a new <see cref="T:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings"/> instance.
+            </summary>
+            <param name="ownerType">The type, who's name will be used to prefix setting variables with</param>
+            <param name="sectionName">The configuration section to read setting variables from.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.#ctor(System.Type,Spring.Objects.Factory.Config.IVariableSource)">
+            <summary>
+            Initializes a new <see cref="T:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings"/> instance.
+            </summary>
+            <param name="ownerType">The type, who's name will be used to prefix setting variables with</param>
+            <param name="variableSource">The variable source to obtain settings from.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.ResolveEntityInterceptor">
+            <summary>
+            Resolve the entityInterceptor by looking up <see cref="F:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.entityInterceptorObjectName"/> 
+            in the root application context.
+            </summary>
+            <returns>The resolved <see cref="T:NHibernate.IInterceptor"/> instance or <see langword="null"/></returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.ResolveSessionFactory">
+            <summary>
+            Resolve the <see cref="T:NHibernate.ISessionFactory"/> by looking up <see cref="F:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.sessionFactoryObjectName"/> 
+            in the root application context.
+            </summary>
+            <returns>The resolved <see cref="T:NHibernate.ISessionFactory"/> instance or <see langword="null"/></returns>
+        </member>
+        <member name="T:Spring.Data.NHibernate.SessionFactoryUtils">
+            <summary>
+             Helper class featuring methods for Hibernate Session handling,
+             allowing for reuse of Hibernate Session instances within transactions.
+             Also provides support for exception translation.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: SessionFactoryUtils.cs,v 1.5 2008/04/08 20:26:37 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.NHibernate.SessionFactoryUtils.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class. 
+            </summary>
+        </member>
+        <member name="F:Spring.Data.NHibernate.SessionFactoryUtils.SESSION_SYNCHRONIZATION_ORDER">
+            <summary>
+            The ordering value for synchronizaiton this session resources.
+            Set to be lower than ADO.NET synchronization.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.SessionFactoryUtils"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.GetNewSession(NHibernate.ISessionFactory,NHibernate.IInterceptor)">
+            <summary>
+            Get a new Hibernate Session from the given SessionFactory.
+            Will return a new Session even if there already is a pre-bound
+            Session for the given SessionFactory.
+            </summary>
+            <remarks>
+            Within a transaction, this method will create a new Session
+            that shares the transaction's ADO.NET Connection. More specifically,
+            it will use the same ADO.NET Connection as the pre-bound Hibernate Session.
+            </remarks>
+            <param name="sessionFactory">The session factory to create the session with.</param>
+            <param name="interceptor">The Hibernate entity interceptor, or <code>null</code> if none.</param>
+            <returns>The new session.</returns>
+            <exception cref="T:Spring.Dao.DataAccessResourceFailureException">If could not open Hibernate session</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.GetSession(NHibernate.ISessionFactory,NHibernate.IInterceptor,Spring.Data.Support.IAdoExceptionTranslator)">
+            <summary>
+            Get a Hibernate Session for the given SessionFactory. Is aware of and will
+            return any existing corresponding Session bound to the current thread, for
+            example when using HibernateTransactionManager. Will always create a new
+            Session otherwise.
+            </summary>
+            <remarks>
+            Supports setting a Session-level Hibernate entity interceptor that allows
+            to inspect and change property values before writing to and reading from the
+            database. Such an interceptor can also be set at the SessionFactory level
+            (i.e. on LocalSessionFactoryObject), on HibernateTransactionManager, or on
+            HibernateInterceptor/HibernateTemplate.
+            </remarks>
+            <param name="sessionFactory">The session factory to create the
+            session with.</param>
+            <param name="entityInterceptor">Hibernate entity interceptor, or <code>null</code> if none.</param>
+            <param name="adoExceptionTranslator"> AdoExceptionTranslator to use for flushing the
+            Session on transaction synchronization (can be <code>null</code>; only used when actually
+            registering a transaction synchronization).</param>
+            <returns>The Hibernate Session</returns>
+            <exception cref="T:Spring.Dao.DataAccessResourceFailureException">
+            If the session couldn't be created.
+            </exception>
+            <exception cref="T:System.InvalidOperationException">
+            If no thread-bound Session found and allowCreate is false.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.GetSession(NHibernate.ISessionFactory,System.Boolean)">
+            <summary>
+            Get a Hibernate Session for the given SessionFactory. Is aware of and will
+            return any existing corresponding Session bound to the current thread, for
+            example when using <see cref="T:Spring.Data.NHibernate.HibernateTransactionManager"/>. Will create a new Session
+            otherwise, if allowCreate is true.
+            </summary>
+            <param name="sessionFactory">The session factory to create the session with.</param>
+            <param name="allowCreate">if set to <c>true</c> create a non-transactional Session when no
+            transactional Session can be found for the current thread.</param>
+            <returns>The hibernate session</returns>
+            <exception cref="T:Spring.Dao.DataAccessResourceFailureException">
+            If the session couldn't be created.
+            </exception>
+            <exception cref="T:System.InvalidOperationException">
+            If no thread-bound Session found and allowCreate is false.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.DoGetSession(NHibernate.ISessionFactory,System.Boolean)">
+            <summary>
+            Get a Hibernate Session for the given SessionFactory.
+            </summary>
+            <remarks>Is aware of and will return any existing corresponding
+            Session bound to the current thread, for example whenusing
+            <see cref="T:Spring.Data.NHibernate.HibernateTransactionManager"/>.  Will create a new 
+            Session otherwise, if "allowCreate" is true.
+            <p>Throws the orginal HibernateException, in contrast to
+            <see cref="M:Spring.Data.NHibernate.SessionFactoryUtils.GetSession(NHibernate.ISessionFactory,System.Boolean)"/>.
+            </p></remarks>
+            <param name="sessionFactory">The session factory.</param>
+            <param name="allowCreate">if set to <c>true</c> [allow create].</param>
+            <returns>The Hibernate Session</returns>
+            <exception cref="T:NHibernate.HibernateException">
+            if the Session couldn't be created
+            </exception>
+            <exception cref="T:System.InvalidOperationException">
+            If no thread-bound Session found and allowCreate is false.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.OpenSession(NHibernate.ISessionFactory,NHibernate.IInterceptor)">
+            <summary>
+            Open a new Session from the factory.
+            </summary>
+            <param name="sessionFactory">The session factory to create the session with.</param>
+            <param name="entityInterceptor">Hibernate entity interceptor, or <code>null</code> if none.</param>
+            <returns>the newly opened session</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.CloseSession(NHibernate.ISession)">
+            <summary>
+            Perform the actual closing of the Hibernate Session
+            catching and logging any cleanup exceptions thrown.
+            </summary>
+            <param name="session">The hibernate session to close</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.IsSessionTransactional(NHibernate.ISession,NHibernate.ISessionFactory)">
+            <summary>
+            Return whether the given Hibernate Session is transactional, that is,
+            bound to the current thread by Spring's transaction facilities.
+            </summary>
+            <param name="session">The hibernate session to check</param>
+            <param name="sessionFactory">The session factory that the session
+            was created with, can be null.</param>
+            <returns>
+            	<c>true</c> if the session transactional; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.ConvertHibernateAccessException(NHibernate.HibernateException)">
+            <summary>
+            Convert the given HibernateException to an appropriate exception from the
+            <code>Spring.Dao</code> hierarchy. Note that it is advisable to
+            handle AdoException specifically by using a AdoExceptionTranslator for the
+            underlying ADO.NET exception.
+            </summary>
+            <param name="ex">The Hibernate exception that occured.</param>
+            <returns>DataAccessException instance</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.ReleaseSession(NHibernate.ISession,NHibernate.ISessionFactory)">
+            <summary>
+            Close the given Session, created via the given factory,
+            if it is not managed externally (i.e. not bound to the thread).
+            </summary>
+            <param name="session">The hibernate session to close</param>
+            <param name="sessionFactory">The hibernate SessionFactory that
+            the session was created with.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.CloseSessionOrRegisterDeferredClose(NHibernate.ISession,NHibernate.ISessionFactory)">
+            <summary>
+            Close the given Session or register it for deferred close.
+            </summary>
+            <param name="session">The session.</param>
+            <param name="sessionFactory">The session factory.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.InitDeferredClose(NHibernate.ISessionFactory)">
+             <summary>
+            Initialize deferred close for the current thread and the given SessionFactory.
+             Sessions will not be actually closed on close calls then, but rather at a
+             processDeferredClose call at a finishing point (like request completion).
+             </summary>
+             <param name="sessionFactory">The session factory.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.IsDeferredCloseActive(NHibernate.ISessionFactory)">
+            <summary>
+            Return if deferred close is active for the current thread
+            and the given SessionFactory.</summary>
+            <param name="sessionFactory">The session factory.</param>
+            <returns>
+            	<c>true</c> if [is deferred close active] [the specified session factory]; otherwise, <c>false</c>.
+            </returns>
+            <exception cref="T:System.ArgumentNullException">If SessionFactory argument is null.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.ProcessDeferredClose(NHibernate.ISessionFactory)">
+            <summary>
+            Process Sessions that have been registered for deferred close
+            for the given SessionFactory.
+            </summary>
+            <param name="sessionFactory">The session factory.</param>
+            <exception cref="T:System.InvalidOperationException">If there is no session factory associated with the thread.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.ApplyTransactionTimeout(NHibernate.ICriteria,NHibernate.ISessionFactory)">
+            <summary>
+            Applies the current transaction timeout, if any, to the given
+            criteria object
+            </summary>
+            <param name="criteria">The Hibernate Criteria object.</param>
+            <param name="sessionFactory">Hibernate SessionFactory that the Criteria was created for
+            (can be <code>null</code>).</param>
+            <exception cref="T:System.ArgumentNullException">If criteria argument is null.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.ApplyTransactionTimeout(NHibernate.IQuery,NHibernate.ISessionFactory)">
+            <summary>
+            Applies the current transaction timeout, if any, to the given
+            Hibenrate query object.
+            </summary>
+            <param name="query">The Hibernate Query object.</param>
+            <param name="sessionFactory">Hibernate SessionFactory that the Query was created for
+            (can be <code>null</code>).</param>
+            <exception cref="T:System.ArgumentNullException">If query argument is null.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.GetDbProvider(NHibernate.ISessionFactory)">
+            <summary>
+            Gets the Spring IDbProvider given the ISessionFactory.
+            </summary>
+            <remarks>The matching is performed by comparing the assembly qualified
+            name string of the hibernate Driver.ConnectionType to those in
+            the DbProviderFactory definitions.  No connections are created
+            in performing this comparison.</remarks>
+            <param name="sessionFactory">The session factory.</param>
+            <returns>The corresponding IDbProvider, null if no mapping was found.</returns>
+            <exception cref="T:System.InvalidOperationException">If DbProviderFactory's ApplicaitonContext is not
+            an instance of IConfigurableApplicaitonContext.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.NewAdoExceptionTranslator(NHibernate.ISessionFactory)">
+            <summary>
+            Create a IAdoExceptionTranslator from the given SessionFactory.
+            </summary>
+            <remarks>If a corresponding IDbProvider is found, a ErrorcodeExceptionTranslator
+            for the IDbProvider is created.  Otherwise, a FallbackException is created.</remarks>
+            <param name="sessionFactory">The session factory to create the translator for</param>
+            <returns>An IAdoExceptionTranslator</returns>
+        </member>
+        <member name="T:Spring.Data.NHibernate.IHibernateCallback">
+            <summary>
+            Callback interface for NHibernate code.
+            </summary>
+            <remarks>To be used with HibernateTemplate execute
+            method. The typical implementation will call 
+            Session.load/find/save/update to perform
+            some operations on persistent objects.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IHibernateCallback.cs,v 1.2 2007/09/19 22:58:22 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+            <returns>A result object, or null if none.</returns>   
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateAccessor">
+            <summary>
+            Base class for HibernateTemplate defining common
+            properties like SessionFactory and flushing behavior.
+            </summary>
+            <remarks>
+            <p>Not intended to be used directly. See HibernateTemplate.
+            </p>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateAccessor.cs,v 1.6 2008/01/25 15:04:39 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.NHibernate.HibernateAccessor.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class. 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateAccessor"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.ApplyFlushMode(NHibernate.ISession,System.Boolean)">
+            <summary>
+            Apply the flush mode that's been specified for this accessor
+            to the given Session.
+            </summary>
+            <param name="session">The current Hibernate Session.</param>
+            <param name="existingTransaction">if set to <c>true</c>
+            if executing within an existing transaction.</param>
+            <returns>
+            the previous flush mode to restore after the operation,
+            or <code>null</code> if none
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.FlushIfNecessary(NHibernate.ISession,System.Boolean)">
+            <summary>
+             Flush the given Hibernate Session if necessary.
+            </summary>
+            <param name="session">The current Hibernate Session.</param>
+            <param name="existingTransaction">if set to <c>true</c> 
+            if executing within an existing transaction.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.ConvertHibernateAccessException(NHibernate.HibernateException)">
+            <summary>
+            Convert the given HibernateException to an appropriate exception from the
+            <code>org.springframework.dao</code> hierarchy. Will automatically detect
+            wrapped ADO.NET Exceptions and convert them accordingly.
+            </summary>
+            <param name="ex">HibernateException that occured.</param>
+            <returns>
+            The corresponding DataAccessException instance
+            </returns>
+            <remarks>
+            The default implementation delegates to SessionFactoryUtils
+            and convertAdoAccessException. Can be overridden in subclasses.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.ConvertAdoAccessException(NHibernate.ADOException)">
+            <summary>
+            Converts the ADO.NET access exception to an appropriate exception from the
+            <code>org.springframework.dao</code> hierarchy. Can be overridden in subclasses.
+            </summary>
+            <param name="ex">ADOException that occured, wrapping underlying ADO.NET exception.</param>
+            <returns>
+            the corresponding DataAccessException instance
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.ConvertAdoAccessException(System.Exception)">
+            <summary>
+            Converts the ADO.NET access exception to an appropriate exception from the
+            <code>org.springframework.dao</code> hierarchy. Can be overridden in subclasses.
+            </summary>
+            <remarks>
+            <note>
+            Note that a direct SQLException can just occur when callback code
+            performs direct ADO.NET access via <code>ISession.Connection()</code>.
+            </note>
+            </remarks>
+            <param name="ex">The ADO.NET exception.</param>
+            <returns>The corresponding DataAccessException instance</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.PrepareQuery(NHibernate.IQuery)">
+            <summary>
+            Prepare the given IQuery object, applying cache settings and/or
+            a transaction timeout.
+            </summary>
+            <param name="queryObject">The query object to prepare.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.ApplyNamedParameterToQuery(NHibernate.IQuery,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Apply the given name parameter to the given Query object.
+            </summary>
+            <param name="queryObject">The query object.</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">The NHibernate type of the parameter (or <code>null</code> if none specified)</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.PrepareCriteria(NHibernate.ICriteria)">
+            <summary>
+            Prepare the given Criteria object, applying cache settings and/or
+            a transaction timeout.
+            </summary>
+            <remarks>
+            <para>Note that for NHibernate 1.2 this only works if the
+            implementation is of the type CriteriaImpl, which should generally
+            be the case.  The SetFetchSize method is not available on the
+            ICriteria interface
+            </para>
+            <para>This is a no-op for NHibernate 1.0.x since
+            the SetFetchSize method is not on the ICriteria interface and
+            the implementation class is has internal access.
+            </para>
+            <para>To remove the method completely for Spring's NHibernate 1.0 
+            support while reusing code for NHibernate 1.2 would not be 
+            possible.  So now this ineffectual operation is left in tact for
+            NHibernate 1.0.2 support.</para>
+            </remarks>
+            <param name="criteria">The criteria object to prepare</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.AfterPropertiesSet">
+            <summary>
+            Ensure SessionFactory is not null
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.AllowCreate">
+            <summary>
+            Gets or sets if a new Session should be created when no transactional Session
+            can be found for the current thread.
+            </summary>
+            <value>
+            	<c>true</c> if allowed to create non-transaction session;
+            otherwise, <c>false</c>.
+            </value>
+            <remarks>
+            	<p>HibernateTemplate is aware of a corresponding Session bound to the
+            current thread, for example when using HibernateTransactionManager.
+            If allowCreate is true, a new non-transactional Session will be created
+            if none found, which needs to be closed at the end of the operation.
+            If false, an InvalidOperationException will get thrown in this case.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.AlwaysUseNewSession">
+            <summary>
+            Gets or sets a value indicating whether to always
+            use a new Hibernate Session for this template.
+            </summary>
+            <value><c>true</c> if always use new session; otherwise, <c>false</c>.</value>
+            <remarks>
+            	<p>
+            Default is "false"; if activated, all operations on this template will
+            work on a new NHibernate ISession even in case of a pre-bound ISession
+            (for example, within a transaction).
+            </p>
+            	<p>Within a transaction, a new NHibernate ISession used by this template
+            will participate in the transaction through using the same ADO.NET
+            Connection. In such a scenario, multiple Sessions will participate
+            in the same database transaction.
+            </p>
+            	<p>Turn this on for operations that are supposed to always execute
+            independently, without side effects caused by a shared NHibernate ISession.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.ExposeNativeSession">
+            <summary>
+            Set whether to expose the native Hibernate Session to IHibernateCallback
+            code. Default is "false": a Session proxy will be returned,
+            suppressing <code>close</code> calls and automatically applying
+            query cache settings and transaction timeouts.
+            </summary>
+            <value><c>true</c> if expose native session; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.TemplateFlushMode">
+            <summary>
+            Gets or sets the template flush mode.
+            </summary>
+            <remarks>
+            Default is Auto. Will get applied to any <b>new</b> ISession
+            created by the template.
+            </remarks>
+            <value>The template flush mode.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.EntityInterceptor">
+            <summary>
+            Gets or sets the entity interceptor that allows to inspect and change
+            property values before writing to and reading from the database.
+            </summary>
+            <remarks>
+            Will get applied to any <b>new</b> ISession created by this object.
+            <p>Such an interceptor can either be set at the ISessionFactory level,
+            i.e. on LocalSessionFactoryObject, or at the ISession level, i.e. on
+            HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
+            It's preferable to set it on LocalSessionFactoryObject or HibernateTransactionManager
+            to avoid repeated configuration and guarantee consistent behavior in transactions.
+            </p>
+            </remarks>
+            <value>The interceptor.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.EntityInterceptorObjectName">
+            <summary>
+            Set the object name of a Hibernate entity interceptor that allows to inspect
+            and change property values before writing to and reading from the database.
+            </summary>
+            <remarks>
+            Will get applied to any new Session created by this transaction manager.
+            <p>Requires the object factory to be known, to be able to resolve the object
+            name to an interceptor instance on session creation. Typically used for
+            prototype interceptors, i.e. a new interceptor instance per session.
+            </p>
+            <p>Can also be used for shared interceptor instances, but it is recommended
+            to set the interceptor reference directly in such a scenario.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.SessionFactory">
+            <summary>
+            Gets or sets the session factory that should be used to create
+            NHibernate ISessions.
+            </summary>
+            <value>The session factory.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.ObjectFactory">
+            <summary>
+            Set the object factory instance.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.CacheQueries">
+            <summary>
+            Gets or sets a value indicating whether to 
+            cache all queries executed by this template.
+            </summary>
+            <remarks>
+            If this is true, all IQuery and ICriteria objects created by
+            this template will be marked as cacheable (including all
+            queries through find methods).
+            <p>To specify the query region to be used for queries cached
+            by this template, set the QueryCacheRegion property.
+            </p>
+            </remarks>
+            <value><c>true</c> if cache queries; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.QueryCacheRegion">
+            <summary>
+            Gets or sets the name of the cache region for queries executed by this template.
+            </summary>
+            <remarks>
+            If this is specified, it will be applied to all IQuery and ICriteria objects
+            created by this template (including all queries through find methods).
+            <p>The cache region will not take effect unless queries created by this
+            template are configured to be cached via the CacheQueries property.
+            </p>
+            </remarks>
+            <value>The query cache region.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.FetchSize">
+            <summary>
+            Gets or sets the fetch size for this HibernateTemplate.
+            </summary>
+            <value>The size of the fetch.</value>
+            <remarks>This is important for processing
+            large result sets: Setting this higher than the default value will increase
+            processing speed at the cost of memory consumption; setting this lower can
+            avoid transferring row data that will never be read by the application.
+            <p>Default is 0, indicating to use the driver's default.</p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.MaxResults">
+            <summary>
+            Gets or sets the maximum number of rows for this HibernateTemplate.
+            </summary>
+            <value>The max results.</value>
+            <remarks>
+            This is important
+            for processing subsets of large result sets, avoiding to read and hold
+            the entire result set in the database or in the ADO.NET driver if we're
+            never interested in the entire result in the first place (for example,
+            when performing searches that might return a large number of matches).
+            <p>Default is 0, indicating to use the driver's default.</p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.AdoExceptionTranslator">
+            <summary>
+            Set the ADO.NET exception translator for this instance.
+            Applied to System.Data.Common.DbException (or provider specific exception type
+            in .NET 1.1) thrown by callback code, be it direct
+            DbException or wrapped Hibernate ADOExceptions.
+            <p>The default exception translator is either a ErrorCodeExceptionTranslator
+            if a DbProvider is available, or a FalbackExceptionTranslator otherwise
+            </p>
+            </summary>
+            <value>The ADO exception translator.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.Session">
+            <summary>
+            Gets a Session for use by this template.
+            </summary>
+            <value>The session.</value>
+            <remarks>
+            - Returns a new Session in case of "alwaysUseNewSession" (using the same ADO.NET connection as a transaction Session, if applicable)
+            - a pre-bound Session in case of "AllowCreate" is set to false (not the default) 
+            - or a pre-bound Session or new Session if no transactional or other pre-bound Session exists.
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder">
+            <summary>
+            Helper class to determine if the FlushMode enumeration
+            was changed from its default value
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder.#ctor(NHibernate.FlushMode)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder"/> class.
+            </summary>
+            <param name="mode">The flush mode.</param>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder.ModeWasSet">
+            <summary>
+            Gets or sets a value indicating whether the FlushMode
+            property was set..
+            </summary>
+            <value><c>true</c> if FlushMode was set; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder.Mode">
+            <summary>
+            Gets or sets the FlushMode.
+            </summary>
+            <value>The FlushMode.</value>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Support.OpenSessionInViewModule">
+            <summary>
+            Provide support for the open session in view pattern for lazily loaded hibernate objects
+            used in ASP.NET pages.
+            </summary>
+            <author>jjx: http://forum.springframework.net/member.php?u=29</author>
+            <author>Mark Pollack (.NET)</author>
+            <author>Erich Eichinger</author>
+            <author>Harald Radi</author>
+            <version>$Id: OpenSessionInViewModule.cs,v 1.7 2008/01/21 06:39:12 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Support.SessionScope">
+            <summary>
+            Implementation of SessionScope that associates a single session within the using scope.
+            </summary>
+            <remarks>
+            <para>It is recommended to be used in the following type of scenario:
+            <code>
+            using (new SessionScope())
+            {
+               ... do multiple operation, possibly in multiple transactions. 
+            }
+            </code>
+            At the end of "using", the session is automatically closed. All transactions within the scope use the same session,
+            if you are using Spring's HibernateTemplate or using Spring's implementation of NHibernate 1.2's 
+            ICurrentSessionContext interface.  
+            </para>
+            <para>
+            It is assumed that the session factory object name is called "SessionFactory". In case that you named the object 
+            in different way you can specify your can specify it in the application settings using the key
+            Spring.Data.NHibernate.Support.SessionScope.SessionFactoryObjectName.  Values for EntityInterceptorObjectName
+            and SingleSessionMode can be specified similarly.
+            </para>
+            <para>
+            <b>Note:</b>
+            The session is managed on a per thread basis on the thread that opens the scope instance. This means that you must
+            never pass a reference to a <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance over to another thread!
+            </para>
+            </remarks>
+            <author>Robert M. (.NET)</author>
+            <author>Harald Radi (.NET)</author>
+        </member>
+        <member name="F:Spring.Data.NHibernate.Support.SessionScope.log">
+            <summary>
+            The logging instance.
+            </summary>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class in single session mode, 
+            associating a session with the thread.  The session is opened lazily on demand.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class.
+            </summary>
+            <param name="open">
+            If set to <c>true</c> associate a session with the thread.  If false, another
+            collaborating class will associate the session with the thread, potentially by calling
+            the Open method on this class.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor(System.String,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class.
+            </summary>
+            <param name="sectionName">
+            The name of the configuration section to read configuration settings from. 
+            See <see cref="T:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings"/> for more info.
+            </param>
+            <param name="open">
+            If set to <c>true</c> associate a session with the thread.  If false, another
+            collaborating class will associate the session with the thread, potentially by calling
+            the Open method on this class.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor(System.String,System.Type,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class.
+            </summary>
+            <param name="sectionName">
+            The name of the configuration section to read configuration settings from. 
+            See <see cref="T:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings"/> for more info.
+            </param>
+            <param name="namespaceType">The type, who's full name is used for prefixing appSetting keys</param>
+            <param name="open">
+            If set to <c>true</c> associate a session with the thread.  If false, another
+            collaborating class will associate the session with the thread, potentially by calling
+            the Open method on this class.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor(NHibernate.ISessionFactory,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class.
+            </summary>
+            <param name="sessionFactory">
+            The <see cref="T:NHibernate.ISessionFactory"/> instance to be used for obtaining <see cref="T:NHibernate.ISession"/> instances.
+            </param>
+            <param name="open">
+            If set to <c>true</c> associate a session with the thread.  If false, another
+            collaborating class will associate the session with the thread, potentially by calling
+            the Open method on this class.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor(NHibernate.ISessionFactory,NHibernate.IInterceptor,System.Boolean,NHibernate.FlushMode,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class.
+            </summary>
+            <param name="sessionFactory">
+            The <see cref="T:NHibernate.ISessionFactory"/> instance to be used for obtaining <see cref="T:NHibernate.ISession"/> instances.
+            </param>
+            <param name="entityInterceptor">
+            Specify the <see cref="T:NHibernate.IInterceptor"/> to be set on each session provided by this <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance.
+            </param>
+            <param name="singleSession">
+            Set whether to use a single session for each request. See <see cref="P:Spring.Data.NHibernate.Support.SessionScope.SingleSession"/> property for details.
+            </param>
+            <param name="defaultFlushMode">
+            Specify the flushmode to be applied on each session provided by this <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance.
+            </param>
+            <param name="open">
+            If set to <c>true</c> associate a session with the thread.  If false, another
+            collaborating class will associate the session with the thread, potentially by calling
+            the Open method on this class.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor(Spring.Data.NHibernate.Support.SessionScopeSettings,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class.
+            </summary>
+            <param name="settings">An <see cref="T:Spring.Data.NHibernate.Support.SessionScopeSettings"/> instance holding the scope configuration</param>
+            <param name="open">
+            If set to <c>true</c> associate a session with the thread.  If false, another
+            collaborating class will associate the session with the thread, potentially by calling
+            the Open method on this class.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.SetOpen(System.Boolean)">
+            <summary>
+            Sets a flag, whether this scope is in "open" state on the current logical thread.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.SetParticipating(System.Boolean)">
+            <summary>
+            Gets/Sets a flag, whether this scope manages it's own session for the current logical thread or not.
+            </summary>
+            <value><c>false</c> if session is managed by this module. <c>false</c> otherwise</value>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.Dispose">
+            <summary>
+            Call <code>Close()</code>, 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.Open">
+            <summary>
+            Opens a new session or participates in an existing session and 
+            registers with spring's <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.Close">
+            <summary>
+            Close the current view's session and unregisters 
+            from spring's <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.SingleSession">
+            <summary>
+            Set whether to use a single session for each request. Default is "true".
+            If set to false, each data access operation or transaction will use
+            its own session (like without Open Session in View). Each of those
+            sessions will be registered for deferred close, though, actually
+            processed at request completion.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.DefaultFlushMode">
+            <summary>
+            Gets the flushmode to be applied on each newly created session.
+            </summary>
+            <remarks>
+            This property defaults to <see cref="F:NHibernate.FlushMode.Never"/> to ensure that modifying objects outside the boundaries 
+            of a transaction will not be persisted. It is recommended to not change this value but wrap any modifying operation
+            within a transaction.
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.SessionFactory">
+            <summary>
+            Get or set the configured SessionFactory
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.EntityInterceptor">
+            <summary>
+            Get or set the configured EntityInterceptor
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.IsOpen">
+            <summary>
+            Gets a flag, whether this scope is in "open" state on the current logical thread.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.IsParticipating">
+            <summary>
+            Gets a flag, whether this scope manages it's own session for the current logical thread or not.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Support.SessionScope.LazySessionHolder">
+            <summary>
+            This sessionHolder creates a default session only if it is needed.
+            </summary>
+            <remarks>
+            Although a NHibernateSession deferes creation of db-connections until they are really
+            needed, instantiation a session is imho still more expensive than this LazySessionHolder. (EE)
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.NHibernate.SessionHolder">
+            <summary>
+            Session holder, wrapping a NHibernate ISession and a NHibernate Transaction.
+            HibernateTransactionManager binds instances of this class
+            to the thread, for a given ISessionFactory.
+            </summary>
+            <remarks>
+            Note: This is an SPI class, not intended to be used by applications.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: SessionHolder.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.#ctor">
+            <summary>
+            May be used by derived classes to create an empty SessionHolder.
+            </summary>
+            <remarks>
+            When using this ctor in your derived class, you MUST override <see cref="M:Spring.Data.NHibernate.SessionHolder.EnsureInitialized"/>!
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.#ctor(NHibernate.ISession)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.SessionHolder"/> class.
+            </summary>
+            <param name="session">The session.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.#ctor(System.Object,NHibernate.ISession)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.SessionHolder"/> class.
+            </summary>
+            <param name="key">The key to store the session under.</param>
+            <param name="session">The hibernate session.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.EnsureInitialized">
+            <summary>
+            May be overridden in a derived class to e.g. lazily create a session
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.GetSession(System.Object)">
+            <summary>
+            Gets the session given key identifier
+            </summary>
+            <param name="key">The key.</param>
+            <returns>A hibernate session</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.GetValidatedSession(System.Object)">
+            <summary>
+            Gets the session given the key and removes the session from
+            the dictionary storage.
+            </summary>
+            <param name="key">The key.</param>
+            <returns>A hibernate session</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.AddSession(NHibernate.ISession)">
+            <summary>
+            Adds the session to the dictionary storage using the default key.
+            </summary>
+            <param name="session">The hibernate session.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.AddSession(System.Object,NHibernate.ISession)">
+            <summary>
+            Adds the session to the dictionary storage using the supplied key.
+            </summary>
+            <param name="key">The key.</param>
+            <param name="session">The hibernate session.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.RemoveSession(System.Object)">
+            <summary>
+            Removes the session from the dictionary storage for the given key.
+            </summary>
+            <param name="key">The key.</param>
+            <returns>The session that was previously contained in the
+            dictionary storage.</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.ContainsSession(System.Object)">
+            <summary>
+            Determines whether the holder the specified session.
+            </summary>
+            <param name="session">The session.</param>
+            <returns>
+            	<c>true</c> if the holder contains the specified session; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.Clear">
+            <summary>
+            Clear the transaction state of this resource holder.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.Session">
+            <summary>
+            Gets the session using the default key
+            </summary>
+            <value>The hibernate session.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.AnySession">
+            <summary>
+            Gets the first session based on iteration over
+            the IDictionary storage.
+            </summary>
+            <value>Any hibernate session.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.IsEmpty">
+            <summary>
+            Gets a value indicating whether dictionary of
+            hibernate sessions is empty.
+            </summary>
+            <value>
+            	<c>true</c> if this session holder is empty; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.DoesNotHoldNonDefaultSession">
+            <summary>
+            Gets a value indicating whether this SessionHolder
+            does not hold non default session.
+            </summary>
+            <value>
+            	<c>true</c> if does not hold non default session; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.Transaction">
+            <summary>
+            Gets or sets the hibernate transaction.
+            </summary>
+            <value>The transaction.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.Connection">
+            <summary>
+            Gets or sets the ADO.NET Connection used to create the session.
+            </summary>
+            <value>The ADO.NET connection.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.PreviousFlushMode">
+            <summary>
+            Gets or sets the previous flush mode.
+            </summary>
+            <value>The previous flush mode.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.AssignedPreviousFlushMode">
+            <summary>
+            Gets a value indicating whether the PreviousFlushMode property
+            was set.
+            </summary>
+            <value>
+            	<c>true</c> if assigned PreviousFlushMode property; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.ValidatedSession">
+            <summary>
+            Gets the validated session.
+            </summary>
+            <value>The validated session.</value>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.LazySessionHolder.#ctor(Spring.Data.NHibernate.Support.SessionScope)">
+            <summary>
+            Initialize a new instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.LazySessionHolder.EnsureInitialized">
+            <summary>
+            Create a new session on demand
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.LazySessionHolder.Close">
+            <summary>
+            Ensure session is closed (if any) and remove circular references to avoid memory leaks!
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.LazySessionHolder.Current">
+            <summary>
+            Gets or sets the LazySessionHolder instance for the current request
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.OpenSessionInViewModule.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.OpenSessionInViewModule"/> class.  Creates a SessionScope,
+            but does not yet associate a session with a thread, that is lef to the lifecycle of the request.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.OpenSessionInViewModule.Init(System.Web.HttpApplication)">
+            <summary>
+            Register context handler and look up SessionFactoryObjectName under the application configuration key,
+            Spring.Data.NHibernate.Support.OpenSessionInViewModule.SessionFactoryObjectName if not using the default value
+            (i.e. sessionFactory) and look up the SingleSession setting under the application configuration key,
+            Spring.Data.NHibernate.Support.OpenSessionInViewModule.SingleSession if not using the default value of true.
+            </summary>
+            <param name="context">The standard HTTP application context</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.OpenSessionInViewModule.Dispose">
+            <summary>
+            A do nothing dispose method.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateTransactionManager">
+            <summary>
+            PlatformTransactionManager implementation for a single Hibernate SessionFactory.
+            Binds a Hibernate Session from the specified factory to the thread, potentially
+            allowing for one thread Session per factory
+            </summary>
+            <remarks>
+            SessionFactoryUtils and HibernateTemplate are aware of thread-bound Sessions and participate in such
+            transactions automatically. Using either of those is required for Hibernate
+            access code that needs to support this transaction handling mechanism.
+            <para>
+            Supports custom isolation levels at the start of the transaction
+            , and timeouts that get applied as appropriate
+            Hibernate query timeouts. To support the latter, application code must either use
+            <code>HibernateTemplate</code> (which by default applies the timeouts) or call
+            <code>SessionFactoryUtils.applyTransactionTimeout</code> for each created
+            Hibernate Query object.
+            </para>
+            <para>Note that you can specify a Spring IDbProvider instance which if shared with
+            a corresponding instance of AdoTemplate will allow for mixing ADO.NET/NHibernate
+            operations within a single transaction.</para>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateTransactionManager.cs,v 1.7 2007/11/20 14:39:48 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.NHibernate.HibernateTransactionManager.objectFactory">
+            <summary>
+            Just needed for entityInterceptorBeanName. 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateTransactionManager"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.#ctor(NHibernate.ISessionFactory)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateTransactionManager"/> class.
+            </summary>
+            <param name="sessionFactory">The session factory.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoGetTransaction">
+            <summary>
+            Return the current transaction object.
+            </summary>
+            <returns>The current transaction object.</returns>
+            <exception cref="T:Spring.Transaction.CannotCreateTransactionException">
+            If transaction support is not available.
+            </exception>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of lookup or system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.IsExistingTransaction(System.Object)">
+            <summary>
+            Check if the given transaction object indicates an existing,
+            i.e. already begun, transaction.
+            </summary>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <returns>True if there is an existing transaction.</returns>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoBegin(System.Object,Spring.Transaction.ITransactionDefinition)">
+            <summary>
+            Begin a new transaction with the given transaction definition.
+            </summary>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <param name="definition">
+            <see cref="T:Spring.Transaction.ITransactionDefinition"/> instance, describing
+            propagation behavior, isolation level, timeout etc.
+            </param>
+            <remarks>
+            Does not have to care about applying the propagation behavior,
+            as this has already been handled by this abstract manager.
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of creation or system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoSuspend(System.Object)">
+            <summary>
+            Suspend the resources of the current transaction.
+            </summary>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <returns>
+            An object that holds suspended resources (will be kept unexamined for passing it into
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoResume(System.Object,System.Object)"/>.)
+            </returns>
+            <remarks>
+            Transaction synchronization will already have been suspended.
+            </remarks>
+            <exception cref="T:Spring.Transaction.IllegalTransactionStateException">
+            If suspending is not supported by the transaction manager implementation.
+            </exception>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            in case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoResume(System.Object,System.Object)">
+            <summary>
+            Resume the resources of the current transaction.
+            </summary>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <param name="suspendedResources">
+            The object that holds suspended resources as returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoSuspend(System.Object)"/>.
+            </param>
+            <remarks>
+            Transaction synchronization will be resumed afterwards.
+            </remarks>
+            <exception cref="T:Spring.Transaction.IllegalTransactionStateException">
+            If suspending is not supported by the transaction manager implementation.
+            </exception>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoCommit(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Perform an actual commit on the given transaction.
+            </summary>
+            <param name="status">The status representation of the transaction.</param>
+            <remarks>
+            <p>
+            An implementation does not need to check the rollback-only flag.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoRollback(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Perform an actual rollback on the given transaction.
+            </summary>
+            <param name="status">The status representation of the transaction.</param>
+            <remarks>
+            An implementation does not need to check the new transaction flag.
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoSetRollbackOnly(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Set the given transaction rollback-only. Only called on rollback
+            if the current transaction takes part in an existing one.
+            </summary>
+            <param name="status">The status representation of the transaction.</param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.GetIDbTransaction(NHibernate.ITransaction)">
+            <summary>
+            Gets the ADO.NET IDbTransaction object from the NHibernate ITransaction object.
+            </summary>
+            <param name="hibernateTx">The hibernate transaction.</param>
+            <returns>The ADO.NET transaction.  Null if could not get the transaction.  Warning
+            messages will be logged in that case.</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.ConvertHibernateAccessException(NHibernate.HibernateException)">
+            <summary>
+            Convert the given HibernateException to an appropriate exception from
+            the Spring.Dao hierarchy. Can be overridden in subclasses.
+            </summary>
+            <param name="ex">The HibernateException that occured.</param>
+            <returns>The corresponding DataAccessException instance</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.ConvertAdoAccessException(NHibernate.ADOException,Spring.Data.Support.IAdoExceptionTranslator)">
+            <summary>
+            Convert the given ADOException to an appropriate exception from the
+            the Spring.Dao hierarchy. Can be overridden in subclasses.
+            </summary>
+            <param name="ex">The ADOException that occured, wrapping the underlying
+            ADO.NET thrown exception.</param>
+            <param name="translator">The translator to convert hibernate ADOExceptions.</param>
+            <returns>
+            The corresponding DataAccessException instance
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoCleanupAfterCompletion(System.Object)">
+            <summary>
+            Cleanup resources after transaction completion.
+            </summary>
+            <param name="transaction">Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.</param>
+            <remarks>
+            <note>
+            This implemenation unbinds the SessionFactory and 
+            DbProvider from thread local storage and closes the 
+            ISession.
+            </note>
+            	<p>
+            Called after <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoCommit(Spring.Transaction.Support.DefaultTransactionStatus)"/>
+            and
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoRollback(Spring.Transaction.Support.DefaultTransactionStatus)"/>
+            execution on any outcome.
+            </p>
+            	<p>
+            Should not throw any exceptions but just issue warnings on errors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has injected all of an object's dependencies.
+            </summary>
+            <remarks>
+            <p>
+            This method allows the object instance to perform the kind of
+            initialization only possible when all of it's dependencies have
+            been injected (set), and to throw an appropriate exception in the
+            event of misconfiguration.
+            </p>
+            <p>
+            Please do consult the class level documentation for the
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> interface for a
+            description of exactly <i>when</i> this method is invoked. In
+            particular, it is worth noting that the
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            and <see cref="T:Spring.Context.IApplicationContextAware"/>
+            callbacks will have been invoked <i>prior</i> to this method being
+            called.
+            </p>
+            </remarks>
+            <exception cref="T:System.ArgumentException">
+            In the event of misconfiguration (such as the failure to set a
+            required property) or if initialization fails.
+            </exception>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.DbProvider">
+            <summary>
+            Gets or sets the db provider.
+            </summary>
+            <value>The db provider.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.EntityInterceptor">
+            <summary>
+            Gets or sets a Hibernate entity interceptor that allows to inspect and change
+            property values before writing to and reading from the database.
+            When getting, return the current Hibernate entity interceptor, or <code>null</code> if none.
+            </summary>
+            <value>The entity interceptor.</value>
+            <remarks>
+            Resolves an entity interceptor object name via the object factory,
+            if necessary.
+            Will get applied to any new Session created by this transaction manager.
+            Such an interceptor can either be set at the SessionFactory level,
+            i.e. on LocalSessionFactoryObject, or at the Session level, i.e. on
+            HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
+            It's preferable to set it on LocalSessionFactoryObject or HibernateTransactionManager
+            to avoid repeated configuration and guarantee consistent behavior in transactions.
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">If object factory is null and need to get entity interceptor via object name.</exception>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.EntityInterceptorObjectName">
+            <summary>
+            Sets the object name of a Hibernate entity interceptor that
+            allows to inspect and change property values before writing to and reading from the database.
+            </summary>
+            <value>The name of the entity interceptor object.</value>
+            <remarks>
+            Will get applied to any new Session created by this transaction manager.
+            <p>Requires the object factory to be known, to be able to resolve the object
+            name to an interceptor instance on session creation. Typically used for
+            prototype interceptors, i.e. a new interceptor instance per session.
+            </p>
+            	<p>Can also be used for shared interceptor instances, but it is recommended
+            to set the interceptor reference directly in such a scenario.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.AdoExceptionTranslator">
+            <summary>
+            Gets or sets the ADO.NET exception translator for this transaction manager.
+            </summary>
+            <remarks>
+            Applied to ADO.NET Exceptions (wrapped by Hibernate's ADOException)
+            </remarks>
+            <value>The ADO exception translator.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.DefaultAdoExceptionTranslator">
+            <summary>
+            Gets the default IAdoException translator, lazily creating it if nece
+            </summary>
+            <value>The default IAdoException translator.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.SessionFactory">
+            <summary>
+            Gets or sets the SessionFactory that this instance should manage transactions for.
+            </summary>
+            <value>The session factory.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.AutodetectDbProvider">
+            <summary>
+            Set whether to autodetect a ADO.NET connection used by the Hibernate SessionFactory,
+            if set via LocalSessionFactoryObject's <code>DbProvider</code>. Default is "true".
+            </summary>
+            <value>
+            	<c>true</c> if [autodetect data source]; otherwise, <c>false</c>.
+            </value>
+            <remarks>
+            	<p>Can be turned off to deliberately ignore an available IDbProvider,
+            to not expose Hibernate transactions as ADO.NET transactions for that IDbProvider.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.ObjectFactory">
+            <summary>
+            The object factory just needs to be known for resolving entity interceptor
+            It does not need to be set for any other mode of operation.
+            </summary>
+            <value>
+            Owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            (may not be <see langword="null"/>). The object can immediately
+            call methods on the factory.
+            </value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.HibernateTransactionObject.RollbackOnly">
+            <summary>
+            Return whether the transaction is internally marked as rollback-only.
+            </summary>
+            <value></value>
+            <returns>True of the transaction is marked as rollback-only.</returns>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateTemplate">
+             <summary>
+             Helper class that simplifies NHibernate data access code
+             </summary>
+             <remarks>
+             <p>Typically used to implement data access or business logic services that
+             use NHibernate within their implementation but are Hibernate-agnostic in their
+             interface. The latter or code calling the latter only have to deal with
+             domain objects.</p>
+            
+             <p>The central method is Execute supporting Hibernate access code
+             implementing the HibernateCallback interface. It provides NHibernate Session
+             handling such that neither the IHibernateCallback implementation nor the calling
+             code needs to explicitly care about retrieving/closing NHibernate Sessions,
+             or handling Session lifecycle exceptions. For typical single step actions,
+             there are various convenience methods (Find, Load, SaveOrUpdate, Delete).
+             </p>
+             
+             <p>Can be used within a service implementation via direct instantiation
+             with a ISessionFactory reference, or get prepared in an application context
+             and given to services as an object reference. Note: The ISessionFactory should
+             always be configured as an object in the application context, in the first case
+             given to the service directly, in the second case to the prepared template.
+             </p>
+             
+             <p>This class can be considered as direct alternative to working with the raw
+             Hibernate Session API (through SessionFactoryUtils.Session).
+             </p>
+             
+             <p>LocalSessionFactoryObject is the preferred way of obtaining a reference
+             to a specific NHibernate ISessionFactory.
+             </p>
+             </remarks>
+             <author>Mark Pollack (.NET)</author>
+             <version>$Id: HibernateTemplate.cs,v 1.3 2008/01/24 17:29:16 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.NHibernate.IHibernateOperations">
+            <summary>
+            Interface that specifies a basic set of Hibernate operations.
+            </summary>
+            <remarks>
+            Implemented by HibernateTemplate. Not often used, but a useful option
+            to enhance testability, as it can easily be mocked or stubbed.
+            <p>Provides HibernateTemplate's data access methods that mirror
+            various Session methods. See the NHibernate ISession documentation
+            for details on those methods.
+            </p>
+            </remarks>
+            <threadsafety statis="true" instance="true"/> 
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IHibernateOperations.cs,v 1.2 2007/09/19 22:58:22 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.NHibernate.ICommonHibernateOperations">
+            <summary>
+            Interface that specifies a set of Hibernate operations that
+            are common across versions of Hibernate.
+            </summary>
+            <remarks>
+            Base interface for generic and non generic IHibernateOperations interfaces
+            Not often used, but a useful option
+            to enhance testability, as it can easily be mocked or stubbed.
+            <p>Provides HibernateTemplate's data access methods that mirror
+            various Session methods. See the NHibernate ISession documentation
+            for details on those methods.
+            </p>
+            </remarks> 
+            <author>Mark Pollack (.NET)</author>  
+            <threadsafety statis="true" instance="true"/> 
+            <version>$Id: ICommonHibernateOperations.cs,v 1.2 2007/09/19 22:58:22 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Clear">
+            <summary>
+            Remove all objects from the Session cache, and cancel all pending saves,
+            updates and deletes.
+            </summary>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Delete(System.Object)">
+            <summary>
+            Delete the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to delete.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Delete(System.Object,NHibernate.LockMode)">
+            <summary>
+            Delete the given persistent instance.
+            </summary>
+            <remarks>
+            Obtains the specified lock mode if the instance exists, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </remarks>
+            <param name="entity">Tthe persistent instance to delete.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Delete(System.String)">
+            <summary>
+            Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Delete(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+             Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <param name="value">The value of the parameter.</param>
+            <param name="type">The Hibernate type of the parameter (or <code>null</code>).</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Delete(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <param name="values">The values of the parameters.</param>
+            <param name="types"> Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Flush">
+            <summary>
+            Flush all pending saves, updates and deletes to the database.
+            </summary>
+            <remarks>
+            Only invoke this for selective eager flushing, for example when ADO.NET code
+            needs to see certain changes within the same transaction. Else, it's preferable
+            to rely on auto-flushing at transaction completion.
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Load(System.Object,System.Object)">
+            <summary>
+            Load the persistent instance with the given identifier
+            into the given object, throwing an exception if not found.
+            </summary>
+            <param name="entity">Entity the object (of the target class) to load into.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If object not found.</exception>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Refresh(System.Object)">
+            <summary>
+            Re-read the state of the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to re-read.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Refresh(System.Object,NHibernate.LockMode)">
+            <summary>
+            Re-read the state of the given persistent instance.
+            Obtains the specified lock mode for the instance.
+            </summary>
+            <param name="entity">The persistent instance to re-read.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Contains(System.Object)">
+            <summary>
+            Determines whether the given object is in the Session cache.
+            </summary>
+            <param name="entity">the persistence instance to check.</param>
+            <returns>
+            	<c>true</c> if session cache contains the specified entity; otherwise, <c>false</c>.
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Evict(System.Object)">
+            <summary>
+            Remove the given object from the Session cache.
+            </summary>
+            <param name="entity">The persistent instance to evict.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Lock(System.Object,NHibernate.LockMode)">
+            <summary>
+            Obtain the specified lock level upon the given object, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </summary>
+            <param name="entity">The he persistent instance to lock.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.ObjectOptimisticLockingFailureException">If not found</exception>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Save(System.Object)">
+            <summary>
+            Persist the given transient instance.
+            </summary>
+            <param name="entity">The transient instance to persist.</param>
+            <returns>The generated identifier.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Save(System.Object,System.Object)">
+            <summary>
+            Persist the given transient instance with the given identifier.
+            </summary>
+            <param name="entity">The transient instance to persist.</param>
+            <param name="id">The identifier to assign.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Update(System.Object)">
+            <summary>
+            Update the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to update.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Update(System.Object,NHibernate.LockMode)">
+            <summary>
+            Update the given persistent instance.
+            Obtains the specified lock mode if the instance exists, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </summary>
+            <param name="entity">The persistent instance to update.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.SaveOrUpdate(System.Object)">
+            <summary>
+            Save or update the given persistent instance,
+            according to its id (matching the configured "unsaved-value"?).
+            </summary>
+            <param name="entity">Tthe persistent instance to save or update
+            (to be associated with the Hibernate Session).</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.SaveOrUpdateCopy(System.Object)">
+            <summary>
+            Save or update the contents of given persistent object,
+            according to its id (matching the configured "unsaved-value"?).
+            Will copy the contained fields to an already loaded instance
+            with the same id, if appropriate.
+            </summary>
+            <param name="entity">The persistent object to save or update.
+            (<i>not</i> necessarily to be associated with the Hibernate Session)
+            </param>
+            <returns>The actually associated persistent object.
+            (either an already loaded instance with the same id, or the given object)</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.DeleteAll(System.Collections.ICollection)">
+            <summary>
+            Delete all given persistent instances.
+            </summary>
+            <param name="entities">The persistent instances to delete.</param>
+            <remarks>
+            This can be combined with any of the find methods to delete by query
+            in two lines of code, similar to Session's delete by query methods.
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Execute(Spring.Data.NHibernate.HibernateDelegate)">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning a result object, i.e. a domain
+            object or a collection of domain objects.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+            <returns>a result object returned by the action, or <code>null</code>
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Execute(Spring.Data.NHibernate.IHibernateCallback)">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning a result object, i.e. a domain
+            object or a collection of domain objects.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <param name="action">The callback object that specifies the Hibernate action.</param>
+            <returns>a result object returned by the action, or <code>null</code>
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.ExecuteFind(Spring.Data.NHibernate.IHibernateCallback)">
+            <summary>
+            Execute the specified action assuming that the result object is a List.
+            </summary>
+            <remarks>
+            This is a convenience method for executing Hibernate find calls or
+            queries within an action.
+            </remarks>
+            <param name="action">The calback object that specifies the Hibernate action.</param>
+            <returns>A IList returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Find(System.String)">
+            <summary>
+            Execute a query for persistent instances.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Find(System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="value">the value of the parameter</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Find(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a query for persistent instances, binding one value
+            to a "?" parameter of the given type in the query string.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="value">The value of the parameter.</param>
+            <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Find(System.String,System.Object[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="values">the values of the parameters</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Find(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a query for persistent instances, binding a number of
+            values to "?" parameters of the given types in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentException">If values and types are not null and their lengths are not equal</exception>          
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedParam(System.String,System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a named parameter in the query string.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">The name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedParam(System.String,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a named parameter in the query string.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">The name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedParam(System.String,System.String[],System.Object[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to named parameters in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedParam(System.String,System.String[],System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to named parameters in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+            if paramNames length is not equal to types length (when types is not null)</exception>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQuery(System.String)">
+            <summary>
+            Execute a named query for persistent instances.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQuery(System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+             A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="value">The value of the parameter</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQuery(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQuery(System.String,System.Object[])">
+            <summary>
+            Execute a named query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="values">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQuery(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a named query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If values and types are not null and their lengths differ.</exception>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQueryAndNamedParam(System.String,System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a named parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQueryAndNamedParam(System.String,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a named parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">The Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQueryAndNamedParam(System.String,System.String[],System.Object[])">
+            <summary>
+            Execute a named query for persistent instances, binding
+            number of values to named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters.</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQueryAndNamedParam(System.String,System.String[],System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a named query for persistent instances, binding
+            number of values to named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters.</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+            if paramNames length is not equal to types length (when types is not null)</exception>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQueryAndValueObject(System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding the properties
+            of the given object to named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="valueObject">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByValueObject(System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding the properties
+            of the given object to <i>named</i> parameters in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>       
+            <param name="valueObject">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Get(System.Type,System.Object)">
+            <summary>
+            Return the persistent instance of the given entity type
+            with the given identifier, or <code>null</code> if not found.
+            </summary>
+            <param name="entityType">a persistent type.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <returns>the persistent instance, or null if not found</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Get(System.Type,System.Object,NHibernate.LockMode)">
+            <summary>
+            Return the persistent instance of the given entity type
+            with the given identifier, or <code>null</code> if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <param name="entityType">A persistent class.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <param name="lockMode">The lock mode.</param>
+            the persistent instance, or <code>null</code> if not found
+            <returns>the persistent instance, or null if not found</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Load(System.Type,System.Object)">
+            <summary>
+            Return the persistent instance of the given entity class
+             with the given identifier, throwing an exception if not found.
+            </summary>
+            <param name="entityType">Type of the entity.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <returns>The persistent instance</returns>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If not found</exception>     
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception> 
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Load(System.Type,System.Object,NHibernate.LockMode)">
+            <summary>
+            Return the persistent instance of the given entity class
+            with the given identifier, throwing an exception if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <param name="entityType">Type of the entity.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <param name="lockMode">The lock mode.</param>
+            <returns>The persistent instance</returns>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If not found</exception>     
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception> 
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.LoadAll(System.Type)">
+            <summary>
+            Return all persistent instances of the given entity class.
+            Note: Use queries or criteria for retrieving a specific subset.
+            </summary>
+            <param name="entityType">Type of the entity.</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception> 
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.SaveOrUpdateAll(System.Collections.ICollection)">
+            <summary>
+            Save or update all given persistent instances,
+            according to its id (matching the configured "unsaved-value"?).
+            </summary>
+            <param name="entities">Tthe persistent instances to save or update
+            (to be associated with the Hibernate Session)he entities.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="F:Spring.Data.NHibernate.HibernateTemplate.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class. 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateTemplate"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.#ctor(NHibernate.ISessionFactory)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateTemplate"/> class.
+            </summary>
+            <remarks>The default for creating a new non-transactional
+            session when no transactional Session can be found for the current thread
+            is set to true.</remarks>
+            <param name="sessionFactory">The session factory to create sessions.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.#ctor(NHibernate.ISessionFactory,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateTemplate"/> class.
+            </summary>
+            <param name="sessionFactory">The session factory to create sessions.</param>        
+            <param name="allowCreate">if set to <c>true</c> allow creation
+            of a new non-transactional when no transactional Session can be found 
+            for the current thread.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.ClearAction(NHibernate.ISession)">
+            <summary>
+            Delegate function that clears the session.
+            </summary>
+            <param name="session">The hibernate session.</param>
+            <returns>null</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Flush">
+            <summary>
+            Flush all pending saves, updates and deletes to the database.
+            </summary>
+            <remarks>
+            Only invoke this for selective eager flushing, for example when ADO.NET code
+            needs to see certain changes within the same transaction. Else, it's preferable
+            to rely on auto-flushing at transaction completion.
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Get(System.Type,System.Object)">
+            <summary>
+            Return the persistent instance of the given entity type
+            with the given identifier, or <code>null</code> if not found.
+            </summary>
+            <param name="entityType">The type.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <returns>The persistent instance, or <code>null</code> if not found</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Get(System.Type,System.Object,NHibernate.LockMode)">
+            <summary>
+            Return the persistent instance of the given entity type
+            with the given identifier, or <code>null</code> if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <param name="type">The type.</param>
+            <param name="id">The lock mode to obtain.</param>
+            <param name="lockMode">The lock mode.</param>
+            the persistent instance, or <code>null</code> if not found
+            <returns>the persistent instance, or null if not found</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Load(System.Type,System.Object)">
+            <summary>
+            Return the persistent instance of the given entity class
+            with the given identifier, throwing an exception if not found.
+            </summary>
+            <param name="entityType">Type of the entity.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <returns>The persistent instance</returns>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If not found</exception>     
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception> 
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Load(System.Type,System.Object,NHibernate.LockMode)">
+            <summary>
+            Return the persistent instance of the given entity class
+             with the given identifier, throwing an exception if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <param name="entityType">Type of the entity.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <param name="lockMode">The lock mode.</param>
+            <returns>The persistent instance</returns>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If not found</exception>     
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception> 
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Load(System.Object,System.Object)">
+            <summary>
+            Load the persistent instance with the given identifier
+            into the given object, throwing an exception if not found.
+            </summary>
+            <param name="entity">Entity the object (of the target class) to load into.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If object not found.</exception>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.LoadAll(System.Type)">
+            <summary>
+            Return all persistent instances of the given entity class.
+            Note: Use queries or criteria for retrieving a specific subset.
+            </summary>
+            <param name="entityType">Type of the entity.</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception> 
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Refresh(System.Object)">
+            <summary>
+            Re-read the state of the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to re-read.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Refresh(System.Object,NHibernate.LockMode)">
+            <summary>
+            Re-read the state of the given persistent instance.
+            Obtains the specified lock mode for the instance.
+            </summary>
+            <param name="entity">The persistent instance to re-read.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Lock(System.Object,NHibernate.LockMode)">
+            <summary>
+            Obtain the specified lock level upon the given object, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </summary>
+            <param name="entity">The he persistent instance to lock.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.ObjectOptimisticLockingFailureException">If not found</exception>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Save(System.Object)">
+            <summary>
+            Persist the given transient instance.
+            </summary>
+            <param name="entity">The transient instance to persist.</param>
+            <returns>The generated identifier.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Save(System.Object,System.Object)">
+            <summary>
+            Persist the given transient instance with the given identifier.
+            </summary>
+            <param name="entity">The transient instance to persist.</param>
+            <param name="id">The identifier to assign.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Update(System.Object)">
+            <summary>
+            Update the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to update.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Update(System.Object,NHibernate.LockMode)">
+            <summary>
+            Update the given persistent instance.
+            Obtains the specified lock mode if the instance exists, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </summary>
+            <param name="entity">The persistent instance to update.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.SaveOrUpdate(System.Object)">
+            <summary>
+            Save or update the given persistent instance,
+            according to its id (matching the configured "unsaved-value"?).
+            </summary>
+            <param name="entity">Tthe persistent instance to save or update
+            (to be associated with the Hibernate Session).</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.SaveOrUpdateAll(System.Collections.ICollection)">
+            <summary>
+            Save or update all given persistent instances,
+            according to its id (matching the configured "unsaved-value"?).
+            </summary>
+            <param name="entities">Tthe persistent instances to save or update
+            (to be associated with the Hibernate Session)he entities.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.SaveOrUpdateCopy(System.Object)">
+            <summary>
+            Save or update the contents of given persistent object,
+            according to its id (matching the configured "unsaved-value"?).
+            Will copy the contained fields to an already loaded instance
+            with the same id, if appropriate.
+            </summary>
+            <param name="entity">The persistent object to save or update.
+            (<i>not</i> necessarily to be associated with the Hibernate Session)
+            </param>
+            <returns>The actually associated persistent object.
+            (either an already loaded instance with the same id, or the given object)</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Clear">
+            <summary>
+            Remove all objects from the Session cache, and cancel all pending saves,
+            updates and deletes.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Contains(System.Object)">
+            <summary>
+            Determines whether the given object is in the Session cache.
+            </summary>
+            <param name="entity">the persistence instance to check.</param>
+            <returns>
+            	<c>true</c> if session cache contains the specified entity; otherwise, <c>false</c>.
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Evict(System.Object)">
+            <summary>
+            Remove the given object from the Session cache.
+            </summary>
+            <param name="entity">The persistent instance to evict.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Delete(System.Object)">
+            <summary>
+            Delete the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to delete.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Delete(System.Object,NHibernate.LockMode)">
+            <summary>
+            Delete the given persistent instance.
+            </summary>
+            <param name="entity">Tthe persistent instance to delete.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <remarks>
+            Obtains the specified lock mode if the instance exists, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Delete(System.String)">
+            <summary>
+            Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Delete(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+             Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <param name="value">The value of the parameter.</param>
+            <param name="type">The Hibernate type of the parameter (or <code>null</code>).</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Delete(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <param name="values">The values of the parameters.</param>
+            <param name="types"> Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If length for argument values and types are not equal.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.DeleteAll(System.Collections.ICollection)">
+            <summary>
+            Delete all given persistent instances.
+            </summary>
+            <param name="entities">The persistent instances to delete.</param>
+            <remarks>
+            This can be combined with any of the find methods to delete by query
+            in two lines of code, similar to Session's delete by query methods.
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Execute(Spring.Data.NHibernate.HibernateDelegate)">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning a result object, i.e. a domain
+            object or a collection of domain objects.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+            <returns>a result object returned by the action, or <code>null</code>
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Execute(Spring.Data.NHibernate.HibernateDelegate,System.Boolean)">
+            <summary>
+            Execute the action specified by the delegate within a Session.
+            </summary>
+            <param name="del">The HibernateDelegate that specifies the action
+            to perform.</param>
+            <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+            callback code.</param>
+            <returns>a result object returned by the action, or <code>null</code>
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Execute(Spring.Data.NHibernate.IHibernateCallback)">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <param name="action">The callback object that specifies the Hibernate action.</param>
+            <returns>
+            a result object returned by the action, or <code>null</code>
+            </returns>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning a result object, i.e. a domain
+            object or a collection of domain objects.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.ExecuteFind(Spring.Data.NHibernate.IHibernateCallback)">
+            <summary>
+            Execute the specified action assuming that the result object is a List.
+            </summary>
+            <remarks>
+            This is a convenience method for executing Hibernate find calls or
+            queries within an action.
+            </remarks>
+            <param name="action">The calback object that specifies the Hibernate action.</param>
+            <returns>A IList returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Execute(Spring.Data.NHibernate.IHibernateCallback,System.Boolean)">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <param name="action">callback object that specifies the Hibernate action.</param>
+            <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+            callback code.</param>
+            <returns>
+            a result object returned by the action, or <code>null</code>
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Find(System.String)">
+            <summary>
+            Execute a query for persistent instances.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <returns>
+            a List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Find(System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="value">the value of the parameter</param>
+            <returns>
+            a List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Find(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a query for persistent instances, binding one value
+            to a "?" parameter of the given type in the query string.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="value">The value of the parameter.</param>
+            <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>
+            a List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Find(System.String,System.Object[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="values">the values of the parameters</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Find(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a query for persistent instances, binding a number of
+            values to "?" parameters of the given types in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>
+            a List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentException">If values and types are not null and their lengths are not equal</exception>          
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedParam(System.String,System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a named parameter in the query string.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">The name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedParam(System.String,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a named parameter in the query string.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">The name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedParam(System.String,System.String[],System.Object[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to named parameters in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedParam(System.String,System.String[],System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to named parameters in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+            if paramNames length is not equal to types length (when types is not null)</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQuery(System.String)">
+            <summary>
+            Execute a named query for persistent instances.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQuery(System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+             A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="value">The value of the parameter</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQuery(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQuery(System.String,System.Object[])">
+            <summary>
+            Execute a named query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="values">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQuery(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a named query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If values and types are not null and their lengths differ.</exception>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQueryAndNamedParam(System.String,System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a named parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQueryAndNamedParam(System.String,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a named parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">The Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQueryAndNamedParam(System.String,System.String[],System.Object[])">
+            <summary>
+            Execute a named query for persistent instances, binding
+            number of values to named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters.</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQueryAndNamedParam(System.String,System.String[],System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a named query for persistent instances, binding
+            number of values to named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters.</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+            if paramNames length is not equal to types length (when types is not null)</exception>                
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQueryAndValueObject(System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding the properties
+            of the given object to  named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="valueObject">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByValueObject(System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding the properties
+            of the given object to <i>named</i> parameters in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>       
+            <param name="valueObject">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.CreateSessionProxy(NHibernate.ISession)">
+            <summary>
+            Create a close-suppressing proxy for the given Hibernate Session.
+            The proxy also prepares returned Query and Criteria objects.
+            </summary>
+            <param name="session">The session.</param>
+            <returns>The session proxy.</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.CheckWriteOperationAllowed(NHibernate.ISession)">
+            <summary>
+            Check whether write operations are allowed on the given Session.
+            </summary>
+            <remarks>
+            Default implementation throws an InvalidDataAccessApiUsageException
+            in case of FlushMode.Never. Can be overridden in subclasses.
+            </remarks>
+            <param name="session">The current Hibernate session.</param>
+            <exception cref="T:Spring.Dao.InvalidDataAccessApiUsageException">If write operation is attempted in read-only mode
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.AreEqualFlushMode(Spring.Data.NHibernate.TemplateFlushMode,NHibernate.FlushMode)">
+            <summary>
+            Compares if the flush mode enumerations, Spring's
+            TemplateFlushMode and NHibernates FlushMode have equal
+            settings.
+            </summary>
+            <param name="tfm">The template flush mode.</param>
+            <param name="fm">The NHibernate flush mode.</param>
+            <returns>
+            Returns true if both are Never, Auto, or Commit, false
+            otherwise.
+            </returns>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.AllowCreate">
+            <summary>
+            Gets or sets if a new Session should be created when no transactional Session
+            can be found for the current thread.
+            </summary>
+            <value>
+            	<c>true</c> if allowed to create non-transaction session;
+            otherwise, <c>false</c>.
+            </value>
+            <remarks>
+            	<p>HibernateTemplate is aware of a corresponding Session bound to the
+            current thread, for example when using HibernateTransactionManager.
+            If allowCreate is true, a new non-transactional Session will be created
+            if none found, which needs to be closed at the end of the operation.
+            If false, an InvalidOperationException will get thrown in this case.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.AlwaysUseNewSession">
+            <summary>
+            Gets or sets a value indicating whether to always
+            use a new Hibernate Session for this template.
+            </summary>
+            <value><c>true</c> if always use new session; otherwise, <c>false</c>.</value>
+            <remarks>
+            	<p>
+            Default is "false"; if activated, all operations on this template will
+            work on a new NHibernate ISession even in case of a pre-bound ISession
+            (for example, within a transaction).
+            </p>
+            	<p>Within a transaction, a new NHibernate ISession used by this template
+            will participate in the transaction through using the same ADO.NET
+            Connection. In such a scenario, multiple Sessions will participate
+            in the same database transaction.
+            </p>
+            	<p>Turn this on for operations that are supposed to always execute
+            independently, without side effects caused by a shared NHibernate ISession.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.TemplateFlushMode">
+            <summary>
+            Gets or sets the template flush mode.
+            </summary>
+            <remarks>
+            Default is Auto. Will get applied to any <b>new</b> ISession
+            created by the template.
+            </remarks>
+            <value>The template flush mode.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.EntityInterceptor">
+            <summary>
+            Gets or sets the entity interceptor that allows to inspect and change
+            property values before writing to and reading from the database.
+            </summary>
+            <remarks>
+            Will get applied to any <b>new</b> ISession created by this object.
+            <p>Such an interceptor can either be set at the ISessionFactory level,
+            i.e. on LocalSessionFactoryObject, or at the ISession level, i.e. on
+            HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
+            It's preferable to set it on LocalSessionFactoryObject or HibernateTransactionManager
+            to avoid repeated configuration and guarantee consistent behavior in transactions.
+            </p>
+            </remarks>
+            <value>The interceptor.</value>
+            <exception cref="T:System.InvalidOperationException">If object factory is not set and need to retrieve entity interceptor by name.</exception>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.QueryCacheRegion">
+            <summary>
+            Gets or sets the name of the cache region for queries executed by this template.
+            </summary>
+            <remarks>
+            If this is specified, it will be applied to all IQuery and ICriteria objects
+            created by this template (including all queries through find methods).
+            <p>The cache region will not take effect unless queries created by this
+            template are configured to be cached via the CacheQueries property.
+            </p>
+            </remarks>
+            <value>The query cache region.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.CacheQueries">
+            <summary>
+            Gets or sets a value indicating whether to 
+            cache all queries executed by this template.
+            </summary>
+            <remarks>
+            If this is true, all IQuery and ICriteria objects created by
+            this template will be marked as cacheable (including all
+            queries through find methods).
+            <p>To specify the query region to be used for queries cached
+            by this template, set the QueryCacheRegion property.
+            </p>
+            </remarks>
+            <value><c>true</c> if cache queries; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.MaxResults">
+            <summary>
+            Gets or sets the maximum number of rows for this HibernateTemplate.
+            </summary>
+            <value>The max results.</value>
+            <remarks>
+            This is important
+            for processing subsets of large result sets, avoiding to read and hold
+            the entire result set in the database or in the ADO.NET driver if we're
+            never interested in the entire result in the first place (for example,
+            when performing searches that might return a large number of matches).
+            <p>Default is 0, indicating to use the driver's default.</p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.ExposeNativeSession">
+            <summary>
+            Set whether to expose the native Hibernate Session to IHibernateCallback
+            code. Default is "false": a Session proxy will be returned,
+            suppressing <code>close</code> calls and automatically applying
+            query cache settings and transaction timeouts.
+            </summary>
+            <value><c>true</c> if expose native session; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.CheckWriteOperations">
+            <summary>
+            Gets or sets  whether to check that the Hibernate Session is not in read-only mode
+            in case of write operations (save/update/delete).
+            </summary>
+            <value>
+            	<c>true</c> if check that the Hibernate Session is not in read-only mode
+            in case of write operations; otherwise, <c>false</c>.
+            </value>
+            <remarks>
+            Default is "true", for fail-fast behavior when attempting write operations
+            within a read-only transaction. Turn this off to allow save/update/delete
+            on a Session with flush mode NEVER.
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.EntityInterceptorObjectName">
+            <summary>
+            Set the object name of a Hibernate entity interceptor that allows to inspect
+            and change property values before writing to and reading from the database.
+            </summary>
+            <remarks>
+            Will get applied to any new Session created by this transaction manager.
+            <p>Requires the object factory to be known, to be able to resolve the object
+            name to an interceptor instance on session creation. Typically used for
+            prototype interceptors, i.e. a new interceptor instance per session.
+            </p>
+            <p>Can also be used for shared interceptor instances, but it is recommended
+            to set the interceptor reference directly in such a scenario.
+            </p>
+            </remarks>
+            <value>The name of the entity interceptor in the object factory/application context.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.ObjectFactory">
+            <summary>
+            Set the object factory instance.
+            </summary>
+            <value>The object factory instance</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.SessionFactory">
+            <summary>
+            Gets or sets the session factory that should be used to create
+            NHibernate ISessions.
+            </summary>
+            <value>The session factory.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.FetchSize">
+            <summary>
+            Gets or sets the fetch size for this HibernateTemplate.
+            </summary>
+            <value>The size of the fetch.</value>
+            <remarks>This is important for processing
+            large result sets: Setting this higher than the default value will increase
+            processing speed at the cost of memory consumption; setting this lower can
+            avoid transferring row data that will never be read by the application.
+            <p>Default is 0, indicating to use the driver's default.</p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.ProxyFactory">
+            <summary>
+            Gets or sets the proxy factory.
+            </summary>
+            <remarks>This may be useful to set if you create many instances of 
+            HibernateTemplate and/or HibernateDaoSupport.  This allows the same
+            ProxyFactory implementation to be used thereby limiting the
+            number of dynamic proxy types created in the temporary assembly, which
+            are never garbage collected due to .NET runtime semantics.
+            </remarks>
+            <value>The proxy factory.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.AdoExceptionTranslator">
+            <summary>
+            Set the ADO.NET exception translator for this instance.
+            Applied to System.Data.Common.DbException (or provider specific exception type
+            in .NET 1.1) thrown by callback code, be it direct
+            DbException or wrapped Hibernate ADOExceptions.
+            <p>The default exception translator is either a ErrorCodeExceptionTranslator
+            if a DbProvider is available, or a FalbackExceptionTranslator otherwise
+            </p>
+            </summary>
+            <value>The ADO exception translator.</value>
+        </member>
+        <member name="M:Spring.Data.NHibernate.DeletebyQueryHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.DeleteAllHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.EvictHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.FindHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.FindByNamedParamHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.FindByNamedQueryHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.FindByNamedQueryAndNamedParamHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.FindByNamedQueryAndValueObjectHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.GetByTypeHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LoadByTypeHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LoadByEntityHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LoadAllByTypeHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LockHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.RefreshHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SaveObjectHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SaveObjectWithIdHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.UpdateObjectHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SaveOrUpdateObjectHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SaveOrUpdateAllHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SaveOrUpdateCopyHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateQueryException">
+            <summary>
+            Hibernate-specific subclass of InvalidDataAccessResourceUsageException,
+            thrown on invalid HQL query syntax.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateQueryException.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateQueryException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateQueryException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateQueryException.#ctor(NHibernate.QueryException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateQueryException"/> class.
+            </summary>
+            <param name="ex">The ex.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateQueryException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateQueryException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateQueryException.QueryString">
+            <summary>
+            Gets the query string that was invalid.
+            </summary>
+            <value>The query string that was invalid.</value>
+        </member>
+        <member name="T:Spring.Data.NHibernate.SpringSessionSynchronization">
+            <summary>
+            NHibnerations actions taken during the transaction lifecycle.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: SpringSessionSynchronization.cs,v 1.2 2007/08/29 03:42:06 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.NHibernate.SpringSessionSynchronization.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class. 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionSynchronization.#ctor(Spring.Data.NHibernate.SessionHolder,NHibernate.ISessionFactory,Spring.Data.Support.IAdoExceptionTranslator,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.SpringSessionSynchronization"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionSynchronization.Suspend">
+            <summary>
+            Suspend this synchronization. 
+            </summary>
+            <remarks>
+            <p>
+            Unbind Hibernate resources (SessionHolder) from
+            <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>
+            if managing any.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionSynchronization.Resume">
+            <summary>
+            Resume this synchronization.
+            </summary>
+            <remarks>
+            <p>
+            Rebind Hibernate resources from 
+            <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>
+            if managing any.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionSynchronization.BeforeCommit(System.Boolean)">
+            <summary>
+            Invoked before transaction commit (before
+            <see cref="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCompletion"/>)
+            </summary>
+            <param name="readOnly">
+            If the transaction is defined as a read-only transaction.
+            </param>
+            <remarks>
+            <p>
+            Can flush transactional sessions to the database.
+            </p>
+            <p>
+            Note that exceptions will get propagated to the commit caller and 
+            cause a rollback of the transaction.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionSynchronization.BeforeCompletion">
+            <summary>
+            Invoked before transaction commit (before
+            <see cref="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCompletion"/>)
+            Can e.g. flush transactional O/R Mapping sessions to the database
+            </summary>
+            <remarks>
+            <para>
+            This callback does not mean that the transaction will actually be
+            commited.  A rollback decision can still occur after this method
+            has been called.  This callback is rather meant to perform work 
+            that's only relevant if a commit still has a chance
+            to happen, such as flushing SQL statements to the database.
+            </para>
+            <para>
+            Note that exceptions will get propagated to the commit caller and cause a
+            rollback of the transaction.</para>
+            <para>
+            (note: do not throw TransactionException subclasses here!)
+            </para>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionSynchronization.AfterCompletion(Spring.Transaction.Support.TransactionSynchronizationStatus)">
+            <summary>
+            Invoked after transaction commit/rollback.
+            </summary>
+            <param name="status">
+            Status according to <see cref="T:Spring.Transaction.Support.TransactionSynchronizationStatus"/>
+            </param>
+            <remarks>
+            Can e.g. perform resource cleanup, in this case after transaction completion.
+            <p>
+            Note that exceptions will get propagated to the commit or rollback
+            caller, although they will not influence the outcome of the transaction.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SpringSessionSynchronization.Order">
+            <summary>
+            Return the order value of this object, where a higher value means greater in
+            terms of sorting.
+            </summary>
+            <remarks>
+            <p>
+            Normally starting with 0 or 1, with <see cref="F:System.Int32.MaxValue"/> indicating
+            greatest. Same order values will result in arbitrary positions for the affected
+            objects.
+            </p>
+            <p>
+            Higher value can be interpreted as lower priority, consequently the first object
+            has highest priority.
+            </p>
+            </remarks>
+            <returns>The order value.</returns>
+        </member>
+        <member name="T:Spring.Data.NHibernate.TemplateFlushMode">
+            <summary>
+            Enumeration for the various Hibernate flush modes. 
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: TemplateFlushMode.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.NHibernate.TemplateFlushMode.Never">
+            <summary>Never flush is a good strategy for read-only units of work.
+            </summary>
+            <remarks>
+            Hibernate will not track and look for changes in this case,
+            avoiding any overhead of modification detection.
+            <p>In case of an existing ISession, TemplateFlushMode.Never will turn 
+            the hibenrate flush mode
+            to FlushMode.Never for the scope of the current operation, resetting the previous
+            flush mode afterwards.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Data.NHibernate.TemplateFlushMode.Auto">
+            <summary>Automatic flushing is the default mode for a Hibernate Session.
+            </summary>
+            <remarks>
+            A session will get flushed on transaction commit, and on certain find
+            operations that might involve already modified instances, but not
+            after each unit of work like with eager flushing.
+            <p>In case of an existing Session, TemplateFlushMode.Auto
+            will participate in the existing flush mode, not modifying 
+            it for the current operation.
+            This in particular means that this setting will not modify an existing
+            hibernate flush mode FlushMode.Never, in contrast to TemplateFlushMode.Eager.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Data.NHibernate.TemplateFlushMode.Eager">
+            <summary>
+            Eager flushing leads to immediate synchronization with the database,
+            even if in a transaction. 
+            </summary>
+            <remarks>
+            This causes inconsistencies to show up and throw
+            a respective exception immediately, and ADO access code that participates
+            in the same transaction will see the changes as the database is already
+            aware of them then. But the drawbacks are:
+            <ul>
+            <li>additional communication roundtrips with the database, instead of a
+            single batch at transaction commit;</li>
+            <li>the fact that an actual database rollback is needed if the Hibernate
+            transaction rolls back (due to already submitted SQL statements).</li>
+            </ul>
+            <p>In case of an existing Session, TemplateFlushMode.Eager
+            will turn the NHibernate flush mode 
+            to FlushMode.Auto for the scope of the current operation and issue a flush at the
+            end, resetting the previous flush mode afterwards.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Data.NHibernate.TemplateFlushMode.Commit">
+            <summary>
+            Flushing at commit only is intended for units of work where no
+            intermediate flushing is desired, not even for find operations
+            that might involve already modified instances.
+            </summary>
+            <remarks>
+            <p>In case of an existing Session, TemplateFlushMode.Commit
+            will turn the NHibernate flush mode
+            to FlushMode.Commit for the scope of the current operation, resetting the previous
+            flush mode afterwards. The only exception is an existing flush mode
+            FlushMode.Never, which will not be modified through this setting.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.NHibernate.LocalSessionFactoryObject">
+            <summary>
+            An IFactoryObject that creates a local Hibernate SessionFactory instance.
+            Behaves like a SessionFactory instance when used as bean reference,
+            e.g. for HibernateTemplate's "SessionFactory" property.
+            </summary>
+            <remarks>
+            The typical usage will be to register this as singleton factory 
+            in an application context and give objects references to application services
+            that need it.
+            <para>
+            Hibernate configuration settings can be set using the IDictionary property 'HibernateProperties'.
+            
+            </para>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: LocalSessionFactoryObject.cs,v 1.7 2008/03/21 14:12:16 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.NHibernate.LocalSessionFactoryObject.hibernateProperties">
+            <summary>
+            TODO: consider changing to NamevalueCollection for easier
+            cut-n-paste from existing App.config based configurations.
+            </summary>
+        </member>
+        <member name="F:Spring.Data.NHibernate.LocalSessionFactoryObject.log">
+            <summary>
+            The shared <see cref="T:Common.Logging.ILog"/> instance for this class (and derived classes). 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.LocalSessionFactoryObject"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.GetObject">
+            <summary>
+            Return the singleon session factory.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.AfterPropertiesSet">
+            <summary>
+            Initialize the SessionFactory for the given or the 
+            default location.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.Dispose">
+            <summary>
+            Close the SessionFactory on application context shutdown.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.NewConfiguration">
+            <summary>
+            Subclasses can override this method to perform custom initialization
+            of the Configuration instance used for ISessionFactory creation.
+            </summary>
+            <remarks>
+            The properties of this LocalSessionFactoryObject will be applied to
+            the Configuration object that gets returned here.
+            <p>The default implementation creates a new Configuration instance.
+            A custom implementation could prepare the instance in a specific way,
+            or use a custom Configuration subclass. 
+            </p>       
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.PostProcessConfiguration(NHibernate.Cfg.Configuration)">
+            <summary>
+            To be implemented by subclasses that want to to perform custom
+            post-processing of the Configuration object after this FactoryObject
+            performed its default initialization.
+            </summary>
+            <param name="config">The current configuration object.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.NewSessionFactory(NHibernate.Cfg.Configuration)">
+            <summary>
+            Subclasses can override this method to perform custom initialization
+            of the SessionFactory instance, creating it via the given Configuration
+            object that got prepared by this LocalSessionFactoryObject.
+            </summary>
+            <remarks>
+            <p>The default implementation invokes Configuration's BuildSessionFactory.
+            A custom implementation could prepare the instance in a specific way,
+            or use a custom ISessionFactory subclass.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.MappingAssemblies">
+            <summary>
+            Sets the assemblies to load that contain mapping files.
+            </summary>
+            <value>The mapping assemblies.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.ConfigFilenames">
+            <summary>
+            Sets the hibernate configuration files to load, i.e. hibernate.cfg.xml.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.MappingResources">
+            <summary>
+            Sets the locations of Spring IResources that contain mapping
+            files.
+            </summary>
+            <value>The location of mapping resources.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.Configuration">
+            <summary>
+            Return the Configuration object used to build the SessionFactory.
+            Allows access to configuration metadata stored there (rarely needed).
+            </summary>
+            <value>The hibernate configuration.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.HibernateProperties">
+            <summary>
+            Set NHibernate configuration properties, like "hibernate.dialect".
+            </summary>
+            <value>The hibernate properties.</value>
+            <remarks>
+            	<p>Can be used to override values in a NHibernate XML config file,
+            or to specify all necessary properties locally.
+            </p>
+            	<p>Note: Do not specify a transaction provider here when using
+            Spring-driven transactions. It is also advisable to omit connection
+            provider settings and use a Spring-set IDbProvider instead.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.DbProvider">
+            <summary>
+            Get or set the DataSource to be used by the SessionFactory.
+            </summary>
+            <value>The db provider.</value>
+            <remarks>
+            If set, this will override corresponding settings in Hibernate properties.
+            <note>Note: If this is set, the Hibernate settings should not define
+            a connection string
+            (hibernate.connection.connection_string) to avoid meaningless double configuration.
+            </note>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.ObjectType">
+            <summary>
+            Return the type <see cref="T:NHibernate.ISessionFactory"/> or subclass.
+            </summary>
+            <value>The type created by this factory</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.IsSingleton">
+            <summary>
+            Returns true
+            </summary>
+            <value>true</value>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateSystemException">
+            <summary>
+            Hibernate-specific subclass of UncategorizedDataAccessException,
+            for Hibernate system errors that do not match any concrete
+            <code>Spring.Dao</code> exceptions.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateSystemException.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateSystemException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateSystemException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateSystemException.#ctor(NHibernate.HibernateException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateSystemException"/> class.
+            </summary>
+            <param name="cause">The cause.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateSystemException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateSystemException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateDelegate">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException">
+            <summary>
+            Hibernate-specific subclass of ObjectOptimisticLockingFailureException.
+            </summary>
+            <remarks>
+            Converts Hibernate's StaleObjectStateException.
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateOptimisticLockingFailureException.cs,v 1.2 2008/04/08 20:26:37 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException.#ctor(NHibernate.StaleObjectStateException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException"/> class.
+            </summary>
+            <param name="ex">The StaleObjectStateException.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException">
+            <summary>
+            Hibernate-specific subclass of ObjectRetrievalFailureException.
+            </summary>	 
+            <remarks>
+            Converts Hibernate's UnresolvableObjectException, ObjectNotFoundException,
+            ObjectDeletedException, and WrongClassException.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateObjectRetrievalFailureException.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException.#ctor(NHibernate.UnresolvableObjectException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="ex">The ex.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException.#ctor(NHibernate.ObjectNotFoundException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="ex">The ex.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException.#ctor(NHibernate.ObjectDeletedException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="ex">The ex.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException.#ctor(NHibernate.WrongClassException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="ex">The ex.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateAdoException">
+            <summary>
+            Hibernate-specific subclass of UncategorizedDataAccessException,
+            for ADO.NET exceptions that Hibernate rethrew and could not be
+            mapped into the DAO exception heirarchy.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateAdoException.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAdoException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateAdoException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAdoException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateAdoException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAdoException.#ctor(System.String,NHibernate.ADOException)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateAdoException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception from the underlying data access API - ADO.NET
+            </param>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAdoException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateAdoException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Support.HibernateDaoSupport">
+            <summary>
+             Convenient super class for Hibernate data access objects.
+            </summary>
+            <remarks>
+            <para>Requires a SessionFactory to be set, providing a HibernateTemplate
+             based on it to subclasses. Can alternatively be initialized directly with
+            a HibernateTemplate, to reuse the latter's settings such as the SessionFactory,
+             exception translator, flush mode, etc
+            </para>
+            This base call is mainly intended for HibernateTemplate usage.
+            <para>
+            This class will create its own HibernateTemplate if only a SessionFactory
+            is passed in. The "allowCreate" flag on that HibernateTemplate will be "true"
+            by default. A custom HibernateTemplate instance can be used through overriding
+            <code>CreateHibernateTemplate</code>.
+            </para>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateDaoSupport.cs,v 1.2 2007/08/28 15:26:37 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.HibernateDaoSupport"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.CreateHibernateTemplate(NHibernate.ISessionFactory)">
+            <summary>
+            Create a HibernateTemplate for the given ISessionFactory.
+            </summary>
+            <remarks>
+            Only invoked if populating the DAO with a ISessionFactory reference!
+            <p>Can be overridden in subclasses to provide a HibernateTemplate instance
+            with different configuration, or a custom HibernateTemplate subclass.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.CheckDaoConfig">
+            <summary>
+            Check if the hibernate template property has been set.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.DoGetSession(System.Boolean)">
+            <summary>
+            Get a Hibernate Session, either from the current transaction or
+            a new one. The latter is only allowed if "allowCreate" is true.
+            </summary>
+            <remarks>Note that this is not meant to be invoked from HibernateTemplate code
+            but rather just in plain Hibernate code. Either rely on a thread-bound
+            Session (via HibernateInterceptor), or use it in combination with
+            ReleaseSession.
+            <para>
+            In general, it is recommended to use HibernateTemplate, either with
+            the provided convenience operations or with a custom HibernateCallback
+            that provides you with a Session to work on. HibernateTemplate will care
+            for all resource management and for proper exception conversion.
+            </para>
+            </remarks>
+            <param name="allowCreate"> if a non-transactional Session should be created when no
+            transactional Session can be found for the current thread
+            </param>
+            <returns>Hibernate session.</returns>
+            <exception cref="T:Spring.Dao.DataAccessResourceFailureException">
+            If the Session couldn't be created
+            </exception>
+            <exception cref="T:System.InvalidOperationException">
+            if no thread-bound Session found and allowCreate false
+            </exception>
+            <seealso cref="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.ReleaseSession(NHibernate.ISession)"/>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.ConvertHibernateAccessException(NHibernate.HibernateException)">
+            <summary>
+            Convert the given HibernateException to an appropriate exception from the
+            <code>org.springframework.dao</code> hierarchy. Will automatically detect
+            wrapped ADO.NET Exceptions and convert them accordingly.
+            </summary>
+            <param name="ex">HibernateException that occured.</param>
+            <returns>
+            The corresponding DataAccessException instance
+            </returns>
+            <remarks>
+            The default implementation delegates to SessionFactoryUtils
+            and convertAdoAccessException. Can be overridden in subclasses.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.ReleaseSession(NHibernate.ISession)">
+            <summary>
+            Close the given Hibernate Session, created via this DAO's SessionFactory,
+            if it isn't bound to the thread.
+            </summary>
+            <remarks>
+            Typically used in plain Hibernate code, in combination with the 
+            Session property and ConvertHibernateAccessException.
+            </remarks>      
+            <param name="session">The session to close.</param>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.HibernateDaoSupport.HibernateTemplate">
+            <summary>
+            Gets or sets the hibernate template.
+            </summary>
+            <remarks>Set the HibernateTemplate for this DAO explicitly,
+            as an alternative to specifying a SessionFactory.
+            </remarks>
+            <value>The hibernate template.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.HibernateDaoSupport.SessionFactory">
+            <summary>
+            Gets or sets the session factory to be used by this DAO.
+            Will automatically create a HibernateTemplate for the given SessionFactory.
+            </summary>
+            <value>The session factory.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.HibernateDaoSupport.Session">
+            <summary>
+            Get a Hibernate Session, either from the current transaction or a new one.
+            The latter is only allowed if the "allowCreate" setting of this object's
+            HibernateTemplate is true.
+            </summary>
+            <remarks>
+            <p><b>Note that this is not meant to be invoked from HibernateTemplate code
+            but rather just in plain Hibernate code.</b> Use it in combination with
+            <b>ReleaseSession</b>.
+            </p>
+            <p>In general, it is recommended to use HibernateTemplate, either with
+            the provided convenience operations or with a custom HibernateCallback
+            that provides you with a Session to work on. HibernateTemplate will care
+            for all resource management and for proper exception conversion.
+            </p>
+            </remarks>
+            <value>The Hibernate session.</value>
+        </member>
+    </members>
+</doc>
diff --git a/src/Spring/Spring.Data.NHibernate12/AssemblyInfo.cs b/src/Spring/Spring.Data.NHibernate12/AssemblyInfo.cs
new file mode 100644
index 00000000..18ecf7b4
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle("Spring.Net NHibernate 1.2 support")]
+[assembly: AssemblyDescription("Interfaces and classes that provide NHibernate 1.2 support in Spring.Net")]
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/FindHibernateDelegate.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/FindHibernateDelegate.cs
new file mode 100644
index 00000000..bc229e6a
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/FindHibernateDelegate.cs
@@ -0,0 +1,46 @@
+#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
+
+#region Imports
+
+using NHibernate;
+using System.Collections.Generic;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Generic
+{
+    /// <summary>
+    /// Gets called by HibernateTemplate with an active
+    /// Hibernate Session. Does not need to care about activating or closing
+    /// the Session, or handling transactions.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Allows for returning an IList of result objects created within the callback. 
+    /// Note that there's special support for single step actions: 
+    /// see HibernateTemplate.find etc.
+    /// </p>
+    /// </remarks>
+    /// <typeparam name="T">The type of result object</typeparam>
+    /// <author>Sree Nivask (.NET)</author>
+    /// <version>$Id: FindHibernateDelegate.cs,v 1.2 2007/09/19 22:58:10 markpollack Exp $</version>
+    public delegate IList<T> FindHibernateDelegate<T>(ISession session);
+}
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDaoSupport.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDaoSupport.cs
new file mode 100644
index 00000000..3d210f3b
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDaoSupport.cs
@@ -0,0 +1,235 @@
+#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
+
+#region Imports
+
+using System;
+using NHibernate;
+using Spring.Dao;
+using Spring.Dao.Support;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Generic.Support
+{
+    /// <summary>
+    ///  Convenient super class for Hibernate data access objects.
+    /// </summary>
+    /// <remarks>
+    /// <para>Requires a SessionFactory to be set, providing a HibernateTemplate
+    ///  based on it to subclasses. Can alternatively be initialized directly with
+    /// a HibernateTemplate, to reuse the latter's settings such as the SessionFactory,
+    ///  exception translator, flush mode, etc
+    /// </para>
+    /// This base call is mainly intended for HibernateTemplate usage.
+    /// <para>
+    /// This class will create its own HibernateTemplate if only a SessionFactory
+    /// is passed in. The "allowCreate" flag on that HibernateTemplate will be "true"
+    /// by default. A custom HibernateTemplate instance can be used through overriding
+    /// <code>CreateHibernateTemplate</code>.
+    /// </para>
+    /// </remarks>
+    /// <author>Sree Nivask (.NET)</author>
+    /// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: HibernateDaoSupport.cs,v 1.3 2007/09/19 22:58:10 markpollack Exp $</version>
+	public abstract class HibernateDaoSupport : DaoSupport
+	{
+		#region Fields
+	    
+        private HibernateTemplate hibernateTemplate;
+		
+        #endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="HibernateDaoSupport"/> class.
+                /// </summary>
+		public 	HibernateDaoSupport()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Gets or sets the hibernate template.
+        /// </summary>
+        /// <remarks>Set the HibernateTemplate for this DAO explicitly,
+        /// as an alternative to specifying a SessionFactory.
+        /// </remarks>
+        /// <value>The hibernate template.</value>
+	    public HibernateTemplate HibernateTemplate
+	    {
+	        get
+	        {
+	            return hibernateTemplate;
+	        }
+	        set
+	        {
+	            hibernateTemplate = value;
+	        }
+	    }
+
+        /// <summary>
+        /// Gets or sets the session factory to be used by this DAO.
+        /// Will automatically create a HibernateTemplate for the given SessionFactory.
+        /// </summary>
+        /// <value>The session factory.</value>
+	    public ISessionFactory SessionFactory
+        {
+            get
+            {
+                return (this.hibernateTemplate != null ? this.hibernateTemplate.SessionFactory : null);
+            }
+            set
+            {
+                hibernateTemplate = CreateHibernateTemplate(value);
+            }
+        }
+
+        /// <summary>
+        /// Get a Hibernate Session, either from the current transaction or a new one.
+        /// The latter is only allowed if the "allowCreate" setting of this object's
+        /// HibernateTemplate is true.
+        /// </summary>
+        /// <remarks>
+        /// <p><b>Note that this is not meant to be invoked from HibernateTemplate code
+        /// but rather just in plain Hibernate code.</b> Use it in combination with
+        /// <b>ReleaseSession</b>.
+        /// </p>
+        /// <p>In general, it is recommended to use HibernateTemplate, either with
+        /// the provided convenience operations or with a custom HibernateCallback
+        /// that provides you with a Session to work on. HibernateTemplate will care
+        /// for all resource management and for proper exception conversion.
+        /// </p>
+        /// </remarks>
+        /// <value>The Hibernate session.</value>
+        public ISession Session
+        {
+            get
+            {
+                return DoGetSession(HibernateTemplate.AllowCreate);
+            }
+        }
+
+		#endregion
+
+		#region Methods
+        
+        /// <summary>
+        /// Create a HibernateTemplate for the given ISessionFactory.
+        /// </summary>
+        /// <remarks>
+        /// Only invoked if populating the DAO with a ISessionFactory reference!
+        /// <p>Can be overridden in subclasses to provide a HibernateTemplate instance
+        /// with different configuration, or a custom HibernateTemplate subclass.
+        /// </p>
+        /// </remarks>
+        /// <returns>The new HibernateTemplate instance</returns>
+        protected virtual HibernateTemplate CreateHibernateTemplate(ISessionFactory sessionFactory) 
+        {
+            return new HibernateTemplate(sessionFactory);
+        }
+
+        /// <summary>
+        /// Check if the hibernate template property has been set.
+        /// </summary>
+        /// <exception cref="ArgumentException">If HibernateTemplate property is null.</exception>
+        protected override void CheckDaoConfig()
+        {
+            if (this.hibernateTemplate == null)
+            {
+                throw new ArgumentException("sessionFactory or hibernateTemplate is required");
+            }
+        }
+        /// <summary>
+        /// Get a Hibernate Session, either from the current transaction or
+        /// a new one. The latter is only allowed if "allowCreate" is true.
+        /// </summary>
+        /// <remarks>Note that this is not meant to be invoked from HibernateTemplate code
+        /// but rather just in plain Hibernate code. Either rely on a thread-bound
+        /// Session (via HibernateInterceptor), or use it in combination with
+        /// ReleaseSession.
+        /// <para>
+        /// In general, it is recommended to use HibernateTemplate, either with
+        /// the provided convenience operations or with a custom HibernateCallback
+        /// that provides you with a Session to work on. HibernateTemplate will care
+        /// for all resource management and for proper exception conversion.
+        /// </para>
+        /// </remarks>
+        /// <param name="allowCreate"> if a non-transactional Session should be created when no
+        /// transactional Session can be found for the current thread
+        /// </param>
+        /// <returns>Hibernate session.</returns>
+        /// <exception cref="DataAccessResourceFailureException">
+        /// If the Session couldn't be created
+        /// </exception>
+        /// <exception cref="InvalidOperationException">
+        /// if no thread-bound Session found and allowCreate false
+        /// </exception>
+        /// <seealso cref="ReleaseSession"/>
+        protected ISession DoGetSession(bool allowCreate)
+        {
+            return (!allowCreate ?
+                SessionFactoryUtils.GetSession(SessionFactory, false) :
+                    SessionFactoryUtils.GetSession(
+                            SessionFactory,
+                            this.hibernateTemplate.EntityInterceptor,
+                            this.hibernateTemplate.AdoExceptionTranslator));
+        }
+
+        /// <summary>
+        /// Convert the given HibernateException to an appropriate exception from the
+        /// <code>org.springframework.dao</code> hierarchy. Will automatically detect
+        /// wrapped ADO.NET Exceptions and convert them accordingly.
+        /// </summary>
+        /// <param name="ex">HibernateException that occured.</param>
+        /// <returns>
+        /// The corresponding DataAccessException instance
+        /// </returns>
+        /// <remarks>
+        /// The default implementation delegates to SessionFactoryUtils
+        /// and convertAdoAccessException. Can be overridden in subclasses.
+        /// </remarks>
+        protected DataAccessException ConvertHibernateAccessException(HibernateException ex)
+        {
+            return hibernateTemplate.ConvertHibernateAccessException(ex);
+        }
+
+        /// <summary>
+        /// Close the given Hibernate Session, created via this DAO's SessionFactory,
+        /// if it isn't bound to the thread.
+        /// </summary>
+        /// <remarks>
+        /// Typically used in plain Hibernate code, in combination with the 
+        /// Session property and ConvertHibernateAccessException.
+        /// </remarks>      
+        /// <param name="session">The session to close.</param>
+        protected void ReleaseSession(ISession session)
+        {
+            SessionFactoryUtils.ReleaseSession(session, SessionFactory);
+        }
+		#endregion
+
+
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDelegate.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDelegate.cs
new file mode 100644
index 00000000..fb8b49c0
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDelegate.cs
@@ -0,0 +1,45 @@
+#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
+
+#region Imports
+
+using NHibernate;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Generic
+{
+    /// <summary>
+    /// Gets called by HibernateTemplate with an active
+    /// Hibernate Session. Does not need to care about activating or closing
+    /// the Session, or handling transactions.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Allows for returning the result object created within the callback. 
+    /// Note that there's special support for single step actions: 
+    /// see HibernateTemplate.find etc.
+    /// </p>
+    /// </remarks>
+    /// <typeparam name="T">The type of result object</typeparam>
+    /// <author>Sree Nivask (.NET)</author>
+    /// <version>$Id: HibernateDelegate.cs,v 1.2 2007/09/19 22:58:10 markpollack Exp $</version>
+    public delegate T HibernateDelegate<T>(ISession session);
+}
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateTemplate.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateTemplate.cs
new file mode 100644
index 00000000..5b994ab8
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateTemplate.cs
@@ -0,0 +1,1706 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections.Generic;
+using NHibernate;
+using NHibernate.Type;
+using Spring.Aop.Framework;
+using Spring.Dao;
+using Spring.Data.Common;
+using Spring.Data.Support;
+using Spring.Objects.Factory;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Generic
+{
+    /// <summary>
+    /// Generic version of the Helper class that simplifies NHibernate data access code
+    /// </summary>
+    /// <remarks>
+    /// <p>Typically used to implement data access or business logic services that
+    /// use NHibernate within their implementation but are Hibernate-agnostic in their
+    /// interface. The latter or code calling the latter only have to deal with
+    /// domain objects.</p>
+    ///
+    /// <p>The central method is Execute() supporting Hibernate access code which
+    /// implements the HibernateCallback interface. It provides NHibernate Session
+    /// handling such that neither the IHibernateCallback implementation nor the calling
+    /// code needs to explicitly care about retrieving/closing NHibernate Sessions,
+    /// or handling Session lifecycle exceptions. For typical single step actions,
+    /// there are various convenience methods (Find, Load, SaveOrUpdate, Delete).
+    /// </p>
+    /// 
+    /// <p>Can be used within a service implementation via direct instantiation
+    /// with a ISessionFactory reference, or get prepared in an application context
+    /// and given to services as an object reference. Note: The ISessionFactory should
+    /// always be configured as an object in the application context, in the first case
+    /// given to the service directly, in the second case to the prepared template.
+    /// </p>
+    /// 
+    /// <p>This class can be considered as a direct alternative to working with the raw
+    /// Hibernate Session API (through SessionFactoryUtils.Session).
+    /// </p>
+    /// 
+    /// <p>LocalSessionFactoryObject is the preferred way of obtaining a reference
+    /// to a specific NHibernate ISessionFactory.
+    /// </p>
+    /// </remarks>
+    /// <author>Sree Nivask (.NET)</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: HibernateTemplate.cs,v 1.3 2008/01/24 17:29:09 markpollack Exp $</version>
+    public class HibernateTemplate : HibernateAccessor, IHibernateOperations
+    {
+        #region Fields
+
+        NHibernate.HibernateTemplate classicHibernateTemplate;
+        
+        #endregion 
+
+        #region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateTemplate"/> class.
+        /// </summary>
+        public HibernateTemplate()
+        {
+            classicHibernateTemplate = new NHibernate.HibernateTemplate();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateTemplate"/> class.
+        /// </summary>
+        /// <remarks>Allows creation of a new non-transactional session when no 
+        /// transactional Session can be found for the current thread</remarks>
+        /// <param name="sessionFactory">The session factory to create sessions.</param>
+        public HibernateTemplate(ISessionFactory sessionFactory)
+        {
+            classicHibernateTemplate = new Spring.Data.NHibernate.HibernateTemplate(sessionFactory);            
+            AfterPropertiesSet();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateTemplate"/> class.
+        /// </summary>
+        /// <param name="sessionFactory">The session factory to create sessions.</param>        
+        /// <param name="allowCreate">if set to <c>true</c> allow creation
+        /// of a new non-transactional session when no transactional Session can be found 
+        /// for the current thread.</param>
+        public HibernateTemplate(ISessionFactory sessionFactory, bool allowCreate)
+        {
+            classicHibernateTemplate = new Spring.Data.NHibernate.HibernateTemplate(sessionFactory, allowCreate);            
+            AfterPropertiesSet();
+        }
+
+                /// <summary>
+        /// Gets or sets if a new Session should be created when no transactional Session
+        /// can be found for the current thread.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if allowed to create non-transaction session;
+        /// otherwise, <c>false</c>.
+        /// </value>
+        /// <remarks>
+        /// 	<p>HibernateTemplate is aware of a corresponding Session bound to the
+        /// current thread, for example when using HibernateTransactionManager.
+        /// If allowCreate is true, a new non-transactional Session will be created
+        /// if none found, which needs to be closed at the end of the operation.
+        /// If false, an InvalidOperationException will get thrown in this case.
+        /// </p>
+        /// </remarks>
+        public override bool AllowCreate
+        {
+            get { return classicHibernateTemplate.AllowCreate; }
+            set { classicHibernateTemplate.AllowCreate = value; }
+        }
+        /// <summary>
+        /// Gets or sets a value indicating whether to always
+        /// use a new Hibernate Session for this template.
+        /// </summary>
+        /// <value><c>true</c> if always use new session; otherwise, <c>false</c>.</value>
+        /// <remarks>
+        /// 	<p>
+        /// Default is "false"; if activated, all operations on this template will
+        /// work on a new NHibernate ISession even in case of a pre-bound ISession
+        /// (for example, within a transaction).
+        /// </p>
+        /// 	<p>Within a transaction, a new NHibernate ISession used by this template
+        /// will participate in the transaction through using the same ADO.NET
+        /// Connection. In such a scenario, multiple Sessions will participate
+        /// in the same database transaction.
+        /// </p>
+        /// 	<p>Turn this on for operations that are supposed to always execute
+        /// independently, without side effects caused by a shared NHibernate ISession.
+        /// </p>
+        /// </remarks>
+        public override bool AlwaysUseNewSession
+        {
+            get { return classicHibernateTemplate.AlwaysUseNewSession; }
+            set { classicHibernateTemplate.AlwaysUseNewSession = value; }
+        }
+
+
+        /// <summary>
+        /// Set whether to expose the native Hibernate Session to IHibernateCallback
+        /// code. Default is "false": a Session proxy will be returned,
+        /// suppressing <code>close</code> calls and automatically applying
+        /// query cache settings and transaction timeouts.
+        /// </summary>
+        /// <value><c>true</c> if expose native session; otherwise, <c>false</c>.</value>
+        public override bool ExposeNativeSession
+        {
+            get { return classicHibernateTemplate.ExposeNativeSession; }
+            set { classicHibernateTemplate.ExposeNativeSession = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the template flush mode.
+        /// </summary>
+        /// <remarks>
+        /// Default is Auto. Will get applied to any <b>new</b> ISession
+        /// created by the template.
+        /// </remarks>
+        /// <value>The template flush mode.</value>
+        public override TemplateFlushMode TemplateFlushMode
+        {
+            get { return classicHibernateTemplate.TemplateFlushMode; }
+            set { classicHibernateTemplate.TemplateFlushMode = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the entity interceptor that allows to inspect and change
+        /// property values before writing to and reading from the database.
+        /// </summary>
+        /// <remarks>
+        /// Will get applied to any <b>new</b> ISession created by this object.
+        /// <p>Such an interceptor can either be set at the ISessionFactory level,
+        /// i.e. on LocalSessionFactoryObject, or at the ISession level, i.e. on
+        /// HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
+        /// It's preferable to set it on LocalSessionFactoryObject or HibernateTransactionManager
+        /// to avoid repeated configuration and guarantee consistent behavior in transactions.
+        /// </p>
+        /// </remarks>
+        /// <value>The interceptor.</value>
+        public override IInterceptor EntityInterceptor
+        {
+            get { return classicHibernateTemplate.EntityInterceptor; }
+            set { classicHibernateTemplate.EntityInterceptor = value; }
+        }
+
+        /// <summary>
+        /// Set the object name of a Hibernate entity interceptor that allows to inspect
+        /// and change property values before writing to and reading from the database.
+        /// </summary>
+        /// <remarks>
+        /// Will get applied to any new Session created by this transaction manager.
+        /// <p>Requires the object factory to be known, to be able to resolve the object
+        /// name to an interceptor instance on session creation. Typically used for
+        /// prototype interceptors, i.e. a new interceptor instance per session.
+        /// </p>
+        /// <p>Can also be used for shared interceptor instances, but it is recommended
+        /// to set the interceptor reference directly in such a scenario.
+        /// </p>
+        /// </remarks>
+        /// <value>The name of the entity interceptor in the object factory/application context.</value>
+        public override string EntityInterceptorObjectName
+        {
+            set { classicHibernateTemplate.EntityInterceptorObjectName = value;}
+        }
+
+        /// <summary>
+        /// Gets or sets the session factory that should be used to create
+        /// NHibernate ISessions.
+        /// </summary>
+        /// <value>The session factory.</value>
+        public override ISessionFactory SessionFactory
+        {
+            get { return classicHibernateTemplate.SessionFactory; }
+            set { classicHibernateTemplate.SessionFactory = value; }
+        }
+
+        /// <summary>
+        /// Set the object factory instance.
+        /// </summary>
+        /// <value>The object factory instance</value>
+        public override IObjectFactory ObjectFactory
+        {
+            set { classicHibernateTemplate.ObjectFactory = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to 
+        /// cache all queries executed by this template.
+        /// </summary>
+        /// <remarks>
+        /// If this is true, all IQuery and ICriteria objects created by
+        /// this template will be marked as cacheable (including all
+        /// queries through find methods).
+        /// <p>To specify the query region to be used for queries cached
+        /// by this template, set the QueryCacheRegion property.
+        /// </p>
+        /// </remarks>
+        /// <value><c>true</c> if cache queries; otherwise, <c>false</c>.</value>
+        public override bool CacheQueries
+        {
+            get { return classicHibernateTemplate.CacheQueries; }
+            set { classicHibernateTemplate.CacheQueries = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the cache region for queries executed by this template.
+        /// </summary>
+        /// <remarks>
+        /// If this is specified, it will be applied to all IQuery and ICriteria objects
+        /// created by this template (including all queries through find methods).
+        /// <p>The cache region will not take effect unless queries created by this
+        /// template are configured to be cached via the CacheQueries property.
+        /// </p>
+        /// </remarks>
+        /// <value>The query cache region.</value>
+        public override string QueryCacheRegion
+        {
+            get { return classicHibernateTemplate.QueryCacheRegion; }
+            set { classicHibernateTemplate.QueryCacheRegion = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the fetch size for this HibernateTemplate.
+        /// </summary>
+        /// <value>The size of the fetch.</value>
+        /// <remarks>This is important for processing
+        /// large result sets: Setting this higher than the default value will increase
+        /// processing speed at the cost of memory consumption; setting this lower can
+        /// avoid transferring row data that will never be read by the application.
+        /// <p>Default is 0, indicating to use the driver's default.</p>
+        /// </remarks>
+        public override int FetchSize
+        {
+            get { return classicHibernateTemplate.FetchSize; }
+            set { classicHibernateTemplate.FetchSize = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum number of rows for this HibernateTemplate.
+        /// </summary>
+        /// <value>The max results.</value>
+        /// <remarks>
+        /// This is important
+        /// for processing subsets of large result sets, avoiding to read and hold
+        /// the entire result set in the database or in the ADO.NET driver if we're
+        /// never interested in the entire result in the first place (for example,
+        /// when performing searches that might return a large number of matches).
+        /// <p>Default is 0, indicating to use the driver's default.</p>
+        /// </remarks>
+        public override int MaxResults
+        {
+            get { return classicHibernateTemplate.MaxResults; }
+            set { classicHibernateTemplate.MaxResults = value; }
+        }
+
+        /// <summary>
+        /// Set the ADO.NET exception translator for this instance.
+        /// Applied to System.Data.Common.DbException (or provider specific exception type
+        /// in .NET 1.1) thrown by callback code, be it direct
+        /// DbException or wrapped Hibernate ADOExceptions.
+        /// <p>The default exception translator is either a ErrorCodeExceptionTranslator
+        /// if a DbProvider is available, or a FalbackExceptionTranslator otherwise
+        /// </p>
+        /// </summary>
+        /// <value>The ADO exception translator.</value>
+        public override IAdoExceptionTranslator AdoExceptionTranslator
+        {
+            get { return classicHibernateTemplate.AdoExceptionTranslator; }
+            set { classicHibernateTemplate.AdoExceptionTranslator = value; }
+        }
+
+        /// <summary>
+        /// Gets the classic hibernate template for access to non-generic methods.
+        /// </summary>
+        /// <value>The classic hibernate template.</value>
+        public NHibernate.HibernateTemplate ClassicHibernateTemplate
+        {
+            get { return classicHibernateTemplate;  }
+        }
+
+        /// <summary>
+        /// Gets or sets the proxy factory.
+        /// </summary>
+        /// <remarks>This may be useful to set if you create many instances of 
+        /// HibernateTemplate and/or HibernateDaoSupport.  This allows the same
+        /// ProxyFactory implementation to be used thereby limiting the
+        /// number of dynamic proxy types created in the temporary assembly, which
+        /// are never garbage collected due to .NET runtime semantics.
+        /// </remarks>
+        /// <value>The proxy factory.</value>
+        public virtual ProxyFactory ProxyFactory
+        {
+            get { return classicHibernateTemplate.ProxyFactory; }
+            set { classicHibernateTemplate.ProxyFactory = value; }
+        }
+
+        #endregion
+
+        #region Properties
+
+
+        
+        
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Remove all objects from the Session cache, and cancel all pending saves,
+        /// updates and deletes.
+        /// </summary>
+        public void Clear()
+        {
+            classicHibernateTemplate.Clear();           
+        }
+
+
+        /// <summary>
+        /// Delete the given persistent instance.
+        /// </summary>
+        /// <param name="entity">The persistent instance to delete.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Delete(object entity)
+        {
+            classicHibernateTemplate.Delete(entity);
+        }
+
+
+        /// <summary>
+        /// Delete the given persistent instance.
+        /// </summary>
+        /// <param name="entity">Tthe persistent instance to delete.</param>
+        /// <param name="lockMode">The lock mode to obtain.</param>
+        /// <remarks>
+        /// Obtains the specified lock mode if the instance exists, implicitly
+        /// checking whether the corresponding database entry still exists
+        /// (throwing an OptimisticLockingFailureException if not found).
+        /// </remarks>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Delete(object entity, LockMode lockMode)
+        {
+            classicHibernateTemplate.Delete(entity, lockMode);
+        }
+
+        /// <summary>
+        /// Delete all objects returned by the query.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language.</param>
+        /// <returns>The number of entity instances deleted.</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public int Delete(string queryString)
+        {
+            return classicHibernateTemplate.Delete(queryString);
+        }
+
+        /// <summary>
+        ///  Delete all objects returned by the query.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language.</param>
+        /// <param name="value">The value of the parameter.</param>
+        /// <param name="type">The Hibernate type of the parameter (or <code>null</code>).</param>
+        /// <returns>The number of entity instances deleted.</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public int Delete(string queryString, object value, IType type)
+        {
+            return classicHibernateTemplate.Delete(queryString, value, type);
+        }
+
+        /// <summary>
+        /// Delete all objects returned by the query.
+        /// </summary>
+        /// <param name="queryString">a query expressed in Hibernate's query language.</param>
+        /// <param name="values">The values of the parameters.</param>
+        /// <param name="types"> Hibernate types of the parameters (or <code>null</code>)</param>
+        /// <returns>The number of entity instances deleted.</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public int Delete(string queryString, object[] values, IType[] types)
+        {
+            return classicHibernateTemplate.Delete(queryString, values, types);
+        }
+
+        /// <summary>
+        /// Flush all pending saves, updates and deletes to the database.
+        /// </summary>
+        /// <remarks>
+        /// Only invoke this for selective eager flushing, for example when ADO.NET code
+        /// needs to see certain changes within the same transaction. Else, it's preferable
+        /// to rely on auto-flushing at transaction completion.
+        /// </remarks>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Flush()
+        {
+            classicHibernateTemplate.Flush();
+        }
+
+        /// <summary>
+        /// Load the persistent instance with the given identifier
+        /// into the given object, throwing an exception if not found.
+        /// </summary>
+        /// <param name="entity">Entity the object (of the target class) to load into.</param>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <exception cref="ObjectRetrievalFailureException">If object not found.</exception>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Load(object entity, object id)
+        {
+            classicHibernateTemplate.Load(entity, id);
+        }
+
+        /// <summary>
+        /// Re-read the state of the given persistent instance.
+        /// </summary>
+        /// <param name="entity">The persistent instance to re-read.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Refresh(object entity)
+        {
+            classicHibernateTemplate.Refresh(entity);
+        }
+
+        /// <summary>
+        /// Re-read the state of the given persistent instance.
+        /// Obtains the specified lock mode for the instance.
+        /// </summary>
+        /// <param name="entity">The persistent instance to re-read.</param>
+        /// <param name="lockMode">The lock mode to obtain.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Refresh(object entity, LockMode lockMode)
+        {
+            classicHibernateTemplate.Refresh(entity, lockMode);
+        }
+
+        /// <summary>
+        /// Determines whether the given object is in the Session cache.
+        /// </summary>
+        /// <param name="entity">the persistence instance to check.</param>
+        /// <returns>
+        /// 	<c>true</c> if session cache contains the specified entity; otherwise, <c>false</c>.
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public bool Contains(object entity)
+        {
+            return classicHibernateTemplate.Contains(entity);
+        }
+
+        /// <summary>
+        /// Remove the given object from the Session cache.
+        /// </summary>
+        /// <param name="entity">The persistent instance to evict.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Evict(object entity)
+        {
+            classicHibernateTemplate.Evict(entity);
+        }
+
+        /// <summary>
+        /// Obtain the specified lock level upon the given object, implicitly
+        /// checking whether the corresponding database entry still exists
+        /// (throwing an OptimisticLockingFailureException if not found).
+        /// </summary>
+        /// <param name="entity">The he persistent instance to lock.</param>
+        /// <param name="lockMode">The lock mode to obtain.</param>
+        /// <exception cref="ObjectOptimisticLockingFailureException">If not found</exception>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Lock(object entity, LockMode lockMode)
+        {
+            classicHibernateTemplate.Lock(entity, lockMode);
+        }
+
+        /// <summary>
+        /// Persist the given transient instance.
+        /// </summary>
+        /// <param name="entity">The transient instance to persist.</param>
+        /// <returns>The generated identifier.</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public object Save(object entity)
+        {
+            return classicHibernateTemplate.Save(entity);
+        }
+
+        /// <summary>
+        /// Persist the given transient instance with the given identifier.
+        /// </summary>
+        /// <param name="entity">The transient instance to persist.</param>
+        /// <param name="id">The identifier to assign.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Save(object entity, object id)
+        {
+            classicHibernateTemplate.Save(entity, id);
+        }
+
+        /// <summary>
+        /// Update the given persistent instance.
+        /// </summary>
+        /// <param name="entity">The persistent instance to update.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Update(object entity)
+        {
+            classicHibernateTemplate.Update(entity);
+        }
+
+        /// <summary>
+        /// Update the given persistent instance.
+        /// Obtains the specified lock mode if the instance exists, implicitly
+        /// checking whether the corresponding database entry still exists
+        /// (throwing an OptimisticLockingFailureException if not found).
+        /// </summary>
+        /// <param name="entity">The persistent instance to update.</param>
+        /// <param name="lockMode">The lock mode to obtain.</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void Update(object entity, LockMode lockMode)
+        {
+            classicHibernateTemplate.Update(entity, lockMode);
+        }
+
+        /// <summary>
+        /// Save or update the given persistent instance,
+        /// according to its id (matching the configured "unsaved-value"?).
+        /// </summary>
+        /// <param name="entity">Tthe persistent instance to save or update
+        /// (to be associated with the Hibernate Session).</param>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public void SaveOrUpdate(object entity)
+        {
+            classicHibernateTemplate.SaveOrUpdate(entity);
+        }
+
+        /// <summary>
+        /// Save or update the contents of given persistent object,
+        /// according to its id (matching the configured "unsaved-value"?).
+        /// Will copy the contained fields to an already loaded instance
+        /// with the same id, if appropriate.
+        /// </summary>
+        /// <param name="entity">The persistent object to save or update.
+        /// (<i>not</i> necessarily to be associated with the Hibernate Session)
+        /// </param>
+        /// <returns>The actually associated persistent object.
+        /// (either an already loaded instance with the same id, or the given object)</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public object SaveOrUpdateCopy(object entity)
+        {
+            return classicHibernateTemplate.SaveOrUpdateCopy(entity);
+        }
+
+        #endregion
+
+        #region IHibernateOperations Gets
+
+        /// <summary>
+        /// Return the persistent instance of the given entity type
+        /// with the given identifier, or null if not found.
+        /// Obtains the specified lock mode if the instance exists.
+        /// </summary>
+        /// <typeparam name="T">The object type to get.</typeparam>
+        /// <param name="id">The id of the object to get.</param>
+        /// <returns>the persistent instance, or null if not found</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>        
+        public T Get<T>(object id)
+        {
+            return Get<T>(id, null);
+        }
+
+        /// <summary>
+        /// Return the persistent instance of the given entity type
+        /// with the given identifier, or null if not found.
+        /// Obtains the specified lock mode if the instance exists.
+        /// </summary>
+        /// <typeparam name="T">The object type to get.</typeparam>
+        /// <param name="id">The lock mode to obtain.</param>
+        /// <param name="lockMode">The lock mode.</param>
+        /// <returns>the persistent instance, or null if not found</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public T Get<T>(object id, LockMode lockMode)
+        {
+            return Execute(new GetByTypeHibernateCallback<T>(id, lockMode), true);
+        }
+
+        #endregion
+
+        #region IHibernateOperations Loads
+
+        /// <summary>
+        /// Return the persistent instance of the given entity class
+        /// with the given identifier, throwing an exception if not found.
+        /// </summary>
+        /// <typeparam name="T">The object type to load.</typeparam>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <returns>The persistent instance</returns>
+        /// <exception cref="ObjectRetrievalFailureException">If not found</exception>     
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public T Load<T>(object id)
+        {
+            return Load<T>(id, null);
+        }
+
+        /// <summary>
+        /// Return the persistent instance of the given entity class
+        ///  with the given identifier, throwing an exception if not found.
+        /// Obtains the specified lock mode if the instance exists.
+        /// </summary>
+        /// <typeparam name="T">The object type to load.</typeparam>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <param name="lockMode">The lock mode.</param>
+        /// <returns>The persistent instance</returns>
+        /// <exception cref="ObjectRetrievalFailureException">If not found</exception>     
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>  
+        public T Load<T>(object id, LockMode lockMode)
+        {
+            return Execute(new LoadByTypeHibernateCallback<T>(id, lockMode), true);
+        }
+
+        /// <summary>
+        /// Return all persistent instances of the given entity class.
+        /// Note: Use queries or criteria for retrieving a specific subset.
+        /// </summary>
+        /// <typeparam name="T">The object type to load.</typeparam>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> LoadAll<T>()
+        {
+            return ExecuteFind(new LoadAllByTypeHibernateCallback<T>(this), true);
+        }
+
+        #endregion
+
+        #region IHibernateOperations Finds
+
+        /// <summary>
+        /// Execute a query for persistent instances.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <returns>
+        /// a generic List containing 0 or more persistent instances
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>  
+        public IList<T> Find<T>(string queryString)
+        {
+            return Find<T>(queryString, (object[]) null, (IType[]) null);
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding
+        /// one value to a "?" parameter in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <param name="value">the value of the parameter</param>
+        /// <returns>
+        /// a generic List containing 0 or more persistent instances
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>  
+        public IList<T> Find<T>(string queryString, object value)
+        {
+            return Find<T>(queryString, new object[] {value}, (IType[]) null);
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding one value
+        /// to a "?" parameter of the given type in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <param name="value">The value of the parameter.</param>
+        /// <param name="type">Hibernate type of the parameter (or null)</param>
+        /// <returns>
+        /// a generic List containing 0 or more persistent instances
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>  
+        public IList<T> Find<T>(string queryString, object value, IType type)
+        {
+            return Find<T>(queryString, new object[] {value}, new IType[] {type});
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a
+        /// number of values to "?" parameters in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <param name="values">the values of the parameters</param>
+        /// <returns>a generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>  
+        public IList<T> Find<T>(string queryString, object[] values)
+        {
+            return Find<T>(queryString, values, (IType[]) null);
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a number of
+        /// values to "?" parameters of the given types in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <param name="types">Hibernate types of the parameters (or null)</param>
+        /// <returns>
+        /// a generic List containing 0 or more persistent instances
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>  
+        /// <exception cref="ArgumentException">If values and types are not null and their lengths are not equal</exception>  
+        public IList<T> Find<T>(string queryString, object[] values, IType[] types)
+        {
+            if (values != null && types != null && values.Length != types.Length)
+            {
+                throw new ArgumentException("Length of values array must match length of types array");
+            }
+            return ExecuteFind(new FindHibernateCallback<T>(this, queryString, values, types), true);
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding
+        /// one value to a  named parameter in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">The name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <returns>a generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> FindByNamedParam<T>(string queryName, string paramName, object value)
+        {
+            return FindByNamedParam<T>(queryName, paramName, value, null);
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding
+        /// one value to a  named parameter in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">The name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">Hibernate type of the parameter (or null)</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> FindByNamedParam<T>(string queryName, string paramName, object value, IType type)
+        {
+            return FindByNamedParam<T>(queryName, new string[] {paramName}, new object[] {value}, new IType[] {type});
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a
+        /// number of values to  named parameters in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> FindByNamedParam<T>(string queryString, string[] paramNames, object[] values)
+        {
+            return FindByNamedParam<T>(queryString, paramNames, values, null);
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a
+        /// number of values to  named parameters in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <param name="types">Hibernate types of the parameters (or null)</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+        /// if paramNames length is not equal to types length (when types is not null)</exception>
+        public IList<T> FindByNamedParam<T>(string queryString, string[] paramNames, object[] values, IType[] types)
+        {
+            if (paramNames.Length != values.Length)
+            {
+                throw new ArgumentOutOfRangeException("paramNames",
+                                                      "Length of paramNames array must match length of values array");
+            }
+            if (types != null && paramNames.Length != types.Length)
+            {
+                throw new ArgumentOutOfRangeException("paramNames",
+                                                      "Length of paramNames array must match length of types array");
+            }
+
+            return
+                ExecuteFind(new FindByNamedParamHibernateCallback<T>(this, queryString, paramNames, values, types), true);
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> FindByNamedQuery<T>(string queryName)
+        {
+            return FindByNamedQuery<T>(queryName, (object[]) null, (IType[]) null);
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a "?" parameter in the query string.
+        ///  A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> FindByNamedQuery<T>(string queryName, object value)
+        {
+            return FindByNamedQuery<T>(queryName, new object[] {value}, (IType[]) null);
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a "?" parameter in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">Hibernate type of the parameter (or null)</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> FindByNamedQuery<T>(string queryName, object value, IType type)
+        {
+            return FindByNamedQuery<T>(queryName, new object[] {value}, new IType[] {type});
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding a
+        /// number of values to "?" parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> FindByNamedQuery<T>(string queryName, object[] values)
+        {
+            return FindByNamedQuery<T>(queryName, values, (IType[]) null);
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding a
+        /// number of values to "?" parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <param name="types">Hibernate types of the parameters (or null)</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If values and types are not null and their lengths differ.</exception>
+        public IList<T> FindByNamedQuery<T>(string queryName, object[] values, IType[] types)
+        {
+            if (values != null && types != null && values.Length != types.Length)
+            {
+                throw new ArgumentOutOfRangeException("Length of values array must match length of types array");
+            }
+            return ExecuteFind(new FindByNamedQueryHibernateCallback<T>(this, queryName, values, types), true);
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a  named parameter in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">Name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> FindByNamedQueryAndNamedParam<T>(string queryName, string paramName, object value)
+        {
+            return FindByNamedQueryAndNamedParam<T>(queryName, paramName, value, null);
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a  named parameter in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">Name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">The Hibernate type of the parameter (or null)</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> FindByNamedQueryAndNamedParam<T>(string queryName, string paramName, object value, IType type)
+        {
+            return FindByNamedQueryAndNamedParam<T>(
+                queryName, new string[] {paramName}, new object[] {value}, new IType[] {type});
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// number of values to  named parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters.</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> FindByNamedQueryAndNamedParam<T>(string queryName, string[] paramNames, object[] values)
+        {
+            return FindByNamedQueryAndNamedParam<T>(queryName, paramNames, values, null);
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// number of values to  named parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters.</param>
+        /// <param name="types">Hibernate types of the parameters (or null)</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+        /// if paramNames length is not equal to types length (when types is not null)</exception>        
+        public IList<T> FindByNamedQueryAndNamedParam<T>(string queryName, string[] paramNames, object[] values,
+                                                         IType[] types)
+        {
+            if (paramNames != null && values != null && paramNames.Length != values.Length)
+            {
+                throw new ArgumentOutOfRangeException("paramNames",
+                                                      "Length of paramNames array must match length of values array");
+            }
+            if (paramNames != null && types != null && paramNames.Length != types.Length)
+            {
+                throw new ArgumentOutOfRangeException("paramNams",
+                                                      "Length of paramNames array must match length of types array");
+            }
+            return
+                ExecuteFind(
+                    new FindByNamedQueryAndNamedParamHibernateCallback<T>(this, queryName, paramNames, values, types),
+                    true);
+        }
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding the properties
+        /// of the given object to  named parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="valueObject">The values of the parameters</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> FindByNamedQueryAndValueObject<T>(string queryName, object valueObject)
+        {
+            return
+                ExecuteFind(new FindByNamedQueryAndValueObjectHibernateCallback<T>(this, queryName, valueObject), true);
+        }
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding the properties
+        /// of the given object to <i>named</i> parameters in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>       
+        /// <param name="valueObject">The values of the parameters</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> FindByValueObject<T>(string queryString, object valueObject)
+        {
+            return ExecuteFind(new FindByValueObjectHibernateCallback<T>(this, queryString, valueObject), true);
+        }
+
+        #endregion
+
+        #region Execute methods
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <remarks>
+        /// Application exceptions thrown by the action object get propagated to the
+        /// caller (can only be unchecked). Hibernate exceptions are transformed into
+        /// appropriate DAO ones. Allows for returning the result object.
+        /// <p>Note: Callback code is not supposed to handle transactions itself!
+        /// Use an appropriate transaction manager like HibernateTransactionManager.
+        /// Generally, callback code must not touch any Session lifecycle methods,
+        /// like close, disconnect, or reconnect, to let the template do its work.
+        /// </p>
+        /// </remarks>
+        /// <typeparam name="T">The object type retrieved.</typeparam>
+        /// <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+        /// <returns>a result object returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public T Execute<T>(HibernateDelegate<T> del)
+        {
+            return Execute<T>(new ExecuteHibernateCallbackUsingDelegate<T>(del));
+        }
+
+        /// <summary>
+        /// Execute the action specified by the delegate within a Session.
+        /// </summary>
+        /// <typeparam name="T">The object type retrieved.</typeparam>
+        /// <param name="del">The HibernateDelegate that specifies the action
+        /// to perform.</param>
+        /// <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+        /// callback code.</param>
+        /// <returns>a result object returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public T Execute<T>(HibernateDelegate<T> del, bool exposeNativeSession)
+        {
+            return Execute<T>(new ExecuteHibernateCallbackUsingDelegate<T>(del), true);
+        }
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <typeparam name="T">The object type retrieved.</typeparam>
+        /// <param name="action">The callback object that specifies the Hibernate action.</param>
+        /// <returns>
+        /// a result object returned by the action, or null
+        /// </returns>
+        /// <remarks>
+        /// Application exceptions thrown by the action object get propagated to the
+        /// caller (can only be unchecked). Hibernate exceptions are transformed into
+        /// appropriate DAO ones. Allows for returning the result object.
+        /// <p>Note: Callback code is not supposed to handle transactions itself!
+        /// Use an appropriate transaction manager like HibernateTransactionManager.
+        /// Generally, callback code must not touch any Session lifecycle methods,
+        /// like close, disconnect, or reconnect, to let the template do its work.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public T Execute<T>(IHibernateCallback<T> action)
+        {
+            return Execute<T>(action, ExposeNativeSession);
+        }
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <typeparam name="T">The object type retrieved.</typeparam>
+        /// <param name="action">callback object that specifies the Hibernate action.</param>
+        /// <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+        /// callback code.</param>
+        /// <returns>
+        /// a result object returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public T Execute<T>(IHibernateCallback<T> action, bool exposeNativeSession)
+        {
+            ISession session = Session;
+
+            bool existingTransaction = SessionFactoryUtils.IsSessionTransactional(session, SessionFactory);
+            if (existingTransaction)
+            {
+                //log.Debug("Found thread-bound Session for HibernateTemplate");
+            }
+
+            FlushModeHolder previousFlushModeHolder = new FlushModeHolder();
+            try
+            {
+                previousFlushModeHolder = ApplyFlushMode(session, existingTransaction);
+                ISession sessionToExpose = (exposeNativeSession ? session : classicHibernateTemplate.CreateSessionProxy(session));
+                T result = action.DoInHibernate(sessionToExpose);
+                FlushIfNecessary(session, existingTransaction);
+                return result;
+            }
+            catch (ADOException ex)
+            {
+                IDbProvider dbProvider = SessionFactoryUtils.GetDbProvider(SessionFactory);
+                if (dbProvider != null && dbProvider.IsDataAccessException(ex.InnerException))
+                {
+                    throw ConvertAdoAccessException(ex);
+                }
+                else
+                {
+                    throw new HibernateSystemException(ex);
+                }
+            }
+            catch (HibernateException ex)
+            {
+                throw ConvertHibernateAccessException(ex);
+            }
+            catch (Exception ex)
+            {
+                IDbProvider dbProvider = SessionFactoryUtils.GetDbProvider(SessionFactory);
+                if (dbProvider != null && dbProvider.IsDataAccessException(ex))
+                {
+                    throw ConvertAdoAccessException(ex);
+                }
+                else
+                {
+                    // Callback code throw application exception or other non DB related exception.
+                    throw;
+                }
+            }
+            finally
+            {
+                if (existingTransaction)
+                {
+                    //log.Debug("Not closing pre-bound Hibernate Session after HibernateTemplate");
+                    if (previousFlushModeHolder.ModeWasSet)
+                    {
+                        session.FlushMode = previousFlushModeHolder.Mode;
+                    }
+                }
+                else
+                {
+                    SessionFactoryUtils.ReleaseSession(session, SessionFactory);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session assuming that an IList is returned.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="action">callback object that specifies the Hibernate action.</param>
+        /// <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+        /// callback code.</param>
+        /// <returns>
+        /// an IList returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> ExecuteFind<T>(IFindHibernateCallback<T> action, bool exposeNativeSession)
+        {
+            ISession session = Session;
+
+            bool existingTransaction = SessionFactoryUtils.IsSessionTransactional(session, SessionFactory);
+
+            FlushModeHolder previousFlushModeHolder = new FlushModeHolder();
+            try
+            {
+                previousFlushModeHolder = ApplyFlushMode(session, existingTransaction);
+                ISession sessionToExpose = (exposeNativeSession ? session : classicHibernateTemplate.CreateSessionProxy(session));
+                IList<T> result = action.DoInHibernate(sessionToExpose);
+                FlushIfNecessary(session, existingTransaction);
+                return result;
+            }
+            catch (ADOException ex)
+            {
+                IDbProvider dbProvider = SessionFactoryUtils.GetDbProvider(SessionFactory);
+                if (dbProvider != null && dbProvider.IsDataAccessException(ex.InnerException))
+                {
+                    throw ConvertAdoAccessException(ex);
+                }
+                else
+                {
+                    // Callback code throw application exception or other non DB related exception.
+                    throw;
+                }
+            }
+            catch (HibernateException ex)
+            {
+                throw ConvertHibernateAccessException(ex);
+            }
+            catch (Exception ex)
+            {
+                IDbProvider dbProvider = SessionFactoryUtils.GetDbProvider(SessionFactory);
+                if (dbProvider != null && dbProvider.IsDataAccessException(ex))
+                {
+                    throw ConvertAdoAccessException(ex);
+                }
+                else
+                {
+                    // Callback code throw application exception or other non DB related exception.
+                    throw;
+                }
+            }
+            finally
+            {
+                if (existingTransaction)
+                {
+                    if (previousFlushModeHolder.ModeWasSet)
+                    {
+                        session.FlushMode = previousFlushModeHolder.Mode;
+                    }
+                }
+                else
+                {
+                    SessionFactoryUtils.ReleaseSession(session, SessionFactory);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <remarks>
+        /// Application exceptions thrown by the action object get propagated to the
+        /// caller (can only be unchecked). Hibernate exceptions are transformed into
+        /// appropriate DAO ones. Allows for returning the result object.
+        /// <p>Note: Callback code is not supposed to handle transactions itself!
+        /// Use an appropriate transaction manager like HibernateTransactionManager.
+        /// Generally, callback code must not touch any Session lifecycle methods,
+        /// like close, disconnect, or reconnect, to let the template do its work.
+        /// </p>
+        /// </remarks>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+        /// <returns>A generic IList returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> ExecuteFind<T>(FindHibernateDelegate<T> del)
+        {
+            return ExecuteFind<T>(new ExecuteFindHibernateCallbackUsingDelegate<T>(del));
+        }
+
+        /// <summary>
+        /// Execute the action specified by the delegate within a Session.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="del">The FindHibernateDelegate that specifies the action
+        /// to perform.</param>
+        /// <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+        /// callback code.</param>
+        /// <returns>A generic IList returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        public IList<T> ExecuteFind<T>(FindHibernateDelegate<T> del, bool exposeNativeSession)
+        {
+            return ExecuteFind<T>(new ExecuteFindHibernateCallbackUsingDelegate<T>(del), true);
+        }
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="action">The callback object that specifies the Hibernate action.</param>
+        /// <returns>
+        /// A generic IList returned by the action, or null
+        /// </returns>
+        /// <remarks>
+        /// Application exceptions thrown by the action object get propagated to the
+        /// caller (can only be unchecked). Hibernate exceptions are transformed into
+        /// appropriate DAO ones. Allows for returning the result object.
+        /// <p>Note: Callback code is not supposed to handle transactions itself!
+        /// Use an appropriate transaction manager like HibernateTransactionManager.
+        /// Generally, callback code must not touch any Session lifecycle methods,
+        /// like close, disconnect, or reconnect, to let the template do its work.
+        /// </p>
+        /// </remarks>
+        public IList<T> ExecuteFind<T>(IFindHibernateCallback<T> action)
+        {
+            return ExecuteFind<T>(action, ExposeNativeSession);
+        }
+
+        #endregion
+
+    }
+
+    #region Internal Supporting Callback Classes
+
+    internal class ExecuteHibernateCallbackUsingDelegate<T> : IHibernateCallback<T>
+    {
+        private HibernateDelegate<T> del;
+
+        public ExecuteHibernateCallbackUsingDelegate(HibernateDelegate<T> d)
+        {
+            del = d;
+        }
+
+        public T DoInHibernate(ISession session)
+        {
+            return del(session);
+        }
+    }
+
+    internal class GetByTypeHibernateCallback<T> : IHibernateCallback<T>
+    {
+        private object id;
+        private LockMode lockMode;
+
+        public GetByTypeHibernateCallback(object id, LockMode lockMode)
+        {
+            this.id = id;
+            this.lockMode = lockMode;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public T DoInHibernate(ISession session)
+        {
+            if (lockMode != null)
+            {
+                return session.Get<T>(id, lockMode);
+            }
+            else
+            {
+                return session.Get<T>(id);
+            }
+        }
+    }
+
+    internal class LoadByTypeHibernateCallback<T> : IHibernateCallback<T>
+    {
+        private object id;
+        private LockMode lockMode;
+
+        public LoadByTypeHibernateCallback(object id, LockMode lockMode)
+        {
+            this.id = id;
+            this.lockMode = lockMode;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public T DoInHibernate(ISession session)
+        {
+            if (lockMode != null)
+            {
+                return session.Load<T>(id, lockMode);
+            }
+            else
+            {
+                return session.Load<T>(id);
+            }
+        }
+    }
+
+    internal class LoadAllByTypeHibernateCallback<T> : IFindHibernateCallback<T>
+    {
+        private HibernateTemplate outer;
+
+        public LoadAllByTypeHibernateCallback(HibernateTemplate template)
+        {
+            outer = template;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public IList<T> DoInHibernate(ISession session)
+        {
+            ICriteria criteria = session.CreateCriteria(typeof (T));
+            outer.PrepareCriteria(criteria);
+            return criteria.List<T>();
+        }
+    }
+
+    internal class FindHibernateCallback<T> : IFindHibernateCallback<T>
+    {
+        private HibernateTemplate outer;
+        private string queryString;
+        private object[] values;
+        private IType[] types;
+
+        public FindHibernateCallback(HibernateTemplate template, string queryString, object[] values, IType[] types)
+        {
+            outer = template;
+            this.queryString = queryString;
+            this.values = values;
+            this.types = types;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public IList<T> DoInHibernate(ISession session)
+        {
+            IQuery queryObject = session.CreateQuery(queryString);
+            outer.PrepareQuery(queryObject);
+
+            if (values != null)
+            {
+                for (int i = 0; i < values.Length; i++)
+                {
+                    if (types != null && types[i] != null)
+                    {
+                        queryObject.SetParameter(i, values[i], types[i]);
+                    }
+                    else
+                    {
+                        queryObject.SetParameter(i, values[i]);
+                    }
+                }
+            }
+
+            return queryObject.List<T>();
+        }
+    }
+
+    internal class FindByNamedParamHibernateCallback<T> : IFindHibernateCallback<T>
+    {
+        HibernateTemplate outer;
+        private string queryString;
+        private string[] paramNames;
+        private object[] values;
+        private IType[] types;
+
+        public FindByNamedParamHibernateCallback(HibernateTemplate template, string queryString, string[] paramNames,
+                                                 object[] values, IType[] types)
+        {
+            outer = template;
+            this.queryString = queryString;
+            this.paramNames = paramNames;
+            this.values = values;
+            this.types = types;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public IList<T> DoInHibernate(ISession session)
+        {
+            IQuery queryObject = session.CreateQuery(queryString);
+            outer.PrepareQuery(queryObject);
+            if (values != null)
+            {
+                for (int i = 0; i < values.Length; i++)
+                {
+                    outer.ApplyNamedParameterToQuery(queryObject, paramNames[i], values[i],
+                                                     (types != null ? types[i] : null));
+                }
+            }
+            return queryObject.List<T>();
+        }
+    }
+
+    internal class FindByNamedQueryHibernateCallback<T> : IFindHibernateCallback<T>
+    {
+        HibernateTemplate outer;
+        private string queryName;
+        private object[] values;
+        private IType[] types;
+
+        public FindByNamedQueryHibernateCallback(HibernateTemplate template, string queryName, object[] values,
+                                                 IType[] types)
+        {
+            outer = template;
+            this.queryName = queryName;
+            this.values = values;
+            this.types = types;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public IList<T> DoInHibernate(ISession session)
+        {
+            IQuery queryObject = session.GetNamedQuery(queryName);
+            outer.PrepareQuery(queryObject);
+            if (values != null)
+            {
+                for (int i = 0; i < values.Length; i++)
+                {
+                    if (types != null && types[i] != null)
+                    {
+                        queryObject.SetParameter(i, values[i], types[i]);
+                    }
+                    else
+                    {
+                        queryObject.SetParameter(i, values[i]);
+                    }
+                }
+            }
+            return queryObject.List<T>();
+        }
+    }
+
+    internal class FindByNamedQueryAndNamedParamHibernateCallback<T> : IFindHibernateCallback<T>
+    {
+        HibernateTemplate outer;
+        private string queryName;
+        private string[] paramNames;
+        private object[] values;
+        private IType[] types;
+
+        public FindByNamedQueryAndNamedParamHibernateCallback(HibernateTemplate template, string queryName,
+                                                              string[] paramNames, object[] values, IType[] types)
+        {
+            outer = template;
+            this.queryName = queryName;
+            this.paramNames = paramNames;
+            this.values = values;
+            this.types = types;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public IList<T> DoInHibernate(ISession session)
+        {
+            IQuery queryObject = session.GetNamedQuery(queryName);
+            outer.PrepareQuery(queryObject);
+            if (values != null)
+            {
+                for (int i = 0; i < values.Length; i++)
+                {
+                    outer.ApplyNamedParameterToQuery(queryObject, paramNames[i], values[i],
+                                                     (types != null ? types[i] : null));
+                }
+            }
+            return queryObject.List<T>();
+        }
+    }
+
+    internal class FindByNamedQueryAndValueObjectHibernateCallback<T> : IFindHibernateCallback<T>
+    {
+        HibernateTemplate outer;
+        private string queryName;
+        private object valueObject;
+
+        public FindByNamedQueryAndValueObjectHibernateCallback(HibernateTemplate template, string queryName,
+                                                               object valueObject)
+        {
+            outer = template;
+            this.queryName = queryName;
+            this.valueObject = valueObject;
+        }
+
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        public IList<T> DoInHibernate(ISession session)
+        {
+            IQuery queryObject = session.GetNamedQuery(queryName);
+            outer.PrepareQuery(queryObject);
+            queryObject.SetProperties(valueObject);
+            return queryObject.List<T>();
+        }
+    }
+
+    internal class FindByValueObjectHibernateCallback<T> : IFindHibernateCallback<T>
+    {
+        HibernateTemplate outer;
+        private string queryString;
+        private object valueObject;
+
+        public FindByValueObjectHibernateCallback(HibernateTemplate template, string queryString, object valueObject)
+        {
+            outer = template;
+            this.queryString = queryString;
+            this.valueObject = valueObject;
+        }
+
+        public IList<T> DoInHibernate(ISession session)
+        {
+            IQuery queryObject = session.CreateQuery(queryString);
+            outer.PrepareQuery(queryObject);
+            queryObject.SetProperties(valueObject);
+            return queryObject.List<T>();
+        }
+    }
+
+    internal class ExecuteFindHibernateCallbackUsingDelegate<T> : IFindHibernateCallback<T>
+    {
+        private FindHibernateDelegate<T> del;
+
+        public ExecuteFindHibernateCallbackUsingDelegate(FindHibernateDelegate<T> d)
+        {
+            del = d;
+        }
+
+        public IList<T> DoInHibernate(ISession session)
+        {
+            return del(session);
+        }
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IFindHibernateCallback.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IFindHibernateCallback.cs
new file mode 100644
index 00000000..b84c65f4
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IFindHibernateCallback.cs
@@ -0,0 +1,56 @@
+#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.Collections.Generic;
+using NHibernate;
+
+namespace Spring.Data.NHibernate.Generic
+{
+    /// <summary>
+    /// Callback interface (Generic version) for NHibernate code that
+    /// returns a List of objects.
+    /// </summary>
+    /// <typeparam name="T">The type of result object</typeparam>
+    /// <remarks>To be used with HibernateTemplate execute
+    /// method. The typical implementation will call 
+    /// Session.load/find/save/update to perform
+    /// some operations on persistent objects.
+	/// </remarks>
+    /// <author>Sree Nivask (.NET)</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IFindHibernateCallback.cs,v 1.2 2007/09/19 22:58:10 markpollack Exp $</version>
+	public interface IFindHibernateCallback<T>
+	{
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        /// <returns>Collection result object.</returns>
+        IList<T> DoInHibernate(ISession session);
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateCallback.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateCallback.cs
new file mode 100644
index 00000000..6fd97f3f
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateCallback.cs
@@ -0,0 +1,59 @@
+#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
+
+#region Imports
+
+using NHibernate;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Generic
+{
+	/// <summary>
+    /// Callback interface (Generic version) for NHibernate code.
+    /// </summary>
+    /// <typeparam name="T">The type of result object</typeparam>
+    /// <remarks>To be used with HibernateTemplate execute
+    /// method. The typical implementation will call 
+    /// Session.load/find/save/update to perform
+    /// some operations on persistent objects.
+	/// </remarks>
+	/// 
+    /// <author>Sree Nivask (.NET)</author>
+	/// <version>$Id: IHibernateCallback.cs,v 1.2 2007/09/19 22:58:10 markpollack Exp $</version>
+	public interface IHibernateCallback<T>
+	{
+        /// <summary>
+        /// Gets called by HibernateTemplate with an active
+        /// Hibernate Session. Does not need to care about activating or closing
+        /// the Session, or handling transactions.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Allows for returning a result object created within the callback, i.e.
+        /// a domain object or a collection of domain objects. Note that there's
+        /// special support for single step actions: see HibernateTemplate.find etc.
+        /// </p>
+        /// </remarks>
+        /// <returns>A result object.</returns>        
+        /// <param name="session">The active Hibernate session</param>
+        T DoInHibernate(ISession session);
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateOperations.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateOperations.cs
new file mode 100644
index 00000000..899c88bc
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateOperations.cs
@@ -0,0 +1,492 @@
+#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.Collections.Generic;
+using NHibernate;
+using NHibernate.Type;
+using Spring.Dao;
+
+namespace Spring.Data.NHibernate.Generic
+{
+    /// <summary>
+    /// Interface that specifies a basic set of Hibernate operations.
+    /// </summary>
+    /// <remarks>
+    /// Implemented by HibernateTemplate. Not often used, but a useful option
+    /// to enhance testability, as it can easily be mocked or stubbed.
+    /// <p>Provides HibernateTemplate's data access methods that mirror
+    /// various Session methods. See the NHibernate ISession documentation
+    /// for details on those methods.
+    /// </p>
+    /// </remarks>
+    /// <threadsafety statis="true" instance="true"/>
+    /// <author>Sree Nivask (.NET)</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: IHibernateOperations.cs,v 1.2 2007/09/19 22:58:10 markpollack Exp $</version>
+    public interface IHibernateOperations : ICommonHibernateOperations
+    {
+        
+        /// <summary>
+        /// Return the persistent instance of the given entity type
+        /// with the given identifier, or <see langword="null" /> if not found.
+        /// Obtains the specified lock mode if the instance exists.
+        /// </summary>
+        /// <typeparam name="T">The object type to get.</typeparam>
+        /// <param name="id">The id of the object to get.</param>
+        /// <returns>the persistent instance, or <see langword="null" /> if not found</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>        
+        T Get<T>(object id);
+
+        /// <summary>
+        /// Return the persistent instance of the given entity type
+        /// with the given identifier, or null if not found.
+        /// Obtains the specified lock mode if the instance exists.
+        /// </summary>
+        /// <typeparam name="T">The object type to get.</typeparam>
+        /// <param name="id">The lock mode to obtain.</param>
+        /// <param name="lockMode">The lock mode.</param>
+        /// <returns>the persistent instance, or null if not found</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>     
+        T Get<T>(object id, LockMode lockMode);
+
+        /// <summary>
+        /// Return the persistent instance of the given entity class
+        /// with the given identifier, throwing an exception if not found.
+        /// </summary>
+        /// <typeparam name="T">The object type to load.</typeparam>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <returns>The persistent instance</returns>
+        /// <exception cref="ObjectRetrievalFailureException">If not found</exception>     
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>     
+        T Load<T>(object id);
+
+        /// <summary>
+        /// Return the persistent instance of the given entity class
+        ///  with the given identifier, throwing an exception if not found.
+        /// Obtains the specified lock mode if the instance exists.
+        /// </summary>
+        /// <typeparam name="T">The object type to load.</typeparam>
+        /// <param name="id">An identifier of the persistent instance.</param>
+        /// <param name="lockMode">The lock mode.</param>
+        /// <returns>The persistent instance</returns>
+        /// <exception cref="ObjectRetrievalFailureException">If not found</exception>     
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>  
+        T Load<T>(object id, LockMode lockMode);
+
+        /// <summary>
+        /// Return all persistent instances of the given entity class.
+        /// Note: Use queries or criteria for retrieving a specific subset.
+        /// </summary>
+        /// <typeparam name="T">The object type to load.</typeparam>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> LoadAll<T>();
+
+        /// <summary>
+        /// Execute a query for persistent instances.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <returns>
+        /// a generic List containing 0 or more persistent instances
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>  
+        IList<T> Find<T>(string queryString);
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding
+        /// one value to a "?" parameter in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <param name="value">the value of the parameter</param>
+        /// <returns>
+        /// a generic List containing 0 or more persistent instances
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>  
+        IList<T> Find<T>(string queryString, object value);
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding one value
+        /// to a "?" parameter of the given type in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <param name="value">The value of the parameter.</param>
+        /// <param name="type">Hibernate type of the parameter (or null)</param>
+        /// <returns>
+        /// a generic List containing 0 or more persistent instances
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>  
+        IList<T> Find<T>(string queryString, object value, IType type);
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a
+        /// number of values to "?" parameters in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">a query expressed in Hibernate's query language</param>
+        /// <param name="values">the values of the parameters</param>
+        /// <returns>a generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>  
+        IList<T> Find<T>(string queryString, object[] values);
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a number of
+        /// values to "?" parameters of the given types in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <param name="types">Hibernate types of the parameters (or null)</param>
+        /// <returns>
+        /// a generic List containing 0 or more persistent instances
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception> 
+        /// <exception cref="ArgumentException">If values and types are not null and their lenths are not equal</exception>          
+        IList<T> Find<T>(string queryString, object[] values, IType[] types);
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding
+        /// one value to a  named parameter in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">The name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <returns>a generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> FindByNamedParam<T>(string queryName, string paramName, object value);
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding
+        /// one value to a  named parameter in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">The name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">Hibernate type of the parameter (or null)</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> FindByNamedParam<T>(string queryName, string paramName, object value, IType type);
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a
+        /// number of values to  named parameters in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> FindByNamedParam<T>(string queryString, string[] paramNames, object[] values);
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding a
+        /// number of values to  named parameters in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <param name="types">Hibernate types of the parameters (or null)</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+        /// if paramNames length is not equal to types length (when types is not null)</exception>        
+        IList<T> FindByNamedParam<T>(string queryString, string[] paramNames, object[] values, IType[] types);
+
+        /// <summary>
+        /// Execute a named query for persistent instances.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> FindByNamedQuery<T>(string queryName);
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a "?" parameter in the query string.
+        ///  A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> FindByNamedQuery<T>(string queryName, object value);
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a "?" parameter in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">Hibernate type of the parameter (or null)</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> FindByNamedQuery<T>(string queryName, object value, IType type);
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding a
+        /// number of values to "?" parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> FindByNamedQuery<T>(string queryName, object[] values);
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding a
+        /// number of values to "?" parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="values">The values of the parameters</param>
+        /// <param name="types">Hibernate types of the parameters (or null)</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If values and types are not null and their lengths differ.</exception>        
+        IList<T> FindByNamedQuery<T>(string queryName, object[] values, IType[] types);
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a  named parameter in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">Name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> FindByNamedQueryAndNamedParam<T>(string queryName, string paramName, object value);
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// one value to a  named parameter in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramName">Name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">The Hibernate type of the parameter (or null)</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> FindByNamedQueryAndNamedParam<T>(string queryName, string paramName, object value, IType type);
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// number of values to named parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters.</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> FindByNamedQueryAndNamedParam<T>(string queryName, string[] paramNames, object[] values);
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding
+        /// number of values to  named parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="paramNames">The names of the parameters</param>
+        /// <param name="values">The values of the parameters.</param>
+        /// <param name="types">Hibernate types of the parameters (or null)</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+        /// if paramNames length is not equal to types length (when types is not null)</exception>                
+        IList<T> FindByNamedQueryAndNamedParam<T>(string queryName, string[] paramNames, object[] values, IType[] types);
+
+        /// <summary>
+        /// Execute a named query for persistent instances, binding the properties
+        /// of the given object to  named parameters in the query string.
+        /// A named query is defined in a Hibernate mapping file.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryName">The name of a Hibernate query in a mapping file</param>
+        /// <param name="valueObject">The values of the parameters</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> FindByNamedQueryAndValueObject<T>(string queryName, object valueObject);
+
+        /// <summary>
+        /// Execute a query for persistent instances, binding the properties
+        /// of the given object to <i>named</i> parameters in the query string.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="queryString">A query expressed in Hibernate's query language</param>       
+        /// <param name="valueObject">The values of the parameters</param>
+        /// <returns>A generic List containing 0 or more persistent instances</returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> FindByValueObject<T>(string queryString, object valueObject);
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <remarks>
+        /// Application exceptions thrown by the action object get propagated to the
+        /// caller (can only be unchecked). Hibernate exceptions are transformed into
+        /// appropriate DAO ones. Allows for returning the result object.
+        /// <p>Note: Callback code is not supposed to handle transactions itself!
+        /// Use an appropriate transaction manager like HibernateTransactionManager.
+        /// Generally, callback code must not touch any Session lifecycle methods,
+        /// like close, disconnect, or reconnect, to let the template do its work.
+        /// </p>
+        /// </remarks>
+        /// <typeparam name="T">The object type retrieved.</typeparam>
+        /// <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+        /// <returns>a result object returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        T Execute<T>(HibernateDelegate<T> del);
+
+        /// <summary>
+        /// Execute the action specified by the delegate within a Session.
+        /// </summary>
+        /// <typeparam name="T">The object type retrieved.</typeparam>
+        /// <param name="del">The HibernateDelegate that specifies the action
+        /// to perform.</param>
+        /// <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+        /// callback code.</param>
+        /// <returns>a result object returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        T Execute<T>(HibernateDelegate<T> del, bool exposeNativeSession);
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <typeparam name="T">The object type retrieved.</typeparam>
+        /// <param name="action">The callback object that specifies the Hibernate action.</param>
+        /// <returns>
+        /// a result object returned by the action, or null
+        /// </returns>
+        /// <remarks>
+        /// Application exceptions thrown by the action object get propagated to the
+        /// caller (can only be unchecked). Hibernate exceptions are transformed into
+        /// appropriate DAO ones. Allows for returning the result object.
+        /// <p>Note: Callback code is not supposed to handle transactions itself!
+        /// Use an appropriate transaction manager like HibernateTransactionManager.
+        /// Generally, callback code must not touch any Session lifecycle methods,
+        /// like close, disconnect, or reconnect, to let the template do its work.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        T Execute<T>(IHibernateCallback<T> action);
+        
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <typeparam name="T">The object type retrieved.</typeparam>
+        /// <param name="action">callback object that specifies the Hibernate action.</param>
+        /// <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+        /// callback code.</param>
+        /// <returns>
+        /// a result object returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        T Execute<T>(IHibernateCallback<T> action, bool exposeNativeSession);
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <remarks>
+        /// Application exceptions thrown by the action object get propagated to the
+        /// caller (can only be unchecked). Hibernate exceptions are transformed into
+        /// appropriate DAO ones. Allows for returning the result object.
+        /// <p>Note: Callback code is not supposed to handle transactions itself!
+        /// Use an appropriate transaction manager like HibernateTransactionManager.
+        /// Generally, callback code must not touch any Session lifecycle methods,
+        /// like close, disconnect, or reconnect, to let the template do its work.
+        /// </p>
+        /// </remarks>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+        /// <returns>A generic IList returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> ExecuteFind<T>(FindHibernateDelegate<T> del);
+
+        /// <summary>
+        /// Execute the action specified by the delegate within a Session.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="del">The FindHibernateDelegate that specifies the action
+        /// to perform.</param>
+        /// <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+        /// callback code.</param>
+        /// <returns>A generic IList returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> ExecuteFind<T>(FindHibernateDelegate<T> del, bool exposeNativeSession);
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="action">The callback object that specifies the Hibernate action.</param>
+        /// <returns>
+        /// A generic IList returned by the action, or null
+        /// </returns>
+        /// <remarks>
+        /// Application exceptions thrown by the action object get propagated to the
+        /// caller (can only be unchecked). Hibernate exceptions are transformed into
+        /// appropriate DAO ones. Allows for returning the result object.
+        /// <p>Note: Callback code is not supposed to handle transactions itself!
+        /// Use an appropriate transaction manager like HibernateTransactionManager.
+        /// Generally, callback code must not touch any Session lifecycle methods,
+        /// like close, disconnect, or reconnect, to let the template do its work.
+        /// </p>
+        /// </remarks>
+        IList<T> ExecuteFind<T>(IFindHibernateCallback<T> action);
+
+        /// <summary>
+        /// Execute the action specified by the given action object within a Session assuming that an IList is returned.
+        /// </summary>
+        /// <typeparam name="T">The object type to find.</typeparam>
+        /// <param name="action">callback object that specifies the Hibernate action.</param>
+        /// <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+        /// callback code.</param>
+        /// <returns>
+        /// an IList returned by the action, or null
+        /// </returns>
+        /// <exception cref="DataAccessException">In case of Hibernate errors</exception>
+        IList<T> ExecuteFind<T>(IFindHibernateCallback<T> action, bool exposeNativeSession);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateAccessor.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateAccessor.cs
new file mode 100644
index 00000000..eb2f24c0
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateAccessor.cs
@@ -0,0 +1,738 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using AopAlliance.Intercept;
+using Common.Logging;
+using NHibernate;
+using NHibernate.Impl;
+using NHibernate.Type;
+using Spring.Core.TypeResolution;
+using Spring.Dao;
+using Spring.Data.Support;
+using Spring.Objects.Factory;
+using IInterceptor=NHibernate.IInterceptor;
+using ICriteria=NHibernate.ICriteria;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+    /// Base class for HibernateTemplate defining common
+    /// properties like SessionFactory and flushing behavior.
+	/// </summary>
+	/// <remarks>
+	/// <p>Not intended to be used directly. See HibernateTemplate.
+	/// </p>
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: HibernateAccessor.cs,v 1.7 2008/01/25 15:04:28 markpollack Exp $</version>
+	public abstract class HibernateAccessor : IInitializingObject, IObjectFactoryAware
+	{
+
+        private Type criteriaType;
+	    
+	    #region Constants
+
+		/// <summary>
+		/// The <see cref="ILog"/> instance for this class. 
+		/// </summary>
+		private readonly ILog log = LogManager.GetLogger(typeof (HibernateAccessor));
+	    
+	    #endregion
+
+		#region Constructor (s)
+
+	    /// <summary>
+		/// Initializes a new instance of the <see cref="HibernateAccessor"/> class.
+        /// </summary>
+		public HibernateAccessor()
+		{
+	        
+		}
+
+		#endregion
+
+	    
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets if a new Session should be created when no transactional Session
+        /// can be found for the current thread.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if allowed to create non-transaction session;
+        /// otherwise, <c>false</c>.
+        /// </value>
+        /// <remarks>
+        /// 	<p>HibernateTemplate is aware of a corresponding Session bound to the
+        /// current thread, for example when using HibernateTransactionManager.
+        /// If allowCreate is true, a new non-transactional Session will be created
+        /// if none found, which needs to be closed at the end of the operation.
+        /// If false, an InvalidOperationException will get thrown in this case.
+        /// </p>
+        /// </remarks>
+        public abstract bool AllowCreate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to always
+        /// use a new Hibernate Session for this template.
+        /// </summary>
+        /// <value><c>true</c> if always use new session; otherwise, <c>false</c>.</value>
+        /// <remarks>
+        /// 	<p>
+        /// Default is "false"; if activated, all operations on this template will
+        /// work on a new NHibernate ISession even in case of a pre-bound ISession
+        /// (for example, within a transaction).
+        /// </p>
+        /// 	<p>Within a transaction, a new NHibernate ISession used by this template
+        /// will participate in the transaction through using the same ADO.NET
+        /// Connection. In such a scenario, multiple Sessions will participate
+        /// in the same database transaction.
+        /// </p>
+        /// 	<p>Turn this on for operations that are supposed to always execute
+        /// independently, without side effects caused by a shared NHibernate ISession.
+        /// </p>
+        /// </remarks>
+        public abstract bool AlwaysUseNewSession
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Set whether to expose the native Hibernate Session to IHibernateCallback
+        /// code. Default is "false": a Session proxy will be returned,
+        /// suppressing <code>close</code> calls and automatically applying
+        /// query cache settings and transaction timeouts.
+        /// </summary>
+        /// <value><c>true</c> if expose native session; otherwise, <c>false</c>.</value>
+        public abstract bool ExposeNativeSession
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the template flush mode.
+        /// </summary>
+        /// <remarks>
+        /// Default is Auto. Will get applied to any <b>new</b> ISession
+        /// created by the template.
+        /// </remarks>
+        /// <value>The template flush mode.</value>
+        public abstract TemplateFlushMode TemplateFlushMode
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the entity interceptor that allows to inspect and change
+        /// property values before writing to and reading from the database.
+        /// </summary>
+        /// <remarks>
+        /// Will get applied to any <b>new</b> ISession created by this object.
+        /// <p>Such an interceptor can either be set at the ISessionFactory level,
+        /// i.e. on LocalSessionFactoryObject, or at the ISession level, i.e. on
+        /// HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
+        /// It's preferable to set it on LocalSessionFactoryObject or HibernateTransactionManager
+        /// to avoid repeated configuration and guarantee consistent behavior in transactions.
+        /// </p>
+        /// </remarks>
+        /// <value>The interceptor.</value>
+        public abstract IInterceptor EntityInterceptor
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Set the object name of a Hibernate entity interceptor that allows to inspect
+        /// and change property values before writing to and reading from the database.
+        /// </summary>
+        /// <remarks>
+        /// Will get applied to any new Session created by this transaction manager.
+        /// <p>Requires the object factory to be known, to be able to resolve the object
+        /// name to an interceptor instance on session creation. Typically used for
+        /// prototype interceptors, i.e. a new interceptor instance per session.
+        /// </p>
+        /// <p>Can also be used for shared interceptor instances, but it is recommended
+        /// to set the interceptor reference directly in such a scenario.
+        /// </p>
+        /// </remarks>
+        /// <value>The name of the entity interceptor in the object factory/application context.</value>
+        public abstract string EntityInterceptorObjectName
+        {
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the session factory that should be used to create
+        /// NHibernate ISessions.
+        /// </summary>
+        /// <value>The session factory.</value>
+        public abstract ISessionFactory SessionFactory
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Set the object factory instance.
+        /// </summary>
+        /// <value>The object factory instance.</value>
+        public abstract IObjectFactory ObjectFactory
+        {
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to 
+        /// cache all queries executed by this template.
+        /// </summary>
+        /// <remarks>
+        /// If this is true, all IQuery and ICriteria objects created by
+        /// this template will be marked as cacheable (including all
+        /// queries through find methods).
+        /// <p>To specify the query region to be used for queries cached
+        /// by this template, set the QueryCacheRegion property.
+        /// </p>
+        /// </remarks>
+        /// <value><c>true</c> if cache queries; otherwise, <c>false</c>.</value>
+        public abstract bool CacheQueries
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the cache region for queries executed by this template.
+        /// </summary>
+        /// <remarks>
+        /// If this is specified, it will be applied to all IQuery and ICriteria objects
+        /// created by this template (including all queries through find methods).
+        /// <p>The cache region will not take effect unless queries created by this
+        /// template are configured to be cached via the CacheQueries property.
+        /// </p>
+        /// </remarks>
+        /// <value>The query cache region.</value>
+        public abstract string QueryCacheRegion
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the fetch size for this HibernateTemplate.
+        /// </summary>
+        /// <value>The size of the fetch.</value>
+        /// <remarks>This is important for processing
+        /// large result sets: Setting this higher than the default value will increase
+        /// processing speed at the cost of memory consumption; setting this lower can
+        /// avoid transferring row data that will never be read by the application.
+        /// <p>Default is 0, indicating to use the driver's default.</p>
+        /// </remarks>
+        public abstract int FetchSize
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum number of rows for this HibernateTemplate.
+        /// </summary>
+        /// <value>The max results.</value>
+        /// <remarks>
+        /// This is important
+        /// for processing subsets of large result sets, avoiding to read and hold
+        /// the entire result set in the database or in the ADO.NET driver if we're
+        /// never interested in the entire result in the first place (for example,
+        /// when performing searches that might return a large number of matches).
+        /// <p>Default is 0, indicating to use the driver's default.</p>
+        /// </remarks>
+        public abstract int MaxResults
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Set the ADO.NET exception translator for this instance.
+        /// Applied to System.Data.Common.DbException (or provider specific exception type
+        /// in .NET 1.1) thrown by callback code, be it direct
+        /// DbException or wrapped Hibernate ADOExceptions.
+        /// <p>The default exception translator is either a ErrorCodeExceptionTranslator
+        /// if a DbProvider is available, or a FalbackExceptionTranslator otherwise
+        /// </p>
+        /// </summary>
+        /// <value>The ADO exception translator.</value>
+        public abstract IAdoExceptionTranslator AdoExceptionTranslator
+        {
+            set;
+            get;
+        }
+	    
+        /// <summary>
+        /// Gets a Session for use by this template.
+        /// </summary>
+        /// <value>The session.</value>
+        /// <remarks>
+        /// - Returns a new Session in case of "alwaysUseNewSession" (using the same ADO.NET connection as a transaction Session, if applicable)
+        /// - a pre-bound Session in case of "AllowCreate" is set to false (not the default) 
+        /// - or a pre-bound Session or new Session if no transactional or other pre-bound Session exists.
+        /// </remarks>
+        protected ISession Session
+        {
+            get
+            {
+                if (AlwaysUseNewSession)
+                {
+                    return SessionFactoryUtils.GetNewSession(SessionFactory, EntityInterceptor);
+                }
+                else if (!AllowCreate)
+                {
+                    return SessionFactoryUtils.GetSession(SessionFactory, false);
+                }
+                else
+                {
+                    return SessionFactoryUtils.GetSession(
+                        SessionFactory, EntityInterceptor, AdoExceptionTranslator);
+                }
+
+            }
+
+        }
+	    
+    	#endregion
+
+		#region Methods
+
+        /// <summary>
+        /// Apply the flush mode that's been specified for this accessor
+        /// to the given Session.
+        /// </summary>
+        /// <param name="session">The current Hibernate Session.</param>
+        /// <param name="existingTransaction">if set to <c>true</c>
+        /// if executing within an existing transaction.</param>
+        /// <returns>
+        /// the previous flush mode to restore after the operation,
+        /// or <code>null</code> if none
+        /// </returns>
+        protected FlushModeHolder ApplyFlushMode(ISession session, bool existingTransaction) 
+        {
+            if (TemplateFlushMode == TemplateFlushMode.Never) 
+            {
+                if (existingTransaction) 
+                {
+                    FlushMode previousFlushMode = session.FlushMode;
+                    if (previousFlushMode != FlushMode.Never) 
+                    {
+                        session.FlushMode = FlushMode.Never;
+                        return new FlushModeHolder(previousFlushMode);
+                    }
+                }
+                else 
+                {
+                    session.FlushMode = FlushMode.Never;
+                }
+            }
+            else if (TemplateFlushMode == TemplateFlushMode.Eager) 
+            {
+                if (existingTransaction) 
+                {
+                    FlushMode previousFlushMode = session.FlushMode;
+                    if (previousFlushMode != FlushMode.Auto) 
+                    {
+                        session.FlushMode = FlushMode.Auto;
+                        return new FlushModeHolder(previousFlushMode);
+                    }
+                }
+                else 
+                {
+                    // rely on default FlushMode.AUTO
+                }
+            }
+            else if (TemplateFlushMode == TemplateFlushMode.Commit) 
+            {
+                if (existingTransaction) 
+                {
+                    FlushMode previousFlushMode = session.FlushMode;
+                    if (previousFlushMode == FlushMode.Auto) 
+                    {
+                        session.FlushMode = FlushMode.Commit;
+                        return new FlushModeHolder(previousFlushMode);
+                    }
+                }
+                else 
+                {
+                    session.FlushMode = FlushMode.Commit;
+                }
+            }
+            return new FlushModeHolder();
+        }
+
+	
+        /// <summary>
+        ///  Flush the given Hibernate Session if necessary.
+        /// </summary>
+        /// <param name="session">The current Hibernate Session.</param>
+        /// <param name="existingTransaction">if set to <c>true</c> 
+        /// if executing within an existing transaction.</param>
+        protected void FlushIfNecessary(ISession session, bool existingTransaction)
+        {
+            if (TemplateFlushMode == TemplateFlushMode.Eager ||
+                (!existingTransaction && TemplateFlushMode != TemplateFlushMode.Never)) 
+            {
+                log.Debug("Eagerly flushing Hibernate session");
+                session.Flush();
+            }
+        }
+
+        /// <summary>
+        /// Convert the given HibernateException to an appropriate exception from the
+        /// <code>org.springframework.dao</code> hierarchy. Will automatically detect
+        /// wrapped ADO.NET Exceptions and convert them accordingly.
+        /// </summary>
+        /// <param name="ex">HibernateException that occured.</param>
+        /// <returns>
+        /// The corresponding DataAccessException instance
+        /// </returns>
+        /// <remarks>
+        /// The default implementation delegates to SessionFactoryUtils
+        /// and convertAdoAccessException. Can be overridden in subclasses.
+        /// </remarks>
+        public virtual DataAccessException ConvertHibernateAccessException(HibernateException ex)
+        {
+            if (ex is ADOException)
+            {
+                return ConvertAdoAccessException((ADOException) ex);
+            }   
+            return SessionFactoryUtils.ConvertHibernateAccessException(ex);
+        }
+
+        /// <summary>
+        /// Converts the ADO.NET access exception to an appropriate exception from the
+        /// <code>org.springframework.dao</code> hierarchy. Can be overridden in subclasses.
+        /// </summary>
+        /// <param name="ex">ADOException that occured, wrapping underlying ADO.NET exception.</param>
+        /// <returns>
+        /// the corresponding DataAccessException instance
+        /// </returns>
+        protected virtual DataAccessException ConvertAdoAccessException(ADOException ex) 
+        {
+
+            string sqlString = (ex.SqlString != null)
+                ? ex.SqlString.ToString()
+                : string.Empty;
+                return AdoExceptionTranslator.Translate(
+                    "Hibernate operation: " + ex.Message, sqlString, ex.InnerException);            
+
+        }
+
+        /// <summary>
+        /// Converts the ADO.NET access exception to an appropriate exception from the
+        /// <code>org.springframework.dao</code> hierarchy. Can be overridden in subclasses.
+        /// </summary>
+        /// <remarks>
+        /// <note>
+        /// Note that a direct SQLException can just occur when callback code
+        /// performs direct ADO.NET access via <code>ISession.Connection()</code>.
+        /// </note>
+        /// </remarks>
+        /// <param name="ex">The ADO.NET exception.</param>
+        /// <returns>The corresponding DataAccessException instance</returns>
+        protected virtual DataAccessException ConvertAdoAccessException(Exception ex) 
+        {           
+            return AdoExceptionTranslator.Translate("Hibernate operation", null, ex);
+        }
+
+	    
+        /// <summary>
+        /// Prepare the given IQuery object, applying cache settings and/or
+        /// a transaction timeout.
+        /// </summary>
+        /// <param name="queryObject">The query object to prepare.</param>
+        public virtual void PrepareQuery(IQuery queryObject)
+        {
+            if (CacheQueries)
+            {
+                queryObject.SetCacheable(true);
+                if (QueryCacheRegion != null)
+                {
+                    queryObject.SetCacheRegion(QueryCacheRegion);
+                }
+            }
+                      
+            if (FetchSize > 0)
+            {
+                AbstractQueryImpl queryImpl = queryObject as AbstractQueryImpl;
+                if (queryImpl != null)
+                {
+                    queryImpl.SetFetchSize(FetchSize);
+                }
+                else
+                {
+                    log.Warn("Could not set FetchSize for IQuery.  Expected Implemention to be of type AbstractQueryImpl");
+                }
+            }
+            
+            if (MaxResults > 0)
+            {
+                queryObject.SetMaxResults(MaxResults);
+            }
+
+            SessionFactoryUtils.ApplyTransactionTimeout(queryObject, SessionFactory);
+
+        }
+
+        /// <summary>
+        /// Apply the given name parameter to the given Query object.
+        /// </summary>
+        /// <param name="queryObject">The query object.</param>
+        /// <param name="paramName">Name of the parameter</param>
+        /// <param name="value">The value of the parameter</param>
+        /// <param name="type">The NHibernate type of the parameter (or <code>null</code> if none specified)</param>
+        public virtual void ApplyNamedParameterToQuery(IQuery queryObject, string paramName, object value, IType type)
+        {
+
+            if (value is ICollection)
+            {
+                if (type != null)
+                {
+                    queryObject.SetParameterList(paramName, (ICollection)value, type);
+                }
+                else
+                {
+                    queryObject.SetParameterList(paramName, (ICollection)value);
+                }
+            }
+            else if (value is Object[])
+            {
+
+                //TODO investigate support for this conversion.
+                if (type != null)
+                {
+                    queryObject.SetParameterList(paramName, (Object[])value, type);
+                }
+                else
+                {
+                    queryObject.SetParameterList(paramName, (Object[])value);
+                }
+            }
+            else
+            {
+                if (type != null)
+                {
+                    queryObject.SetParameter(paramName, value, type);
+                }
+                else
+                {
+                    queryObject.SetParameter(paramName, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Prepare the given Criteria object, applying cache settings and/or
+        /// a transaction timeout.
+        /// </summary>
+        /// <remarks>
+        /// <para>Note that for NHibernate 1.2 this only works if the
+        /// implementation is of the type CriteriaImpl, which should generally
+        /// be the case.  The SetFetchSize method is not available on the
+        /// ICriteria interface
+        /// </para>
+        /// <para>This is a no-op for NHibernate 1.0.x since
+        /// the SetFetchSize method is not on the ICriteria interface and
+        /// the implementation class is has internal access.
+        /// </para>
+        /// <para>To remove the method completely for Spring's NHibernate 1.0 
+        /// support while reusing code for NHibernate 1.2 would not be 
+        /// possible.  So now this ineffectual operation is left in tact for
+        /// NHibernate 1.0.2 support.</para>
+        /// </remarks>
+        /// <param name="criteria">The criteria object to prepare</param>
+        public void PrepareCriteria(ICriteria criteria)
+        {
+            if (CacheQueries)
+            {
+                criteria.SetCacheable(true);
+                if (QueryCacheRegion != null)
+                {
+                    criteria.SetCacheRegion(QueryCacheRegion);
+                }
+            }
+
+
+
+            if (FetchSize > 0)
+            {
+                //TODO see if we can optimize performance.
+                //CriteriaImpl is internal in NH 1.0.x
+                object[] args = new object[] { FetchSize };
+                try
+                {
+                    Type t = TypeResolutionUtils.ResolveType("NHibernate.Impl.CriteriaImpl, NHibernate");
+                    if (t != null)
+                    {
+                        t.InvokeMember("SetFetchSize", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance
+                                                       | BindingFlags.InvokeMethod,
+                                       null, criteria, args);
+                    }
+                }
+                catch (TypeLoadException e)
+                {
+                    log.Warn("Can't set FetchSize for ICriteria", e);
+                }
+            }
+            
+            if (MaxResults > 0)
+            {
+                criteria.SetMaxResults(MaxResults);
+            }
+
+            SessionFactoryUtils.ApplyTransactionTimeout(criteria, SessionFactory);
+        }
+	    
+	    private void InitCriteriaType()
+	    {
+	                    
+            try
+            {
+                criteriaType = TypeResolutionUtils.ResolveType("Hibernate.Impl.CriteriaImpl, NHibernate");
+            }
+            catch (TypeLoadException e)
+            {
+                log.Warn("CriteriaImpl not available. FetchSize can not be set on ICriteria objects", e);
+            }
+	    }
+	    
+		#endregion
+
+        /// <summary>
+        /// Ensure SessionFactory is not null
+        /// </summary>
+        /// <exception cref="ArgumentException">If SessionFactory property is null.</exception>
+	    public virtual void AfterPropertiesSet()
+	    {
+            if (SessionFactory == null) 
+            {
+                throw new ArgumentException("sessionFactory is required");
+            }
+	    }
+
+        #region Helper Classes
+        /// <summary>
+        /// Helper class to determine if the FlushMode enumeration
+        /// was changed from its default value
+        /// </summary>
+        protected class FlushModeHolder
+        {
+            /// <summary>
+            /// Gets or sets a value indicating whether the FlushMode
+            /// property was set..
+            /// </summary>
+            /// <value><c>true</c> if FlushMode was set; otherwise, <c>false</c>.</value>
+            public bool ModeWasSet
+            {
+                get { return modeWasSet; }
+                set { modeWasSet = value; }
+            }
+
+            /// <summary>
+            /// Gets or sets the FlushMode.
+            /// </summary>
+            /// <value>The FlushMode.</value>
+            public FlushMode Mode
+            {
+                get { return flushMode; }
+                set { flushMode = value; }
+            }
+
+            private bool modeWasSet = false;
+            private FlushMode flushMode;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="FlushModeHolder"/> class.
+            /// </summary>
+            public FlushModeHolder()
+            {                
+            }
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="FlushModeHolder"/> class.
+            /// </summary>
+            /// <param name="mode">The flush mode.</param>
+            public FlushModeHolder(FlushMode mode)
+            {
+                Mode = mode;
+                ModeWasSet = true;
+            }
+
+        }
+	    
+
+        #endregion
+	    
+
+	}
+
+    internal class CloseSuppressingMethodInterceptor : IMethodInterceptor
+    {
+        private HibernateAccessor hibernateAccessor;
+
+        public CloseSuppressingMethodInterceptor(HibernateAccessor accessor)
+        {
+            hibernateAccessor = accessor;
+        }
+
+        public object Invoke(IMethodInvocation invocation)
+        {
+            //anything special for equals/hashcode?
+            if (invocation.Method.Name.Equals("Close"))
+            {
+                return null;
+            }
+            else
+            {
+                object retValue = invocation.Proceed();
+                if (retValue is IQuery)
+                {
+                    hibernateAccessor.PrepareQuery((IQuery)retValue);
+                }
+                if (retValue is ICriteria)
+                {
+                    hibernateAccessor.PrepareCriteria((ICriteria)retValue);
+                }
+                return retValue;
+            }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateOptimisticLockingFailureException.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateOptimisticLockingFailureException.cs
new file mode 100644
index 00000000..a196d416
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateOptimisticLockingFailureException.cs
@@ -0,0 +1,99 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using NHibernate;
+using Spring.Dao;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+    /// <summary>
+    /// Hibernate-specific subclass of ObjectOptimisticLockingFailureException.
+    /// </summary>
+    /// <remarks>
+    /// Converts Hibernate's StaleObjectStateException.
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: HibernateOptimisticLockingFailureException.cs,v 1.1 2008/04/08 20:26:30 markpollack Exp $</version>
+    [Serializable]
+    public class HibernateOptimisticLockingFailureException : ObjectOptimisticLockingFailureException
+    {
+        #region Fields
+
+        #endregion
+
+        #region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateOptimisticLockingFailureException"/> class.
+        /// </summary>
+        public HibernateOptimisticLockingFailureException()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateOptimisticLockingFailureException"/> class.
+        /// </summary>
+        /// <param name="ex">The StaleObjectStateException.</param>
+        public HibernateOptimisticLockingFailureException(StaleObjectStateException ex) : base(ex.PersistentType, ex.Identifier, ex.Message, ex)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HibernateOptimisticLockingFailureException"/> class.
+        /// </summary>
+        /// <param name="ex">The StaleStateException.</param>
+        public HibernateOptimisticLockingFailureException(StaleStateException ex) : base(ex.Message, ex)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="HibernateOptimisticLockingFailureException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected HibernateOptimisticLockingFailureException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+
+        #endregion
+
+        #region Properties
+
+        #endregion
+
+        #region Methods
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs
new file mode 100644
index 00000000..e3232651
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs
@@ -0,0 +1,420 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+using System.Data;
+using Common.Logging;
+using NHibernate;
+using NHibernate.Cfg;
+using NHibernate.Connection;
+using Spring.Core.IO;
+using Spring.Data.Common;
+using Spring.Objects.Factory;
+using Environment = NHibernate.Cfg.Environment;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	///  An IFactoryObject that creates a local Hibernate SessionFactory instance.
+    /// Behaves like a SessionFactory instance when used as bean reference,
+    /// e.g. for HibernateTemplate's "SessionFactory" property.
+	/// </summary>
+	/// <remarks>
+	/// The typical usage will be to register this as singleton factory
+	/// in an application context and give objects references to application services
+	/// that need it.
+	/// <para>
+	/// Hibernate configuration settings can be set using the IDictionary property 'HibernateProperties'.
+	///
+	/// </para>
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: LocalSessionFactoryObject.cs,v 1.11 2008/03/21 14:12:08 markpollack Exp $</version>
+	public class LocalSessionFactoryObject : IFactoryObject, IInitializingObject, System.IDisposable
+	{
+		#region Fields
+
+        private Configuration configuration;
+
+	    private ISessionFactory sessionFactory;
+
+        private string[] mappingAssemblies;
+
+        private string[] mappingResources;
+
+	    private string[] configFilenames;
+
+        /// <summary>
+        /// TODO: consider changing to NamevalueCollection for easier
+        /// cut-n-paste from existing App.config based configurations.
+        /// </summary>
+        private IDictionary hibernateProperties;
+
+        private IDbProvider dbProvider;
+
+	    private bool exposeTransactionAwareSessionFactory = false;
+
+		#endregion
+
+		#region Constants
+
+		/// <summary>
+		/// The shared <see cref="ILog"/> instance for this class (and derived classes).
+		/// </summary>
+		protected static readonly ILog log =
+			LogManager.GetLogger(typeof (LocalSessionFactoryObject));
+
+
+
+	    #endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="LocalSessionFactoryObject"/> class.
+        /// </summary>
+		public LocalSessionFactoryObject()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Sets the assemblies to load that contain mapping files.
+        /// </summary>
+        /// <value>The mapping assemblies.</value>
+	    public string[] MappingAssemblies
+	    {
+	        set { mappingAssemblies = value; }
+	    }
+
+        /// <summary>
+        /// Sets the hibernate configuration files to load, i.e. hibernate.cfg.xml.
+        /// </summary>
+	    public string[] ConfigFilenames
+	    {
+	        set { configFilenames = value; }
+	    }
+
+	    /// <summary>
+        /// Sets the locations of Spring IResources that contain mapping
+        /// files.
+        /// </summary>
+        /// <value>The location of mapping resources.</value>
+	    public string[] MappingResources
+	    {
+	        set { mappingResources = value;}
+	    }
+
+        /// <summary>
+        /// Return the Configuration object used to build the SessionFactory.
+        /// Allows access to configuration metadata stored there (rarely needed).
+        /// </summary>
+        /// <value>The hibernate configuration.</value>
+	    public Configuration Configuration
+	    {
+	        get { return configuration; }
+	    }
+
+        /// <summary>
+        /// Set NHibernate configuration properties, like "hibernate.dialect".
+        /// </summary>
+        /// <value>The hibernate properties.</value>
+        /// <remarks>
+        /// 	<p>Can be used to override values in a NHibernate XML config file,
+        /// or to specify all necessary properties locally.
+        /// </p>
+        /// 	<p>Note: Do not specify a transaction provider here when using
+        /// Spring-driven transactions. It is also advisable to omit connection
+        /// provider settings and use a Spring-set IDbProvider instead.
+        /// </p>
+        /// </remarks>
+	    public IDictionary HibernateProperties
+	    {
+	        get
+	        {
+	            if (hibernateProperties == null)
+	            {
+	                hibernateProperties = new Hashtable();
+	            }
+                return hibernateProperties;
+	        }
+	        set
+	        {
+	            hibernateProperties = value;
+	        }
+	    }
+
+        /// <summary>
+        /// Get or set the DataSource to be used by the SessionFactory.
+        /// </summary>
+        /// <value>The db provider.</value>
+        /// <remarks>
+        /// If set, this will override corresponding settings in Hibernate properties.
+        /// <note>Note: If this is set, the Hibernate settings should not define
+        /// a connection string
+        /// (hibernate.connection.connection_string) to avoid meaningless double configuration.
+        /// </note>
+        /// </remarks>
+	    public IDbProvider DbProvider
+	    {
+	        set { dbProvider = value; }
+            get { return dbProvider; }
+	    }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to expose a transaction aware session factory.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if want to expose transaction aware session factory; otherwise, <c>false</c>.
+        /// </value>
+	    public bool ExposeTransactionAwareSessionFactory
+	    {
+	        set { exposeTransactionAwareSessionFactory = value; }
+            get { return exposeTransactionAwareSessionFactory; }
+	    }
+
+	    #endregion
+
+		#region Methods
+
+		#endregion
+
+        /// <summary>
+        /// Return the singleon session factory.
+        /// </summary>
+        /// <returns>The singleon session factory.</returns>
+	    public object GetObject()
+	    {
+	        return sessionFactory;
+	    }
+
+        /// <summary>
+        /// Return the type <see cref="ISessionFactory"/> or subclass.
+        /// </summary>
+        /// <value>The type created by this factory</value>
+	    public System.Type ObjectType
+	    {
+	        get
+	        {
+                return (sessionFactory != null) ? sessionFactory.GetType() : typeof(ISessionFactory);
+	        }
+	    }
+
+        /// <summary>
+        /// Returns true
+        /// </summary>
+        /// <value>true</value>
+	    public bool IsSingleton
+	    {
+            get
+            {
+                return true;
+            }
+	    }
+
+        /// <summary>
+        /// Initialize the SessionFactory for the given or the
+        /// default location.
+        /// </summary>
+	    public virtual void AfterPropertiesSet()
+	    {
+            // Create Configuration instance.
+            Configuration config = NewConfiguration();
+
+
+            if (this.dbProvider != null)
+            {
+                config.SetProperty(Environment.ConnectionString,
+                                   dbProvider.ConnectionString);
+                config.SetProperty(Environment.ConnectionProvider, typeof(DbProviderWrapper).AssemblyQualifiedName);
+
+            }
+
+            if (ExposeTransactionAwareSessionFactory)
+            {
+                // Set ICurrentSessionContext implementation,
+                // providng the Spring-managed ISession s current Session.
+                // Can be overridden by a custom value for the corresponding Hibernate property
+                config.SetProperty(Environment.CurrentSessionContextClass,
+                                   "Spring.Data.NHibernate.SpringSessionContext, Spring.Data.NHibernate12");
+            }
+
+            if (this.hibernateProperties != null)
+            {
+                if (config.GetProperty(Environment.ConnectionProvider) !=null &&
+                    hibernateProperties.Contains(Environment.ConnectionProvider))
+                {
+                    #region Logging
+                    if (log.IsWarnEnabled)
+                    {
+                        log.Warn("Overriding use of Spring's Hibernate Connection Provider with [" +
+                                 hibernateProperties[Environment.ConnectionProvider] + "]");
+                    }
+                    #endregion 
+                    config.Properties.Remove(Environment.ConnectionProvider);
+                }
+                config.AddProperties(hibernateProperties);
+            }
+            if (this.mappingAssemblies != null)
+            {
+                foreach (string assemblyName in mappingAssemblies)
+                {
+                    config.AddAssembly(assemblyName);
+                }
+            }
+
+            IResourceLoader resourceLoader = new ConfigurableResourceLoader();
+
+            if (this.mappingResources != null)
+            {
+                foreach (string resourceName in mappingResources)
+                {
+                    config.AddInputStream(resourceLoader.GetResource(resourceName).InputStream);
+                }
+            }
+
+            if (configFilenames != null)
+            {
+                foreach (string configFilename in configFilenames)
+                {
+                    config.Configure(configFilename);
+                }
+            }
+
+            // Perform custom post-processing in subclasses.
+            PostProcessConfiguration(config);
+
+            // Build SessionFactory instance.
+            log.Info("Building new Hibernate SessionFactory");
+            this.configuration = config;
+            this.sessionFactory = NewSessionFactory(config);
+
+
+	    }
+
+	    /// <summary>
+        /// Close the SessionFactory on application context shutdown.
+        /// </summary>
+	    public void Dispose()
+	    {
+            if (sessionFactory != null)
+            {
+                #region Instrumentation
+                if (log.IsInfoEnabled)
+                {
+                    log.Info("Closing Hibernate SessionFactory");
+                }  
+                #endregion                  
+                sessionFactory.Close();
+            }
+
+	    }
+
+        /// <summary>
+        /// Subclasses can override this method to perform custom initialization
+        /// of the Configuration instance used for ISessionFactory creation.
+        /// </summary>
+        /// <remarks>
+        /// The properties of this LocalSessionFactoryObject will be applied to
+        /// the Configuration object that gets returned here.
+        /// <p>The default implementation creates a new Configuration instance.
+        /// A custom implementation could prepare the instance in a specific way,
+        /// or use a custom Configuration subclass.
+        /// </p>
+        /// </remarks>
+        /// <returns>The configuration instance.</returns>
+        protected virtual Configuration NewConfiguration()
+        {
+            return new Configuration();
+        }
+
+        /// <summary>
+        /// To be implemented by subclasses that want to to perform custom
+        /// post-processing of the Configuration object after this FactoryObject
+        /// performed its default initialization.
+        /// </summary>
+        /// <param name="config">The current configuration object.</param>
+        protected virtual void PostProcessConfiguration(Configuration config)
+        {
+        }
+
+        /// <summary>
+        /// Subclasses can override this method to perform custom initialization
+        /// of the SessionFactory instance, creating it via the given Configuration
+        /// object that got prepared by this LocalSessionFactoryObject.
+        /// </summary>
+        /// <remarks>
+        /// <p>The default implementation invokes Configuration's BuildSessionFactory.
+        /// A custom implementation could prepare the instance in a specific way,
+        /// or use a custom ISessionFactory subclass.
+        /// </p>
+        /// </remarks>
+        /// <returns>The ISessionFactory instance.</returns>
+        protected virtual ISessionFactory NewSessionFactory(Configuration config)
+        {
+            ISessionFactory sf = config.BuildSessionFactory();
+            DbProviderWrapper dbProviderWrapper = sf.ConnectionProvider as DbProviderWrapper;
+            if (dbProviderWrapper != null)
+            {
+                dbProviderWrapper.DbProvider = dbProvider;
+            }
+            return sf;
+        }
+
+        #region DbProviderWrapper Helper class
+
+        internal class DbProviderWrapper : ConnectionProvider
+        {
+            private IDbProvider _dbProvider;
+
+            public DbProviderWrapper()
+            {
+            }
+
+            public IDbProvider DbProvider
+            {
+                get { return _dbProvider; }
+                set { _dbProvider = value; }
+            }
+
+            public override void CloseConnection(IDbConnection conn)
+            {
+                base.CloseConnection(conn);
+                conn.Dispose();
+            }
+
+            public override IDbConnection GetConnection()
+            {
+                IDbConnection dbCon = _dbProvider.CreateConnection();
+                dbCon.Open();
+                return dbCon;
+            }
+        }
+
+        #endregion // DbProviderWrapper Helper class
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SessionFactoryUtils.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SessionFactoryUtils.cs
new file mode 100644
index 00000000..9361bbb4
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SessionFactoryUtils.cs
@@ -0,0 +1,718 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Common.Logging;
+using NHibernate;
+using NHibernate.Connection;
+using NHibernate.Driver;
+using NHibernate.Engine;
+using Spring.Collections;
+using Spring.Context;
+using Spring.Dao;
+using Spring.Data.Common;
+using Spring.Data.Support;
+using Spring.Objects.Factory.Config;
+using Spring.Threading;
+using Spring.Transaction.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	///  Helper class featuring methods for Hibernate Session handling,
+    ///  allowing for reuse of Hibernate Session instances within transactions.
+    ///  Also provides support for exception translation.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: SessionFactoryUtils.cs,v 1.1 2008/04/08 20:26:30 markpollack Exp $</version>
+	public abstract class SessionFactoryUtils 
+	{
+		#region Fields
+
+        /// <summary>
+        /// The <see cref="ILog"/> instance for this class. 
+        /// </summary>
+        private static readonly ILog log = LogManager.GetLogger(typeof(SessionFactoryUtils));
+
+		#endregion
+
+		#region Constants
+
+        /// <summary>
+        /// The ordering value for synchronizaiton this session resources.
+        /// Set to be lower than ADO.NET synchronization.
+        /// </summary>
+        public static readonly int SESSION_SYNCHRONIZATION_ORDER =
+            AdoUtils.CONNECTION_SYNCHRONIZATION_ORDER - 100;
+
+        private static readonly string DeferredCloseHolderDataSlotName = "Spring.Data.NHibernate:deferredCloseHolder";
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SessionFactoryUtils"/> class.
+        /// </summary>
+		public SessionFactoryUtils()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+
+        /// <summary>
+        /// Get a new Hibernate Session from the given SessionFactory.
+        /// Will return a new Session even if there already is a pre-bound
+        /// Session for the given SessionFactory.
+        /// </summary>
+        /// <remarks>
+        /// Within a transaction, this method will create a new Session
+        /// that shares the transaction's ADO.NET Connection. More specifically,
+        /// it will use the same ADO.NET Connection as the pre-bound Hibernate Session.
+        /// </remarks>
+        /// <param name="sessionFactory">The session factory to create the session with.</param>
+        /// <param name="interceptor">The Hibernate entity interceptor, or <code>null</code> if none.</param>
+        /// <returns>The new session.</returns>
+        /// <exception cref="DataAccessResourceFailureException">If could not open Hibernate session</exception>
+	    public static ISession GetNewSession(ISessionFactory sessionFactory, IInterceptor interceptor)
+	    {
+            try 
+            {
+                SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.GetResource(sessionFactory);
+                if (sessionHolder != null && !sessionHolder.IsEmpty) 
+                {
+                    if (interceptor != null) 
+                    {
+                        return sessionFactory.OpenSession(sessionHolder.AnySession.Connection, interceptor);
+                    }
+                    else 
+                    {
+                        return sessionFactory.OpenSession(sessionHolder.AnySession.Connection);
+                    }
+                }
+                else 
+                {
+                    if (interceptor != null) 
+                    {
+                        return sessionFactory.OpenSession(interceptor);
+                    }
+                    else 
+                    {
+                        return sessionFactory.OpenSession();
+                    }
+                }
+            }
+            catch (HibernateException ex) 
+            {
+                throw new DataAccessResourceFailureException("Could not open Hibernate Session", ex);
+            }
+	    }
+
+        /// <summary>
+        /// Get a Hibernate Session for the given SessionFactory. Is aware of and will
+        /// return any existing corresponding Session bound to the current thread, for
+        /// example when using HibernateTransactionManager. Will always create a new
+        /// Session otherwise.
+        /// </summary>
+        /// <remarks>
+        /// Supports setting a Session-level Hibernate entity interceptor that allows
+        /// to inspect and change property values before writing to and reading from the
+        /// database. Such an interceptor can also be set at the SessionFactory level
+        /// (i.e. on LocalSessionFactoryObject), on HibernateTransactionManager, or on
+        /// HibernateInterceptor/HibernateTemplate.
+        /// </remarks>
+        /// <param name="sessionFactory">The session factory to create the
+        /// session with.</param>
+        /// <param name="entityInterceptor">Hibernate entity interceptor, or <code>null</code> if none.</param>
+        /// <param name="adoExceptionTranslator"> AdoExceptionTranslator to use for flushing the
+        /// Session on transaction synchronization (can be <code>null</code>; only used when actually
+        /// registering a transaction synchronization).</param>
+        /// <returns>The Hibernate Session</returns>
+        /// <exception cref="DataAccessResourceFailureException">
+        /// If the session couldn't be created.
+        /// </exception>
+        /// <exception cref="InvalidOperationException">
+        /// If no thread-bound Session found and allowCreate is false.
+        /// </exception>
+        public static ISession GetSession(
+            ISessionFactory sessionFactory, IInterceptor entityInterceptor,
+            IAdoExceptionTranslator adoExceptionTranslator)
+        {
+            try
+            {
+                return GetSession(sessionFactory, entityInterceptor, adoExceptionTranslator, true);
+            }
+            catch (HibernateException ex)
+            {
+                throw new DataAccessResourceFailureException("Could not open Hibernate Session", ex);
+            }
+        }   
+
+        /// <summary>
+        /// Get a Hibernate Session for the given SessionFactory. Is aware of and will
+        /// return any existing corresponding Session bound to the current thread, for
+        /// example when using <see cref="HibernateTransactionManager"/>. Will create a new Session
+        /// otherwise, if allowCreate is true.
+        /// </summary>
+        /// <param name="sessionFactory">The session factory to create the session with.</param>
+        /// <param name="allowCreate">if set to <c>true</c> create a non-transactional Session when no
+        /// transactional Session can be found for the current thread.</param>
+        /// <returns>The hibernate session</returns>
+        /// <exception cref="DataAccessResourceFailureException">
+        /// If the session couldn't be created.
+        /// </exception>
+        /// <exception cref="InvalidOperationException">
+        /// If no thread-bound Session found and allowCreate is false.
+        /// </exception>
+        public static ISession GetSession(ISessionFactory sessionFactory, bool allowCreate)
+        {
+            try
+            {
+                return GetSession(sessionFactory, null, null, allowCreate);
+            }
+            catch (HibernateException ex)
+            {
+                throw new DataAccessResourceFailureException("Could not open Hibernate Session", ex);
+            }
+        }
+
+        /// <summary>
+        /// Get a Hibernate Session for the given SessionFactory.
+        /// </summary>
+        /// <remarks>Is aware of and will return any existing corresponding
+        /// Session bound to the current thread, for example whenusing
+        /// <see cref="HibernateTransactionManager"/>.  Will create a new 
+        /// Session otherwise, if "allowCreate" is true.
+        /// <p>Throws the orginal HibernateException, in contrast to
+        /// <see cref="GetSession(ISessionFactory, bool)"/>.
+        /// </p></remarks>
+        /// <param name="sessionFactory">The session factory.</param>
+        /// <param name="allowCreate">if set to <c>true</c> [allow create].</param>
+        /// <returns>The Hibernate Session</returns>
+        /// <exception cref="HibernateException">
+        /// if the Session couldn't be created
+        /// </exception>
+        /// <exception cref="InvalidOperationException">
+        /// If no thread-bound Session found and allowCreate is false.
+        /// </exception>
+        public static ISession DoGetSession(ISessionFactory sessionFactory, bool allowCreate)
+        {
+            return DoGetSession(sessionFactory, null, null, allowCreate);
+        }
+
+        private static ISession GetSession(
+            ISessionFactory sessionFactory, IInterceptor entityInterceptor,
+            IAdoExceptionTranslator adoExceptionTranslator, bool allowCreate)
+        {
+            try
+            {
+                return DoGetSession(sessionFactory, entityInterceptor, adoExceptionTranslator, allowCreate);
+            }
+            catch (HibernateException ex)
+            {
+                throw new DataAccessResourceFailureException("Could not open Hibernate Session", ex);
+            }
+        }
+
+
+        private static ISession DoGetSession(
+            ISessionFactory sessionFactory, IInterceptor entityInterceptor,
+            IAdoExceptionTranslator adoExceptionTranslator, bool allowCreate)
+        {
+            AssertUtils.ArgumentNotNull(sessionFactory, "sessionFactory", "SessionFactory can not be null");
+
+            SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.GetResource(sessionFactory);
+            if (sessionHolder != null && !sessionHolder.IsEmpty) 
+            {
+                // pre-bound Hibernate Session
+                ISession session = null;
+                if (TransactionSynchronizationManager.SynchronizationActive &&
+                    sessionHolder.DoesNotHoldNonDefaultSession)
+                {
+                    // Spring transaction management is active ->
+                    // register pre-bound Session with it for transactional flushing.
+                    session = sessionHolder.ValidatedSession;
+                    if (!sessionHolder.SynchronizedWithTransaction) 
+                    {
+                        log.Debug("Registering Spring transaction synchronization for existing Hibernate Session");
+                        TransactionSynchronizationManager.RegisterSynchronization(
+                            new SpringSessionSynchronization(sessionHolder, sessionFactory, adoExceptionTranslator, false));
+                        sessionHolder.SynchronizedWithTransaction = true;
+                        // Switch to FlushMode.AUTO if we're not within a read-only transaction.
+                        FlushMode flushMode = session.FlushMode;
+                        if (FlushMode.Never == flushMode &&
+                            !TransactionSynchronizationManager.CurrentTransactionReadOnly) 
+                        {
+                            session.FlushMode = FlushMode.Auto;
+                            sessionHolder.PreviousFlushMode = flushMode;
+                        }
+                    }
+                }
+                else
+                {
+                   // No Spring transaction management active -> simply return default thread-bound Session, if any
+                   // (possibly from OpenSessionInViewModule)
+                    session = sessionHolder.ValidatedSession;
+                }
+                
+                if (session != null) 
+                {
+                    return session;
+                }
+                
+            }
+
+
+            ISession sess = OpenSession(sessionFactory, entityInterceptor);
+            // Set Session to FlushMode.Never if we're within a read-only transaction.
+            // Use same Session for further Hibernate actions within the transaction.
+            // Thread object will get removed by synchronization at transaction completion.
+            if (TransactionSynchronizationManager.SynchronizationActive) 
+            {
+                log.Debug("Registering Spring transaction synchronization for new Hibernate Session");
+                SessionHolder holderToUse = sessionHolder;
+                if (holderToUse == null) 
+                {
+                    holderToUse = new SessionHolder(sess);
+                }
+                else 
+                {
+                    holderToUse.AddSession(sess);
+                }
+                if (TransactionSynchronizationManager.CurrentTransactionReadOnly) 
+                {
+                    sess.FlushMode = FlushMode.Never;
+                }
+                TransactionSynchronizationManager.RegisterSynchronization(
+                    new SpringSessionSynchronization(holderToUse, sessionFactory, adoExceptionTranslator, true));
+                holderToUse.SynchronizedWithTransaction = true;
+                if (holderToUse != sessionHolder) 
+                {
+                    TransactionSynchronizationManager.BindResource(sessionFactory, holderToUse);
+                }
+            }
+
+            
+
+            // Check whether we are allowed to return the Session.
+            if (!allowCreate && !IsSessionTransactional(sess, sessionFactory)) 
+            {
+                CloseSession(sess);
+                throw new InvalidOperationException ("No Hibernate Session bound to thread, " +
+                    "and configuration does not allow creation of non-transactional one here");
+            }
+
+            return sess;
+
+
+        }
+
+	    /// <summary>
+	    /// Open a new Session from the factory.
+	    /// </summary>
+        /// <param name="sessionFactory">The session factory to create the session with.</param>
+        /// <param name="entityInterceptor">Hibernate entity interceptor, or <code>null</code> if none.</param>
+        /// <returns>the newly opened session</returns>
+        internal static ISession OpenSession(ISessionFactory sessionFactory, IInterceptor entityInterceptor)
+        {
+            log.Debug("Opening Hibernate Session");
+            ISession session = (
+                                   (entityInterceptor != null)
+                                   ? sessionFactory.OpenSession(entityInterceptor) 
+                                   : sessionFactory.OpenSession()
+                               );
+
+            return session;
+        }	         
+   
+        /// <summary>
+        /// Perform the actual closing of the Hibernate Session
+        /// catching and logging any cleanup exceptions thrown.
+        /// </summary>
+        /// <param name="session">The hibernate session to close</param>
+        public static void CloseSession(ISession session) 
+        {
+            if (session != null) 
+            {
+                log.Debug("Closing Hibernate Session");
+                try 
+                {
+                    session.Close();
+                }
+                catch (HibernateException ex) 
+                {
+                    log.Error("Could not close Hibernate Session", ex);
+                }
+                catch (Exception ex) 
+                {
+                    log.Error("Unexpected exception on closing Hibernate Session", ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Return whether the given Hibernate Session is transactional, that is,
+        /// bound to the current thread by Spring's transaction facilities.
+        /// </summary>
+        /// <param name="session">The hibernate session to check</param>
+        /// <param name="sessionFactory">The session factory that the session
+        /// was created with, can be null.</param>
+        /// <returns>
+        /// 	<c>true</c> if the session transactional; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool IsSessionTransactional(ISession session, ISessionFactory sessionFactory) 
+        {
+            if (sessionFactory == null) 
+            {
+                return false;
+            }
+            SessionHolder sessionHolder =
+                (SessionHolder) TransactionSynchronizationManager.GetResource(sessionFactory);
+            return (sessionHolder != null && sessionHolder.ContainsSession(session));
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Convert the given HibernateException to an appropriate exception from the
+        /// <code>Spring.Dao</code> hierarchy. Note that it is advisable to
+        /// handle AdoException specifically by using a AdoExceptionTranslator for the
+        /// underlying ADO.NET exception.
+        /// </summary>
+        /// <param name="ex">The Hibernate exception that occured.</param>
+        /// <returns>DataAccessException instance</returns>
+        public static DataAccessException ConvertHibernateAccessException(HibernateException ex)
+        {
+            if (ex is ADOException)
+            {
+                // ADOException during Hibernate access: only passed in here from custom code,
+                // as HibernateTemplate etc will use AdoExceptionTranslator-based handling.
+                return new HibernateAdoException("Ado Exception", (ADOException) ex);
+            }
+            if (ex is UnresolvableObjectException)
+            {
+                return new HibernateObjectRetrievalFailureException((UnresolvableObjectException) ex);
+            }
+            if (ex is ObjectDeletedException)
+            {
+                return new InvalidDataAccessApiUsageException(ex.Message, ex);
+            }
+            if (ex is WrongClassException)
+            {
+                return new HibernateObjectRetrievalFailureException((WrongClassException) ex);
+            }
+            if (ex is StaleObjectStateException)
+            {
+                return new HibernateOptimisticLockingFailureException((StaleObjectStateException) ex);
+            }
+            if (ex is StaleStateException)
+            {
+                return new HibernateOptimisticLockingFailureException((StaleStateException)ex);
+            }
+            if (ex is QueryException)
+            {
+                return new HibernateQueryException((QueryException) ex);
+            }
+
+            if (ex is PersistentObjectException)
+            {
+                return new InvalidDataAccessApiUsageException(ex.Message, ex);
+            }
+            if (ex is TransientObjectException)
+            {
+                return new InvalidDataAccessApiUsageException(ex.Message, ex);
+            }
+
+            if (ex is PropertyValueException)
+            {
+                return new DataIntegrityViolationException(ex.Message, ex);
+            }
+            if (ex is PersistentObjectException)
+            {
+                return new InvalidDataAccessApiUsageException(ex.Message, ex);
+            }
+            if (ex is NonUniqueResultException)
+            {
+                return new IncorrectResultSizeDataAccessException(ex.Message, 1);
+            }
+            // fallback
+            return new HibernateSystemException(ex);
+        }
+
+        /// <summary>
+        /// Close the given Session, created via the given factory,
+        /// if it is not managed externally (i.e. not bound to the thread).
+        /// </summary>
+        /// <param name="session">The hibernate session to close</param>
+        /// <param name="sessionFactory">The hibernate SessionFactory that
+        /// the session was created with.</param>
+	    public static void ReleaseSession(ISession session, ISessionFactory sessionFactory)
+	    {
+            if (session == null) 
+            {
+                return;
+            }
+            // Only close non-transactional Sessions.
+            if (!IsSessionTransactional(session, sessionFactory)) 
+            {
+                CloseSessionOrRegisterDeferredClose(session, sessionFactory);
+            }
+	    }
+
+        /// <summary>
+        /// Close the given Session or register it for deferred close.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <param name="sessionFactory">The session factory.</param>
+	    internal static void CloseSessionOrRegisterDeferredClose(ISession session, ISessionFactory sessionFactory)
+	    {
+            IDictionary holderDictionary = LogicalThreadContext.GetData(DeferredCloseHolderDataSlotName) as IDictionary;
+            
+            if (holderDictionary != null && sessionFactory != null && holderDictionary.Contains(sessionFactory)) 
+            {
+                log.Debug("Registering Hibernate Session for deferred close");
+                // Switch Session to FlushMode.NEVER for remaining lifetime.
+                session.FlushMode = FlushMode.Never;
+                Set sessions = (Set) holderDictionary[sessionFactory];
+                sessions.Add(session);
+            }
+            else 
+            {
+                CloseSession(session);
+            }
+	    }
+
+        /// <summary>
+	    ///Initialize deferred close for the current thread and the given SessionFactory.
+	    /// Sessions will not be actually closed on close calls then, but rather at a
+	    /// processDeferredClose call at a finishing point (like request completion).
+        /// </summary>
+        /// <param name="sessionFactory">The session factory.</param>
+        public static void InitDeferredClose(ISessionFactory sessionFactory) 
+        {
+            AssertUtils.ArgumentNotNull(sessionFactory, "No SessionFactory specified");
+
+            log.Debug("Initializing deferred close of Hibernate Sessions");
+
+            IDictionary holderDictionary = LogicalThreadContext.GetData(DeferredCloseHolderDataSlotName) as IDictionary;
+          
+            if (holderDictionary == null) 
+            {
+                holderDictionary = new Hashtable();
+                LogicalThreadContext.SetData(DeferredCloseHolderDataSlotName, holderDictionary);
+            }
+            holderDictionary.Add(sessionFactory, new ListSet());
+        }
+
+        /// <summary>
+        /// Return if deferred close is active for the current thread
+        /// and the given SessionFactory.</summary>
+        /// <param name="sessionFactory">The session factory.</param>
+        /// <returns>
+        /// 	<c>true</c> if [is deferred close active] [the specified session factory]; otherwise, <c>false</c>.
+        /// </returns>
+        /// <exception cref="ArgumentNullException">If SessionFactory argument is null.</exception>
+        public static bool IsDeferredCloseActive(ISessionFactory sessionFactory) 
+        {
+            if (sessionFactory == null)
+            {
+                throw new ArgumentNullException("sessionFactory", "No SessionFactory specified");
+            }
+            IDictionary holderDictionary = LogicalThreadContext.GetData(DeferredCloseHolderDataSlotName) as IDictionary;          
+            return (holderDictionary != null && holderDictionary.Contains(sessionFactory));
+        }
+
+        /// <summary>
+        /// Process Sessions that have been registered for deferred close
+        /// for the given SessionFactory.
+        /// </summary>
+        /// <param name="sessionFactory">The session factory.</param>
+        /// <exception cref="InvalidOperationException">If there is no session factory associated with the thread.</exception>
+        public static void ProcessDeferredClose(ISessionFactory sessionFactory) 
+        {
+            AssertUtils.ArgumentNotNull(sessionFactory, "No SessionFactory specified");
+
+            IDictionary holderDictionary = LogicalThreadContext.GetData(DeferredCloseHolderDataSlotName) as IDictionary;
+          
+            if (holderDictionary == null || !holderDictionary.Contains(sessionFactory)) 
+            {
+                throw new InvalidOperationException("Deferred close not active for SessionFactory [" + sessionFactory + "]");
+            }
+            log.Debug("Processing deferred close of Hibernate Sessions");
+            Set sessions = (Set) holderDictionary[sessionFactory];
+            holderDictionary.Remove(sessionFactory);
+            foreach (ISession session in sessions)
+            {
+                CloseSession(session);
+            }
+
+            if (holderDictionary.Count == 0)
+            {
+                LogicalThreadContext.FreeNamedDataSlot(DeferredCloseHolderDataSlotName);
+            }
+
+
+        }
+
+        /// <summary>
+        /// Applies the current transaction timeout, if any, to the given
+        /// criteria object
+        /// </summary>
+        /// <param name="criteria">The Hibernate Criteria object.</param>
+        /// <param name="sessionFactory">Hibernate SessionFactory that the Criteria was created for
+        /// (can be <code>null</code>).</param>
+        /// <exception cref="ArgumentNullException">If criteria argument is null.</exception>
+        public static void ApplyTransactionTimeout(ICriteria criteria, ISessionFactory sessionFactory) 
+        {
+            if (criteria == null)
+            {
+                throw new ArgumentNullException("criteria", "No Criteria object specified");
+            }
+
+            SessionHolder sessionHolder =
+                (SessionHolder) TransactionSynchronizationManager.GetResource(sessionFactory);
+            if (sessionHolder != null && sessionHolder.HasTimeout) 
+            {
+                criteria.SetTimeout(sessionHolder.TimeToLiveInSeconds);
+            }
+        }
+
+        /// <summary>
+        /// Applies the current transaction timeout, if any, to the given
+        /// Hibenrate query object.
+        /// </summary>
+        /// <param name="query">The Hibernate Query object.</param>
+        /// <param name="sessionFactory">Hibernate SessionFactory that the Query was created for
+        /// (can be <code>null</code>).</param>
+        /// <exception cref="ArgumentNullException">If query argument is null.</exception>
+	    public static void ApplyTransactionTimeout(IQuery query, ISessionFactory sessionFactory)
+	    {	        
+            if (query == null)
+            {
+                throw new ArgumentNullException("queryObject", "No query object specified");
+            }
+            if (sessionFactory != null) 
+            {
+                SessionHolder sessionHolder =
+                    (SessionHolder) TransactionSynchronizationManager.GetResource(sessionFactory);
+                if (sessionHolder != null && sessionHolder.HasTimeout) 
+                {
+                    query.SetTimeout(sessionHolder.TimeToLiveInSeconds);
+                }
+            }
+	    }
+        /// <summary>
+        /// Gets the Spring IDbProvider given the ISessionFactory.
+        /// </summary>
+        /// <remarks>The matching is performed by comparing the assembly qualified
+        /// name string of the hibernate Driver.ConnectionType to those in
+        /// the DbProviderFactory definitions.  No connections are created
+        /// in performing this comparison.</remarks>
+        /// <param name="sessionFactory">The session factory.</param>
+        /// <returns>The corresponding IDbProvider, null if no mapping was found.</returns>
+        /// <exception cref="InvalidOperationException">If DbProviderFactory's ApplicaitonContext is not
+        /// an instance of IConfigurableApplicaitonContext.</exception>
+	    public static IDbProvider GetDbProvider(ISessionFactory sessionFactory)
+	    {
+	        ISessionFactoryImplementor sfi = sessionFactory as ISessionFactoryImplementor;
+	        if (sfi != null)
+	        {
+	            
+                ConnectionProvider cp = sfi.ConnectionProvider as ConnectionProvider;
+	            if (cp != null)
+	            {
+                    IConfigurableApplicationContext ctx =
+	                    Spring.Data.Common.DbProviderFactory.ApplicationContext as IConfigurableApplicationContext;
+                    if (ctx == null)
+                    {
+                        throw new InvalidOperationException(
+                            "Implementations of IApplicationContext must also implement IConfigurableApplicationContext");
+                    }
+
+
+                    DriverBase db = cp.Driver as DriverBase;
+                    if (db != null)
+                    {
+                        Type hibCommandType = db.CreateCommand().GetType();
+                        //Type hibConnectionType = cp.Driver.ConnectionType;
+
+                        string[] providerNames = ctx.GetObjectNamesForType(typeof(DbProvider), true, false);
+                        string hibCommandAQN = hibCommandType.AssemblyQualifiedName;
+                        foreach (string providerName in providerNames)
+                        {
+                            IObjectDefinition objectdef = ctx.ObjectFactory.GetObjectDefinition(providerName);
+                            ConstructorArgumentValues ctorArgs = objectdef.ConstructorArgumentValues;
+                            ConstructorArgumentValues.ValueHolder vh = ctorArgs.NamedArgumentValues["dbmetadata"] as ConstructorArgumentValues.ValueHolder;
+                            IObjectDefinition od = vh.Value as IObjectDefinition;
+                            ConstructorArgumentValues dbmdCtorArgs = od.ConstructorArgumentValues;
+                            string commandType = dbmdCtorArgs.GetArgumentValue("commandType", typeof(string)).Value as string;
+                            string assemblyName = dbmdCtorArgs.GetArgumentValue("assemblyName", typeof(string)).Value as string;
+
+
+                            if (hibCommandAQN.Equals(commandType))
+                            {
+                                IDbProvider prov = Spring.Data.Common.DbProviderFactory.GetDbProvider(providerName);
+                                return prov;
+                            }
+                        }
+                    }
+	                else
+                    {
+                        log.Info("Could not derive IDbProvider from SessionFactory");
+                    }
+	            }
+	            
+	            
+	        }
+	        return null;
+	    }
+
+        /// <summary>
+        /// Create a IAdoExceptionTranslator from the given SessionFactory.
+        /// </summary>
+        /// <remarks>If a corresponding IDbProvider is found, a ErrorcodeExceptionTranslator
+        /// for the IDbProvider is created.  Otherwise, a FallbackException is created.</remarks>
+        /// <param name="sessionFactory">The session factory to create the translator for</param>
+        /// <returns>An IAdoExceptionTranslator</returns>
+	    public static IAdoExceptionTranslator NewAdoExceptionTranslator(ISessionFactory sessionFactory)
+	    {
+            IDbProvider dbProvider = GetDbProvider(sessionFactory);
+	        if (dbProvider != null)
+	        {
+                return new ErrorCodeExceptionTranslator(dbProvider);
+	        }
+	        log.Warn("Using FallbackException Translator.  Could not translate from ISessionFactory to IDbProvider");
+            return new FallbackExceptionTranslator();
+	        
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionContext.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionContext.cs
new file mode 100644
index 00000000..c0ab893e
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionContext.cs
@@ -0,0 +1,77 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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 NHibernate;
+using NHibernate.Context;
+using NHibernate.Engine;
+
+namespace Spring.Data.NHibernate
+{
+    /// <summary>
+    /// Implementation of NHibernates 1.2's ICurrentSessionContext interface
+    /// that delegates to Spring's SessionFactoryUtils for providing a
+    /// Spirng-managed current Session.
+    /// </summary>
+    /// <remarks>Used by Spring's LocalSessionFactoryBean if told to expose
+    /// a transaction-aware SessionFactory.
+    /// <p>This ICurrentSessionContext implementation can also be specified in
+    /// custom ISessionFactory setup through the 
+    /// "hibernate.current_session_context_class" property, with the fully
+    /// qualified name of this class as value.</p></remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: SpringSessionContext.cs,v 1.2 2007/09/19 22:58:11 markpollack Exp $</version>
+    /// <see cref="SessionFactoryUtils.DoGetSession(ISessionFactory, bool)"/>
+    public class SpringSessionContext : ICurrentSessionContext
+    {
+        private readonly ISessionFactoryImplementor sessionFactory;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SpringSessionContext"/> class
+        /// </summary>
+        /// <param name="sessionFactory">The NHibernate session factory.</param>
+        public SpringSessionContext(ISessionFactoryImplementor sessionFactory)
+        {
+            this.sessionFactory = sessionFactory;
+        }
+
+        #region ICurrentSessionContext Members
+
+        /// <summary>
+        /// Retrieve the Spring-managed Session for the current thread.
+        /// </summary>
+        /// <returns>Current session associated with the thread</returns>
+        /// <exception cref="HibernateException">On errors retrieving thread bound session.</exception>
+        public ISession CurrentSession()
+        {
+            try
+            {
+                return SessionFactoryUtils.DoGetSession(sessionFactory, false);
+            }
+            catch (InvalidOperationException ex)
+            {
+                throw new HibernateException(ex.Message);
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionSynchronization.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionSynchronization.cs
new file mode 100644
index 00000000..78ca458b
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionSynchronization.cs
@@ -0,0 +1,276 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using Common.Logging;
+using NHibernate;
+using NHibernate.Engine;
+using Spring.Core;
+using Spring.Data.Support;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// NHibnerations actions taken during the transaction lifecycle.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: SpringSessionSynchronization.cs,v 1.1 2007/06/01 02:34:12 markpollack Exp $</version>
+	public class SpringSessionSynchronization : TransactionSynchronizationAdapter, IOrdered
+	{
+		#region Fields
+
+        /// <summary>
+        /// The <see cref="ILog"/> instance for this class. 
+        /// </summary>
+        private readonly ILog log = LogManager.GetLogger(typeof(SpringSessionSynchronization));
+	    
+        private readonly SessionHolder sessionHolder;
+
+        private readonly ISessionFactory sessionFactory;
+
+        private readonly IAdoExceptionTranslator adoExceptionTranslator;
+
+        private readonly bool newSession;
+
+        private bool holderActive = true;
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="SpringSessionSynchronization"/> class.
+        /// </summary>
+        public 	SpringSessionSynchronization(SessionHolder sessionHolder, ISessionFactory sessionFactory,
+               	                             IAdoExceptionTranslator adoExceptionTranslator, bool newSession)
+		{
+            this.sessionHolder = sessionHolder;
+            this.sessionFactory = sessionFactory;
+            this.adoExceptionTranslator = adoExceptionTranslator;
+            this.newSession = newSession;
+		}
+
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Return the order value of this object, where a higher value means greater in
+        /// terms of sorting.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Normally starting with 0 or 1, with <see cref="System.Int32.MaxValue"/> indicating
+        /// greatest. Same order values will result in arbitrary positions for the affected
+        /// objects.
+        /// </p>
+        /// <p>
+        /// Higher value can be interpreted as lower priority, consequently the first object
+        /// has highest priority.
+        /// </p>
+        /// </remarks>
+        /// <returns>The order value.</returns>
+        public int Order
+        {
+            get
+            {
+                return SessionFactoryUtils.SESSION_SYNCHRONIZATION_ORDER;
+            }
+        }
+
+		#endregion
+
+		#region Methods
+
+	    /// <summary>
+	    /// Suspend this synchronization. 
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// Unbind Hibernate resources (SessionHolder) from
+	    /// <see cref="Spring.Transaction.Support.TransactionSynchronizationManager"/>
+	    /// if managing any.
+	    /// </p>
+	    /// </remarks>
+	    public override void Suspend()
+	    {
+            if (this.holderActive) 
+            {
+                TransactionSynchronizationManager.UnbindResource(this.sessionFactory);
+            }
+	    }
+
+	    /// <summary>
+	    /// Resume this synchronization.
+	    /// </summary>
+	    /// <remarks>
+	    /// <p>
+	    /// Rebind Hibernate resources from 
+	    /// <see cref="Spring.Transaction.Support.TransactionSynchronizationManager"/>
+	    /// if managing any.
+	    /// </p>
+	    /// </remarks>
+	    public override void Resume()
+	    {
+            if (this.holderActive) 
+            {
+                TransactionSynchronizationManager.BindResource(this.sessionFactory, this.sessionHolder);
+            }
+	    }
+
+	    /// <summary>
+	    /// Invoked before transaction commit (before
+	    /// <see cref="Spring.Transaction.Support.ITransactionSynchronization.BeforeCompletion"/>)
+	    /// </summary>
+	    /// <param name="readOnly">
+	    /// If the transaction is defined as a read-only transaction.
+	    /// </param>
+	    /// <remarks>
+	    /// <p>
+	    /// Can flush transactional sessions to the database.
+	    /// </p>
+	    /// <p>
+	    /// Note that exceptions will get propagated to the commit caller and 
+	    /// cause a rollback of the transaction.
+	    /// </p>
+	    /// </remarks>
+	    public override void BeforeCommit(bool readOnly)
+	    {
+		    if (!readOnly)
+		    {
+                // read-write transaction -> flush the Hibernate Session
+                log.Debug("Flushing Hibernate Session on transaction synchronization");			
+                ISession session = this.sessionHolder.Session;
+                //Further check: only flush when not FlushMode.NEVER
+                if (session.FlushMode != FlushMode.Never)
+                {
+                    try 
+                    {
+                        session.Flush();
+                        //TODO can throw System.ObjectDisposedException...
+                    }
+                    catch (ADOException ex) 
+                    {
+                        if (this.adoExceptionTranslator != null) 
+                        {
+                            //TODO investigate how ADOException wraps inner exception.
+                            throw this.adoExceptionTranslator.Translate(
+                                "Hibernate transaction synchronization: " + ex.Message, null, ex.InnerException);
+                        }
+                        else 
+                        {
+                            throw new HibernateAdoException("ADO.NET Exception", ex);
+                        }
+                    }
+                    catch (HibernateException ex) 
+                    {
+                        throw SessionFactoryUtils.ConvertHibernateAccessException(ex);
+                    }
+                }
+
+		    }
+	    }
+
+        /// <summary>
+        /// Invoked before transaction commit (before
+        /// <see cref="Spring.Transaction.Support.ITransactionSynchronization.BeforeCompletion"/>)
+        /// Can e.g. flush transactional O/R Mapping sessions to the database
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This callback does not mean that the transaction will actually be
+        /// commited.  A rollback decision can still occur after this method
+        /// has been called.  This callback is rather meant to perform work 
+        /// that's only relevant if a commit still has a chance
+        /// to happen, such as flushing SQL statements to the database.
+        /// </para>
+        /// <para>
+        /// Note that exceptions will get propagated to the commit caller and cause a
+        /// rollback of the transaction.</para>
+        /// <para>
+        /// (note: do not throw TransactionException subclasses here!)
+        /// </para>
+        /// </remarks>
+	    public override void BeforeCompletion()
+	    {
+            if (this.newSession) 
+            {
+                // Default behavior: unbind and close the thread-bound Hibernate Session.
+                TransactionSynchronizationManager.UnbindResource(this.sessionFactory);
+                this.holderActive = false;
+            }
+            else if (this.sessionHolder.AssignedPreviousFlushMode == true) 
+            {
+                // In case of pre-bound Session, restore previous flush mode.
+                this.sessionHolder.Session.FlushMode = (this.sessionHolder.PreviousFlushMode);
+            }
+	    }
+
+	    /// <summary>
+	    /// Invoked after transaction commit/rollback.
+	    /// </summary>
+	    /// <param name="status">
+	    /// Status according to <see cref="Spring.Transaction.Support.TransactionSynchronizationStatus"/>
+	    /// </param>
+	    /// <remarks>
+	    /// Can e.g. perform resource cleanup, in this case after transaction completion.
+	    /// <p>
+	    /// Note that exceptions will get propagated to the commit or rollback
+	    /// caller, although they will not influence the outcome of the transaction.
+	    /// </p>
+	    /// </remarks>
+	    public override void AfterCompletion(TransactionSynchronizationStatus status)
+	    {
+	        if (!newSession)
+	        {
+                ISession session = sessionHolder.Session;
+                
+                // Provide correct transaction status for releasing the Session's cache locks,
+                // if possible. Else, closing will release all cache locks assuming a rollback.
+                ISessionImplementor sessionImplementor = session as ISessionImplementor;
+	            if (sessionImplementor != null)
+	            {
+                    sessionImplementor.AfterTransactionCompletion(status == TransactionSynchronizationStatus.Committed, sessionHolder.Transaction);
+	            }
+
+                if (newSession)
+                {
+                    SessionFactoryUtils.CloseSessionOrRegisterDeferredClose(session, sessionFactory);
+                }	            	            
+	        }
+            if (!newSession && status != TransactionSynchronizationStatus.Committed)
+            {
+                // Clear all pending inserts/updates/deletes in the Session.
+                // Necessary for pre-bound Sessions, to avoid inconsistent state.
+                sessionHolder.Session.Clear();
+            }
+      		
+	        if (this.sessionHolder.DoesNotHoldNonDefaultSession) {
+			  sessionHolder.SynchronizedWithTransaction = false;
+		    }
+
+        }
+
+        #endregion
+
+    }
+}
diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Support/dontdelete.txt b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Support/dontdelete.txt
new file mode 100644
index 00000000..b4472e3f
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Support/dontdelete.txt
@@ -0,0 +1 @@
+sources are linked here from Spring.Data.NHibernate
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2003.csproj b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2003.csproj
new file mode 100644
index 00000000..e65acf0d
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2003.csproj
@@ -0,0 +1,289 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{2E12AE3E-5690-46A5-9F89-80F1D3004ADB}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Data.NHibernate12"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.Data.NHibernate12"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "NHibernate"
+                    AssemblyName = "NHibernate"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\NHibernate.dll"
+                />
+                <Reference
+                    Name = "Castle.DynamicProxy"
+                    AssemblyName = "Castle.DynamicProxy"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\Castle.DynamicProxy.dll"
+                />
+                <Reference
+                    Name = "Iesi.Collections"
+                    AssemblyName = "Iesi.Collections"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\Iesi.Collections.dll"
+                />
+                <Reference
+                    Name = "log4net"
+                    AssemblyName = "log4net"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\log4net.dll"
+                />
+                <Reference
+                    Name = "Spring.Aop.2003"
+                    Project = "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Data.2003"
+                    Project = "{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "HashCodeProvider"
+                    AssemblyName = "HashCodeProvider"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\HashCodeProvider.dll"
+                />
+                <Reference
+                    Name = "System.Web"
+                    AssemblyName = "System.Web"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CommonAssemblyInfo.cs"
+                    Link = "..\CommonAssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateAccessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateAdoException.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\HibernateAdoException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateDelegate.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\HibernateDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateObjectRetrievalFailureException.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\HibernateObjectRetrievalFailureException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateOptimisticLockingFailureException.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\HibernateOptimisticLockingFailureException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateQueryException.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\HibernateQueryException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateSystemException.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\HibernateSystemException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateTemplate.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\HibernateTemplate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\HibernateTransactionManager.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\HibernateTransactionManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\ICommonHibernateOperations.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\ICommonHibernateOperations.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\IHibernateCallback.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\IHibernateCallback.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\IHibernateOperations.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\IHibernateOperations.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\LocalSessionFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\SessionFactoryUtils.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\SessionFactoryUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\SessionHolder.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\SessionHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\SpringSessionContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\SpringSessionSynchronization.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\TemplateFlushMode.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\TemplateFlushMode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\dontdelete.txt"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\HibernateDaoSupport.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\Support\HibernateDaoSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\OpenSessionInViewModule.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\Support\OpenSessionInViewModule.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\SessionScope.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\Support\SessionScope.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\SessionScopeSettings.cs"
+                    Link = "..\Spring.Data.NHibernate\Data\NHibernate\Support\SessionScopeSettings.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2005.csproj b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2005.csproj
new file mode 100644
index 00000000..b97f4698
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.2005.csproj
@@ -0,0 +1,141 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{90F2D070-6F98-4926-A626-BD7A6071D6D9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate12</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate12\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>Spring.Data.NHibernate12.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate12\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate12\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=1.2.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate12\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateAdoException.cs">
+      <Link>Data\NHibernate\HibernateAdoException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateDelegate.cs">
+      <Link>Data\NHibernate\HibernateDelegate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateObjectRetrievalFailureException.cs">
+      <Link>Data\NHibernate\HibernateObjectRetrievalFailureException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateQueryException.cs">
+      <Link>Data\NHibernate\HibernateQueryException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateSystemException.cs">
+      <Link>Data\NHibernate\HibernateSystemException.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateTemplate.cs">
+      <Link>Data\NHibernate\HibernateTemplate.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\HibernateTransactionManager.cs">
+      <Link>Data\NHibernate\HibernateTransactionManager.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\ICommonHibernateOperations.cs">
+      <Link>Data\NHibernate\ICommonHibernateOperations.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\IHibernateCallback.cs">
+      <Link>Data\NHibernate\IHibernateCallback.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\IHibernateOperations.cs">
+      <Link>Data\NHibernate\IHibernateOperations.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\SessionHolder.cs">
+      <Link>Data\NHibernate\SessionHolder.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs">
+      <Link>Data\NHibernate\Support\ConfigSectionSessionScopeSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\HibernateDaoSupport.cs">
+      <Link>Data\NHibernate\Support\HibernateDaoSupport.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\OpenSessionInViewModule.cs">
+      <Link>Data\NHibernate\Support\OpenSessionInViewModule.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\SessionScope.cs">
+      <Link>Data\NHibernate\Support\SessionScope.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\Support\SessionScopeSettings.cs">
+      <Link>Data\NHibernate\Support\SessionScopeSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\Spring.Data.NHibernate\Data\NHibernate\TemplateFlushMode.cs">
+      <Link>Data\NHibernate\TemplateFlushMode.cs</Link>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Data\NHibernate\Generic\FindHibernateDelegate.cs" />
+    <Compile Include="Data\NHibernate\Generic\HibernateDaoSupport.cs" />
+    <Compile Include="Data\NHibernate\Generic\HibernateDelegate.cs" />
+    <Compile Include="Data\NHibernate\Generic\HibernateTemplate.cs" />
+    <Compile Include="Data\NHibernate\Generic\IFindHibernateCallback.cs" />
+    <Compile Include="Data\NHibernate\Generic\IHibernateCallback.cs" />
+    <Compile Include="Data\NHibernate\Generic\IHibernateOperations.cs" />
+    <Compile Include="Data\NHibernate\HibernateAccessor.cs" />
+    <Compile Include="Data\NHibernate\HibernateOptimisticLockingFailureException.cs" />
+    <Compile Include="Data\NHibernate\LocalSessionFactoryObject.cs" />
+    <Compile Include="Data\NHibernate\SessionFactoryUtils.cs" />
+    <Compile Include="Data\NHibernate\SpringSessionContext.cs" />
+    <Compile Include="Data\NHibernate\SpringSessionSynchronization.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2005.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build
new file mode 100644
index 00000000..408cb040
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build
@@ -0,0 +1,47 @@
+<?xml version="1.0" ?>
+<project name="Spring.Data.NHibernate12" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+	<target name="build">
+
+		<!-- build Spring.Data.NHibernate12 -->
+		<csc target="library" define="${current.build.defines.csc}"
+                     warnaserror="true"
+		     debug="${current.build.debug}"
+                     output="${current.bin.dir}/${project::get-name()}.dll"
+                     doc="${current.bin.dir}/${project::get-name()}.xml">
+			<arg line="${compiler.args}"/>
+			<nowarn>
+				<warning number="${nowarn.numbers.test},0169" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../Spring.Data.NHibernate/Data/**/*.cs" />
+				<include name="../Spring.Data.NHibernate/Support/**/*.cs" />
+				<exclude name="../Spring.Data.NHibernate/Data/**/SpringSessionSynchronization.cs" />
+				<exclude name="../Spring.Data.NHibernate/Data/**/LocalSessionFactoryObject.cs" />
+				<exclude name="../Spring.Data.NHibernate/Data/**/HibernateAccessor.cs" />
+				<exclude name="../Spring.Data.NHibernate/Data/**/SessionFactoryUtils.cs" />
+				<exclude name="../Spring.Data.NHibernate/Data/**/HibernateOptimisticLockingFailureException.cs" />
+				<exclude name="./Data/NHibernate/Generic/*.cs" if="${nant.settings.currentframework == 'net-1.1'}"/>
+				<include name="../GenCommonAssemblyInfo.cs" />
+			</sources>
+			<references basedir="${current.bin.dir}">
+				<lib>
+				  <include name="${nh12.lib.dir}"/>
+				</lib>
+				<include name="System.Data.dll" />
+				<include name="System.EnterpriseServices.dll" />
+				<include name="NHibernate.dll" />
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+				<exclude name="Spring.Data.NHibernate.dll" />
+				<exclude name="CloverRuntime.dll" />
+			</references>
+		</csc>
+	</target>
+</project>
diff --git a/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.xml b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.xml
new file mode 100644
index 00000000..a5db6e34
--- /dev/null
+++ b/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.xml
@@ -0,0 +1,5627 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Spring.Data.NHibernate12</name>
+    </assembly>
+    <members>
+        <member name="T:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings">
+            <summary>
+            Holds the references and configuration settings for a <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance. 
+            References are resolved by looking up the given object names in the root <see cref="T:Spring.Context.IApplicationContext"/> obtained by <see cref="M:Spring.Context.Support.ContextRegistry.GetContext"/>.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Support.SessionScopeSettings">
+            <summary>
+            Holds the references and configuration settings for a <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance.
+            </summary>
+        </member>
+        <member name="F:Spring.Data.NHibernate.Support.SessionScopeSettings.SINGLESESSION_DEFAULT">
+            <summary>
+            Default value for <see cref="P:Spring.Data.NHibernate.Support.SessionScopeSettings.SingleSession"/> property.
+            </summary>
+        </member>
+        <member name="F:Spring.Data.NHibernate.Support.SessionScopeSettings.FLUSHMODE_DEFAULT">
+            <summary>
+            Default value for <see cref="P:Spring.Data.NHibernate.Support.SessionScopeSettings.DefaultFlushMode"/> property.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScopeSettings.#ctor">
+            <summary>
+            Initialize a new instance of <see cref="T:Spring.Data.NHibernate.Support.SessionScopeSettings"/> with default values.
+            </summary>
+            <remarks>
+            Calling this constructor from your derived class leaves <see cref="P:Spring.Data.NHibernate.Support.SessionScopeSettings.SessionFactory"/> and <see cref="P:Spring.Data.NHibernate.Support.SessionScopeSettings.EntityInterceptor"/>
+            uninitialized. See <see cref="M:Spring.Data.NHibernate.Support.SessionScopeSettings.ResolveSessionFactory"/> and <see cref="M:Spring.Data.NHibernate.Support.SessionScopeSettings.ResolveEntityInterceptor"/> for more.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScopeSettings.#ctor(NHibernate.ISessionFactory)">
+            <summary>
+            Initialize a new instance of <see cref="T:Spring.Data.NHibernate.Support.SessionScopeSettings"/> with the given sessionFactory 
+            and default values for all other settings.
+            </summary>
+            <param name="sessionFactory">
+            The <see cref="T:NHibernate.ISessionFactory"/> instance to be used for obtaining <see cref="T:NHibernate.ISession"/> instances.
+            </param>
+            <remarks>
+            Calling this constructor marks all properties initialized.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScopeSettings.#ctor(NHibernate.ISessionFactory,NHibernate.IInterceptor,System.Boolean,NHibernate.FlushMode)">
+            <summary>
+            Initialize a new instance of <see cref="T:Spring.Data.NHibernate.Support.SessionScopeSettings"/> with the given values and references.
+            </summary>
+            <param name="sessionFactory">
+            The <see cref="T:NHibernate.ISessionFactory"/> instance to be used for obtaining <see cref="T:NHibernate.ISession"/> instances.
+            </param>
+            <param name="entityInterceptor">
+            Specify the <see cref="T:NHibernate.IInterceptor"/> to be set on each session provided by the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance.
+            </param>
+            <param name="singleSession">
+            Set whether to use a single session for each request. See <see cref="P:Spring.Data.NHibernate.Support.SessionScopeSettings.SingleSession"/> property for details.
+            </param>
+            <param name="defaultFlushMode">
+            Specify the flushmode to be applied on each session provided by the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance.
+            </param>
+            <remarks>
+            Calling this constructor marks all properties initialized.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScopeSettings.ResolveEntityInterceptor">
+            <summary>
+            Override this method to resolve an <see cref="T:NHibernate.IInterceptor"/> instance according to your chosen strategy.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScopeSettings.ResolveSessionFactory">
+            <summary>
+            Override this method to resolve an <see cref="T:NHibernate.ISessionFactory"/> instance according to your chosen strategy.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScopeSettings.EntityInterceptor">
+            <summary>
+            Gets the configured <see cref="T:NHibernate.IInterceptor"/> instance to be used.
+            </summary>
+            <remarks>
+            If the entity interceptor is not set by the constructor, this property calls 
+            <see cref="M:Spring.Data.NHibernate.Support.SessionScopeSettings.ResolveEntityInterceptor"/> to obtain an instance. This allows derived classes to 
+            override the behaviour of how to obtain the concrete <see cref="T:NHibernate.IInterceptor"/> instance.
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScopeSettings.SessionFactory">
+            <summary>
+            Gets the configured <see cref="T:NHibernate.ISessionFactory"/> instance to be used.
+            </summary>
+            <remarks>
+            If this property is requested for the first time, <see cref="M:Spring.Data.NHibernate.Support.SessionScopeSettings.ResolveSessionFactory"/> is called. 
+            This allows derived classes to override the behaviour of how to obtain the concrete <see cref="T:NHibernate.ISessionFactory"/> instance.
+            </remarks>
+            <exception cref="T:System.ArgumentException">If the <see cref="T:NHibernate.ISessionFactory"/> instance cannot be resolved.</exception>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScopeSettings.SingleSession">
+            <summary>
+             Set whether to use a single session for each request. Default is "true".
+             If set to false, each data access operation or transaction will use
+             its own session (like without Open Session in View). Each of those
+             sessions will be registered for deferred close, though, actually
+             processed at request completion.
+             </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScopeSettings.DefaultFlushMode">
+            <summary>
+            Gets or Sets the flushmode to be applied on each newly created session.
+            </summary>
+            <remarks>
+            This property defaults to <see cref="F:NHibernate.FlushMode.Never"/> to ensure that modifying objects outside the boundaries 
+            of a transaction will not be persisted. It is recommended to not change this value but wrap any modifying operation
+            within a transaction.
+            </remarks>
+        </member>
+        <member name="F:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.DEFAULT_SESSION_FACTORY_OBJECT_NAME">
+            <summary>
+            The default session factory name to use when retrieving the Hibernate session factory from
+            the root context.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.#ctor(System.Type)">
+            <summary>
+            Initializes a new <see cref="T:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings"/> instance.
+            </summary>
+            <param name="ownerType">The type, who's name will be used to prefix setting variables with</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.#ctor(System.Type,System.String)">
+            <summary>
+            Initializes a new <see cref="T:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings"/> instance.
+            </summary>
+            <param name="ownerType">The type, who's name will be used to prefix setting variables with</param>
+            <param name="sectionName">The configuration section to read setting variables from.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.#ctor(System.Type,Spring.Objects.Factory.Config.IVariableSource)">
+            <summary>
+            Initializes a new <see cref="T:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings"/> instance.
+            </summary>
+            <param name="ownerType">The type, who's name will be used to prefix setting variables with</param>
+            <param name="variableSource">The variable source to obtain settings from.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.ResolveEntityInterceptor">
+            <summary>
+            Resolve the entityInterceptor by looking up <see cref="F:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.entityInterceptorObjectName"/> 
+            in the root application context.
+            </summary>
+            <returns>The resolved <see cref="T:NHibernate.IInterceptor"/> instance or <see langword="null"/></returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.ResolveSessionFactory">
+            <summary>
+            Resolve the <see cref="T:NHibernate.ISessionFactory"/> by looking up <see cref="F:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings.sessionFactoryObjectName"/> 
+            in the root application context.
+            </summary>
+            <returns>The resolved <see cref="T:NHibernate.ISessionFactory"/> instance or <see langword="null"/></returns>
+        </member>
+        <member name="T:Spring.Data.NHibernate.IHibernateCallback">
+            <summary>
+            Callback interface for NHibernate code.
+            </summary>
+            <remarks>To be used with HibernateTemplate execute
+            method. The typical implementation will call 
+            Session.load/find/save/update to perform
+            some operations on persistent objects.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IHibernateCallback.cs,v 1.2 2007/09/19 22:58:22 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+            <returns>A result object, or null if none.</returns>   
+        </member>
+        <member name="T:Spring.Data.NHibernate.LocalSessionFactoryObject">
+             <summary>
+              An IFactoryObject that creates a local Hibernate SessionFactory instance.
+             Behaves like a SessionFactory instance when used as bean reference,
+             e.g. for HibernateTemplate's "SessionFactory" property.
+             </summary>
+             <remarks>
+             The typical usage will be to register this as singleton factory
+             in an application context and give objects references to application services
+             that need it.
+             <para>
+             Hibernate configuration settings can be set using the IDictionary property 'HibernateProperties'.
+            
+             </para>
+             </remarks>
+             <author>Mark Pollack (.NET)</author>
+             <version>$Id: LocalSessionFactoryObject.cs,v 1.11 2008/03/21 14:12:08 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.NHibernate.LocalSessionFactoryObject.hibernateProperties">
+            <summary>
+            TODO: consider changing to NamevalueCollection for easier
+            cut-n-paste from existing App.config based configurations.
+            </summary>
+        </member>
+        <member name="F:Spring.Data.NHibernate.LocalSessionFactoryObject.log">
+            <summary>
+            The shared <see cref="T:Common.Logging.ILog"/> instance for this class (and derived classes).
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.LocalSessionFactoryObject"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.GetObject">
+            <summary>
+            Return the singleon session factory.
+            </summary>
+            <returns>The singleon session factory.</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.AfterPropertiesSet">
+            <summary>
+            Initialize the SessionFactory for the given or the
+            default location.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.Dispose">
+            <summary>
+            Close the SessionFactory on application context shutdown.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.NewConfiguration">
+            <summary>
+            Subclasses can override this method to perform custom initialization
+            of the Configuration instance used for ISessionFactory creation.
+            </summary>
+            <remarks>
+            The properties of this LocalSessionFactoryObject will be applied to
+            the Configuration object that gets returned here.
+            <p>The default implementation creates a new Configuration instance.
+            A custom implementation could prepare the instance in a specific way,
+            or use a custom Configuration subclass.
+            </p>
+            </remarks>
+            <returns>The configuration instance.</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.PostProcessConfiguration(NHibernate.Cfg.Configuration)">
+            <summary>
+            To be implemented by subclasses that want to to perform custom
+            post-processing of the Configuration object after this FactoryObject
+            performed its default initialization.
+            </summary>
+            <param name="config">The current configuration object.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LocalSessionFactoryObject.NewSessionFactory(NHibernate.Cfg.Configuration)">
+            <summary>
+            Subclasses can override this method to perform custom initialization
+            of the SessionFactory instance, creating it via the given Configuration
+            object that got prepared by this LocalSessionFactoryObject.
+            </summary>
+            <remarks>
+            <p>The default implementation invokes Configuration's BuildSessionFactory.
+            A custom implementation could prepare the instance in a specific way,
+            or use a custom ISessionFactory subclass.
+            </p>
+            </remarks>
+            <returns>The ISessionFactory instance.</returns>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.MappingAssemblies">
+            <summary>
+            Sets the assemblies to load that contain mapping files.
+            </summary>
+            <value>The mapping assemblies.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.ConfigFilenames">
+            <summary>
+            Sets the hibernate configuration files to load, i.e. hibernate.cfg.xml.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.MappingResources">
+            <summary>
+            Sets the locations of Spring IResources that contain mapping
+            files.
+            </summary>
+            <value>The location of mapping resources.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.Configuration">
+            <summary>
+            Return the Configuration object used to build the SessionFactory.
+            Allows access to configuration metadata stored there (rarely needed).
+            </summary>
+            <value>The hibernate configuration.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.HibernateProperties">
+            <summary>
+            Set NHibernate configuration properties, like "hibernate.dialect".
+            </summary>
+            <value>The hibernate properties.</value>
+            <remarks>
+            	<p>Can be used to override values in a NHibernate XML config file,
+            or to specify all necessary properties locally.
+            </p>
+            	<p>Note: Do not specify a transaction provider here when using
+            Spring-driven transactions. It is also advisable to omit connection
+            provider settings and use a Spring-set IDbProvider instead.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.DbProvider">
+            <summary>
+            Get or set the DataSource to be used by the SessionFactory.
+            </summary>
+            <value>The db provider.</value>
+            <remarks>
+            If set, this will override corresponding settings in Hibernate properties.
+            <note>Note: If this is set, the Hibernate settings should not define
+            a connection string
+            (hibernate.connection.connection_string) to avoid meaningless double configuration.
+            </note>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.ExposeTransactionAwareSessionFactory">
+            <summary>
+            Gets or sets a value indicating whether to expose a transaction aware session factory.
+            </summary>
+            <value>
+            	<c>true</c> if want to expose transaction aware session factory; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.ObjectType">
+            <summary>
+            Return the type <see cref="T:NHibernate.ISessionFactory"/> or subclass.
+            </summary>
+            <value>The type created by this factory</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.LocalSessionFactoryObject.IsSingleton">
+            <summary>
+            Returns true
+            </summary>
+            <value>true</value>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Generic.IHibernateCallback`1">
+            <summary>
+            Callback interface (Generic version) for NHibernate code.
+            </summary>
+            <typeparam name="T">The type of result object</typeparam>
+            <remarks>To be used with HibernateTemplate execute
+            method. The typical implementation will call 
+            Session.load/find/save/update to perform
+            some operations on persistent objects.
+            </remarks>
+            
+            <author>Sree Nivask (.NET)</author>
+            <version>$Id: IHibernateCallback.cs,v 1.2 2007/09/19 22:58:10 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateCallback`1.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+            <returns>A result object.</returns>        
+            <param name="session">The active Hibernate session</param>
+        </member>
+        <member name="T:Spring.Data.NHibernate.SpringSessionSynchronization">
+            <summary>
+            NHibnerations actions taken during the transaction lifecycle.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: SpringSessionSynchronization.cs,v 1.1 2007/06/01 02:34:12 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.NHibernate.SpringSessionSynchronization.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class. 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionSynchronization.#ctor(Spring.Data.NHibernate.SessionHolder,NHibernate.ISessionFactory,Spring.Data.Support.IAdoExceptionTranslator,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.SpringSessionSynchronization"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionSynchronization.Suspend">
+            <summary>
+            Suspend this synchronization. 
+            </summary>
+            <remarks>
+            <p>
+            Unbind Hibernate resources (SessionHolder) from
+            <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>
+            if managing any.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionSynchronization.Resume">
+            <summary>
+            Resume this synchronization.
+            </summary>
+            <remarks>
+            <p>
+            Rebind Hibernate resources from 
+            <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>
+            if managing any.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionSynchronization.BeforeCommit(System.Boolean)">
+            <summary>
+            Invoked before transaction commit (before
+            <see cref="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCompletion"/>)
+            </summary>
+            <param name="readOnly">
+            If the transaction is defined as a read-only transaction.
+            </param>
+            <remarks>
+            <p>
+            Can flush transactional sessions to the database.
+            </p>
+            <p>
+            Note that exceptions will get propagated to the commit caller and 
+            cause a rollback of the transaction.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionSynchronization.BeforeCompletion">
+            <summary>
+            Invoked before transaction commit (before
+            <see cref="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCompletion"/>)
+            Can e.g. flush transactional O/R Mapping sessions to the database
+            </summary>
+            <remarks>
+            <para>
+            This callback does not mean that the transaction will actually be
+            commited.  A rollback decision can still occur after this method
+            has been called.  This callback is rather meant to perform work 
+            that's only relevant if a commit still has a chance
+            to happen, such as flushing SQL statements to the database.
+            </para>
+            <para>
+            Note that exceptions will get propagated to the commit caller and cause a
+            rollback of the transaction.</para>
+            <para>
+            (note: do not throw TransactionException subclasses here!)
+            </para>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionSynchronization.AfterCompletion(Spring.Transaction.Support.TransactionSynchronizationStatus)">
+            <summary>
+            Invoked after transaction commit/rollback.
+            </summary>
+            <param name="status">
+            Status according to <see cref="T:Spring.Transaction.Support.TransactionSynchronizationStatus"/>
+            </param>
+            <remarks>
+            Can e.g. perform resource cleanup, in this case after transaction completion.
+            <p>
+            Note that exceptions will get propagated to the commit or rollback
+            caller, although they will not influence the outcome of the transaction.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SpringSessionSynchronization.Order">
+            <summary>
+            Return the order value of this object, where a higher value means greater in
+            terms of sorting.
+            </summary>
+            <remarks>
+            <p>
+            Normally starting with 0 or 1, with <see cref="F:System.Int32.MaxValue"/> indicating
+            greatest. Same order values will result in arbitrary positions for the affected
+            objects.
+            </p>
+            <p>
+            Higher value can be interpreted as lower priority, consequently the first object
+            has highest priority.
+            </p>
+            </remarks>
+            <returns>The order value.</returns>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateAccessor">
+            <summary>
+            Base class for HibernateTemplate defining common
+            properties like SessionFactory and flushing behavior.
+            </summary>
+            <remarks>
+            <p>Not intended to be used directly. See HibernateTemplate.
+            </p>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateAccessor.cs,v 1.7 2008/01/25 15:04:28 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.NHibernate.HibernateAccessor.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class. 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateAccessor"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.ApplyFlushMode(NHibernate.ISession,System.Boolean)">
+            <summary>
+            Apply the flush mode that's been specified for this accessor
+            to the given Session.
+            </summary>
+            <param name="session">The current Hibernate Session.</param>
+            <param name="existingTransaction">if set to <c>true</c>
+            if executing within an existing transaction.</param>
+            <returns>
+            the previous flush mode to restore after the operation,
+            or <code>null</code> if none
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.FlushIfNecessary(NHibernate.ISession,System.Boolean)">
+            <summary>
+             Flush the given Hibernate Session if necessary.
+            </summary>
+            <param name="session">The current Hibernate Session.</param>
+            <param name="existingTransaction">if set to <c>true</c> 
+            if executing within an existing transaction.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.ConvertHibernateAccessException(NHibernate.HibernateException)">
+            <summary>
+            Convert the given HibernateException to an appropriate exception from the
+            <code>org.springframework.dao</code> hierarchy. Will automatically detect
+            wrapped ADO.NET Exceptions and convert them accordingly.
+            </summary>
+            <param name="ex">HibernateException that occured.</param>
+            <returns>
+            The corresponding DataAccessException instance
+            </returns>
+            <remarks>
+            The default implementation delegates to SessionFactoryUtils
+            and convertAdoAccessException. Can be overridden in subclasses.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.ConvertAdoAccessException(NHibernate.ADOException)">
+            <summary>
+            Converts the ADO.NET access exception to an appropriate exception from the
+            <code>org.springframework.dao</code> hierarchy. Can be overridden in subclasses.
+            </summary>
+            <param name="ex">ADOException that occured, wrapping underlying ADO.NET exception.</param>
+            <returns>
+            the corresponding DataAccessException instance
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.ConvertAdoAccessException(System.Exception)">
+            <summary>
+            Converts the ADO.NET access exception to an appropriate exception from the
+            <code>org.springframework.dao</code> hierarchy. Can be overridden in subclasses.
+            </summary>
+            <remarks>
+            <note>
+            Note that a direct SQLException can just occur when callback code
+            performs direct ADO.NET access via <code>ISession.Connection()</code>.
+            </note>
+            </remarks>
+            <param name="ex">The ADO.NET exception.</param>
+            <returns>The corresponding DataAccessException instance</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.PrepareQuery(NHibernate.IQuery)">
+            <summary>
+            Prepare the given IQuery object, applying cache settings and/or
+            a transaction timeout.
+            </summary>
+            <param name="queryObject">The query object to prepare.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.ApplyNamedParameterToQuery(NHibernate.IQuery,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Apply the given name parameter to the given Query object.
+            </summary>
+            <param name="queryObject">The query object.</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">The NHibernate type of the parameter (or <code>null</code> if none specified)</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.PrepareCriteria(NHibernate.ICriteria)">
+            <summary>
+            Prepare the given Criteria object, applying cache settings and/or
+            a transaction timeout.
+            </summary>
+            <remarks>
+            <para>Note that for NHibernate 1.2 this only works if the
+            implementation is of the type CriteriaImpl, which should generally
+            be the case.  The SetFetchSize method is not available on the
+            ICriteria interface
+            </para>
+            <para>This is a no-op for NHibernate 1.0.x since
+            the SetFetchSize method is not on the ICriteria interface and
+            the implementation class is has internal access.
+            </para>
+            <para>To remove the method completely for Spring's NHibernate 1.0 
+            support while reusing code for NHibernate 1.2 would not be 
+            possible.  So now this ineffectual operation is left in tact for
+            NHibernate 1.0.2 support.</para>
+            </remarks>
+            <param name="criteria">The criteria object to prepare</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.AfterPropertiesSet">
+            <summary>
+            Ensure SessionFactory is not null
+            </summary>
+            <exception cref="T:System.ArgumentException">If SessionFactory property is null.</exception>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.AllowCreate">
+            <summary>
+            Gets or sets if a new Session should be created when no transactional Session
+            can be found for the current thread.
+            </summary>
+            <value>
+            	<c>true</c> if allowed to create non-transaction session;
+            otherwise, <c>false</c>.
+            </value>
+            <remarks>
+            	<p>HibernateTemplate is aware of a corresponding Session bound to the
+            current thread, for example when using HibernateTransactionManager.
+            If allowCreate is true, a new non-transactional Session will be created
+            if none found, which needs to be closed at the end of the operation.
+            If false, an InvalidOperationException will get thrown in this case.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.AlwaysUseNewSession">
+            <summary>
+            Gets or sets a value indicating whether to always
+            use a new Hibernate Session for this template.
+            </summary>
+            <value><c>true</c> if always use new session; otherwise, <c>false</c>.</value>
+            <remarks>
+            	<p>
+            Default is "false"; if activated, all operations on this template will
+            work on a new NHibernate ISession even in case of a pre-bound ISession
+            (for example, within a transaction).
+            </p>
+            	<p>Within a transaction, a new NHibernate ISession used by this template
+            will participate in the transaction through using the same ADO.NET
+            Connection. In such a scenario, multiple Sessions will participate
+            in the same database transaction.
+            </p>
+            	<p>Turn this on for operations that are supposed to always execute
+            independently, without side effects caused by a shared NHibernate ISession.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.ExposeNativeSession">
+            <summary>
+            Set whether to expose the native Hibernate Session to IHibernateCallback
+            code. Default is "false": a Session proxy will be returned,
+            suppressing <code>close</code> calls and automatically applying
+            query cache settings and transaction timeouts.
+            </summary>
+            <value><c>true</c> if expose native session; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.TemplateFlushMode">
+            <summary>
+            Gets or sets the template flush mode.
+            </summary>
+            <remarks>
+            Default is Auto. Will get applied to any <b>new</b> ISession
+            created by the template.
+            </remarks>
+            <value>The template flush mode.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.EntityInterceptor">
+            <summary>
+            Gets or sets the entity interceptor that allows to inspect and change
+            property values before writing to and reading from the database.
+            </summary>
+            <remarks>
+            Will get applied to any <b>new</b> ISession created by this object.
+            <p>Such an interceptor can either be set at the ISessionFactory level,
+            i.e. on LocalSessionFactoryObject, or at the ISession level, i.e. on
+            HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
+            It's preferable to set it on LocalSessionFactoryObject or HibernateTransactionManager
+            to avoid repeated configuration and guarantee consistent behavior in transactions.
+            </p>
+            </remarks>
+            <value>The interceptor.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.EntityInterceptorObjectName">
+            <summary>
+            Set the object name of a Hibernate entity interceptor that allows to inspect
+            and change property values before writing to and reading from the database.
+            </summary>
+            <remarks>
+            Will get applied to any new Session created by this transaction manager.
+            <p>Requires the object factory to be known, to be able to resolve the object
+            name to an interceptor instance on session creation. Typically used for
+            prototype interceptors, i.e. a new interceptor instance per session.
+            </p>
+            <p>Can also be used for shared interceptor instances, but it is recommended
+            to set the interceptor reference directly in such a scenario.
+            </p>
+            </remarks>
+            <value>The name of the entity interceptor in the object factory/application context.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.SessionFactory">
+            <summary>
+            Gets or sets the session factory that should be used to create
+            NHibernate ISessions.
+            </summary>
+            <value>The session factory.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.ObjectFactory">
+            <summary>
+            Set the object factory instance.
+            </summary>
+            <value>The object factory instance.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.CacheQueries">
+            <summary>
+            Gets or sets a value indicating whether to 
+            cache all queries executed by this template.
+            </summary>
+            <remarks>
+            If this is true, all IQuery and ICriteria objects created by
+            this template will be marked as cacheable (including all
+            queries through find methods).
+            <p>To specify the query region to be used for queries cached
+            by this template, set the QueryCacheRegion property.
+            </p>
+            </remarks>
+            <value><c>true</c> if cache queries; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.QueryCacheRegion">
+            <summary>
+            Gets or sets the name of the cache region for queries executed by this template.
+            </summary>
+            <remarks>
+            If this is specified, it will be applied to all IQuery and ICriteria objects
+            created by this template (including all queries through find methods).
+            <p>The cache region will not take effect unless queries created by this
+            template are configured to be cached via the CacheQueries property.
+            </p>
+            </remarks>
+            <value>The query cache region.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.FetchSize">
+            <summary>
+            Gets or sets the fetch size for this HibernateTemplate.
+            </summary>
+            <value>The size of the fetch.</value>
+            <remarks>This is important for processing
+            large result sets: Setting this higher than the default value will increase
+            processing speed at the cost of memory consumption; setting this lower can
+            avoid transferring row data that will never be read by the application.
+            <p>Default is 0, indicating to use the driver's default.</p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.MaxResults">
+            <summary>
+            Gets or sets the maximum number of rows for this HibernateTemplate.
+            </summary>
+            <value>The max results.</value>
+            <remarks>
+            This is important
+            for processing subsets of large result sets, avoiding to read and hold
+            the entire result set in the database or in the ADO.NET driver if we're
+            never interested in the entire result in the first place (for example,
+            when performing searches that might return a large number of matches).
+            <p>Default is 0, indicating to use the driver's default.</p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.AdoExceptionTranslator">
+            <summary>
+            Set the ADO.NET exception translator for this instance.
+            Applied to System.Data.Common.DbException (or provider specific exception type
+            in .NET 1.1) thrown by callback code, be it direct
+            DbException or wrapped Hibernate ADOExceptions.
+            <p>The default exception translator is either a ErrorCodeExceptionTranslator
+            if a DbProvider is available, or a FalbackExceptionTranslator otherwise
+            </p>
+            </summary>
+            <value>The ADO exception translator.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.Session">
+            <summary>
+            Gets a Session for use by this template.
+            </summary>
+            <value>The session.</value>
+            <remarks>
+            - Returns a new Session in case of "alwaysUseNewSession" (using the same ADO.NET connection as a transaction Session, if applicable)
+            - a pre-bound Session in case of "AllowCreate" is set to false (not the default) 
+            - or a pre-bound Session or new Session if no transactional or other pre-bound Session exists.
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder">
+            <summary>
+            Helper class to determine if the FlushMode enumeration
+            was changed from its default value
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder.#ctor(NHibernate.FlushMode)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder"/> class.
+            </summary>
+            <param name="mode">The flush mode.</param>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder.ModeWasSet">
+            <summary>
+            Gets or sets a value indicating whether the FlushMode
+            property was set..
+            </summary>
+            <value><c>true</c> if FlushMode was set; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateAccessor.FlushModeHolder.Mode">
+            <summary>
+            Gets or sets the FlushMode.
+            </summary>
+            <value>The FlushMode.</value>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Generic.HibernateTemplate">
+             <summary>
+             Generic version of the Helper class that simplifies NHibernate data access code
+             </summary>
+             <remarks>
+             <p>Typically used to implement data access or business logic services that
+             use NHibernate within their implementation but are Hibernate-agnostic in their
+             interface. The latter or code calling the latter only have to deal with
+             domain objects.</p>
+            
+             <p>The central method is Execute() supporting Hibernate access code which
+             implements the HibernateCallback interface. It provides NHibernate Session
+             handling such that neither the IHibernateCallback implementation nor the calling
+             code needs to explicitly care about retrieving/closing NHibernate Sessions,
+             or handling Session lifecycle exceptions. For typical single step actions,
+             there are various convenience methods (Find, Load, SaveOrUpdate, Delete).
+             </p>
+             
+             <p>Can be used within a service implementation via direct instantiation
+             with a ISessionFactory reference, or get prepared in an application context
+             and given to services as an object reference. Note: The ISessionFactory should
+             always be configured as an object in the application context, in the first case
+             given to the service directly, in the second case to the prepared template.
+             </p>
+             
+             <p>This class can be considered as a direct alternative to working with the raw
+             Hibernate Session API (through SessionFactoryUtils.Session).
+             </p>
+             
+             <p>LocalSessionFactoryObject is the preferred way of obtaining a reference
+             to a specific NHibernate ISessionFactory.
+             </p>
+             </remarks>
+             <author>Sree Nivask (.NET)</author>
+             <author>Mark Pollack (.NET)</author>
+             <version>$Id: HibernateTemplate.cs,v 1.3 2008/01/24 17:29:09 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Generic.IHibernateOperations">
+            <summary>
+            Interface that specifies a basic set of Hibernate operations.
+            </summary>
+            <remarks>
+            Implemented by HibernateTemplate. Not often used, but a useful option
+            to enhance testability, as it can easily be mocked or stubbed.
+            <p>Provides HibernateTemplate's data access methods that mirror
+            various Session methods. See the NHibernate ISession documentation
+            for details on those methods.
+            </p>
+            </remarks>
+            <threadsafety statis="true" instance="true"/>
+            <author>Sree Nivask (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IHibernateOperations.cs,v 1.2 2007/09/19 22:58:10 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.NHibernate.ICommonHibernateOperations">
+            <summary>
+            Interface that specifies a set of Hibernate operations that
+            are common across versions of Hibernate.
+            </summary>
+            <remarks>
+            Base interface for generic and non generic IHibernateOperations interfaces
+            Not often used, but a useful option
+            to enhance testability, as it can easily be mocked or stubbed.
+            <p>Provides HibernateTemplate's data access methods that mirror
+            various Session methods. See the NHibernate ISession documentation
+            for details on those methods.
+            </p>
+            </remarks> 
+            <author>Mark Pollack (.NET)</author>  
+            <threadsafety statis="true" instance="true"/> 
+            <version>$Id: ICommonHibernateOperations.cs,v 1.2 2007/09/19 22:58:22 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Clear">
+            <summary>
+            Remove all objects from the Session cache, and cancel all pending saves,
+            updates and deletes.
+            </summary>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Delete(System.Object)">
+            <summary>
+            Delete the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to delete.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Delete(System.Object,NHibernate.LockMode)">
+            <summary>
+            Delete the given persistent instance.
+            </summary>
+            <remarks>
+            Obtains the specified lock mode if the instance exists, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </remarks>
+            <param name="entity">Tthe persistent instance to delete.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Delete(System.String)">
+            <summary>
+            Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Delete(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+             Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <param name="value">The value of the parameter.</param>
+            <param name="type">The Hibernate type of the parameter (or <code>null</code>).</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Delete(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <param name="values">The values of the parameters.</param>
+            <param name="types"> Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Flush">
+            <summary>
+            Flush all pending saves, updates and deletes to the database.
+            </summary>
+            <remarks>
+            Only invoke this for selective eager flushing, for example when ADO.NET code
+            needs to see certain changes within the same transaction. Else, it's preferable
+            to rely on auto-flushing at transaction completion.
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Load(System.Object,System.Object)">
+            <summary>
+            Load the persistent instance with the given identifier
+            into the given object, throwing an exception if not found.
+            </summary>
+            <param name="entity">Entity the object (of the target class) to load into.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If object not found.</exception>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Refresh(System.Object)">
+            <summary>
+            Re-read the state of the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to re-read.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Refresh(System.Object,NHibernate.LockMode)">
+            <summary>
+            Re-read the state of the given persistent instance.
+            Obtains the specified lock mode for the instance.
+            </summary>
+            <param name="entity">The persistent instance to re-read.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Contains(System.Object)">
+            <summary>
+            Determines whether the given object is in the Session cache.
+            </summary>
+            <param name="entity">the persistence instance to check.</param>
+            <returns>
+            	<c>true</c> if session cache contains the specified entity; otherwise, <c>false</c>.
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Evict(System.Object)">
+            <summary>
+            Remove the given object from the Session cache.
+            </summary>
+            <param name="entity">The persistent instance to evict.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Lock(System.Object,NHibernate.LockMode)">
+            <summary>
+            Obtain the specified lock level upon the given object, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </summary>
+            <param name="entity">The he persistent instance to lock.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.ObjectOptimisticLockingFailureException">If not found</exception>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Save(System.Object)">
+            <summary>
+            Persist the given transient instance.
+            </summary>
+            <param name="entity">The transient instance to persist.</param>
+            <returns>The generated identifier.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Save(System.Object,System.Object)">
+            <summary>
+            Persist the given transient instance with the given identifier.
+            </summary>
+            <param name="entity">The transient instance to persist.</param>
+            <param name="id">The identifier to assign.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Update(System.Object)">
+            <summary>
+            Update the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to update.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.Update(System.Object,NHibernate.LockMode)">
+            <summary>
+            Update the given persistent instance.
+            Obtains the specified lock mode if the instance exists, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </summary>
+            <param name="entity">The persistent instance to update.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.SaveOrUpdate(System.Object)">
+            <summary>
+            Save or update the given persistent instance,
+            according to its id (matching the configured "unsaved-value"?).
+            </summary>
+            <param name="entity">Tthe persistent instance to save or update
+            (to be associated with the Hibernate Session).</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.ICommonHibernateOperations.SaveOrUpdateCopy(System.Object)">
+            <summary>
+            Save or update the contents of given persistent object,
+            according to its id (matching the configured "unsaved-value"?).
+            Will copy the contained fields to an already loaded instance
+            with the same id, if appropriate.
+            </summary>
+            <param name="entity">The persistent object to save or update.
+            (<i>not</i> necessarily to be associated with the Hibernate Session)
+            </param>
+            <returns>The actually associated persistent object.
+            (either an already loaded instance with the same id, or the given object)</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.Get``1(System.Object)">
+            <summary>
+            Return the persistent instance of the given entity type
+            with the given identifier, or <see langword="null"/> if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <typeparam name="T">The object type to get.</typeparam>
+            <param name="id">The id of the object to get.</param>
+            <returns>the persistent instance, or <see langword="null"/> if not found</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.Get``1(System.Object,NHibernate.LockMode)">
+            <summary>
+            Return the persistent instance of the given entity type
+            with the given identifier, or null if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <typeparam name="T">The object type to get.</typeparam>
+            <param name="id">The lock mode to obtain.</param>
+            <param name="lockMode">The lock mode.</param>
+            <returns>the persistent instance, or null if not found</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>     
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.Load``1(System.Object)">
+            <summary>
+            Return the persistent instance of the given entity class
+            with the given identifier, throwing an exception if not found.
+            </summary>
+            <typeparam name="T">The object type to load.</typeparam>
+            <param name="id">An identifier of the persistent instance.</param>
+            <returns>The persistent instance</returns>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If not found</exception>     
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>     
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.Load``1(System.Object,NHibernate.LockMode)">
+            <summary>
+            Return the persistent instance of the given entity class
+             with the given identifier, throwing an exception if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <typeparam name="T">The object type to load.</typeparam>
+            <param name="id">An identifier of the persistent instance.</param>
+            <param name="lockMode">The lock mode.</param>
+            <returns>The persistent instance</returns>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If not found</exception>     
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>  
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.LoadAll``1">
+            <summary>
+            Return all persistent instances of the given entity class.
+            Note: Use queries or criteria for retrieving a specific subset.
+            </summary>
+            <typeparam name="T">The object type to load.</typeparam>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.Find``1(System.String)">
+            <summary>
+            Execute a query for persistent instances.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <returns>
+            a generic List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>  
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.Find``1(System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="value">the value of the parameter</param>
+            <returns>
+            a generic List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>  
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.Find``1(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a query for persistent instances, binding one value
+            to a "?" parameter of the given type in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="value">The value of the parameter.</param>
+            <param name="type">Hibernate type of the parameter (or null)</param>
+            <returns>
+            a generic List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>  
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.Find``1(System.String,System.Object[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="values">the values of the parameters</param>
+            <returns>a generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>  
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.Find``1(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a query for persistent instances, binding a number of
+            values to "?" parameters of the given types in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or null)</param>
+            <returns>
+            a generic List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception> 
+            <exception cref="T:System.ArgumentException">If values and types are not null and their lenths are not equal</exception>          
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedParam``1(System.String,System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a  named parameter in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">The name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <returns>a generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedParam``1(System.String,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a  named parameter in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">The name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">Hibernate type of the parameter (or null)</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedParam``1(System.String,System.String[],System.Object[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to  named parameters in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedParam``1(System.String,System.String[],System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to  named parameters in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or null)</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+            if paramNames length is not equal to types length (when types is not null)</exception>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedQuery``1(System.String)">
+            <summary>
+            Execute a named query for persistent instances.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedQuery``1(System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+             A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="value">The value of the parameter</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedQuery``1(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">Hibernate type of the parameter (or null)</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedQuery``1(System.String,System.Object[])">
+            <summary>
+            Execute a named query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="values">The values of the parameters</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedQuery``1(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a named query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or null)</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If values and types are not null and their lengths differ.</exception>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedQueryAndNamedParam``1(System.String,System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a  named parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedQueryAndNamedParam``1(System.String,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a  named parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">The Hibernate type of the parameter (or null)</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedQueryAndNamedParam``1(System.String,System.String[],System.Object[])">
+            <summary>
+            Execute a named query for persistent instances, binding
+            number of values to named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters.</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedQueryAndNamedParam``1(System.String,System.String[],System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a named query for persistent instances, binding
+            number of values to  named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters.</param>
+            <param name="types">Hibernate types of the parameters (or null)</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+            if paramNames length is not equal to types length (when types is not null)</exception>                
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByNamedQueryAndValueObject``1(System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding the properties
+            of the given object to  named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="valueObject">The values of the parameters</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.FindByValueObject``1(System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding the properties
+            of the given object to <i>named</i> parameters in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">A query expressed in Hibernate's query language</param>       
+            <param name="valueObject">The values of the parameters</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.Execute``1(Spring.Data.NHibernate.Generic.HibernateDelegate{``0})">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning the result object.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <typeparam name="T">The object type retrieved.</typeparam>
+            <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+            <returns>a result object returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.Execute``1(Spring.Data.NHibernate.Generic.HibernateDelegate{``0},System.Boolean)">
+            <summary>
+            Execute the action specified by the delegate within a Session.
+            </summary>
+            <typeparam name="T">The object type retrieved.</typeparam>
+            <param name="del">The HibernateDelegate that specifies the action
+            to perform.</param>
+            <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+            callback code.</param>
+            <returns>a result object returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.Execute``1(Spring.Data.NHibernate.Generic.IHibernateCallback{``0})">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <typeparam name="T">The object type retrieved.</typeparam>
+            <param name="action">The callback object that specifies the Hibernate action.</param>
+            <returns>
+            a result object returned by the action, or null
+            </returns>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning the result object.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.Execute``1(Spring.Data.NHibernate.Generic.IHibernateCallback{``0},System.Boolean)">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <typeparam name="T">The object type retrieved.</typeparam>
+            <param name="action">callback object that specifies the Hibernate action.</param>
+            <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+            callback code.</param>
+            <returns>
+            a result object returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.ExecuteFind``1(Spring.Data.NHibernate.Generic.FindHibernateDelegate{``0})">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning the result object.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+            <returns>A generic IList returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.ExecuteFind``1(Spring.Data.NHibernate.Generic.FindHibernateDelegate{``0},System.Boolean)">
+            <summary>
+            Execute the action specified by the delegate within a Session.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="del">The FindHibernateDelegate that specifies the action
+            to perform.</param>
+            <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+            callback code.</param>
+            <returns>A generic IList returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.ExecuteFind``1(Spring.Data.NHibernate.Generic.IFindHibernateCallback{``0})">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="action">The callback object that specifies the Hibernate action.</param>
+            <returns>
+            A generic IList returned by the action, or null
+            </returns>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning the result object.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IHibernateOperations.ExecuteFind``1(Spring.Data.NHibernate.Generic.IFindHibernateCallback{``0},System.Boolean)">
+            <summary>
+            Execute the action specified by the given action object within a Session assuming that an IList is returned.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="action">callback object that specifies the Hibernate action.</param>
+            <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+            callback code.</param>
+            <returns>
+            an IList returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Generic.HibernateTemplate"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.#ctor(NHibernate.ISessionFactory)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Generic.HibernateTemplate"/> class.
+            </summary>
+            <remarks>Allows creation of a new non-transactional session when no 
+            transactional Session can be found for the current thread</remarks>
+            <param name="sessionFactory">The session factory to create sessions.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.#ctor(NHibernate.ISessionFactory,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Generic.HibernateTemplate"/> class.
+            </summary>
+            <param name="sessionFactory">The session factory to create sessions.</param>        
+            <param name="allowCreate">if set to <c>true</c> allow creation
+            of a new non-transactional session when no transactional Session can be found 
+            for the current thread.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Clear">
+            <summary>
+            Remove all objects from the Session cache, and cancel all pending saves,
+            updates and deletes.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Delete(System.Object)">
+            <summary>
+            Delete the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to delete.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Delete(System.Object,NHibernate.LockMode)">
+            <summary>
+            Delete the given persistent instance.
+            </summary>
+            <param name="entity">Tthe persistent instance to delete.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <remarks>
+            Obtains the specified lock mode if the instance exists, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Delete(System.String)">
+            <summary>
+            Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Delete(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+             Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <param name="value">The value of the parameter.</param>
+            <param name="type">The Hibernate type of the parameter (or <code>null</code>).</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Delete(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <param name="values">The values of the parameters.</param>
+            <param name="types"> Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Flush">
+            <summary>
+            Flush all pending saves, updates and deletes to the database.
+            </summary>
+            <remarks>
+            Only invoke this for selective eager flushing, for example when ADO.NET code
+            needs to see certain changes within the same transaction. Else, it's preferable
+            to rely on auto-flushing at transaction completion.
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Load(System.Object,System.Object)">
+            <summary>
+            Load the persistent instance with the given identifier
+            into the given object, throwing an exception if not found.
+            </summary>
+            <param name="entity">Entity the object (of the target class) to load into.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If object not found.</exception>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Refresh(System.Object)">
+            <summary>
+            Re-read the state of the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to re-read.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Refresh(System.Object,NHibernate.LockMode)">
+            <summary>
+            Re-read the state of the given persistent instance.
+            Obtains the specified lock mode for the instance.
+            </summary>
+            <param name="entity">The persistent instance to re-read.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Contains(System.Object)">
+            <summary>
+            Determines whether the given object is in the Session cache.
+            </summary>
+            <param name="entity">the persistence instance to check.</param>
+            <returns>
+            	<c>true</c> if session cache contains the specified entity; otherwise, <c>false</c>.
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Evict(System.Object)">
+            <summary>
+            Remove the given object from the Session cache.
+            </summary>
+            <param name="entity">The persistent instance to evict.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Lock(System.Object,NHibernate.LockMode)">
+            <summary>
+            Obtain the specified lock level upon the given object, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </summary>
+            <param name="entity">The he persistent instance to lock.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.ObjectOptimisticLockingFailureException">If not found</exception>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Save(System.Object)">
+            <summary>
+            Persist the given transient instance.
+            </summary>
+            <param name="entity">The transient instance to persist.</param>
+            <returns>The generated identifier.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Save(System.Object,System.Object)">
+            <summary>
+            Persist the given transient instance with the given identifier.
+            </summary>
+            <param name="entity">The transient instance to persist.</param>
+            <param name="id">The identifier to assign.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Update(System.Object)">
+            <summary>
+            Update the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to update.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Update(System.Object,NHibernate.LockMode)">
+            <summary>
+            Update the given persistent instance.
+            Obtains the specified lock mode if the instance exists, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </summary>
+            <param name="entity">The persistent instance to update.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.SaveOrUpdate(System.Object)">
+            <summary>
+            Save or update the given persistent instance,
+            according to its id (matching the configured "unsaved-value"?).
+            </summary>
+            <param name="entity">Tthe persistent instance to save or update
+            (to be associated with the Hibernate Session).</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.SaveOrUpdateCopy(System.Object)">
+            <summary>
+            Save or update the contents of given persistent object,
+            according to its id (matching the configured "unsaved-value"?).
+            Will copy the contained fields to an already loaded instance
+            with the same id, if appropriate.
+            </summary>
+            <param name="entity">The persistent object to save or update.
+            (<i>not</i> necessarily to be associated with the Hibernate Session)
+            </param>
+            <returns>The actually associated persistent object.
+            (either an already loaded instance with the same id, or the given object)</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Get``1(System.Object)">
+            <summary>
+            Return the persistent instance of the given entity type
+            with the given identifier, or null if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <typeparam name="T">The object type to get.</typeparam>
+            <param name="id">The id of the object to get.</param>
+            <returns>the persistent instance, or null if not found</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Get``1(System.Object,NHibernate.LockMode)">
+            <summary>
+            Return the persistent instance of the given entity type
+            with the given identifier, or null if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <typeparam name="T">The object type to get.</typeparam>
+            <param name="id">The lock mode to obtain.</param>
+            <param name="lockMode">The lock mode.</param>
+            <returns>the persistent instance, or null if not found</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Load``1(System.Object)">
+            <summary>
+            Return the persistent instance of the given entity class
+            with the given identifier, throwing an exception if not found.
+            </summary>
+            <typeparam name="T">The object type to load.</typeparam>
+            <param name="id">An identifier of the persistent instance.</param>
+            <returns>The persistent instance</returns>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If not found</exception>     
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Load``1(System.Object,NHibernate.LockMode)">
+            <summary>
+            Return the persistent instance of the given entity class
+             with the given identifier, throwing an exception if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <typeparam name="T">The object type to load.</typeparam>
+            <param name="id">An identifier of the persistent instance.</param>
+            <param name="lockMode">The lock mode.</param>
+            <returns>The persistent instance</returns>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If not found</exception>     
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>  
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.LoadAll``1">
+            <summary>
+            Return all persistent instances of the given entity class.
+            Note: Use queries or criteria for retrieving a specific subset.
+            </summary>
+            <typeparam name="T">The object type to load.</typeparam>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Find``1(System.String)">
+            <summary>
+            Execute a query for persistent instances.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <returns>
+            a generic List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>  
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Find``1(System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="value">the value of the parameter</param>
+            <returns>
+            a generic List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>  
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Find``1(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a query for persistent instances, binding one value
+            to a "?" parameter of the given type in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="value">The value of the parameter.</param>
+            <param name="type">Hibernate type of the parameter (or null)</param>
+            <returns>
+            a generic List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>  
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Find``1(System.String,System.Object[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="values">the values of the parameters</param>
+            <returns>a generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>  
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Find``1(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a query for persistent instances, binding a number of
+            values to "?" parameters of the given types in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or null)</param>
+            <returns>
+            a generic List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>  
+            <exception cref="T:System.ArgumentException">If values and types are not null and their lengths are not equal</exception>  
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedParam``1(System.String,System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a  named parameter in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">The name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <returns>a generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedParam``1(System.String,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a  named parameter in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">The name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">Hibernate type of the parameter (or null)</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedParam``1(System.String,System.String[],System.Object[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to  named parameters in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedParam``1(System.String,System.String[],System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to  named parameters in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or null)</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+            if paramNames length is not equal to types length (when types is not null)</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedQuery``1(System.String)">
+            <summary>
+            Execute a named query for persistent instances.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedQuery``1(System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+             A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="value">The value of the parameter</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedQuery``1(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">Hibernate type of the parameter (or null)</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedQuery``1(System.String,System.Object[])">
+            <summary>
+            Execute a named query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="values">The values of the parameters</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedQuery``1(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a named query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or null)</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If values and types are not null and their lengths differ.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedQueryAndNamedParam``1(System.String,System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a  named parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedQueryAndNamedParam``1(System.String,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a  named parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">The Hibernate type of the parameter (or null)</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedQueryAndNamedParam``1(System.String,System.String[],System.Object[])">
+            <summary>
+            Execute a named query for persistent instances, binding
+            number of values to  named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters.</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedQueryAndNamedParam``1(System.String,System.String[],System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a named query for persistent instances, binding
+            number of values to  named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters.</param>
+            <param name="types">Hibernate types of the parameters (or null)</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+            if paramNames length is not equal to types length (when types is not null)</exception>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByNamedQueryAndValueObject``1(System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding the properties
+            of the given object to  named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="valueObject">The values of the parameters</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.FindByValueObject``1(System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding the properties
+            of the given object to <i>named</i> parameters in the query string.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="queryString">A query expressed in Hibernate's query language</param>       
+            <param name="valueObject">The values of the parameters</param>
+            <returns>A generic List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Execute``1(Spring.Data.NHibernate.Generic.HibernateDelegate{``0})">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning the result object.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <typeparam name="T">The object type retrieved.</typeparam>
+            <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+            <returns>a result object returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Execute``1(Spring.Data.NHibernate.Generic.HibernateDelegate{``0},System.Boolean)">
+            <summary>
+            Execute the action specified by the delegate within a Session.
+            </summary>
+            <typeparam name="T">The object type retrieved.</typeparam>
+            <param name="del">The HibernateDelegate that specifies the action
+            to perform.</param>
+            <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+            callback code.</param>
+            <returns>a result object returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Execute``1(Spring.Data.NHibernate.Generic.IHibernateCallback{``0})">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <typeparam name="T">The object type retrieved.</typeparam>
+            <param name="action">The callback object that specifies the Hibernate action.</param>
+            <returns>
+            a result object returned by the action, or null
+            </returns>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning the result object.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.Execute``1(Spring.Data.NHibernate.Generic.IHibernateCallback{``0},System.Boolean)">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <typeparam name="T">The object type retrieved.</typeparam>
+            <param name="action">callback object that specifies the Hibernate action.</param>
+            <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+            callback code.</param>
+            <returns>
+            a result object returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.ExecuteFind``1(Spring.Data.NHibernate.Generic.IFindHibernateCallback{``0},System.Boolean)">
+            <summary>
+            Execute the action specified by the given action object within a Session assuming that an IList is returned.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="action">callback object that specifies the Hibernate action.</param>
+            <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+            callback code.</param>
+            <returns>
+            an IList returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.ExecuteFind``1(Spring.Data.NHibernate.Generic.FindHibernateDelegate{``0})">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning the result object.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+            <returns>A generic IList returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.ExecuteFind``1(Spring.Data.NHibernate.Generic.FindHibernateDelegate{``0},System.Boolean)">
+            <summary>
+            Execute the action specified by the delegate within a Session.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="del">The FindHibernateDelegate that specifies the action
+            to perform.</param>
+            <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+            callback code.</param>
+            <returns>A generic IList returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.HibernateTemplate.ExecuteFind``1(Spring.Data.NHibernate.Generic.IFindHibernateCallback{``0})">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <typeparam name="T">The object type to find.</typeparam>
+            <param name="action">The callback object that specifies the Hibernate action.</param>
+            <returns>
+            A generic IList returned by the action, or null
+            </returns>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning the result object.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.AllowCreate">
+            <summary>
+            Gets or sets if a new Session should be created when no transactional Session
+            can be found for the current thread.
+            </summary>
+            <value>
+            	<c>true</c> if allowed to create non-transaction session;
+            otherwise, <c>false</c>.
+            </value>
+            <remarks>
+            	<p>HibernateTemplate is aware of a corresponding Session bound to the
+            current thread, for example when using HibernateTransactionManager.
+            If allowCreate is true, a new non-transactional Session will be created
+            if none found, which needs to be closed at the end of the operation.
+            If false, an InvalidOperationException will get thrown in this case.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.AlwaysUseNewSession">
+            <summary>
+            Gets or sets a value indicating whether to always
+            use a new Hibernate Session for this template.
+            </summary>
+            <value><c>true</c> if always use new session; otherwise, <c>false</c>.</value>
+            <remarks>
+            	<p>
+            Default is "false"; if activated, all operations on this template will
+            work on a new NHibernate ISession even in case of a pre-bound ISession
+            (for example, within a transaction).
+            </p>
+            	<p>Within a transaction, a new NHibernate ISession used by this template
+            will participate in the transaction through using the same ADO.NET
+            Connection. In such a scenario, multiple Sessions will participate
+            in the same database transaction.
+            </p>
+            	<p>Turn this on for operations that are supposed to always execute
+            independently, without side effects caused by a shared NHibernate ISession.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.ExposeNativeSession">
+            <summary>
+            Set whether to expose the native Hibernate Session to IHibernateCallback
+            code. Default is "false": a Session proxy will be returned,
+            suppressing <code>close</code> calls and automatically applying
+            query cache settings and transaction timeouts.
+            </summary>
+            <value><c>true</c> if expose native session; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.TemplateFlushMode">
+            <summary>
+            Gets or sets the template flush mode.
+            </summary>
+            <remarks>
+            Default is Auto. Will get applied to any <b>new</b> ISession
+            created by the template.
+            </remarks>
+            <value>The template flush mode.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.EntityInterceptor">
+            <summary>
+            Gets or sets the entity interceptor that allows to inspect and change
+            property values before writing to and reading from the database.
+            </summary>
+            <remarks>
+            Will get applied to any <b>new</b> ISession created by this object.
+            <p>Such an interceptor can either be set at the ISessionFactory level,
+            i.e. on LocalSessionFactoryObject, or at the ISession level, i.e. on
+            HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
+            It's preferable to set it on LocalSessionFactoryObject or HibernateTransactionManager
+            to avoid repeated configuration and guarantee consistent behavior in transactions.
+            </p>
+            </remarks>
+            <value>The interceptor.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.EntityInterceptorObjectName">
+            <summary>
+            Set the object name of a Hibernate entity interceptor that allows to inspect
+            and change property values before writing to and reading from the database.
+            </summary>
+            <remarks>
+            Will get applied to any new Session created by this transaction manager.
+            <p>Requires the object factory to be known, to be able to resolve the object
+            name to an interceptor instance on session creation. Typically used for
+            prototype interceptors, i.e. a new interceptor instance per session.
+            </p>
+            <p>Can also be used for shared interceptor instances, but it is recommended
+            to set the interceptor reference directly in such a scenario.
+            </p>
+            </remarks>
+            <value>The name of the entity interceptor in the object factory/application context.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.SessionFactory">
+            <summary>
+            Gets or sets the session factory that should be used to create
+            NHibernate ISessions.
+            </summary>
+            <value>The session factory.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.ObjectFactory">
+            <summary>
+            Set the object factory instance.
+            </summary>
+            <value>The object factory instance</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.CacheQueries">
+            <summary>
+            Gets or sets a value indicating whether to 
+            cache all queries executed by this template.
+            </summary>
+            <remarks>
+            If this is true, all IQuery and ICriteria objects created by
+            this template will be marked as cacheable (including all
+            queries through find methods).
+            <p>To specify the query region to be used for queries cached
+            by this template, set the QueryCacheRegion property.
+            </p>
+            </remarks>
+            <value><c>true</c> if cache queries; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.QueryCacheRegion">
+            <summary>
+            Gets or sets the name of the cache region for queries executed by this template.
+            </summary>
+            <remarks>
+            If this is specified, it will be applied to all IQuery and ICriteria objects
+            created by this template (including all queries through find methods).
+            <p>The cache region will not take effect unless queries created by this
+            template are configured to be cached via the CacheQueries property.
+            </p>
+            </remarks>
+            <value>The query cache region.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.FetchSize">
+            <summary>
+            Gets or sets the fetch size for this HibernateTemplate.
+            </summary>
+            <value>The size of the fetch.</value>
+            <remarks>This is important for processing
+            large result sets: Setting this higher than the default value will increase
+            processing speed at the cost of memory consumption; setting this lower can
+            avoid transferring row data that will never be read by the application.
+            <p>Default is 0, indicating to use the driver's default.</p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.MaxResults">
+            <summary>
+            Gets or sets the maximum number of rows for this HibernateTemplate.
+            </summary>
+            <value>The max results.</value>
+            <remarks>
+            This is important
+            for processing subsets of large result sets, avoiding to read and hold
+            the entire result set in the database or in the ADO.NET driver if we're
+            never interested in the entire result in the first place (for example,
+            when performing searches that might return a large number of matches).
+            <p>Default is 0, indicating to use the driver's default.</p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.AdoExceptionTranslator">
+            <summary>
+            Set the ADO.NET exception translator for this instance.
+            Applied to System.Data.Common.DbException (or provider specific exception type
+            in .NET 1.1) thrown by callback code, be it direct
+            DbException or wrapped Hibernate ADOExceptions.
+            <p>The default exception translator is either a ErrorCodeExceptionTranslator
+            if a DbProvider is available, or a FalbackExceptionTranslator otherwise
+            </p>
+            </summary>
+            <value>The ADO exception translator.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.ClassicHibernateTemplate">
+            <summary>
+            Gets the classic hibernate template for access to non-generic methods.
+            </summary>
+            <value>The classic hibernate template.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.HibernateTemplate.ProxyFactory">
+            <summary>
+            Gets or sets the proxy factory.
+            </summary>
+            <remarks>This may be useful to set if you create many instances of 
+            HibernateTemplate and/or HibernateDaoSupport.  This allows the same
+            ProxyFactory implementation to be used thereby limiting the
+            number of dynamic proxy types created in the temporary assembly, which
+            are never garbage collected due to .NET runtime semantics.
+            </remarks>
+            <value>The proxy factory.</value>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.GetByTypeHibernateCallback`1.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.LoadByTypeHibernateCallback`1.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Generic.IFindHibernateCallback`1">
+            <summary>
+            Callback interface (Generic version) for NHibernate code that
+            returns a List of objects.
+            </summary>
+            <typeparam name="T">The type of result object</typeparam>
+            <remarks>To be used with HibernateTemplate execute
+            method. The typical implementation will call 
+            Session.load/find/save/update to perform
+            some operations on persistent objects.
+            </remarks>
+            <author>Sree Nivask (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IFindHibernateCallback.cs,v 1.2 2007/09/19 22:58:10 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.IFindHibernateCallback`1.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+            <returns>Collection result object.</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.LoadAllByTypeHibernateCallback`1.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.FindHibernateCallback`1.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.FindByNamedParamHibernateCallback`1.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.FindByNamedQueryHibernateCallback`1.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.FindByNamedQueryAndNamedParamHibernateCallback`1.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.FindByNamedQueryAndValueObjectHibernateCallback`1.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Generic.Support.HibernateDaoSupport">
+            <summary>
+             Convenient super class for Hibernate data access objects.
+            </summary>
+            <remarks>
+            <para>Requires a SessionFactory to be set, providing a HibernateTemplate
+             based on it to subclasses. Can alternatively be initialized directly with
+            a HibernateTemplate, to reuse the latter's settings such as the SessionFactory,
+             exception translator, flush mode, etc
+            </para>
+            This base call is mainly intended for HibernateTemplate usage.
+            <para>
+            This class will create its own HibernateTemplate if only a SessionFactory
+            is passed in. The "allowCreate" flag on that HibernateTemplate will be "true"
+            by default. A custom HibernateTemplate instance can be used through overriding
+            <code>CreateHibernateTemplate</code>.
+            </para>
+            </remarks>
+            <author>Sree Nivask (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateDaoSupport.cs,v 1.3 2007/09/19 22:58:10 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.Support.HibernateDaoSupport.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Generic.Support.HibernateDaoSupport"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.Support.HibernateDaoSupport.CreateHibernateTemplate(NHibernate.ISessionFactory)">
+            <summary>
+            Create a HibernateTemplate for the given ISessionFactory.
+            </summary>
+            <remarks>
+            Only invoked if populating the DAO with a ISessionFactory reference!
+            <p>Can be overridden in subclasses to provide a HibernateTemplate instance
+            with different configuration, or a custom HibernateTemplate subclass.
+            </p>
+            </remarks>
+            <returns>The new HibernateTemplate instance</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.Support.HibernateDaoSupport.CheckDaoConfig">
+            <summary>
+            Check if the hibernate template property has been set.
+            </summary>
+            <exception cref="T:System.ArgumentException">If HibernateTemplate property is null.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.Support.HibernateDaoSupport.DoGetSession(System.Boolean)">
+            <summary>
+            Get a Hibernate Session, either from the current transaction or
+            a new one. The latter is only allowed if "allowCreate" is true.
+            </summary>
+            <remarks>Note that this is not meant to be invoked from HibernateTemplate code
+            but rather just in plain Hibernate code. Either rely on a thread-bound
+            Session (via HibernateInterceptor), or use it in combination with
+            ReleaseSession.
+            <para>
+            In general, it is recommended to use HibernateTemplate, either with
+            the provided convenience operations or with a custom HibernateCallback
+            that provides you with a Session to work on. HibernateTemplate will care
+            for all resource management and for proper exception conversion.
+            </para>
+            </remarks>
+            <param name="allowCreate"> if a non-transactional Session should be created when no
+            transactional Session can be found for the current thread
+            </param>
+            <returns>Hibernate session.</returns>
+            <exception cref="T:Spring.Dao.DataAccessResourceFailureException">
+            If the Session couldn't be created
+            </exception>
+            <exception cref="T:System.InvalidOperationException">
+            if no thread-bound Session found and allowCreate false
+            </exception>
+            <seealso cref="M:Spring.Data.NHibernate.Generic.Support.HibernateDaoSupport.ReleaseSession(NHibernate.ISession)"/>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.Support.HibernateDaoSupport.ConvertHibernateAccessException(NHibernate.HibernateException)">
+            <summary>
+            Convert the given HibernateException to an appropriate exception from the
+            <code>org.springframework.dao</code> hierarchy. Will automatically detect
+            wrapped ADO.NET Exceptions and convert them accordingly.
+            </summary>
+            <param name="ex">HibernateException that occured.</param>
+            <returns>
+            The corresponding DataAccessException instance
+            </returns>
+            <remarks>
+            The default implementation delegates to SessionFactoryUtils
+            and convertAdoAccessException. Can be overridden in subclasses.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Generic.Support.HibernateDaoSupport.ReleaseSession(NHibernate.ISession)">
+            <summary>
+            Close the given Hibernate Session, created via this DAO's SessionFactory,
+            if it isn't bound to the thread.
+            </summary>
+            <remarks>
+            Typically used in plain Hibernate code, in combination with the 
+            Session property and ConvertHibernateAccessException.
+            </remarks>      
+            <param name="session">The session to close.</param>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.Support.HibernateDaoSupport.HibernateTemplate">
+            <summary>
+            Gets or sets the hibernate template.
+            </summary>
+            <remarks>Set the HibernateTemplate for this DAO explicitly,
+            as an alternative to specifying a SessionFactory.
+            </remarks>
+            <value>The hibernate template.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.Support.HibernateDaoSupport.SessionFactory">
+            <summary>
+            Gets or sets the session factory to be used by this DAO.
+            Will automatically create a HibernateTemplate for the given SessionFactory.
+            </summary>
+            <value>The session factory.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Generic.Support.HibernateDaoSupport.Session">
+            <summary>
+            Get a Hibernate Session, either from the current transaction or a new one.
+            The latter is only allowed if the "allowCreate" setting of this object's
+            HibernateTemplate is true.
+            </summary>
+            <remarks>
+            <p><b>Note that this is not meant to be invoked from HibernateTemplate code
+            but rather just in plain Hibernate code.</b> Use it in combination with
+            <b>ReleaseSession</b>.
+            </p>
+            <p>In general, it is recommended to use HibernateTemplate, either with
+            the provided convenience operations or with a custom HibernateCallback
+            that provides you with a Session to work on. HibernateTemplate will care
+            for all resource management and for proper exception conversion.
+            </p>
+            </remarks>
+            <value>The Hibernate session.</value>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Support.OpenSessionInViewModule">
+            <summary>
+            Provide support for the open session in view pattern for lazily loaded hibernate objects
+            used in ASP.NET pages.
+            </summary>
+            <author>jjx: http://forum.springframework.net/member.php?u=29</author>
+            <author>Mark Pollack (.NET)</author>
+            <author>Erich Eichinger</author>
+            <author>Harald Radi</author>
+            <version>$Id: OpenSessionInViewModule.cs,v 1.7 2008/01/21 06:39:12 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Support.SessionScope">
+            <summary>
+            Implementation of SessionScope that associates a single session within the using scope.
+            </summary>
+            <remarks>
+            <para>It is recommended to be used in the following type of scenario:
+            <code>
+            using (new SessionScope())
+            {
+               ... do multiple operation, possibly in multiple transactions. 
+            }
+            </code>
+            At the end of "using", the session is automatically closed. All transactions within the scope use the same session,
+            if you are using Spring's HibernateTemplate or using Spring's implementation of NHibernate 1.2's 
+            ICurrentSessionContext interface.  
+            </para>
+            <para>
+            It is assumed that the session factory object name is called "SessionFactory". In case that you named the object 
+            in different way you can specify your can specify it in the application settings using the key
+            Spring.Data.NHibernate.Support.SessionScope.SessionFactoryObjectName.  Values for EntityInterceptorObjectName
+            and SingleSessionMode can be specified similarly.
+            </para>
+            <para>
+            <b>Note:</b>
+            The session is managed on a per thread basis on the thread that opens the scope instance. This means that you must
+            never pass a reference to a <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance over to another thread!
+            </para>
+            </remarks>
+            <author>Robert M. (.NET)</author>
+            <author>Harald Radi (.NET)</author>
+        </member>
+        <member name="F:Spring.Data.NHibernate.Support.SessionScope.log">
+            <summary>
+            The logging instance.
+            </summary>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class in single session mode, 
+            associating a session with the thread.  The session is opened lazily on demand.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class.
+            </summary>
+            <param name="open">
+            If set to <c>true</c> associate a session with the thread.  If false, another
+            collaborating class will associate the session with the thread, potentially by calling
+            the Open method on this class.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor(System.String,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class.
+            </summary>
+            <param name="sectionName">
+            The name of the configuration section to read configuration settings from. 
+            See <see cref="T:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings"/> for more info.
+            </param>
+            <param name="open">
+            If set to <c>true</c> associate a session with the thread.  If false, another
+            collaborating class will associate the session with the thread, potentially by calling
+            the Open method on this class.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor(System.String,System.Type,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class.
+            </summary>
+            <param name="sectionName">
+            The name of the configuration section to read configuration settings from. 
+            See <see cref="T:Spring.Data.NHibernate.Support.ConfigSectionSessionScopeSettings"/> for more info.
+            </param>
+            <param name="namespaceType">The type, who's full name is used for prefixing appSetting keys</param>
+            <param name="open">
+            If set to <c>true</c> associate a session with the thread.  If false, another
+            collaborating class will associate the session with the thread, potentially by calling
+            the Open method on this class.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor(NHibernate.ISessionFactory,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class.
+            </summary>
+            <param name="sessionFactory">
+            The <see cref="T:NHibernate.ISessionFactory"/> instance to be used for obtaining <see cref="T:NHibernate.ISession"/> instances.
+            </param>
+            <param name="open">
+            If set to <c>true</c> associate a session with the thread.  If false, another
+            collaborating class will associate the session with the thread, potentially by calling
+            the Open method on this class.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor(NHibernate.ISessionFactory,NHibernate.IInterceptor,System.Boolean,NHibernate.FlushMode,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class.
+            </summary>
+            <param name="sessionFactory">
+            The <see cref="T:NHibernate.ISessionFactory"/> instance to be used for obtaining <see cref="T:NHibernate.ISession"/> instances.
+            </param>
+            <param name="entityInterceptor">
+            Specify the <see cref="T:NHibernate.IInterceptor"/> to be set on each session provided by this <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance.
+            </param>
+            <param name="singleSession">
+            Set whether to use a single session for each request. See <see cref="P:Spring.Data.NHibernate.Support.SessionScope.SingleSession"/> property for details.
+            </param>
+            <param name="defaultFlushMode">
+            Specify the flushmode to be applied on each session provided by this <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> instance.
+            </param>
+            <param name="open">
+            If set to <c>true</c> associate a session with the thread.  If false, another
+            collaborating class will associate the session with the thread, potentially by calling
+            the Open method on this class.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.#ctor(Spring.Data.NHibernate.Support.SessionScopeSettings,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.SessionScope"/> class.
+            </summary>
+            <param name="settings">An <see cref="T:Spring.Data.NHibernate.Support.SessionScopeSettings"/> instance holding the scope configuration</param>
+            <param name="open">
+            If set to <c>true</c> associate a session with the thread.  If false, another
+            collaborating class will associate the session with the thread, potentially by calling
+            the Open method on this class.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.SetOpen(System.Boolean)">
+            <summary>
+            Sets a flag, whether this scope is in "open" state on the current logical thread.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.SetParticipating(System.Boolean)">
+            <summary>
+            Gets/Sets a flag, whether this scope manages it's own session for the current logical thread or not.
+            </summary>
+            <value><c>false</c> if session is managed by this module. <c>false</c> otherwise</value>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.Dispose">
+            <summary>
+            Call <code>Close()</code>, 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.Open">
+            <summary>
+            Opens a new session or participates in an existing session and 
+            registers with spring's <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.Close">
+            <summary>
+            Close the current view's session and unregisters 
+            from spring's <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.SingleSession">
+            <summary>
+            Set whether to use a single session for each request. Default is "true".
+            If set to false, each data access operation or transaction will use
+            its own session (like without Open Session in View). Each of those
+            sessions will be registered for deferred close, though, actually
+            processed at request completion.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.DefaultFlushMode">
+            <summary>
+            Gets the flushmode to be applied on each newly created session.
+            </summary>
+            <remarks>
+            This property defaults to <see cref="F:NHibernate.FlushMode.Never"/> to ensure that modifying objects outside the boundaries 
+            of a transaction will not be persisted. It is recommended to not change this value but wrap any modifying operation
+            within a transaction.
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.SessionFactory">
+            <summary>
+            Get or set the configured SessionFactory
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.EntityInterceptor">
+            <summary>
+            Get or set the configured EntityInterceptor
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.IsOpen">
+            <summary>
+            Gets a flag, whether this scope is in "open" state on the current logical thread.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.IsParticipating">
+            <summary>
+            Gets a flag, whether this scope manages it's own session for the current logical thread or not.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Support.SessionScope.LazySessionHolder">
+            <summary>
+            This sessionHolder creates a default session only if it is needed.
+            </summary>
+            <remarks>
+            Although a NHibernateSession deferes creation of db-connections until they are really
+            needed, instantiation a session is imho still more expensive than this LazySessionHolder. (EE)
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.NHibernate.SessionHolder">
+            <summary>
+            Session holder, wrapping a NHibernate ISession and a NHibernate Transaction.
+            HibernateTransactionManager binds instances of this class
+            to the thread, for a given ISessionFactory.
+            </summary>
+            <remarks>
+            Note: This is an SPI class, not intended to be used by applications.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: SessionHolder.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.#ctor">
+            <summary>
+            May be used by derived classes to create an empty SessionHolder.
+            </summary>
+            <remarks>
+            When using this ctor in your derived class, you MUST override <see cref="M:Spring.Data.NHibernate.SessionHolder.EnsureInitialized"/>!
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.#ctor(NHibernate.ISession)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.SessionHolder"/> class.
+            </summary>
+            <param name="session">The session.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.#ctor(System.Object,NHibernate.ISession)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.SessionHolder"/> class.
+            </summary>
+            <param name="key">The key to store the session under.</param>
+            <param name="session">The hibernate session.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.EnsureInitialized">
+            <summary>
+            May be overridden in a derived class to e.g. lazily create a session
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.GetSession(System.Object)">
+            <summary>
+            Gets the session given key identifier
+            </summary>
+            <param name="key">The key.</param>
+            <returns>A hibernate session</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.GetValidatedSession(System.Object)">
+            <summary>
+            Gets the session given the key and removes the session from
+            the dictionary storage.
+            </summary>
+            <param name="key">The key.</param>
+            <returns>A hibernate session</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.AddSession(NHibernate.ISession)">
+            <summary>
+            Adds the session to the dictionary storage using the default key.
+            </summary>
+            <param name="session">The hibernate session.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.AddSession(System.Object,NHibernate.ISession)">
+            <summary>
+            Adds the session to the dictionary storage using the supplied key.
+            </summary>
+            <param name="key">The key.</param>
+            <param name="session">The hibernate session.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.RemoveSession(System.Object)">
+            <summary>
+            Removes the session from the dictionary storage for the given key.
+            </summary>
+            <param name="key">The key.</param>
+            <returns>The session that was previously contained in the
+            dictionary storage.</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.ContainsSession(System.Object)">
+            <summary>
+            Determines whether the holder the specified session.
+            </summary>
+            <param name="session">The session.</param>
+            <returns>
+            	<c>true</c> if the holder contains the specified session; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionHolder.Clear">
+            <summary>
+            Clear the transaction state of this resource holder.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.Session">
+            <summary>
+            Gets the session using the default key
+            </summary>
+            <value>The hibernate session.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.AnySession">
+            <summary>
+            Gets the first session based on iteration over
+            the IDictionary storage.
+            </summary>
+            <value>Any hibernate session.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.IsEmpty">
+            <summary>
+            Gets a value indicating whether dictionary of
+            hibernate sessions is empty.
+            </summary>
+            <value>
+            	<c>true</c> if this session holder is empty; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.DoesNotHoldNonDefaultSession">
+            <summary>
+            Gets a value indicating whether this SessionHolder
+            does not hold non default session.
+            </summary>
+            <value>
+            	<c>true</c> if does not hold non default session; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.Transaction">
+            <summary>
+            Gets or sets the hibernate transaction.
+            </summary>
+            <value>The transaction.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.Connection">
+            <summary>
+            Gets or sets the ADO.NET Connection used to create the session.
+            </summary>
+            <value>The ADO.NET connection.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.PreviousFlushMode">
+            <summary>
+            Gets or sets the previous flush mode.
+            </summary>
+            <value>The previous flush mode.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.AssignedPreviousFlushMode">
+            <summary>
+            Gets a value indicating whether the PreviousFlushMode property
+            was set.
+            </summary>
+            <value>
+            	<c>true</c> if assigned PreviousFlushMode property; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.SessionHolder.ValidatedSession">
+            <summary>
+            Gets the validated session.
+            </summary>
+            <value>The validated session.</value>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.LazySessionHolder.#ctor(Spring.Data.NHibernate.Support.SessionScope)">
+            <summary>
+            Initialize a new instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.LazySessionHolder.EnsureInitialized">
+            <summary>
+            Create a new session on demand
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.SessionScope.LazySessionHolder.Close">
+            <summary>
+            Ensure session is closed (if any) and remove circular references to avoid memory leaks!
+            </summary>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.SessionScope.LazySessionHolder.Current">
+            <summary>
+            Gets or sets the LazySessionHolder instance for the current request
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.OpenSessionInViewModule.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.OpenSessionInViewModule"/> class.  Creates a SessionScope,
+            but does not yet associate a session with a thread, that is lef to the lifecycle of the request.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.OpenSessionInViewModule.Init(System.Web.HttpApplication)">
+            <summary>
+            Register context handler and look up SessionFactoryObjectName under the application configuration key,
+            Spring.Data.NHibernate.Support.OpenSessionInViewModule.SessionFactoryObjectName if not using the default value
+            (i.e. sessionFactory) and look up the SingleSession setting under the application configuration key,
+            Spring.Data.NHibernate.Support.OpenSessionInViewModule.SingleSession if not using the default value of true.
+            </summary>
+            <param name="context">The standard HTTP application context</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.OpenSessionInViewModule.Dispose">
+            <summary>
+            A do nothing dispose method.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Generic.FindHibernateDelegate`1">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning an IList of result objects created within the callback. 
+            Note that there's special support for single step actions: 
+            see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+            <typeparam name="T">The type of result object</typeparam>
+            <author>Sree Nivask (.NET)</author>
+            <version>$Id: FindHibernateDelegate.cs,v 1.2 2007/09/19 22:58:10 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateTransactionManager">
+            <summary>
+            PlatformTransactionManager implementation for a single Hibernate SessionFactory.
+            Binds a Hibernate Session from the specified factory to the thread, potentially
+            allowing for one thread Session per factory
+            </summary>
+            <remarks>
+            SessionFactoryUtils and HibernateTemplate are aware of thread-bound Sessions and participate in such
+            transactions automatically. Using either of those is required for Hibernate
+            access code that needs to support this transaction handling mechanism.
+            <para>
+            Supports custom isolation levels at the start of the transaction
+            , and timeouts that get applied as appropriate
+            Hibernate query timeouts. To support the latter, application code must either use
+            <code>HibernateTemplate</code> (which by default applies the timeouts) or call
+            <code>SessionFactoryUtils.applyTransactionTimeout</code> for each created
+            Hibernate Query object.
+            </para>
+            <para>Note that you can specify a Spring IDbProvider instance which if shared with
+            a corresponding instance of AdoTemplate will allow for mixing ADO.NET/NHibernate
+            operations within a single transaction.</para>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateTransactionManager.cs,v 1.7 2007/11/20 14:39:48 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.NHibernate.HibernateTransactionManager.objectFactory">
+            <summary>
+            Just needed for entityInterceptorBeanName. 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateTransactionManager"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.#ctor(NHibernate.ISessionFactory)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateTransactionManager"/> class.
+            </summary>
+            <param name="sessionFactory">The session factory.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoGetTransaction">
+            <summary>
+            Return the current transaction object.
+            </summary>
+            <returns>The current transaction object.</returns>
+            <exception cref="T:Spring.Transaction.CannotCreateTransactionException">
+            If transaction support is not available.
+            </exception>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of lookup or system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.IsExistingTransaction(System.Object)">
+            <summary>
+            Check if the given transaction object indicates an existing,
+            i.e. already begun, transaction.
+            </summary>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <returns>True if there is an existing transaction.</returns>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoBegin(System.Object,Spring.Transaction.ITransactionDefinition)">
+            <summary>
+            Begin a new transaction with the given transaction definition.
+            </summary>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <param name="definition">
+            <see cref="T:Spring.Transaction.ITransactionDefinition"/> instance, describing
+            propagation behavior, isolation level, timeout etc.
+            </param>
+            <remarks>
+            Does not have to care about applying the propagation behavior,
+            as this has already been handled by this abstract manager.
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of creation or system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoSuspend(System.Object)">
+            <summary>
+            Suspend the resources of the current transaction.
+            </summary>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <returns>
+            An object that holds suspended resources (will be kept unexamined for passing it into
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoResume(System.Object,System.Object)"/>.)
+            </returns>
+            <remarks>
+            Transaction synchronization will already have been suspended.
+            </remarks>
+            <exception cref="T:Spring.Transaction.IllegalTransactionStateException">
+            If suspending is not supported by the transaction manager implementation.
+            </exception>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            in case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoResume(System.Object,System.Object)">
+            <summary>
+            Resume the resources of the current transaction.
+            </summary>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <param name="suspendedResources">
+            The object that holds suspended resources as returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoSuspend(System.Object)"/>.
+            </param>
+            <remarks>
+            Transaction synchronization will be resumed afterwards.
+            </remarks>
+            <exception cref="T:Spring.Transaction.IllegalTransactionStateException">
+            If suspending is not supported by the transaction manager implementation.
+            </exception>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoCommit(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Perform an actual commit on the given transaction.
+            </summary>
+            <param name="status">The status representation of the transaction.</param>
+            <remarks>
+            <p>
+            An implementation does not need to check the rollback-only flag.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoRollback(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Perform an actual rollback on the given transaction.
+            </summary>
+            <param name="status">The status representation of the transaction.</param>
+            <remarks>
+            An implementation does not need to check the new transaction flag.
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoSetRollbackOnly(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Set the given transaction rollback-only. Only called on rollback
+            if the current transaction takes part in an existing one.
+            </summary>
+            <param name="status">The status representation of the transaction.</param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.GetIDbTransaction(NHibernate.ITransaction)">
+            <summary>
+            Gets the ADO.NET IDbTransaction object from the NHibernate ITransaction object.
+            </summary>
+            <param name="hibernateTx">The hibernate transaction.</param>
+            <returns>The ADO.NET transaction.  Null if could not get the transaction.  Warning
+            messages will be logged in that case.</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.ConvertHibernateAccessException(NHibernate.HibernateException)">
+            <summary>
+            Convert the given HibernateException to an appropriate exception from
+            the Spring.Dao hierarchy. Can be overridden in subclasses.
+            </summary>
+            <param name="ex">The HibernateException that occured.</param>
+            <returns>The corresponding DataAccessException instance</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.ConvertAdoAccessException(NHibernate.ADOException,Spring.Data.Support.IAdoExceptionTranslator)">
+            <summary>
+            Convert the given ADOException to an appropriate exception from the
+            the Spring.Dao hierarchy. Can be overridden in subclasses.
+            </summary>
+            <param name="ex">The ADOException that occured, wrapping the underlying
+            ADO.NET thrown exception.</param>
+            <param name="translator">The translator to convert hibernate ADOExceptions.</param>
+            <returns>
+            The corresponding DataAccessException instance
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.DoCleanupAfterCompletion(System.Object)">
+            <summary>
+            Cleanup resources after transaction completion.
+            </summary>
+            <param name="transaction">Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.</param>
+            <remarks>
+            <note>
+            This implemenation unbinds the SessionFactory and 
+            DbProvider from thread local storage and closes the 
+            ISession.
+            </note>
+            	<p>
+            Called after <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoCommit(Spring.Transaction.Support.DefaultTransactionStatus)"/>
+            and
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoRollback(Spring.Transaction.Support.DefaultTransactionStatus)"/>
+            execution on any outcome.
+            </p>
+            	<p>
+            Should not throw any exceptions but just issue warnings on errors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTransactionManager.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has injected all of an object's dependencies.
+            </summary>
+            <remarks>
+            <p>
+            This method allows the object instance to perform the kind of
+            initialization only possible when all of it's dependencies have
+            been injected (set), and to throw an appropriate exception in the
+            event of misconfiguration.
+            </p>
+            <p>
+            Please do consult the class level documentation for the
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> interface for a
+            description of exactly <i>when</i> this method is invoked. In
+            particular, it is worth noting that the
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            and <see cref="T:Spring.Context.IApplicationContextAware"/>
+            callbacks will have been invoked <i>prior</i> to this method being
+            called.
+            </p>
+            </remarks>
+            <exception cref="T:System.ArgumentException">
+            In the event of misconfiguration (such as the failure to set a
+            required property) or if initialization fails.
+            </exception>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.DbProvider">
+            <summary>
+            Gets or sets the db provider.
+            </summary>
+            <value>The db provider.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.EntityInterceptor">
+            <summary>
+            Gets or sets a Hibernate entity interceptor that allows to inspect and change
+            property values before writing to and reading from the database.
+            When getting, return the current Hibernate entity interceptor, or <code>null</code> if none.
+            </summary>
+            <value>The entity interceptor.</value>
+            <remarks>
+            Resolves an entity interceptor object name via the object factory,
+            if necessary.
+            Will get applied to any new Session created by this transaction manager.
+            Such an interceptor can either be set at the SessionFactory level,
+            i.e. on LocalSessionFactoryObject, or at the Session level, i.e. on
+            HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
+            It's preferable to set it on LocalSessionFactoryObject or HibernateTransactionManager
+            to avoid repeated configuration and guarantee consistent behavior in transactions.
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">If object factory is null and need to get entity interceptor via object name.</exception>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.EntityInterceptorObjectName">
+            <summary>
+            Sets the object name of a Hibernate entity interceptor that
+            allows to inspect and change property values before writing to and reading from the database.
+            </summary>
+            <value>The name of the entity interceptor object.</value>
+            <remarks>
+            Will get applied to any new Session created by this transaction manager.
+            <p>Requires the object factory to be known, to be able to resolve the object
+            name to an interceptor instance on session creation. Typically used for
+            prototype interceptors, i.e. a new interceptor instance per session.
+            </p>
+            	<p>Can also be used for shared interceptor instances, but it is recommended
+            to set the interceptor reference directly in such a scenario.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.AdoExceptionTranslator">
+            <summary>
+            Gets or sets the ADO.NET exception translator for this transaction manager.
+            </summary>
+            <remarks>
+            Applied to ADO.NET Exceptions (wrapped by Hibernate's ADOException)
+            </remarks>
+            <value>The ADO exception translator.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.DefaultAdoExceptionTranslator">
+            <summary>
+            Gets the default IAdoException translator, lazily creating it if nece
+            </summary>
+            <value>The default IAdoException translator.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.SessionFactory">
+            <summary>
+            Gets or sets the SessionFactory that this instance should manage transactions for.
+            </summary>
+            <value>The session factory.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.AutodetectDbProvider">
+            <summary>
+            Set whether to autodetect a ADO.NET connection used by the Hibernate SessionFactory,
+            if set via LocalSessionFactoryObject's <code>DbProvider</code>. Default is "true".
+            </summary>
+            <value>
+            	<c>true</c> if [autodetect data source]; otherwise, <c>false</c>.
+            </value>
+            <remarks>
+            	<p>Can be turned off to deliberately ignore an available IDbProvider,
+            to not expose Hibernate transactions as ADO.NET transactions for that IDbProvider.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.ObjectFactory">
+            <summary>
+            The object factory just needs to be known for resolving entity interceptor
+            It does not need to be set for any other mode of operation.
+            </summary>
+            <value>
+            Owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            (may not be <see langword="null"/>). The object can immediately
+            call methods on the factory.
+            </value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTransactionManager.HibernateTransactionObject.RollbackOnly">
+            <summary>
+            Return whether the transaction is internally marked as rollback-only.
+            </summary>
+            <value></value>
+            <returns>True of the transaction is marked as rollback-only.</returns>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateTemplate">
+             <summary>
+             Helper class that simplifies NHibernate data access code
+             </summary>
+             <remarks>
+             <p>Typically used to implement data access or business logic services that
+             use NHibernate within their implementation but are Hibernate-agnostic in their
+             interface. The latter or code calling the latter only have to deal with
+             domain objects.</p>
+            
+             <p>The central method is Execute supporting Hibernate access code
+             implementing the HibernateCallback interface. It provides NHibernate Session
+             handling such that neither the IHibernateCallback implementation nor the calling
+             code needs to explicitly care about retrieving/closing NHibernate Sessions,
+             or handling Session lifecycle exceptions. For typical single step actions,
+             there are various convenience methods (Find, Load, SaveOrUpdate, Delete).
+             </p>
+             
+             <p>Can be used within a service implementation via direct instantiation
+             with a ISessionFactory reference, or get prepared in an application context
+             and given to services as an object reference. Note: The ISessionFactory should
+             always be configured as an object in the application context, in the first case
+             given to the service directly, in the second case to the prepared template.
+             </p>
+             
+             <p>This class can be considered as direct alternative to working with the raw
+             Hibernate Session API (through SessionFactoryUtils.Session).
+             </p>
+             
+             <p>LocalSessionFactoryObject is the preferred way of obtaining a reference
+             to a specific NHibernate ISessionFactory.
+             </p>
+             </remarks>
+             <author>Mark Pollack (.NET)</author>
+             <version>$Id: HibernateTemplate.cs,v 1.3 2008/01/24 17:29:16 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.NHibernate.IHibernateOperations">
+            <summary>
+            Interface that specifies a basic set of Hibernate operations.
+            </summary>
+            <remarks>
+            Implemented by HibernateTemplate. Not often used, but a useful option
+            to enhance testability, as it can easily be mocked or stubbed.
+            <p>Provides HibernateTemplate's data access methods that mirror
+            various Session methods. See the NHibernate ISession documentation
+            for details on those methods.
+            </p>
+            </remarks>
+            <threadsafety statis="true" instance="true"/> 
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IHibernateOperations.cs,v 1.2 2007/09/19 22:58:22 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.DeleteAll(System.Collections.ICollection)">
+            <summary>
+            Delete all given persistent instances.
+            </summary>
+            <param name="entities">The persistent instances to delete.</param>
+            <remarks>
+            This can be combined with any of the find methods to delete by query
+            in two lines of code, similar to Session's delete by query methods.
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Execute(Spring.Data.NHibernate.HibernateDelegate)">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning a result object, i.e. a domain
+            object or a collection of domain objects.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+            <returns>a result object returned by the action, or <code>null</code>
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Execute(Spring.Data.NHibernate.IHibernateCallback)">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning a result object, i.e. a domain
+            object or a collection of domain objects.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <param name="action">The callback object that specifies the Hibernate action.</param>
+            <returns>a result object returned by the action, or <code>null</code>
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.ExecuteFind(Spring.Data.NHibernate.IHibernateCallback)">
+            <summary>
+            Execute the specified action assuming that the result object is a List.
+            </summary>
+            <remarks>
+            This is a convenience method for executing Hibernate find calls or
+            queries within an action.
+            </remarks>
+            <param name="action">The calback object that specifies the Hibernate action.</param>
+            <returns>A IList returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Find(System.String)">
+            <summary>
+            Execute a query for persistent instances.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Find(System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="value">the value of the parameter</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Find(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a query for persistent instances, binding one value
+            to a "?" parameter of the given type in the query string.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="value">The value of the parameter.</param>
+            <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Find(System.String,System.Object[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="values">the values of the parameters</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Find(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a query for persistent instances, binding a number of
+            values to "?" parameters of the given types in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentException">If values and types are not null and their lengths are not equal</exception>          
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedParam(System.String,System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a named parameter in the query string.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">The name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedParam(System.String,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a named parameter in the query string.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">The name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedParam(System.String,System.String[],System.Object[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to named parameters in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedParam(System.String,System.String[],System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to named parameters in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+            if paramNames length is not equal to types length (when types is not null)</exception>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQuery(System.String)">
+            <summary>
+            Execute a named query for persistent instances.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQuery(System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+             A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="value">The value of the parameter</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQuery(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQuery(System.String,System.Object[])">
+            <summary>
+            Execute a named query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="values">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQuery(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a named query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If values and types are not null and their lengths differ.</exception>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQueryAndNamedParam(System.String,System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a named parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQueryAndNamedParam(System.String,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a named parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">The Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQueryAndNamedParam(System.String,System.String[],System.Object[])">
+            <summary>
+            Execute a named query for persistent instances, binding
+            number of values to named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters.</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQueryAndNamedParam(System.String,System.String[],System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a named query for persistent instances, binding
+            number of values to named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters.</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+            if paramNames length is not equal to types length (when types is not null)</exception>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByNamedQueryAndValueObject(System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding the properties
+            of the given object to named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="valueObject">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.FindByValueObject(System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding the properties
+            of the given object to <i>named</i> parameters in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>       
+            <param name="valueObject">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Get(System.Type,System.Object)">
+            <summary>
+            Return the persistent instance of the given entity type
+            with the given identifier, or <code>null</code> if not found.
+            </summary>
+            <param name="entityType">a persistent type.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <returns>the persistent instance, or null if not found</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Get(System.Type,System.Object,NHibernate.LockMode)">
+            <summary>
+            Return the persistent instance of the given entity type
+            with the given identifier, or <code>null</code> if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <param name="entityType">A persistent class.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <param name="lockMode">The lock mode.</param>
+            the persistent instance, or <code>null</code> if not found
+            <returns>the persistent instance, or null if not found</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Load(System.Type,System.Object)">
+            <summary>
+            Return the persistent instance of the given entity class
+             with the given identifier, throwing an exception if not found.
+            </summary>
+            <param name="entityType">Type of the entity.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <returns>The persistent instance</returns>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If not found</exception>     
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception> 
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.Load(System.Type,System.Object,NHibernate.LockMode)">
+            <summary>
+            Return the persistent instance of the given entity class
+            with the given identifier, throwing an exception if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <param name="entityType">Type of the entity.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <param name="lockMode">The lock mode.</param>
+            <returns>The persistent instance</returns>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If not found</exception>     
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception> 
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.LoadAll(System.Type)">
+            <summary>
+            Return all persistent instances of the given entity class.
+            Note: Use queries or criteria for retrieving a specific subset.
+            </summary>
+            <param name="entityType">Type of the entity.</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception> 
+        </member>
+        <member name="M:Spring.Data.NHibernate.IHibernateOperations.SaveOrUpdateAll(System.Collections.ICollection)">
+            <summary>
+            Save or update all given persistent instances,
+            according to its id (matching the configured "unsaved-value"?).
+            </summary>
+            <param name="entities">Tthe persistent instances to save or update
+            (to be associated with the Hibernate Session)he entities.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="F:Spring.Data.NHibernate.HibernateTemplate.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class. 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateTemplate"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.#ctor(NHibernate.ISessionFactory)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateTemplate"/> class.
+            </summary>
+            <remarks>The default for creating a new non-transactional
+            session when no transactional Session can be found for the current thread
+            is set to true.</remarks>
+            <param name="sessionFactory">The session factory to create sessions.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.#ctor(NHibernate.ISessionFactory,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateTemplate"/> class.
+            </summary>
+            <param name="sessionFactory">The session factory to create sessions.</param>        
+            <param name="allowCreate">if set to <c>true</c> allow creation
+            of a new non-transactional when no transactional Session can be found 
+            for the current thread.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.ClearAction(NHibernate.ISession)">
+            <summary>
+            Delegate function that clears the session.
+            </summary>
+            <param name="session">The hibernate session.</param>
+            <returns>null</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Flush">
+            <summary>
+            Flush all pending saves, updates and deletes to the database.
+            </summary>
+            <remarks>
+            Only invoke this for selective eager flushing, for example when ADO.NET code
+            needs to see certain changes within the same transaction. Else, it's preferable
+            to rely on auto-flushing at transaction completion.
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Get(System.Type,System.Object)">
+            <summary>
+            Return the persistent instance of the given entity type
+            with the given identifier, or <code>null</code> if not found.
+            </summary>
+            <param name="entityType">The type.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <returns>The persistent instance, or <code>null</code> if not found</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Get(System.Type,System.Object,NHibernate.LockMode)">
+            <summary>
+            Return the persistent instance of the given entity type
+            with the given identifier, or <code>null</code> if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <param name="type">The type.</param>
+            <param name="id">The lock mode to obtain.</param>
+            <param name="lockMode">The lock mode.</param>
+            the persistent instance, or <code>null</code> if not found
+            <returns>the persistent instance, or null if not found</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Load(System.Type,System.Object)">
+            <summary>
+            Return the persistent instance of the given entity class
+            with the given identifier, throwing an exception if not found.
+            </summary>
+            <param name="entityType">Type of the entity.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <returns>The persistent instance</returns>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If not found</exception>     
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception> 
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Load(System.Type,System.Object,NHibernate.LockMode)">
+            <summary>
+            Return the persistent instance of the given entity class
+             with the given identifier, throwing an exception if not found.
+            Obtains the specified lock mode if the instance exists.
+            </summary>
+            <param name="entityType">Type of the entity.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <param name="lockMode">The lock mode.</param>
+            <returns>The persistent instance</returns>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If not found</exception>     
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception> 
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Load(System.Object,System.Object)">
+            <summary>
+            Load the persistent instance with the given identifier
+            into the given object, throwing an exception if not found.
+            </summary>
+            <param name="entity">Entity the object (of the target class) to load into.</param>
+            <param name="id">An identifier of the persistent instance.</param>
+            <exception cref="T:Spring.Dao.ObjectRetrievalFailureException">If object not found.</exception>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.LoadAll(System.Type)">
+            <summary>
+            Return all persistent instances of the given entity class.
+            Note: Use queries or criteria for retrieving a specific subset.
+            </summary>
+            <param name="entityType">Type of the entity.</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception> 
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Refresh(System.Object)">
+            <summary>
+            Re-read the state of the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to re-read.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Refresh(System.Object,NHibernate.LockMode)">
+            <summary>
+            Re-read the state of the given persistent instance.
+            Obtains the specified lock mode for the instance.
+            </summary>
+            <param name="entity">The persistent instance to re-read.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Lock(System.Object,NHibernate.LockMode)">
+            <summary>
+            Obtain the specified lock level upon the given object, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </summary>
+            <param name="entity">The he persistent instance to lock.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.ObjectOptimisticLockingFailureException">If not found</exception>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Save(System.Object)">
+            <summary>
+            Persist the given transient instance.
+            </summary>
+            <param name="entity">The transient instance to persist.</param>
+            <returns>The generated identifier.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Save(System.Object,System.Object)">
+            <summary>
+            Persist the given transient instance with the given identifier.
+            </summary>
+            <param name="entity">The transient instance to persist.</param>
+            <param name="id">The identifier to assign.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Update(System.Object)">
+            <summary>
+            Update the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to update.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Update(System.Object,NHibernate.LockMode)">
+            <summary>
+            Update the given persistent instance.
+            Obtains the specified lock mode if the instance exists, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </summary>
+            <param name="entity">The persistent instance to update.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.SaveOrUpdate(System.Object)">
+            <summary>
+            Save or update the given persistent instance,
+            according to its id (matching the configured "unsaved-value"?).
+            </summary>
+            <param name="entity">Tthe persistent instance to save or update
+            (to be associated with the Hibernate Session).</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.SaveOrUpdateAll(System.Collections.ICollection)">
+            <summary>
+            Save or update all given persistent instances,
+            according to its id (matching the configured "unsaved-value"?).
+            </summary>
+            <param name="entities">Tthe persistent instances to save or update
+            (to be associated with the Hibernate Session)he entities.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.SaveOrUpdateCopy(System.Object)">
+            <summary>
+            Save or update the contents of given persistent object,
+            according to its id (matching the configured "unsaved-value"?).
+            Will copy the contained fields to an already loaded instance
+            with the same id, if appropriate.
+            </summary>
+            <param name="entity">The persistent object to save or update.
+            (<i>not</i> necessarily to be associated with the Hibernate Session)
+            </param>
+            <returns>The actually associated persistent object.
+            (either an already loaded instance with the same id, or the given object)</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Clear">
+            <summary>
+            Remove all objects from the Session cache, and cancel all pending saves,
+            updates and deletes.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Contains(System.Object)">
+            <summary>
+            Determines whether the given object is in the Session cache.
+            </summary>
+            <param name="entity">the persistence instance to check.</param>
+            <returns>
+            	<c>true</c> if session cache contains the specified entity; otherwise, <c>false</c>.
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Evict(System.Object)">
+            <summary>
+            Remove the given object from the Session cache.
+            </summary>
+            <param name="entity">The persistent instance to evict.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Delete(System.Object)">
+            <summary>
+            Delete the given persistent instance.
+            </summary>
+            <param name="entity">The persistent instance to delete.</param>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Delete(System.Object,NHibernate.LockMode)">
+            <summary>
+            Delete the given persistent instance.
+            </summary>
+            <param name="entity">Tthe persistent instance to delete.</param>
+            <param name="lockMode">The lock mode to obtain.</param>
+            <remarks>
+            Obtains the specified lock mode if the instance exists, implicitly
+            checking whether the corresponding database entry still exists
+            (throwing an OptimisticLockingFailureException if not found).
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Delete(System.String)">
+            <summary>
+            Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Delete(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+             Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <param name="value">The value of the parameter.</param>
+            <param name="type">The Hibernate type of the parameter (or <code>null</code>).</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Delete(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Delete all objects returned by the query.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language.</param>
+            <param name="values">The values of the parameters.</param>
+            <param name="types"> Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>The number of entity instances deleted.</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If length for argument values and types are not equal.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.DeleteAll(System.Collections.ICollection)">
+            <summary>
+            Delete all given persistent instances.
+            </summary>
+            <param name="entities">The persistent instances to delete.</param>
+            <remarks>
+            This can be combined with any of the find methods to delete by query
+            in two lines of code, similar to Session's delete by query methods.
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Execute(Spring.Data.NHibernate.HibernateDelegate)">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning a result object, i.e. a domain
+            object or a collection of domain objects.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <param name="del">The delegate callback object that specifies the Hibernate action.</param>
+            <returns>a result object returned by the action, or <code>null</code>
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Execute(Spring.Data.NHibernate.HibernateDelegate,System.Boolean)">
+            <summary>
+            Execute the action specified by the delegate within a Session.
+            </summary>
+            <param name="del">The HibernateDelegate that specifies the action
+            to perform.</param>
+            <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+            callback code.</param>
+            <returns>a result object returned by the action, or <code>null</code>
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Execute(Spring.Data.NHibernate.IHibernateCallback)">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <param name="action">The callback object that specifies the Hibernate action.</param>
+            <returns>
+            a result object returned by the action, or <code>null</code>
+            </returns>
+            <remarks>
+            Application exceptions thrown by the action object get propagated to the
+            caller (can only be unchecked). Hibernate exceptions are transformed into
+            appropriate DAO ones. Allows for returning a result object, i.e. a domain
+            object or a collection of domain objects.
+            <p>Note: Callback code is not supposed to handle transactions itself!
+            Use an appropriate transaction manager like HibernateTransactionManager.
+            Generally, callback code must not touch any Session lifecycle methods,
+            like close, disconnect, or reconnect, to let the template do its work.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.ExecuteFind(Spring.Data.NHibernate.IHibernateCallback)">
+            <summary>
+            Execute the specified action assuming that the result object is a List.
+            </summary>
+            <remarks>
+            This is a convenience method for executing Hibernate find calls or
+            queries within an action.
+            </remarks>
+            <param name="action">The calback object that specifies the Hibernate action.</param>
+            <returns>A IList returned by the action, or null
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Execute(Spring.Data.NHibernate.IHibernateCallback,System.Boolean)">
+            <summary>
+            Execute the action specified by the given action object within a Session.
+            </summary>
+            <param name="action">callback object that specifies the Hibernate action.</param>
+            <param name="exposeNativeSession">if set to <c>true</c> expose the native hibernate session to
+            callback code.</param>
+            <returns>
+            a result object returned by the action, or <code>null</code>
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Find(System.String)">
+            <summary>
+            Execute a query for persistent instances.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <returns>
+            a List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Find(System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="value">the value of the parameter</param>
+            <returns>
+            a List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Find(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a query for persistent instances, binding one value
+            to a "?" parameter of the given type in the query string.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="value">The value of the parameter.</param>
+            <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>
+            a List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Find(System.String,System.Object[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            </summary>
+            <param name="queryString">a query expressed in Hibernate's query language</param>
+            <param name="values">the values of the parameters</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.Find(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a query for persistent instances, binding a number of
+            values to "?" parameters of the given types in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>
+            a List containing 0 or more persistent instances
+            </returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentException">If values and types are not null and their lengths are not equal</exception>          
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedParam(System.String,System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a named parameter in the query string.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">The name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <returns>a List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedParam(System.String,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a query for persistent instances, binding
+            one value to a named parameter in the query string.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">The name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedParam(System.String,System.String[],System.Object[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to named parameters in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedParam(System.String,System.String[],System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a query for persistent instances, binding a
+            number of values to named parameters in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+            if paramNames length is not equal to types length (when types is not null)</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQuery(System.String)">
+            <summary>
+            Execute a named query for persistent instances.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQuery(System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+             A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="value">The value of the parameter</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQuery(System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a "?" parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQuery(System.String,System.Object[])">
+            <summary>
+            Execute a named query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="values">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQuery(System.String,System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a named query for persistent instances, binding a
+            number of values to "?" parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="values">The values of the parameters</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If values and types are not null and their lengths differ.</exception>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQueryAndNamedParam(System.String,System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a named parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQueryAndNamedParam(System.String,System.String,System.Object,NHibernate.Type.IType)">
+            <summary>
+            Execute a named query for persistent instances, binding
+            one value to a named parameter in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramName">Name of the parameter</param>
+            <param name="value">The value of the parameter</param>
+            <param name="type">The Hibernate type of the parameter (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQueryAndNamedParam(System.String,System.String[],System.Object[])">
+            <summary>
+            Execute a named query for persistent instances, binding
+            number of values to named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters.</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQueryAndNamedParam(System.String,System.String[],System.Object[],NHibernate.Type.IType[])">
+            <summary>
+            Execute a named query for persistent instances, binding
+            number of values to named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="paramNames">The names of the parameters</param>
+            <param name="values">The values of the parameters.</param>
+            <param name="types">Hibernate types of the parameters (or <code>null</code>)</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">If paramNames length is not equal to values length or
+            if paramNames length is not equal to types length (when types is not null)</exception>                
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByNamedQueryAndValueObject(System.String,System.Object)">
+            <summary>
+            Execute a named query for persistent instances, binding the properties
+            of the given object to  named parameters in the query string.
+            A named query is defined in a Hibernate mapping file.
+            </summary>
+            <param name="queryName">The name of a Hibernate query in a mapping file</param>
+            <param name="valueObject">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.FindByValueObject(System.String,System.Object)">
+            <summary>
+            Execute a query for persistent instances, binding the properties
+            of the given object to <i>named</i> parameters in the query string.
+            </summary>
+            <param name="queryString">A query expressed in Hibernate's query language</param>       
+            <param name="valueObject">The values of the parameters</param>
+            <returns>A List containing 0 or more persistent instances</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">In case of Hibernate errors</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.CreateSessionProxy(NHibernate.ISession)">
+            <summary>
+            Create a close-suppressing proxy for the given Hibernate Session.
+            The proxy also prepares returned Query and Criteria objects.
+            </summary>
+            <param name="session">The session.</param>
+            <returns>The session proxy.</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.CheckWriteOperationAllowed(NHibernate.ISession)">
+            <summary>
+            Check whether write operations are allowed on the given Session.
+            </summary>
+            <remarks>
+            Default implementation throws an InvalidDataAccessApiUsageException
+            in case of FlushMode.Never. Can be overridden in subclasses.
+            </remarks>
+            <param name="session">The current Hibernate session.</param>
+            <exception cref="T:Spring.Dao.InvalidDataAccessApiUsageException">If write operation is attempted in read-only mode
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateTemplate.AreEqualFlushMode(Spring.Data.NHibernate.TemplateFlushMode,NHibernate.FlushMode)">
+            <summary>
+            Compares if the flush mode enumerations, Spring's
+            TemplateFlushMode and NHibernates FlushMode have equal
+            settings.
+            </summary>
+            <param name="tfm">The template flush mode.</param>
+            <param name="fm">The NHibernate flush mode.</param>
+            <returns>
+            Returns true if both are Never, Auto, or Commit, false
+            otherwise.
+            </returns>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.AllowCreate">
+            <summary>
+            Gets or sets if a new Session should be created when no transactional Session
+            can be found for the current thread.
+            </summary>
+            <value>
+            	<c>true</c> if allowed to create non-transaction session;
+            otherwise, <c>false</c>.
+            </value>
+            <remarks>
+            	<p>HibernateTemplate is aware of a corresponding Session bound to the
+            current thread, for example when using HibernateTransactionManager.
+            If allowCreate is true, a new non-transactional Session will be created
+            if none found, which needs to be closed at the end of the operation.
+            If false, an InvalidOperationException will get thrown in this case.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.AlwaysUseNewSession">
+            <summary>
+            Gets or sets a value indicating whether to always
+            use a new Hibernate Session for this template.
+            </summary>
+            <value><c>true</c> if always use new session; otherwise, <c>false</c>.</value>
+            <remarks>
+            	<p>
+            Default is "false"; if activated, all operations on this template will
+            work on a new NHibernate ISession even in case of a pre-bound ISession
+            (for example, within a transaction).
+            </p>
+            	<p>Within a transaction, a new NHibernate ISession used by this template
+            will participate in the transaction through using the same ADO.NET
+            Connection. In such a scenario, multiple Sessions will participate
+            in the same database transaction.
+            </p>
+            	<p>Turn this on for operations that are supposed to always execute
+            independently, without side effects caused by a shared NHibernate ISession.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.TemplateFlushMode">
+            <summary>
+            Gets or sets the template flush mode.
+            </summary>
+            <remarks>
+            Default is Auto. Will get applied to any <b>new</b> ISession
+            created by the template.
+            </remarks>
+            <value>The template flush mode.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.EntityInterceptor">
+            <summary>
+            Gets or sets the entity interceptor that allows to inspect and change
+            property values before writing to and reading from the database.
+            </summary>
+            <remarks>
+            Will get applied to any <b>new</b> ISession created by this object.
+            <p>Such an interceptor can either be set at the ISessionFactory level,
+            i.e. on LocalSessionFactoryObject, or at the ISession level, i.e. on
+            HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
+            It's preferable to set it on LocalSessionFactoryObject or HibernateTransactionManager
+            to avoid repeated configuration and guarantee consistent behavior in transactions.
+            </p>
+            </remarks>
+            <value>The interceptor.</value>
+            <exception cref="T:System.InvalidOperationException">If object factory is not set and need to retrieve entity interceptor by name.</exception>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.QueryCacheRegion">
+            <summary>
+            Gets or sets the name of the cache region for queries executed by this template.
+            </summary>
+            <remarks>
+            If this is specified, it will be applied to all IQuery and ICriteria objects
+            created by this template (including all queries through find methods).
+            <p>The cache region will not take effect unless queries created by this
+            template are configured to be cached via the CacheQueries property.
+            </p>
+            </remarks>
+            <value>The query cache region.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.CacheQueries">
+            <summary>
+            Gets or sets a value indicating whether to 
+            cache all queries executed by this template.
+            </summary>
+            <remarks>
+            If this is true, all IQuery and ICriteria objects created by
+            this template will be marked as cacheable (including all
+            queries through find methods).
+            <p>To specify the query region to be used for queries cached
+            by this template, set the QueryCacheRegion property.
+            </p>
+            </remarks>
+            <value><c>true</c> if cache queries; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.MaxResults">
+            <summary>
+            Gets or sets the maximum number of rows for this HibernateTemplate.
+            </summary>
+            <value>The max results.</value>
+            <remarks>
+            This is important
+            for processing subsets of large result sets, avoiding to read and hold
+            the entire result set in the database or in the ADO.NET driver if we're
+            never interested in the entire result in the first place (for example,
+            when performing searches that might return a large number of matches).
+            <p>Default is 0, indicating to use the driver's default.</p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.ExposeNativeSession">
+            <summary>
+            Set whether to expose the native Hibernate Session to IHibernateCallback
+            code. Default is "false": a Session proxy will be returned,
+            suppressing <code>close</code> calls and automatically applying
+            query cache settings and transaction timeouts.
+            </summary>
+            <value><c>true</c> if expose native session; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.CheckWriteOperations">
+            <summary>
+            Gets or sets  whether to check that the Hibernate Session is not in read-only mode
+            in case of write operations (save/update/delete).
+            </summary>
+            <value>
+            	<c>true</c> if check that the Hibernate Session is not in read-only mode
+            in case of write operations; otherwise, <c>false</c>.
+            </value>
+            <remarks>
+            Default is "true", for fail-fast behavior when attempting write operations
+            within a read-only transaction. Turn this off to allow save/update/delete
+            on a Session with flush mode NEVER.
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.EntityInterceptorObjectName">
+            <summary>
+            Set the object name of a Hibernate entity interceptor that allows to inspect
+            and change property values before writing to and reading from the database.
+            </summary>
+            <remarks>
+            Will get applied to any new Session created by this transaction manager.
+            <p>Requires the object factory to be known, to be able to resolve the object
+            name to an interceptor instance on session creation. Typically used for
+            prototype interceptors, i.e. a new interceptor instance per session.
+            </p>
+            <p>Can also be used for shared interceptor instances, but it is recommended
+            to set the interceptor reference directly in such a scenario.
+            </p>
+            </remarks>
+            <value>The name of the entity interceptor in the object factory/application context.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.ObjectFactory">
+            <summary>
+            Set the object factory instance.
+            </summary>
+            <value>The object factory instance</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.SessionFactory">
+            <summary>
+            Gets or sets the session factory that should be used to create
+            NHibernate ISessions.
+            </summary>
+            <value>The session factory.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.FetchSize">
+            <summary>
+            Gets or sets the fetch size for this HibernateTemplate.
+            </summary>
+            <value>The size of the fetch.</value>
+            <remarks>This is important for processing
+            large result sets: Setting this higher than the default value will increase
+            processing speed at the cost of memory consumption; setting this lower can
+            avoid transferring row data that will never be read by the application.
+            <p>Default is 0, indicating to use the driver's default.</p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.ProxyFactory">
+            <summary>
+            Gets or sets the proxy factory.
+            </summary>
+            <remarks>This may be useful to set if you create many instances of 
+            HibernateTemplate and/or HibernateDaoSupport.  This allows the same
+            ProxyFactory implementation to be used thereby limiting the
+            number of dynamic proxy types created in the temporary assembly, which
+            are never garbage collected due to .NET runtime semantics.
+            </remarks>
+            <value>The proxy factory.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateTemplate.AdoExceptionTranslator">
+            <summary>
+            Set the ADO.NET exception translator for this instance.
+            Applied to System.Data.Common.DbException (or provider specific exception type
+            in .NET 1.1) thrown by callback code, be it direct
+            DbException or wrapped Hibernate ADOExceptions.
+            <p>The default exception translator is either a ErrorCodeExceptionTranslator
+            if a DbProvider is available, or a FalbackExceptionTranslator otherwise
+            </p>
+            </summary>
+            <value>The ADO exception translator.</value>
+        </member>
+        <member name="M:Spring.Data.NHibernate.DeletebyQueryHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.DeleteAllHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.EvictHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.FindHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.FindByNamedParamHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.FindByNamedQueryHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.FindByNamedQueryAndNamedParamHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.FindByNamedQueryAndValueObjectHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.GetByTypeHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LoadByTypeHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LoadByEntityHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LoadAllByTypeHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.LockHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.RefreshHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SaveObjectHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SaveObjectWithIdHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.UpdateObjectHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SaveOrUpdateObjectHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SaveOrUpdateAllHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SaveOrUpdateCopyHibernateCallback.DoInHibernate(NHibernate.ISession)">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.NHibernate.SessionFactoryUtils">
+            <summary>
+             Helper class featuring methods for Hibernate Session handling,
+             allowing for reuse of Hibernate Session instances within transactions.
+             Also provides support for exception translation.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: SessionFactoryUtils.cs,v 1.1 2008/04/08 20:26:30 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.NHibernate.SessionFactoryUtils.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class. 
+            </summary>
+        </member>
+        <member name="F:Spring.Data.NHibernate.SessionFactoryUtils.SESSION_SYNCHRONIZATION_ORDER">
+            <summary>
+            The ordering value for synchronizaiton this session resources.
+            Set to be lower than ADO.NET synchronization.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.SessionFactoryUtils"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.GetNewSession(NHibernate.ISessionFactory,NHibernate.IInterceptor)">
+            <summary>
+            Get a new Hibernate Session from the given SessionFactory.
+            Will return a new Session even if there already is a pre-bound
+            Session for the given SessionFactory.
+            </summary>
+            <remarks>
+            Within a transaction, this method will create a new Session
+            that shares the transaction's ADO.NET Connection. More specifically,
+            it will use the same ADO.NET Connection as the pre-bound Hibernate Session.
+            </remarks>
+            <param name="sessionFactory">The session factory to create the session with.</param>
+            <param name="interceptor">The Hibernate entity interceptor, or <code>null</code> if none.</param>
+            <returns>The new session.</returns>
+            <exception cref="T:Spring.Dao.DataAccessResourceFailureException">If could not open Hibernate session</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.GetSession(NHibernate.ISessionFactory,NHibernate.IInterceptor,Spring.Data.Support.IAdoExceptionTranslator)">
+            <summary>
+            Get a Hibernate Session for the given SessionFactory. Is aware of and will
+            return any existing corresponding Session bound to the current thread, for
+            example when using HibernateTransactionManager. Will always create a new
+            Session otherwise.
+            </summary>
+            <remarks>
+            Supports setting a Session-level Hibernate entity interceptor that allows
+            to inspect and change property values before writing to and reading from the
+            database. Such an interceptor can also be set at the SessionFactory level
+            (i.e. on LocalSessionFactoryObject), on HibernateTransactionManager, or on
+            HibernateInterceptor/HibernateTemplate.
+            </remarks>
+            <param name="sessionFactory">The session factory to create the
+            session with.</param>
+            <param name="entityInterceptor">Hibernate entity interceptor, or <code>null</code> if none.</param>
+            <param name="adoExceptionTranslator"> AdoExceptionTranslator to use for flushing the
+            Session on transaction synchronization (can be <code>null</code>; only used when actually
+            registering a transaction synchronization).</param>
+            <returns>The Hibernate Session</returns>
+            <exception cref="T:Spring.Dao.DataAccessResourceFailureException">
+            If the session couldn't be created.
+            </exception>
+            <exception cref="T:System.InvalidOperationException">
+            If no thread-bound Session found and allowCreate is false.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.GetSession(NHibernate.ISessionFactory,System.Boolean)">
+            <summary>
+            Get a Hibernate Session for the given SessionFactory. Is aware of and will
+            return any existing corresponding Session bound to the current thread, for
+            example when using <see cref="T:Spring.Data.NHibernate.HibernateTransactionManager"/>. Will create a new Session
+            otherwise, if allowCreate is true.
+            </summary>
+            <param name="sessionFactory">The session factory to create the session with.</param>
+            <param name="allowCreate">if set to <c>true</c> create a non-transactional Session when no
+            transactional Session can be found for the current thread.</param>
+            <returns>The hibernate session</returns>
+            <exception cref="T:Spring.Dao.DataAccessResourceFailureException">
+            If the session couldn't be created.
+            </exception>
+            <exception cref="T:System.InvalidOperationException">
+            If no thread-bound Session found and allowCreate is false.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.DoGetSession(NHibernate.ISessionFactory,System.Boolean)">
+            <summary>
+            Get a Hibernate Session for the given SessionFactory.
+            </summary>
+            <remarks>Is aware of and will return any existing corresponding
+            Session bound to the current thread, for example whenusing
+            <see cref="T:Spring.Data.NHibernate.HibernateTransactionManager"/>.  Will create a new 
+            Session otherwise, if "allowCreate" is true.
+            <p>Throws the orginal HibernateException, in contrast to
+            <see cref="M:Spring.Data.NHibernate.SessionFactoryUtils.GetSession(NHibernate.ISessionFactory,System.Boolean)"/>.
+            </p></remarks>
+            <param name="sessionFactory">The session factory.</param>
+            <param name="allowCreate">if set to <c>true</c> [allow create].</param>
+            <returns>The Hibernate Session</returns>
+            <exception cref="T:NHibernate.HibernateException">
+            if the Session couldn't be created
+            </exception>
+            <exception cref="T:System.InvalidOperationException">
+            If no thread-bound Session found and allowCreate is false.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.OpenSession(NHibernate.ISessionFactory,NHibernate.IInterceptor)">
+            <summary>
+            Open a new Session from the factory.
+            </summary>
+            <param name="sessionFactory">The session factory to create the session with.</param>
+            <param name="entityInterceptor">Hibernate entity interceptor, or <code>null</code> if none.</param>
+            <returns>the newly opened session</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.CloseSession(NHibernate.ISession)">
+            <summary>
+            Perform the actual closing of the Hibernate Session
+            catching and logging any cleanup exceptions thrown.
+            </summary>
+            <param name="session">The hibernate session to close</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.IsSessionTransactional(NHibernate.ISession,NHibernate.ISessionFactory)">
+            <summary>
+            Return whether the given Hibernate Session is transactional, that is,
+            bound to the current thread by Spring's transaction facilities.
+            </summary>
+            <param name="session">The hibernate session to check</param>
+            <param name="sessionFactory">The session factory that the session
+            was created with, can be null.</param>
+            <returns>
+            	<c>true</c> if the session transactional; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.ConvertHibernateAccessException(NHibernate.HibernateException)">
+            <summary>
+            Convert the given HibernateException to an appropriate exception from the
+            <code>Spring.Dao</code> hierarchy. Note that it is advisable to
+            handle AdoException specifically by using a AdoExceptionTranslator for the
+            underlying ADO.NET exception.
+            </summary>
+            <param name="ex">The Hibernate exception that occured.</param>
+            <returns>DataAccessException instance</returns>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.ReleaseSession(NHibernate.ISession,NHibernate.ISessionFactory)">
+            <summary>
+            Close the given Session, created via the given factory,
+            if it is not managed externally (i.e. not bound to the thread).
+            </summary>
+            <param name="session">The hibernate session to close</param>
+            <param name="sessionFactory">The hibernate SessionFactory that
+            the session was created with.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.CloseSessionOrRegisterDeferredClose(NHibernate.ISession,NHibernate.ISessionFactory)">
+            <summary>
+            Close the given Session or register it for deferred close.
+            </summary>
+            <param name="session">The session.</param>
+            <param name="sessionFactory">The session factory.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.InitDeferredClose(NHibernate.ISessionFactory)">
+             <summary>
+            Initialize deferred close for the current thread and the given SessionFactory.
+             Sessions will not be actually closed on close calls then, but rather at a
+             processDeferredClose call at a finishing point (like request completion).
+             </summary>
+             <param name="sessionFactory">The session factory.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.IsDeferredCloseActive(NHibernate.ISessionFactory)">
+            <summary>
+            Return if deferred close is active for the current thread
+            and the given SessionFactory.</summary>
+            <param name="sessionFactory">The session factory.</param>
+            <returns>
+            	<c>true</c> if [is deferred close active] [the specified session factory]; otherwise, <c>false</c>.
+            </returns>
+            <exception cref="T:System.ArgumentNullException">If SessionFactory argument is null.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.ProcessDeferredClose(NHibernate.ISessionFactory)">
+            <summary>
+            Process Sessions that have been registered for deferred close
+            for the given SessionFactory.
+            </summary>
+            <param name="sessionFactory">The session factory.</param>
+            <exception cref="T:System.InvalidOperationException">If there is no session factory associated with the thread.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.ApplyTransactionTimeout(NHibernate.ICriteria,NHibernate.ISessionFactory)">
+            <summary>
+            Applies the current transaction timeout, if any, to the given
+            criteria object
+            </summary>
+            <param name="criteria">The Hibernate Criteria object.</param>
+            <param name="sessionFactory">Hibernate SessionFactory that the Criteria was created for
+            (can be <code>null</code>).</param>
+            <exception cref="T:System.ArgumentNullException">If criteria argument is null.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.ApplyTransactionTimeout(NHibernate.IQuery,NHibernate.ISessionFactory)">
+            <summary>
+            Applies the current transaction timeout, if any, to the given
+            Hibenrate query object.
+            </summary>
+            <param name="query">The Hibernate Query object.</param>
+            <param name="sessionFactory">Hibernate SessionFactory that the Query was created for
+            (can be <code>null</code>).</param>
+            <exception cref="T:System.ArgumentNullException">If query argument is null.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.GetDbProvider(NHibernate.ISessionFactory)">
+            <summary>
+            Gets the Spring IDbProvider given the ISessionFactory.
+            </summary>
+            <remarks>The matching is performed by comparing the assembly qualified
+            name string of the hibernate Driver.ConnectionType to those in
+            the DbProviderFactory definitions.  No connections are created
+            in performing this comparison.</remarks>
+            <param name="sessionFactory">The session factory.</param>
+            <returns>The corresponding IDbProvider, null if no mapping was found.</returns>
+            <exception cref="T:System.InvalidOperationException">If DbProviderFactory's ApplicaitonContext is not
+            an instance of IConfigurableApplicaitonContext.</exception>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SessionFactoryUtils.NewAdoExceptionTranslator(NHibernate.ISessionFactory)">
+            <summary>
+            Create a IAdoExceptionTranslator from the given SessionFactory.
+            </summary>
+            <remarks>If a corresponding IDbProvider is found, a ErrorcodeExceptionTranslator
+            for the IDbProvider is created.  Otherwise, a FallbackException is created.</remarks>
+            <param name="sessionFactory">The session factory to create the translator for</param>
+            <returns>An IAdoExceptionTranslator</returns>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Generic.HibernateDelegate`1">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning the result object created within the callback. 
+            Note that there's special support for single step actions: 
+            see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+            <typeparam name="T">The type of result object</typeparam>
+            <author>Sree Nivask (.NET)</author>
+            <version>$Id: HibernateDelegate.cs,v 1.2 2007/09/19 22:58:10 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateQueryException">
+            <summary>
+            Hibernate-specific subclass of InvalidDataAccessResourceUsageException,
+            thrown on invalid HQL query syntax.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateQueryException.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateQueryException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateQueryException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateQueryException.#ctor(NHibernate.QueryException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateQueryException"/> class.
+            </summary>
+            <param name="ex">The ex.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateQueryException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateQueryException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="P:Spring.Data.NHibernate.HibernateQueryException.QueryString">
+            <summary>
+            Gets the query string that was invalid.
+            </summary>
+            <value>The query string that was invalid.</value>
+        </member>
+        <member name="T:Spring.Data.NHibernate.SpringSessionContext">
+            <summary>
+            Implementation of NHibernates 1.2's ICurrentSessionContext interface
+            that delegates to Spring's SessionFactoryUtils for providing a
+            Spirng-managed current Session.
+            </summary>
+            <remarks>Used by Spring's LocalSessionFactoryBean if told to expose
+            a transaction-aware SessionFactory.
+            <p>This ICurrentSessionContext implementation can also be specified in
+            custom ISessionFactory setup through the 
+            "hibernate.current_session_context_class" property, with the fully
+            qualified name of this class as value.</p></remarks>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: SpringSessionContext.cs,v 1.2 2007/09/19 22:58:11 markpollack Exp $</version>
+            <see cref="M:Spring.Data.NHibernate.SessionFactoryUtils.DoGetSession(NHibernate.ISessionFactory,System.Boolean)"/>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionContext.#ctor(NHibernate.Engine.ISessionFactoryImplementor)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.SpringSessionContext"/> class
+            </summary>
+            <param name="sessionFactory">The NHibernate session factory.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.SpringSessionContext.CurrentSession">
+            <summary>
+            Retrieve the Spring-managed Session for the current thread.
+            </summary>
+            <returns>Current session associated with the thread</returns>
+            <exception cref="T:NHibernate.HibernateException">On errors retrieving thread bound session.</exception>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException">
+            <summary>
+            Hibernate-specific subclass of ObjectOptimisticLockingFailureException.
+            </summary>
+            <remarks>
+            Converts Hibernate's StaleObjectStateException.
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateOptimisticLockingFailureException.cs,v 1.1 2008/04/08 20:26:30 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException.#ctor(NHibernate.StaleObjectStateException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException"/> class.
+            </summary>
+            <param name="ex">The StaleObjectStateException.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException.#ctor(NHibernate.StaleStateException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException"/> class.
+            </summary>
+            <param name="ex">The StaleStateException.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateOptimisticLockingFailureException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Data.NHibernate.TemplateFlushMode">
+            <summary>
+            Enumeration for the various Hibernate flush modes. 
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: TemplateFlushMode.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.NHibernate.TemplateFlushMode.Never">
+            <summary>Never flush is a good strategy for read-only units of work.
+            </summary>
+            <remarks>
+            Hibernate will not track and look for changes in this case,
+            avoiding any overhead of modification detection.
+            <p>In case of an existing ISession, TemplateFlushMode.Never will turn 
+            the hibenrate flush mode
+            to FlushMode.Never for the scope of the current operation, resetting the previous
+            flush mode afterwards.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Data.NHibernate.TemplateFlushMode.Auto">
+            <summary>Automatic flushing is the default mode for a Hibernate Session.
+            </summary>
+            <remarks>
+            A session will get flushed on transaction commit, and on certain find
+            operations that might involve already modified instances, but not
+            after each unit of work like with eager flushing.
+            <p>In case of an existing Session, TemplateFlushMode.Auto
+            will participate in the existing flush mode, not modifying 
+            it for the current operation.
+            This in particular means that this setting will not modify an existing
+            hibernate flush mode FlushMode.Never, in contrast to TemplateFlushMode.Eager.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Data.NHibernate.TemplateFlushMode.Eager">
+            <summary>
+            Eager flushing leads to immediate synchronization with the database,
+            even if in a transaction. 
+            </summary>
+            <remarks>
+            This causes inconsistencies to show up and throw
+            a respective exception immediately, and ADO access code that participates
+            in the same transaction will see the changes as the database is already
+            aware of them then. But the drawbacks are:
+            <ul>
+            <li>additional communication roundtrips with the database, instead of a
+            single batch at transaction commit;</li>
+            <li>the fact that an actual database rollback is needed if the Hibernate
+            transaction rolls back (due to already submitted SQL statements).</li>
+            </ul>
+            <p>In case of an existing Session, TemplateFlushMode.Eager
+            will turn the NHibernate flush mode 
+            to FlushMode.Auto for the scope of the current operation and issue a flush at the
+            end, resetting the previous flush mode afterwards.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Data.NHibernate.TemplateFlushMode.Commit">
+            <summary>
+            Flushing at commit only is intended for units of work where no
+            intermediate flushing is desired, not even for find operations
+            that might involve already modified instances.
+            </summary>
+            <remarks>
+            <p>In case of an existing Session, TemplateFlushMode.Commit
+            will turn the NHibernate flush mode
+            to FlushMode.Commit for the scope of the current operation, resetting the previous
+            flush mode afterwards. The only exception is an existing flush mode
+            FlushMode.Never, which will not be modified through this setting.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateSystemException">
+            <summary>
+            Hibernate-specific subclass of UncategorizedDataAccessException,
+            for Hibernate system errors that do not match any concrete
+            <code>Spring.Dao</code> exceptions.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateSystemException.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateSystemException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateSystemException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateSystemException.#ctor(NHibernate.HibernateException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateSystemException"/> class.
+            </summary>
+            <param name="cause">The cause.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateSystemException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateSystemException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateDelegate">
+            <summary>
+            Gets called by HibernateTemplate with an active
+            Hibernate Session. Does not need to care about activating or closing
+            the Session, or handling transactions.
+            </summary>
+            <remarks>
+            <p>
+            Allows for returning a result object created within the callback, i.e.
+            a domain object or a collection of domain objects. Note that there's
+            special support for single step actions: see HibernateTemplate.find etc.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException">
+            <summary>
+            Hibernate-specific subclass of ObjectRetrievalFailureException.
+            </summary>	 
+            <remarks>
+            Converts Hibernate's UnresolvableObjectException, ObjectNotFoundException,
+            ObjectDeletedException, and WrongClassException.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateObjectRetrievalFailureException.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException.#ctor(NHibernate.UnresolvableObjectException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="ex">The ex.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException.#ctor(NHibernate.ObjectNotFoundException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="ex">The ex.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException.#ctor(NHibernate.ObjectDeletedException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="ex">The ex.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException.#ctor(NHibernate.WrongClassException)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="ex">The ex.</param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Data.NHibernate.HibernateAdoException">
+            <summary>
+            Hibernate-specific subclass of UncategorizedDataAccessException,
+            for ADO.NET exceptions that Hibernate rethrew and could not be
+            mapped into the DAO exception heirarchy.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateAdoException.cs,v 1.1 2007/05/31 20:25:13 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAdoException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.HibernateAdoException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAdoException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateAdoException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAdoException.#ctor(System.String,NHibernate.ADOException)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateAdoException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception from the underlying data access API - ADO.NET
+            </param>        
+        </member>
+        <member name="M:Spring.Data.NHibernate.HibernateAdoException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.NHibernate.HibernateAdoException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Data.NHibernate.Support.HibernateDaoSupport">
+            <summary>
+             Convenient super class for Hibernate data access objects.
+            </summary>
+            <remarks>
+            <para>Requires a SessionFactory to be set, providing a HibernateTemplate
+             based on it to subclasses. Can alternatively be initialized directly with
+            a HibernateTemplate, to reuse the latter's settings such as the SessionFactory,
+             exception translator, flush mode, etc
+            </para>
+            This base call is mainly intended for HibernateTemplate usage.
+            <para>
+            This class will create its own HibernateTemplate if only a SessionFactory
+            is passed in. The "allowCreate" flag on that HibernateTemplate will be "true"
+            by default. A custom HibernateTemplate instance can be used through overriding
+            <code>CreateHibernateTemplate</code>.
+            </para>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: HibernateDaoSupport.cs,v 1.2 2007/08/28 15:26:37 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.NHibernate.Support.HibernateDaoSupport"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.CreateHibernateTemplate(NHibernate.ISessionFactory)">
+            <summary>
+            Create a HibernateTemplate for the given ISessionFactory.
+            </summary>
+            <remarks>
+            Only invoked if populating the DAO with a ISessionFactory reference!
+            <p>Can be overridden in subclasses to provide a HibernateTemplate instance
+            with different configuration, or a custom HibernateTemplate subclass.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.CheckDaoConfig">
+            <summary>
+            Check if the hibernate template property has been set.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.DoGetSession(System.Boolean)">
+            <summary>
+            Get a Hibernate Session, either from the current transaction or
+            a new one. The latter is only allowed if "allowCreate" is true.
+            </summary>
+            <remarks>Note that this is not meant to be invoked from HibernateTemplate code
+            but rather just in plain Hibernate code. Either rely on a thread-bound
+            Session (via HibernateInterceptor), or use it in combination with
+            ReleaseSession.
+            <para>
+            In general, it is recommended to use HibernateTemplate, either with
+            the provided convenience operations or with a custom HibernateCallback
+            that provides you with a Session to work on. HibernateTemplate will care
+            for all resource management and for proper exception conversion.
+            </para>
+            </remarks>
+            <param name="allowCreate"> if a non-transactional Session should be created when no
+            transactional Session can be found for the current thread
+            </param>
+            <returns>Hibernate session.</returns>
+            <exception cref="T:Spring.Dao.DataAccessResourceFailureException">
+            If the Session couldn't be created
+            </exception>
+            <exception cref="T:System.InvalidOperationException">
+            if no thread-bound Session found and allowCreate false
+            </exception>
+            <seealso cref="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.ReleaseSession(NHibernate.ISession)"/>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.ConvertHibernateAccessException(NHibernate.HibernateException)">
+            <summary>
+            Convert the given HibernateException to an appropriate exception from the
+            <code>org.springframework.dao</code> hierarchy. Will automatically detect
+            wrapped ADO.NET Exceptions and convert them accordingly.
+            </summary>
+            <param name="ex">HibernateException that occured.</param>
+            <returns>
+            The corresponding DataAccessException instance
+            </returns>
+            <remarks>
+            The default implementation delegates to SessionFactoryUtils
+            and convertAdoAccessException. Can be overridden in subclasses.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.NHibernate.Support.HibernateDaoSupport.ReleaseSession(NHibernate.ISession)">
+            <summary>
+            Close the given Hibernate Session, created via this DAO's SessionFactory,
+            if it isn't bound to the thread.
+            </summary>
+            <remarks>
+            Typically used in plain Hibernate code, in combination with the 
+            Session property and ConvertHibernateAccessException.
+            </remarks>      
+            <param name="session">The session to close.</param>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.HibernateDaoSupport.HibernateTemplate">
+            <summary>
+            Gets or sets the hibernate template.
+            </summary>
+            <remarks>Set the HibernateTemplate for this DAO explicitly,
+            as an alternative to specifying a SessionFactory.
+            </remarks>
+            <value>The hibernate template.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.HibernateDaoSupport.SessionFactory">
+            <summary>
+            Gets or sets the session factory to be used by this DAO.
+            Will automatically create a HibernateTemplate for the given SessionFactory.
+            </summary>
+            <value>The session factory.</value>
+        </member>
+        <member name="P:Spring.Data.NHibernate.Support.HibernateDaoSupport.Session">
+            <summary>
+            Get a Hibernate Session, either from the current transaction or a new one.
+            The latter is only allowed if the "allowCreate" setting of this object's
+            HibernateTemplate is true.
+            </summary>
+            <remarks>
+            <p><b>Note that this is not meant to be invoked from HibernateTemplate code
+            but rather just in plain Hibernate code.</b> Use it in combination with
+            <b>ReleaseSession</b>.
+            </p>
+            <p>In general, it is recommended to use HibernateTemplate, either with
+            the provided convenience operations or with a custom HibernateCallback
+            that provides you with a Session to work on. HibernateTemplate will care
+            for all resource management and for proper exception conversion.
+            </p>
+            </remarks>
+            <value>The Hibernate session.</value>
+        </member>
+    </members>
+</doc>
diff --git a/src/Spring/Spring.Data/AssemblyInfo.cs b/src/Spring/Spring.Data/AssemblyInfo.cs
new file mode 100644
index 00000000..c68f64b9
--- /dev/null
+++ b/src/Spring/Spring.Data/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle("Spring.Net Data Access support")]
+[assembly: AssemblyDescription("Interfaces and classes that provide Data access support in Spring.Net")]
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/CannotAcquireLockException.cs b/src/Spring/Spring.Data/Dao/CannotAcquireLockException.cs
new file mode 100644
index 00000000..a73c4ef4
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/CannotAcquireLockException.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Exception thrown on failure to aquire a lock during an update i.e a select for
+	/// update statement.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This exception will be thrown either by O/R mapping tools or by custom DAO
+	/// implementations.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: CannotAcquireLockException.cs,v 1.6 2008/04/08 20:26:43 markpollack Exp $</version>
+	[Serializable]
+	public class CannotAcquireLockException : PessimisticLockingFailureException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CannotAcquireLockException"/> class.
+		/// </summary>
+		public CannotAcquireLockException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CannotAcquireLockException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public CannotAcquireLockException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CannotAcquireLockException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public CannotAcquireLockException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CannotAcquireLockException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected CannotAcquireLockException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/CannotSerializeTransactionException.cs b/src/Spring/Spring.Data/Dao/CannotSerializeTransactionException.cs
new file mode 100644
index 00000000..bdfcf15e
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/CannotSerializeTransactionException.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Exception thrown on failure to complete a transaction in serialized mode due to
+	/// update conflicts.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This exception will be thrown either by O/R mapping tools or by custom DAO
+	/// implementations.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: CannotSerializeTransactionException.cs,v 1.6 2008/04/08 20:26:43 markpollack Exp $</version>
+	[Serializable]
+	public class CannotSerializeTransactionException : PessimisticLockingFailureException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CannotSerializeTransactionException"/> class.
+		/// </summary>
+		public CannotSerializeTransactionException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CannotSerializeTransactionException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public CannotSerializeTransactionException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CannotSerializeTransactionException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public CannotSerializeTransactionException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CannotSerializeTransactionException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected CannotSerializeTransactionException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/CleanupFailureDataAccessException.cs b/src/Spring/Spring.Data/Dao/CleanupFailureDataAccessException.cs
new file mode 100644
index 00000000..5c344dab
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/CleanupFailureDataAccessException.cs
@@ -0,0 +1,94 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Exception thrown when we couldn't cleanup after a data access operation,
+	/// but the actual operation went OK.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// For example, this exception or a subclass might be thrown if an ADO.NET
+	/// connection couldn't be closed after it had been used successfully.
+	/// </p>
+	/// <p>
+	/// Note that data access code might perform resource cleanup in a
+	/// finally block and therefore log cleanup failure rather than rethrow it,
+	/// to keep the original data access exception, if any.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: CleanupFailureDataAccessException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+	[Serializable]
+	public class CleanupFailureDataAccessException : DataAccessException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CleanupFailureDataAccessException"/> class.
+		/// </summary>
+		public CleanupFailureDataAccessException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CleanupFailureDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public CleanupFailureDataAccessException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CleanupFailureDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public CleanupFailureDataAccessException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CleanupFailureDataAccessException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected CleanupFailureDataAccessException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/ConcurrencyFailureException.cs b/src/Spring/Spring.Data/Dao/ConcurrencyFailureException.cs
new file mode 100644
index 00000000..2c6ffc71
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/ConcurrencyFailureException.cs
@@ -0,0 +1,90 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Exception thrown on concurrency failure. This exception should be
+	/// sublassed to indicate the type of failure - optimistic locking,
+	/// failure to acquire lock, etc.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This exception will be thrown either by O/R mapping tools or by custom DAO
+	/// implementations.
+	/// </p>
+	/// </remarks>
+	/// <author>Thomas Risberg</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: ConcurrencyFailureException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+	[Serializable]
+	public class ConcurrencyFailureException : DataAccessException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.ConcurrencyFailureException"/> class.
+		/// </summary>
+		public ConcurrencyFailureException() : base("No Exception Message") {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.ConcurrencyFailureException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public ConcurrencyFailureException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.ConcurrencyFailureException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public ConcurrencyFailureException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.ConcurrencyFailureException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected ConcurrencyFailureException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/DataAccessException.cs b/src/Spring/Spring.Data/Dao/DataAccessException.cs
new file mode 100644
index 00000000..66b84c64
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/DataAccessException.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{	
+	/// <summary>
+	/// Root of the hierarchy of data access exceptions
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	[Serializable]
+	public abstract class DataAccessException : Exception
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataAccessException"/> class.
+		/// </summary>
+		protected DataAccessException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		protected DataAccessException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		protected DataAccessException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataAccessException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected DataAccessException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
diff --git a/src/Spring/Spring.Data/Dao/DataAccessResourceFailureException.cs b/src/Spring/Spring.Data/Dao/DataAccessResourceFailureException.cs
new file mode 100644
index 00000000..e762cbdd
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/DataAccessResourceFailureException.cs
@@ -0,0 +1,83 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Data access exception thrown when a resource fails completely:
+	/// for example, if we can't connect to a database using ADO.NET.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: DataAccessResourceFailureException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+	[Serializable]
+	public class DataAccessResourceFailureException : DataAccessException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataAccessResourceFailureException"/> class.
+		/// </summary>
+		public DataAccessResourceFailureException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataAccessResourceFailureException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public DataAccessResourceFailureException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataAccessResourceFailureException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public DataAccessResourceFailureException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataAccessResourceFailureException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected DataAccessResourceFailureException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/DataIntegrityViolationException.cs b/src/Spring/Spring.Data/Dao/DataIntegrityViolationException.cs
new file mode 100644
index 00000000..86c77d3c
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/DataIntegrityViolationException.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Exception thrown when an attempt to insert or update data
+	/// results in violation of an integrity constraint.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Note that this is not purely a relational concept; unique primary keys are
+	/// required by most database types.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: DataIntegrityViolationException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+	[Serializable]
+	public class DataIntegrityViolationException : DataAccessException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataIntegrityViolationException"/> class.
+		/// </summary>
+		public DataIntegrityViolationException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataIntegrityViolationException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public DataIntegrityViolationException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataIntegrityViolationException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public DataIntegrityViolationException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataIntegrityViolationException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected DataIntegrityViolationException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/DataRetrievalFailureException.cs b/src/Spring/Spring.Data/Dao/DataRetrievalFailureException.cs
new file mode 100644
index 00000000..0c5c8238
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/DataRetrievalFailureException.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Exception thrown if certain expected data could not be retrieved, e.g.
+	/// when looking up specific data via a known identifier.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This exception will be thrown either by O/R mapping tools or by custom DAO
+	/// implementations.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: DataRetrievalFailureException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+	[Serializable]
+	public class DataRetrievalFailureException : DataAccessException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataRetrievalFailureException"/> class.
+		/// </summary>
+		public DataRetrievalFailureException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataRetrievalFailureException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public DataRetrievalFailureException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataRetrievalFailureException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public DataRetrievalFailureException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DataRetrievalFailureException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected DataRetrievalFailureException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/DeadlockLoserDataAccessException.cs b/src/Spring/Spring.Data/Dao/DeadlockLoserDataAccessException.cs
new file mode 100644
index 00000000..ae62ad45
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/DeadlockLoserDataAccessException.cs
@@ -0,0 +1,83 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Generic exception thrown when the current process was
+	/// a deadlock loser, and its transaction rolled back.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: DeadlockLoserDataAccessException.cs,v 1.6 2008/04/08 20:26:43 markpollack Exp $</version>
+	[Serializable]
+	public class DeadlockLoserDataAccessException : PessimisticLockingFailureException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DeadlockLoserDataAccessException"/> class.
+		/// </summary>
+		public DeadlockLoserDataAccessException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DeadlockLoserDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public DeadlockLoserDataAccessException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DeadlockLoserDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public DeadlockLoserDataAccessException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.DeadlockLoserDataAccessException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected DeadlockLoserDataAccessException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/EmptyResultDataAccessException.cs b/src/Spring/Spring.Data/Dao/EmptyResultDataAccessException.cs
new file mode 100644
index 00000000..fb83d4f0
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/EmptyResultDataAccessException.cs
@@ -0,0 +1,94 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary>
+    /// Data access exception thrown when a result was not of the expected size,
+    /// for example when expecting a single row but getting 0 or more than 1 rows.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <author>Juergen Hoeller</author>
+	/// <version>$Id: EmptyResultDataAccessException.cs,v 1.2 2006/05/18 21:37:50 markpollack Exp $</version>
+    [Serializable]
+    public class EmptyResultDataAccessException : IncorrectResultSizeDataAccessException
+    {
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EmptyResultDataAccessException"/> class.
+        /// </summary>
+        public EmptyResultDataAccessException() : base ()
+        {           
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EmptyResultDataAccessException"/> class.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        public EmptyResultDataAccessException(string message) : base (message)
+        {           
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EmptyResultDataAccessException"/> class.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        /// <param name="innerException">The inner exception.</param>
+        public EmptyResultDataAccessException(string message, Exception innerException) : base (message, innerException)
+        {           
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Dao.EmptyResultDataAccessException"/> class.
+        /// </summary>
+        /// <param name="expectedSize">The expected size.</param>
+        public EmptyResultDataAccessException(int expectedSize) : base (expectedSize, 0)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Dao.EmptyResultDataAccessException"/> class.
+        /// </summary>
+        /// <param name="message">A message about the exception.</param>
+        /// <param name="expectedSize">The expected size.</param>
+        public EmptyResultDataAccessException( string message, int expectedSize ) : base( message, expectedSize, 0 ) {}
+
+       
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EmptyResultDataAccessException"/> class.
+        /// </summary>
+        /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+        /// <exception cref="T:System.ArgumentNullException">The <paramref name="info"/> parameter is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.Runtime.Serialization.SerializationException">The class name is <see langword="null"/> or <see cref="P:System.Exception.HResult"/> is zero (0).</exception>
+        protected EmptyResultDataAccessException( SerializationInfo info, StreamingContext context ) : base( info, context )
+        {
+        }
+    }
+}
diff --git a/src/Spring/Spring.Data/Dao/IncorrectResultSizeDataAccessException.cs b/src/Spring/Spring.Data/Dao/IncorrectResultSizeDataAccessException.cs
new file mode 100644
index 00000000..c0064c19
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/IncorrectResultSizeDataAccessException.cs
@@ -0,0 +1,173 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Data access exception thrown when a result was not of the expected size,
+	/// for example when expecting a single row but getting 0 or more than 1 rows.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: IncorrectResultSizeDataAccessException.cs,v 1.6 2007/11/20 04:03:48 markpollack Exp $</version>
+	[Serializable]
+	public class IncorrectResultSizeDataAccessException : InvalidDataAccessApiUsageException, ISerializable
+	{
+		private int _expectedSize;
+		private int _actualSize;
+
+		/// <summary>Return the expected result size.</summary>
+		public virtual int ExpectedSize
+		{
+			get
+			{
+				return _expectedSize;
+			}
+		}
+
+		/// <summary>Return the actual result size (or -1 if unknown).</summary>
+		public virtual int ActualSize
+		{
+			get
+			{
+				return _actualSize;
+			}
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.IncorrectResultSizeDataAccessException"/> class.
+		/// </summary>
+		public IncorrectResultSizeDataAccessException() : this( -1, -1 ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.IncorrectResultSizeDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public IncorrectResultSizeDataAccessException( string message ) : this( message, -1, -1 )
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CleanupFailureDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public IncorrectResultSizeDataAccessException( string message, Exception rootCause )
+			: base( message, rootCause )
+		{
+			_expectedSize = -1;
+			_actualSize = -1;
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CleanupFailureDataAccessException"/> class.
+		/// </summary>
+		/// <param name="expectedSize">The expected result size.</param>
+		/// <param name="actualSize">The actual result size (or -1 if unknown).</param>
+		public IncorrectResultSizeDataAccessException( int expectedSize, int actualSize )
+			: this ( "Incorrect result size: expected " + expectedSize + ", actual " + actualSize, expectedSize, actualSize)
+		{
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CleanupFailureDataAccessException"/> class.
+		/// </summary>>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="expectedSize">The expected result size.</param>
+		/// <param name="actualSize">The actual result size (or -1 if unknown).</param>
+		public IncorrectResultSizeDataAccessException( string message, int expectedSize, int actualSize )
+			: base( message )
+		{
+			this._expectedSize = expectedSize;
+			this._actualSize = actualSize;
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IncorrectResultSizeDataAccessException"/> class.
+        /// </summary>
+        /// <param name="message">A message about the exception</param>
+        /// <param name="expectedSize">The expected result size.</param>
+        public IncorrectResultSizeDataAccessException(string message, int expectedSize)
+            : base(message)
+        {
+            this._expectedSize = expectedSize;
+            this._actualSize = -1;
+        }
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CleanupFailureDataAccessException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected IncorrectResultSizeDataAccessException( SerializationInfo info, StreamingContext context ) : base( info, context )
+		{
+			_expectedSize = info.GetInt32( "expectedSize" );
+			_actualSize = info.GetInt32( "actualSize" );
+		}
+
+		#region ISerializable Members
+		/// <summary>
+		/// Override of <see cref="System.Exception.GetObjectData(SerializationInfo, StreamingContext)"/>
+		/// to allow for private serialization.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		public override void GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+			info.AddValue( "expectedSize", _expectedSize );
+			info.AddValue( "actualSize", _actualSize );
+			base.GetObjectData( info, context );
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/IncorrectUpdateSemanticsDataAccessException.cs b/src/Spring/Spring.Data/Dao/IncorrectUpdateSemanticsDataAccessException.cs
new file mode 100644
index 00000000..e50c3834
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/IncorrectUpdateSemanticsDataAccessException.cs
@@ -0,0 +1,97 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Data access exception thrown when something unintended appears to have
+	/// happened with an update, but the transaction hasn't already been rolled back.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Thrown, for example, when we wanted to update 1 row in an RDBMS but actually
+	/// updated 3.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: IncorrectUpdateSemanticsDataAccessException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+	[Serializable]
+	public abstract class IncorrectUpdateSemanticsDataAccessException
+		: InvalidDataAccessResourceUsageException
+	{
+		/// <summary>Return whether or not data was updated.</summary>
+		/// <returns>
+		/// <b>True</b> if data was updated (as opposed to being incorrectly
+		/// updated). If this property returns false, there's nothing to roll back.
+		/// </returns>
+		public abstract bool DataWasUpdated { get; }
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.IncorrectUpdateSemanticsDataAccessException"/> class.
+		/// </summary>
+		protected IncorrectUpdateSemanticsDataAccessException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.IncorrectUpdateSemanticsDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		protected IncorrectUpdateSemanticsDataAccessException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.IncorrectUpdateSemanticsDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		protected IncorrectUpdateSemanticsDataAccessException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.IncorrectUpdateSemanticsDataAccessException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected IncorrectUpdateSemanticsDataAccessException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/InvalidDataAccessApiUsageException.cs b/src/Spring/Spring.Data/Dao/InvalidDataAccessApiUsageException.cs
new file mode 100644
index 00000000..f7f27c01
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/InvalidDataAccessApiUsageException.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Exception thrown on incorrect usage of the API, such as failing to "compile" a query
+	/// object that needed compilation before execution.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This represents a problem in our data access framework, not the underlying data access
+	/// infrastructure.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: InvalidDataAccessApiUsageException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+	[Serializable]
+	public class InvalidDataAccessApiUsageException : DataAccessException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.InvalidDataAccessApiUsageException"/> class.
+		/// </summary>
+		public InvalidDataAccessApiUsageException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.InvalidDataAccessApiUsageException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public InvalidDataAccessApiUsageException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.InvalidDataAccessApiUsageException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public InvalidDataAccessApiUsageException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.InvalidDataAccessApiUsageException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected InvalidDataAccessApiUsageException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/InvalidDataAccessResourceUsageException.cs b/src/Spring/Spring.Data/Dao/InvalidDataAccessResourceUsageException.cs
new file mode 100644
index 00000000..65cec5ef
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/InvalidDataAccessResourceUsageException.cs
@@ -0,0 +1,88 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Root for exceptions thrown when we use a data access resource incorrectly.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Thrown for example on specifying bad SQL when using a RDBMS.
+	/// Resource-specific subclasses will probably be supplied by data access packages.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: InvalidDataAccessResourceUsageException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+	[Serializable]
+	public class InvalidDataAccessResourceUsageException : DataAccessException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.InvalidDataAccessResourceUsageException"/> class.
+		/// </summary>
+		public InvalidDataAccessResourceUsageException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.InvalidDataAccessResourceUsageException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public InvalidDataAccessResourceUsageException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.InvalidDataAccessResourceUsageException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public InvalidDataAccessResourceUsageException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.InvalidDataAccessResourceUsageException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected InvalidDataAccessResourceUsageException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/ObjectOptimisticLockingFailureException.cs b/src/Spring/Spring.Data/Dao/ObjectOptimisticLockingFailureException.cs
new file mode 100644
index 00000000..39fd8b0c
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/ObjectOptimisticLockingFailureException.cs
@@ -0,0 +1,176 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+    /// <summary>
+    /// Exception thrown on an optimistic locking violation for a mapped object.
+    ///  Provides information about the persistent class and the identifier. 
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ObjectOptimisticLockingFailureException.cs,v 1.1 2006/12/13 18:40:11 markpollack Exp $</version>
+    [Serializable]
+    public class ObjectOptimisticLockingFailureException : OptimisticLockingFailureException, ISerializable
+    {
+        #region Fields
+
+        private object persistentClass;
+
+        private object identifier;
+
+        #endregion
+
+        #region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObjectOptimisticLockingFailureException"/> class.
+        /// </summary>
+        public ObjectOptimisticLockingFailureException()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObjectOptimisticLockingFailureException"/> class.
+        /// </summary>
+        /// <param name="message">A message about the exception..</param>
+        public ObjectOptimisticLockingFailureException(string message) : base(message)
+        {            
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="ObjectRetrievalFailureException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception from the underlying data access API
+        /// </param>        
+        public ObjectOptimisticLockingFailureException(string message, Exception rootCause) : base(message, rootCause)
+        {
+        }
+
+        public ObjectOptimisticLockingFailureException(Type persistentClass, Object identifier) : this(persistentClass, identifier,
+            "Object of class [" + persistentClass.Name + "] with identifier [" + identifier +
+            "]: optimistic locking failed", null)
+        {
+            
+        }
+
+        public ObjectOptimisticLockingFailureException(
+            Type persistentClass, Object identifier, String msg, Exception ex) : base(msg, ex)
+        {
+            this.persistentClass = persistentClass;
+            this.identifier = identifier;
+        }
+
+        public ObjectOptimisticLockingFailureException(String persistentClassName, Object identifier) : this(persistentClassName, identifier,
+            "Object of class [" + persistentClassName + "] with identifier [" + identifier +
+            "]: optimistic locking failed", null)
+        {
+            
+        }
+
+        public ObjectOptimisticLockingFailureException(
+            String persistentClassName, Object identifier, String msg, Exception ex) : base(msg, ex)
+        {
+            this.persistentClass = persistentClassName;
+            this.identifier = identifier;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="ObjectOptimisticLockingFailureException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected ObjectOptimisticLockingFailureException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+
+        #endregion
+
+        public Type PersistentClass
+        {
+            get { return persistentClass as Type;}
+        }
+
+        public object Identifier
+        {
+            get { return identifier; }
+        }
+
+        public string PersistentClassName
+        {
+            get
+            {
+                if (this.persistentClass is Type) 
+                {
+                    return ((Type) this.persistentClass).Name;
+                }
+                return (this.persistentClass != null ? this.persistentClass.ToString() : null);
+        
+            }
+        }
+
+
+      
+
+        #region Properties
+
+        #endregion
+
+        #region Methods
+
+        #endregion
+
+        #region ISerializable Members
+
+        /// <summary>
+        /// When overridden in a derived class, sets the <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+        /// with information about the exception.
+        /// </summary>
+        /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+        /// <exception cref="T:System.ArgumentNullException">The <paramref name="info"/> parameter is a null reference (<see langword="Nothing"/> in Visual Basic).</exception>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            info.AddValue( "persistentClass", persistentClass );
+            info.AddValue( "identifier", identifier );
+            base.GetObjectData( info, context );            
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/ObjectRetrievalFailureException.cs b/src/Spring/Spring.Data/Dao/ObjectRetrievalFailureException.cs
new file mode 100644
index 00000000..42c37439
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/ObjectRetrievalFailureException.cs
@@ -0,0 +1,157 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+    /// <summary>
+    /// Exception thrown if a mapped object could not be retrieved via its identifier.
+    /// Provides information about the persistent class and the identifier.  
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ObjectRetrievalFailureException.cs,v 1.1 2006/12/13 18:40:11 markpollack Exp $</version>
+    [Serializable]
+    public class ObjectRetrievalFailureException : DataRetrievalFailureException, ISerializable
+    {
+        private object persistentClass;
+
+        private object identifier;
+
+        #region Constructor (s)
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="ObjectRetrievalFailureException"/> class.
+        /// </summary>
+        public ObjectRetrievalFailureException() {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObjectRetrievalFailureException"/> class.
+        /// </summary>
+        /// <param name="message">A message about the exception.</param>
+        public ObjectRetrievalFailureException(string message) : base(message)
+        {
+            
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="ObjectRetrievalFailureException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception from the underlying data access API
+        /// </param>        
+        public ObjectRetrievalFailureException(string message, Exception rootCause) : base(message, rootCause)
+        {
+        }
+
+
+        public ObjectRetrievalFailureException(Type persistentClass, object identifier) : this(persistentClass, identifier,                                                                                              "Object of class [" + persistentClass.Name + "] with identifier [" + identifier + "]: not found",                                                                                     null)
+        {
+        }
+
+
+        public ObjectRetrievalFailureException(
+            Type persistentClass, Object identifier, String msg, Exception ex) : base(msg, ex)
+        {
+            this.persistentClass = persistentClass;
+            this.identifier = identifier;
+        }
+
+        public ObjectRetrievalFailureException(String persistentClassName, Object identifier) : this(persistentClassName, identifier,
+            "Object of class [" + persistentClassName + "] with identifier [" + identifier + "]: not found",
+            null)
+        {
+            
+        }
+
+        public ObjectRetrievalFailureException(
+            String persistentClassName, Object identifier, String msg, Exception ex) : base(msg, ex)
+        {            
+            this.persistentClass = persistentClassName;
+            this.identifier = identifier;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="ObjectRetrievalFailureException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected ObjectRetrievalFailureException(
+            SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+
+
+        #endregion
+
+        public object PersistentClass
+        {
+            get { return persistentClass; }
+        }
+
+        public object Identifier
+        {
+            get { return identifier; }
+        }
+
+        public string PersistentClassName
+        {
+            get
+            {
+                if (this.persistentClass is Type) 
+                {
+                    return ((Type) this.persistentClass).Name;
+                }
+                return (this.persistentClass != null ? this.persistentClass.ToString() : null);
+        
+            }
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, sets the <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+        /// with information about the exception.
+        /// </summary>
+        /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+        /// <exception cref="T:System.ArgumentNullException">The <paramref name="info"/> parameter is a null reference (<see langword="Nothing"/> in Visual Basic).</exception>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            info.AddValue( "persistentClass", persistentClass );
+            info.AddValue( "identifier", identifier );
+            base.GetObjectData( info, context );            
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/OptimisticLockingFailureException.cs b/src/Spring/Spring.Data/Dao/OptimisticLockingFailureException.cs
new file mode 100644
index 00000000..a77e3044
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/OptimisticLockingFailureException.cs
@@ -0,0 +1,88 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Exception thrown on an optimistic locking violation.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This exception will be thrown either by O/R mapping tools or by custom DAO
+	/// implementations.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: OptimisticLockingFailureException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+	[Serializable]
+	public class OptimisticLockingFailureException : ConcurrencyFailureException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.OptimisticLockingFailureException"/> class.
+		/// </summary>
+		public OptimisticLockingFailureException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.OptimisticLockingFailureException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public OptimisticLockingFailureException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.OptimisticLockingFailureException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public OptimisticLockingFailureException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.OptimisticLockingFailureException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected OptimisticLockingFailureException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/PermissionDeniedDataAccessException.cs b/src/Spring/Spring.Data/Dao/PermissionDeniedDataAccessException.cs
new file mode 100644
index 00000000..9d91eb92
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/PermissionDeniedDataAccessException.cs
@@ -0,0 +1,83 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+    /// Exception thrown when the underlyingresource denied a permission to 
+    /// access a specific element, such as a specific database table.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: PermissionDeniedDataAccessException.cs,v 1.1 2006/06/12 10:39:19 markpollack Exp $</version>
+	[Serializable]
+	public class PermissionDeniedDataAccessException : InvalidDataAccessResourceUsageException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.PermissionDeniedDataAccessException"/> class.
+		/// </summary>
+		public PermissionDeniedDataAccessException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.PermissionDeniedDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public PermissionDeniedDataAccessException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.PermissionDeniedDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public PermissionDeniedDataAccessException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.PermissionDeniedDataAccessException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected PermissionDeniedDataAccessException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/PessimisticLockingFailureException.cs b/src/Spring/Spring.Data/Dao/PessimisticLockingFailureException.cs
new file mode 100644
index 00000000..901ab619
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/PessimisticLockingFailureException.cs
@@ -0,0 +1,91 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Exception thrown on a pessimistic locking violation.
+	/// </summary>
+	/// <remarks>
+	/// <para>Serves as a superclass for more specific exceptions, like 
+	/// CannotAcquireLockException and DeadlockLoserDataAccessException
+	/// </para>
+	/// <para>
+	/// This exception will be thrown either by O/R mapping tools or by custom DAO
+	/// implementations.
+	/// </para>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: PessimisticLockingFailureException.cs,v 1.1 2008/04/08 20:26:43 markpollack Exp $</version>
+	[Serializable]
+	public class PessimisticLockingFailureException : ConcurrencyFailureException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.PessimisticLockingFailureException"/> class.
+		/// </summary>
+		public PessimisticLockingFailureException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.PessimisticLockingFailureException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public PessimisticLockingFailureException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.PessimisticLockingFailureException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public PessimisticLockingFailureException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.CannotAcquireLockException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+        protected PessimisticLockingFailureException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs b/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs
new file mode 100644
index 00000000..e547f7ac
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs
@@ -0,0 +1,115 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Common.Logging;
+using Spring.Objects.Factory;
+
+#endregion
+
+namespace Spring.Dao.Support
+{
+	/// <summary>
+	/// Generic base class for DAOs, defining template methods for DAO initialization. 
+	/// </summary>
+	/// <remarks>
+    /// Extended by Spring's specific DAO support classes, such as:
+    ///  AdoDaoSupport, HibernateDaoSupport, etc.
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: DaoSupport.cs,v 1.3 2006/11/13 07:04:45 markpollack Exp $</version>
+	public abstract class DaoSupport : IInitializingObject
+	{
+		#region Fields
+
+		#endregion
+
+		#region Constants
+
+		/// <summary>
+		/// The shared <see cref="Common.Logging.ILog"/> instance for this class (and derived classes). 
+		/// </summary>
+		protected static readonly ILog log =
+			LogManager.GetLogger(typeof (DaoSupport));
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="DaoSupport"/> class.
+                /// </summary>
+		public 	DaoSupport()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+
+        /// <summary>
+        /// Abstract subclasses must override this to check their configuration.
+        /// </summary>
+        /// <remarks>
+        /// <p>Implementors should be marked as <code>sealed</code>, to make it clear that
+        /// concrete subclasses are not supposed to override this template method themselves.
+        /// </p>
+        /// </remarks>
+        protected abstract void CheckDaoConfig();
+
+        /// <summary>        
+        /// Concrete subclasses can override this for custom initialization behavior.
+        /// </summary>
+        /// <remarks>
+        /// Gets called after population of this instance's object properties.
+        /// Exception thrown if InitDao fails will be rethrown as
+        /// a ObjectInitializationException.
+        /// </remarks>
+        protected virtual void InitDao()
+        {
+            
+        }
+
+
+		#endregion
+
+	    public void AfterPropertiesSet()
+	    {
+            // Let abstract subclasses check their configuration.
+            CheckDaoConfig();
+
+            // Let concrete implementations initialize themselves.
+            try 
+            {
+                InitDao();
+            }
+            catch (Exception ex) 
+            {
+                throw new ObjectInitializationException("Initialization of DAO failed: " + ex.Message, ex);
+            }
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Data/Dao/Support/DataAccessUtils.cs b/src/Spring/Spring.Data/Dao/Support/DataAccessUtils.cs
new file mode 100644
index 00000000..c93e984d
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/Support/DataAccessUtils.cs
@@ -0,0 +1,72 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Dao.Support
+{
+	/// <summary>
+	/// Miscellaneous utility methods for DAO implementations.
+	/// Useful with any data access technology.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: DataAccessUtils.cs,v 1.3 2006/12/02 07:35:23 markpollack Exp $</version>
+	public class DataAccessUtils 
+	{
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="DataAccessUtils"/> class.
+                /// </summary>
+		public 	DataAccessUtils()
+		{
+
+		}
+
+		#endregion
+
+		#region Methods
+	    
+	    public static object RequiredUniqueResultSet(IList results)
+	    {
+	        int size = (results != null ? results.Count : 0);
+	        if (size == 0)
+	        {
+	            throw new EmptyResultDataAccessException(1);
+	        }
+	        if ( ! CollectionUtils.HasUniqueObject(results))
+	        {
+	            throw new IncorrectResultSizeDataAccessException(1, size);
+	        }
+	        IEnumerator enumerator = results.GetEnumerator();
+	        enumerator.MoveNext();
+	        return enumerator.Current;
+	    }
+    	
+	    #endregion	    
+	}
+
+}
diff --git a/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs b/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs
new file mode 100644
index 00000000..99b53f48
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs
@@ -0,0 +1,76 @@
+#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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Spring.Util.Generic;
+
+#endregion
+
+namespace Spring.Dao.Support.Generic
+{
+	/// <summary>
+	/// Miscellaneous utility methods for DAO implementations.
+	/// Useful with any data access technology.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: DataAccessUtils.cs,v 1.1 2006/12/02 20:50:21 markpollack Exp $</version>
+	public class DataAccessUtils 
+	{
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="DataAccessUtils"/> class.
+                /// </summary>
+		public 	DataAccessUtils()
+		{
+
+		}
+
+		#endregion
+
+		#region Methods
+
+	    public static T RequiredUniqueResultSet<T>(IList<T> results)
+	    {
+	        int size = (results != null ? results.Count : 0);
+	        if (size == 0)
+	        {
+	            throw new EmptyResultDataAccessException(1);
+	        }
+	        if ( ! CollectionUtils.HasUniqueObject(results))
+	        {
+	            throw new IncorrectResultSizeDataAccessException(1, size);
+	        }
+            IEnumerator<T> enumerator = results.GetEnumerator();
+	        enumerator.MoveNext();
+	        return enumerator.Current;
+	    }
+    	
+	    #endregion	    
+	}
+
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/TypeMismatchDataAccessException.cs b/src/Spring/Spring.Data/Dao/TypeMismatchDataAccessException.cs
new file mode 100644
index 00000000..b74c8fa7
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/TypeMismatchDataAccessException.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Exception thrown on mismatch between CLS type and database type:
+	/// for example on an attempt to set an object of the wrong type
+	/// in an RDBMS column.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: TypeMismatchDataAccessException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+	[Serializable]
+	public class TypeMismatchDataAccessException : InvalidDataAccessResourceUsageException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.TypeMismatchDataAccessException"/> class.
+		/// </summary>
+		public TypeMismatchDataAccessException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.TypeMismatchDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public TypeMismatchDataAccessException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.TypeMismatchDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public TypeMismatchDataAccessException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.TypeMismatchDataAccessException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected TypeMismatchDataAccessException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Dao/UncategorizedDataAccessException.cs b/src/Spring/Spring.Data/Dao/UncategorizedDataAccessException.cs
new file mode 100644
index 00000000..1ea9397e
--- /dev/null
+++ b/src/Spring/Spring.Data/Dao/UncategorizedDataAccessException.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Dao
+{
+	/// <summary> 
+	/// Normal superclass when we can't distinguish anything more specific
+	/// than "something went wrong with the underlying resource": for example,
+	/// a SQLException from Sql Server that we can't pinpoint more precisely.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: UncategorizedDataAccessException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+	[Serializable]
+	public abstract class UncategorizedDataAccessException : DataAccessException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.UncategorizedDataAccessException"/> class.
+		/// </summary>
+		public UncategorizedDataAccessException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.UncategorizedDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public UncategorizedDataAccessException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.UncategorizedDataAccessException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception (from the underlying data access API, such as ADO.NET).
+		/// </param>
+		public UncategorizedDataAccessException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Dao.UncategorizedDataAccessException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected UncategorizedDataAccessException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/BadSqlGrammarException.cs b/src/Spring/Spring.Data/Data/BadSqlGrammarException.cs
new file mode 100644
index 00000000..80f0d98a
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/BadSqlGrammarException.cs
@@ -0,0 +1,131 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using Spring.Dao;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+    /// Exception thrown when SQL specified is invalid.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: BadSqlGrammarException.cs,v 1.3 2006/11/29 07:18:45 markpollack Exp $</version>
+	[Serializable]
+	public class BadSqlGrammarException : InvalidDataAccessResourceUsageException, ISerializable
+	{
+		#region Fields
+
+        /// <summary>
+        /// SQL that led to the problem
+        /// </summary>
+        private string sql;
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="BadSqlGrammarException"/> class.
+        /// </summary>
+		public BadSqlGrammarException()
+		{
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BadSqlGrammarException"/> class.
+        /// </summary>
+        /// <param name="message">A message about the exception.</param>
+        public BadSqlGrammarException(string message): base(message)
+        {            
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BadSqlGrammarException"/> class.
+        /// </summary>
+        /// <param name="message">A message about the exception.</param>
+        /// <param name="inner">The inner exception.</param>
+        public BadSqlGrammarException(string message, Exception inner): base(message, inner)
+        {            
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BadSqlGrammarException"/> class.
+        /// </summary>
+        /// <param name="task">name of the current task.</param>
+        /// <param name="sql">The offending SQL statment</param>
+        /// <param name="ex">The root cause.</param>
+        public BadSqlGrammarException(string task, String sql, Exception ex) : base(task + "; bad SQL grammar [" + sql + "]; " + ex.Message, ex)           
+        {
+             this.sql = sql;
+        }
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="BadSqlGrammarException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected BadSqlGrammarException( SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+
+
+
+		#endregion
+
+		#region Properties
+
+	    public string Sql
+	    {
+            get 
+            {
+                return sql;
+            }
+	    }
+		#endregion
+
+
+        #region ISerializable Members
+
+        /// <summary>
+        /// When overridden in a derived class, sets the <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+        /// with information about the exception.
+        /// </summary>
+        /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+        /// <exception cref="T:System.ArgumentNullException">The <paramref name="info"/> parameter is a null reference (<see langword="Nothing"/> in Visual Basic).</exception>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            info.AddValue( "sql", sql );
+            base.GetObjectData( info, context ); 
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/CannotGetAdoConnectionException.cs b/src/Spring/Spring.Data/Data/CannotGetAdoConnectionException.cs
new file mode 100644
index 00000000..649cda4e
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/CannotGetAdoConnectionException.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using Spring.Dao;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+    /// Fatal exception thrown when we can't connect to an RDBMS using ADO.NET
+    /// </summary>
+    /// <author>Rod Johnson</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: CannotGetAdoConnectionException.cs,v 1.1 2006/11/24 05:57:46 markpollack Exp $</version>
+	[Serializable]
+	public class CannotGetAdoConnectionException : InvalidDataAccessResourceUsageException, ISerializable
+	{
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="CannotGetAdoConnectionException"/> class.
+        /// </summary>
+		public CannotGetAdoConnectionException()
+		{
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CannotGetAdoConnectionException"/> class.
+        /// </summary>
+        /// <param name="message">A message about the exception.</param>
+        public CannotGetAdoConnectionException(string message): base(message)
+        {            
+        }
+	    
+	    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CannotGetAdoConnectionException"/> class.
+        /// </summary>
+        /// <param name="message">A message about the exception.</param>
+        /// <param name="inner">The inner exception.</param>
+        public CannotGetAdoConnectionException(string message, Exception inner)
+            : base(message, inner)
+        {            
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="CannotGetAdoConnectionException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected CannotGetAdoConnectionException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+
+
+
+		#endregion
+
+
+     
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/CommandDelegate.cs b/src/Spring/Spring.Data/Data/CommandDelegate.cs
new file mode 100644
index 00000000..5031e919
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/CommandDelegate.cs
@@ -0,0 +1,42 @@
+#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.Data;
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// Callback delegate for code that operates on a IDbCommand. 
+    /// </summary>
+    /// <param name="command">the ADO.NET command object.</param>
+    /// <remarks>
+    /// <p>Allows you to execute any number of operations
+    /// on a single IDbCommand, for example a single ExecuteScalar
+    /// call or repeated execute calls with varying parameters.
+    /// </p>
+    /// <p>Used internally by AdoTemplate, but also useful for 
+    /// application code.  Note that the passed in IDbCommand
+    /// has been created by the framework and will have its
+    /// Connection property set and the Transaction property
+    /// set based on the transaction context.</p>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    public delegate object CommandDelegate(IDbCommand command);
+}
diff --git a/src/Spring/Spring.Data/Data/CommandSetterDelegate.cs b/src/Spring/Spring.Data/Data/CommandSetterDelegate.cs
new file mode 100644
index 00000000..6427eec5
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/CommandSetterDelegate.cs
@@ -0,0 +1,34 @@
+#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.Data;
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// Callback delegate to set any necessary parameters or other
+    /// properties on the command object.  The CommandType and
+    /// CommandText properties will have already been supplied
+    /// </summary>
+    /// <param name="dbCommand">The database command object.</param>
+    /// <author>Mark Pollack</author>
+    public delegate void CommandSetterDelegate(IDbCommand dbCommand);
+
+}
diff --git a/src/Spring/Spring.Data/Data/Common/DbMetadata.cs b/src/Spring/Spring.Data/Data/Common/DbMetadata.cs
new file mode 100644
index 00000000..69cf20c7
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/DbMetadata.cs
@@ -0,0 +1,420 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// Provides database metdata information.
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: DbMetadata.cs,v 1.13 2007/11/21 18:01:45 markpollack Exp $</version>
+    public class DbMetadata : IDbMetadata
+    {
+        #region Fields
+
+        private bool supportsDeriveParametersMethod = true;
+
+        private string productName;
+        private string assemblyName;
+        private Type connectionType;
+        private Type commandType;
+        private Type parameterType;
+        private Type dataAdapterType;
+        
+
+        private Type parameterDbType;
+        private PropertyInfo parameterDbTypeProperty;
+        private PropertyInfo parameterIsNullableProperty;        
+        private string parameterNamePrefix;
+
+        private Type exceptionType;
+        private bool useParameterNamePrefixInParameterCollection;
+        private bool useParameterPrefixInSql;
+        private bool bindByName;
+
+
+
+
+        private Type commandBuilderType;
+        private MethodInfo commandBuilderDeriveParametersMethod;
+
+        private string errorCodeExceptionExpression = string.Empty;
+
+        private ErrorCodes errorCodes;
+
+        #endregion
+
+        #region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DbMetadata"/> class.
+        /// </summary>
+        /// <param name="productName">Name of the product.</param>
+        /// <param name="assemblyName">Name of the assembly.</param>
+        /// <param name="connectionType">Type of the connection.</param>
+        /// <param name="commandType">Type of the command.</param>
+        /// <param name="parameterType">Type of the parameter.</param>
+        /// <param name="dataAdapterType">Type of the data adapter.</param>
+        /// <param name="commandBuilderType">Type of the command builder.</param>
+        /// <param name="commandBuilderDeriveParametersMethod">The command builder derive parameters method.</param>
+        /// <param name="parameterDbType">Type of the parameter db.</param>
+        /// <param name="parameterDbTypeProperty">The parameter db type property.</param>
+        /// <param name="parameterIsNullableProperty">The parameter is nullable property.</param>
+        /// <param name="parameterNamePrefix">The parameter name prefix.</param>
+        /// <param name="exceptionType">Type of the exception.</param>
+        /// <param name="useParameterNamePrefixInParameterCollection">if set to <c>true</c> [use parameter name prefix in parameter collection].</param>
+        /// <param name="useParameterPrefixInSql">if set to <c>true</c> [use parameter prefix in SQL].</param>
+        /// <param name="bindByName">if set to <c>true</c> [bind by name].</param>
+        /// <param name="errorCodeExceptionExpression">The error code exception expression.</param>
+        public DbMetadata(string productName,
+                          string assemblyName,
+                          Type connectionType,
+                          Type commandType,
+                          Type parameterType,
+                          Type dataAdapterType,
+                          Type commandBuilderType,
+                          string commandBuilderDeriveParametersMethod,
+                          Type parameterDbType,
+                          string parameterDbTypeProperty,
+                          string parameterIsNullableProperty,
+                          string parameterNamePrefix,
+                          Type exceptionType,
+                          bool useParameterNamePrefixInParameterCollection,
+                          bool useParameterPrefixInSql,
+                          bool bindByName,
+                          string errorCodeExceptionExpression
+
+            )
+        {
+
+            AssertUtils.ArgumentHasText(productName, "ProductName");
+            this.productName = productName;
+            AssertUtils.ArgumentHasText(assemblyName, "assemblyName", GetErrorMessage() );
+            AssertUtils.ArgumentNotNull(connectionType, "connectionType", GetErrorMessage() );
+            AssertUtils.ArgumentNotNull(commandType, "commandType", GetErrorMessage());
+            AssertUtils.ArgumentNotNull(parameterType, "parameterType", GetErrorMessage());
+            AssertUtils.ArgumentNotNull(dataAdapterType, "dataAdapterType", GetErrorMessage());
+            AssertUtils.ArgumentNotNull(commandBuilderType, "commandBuilderType", GetErrorMessage());
+            AssertUtils.ArgumentHasText(commandBuilderDeriveParametersMethod, "commandBuilderDeriveParametersMethod", GetErrorMessage());
+            AssertUtils.ArgumentNotNull(parameterDbType, "parameterDbType", GetErrorMessage());
+            AssertUtils.ArgumentHasText(parameterDbTypeProperty, "parameterDbTypeProperty", GetErrorMessage());
+            AssertUtils.ArgumentHasText(parameterIsNullableProperty, "parameterIsNullableProperty", GetErrorMessage());
+            AssertUtils.ArgumentHasText(parameterNamePrefix, "parameterNamePrefix", GetErrorMessage());
+            AssertUtils.ArgumentNotNull(exceptionType, "exceptionType", GetErrorMessage());
+            
+            this.assemblyName = assemblyName;
+
+            this.connectionType = connectionType;
+            this.commandType = commandType;
+            this.parameterType = parameterType;
+            this.dataAdapterType = dataAdapterType;
+            this.commandBuilderType = commandBuilderType;
+
+            //TODO consider support for derive parameters via a stored procedure.
+            if (commandBuilderDeriveParametersMethod.ToLower().Trim().Equals("not supported"))
+            {
+                supportsDeriveParametersMethod = false;
+            }
+
+            if (supportsDeriveParametersMethod)
+            {
+                this.commandBuilderDeriveParametersMethod =
+                    ReflectionUtils.GetMethod(this.commandBuilderType, commandBuilderDeriveParametersMethod,
+                                              new Type[] {this.commandType});
+
+                AssertUtils.ArgumentNotNull(this.commandBuilderDeriveParametersMethod,
+                                            "commandBuilderDeriveParametersMethod", GetErrorMessage() +
+                                                                                    ", could not resolve commandBuilderDeriveParametersMethod " +
+                                                                                    commandBuilderDeriveParametersMethod +
+                                                                                    " to MethodInfo.  Please check dbproviders.xml entry for correct metadata listing.");
+            }
+
+            this.commandType = commandType;
+
+            this.parameterDbType = parameterDbType;
+
+            this.parameterDbTypeProperty = this.parameterType.GetProperty(parameterDbTypeProperty,
+                                                     BindingFlags.Instance | BindingFlags.Public);
+            AssertUtils.ArgumentNotNull(this.parameterDbTypeProperty, "parameterDbTypeProperty", GetErrorMessage() + 
+                ", could not resolve parameterDbTypeProperty " + 
+                parameterDbTypeProperty + 
+                " to PropertyInfo.  Please check dbproviders.xml entry for correct metadata listing.");
+
+            this.parameterIsNullableProperty = this.parameterType.GetProperty(parameterIsNullableProperty,
+                                                     BindingFlags.Instance | BindingFlags.Public);
+
+            AssertUtils.ArgumentNotNull(this.parameterIsNullableProperty, "parameterIsNullableProperty", GetErrorMessage() +
+                ", could not resolve parameterIsNullableProperty " +
+                parameterIsNullableProperty +
+                " to PropertyInfo.  Please check dbproviders.xml entry for correct metadata listing.");
+            
+            this.parameterNamePrefix = parameterNamePrefix;
+            this.exceptionType = exceptionType;
+           
+            this.useParameterNamePrefixInParameterCollection = useParameterNamePrefixInParameterCollection;
+            this.useParameterPrefixInSql = useParameterPrefixInSql;
+            this.bindByName = bindByName;
+
+            this.errorCodeExceptionExpression = errorCodeExceptionExpression;
+            
+            
+            errorCodes = new ErrorCodes();
+
+        
+        }
+
+        private string GetErrorMessage()
+        {
+            return "DbProvider product name = " + productName;
+        }
+
+
+        #endregion
+
+        #region IDbMetadata Members
+
+        /// <summary>
+        /// Gets a value indicating whether to use param name prefix in parameter collection.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if should use param name prefix in parameter collection; otherwise, <c>false</c>.
+        /// </value>
+        public bool UseParamNamePrefixInParameterCollection
+        {
+            get { return useParameterNamePrefixInParameterCollection; }
+        }
+
+        /// <summary>
+        /// Gets the name of the assembly.
+        /// </summary>
+        /// <example>Example: System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The name of the assembly.</value>
+        public string AssemblyName
+        {
+            get { return assemblyName; }
+        }
+
+        /// <summary>
+        /// Gets a descriptive name of the product.
+        /// </summary>
+        /// <example>Example: Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0</example>
+        /// <value>The name of the product.</value>
+        public string ProductName
+        {
+            get { return productName; }
+        }
+
+        /// <summary>
+        /// Gets the type of the connection.  The fully qualified type name is given since some providers,
+        /// notably for SqlServerCe, do not use the same namespace for all data access types.
+        /// </summary>
+        /// <example>Example: System.Data.SqlClient.SqlCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the connection.</value>
+        public Type ConnectionType
+        {
+            get { return connectionType; }
+        }
+
+        /// <summary>
+        /// Gets the type of the command.
+        /// </summary>
+        /// <example>Example: System.Data.SqlClient.SqlCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the command.</value>
+        public Type CommandType
+        {
+            get { return commandType; }
+        }
+
+        /// <summary>
+        /// Gets the type of the parameter.
+        /// </summary>
+        /// <example>Example: System.Data.SqlClient.SqlParameter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the parameter.</value>
+        public Type ParameterType
+        {
+            get { return parameterType; }
+        }
+
+        /// <summary>
+        /// Gets the type of the data adapter.
+        /// </summary>
+        /// <example>Example: System.Data.SqlClient.SqlDataAdapter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the data adapter.</value>
+        public Type DataAdapterType
+        {
+            get { return dataAdapterType; }
+        }
+
+        /// <summary>
+        /// Gets the type of the command builder.
+        /// </summary>
+        /// <example>Example: System.Data.SqlClient.SqlCommandBuilder, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the command builder.</value>
+        public Type CommandBuilderType
+        {
+            get { return commandBuilderType; }
+        }
+
+        /// <summary>
+        /// Gets the command builder derive parameters method.
+        /// </summary>
+        /// <remarks>If the value 'not supported' is specified then this method will throw an ArgumentException</remarks>
+        /// <example>Example: DeriveParameters</example>
+        /// <value>The command builder derive parameters method.</value>
+        public MethodInfo CommandBuilderDeriveParametersMethod
+        {
+            get
+            {
+                if (supportsDeriveParametersMethod)
+                {
+                    return commandBuilderDeriveParametersMethod;
+                } else
+                {
+                    throw new ArgumentException("This provider does not support the DeriveParameters functionality");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Provide the prefix used to indentify named parameters in SQL text.
+        /// </summary>
+        /// <example>@ for Sql Server</example>
+        public string ParameterNamePrefix
+        {
+            get { return parameterNamePrefix; }
+        }
+
+        /// <summary>
+        /// Gets the type of the exception.
+        /// </summary>
+        /// <example>Example: System.Data.SqlClient.SqlException, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the exception.</value>
+        public Type ExceptionType
+        {
+            get { return exceptionType; }
+        }
+
+        /// <summary>
+        /// Does the driver require the use of the parameter prefix when
+        /// specifying the name of the parameter in the Command's
+        /// Parameter collection.
+        /// </summary>
+        /// <value></value>
+        /// <remarks>If true, then commamd.Parameters["@parameterName"] is
+        /// used, otherwise, command.Parameters["parameterName"].
+        /// </remarks>
+        public bool UseParameterNamePrefixInParameterCollection
+        {
+            get { return useParameterNamePrefixInParameterCollection; }
+        }
+
+
+        /// <summary>
+        /// Gets a value indicating whether the Provider requires
+        /// the use of a named prefix in the SQL string.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if use parameter prefix in SQL; otherwise, <c>false</c>.
+        /// </value>
+        /// <remarks>
+        /// The OLE DB/ODBC .NET Provider does not support named parameters for
+        /// passing parameters to an SQL Statement or a stored procedure called
+        /// by an IDbCommand when CommandType is set to Text.
+        /// </remarks>
+        public bool UseParameterPrefixInSql
+        {
+            get { return useParameterPrefixInSql; }
+        }
+
+        /// <summary>
+        /// For providers that allow you to choose between binding parameters
+        /// to a command by name (true) or by position (false).
+        /// </summary>
+        /// <value></value>
+        public bool BindByName
+        {
+            get { return bindByName; }
+            set { bindByName = value; }
+        }
+
+        /// <summary>
+        /// Gets the type of the parameter db.
+        /// </summary>
+        /// <example>Example: System.Data.SqlDbType, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the parameter db.</value>
+        public Type ParameterDbType
+        {
+            get { return parameterDbType; }
+        }
+
+        /// <summary>
+        /// Gets the parameter db type property.
+        /// </summary>
+        /// <example>Example: SqlDbType for SqlServer</example>
+        /// <value>The parameter db type property.</value>
+        public PropertyInfo ParameterDbTypeProperty
+        {
+            get { return parameterDbTypeProperty; }
+        }
+
+        /// <summary>
+        /// Gets the parameter is nullable property.
+        /// </summary>
+        /// <example>Example: IsNullable for Sql Server</example>
+        /// <value>The parameter is nullable property.</value>
+        public PropertyInfo ParameterIsNullableProperty
+        {
+            get { return parameterIsNullableProperty; }
+        }
+
+        /// <summary>
+        /// Gets or sets the error codes.
+        /// </summary>
+        /// <remarks>The collection of error codes to map error code integer values to Spring's DAO exception hierarchy</remarks>
+        /// <value>The error codes.</value>
+        public ErrorCodes ErrorCodes
+        {
+            get { return errorCodes; } 
+            set { errorCodes = value;}
+        }
+
+        /// <summary>
+        /// Gets the error code exception expression.
+        /// </summary>
+        /// <example>Example Errors[0].Number.ToString() for Sql Server </example>
+        /// <value>The error code exception expression.</value>
+        public string ErrorCodeExceptionExpression
+        {
+            get { return errorCodeExceptionExpression; }
+        }
+
+        #endregion
+        
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Common/DbParameter.cs b/src/Spring/Spring.Data/Data/Common/DbParameter.cs
new file mode 100644
index 00000000..819e9049
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/DbParameter.cs
@@ -0,0 +1,194 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+
+#endregion
+
+namespace Spring.Data.Common
+{
+	/// <summary>
+    /// A parameter class used by <see cref="DbParametersBuilder"/>
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: DbParameter.cs,v 1.6 2008/05/30 21:09:22 markpollack Exp $</version>
+	public class DbParameter : Spring.Data.Common.IDbParameter
+	{
+		#region Fields
+        private Enum dbType;	    
+	    private ParameterDirection direction;
+        private bool isNullable;
+        private string name;
+	    private string sourceColumn;
+	    private DataRowVersion sourceVersion;
+        private object val;
+	    private byte precision;
+	    private byte scale;
+	    private int size;
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="DbParameter"/> class.
+        /// </summary>
+        /// <remarks>
+        /// Sets the SourceVersion to be Default and the ParameterDirection to be Input.
+        /// </remarks>
+		public DbParameter()
+		{
+            sourceVersion = DataRowVersion.Default;
+            direction = ParameterDirection.Input;		    
+		}
+
+		#endregion
+
+        #region IDbParameter Members
+
+        public Enum DbType
+        {
+            set
+            {
+                dbType = value;
+            }
+        }
+
+        #endregion
+
+	    public IDbParameter Type(Enum dbType)
+	    {
+	        this.dbType = dbType;
+	        return this;
+	    }
+
+	    public IDbParameter Type(Enum dbType, int size)
+	    {
+	        this.dbType = dbType;
+	        this.size = size;
+	        return this;
+	    }
+
+	    public Enum GetDbType()
+	    {
+	        return dbType;
+	    }
+
+	    public IDbParameter Direction(ParameterDirection direction)
+	    {
+	        this.direction = direction;
+	        return this;
+	    }
+
+	    public ParameterDirection GetDirection()
+	    {
+	        return direction;
+	    }
+
+	    public IDbParameter IsNullable(bool isNullable)
+	    {
+	        this.isNullable = isNullable;
+	        return this;
+	    }
+
+	    public bool GetIsNullable()
+	    {
+	        return isNullable;
+	    }
+
+	    public IDbParameter Name(string name)
+	    {
+	        this.name = name;
+	        return this;
+	    }
+
+	    public string GetName()
+	    {
+	        return name;
+	    }
+
+	    public IDbParameter SourceColumn(string sourceColumn)
+	    {
+	        this.sourceColumn = sourceColumn;
+	        return this;
+	    }
+
+	    public string GetSourceColumn()
+	    {
+	        return sourceColumn;
+	    }
+
+	    public IDbParameter SourceVersion(DataRowVersion sourceVersion)
+	    {
+	        this.sourceVersion = sourceVersion;
+	        return this;
+	    }
+
+	    public DataRowVersion GetSourceVersion()
+	    {
+	        return sourceVersion;
+	    }
+
+	    public IDbParameter Value(object val)
+	    {
+	        this.val = val;
+	        return this;
+	    }
+
+	    public object GetValue()
+	    {
+	       return val;
+	    }
+
+	    public IDbParameter Precision(byte precision)
+	    {
+	        this.precision = precision;
+	        return this;
+	    }
+
+	    public byte GetPrecision()
+	    {
+	        return precision;	       
+	    }
+
+	    public IDbParameter Scale(byte scale)
+	    {
+	        this.scale = scale;
+	        return this;
+	    }
+
+	    public byte GetScale()
+	    {
+	        return scale;
+	    }
+
+	    public IDbParameter Size(int size)
+	    {
+	        this.size = size;
+	        return this;
+	    }
+
+	    public int GetSize()
+	    {
+	        return size;
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Common/DbParameters.cs b/src/Spring/Spring.Data/Data/Common/DbParameters.cs
new file mode 100644
index 00000000..7a1a6bda
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/DbParameters.cs
@@ -0,0 +1,302 @@
+#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
+
+#region Imports
+
+using System;
+using System.Data;
+using System.Reflection;
+using Spring.Dao;
+
+#endregion
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// A more portable means to create a collection of ADO.NET
+    /// parameters.
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: DbParameters.cs,v 1.14 2007/12/06 22:34:56 markpollack Exp $</version>
+    public class DbParameters : IDbParameters
+    {
+
+        #region Fields
+
+        private IDbProvider dbProvider;
+
+        //Just used as a container for the underlying parameter collection.	    
+        private IDbCommand dbCommand;
+        private IDataParameterCollection dataParameterCollection;
+
+        #endregion
+
+        #region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DbParameters"/> class.
+        /// </summary>
+        public DbParameters(IDbProvider dbProvider)
+        {
+            this.dbProvider = dbProvider;
+            dbCommand = dbProvider.CreateCommand();
+            dataParameterCollection = dbCommand.Parameters;
+        }
+
+        #endregion
+
+        #region Properties
+
+        #endregion
+
+        #region Methods
+
+        #endregion
+
+        public IDataParameter this[string parameterName]
+        {
+            get { return (IDbDataParameter) dataParameterCollection[parameterName]; }
+            set { dataParameterCollection[parameterName] = value; }
+        }
+
+        public IDataParameter this[int index]
+        {
+            get { return (IDbDataParameter) dataParameterCollection[index]; }
+            set { dataParameterCollection[index] = value; }
+        }
+
+        public IDataParameterCollection DataParameterCollection
+        {
+            get { return dataParameterCollection; }
+        }
+        
+        public int Count
+        {
+            get
+            {
+                return dataParameterCollection.Count;
+            }
+        }
+        public bool Contains(string parameterName)
+        {
+            return dataParameterCollection.Contains(parameterName);
+        }
+
+        public void AddParameter(IDataParameter dbParameter)
+        {
+            dataParameterCollection.Add(dbParameter);
+        }
+        
+
+        public IDbDataParameter AddParameter(string name, 
+                                 Enum parameterType, 
+                                 int size, 
+                                 ParameterDirection direction,
+                                 bool isNullable,
+                                 byte precision, 
+                                 byte scale, 
+                                 string sourceColumn, 
+                                 DataRowVersion sourceVersion,
+                                 object parameterValue)
+        {
+            IDbDataParameter parameter = dbCommand.CreateParameter();
+
+            parameter.ParameterName = dbProvider.CreateParameterNameForCollection(name);
+
+            AssignParameterType(parameter, parameterType);
+
+            if (size > 0)
+            {
+                parameter.Size = size;
+            }
+            parameter.Direction = direction;
+
+            if (isNullable)
+            {
+                AssignIsNullable(isNullable, parameter);
+            }
+
+            parameter.Precision = precision;
+
+            if (scale > 0)
+            {
+                parameter.Scale = scale;
+            }
+
+            if (sourceColumn != null && sourceColumn != string.Empty)
+            {
+                parameter.SourceColumn = sourceColumn;
+            }
+
+            parameter.SourceVersion = sourceVersion;
+
+            parameter.Value = (parameterValue == null) ? DBNull.Value : parameterValue;
+
+            dataParameterCollection.Add(parameter);
+            
+            return parameter;
+        }
+
+        public IDbDataParameter AddParameter(string name, 
+                                             Enum parameterType, 
+                                             ParameterDirection direction, 
+                                             bool isNullable,
+                                             byte precision,
+                                             byte scale, 
+                                             string sourceColumn, 
+                                             DataRowVersion sourceVersion, 
+                                             object parameterValue)
+        {
+            return AddParameter(name, parameterType, 0, direction, isNullable, precision, scale, sourceColumn, sourceVersion,
+                         parameterValue);
+        }
+
+
+        public int Add(object parameterValue)
+        {
+            IDbDataParameter parameter = dbCommand.CreateParameter();
+            //TODO investigate default behavior of values.
+            parameter.Value = (parameterValue == null) ? DBNull.Value : parameterValue;
+            dataParameterCollection.Add(parameter);
+            return dataParameterCollection.Count - 1;
+        }
+
+        public void AddRange(Array values)
+        {
+            foreach (Array value in values)
+            {
+                Add(value);
+            }
+        }
+
+        public IDbDataParameter AddWithValue(string name, object parameterValue)
+        {
+            return AddParameter(name, null, -1, ParameterDirection.Input, false, 
+                                0, 0, null, DataRowVersion.Default, parameterValue);
+        }
+
+        public IDbDataParameter Add(string name, Enum parameterType)
+        {
+            return AddParameter(name, parameterType, -1, ParameterDirection.Input, 
+                false, 0, 0, null, DataRowVersion.Default, null);
+        }
+        
+        public IDbDataParameter Add(string name, Enum parameterType, int size)
+        {
+            return AddParameter(name, parameterType, size, ParameterDirection.Input, 
+                false, 0, 0, null, DataRowVersion.Default, null);
+        }
+        
+        public IDbDataParameter Add(string name, Enum parameterType, int size, string sourceColumn)
+        {
+            return AddParameter(name, parameterType, size, ParameterDirection.Input, 
+                false, 0, 0, sourceColumn, DataRowVersion.Default, null);
+        }
+
+        public IDbDataParameter AddOut(string name, Enum parameterType)
+        {
+            return AddParameter(name, parameterType, -1, ParameterDirection.Output, 
+                false, 0, 0, null, DataRowVersion.Default, null);
+        }
+
+        public IDbDataParameter AddOut(string name, Enum parameterType, int size)
+        {
+            return AddParameter(name, parameterType, size, ParameterDirection.Output,
+                false, 0, 0, null, DataRowVersion.Default, null);
+        }
+        
+        public IDbDataParameter AddInOut(string name, Enum parameterType)
+        {
+            return AddParameter(name, parameterType, -1, ParameterDirection.InputOutput,
+                false, 0, 0, null, DataRowVersion.Default, null);
+        }
+        
+        public IDbDataParameter AddInOut(string name, Enum parameterType, int size)
+        {
+            return AddParameter(name, parameterType, size, ParameterDirection.InputOutput,
+                false, 0, 0, null, DataRowVersion.Default, null);
+        }
+        
+        public IDbDataParameter AddReturn(string name, Enum parameterType)
+        {
+            return AddParameter(name, parameterType, -1, ParameterDirection.ReturnValue,
+                false, 0, 0, null, DataRowVersion.Default, null);
+        }
+        
+        public IDbDataParameter AddReturn(string name, Enum parameterType, int size)
+        {
+            return AddParameter(name, parameterType, size, ParameterDirection.ReturnValue,
+                false, 0, 0, null, DataRowVersion.Default, null);
+        }
+
+
+        public object GetValue(string name)
+        {
+            return dataParameterCollection[dbProvider.CreateParameterNameForCollection(name)];
+        }
+
+        public void SetValue(string name, object parameterValue)
+        {
+            IDbDataParameter parameter = dataParameterCollection[dbProvider.CreateParameterNameForCollection(name)] as IDbDataParameter;
+            if (parameter != null)
+            {
+                parameter.Value = (parameterValue == null) ? DBNull.Value : parameterValue;
+            }
+        }
+
+        
+        protected void AssignParameterType(IDbDataParameter parameter, Enum parameterType)
+        {
+            if (parameterType != null)
+            {
+                if (parameterType is DbType)
+                {
+                    parameter.DbType = (DbType) parameterType;
+                }
+                else
+                {
+                    if (parameterType.GetType() != dbProvider.DbMetadata.ParameterDbType)
+                    {
+                        throw new TypeMismatchDataAccessException("Invalid parameter type specified for parameter name ["
+                                                                  + parameter.ParameterName + "].  [" 
+                                                                  + parameterType.GetType().AssemblyQualifiedName + "] is not of expected type [" 
+                                                                  + dbProvider.DbMetadata.ParameterDbType.AssemblyQualifiedName + "]");
+                    }
+                    dbProvider.DbMetadata.ParameterDbTypeProperty.SetValue(parameter, parameterType, null);
+                }
+            }
+        }
+        
+        protected void AssignIsNullable(bool isNullable, IDbDataParameter parameter)
+        {
+            PropertyInfo propertyInfo = dbProvider.DbMetadata.ParameterIsNullableProperty;
+            if (propertyInfo != null)
+            {
+                propertyInfo.SetValue(parameter, isNullable, null);
+            }
+            //TODO investigate default behavior.
+            if (parameter.Value == null)
+            {
+                parameter.Value = DBNull.Value;
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs b/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs
new file mode 100644
index 00000000..a5b6f769
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs
@@ -0,0 +1,111 @@
+#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
+
+#region Imports
+
+using System.Collections;
+using Common.Logging;
+
+#endregion
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// Assists in creating a collection of parameters by keeping track of all
+    /// IDbParameters its creates.  After creating a number of parameters ask for the collection
+    /// with the GetParameters methods.
+    /// </summary>
+    /// <remarks>This builder is stateful, you must create a new one for each collection
+    /// of parameters you would like to create.</remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: DbParametersBuilder.cs,v 1.2 2007/05/01 00:37:10 markpollack Exp $</version>
+    public class DbParametersBuilder : IDbParametersBuilder
+    {
+        #region Fields
+
+        private IDbProvider dbProvider;
+        private IList parameterList;
+
+        #endregion
+
+        #region Constants
+
+        /// <summary>
+        /// The shared log instance for this class (and derived classes). 
+        /// </summary>
+        protected static readonly ILog log =
+            LogManager.GetLogger(typeof (DbParametersBuilder));
+
+        #endregion
+
+        #region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DbParametersBuilder"/> class.
+        /// </summary>
+        public DbParametersBuilder(IDbProvider dbProvider)
+        {
+            this.dbProvider = dbProvider;
+            parameterList = new ArrayList();
+        }
+
+        #endregion
+
+        #region Properties
+
+        #endregion
+
+        #region Methods
+
+        public IDbParameter Create()
+        {
+            IDbParameter p = new DbParameter();
+            parameterList.Add(p);
+            return p;
+        }
+
+        public IDbParameters GetParameters()
+        {
+            IDbParameters dbParameters = CreateDbParameters();
+            foreach (IDbParameter parameter in parameterList)
+            {
+                dbParameters.AddParameter(parameter.GetName(),																					
+                                          parameter.GetDbType(),
+                                          parameter.GetSize(),
+                                          parameter.GetDirection(),
+                                          parameter.GetIsNullable(),
+                                          parameter.GetPrecision(),
+                                          parameter.GetScale(),
+                                          parameter.GetSourceColumn(),
+                                          parameter.GetSourceVersion(),
+                                          parameter.GetValue());
+            }
+            return dbParameters;
+        }
+
+
+        protected IDbParameters CreateDbParameters()
+        {
+            return new DbParameters(dbProvider);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Common/DbProvider.cs b/src/Spring/Spring.Data/Data/Common/DbProvider.cs
new file mode 100644
index 00000000..c4d07e54
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/DbProvider.cs
@@ -0,0 +1,250 @@
+#region Licence
+
+/*
+ * 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.Data;
+using Spring.Expressions;
+using Spring.Reflection.Dynamic;
+using Spring.Util;
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// Implemenation of of DbProvider that uses metadata to create provider specific ADO.NET objects.
+    /// </summary>
+    /// <version>$Id:</version>
+    public class DbProvider : IDbProvider
+    {
+        private string connectionString;
+        private IDbMetadata dbMetadata;
+        private IDynamicConstructor newCommand;
+        private IDynamicConstructor newConnection;
+        private IDynamicConstructor newCommandBuilder;
+        private IDynamicConstructor newDataAdapter;
+        private IDynamicConstructor newParameter;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DbProvider"/> class.
+        /// </summary>
+        /// <param name="dbMetadata">The db metadata.</param>
+        public DbProvider(IDbMetadata dbMetadata)
+        {
+            this.dbMetadata = dbMetadata;
+            newCommand = DynamicConstructor.Create(dbMetadata.CommandType.GetConstructor(Type.EmptyTypes));
+            newConnection = DynamicConstructor.Create(dbMetadata.ConnectionType.GetConstructor(Type.EmptyTypes));
+            newCommandBuilder = DynamicConstructor.Create(dbMetadata.CommandBuilderType.GetConstructor(Type.EmptyTypes));
+            newDataAdapter = DynamicConstructor.Create(dbMetadata.DataAdapterType.GetConstructor(Type.EmptyTypes));
+            newParameter = DynamicConstructor.Create(dbMetadata.ParameterType.GetConstructor(Type.EmptyTypes));
+        }
+
+        /// <summary>
+        /// Returns a new command object for executing SQL statments/Stored Procedures
+        /// against the database.
+        /// </summary>
+        /// <returns>An new <see cref="IDbCommand"/></returns>
+        public IDbCommand CreateCommand()
+        {
+            return newCommand.Invoke(ObjectUtils.EmptyObjects) as IDbCommand;          
+        }
+
+        /// <summary>
+        /// Returns a new instance of the providers CommandBuilder class.
+        /// </summary>
+        /// <returns>A new Command Builder</returns>
+        /// <remarks>In .NET 1.1 there was no common base class or interface
+        /// for command builders, hence the return signature is object to
+        /// be portable (but more loosely typed) across .NET 1.1/2.0</remarks>
+        public object CreateCommandBuilder()
+        {
+            return newCommandBuilder.Invoke(ObjectUtils.EmptyObjects);
+        }
+
+        /// <summary>
+        /// Returns a new connection object to communicate with the database.
+        /// </summary>
+        /// <returns>A new <see cref="IDbConnection"/></returns>
+        public IDbConnection CreateConnection()
+        {
+            IDbConnection conn = newConnection.Invoke(ObjectUtils.EmptyObjects) as IDbConnection;
+            if (conn != null)
+            {
+                conn.ConnectionString = ConnectionString;
+            }
+            return conn;
+        }
+
+        /// <summary>
+        /// Returns a new adapter objects for use with offline DataSets.
+        /// </summary>
+        /// <returns>A new <see cref="IDbDataAdapter"/></returns>
+        public IDbDataAdapter CreateDataAdapter()
+        {
+            return newDataAdapter.Invoke(ObjectUtils.EmptyObjects) as IDbDataAdapter;
+        }
+
+        /// <summary>
+        /// Returns a new parameter object for binding values to parameter
+        /// placeholders in SQL statements or Stored Procedure variables.
+        /// </summary>
+        /// <returns>A new <see cref="IDbDataParameter"/></returns>
+        public IDbDataParameter CreateParameter()
+        {
+            return newParameter.Invoke(ObjectUtils.EmptyObjects) as IDbDataParameter;
+        }
+
+        /// <summary>
+        /// Creates the name of the parameter in the format appropriate to use inside IDbCommand.CommandText.
+        /// </summary>
+        /// <param name="name">The unformatted name of the parameter.</param>
+        /// <returns>
+        /// The parameter name formatted foran IDbCommand.CommandText.
+        /// </returns>
+        /// <remarks>In most cases this adds the parameter prefix to the name passed into this method.</remarks>
+        public string CreateParameterName(string name)
+        {
+            if (dbMetadata.BindByName)
+            {
+                if (DbMetadata.UseParameterPrefixInSql)
+                {
+                    return DbMetadata.ParameterNamePrefix + name;
+                }
+                else
+                {
+                    return name;
+                }
+            }
+            else
+            {
+                return DbMetadata.ParameterNamePrefix;
+            }
+        }
+
+        /// <summary>
+        /// Creates the name ofthe parameter in the format appropriate for an IDataParameter, i.e. to be
+        /// part of a IDataParameterCollection.
+        /// </summary>
+        /// <param name="name">The unformatted name of the parameter.</param>
+        /// <returns>
+        /// The parameter name formatted for an IDataParameter
+        /// </returns>
+        public string CreateParameterNameForCollection(string name)
+        {
+            if (dbMetadata.BindByName)
+            {
+                if (DbMetadata.UseParameterNamePrefixInParameterCollection)
+                {
+                    return DbMetadata.ParameterNamePrefix + name;
+                }
+                else
+                {
+                    return name;
+                }
+            }
+            else
+            {
+                return DbMetadata.ParameterNamePrefix;
+            }
+        }
+
+        /// <summary>
+        /// Return metadata information about the database provider
+        /// </summary>
+        /// <value></value>
+        public IDbMetadata DbMetadata
+        {
+            get { return dbMetadata; }
+        }
+
+        /// <summary>
+        /// Connection string used to create connections.
+        /// </summary>
+        /// <value></value>
+        public string ConnectionString
+        {
+            get { return connectionString; }
+            set { connectionString = value; }
+        }
+
+        /// <summary>
+        /// Extracts the provider specific error code as a string.
+        /// </summary>
+        /// <param name="e">The data access exception.</param>
+        /// <returns>The provider specific error code</returns>
+        public string ExtractError(Exception e)
+        {
+    
+            if (!StringUtils.IsNullOrEmpty(dbMetadata.ErrorCodeExceptionExpression))
+            {
+                return ExpressionEvaluator.GetValue(e, dbMetadata.ErrorCodeExceptionExpression).ToString();
+            }  
+            else
+            {
+                return "Could not extract error code exception type." + e.GetType(); 
+            }
+
+        }
+
+
+
+        /// <summary>
+        /// Determines whether the provided exception is in fact related
+        /// to database access.  This can be provider dependent in .NET 1.1 since
+        /// there isn't a common base class for ADO.NET exceptions.
+        /// </summary>
+        /// <param name="e">The exception thrown when performing data access
+        /// operations.</param>
+        /// <returns>
+        /// 	<c>true</c> if is a valid data access exception for the specified
+        /// exception; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsDataAccessException(Exception e)
+        {
+
+#if NET_2_0
+            if (e is System.Data.Common.DbException)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+#else       
+            return IsDataAccessExceptionBCL11(e);
+#endif
+        }
+
+        /// <summary>
+        /// Determines whether is data access exception in .NET 1.1 for the specified exception.
+        /// </summary>
+        /// <param name="e">The candidate exception.</param>
+        /// <returns>
+        /// 	<c>true</c> if is data access exception in .NET 1.1 for the specified exception; otherwise, <c>false</c>.
+        /// </returns>
+        private bool IsDataAccessExceptionBCL11(Exception e)
+        {
+            if (e == null)
+            {
+                return false;
+            }
+            return e.GetType().IsAssignableFrom(DbMetadata.ExceptionType);
+        }
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/Common/DbProviderFactory.cs b/src/Spring/Spring.Data/Data/Common/DbProviderFactory.cs
new file mode 100644
index 00000000..90089610
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/DbProviderFactory.cs
@@ -0,0 +1,165 @@
+#region Licence
+
+/*
+ * 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 Common.Logging;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Core.IO;
+using Spring.Util;
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// Create DbProviders based on configuration information in assembly resource
+    /// dbproviders.xml
+    ///
+    ///
+    /// </summary>
+    /// <remarks>
+    /// TODO: Provide over-ride resource location.
+    /// TODO: Add error codes to provider.
+    /// </remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: DbProviderFactory.cs,v 1.12 2007/08/16 20:38:43 markpollack Exp $</version>
+    public class DbProviderFactory
+    {
+    	#region Constants
+
+        /// <summary>
+        /// The shared log instance for this class (and derived classes).
+        /// </summary>
+        protected static ILog log = LogManager.GetLogger(typeof(DbProviderFactory));
+
+        private static readonly string DBPROVIDER_DEFAULT_RESOURCE_NAME =
+            "assembly://" + typeof(DbProviderFactory).Assembly.FullName + "/Spring.Data.Common/dbproviders.xml";
+
+        public static string DBPROVIDER_ADDITIONAL_RESOURCE_NAME =
+            "file://dbProviders.xml";
+
+		private static readonly string DBPROVIDER_CONTEXTNAME = "DBPROVIDERFACTORY_CONTEXT";
+
+        #endregion
+
+	    #region Fields
+
+        private volatile static XmlApplicationContext ctx;
+
+        #endregion
+
+        #region Constructor (s)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DbProviderFactory"/> class.
+        /// </summary>
+        static DbProviderFactory()
+        {
+        }
+
+        #endregion
+
+
+        /// <summary>
+        /// Gets the DbProvider given an identifying name.
+        /// </summary>
+        /// <remarks>
+        /// Familiar names for the .NET 2.0 provider model are supported, i.e.
+        /// System.Data.SqlClient.  Refer to the documentation for a complete
+        /// listing of supported DbProviders and their names.  You may
+        /// also use the method GetDbProviderClasses or obtain the
+        /// underlying IApplicationContext to progammatically obtain information
+        /// about supported providers.
+        /// </remarks>
+        /// <param name="providerInvariantName">Name of the provider invariant.</param>
+        /// <returns></returns>
+        public static IDbProvider GetDbProvider(string providerInvariantName)
+        {
+            InitializeDbProviderFactoryIfNeeded();
+
+            return ctx.GetObject(providerInvariantName, typeof(IDbProvider)) as IDbProvider;
+
+        }
+
+        /// <summary>
+        /// Gets the application context that contains the definitions of the
+        /// various providers.
+        /// </summary>
+        /// <remarks>This method should rarely, if ever, be used in
+        /// application code.  It is used by the framework itself
+        /// to map other data access products abstractions for a 'DbProvider/DataSource'
+        /// onto Spring's model.</remarks>
+        /// <value>The application context.</value>
+        public static IApplicationContext ApplicationContext
+        {
+            get
+            {
+                InitializeDbProviderFactoryIfNeeded();
+                return ctx;
+            }
+        }
+
+        //TODO GetDbProviderClasses
+        private static void InitializeDbProviderFactoryIfNeeded()
+        {
+            if (ctx == null)
+            {
+				lock(typeof(DbProviderFactory))
+				{
+					if (ctx == null)
+					{
+						try
+						{
+
+							//TODO get from well know location in app.config....
+							ConfigurableResourceLoader loader = new ConfigurableResourceLoader(DBPROVIDER_ADDITIONAL_RESOURCE_NAME);
+
+
+							if (loader.GetResource(DBPROVIDER_ADDITIONAL_RESOURCE_NAME).Exists)
+							{
+								#region Instrumentation
+								if (log.IsDebugEnabled)
+								{
+									log.Debug("Loading additional DbProviders from " + DBPROVIDER_ADDITIONAL_RESOURCE_NAME);
+								}
+								#endregion
+								ctx = new XmlApplicationContext(DBPROVIDER_CONTEXTNAME, true, new string[] { DBPROVIDER_DEFAULT_RESOURCE_NAME,
+								                                               DBPROVIDER_ADDITIONAL_RESOURCE_NAME});
+							}
+							else
+							{
+								ctx = new XmlApplicationContext(DBPROVIDER_CONTEXTNAME, true, new string[] { DBPROVIDER_DEFAULT_RESOURCE_NAME });
+							}
+
+							string[] dbProviderNames = ctx.GetObjectNamesForType(typeof(IDbProvider));
+							if (log.IsInfoEnabled)
+							{
+								log.Info(String.Format("{0} DbProviders Available. [{1}]", dbProviderNames.Length, StringUtils.ArrayToCommaDelimitedString(dbProviderNames)));
+							}
+						}
+						catch (Exception e)
+						{
+							log.Error("Error processing " + DBPROVIDER_DEFAULT_RESOURCE_NAME, e);
+							throw;
+						}
+					}					
+				}
+            }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/Common/DbProviderFactoryObject.cs b/src/Spring/Spring.Data/Data/Common/DbProviderFactoryObject.cs
new file mode 100644
index 00000000..848d0563
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/DbProviderFactoryObject.cs
@@ -0,0 +1,153 @@
+#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 Spring.Objects.Factory;
+using Spring.Util;
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// A <see cref="Spring.Objects.Factory.IFactoryObject"/> implementation that
+    /// creates instances of the <see cref="IDbProvider"/> class.
+    /// </summary>
+    /// <remarks>Typically used as a convenience for retrieving shared 
+    /// <see cref="IDbProvider"/> in a Spring XML configuration file as compared to
+    /// using explict factory method support.
+    /// </remarks>
+    public class DbProviderFactoryObject : IFactoryObject, IInitializingObject
+    {
+        private string provider;
+        private string connectionString;
+        private IDbProvider dbProvider;
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="DbProviderFactoryObject"/> class.
+        /// </summary>
+        public DbProviderFactoryObject()
+        {
+        }
+
+        /// <summary>
+        /// Return an instance of and IDbProvider as configured by this factory
+        /// managed by this factory.
+        /// </summary>
+        /// <returns>
+        /// The same (singleton) instance of the IDbProvider managed by
+        /// this factory.
+        /// </returns>
+        /// <remarks>
+        /// 	<note type="caution">
+        /// If this method is being called in the context of an enclosing IoC container and
+        /// returns <see langword="null"/>, the IoC container will consider this factory
+        /// object as not being fully initialized and throw a corresponding (and most
+        /// probably fatal) exception.
+        /// </note>
+        /// </remarks>
+        public object GetObject()
+        {
+            lock (this)
+            {
+                if (dbProvider == null)
+                {
+                    ValidateProperties();
+                    dbProvider = DbProviderFactory.GetDbProvider(Provider);
+                    if (connectionString != null)
+                    {
+                        dbProvider.ConnectionString = this.connectionString;
+                    }
+                }
+
+                return dbProvider;
+            }
+        }
+
+        /// <summary>
+        /// Return the type of <see cref="IDbProvider"/>
+        /// </summary>
+        public Type ObjectType
+        {
+            get { return typeof (IDbProvider); }
+        }
+
+        /// <summary>
+        /// Returns true, as the the object managed by this factory is a singleton.
+        /// </summary>
+        /// <value></value>
+        public bool IsSingleton
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// Validates that the provider name is specified.
+        /// </summary>
+        /// <remarks>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </remarks>
+        /// <exception cref="System.ArgumentException">
+        /// In the event of not setting the ProviderName.
+        /// </exception>
+        public void AfterPropertiesSet()
+        {
+            ValidateProperties();
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the database provider.
+        /// </summary>
+        /// <value>The name of the database provider.</value>
+        public string Provider
+        {
+            get { return provider; }
+            set
+            {
+                AssertUtils.ArgumentHasText(value, "The 'ProviderName' property must have a value.");
+                provider = value.Trim();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the connection string.
+        /// </summary>
+        /// <value>The connection string.</value>
+        public string ConnectionString
+        {
+            get { return connectionString; }
+            set
+            {
+                AssertUtils.ArgumentHasText(value, "The 'ConnectionString' property must have a value.");
+                connectionString = value.Trim();
+            }
+        }
+
+        /// <summary>
+        /// Validates the properties.
+        /// </summary>
+        private void ValidateProperties()
+        {
+            if (StringUtils.IsNullOrEmpty(Provider))
+            {
+                throw new ArgumentException("The 'DbProviderName' property has not been set.");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Common/DelegatingDbProvider.cs b/src/Spring/Spring.Data/Data/Common/DelegatingDbProvider.cs
new file mode 100644
index 00000000..133b1c1f
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/DelegatingDbProvider.cs
@@ -0,0 +1,228 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2007 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.Data;
+using Spring.Objects.Factory;
+using Spring.Util;
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// IDbProvider implementation that delegates all calls to a given target
+    /// IDbProvider
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: DelegatingDbProvider.cs,v 1.1 2008/01/29 22:19:20 markpollack Exp $</version>    
+    public class DelegatingDbProvider : IDbProvider, IInitializingObject
+    {
+        private IDbProvider targetDbProvider;
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DelegatingDbProvider"/> class.
+        /// </summary>
+        public DelegatingDbProvider()
+        {
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DelegatingDbProvider"/> class.
+        /// </summary>
+        /// <param name="targetDbProvider">The target db provider.</param>
+        public DelegatingDbProvider(IDbProvider targetDbProvider)
+        {
+            this.targetDbProvider = targetDbProvider;
+        }
+
+
+        /// <summary>
+        /// Gets or sets the target IDbProvider that this IDbProvider should delegate to
+        /// </summary>
+        /// <value>The target db provider.</value>
+        public IDbProvider TargetDbProvider
+        {
+            get { return targetDbProvider; }
+            set
+            {
+                AssertUtils.ArgumentNotNull(value,"TargetDbProvider");
+                targetDbProvider = value;
+            }
+        }
+
+        #region IDbProvider Members
+
+        /// <summary>
+        /// Returns a new command object for executing SQL statments/Stored Procedures
+        /// against the database.
+        /// </summary>
+        /// <returns>An new <see cref="IDbCommand"/></returns>
+        public virtual IDbCommand CreateCommand()
+        {
+            return TargetDbProvider.CreateCommand();
+        }
+
+        /// <summary>
+        /// Returns a new instance of the providers CommandBuilder class.
+        /// </summary>
+        /// <remarks>In .NET 1.1 there was no common base class or interface
+        /// for command builders, hence the return signature is object to
+        /// be portable (but more loosely typed) across .NET 1.1/2.0</remarks>
+        /// <returns>A new Command Builder</returns>
+        public virtual object CreateCommandBuilder()
+        {
+            return TargetDbProvider.CreateCommandBuilder();
+        }
+
+        /// <summary>
+        /// Returns a new connection object to communicate with the database.
+        /// </summary>
+        /// <returns>A new <see cref="IDbConnection"/></returns>
+        public virtual IDbConnection CreateConnection()
+        {
+            return TargetDbProvider.CreateConnection();
+        }
+
+        /// <summary>
+        /// Returns a new adapter objects for use with offline DataSets.
+        /// </summary>
+        /// <returns>A new <see cref="IDbDataAdapter"/></returns>
+        public virtual IDbDataAdapter CreateDataAdapter()
+        {
+            return TargetDbProvider.CreateDataAdapter();
+        }
+
+        /// <summary>
+        /// Returns a new parameter object for binding values to parameter
+        /// placeholders in SQL statements or Stored Procedure variables.
+        /// </summary> 
+        /// <returns>A new <see cref="IDbDataParameter"/></returns>
+        public virtual IDbDataParameter CreateParameter()
+        {
+            return TargetDbProvider.CreateParameter();
+        }
+
+        /// <summary>
+        /// Creates the name of the parameter in the format appropriate to use inside IDbCommand.CommandText.
+        /// </summary>
+        /// <remarks>In most cases this adds the parameter prefix to the name passed into this method.</remarks>
+        /// <param name="name">The unformatted name of the parameter.</param>
+        /// <returns>The parameter name formatted foran IDbCommand.CommandText.</returns>
+        public virtual string CreateParameterName(string name)
+        {
+            return TargetDbProvider.CreateParameterName(name);
+        }
+
+        /// <summary>
+        /// Creates the name ofthe parameter in the format appropriate for an IDataParameter, i.e. to be
+        /// part of a IDataParameterCollection.
+        /// </summary>
+        /// <param name="name">The unformatted name of the parameter.</param>
+        /// <returns>The parameter name formatted for an IDataParameter</returns>
+        public virtual string CreateParameterNameForCollection(string name)
+        {
+            return TargetDbProvider.CreateParameterNameForCollection(name);
+        }
+
+        /// <summary>
+        /// Return metadata information about the database provider
+        /// </summary>
+        public virtual IDbMetadata DbMetadata
+        {
+            get { return TargetDbProvider.DbMetadata; }
+        }
+
+        /// <summary>
+        /// Connection string used to create connections.
+        /// </summary>
+        public virtual string ConnectionString
+        {
+            get { return TargetDbProvider.ConnectionString; }
+            set { TargetDbProvider.ConnectionString = value; }
+        }
+
+        /// <summary>
+        /// Extracts the provider specific error code as a string.
+        /// </summary>
+        /// <param name="e">The data access exception.</param>
+        /// <returns>The provider specific error code</returns>
+        public virtual string ExtractError(Exception e)
+        {
+            return TargetDbProvider.ExtractError(e);
+        }
+
+        /// <summary>
+        /// Determines whether the provided exception is in fact related
+        /// to database access.  This can be provider dependent in .NET 1.1 since
+        /// there isn't a common base class for ADO.NET exceptions.
+        /// </summary>
+        /// <param name="e">The exception thrown when performing data access 
+        /// operations.</param>
+        /// <returns>
+        /// 	<c>true</c> if is a valid data access exception for the specified 
+        /// exception; otherwise, <c>false</c>.
+        /// </returns>
+        public virtual bool IsDataAccessException(Exception e)
+        {
+            return TargetDbProvider.IsDataAccessException(e);
+        }
+
+        #endregion
+
+        #region IInitializingObject Members
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method allows the object instance to perform the kind of
+        /// initialization only possible when all of it's dependencies have
+        /// been injected (set), and to throw an appropriate exception in the
+        /// event of misconfiguration.
+        /// </p>
+        /// <p>
+        /// Please do consult the class level documentation for the
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+        /// description of exactly <i>when</i> this method is invoked. In
+        /// particular, it is worth noting that the
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and <see cref="Spring.Context.IApplicationContextAware"/>
+        /// callbacks will have been invoked <i>prior</i> to this method being
+        /// called.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as the failure to set a
+        /// required property) or if initialization fails.
+        /// </exception>
+        public virtual void AfterPropertiesSet()
+        {
+            if (TargetDbProvider == null)
+            {
+                throw new ArgumentNullException("Property 'TargetDbProvider' is required.");
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs b/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs
new file mode 100644
index 00000000..9552801a
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs
@@ -0,0 +1,157 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Common.Logging;
+
+#endregion
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// Holds ADO.NET error codes for a particular provider. 
+    /// </summary>
+    /// <remarks>
+    /// Used by ErrorCodeExceptionTranslator.  The embedded resource
+    /// "dbProviders.xml" in Spring.Data.Common contains default
+    /// ErrorCodes instances for various providers.
+    /// </remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ErrorCodes.cs,v 1.1 2007/08/01 18:53:06 markpollack Exp $</version>
+    public class ErrorCodes 
+    {
+        #region Fields
+        private String[] databaseProductNames;
+
+        private String[] badSqlGrammarCodes = new String[0];
+
+        private String[] invalidResultSetAccessCodes = new String[0];
+
+        private String[] dataAccessResourceFailureCodes = new String[0];
+
+        private String[] permissionDeniedCodes = new String[0];
+
+        private String[] dataIntegrityViolationCodes = new String[0];
+	
+        private String[] cannotAcquireLockCodes = new String[0];
+
+        private String[] deadlockLoserCodes = new String[0];
+
+        private String[] cannotSerializeTransactionCodes = new String[0];
+
+        // CustomErrorCodesTranslation[] customTranslations;
+        #endregion
+
+        #region Constants
+
+        /// <summary>
+        /// The shared log instance for this class (and derived classes). 
+        /// </summary>
+        protected static readonly ILog log =
+            LogManager.GetLogger(typeof (ErrorCodes));
+
+        #endregion
+
+        #region Constructor (s)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ErrorCodes"/> class.
+        /// </summary>
+        public 	ErrorCodes()
+        {
+
+        }
+
+        #endregion
+
+        #region Properties
+        public string DatabaseProductName
+        {
+            get
+            {
+                return (databaseProductNames != null && databaseProductNames.Length > 0 ?
+                        databaseProductNames[0] : null);
+            }
+        }
+
+        public string[] DatabaseProductNames
+        {
+            get { return databaseProductNames; }
+            set { databaseProductNames = value; }
+        }
+
+        public string[] BadSqlGrammarCodes
+        {
+            get { return badSqlGrammarCodes; }
+            set { badSqlGrammarCodes = value; }
+        }
+
+        public string[] InvalidResultSetAccessCodes
+        {
+            get { return invalidResultSetAccessCodes; }
+            set { invalidResultSetAccessCodes = value; }
+        }
+
+        public string[] DataAccessResourceFailureCodes
+        {
+            get { return dataAccessResourceFailureCodes; }
+            set { dataAccessResourceFailureCodes = value; }
+        }
+
+        public string[] PermissionDeniedCodes
+        {
+            get { return permissionDeniedCodes; }
+            set { permissionDeniedCodes = value; }
+        }
+
+        public string[] DataIntegrityViolationCodes
+        {
+            get { return dataIntegrityViolationCodes; }
+            set { dataIntegrityViolationCodes = value; }
+        }
+
+        public string[] CannotAcquireLockCodes
+        {
+            get { return cannotAcquireLockCodes; }
+            set { cannotAcquireLockCodes = value; }
+        }
+
+        public string[] DeadlockLoserCodes
+        {
+            get { return deadlockLoserCodes; }
+            set { deadlockLoserCodes = value; }
+        }
+
+        public string[] CannotSerializeTransactionCodes
+        {
+            get { return cannotSerializeTransactionCodes; }
+            set { cannotSerializeTransactionCodes = value; }
+        }
+	    
+        #endregion
+
+        #region Methods
+
+        #endregion
+	    
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs b/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs
new file mode 100644
index 00000000..958a6446
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs
@@ -0,0 +1,172 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// Provides minimal database metadata information to support the
+    /// functionality in Spring.NET ADO.NET Framework.
+    /// </summary>
+    /// 
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: IDbMetadata.cs,v 1.8 2007/11/21 18:01:45 markpollack Exp $</version>
+    public interface IDbMetadata
+    {
+        /// <summary>
+        /// Gets a descriptive name of the product.
+        /// </summary>
+        /// <example>Example: Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0</example>
+        /// <value>The name of the product.</value>
+        string ProductName { get; }
+
+        /// <summary>
+        /// Gets the type of the connection.  The fully qualified type name is given since some providers,
+        /// notably for SqlServerCe, do not use the same namespace for all data access types.
+        /// </summary>
+        /// <example>Example: System.Data.SqlClient.SqlCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the connection.</value>
+        Type ConnectionType { get; }
+
+        /// <summary>
+        /// Gets the type of the command.
+        /// </summary>
+        /// <example>Example: System.Data.SqlClient.SqlCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the command.</value>
+        Type CommandType { get; }
+
+        /// <summary>
+        /// Gets the type of the parameter.
+        /// </summary>
+        /// <example>Example: System.Data.SqlClient.SqlParameter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the parameter.</value>
+        Type ParameterType { get; }
+
+        /// <summary>
+        /// Gets the type of the data adapter.
+        /// </summary>
+        /// <example>Example: System.Data.SqlClient.SqlDataAdapter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the data adapter.</value>
+        Type DataAdapterType { get; }
+
+        /// <summary>
+        /// Gets the type of the command builder.
+        /// </summary>
+        /// <example>Example: System.Data.SqlClient.SqlCommandBuilder, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the command builder.</value>
+        Type CommandBuilderType { get; }
+
+        /// <summary>
+        /// Gets the type of the exception.
+        /// </summary>
+        /// <example>Example: System.Data.SqlClient.SqlException, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the exception.</value>
+        Type ExceptionType { get; }
+
+        /// <summary>
+        /// Gets the error code exception expression.
+        /// </summary>
+        /// <example>Example Errors[0].Number.ToString() for Sql Server </example>
+        /// <value>The error code exception expression.</value>
+        string ErrorCodeExceptionExpression { get; }
+
+        /// <summary>
+        /// Gets the command builder derive parameters method.
+        /// </summary>
+        /// <remarks>If the value 'not supported' is specified then this method will throw an ArgumentException</remarks>
+        /// <example>Example: DeriveParameters</example>
+        /// <value>The command builder derive parameters method.</value>
+        MethodInfo CommandBuilderDeriveParametersMethod { get; }
+
+        /// <summary>
+        /// Provide the prefix used to indentify named parameters in SQL text.
+        /// </summary>
+        /// <example>@ for Sql Server</example>
+        string ParameterNamePrefix { get; }
+
+        /// <summary>
+        /// Does the driver require the use of the parameter prefix when
+        /// specifying the name of the parameter in the Command's
+        /// Parameter collection.  
+        /// </summary>
+        /// <remarks>If true, then commamd.Parameters["@parameterName"] is
+        /// used, otherwise, command.Parameters["parameterName"].
+        /// </remarks>
+        bool UseParameterNamePrefixInParameterCollection { get; }
+
+
+        /// <summary>
+        /// Gets a value indicating whether the Provider requires
+        /// the use of a named prefix in the SQL string. 
+        /// </summary>
+        /// <remarks>
+        /// The OLE DB/ODBC .NET Provider does not support named parameters for 
+        /// passing parameters to an SQL Statement or a stored procedure called
+        /// by an IDbCommand when CommandType is set to Text.
+        /// </remarks>
+        /// <value>
+        /// 	<c>true</c> if use parameter prefix in SQL; otherwise, <c>false</c>.
+        /// </value>
+        bool UseParameterPrefixInSql { get; }
+
+        /// <summary>
+        /// For providers that allow you to choose between binding parameters
+        /// to a command by name (true) or by position (false).
+        /// </summary>
+        bool BindByName { get;
+            //TODO will go away when make all of this fully configuration driven.
+            set; 
+        }
+
+        /// <summary>
+        /// Gets the type of the parameter db.
+        /// </summary>
+        /// <example>Example: System.Data.SqlDbType, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+        /// <value>The type of the parameter db.</value>
+        Type ParameterDbType { get; }
+
+        /// <summary>
+        /// Gets the parameter db type property.
+        /// </summary>
+        /// <example>Example: SqlDbType for SqlServer</example>
+        /// <value>The parameter db type property.</value>
+        PropertyInfo ParameterDbTypeProperty { get; }
+
+        /// <summary>
+        /// Gets the parameter is nullable property.
+        /// </summary>
+        /// <example>Example: IsNullable for Sql Server</example>
+        /// <value>The parameter is nullable property.</value>
+        PropertyInfo ParameterIsNullableProperty { get; }
+
+        /// <summary>
+        /// Gets or sets the error codes.
+        /// </summary>
+        /// <remarks>The collection of error codes to map error code integer values to Spring's DAO exception hierarchy</remarks>
+        /// <value>The error codes.</value>
+        ErrorCodes ErrorCodes { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Common/IDbParameter.cs b/src/Spring/Spring.Data/Data/Common/IDbParameter.cs
new file mode 100644
index 00000000..2ead7d42
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/IDbParameter.cs
@@ -0,0 +1,84 @@
+#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
+
+#region Imports
+
+using System;
+using System.Data;
+
+#endregion
+
+namespace Spring.Data.Common
+{
+	/// <summary>
+	/// A parameter interface used by <see cref="IDbParametersBuilder"/>
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IDbParameter.cs,v 1.6 2006/12/02 07:35:23 markpollack Exp $</version>
+	public interface IDbParameter 
+	{
+	    
+	    IDbParameter Type(Enum dbType);
+	    
+	    IDbParameter Type(Enum dbType, int size);
+	    
+	    Enum GetDbType();
+	    
+	    IDbParameter Direction(ParameterDirection direction);
+
+	    ParameterDirection GetDirection();
+	    
+	    IDbParameter IsNullable(bool isNullable);
+	    
+	    bool GetIsNullable();
+
+	    IDbParameter Name(string name);
+	    
+	    string GetName();
+	    
+	    IDbParameter SourceColumn(string sourceColumn);
+
+	    string GetSourceColumn();
+	    
+	    IDbParameter SourceVersion(DataRowVersion sourceVersion);
+	    	    
+	    DataRowVersion GetSourceVersion();
+
+	    
+	    IDbParameter Value(object val);
+	    
+	    object GetValue();
+
+	    IDbParameter Precision(byte precision);
+	    
+	    byte GetPrecision();
+
+	    
+	    IDbParameter Scale(byte scale);
+	    
+	    byte GetScale();
+
+	    
+	    IDbParameter Size(int size);
+	    
+	    int GetSize();
+
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Common/IDbParameters.cs b/src/Spring/Spring.Data/Data/Common/IDbParameters.cs
new file mode 100644
index 00000000..c9b7b636
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/IDbParameters.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Data;
+
+namespace Spring.Data.Common
+{
+    public interface IDbParameters 
+    {
+        //TODO implement IDataParameterCollection....?
+
+        //TODO should add methods return IDbDataParameter?
+
+#if !MONO // EE: mono/win32 doesn't accept comments on indexer?!?
+        /// <summary>
+        /// Gets the underlying standard ADO.NET <see cref="IDbDataParameter"/> for the specified parameter name.
+        /// </summary>
+#endif
+        IDataParameter this[string parameterName] { get; set; }
+
+#if !MONO // EE: mono/win32 doesn't accept comments on indexer?!?
+        /// <summary>
+        /// Gets the underlying standard ADO.NET <see cref="IDbDataParameter"/> for the specified index.
+        /// </summary>
+#endif
+        IDataParameter this[int index] { get; set; }
+
+        int Count
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Determines whether this collection contains the specified parameter name.
+        /// </summary>
+        /// <param name="parameterName">Name of the parameter.</param>
+        /// <returns>
+        /// 	<c>true</c> if contains the specified parameter name; otherwise, <c>false</c>.
+        /// </returns>
+        bool Contains(string parameterName);
+
+        /// <summary>
+        /// Returns the underlying standard ADO.NET parameters collection.
+        /// </summary>
+        IDataParameterCollection DataParameterCollection { get; }
+
+        /// <summary>
+        /// Add an instance of <see cref="IDbDataParameter"/>.
+        /// </summary>
+        /// <param name="dbParameter"></param>
+        void AddParameter(IDataParameter dbParameter);
+
+        /// <summary>
+        /// Add a parameter specifying the all the individual properties of a
+        /// IDbDataParameter.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="parameterType"></param>
+        /// <param name="size"></param>
+        /// <param name="direction"></param>
+        /// <param name="isNullable"></param>
+        /// <param name="precision"></param>
+        /// <param name="scale"></param>
+        /// <param name="sourceColumn"></param>
+        /// <param name="sourceVersion"></param>
+        /// <param name="parameterValue"></param>
+        /// <returns>The newly created parameter</returns>
+        IDbDataParameter AddParameter(string name, Enum parameterType, int size, ParameterDirection direction, bool isNullable,
+                          byte precision, byte scale, string sourceColumn, DataRowVersion sourceVersion, object parameterValue);
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="parameterType"></param>
+        /// <param name="direction"></param>
+        /// <param name="isNullable"></param>
+        /// <param name="precision"></param>
+        /// <param name="scale"></param>
+        /// <param name="sourceColumn"></param>
+        /// <param name="sourceVersion"></param>
+        /// <param name="parameterValue"></param>
+        /// <returns>The newly created parameter</returns>
+        IDbDataParameter AddParameter(string name, Enum parameterType, ParameterDirection direction, bool isNullable, byte precision,
+                          byte scale, string sourceColumn, DataRowVersion sourceVersion, object parameterValue);
+
+
+        /// <summary>
+        /// Adds a value to the parameter collection
+        /// </summary>
+        /// <remarks>This method can not be used with stored procedures for
+        /// providers that require named parameters.  However, it is of
+        /// great convenience for other cases.</remarks>
+        /// <param name="parameterValue">The value of the parameter.</param>
+        /// <returns>Index of added parameter.</returns>
+        int Add(object parameterValue);
+
+        /// <summary>
+        /// Adds a range of vlaues to the parameter collection.
+        /// </summary>
+        /// <remarks>This method can not be used with stored procedures for
+        /// providers that require named parameters.  However, it is of
+        /// great convenience for other cases.</remarks>
+        /// <param name="values"></param>
+        void AddRange(Array values);
+
+        IDbDataParameter AddWithValue(string name, object parameterValue);
+
+        IDbDataParameter Add(string name, Enum parameterType);
+
+        IDbDataParameter Add(string name, Enum parameterType, int size);
+
+        IDbDataParameter Add(string name, Enum parameterType, int size, string sourceColumn);
+
+        IDbDataParameter AddOut(string name, Enum parameterType);
+
+        IDbDataParameter AddOut(string name, Enum parameterType, int size);
+
+        IDbDataParameter AddInOut(string name, Enum parameterType);
+
+        IDbDataParameter AddInOut(string name, Enum parameterType, int size);
+
+        IDbDataParameter AddReturn(string name, Enum parameterType);
+
+        IDbDataParameter AddReturn(string name, Enum parameterType, int size);
+
+        object GetValue(string name);
+
+        void SetValue(string name, object parameterValue);
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Common/IDbParametersBuilder.cs b/src/Spring/Spring.Data/Data/Common/IDbParametersBuilder.cs
new file mode 100644
index 00000000..45a19f3f
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/IDbParametersBuilder.cs
@@ -0,0 +1,34 @@
+
+#region Imports
+
+
+
+#endregion
+
+namespace Spring.Data.Common
+{
+	/// <summary>
+	/// A builder to create a collection of ADO.NET parameters.
+	/// </summary>
+	/// <remarks>The chaining of IDbParameter methods does the 
+	/// building of the parameter details while the builder class
+	/// itself keeps track of the collection.</remarks>
+	/// 
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IDbParametersBuilder.cs,v 1.1 2006/12/02 07:38:15 markpollack Exp $</version>
+	public interface IDbParametersBuilder 
+	{
+        /// <summary>
+        /// Creates a IDbParameter object and adds it to an internal collection for
+        /// later retrieval via the GetParameters method.
+        /// </summary>
+        /// <returns></returns>
+        IDbParameter Create();
+
+        /// <summary>
+        /// Gets all the parameters created and configured via the Create method.
+        /// </summary>
+        /// <returns>An instance of IDbParameters</returns>
+	    IDbParameters GetParameters();
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Common/IDbProvider.cs b/src/Spring/Spring.Data/Data/Common/IDbProvider.cs
new file mode 100644
index 00000000..b5ad14ed
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/IDbProvider.cs
@@ -0,0 +1,126 @@
+#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.Data;
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// Factory interface to create provider specific ADO.NET objects.
+    /// </summary>
+    public interface IDbProvider
+    {
+        
+        /// <summary>
+        /// Returns a new command object for executing SQL statments/Stored Procedures
+        /// against the database.
+        /// </summary>
+        /// <returns>An new <see cref="IDbCommand"/></returns>
+        IDbCommand CreateCommand();
+
+        /// <summary>
+        /// Returns a new instance of the providers CommandBuilder class.
+        /// </summary>
+        /// <remarks>In .NET 1.1 there was no common base class or interface
+        /// for command builders, hence the return signature is object to
+        /// be portable (but more loosely typed) across .NET 1.1/2.0</remarks>
+        /// <returns>A new Command Builder</returns>
+        object CreateCommandBuilder();        
+        
+        /// <summary>
+        /// Returns a new connection object to communicate with the database.
+        /// </summary>
+        /// <returns>A new <see cref="IDbConnection"/></returns>
+        IDbConnection CreateConnection();
+
+
+        /// <summary>
+        /// Returns a new adapter objects for use with offline DataSets.
+        /// </summary>
+        /// <returns>A new <see cref="IDbDataAdapter"/></returns>
+        IDbDataAdapter CreateDataAdapter();
+        
+        /// <summary>
+        /// Returns a new parameter object for binding values to parameter
+        /// placeholders in SQL statements or Stored Procedure variables.
+        /// </summary> 
+        /// <returns>A new <see cref="IDbDataParameter"/></returns>
+        IDbDataParameter CreateParameter();
+
+
+        /// <summary>
+        /// Creates the name of the parameter in the format appropriate to use inside IDbCommand.CommandText.
+        /// </summary>
+        /// <remarks>In most cases this adds the parameter prefix to the name passed into this method.</remarks>
+        /// <param name="name">The unformatted name of the parameter.</param>
+        /// <returns>The parameter name formatted foran IDbCommand.CommandText.</returns>
+        string CreateParameterName(string name);
+
+        /// <summary>
+        /// Creates the name ofthe parameter in the format appropriate for an IDataParameter, i.e. to be
+        /// part of a IDataParameterCollection.
+        /// </summary>
+        /// <param name="name">The unformatted name of the parameter.</param>
+        /// <returns>The parameter name formatted for an IDataParameter</returns>
+        string CreateParameterNameForCollection(string name);
+
+        /// <summary>
+        /// Return metadata information about the database provider
+        /// </summary>
+        IDbMetadata DbMetadata
+        {
+            get;
+        }               
+        
+       
+        
+        /// <summary>
+        /// Connection string used to create connections.
+        /// </summary>
+        string ConnectionString
+        {
+            set;
+            get;
+        }
+
+
+        /// <summary>
+        /// Extracts the provider specific error code as a string.
+        /// </summary>
+        /// <param name="e">The data access exception.</param>
+        /// <returns>The provider specific error code</returns>
+        string ExtractError(Exception e);
+
+        /// <summary>
+        /// Determines whether the provided exception is in fact related
+        /// to database access.  This can be provider dependent in .NET 1.1 since
+        /// there isn't a common base class for ADO.NET exceptions.
+        /// </summary>
+        /// <param name="e">The exception thrown when performing data access 
+        /// operations.</param>
+        /// <returns>
+        /// 	<c>true</c> if is a valid data access exception for the specified 
+        /// exception; otherwise, <c>false</c>.
+        /// </returns>
+        bool IsDataAccessException(Exception e);
+        
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs b/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs
new file mode 100644
index 00000000..2d2d0a08
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs
@@ -0,0 +1,267 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2007 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.Collections;
+using System.Data;
+using Spring.Collections;
+using Spring.Dao;
+using Spring.Data.Common;
+using Spring.Objects.Factory;
+using Spring.Threading;
+
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// A wrapper implementation for IDbProvider such that multiple DbProvider instances can be
+    /// selected at runtime, say based on web request criteria.
+    /// </summary>
+    /// <remarks>
+    /// The name of which DbProvider to use, as provided to the IDictionary property TargetDbProviders
+    /// is "dbProviderName".  Once the target dbprovider name is known, set the name via a call to
+    /// <code>LogicalThreadContext.SetData("dbProviderName", "database1ProviderName")</code>. The value
+    /// "database1ProviderName" must match a key in the provided TargetDbProviders dictionary.
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: MultiDelegatingDbProvider.cs,v 1.5 2008/05/29 17:26:35 markpollack Exp $</version>
+    public class MultiDelegatingDbProvider : IDbProvider, IInitializingObject
+    {
+        private IDictionary targetDbProviders = new SynchronizedHashtable();
+
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultiDelegatingDbProvider"/> class.
+        /// </summary>
+        public MultiDelegatingDbProvider()
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultiDelegatingDbProvider"/> class.
+        /// </summary>
+        /// <param name="targetDbProviders">The target db providers.</param>
+        public MultiDelegatingDbProvider(IDictionary targetDbProviders)
+        {
+            this.targetDbProviders = targetDbProviders;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Sets the target db providers.
+        /// </summary>
+        /// <value>The target db providers.</value>
+        public IDictionary TargetDbProviders
+        {
+            set { targetDbProviders = value; }
+        }
+
+        /// <summary>
+        /// Ensures that the there are values in the TargetDbProviders dictionary and that the
+        /// key is of the type string and value is of the type IDbProvider.
+        /// </summary>
+        /// <exception cref="ArgumentException">If the above conditions are not met.</exception>
+        public void AfterPropertiesSet()
+        {
+            if (targetDbProviders.Count == 0)
+            {
+                throw new ArgumentException("Target DbProvider collection required.");
+            }
+            foreach (DictionaryEntry entry in targetDbProviders)
+            {
+                if (! entry.Key.GetType().Equals(typeof(string)))
+                {
+                    throw new ArgumentException("Key identifying target IDbProvider in TargetDbProviders dictionary property is required to be of type string.  Key = " + entry.Key);
+                }
+                IDbProvider targetProvider = entry.Value as IDbProvider;
+                if (targetProvider == null)
+                {
+                    throw new ArgumentException("Value in TargetDbProviders dictionary is not of type IDbProvider.");
+                }
+            } 
+        }
+        
+        #region IDbProvider methods
+
+
+        /// <summary>
+        /// Returns a new command object for executing SQL statments/Stored Procedures
+        /// against the database.
+        /// </summary>
+        /// <returns>An new <see cref="IDbCommand"/></returns>
+        public IDbCommand CreateCommand()
+        {
+            return GetTargetProvider().CreateCommand();
+        }
+
+        /// <summary>
+        /// Returns a new connection object to communicate with the database.
+        /// </summary>
+        /// <returns>A new <see cref="IDbConnection"/></returns>
+        public IDbConnection CreateConnection()
+        {
+            return GetTargetProvider().CreateConnection();
+        }
+
+        /// <summary>
+        /// Returns a new parameter object for binding values to parameter
+        /// placeholders in SQL statements or Stored Procedure variables.
+        /// </summary>
+        /// <returns>A new <see cref="IDbDataParameter"/></returns>
+        public IDbDataParameter CreateParameter()
+        {
+            return GetTargetProvider().CreateParameter();
+        }
+
+        /// <summary>
+        /// Returns a new adapter objects for use with offline DataSets.
+        /// </summary>
+        /// <returns>A new <see cref="IDbDataAdapter"/></returns>
+        public IDbDataAdapter CreateDataAdapter()
+        {
+            return GetTargetProvider().CreateDataAdapter();
+        }
+
+        /// <summary>
+        /// Returns a new instance of the providers CommandBuilder class.
+        /// </summary>
+        /// <returns>A new Command Builder</returns>
+        /// <remarks>In .NET 1.1 there was no common base class or interface
+        /// for command builders, hence the return signature is object to
+        /// be portable (but more loosely typed) across .NET 1.1/2.0</remarks>
+        public object CreateCommandBuilder()
+        {
+            return GetTargetProvider().CreateDataAdapter();
+        }
+
+        /// <summary>
+        /// Creates the name of the parameter in the format appropriate to use inside IDbCommand.CommandText.
+        /// </summary>
+        /// <param name="name">The unformatted name of the parameter.</param>
+        /// <returns>
+        /// The parameter name formatted foran IDbCommand.CommandText.
+        /// </returns>
+        /// <remarks>In most cases this adds the parameter prefix to the name passed into this method.</remarks>
+        public string CreateParameterName(string name)
+        {
+            return GetTargetProvider().CreateParameterName(name);
+        }
+
+
+        /// <summary>
+        /// Creates the name ofthe parameter in the format appropriate for an IDataParameter, i.e. to be
+        /// part of a IDataParameterCollection.
+        /// </summary>
+        /// <param name="name">The unformatted name of the parameter.</param>
+        /// <returns>
+        /// The parameter name formatted for an IDataParameter
+        /// </returns>
+        public string CreateParameterNameForCollection(string name)
+        {
+            return GetTargetProvider().CreateParameterNameForCollection(name);
+        }
+
+        /// <summary>
+        /// Return metadata information about the database provider
+        /// </summary>
+        /// <value></value>
+        public IDbMetadata DbMetadata
+        {
+            get { return GetTargetProvider().DbMetadata; }
+        }
+
+        /// <summary>
+        /// Connection string used to create connections.
+        /// </summary>
+        /// <value></value>
+        public string ConnectionString
+        {
+            get { return GetTargetProvider().ConnectionString; }
+            set { GetTargetProvider().ConnectionString = value; }
+        }
+
+        /// <summary>
+        /// Extracts the provider specific error code as a string.
+        /// </summary>
+        /// <param name="e">The data access exception.</param>
+        /// <returns>The provider specific error code</returns>
+        public string ExtractError(Exception e)
+        {
+            return GetTargetProvider().ExtractError(e);
+        }
+
+        /// <summary>
+        /// Determines whether the provided exception is in fact related
+        /// to database access.  This can be provider dependent in .NET 1.1 since
+        /// there isn't a common base class for ADO.NET exceptions.
+        /// </summary>
+        /// <param name="e">The exception thrown when performing data access
+        /// operations.</param>
+        /// <returns>
+        /// 	<c>true</c> if is a valid data access exception for the specified
+        /// exception; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsDataAccessException(Exception e)
+        {
+#if NET_2_0
+            if (e is System.Data.Common.DbException)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+#else
+            return IsDataAccessExceptionBCL11(e);
+#endif
+        }
+
+        /// <summary>
+        /// Determines whether is data access exception in .NET 1.1 for the specified exception.
+        /// </summary>
+        /// <param name="e">The candidate exception.</param>
+        /// <returns>
+        /// 	<c>true</c> if is data access exception in .NET 1.1 for the specified exception; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsDataAccessExceptionBCL11(Exception e)
+        {
+            return false;
+        }
+        #endregion
+
+        /// <summary>
+        /// Gets the target provider based on the thread local name "dbProviderName"
+        /// </summary>
+        /// <returns>The corresonding IDbProvider.</returns>
+        protected virtual IDbProvider GetTargetProvider()
+        {
+            string dbProviderName = (string)LogicalThreadContext.GetData("dbProviderName");
+            if (targetDbProviders.Contains(dbProviderName))
+            {
+                return (IDbProvider)targetDbProviders[dbProviderName];
+            }
+            throw new InvalidDataAccessApiUsageException("'" + dbProviderName + "'"
+                                        + "was not under the thread local key 'dbProviderName'");
+        }
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/Common/UserCredentialsDbProvider.cs b/src/Spring/Spring.Data/Data/Common/UserCredentialsDbProvider.cs
new file mode 100644
index 00000000..8ec7247e
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/UserCredentialsDbProvider.cs
@@ -0,0 +1,137 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2007 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.Data;
+using Spring.Threading;
+using Spring.Util;
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// An adapter for a target IDbProvider, applying the specified user credentials
+    /// to the connection string for every GetConnection call.
+    /// </summary>
+    public class UserCredentialsDbProvider : DelegatingDbProvider
+    {
+        private string username;
+
+        private string password;
+
+        private string separator = ";";
+
+        private const string USERNAME = "UserCredentialsDbProvider.UserName";
+
+        private const string PASSWORD = "UserCredentialsDbProvider.Password";
+
+        /// <summary>
+        /// Sets the username string that will be appended to the connection string.
+        /// </summary>
+        /// <value>The username.</value>
+        public string Username
+        {
+            set { username = value; }
+        }
+
+        /// <summary>
+        /// Sets the password string that will be appended to the connection string.
+        /// </summary>
+        /// <value>The password.</value>
+        public string Password
+        {
+            set { password = value; }
+        }
+
+
+        /// <summary>
+        /// Sets the separator used to separate elements of the connection string.  Default is ';'.
+        /// </summary>
+        /// 
+        /// <value>The separator used to separate elements in the connection string.</value>
+        public string Separator
+        {
+            set { separator = value; }
+        }
+
+        /// <summary>
+        /// Sets the user credentials for current thread.  The given username and password
+        /// strings will be added to the connection string for all subsequent GetConnection
+        /// requests.  This will override any statically specified user credentials, that is,
+        /// set by the properties Username nad Password.
+        /// </summary>
+        /// <param name="user">The username part of the connection string.</param>
+        /// <param name="pass">The password part of the connection string.</param>
+        public void SetCredentialsForCurrentThread(string user, string pass)
+        {
+            LogicalThreadContext.SetData(USERNAME, user);
+            LogicalThreadContext.SetData(PASSWORD, pass);
+        }
+
+        /// <summary>
+        /// Removes the user credentials from current thread.  Use statically specified 
+        /// credentials afterwards.
+        /// </summary>
+        public void RemoveCredentialsFromCurrentThread()
+        {
+            LogicalThreadContext.FreeNamedDataSlot(USERNAME);
+            LogicalThreadContext.FreeNamedDataSlot(PASSWORD);
+        }
+
+
+        /// <summary>
+        /// Returns a new connection object to communicate with the database.
+        /// Determine if there are currently thread-bound credentials, using them if
+        /// available, falling back to the statically specified username and password
+        /// (i.e. values of the properties 'Username' and 'Password') otherwise.  
+        /// The username and password will be concatenated on the connection string
+        /// using string in the Separator property
+        /// </summary>
+        /// <returns>A new <see cref="IDbConnection"/></returns>
+        public override IDbConnection CreateConnection()
+        {
+            string user = LogicalThreadContext.GetData(USERNAME) as string;
+            string pass = LogicalThreadContext.GetData(PASSWORD) as string;
+            if (user != null && pass != null)
+            {
+                return DoCreateConnection(user, pass);
+            }
+            else
+            {
+                return DoCreateConnection(username, password);
+            }
+        }
+
+        protected virtual IDbConnection DoCreateConnection(string user, string pass)
+        {
+            AssertUtils.ArgumentNotNull(TargetDbProvider,"TargetDbProvider");
+            if (StringUtils.HasLength(user))
+            {
+                IDbConnection conn = TargetDbProvider.CreateConnection();
+                string s= ConnectionString + separator + user + separator + pass;
+                conn.ConnectionString = s;
+                return conn;
+            }
+            else
+            {
+                return TargetDbProvider.CreateConnection();
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Common/dbproviders.xml b/src/Spring/Spring.Data/Data/Common/dbproviders.xml
new file mode 100644
index 00000000..274adadc
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Common/dbproviders.xml
@@ -0,0 +1,1166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	- Database Provider definitions.   
+-->
+<objects xmlns='http://www.springframework.net'>
+
+	<!-- TODO Provide Schema to make it less verbose to configure -->
+
+
+
+  <!-- SQL SERVER -->
+  
+  <object id="SqlServer-1.1" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="Microsoft SQL Server, provider V1.0.5000.0 in framework .NET V1.1"/>
+        <constructor-arg name="assemblyName" value="System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="connectionType" value="System.Data.SqlClient.SqlConnection, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandType" value="System.Data.SqlClient.SqlCommand, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="parameterType" value="System.Data.SqlClient.SqlParameter, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="dataAdapterType" value="System.Data.SqlClient.SqlDataAdapter, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandBuilderType" value="System.Data.SqlClient.SqlCommandBuilder, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="System.Data.SqlDbType, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="parameterDbTypeProperty" value="SqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="@"/>
+        <constructor-arg name="exceptionType" value="System.Data.SqlClient.SqlException, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].Number.ToString()"/>
+
+        <!-- TODO select form system db all errors that have 'incorrect syntax' at the start of the error string-->
+        <property name="ErrorCodes.BadSqlGrammarCodes">
+          <value>156,170,207,208</value>
+        </property>
+        <property name="ErrorCodes.PermissionDeniedCodes">
+          <value>229</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>544,2627,8114,8115</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1205</value>
+        </property>
+      </object>
+    </constructor-arg>
+
+  </object>
+  
+	<object id="SqlServer-2.0" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+		<constructor-arg name="dbMetaData">
+			<object type="Spring.Data.Common.DbMetadata">
+				<constructor-arg name="productName" value="Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0" />
+				<constructor-arg name="assemblyName" value="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+				<constructor-arg name="connectionType" value="System.Data.SqlClient.SqlConnection, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+				<constructor-arg name="commandType" value="System.Data.SqlClient.SqlCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+				<constructor-arg name="parameterType" value="System.Data.SqlClient.SqlParameter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+				<constructor-arg name="dataAdapterType" value="System.Data.SqlClient.SqlDataAdapter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+				<constructor-arg name="commandBuilderType" value="System.Data.SqlClient.SqlCommandBuilder, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+				<constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+				<constructor-arg name="parameterDbType" value="System.Data.SqlDbType, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+				<constructor-arg name="parameterDbTypeProperty" value="SqlDbType"/>
+				<constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+				<constructor-arg name="parameterNamePrefix" value="@"/>
+				<constructor-arg name="exceptionType" value="System.Data.SqlClient.SqlException, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+				<constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>     
+				<constructor-arg name="bindByName" value="true"/>
+				<!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+				<constructor-arg name="errorCodeExceptionExpression" value="Errors[0].Number.ToString()"/>
+        
+        <!-- TODO select form system db all errors that have 'incorrect syntax' at the start of the error string-->
+        <property name="ErrorCodes.BadSqlGrammarCodes">
+          <value>156,170,207,208</value>
+        </property>
+        <property name="ErrorCodes.PermissionDeniedCodes">
+          <value>229</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>544,2627,8114,8115</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1205</value>
+        </property>
+			</object>
+		</constructor-arg>
+
+	</object>
+
+  <alias name="SqlServer-2.0" alias="System.Data.SqlClient"/>
+
+  
+  <!-- SQL SERVER COMPACT EDITION 3.1 -->
+
+  <object id="SqlServerCe-3.1" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="Microsoft SQL Server Compact Edition, provider V9.0.242.0" />
+        <constructor-arg name="assemblyName" value="System.Data.SqlServerCe, Version=9.0.242.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
+        <constructor-arg name="connectionType" value="System.Data.SqlServerCe.SqlCeConnection, System.Data.SqlServerCe, Version=9.0.242.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
+        <constructor-arg name="commandType" value="System.Data.SqlServerCe.SqlCeCommand, System.Data.SqlServerCe, Version=9.0.242.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
+        <constructor-arg name="parameterType" value="System.Data.SqlServerCe.SqlCeParameter, System.Data.SqlServerCe, Version=9.0.242.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
+        <constructor-arg name="dataAdapterType" value="System.Data.SqlServerCe.SqlCeDataAdapter, System.Data.SqlServerCe, Version=9.0.242.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
+        <constructor-arg name="commandBuilderType" value="System.Data.SqlServerCe.SqlCeCommandBuilder, System.Data.SqlServerCe, Version=9.0.242.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="not supported"/>
+        <constructor-arg name="parameterDbType" value="System.Data.SqlDbType, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="parameterDbTypeProperty" value="SqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="@"/>
+        <constructor-arg name="exceptionType" value="System.Data.SqlServerCe.SqlCeException, System.Data.SqlServerCe, Version=9.0.242.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>        
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].NativeError.ToString()"/>
+        <!-- TODO select form system db all errors that have 'incorrect syntax' at the start of the error string-->
+        <property name="ErrorCodes.BadSqlGrammarCodes">
+          <value></value>
+        </property>
+        <property name="ErrorCodes.PermissionDeniedCodes">
+          <value></value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value></value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value></value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <alias name="SqlServerCe-3.1" alias="System.Data.SqlServerCe"/>
+
+  
+  <!-- OLE DB -->
+
+  <object id="OleDb-1.1" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="OleDb, provider V1.0.5000.0 in framework .NET V1.1"/>
+        <constructor-arg name="assemblyName" value="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="connectionType" value="System.Data.OleDb.OleDbConnection, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandType" value="System.Data.OleDb.OleDbCommand, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="parameterType" value="System.Data.OleDb.OleDbParameter, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="dataAdapterType" value="System.Data.OleDb.OleDbDataAdapter, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="commandBuilderType" value="System.Data.OleDb.OleDbCommandBuilder, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="System.Data.OleDb.OleDbType, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="parameterDbTypeProperty" value="OleDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="?"/>
+        <constructor-arg name="exceptionType" value="System.Data.OleDb.OleDbException, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="false"/>
+        <constructor-arg name="useParameterPrefixInSql" value="false"/>        
+        <constructor-arg name="bindByName" value="false"/>
+        <!-- TODO should parse out high/low values in the native error...yuk!-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].NativeError.ToString()"/>
+
+        <!-- TODO where is the definitive list of the error.  Anyway, until parse out high low error there isn't any
+             exception mapping yet for this provider. 
+         -->
+        <property name="ErrorCodes.BadSqlGrammarCodes">
+          <value>156,170,207,208</value>
+        </property>
+        <property name="ErrorCodes.PermissionDeniedCodes">
+          <value>229</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>2627,8114,8115</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1205</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+  
+  <object id="OleDb-2.0" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="OleDb, provider V2.0.0.0 in framework .NET V2"/>
+        <constructor-arg name="assemblyName" value="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="connectionType" value="System.Data.OleDb.OleDbConnection, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>        
+        <constructor-arg name="commandType" value="System.Data.OleDb.OleDbCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="parameterType" value="System.Data.OleDb.OleDbParameter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="dataAdapterType" value="System.Data.OleDb.OleDbDataAdapter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="commandBuilderType" value="System.Data.OleDb.OleDbCommandBuilder, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="System.Data.OleDb.OleDbType, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="parameterDbTypeProperty" value="OleDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="?"/>
+        <constructor-arg name="exceptionType" value="System.Data.OleDb.OleDbException, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="false"/>
+        <constructor-arg name="useParameterPrefixInSql" value="false"/>        
+        <constructor-arg name="bindByName" value="false"/>
+        <!-- TODO should parse out high/low values in the native error...yuk!-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].NativeError.ToString()"/>
+
+        <!-- TODO where is the definitive list of the error.  Anyway, until parse out high low error there isn't any
+             exception mapping yet for this provider. 
+         -->
+        <property name="ErrorCodes.BadSqlGrammarCodes">
+          <value>156,170,207,208</value>
+        </property>
+        <property name="ErrorCodes.PermissionDeniedCodes">
+          <value>229</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>2627,8114,8115</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1205</value>
+        </property>
+      </object>
+    </constructor-arg>
+
+  </object>
+
+  <alias name="OleDb-2.0" alias="System.Data.OleDb"/>
+
+
+  <!-- ORACLE -->
+  
+  <object id="OracleClient-2.0" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="Oracle, Microsoft provider V2.0.0.0"  />
+        <constructor-arg name="assemblyName" value="System.Data.OracleClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="connectionType" value="System.Data.OracleClient.OracleConnection, System.Data.OracleClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandType" value="System.Data.OracleClient.OracleCommand, System.Data.OracleClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="parameterType" value="System.Data.OracleClient.OracleParameter, System.Data.OracleClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="dataAdapterType" value="System.Data.OracleClient.OracleDataAdapter, System.Data.OracleClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandBuilderType" value="System.Data.OracleClient.OracleCommandBuilder, System.Data.OracleClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="System.Data.OracleClient.OracleType, System.Data.OracleClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="parameterDbTypeProperty" value="OracleType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value=":"/>
+        <constructor-arg name="exceptionType" value="System.Data.OracleClient.OracleException, System.Data.OracleClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="false"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>        
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Code.ToString()"/>
+
+        <property name="ErrorCodes.BadSqlGrammarCodes">
+          <value>900,903,904,917,936,942,17006</value>
+        </property>
+        <property name="ErrorCodes.InvalidResultSetAccessCodes">
+          <value>17003</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>17002,17447</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>1,1400,1722,2291,2292</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>54</value>
+        </property>
+        <property name="ErrorCodes.CannotSerializeTransactionCodes">
+          <value>8177</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>60</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <alias name="OracleClient-2.0" alias="System.Data.OracleClient"/>
+
+  <object id="OracleODP-2.0" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="Oracle, Oracle provider V2.102.2.20"  />
+        <constructor-arg name="assemblyName" value="Oracle.DataAccess, Version=2.102.2.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="connectionType" value="Oracle.DataAccess.Client.OracleConnection, Oracle.DataAccess, Version=2.102.2.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="commandType" value="Oracle.DataAccess.Client.OracleCommand, Oracle.DataAccess, Version=2.102.2.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="parameterType" value="Oracle.DataAccess.Client.OracleParameter, Oracle.DataAccess, Version=2.102.2.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="dataAdapterType" value="Oracle.DataAccess.Client.OracleDataAdapter, Oracle.DataAccess, Version=2.102.2.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="commandBuilderType" value="Oracle.DataAccess.Client.OracleCommandBuilder, Oracle.DataAccess, Version=2.102.2.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="Oracle.DataAccess.Client.OracleDbType, Oracle.DataAccess, Version=2.102.2.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="parameterDbTypeProperty" value="OracleDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value=":"/>
+        <constructor-arg name="exceptionType" value="Oracle.DataAccess.Client.OracleException, Oracle.DataAccess, Version=2.102.2.20, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="false"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>        
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="ErrorCode.ToString()"/>
+
+        <property name="ErrorCodes.BadSqlGrammarCodes">
+          <value>900,903,904,917,936,942,17006</value>
+        </property>
+        <property name="ErrorCodes.InvalidResultSetAccessCodes">
+          <value>17003</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>17002,17447</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>1,1400,1722,2291,2292</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>54</value>
+        </property>
+        <property name="ErrorCodes.CannotSerializeTransactionCodes">
+          <value>8177</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>60</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <alias name="OracleODP-2.0" alias="Oracle.DataAccess.Client"/>
+
+  
+  <!-- My Sql -->
+  
+  <!-- Connector/NET 1.0 -->
+  
+  <object id="MySql" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="MySQL, MySQL provider 1.0.10.1"  />
+        <constructor-arg name="assemblyName" value="MySql.Data, Version=1.0.10.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="connectionType" value="MySql.Data.MySqlClient.MySqlConnection, MySql.Data, Version=1.0.10.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandType" value="MySql.Data.MySqlClient.MySqlCommand, MySql.Data, Version=1.0.10.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterType" value="MySql.Data.MySqlClient.MySqlParameter, MySql.Data, Version=1.0.10.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="dataAdapterType" value="MySql.Data.MySqlClient.MySqlDataAdapter, MySql.Data, Version=1.0.10.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderType" value="MySql.Data.MySqlClient.MySqlCommandBuilder, MySql.Data, Version=1.0.10.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="MySql.Data.MySqlClient.MySqlDbType, MySql.Data, Version=1.0.10.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterDbTypeProperty" value="MySqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="?"/>
+        <constructor-arg name="exceptionType" value="MySql.Data.MySqlClient.MySqlException, MySql.Data, Version=1.0.10.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>        
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Number.ToString()"/>
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>1054,1064,1146</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>630,839,840,893,1062,1169,1215,1216,1217,1451,1452,1557</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>1205</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1213</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <object id="MySql-1.0.9" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="MySQL, MySQL provider 1.0.9.0"  />
+        <constructor-arg name="assemblyName" value="MySql.Data, Version=1.0.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="connectionType" value="MySql.Data.MySqlClient.MySqlConnection, MySql.Data, Version=1.0.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandType" value="MySql.Data.MySqlClient.MySqlCommand, MySql.Data, Version=1.0.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterType" value="MySql.Data.MySqlClient.MySqlParameter, MySql.Data, Version=1.0.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="dataAdapterType" value="MySql.Data.MySqlClient.MySqlDataAdapter, MySql.Data, Version=1.0.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderType" value="MySql.Data.MySqlClient.MySqlCommandBuilder, MySql.Data, Version=1.0.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="MySql.Data.MySqlClient.MySqlDbType, MySql.Data, Version=1.0.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterDbTypeProperty" value="MySqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="?"/>
+        <constructor-arg name="exceptionType" value="MySql.Data.MySqlClient.MySqlException, MySql.Data, Version=1.0.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>        
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Number.ToString()"/>
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>1054,1064,1146</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>630,839,840,893,1062,1169,1215,1216,1217,1451,1452,1557</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>1205</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1213</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+
+
+  <!-- Connector/NET 5.0 (.NET 2.0 only) -->
+
+  <object id="MySql-5.0" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="MySQL, MySQL provider 5.0.7.0"  />
+        <constructor-arg name="assemblyName" value="MySql.Data, Version=5.0.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="connectionType" value="MySql.Data.MySqlClient.MySqlConnection, MySql.Data, Version=5.0.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandType" value="MySql.Data.MySqlClient.MySqlCommand, MySql.Data, Version=5.0.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterType" value="MySql.Data.MySqlClient.MySqlParameter, MySql.Data, Version=5.0.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="dataAdapterType" value="MySql.Data.MySqlClient.MySqlDataAdapter, MySql.Data, Version=5.0.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderType" value="MySql.Data.MySqlClient.MySqlCommandBuilder, MySql.Data, Version=5.0.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="MySql.Data.MySqlClient.MySqlDbType, MySql.Data, Version=5.0.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterDbTypeProperty" value="MySqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="?"/>
+        <constructor-arg name="exceptionType" value="MySql.Data.MySqlClient.MySqlException, MySql.Data, Version=5.0.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>        
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Number.ToString()"/>
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>1054,1064,1146</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>630,839,840,893,1062,1169,1215,1216,1217,1451,1452,1557</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>1205</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1213</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <object id="MySql-5.0.8.1" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="MySQL, MySQL provider 5.0.8.1"  />
+        <constructor-arg name="assemblyName" value="MySql.Data, Version=5.0.8.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="connectionType" value="MySql.Data.MySqlClient.MySqlConnection, MySql.Data, Version=5.0.8.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandType" value="MySql.Data.MySqlClient.MySqlCommand, MySql.Data, Version=5.0.8.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterType" value="MySql.Data.MySqlClient.MySqlParameter, MySql.Data, Version=5.0.8.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="dataAdapterType" value="MySql.Data.MySqlClient.MySqlDataAdapter, MySql.Data, Version=5.0.8.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderType" value="MySql.Data.MySqlClient.MySqlCommandBuilder, MySql.Data, Version=5.0.8.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="MySql.Data.MySqlClient.MySqlDbType, MySql.Data, Version=5.0.8.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterDbTypeProperty" value="MySqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="?"/>
+        <constructor-arg name="exceptionType" value="MySql.Data.MySqlClient.MySqlException, MySql.Data, Version=5.0.8.1, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Number.ToString()"/>
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>1054,1064,1146</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>630,839,840,893,1062,1169,1215,1216,1217,1451,1452,1557</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>1205</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1213</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+
+  <!-- Connector/NET 5.1 (.NET 2.0 only) -->
+
+  <object id="MySql-5.1" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="MySQL, MySQL provider 5.1.2.2"  />
+        <constructor-arg name="assemblyName" value="MySql.Data, Version=5.1.2.2, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="connectionType" value="MySql.Data.MySqlClient.MySqlConnection, MySql.Data, Version=5.1.2.2, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandType" value="MySql.Data.MySqlClient.MySqlCommand, MySql.Data, Version=5.1.2.2, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterType" value="MySql.Data.MySqlClient.MySqlParameter, MySql.Data, Version=5.1.2.2, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="dataAdapterType" value="MySql.Data.MySqlClient.MySqlDataAdapter, MySql.Data, Version=5.1.2.2, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderType" value="MySql.Data.MySqlClient.MySqlCommandBuilder, MySql.Data, Version=5.1.2.2, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="MySql.Data.MySqlClient.MySqlDbType, MySql.Data, Version=5.1.2.2, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterDbTypeProperty" value="MySqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="?"/>
+        <constructor-arg name="exceptionType" value="MySql.Data.MySqlClient.MySqlException, MySql.Data, Version=5.1.2.2, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>        
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Number.ToString()"/>
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>1054,1064,1146</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>630,839,840,893,1062,1169,1215,1216,1217,1451,1452,1557</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>1205</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1213</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <object id="MySql-5.1.4" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="MySQL, MySQL provider 5.1.4.0"  />
+        <constructor-arg name="assemblyName" value="MySql.Data, Version=5.1.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="connectionType" value="MySql.Data.MySqlClient.MySqlConnection, MySql.Data, Version=5.1.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandType" value="MySql.Data.MySqlClient.MySqlCommand, MySql.Data, Version=5.1.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterType" value="MySql.Data.MySqlClient.MySqlParameter, MySql.Data, Version=5.1.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="dataAdapterType" value="MySql.Data.MySqlClient.MySqlDataAdapter, MySql.Data, Version=5.1.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderType" value="MySql.Data.MySqlClient.MySqlCommandBuilder, MySql.Data, Version=5.1.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="MySql.Data.MySqlClient.MySqlDbType, MySql.Data, Version=5.1.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="parameterDbTypeProperty" value="MySqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="?"/>
+        <constructor-arg name="exceptionType" value="MySql.Data.MySqlClient.MySqlException, MySql.Data, Version=5.1.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Number.ToString()"/>
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>1054,1064,1146</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>630,839,840,893,1062,1169,1215,1216,1217,1451,1452,1557</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>1205</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1213</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <alias name="MySql-5.1.4" alias="MySql.Data.MySqlClient"/>
+
+
+  <object id="Npgsql-1.0" type="Spring.Data.Common.DbProvider, Spring.Data"  singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata, Spring.Data">
+        <constructor-arg name="productName" value="Npgsql"  />
+        <constructor-arg name="assemblyName" value="Npgsql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="connectionType" value="Npgsql.NpgsqlConnection, Npgsql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="commandType" value="Npgsql.NpgsqlCommand, Npgsql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="parameterType" value="Npgsql.NpgsqlParameter, Npgsql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="dataAdapterType" value="Npgsql.NpgsqlDataAdapter, Npgsql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="commandBuilderType" value="Npgsql.NpgsqlCommandBuilder, Npgsql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="NpgsqlTypes.NpgsqlDbType, Npgsql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="parameterDbTypeProperty" value="NpgsqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value=":"/>
+        <constructor-arg name="exceptionType" value="Npgsql.NpgsqlException, Npgsql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>        
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].Code"/>
+        <!-- error codes taken from http://www.postgresql.org/docs/8.1/static/errcodes-appendix.html -->
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>03000,42000,42601,42602,42622,42804,42P01</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>53000,53100,53200,53300</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>23000,23502,23503,23505,23514</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>55P03</value>
+        </property>
+        <property name="ErrorCodes.CannotSerializeTransactionCodes">
+          <value>40001</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>40P01</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <object id="Npgsql-2.0-beta1" type="Spring.Data.Common.DbProvider, Spring.Data"  singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata, Spring.Data">
+        <constructor-arg name="productName" value="Npgsql"  />
+        <constructor-arg name="assemblyName" value="Npgsql, Version=1.98.1.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="connectionType" value="Npgsql.NpgsqlConnection, Npgsql, Version=1.98.1.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="commandType" value="Npgsql.NpgsqlCommand, Npgsql, Version=1.98.1.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="parameterType" value="Npgsql.NpgsqlParameter, Npgsql, Version=1.98.1.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="dataAdapterType" value="Npgsql.NpgsqlDataAdapter, Npgsql, Version=1.98.1.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="commandBuilderType" value="Npgsql.NpgsqlCommandBuilder, Npgsql, Version=1.98.1.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="NpgsqlTypes.NpgsqlDbType, Npgsql, Version=1.98.1.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="parameterDbTypeProperty" value="NpgsqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value=":"/>
+        <constructor-arg name="exceptionType" value="Npgsql.NpgsqlException, Npgsql, Version=1.98.1.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].Code"/>
+        <!-- error codes taken from http://www.postgresql.org/docs/8.1/static/errcodes-appendix.html -->
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>03000,42000,42601,42602,42622,42804,42P01</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>53000,53100,53200,53300</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>23000,23502,23503,23505,23514</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>55P03</value>
+        </property>
+        <property name="ErrorCodes.CannotSerializeTransactionCodes">
+          <value>40001</value>
+        </property>                  
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>40P01</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+  
+  <!-- DB2 9.0.0 for .NET 1.1 -->
+  <object id="DB2-9.0.0-1.1" type="Spring.Data.Common.DbProvider, Spring.Data"  singleton="false">
+    <constructor-arg name="DbMetaData">
+      <object type="Spring.Data.Common.DbMetadata, Spring.Data">
+        <constructor-arg name="productName" value="IBM.Data.DB2 .NET 1.1 Version 9.0.0.1"/>
+        <constructor-arg name="assemblyName" value="IBM.Data.DB2, Version=9.0.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="connectionType" value="IBM.Data.DB2.DB2Connection, IBM.Data.DB2, Version=9.0.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="commandType" value="IBM.Data.DB2.DB2Command, IBM.Data.DB2, Version=9.0.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="parameterType" value="IBM.Data.DB2.DB2Parameter, IBM.Data.DB2, Version=9.0.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="dataAdapterType" value="IBM.Data.DB2.DB2DataAdapter, IBM.Data.DB2, Version=9.0.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="commandBuilderType" value="IBM.Data.DB2.DB2CommandBuilder, IBM.Data.DB2, Version=9.0.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="IBM.Data.DB2.DB2Type, IBM.Data.DB2, Version=9.0.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="parameterDbTypeProperty" value="DB2Type"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="@"/>
+        <constructor-arg name="exceptionType" value="IBM.Data.DB2.DB2Exception, IBM.Data.DB2, Version=9.0.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].NativeError"/>
+        <!-- error codes taken from http://publib.boulder.ibm.com/infocenter/iseries/v5r3/index.jsp?topic=/rzala/rzalaco.htm and 
+             from Spring.Java sql-error-codes.xml -->
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>-007,-029,-097,-104,-109,-115,-128,-199,-204,-206,-301,-408,-441,-491</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>-904,-971</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>-407,-530,-531,-532,-543,-544,-545,-603,-667,-803</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>-911,-913</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <!-- DB2 9.0.0 for .NET 2.0 -->
+  <object id="DB2-9.0.0-2.0" type="Spring.Data.Common.DbProvider, Spring.Data"  singleton="false">
+    <constructor-arg name="DbMetaData">
+      <object type="Spring.Data.Common.DbMetadata, Spring.Data">
+        <constructor-arg name="productName" value="IBM.Data.DB2"/>
+        <constructor-arg name="assemblyName" value="IBM.Data.DB2, Version=9.0.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="connectionType" value="IBM.Data.DB2.DB2Connection, IBM.Data.DB2, Version=9.0.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="commandType" value="IBM.Data.DB2.DB2Command, IBM.Data.DB2, Version=9.0.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="parameterType" value="IBM.Data.DB2.DB2Parameter, IBM.Data.DB2, Version=9.0.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="dataAdapterType" value="IBM.Data.DB2.DB2DataAdapter, IBM.Data.DB2, Version=9.0.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="commandBuilderType" value="IBM.Data.DB2.DB2CommandBuilder, IBM.Data.DB2, Version=9.0.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="IBM.Data.DB2.DB2Type, IBM.Data.DB2, Version=9.0.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="parameterDbTypeProperty" value="DB2Type"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="@"/>
+        <constructor-arg name="exceptionType" value="IBM.Data.DB2.DB2Exception, IBM.Data.DB2, Version=9.0.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].NativeError"/>
+        <!-- error codes taken from http://publib.boulder.ibm.com/infocenter/iseries/v5r3/index.jsp?topic=/rzala/rzalaco.htm and 
+             from Spring.Java sql-error-codes.xml -->
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>-007,-029,-097,-104,-109,-115,-128,-199,-204,-206,-301,-408,-441,-491</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>-904,-971</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>-407,-530,-531,-532,-543,-544,-545,-603,-667,-803</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>-911,-913</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <alias name="DB2-9.0.0-2.0" alias="IBM.Data.DB2"/>
+
+  <!-- DB2 9.1.0 for .NET 1.1 -->
+  <object id="DB2-9.1.0-1.1" type="Spring.Data.Common.DbProvider, Spring.Data"  singleton="false">
+    <constructor-arg name="DbMetaData">
+      <object type="Spring.Data.Common.DbMetadata, Spring.Data">
+        <constructor-arg name="productName" value="IBM.Data.DB2 .NET 1.1 Version 9.1.0.1"/>
+        <constructor-arg name="assemblyName" value="IBM.Data.DB2, Version=9.1.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="connectionType" value="IBM.Data.DB2.DB2Connection, IBM.Data.DB2, Version=9.1.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="commandType" value="IBM.Data.DB2.DB2Command, IBM.Data.DB2, Version=9.1.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="parameterType" value="IBM.Data.DB2.DB2Parameter, IBM.Data.DB2, Version=9.1.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="dataAdapterType" value="IBM.Data.DB2.DB2DataAdapter, IBM.Data.DB2, Version=9.1.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="commandBuilderType" value="IBM.Data.DB2.DB2CommandBuilder, IBM.Data.DB2, Version=9.1.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="IBM.Data.DB2.DB2Type, IBM.Data.DB2, Version=9.1.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="parameterDbTypeProperty" value="DB2Type"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="@"/>
+        <constructor-arg name="exceptionType" value="IBM.Data.DB2.DB2Exception, IBM.Data.DB2, Version=9.1.0.1, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].NativeError"/>
+        <!-- error codes taken from http://publib.boulder.ibm.com/infocenter/iseries/v5r3/index.jsp?topic=/rzala/rzalaco.htm and 
+             from Spring.Java sql-error-codes.xml -->
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>-007,-029,-097,-104,-109,-115,-128,-199,-204,-206,-301,-408,-441,-491</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>-904,-971</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>-407,-530,-531,-532,-543,-544,-545,-603,-667,-803</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>-911,-913</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <!-- DB2 9.1.0 for .NET 2.0 -->
+  <object id="DB2-9.1.0.2" type="Spring.Data.Common.DbProvider, Spring.Data"  singleton="false">
+    <constructor-arg name="DbMetaData">
+      <object type="Spring.Data.Common.DbMetadata, Spring.Data">
+        <constructor-arg name="productName" value="IBM.Data.DB2"/>
+        <constructor-arg name="assemblyName" value="IBM.Data.DB2, Version=9.1.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="connectionType" value="IBM.Data.DB2.DB2Connection, IBM.Data.DB2, Version=9.1.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="commandType" value="IBM.Data.DB2.DB2Command, IBM.Data.DB2, Version=9.1.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="parameterType" value="IBM.Data.DB2.DB2Parameter, IBM.Data.DB2, Version=9.1.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="dataAdapterType" value="IBM.Data.DB2.DB2DataAdapter, IBM.Data.DB2, Version=9.1.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="commandBuilderType" value="IBM.Data.DB2.DB2CommandBuilder, IBM.Data.DB2, Version=9.1.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="IBM.Data.DB2.DB2Type, IBM.Data.DB2, Version=9.1.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="parameterDbTypeProperty" value="DB2Type"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="@"/>
+        <constructor-arg name="exceptionType" value="IBM.Data.DB2.DB2Exception, IBM.Data.DB2, Version=9.1.0.2, Culture=neutral, PublicKeyToken=7c307b91aa13d208"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].NativeError"/>
+        <!-- error codes taken from http://publib.boulder.ibm.com/infocenter/iseries/v5r3/index.jsp?topic=/rzala/rzalaco.htm and 
+             from Spring.Java sql-error-codes.xml -->
+        
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>-007,-029,-097,-104,-109,-115,-128,-199,-204,-206,-301,-408,-441,-491</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>-904,-971</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>-407,-530,-531,-532,-543,-544,-545,-603,-667,-803</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>-911,-913</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <alias name="DB2-9.1.0.2" alias="IBM.Data.DB2.9.1.0"/>
+
+
+  <!-- DB2 9.1.0 for .NET 2.0 -->
+  <object id="iDB2-10.0.0.0" type="Spring.Data.Common.DbProvider, Spring.Data"  singleton="false">
+    <constructor-arg name="DbMetaData">
+      <object type="Spring.Data.Common.DbMetadata, Spring.Data">
+        <constructor-arg name="productName" value="IBM.Data.DB2.iSeries"/>
+        <constructor-arg name="assemblyName" value="IBM.Data.DB2.iSeries, Version=10.0.0.0, Culture=neutral, PublicKeyToken=9cdb2ebfb1f93a26"/>
+        <constructor-arg name="connectionType" value="IBM.Data.DB2.iSeries.iDB2Connection, IBM.Data.DB2.iSeries, Version=10.0.0.0, Culture=neutral, PublicKeyToken=9cdb2ebfb1f93a26"/>
+        <constructor-arg name="commandType" value="IBM.Data.DB2.iSeries.iDB2Command, IBM.Data.DB2.iSeries, Version=10.0.0.0, Culture=neutral, PublicKeyToken=9cdb2ebfb1f93a26"/>
+        <constructor-arg name="parameterType" value="IBM.Data.DB2.iSeries.iDB2Parameter, IBM.Data.DB2.iSeries, Version=10.0.0.0, Culture=neutral, PublicKeyToken=9cdb2ebfb1f93a26"/>
+        <constructor-arg name="dataAdapterType" value="IBM.Data.DB2.iSeries.iDB2DataAdapter, IBM.Data.DB2.iSeries, Version=10.0.0.0, Culture=neutral, PublicKeyToken=9cdb2ebfb1f93a26"/>
+        <constructor-arg name="commandBuilderType" value="IBM.Data.DB2.iSeries.iDB2CommandBuilder, IBM.Data.DB2.iSeries, Version=10.0.0.0, Culture=neutral, PublicKeyToken=9cdb2ebfb1f93a26"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="IBM.Data.DB2.iSeries.iDB2DbType, IBM.Data.DB2.iSeries, Version=10.0.0.0, Culture=neutral, PublicKeyToken=9cdb2ebfb1f93a26"/>
+        <constructor-arg name="parameterDbTypeProperty" value="iDB2DbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="@"/>
+        <constructor-arg name="exceptionType" value="IBM.Data.DB2.iSeries.iDB2SQLErrorException, IBM.Data.DB2.iSeries, Version=10.0.0.0, Culture=neutral, PublicKeyToken=9cdb2ebfb1f93a26"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>        
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="MessageCode"/>
+        <!-- error codes taken from http://publib.boulder.ibm.com/infocenter/iseries/v5r3/index.jsp?topic=/rzala/rzalaco.htm and 
+             from Spring.Java sql-error-codes.xml -->
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>-007,-029,-097,-104,-109,-115,-128,-199,-204,-206,-301,-408,-441,-491</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>-904,-971</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>-407,-530,-531,-532,-543,-544,-545,-603,-667,-803</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>-911,-913</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+  
+  
+
+  <!-- Sqlite + ADO Net provider for sqlite -->
+  <!-- Driver can be found at : http://sourceforge.net/projects/sqlite-dotnet2 -->
+  <!-- Reference for error codes : http://www.sqlite.org/capi3.html -->
+  <object id="SQLite-1.0.43" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="SQLite"/>
+        <constructor-arg name="assemblyName" value="System.Data.SQLite, Version=1.0.43.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="connectionType" value="System.Data.SQLite.SQLiteConnection, System.Data.SQLite, Version=1.0.43.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="commandType" value="System.Data.SQLite.SQLiteCommand, System.Data.SQLite, Version=1.0.43.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="parameterType" value="System.Data.SQLite.SQLiteParameter, System.Data.SQLite, Version=1.0.43.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="dataAdapterType" value="System.Data.SQLite.SQLiteDataAdapter , System.Data.SQLite, Version=1.0.43.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="commandBuilderType" value="System.Data.SQLite.SQLiteCommandBuilder, System.Data.SQLite, Version=1.0.43.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="not supported"/>
+        <constructor-arg name="parameterDbType" value="System.Data.SQLite.TypeAffinity, System.Data.SQLite, Version=1.0.43.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="parameterDbTypeProperty" value="DbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value=":"/>
+        <constructor-arg name="exceptionType" value="System.Data.SQLite.SQLiteException, System.Data.SQLite, Version=1.0.43.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>        
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Number.ToString()"/>
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value></value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value></value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>15</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>5,6</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+
+  <!-- Sqlite + ADO Net provider for sqlite -->
+  <!-- Driver can be found at : http://sourceforge.net/projects/sqlite-dotnet2 -->
+  <!-- Reference for error codes : http://www.sqlite.org/capi3.html -->
+  <object id="SQLite-1.0.44" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="SQLite"/>
+        <constructor-arg name="assemblyName" value="System.Data.SQLite, Version=1.0.44.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="connectionType" value="System.Data.SQLite.SQLiteConnection, System.Data.SQLite, Version=1.0.44.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="commandType" value="System.Data.SQLite.SQLiteCommand, System.Data.SQLite, Version=1.0.44.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="parameterType" value="System.Data.SQLite.SQLiteParameter, System.Data.SQLite, Version=1.0.44.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="dataAdapterType" value="System.Data.SQLite.SQLiteDataAdapter , System.Data.SQLite, Version=1.0.44.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="commandBuilderType" value="System.Data.SQLite.SQLiteCommandBuilder, System.Data.SQLite, Version=1.0.44.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="not supported"/>
+        <constructor-arg name="parameterDbType" value="System.Data.SQLite.TypeAffinity, System.Data.SQLite, Version=1.0.44.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="parameterDbTypeProperty" value="DbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value=":"/>
+        <constructor-arg name="exceptionType" value="System.Data.SQLite.SQLiteException, System.Data.SQLite, Version=1.0.44.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>        
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Number.ToString()"/>
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value></value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value></value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>15</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>5,6</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <object id="SQLite-1.0.47" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="SQLite"/>
+        <constructor-arg name="assemblyName" value="System.Data.SQLite, Version=1.0.47.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="connectionType" value="System.Data.SQLite.SQLiteConnection, System.Data.SQLite, Version=1.0.47.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="commandType" value="System.Data.SQLite.SQLiteCommand, System.Data.SQLite, Version=1.0.47.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="parameterType" value="System.Data.SQLite.SQLiteParameter, System.Data.SQLite, Version=1.0.47.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="dataAdapterType" value="System.Data.SQLite.SQLiteDataAdapter , System.Data.SQLite, Version=1.0.47.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="commandBuilderType" value="System.Data.SQLite.SQLiteCommandBuilder, System.Data.SQLite, Version=1.0.47.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="not supported"/>
+        <constructor-arg name="parameterDbType" value="System.Data.SQLite.TypeAffinity, System.Data.SQLite, Version=1.0.47.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="parameterDbTypeProperty" value="DbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value=":"/>
+        <constructor-arg name="exceptionType" value="System.Data.SQLite.SQLiteException, System.Data.SQLite, Version=1.0.47.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Number.ToString()"/>
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value></value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value></value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>15</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>5,6</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+  
+  <alias name="SQLite-1.0.47" alias="System.Data.SQLite"/>
+
+  <!-- Sybase -->
+
+  <object id="SybaseAse-12" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="Sybase Adaptive Server Enterprise 12.5, provider V1.1.411 in framework .NET V1.1"/>
+        <constructor-arg name="assemblyName" value="Sybase.Data.AseClient, Version=1.1.411.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7" />
+        <constructor-arg name="connectionType" value="Sybase.Data.AseClient.AseConnection, Sybase.Data.AseClient, Version=1.1.411.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="commandType" value="Sybase.Data.AseClient.AseCommand, Sybase.Data.AseClient, Version=1.1.411.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="parameterType" value="Sybase.Data.AseClient.AseParameter, Sybase.Data.AseClient, Version=1.1.411.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="dataAdapterType" value="Sybase.Data.AseClient.AseDataAdapter, Sybase.Data.AseClient, Version=1.1.411.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="commandBuilderType" value="Sybase.Data.AseClient.AseCommandBuilder, Sybase.Data.AseClient, Version=1.1.411.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="Sybase.Data.AseClient.AseDbType, Sybase.Data.AseClient, Version=1.1.411.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="parameterDbTypeProperty" value="AseDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="@"/>
+        <constructor-arg name="exceptionType" value="Sybase.Data.AseClient.AseException, Sybase.Data.AseClient, Version=1.1.411.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].MessageNumber.ToString()"/>
+
+        <!-- TODO select form system db all errors that have 'incorrect syntax' at the start of the error string-->
+        <property name="ErrorCodes.BadSqlGrammarCodes">
+          <value>101,102,103,104,105,106,107,108,109,110,111,112,113,116,120,121,123,207,208,213,257,512</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>423,511,515,530,547,2601,2615,2714</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1205</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+  
+  <object id="SybaseAse-15" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="Sybase Adaptive Server Enterprise 15.0.2, provider V1.15.152"/>
+        <constructor-arg name="assemblyName" value="Sybase.Data.AseClient, Version=1.15.152.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7" />
+        <constructor-arg name="connectionType" value="Sybase.Data.AseClient.AseConnection, Sybase.Data.AseClient, Version=1.15.152.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="commandType" value="Sybase.Data.AseClient.AseCommand, Sybase.Data.AseClient, Version=1.15.152.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="parameterType" value="Sybase.Data.AseClient.AseParameter, Sybase.Data.AseClient, Version=1.15.152.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="dataAdapterType" value="Sybase.Data.AseClient.AseDataAdapter, Sybase.Data.AseClient, Version=1.15.152.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="commandBuilderType" value="Sybase.Data.AseClient.AseCommandBuilder, Sybase.Data.AseClient, Version=1.15.152.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="Sybase.Data.AseClient.AseDbType, Sybase.Data.AseClient, Version=1.15.152.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="parameterDbTypeProperty" value="AseDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="@"/>
+        <constructor-arg name="exceptionType" value="Sybase.Data.AseClient.AseException, Sybase.Data.AseClient, Version=1.15.152.0, Culture=neutral, PublicKeyToken=26e0f1529304f4a7"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].MessageNumber.ToString()"/>
+
+        <!-- TODO select form system db all errors that have 'incorrect syntax' at the start of the error string-->
+        <property name="ErrorCodes.BadSqlGrammarCodes">
+          <value>101,102,103,104,105,106,107,108,109,110,111,112,113,116,120,121,123,207,208,213,257,512</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>423,511,515,530,547,2601,2615,2714</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1205</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <!-- ODBC -->
+
+  <object id="Odbc-1.1" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="Microsoft ODBC, provider V1.0.5000.0 in framework .NET V1.1"/>
+        <constructor-arg name="assemblyName" value="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="connectionType" value="System.Data.Odbc.OdbcConnection, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandType" value="System.Data.Odbc.OdbcCommand, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="parameterType" value="System.Data.Odbc.OdbcParameter, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="dataAdapterType" value="System.Data.Odbc.OdbcDataAdapter, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="commandBuilderType" value="System.Data.Odbc.OdbcCommandBuilder, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="System.Data.Odbc.OdbcType, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="parameterDbTypeProperty" value="OdbcType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="?"/>
+        <constructor-arg name="exceptionType" value="System.Data.Odbc.OdbcException, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="false"/>
+        <constructor-arg name="useParameterPrefixInSql" value="false"/>
+        <constructor-arg name="bindByName" value="false"/>
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].NativeError.ToString()"/>
+      </object>
+    </constructor-arg>
+  </object>
+
+  <object id="Odbc-2.0" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="Microsoft ODBC, provider V2.0.0.0 in framework .NET V2"/>
+        <constructor-arg name="assemblyName" value="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="connectionType" value="System.Data.Odbc.OdbcConnection, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandType" value="System.Data.Odbc.OdbcCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="parameterType" value="System.Data.Odbc.OdbcParameter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="dataAdapterType" value="System.Data.Odbc.OdbcDataAdapter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="commandBuilderType" value="System.Data.Odbc.OdbcCommandBuilder, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="System.Data.Odbc.OdbcType, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+        <constructor-arg name="parameterDbTypeProperty" value="OdbcType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="?"/>
+        <constructor-arg name="exceptionType" value="System.Data.Odbc.OdbcException, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="false"/>
+        <constructor-arg name="useParameterPrefixInSql" value="false"/>
+        <constructor-arg name="bindByName" value="false"/>
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].NativeError.ToString()"/>
+      </object>
+    </constructor-arg>
+
+  </object>
+
+  <alias name="Odbc-2.0" alias="System.Data.Odbc"/>
+
+</objects>
+
diff --git a/src/Spring/Spring.Data/Data/Config/DatabaseNamespaceParser.cs b/src/Spring/Spring.Data/Data/Config/DatabaseNamespaceParser.cs
new file mode 100644
index 00000000..2ee04c63
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Config/DatabaseNamespaceParser.cs
@@ -0,0 +1,170 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System.Globalization;
+using System.Xml;
+
+using Spring.Data.Common;
+using Spring.Core.TypeResolution;
+using Spring.Objects;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Data.Config
+{
+    /// <summary>
+    /// Implementation of the custom configuration parser for database definitions.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: DatabaseNamespaceParser.cs,v 1.3 2007/08/08 00:34:33 bbaia Exp $</version>
+    [
+        NamespaceParser(
+            Namespace = "http://www.springframework.net/database",
+            SchemaLocationAssemblyHint = typeof(DatabaseNamespaceParser),
+            SchemaLocation = "/Spring.Data.Config/spring-database-1.1.xsd")
+    ]
+    public class DatabaseNamespaceParser : ObjectsNamespaceParser
+    {
+
+        private const string DatabaseTypePrefix = "database: ";
+        
+        static DatabaseNamespaceParser()
+        {
+            TypeRegistry.RegisterType(
+                DatabaseTypePrefix + DbProviderFactoryObjectConstants.DbProviderFactoryObjectElement,
+                typeof (DbProviderFactoryObject));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DatabaseNamespaceParser"/> class.
+        /// </summary>
+        public DatabaseNamespaceParser()
+        {            
+        }
+
+
+
+
+        /// <summary>
+        /// Parse the specified element and register any resulting
+        /// IObjectDefinitions with the IObjectDefinitionRegistry that is
+        /// embedded in the supplied ParserContext.
+        /// </summary>
+        /// <param name="element">The element to be parsed into one or more IObjectDefinitions</param>
+        /// <param name="parserContext">The object encapsulating the current state of the parsing
+        /// process.</param>
+        /// <returns>
+        /// The primary IObjectDefinition (can be null as explained above)
+        /// </returns>
+        /// <remarks>
+        /// Implementations should return the primary IObjectDefinition
+        /// that results from the parse phase if they wish to used nested
+        /// inside (for example) a <code>&lt;property&gt;</code> tag.
+        /// <para>Implementations may return null if they will not
+        /// be used in a nested scenario.
+        /// </para>
+        /// </remarks>
+        public override IObjectDefinition ParseElement(XmlElement element, ParserContext parserContext)
+        {
+            string id = element.GetAttribute(ObjectDefinitionConstants.IdAttribute);
+            IConfigurableObjectDefinition databaseConfiguration = ParseDatabaseDefinition(element, id, parserContext);
+            if (!StringUtils.HasText(id))
+            {
+                id = ObjectDefinitionReaderUtils.GenerateObjectName(databaseConfiguration, parserContext.Registry);
+            }
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug(
+                    string.Format(
+                        CultureInfo.InvariantCulture,
+                        "Registering object definition with id '{0}'.", id));
+            }
+
+            #endregion
+            parserContext.Registry.RegisterObjectDefinition(id, databaseConfiguration);
+
+            return null;
+        }
+
+        private IConfigurableObjectDefinition ParseDatabaseDefinition(XmlElement element, string name, ParserContext parserContext)
+        {
+            switch (element.LocalName)
+            {
+                case DbProviderFactoryObjectConstants.DbProviderFactoryObjectElement:
+                    return ParseDatabaseConfigurer(element, name, parserContext);
+            }
+            return null;
+        }
+
+        private IConfigurableObjectDefinition ParseDatabaseConfigurer(XmlElement element, string name, ParserContext parserContext)
+        {
+            string typeName = GetTypeName(element);
+            string providerNameAttribute = element.GetAttribute(DbProviderFactoryObjectConstants.ProviderNameAttribute);
+            string connectionString = element.GetAttribute(DbProviderFactoryObjectConstants.ConnectionStringAttribute);
+
+            MutablePropertyValues properties = new MutablePropertyValues();
+            if (StringUtils.HasText(providerNameAttribute))
+            {
+                properties.Add("Provider", providerNameAttribute);
+            }
+            if (StringUtils.HasText(connectionString))
+            {
+                properties.Add("ConnectionString", connectionString);
+            }
+
+            IConfigurableObjectDefinition cod = parserContext.ReaderContext.ObjectDefinitionFactory.CreateObjectDefinition(
+                typeName, null, parserContext.ReaderContext.Reader.Domain);
+            cod.PropertyValues = properties;
+
+            return cod;
+        }
+
+        /// <summary>
+        /// Gets the name of the object type for the specified element.  This has already been aliased
+        /// in the static constructor.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        /// <returns>The name of the object type.</returns>
+        private string GetTypeName(XmlElement element)
+        {
+            string typeName = element.GetAttribute(ObjectDefinitionConstants.TypeAttribute);
+            if (StringUtils.IsNullOrEmpty(typeName))
+            {
+                return DatabaseTypePrefix + element.LocalName;
+            }
+            return typeName;
+        }
+
+        private class DbProviderFactoryObjectConstants
+        {
+            public const string DbProviderFactoryObjectElement = "provider";
+            public const string ProviderNameAttribute = "provider";
+            public const string ConnectionStringAttribute = "connectionString";
+        }
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsd b/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsd
new file mode 100644
index 00000000..e68c0b27
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsd
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns="http://www.springframework.net/database"
+           xmlns:objects="http://www.springframework.net"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:vs="http://schemas.microsoft.com/Visual-Studio-Intellisense"
+           targetNamespace="http://www.springframework.net/database"
+           elementFormDefault="qualified" attributeFormDefault="unqualified"
+           vs:friendlyname="Spring.NET Database Framework Configuration" vs:ishtmlschema="false" vs:iscasesensitive="true" vs:requireattributequotes="true" vs:defaultnamespacequalifier="" vs:defaultnsprefix="">
+
+  <xs:import namespace="http://www.springframework.net"/>
+
+  <xs:annotation>
+    <xs:documentation>
+      Spring.NET Database Framework Config Schema Definition
+
+      Author: Mark Pollack
+
+      This file defines a configuration schema for the database framework
+      object definitions. Using elements from this schema instead of the
+      standard object definitions can greatly simplify remoting configuration.
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="provider">
+    <xs:annotation>
+      <xs:documentation>Defines a DbProvider instance</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attribute name="id" type="xs:string" use="required">
+        <xs:annotation>
+          <xs:documentation>The id of the DbProvider instance to be referenced.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="provider" type="providerType" use="required">
+        <xs:annotation>
+          <xs:documentation>The name of the database provider.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="connectionString" type="xs:string" use="required">
+        <xs:annotation>
+          <xs:documentation>The database connection string.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name="providerType">
+    <xs:union>
+      <xs:simpleType id="customProvider">
+        <xs:restriction base="objects:nonNullString"/>
+      </xs:simpleType>
+      <xs:simpleType id="buildinProvider">
+        <xs:restriction base="xs:string">
+          <xs:enumeration value="System.Data.SqlClient">
+            <xs:annotation>
+              <xs:documentation>Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="System.Data.SqlServerCe">
+            <xs:annotation>
+              <xs:documentation>Microsoft SQL Server Compact Edition, provider V9.0.242.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="System.Data.OleDb">
+            <xs:annotation>
+              <xs:documentation>OleDb, provider V2.0.0.0 in framework .NET V2.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="System.Data.OracleClient">
+            <xs:annotation>
+              <xs:documentation>Oracle, Oracle provider V2.102.2.20</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="Oracle.DataAccess.Client">
+            <xs:annotation>
+              <xs:documentation>Oracle, Oracle provider V2.102.2.20</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="MySql.Data.MySqlClient">
+            <xs:annotation>
+              <xs:documentation>MySQL provider 5.1.4.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="System.Data.SQLite">
+            <xs:annotation>
+              <xs:documentation>SQLite 1.0.47 provider</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          
+          <xs:enumeration value="SqlServer-1.1">
+            <xs:annotation>
+              <xs:documentation>Microsoft SQL Server, provider V1.0.5000.0 in framework .NET V1.1</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="SqlServer-2.0">
+            <xs:annotation>
+              <xs:documentation>Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="SqlServerCe-3.1">
+            <xs:annotation>
+              <xs:documentation>Microsoft SQL Server Compact Edition, provider V9.0.242.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="OleDb-1.1">
+            <xs:annotation>
+              <xs:documentation>OleDb, provider V1.0.5000.0 in framework .NET V1.1</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="OleDb-2.0">
+            <xs:annotation>
+              <xs:documentation>OleDb, provider V2.0.0.0 in framework .NET V2.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="OracleClient-2.0">
+            <xs:annotation>
+              <xs:documentation>Oracle, Microsoft provider V2.0.0.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="OracleODP-2.0">
+            <xs:annotation>
+              <xs:documentation>Oracle, Oracle provider V2.102.2.20</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="MySql">
+            <xs:annotation>
+              <xs:documentation>MySQL provider 1.0.7.3007</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="MySql-1.0.9">
+            <xs:annotation>
+              <xs:documentation>MySQL provider 1.0.9.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="MySql-5.0">
+            <xs:annotation>
+              <xs:documentation>MySQL provider 5.0.7.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="MySql-5.0.8.1">
+            <xs:annotation>
+              <xs:documentation>MySQL provider 5.0.8.1</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="MySql-5.1">
+            <xs:annotation>
+              <xs:documentation>MySQL provider 5.1.2.2</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="MySql-5.1.4">
+            <xs:annotation>
+              <xs:documentation>MySQL provider 5.1.4.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="Npgsql-1.0">
+            <xs:annotation>
+              <xs:documentation>Npgsql provider 1.0.0.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="Npgsql-2.0-beta1">
+            <xs:annotation>
+              <xs:documentation>Npgsql provider beta-1 1.98.1.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="DB2-9.0.0-1.1">
+            <xs:annotation>
+              <xs:documentation>IBM DB2 Data Provider 9.0.0 for .NET Framework 1.1</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="DB2-9.0.0-2.0">
+            <xs:annotation>
+              <xs:documentation>IBM DB2 Data Provider 9.0.0 for .NET Framework 2.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="DB2-9.1.0-1.1">
+            <xs:annotation>
+              <xs:documentation>IBM DB2 Data Provider 9.1.0 for .NET Framework 1.1</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="DB2-9.1.0.2">
+            <xs:annotation>
+              <xs:documentation>IBM DB2 Data Provider 9.1.0 for .NET Framework 2.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="iDB2-10.0.0.0">
+            <xs:annotation>
+              <xs:documentation>IBM iSeries DB2 Data Provider 10.0.0.0</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="SQLite-1.0.43">
+            <xs:annotation>
+              <xs:documentation>SQLite 1.0.43 provider</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="SQLite-1.0.44">
+            <xs:annotation>
+              <xs:documentation>SQLite 1.0.44 provider</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="SybaseAse-12">
+            <xs:annotation>
+              <xs:documentation>Sybase ASE 12.5, 1.1.411 provider</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="SybaseAse-15">
+            <xs:annotation>
+              <xs:documentation>Sybase ASE 15, 1.15.152 provider</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="Odbc-1.1">
+            <xs:annotation>
+              <xs:documentation>Microsoft ODBC, provider V1.0.5000.0 in framework .NET V1.1</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+          <xs:enumeration value="Odbc-2.0">
+            <xs:annotation>
+              <xs:documentation>Microsoft ODBC, provider V2.0.0.0 in framework .NET V2</xs:documentation>
+            </xs:annotation>
+          </xs:enumeration>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:union>
+  </xs:simpleType>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsx b/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsx
new file mode 100644
index 00000000..ff71343b
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Config/spring-database-1.1.xsx
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.-->
+<XSDDesignerLayout Style="LeftRight" />
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs b/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs
new file mode 100644
index 00000000..87240431
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs
@@ -0,0 +1,216 @@
+#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.Data;
+using Spring.Data.Common;
+using Spring.Data.Support;
+using Spring.Objects.Factory;
+
+namespace Spring.Data.Core
+{
+    /// <summary>
+    /// Base class for AdoTemplate and other ADO.NET DAO helper classes defining
+    /// common properties like DbProvider.
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <author>Juergen Hoeller</author>
+    public abstract class AdoAccessor : IInitializingObject
+    {
+        protected int commandTimeout;
+
+        #region Properties
+
+        /// <summary>
+        /// An instance of a DbProvider implementation.
+        /// </summary>
+        public abstract IDbProvider DbProvider
+        {
+            get;
+            set;
+        }
+
+
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to lazily initialize the 
+        /// IAdoExceptionTranslator for this accessor, on first encounter of a 
+        /// exception from the data provider.  Default is "true"; can be switched to
+	    /// "false" for initialization on startup.
+        /// </summary>
+        /// <value><c>true</c> if to lazy initialize the IAdoExceptionTranslator; 
+        /// otherwise, <c>false</c>.</value>
+        public abstract bool LazyInit
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// Gets or sets the exception translator. If no custom translator is provided, a default
+        /// <see cref="ErrorCodeExceptionTranslator"/> is used.
+        /// </summary>
+        /// <value>The exception translator.</value>
+        public abstract IAdoExceptionTranslator ExceptionTranslator
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// Gets or set the System.Type to use to create an instance of IDataReaderWrapper 
+        /// for the purpose of having defaults values to use in case of DBNull values read 
+        /// from IDataReader.
+        /// </summary>
+        /// <value>The type of the data reader wrapper.</value>
+        public abstract Type DataReaderWrapperType
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the command timeout for IDbCommands that this AdoTemplate executes.
+        /// </summary>
+        /// <remarks>Default is 0, indicating to use the database provider's default.
+        /// Any timeout specified here will be overridden by the remaining 
+        /// transaction timeout when executing within a transaction that has a
+        /// timeout specified at the transaction level. 
+        /// </remarks>
+        /// <value>The command timeout.</value>
+        public virtual int CommandTimeout
+        {
+            get { return commandTimeout; }
+            set { commandTimeout = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Prepare the command setting the transaction timeout.
+        /// </summary>
+        /// <param name="command"></param>
+        protected void ApplyCommandSettings(IDbCommand command)
+        {
+            ConnectionUtils.ApplyTransactionTimeout(command, DbProvider, CommandTimeout );
+        }
+
+        protected virtual string GetCommandText(object cmdTextProvider)
+        {
+            ICommandTextProvider commandTextProvider = cmdTextProvider as ICommandTextProvider;
+            if (commandTextProvider != null)
+            {
+                return commandTextProvider.CommandText;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method allows the object instance to perform the kind of
+        /// initialization only possible when all of it's dependencies have
+        /// been injected (set), and to throw an appropriate exception in the
+        /// event of misconfiguration.
+        /// </p>
+        /// <p>
+        /// Please do consult the class level documentation for the
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+        /// description of exactly <i>when</i> this method is invoked. In
+        /// particular, it is worth noting that the
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and <see cref="Spring.Context.IApplicationContextAware"/>
+        /// callbacks will have been invoked <i>prior</i> to this method being
+        /// called.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as the failure to set a
+        /// required property) or if initialization fails.
+        /// </exception>
+        public abstract void AfterPropertiesSet();
+
+        /// <summary>
+        /// Creates the data reader wrapper for use in AdoTemplate callback methods.
+        /// </summary>
+        /// <param name="readerToWrap">The reader to wrap.</param>
+        /// <returns>The data reader used in AdoTemplate callbacks</returns>
+        public abstract IDataReader CreateDataReaderWrapper(IDataReader readerToWrap);
+
+        /// <summary>
+        /// Creates the a db parameters collection, adding to the collection a parameter created from
+        /// the method parameters.
+        /// </summary>
+        /// <param name="name">The name of the parameter</param>
+        /// <param name="dbType">The type of the parameter.</param>
+        /// <param name="size">The size of the parameter, for use in defining lengths of string values.  Use
+        /// 0 if not applicable.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        /// <returns>A collection of db parameters with a single parameter in the collection based
+        /// on the method parameters</returns>
+        protected IDbParameters CreateDbParameters(string name, Enum dbType, int size, object parameterValue)
+        {
+            IDbParameters parameters = new DbParameters(DbProvider);
+            parameters.Add(name, dbType, size).Value = parameterValue;
+            return parameters;
+        }
+
+
+        #region Parameter Creation Helper Methods
+
+        /// <summary>
+        /// Creates a new instance of <see cref="DbParameters"/>
+        /// </summary>
+        /// <returns>a new instance of <see cref="DbParameters"/></returns>
+        public virtual IDbParameters CreateDbParameters()
+        {
+            return new DbParameters(DbProvider);
+        }
+
+        /// <summary>
+        /// Derives the parameters of a stored procedure, not including the return parameter.
+        /// </summary>
+        /// <param name="procedureName">Name of the procedure.</param>
+        /// <returns>The stored procedure parameters.</returns>
+        public virtual IDataParameter[] DeriveParameters(string procedureName)
+        {
+            return DeriveParameters(procedureName, false);
+        }
+
+        /// <summary>
+        /// Derives the parameters of a stored procedure including the return parameter
+        /// </summary>
+        /// <param name="procedureName">Name of the procedure.</param>
+        /// <param name="includeReturnParameter">if set to <c>true</c> to include return parameter.</param>
+        /// <returns>The stored procedure parameters</returns>
+        public abstract IDataParameter[] DeriveParameters(string procedureName, bool includeReturnParameter);
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/Core/AdoDaoSupport.cs b/src/Spring/Spring.Data/Data/Core/AdoDaoSupport.cs
new file mode 100644
index 00000000..2b8aae91
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Core/AdoDaoSupport.cs
@@ -0,0 +1,142 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Data;
+using Spring.Dao.Support;
+using Spring.Data.Common;
+using Spring.Data.Support;
+
+namespace Spring.Data.Core
+{
+    /// <summary>
+    /// Convenient super class for ADO.NET data access objects.
+    /// </summary>
+    /// <remarks>
+    /// Requires a IDBProvider to be set, providing a
+    /// AdoTemplate based on it to subclasses.
+    /// This base class is mainly intended for AdoTemplate usage.
+    /// </remarks>
+    public class AdoDaoSupport : DaoSupport
+    {
+        private AdoTemplate adoTemplate;
+
+        /// <summary>
+        /// The DbProvider instance used by this DAO
+        /// </summary>
+        public IDbProvider DbProvider
+        {
+            set
+            {
+                adoTemplate = CreateAdoTemplate(value);
+            }
+            get
+            {
+                if (adoTemplate != null)
+                {
+                    return adoTemplate.DbProvider;
+                }
+                else
+                {
+                    return null;
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Set the AdoTemplate for this DAO explicity, as
+        /// an alternative to specifying a IDbProvider
+        /// </summary>
+        public AdoTemplate AdoTemplate
+        {
+            set
+            {
+                adoTemplate = value;
+            }
+            get
+            {
+                return adoTemplate;
+            }
+
+        }
+
+        protected override void CheckDaoConfig()
+        {
+            if (adoTemplate == null)
+            {
+                throw new ArgumentException("DbProvider or AdoTemplate is required");
+            }
+        }
+
+        protected IDbConnection Connection
+        {
+            get
+            {
+                return ConnectionUtils.GetConnection(DbProvider);
+            }
+        }
+
+        protected IAdoExceptionTranslator ExceptionTranslator
+        {
+            get
+            {
+                return null;  //Investigate AdoExceptionTranslator on AdoAccessor
+            }
+        }
+
+        protected void DisposeConnection(IDbConnection conn, IDbProvider dbProvider)
+        {
+            ConnectionUtils.DisposeConnection(conn, dbProvider);
+        }
+        
+
+        /// <summary>
+        /// Create a AdoTemplate for a given DbProvider
+        /// Only invoked if populating the DAO with a DbProvider reference.
+        /// </summary>
+        /// <remarks>
+        /// Can be overriden in subclasses to provide AdoTemplate instances
+        /// with a different configuration, or a cusotm AdoTemplate subclass.       
+        /// </remarks>
+        /// <param name="dbProvider">The DbProvider to create a AdoTemplate for</param>        
+        protected virtual AdoTemplate CreateAdoTemplate(IDbProvider dbProvider)
+        {
+            return new AdoTemplate(dbProvider);
+        }
+
+        /// <summary>
+        /// Convenience method to create a parameters builder.
+        /// </summary>
+        /// <remarks>Virtual for sublcasses to override with custom
+        /// implementation.</remarks>
+        /// <returns>A new DbParameterBuilder</returns>
+        protected virtual IDbParametersBuilder CreateDbParametersBuilder()
+        {
+            return new DbParametersBuilder(DbProvider);
+        }
+
+        protected virtual IDbParameters CreateDbParameters()
+        {
+            return AdoTemplate.CreateDbParameters();
+        }
+        
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/Core/AdoPlatformTransactionManager.cs b/src/Spring/Spring.Data/Data/Core/AdoPlatformTransactionManager.cs
new file mode 100644
index 00000000..612aafa9
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Core/AdoPlatformTransactionManager.cs
@@ -0,0 +1,431 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Data;
+using Common.Logging;
+using Spring.Data.Common;
+using Spring.Data.Support;
+using Spring.Objects.Factory;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+#endregion
+namespace Spring.Data.Core
+{
+    /// <summary>
+    /// ADO.NET based implementation of the <see cref="Spring.Transaction.IPlatformTransactionManager"/>
+    /// interface.
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AdoPlatformTransactionManager.cs,v 1.7 2007/11/30 18:42:11 markpollack Exp $</version>
+    public class AdoPlatformTransactionManager : AbstractPlatformTransactionManager, IInitializingObject
+    {
+
+        private IDbProvider dbProvider;
+
+        #region Logging Definition
+
+        private static readonly ILog LOG = LogManager.GetLogger(typeof (AdoPlatformTransactionManager));
+
+        #endregion      
+
+        public AdoPlatformTransactionManager()
+        {
+            NestedTransactionsAllowed = true;
+        }
+
+        public AdoPlatformTransactionManager(IDbProvider dbProvider) : this()
+        {
+            DbProvider = dbProvider;
+
+        }
+
+        #region Propeties
+
+        public IDbProvider DbProvider
+        {
+            get { return dbProvider; }
+            set { dbProvider = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Return the current transaction object.
+        /// </summary>
+        /// <returns>The current transaction object.</returns>
+        /// <exception cref="Spring.Transaction.CannotCreateTransactionException">
+        /// If transaction support is not available.
+        /// </exception>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of lookup or system errors.
+        /// </exception>
+        protected override object DoGetTransaction()
+        {
+            DbProviderTransactionObject txMgrStateObject =
+                new DbProviderTransactionObject();
+            txMgrStateObject.SavepointAllowed = NestedTransactionsAllowed;
+            ConnectionHolder conHolder = 
+                (ConnectionHolder) TransactionSynchronizationManager.GetResource(DbProvider);
+            txMgrStateObject.SetConnectionHolder(conHolder, false);
+            return txMgrStateObject;
+        }
+
+        /// <summary>
+        /// Check if the given transaction object indicates an existing,
+        /// i.e. already begun, transaction.
+        /// </summary>
+        /// <param name="transaction">
+        /// Transaction object returned by
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+        /// </param>
+        /// <returns>True if there is an existing transaction.</returns>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of system errors.
+        /// </exception>
+        protected override bool IsExistingTransaction(object transaction)
+        {
+            DbProviderTransactionObject txMgrStateObject =
+                (DbProviderTransactionObject)transaction;
+            return (txMgrStateObject.ConnectionHolder != null
+                    &&
+                    txMgrStateObject.ConnectionHolder.TransactionActive);
+
+        }
+
+        /// <summary>
+        /// Begin a new transaction with the given transaction definition.
+        /// </summary>
+        /// <param name="transaction">
+        /// Transaction object returned by
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+        /// </param>
+        /// <param name="definition">
+        /// <see cref="Spring.Transaction.ITransactionDefinition"/> instance, describing
+        /// propagation behavior, isolation level, timeout etc.
+        /// </param>
+        /// <remarks>
+        /// Does not have to care about applying the propagation behavior,
+        /// as this has already been handled by this abstract manager.
+        /// </remarks>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of creation or system errors.
+        /// </exception>
+        protected override void DoBegin(object transaction, ITransactionDefinition definition)
+        {
+            DbProviderTransactionObject txMgrStateObject =
+                (DbProviderTransactionObject)transaction;
+            IDbConnection con = null;
+	        
+            if (dbProvider == null)
+            {
+                throw new ArgumentException("DbProvider is required to be set on AdoPlatformTransactionManager");
+            }
+	        
+            try
+            {
+                if (txMgrStateObject.ConnectionHolder == null || txMgrStateObject.ConnectionHolder.SynchronizedWithTransaction)
+                {
+                    IDbConnection newCon = DbProvider.CreateConnection();
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug("Acquired Connection [" + newCon + ", " + newCon.ConnectionString + "] for ADO.NET transaction");
+                    }
+                    newCon.Open();                    
+
+                    //TODO isolation level mgmt - will need to abstract out SQL used to specify this in DbMetaData
+                    //MSDN docs...
+                    //With one exception, you can switch from one isolation level to another at any time during a transaction. The exception occurs when changing from any isolation level to SNAPSHOT isolation
+                    
+                    
+                    //IsolationLevel previousIsolationLevel = 
+
+                    IDbTransaction newTrans = newCon.BeginTransaction(definition.TransactionIsolationLevel);
+
+                    txMgrStateObject.SetConnectionHolder(new ConnectionHolder(newCon, newTrans), true);
+
+                }
+                txMgrStateObject.ConnectionHolder.SynchronizedWithTransaction = true;
+                con = txMgrStateObject.ConnectionHolder.Connection;
+
+
+                txMgrStateObject.ConnectionHolder.TransactionActive = true;
+
+                int timeout = DetermineTimeout(definition);
+                if (timeout != DefaultTransactionDefinition.TIMEOUT_DEFAULT)
+                {
+                    txMgrStateObject.ConnectionHolder.TimeoutInSeconds = timeout;
+                }
+                    
+
+                //Bind transactional resources to thread
+                if (txMgrStateObject.NewConnectionHolder)
+                {
+                    TransactionSynchronizationManager.BindResource(DbProvider, 
+                                                                   txMgrStateObject.ConnectionHolder);
+                }
+
+            }
+                //TODO catch specific exception
+            catch (Exception e)
+            {
+                ConnectionUtils.DisposeConnection(con, DbProvider);
+                throw new CannotCreateTransactionException("Could not create ADO.NET connection for transaction", e);
+            }
+                
+        }
+
+
+        /// <summary>
+        /// Suspend the resources of the current transaction.
+        /// </summary>
+        /// <param name="transaction">Transaction object returned by
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.</param>
+        /// <returns>
+        /// An object that holds suspended resources (will be kept unexamined for passing it into
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoResume"/>.)
+        /// </returns>
+        /// <remarks>
+        /// Transaction synchronization will already have been suspended.
+        /// </remarks>
+        /// <exception cref="Spring.Transaction.IllegalTransactionStateException">
+        /// If suspending is not supported by the transaction manager implementation.
+        /// </exception>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// in case of system errors.
+        /// </exception>
+        protected override object DoSuspend(object transaction)
+        {
+            DbProviderTransactionObject txMgrStateObject = (DbProviderTransactionObject)transaction;
+            txMgrStateObject.ConnectionHolder = null;
+            ConnectionHolder conHolder = (ConnectionHolder) TransactionSynchronizationManager.UnbindResource(DbProvider);
+            return conHolder;
+        }
+
+
+        /// <summary>
+        /// Resume the resources of the current transaction.
+        /// </summary>
+        /// <param name="transaction">Transaction object returned by
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.</param>
+        /// <param name="suspendedResources">The object that holds suspended resources as returned by
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoSuspend"/>.</param>
+        /// <remarks>
+        /// Transaction synchronization will be resumed afterwards.
+        /// </remarks>
+        /// <exception cref="Spring.Transaction.IllegalTransactionStateException">
+        /// If suspending is not supported by the transaction manager implementation.
+        /// </exception>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of system errors.
+        /// </exception>
+        protected override void DoResume(object transaction, object suspendedResources)
+        {
+            ConnectionHolder conHolder = (ConnectionHolder)suspendedResources;
+            TransactionSynchronizationManager.BindResource(DbProvider, conHolder);            
+        }
+	   
+
+        /// <summary>
+        /// Perform an actual commit on the given transaction.
+        /// </summary>
+        /// <param name="status">The status representation of the transaction.</param>
+        /// <remarks>
+        /// <p>
+        /// An implementation does not need to check the rollback-only flag.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of system errors.
+        /// </exception>
+        protected override void DoCommit(DefaultTransactionStatus status)
+        {
+            DbProviderTransactionObject txMgrStateObject =
+                (DbProviderTransactionObject)status.Transaction;
+            IDbTransaction trans = txMgrStateObject.ConnectionHolder.Transaction;
+            if (status.Debug)
+            {
+                IDbConnection conn = txMgrStateObject.ConnectionHolder.Connection;
+                log.Debug("Committing ADO.NET transaction on Connection [" + conn + ", " + conn.ConnectionString + "]");
+            }
+            try
+            {
+                trans.Commit();
+            }
+            catch (Exception e)
+            {
+                throw new TransactionSystemException("Could not commit ADO.NET transaction", e);
+            }
+
+        }
+
+        /// <summary>
+        /// Perform an actual rollback on the given transaction.
+        /// </summary>
+        /// <param name="status">The status representation of the transaction.</param>
+        /// <remarks>
+        /// An implementation does not need to check the new transaction flag.
+        /// </remarks>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of system errors.
+        /// </exception>
+        protected override void DoRollback(DefaultTransactionStatus status)
+        {
+            DbProviderTransactionObject txMgrStateObject =
+                (DbProviderTransactionObject)status.Transaction;
+            IDbConnection conn = txMgrStateObject.ConnectionHolder.Connection;
+            IDbTransaction trans = txMgrStateObject.ConnectionHolder.Transaction;
+            if (status.Debug)
+            {
+                log.Debug("Rolling back ADO.NET transaction on Connection [" + conn + ", " + conn.ConnectionString + "]" );
+            }
+            try
+            {
+                trans.Rollback();
+            }
+            catch (Exception e)
+            {
+                throw new TransactionSystemException("Could not rollback ADO.NET transaction", e);
+            }
+        }
+
+        /// <summary>
+        /// Set the given transaction rollback-only. Only called on rollback
+        /// if the current transaction takes part in an existing one.
+        /// </summary>
+        /// <param name="status">The status representation of the transaction.</param>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of system errors.
+        /// </exception>
+        protected override void DoSetRollbackOnly(DefaultTransactionStatus status)
+        {
+            DbProviderTransactionObject txMgrStateObject =
+                        (DbProviderTransactionObject)status.Transaction;
+            if (status.Debug)
+            {
+                IDbConnection conn = txMgrStateObject.ConnectionHolder.Connection;
+                log.Debug("Setting ADO.NET transaction [" + conn + ", " + conn.ConnectionString + "] rollback-only.");
+            }
+            txMgrStateObject.SetRollbackOnly();
+
+        }
+
+        protected override void DoCleanupAfterCompletion(object transaction)
+        {
+            DbProviderTransactionObject txMgrStateObject =
+                (DbProviderTransactionObject)transaction;
+            if (txMgrStateObject.NewConnectionHolder)
+            {
+                TransactionSynchronizationManager.UnbindResource(DbProvider);
+            }
+            IDbConnection con = txMgrStateObject.ConnectionHolder.Connection;
+
+            if (log.IsDebugEnabled)
+            {
+                log.Debug("Releasing ADO.NET Connection [" + con + ", " + con.ConnectionString + "] after transaction");
+            }
+
+            ConnectionUtils.DisposeConnection(con, DbProvider);
+            //TODO clear out IDbTransaction object?
+
+            txMgrStateObject.ConnectionHolder.Clear();
+
+
+        }
+
+
+
+        /// <summary>
+        /// DbProvider transaction (state) object, representing a ConnectionHolder.
+        /// Used as a transaction object by AdoPlatformTransactionManager
+        /// </summary>
+        /// <remarks>Derives from AdoTransactionObjectSupport to inherit the capability
+        /// to manage Savepoints.
+        /// </remarks>
+        /// <seealso cref="ConnectionHolder"/>
+        private class DbProviderTransactionObject : AdoTransactionObjectSupport
+        {
+            private bool newConnectionHolder;
+
+            public void SetConnectionHolder(ConnectionHolder connectionHolder,
+                                            bool newConnection)
+            {
+                ConnectionHolder = connectionHolder;
+                newConnectionHolder = newConnection;
+            }
+
+            public bool NewConnectionHolder
+            {
+                get
+                {
+                    return newConnectionHolder;
+                }
+            }
+
+            public bool HasTransaction
+            {
+                get
+                {
+                    return (ConnectionHolder != null && ConnectionHolder.TransactionActive);                 
+                }
+            }
+
+            /// <summary>
+            /// Sets the rollback only.
+            /// </summary>
+            public void SetRollbackOnly()
+            {                
+                ConnectionHolder.RollbackOnly = true;
+            }
+
+            /// <summary>
+            /// Return whether the transaction is internally marked as rollback-only.
+            /// </summary>
+            /// <value></value>
+            /// <returns>True of the transaction is marked as rollback-only.</returns>
+            public override bool RollbackOnly
+            {
+                get
+                {
+                    return ConnectionHolder.RollbackOnly;
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        /// <exception cref="System.ArgumentException">
+        /// If DbProvider is null.
+        /// </exception>
+        public void AfterPropertiesSet()
+        {
+            if (dbProvider == null)
+            {
+                throw new ArgumentException("DbProvider is required");
+            }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs b/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs
new file mode 100644
index 00000000..8325b999
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs
@@ -0,0 +1,3051 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using System.Data.Common;
+using System.Globalization;
+using System.Reflection;
+using Common.Logging;
+using Spring.Dao.Support;
+using Spring.Data.Common;
+using Spring.Data.Support;
+using Spring.Reflection.Dynamic;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Data.Core
+{
+    /// <summary>
+    /// This is the central class in the Spring.Data namespace.
+    /// It simplifies the use of ADO.NET and helps to avoid commons errors.
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AdoTemplate.cs,v 1.9 2007/12/28 19:37:13 markpollack Exp $</version>   
+    public class AdoTemplate : AdoAccessor, IAdoOperations
+    {
+        #region Logging Definition
+
+        private static readonly ILog LOG = LogManager.GetLogger(typeof(AdoTemplate));
+
+        #endregion
+
+        #region Fields
+
+        private IDbProvider dbProvider;
+
+        private IAdoExceptionTranslator exceptionTranslator;
+
+        private bool lazyInit = true;
+        protected Type dataReaderWrapperType;
+        protected IDynamicConstructor newDataReaderWrapper;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoTemplate"/> class.
+        /// </summary>
+        public AdoTemplate()
+            : base()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoTemplate"/> class.
+        /// </summary>
+        /// <param name="provider">The database provider.</param>
+        public AdoTemplate(IDbProvider provider)
+        {
+            DbProvider = provider;
+            AfterPropertiesSet();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoTemplate"/> class.
+        /// </summary>
+        /// <param name="provider">The database provider.</param>
+        /// <param name="lazyInit">if set to <c>false</c>
+        /// lazily initialize the ErrorCodeExceptionTranslator.</param>
+        public AdoTemplate(IDbProvider provider, bool lazyInit)
+        {
+            DbProvider = provider;
+            LazyInit = lazyInit;
+            AfterPropertiesSet();
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// An instance of a DbProvider implementation.
+        /// </summary>
+        public override IDbProvider DbProvider
+        {
+            get { return dbProvider; }
+            set
+            {
+                dbProvider = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to lazily initialize the 
+        /// IAdoExceptionTranslator for this accessor, on first encounter of a 
+        /// exception from the data provider.  Default is "true"; can be switched to
+        /// "false" for initialization on startup.
+        /// </summary>
+        /// <value><c>true</c> if to lazy initialize the IAdoExceptionTranslator; 
+        /// otherwise, <c>false</c>.</value>
+        public override bool LazyInit
+        {
+            get { return lazyInit; }
+            set { lazyInit = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the exception translator. If no custom translator is provided, a default
+        /// <see cref="ErrorCodeExceptionTranslator"/> is used.
+        /// </summary>
+        /// <value>The exception translator.</value>
+        public override IAdoExceptionTranslator ExceptionTranslator
+        {
+            get
+            {
+                InitExceptionTranslator();
+                return exceptionTranslator;
+            }
+            set
+            {
+                exceptionTranslator = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or set the System.Type to use to create an instance of IDataReaderWrapper 
+        /// for the purpose of having defaults values to use in case of DBNull values read 
+        /// from IDataReader.
+        /// </summary>
+        /// <value>The type of the data reader wrapper.</value>
+        public override Type DataReaderWrapperType
+        {
+            get { return dataReaderWrapperType; }
+            set
+            {
+                if (dataReaderWrapperType == null)
+                {
+                    if (typeof(IDataReaderWrapper).IsAssignableFrom(value))
+                    {
+                        dataReaderWrapperType = value;
+                        ConstructorInfo constructor = ObjectUtils.GetZeroArgConstructorInfo(dataReaderWrapperType);
+                        newDataReaderWrapper = DynamicConstructor.Create(constructor);
+
+                    }
+                    else
+                    {
+                        throw new ArgumentException("DataReaderWrapper type must implement IDataReaderWrapper. Implemented interfaces on "
+                                                    + value.GetType().Name + "are [" +
+                                                    StringUtils.ArrayToCommaDelimitedString(
+                                                        ReflectionUtils.ToInterfaceArray(value)) + "]");
+                        
+                    }
+                }
+                else
+                {
+                    LOG.Warn("Ignoring assignment of DataReaderWrapperType since it has already been assigned.");
+                }
+
+            }
+
+        }
+
+        #endregion
+
+
+        public override void AfterPropertiesSet()
+        {
+            if (DbProvider == null)
+            {
+                throw new ArgumentException("DbProvider is required");
+            }
+            if (!LazyInit)
+            {
+                InitExceptionTranslator();
+            }
+        }
+
+
+        #region General Execute Callback Methods
+        /// <summary>
+        /// Execute a ADO.NET operation on a command object using a delegate callback.
+        /// </summary>
+        /// <param name="del">The delegate called with a command object.</param>
+        /// <returns>
+        /// A result object returned by the action or null
+        /// </returns>
+        /// <remarks>This allows for implementing arbitrary data access operations
+        /// on a single command within Spring's managed ADO.NET environment.</remarks>
+        public Object Execute(CommandDelegate del)
+        {
+            return Execute(new ExecuteCommandCallbackUsingDelegate(del));
+        }
+
+        /// <summary>
+        /// Callback to execute a IDbCommand.
+        /// </summary>
+        /// <param name="action">the callback to execute</param>
+        /// <returns>object returned from callback</returns>
+        public object Execute(ICommandCallback action)
+        {
+            ConnectionTxPair connectionTxPairToUse = ConnectionUtils.GetConnectionTxPair(DbProvider);
+
+            IDbCommand command = null;
+            try
+            {
+                command = DbProvider.CreateCommand();
+                command.Connection = connectionTxPairToUse.Connection;
+                command.Transaction = connectionTxPairToUse.Transaction;
+                //TODO collect warnings...
+                //RegisterEventHandlers(command.Connection);
+                ApplyCommandSettings(command);
+                Object result = action.DoInCommand(command);
+                //SqlWarnings sqlWarnings = GetSqlWarnings()
+                //ThrowExceptionOnWarningIfNotIgnoringWarnings(sqlWarnings);
+                return result;
+            }
+            catch (Exception e)
+            {
+                AdoUtils.DisposeCommand(command);
+                command = null;
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+                connectionTxPairToUse.Connection = null;
+                if (DbProvider.IsDataAccessException(e))
+                {
+                    throw ExceptionTranslator.Translate("CommandCallback", GetCommandText(action), e);
+                }
+                else
+                {
+                    throw;
+                }
+
+
+            }
+            finally
+            {
+                AdoUtils.DisposeCommand(command);
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+            }
+
+        }
+
+        /// <summary>
+        /// Executes ADO.NET operations on a command object, created by the provided IDbCommandCreator,
+        /// using the interface based callback IDbCommandCallback.
+        /// </summary>
+        /// <param name="commandCreator">The command creator.</param>
+        /// <param name="action">The callback to execute based on IDbCommand</param>
+        /// <returns>A result object returned by the action or null</returns>
+        public object Execute(IDbCommandCreator commandCreator, ICommandCallback action)
+        {
+            AssertUtils.ArgumentNotNull(commandCreator, "commandCreator", "IDbCommandCreator must not be null");
+            AssertUtils.ArgumentNotNull(action, "action", "Callback object must not be null");
+
+            ConnectionTxPair connectionTxPairToUse = ConnectionUtils.GetConnectionTxPair(DbProvider);
+
+
+            IDbCommand command = null;
+            try
+            {
+                command = commandCreator.CreateDbCommand(DbProvider);
+                command.Connection = connectionTxPairToUse.Connection;
+                command.Transaction = connectionTxPairToUse.Transaction;
+                ApplyCommandSettings(command);
+                //TODO collect warnings...
+                //RegisterEventHandlers(command.Connection);
+                Object result = action.DoInCommand(command);
+
+                //SqlWarnings sqlWarnings = GetSqlWarnings()
+                //ThrowExceptionOnWarningIfNotIgnoringWarnings(sqlWarnings);
+
+                return result;
+            }
+            catch (Exception e)
+            {
+                commandCreator = null;
+                AdoUtils.DisposeCommand(command);
+                command = null;
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+                connectionTxPairToUse.Connection = null;
+                if (DbProvider.IsDataAccessException(e))
+                {
+                    throw ExceptionTranslator.Translate("CommandCallback", GetCommandText(action), e);
+                }
+                else
+                {
+                    throw;
+                }
+            }
+            finally
+            {
+                AdoUtils.DisposeCommand(command);
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+            }
+
+        }
+
+        /// <summary>
+        /// Execute ADO.NET operations on a IDbDataAdapter object using an interface based callback.
+        /// </summary>
+        /// <remarks>This allows for implementing abritrary data access operations
+        /// on a single DataAdapter within Spring's managed ADO.NET environment.
+        /// </remarks>
+        /// <param name="dataAdapterCallback">The data adapter callback.</param>
+        /// <returns>A result object returned by the callback or null</returns>
+        public object Execute(IDataAdapterCallback dataAdapterCallback)
+        {
+            ConnectionTxPair connectionTxPairToUse = ConnectionUtils.GetConnectionTxPair(DbProvider);
+            IDbDataAdapter dataAdapter = null;
+            try
+            {
+                dataAdapter = DbProvider.CreateDataAdapter();
+                //TODO row updated event handling...
+                dataAdapter.SelectCommand = DbProvider.CreateCommand();
+                dataAdapter.SelectCommand.Connection = connectionTxPairToUse.Connection;
+                //TODO register for warnings on connection.
+                dataAdapter.SelectCommand.Transaction = connectionTxPairToUse.Transaction;
+                ApplyCommandSettings(dataAdapter.SelectCommand);
+                object result = dataAdapterCallback.DoInDataAdapter(dataAdapter);
+                return result;
+
+            }
+            catch (Exception)
+            {
+                AdoUtils.DisposeDataAdapterCommands(dataAdapter);
+                //TODO set dataAdapter command's = null; ?
+                //TODO exception translation? different hierarchy for data set operations.
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+                connectionTxPairToUse.Connection = null;
+                throw;
+            }
+            finally
+            {
+                AdoUtils.DisposeDataAdapterCommands(dataAdapter);
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+            }
+
+
+        }
+
+        #endregion
+
+        #region ExecuteNonQuery
+
+
+        /// <summary>
+        /// Executes a non query returning the number of rows affected.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <returns>The number of rows affected.</returns>
+        public int ExecuteNonQuery(CommandType cmdType, string cmdText)
+        {
+            #region Instrumentation
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Executing NonQuery " + cmdType + "[" + cmdText + "]");
+            }
+            #endregion
+
+            return (int)Execute(new ExecuteNonQueryCallbackWithParameters(cmdType, cmdText, null));
+        }
+
+        /// <summary>
+        /// Executes a non query returning the number of rows affected.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="parameterName">The name of the parameter to map.</param>
+        /// <param name="dbType">One of the database parameter type enumerations.</param>
+        /// <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        /// <returns>The number of rows affected.</returns>
+        public int ExecuteNonQuery(CommandType cmdType, string cmdText,
+                                   string parameterName, Enum dbType, int size, object parameterValue)
+        {
+            return (int)Execute(new ExecuteNonQueryCallbackWithParameters(cmdType, cmdText,
+                                                                          CreateDbParameters(parameterName, dbType, size, parameterValue)));
+
+
+        }
+
+        /// <summary>
+        /// Executes a non query returning the number of rows affected.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="parameters">The parameter collection to map.</param>
+        /// <returns>The number of rows affected.</returns>
+        public int ExecuteNonQuery(CommandType cmdType, string cmdText,
+                                   IDbParameters parameters)
+        {
+            #region Instrumentation
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Executing NonQuery.  " + cmdType + "[" + cmdText + "]");
+            }
+            #endregion
+
+            return (int)Execute(new ExecuteNonQueryCallbackWithParameters(cmdType, cmdText, parameters));
+
+        }
+
+        /// <summary>
+        /// Executes a non query with parameters set via the
+        /// command setter, returning the number of rows affected.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="commandSetter">The command setter.</param>
+        /// <returns>The number of rows affected.</returns>
+        public int ExecuteNonQuery(CommandType cmdType, string cmdText,
+                                   ICommandSetter commandSetter)
+        {
+            #region Instrumentation
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Executing NonQuery. " + cmdType + "[" + cmdText + "]");
+            }
+            #endregion
+
+            return (int)Execute(new ExecuteNonQueryCallbackWithCommandSetter(cmdType, cmdText, commandSetter));
+        }
+
+
+        /// <summary>
+        /// Executes a non query with a command created via IDbCommandCreator and
+        /// parameters.
+        /// </summary>
+        /// <remarks>Output parameters can be retrieved via the returned
+        /// dictionary.
+        /// <para>
+        /// More commonly used as a lower level support method within the framework,
+        /// for example StoredProcedure/AdoScalar.
+        /// </para>
+        /// </remarks>
+        /// <param name="commandCreator">The callback to create a IDbCommand.</param>
+        /// <returns>The number of rows affected.</returns>
+        public IDictionary ExecuteNonQuery(IDbCommandCreator commandCreator)
+        {
+
+            return (IDictionary)Execute(commandCreator, new AdoNonQueryWithOutputParamsCommandCallback());
+
+        }
+
+        #endregion
+
+        #region ExecuteScalar
+
+        /// <summary>
+        /// Execute the query with the specified command text.
+        /// </summary>
+        /// <remarks>No parameters are used.  As with
+        /// IDbCommand.ExecuteScalar, it returns the first column of the first row in the resultset
+        /// returned by the query.  Extra columns or row are ignored.</remarks>
+        /// <param name="cmdType">The command type</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <returns>The first column of the first row in the result set</returns>
+        public object ExecuteScalar(CommandType cmdType, string cmdText)
+        {
+            return Execute(new ExecuteScalarCallbackWithParameters(cmdType, cmdText, null));
+        }
+
+        /// <summary>
+        /// Execute the query with the specified command text and parameter returning a scalar result
+        /// </summary>
+        /// <param name="cmdType">The command type</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="parameterName">The name of the parameter to map.</param>
+        /// <param name="dbType">One of the database parameter type enumerations.</param>
+        /// <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        /// <returns>The first column of the first row in the result set</returns>
+        public object ExecuteScalar(CommandType cmdType, string cmdText,
+                                    string parameterName, Enum dbType, int size, object parameterValue)
+        {
+            return Execute(new ExecuteScalarCallbackWithParameters(cmdType, cmdText,
+                                                                   CreateDbParameters(parameterName, dbType, size, parameterValue)));
+
+        }
+
+
+        /// <summary>
+        /// Execute the query with the specified command text and parameters returning a scalar result
+        /// </summary>
+        /// <param name="cmdType">The command type</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="parameters">The parameter collection to map.</param>
+        /// <returns>The first column of the first row in the result set</returns>
+        public object ExecuteScalar(CommandType cmdType, string cmdText,
+                                    IDbParameters parameters)
+        {
+            return Execute(new ExecuteScalarCallbackWithParameters(cmdType, cmdText, parameters));
+
+        }
+
+        /// <summary>
+        /// Execute the query with the specified command text and parameters set via the
+        /// command setter, returning a scalar result
+        /// </summary>
+        /// <param name="cmdType">The command type</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="commandSetter">The command setter.</param>
+        /// <returns>The first column of the first row in the result set</returns>
+        public object ExecuteScalar(CommandType cmdType, string cmdText,
+                                    ICommandSetter commandSetter)
+        {
+            #region Instrumentation
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Executing ExecuteScalar. " + cmdType + "[" + cmdText + "]");
+            }
+            #endregion
+
+            return (int)Execute(new ExecuteScalarCallbackWithCommandSetter(cmdType, cmdText, commandSetter));
+
+        }
+
+        /// <summary>
+        /// Execute the query with a command created via IDbCommandCreator and
+        /// parameters
+        /// </summary>
+        /// <remarks>Output parameters can be retrieved via the returned
+        /// dictionary.
+        /// <para>
+        /// More commonly used as a lower level support method within the framework,
+        /// for example for StoredProcedure/AdoScalar.
+        /// </para></remarks>
+        /// <param name="commandCreator">The callback to create a IDbCommand.</param>
+        /// <returns>A dictionary containing output parameters, if any</returns>
+        public IDictionary ExecuteScalar(IDbCommandCreator commandCreator)
+        {
+            return (IDictionary)Execute(commandCreator, new AdoStoredProcedureScalarCommandCallback());
+        }
+
+        #endregion
+
+        #region Query with RowCallback
+
+        /// <summary>
+        /// Execute a query given IDbCommand's type and text, reading a
+        /// single result set on a per-row basis with a <see cref="IRowCallback"/>.
+        /// </summary>
+        /// <param name="cmdType">The type of command</param>
+        /// <param name="cmdText">The text of the query.</param>
+        /// <param name="rowCallback">callback that will extract results
+        /// one row at a time.
+        /// </param>
+        public void QueryWithRowCallback(CommandType cmdType, string cmdText, IRowCallback rowCallback)
+        {
+            QueryWithResultSetExtractor(cmdType, cmdText, new RowCallbackResultSetExtractor(rowCallback));
+        }
+
+        /// <summary>
+        /// Execute a query given IDbCommand's type and text by
+        /// passing the created IDbCommand to a ICommandSetter implementation
+        /// that knows how to bind values to the IDbCommand, reading a
+        /// single result set on a per-row basis with a <see cref="IRowCallback"/>.
+        /// </summary>
+        /// <param name="cmdType">The type of command</param>
+        /// <param name="cmdText">The text of the query.</param>
+        /// <param name="rowCallback">callback that will extract results
+        /// one row at a time.
+        /// </param>
+        /// <param name="commandSetter">The command setter.</param>
+        public void QueryWithRowCallback(CommandType cmdType, string cmdText, IRowCallback rowCallback,
+                                         ICommandSetter commandSetter)
+        {
+            QueryWithResultSetExtractor(cmdType, cmdText, new RowCallbackResultSetExtractor(rowCallback), commandSetter);
+
+        }
+
+        /// <summary>
+        /// Execute a query given IDbCommand's type and text and provided parameter
+        /// information, reading a
+        /// single result set on a per-row basis with a <see cref="IRowCallback"/>.
+        /// </summary>
+        /// <param name="cmdType">The type of command</param>
+        /// <param name="cmdText">The text of the query.</param>
+        /// <param name="rowCallback">callback that will extract results
+        /// one row at a time.
+        /// </param>
+        /// <param name="parameterName">The name of the parameter to map.</param>
+        /// <param name="dbType">One of the database parameter type enumerations.</param>
+        /// <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        public void QueryWithRowCallback(CommandType cmdType, string cmdText, IRowCallback rowCallback,
+                                         string parameterName, Enum dbType, int size, object parameterValue)
+        {
+            QueryWithResultSetExtractor(cmdType, cmdText, new RowCallbackResultSetExtractor(rowCallback), parameterName, dbType, size, parameterValue);
+        }
+
+
+        public void QueryWithRowCallback(CommandType cmdType, string cmdText, IRowCallback rowCallback, IDbParameters parameters)
+        {
+            QueryWithResultSetExtractor(cmdType, cmdText, new RowCallbackResultSetExtractor(rowCallback), parameters);
+        }
+
+        #endregion
+
+        // RowCallback with Delegate Questionable for 1.1 since no anonymous delegates and there isn't a collecting parameter
+        // in the delegate method signature.
+
+        #region Query with RowCallback Delegate
+
+        public void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate)
+        {
+            QueryWithResultSetExtractor(cmdType, sql, new RowCallbackResultSetExtractor(rowCallbackDelegate));
+
+        }
+        public void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate, ICommandSetter commandSetter)
+        {
+            QueryWithResultSetExtractor(cmdType, sql, new RowCallbackResultSetExtractor(rowCallbackDelegate), commandSetter);
+
+        }
+
+        public void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate,
+                                                 string name, Enum dbType, int size, object parameterValue)
+        {
+            QueryWithResultSetExtractor(cmdType, sql, new RowCallbackResultSetExtractor(rowCallbackDelegate), name, dbType, size, parameterValue);
+
+        }
+
+        public void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate, IDbParameters parameters)
+        {
+            QueryWithResultSetExtractor(cmdType, sql, new RowCallbackResultSetExtractor(rowCallbackDelegate), parameters);
+
+        }
+
+
+
+        #endregion
+
+        #region Query with RowMapper
+
+        public IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper)
+        {
+            return (IList)QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapper));
+        }
+
+        public IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper, ICommandSetter commandSetter)
+        {
+
+            return (IList)QueryWithResultSetExtractor(cmdType, cmdText,
+                                                      new RowMapperResultSetExtractor(rowMapper), commandSetter);
+
+        }
+
+
+        public IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper,
+                                        string name, Enum dbType, int size, object parameterValue)
+        {
+            return (IList)QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapper), name, dbType, size, parameterValue);
+        }
+
+
+        public IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper, IDbParameters parameters)
+        {
+            return (IList)QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapper), parameters);
+        }
+
+
+        #endregion
+
+        #region Query With RowMapper Delegate
+
+        public IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate)
+        {
+            return (IList)QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapperDelegate));
+        }
+
+        public IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate, ICommandSetter commandSetter)
+        {
+            return (IList)QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapperDelegate), commandSetter);
+        }
+
+
+        public IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate,
+                                                string parameterName, Enum dbType, int size, object parameterValue)
+        {
+            return (IList)QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapperDelegate), parameterName, dbType, size, parameterValue);
+        }
+
+
+        public IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate,
+                                                IDbParameters parameters)
+        {
+            return (IList)QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor(rowMapperDelegate), parameters);
+        }
+
+        #endregion
+
+        #region Query with ResultSetExtractor
+
+        /// <summary>
+        /// Execute a query given static SQL/Stored Procedure name
+        /// and process a single result set with an instance of IResultSetExtractor
+        /// </summary>
+        /// <param name="cmdType">The type of command.</param>
+        /// <param name="sql">The SQL/Stored Procedure to execute</param>
+        /// <param name="rse">Object that will extract all rows of a result set</param>
+        /// <returns>An arbitrary result object, as returned by the IResultSetExtractor</returns>
+        public object QueryWithResultSetExtractor(CommandType cmdType, string sql, IResultSetExtractor rse)
+        {
+            AssertUtils.ArgumentNotNull(sql, "sql", "SQL must not be null");
+
+            //TODO check for parameter placeholders...
+
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Executing SQL [" + sql + "]");
+            }
+
+            return Execute(new QueryCallback(this, cmdType, sql, rse, null));
+
+        }
+
+        public object QueryWithResultSetExtractor(CommandType cmdType, string cmdText, IResultSetExtractor resultSetExtractor, ICommandSetter commandSetter)
+        {
+            AssertUtils.ArgumentNotNull(resultSetExtractor, "resultSetExtractor", "Result Set Extractor must not be null");
+            return Execute(new QueryCallbackWithCommandSetter(this, cmdType, cmdText,
+                                                              resultSetExtractor, commandSetter));
+        }
+
+
+        public object QueryWithResultSetExtractor(CommandType cmdType, string cmdText, IResultSetExtractor resultSetExtractor,
+                                                  string name, Enum dbType, int size, object parameterValue)
+        {
+            AssertUtils.ArgumentNotNull(resultSetExtractor, "resultSetExtractor", "Result Set Extractor must not be null");
+            return Execute(new QueryCallback(this, cmdType, cmdText, resultSetExtractor, CreateDbParameters(name, dbType, size, parameterValue)));
+        }
+
+        public object QueryWithResultSetExtractor(CommandType cmdType, string cmdText, IResultSetExtractor resultSetExtractor,
+                                                  IDbParameters parameters)
+        {
+            AssertUtils.ArgumentNotNull(resultSetExtractor, "resultSetExtractor", "Result Set Extractor must not be null");
+            return Execute(new QueryCallback(this, cmdType, cmdText, resultSetExtractor, parameters));
+        }
+
+
+        #endregion
+
+
+        #region Query with ResultSetExtractorDelegate
+
+        /// <summary>
+        /// Execute a query given static SQL/Stored Procedure name
+        /// and process a single result set with an instance of IResultSetExtractor
+        /// </summary>
+        /// <param name="cmdType">The type of command.</param>
+        /// <param name="sql">The SQL/Stored Procedure to execute</param>
+        /// <param name="resultSetExtractorDelegate">Delegate that will extract all rows of a result set</param>
+        /// <returns>An arbitrary result object, as returned by the IResultSetExtractor</returns>
+        public object QueryWithResultSetExtractorDelegate(CommandType cmdType, string sql, ResultSetExtractorDelegate resultSetExtractorDelegate)
+        {
+            AssertUtils.ArgumentNotNull(sql, "sql", "SQL must not be null");
+
+            //TODO check for parameter placeholders...
+
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Executing SQL [" + sql + "]");
+            }
+
+            return Execute(new QueryCallback(this, cmdType, sql, resultSetExtractorDelegate, null));
+
+        }
+
+        public object QueryWithResultSetExtractorDelegate(CommandType cmdType, string cmdText, ResultSetExtractorDelegate resultSetExtractorDelegate,
+                                                          ICommandSetter commandSetter)
+        {
+            AssertUtils.ArgumentNotNull(resultSetExtractorDelegate, "resultSetExtractorDelegate", "Result set extractor delegate must not be null");
+            return Execute(new QueryCallbackWithCommandSetter(this, cmdType, cmdText,
+                                                              resultSetExtractorDelegate, commandSetter));
+        }
+
+
+        public object QueryWithResultSetExtractorDelegate(CommandType cmdType, string cmdText, ResultSetExtractorDelegate resultSetExtractorDelegate,
+                                                          string name, Enum dbType, int size, object parameterValue)
+        {
+            AssertUtils.ArgumentNotNull(resultSetExtractorDelegate, "resultSetExtractorDelegate", "Result set extractor delegate must not be null");
+            return Execute(new QueryCallback(this, cmdType, cmdText, resultSetExtractorDelegate, CreateDbParameters(name, dbType, size, parameterValue)));
+        }
+
+        public object QueryWithResultSetExtractorDelegate(CommandType cmdType, string cmdText, ResultSetExtractorDelegate resultSetExtractorDelegate,
+                                                          IDbParameters parameters)
+        {
+            AssertUtils.ArgumentNotNull(resultSetExtractorDelegate, "resultSetExtractorDelegate", "Result set extractor delegate must not be null");
+            return Execute(new QueryCallback(this, cmdType, cmdText, resultSetExtractorDelegate, parameters));
+        }
+
+
+        #endregion
+
+        #region Query for Object
+
+        /// <summary>
+        /// Execute a query with the specified command text, mapping a single result
+        /// row to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapper">object that will map one object per row</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        public object QueryForObject(CommandType cmdType, string cmdText, IRowMapper rowMapper)
+        {
+            IList results = QueryWithRowMapper(cmdType, cmdText, rowMapper);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        /// <summary>
+        /// Execute a query with the specified command text and parameters set via the
+        /// command setter, mapping a single result row to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapper">object that will map one object per row</param>
+        /// <param name="commandSetter">The command setter.</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        public object QueryForObject(CommandType cmdType, string cmdText, IRowMapper rowMapper, ICommandSetter commandSetter)
+        {
+            IList results = QueryWithRowMapper(cmdType, cmdText, rowMapper, commandSetter);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        /// <summary>
+        /// Execute a query with the specified command text and parameters, mapping a single result row
+        /// to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapper">object that will map one object per row</param>
+        /// <param name="parameters">The parameter collection to use in the query.</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        public object QueryForObject(CommandType cmdType, string cmdText, IRowMapper rowMapper, IDbParameters parameters)
+        {
+            IList results = QueryWithRowMapper(cmdType, cmdText, rowMapper, parameters);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        /// <summary>
+        /// Execute a query with the specified command text and parameter, mapping a single result row
+        /// to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapper">object that will map one object per row</param>
+        /// <param name="parameterName">The name of the parameter to map.</param>
+        /// <param name="dbType">One of the database parameter type enumerations.</param>
+        /// <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        public object QueryForObject(CommandType cmdType, string cmdText, IRowMapper rowMapper, string parameterName, Enum dbType, int size,
+                                     object parameterValue)
+        {
+            IList results = QueryWithRowMapper(cmdType, cmdText, rowMapper, parameterName, dbType, size, parameterValue);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        #endregion
+
+        #region Query for ObjectDelegate
+
+        /// <summary>
+        /// Execute a query with the specified command text, mapping a single result
+        /// row to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapperDelegate">delegate that will map one object per row</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        public object QueryForObjectDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate)
+        {
+            IList results = QueryWithRowMapperDelegate(cmdType, cmdText, rowMapperDelegate);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+
+        /// <summary>
+        /// Execute a query with the specified command text and parameters set via the
+        /// command setter, mapping a single result row to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapperDelegate">delegate that will map one object per row</param>
+        /// <param name="commandSetter">The command setter.</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        public object QueryForObjectDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate, ICommandSetter commandSetter)
+        {
+            IList results = QueryWithRowMapperDelegate(cmdType, cmdText, rowMapperDelegate, commandSetter);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        /// <summary>
+        /// Execute a query with the specified command text and parameters, mapping a single result row
+        /// to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapperDelegate">delegate that will map one object per row</param>
+        /// <param name="parameters">The parameter collection to use in the query.</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        public object QueryForObjectDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate, IDbParameters parameters)
+        {
+            IList results = QueryWithRowMapperDelegate(cmdType, cmdText, rowMapperDelegate, parameters);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        /// <summary>
+        /// Execute a query with the specified command text and parameter, mapping a single result row
+        /// to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapperDelegate">delegate that will map one object per row</param>
+        /// <param name="parameterName">The name of the parameter to map.</param>
+        /// <param name="dbType">One of the database parameter type enumerations.</param>
+        /// <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        public object QueryForObjectDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate, string parameterName, Enum dbType, int size,
+                                             object parameterValue)
+        {
+            IList results = QueryWithRowMapperDelegate(cmdType, cmdText, rowMapperDelegate, parameterName, dbType, size, parameterValue);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        #endregion
+
+        #region Query with CommandCreator
+
+        public object QueryWithCommandCreator(IDbCommandCreator cc, IResultSetExtractor rse)
+        {
+            return QueryWithCommandCreator(cc, rse, null);
+        }
+        
+        public void QueryWithCommandCreator(IDbCommandCreator cc, IRowCallback rowCallback)
+        {
+            QueryWithCommandCreator(cc, rowCallback, null);
+        }
+
+        public IList QueryWithCommandCreator(IDbCommandCreator cc, IRowMapper rowMapper)
+        {
+            return QueryWithCommandCreator(cc, rowMapper, null);
+        }
+
+        public object QueryWithCommandCreator(IDbCommandCreator cc, IResultSetExtractor rse, IDictionary returnedParameters)
+        {
+            if (rse == null)
+            {
+                throw new ArgumentNullException("Result Set Extractor must not be null");
+            }
+
+            return Execute(cc, new AdoResultSetExtractorWithOutputParamsCommandCallback(this, rse, returnedParameters));
+        }
+
+        public void QueryWithCommandCreator(IDbCommandCreator cc, IRowCallback rowCallback, IDictionary returnedParameters)
+        {
+            if (rowCallback == null)
+            {
+                throw new ArgumentNullException("RowCallback must not be null");
+            }
+            Execute(cc, new AdoRowCallbackCommandCallback(this, rowCallback, returnedParameters));
+        }
+
+        public IList QueryWithCommandCreator(IDbCommandCreator cc, IRowMapper rowMapper, IDictionary returnedParameters)
+        {
+            if (rowMapper == null)
+            {
+                throw new ArgumentNullException("rowMapper must not be null");
+            }
+
+            return (IList)Execute(cc, new AdoRowMapperQueryCommandCallback(this, rowMapper, returnedParameters));
+        }
+
+
+
+
+        public IDictionary QueryWithCommandCreator(IDbCommandCreator cc, IList namedResultSetProcessors)
+        {
+            return (IDictionary)Execute(cc, new AdoResultProcessorsQueryCommandCallback(this, namedResultSetProcessors));
+        }
+
+        #endregion
+
+        // DataSet/DataTable related methods.
+
+        #region DataTable Create operations without parameters
+
+        public DataTable DataTableCreate(CommandType commandType, string sql)
+        {
+            DataTable dataTable = CreateDataTable();
+            DataTableFill(dataTable, commandType, sql);
+            return dataTable;
+        }
+
+        public DataTable DataTableCreate(CommandType commandType, string sql,
+                                         string tableMappingName)
+        {
+            DataTable dataTable = CreateDataTable();
+            DataTableFill(dataTable, commandType, sql, tableMappingName);
+            return dataTable;
+        }
+
+        public DataTable DataTableCreate(CommandType commandType, string sql,
+                                         ITableMapping tableMapping)
+        {
+            DataTable dataTable = CreateDataTable();
+            DataTableFill(dataTable, commandType, sql, tableMapping);
+            return dataTable;
+        }
+
+        public DataTable DataTableCreate(CommandType commandType, string sql,
+                                         ITableMapping tableMapping,
+                                         IDataAdapterSetter setter)
+        {
+            DataTable dataTable = CreateDataTable();
+            DataTableFill(dataTable, commandType, sql, tableMapping, setter);
+            return dataTable;
+        }
+
+        #endregion
+
+        #region DataTable Create operations with parameters
+
+        public DataTable DataTableCreateWithParams(CommandType commandType, string sql,
+                                                   IDbParameters parameters)
+        {
+            DataTable dataTable = CreateDataTable();
+            DataTableFillWithParams(dataTable, commandType, sql, parameters);
+            return dataTable;
+        }
+
+        public DataTable DataTableCreateWithParams(CommandType commandType, string sql,
+                                                   IDbParameters parameters,
+                                                   string tableMappingName)
+        {
+            DataTable dataTable = CreateDataTable();
+            DataTableFillWithParams(dataTable, commandType, sql, parameters, tableMappingName);
+            return dataTable;
+        }
+
+        public DataTable DataTableCreateWithParams(CommandType commandType, string sql,
+                                                   IDbParameters parameters,
+                                                   ITableMapping tableMapping)
+        {
+            DataTable dataTable = CreateDataTable();
+            DataTableFillWithParams(dataTable, commandType, sql, parameters, tableMapping);
+            return dataTable;
+        }
+
+        public DataTable DataTableCreateWithParams(CommandType commandType, string sql,
+                                                   IDbParameters parameters,
+                                                   ITableMapping tableMapping,
+                                                   IDataAdapterSetter dataAdapterSetter)
+        {
+            DataTable dataTable = CreateDataTable();
+            DataTableFillWithParams(dataTable, commandType, sql, parameters, tableMapping, dataAdapterSetter);
+            return dataTable;
+        }
+
+
+        #endregion
+
+        #region DataTable Fill operations without parameters
+        /// <summary>
+        /// Fill a  <see cref="DataTable"/> based on a select command that requires no parameters.
+        /// </summary>
+        /// <param name="dataTable">The <see cref="DataTable"/> to populate</param>
+        /// <param name="commandType">The type of command</param>
+        /// <param name="sql">SQL query to execute</param>
+        /// <returns>The number of rows successfully added to or refreshed in the  <see cref="DataTable"/></returns>
+        public int DataTableFill(DataTable dataTable, CommandType commandType, string sql)
+        {
+            ValidateFillArguments(dataTable, sql);
+
+            #region Instrumentation
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Executing DataTableFill " + commandType + "[" + sql + "]");
+            }
+            #endregion
+
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(null);
+            return (int)Execute(new DataAdapterFillCallback(dataTable,
+                                                            commandType, sql,
+                                                            mappingCollection, null, null, null));
+        }
+
+        public int DataTableFill(DataTable dataTable, CommandType commandType, string sql,
+                                 string tableMappingName)
+        {
+            ValidateFillArguments(dataTable, sql);
+
+            #region Instrumentation
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Executing DataTableFill " + commandType + "[" + sql + "] with table mapping name " + tableMappingName);
+            }
+            #endregion
+
+            if (tableMappingName == null)
+            {
+                tableMappingName = "Table";
+            }
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(new string[] { tableMappingName });
+            return (int)Execute(new DataAdapterFillCallback(dataTable,
+                                                            commandType, sql,
+                                                            mappingCollection, null, null, null));
+
+        }
+
+        public int DataTableFill(DataTable dataTable, CommandType commandType, string sql,
+                                 ITableMapping tableMapping)
+        {
+            ValidateFillArguments(dataTable, sql, tableMapping);
+            ITableMappingCollection mappingCollection = new DataTableMappingCollection();
+            mappingCollection.Add((object)tableMapping);
+
+            return (int)Execute(new DataAdapterFillCallback(dataTable,
+                                                            commandType, sql,
+                                                            mappingCollection, null, null, null));
+        }
+
+        public int DataTableFill(DataTable dataTable, CommandType commandType, string sql,
+                                 ITableMapping tableMapping,
+                                 IDataAdapterSetter setter)
+        {
+            ValidateFillArguments(dataTable, sql, tableMapping);
+            ITableMappingCollection mappingCollection = new DataTableMappingCollection();
+            mappingCollection.Add((object)tableMapping);
+            return (int)Execute(new DataAdapterFillCallback(dataTable,
+                                                            commandType, sql,
+                                                            mappingCollection, setter, null, null));
+        }
+
+
+        #endregion
+
+        #region DataTable Fill operations with parameters
+
+        public int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql,
+                                           IDbParameters parameters)
+        {
+            ValidateFillWithParameterArguments(dataTable, sql, parameters);
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(null);
+            return (int)Execute(new DataAdapterFillCallback(dataTable,
+                                                            commandType, sql,
+                                                            mappingCollection, null, null,
+                                                            parameters));
+        }
+
+        public int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql,
+                                           IDbParameters parameters,
+                                           string tableMappingName)
+        {
+            ValidateFillWithParameterArguments(dataTable, sql, parameters);
+            if (tableMappingName == null)
+            {
+                tableMappingName = "Table";
+            }
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(new string[] { tableMappingName });
+            return (int)Execute(new DataAdapterFillCallback(dataTable,
+                                                            commandType, sql,
+                                                            mappingCollection, null, null, parameters));
+        }
+
+        public int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql,
+                                           IDbParameters parameters,
+                                           ITableMapping tableMapping)
+        {
+            ValidateFillWithParameterArguments(dataTable, sql, parameters, tableMapping);
+            ITableMappingCollection mappingCollection = new DataTableMappingCollection();
+            mappingCollection.Add((object)tableMapping);
+            return (int)Execute(new DataAdapterFillCallback(dataTable,
+                                                            commandType, sql,
+                                                            mappingCollection, null, null, parameters));
+        }
+
+        public int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql,
+                                           IDbParameters parameters,
+                                           ITableMapping tableMapping,
+                                           IDataAdapterSetter dataAdapterSetter)
+        {
+            ValidateFillWithParameterArguments(dataTable, sql, parameters, tableMapping);
+            ITableMappingCollection mappingCollection = new DataTableMappingCollection();
+            mappingCollection.Add((object)tableMapping);
+            return (int)Execute(new DataAdapterFillCallback(dataTable,
+                                                            commandType, sql,
+                                                            mappingCollection, dataAdapterSetter, null, parameters));
+        }
+
+
+        #endregion
+
+        #region DataTable Update operations
+        //TODO conflict options...
+
+        public int DataTableUpdateWithCommandBuilder(DataTable dataTable,
+                                                     CommandType commandType,
+                                                     string selectSql,
+                                                     IDbParameters parameters,
+                                                     string tableName)
+        {
+            ValidateUpdateWithCommandBuilderArguments(dataTable, tableName, selectSql);
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(new string[] { tableName });
+            return (int)Execute(new DataAdapterUpdateWithCommandBuilderCallback(dataTable,
+                                                                                DbProvider.CreateCommandBuilder(),
+                                                                                mappingCollection,
+                                                                                commandType,
+                                                                                selectSql,
+                                                                                parameters,
+                                                                                null));
+        }
+
+        public int DataTableUpdateWithCommandBuilder(DataTable dataTable,
+                                                     CommandType commandType,
+                                                     string selectSql,
+                                                     IDbParameters parameters,
+                                                     string tableName,
+                                                     IDataAdapterSetter dataAdapterSetter)
+        {
+            ValidateUpdateWithCommandBuilderArguments(dataTable, tableName, selectSql);
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(new string[] { tableName });
+            return (int)Execute(new DataAdapterUpdateWithCommandBuilderCallback(dataTable,
+                                                                                DbProvider.CreateCommandBuilder(),
+                                                                                mappingCollection,
+                                                                                commandType,
+                                                                                selectSql,
+                                                                                parameters,
+                                                                                dataAdapterSetter));
+        }
+
+
+        public int DataTableUpdateWithCommandBuilder(DataTable dataTable,
+                                                     CommandType commandType,
+                                                     string selectSql,
+                                                     IDbParameters parameters,
+                                                     ITableMapping tableMapping,
+                                                     IDataAdapterSetter dataAdapterSetter)
+        {
+            ValidateUpdateWithCommandBuilderArguments(dataTable, tableMapping, selectSql);
+            ITableMappingCollection mappingCollection = new DataTableMappingCollection();
+            mappingCollection.Add(tableMapping);
+            return (int)Execute(new DataAdapterUpdateWithCommandBuilderCallback(dataTable,
+                                                                                DbProvider.CreateCommandBuilder(),
+                                                                                mappingCollection,
+                                                                                commandType,
+                                                                                selectSql,
+                                                                                parameters,
+                                                                                dataAdapterSetter));
+        }
+
+
+
+        public int DataTableUpdate(DataTable dataTable,
+                                   string tableName,
+                                   CommandType insertCommandtype, string insertSql, IDbParameters insertParameters,
+                                   CommandType updateCommandtype, string updateSql, IDbParameters updateParameters,
+                                   CommandType deleteCommandtype, string deleteSql, IDbParameters deleteParameters)
+        {
+            ValidateUpdateArguments(dataTable, tableName);
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(new string[] { tableName });
+            return DataTableUpdate(dataTable, mappingCollection,
+                                   insertCommandtype, insertSql, insertParameters,
+                                   updateCommandtype, updateSql, updateParameters,
+                                   deleteCommandtype, deleteSql, deleteParameters,
+                                   null);
+
+        }
+
+        public int DataTableUpdate(DataTable dataTable,
+                                   string tableName,
+                                   CommandType insertCommandtype, string insertSql, IDbParameters insertParameters,
+                                   CommandType updateCommandtype, string updateSql, IDbParameters updateParameters,
+                                   CommandType deleteCommandtype, string deleteSql, IDbParameters deleteParameters,
+                                   IDataAdapterSetter dataAdapterSetter)
+        {
+            ValidateUpdateArguments(dataTable, tableName);
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(new string[] { tableName });
+            return DataTableUpdate(dataTable, mappingCollection,
+                                   insertCommandtype, insertSql, insertParameters,
+                                   updateCommandtype, updateSql, updateParameters,
+                                   deleteCommandtype, deleteSql, deleteParameters,
+                                   dataAdapterSetter);
+        }
+
+        public int DataTableUpdate(DataTable dataTable,
+                                   ITableMapping tableMapping,
+                                   CommandType insertCommandtype, string insertSql, IDbParameters insertParameters,
+                                   CommandType updateCommandtype, string updateSql, IDbParameters updateParameters,
+                                   CommandType deleteCommandtype, string deleteSql, IDbParameters deleteParameters,
+                                   IDataAdapterSetter dataAdapterSetter)
+        {
+            ValidateUpdateArguments(dataTable, tableMapping);
+            ITableMappingCollection mappingCollection = new DataTableMappingCollection();
+
+            mappingCollection.Add((object)tableMapping);
+
+            return DataTableUpdate(dataTable, mappingCollection,
+                                   insertCommandtype, insertSql, insertParameters,
+                                   updateCommandtype, updateSql, updateParameters,
+                                   deleteCommandtype, deleteSql, deleteParameters,
+                                   dataAdapterSetter);
+
+
+        }
+
+
+
+        #endregion
+
+        #region DataSet Create operations without parameters
+
+        public DataSet DataSetCreate(CommandType commandType, string sql)
+        {
+            DataSet dataSet = CreateDataSet();
+            DataSetFill(dataSet, commandType, sql);
+            return dataSet;
+        }
+
+
+        public DataSet DataSetCreate(CommandType commandType, string sql,
+                                     string[] tableNames)
+        {
+            DataSet dataSet = CreateDataSet();
+            DataSetFill(dataSet, commandType, sql, tableNames);
+            return dataSet;
+        }
+
+        public DataSet DataSetCreate(CommandType commandType, string sql,
+                                     ITableMappingCollection tableMapping)
+        {
+            DataSet dataSet = CreateDataSet();
+            DataSetFill(dataSet, commandType, sql, tableMapping);
+            return dataSet;
+        }
+
+        public DataSet DataSetCreate(CommandType commandType, string sql,
+                                     ITableMappingCollection tableMapping,
+                                     IDataAdapterSetter setter)
+        {
+            DataSet dataSet = CreateDataSet();
+            DataSetFill(dataSet, commandType, sql, tableMapping, setter);
+            return dataSet;
+        }
+
+        public DataSet DataSetCreate(CommandType commandType, string sql,
+                                     ITableMappingCollection tableMapping,
+                                     IDataAdapterSetter setter,
+                                     IDataSetFillLifecycleProcessor fillLifecycleProcessor)
+        {
+            DataSet dataSet = CreateDataSet();
+            DataSetFill(dataSet, commandType, sql, tableMapping, setter, fillLifecycleProcessor);
+            return dataSet;
+        }
+        #endregion
+
+        #region DataSet Create operations with parameters
+
+        public DataSet DataSetCreateWithParams(CommandType commandType, string sql,
+                                               IDbParameters parameters)
+        {
+            DataSet dataSet = CreateDataSet();
+            DataSetFillWithParameters(dataSet, commandType, sql, parameters);
+            return dataSet;
+        }
+
+        public DataSet DataSetCreateWithParams(CommandType commandType, string sql,
+                                               IDbParameters parameters,
+                                               string[] tableNames)
+        {
+            DataSet dataSet = CreateDataSet();
+            DataSetFillWithParameters(dataSet, commandType, sql, parameters, tableNames);
+            return dataSet;
+        }
+
+        public DataSet DataSetCreateWithParams(CommandType commandType, string sql,
+                                               IDbParameters parameters,
+                                               ITableMappingCollection tableMapping)
+        {
+            DataSet dataSet = CreateDataSet();
+            DataSetFillWithParameters(dataSet, commandType, sql, parameters, tableMapping);
+            return dataSet;
+        }
+
+        public DataSet DataSetCreateWithParams(CommandType commandType, string sql,
+                                               IDbParameters parameters,
+                                               ITableMappingCollection tableMapping,
+                                               IDataAdapterSetter dataAdapterSetter)
+        {
+            DataSet dataSet = CreateDataSet();
+            DataSetFillWithParameters(dataSet, commandType, sql, parameters, tableMapping, dataAdapterSetter);
+            return dataSet;
+        }
+
+        public DataSet DataSetCreateWithParams(CommandType commandType, string sql,
+                                               IDbParameters parameters,
+                                               ITableMappingCollection tableMapping,
+                                               IDataAdapterSetter dataAdapterSetter,
+                                               IDataSetFillLifecycleProcessor fillLifecycleProcessor)
+        {
+            DataSet dataSet = CreateDataSet();
+            DataSetFillWithParameters(dataSet, commandType, sql, parameters, tableMapping, dataAdapterSetter, fillLifecycleProcessor);
+            return dataSet;
+        }
+
+        #endregion
+
+        #region DataSet Fill operations without parameters
+
+        public int DataSetFill(DataSet dataSet, CommandType commandType, string sql)
+        {
+            ValidateFillArguments(dataSet, sql);
+
+            #region Instrumentation
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Executing DataSetFill " + commandType + "[" + sql + "]");
+            }
+            #endregion
+
+
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(null);
+            return (int)Execute(new DataAdapterFillCallback(dataSet,
+                                                            commandType, sql,
+                                                            mappingCollection, null, null, null));
+        }
+
+
+
+        public int DataSetFill(DataSet dataSet, CommandType commandType, string sql, string[] tableNames)
+        {
+            ValidateFillArguments(dataSet, sql);
+
+            #region Instrumentation
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Executing DataSetFill " + commandType + "[" + sql + "] with table names " + tableNames);
+            }
+            #endregion
+
+            if (tableNames == null)
+            {
+                tableNames = new string[] { "Table" };
+            }
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(tableNames);
+            return (int)Execute(new DataAdapterFillCallback(dataSet,
+                                                            commandType, sql,
+                                                            mappingCollection, null, null, null));
+        }
+
+
+        public int DataSetFill(DataSet dataSet, CommandType commandType, string sql,
+                               ITableMappingCollection tableMapping)
+        {
+            ValidateFillArguments(dataSet, sql, tableMapping);
+            return (int)Execute(new DataAdapterFillCallback(dataSet,
+                                                            commandType, sql,
+                                                            tableMapping, null, null, null));
+
+        }
+
+        public int DataSetFill(DataSet dataSet, CommandType commandType, string sql,
+                               ITableMappingCollection tableMapping,
+                               IDataAdapterSetter setter)
+        {
+            ValidateFillArguments(dataSet, sql, tableMapping);
+            return (int)Execute(new DataAdapterFillCallback(dataSet,
+                                                            commandType, sql,
+                                                            tableMapping, setter, null, null));
+
+        }
+
+        public int DataSetFill(DataSet dataSet, CommandType commandType, string sql,
+                               ITableMappingCollection tableMapping,
+                               IDataAdapterSetter setter,
+                               IDataSetFillLifecycleProcessor fillLifecycleProcessor)
+        {
+            ValidateFillArguments(dataSet, sql, tableMapping);
+            return (int)Execute(new DataAdapterFillCallback(dataSet,
+                                                            commandType, sql,
+                                                            tableMapping, setter, fillLifecycleProcessor, null));
+
+        }
+
+        #endregion
+
+        #region DataSet Fill operations with parameters
+
+        public int DataSetFillWithParameters(DataSet dataSet, CommandType commandType, string sql,
+                                             IDbParameters parameters)
+        {
+            ValidateFillWithParameterArguments(dataSet, sql, parameters);
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(null);
+            return (int)Execute(new DataAdapterFillCallback(dataSet,
+                                                            commandType, sql,
+                                                            mappingCollection, null, null,
+                                                            parameters));
+        }
+
+        public int DataSetFillWithParameters(DataSet dataSet, CommandType commandType, string sql,
+                                             IDbParameters parameters,
+                                             string[] tableNames)
+        {
+            ValidateFillWithParameterArguments(dataSet, sql, parameters);
+            if (tableNames == null)
+            {
+                tableNames = new string[] { "Table" };
+            }
+            ITableMappingCollection tableMapping = DoCreateMappingCollection(tableNames);
+            return (int)Execute(new DataAdapterFillCallback(dataSet,
+                                                            commandType, sql,
+                                                            tableMapping, null, null, parameters));
+
+        }
+
+        public int DataSetFillWithParameters(DataSet dataSet, CommandType commandType, string sql,
+                                             IDbParameters parameters,
+                                             ITableMappingCollection tableMapping)
+        {
+            ValidateFillWithParameterArguments(dataSet, sql, parameters, tableMapping);
+            return (int)Execute(new DataAdapterFillCallback(dataSet,
+                                                            commandType, sql,
+                                                            tableMapping, null, null, parameters));
+        }
+
+        public int DataSetFillWithParameters(DataSet dataSet, CommandType commandType, string sql,
+                                             IDbParameters parameters,
+                                             ITableMappingCollection tableMapping,
+                                             IDataAdapterSetter dataAdapterSetter)
+        {
+            ValidateFillWithParameterArguments(dataSet, sql, parameters, tableMapping);
+            return (int)Execute(new DataAdapterFillCallback(dataSet,
+                                                            commandType, sql,
+                                                            tableMapping, dataAdapterSetter, null, parameters));
+        }
+
+        public int DataSetFillWithParameters(DataSet dataSet, CommandType commandType, string sql,
+                                             IDbParameters parameters,
+                                             ITableMappingCollection tableMapping,
+                                             IDataAdapterSetter dataAdapterSetter,
+                                             IDataSetFillLifecycleProcessor fillLifecycleProcessor)
+        {
+            ValidateFillWithParameterArguments(dataSet, sql, parameters, tableMapping);
+            return (int)Execute(new DataAdapterFillCallback(dataSet,
+                                                            commandType, sql,
+                                                            tableMapping, dataAdapterSetter, fillLifecycleProcessor, parameters));
+        }
+
+        #endregion
+
+        #region DataSet Update operations
+        public int DataSetUpdateWithCommandBuilder(DataSet dataSet,
+                                                   CommandType commandType,
+                                                   string selectSql,
+                                                   IDbParameters selectParameters,
+                                                   string tableName)
+        {
+            ValidateUpdateWithCommandBuilderArguments(dataSet, tableName, selectSql);
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(new string[] { tableName });
+            return (int)Execute(new DataAdapterUpdateWithCommandBuilderCallback(dataSet,
+                                                                                DbProvider.CreateCommandBuilder(),
+                                                                                mappingCollection,
+                                                                                commandType,
+                                                                                selectSql,
+                                                                                selectParameters,
+                                                                                null));
+        }
+
+        public int DataSetUpdateWithCommandBuilder(DataSet dataSet,
+                                                   CommandType commandType,
+                                                   string selectSql,
+                                                   IDbParameters selectParameters,
+                                                   string tableName,
+                                                   IDataAdapterSetter dataAdapterSetter)
+        {
+            ValidateUpdateWithCommandBuilderArguments(dataSet, tableName, selectSql);
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(new string[] { tableName });
+            return (int)Execute(new DataAdapterUpdateWithCommandBuilderCallback(dataSet,
+                                                                                DbProvider.CreateCommandBuilder(),
+                                                                                mappingCollection,
+                                                                                commandType,
+                                                                                selectSql,
+                                                                                selectParameters,
+                                                                                dataAdapterSetter));
+        }
+
+        public int DataSetUpdateWithCommandBuilder(DataSet dataSet,
+                                                   CommandType commandType,
+                                                   string selectSql,
+                                                   IDbParameters selectParameters,
+                                                   ITableMappingCollection mappingCollection,
+                                                   IDataAdapterSetter dataAdapterSetter)
+        {
+            ValidateUpdateWithCommandBuilderArguments(dataSet, mappingCollection, selectSql);
+            return (int)Execute(new DataAdapterUpdateWithCommandBuilderCallback(dataSet,
+                                                                                DbProvider.CreateCommandBuilder(),
+                                                                                mappingCollection,
+                                                                                commandType,
+                                                                                selectSql,
+                                                                                selectParameters,
+                                                                                dataAdapterSetter));
+        }
+
+        public int DataSetUpdate(DataSet dataSet,
+                                 string tableName,
+                                 IDbCommand insertCommand,
+                                 IDbCommand updateCommand,
+                                 IDbCommand deleteCommand)
+        {
+            ValidateUpdateArguments(dataSet, tableName);
+
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(new string[] { tableName });
+
+            return (int)Execute(new DataAdapterUpdateCallback(dataSet,
+                                                              mappingCollection,
+                                                              insertCommand,
+                                                              updateCommand,
+                                                              deleteCommand,
+                                                              null));
+        }
+
+        public int DataSetUpdate(DataSet dataSet,
+                                 string tableName,
+                                 CommandType insertCommandtype, string insertSql, IDbParameters insertParameters,
+                                 CommandType updateCommandtype, string updateSql, IDbParameters updateParameters,
+                                 CommandType deleteCommandtype, string deleteSql, IDbParameters deleteParameters)
+        {
+            ValidateUpdateArguments(dataSet, tableName);
+            IDbCommand insertCommand = null;
+            if (insertSql != null)
+            {
+                insertCommand = DbProvider.CreateCommand();
+                insertCommand.CommandType = insertCommandtype;
+                insertCommand.CommandText = insertSql;
+                ParameterUtils.CopyParameters(insertCommand, insertParameters);
+            }
+            IDbCommand updateCommand = null;
+            if (updateSql != null)
+            {
+                updateCommand = DbProvider.CreateCommand();
+                updateCommand.CommandType = updateCommandtype;
+                updateCommand.CommandText = updateSql;
+                ParameterUtils.CopyParameters(updateCommand, updateParameters);
+            }
+            IDbCommand deleteCommand = null;
+            if (deleteSql != null)
+            {
+                deleteCommand = DbProvider.CreateCommand();
+                deleteCommand.CommandType = deleteCommandtype;
+                deleteCommand.CommandText = deleteSql;
+                ParameterUtils.CopyParameters(deleteCommand, deleteParameters);
+            }
+            ITableMappingCollection mappingCollection = DoCreateMappingCollection(new string[] { tableName });
+
+            int returnVal = (int)Execute(new DataAdapterUpdateCallback(dataSet, mappingCollection,
+                                                                       insertCommand, updateCommand, deleteCommand, null));
+
+            if (insertSql != null)
+            {
+                ParameterUtils.CopyParameters(insertParameters, insertCommand);
+            }
+            if (updateSql != null)
+            {
+                ParameterUtils.CopyParameters(updateParameters, updateCommand);
+            }
+            if (deleteSql != null)
+            {
+                ParameterUtils.CopyParameters(deleteParameters, deleteCommand);
+            }
+            return returnVal;
+        }
+
+
+
+        public int DataSetUpdate(DataSet dataSet,
+                                 string tableName,
+                                 IDbCommand insertCommand,
+                                 IDbCommand updateCommand,
+                                 IDbCommand deleteCommand,
+                                 IDataAdapterSetter dataAdapterSetter)
+        {
+            ValidateUpdateArguments(dataSet, tableName);
+            ITableMappingCollection tableMapping = DoCreateMappingCollection(new string[] { tableName });
+            return (int)Execute(new DataAdapterUpdateCallback(dataSet,
+                                                              tableMapping,
+                                                              insertCommand,
+                                                              updateCommand,
+                                                              deleteCommand,
+                                                              dataAdapterSetter));
+        }
+
+
+        public int DataSetUpdate(DataSet dataSet,
+                                 ITableMappingCollection tableMapping,
+                                 IDbCommand insertCommand,
+                                 IDbCommand updateCommand,
+                                 IDbCommand deleteCommand)
+        {
+            ValidateUpdateArguments(dataSet, tableMapping);
+            return (int)Execute(new DataAdapterUpdateCallback(dataSet,
+                                                              tableMapping,
+                                                              insertCommand,
+                                                              updateCommand,
+                                                              deleteCommand,
+                                                              null));
+        }
+
+        public int DataSetUpdate(DataSet dataSet,
+                                 ITableMappingCollection tableMapping,
+                                 IDbCommand insertCommand,
+                                 IDbCommand updateCommand,
+                                 IDbCommand deleteCommand,
+                                 IDataAdapterSetter dataAdapterSetter)
+        {
+            ValidateUpdateArguments(dataSet, tableMapping);
+            return (int)Execute(new DataAdapterUpdateCallback(dataSet,
+                                                              tableMapping,
+                                                              insertCommand,
+                                                              updateCommand,
+                                                              deleteCommand,
+                                                              dataAdapterSetter));
+        }
+
+        #endregion
+
+        #region Parameter Creation Helper Methods
+
+        public override IDataParameter[] DeriveParameters(string procedureName, bool includeReturnParameter)
+        {
+            return (IDataParameter[])Execute(new DeriveParametersCommandCallback(DbProvider, procedureName, includeReturnParameter));
+
+        }
+
+        #endregion
+
+        #region Private Helper Methods
+
+        private IDbParameters CreateDbParameters(IDbDataParameter parameter)
+        {
+            IDbParameters parameters = new DbParameters(DbProvider);
+            parameters.AddParameter(parameter);
+            return parameters;
+        }
+
+        private IDbParameters CreateDbParameters(IList parameterList)
+        {
+            IDbParameters parameters = null;
+            if (parameterList != null)
+            {
+                parameters = new DbParameters(DbProvider);
+                foreach (IDbDataParameter parameter in parameterList)
+                {
+                    parameters.AddParameter(parameter);
+                }
+            }
+            return parameters;
+        }
+
+        private IDbParameters CreateDbParameters(object[] parameterValues)
+        {
+            IDbParameters parameters = null;
+            if (parameterValues != null)
+            {
+                parameters = new DbParameters(DbProvider);
+                foreach (object parameterValue in parameterValues)
+                {
+                    parameters.Add(parameterValue);
+                }
+            }
+            return parameters;
+        }
+
+        public int DataTableUpdate(DataTable dataTable,
+                                   ITableMappingCollection mappingCollection,
+                                   CommandType insertCommandtype, string insertSql, IDbParameters insertParameters,
+                                   CommandType updateCommandtype, string updateSql, IDbParameters updateParameters,
+                                   CommandType deleteCommandtype, string deleteSql, IDbParameters deleteParameters,
+                                   IDataAdapterSetter dataAdapterSetter)
+        {
+            //TODO - refactor to remove cut-n-pasted code.
+            IDbCommand insertCommand = null;
+            if (insertSql != null)
+            {
+                insertCommand = DbProvider.CreateCommand();
+                insertCommand.CommandType = insertCommandtype;
+                insertCommand.CommandText = insertSql;
+                ParameterUtils.CopyParameters(insertCommand, insertParameters);
+            }
+            IDbCommand updateCommand = null;
+            if (updateSql != null)
+            {
+                updateCommand = DbProvider.CreateCommand();
+                updateCommand.CommandType = updateCommandtype;
+                updateCommand.CommandText = updateSql;
+                ParameterUtils.CopyParameters(updateCommand, updateParameters);
+            }
+            IDbCommand deleteCommand = null;
+            if (deleteSql != null)
+            {
+                deleteCommand = DbProvider.CreateCommand();
+                deleteCommand.CommandType = deleteCommandtype;
+                deleteCommand.CommandText = deleteSql;
+                ParameterUtils.CopyParameters(deleteCommand, deleteParameters);
+            }
+
+            int returnVal = (int)Execute(new DataAdapterUpdateCallback(dataTable, mappingCollection,
+                                                                       insertCommand, updateCommand, deleteCommand, null));
+
+            if (insertSql != null)
+            {
+                ParameterUtils.CopyParameters(insertParameters, insertCommand);
+            }
+            if (updateSql != null)
+            {
+                ParameterUtils.CopyParameters(updateParameters, updateCommand);
+            }
+            if (deleteSql != null)
+            {
+                ParameterUtils.CopyParameters(deleteParameters, deleteCommand);
+            }
+            return returnVal;
+        }
+        #endregion
+
+        #region Protected Helper Methods
+
+        protected void InitExceptionTranslator()
+        {
+            if (exceptionTranslator == null)
+            {
+                IDbProvider provider = DbProvider;
+                if (provider != null)
+                {
+                    exceptionTranslator = new ErrorCodeExceptionTranslator(provider);
+                }
+                else
+                {
+                    exceptionTranslator = new FallbackExceptionTranslator();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Protected DataAdapter Helper methods
+
+        protected virtual DataTable CreateDataTable()
+        {
+            DataTable dataTable = new DataTable();
+            dataTable.Locale = CultureInfo.InvariantCulture;
+            return dataTable;
+        }
+
+        protected virtual DataSet CreateDataSet()
+        {
+            DataSet dataSet = new DataSet();
+            dataSet.Locale = CultureInfo.InvariantCulture;
+            return dataSet;
+        }
+
+        protected virtual void ValidateFillArguments(DataTable dataTable, string sql)
+        {
+            if (dataTable == null)
+            {
+                throw new ArgumentNullException("dataTable", "DataTable argument can not be null");
+            }
+            if (sql == null)
+            {
+                throw new ArgumentNullException("sql", "SQL for DataSet Fill operation can not be null");
+            }
+        }
+        protected virtual void ValidateFillArguments(DataSet dataSet, string sql)
+        {
+            if (dataSet == null)
+            {
+                throw new ArgumentNullException("dataSet", "DataSet argument can not be null");
+            }
+            if (sql == null)
+            {
+                throw new ArgumentNullException("sql", "SQL for DataSet Fill operation can not be null");
+            }
+        }
+        protected virtual void ValidateFillArguments(DataTable dataTable, string sql,
+                                                     ITableMapping tableMapping)
+        {
+            ValidateFillArguments(dataTable, sql);
+            if (tableMapping == null)
+            {
+                throw new ArgumentNullException("tableMapping", "ITableMapping for DataTable Fill operations can not be null");
+            }
+        }
+
+        protected virtual void ValidateFillArguments(DataSet dataSet, string sql,
+                                                     ITableMappingCollection tableMappingCollection)
+        {
+            ValidateFillArguments(dataSet, sql);
+            if (tableMappingCollection == null)
+            {
+                throw new ArgumentNullException("tableMappingCollection", "ITableMappingCollection for DataSet Fill operations can not be null");
+            }
+        }
+        protected virtual void ValidateFillWithParameterArguments(DataTable dataTable, string sql, IDbParameters parameters)
+        {
+            ValidateFillArguments(dataTable, sql);
+            if (parameters == null)
+            {
+                throw new ArgumentNullException("parameters", "IDbParameters for DataTable Fill operations can not be null");
+            }
+        }
+        protected virtual void ValidateFillWithParameterArguments(DataSet dataSet, string sql, IDbParameters parameters)
+        {
+            ValidateFillArguments(dataSet, sql);
+            if (parameters == null)
+            {
+                throw new ArgumentNullException("parameters", "IDbParameters for DataSet Fill operations can not be null");
+            }
+        }
+        protected virtual void ValidateFillWithParameterArguments(DataTable dataTable, string sql, IDbParameters parameters, ITableMapping tableMapping)
+        {
+            ValidateFillWithParameterArguments(dataTable, sql, parameters);
+            if (tableMapping == null)
+            {
+                throw new ArgumentNullException("tableMapping", "ITableMappingCollection for DataTable Fill operations can not be null");
+            }
+        }
+        protected virtual void ValidateFillWithParameterArguments(DataSet dataSet, string sql, IDbParameters parameters, ITableMappingCollection tableMapping)
+        {
+            ValidateFillWithParameterArguments(dataSet, sql, parameters);
+            if (tableMapping == null)
+            {
+                throw new ArgumentNullException("tableMapping", "ITableMappingCollection for DataSet Fill operations can not be null");
+            }
+        }
+
+        protected virtual void ValidateUpdateArguments(DataSet dataSet, ITableMappingCollection tableMapping)
+        {
+            if (dataSet == null)
+            {
+                throw new ArgumentNullException("dataSet", "DataSet argument can not be null for update operation");
+            }
+            if (tableMapping == null)
+            {
+                throw new ArgumentNullException("tableMapping", "TableMappings for DataSet Update operation can not be null");
+            }
+        }
+
+        protected virtual void ValidateUpdateArguments(DataSet dataSet, string tableName)
+        {
+            if (dataSet == null)
+            {
+                throw new ArgumentNullException("dataSet", "DataSet argument can not be null for update operation");
+            }
+            if (tableName == null)
+            {
+                throw new ArgumentNullException("tableName", "TableName for DataSet Update operation can not be null");
+            }
+        }
+
+        protected virtual void ValidateUpdateArguments(DataTable dataTable, ITableMapping tableMapping)
+        {
+            if (dataTable == null)
+            {
+                throw new ArgumentNullException("dataTable", "DataTable argument can not be null for DataTable update operation");
+            }
+            if (tableMapping == null)
+            {
+                throw new ArgumentNullException("tableMapping", "TableMapping for DataTable Update operation can not be null");
+            }
+        }
+        protected virtual void ValidateUpdateArguments(DataTable dataTable, string tableName)
+        {
+            if (dataTable == null)
+            {
+                throw new ArgumentNullException("dataTable", "DataTable argument can not be null for DataTable update operation");
+            }
+            if (tableName == null)
+            {
+                throw new ArgumentNullException("tableName", "TableName for DataTable Update operation can not be null");
+            }
+        }
+        protected virtual void ValidateUpdateWithCommandBuilderArguments(DataSet dataSet, ITableMappingCollection tableMapping, string selectSql)
+        {
+            if (dataSet == null)
+            {
+                throw new ArgumentNullException("dataSet", "DataSet can not be null for update operation");
+            }
+            if (tableMapping == null)
+            {
+                throw new ArgumentNullException("tableMapping", "TableMapping for DataSet Update operation can not be null");
+            }
+            if (selectSql == null)
+            {
+                throw new ArgumentNullException("selectSql", "SelectSql for DataSet Update operations can not be null");
+            }
+        }
+
+        protected virtual void ValidateUpdateWithCommandBuilderArguments(DataTable dataTable, string tableName, string selectSql)
+        {
+            if (dataTable == null)
+            {
+                throw new ArgumentNullException("dataTable", "DataTable can not be null for update operation");
+            }
+            if (tableName == null)
+            {
+                throw new ArgumentNullException("tableName", "TableName for DataSet Update operation can not be null");
+            }
+            if (selectSql == null)
+            {
+                throw new ArgumentNullException("selectSql", "SelectSql for DataSet Update operations can not be null");
+            }
+        }
+
+        protected virtual void ValidateUpdateWithCommandBuilderArguments(DataTable dataTable, ITableMapping tableMapping, string selectSql)
+        {
+            if (dataTable == null)
+            {
+                throw new ArgumentNullException("dataTable", "DataTable can not be null for update operation");
+            }
+            if (tableMapping == null)
+            {
+                throw new ArgumentNullException("tableMapping", "TableMapping for DataSet Update operation can not be null");
+            }
+            if (selectSql == null)
+            {
+                throw new ArgumentNullException("selectSql", "SelectSql for DataSet Update operations can not be null");
+            }
+        }
+        protected virtual void ValidateUpdateWithCommandBuilderArguments(DataSet dataSet, string tableName, string selectSql)
+        {
+            if (dataSet == null)
+            {
+                throw new ArgumentNullException("dataSet", "DataSet can not be null for update operation");
+            }
+            if (tableName == null)
+            {
+                throw new ArgumentNullException("tableName", "TableName for DataSet Update operation can not be null");
+            }
+            if (selectSql == null)
+            {
+                throw new ArgumentNullException("selectSql", "SelectSql for DataSet Update operations can not be null");
+            }
+        }
+
+
+        protected virtual ITableMappingCollection DoCreateMappingCollection(string[] dataSetTableNames)
+        {
+            DataTableMappingCollection mappingCollection;
+
+            if (dataSetTableNames == null)
+            {
+                dataSetTableNames = new string[] { "Table" };
+            }
+            foreach (string tableName in dataSetTableNames)
+            {
+                if (StringUtils.IsNullOrEmpty(tableName))
+                {
+                    throw new ArgumentException("TableName for DataTable mapping can not be null or empty");
+                }
+            }
+            mappingCollection = new DataTableMappingCollection();
+            int counter = 0;
+            foreach (string dataSetTableName in dataSetTableNames)
+            {
+                string sourceTableName;
+                if (counter == 0)
+                {
+                    sourceTableName = "Table";
+                }
+                else
+                {
+                    sourceTableName = "Table" + ++counter;
+                }
+                mappingCollection.Add(sourceTableName, dataSetTableName);
+            }
+            return mappingCollection;
+        }
+
+        #endregion
+
+        #region Private DataAdapter Helper callbacks
+
+
+
+        private class DataAdapterFillCallback : IDataAdapterCallback
+        {
+            private bool containsDataSet;
+            private DataSet dataSet;
+            private DataTable dataTable;
+            private CommandType commandType;
+            private string sql;
+            private ITableMappingCollection mappingCollection;
+            private IDataAdapterSetter dataAdapterSetter;
+            private IDataSetFillLifecycleProcessor fillLifecycleProcessor;
+            private IDbParameters parameters;
+
+            public DataAdapterFillCallback(DataSet dataSet,
+                                           CommandType commandType,
+                                           string sql,
+                                           ITableMappingCollection mappingCollection,
+                                           IDataAdapterSetter dataAdapterSetter,
+                                           IDataSetFillLifecycleProcessor fillLifecycleProcessor,
+                                           IDbParameters parameters)
+            {
+                containsDataSet = true;
+                this.dataSet = dataSet;
+                this.commandType = commandType;
+                this.sql = sql;
+                this.mappingCollection = mappingCollection;
+                this.dataAdapterSetter = dataAdapterSetter;
+                this.fillLifecycleProcessor = fillLifecycleProcessor;
+                this.parameters = parameters;
+            }
+
+            public DataAdapterFillCallback(DataTable dataTable,
+                                           CommandType commandType,
+                                           string sql,
+                                           ITableMappingCollection mappingCollection,
+                                           IDataAdapterSetter dataAdapterSetter,
+                                           IDataSetFillLifecycleProcessor fillLifecycleProcessor,
+                                           IDbParameters parameters)
+            {
+                containsDataSet = false;
+                this.dataTable = dataTable;
+                this.commandType = commandType;
+                this.sql = sql;
+                this.mappingCollection = mappingCollection;
+                this.dataAdapterSetter = dataAdapterSetter;
+                this.fillLifecycleProcessor = fillLifecycleProcessor;
+                this.parameters = parameters;
+            }
+
+
+
+            public object DoInDataAdapter(IDbDataAdapter dataAdapter)
+            {
+                dataAdapter.SelectCommand.CommandType = commandType;
+                dataAdapter.SelectCommand.CommandText = sql;
+                //TODO investigate performance of cloning....would need to change signature to
+                //     DataTableMapping[] otherwise...
+                foreach (DataTableMapping dataTableMapping in mappingCollection)
+                {
+                    dataAdapter.TableMappings.Add(((ICloneable)dataTableMapping).Clone());
+                }
+
+                ParameterUtils.CopyParameters(dataAdapter.SelectCommand, parameters);
+
+                //TODO Review these lifecycle hooks...
+                if (dataAdapterSetter != null)
+                {
+                    dataAdapterSetter.SetValues(dataAdapter);
+                }
+                if (fillLifecycleProcessor != null)
+                {
+                    fillLifecycleProcessor.BeforeFill(dataSet, dataAdapter.TableMappings);
+                }
+
+                int returnVal;
+                if (containsDataSet)
+                {
+                    returnVal = dataAdapter.Fill(dataSet);
+                }
+                else
+                {
+                    //TODO should query metadata to see if supports filling dataTable directly.
+                    if (dataAdapter is DbDataAdapter)
+                    {
+                        returnVal = ((DbDataAdapter)dataAdapter).Fill(dataTable);
+                    }
+                    else
+                    {
+                        //TODO could create DataSet and extract DataTable... for now just throw
+                        throw new DataException("Provider does not support filling DataTable directly");
+                    }
+                }
+
+                ParameterUtils.CopyParameters(parameters, dataAdapter.SelectCommand);
+
+                if (fillLifecycleProcessor != null)
+                {
+                    fillLifecycleProcessor.AfterFill(dataSet, dataAdapter.TableMappings);
+                }
+                return returnVal;
+            }
+        }
+
+
+        private class DataAdapterUpdateCallback : IDataAdapterCallback
+        {
+            private bool containsDataSet;
+            private DataSet dataSet;
+            private DataTable dataTable;
+            private ITableMappingCollection mappingCollection;
+            private IDbCommand insertCommand;
+            private IDbCommand updateCommand;
+            private IDbCommand deleteCommand;
+            private IDataAdapterSetter dataAdapterSetter;
+
+            public DataAdapterUpdateCallback(DataSet dataSet,
+                                             ITableMappingCollection mappingCollection,
+                                             IDbCommand insertCommand,
+                                             IDbCommand updateCommand,
+                                             IDbCommand deleteCommand,
+                                             IDataAdapterSetter dataAdapterSetter)
+            {
+                containsDataSet = true;
+                this.dataSet = dataSet;
+                this.mappingCollection = mappingCollection;
+                this.insertCommand = insertCommand;
+                this.updateCommand = updateCommand;
+                this.deleteCommand = deleteCommand;
+                this.dataAdapterSetter = dataAdapterSetter;
+            }
+
+            public DataAdapterUpdateCallback(DataTable dataTable,
+                                             ITableMappingCollection mappingCollection,
+                                             IDbCommand insertCommand,
+                                             IDbCommand updateCommand,
+                                             IDbCommand deleteCommand,
+                                             IDataAdapterSetter dataAdapterSetter)
+            {
+                containsDataSet = false;
+                this.dataTable = dataTable;
+                this.mappingCollection = mappingCollection;
+                this.insertCommand = insertCommand;
+                this.updateCommand = updateCommand;
+                this.deleteCommand = deleteCommand;
+                this.dataAdapterSetter = dataAdapterSetter;
+            }
+            #region IDataAdapterCallback Members
+
+            public object DoInDataAdapter(IDbDataAdapter dataAdapter)
+            {
+                //TODO - did not make copies of parameters...
+                if (insertCommand == null && updateCommand == null && deleteCommand == null)
+                {
+                    throw new ArgumentException("All commands for DataSet Update operation are null");
+                }
+
+                if (insertCommand != null)
+                {
+                    dataAdapter.InsertCommand = insertCommand;
+                    ApplyConnectionAndTx(dataAdapter.InsertCommand, dataAdapter.SelectCommand);
+                }
+                if (updateCommand != null)
+                {
+                    dataAdapter.UpdateCommand = updateCommand;
+                    ApplyConnectionAndTx(dataAdapter.UpdateCommand, dataAdapter.SelectCommand);
+                }
+                if (deleteCommand != null)
+                {
+                    dataAdapter.DeleteCommand = deleteCommand;
+                    ApplyConnectionAndTx(dataAdapter.DeleteCommand, dataAdapter.SelectCommand);
+                }
+                foreach (DataTableMapping dataTableMapping in mappingCollection)
+                {
+                    dataAdapter.TableMappings.Add(((ICloneable)dataTableMapping).Clone());
+                }
+
+                if (dataAdapterSetter != null)
+                {
+                    dataAdapterSetter.SetValues(dataAdapter);
+                }
+
+                if (containsDataSet)
+                {
+                    return dataAdapter.Update(dataSet);
+                }
+                else
+                {
+                    //TODO should query metadata to see if supports filling dataTable directly.
+                    if (dataAdapter is DbDataAdapter)
+                    {
+                        return ((DbDataAdapter)dataAdapter).Update(dataTable);
+                    }
+                    else
+                    {
+                        //TODO could create DataSet and extract DataTable... for now just throw
+                        throw new DataException("Provider does not support filling DataTable directly");
+                    }
+                }
+            }
+
+            private static void ApplyConnectionAndTx(IDbCommand dbCommand, IDbCommand sourceCommand)
+            {
+                dbCommand.Connection = sourceCommand.Connection;
+                dbCommand.Transaction = sourceCommand.Transaction;
+            }
+
+            #endregion
+
+        }
+
+        private class DataAdapterUpdateWithCommandBuilderCallback : IDataAdapterCallback
+        {
+            private bool containsDataSet;
+            private DataSet dataSet;
+            private DataTable dataTable;
+            private object commandBuilder;
+            private ITableMappingCollection mappingCollection;
+            private CommandType selectCommandType;
+            private string selectSql;
+            private IDbParameters selectParameters;
+            private IDataAdapterSetter dataAdapterSetter;
+
+            public DataAdapterUpdateWithCommandBuilderCallback(DataSet dataSet,
+                                                               object commandBuilder,
+                                                               ITableMappingCollection mappingCollection,
+                                                               CommandType selectCommandType,
+                                                               string selectSql,
+                                                               IDbParameters selectParameters,
+                                                               IDataAdapterSetter dataAdapterSetter)
+            {
+                containsDataSet = true;
+                this.dataSet = dataSet;
+                this.commandBuilder = commandBuilder;
+                this.mappingCollection = mappingCollection;
+                this.selectCommandType = selectCommandType;
+                this.selectSql = selectSql;
+                this.selectParameters = selectParameters;
+                this.dataAdapterSetter = dataAdapterSetter;
+            }
+
+            public DataAdapterUpdateWithCommandBuilderCallback(DataTable dataTable,
+                                                               object commandBuilder,
+                                                               ITableMappingCollection mappingCollection,
+                                                               CommandType selectCommandType,
+                                                               string selectSql,
+                                                               IDbParameters selectParameters,
+                                                               IDataAdapterSetter dataAdapterSetter)
+            {
+                containsDataSet = false;
+                this.dataTable = dataTable;
+                this.commandBuilder = commandBuilder;
+                this.mappingCollection = mappingCollection;
+                this.selectCommandType = selectCommandType;
+                this.selectSql = selectSql;
+                this.selectParameters = selectParameters;
+                this.dataAdapterSetter = dataAdapterSetter;
+            }
+            #region IDataAdapterCallback Members
+
+            public object DoInDataAdapter(IDbDataAdapter dataAdapter)
+            {
+                dataAdapter.SelectCommand.CommandType = selectCommandType;
+                dataAdapter.SelectCommand.CommandText = selectSql;
+                ParameterUtils.CopyParameters(dataAdapter.SelectCommand, selectParameters);
+
+
+                foreach (DataTableMapping dataTableMapping in mappingCollection)
+                {
+                    dataAdapter.TableMappings.Add(((ICloneable)dataTableMapping).Clone());
+                }
+
+                if (dataAdapterSetter != null)
+                {
+                    dataAdapterSetter.SetValues(dataAdapter);
+                }
+
+                //TODO consider refactoring to put this inside IDbMetadata
+                PropertyInfo selectCommandProperty = commandBuilder.GetType().GetProperty("DataAdapter",
+                                                                                          BindingFlags.DeclaredOnly |
+                                                                                          BindingFlags.GetProperty |
+                                                                                          BindingFlags.Public |
+                                                                                          BindingFlags.Instance
+                    );
+
+                selectCommandProperty.SetValue(commandBuilder, dataAdapter, null);
+
+                ParameterUtils.CopyParameters(selectParameters, dataAdapter.SelectCommand);
+                if (containsDataSet)
+                {
+                    return dataAdapter.Update(dataSet);
+                }
+                else
+                {
+                    //TODO should query metadata to see if supports filling dataTable directly.
+                    if (dataAdapter is DbDataAdapter)
+                    {
+                        return ((DbDataAdapter)dataAdapter).Update(dataTable);
+                    }
+                    else
+                    {
+                        //TODO could create DataSet and extract DataTable... for now just throw
+                        throw new DataException("Provider does not support filling DataTable directly");
+                    }
+                }
+            }
+
+            private static void ApplyConnectionAndTx(IDbCommand dbCommand, IDbCommand sourceCommand)
+            {
+                dbCommand.Connection = sourceCommand.Connection;
+                dbCommand.Transaction = sourceCommand.Transaction;
+            }
+
+            #endregion
+
+        }
+        #endregion
+
+        #region Private Helper Classes
+
+        private class AdoStoredProcedureScalarCommandCallback : ICommandCallback
+        {
+
+            public object DoInCommand(IDbCommand command)
+            {
+                IDictionary returnedResults = new Hashtable();
+                object scalar = command.ExecuteScalar();
+                ParameterUtils.ExtractOutputParameters(returnedResults, command);
+                returnedResults.Add("scalar", scalar);
+                return returnedResults;
+
+            }
+        }
+
+        private class AdoNonQueryWithOutputParamsCommandCallback : ICommandCallback
+        {
+
+            public object DoInCommand(IDbCommand command)
+            {
+                IDictionary returnedResults = new Hashtable();
+                int rowsAffected = command.ExecuteNonQuery();
+                ParameterUtils.ExtractOutputParameters(returnedResults, command);
+                returnedResults.Add("rowsAffected", rowsAffected);
+                return returnedResults;
+
+            }
+        }
+
+
+        private class AdoResultProcessorsQueryCommandCallback : ICommandCallback
+        {
+            private AdoTemplate adoTemplate;
+            private IList namedResultSetProcessors;
+            //private IDbParameters declaredParameters;
+
+            public AdoResultProcessorsQueryCommandCallback(AdoTemplate adoTemplate, IList namedResultSetProcessors)
+            {
+                //AssertUtils.ArgumentHasLength(namedResultSetProcessors, "namedResultSetProcessors");
+
+                this.adoTemplate = adoTemplate;
+                this.namedResultSetProcessors = namedResultSetProcessors;
+                //this.declaredParameters = declaredParameters;
+            }
+
+            public object DoInCommand(IDbCommand command)
+            {
+                IDictionary returnedResults = new Hashtable();
+                int resultSetIndex = 0;
+                IDataReader reader = null;
+                try
+                {
+                    reader = adoTemplate.CreateDataReaderWrapper(command.ExecuteReader());
+
+                    //TODO On >= .NET 2.0 platforms make use of DbDataReader.HasRows property to
+                    //     see if there is a result set.  now currently assuming matching
+                    //     NamedResultSetProcessor/ResultSet pairs.
+
+                    do
+                    {
+                        if (namedResultSetProcessors.Count == 0)
+                        {
+                            //We could just have output parameters and/or return value, that is, no result sets
+                            //If we didn't register a result set processor, it is likely that a result set wasn't expected.
+                            break;
+                        }
+                        NamedResultSetProcessor namedResultSetProcessor = null;
+                        try
+                        {
+                            namedResultSetProcessor
+                                = namedResultSetProcessors[resultSetIndex] as NamedResultSetProcessor;
+                            //Will only have possibility of run-time type error if using QueryWithCommandCreator
+                            if (namedResultSetProcessor == null)
+                            {
+                                LOG.Error("NamedResultSetProcessor for result set index " + resultSetIndex +
+                                          ", is not of expected type NamedResultSetProcessor.  Type = " +
+                                          namedResultSetProcessors[resultSetIndex].GetType() +
+                                          "; Skipping processing for this result set.");
+                                continue;
+                            }
+                        }
+                        catch (IndexOutOfRangeException e)
+                        {
+                            LOG.Error("No NamedResultSetProcessor associated with result set index " + resultSetIndex, e);
+                            continue;
+                        }
+                        catch (ArgumentOutOfRangeException e)
+                        {
+                            LOG.Error("No NamedResultSetProcessor associated with result set index " + resultSetIndex, e);
+                            continue;
+                        }
+
+
+                        string parameterName = namedResultSetProcessor.Name;
+                        if (namedResultSetProcessor.ResultSetProcessor is IResultSetExtractor)
+                        {
+                            IResultSetExtractor rse = (IResultSetExtractor)namedResultSetProcessor.ResultSetProcessor;
+                            object result = rse.ExtractData(reader);
+                            returnedResults.Add(parameterName, result);
+                        }
+                        else if (namedResultSetProcessor.ResultSetProcessor is IRowMapper)
+                        {
+                            IRowMapper rowMapper = (IRowMapper)namedResultSetProcessor.ResultSetProcessor;
+                            object result = (new RowMapperResultSetExtractor(rowMapper)).ExtractData(reader);
+                            returnedResults.Add(parameterName, result);
+                        }
+                        else if (namedResultSetProcessor.ResultSetProcessor is IRowCallback)
+                        {
+                            IRowCallback rowCallback = (IRowCallback)namedResultSetProcessor.ResultSetProcessor;
+                            (new RowCallbackResultSetExtractor(rowCallback)).ExtractData(reader);
+                            returnedResults.Add(parameterName, "ResultSet returned was processed by an IRowCallback");
+                        }
+                        resultSetIndex++;
+
+                    } while (reader.NextResult());
+                }
+                finally
+                {
+                    AdoUtils.CloseReader(reader);
+                }
+                ParameterUtils.ExtractOutputParameters(returnedResults, command);
+                return returnedResults;
+            }
+        }
+
+
+        private class DeriveParametersCommandCallback : ICommandCallback, ICommandTextProvider
+        {
+            private IDbProvider provider;
+            private string procedureName;
+            private bool includeReturnParameter;
+
+            public DeriveParametersCommandCallback(IDbProvider provider, string procedureName, bool includeReturnParameter)
+            {
+                this.provider = provider;
+                this.procedureName = procedureName;
+                this.includeReturnParameter = includeReturnParameter;
+            }
+
+            public string CommandText
+            {
+                get { return procedureName; }
+            }
+
+            public object DoInCommand(IDbCommand command)
+            {
+                command.CommandType = CommandType.StoredProcedure;
+                command.CommandText = procedureName;
+
+                //The DeriveParameter is static in all providers...it seems....
+                Type commandBuilderType = provider.DbMetadata.CommandBuilderType;
+                commandBuilderType.InvokeMember(provider.DbMetadata.CommandBuilderDeriveParametersMethod.Name,
+                                                BindingFlags.Static | BindingFlags.Public | BindingFlags.InvokeMethod, null, null,
+                                                new object[] { command });
+
+                if (command.Parameters.Count > 0)
+                {
+                    IDataParameter param = (IDataParameter)command.Parameters[0];
+                    if (param.Direction == ParameterDirection.ReturnValue)
+                    {
+                        if (!includeReturnParameter)
+                        {
+                            command.Parameters.RemoveAt(0);
+                        }
+                    }
+                }
+                return ParameterUtils.CloneParameters(command);
+            }
+        }
+
+        private class AdoRowCallbackCommandCallback : ICommandCallback
+        {
+            private AdoTemplate adoTemplate;
+            private IRowCallback rowCallback;
+            private IDictionary returnedParameters;
+
+            public AdoRowCallbackCommandCallback(AdoTemplate adoTemplate, IRowCallback rowCallback, IDictionary returnedParameters)
+            {
+                this.adoTemplate = adoTemplate;
+                this.rowCallback = rowCallback;
+                this.returnedParameters = returnedParameters;
+            }
+
+            public object DoInCommand(IDbCommand command)
+            {
+                //Extract the single returned result set
+                IDataReader reader = null;
+                try
+                {
+                    reader = adoTemplate.CreateDataReaderWrapper(command.ExecuteReader());
+                    rowCallback.ProcessRow(reader);
+                }
+                finally
+                {
+                    AdoUtils.CloseReader(reader);
+                }
+                ParameterUtils.ExtractOutputParameters(returnedParameters, command);
+                return null;
+            }
+        }
+        private class AdoResultSetExtractorWithOutputParamsCommandCallback : ICommandCallback
+        {
+            private AdoTemplate adoTemplate;
+            private IResultSetExtractor rse;
+            private IDictionary returnedParameters;
+
+            public AdoResultSetExtractorWithOutputParamsCommandCallback(AdoTemplate adoTemplate, IResultSetExtractor rse, IDictionary returnedParameters)
+            {
+                this.adoTemplate = adoTemplate;
+                this.rse = rse;
+                this.returnedParameters = returnedParameters;
+            }
+
+            public object DoInCommand(IDbCommand command)
+            {
+                object returnVal = null;
+                //Extract the single returned result set
+                IDataReader reader = null;
+                try
+                {
+                    reader = adoTemplate.CreateDataReaderWrapper(command.ExecuteReader());
+                    returnVal = rse.ExtractData(reader);
+                }
+                finally
+                {
+                    AdoUtils.CloseReader(reader);
+                }
+                ParameterUtils.ExtractOutputParameters(returnedParameters, command);
+                return returnVal;
+            }
+        }
+
+
+        private class AdoRowMapperQueryCommandCallback : ICommandCallback
+        {
+            private AdoTemplate adoTemplate;
+            private IRowMapper rowMapper;
+            //private IDbParameters declaredParameters;
+            private IDictionary returnedParameters;
+
+            public AdoRowMapperQueryCommandCallback(AdoTemplate adoTemplate, IRowMapper rowMapper, IDictionary returnedParameters)
+            {
+                this.adoTemplate = adoTemplate;
+                this.rowMapper = rowMapper;
+                //this.declaredParameters = declaredParameters;
+                this.returnedParameters = returnedParameters;
+            }
+
+            public object DoInCommand(IDbCommand command)
+            {
+                IList objectList = null;
+                //Extract the single returned result set
+                IDataReader reader = null;
+                try
+                {
+                    reader = adoTemplate.CreateDataReaderWrapper(command.ExecuteReader());
+                    RowMapperResultSetExtractor rse = new RowMapperResultSetExtractor(rowMapper, 1);
+                    objectList = (IList)rse.ExtractData(reader);
+                }
+                finally
+                {
+                    AdoUtils.CloseReader(reader);
+                }
+                ParameterUtils.ExtractOutputParameters(returnedParameters, command);
+                return objectList;
+            }
+        }
+
+
+        private class ExecuteNonQueryCallbackWithParameters : ICommandCallback, ICommandTextProvider
+        {
+            private CommandType commandType;
+            private string commandText;
+            private IDbParameters parameters;
+
+            public ExecuteNonQueryCallbackWithParameters(CommandType commandType, string commandText, IDbParameters dbParameters)
+            {
+                this.commandType = commandType;
+                this.commandText = commandText;
+                parameters = dbParameters;
+            }
+
+            public string CommandText
+            {
+                get { return commandText; }
+            }
+
+            public Object DoInCommand(IDbCommand command)
+            {
+                command.CommandType = commandType;
+                command.CommandText = commandText;
+                ParameterUtils.CopyParameters(command, parameters);
+                Object returnValue = command.ExecuteNonQuery();
+                ParameterUtils.CopyParameters(parameters, command);
+                return returnValue;
+            }
+
+        }
+
+
+        private class ExecuteNonQueryCallbackWithCommandSetter : ICommandCallback, ICommandTextProvider
+        {
+            private CommandType commandType;
+            private string commandText;
+            private ICommandSetter commandSetter;
+
+            public ExecuteNonQueryCallbackWithCommandSetter(CommandType commandType, string commandText, ICommandSetter commandSetter)
+            {
+                this.commandType = commandType;
+                this.commandText = commandText;
+                this.commandSetter = commandSetter;
+            }
+
+            public string CommandText
+            {
+                get { return commandText; }
+            }
+
+            public Object DoInCommand(IDbCommand command)
+            {
+                command.CommandType = commandType;
+                command.CommandText = commandText;
+                if (commandSetter != null)
+                {
+                    commandSetter.SetValues(command);
+                }
+                Object rowsAffected = command.ExecuteNonQuery();
+                if (LOG.IsDebugEnabled)
+                {
+                    LOG.Debug("ExecuteNonQuery affected " + rowsAffected + " rows");
+                }
+                return rowsAffected;
+            }
+
+        }
+
+
+        private class ExecuteScalarCallbackWithParameters : ICommandCallback, ICommandTextProvider
+        {
+            private CommandType commandType = CommandType.Text;
+            private string commandText;
+            private IDbParameters parameters;
+
+            public ExecuteScalarCallbackWithParameters(CommandType cmdType, string cmdText, IDbParameters dbParameters)
+            {
+                commandType = cmdType;
+                commandText = cmdText;
+                parameters = dbParameters;
+            }
+
+            public string CommandText
+            {
+                get { return commandText; }
+            }
+
+            public Object DoInCommand(IDbCommand command)
+            {
+                command.CommandType = commandType;
+                command.CommandText = commandText;
+                ParameterUtils.CopyParameters(command, parameters);
+                Object returnValue = command.ExecuteScalar();
+                ParameterUtils.CopyParameters(parameters, command);
+                return returnValue;
+            }
+        }
+
+        private class ExecuteScalarCallbackWithCommandSetter : ICommandCallback, ICommandTextProvider
+        {
+            private CommandType commandType;
+            private string commandText;
+            private ICommandSetter commandSetter;
+
+            public ExecuteScalarCallbackWithCommandSetter(CommandType commandType, string commandText, ICommandSetter commandSetter)
+            {
+                this.commandType = commandType;
+                this.commandText = commandText;
+                this.commandSetter = commandSetter;
+            }
+
+            public string CommandText
+            {
+                get { return commandText; }
+            }
+
+            public Object DoInCommand(IDbCommand command)
+            {
+                command.CommandType = commandType;
+                command.CommandText = commandText;
+                if (commandSetter != null)
+                {
+                    commandSetter.SetValues(command);
+                }
+                Object returnValue = command.ExecuteScalar();
+                if (LOG.IsDebugEnabled)
+                {
+                    LOG.Debug("ExecuteScalar return value = " + returnValue);
+                }
+                return returnValue;
+            }
+
+        }
+
+
+        private class ExecuteCommandCallbackUsingDelegate : ICommandCallback, ICommandTextProvider
+        {
+            private CommandDelegate del;
+            private string commandText;
+
+            public ExecuteCommandCallbackUsingDelegate(CommandDelegate d)
+            {
+                del = d;
+            }
+
+            public string CommandText
+            {
+                get { return commandText; }
+            }
+
+            public Object DoInCommand(IDbCommand command)
+            {
+                try
+                {
+                    return del(command);
+                }
+                catch (Exception e)
+                {
+                    e.GetType();
+                    commandText = command.CommandText;
+                    throw;
+                }
+            }
+        }
+
+
+
+        private class QueryCallbackWithCommandSetter : ICommandCallback, ICommandTextProvider
+        {
+            private AdoTemplate adoTemplate;
+            private IResultSetExtractor rse;
+            private ResultSetExtractorDelegate resultSetExtractorDelegate;
+            private ICommandSetter commandSetter;
+            private CommandType commandType;
+            private string commandText;
+
+            public QueryCallbackWithCommandSetter(AdoTemplate adoTemplate, CommandType cmdType, string cmdText, IResultSetExtractor rse, ICommandSetter commandSetter)
+            {
+                this.adoTemplate = adoTemplate;
+                commandType = cmdType;
+                commandText = cmdText;
+                this.rse = rse;
+                this.commandSetter = commandSetter;
+            }
+
+            public QueryCallbackWithCommandSetter(AdoTemplate adoTemplate, CommandType cmdType, string cmdText, ResultSetExtractorDelegate resultSetExtractorDelegate, ICommandSetter commandSetter)
+            {
+                this.adoTemplate = adoTemplate;
+                commandType = cmdType;
+                commandText = cmdText;
+                this.resultSetExtractorDelegate = resultSetExtractorDelegate;
+                this.commandSetter = commandSetter;
+            }
+
+            public string CommandText
+            {
+                get { return commandText; }
+            }
+
+            public object DoInCommand(IDbCommand command)
+            {
+                IDataReader reader = null;
+                try
+                {
+                    command.CommandType = commandType;
+                    command.CommandText = commandText;
+                    if (commandSetter != null)
+                    {
+                        commandSetter.SetValues(command);
+                    }
+                    reader = adoTemplate.CreateDataReaderWrapper(command.ExecuteReader());
+                    if (rse != null)
+                    {
+                        return rse.ExtractData(reader);
+                    }
+                    else
+                    {
+                        return resultSetExtractorDelegate(reader);
+                    }
+                }
+                finally
+                {
+                    AdoUtils.CloseReader(reader);
+                }
+            }
+
+        }
+
+        private class QueryCallback : ICommandCallback, ICommandTextProvider
+        {
+            private AdoTemplate adoTemplate;
+            private IResultSetExtractor rse;
+            private ResultSetExtractorDelegate resultSetExtractorDelegate;
+            private CommandType commandType;
+            private string commandText;
+            private IDbParameters parameters;
+
+            public QueryCallback(AdoTemplate adoTemplate, CommandType cmdType, string cmdText, IResultSetExtractor rse, IDbParameters dbParameters)
+            {
+                this.adoTemplate = adoTemplate;
+                commandType = cmdType;
+                commandText = cmdText;
+                this.rse = rse;
+                parameters = dbParameters;
+            }
+
+            public QueryCallback(AdoTemplate adoTemplate, CommandType cmdType, string cmdText, ResultSetExtractorDelegate resultSetExtractorDelegate, IDbParameters dbParameters)
+            {
+                this.adoTemplate = adoTemplate;
+                commandType = cmdType;
+                commandText = cmdText;
+                this.resultSetExtractorDelegate = resultSetExtractorDelegate;
+                parameters = dbParameters;
+            }
+
+
+            public string CommandText
+            {
+                get { return commandText; }
+            }
+
+            public object DoInCommand(IDbCommand command)
+            {
+                IDataReader reader = null;
+                try
+                {
+                    command.CommandType = commandType;
+                    command.CommandText = commandText;
+                    ParameterUtils.CopyParameters(command, parameters);
+                    reader = adoTemplate.CreateDataReaderWrapper(command.ExecuteReader());
+                    object returnValue;
+                    if (rse != null)
+                    {
+                        returnValue = rse.ExtractData(reader);
+                    }
+                    else
+                    {
+                        returnValue = resultSetExtractorDelegate(reader);
+                    }                    
+                    return returnValue;
+                }
+                finally
+                {
+                    AdoUtils.CloseReader(reader);
+                    ParameterUtils.CopyParameters(parameters, command);
+                }
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Creates the data reader wrapper for use in AdoTemplate callback methods.
+        /// </summary>
+        /// <param name="readerToWrap">The reader to wrap.</param>
+        /// <returns>The data reader used in AdoTemplate callbacks</returns>
+        public override IDataReader CreateDataReaderWrapper(IDataReader readerToWrap)
+        {
+            if (dataReaderWrapperType != null && newDataReaderWrapper != null)
+            {
+                IDataReaderWrapper wrapper = (IDataReaderWrapper) newDataReaderWrapper.Invoke(ObjectUtils.EmptyObjects);
+                wrapper.WrappedReader = readerToWrap;
+                return wrapper;
+            }
+            else
+            {
+                return readerToWrap;
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Core/RowMapperResultSetExtractor.cs b/src/Spring/Spring.Data/Data/Core/RowMapperResultSetExtractor.cs
new file mode 100644
index 00000000..67195813
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Core/RowMapperResultSetExtractor.cs
@@ -0,0 +1,137 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Collections;
+using Spring.Data.Support;
+
+#endregion
+
+namespace Spring.Data.Core
+{
+    /// <summary>
+    /// Adapter implementation of the ResultSetExtractor interface that delegates 
+    /// to a RowMapper which is supposed to create an object for each row.
+    /// Each object is added to the results List of this ResultSetExtractor.
+    /// </summary>
+    /// <remarks>
+    /// Useful for the typical case of one object per row in the database table.
+    /// The number of entries in the results list will match the number of rows.
+    /// <p>
+    /// Note that a RowMapper object is typically stateless and thus reusable;
+    /// just the RowMapperResultSetExtractor adapter is stateful.
+    /// </p>
+    /// <p>
+    /// As an alternative consider subclassing MappingAdoQuery from the 
+    /// Spring.Data.Objects namespace:  Instead of working with separate 
+    /// AdoTemplate and IRowMapper objects you can have executable
+    /// query objects (containing row-mapping logic) there.
+    /// </p>
+    /// </remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: RowMapperResultSetExtractor.cs,v 1.1 2007/08/03 19:51:11 markpollack Exp $</version>
+    public class RowMapperResultSetExtractor : IResultSetExtractor
+    {
+        #region Fields
+        
+        private IRowMapper rowMapper;
+
+        private RowMapperDelegate rowMapperDelegate;
+	    
+        private int rowsExpected;
+	    
+        #endregion
+
+        #region Constructor (s)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RowMapperResultSetExtractor"/> class.
+        /// </summary>
+        public RowMapperResultSetExtractor(IRowMapper rowMapper) : this(rowMapper,0, null)
+        {
+        }
+	    
+        public RowMapperResultSetExtractor(IRowMapper rowMapper, int rowsExpected) : this(rowMapper, rowsExpected, null)
+        {
+        }
+        public RowMapperResultSetExtractor(IRowMapper rowMapper, int rowsExpected, IDataReaderWrapper dataReaderWrapper)
+        {
+            //TODO use datareaderwrapper
+            if (rowMapper == null)
+            {
+                throw new ArgumentNullException("rowMapper");
+            }
+            this.rowMapper = rowMapper;
+            this.rowsExpected = rowsExpected;
+        }
+
+        public RowMapperResultSetExtractor(RowMapperDelegate rowMapperDelegate)
+            : this(rowMapperDelegate, 0, null)
+        {
+        }
+
+        public RowMapperResultSetExtractor(RowMapperDelegate rowMapperDelegate, int rowsExpected)
+            : this(rowMapperDelegate, rowsExpected, null)
+        {
+        }
+        public RowMapperResultSetExtractor(RowMapperDelegate rowMapperDelegate, int rowsExpected, IDataReaderWrapper dataReaderWrapper)
+        {
+            //TODO use datareaderwrapper
+            if (rowMapperDelegate == null)
+            {
+                throw new ArgumentNullException("rowMapperDelegate");
+            }
+            this.rowMapperDelegate = rowMapperDelegate;
+            this.rowsExpected = rowsExpected;
+        }
+
+        #endregion
+
+        #region IResultSetExtractor Members
+
+        public object ExtractData(System.Data.IDataReader reader)
+        {
+            // Use the more efficient collection if we know how many rows to expect:
+            // ArrayList in case of a known row count, LinkedList if unknown
+            IList results = (rowsExpected > 0) ? (IList) new ArrayList(rowsExpected) : new LinkedList();
+            int rowNum = 0;
+            if (rowMapper != null)
+            {
+                while (reader.Read())
+                {
+                    results.Add(rowMapper.MapRow(reader, rowNum++));
+                }  
+            }
+            else
+            {
+                while (reader.Read())
+                {
+                    results.Add(rowMapperDelegate(reader, rowNum++));
+                }
+            }
+
+            return results;
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs b/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs
new file mode 100644
index 00000000..532afacb
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs
@@ -0,0 +1,402 @@
+#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
+
+#if (!NET_1_0)
+
+#region Imports
+
+using System;
+using System.EnterpriseServices;
+using System.Threading;
+using Spring.Data.Support;
+using Spring.Objects.Factory;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data.Core
+{
+    /// <summary>
+    /// Transaction Manager that uses EnterpriseServices to access the
+    /// MS-DTC.  It requires the support of 'Services without Components'
+    /// functionality which is available on Win 2003 and Win XP SP2.
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ServiceDomainPlatformTransactionManager.cs,v 1.6 2007/12/04 19:43:16 markpollack Exp $</version>
+    public class ServiceDomainPlatformTransactionManager : AbstractPlatformTransactionManager, IInitializingObject
+    {
+        private IServiceDomainAdapter txAdapter;
+
+        private bool trackingEnabled = true;
+        private string trackingAppName = "Spring.NET";
+        private string trackingComponentName = "ServiceDomainPlatformTransactionManager";
+
+        #region Constructor (s)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ServiceDomainPlatformTransactionManager"/> class.
+        /// </summary>
+        public 	ServiceDomainPlatformTransactionManager()
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ServiceDomainPlatformTransactionManager"/> class.
+        /// </summary>
+        /// <remarks>This is indented only for unit testing purposes and should not be
+        /// called by production application code.</remarks>
+        /// <param name="txAdapter">The tx adapter.</param>
+        public ServiceDomainPlatformTransactionManager(IServiceDomainAdapter txAdapter)
+        {
+            this.txAdapter = txAdapter;
+        }
+
+        #endregion
+
+
+        /// <summary>
+        /// Gets or sets a value indicating whether tracking is enabled.
+        /// </summary>
+        /// <value><c>true</c> if tracking is enabled; otherwise, <c>false</c>.</value>
+        public bool TrackingEnabled
+        {
+            get { return trackingEnabled; }
+            set { trackingEnabled = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a text string that corresponds to the application ID under which tracker information is reported.
+        /// The default value is 'Spring.NET'
+        /// </summary>
+        /// <value>The name of the tracking app.</value>
+        public string TrackingAppName
+        {
+            get { return trackingAppName; }
+            set { trackingAppName = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a text string that corresponds to the context name under which tracker information is reported. 
+        /// </summary>
+        /// <value>The name of the tracking component.</value>
+        public string TrackingComponentName
+        {
+            get { return trackingComponentName; }
+            set { trackingComponentName = value; }
+        }
+
+        public void AfterPropertiesSet()
+        {
+            //TODO decide what should be validated for advanced configurations.
+        }
+
+        protected override object DoGetTransaction()
+        {
+            ServiceDomainTransactionObject txObject = new ServiceDomainTransactionObject();
+            if (txAdapter != null)
+            {
+                txObject.ServiceDomainAdapter = txAdapter;
+            }
+            return txObject;
+        }
+
+
+
+        protected override bool IsExistingTransaction(object transaction)
+        {
+            ServiceDomainTransactionObject txObject =  (ServiceDomainTransactionObject)transaction;
+            if (txObject.ServiceDomainAdapter.IsInTransaction)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        protected override void DoBegin(object transaction, ITransactionDefinition definition)
+        {
+            try
+            {
+                ServiceDomainTransactionObject txObject = (ServiceDomainTransactionObject)transaction;
+
+                DoServiceDomainBegin(txObject, definition);
+            }
+            catch (PlatformNotSupportedException ex)
+            {
+                throw new TransactionSystemException("ServiceDomain failure on begin of transaction.  Platform does not support EnterpriseServices 'Services without Components'", ex);
+            }
+            catch (Exception e)
+            {
+                throw new CannotCreateTransactionException("ServiceDomain failure on begin of transaction", e);
+            }
+        }
+
+        private void DoServiceDomainBegin(ServiceDomainTransactionObject serviceDomainTxObject, ITransactionDefinition definition)
+        {
+            SimpleServiceConfig serviceConfig = CreateServiceConfig(definition);
+            //The context is created when we call Enter.
+            serviceDomainTxObject.ServiceDomainAdapter.Enter(serviceConfig);
+            if (log.IsDebugEnabled)
+            {
+                log.Debug("Context created. TransactionId = " + ContextUtil.TransactionId
+                          + ", ActivityId = " + ContextUtil.ActivityId);
+            }
+        }
+
+        protected override object DoSuspend(object transaction)
+        {
+            // Passing the current transaction object, literally an 'object' as the 'suspended resource', 
+            // even though it is not used just to avoid passing null
+            // ServiceDomainPlatformTransactionManager is not binding any resources to the local thread, instead delegating to
+            // System.EnterpriseServices to handle thread local resources.
+            return transaction;
+        }
+
+        protected override void DoResume(object transaction, object suspendedResources)
+        {
+        }
+
+        private SimpleServiceConfig CreateServiceConfig(ITransactionDefinition definition)
+        {
+            SimpleServiceConfig serviceConfig = new SimpleServiceConfig();
+
+            //TODO investigate BringYourOwnTransaction and TipUrl properties of ServiceConfig
+            serviceConfig.TransactionDescription = definition.Name;
+
+            serviceConfig.TrackingEnabled = TrackingEnabled;
+            serviceConfig.TrackingAppName = TrackingAppName;
+            serviceConfig.TrackingComponentName = TrackingComponentName;
+
+            ApplyPropagationBehavior(serviceConfig, definition);
+
+            ApplyIsolationLevel(serviceConfig, definition);
+            
+            // infinite==-1 would cause transactions to be aborted immediately!
+            if(definition.TransactionTimeout != Timeout.Infinite)
+            {
+                serviceConfig.TransactionTimeout = definition.TransactionTimeout;
+            }
+            return serviceConfig;
+        }
+
+        protected void ApplyIsolationLevel(SimpleServiceConfig serviceConfig, ITransactionDefinition definition)
+        {
+            switch (definition.TransactionIsolationLevel)
+            {
+                    
+                case System.Data.IsolationLevel.Chaos:
+                    if (log.IsInfoEnabled)
+                    {
+                        log.Info("IsolationLevel Chaos does not have a direct counterpart in EnterpriseServices, using Any");
+                    }   
+                    serviceConfig.IsolationLevel = TransactionIsolationLevel.Any;
+                    break;
+                case System.Data.IsolationLevel.ReadCommitted:
+                    serviceConfig.IsolationLevel = TransactionIsolationLevel.ReadCommitted;
+                    break;
+                case System.Data.IsolationLevel.ReadUncommitted:
+                    serviceConfig.IsolationLevel = TransactionIsolationLevel.ReadUncommitted;
+                    break;
+                case System.Data.IsolationLevel.RepeatableRead:
+                    serviceConfig.IsolationLevel = TransactionIsolationLevel.RepeatableRead;
+                    break;
+                case System.Data.IsolationLevel.Serializable:
+                    serviceConfig.IsolationLevel = TransactionIsolationLevel.Serializable;
+                    break;
+#if NET_2_0
+                case System.Data.IsolationLevel.Snapshot:
+                    if (log.IsInfoEnabled)
+                    {
+                        log.Info("IsolationLevel Snapshot does not have a direct counterpart in EnterpriseServices, using ReadCommitted.  Introduced in SqlServer 2005.  Consider using System.Transactions for transaction management instead."); 
+                    }   
+                    serviceConfig.IsolationLevel = TransactionIsolationLevel.ReadCommitted;  //err on the side of consistency
+                    break;
+#endif
+                case System.Data.IsolationLevel.Unspecified:
+                    serviceConfig.IsolationLevel = TransactionIsolationLevel.Any;
+                    break;
+            }
+
+        }
+
+        protected void ApplyPropagationBehavior(SimpleServiceConfig serviceConfig, ITransactionDefinition definition)
+        {
+            if (definition.PropagationBehavior == TransactionPropagation.Required)
+            {
+                serviceConfig.TransactionOption = TransactionOption.Required;
+            }
+            else if (definition.PropagationBehavior == TransactionPropagation.RequiresNew)
+            {
+                serviceConfig.TransactionOption = TransactionOption.RequiresNew;
+            }
+            else if (definition.PropagationBehavior == TransactionPropagation.Supports)
+            {
+                serviceConfig.TransactionOption = TransactionOption.Supported;
+            }
+            else if (definition.PropagationBehavior == TransactionPropagation.NotSupported)
+            {
+                serviceConfig.TransactionOption = TransactionOption.NotSupported;
+            }
+            else if (definition.PropagationBehavior == TransactionPropagation.Never)
+            {
+                //TODO check the validity of this mapping
+                serviceConfig.TransactionOption = TransactionOption.Disabled;
+            } else
+            {
+                //TODO Should we throw an exception instead?
+                log.Warn("The requested transaction propagation option " +
+                         definition.PropagationBehavior + " is not supported.  " +
+                         "Defaulting to Never(Disabled) ");
+            }
+        }
+
+
+
+
+        protected override void DoCommit(DefaultTransactionStatus status)
+        {
+            ServiceDomainTransactionObject txObject = (ServiceDomainTransactionObject) status.Transaction;
+            bool globalRollbackOnly = status.GlobalRollbackOnly;
+            try
+            {
+                if (txObject.ServiceDomainAdapter.IsInTransaction)
+                {
+
+                    if (txObject.ServiceDomainAdapter.MyTransactionVote == TransactionVote.Commit)
+                    {
+                        txObject.ServiceDomainAdapter.SetComplete();
+                    }
+                    else
+                    {
+                        txObject.ServiceDomainAdapter.SetAbort();
+                    }                                  
+                }
+                TransactionStatus serviceDomainTxstatus = txObject.ServiceDomainAdapter.Leave();
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug("ServiceDomain Transaction Status upon leaving ServiceDomain = " + serviceDomainTxstatus);
+                }
+                txObject.TransactionStatus = serviceDomainTxstatus;
+                if (!globalRollbackOnly && serviceDomainTxstatus == TransactionStatus.Aborted)
+                {
+                    throw new UnexpectedRollbackException("Transaction unexpectedly rolled-back (maybe due to a timeout)");
+                }
+            }
+            catch (PlatformNotSupportedException ex)
+            {
+                throw new TransactionSystemException("Failure on Commit.  Platform does not support EnterpriseServices 'Services without Components'", ex); 
+            }
+            catch (Exception e)
+            {
+                throw new TransactionSystemException("Failure upon Leaving ServiceDomain (for Commit)", e);
+            }
+
+        }
+
+        protected override void DoRollback(DefaultTransactionStatus status)
+        {
+            ServiceDomainTransactionObject txObject = (ServiceDomainTransactionObject)status.Transaction;
+            if (txObject.ServiceDomainAdapter.IsInTransaction)
+            {
+                try
+                {
+                    txObject.ServiceDomainAdapter.SetAbort();
+                    txObject.ServiceDomainAdapter.Leave();
+                }
+                catch (PlatformNotSupportedException ex)
+                {
+                    throw new TransactionSystemException("Failure on Rollback.  Platform does not support EnterpriseServices 'Services without Components'", ex);
+                }
+                catch (Exception e)
+                {
+                    throw new Spring.Transaction.TransactionSystemException("Failure upon Leaving ServiceDomain (for Rollback)", e);
+                }
+            }
+        }
+
+        protected override void DoSetRollbackOnly(DefaultTransactionStatus status)
+        {
+            ServiceDomainTransactionObject txObject = (ServiceDomainTransactionObject)status.Transaction;
+            if (status.Debug)
+            {
+                log.Debug("Setting transaction rollback-only");
+            }
+            try
+            {
+                txObject.ServiceDomainAdapter.MyTransactionVote = TransactionVote.Abort;
+            }
+            catch (Exception ex)
+            {
+                throw new TransactionSystemException("Failure on System.Transactions.Transaction.Current.Rollback", ex);
+            }
+           
+        }
+
+        protected override bool ShouldCommitOnGlobalRollbackOnly
+        {
+            get { return true; }
+        }
+
+
+        public class ServiceDomainTransactionObject : ISmartTransactionObject
+        {
+            private TransactionStatus transactionStatus;
+            private IServiceDomainAdapter serviceDomainAdapter;
+
+
+            public ServiceDomainTransactionObject()
+            {
+                serviceDomainAdapter = new DefaultServiceDomainAdapter();
+            }
+
+            public IServiceDomainAdapter ServiceDomainAdapter
+            {
+                get { return serviceDomainAdapter; }
+                set { serviceDomainAdapter = value; }
+            }
+
+            public TransactionStatus TransactionStatus
+            {
+                get { return transactionStatus; }
+                set { transactionStatus = value; }
+            }
+
+            public bool RollbackOnly
+            {
+                get
+                {
+                    if ( serviceDomainAdapter.MyTransactionVote == TransactionVote.Abort)
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+    }
+}
+
+#endif // (!NET_1_0)
diff --git a/src/Spring/Spring.Data/Data/Core/TxScopeTransactionManager.cs b/src/Spring/Spring.Data/Data/Core/TxScopeTransactionManager.cs
new file mode 100644
index 00000000..342cb01f
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Core/TxScopeTransactionManager.cs
@@ -0,0 +1,284 @@
+#if NET_2_0
+
+#region License
+
+/*
+ * Copyright 2007 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.Transactions;
+using Spring.Data.Support;
+using Spring.Objects.Factory;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+namespace Spring.Data.Core
+{
+    /// <summary>
+    /// TransactionManager that uses TransactionScope provided by System.Transactions.
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: TxScopeTransactionManager.cs,v 1.5 2007/12/04 19:43:16 markpollack Exp $</version>    
+    public class TxScopeTransactionManager : AbstractPlatformTransactionManager, IInitializingObject
+    {
+        private ITransactionScopeAdapter txAdapter;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TxScopeTransactionManager"/> class.
+        /// </summary>
+        public TxScopeTransactionManager()
+        {
+            
+        }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TxScopeTransactionManager"/> class.
+        /// </summary>
+        /// <remarks>This is indented only for unit testing purposes and should not be
+        /// called by production application code.</remarks>
+        /// <param name="txAdapter">The tx adapter.</param>
+        public TxScopeTransactionManager(ITransactionScopeAdapter txAdapter)
+        {
+            this.txAdapter = txAdapter;
+        }
+
+        #region IInitializingObject Members
+
+        /// <summary>
+        /// No-op initialization
+        /// </summary>
+        public void AfterPropertiesSet()
+        {
+            // placeholder for more advanced configurations.
+        }
+
+        #endregion
+
+        protected override object DoGetTransaction()
+        {
+            PromotableTxScopeTransactionObject txObject = new PromotableTxScopeTransactionObject();
+
+            if (txAdapter != null)
+            {
+                txObject.TxScopeAdapter = txAdapter;
+            }
+            return txObject;
+        }
+
+        protected override bool IsExistingTransaction(object transaction)
+        {
+            PromotableTxScopeTransactionObject txObject =
+                (PromotableTxScopeTransactionObject)transaction;
+            return txObject.TxScopeAdapter.IsExistingTransaction;                       
+        }
+
+        protected override void DoBegin(object transaction, Spring.Transaction.ITransactionDefinition definition)
+        {
+            PromotableTxScopeTransactionObject txObject =
+                (PromotableTxScopeTransactionObject)transaction;
+            try
+            {
+                DoTxScopeBegin(txObject, definition);
+            }
+            catch (Exception e)
+            {
+                throw new CannotCreateTransactionException("Transaction Scope failure on begin", e);
+            }
+        }
+
+        protected override object DoSuspend(object transaction)
+        {
+            // Passing the current TxScopeAdapter as the 'suspended resource', even though it is not used just to avoid passing null
+            // TxScopeTransactionManager is not binding any resources to the local thread, instead delegating to
+            // System.Transactions to handle thread local resources.
+            PromotableTxScopeTransactionObject txMgrStateObject = (PromotableTxScopeTransactionObject) transaction;
+            return txMgrStateObject.TxScopeAdapter;
+        }
+        
+        protected override void DoResume(object transaction, object suspendedResources)
+        {
+        }
+
+        protected override void DoCommit(DefaultTransactionStatus status)
+        {
+            PromotableTxScopeTransactionObject txObject =
+                (PromotableTxScopeTransactionObject)status.Transaction;
+            try
+            {
+                txObject.TxScopeAdapter.Complete();
+                txObject.TxScopeAdapter.Dispose();
+            }
+            catch (TransactionAbortedException ex)
+            {
+                throw new UnexpectedRollbackException("Transaction unexpectedly rolled back (maybe due to a timeout)", ex);
+            }
+            catch (TransactionInDoubtException ex)
+            {
+                throw new HeuristicCompletionException(TransactionOutcomeState.Unknown, ex);
+            }
+            catch (Exception ex)
+            {
+                throw new TransactionSystemException("Failure on Transaction Scope Commit", ex);
+            }
+        }
+
+        protected override void DoRollback(DefaultTransactionStatus status)
+        {
+            PromotableTxScopeTransactionObject txObject =
+                (PromotableTxScopeTransactionObject)status.Transaction;
+
+            try
+            {
+                
+                txObject.TxScopeAdapter.Dispose();
+            }
+            catch (Exception e)
+            {
+                throw new Spring.Transaction.TransactionSystemException("Failure on Transaction Scope rollback.", e);
+            }
+        }
+
+
+        protected override void DoSetRollbackOnly(DefaultTransactionStatus status)
+        {
+            if (status.Debug)
+            {
+                log.Debug("Setting transaction rollback-only");
+            }
+            try
+            {
+                System.Transactions.Transaction.Current.Rollback();
+            } catch (Exception ex)
+            {
+                throw new TransactionSystemException("Failure on System.Transactions.Transaction.Current.Rollback", ex);
+            }
+        }
+
+        protected override bool ShouldCommitOnGlobalRollbackOnly
+        {
+            get { return true; }
+        }
+
+        private void DoTxScopeBegin(PromotableTxScopeTransactionObject txObject, 
+                                    Spring.Transaction.ITransactionDefinition definition)
+        {
+
+            TransactionScopeOption txScopeOption = CreateTransactionScopeOptions(definition);     
+            TransactionOptions txOptions = CreateTransactionOptions(definition);
+            txObject.TxScopeAdapter.CreateTransactionScope(txScopeOption, txOptions, definition.EnterpriseServicesInteropOption);            
+            
+        }
+
+        private static TransactionOptions CreateTransactionOptions(ITransactionDefinition definition)
+        {
+            TransactionOptions txOptions = new TransactionOptions();
+            switch (definition.TransactionIsolationLevel )
+            {
+                case System.Data.IsolationLevel.Chaos:
+                    txOptions.IsolationLevel = IsolationLevel.Chaos;
+                    break;
+                case System.Data.IsolationLevel.ReadCommitted:
+                    txOptions.IsolationLevel = IsolationLevel.ReadCommitted;
+                    break;
+                case System.Data.IsolationLevel.ReadUncommitted:
+                    txOptions.IsolationLevel = IsolationLevel.ReadUncommitted;
+                    break;
+                case System.Data.IsolationLevel.RepeatableRead:
+                    txOptions.IsolationLevel = IsolationLevel.RepeatableRead;
+                    break;
+                case System.Data.IsolationLevel.Serializable:
+                    txOptions.IsolationLevel = IsolationLevel.Serializable;
+                    break;
+                case System.Data.IsolationLevel.Snapshot:
+                    txOptions.IsolationLevel = IsolationLevel.Snapshot;
+                    break;
+                case System.Data.IsolationLevel.Unspecified:
+                    txOptions.IsolationLevel = IsolationLevel.Unspecified;
+                    break;
+            }
+
+            if (definition.TransactionTimeout != DefaultTransactionDefinition.TIMEOUT_DEFAULT)
+            {                
+                txOptions.Timeout = new TimeSpan(0, 0, definition.TransactionTimeout);
+            }
+            return txOptions;
+        }
+
+        private static TransactionScopeOption CreateTransactionScopeOptions(ITransactionDefinition definition)
+        {
+            TransactionScopeOption txScopeOption;
+            if (definition.PropagationBehavior == TransactionPropagation.Required)
+            {
+                txScopeOption = TransactionScopeOption.Required;
+            }
+            else if (definition.PropagationBehavior == TransactionPropagation.RequiresNew)
+            {
+                txScopeOption = TransactionScopeOption.RequiresNew;
+            }
+            else
+            {
+                throw new Spring.Transaction.TransactionSystemException("Transaction Propagation Behavior" +
+                                                                        definition.PropagationBehavior +
+                                                                        " not supported by TransactionScope.  Use Required or RequiredNew");
+            }
+            return txScopeOption;
+        }
+
+        /// <summary>
+        /// The transaction resource object that encapsulates the state and functionality
+        /// contained in TransactionScope and Transaction.Current via the ITransactionScopeAdapter 
+        /// property.
+        /// </summary>
+        public class PromotableTxScopeTransactionObject : ISmartTransactionObject
+        {
+            private ITransactionScopeAdapter txScopeAdapter;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="PromotableTxScopeTransactionObject"/> class.
+            /// Will create an instance of <see cref="DefaultTransactionScopeAdapter"/>.
+            /// </summary>
+            public PromotableTxScopeTransactionObject()
+            {
+                txScopeAdapter = new DefaultTransactionScopeAdapter();
+            }
+
+            /// <summary>
+            /// Gets or sets the transaction scope adapter.
+            /// </summary>
+            /// <value>The transaction scope adapter.</value>
+            public ITransactionScopeAdapter TxScopeAdapter
+            {
+                get { return txScopeAdapter; }
+                set { txScopeAdapter = value; }
+            }
+
+
+            /// <summary>
+            /// Return whether the transaction is internally marked as rollback-only.
+            /// </summary>
+            /// <value></value>
+            /// <returns>True of the transaction is marked as rollback-only.</returns>
+            public bool RollbackOnly
+            {
+                get {
+                    return txScopeAdapter.RollbackOnly;
+                } 
+            }
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs b/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs
new file mode 100644
index 00000000..99264e21
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs
@@ -0,0 +1,153 @@
+#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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Data;
+using Spring.Dao.Support;
+using Spring.Data.Common;
+using Spring.Data.Support;
+
+#endregion
+
+namespace Spring.Data.Generic
+{
+    /// <summary>
+    /// Convenient super class for ADO.NET data access objects using generics.
+    /// </summary>
+    /// <remarks>
+    /// Requires a IDBProvider to be set, providing a
+    /// AdoTemplate based on it to subclasses.
+    /// This base class is mainly intended for AdoTemplate usage.
+    /// </remarks>
+    public class AdoDaoSupport : DaoSupport
+    {
+        private AdoTemplate adoTemplate;
+
+        /// <summary>
+        /// The DbProvider instance used by this DAO
+        /// </summary>
+        public IDbProvider DbProvider
+        {
+            set
+            {
+                adoTemplate = CreateAdoTemplate(value);
+            }
+            get
+            {
+                if (adoTemplate != null)
+                {
+                    return adoTemplate.DbProvider;
+                }
+                else
+                {
+                    return null;
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Set the AdoTemplate for this DAO explicity, as
+        /// an alternative to specifying a IDbProvider
+        /// </summary>
+        public AdoTemplate AdoTemplate
+        {
+            set
+            {
+                adoTemplate = value;
+            }
+            get
+            {
+                return adoTemplate;
+            }
+
+        }
+
+        protected override void CheckDaoConfig()
+        {
+            if (adoTemplate == null)
+            {
+                throw new ArgumentException("DbProvider or AdoTemplate is required");
+            }
+        }
+
+        protected IDbConnection Connection
+        {
+            get
+            {
+                return ConnectionUtils.GetConnection(DbProvider);
+            }
+        }
+
+        protected IAdoExceptionTranslator ExceptionTranslator
+        {
+            get
+            {
+                return null;  //Investigate AdoExceptionTranslator on AdoAccessor
+            }
+        }
+
+        protected void DisposeConnection(IDbConnection conn, IDbProvider dbProvider)
+        {
+            ConnectionUtils.DisposeConnection(conn, dbProvider);
+        }
+
+
+        /// <summary>
+        /// Create a AdoTemplate for a given DbProvider
+        /// Only invoked if populating the DAO with a DbProvider reference.
+        /// </summary>
+        /// <remarks>
+        /// Can be overriden in subclasses to provide AdoTemplate instances
+        /// with a different configuration, or a cusotm AdoTemplate subclass.       
+        /// </remarks>
+        /// <param name="dbProvider">The DbProvider to create a AdoTemplate for</param>        
+        protected virtual AdoTemplate CreateAdoTemplate(IDbProvider dbProvider)
+        {
+            return new AdoTemplate(dbProvider);
+        }
+
+        /// <summary>
+        /// Convenience method to create a parameters builder.
+        /// </summary>
+        /// <remarks>Virtual for sublcasses to override with custom
+        /// implementation.</remarks>
+        /// <returns>A new DbParameterBuilder</returns>
+        protected virtual IDbParametersBuilder CreateDbParametersBuilder()
+        {
+            return new DbParametersBuilder(DbProvider);
+        }
+        
+        protected virtual IDbParameters CreateDbParameters()
+        {
+            return AdoTemplate.CreateDbParameters();
+        }
+        
+        
+        
+        
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs b/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs
new file mode 100644
index 00000000..65eeb28c
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs
@@ -0,0 +1,1707 @@
+#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
+
+#if NET_2_0
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Common;
+using Common.Logging;
+using Spring.Dao;
+using Spring.Dao.Support.Generic;
+using Spring.Data.Common;
+using Spring.Data.Core;
+using Spring.Data.Support;
+using Spring.Util;
+
+namespace Spring.Data.Generic
+{
+    /// <summary>
+    /// This is the central class in the Spring.Data.Generic namespace.
+    /// It simplifies the use of ADO.NET and helps to avoid commons errors.
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AdoTemplate.cs,v 1.19 2007/12/07 22:56:22 markpollack Exp $</version>
+    public class AdoTemplate : AdoAccessor, IAdoOperations
+    {
+
+        #region Logging Definition
+
+        private static readonly ILog LOG = LogManager.GetLogger(typeof(AdoTemplate));
+
+        #endregion
+
+        #region Fields
+
+        private Core.AdoTemplate classicAdoTemplate;
+        protected Type dataReaderWrapperType;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoTemplate"/> class.
+        /// </summary>
+        public AdoTemplate()
+            : base()
+        {
+            classicAdoTemplate = new Core.AdoTemplate();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoTemplate"/> class.
+        /// </summary>
+        /// <param name="provider">The provider.</param>
+        public AdoTemplate(IDbProvider provider)
+        {
+            classicAdoTemplate = new Core.AdoTemplate(provider);
+            AfterPropertiesSet();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoTemplate"/> class.
+        /// </summary>
+        /// <param name="provider">The database provider.</param>
+        /// <param name="lazyInit">if set to <c>false</c>
+        /// lazily initialize the ErrorCodeExceptionTranslator.</param>
+        public AdoTemplate(IDbProvider provider, bool lazyInit)
+        {
+            classicAdoTemplate = new Core.AdoTemplate(provider, lazyInit);
+            AfterPropertiesSet();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoTemplate"/> class.
+        /// </summary>
+        /// <remarks>Useful if you have a subclass of Spring.Data.Core.AdoTemplate.</remarks>
+        /// <param name="classicAdoTemplate">The classic ADO template.</param>
+        public AdoTemplate(Core.AdoTemplate classicAdoTemplate)
+        {
+            this.classicAdoTemplate = classicAdoTemplate;
+            AfterPropertiesSet();
+        }
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// An instance of a DbProvider implementation.
+        /// </summary>
+        public override IDbProvider DbProvider
+        {
+            get { return classicAdoTemplate.DbProvider; }
+            set { classicAdoTemplate.DbProvider = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to lazily initialize the 
+        /// IAdoExceptionTranslator for this accessor, on first encounter of a 
+        /// exception from the data provider.  Default is "true"; can be switched to
+        /// "false" for initialization on startup.
+        /// </summary>
+        /// <value><c>true</c> if to lazy initialize the IAdoExceptionTranslator; 
+        /// otherwise, <c>false</c>.</value>
+        public override bool LazyInit
+        {
+            get { return classicAdoTemplate.LazyInit; }
+            set { classicAdoTemplate.LazyInit = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the exception translator. If no custom translator is provided, a default
+        /// <see cref="ErrorCodeExceptionTranslator"/> is used.
+        /// </summary>
+        /// <value>The exception translator.</value>
+        public override IAdoExceptionTranslator ExceptionTranslator
+        {
+            get { return classicAdoTemplate.ExceptionTranslator; }
+            set { classicAdoTemplate.ExceptionTranslator = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or set the System.Type to use to create an instance of IDataReaderWrapper 
+        /// for the purpose of having defaults values to use in case of DBNull values read 
+        /// from IDataReader.
+        /// </summary>
+        /// <value>The type of the data reader wrapper.</value>
+        public override Type DataReaderWrapperType
+        {
+            get { return classicAdoTemplate.DataReaderWrapperType; }
+            set { classicAdoTemplate.DataReaderWrapperType = value; }
+        }
+
+        /// <summary>
+        /// Gets the 'Classic' AdoTemplate in Spring.Data
+        /// </summary>
+        /// <remarks>
+        /// Useful to access methods that return non-generic collections.
+        /// </remarks>
+        /// <value>The 'Classic; AdoTemplate in Spring.Data.</value>
+        public Core.AdoTemplate ClassicAdoTemplate
+        {
+            get { return classicAdoTemplate; }
+        }
+
+        /// <summary>
+        /// Gets or sets the command timeout for IDbCommands that this AdoTemplate executes.  It also
+        /// sets the value of the contained 'ClassicAdoTemplate'.
+        /// </summary>
+        /// <value>The command timeout.</value>
+        /// <remarks>Default is 0, indicating to use the database provider's default.
+        /// Any timeout specified here will be overridden by the remaining
+        /// transaction timeout when executing within a transaction that has a
+        /// timeout specified at the transaction level.
+        /// </remarks>
+        public override int CommandTimeout
+        {
+            get { return commandTimeout; }
+            set
+            {
+                commandTimeout = value;
+                classicAdoTemplate.CommandTimeout = value;
+            }
+        }
+
+        #endregion
+
+        #region General Execute Callback methods
+
+        /// <summary>
+        /// Execute a ADO.NET operation on a command object using a interface based callback.
+        /// </summary>
+        /// <param name="action">the callback to execute</param>
+        /// <returns>object returned from callback</returns>
+        public T Execute<T>(ICommandCallback<T> action)
+        {
+            ConnectionTxPair connectionTxPairToUse = ConnectionUtils.GetConnectionTxPair(DbProvider);
+
+            IDbCommand command = null;
+            try
+            {
+                command = DbProvider.CreateCommand();
+                command.Connection = connectionTxPairToUse.Connection;
+                command.Transaction = connectionTxPairToUse.Transaction;
+                //TODO collect warnings...
+                //RegisterEventHandlers(command.Connection);
+                ApplyCommandSettings(command);
+                //TODO explicit check to cast to base class.
+                DbCommand commandToUse = command as DbCommand;
+                if (commandToUse != null)
+                {
+                    T result = action.DoInCommand((DbCommand)command);
+                    //SqlWarnings sqlWarnings = GetSqlWarnings()
+                    //ThrowExceptionOnWarningIfNotIgnoringWarnings(sqlWarnings);
+                    return result;
+                }
+                else
+                {
+                    throw new InvalidDataAccessApiUsageException(
+                        "Providers implementation of IDbCommand does not inherit from System.Data.Common.DbCommand.  Use the alternative overloaded Execute method that specifies IDbCommandCallback as a parameter.");
+                }
+
+            }
+            catch (Exception e)
+            {
+                AdoUtils.DisposeCommand(command);
+                command = null;
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+                connectionTxPairToUse.Connection = null;
+                if (DbProvider.IsDataAccessException(e))
+                {
+                    throw ExceptionTranslator.Translate("CommandCallback", GetCommandText(action), e);
+                }
+                else
+                {
+                    throw;
+                }
+
+
+            }
+            finally
+            {
+                AdoUtils.DisposeCommand(command);
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+            }
+        }
+
+        /// <summary>
+        /// Execute a ADO.NET operation on a command object using a delegate callback.
+        /// </summary>
+        /// <remarks>This allows for implementing arbitrary data access operations
+        /// on a single command within Spring's managed ADO.NET environment.</remarks>
+        /// <param name="del">The delegate called with a command object.</param>
+        /// <returns>A result object returned by the action or null</returns>
+        public T Execute<T>(CommandDelegate<T> del)
+        {
+            ConnectionTxPair connectionTxPairToUse = ConnectionUtils.GetConnectionTxPair(DbProvider);
+
+            IDbCommand command = null;
+            try
+            {
+                command = DbProvider.CreateCommand();
+                command.Connection = connectionTxPairToUse.Connection;
+                command.Transaction = connectionTxPairToUse.Transaction;
+                //TODO collect warnings...
+                //RegisterEventHandlers(command.Connection);
+                ApplyCommandSettings(command);
+                DbCommand commandToUse = command as DbCommand;
+                if (commandToUse != null)
+                {
+                    T result = del((DbCommand) command);
+                    //SqlWarnings sqlWarnings = GetSqlWarnings()
+                    //ThrowExceptionOnWarningIfNotIgnoringWarnings(sqlWarnings);
+                    return result;
+                }
+                else
+                {
+                    throw new InvalidDataAccessApiUsageException(
+                        "Providers implementation of IDbCommand does not inherit from System.Data.Common.DbCommand.  Use the alternative overloaded Execute method that specifies IDbCommandDelegate as a parameter.");
+                }            
+            }
+            catch (Exception e)
+            {
+                string commandText = command.CommandText;
+                AdoUtils.DisposeCommand(command);
+                command = null;
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+                connectionTxPairToUse.Connection = null;
+                if (DbProvider.IsDataAccessException(e))
+                {
+                    throw ExceptionTranslator.Translate("CommandCallback", commandText, e);
+                }
+                else
+                {
+                    throw;
+                }
+
+
+            }
+            finally
+            {
+                AdoUtils.DisposeCommand(command);
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+            }
+        }
+
+
+        /// <summary>
+        /// Execute a ADO.NET operation on a command object using a interface based callback.
+        /// </summary>
+        /// <param name="action">the callback to execute</param>
+        /// <returns>object returned from callback</returns>
+        public T Execute<T>(IDbCommandCallback<T> action)
+        {
+            ConnectionTxPair connectionTxPairToUse = ConnectionUtils.GetConnectionTxPair(DbProvider);
+
+            IDbCommand command = null;
+            try
+            {
+                command = DbProvider.CreateCommand();
+                command.Connection = connectionTxPairToUse.Connection;
+                command.Transaction = connectionTxPairToUse.Transaction;
+                //TODO collect warnings...
+                //RegisterEventHandlers(command.Connection);
+                ApplyCommandSettings(command);
+                T result = action.DoInCommand(command);
+                //SqlWarnings sqlWarnings = GetSqlWarnings()
+                //ThrowExceptionOnWarningIfNotIgnoringWarnings(sqlWarnings);
+                return result;
+            }
+            catch (Exception e)
+            {
+                AdoUtils.DisposeCommand(command);
+                command = null;
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+                connectionTxPairToUse.Connection = null;
+                if (DbProvider.IsDataAccessException(e))
+                {
+                    throw ExceptionTranslator.Translate("CommandCallback", GetCommandText(action), e);
+                }
+                else
+                {
+                    throw;
+                }
+
+
+            }
+            finally
+            {
+                AdoUtils.DisposeCommand(command);
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+            }
+        }
+
+        /// <summary>
+        /// Execute a ADO.NET operation on a command object using a delegate callback.
+        /// </summary>
+        /// <remarks>This allows for implementing arbitrary data access operations
+        /// on a single command within Spring's managed ADO.NET environment.</remarks>
+        /// <param name="del">The delegate called with a command object.</param>
+        /// <returns>A result object returned by the action or null</returns>
+        public T Execute<T>(IDbCommandDelegate<T> del)
+        {
+            ConnectionTxPair connectionTxPairToUse = ConnectionUtils.GetConnectionTxPair(DbProvider);
+
+            IDbCommand command = null;
+            try
+            {
+                command = DbProvider.CreateCommand();
+                command.Connection = connectionTxPairToUse.Connection;
+                command.Transaction = connectionTxPairToUse.Transaction;
+                //TODO collect warnings...
+                //RegisterEventHandlers(command.Connection);
+                ApplyCommandSettings(command);
+                T result = del(command);
+                //SqlWarnings sqlWarnings = GetSqlWarnings()
+                //ThrowExceptionOnWarningIfNotIgnoringWarnings(sqlWarnings);
+                return result;
+            }
+            catch (Exception e)
+            {
+                string commandText = command.CommandText;
+                AdoUtils.DisposeCommand(command);
+                command = null;
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+                connectionTxPairToUse.Connection = null;
+                if (DbProvider.IsDataAccessException(e))
+                {
+                    throw ExceptionTranslator.Translate("CommandCallback", commandText, e);
+                }
+                else
+                {
+                    throw;
+                }
+
+
+            }
+            finally
+            {
+                AdoUtils.DisposeCommand(command);
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+            }
+        }
+
+
+        /// <summary>
+        /// Executes ADO.NET operations on a command object, created by the provided IDbCommandCreator,
+        /// using the interface based callback IDbCommandCallback.
+        /// </summary>
+        /// <typeparam name="T">The type of object returned from the callback.</typeparam>
+        /// <param name="commandCreator">The command creator.</param>
+        /// <param name="action">The callback to execute based on IDbCommand</param>
+        /// <returns>
+        /// A result object returned by the action or null
+        /// </returns>
+        public T Execute<T>(IDbCommandCreator commandCreator, IDbCommandCallback<T> action)
+        {
+            AssertUtils.ArgumentNotNull(commandCreator, "commandCreator", "IDbCommandCreator must not be null");
+            AssertUtils.ArgumentNotNull(action, "action", "Callback object must not be null");
+            ConnectionTxPair connectionTxPairToUse = ConnectionUtils.GetConnectionTxPair(DbProvider);
+
+            IDbCommand command = null;
+            try
+            {
+                command = commandCreator.CreateDbCommand(DbProvider);
+                command.Connection = connectionTxPairToUse.Connection;
+                command.Transaction = connectionTxPairToUse.Transaction;
+                //TODO collect warnings...
+                //RegisterEventHandlers(command.Connection);
+                ApplyCommandSettings(command);
+                T result = action.DoInCommand(command);
+                //SqlWarnings sqlWarnings = GetSqlWarnings()
+                //ThrowExceptionOnWarningIfNotIgnoringWarnings(sqlWarnings);
+                return result;
+            }
+            catch (Exception e)
+            {
+                AdoUtils.DisposeCommand(command);
+                command = null;
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+                connectionTxPairToUse.Connection = null;
+                if (DbProvider.IsDataAccessException(e))
+                {
+                    throw ExceptionTranslator.Translate("CommandCallback", GetCommandText(action), e);
+                }
+                else
+                {
+                    throw;
+                }
+
+
+            }
+            finally
+            {
+                AdoUtils.DisposeCommand(command);
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+            }
+
+        }
+
+        /// <summary>
+        /// Execute ADO.NET operations on a IDbDataAdapter object using an interface based callback.
+        /// </summary>
+        /// <typeparam name="T">The type of object returned from the callback.</typeparam>
+        /// <param name="dataAdapterCallback">The data adapter callback.</param>
+        /// <returns>
+        /// A result object returned by the callback or null
+        /// </returns>
+        /// <remarks>This allows for implementing abritrary data access operations
+        /// on a single DataAdapter within Spring's managed ADO.NET environment.
+        /// </remarks>
+        public T Execute<T>(IDataAdapterCallback<T> dataAdapterCallback)
+        {
+            ConnectionTxPair connectionTxPairToUse = ConnectionUtils.GetConnectionTxPair(DbProvider);
+            IDbDataAdapter dataAdapter = null;
+            try
+            {
+                dataAdapter = DbProvider.CreateDataAdapter();
+                //TODO row updated event handling...
+                dataAdapter.SelectCommand = DbProvider.CreateCommand();
+                dataAdapter.SelectCommand.Connection = connectionTxPairToUse.Connection;
+                //TODO register for warnings on connection.
+                dataAdapter.SelectCommand.Transaction = connectionTxPairToUse.Transaction;
+                ApplyCommandSettings(dataAdapter.SelectCommand);
+                T result = dataAdapterCallback.DoInDataAdapter(dataAdapter);
+                return result;
+            }
+            catch (Exception)
+            {
+                AdoUtils.DisposeDataAdapterCommands(dataAdapter);
+                //TODO set dataAdapter command's = null; ?
+                //TODO exception translation? different hierarchy for data set operations.
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+                connectionTxPairToUse.Connection = null;
+                throw;
+            }
+            finally
+            {
+                AdoUtils.DisposeDataAdapterCommands(dataAdapter);
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+            }
+
+
+        }
+
+        /// <summary>
+        /// Execute ADO.NET operations on a IDbDataAdapter object using an delgate based callback.
+        /// </summary>
+        /// <remarks>This allows for implementing abritrary data access operations
+        /// on a single DataAdapter within Spring's managed ADO.NET environment.
+        /// </remarks>        
+        /// <typeparam name="T">The type of object returned from the callback.</typeparam>
+        /// <param name="dataAdapterCallback">The delegate called with a IDbDataAdapter object.</param>
+        /// <returns>A result object returned by the callback or null</returns>
+        public T Execute<T>(DataAdapterDelegate<T> dataAdapterCallback)
+        {
+            ConnectionTxPair connectionTxPairToUse = ConnectionUtils.GetConnectionTxPair(DbProvider);
+            IDbDataAdapter dataAdapter = null;
+            try
+            {
+                dataAdapter = DbProvider.CreateDataAdapter();
+                //TODO row updated event handling...
+                dataAdapter.SelectCommand = DbProvider.CreateCommand();
+                dataAdapter.SelectCommand.Connection = connectionTxPairToUse.Connection;
+                //TODO register for warnings on connection.
+                dataAdapter.SelectCommand.Transaction = connectionTxPairToUse.Transaction;
+                ApplyCommandSettings(dataAdapter.SelectCommand);
+                T result = dataAdapterCallback(dataAdapter);
+                return result;
+
+            }
+            catch (Exception)
+            {
+                AdoUtils.DisposeDataAdapterCommands(dataAdapter);
+                //TODO set dataAdapter command's = null; ?
+                //TODO exception translation? different hierarchy for data set operations.
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+                connectionTxPairToUse.Connection = null;
+                throw;
+            }
+            finally
+            {
+                AdoUtils.DisposeDataAdapterCommands(dataAdapter);
+                ConnectionUtils.DisposeConnection(connectionTxPairToUse.Connection, DbProvider);
+            }
+        }
+
+        #endregion
+
+        #region ExecuteNonQuery
+
+        /// <summary>
+        /// Executes a non query returning the number of rows affected.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <returns>The number of rows affected.</returns>
+        public int ExecuteNonQuery(CommandType cmdType, string cmdText)
+        {
+            return classicAdoTemplate.ExecuteNonQuery(cmdType, cmdText);
+        }
+
+
+        /// <summary>
+        /// Executes a non query returning the number of rows affected.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="parameterName">The name of the parameter to map.</param>
+        /// <param name="dbType">One of the database parameter type enumerations.</param>
+        /// <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        /// <returns>The number of rows affected.</returns>
+        public int ExecuteNonQuery(CommandType cmdType, string cmdText,
+                                   string parameterName, Enum dbType, int size, object parameterValue)
+        {
+            return classicAdoTemplate.ExecuteNonQuery(cmdType, cmdText, parameterName, dbType, size, parameterValue);
+
+
+        }
+
+        /// <summary>
+        /// Executes a non query returning the number of rows affected.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="parameters">The parameter collection to map.</param>
+        /// <returns>The number of rows affected.</returns>
+        public int ExecuteNonQuery(CommandType cmdType, string cmdText,
+                                   IDbParameters parameters)
+        {
+            return classicAdoTemplate.ExecuteNonQuery(cmdType, cmdText, parameters);
+
+        }
+
+        /// <summary>
+        /// Executes a non query with parameters set via the
+        /// command setter, returning the number of rows affected.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="commandSetter">The command setter.</param>
+        /// <returns>The number of rows affected.</returns>
+        public int ExecuteNonQuery(CommandType cmdType, string cmdText,
+                                   ICommandSetter commandSetter)
+        {
+            return classicAdoTemplate.ExecuteNonQuery(cmdType, cmdText, commandSetter);
+        }
+
+        /// <summary>
+        /// Executes a non query with a command created via IDbCommandCreator and
+        /// parameters.
+        /// </summary>
+        /// <remarks>Output parameters can be retrieved via the returned
+        /// dictionary.
+        /// <para>
+        /// More commonly used as a lower level support method within the framework,
+        /// for example StoredProcedure/AdoScalar.
+        /// </para>
+        /// </remarks>
+        /// <param name="commandCreator">The callback to create a IDbCommand.</param>
+        /// <returns>The number of rows affected.</returns>
+        public IDictionary ExecuteNonQuery(IDbCommandCreator commandCreator)
+        {
+            return classicAdoTemplate.ExecuteNonQuery(commandCreator);
+        }
+
+        #endregion
+
+        #region ExecuteScalar
+
+        /// <summary>
+        /// Execute the query with the specified command text.
+        /// </summary>
+        /// <remarks>No parameters are used.  As with 
+        /// IDbCommand.ExecuteScalar, it returns the first column of the first row in the result set
+        /// returned by the query.  Extra columns or row are ignored.</remarks>
+        /// <param name="cmdType">The command type</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <returns>The first column of the first row in the result set</returns>
+        public object ExecuteScalar(CommandType cmdType, string cmdText)
+        {
+            return classicAdoTemplate.ExecuteScalar(cmdType, cmdText);
+        }
+
+        /// <summary>
+        /// Execute the query with the specified command text and parameter returning a scalar result
+        /// </summary>
+        /// <param name="cmdType">The command type</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="parameterName">The name of the parameter to map.</param>
+        /// <param name="dbType">One of the database parameter type enumerations.</param>
+        /// <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        /// <returns>The first column of the first row in the result set</returns>
+        public object ExecuteScalar(CommandType cmdType, string cmdText,
+                                    string parameterName, Enum dbType, int size, object parameterValue)
+        {
+            return classicAdoTemplate.ExecuteScalar(cmdType, cmdText, parameterName, dbType, size, parameterValue);
+
+        }
+
+
+        /// <summary>
+        /// Execute the query with the specified command text and parameters returning a scalar result
+        /// </summary>
+        /// <param name="cmdType">The command type</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="parameters">The parameter collection to map.</param>
+        /// <returns>The first column of the first row in the result set</returns>
+        public object ExecuteScalar(CommandType cmdType, string cmdText,
+                                    IDbParameters parameters)
+        {
+            return classicAdoTemplate.ExecuteScalar(cmdType, cmdText, parameters);
+        }
+
+        /// <summary>
+        /// Execute the query with the specified command text and parameters set via the
+        /// command setter, returning a scalar result
+        /// </summary>
+        /// <param name="cmdType">The command type</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="commandSetter">The command setter.</param>
+        /// <returns>The first column of the first row in the result set</returns>
+        public object ExecuteScalar(CommandType cmdType, string cmdText,
+                                    ICommandSetter commandSetter)
+        {
+            return classicAdoTemplate.ExecuteScalar(cmdType, cmdText, commandSetter);
+        }
+
+        /// <summary>
+        /// Execute the query with a command created via IDbCommandCreator and 
+        /// parameters
+        /// </summary>
+        /// <remarks>Output parameters can be retrieved via the returned
+        /// dictionary.
+        /// <para>
+        /// More commonly used as a lower level support method within the framework,
+        /// for example for StoredProcedure/AdoScalar.
+        /// </para></remarks>
+        /// <param name="commandCreator">The callback to create a IDbCommand.</param>
+        /// <returns>A dictionary containing output parameters, if any</returns>
+        public IDictionary ExecuteScalar(IDbCommandCreator commandCreator)
+        {
+            return classicAdoTemplate.ExecuteScalar(commandCreator);
+        }
+
+        #endregion
+
+        #region Queries with RowCallback
+
+        /// <summary>
+        /// Execute a query given IDbCommand's type and text by 
+        /// passing the created IDbCommand to a ICommandSetter implementation 
+        /// that knows how to bind values to the IDbCommand, reading a 
+        /// single result set on a per-row basis with a <see cref="IRowCallback"/>.
+        /// </summary>
+        /// <param name="cmdType">The type of command</param>
+        /// <param name="cmdText">The text of the query.</param>
+        /// <param name="rowCallback">callback that will extract results
+        /// one row at a time.
+        /// </param>
+        /// <param name="commandSetter">The command setter.</param>
+        public void QueryWithRowCallback(CommandType cmdType, string cmdText, IRowCallback rowCallback,
+                                         ICommandSetter commandSetter)
+        {
+            classicAdoTemplate.QueryWithRowCallback(cmdType, cmdText, rowCallback, commandSetter);
+        }
+        /// <summary>
+        /// Execute a query given IDbCommand's type and text, reading a 
+        /// single result set on a per-row basis with a <see cref="IRowCallback"/>.
+        /// </summary>
+        /// <param name="cmdType">The type of command</param>
+        /// <param name="cmdText">The text of the query.</param>
+        /// <param name="rowCallback">callback that will extract results
+        /// one row at a time.
+        /// </param>
+        public void QueryWithRowCallback(CommandType cmdType, string cmdText, IRowCallback rowCallback)
+        {
+            classicAdoTemplate.QueryWithRowCallback(cmdType, cmdText, rowCallback);
+        }
+
+        /// <summary>
+        /// Execute a query given IDbCommand's type and text and provided parameter
+        /// information, reading a 
+        /// single result set on a per-row basis with a <see cref="IRowCallback"/>.
+        /// </summary>
+        /// <param name="cmdType">The type of command</param>
+        /// <param name="cmdText">The text of the query.</param>
+        /// <param name="rowCallback">callback that will extract results
+        /// one row at a time.
+        /// </param>
+        /// <param name="parameterName">The name of the parameter to map.</param>
+        /// <param name="dbType">One of the database parameter type enumerations.</param>
+        /// <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        public void QueryWithRowCallback(CommandType cmdType, string cmdText, IRowCallback rowCallback,
+                                         string parameterName, Enum dbType, int size, object parameterValue)
+        {
+            classicAdoTemplate.QueryWithRowCallback(cmdType, cmdText, rowCallback,
+                                                    parameterName, dbType, size, parameterValue);
+        }
+
+        /// <summary>
+        /// Execute a query given IDbCommand's type and text and provided IDbParameters,
+        /// reading a single result set on a per-row basis with a <see cref="IRowCallback"/>.
+        /// </summary>
+        /// <param name="cmdType">Type of the command.</param>
+        /// <param name="cmdText">The text of the query.</param>
+        /// <param name="rowCallback">callback that will extract results
+        /// one row at a time.</param>
+        /// <param name="parameter">The parameter collection to map.</param>
+        public void QueryWithRowCallback(CommandType cmdType, string cmdText, IRowCallback rowCallback,
+                                  IDbParameters parameter)
+        {
+            classicAdoTemplate.QueryWithRowCallback(cmdType, cmdText, rowCallback,
+                                                    parameter);
+        }
+
+        #endregion
+
+        #region Queries with RowCallback Delegate
+
+        public void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate)
+        {
+            classicAdoTemplate.QueryWithRowCallbackDelegate(cmdType, sql, rowCallbackDelegate);
+
+        }
+        public void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate, ICommandSetter commandSetter)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate,
+                        string parameterName, Enum dbType, int size, object parameterValue)
+        {
+            classicAdoTemplate.QueryWithRowCallbackDelegate(cmdType, sql, rowCallbackDelegate,
+                                                            parameterName, dbType, size, parameterValue);
+
+        }
+
+        public void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate, IDbParameters parameters)
+        {
+            classicAdoTemplate.QueryWithRowCallbackDelegate(cmdType, sql, rowCallbackDelegate, parameters);
+
+        }
+
+        #endregion
+
+        #region Queries with RowMapper<T>
+
+        public IList<T> QueryWithRowMapper<T>(CommandType cmdType, string cmdText, IRowMapper<T> rowMapper)
+        {
+            return QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor<T>(rowMapper));
+
+        }
+
+
+        public IList<T> QueryWithRowMapper<T>(CommandType cmdType, String cmdText, IRowMapper<T> rowMapper,
+                                              ICommandSetter commandSetter)
+        {
+            return QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor<T>(rowMapper), commandSetter);
+
+        }
+
+        public IList<T> QueryWithRowMapper<T>(CommandType cmdType, string cmdText, IRowMapper<T> rowMapper,
+                                              string parameterName, Enum dbType, int size, object parameterValue)
+        {
+            return QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor<T>(rowMapper), parameterName, dbType, size, parameterValue);
+
+        }
+
+        public IList<T> QueryWithRowMapper<T>(CommandType cmdType, string cmdText, IRowMapper<T> rowMapper, IDbParameters parameters)
+        {
+            return QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor<T>(rowMapper), parameters);
+
+        }
+
+
+
+        #endregion
+
+        #region Queries with RowMapperDelegate<T>
+
+        public IList<T> QueryWithRowMapperDelegate<T>(CommandType cmdType, string cmdText, RowMapperDelegate<T> rowMapperDelegate)
+        {
+            return QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor<T>(rowMapperDelegate));
+
+        }
+
+        public IList<T> QueryWithRowMapperDelegate<T>(CommandType cmdType, string cmdText, RowMapperDelegate<T> rowMapperDelegate,
+                                                      ICommandSetter commandSetter)
+        {
+            return QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor<T>(rowMapperDelegate),
+                                               commandSetter);
+        }
+
+        public IList<T> QueryWithRowMapperDelegate<T>(CommandType cmdType, string cmdText, RowMapperDelegate<T> rowMapperDelegate,
+                                                      string parameterName, Enum dbType, int size, object parameterValue)
+        {
+            return QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor<T>(rowMapperDelegate),
+                                               parameterName, dbType, size, parameterValue);
+        }
+
+        public IList<T> QueryWithRowMapperDelegate<T>(CommandType cmdType, string cmdText, RowMapperDelegate<T> rowMapperDelegate,
+                                               IDbParameters parameters)
+        {
+            return QueryWithResultSetExtractor(cmdType, cmdText, new RowMapperResultSetExtractor<T>(rowMapperDelegate),
+                                               parameters);
+        }
+        #endregion
+
+        #region Queries with ResultSetExtractor<T>
+
+        public T QueryWithResultSetExtractor<T>(CommandType cmdType,
+                                                string cmdText,
+                                                IResultSetExtractor<T> resultSetExtractor)
+        {
+            AssertUtils.ArgumentNotNull(cmdText, "cmdText", "CommandText must not be null");
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Executing CommandText [" + cmdText + "]");
+            }
+            return Execute<T>(new QueryCallback<T>(this, cmdType, cmdText, resultSetExtractor, null));
+        }
+
+        public T QueryWithResultSetExtractor<T>(CommandType commandType, string cmdText, IResultSetExtractor<T> resultSetExtractor,
+                                                string name, Enum dbType, int size, object parameterValue)
+        {
+            AssertUtils.ArgumentNotNull(resultSetExtractor, "resultSetExtractor", "Result Set Extractor must not be null");
+            return Execute<T>(new QueryCallback<T>(this, commandType, cmdText, resultSetExtractor,
+                                                   CreateDbParameters(name, dbType, size, parameterValue)));
+        }
+
+        public T QueryWithResultSetExtractor<T>(CommandType commandType, string cmdText,
+                                                IResultSetExtractor<T> resultSetExtractor,
+                                                IDbParameters parameters)
+        {
+            AssertUtils.ArgumentNotNull(resultSetExtractor, "resultSetExtractor", "Result Set Extractor must not be null");
+            return Execute<T>(new QueryCallback<T>(this, commandType, cmdText, resultSetExtractor, parameters));
+        }
+
+        public T QueryWithResultSetExtractor<T>(CommandType cmdType, string cmdText,
+                                                IResultSetExtractor<T> resultSetExtractor,
+                                                ICommandSetter commandSetter)
+        {
+            AssertUtils.ArgumentNotNull(resultSetExtractor, "resultSetExtractor", "Result Set Extractor must not be null");
+            return Execute<T>(new QueryCallbackWithCommandSetter<T>(this, cmdType, cmdText,
+                                                                    resultSetExtractor,
+                                                                    commandSetter));
+        }
+
+        public T QueryWithResultSetExtractor<T>(CommandType cmdType, string cmdText,
+                                                IResultSetExtractor<T> resultSetExtractor,
+                                                CommandSetterDelegate commandSetterDelegate)
+        {
+            AssertUtils.ArgumentNotNull(resultSetExtractor, "resultSetExtractor", "Result Set Extractor must not be null");
+            return Execute<T>(new QueryCallbackWithCommandSetterDelegate<T>(this, cmdType, cmdText,
+                                                                    resultSetExtractor,
+                                                                    commandSetterDelegate));
+        }
+
+        #endregion
+
+
+        #region Queries with ResultSetExtractorDelegate<T>
+
+        public T QueryWithResultSetExtractorDelegate<T>(CommandType cmdType,
+                                                        string cmdText,
+                                                        ResultSetExtractorDelegate<T> resultSetExtractorDelegate)
+        {
+            AssertUtils.ArgumentNotNull(cmdText, "cmdText", "CommandText must not be null");
+            AssertUtils.ArgumentNotNull(resultSetExtractorDelegate, "resultSetExtractorDelegate", "Result set extractor delegate must not be null");
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Executing CommandText [" + cmdText + "]");
+            }
+
+            return Execute<T>(new QueryCallback<T>(this, cmdType, cmdText, resultSetExtractorDelegate, null));
+        }
+
+        public T QueryWithResultSetExtractorDelegate<T>(CommandType commandType, string cmdText, ResultSetExtractorDelegate<T> resultSetExtractorDelegate,
+                                                        string paramenterName, Enum dbType, int size, object parameterValue)
+        {
+            AssertUtils.ArgumentNotNull(cmdText, "cmdText", "CommandText must not be null");
+            AssertUtils.ArgumentNotNull(resultSetExtractorDelegate, "resultSetExtractorDelegate", "Result set extractor delegate must not be null");
+            return Execute<T>(new QueryCallback<T>(this, commandType, cmdText, resultSetExtractorDelegate,
+                                                   CreateDbParameters(paramenterName, dbType, size, parameterValue)));
+        }
+
+        public T QueryWithResultSetExtractorDelegate<T>(CommandType commandType, string cmdText, ResultSetExtractorDelegate<T> resultSetExtractorDelegate,
+                                                IDbParameters parameters)
+        {
+            AssertUtils.ArgumentNotNull(cmdText, "cmdText", "CommandText must not be null");
+            AssertUtils.ArgumentNotNull(resultSetExtractorDelegate, "resultSetExtractorDelegate", "Result set extractor delegate  must not be null");
+            return Execute<T>(new QueryCallback<T>(this, commandType, cmdText, resultSetExtractorDelegate, parameters));
+        }
+
+        public T QueryWithResultSetExtractorDelegate<T>(CommandType cmdType, string cmdText, ResultSetExtractorDelegate<T> resultSetExtractorDelegate,
+                                                        ICommandSetter commandSetter)
+        {
+            AssertUtils.ArgumentNotNull(cmdText, "cmdText", "CommandText must not be null");
+            AssertUtils.ArgumentNotNull(resultSetExtractorDelegate, "resultSetExtractorDelegate", "Result set extractor delegate must not be null");
+            return Execute<T>(new QueryCallbackWithCommandSetter<T>(this, cmdType, cmdText,
+                                                                    resultSetExtractorDelegate,
+                                                                    commandSetter));
+        }
+
+        public T QueryWithResultSetExtractorDelegate<T>(CommandType cmdType, string cmdText, ResultSetExtractorDelegate<T> resultSetExtractorDelegate,
+                                                        CommandSetterDelegate commandSetterDelegate)
+        {
+            AssertUtils.ArgumentNotNull(resultSetExtractorDelegate, "resultSetExtractorDelegate", "Result set extractor delegate must not be null");
+            return Execute<T>(new QueryCallbackWithCommandSetterDelegate<T>(this, cmdType, cmdText,
+                                                                    resultSetExtractorDelegate,
+                                                                    commandSetterDelegate));
+        }
+
+        #endregion
+
+        #region Query for Object<T>
+
+        public T QueryForObject<T>(CommandType cmdType, string cmdText, IRowMapper<T> rowMapper)
+        {
+            IList<T> results = QueryWithRowMapper(cmdType, cmdText, rowMapper);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        public T QueryForObject<T>(CommandType cmdType, string cmdText, IRowMapper<T> rowMapper, ICommandSetter commandSetter)
+        {
+            IList<T> results = QueryWithRowMapper(cmdType, cmdText, rowMapper, commandSetter);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        public T QueryForObject<T>(CommandType cmdType, string cmdText, IRowMapper<T> rowMapper, IDbParameters parameters)
+        {
+            IList<T> results = QueryWithRowMapper(cmdType, cmdText, rowMapper, parameters);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+
+        public T QueryForObject<T>(CommandType cmdType, string cmdText, IRowMapper<T> rowMapper,
+                                   string parameterName, Enum dbType, int size, object parameterValue)
+        {
+            IList<T> results = QueryWithRowMapper(cmdType, cmdText, rowMapper, parameterName, dbType, size, parameterValue);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+        #endregion
+
+        #region Query for ObjectDelegate<T>
+
+        public T QueryForObjectDelegate<T>(CommandType cmdType, string cmdText, RowMapperDelegate<T> rowMapperDelegate)
+        {
+            IList<T> results = QueryWithRowMapperDelegate(cmdType, cmdText, rowMapperDelegate);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        public T QueryForObjectDelegate<T>(CommandType cmdType, string cmdText, RowMapperDelegate<T> rowMapperDelegate, ICommandSetter commandSetter)
+        {
+            IList<T> results = QueryWithRowMapperDelegate(cmdType, cmdText, rowMapperDelegate, commandSetter);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        public T QueryForObjectDelegate<T>(CommandType cmdType, string cmdText, RowMapperDelegate<T> rowMapperDelegate, IDbParameters parameters)
+        {
+            IList<T> results = QueryWithRowMapperDelegate(cmdType, cmdText, rowMapperDelegate, parameters);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+
+        public T QueryForObjectDelegate<T>(CommandType cmdType, string cmdText, RowMapperDelegate<T> rowMapperDelegate,
+                                   string parameterName, Enum dbType, int size, object parameterValue)
+        {
+            IList<T> results = QueryWithRowMapperDelegate(cmdType, cmdText, rowMapperDelegate, parameterName, dbType, size, parameterValue);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+        #endregion
+
+
+        #region Query with CommandCreator
+
+        public T QueryWithCommandCreator<T>(IDbCommandCreator cc, IResultSetExtractor<T> rse)
+        {
+            return QueryWithCommandCreator<T>(cc, rse, null);
+        }
+
+        public void QueryWithCommandCreator(IDbCommandCreator cc, IRowCallback rowCallback)
+        {
+            classicAdoTemplate.QueryWithCommandCreator(cc, rowCallback, null);
+        }
+
+        public IList<T> QueryWithCommandCreator<T>(IDbCommandCreator cc, IRowMapper<T> rowMapper)
+        {
+            return QueryWithCommandCreator<T>(cc, rowMapper, null);
+        }
+
+        public T QueryWithCommandCreator<T>(IDbCommandCreator cc, IResultSetExtractor<T> rse, IDictionary returnedParameters)
+        {
+            if (rse == null)
+            {
+                throw new ArgumentNullException("Result Set Extractor must not be null");
+            }
+
+            return Execute(cc, new AdoResultSetExtractorWithOutputParamsCommandCallback<T>(this, rse, returnedParameters));
+        }
+
+
+        public void QueryWithCommandCreator(IDbCommandCreator cc, IRowCallback rowCallback, IDictionary returnedParameters)
+        {
+            classicAdoTemplate.QueryWithCommandCreator(cc, rowCallback, returnedParameters);
+        }
+
+
+        public IList<T> QueryWithCommandCreator<T>(IDbCommandCreator cc, IRowMapper<T> rowMapper, IDictionary returnedParameters)
+        {
+            if (rowMapper == null)
+            {
+                throw new ArgumentNullException("rowMapper must not be null");
+            }
+
+            return Execute(cc, new AdoRowMapperQueryCommandCallback<T>(this, rowMapper, returnedParameters));
+        }
+
+
+        public IDictionary QueryWithCommandCreator<T>(IDbCommandCreator cc, IList namedResultSetProcessors)
+        {
+            return classicAdoTemplate.Execute(cc, new AdoResultProcessorsQueryCommandCallback<T>(this, namedResultSetProcessors)) as IDictionary;
+        }
+        
+
+        public IDictionary QueryWithCommandCreator<T,U>(IDbCommandCreator cc, IList namedResultSetProcessors)
+        {
+            return classicAdoTemplate.Execute(cc, new AdoResultProcessorsQueryCommandCallback<T,U>(this, namedResultSetProcessors)) as IDictionary;
+        }
+
+
+        #endregion
+
+        #region General Helper Methods
+
+        /// <summary>
+        /// Checks if DbProvider is not null and creates ExceptionTranslator if not LazyInit.
+        /// </summary>
+        public override void AfterPropertiesSet()
+        {
+            classicAdoTemplate.AfterPropertiesSet();
+            classicAdoTemplate.CommandTimeout = CommandTimeout;
+        }
+
+        /// <summary>
+        /// Creates the data reader wrapper for use in AdoTemplate callback methods.
+        /// </summary>
+        /// <param name="readerToWrap">The reader to wrap.</param>
+        /// <returns>The data reader used in AdoTemplate callbacks</returns>
+        public override IDataReader CreateDataReaderWrapper(IDataReader readerToWrap)
+        {
+            return classicAdoTemplate.CreateDataReaderWrapper(readerToWrap);
+        }
+
+        #endregion
+
+        #region Parameter Creation Helper Methods
+
+        /// <summary>
+        /// Derives the parameters of a stored procedure including the return parameter
+        /// </summary>
+        /// <param name="procedureName">Name of the procedure.</param>
+        /// <param name="includeReturnParameter">if set to <c>true</c> to include return parameter.</param>
+        /// <returns>The stored procedure parameters</returns>
+        public override IDataParameter[] DeriveParameters(string procedureName, bool includeReturnParameter)
+        {
+            return classicAdoTemplate.DeriveParameters(procedureName, includeReturnParameter);
+        }
+
+        #endregion
+
+
+
+
+
+        #region Internal Helper classes
+
+        internal class QueryCallback<T> : IDbCommandCallback<T>, ICommandTextProvider
+        {
+            private AdoTemplate adoTemplate;
+            private IResultSetExtractor<T> rse;
+            private ResultSetExtractorDelegate<T> resultSetExtractorDelegate;
+            private CommandType commandType;
+            private string commandText;
+            private IDbParameters parameters;
+
+            public QueryCallback(AdoTemplate adoTemplate,
+                                 CommandType cmdType,
+                                 string cmdText,
+                                 IResultSetExtractor<T> rse,
+                                 IDbParameters dbParameters)
+            {
+                this.adoTemplate = adoTemplate;
+                commandType = cmdType;
+                commandText = cmdText;
+                this.rse = rse;
+                parameters = dbParameters;
+            }
+
+            public QueryCallback(AdoTemplate adoTemplate,
+                         CommandType cmdType,
+                         string cmdText,
+                         ResultSetExtractorDelegate<T> resultSetExtractorDelegate,
+                         IDbParameters dbParameters)
+            {
+                this.adoTemplate = adoTemplate;
+                commandType = cmdType;
+                commandText = cmdText;
+                this.resultSetExtractorDelegate = resultSetExtractorDelegate;
+                parameters = dbParameters;
+            }
+
+            public string CommandText
+            {
+                get { return commandText; }
+            }
+
+            public T DoInCommand(IDbCommand command)
+            {
+                IDataReader reader = null;
+                try
+                {
+                    command.CommandType = commandType;
+                    command.CommandText = commandText;
+                    ParameterUtils.CopyParameters(command, parameters);
+                    reader = adoTemplate.CreateDataReaderWrapper(command.ExecuteReader());
+                    T returnValue = default(T);
+                    if (rse != null)
+                    {
+                        returnValue = rse.ExtractData(reader);
+                    }
+                    else
+                    {
+                        returnValue = resultSetExtractorDelegate(reader);
+                    }
+                    return returnValue;
+                }
+                finally
+                {
+                    AdoUtils.CloseReader(reader);
+                    ParameterUtils.CopyParameters(parameters, command);
+                }
+            }
+
+
+        }
+
+        internal class QueryCallbackWithCommandSetter<T> : IDbCommandCallback<T>, ICommandTextProvider
+        {
+            private AdoTemplate adoTemplate;
+            private IResultSetExtractor<T> rse;
+            private ResultSetExtractorDelegate<T> resultSetExtractorDelegate;
+            private CommandType commandType;
+            private string commandText;
+            private ICommandSetter commandSetter;
+
+            public QueryCallbackWithCommandSetter(AdoTemplate adoTemplate,
+                                                     CommandType cmdType,
+                                                     string cmdText,
+                                                     IResultSetExtractor<T> rse,
+                                                     ICommandSetter commandSetter)
+            {
+                this.adoTemplate = adoTemplate;
+                commandType = cmdType;
+                commandText = cmdText;
+                this.rse = rse;
+                this.commandSetter = commandSetter;
+            }
+
+            public QueryCallbackWithCommandSetter(AdoTemplate adoTemplate,
+                                             CommandType cmdType,
+                                             string cmdText,
+                                             ResultSetExtractorDelegate<T> resultSetExtractorDelegate,
+                                             ICommandSetter commandSetter)
+            {
+                this.adoTemplate = adoTemplate;
+                commandType = cmdType;
+                commandText = cmdText;
+                this.resultSetExtractorDelegate = resultSetExtractorDelegate;
+                this.commandSetter = commandSetter;
+            }
+
+            public string CommandText
+            {
+                get { return commandText; }
+            }
+
+            public T DoInCommand(IDbCommand command)
+            {
+                IDataReader reader = null;
+                try
+                {
+                    command.CommandType = commandType;
+                    command.CommandText = commandText;
+                    if (commandSetter != null)
+                    {
+                        commandSetter.SetValues(command);
+                    }
+                    reader = adoTemplate.CreateDataReaderWrapper(command.ExecuteReader());
+                    if (rse != null)
+                    {
+                        return rse.ExtractData(reader);
+                    }
+                    else
+                    {
+                        return resultSetExtractorDelegate(reader);
+                    }
+
+                }
+                finally
+                {
+                    AdoUtils.CloseReader(reader);
+                }
+            }
+
+
+        }
+
+        internal class QueryCallbackWithCommandSetterDelegate<T> : IDbCommandCallback<T>, ICommandTextProvider
+        {
+            private AdoTemplate adoTemplate;
+            private IResultSetExtractor<T> rse;
+            private ResultSetExtractorDelegate<T> resultSetExtractorDelegate;
+            private CommandType commandType;
+            private string commandText;
+            private CommandSetterDelegate commandSetterDelegate;
+
+            public QueryCallbackWithCommandSetterDelegate(AdoTemplate adoTemplate,
+                                                        CommandType cmdType,
+                                                        string cmdText,
+                                                        IResultSetExtractor<T> rse,
+                                                        CommandSetterDelegate commandSetterDelegate)
+            {
+                this.adoTemplate = adoTemplate;
+                commandType = cmdType;
+                commandText = cmdText;
+                this.rse = rse;
+                this.commandSetterDelegate = commandSetterDelegate;
+            }
+
+            public QueryCallbackWithCommandSetterDelegate(AdoTemplate adoTemplate,
+                                                CommandType cmdType,
+                                                string cmdText,
+                                                ResultSetExtractorDelegate<T> resultSetExtractorDelegate,
+                                                CommandSetterDelegate commandSetterDelegate)
+            {
+                this.adoTemplate = adoTemplate;
+                commandType = cmdType;
+                commandText = cmdText;
+                this.resultSetExtractorDelegate = resultSetExtractorDelegate;
+                this.commandSetterDelegate = commandSetterDelegate;
+            }
+
+            public string CommandText
+            {
+                get { return commandText; }
+            }
+
+            public T DoInCommand(IDbCommand command)
+            {
+                IDataReader reader = null;
+                try
+                {
+                    command.CommandType = commandType;
+                    command.CommandText = commandText;
+                    if (commandSetterDelegate != null)
+                    {
+                        commandSetterDelegate(command);
+                    }
+                    reader = adoTemplate.CreateDataReaderWrapper(command.ExecuteReader());
+                    if (rse != null)
+                    {
+                        return rse.ExtractData(reader);
+                    }
+                    else
+                    {
+                        return resultSetExtractorDelegate(reader);
+                    }
+                }
+                finally
+                {
+                    AdoUtils.CloseReader(reader);
+                }
+            }
+
+
+        }
+
+        internal class AdoRowMapperQueryCommandCallback<T> : IDbCommandCallback<IList<T>>
+        {
+            private AdoTemplate adoTemplate;
+            private IRowMapper<T> rowMapper;
+            private IDictionary returnedParameters;
+
+            public AdoRowMapperQueryCommandCallback(AdoTemplate adoTemplate, IRowMapper<T> rowMapper, IDictionary returnedParameters)
+            {
+                this.adoTemplate = adoTemplate;
+                this.rowMapper = rowMapper;
+                this.returnedParameters = returnedParameters;
+            }
+
+            public IList<T> DoInCommand(IDbCommand command)
+            {
+                IList<T> objectList;
+                //Extract the single returned result set
+                IDataReader reader = null;
+                try
+                {
+                    reader = adoTemplate.CreateDataReaderWrapper(command.ExecuteReader());
+                    RowMapperResultSetExtractor<T> rse = new RowMapperResultSetExtractor<T>(rowMapper, 1);
+                    objectList = rse.ExtractData(reader);
+                }
+                finally
+                {
+                    AdoUtils.CloseReader(reader);
+                }
+                ParameterUtils.ExtractOutputParameters(returnedParameters, command);
+                return objectList;
+            }
+        }
+
+        internal class AdoResultSetExtractorWithOutputParamsCommandCallback<T> : IDbCommandCallback<T>
+        {
+            private AdoTemplate adoTemplate;
+            private IResultSetExtractor<T> rse;
+            private IDictionary returnedParameters;
+
+            public AdoResultSetExtractorWithOutputParamsCommandCallback(AdoTemplate adoTemplate, IResultSetExtractor<T> rse, IDictionary returnedParameters)
+            {
+                this.adoTemplate = adoTemplate;
+                this.rse = rse;
+                this.returnedParameters = returnedParameters;
+            }
+
+            public T DoInCommand(IDbCommand command)
+            {
+                T returnVal;
+                //Extract the single returned result set
+                IDataReader reader = null;
+                try
+                {
+                    reader = adoTemplate.CreateDataReaderWrapper(command.ExecuteReader());
+                    returnVal = rse.ExtractData(reader);
+                }
+                finally
+                {
+                    AdoUtils.CloseReader(reader);
+                }
+                ParameterUtils.ExtractOutputParameters(returnedParameters, command);
+                return returnVal;
+            }
+        }
+
+        internal class BaseAdoResultProcessorsQueryCommandCallback<T>
+        {
+            public static void ProcessNonGenericResultSetProcessor(NamedResultSetProcessor otherResultSetProcessor, IDataReader reader, IDictionary returnedResults)
+            {
+                string parameterName = otherResultSetProcessor.Name;
+                if (otherResultSetProcessor.ResultSetProcessor is IResultSetExtractor)
+                {
+                    IResultSetExtractor rse = (IResultSetExtractor)otherResultSetProcessor.ResultSetProcessor;
+                    object result = rse.ExtractData(reader);
+                    returnedResults.Add(parameterName, result);
+                }
+                else if (otherResultSetProcessor.ResultSetProcessor is IRowMapper)
+                {
+                    IRowMapper rowMapper = (IRowMapper)otherResultSetProcessor.ResultSetProcessor;
+                    object result = (new RowMapperResultSetExtractor(rowMapper)).ExtractData(reader);
+                    returnedResults.Add(parameterName, result);
+                }
+                else if (otherResultSetProcessor.ResultSetProcessor is IRowCallback)
+                {
+                    IRowCallback rowCallback = (IRowCallback)otherResultSetProcessor.ResultSetProcessor;
+                    (new RowCallbackResultSetExtractor(rowCallback)).ExtractData(reader);
+                    returnedResults.Add(parameterName, "ResultSet returned was processed by an IRowCallback");
+                }
+            }
+
+            public static void ProcessFirstGenericResultSetProcessor(NamedResultSetProcessor<T> firstResultSetProcessor, IDataReader reader, IDictionary returnedResults)
+            {
+                string parameterName = firstResultSetProcessor.Name;
+                if (firstResultSetProcessor.ResultSetExtractor != null)
+                {
+                    IResultSetExtractor<T> rse = firstResultSetProcessor.ResultSetExtractor;
+                    T result = rse.ExtractData(reader);
+                    returnedResults.Add(parameterName, result);
+                }
+                else if (firstResultSetProcessor.RowMapper != null)
+                {
+                    IRowMapper<T> rowMapper = firstResultSetProcessor.RowMapper;
+                    object result = (new RowMapperResultSetExtractor<T>(rowMapper)).ExtractData(reader);
+                    returnedResults.Add(parameterName, result);
+                }
+                else if (firstResultSetProcessor.RowCallback != null)
+                {
+                    IRowCallback rowCallback = firstResultSetProcessor.RowCallback;
+                    (new RowCallbackResultSetExtractor(rowCallback)).ExtractData(reader);
+                    returnedResults.Add(parameterName, "ResultSet returned was processed by an IRowCallback");
+                }
+            }
+        }
+
+        internal class AdoResultProcessorsQueryCommandCallback<T> : BaseAdoResultProcessorsQueryCommandCallback<T>, ICommandCallback
+        {
+            private AdoTemplate adoTemplate;
+            private IList namedResultSetProcessors;
+
+            public AdoResultProcessorsQueryCommandCallback(AdoTemplate adoTemplate, IList namedResultSetProcessors)
+            {
+                this.adoTemplate = adoTemplate;
+                this.namedResultSetProcessors = namedResultSetProcessors;
+            }
+
+            public object DoInCommand(IDbCommand command)
+            {
+                IDictionary returnedResults = new Hashtable();
+                int resultSetIndex = 0;
+                IDataReader reader = null;
+                try
+                {
+                    reader = adoTemplate.CreateDataReaderWrapper(command.ExecuteReader());
+
+                    //TODO On >= .NET 2.0 platforms make use of DbDataReader.HasRows property to
+                    //     see if there is a result set.  now currently assuming matching
+                    //     NamedResultSetProcessor/ResultSet pairs.
+             
+                    do
+                    {
+                        if (namedResultSetProcessors.Count == 0)
+                        {
+                            //We could just have output parameters and/or return value, that is, no result sets
+                            //If we didn't register a result set processor, it is likely that a result set wasn't expected.
+                            break;
+                        }
+                        NamedResultSetProcessor<T> firstResultSetProcessor = null;
+                        NamedResultSetProcessor otherResultSetProcessor = null;
+                        try
+                        {
+                            if (resultSetIndex == 0)
+                            {
+                                firstResultSetProcessor
+                                    = namedResultSetProcessors[resultSetIndex] as NamedResultSetProcessor<T>;
+                                //Will have possibility of run-time type error if using QueryWithCommandCreator
+                                if (firstResultSetProcessor == null)
+                                {
+                                    LOG.Error("NamedResultSetProcessor for result set index " + resultSetIndex +
+                                              ", is not of expected type NamedResultSetProcessor<T>.  Type = " +
+                                              namedResultSetProcessors[resultSetIndex].GetType() +
+                                              "; Skipping processing for this result set.");
+                                    continue;
+                                }
+                            }
+                            else
+                            {
+                                otherResultSetProcessor =
+                                    namedResultSetProcessors[resultSetIndex] as NamedResultSetProcessor;
+                                if (otherResultSetProcessor == null)
+                                {
+
+                                    LOG.Error("NamedResultSetProcessor for result set index " + resultSetIndex +
+                                              ", is not of expected type NamedResultSetProcessor  Type = " +
+                                              namedResultSetProcessors[resultSetIndex].GetType() +
+                                              "; Skipping processing for this result set.");
+                                    continue;
+                                }
+                            }
+                        }
+                        catch (IndexOutOfRangeException e)
+                        {
+                            LOG.Error("No NamedResultSetProcessor associated with result set index " + resultSetIndex, e);
+                            continue;
+                        }
+                        catch (ArgumentOutOfRangeException e)
+                        {
+                            LOG.Error("No NamedResultSetProcessor associated with result set index " + resultSetIndex, e);
+                            continue;
+                        }
+
+
+                        if (resultSetIndex == 0)
+                        {
+                            ProcessFirstGenericResultSetProcessor(firstResultSetProcessor, reader, returnedResults);
+                        }
+                        else
+                        {
+                            ProcessNonGenericResultSetProcessor(otherResultSetProcessor, reader, returnedResults);
+                        }
+                        resultSetIndex++;
+
+                    } while (reader.NextResult());
+                }
+                finally
+                {
+                    AdoUtils.CloseReader(reader);
+                }
+                ParameterUtils.ExtractOutputParameters(returnedResults, command);
+                return returnedResults;
+            }
+        }
+
+
+        internal class AdoResultProcessorsQueryCommandCallback<T, U> : BaseAdoResultProcessorsQueryCommandCallback<T>, ICommandCallback
+        {
+            private AdoTemplate adoTemplate;
+            private IList namedResultSetProcessors;
+
+            public AdoResultProcessorsQueryCommandCallback(AdoTemplate adoTemplate, IList namedResultSetProcessors)
+            {
+                this.adoTemplate = adoTemplate;
+                this.namedResultSetProcessors = namedResultSetProcessors;
+            }
+
+            public object DoInCommand(IDbCommand command)
+            {
+                IDictionary returnedResults = new Hashtable();
+                int resultSetIndex = 0;
+                IDataReader reader = null;
+                try
+                {
+                    reader = adoTemplate.CreateDataReaderWrapper(command.ExecuteReader());
+
+                    //TODO On >= .NET 2.0 platforms make use of DbDataReader.HasRows property to
+                    //     see if there is a result set.  now currently assuming matching
+                    //     NamedResultSetProcessor/ResultSet pairs.
+
+                    do
+                    {
+                        if (namedResultSetProcessors.Count == 0)
+                        {
+                            //We could just have output parameters and/or return value, that is, no result sets
+                            //If we didn't register a result set processor, it is likely that a result set wasn't expected.
+                            break;
+                        }
+                        NamedResultSetProcessor<T> firstResultSetProcessor = null;
+                        NamedResultSetProcessor<U> secondResultSetProcessor = null;
+                        NamedResultSetProcessor otherResultSetProcessor = null;
+                        try
+                        {
+                            if (resultSetIndex == 0)
+                            {
+                                firstResultSetProcessor = namedResultSetProcessors[resultSetIndex] as NamedResultSetProcessor<T>;
+                                //Will only have possibility of run-time type error if using QueryWithCommandCreator
+                                if (firstResultSetProcessor == null)
+                                {
+
+                                    LOG.Error("NamedResultSetProcessor for result set index " + resultSetIndex +
+                                              ", is not of expected type NamedResultSetProcessor<T>  Type = " +
+                                              namedResultSetProcessors[resultSetIndex].GetType() +
+                                              "; Skipping processing for this result set.");
+                                    continue;                                    
+                                }
+                            } else if (resultSetIndex == 1)
+                            {
+                                secondResultSetProcessor
+                                    = namedResultSetProcessors[resultSetIndex] as NamedResultSetProcessor<U>;
+                                if (secondResultSetProcessor == null)
+                                {
+
+                                    LOG.Error("NamedResultSetProcessor for result set index " + resultSetIndex +
+                                              ", is not of expected type NamedResultSetProcessor<T>  Type = " +
+                                              namedResultSetProcessors[resultSetIndex].GetType() +
+                                              "; Skipping processing for this result set.");
+                                    continue;
+                                }
+                            } else
+                            {
+                                otherResultSetProcessor =
+                                    namedResultSetProcessors[resultSetIndex] as NamedResultSetProcessor;
+                                if (otherResultSetProcessor == null)
+                                {
+
+                                    LOG.Error("NamedResultSetProcessor for result set index " + resultSetIndex +
+                                              ", is not of expected type NamedResultSetProcessor  Type = " +
+                                              namedResultSetProcessors[resultSetIndex].GetType() +
+                                              "; Skipping processing for this result set.");
+                                    continue;
+                                }
+                            }
+
+                        }
+                        catch (IndexOutOfRangeException e)
+                        {
+                            LOG.Error("No NamedResultSetProcessor associated with result set index " + resultSetIndex, e);
+                            continue;
+                        }
+                        catch (ArgumentOutOfRangeException e)
+                        {
+                            LOG.Error("No NamedResultSetProcessor associated with result set index " + resultSetIndex, e);
+                            continue;
+                        }
+
+                        if (resultSetIndex == 0)
+                        {
+                            ProcessFirstGenericResultSetProcessor(firstResultSetProcessor, reader, returnedResults);
+                        }
+                        else if (resultSetIndex == 1)
+                        {
+                            string parameterName = secondResultSetProcessor.Name;
+                            if (secondResultSetProcessor.ResultSetExtractor != null)
+                            {
+                                IResultSetExtractor<U> rse = secondResultSetProcessor.ResultSetExtractor;
+                                U result = rse.ExtractData(reader);
+                                returnedResults.Add(parameterName, result);
+                            }
+                            else if (secondResultSetProcessor.RowMapper != null)
+                            {
+                                IRowMapper<U> rowMapper = secondResultSetProcessor.RowMapper;
+                                object result = (new RowMapperResultSetExtractor<U>(rowMapper)).ExtractData(reader);
+                                returnedResults.Add(parameterName, result);
+                            }
+                            else if (secondResultSetProcessor.RowCallback != null)
+                            {
+                                //In this case a dummy type parameter would need to be specified a better alternative would
+                                //be to to use the single type parameterization of this callback.
+                                IRowCallback rowCallback = secondResultSetProcessor.RowCallback;
+                                (new RowCallbackResultSetExtractor(rowCallback)).ExtractData(reader);
+                                returnedResults.Add(parameterName, "ResultSet returned was processed by an IRowCallback");
+                            }
+                        }
+                        else
+                        {
+                            ProcessNonGenericResultSetProcessor(otherResultSetProcessor, reader, returnedResults);
+                        }
+                        resultSetIndex++;
+
+                    } while (reader.NextResult());
+                }
+                finally
+                {
+                    AdoUtils.CloseReader(reader);
+                }
+                ParameterUtils.ExtractOutputParameters(returnedResults, command);
+                return returnedResults;
+            }
+
+
+        }
+        #endregion
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs b/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs
new file mode 100644
index 00000000..f924380f
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs
@@ -0,0 +1,49 @@
+#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
+
+#if NET_2_0
+
+using System.Data.Common;
+
+namespace Spring.Data.Generic
+{
+    /// <summary>
+    /// Generic callback delegate for code that operates on a DbCommand. 
+    /// </summary>
+    /// <remarks>
+    /// <p>Allows you to execute any number of operations
+    /// on a single DbCommand, for example a single ExecuteScalar
+    /// call or repeated execute calls with varying parameters.
+    /// </p>
+    /// <p>Used internally by AdoTemplate, but also useful for 
+    /// application code.  Note that the passed in DbCommand
+    /// has been created by the framework and will have its
+    /// Connection property set and the Transaction property
+    /// set based on the transaction context.</p>
+    /// </remarks>
+    /// <typeparam name="T">The return type from executing the
+    /// callback</typeparam>
+    /// <param name="command">The ADO.NET DbCommand object</param>
+    /// <returns>The object returned from processing with the
+    /// provided DbCommand </returns>
+    /// <author>Mark Pollack</author>
+    public delegate T CommandDelegate<T>(DbCommand command);
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs b/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs
new file mode 100644
index 00000000..2ac0ee66
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs
@@ -0,0 +1,39 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if NET_2_0
+
+using System.Data;
+
+namespace Spring.Data.Generic
+{
+    /// <summary>
+    /// Called by AdoTemplate.Execute with an preconfigured
+    /// ADO.NET IDbDataAdapter instance with its SelectCommand
+    /// property populated with CommandType and Text values
+    /// along with Connection/Transaction properties based on the
+    /// calling transaction context.
+    /// </summary>
+    /// <param name="dataAdapter">An active IDbDataAdapter instance</param>
+    /// <returns>The result object</returns>
+    public delegate T DataAdapterDelegate<T>(IDbDataAdapter dataAdapter);
+   
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs b/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs
new file mode 100644
index 00000000..9c37910b
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs
@@ -0,0 +1,237 @@
+#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
+
+#if NET_2_0
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using Spring.Data.Common;
+
+namespace Spring.Data.Generic
+{
+    /// <summary>
+    /// Interface that defines ADO.NET related database operations using generics
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: IAdoOperations.cs,v 1.9 2007/12/04 06:48:21 markpollack Exp $</version>
+    public interface IAdoOperations : ICommonAdoOperations
+    {
+
+        #region General Execute Callback Methods
+
+
+        /// <summary>
+        /// Execute a ADO.NET operation on a command object using a generic interface based callback.
+        /// </summary>
+        /// <typeparam name="T">The type of object returned from the callback.</typeparam>
+        /// <param name="action">the callback to execute based on DbCommand</param>
+        /// <returns>An object returned from callback</returns>
+        T Execute<T>(ICommandCallback<T> action);
+
+        /// <summary>
+        /// Execute a ADO.NET operation on a command object using a generic interface based callback.
+        /// </summary>
+        /// <typeparam name="T">The type of object returned from the callback.</typeparam>
+        /// <param name="action">The callback to execute based on IDbCommand</param>
+        /// <returns>An object returned from callback</returns>
+        T Execute<T>(IDbCommandCallback<T> action);
+
+        /// <summary>
+        /// Execute a ADO.NET operation on a command object using a generic delegate callback.
+        /// </summary>
+        /// <typeparam name="T">The type of object returned from the callback.</typeparam>        
+        /// <remarks>This allows for implementing arbitrary data access operations
+        /// on a single command within Spring's managed ADO.NET environment.</remarks>
+        /// <param name="del">The delegate called with a DbCommand object.</param>
+        /// <returns>A result object returned by the action or null</returns>
+        T Execute<T>(CommandDelegate<T> del);
+
+        /// <summary>
+        /// Execute a ADO.NET operation on a command object using a generic delegate callback.
+        /// </summary>
+        /// <typeparam name="T">The type of object returned from the callback.</typeparam>        
+        /// <remarks>This allows for implementing arbitrary data access operations
+        /// on a single command within Spring's managed ADO.NET environment.</remarks>
+        /// <param name="del">The delegate called with a IDbCommand object.</param>
+        /// <returns>A result object returned by the action or null</returns>
+        T Execute<T>(IDbCommandDelegate<T> del);
+
+        /// <summary>
+        /// Executes ADO.NET operations on a command object, created by the provided IDbCommandCreator,
+        /// using the interface based callback IDbCommandCallback.
+        /// </summary>
+        /// <typeparam name="T">The type of object returned from the callback.</typeparam>
+        /// <param name="commandCreator">The command creator.</param>
+        /// <param name="action">The callback to execute based on IDbCommand</param>
+        /// <returns>A result object returned by the action or null</returns>
+        T Execute<T>(IDbCommandCreator commandCreator, IDbCommandCallback<T> action);
+
+        /// <summary>
+        /// Execute ADO.NET operations on a IDbDataAdapter object using an interface based callback.
+        /// </summary>
+        /// <remarks>This allows for implementing abritrary data access operations
+        /// on a single DataAdapter within Spring's managed ADO.NET environment.
+        /// </remarks>        
+        /// <typeparam name="T">The type of object returned from the callback.</typeparam>
+        /// <param name="dataAdapterCallback">The data adapter callback.</param>
+        /// <returns>A result object returned by the callback or null</returns>
+        T Execute<T>(IDataAdapterCallback<T> dataAdapterCallback);
+
+        /// <summary>
+        /// Execute ADO.NET operations on a IDbDataAdapter object using an delgate based callback.
+        /// </summary>
+        /// <remarks>This allows for implementing abritrary data access operations
+        /// on a single DataAdapter within Spring's managed ADO.NET environment.
+        /// </remarks>        
+        /// <typeparam name="T">The type of object returned from the callback.</typeparam>
+        /// <param name="del">The delegate called with a IDbDataAdapter object.</param>
+        /// <returns>A result object returned by the callback or null</returns>
+        T Execute<T>(DataAdapterDelegate<T> del);
+
+        #endregion                 
+
+        #region Queries with RowMapper<T>
+
+        IList<T> QueryWithRowMapper<T>(CommandType cmdType, string cmdText, IRowMapper<T> rowMapper);
+
+        IList<T> QueryWithRowMapper<T>(CommandType cmdType, string cmdText, IRowMapper<T> rowMapper, 
+                                       ICommandSetter commandSetter);
+
+        IList<T> QueryWithRowMapper<T>(CommandType cmdType, string cmdText, IRowMapper<T> rowMapper,
+                                       string parameterName, Enum dbType, int size, object parameterValue);
+
+        IList<T> QueryWithRowMapper<T>(CommandType cmdType, string cmdText, IRowMapper<T> rowMapper, 
+                                       IDbParameters parameters);
+
+
+        #endregion
+        
+        #region Queries with RowMapperDelegate<T>
+
+        IList<T> QueryWithRowMapperDelegate<T>(CommandType cmdType, string cmdText, RowMapperDelegate<T> rowMapperDelegate);
+
+        IList<T> QueryWithRowMapperDelegate<T>(CommandType cmdType, string cmdText, RowMapperDelegate<T> rowMapperDelegate,
+                                               ICommandSetter commandSetter);
+        
+        
+        IList<T> QueryWithRowMapperDelegate<T>(CommandType cmdType, string cmdText, RowMapperDelegate<T> rowMapperDelegate,
+                                               string parameterName, Enum dbType, int size, object parameterValue);
+        
+        IList<T> QueryWithRowMapperDelegate<T>(CommandType cmdType, string cmdText, RowMapperDelegate<T> rowMapperDelegate,
+                                               IDbParameters parameters);
+
+        
+        #endregion
+
+        #region Queries with ResultSetExtractor<T>
+
+        T QueryWithResultSetExtractor<T>(CommandType cmdType, string cmdText, IResultSetExtractor<T> resultSetExtractor);
+
+        T QueryWithResultSetExtractor<T>(CommandType cmdType, string cmdText, IResultSetExtractor<T> resultSetExtractor,
+                                         string name, Enum dbType, int size, object parameterValue);
+
+        T QueryWithResultSetExtractor<T>(CommandType cmdType, string cmdText, IResultSetExtractor<T> resultSetExtractor,
+                                         IDbParameters parameters);
+
+        T QueryWithResultSetExtractor<T>(CommandType cmdType, string cmdText, IResultSetExtractor<T> resultSetExtractor,
+                                         ICommandSetter commandSetter);
+
+        T QueryWithResultSetExtractor<T>(CommandType cmdType, string cmdText, IResultSetExtractor<T> resultSetExtractor,
+                                         CommandSetterDelegate commandSetterDelegate);
+        #endregion
+
+
+        #region Queries with ResultSetExtractorDelegate<T>
+
+        T QueryWithResultSetExtractorDelegate<T>(CommandType cmdType, string cmdText, ResultSetExtractorDelegate<T> resultSetExtractor);
+
+        T QueryWithResultSetExtractorDelegate<T>(CommandType cmdType, string cmdText, ResultSetExtractorDelegate<T> resultSetExtractor,
+                                                 string paramenterName, Enum dbType, int size, object parameterValue);
+
+        T QueryWithResultSetExtractorDelegate<T>(CommandType cmdType, string cmdText, ResultSetExtractorDelegate<T> resultSetExtractor,
+                                                 IDbParameters parameters);
+
+        T QueryWithResultSetExtractorDelegate<T>(CommandType cmdType, string cmdText, ResultSetExtractorDelegate<T> resultSetExtractor,
+                                                 ICommandSetter commandSetter);
+
+        T QueryWithResultSetExtractorDelegate<T>(CommandType cmdType, string cmdText, ResultSetExtractorDelegate<T> resultSetExtractor,
+                                                 CommandSetterDelegate commandSetterDelegate);
+        #endregion
+
+        #region Queries for Object<T>
+
+        T QueryForObject<T>(CommandType cmdType, string sql, IRowMapper<T> rowMapper);
+
+
+        T QueryForObject<T>(CommandType cmdType, string sql, IRowMapper<T> rowMapper, ICommandSetter commandSetter);
+
+
+        T QueryForObject<T>(CommandType cmdType, string sql, IRowMapper<T> rowMapper, IDbParameters parameters);
+        
+        
+        T QueryForObject<T>(CommandType cmdType, string sql, IRowMapper<T> rowMapper,
+                            string name, Enum dbType, int size, object parameterValue);
+        
+        
+
+        #endregion
+
+        #region Queries for ObjectDelegate<T>
+
+        T QueryForObjectDelegate<T>(CommandType cmdType, string sql, RowMapperDelegate<T> rowMapper);
+
+
+        T QueryForObjectDelegate<T>(CommandType cmdType, string sql, RowMapperDelegate<T> rowMapper, ICommandSetter commandSetter);
+
+
+        T QueryForObjectDelegate<T>(CommandType cmdType, string sql, RowMapperDelegate<T> rowMapper, IDbParameters parameters);
+
+
+        T QueryForObjectDelegate<T>(CommandType cmdType, string sql, RowMapperDelegate<T> rowMapper,
+                                    string name, Enum dbType, int size, object parameterValue);
+
+
+
+        #endregion
+
+        #region Query With CommandCreator
+
+        T QueryWithCommandCreator<T>(IDbCommandCreator cc, IResultSetExtractor<T> rse);
+
+        IList<T> QueryWithCommandCreator<T>(IDbCommandCreator cc, IRowMapper<T> rowMapper);
+
+        T QueryWithCommandCreator<T>(IDbCommandCreator cc, IResultSetExtractor<T> rse, IDictionary returnedParameters);
+
+        IList<T> QueryWithCommandCreator<T>(IDbCommandCreator cc, IRowMapper<T> rowMapper,
+                                            IDictionary returnedParameters);
+
+
+        IDictionary QueryWithCommandCreator<T>(IDbCommandCreator cc, IList namedResultSetProcessors);
+
+        IDictionary QueryWithCommandCreator<T, U>(IDbCommandCreator cc, IList namedResultSetProcessors);
+
+        #endregion
+
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs b/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs
new file mode 100644
index 00000000..ccbf2ec2
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs
@@ -0,0 +1,60 @@
+#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
+
+#if NET_2_0
+
+using System.Data.Common;
+
+namespace Spring.Data.Generic
+{
+
+    /// <summary>
+    /// Generic callback interface for code that operates on a 
+    /// DbCommand. 
+    /// </summary>
+    /// <typeparam name="T">The return type from executing the
+    /// callback</typeparam>
+    /// <remarks>
+    /// <p>Allows you to execute any number of operations
+    /// on a single DbCommand, for example a single ExecuteScalar
+    /// call or repeated execute calls with varying parameters.
+    /// </p>
+    /// <p>Used internally by AdoTemplate, but also useful for 
+    /// application code.  Note that the passed in DbCommand
+    /// has been created by the framework and will have its
+    /// Connection property set and the Transaction property
+    /// set based on the transaction context.</p>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+	public interface ICommandCallback<T>
+	{
+        /// <summary>
+        /// Called by AdoTemplate.Execute with an active ADO.NET IDbCommand.
+        /// The calling code does not need to care about closing the 
+        /// command or the connection, or
+        /// about handling transactions:  this will all be handled by 
+        /// Spring's AdoTemplate
+        /// </summary>
+        /// <param name="command">An active IDbCommand instance</param>
+        /// <returns>The result object</returns>
+        T DoInCommand(DbCommand command);
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs b/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs
new file mode 100644
index 00000000..5663c770
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs
@@ -0,0 +1,62 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if NET_2_0
+
+using System.Data;
+
+namespace Spring.Data.Generic
+{
+    /// <summary>
+    /// Generic callback interface for code that operates on a 
+    /// IDbDataAdapter. 
+    /// </summary>
+    /// <remarks>
+    /// <p>Allows you to execute any number of operations
+    /// on a IDbDataAdapter, for example to Fill a DataSet
+    /// or other more advanced operations such as the transfering
+    /// data between two different DataSets.
+    /// </p>
+    /// <p>Note that the passed in IDbDataAdapter
+    /// has been created by the framework and its SelectCommand
+    /// will be populated with values for CommandType and Text properties
+    /// along with Connection/Transaction properties based on the
+    /// calling transaction context.
+    ///  </p>
+    /// <see cref="Spring.Data.Generic.AdoTemplate"/> Execute(IDataAdapterCallback dataAdapterCallback)
+    /// method.
+    /// </remarks>    
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: IDataAdapterCallback.cs,v 1.1 2007/12/04 06:48:21 markpollack Exp $</version>
+    public interface IDataAdapterCallback<T>
+    {
+        /// <summary>
+        /// Called by AdoTemplate.Execute with an preconfigured
+        /// ADO.NET IDbDataAdapter instance with its SelectCommand
+        /// property populated with CommandType and Text values
+        /// along with Connection/Transaction properties based on the
+        /// calling transaction context.
+        /// </summary>
+        /// <param name="dataAdapter">An active IDbDataAdapter instance</param>
+        /// <returns>The result object</returns>
+        T DoInDataAdapter(IDbDataAdapter dataAdapter);
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs b/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs
new file mode 100644
index 00000000..d23859b9
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if NET_2_0
+
+using System.Data;
+
+namespace Spring.Data.Generic
+{
+    /// <summary>
+    /// Generic callback interface for code that operates on a 
+    /// IDbCommand. 
+    /// </summary>
+    /// <typeparam name="T">The return type from executing the
+    /// callback</typeparam>
+    /// <remarks>
+    /// <p>Allows you to execute any number of operations
+    /// on a single IDbCommand, for example a single ExecuteScalar
+    /// call or repeated execute calls with varying parameters.
+    /// </p>
+    /// <p>Used internally by AdoTemplate, but also useful for 
+    /// application code.  Note that the passed in IDbCommand
+    /// has been created by the framework and will have its
+    /// Connection property set and the Transaction property
+    /// set based on the transaction context.</p>
+    /// <p>As an alternative to using this interface you can use 
+    /// the delegate version which is particularly nice when using
+    /// anonymous delegates for writing more terse code and having
+    /// easy access to the variables in the calling class.</p>
+    /// <p>See <see cref="ICommandCallback"/> for a version that has the
+    /// base class DbCommand as the callback argument.</p>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    public interface IDbCommandCallback<T>
+    {
+        /// <summary>
+        /// Called by AdoTemplate.Execute with an active ADO.NET IDbCommand.
+        /// The calling code does not need to care about closing the 
+        /// command or the connection, or
+        /// about handling transactions:  this will all be handled by 
+        /// Spring's AdoTemplate
+        /// </summary>
+        /// <param name="command">An active IDbCommand instance</param>
+        /// <returns>The result object</returns>
+        T DoInCommand(IDbCommand command);
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs b/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs
new file mode 100644
index 00000000..f8751d84
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs
@@ -0,0 +1,50 @@
+#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
+
+#if NET_2_0
+
+using System.Data;
+
+namespace Spring.Data.Generic
+{
+    /// <summary>
+    /// Generic callback delegate for code that operates on a IDbCommand. 
+    /// </summary>
+    /// <remarks>
+    /// <p>Allows you to execute any number of operations
+    /// on a single IDbCommand, for example a single ExecuteScalar
+    /// call or repeated execute calls with varying parameters.
+    /// </p>
+    /// <p>Used internally by AdoTemplate, but also useful for 
+    /// application code.  Note that the passed in DbCommand
+    /// has been created by the framework and will have its
+    /// Connection property set and the Transaction property
+    /// set based on the transaction context.</p>
+    /// </remarks>
+    /// <typeparam name="T">The return type from executing the
+    /// callback</typeparam>
+    /// <param name="command">The ADO.NET DbCommand object</param>
+    /// <returns>The object returned from processing with the
+    /// provided DbCommand </returns>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: IDbCommandDelegate.cs,v 1.1 2007/06/27 21:41:57 markpollack Exp $</version>
+    public delegate T IDbCommandDelegate<T>(IDbCommand command);
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs b/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs
new file mode 100644
index 00000000..810b0114
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs
@@ -0,0 +1,63 @@
+#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
+
+#if NET_2_0
+
+using System.Data;
+
+namespace Spring.Data.Generic
+{
+    /// <summary>
+    /// Callback interface to process all results sets and rows in
+    /// an AdoTemplate query method.
+    /// </summary>
+    /// <remarks>Implementations of this interface perform the work
+    /// of extracting results but don't need worry about managing
+    /// ADO.NET resources, such as closing the reader. 
+    /// <p>
+    /// This interface is mainly used within the ADO.NET
+    /// framework.  An IResultSetExtractor is usually a simpler choice
+    /// for result set (DataReader) processing, in particular a 
+    /// RowMapperResultSetExtractor in combination with a IRowMapper.
+    /// </p>
+    /// <para>Note: in contracts to a IRowCallbackHandler, a ResultSetExtractor
+    /// is usually stateless and thus reusable, as long as it doesn't access
+    /// stateful resources or keep result state within the object.
+    /// </para>
+    /// </remarks>
+    /// 
+    public interface IResultSetExtractor<T>
+    {
+        /// <summary>
+        /// Implementations must implement this method to process all
+        /// result set and rows in the IDataReader.
+        /// </summary>
+        /// <param name="reader">The IDataReader to extract data from.
+        /// Implementations should not close this: it will be closed
+        /// by the AdoTemplate.</param>
+        /// <returns>An arbitrary result object or null if none.  The
+        /// extractor will typically be stateful in the latter case.</returns>
+        T ExtractData(IDataReader reader);
+        
+
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs b/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs
new file mode 100644
index 00000000..e4e635f2
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs
@@ -0,0 +1,60 @@
+#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
+
+#if NET_2_0
+
+using System.Data;
+
+namespace Spring.Data.Generic
+{
+    /// <summary>
+    /// Generic callback to process each row of data in a result set to an object.
+    /// </summary>
+    /// <remarks>Implementations of this interface perform the actual work
+    /// of mapping rows, but don't need worry about managing
+    /// ADO.NET resources, such as closing the reader.
+    /// <p>
+    /// Typically used for AdoTemplate's query methods (with RowMapperResultSetExtractor
+    /// adapters).  RowMapper objects are typically stateless and thus
+    /// reusable; they are ideal choices for implementing row-mapping logic in a single
+    /// place.
+    /// </p>
+    /// <p>Alternatively, consider subclassing MappingSqlQuery from the Spring.Data.Object
+    /// namespace:  Instead of working with separate AdoTemplate and RowMapper objects, 
+    /// you can have executable query objects (containing row-mapping logic) there.
+    /// </p>
+    /// </remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: IRowMapper.cs,v 1.4 2007/06/28 18:48:18 markpollack Exp $</version>
+    public interface IRowMapper<T>
+    {
+        /// <summary>
+        /// Implementations must implement this method to map each row of data in the
+        /// result set (DataReader).  This method should not call Next() on the 
+        /// DataReader; it should only extract the values of the current row.
+        /// </summary>
+        /// <param name="reader">The IDataReader to map (pre-initialized to the current row)</param>
+        /// <param name="rowNum">The number of the current row..</param>
+        /// <returns>The specific typed result object for the current row.</returns>
+        T MapRow(IDataReader reader, int rowNum);
+    }
+}
+
+#endif
diff --git a/src/Spring/Spring.Data/Data/Generic/NamedResultSetProcessor.cs b/src/Spring/Spring.Data/Data/Generic/NamedResultSetProcessor.cs
new file mode 100644
index 00000000..31dc1d57
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/NamedResultSetProcessor.cs
@@ -0,0 +1,123 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+
+
+#endregion
+
+using Spring.Data.Support;
+
+namespace Spring.Data.Generic
+{
+	/// <summary>
+	/// Provides a name to a ResultSetProcessor for use with AdoOperation subclasses
+	/// such as StoredProcedure.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: NamedResultSetProcessor.cs,v 1.2 2007/07/25 13:32:31 oakinger Exp $</version>
+	public class NamedResultSetProcessor<T>
+	{
+		#region Fields
+
+        private IRowCallback rowCallback;
+	    private IRowMapper<T> rowMapper;
+	    private IResultSetExtractor<T> resultSetExtractor;
+	    private string name;
+		
+	    #endregion
+
+		#region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the class with a
+        /// IRowCallback instance
+        /// </summary>
+        /// <param name="name">The name of the associated row callback for use with output 
+        /// result set mappers.</param>
+        /// <param name="rowcallback">A row callback instance.</param>
+		public NamedResultSetProcessor(string name, IRowCallback rowcallback)
+		{
+            this.name = name;
+		    this.rowCallback = rowcallback;
+		}
+	    
+	    /// <summary>
+        /// Initializes a new instance of the class with a
+        /// IRowMapper instance
+	    /// </summary>
+	    /// <param name="name">The name of the associated row mapper.</param>
+	    /// <param name="rowMapper">A IRowMapper instance.</param>
+	    public NamedResultSetProcessor(string name, IRowMapper<T> rowMapper)
+	    {
+	        this.name = name;
+	        this.rowMapper = rowMapper;
+	    }
+	    
+        /// <summary>
+        /// Initializes a new instance of the class with a
+        /// IResultSetExtractor instance
+        /// </summary>
+        /// <param name="name">The name of the associated result set extractor.</param>
+        /// <param name="resultSetExtractor">A IResultSetExtractor instance.</param>
+        public NamedResultSetProcessor(string name, IResultSetExtractor<T> resultSetExtractor)
+        {
+            this.name = name;
+            this.resultSetExtractor = resultSetExtractor;
+        }
+
+
+		#endregion
+
+		#region Properties
+	    public string Name
+	    {
+	        get
+	        {
+	            return name;
+	        }
+	    }
+
+
+        public IRowCallback RowCallback
+	    {
+	        get { return rowCallback; }
+	    }
+
+	    public IRowMapper<T> RowMapper
+	    {
+	        get { return rowMapper; }
+	    }
+
+	    public IResultSetExtractor<T> ResultSetExtractor
+	    {
+	        get { return resultSetExtractor; }
+	    }
+
+	    #endregion
+
+
+	}
+}
+
+#endif
diff --git a/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs b/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs
new file mode 100644
index 00000000..baa348e0
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs
@@ -0,0 +1,40 @@
+#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
+
+#if NET_2_0
+
+using System.Data;
+
+namespace Spring.Data.Generic
+{
+
+    /// <summary>
+    /// Callback delegate to process all result sets and row in an 
+    /// AdoTemplate query method.
+    /// </summary>
+    /// <typeparam name="T">The type returned from the result set mapping.</typeparam>
+    /// <param name="reader">The IDataReader to extract data from.
+    /// Implementations should not close this: it will be closed
+    /// by the AdoTemplate.</param>
+    /// <returns>An arbitrary result object or null if none.</returns>
+    public delegate T ResultSetExtractorDelegate<T>(IDataReader reader);
+}
+
+#endif
diff --git a/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs b/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs
new file mode 100644
index 00000000..6a0fea16
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs
@@ -0,0 +1,38 @@
+#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
+
+#if NET_2_0
+
+using System.Data;
+
+namespace Spring.Data.Generic
+{
+    /// <summary>
+    /// Callback delegate to process each row of data in a result set to an object.
+    /// </summary>
+    /// <typeparam name="T">The type of the object returned from the mapping operation.</typeparam>
+    /// <param name="dataReader">The IDataReader to map</param>
+    /// <param name="rowNum">the number of the current row.</param>
+    /// <returns>An abrirary object, typically derived from data
+    /// in the result set.</returns>
+    public delegate T RowMapperDelegate<T>(IDataReader dataReader, int rowNum);
+}
+
+#endif
diff --git a/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs b/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs
new file mode 100644
index 00000000..b0ae3e42
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs
@@ -0,0 +1,151 @@
+#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
+
+#if NET_2_0
+
+#region Imports
+
+using System.Collections.Generic;
+using System.Data;
+using Spring.Data.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Data.Generic
+{
+	/// <summary>
+	/// Adapter implementation of the ResultSetExtractor interface that delegates 
+	/// to a RowMapper which is supposed to create an object for each row.
+	/// Each object is added to the results List of this ResultSetExtractor.
+	/// </summary>
+	/// <remarks>
+	/// Useful for the typical case of one object per row in the database table.
+	/// The number of entries in the results list will match the number of rows.
+	/// <p>
+	/// Note that a RowMapper object is typically stateless and thus reusable;
+	/// just the RowMapperResultSetExtractor adapter is stateful.
+	/// </p>
+	/// <p>
+	/// As an alternative consider subclassing MappingAdoQuery from the 
+	/// Spring.Data.Objects namespace:  Instead of working with separate 
+	/// AdoTemplate and IRowMapper objects you can have executable
+	/// query objects (containing row-mapping logic) there.
+	/// </p>
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: RowMapperResultSetExtractor.cs,v 1.4 2007/08/03 19:51:10 markpollack Exp $</version>
+	public class RowMapperResultSetExtractor<T> : IResultSetExtractor<IList<T>> 
+	{
+		#region Fields
+        
+	    private IRowMapper<T> rowMapper;
+
+        private RowMapperDelegate<T> rowMapperDelegate;
+	    
+	    private int rowsExpected;
+	    
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="Spring.Data.Core.RowMapperResultSetExtractor"/> class.
+        /// </summary>
+		public RowMapperResultSetExtractor(IRowMapper<T> rowMapper) : this(rowMapper,0, null)
+		{
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RowMapperResultSetExtractor&lt;T&gt;"/> class.
+        /// </summary>
+        /// <param name="rowMapper">The row mapper.</param>
+        /// <param name="rowsExpected">The rows expected.</param>
+        public RowMapperResultSetExtractor(IRowMapper<T> rowMapper, int rowsExpected) : this(rowMapper, rowsExpected, null)
+        {
+        }
+        public RowMapperResultSetExtractor(IRowMapper<T> rowMapper, int rowsExpected, IDataReaderWrapper dataReaderWrapper)
+        {
+            //TODO use datareaderwrapper
+            AssertUtils.ArgumentNotNull(rowMapper, "rowMapper");
+
+            this.rowMapper = rowMapper;
+            this.rowsExpected = rowsExpected;
+        }
+
+        public RowMapperResultSetExtractor(RowMapperDelegate<T> rowMapperDelegate)
+            : this(rowMapperDelegate, 0, null)
+        {
+        }
+
+        public RowMapperResultSetExtractor(RowMapperDelegate<T> rowMapperDelegate, int rowsExpected)
+            : this(rowMapperDelegate, rowsExpected, null)
+        {
+        }
+        public RowMapperResultSetExtractor(RowMapperDelegate<T> rowMapperDelegate, int rowsExpected, IDataReaderWrapper dataReaderWrapper)
+        {
+            //TODO use datareaderwrapper
+            
+            AssertUtils.ArgumentNotNull(rowMapperDelegate, "rowMapperDelegate");
+
+            this.rowMapperDelegate = rowMapperDelegate;
+            this.rowsExpected = rowsExpected;
+        }
+
+		#endregion
+
+        #region IResultSetExtractor Members
+
+        public IList<T> ExtractData(IDataReader reader) 
+        {
+            // Use the more efficient collection if we know how many rows to expect:
+            // ArrayList in case of a known row count, LinkedList if unknown
+            //IList<T> results = (rowsExpected > 0) ? new List<T>(rowsExpected) : new LinkedList<T>();
+
+            //how come LinkedList<T> doesn't implement IList<T> ?!?!?!
+            //some web entries claim slow indexer...  need to write our own again?  return ICollection instead?
+            //http://blogs.msdn.com/kcwalina/archive/2005/09/23/Collections.aspx
+            //We did not implement IList<T> on LinkedList because the indexer would be 
+            //very slow. If you really need the interface, you probably can inherit from 
+            //LinkedList<T> and implement the interface on the subtype.
+            IList<T> results =  new List<T>();
+		    int rowNum = 0;
+            if (rowMapper != null)
+            {
+                while (reader.Read())
+                {
+                    results.Add(rowMapper.MapRow(reader, rowNum++));
+                }  
+            }
+            else
+            {
+                while (reader.Read())
+                {
+                    results.Add(rowMapperDelegate(reader, rowNum++));
+                }
+            }
+
+            return results;
+        }
+
+        #endregion
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/IAdoOperations.cs b/src/Spring/Spring.Data/Data/IAdoOperations.cs
new file mode 100644
index 00000000..c22b9cff
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/IAdoOperations.cs
@@ -0,0 +1,747 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// Interface that defines ADO.NET related database operations.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IAdoOperations.cs,v 1.24 2007/12/04 06:52:19 markpollack Exp $</version>
+	public interface IAdoOperations : ICommonAdoOperations
+	{        
+
+        #region General Execute Methods with Callbacks
+        /// <summary>
+        /// Execute a ADO.NET operation on a command object using a delegate callback.
+        /// </summary>
+        /// <remarks>This allows for implementing arbitrary data access operations
+        /// on a single command within Spring's managed ADO.NET environment.</remarks>
+        /// <param name="del">The delegate called with a command object.</param>
+        /// <returns>A result object returned by the action or null</returns>
+        object Execute(CommandDelegate del);
+
+        /// <summary>
+        /// Execute a ADO.NET operation on a command object using an interface based callback.
+        /// </summary>
+        /// <param name="action">the callback to execute</param>
+        /// <returns>object returned from callback</returns>
+        object Execute(ICommandCallback action);
+        
+        /// <summary>
+        /// Executes ADO.NET operations on a command object, created by the provided IDbCommandCreator,
+        /// using the interface based callback IDbCommandCallback.
+        /// </summary>
+        /// <param name="commandCreator">The command creator.</param>
+        /// <param name="action">The callback to execute based on IDbCommand</param>
+        /// <returns>A result object returned by the action or null</returns>
+        object Execute(IDbCommandCreator commandCreator, ICommandCallback action);
+
+        /// <summary>
+        /// Execute ADO.NET operations on a IDbDataAdapter object using an interface based callback.
+        /// </summary>
+        /// <remarks>This allows for implementing abritrary data access operations
+        /// on a single DataAdapter within Spring's managed ADO.NET environment.
+        /// </remarks>
+        /// <param name="dataAdapterCallback">The data adapter callback.</param>
+        /// <returns>A result object returned by the callback or null</returns>
+	    object Execute(IDataAdapterCallback dataAdapterCallback);
+	    
+        #endregion 
+	    
+
+	    
+
+	    
+        #region Queries With ResultSetExtractor
+
+	    // Static Queries
+
+        /// <summary>
+        /// Execute a query given IDbCommand's type and text, processing a 
+        /// single result set with an instance of IResultSetExtractor
+        /// </summary>
+        /// <param name="cmdType">The type of command</param>
+        /// <param name="cmdText">The text of the query.</param>
+        /// <param name="resultSetExtractor">Object that will extract all rows of a result set</param>
+        /// <returns>An arbitrary result object, as returned by the IResultSetExtractor</returns>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        object QueryWithResultSetExtractor(CommandType cmdType, string cmdText, IResultSetExtractor resultSetExtractor);
+
+
+	    // Parameterized Queries
+	    
+
+        //only input parameters can be used...
+
+
+        /// <summary>
+        /// Execute a query given IDbCommand's type and text with parameters set
+        /// via the command setter, processing a 
+        /// single result set with an instance of IResultSetExtractor
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="resultSetExtractor">The result set extractor.</param>
+        /// <param name="commandSetter">The command setter.</param>
+        /// <returns>An arbitrary result object, as returned by the IResultSetExtractor</returns>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        object QueryWithResultSetExtractor(CommandType cmdType, string cmdText, IResultSetExtractor resultSetExtractor, 
+                                           ICommandSetter commandSetter);
+
+        //only input parameters can be used.
+        object QueryWithResultSetExtractor(CommandType commandType, string cmdText, IResultSetExtractor resultSetExtractor,
+                                           string parameterName, Enum dbType, int size, object parameterValue);
+
+        //iterate over one or more result sets and then assign output parameters.
+        object QueryWithResultSetExtractor(CommandType commandType, string cmdText, IResultSetExtractor resultSetExtractor,
+                                           IDbParameters parameters);
+
+	    
+        #endregion
+
+        #region Queries With ResultSetExtractorDelegate
+
+        // Static Queries
+
+        /// <summary>
+        /// Execute a query given static SQL/Stored Procedure name 
+        /// and process a single result set with an instance of ResultSetExtractorDelegate
+        /// </summary>
+        /// <param name="cmdType">The type of command.</param>
+        /// <param name="cmdText">The command text.</param>
+        /// <param name="resultSetExtractorDelegate">Delegate that will extract all rows of a result set</param>
+        /// <returns>An arbitrary result object, as returned by the IResultSetExtractor</returns>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>        
+        object QueryWithResultSetExtractorDelegate(CommandType cmdType, string cmdText, ResultSetExtractorDelegate resultSetExtractorDelegate);
+
+
+        // Parameterized Queries
+
+
+        //only input parameters can be used...
+        object QueryWithResultSetExtractorDelegate(CommandType commandType, string sql, ResultSetExtractorDelegate resultSetExtractorDelegate, 
+                                                   ICommandSetter commandSetter);
+
+        //only input parameters can be used.
+        object QueryWithResultSetExtractorDelegate(CommandType commandType, string sql, ResultSetExtractorDelegate resultSetExtractorDelegate,
+                                                   string parameterName, Enum dbType, int size, object parameterValue);
+
+        //iterate over one or more result sets and then assign output parameters.
+        object QueryWithResultSetExtractorDelegate(CommandType commandType, string sql, ResultSetExtractorDelegate resultSetExtractorDelegate, 
+                                                   IDbParameters parameter);
+
+
+        #endregion
+	    
+        #region Queries with RowMapperDelegate
+
+        IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelgate);
+
+        IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelgate, ICommandSetter commandSetter);
+
+        IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelgate,
+                                         string parameterName, Enum dbType, int size, object parameterValue);
+
+        IList QueryWithRowMapperDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelgate, IDbParameters parameter);
+
+
+        #endregion
+	    
+        #region Queries with RowMapper
+
+        // Static Queries
+
+
+        /// <summary>
+        /// Execute a query given static SQL, mapping each row to a .NET object
+        /// iva a RowMapper
+        /// </summary>
+        /// <param name="cmdType">The type of command</param>
+        /// <param name="cmdText">SQL query to execute</param>
+        /// <param name="rowMapper">object that will map one object per row</param>
+        /// <returns>the result list containing mapped objects</returns>
+        IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper);
+
+	    // Parameterized Queries
+
+        //Using IRowMapper to process 1 result set
+        IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper, ICommandSetter commandSetter);
+
+        IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper,
+                    string name, Enum dbType, int size, object parameterValue);
+
+        IList QueryWithRowMapper(CommandType cmdType, string cmdText, IRowMapper rowMapper, IDbParameters parameter);
+
+
+	    
+        #endregion
+
+        #region Query for Object 
+
+
+
+   	  
+	    
+        /// <summary>
+        /// Execute a query with the specified command text, mapping a single result 
+        /// row to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapper">object that will map one object per row</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+	    object QueryForObject(CommandType cmdType, string cmdText, IRowMapper rowMapper);
+
+
+        /// <summary>
+        /// Execute a query with the specified command text and parameters set via the
+        /// command setter, mapping a single result row to an object via a RowMapper.  
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapper">object that will map one object per row</param>
+        /// <param name="commandSetter">The command setter.</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        object QueryForObject(CommandType cmdType, string cmdText, IRowMapper rowMapper, ICommandSetter commandSetter);
+
+        /// <summary>
+        /// Execute a query with the specified command text and parameters, mapping a single result row
+        /// to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapper">object that will map one object per row</param>
+        /// <param name="parameters">The parameter collection to use in the query.</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        object QueryForObject(CommandType cmdType, string cmdText, IRowMapper rowMapper, IDbParameters parameters);
+
+        /// <summary>
+        /// Execute a query with the specified command text and parameter, mapping a single result row
+        /// to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapper">object that will map one object per row</param>
+        /// <param name="parameterName">The name of the parameter to map.</param>
+        /// <param name="dbType">One of the database parameter type enumerations.</param>
+        /// <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        object QueryForObject(CommandType cmdType, string cmdText, IRowMapper rowMapper,
+                              string parameterName, Enum dbType, int size, object parameterValue);	    
+
+	    
+        /*
+        /// <summary>
+        /// Execute a query for a result list, given static SQL.
+        /// </summary>
+        /// <remarks>
+        /// The results will be mapped to a List (one entry for each row)
+        /// of IDictionaries (one entry for each column using he column 
+        /// name as the key).  Each element in the list will be of the form
+        /// returned by ths interfaces QueryForMap() methods.
+        /// </remarks>
+        /// <param name="cmdType">The type of the command.</param>
+        /// <param name="sql">The SQL query to execute</param>
+        /// <returns></returns>
+	    IList QueryForList(CommandType cmdType, string sql);
+        */
+	    //IDictionary QueryForDictionary(CommandType cmdType, string sql);
+        //TODO -
+        //Object QueryForObject(CommandType cmdType, String sql, Type requiredType) throws DataAccessException;
+	    //IDictionary QueryForDictionary
+	    //IList QueryForList
+
+        #endregion
+
+        #region Query for ObjectDelegate
+
+        /// <summary>
+        /// Execute a query with the specified command text, mapping a single result 
+        /// row to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapperDelgate">delegate that will map one object per row</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        object QueryForObjectDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelgate);
+
+
+
+        /// <summary>
+        /// Execute a query with the specified command text and parameters set via the
+        /// command setter, mapping a single result row to an object via a RowMapper.  
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapperDelegate">delegate that will map one object per row</param>
+        /// <param name="commandSetter">The command setter.</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        object QueryForObjectDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate, ICommandSetter commandSetter);
+
+
+        /// <summary>
+        /// Execute a query with the specified command text and parameters, mapping a single result row
+        /// to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapperDelegate">delegate that will map one object per row</param>
+        /// <param name="parameters">The parameter collection to use in the query.</param>
+        /// <returns>The single mapped object.</returns>
+        /// <exception cref="Spring.Dao.IncorrectResultSizeDataAccessException">
+        /// If the query does not return exactly one row.
+        /// </exception>
+        /// <exception cref="Spring.Dao.DataAccessException">
+        /// If there is any problem executing the query.
+        /// </exception>
+        object QueryForObjectDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate, IDbParameters parameters);
+
+
+        /// <summary>
+        /// Execute a query with the specified command text and parameter, mapping a single result row
+        /// to an object via a RowMapper.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="rowMapperDelegate">delegate that will map one object per row</param>
+        /// <param name="parameterName">The name of the parameter to map.</param>
+        /// <param name="dbType">One of the database parameter type enumerations.</param>
+        /// <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        /// <returns></returns>
+        object QueryForObjectDelegate(CommandType cmdType, string cmdText, RowMapperDelegate rowMapperDelegate,
+                                      string parameterName, Enum dbType, int size, object parameterValue);	    
+
+	    
+        #endregion
+
+        #region Query With CommandCreator
+
+        // Using IResultSetExtractor to process one result set.
+        object QueryWithCommandCreator(IDbCommandCreator commandCreator, IResultSetExtractor resultSetExtractor);
+
+	    IList QueryWithCommandCreator(IDbCommandCreator cc, IRowMapper rowMapper);
+
+        // Using IResultSetExtractor to return one result set, multiple output parameters.
+        object QueryWithCommandCreator(IDbCommandCreator commandCreator, IResultSetExtractor resultSetExtractor, IDictionary returnedParameters);
+
+        // Using IRowMapper to return one result set, multiple output parameters.
+        IList QueryWithCommandCreator(IDbCommandCreator commandCreator, IRowMapper rowMapper, IDictionary returnedParameters);
+       	   
+       
+	    // Multiple return result sets, (A list of lists) 
+	    // each with either a IRowMapper, IResultSetExtractor, IRowCallback
+	    // and multiple output parameters.
+	    IDictionary QueryWithCommandCreator(IDbCommandCreator commandCreator, IList resultProcessors);
+       
+	    //TODO
+	    //Object QueryForObject(... Type requiredType)
+        //IDictionary QueryForDictionary
+        //IList QueryForList
+	    
+        #endregion
+	    
+        // ***************************************************************
+	    // NB: Complex DataSet/DataTable operations are best handled with
+	    //     DataSetOperations class in Spring.Data.Objects
+	    // ***************************************************************
+        
+	    #region DataTable Create operations without parameters
+	    
+        DataTable DataTableCreate(CommandType commandType, string sql);
+	    
+        DataTable DataTableCreate(CommandType commandType, string sql,
+                                  string tableMappingName);	  
+	    
+        DataTable DataTableCreate(CommandType commandType, string sql, 
+                                  ITableMapping tableMapping);
+	    
+        DataTable DataTableCreate(CommandType commandType, string sql, 
+                                  ITableMapping tableMapping,
+                                  IDataAdapterSetter setter);	
+	    
+        #endregion
+	    
+        #region DataTable Create operations with parameters
+	    
+        DataTable DataTableCreateWithParams(CommandType commandType, string sql,
+                                  IDbParameters parameters);
+        
+        DataTable DataTableCreateWithParams(CommandType commandType, string sql,
+                                  IDbParameters parameters,
+                                  string tableMappingName);	    
+
+        DataTable DataTableCreateWithParams(CommandType commandType, string sql,
+                                  IDbParameters parameters,
+                                  ITableMapping tableMapping);
+	    
+        DataTable DataTableCreateWithParams(CommandType commandType, string sql, 
+                                  IDbParameters parameters,
+                                  ITableMapping tableMapping,
+                                  IDataAdapterSetter dataAdapterSetter);	 
+	    
+	    
+	    //TODO
+	    /*
+        DataTable DataTableCreateWithParams(IDbDataAdapterCreator dataAdapterCreator);
+        */
+	    
+        #endregion
+	    
+        #region DataTable Fill operations without parameters
+        /// <summary>
+        /// Fill a  <see cref="DataTable"/> based on a select command that requires no parameters.
+        /// </summary>
+        /// <param name="dataTable">The <see cref="DataTable"/> to populate</param>
+        /// <param name="commandType">The type of command</param>
+        /// <param name="sql">SQL query to execute</param>
+        /// <returns>The number of rows successfully added to or refreshed in the  <see cref="DataTable"/></returns>
+	    int DataTableFill(DataTable dataTable, CommandType commandType, string sql);
+	    
+        int DataTableFill(DataTable dataTable, CommandType commandType, string sql,
+                          string tableMappingName);	  
+	    
+        int DataTableFill(DataTable dataTable, CommandType commandType, string sql, 
+                          ITableMapping tableMapping);
+	    
+        int DataTableFill(DataTable dataTable, CommandType commandType, string sql, 
+                          ITableMapping tableMapping,
+                          IDataAdapterSetter setter);
+	        
+	    
+        #endregion
+	    
+        #region DataTable Fill operations with parameters
+        
+        int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql,
+                          IDbParameters parameters);
+        
+        int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql,
+                          IDbParameters parameters,
+                          string tableName);	    
+
+        int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql,
+                          IDbParameters parameters,
+                          ITableMapping tableMapping);
+	    
+        int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql, 
+                          IDbParameters parameters,
+                          ITableMapping tableMapping,
+                          IDataAdapterSetter dataAdapterSetter);	 
+	    
+	    //TODO
+	    /*
+        int DataTableFillWithParams(DataTable dataTable, 
+                          IDbDataAdapterCreator dataAdapterCreator);	 
+	    
+	    */
+        #endregion
+	    
+        #region DataTable Update operations
+        //TODO conflict options...
+	    
+        int DataTableUpdateWithCommandBuilder(DataTable dataTable,
+            CommandType commandType,
+            string selectSql,
+            IDbParameters parameters,
+            string tableName);
+	    
+        int DataTableUpdateWithCommandBuilder(DataTable dataTable,
+            CommandType commandType,
+            string selectSql,
+            IDbParameters parameters,	                                          
+            string tableName,
+            IDataAdapterSetter dataAdapterSetter);
+
+        int DataTableUpdateWithCommandBuilder(DataTable dataTable,
+            CommandType commandType,
+            string selectSql,
+            IDbParameters parameters,                                              
+            ITableMapping tableMapping,
+            IDataAdapterSetter dataAdapterSetter);		       
+	    
+        int DataTableUpdate(DataTable dataTable, 
+            string tableName,
+            CommandType insertCommandtype, string insertSql, IDbParameters insertParameters,
+            CommandType updateCommandtype, string updateSql, IDbParameters updateParameters,
+            CommandType deleteCommandtype, string deleteSql, IDbParameters deleteParameters);                          
+	    
+        int DataTableUpdate(DataTable dataTable, 
+            string tableName,
+            CommandType insertCommandtype, string insertSql, IDbParameters insertParameters,
+            CommandType updateCommandtype, string updateSql, IDbParameters updateParameters,
+            CommandType deleteCommandtype, string deleteSql, IDbParameters deleteParameters,
+            IDataAdapterSetter dataAdapterSetter); 
+	    
+        int DataTableUpdate(DataTable dataTable, 
+            ITableMapping tableMapping,
+            CommandType insertCommandtype, string insertSql, IDbParameters insertParameters,
+            CommandType updateCommandtype, string updateSql, IDbParameters updateParameters,
+            CommandType deleteCommandtype, string deleteSql, IDbParameters deleteParameters,
+            IDataAdapterSetter dataAdapterSetter); 	    
+    
+        
+	    
+        #endregion	    	    
+	    
+        #region DataSet Create operations without parameters
+	    
+	    DataSet DataSetCreate(CommandType commandType, string sql);
+	    
+        DataSet DataSetCreate(CommandType commandType, string sql,
+                              string[] tableNames);
+	    
+        DataSet DataSetCreate(CommandType commandType, string sql, 
+                              ITableMappingCollection tableMapping);
+	    
+        DataSet DataSetCreate(CommandType commandType, string sql, 
+                              ITableMappingCollection tableMapping,
+                              IDataAdapterSetter setter);
+	    
+        DataSet DataSetCreate(CommandType commandType, string sql, 
+                              ITableMappingCollection tableMapping,
+                              IDataAdapterSetter setter,
+                              IDataSetFillLifecycleProcessor fillLifecycleProcessor);	
+        #endregion
+	    
+        #region DataSet Create operations with parameters
+	    
+        DataSet DataSetCreateWithParams(CommandType commandType, string sql,
+                              IDbParameters parameters);
+        
+        DataSet DataSetCreateWithParams(CommandType commandType, string sql,
+                              IDbParameters parameters,
+                              string[] tableNames);	    
+
+        DataSet DataSetCreateWithParams(CommandType commandType, string sql,
+                              IDbParameters parameters,
+                              ITableMappingCollection tableMapping);
+	    
+        DataSet DataSetCreateWithParams(CommandType commandType, string sql, 
+                                IDbParameters parameters,
+                                ITableMappingCollection tableMapping,
+                                IDataAdapterSetter dataAdapterSetter);	 
+	    
+        DataSet DataSetCreateWithParams(CommandType commandType, string sql, 
+                                IDbParameters parameters,
+                                ITableMappingCollection tableMapping,
+                                IDataAdapterSetter dataAdapterSetter,
+                                IDataSetFillLifecycleProcessor fillLifecycleProcessor);	 
+	    	    
+        #endregion
+	    
+        #region DataSet Fill operations without parameters
+	    
+	    /// <summary>
+	    /// Fill a  <see cref="DataSet"/> based on a select command that requires no parameters.
+	    /// </summary>
+	    /// <param name="dataSet">The <see cref="DataSet"/> to populate</param>
+	    /// <param name="commandType">The type of command</param>
+	    /// <param name="sql">SQL query to execute</param>
+	    /// <returns>The number of rows successfully added to or refreshed in the  <see cref="DataSet"/></returns>
+	    int DataSetFill(DataSet dataSet, CommandType commandType, string sql);
+	    
+	    /// <summary>
+	    /// Fill a  <see cref="DataSet"/> based on a select command that requires no parameters
+	    /// that returns one or more result sets that are added as 
+	    /// <see cref="DataTable"/>s to the <see cref="DataSet"/>
+	    /// </summary>
+	    /// <param name="dataSet">The <see cref="DataSet"/> to populate</param>
+	    /// <param name="commandType">The type of command</param>
+	    /// <param name="sql">SQL query to execute</param>
+	    /// <param name="tableNames">The mapping of table names for each <see cref="DataTable"/>
+	    /// created</param>
+	    /// <returns></returns>
+	    int DataSetFill(DataSet dataSet, CommandType commandType, string sql,
+	                    string[] tableNames);
+	    
+        int DataSetFill(DataSet dataSet, CommandType commandType, string sql, 
+                        ITableMappingCollection tableMapping);
+	    
+	    int DataSetFill(DataSet dataSet, CommandType commandType, string sql, 
+	                    ITableMappingCollection tableMapping,
+	                    IDataAdapterSetter setter);
+	    
+        int DataSetFill(DataSet dataSet, CommandType commandType, string sql, 
+                        ITableMappingCollection tableMapping,
+                        IDataAdapterSetter setter,
+                        IDataSetFillLifecycleProcessor fillLifecycleProcessor);	
+	    
+        #endregion
+	    
+	    #region DataSet Fill operations with parameters
+        
+	    int DataSetFillWithParameters(DataSet dataSet, CommandType commandType, string sql,
+                        IDbParameters parameters);
+        
+	    int DataSetFillWithParameters(DataSet dataSet, CommandType commandType, string sql,
+	                    IDbParameters parameters,
+                        string[] tableNames);	    
+
+        int DataSetFillWithParameters(DataSet dataSet, CommandType commandType, string sql,
+                        IDbParameters parameters,
+                        ITableMappingCollection tableMapping);
+	    
+        int DataSetFillWithParameters(DataSet dataSet, CommandType commandType, string sql, 
+                        IDbParameters parameters,
+                        ITableMappingCollection tableMapping,
+                        IDataAdapterSetter dataAdapterSetter);	 
+	    
+        int DataSetFillWithParameters(DataSet dataSet, CommandType commandType, string sql, 
+                        IDbParameters parameters,
+                        ITableMappingCollection tableMapping,
+                        IDataAdapterSetter dataAdapterSetter,
+                        IDataSetFillLifecycleProcessor fillLifecycleProcessor);	 	       
+	    
+        #endregion	   
+	    
+        #region DataSet Update operations
+	    //TODO expose RowUpdate event in a generic manner
+	    //TODO any way to integrate Accept/RejectChanges based on tx outcome?
+
+        int DataSetUpdateWithCommandBuilder(DataSet dataSet,
+            CommandType commandType,
+            string selectSql,
+            IDbParameters selectParameters,
+            string tableName);
+	    
+        int DataSetUpdateWithCommandBuilder(DataSet dataSet,
+            CommandType commandType,
+            string selectSql,
+            IDbParameters selectParameters,	                                          
+            string tableName,
+            IDataAdapterSetter dataAdapterSetter);
+
+        int DataSetUpdateWithCommandBuilder(DataSet dataSet,
+            CommandType commandType,
+            string selectSql,
+            IDbParameters selectParameters,                                              
+            ITableMappingCollection tableMapping,
+            IDataAdapterSetter dataAdapterSetter);	
+	     
+	    
+	    int DataSetUpdate(DataSet dataSet, 
+	                      string tableName,
+	                      IDbCommand insertCommand,
+	                      IDbCommand updateCommand,
+	                      IDbCommand deleteCommand);
+	    
+	    
+        int DataSetUpdate(DataSet dataSet, 
+            string tableName,
+            CommandType insertCommandtype, string insertSql, IDbParameters insertParameters,
+            CommandType updateCommandtype, string updateSql, IDbParameters updateParameters,
+            CommandType deleteCommandtype, string deleteSql, IDbParameters deleteParameters);                          
+	    
+	    
+        int DataSetUpdate(DataSet dataSet, 
+                            string tableName,
+                            IDbCommand insertCommand,
+                            IDbCommand updateCommand,
+                            IDbCommand deleteCommand,
+                            IDataAdapterSetter dataAdapterSetter);
+
+        int DataSetUpdate(DataSet dataSet, 
+                          ITableMappingCollection tableMapping,
+                          IDbCommand insertCommand,
+                          IDbCommand updateCommand,
+                          IDbCommand deleteCommand);	    
+        
+	    int DataSetUpdate(DataSet dataSet, 
+                            ITableMappingCollection tableMapping,
+                            IDbCommand insertCommand,
+                            IDbCommand updateCommand,
+                            IDbCommand deleteCommand,
+	                        IDataAdapterSetter dataAdapterSetter);	
+	    
+        #endregion
+	    
+        #region Parameter Creation Helper Methods
+	    
+	    IDbParameters CreateDbParameters();
+	    
+	    /// <summary>
+	    /// Note that output parameters are marked input/output after derivation....
+	    /// (TODO - double check....)
+	    /// </summary>
+	    /// <param name="procedureName"></param>
+	    /// <returns></returns>
+	    IDataParameter[] DeriveParameters(string procedureName);
+	    
+	    IDataParameter[] DeriveParameters(string procedureName, bool includeReturnParameter);
+
+        #endregion
+	}
+
+
+}
diff --git a/src/Spring/Spring.Data/Data/ICommandCallback.cs b/src/Spring/Spring.Data/Data/ICommandCallback.cs
new file mode 100644
index 00000000..3ba7f388
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/ICommandCallback.cs
@@ -0,0 +1,53 @@
+#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.Data;
+
+namespace Spring.Data
+{
+	/// <summary>
+    /// Generic callback interface for code that operates on a 
+    /// IDbCommand. 
+	/// </summary>
+	/// <remarks>
+	/// <p>Allows you to execute any number of operations
+	/// on a single IDbCommand, for example a single ExecuteScalar
+	/// call or repeated execute calls with varying parameters.
+	/// </p>
+	/// <p>Used internally by AdoTemplate, but also useful for 
+	/// application code.  Note that the passed in IDbCommand
+	/// has been created by the framework.  </p>
+	/// </remarks>
+	/// <author>Mark Pollack</author>
+	public interface ICommandCallback
+	{
+        /// <summary>
+        /// Called by AdoTemplate.Execute with an active ADO.NET IDbCommand.
+        /// The calling code does not need to care about closing the 
+        /// command or the connection, or
+        /// about handling transactions:  this will all be handled by 
+        /// Spring's AdoTemplate
+        /// </summary>
+        /// <param name="command">An active IDbCommand instance</param>
+        /// <returns>The result object</returns>
+        object DoInCommand(IDbCommand command);
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/ICommandSetter.cs b/src/Spring/Spring.Data/Data/ICommandSetter.cs
new file mode 100644
index 00000000..71d3ce58
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/ICommandSetter.cs
@@ -0,0 +1,43 @@
+#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
+
+#region Imports
+
+using System.Data;
+
+#endregion
+
+namespace Spring.Data
+{
+    
+	/// <summary>
+	/// Called by the AdoTemplate class to allow implementations
+	/// to set any necessary parameters on the command object.
+	/// The CommandType and CommandText will have already been supplied.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: ICommandSetter.cs,v 1.5 2006/12/02 07:35:23 markpollack Exp $</version>
+	public interface ICommandSetter 
+	{
+	    
+	    
+        void SetValues(IDbCommand dbCommand);
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/ICommandTextProvider.cs b/src/Spring/Spring.Data/Data/ICommandTextProvider.cs
new file mode 100644
index 00000000..9d19b423
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/ICommandTextProvider.cs
@@ -0,0 +1,39 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// Interface to be implemented by objects that can provide SQL strings
+    /// </summary>
+    /// <remarks>Typically implemented by IDbCommandCreator and 
+    /// ICommandCallbacks that want to expose the CommandText they
+    /// use to create their ADO.NET commands, to allow for better
+    /// contextual information in case of exceptions</remarks>
+    /// <author>Mark Pollack(.NET)</author>
+    /// <author>Juergen Hoeller</author>
+    public interface ICommandTextProvider
+    {
+        string CommandText
+        {
+            get;
+        }
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/ICommonAdoOperations.cs b/src/Spring/Spring.Data/Data/ICommonAdoOperations.cs
new file mode 100644
index 00000000..18658692
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/ICommonAdoOperations.cs
@@ -0,0 +1,248 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data
+{
+    public interface ICommonAdoOperations
+    {
+        #region ExecuteScalar
+
+        /// <summary>
+        /// Execute the query with the specified command text returning a scalar result
+        /// </summary>
+        /// <remarks>No parameters are used.  As with 
+        /// IDbCommand.ExecuteScalar, it returns the first column of the first row in the resultset
+        /// returned by the query.  Extra columns or row are ignored.</remarks>
+        /// <param name="cmdType">The command type</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <returns>The first column of the first row in the result set.</returns>
+        object ExecuteScalar(CommandType cmdType, string cmdText);
+
+
+        /// <summary>
+        /// Execute the query with the specified command text and parameter returning a scalar result
+        /// </summary>
+        /// <param name="cmdType">The command type</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="parameterName">The name of the parameter to map.</param>
+        /// <param name="dbType">One of the database parameter type enumerations.</param>
+        /// <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        /// <returns>The first column of the first row in the result set</returns>
+        object ExecuteScalar(CommandType cmdType, string cmdText,
+                             string parameterName, Enum dbType, int size, object parameterValue);
+
+        /// <summary>
+        /// Execute the query with the specified command text and parameters returning a scalar result
+        /// </summary>
+        /// <param name="cmdType">The command type</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="parameters">The parameter collection to map.</param>
+        /// <returns>The first column of the first row in the result set</returns>
+        object ExecuteScalar(CommandType cmdType, string cmdText,
+                             IDbParameters parameters);
+
+        /// <summary>
+        /// Execute the query with the specified command text and parameters set via the
+        /// command setter, returning a scalar result
+        /// </summary>
+        /// <param name="cmdType">The command type</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="commandSetter">The command setter.</param>
+        /// <returns>The first column of the first row in the result set</returns>
+        object ExecuteScalar(CommandType cmdType,
+                             string cmdText,
+                             ICommandSetter commandSetter);
+
+        /// <summary>
+        /// Execute the query with a command created via IDbCommandCreator and 
+        /// parameters
+        /// </summary>
+        /// <remarks>Output parameters can be retrieved via the returned
+        /// dictionary.
+        /// <para>
+        /// More commonly used as a lower level support method within the framework,
+        /// for example StoredProcedure/AdoScalar.
+        /// </para>
+        /// </remarks>
+        /// <param name="commandCreator">The callback to create a IDbCommand.</param>
+        /// <returns>A dictionary containing output parameters, if any</returns>
+        IDictionary ExecuteScalar(IDbCommandCreator commandCreator);
+
+        #endregion	
+        
+        #region ExecuteNonQuery
+
+        /// <summary>
+        /// Executes a non query returning the number of rows affected.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <returns>The number of rows affected.</returns>
+        int ExecuteNonQuery(CommandType cmdType, string cmdText);
+
+        /// <summary>
+        /// Executes a non query returning the number of rows affected.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="parameterName">The name of the parameter to map.</param>
+        /// <param name="dbType">One of the database parameter type enumerations.</param>
+        /// <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        /// <returns>The number of rows affected.</returns>
+        int ExecuteNonQuery(CommandType cmdType, string cmdText,
+                            string parameterName, Enum dbType, int size, object parameterValue);
+
+        /// <summary>
+        /// Executes a non query returning the number of rows affected.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="parameters">The parameter collection to map.</param>
+        /// <returns>The number of rows affected.</returns>
+        int ExecuteNonQuery(CommandType cmdType, string cmdText,
+                            IDbParameters parameters);
+
+        /// <summary>
+        /// Executes a non query with parameters set via the
+        /// command setter, returning the number of rows affected.
+        /// </summary>
+        /// <param name="cmdType">The command type.</param>
+        /// <param name="cmdText">The command text to execute.</param>
+        /// <param name="commandSetter">The command setter.</param>
+        /// <returns>The number of rows affected.</returns>
+        int ExecuteNonQuery(CommandType cmdType, string cmdText,
+                            ICommandSetter commandSetter);
+        
+        
+        /// <summary>
+        /// Executes a non query with a command created via IDbCommandCreator and
+        /// parameters.
+        /// </summary>
+        /// <remarks>Output parameters can be retrieved via the returned
+        /// dictionary.
+        /// <para>
+        /// More commonly used as a lower level support method within the framework,
+        /// for example StoredProcedure/AdoScalar.
+        /// </para>
+        /// </remarks>
+        /// <param name="commandCreator">The callback to create a IDbCommand.</param>
+        /// <returns>The number of rows affected.</returns>
+        IDictionary ExecuteNonQuery(IDbCommandCreator commandCreator);
+
+
+        #endregion
+        
+        #region Query with RowCallback
+
+        /// <summary>
+        /// Execute a query given IDbCommand's type and text, reading a 
+        /// single result set on a per-row basis with a <see cref="IRowCallback"/>.
+        /// </summary>
+        /// <param name="cmdType">The type of command.</param>
+        /// <param name="cmdText">The text of the query.</param>
+        /// <param name="rowCallback">callback that will extract results
+        /// one row at a time.
+        /// </param>
+        void QueryWithRowCallback(CommandType cmdType, string cmdText, IRowCallback rowCallback);
+        
+
+        /// <summary>
+        /// Execute a query given IDbCommand's type and text and provided parameter
+        /// information, reading a 
+        /// single result set on a per-row basis with a <see cref="IRowCallback"/>.
+        /// </summary>
+        /// <param name="cmdType">The type of command</param>
+        /// <param name="cmdText">The text of the query.</param>
+        /// <param name="rowCallback">callback that will extract results
+        /// one row at a time.
+        /// </param>
+        /// <param name="parameterName">The name of the parameter to map.</param>
+        /// <param name="dbType">One of the database parameter type enumerations.</param>
+        /// <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+        /// <param name="parameterValue">The parameter value.</param>
+        void QueryWithRowCallback(CommandType cmdType, string cmdText, IRowCallback rowCallback,
+                                  string parameterName, Enum dbType, int size, object parameterValue);
+
+        /// <summary>
+        /// Execute a query given IDbCommand's type and text and provided IDbParameters,
+        /// reading a single result set on a per-row basis with a <see cref="IRowCallback"/>.
+        /// </summary>
+        /// <param name="cmdType">Type of the command.</param>
+        /// <param name="cmdText">The text of the query.</param>
+        /// <param name="rowCallback">callback that will extract results
+        /// one row at a time.</param>
+        /// <param name="parameters">The parameter collection to map.</param>
+        void QueryWithRowCallback(CommandType cmdType, string cmdText, IRowCallback rowCallback,
+                                  IDbParameters parameters);
+
+        /// <summary>
+        /// Execute a query given IDbCommand's type and text by 
+        /// passing the created IDbCommand to a ICommandSetter implementation 
+        /// that knows how to bind values to the IDbCommand, reading a 
+        /// single result set on a per-row basis with a <see cref="IRowCallback"/>.
+        /// </summary>
+        /// <param name="cmdType">The type of command</param>
+        /// <param name="cmdText">The text of the query.</param>
+        /// <param name="rowCallback">callback that will extract results
+        /// one row at a time.
+        /// </param>
+        /// <param name="commandSetter">The command setter.</param>
+        void QueryWithRowCallback(CommandType cmdType, String cmdText, IRowCallback rowCallback,
+                                  ICommandSetter commandSetter);
+
+
+        #endregion
+
+        #region Query with RowCallback Delegate
+
+        void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate);
+
+        void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate, ICommandSetter commandSetter);
+
+
+        void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate,
+                        string name, Enum dbType, int size, object parameterValue);
+
+
+        void QueryWithRowCallbackDelegate(CommandType cmdType, string sql, RowCallbackDelegate rowCallbackDelegate, IDbParameters parameters);
+
+        #endregion
+
+        #region Query with CommandCreator
+
+        void QueryWithCommandCreator(IDbCommandCreator cc, IRowCallback rowCallback);
+
+        void QueryWithCommandCreator(IDbCommandCreator cc, IRowCallback rowCallback, IDictionary returnedParameters);
+
+        #endregion 
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/IDataAdapterCallback.cs b/src/Spring/Spring.Data/Data/IDataAdapterCallback.cs
new file mode 100644
index 00000000..987df433
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/IDataAdapterCallback.cs
@@ -0,0 +1,63 @@
+#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
+
+#region Imports
+
+using System.Data;
+
+#endregion
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// Generic callback interface for code that operates on a 
+    /// IDbDataAdapter. 
+    /// </summary>
+    /// <remarks>
+    /// <p>Allows you to execute any number of operations
+    /// on a IDbDataAdapter, for example to Fill a DataSet
+    /// or other more advanced operations such as the transfering
+    /// data between two different DataSets.
+    /// </p>
+    /// <p>Note that the passed in IDbDataAdapter
+    /// has been created by the framework and its SelectCommand
+    /// will be populated with values for CommandType and Text properties
+    /// along with Connection/Transaction properties based on the
+    /// calling transaction context.
+    ///  </p>
+    /// <see cref="Spring.Data.Core.AdoTemplate"/> Execute(IDataAdapterCallback dataAdapterCallback)
+    /// method.
+    /// </remarks>    
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IDataAdapterCallback.cs,v 1.3 2007/12/04 06:49:17 markpollack Exp $</version>
+	public interface IDataAdapterCallback 
+	{
+        /// <summary>
+        /// Called by AdoTemplate.Execute with an preconfigured
+        /// ADO.NET IDbDataAdapter instance with its SelectCommand
+        /// property populated with CommandType and Text values
+        /// along with Connection/Transaction properties based on the
+        /// calling transaction context.
+        /// </summary>
+        /// <param name="dataAdapter">An active IDbDataAdapter instance</param>
+        /// <returns>The result object</returns>
+        object DoInDataAdapter(IDbDataAdapter dataAdapter);
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/IDataAdapterSetter.cs b/src/Spring/Spring.Data/Data/IDataAdapterSetter.cs
new file mode 100644
index 00000000..30403a90
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/IDataAdapterSetter.cs
@@ -0,0 +1,56 @@
+#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
+
+#region Imports
+
+using System.Data;
+
+#endregion
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// Called by the AdoTemplate class to allow implementations
+    /// to set any necessary properties on the DbDataAdapter object.
+    /// </summary>
+    /// <remarks>
+    /// <p>For example, this callback can be used to set the 
+    /// AcceptChangesDuringFill property, register an event handler 
+    /// for the FillErrors event, set update batch sizes if your provider 
+    /// supports such functionality, set the ContinueUpdateOnError property,
+    /// or in .NET 2.0 to set the property AcceptChangesDuringUpdate.
+    /// </p>
+    /// <p>
+    /// Downcast to the appropriate subtype to access vendor specific
+    /// functionality.</p>
+    /// <p>
+    /// The DataAdapter SelectCommand will be already be 
+    /// populated with values for CommandType and Text properties
+    /// along with Connection/Transaction properties based on the
+    /// calling transaction context.
+    /// </p>
+    /// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IDataAdapterSetter.cs,v 1.3 2006/11/29 07:18:45 markpollack Exp $</version>
+	public interface IDataAdapterSetter 
+	{ 
+        void SetValues(IDbDataAdapter dataAdapter);
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/IDataReaderWrapper.cs b/src/Spring/Spring.Data/Data/IDataReaderWrapper.cs
new file mode 100644
index 00000000..b38c0c04
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/IDataReaderWrapper.cs
@@ -0,0 +1,54 @@
+#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
+
+#region Imports
+
+using System.Data;
+
+#endregion
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// Custom data reader implementations often delegate to an underlying
+    /// instance.  This interface captures that relationship for reuse in
+    /// the framework.
+    /// </summary>
+    /// <remarks>Implementations will typically add behavior to standard IDataReader methods,
+    /// for example, by providing default values for DbNull values.  
+    /// See <see cref="Spring.Data.Support.NullMappingDataReader"/> as an example.
+    ///  </remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: IDataReaderWrapper.cs,v 1.2 2007/10/30 15:24:44 markpollack Exp $</version>
+    public interface IDataReaderWrapper : IDataReader
+    {
+        /// <summary>
+        /// The underlying reader implementation to delegate to for accessing data 
+        /// from a returned result sets.
+        /// </summary>
+        /// <value>The wrapped reader.</value>
+        IDataReader WrappedReader
+        {
+            get;
+            set;
+        }
+	    
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/IDataSetFillLifecycleProcessor.cs b/src/Spring/Spring.Data/Data/IDataSetFillLifecycleProcessor.cs
new file mode 100644
index 00000000..ddbd63bb
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/IDataSetFillLifecycleProcessor.cs
@@ -0,0 +1,66 @@
+#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
+
+#region Imports
+
+using System.Data;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// Lifecycle callback methods that can be registered when
+	/// performing Fill operations with AdoTemplate.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The methods let you set various properties and invoke
+	/// methods on the DataSet before and after it gets filled by a DataAdapter.  
+	/// For example, EnforceConstraints, BeginLoadData, and EndLoadData
+	/// can be called to optimize the loading of large DataSets with
+	/// many related tables.
+	/// </p>
+	/// <p>Vendors may expose other propriety methods on their DataSet
+	/// implementation, downcast to access this specific functionality.
+	/// </p>
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IDataSetFillLifecycleProcessor.cs,v 1.3 2006/11/29 07:18:45 markpollack Exp $</version>
+	public interface IDataSetFillLifecycleProcessor 
+	{
+	    /// <summary>
+	    /// Called before a DataAdapter is used to fill a DataSet 
+	    /// the the provided tablename.
+	    /// </summary>
+	    /// <param name="ds">The DataSet to be filled with a DataTable</param>
+	    /// <param name="tableMappingCollection">The table collection to be filled</param>
+        void BeforeFill(DataSet ds, ITableMappingCollection tableMappingCollection);
+	    
+        /// <summary>
+        /// Called after a DataAdapter is used to fill a DataSet 
+        /// the the provided tablename.
+        /// </summary>
+        /// <param name="ds">The DataSet to be filled with a DataTable</param>
+        /// <param name="tableMappingCollection">The table collection to be filled</param>
+        void AfterFill(DataSet ds, ITableMappingCollection tableMappingCollection);
+
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/IDbCommandCreator.cs b/src/Spring/Spring.Data/Data/IDbCommandCreator.cs
new file mode 100644
index 00000000..8242e1d5
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/IDbCommandCreator.cs
@@ -0,0 +1,48 @@
+#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
+
+#region Imports
+
+using System.Data;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// One of the central callback interfaces used by the AdoTemplate class
+	/// This interface creates a IDbCommand.  Implementations are responsible
+	/// for configuring the created command with command type, command text and
+	/// any necessary parameters. 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IDbCommandCreator.cs,v 1.6 2007/08/06 20:13:39 markpollack Exp $</version>
+	public interface IDbCommandCreator 
+	{
+        /// <summary>
+        /// Creates a IDbCommand.
+        /// </summary>
+        /// <param name="dbProvider">The IDbProvider reference that can be used to create the command in a 
+        /// provider independent manner.  The provider supplied is the same as used in configuration of AdoTemplate.</param>
+        /// <returns></returns>
+	    IDbCommand CreateDbCommand(IDbProvider dbProvider);
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/IDbCommandCreatorFactory.cs b/src/Spring/Spring.Data/Data/IDbCommandCreatorFactory.cs
new file mode 100644
index 00000000..3fa344d4
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/IDbCommandCreatorFactory.cs
@@ -0,0 +1,232 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using Spring.Dao;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+    /// Helper class that can efficiently create multiple IDbCommand
+    /// objects with different parameters based on a SQL statement and a single
+    /// set of parameter declarations.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IDbCommandCreatorFactory.cs,v 1.11 2007/08/06 20:13:39 markpollack Exp $</version>
+	public class IDbCommandCreatorFactory 
+	{
+		#region Fields
+
+	    private String sql;
+	    
+	    private IDbParameters declaredParameters;
+	    
+	    private IDbProvider dbProvider;
+	    
+	    private CommandType commandType;
+	    
+		#endregion
+
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="IDbCommandCreatorFactory"/> class.
+        /// </summary>
+	    public IDbCommandCreatorFactory(IDbProvider dbProvider, CommandType commandType, string sql, IDbParameters declaredParameters)
+	    {
+            this.dbProvider = dbProvider;
+            this.sql = sql;	
+		    this.commandType = commandType;
+		    this.declaredParameters = declaredParameters;
+	    }
+
+	    #endregion
+
+		#region Properties
+	    
+	    public IDbParameters DeclaredParameters
+	    {
+	        get
+	        {
+	            return declaredParameters;
+	        }
+	    }
+	    
+        public string Sql
+        {
+            get { return sql; }
+        }
+
+        public IDbProvider DbProvider
+        {
+            get { return dbProvider; }
+        }
+
+        public CommandType CommandType
+        {
+            get { return commandType; }
+        }
+		#endregion
+	    
+		#region Methods
+
+        public IDbCommandCreator NewDbCommandCreatorWithParamValues(params object[] inParamValues)
+        {
+	        
+            return new CommandCreatorWithParamValues(this, inParamValues != null ? ArrayList.Adapter(inParamValues) : new ArrayList());
+        }
+
+
+	    public IDbCommandCreator NewDbCommandCreator(IDictionary inParameters)
+	    {
+	        
+	        return new CommandCreatorImpl(this, inParameters != null ? inParameters : new Hashtable());
+	    }
+	   
+		#endregion
+
+        private class CommandCreatorWithParamValues : IDbCommandCreator
+        {
+            private IDbCommandCreatorFactory factory;
+            private IList inParamValues;
+            
+            public CommandCreatorWithParamValues(IDbCommandCreatorFactory factory, IList inParamValues)
+            {
+                this.factory = factory;                
+                this.inParamValues = inParamValues;
+            }
+
+            public IDbCommand CreateDbCommand(IDbProvider provider)
+            {
+                IDbCommand command = factory.dbProvider.CreateCommand();
+                command.CommandText = factory.sql;
+                command.CommandType = factory.commandType;
+                if (factory.declaredParameters != null)
+                {
+                    int parameterIndex = 0;
+                    foreach ( IDbDataParameter declaredParameter in factory.declaredParameters.DataParameterCollection)
+                    {
+                        IDbDataParameter clonedParameter = (IDbDataParameter)((ICloneable)declaredParameter).Clone();
+                        if (!(clonedParameter.Direction == ParameterDirection.Output) &&
+                            !(clonedParameter.Direction == ParameterDirection.ReturnValue))
+                        {
+                            if (clonedParameter.Direction == ParameterDirection.InputOutput)
+                            {
+                                //heuristic for case when have output parameter from stored procedure discovery classified
+                                //as in-out.  Assume out parameters come last in the stored proc definition and ignore
+                                //setting values if there are not enough input values as passed in by the user.
+                                if (parameterIndex < inParamValues.Count)
+                                {
+                                    //The value may still be null
+                                    Object inValue = inParamValues[parameterIndex];
+                                    clonedParameter.Value = (inValue == null) ? DBNull.Value : inValue;
+                                } else
+                                {
+                                    //Since it thinks it is an input-output value and we have no value from the user - pass in null
+                                    //as a workaround.
+                                    clonedParameter.Value = DBNull.Value;
+                                }
+
+                            }
+                            else
+                            {
+                                //The value may still be null
+                                Object inValue = inParamValues[parameterIndex];
+                                clonedParameter.Value = (inValue == null) ? DBNull.Value : inValue;
+                            }
+                            // only increment index if we could assign a value from the user specified inputs.
+                            parameterIndex++;
+                        }
+
+                        command.Parameters.Add(clonedParameter);
+                        
+                    }
+                }
+                return command;
+            }
+            
+        }
+	    private class CommandCreatorImpl : IDbCommandCreator{
+
+            private IDbCommandCreatorFactory factory;
+	        private IDictionary inParams;
+	        
+
+	        public CommandCreatorImpl(IDbCommandCreatorFactory factory, IDictionary inParameters)
+	        {
+	            this.factory = factory;    
+	            this.inParams = inParameters;
+	        }
+
+	        public IDbCommand CreateDbCommand(IDbProvider provider)
+	        {
+	            IDbCommand command = factory.dbProvider.CreateCommand();
+	            command.CommandText = factory.sql;
+	            command.CommandType = factory.commandType;
+                if (factory.declaredParameters != null)
+                {
+                    foreach ( IDbDataParameter declaredParameter in factory.declaredParameters.DataParameterCollection)
+                    {
+                        IDbDataParameter clonedParameter = (IDbDataParameter)((ICloneable)declaredParameter).Clone();
+                        
+                        if (IsInputParamter(clonedParameter) && !inParams.Contains(clonedParameter.ParameterName))
+                        {
+                            throw new InvalidDataAccessApiUsageException("Required input parameter '" +
+                                                                         clonedParameter.ParameterName + "' is missing");
+                        }
+                        //The value may still be null
+//                        Object inValue =
+//                            inParams[factory.dbProvider.CreateParameterName(clonedParameter.ParameterName)];
+
+                        // TODO: The above code doesn't work as it duplicates parameter prefix, thus failing
+                        // to obtain parameter values. The whole parameter handling mechanism should be refactored
+                        // not to require parameter prefix to be specified when populating named parameters collection
+                        // within AdoOperations. Code below is just a temporary workaround until this issue is resolved.
+                        
+                        Object inValue = inParams[clonedParameter.ParameterName];
+                        if (!(clonedParameter.Direction == ParameterDirection.Output) &&
+                            !(clonedParameter.Direction == ParameterDirection.ReturnValue))
+                        {
+                            clonedParameter.Value = (inValue == null) ? DBNull.Value : inValue;
+                        }
+                        
+                        command.Parameters.Add(clonedParameter);
+                    }
+                }
+	            return command;
+	        }
+
+            private bool IsInputParamter(IDataParameter parameter)
+            {
+                //Due to quirk in DeriveParameters can only verify Input parameter as output parameters
+                //are incorrectly listed as InputOutput
+                return (parameter.Direction == ParameterDirection.Input);
+            }
+
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/IDbDataAdapterCreator.cs b/src/Spring/Spring.Data/Data/IDbDataAdapterCreator.cs
new file mode 100644
index 00000000..7f82b897
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/IDbDataAdapterCreator.cs
@@ -0,0 +1,49 @@
+#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
+
+#region Imports
+
+using System.Data;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// This interface creates a IDbDataAdapterCommand.  
+	/// Implementations are responsible
+	/// for configuring the created command with appropriate
+	/// select and actions commands along with their parameters.
+	/// </summary>
+	/// <remarks>
+	/// Generally used to to support the DataSet functionality in
+	/// the Spring.Data.Objects namespace.
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IDbDataAdapterCreator.cs,v 1.3 2007/12/07 08:09:52 markpollack Exp $</version>
+	public interface IDbDataAdapterCreator 
+	{
+        /// <summary>
+        /// Creates the data adapter.
+        /// </summary>
+        /// <returns>A new IDbDataAdapter instance</returns>
+	    IDbDataAdapter CreateDataAdapter();
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/IResultSetExtractor.cs b/src/Spring/Spring.Data/Data/IResultSetExtractor.cs
new file mode 100644
index 00000000..fd8c3c5a
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/IResultSetExtractor.cs
@@ -0,0 +1,60 @@
+#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.Data;
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// Callback interface to process all result sets and rows in
+    /// an AdoTemplate query method.
+    /// </summary>
+    /// <remarks>Implementations of this interface perform the work
+    /// of extracting results but don't need worry about managing
+    /// ADO.NET resources, such as closing the reader or transaction management.
+    /// <p>
+    /// This interface is mainly used within the ADO.NET
+    /// framework.  An IResultSetExtractor is usually a simpler choice
+    /// for result set (DataReader) processing, in particular a 
+    /// RowMapperResultSetExtractor in combination with a IRowMapper.
+    /// </p>
+    /// <para>Note: in contracts to a IRowCallbackHandler, a ResultSetExtractor
+    /// is usually stateless and thus reusable, as long as it doesn't access
+    /// stateful resources or keep result state within the object.
+    /// </para>
+    /// </remarks>
+    /// 
+    public interface IResultSetExtractor
+    {
+        /// <summary>
+        /// Implementations must implement this method to process all
+        /// result set and rows in the IDataReader.
+        /// </summary>
+        /// <param name="reader">The IDataReader to extract data from.
+        /// Implementations should not close this: it will be closed
+        /// by the AdoTemplate.</param>
+        /// <returns>An arbitrary result object or null if none.  The
+        /// extractor will typically be stateful in the latter case.</returns>
+        object ExtractData(IDataReader reader);
+        
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/IRowCallback.cs b/src/Spring/Spring.Data/Data/IRowCallback.cs
new file mode 100644
index 00000000..08f08a0b
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/IRowCallback.cs
@@ -0,0 +1,35 @@
+
+
+using System.Data;
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// Callback to process each row of data in an AdoOperation's Query method.
+	/// </summary>
+	/// <remarks>
+	/// Implementations of this interface perform the actual work of extracting
+	/// results. In contrast to a IResultSetExtractor, a IRowCallback object is typically
+	/// stateful.  It keeps the result state within the object, to be available
+	/// for later inspection.
+	/// </remarks>	
+	/// 
+	public interface IRowCallback
+	{
+        /// <summary>
+        /// Implementations must implement this method to process each row of data
+        /// in the data reader.
+        /// </summary>
+        /// <remarks>
+        /// This method should not advance the cursor by calling Read()
+        /// on IDataReader but only extract the current values.  The
+        /// caller does not need to care about closing the reader, command, connection, or
+        /// about handling transactions:  this will all be handled by 
+        /// Spring's AdoTemplate
+        /// </remarks>
+        /// <param name="reader">An active IDataReader instance</param>
+        /// <returns>The result object</returns>
+        void ProcessRow(IDataReader reader);	  
+
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/IRowMapper.cs b/src/Spring/Spring.Data/Data/IRowMapper.cs
new file mode 100644
index 00000000..4f2aa3e0
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/IRowMapper.cs
@@ -0,0 +1,60 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Data;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+    /// Callback to process each row of data in a result set to an object.
+	/// </summary>
+	/// <remarks>Implementations of this interface perform the actual work
+    /// of mapping rows, but don't need worry about managing
+    /// ADO.NET resources, such as closing the reader.
+	/// <p>
+	/// Typically used for AdoTemplate's query methods (with RowMapperResultSetExtractor
+	/// adapters).  RowMapper objects are typically stateless and thus
+	/// reusable; they are ideal choices for implementing row-mapping logic in a single
+	/// place.
+	/// </p>
+	/// <p>Alternatively, consider subclassing MappingSqlQuery from the Spring.Data.Object
+	/// namespace:  Instead of working with separate AdoTemplate and RowMapper objects, 
+	/// you can have executable query objects (containing row-mapping logic) there.
+	/// </p>
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IRowMapper.cs,v 1.6 2007/06/28 18:48:19 markpollack Exp $</version>
+	public interface IRowMapper 
+	{
+	    /// <summary>
+	    /// Implementations must implement this method to map each row of data in the
+	    /// result set (DataReader).  This method should not call Next() on the 
+	    /// DataReader; it should only extract the values of the current row.
+	    /// </summary>
+	    /// <param name="reader">The IDataReader to map (pre-initialized for the current row)</param>
+	    /// <param name="rowNum">The number of the current row.</param>
+	    /// <returns>The result object for the current row.</returns>
+	    object MapRow(IDataReader reader, int rowNum);
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/InvalidResultSetAccessException.cs b/src/Spring/Spring.Data/Data/InvalidResultSetAccessException.cs
new file mode 100644
index 00000000..a2442bf4
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/InvalidResultSetAccessException.cs
@@ -0,0 +1,138 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using Spring.Dao;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+    /// Exception thrown when a result set has been accessed in an invalid fashion.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: InvalidResultSetAccessException.cs,v 1.2 2007/12/07 08:09:52 markpollack Exp $</version>
+	[Serializable]
+	public class InvalidResultSetAccessException : InvalidDataAccessResourceUsageException, ISerializable
+	{
+		#region Fields
+
+        /// <summary>
+        /// SQL that led to the problem
+        /// </summary>
+        private string sql;
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="InvalidResultSetAccessException"/> class.
+        /// </summary>
+		public InvalidResultSetAccessException()
+		{
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvalidResultSetAccessException"/> class.
+        /// </summary>
+        /// <param name="message">A message about the exception.</param>
+        public InvalidResultSetAccessException(string message): base(message)
+        {            
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvalidResultSetAccessException"/> class.
+        /// </summary>
+        /// <param name="message">A message about the exception.</param>
+        /// <param name="inner">The inner exception.</param>
+        public InvalidResultSetAccessException(string message, Exception inner): base(message, inner)
+        {            
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvalidResultSetAccessException"/> class.
+        /// </summary>
+        /// <param name="task">name of the current task.</param>
+        /// <param name="sql">The offending SQL statment</param>
+        /// <param name="ex">The root cause.</param>
+        public InvalidResultSetAccessException(string task, String sql, Exception ex) : base(task + "; invalid ResultSet access for SQL [" + sql + "]; " + ex.Message, ex)           
+        {
+             this.sql = sql;
+        }
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="InvalidResultSetAccessException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected InvalidResultSetAccessException( SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+
+
+
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Gets the SQL that caused the exception
+        /// </summary>
+        /// <value>The SQL that caused the exception.</value>
+	    public string Sql
+	    {
+            get 
+            {
+                return sql;
+            }
+	    }
+		#endregion
+
+		#region Methods
+
+		#endregion
+
+        #region ISerializable Members
+
+        /// <summary>
+        /// When overridden in a derived class, sets the <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+        /// with information about the exception.
+        /// </summary>
+        /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+        /// <exception cref="T:System.ArgumentNullException">The <paramref name="info"/> parameter is a null reference (<see langword="Nothing"/> in Visual Basic).</exception>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            info.AddValue( "sql", sql );
+            base.GetObjectData( info, context ); 
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/Objects/AbstractAdoOperation.cs b/src/Spring/Spring.Data/Data/Objects/AbstractAdoOperation.cs
new file mode 100644
index 00000000..d8eb4830
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Objects/AbstractAdoOperation.cs
@@ -0,0 +1,330 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+using System.Data;
+using Common.Logging;
+using Spring.Dao;
+using Spring.Data.Common;
+using Spring.Objects.Factory;
+
+namespace Spring.Data.Objects
+{
+    /// <summary>
+    /// Abstract base class providing common functionality for generic and non
+    /// generic implementations of "AdoOperation" subclasses.
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AbstractAdoOperation.cs,v 1.2 2008/05/30 21:09:22 markpollack Exp $</version>
+    public abstract class AbstractAdoOperation : IInitializingObject
+    {
+        #region Logging Definition
+
+        protected readonly ILog log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
+        #endregion
+
+        #region Fields
+
+        private string sql;
+
+        private CommandType commandType = CommandType.Text;
+
+        private IDbParameters declaredParameters;
+
+
+        /// <summary>
+        /// Has this operation been compiled?  Compilation means at 
+        /// least checking that a IDbProvider and sql have been provided,
+        /// but subclasses may also implement their own custom validation.
+        /// </summary>
+        protected bool compiled;
+
+        /// <summary>
+        /// Object enabling us to create IDbCommands
+        /// efficiently, based on this class's declared parameters.
+        /// </summary>
+        private IDbCommandCreatorFactory commandFactory;
+
+        #endregion
+
+
+        #region Properties
+
+
+        /// <summary>
+        /// Gets or sets the type of the command.
+        /// </summary>
+        /// <value>The type of the command.</value>
+        public CommandType CommandType
+        {
+            get { return commandType; }
+            set { commandType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the db provider.
+        /// </summary>
+        /// <value>The db provider.</value>
+        public abstract IDbProvider DbProvider
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// Gets or sets the SQL to execute
+        /// </summary>
+        /// <value>The SQL.</value>
+        public string Sql
+        {
+            get
+            {
+                return sql;
+            }
+            set
+            {
+                sql = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the declared parameters.
+        /// </summary>
+        /// <value>The declared parameters.</value>
+        public IDbParameters DeclaredParameters
+        {
+            get
+            {
+                return declaredParameters;
+            }
+            set
+            {
+                if (Compiled)
+                {
+                    throw new InvalidDataAccessApiUsageException("Cannot add parameters once operation is compiled");
+                }
+                declaredParameters = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this <see cref="AdoOperation"/> is compiled.
+        /// </summary>
+        /// <remarks>Compilation means that the operation is fully configured,
+        ///  and ready to use.  The exact meaning of compilation will vary between subclasses.</remarks>
+        /// <value><c>true</c> if compiled; otherwise, <c>false</c>.</value>
+        public bool Compiled
+        {
+            get { return compiled; }
+        }
+
+        /// <summary>
+        /// Sets the command timeout for IDbCommands that this AdoTemplate executes.
+        /// </summary>
+        /// <remarks>Default is 0, indicating to use the database provider's default.
+        /// Any timeout specified here will be overridden by the remaining 
+        /// transaction timeout when executing within a transaction that has a
+        /// timeout specified at the transaction level. 
+        /// </remarks>
+        /// <value>The command timeout.</value>
+        public abstract int CommandTimeout
+        { 
+            set;
+        }
+
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Ensures compilation if used in an IApplicationContext
+        /// </summary>
+        public void AfterPropertiesSet()
+        {
+            Compile();
+        }
+
+        /// <summary>
+        /// Compiles this operation.  Ignores subsequent attempts to compile.
+        /// </summary>
+        public abstract void Compile();
+
+
+
+
+        /// <summary>
+        /// Check whether this operation has been compiled already;
+        /// lazily compile it if not already compiled.
+        /// </summary>
+        /// <remarks>Automatically called by ValidateParameters and ValidateNamedParameters</remarks>
+        protected void CheckCompiled()
+        {
+            if (!Compiled)
+            {
+                log.Debug("ADO operation not compiled before execution - invoking compile");
+                Compile();
+            }
+        }
+
+
+        protected virtual void ValidateParameters(params object[] inParamValues)
+        {
+            CheckCompiled();
+            int declaredInParameters = 0;
+            if (DeclaredParameters != null)
+            {
+                for (int i = 0; i < declaredParameters.Count; i++)
+                {
+                    IDataParameter declaredParameter = DeclaredParameters[i];
+                    if (IsInputParameter(declaredParameter))
+                    {
+                        declaredInParameters++;
+                    }
+                }
+            }
+
+            if (inParamValues != null)
+            {
+                if (DeclaredParameters == null)
+                {
+                    throw new InvalidDataAccessApiUsageException(
+                        "Didn't expect any parameters: none were declared");
+                }
+                if (inParamValues.Length < declaredInParameters)
+                {
+                    throw new InvalidDataAccessApiUsageException(
+                        inParamValues.Length + " parameters were supplied, but " +
+                        declaredInParameters + " in parameters were declared in class [" +
+                        GetType().AssemblyQualifiedName + "]");
+                }
+                if (inParamValues.Length > declaredInParameters)
+                {
+                    throw new InvalidDataAccessApiUsageException(
+                        inParamValues.Length + " parameters were supplied, but " +
+                        DeclaredParameters.Count + " parameters were declared " +
+                        "in class [" + GetType().AssemblyQualifiedName + "]");
+                }
+            }
+            else
+            {
+                // No parameters were supplied
+                if (DeclaredParameters != null && !(DeclaredParameters.Count == 0))
+                {
+                    throw new InvalidDataAccessApiUsageException(
+                        DeclaredParameters.Count + " parameters must be supplied");
+                }
+            }
+        }
+
+        protected virtual bool IsInputParameter(IDataParameter parameter)
+        {
+            return (parameter.Direction == ParameterDirection.Input
+                    || parameter.Direction == ParameterDirection.InputOutput);
+        }
+
+        /// <summary>
+        /// Validates the named parameters passed to an AdoTemplate ExecuteXXX method based on
+        /// declared parameters.
+        /// </summary>
+        /// <remarks>
+        /// Subclasses should invoke this method very every ExecuteXXX method.
+        /// </remarks>
+        /// <param name="parameters">The parameter dictionary supplied.  May by null.</param>
+        protected virtual void ValidateNamedParameters(IDictionary parameters)
+        {
+            CheckCompiled();
+            IDictionary paramsToUse = (parameters != null ? parameters : new Hashtable());
+
+            if (declaredParameters != null)
+            {
+                for (int i = 0; i < declaredParameters.Count; i++)
+                {
+                    IDataParameter declaredParameter = DeclaredParameters[i];
+                    if (declaredParameter.ParameterName == null)
+                    {
+                        throw new InvalidDataAccessApiUsageException(
+                            "All parameters must have name specified when using the methods " +
+                            "dedicated to named parameter support");
+                    }
+                    if (IsInputParameter(declaredParameter) && !paramsToUse.Contains(declaredParameter.ParameterName))
+                    {
+                        throw new InvalidDataAccessApiUsageException(
+                            "The parameter named '" + declaredParameter +
+                            "' was not among the parameters supplied: " + paramsToUse.Keys);
+                    }
+                }
+            }
+
+
+            if (DeclaredParameters != null && DeclaredParameters.Count > 0)
+            {
+                if (DeclaredParameters == null)
+                {
+                    throw new InvalidDataAccessApiUsageException(
+                        "Didn't expect any parameters: none were declared");
+                }
+            }
+            else
+            {
+                // No parameters were supplied
+                if (DeclaredParameters != null && !(DeclaredParameters.Count == 0))
+                {
+                    throw new InvalidDataAccessApiUsageException(
+                        "Parameters must be supplied");
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Subclasses must implement to perform their own compilation.
+        /// Invoked after this class's compilation is complete.
+        /// Subclasses can assume that SQL has been supplied and that
+        /// a IDbProvider has been supplied.
+        /// </summary>                                                                                                
+        protected virtual void CompileInternal()
+        {
+            commandFactory = new IDbCommandCreatorFactory(DbProvider, CommandType, Sql, DeclaredParameters);
+            OnCompileInternal();
+
+
+        }
+        /// <summary>
+        /// Hook method that subclasses may override to react to compilation.
+        /// This implementation does nothing.
+        /// </summary>
+        protected virtual void OnCompileInternal()
+        {
+        }
+
+        protected virtual IDbCommandCreator NewCommandCreator(IDictionary inParams)
+        {
+            return commandFactory.NewDbCommandCreator(inParams);
+        }
+
+        protected virtual IDbCommandCreator NewCommandCreatorWithParamValues(params object[] inParams)
+        {
+            return commandFactory.NewDbCommandCreatorWithParamValues(inParams);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Objects/AdoNonQuery.cs b/src/Spring/Spring.Data/Data/Objects/AdoNonQuery.cs
new file mode 100644
index 00000000..ab5baee2
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Objects/AdoNonQuery.cs
@@ -0,0 +1,84 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+using System.Data;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data.Objects
+{
+	/// <summary>
+	/// Encapsulate Command.ExecuteNonQuery operations within a reusable class. 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <remarks>The default CommandType is CommandType.Text</remarks>
+	/// <version>$Id: AdoNonQuery.cs,v 1.3 2007/07/25 08:25:20 markpollack Exp $</version>
+	public class AdoNonQuery : AdoOperation
+	{
+        #region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoNonQuery"/> class.
+        /// </summary>
+        public AdoNonQuery()
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoNonQuery"/> class.
+        /// </summary>
+        public AdoNonQuery(IDbProvider provider)
+            : base(provider)
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoNonQuery"/> class.
+        /// </summary>
+        public AdoNonQuery(IDbProvider dbProvider, string sql)
+            : base(dbProvider, sql)
+        {}
+
+        #endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+
+        public IDictionary ExecuteNonQuery(params object[] inParameterValues)
+        {
+            ValidateParameters(inParameterValues);
+            return AdoTemplate.ExecuteNonQuery(NewCommandCreatorWithParamValues(inParameterValues));		        
+        }
+
+
+        public IDictionary ExecuteNonQueryByNamedParam(IDictionary inParams)
+        {
+            ValidateNamedParameters(inParams);                        
+            return AdoTemplate.ExecuteNonQuery(NewCommandCreator(inParams));
+        }	    
+	       
+		#endregion
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Objects/AdoOperation.cs b/src/Spring/Spring.Data/Data/Objects/AdoOperation.cs
new file mode 100644
index 00000000..e9416d48
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Objects/AdoOperation.cs
@@ -0,0 +1,199 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Dao;
+using Spring.Data.Common;
+using Spring.Data.Core;
+
+#endregion
+
+namespace Spring.Data.Objects
+{
+    /// <summary>
+    /// A "AdoOperation" is a thread-safe, reusable object representing 
+    /// an ADO Query, "NonQuery" (Create, Update, Delete), stored procedure
+    /// or DataSet manipualtions.
+    /// </summary>
+    /// <remarks>
+    /// Subclasses should set Command Text and add parameters before invoking
+    /// Compile().  The order in which parameters are added is generally
+    /// significant when using providers or functionality that do not use
+    /// named parameters.
+    /// 
+    /// </remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AdoOperation.cs,v 1.15 2008/05/30 21:09:22 markpollack Exp $</version>
+    public abstract class AdoOperation : AbstractAdoOperation
+    {
+        
+        #region Fields
+
+        private AdoTemplate adoTemplate = new AdoTemplate();
+	    
+        
+        #endregion
+
+        #region Constructor (s)
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoOperation"/> class.
+        /// </summary>
+        /// <remarks>A DbProvider, SQL and any parameters must be supplied
+        /// before invoking the compile method and using this object.       
+        /// </remarks>
+        public AdoOperation()
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoOperation"/> class.
+        /// </summary>
+        /// <remarks>A DbProvider, SQL and any parameters must be supplied
+        /// before invoking the compile method and using this object.       
+        /// </remarks>
+        /// <param name="provider">Database provider to use.</param>
+        public AdoOperation(IDbProvider provider)
+            : this(provider, null)
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoOperation"/> class.
+        /// </summary>
+        /// <remarks>A DbProvider, SQL and any parameters must be supplied
+        /// before invoking the compile method and using this object.       
+        /// </remarks>
+        /// <param name="provider">Database provider to use.</param>
+        /// <param name="sql">SQL query or stored procedure name.</param>
+        public AdoOperation(IDbProvider provider, String sql)
+        {
+            //intialized AdoTemplate with the DbProvider
+            DbProvider = provider;
+            Sql = sql;                  
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the ADO template.
+        /// </summary>
+        /// <value>The ADO template.</value>
+        public AdoTemplate AdoTemplate
+        {
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException("AdoTemplate");
+                }
+                adoTemplate = value;
+            }
+            get
+            {
+                return adoTemplate;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the db provider.
+        /// </summary>
+        /// <value>The db provider.</value>
+        public override IDbProvider DbProvider
+        {
+            set
+            {
+                adoTemplate.DbProvider = value;                
+                if (DeclaredParameters == null)
+                {                         
+                    DeclaredParameters = new DbParameters(value);
+                }
+            }
+            get
+            {
+                return adoTemplate.DbProvider;
+            }
+        }
+
+
+
+        /// <summary>
+        /// Sets the command timeout for IDbCommands that this AdoTemplate executes.
+        /// </summary>
+        /// <remarks>Default is 0, indicating to use the database provider's default.
+        /// Any timeout specified here will be overridden by the remaining 
+        /// transaction timeout when executing within a transaction that has a
+        /// timeout specified at the transaction level. 
+        /// </remarks>
+        /// <value>The command timeout.</value>
+        public override int CommandTimeout
+        {
+            set { adoTemplate.CommandTimeout = value; }
+        }
+
+        #endregion
+
+        #region Methods
+        
+
+        /// <summary>
+        /// Compiles this operation.  Ignores subsequent attempts to compile.
+        /// </summary>
+        public override void Compile()
+        {
+            if (!Compiled)
+            {
+                if (Sql == null)
+                {
+                    throw new InvalidDataAccessApiUsageException("Setting of Sql is required");
+                }
+                if (CommandType == 0)
+                {
+                    throw new InvalidDataAccessApiUsageException("Setting of CommandType is required");
+                }
+
+                try 
+                {                    
+                    adoTemplate.AfterPropertiesSet();
+                }
+                catch (ArgumentException ex) 
+                {
+                    throw new InvalidDataAccessApiUsageException(ex.Message);
+                }	
+                
+                
+                CompileInternal();
+                compiled = true;
+                
+		
+            }
+        }
+
+
+
+
+  
+        
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/Objects/AdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/AdoQuery.cs
new file mode 100644
index 00000000..de09700c
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Objects/AdoQuery.cs
@@ -0,0 +1,112 @@
+#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
+
+#region Imports
+
+using System.Collections;
+using Spring.Dao.Support;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data.Objects
+{
+	/// <summary>
+	/// Place together the mapping logic to a plain .NET object
+	/// for one result set within the same class.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: AdoQuery.cs,v 1.8 2008/05/30 21:09:22 markpollack Exp $</version>
+	public abstract class AdoQuery : AdoOperation
+	{
+		#region Fields
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="AdoQuery"/> class.
+        /// </summary>
+		public AdoQuery()
+		{
+
+		}
+	    
+	    public AdoQuery(IDbProvider provider, string sql)
+	    {
+	        DbProvider = provider;
+	        Sql = sql;
+	    }
+
+		#endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+	    
+        public IList Query()
+        {
+            return QueryByNamedParam(null);
+        }
+	    	    
+	    public IList QueryByNamedParam(IDictionary inParams)
+	    {
+	        return QueryByNamedParam(inParams, null);
+	    }
+	    
+	    public IList QueryByNamedParam(IDictionary inParams, IDictionary returnedParameters)
+	    {
+            return QueryByNamedParam(inParams, returnedParameters, null);
+	    }
+	    
+        public IList QueryByNamedParam(IDictionary inParams, IDictionary returnedParameters, IDictionary callingContext)
+        {
+            ValidateNamedParameters(inParams);
+            IRowMapper rowMapper = NewRowMapper(inParams, callingContext);
+            return AdoTemplate.QueryWithCommandCreator(NewCommandCreator(inParams), rowMapper, returnedParameters);
+        }
+
+        public object QueryForObject(IDictionary inParams)
+        {
+            IList results = QueryByNamedParam(inParams);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        public object QueryForObject(IDictionary inParams, IDictionary returnedParameters)
+        {
+            IList results = QueryByNamedParam(inParams, returnedParameters);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        public object QueryForObject(IDictionary inParams, IDictionary returnedParameters, IDictionary callingContext)
+        {
+            IList results = QueryByNamedParam(inParams, returnedParameters, callingContext);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+
+	    protected abstract IRowMapper NewRowMapper(IDictionary inParams, IDictionary callingContext);
+	    
+		#endregion
+
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Objects/AdoScalar.cs b/src/Spring/Spring.Data/Data/Objects/AdoScalar.cs
new file mode 100644
index 00000000..721d1e19
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Objects/AdoScalar.cs
@@ -0,0 +1,79 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+using System.Data;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data.Objects
+{
+    /// <summary>
+    /// Encapsulate Command ExecuteScalar operations within a reusable class. 
+    /// </summary>
+    /// <remarks>The default CommandType is CommandType.Text</remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AdoScalar.cs,v 1.3 2007/07/25 08:25:20 markpollack Exp $</version>
+    public class AdoScalar : AdoOperation
+    {
+        #region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoScalar"/> class.
+        /// </summary>
+        public AdoScalar()
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoScalar"/> class.
+        /// </summary>
+        public AdoScalar(IDbProvider provider)
+            : base(provider)
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoScalar"/> class.
+        /// </summary>
+        public AdoScalar(IDbProvider dbProvider, string sql)
+            : base(dbProvider, sql)
+        {}
+
+        #endregion
+
+        #region Methods
+
+        public IDictionary ExecuteScalar(params object[] inParameterValues)
+        {
+            ValidateParameters(inParameterValues);
+            return AdoTemplate.ExecuteScalar(NewCommandCreatorWithParamValues(inParameterValues));
+        }
+
+        public IDictionary ExecuteScalarByNamedParam(IDictionary inParams)
+        {
+            ValidateNamedParameters(inParams);
+            return AdoTemplate.ExecuteScalar(NewCommandCreator(inParams));
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs b/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs
new file mode 100644
index 00000000..4f9a354a
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs
@@ -0,0 +1,202 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using Spring.Dao;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data.Objects.Generic
+{
+    /// <summary>
+    /// A "AdoOperation" is a thread-safe, reusable object representing 
+    /// an ADO Query, "NonQuery" (Create, Update, Delete), stored procedure
+    /// or DataSet manipualtions.
+    /// </summary>
+    /// <remarks>
+    /// Subclasses should set Command Text and add parameters before invoking
+    /// Compile().  The order in which parameters are added is generally
+    /// significant when using providers or functionality that do not use
+    /// named parameters.
+    /// 
+    /// </remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AdoOperation.cs,v 1.3 2008/05/30 21:09:32 markpollack Exp $</version>
+    public abstract class AdoOperation : AbstractAdoOperation
+    {
+        
+        #region Fields
+
+        private Data.Generic.AdoTemplate adoTemplate = new Data.Generic.AdoTemplate();
+	    
+        
+        #endregion
+
+        #region Constructor (s)
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoOperation"/> class.
+        /// </summary>
+        /// <remarks>A DbProvider, SQL and any parameters must be supplied
+        /// before invoking the compile method and using this object.       
+        /// </remarks>
+        public AdoOperation()
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoOperation"/> class.
+        /// </summary>
+        /// <remarks>A DbProvider, SQL and any parameters must be supplied
+        /// before invoking the compile method and using this object.       
+        /// </remarks>
+        /// <param name="provider">Database provider to use.</param>
+        public AdoOperation(IDbProvider provider)
+            : this(provider, null)
+        {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoOperation"/> class.
+        /// </summary>
+        /// <remarks>A DbProvider, SQL and any parameters must be supplied
+        /// before invoking the compile method and using this object.       
+        /// </remarks>
+        /// <param name="provider">Database provider to use.</param>
+        /// <param name="sql">SQL query or stored procedure name.</param>
+        public AdoOperation(IDbProvider provider, String sql)
+        {
+            //intialized AdoTemplate with the DbProvider
+            DbProvider = provider;
+            Sql = sql;                         
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the ADO template.
+        /// </summary>
+        /// <value>The ADO template.</value>
+        public Data.Generic.AdoTemplate AdoTemplate
+        {
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException("AdoTemplate");
+                }
+                adoTemplate = value;
+            }
+            get
+            {
+                return adoTemplate;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the db provider.
+        /// </summary>
+        /// <value>The db provider.</value>
+        public override IDbProvider DbProvider
+        {
+            set
+            {
+                adoTemplate.DbProvider = value;
+                if (DeclaredParameters == null)
+                {
+                    DeclaredParameters = new DbParameters(value);
+                }
+            }
+            get
+            {
+                return adoTemplate.DbProvider;
+            }
+        }
+
+
+
+        /// <summary>
+        /// Sets the command timeout for IDbCommands that this AdoTemplate executes.
+        /// </summary>
+        /// <remarks>Default is 0, indicating to use the database provider's default.
+        /// Any timeout specified here will be overridden by the remaining 
+        /// transaction timeout when executing within a transaction that has a
+        /// timeout specified at the transaction level. 
+        /// </remarks>
+        /// <value>The command timeout.</value>
+        public override int CommandTimeout
+        {
+            set { adoTemplate.CommandTimeout = value; }
+        }
+
+        #endregion
+
+        #region Methods
+        
+
+        /// <summary>
+        /// Compiles this operation.  Ignores subsequent attempts to compile.
+        /// </summary>
+        public override void Compile()
+        {
+            if (!Compiled)
+            {
+                if (Sql == null)
+                {
+                    throw new InvalidDataAccessApiUsageException("Setting of Sql is required");
+                }
+                if (CommandType == 0)
+                {
+                    throw new InvalidDataAccessApiUsageException("Setting of CommandType is required");
+                }
+
+                try 
+                {                    
+                    adoTemplate.AfterPropertiesSet();
+                }
+                catch (ArgumentException ex) 
+                {
+                    throw new InvalidDataAccessApiUsageException(ex.Message);
+                }	
+                
+                
+                CompileInternal();
+                compiled = true;
+                
+		
+            }
+        }
+
+
+
+
+  
+        
+        #endregion
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs
new file mode 100644
index 00000000..afa1054a
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs
@@ -0,0 +1,152 @@
+#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
+
+#if NET_2_0
+
+#region Imports
+
+using System.Collections.Generic;
+using Spring.Dao.Support.Generic;
+using Spring.Data.Common;
+using Spring.Data.Generic;
+
+#endregion
+
+namespace Spring.Data.Objects.Generic
+{
+	/// <summary>
+	/// Place together the mapping logic to a plain .NET object
+	/// for one result set within the same class.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: AdoQuery.cs,v 1.3 2007/07/25 13:32:39 oakinger Exp $</version>
+	public abstract class AdoQuery : AdoOperation
+	{
+		#region Fields
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="AdoQuery"/> class.
+        /// </summary>
+		public AdoQuery()
+		{
+
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AdoQuery"/> class.
+        /// </summary>
+        /// <param name="provider">The database provider.</param>
+        /// <param name="sql">The SQL to execute</param>
+	    public AdoQuery(IDbProvider provider, string sql)
+	    {
+	        DbProvider = provider;
+	        Sql = sql;
+	    }
+
+		#endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+
+
+        /// <summary>
+        /// Convenient method to execute query without parameters or calling context.
+        /// </summary>
+        /// <typeparam name="T">The type parameter for the returned collection</typeparam>
+        /// <returns>List of mapped objects</returns>
+        public IList<T> Query<T>()
+        {
+            return QueryByNamedParam<T>(null);
+        }
+
+        /// <summary>
+        /// Convenient method to execute query with parameters but without calling context.
+        /// </summary>
+        /// <typeparam name="T">The type parameter for the returned collection</typeparam>
+        /// <param name="inParams">The parameters for the query.</param>
+        /// <returns></returns>
+        public IList<T> QueryByNamedParam<T>(System.Collections.IDictionary inParams)
+	    {
+	        return QueryByNamedParam<T>(inParams, null);
+	    }
+
+        /// <summary>
+        /// Convenient method to execute query with parameters and access to output parameter values.
+        /// </summary>
+        /// <typeparam name="T">The type parameter for the returned collection</typeparam>
+        /// <param name="inParams">The parameters for the query.</param>
+        /// <param name="outParams">The returned output parameters.</param>
+        /// <returns></returns>
+        public IList<T> QueryByNamedParam<T>(System.Collections.IDictionary inParams, 
+                                             System.Collections.IDictionary outParams)
+	    {
+            return QueryByNamedParam<T>(inParams, outParams, null);
+	    }
+
+        /// <summary>
+        /// Central execution method.  All named parameter execution goes through this method.
+        /// </summary>
+        /// <typeparam name="T">the type parameter for the returned collection</typeparam>
+        /// <param name="inParams">The in params.</param>
+        /// <param name="outParams">The out params.</param>
+        /// <param name="callingContext">The calling context.</param>
+        /// <returns></returns>
+        public IList<T> QueryByNamedParam<T>(System.Collections.IDictionary inParams, 
+                                             System.Collections.IDictionary outParams, 
+                                             System.Collections.IDictionary callingContext)
+        {
+            ValidateNamedParameters(inParams);
+            IRowMapper<T> rowMapper = NewRowMapper<T>(inParams, callingContext);
+            return AdoTemplate.QueryWithCommandCreator(NewCommandCreator(inParams), rowMapper, outParams);
+        }
+
+        public T QueryForObject<T>(System.Collections.IDictionary inParams)
+        {
+            IList<T> results = QueryByNamedParam<T>(inParams);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        public T QueryForObject<T>(System.Collections.IDictionary inParams, System.Collections.IDictionary returnedParameters)
+        {
+            IList<T> results = QueryByNamedParam<T>(inParams, returnedParameters);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        public T QueryForObject<T>(System.Collections.IDictionary inParams, System.Collections.IDictionary returnedParameters, System.Collections.IDictionary callingContext)
+        {
+            IList<T> results = QueryByNamedParam<T>(inParams, returnedParameters, callingContext);
+            return DataAccessUtils.RequiredUniqueResultSet(results);
+        }
+
+        
+        protected abstract IRowMapper<T> NewRowMapper<T>(System.Collections.IDictionary inParams, System.Collections.IDictionary callingContext);
+	    
+		#endregion
+
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs
new file mode 100644
index 00000000..956f79cf
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs
@@ -0,0 +1,76 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System.Collections;
+using System.Data;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data.Objects.Generic
+{
+    /// <summary>
+    /// Reusable query in which concrete subclasses must implement the
+    /// MapRow method to map each row of a single result set into an 
+    /// object.
+    /// </summary>
+    /// <remarks>
+    /// Simplifies MappingSqlQueryWithContext API by dropping parameters and
+    /// context. Most subclasses won't care about parameters. If you don't use
+    /// contextual information, subclass this instead of MappingSqlQueryWithContext.
+    /// </remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: MappingAdoQuery.cs,v 1.2 2007/07/25 13:32:39 oakinger Exp $</version>
+    public abstract class MappingAdoQuery : MappingAdoQueryWithContext
+    {
+        #region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MappingAdoQuery"/> class.
+        /// </summary>
+        public MappingAdoQuery()
+        {
+        }
+
+        public MappingAdoQuery(IDbProvider dbProvider, string sql) : base(dbProvider, sql)
+        {
+        }
+
+        #endregion
+
+        #region Methods
+
+        protected override T MapRow<T>(IDataReader reader, int rowNum, IDictionary inParams,
+                                       IDictionary callingContext)
+        {
+            return MapRow<T>(reader, rowNum);
+        }
+
+        protected abstract T MapRow<T>(IDataReader reader, int num);
+
+        #endregion
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs
new file mode 100644
index 00000000..b773cc15
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs
@@ -0,0 +1,102 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System.Collections;
+using System.Data;
+using Spring.Data.Common;
+using Spring.Data.Generic;
+
+#endregion
+
+namespace Spring.Data.Objects.Generic
+{
+	/// <summary>
+	/// Reusable query in which concrete subclasses must implement the
+	/// abstract MapRow method to map each row of a single result set into an 
+	/// object.
+	/// </summary>
+	/// <remarks>The MapRow method is also passed the input parameters and
+	/// a dictionary to provide the method with calling context information
+	/// (if necessary).  If you do not need these additional parameters, use
+	/// the subclass MappingAdoQuery.
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: MappingAdoQueryWithContext.cs,v 1.2 2007/07/25 13:32:39 oakinger Exp $</version>
+	public abstract class MappingAdoQueryWithContext : AdoQuery
+	{
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="MappingAdoQueryWithContext"/> class.
+        /// </summary>
+		public MappingAdoQueryWithContext()
+		{
+
+		}
+
+	    public MappingAdoQueryWithContext(IDbProvider dbProvider, string sql) : base(dbProvider, sql)
+	    {
+	        
+	    }
+		#endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+	    
+        protected override IRowMapper<T> NewRowMapper<T>(System.Collections.IDictionary inParams, 
+                                                         System.Collections.IDictionary callingContext)	    
+        {
+            return new RowMapperImpl<T>(this, inParams, callingContext);
+        }
+	    
+        protected abstract T MapRow<T>(IDataReader reader, int rowNum, IDictionary inParams, IDictionary callingContext);
+          
+
+	    #endregion
+	    
+        private class RowMapperImpl<T> : IRowMapper<T>
+        {
+            private MappingAdoQueryWithContext outer;
+            private IDictionary inParams;
+            private IDictionary callingContext;
+	        
+            public RowMapperImpl(MappingAdoQueryWithContext mappingAdoQueryWithContext, IDictionary inParams, IDictionary callingContext)
+            {
+                outer = mappingAdoQueryWithContext;
+                this.inParams = inParams;
+                this.callingContext = callingContext;
+            }
+
+            public T MapRow(IDataReader dataReader, int rowNum)
+            {
+                return outer.MapRow<T>(dataReader, rowNum, inParams, callingContext);
+            }
+        }
+
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/StoredProcedure.cs b/src/Spring/Spring.Data/Data/Objects/Generic/StoredProcedure.cs
new file mode 100644
index 00000000..1b5603c5
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Objects/Generic/StoredProcedure.cs
@@ -0,0 +1,255 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System.Collections;
+using System.Data;
+using Spring.Collections;
+using Spring.Dao;
+using Spring.Data.Common;
+using Spring.Data.Generic;
+using Spring.Data.Support;
+
+#endregion
+
+namespace Spring.Data.Objects.Generic
+{
+	/// <summary>
+	/// A superclass for object based abstractions of RDBMS stored procedures. 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: StoredProcedure.cs,v 1.3 2007/07/25 13:32:39 oakinger Exp $</version>
+	public abstract class StoredProcedure : AdoOperation
+	{
+		#region Fields
+        
+	    //A collection of NamedResultSetProcessor
+	     
+        private IList resultProcessors = new LinkedList();
+	    private bool usingDerivedParameters = false;
+	    
+	    
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="StoredProcedure"/> class.
+        /// </summary>
+		public StoredProcedure()
+		{
+            CommandType = CommandType.StoredProcedure;
+		}
+	    
+        public StoredProcedure(IDbProvider dbProvider, string procedureName) : base(dbProvider, procedureName)
+        {
+    	    CommandType = CommandType.StoredProcedure;
+        }
+	    
+	    
+
+		#endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+
+	    public void DeriveParameters()
+	    {
+	        DeriveParameters(false);
+	    }
+	    
+	    
+        public void DeriveParameters(bool includeReturnParameter)
+        {
+            //TODO does this account for offsets?
+            IDataParameter[] derivedParameters = AdoTemplate.DeriveParameters(Sql, includeReturnParameter);
+            for (int i = 0; i < derivedParameters.Length; i++)
+            {
+                IDataParameter parameter = derivedParameters[i];
+                DeclaredParameters.AddParameter(parameter);
+            } 
+            usingDerivedParameters = true;
+        }
+
+
+        #region Non-generic result set processors 
+        public void AddResultSetExtractor(string name, IResultSetExtractor resultSetExtractor)
+        {
+            if (Compiled)
+            {
+                throw new InvalidDataAccessApiUsageException("Cannot add ResultSetExtractors once operation is compiled");
+            }
+            resultProcessors.Add(new NamedResultSetProcessor(name, resultSetExtractor));
+        }
+
+        public void AddRowCallback(string name, IRowCallback rowCallback)
+        {
+            if (Compiled)
+            {
+                throw new InvalidDataAccessApiUsageException("Cannot add RowCallbacks once operation is compiled");
+            }
+            resultProcessors.Add(new NamedResultSetProcessor(name, rowCallback));
+        }
+
+        public void AddRowMapper(string name, IRowMapper rowMapper)
+        {
+            if (Compiled)
+            {
+                throw new InvalidDataAccessApiUsageException("Cannot add RowMappers once operation is compiled");
+            }
+            resultProcessors.Add(new NamedResultSetProcessor(name, rowMapper));
+        }
+
+        #endregion
+
+        #region Generic result set processors
+
+        public void AddResultSetExtractor<T>(string name, IResultSetExtractor<T> resultSetExtractor)
+        {
+            if (Compiled)
+            {
+                throw new InvalidDataAccessApiUsageException("Cannot add ResultSetExtractors once operation is compiled");
+            }
+            resultProcessors.Add(new NamedResultSetProcessor<T>(name, resultSetExtractor));
+        }
+        
+
+        public void AddRowMapper<T>(string name, IRowMapper<T> rowMapper)
+        {
+            if (Compiled)
+            {
+                throw new InvalidDataAccessApiUsageException("Cannot add RowMappers once operation is compiled");
+            }
+            resultProcessors.Add(new NamedResultSetProcessor<T>(name,rowMapper));
+        }
+        #endregion
+
+        #region Operations that use derived parameters
+        protected virtual IDictionary ExecuteScalar(params object[] inParameterValues)
+	    {
+            ValidateParameters(inParameterValues);
+            return AdoTemplate.ExecuteScalar(NewCommandCreatorWithParamValues(inParameterValues));		        
+	    }
+	    
+        protected virtual IDictionary ExecuteNonQuery(params object[] inParameterValues)
+        {
+            ValidateParameters(inParameterValues);
+            return AdoTemplate.ExecuteNonQuery(NewCommandCreatorWithParamValues(inParameterValues));
+        }
+
+
+        public System.Collections.Generic.IList<T> QueryWithRowMapper<T>(params object[] inParameterValues)
+        {
+            ValidateParameters(inParameterValues);
+            if (resultProcessors.Count == 0)
+            {
+                throw new InvalidDataAccessApiUsageException("No row mapper is specified.");
+            }
+            
+            NamedResultSetProcessor<T> resultSetProcessor = resultProcessors[0] as NamedResultSetProcessor<T>;
+            if (resultSetProcessor == null)
+            {
+                throw new InvalidDataAccessApiUsageException("No row mapper is specified.");
+            }
+
+            if (resultSetProcessor.RowMapper == null)
+            {
+                throw new InvalidDataAccessApiUsageException("No row mapper is specified as first result set processor.");
+            }
+            IDictionary outParams = Query<T>(inParameterValues);
+            return outParams[resultSetProcessor.Name] as System.Collections.Generic.IList<T>;
+            
+        }
+
+        protected virtual IDictionary Query<T>(params object[] inParameterValues)
+        {
+            ValidateParameters(inParameterValues);
+            return AdoTemplate.QueryWithCommandCreator<T>(NewCommandCreatorWithParamValues(inParameterValues), resultProcessors);
+
+        }
+
+        protected virtual IDictionary Query<T,U>(params object[] inParameterValues)
+        {
+            ValidateParameters(inParameterValues);
+            return AdoTemplate.QueryWithCommandCreator<T,U>(NewCommandCreatorWithParamValues(inParameterValues), resultProcessors);
+
+        }
+
+        #endregion
+
+
+        #region Operations that used provided named parameters
+        /// <summary>
+	    /// Execute the stored procedure using 'ExecuteScalar'
+	    /// </summary>
+	    /// <param name="inParams">Value of input parameters.</param>
+        /// <returns>Dictionary with any named output parameters and the value of the
+        /// scalar under the key "scalar".</returns>
+	    protected virtual IDictionary ExecuteScalarByNamedParam(IDictionary inParams)
+	    {
+            ValidateNamedParameters(inParams);                        
+            return AdoTemplate.ExecuteScalar(NewCommandCreator(inParams));	        
+	    }
+	    
+        protected virtual IDictionary ExecuteNonQueryByNamedParam(IDictionary inParams)
+        {
+            ValidateNamedParameters(inParams);                        
+            return AdoTemplate.ExecuteNonQuery(NewCommandCreator(inParams));
+        }	    
+	       
+	    
+        protected virtual IDictionary QueryByNamedParam<T>(IDictionary inParams)
+        {
+            ValidateNamedParameters(inParams);                        
+            return AdoTemplate.QueryWithCommandCreator<T>(NewCommandCreator(inParams), resultProcessors);
+        }
+
+        protected virtual IDictionary QueryByNamedParam<T,U>(IDictionary inParams)
+        {
+            ValidateNamedParameters(inParams);
+            return AdoTemplate.QueryWithCommandCreator<T,U>(NewCommandCreator(inParams), resultProcessors);
+        }
+
+        #endregion
+
+        protected override bool IsInputParameter(IDataParameter parameter)
+        {
+            if (usingDerivedParameters)
+            {
+                //Can only count Input, derived output parameters are incorrectly classified as input-output
+                return (parameter.Direction == ParameterDirection.Input);
+            }     
+            else
+            {
+                return base.IsInputParameter(parameter);
+            }
+        }
+	    
+		#endregion
+
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Objects/MappingAdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/MappingAdoQuery.cs
new file mode 100644
index 00000000..e56743dc
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Objects/MappingAdoQuery.cs
@@ -0,0 +1,75 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+using System.Data;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data.Objects
+{
+	/// <summary>
+    /// Reusable query in which concrete subclasses must implement the
+    /// MapRow method to map each row of a single result set into an 
+    /// object.
+	/// </summary>
+	/// <remarks>
+    /// Simplifies MappingAdoQueryWithContext API by dropping parameters and
+    /// context. Most subclasses won't care about parameters. If you don't use
+    /// contextual information, subclass this instead of MappingSqlQueryWithContext.
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: MappingAdoQuery.cs,v 1.5 2008/05/29 17:26:35 markpollack Exp $</version>
+	public abstract class MappingAdoQuery : MappingAdoQueryWithContext
+	{
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="MappingAdoQuery"/> class.
+        /// </summary>
+		public 	MappingAdoQuery()
+		{
+
+		}
+	    
+        public MappingAdoQuery(IDbProvider dbProvider, string sql) : base(dbProvider, sql)
+        {
+	        
+        }
+
+		#endregion
+
+		#region Methods
+
+        protected override object MapRow(IDataReader reader, int rowNum, IDictionary inParams,
+            IDictionary callingContext)
+        {
+            return MapRow(reader, rowNum);
+        }
+
+        protected abstract object MapRow(IDataReader reader, int num);
+	    
+		#endregion
+
+
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Objects/MappingAdoQueryWithContext.cs b/src/Spring/Spring.Data/Data/Objects/MappingAdoQueryWithContext.cs
new file mode 100644
index 00000000..bde0ded0
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Objects/MappingAdoQueryWithContext.cs
@@ -0,0 +1,97 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data.Objects
+{
+	/// <summary>
+	/// Reusable query in which concrete subclasses must implement the
+	/// MapRow method to map each row of a single result set into an 
+	/// object.
+	/// </summary>
+	/// <remarks>The MapRow method is also passed the input parameters and
+	/// a dictionary to provide the method with calling context information
+	/// (if necessary).  If you do not need these additional parameters, use
+	/// the subclass MappingAdoQuery.
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: MappingAdoQueryWithContext.cs,v 1.4 2008/05/29 17:26:35 markpollack Exp $</version>
+	public abstract class MappingAdoQueryWithContext : AdoQuery
+	{
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="MappingAdoQueryWithContext"/> class.
+        /// </summary>
+		public MappingAdoQueryWithContext()
+		{
+
+		}
+
+	    public MappingAdoQueryWithContext(IDbProvider dbProvider, string sql) : base(dbProvider, sql)
+	    {
+	        
+	    }
+		#endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+	    
+        protected override IRowMapper NewRowMapper(IDictionary inParams, IDictionary callingContext) 
+        {
+            return new RowMapperImpl(this, inParams, callingContext);
+        }
+	    
+        protected abstract Object MapRow(IDataReader reader, int rowNum, IDictionary inParams, IDictionary callingContext);
+          
+
+	    #endregion
+	    
+        private class RowMapperImpl : IRowMapper
+        {
+            private MappingAdoQueryWithContext outer;
+            private IDictionary inParams;
+            private IDictionary callingContext;
+	        
+            public RowMapperImpl(MappingAdoQueryWithContext mappingAdoQueryWithContext, IDictionary inParams, IDictionary callingContext)
+            {
+                outer = mappingAdoQueryWithContext;
+                this.inParams = inParams;
+                this.callingContext = callingContext;
+            }
+
+            public object MapRow(IDataReader dataReader, int rowNum)
+            {
+                return outer.MapRow(dataReader, rowNum, inParams, callingContext);
+            }
+        }
+
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Objects/StoredProcedure.cs b/src/Spring/Spring.Data/Data/Objects/StoredProcedure.cs
new file mode 100644
index 00000000..876abb7e
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Objects/StoredProcedure.cs
@@ -0,0 +1,180 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+using System.Data;
+using Spring.Collections;
+using Spring.Dao;
+using Spring.Data.Common;
+using Spring.Data.Support;
+
+#endregion
+
+namespace Spring.Data.Objects
+{
+	/// <summary>
+	/// A superclass for object based abstractions of RDBMS stored procedures. 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: StoredProcedure.cs,v 1.9 2007/07/25 08:25:20 markpollack Exp $</version>
+	public abstract class StoredProcedure : AdoOperation
+	{
+		#region Fields
+        
+	    //A collection of NamedResultSetProcessor
+        private IList resultProcessors = new LinkedList();
+	    private bool usingDerivedParameters = false;
+	    
+	    
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="StoredProcedure"/> class.
+        /// </summary>
+		public StoredProcedure()
+		{
+            CommandType = CommandType.StoredProcedure;
+		}
+	    
+        public StoredProcedure(IDbProvider dbProvider, string procedureName) : base(dbProvider, procedureName)
+        {
+    	    CommandType = CommandType.StoredProcedure;
+        }
+	    
+	    
+
+		#endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+
+	    public void DeriveParameters()
+	    {
+	        DeriveParameters(false);
+	    }
+	    
+	    
+        public void DeriveParameters(bool includeReturnParameter)
+        {
+            //TODO does this account for offsets?
+            IDataParameter[] derivedParameters = AdoTemplate.DeriveParameters(Sql, includeReturnParameter);
+            for (int i = 0; i < derivedParameters.Length; i++)
+            {
+                IDataParameter parameter = derivedParameters[i];
+                DeclaredParameters.AddParameter(parameter);
+            } 
+            usingDerivedParameters = true;
+        }
+	    
+	    
+        public void AddResultSetExtractor(string name, IResultSetExtractor resultSetExtractor)
+        {
+            if (Compiled)
+            {
+                throw new InvalidDataAccessApiUsageException("Cannot add ResultSetExtractors once operation is compiled");
+            }
+            resultProcessors.Add(new NamedResultSetProcessor(name, resultSetExtractor));
+        }
+        
+        public void AddRowCallback(string name, IRowCallback rowCallback)
+        {
+            if (Compiled)
+            {
+                throw new InvalidDataAccessApiUsageException("Cannot add RowCallbacks once operation is compiled");
+            }
+            resultProcessors.Add(new NamedResultSetProcessor(name,rowCallback));
+        }
+        
+        public void AddRowMapper(string name, IRowMapper rowMapper)
+        {
+            if (Compiled)
+            {
+                throw new InvalidDataAccessApiUsageException("Cannot add RowMappers once operation is compiled");
+            }
+            resultProcessors.Add(new NamedResultSetProcessor(name,rowMapper));
+        }
+	    
+	    
+	    protected virtual IDictionary ExecuteScalar(params object[] inParameterValues)
+	    {
+            ValidateParameters(inParameterValues);
+            return AdoTemplate.ExecuteScalar(NewCommandCreatorWithParamValues(inParameterValues));		        
+	    }
+	    
+        protected virtual IDictionary ExecuteNonQuery(params object[] inParameterValues)
+        {
+            ValidateParameters(inParameterValues);
+            return AdoTemplate.ExecuteNonQuery(NewCommandCreatorWithParamValues(inParameterValues));		        
+        }
+
+        protected virtual IDictionary Query(params object[] inParameterValues)
+        {
+            ValidateParameters(inParameterValues);
+            return AdoTemplate.QueryWithCommandCreator(NewCommandCreatorWithParamValues(inParameterValues), resultProcessors);		        
+        }
+	    
+	    /// <summary>
+	    /// Execute the stored procedure using 'ExecuteScalar'
+	    /// </summary>
+	    /// <param name="inParams">Value of input parameters.</param>
+        /// <returns>Dictionary with any named output parameters and the value of the
+        /// scalar under the key "scalar".</returns>
+	    protected virtual IDictionary ExecuteScalarByNamedParam(IDictionary inParams)
+	    {
+            ValidateNamedParameters(inParams);                        
+            return AdoTemplate.ExecuteScalar(NewCommandCreator(inParams));	        
+	    }
+	    
+        protected virtual IDictionary ExecuteNonQueryByNamedParam(IDictionary inParams)
+        {
+            ValidateNamedParameters(inParams);                        
+            return AdoTemplate.ExecuteNonQuery(NewCommandCreator(inParams));
+        }	    
+	       
+	    
+        protected virtual IDictionary QueryByNamedParam(IDictionary inParams)
+        {
+            ValidateNamedParameters(inParams);                        
+            return AdoTemplate.QueryWithCommandCreator(NewCommandCreator(inParams), resultProcessors);
+        }
+
+        protected override bool IsInputParameter(IDataParameter parameter)
+        {
+            if (usingDerivedParameters)
+            {
+                //Can only count Input, derived output parameters are incorrectly classified as input-output
+                return (parameter.Direction == ParameterDirection.Input);
+            }     
+            else
+            {
+                return base.IsInputParameter(parameter);
+            }
+        }
+	    
+		#endregion
+
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/ResultSetExtractorDelegate.cs b/src/Spring/Spring.Data/Data/ResultSetExtractorDelegate.cs
new file mode 100644
index 00000000..ac9eaf28
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/ResultSetExtractorDelegate.cs
@@ -0,0 +1,40 @@
+#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.Data;
+
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// Callback delegate to process all result sets and row in an 
+    /// AdoTemplate query method.
+    /// </summary>
+    /// <remarks>
+    /// Implementations of this delegate perform the work
+    /// of extracting results but don't need worry about managing
+    /// ADO.NET resources, such as closing the reader, or transaction management.
+    /// </remarks> 
+    /// <param name="reader">The IDataReader to extract data from.
+    /// Implementations should not close this: it will be closed
+    /// by the AdoTemplate.</param>
+    /// <returns>An arbitrary result object or null if none.</returns>
+    public delegate object ResultSetExtractorDelegate(IDataReader reader);
+}
diff --git a/src/Spring/Spring.Data/Data/RowCallbackDelegate.cs b/src/Spring/Spring.Data/Data/RowCallbackDelegate.cs
new file mode 100644
index 00000000..775e1349
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/RowCallbackDelegate.cs
@@ -0,0 +1,8 @@
+
+
+using System.Data;
+
+namespace Spring.Data
+{
+    public delegate void RowCallbackDelegate(IDataReader dataReader);
+}
diff --git a/src/Spring/Spring.Data/Data/RowMapperDelegate.cs b/src/Spring/Spring.Data/Data/RowMapperDelegate.cs
new file mode 100644
index 00000000..1f4c5dbf
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/RowMapperDelegate.cs
@@ -0,0 +1,35 @@
+#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.Data;
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// Callback delegate to process each row of data in a result set to an object.
+    /// </summary>
+    /// <param name="dataReader">The IDataReader to map</param>
+    /// <param name="rowNum">the number of the current row.</param>
+    /// <returns>An abrirary object, typically derived from data
+    /// in the result set.</returns>
+    public delegate object RowMapperDelegate(IDataReader dataReader, int rowNum);
+
+}
diff --git a/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs b/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs
new file mode 100644
index 00000000..7e5862d0
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs
@@ -0,0 +1,170 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using Common.Logging;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data.Support
+{
+    /// <summary>
+    /// Convenient base class for ADO.NET transaction aware objects.
+    /// </summary>
+    /// <remarks>
+    /// Can contain a ConnectionHolder object.
+    /// </remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AdoTransactionObjectSupport.cs,v 1.7 2007/11/28 05:54:47 markpollack Exp $</version>
+    public abstract class AdoTransactionObjectSupport : ISavepointManager, ISmartTransactionObject
+    {
+        #region Fields
+
+        private ConnectionHolder connectionHolder;
+
+        private IsolationLevel previousIsolationLevel;
+
+        private bool savepointAllowed;
+
+        #endregion
+
+        #region Constants
+
+        /// <summary>
+        /// The shared log instance for this class (and derived classes). 
+        /// </summary>
+        protected static readonly ILog log =
+            LogManager.GetLogger(typeof (AdoTransactionObjectSupport));
+
+        #endregion
+
+        #region Properties
+
+        public ConnectionHolder ConnectionHolder
+        {
+            get { return connectionHolder; }
+            set { connectionHolder = value; }
+        }
+
+        public bool HasConnectionHolder
+        {
+            get { return (connectionHolder != null); }
+        }
+
+        public IsolationLevel PreviousIsolationLevel
+        {
+            get { return previousIsolationLevel; }
+            set { previousIsolationLevel = value; }
+        }
+
+        public bool SavepointAllowed
+        {
+            get { return savepointAllowed; }
+            set { savepointAllowed = value; }
+        }
+
+        /// <summary>
+        /// Return whether the transaction is internally marked as rollback-only.
+        /// </summary>
+        /// <value></value>
+        /// <returns>True of the transaction is marked as rollback-only.</returns>
+        public abstract bool RollbackOnly { get; }
+
+        #endregion
+
+        /// <summary>
+        /// Create a new savepoint.
+        /// </summary>
+        /// <param name="savepointName">
+        /// The name of the savepoint to create.
+        /// </param>
+        /// <remarks>
+        /// You can roll back to a specific savepoint
+        /// via <see cref="Spring.Transaction.ISavepointManager.RollbackToSavepoint"/>,
+        /// and explicitly release a savepoint that you don't need anymore via
+        /// <see cref="Spring.Transaction.ISavepointManager.ReleaseSavepoint"/>.
+        /// <p>
+        /// Note that most transaction managers will automatically release
+        /// savepoints at transaction completion.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// If the savepoint could not be created,
+        /// either because the backend does not support it or because the
+        /// transaction is not in an appropriate state.
+        /// </exception>
+        /// <returns>
+        /// A savepoint object, to be passed into
+        /// <see cref="Spring.Transaction.ISavepointManager.RollbackToSavepoint"/>
+        /// or <see cref="Spring.Transaction.ISavepointManager.ReleaseSavepoint"/>.
+        /// </returns>
+        public virtual void CreateSavepoint(string savepointName)
+        {
+            throw new NestedTransactionNotSupportedException(
+                "Cannot create a nested transaction because savepoints have not been implemented in the metadata for the DbProvider.");
+        }
+
+        /// <summary>
+        /// Roll back to the given savepoint.
+        /// </summary>
+        /// <remarks>
+        /// The savepoint will be automatically released afterwards.
+        /// </remarks>
+        /// <param name="savepoint">The savepoint to roll back to.</param>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// If the rollback failed.
+        /// </exception>
+        public virtual void RollbackToSavepoint(string savepoint)
+        {
+            throw new NestedTransactionNotSupportedException(
+                           "Cannot rollback to a savepoint in a nested transaction because savepoints have not been implemented in the metadata for the DbProvider.");
+       
+        }
+
+        /// <summary>
+        /// Explicitly release the given savepoint.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Note that most transaction managers will automatically release
+        /// savepoints at transaction completion.
+        /// </p>
+        /// <p>
+        /// Implementations should fail as silently as possible if
+        /// proper resource cleanup will still happen at transaction completion.
+        /// </p>
+        /// </remarks>
+        /// <param name="savepoint">The savepoint to release.</param>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// If the release failed.
+        /// </exception>
+        public virtual void ReleaseSavepoint(string savepoint)
+        {
+            throw new NestedTransactionNotSupportedException(
+                                       "Cannot release a savepoint in a nested transaction because savepoints have not been implemented in the metadata for the DbProvider.");
+       
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Support/AdoUtils.cs b/src/Spring/Spring.Data/Data/Support/AdoUtils.cs
new file mode 100644
index 00000000..c49775ab
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/AdoUtils.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Data;
+using Common.Logging;
+
+namespace Spring.Data.Support
+{
+	/// <summary>
+	/// Summary description for AdoUtils.
+	/// </summary>
+    public abstract class AdoUtils
+    {
+        #region Logging
+
+        private static readonly ILog LOG = LogManager.GetLogger(typeof (AdoUtils));
+
+        #endregion
+
+        #region Constants
+
+        /// <summary>
+        /// Order value for TransactionSynchronization objects that clean up
+        /// ADO.NET Connections.
+        /// </summary>
+        public static readonly int CONNECTION_SYNCHRONIZATION_ORDER = 1000;
+
+        #endregion
+        /// <summary>
+        /// Property dispose of the command.  Useful in finally or catch blocks.
+        /// </summary>
+        /// <param name="command">command to dispose</param>
+        public static void DisposeCommand(IDbCommand command)
+        {
+            if (command != null)
+            {
+                DoDisposeCommand(command);
+            }
+        }
+
+
+	    public static void DisposeDataAdapterCommands(IDbDataAdapter adapter)
+        {
+            if (adapter.SelectCommand != null)
+            {
+                DoDisposeCommand(adapter.SelectCommand);
+            }
+	        if (adapter.InsertCommand != null)
+	        {
+	            DoDisposeCommand(adapter.InsertCommand);
+	        }
+            if (adapter.UpdateCommand != null)
+            {
+                DoDisposeCommand(adapter.UpdateCommand);
+            }
+	        if (adapter.DeleteCommand != null)
+	        {
+	            DoDisposeCommand(adapter.DeleteCommand);
+	        }
+
+        }
+        public static void CloseReader(IDataReader reader)
+        {
+	        if (reader != null)
+	        {
+	            try
+	            {
+	                reader.Close();
+	            }
+                catch (Exception e)
+                {
+                    LOG.Warn("Could not close IDataRader", e);
+                }
+	        }
+        }
+	    
+        private static void DoDisposeCommand(IDbCommand command)
+        {
+            try
+            {
+                command.Dispose();
+            }
+            catch (Exception e)
+            {
+                LOG.Warn("Could not dispose of command", e);
+            }
+        }
+
+    }
+
+}
diff --git a/src/Spring/Spring.Data/Data/Support/ConnectionHolder.cs b/src/Spring/Spring.Data/Data/Support/ConnectionHolder.cs
new file mode 100644
index 00000000..7e65fd72
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/ConnectionHolder.cs
@@ -0,0 +1,72 @@
+using System.Data;
+using Spring.Transaction.Support;
+
+namespace Spring.Data.Support
+{
+	/// <summary>
+	/// Connection holder, wrapping a ADO.NET connection and transaction.
+	/// </summary>
+	/// <remarks>AdoTransactionManager binds instances of this class to the
+	/// thread for a given DbProvider.</remarks>
+	/// <author>Jurgen Hoeller</author>
+	/// <author>Mark Pollack (.NET)</author>
+	public class ConnectionHolder : ResourceHolderSupport
+	{
+        private IDbConnection currentConnection;
+
+        private IDbTransaction currentTransaction;
+
+	    private bool transactionActive = false;
+
+        /// <summary>
+        /// Create a new ConnectionHolder
+        /// </summary>
+        /// <param name="conn">The connection to hold</param>
+        /// <param name="transaction">The transaction to hold</param>
+		public ConnectionHolder(IDbConnection conn, IDbTransaction transaction)
+		{
+            //TODO assert conn is not null.
+            currentConnection = conn;
+            currentTransaction = transaction;
+		}
+
+        public IDbConnection Connection
+        {
+            get
+            {
+                return currentConnection;
+            }
+            set
+            {
+                currentConnection = value;
+            }
+
+        }
+
+	    public IDbTransaction Transaction
+	    {
+	        get { return currentTransaction; }
+	        set { currentTransaction = value; }
+	    }
+
+	    public bool HasConnection
+        {
+            get
+            {
+                return (currentConnection != null);
+            }
+        }
+
+        public bool TransactionActive
+        {
+            get { return transactionActive; }
+            set { transactionActive = value; }
+        }
+
+        public override void Clear()
+        {
+            base.Clear();
+            transactionActive = false;
+        }
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Support/ConnectionSynchronization.cs b/src/Spring/Spring.Data/Data/Support/ConnectionSynchronization.cs
new file mode 100644
index 00000000..d8a7e3d3
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/ConnectionSynchronization.cs
@@ -0,0 +1,129 @@
+using Spring.Data.Common;
+using Spring.Transaction.Support;
+
+namespace Spring.Data.Support
+{
+	/// <summary>
+	/// Callback for resource cleanup at end of transaction.
+	/// </summary>
+	public class ConnectionSynchronization : TransactionSynchronizationAdapter
+	{
+	    
+        private ConnectionHolder connectionHolder;
+
+        private IDbProvider dbProvider;
+
+        private bool holderActive = true;
+
+        private int order;
+        /// <summary>
+        /// Create a new instance.
+        /// </summary>
+        /// <param name="connHolder"></param>
+        /// <param name="provider"></param>
+		public ConnectionSynchronization(ConnectionHolder connHolder, IDbProvider provider)
+	    {
+            connectionHolder = connHolder;
+            dbProvider = provider;
+            order = ConnectionUtils.CONNECTION_SYNCHRONIZATION_ORDER;
+		}
+
+
+        /// <summary>
+        /// Compares the current instance with another object of the same type.
+        /// </summary>
+        /// <param name="obj">An object to compare with this instance.</param>
+        /// <returns>
+        /// The value of the order property.
+        /// </returns>
+        public override int CompareTo(object obj)
+        {
+        	return order;
+        }
+        /// <summary>
+        /// Suspend this synchronization.
+        /// </summary>
+        /// <remarks>
+        /// 	<p>
+        /// Supposed to unbind resources from
+        /// <see cref="Spring.Transaction.Support.TransactionSynchronizationManager"/>
+        /// if managing any.
+        /// </p>
+        /// </remarks>
+        public override void Suspend()
+        {
+            if (holderActive)
+            {
+                TransactionSynchronizationManager.UnbindResource(dbProvider);
+
+                //TODO do we need to reset the connection inside the conHolder to null?
+            }
+        }
+
+        /// <summary>
+        /// Resume this synchronization.
+        /// </summary>
+        /// <remarks>
+        /// 	<p>
+        /// Supposed to unbind resources from
+        /// <see cref="Spring.Transaction.Support.TransactionSynchronizationManager"/>
+        /// if managing any.
+        /// </p>
+        /// </remarks>
+        public override void Resume()
+        {
+            if (holderActive)
+            {
+                TransactionSynchronizationManager.BindResource(dbProvider, connectionHolder);
+            }
+        }
+
+        /// <summary>
+        /// Invoked before transaction commit/rollback (after
+        /// <see cref="Spring.Transaction.Support.ITransactionSynchronization.BeforeCommit"/>,
+        /// even if
+        /// <see cref="Spring.Transaction.Support.ITransactionSynchronization.BeforeCommit"/>
+        /// threw an exception).
+        /// </summary>
+        /// <remarks>
+        /// 	<p>
+        /// Can e.g. perform resource cleanup.
+        /// </p>
+        /// 	<p>
+        /// Note that exceptions will get propagated to the commit caller
+        /// and cause a rollback of the transaction.
+        /// </p>
+        /// </remarks>
+        public override void BeforeCompletion()
+        {
+            if (connectionHolder.IsOpen )
+            {
+                TransactionSynchronizationManager.UnbindResource(dbProvider);
+                holderActive= false;
+                ConnectionUtils.DisposeConnection(connectionHolder.Connection, dbProvider);
+            }
+        }
+
+        /// <summary>
+        /// Invoked after transaction commit/rollback.
+        /// </summary>
+        /// <param name="status">Status according to <see cref="Spring.Transaction.Support.TransactionSynchronizationStatus"/></param>
+        /// <remarks>
+        /// Can e.g. perform resource cleanup, in this case after transaction completion.
+        /// <p>
+        /// Note that exceptions will get propagated to the commit or rollback
+        /// caller, although they will not influence the outcome of the transaction.
+        /// </p>
+        /// </remarks>
+        public override void AfterCompletion(TransactionSynchronizationStatus status)
+        {
+            if (TransactionSynchronizationManager.HasResource(dbProvider))
+            {
+                TransactionSynchronizationManager.UnbindResource(dbProvider);
+                holderActive = false;
+                ConnectionUtils.DisposeConnection(connectionHolder.Connection, dbProvider);   
+            }
+        }
+
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Support/ConnectionTxPair.cs b/src/Spring/Spring.Data/Data/Support/ConnectionTxPair.cs
new file mode 100644
index 00000000..0ae2808e
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/ConnectionTxPair.cs
@@ -0,0 +1,64 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Data;
+
+namespace Spring.Data.Support
+{
+    /// <summary>
+    /// A simple holder for the current Connection/Transaction objects
+    /// to use within a given AdoTemplate Execute operation.  Used internally.
+    /// </summary>
+    public class ConnectionTxPair
+    {
+        private IDbConnection connection;
+        private IDbTransaction transaction;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConnectionTxPair"/> class.
+        /// </summary>
+        /// <param name="connection">The connection.</param>
+        /// <param name="transaction">The transaction.</param>
+        public ConnectionTxPair(IDbConnection connection, IDbTransaction transaction)
+        {
+            this.connection = connection;
+            this.transaction = transaction;
+        }
+
+        /// <summary>
+        /// Gets the connection.
+        /// </summary>
+        /// <value>The connection.</value>
+        public IDbConnection Connection
+        {
+            get { return connection; }
+            set { connection = value; }
+        }
+
+        /// <summary>
+        /// Gets the transaction.
+        /// </summary>
+        /// <value>The transaction.</value>
+        public IDbTransaction Transaction
+        {
+            get { return transaction; }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs b/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs
new file mode 100644
index 00000000..40e82181
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs
@@ -0,0 +1,246 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Data;
+using Common.Logging;
+using Spring.Data.Common;
+using Spring.Transaction.Support;
+using Spring.Util;
+
+namespace Spring.Data.Support
+{
+	/// <summary>
+	/// Summary description for DbProviderUtils.
+	/// </summary>
+	public abstract class ConnectionUtils
+	{
+	    #region Logging
+
+	    private static readonly ILog LOG = LogManager.GetLogger(typeof (ConnectionUtils));
+
+	    #endregion
+
+	    public static readonly int CONNECTION_SYNCHRONIZATION_ORDER = 1000;
+        /// <summary>
+        /// Dispose of the given Connection, created via the given IDbProvider,
+	    /// if it is not managed externally (that is, not bound to the thread).
+        /// </summary>
+        /// <param name="conn">The connection to close if necessary.  If
+        /// this is null the call will be ignored. </param>
+        /// <param name="dbProvider">The IDbProvider the connection came from</param>
+	    public static void DisposeConnection(IDbConnection conn, IDbProvider dbProvider)
+        {
+            try
+            {
+                DoDisposeConnection(conn, dbProvider);
+            } catch (Exception e)
+            {
+                LOG.Warn("Could not close connection", e);
+            }
+
+        }
+        private static void DoDisposeConnection(IDbConnection conn, IDbProvider dbProvider)
+        {
+            if (conn == null)
+            {
+                return;
+            }
+
+            if (dbProvider != null)
+            {
+                ConnectionHolder conHolder = (ConnectionHolder) TransactionSynchronizationManager.GetResource(dbProvider);
+                if (conHolder != null && connectionEquals(conHolder.Connection, conn))
+                {
+                    // It's the transactional connection bound to the thread so don't close it.
+                    conHolder.Released();
+                    return;
+                }
+            }
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Disposing of IDbConnection with connection string = [" + dbProvider.ConnectionString + "]");
+            }
+            conn.Dispose();
+        }
+
+
+        /// <summary>
+        /// Get a ADO.NET Connection/Transaction Pair for the given IDbProvider.
+        /// Changes any exception into the Spring hierarchy of generic data access 
+        /// exceptions, simplifying calling code and making any exception that is 
+        /// thrown more meaningful.
+        /// </summary>
+        /// <remarks>
+        /// Is aware of a corresponding Connection/Transaction bound to the current thread, for example
+	    /// when using AdoPlatformTransactionManager. Will bind a IDbConnection to the thread
+	    /// if transaction synchronization is active
+        /// </remarks>
+        /// <param name="provider">The provider.</param>
+        /// <returns>A Connection/Transaction pair.</returns>
+	    public static ConnectionTxPair GetConnectionTxPair(IDbProvider provider)
+	    {
+            try
+            {
+                return DoGetConnection(provider);
+            } catch  (Exception e)
+            {
+                throw new CannotGetAdoConnectionException("Could not get ADO.NET connection.", e);
+            }
+            
+	    }
+
+
+        /// <summary>
+        /// Get a ADO.NET Connection/Transaction Pair for the given IDbProvider.
+        /// Same as <see cref="GetConnection"/> but throwing original provider
+        /// exception.
+        /// </summary>
+        /// <remarks>
+        /// Is aware of a corresponding Connection/Transaction bound to the current thread, for example
+        /// when using AdoPlatformTransactionManager. Will bind a IDbConnection to the thread
+        /// if transaction synchronization is active
+        /// </remarks>
+        /// <param name="provider">The provider.</param>
+        /// <returns></returns>
+	    public static ConnectionTxPair DoGetConnection(IDbProvider provider)
+	    {
+	        AssertUtils.ArgumentNotNull(provider, "provider");
+	        ConnectionHolder conHolder = (ConnectionHolder)TransactionSynchronizationManager.GetResource(provider);
+	        if (conHolder != null && (conHolder.HasConnection || conHolder.SynchronizedWithTransaction))
+	        {
+	            conHolder.Requested();
+	            if (!conHolder.HasConnection)
+	            {
+	                if (LOG.IsDebugEnabled)
+	                {
+	                    LOG.Debug("Fetching resumed ADO.NET connection from DbProvider");
+	                }
+	                conHolder.Connection = provider.CreateConnection();
+	            }    
+	            return new ConnectionTxPair(conHolder.Connection, conHolder.Transaction);
+	        }
+	        
+	        // Else we either got no holder or an empty thread-bound holder here.
+	        if (LOG.IsDebugEnabled)
+	        {
+	            LOG.Debug("Fetching Connection from DbProvider");
+	        }
+	        IDbConnection conn = provider.CreateConnection();
+            conn.Open();            
+
+            if (TransactionSynchronizationManager.SynchronizationActive)
+	        {
+	            LOG.Debug("Registering transaction synchronization for IDbConnection");
+	            //Use same connection for further ADO.NET actions with the transaction.
+	            //Thread-bound object will get removed by manager at transaction completion.
+
+	            //TODO investigate creating tx object...
+	            ConnectionHolder holderToUse = conHolder;
+	            if (holderToUse == null)
+	            {
+	                holderToUse = new ConnectionHolder(conn, null);
+	            }
+	            else
+	            {
+	                holderToUse.Connection = conn;
+	            }
+	            holderToUse.Requested();                
+	            TransactionSynchronizationManager.RegisterSynchronization(
+	                new ConnectionSynchronization(holderToUse, provider));
+	            holderToUse.SynchronizedWithTransaction = true;
+	            if (holderToUse != conHolder)
+	            {
+	                TransactionSynchronizationManager.BindResource(provider, holderToUse);
+	            }
+
+	        }
+	        return new ConnectionTxPair(conn, null);
+	    }
+
+	    //TODO exception translation?
+        /// <summary>
+        /// Do the connection mgmt.
+        /// </summary>
+        /// <param name="provider"></param>
+        /// <returns></returns>
+	    public static IDbConnection GetConnection(IDbProvider provider)
+	    {
+            AssertUtils.ArgumentNotNull(provider, "provider");
+
+            return GetConnectionTxPair(provider).Connection;
+
+	    }
+
+	    private static bool connectionEquals(IDbConnection heldCon, IDbConnection passedInCon)
+	    {
+	        return (heldCon == passedInCon || heldCon.Equals(passedInCon) ||
+                getTargetConnection(heldCon).Equals(passedInCon));
+	    }
+
+	    private static IDbConnection getTargetConnection(IDbConnection con)
+	    {
+	        IDbConnection conToUse = con;
+            /*
+            while (conToUse is ConnectionProxy)
+            {
+                conToUse = (ConnectionProxy)conToUse.getTargetConnection();
+            }
+            */
+            return conToUse;
+	    }
+
+        /// <summary>
+        /// Applies the current transaction timeout, if any, to the given ADO.NET IDbCommand object.
+        /// </summary>
+        /// <param name="command">The command.</param>
+        /// <param name="dbProvider">The db provider.</param>
+        public static void ApplyTransactionTimeout(IDbCommand command, IDbProvider dbProvider)
+        {
+            ApplyTransactionTimeout(command, dbProvider, 0);
+        }
+
+        /// <summary>
+        /// Applies the specified timeout - overridden by the current transaction timeout, if any, to to the
+        /// given ADO.NET IDb command object.
+        /// </summary>
+        /// <param name="command">The command.</param>
+        /// <param name="dbProvider">The db provider the command was obtained from.</param>
+        /// <param name="timeout">The timeout to apply (or 0 for no timeout outside of a transaction.</param>
+	    public static void ApplyTransactionTimeout(IDbCommand command, IDbProvider dbProvider, int timeout)
+	    {
+            AssertUtils.ArgumentNotNull(command, "command", "No IDbCommand specified.");
+            AssertUtils.ArgumentNotNull(dbProvider, "dbProvider", "No IDbProvider specified.");
+
+            ConnectionHolder conHolder = (ConnectionHolder)TransactionSynchronizationManager.GetResource(dbProvider);
+            if (conHolder != null && conHolder.HasTimeout)
+            {
+                // Remaining transaction timeout overrides specified value.
+                command.CommandTimeout = conHolder.TimeToLiveInSeconds;
+            }
+            else if (timeout > 0)
+            {
+                // No current transaction timeout -> apply specified value.
+                command.CommandTimeout = timeout;
+            }
+	        
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Support/DefaultServiceDomainAdapter.cs b/src/Spring/Spring.Data/Data/Support/DefaultServiceDomainAdapter.cs
new file mode 100644
index 00000000..3a28ae0f
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/DefaultServiceDomainAdapter.cs
@@ -0,0 +1,95 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if (!NET_1_0)
+
+using System.EnterpriseServices;
+
+namespace Spring.Data.Support
+{
+    /// <summary>
+    /// Implementation that delegates to ServiceDomain and ContextUtil for all functionality.
+    /// </summary>
+    /// <remarks>Introduced for purposes of unit testing.</remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id $</version> 
+    public class DefaultServiceDomainAdapter : IServiceDomainAdapter
+    {
+
+        /// <summary>
+        /// Creates the context specified by the ServiceConfig object and pushes it onto the context stack to
+        /// become the current context.
+        /// </summary>
+        /// <param name="config">A ServiceConfig that contains the configuration information for the services to be used within the enclosed code.</param>
+        public void Enter(SimpleServiceConfig config)
+        {
+            ServiceConfig serviceConfig = config.CreateServiceConfig();
+            ServiceDomain.Enter(serviceConfig);
+        }
+
+        /// <summary>
+        /// Leaves this ServiceDomain. The current context is then popped from the context stack, and the
+        /// context that was running when Enter was called becomes the current context.
+        /// </summary>
+        /// <returns>One of the TransactionStatus values</returns>
+        public TransactionStatus Leave()
+        {
+            return ServiceDomain.Leave();
+        }
+
+        /// <summary>
+        /// Sets the consistent bit and the done bit to true in the COM+ context
+        /// </summary>
+        public void SetComplete()
+        {
+            ContextUtil.SetComplete();
+        }
+
+        /// <summary>
+        /// Sets the consistent bit to false and the done bit to true in the COM+ context.
+        /// </summary>
+        public void SetAbort()
+        {
+            ContextUtil.SetAbort();
+        }
+
+        /// <summary>
+        /// Gets or sets the consistent bit in the COM+ context.
+        /// </summary>
+        /// <value>My transaction vote.</value>
+        public TransactionVote MyTransactionVote
+        {
+            get { return ContextUtil.MyTransactionVote; }
+            set { ContextUtil.MyTransactionVote = value; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the current context is transactional.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance is existing transaction; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsInTransaction
+        {
+            get { return ContextUtil.IsInTransaction; }
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Support/DefaultTransactionScopeAdapter.cs b/src/Spring/Spring.Data/Data/Support/DefaultTransactionScopeAdapter.cs
new file mode 100644
index 00000000..9bb8c6cb
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/DefaultTransactionScopeAdapter.cs
@@ -0,0 +1,109 @@
+#if NET_2_0
+
+#region License
+
+/*
+ * Copyright 2007 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.Transactions;
+
+namespace Spring.Data.Support
+{
+    /// <summary>
+    /// Uses <see cref="TransactionScope"/> and System.Transactions.Transaction.Current to provide
+    /// necessary state and operations to TxScopeTransactionManager.
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: DefaultTransactionScopeAdapter.cs,v 1.1 2007/11/30 18:38:47 markpollack Exp $</version> 
+    public class DefaultTransactionScopeAdapter : ITransactionScopeAdapter
+    {
+        private TransactionScope txScope;
+
+        /// <summary>
+        /// Call Complete() on the TransactionScope object created by this instance.
+        /// </summary>
+        public void Complete()
+        {
+            txScope.Complete();
+        }
+
+        /// <summary>
+        /// Call Disponse() on the TransactionScope object created by this instance.
+        /// </summary>
+        public void Dispose()
+        {
+            txScope.Dispose();
+        }
+
+
+        /// <summary>
+        /// Gets a value indicating whether there is a new transaction or an existing transaction.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance is existing transaction; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsExistingTransaction
+        {
+            get {
+                if (System.Transactions.Transaction.Current != null)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether rollback only has been called (i.e. Rollback() on the
+        /// Transaction object) and therefore voting that the transaction will be aborted.
+        /// </summary>
+        /// <value><c>true</c> if rollback only; otherwise, <c>false</c>.</value>
+        public bool RollbackOnly
+        {
+            get
+            {
+                if (System.Transactions.Transaction.Current != null &&
+                    System.Transactions.Transaction.Current.TransactionInformation != null &&
+                    System.Transactions.Transaction.Current.TransactionInformation.Status == TransactionStatus.Aborted)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            } 
+        }
+
+        /// <summary>
+        /// Creates the transaction scope.
+        /// </summary>
+        /// <param name="txScopeOption">The tx scope option.</param>
+        /// <param name="txOptions">The tx options.</param>
+        /// <param name="interopOption">The interop option.</param>
+        public void CreateTransactionScope(TransactionScopeOption txScopeOption, TransactionOptions txOptions,
+                                           EnterpriseServicesInteropOption interopOption)
+        {
+            txScope = new TransactionScope(txScopeOption, txOptions, interopOption);
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs b/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs
new file mode 100644
index 00000000..5724bbf1
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs
@@ -0,0 +1,301 @@
+#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
+
+#region Imports
+
+using System;
+using Common.Logging;
+using Spring.Dao;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data.Support
+{
+	/// <summary>
+	/// Implementation of IAdoExceptionTranslator that analyzes provider specific
+	/// error codes and translates into the DAO exception hierarchy.
+	/// </summary>
+	/// <remarks>This class loads the obtains error codes from
+	/// the IDbProvider metadata property ErrorCodes  
+	/// which defines error code mappings for various providers.
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: ErrorCodeExceptionTranslator.cs,v 1.11 2007/12/06 20:14:30 markpollack Exp $</version>
+	public class ErrorCodeExceptionTranslator : IAdoExceptionTranslator
+	{
+		#region Fields
+
+	    private ErrorCodes errorCodes;
+
+        private IAdoExceptionTranslator fallbackTranslator;
+	    
+	    private IDbProvider dbProvider;
+	    
+		#endregion
+
+		#region Constants
+
+		/// <summary>
+		/// The shared log instance for this class (and derived classes). 
+		/// </summary>
+		protected static readonly ILog log =
+			LogManager.GetLogger(typeof (ErrorCodeExceptionTranslator));
+
+		#endregion
+
+		#region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ErrorCodeExceptionTranslator"/> class.
+        /// </summary>
+        /// <param name="provider">The data provider.</param>
+	    public ErrorCodeExceptionTranslator(IDbProvider provider)
+	    {
+	        DbProvider = provider;
+	    }
+
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ErrorCodeExceptionTranslator"/> class.
+        /// </summary>
+        /// <param name="provider">The data provider.</param>
+        /// <param name="ec">The error code collection.</param>
+        public ErrorCodeExceptionTranslator(IDbProvider provider, ErrorCodes ec)
+        {
+            DbProvider = provider;
+            errorCodes = ec;
+        }
+        
+	  
+
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Sets the db provider.
+        /// </summary>
+        /// <value>The db provider.</value>
+	    public IDbProvider DbProvider
+	    {
+	        set
+	        {
+	            dbProvider = value;
+                fallbackTranslator = new FallbackExceptionTranslator();
+                errorCodes = dbProvider.DbMetadata.ErrorCodes;
+	            
+	        }
+	    }
+	    
+        /// <summary>
+        /// Gets the error codes for the provider
+        /// </summary>
+        /// <value>The error codes.</value>
+	    public ErrorCodes ErrorCodes
+	    {
+	        get
+	        {
+	            return errorCodes;
+	        }
+	    }
+	    
+		#endregion
+
+        /// <summary>
+        /// Gets or sets the fallback translator to use in case error code based translation
+        /// fails.
+        /// </summary>
+        /// <value>The fallback translator.</value>
+	    public IAdoExceptionTranslator FallbackTranslator
+	    {
+	        get
+	        {
+	            return fallbackTranslator;
+	        }
+	        set
+	        {
+	            fallbackTranslator = value;
+	        }
+	    }
+	    
+
+		#region Methods
+
+		#endregion
+
+	    /// <summary>
+	    /// Translate the given <see cref="System.SystemException"/> into a generic data access exception.
+	    /// </summary>
+	    /// <param name="task">A readable string describing the task being attempted.</param>
+	    /// <param name="sql">The SQL query or update that caused the problem. May be null.</param>
+	    /// <param name="exception">
+	    /// The <see cref="System.Exception"/> encountered by the ADO.NET implementation.
+	    /// </param>
+	    /// <returns>
+	    /// A <see cref="Spring.Dao.DataAccessException"/> appropriate for the supplied
+	    /// <paramref name="exception"/>.
+	    /// </returns>
+	    public virtual DataAccessException Translate(string task, string sql, Exception exception)
+	    {
+	        if (task == null)
+	        {
+	            task = "";
+	        }
+	        if (sql == null)
+	        {
+	            sql = "";
+	        }
+	        string errorCode = ExtractErrorCode(exception);
+
+            // First, try custom translation from overridden method.
+            DataAccessException dex = TranslateException(task, sql, errorCode, exception);
+            if (dex != null)
+            {
+                return dex;
+            }
+
+
+	        if (errorCodes != null)
+	        {
+
+	            if (errorCode != null)
+	            {
+                    if (Array.IndexOf(errorCodes.BadSqlGrammarCodes, errorCode) >= 0)
+	                {
+	                    LogTranslation(task, sql, errorCode, exception, false);
+	                    return new BadSqlGrammarException(task, sql, exception);
+	                }
+                    else if (Array.IndexOf(errorCodes.InvalidResultSetAccessCodes, errorCode) >= 0) 
+                    {
+                        LogTranslation(task, sql, errorCode, exception, false);
+                        return new InvalidResultSetAccessException(task, sql, exception);
+                    }
+                    else if (Array.IndexOf(errorCodes.DataAccessResourceFailureCodes, errorCode) >= 0) 
+                    {
+                        LogTranslation(task, sql, errorCode, exception, false);
+                        return new DataAccessResourceFailureException(BuildMessage(task, sql, exception), exception);
+                    }
+                    else if (Array.IndexOf(errorCodes.PermissionDeniedCodes, errorCode) >= 0) 
+                    {
+                        LogTranslation(task, sql, errorCode, exception, false);
+                        return new PermissionDeniedDataAccessException(BuildMessage(task, sql, exception), exception);
+                    }
+                    else if (Array.IndexOf(errorCodes.DataIntegrityViolationCodes, errorCode) >= 0) 
+                    {
+                        LogTranslation(task, sql, errorCode, exception, false);
+                        return new DataIntegrityViolationException(BuildMessage(task, sql, exception), exception);
+                    }
+                    else if (Array.IndexOf(errorCodes.CannotAcquireLockCodes, errorCode) >= 0) 
+                    {
+                        LogTranslation(task, sql, errorCode, exception, false);
+                        return new CannotAcquireLockException(BuildMessage(task, sql, exception), exception);
+                    }
+                    else if (Array.IndexOf(errorCodes.DeadlockLoserCodes, errorCode) >= 0) 
+                    {
+                        LogTranslation(task, sql, errorCode, exception, false);
+                        return new DeadlockLoserDataAccessException(BuildMessage(task, sql, exception), exception);
+                    }
+                    else if (Array.IndexOf(errorCodes.CannotSerializeTransactionCodes, errorCode) >= 0) 
+                    {
+                        LogTranslation(task, sql, errorCode, exception, false);
+                        return new CannotSerializeTransactionException(BuildMessage(task, sql, exception), exception);
+                    }
+	            }
+	        }
+	        if (log.IsDebugEnabled)
+	        {
+	            log.Debug("Unable to translate exception eith errorCode '" + errorCode + "', will use the fallback translator");	            
+	        }
+	        return fallbackTranslator.Translate(task, sql, exception);
+	    }
+
+        /// <summary>
+        /// Subclasses can override this method to attempt a custom mapping from a data access Exception
+        /// to DataAccessException.
+        /// </summary>
+        /// <param name="task">Readable text describing the task being attempted.</param>
+        /// <param name="sql">SQL query or update that caused the problem. May be <code>null</code>.</param>
+        /// <param name="errorCode">The error code extracted from the generic data access exception for
+        /// a particular provider.</param>
+        /// <param name="exception">The exception thrown from a data access operation.</param>
+        /// <returns>
+        /// null if no custom translation was possible, otherwise a DataAccessException
+        /// resulting from custom translation.  This exception should include the exception parameter
+        /// as a nested root cause. This implementation always returns null, meaning that
+        /// the translator always falls back to the default error codes.
+        /// </returns>
+	    protected virtual DataAccessException TranslateException(string task, string sql, string errorCode, Exception exception)
+	    {
+	        return null;
+	    }
+
+
+	    /// <summary>
+	    /// Builds the message.
+	    /// </summary>
+	    /// <param name="task">The task.</param>
+	    /// <param name="sql">The SQL.</param>
+	    /// <param name="exception">The exception.</param>
+	    /// <returns></returns>
+	    protected virtual string BuildMessage(string task, string sql, Exception exception)
+	    {
+	        return task + "; SQL [" + sql + "]; " + exception.Message;
+	    }
+
+	    /// <summary>
+        /// Determines whether the specified exception is valid data access exception.
+        /// </summary>
+        /// <param name="e">The exception.</param>
+        /// <returns>
+        /// 	<c>true</c> if is valid data access exception; otherwise, <c>false</c>.
+        /// </returns>
+	    public bool IsValidDataAccessException(Exception e)
+	    {
+	       return dbProvider.IsDataAccessException(e);
+        }
+
+        /// <summary>
+        /// Logs the translation.
+        /// </summary>
+        /// <param name="task">The task.</param>
+        /// <param name="sql">The SQL.</param>
+        /// <param name="errorCode">The error code.</param>
+        /// <param name="exception">The exception.</param>
+        /// <param name="b">if set to <c>true</c> [b].</param>
+	    private void LogTranslation(string task, string sql, string errorCode, Exception exception, bool b)
+	    {
+            if (log.IsDebugEnabled) 
+            {
+                String intro = "Translating";
+                log.Debug(intro + " ADO exception with error code '" + errorCode
+                          + "', message [" + exception.Message +
+                    "]; SQL was [" + sql + "] for task [" + task + "]");
+            }
+	    }
+
+	    private string ExtractErrorCode(Exception exception)
+	    {
+            // Use provider specific reflection information to extract error code.
+	        return dbProvider.ExtractError(exception);
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Support/FallbackExceptionTranslator.cs b/src/Spring/Spring.Data/Data/Support/FallbackExceptionTranslator.cs
new file mode 100644
index 00000000..73e3e9f4
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/FallbackExceptionTranslator.cs
@@ -0,0 +1,71 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Spring.Dao;
+
+#endregion
+
+namespace Spring.Data.Support
+{
+	/// <summary>
+    /// Translates all exceptions to an UncategorizedAdoException.
+    /// </summary>
+    /// <remarks>
+    /// This exception translator used when an exception is thrown using the
+	/// "primary" implementation of IAdoExceptionTranslator, i.e. AdoExceptionTranslator.
+    /// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: FallbackExceptionTranslator.cs,v 1.6 2007/01/01 22:22:50 markpollack Exp $</version>
+	public class FallbackExceptionTranslator : IAdoExceptionTranslator
+	{
+
+    
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="FallbackExceptionTranslator"/> class.
+        /// </summary>
+		public FallbackExceptionTranslator()
+		{
+		}
+
+		#endregion
+
+
+	    /// <summary>
+	    /// Translate the given <see cref="System.SystemException"/> into a generic data access exception.
+	    /// </summary>
+	    /// <param name="task">A readable string describing the task being attempted.</param>
+	    /// <param name="sql">The SQL query or update that caused the problem. May be null.</param>
+	    /// <param name="exception">
+	    /// The <see cref="System.Exception"/> encountered by the ADO.NET implementation.
+	    /// </param>
+	    /// <returns>
+	    /// A <see cref="Spring.Dao.DataAccessException"/> appropriate for the supplied
+	    /// <paramref name="exception"/>.
+	    /// </returns>
+	    public DataAccessException Translate(string task, string sql, Exception exception)
+	    {
+	        throw new UncategorizedAdoException(task, sql, "<no error code>", exception);
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Support/IAdoExceptionTranslator.cs b/src/Spring/Spring.Data/Data/Support/IAdoExceptionTranslator.cs
new file mode 100644
index 00000000..e73270d4
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/IAdoExceptionTranslator.cs
@@ -0,0 +1,56 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 Spring.Dao;
+
+namespace Spring.Data.Support
+{
+	/// <summary>
+	/// Interface to be implemented by classes that can translate between properietary SQL exceptions
+	/// and Spring.NET's data access strategy-agnostic <see cref="Spring.Dao.DataAccessException"/>.
+	/// </summary>
+	/// <remarks>
+	///  <p>
+	///  Implementations can be generic (for example, ADO.NET Exceptions) or proprietary (for example,
+	///  using SQL Server or Oracle error codes) for greater precision.
+	///  </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <author>Mark Pollack</author> 
+	/// <version>$Id: IAdoExceptionTranslator.cs,v 1.2 2006/11/29 07:18:46 markpollack Exp $</version>
+	public interface IAdoExceptionTranslator
+	{
+		/// <summary>
+		/// Translate the given <see cref="System.SystemException"/> into a generic data access exception.
+		/// </summary>
+		/// <param name="task">A readable string describing the task being attempted.</param>
+		/// <param name="sql">The SQL query or update that caused the problem. May be null.</param>
+		/// <param name="exception">
+		/// The <see cref="System.Exception"/> encountered by the ADO.NET implementation.
+		/// </param>
+		/// <returns>
+		/// A <see cref="Spring.Dao.DataAccessException"/> appropriate for the supplied
+		/// <paramref name="exception"/>.
+		/// </returns>
+		DataAccessException Translate( string task, string sql, Exception exception );
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Support/IServiceDomainAdapter.cs b/src/Spring/Spring.Data/Data/Support/IServiceDomainAdapter.cs
new file mode 100644
index 00000000..68ed2566
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/IServiceDomainAdapter.cs
@@ -0,0 +1,77 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if (!NET_1_0)
+
+using System.EnterpriseServices;
+
+namespace Spring.Data.Support
+{
+    /// <summary>
+    /// Provides the necessary transactional state and operations for ServiceDomainTransactionManager to
+    /// work with ServiceDomain and ContextUtil.
+    /// </summary>
+    /// <remarks>Introduced for purposes of unit testing.</remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id $</version> 
+    public interface IServiceDomainAdapter
+    {
+        /// <summary>
+        /// Creates the context specified by the ServiceConfig object and pushes it onto the context stack to 
+        /// become the current context. 
+        /// </summary>
+        /// <param name="config">A ServiceConfig that contains the configuration information for the services to be used within the enclosed code.</param>
+        void Enter(SimpleServiceConfig config);
+
+        /// <summary>
+        /// Leaves this ServiceDomain. The current context is then popped from the context stack, and the 
+        /// context that was running when Enter was called becomes the current context. 
+        /// </summary>
+        /// <returns>One of the TransactionStatus values</returns>
+        TransactionStatus Leave();
+
+        /// <summary>
+        /// Sets the consistent bit and the done bit to true in the COM+ context
+        /// </summary>
+        void SetComplete();
+
+        /// <summary>
+        /// Sets the consistent bit to false and the done bit to true in the COM+ context. 
+        /// </summary>
+        void SetAbort();
+
+        /// <summary>
+        /// Gets or sets the consistent bit in the COM+ context.
+        /// </summary>
+        /// <value>My transaction vote.</value>
+        TransactionVote MyTransactionVote { get; set;}
+
+        /// <summary>
+        ///  Gets a value indicating whether the current context is transactional.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance is existing transaction; otherwise, <c>false</c>.
+        /// </value>
+        bool IsInTransaction { get; }
+
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Support/ITransactionScopeAdapter.cs b/src/Spring/Spring.Data/Data/Support/ITransactionScopeAdapter.cs
new file mode 100644
index 00000000..71e23650
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/ITransactionScopeAdapter.cs
@@ -0,0 +1,74 @@
+#if NET_2_0
+
+#region License
+
+/*
+ * Copyright 2007 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.Transactions;
+
+namespace Spring.Data.Support
+{
+    /// <summary>
+    /// Provides the necessary transactional state and operations for TxScopeTransactionManager to
+    /// work with TransactionScope and Transaction.Current.
+    /// </summary>
+    /// <remarks>Introduced for purposes of unit testing.</remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ITransactionScopeAdapter.cs,v 1.1 2007/11/30 18:38:47 markpollack Exp $</version> 
+    public interface ITransactionScopeAdapter
+    {
+        /// <summary>
+        /// Creates the transaction scope.
+        /// </summary>
+        /// <param name="txScopeOption">The tx scope option.</param>
+        /// <param name="txOptions">The tx options.</param>
+        /// <param name="interopOption">The interop option.</param>
+        void CreateTransactionScope(TransactionScopeOption txScopeOption, TransactionOptions txOptions, EnterpriseServicesInteropOption interopOption);
+
+        /// <summary>
+        /// Call Complete() on the TransactionScope object created by this instance.
+        /// </summary>
+        void Complete();
+
+
+        /// <summary>
+        /// Call Disponse() on the TransactionScope object created by this instance.
+        /// </summary>
+        void Dispose();
+
+
+        /// <summary>
+        /// Gets a value indicating whether there is a new transaction or an existing transaction.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance is existing transaction; otherwise, <c>false</c>.
+        /// </value>
+        bool IsExistingTransaction { get; }
+
+
+        /// <summary>
+        /// Gets a value indicating whether rollback only has been called (i.e. Rollback() on the
+        /// Transaction object) and therefore voting that the transaction will be aborted.
+        /// </summary>
+        /// <value><c>true</c> if rollback only; otherwise, <c>false</c>.</value>
+        bool RollbackOnly { get; }
+       }
+
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Support/NamedResultSetProcessor.cs b/src/Spring/Spring.Data/Data/Support/NamedResultSetProcessor.cs
new file mode 100644
index 00000000..52a74603
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/NamedResultSetProcessor.cs
@@ -0,0 +1,106 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+
+
+#endregion
+
+namespace Spring.Data.Support
+{
+	/// <summary>
+	/// Provides a name to a ResultSetProcessor for use with AdoOperation subclasses
+	/// such as StoredProcedure.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: NamedResultSetProcessor.cs,v 1.3 2006/11/29 07:18:46 markpollack Exp $</version>
+	public class NamedResultSetProcessor 
+	{
+		#region Fields
+        
+	    private object resultSetProcessor;
+	    private string name;
+		
+	    #endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="NamedResultSetProcessor"/> class with a
+		/// IRowCallback instance
+        /// </summary>
+        /// <param name="name">The name of the associated row callback for use with output 
+        /// result set mappers.</param>
+        /// <param name="rowcallback">A row callback instance.</param>
+		public NamedResultSetProcessor(string name, IRowCallback rowcallback)
+		{
+            this.name = name;
+		    resultSetProcessor = rowcallback;
+		}
+	    
+	    /// <summary>
+        /// Initializes a new instance of the <see cref="NamedResultSetProcessor"/> class with a
+        /// IRowMapper instance
+	    /// </summary>
+	    /// <param name="name">The name of the associated row mapper.</param>
+	    /// <param name="rowMapper">A IRowMapper instance.</param>
+	    public NamedResultSetProcessor(string name, IRowMapper rowMapper)
+	    {
+	        this.name = name;
+	        resultSetProcessor = rowMapper;
+	    }
+	    
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NamedResultSetProcessor"/> class with a
+        /// IResultSetExtractor instance
+        /// </summary>
+        /// <param name="name">The name of the associated result set extractor.</param>
+        /// <param name="resultSetExtractor">A IResultSetExtractor instance.</param>
+        public NamedResultSetProcessor(string name, IResultSetExtractor resultSetExtractor)
+        {
+            this.name = name;
+            resultSetProcessor = resultSetExtractor;
+        }
+
+
+		#endregion
+
+		#region Properties
+	    public string Name
+	    {
+	        get
+	        {
+	            return name;
+	        }
+	    }
+	    
+	    public object ResultSetProcessor
+	    {
+	        get
+	        {
+	            return resultSetProcessor;
+	        }
+	    }
+	    
+		#endregion
+
+
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Support/NullMappingDataReader.cs b/src/Spring/Spring.Data/Data/Support/NullMappingDataReader.cs
new file mode 100644
index 00000000..00a4ecbe
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/NullMappingDataReader.cs
@@ -0,0 +1,348 @@
+#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
+
+#region Imports
+
+using System;
+using System.Data;
+
+#endregion
+
+namespace Spring.Data.Support
+{
+	/// <summary>
+	/// A data reader implementation that mapps DBNull values to sensible defaults.
+	/// </summary>
+	/// <remarks>IDataRecord methods are virtual.</remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: NullMappingDataReader.cs,v 1.2 2006/10/08 04:56:06 markpollack Exp $</version>
+	public class NullMappingDataReader : IDataReaderWrapper
+	{
+		#region Fields
+
+	    protected IDataReader dataReader; 
+	    private bool alreadyDisposed = false;
+	    
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="NullMappingDataReader"/> class.
+        /// </summary>
+		public NullMappingDataReader()
+		{
+
+		}
+	    	    
+	    /// <summary>
+	    /// Initializes a new instance of the <see cref="NullMappingDataReader"/> class.
+	    /// </summary>
+	    /// <param name="dataReader">The data reader to delegate operations to.</param>
+	    public NullMappingDataReader(IDataReader dataReader)
+	    {
+	        this.dataReader = dataReader;
+	    }
+
+		#endregion
+
+	    ~NullMappingDataReader()
+	    {
+	        Dispose(false);
+	    }
+		#region Methods
+        protected virtual void Dispose(bool isDisposing)
+        {
+            // Don't dispose more than once
+            if (alreadyDisposed)
+            {
+                return;
+            }
+            if (isDisposing)
+            {
+                //free managed resourced
+                dataReader.Dispose();
+            }
+            alreadyDisposed = true;
+        }
+		#endregion
+
+        #region IDataReaderWrapper Members
+
+        public IDataReader WrappedReader
+        {
+            get
+            {
+                return dataReader;
+            }
+            set
+            {
+                dataReader = value;
+            }
+        }
+
+        #endregion
+
+        #region IDataReader Members
+
+        public int RecordsAffected
+        {
+            get
+            {
+                return this.dataReader.RecordsAffected;
+            }
+        }
+
+        public bool IsClosed
+        {
+            get
+            {
+                return this.dataReader.IsClosed;
+            }
+        }
+
+        public bool NextResult()
+        {
+            return dataReader.NextResult();
+        }
+
+        public void Close()
+        {
+            dataReader.Close();
+        }
+
+        public bool Read()
+        {
+            return dataReader.Read();
+        }
+
+        public int Depth
+        {
+            get
+            {
+                return dataReader.Depth;
+            }
+        }
+
+        public DataTable GetSchemaTable()
+        {
+            return dataReader.GetSchemaTable();
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(true);
+        }	   	  
+
+        #endregion
+
+        #region IDataRecord Members
+
+        /// <summary>
+        /// Gets the 32-bit signed integer value of the specified field.
+        /// </summary>
+        /// <param name="i">The index of the field to find.</param>
+        /// <returns>
+        /// The 32-bit signed integer value of the specified field or 0 if null
+        /// </returns>
+        /// <exception cref="T:System.IndexOutOfRangeException">The index passed was outside the range of 0 through <see cref="P:System.Data.IDataRecord.FieldCount"/>.</exception>
+        public virtual int GetInt32(int i)
+        {
+            if (dataReader.IsDBNull(i))
+            {
+                return 0;
+            }
+            else
+            {
+                return dataReader.GetInt32(i);
+            }
+        }
+
+        
+        /// <summary>
+        /// Gets the <see cref="Object"/> with the specified name.  
+        /// Returns null if value equals DBNull.Value
+        /// </summary>
+        /// <value></value>
+	    public virtual object this[string name]
+        {
+            get
+            {
+                object objectValue = dataReader[name];
+                return DBNull.Value.Equals(objectValue) ? null : objectValue;
+            }
+        }
+
+        
+        /// <summary>
+        /// Gets the <see cref="Object"/> with the specified i.
+        /// Returns null if value equals DBNull.Value
+        /// </summary>
+        /// <value>Return the object or null if the value equals DBNull.Value</value>
+	    public virtual object this[int i]
+        {
+            get
+            {
+                
+                return dataReader.IsDBNull(i) ? null : dataReader[i];
+            }
+        }
+
+        /// <summary>
+        /// Return the value of the specified field, null if value equals DBNull.Value
+        /// </summary>
+        /// <param name="i">The index of the field to find.</param>
+        /// <returns>
+        /// The <see cref="T:System.Object"/> which will contain the field value upon return.
+        /// Returns null if value equals DBNull.Value
+        /// </returns>
+        /// <exception cref="T:System.IndexOutOfRangeException">
+        /// The index passed was outside the range of 0 through <see cref="P:System.Data.IDataRecord.FieldCount"/>.
+        /// </exception>
+        public virtual object GetValue(int i)
+        {
+            return dataReader.IsDBNull(i) ? null : dataReader.GetValue(i);
+        }
+
+        /// <summary>
+        /// Return whether the specified field is set to null.
+        /// </summary>
+        /// <param name="i">The index of the field to find.</param>
+        /// <returns>
+        /// 	<see langword="true"/> if the specified field is set to null, otherwise
+        /// <see langword="false"/>.
+        /// </returns>
+        /// <exception cref="T:System.IndexOutOfRangeException">The index passed was outside the range of 0 through <see cref="P:System.Data.IDataRecord.FieldCount"/>. </exception>
+        public virtual bool IsDBNull(int i)
+        {
+            return dataReader.IsDBNull(i);
+        }
+
+        public virtual long GetBytes(int i, long fieldOffset, byte[] buffer, int bufferoffset, int length)
+        {
+            return dataReader.IsDBNull(i) ? 0 : dataReader.GetBytes(i, fieldOffset, buffer, bufferoffset, length);
+        }
+
+        public virtual byte GetByte(int i)
+        {
+            return dataReader.IsDBNull(i) ? (byte)0 : dataReader.GetByte(i);
+        }
+
+        public virtual Type GetFieldType(int i)
+        {
+            return dataReader.GetFieldType(i);
+        }
+
+        public virtual decimal GetDecimal(int i)
+        {
+            return dataReader.IsDBNull(i) ? 0 : dataReader.GetDecimal(i);
+        }
+
+        public virtual int GetValues(object[] values)
+        {
+            return dataReader.GetValues(values);
+        }
+
+        public virtual string GetName(int i)
+        {
+            return dataReader.GetName(i);
+        }
+
+        public virtual int FieldCount
+        {
+            get
+            {
+                return dataReader.FieldCount;
+            }
+        }
+
+        public virtual long GetInt64(int i)
+        {
+            return dataReader.IsDBNull(i) ? 0 : dataReader.GetInt64(i);
+        }
+
+        public virtual double GetDouble(int i)
+        {
+            return dataReader.IsDBNull(i) ? 0 : dataReader.GetDouble(i);
+        }
+
+        public virtual bool GetBoolean(int i)
+        {
+            return dataReader.IsDBNull(i) ? false : dataReader.GetBoolean(i);
+        }
+
+        public virtual Guid GetGuid(int i)
+        {
+             return dataReader.IsDBNull(i) ? Guid.Empty : dataReader.GetGuid(i);
+        }
+
+        public virtual DateTime GetDateTime(int i)
+        {
+             return dataReader.IsDBNull(i) ? DateTime.MinValue : dataReader.GetDateTime(i);
+        }
+
+        public virtual int GetOrdinal(string name)
+        {
+            return dataReader.GetOrdinal(name);
+        }
+
+        public virtual string GetDataTypeName(int i)
+        {
+            return dataReader.GetDataTypeName(i);
+        }
+
+        public virtual float GetFloat(int i)
+        {
+             return dataReader.IsDBNull(i) ? 0 : dataReader.GetFloat(i);
+        }
+
+        public virtual IDataReader GetData(int i)
+        {
+            return dataReader.GetData(i);
+        }
+
+        public virtual long GetChars(int i, long fieldoffset, char[] buffer, int bufferoffset, int length)
+        {
+             return dataReader.IsDBNull(i) ? 0 : dataReader.GetChars(i, fieldoffset, buffer, bufferoffset, length);         
+        }
+
+        public virtual string GetString(int i)
+        {
+            return dataReader.IsDBNull(i) ? string.Empty : dataReader.GetString(i);
+        }
+
+        public virtual char GetChar(int i)
+        {
+            return dataReader.IsDBNull(i) ? char.MinValue : dataReader.GetChar(i);
+        }
+
+        public virtual short GetInt16(int i)
+        {
+            return dataReader.IsDBNull(i) ? (short)0 : dataReader.GetInt16(i);
+        }
+
+        #endregion
+
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs b/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs
new file mode 100644
index 00000000..754bf3ea
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs
@@ -0,0 +1,174 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using Common.Logging;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data.Support
+{
+	/// <summary>
+	/// Miscellaneous utility methods for manipulating parameter objects. 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: ParameterUtils.cs,v 1.12 2007/10/11 04:41:00 markpollack Exp $</version>
+	public class ParameterUtils 
+	{
+		#region Fields
+
+		#endregion
+
+		#region Constants
+
+		/// <summary>
+		/// The shared log instance for this class (and derived classes). 
+		/// </summary>
+		protected static readonly ILog log =
+			LogManager.GetLogger(typeof (ParameterUtils));
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="ParameterUtils"/> class.
+                /// </summary>
+		public 	ParameterUtils()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+
+
+        /// <summary>
+        /// Copies the parameters from IDbParameters to the parameter collection in IDbCommand
+        /// </summary>
+        /// <param name="command">The command.</param>
+        /// <param name="springParamCollection">The spring param collection.</param>
+        public static void CopyParameters(IDbCommand command, IDbParameters springParamCollection)
+        {
+            if (springParamCollection != null)
+            {
+                IDataParameterCollection collection = springParamCollection.DataParameterCollection;
+                
+                foreach (IDbDataParameter parameter in collection)
+                {
+                    IDbDataParameter pClone = (IDbDataParameter)((ICloneable)parameter).Clone();
+                    command.Parameters.Add(pClone);
+                }
+            }
+        }
+	    
+	    public static IDataParameter[] CloneParameters(IDbCommand command)
+	    {
+            IDataParameter[] returnParameters = new IDataParameter[command.Parameters.Count];
+            for (int i = 0; i < command.Parameters.Count; i++)
+            {
+                IDbDataParameter pClone = (IDbDataParameter)((ICloneable)command.Parameters[i]).Clone();
+                returnParameters[i] = pClone;
+            }
+	        return returnParameters;
+	    }
+
+
+        /// <summary>
+        /// Copies the parameters in IDbCommand to IDbParameters
+        /// </summary>
+        /// <param name="springParamCollection">The spring param collection.</param>
+        /// <param name="command">The command.</param>
+        public static void CopyParameters(IDbParameters springParamCollection, 
+                                          IDbCommand command)
+        {
+            if (springParamCollection != null)
+            {
+                IDataParameterCollection cmdParameterCollection =  command.Parameters;
+                //TODO investigate copying only the values over, not a full clone.
+                int count = 0;
+                foreach (IDbDataParameter dbDataParameter in cmdParameterCollection)
+                {
+                    springParamCollection[count] = (IDbDataParameter)((ICloneable)dbDataParameter).Clone();;
+                    count++;
+                }
+            }
+        }
+	    
+		#endregion
+
+	    public static void ExtractOutputParameters(IDictionary returnedParameters, IDbCommand command)
+	    {
+	        if (returnedParameters == null)
+	        {
+	            return;
+	        }
+	        IDataParameterCollection paramCollection = command.Parameters;
+	        int count = 0;
+	        foreach (IDbDataParameter dbDataParameter in paramCollection)
+	        {
+                if (dbDataParameter.Direction == ParameterDirection.Output
+                    || dbDataParameter.Direction == ParameterDirection.InputOutput)
+                {
+                    if (dbDataParameter.ParameterName == null)
+                    {
+                        returnedParameters.Add("P" + count, dbDataParameter.Value);
+                    }
+                    else
+                    {
+                        returnedParameters.Add(dbDataParameter.ParameterName, dbDataParameter.Value);
+                    }
+                }
+                if (dbDataParameter.Direction == ParameterDirection.ReturnValue)
+                {
+                    returnedParameters.Add("RETURN_VALUE", dbDataParameter.Value);
+                }
+	            count++;
+	        }
+            /*
+	        for (int i = 0; i < declaredParameters.Count; i++)
+	        {
+	            IDataParameter declaredParameter = declaredParameters[i];
+	            if (declaredParameter.Direction == ParameterDirection.Output
+	                || declaredParameter.Direction == ParameterDirection.InputOutput)
+	            {
+	                IDataParameter outParameter = (IDataParameter)command.Parameters[i];
+	                if (declaredParameter.ParameterName == null)
+	                {
+	                    returnedParameters.Add("P" + i, outParameter.Value);
+	                }
+	                else
+	                {
+	                    returnedParameters.Add(outParameter.ParameterName, outParameter.Value);
+	                }
+	            }
+	        }*/
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Data/Data/Support/RowCallbackResultSetExtractor.cs b/src/Spring/Spring.Data/Data/Support/RowCallbackResultSetExtractor.cs
new file mode 100644
index 00000000..38bf549c
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/RowCallbackResultSetExtractor.cs
@@ -0,0 +1,88 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Data;
+using Spring.Util;
+
+namespace Spring.Data.Support
+{
+    /// <summary>
+    /// Adapter to enable use of a IRowCallback inside a ResultSetExtractor.
+    /// </summary>
+    /// <remarks>We don't use it for navigating since this could lead to unpredictable consequences.</remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: RowCallbackResultSetExtractor.cs,v 1.1 2007/07/25 08:27:08 markpollack Exp $</version>
+    public class RowCallbackResultSetExtractor : IResultSetExtractor
+    {
+        private IRowCallback rowCallback;
+
+        private RowCallbackDelegate rowCallbackDelegate;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RowCallbackResultSetExtractor"/> class.
+        /// </summary>
+        /// <param name="rowCallback">The row callback.</param>
+        public RowCallbackResultSetExtractor(IRowCallback rowCallback)
+        {
+            AssertUtils.ArgumentNotNull(rowCallback, "rowCallback");
+            this.rowCallback = rowCallback;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RowCallbackResultSetExtractor"/> class.
+        /// </summary>
+        /// <param name="rowCallbackDelegate">The row callback delegate.</param>
+        public RowCallbackResultSetExtractor(RowCallbackDelegate rowCallbackDelegate)
+        {
+            AssertUtils.ArgumentNotNull(rowCallbackDelegate, "rowCallbackDelegate");
+            this.rowCallbackDelegate = rowCallbackDelegate;
+        }
+
+        /// <summary>
+        /// All rows of the data reader are passed to the IRowCallback
+        /// associated with this class.
+        /// </summary>
+        /// <param name="reader">The IDataReader to extract data from.
+        /// Implementations should not close this: it will be closed
+        /// by the AdoTemplate.</param>
+        /// <returns>
+        /// Null is returned since IRowCallback manages its own state.
+        /// </returns>
+        public object ExtractData(IDataReader reader)
+        {
+            if (rowCallback != null)
+            {
+                while (reader.Read())
+                {
+                    rowCallback.ProcessRow(reader);
+                }
+            }
+            else
+            {
+                while (reader.Read())
+                {
+                    rowCallbackDelegate(reader);
+                }
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Support/SimpleServiceConfig.cs b/src/Spring/Spring.Data/Data/Support/SimpleServiceConfig.cs
new file mode 100644
index 00000000..3cc11052
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/SimpleServiceConfig.cs
@@ -0,0 +1,127 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if (!NET_1_0)
+
+using System.EnterpriseServices;
+
+namespace Spring.Data.Support
+{
+    /// <summary>
+    /// A class that contains the properties of ServiceConfig used by ServiceDomainPlatformTransactionManager.
+    /// </summary>
+    /// <remarks>This is done to enhance testability of the transaction manager since ServiceConfig does not override Equals or Hashcode</remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id $</version> 
+    public class SimpleServiceConfig
+    {
+        private string transactionDescription;
+        private bool trackingEnabled = true;
+        private string trackingAppName;
+        private string trackingComponentName;
+        private TransactionOption transactionOption;
+        private TransactionIsolationLevel isolationLevel;
+        private int transactionTimeout;
+
+
+        public string TransactionDescription
+        {
+            get { return transactionDescription; }
+            set { transactionDescription = value; }
+        }
+
+        public bool TrackingEnabled
+        {
+            get { return trackingEnabled; }
+            set { trackingEnabled = value; }
+        }
+
+        public string TrackingAppName
+        {
+            get { return trackingAppName; }
+            set { trackingAppName = value; }
+        }
+
+        public string TrackingComponentName
+        {
+            get { return trackingComponentName; }
+            set { trackingComponentName = value; }
+        }
+
+        public TransactionOption TransactionOption
+        {
+            get { return transactionOption; }
+            set { transactionOption = value; }
+        }
+
+        public TransactionIsolationLevel IsolationLevel
+        {
+            get { return isolationLevel; }
+            set { isolationLevel = value; }
+        }
+
+        public int TransactionTimeout
+        {
+            get { return transactionTimeout; }
+            set { transactionTimeout = value; }
+        }
+
+        public ServiceConfig CreateServiceConfig()
+        {
+            ServiceConfig serviceConfig = new ServiceConfig();
+            serviceConfig.TransactionDescription = this.transactionDescription;
+            serviceConfig.TrackingEnabled = this.trackingEnabled;
+            serviceConfig.TrackingAppName = this.trackingAppName;
+            serviceConfig.TrackingComponentName = this.trackingComponentName;
+            serviceConfig.Transaction = this.transactionOption;
+            serviceConfig.IsolationLevel = this.isolationLevel;
+            serviceConfig.TransactionTimeout = this.transactionTimeout;
+            return serviceConfig;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (this == obj) return true;
+            SimpleServiceConfig simpleServiceConfig = obj as SimpleServiceConfig;
+            if (simpleServiceConfig == null) return false;
+            if (!Equals(transactionDescription, simpleServiceConfig.transactionDescription)) return false;
+            if (!Equals(trackingEnabled, simpleServiceConfig.trackingEnabled)) return false;
+            if (!Equals(trackingAppName, simpleServiceConfig.trackingAppName)) return false;
+            if (!Equals(trackingComponentName, simpleServiceConfig.trackingComponentName)) return false;
+            if (!Equals(transactionOption, simpleServiceConfig.transactionOption)) return false;
+            if (!Equals(isolationLevel, simpleServiceConfig.isolationLevel)) return false;
+            if (transactionTimeout != simpleServiceConfig.transactionTimeout) return false;
+            return true;
+        }
+
+        public override int GetHashCode()
+        {
+            int result = transactionDescription != null ? transactionDescription.GetHashCode() : 0;
+            result = 29*result + trackingEnabled.GetHashCode();
+            result = 29*result + (trackingAppName != null ? trackingAppName.GetHashCode() : 0);
+            result = 29*result + (trackingComponentName != null ? trackingComponentName.GetHashCode() : 0);
+            result = 29*result + transactionOption.GetHashCode();
+            result = 29*result + isolationLevel.GetHashCode();
+            result = 29*result + transactionTimeout;
+            return result;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/Support/Sql/sqlconnectionstring.xsd b/src/Spring/Spring.Data/Data/Support/Sql/sqlconnectionstring.xsd
new file mode 100644
index 00000000..b36cd970
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/Sql/sqlconnectionstring.xsd
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  
+  <xs:simpleType name="nonNullString">
+    <xs:restriction base="xs:string">    
+      <xs:minLength value="1"/>
+    </xs:restriction>
+  </xs:simpleType>
+  
+  
+  <xs:element name="sqlServerConnection">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="dictionary" minOccurs="0" maxOccurs="1"/>
+      </xs:sequence>
+      
+      <xs:attribute name="name" use="required" type="nonNullString"/>
+      <xs:attribute name="applicationName" use="optional" type="nonNullString"/>
+      <xs:attribute name="asynchronousProcessing" use="optional" type="xs:boolean"/>
+      <xs:attribute name="attachDBFilename" use="optional" type="nonNullString"/>
+      <xs:attribute name="browsableConnectionString" use="optional" type="xs:boolean"/>
+      <xs:attribute name="connectTimeout" use="optional" type="xs:integer"/>
+      <xs:attribute name="connectionReset" use="optional" type="xs:boolean"/>
+      <xs:attribute name="contextConnection" use="optional" type="xs:boolean"/>
+      <xs:attribute name="currentLanguage" use="optional" type="xs:string"/>
+      <xs:attribute name="dataSource" use="optional" type="nonNullString"/>
+      <xs:attribute name="encrypt" use="optional" type="xs:boolean"/>
+      <xs:attribute name="enlist" use="optional" type="xs:boolean"/>
+      <xs:attribute name="failoverPartner" use="optional" type="nonNullString"/>
+      <xs:attribute name="initialCatalog" use="optional" type="nonNullString"/>
+      <xs:attribute name="integratedSecurity" use="optional" type="xs:boolean"/>
+      <xs:attribute name="loadBalanceTimeout" use="optional" type="xs:integer"/>
+      <xs:attribute name="maxPoolSize" use="optional" type="xs:integer"/>
+      <xs:attribute name="minPoolSize" use="optional" type="xs:integer"/>
+      <xs:attribute name="multipleActiveResultSets" use="optional" type="xs:boolean"/>
+      <xs:attribute name="networkLibrary" use="optional" type="xs:string"/>
+      <xs:attribute name="packetSize" use="optional" type="xs:integer"/>
+      <xs:attribute name="password" use="optional" type="xs:string"/>
+      <xs:attribute name="persistSecurityInfo" use="optional" type="xs:boolean"/>
+      <xs:attribute name="pooling" use="optional" type="xs:boolean"/>
+      <xs:attribute name="replication" use="optional" type="xs:boolean"/>
+      <xs:attribute name="trustServerCertificate" use="optional" type="xs:boolean"/>
+      <xs:attribute name="typeSystemVersion" use="optional" type="nonNullString"/>
+      <xs:attribute name="userID" use="optional" type="xs:string"/>
+      <xs:attribute name="userInstance" use="optional" type="xs:boolean"/>
+      <xs:attribute name="workstationID" use="optional" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="dictionary">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element  minOccurs="0" maxOccurs="unbounded" ref="entry"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="entry">
+    <xs:complexType>
+      <xs:attribute name="key" use="optional" type="nonNullString"/>
+      <xs:attribute name="key-ref" use="optional"  type="nonNullString"/>
+      <xs:attribute name="value"  use="optional" type="nonNullString"/>
+      <xs:attribute name="value-ref" use="optional" type="nonNullString"/>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs b/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs
new file mode 100644
index 00000000..72224ed4
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs
@@ -0,0 +1,170 @@
+#if NET_2_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.Data;
+using System.Reflection;
+using Common.Logging;
+using Spring.Data.Common;
+
+namespace Spring.Data.Support
+{
+    /// <summary>
+    /// Using reflection on VS.NET 2005 a generated typed dataset, apply the
+    /// connection/transaction pair associated with the current Spring based
+    /// transaction scope.  
+    /// </summary>
+    /// <remarks>This avoids the limitations of using System.Transaction
+    /// based transaction scope for multiple operation on typed datasets withone one
+    /// transaction.  Reflection was used rather than partial classes to provide
+    /// a general solution that can be written and applied once.
+    /// Usage within a DAO method, FindAll() is shown below.  Note: Convenience methods
+    /// to simplify calling syntax maybe provided in the future, it is a trade off on type
+    /// safety calling the typed adapter defined outside the anonymous method as 
+    /// compared to casting inside a "DoInDbAdapter(object dbAdapter) method.
+    /// <code>
+    /// public PrintGroupMappingDataSet FindAll()
+    /// {
+    ///
+    ///    PrintGroupMappingTableAdapter adapter = new PrintGroupMappingTableAdapter();
+    ///    PrintGroupMappingDataSet printGroupMappingDataSet = new PrintGroupMappingDataSet();
+    ///        
+    ///        
+    ///    printGroupMappingDataSet = AdoTemplate.Execute(delegate(IDbCommand command)
+    ///                               {
+    ///                                   TypedDataSetUtils.ApplyConnectionAndTx(adapter, command);
+    ///                                   adapter.Fill(printGroupMappingDataSet.PrintGroupMapping);
+    ///                                   return printGroupMappingDataSet;
+    ///                               }) 
+    ///                               as PrintGroupMappingDataSet;
+    ///
+    ///    return printGroupMappingDataSet;
+    /// }
+    /// </code>
+    /// See http://www.code-magazine.com/articleprint.aspx?quickid=0605031 for a 
+    /// more complete discussion.
+    /// 
+    /// </remarks>
+    /// <version>$Id:</version>
+    public abstract class TypedDataSetUtils
+    {
+        private static readonly ILog LOG = LogManager.GetLogger(typeof (TypedDataSetUtils));
+
+
+        /// <summary>
+        /// Applies the connection and tx to the provided typed dataset.  The connection and transaction
+        /// used are taken from the Spring's current transactional context.  See ConnectionUtils.GetConnectionTxPair
+        /// for more information
+        /// </summary>
+        /// <param name="typedDataSetAdapter">The typed data set adapter.</param>
+        /// <param name="dbProvider">The db provider.</param>
+        public static void ApplyConnectionAndTx(object typedDataSetAdapter, IDbProvider dbProvider)
+        {
+            ConnectionTxPair connectionTxPairToUse = ConnectionUtils.GetConnectionTxPair(dbProvider);
+            ApplyConnectionAndTxToDataAdapter(typedDataSetAdapter, connectionTxPairToUse.Connection, connectionTxPairToUse.Transaction);
+        }
+
+        /// <summary>
+        /// Applies the connection and tx to the provided typed dataset.
+        /// </summary>
+        /// <remarks>Generated dataset to not inherit from a common base
+        /// class so that we must pass in the generic object type.</remarks>
+        /// <param name="typedDataSetAdapter">The typed data set adapter.</param>
+        /// <param name="sourceCommand">The IDbCommand managed by Spring and set with
+        /// the connection/transaction of the current Spring transaction scope.</param>
+        public static void ApplyConnectionAndTx(object typedDataSetAdapter, IDbCommand sourceCommand)
+        {                      
+            if (sourceCommand != null)
+            {
+                ApplyConnectionAndTxToDataAdapter(typedDataSetAdapter, sourceCommand.Connection, sourceCommand.Transaction);
+            }            
+        }
+        
+        private static IDbCommand[] GetCommandCollection(object typedDataSetAdapter)
+        {
+            PropertyInfo pi =
+                typedDataSetAdapter.GetType().GetProperty("CommandCollection",
+                                                          BindingFlags.NonPublic | BindingFlags.Instance);
+            MethodInfo mi = pi.GetGetMethod(true);
+            return mi.Invoke(typedDataSetAdapter, null) as IDbCommand[];
+        }
+
+        private static IDbDataAdapter GetDataAdapter(object typedDataSetAdapter)
+        {
+            PropertyInfo api =
+                typedDataSetAdapter.GetType().GetProperty("Adapter", 
+                                                          BindingFlags.NonPublic | BindingFlags.Instance);
+            MethodInfo ami = api.GetGetMethod(true);
+            return ami.Invoke(typedDataSetAdapter, null) as IDbDataAdapter;
+        }
+
+        private static void ApplyConnectionAndTxToDataAdapter(object typedDataSetAdapter, IDbConnection connection, IDbTransaction transaction)
+        {
+            IDbDataAdapter dataAdapter = GetDataAdapter(typedDataSetAdapter);
+            if (dataAdapter != null)
+            {
+                ApplyConnectionAndTxToCommand(dataAdapter.SelectCommand, connection, transaction);
+
+
+                ApplyConnectionAndTxToCommand(dataAdapter.InsertCommand, connection, transaction);
+
+
+                ApplyConnectionAndTxToCommand(dataAdapter.UpdateCommand, connection, transaction);
+
+
+                ApplyConnectionAndTxToCommand(dataAdapter.DeleteCommand, connection, transaction);
+            }
+            else
+            {
+                LOG.Warn("Could not extract IDbDataAdapter from TypedDataset.");
+            }
+
+
+            IDbCommand[] commandCollection = GetCommandCollection(typedDataSetAdapter);
+            if (commandCollection != null)
+            {
+                //don't know which one to set, so set them all.
+                foreach (IDbCommand dbCommand in commandCollection)
+                {
+                    dbCommand.Connection = connection;
+                    dbCommand.Transaction = transaction;
+                }
+            }
+            else
+            {
+                LOG.Warn("Could not extract IDbCommand collection from TypedDataset.");
+            }
+        }
+
+
+        private static void ApplyConnectionAndTxToCommand(IDbCommand targetDbCommand, IDbConnection connection, IDbTransaction transaction)
+        {
+            if (targetDbCommand != null)
+            {
+                targetDbCommand.Connection = connection;
+                targetDbCommand.Transaction = transaction;
+            }
+        }
+
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Data/UncategorizedAdoException.cs b/src/Spring/Spring.Data/Data/UncategorizedAdoException.cs
new file mode 100644
index 00000000..62a3711f
--- /dev/null
+++ b/src/Spring/Spring.Data/Data/UncategorizedAdoException.cs
@@ -0,0 +1,136 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using Spring.Dao;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+    /// Exception thrown when we can't classify a SQLException into 
+    /// one of our generic data access exceptions. 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: UncategorizedAdoException.cs,v 1.4 2006/11/29 07:18:46 markpollack Exp $</version>
+	[Serializable]
+	public class UncategorizedAdoException : UncategorizedDataAccessException, ISerializable
+	{
+		#region Fields
+
+        /// <summary>
+        /// SQL that led to the problem
+        /// </summary>
+        private readonly string sql;
+
+	    /// <summary>
+	    /// The error code, if available, that was unable to be categorized.
+	    /// </summary>
+        private readonly string errorCode;
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="UncategorizedAdoException"/> class.
+        /// </summary>
+		public UncategorizedAdoException()
+		{
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UncategorizedAdoException"/> class.
+        /// </summary>
+        /// <param name="message">A message about the exception.</param>
+        public UncategorizedAdoException(string message): base(message)
+        {            
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UncategorizedAdoException"/> class.
+        /// </summary>
+        /// <param name="message">A message about the exception.</param>
+        /// <param name="inner">The inner exception.</param>
+        public UncategorizedAdoException(string message, Exception inner): base(message, inner)
+        {            
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UncategorizedAdoException"/> class.
+        /// </summary>
+        /// <param name="task">name of the current task.</param>
+        /// <param name="errorCode">the underlying error code that could not be translated</param>
+        /// <param name="sql">The offending SQL statment</param>
+        /// <param name="ex">The root cause.</param>
+        public UncategorizedAdoException(string task, string sql, string errorCode, Exception ex) : base(task + "; uncategorized DataException for SQL [" + sql + "]; " + "ErrorCode [" + errorCode + "]; " + ex.Message, ex)           
+        {
+             this.sql = sql;
+             this.errorCode = errorCode;
+        }
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="UncategorizedAdoException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected UncategorizedAdoException( SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+
+
+
+		#endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+
+		#endregion
+
+        #region ISerializable Members
+
+        /// <summary>
+        /// When overridden in a derived class, sets the <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+        /// with information about the exception.
+        /// </summary>
+        /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+        /// <exception cref="T:System.ArgumentNullException">The <paramref name="info"/> parameter is a null reference (<see langword="Nothing"/> in Visual Basic).</exception>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            info.AddValue( "sql", sql );
+            info.AddValue( "errorCode", errorCode);
+            base.GetObjectData( info, context ); 
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Data/Spring.Data.2003.csproj b/src/Spring/Spring.Data/Spring.Data.2003.csproj
new file mode 100644
index 00000000..368c5db1
--- /dev/null
+++ b/src/Spring/Spring.Data/Spring.Data.2003.csproj
@@ -0,0 +1,1016 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Data"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = "Spring.Data.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = "1591"
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Data\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "true"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Data\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "System.EnterpriseServices"
+                    AssemblyName = "System.EnterpriseServices"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.EnterpriseServices.dll"
+                />
+                <Reference
+                    Name = "System.Data.OracleClient"
+                    AssemblyName = "System.Data.OracleClient"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.OracleClient.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Aop.2003"
+                    Project = "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CommonAssemblyInfo.cs"
+                    Link = "..\CommonAssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Data.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Dao\CannotAcquireLockException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\CannotSerializeTransactionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\CleanupFailureDataAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\ConcurrencyFailureException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\DataAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\DataAccessResourceFailureException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\DataIntegrityViolationException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\DataRetrievalFailureException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\DeadlockLoserDataAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\EmptyResultDataAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\IncorrectResultSizeDataAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\IncorrectUpdateSemanticsDataAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\InvalidDataAccessApiUsageException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\InvalidDataAccessResourceUsageException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\ObjectOptimisticLockingFailureException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\ObjectRetrievalFailureException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\OptimisticLockingFailureException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\PermissionDeniedDataAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\PessimisticLockingFailureException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\TypeMismatchDataAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\UncategorizedDataAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\Support\DaoSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\Support\DataAccessUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\Support\Generic\DataAccessUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\BadSqlGrammarException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\CannotGetAdoConnectionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\CommandDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\CommandSetterDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IAdoOperations.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\ICommandCallback.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\ICommandSetter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\ICommandTextProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\ICommonAdoOperations.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IDataAdapterCallback.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IDataAdapterSetter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IDataReaderWrapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IDataSetFillLifecycleProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IDbCommandCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IDbCommandCreatorFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IDbDataAdapterCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\InvalidResultSetAccessException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IResultSetExtractor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IRowCallback.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IRowMapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\ResultSetExtractorDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\RowCallbackDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\RowMapperDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\UncategorizedAdoException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\DbMetadata.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\DbParameter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\DbParameters.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\DbParametersBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\DbProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\DbProviderFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\DbProviderFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\dbproviders.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Common\DelegatingDbProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\ErrorCodes.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\IDbMetadata.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\IDbParameter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\IDbParameters.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\IDbParametersBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\IDbProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\MultiDelegatingDbProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\UserCredentialsDbProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Config\DatabaseNamespaceParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Config\spring-database-1.1.xsd"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Core\AdoAccessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Core\AdoDaoSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Core\AdoPlatformTransactionManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Core\AdoTemplate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Core\RowMapperResultSetExtractor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Core\ServiceDomainPlatformTransactionManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Core\TxScopeTransactionManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Generic\AdoDaoSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Generic\AdoTemplate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Generic\CommandDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Generic\IAdoOperations.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Generic\ICommandCallback.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Generic\IDbCommandCallback.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Generic\IDbCommandDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Generic\IResultSetExtractor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Generic\IRowMapper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Generic\NamedResultSetProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Generic\ResultSetExtractorDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Generic\RowMapperDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Generic\RowMapperResultSetExtractor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\AbstractAdoOperation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\AdoNonQuery.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\AdoOperation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\AdoQuery.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\AdoScalar.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\MappingAdoQuery.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\MappingAdoQueryWithContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\StoredProcedure.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\Generic\AdoOperation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\Generic\AdoQuery.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\Generic\MappingAdoQuery.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\Generic\MappingAdoQueryWithContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\Generic\StoredProcedure.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\AdoTransactionObjectSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\AdoUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\ConnectionHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\ConnectionSynchronization.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\ConnectionTxPair.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\ConnectionUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\DefaultServiceDomainAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\ErrorCodeExceptionTranslator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\FallbackExceptionTranslator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\IAdoExceptionTranslator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\IServiceDomainAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\NamedResultSetProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\NullMappingDataReader.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\ParameterUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\RowCallbackResultSetExtractor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\SimpleServiceConfig.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\TypedDataSetUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\Sql\sqlconnectionstring.xsd"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Transaction\CannotCreateTransactionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\HeuristicCompletionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\IllegalTransactionStateException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\InvalidIsolationLevelException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\InvalidTimeoutException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\IPlatformTransactionManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\ISavepointManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\ITransactionDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\ITransactionStatus.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\NestedTransactionNotSupportedException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\NoTransactionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\TransactionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\TransactionOutcomeState.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\TransactionPropagation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\TransactionSuspensionNotSupportedException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\TransactionSystemException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\TransactionTimedOutException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\TransactionUsageException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\UnexpectedRollbackException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Config\AttributeDrivenObjectDefinitionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Config\spring-tx-1.1.xsd"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Transaction\Config\TxAdviceObjectDefinitionParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Config\TxNamespaceParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Config\TxNamespaceUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\AbstractFallbackTransactionAttributeSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\AttributesTransactionAttributeSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\DefaultTransactionAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\DefaultTransactionAttributeSourceAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\DelegatingTransactionAttributeWithName.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\ITransactionAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\ITransactionAttributeSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\MatchAlwaysTransactionAttributeSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\MethodMapTransactionAttributeSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\NameMatchTransactionAttributeSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\NoRollbackRuleAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\RollbackRuleAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\RuleBasedTransactionAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\TransactionAspectSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\TransactionAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\TransactionAttributeConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\TransactionAttributeEditor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\TransactionAttributeSourceAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\TransactionAttributeSourceEditor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\TransactionInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\TransactionProxyFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\AbstractPlatformTransactionManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\DefaultTransactionDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\DefaultTransactionStatus.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\ISmartTransactionObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\ITransactionCallback.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\ITransactionOperations.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\ITransactionSynchronization.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\ResourceHolderSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\TransactionCallbackWithoutResult.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\TransactionDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\TransactionSynchronizationAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\TransactionSynchronizationManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\TransactionSynchronizationState.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\TransactionSynchronizationStatus.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\TransactionTemplate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Data/Spring.Data.2005.csproj b/src/Spring/Spring.Data/Spring.Data.2005.csproj
new file mode 100644
index 00000000..06d2bfdc
--- /dev/null
+++ b/src/Spring/Spring.Data/Spring.Data.2005.csproj
@@ -0,0 +1,309 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Data</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>Spring.Data.xml</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>1587, 1591, 219, 162, 618</NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Web">
+      <Name>System.Web</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Dao\CannotAcquireLockException.cs" />
+    <Compile Include="Dao\CannotSerializeTransactionException.cs" />
+    <Compile Include="Dao\CleanupFailureDataAccessException.cs" />
+    <Compile Include="Dao\ConcurrencyFailureException.cs" />
+    <Compile Include="Dao\PessimisticLockingFailureException.cs" />
+    <Compile Include="Dao\DataAccessException.cs" />
+    <Compile Include="Dao\DataAccessResourceFailureException.cs" />
+    <Compile Include="Dao\DataIntegrityViolationException.cs" />
+    <Compile Include="Dao\DataRetrievalFailureException.cs" />
+    <Compile Include="Dao\DeadlockLoserDataAccessException.cs" />
+    <Compile Include="Dao\EmptyResultDataAccessException.cs" />
+    <Compile Include="Dao\IncorrectResultSizeDataAccessException.cs" />
+    <Compile Include="Dao\IncorrectUpdateSemanticsDataAccessException.cs" />
+    <Compile Include="Dao\InvalidDataAccessApiUsageException.cs" />
+    <Compile Include="Dao\InvalidDataAccessResourceUsageException.cs" />
+    <Compile Include="Dao\ObjectOptimisticLockingFailureException.cs" />
+    <Compile Include="Dao\ObjectRetrievalFailureException.cs" />
+    <Compile Include="Dao\OptimisticLockingFailureException.cs" />
+    <Compile Include="Dao\PermissionDeniedDataAccessException.cs" />
+    <Compile Include="Dao\Support\DaoSupport.cs" />
+    <Compile Include="Dao\Support\DataAccessUtils.cs" />
+    <Compile Include="Dao\Support\Generic\DataAccessUtils.cs" />
+    <Compile Include="Dao\TypeMismatchDataAccessException.cs" />
+    <Compile Include="Dao\UncategorizedDataAccessException.cs" />
+    <Compile Include="Data\BadSqlGrammarException.cs" />
+    <Compile Include="Data\CommandDelegate.cs" />
+    <Compile Include="Data\Common\DbMetadata.cs" />
+    <Compile Include="Data\Common\DbParameter.cs" />
+    <Compile Include="Data\Common\DbParameters.cs" />
+    <Compile Include="Data\Common\DbProvider.cs" />
+    <Compile Include="Data\Common\DbProviderFactory.cs" />
+    <Compile Include="Data\Common\DbProviderFactoryObject.cs" />
+    <Compile Include="Data\Common\DbParametersBuilder.cs" />
+    <Compile Include="Data\Common\DelegatingDbProvider.cs" />
+    <Compile Include="Data\Common\ErrorCodes.cs" />
+    <Compile Include="Data\Common\IDbMetadata.cs" />
+    <Compile Include="Data\Common\IDbParameter.cs" />
+    <Compile Include="Data\Common\IDbParametersBuilder.cs" />
+    <Compile Include="Data\Common\IDbParameters.cs" />
+    <Compile Include="Data\Common\IDbProvider.cs" />
+    <Compile Include="Data\CannotGetAdoConnectionException.cs" />
+    <Compile Include="Data\CommandSetterDelegate.cs" />
+    <Compile Include="Data\Common\MultiDelegatingDbProvider.cs" />
+    <Compile Include="Data\Common\UserCredentialsDbProvider.cs" />
+    <Compile Include="Data\Config\DatabaseNamespaceParser.cs" />
+    <Compile Include="Data\Core\AdoAccessor.cs" />
+    <Compile Include="Data\Core\AdoDaoSupport.cs" />
+    <Compile Include="Data\Core\AdoPlatformTransactionManager.cs" />
+    <Compile Include="Data\Core\AdoTemplate.cs" />
+    <Compile Include="Data\Core\RowMapperResultSetExtractor.cs" />
+    <Compile Include="Data\Core\ServiceDomainPlatformTransactionManager.cs" />
+    <Compile Include="Data\Core\TxScopeTransactionManager.cs" />
+    <Compile Include="Data\Generic\AdoDaoSupport.cs" />
+    <Compile Include="Data\Generic\IDataAdapterCallback.cs" />
+    <Compile Include="Data\Generic\DataAdapterDelegate.cs" />
+    <Compile Include="Data\Generic\IDbCommandDelegate.cs" />
+    <Compile Include="Data\Generic\IDbCommandCallback.cs" />
+    <Compile Include="Data\Generic\IResultSetExtractor.cs" />
+    <Compile Include="Data\Generic\NamedResultSetProcessor.cs" />
+    <Compile Include="Data\Generic\ResultSetExtractorDelegate.cs" />
+    <Compile Include="Data\Generic\RowMapperDelegate.cs" />
+    <Compile Include="Data\Generic\RowMapperResultSetExtractor.cs" />
+    <Compile Include="Data\ICommonAdoOperations.cs" />
+    <Compile Include="Data\IDataReaderWrapper.cs" />
+    <Compile Include="Data\Objects\AbstractAdoOperation.cs" />
+    <Compile Include="Data\Objects\Generic\AdoOperation.cs" />
+    <Compile Include="Data\Objects\Generic\AdoQuery.cs" />
+    <Compile Include="Data\Objects\Generic\MappingAdoQuery.cs" />
+    <Compile Include="Data\Objects\Generic\MappingAdoQueryWithContext.cs" />
+    <Compile Include="Data\Objects\Generic\StoredProcedure.cs" />
+    <Compile Include="Data\ResultSetExtractorDelegate.cs" />
+    <Compile Include="Data\RowCallbackDelegate.cs" />
+    <Compile Include="Data\Generic\AdoTemplate.cs" />
+    <Compile Include="Data\Generic\CommandDelegate.cs" />
+    <Compile Include="Data\Generic\IAdoOperations.cs" />
+    <Compile Include="Data\Generic\ICommandCallback.cs" />
+    <Compile Include="Data\Generic\IRowMapper.cs" />
+    <Compile Include="Data\IAdoOperations.cs" />
+    <Compile Include="Data\ICommandCallback.cs" />
+    <Compile Include="Data\ICommandSetter.cs" />
+    <Compile Include="Data\ICommandTextProvider.cs" />
+    <Compile Include="Data\IDataAdapterCallback.cs" />
+    <Compile Include="Data\IDataAdapterSetter.cs" />
+    <Compile Include="Data\IDataSetFillLifecycleProcessor.cs" />
+    <Compile Include="Data\IDbCommandCreator.cs" />
+    <Compile Include="Data\IDbCommandCreatorFactory.cs" />
+    <Compile Include="Data\IDbDataAdapterCreator.cs" />
+    <Compile Include="Data\InvalidResultSetAccessException.cs" />
+    <Compile Include="Data\IResultSetExtractor.cs" />
+    <Compile Include="Data\IRowCallback.cs" />
+    <Compile Include="Data\IRowMapper.cs" />
+    <Compile Include="Data\Objects\AdoNonQuery.cs" />
+    <Compile Include="Data\Objects\AdoOperation.cs" />
+    <Compile Include="Data\Objects\AdoQuery.cs" />
+    <Compile Include="Data\Objects\AdoScalar.cs" />
+    <Compile Include="Data\Objects\MappingAdoQuery.cs" />
+    <Compile Include="Data\Objects\MappingAdoQueryWithContext.cs" />
+    <Compile Include="Data\Objects\StoredProcedure.cs" />
+    <Compile Include="Data\RowMapperDelegate.cs" />
+    <Compile Include="Data\Support\AdoTransactionObjectSupport.cs" />
+    <Compile Include="Data\Support\AdoUtils.cs" />
+    <Compile Include="Data\Support\ConnectionHolder.cs" />
+    <Compile Include="Data\Support\ConnectionSynchronization.cs" />
+    <Compile Include="Data\Support\ConnectionTxPair.cs" />
+    <Compile Include="Data\Support\ConnectionUtils.cs" />
+    <Compile Include="Data\Support\DefaultServiceDomainAdapter.cs" />
+    <Compile Include="Data\Support\DefaultTransactionScopeAdapter.cs" />
+    <Compile Include="Data\Support\ErrorCodeExceptionTranslator.cs" />
+    <Compile Include="Data\Support\FallbackExceptionTranslator.cs" />
+    <Compile Include="Data\Support\IAdoExceptionTranslator.cs" />
+    <Compile Include="Data\Support\IServiceDomainAdapter.cs" />
+    <Compile Include="Data\Support\ITransactionScopeAdapter.cs" />
+    <Compile Include="Data\Support\NamedResultSetProcessor.cs" />
+    <Compile Include="Data\Support\NullMappingDataReader.cs" />
+    <Compile Include="Data\Support\ParameterUtils.cs" />
+    <Compile Include="Data\Support\RowCallbackResultSetExtractor.cs" />
+    <Compile Include="Data\Support\SimpleServiceConfig.cs" />
+    <Compile Include="Data\Support\TypedDataSetUtils.cs" />
+    <Compile Include="Data\UncategorizedAdoException.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Transaction\CannotCreateTransactionException.cs" />
+    <Compile Include="Transaction\Config\AttributeDrivenObjectDefinitionParser.cs" />
+    <Compile Include="Transaction\Config\TxNamespaceUtils.cs" />
+    <Compile Include="Transaction\Config\TxAdviceObjectDefinitionParser.cs" />
+    <Compile Include="Transaction\Config\TxNamespaceParser.cs" />
+    <Compile Include="Transaction\HeuristicCompletionException.cs" />
+    <Compile Include="Transaction\IllegalTransactionStateException.cs" />
+    <Compile Include="Transaction\Interceptor\AbstractFallbackTransactionAttributeSource.cs" />
+    <Compile Include="Transaction\Interceptor\AttributesTransactionAttributeSource.cs" />
+    <Compile Include="Transaction\Interceptor\DefaultTransactionAttribute.cs" />
+    <Compile Include="Transaction\Interceptor\DefaultTransactionAttributeSourceAdvisor.cs" />
+    <Compile Include="Transaction\Interceptor\DelegatingTransactionAttributeWithName.cs" />
+    <Compile Include="Transaction\Interceptor\ITransactionAttribute.cs" />
+    <Compile Include="Transaction\Interceptor\ITransactionAttributeSource.cs" />
+    <Compile Include="Transaction\Interceptor\MatchAlwaysTransactionAttributeSource.cs" />
+    <Compile Include="Transaction\Interceptor\MethodMapTransactionAttributeSource.cs" />
+    <Compile Include="Transaction\Interceptor\NameMatchTransactionAttributeSource.cs" />
+    <Compile Include="Transaction\Interceptor\NoRollbackRuleAttribute.cs" />
+    <Compile Include="Transaction\Interceptor\RollbackRuleAttribute.cs" />
+    <Compile Include="Transaction\Interceptor\RuleBasedTransactionAttribute.cs" />
+    <Compile Include="Transaction\Interceptor\TransactionAspectSupport.cs" />
+    <Compile Include="Transaction\Interceptor\TransactionAttribute.cs" />
+    <Compile Include="Transaction\Interceptor\TransactionAttributeConverter.cs" />
+    <Compile Include="Transaction\Interceptor\TransactionAttributeEditor.cs" />
+    <Compile Include="Transaction\Interceptor\TransactionAttributeSourceAdvisor.cs" />
+    <Compile Include="Transaction\Interceptor\TransactionAttributeSourceEditor.cs" />
+    <Compile Include="Transaction\Interceptor\TransactionInterceptor.cs" />
+    <Compile Include="Transaction\Interceptor\TransactionProxyFactoryObject.cs" />
+    <Compile Include="Transaction\InvalidIsolationLevelException.cs" />
+    <Compile Include="Transaction\InvalidTimeoutException.cs" />
+    <Compile Include="Transaction\IPlatformTransactionManager.cs" />
+    <Compile Include="Transaction\ISavepointManager.cs" />
+    <Compile Include="Transaction\ITransactionDefinition.cs" />
+    <Compile Include="Transaction\ITransactionStatus.cs" />
+    <Compile Include="Transaction\NestedTransactionNotSupportedException.cs" />
+    <Compile Include="Transaction\NoTransactionException.cs" />
+    <Compile Include="Transaction\Support\AbstractPlatformTransactionManager.cs" />
+    <Compile Include="Transaction\Support\DefaultTransactionDefinition.cs" />
+    <Compile Include="Transaction\Support\DefaultTransactionStatus.cs" />
+    <Compile Include="Transaction\Support\ISmartTransactionObject.cs" />
+    <Compile Include="Transaction\Support\ITransactionCallback.cs" />
+    <Compile Include="Transaction\Support\ITransactionOperations.cs" />
+    <Compile Include="Transaction\Support\ITransactionSynchronization.cs" />
+    <Compile Include="Transaction\Support\ResourceHolderSupport.cs" />
+    <Compile Include="Transaction\Support\TransactionCallbackWithoutResult.cs" />
+    <Compile Include="Transaction\Support\TransactionDelegate.cs" />
+    <Compile Include="Transaction\Support\TransactionSynchronizationAdapter.cs" />
+    <Compile Include="Transaction\Support\TransactionSynchronizationManager.cs" />
+    <Compile Include="Transaction\Support\TransactionSynchronizationState.cs" />
+    <Compile Include="Transaction\Support\TransactionSynchronizationStatus.cs" />
+    <Compile Include="Transaction\Support\TransactionTemplate.cs" />
+    <Compile Include="Transaction\TransactionException.cs" />
+    <Compile Include="Transaction\TransactionOutcomeState.cs" />
+    <Compile Include="Transaction\TransactionPropagation.cs" />
+    <Compile Include="Transaction\TransactionSuspensionNotSupportedException.cs" />
+    <Compile Include="Transaction\TransactionSystemException.cs" />
+    <Compile Include="Transaction\TransactionTimedOutException.cs" />
+    <Compile Include="Transaction\TransactionUsageException.cs" />
+    <Compile Include="Transaction\UnexpectedRollbackException.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\Common\dbproviders.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\Config\spring-database-1.1.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Transaction\Config\spring-tx-1.1.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Spring.Data.build b/src/Spring/Spring.Data/Spring.Data.build
new file mode 100644
index 00000000..65612c1c
--- /dev/null
+++ b/src/Spring/Spring.Data/Spring.Data.build
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<project name="Spring.Data" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+	<target name="build">
+		<!-- build Spring.Data -->
+		<csc target="library" define="${current.build.defines.csc}"
+                     warnaserror="true"
+		     debug="${current.build.debug}"
+                     output="${current.bin.dir}/${project::get-name()}.dll"
+                     doc="${current.bin.dir}/${project::get-name()}.xml">
+			<arg line="${compiler.args}"/>
+			<nowarn>
+				<warning number="1591,0169,0168" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../GenCommonAssemblyInfo.cs" />
+			</sources>
+			<resources basedir="." prefix="Spring.Data.Common" failonempty="true">
+				<include name="Data\Common\dbproviders.xml" />
+			</resources>
+			<resources basedir="." prefix="Spring.Data.Config" failonempty="true">
+				<include name="Data\Config\spring-database-1.1.xsd" />
+			</resources>
+			<resources basedir="." prefix="Spring.Transaction.Config" failonempty="true">
+				<include name="Transaction\Config\spring-tx-1.1.xsd" />
+			</resources>
+			<resources basedir="Resources">
+				<include name="**/*" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+				<include name="System.Data.dll" />
+				<include name="System.EnterpriseServices.dll" />
+				<include name="Common.Logging.dll"/>
+				<include name="Spring.Core.dll" />
+				<include name="Spring.Aop.dll" />
+			</references>
+		</csc>
+	</target>
+</project>
diff --git a/src/Spring/Spring.Data/Spring.Data.xml b/src/Spring/Spring.Data/Spring.Data.xml
new file mode 100644
index 00000000..3640e377
--- /dev/null
+++ b/src/Spring/Spring.Data/Spring.Data.xml
@@ -0,0 +1,10944 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Spring.Data</name>
+    </assembly>
+    <members>
+        <member name="T:Spring.Transaction.IPlatformTransactionManager">
+            <summary>
+            This is the central interface in Spring.NET's transaction support.
+            </summary>
+            <remarks>
+            <p>
+            Applications can use this directly, but it is not primarily meant as an API.
+            Typically, applications will work with either
+            <see cref="T:Spring.Transaction.Support.TransactionTemplate"/> or the AOP transaction
+            interceptor.
+            </p>
+            <p>
+            For implementers, <see cref="T:Spring.Transaction.Support.AbstractPlatformTransactionManager"/>
+            is a good starting point.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: IPlatformTransactionManager.cs,v 1.10 2007/08/01 18:53:05 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.IPlatformTransactionManager.GetTransaction(Spring.Transaction.ITransactionDefinition)">
+            <summary>
+            Return a currently active transaction or create a new one.
+            </summary>
+            <remarks>
+            <p>
+            Note that parameters like isolation level or timeout will only be applied
+            to new transactions, and thus be ignored when participating in active ones.
+            Furthermore, they aren't supported by every transaction manager:
+            a proper implementation should throw an exception when custom values
+            that it doesn't support are specified.
+            </p>
+            </remarks>
+            <param name="definition">
+            <see cref="T:Spring.Transaction.ITransactionDefinition"/> instance (can be null for
+            defaults), describing propagation behavior, isolation level, timeout etc.
+            </param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In case of lookup, creation, or system errors.
+            </exception>
+            <returns>
+            A <see cref="T:Spring.Transaction.ITransactionStatus"/> representing the new or current transaction.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.IPlatformTransactionManager.Commit(Spring.Transaction.ITransactionStatus)">
+            <summary>
+            Commit the given transaction, with regard to its status.
+            </summary>
+            <remarks>
+            <p>
+            If the transaction has been marked rollback-only programmatically,
+            perform a rollback.
+            </p>
+            <p>
+            If the transaction wasn't a new one, omit the commit to take part
+            in the surrounding transaction properly.
+            </p>
+            </remarks>
+            <param name="transactionStatus">
+            The <see cref="T:Spring.Transaction.ITransactionStatus"/> instance returned by the
+            <see cref="M:Spring.Transaction.IPlatformTransactionManager.GetTransaction(Spring.Transaction.ITransactionDefinition)"/>() method.
+            </param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In case of commit or system errors
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.IPlatformTransactionManager.Rollback(Spring.Transaction.ITransactionStatus)">
+            <summary>
+            Roll back the given transaction, with regard to its status.
+            </summary>
+            <remarks>
+            <p>
+            If the transaction wasn't a new one, just set it rollback-only
+            to take part in the surrounding transaction properly.
+            </p>
+            </remarks>
+            <param name="transactionStatus">
+            The <see cref="T:Spring.Transaction.ITransactionStatus"/> instance returned by the
+            <see cref="M:Spring.Transaction.IPlatformTransactionManager.GetTransaction(Spring.Transaction.ITransactionDefinition)"/>() method.
+            </param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In case of system errors.
+            </exception>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.TransactionInterceptor">
+            <summary>
+            An AOP Alliance <see cref="T:AopAlliance.Intercept.IMethodInterceptor"/> providing
+            declarative transaction management using the common Spring.NET transaction infrastructure.
+            </summary>
+            <remarks>
+            <p>
+            That class contains the necessary calls into Spring.NET's underlying
+            transaction API: subclasses such as this are responsible for calling
+            superclass methods such as
+            <see cref="M:Spring.Transaction.Interceptor.TransactionAspectSupport.CreateTransactionIfNecessary(System.Reflection.MethodInfo,System.Type)"/>
+            in the correct order, in the event of normal invocation return or an exception. 
+            </p>
+            <p>
+            <see cref="T:Spring.Transaction.Interceptor.TransactionInterceptor"/>s are thread-safe.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: TransactionInterceptor.cs,v 1.12 2007/09/07 04:46:53 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.TransactionAspectSupport">
+            <summary>
+            Superclass for transaction aspects, such as the AOP Alliance-compatible
+            <see cref="T:Spring.Transaction.Interceptor.TransactionInterceptor"/>.
+            </summary>
+            <remarks>
+            <p>
+             This enables the underlying Spring transaction infrastructure to be used
+             to easily implement an aspect for any aspect system.
+            </p>
+            <p>
+            Subclasses are responsible for calling methods in this class in the correct order.
+            </p>
+            <p>
+            Uses the Strategy design pattern. A <see cref="T:Spring.Transaction.IPlatformTransactionManager"/>
+            implementation will perform the actual transaction management
+            </p>
+            <p>
+            A transaction aspect is serializable if its
+            <see cref="T:Spring.Transaction.IPlatformTransactionManager"/> and
+            <see cref="T:Spring.Transaction.Interceptor.ITransactionAttributeSource"/> are serializable.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: TransactionAspectSupport.cs,v 1.15 2008/05/27 19:06:57 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Transaction.Interceptor.TransactionAspectSupport.CURRENT_TRANSACTIONINFO_SLOTNAME">
+            <summary>
+            The name in thread local storage where the TransactionInfo object is located
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Interceptor.TransactionAspectSupport._transactionManager">
+            <summary>
+            The <see cref="T:Spring.Transaction.IPlatformTransactionManager"/> currently referenced by
+            this aspect
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Interceptor.TransactionAspectSupport._transactionAttributeSource">
+            <summary>
+            The <see cref="T:Spring.Transaction.Interceptor.ITransactionAttributeSource"/> currently
+            referenced by this aspect.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAspectSupport.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAspectSupport.AfterPropertiesSet">
+            <summary>
+            Checks that the required properties are set.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAspectSupport.CreateTransactionIfNecessary(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Create a transaction if necessary
+            </summary>
+            <param name="method">Method about to execute</param>
+            <param name="targetType">Type that the method is on</param>
+            <returns>
+            A <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/> object,
+            whether or not a transaction was created.
+            <p>
+            The
+            <see cref="P:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo.HasTransaction"/>
+            property on the
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+            class can be used to tell if there was a transaction created.
+            </p>
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAspectSupport.CreateTransactionIfNecessary(Spring.Transaction.Interceptor.ITransactionAttribute,System.String)">
+            <summary>
+            Creates the transaction if necessary.
+            </summary>
+            <param name="sourceAttr">The source transaction attribute.</param>
+            <param name="joinpointIdentification">The joinpoint identification.</param>
+            <returns>Transaction Info for declarative transaction management.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAspectSupport.MethodIdentification(System.Reflection.MethodInfo)">
+            <summary>
+            Identifies the method by providing the qualfied method name.
+            </summary>
+            <param name="methodInfo">The method info.</param>
+            <returns>qualified mehtod name.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAspectSupport.CommitTransactionAfterReturning(Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo)">
+            <summary>
+            Execute after the successful completion of call, but not after an exception was handled.
+            </summary>
+            <remarks>
+            <p>
+            Do nothing if we didn't create a transaction.
+            </p>
+            </remarks>
+            <param name="transactionInfo">
+            The
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+            about the current transaction.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAspectSupport.CompleteTransactionAfterThrowing(Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo,System.Exception)">
+            <summary>
+            Handle a exception, closing out the transaction.
+            </summary>
+            <remarks>
+            <p>
+            We may commit or roll back, depending on our configuration.
+            </p>
+            </remarks>
+            <param name="transactionInfo">
+            The
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+            about the current transaction.
+            </param>
+            <param name="exception">The <see cref="T:System.Exception"/> encountered.</param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAspectSupport.CleanupTransactionInfo(Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo)">
+            <summary>
+            Resets the 
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+            for this thread.
+            </summary>
+            <remarks>
+            <note>
+            Call this in all cases: exceptions or normal return.
+            </note>
+            </remarks>
+            <param name="transactionInfo">
+            The 
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+            about the current transaction. May be null.
+            </param>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionManager">
+            <summary>
+            Gets and sets the <see cref="T:Spring.Transaction.IPlatformTransactionManager"/> for
+            this aspect.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionAttributeSource">
+            <summary>
+            Gets and sets the
+            <see cref="T:Spring.Transaction.Interceptor.ITransactionAttributeSource"/> for
+            this aspect.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAspectSupport.CurrentTransactionStatus">
+            <summary>
+            Returns the <see cref="T:Spring.Transaction.ITransactionStatus"/>
+            of the current method invocation.
+            </summary>
+            <remarks>
+            Mainly intended for code that wants to set the current transaction
+            rollback-only but not throw an application exception.
+            </remarks>
+            <exception cref="T:Spring.Transaction.NoTransactionException">
+            If the transaction info cannot be found, because the method was invoked
+            outside of an AOP invocation context.
+            </exception>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAspectSupport.CurrentTransactionInfo">
+            <summary>
+            Subclasses can use this to return the current
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>.
+            </summary>
+            <remarks>
+            Only subclasses that cannot handle all operations in one method
+            need to use this mechanism to get at the current
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>. 
+            An around advice such as an AOP Alliance
+            <see cref="T:AopAlliance.Intercept.IMethodInterceptor"/> can hold a reference to the 
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+            throughout the aspect method.
+            A <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+            will be returned even if no transaction was created. The
+            <see cref="P:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo.HasTransaction"/>
+            property can be used to query this.
+            </remarks>
+            <exception cref="T:Spring.Transaction.NoTransactionException">
+            If no transaction has been created by an aspect.
+            </exception>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionAttributes">
+            <summary>
+            Set properties with method names as keys and transaction attribute
+            descriptors (parsed via <see cref="T:Spring.Transaction.Interceptor.TransactionAttributeEditor"/>) as values:
+            e.g. key = "MyMethod", value = "PROPAGATION_REQUIRED,readOnly".
+            </summary>
+            <remarks>
+            <note>
+            Method names are always applied to the target class, no matter if defined in an
+            interface or the class itself.
+            </note>
+            <p>
+            Internally, a
+            <see cref="T:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource"/>
+            will be created from the given properties.
+            </p>	
+            </remarks>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo">
+            <summary>
+            Opaque object used to hold transaction information.
+            </summary>
+            <remarks>
+            <p>
+            Subclasses must pass it back to method on this class, but not see its internals.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo.#ctor(Spring.Transaction.Interceptor.ITransactionAttribute,System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+            class for the supplied <paramref name="transactionAttribute"/>.
+            </summary>
+            <param name="transactionAttribute">The transaction attributes to associate with any transaction.</param>
+            <param name="joinpointIdentification">The info for diagnostic display of joinpoint</param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo.BindToThread">
+            <summary>
+            Binds this
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+            instance to the thread local storage variable for the current thread and
+            backs up the existing
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+            object for the current thread.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo.RestoreThreadLocalStatus">
+            <summary>
+            Restores the previous
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+            object to the current thread.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo.HasTransaction">
+            <summary>
+            Does this instance currently have a transaction?
+            </summary>
+            <value><b>True</b> if this instance has a transaction.</value>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo.TransactionStatus">
+            <summary>
+            Gets and sets the <see cref="T:Spring.Transaction.ITransactionStatus"/> for this object.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo.TransactionAttribute">
+            <summary>
+            Gets the current
+            <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> for this
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+            object.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo.JoinpointIdentification">
+            <summary>
+            Gets the joinpoint identification.
+            </summary>
+            <value>The joinpoint identification.</value>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionInterceptor.Invoke(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            AOP Alliance invoke call that handles all transaction plumbing. 
+            </summary>
+            <param name="invocation">
+            The method that is to execute in the context of a transaction.
+            </param>
+            <returns>The return value from the method invocation.</returns>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.NoRollbackRuleAttribute">
+            <summary>
+            Tag class. Its class means it has the opposite behaviour to the
+            <see cref="T:Spring.Transaction.Interceptor.RollbackRuleAttribute"/> superclass.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: NoRollbackRuleAttribute.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.RollbackRuleAttribute">
+            <summary>
+            Rule determining whether or not a given exception (and any subclasses) should
+            cause a rollback.
+            </summary>
+            <remarks>
+            <p>
+            Multiple such rules can be applied to determine whether a transaction should commit
+            or rollback after an exception has been thrown.
+            </p>
+            </remarks>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: RollbackRuleAttribute.cs,v 1.7 2008/03/31 20:09:59 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Transaction.Interceptor.RollbackRuleAttribute.RollbackOnSystemExceptions">
+            <summary>
+            Canonical instance representing default behavior for rolling back on
+            all <see cref="T:System.SystemException"/>s.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RollbackRuleAttribute.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.RollbackRuleAttribute"/> class
+            for the named <paramref name="exceptionName"/>.
+            </summary>
+            <param name="exceptionName">The exception name.</param>
+            <remarks>
+            <p>
+            As always, the <paramref name="exceptionName"/> should be the full
+            assembly qualified version.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RollbackRuleAttribute.#ctor(System.Type)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.RollbackRuleAttribute"/> class
+            for the suplied <paramref name="exceptionType"/>.
+            </summary>
+            <remarks>
+            <p>
+            The exception class must be <see cref="T:System.Exception"/> or a subclass.
+            </p>
+            <p>
+            This is the preferred way to construct a
+            <see cref="T:Spring.Transaction.Interceptor.RollbackRuleAttribute"/>,
+            matching the exception class and subclasses.
+            </p>
+            </remarks>
+            <param name="exceptionType">
+            The <see cref="T:System.Exception"/> class that will trigger a rollback.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RollbackRuleAttribute.GetDepth(System.Type)">
+            <summary>
+            Return the depth to the matching superclass execption <see cref="T:System.Type"/>.
+            </summary>
+            <remarks>
+            A return value of 0 means that the <paramref name="exceptionType"/> matches. 
+            </remarks>
+            <param name="exceptionType">
+            The <see cref="T:System.Type"/> of exception to find.
+            </param>
+            <returns>
+            Return -1 if there's no match. Otherwise, return depth. Lowest depth wins.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RollbackRuleAttribute.GetDepth(System.Object)">
+            <summary>
+            Return the depth to the matching superclass execption <see cref="T:System.Type"/>.
+            </summary>
+            <remarks>
+            A return value of 0 means that the <paramref name="exception"/>s 
+            <see cref="T:System.Type"/> matches. 
+            </remarks>
+            <param name="exception">
+            The exception object to find.
+            </param>
+            <returns>
+            Return -1 if there's no match. Otherwise, return depth. Lowest depth wins.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RollbackRuleAttribute.ToString">
+            <summary>
+            Returns a <see cref="T:System.String"/> representation of this instance.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> containing the exception covered by this instance.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RollbackRuleAttribute.GetHashCode">
+            <summary>
+            Override of <see cref="M:System.Object.GetHashCode"/>.
+            </summary>
+            <returns>The hashcode of the exception name covered by this instance.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RollbackRuleAttribute.Equals(System.Object)">
+            <summary>
+            Override of <see cref="M:System.Object.Equals(System.Object)"/>.
+            </summary>
+            <param name="obj">The object to compare.</param>
+            <returns><b>True</b> if the input object is equal to this instance.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RollbackRuleAttribute.Equals(Spring.Transaction.Interceptor.RollbackRuleAttribute)">
+            <summary>
+            Strongly typed <c>Equals()</c> implementation.
+            </summary>
+            <param name="rollbackRuleAttribute">
+            The <see cref="T:Spring.Transaction.Interceptor.RollbackRuleAttribute"/> to compare.
+            </param>
+            <returns>
+            <b>True</b> if the input object is equal to the supplied <paramref name="rollbackRuleAttribute"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.RollbackRuleAttribute.ExceptionName">
+            <summary>
+            Returns the name of the exception.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.NoRollbackRuleAttribute.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.NoRollbackRuleAttribute.#ctor(System.Type)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource"/> class.
+            </summary>
+            <param name="exceptionType">
+            The <see cref="T:System.Exception"/> class that will trigger a rollback.
+            </param>
+        </member>
+        <member name="T:Spring.Data.RowMapperDelegate">
+            <summary>
+            Callback delegate to process each row of data in a result set to an object.
+            </summary>
+            <param name="dataReader">The IDataReader to map</param>
+            <param name="rowNum">the number of the current row.</param>
+            <returns>An abrirary object, typically derived from data
+            in the result set.</returns>
+        </member>
+        <member name="T:Spring.Data.Generic.AdoTemplate">
+            <summary>
+            This is the central class in the Spring.Data.Generic namespace.
+            It simplifies the use of ADO.NET and helps to avoid commons errors.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AdoTemplate.cs,v 1.19 2007/12/07 22:56:22 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.Core.AdoAccessor">
+            <summary>
+            Base class for AdoTemplate and other ADO.NET DAO helper classes defining
+            common properties like DbProvider.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <author>Juergen Hoeller</author>
+        </member>
+        <member name="M:Spring.Data.Core.AdoAccessor.ApplyCommandSettings(System.Data.IDbCommand)">
+            <summary>
+            Prepare the command setting the transaction timeout.
+            </summary>
+            <param name="command"></param>
+        </member>
+        <member name="M:Spring.Data.Core.AdoAccessor.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has injected all of an object's dependencies.
+            </summary>
+            <remarks>
+            <p>
+            This method allows the object instance to perform the kind of
+            initialization only possible when all of it's dependencies have
+            been injected (set), and to throw an appropriate exception in the
+            event of misconfiguration.
+            </p>
+            <p>
+            Please do consult the class level documentation for the
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> interface for a
+            description of exactly <i>when</i> this method is invoked. In
+            particular, it is worth noting that the
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            and <see cref="T:Spring.Context.IApplicationContextAware"/>
+            callbacks will have been invoked <i>prior</i> to this method being
+            called.
+            </p>
+            </remarks>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as the failure to set a
+            required property) or if initialization fails.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoAccessor.CreateDataReaderWrapper(System.Data.IDataReader)">
+            <summary>
+            Creates the data reader wrapper for use in AdoTemplate callback methods.
+            </summary>
+            <param name="readerToWrap">The reader to wrap.</param>
+            <returns>The data reader used in AdoTemplate callbacks</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoAccessor.CreateDbParameters(System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Creates the a db parameters collection, adding to the collection a parameter created from
+            the method parameters.
+            </summary>
+            <param name="name">The name of the parameter</param>
+            <param name="dbType">The type of the parameter.</param>
+            <param name="size">The size of the parameter, for use in defining lengths of string values.  Use
+            0 if not applicable.</param>
+            <param name="parameterValue">The parameter value.</param>
+            <returns>A collection of db parameters with a single parameter in the collection based
+            on the method parameters</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoAccessor.CreateDbParameters">
+            <summary>
+            Creates a new instance of <see cref="T:Spring.Data.Common.DbParameters"/>
+            </summary>
+            <returns>a new instance of <see cref="T:Spring.Data.Common.DbParameters"/></returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoAccessor.DeriveParameters(System.String)">
+            <summary>
+            Derives the parameters of a stored procedure, not including the return parameter.
+            </summary>
+            <param name="procedureName">Name of the procedure.</param>
+            <returns>The stored procedure parameters.</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoAccessor.DeriveParameters(System.String,System.Boolean)">
+            <summary>
+            Derives the parameters of a stored procedure including the return parameter
+            </summary>
+            <param name="procedureName">Name of the procedure.</param>
+            <param name="includeReturnParameter">if set to <c>true</c> to include return parameter.</param>
+            <returns>The stored procedure parameters</returns>
+        </member>
+        <member name="P:Spring.Data.Core.AdoAccessor.DbProvider">
+            <summary>
+            An instance of a DbProvider implementation.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Core.AdoAccessor.LazyInit">
+            <summary>
+            Gets or sets a value indicating whether to lazily initialize the 
+            IAdoExceptionTranslator for this accessor, on first encounter of a 
+            exception from the data provider.  Default is "true"; can be switched to
+            "false" for initialization on startup.
+            </summary>
+            <value><c>true</c> if to lazy initialize the IAdoExceptionTranslator; 
+            otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.Core.AdoAccessor.ExceptionTranslator">
+            <summary>
+            Gets or sets the exception translator. If no custom translator is provided, a default
+            <see cref="T:Spring.Data.Support.ErrorCodeExceptionTranslator"/> is used.
+            </summary>
+            <value>The exception translator.</value>
+        </member>
+        <member name="P:Spring.Data.Core.AdoAccessor.DataReaderWrapperType">
+            <summary>
+            Gets or set the System.Type to use to create an instance of IDataReaderWrapper 
+            for the purpose of having defaults values to use in case of DBNull values read 
+            from IDataReader.
+            </summary>
+            <value>The type of the data reader wrapper.</value>
+        </member>
+        <member name="P:Spring.Data.Core.AdoAccessor.CommandTimeout">
+            <summary>
+            Gets or sets the command timeout for IDbCommands that this AdoTemplate executes.
+            </summary>
+            <remarks>Default is 0, indicating to use the database provider's default.
+            Any timeout specified here will be overridden by the remaining 
+            transaction timeout when executing within a transaction that has a
+            timeout specified at the transaction level. 
+            </remarks>
+            <value>The command timeout.</value>
+        </member>
+        <member name="T:Spring.Data.Generic.IAdoOperations">
+            <summary>
+            Interface that defines ADO.NET related database operations using generics
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IAdoOperations.cs,v 1.9 2007/12/04 06:48:21 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.ExecuteScalar(System.Data.CommandType,System.String)">
+            <summary>
+            Execute the query with the specified command text returning a scalar result
+            </summary>
+            <remarks>No parameters are used.  As with 
+            IDbCommand.ExecuteScalar, it returns the first column of the first row in the resultset
+            returned by the query.  Extra columns or row are ignored.</remarks>
+            <param name="cmdType">The command type</param>
+            <param name="cmdText">The command text to execute.</param>
+            <returns>The first column of the first row in the result set.</returns>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.ExecuteScalar(System.Data.CommandType,System.String,System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Execute the query with the specified command text and parameter returning a scalar result
+            </summary>
+            <param name="cmdType">The command type</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="parameterName">The name of the parameter to map.</param>
+            <param name="dbType">One of the database parameter type enumerations.</param>
+            <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+            <param name="parameterValue">The parameter value.</param>
+            <returns>The first column of the first row in the result set</returns>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.ExecuteScalar(System.Data.CommandType,System.String,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Execute the query with the specified command text and parameters returning a scalar result
+            </summary>
+            <param name="cmdType">The command type</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="parameters">The parameter collection to map.</param>
+            <returns>The first column of the first row in the result set</returns>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.ExecuteScalar(System.Data.CommandType,System.String,Spring.Data.ICommandSetter)">
+            <summary>
+            Execute the query with the specified command text and parameters set via the
+            command setter, returning a scalar result
+            </summary>
+            <param name="cmdType">The command type</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="commandSetter">The command setter.</param>
+            <returns>The first column of the first row in the result set</returns>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.ExecuteScalar(Spring.Data.IDbCommandCreator)">
+            <summary>
+            Execute the query with a command created via IDbCommandCreator and 
+            parameters
+            </summary>
+            <remarks>Output parameters can be retrieved via the returned
+            dictionary.
+            <para>
+            More commonly used as a lower level support method within the framework,
+            for example StoredProcedure/AdoScalar.
+            </para>
+            </remarks>
+            <param name="commandCreator">The callback to create a IDbCommand.</param>
+            <returns>A dictionary containing output parameters, if any</returns>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.ExecuteNonQuery(System.Data.CommandType,System.String)">
+            <summary>
+            Executes a non query returning the number of rows affected.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.ExecuteNonQuery(System.Data.CommandType,System.String,System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Executes a non query returning the number of rows affected.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="parameterName">The name of the parameter to map.</param>
+            <param name="dbType">One of the database parameter type enumerations.</param>
+            <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+            <param name="parameterValue">The parameter value.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.ExecuteNonQuery(System.Data.CommandType,System.String,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Executes a non query returning the number of rows affected.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="parameters">The parameter collection to map.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.ExecuteNonQuery(System.Data.CommandType,System.String,Spring.Data.ICommandSetter)">
+            <summary>
+            Executes a non query with parameters set via the
+            command setter, returning the number of rows affected.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="commandSetter">The command setter.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.ExecuteNonQuery(Spring.Data.IDbCommandCreator)">
+            <summary>
+            Executes a non query with a command created via IDbCommandCreator and
+            parameters.
+            </summary>
+            <remarks>Output parameters can be retrieved via the returned
+            dictionary.
+            <para>
+            More commonly used as a lower level support method within the framework,
+            for example StoredProcedure/AdoScalar.
+            </para>
+            </remarks>
+            <param name="commandCreator">The callback to create a IDbCommand.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.QueryWithRowCallback(System.Data.CommandType,System.String,Spring.Data.IRowCallback)">
+            <summary>
+            Execute a query given IDbCommand's type and text, reading a 
+            single result set on a per-row basis with a <see cref="T:Spring.Data.IRowCallback"/>.
+            </summary>
+            <param name="cmdType">The type of command.</param>
+            <param name="cmdText">The text of the query.</param>
+            <param name="rowCallback">callback that will extract results
+            one row at a time.
+            </param>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.QueryWithRowCallback(System.Data.CommandType,System.String,Spring.Data.IRowCallback,System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Execute a query given IDbCommand's type and text and provided parameter
+            information, reading a 
+            single result set on a per-row basis with a <see cref="T:Spring.Data.IRowCallback"/>.
+            </summary>
+            <param name="cmdType">The type of command</param>
+            <param name="cmdText">The text of the query.</param>
+            <param name="rowCallback">callback that will extract results
+            one row at a time.
+            </param>
+            <param name="parameterName">The name of the parameter to map.</param>
+            <param name="dbType">One of the database parameter type enumerations.</param>
+            <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+            <param name="parameterValue">The parameter value.</param>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.QueryWithRowCallback(System.Data.CommandType,System.String,Spring.Data.IRowCallback,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Execute a query given IDbCommand's type and text and provided IDbParameters,
+            reading a single result set on a per-row basis with a <see cref="T:Spring.Data.IRowCallback"/>.
+            </summary>
+            <param name="cmdType">Type of the command.</param>
+            <param name="cmdText">The text of the query.</param>
+            <param name="rowCallback">callback that will extract results
+            one row at a time.</param>
+            <param name="parameters">The parameter collection to map.</param>
+        </member>
+        <member name="M:Spring.Data.ICommonAdoOperations.QueryWithRowCallback(System.Data.CommandType,System.String,Spring.Data.IRowCallback,Spring.Data.ICommandSetter)">
+            <summary>
+            Execute a query given IDbCommand's type and text by 
+            passing the created IDbCommand to a ICommandSetter implementation 
+            that knows how to bind values to the IDbCommand, reading a 
+            single result set on a per-row basis with a <see cref="T:Spring.Data.IRowCallback"/>.
+            </summary>
+            <param name="cmdType">The type of command</param>
+            <param name="cmdText">The text of the query.</param>
+            <param name="rowCallback">callback that will extract results
+            one row at a time.
+            </param>
+            <param name="commandSetter">The command setter.</param>
+        </member>
+        <member name="M:Spring.Data.Generic.IAdoOperations.Execute``1(Spring.Data.Generic.ICommandCallback{``0})">
+            <summary>
+            Execute a ADO.NET operation on a command object using a generic interface based callback.
+            </summary>
+            <typeparam name="T">The type of object returned from the callback.</typeparam>
+            <param name="action">the callback to execute based on DbCommand</param>
+            <returns>An object returned from callback</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.IAdoOperations.Execute``1(Spring.Data.Generic.IDbCommandCallback{``0})">
+            <summary>
+            Execute a ADO.NET operation on a command object using a generic interface based callback.
+            </summary>
+            <typeparam name="T">The type of object returned from the callback.</typeparam>
+            <param name="action">The callback to execute based on IDbCommand</param>
+            <returns>An object returned from callback</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.IAdoOperations.Execute``1(Spring.Data.Generic.CommandDelegate{``0})">
+            <summary>
+            Execute a ADO.NET operation on a command object using a generic delegate callback.
+            </summary>
+            <typeparam name="T">The type of object returned from the callback.</typeparam>        
+            <remarks>This allows for implementing arbitrary data access operations
+            on a single command within Spring's managed ADO.NET environment.</remarks>
+            <param name="del">The delegate called with a DbCommand object.</param>
+            <returns>A result object returned by the action or null</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.IAdoOperations.Execute``1(Spring.Data.Generic.IDbCommandDelegate{``0})">
+            <summary>
+            Execute a ADO.NET operation on a command object using a generic delegate callback.
+            </summary>
+            <typeparam name="T">The type of object returned from the callback.</typeparam>        
+            <remarks>This allows for implementing arbitrary data access operations
+            on a single command within Spring's managed ADO.NET environment.</remarks>
+            <param name="del">The delegate called with a IDbCommand object.</param>
+            <returns>A result object returned by the action or null</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.IAdoOperations.Execute``1(Spring.Data.IDbCommandCreator,Spring.Data.Generic.IDbCommandCallback{``0})">
+            <summary>
+            Executes ADO.NET operations on a command object, created by the provided IDbCommandCreator,
+            using the interface based callback IDbCommandCallback.
+            </summary>
+            <typeparam name="T">The type of object returned from the callback.</typeparam>
+            <param name="commandCreator">The command creator.</param>
+            <param name="action">The callback to execute based on IDbCommand</param>
+            <returns>A result object returned by the action or null</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.IAdoOperations.Execute``1(Spring.Data.Generic.IDataAdapterCallback{``0})">
+            <summary>
+            Execute ADO.NET operations on a IDbDataAdapter object using an interface based callback.
+            </summary>
+            <remarks>This allows for implementing abritrary data access operations
+            on a single DataAdapter within Spring's managed ADO.NET environment.
+            </remarks>        
+            <typeparam name="T">The type of object returned from the callback.</typeparam>
+            <param name="dataAdapterCallback">The data adapter callback.</param>
+            <returns>A result object returned by the callback or null</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.IAdoOperations.Execute``1(Spring.Data.Generic.DataAdapterDelegate{``0})">
+            <summary>
+            Execute ADO.NET operations on a IDbDataAdapter object using an delgate based callback.
+            </summary>
+            <remarks>This allows for implementing abritrary data access operations
+            on a single DataAdapter within Spring's managed ADO.NET environment.
+            </remarks>        
+            <typeparam name="T">The type of object returned from the callback.</typeparam>
+            <param name="del">The delegate called with a IDbDataAdapter object.</param>
+            <returns>A result object returned by the callback or null</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Generic.AdoTemplate"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.#ctor(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Generic.AdoTemplate"/> class.
+            </summary>
+            <param name="provider">The provider.</param>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.#ctor(Spring.Data.Common.IDbProvider,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Generic.AdoTemplate"/> class.
+            </summary>
+            <param name="provider">The database provider.</param>
+            <param name="lazyInit">if set to <c>false</c>
+            lazily initialize the ErrorCodeExceptionTranslator.</param>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.#ctor(Spring.Data.Core.AdoTemplate)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Generic.AdoTemplate"/> class.
+            </summary>
+            <remarks>Useful if you have a subclass of Spring.Data.Core.AdoTemplate.</remarks>
+            <param name="classicAdoTemplate">The classic ADO template.</param>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.Execute``1(Spring.Data.Generic.ICommandCallback{``0})">
+            <summary>
+            Execute a ADO.NET operation on a command object using a interface based callback.
+            </summary>
+            <param name="action">the callback to execute</param>
+            <returns>object returned from callback</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.Execute``1(Spring.Data.Generic.CommandDelegate{``0})">
+            <summary>
+            Execute a ADO.NET operation on a command object using a delegate callback.
+            </summary>
+            <remarks>This allows for implementing arbitrary data access operations
+            on a single command within Spring's managed ADO.NET environment.</remarks>
+            <param name="del">The delegate called with a command object.</param>
+            <returns>A result object returned by the action or null</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.Execute``1(Spring.Data.Generic.IDbCommandCallback{``0})">
+            <summary>
+            Execute a ADO.NET operation on a command object using a interface based callback.
+            </summary>
+            <param name="action">the callback to execute</param>
+            <returns>object returned from callback</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.Execute``1(Spring.Data.Generic.IDbCommandDelegate{``0})">
+            <summary>
+            Execute a ADO.NET operation on a command object using a delegate callback.
+            </summary>
+            <remarks>This allows for implementing arbitrary data access operations
+            on a single command within Spring's managed ADO.NET environment.</remarks>
+            <param name="del">The delegate called with a command object.</param>
+            <returns>A result object returned by the action or null</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.Execute``1(Spring.Data.IDbCommandCreator,Spring.Data.Generic.IDbCommandCallback{``0})">
+            <summary>
+            Executes ADO.NET operations on a command object, created by the provided IDbCommandCreator,
+            using the interface based callback IDbCommandCallback.
+            </summary>
+            <typeparam name="T">The type of object returned from the callback.</typeparam>
+            <param name="commandCreator">The command creator.</param>
+            <param name="action">The callback to execute based on IDbCommand</param>
+            <returns>
+            A result object returned by the action or null
+            </returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.Execute``1(Spring.Data.Generic.IDataAdapterCallback{``0})">
+            <summary>
+            Execute ADO.NET operations on a IDbDataAdapter object using an interface based callback.
+            </summary>
+            <typeparam name="T">The type of object returned from the callback.</typeparam>
+            <param name="dataAdapterCallback">The data adapter callback.</param>
+            <returns>
+            A result object returned by the callback or null
+            </returns>
+            <remarks>This allows for implementing abritrary data access operations
+            on a single DataAdapter within Spring's managed ADO.NET environment.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.Execute``1(Spring.Data.Generic.DataAdapterDelegate{``0})">
+            <summary>
+            Execute ADO.NET operations on a IDbDataAdapter object using an delgate based callback.
+            </summary>
+            <remarks>This allows for implementing abritrary data access operations
+            on a single DataAdapter within Spring's managed ADO.NET environment.
+            </remarks>        
+            <typeparam name="T">The type of object returned from the callback.</typeparam>
+            <param name="dataAdapterCallback">The delegate called with a IDbDataAdapter object.</param>
+            <returns>A result object returned by the callback or null</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.ExecuteNonQuery(System.Data.CommandType,System.String)">
+            <summary>
+            Executes a non query returning the number of rows affected.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.ExecuteNonQuery(System.Data.CommandType,System.String,System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Executes a non query returning the number of rows affected.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="parameterName">The name of the parameter to map.</param>
+            <param name="dbType">One of the database parameter type enumerations.</param>
+            <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+            <param name="parameterValue">The parameter value.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.ExecuteNonQuery(System.Data.CommandType,System.String,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Executes a non query returning the number of rows affected.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="parameters">The parameter collection to map.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.ExecuteNonQuery(System.Data.CommandType,System.String,Spring.Data.ICommandSetter)">
+            <summary>
+            Executes a non query with parameters set via the
+            command setter, returning the number of rows affected.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="commandSetter">The command setter.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.ExecuteNonQuery(Spring.Data.IDbCommandCreator)">
+            <summary>
+            Executes a non query with a command created via IDbCommandCreator and
+            parameters.
+            </summary>
+            <remarks>Output parameters can be retrieved via the returned
+            dictionary.
+            <para>
+            More commonly used as a lower level support method within the framework,
+            for example StoredProcedure/AdoScalar.
+            </para>
+            </remarks>
+            <param name="commandCreator">The callback to create a IDbCommand.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.ExecuteScalar(System.Data.CommandType,System.String)">
+            <summary>
+            Execute the query with the specified command text.
+            </summary>
+            <remarks>No parameters are used.  As with 
+            IDbCommand.ExecuteScalar, it returns the first column of the first row in the result set
+            returned by the query.  Extra columns or row are ignored.</remarks>
+            <param name="cmdType">The command type</param>
+            <param name="cmdText">The command text to execute.</param>
+            <returns>The first column of the first row in the result set</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.ExecuteScalar(System.Data.CommandType,System.String,System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Execute the query with the specified command text and parameter returning a scalar result
+            </summary>
+            <param name="cmdType">The command type</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="parameterName">The name of the parameter to map.</param>
+            <param name="dbType">One of the database parameter type enumerations.</param>
+            <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+            <param name="parameterValue">The parameter value.</param>
+            <returns>The first column of the first row in the result set</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.ExecuteScalar(System.Data.CommandType,System.String,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Execute the query with the specified command text and parameters returning a scalar result
+            </summary>
+            <param name="cmdType">The command type</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="parameters">The parameter collection to map.</param>
+            <returns>The first column of the first row in the result set</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.ExecuteScalar(System.Data.CommandType,System.String,Spring.Data.ICommandSetter)">
+            <summary>
+            Execute the query with the specified command text and parameters set via the
+            command setter, returning a scalar result
+            </summary>
+            <param name="cmdType">The command type</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="commandSetter">The command setter.</param>
+            <returns>The first column of the first row in the result set</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.ExecuteScalar(Spring.Data.IDbCommandCreator)">
+            <summary>
+            Execute the query with a command created via IDbCommandCreator and 
+            parameters
+            </summary>
+            <remarks>Output parameters can be retrieved via the returned
+            dictionary.
+            <para>
+            More commonly used as a lower level support method within the framework,
+            for example for StoredProcedure/AdoScalar.
+            </para></remarks>
+            <param name="commandCreator">The callback to create a IDbCommand.</param>
+            <returns>A dictionary containing output parameters, if any</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.QueryWithRowCallback(System.Data.CommandType,System.String,Spring.Data.IRowCallback,Spring.Data.ICommandSetter)">
+            <summary>
+            Execute a query given IDbCommand's type and text by 
+            passing the created IDbCommand to a ICommandSetter implementation 
+            that knows how to bind values to the IDbCommand, reading a 
+            single result set on a per-row basis with a <see cref="T:Spring.Data.IRowCallback"/>.
+            </summary>
+            <param name="cmdType">The type of command</param>
+            <param name="cmdText">The text of the query.</param>
+            <param name="rowCallback">callback that will extract results
+            one row at a time.
+            </param>
+            <param name="commandSetter">The command setter.</param>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.QueryWithRowCallback(System.Data.CommandType,System.String,Spring.Data.IRowCallback)">
+            <summary>
+            Execute a query given IDbCommand's type and text, reading a 
+            single result set on a per-row basis with a <see cref="T:Spring.Data.IRowCallback"/>.
+            </summary>
+            <param name="cmdType">The type of command</param>
+            <param name="cmdText">The text of the query.</param>
+            <param name="rowCallback">callback that will extract results
+            one row at a time.
+            </param>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.QueryWithRowCallback(System.Data.CommandType,System.String,Spring.Data.IRowCallback,System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Execute a query given IDbCommand's type and text and provided parameter
+            information, reading a 
+            single result set on a per-row basis with a <see cref="T:Spring.Data.IRowCallback"/>.
+            </summary>
+            <param name="cmdType">The type of command</param>
+            <param name="cmdText">The text of the query.</param>
+            <param name="rowCallback">callback that will extract results
+            one row at a time.
+            </param>
+            <param name="parameterName">The name of the parameter to map.</param>
+            <param name="dbType">One of the database parameter type enumerations.</param>
+            <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+            <param name="parameterValue">The parameter value.</param>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.QueryWithRowCallback(System.Data.CommandType,System.String,Spring.Data.IRowCallback,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Execute a query given IDbCommand's type and text and provided IDbParameters,
+            reading a single result set on a per-row basis with a <see cref="T:Spring.Data.IRowCallback"/>.
+            </summary>
+            <param name="cmdType">Type of the command.</param>
+            <param name="cmdText">The text of the query.</param>
+            <param name="rowCallback">callback that will extract results
+            one row at a time.</param>
+            <param name="parameter">The parameter collection to map.</param>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.AfterPropertiesSet">
+            <summary>
+            Checks if DbProvider is not null and creates ExceptionTranslator if not LazyInit.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.CreateDataReaderWrapper(System.Data.IDataReader)">
+            <summary>
+            Creates the data reader wrapper for use in AdoTemplate callback methods.
+            </summary>
+            <param name="readerToWrap">The reader to wrap.</param>
+            <returns>The data reader used in AdoTemplate callbacks</returns>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoTemplate.DeriveParameters(System.String,System.Boolean)">
+            <summary>
+            Derives the parameters of a stored procedure including the return parameter
+            </summary>
+            <param name="procedureName">Name of the procedure.</param>
+            <param name="includeReturnParameter">if set to <c>true</c> to include return parameter.</param>
+            <returns>The stored procedure parameters</returns>
+        </member>
+        <member name="P:Spring.Data.Generic.AdoTemplate.DbProvider">
+            <summary>
+            An instance of a DbProvider implementation.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Generic.AdoTemplate.LazyInit">
+            <summary>
+            Gets or sets a value indicating whether to lazily initialize the 
+            IAdoExceptionTranslator for this accessor, on first encounter of a 
+            exception from the data provider.  Default is "true"; can be switched to
+            "false" for initialization on startup.
+            </summary>
+            <value><c>true</c> if to lazy initialize the IAdoExceptionTranslator; 
+            otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.Generic.AdoTemplate.ExceptionTranslator">
+            <summary>
+            Gets or sets the exception translator. If no custom translator is provided, a default
+            <see cref="T:Spring.Data.Support.ErrorCodeExceptionTranslator"/> is used.
+            </summary>
+            <value>The exception translator.</value>
+        </member>
+        <member name="P:Spring.Data.Generic.AdoTemplate.DataReaderWrapperType">
+            <summary>
+            Gets or set the System.Type to use to create an instance of IDataReaderWrapper 
+            for the purpose of having defaults values to use in case of DBNull values read 
+            from IDataReader.
+            </summary>
+            <value>The type of the data reader wrapper.</value>
+        </member>
+        <member name="P:Spring.Data.Generic.AdoTemplate.ClassicAdoTemplate">
+            <summary>
+            Gets the 'Classic' AdoTemplate in Spring.Data
+            </summary>
+            <remarks>
+            Useful to access methods that return non-generic collections.
+            </remarks>
+            <value>The 'Classic; AdoTemplate in Spring.Data.</value>
+        </member>
+        <member name="P:Spring.Data.Generic.AdoTemplate.CommandTimeout">
+            <summary>
+            Gets or sets the command timeout for IDbCommands that this AdoTemplate executes.  It also
+            sets the value of the contained 'ClassicAdoTemplate'.
+            </summary>
+            <value>The command timeout.</value>
+            <remarks>Default is 0, indicating to use the database provider's default.
+            Any timeout specified here will be overridden by the remaining
+            transaction timeout when executing within a transaction that has a
+            timeout specified at the transaction level.
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.Generic.IDbCommandCallback`1">
+            <summary>
+            Generic callback interface for code that operates on a 
+            IDbCommand. 
+            </summary>
+            <typeparam name="T">The return type from executing the
+            callback</typeparam>
+            <remarks>
+            <p>Allows you to execute any number of operations
+            on a single IDbCommand, for example a single ExecuteScalar
+            call or repeated execute calls with varying parameters.
+            </p>
+            <p>Used internally by AdoTemplate, but also useful for 
+            application code.  Note that the passed in IDbCommand
+            has been created by the framework and will have its
+            Connection property set and the Transaction property
+            set based on the transaction context.</p>
+            <p>As an alternative to using this interface you can use 
+            the delegate version which is particularly nice when using
+            anonymous delegates for writing more terse code and having
+            easy access to the variables in the calling class.</p>
+            <p>See <see cref="T:Spring.Data.ICommandCallback"/> for a version that has the
+            base class DbCommand as the callback argument.</p>
+            </remarks>
+            <author>Mark Pollack</author>
+        </member>
+        <member name="M:Spring.Data.Generic.IDbCommandCallback`1.DoInCommand(System.Data.IDbCommand)">
+            <summary>
+            Called by AdoTemplate.Execute with an active ADO.NET IDbCommand.
+            The calling code does not need to care about closing the 
+            command or the connection, or
+            about handling transactions:  this will all be handled by 
+            Spring's AdoTemplate
+            </summary>
+            <param name="command">An active IDbCommand instance</param>
+            <returns>The result object</returns>
+        </member>
+        <member name="T:Spring.Data.ICommandTextProvider">
+            <summary>
+            Interface to be implemented by objects that can provide SQL strings
+            </summary>
+            <remarks>Typically implemented by IDbCommandCreator and 
+            ICommandCallbacks that want to expose the CommandText they
+            use to create their ADO.NET commands, to allow for better
+            contextual information in case of exceptions</remarks>
+            <author>Mark Pollack(.NET)</author>
+            <author>Juergen Hoeller</author>
+        </member>
+        <member name="T:Spring.Data.ICommandCallback">
+            <summary>
+            Generic callback interface for code that operates on a 
+            IDbCommand. 
+            </summary>
+            <remarks>
+            <p>Allows you to execute any number of operations
+            on a single IDbCommand, for example a single ExecuteScalar
+            call or repeated execute calls with varying parameters.
+            </p>
+            <p>Used internally by AdoTemplate, but also useful for 
+            application code.  Note that the passed in IDbCommand
+            has been created by the framework.  </p>
+            </remarks>
+            <author>Mark Pollack</author>
+        </member>
+        <member name="M:Spring.Data.ICommandCallback.DoInCommand(System.Data.IDbCommand)">
+            <summary>
+            Called by AdoTemplate.Execute with an active ADO.NET IDbCommand.
+            The calling code does not need to care about closing the 
+            command or the connection, or
+            about handling transactions:  this will all be handled by 
+            Spring's AdoTemplate
+            </summary>
+            <param name="command">An active IDbCommand instance</param>
+            <returns>The result object</returns>
+        </member>
+        <member name="T:Spring.Data.Generic.ResultSetExtractorDelegate`1">
+            <summary>
+            Callback delegate to process all result sets and row in an 
+            AdoTemplate query method.
+            </summary>
+            <typeparam name="T">The type returned from the result set mapping.</typeparam>
+            <param name="reader">The IDataReader to extract data from.
+            Implementations should not close this: it will be closed
+            by the AdoTemplate.</param>
+            <returns>An arbitrary result object or null if none.</returns>
+        </member>
+        <member name="T:Spring.Data.Common.DbMetadata">
+            <summary>
+            Provides database metdata information.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: DbMetadata.cs,v 1.13 2007/11/21 18:01:45 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.Common.IDbMetadata">
+            <summary>
+            Provides minimal database metadata information to support the
+            functionality in Spring.NET ADO.NET Framework.
+            </summary>
+            
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IDbMetadata.cs,v 1.8 2007/11/21 18:01:45 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.ProductName">
+            <summary>
+            Gets a descriptive name of the product.
+            </summary>
+            <example>Example: Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0</example>
+            <value>The name of the product.</value>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.ConnectionType">
+            <summary>
+            Gets the type of the connection.  The fully qualified type name is given since some providers,
+            notably for SqlServerCe, do not use the same namespace for all data access types.
+            </summary>
+            <example>Example: System.Data.SqlClient.SqlCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the connection.</value>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.CommandType">
+            <summary>
+            Gets the type of the command.
+            </summary>
+            <example>Example: System.Data.SqlClient.SqlCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the command.</value>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.ParameterType">
+            <summary>
+            Gets the type of the parameter.
+            </summary>
+            <example>Example: System.Data.SqlClient.SqlParameter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the parameter.</value>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.DataAdapterType">
+            <summary>
+            Gets the type of the data adapter.
+            </summary>
+            <example>Example: System.Data.SqlClient.SqlDataAdapter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the data adapter.</value>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.CommandBuilderType">
+            <summary>
+            Gets the type of the command builder.
+            </summary>
+            <example>Example: System.Data.SqlClient.SqlCommandBuilder, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the command builder.</value>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.ExceptionType">
+            <summary>
+            Gets the type of the exception.
+            </summary>
+            <example>Example: System.Data.SqlClient.SqlException, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the exception.</value>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.ErrorCodeExceptionExpression">
+            <summary>
+            Gets the error code exception expression.
+            </summary>
+            <example>Example Errors[0].Number.ToString() for Sql Server </example>
+            <value>The error code exception expression.</value>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.CommandBuilderDeriveParametersMethod">
+            <summary>
+            Gets the command builder derive parameters method.
+            </summary>
+            <remarks>If the value 'not supported' is specified then this method will throw an ArgumentException</remarks>
+            <example>Example: DeriveParameters</example>
+            <value>The command builder derive parameters method.</value>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.ParameterNamePrefix">
+            <summary>
+            Provide the prefix used to indentify named parameters in SQL text.
+            </summary>
+            <example>@ for Sql Server</example>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.UseParameterNamePrefixInParameterCollection">
+            <summary>
+            Does the driver require the use of the parameter prefix when
+            specifying the name of the parameter in the Command's
+            Parameter collection.  
+            </summary>
+            <remarks>If true, then commamd.Parameters["@parameterName"] is
+            used, otherwise, command.Parameters["parameterName"].
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.UseParameterPrefixInSql">
+            <summary>
+            Gets a value indicating whether the Provider requires
+            the use of a named prefix in the SQL string. 
+            </summary>
+            <remarks>
+            The OLE DB/ODBC .NET Provider does not support named parameters for 
+            passing parameters to an SQL Statement or a stored procedure called
+            by an IDbCommand when CommandType is set to Text.
+            </remarks>
+            <value>
+            	<c>true</c> if use parameter prefix in SQL; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.BindByName">
+            <summary>
+            For providers that allow you to choose between binding parameters
+            to a command by name (true) or by position (false).
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.ParameterDbType">
+            <summary>
+            Gets the type of the parameter db.
+            </summary>
+            <example>Example: System.Data.SqlDbType, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the parameter db.</value>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.ParameterDbTypeProperty">
+            <summary>
+            Gets the parameter db type property.
+            </summary>
+            <example>Example: SqlDbType for SqlServer</example>
+            <value>The parameter db type property.</value>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.ParameterIsNullableProperty">
+            <summary>
+            Gets the parameter is nullable property.
+            </summary>
+            <example>Example: IsNullable for Sql Server</example>
+            <value>The parameter is nullable property.</value>
+        </member>
+        <member name="P:Spring.Data.Common.IDbMetadata.ErrorCodes">
+            <summary>
+            Gets or sets the error codes.
+            </summary>
+            <remarks>The collection of error codes to map error code integer values to Spring's DAO exception hierarchy</remarks>
+            <value>The error codes.</value>
+        </member>
+        <member name="M:Spring.Data.Common.DbMetadata.#ctor(System.String,System.String,System.Type,System.Type,System.Type,System.Type,System.Type,System.String,System.Type,System.String,System.String,System.String,System.Type,System.Boolean,System.Boolean,System.Boolean,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Common.DbMetadata"/> class.
+            </summary>
+            <param name="productName">Name of the product.</param>
+            <param name="assemblyName">Name of the assembly.</param>
+            <param name="connectionType">Type of the connection.</param>
+            <param name="commandType">Type of the command.</param>
+            <param name="parameterType">Type of the parameter.</param>
+            <param name="dataAdapterType">Type of the data adapter.</param>
+            <param name="commandBuilderType">Type of the command builder.</param>
+            <param name="commandBuilderDeriveParametersMethod">The command builder derive parameters method.</param>
+            <param name="parameterDbType">Type of the parameter db.</param>
+            <param name="parameterDbTypeProperty">The parameter db type property.</param>
+            <param name="parameterIsNullableProperty">The parameter is nullable property.</param>
+            <param name="parameterNamePrefix">The parameter name prefix.</param>
+            <param name="exceptionType">Type of the exception.</param>
+            <param name="useParameterNamePrefixInParameterCollection">if set to <c>true</c> [use parameter name prefix in parameter collection].</param>
+            <param name="useParameterPrefixInSql">if set to <c>true</c> [use parameter prefix in SQL].</param>
+            <param name="bindByName">if set to <c>true</c> [bind by name].</param>
+            <param name="errorCodeExceptionExpression">The error code exception expression.</param>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.UseParamNamePrefixInParameterCollection">
+            <summary>
+            Gets a value indicating whether to use param name prefix in parameter collection.
+            </summary>
+            <value>
+            	<c>true</c> if should use param name prefix in parameter collection; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.AssemblyName">
+            <summary>
+            Gets the name of the assembly.
+            </summary>
+            <example>Example: System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The name of the assembly.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.ProductName">
+            <summary>
+            Gets a descriptive name of the product.
+            </summary>
+            <example>Example: Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0</example>
+            <value>The name of the product.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.ConnectionType">
+            <summary>
+            Gets the type of the connection.  The fully qualified type name is given since some providers,
+            notably for SqlServerCe, do not use the same namespace for all data access types.
+            </summary>
+            <example>Example: System.Data.SqlClient.SqlCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the connection.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.CommandType">
+            <summary>
+            Gets the type of the command.
+            </summary>
+            <example>Example: System.Data.SqlClient.SqlCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the command.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.ParameterType">
+            <summary>
+            Gets the type of the parameter.
+            </summary>
+            <example>Example: System.Data.SqlClient.SqlParameter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the parameter.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.DataAdapterType">
+            <summary>
+            Gets the type of the data adapter.
+            </summary>
+            <example>Example: System.Data.SqlClient.SqlDataAdapter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the data adapter.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.CommandBuilderType">
+            <summary>
+            Gets the type of the command builder.
+            </summary>
+            <example>Example: System.Data.SqlClient.SqlCommandBuilder, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the command builder.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.CommandBuilderDeriveParametersMethod">
+            <summary>
+            Gets the command builder derive parameters method.
+            </summary>
+            <remarks>If the value 'not supported' is specified then this method will throw an ArgumentException</remarks>
+            <example>Example: DeriveParameters</example>
+            <value>The command builder derive parameters method.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.ParameterNamePrefix">
+            <summary>
+            Provide the prefix used to indentify named parameters in SQL text.
+            </summary>
+            <example>@ for Sql Server</example>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.ExceptionType">
+            <summary>
+            Gets the type of the exception.
+            </summary>
+            <example>Example: System.Data.SqlClient.SqlException, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the exception.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.UseParameterNamePrefixInParameterCollection">
+            <summary>
+            Does the driver require the use of the parameter prefix when
+            specifying the name of the parameter in the Command's
+            Parameter collection.
+            </summary>
+            <value></value>
+            <remarks>If true, then commamd.Parameters["@parameterName"] is
+            used, otherwise, command.Parameters["parameterName"].
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.UseParameterPrefixInSql">
+            <summary>
+            Gets a value indicating whether the Provider requires
+            the use of a named prefix in the SQL string.
+            </summary>
+            <value>
+            	<c>true</c> if use parameter prefix in SQL; otherwise, <c>false</c>.
+            </value>
+            <remarks>
+            The OLE DB/ODBC .NET Provider does not support named parameters for
+            passing parameters to an SQL Statement or a stored procedure called
+            by an IDbCommand when CommandType is set to Text.
+            </remarks>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.BindByName">
+            <summary>
+            For providers that allow you to choose between binding parameters
+            to a command by name (true) or by position (false).
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.ParameterDbType">
+            <summary>
+            Gets the type of the parameter db.
+            </summary>
+            <example>Example: System.Data.SqlDbType, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</example>
+            <value>The type of the parameter db.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.ParameterDbTypeProperty">
+            <summary>
+            Gets the parameter db type property.
+            </summary>
+            <example>Example: SqlDbType for SqlServer</example>
+            <value>The parameter db type property.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.ParameterIsNullableProperty">
+            <summary>
+            Gets the parameter is nullable property.
+            </summary>
+            <example>Example: IsNullable for Sql Server</example>
+            <value>The parameter is nullable property.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.ErrorCodes">
+            <summary>
+            Gets or sets the error codes.
+            </summary>
+            <remarks>The collection of error codes to map error code integer values to Spring's DAO exception hierarchy</remarks>
+            <value>The error codes.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbMetadata.ErrorCodeExceptionExpression">
+            <summary>
+            Gets the error code exception expression.
+            </summary>
+            <example>Example Errors[0].Number.ToString() for Sql Server </example>
+            <value>The error code exception expression.</value>
+        </member>
+        <member name="T:Spring.Dao.PessimisticLockingFailureException">
+            <summary> 
+            Exception thrown on a pessimistic locking violation.
+            </summary>
+            <remarks>
+            <para>Serves as a superclass for more specific exceptions, like 
+            CannotAcquireLockException and DeadlockLoserDataAccessException
+            </para>
+            <para>
+            This exception will be thrown either by O/R mapping tools or by custom DAO
+            implementations.
+            </para>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: PessimisticLockingFailureException.cs,v 1.1 2008/04/08 20:26:43 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Dao.ConcurrencyFailureException">
+            <summary> 
+            Exception thrown on concurrency failure. This exception should be
+            sublassed to indicate the type of failure - optimistic locking,
+            failure to acquire lock, etc.
+            </summary>
+            <remarks>
+            <p>
+            This exception will be thrown either by O/R mapping tools or by custom DAO
+            implementations.
+            </p>
+            </remarks>
+            <author>Thomas Risberg</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: ConcurrencyFailureException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Dao.DataAccessException">
+            <summary>
+            Root of the hierarchy of data access exceptions
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+        </member>
+        <member name="M:Spring.Dao.DataAccessException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataAccessException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.DataAccessException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.DataAccessException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.DataAccessException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataAccessException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.ConcurrencyFailureException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.ConcurrencyFailureException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.ConcurrencyFailureException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.ConcurrencyFailureException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.ConcurrencyFailureException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.ConcurrencyFailureException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.ConcurrencyFailureException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.ConcurrencyFailureException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.PessimisticLockingFailureException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.PessimisticLockingFailureException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.PessimisticLockingFailureException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.PessimisticLockingFailureException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.PessimisticLockingFailureException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.PessimisticLockingFailureException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.PessimisticLockingFailureException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CannotAcquireLockException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Transaction.Support.TransactionTemplate">
+            <summary>
+            Helper class that simplifies programmatic transaction demarcation and
+            transaction exception handling.
+            </summary>
+            <remarks>
+            <p>
+            The central methods are
+            <see cref="M:Spring.Transaction.Support.TransactionTemplate.Execute(Spring.Transaction.Support.ITransactionCallback)"/>
+            and <see cref="M:Spring.Transaction.Support.TransactionTemplate.Execute(Spring.Transaction.Support.TransactionDelegate)"/>
+            supporting transactional code wrapped in the delegate instance. It handles the
+            transaction lifecycle and possible exceptions such that neither the delegate
+            implementation nor the calling code needs to explicitly handle transactions.
+            </p>
+            <p>
+            Can be used within a service implementation via direct instantiation with
+            a transaction manager reference, or get prepared in an application context
+            and given to services as object reference.
+            </p>
+            <note>
+            The transaction manager should always be configured as an object in the application
+            context, in the first case given to the service directly, in the second case to the
+            prepared template.
+            </note>
+            <p>
+            Supports setting the propagation behavior and the isolation level by name,
+            for convenient configuration in context definitions.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author> 
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: TransactionTemplate.cs,v 1.13 2007/08/01 18:53:14 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Transaction.Support.DefaultTransactionDefinition">
+            <summary>
+            Default implementation of the <see cref="T:Spring.Transaction.ITransactionDefinition"/>
+            interface, offering object-style configuration and sensible default values.
+            </summary>
+            <remarks>
+            <p>
+            Base class for both <see cref="T:System.SystemException"/> and
+            <see cref="T:Spring.Transaction.Interceptor.DefaultTransactionAttribute"/>.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: DefaultTransactionDefinition.cs,v 1.15 2007/12/07 08:10:03 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Transaction.ITransactionDefinition">
+            <summary>
+            Interface for classes that define transaction properties. Base interface for
+            <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/>.
+            </summary>
+            <remarks>
+            <p>
+            Note that isolation level, timeout and read-only settings will only
+            get applied when starting a new transaction. As only
+            <see cref="F:Spring.Transaction.TransactionPropagation.Required"/> and
+            <see cref="F:Spring.Transaction.TransactionPropagation.RequiresNew"/> can actually cause that, it doesn't make sense
+            to specify any of those settings else. Furthermore, not all transaction
+            managers will support those features and thus throw respective exceptions
+            when given non-default values.
+            </p>
+            </remarks>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ITransactionDefinition.cs,v 1.9 2007/12/07 08:10:03 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Transaction.ITransactionDefinition.PropagationBehavior">
+            <summary>
+            Return the propagation behavior of type
+            <see cref="T:Spring.Transaction.TransactionPropagation"/>.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.ITransactionDefinition.TransactionIsolationLevel">
+            <summary>
+            Return the isolation level of type <see cref="T:System.Data.IsolationLevel"/>.
+            </summary>
+            <remarks>
+            <p>
+            Only makes sense in combination with
+            <see cref="F:Spring.Transaction.TransactionPropagation.Required"/> and
+            <see cref="F:Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+            </p>
+            <p>
+            Note that a transaction manager that does not support custom isolation levels
+            will throw an exception when given any other level than
+            <see cref="F:System.Data.IsolationLevel.Unspecified"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.ITransactionDefinition.TransactionTimeout">
+            <summary>
+            Return the transaction timeout.
+            </summary>
+            <remarks>
+            <p>
+            Must return a number of seconds, or -1.
+            Only makes sense in combination with
+            <see cref="F:Spring.Transaction.TransactionPropagation.Required"/> and
+            <see cref="F:Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+            Note that a transaction manager that does not support timeouts will
+            throw an exception when given any other timeout than -1.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.ITransactionDefinition.ReadOnly">
+            <summary>
+            Get whether to optimize as read-only transaction.
+            </summary>
+            <remarks>
+            <p>
+            This just serves as hint for the actual transaction subsystem,
+            it will <i>not necessarily</i> cause failure of write accesses.
+            </p>
+            <p>
+            Only makes sense in combination with
+            <see cref="F:Spring.Transaction.TransactionPropagation.Required"/> and
+            <see cref="F:Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+            </p>
+            <p>
+            A transaction manager that cannot interpret the read-only hint
+            will <i>not</i> throw an exception when given <c>ReadOnly=true</c>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.ITransactionDefinition.Name">
+            <summary>
+            Return the name of this transaction.  Can be null.
+            </summary>
+            <remarks>
+            This will be used as a transaction name to be shown in a 
+            transaction monitor, if applicable.  In the case of Spring
+            declarative transactions, the exposed name will be the fully
+            qualified type name + "." method name + assembly (by default).
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.ITransactionDefinition.EnterpriseServicesInteropOption">
+            <summary>
+            Gets the enterprise services interop option.
+            </summary>
+            <value>The enterprise services interop option.</value>
+        </member>
+        <member name="F:Spring.Transaction.Support.DefaultTransactionDefinition.TIMEOUT_DEFAULT">
+            <summary>
+            The default transaction timeout.
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Support.DefaultTransactionDefinition.PROPAGATION_CONSTANT_PREFIX">
+            <summary>
+            Prefix for Propagation settings.
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Support.DefaultTransactionDefinition.ISOLATION_CONSTANT_PREFIX">
+            <summary>
+            Prefix for IsolationLevel settings.
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Support.DefaultTransactionDefinition.TIMEOUT_PREFIX">
+            <summary>
+            Prefix for transaction timeout values in description strings.
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Support.DefaultTransactionDefinition.READ_ONLY_MARKER">
+            <summary>
+            Marker for read-only transactions in description strings.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Support.DefaultTransactionDefinition.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Support.DefaultTransactionDefinition"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Support.DefaultTransactionDefinition.#ctor(Spring.Transaction.TransactionPropagation)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Support.DefaultTransactionDefinition"/> class
+            with the supplied <see cref="T:Spring.Transaction.TransactionPropagation"/>
+            behaviour.
+            </summary>
+            <param name="transactionPropagation">
+            The desired <see cref="T:Spring.Transaction.TransactionPropagation"/> behavior.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.Support.DefaultTransactionDefinition.Equals(System.Object)">
+            <summary>
+            An override of the default <see cref="M:System.Object.Equals(System.Object)"/> method.
+            </summary>
+            <param name="obj">The <see cref="T:System.Object"/> to compare to.</param>
+            <returns>True if the objects are equal.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Support.DefaultTransactionDefinition.GetHashCode">
+            <summary>
+            An override of the default <see cref="M:System.Object.GetHashCode"/> method that returns the
+            hashcode of the
+            <see cref="P:Spring.Transaction.Support.DefaultTransactionDefinition.DefinitionDescription"/>
+            property.
+            </summary>
+            <returns>
+            The hashcode of the
+            <see cref="P:Spring.Transaction.Support.DefaultTransactionDefinition.DefinitionDescription"/>
+            property.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Support.DefaultTransactionDefinition.ToString">
+            <summary>
+            An override of the default <see cref="M:System.Object.ToString"/> method that returns a string
+            representation of the
+            <see cref="P:Spring.Transaction.Support.DefaultTransactionDefinition.DefinitionDescription"/>
+            property.
+            </summary>
+            <returns>
+            A string representation of the
+            <see cref="P:Spring.Transaction.Support.DefaultTransactionDefinition.DefinitionDescription"/>
+            property.
+            </returns>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionDefinition.PropagationBehavior">
+            <summary>
+            Gets / Sets the <see cref="T:Spring.Transaction.TransactionPropagation">propagation</see>
+            behavior.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionDefinition.TransactionIsolationLevel">
+            <summary>
+            Return the isolation level of type <see cref="T:System.Data.IsolationLevel"/>.
+            </summary>
+            <remarks>
+            <p>
+            Only makes sense in combination with
+            <see cref="F:Spring.Transaction.TransactionPropagation.Required"/> and
+            <see cref="F:Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+            </p>
+            <p>
+            Note that a transaction manager that does not support custom isolation levels
+            will throw an exception when given any other level than
+            <see cref="F:System.Data.IsolationLevel.Unspecified"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionDefinition.TransactionTimeout">
+            <summary>
+            Return the transaction timeout.
+            </summary>
+            <remarks>
+            <p>
+            Must return a number of seconds, or -1.
+            Only makes sense in combination with
+            <see cref="F:Spring.Transaction.TransactionPropagation.Required"/> and
+            <see cref="F:Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+            Note that a transaction manager that does not support timeouts will
+            throw an exception when given any other timeout than -1.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionDefinition.ReadOnly">
+            <summary>
+            Get whether to optimize as read-only transaction.
+            </summary>
+            <remarks>
+            <p>
+            This just serves as hint for the actual transaction subsystem,
+            it will <i>not necessarily</i> cause failure of write accesses.
+            </p>
+            <p>
+            Only makes sense in combination with
+            <see cref="F:Spring.Transaction.TransactionPropagation.Required"/> and
+            <see cref="F:Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+            </p>
+            <p>
+            A transaction manager that cannot interpret the read-only hint
+            will <i>not</i> throw an exception when given <c>ReadOnly=true</c>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionDefinition.Name">
+            <summary>
+            Return the name of this transaction.  Can be null.
+            </summary>
+            <value></value>
+            <remarks>
+            This will be used as a transaction name to be shown in a
+            transaction monitor, if applicable.  In the case of Spring
+            declarative transactions, the exposed name will be the fully
+            qualified type name + "." method name + assembly (by default).
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionDefinition.EnterpriseServicesInteropOption">
+            <summary>
+            Gets the enterprise services interop option.
+            </summary>
+            <value>The enterprise services interop option.</value>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionDefinition.DefinitionDescription">
+            <summary>
+            Returns a <see cref="T:System.String"/> representation of the
+            <see cref="P:Spring.Transaction.Support.DefaultTransactionDefinition.DefinitionDescription"/>
+            property.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.Support.ITransactionOperations">
+            <summary>
+            Interface specifying basic transaction exectuion operations.
+            </summary>
+            <remarks>
+            Implemented by <see cref="T:Spring.Transaction.Support.TransactionTemplate"/>.  Not often used directly,
+            but a useful option to enhance testability, as it can easily be mocked or stubbed.
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollac (.NET)</author>
+            <version>$Id: ITransactionOperations.cs,v 1.1 2007/08/01 18:53:14 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Support.ITransactionOperations.Execute(Spring.Transaction.Support.TransactionDelegate)">
+            <summary>
+            Executes the the action specified by the given delegate callback within a transaction.
+            </summary>
+            <remarks>Allows for returning a result object created within the transaction, that is,
+            a domain object or a collection of domain objects.  An exception thrown by the callback
+            is treated as a fatal exception that enforces a rollback.  Such an exception gets
+            propagated to the caller of the template.
+            </remarks>
+            <param name="transactionMethod">The delegate that specifies the transactional action.</param>
+            <returns>A result object returned by the callback, or <code>null</code> if one</returns>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In case of initialization or system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.ITransactionOperations.Execute(Spring.Transaction.Support.ITransactionCallback)">
+            <summary>
+            Executes the action specified by the given callback object within a transaction.
+            </summary>
+            <remarks>Allows for returning a result object created within the transaction, that is,
+            a domain object or a collection of domain objects.  An exception thrown by the callback
+            is treated as a fatal exception that enforces a rollback.  Such an exception gets
+            propagated to the caller of the template.
+            </remarks>
+            <param name="action">The callback object that specifies the transactional action.</param>
+            <returns>A result object returned by the callback, or <code>null</code> if one</returns>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In case of initialization or system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionTemplate.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Support.TransactionTemplate"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Mainly targeted at configuration by an object factory.
+            </p>
+            <note>
+            The
+            <see cref="P:Spring.Transaction.Support.TransactionTemplate.PlatformTransactionManager"/>
+            property must be set before any calls to the
+            <see cref="M:Spring.Transaction.Support.TransactionTemplate.Execute(Spring.Transaction.Support.ITransactionCallback)"/>
+            or <see cref="M:Spring.Transaction.Support.TransactionTemplate.Execute(Spring.Transaction.Support.TransactionDelegate)"/>
+            method.
+            </note>
+            </remarks>
+            <seealso cref="T:Spring.Transaction.IPlatformTransactionManager"/>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionTemplate.#ctor(Spring.Transaction.IPlatformTransactionManager)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Support.TransactionTemplate"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Mainly targeted at configuration by an object factory.
+            </p>
+            </remarks>
+            <param name="platformTransactionManager">
+            The transaction management strategy to be used.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionTemplate.AfterPropertiesSet">
+            <summary>
+            Ensures that the
+            <see cref="P:Spring.Transaction.Support.TransactionTemplate.PlatformTransactionManager"/>
+            has been set.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionTemplate.Execute(Spring.Transaction.Support.TransactionDelegate)">
+            <summary>
+            Executes the the action specified by the given delegate callback within a transaction.
+            </summary>
+            <param name="transactionMethod">The delegate that specifies the transactional action.</param>
+            <returns>
+            A result object returned by the callback, or <code>null</code> if one
+            </returns>
+            <remarks>Allows for returning a result object created within the transaction, that is,
+            a domain object or a collection of domain objects.  An exception thrown by the callback
+            is treated as a fatal exception that enforces a rollback.  Such an exception gets
+            propagated to the caller of the template.
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In case of initialization or system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionTemplate.Execute(Spring.Transaction.Support.ITransactionCallback)">
+            <summary>
+            Executes the action specified by the given callback object within a transaction.
+            </summary>
+            <param name="action">The callback object that specifies the transactional action.</param>
+            <returns>
+            A result object returned by the callback, or <code>null</code> if one
+            </returns>
+            <remarks>Allows for returning a result object created within the transaction, that is,
+            a domain object or a collection of domain objects.  An exception thrown by the callback
+            is treated as a fatal exception that enforces a rollback.  Such an exception gets
+            propagated to the caller of the template.
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In case of initialization or system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionTemplate.rollbackOnException(Spring.Transaction.ITransactionStatus,System.Exception)">
+            <summary>
+            Perform a rollback, handling rollback exceptions properly.
+            </summary>
+            <param name="status">The object representing the transaction.</param>
+            <param name="exception">The thrown application exception or error.</param>
+        </member>
+        <member name="P:Spring.Transaction.Support.TransactionTemplate.PlatformTransactionManager">
+            <summary>
+            Gets and sets the <see cref="T:Spring.Transaction.IPlatformTransactionManager"/> to
+            be used.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.ISavepointManager">
+            <summary>
+            Interface that specifies means to programmatically manage
+            transaction savepoints in a generic fashion.
+            </summary>
+            <remarks>
+            <p>
+            Note that savepoints can only work within an active transaction.
+            Just use this programmatic savepoint handling for advanced needs;
+            else, a subtransaction with a <see cref="T:Spring.Transaction.TransactionPropagation"/> value
+            of <see cref="F:Spring.Transaction.TransactionPropagation.Nested"/> is preferable.
+            </p>	
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: ISavepointManager.cs,v 1.5 2006/05/17 17:48:25 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.ISavepointManager.CreateSavepoint(System.String)">
+            <summary>
+            Create a new savepoint.
+            </summary>
+            <param name="savepointName">
+            The name of the savepoint to create.
+            </param>
+            <remarks>
+            You can roll back to a specific savepoint
+            via <see cref="M:Spring.Transaction.ISavepointManager.RollbackToSavepoint(System.String)"/>,
+            and explicitly release a savepoint that you don't need anymore via
+            <see cref="M:Spring.Transaction.ISavepointManager.ReleaseSavepoint(System.String)"/>.
+            <p>
+            Note that most transaction managers will automatically release
+            savepoints at transaction completion.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            If the savepoint could not be created,
+            either because the backend does not support it or because the
+            transaction is not in an appropriate state.
+            </exception>
+            <returns>
+            A savepoint object, to be passed into
+            <see cref="M:Spring.Transaction.ISavepointManager.RollbackToSavepoint(System.String)"/>
+            or <see cref="M:Spring.Transaction.ISavepointManager.ReleaseSavepoint(System.String)"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.ISavepointManager.RollbackToSavepoint(System.String)">
+            <summary>
+            Roll back to the given savepoint.
+            </summary>
+            <remarks>
+            The savepoint will be automatically released afterwards.
+            </remarks>
+            <param name="savepoint">The savepoint to roll back to.</param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            If the rollback failed.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.ISavepointManager.ReleaseSavepoint(System.String)">
+            <summary>
+            Explicitly release the given savepoint.
+            </summary>
+            <remarks>
+            <p>
+            Note that most transaction managers will automatically release
+            savepoints at transaction completion.
+            </p>
+            <p>
+            Implementations should fail as silently as possible if
+            proper resource cleanup will still happen at transaction completion.
+            </p>
+            </remarks>
+            <param name="savepoint">The savepoint to release.</param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            If the release failed.
+            </exception>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.ITransactionAttribute">
+            <summary>
+            This interface adds a
+            <see cref="M:Spring.Transaction.Interceptor.ITransactionAttribute.RollbackOn(System.Exception)"/>
+            specification to <see cref="T:Spring.Transaction.ITransactionDefinition"/>.
+            </summary>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: ITransactionAttribute.cs,v 1.6 2007/12/29 00:28:53 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.ITransactionAttribute.RollbackOn(System.Exception)">
+            <summary>
+            Decides if rollback is required for the supplied <paramref name="exception"/>.
+            </summary>
+            <param name="exception">The <see cref="T:System.Exception"/> to evaluate.</param>
+            <returns>True if the exception causes a rollback, false otherwise.</returns>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.DefaultTransactionAttribute">
+            <summary> 
+            Transaction attribute approach to rolling back on all exceptions, no other
+            exceptions by default.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: DefaultTransactionAttribute.cs,v 1.9 2007/12/29 00:28:53 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Transaction.Interceptor.DefaultTransactionAttribute.ROLLBACK_RULE_PREFIX">
+            <summary>
+            Prefix for rollback-on-exception rules in description strings.
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Interceptor.DefaultTransactionAttribute.COMMIT_RULE_PREFIX">
+            <summary>
+            Prefix for commit-on-exception rules in description strings.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.DefaultTransactionAttribute.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.DefaultTransactionAttribute"/>
+            class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.DefaultTransactionAttribute.#ctor(Spring.Transaction.TransactionPropagation)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.DefaultTransactionAttribute"/>
+            class, setting the propagation behavior to the supplied value.
+            </summary>
+            <param name="propagationBehavior">
+            The desired transaction propagation behaviour.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.DefaultTransactionAttribute.RollbackOn(System.Exception)">
+            <summary>
+            Decides if rollback is required for the supplied <paramref name="exception"/>.
+            </summary>
+            <remarks>
+            <p>
+            The default behavior is to rollback on any exception.
+            Consistent with <see cref="T:Spring.Transaction.Support.TransactionTemplate"/>'s behavior.
+            </p>
+            </remarks>
+            <param name="exception">The <see cref="T:System.Exception"/> to evaluate.</param>
+            <returns>True if the exception causes a rollback, false otherwise.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.DefaultTransactionAttribute.ToString">
+            <summary> 
+            Return a description of this transaction attribute.
+            </summary>
+            <remarks>
+            <p>
+            The format matches the one used by the
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAttributeEditor"/>,
+            to be able to feed any result into a <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/>
+            instance's properties.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.Support.ParameterUtils">
+            <summary>
+            Miscellaneous utility methods for manipulating parameter objects. 
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ParameterUtils.cs,v 1.12 2007/10/11 04:41:00 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.Support.ParameterUtils.log">
+            <summary>
+            The shared log instance for this class (and derived classes). 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.ParameterUtils.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Support.ParameterUtils"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.ParameterUtils.CopyParameters(System.Data.IDbCommand,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Copies the parameters from IDbParameters to the parameter collection in IDbCommand
+            </summary>
+            <param name="command">The command.</param>
+            <param name="springParamCollection">The spring param collection.</param>
+        </member>
+        <member name="M:Spring.Data.Support.ParameterUtils.CopyParameters(Spring.Data.Common.IDbParameters,System.Data.IDbCommand)">
+            <summary>
+            Copies the parameters in IDbCommand to IDbParameters
+            </summary>
+            <param name="springParamCollection">The spring param collection.</param>
+            <param name="command">The command.</param>
+        </member>
+        <member name="T:Spring.Data.Support.IAdoExceptionTranslator">
+            <summary>
+            Interface to be implemented by classes that can translate between properietary SQL exceptions
+            and Spring.NET's data access strategy-agnostic <see cref="T:Spring.Dao.DataAccessException"/>.
+            </summary>
+            <remarks>
+             <p>
+             Implementations can be generic (for example, ADO.NET Exceptions) or proprietary (for example,
+             using SQL Server or Oracle error codes) for greater precision.
+             </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Mark Pollack</author> 
+            <version>$Id: IAdoExceptionTranslator.cs,v 1.2 2006/11/29 07:18:46 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Support.IAdoExceptionTranslator.Translate(System.String,System.String,System.Exception)">
+            <summary>
+            Translate the given <see cref="T:System.SystemException"/> into a generic data access exception.
+            </summary>
+            <param name="task">A readable string describing the task being attempted.</param>
+            <param name="sql">The SQL query or update that caused the problem. May be null.</param>
+            <param name="exception">
+            The <see cref="T:System.Exception"/> encountered by the ADO.NET implementation.
+            </param>
+            <returns>
+            A <see cref="T:Spring.Dao.DataAccessException"/> appropriate for the supplied
+            <paramref name="exception"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Data.Core.ServiceDomainPlatformTransactionManager">
+            <summary>
+            Transaction Manager that uses EnterpriseServices to access the
+            MS-DTC.  It requires the support of 'Services without Components'
+            functionality which is available on Win 2003 and Win XP SP2.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ServiceDomainPlatformTransactionManager.cs,v 1.6 2007/12/04 19:43:16 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Transaction.Support.AbstractPlatformTransactionManager">
+            <summary>
+            Abstract base class that allows for easy implementation of concrete platform transaction managers.
+            </summary>
+            <remarks>
+            <p>Provides the following workflow handling:
+            <ul>
+            <li>Determines if there is an existing transaction</li>
+            <li>Applies the appropriate propagation behavior</li>
+            <li>Suspends and resumes transactions if necessary</li>
+            <li>Checks the rollback-only flag on commit</li>
+            <li>Applies the appropriate modification on rollback (actual rollback or setting rollback-only)</li>
+            <li>Triggers registered synchronization callbacks (if transaction synchronization is active)</li>
+            </ul>
+            </p>
+            <p>
+            Transaction synchronization is a generic mechanism for registering
+            callbacks that get invoked at transaction completion time. The same mechanism
+            can also be used for custom synchronization efforts.
+            </p>
+            <p>
+            The state of this class is serializable. It's up to subclasses if
+            they wish to make their state to be serializable.
+            They should implement <see cref="T:System.Runtime.Serialization.ISerializable"/> if they need
+            to restore any transient state.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <author>Griffin Caprio (.NET)</author>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction">
+            <summary>
+            Return the current transaction object.
+            </summary>
+            <returns>The current transaction object.</returns>
+            <exception cref="T:Spring.Transaction.CannotCreateTransactionException">
+            If transaction support is not available.
+            </exception>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of lookup or system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.IsExistingTransaction(System.Object)">
+            <summary>
+            Check if the given transaction object indicates an existing transaction
+            (that is, a transaction which has already started).
+            </summary>
+            <remarks>
+            The result will be evaluated according to the specified propagation
+            behavior for the new transaction. An existing transaction might get
+            suspended (in case of PROPAGATION_REQUIRES_NEW), or the new transaction
+            might participate in the existing one (in case of PROPAGATION_REQUIRED).
+            Default implementation returns false, assuming that detection of or
+            participating in existing transactions is generally not supported.
+            Subclasses are of course encouraged to provide such support.</remarks>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <returns>True if there is an existing transaction.</returns>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoBegin(System.Object,Spring.Transaction.ITransactionDefinition)">
+            <summary>
+            Begin a new transaction with the given transaction definition.
+            </summary>
+            <remarks>
+            Does not have to care about applying the propagation behavior,
+            as this has already been handled by this abstract manager.
+            </remarks>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <param name="definition">
+            <see cref="T:Spring.Transaction.ITransactionDefinition"/> instance, describing
+            propagation behavior, isolation level, timeout etc.
+            </param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of creation or system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoSuspend(System.Object)">
+            <summary>
+            Suspend the resources of the current transaction.
+            </summary>
+            <remarks>
+            Transaction synchronization will already have been suspended.
+            <para>
+            Default implementation throws a TransactionSuspensionNotSupportedException,
+            assuming that transaction suspension is generally not supported.
+            </para>
+            </remarks>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <returns>
+            An object that holds suspended resources (will be kept unexamined for passing it into
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoResume(System.Object,System.Object)"/>.)
+            </returns>
+            <exception cref="T:Spring.Transaction.IllegalTransactionStateException">
+            If suspending is not supported by the transaction manager implementation.
+            </exception>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            in case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoResume(System.Object,System.Object)">
+            <summary>
+            Resume the resources of the current transaction.
+            </summary>
+            <remarks>Transaction synchronization will be resumed afterwards.
+            <para>
+            Default implementation throws a TransactionSuspensionNotSupportedException,
+            assuming that transaction suspension is generally not supported.
+            </para>
+            </remarks>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <param name="suspendedResources">
+            The object that holds suspended resources as returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoSuspend(System.Object)"/>.
+            </param>
+            <exception cref="T:Spring.Transaction.IllegalTransactionStateException">
+            If suspending is not supported by the transaction manager implementation.
+            </exception>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoCommit(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Perform an actual commit on the given transaction.
+            </summary>
+            <param name="status">The status representation of the transaction.</param>
+            <remarks>
+            <p>
+            An implementation does not need to check the rollback-only flag.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoRollback(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Perform an actual rollback on the given transaction.
+            </summary>
+            <param name="status">The status representation of the transaction.</param>
+            <remarks>
+            An implementation does not need to check the new transaction flag.
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoSetRollbackOnly(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Set the given transaction rollback-only. Only called on rollback
+            if the current transaction takes part in an existing one.
+            </summary>
+            <remarks>Default implementation throws an IllegalTransactionStateException,
+            assuming that participating in existing transactions is generally not
+            supported. Subclasses are of course encouraged to provide such support.
+            </remarks>
+            <param name="status">The status representation of the transaction.</param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.UseSavepointForNestedTransaction">
+            <summary>
+            Return whether to use a savepoint for a nested transaction. Default is true,
+            which causes delegation to <see cref="T:Spring.Transaction.Support.DefaultTransactionStatus"/>
+            for holding a savepoint.
+            </summary>
+            <returns></returns>
+            <remarks>
+            <p>
+            Subclasses can override this to return false, causing a further
+            invocation of
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoBegin(System.Object,Spring.Transaction.ITransactionDefinition)"/>
+            despite an already existing transaction.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoCleanupAfterCompletion(System.Object)">
+            <summary>
+            Cleanup resources after transaction completion.
+            </summary>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <remarks>
+            <p>
+            Called after <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoCommit(Spring.Transaction.Support.DefaultTransactionStatus)"/>
+            and
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoRollback(Spring.Transaction.Support.DefaultTransactionStatus)"/>
+            execution on any outcome.
+            </p>
+            <p>
+            Should not throw any exceptions but just issue warnings on errors.
+            </p>
+            <p>
+            Default implementation does nothing.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.GetTransaction(Spring.Transaction.ITransactionDefinition)">
+            <summary>
+            Return a currently active transaction or create a new one.
+            </summary>
+            <remarks>
+            <p>
+            This implementation handles propagation behavior.
+            </p>
+            <p>
+            Delegates to
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>,
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.IsExistingTransaction(System.Object)"/>,
+            and
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoBegin(System.Object,Spring.Transaction.ITransactionDefinition)"/>.
+            </p>
+            <p>
+            Note that parameters like isolation level or timeout will only be applied
+            to new transactions, and thus be ignored when participating in active ones.
+            Furthermore, they aren't supported by every transaction manager:
+            a proper implementation should throw an exception when custom values
+            that it doesn't support are specified.
+            </p>
+            </remarks>
+            <param name="definition">
+            <see cref="T:Spring.Transaction.ITransactionDefinition"/> instance (can be null for
+            defaults), describing propagation behavior, isolation level, timeout etc.
+            </param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In case of lookup, creation, or system errors.
+            </exception>
+            <returns>
+            <see cref="T:Spring.Transaction.ITransactionStatus"/> representing the new or current transaction.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.Commit(Spring.Transaction.ITransactionStatus)">
+            <summary>
+            This implementation of commit handles participating in existing transactions
+            and programmatic rollback requests.
+            </summary>
+            <remarks>
+            </remarks>
+            <param name="transactionStatus">
+            ITransactionStatus object returned by the
+            <see cref="M:Spring.Transaction.IPlatformTransactionManager.GetTransaction(Spring.Transaction.ITransactionDefinition)"/>() method.
+            </param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In case of commit or system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.Rollback(Spring.Transaction.ITransactionStatus)">
+            <summary>
+            Roll back the given transaction, with regard to its status.
+            </summary>
+            <remarks>
+            <p>
+            This implementation handles participating in existing transactions.
+            </p>
+            <p>
+            Delegates to
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoRollback(Spring.Transaction.Support.DefaultTransactionStatus)"/>,
+            and
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoSetRollbackOnly(Spring.Transaction.Support.DefaultTransactionStatus)"/>.
+            </p>
+            <p>
+            If the transaction wasn't a new one, just set it rollback-only
+            to take part in the surrounding transaction properly.
+            </p>
+            </remarks>
+            <param name="transactionStatus">
+            ITransactionStatusObject returned by the
+            <see cref="M:Spring.Transaction.IPlatformTransactionManager.GetTransaction(Spring.Transaction.ITransactionDefinition)"/>() method.
+            </param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DetermineTimeout(Spring.Transaction.ITransactionDefinition)">
+            <summary>
+            Determines the timeout to use for the given definition.  Will fall back to this manager's default
+            timeout if the transaction definition doesn't specify a non-default value.
+            </summary>
+            <param name="definition">The transaction definition.</param>
+            <returns>the actual timeout to use.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.Suspend(System.Object)">
+            <summary>
+            Suspend the given transaction. Suspends transaction synchronization first,
+            then delegates to the doSuspend template method.
+            </summary>
+            <param name="transaction">the current transaction object</param>
+            <returns>an object that holds suspended resources</returns>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.Resume(System.Object,System.Object)">
+            <summary>
+            Resume the given transaction. Delegates to the doResume template method
+            first, then resuming transaction synchronization.
+            </summary>
+            <param name="transaction">the current transaction object</param>
+            <param name="suspendedResources"> the object that holds suspended resources, as returned by suspend</param>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoRollbackOnCommitException(Spring.Transaction.Support.DefaultTransactionStatus,System.Exception)">
+            <summary>
+            Invoke doRollback, handling rollback exceptions properly.
+            </summary>
+            <param name="status">object representing the transaction</param>
+            <param name="exception">the thrown application exception or error</param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            in case of a rollback error
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.TriggerBeforeCommit(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Trigger beforeCommit callback.
+            </summary>
+            <param name="status">object representing the transaction</param>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.TriggerBeforeCompletion(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Trigger beforeCompletion callback.
+            </summary>
+            <param name="status">object representing the transaction</param>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.TriggerAfterCompletion(Spring.Transaction.Support.DefaultTransactionStatus,Spring.Transaction.Support.TransactionSynchronizationStatus)">
+            <summary>
+            Trigger afterCompletion callback, handling exceptions properly.
+            </summary>
+            <param name="status">object representing the transaction</param>
+            <param name="completionStatus">
+            Completion status according to <see cref="T:Spring.Transaction.Support.TransactionSynchronizationStatus"/>
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.CleanupAfterCompletion(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Clean up after completion, clearing synchronization if necessary,
+            and invoking doCleanupAfterCompletion.
+            </summary>
+            <param name="status">object representing the transaction</param>
+        </member>
+        <member name="P:Spring.Transaction.Support.AbstractPlatformTransactionManager.TransactionSynchronization">
+            <summary>
+            Sets and gets when this transaction manager should activate the thread-bound
+            transaction synchronization support. Default is "always".
+            </summary>
+            <remarks>
+            <p>
+            Note that transaction synchronization isn't supported for
+            multiple concurrent transactions by different transaction managers.
+            Only one transaction manager is allowed to activate it at any time.
+            </p>
+            <see cref="T:Spring.Transaction.Support.TransactionSynchronizationState"/>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Support.AbstractPlatformTransactionManager.NestedTransactionsAllowed">
+            <summary>
+            Sets and gets whether nested transactions are allowed. Default is false.
+            </summary>
+            <remarks>
+            <p>
+            Typically initialized with an appropriate default by the
+            concrete transaction manager subclass.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Support.AbstractPlatformTransactionManager.RollbackOnCommitFailure">
+            <summary>
+            Sets and gets a flag that determines whether or not the
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoRollback(Spring.Transaction.Support.DefaultTransactionStatus)"/>
+            method must be invoked if a call to the
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoCommit(Spring.Transaction.Support.DefaultTransactionStatus)"/>
+            method fails. Default is false.
+            </summary>
+            <remarks>
+            Typically not necessary and thus to be avoided as it can override the
+            commit exception with a subsequent rollback exception.
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Support.AbstractPlatformTransactionManager.FailEarlyOnGlobalRollbackOnly">
+            <summary>
+            Gets or sets a value indicating whether to fail early in case of the transaction being
+            globally marked as rollback-only.
+            </summary>
+            <remarks>
+             Default is "false", only causing an UnexpectedRollbackException at the
+             outermost transaction boundary. Switch this flag on to cause an
+             UnexpectedRollbackException as early as the global rollback-only marker
+             has been first detected, even from within an inner transaction boundary.
+            </remarks>
+            <value>
+            	<c>true</c> if fail early on global rollback; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Transaction.Support.AbstractPlatformTransactionManager.DefaultTimeout">
+            <summary>
+            Gets or sets the default timeout that this transaction manager should apply if there
+            is no timeout specified at the transaction level, in seconds.
+            </summary>
+            <remarks>Returns DefaultTransactionDefinition.TIMEOUT_DEFAULT to indicate the
+            underlying transaction infrastructure's default timeout.</remarks>
+            <value>The default timeout.</value>
+        </member>
+        <member name="M:Spring.Data.Core.ServiceDomainPlatformTransactionManager.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Core.ServiceDomainPlatformTransactionManager"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Core.ServiceDomainPlatformTransactionManager.#ctor(Spring.Data.Support.IServiceDomainAdapter)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Core.ServiceDomainPlatformTransactionManager"/> class.
+            </summary>
+            <remarks>This is indented only for unit testing purposes and should not be
+            called by production application code.</remarks>
+            <param name="txAdapter">The tx adapter.</param>
+        </member>
+        <member name="P:Spring.Data.Core.ServiceDomainPlatformTransactionManager.TrackingEnabled">
+            <summary>
+            Gets or sets a value indicating whether tracking is enabled.
+            </summary>
+            <value><c>true</c> if tracking is enabled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.Core.ServiceDomainPlatformTransactionManager.TrackingAppName">
+            <summary>
+            Gets or sets a text string that corresponds to the application ID under which tracker information is reported.
+            The default value is 'Spring.NET'
+            </summary>
+            <value>The name of the tracking app.</value>
+        </member>
+        <member name="P:Spring.Data.Core.ServiceDomainPlatformTransactionManager.TrackingComponentName">
+            <summary>
+            Gets or sets a text string that corresponds to the context name under which tracker information is reported. 
+            </summary>
+            <value>The name of the tracking component.</value>
+        </member>
+        <member name="T:Spring.Transaction.Support.ISmartTransactionObject">
+            <summary>
+            Interface to be implemented by transaction objects that are able to
+            return an internal rollback-only marker, typically from a another
+            transaction that has participated and marked it as rollback-only.
+            </summary>
+            <remarks>
+            <p>
+            Autodetected by <see cref="T:Spring.Transaction.Support.DefaultTransactionStatus"/>,
+            to always return a current rollbackOnly flag even if not resulting from the current
+            <see cref="T:Spring.Transaction.ITransactionStatus"/>.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: ISmartTransactionObject.cs,v 1.6 2007/08/29 03:42:20 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Transaction.Support.ISmartTransactionObject.RollbackOnly">
+            <summary>
+            Return whether the transaction is internally marked as rollback-only.
+            </summary>
+            <returns>True of the transaction is marked as rollback-only.</returns>
+        </member>
+        <member name="T:Spring.Dao.TypeMismatchDataAccessException">
+            <summary> 
+            Exception thrown on mismatch between CLS type and database type:
+            for example on an attempt to set an object of the wrong type
+            in an RDBMS column.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: TypeMismatchDataAccessException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Dao.InvalidDataAccessResourceUsageException">
+            <summary> 
+            Root for exceptions thrown when we use a data access resource incorrectly.
+            </summary>
+            <remarks>
+            <p>
+            Thrown for example on specifying bad SQL when using a RDBMS.
+            Resource-specific subclasses will probably be supplied by data access packages.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: InvalidDataAccessResourceUsageException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.InvalidDataAccessResourceUsageException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.InvalidDataAccessResourceUsageException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.InvalidDataAccessResourceUsageException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.InvalidDataAccessResourceUsageException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.InvalidDataAccessResourceUsageException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.InvalidDataAccessResourceUsageException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.InvalidDataAccessResourceUsageException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.InvalidDataAccessResourceUsageException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.TypeMismatchDataAccessException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.TypeMismatchDataAccessException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.TypeMismatchDataAccessException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.TypeMismatchDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.TypeMismatchDataAccessException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.TypeMismatchDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.TypeMismatchDataAccessException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.TypeMismatchDataAccessException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Dao.DataAccessResourceFailureException">
+            <summary> 
+            Data access exception thrown when a resource fails completely:
+            for example, if we can't connect to a database using ADO.NET.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: DataAccessResourceFailureException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.DataAccessResourceFailureException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataAccessResourceFailureException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.DataAccessResourceFailureException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataAccessResourceFailureException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.DataAccessResourceFailureException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataAccessResourceFailureException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.DataAccessResourceFailureException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataAccessResourceFailureException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Dao.CleanupFailureDataAccessException">
+            <summary> 
+            Exception thrown when we couldn't cleanup after a data access operation,
+            but the actual operation went OK.
+            </summary>
+            <remarks>
+            <p>
+            For example, this exception or a subclass might be thrown if an ADO.NET
+            connection couldn't be closed after it had been used successfully.
+            </p>
+            <p>
+            Note that data access code might perform resource cleanup in a
+            finally block and therefore log cleanup failure rather than rethrow it,
+            to keep the original data access exception, if any.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: CleanupFailureDataAccessException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.CleanupFailureDataAccessException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CleanupFailureDataAccessException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.CleanupFailureDataAccessException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CleanupFailureDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.CleanupFailureDataAccessException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CleanupFailureDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.CleanupFailureDataAccessException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CleanupFailureDataAccessException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Dao.CannotSerializeTransactionException">
+            <summary> 
+            Exception thrown on failure to complete a transaction in serialized mode due to
+            update conflicts.
+            </summary>
+            <remarks>
+            <p>
+            This exception will be thrown either by O/R mapping tools or by custom DAO
+            implementations.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: CannotSerializeTransactionException.cs,v 1.6 2008/04/08 20:26:43 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.CannotSerializeTransactionException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CannotSerializeTransactionException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.CannotSerializeTransactionException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CannotSerializeTransactionException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.CannotSerializeTransactionException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CannotSerializeTransactionException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.CannotSerializeTransactionException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CannotSerializeTransactionException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Transaction.Support.TransactionSynchronizationManager">
+            <summary>
+            Internal class that manages resources and transaction synchronizations per thread.
+            </summary>
+            <remarks>
+            Supports one resource per key without overwriting, i.e. a resource needs to
+            be removed before a new one can be set for the same key.
+            Supports a list of transaction synchronizations if synchronization is active.
+            <p>
+            Resource management code should check for thread-bound resources via GetResource().
+            It is normally not supposed
+            to bind resources to threads, as this is the responsiblity of transaction managers.
+            A further option is to lazily bind on first use if transaction synchronization
+            is active, for performing transactions that span an arbitrary number of resources.
+            </p>
+            <p>
+            Transaction synchronization must be activated and deactivated by a transaction
+            manager via
+            <see cref="M:Spring.Transaction.Support.TransactionSynchronizationManager.InitSynchronization">InitSynchronization</see>
+            and
+            <see cref="M:Spring.Transaction.Support.TransactionSynchronizationManager.ClearSynchronization">ClearSynchronization</see>.
+            This is automatically supported by
+            <see cref="T:Spring.Transaction.Support.AbstractPlatformTransactionManager"/>.
+            </p>
+            <p>
+            Resource management code should only register synchronizations when this
+            manager is active, and perform resource cleanup immediately else.
+            If transaction synchronization isn't active, there is either no current
+            transaction, or the transaction manager doesn't support synchronizations.
+            </p>
+            Note that this class uses following naming convention for the 
+            named 'data slots' for storage of thread local data, 'Spring.Transaction:Name'
+            where Name is either 
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: TransactionSynchronizationManager.cs,v 1.19 2008/02/17 13:17:13 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationManager.HasResource(System.Object)">
+            <summary>
+            Check if there is a resource for the given key bound to the current thread.
+            </summary>
+            <param name="key">key to check</param>
+            <returns>if there is a value bound to the current thread</returns>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationManager.GetResource(System.Object)">
+            <summary>
+            Retrieve a resource for the given key that is bound to the current thread.
+            </summary>
+            <param name="key">key to check</param>
+            <returns>a value bound to the current thread, or null if none.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationManager.BindResource(System.Object,System.Object)">
+            <summary>
+            Bind the given resource for teh given key to the current thread
+            </summary>
+            <param name="key">key to bind the value to</param>
+            <param name="value">value to bind</param>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationManager.UnbindResource(System.Object)">
+            <summary>
+            Unbind a resource for the given key from the current thread
+            </summary>
+            <param name="key">key to check</param>
+            <returns>the previously bound value</returns>
+            <exception cref="T:System.InvalidOperationException">if there is no value bound to the thread</exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationManager.InitSynchronization">
+            <summary>
+            Activate transaction synchronization for the current thread.
+            </summary>
+            <remarks>
+            Called by transaction manager at the beginning of a transaction.
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">
+            If synchronization is already active.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationManager.ClearSynchronization">
+            <summary>
+            Deactivate transaction synchronization for the current thread.
+            </summary>
+            <remarks>
+            Called by transaction manager on transaction cleanup.
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">
+            If synchronization is not active.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationManager.Clear">
+            <summary>
+            Clears the entire transaction synchronization state for the current thread, registered
+            synchronizations as well as the various transaction characteristics.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationManager.RegisterSynchronization(Spring.Transaction.Support.ITransactionSynchronization)">
+            <summary>
+            Register a new transaction synchronization for the current thread.
+            </summary>
+            <remarks>
+            Typically called by resource management code.
+            </remarks>
+            <exception cref="T:System.InvalidOperationException">
+            If synchronization is not active.
+            </exception>
+        </member>
+        <member name="P:Spring.Transaction.Support.TransactionSynchronizationManager.ResourceDictionary">
+            <summary>
+            Return all resources that are bound to the current thread.
+            </summary>
+            <remarks>Main for debugging purposes.  Resource manager should always
+            invoke HasResource for a specific resource key that they are interested in.
+            </remarks>
+            <returns>IDictionary with resource keys and resource objects or empty 
+            dictionary if none is bound.</returns>
+        </member>
+        <member name="P:Spring.Transaction.Support.TransactionSynchronizationManager.Synchronizations">
+            <summary>
+            Return an unmodifiable list of all registered synchronizations
+            for the current thread.
+            </summary>
+            <returns>
+            A list of <see cref="T:Spring.Transaction.Support.ITransactionSynchronization"/>
+            instances.
+            </returns>
+            <exception cref="T:System.InvalidOperationException">
+            If synchronization is not active.
+            </exception>
+        </member>
+        <member name="P:Spring.Transaction.Support.TransactionSynchronizationManager.SynchronizationActive">
+            <summary>
+            Return if transaction synchronization is active for the current thread.
+            </summary>
+            <remarks>
+            Can be called before
+            <see cref="M:Spring.Transaction.Support.TransactionSynchronizationManager.RegisterSynchronization(Spring.Transaction.Support.ITransactionSynchronization)">InitSynchronization</see>
+            to avoid unnecessary instance creation.
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Support.TransactionSynchronizationManager.CurrentTransactionReadOnly">
+            <summary>
+            Gets or sets a value indicating whether the 
+            current transaction is read only.
+            </summary>
+            <remarks> 
+            Called by transaction manager on transaction begin and on cleanup.
+            Return whether the current transaction is marked as read-only.
+            To be called by resource management code when preparing a newly
+            created resource (for example, a Hibernate Session).
+            <p>Note that transaction synchronizations receive the read-only flag
+            as argument for the <code>beforeCommit</code> callback, to be able
+            to suppress change detection on commit. The present method is meant
+            to be used for earlier read-only checks, for example to set the
+            flush mode of a Hibernate Session to FlushMode.Never upfront.
+            </p>
+            </remarks>
+            <value>
+            	<c>true</c> if current transaction read only; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Transaction.Support.TransactionSynchronizationManager.CurrentTransactionName">
+            <summary>
+            Gets or sets the name of the current transaction, if any.
+            </summary>
+            <remarks>Called by the transaction manager on transaction begin and on cleanup.
+            To be called by resource management code for optimizations per use case, for
+            example to optimize fetch strategies for specific named transactions.</remarks>
+            <value>The name of the current transactio or null if none set.</value>
+        </member>
+        <member name="P:Spring.Transaction.Support.TransactionSynchronizationManager.ActualTransactionActive">
+            <summary>
+            Gets or sets a value indicating whether there currently is an actual transaction
+            active.
+            </summary>
+            <remarks>This indicates wheter the current thread is associated with an actual
+            transaction rather than just with active transaction synchronization.
+            <para>Called by the transaction manager on transaction begin and on cleanup.</para>
+            <para>To be called by resource management code that wants to discriminate between
+            active transaction synchronization (with or without backing resource transaction;
+            also on PROPAGATION_SUPPORTS) and an actual transaction being active; on 
+            PROPAGATION_REQUIRES, PROPAGATION_REQUIRES_NEW, etC)</para></remarks>
+            <value>
+            	<c>true</c> if [actual transaction active]; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Transaction.Support.TransactionSynchronizationManager.CurrentTransactionIsolationLevel">
+            <summary>
+            Gets or sets the current transaction isolation level, if any.
+            </summary>
+            <remarks>Called by the transaction manager on transaction begin and on cleanup.</remarks>
+            <value>The current transaction isolation level.  If no current transaction is 
+            active, retrun IsolationLevel.Unspecified</value>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.TransactionAttributeConverter">
+            <summary>
+            Type converter for <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> 
+            objects.
+            </summary>
+            <remarks>
+            Takes <see cref="T:System.String"/>s of the form
+            <p><code>PROPAGATION_NAME,ISOLATION_NAME,readOnly,timeout_NNNN,+Exception1,-Exception2</code></p>
+            <p>where only propagation code is required. For example:</p>
+            <p><code>PROPAGATION_MANDATORY,ISOLATION_DEFAULT</code></p>
+            <p>
+            The tokens can be in <strong>any</strong> order. Propagation and isolation codes
+            must use the names of the values in the <see cref="T:Spring.Transaction.TransactionPropagation"/>
+            enumeration. Timeout values are in seconds. If no timeout is specified, the transaction
+            manager will apply a default timeout specific to the particular transaction manager.
+            </p>
+            <p>
+            A "+" before an exception name substring indicates that transactions should commit even
+            if this exception is thrown; a "-" that they should roll back.
+            </p>
+            </remarks>
+            <author>Mark Pollack</author>
+            <version>$Id: TransactionAttributeConverter.cs,v 1.1 2007/12/29 00:28:53 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttributeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Type)">
+            <summary>
+            Returns whether this converter can convert an object of the given type to an ITransactionAttribute, using the specified context.
+            </summary>
+            <param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext"></see> that provides a format context.</param>
+            <param name="sourceType">A <see cref="T:System.Type"></see> that represents the type you want to convert from.</param>
+            <returns>
+            true if this converter can perform the conversion; otherwise, false.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttributeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            Converts from string to ITransactionAttribute
+            </summary>
+            <param name="context">The context.</param>
+            <param name="culture">The culture.</param>
+            <param name="val">The string value to convert</param>
+            <returns>An ITransactionAttribute instance</returns>
+        </member>
+        <member name="T:Spring.Data.Support.DefaultTransactionScopeAdapter">
+            <summary>
+            Uses <see cref="T:System.Transactions.TransactionScope"/> and System.Transactions.Transaction.Current to provide
+            necessary state and operations to TxScopeTransactionManager.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: DefaultTransactionScopeAdapter.cs,v 1.1 2007/11/30 18:38:47 markpollack Exp $</version> 
+        </member>
+        <member name="T:Spring.Data.Support.ITransactionScopeAdapter">
+            <summary>
+            Provides the necessary transactional state and operations for TxScopeTransactionManager to
+            work with TransactionScope and Transaction.Current.
+            </summary>
+            <remarks>Introduced for purposes of unit testing.</remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ITransactionScopeAdapter.cs,v 1.1 2007/11/30 18:38:47 markpollack Exp $</version> 
+        </member>
+        <member name="M:Spring.Data.Support.ITransactionScopeAdapter.CreateTransactionScope(System.Transactions.TransactionScopeOption,System.Transactions.TransactionOptions,System.Transactions.EnterpriseServicesInteropOption)">
+            <summary>
+            Creates the transaction scope.
+            </summary>
+            <param name="txScopeOption">The tx scope option.</param>
+            <param name="txOptions">The tx options.</param>
+            <param name="interopOption">The interop option.</param>
+        </member>
+        <member name="M:Spring.Data.Support.ITransactionScopeAdapter.Complete">
+            <summary>
+            Call Complete() on the TransactionScope object created by this instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.ITransactionScopeAdapter.Dispose">
+            <summary>
+            Call Disponse() on the TransactionScope object created by this instance.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Support.ITransactionScopeAdapter.IsExistingTransaction">
+            <summary>
+            Gets a value indicating whether there is a new transaction or an existing transaction.
+            </summary>
+            <value>
+            	<c>true</c> if this instance is existing transaction; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Data.Support.ITransactionScopeAdapter.RollbackOnly">
+            <summary>
+            Gets a value indicating whether rollback only has been called (i.e. Rollback() on the
+            Transaction object) and therefore voting that the transaction will be aborted.
+            </summary>
+            <value><c>true</c> if rollback only; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="M:Spring.Data.Support.DefaultTransactionScopeAdapter.Complete">
+            <summary>
+            Call Complete() on the TransactionScope object created by this instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.DefaultTransactionScopeAdapter.Dispose">
+            <summary>
+            Call Disponse() on the TransactionScope object created by this instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.DefaultTransactionScopeAdapter.CreateTransactionScope(System.Transactions.TransactionScopeOption,System.Transactions.TransactionOptions,System.Transactions.EnterpriseServicesInteropOption)">
+            <summary>
+            Creates the transaction scope.
+            </summary>
+            <param name="txScopeOption">The tx scope option.</param>
+            <param name="txOptions">The tx options.</param>
+            <param name="interopOption">The interop option.</param>
+        </member>
+        <member name="P:Spring.Data.Support.DefaultTransactionScopeAdapter.IsExistingTransaction">
+            <summary>
+            Gets a value indicating whether there is a new transaction or an existing transaction.
+            </summary>
+            <value>
+            	<c>true</c> if this instance is existing transaction; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Data.Support.DefaultTransactionScopeAdapter.RollbackOnly">
+            <summary>
+            Gets a value indicating whether rollback only has been called (i.e. Rollback() on the
+            Transaction object) and therefore voting that the transaction will be aborted.
+            </summary>
+            <value><c>true</c> if rollback only; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="T:Spring.Data.IResultSetExtractor">
+            <summary>
+            Callback interface to process all result sets and rows in
+            an AdoTemplate query method.
+            </summary>
+            <remarks>Implementations of this interface perform the work
+            of extracting results but don't need worry about managing
+            ADO.NET resources, such as closing the reader or transaction management.
+            <p>
+            This interface is mainly used within the ADO.NET
+            framework.  An IResultSetExtractor is usually a simpler choice
+            for result set (DataReader) processing, in particular a 
+            RowMapperResultSetExtractor in combination with a IRowMapper.
+            </p>
+            <para>Note: in contracts to a IRowCallbackHandler, a ResultSetExtractor
+            is usually stateless and thus reusable, as long as it doesn't access
+            stateful resources or keep result state within the object.
+            </para>
+            </remarks>
+            
+        </member>
+        <member name="M:Spring.Data.IResultSetExtractor.ExtractData(System.Data.IDataReader)">
+            <summary>
+            Implementations must implement this method to process all
+            result set and rows in the IDataReader.
+            </summary>
+            <param name="reader">The IDataReader to extract data from.
+            Implementations should not close this: it will be closed
+            by the AdoTemplate.</param>
+            <returns>An arbitrary result object or null if none.  The
+            extractor will typically be stateful in the latter case.</returns>
+        </member>
+        <member name="T:Spring.Data.IDataReaderWrapper">
+            <summary>
+            Custom data reader implementations often delegate to an underlying
+            instance.  This interface captures that relationship for reuse in
+            the framework.
+            </summary>
+            <remarks>Implementations will typically add behavior to standard IDataReader methods,
+            for example, by providing default values for DbNull values.  
+            See <see cref="T:Spring.Data.Support.NullMappingDataReader"/> as an example.
+             </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IDataReaderWrapper.cs,v 1.2 2007/10/30 15:24:44 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Data.IDataReaderWrapper.WrappedReader">
+            <summary>
+            The underlying reader implementation to delegate to for accessing data 
+            from a returned result sets.
+            </summary>
+            <value>The wrapped reader.</value>
+        </member>
+        <member name="T:Spring.Data.Generic.AdoDaoSupport">
+            <summary>
+            Convenient super class for ADO.NET data access objects using generics.
+            </summary>
+            <remarks>
+            Requires a IDBProvider to be set, providing a
+            AdoTemplate based on it to subclasses.
+            This base class is mainly intended for AdoTemplate usage.
+            </remarks>
+        </member>
+        <member name="T:Spring.Dao.Support.DaoSupport">
+            <summary>
+            Generic base class for DAOs, defining template methods for DAO initialization. 
+            </summary>
+            <remarks>
+            Extended by Spring's specific DAO support classes, such as:
+             AdoDaoSupport, HibernateDaoSupport, etc.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: DaoSupport.cs,v 1.3 2006/11/13 07:04:45 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Dao.Support.DaoSupport.log">
+            <summary>
+            The shared <see cref="T:Common.Logging.ILog"/> instance for this class (and derived classes). 
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.Support.DaoSupport.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Dao.Support.DaoSupport"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.Support.DaoSupport.CheckDaoConfig">
+            <summary>
+            Abstract subclasses must override this to check their configuration.
+            </summary>
+            <remarks>
+            <p>Implementors should be marked as <code>sealed</code>, to make it clear that
+            concrete subclasses are not supposed to override this template method themselves.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Dao.Support.DaoSupport.InitDao">
+            <summary>        
+            Concrete subclasses can override this for custom initialization behavior.
+            </summary>
+            <remarks>
+            Gets called after population of this instance's object properties.
+            Exception thrown if InitDao fails will be rethrown as
+            a ObjectInitializationException.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.Generic.AdoDaoSupport.CreateAdoTemplate(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Create a AdoTemplate for a given DbProvider
+            Only invoked if populating the DAO with a DbProvider reference.
+            </summary>
+            <remarks>
+            Can be overriden in subclasses to provide AdoTemplate instances
+            with a different configuration, or a cusotm AdoTemplate subclass.       
+            </remarks>
+            <param name="dbProvider">The DbProvider to create a AdoTemplate for</param>        
+        </member>
+        <member name="M:Spring.Data.Generic.AdoDaoSupport.CreateDbParametersBuilder">
+            <summary>
+            Convenience method to create a parameters builder.
+            </summary>
+            <remarks>Virtual for sublcasses to override with custom
+            implementation.</remarks>
+            <returns>A new DbParameterBuilder</returns>
+        </member>
+        <member name="P:Spring.Data.Generic.AdoDaoSupport.DbProvider">
+            <summary>
+            The DbProvider instance used by this DAO
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Generic.AdoDaoSupport.AdoTemplate">
+            <summary>
+            Set the AdoTemplate for this DAO explicity, as
+            an alternative to specifying a IDbProvider
+            </summary>
+        </member>
+        <member name="T:Spring.Data.Common.DelegatingDbProvider">
+            <summary>
+            IDbProvider implementation that delegates all calls to a given target
+            IDbProvider
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: DelegatingDbProvider.cs,v 1.1 2008/01/29 22:19:20 markpollack Exp $</version>    
+        </member>
+        <member name="T:Spring.Data.Common.IDbProvider">
+            <summary>
+            Factory interface to create provider specific ADO.NET objects.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Common.IDbProvider.CreateCommand">
+            <summary>
+            Returns a new command object for executing SQL statments/Stored Procedures
+            against the database.
+            </summary>
+            <returns>An new <see cref="T:System.Data.IDbCommand"/></returns>
+        </member>
+        <member name="M:Spring.Data.Common.IDbProvider.CreateCommandBuilder">
+            <summary>
+            Returns a new instance of the providers CommandBuilder class.
+            </summary>
+            <remarks>In .NET 1.1 there was no common base class or interface
+            for command builders, hence the return signature is object to
+            be portable (but more loosely typed) across .NET 1.1/2.0</remarks>
+            <returns>A new Command Builder</returns>
+        </member>
+        <member name="M:Spring.Data.Common.IDbProvider.CreateConnection">
+            <summary>
+            Returns a new connection object to communicate with the database.
+            </summary>
+            <returns>A new <see cref="T:System.Data.IDbConnection"/></returns>
+        </member>
+        <member name="M:Spring.Data.Common.IDbProvider.CreateDataAdapter">
+            <summary>
+            Returns a new adapter objects for use with offline DataSets.
+            </summary>
+            <returns>A new <see cref="T:System.Data.IDbDataAdapter"/></returns>
+        </member>
+        <member name="M:Spring.Data.Common.IDbProvider.CreateParameter">
+            <summary>
+            Returns a new parameter object for binding values to parameter
+            placeholders in SQL statements or Stored Procedure variables.
+            </summary> 
+            <returns>A new <see cref="T:System.Data.IDbDataParameter"/></returns>
+        </member>
+        <member name="M:Spring.Data.Common.IDbProvider.CreateParameterName(System.String)">
+            <summary>
+            Creates the name of the parameter in the format appropriate to use inside IDbCommand.CommandText.
+            </summary>
+            <remarks>In most cases this adds the parameter prefix to the name passed into this method.</remarks>
+            <param name="name">The unformatted name of the parameter.</param>
+            <returns>The parameter name formatted foran IDbCommand.CommandText.</returns>
+        </member>
+        <member name="M:Spring.Data.Common.IDbProvider.CreateParameterNameForCollection(System.String)">
+            <summary>
+            Creates the name ofthe parameter in the format appropriate for an IDataParameter, i.e. to be
+            part of a IDataParameterCollection.
+            </summary>
+            <param name="name">The unformatted name of the parameter.</param>
+            <returns>The parameter name formatted for an IDataParameter</returns>
+        </member>
+        <member name="M:Spring.Data.Common.IDbProvider.ExtractError(System.Exception)">
+            <summary>
+            Extracts the provider specific error code as a string.
+            </summary>
+            <param name="e">The data access exception.</param>
+            <returns>The provider specific error code</returns>
+        </member>
+        <member name="M:Spring.Data.Common.IDbProvider.IsDataAccessException(System.Exception)">
+            <summary>
+            Determines whether the provided exception is in fact related
+            to database access.  This can be provider dependent in .NET 1.1 since
+            there isn't a common base class for ADO.NET exceptions.
+            </summary>
+            <param name="e">The exception thrown when performing data access 
+            operations.</param>
+            <returns>
+            	<c>true</c> if is a valid data access exception for the specified 
+            exception; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="P:Spring.Data.Common.IDbProvider.DbMetadata">
+            <summary>
+            Return metadata information about the database provider
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Common.IDbProvider.ConnectionString">
+            <summary>
+            Connection string used to create connections.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Common.DelegatingDbProvider.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Common.DelegatingDbProvider"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Common.DelegatingDbProvider.#ctor(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Common.DelegatingDbProvider"/> class.
+            </summary>
+            <param name="targetDbProvider">The target db provider.</param>
+        </member>
+        <member name="M:Spring.Data.Common.DelegatingDbProvider.CreateCommand">
+            <summary>
+            Returns a new command object for executing SQL statments/Stored Procedures
+            against the database.
+            </summary>
+            <returns>An new <see cref="T:System.Data.IDbCommand"/></returns>
+        </member>
+        <member name="M:Spring.Data.Common.DelegatingDbProvider.CreateCommandBuilder">
+            <summary>
+            Returns a new instance of the providers CommandBuilder class.
+            </summary>
+            <remarks>In .NET 1.1 there was no common base class or interface
+            for command builders, hence the return signature is object to
+            be portable (but more loosely typed) across .NET 1.1/2.0</remarks>
+            <returns>A new Command Builder</returns>
+        </member>
+        <member name="M:Spring.Data.Common.DelegatingDbProvider.CreateConnection">
+            <summary>
+            Returns a new connection object to communicate with the database.
+            </summary>
+            <returns>A new <see cref="T:System.Data.IDbConnection"/></returns>
+        </member>
+        <member name="M:Spring.Data.Common.DelegatingDbProvider.CreateDataAdapter">
+            <summary>
+            Returns a new adapter objects for use with offline DataSets.
+            </summary>
+            <returns>A new <see cref="T:System.Data.IDbDataAdapter"/></returns>
+        </member>
+        <member name="M:Spring.Data.Common.DelegatingDbProvider.CreateParameter">
+            <summary>
+            Returns a new parameter object for binding values to parameter
+            placeholders in SQL statements or Stored Procedure variables.
+            </summary> 
+            <returns>A new <see cref="T:System.Data.IDbDataParameter"/></returns>
+        </member>
+        <member name="M:Spring.Data.Common.DelegatingDbProvider.CreateParameterName(System.String)">
+            <summary>
+            Creates the name of the parameter in the format appropriate to use inside IDbCommand.CommandText.
+            </summary>
+            <remarks>In most cases this adds the parameter prefix to the name passed into this method.</remarks>
+            <param name="name">The unformatted name of the parameter.</param>
+            <returns>The parameter name formatted foran IDbCommand.CommandText.</returns>
+        </member>
+        <member name="M:Spring.Data.Common.DelegatingDbProvider.CreateParameterNameForCollection(System.String)">
+            <summary>
+            Creates the name ofthe parameter in the format appropriate for an IDataParameter, i.e. to be
+            part of a IDataParameterCollection.
+            </summary>
+            <param name="name">The unformatted name of the parameter.</param>
+            <returns>The parameter name formatted for an IDataParameter</returns>
+        </member>
+        <member name="M:Spring.Data.Common.DelegatingDbProvider.ExtractError(System.Exception)">
+            <summary>
+            Extracts the provider specific error code as a string.
+            </summary>
+            <param name="e">The data access exception.</param>
+            <returns>The provider specific error code</returns>
+        </member>
+        <member name="M:Spring.Data.Common.DelegatingDbProvider.IsDataAccessException(System.Exception)">
+            <summary>
+            Determines whether the provided exception is in fact related
+            to database access.  This can be provider dependent in .NET 1.1 since
+            there isn't a common base class for ADO.NET exceptions.
+            </summary>
+            <param name="e">The exception thrown when performing data access 
+            operations.</param>
+            <returns>
+            	<c>true</c> if is a valid data access exception for the specified 
+            exception; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.Common.DelegatingDbProvider.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has injected all of an object's dependencies.
+            </summary>
+            <remarks>
+            <p>
+            This method allows the object instance to perform the kind of
+            initialization only possible when all of it's dependencies have
+            been injected (set), and to throw an appropriate exception in the
+            event of misconfiguration.
+            </p>
+            <p>
+            Please do consult the class level documentation for the
+            <see cref="T:Spring.Objects.Factory.IObjectFactory"/> interface for a
+            description of exactly <i>when</i> this method is invoked. In
+            particular, it is worth noting that the
+            <see cref="T:Spring.Objects.Factory.IObjectFactoryAware"/>
+            and <see cref="T:Spring.Context.IApplicationContextAware"/>
+            callbacks will have been invoked <i>prior</i> to this method being
+            called.
+            </p>
+            </remarks>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as the failure to set a
+            required property) or if initialization fails.
+            </exception>
+        </member>
+        <member name="P:Spring.Data.Common.DelegatingDbProvider.TargetDbProvider">
+            <summary>
+            Gets or sets the target IDbProvider that this IDbProvider should delegate to
+            </summary>
+            <value>The target db provider.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DelegatingDbProvider.DbMetadata">
+            <summary>
+            Return metadata information about the database provider
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Common.DelegatingDbProvider.ConnectionString">
+            <summary>
+            Connection string used to create connections.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.BadSqlGrammarException">
+            <summary>
+            Exception thrown when SQL specified is invalid.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: BadSqlGrammarException.cs,v 1.3 2006/11/29 07:18:45 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.BadSqlGrammarException.sql">
+            <summary>
+            SQL that led to the problem
+            </summary>
+        </member>
+        <member name="M:Spring.Data.BadSqlGrammarException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.BadSqlGrammarException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.BadSqlGrammarException.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.BadSqlGrammarException"/> class.
+            </summary>
+            <param name="message">A message about the exception.</param>
+        </member>
+        <member name="M:Spring.Data.BadSqlGrammarException.#ctor(System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.BadSqlGrammarException"/> class.
+            </summary>
+            <param name="message">A message about the exception.</param>
+            <param name="inner">The inner exception.</param>
+        </member>
+        <member name="M:Spring.Data.BadSqlGrammarException.#ctor(System.String,System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.BadSqlGrammarException"/> class.
+            </summary>
+            <param name="task">name of the current task.</param>
+            <param name="sql">The offending SQL statment</param>
+            <param name="ex">The root cause.</param>
+        </member>
+        <member name="M:Spring.Data.BadSqlGrammarException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.BadSqlGrammarException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Data.BadSqlGrammarException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            When overridden in a derived class, sets the <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            with information about the exception.
+            </summary>
+            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="info"/> parameter is a null reference (<see langword="Nothing"/> in Visual Basic).</exception>
+        </member>
+        <member name="T:Spring.Dao.OptimisticLockingFailureException">
+            <summary> 
+            Exception thrown on an optimistic locking violation.
+            </summary>
+            <remarks>
+            <p>
+            This exception will be thrown either by O/R mapping tools or by custom DAO
+            implementations.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: OptimisticLockingFailureException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.OptimisticLockingFailureException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.OptimisticLockingFailureException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.OptimisticLockingFailureException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.OptimisticLockingFailureException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.OptimisticLockingFailureException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.OptimisticLockingFailureException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.OptimisticLockingFailureException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.OptimisticLockingFailureException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Transaction.Support.TransactionSynchronizationStatus">
+            <summary>
+            Enumeration of status values when synchronizing transactions.
+            </summary>
+            <author>Griffin Caprio</author>
+            <version>$Id: TransactionSynchronizationStatus.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Transaction.Support.TransactionSynchronizationStatus.Committed">
+            <summary>
+            Completion status in case of proper commit.
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Support.TransactionSynchronizationStatus.Rolledback">
+            <summary>
+            Completion status in case of proper rollback.
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Support.TransactionSynchronizationStatus.Unknown">
+            <summary>
+            Completion status in case of heuristic mixed completion or system error.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.Support.TransactionSynchronizationAdapter">
+            <summary>
+            Adapter for the <see cref="T:Spring.Transaction.Support.ITransactionSynchronization"/>
+            interface.
+            </summary>
+            <remarks>
+            Contains empty implementations of all interface methods, for easy overriding of
+            single methods.
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: TransactionSynchronizationAdapter.cs,v 1.7 2006/12/06 00:02:25 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Transaction.Support.ITransactionSynchronization">
+            <summary>
+            Interface for transaction synchronization callbacks.
+            </summary>
+            <remarks>
+            Supported by <see cref="T:Spring.Transaction.Support.AbstractPlatformTransactionManager"/>.
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ITransactionSynchronization.cs,v 1.7 2006/11/24 05:57:46 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Support.ITransactionSynchronization.Suspend">
+            <summary>
+            Suspend this synchronization. 
+            </summary>
+            <remarks>
+            <p>
+            Supposed to unbind resources from
+            <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>
+            if managing any.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.ITransactionSynchronization.Resume">
+            <summary>
+            Resume this synchronization.
+            </summary>
+            <remarks>
+            <p>
+            Supposed to rebind resources from
+            <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>
+            if managing any.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCommit(System.Boolean)">
+            <summary>
+            Invoked before transaction commit (before
+            <see cref="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCompletion"/>)
+            Can e.g. flush transactional O/R Mapping sessions to the database
+            </summary>
+            <remarks>
+            <para>
+            This callback does not mean that the transaction will actually be
+            commited.  A rollback decision can still occur after this method
+            has been called.  This callback is rather meant to perform work 
+            that's only relevant if a commit still has a chance
+            to happen, such as flushing SQL statements to the database.
+            </para>
+            <para>
+            Note that exceptions will get propagated to the commit caller and cause a
+            rollback of the transaction.</para>
+            <para>
+            (note: do not throw TransactionException subclasses here!)
+            </para>
+            </remarks>
+            <param name="readOnly">
+            If the transaction is defined as a read-only transaction.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.Support.ITransactionSynchronization.AfterCommit">
+            <summary>
+            Invoked after transaction commit.
+            </summary>
+            <remarks>Can e.g. commit further operations that are supposed to follow on
+            a successful commit of the main transaction.
+            Throws exception in case of errors; will be propagated to the caller.
+            Note: To not throw TransactionExeption sbuclasses here!
+            </remarks>
+            
+        </member>
+        <member name="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCompletion">
+            <summary>
+            Invoked before transaction commit/rollback (after
+            <see cref="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCommit(System.Boolean)"/>,
+            even if
+            <see cref="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCommit(System.Boolean)"/>
+            threw an exception).
+            </summary>
+            <remarks>
+            <p>
+            Can e.g. perform resource cleanup.
+            </p>
+            <p>
+            Note that exceptions will get propagated to the commit caller
+            and cause a rollback of the transaction.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.ITransactionSynchronization.AfterCompletion(Spring.Transaction.Support.TransactionSynchronizationStatus)">
+            <summary>
+            Invoked after transaction commit/rollback.
+            </summary>
+            <param name="status">
+            Status according to <see cref="T:Spring.Transaction.Support.TransactionSynchronizationStatus"/>
+            </param>
+            <remarks>
+            Can e.g. perform resource cleanup, in this case after transaction completion.
+            <p>
+            Note that exceptions will get propagated to the commit or rollback
+            caller, although they will not influence the outcome of the transaction.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationAdapter.Suspend">
+            <summary>
+            Suspend this synchronization. 
+            </summary>
+            <remarks>
+            <p>
+            Supposed to unbind resources from
+            <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>
+            if managing any.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationAdapter.Resume">
+            <summary>
+            Resume this synchronization.
+            </summary>
+            <remarks>
+            <p>
+            Supposed to unbind resources from
+            <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>
+            if managing any.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationAdapter.BeforeCommit(System.Boolean)">
+            <summary>
+            Invoked before transaction commit (before
+            <see cref="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCompletion"/>)
+            </summary>
+            <param name="readOnly">
+            If the transaction is defined as a read-only transaction.
+            </param>
+            <remarks>
+            <p>
+            Can flush transactional sessions to the database.
+            </p>
+            <p>
+            Note that exceptions will get propagated to the commit caller and 
+            cause a rollback of the transaction.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationAdapter.AfterCommit">
+            <summary>
+            Invoked after transaction commit.
+            </summary>
+            <remarks>Can e.g. commit further operations that are supposed to follow on
+            a successful commit of the main transaction.
+            Throws exception in case of errors; will be propagated to the caller.
+            Note: To not throw TransactionExeption sbuclasses here!
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationAdapter.BeforeCompletion">
+            <summary>
+            Invoked before transaction commit/rollback (after
+            <see cref="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCommit(System.Boolean)"/>,
+            even if
+            <see cref="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCommit(System.Boolean)"/>
+            threw an exception).
+            </summary>
+            <remarks>
+            <p>
+            Can e.g. perform resource cleanup.
+            </p>
+            <p>
+            Note that exceptions will get propagated to the commit caller
+            and cause a rollback of the transaction.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationAdapter.AfterCompletion(Spring.Transaction.Support.TransactionSynchronizationStatus)">
+            <summary>
+            Invoked after transaction commit/rollback.
+            </summary>
+            <param name="status">
+            Status according to <see cref="T:Spring.Transaction.Support.TransactionSynchronizationStatus"/>
+            </param>
+            <remarks>
+            Can e.g. perform resource cleanup, in this case after transaction completion.
+            <p>
+            Note that exceptions will get propagated to the commit or rollback
+            caller, although they will not influence the outcome of the transaction.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionSynchronizationAdapter.CompareTo(System.Object)">
+            <summary>
+            Compares the current instance with another object of the same type.
+            </summary>
+            
+            <returns>
+            A 32-bit signed integer that indicates the relative order of the objects being compared. The return value has these meanings: Value Meaning Less than zero This instance is less than obj. Zero This instance is equal to obj. Greater than zero This instance is greater than obj. 
+            </returns>
+            
+            <param name="obj">An object to compare with this instance. </param>
+            <exception cref="T:System.ArgumentException">obj is not the same type as this instance. </exception><filterpriority>2</filterpriority>
+        </member>
+        <member name="T:Spring.Transaction.InvalidIsolationLevelException">
+            <summary>
+            Exception that gets thrown when an invalid isolation level is specified,
+            i.e. an isolation level that the transaction manager implementation
+            doesn't support.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: InvalidIsolationLevelException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Transaction.TransactionUsageException">
+            <summary> 
+            Superclass for exceptions caused by inappropriate usage of 
+            a <a href="http://www.springframework.net/">Spring.NET</a> transaction API.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: TransactionUsageException.cs,v 1.6 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Transaction.TransactionException">
+            <summary>
+            Base class for all transaction exceptions.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: TransactionException.cs,v 1.7 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.TransactionException.#ctor">
+            <summary>
+            Creates a new instance of the TransactionException class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.TransactionException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the TransactionException class, with the specified message.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.TransactionException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the TransactionException class with the specified message
+            and root cause.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.TransactionException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the TransactionException class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.TransactionUsageException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionUsageException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.TransactionUsageException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionUsageException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.TransactionUsageException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionUsageException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.TransactionUsageException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionUsageException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.InvalidIsolationLevelException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.InvalidIsolationLevelException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.InvalidIsolationLevelException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.InvalidIsolationLevelException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.InvalidIsolationLevelException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.InvalidIsolationLevelException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.InvalidIsolationLevelException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.InvalidIsolationLevelException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.TransactionAttributeEditor">
+            <summary>
+            Type converter for <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> 
+            objects.
+            </summary>
+            <remarks>
+            Takes <see cref="T:System.String"/>s of the form
+            <p><code>PROPAGATION_NAME,ISOLATION_NAME,readOnly,timeout_NNNN,+Exception1,-Exception2</code></p>
+            <p>where only propagation code is required. For example:</p>
+            <p><code>PROPAGATION_MANDATORY,ISOLATION_DEFAULT</code></p>
+            <p>
+            The tokens can be in <strong>any</strong> order. Propagation and isolation codes
+            must use the names of the values in the <see cref="T:Spring.Transaction.TransactionPropagation"/>
+            enumeration. Timeout values are in seconds. If no timeout is specified, the transaction
+            manager will apply a default timeout specific to the particular transaction manager.
+            </p>
+            <p>
+            A "+" before an exception name substring indicates that transactions should commit even
+            if this exception is thrown; a "-" that they should roll back.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: TransactionAttributeEditor.cs,v 1.7 2007/12/07 07:30:48 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttributeEditor.SetAsText(System.String)">
+            <summary>
+            Parses the input properties string into a valid <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/>
+            instance
+            </summary>
+            <param name="transactionProperties">
+            The string defining the transactional properties.
+            </param>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAttributeEditor.Value">
+            <summary>
+            Gets the <see cref="T:Spring.Transaction.Interceptor.RuleBasedTransactionAttribute"/>
+            from this editor.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.Support.ConnectionUtils">
+            <summary>
+            Summary description for DbProviderUtils.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionUtils.DisposeConnection(System.Data.IDbConnection,Spring.Data.Common.IDbProvider)">
+            <summary>
+            Dispose of the given Connection, created via the given IDbProvider,
+            if it is not managed externally (that is, not bound to the thread).
+            </summary>
+            <param name="conn">The connection to close if necessary.  If
+            this is null the call will be ignored. </param>
+            <param name="dbProvider">The IDbProvider the connection came from</param>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionUtils.GetConnectionTxPair(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Get a ADO.NET Connection/Transaction Pair for the given IDbProvider.
+            Changes any exception into the Spring hierarchy of generic data access 
+            exceptions, simplifying calling code and making any exception that is 
+            thrown more meaningful.
+            </summary>
+            <remarks>
+            Is aware of a corresponding Connection/Transaction bound to the current thread, for example
+            when using AdoPlatformTransactionManager. Will bind a IDbConnection to the thread
+            if transaction synchronization is active
+            </remarks>
+            <param name="provider">The provider.</param>
+            <returns>A Connection/Transaction pair.</returns>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionUtils.DoGetConnection(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Get a ADO.NET Connection/Transaction Pair for the given IDbProvider.
+            Same as <see cref="M:Spring.Data.Support.ConnectionUtils.GetConnection(Spring.Data.Common.IDbProvider)"/> but throwing original provider
+            exception.
+            </summary>
+            <remarks>
+            Is aware of a corresponding Connection/Transaction bound to the current thread, for example
+            when using AdoPlatformTransactionManager. Will bind a IDbConnection to the thread
+            if transaction synchronization is active
+            </remarks>
+            <param name="provider">The provider.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionUtils.GetConnection(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Do the connection mgmt.
+            </summary>
+            <param name="provider"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionUtils.ApplyTransactionTimeout(System.Data.IDbCommand,Spring.Data.Common.IDbProvider)">
+            <summary>
+            Applies the current transaction timeout, if any, to the given ADO.NET IDbCommand object.
+            </summary>
+            <param name="command">The command.</param>
+            <param name="dbProvider">The db provider.</param>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionUtils.ApplyTransactionTimeout(System.Data.IDbCommand,Spring.Data.Common.IDbProvider,System.Int32)">
+            <summary>
+            Applies the specified timeout - overridden by the current transaction timeout, if any, to to the
+            given ADO.NET IDb command object.
+            </summary>
+            <param name="command">The command.</param>
+            <param name="dbProvider">The db provider the command was obtained from.</param>
+            <param name="timeout">The timeout to apply (or 0 for no timeout outside of a transaction.</param>
+        </member>
+        <member name="T:Spring.Data.Objects.AdoQuery">
+            <summary>
+            Place together the mapping logic to a plain .NET object
+            for one result set within the same class.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AdoQuery.cs,v 1.7 2007/07/25 08:25:20 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.Objects.AdoOperation">
+            <summary>
+            A "AdoOperation" is a thread-safe, reusable object representing 
+            an ADO Query, "NonQuery" (Create, Update, Delete), stored procedure
+            or DataSet manipualtions.
+            </summary>
+            <remarks>
+            Subclasses should set Command Text and add parameters before invoking
+            Compile().  The order in which parameters are added is generally
+            significant when using providers or functionality that do not use
+            named parameters.
+            
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AdoOperation.cs,v 1.14 2007/12/07 08:09:52 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.Objects.AbstractAdoOperation">
+            <summary>
+            Abstract base class providing common functionality for generic and non
+            generic implementations of "AdoOperation" subclasses.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AbstractAdoOperation.cs,v 1.1 2007/07/24 21:01:11 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.Objects.AbstractAdoOperation.compiled">
+            <summary>
+            Has this operation been compiled?  Compilation means at 
+            least checking that a IDbProvider and sql have been provided,
+            but subclasses may also implement their own custom validation.
+            </summary>
+        </member>
+        <member name="F:Spring.Data.Objects.AbstractAdoOperation.commandFactory">
+            <summary>
+            Object enabling us to create IDbCommands
+            efficiently, based on this class's declared parameters.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Objects.AbstractAdoOperation.AfterPropertiesSet">
+            <summary>
+            Ensures compilation if used in an IApplicationContext
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Objects.AbstractAdoOperation.Compile">
+            <summary>
+            Compiles this operation.  Ignores subsequent attempts to compile.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Objects.AbstractAdoOperation.CheckCompiled">
+            <summary>
+            Check whether this operation has been compiled already;
+            lazily compile it if not already compiled.
+            </summary>
+            <remarks>Automatically called by ValidateParameters and ValidateNamedParameters</remarks>
+        </member>
+        <member name="M:Spring.Data.Objects.AbstractAdoOperation.ValidateNamedParameters(System.Collections.IDictionary)">
+            <summary>
+            Validates the named parameters passed to an AdoTemplate ExecuteXXX method based on
+            declared parameters.
+            </summary>
+            <remarks>
+            Subclasses should invoke this method very every ExecuteXXX method.
+            </remarks>
+            <param name="parameters">The parameter dictionary supplied.  May by null.</param>
+        </member>
+        <member name="M:Spring.Data.Objects.AbstractAdoOperation.CompileInternal">
+            <summary>
+            Subclasses must implement to perform their own compilation.
+            Invoked after this class's compilation is complete.
+            Subclasses can assume that SQL has been supplied and that
+            a IDbProvider has been supplied.
+            </summary>                                                                                                
+        </member>
+        <member name="M:Spring.Data.Objects.AbstractAdoOperation.OnCompileInternal">
+            <summary>
+            Hook method that subclasses may override to react to compilation.
+            This implementation does nothing.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Objects.AbstractAdoOperation.CommandType">
+            <summary>
+            Gets or sets the type of the command.
+            </summary>
+            <value>The type of the command.</value>
+        </member>
+        <member name="P:Spring.Data.Objects.AbstractAdoOperation.DbProvider">
+            <summary>
+            Gets or sets the db provider.
+            </summary>
+            <value>The db provider.</value>
+        </member>
+        <member name="P:Spring.Data.Objects.AbstractAdoOperation.Sql">
+            <summary>
+            Gets or sets the SQL to execute
+            </summary>
+            <value>The SQL.</value>
+        </member>
+        <member name="P:Spring.Data.Objects.AbstractAdoOperation.DeclaredParameters">
+            <summary>
+            Gets or sets the declared parameters.
+            </summary>
+            <value>The declared parameters.</value>
+        </member>
+        <member name="P:Spring.Data.Objects.AbstractAdoOperation.Compiled">
+            <summary>
+            Gets a value indicating whether this <see cref="T:Spring.Data.Objects.AdoOperation"/> is compiled.
+            </summary>
+            <remarks>Compilation means that the operation is fully configured,
+             and ready to use.  The exact meaning of compilation will vary between subclasses.</remarks>
+            <value><c>true</c> if compiled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.Objects.AbstractAdoOperation.CommandTimeout">
+            <summary>
+            Sets the command timeout for IDbCommands that this AdoTemplate executes.
+            </summary>
+            <remarks>Default is 0, indicating to use the database provider's default.
+            Any timeout specified here will be overridden by the remaining 
+            transaction timeout when executing within a transaction that has a
+            timeout specified at the transaction level. 
+            </remarks>
+            <value>The command timeout.</value>
+        </member>
+        <member name="M:Spring.Data.Objects.AdoOperation.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.AdoOperation"/> class.
+            </summary>
+            <remarks>A DbProvider, SQL and any parameters must be supplied
+            before invoking the compile method and using this object.       
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.Objects.AdoOperation.#ctor(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.AdoOperation"/> class.
+            </summary>
+            <remarks>A DbProvider, SQL and any parameters must be supplied
+            before invoking the compile method and using this object.       
+            </remarks>
+            <param name="provider">Database provider to use.</param>
+        </member>
+        <member name="M:Spring.Data.Objects.AdoOperation.#ctor(Spring.Data.Common.IDbProvider,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.AdoOperation"/> class.
+            </summary>
+            <remarks>A DbProvider, SQL and any parameters must be supplied
+            before invoking the compile method and using this object.       
+            </remarks>
+            <param name="provider">Database provider to use.</param>
+            <param name="sql">SQL query or stored procedure name.</param>
+        </member>
+        <member name="M:Spring.Data.Objects.AdoOperation.Compile">
+            <summary>
+            Compiles this operation.  Ignores subsequent attempts to compile.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Objects.AdoOperation.AdoTemplate">
+            <summary>
+            Gets or sets the ADO template.
+            </summary>
+            <value>The ADO template.</value>
+        </member>
+        <member name="P:Spring.Data.Objects.AdoOperation.DbProvider">
+            <summary>
+            Gets or sets the db provider.
+            </summary>
+            <value>The db provider.</value>
+        </member>
+        <member name="P:Spring.Data.Objects.AdoOperation.CommandTimeout">
+            <summary>
+            Sets the command timeout for IDbCommands that this AdoTemplate executes.
+            </summary>
+            <remarks>Default is 0, indicating to use the database provider's default.
+            Any timeout specified here will be overridden by the remaining 
+            transaction timeout when executing within a transaction that has a
+            timeout specified at the transaction level. 
+            </remarks>
+            <value>The command timeout.</value>
+        </member>
+        <member name="M:Spring.Data.Objects.AdoQuery.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.AdoQuery"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.Generic.CommandDelegate`1">
+            <summary>
+            Generic callback delegate for code that operates on a DbCommand. 
+            </summary>
+            <remarks>
+            <p>Allows you to execute any number of operations
+            on a single DbCommand, for example a single ExecuteScalar
+            call or repeated execute calls with varying parameters.
+            </p>
+            <p>Used internally by AdoTemplate, but also useful for 
+            application code.  Note that the passed in DbCommand
+            has been created by the framework and will have its
+            Connection property set and the Transaction property
+            set based on the transaction context.</p>
+            </remarks>
+            <typeparam name="T">The return type from executing the
+            callback</typeparam>
+            <param name="command">The ADO.NET DbCommand object</param>
+            <returns>The object returned from processing with the
+            provided DbCommand </returns>
+            <author>Mark Pollack</author>
+        </member>
+        <member name="T:Spring.Data.Generic.IDataAdapterCallback`1">
+            <summary>
+            Generic callback interface for code that operates on a 
+            IDbDataAdapter. 
+            </summary>
+            <remarks>
+            <p>Allows you to execute any number of operations
+            on a IDbDataAdapter, for example to Fill a DataSet
+            or other more advanced operations such as the transfering
+            data between two different DataSets.
+            </p>
+            <p>Note that the passed in IDbDataAdapter
+            has been created by the framework and its SelectCommand
+            will be populated with values for CommandType and Text properties
+            along with Connection/Transaction properties based on the
+            calling transaction context.
+             </p>
+            <see cref="T:Spring.Data.Generic.AdoTemplate"/> Execute(IDataAdapterCallback dataAdapterCallback)
+            method.
+            </remarks>    
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IDataAdapterCallback.cs,v 1.1 2007/12/04 06:48:21 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Generic.IDataAdapterCallback`1.DoInDataAdapter(System.Data.IDbDataAdapter)">
+            <summary>
+            Called by AdoTemplate.Execute with an preconfigured
+            ADO.NET IDbDataAdapter instance with its SelectCommand
+            property populated with CommandType and Text values
+            along with Connection/Transaction properties based on the
+            calling transaction context.
+            </summary>
+            <param name="dataAdapter">An active IDbDataAdapter instance</param>
+            <returns>The result object</returns>
+        </member>
+        <member name="T:Spring.Data.Core.AdoPlatformTransactionManager">
+            <summary>
+            ADO.NET based implementation of the <see cref="T:Spring.Transaction.IPlatformTransactionManager"/>
+            interface.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AdoPlatformTransactionManager.cs,v 1.7 2007/11/30 18:42:11 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Core.AdoPlatformTransactionManager.DoGetTransaction">
+            <summary>
+            Return the current transaction object.
+            </summary>
+            <returns>The current transaction object.</returns>
+            <exception cref="T:Spring.Transaction.CannotCreateTransactionException">
+            If transaction support is not available.
+            </exception>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of lookup or system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoPlatformTransactionManager.IsExistingTransaction(System.Object)">
+            <summary>
+            Check if the given transaction object indicates an existing,
+            i.e. already begun, transaction.
+            </summary>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <returns>True if there is an existing transaction.</returns>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoPlatformTransactionManager.DoBegin(System.Object,Spring.Transaction.ITransactionDefinition)">
+            <summary>
+            Begin a new transaction with the given transaction definition.
+            </summary>
+            <param name="transaction">
+            Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+            </param>
+            <param name="definition">
+            <see cref="T:Spring.Transaction.ITransactionDefinition"/> instance, describing
+            propagation behavior, isolation level, timeout etc.
+            </param>
+            <remarks>
+            Does not have to care about applying the propagation behavior,
+            as this has already been handled by this abstract manager.
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of creation or system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoPlatformTransactionManager.DoSuspend(System.Object)">
+            <summary>
+            Suspend the resources of the current transaction.
+            </summary>
+            <param name="transaction">Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.</param>
+            <returns>
+            An object that holds suspended resources (will be kept unexamined for passing it into
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoResume(System.Object,System.Object)"/>.)
+            </returns>
+            <remarks>
+            Transaction synchronization will already have been suspended.
+            </remarks>
+            <exception cref="T:Spring.Transaction.IllegalTransactionStateException">
+            If suspending is not supported by the transaction manager implementation.
+            </exception>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            in case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoPlatformTransactionManager.DoResume(System.Object,System.Object)">
+            <summary>
+            Resume the resources of the current transaction.
+            </summary>
+            <param name="transaction">Transaction object returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.</param>
+            <param name="suspendedResources">The object that holds suspended resources as returned by
+            <see cref="M:Spring.Transaction.Support.AbstractPlatformTransactionManager.DoSuspend(System.Object)"/>.</param>
+            <remarks>
+            Transaction synchronization will be resumed afterwards.
+            </remarks>
+            <exception cref="T:Spring.Transaction.IllegalTransactionStateException">
+            If suspending is not supported by the transaction manager implementation.
+            </exception>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoPlatformTransactionManager.DoCommit(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Perform an actual commit on the given transaction.
+            </summary>
+            <param name="status">The status representation of the transaction.</param>
+            <remarks>
+            <p>
+            An implementation does not need to check the rollback-only flag.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoPlatformTransactionManager.DoRollback(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Perform an actual rollback on the given transaction.
+            </summary>
+            <param name="status">The status representation of the transaction.</param>
+            <remarks>
+            An implementation does not need to check the new transaction flag.
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoPlatformTransactionManager.DoSetRollbackOnly(Spring.Transaction.Support.DefaultTransactionStatus)">
+            <summary>
+            Set the given transaction rollback-only. Only called on rollback
+            if the current transaction takes part in an existing one.
+            </summary>
+            <param name="status">The status representation of the transaction.</param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            In the case of system errors.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoPlatformTransactionManager.AfterPropertiesSet">
+            <summary>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has injected all of an object's dependencies.
+            </summary>
+            <exception cref="T:System.ArgumentException">
+            If DbProvider is null.
+            </exception>
+        </member>
+        <member name="T:Spring.Data.Core.AdoPlatformTransactionManager.DbProviderTransactionObject">
+            <summary>
+            DbProvider transaction (state) object, representing a ConnectionHolder.
+            Used as a transaction object by AdoPlatformTransactionManager
+            </summary>
+            <remarks>Derives from AdoTransactionObjectSupport to inherit the capability
+            to manage Savepoints.
+            </remarks>
+            <seealso cref="T:Spring.Data.Support.ConnectionHolder"/>
+        </member>
+        <member name="T:Spring.Data.Support.AdoTransactionObjectSupport">
+            <summary>
+            Convenient base class for ADO.NET transaction aware objects.
+            </summary>
+            <remarks>
+            Can contain a ConnectionHolder object.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AdoTransactionObjectSupport.cs,v 1.7 2007/11/28 05:54:47 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.Support.AdoTransactionObjectSupport.log">
+            <summary>
+            The shared log instance for this class (and derived classes). 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.AdoTransactionObjectSupport.CreateSavepoint(System.String)">
+            <summary>
+            Create a new savepoint.
+            </summary>
+            <param name="savepointName">
+            The name of the savepoint to create.
+            </param>
+            <remarks>
+            You can roll back to a specific savepoint
+            via <see cref="M:Spring.Transaction.ISavepointManager.RollbackToSavepoint(System.String)"/>,
+            and explicitly release a savepoint that you don't need anymore via
+            <see cref="M:Spring.Transaction.ISavepointManager.ReleaseSavepoint(System.String)"/>.
+            <p>
+            Note that most transaction managers will automatically release
+            savepoints at transaction completion.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            If the savepoint could not be created,
+            either because the backend does not support it or because the
+            transaction is not in an appropriate state.
+            </exception>
+            <returns>
+            A savepoint object, to be passed into
+            <see cref="M:Spring.Transaction.ISavepointManager.RollbackToSavepoint(System.String)"/>
+            or <see cref="M:Spring.Transaction.ISavepointManager.ReleaseSavepoint(System.String)"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.Support.AdoTransactionObjectSupport.RollbackToSavepoint(System.String)">
+            <summary>
+            Roll back to the given savepoint.
+            </summary>
+            <remarks>
+            The savepoint will be automatically released afterwards.
+            </remarks>
+            <param name="savepoint">The savepoint to roll back to.</param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            If the rollback failed.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Support.AdoTransactionObjectSupport.ReleaseSavepoint(System.String)">
+            <summary>
+            Explicitly release the given savepoint.
+            </summary>
+            <remarks>
+            <p>
+            Note that most transaction managers will automatically release
+            savepoints at transaction completion.
+            </p>
+            <p>
+            Implementations should fail as silently as possible if
+            proper resource cleanup will still happen at transaction completion.
+            </p>
+            </remarks>
+            <param name="savepoint">The savepoint to release.</param>
+            <exception cref="T:Spring.Transaction.TransactionException">
+            If the release failed.
+            </exception>
+        </member>
+        <member name="P:Spring.Data.Support.AdoTransactionObjectSupport.RollbackOnly">
+            <summary>
+            Return whether the transaction is internally marked as rollback-only.
+            </summary>
+            <value></value>
+            <returns>True of the transaction is marked as rollback-only.</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoPlatformTransactionManager.DbProviderTransactionObject.SetRollbackOnly">
+            <summary>
+            Sets the rollback only.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Core.AdoPlatformTransactionManager.DbProviderTransactionObject.RollbackOnly">
+            <summary>
+            Return whether the transaction is internally marked as rollback-only.
+            </summary>
+            <value></value>
+            <returns>True of the transaction is marked as rollback-only.</returns>
+        </member>
+        <member name="T:Spring.Dao.Support.Generic.DataAccessUtils">
+            <summary>
+            Miscellaneous utility methods for DAO implementations.
+            Useful with any data access technology.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: DataAccessUtils.cs,v 1.1 2006/12/02 20:50:21 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.Support.Generic.DataAccessUtils.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Dao.Support.Generic.DataAccessUtils"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.InvalidTimeoutException">
+            <summary> 
+            Exception that gets thrown when an invalid timeout is specified,
+            for example when the transaction manager implementation doesn't support timeouts.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: InvalidTimeoutException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Transaction.InvalidTimeoutException._timeout">
+            <summary>
+            Invalid timeout value.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.InvalidTimeoutException.#ctor(System.String,System.Int32)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.InvalidTimeoutException"/> class
+            with the specified message and timeout value.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="timeout">The (possibly invalid) timeout value.</param>
+        </member>
+        <member name="M:Spring.Transaction.InvalidTimeoutException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.InvalidTimeoutException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.InvalidTimeoutException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.InvalidTimeoutException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.InvalidTimeoutException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.InvalidTimeoutException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.InvalidTimeoutException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.InvalidTimeoutException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.InvalidTimeoutException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Override of <see cref="M:System.Exception.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)"/>
+            to allow for private serialization.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="P:Spring.Transaction.InvalidTimeoutException.Timeout">
+            <summary>
+            Returns the invalid timeout for this exception.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.DelegatingTransactionAttributeWithName">
+            <summary>
+            ITransactionAttribute that delegates all calls to a give target attribute except for the
+            name, which is specified in the constructor.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.DelegatingTransactionAttributeWithName.#ctor(Spring.Transaction.Interceptor.ITransactionAttribute,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Transaction.Interceptor.DelegatingTransactionAttributeWithName"/> class.
+            </summary>
+            <param name="targetAttribute">The target attribute.</param>
+            <param name="identification">The identification.</param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.DelegatingTransactionAttributeWithName.RollbackOn(System.Exception)">
+            <summary>
+            Decides if rollback is required for the supplied <paramref name="exception"/>.
+            </summary>
+            <param name="exception">The <see cref="T:System.Exception"/> to evaluate.</param>
+            <returns>
+            True if the exception causes a rollback, false otherwise.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.DelegatingTransactionAttributeWithName.ToString">
+            <summary> 
+            Return a description of this transaction attribute.
+            </summary>
+            <remarks>
+            <p>
+            The format matches the one used by the
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAttributeEditor"/>,
+            to be able to feed any result into a <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/>
+            instance's properties.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.DelegatingTransactionAttributeWithName.PropagationBehavior">
+            <summary>
+            Return the propagation behavior of type
+            <see cref="T:Spring.Transaction.TransactionPropagation"/>.
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.DelegatingTransactionAttributeWithName.TransactionIsolationLevel">
+            <summary>
+            Return the isolation level of type <see cref="T:System.Data.IsolationLevel"/>.
+            </summary>
+            <value></value>
+            <remarks>
+            	<p>
+            Only makes sense in combination with
+            <see cref="F:Spring.Transaction.TransactionPropagation.Required"/> and
+            <see cref="F:Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+            </p>
+            	<p>
+            Note that a transaction manager that does not support custom isolation levels
+            will throw an exception when given any other level than
+            <see cref="F:System.Data.IsolationLevel.Unspecified"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.DelegatingTransactionAttributeWithName.TransactionTimeout">
+            <summary>
+            Return the transaction timeout.
+            </summary>
+            <value></value>
+            <remarks>
+            	<p>
+            Must return a number of seconds, or -1.
+            Only makes sense in combination with
+            <see cref="F:Spring.Transaction.TransactionPropagation.Required"/> and
+            <see cref="F:Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+            Note that a transaction manager that does not support timeouts will
+            throw an exception when given any other timeout than -1.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.DelegatingTransactionAttributeWithName.ReadOnly">
+            <summary>
+            Get whether to optimize as read-only transaction.
+            </summary>
+            <value></value>
+            <remarks>
+            	<p>
+            This just serves as hint for the actual transaction subsystem,
+            it will <i>not necessarily</i> cause failure of write accesses.
+            </p>
+            	<p>
+            Only makes sense in combination with
+            <see cref="F:Spring.Transaction.TransactionPropagation.Required"/> and
+            <see cref="F:Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+            </p>
+            	<p>
+            A transaction manager that cannot interpret the read-only hint
+            will <i>not</i> throw an exception when given <c>ReadOnly=true</c>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.DelegatingTransactionAttributeWithName.Name">
+            <summary>
+            Return the name of this transaction.
+            </summary>
+            <value></value>
+            <remarks>
+            The exposed name will be the fully
+            qualified type name + "." method name + assembly (by default).
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.DelegatingTransactionAttributeWithName.EnterpriseServicesInteropOption">
+            <summary>
+            Gets the enterprise services interop option.
+            </summary>
+            <value>The enterprise services interop option.</value>
+        </member>
+        <member name="T:Spring.Transaction.Config.AttributeDrivenObjectDefinitionParser">
+            <summary>
+            IObjectDefinitionParser implementation that allows users to easily configure all the
+            infrastructure objects required to enable attribute-driven transction demarcation.
+            </summary>
+            <author>Rob Harrop</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+        </member>
+        <member name="F:Spring.Transaction.Config.AttributeDrivenObjectDefinitionParser.TRANSACTION_INTERCEPTOR">
+            <summary>
+            Object property name for injection the TransactionInterceptor
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Config.AttributeDrivenObjectDefinitionParser.PROXY_TARGET_TYPE">
+            <summary>
+            The '<code>proxy-target-type</code>' attribute
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Config.AttributeDrivenObjectDefinitionParser.ORDER">
+            <summary>
+            The '<code>order</code>' property/attribute
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Config.AttributeDrivenObjectDefinitionParser.ParseInternal(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Central template method to actually parse the supplied XmlElement
+            into one or more IObjectDefinitions.
+            </summary>
+            <param name="element">The element that is to be parsed into one or more <see cref="T:Spring.Objects.Factory.Config.IObjectDefinition"/>s</param>
+            <param name="parserContext">The the object encapsulating the current state of the parsing process;
+            provides access to a <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionRegistry"/></param>
+            <returns>
+            The primary IObjectDefinition resulting from the parsing of the supplied XmlElement
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Config.AttributeDrivenObjectDefinitionParser.ConfigureAutoProxyCreator(Spring.Objects.Factory.Xml.ParserContext,System.Xml.XmlElement)">
+            <summary>
+            Configures the auto proxy creator.
+            </summary>
+            <param name="parserContext">The parser context.</param>
+            <param name="element">The element.</param>
+        </member>
+        <member name="P:Spring.Transaction.Config.AttributeDrivenObjectDefinitionParser.ShouldGenerateId">
+            <summary>
+            Gets a value indicating whether an ID should be generated instead of read
+            from the passed in XmlElement.
+            </summary>
+            <value><c>true</c> if should generate id; otherwise, <c>false</c>.</value>
+            <remarks>Note that this flag is about always generating an ID; the parser
+            won't even check for an "id" attribute in this case.
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.Support.SimpleServiceConfig">
+            <summary>
+            A class that contains the properties of ServiceConfig used by ServiceDomainPlatformTransactionManager.
+            </summary>
+            <remarks>This is done to enhance testability of the transaction manager since ServiceConfig does not override Equals or Hashcode</remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id $</version> 
+        </member>
+        <member name="T:Spring.Data.Config.DatabaseNamespaceParser">
+            <summary>
+            Implementation of the custom configuration parser for database definitions.
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: DatabaseNamespaceParser.cs,v 1.3 2007/08/08 00:34:33 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Config.DatabaseNamespaceParser.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Config.DatabaseNamespaceParser"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Config.DatabaseNamespaceParser.ParseElement(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parse the specified element and register any resulting
+            IObjectDefinitions with the IObjectDefinitionRegistry that is
+            embedded in the supplied ParserContext.
+            </summary>
+            <param name="element">The element to be parsed into one or more IObjectDefinitions</param>
+            <param name="parserContext">The object encapsulating the current state of the parsing
+            process.</param>
+            <returns>
+            The primary IObjectDefinition (can be null as explained above)
+            </returns>
+            <remarks>
+            Implementations should return the primary IObjectDefinition
+            that results from the parse phase if they wish to used nested
+            inside (for example) a <code>&lt;property&gt;</code> tag.
+            <para>Implementations may return null if they will not
+            be used in a nested scenario.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.Config.DatabaseNamespaceParser.GetTypeName(System.Xml.XmlElement)">
+            <summary>
+            Gets the name of the object type for the specified element.  This has already been aliased
+            in the static constructor.
+            </summary>
+            <param name="element">The element.</param>
+            <returns>The name of the object type.</returns>
+        </member>
+        <member name="T:Spring.Dao.Support.DataAccessUtils">
+            <summary>
+            Miscellaneous utility methods for DAO implementations.
+            Useful with any data access technology.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: DataAccessUtils.cs,v 1.3 2006/12/02 07:35:23 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.Support.DataAccessUtils.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Dao.Support.DataAccessUtils"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.Dao.DeadlockLoserDataAccessException">
+            <summary> 
+            Generic exception thrown when the current process was
+            a deadlock loser, and its transaction rolled back.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: DeadlockLoserDataAccessException.cs,v 1.6 2008/04/08 20:26:43 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.DeadlockLoserDataAccessException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DeadlockLoserDataAccessException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.DeadlockLoserDataAccessException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DeadlockLoserDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.DeadlockLoserDataAccessException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DeadlockLoserDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.DeadlockLoserDataAccessException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DeadlockLoserDataAccessException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Dao.DataRetrievalFailureException">
+            <summary> 
+            Exception thrown if certain expected data could not be retrieved, e.g.
+            when looking up specific data via a known identifier.
+            </summary>
+            <remarks>
+            <p>
+            This exception will be thrown either by O/R mapping tools or by custom DAO
+            implementations.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: DataRetrievalFailureException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.DataRetrievalFailureException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataRetrievalFailureException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.DataRetrievalFailureException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataRetrievalFailureException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.DataRetrievalFailureException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataRetrievalFailureException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.DataRetrievalFailureException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataRetrievalFailureException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Transaction.Support.TransactionDelegate">
+            <summary>
+            Callback delegate for performing actions within a transactional context.
+            </summary>
+            <remarks>
+            <p>To be used with <see cref="T:Spring.Transaction.Support.TransactionTemplate"/>'s Execute
+            methods.
+            </p>
+            <p>
+            Typically used to gather various calls to transaction-unaware low-level
+            services into a higher-level method implementation with transaction
+            demarcation.
+            </p>
+            </remarks>
+            <param name="status">The status of the transaction, can be used to
+            trigger a rollback the current transaction by settings its
+            RollbackOnly property to true.</param>
+            <returns>A result object or <c>null</c>.</returns>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.ITransactionAttributeSource">
+            <summary>
+            Interface used by <see cref="T:Spring.Transaction.Interceptor.TransactionInterceptor"/>
+            to source transaction attributes.
+            </summary>
+            <remarks>
+            <p>
+            Implementations know how to source transaction attributes, whether from configuration,
+            metadata attributes at source level, or anywhere else.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: ITransactionAttributeSource.cs,v 1.7 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.ITransactionAttributeSource.ReturnTransactionAttribute(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Return the <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> for this
+            method.
+            </summary>
+            <param name="method">The method to check.</param>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/>. May be null, in which case the declaring 
+            class of the supplied <paramref name="method"/> must be used.
+            </param>
+            <returns>
+            A <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> or 
+            null if the method is non-transactional.
+            </returns>
+        </member>
+        <member name="T:Spring.Transaction.HeuristicCompletionException">
+            <summary>
+            Exception that represents a transaction failure caused by heuristics.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: HeuristicCompletionException.cs,v 1.6 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Transaction.HeuristicCompletionException._outcomeState">
+            <summary>
+            The outcome state of the transaction: have some or all resources been committed?
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.HeuristicCompletionException.GetStateString(Spring.Transaction.TransactionOutcomeState)">
+            <summary>
+            Returns a <see cref="T:System.String"/> representation of the supplied
+            <see cref="T:Spring.Transaction.TransactionOutcomeState"/>.
+            </summary>
+            <param name="outcomeState">
+            The <see cref="T:Spring.Transaction.TransactionOutcomeState"/> value that
+            is to be stringified.
+            </param>
+            <returns>A <see cref="T:System.String"/> representation.</returns>
+        </member>
+        <member name="M:Spring.Transaction.HeuristicCompletionException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.CannotCreateTransactionException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.HeuristicCompletionException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.CannotCreateTransactionException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.HeuristicCompletionException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.CannotCreateTransactionException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.HeuristicCompletionException.#ctor(Spring.Transaction.TransactionOutcomeState,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.CannotCreateTransactionException"/> class
+            with the specified <see cref="T:Spring.Transaction.TransactionOutcomeState"/>
+            and inner exception.
+            </summary>
+            <param name="outcomeState">
+            The <see cref="T:Spring.Transaction.TransactionOutcomeState"/>
+            for the transaction.
+            </param>
+            <param name="innerException">
+            The inner exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.HeuristicCompletionException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.CannotCreateTransactionException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.HeuristicCompletionException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Override of <see cref="M:System.Exception.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)"/>
+            to allow for private serialization.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="P:Spring.Transaction.HeuristicCompletionException.OutcomeState">
+            <summary>
+            Returns the transaction's outcome state.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.Support.TypedDataSetUtils">
+             <summary>
+             Using reflection on VS.NET 2005 a generated typed dataset, apply the
+             connection/transaction pair associated with the current Spring based
+             transaction scope.  
+             </summary>
+             <remarks>This avoids the limitations of using System.Transaction
+             based transaction scope for multiple operation on typed datasets withone one
+             transaction.  Reflection was used rather than partial classes to provide
+             a general solution that can be written and applied once.
+             Usage within a DAO method, FindAll() is shown below.  Note: Convenience methods
+             to simplify calling syntax maybe provided in the future, it is a trade off on type
+             safety calling the typed adapter defined outside the anonymous method as 
+             compared to casting inside a "DoInDbAdapter(object dbAdapter) method.
+             <code>
+             public PrintGroupMappingDataSet FindAll()
+             {
+            
+                PrintGroupMappingTableAdapter adapter = new PrintGroupMappingTableAdapter();
+                PrintGroupMappingDataSet printGroupMappingDataSet = new PrintGroupMappingDataSet();
+                    
+                    
+                printGroupMappingDataSet = AdoTemplate.Execute(delegate(IDbCommand command)
+                                           {
+                                               TypedDataSetUtils.ApplyConnectionAndTx(adapter, command);
+                                               adapter.Fill(printGroupMappingDataSet.PrintGroupMapping);
+                                               return printGroupMappingDataSet;
+                                           }) 
+                                           as PrintGroupMappingDataSet;
+            
+                return printGroupMappingDataSet;
+             }
+             </code>
+             See http://www.code-magazine.com/articleprint.aspx?quickid=0605031 for a 
+             more complete discussion.
+             
+             </remarks>
+             <version>$Id:</version>
+        </member>
+        <member name="M:Spring.Data.Support.TypedDataSetUtils.ApplyConnectionAndTx(System.Object,Spring.Data.Common.IDbProvider)">
+            <summary>
+            Applies the connection and tx to the provided typed dataset.  The connection and transaction
+            used are taken from the Spring's current transactional context.  See ConnectionUtils.GetConnectionTxPair
+            for more information
+            </summary>
+            <param name="typedDataSetAdapter">The typed data set adapter.</param>
+            <param name="dbProvider">The db provider.</param>
+        </member>
+        <member name="M:Spring.Data.Support.TypedDataSetUtils.ApplyConnectionAndTx(System.Object,System.Data.IDbCommand)">
+            <summary>
+            Applies the connection and tx to the provided typed dataset.
+            </summary>
+            <remarks>Generated dataset to not inherit from a common base
+            class so that we must pass in the generic object type.</remarks>
+            <param name="typedDataSetAdapter">The typed data set adapter.</param>
+            <param name="sourceCommand">The IDbCommand managed by Spring and set with
+            the connection/transaction of the current Spring transaction scope.</param>
+        </member>
+        <member name="T:Spring.Data.Support.ConnectionHolder">
+            <summary>
+            Connection holder, wrapping a ADO.NET connection and transaction.
+            </summary>
+            <remarks>AdoTransactionManager binds instances of this class to the
+            thread for a given DbProvider.</remarks>
+            <author>Jurgen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+        </member>
+        <member name="T:Spring.Transaction.Support.ResourceHolderSupport">
+            <summary>
+            Convenient base class for resource holders.
+            </summary>
+            <remarks>
+            <p>
+            Features rollback-only support transactions. Can expire after a certain number of
+            seconds or milliseconds, to determine transactional timeouts.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: ResourceHolderSupport.cs,v 1.9 2007/01/30 20:12:29 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Support.ResourceHolderSupport.Clear">
+            <summary>
+            Clear the transaction state of this resource holder.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Support.ResourceHolderSupport.Requested">
+            <summary>
+            Increase the reference count by one because the holder has been requested.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Support.ResourceHolderSupport.Released">
+            <summary>
+            Decrease the reference count by one because the holder has been released.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Support.ResourceHolderSupport.SynchronizedWithTransaction">
+            <summary>
+            Mark the resource as synchronized with a transaction.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Support.ResourceHolderSupport.RollbackOnly">
+            <summary>
+            Get or set whether the resource is synchronized with a transaction.
+            </summary>
+            <value><c>true</c> if synchronized; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Transaction.Support.ResourceHolderSupport.Deadline">
+            <summary>
+            Return the expiration deadline of this object.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Support.ResourceHolderSupport.HasTimeout">
+            <summary>
+            Return whether this object has an associated timeout.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Support.ResourceHolderSupport.TimeToLiveInSeconds">
+            <summary>
+            Return the time to live for this object in seconds.
+            </summary>
+            <remarks>
+            <p>
+            Rounds up eagerly, e.g. '9.00001' to '10'.
+            </p>
+            </remarks>
+            <exception cref="T:System.ArgumentException">
+            If no deadline has been set.
+            </exception>
+        </member>
+        <member name="P:Spring.Transaction.Support.ResourceHolderSupport.TimeToLiveInMilliseconds">
+            <summary>
+            Return the time to live for this object in milliseconds.
+            </summary>
+            <exception cref="T:System.ArgumentException">
+            If no deadline has been set.
+            </exception>
+        </member>
+        <member name="P:Spring.Transaction.Support.ResourceHolderSupport.TimeoutInMillis">
+            <summary>
+            Sets the timeout for this object in milliseconds.
+            </summary>
+            <value>Number of milliseconds until expiration.</value>
+        </member>
+        <member name="P:Spring.Transaction.Support.ResourceHolderSupport.TimeoutInSeconds">
+            <summary>
+            Sets the timeout for this object in seconds.
+            </summary>
+            <value>Number of seconds until expiration.</value>
+        </member>
+        <member name="P:Spring.Transaction.Support.ResourceHolderSupport.IsOpen">
+            <summary>
+            Return wheterh there are still open references to this holder
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionHolder.#ctor(System.Data.IDbConnection,System.Data.IDbTransaction)">
+            <summary>
+            Create a new ConnectionHolder
+            </summary>
+            <param name="conn">The connection to hold</param>
+            <param name="transaction">The transaction to hold</param>
+        </member>
+        <member name="T:Spring.Data.Support.AdoUtils">
+            <summary>
+            Summary description for AdoUtils.
+            </summary>
+        </member>
+        <member name="F:Spring.Data.Support.AdoUtils.CONNECTION_SYNCHRONIZATION_ORDER">
+            <summary>
+            Order value for TransactionSynchronization objects that clean up
+            ADO.NET Connections.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.AdoUtils.DisposeCommand(System.Data.IDbCommand)">
+            <summary>
+            Property dispose of the command.  Useful in finally or catch blocks.
+            </summary>
+            <param name="command">command to dispose</param>
+        </member>
+        <member name="T:Spring.Data.IDataSetFillLifecycleProcessor">
+            <summary>
+            Lifecycle callback methods that can be registered when
+            performing Fill operations with AdoTemplate.
+            </summary>
+            <remarks>
+            <p>
+            The methods let you set various properties and invoke
+            methods on the DataSet before and after it gets filled by a DataAdapter.  
+            For example, EnforceConstraints, BeginLoadData, and EndLoadData
+            can be called to optimize the loading of large DataSets with
+            many related tables.
+            </p>
+            <p>Vendors may expose other propriety methods on their DataSet
+            implementation, downcast to access this specific functionality.
+            </p>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IDataSetFillLifecycleProcessor.cs,v 1.3 2006/11/29 07:18:45 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.IDataSetFillLifecycleProcessor.BeforeFill(System.Data.DataSet,System.Data.ITableMappingCollection)">
+            <summary>
+            Called before a DataAdapter is used to fill a DataSet 
+            the the provided tablename.
+            </summary>
+            <param name="ds">The DataSet to be filled with a DataTable</param>
+            <param name="tableMappingCollection">The table collection to be filled</param>
+        </member>
+        <member name="M:Spring.Data.IDataSetFillLifecycleProcessor.AfterFill(System.Data.DataSet,System.Data.ITableMappingCollection)">
+            <summary>
+            Called after a DataAdapter is used to fill a DataSet 
+            the the provided tablename.
+            </summary>
+            <param name="ds">The DataSet to be filled with a DataTable</param>
+            <param name="tableMappingCollection">The table collection to be filled</param>
+        </member>
+        <member name="T:Spring.Data.Core.TxScopeTransactionManager">
+            <summary>
+            TransactionManager that uses TransactionScope provided by System.Transactions.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: TxScopeTransactionManager.cs,v 1.5 2007/12/04 19:43:16 markpollack Exp $</version>    
+        </member>
+        <member name="M:Spring.Data.Core.TxScopeTransactionManager.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Core.TxScopeTransactionManager"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Core.TxScopeTransactionManager.#ctor(Spring.Data.Support.ITransactionScopeAdapter)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Core.TxScopeTransactionManager"/> class.
+            </summary>
+            <remarks>This is indented only for unit testing purposes and should not be
+            called by production application code.</remarks>
+            <param name="txAdapter">The tx adapter.</param>
+        </member>
+        <member name="M:Spring.Data.Core.TxScopeTransactionManager.AfterPropertiesSet">
+            <summary>
+            No-op initialization
+            </summary>
+        </member>
+        <member name="T:Spring.Data.Core.TxScopeTransactionManager.PromotableTxScopeTransactionObject">
+            <summary>
+            The transaction resource object that encapsulates the state and functionality
+            contained in TransactionScope and Transaction.Current via the ITransactionScopeAdapter 
+            property.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Core.TxScopeTransactionManager.PromotableTxScopeTransactionObject.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Core.TxScopeTransactionManager.PromotableTxScopeTransactionObject"/> class.
+            Will create an instance of <see cref="T:Spring.Data.Support.DefaultTransactionScopeAdapter"/>.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Core.TxScopeTransactionManager.PromotableTxScopeTransactionObject.TxScopeAdapter">
+            <summary>
+            Gets or sets the transaction scope adapter.
+            </summary>
+            <value>The transaction scope adapter.</value>
+        </member>
+        <member name="P:Spring.Data.Core.TxScopeTransactionManager.PromotableTxScopeTransactionObject.RollbackOnly">
+            <summary>
+            Return whether the transaction is internally marked as rollback-only.
+            </summary>
+            <value></value>
+            <returns>True of the transaction is marked as rollback-only.</returns>
+        </member>
+        <member name="T:Spring.Data.Common.DbProviderFactory">
+             <summary>
+             Create DbProviders based on configuration information in assembly resource
+             dbproviders.xml
+            
+            
+             </summary>
+             <remarks>
+             TODO: Provide over-ride resource location.
+             TODO: Add error codes to provider.
+             </remarks>
+             <author>Mark Pollack (.NET)</author>
+             <version>$Id: DbProviderFactory.cs,v 1.12 2007/08/16 20:38:43 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.Common.DbProviderFactory.log">
+            <summary>
+            The shared log instance for this class (and derived classes).
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Common.DbProviderFactory.#cctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Common.DbProviderFactory"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Common.DbProviderFactory.GetDbProvider(System.String)">
+            <summary>
+            Gets the DbProvider given an identifying name.
+            </summary>
+            <remarks>
+            Familiar names for the .NET 2.0 provider model are supported, i.e.
+            System.Data.SqlClient.  Refer to the documentation for a complete
+            listing of supported DbProviders and their names.  You may
+            also use the method GetDbProviderClasses or obtain the
+            underlying IApplicationContext to progammatically obtain information
+            about supported providers.
+            </remarks>
+            <param name="providerInvariantName">Name of the provider invariant.</param>
+            <returns></returns>
+        </member>
+        <member name="P:Spring.Data.Common.DbProviderFactory.ApplicationContext">
+            <summary>
+            Gets the application context that contains the definitions of the
+            various providers.
+            </summary>
+            <remarks>This method should rarely, if ever, be used in
+            application code.  It is used by the framework itself
+            to map other data access products abstractions for a 'DbProvider/DataSource'
+            onto Spring's model.</remarks>
+            <value>The application context.</value>
+        </member>
+        <member name="T:Spring.Dao.IncorrectUpdateSemanticsDataAccessException">
+            <summary> 
+            Data access exception thrown when something unintended appears to have
+            happened with an update, but the transaction hasn't already been rolled back.
+            </summary>
+            <remarks>
+            <p>
+            Thrown, for example, when we wanted to update 1 row in an RDBMS but actually
+            updated 3.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: IncorrectUpdateSemanticsDataAccessException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.IncorrectUpdateSemanticsDataAccessException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.IncorrectUpdateSemanticsDataAccessException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.IncorrectUpdateSemanticsDataAccessException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.IncorrectUpdateSemanticsDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.IncorrectUpdateSemanticsDataAccessException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.IncorrectUpdateSemanticsDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.IncorrectUpdateSemanticsDataAccessException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.IncorrectUpdateSemanticsDataAccessException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="P:Spring.Dao.IncorrectUpdateSemanticsDataAccessException.DataWasUpdated">
+            <summary>Return whether or not data was updated.</summary>
+            <returns>
+            <b>True</b> if data was updated (as opposed to being incorrectly
+            updated). If this property returns false, there's nothing to roll back.
+            </returns>
+        </member>
+        <member name="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            <summary> 
+            Data access exception thrown when a result was not of the expected size,
+            for example when expecting a single row but getting 0 or more than 1 rows.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: IncorrectResultSizeDataAccessException.cs,v 1.6 2007/11/20 04:03:48 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Dao.InvalidDataAccessApiUsageException">
+            <summary> 
+            Exception thrown on incorrect usage of the API, such as failing to "compile" a query
+            object that needed compilation before execution.
+            </summary>
+            <remarks>
+            <p>
+            This represents a problem in our data access framework, not the underlying data access
+            infrastructure.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: InvalidDataAccessApiUsageException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.InvalidDataAccessApiUsageException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.InvalidDataAccessApiUsageException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.InvalidDataAccessApiUsageException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.InvalidDataAccessApiUsageException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.InvalidDataAccessApiUsageException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.InvalidDataAccessApiUsageException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.InvalidDataAccessApiUsageException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.InvalidDataAccessApiUsageException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.IncorrectResultSizeDataAccessException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.IncorrectResultSizeDataAccessException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.IncorrectResultSizeDataAccessException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.IncorrectResultSizeDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.IncorrectResultSizeDataAccessException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CleanupFailureDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.IncorrectResultSizeDataAccessException.#ctor(System.Int32,System.Int32)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CleanupFailureDataAccessException"/> class.
+            </summary>
+            <param name="expectedSize">The expected result size.</param>
+            <param name="actualSize">The actual result size (or -1 if unknown).</param>
+        </member>
+        <member name="M:Spring.Dao.IncorrectResultSizeDataAccessException.#ctor(System.String,System.Int32,System.Int32)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CleanupFailureDataAccessException"/> class.
+            </summary>&gt;
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="expectedSize">The expected result size.</param>
+            <param name="actualSize">The actual result size (or -1 if unknown).</param>
+        </member>
+        <member name="M:Spring.Dao.IncorrectResultSizeDataAccessException.#ctor(System.String,System.Int32)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Dao.IncorrectResultSizeDataAccessException"/> class.
+            </summary>
+            <param name="message">A message about the exception</param>
+            <param name="expectedSize">The expected result size.</param>
+        </member>
+        <member name="M:Spring.Dao.IncorrectResultSizeDataAccessException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CleanupFailureDataAccessException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.IncorrectResultSizeDataAccessException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Override of <see cref="M:System.Exception.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)"/>
+            to allow for private serialization.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="P:Spring.Dao.IncorrectResultSizeDataAccessException.ExpectedSize">
+            <summary>Return the expected result size.</summary>
+        </member>
+        <member name="P:Spring.Dao.IncorrectResultSizeDataAccessException.ActualSize">
+            <summary>Return the actual result size (or -1 if unknown).</summary>
+        </member>
+        <member name="T:Spring.Transaction.TransactionPropagation">
+            <summary>
+            Enumeration describing <a href="http://www.springframework.net/">Spring.NET's</a>
+            transaction propagation settings.
+            </summary>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: TransactionPropagation.cs,v 1.7 2007/05/29 20:00:33 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Transaction.TransactionPropagation.Required">
+            <summary>
+            Support a current transaction, create a new one if none exists.
+            </summary>
+            <remarks>
+            <p>
+            Analogous to System.EnterpriseServices.TransactionOption value of the same name.
+            This is typically the default setting of a transaction definition.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Transaction.TransactionPropagation.Supports">
+            <summary>
+            Support a current transaction, execute non-transactionally if none exists.
+            </summary>
+            <remarks>
+            <p>
+            Analogous to System.EnterpriseServices.TransactionOption.Supported.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Transaction.TransactionPropagation.Mandatory">
+            <summary>
+            Support a current transaction, throw an exception if none exists.
+            </summary>
+            <remarks>
+            <p>
+            No corresponding System.EnterpriseServices.TransactionOption value.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Transaction.TransactionPropagation.RequiresNew">
+            <summary>
+            Create a new transaction, suspending the current transaction if one exists.
+            </summary>
+            <remarks>
+            <p>
+            Analogous to System.EnterpriseServices.TransactionOption value of the same name.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Transaction.TransactionPropagation.NotSupported">
+            <summary>
+            Execute non-transactionally, suspending the current transaction if one exists.
+            </summary>
+            <remarks>
+            <p>
+            Analogous to System.EnterpriseServices.TransactionOption value of the same name.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Transaction.TransactionPropagation.Never">
+            <summary>
+            Execute non-transactionally, throw an exception if a transaction exists.
+            </summary>
+            <remarks>
+            <p>
+            Analogous to System.EnterpriseServices.TransactionOption.Disabled.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Transaction.TransactionPropagation.Nested">
+            <summary>
+            Execute within a nested transaction if a current transaction exists, else
+            behave like <see cref="F:Spring.Transaction.TransactionPropagation.Required"/>. 
+            </summary>
+            <remarks>
+            <p>
+            There is no analogous feature in TransactionOption.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Transaction.Support.ITransactionCallback">
+            <summary>
+            Callback interface for transactional code. 
+            </summary>
+            <remarks>
+            <p>To be used with <see cref="T:Spring.Transaction.Support.TransactionTemplate"/>'s Execute
+            methods.
+            </p>
+            <p>
+            Typically used to gather various calls to transaction-unaware low-level
+            services into a higher-level method implementation with transaction
+            demarcation.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ITransactionCallback.cs,v 1.4 2007/08/01 23:32:39 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Support.ITransactionCallback.DoInTransaction(Spring.Transaction.ITransactionStatus)">
+            <summary>
+            Gets called by TransactionTemplate.Execute within a 
+            transaction context.
+            </summary>
+            <param name="status">The associated transaction status.</param>
+            <returns>A result object or <c>null</c>.</returns>
+        </member>
+        <member name="T:Spring.Data.UncategorizedAdoException">
+            <summary>
+            Exception thrown when we can't classify a SQLException into 
+            one of our generic data access exceptions. 
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: UncategorizedAdoException.cs,v 1.4 2006/11/29 07:18:46 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Dao.UncategorizedDataAccessException">
+            <summary> 
+            Normal superclass when we can't distinguish anything more specific
+            than "something went wrong with the underlying resource": for example,
+            a SQLException from Sql Server that we can't pinpoint more precisely.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: UncategorizedDataAccessException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.UncategorizedDataAccessException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.UncategorizedDataAccessException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.UncategorizedDataAccessException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.UncategorizedDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.UncategorizedDataAccessException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.UncategorizedDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.UncategorizedDataAccessException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.UncategorizedDataAccessException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="F:Spring.Data.UncategorizedAdoException.sql">
+            <summary>
+            SQL that led to the problem
+            </summary>
+        </member>
+        <member name="F:Spring.Data.UncategorizedAdoException.errorCode">
+            <summary>
+            The error code, if available, that was unable to be categorized.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.UncategorizedAdoException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.UncategorizedAdoException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.UncategorizedAdoException.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.UncategorizedAdoException"/> class.
+            </summary>
+            <param name="message">A message about the exception.</param>
+        </member>
+        <member name="M:Spring.Data.UncategorizedAdoException.#ctor(System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.UncategorizedAdoException"/> class.
+            </summary>
+            <param name="message">A message about the exception.</param>
+            <param name="inner">The inner exception.</param>
+        </member>
+        <member name="M:Spring.Data.UncategorizedAdoException.#ctor(System.String,System.String,System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.UncategorizedAdoException"/> class.
+            </summary>
+            <param name="task">name of the current task.</param>
+            <param name="errorCode">the underlying error code that could not be translated</param>
+            <param name="sql">The offending SQL statment</param>
+            <param name="ex">The root cause.</param>
+        </member>
+        <member name="M:Spring.Data.UncategorizedAdoException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.UncategorizedAdoException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Data.UncategorizedAdoException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            When overridden in a derived class, sets the <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            with information about the exception.
+            </summary>
+            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="info"/> parameter is a null reference (<see langword="Nothing"/> in Visual Basic).</exception>
+        </member>
+        <member name="T:Spring.Data.Support.NullMappingDataReader">
+            <summary>
+            A data reader implementation that mapps DBNull values to sensible defaults.
+            </summary>
+            <remarks>IDataRecord methods are virtual.</remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: NullMappingDataReader.cs,v 1.2 2006/10/08 04:56:06 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Support.NullMappingDataReader.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Support.NullMappingDataReader"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.NullMappingDataReader.#ctor(System.Data.IDataReader)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Support.NullMappingDataReader"/> class.
+            </summary>
+            <param name="dataReader">The data reader to delegate operations to.</param>
+        </member>
+        <member name="M:Spring.Data.Support.NullMappingDataReader.GetInt32(System.Int32)">
+            <summary>
+            Gets the 32-bit signed integer value of the specified field.
+            </summary>
+            <param name="i">The index of the field to find.</param>
+            <returns>
+            The 32-bit signed integer value of the specified field or 0 if null
+            </returns>
+            <exception cref="T:System.IndexOutOfRangeException">The index passed was outside the range of 0 through <see cref="P:System.Data.IDataRecord.FieldCount"/>.</exception>
+        </member>
+        <member name="M:Spring.Data.Support.NullMappingDataReader.GetValue(System.Int32)">
+            <summary>
+            Return the value of the specified field, null if value equals DBNull.Value
+            </summary>
+            <param name="i">The index of the field to find.</param>
+            <returns>
+            The <see cref="T:System.Object"/> which will contain the field value upon return.
+            Returns null if value equals DBNull.Value
+            </returns>
+            <exception cref="T:System.IndexOutOfRangeException">
+            The index passed was outside the range of 0 through <see cref="P:System.Data.IDataRecord.FieldCount"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Support.NullMappingDataReader.IsDBNull(System.Int32)">
+            <summary>
+            Return whether the specified field is set to null.
+            </summary>
+            <param name="i">The index of the field to find.</param>
+            <returns>
+            	<see langword="true"/> if the specified field is set to null, otherwise
+            <see langword="false"/>.
+            </returns>
+            <exception cref="T:System.IndexOutOfRangeException">The index passed was outside the range of 0 through <see cref="P:System.Data.IDataRecord.FieldCount"/>. </exception>
+        </member>
+        <member name="P:Spring.Data.Support.NullMappingDataReader.Item(System.String)">
+            <summary>
+            Gets the <see cref="T:System.Object"/> with the specified name.  
+            Returns null if value equals DBNull.Value
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Spring.Data.Support.NullMappingDataReader.Item(System.Int32)">
+            <summary>
+            Gets the <see cref="T:System.Object"/> with the specified i.
+            Returns null if value equals DBNull.Value
+            </summary>
+            <value>Return the object or null if the value equals DBNull.Value</value>
+        </member>
+        <member name="T:Spring.Data.Objects.AdoNonQuery">
+            <summary>
+            Encapsulate Command.ExecuteNonQuery operations within a reusable class. 
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <remarks>The default CommandType is CommandType.Text</remarks>
+            <version>$Id: AdoNonQuery.cs,v 1.3 2007/07/25 08:25:20 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Objects.AdoNonQuery.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.AdoNonQuery"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Objects.AdoNonQuery.#ctor(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.AdoNonQuery"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Objects.AdoNonQuery.#ctor(Spring.Data.Common.IDbProvider,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.AdoNonQuery"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.Generic.ICommandCallback`1">
+            <summary>
+            Generic callback interface for code that operates on a 
+            DbCommand. 
+            </summary>
+            <typeparam name="T">The return type from executing the
+            callback</typeparam>
+            <remarks>
+            <p>Allows you to execute any number of operations
+            on a single DbCommand, for example a single ExecuteScalar
+            call or repeated execute calls with varying parameters.
+            </p>
+            <p>Used internally by AdoTemplate, but also useful for 
+            application code.  Note that the passed in DbCommand
+            has been created by the framework and will have its
+            Connection property set and the Transaction property
+            set based on the transaction context.</p>
+            </remarks>
+            <author>Mark Pollack</author>
+        </member>
+        <member name="M:Spring.Data.Generic.ICommandCallback`1.DoInCommand(System.Data.Common.DbCommand)">
+            <summary>
+            Called by AdoTemplate.Execute with an active ADO.NET IDbCommand.
+            The calling code does not need to care about closing the 
+            command or the connection, or
+            about handling transactions:  this will all be handled by 
+            Spring's AdoTemplate
+            </summary>
+            <param name="command">An active IDbCommand instance</param>
+            <returns>The result object</returns>
+        </member>
+        <member name="T:Spring.Data.Objects.Generic.AdoOperation">
+            <summary>
+            A "AdoOperation" is a thread-safe, reusable object representing 
+            an ADO Query, "NonQuery" (Create, Update, Delete), stored procedure
+            or DataSet manipualtions.
+            </summary>
+            <remarks>
+            Subclasses should set Command Text and add parameters before invoking
+            Compile().  The order in which parameters are added is generally
+            significant when using providers or functionality that do not use
+            named parameters.
+            
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AdoOperation.cs,v 1.2 2007/07/25 13:32:39 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.AdoOperation.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.Generic.AdoOperation"/> class.
+            </summary>
+            <remarks>A DbProvider, SQL and any parameters must be supplied
+            before invoking the compile method and using this object.       
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.AdoOperation.#ctor(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.Generic.AdoOperation"/> class.
+            </summary>
+            <remarks>A DbProvider, SQL and any parameters must be supplied
+            before invoking the compile method and using this object.       
+            </remarks>
+            <param name="provider">Database provider to use.</param>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.AdoOperation.#ctor(Spring.Data.Common.IDbProvider,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.Generic.AdoOperation"/> class.
+            </summary>
+            <remarks>A DbProvider, SQL and any parameters must be supplied
+            before invoking the compile method and using this object.       
+            </remarks>
+            <param name="provider">Database provider to use.</param>
+            <param name="sql">SQL query or stored procedure name.</param>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.AdoOperation.Compile">
+            <summary>
+            Compiles this operation.  Ignores subsequent attempts to compile.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Objects.Generic.AdoOperation.AdoTemplate">
+            <summary>
+            Gets or sets the ADO template.
+            </summary>
+            <value>The ADO template.</value>
+        </member>
+        <member name="P:Spring.Data.Objects.Generic.AdoOperation.DbProvider">
+            <summary>
+            Gets or sets the db provider.
+            </summary>
+            <value>The db provider.</value>
+        </member>
+        <member name="P:Spring.Data.Objects.Generic.AdoOperation.CommandTimeout">
+            <summary>
+            Sets the command timeout for IDbCommands that this AdoTemplate executes.
+            </summary>
+            <remarks>Default is 0, indicating to use the database provider's default.
+            Any timeout specified here will be overridden by the remaining 
+            transaction timeout when executing within a transaction that has a
+            timeout specified at the transaction level. 
+            </remarks>
+            <value>The command timeout.</value>
+        </member>
+        <member name="T:Spring.Data.CannotGetAdoConnectionException">
+            <summary>
+            Fatal exception thrown when we can't connect to an RDBMS using ADO.NET
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: CannotGetAdoConnectionException.cs,v 1.1 2006/11/24 05:57:46 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.CannotGetAdoConnectionException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.CannotGetAdoConnectionException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.CannotGetAdoConnectionException.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.CannotGetAdoConnectionException"/> class.
+            </summary>
+            <param name="message">A message about the exception.</param>
+        </member>
+        <member name="M:Spring.Data.CannotGetAdoConnectionException.#ctor(System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.CannotGetAdoConnectionException"/> class.
+            </summary>
+            <param name="message">A message about the exception.</param>
+            <param name="inner">The inner exception.</param>
+        </member>
+        <member name="M:Spring.Data.CannotGetAdoConnectionException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.CannotGetAdoConnectionException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Data.Common.DbParametersBuilder">
+            <summary>
+            Assists in creating a collection of parameters by keeping track of all
+            IDbParameters its creates.  After creating a number of parameters ask for the collection
+            with the GetParameters methods.
+            </summary>
+            <remarks>This builder is stateful, you must create a new one for each collection
+            of parameters you would like to create.</remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: DbParametersBuilder.cs,v 1.2 2007/05/01 00:37:10 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.Common.IDbParametersBuilder">
+            <summary>
+            A builder to create a collection of ADO.NET parameters.
+            </summary>
+            <remarks>The chaining of IDbParameter methods does the 
+            building of the parameter details while the builder class
+            itself keeps track of the collection.</remarks>
+            
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IDbParametersBuilder.cs,v 1.1 2006/12/02 07:38:15 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Common.IDbParametersBuilder.Create">
+            <summary>
+            Creates a IDbParameter object and adds it to an internal collection for
+            later retrieval via the GetParameters method.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Data.Common.IDbParametersBuilder.GetParameters">
+            <summary>
+            Gets all the parameters created and configured via the Create method.
+            </summary>
+            <returns>An instance of IDbParameters</returns>
+        </member>
+        <member name="F:Spring.Data.Common.DbParametersBuilder.log">
+            <summary>
+            The shared log instance for this class (and derived classes). 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Common.DbParametersBuilder.#ctor(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Common.DbParametersBuilder"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor">
+            <summary>
+            Advisor driven by a <see cref="T:Spring.Transaction.Interceptor.ITransactionAttributeSource"/>, used to exclude
+            a <see cref="T:Spring.Transaction.Interceptor.TransactionInterceptor"/> from methods that
+            are non-transactional.
+            </summary>
+            <remarks>
+            <p>
+            Because the AOP framework caches advice calculations, this is normally
+            faster than just letting the <see cref="T:Spring.Transaction.Interceptor.TransactionInterceptor"/> 
+            run and find out itself that it has no work to do.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: TransactionAttributeSourceAdvisor.cs,v 1.11 2007/12/07 08:10:03 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor"/> class.
+            </summary>
+            <remarks>
+            	<p>
+            This is an abstract class, and as such has no publicly
+            visible constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor.#ctor(Spring.Transaction.Interceptor.TransactionInterceptor)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor"/> class.
+            </summary>
+            <param name="transactionInterceptor">
+            The pre-configured transaction interceptor.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor.Matches(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Tests the input method to see if it's covered by the advisor.
+            </summary>
+            <param name="method">The method to match.</param>
+            <param name="targetClass">The <see cref="T:System.Type"/> to match against.</param>
+            <returns>
+            <b>True</b> if the supplied <paramref name="method"/> is covered by the advisor.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor.SetTxAttributeSource(Spring.Transaction.Interceptor.TransactionInterceptor)">
+            <summary>
+            Sets the tx attribute source.
+            </summary>
+            <param name="transactionInterceptor">The transaction interceptor.</param>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor.TransactionInterceptor">
+            <summary>
+            Sets the transaction interceptor.
+            </summary>
+            <value>The transaction interceptor.</value>
+        </member>
+        <member name="T:Spring.Data.IRowMapper">
+            <summary>
+            Callback to process each row of data in a result set to an object.
+            </summary>
+            <remarks>Implementations of this interface perform the actual work
+            of mapping rows, but don't need worry about managing
+            ADO.NET resources, such as closing the reader.
+            <p>
+            Typically used for AdoTemplate's query methods (with RowMapperResultSetExtractor
+            adapters).  RowMapper objects are typically stateless and thus
+            reusable; they are ideal choices for implementing row-mapping logic in a single
+            place.
+            </p>
+            <p>Alternatively, consider subclassing MappingSqlQuery from the Spring.Data.Object
+            namespace:  Instead of working with separate AdoTemplate and RowMapper objects, 
+            you can have executable query objects (containing row-mapping logic) there.
+            </p>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IRowMapper.cs,v 1.6 2007/06/28 18:48:19 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.IRowMapper.MapRow(System.Data.IDataReader,System.Int32)">
+            <summary>
+            Implementations must implement this method to map each row of data in the
+            result set (DataReader).  This method should not call Next() on the 
+            DataReader; it should only extract the values of the current row.
+            </summary>
+            <param name="reader">The IDataReader to map (pre-initialized for the current row)</param>
+            <param name="rowNum">The number of the current row.</param>
+            <returns>The result object for the current row.</returns>
+        </member>
+        <member name="T:Spring.Data.ICommandSetter">
+            <summary>
+            Called by the AdoTemplate class to allow implementations
+            to set any necessary parameters on the command object.
+            The CommandType and CommandText will have already been supplied.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ICommandSetter.cs,v 1.5 2006/12/02 07:35:23 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.Generic.NamedResultSetProcessor`1">
+            <summary>
+            Provides a name to a ResultSetProcessor for use with AdoOperation subclasses
+            such as StoredProcedure.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: NamedResultSetProcessor.cs,v 1.2 2007/07/25 13:32:31 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Generic.NamedResultSetProcessor`1.#ctor(System.String,Spring.Data.IRowCallback)">
+            <summary>
+            Initializes a new instance of the class with a
+            IRowCallback instance
+            </summary>
+            <param name="name">The name of the associated row callback for use with output 
+            result set mappers.</param>
+            <param name="rowcallback">A row callback instance.</param>
+        </member>
+        <member name="M:Spring.Data.Generic.NamedResultSetProcessor`1.#ctor(System.String,Spring.Data.Generic.IRowMapper{`0})">
+            <summary>
+            Initializes a new instance of the class with a
+            IRowMapper instance
+            </summary>
+            <param name="name">The name of the associated row mapper.</param>
+            <param name="rowMapper">A IRowMapper instance.</param>
+        </member>
+        <member name="M:Spring.Data.Generic.NamedResultSetProcessor`1.#ctor(System.String,Spring.Data.Generic.IResultSetExtractor{`0})">
+            <summary>
+            Initializes a new instance of the class with a
+            IResultSetExtractor instance
+            </summary>
+            <param name="name">The name of the associated result set extractor.</param>
+            <param name="resultSetExtractor">A IResultSetExtractor instance.</param>
+        </member>
+        <member name="T:Spring.Transaction.TransactionTimedOutException">
+            <summary>
+            Exception to be thrown when a transaction has timed out.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.TransactionTimedOutException.#ctor">
+            <summary>
+            Create a new instance
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.TransactionTimedOutException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionTimedOutException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.TransactionTimedOutException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionTimedOutException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.TransactionTimedOutException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionTimedOutException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Transaction.Config.TxNamespaceParser">
+            <summary>
+            <code>NamespaceParser</code> allowing for the configuration of
+            declarative transaction management using either XML or using attributes.
+            
+            This namespace handler is the central piece of functionality in the
+            Spring transaction management facilities and offers two appraoches
+            to declaratively manage transactions.
+            
+            One approach uses transaction semantics defined in XML using the
+            <code>&lt;tx:advice&gt;</code> elements, the other uses attributes
+            in combination with the <code>&lt;tx:annotation-driven&gt;</code> element.
+            Both approached are detailed in the Spring reference manual.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Config.TxNamespaceParser.Init">
+            <summary>
+            Register the <see cref="T:Spring.Objects.Factory.Xml.IObjectDefinitionParser"/> for the '<code>advice</code>' and
+            '<code>attribute-driven'</code> tags.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.Config.TxAdviceObjectDefinitionParser">
+            <summary>
+            The <see cref="T:Spring.Objects.Factory.Xml.IObjectDefinitionParser"/> for the <code>&lt;tx:advice&gt;</code> tag.
+            </summary>
+            <author>Rob Harrop</author>
+            <author>Juergen Hoeller</author>
+            <author>Adrian Colyer</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: TxAdviceObjectDefinitionParser.cs,v 1.2 2007/06/18 10:31:19 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Data.Objects.StoredProcedure">
+            <summary>
+            A superclass for object based abstractions of RDBMS stored procedures. 
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: StoredProcedure.cs,v 1.9 2007/07/25 08:25:20 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Objects.StoredProcedure.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.StoredProcedure"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Objects.StoredProcedure.ExecuteScalarByNamedParam(System.Collections.IDictionary)">
+            <summary>
+            Execute the stored procedure using 'ExecuteScalar'
+            </summary>
+            <param name="inParams">Value of input parameters.</param>
+            <returns>Dictionary with any named output parameters and the value of the
+            scalar under the key "scalar".</returns>
+        </member>
+        <member name="T:Spring.Data.Objects.MappingAdoQuery">
+            <summary>
+            Reusable query in which concrete subclasses must implement the
+            MapRow method to map each row of a single result set into an 
+            object.
+            </summary>
+            <remarks>
+            Simplifies MappingAdoQueryWithContext API by dropping parameters and
+            context. Most subclasses won't care about parameters. If you don't use
+            contextual information, subclass this instead of MappingSqlQueryWithContext.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: MappingAdoQuery.cs,v 1.4 2007/07/17 04:33:44 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.Objects.MappingAdoQueryWithContext">
+            <summary>
+            Reusable query in which concrete subclasses must implement the
+            MapRow method to map each row of a single result set into an 
+            object.
+            </summary>
+            <remarks>The MapRow method is also passed the input parameters and
+            a dictionary to provide the method with calling context information
+            (if necessary).  If you do not need these additional parameters, use
+            the subclass MappingAdoQuery.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: MappingAdoQueryWithContext.cs,v 1.3 2007/07/17 04:33:44 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Objects.MappingAdoQueryWithContext.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.MappingAdoQueryWithContext"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Objects.MappingAdoQuery.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.MappingAdoQuery"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.IRowCallback">
+            <summary>
+            Callback to process each row of data in an AdoOperation's Query method.
+            </summary>
+            <remarks>
+            Implementations of this interface perform the actual work of extracting
+            results. In contrast to a IResultSetExtractor, a IRowCallback object is typically
+            stateful.  It keeps the result state within the object, to be available
+            for later inspection.
+            </remarks>	
+            
+        </member>
+        <member name="M:Spring.Data.IRowCallback.ProcessRow(System.Data.IDataReader)">
+            <summary>
+            Implementations must implement this method to process each row of data
+            in the data reader.
+            </summary>
+            <remarks>
+            This method should not advance the cursor by calling Read()
+            on IDataReader but only extract the current values.  The
+            caller does not need to care about closing the reader, command, connection, or
+            about handling transactions:  this will all be handled by 
+            Spring's AdoTemplate
+            </remarks>
+            <param name="reader">An active IDataReader instance</param>
+            <returns>The result object</returns>
+        </member>
+        <member name="T:Spring.Data.Core.AdoDaoSupport">
+            <summary>
+            Convenient super class for ADO.NET data access objects.
+            </summary>
+            <remarks>
+            Requires a IDBProvider to be set, providing a
+            AdoTemplate based on it to subclasses.
+            This base class is mainly intended for AdoTemplate usage.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.Core.AdoDaoSupport.CreateAdoTemplate(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Create a AdoTemplate for a given DbProvider
+            Only invoked if populating the DAO with a DbProvider reference.
+            </summary>
+            <remarks>
+            Can be overriden in subclasses to provide AdoTemplate instances
+            with a different configuration, or a cusotm AdoTemplate subclass.       
+            </remarks>
+            <param name="dbProvider">The DbProvider to create a AdoTemplate for</param>        
+        </member>
+        <member name="M:Spring.Data.Core.AdoDaoSupport.CreateDbParametersBuilder">
+            <summary>
+            Convenience method to create a parameters builder.
+            </summary>
+            <remarks>Virtual for sublcasses to override with custom
+            implementation.</remarks>
+            <returns>A new DbParameterBuilder</returns>
+        </member>
+        <member name="P:Spring.Data.Core.AdoDaoSupport.DbProvider">
+            <summary>
+            The DbProvider instance used by this DAO
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Core.AdoDaoSupport.AdoTemplate">
+            <summary>
+            Set the AdoTemplate for this DAO explicity, as
+            an alternative to specifying a IDbProvider
+            </summary>
+        </member>
+        <member name="T:Spring.Data.Common.DbProvider">
+            <summary>
+            Implemenation of of DbProvider that uses metadata to create provider specific ADO.NET objects.
+            </summary>
+            <version>$Id:</version>
+        </member>
+        <member name="M:Spring.Data.Common.DbProvider.#ctor(Spring.Data.Common.IDbMetadata)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Common.DbProvider"/> class.
+            </summary>
+            <param name="dbMetadata">The db metadata.</param>
+        </member>
+        <member name="M:Spring.Data.Common.DbProvider.CreateCommand">
+            <summary>
+            Returns a new command object for executing SQL statments/Stored Procedures
+            against the database.
+            </summary>
+            <returns>An new <see cref="T:System.Data.IDbCommand"/></returns>
+        </member>
+        <member name="M:Spring.Data.Common.DbProvider.CreateCommandBuilder">
+            <summary>
+            Returns a new instance of the providers CommandBuilder class.
+            </summary>
+            <returns>A new Command Builder</returns>
+            <remarks>In .NET 1.1 there was no common base class or interface
+            for command builders, hence the return signature is object to
+            be portable (but more loosely typed) across .NET 1.1/2.0</remarks>
+        </member>
+        <member name="M:Spring.Data.Common.DbProvider.CreateConnection">
+            <summary>
+            Returns a new connection object to communicate with the database.
+            </summary>
+            <returns>A new <see cref="T:System.Data.IDbConnection"/></returns>
+        </member>
+        <member name="M:Spring.Data.Common.DbProvider.CreateDataAdapter">
+            <summary>
+            Returns a new adapter objects for use with offline DataSets.
+            </summary>
+            <returns>A new <see cref="T:System.Data.IDbDataAdapter"/></returns>
+        </member>
+        <member name="M:Spring.Data.Common.DbProvider.CreateParameter">
+            <summary>
+            Returns a new parameter object for binding values to parameter
+            placeholders in SQL statements or Stored Procedure variables.
+            </summary>
+            <returns>A new <see cref="T:System.Data.IDbDataParameter"/></returns>
+        </member>
+        <member name="M:Spring.Data.Common.DbProvider.CreateParameterName(System.String)">
+            <summary>
+            Creates the name of the parameter in the format appropriate to use inside IDbCommand.CommandText.
+            </summary>
+            <param name="name">The unformatted name of the parameter.</param>
+            <returns>
+            The parameter name formatted foran IDbCommand.CommandText.
+            </returns>
+            <remarks>In most cases this adds the parameter prefix to the name passed into this method.</remarks>
+        </member>
+        <member name="M:Spring.Data.Common.DbProvider.CreateParameterNameForCollection(System.String)">
+            <summary>
+            Creates the name ofthe parameter in the format appropriate for an IDataParameter, i.e. to be
+            part of a IDataParameterCollection.
+            </summary>
+            <param name="name">The unformatted name of the parameter.</param>
+            <returns>
+            The parameter name formatted for an IDataParameter
+            </returns>
+        </member>
+        <member name="M:Spring.Data.Common.DbProvider.ExtractError(System.Exception)">
+            <summary>
+            Extracts the provider specific error code as a string.
+            </summary>
+            <param name="e">The data access exception.</param>
+            <returns>The provider specific error code</returns>
+        </member>
+        <member name="M:Spring.Data.Common.DbProvider.IsDataAccessException(System.Exception)">
+            <summary>
+            Determines whether the provided exception is in fact related
+            to database access.  This can be provider dependent in .NET 1.1 since
+            there isn't a common base class for ADO.NET exceptions.
+            </summary>
+            <param name="e">The exception thrown when performing data access
+            operations.</param>
+            <returns>
+            	<c>true</c> if is a valid data access exception for the specified
+            exception; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.Common.DbProvider.IsDataAccessExceptionBCL11(System.Exception)">
+            <summary>
+            Determines whether is data access exception in .NET 1.1 for the specified exception.
+            </summary>
+            <param name="e">The candidate exception.</param>
+            <returns>
+            	<c>true</c> if is data access exception in .NET 1.1 for the specified exception; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="P:Spring.Data.Common.DbProvider.DbMetadata">
+            <summary>
+            Return metadata information about the database provider
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Spring.Data.Common.DbProvider.ConnectionString">
+            <summary>
+            Connection string used to create connections.
+            </summary>
+            <value></value>
+        </member>
+        <member name="T:Spring.Dao.DataIntegrityViolationException">
+            <summary> 
+            Exception thrown when an attempt to insert or update data
+            results in violation of an integrity constraint.
+            </summary>
+            <remarks>
+            <p>
+            Note that this is not purely a relational concept; unique primary keys are
+            required by most database types.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: DataIntegrityViolationException.cs,v 1.5 2006/05/18 21:37:50 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.DataIntegrityViolationException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataIntegrityViolationException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.DataIntegrityViolationException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataIntegrityViolationException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.DataIntegrityViolationException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataIntegrityViolationException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.DataIntegrityViolationException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.DataIntegrityViolationException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Transaction.TransactionOutcomeState">
+            <summary>
+            Represents a transaction's current state.
+            </summary>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: TransactionOutcomeState.cs,v 1.4 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Transaction.TransactionOutcomeState.Unknown">
+            <summary>
+            The transaction state is unknown.
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.TransactionOutcomeState.Committed">
+            <summary>
+            The transaction has been committed.
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.TransactionOutcomeState.Rolledback">
+            <summary>
+            The transaction has been rolled back.
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.TransactionOutcomeState.Mixed">
+            <summary>
+            The transaction is in an unknown, mixed state.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.Support.TransactionSynchronizationState">
+            <summary>
+            Enumeration containing the state of transaction synchronization.
+            </summary>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: TransactionSynchronizationState.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Transaction.Support.TransactionSynchronizationState.Always">
+            <summary>
+            Always activate transaction synchronization, even for "empty" transactions
+            that result from <see cref="T:Spring.Transaction.TransactionPropagation"/>.
+            </summary>
+            <seealso cref="F:Spring.Transaction.TransactionPropagation.Supports"/> with no existing backend transaction.
+        </member>
+        <member name="F:Spring.Transaction.Support.TransactionSynchronizationState.OnActualTransaction">
+            <summary>
+            Activate transaction synchronization only for actual transactions,
+            i.e. not for empty ones that result from <see cref="T:Spring.Transaction.TransactionPropagation"/>.
+            </summary>
+            <seealso cref="F:Spring.Transaction.TransactionPropagation.Supports"/> with no
+            existing backend transaction.
+        </member>
+        <member name="F:Spring.Transaction.Support.TransactionSynchronizationState.Never">
+            <summary>
+            Never active transaction synchronization.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.Support.TransactionCallbackWithoutResult">
+            <summary>
+            Simple convenience class for TransactionCallback implementation.
+            Allows for implementing a DoInTransaction version without result,
+            i.e. without the need for a return statement.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: TransactionCallbackWithoutResult.cs,v 1.3 2006/06/21 14:07:30 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionCallbackWithoutResult.DoInTransactionWithoutResult(Spring.Transaction.ITransactionStatus)">
+            <summary>
+            Gets called by TransactionTemplate.execute within a transactional context
+            when no return value is required.
+            </summary>
+            <param name="status">The status.</param>
+            <remarks>
+            Does not need to care about transactions itself, although it can retrieve
+            and influence the status of the current transaction via the given status
+            object, e.g. setting rollback-only.
+            A RuntimeException thrown by the callback is treated as application
+            exception that enforces a rollback. An exception gets propagated to the
+            caller of the template.
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.TransactionCallbackWithoutResult.DoInTransaction(Spring.Transaction.ITransactionStatus)">
+            <summary>
+            Gets called by TransactionTemplate.Execute within a
+            transaction context.
+            </summary>
+            <param name="status">The associated transaction status.</param>
+            <returns>a result object or <c>null</c></returns>
+        </member>
+        <member name="T:Spring.Transaction.CannotCreateTransactionException">
+            <summary> 
+            Exception thrown when a transaction can't be created using an
+            underlying transaction API such as COM+.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: CannotCreateTransactionException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.CannotCreateTransactionException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.CannotCreateTransactionException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.CannotCreateTransactionException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.CannotCreateTransactionException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.CannotCreateTransactionException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.CannotCreateTransactionException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.CannotCreateTransactionException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.CannotCreateTransactionException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Data.Support.IServiceDomainAdapter">
+            <summary>
+            Provides the necessary transactional state and operations for ServiceDomainTransactionManager to
+            work with ServiceDomain and ContextUtil.
+            </summary>
+            <remarks>Introduced for purposes of unit testing.</remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id $</version> 
+        </member>
+        <member name="M:Spring.Data.Support.IServiceDomainAdapter.Enter(Spring.Data.Support.SimpleServiceConfig)">
+            <summary>
+            Creates the context specified by the ServiceConfig object and pushes it onto the context stack to 
+            become the current context. 
+            </summary>
+            <param name="config">A ServiceConfig that contains the configuration information for the services to be used within the enclosed code.</param>
+        </member>
+        <member name="M:Spring.Data.Support.IServiceDomainAdapter.Leave">
+            <summary>
+            Leaves this ServiceDomain. The current context is then popped from the context stack, and the 
+            context that was running when Enter was called becomes the current context. 
+            </summary>
+            <returns>One of the TransactionStatus values</returns>
+        </member>
+        <member name="M:Spring.Data.Support.IServiceDomainAdapter.SetComplete">
+            <summary>
+            Sets the consistent bit and the done bit to true in the COM+ context
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.IServiceDomainAdapter.SetAbort">
+            <summary>
+            Sets the consistent bit to false and the done bit to true in the COM+ context. 
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Support.IServiceDomainAdapter.MyTransactionVote">
+            <summary>
+            Gets or sets the consistent bit in the COM+ context.
+            </summary>
+            <value>My transaction vote.</value>
+        </member>
+        <member name="P:Spring.Data.Support.IServiceDomainAdapter.IsInTransaction">
+            <summary>
+             Gets a value indicating whether the current context is transactional.
+            </summary>
+            <value>
+            	<c>true</c> if this instance is existing transaction; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="T:Spring.Data.IDbDataAdapterCreator">
+            <summary>
+            This interface creates a IDbDataAdapterCommand.  
+            Implementations are responsible
+            for configuring the created command with appropriate
+            select and actions commands along with their parameters.
+            </summary>
+            <remarks>
+            Generally used to to support the DataSet functionality in
+            the Spring.Data.Objects namespace.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IDbDataAdapterCreator.cs,v 1.3 2007/12/07 08:09:52 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.IDbDataAdapterCreator.CreateDataAdapter">
+            <summary>
+            Creates the data adapter.
+            </summary>
+            <returns>A new IDbDataAdapter instance</returns>
+        </member>
+        <member name="T:Spring.Data.IDbCommandCreatorFactory">
+            <summary>
+            Helper class that can efficiently create multiple IDbCommand
+            objects with different parameters based on a SQL statement and a single
+            set of parameter declarations.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IDbCommandCreatorFactory.cs,v 1.11 2007/08/06 20:13:39 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.IDbCommandCreatorFactory.#ctor(Spring.Data.Common.IDbProvider,System.Data.CommandType,System.String,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.IDbCommandCreatorFactory"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.IDbCommandCreator">
+            <summary>
+            One of the central callback interfaces used by the AdoTemplate class
+            This interface creates a IDbCommand.  Implementations are responsible
+            for configuring the created command with command type, command text and
+            any necessary parameters. 
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IDbCommandCreator.cs,v 1.6 2007/08/06 20:13:39 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.IDbCommandCreator.CreateDbCommand(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Creates a IDbCommand.
+            </summary>
+            <param name="dbProvider">The IDbProvider reference that can be used to create the command in a 
+            provider independent manner.  The provider supplied is the same as used in configuration of AdoTemplate.</param>
+            <returns></returns>
+        </member>
+        <member name="T:Spring.Data.Generic.IRowMapper`1">
+            <summary>
+            Generic callback to process each row of data in a result set to an object.
+            </summary>
+            <remarks>Implementations of this interface perform the actual work
+            of mapping rows, but don't need worry about managing
+            ADO.NET resources, such as closing the reader.
+            <p>
+            Typically used for AdoTemplate's query methods (with RowMapperResultSetExtractor
+            adapters).  RowMapper objects are typically stateless and thus
+            reusable; they are ideal choices for implementing row-mapping logic in a single
+            place.
+            </p>
+            <p>Alternatively, consider subclassing MappingSqlQuery from the Spring.Data.Object
+            namespace:  Instead of working with separate AdoTemplate and RowMapper objects, 
+            you can have executable query objects (containing row-mapping logic) there.
+            </p>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IRowMapper.cs,v 1.4 2007/06/28 18:48:18 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Generic.IRowMapper`1.MapRow(System.Data.IDataReader,System.Int32)">
+            <summary>
+            Implementations must implement this method to map each row of data in the
+            result set (DataReader).  This method should not call Next() on the 
+            DataReader; it should only extract the values of the current row.
+            </summary>
+            <param name="reader">The IDataReader to map (pre-initialized to the current row)</param>
+            <param name="rowNum">The number of the current row..</param>
+            <returns>The specific typed result object for the current row.</returns>
+        </member>
+        <member name="T:Spring.Data.Generic.IResultSetExtractor`1">
+            <summary>
+            Callback interface to process all results sets and rows in
+            an AdoTemplate query method.
+            </summary>
+            <remarks>Implementations of this interface perform the work
+            of extracting results but don't need worry about managing
+            ADO.NET resources, such as closing the reader. 
+            <p>
+            This interface is mainly used within the ADO.NET
+            framework.  An IResultSetExtractor is usually a simpler choice
+            for result set (DataReader) processing, in particular a 
+            RowMapperResultSetExtractor in combination with a IRowMapper.
+            </p>
+            <para>Note: in contracts to a IRowCallbackHandler, a ResultSetExtractor
+            is usually stateless and thus reusable, as long as it doesn't access
+            stateful resources or keep result state within the object.
+            </para>
+            </remarks>
+            
+        </member>
+        <member name="M:Spring.Data.Generic.IResultSetExtractor`1.ExtractData(System.Data.IDataReader)">
+            <summary>
+            Implementations must implement this method to process all
+            result set and rows in the IDataReader.
+            </summary>
+            <param name="reader">The IDataReader to extract data from.
+            Implementations should not close this: it will be closed
+            by the AdoTemplate.</param>
+            <returns>An arbitrary result object or null if none.  The
+            extractor will typically be stateful in the latter case.</returns>
+        </member>
+        <member name="T:Spring.Data.Generic.IDbCommandDelegate`1">
+            <summary>
+            Generic callback delegate for code that operates on a IDbCommand. 
+            </summary>
+            <remarks>
+            <p>Allows you to execute any number of operations
+            on a single IDbCommand, for example a single ExecuteScalar
+            call or repeated execute calls with varying parameters.
+            </p>
+            <p>Used internally by AdoTemplate, but also useful for 
+            application code.  Note that the passed in DbCommand
+            has been created by the framework and will have its
+            Connection property set and the Transaction property
+            set based on the transaction context.</p>
+            </remarks>
+            <typeparam name="T">The return type from executing the
+            callback</typeparam>
+            <param name="command">The ADO.NET DbCommand object</param>
+            <returns>The object returned from processing with the
+            provided DbCommand </returns>
+            <author>Mark Pollack</author>
+            <version>$Id: IDbCommandDelegate.cs,v 1.1 2007/06/27 21:41:57 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Transaction.TransactionSystemException">
+            <summary>
+            Exception thrown when a general transaction system error is encountered,
+            for instance on commit or rollback.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: TransactionSystemException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.TransactionSystemException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionSystemException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.TransactionSystemException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionSystemException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.TransactionSystemException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionSystemException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.TransactionSystemException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionSystemException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource">
+            <summary>
+            Simple implementation of the <see cref="T:Spring.Transaction.Interceptor.ITransactionAttributeSource"/>
+            interface that allows attributes to be stored per method in a map.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: MethodMapTransactionAttributeSource.cs,v 1.14 2008/05/27 19:06:57 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource.AddTransactionalMethod(System.String,Spring.Transaction.Interceptor.ITransactionAttribute)">
+            <summary>
+            Add an attribute for a transactional method.
+            </summary>
+            <remarks>
+            Method names can end or start with "*" for matching multiple methods.
+            </remarks>
+            <param name="name">The class and method name, separated by a dot.</param>
+            <param name="attribute">The attribute to be associated with the method.</param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource.AddTransactionalMethod(System.Type,System.String,Spring.Transaction.Interceptor.ITransactionAttribute)">
+            <summary>
+            Add an attribute for a transactional method.
+            </summary>
+            <remarks>
+            Method names can end or start with "*" for matching multiple methods.
+            </remarks>
+            <param name="type">The target interface or class.</param>
+            <param name="mappedName">The mapped method name.</param>
+            <param name="transactionAttribute">
+            The attribute to be associated with the method.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource.AddTransactionalMethod(System.Reflection.MethodInfo,Spring.Transaction.Interceptor.ITransactionAttribute)">
+            <summary>
+            Add an attribute for a transactional method.
+            </summary>
+            <param name="method">The transactional method.</param>
+            <param name="transactionAttribute">
+            The attribute to be associated with the method.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource.IsMatch(System.String,System.String)">
+            <summary>
+            Does the supplied <paramref name="methodName"/> match the supplied <paramref name="mappedName"/>?
+            </summary>
+            <remarks>
+            The default implementation checks for "xxx*", "*xxx" and "*xxx*" matches,
+            as well as direct equality.  This behaviour can (of course) be overridden in 
+            derived classes.
+            </remarks>
+            <param name="methodName">The method name of the class.</param>
+            <param name="mappedName">The name in the descriptor.</param>
+            <returns><b>True</b> if the names match.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource.ReturnTransactionAttribute(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Return the <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> for this
+            method.
+            </summary>
+            <param name="method">The method to check.</param>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/>. May be null, in which case the declaring 
+            class of the supplied <paramref name="method"/> must be used.
+            </param>
+            <returns>
+            A <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> or 
+            null if the method is non-transactional.
+            </returns>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource.MethodMap">
+            <summary>
+            Set a name/attribute map, consisting of "FQCN.method, AssemblyName" method names
+            (e.g. "MyNameSpace.MyClass.MyMethod, MyAssembly") and ITransactionAttribute
+            instances (or Strings to be converted to <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> instances).
+            </summary>
+            <remarks>
+            <p>
+            The key values of the supplied <see cref="T:System.Collections.IDictionary"/>
+            must adhere to the following form:<br/>
+            <code>FQCN.methodName, Assembly</code>.
+            </p>
+            <example>
+            <code>MyNameSpace.MyClass.MyMethod, MyAssembly</code>
+            </example>
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.Objects.AdoScalar">
+            <summary>
+            Encapsulate Command ExecuteScalar operations within a reusable class. 
+            </summary>
+            <remarks>The default CommandType is CommandType.Text</remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AdoScalar.cs,v 1.3 2007/07/25 08:25:20 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Objects.AdoScalar.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.AdoScalar"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Objects.AdoScalar.#ctor(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.AdoScalar"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Objects.AdoScalar.#ctor(Spring.Data.Common.IDbProvider,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.AdoScalar"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.InvalidResultSetAccessException">
+            <summary>
+            Exception thrown when a result set has been accessed in an invalid fashion.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: InvalidResultSetAccessException.cs,v 1.2 2007/12/07 08:09:52 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.InvalidResultSetAccessException.sql">
+            <summary>
+            SQL that led to the problem
+            </summary>
+        </member>
+        <member name="M:Spring.Data.InvalidResultSetAccessException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.InvalidResultSetAccessException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.InvalidResultSetAccessException.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.InvalidResultSetAccessException"/> class.
+            </summary>
+            <param name="message">A message about the exception.</param>
+        </member>
+        <member name="M:Spring.Data.InvalidResultSetAccessException.#ctor(System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.InvalidResultSetAccessException"/> class.
+            </summary>
+            <param name="message">A message about the exception.</param>
+            <param name="inner">The inner exception.</param>
+        </member>
+        <member name="M:Spring.Data.InvalidResultSetAccessException.#ctor(System.String,System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.InvalidResultSetAccessException"/> class.
+            </summary>
+            <param name="task">name of the current task.</param>
+            <param name="sql">The offending SQL statment</param>
+            <param name="ex">The root cause.</param>
+        </member>
+        <member name="M:Spring.Data.InvalidResultSetAccessException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Data.InvalidResultSetAccessException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Data.InvalidResultSetAccessException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            When overridden in a derived class, sets the <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            with information about the exception.
+            </summary>
+            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="info"/> parameter is a null reference (<see langword="Nothing"/> in Visual Basic).</exception>
+        </member>
+        <member name="P:Spring.Data.InvalidResultSetAccessException.Sql">
+            <summary>
+            Gets the SQL that caused the exception
+            </summary>
+            <value>The SQL that caused the exception.</value>
+        </member>
+        <member name="T:Spring.Data.Common.UserCredentialsDbProvider">
+            <summary>
+            An adapter for a target IDbProvider, applying the specified user credentials
+            to the connection string for every GetConnection call.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Common.UserCredentialsDbProvider.SetCredentialsForCurrentThread(System.String,System.String)">
+            <summary>
+            Sets the user credentials for current thread.  The given username and password
+            strings will be added to the connection string for all subsequent GetConnection
+            requests.  This will override any statically specified user credentials, that is,
+            set by the properties Username nad Password.
+            </summary>
+            <param name="user">The username part of the connection string.</param>
+            <param name="pass">The password part of the connection string.</param>
+        </member>
+        <member name="M:Spring.Data.Common.UserCredentialsDbProvider.RemoveCredentialsFromCurrentThread">
+            <summary>
+            Removes the user credentials from current thread.  Use statically specified 
+            credentials afterwards.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Common.UserCredentialsDbProvider.CreateConnection">
+            <summary>
+            Returns a new connection object to communicate with the database.
+            Determine if there are currently thread-bound credentials, using them if
+            available, falling back to the statically specified username and password
+            (i.e. values of the properties 'Username' and 'Password') otherwise.  
+            The username and password will be concatenated on the connection string
+            using string in the Separator property
+            </summary>
+            <returns>A new <see cref="T:System.Data.IDbConnection"/></returns>
+        </member>
+        <member name="P:Spring.Data.Common.UserCredentialsDbProvider.Username">
+            <summary>
+            Sets the username string that will be appended to the connection string.
+            </summary>
+            <value>The username.</value>
+        </member>
+        <member name="P:Spring.Data.Common.UserCredentialsDbProvider.Password">
+            <summary>
+            Sets the password string that will be appended to the connection string.
+            </summary>
+            <value>The password.</value>
+        </member>
+        <member name="P:Spring.Data.Common.UserCredentialsDbProvider.Separator">
+            <summary>
+            Sets the separator used to separate elements of the connection string.  Default is ';'.
+            </summary>
+            
+            <value>The separator used to separate elements in the connection string.</value>
+        </member>
+        <member name="T:Spring.Data.Common.IDbParameter">
+            <summary>
+            A parameter interface used by <see cref="T:Spring.Data.Common.IDbParametersBuilder"/>
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IDbParameter.cs,v 1.6 2006/12/02 07:35:23 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.Common.ErrorCodes">
+            <summary>
+            Holds ADO.NET error codes for a particular provider. 
+            </summary>
+            <remarks>
+            Used by ErrorCodeExceptionTranslator.  The embedded resource
+            "dbProviders.xml" in Spring.Data.Common contains default
+            ErrorCodes instances for various providers.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ErrorCodes.cs,v 1.1 2007/08/01 18:53:06 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.Common.ErrorCodes.log">
+            <summary>
+            The shared log instance for this class (and derived classes). 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Common.ErrorCodes.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Common.ErrorCodes"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.TransactionAttribute">
+            <summary>
+            .NET Attribute for describing transactional behavior of methods in a class. 
+            </summary>
+            <remarks>This attribute type is generally directly comparable
+            to Spring's <see cref="T:Spring.Transaction.Interceptor.RuleBasedTransactionAttribute"/> class and
+            in fact <see cref="T:Spring.Transaction.Interceptor.AttributesTransactionAttributeSource"/> will
+            directly convert the data to a <see cref="T:Spring.Transaction.Interceptor.RuleBasedTransactionAttribute"/>
+            so that Spring's transaction support code does not have to know about
+            attributes. If no rules are relevant to the exception it will be treaded
+            like DefaultTransactionAttribute, (rolling back on all exceptions).
+            <para>
+            The default property values are TransactionPropagation.Required, IsolationLevel.ReadCommitted,
+            DefaultTransactionDefinition.TIMEOUT_DEFAULT (can be changed, by default is the default
+            value of the underlying transaction subsystem)
+            ReadOnly = false, and Type.EmtptyTypes specified for Rollbackfor and NoRollbackFor exception
+            types.
+            </para>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: TransactionAttribute.cs,v 1.8 2007/12/07 07:30:48 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttribute.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Transaction.Interceptor.TransactionAttribute"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttribute.#ctor(Spring.Transaction.TransactionPropagation)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Transaction.Interceptor.TransactionAttribute"/> class.
+            </summary>
+            <param name="transactionPropagation">The transaction propagation.</param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttribute.#ctor(Spring.Transaction.TransactionPropagation,System.Data.IsolationLevel)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Transaction.Interceptor.TransactionAttribute"/> class.
+            </summary>
+            <param name="transactionPropagation">The transaction propagation.</param>
+            <param name="isolationLevel">The isolation level.</param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttribute.#ctor(System.Data.IsolationLevel)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Transaction.Interceptor.TransactionAttribute"/> class.
+            </summary>
+            <param name="isolationLevel">The isolation level.</param>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAttribute.TransactionPropagation">
+            <summary>
+            Gets the transaction propagation.
+            </summary>
+            <remarks>Defaults to TransactionPropagation.Required</remarks>
+            <value>The transaction propagation.</value>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAttribute.IsolationLevel">
+            <summary>
+            Gets the isolation level.
+            </summary>
+            <remarks>Defaults to IsolationLevel.Unspecified</remarks>
+            <value>The isolation level.</value>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAttribute.Timeout">
+            <summary>
+            Gets or sets the timeout.
+            </summary>
+            <remarks>Defaults to the default timeout of the underlying transaction system.</remarks>
+            <value>The timeout.</value>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAttribute.ReadOnly">
+            <summary>
+            Gets or sets a value indicating whether the transaction is readonly.
+            </summary>
+            <remarks>Defaults to false</remarks>
+            <value><c>true</c> if read-only; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAttribute.RollbackFor">
+            <summary>
+            Gets or sets the zero or more exception types which
+            indicating which exception types must cause a transaction
+            rollback.
+            </summary>
+            <remarks>This is the preferred way to construct a rollback rule,
+            matching the exception class and subclasses.</remarks>
+            <value>The rollback types.</value>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAttribute.NoRollbackFor">
+            <summary>
+            Gets or sets zero or more exceptions types which
+            indicationg which exception type must <c>not</c>
+            cause a transaction rollback.
+            </summary>
+            <remarks>This is the preferred way to construct a rollback rule,
+            matching the exception type.</remarks>
+            <value>The no rollback for.</value>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAttribute.EnterpriseServicesInteropOption">
+            <summary>
+            Gets or sets the enterprise services interop option.
+            </summary>
+            <value>The enterprise services interop option.</value>
+        </member>
+        <member name="T:Spring.Transaction.IllegalTransactionStateException">
+            <summary>
+            Exception thrown when the existence or non-existence of a transaction
+            amounts to an illegal state according to the transaction propagation
+            behavior that applies.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: IllegalTransactionStateException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.IllegalTransactionStateException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.IllegalTransactionStateException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.IllegalTransactionStateException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.IllegalTransactionStateException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.IllegalTransactionStateException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.IllegalTransactionStateException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.IllegalTransactionStateException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.IllegalTransactionStateException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Data.Support.ConnectionTxPair">
+            <summary>
+            A simple holder for the current Connection/Transaction objects
+            to use within a given AdoTemplate Execute operation.  Used internally.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionTxPair.#ctor(System.Data.IDbConnection,System.Data.IDbTransaction)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Support.ConnectionTxPair"/> class.
+            </summary>
+            <param name="connection">The connection.</param>
+            <param name="transaction">The transaction.</param>
+        </member>
+        <member name="P:Spring.Data.Support.ConnectionTxPair.Connection">
+            <summary>
+            Gets the connection.
+            </summary>
+            <value>The connection.</value>
+        </member>
+        <member name="P:Spring.Data.Support.ConnectionTxPair.Transaction">
+            <summary>
+            Gets the transaction.
+            </summary>
+            <value>The transaction.</value>
+        </member>
+        <member name="T:Spring.Data.Objects.Generic.MappingAdoQueryWithContext">
+            <summary>
+            Reusable query in which concrete subclasses must implement the
+            abstract MapRow method to map each row of a single result set into an 
+            object.
+            </summary>
+            <remarks>The MapRow method is also passed the input parameters and
+            a dictionary to provide the method with calling context information
+            (if necessary).  If you do not need these additional parameters, use
+            the subclass MappingAdoQuery.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: MappingAdoQueryWithContext.cs,v 1.2 2007/07/25 13:32:39 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Data.Objects.Generic.AdoQuery">
+            <summary>
+            Place together the mapping logic to a plain .NET object
+            for one result set within the same class.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AdoQuery.cs,v 1.3 2007/07/25 13:32:39 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.AdoQuery.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.Generic.AdoQuery"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.AdoQuery.#ctor(Spring.Data.Common.IDbProvider,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.Generic.AdoQuery"/> class.
+            </summary>
+            <param name="provider">The database provider.</param>
+            <param name="sql">The SQL to execute</param>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.AdoQuery.Query``1">
+            <summary>
+            Convenient method to execute query without parameters or calling context.
+            </summary>
+            <typeparam name="T">The type parameter for the returned collection</typeparam>
+            <returns>List of mapped objects</returns>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.AdoQuery.QueryByNamedParam``1(System.Collections.IDictionary)">
+            <summary>
+            Convenient method to execute query with parameters but without calling context.
+            </summary>
+            <typeparam name="T">The type parameter for the returned collection</typeparam>
+            <param name="inParams">The parameters for the query.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.AdoQuery.QueryByNamedParam``1(System.Collections.IDictionary,System.Collections.IDictionary)">
+            <summary>
+            Convenient method to execute query with parameters and access to output parameter values.
+            </summary>
+            <typeparam name="T">The type parameter for the returned collection</typeparam>
+            <param name="inParams">The parameters for the query.</param>
+            <param name="outParams">The returned output parameters.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.AdoQuery.QueryByNamedParam``1(System.Collections.IDictionary,System.Collections.IDictionary,System.Collections.IDictionary)">
+            <summary>
+            Central execution method.  All named parameter execution goes through this method.
+            </summary>
+            <typeparam name="T">the type parameter for the returned collection</typeparam>
+            <param name="inParams">The in params.</param>
+            <param name="outParams">The out params.</param>
+            <param name="callingContext">The calling context.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.MappingAdoQueryWithContext.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.Generic.MappingAdoQueryWithContext"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.Common.DbProviderFactoryObject">
+            <summary>
+            A <see cref="T:Spring.Objects.Factory.IFactoryObject"/> implementation that
+            creates instances of the <see cref="T:Spring.Data.Common.IDbProvider"/> class.
+            </summary>
+            <remarks>Typically used as a convenience for retrieving shared 
+            <see cref="T:Spring.Data.Common.IDbProvider"/> in a Spring XML configuration file as compared to
+            using explict factory method support.
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.Common.DbProviderFactoryObject.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Data.Common.DbProviderFactoryObject"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Common.DbProviderFactoryObject.GetObject">
+            <summary>
+            Return an instance of and IDbProvider as configured by this factory
+            managed by this factory.
+            </summary>
+            <returns>
+            The same (singleton) instance of the IDbProvider managed by
+            this factory.
+            </returns>
+            <remarks>
+            	<note type="caution">
+            If this method is being called in the context of an enclosing IoC container and
+            returns <see langword="null"/>, the IoC container will consider this factory
+            object as not being fully initialized and throw a corresponding (and most
+            probably fatal) exception.
+            </note>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.Common.DbProviderFactoryObject.AfterPropertiesSet">
+            <summary>
+            Validates that the provider name is specified.
+            </summary>
+            <remarks>
+            Invoked by an <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            after it has injected all of an object's dependencies.
+            </remarks>
+            <exception cref="T:System.ArgumentException">
+            In the event of not setting the ProviderName.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Common.DbProviderFactoryObject.ValidateProperties">
+            <summary>
+            Validates the properties.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Common.DbProviderFactoryObject.ObjectType">
+            <summary>
+            Return the type of <see cref="T:Spring.Data.Common.IDbProvider"/>
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Common.DbProviderFactoryObject.IsSingleton">
+            <summary>
+            Returns true, as the the object managed by this factory is a singleton.
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Spring.Data.Common.DbProviderFactoryObject.Provider">
+            <summary>
+            Gets or sets the name of the database provider.
+            </summary>
+            <value>The name of the database provider.</value>
+        </member>
+        <member name="P:Spring.Data.Common.DbProviderFactoryObject.ConnectionString">
+            <summary>
+            Gets or sets the connection string.
+            </summary>
+            <value>The connection string.</value>
+        </member>
+        <member name="T:Spring.Dao.ObjectRetrievalFailureException">
+            <summary>
+            Exception thrown if a mapped object could not be retrieved via its identifier.
+            Provides information about the persistent class and the identifier.  
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ObjectRetrievalFailureException.cs,v 1.1 2006/12/13 18:40:11 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.ObjectRetrievalFailureException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.ObjectRetrievalFailureException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.ObjectRetrievalFailureException.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Dao.ObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="message">A message about the exception.</param>
+        </member>
+        <member name="M:Spring.Dao.ObjectRetrievalFailureException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.ObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception from the underlying data access API
+            </param>        
+        </member>
+        <member name="M:Spring.Dao.ObjectRetrievalFailureException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.ObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.ObjectRetrievalFailureException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            When overridden in a derived class, sets the <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            with information about the exception.
+            </summary>
+            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="info"/> parameter is a null reference (<see langword="Nothing"/> in Visual Basic).</exception>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.TransactionProxyFactoryObject">
+            <summary>
+            Proxy factory object for simplified declarative transaction handling.
+            </summary>
+            <remarks>
+            <p>
+            Alternative to the standard AOP <see cref="T:Spring.Aop.Framework.ProxyFactoryObject"/>
+            with a <see cref="T:Spring.Transaction.Interceptor.TransactionInterceptor"/>.
+            </p>
+            <p>
+            This class is intended to cover the <i>typical</i> case of declarative
+            transaction demarcation: namely, wrapping a (singleton) target object with a
+            transactional proxy, proxying all the interfaces that the target implements.
+            </p>
+            <p>
+            Internally, a <see cref="T:Spring.Transaction.Interceptor.TransactionInterceptor"/> 
+            instance is used, but the user of this class does not have to care. Optionally, an
+            <see cref="T:Spring.Aop.IPointcut"/> can be specified to cause conditional invocation of
+            the underlying <see cref="T:Spring.Transaction.Interceptor.TransactionInterceptor"/>.
+            </p> 
+            <p>
+            The
+            <see cref="P:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.PreInterceptors"/>
+            and
+            <see cref="P:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.PostInterceptors"/>
+            properties can be set to add additional interceptors to the mix.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Dmitriy Kopylenko</author>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: TransactionProxyFactoryObject.cs,v 1.7 2007/08/01 17:56:16 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.TransactionProxyFactoryObject"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.GetObject">
+            <summary>
+            Returns the object wrapped by this proxy factory.
+            </summary>
+            <returns>The target object proxy.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.AfterPropertiesSet">
+            <summary>
+            Method run after all the properties have been set for this object.
+            Responsible for actual proxy creation.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.createTargetSource(System.Object)">
+            <summary>
+            Set the target or <see cref="T:Spring.Aop.ITargetSource"/>.
+            </summary>
+            <param name="target">
+            The target. If this is an implementation of the <see cref="T:Spring.Aop.ITargetSource"/>
+            interface, it is used as our <see cref="T:Spring.Aop.ITargetSource"/>; otherwise it is
+            wrapped in a <see cref="T:Spring.Aop.Target.SingletonTargetSource"/>.
+            </param>
+            <returns>An <see cref="T:Spring.Aop.ITargetSource"/> for this object.</returns>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.PlatformTransactionManager">
+            <summary>
+            Set the transaction manager for this factory.
+            </summary>
+            <remarks>
+            It is this instance that will perform actual transaction management: this class is
+            just a way of invoking it.
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.Target">
+            <summary>
+            Set the target object, i.e. the object to be wrapped with a transactional proxy.
+            </summary>
+            <remarks>
+            <p>
+            The target may be any object, in which case a
+            <see cref="T:Spring.Aop.Target.SingletonTargetSource"/> will
+            be created. If it is a <see cref="T:Spring.Aop.Target.EmptyTargetSource"/>, no wrapper
+            <see cref="T:Spring.Aop.Target.EmptyTargetSource"/> is created: this enables the use of a pooling
+            or prototype <see cref="T:Spring.Aop.Target.EmptyTargetSource"/>.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.ProxyInterfaces">
+            <summary>
+            Specify the set of interfaces being proxied.
+            </summary>
+            <remarks>
+            <p>
+            If left null (the default), the AOP infrastructure works
+            out which interfaces need proxying by analyzing the target,
+            proxying <b>all</b> of the interfaces that the target object implements.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.TransactionAttributes">
+            <summary>
+            Set properties with method names as keys and transaction attribute
+            descriptors as values.
+            </summary>
+            <remarks>
+            <p>
+            The various transaction attribute descriptors are parsed via
+            an instance of the
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAttributeEditor"/> class.
+            </p>
+            <note>
+            Method names are always applied to the target class, no matter if defined in an
+            interface or the class itself.
+            </note>
+            <p>
+            Internally, a
+            <see cref="T:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource"/>
+            will be created from the given properties.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            An example string (method name and transaction attributes) might be:
+            </p>
+            <p>
+            key = "myMethod", value = "PROPAGATION_REQUIRED,readOnly".
+            </p>
+            </example>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.TransactionAttributeSource">
+            <summary>
+            Set the transaction attribute source which is used to find transaction
+            attributes.
+            </summary>
+            <remarks>
+            <p>
+            If specifying a <see cref="T:System.String"/> property value, an
+            appropriate <see cref="T:System.ComponentModel.TypeConverter"/>
+            implementation will create a
+            <see cref="T:Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource"/>
+            from the value.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.TruePointcut">
+            <summary>
+            Set a pointcut, i.e an object that can cause conditional invocation
+            of the <see cref="T:Spring.Transaction.Interceptor.TransactionInterceptor"/>
+            depending on method and attributes passed.
+            </summary>
+            <remarks>
+            <note>
+            Additional interceptors are always invoked.
+            </note>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.PreInterceptors">
+            <summary>
+            Set additional interceptors (or advisors) to be applied before the
+            implicit transaction interceptor.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.PostInterceptors">
+            <summary>
+            Set additional interceptors (or advisors) to be applied after the
+            implicit transaction interceptor.
+            </summary>
+            <remarks>
+            <p>
+            Note that this is just necessary if you rely on those interceptors in general.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.AdvisorAdapterRegistry">
+            <summary>
+            Specify the <see cref="T:Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry"/> to use.
+            </summary>
+            <remarks>The default instance is the global AdvisorAdapterRegistry.</remarks>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.ObjectType">
+            <summary>
+            Returns the object <see cref="T:System.Type"/> for this proxy factory.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionProxyFactoryObject.IsSingleton">
+            <summary>
+            Is this object a singleton?  Always returns <b>true</b> in this implementation.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.AttributesTransactionAttributeSource">
+            <summary>
+            Implementation of <see cref="T:Spring.Transaction.Interceptor.ITransactionAttributeSource"/> that uses
+            <see cref="T:System.Attribute"/>s.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AttributesTransactionAttributeSource.cs,v 1.6 2007/08/08 20:59:50 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource">
+            <summary>
+            Abstract implementation of
+            <see cref="T:Spring.Transaction.Interceptor.ITransactionAttributeSource"/>
+            that caches attributes for methods, and implements a default fallback policy.
+            </summary>
+            <remarks>
+            <p>
+            The default fallback policy applied by this class is:
+            <list type="numbered">
+            <item>
+            <description>most specific method</description>
+            </item>
+            <item>
+            <description>target class attribute</description>
+            </item>
+            <item>
+            <description>declaring method</description>
+            </item>
+            <item>
+            <description>declaring class</description>
+            </item>
+            </list>
+            </p>
+            <p>
+            Defaults to using class's transaction attribute if none is associated
+            with the target method. Any transaction attribute associated with the
+            target method completely overrides a class transaction attribute.
+            </p>
+            <p>
+            This implementation caches attributes by method after they are first used.
+            If it's ever desirable to allow dynamic changing of transaction attributes
+            (unlikely) caching could be made configurable. Caching is desirable because
+            of the cost of evaluating rollback rules.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AbstractFallbackTransactionAttributeSource.cs,v 1.8 2007/09/20 12:31:01 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource.NULL_TX_ATTIBUTE">
+            <summary>
+            Canonical value held in cache to indicate no transaction attibute was found
+            for this method, and we don't need to look again.
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource._transactionAttibuteCache">
+            <summary>
+            Cache of <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/>s, keyed by method and target class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource"/>
+            class.
+            </summary>
+            <remarks>
+            <p>
+            This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource.FindAllAttributes(System.Reflection.MethodInfo)">
+            <summary>
+            Subclasses should implement this to return all attributes for this method.
+            May return null.
+            </summary>
+            <remarks>
+            We need all because of the need to analyze rollback rules.
+            </remarks>
+            <param name="method">The method to retrieve attributes for.</param>
+            <returns>The transactional attributes associated with the method.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource.FindAllAttributes(System.Type)">
+            <summary>
+            Subclasses should implement this to return all attributes for this class.
+            May return null.
+            </summary>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> to retrieve attributes for.
+            </param>
+            <returns>
+            All attributes associated with the supplied <paramref name="targetType"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource.ReturnTransactionAttribute(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Return the transaction attribute for this method invocation.
+            </summary>
+            <remarks>
+            Defaults to the class's transaction attribute if no method
+            attribute is found
+            </remarks>
+            <param name="method">method for the current invocation. Can't be null</param>
+            <param name="targetType">target class for this invocation. May be null.</param>
+            <returns><see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> for this method, or null if the method is non-transactional</returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource.FindTransactionAttribute(System.Attribute[])">
+            <summary>
+            Return the transaction attribute, given this set of attributes
+            attached to a method or class. Return null if it's not transactional.  
+            </summary>
+            <remarks>
+            Protected rather than private as subclasses may want to customize
+            how this is done: for example, returning a
+            <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/>
+            affected by the values of other attributes.
+            This implementation takes into account
+            <see cref="T:Spring.Transaction.Interceptor.RollbackRuleAttribute"/>s, if
+            the TransactionAttribute is a RuleBasedTransactionAttribute.
+            </remarks>
+            <param name="attributes">
+            Attributes attached to a method or class. May be null, in which case a null
+            <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> will be returned.
+            </param>
+            <returns>
+            The <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> configured transaction attribute, or null
+            if none was found.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.AttributesTransactionAttributeSource.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Transaction.Interceptor.AttributesTransactionAttributeSource"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.AttributesTransactionAttributeSource.FindAllAttributes(System.Reflection.MethodInfo)">
+            <summary>
+            <see cref="M:Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource.FindAllAttributes(System.Reflection.MethodInfo)"/>
+            implementation.
+            </summary>
+            <remarks>
+            We need all because of the need to analyze rollback rules.
+            </remarks>
+            <param name="method">The method to retrieve attributes for.</param>
+            <returns>The transactional attributes associated with the method.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.AttributesTransactionAttributeSource.FindAllAttributes(System.Type)">
+            <summary>
+            <see cref="M:Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource.FindAllAttributes(System.Type)"/>
+            implementation.
+            </summary>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> to retrieve attributes for.
+            </param>
+            <returns>
+            All attributes associated with the supplied <paramref name="targetType"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Data.Support.ErrorCodeExceptionTranslator">
+            <summary>
+            Implementation of IAdoExceptionTranslator that analyzes provider specific
+            error codes and translates into the DAO exception hierarchy.
+            </summary>
+            <remarks>This class loads the obtains error codes from
+            the IDbProvider metadata property ErrorCodes  
+            which defines error code mappings for various providers.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ErrorCodeExceptionTranslator.cs,v 1.11 2007/12/06 20:14:30 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Data.Support.ErrorCodeExceptionTranslator.log">
+            <summary>
+            The shared log instance for this class (and derived classes). 
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.ErrorCodeExceptionTranslator.#ctor(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Support.ErrorCodeExceptionTranslator"/> class.
+            </summary>
+            <param name="provider">The data provider.</param>
+        </member>
+        <member name="M:Spring.Data.Support.ErrorCodeExceptionTranslator.#ctor(Spring.Data.Common.IDbProvider,Spring.Data.Common.ErrorCodes)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Support.ErrorCodeExceptionTranslator"/> class.
+            </summary>
+            <param name="provider">The data provider.</param>
+            <param name="ec">The error code collection.</param>
+        </member>
+        <member name="M:Spring.Data.Support.ErrorCodeExceptionTranslator.Translate(System.String,System.String,System.Exception)">
+            <summary>
+            Translate the given <see cref="T:System.SystemException"/> into a generic data access exception.
+            </summary>
+            <param name="task">A readable string describing the task being attempted.</param>
+            <param name="sql">The SQL query or update that caused the problem. May be null.</param>
+            <param name="exception">
+            The <see cref="T:System.Exception"/> encountered by the ADO.NET implementation.
+            </param>
+            <returns>
+            A <see cref="T:Spring.Dao.DataAccessException"/> appropriate for the supplied
+            <paramref name="exception"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.Support.ErrorCodeExceptionTranslator.TranslateException(System.String,System.String,System.String,System.Exception)">
+            <summary>
+            Subclasses can override this method to attempt a custom mapping from a data access Exception
+            to DataAccessException.
+            </summary>
+            <param name="task">Readable text describing the task being attempted.</param>
+            <param name="sql">SQL query or update that caused the problem. May be <code>null</code>.</param>
+            <param name="errorCode">The error code extracted from the generic data access exception for
+            a particular provider.</param>
+            <param name="exception">The exception thrown from a data access operation.</param>
+            <returns>
+            null if no custom translation was possible, otherwise a DataAccessException
+            resulting from custom translation.  This exception should include the exception parameter
+            as a nested root cause. This implementation always returns null, meaning that
+            the translator always falls back to the default error codes.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.Support.ErrorCodeExceptionTranslator.BuildMessage(System.String,System.String,System.Exception)">
+            <summary>
+            Builds the message.
+            </summary>
+            <param name="task">The task.</param>
+            <param name="sql">The SQL.</param>
+            <param name="exception">The exception.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Data.Support.ErrorCodeExceptionTranslator.IsValidDataAccessException(System.Exception)">
+            <summary>
+            Determines whether the specified exception is valid data access exception.
+            </summary>
+            <param name="e">The exception.</param>
+            <returns>
+            	<c>true</c> if is valid data access exception; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.Support.ErrorCodeExceptionTranslator.LogTranslation(System.String,System.String,System.String,System.Exception,System.Boolean)">
+            <summary>
+            Logs the translation.
+            </summary>
+            <param name="task">The task.</param>
+            <param name="sql">The SQL.</param>
+            <param name="errorCode">The error code.</param>
+            <param name="exception">The exception.</param>
+            <param name="b">if set to <c>true</c> [b].</param>
+        </member>
+        <member name="P:Spring.Data.Support.ErrorCodeExceptionTranslator.DbProvider">
+            <summary>
+            Sets the db provider.
+            </summary>
+            <value>The db provider.</value>
+        </member>
+        <member name="P:Spring.Data.Support.ErrorCodeExceptionTranslator.ErrorCodes">
+            <summary>
+            Gets the error codes for the provider
+            </summary>
+            <value>The error codes.</value>
+        </member>
+        <member name="P:Spring.Data.Support.ErrorCodeExceptionTranslator.FallbackTranslator">
+            <summary>
+            Gets or sets the fallback translator to use in case error code based translation
+            fails.
+            </summary>
+            <value>The fallback translator.</value>
+        </member>
+        <member name="T:Spring.Data.IDataAdapterCallback">
+            <summary>
+            Generic callback interface for code that operates on a 
+            IDbDataAdapter. 
+            </summary>
+            <remarks>
+            <p>Allows you to execute any number of operations
+            on a IDbDataAdapter, for example to Fill a DataSet
+            or other more advanced operations such as the transfering
+            data between two different DataSets.
+            </p>
+            <p>Note that the passed in IDbDataAdapter
+            has been created by the framework and its SelectCommand
+            will be populated with values for CommandType and Text properties
+            along with Connection/Transaction properties based on the
+            calling transaction context.
+             </p>
+            <see cref="T:Spring.Data.Core.AdoTemplate"/> Execute(IDataAdapterCallback dataAdapterCallback)
+            method.
+            </remarks>    
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IDataAdapterCallback.cs,v 1.3 2007/12/04 06:49:17 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.IDataAdapterCallback.DoInDataAdapter(System.Data.IDbDataAdapter)">
+            <summary>
+            Called by AdoTemplate.Execute with an preconfigured
+            ADO.NET IDbDataAdapter instance with its SelectCommand
+            property populated with CommandType and Text values
+            along with Connection/Transaction properties based on the
+            calling transaction context.
+            </summary>
+            <param name="dataAdapter">An active IDbDataAdapter instance</param>
+            <returns>The result object</returns>
+        </member>
+        <member name="T:Spring.Data.Generic.RowMapperDelegate`1">
+            <summary>
+            Callback delegate to process each row of data in a result set to an object.
+            </summary>
+            <typeparam name="T">The type of the object returned from the mapping operation.</typeparam>
+            <param name="dataReader">The IDataReader to map</param>
+            <param name="rowNum">the number of the current row.</param>
+            <returns>An abrirary object, typically derived from data
+            in the result set.</returns>
+        </member>
+        <member name="T:Spring.Data.Core.RowMapperResultSetExtractor">
+            <summary>
+            Adapter implementation of the ResultSetExtractor interface that delegates 
+            to a RowMapper which is supposed to create an object for each row.
+            Each object is added to the results List of this ResultSetExtractor.
+            </summary>
+            <remarks>
+            Useful for the typical case of one object per row in the database table.
+            The number of entries in the results list will match the number of rows.
+            <p>
+            Note that a RowMapper object is typically stateless and thus reusable;
+            just the RowMapperResultSetExtractor adapter is stateful.
+            </p>
+            <p>
+            As an alternative consider subclassing MappingAdoQuery from the 
+            Spring.Data.Objects namespace:  Instead of working with separate 
+            AdoTemplate and IRowMapper objects you can have executable
+            query objects (containing row-mapping logic) there.
+            </p>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: RowMapperResultSetExtractor.cs,v 1.1 2007/08/03 19:51:11 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Core.RowMapperResultSetExtractor.#ctor(Spring.Data.IRowMapper)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Core.RowMapperResultSetExtractor"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Common.IDbParameters.Contains(System.String)">
+            <summary>
+            Determines whether this collection contains the specified parameter name.
+            </summary>
+            <param name="parameterName">Name of the parameter.</param>
+            <returns>
+            	<c>true</c> if contains the specified parameter name; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.Common.IDbParameters.AddParameter(System.Data.IDataParameter)">
+            <summary>
+            Add an instance of <see cref="T:System.Data.IDbDataParameter"/>.
+            </summary>
+            <param name="dbParameter"></param>
+        </member>
+        <member name="M:Spring.Data.Common.IDbParameters.AddParameter(System.String,System.Enum,System.Int32,System.Data.ParameterDirection,System.Boolean,System.Byte,System.Byte,System.String,System.Data.DataRowVersion,System.Object)">
+            <summary>
+            Add a parameter specifying the all the individual properties of a
+            IDbDataParameter.
+            </summary>
+            <param name="name"></param>
+            <param name="parameterType"></param>
+            <param name="size"></param>
+            <param name="direction"></param>
+            <param name="isNullable"></param>
+            <param name="precision"></param>
+            <param name="scale"></param>
+            <param name="sourceColumn"></param>
+            <param name="sourceVersion"></param>
+            <param name="parameterValue"></param>
+            <returns>The newly created parameter</returns>
+        </member>
+        <member name="M:Spring.Data.Common.IDbParameters.AddParameter(System.String,System.Enum,System.Data.ParameterDirection,System.Boolean,System.Byte,System.Byte,System.String,System.Data.DataRowVersion,System.Object)">
+             <summary>
+            
+             </summary>
+             <param name="name"></param>
+             <param name="parameterType"></param>
+             <param name="direction"></param>
+             <param name="isNullable"></param>
+             <param name="precision"></param>
+             <param name="scale"></param>
+             <param name="sourceColumn"></param>
+             <param name="sourceVersion"></param>
+             <param name="parameterValue"></param>
+             <returns>The newly created parameter</returns>
+        </member>
+        <member name="M:Spring.Data.Common.IDbParameters.Add(System.Object)">
+            <summary>
+            Adds a value to the parameter collection
+            </summary>
+            <remarks>This method can not be used with stored procedures for
+            providers that require named parameters.  However, it is of
+            great convenience for other cases.</remarks>
+            <param name="parameterValue">The value of the parameter.</param>
+            <returns>Index of added parameter.</returns>
+        </member>
+        <member name="M:Spring.Data.Common.IDbParameters.AddRange(System.Array)">
+            <summary>
+            Adds a range of vlaues to the parameter collection.
+            </summary>
+            <remarks>This method can not be used with stored procedures for
+            providers that require named parameters.  However, it is of
+            great convenience for other cases.</remarks>
+            <param name="values"></param>
+        </member>
+        <member name="P:Spring.Data.Common.IDbParameters.Item(System.String)">
+            <summary>
+            Gets the underlying standard ADO.NET <see cref="T:System.Data.IDbDataParameter"/> for the specified parameter name.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Common.IDbParameters.Item(System.Int32)">
+            <summary>
+            Gets the underlying standard ADO.NET <see cref="T:System.Data.IDbDataParameter"/> for the specified index.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Common.IDbParameters.DataParameterCollection">
+            <summary>
+            Returns the underlying standard ADO.NET parameters collection.
+            </summary>
+        </member>
+        <member name="T:Spring.Data.CommandDelegate">
+            <summary>
+            Callback delegate for code that operates on a IDbCommand. 
+            </summary>
+            <param name="command">the ADO.NET command object.</param>
+            <remarks>
+            <p>Allows you to execute any number of operations
+            on a single IDbCommand, for example a single ExecuteScalar
+            call or repeated execute calls with varying parameters.
+            </p>
+            <p>Used internally by AdoTemplate, but also useful for 
+            application code.  Note that the passed in IDbCommand
+            has been created by the framework and will have its
+            Connection property set and the Transaction property
+            set based on the transaction context.</p>
+            </remarks>
+            <author>Mark Pollack</author>
+        </member>
+        <member name="T:Spring.Transaction.TransactionSuspensionNotSupportedException">
+            <summary>
+            Exception thrown when attempting to suspend an existing transaction
+            but transaction suspension is not supported by the underlying backend.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: TransactionSuspensionNotSupportedException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.TransactionSuspensionNotSupportedException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionSuspensionNotSupportedException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.TransactionSuspensionNotSupportedException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionSuspensionNotSupportedException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.TransactionSuspensionNotSupportedException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionSuspensionNotSupportedException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.TransactionSuspensionNotSupportedException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.TransactionSuspensionNotSupportedException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Transaction.Support.DefaultTransactionStatus">
+            <summary>
+            Default implementation of the <see cref="T:Spring.Transaction.ITransactionStatus"/> interface,
+            used by <see cref="T:Spring.Transaction.Support.AbstractPlatformTransactionManager"/>.
+            </summary>
+            <remarks>
+            <p>
+            Holds all status information that
+            <see cref="T:Spring.Transaction.Support.AbstractPlatformTransactionManager"/>
+            needs internally, including a generic transaction object determined by
+            the concrete transaction manager implementation.
+            </p>
+            <p>
+            Supports delegating savepoint-related methods to a transaction object
+            that implements the <see cref="T:Spring.Transaction.ISavepointManager"/> interface.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: DefaultTransactionStatus.cs,v 1.14 2007/12/06 06:23:33 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Transaction.ITransactionStatus">
+            <summary>
+            Representation of the status of a transaction,
+            consisting of a transaction object and some status flags.
+            </summary>
+            <remarks>
+            <p>
+            Transactional code can use this to retrieve status information,
+            and to programmatically request a rollback (instead of throwing
+            an exception that causes an implicit rollback).
+            </p>
+            <p>
+            Derives from the <see cref="T:Spring.Transaction.ISavepointManager"/> interface to provide access
+            to savepoint management facilities. Note that savepoint management
+            is just available if the actual transaction manager supports it.
+            </p>
+            </remarks>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ITransactionStatus.cs,v 1.11 2007/08/01 18:53:05 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Transaction.ITransactionStatus.IsNewTransaction">
+            <summary>
+            Returns <b>true</b> if the transaction is new, else <b>false</b> if participating
+            in an existing transaction.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.ITransactionStatus.RollbackOnly">
+            <summary>
+            Gets / sets if the transaction is rollback-only.
+            </summary>
+            <remarks>
+            <p>
+            This instructs the transaction manager that the only possible outcome of
+            the transaction may be a rollback, proceeding with the normal application
+            workflow though (i.e. no exception).
+            </p>
+            <p>
+            For transactions managed by a
+            <see cref="T:Spring.Transaction.Support.TransactionTemplate"/> or
+            <see cref="T:Spring.Transaction.Interceptor.TransactionInterceptor"/>.
+            An alternative way to trigger a rollback is throwing an transaction exception.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Transaction.ITransactionStatus.Transaction">
+            <summary>
+            Gets the current transaction object.
+            </summary>
+            <remarks>
+            Returns the current transaction object for a given connection.
+            <p>
+            Used to associate with the <see cref="P:System.Data.IDbCommand.Transaction"/> property.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Transaction.Support.DefaultTransactionStatus.#ctor(System.Object,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Object)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Support.DefaultTransactionStatus"/> class.
+            </summary>
+            <param name="transaction">The underlying transaction object that can hold state for the internal
+            transaction implementation.</param>
+            <param name="newTransaction">True if the transaction is new, else false if participating in an existing transaction.</param>
+            <param name="newSynchronization">True if a new transaction synchronization has been opened for the given
+            <paramref name="transaction"/>.</param>
+            <param name="readOnly">True if the transaction is read only.</param>
+            <param name="debug">if set to <c>true</c>, enable debug log in tx managers.</param>
+            <param name="suspendedResources">The suspended resources for the given <paramref name="transaction"/>.</param>
+        </member>
+        <member name="M:Spring.Transaction.Support.DefaultTransactionStatus.HasTransaction">
+            <summary>
+            Determines whether there is an actual transaction active.
+            </summary>
+            <returns>
+            	<c>true</c> if there is an actual transaction active; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Support.DefaultTransactionStatus.CreateSavepoint(System.String)">
+            <summary>
+            This implementation delegates to the underlying transaction object
+            (if it implements the <see cref="T:Spring.Transaction.ISavepointManager"/> interface)
+            to create a savepoint.
+            </summary>
+            <exception cref="T:Spring.Transaction.NestedTransactionNotSupportedException">
+            If the underlying transaction does not support savepoints.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.DefaultTransactionStatus.RollbackToSavepoint(System.String)">
+            <summary>
+            This implementation delegates to the underlying transaction object
+            (if it implements the <see cref="T:Spring.Transaction.ISavepointManager"/> interface)
+            to rollback to the supplied <paramref name="savepoint"/>.
+            </summary>
+            <param name="savepoint">The savepoint to rollback to.</param>
+        </member>
+        <member name="M:Spring.Transaction.Support.DefaultTransactionStatus.ReleaseSavepoint(System.String)">
+            <summary>
+            This implementation delegates to the underlying transaction object
+            (if it implements the <see cref="T:Spring.Transaction.ISavepointManager"/> interface)
+            to release the supplied <paramref name="savepoint"/>.
+            </summary>
+            <param name="savepoint">The savepoint to release.</param>
+        </member>
+        <member name="M:Spring.Transaction.Support.DefaultTransactionStatus.CreateAndHoldSavepoint(System.String)">
+            <summary>
+            Create a savepoint and hold it for the transaction.
+            </summary>
+            <exception cref="T:Spring.Transaction.NestedTransactionNotSupportedException">
+            If the underlying transaction does not support savepoints.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.DefaultTransactionStatus.RollbackToHeldSavepoint">
+            <summary>
+            Roll back to the savepoint that is held for the transaction.
+            </summary>
+            <exception cref="T:Spring.Transaction.TransactionUsageException">
+            If no save point has been created.
+            </exception>
+        </member>
+        <member name="M:Spring.Transaction.Support.DefaultTransactionStatus.ReleaseHeldSavepoint">
+            <summary>
+            Release the savepoint that is held for the transaction.
+            </summary>
+            <exception cref="T:Spring.Transaction.TransactionUsageException">
+            If no save point has been created.
+            </exception>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionStatus.Debug">
+            <summary>
+            Gets a value indicating whether the progress of this transaction is debugged. 
+            This is used by AbstractPlatformTransactionManager as an optimization, to prevent repeated
+            calls to log.IsDebug. Not really intended for client code.</summary>
+            <value><c>true</c> if debug; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionStatus.Transaction">
+            <summary>
+            Returns the underlying transaction object.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionStatus.Completed">
+            <summary>
+            Gets or sets a value indicating whether the Transaction is completed, that is commited or rolled back.
+            </summary>
+            <value><c>true</c> if completed; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionStatus.ReadOnly">
+            <summary>
+            Returns true if the underlying transaction is read only.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionStatus.NewSynchronization">
+            <summary>
+            Flag indicating if a new transaction synchronization has been opened
+            for this transaction.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionStatus.SuspendedResources">
+            <summary>
+            Returns suspended resources for this transaction.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionStatus.Savepoint">
+            <summary>
+            Gets and sets the savepoint for the current transaction, if any. 
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionStatus.HasSavepoint">
+            <summary>
+            Returns a flag indicating if the transaction has a savepoint.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionStatus.SavepointManager">
+            <summary>
+            Return the underlying transaction as a
+            <see cref="T:Spring.Transaction.ISavepointManager"/>, if possible.
+            </summary>
+            <exception cref="T:Spring.Transaction.NestedTransactionNotSupportedException">
+            If the underlying transaction does not support savepoints.
+            </exception>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionStatus.IsTransactionSavepointManager">
+            <summary>
+            Return true if the underlying transaction implements the
+            <see cref="T:Spring.Transaction.ISavepointManager"/> interface.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionStatus.IsNewTransaction">
+            <summary>
+            Returns <b>true</b> if the transaction is new, else <b>false</b> if participating
+            in an existing transaction.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionStatus.RollbackOnly">
+            <summary>
+            Determine the rollbackOnly flag via checking both this
+            <see cref="T:Spring.Transaction.ITransactionStatus"/>
+            and the transaction object, provided that the latter implements the
+            <see cref="T:Spring.Transaction.Support.ISmartTransactionObject"/> interface.
+            </summary>
+            <remarks>The property can only be set to true.</remarks>
+        </member>
+        <member name="P:Spring.Transaction.Support.DefaultTransactionStatus.LocalRollbackOnly">
+            <summary>
+            Determine the rollback-only flag via checking this TransactionStatus.  Will only
+            return true if the application set the property RollbackOnly to true on this
+            TransactionStatus object.
+            </summary>
+            <value><c>true</c> if [local rollback only]; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.TransactionAttributeSourceEditor">
+            <summary>
+            Editor that can convert <see cref="T:System.String"/> values into
+            <see cref="T:Spring.Transaction.Interceptor.ITransactionAttributeSource"/> instances.
+            </summary>
+            <remarks>
+            The transaction attribute string must be parseable by the
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAttributeEditor"/> in this package.
+            <p>
+            Strings must be specified in the following syntax:<br/>
+            <code>FQCN.methodName=&lt;transaction attribute string&gt;</code> (sans &lt;&gt;).
+            </p>
+            <example>
+            <code>ExampleNamespace.ExampleClass.MyMethod=PROPAGATION_MANDATORY,ISOLATION_DEFAULT</code>
+            </example>
+            <note>
+            The specified class must be the one where the methods are defined; in the case of
+            implementing an interface, the interface class name must be specified.
+            </note>
+            <p>
+            This will register all overloaded methods for a given name. Does not support explicit
+            registration of certain overloaded methods. Supports wildcard style mappings (in
+            the form "xxx*"), e.g. "Notify*" for "Notify" and "NotifyAll".
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: TransactionAttributeSourceEditor.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttributeSourceEditor.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAttributeSourceEditor.PropertiesEditor"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttributeSourceEditor.SetAsText(System.String)">
+            <summary>
+            Parses the input properties <see cref="T:System.String"/> into a valid
+            <see cref="T:Spring.Transaction.Interceptor.ITransactionAttributeSource"/>
+            instance
+            </summary>
+            <param name="attributeSource">The properties string to be parsed.</param>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAttributeSourceEditor.Value">
+            <summary>
+            Gets the <see cref="T:Spring.Transaction.Interceptor.ITransactionAttributeSource"/>
+            from this instance.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.TransactionAttributeSourceEditor.PropertiesEditor">
+            <summary>
+            Internal class to parse property values.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.TransactionAttributeSourceEditor.PropertiesEditor.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAttributeSourceEditor.PropertiesEditor"/> class.
+            </summary>
+            <param name="properties">The property values to be parsed.</param>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAttributeSourceEditor.PropertiesEditor.Item(System.String)">
+            <summary>
+            Indexer to return values based on index value.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.TransactionAttributeSourceEditor.PropertiesEditor.Keys">
+            <summary>
+            Returns the collection of keys for properties.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.RuleBasedTransactionAttribute">
+            <summary>
+            <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> implementation
+            that works out whether a given exception should cause transaction rollback by applying
+            a number of rollback rules, both positive and negative.
+            </summary>
+            <remarks>
+            If no rules are relevant to the exception, it behaves like the 
+            <see cref="T:Spring.Transaction.Interceptor.DefaultTransactionAttribute"/> class
+            (rolling back on runtime exceptions)..
+            <p>
+            The <see cref="T:Spring.Transaction.Interceptor.TransactionAttributeEditor"/> 
+            creates objects of this class.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: RuleBasedTransactionAttribute.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RuleBasedTransactionAttribute.#ctor(Spring.Transaction.TransactionPropagation,System.Collections.IList)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.RuleBasedTransactionAttribute"/>
+            class.
+            </summary>
+            <param name="transactionPropagation">
+            The desired transaction propagation behaviour.
+            </param>
+            <param name="ruleList">
+            The rollback rules list for this transaction attribute.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RuleBasedTransactionAttribute.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.RuleBasedTransactionAttribute"/>
+            class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RuleBasedTransactionAttribute.RollbackOn(System.Exception)">
+            <summary>
+            Will a transaction be rolled back if the supplied <parameref name="exception"/>
+            is thrown during the lifecycle of a transaction to which this attribute is applied?
+            </summary>
+            <param name="exception">The offending <see cref="T:System.Exception"/>.</param>
+            <returns>True if the exception should cause a rollback, false otherwise.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RuleBasedTransactionAttribute.ToString">
+            <summary>
+            Returns a <see cref="T:System.String"/> representation of this instance.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> representation of this instance.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RuleBasedTransactionAttribute.AddRollbackRule(Spring.Transaction.Interceptor.RollbackRuleAttribute)">
+            <summary>
+            Adds a <see cref="T:Spring.Transaction.Interceptor.RollbackRuleAttribute"/> to this
+            attributes list of rollback rules.
+            </summary>
+            <param name="rule">
+            The <see cref="T:Spring.Transaction.Interceptor.RollbackRuleAttribute"/> to add.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.RuleBasedTransactionAttribute.ClearRollbackRules">
+            <summary>
+            Clears the rollback rules for this attribute.
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.RuleBasedTransactionAttribute.RollbackRules">
+            <summary>
+            Sets the rollback rules list for this transaction attribute.
+            </summary>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource">
+            <summary>
+            Simple implementation of the <see cref="T:Spring.Transaction.Interceptor.ITransactionAttributeSource"/>
+            that allows attributes to be matched by registered name.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: NameMatchTransactionAttributeSource.cs,v 1.8 2008/05/27 19:06:57 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource.log">
+            <summary>
+            Logger available to subclasses, static for optimal serialization
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource.nameMap">
+            <summary>
+            Keys are method names; values are ITransactionAttributes
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource.IsMatch(System.String,System.String)">
+            <summary>
+            Does the supplied <paramref name="methodName"/> match the supplied <paramref name="mappedName"/>?
+            </summary>
+            <remarks>
+            The default implementation checks for "xxx*", "*xxx" and "*xxx*" matches,
+            as well as direct equality. Can be overridden in subclasses.
+            </remarks>
+            <param name="methodName">The method name of the class.</param>
+            <param name="mappedName">The name in the descriptor.</param>
+            <returns><b>True</b> if the names match.</returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource.AddTransactionMethod(System.String,Spring.Transaction.Interceptor.ITransactionAttribute)">
+            <summary>
+            Add an attribute for a transactional method.
+            </summary>
+            <remarks>
+            <p>
+            Method names can end with "*" for matching multiple methods.
+            </p>
+            </remarks>
+            <param name="methodName">The transactional method name.</param>
+            <param name="attribute">
+            The attribute to be associated with the method.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource.SetProperties(System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Parses the given properties into a name/attribute map.
+            </summary>
+            <remarks>
+            Expects method names as keys and string attributes definitions as values,
+            parsable into <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> 
+            instances via 
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAttributeEditor"/>.
+            </remarks>
+            <param name="transactionAttributes">The properties of the transaction.</param>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource.ReturnTransactionAttribute(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Return the <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> for this
+            method.
+            </summary>
+            <param name="method">The method to check.</param>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/>. May be null, in which case the declaring 
+            class of the supplied <paramref name="method"/> must be used.
+            </param>
+            <returns>
+            A <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> or 
+            null if the method is non-transactional.
+            </returns>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource.NameMap">
+            <summary>
+            Set a name/attribute map, consisting of method names (e.g. "MyMethod") and
+            <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> instances
+            (or Strings to be converted to ITransactionAttribute instances).
+            </summary>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource.NameProperties">
+            <summary>
+            Parses the given properties into a name/attribute map.
+            </summary>
+            <remarks>
+            Expects method names as keys and string attributes definitions as values,
+            parsable into <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> 
+            instances via 
+            <see cref="T:Spring.Transaction.Interceptor.TransactionAttributeEditor"/>.
+            </remarks>
+            <value>The properties of the transaction.</value>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.MatchAlwaysTransactionAttributeSource">
+            <summary>
+            Very simple implementation of <see cref="T:Spring.Transaction.Interceptor.ITransactionAttributeSource"/> 
+            which will always return the same <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> 
+            for all methods fed to it.
+            </summary>
+            <remarks>
+            <p>
+            The <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/>
+            may be specified, but will otherwise default to PROPAGATION_REQUIRED. This may be
+            used in the cases where you want to use the same transaction attribute with all
+            methods being handled by a transaction interceptor.
+            </p>
+            </remarks>
+            <author>Colin Sampaleanu</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: MatchAlwaysTransactionAttributeSource.cs,v 1.7 2007/12/29 00:28:53 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.MatchAlwaysTransactionAttributeSource.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.MatchAlwaysTransactionAttributeSource"/>
+            class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.MatchAlwaysTransactionAttributeSource.ReturnTransactionAttribute(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Return the <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> for this
+            method.
+            </summary>
+            <param name="method">The method to check.</param>
+            <param name="targetType">
+            The target <see cref="T:System.Type"/>. May be null, in which case the declaring 
+            class of the supplied <paramref name="method"/> must be used.
+            </param>
+            <returns>
+            A <see cref="T:Spring.Transaction.Interceptor.ITransactionAttribute"/> or 
+            null if the method is non-transactional.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.MatchAlwaysTransactionAttributeSource.Equals(System.Object)">
+            <summary>
+            Determines whether the specified <see cref="T:System.Object"></see> is equal to the current <see cref="T:System.Object"></see>.
+            </summary>
+            <param name="obj">The <see cref="T:System.Object"></see> to compare with the current <see cref="T:System.Object"></see>.</param>
+            <returns>
+            true if the specified <see cref="T:System.Object"></see> is equal to the current <see cref="T:System.Object"></see>; otherwise, false.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.MatchAlwaysTransactionAttributeSource.GetHashCode">
+            <summary>
+            Serves as a hash function for a particular type. <see cref="M:System.Object.GetHashCode"></see> is suitable for use in hashing algorithms and data structures like a hash table.
+            </summary>
+            <returns>
+            A hash code for the current <see cref="T:System.Object"></see>.
+            </returns>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.MatchAlwaysTransactionAttributeSource.ToString">
+            <summary>
+            Returns a <see cref="T:System.String"></see> that represents the current <see cref="T:System.Object"></see>.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.String"></see> that represents the current <see cref="T:System.Object"></see>.
+            </returns>
+            <filterpriority>2</filterpriority>
+        </member>
+        <member name="P:Spring.Transaction.Interceptor.MatchAlwaysTransactionAttributeSource.TransactionAttribute">
+            <summary>
+            Allows a transaction attribute to be specified, using the <see cref="T:System.String"/>
+            form, for example, "PROPAGATION_REQUIRED".
+            </summary>
+        </member>
+        <member name="T:Spring.Data.ResultSetExtractorDelegate">
+            <summary>
+            Callback delegate to process all result sets and row in an 
+            AdoTemplate query method.
+            </summary>
+            <remarks>
+            Implementations of this delegate perform the work
+            of extracting results but don't need worry about managing
+            ADO.NET resources, such as closing the reader, or transaction management.
+            </remarks> 
+            <param name="reader">The IDataReader to extract data from.
+            Implementations should not close this: it will be closed
+            by the AdoTemplate.</param>
+            <returns>An arbitrary result object or null if none.</returns>
+        </member>
+        <member name="T:Spring.Data.Core.AdoTemplate">
+            <summary>
+            This is the central class in the Spring.Data namespace.
+            It simplifies the use of ADO.NET and helps to avoid commons errors.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AdoTemplate.cs,v 1.9 2007/12/28 19:37:13 markpollack Exp $</version>   
+        </member>
+        <member name="T:Spring.Data.IAdoOperations">
+            <summary>
+            Interface that defines ADO.NET related database operations.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IAdoOperations.cs,v 1.24 2007/12/04 06:52:19 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.Execute(Spring.Data.CommandDelegate)">
+            <summary>
+            Execute a ADO.NET operation on a command object using a delegate callback.
+            </summary>
+            <remarks>This allows for implementing arbitrary data access operations
+            on a single command within Spring's managed ADO.NET environment.</remarks>
+            <param name="del">The delegate called with a command object.</param>
+            <returns>A result object returned by the action or null</returns>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.Execute(Spring.Data.ICommandCallback)">
+            <summary>
+            Execute a ADO.NET operation on a command object using an interface based callback.
+            </summary>
+            <param name="action">the callback to execute</param>
+            <returns>object returned from callback</returns>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.Execute(Spring.Data.IDbCommandCreator,Spring.Data.ICommandCallback)">
+            <summary>
+            Executes ADO.NET operations on a command object, created by the provided IDbCommandCreator,
+            using the interface based callback IDbCommandCallback.
+            </summary>
+            <param name="commandCreator">The command creator.</param>
+            <param name="action">The callback to execute based on IDbCommand</param>
+            <returns>A result object returned by the action or null</returns>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.Execute(Spring.Data.IDataAdapterCallback)">
+            <summary>
+            Execute ADO.NET operations on a IDbDataAdapter object using an interface based callback.
+            </summary>
+            <remarks>This allows for implementing abritrary data access operations
+            on a single DataAdapter within Spring's managed ADO.NET environment.
+            </remarks>
+            <param name="dataAdapterCallback">The data adapter callback.</param>
+            <returns>A result object returned by the callback or null</returns>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.QueryWithResultSetExtractor(System.Data.CommandType,System.String,Spring.Data.IResultSetExtractor)">
+            <summary>
+            Execute a query given IDbCommand's type and text, processing a 
+            single result set with an instance of IResultSetExtractor
+            </summary>
+            <param name="cmdType">The type of command</param>
+            <param name="cmdText">The text of the query.</param>
+            <param name="resultSetExtractor">Object that will extract all rows of a result set</param>
+            <returns>An arbitrary result object, as returned by the IResultSetExtractor</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.QueryWithResultSetExtractor(System.Data.CommandType,System.String,Spring.Data.IResultSetExtractor,Spring.Data.ICommandSetter)">
+            <summary>
+            Execute a query given IDbCommand's type and text with parameters set
+            via the command setter, processing a 
+            single result set with an instance of IResultSetExtractor
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="resultSetExtractor">The result set extractor.</param>
+            <param name="commandSetter">The command setter.</param>
+            <returns>An arbitrary result object, as returned by the IResultSetExtractor</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.QueryWithResultSetExtractorDelegate(System.Data.CommandType,System.String,Spring.Data.ResultSetExtractorDelegate)">
+            <summary>
+            Execute a query given static SQL/Stored Procedure name 
+            and process a single result set with an instance of ResultSetExtractorDelegate
+            </summary>
+            <param name="cmdType">The type of command.</param>
+            <param name="cmdText">The command text.</param>
+            <param name="resultSetExtractorDelegate">Delegate that will extract all rows of a result set</param>
+            <returns>An arbitrary result object, as returned by the IResultSetExtractor</returns>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>        
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.QueryWithRowMapper(System.Data.CommandType,System.String,Spring.Data.IRowMapper)">
+            <summary>
+            Execute a query given static SQL, mapping each row to a .NET object
+            iva a RowMapper
+            </summary>
+            <param name="cmdType">The type of command</param>
+            <param name="cmdText">SQL query to execute</param>
+            <param name="rowMapper">object that will map one object per row</param>
+            <returns>the result list containing mapped objects</returns>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.QueryForObject(System.Data.CommandType,System.String,Spring.Data.IRowMapper)">
+            <summary>
+            Execute a query with the specified command text, mapping a single result 
+            row to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapper">object that will map one object per row</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.QueryForObject(System.Data.CommandType,System.String,Spring.Data.IRowMapper,Spring.Data.ICommandSetter)">
+            <summary>
+            Execute a query with the specified command text and parameters set via the
+            command setter, mapping a single result row to an object via a RowMapper.  
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapper">object that will map one object per row</param>
+            <param name="commandSetter">The command setter.</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.QueryForObject(System.Data.CommandType,System.String,Spring.Data.IRowMapper,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Execute a query with the specified command text and parameters, mapping a single result row
+            to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapper">object that will map one object per row</param>
+            <param name="parameters">The parameter collection to use in the query.</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.QueryForObject(System.Data.CommandType,System.String,Spring.Data.IRowMapper,System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Execute a query with the specified command text and parameter, mapping a single result row
+            to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapper">object that will map one object per row</param>
+            <param name="parameterName">The name of the parameter to map.</param>
+            <param name="dbType">One of the database parameter type enumerations.</param>
+            <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+            <param name="parameterValue">The parameter value.</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.QueryForObjectDelegate(System.Data.CommandType,System.String,Spring.Data.RowMapperDelegate)">
+            <summary>
+            Execute a query with the specified command text, mapping a single result 
+            row to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapperDelgate">delegate that will map one object per row</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.QueryForObjectDelegate(System.Data.CommandType,System.String,Spring.Data.RowMapperDelegate,Spring.Data.ICommandSetter)">
+            <summary>
+            Execute a query with the specified command text and parameters set via the
+            command setter, mapping a single result row to an object via a RowMapper.  
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapperDelegate">delegate that will map one object per row</param>
+            <param name="commandSetter">The command setter.</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.QueryForObjectDelegate(System.Data.CommandType,System.String,Spring.Data.RowMapperDelegate,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Execute a query with the specified command text and parameters, mapping a single result row
+            to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapperDelegate">delegate that will map one object per row</param>
+            <param name="parameters">The parameter collection to use in the query.</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.QueryForObjectDelegate(System.Data.CommandType,System.String,Spring.Data.RowMapperDelegate,System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Execute a query with the specified command text and parameter, mapping a single result row
+            to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapperDelegate">delegate that will map one object per row</param>
+            <param name="parameterName">The name of the parameter to map.</param>
+            <param name="dbType">One of the database parameter type enumerations.</param>
+            <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+            <param name="parameterValue">The parameter value.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.DataTableFill(System.Data.DataTable,System.Data.CommandType,System.String)">
+            <summary>
+            Fill a  <see cref="T:System.Data.DataTable"/> based on a select command that requires no parameters.
+            </summary>
+            <param name="dataTable">The <see cref="T:System.Data.DataTable"/> to populate</param>
+            <param name="commandType">The type of command</param>
+            <param name="sql">SQL query to execute</param>
+            <returns>The number of rows successfully added to or refreshed in the  <see cref="T:System.Data.DataTable"/></returns>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.DataSetFill(System.Data.DataSet,System.Data.CommandType,System.String)">
+            <summary>
+            Fill a  <see cref="T:System.Data.DataSet"/> based on a select command that requires no parameters.
+            </summary>
+            <param name="dataSet">The <see cref="T:System.Data.DataSet"/> to populate</param>
+            <param name="commandType">The type of command</param>
+            <param name="sql">SQL query to execute</param>
+            <returns>The number of rows successfully added to or refreshed in the  <see cref="T:System.Data.DataSet"/></returns>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.DataSetFill(System.Data.DataSet,System.Data.CommandType,System.String,System.String[])">
+            <summary>
+            Fill a  <see cref="T:System.Data.DataSet"/> based on a select command that requires no parameters
+            that returns one or more result sets that are added as 
+            <see cref="T:System.Data.DataTable"/>s to the <see cref="T:System.Data.DataSet"/>
+            </summary>
+            <param name="dataSet">The <see cref="T:System.Data.DataSet"/> to populate</param>
+            <param name="commandType">The type of command</param>
+            <param name="sql">SQL query to execute</param>
+            <param name="tableNames">The mapping of table names for each <see cref="T:System.Data.DataTable"/>
+            created</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Data.IAdoOperations.DeriveParameters(System.String)">
+            <summary>
+            Note that output parameters are marked input/output after derivation....
+            (TODO - double check....)
+            </summary>
+            <param name="procedureName"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Core.AdoTemplate"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.#ctor(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Core.AdoTemplate"/> class.
+            </summary>
+            <param name="provider">The database provider.</param>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.#ctor(Spring.Data.Common.IDbProvider,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Core.AdoTemplate"/> class.
+            </summary>
+            <param name="provider">The database provider.</param>
+            <param name="lazyInit">if set to <c>false</c>
+            lazily initialize the ErrorCodeExceptionTranslator.</param>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.Execute(Spring.Data.CommandDelegate)">
+            <summary>
+            Execute a ADO.NET operation on a command object using a delegate callback.
+            </summary>
+            <param name="del">The delegate called with a command object.</param>
+            <returns>
+            A result object returned by the action or null
+            </returns>
+            <remarks>This allows for implementing arbitrary data access operations
+            on a single command within Spring's managed ADO.NET environment.</remarks>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.Execute(Spring.Data.ICommandCallback)">
+            <summary>
+            Callback to execute a IDbCommand.
+            </summary>
+            <param name="action">the callback to execute</param>
+            <returns>object returned from callback</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.Execute(Spring.Data.IDbCommandCreator,Spring.Data.ICommandCallback)">
+            <summary>
+            Executes ADO.NET operations on a command object, created by the provided IDbCommandCreator,
+            using the interface based callback IDbCommandCallback.
+            </summary>
+            <param name="commandCreator">The command creator.</param>
+            <param name="action">The callback to execute based on IDbCommand</param>
+            <returns>A result object returned by the action or null</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.Execute(Spring.Data.IDataAdapterCallback)">
+            <summary>
+            Execute ADO.NET operations on a IDbDataAdapter object using an interface based callback.
+            </summary>
+            <remarks>This allows for implementing abritrary data access operations
+            on a single DataAdapter within Spring's managed ADO.NET environment.
+            </remarks>
+            <param name="dataAdapterCallback">The data adapter callback.</param>
+            <returns>A result object returned by the callback or null</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.ExecuteNonQuery(System.Data.CommandType,System.String)">
+            <summary>
+            Executes a non query returning the number of rows affected.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.ExecuteNonQuery(System.Data.CommandType,System.String,System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Executes a non query returning the number of rows affected.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="parameterName">The name of the parameter to map.</param>
+            <param name="dbType">One of the database parameter type enumerations.</param>
+            <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+            <param name="parameterValue">The parameter value.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.ExecuteNonQuery(System.Data.CommandType,System.String,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Executes a non query returning the number of rows affected.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="parameters">The parameter collection to map.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.ExecuteNonQuery(System.Data.CommandType,System.String,Spring.Data.ICommandSetter)">
+            <summary>
+            Executes a non query with parameters set via the
+            command setter, returning the number of rows affected.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="commandSetter">The command setter.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.ExecuteNonQuery(Spring.Data.IDbCommandCreator)">
+            <summary>
+            Executes a non query with a command created via IDbCommandCreator and
+            parameters.
+            </summary>
+            <remarks>Output parameters can be retrieved via the returned
+            dictionary.
+            <para>
+            More commonly used as a lower level support method within the framework,
+            for example StoredProcedure/AdoScalar.
+            </para>
+            </remarks>
+            <param name="commandCreator">The callback to create a IDbCommand.</param>
+            <returns>The number of rows affected.</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.ExecuteScalar(System.Data.CommandType,System.String)">
+            <summary>
+            Execute the query with the specified command text.
+            </summary>
+            <remarks>No parameters are used.  As with
+            IDbCommand.ExecuteScalar, it returns the first column of the first row in the resultset
+            returned by the query.  Extra columns or row are ignored.</remarks>
+            <param name="cmdType">The command type</param>
+            <param name="cmdText">The command text to execute.</param>
+            <returns>The first column of the first row in the result set</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.ExecuteScalar(System.Data.CommandType,System.String,System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Execute the query with the specified command text and parameter returning a scalar result
+            </summary>
+            <param name="cmdType">The command type</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="parameterName">The name of the parameter to map.</param>
+            <param name="dbType">One of the database parameter type enumerations.</param>
+            <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+            <param name="parameterValue">The parameter value.</param>
+            <returns>The first column of the first row in the result set</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.ExecuteScalar(System.Data.CommandType,System.String,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Execute the query with the specified command text and parameters returning a scalar result
+            </summary>
+            <param name="cmdType">The command type</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="parameters">The parameter collection to map.</param>
+            <returns>The first column of the first row in the result set</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.ExecuteScalar(System.Data.CommandType,System.String,Spring.Data.ICommandSetter)">
+            <summary>
+            Execute the query with the specified command text and parameters set via the
+            command setter, returning a scalar result
+            </summary>
+            <param name="cmdType">The command type</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="commandSetter">The command setter.</param>
+            <returns>The first column of the first row in the result set</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.ExecuteScalar(Spring.Data.IDbCommandCreator)">
+            <summary>
+            Execute the query with a command created via IDbCommandCreator and
+            parameters
+            </summary>
+            <remarks>Output parameters can be retrieved via the returned
+            dictionary.
+            <para>
+            More commonly used as a lower level support method within the framework,
+            for example for StoredProcedure/AdoScalar.
+            </para></remarks>
+            <param name="commandCreator">The callback to create a IDbCommand.</param>
+            <returns>A dictionary containing output parameters, if any</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.QueryWithRowCallback(System.Data.CommandType,System.String,Spring.Data.IRowCallback)">
+            <summary>
+            Execute a query given IDbCommand's type and text, reading a
+            single result set on a per-row basis with a <see cref="T:Spring.Data.IRowCallback"/>.
+            </summary>
+            <param name="cmdType">The type of command</param>
+            <param name="cmdText">The text of the query.</param>
+            <param name="rowCallback">callback that will extract results
+            one row at a time.
+            </param>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.QueryWithRowCallback(System.Data.CommandType,System.String,Spring.Data.IRowCallback,Spring.Data.ICommandSetter)">
+            <summary>
+            Execute a query given IDbCommand's type and text by
+            passing the created IDbCommand to a ICommandSetter implementation
+            that knows how to bind values to the IDbCommand, reading a
+            single result set on a per-row basis with a <see cref="T:Spring.Data.IRowCallback"/>.
+            </summary>
+            <param name="cmdType">The type of command</param>
+            <param name="cmdText">The text of the query.</param>
+            <param name="rowCallback">callback that will extract results
+            one row at a time.
+            </param>
+            <param name="commandSetter">The command setter.</param>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.QueryWithRowCallback(System.Data.CommandType,System.String,Spring.Data.IRowCallback,System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Execute a query given IDbCommand's type and text and provided parameter
+            information, reading a
+            single result set on a per-row basis with a <see cref="T:Spring.Data.IRowCallback"/>.
+            </summary>
+            <param name="cmdType">The type of command</param>
+            <param name="cmdText">The text of the query.</param>
+            <param name="rowCallback">callback that will extract results
+            one row at a time.
+            </param>
+            <param name="parameterName">The name of the parameter to map.</param>
+            <param name="dbType">One of the database parameter type enumerations.</param>
+            <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+            <param name="parameterValue">The parameter value.</param>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.QueryWithResultSetExtractor(System.Data.CommandType,System.String,Spring.Data.IResultSetExtractor)">
+            <summary>
+            Execute a query given static SQL/Stored Procedure name
+            and process a single result set with an instance of IResultSetExtractor
+            </summary>
+            <param name="cmdType">The type of command.</param>
+            <param name="sql">The SQL/Stored Procedure to execute</param>
+            <param name="rse">Object that will extract all rows of a result set</param>
+            <returns>An arbitrary result object, as returned by the IResultSetExtractor</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.QueryWithResultSetExtractorDelegate(System.Data.CommandType,System.String,Spring.Data.ResultSetExtractorDelegate)">
+            <summary>
+            Execute a query given static SQL/Stored Procedure name
+            and process a single result set with an instance of IResultSetExtractor
+            </summary>
+            <param name="cmdType">The type of command.</param>
+            <param name="sql">The SQL/Stored Procedure to execute</param>
+            <param name="resultSetExtractorDelegate">Delegate that will extract all rows of a result set</param>
+            <returns>An arbitrary result object, as returned by the IResultSetExtractor</returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.QueryForObject(System.Data.CommandType,System.String,Spring.Data.IRowMapper)">
+            <summary>
+            Execute a query with the specified command text, mapping a single result
+            row to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapper">object that will map one object per row</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.QueryForObject(System.Data.CommandType,System.String,Spring.Data.IRowMapper,Spring.Data.ICommandSetter)">
+            <summary>
+            Execute a query with the specified command text and parameters set via the
+            command setter, mapping a single result row to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapper">object that will map one object per row</param>
+            <param name="commandSetter">The command setter.</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.QueryForObject(System.Data.CommandType,System.String,Spring.Data.IRowMapper,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Execute a query with the specified command text and parameters, mapping a single result row
+            to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapper">object that will map one object per row</param>
+            <param name="parameters">The parameter collection to use in the query.</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.QueryForObject(System.Data.CommandType,System.String,Spring.Data.IRowMapper,System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Execute a query with the specified command text and parameter, mapping a single result row
+            to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapper">object that will map one object per row</param>
+            <param name="parameterName">The name of the parameter to map.</param>
+            <param name="dbType">One of the database parameter type enumerations.</param>
+            <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+            <param name="parameterValue">The parameter value.</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.QueryForObjectDelegate(System.Data.CommandType,System.String,Spring.Data.RowMapperDelegate)">
+            <summary>
+            Execute a query with the specified command text, mapping a single result
+            row to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapperDelegate">delegate that will map one object per row</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.QueryForObjectDelegate(System.Data.CommandType,System.String,Spring.Data.RowMapperDelegate,Spring.Data.ICommandSetter)">
+            <summary>
+            Execute a query with the specified command text and parameters set via the
+            command setter, mapping a single result row to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapperDelegate">delegate that will map one object per row</param>
+            <param name="commandSetter">The command setter.</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.QueryForObjectDelegate(System.Data.CommandType,System.String,Spring.Data.RowMapperDelegate,Spring.Data.Common.IDbParameters)">
+            <summary>
+            Execute a query with the specified command text and parameters, mapping a single result row
+            to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapperDelegate">delegate that will map one object per row</param>
+            <param name="parameters">The parameter collection to use in the query.</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.QueryForObjectDelegate(System.Data.CommandType,System.String,Spring.Data.RowMapperDelegate,System.String,System.Enum,System.Int32,System.Object)">
+            <summary>
+            Execute a query with the specified command text and parameter, mapping a single result row
+            to an object via a RowMapper.
+            </summary>
+            <param name="cmdType">The command type.</param>
+            <param name="cmdText">The command text to execute.</param>
+            <param name="rowMapperDelegate">delegate that will map one object per row</param>
+            <param name="parameterName">The name of the parameter to map.</param>
+            <param name="dbType">One of the database parameter type enumerations.</param>
+            <param name="size">The length of the parameter. 0 if not applicable to parameter type.</param>
+            <param name="parameterValue">The parameter value.</param>
+            <returns>The single mapped object.</returns>
+            <exception cref="T:Spring.Dao.IncorrectResultSizeDataAccessException">
+            If the query does not return exactly one row.
+            </exception>
+            <exception cref="T:Spring.Dao.DataAccessException">
+            If there is any problem executing the query.
+            </exception>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.DataTableFill(System.Data.DataTable,System.Data.CommandType,System.String)">
+            <summary>
+            Fill a  <see cref="T:System.Data.DataTable"/> based on a select command that requires no parameters.
+            </summary>
+            <param name="dataTable">The <see cref="T:System.Data.DataTable"/> to populate</param>
+            <param name="commandType">The type of command</param>
+            <param name="sql">SQL query to execute</param>
+            <returns>The number of rows successfully added to or refreshed in the  <see cref="T:System.Data.DataTable"/></returns>
+        </member>
+        <member name="M:Spring.Data.Core.AdoTemplate.CreateDataReaderWrapper(System.Data.IDataReader)">
+            <summary>
+            Creates the data reader wrapper for use in AdoTemplate callback methods.
+            </summary>
+            <param name="readerToWrap">The reader to wrap.</param>
+            <returns>The data reader used in AdoTemplate callbacks</returns>
+        </member>
+        <member name="P:Spring.Data.Core.AdoTemplate.DbProvider">
+            <summary>
+            An instance of a DbProvider implementation.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Core.AdoTemplate.LazyInit">
+            <summary>
+            Gets or sets a value indicating whether to lazily initialize the 
+            IAdoExceptionTranslator for this accessor, on first encounter of a 
+            exception from the data provider.  Default is "true"; can be switched to
+            "false" for initialization on startup.
+            </summary>
+            <value><c>true</c> if to lazy initialize the IAdoExceptionTranslator; 
+            otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Spring.Data.Core.AdoTemplate.ExceptionTranslator">
+            <summary>
+            Gets or sets the exception translator. If no custom translator is provided, a default
+            <see cref="T:Spring.Data.Support.ErrorCodeExceptionTranslator"/> is used.
+            </summary>
+            <value>The exception translator.</value>
+        </member>
+        <member name="P:Spring.Data.Core.AdoTemplate.DataReaderWrapperType">
+            <summary>
+            Gets or set the System.Type to use to create an instance of IDataReaderWrapper 
+            for the purpose of having defaults values to use in case of DBNull values read 
+            from IDataReader.
+            </summary>
+            <value>The type of the data reader wrapper.</value>
+        </member>
+        <member name="T:Spring.Data.MultiDelegatingDbProvider">
+            <summary>
+            A wrapper implementation for IDbProvider such that multiple DbProvider instances can be
+            selected at runtime, say based on web request criteria.
+            </summary>
+            <remarks>
+            The name of which DbProvider to use, as provided to the IDictionary property TargetDbProviders
+            is "dbProviderName".  Once the target dbprovider name is known, set the name via a call to
+            <code>LogicalThreadContext.SetData("dbProviderName", "database1ProviderName")</code>. The value
+            "database1ProviderName" must match a key in the provided TargetDbProviders dictionary.
+            </remarks>
+            <author>Mark Pollack</author>
+            <version>$Id: MultiDelegatingDbProvider.cs,v 1.4 2008/01/29 18:15:38 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.MultiDelegatingDbProvider"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.#ctor(System.Collections.IDictionary)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.MultiDelegatingDbProvider"/> class.
+            </summary>
+            <param name="targetDbProviders">The target db providers.</param>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.AfterPropertiesSet">
+            <summary>
+            Ensures that the there are values in the TargetDbProviders dictionary and that the
+            key is of the type string and value is of the type IDbProvider.
+            </summary>
+            <exception cref="T:System.ArgumentException">If the above conditions are not met.</exception>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.CreateCommand">
+            <summary>
+            Returns a new command object for executing SQL statments/Stored Procedures
+            against the database.
+            </summary>
+            <returns>An new <see cref="T:System.Data.IDbCommand"/></returns>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.CreateConnection">
+            <summary>
+            Returns a new connection object to communicate with the database.
+            </summary>
+            <returns>A new <see cref="T:System.Data.IDbConnection"/></returns>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.CreateParameter">
+            <summary>
+            Returns a new parameter object for binding values to parameter
+            placeholders in SQL statements or Stored Procedure variables.
+            </summary>
+            <returns>A new <see cref="T:System.Data.IDbDataParameter"/></returns>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.CreateDataAdapter">
+            <summary>
+            Returns a new adapter objects for use with offline DataSets.
+            </summary>
+            <returns>A new <see cref="T:System.Data.IDbDataAdapter"/></returns>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.CreateCommandBuilder">
+            <summary>
+            Returns a new instance of the providers CommandBuilder class.
+            </summary>
+            <returns>A new Command Builder</returns>
+            <remarks>In .NET 1.1 there was no common base class or interface
+            for command builders, hence the return signature is object to
+            be portable (but more loosely typed) across .NET 1.1/2.0</remarks>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.CreateParameterName(System.String)">
+            <summary>
+            Creates the name of the parameter in the format appropriate to use inside IDbCommand.CommandText.
+            </summary>
+            <param name="name">The unformatted name of the parameter.</param>
+            <returns>
+            The parameter name formatted foran IDbCommand.CommandText.
+            </returns>
+            <remarks>In most cases this adds the parameter prefix to the name passed into this method.</remarks>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.CreateParameterNameForCollection(System.String)">
+            <summary>
+            Creates the name ofthe parameter in the format appropriate for an IDataParameter, i.e. to be
+            part of a IDataParameterCollection.
+            </summary>
+            <param name="name">The unformatted name of the parameter.</param>
+            <returns>
+            The parameter name formatted for an IDataParameter
+            </returns>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.ExtractError(System.Exception)">
+            <summary>
+            Extracts the provider specific error code as a string.
+            </summary>
+            <param name="e">The data access exception.</param>
+            <returns>The provider specific error code</returns>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.IsDataAccessException(System.Exception)">
+            <summary>
+            Determines whether the provided exception is in fact related
+            to database access.  This can be provider dependent in .NET 1.1 since
+            there isn't a common base class for ADO.NET exceptions.
+            </summary>
+            <param name="e">The exception thrown when performing data access
+            operations.</param>
+            <returns>
+            	<c>true</c> if is a valid data access exception for the specified
+            exception; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.IsDataAccessExceptionBCL11(System.Exception)">
+            <summary>
+            Determines whether is data access exception in .NET 1.1 for the specified exception.
+            </summary>
+            <param name="e">The candidate exception.</param>
+            <returns>
+            	<c>true</c> if is data access exception in .NET 1.1 for the specified exception; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.MultiDelegatingDbProvider.GetTargetProvider">
+            <summary>
+            Gets the target provider based on the thread local name "dbProviderName"
+            </summary>
+            <returns>The corresonding IDbProvider.</returns>
+        </member>
+        <member name="P:Spring.Data.MultiDelegatingDbProvider.TargetDbProviders">
+            <summary>
+            Sets the target db providers.
+            </summary>
+            <value>The target db providers.</value>
+        </member>
+        <member name="P:Spring.Data.MultiDelegatingDbProvider.DbMetadata">
+            <summary>
+            Return metadata information about the database provider
+            </summary>
+            <value></value>
+        </member>
+        <member name="P:Spring.Data.MultiDelegatingDbProvider.ConnectionString">
+            <summary>
+            Connection string used to create connections.
+            </summary>
+            <value></value>
+        </member>
+        <member name="T:Spring.Data.CommandSetterDelegate">
+            <summary>
+            Callback delegate to set any necessary parameters or other
+            properties on the command object.  The CommandType and
+            CommandText properties will have already been supplied
+            </summary>
+            <param name="dbCommand">The database command object.</param>
+            <author>Mark Pollack</author>
+        </member>
+        <member name="T:Spring.Dao.EmptyResultDataAccessException">
+            <summary>
+            Data access exception thrown when a result was not of the expected size,
+            for example when expecting a single row but getting 0 or more than 1 rows.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <author>Juergen Hoeller</author>
+            <version>$Id: EmptyResultDataAccessException.cs,v 1.2 2006/05/18 21:37:50 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.EmptyResultDataAccessException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Dao.EmptyResultDataAccessException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.EmptyResultDataAccessException.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Dao.EmptyResultDataAccessException"/> class.
+            </summary>
+            <param name="message">The message.</param>
+        </member>
+        <member name="M:Spring.Dao.EmptyResultDataAccessException.#ctor(System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Dao.EmptyResultDataAccessException"/> class.
+            </summary>
+            <param name="message">The message.</param>
+            <param name="innerException">The inner exception.</param>
+        </member>
+        <member name="M:Spring.Dao.EmptyResultDataAccessException.#ctor(System.Int32)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.EmptyResultDataAccessException"/> class.
+            </summary>
+            <param name="expectedSize">The expected size.</param>
+        </member>
+        <member name="M:Spring.Dao.EmptyResultDataAccessException.#ctor(System.String,System.Int32)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.EmptyResultDataAccessException"/> class.
+            </summary>
+            <param name="message">A message about the exception.</param>
+            <param name="expectedSize">The expected size.</param>
+        </member>
+        <member name="M:Spring.Dao.EmptyResultDataAccessException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Dao.EmptyResultDataAccessException"/> class.
+            </summary>
+            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="info"/> parameter is <see langword="null"/>.</exception>
+            <exception cref="T:System.Runtime.Serialization.SerializationException">The class name is <see langword="null"/> or <see cref="P:System.Exception.HResult"/> is zero (0).</exception>
+        </member>
+        <member name="T:Spring.Dao.CannotAcquireLockException">
+            <summary> 
+            Exception thrown on failure to aquire a lock during an update i.e a select for
+            update statement.
+            </summary>
+            <remarks>
+            <p>
+            This exception will be thrown either by O/R mapping tools or by custom DAO
+            implementations.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: CannotAcquireLockException.cs,v 1.6 2008/04/08 20:26:43 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.CannotAcquireLockException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CannotAcquireLockException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.CannotAcquireLockException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CannotAcquireLockException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.CannotAcquireLockException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CannotAcquireLockException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.CannotAcquireLockException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.CannotAcquireLockException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Transaction.NoTransactionException">
+            <summary>
+            Exception thrown when an operation is attempted that relies on an existing
+            transaction (such as setting rollback status) and there is no existing transaction.
+            This represents an illegal usage of the transaction API.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: NoTransactionException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.NoTransactionException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.NoTransactionException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.NoTransactionException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.NoTransactionException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.NoTransactionException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.NoTransactionException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.NoTransactionException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.NoTransactionException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Transaction.NestedTransactionNotSupportedException">
+            <summary>
+            Exception thrown when attempting to work with a nested transaction
+            but nested transactions are not supported by the underlying backend.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: NestedTransactionNotSupportedException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.NestedTransactionNotSupportedException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.NestedTransactionNotSupportedException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.NestedTransactionNotSupportedException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.NestedTransactionNotSupportedException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.NestedTransactionNotSupportedException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.NestedTransactionNotSupportedException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.NestedTransactionNotSupportedException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.NestedTransactionNotSupportedException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Transaction.Config.TxNamespaceUtils">
+            <summary>
+            This is a utility class to help in parsing the transaction namespace
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: TxNamespaceUtils.cs,v 1.2 2007/12/07 08:10:03 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Transaction.Config.TxNamespaceUtils.TRANSACTION_MANAGER_ATTRIBUTE">
+            <summary>
+            The transaction manager attribute
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Config.TxNamespaceUtils.TRANSACTION_ATTRIBUTE_SOURCE">
+            <summary>
+            The source of transaction metadata
+            </summary>
+        </member>
+        <member name="F:Spring.Transaction.Config.TxNamespaceUtils.TRANSACTION_MANAGER_PROPERTY">
+            <summary>
+            The property asociated with the transaction manager xml element
+            </summary>
+        </member>
+        <member name="T:Spring.Data.Support.DefaultServiceDomainAdapter">
+            <summary>
+            Implementation that delegates to ServiceDomain and ContextUtil for all functionality.
+            </summary>
+            <remarks>Introduced for purposes of unit testing.</remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id $</version> 
+        </member>
+        <member name="M:Spring.Data.Support.DefaultServiceDomainAdapter.Enter(Spring.Data.Support.SimpleServiceConfig)">
+            <summary>
+            Creates the context specified by the ServiceConfig object and pushes it onto the context stack to
+            become the current context.
+            </summary>
+            <param name="config">A ServiceConfig that contains the configuration information for the services to be used within the enclosed code.</param>
+        </member>
+        <member name="M:Spring.Data.Support.DefaultServiceDomainAdapter.Leave">
+            <summary>
+            Leaves this ServiceDomain. The current context is then popped from the context stack, and the
+            context that was running when Enter was called becomes the current context.
+            </summary>
+            <returns>One of the TransactionStatus values</returns>
+        </member>
+        <member name="M:Spring.Data.Support.DefaultServiceDomainAdapter.SetComplete">
+            <summary>
+            Sets the consistent bit and the done bit to true in the COM+ context
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.DefaultServiceDomainAdapter.SetAbort">
+            <summary>
+            Sets the consistent bit to false and the done bit to true in the COM+ context.
+            </summary>
+        </member>
+        <member name="P:Spring.Data.Support.DefaultServiceDomainAdapter.MyTransactionVote">
+            <summary>
+            Gets or sets the consistent bit in the COM+ context.
+            </summary>
+            <value>My transaction vote.</value>
+        </member>
+        <member name="P:Spring.Data.Support.DefaultServiceDomainAdapter.IsInTransaction">
+            <summary>
+            Gets a value indicating whether the current context is transactional.
+            </summary>
+            <value>
+            	<c>true</c> if this instance is existing transaction; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="T:Spring.Data.IDataAdapterSetter">
+            <summary>
+            Called by the AdoTemplate class to allow implementations
+            to set any necessary properties on the DbDataAdapter object.
+            </summary>
+            <remarks>
+            <p>For example, this callback can be used to set the 
+            AcceptChangesDuringFill property, register an event handler 
+            for the FillErrors event, set update batch sizes if your provider 
+            supports such functionality, set the ContinueUpdateOnError property,
+            or in .NET 2.0 to set the property AcceptChangesDuringUpdate.
+            </p>
+            <p>
+            Downcast to the appropriate subtype to access vendor specific
+            functionality.</p>
+            <p>
+            The DataAdapter SelectCommand will be already be 
+            populated with values for CommandType and Text properties
+            along with Connection/Transaction properties based on the
+            calling transaction context.
+            </p>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: IDataAdapterSetter.cs,v 1.3 2006/11/29 07:18:45 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Data.Objects.Generic.StoredProcedure">
+            <summary>
+            A superclass for object based abstractions of RDBMS stored procedures. 
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: StoredProcedure.cs,v 1.3 2007/07/25 13:32:39 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.StoredProcedure.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.Generic.StoredProcedure"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.StoredProcedure.ExecuteScalarByNamedParam(System.Collections.IDictionary)">
+            <summary>
+            Execute the stored procedure using 'ExecuteScalar'
+            </summary>
+            <param name="inParams">Value of input parameters.</param>
+            <returns>Dictionary with any named output parameters and the value of the
+            scalar under the key "scalar".</returns>
+        </member>
+        <member name="T:Spring.Data.Objects.Generic.MappingAdoQuery">
+            <summary>
+            Reusable query in which concrete subclasses must implement the
+            MapRow method to map each row of a single result set into an 
+            object.
+            </summary>
+            <remarks>
+            Simplifies MappingSqlQueryWithContext API by dropping parameters and
+            context. Most subclasses won't care about parameters. If you don't use
+            contextual information, subclass this instead of MappingSqlQueryWithContext.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: MappingAdoQuery.cs,v 1.2 2007/07/25 13:32:39 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Objects.Generic.MappingAdoQuery.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Objects.Generic.MappingAdoQuery"/> class.
+            </summary>
+        </member>
+        <member name="T:Spring.Dao.PermissionDeniedDataAccessException">
+            <summary> 
+            Exception thrown when the underlyingresource denied a permission to 
+            access a specific element, such as a specific database table.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: PermissionDeniedDataAccessException.cs,v 1.1 2006/06/12 10:39:19 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.PermissionDeniedDataAccessException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.PermissionDeniedDataAccessException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.PermissionDeniedDataAccessException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.PermissionDeniedDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.PermissionDeniedDataAccessException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.PermissionDeniedDataAccessException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception (from the underlying data access API, such as ADO.NET).
+            </param>
+        </member>
+        <member name="M:Spring.Dao.PermissionDeniedDataAccessException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.PermissionDeniedDataAccessException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Dao.ObjectOptimisticLockingFailureException">
+            <summary>
+            Exception thrown on an optimistic locking violation for a mapped object.
+             Provides information about the persistent class and the identifier. 
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: ObjectOptimisticLockingFailureException.cs,v 1.1 2006/12/13 18:40:11 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Dao.ObjectOptimisticLockingFailureException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Dao.ObjectOptimisticLockingFailureException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Dao.ObjectOptimisticLockingFailureException.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Dao.ObjectOptimisticLockingFailureException"/> class.
+            </summary>
+            <param name="message">A message about the exception..</param>
+        </member>
+        <member name="M:Spring.Dao.ObjectOptimisticLockingFailureException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.ObjectRetrievalFailureException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception from the underlying data access API
+            </param>        
+        </member>
+        <member name="M:Spring.Dao.ObjectOptimisticLockingFailureException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Dao.ObjectOptimisticLockingFailureException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:Spring.Dao.ObjectOptimisticLockingFailureException.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            When overridden in a derived class, sets the <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            with information about the exception.
+            </summary>
+            <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+            <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext"/> that contains contextual information about the source or destination.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="info"/> parameter is a null reference (<see langword="Nothing"/> in Visual Basic).</exception>
+        </member>
+        <member name="T:Spring.Transaction.UnexpectedRollbackException">
+            <summary>
+            Thrown when an attempt to commit a transaction resulted in an unexpected rollback.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Griffin Caprio (.NET)</author>
+            <version>$Id: UnexpectedRollbackException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.UnexpectedRollbackException.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.UnexpectedRollbackException"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.UnexpectedRollbackException.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.UnexpectedRollbackException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.UnexpectedRollbackException.#ctor(System.String,System.Exception)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.UnexpectedRollbackException"/> class.
+            </summary>
+            <param name="message">
+            A message about the exception.
+            </param>
+            <param name="rootCause">
+            The root exception that is being wrapped.
+            </param>
+        </member>
+        <member name="M:Spring.Transaction.UnexpectedRollbackException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.UnexpectedRollbackException"/> class.
+            </summary>
+            <param name="info">
+            The <see cref="T:System.Runtime.Serialization.SerializationInfo"/>
+            that holds the serialized object data about the exception being thrown.
+            </param>
+            <param name="context">
+            The <see cref="T:System.Runtime.Serialization.StreamingContext"/>
+            that contains contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="T:Spring.Transaction.Interceptor.DefaultTransactionAttributeSourceAdvisor">
+            <summary>
+            Advisor driven by a <see cref="T:Spring.Transaction.Interceptor.ITransactionAttributeSource"/>, 
+            used to exclude a general advice <see cref="T:AopAlliance.Aop.IAdvice"/> from methods that
+            are non-transactional.
+            </summary>
+            <remarks>
+            <para>
+            To put it another way, use this advisor when you would like to associate other AOP 
+            advice based on the pointcut specified by declarative transaction demarcation, 
+            attibute based or otherwise. 
+            </para>
+            <p>
+            Because the AOP framework caches advice calculations, this is normally
+            faster than just letting the <see cref="T:AopAlliance.Intercept.IInterceptor"/>
+            run and find out itself that it has no work to do.
+            </p>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: DefaultTransactionAttributeSourceAdvisor.cs,v 1.1 2007/01/04 05:11:17 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.DefaultTransactionAttributeSourceAdvisor.#ctor(Spring.Transaction.Interceptor.ITransactionAttributeSource,AopAlliance.Aop.IAdvice)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Transaction.Interceptor.DefaultTransactionAttributeSourceAdvisor"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Transaction.Interceptor.DefaultTransactionAttributeSourceAdvisor.Matches(System.Reflection.MethodInfo,System.Type)">
+            <summary>
+            Tests the input method to see if it's covered by the advisor.
+            </summary>
+            <param name="method">The method to match.</param>
+            <param name="targetClass">The <see cref="T:System.Type"/> to match against.</param>
+            <returns>
+            <b>True</b> if the supplied <paramref name="method"/> is covered by the advisor.
+            </returns>
+        </member>
+        <member name="T:Spring.Data.Support.FallbackExceptionTranslator">
+            <summary>
+            Translates all exceptions to an UncategorizedAdoException.
+            </summary>
+            <remarks>
+            This exception translator used when an exception is thrown using the
+            "primary" implementation of IAdoExceptionTranslator, i.e. AdoExceptionTranslator.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: FallbackExceptionTranslator.cs,v 1.6 2007/01/01 22:22:50 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Support.FallbackExceptionTranslator.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Support.FallbackExceptionTranslator"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.FallbackExceptionTranslator.Translate(System.String,System.String,System.Exception)">
+            <summary>
+            Translate the given <see cref="T:System.SystemException"/> into a generic data access exception.
+            </summary>
+            <param name="task">A readable string describing the task being attempted.</param>
+            <param name="sql">The SQL query or update that caused the problem. May be null.</param>
+            <param name="exception">
+            The <see cref="T:System.Exception"/> encountered by the ADO.NET implementation.
+            </param>
+            <returns>
+            A <see cref="T:Spring.Dao.DataAccessException"/> appropriate for the supplied
+            <paramref name="exception"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Data.Generic.DataAdapterDelegate`1">
+            <summary>
+            Called by AdoTemplate.Execute with an preconfigured
+            ADO.NET IDbDataAdapter instance with its SelectCommand
+            property populated with CommandType and Text values
+            along with Connection/Transaction properties based on the
+            calling transaction context.
+            </summary>
+            <param name="dataAdapter">An active IDbDataAdapter instance</param>
+            <returns>The result object</returns>
+        </member>
+        <member name="T:Spring.Data.Common.DbParameter">
+            <summary>
+            TODO: 
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: DbParameter.cs,v 1.5 2006/12/03 08:25:46 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Common.DbParameter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Common.DbParameter"/> class.
+            </summary>
+            <remarks>
+            Sets the SourceVersion to be Default and the ParameterDirection to be Input.
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.Support.RowCallbackResultSetExtractor">
+            <summary>
+            Adapter to enable use of a IRowCallback inside a ResultSetExtractor.
+            </summary>
+            <remarks>We don't use it for navigating since this could lead to unpredictable consequences.</remarks>
+            <author>Mark Pollack</author>
+            <version>$Id: RowCallbackResultSetExtractor.cs,v 1.1 2007/07/25 08:27:08 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Support.RowCallbackResultSetExtractor.#ctor(Spring.Data.IRowCallback)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Support.RowCallbackResultSetExtractor"/> class.
+            </summary>
+            <param name="rowCallback">The row callback.</param>
+        </member>
+        <member name="M:Spring.Data.Support.RowCallbackResultSetExtractor.#ctor(Spring.Data.RowCallbackDelegate)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Support.RowCallbackResultSetExtractor"/> class.
+            </summary>
+            <param name="rowCallbackDelegate">The row callback delegate.</param>
+        </member>
+        <member name="M:Spring.Data.Support.RowCallbackResultSetExtractor.ExtractData(System.Data.IDataReader)">
+            <summary>
+            All rows of the data reader are passed to the IRowCallback
+            associated with this class.
+            </summary>
+            <param name="reader">The IDataReader to extract data from.
+            Implementations should not close this: it will be closed
+            by the AdoTemplate.</param>
+            <returns>
+            Null is returned since IRowCallback manages its own state.
+            </returns>
+        </member>
+        <member name="T:Spring.Data.Support.NamedResultSetProcessor">
+            <summary>
+            Provides a name to a ResultSetProcessor for use with AdoOperation subclasses
+            such as StoredProcedure.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: NamedResultSetProcessor.cs,v 1.3 2006/11/29 07:18:46 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Support.NamedResultSetProcessor.#ctor(System.String,Spring.Data.IRowCallback)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Support.NamedResultSetProcessor"/> class with a
+            IRowCallback instance
+            </summary>
+            <param name="name">The name of the associated row callback for use with output 
+            result set mappers.</param>
+            <param name="rowcallback">A row callback instance.</param>
+        </member>
+        <member name="M:Spring.Data.Support.NamedResultSetProcessor.#ctor(System.String,Spring.Data.IRowMapper)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Support.NamedResultSetProcessor"/> class with a
+            IRowMapper instance
+            </summary>
+            <param name="name">The name of the associated row mapper.</param>
+            <param name="rowMapper">A IRowMapper instance.</param>
+        </member>
+        <member name="M:Spring.Data.Support.NamedResultSetProcessor.#ctor(System.String,Spring.Data.IResultSetExtractor)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Support.NamedResultSetProcessor"/> class with a
+            IResultSetExtractor instance
+            </summary>
+            <param name="name">The name of the associated result set extractor.</param>
+            <param name="resultSetExtractor">A IResultSetExtractor instance.</param>
+        </member>
+        <member name="T:Spring.Data.Support.ConnectionSynchronization">
+            <summary>
+            Callback for resource cleanup at end of transaction.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionSynchronization.#ctor(Spring.Data.Support.ConnectionHolder,Spring.Data.Common.IDbProvider)">
+            <summary>
+            Create a new instance.
+            </summary>
+            <param name="connHolder"></param>
+            <param name="provider"></param>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionSynchronization.CompareTo(System.Object)">
+            <summary>
+            Compares the current instance with another object of the same type.
+            </summary>
+            <param name="obj">An object to compare with this instance.</param>
+            <returns>
+            The value of the order property.
+            </returns>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionSynchronization.Suspend">
+            <summary>
+            Suspend this synchronization.
+            </summary>
+            <remarks>
+            	<p>
+            Supposed to unbind resources from
+            <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>
+            if managing any.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionSynchronization.Resume">
+            <summary>
+            Resume this synchronization.
+            </summary>
+            <remarks>
+            	<p>
+            Supposed to unbind resources from
+            <see cref="T:Spring.Transaction.Support.TransactionSynchronizationManager"/>
+            if managing any.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionSynchronization.BeforeCompletion">
+            <summary>
+            Invoked before transaction commit/rollback (after
+            <see cref="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCommit(System.Boolean)"/>,
+            even if
+            <see cref="M:Spring.Transaction.Support.ITransactionSynchronization.BeforeCommit(System.Boolean)"/>
+            threw an exception).
+            </summary>
+            <remarks>
+            	<p>
+            Can e.g. perform resource cleanup.
+            </p>
+            	<p>
+            Note that exceptions will get propagated to the commit caller
+            and cause a rollback of the transaction.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Data.Support.ConnectionSynchronization.AfterCompletion(Spring.Transaction.Support.TransactionSynchronizationStatus)">
+            <summary>
+            Invoked after transaction commit/rollback.
+            </summary>
+            <param name="status">Status according to <see cref="T:Spring.Transaction.Support.TransactionSynchronizationStatus"/></param>
+            <remarks>
+            Can e.g. perform resource cleanup, in this case after transaction completion.
+            <p>
+            Note that exceptions will get propagated to the commit or rollback
+            caller, although they will not influence the outcome of the transaction.
+            </p>
+            </remarks>
+        </member>
+        <member name="T:Spring.Data.Generic.RowMapperResultSetExtractor`1">
+            <summary>
+            Adapter implementation of the ResultSetExtractor interface that delegates 
+            to a RowMapper which is supposed to create an object for each row.
+            Each object is added to the results List of this ResultSetExtractor.
+            </summary>
+            <remarks>
+            Useful for the typical case of one object per row in the database table.
+            The number of entries in the results list will match the number of rows.
+            <p>
+            Note that a RowMapper object is typically stateless and thus reusable;
+            just the RowMapperResultSetExtractor adapter is stateful.
+            </p>
+            <p>
+            As an alternative consider subclassing MappingAdoQuery from the 
+            Spring.Data.Objects namespace:  Instead of working with separate 
+            AdoTemplate and IRowMapper objects you can have executable
+            query objects (containing row-mapping logic) there.
+            </p>
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: RowMapperResultSetExtractor.cs,v 1.4 2007/08/03 19:51:10 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Generic.RowMapperResultSetExtractor`1.#ctor(Spring.Data.Generic.IRowMapper{`0})">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Core.RowMapperResultSetExtractor"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Data.Generic.RowMapperResultSetExtractor`1.#ctor(Spring.Data.Generic.IRowMapper{`0},System.Int32)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Generic.RowMapperResultSetExtractor`1"/> class.
+            </summary>
+            <param name="rowMapper">The row mapper.</param>
+            <param name="rowsExpected">The rows expected.</param>
+        </member>
+        <member name="T:Spring.Data.Common.DbParameters">
+            <summary>
+            A more portable means to create a collection of ADO.NET
+            parameters.
+            </summary>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: DbParameters.cs,v 1.14 2007/12/06 22:34:56 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Data.Common.DbParameters.#ctor(Spring.Data.Common.IDbProvider)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Data.Common.DbParameters"/> class.
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/src/Spring/Spring.Data/Transaction/CannotCreateTransactionException.cs b/src/Spring/Spring.Data/Transaction/CannotCreateTransactionException.cs
new file mode 100644
index 00000000..87102da0
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/CannotCreateTransactionException.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Runtime.Serialization;
+
+namespace Spring.Transaction
+{
+	/// <summary> 
+	/// Exception thrown when a transaction can't be created using an
+	/// underlying transaction API such as COM+.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: CannotCreateTransactionException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	[Serializable]
+	public class CannotCreateTransactionException : TransactionException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.CannotCreateTransactionException"/> class.
+		/// </summary>
+		public CannotCreateTransactionException() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.CannotCreateTransactionException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public CannotCreateTransactionException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.CannotCreateTransactionException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public CannotCreateTransactionException( string message, Exception rootCause)
+			: base( message , rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.CannotCreateTransactionException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected CannotCreateTransactionException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/Config/AttributeDrivenObjectDefinitionParser.cs b/src/Spring/Spring.Data/Transaction/Config/AttributeDrivenObjectDefinitionParser.cs
new file mode 100644
index 00000000..b008dcf5
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Config/AttributeDrivenObjectDefinitionParser.cs
@@ -0,0 +1,120 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Xml;
+using Spring.Aop.Config;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+using Spring.Transaction.Interceptor;
+
+namespace Spring.Transaction.Config
+{
+    /// <summary>
+    /// IObjectDefinitionParser implementation that allows users to easily configure all the
+    /// infrastructure objects required to enable attribute-driven transction demarcation.
+    /// </summary>
+    /// <author>Rob Harrop</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    public class AttributeDrivenObjectDefinitionParser : AbstractObjectDefinitionParser
+    {
+        /// <summary>
+        /// Object property name for injection the TransactionInterceptor
+        /// </summary>
+        private static readonly string TRANSACTION_INTERCEPTOR = "transactionInterceptor";
+
+        /// <summary>
+        /// The '<code>proxy-target-type</code>' attribute
+        /// </summary>
+        private static readonly string PROXY_TARGET_TYPE = "proxy-target-type";
+
+        /// <summary>
+        /// The '<code>order</code>' property/attribute
+        /// </summary>
+        private static readonly string ORDER = "order";
+
+        /// <summary>
+        /// Central template method to actually parse the supplied XmlElement
+        /// into one or more IObjectDefinitions.
+        /// </summary>
+        /// <param name="element">The element that is to be parsed into one or more <see cref="IObjectDefinition"/>s</param>
+        /// <param name="parserContext">The the object encapsulating the current state of the parsing process;
+        /// provides access to a <see cref="IObjectDefinitionRegistry"/></param>
+        /// <returns>
+        /// The primary IObjectDefinition resulting from the parsing of the supplied XmlElement
+        /// </returns>
+        protected override AbstractObjectDefinition ParseInternal(XmlElement element, ParserContext parserContext)
+        {
+            ConfigureAutoProxyCreator(parserContext, element);
+
+            string transactionManagerName = element.GetAttribute(TxNamespaceUtils.TRANSACTION_MANAGER_ATTRIBUTE);
+            Type sourceType = typeof (AttributesTransactionAttributeSource);
+
+            //Create the TransactionInterceptor definition.
+            RootObjectDefinition interceptorDefinition = new RootObjectDefinition(typeof (TransactionInterceptor));
+            interceptorDefinition.PropertyValues.Add(TxNamespaceUtils.TRANSACTION_MANAGER_PROPERTY,
+                                                     new RuntimeObjectReference(transactionManagerName));
+            interceptorDefinition.PropertyValues.Add(TxNamespaceUtils.TRANSACTION_ATTRIBUTE_SOURCE,
+                                                     new RootObjectDefinition(sourceType));
+
+            //Create the TransactionAttributeSourceAdvisor definition.
+            RootObjectDefinition advisorDefinition = new RootObjectDefinition(typeof (TransactionAttributeSourceAdvisor));
+            advisorDefinition.PropertyValues.Add(TRANSACTION_INTERCEPTOR, interceptorDefinition);
+            if (element.HasAttribute(ORDER))
+            {
+                advisorDefinition.PropertyValues.Add(ORDER, element.GetAttribute(ORDER));
+            }
+
+            return advisorDefinition;
+        }
+
+        /// <summary>
+        /// Configures the auto proxy creator.
+        /// </summary>
+        /// <param name="parserContext">The parser context.</param>
+        /// <param name="element">The element.</param>
+        private static void ConfigureAutoProxyCreator(ParserContext parserContext, XmlElement element)
+        {
+            AopNamespaceUtils.RegisterAutoProxyCreatorIfNecessary(parserContext, element);
+
+            bool proxyTargetClass =
+                parserContext.ParserHelper.IsTrueStringValue(element.GetAttribute(PROXY_TARGET_TYPE));
+            if (proxyTargetClass)
+            {
+                AopNamespaceUtils.ForceAutoProxyCreatorToUseDecoratorProxy(parserContext.Registry);
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether an ID should be generated instead of read
+        /// from the passed in XmlElement.
+        /// </summary>
+        /// <value><c>true</c> if should generate id; otherwise, <c>false</c>.</value>
+        /// <remarks>Note that this flag is about always generating an ID; the parser
+        /// won't even check for an "id" attribute in this case.
+        /// </remarks>
+        protected override bool ShouldGenerateId
+        {
+            get { return true; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/Config/TxAdviceObjectDefinitionParser.cs b/src/Spring/Spring.Data/Transaction/Config/TxAdviceObjectDefinitionParser.cs
new file mode 100644
index 00000000..9ea11c8c
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Config/TxAdviceObjectDefinitionParser.cs
@@ -0,0 +1,177 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Collections;
+using System.Data;
+using System.Xml;
+using Spring.Collections;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+using Spring.Transaction.Interceptor;
+using Spring.Util;
+
+namespace Spring.Transaction.Config
+{
+    /// <summary>
+    /// The <see cref="IObjectDefinitionParser"/> for the <code>&lt;tx:advice&gt;</code> tag.
+    /// </summary>
+    /// <author>Rob Harrop</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Adrian Colyer</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: TxAdviceObjectDefinitionParser.cs,v 1.2 2007/06/18 10:31:19 bbaia Exp $</version>
+    public class TxAdviceObjectDefinitionParser : AbstractSingleObjectDefinitionParser
+    {
+        private static string TIMEOUT = "timeout";
+
+        private static string READ_ONLY = "read-only";
+
+        private static string NAME_MAP = "nameMap";
+
+        private static string PROPAGATION = "propagation";
+
+        private static string ISOLATION = "isolation";
+
+        private static string ROLLBACK_FOR = "rollback-for";
+
+        private static string NO_ROLLBACK_FOR = "no-rollback-for";
+
+        protected override Type GetObjectType(XmlElement element)
+        {
+            return typeof (TransactionInterceptor);
+        }
+
+        protected override void DoParse(XmlElement element, ParserContext parserContext, ObjectDefinitionBuilder builder)
+        {
+
+            builder.AddPropertyReference(TxNamespaceUtils.TRANSACTION_MANAGER_PROPERTY,
+                element.GetAttribute(TxNamespaceUtils.TRANSACTION_MANAGER_ATTRIBUTE));
+            XmlNodeList txAttributes = element.SelectNodes("*[local-name()='attributes' and namespace-uri()='" + element.NamespaceURI + "']");
+            if (txAttributes.Count > 1 )
+            {
+                parserContext.ReaderContext.ReportException(element, "tx advice", "Element <attributes> is allowed at most once inside element <advice>");
+            }
+            else if (txAttributes.Count == 1)
+            {
+                //using xml defined source
+                XmlElement attributeSourceElement = txAttributes[0] as XmlElement;
+                AbstractObjectDefinition attributeSourceDefinition =
+                    ParseAttributeSource(attributeSourceElement, parserContext);
+                builder.AddPropertyValue(TxNamespaceUtils.TRANSACTION_ATTRIBUTE_SOURCE, attributeSourceDefinition);
+            }
+            else
+            {
+                //Assume attibutes source
+                ObjectDefinitionBuilder txAttributeSourceBuilder = 
+                    parserContext.ParserHelper.CreateRootObjectDefinitionBuilder(typeof (AttributesTransactionAttributeSource));
+
+                builder.AddPropertyValue(TxNamespaceUtils.TRANSACTION_ATTRIBUTE_SOURCE,
+                                         txAttributeSourceBuilder.ObjectDefinition);
+
+            }
+        }
+
+        private AbstractObjectDefinition ParseAttributeSource(XmlElement element, ParserContext parserContext)
+        {
+            XmlNodeList methods = element.SelectNodes("*[local-name()='method' and namespace-uri()='" + element.NamespaceURI + "']");
+            ManagedDictionary transactionAttributeMap = new ManagedDictionary();
+            foreach (XmlElement methodElement in methods)
+            {
+                string name = methodElement.GetAttribute("name");
+                TypedStringValue nameHolder = new TypedStringValue(name);
+                
+                RuleBasedTransactionAttribute attribute = new RuleBasedTransactionAttribute();
+                string propagation = methodElement.GetAttribute(PROPAGATION);
+                string isolation = methodElement.GetAttribute(ISOLATION);
+                string timeout = methodElement.GetAttribute(TIMEOUT);
+                string readOnly = methodElement.GetAttribute(READ_ONLY);
+                if (StringUtils.HasText(propagation))
+                {
+                    attribute.PropagationBehavior = (TransactionPropagation) Enum.Parse(typeof (TransactionPropagation), propagation, true);
+                }
+                if (StringUtils.HasText(isolation))
+                {
+                    attribute.TransactionIsolationLevel =
+                        (IsolationLevel) Enum.Parse(typeof (IsolationLevel), isolation, true);
+                }
+                if (StringUtils.HasText(timeout))
+                {
+                    try
+                    {
+                        attribute.TransactionTimeout = Int32.Parse(timeout);
+                    }
+                    catch (FormatException ex)
+                    {
+                        parserContext.ReaderContext.ReportException(methodElement,"tx advice","timeout must be an integer value: [" + timeout + "]", ex);
+                    }
+                }
+                if (StringUtils.HasText(readOnly))
+                {
+                    attribute.ReadOnly = Boolean.Parse(methodElement.GetAttribute(READ_ONLY));
+                }
+                IList rollbackRules = new LinkedList();
+                if (methodElement.HasAttribute(ROLLBACK_FOR))
+                {
+                    string rollbackForValue = methodElement.GetAttribute(ROLLBACK_FOR);
+                    AddRollbackRuleAttributesTo(rollbackRules, rollbackForValue);
+                }
+                if (methodElement.HasAttribute(NO_ROLLBACK_FOR))
+                {
+                    string noRollbackForValue = methodElement.GetAttribute(NO_ROLLBACK_FOR);
+                    AddNoRollbackRuleAttributesTo(rollbackRules, noRollbackForValue);
+                }
+                attribute.RollbackRules = rollbackRules;
+
+                transactionAttributeMap[nameHolder] = attribute;
+
+
+
+            }
+
+            ObjectDefinitionBuilder builder = 
+                parserContext.ParserHelper.CreateRootObjectDefinitionBuilder(typeof (NameMatchTransactionAttributeSource));
+            builder.AddPropertyValue(NAME_MAP, transactionAttributeMap);
+            return builder.ObjectDefinition;
+
+        }
+
+
+
+        private void AddRollbackRuleAttributesTo(IList rollbackRules, string rollbackForValue)
+        {
+            string[] exceptionTypeNames = StringUtils.CommaDelimitedListToStringArray(rollbackForValue);
+            foreach (string exceptionTypeName in exceptionTypeNames)
+            {
+                rollbackRules.Add(new RollbackRuleAttribute(exceptionTypeName.Trim()));
+            }
+        }
+
+        private void AddNoRollbackRuleAttributesTo(IList rollbackRules, string noRollbackForValue)
+        {
+            string[] exceptionTypeNames = StringUtils.CommaDelimitedListToStringArray(noRollbackForValue);
+            foreach (string exceptionTypeName in exceptionTypeNames)
+            {
+                rollbackRules.Add(new NoRollbackRuleAttribute(exceptionTypeName.Trim()));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/Config/TxNamespaceParser.cs b/src/Spring/Spring.Data/Transaction/Config/TxNamespaceParser.cs
new file mode 100644
index 00000000..12061aae
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Config/TxNamespaceParser.cs
@@ -0,0 +1,59 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 Spring.Objects.Factory.Xml;
+
+namespace Spring.Transaction.Config
+{
+    /// <summary>
+    /// <code>NamespaceParser</code> allowing for the configuration of
+    /// declarative transaction management using either XML or using attributes.
+    /// 
+    /// This namespace handler is the central piece of functionality in the
+    /// Spring transaction management facilities and offers two appraoches
+    /// to declaratively manage transactions.
+    /// 
+    /// One approach uses transaction semantics defined in XML using the
+    /// <code>&lt;tx:advice&gt;</code> elements, the other uses attributes
+    /// in combination with the <code>&lt;tx:annotation-driven&gt;</code> element.
+    /// Both approached are detailed in the Spring reference manual.
+    /// </summary>
+    [
+        NamespaceParser(
+            Namespace = "http://www.springframework.net/tx",
+            SchemaLocationAssemblyHint = typeof(TxNamespaceParser),
+            SchemaLocation = "/Spring.Transaction.Config/spring-tx-1.1.xsd"
+        )
+    ]
+    public class TxNamespaceParser : NamespaceParserSupport
+    {
+        /// <summary>
+        /// Register the <see cref="IObjectDefinitionParser"/> for the '<code>advice</code>' and
+        /// '<code>attribute-driven'</code> tags.
+        /// </summary>
+        public override void Init()
+        {
+            RegisterObjectDefinitionParser("advice", new TxAdviceObjectDefinitionParser());
+            RegisterObjectDefinitionParser("attribute-driven", new AttributeDrivenObjectDefinitionParser());
+
+        }
+    }
+}
diff --git a/src/Spring/Spring.Data/Transaction/Config/TxNamespaceUtils.cs b/src/Spring/Spring.Data/Transaction/Config/TxNamespaceUtils.cs
new file mode 100644
index 00000000..f1bfa4e1
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Config/TxNamespaceUtils.cs
@@ -0,0 +1,52 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 Spring.Core;
+using Spring.Transaction.Interceptor;
+
+namespace Spring.Transaction.Config
+{
+    /// <summary>
+    /// This is a utility class to help in parsing the transaction namespace
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: TxNamespaceUtils.cs,v 1.2 2007/12/07 08:10:03 markpollack Exp $</version>
+    public sealed class TxNamespaceUtils
+    {
+        /// <summary>
+        /// The transaction manager attribute
+        /// </summary>
+        public const string TRANSACTION_MANAGER_ATTRIBUTE = "transaction-manager";
+
+        /// <summary>
+        /// The source of transaction metadata
+        /// </summary>
+        public const string TRANSACTION_ATTRIBUTE_SOURCE = "transactionAttributeSource";
+
+        /// <summary>
+        /// The property asociated with the transaction manager xml element
+        /// </summary>
+        public static readonly string TRANSACTION_MANAGER_PROPERTY =
+            Conventions.AttributeNameToPropertyName(TRANSACTION_MANAGER_ATTRIBUTE);
+
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/Config/spring-tx-1.1.xsd b/src/Spring/Spring.Data/Transaction/Config/spring-tx-1.1.xsd
new file mode 100644
index 00000000..3759bad6
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Config/spring-tx-1.1.xsd
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://www.springframework.net/tx"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:objects="http://www.springframework.net"
+		xmlns:tool="http://www.springframework.net/tool"
+		targetNamespace="http://www.springframework.net/tx"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.net"/>
+	<xsd:import namespace="http://www.springframework.net/tool"/>
+
+
+	<xsd:complexType name="identifiedType" abstract="true">
+		<xsd:annotation>
+			<xsd:documentation>
+				<![CDATA[
+	The unique identifier for a object. The scope of the identifier
+	is the enclosing object factory.
+			]]>
+			</xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="id" type="xsd:ID">
+			<xsd:annotation>
+				<xsd:documentation>
+					<![CDATA[
+	The unique identifier for an object.
+				]]>
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:annotation>
+		<xsd:documentation><![CDATA[
+	Defines the elements used in the Spring Framework's declarative
+	transaction management infrastructure.
+		]]></xsd:documentation>
+	</xsd:annotation>
+
+	<xsd:element name="advice">
+		<xsd:complexType>
+			<xsd:annotation>
+				<xsd:documentation source="net: Spring.Transaction.Interceptor.TransactionInterceptor"><![CDATA[
+	Defines the transactional semantics of the AOP advice that is to be
+	executed.
+	
+	That is, this advice element is where the transactional semantics of
+	any	number of methods are defined (where transactional semantics
+	includes the propagation settings, the isolation level, the rollback
+	rules, etc).
+				]]></xsd:documentation>
+				<xsd:appinfo>
+					<tool:annotation>
+						<tool:exports type="Spring.Transaction.Interceptor.TransactionInterceptor"/>
+					</tool:annotation>
+				</xsd:appinfo>
+			</xsd:annotation>
+			<xsd:complexContent>
+				<xsd:extension base="identifiedType">
+					<xsd:sequence>
+						<xsd:element name="attributes" type="attributesType" minOccurs="0" maxOccurs="1"/>
+					</xsd:sequence>
+					<xsd:attribute name="transaction-manager" type="xsd:string" default="transactionManager">
+						<xsd:annotation>
+							<xsd:documentation source="net:Spring.Transaction.IPlatformTransactionManager"><![CDATA[
+	The object name of the PlatformTransactionManager that is to be used
+	to drive transactions.
+	
+	This attribute is not required, and only needs to be specified
+	explicitly if the bean name of the desired PlatformTransactionManager
+	is not 'transactionManager'.
+							]]></xsd:documentation>
+							<xsd:appinfo>
+								<tool:annotation kind="ref">
+									<tool:expected-type type="Spring.Transaction.IPlatformTransactionManager"/>
+								</tool:annotation>
+							</xsd:appinfo>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="attribute-driven">
+		<xsd:complexType>
+			<xsd:annotation>
+				<xsd:documentation source="net:Spring.Transaction.Interceptor.AttributesTransactionAttributeSource"><![CDATA[
+	Indicates that transaction configuration is defined by .NET
+	attributes on objects classes, and that proxies are automatically
+	to be created for the relevant annotated objects.
+	
+	Transaction semantics such as propagation settings, the isolation
+	level, the rollback rules, etc are all defined in the annotation
+	metadata.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:attribute name="transaction-manager" type="xsd:string" default="transactionManager">
+				<xsd:annotation>
+					<xsd:documentation source="net:Spring.Transaction.IPlatformTransactionManager"><![CDATA[
+	The object name of the PlatformTransactionManager that is to be used
+	to drive transactions.
+	
+	This attribute is not required, and only needs to be specified
+	explicitly if the object name of the desired PlatformTransactionManager
+	is not 'transactionManager'.
+					]]></xsd:documentation>
+					<xsd:appinfo>
+								<tool:annotation kind="ref">
+									<tool:expected-type type="Spring.Transaction.IPlatformTransactionManager"/>
+								</tool:annotation>
+							</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="proxy-target-type" type="xsd:boolean" default="false">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Are inheritance based proxies to be created? By default, composition
+	based proxies are created.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="order" type="xsd:int">
+				<xsd:annotation>
+					<xsd:documentation source="net:Spring.Core.IOrdered"><![CDATA[
+	Controls the ordering of the execution of the transaction advisor
+	when multiple advice executes at a specific joinpoint.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:complexType name="attributesType">
+		<xsd:sequence>
+			<xsd:element name="method" minOccurs="1" maxOccurs="unbounded">
+				<xsd:complexType>
+					<xsd:attribute name="name" type="xsd:string" use="required">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The method name(s) with which the transaction attributes are to be
+	associated. The wildcard (*) character can be used to associate the
+	same transaction attribute settings with a number of methods; for
+	example, 'get*', 'handle*', 'on*Event', etc.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="propagation" default="Required">
+						<xsd:simpleType>
+							<xsd:annotation>
+								<xsd:documentation source="net:Spring.Transaction.TransactionPropagation"><![CDATA[
+	The transaction propagation behavior.
+								]]></xsd:documentation>
+							</xsd:annotation>
+							<xsd:restriction base="xsd:string">
+								<xsd:enumeration value="Required"/>
+								<xsd:enumeration value="Supports"/>
+								<xsd:enumeration value="Mandatory"/>
+								<xsd:enumeration value="RequiresNew"/>
+								<xsd:enumeration value="NotSupported"/>
+								<xsd:enumeration value="Never"/>
+								<xsd:enumeration value="Nested"/>
+							</xsd:restriction>
+						</xsd:simpleType>
+					</xsd:attribute>
+					<xsd:attribute name="isolation" default="ReadCommitted">
+						<xsd:simpleType>
+							<xsd:annotation>
+								<xsd:documentation source="net:System.Data.IsolationLevel"><![CDATA[
+	The transaction isolation level.
+								]]></xsd:documentation>
+							</xsd:annotation>
+							<xsd:restriction base="xsd:string">
+								<xsd:enumeration value="Unspecified"/>
+								<xsd:enumeration value="ReadUncommitted"/>
+								<xsd:enumeration value="ReadCommitted"/>
+								<xsd:enumeration value="RepeatableRead"/>
+								<xsd:enumeration value="Serializable"/>
+                <xsd:enumeration value="Snapshot"/>
+                <xsd:enumeration value="Chaos"/>
+							</xsd:restriction>
+						</xsd:simpleType>
+					</xsd:attribute>
+					<xsd:attribute name="timeout" type="xsd:integer" default="-1">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The transaction timeout value (in seconds).
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="read-only" type="xsd:boolean" default="false">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	Is this transaction read-only?
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="rollback-for" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The Exception(s) that will trigger rollback; comma-delimited.
+	For example, 'com.foo.MyBusinessException,ServletException'
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="no-rollback-for" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The Exception(s) that will *not* trigger rollback; comma-delimited.
+	For example, 'com.foo.MyBusinessException,ServletException'
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+
+</xsd:schema>
diff --git a/src/Spring/Spring.Data/Transaction/HeuristicCompletionException.cs b/src/Spring/Spring.Data/Transaction/HeuristicCompletionException.cs
new file mode 100644
index 00000000..ca775a16
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/HeuristicCompletionException.cs
@@ -0,0 +1,147 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Runtime.Serialization;
+
+namespace Spring.Transaction
+{
+	/// <summary>
+	/// Exception that represents a transaction failure caused by heuristics.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: HeuristicCompletionException.cs,v 1.6 2006/05/18 21:37:51 markpollack Exp $</version>
+	[Serializable]
+	public class HeuristicCompletionException : TransactionException, ISerializable
+	{
+		/// <summary>
+		/// The outcome state of the transaction: have some or all resources been committed?
+		/// </summary>
+		private TransactionOutcomeState _outcomeState = TransactionOutcomeState.Unknown;
+
+		/// <summary>
+		/// Returns the transaction's outcome state.
+		/// </summary>
+		public TransactionOutcomeState OutcomeState
+		{
+			get { return _outcomeState; }
+		}
+
+		/// <summary>
+		/// Returns a <see cref="System.String"/> representation of the supplied
+		/// <see cref="Spring.Transaction.TransactionOutcomeState"/>.
+		/// </summary>
+		/// <param name="outcomeState">
+		/// The <see cref="Spring.Transaction.TransactionOutcomeState"/> value that
+		/// is to be stringified.
+		/// </param>
+		/// <returns>A <see cref="System.String"/> representation.</returns>
+		public static string GetStateString( TransactionOutcomeState outcomeState )
+		{
+			return Enum.GetName (typeof (TransactionOutcomeState), outcomeState);
+		}
+		
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.CannotCreateTransactionException"/> class.
+		/// </summary>
+		public HeuristicCompletionException( ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.CannotCreateTransactionException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public HeuristicCompletionException( string message ) : base( message ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.CannotCreateTransactionException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public HeuristicCompletionException( string message, Exception rootCause )
+			: base( message, rootCause ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.CannotCreateTransactionException"/> class
+		/// with the specified <see cref="Spring.Transaction.TransactionOutcomeState"/>
+		/// and inner exception.
+		/// </summary>
+		/// <param name="outcomeState">
+		/// The <see cref="Spring.Transaction.TransactionOutcomeState"/>
+		/// for the transaction.
+		/// </param>
+		/// <param name="innerException">
+		/// The inner exception that is being wrapped.
+		/// </param>
+		public HeuristicCompletionException(
+			TransactionOutcomeState outcomeState, Exception innerException)
+			: base( "Heuristic completion: outcome state is " + GetStateString(outcomeState), innerException )
+		{
+			_outcomeState = outcomeState;
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.CannotCreateTransactionException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected HeuristicCompletionException( SerializationInfo info, StreamingContext context )
+			: base( info, context ) 
+		{
+			_outcomeState = ( TransactionOutcomeState ) info.GetInt32( "outcomeState" );
+		}
+
+		/// <summary>
+		/// Override of <see cref="System.Exception.GetObjectData(SerializationInfo, StreamingContext)"/>
+		/// to allow for private serialization.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		public override void GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+			info.AddValue( "outcomeState", _outcomeState );
+			base.GetObjectData (info, context);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/IPlatformTransactionManager.cs b/src/Spring/Spring.Data/Transaction/IPlatformTransactionManager.cs
new file mode 100644
index 00000000..bf2cf496
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/IPlatformTransactionManager.cs
@@ -0,0 +1,110 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Transaction
+{
+	/// <summary>
+	/// This is the central interface in Spring.NET's transaction support.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+    /// Applications can use this directly, but it is not primarily meant as an API.
+    /// Typically, applications will work with either
+    /// <see cref="Spring.Transaction.Support.TransactionTemplate"/> or the AOP transaction
+    /// interceptor.
+    /// </p>
+    /// <p>
+    /// For implementers, <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager"/>
+    /// is a good starting point.
+    /// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: IPlatformTransactionManager.cs,v 1.10 2007/08/01 18:53:05 markpollack Exp $</version>
+	public interface IPlatformTransactionManager
+	{
+		/// <summary>
+		/// Return a currently active transaction or create a new one.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+        /// Note that parameters like isolation level or timeout will only be applied
+        /// to new transactions, and thus be ignored when participating in active ones.
+        /// Furthermore, they aren't supported by every transaction manager:
+        /// a proper implementation should throw an exception when custom values
+        /// that it doesn't support are specified.
+		/// </p>
+		/// </remarks>
+		/// <param name="definition">
+		/// <see cref="Spring.Transaction.ITransactionDefinition"/> instance (can be null for
+		/// defaults), describing propagation behavior, isolation level, timeout etc.
+		/// </param>
+		/// <exception cref="Spring.Transaction.TransactionException">
+		/// In case of lookup, creation, or system errors.
+		/// </exception>
+		/// <returns>
+		/// A <see cref="Spring.Transaction.ITransactionStatus"/> representing the new or current transaction.
+		/// </returns>
+		ITransactionStatus GetTransaction( ITransactionDefinition definition );
+
+		/// <summary>
+        /// Commit the given transaction, with regard to its status.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the transaction has been marked rollback-only programmatically,
+        /// perform a rollback.
+        /// </p>
+        /// <p>
+        /// If the transaction wasn't a new one, omit the commit to take part
+        /// in the surrounding transaction properly.
+        /// </p>
+        /// </remarks>
+		/// <param name="transactionStatus">
+		/// The <see cref="Spring.Transaction.ITransactionStatus"/> instance returned by the
+		/// <see cref="Spring.Transaction.IPlatformTransactionManager.GetTransaction"/>() method.
+		/// </param>
+		/// <exception cref="Spring.Transaction.TransactionException">
+		/// In case of commit or system errors
+		/// </exception>
+		void Commit( ITransactionStatus transactionStatus );
+
+		/// <summary>
+		/// Roll back the given transaction, with regard to its status.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the transaction wasn't a new one, just set it rollback-only
+        /// to take part in the surrounding transaction properly.
+        /// </p>
+        /// </remarks>
+		/// <param name="transactionStatus">
+		/// The <see cref="Spring.Transaction.ITransactionStatus"/> instance returned by the
+		/// <see cref="Spring.Transaction.IPlatformTransactionManager.GetTransaction"/>() method.
+		/// </param>
+		/// <exception cref="Spring.Transaction.TransactionException">
+		/// In case of system errors.
+		/// </exception>
+		void Rollback( ITransactionStatus transactionStatus );
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/ISavepointManager.cs b/src/Spring/Spring.Data/Transaction/ISavepointManager.cs
new file mode 100644
index 00000000..55495ab9
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/ISavepointManager.cs
@@ -0,0 +1,99 @@
+#region License
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Transaction
+{
+	/// <summary>
+	/// Interface that specifies means to programmatically manage
+	/// transaction savepoints in a generic fashion.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Note that savepoints can only work within an active transaction.
+	/// Just use this programmatic savepoint handling for advanced needs;
+	/// else, a subtransaction with a <see cref="Spring.Transaction.TransactionPropagation"/> value
+	/// of <see cref="Spring.Transaction.TransactionPropagation.Nested"/> is preferable.
+	///	</p>	
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: ISavepointManager.cs,v 1.5 2006/05/17 17:48:25 bbaia Exp $</version>
+	public interface ISavepointManager
+	{
+		/// <summary>
+		/// Create a new savepoint.
+		/// </summary>
+		/// <param name="savepointName">
+		/// The name of the savepoint to create.
+		/// </param>
+		/// <remarks>
+		/// You can roll back to a specific savepoint
+		/// via <see cref="Spring.Transaction.ISavepointManager.RollbackToSavepoint"/>,
+		/// and explicitly release a savepoint that you don't need anymore via
+		/// <see cref="Spring.Transaction.ISavepointManager.ReleaseSavepoint"/>.
+		/// <p>
+		/// Note that most transaction managers will automatically release
+		/// savepoints at transaction completion.
+		/// </p>
+		/// </remarks>
+		/// <exception cref="Spring.Transaction.TransactionException">
+		/// If the savepoint could not be created,
+		/// either because the backend does not support it or because the
+		/// transaction is not in an appropriate state.
+		/// </exception>
+		/// <returns>
+		/// A savepoint object, to be passed into
+		/// <see cref="Spring.Transaction.ISavepointManager.RollbackToSavepoint"/>
+		/// or <see cref="Spring.Transaction.ISavepointManager.ReleaseSavepoint"/>.
+		/// </returns>
+		void CreateSavepoint( string savepointName );
+
+		/// <summary>
+		/// Roll back to the given savepoint.
+		/// </summary>
+		/// <remarks>
+		/// The savepoint will be automatically released afterwards.
+		/// </remarks>
+		/// <param name="savepoint">The savepoint to roll back to.</param>
+		/// <exception cref="Spring.Transaction.TransactionException">
+		/// If the rollback failed.
+		/// </exception>
+		void RollbackToSavepoint( string savepoint );
+
+		/// <summary>
+		/// Explicitly release the given savepoint.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Note that most transaction managers will automatically release
+		/// savepoints at transaction completion.
+		/// </p>
+		/// <p>
+		/// Implementations should fail as silently as possible if
+		/// proper resource cleanup will still happen at transaction completion.
+		/// </p>
+		/// </remarks>
+		/// <param name="savepoint">The savepoint to release.</param>
+		/// <exception cref="Spring.Transaction.TransactionException">
+		/// If the release failed.
+		/// </exception>
+		void ReleaseSavepoint( string savepoint );
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/ITransactionDefinition.cs b/src/Spring/Spring.Data/Transaction/ITransactionDefinition.cs
new file mode 100644
index 00000000..3294ad1d
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/ITransactionDefinition.cs
@@ -0,0 +1,122 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Data;
+
+namespace Spring.Transaction
+{
+	/// <summary>
+	/// Interface for classes that define transaction properties. Base interface for
+	/// <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/>.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Note that isolation level, timeout and read-only settings will only
+    /// get applied when starting a new transaction. As only
+    /// <see cref="Spring.Transaction.TransactionPropagation.Required"/> and
+    /// <see cref="Spring.Transaction.TransactionPropagation.RequiresNew"/> can actually cause that, it doesn't make sense
+    /// to specify any of those settings else. Furthermore, not all transaction
+    /// managers will support those features and thus throw respective exceptions
+    /// when given non-default values.
+    /// </p>
+    /// </remarks>
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ITransactionDefinition.cs,v 1.9 2007/12/07 08:10:03 markpollack Exp $</version>
+	public interface ITransactionDefinition
+	{
+		/// <summary>
+		/// Return the propagation behavior of type
+		/// <see cref="Spring.Transaction.TransactionPropagation"/>.
+		/// </summary>
+		TransactionPropagation PropagationBehavior { get; }
+
+		/// <summary>
+        /// Return the isolation level of type <see cref="System.Data.IsolationLevel"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Only makes sense in combination with
+        /// <see cref="Spring.Transaction.TransactionPropagation.Required"/> and
+        /// <see cref="Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+        /// </p>
+        /// <p>
+        /// Note that a transaction manager that does not support custom isolation levels
+        /// will throw an exception when given any other level than
+        /// <see cref="System.Data.IsolationLevel.Unspecified"/>.
+        /// </p>
+        /// </remarks>
+		IsolationLevel TransactionIsolationLevel { get; }
+
+		/// <summary>
+        /// Return the transaction timeout.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Must return a number of seconds, or -1.
+        /// Only makes sense in combination with
+        /// <see cref="Spring.Transaction.TransactionPropagation.Required"/> and
+        /// <see cref="Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+        /// Note that a transaction manager that does not support timeouts will
+        /// throw an exception when given any other timeout than -1.
+        /// </p>
+        /// </remarks>
+		int TransactionTimeout { get; }
+
+		/// <summary>
+        /// Get whether to optimize as read-only transaction.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This just serves as hint for the actual transaction subsystem,
+        /// it will <i>not necessarily</i> cause failure of write accesses.
+        /// </p>
+        /// <p>
+        /// Only makes sense in combination with
+        /// <see cref="Spring.Transaction.TransactionPropagation.Required"/> and
+        /// <see cref="Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+        /// </p>
+        /// <p>
+        /// A transaction manager that cannot interpret the read-only hint
+        /// will <i>not</i> throw an exception when given <c>ReadOnly=true</c>.
+        /// </p>
+        /// </remarks>
+		bool ReadOnly { get; }
+
+        /// <summary>
+        /// Return the name of this transaction.  Can be null.
+        /// </summary>
+        /// <remarks>
+        /// This will be used as a transaction name to be shown in a 
+        /// transaction monitor, if applicable.  In the case of Spring
+        /// declarative transactions, the exposed name will be the fully
+        /// qualified type name + "." method name + assembly (by default).
+        /// </remarks>
+        string Name { get; }
+
+#if NET_2_0
+        /// <summary>
+        /// Gets the enterprise services interop option.
+        /// </summary>
+        /// <value>The enterprise services interop option.</value>
+        System.Transactions.EnterpriseServicesInteropOption EnterpriseServicesInteropOption { get;}
+#endif
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/ITransactionStatus.cs b/src/Spring/Spring.Data/Transaction/ITransactionStatus.cs
new file mode 100644
index 00000000..58c98a20
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/ITransactionStatus.cs
@@ -0,0 +1,85 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Data;
+
+namespace Spring.Transaction
+{
+	/// <summary>
+	/// Representation of the status of a transaction,
+    /// consisting of a transaction object and some status flags.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Transactional code can use this to retrieve status information,
+    /// and to programmatically request a rollback (instead of throwing
+    /// an exception that causes an implicit rollback).
+    /// </p>
+    /// <p>
+	/// Derives from the <see cref="Spring.Transaction.ISavepointManager"/> interface to provide access
+	/// to savepoint management facilities. Note that savepoint management
+	/// is just available if the actual transaction manager supports it.
+    /// </p>
+    /// </remarks>
+	/// <author>Juergen Hoeller</author>
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ITransactionStatus.cs,v 1.11 2007/08/01 18:53:05 markpollack Exp $</version>
+	public interface ITransactionStatus : ISavepointManager
+	{
+		/// <summary>
+		/// Returns <b>true</b> if the transaction is new, else <b>false</b> if participating
+		/// in an existing transaction.
+		/// </summary>
+		bool IsNewTransaction { get; }
+
+		/// <summary>
+        /// Gets / sets if the transaction is rollback-only.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This instructs the transaction manager that the only possible outcome of
+        /// the transaction may be a rollback, proceeding with the normal application
+        /// workflow though (i.e. no exception).
+        /// </p>
+        /// <p>
+        /// For transactions managed by a
+        /// <see cref="Spring.Transaction.Support.TransactionTemplate"/> or
+        /// <see cref="Spring.Transaction.Interceptor.TransactionInterceptor"/>.
+        /// An alternative way to trigger a rollback is throwing an transaction exception.
+        /// </p>
+        /// </remarks>
+		bool RollbackOnly { get; set; }
+
+		/// <summary>
+		/// Gets the current transaction object.
+		/// </summary>
+		/// <remarks>
+		/// Returns the current transaction object for a given connection.
+		/// <p>
+		/// Used to associate with the <see cref="System.Data.IDbCommand.Transaction"/> property.
+		/// </p>
+		/// </remarks>
+		object Transaction { get; }
+
+        bool Completed { get; }
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/IllegalTransactionStateException.cs b/src/Spring/Spring.Data/Transaction/IllegalTransactionStateException.cs
new file mode 100644
index 00000000..67581711
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/IllegalTransactionStateException.cs
@@ -0,0 +1,80 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Runtime.Serialization;
+
+namespace Spring.Transaction
+{
+	/// <summary>
+	/// Exception thrown when the existence or non-existence of a transaction
+	/// amounts to an illegal state according to the transaction propagation
+	/// behavior that applies.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: IllegalTransactionStateException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	[Serializable]
+	public class IllegalTransactionStateException : CannotCreateTransactionException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.IllegalTransactionStateException"/> class.
+		/// </summary>
+		public IllegalTransactionStateException( ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.IllegalTransactionStateException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public IllegalTransactionStateException( String message ) : base(message) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.IllegalTransactionStateException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public IllegalTransactionStateException(string message, Exception rootCause)
+			: base(message, rootCause) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.IllegalTransactionStateException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected IllegalTransactionStateException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/AbstractFallbackTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/AbstractFallbackTransactionAttributeSource.cs
new file mode 100644
index 00000000..7902fba0
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/AbstractFallbackTransactionAttributeSource.cs
@@ -0,0 +1,299 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Reflection;
+
+using Spring.Collections;
+using Spring.Util;
+using Spring.Core;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Abstract implementation of
+	/// <see cref="Spring.Transaction.Interceptor.ITransactionAttributeSource"/>
+	/// that caches attributes for methods, and implements a default fallback policy.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The default fallback policy applied by this class is:
+	/// <list type="numbered">
+	/// <item>
+	/// <description>most specific method</description>
+	/// </item>
+	/// <item>
+	/// <description>target class attribute</description>
+	/// </item>
+	/// <item>
+	/// <description>declaring method</description>
+	/// </item>
+	/// <item>
+	/// <description>declaring class</description>
+	/// </item>
+	/// </list>
+	/// </p>
+	/// <p>
+	/// Defaults to using class's transaction attribute if none is associated
+	/// with the target method. Any transaction attribute associated with the
+	/// target method completely overrides a class transaction attribute.
+	/// </p>
+	/// <p>
+	/// This implementation caches attributes by method after they are first used.
+	/// If it's ever desirable to allow dynamic changing of transaction attributes
+	/// (unlikely) caching could be made configurable. Caching is desirable because
+	/// of the cost of evaluating rollback rules.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: AbstractFallbackTransactionAttributeSource.cs,v 1.8 2007/09/20 12:31:01 bbaia Exp $</version>
+	public abstract class AbstractFallbackTransactionAttributeSource : ITransactionAttributeSource
+	{
+		/// <summary>
+		/// Canonical value held in cache to indicate no transaction attibute was found
+		/// for this method, and we don't need to look again.
+		/// </summary>
+		private static readonly object NULL_TX_ATTIBUTE = new object();
+
+		/// <summary>
+		/// Cache of <see cref="ITransactionAttribute"/>s, keyed by method and target class.
+		/// </summary>
+		private IDictionary _transactionAttibuteCache = new Hashtable();
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource"/>
+		/// class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This is an <see langword="abstract"/> class, and as such exposes no public constructors.
+		/// </p>
+		/// </remarks>
+		protected AbstractFallbackTransactionAttributeSource()
+		{
+		}
+
+		#region Protected Abstract Methods
+
+		/// <summary>
+		/// Subclasses should implement this to return all attributes for this method.
+		/// May return null.
+		/// </summary>
+		/// <remarks>
+		/// We need all because of the need to analyze rollback rules.
+		/// </remarks>
+		/// <param name="method">The method to retrieve attributes for.</param>
+		/// <returns>The transactional attributes associated with the method.</returns>
+		protected abstract Attribute[] FindAllAttributes(MethodInfo method);
+
+		/// <summary>
+		/// Subclasses should implement this to return all attributes for this class.
+		/// May return null.
+		/// </summary>
+		/// <param name="targetType">
+		/// The <see cref="System.Type"/> to retrieve attributes for.
+		/// </param>
+		/// <returns>
+		/// All attributes associated with the supplied <paramref name="targetType"/>.
+		/// </returns>
+		protected abstract Attribute[] FindAllAttributes(Type targetType);
+
+		#endregion
+
+		#region ITransactionAttributeSource Members
+
+		/// <summary>
+		/// Return the transaction attribute for this method invocation.
+		/// </summary>
+		/// <remarks>
+		/// Defaults to the class's transaction attribute if no method
+		/// attribute is found
+		/// </remarks>
+		/// <param name="method">method for the current invocation. Can't be null</param>
+		/// <param name="targetType">target class for this invocation. May be null.</param>
+		/// <returns><see cref="ITransactionAttribute"/> for this method, or null if the method is non-transactional</returns>
+		public ITransactionAttribute ReturnTransactionAttribute(MethodInfo method, Type targetType)
+		{
+			object cacheKey = getCacheKey(method, targetType);
+            object cached = null;
+
+            lock (_transactionAttibuteCache)
+            {
+                cached = _transactionAttibuteCache[cacheKey];
+
+                if (cached != null)
+                {
+                    if (NULL_TX_ATTIBUTE == cached)
+                    {
+                        return null;
+                    }
+                    {
+                        return (ITransactionAttribute)cached;
+                    }
+                }
+                else
+                {
+                    ITransactionAttribute transactionAttribute = computeTransactionAttribute(method, targetType);
+                    if (null == transactionAttribute)
+                    {
+                        _transactionAttibuteCache.Add(cacheKey, NULL_TX_ATTIBUTE);
+                    }
+                    else
+                    {
+                        _transactionAttibuteCache.Add(cacheKey, transactionAttribute);
+                    }
+                    return transactionAttribute;
+                }
+            }
+		}
+
+		#endregion
+
+		/// <summary>
+		/// Return the transaction attribute, given this set of attributes
+		/// attached to a method or class. Return null if it's not transactional.  
+		/// </summary>
+		/// <remarks>
+		/// Protected rather than private as subclasses may want to customize
+		/// how this is done: for example, returning a
+		/// <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/>
+		/// affected by the values of other attributes.
+		/// This implementation takes into account
+		/// <see cref="Spring.Transaction.Interceptor.RollbackRuleAttribute"/>s, if
+		/// the TransactionAttribute is a RuleBasedTransactionAttribute.
+		/// </remarks>
+		/// <param name="attributes">
+		/// Attributes attached to a method or class. May be null, in which case a null
+		/// <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> will be returned.
+		/// </param>
+		/// <returns>
+		/// The <see cref="ITransactionAttribute"/> configured transaction attribute, or null
+		/// if none was found.
+		/// </returns>
+		protected virtual ITransactionAttribute FindTransactionAttribute(Attribute[] attributes)
+		{
+			if (null == attributes)
+			{
+				return null;
+			}
+			ITransactionAttribute transactionAttribute = null;
+			foreach (Attribute currentAttribute in attributes)
+			{
+				transactionAttribute = currentAttribute as ITransactionAttribute;
+				if (null != transactionAttribute)
+				{
+					break;
+				}
+			}
+
+			RuleBasedTransactionAttribute ruleBasedTransactionAttribute = transactionAttribute as RuleBasedTransactionAttribute;
+			if (null != ruleBasedTransactionAttribute)
+			{
+				IList rollbackRules = new LinkedList();
+				foreach (Attribute currentAttribute in attributes)
+				{
+					RollbackRuleAttribute rollbackRuleAttribute = currentAttribute as RollbackRuleAttribute;
+					if (null != rollbackRuleAttribute)
+					{
+						rollbackRules.Add(rollbackRuleAttribute);
+					}
+				}
+				ruleBasedTransactionAttribute.RollbackRules = rollbackRules;
+				return ruleBasedTransactionAttribute;
+			}
+			return transactionAttribute;
+		}
+
+		#region Private Methods
+
+		private object getCacheKey(MethodBase method, Type targetType)
+		{
+			return targetType + String.Empty + method.GetHashCode();
+		}
+
+        private ITransactionAttribute computeTransactionAttribute(MethodInfo method, Type targetType)
+        {
+            MethodInfo specificMethod;
+            if (targetType == null)
+            {
+                specificMethod = method;
+            }
+            else
+            {
+                ComposedCriteria searchCriteria = new ComposedCriteria();
+                searchCriteria.Add(new MethodNameMatchCriteria(method.Name));
+                searchCriteria.Add(new MethodParametersCountCriteria(method.GetParameters().Length));
+#if NET_2_0
+                searchCriteria.Add(new MethodGenericArgumentsCountCriteria(
+                    method.GetGenericArguments().Length));
+#endif
+                searchCriteria.Add(new MethodParametersCriteria(ReflectionUtils.GetParameterTypes(method)));
+
+                MemberInfo[] matchingMethods = targetType.FindMembers(
+                    MemberTypes.Method,
+                    BindingFlags.Instance | BindingFlags.Public,
+                    new MemberFilter(new CriteriaMemberFilter().FilterMemberByCriteria),
+                    searchCriteria);
+
+                if (matchingMethods != null && matchingMethods.Length == 1)
+                {
+                    specificMethod = matchingMethods[0] as MethodInfo;
+                }
+                else
+                {
+                    specificMethod = method;
+                }
+            }
+
+            ITransactionAttribute transactionAttribute = getTransactionAttribute(specificMethod);
+            if (null != transactionAttribute)
+            {
+                return transactionAttribute;
+            }
+            else if (specificMethod != method)
+            {
+                transactionAttribute = getTransactionAttribute(method);
+            }
+            return null;
+        }
+
+		private ITransactionAttribute getTransactionAttribute(MethodInfo methodInfo)
+		{
+			ITransactionAttribute transactionAttribute = FindTransactionAttribute(FindAllAttributes(methodInfo));
+
+			if (null != transactionAttribute)
+			{
+				return transactionAttribute;
+			}
+			transactionAttribute = FindTransactionAttribute(FindAllAttributes(methodInfo.DeclaringType));
+			if (null != transactionAttribute)
+			{
+				return transactionAttribute;
+			}
+			return null;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/AttributesTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/AttributesTransactionAttributeSource.cs
new file mode 100644
index 00000000..513bc923
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/AttributesTransactionAttributeSource.cs
@@ -0,0 +1,131 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Reflection;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Implementation of <see cref="ITransactionAttributeSource"/> that uses
+	/// <see cref="System.Attribute"/>s.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: AttributesTransactionAttributeSource.cs,v 1.6 2007/08/08 20:59:50 markpollack Exp $</version>
+	public class AttributesTransactionAttributeSource : AbstractFallbackTransactionAttributeSource
+	{
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AttributesTransactionAttributeSource"/> class.
+        /// </summary>
+		public AttributesTransactionAttributeSource( )
+		{
+		}
+
+		/// <summary>
+		/// <see cref="Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource.FindAllAttributes(MethodInfo)"/>
+		/// implementation.
+		/// </summary>
+		/// <remarks>
+		/// We need all because of the need to analyze rollback rules.
+		/// </remarks>
+		/// <param name="method">The method to retrieve attributes for.</param>
+		/// <returns>The transactional attributes associated with the method.</returns>
+		protected override Attribute[] FindAllAttributes( MethodInfo method )
+		{
+			return Attribute.GetCustomAttributes(  method );
+		}
+
+		/// <summary>
+		/// <see cref="Spring.Transaction.Interceptor.AbstractFallbackTransactionAttributeSource.FindAllAttributes(Type)"/>
+		/// implementation.
+		/// </summary>
+		/// <param name="targetType">
+		/// The <see cref="System.Type"/> to retrieve attributes for.
+		/// </param>
+		/// <returns>
+		/// All attributes associated with the supplied <paramref name="targetType"/>.
+		/// </returns>
+		protected override Attribute[] FindAllAttributes( Type targetType )
+		{
+			return Attribute.GetCustomAttributes( targetType );
+		}
+
+        protected override ITransactionAttribute FindTransactionAttribute(Attribute[] attributes)
+        {
+            if (attributes == null)
+            {
+                return null;
+            }
+            foreach (Attribute attr in attributes)
+            {
+                if (attr is TransactionAttribute)
+                {
+                    TransactionAttribute ta = (TransactionAttribute)attr;
+                    RuleBasedTransactionAttribute rbta = 
+                        new RuleBasedTransactionAttribute();
+
+                    //TODO another reminder to sync property names
+                    rbta.PropagationBehavior = ta.TransactionPropagation;
+                    rbta.TransactionIsolationLevel = ta.IsolationLevel;
+                    rbta.ReadOnly = ta.ReadOnly;
+
+#if NET_2_0
+                    rbta.EnterpriseServicesInteropOption = ta.EnterpriseServicesInteropOption;
+#endif
+                    Type[] rbf = ta.RollbackFor;
+
+                    IList rollBackRules = new ArrayList();
+
+                    if (rbf != null)
+                    {
+                        foreach (Type t in rbf)
+                        {
+                            RollbackRuleAttribute rule = new RollbackRuleAttribute(t);
+                            rollBackRules.Add(rule);
+                        }
+                    }
+
+
+                    Type[] nrbfc = ta.NoRollbackFor;
+
+                    if (nrbfc != null)
+                    {
+                        foreach (Type t in nrbfc)
+                        {
+                            NoRollbackRuleAttribute rule = new NoRollbackRuleAttribute(t);
+                            rollBackRules.Add(rule);
+                        }
+                    }
+
+                    rbta.RollbackRules = rollBackRules;
+
+                    return rbta;
+
+                }
+            }
+            return null;
+        }
+        
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/DefaultTransactionAttribute.cs b/src/Spring/Spring.Data/Transaction/Interceptor/DefaultTransactionAttribute.cs
new file mode 100644
index 00000000..a70271f8
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/DefaultTransactionAttribute.cs
@@ -0,0 +1,99 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 Spring.Transaction.Support;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary> 
+	/// Transaction attribute approach to rolling back on all exceptions, no other
+	/// exceptions by default.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: DefaultTransactionAttribute.cs,v 1.9 2007/12/29 00:28:53 markpollack Exp $</version>
+	public class DefaultTransactionAttribute : DefaultTransactionDefinition, ITransactionAttribute	
+	{
+		/// <summary>
+		/// Prefix for rollback-on-exception rules in description strings.
+		/// </summary>
+		public static readonly string ROLLBACK_RULE_PREFIX = "-";
+
+		/// <summary>
+		/// Prefix for commit-on-exception rules in description strings.
+		/// </summary>
+		public static readonly string COMMIT_RULE_PREFIX = "+";
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.DefaultTransactionAttribute"/>
+		/// class.
+		/// </summary>
+		public DefaultTransactionAttribute() {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.DefaultTransactionAttribute"/>
+		/// class, setting the propagation behavior to the supplied value.
+		/// </summary>
+		/// <param name="propagationBehavior">
+		/// The desired transaction propagation behaviour.
+		/// </param>
+		public DefaultTransactionAttribute( TransactionPropagation propagationBehavior )
+			: base (propagationBehavior) {}
+
+		#region ITransactionAttribute Members
+		/// <summary>
+		/// Decides if rollback is required for the supplied <paramref name="exception"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The default behavior is to rollback on any exception.
+		/// Consistent with <see cref="Spring.Transaction.Support.TransactionTemplate"/>'s behavior.
+		/// </p>
+		/// </remarks>
+		/// <param name="exception">The <see cref="System.Exception"/> to evaluate.</param>
+		/// <returns>True if the exception causes a rollback, false otherwise.</returns>
+		public virtual bool RollbackOn(Exception exception)
+		{
+			return ( true );
+		}
+		#endregion
+
+		/// <summary> 
+		/// Return a description of this transaction attribute.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The format matches the one used by the
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAttributeEditor"/>,
+		/// to be able to feed any result into a <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/>
+		/// instance's properties.
+		/// </p>
+		/// </remarks>
+		public override string ToString()
+		{
+			string result = DefinitionDescription;
+			result += "," + ROLLBACK_RULE_PREFIX + "System.Exception";
+			return result;
+		}
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/DefaultTransactionAttributeSourceAdvisor.cs b/src/Spring/Spring.Data/Transaction/Interceptor/DefaultTransactionAttributeSourceAdvisor.cs
new file mode 100644
index 00000000..a1f73652
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/DefaultTransactionAttributeSourceAdvisor.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+using AopAlliance.Aop;
+using Spring.Aop.Framework;
+using Spring.Aop.Support;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Advisor driven by a <see cref="Spring.Transaction.Interceptor.ITransactionAttributeSource"/>, 
+    /// used to exclude a general advice <see cref="IAdvice"/> from methods that
+	/// are non-transactional.
+	/// </summary>
+	/// <remarks>
+	/// <para>
+	/// To put it another way, use this advisor when you would like to associate other AOP 
+	/// advice based on the pointcut specified by declarative transaction demarcation, 
+	/// attibute based or otherwise. 
+	/// </para>
+	/// <p>
+	/// Because the AOP framework caches advice calculations, this is normally
+    /// faster than just letting the <see cref="AopAlliance.Intercept.IInterceptor"/>
+	/// run and find out itself that it has no work to do.
+	/// </p>
+	/// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: DefaultTransactionAttributeSourceAdvisor.cs,v 1.1 2007/01/04 05:11:17 markpollack Exp $</version>
+	[Serializable]
+	public class DefaultTransactionAttributeSourceAdvisor : StaticMethodMatcherPointcutAdvisor
+	{
+		private ITransactionAttributeSource _transactionAttributeSource;
+
+		/// <summary>
+		/// Creates a new instance of the
+        /// <see cref="Spring.Transaction.Interceptor.DefaultTransactionAttributeSourceAdvisor"/> class.
+		/// </summary>
+        public DefaultTransactionAttributeSourceAdvisor(ITransactionAttributeSource transactionAttributeSource, IAdvice advice)
+			: base( advice )
+		{
+            if (transactionAttributeSource == null)
+			{
+                throw new AopConfigException("Cannot construct a DefaultTransactionAttributeSourceAdvisor if " + 
+					"TransactionAttributeSource is null.");
+			}
+            _transactionAttributeSource = transactionAttributeSource;
+		}
+
+		/// <summary>
+		/// Tests the input method to see if it's covered by the advisor.
+		/// </summary>
+		/// <param name="method">The method to match.</param>
+		/// <param name="targetClass">The <see cref="System.Type"/> to match against.</param>
+		/// <returns>
+		/// <b>True</b> if the supplied <paramref name="method"/> is covered by the advisor.
+		/// </returns>
+		public override bool Matches(MethodInfo method, Type targetClass)
+		{
+		    return ( _transactionAttributeSource.ReturnTransactionAttribute( (MethodInfo)method, targetClass ) != null);
+		}
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/DelegatingTransactionAttributeWithName.cs b/src/Spring/Spring.Data/Transaction/Interceptor/DelegatingTransactionAttributeWithName.cs
new file mode 100644
index 00000000..6e5890e7
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/DelegatingTransactionAttributeWithName.cs
@@ -0,0 +1,176 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+#if NET_2_0
+using System.Transactions;
+#endif
+using IsolationLevel=System.Data.IsolationLevel;
+
+namespace Spring.Transaction.Interceptor
+{
+    /// <summary>
+    /// ITransactionAttribute that delegates all calls to a give target attribute except for the
+    /// name, which is specified in the constructor.
+    /// </summary>
+    public class DelegatingTransactionAttributeWithName : ITransactionAttribute
+    {
+        private ITransactionAttribute targetAttribute;
+        private string joinpointIdentification;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DelegatingTransactionAttributeWithName"/> class.
+        /// </summary>
+        /// <param name="targetAttribute">The target attribute.</param>
+        /// <param name="identification">The identification.</param>
+        public DelegatingTransactionAttributeWithName(ITransactionAttribute targetAttribute, string identification)
+        {
+            this.targetAttribute = targetAttribute;
+            joinpointIdentification = identification;
+        }
+
+        /// <summary>
+        /// Decides if rollback is required for the supplied <paramref name="exception"/>.
+        /// </summary>
+        /// <param name="exception">The <see cref="System.Exception"/> to evaluate.</param>
+        /// <returns>
+        /// True if the exception causes a rollback, false otherwise.
+        /// </returns>
+        public bool RollbackOn(Exception exception)
+        {
+            return targetAttribute.RollbackOn(exception);
+        }
+
+        /// <summary>
+        /// Return the propagation behavior of type
+        /// <see cref="Spring.Transaction.TransactionPropagation"/>.
+        /// </summary>
+        /// <value></value>
+        public TransactionPropagation PropagationBehavior
+        {
+            get { return targetAttribute.PropagationBehavior; }
+        }
+
+        /// <summary>
+        /// Return the isolation level of type <see cref="System.Data.IsolationLevel"/>.
+        /// </summary>
+        /// <value></value>
+        /// <remarks>
+        /// 	<p>
+        /// Only makes sense in combination with
+        /// <see cref="Spring.Transaction.TransactionPropagation.Required"/> and
+        /// <see cref="Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+        /// </p>
+        /// 	<p>
+        /// Note that a transaction manager that does not support custom isolation levels
+        /// will throw an exception when given any other level than
+        /// <see cref="System.Data.IsolationLevel.Unspecified"/>.
+        /// </p>
+        /// </remarks>
+        public IsolationLevel TransactionIsolationLevel
+        {
+            get { return targetAttribute.TransactionIsolationLevel; }
+        }
+
+        /// <summary>
+        /// Return the transaction timeout.
+        /// </summary>
+        /// <value></value>
+        /// <remarks>
+        /// 	<p>
+        /// Must return a number of seconds, or -1.
+        /// Only makes sense in combination with
+        /// <see cref="Spring.Transaction.TransactionPropagation.Required"/> and
+        /// <see cref="Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+        /// Note that a transaction manager that does not support timeouts will
+        /// throw an exception when given any other timeout than -1.
+        /// </p>
+        /// </remarks>
+        public int TransactionTimeout
+        {
+            get { return targetAttribute.TransactionTimeout; }
+        }
+
+        /// <summary>
+        /// Get whether to optimize as read-only transaction.
+        /// </summary>
+        /// <value></value>
+        /// <remarks>
+        /// 	<p>
+        /// This just serves as hint for the actual transaction subsystem,
+        /// it will <i>not necessarily</i> cause failure of write accesses.
+        /// </p>
+        /// 	<p>
+        /// Only makes sense in combination with
+        /// <see cref="Spring.Transaction.TransactionPropagation.Required"/> and
+        /// <see cref="Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+        /// </p>
+        /// 	<p>
+        /// A transaction manager that cannot interpret the read-only hint
+        /// will <i>not</i> throw an exception when given <c>ReadOnly=true</c>.
+        /// </p>
+        /// </remarks>
+        public bool ReadOnly
+        {
+            get { return targetAttribute.ReadOnly; }
+        }
+
+        /// <summary>
+        /// Return the name of this transaction.
+        /// </summary>
+        /// <value></value>
+        /// <remarks>
+        /// The exposed name will be the fully
+        /// qualified type name + "." method name + assembly (by default).
+        /// </remarks>
+        public string Name
+        {
+            get { return joinpointIdentification; }
+        }
+
+#if NET_2_0
+
+        /// <summary>
+        /// Gets the enterprise services interop option.
+        /// </summary>
+        /// <value>The enterprise services interop option.</value>
+        public EnterpriseServicesInteropOption EnterpriseServicesInteropOption
+        {
+            get { return targetAttribute.EnterpriseServicesInteropOption;  }
+        }
+#endif
+
+        /// <summary> 
+        /// Return a description of this transaction attribute.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The format matches the one used by the
+        /// <see cref="Spring.Transaction.Interceptor.TransactionAttributeEditor"/>,
+        /// to be able to feed any result into a <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/>
+        /// instance's properties.
+        /// </p>
+        /// </remarks>
+        public override string ToString()
+        {
+            return targetAttribute.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttribute.cs b/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttribute.cs
new file mode 100644
index 00000000..b47686f1
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttribute.cs
@@ -0,0 +1,43 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.ComponentModel;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// This interface adds a
+	/// <see cref="Spring.Transaction.Interceptor.ITransactionAttribute.RollbackOn(Exception)"/>
+	/// specification to <see cref="Spring.Transaction.ITransactionDefinition"/>.
+	/// </summary>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: ITransactionAttribute.cs,v 1.6 2007/12/29 00:28:53 markpollack Exp $</version>
+	[TypeConverter(typeof(TransactionAttributeConverter))]
+	public interface ITransactionAttribute : ITransactionDefinition
+	{
+		/// <summary>
+		/// Decides if rollback is required for the supplied <paramref name="exception"/>.
+		/// </summary>
+		/// <param name="exception">The <see cref="System.Exception"/> to evaluate.</param>
+		/// <returns>True if the exception causes a rollback, false otherwise.</returns>
+		bool RollbackOn( Exception exception );
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttributeSource.cs
new file mode 100644
index 00000000..92f19889
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/ITransactionAttributeSource.cs
@@ -0,0 +1,56 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Interface used by <see cref="Spring.Transaction.Interceptor.TransactionInterceptor"/>
+	/// to source transaction attributes.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Implementations know how to source transaction attributes, whether from configuration,
+	/// metadata attributes at source level, or anywhere else.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: ITransactionAttributeSource.cs,v 1.7 2006/05/18 21:37:51 markpollack Exp $</version>
+	public interface ITransactionAttributeSource
+	{
+		/// <summary>
+		/// Return the <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> for this
+		/// method.
+		/// </summary>
+		/// <param name="method">The method to check.</param>
+		/// <param name="targetType">
+		/// The target <see cref="System.Type"/>. May be null, in which case the declaring 
+		/// class of the supplied <paramref name="method"/> must be used.
+		/// </param>
+		/// <returns>
+		/// A <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> or 
+		/// null if the method is non-transactional.
+		/// </returns>
+		ITransactionAttribute ReturnTransactionAttribute( MethodInfo method, Type targetType );
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/MatchAlwaysTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/MatchAlwaysTransactionAttributeSource.cs
new file mode 100644
index 00000000..29908e41
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/MatchAlwaysTransactionAttributeSource.cs
@@ -0,0 +1,126 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Very simple implementation of <see cref="Spring.Transaction.Interceptor.ITransactionAttributeSource"/> 
+	/// which will always return the same <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> 
+	/// for all methods fed to it.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// The <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/>
+	/// may be specified, but will otherwise default to PROPAGATION_REQUIRED. This may be
+	/// used in the cases where you want to use the same transaction attribute with all
+	/// methods being handled by a transaction interceptor.
+	/// </p>
+	/// </remarks>
+	/// <author>Colin Sampaleanu</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: MatchAlwaysTransactionAttributeSource.cs,v 1.7 2007/12/29 00:28:53 markpollack Exp $</version>
+	[Serializable]
+	public class MatchAlwaysTransactionAttributeSource : ITransactionAttributeSource
+	{
+		private ITransactionAttribute _transactionAttribute;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.MatchAlwaysTransactionAttributeSource"/>
+		/// class.
+		/// </summary>
+		public MatchAlwaysTransactionAttributeSource()
+		{
+			_transactionAttribute = new DefaultTransactionAttribute();
+		}
+
+		/// <summary>
+		/// Allows a transaction attribute to be specified, using the <see cref="System.String"/>
+		/// form, for example, "PROPAGATION_REQUIRED".
+		/// </summary>
+		public ITransactionAttribute TransactionAttribute
+		{
+			set { _transactionAttribute = value; }
+		}
+
+		#region ITransactionAttributeSource Members
+		/// <summary>
+		/// Return the <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> for this
+		/// method.
+		/// </summary>
+		/// <param name="method">The method to check.</param>
+		/// <param name="targetType">
+		/// The target <see cref="System.Type"/>. May be null, in which case the declaring 
+		/// class of the supplied <paramref name="method"/> must be used.
+		/// </param>
+		/// <returns>
+		/// A <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> or 
+		/// null if the method is non-transactional.
+		/// </returns>
+		public ITransactionAttribute ReturnTransactionAttribute(MethodInfo method, Type targetType)
+		{
+			return _transactionAttribute;
+		}
+		#endregion
+
+        /// <summary>
+        /// Determines whether the specified <see cref="T:System.Object"></see> is equal to the current <see cref="T:System.Object"></see>.
+        /// </summary>
+        /// <param name="obj">The <see cref="T:System.Object"></see> to compare with the current <see cref="T:System.Object"></see>.</param>
+        /// <returns>
+        /// true if the specified <see cref="T:System.Object"></see> is equal to the current <see cref="T:System.Object"></see>; otherwise, false.
+        /// </returns>
+	    public override bool Equals(object obj)
+	    {
+	        if (this == obj) return true;
+	        MatchAlwaysTransactionAttributeSource matchAlwaysTransactionAttributeSource = obj as MatchAlwaysTransactionAttributeSource;
+	        if (matchAlwaysTransactionAttributeSource == null) return false;
+	        return Equals(_transactionAttribute, matchAlwaysTransactionAttributeSource._transactionAttribute);
+	    }
+
+        /// <summary>
+        /// Serves as a hash function for a particular type. <see cref="M:System.Object.GetHashCode"></see> is suitable for use in hashing algorithms and data structures like a hash table.
+        /// </summary>
+        /// <returns>
+        /// A hash code for the current <see cref="T:System.Object"></see>.
+        /// </returns>
+	    public override int GetHashCode()
+	    {
+	        return _transactionAttribute != null ? _transactionAttribute.GetHashCode() : 0;
+	    }
+
+
+	    ///<summary>
+	    ///Returns a <see cref="T:System.String"></see> that represents the current <see cref="T:System.Object"></see>.
+	    ///</summary>
+	    ///
+	    ///<returns>
+	    ///A <see cref="T:System.String"></see> that represents the current <see cref="T:System.Object"></see>.
+	    ///</returns>
+	    ///<filterpriority>2</filterpriority>
+	    public override string ToString()
+	    {
+	        return GetType().Name + ": " + _transactionAttribute;
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs
new file mode 100644
index 00000000..89870d92
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs
@@ -0,0 +1,294 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+using Common.Logging;
+using Spring.Util;
+using Spring.Core.TypeResolution;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Simple implementation of the <see cref="Spring.Transaction.Interceptor.ITransactionAttributeSource"/>
+	/// interface that allows attributes to be stored per method in a map.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: MethodMapTransactionAttributeSource.cs,v 1.15 2008/05/29 17:26:41 markpollack Exp $</version>
+	public class MethodMapTransactionAttributeSource : ITransactionAttributeSource
+	{
+		private IDictionary _methodMap;
+		private IDictionary _nameMap;
+
+	    #region Logging Definition
+
+	    private static readonly ILog LOG = LogManager.GetLogger(typeof (MethodMapTransactionAttributeSource));
+
+	    #endregion
+
+	    /// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource"/> class.
+		/// </summary>
+		public MethodMapTransactionAttributeSource()
+		{
+			_methodMap = new Hashtable();
+			_nameMap = new Hashtable();
+		}
+
+		/// <summary>
+		/// Set a name/attribute map, consisting of "FQCN.method, AssemblyName" method names
+		/// (e.g. "MyNameSpace.MyClass.MyMethod, MyAssembly") and ITransactionAttribute
+		/// instances (or Strings to be converted to <see cref="ITransactionAttribute"/> instances).
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The key values of the supplied <see cref="System.Collections.IDictionary"/>
+		/// must adhere to the following form:<br/>
+		/// <code>FQCN.methodName, Assembly</code>.
+		/// </p>
+		/// <example>
+        /// <code>MyNameSpace.MyClass.MyMethod, MyAssembly</code>
+		///	</example>
+		/// </remarks>
+		public IDictionary MethodMap
+		{
+			set
+			{
+			    foreach (DictionaryEntry entry in value)
+			    {
+
+			        string name = entry.Key as string;
+                    ITransactionAttribute attribute = null;
+                    //Check if we need to convert from a string to ITransactionAttribute
+                    if (entry.Value is ITransactionAttribute)
+                    {
+                        attribute = entry.Value as ITransactionAttribute;
+                    }
+                    else
+                    {
+                        TransactionAttributeEditor editor = new TransactionAttributeEditor();
+                        editor.SetAsText(entry.Value.ToString());
+                        attribute = editor.Value;
+                    }
+                    AddTransactionalMethod( name, attribute );                    
+			        
+			    }
+
+			} 
+		}
+		/// <summary>
+		/// Add an attribute for a transactional method.
+		/// </summary>
+		/// <remarks>
+		/// Method names can end or start with "*" for matching multiple methods.
+		/// </remarks>
+		/// <param name="name">The class and method name, separated by a dot.</param>
+		/// <param name="attribute">The attribute to be associated with the method.</param>
+		public void AddTransactionalMethod( string name, ITransactionAttribute attribute )
+		{
+            AssertUtils.ArgumentNotNull(name, "name");
+            int lastCommaIndex = name.LastIndexOf( "," );
+            if (lastCommaIndex == -1)
+            {
+                throw new ArgumentException("'" + name + "'" +
+                                            " is not a valid method name, missing AssemblyName.  Format is FQN.MethodName, AssemblyName.");                
+            }
+            string fqnWithMethod = name.Substring(0, lastCommaIndex);
+
+			int lastDotIndex = fqnWithMethod.LastIndexOf( "." );
+			if ( lastDotIndex == -1 )
+			{
+				throw new TransactionUsageException("'" + fqnWithMethod + "' is not a valid method name: format is FQN.methodName");
+			}
+			string className = fqnWithMethod.Substring(0, lastDotIndex );
+            string assemblyName = name.Substring(lastCommaIndex + 1);
+			string methodName = fqnWithMethod.Substring(lastDotIndex + 1 );
+            string fqnClassName = className + ", " + assemblyName;
+			try
+			{
+				Type type = TypeResolutionUtils.ResolveType(fqnClassName);
+				AddTransactionalMethod( type, methodName, attribute );
+			} catch ( TypeLoadException exception )
+			{
+				throw new TransactionUsageException( "Type '" + fqnClassName + "' not found.", exception );
+			} 
+		}
+
+		/// <summary>
+		/// Add an attribute for a transactional method.
+		/// </summary>
+		/// <remarks>
+		/// Method names can end or start with "*" for matching multiple methods.
+		/// </remarks>
+		/// <param name="type">The target interface or class.</param>
+		/// <param name="mappedName">The mapped method name.</param>
+		/// <param name="transactionAttribute">
+		/// The attribute to be associated with the method.
+		/// </param>
+		public void AddTransactionalMethod(
+			Type type, string mappedName, ITransactionAttribute transactionAttribute )
+		{
+            // TODO address method overloading? At present this will
+            // simply match all methods that have the given name.
+			string name = type.Name + "." + mappedName;
+			MethodInfo[] methods = type.GetMethods();
+			IList matchingMethods = new ArrayList();
+			for ( int i = 0; i < methods.Length; i++ )
+			{
+				if ( methods[i].Name.Equals( mappedName ) || IsMatch(methods[i].Name, mappedName ))
+				{
+					matchingMethods.Add( methods[i] );
+				}
+			}
+			if ( matchingMethods.Count == 0 )
+			{
+				throw new TransactionUsageException("Couldn't find method '" + mappedName + "' on Type [" + type.Name + "]");
+			}
+            // register all matching methods
+			foreach ( MethodInfo currentMethod in matchingMethods )
+			{
+				string regularMethodName = (string)_nameMap[currentMethod];
+				if ( regularMethodName == null || ( !regularMethodName.Equals(name) && regularMethodName.Length <= name.Length))
+				{
+                    // No already registered method name, or more specific
+                    // method name specification now -> (re-)register method.
+                    if (LOG.IsDebugEnabled && regularMethodName != null) 
+                    {
+                        LOG.Debug("Replacing attribute for transactional method [" + currentMethod + "]: current name '" +
+                            name + "' is more specific than '" + regularMethodName + "'");
+                    }
+					_nameMap.Add( currentMethod, name );
+					AddTransactionalMethod( currentMethod, transactionAttribute );
+				}
+                else
+				{
+                    if (LOG.IsDebugEnabled && regularMethodName != null) 
+                    {
+                        LOG.Debug("Keeping attribute for transactional method [" + currentMethod + "]: current name '" +
+                            name + "' is not more specific than '" + regularMethodName + "'");
+                    }
+				}
+			}
+		}
+
+		/// <summary>
+		/// Add an attribute for a transactional method.
+		/// </summary>
+		/// <param name="method">The transactional method.</param>
+		/// <param name="transactionAttribute">
+		/// The attribute to be associated with the method.
+		/// </param>
+		public void AddTransactionalMethod( MethodInfo method, ITransactionAttribute transactionAttribute )
+		{
+			_methodMap.Add( method, transactionAttribute );
+		}
+
+		/// <summary>
+		/// Does the supplied <paramref name="methodName"/> match the supplied <paramref name="mappedName"/>?
+		/// </summary>
+		/// <remarks>
+		/// The default implementation checks for "xxx*", "*xxx" and "*xxx*" matches,
+	    /// as well as direct equality.  This behaviour can (of course) be overridden in 
+	    /// derived classes.
+		/// </remarks>
+		/// <param name="methodName">The method name of the class.</param>
+		/// <param name="mappedName">The name in the descriptor.</param>
+		/// <returns><b>True</b> if the names match.</returns>
+		protected virtual bool IsMatch( string methodName, string mappedName )
+		{
+            return PatternMatchUtils.SimpleMatch(mappedName, methodName);
+		}
+
+		#region ITransactionAttributeSource Members
+		/// <summary>
+		/// Return the <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> for this
+		/// method.
+		/// </summary>
+		/// <param name="method">The method to check.</param>
+		/// <param name="targetType">
+		/// The target <see cref="System.Type"/>. May be null, in which case the declaring 
+		/// class of the supplied <paramref name="method"/> must be used.
+		/// </param>
+		/// <returns>
+		/// A <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> or 
+		/// null if the method is non-transactional.
+		/// </returns>
+		public ITransactionAttribute ReturnTransactionAttribute(MethodInfo method, Type targetType)
+		{
+            //Might have registered MethodInfo objects whose declaring type is the interface, so 'downcast'
+            //to the most specific method which is typically what is passed in as the first method argument.
+            foreach (DictionaryEntry dictionaryEntry in _methodMap)
+            {
+                MethodInfo currentMethod = (MethodInfo)dictionaryEntry.Key;
+                
+                MethodInfo specificMethod;
+                if (targetType == null)
+                {
+                    specificMethod = currentMethod;
+                }
+                else
+                {
+                    ComposedCriteria searchCriteria = new ComposedCriteria();
+                    searchCriteria.Add(new MethodNameMatchCriteria(currentMethod.Name));
+                    searchCriteria.Add(new MethodParametersCountCriteria(currentMethod.GetParameters().Length));
+#if NET_2_0
+                    searchCriteria.Add(new MethodGenericArgumentsCountCriteria(
+                        currentMethod.GetGenericArguments().Length));
+#endif
+                    searchCriteria.Add(new MethodParametersCriteria(ReflectionUtils.GetParameterTypes(currentMethod)));
+
+                    MemberInfo[] matchingMethods = targetType.FindMembers(
+                        MemberTypes.Method,
+                        BindingFlags.Instance | BindingFlags.Public,
+                        new MemberFilter(new CriteriaMemberFilter().FilterMemberByCriteria),
+                        searchCriteria);
+
+                    if (matchingMethods != null && matchingMethods.Length == 1)
+                    {
+                        specificMethod = matchingMethods[0] as MethodInfo;
+                    }
+                    else
+                    {
+                        specificMethod = currentMethod;
+                    }
+                }
+
+                if (method == specificMethod)
+                {
+                    return (ITransactionAttribute)dictionaryEntry.Value;
+                }
+            }
+            return (ITransactionAttribute)_methodMap[method];
+		}
+		#endregion
+
+	
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/NameMatchTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/NameMatchTransactionAttributeSource.cs
new file mode 100644
index 00000000..4c1d57cf
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/NameMatchTransactionAttributeSource.cs
@@ -0,0 +1,203 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Collections.Specialized;
+using System.Reflection;
+using Common.Logging;
+using Spring.Util;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Simple implementation of the <see cref="Spring.Transaction.Interceptor.ITransactionAttributeSource"/>
+	/// that allows attributes to be matched by registered name.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: NameMatchTransactionAttributeSource.cs,v 1.9 2008/05/29 17:26:41 markpollack Exp $</version>
+	[Serializable]
+	public class NameMatchTransactionAttributeSource : ITransactionAttributeSource
+	{
+        /// <summary>
+        /// Logger available to subclasses, static for optimal serialization
+        /// </summary>
+        [NonSerialized()]
+        protected static readonly ILog log = LogManager.GetLogger(typeof(NameMatchTransactionAttributeSource));
+
+        /// <summary>
+        /// Keys are method names; values are ITransactionAttributes
+        /// </summary>
+		private IDictionary nameMap;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource"/> class.
+		/// </summary>
+		public NameMatchTransactionAttributeSource()
+		{
+			nameMap = new Hashtable();
+		}
+
+		/// <summary>
+		/// Set a name/attribute map, consisting of method names (e.g. "MyMethod") and
+		/// <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> instances
+        /// (or Strings to be converted to ITransactionAttribute instances).
+		/// </summary>
+		public IDictionary NameMap
+		{
+			set
+			{
+			    foreach (DictionaryEntry entry in value)
+			    {
+                    string name = entry.Key as string;
+                    ITransactionAttribute attribute = null;
+                    if (entry.Value is ITransactionAttribute)
+                    {
+                        attribute = entry.Value as ITransactionAttribute;
+                    }
+                    else
+                    {
+                        TransactionAttributeEditor editor = new TransactionAttributeEditor();
+                        editor.SetAsText(entry.Value.ToString());
+                        attribute = editor.Value;
+                    }
+                    AddTransactionMethod(name, attribute);    
+			    }
+			}
+		}
+
+	    /// <summary>
+	    /// Parses the given properties into a name/attribute map.
+	    /// </summary>
+	    /// <remarks>
+	    /// Expects method names as keys and string attributes definitions as values,
+	    /// parsable into <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> 
+	    /// instances via 
+	    /// <see cref="Spring.Transaction.Interceptor.TransactionAttributeEditor"/>.
+	    /// </remarks>
+	    /// <value>The properties of the transaction.</value>
+	    public NameValueCollection NameProperties
+	    {
+	        set
+	        {
+	            SetProperties(value);
+	        }
+	    }
+
+	    /// <summary>
+		/// Does the supplied <paramref name="methodName"/> match the supplied <paramref name="mappedName"/>?
+		/// </summary>
+		/// <remarks>
+        /// The default implementation checks for "xxx*", "*xxx" and "*xxx*" matches,
+        /// as well as direct equality. Can be overridden in subclasses.
+		/// </remarks>
+		/// <param name="methodName">The method name of the class.</param>
+		/// <param name="mappedName">The name in the descriptor.</param>
+		/// <returns><b>True</b> if the names match.</returns>
+		protected virtual bool IsMatch( string methodName, string mappedName )
+		{
+            return PatternMatchUtils.SimpleMatch(mappedName, methodName);
+		} 
+
+		/// <summary>
+		/// Add an attribute for a transactional method.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Method names can end with "*" for matching multiple methods.
+		/// </p>
+		/// </remarks>
+		/// <param name="methodName">The transactional method name.</param>
+		/// <param name="attribute">
+		/// The attribute to be associated with the method.
+		/// </param>
+		public void AddTransactionMethod( string methodName, ITransactionAttribute attribute )
+        {
+            #region Instrumentation
+            if (log.IsDebugEnabled)
+            {
+                log.Debug("Adding transactional method [" + methodName + "] with attribute [" + attribute + "]");
+            }
+            #endregion
+            nameMap.Add( methodName, attribute );
+		}	
+
+		/// <summary>
+		/// Parses the given properties into a name/attribute map.
+		/// </summary>
+		/// <remarks>
+		/// Expects method names as keys and string attributes definitions as values,
+		/// parsable into <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> 
+		/// instances via 
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAttributeEditor"/>.
+		/// </remarks>
+		/// <param name="transactionAttributes">The properties of the transaction.</param>
+		public void SetProperties( NameValueCollection transactionAttributes )
+		{
+			TransactionAttributeEditor editor = new TransactionAttributeEditor();
+			foreach ( string methodName in transactionAttributes.Keys )
+			{
+				string value = transactionAttributes[methodName];
+				editor.SetAsText(value);
+				AddTransactionMethod(methodName, editor.Value);
+			}
+		}
+
+	    #region ITransactionAttributeSource Members
+		/// <summary>
+		/// Return the <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> for this
+		/// method.
+		/// </summary>
+		/// <param name="method">The method to check.</param>
+		/// <param name="targetType">
+		/// The target <see cref="System.Type"/>. May be null, in which case the declaring 
+		/// class of the supplied <paramref name="method"/> must be used.
+		/// </param>
+		/// <returns>
+		/// A <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> or 
+		/// null if the method is non-transactional.
+		/// </returns>
+		public ITransactionAttribute ReturnTransactionAttribute(MethodInfo method, Type targetType)
+		{
+			string methodName = method.Name;
+			ITransactionAttribute attribute = (ITransactionAttribute) nameMap[methodName];
+			if ( attribute != null )
+			{
+				return attribute;
+			}
+			else
+			{
+				string bestNameMatch = null;
+				foreach ( string mappedName in nameMap.Keys )
+				{
+					if ( ( IsMatch( methodName, mappedName ) ) && ( bestNameMatch == null || bestNameMatch.Length <= mappedName.Length ) )
+					{
+						attribute = (ITransactionAttribute) nameMap[mappedName];
+						bestNameMatch = mappedName;
+					}
+				}
+			}
+			return attribute;
+		}
+		#endregion
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/NoRollbackRuleAttribute.cs b/src/Spring/Spring.Data/Transaction/Interceptor/NoRollbackRuleAttribute.cs
new file mode 100644
index 00000000..6a34075b
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/NoRollbackRuleAttribute.cs
@@ -0,0 +1,49 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Tag class. Its class means it has the opposite behaviour to the
+	/// <see cref="Spring.Transaction.Interceptor.RollbackRuleAttribute"/> superclass.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: NoRollbackRuleAttribute.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	public class NoRollbackRuleAttribute : RollbackRuleAttribute
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource"/> class.
+		/// </summary>
+		public NoRollbackRuleAttribute( string exceptionType ) : base( exceptionType ){}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource"/> class.
+		/// </summary>
+		/// <param name="exceptionType">
+		/// The <see cref="System.Exception"/> class that will trigger a rollback.
+		/// </param>
+		public NoRollbackRuleAttribute( Type exceptionType ) : base( exceptionType ){}
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/RollbackRuleAttribute.cs b/src/Spring/Spring.Data/Transaction/Interceptor/RollbackRuleAttribute.cs
new file mode 100644
index 00000000..7e86714b
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/RollbackRuleAttribute.cs
@@ -0,0 +1,202 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 Spring.Aop.Framework;
+using Spring.Util;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Rule determining whether or not a given exception (and any subclasses) should
+	/// cause a rollback.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Multiple such rules can be applied to determine whether a transaction should commit
+	/// or rollback after an exception has been thrown.
+	/// </p>
+	/// </remarks>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: RollbackRuleAttribute.cs,v 1.7 2008/03/31 20:09:59 markpollack Exp $</version>
+	[Serializable]
+	public class RollbackRuleAttribute : Attribute
+	{
+		private string _exceptionName;
+
+		/// <summary>
+		/// Canonical instance representing default behavior for rolling back on
+		/// all <see cref="System.SystemException"/>s.
+		/// </summary>
+		public static RollbackRuleAttribute RollbackOnSystemExceptions
+			= new RollbackRuleAttribute(typeof (Exception).Name);
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.RollbackRuleAttribute"/> class
+		/// for the named <paramref name="exceptionName"/>.
+		/// </summary>
+		/// <param name="exceptionName">The exception name.</param>
+		/// <remarks>
+		/// <p>
+		/// As always, the <paramref name="exceptionName"/> should be the full
+		/// assembly qualified version.
+		/// </p>
+		/// </remarks>
+		public RollbackRuleAttribute( string exceptionName )
+		{
+            AssertUtils.ArgumentHasText(exceptionName, "exceptionName");
+			_exceptionName = exceptionName;
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.RollbackRuleAttribute"/> class
+		/// for the suplied <paramref name="exceptionType"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The exception class must be <see cref="System.Exception"/> or a subclass.
+		/// </p>
+		/// <p>
+		/// This is the preferred way to construct a
+		/// <see cref="Spring.Transaction.Interceptor.RollbackRuleAttribute"/>,
+		/// matching the exception class and subclasses.
+		/// </p>
+		/// </remarks>
+		/// <param name="exceptionType">
+		/// The <see cref="System.Exception"/> class that will trigger a rollback.
+		/// </param>
+		public RollbackRuleAttribute( Type exceptionType )
+		{
+		    AssertUtils.ArgumentNotNull(exceptionType, "exceptionType");            
+			if ( ! typeof(Exception).IsAssignableFrom( exceptionType ) )
+			{
+				throw new AopConfigException("Cannot construct rollback rule from " + exceptionType + "; " + "It's not an Exception");
+			}
+			_exceptionName = exceptionType.Name;
+		}
+
+		/// <summary>
+		/// Returns the name of the exception.
+		/// </summary>
+		public string ExceptionName
+		{
+			get { return _exceptionName; }
+		}
+
+		/// <summary>
+		/// Return the depth to the matching superclass execption <see cref="System.Type"/>.
+		/// </summary>
+		/// <remarks>
+		/// A return value of 0 means that the <paramref name="exceptionType"/> matches. 
+		/// </remarks>
+		/// <param name="exceptionType">
+		/// The <see cref="System.Type"/> of exception to find.
+		/// </param>
+		/// <returns>
+		/// Return -1 if there's no match. Otherwise, return depth. Lowest depth wins.
+		/// </returns>
+		public int GetDepth( Type exceptionType )
+		{
+			return getDepth( exceptionType, 0 );
+		}
+
+		/// <summary>
+		/// Return the depth to the matching superclass execption <see cref="System.Type"/>.
+		/// </summary>
+		/// <remarks>
+		/// A return value of 0 means that the <paramref name="exception"/>s 
+		/// <see cref="System.Type"/> matches. 
+		/// </remarks>
+		/// <param name="exception">
+		/// The exception object to find.
+		/// </param>
+		/// <returns>
+		/// Return -1 if there's no match. Otherwise, return depth. Lowest depth wins.
+		/// </returns>
+		public int GetDepth( object exception )
+		{
+			return GetDepth( exception.GetType() );
+		}
+
+		/// <summary>
+		/// Returns a <see cref="System.String"/> representation of this instance.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> containing the exception covered by this instance.
+		/// </returns>
+		public override string ToString()
+		{
+			return "RollbackRule with pattern '" + ExceptionName + "'";
+		}
+
+		/// <summary>
+		/// Override of <see cref="System.Object.GetHashCode"/>.
+		/// </summary>
+		/// <returns>The hashcode of the exception name covered by this instance.</returns>
+		public override int GetHashCode()
+		{
+			return ExceptionName.GetHashCode();
+		}
+
+		/// <summary>
+		/// Override of <see cref="System.Object.Equals(object)"/>.
+		/// </summary>
+		/// <param name="obj">The object to compare.</param>
+		/// <returns><b>True</b> if the input object is equal to this instance.</returns>
+		public override bool Equals(object obj)
+		{
+			RollbackRuleAttribute rollbackRuleAttribute = obj as RollbackRuleAttribute;
+			if ( rollbackRuleAttribute == null )
+			{
+				return false;
+			}
+			return Equals( rollbackRuleAttribute );
+		}
+
+		/// <summary>
+		/// Strongly typed <c>Equals()</c> implementation.
+		/// </summary>
+		/// <param name="rollbackRuleAttribute">
+		/// The <see cref="Spring.Transaction.Interceptor.RollbackRuleAttribute"/> to compare.
+		/// </param>
+		/// <returns>
+		/// <b>True</b> if the input object is equal to the supplied <paramref name="rollbackRuleAttribute"/>.
+		/// </returns>
+		public bool Equals( RollbackRuleAttribute rollbackRuleAttribute )
+		{
+			return ExceptionName.Equals(rollbackRuleAttribute.ExceptionName);
+		}
+
+		private int getDepth( Type exceptionType, int depth )
+		{
+			if ( ( exceptionType.Name.IndexOf( ExceptionName ) != -1 ) || ( exceptionType.FullName.IndexOf( ExceptionName ) != -1 ) )
+			{
+				return depth;
+			}			
+			if ( exceptionType == typeof(Exception))
+			{
+				return -1;
+			}
+			return getDepth( exceptionType.BaseType, depth + 1 );
+		}
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/RuleBasedTransactionAttribute.cs b/src/Spring/Spring.Data/Transaction/Interceptor/RuleBasedTransactionAttribute.cs
new file mode 100644
index 00000000..9d362869
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/RuleBasedTransactionAttribute.cs
@@ -0,0 +1,159 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Text;
+
+using Spring.Collections;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> implementation
+	/// that works out whether a given exception should cause transaction rollback by applying
+	/// a number of rollback rules, both positive and negative.
+	/// </summary>
+	/// <remarks>
+	/// If no rules are relevant to the exception, it behaves like the 
+	/// <see cref="Spring.Transaction.Interceptor.DefaultTransactionAttribute"/> class
+	/// (rolling back on runtime exceptions)..
+	/// <p>
+	/// The <see cref="Spring.Transaction.Interceptor.TransactionAttributeEditor"/> 
+	/// creates objects of this class.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: RuleBasedTransactionAttribute.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	public class RuleBasedTransactionAttribute : DefaultTransactionAttribute
+	{
+		private IList _rollbackRules;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.RuleBasedTransactionAttribute"/>
+		/// class.
+		/// </summary>
+		/// <param name="transactionPropagation">
+		/// The desired transaction propagation behaviour.
+		/// </param>
+		/// <param name="ruleList">
+		/// The rollback rules list for this transaction attribute.
+		/// </param>
+		public RuleBasedTransactionAttribute(
+			TransactionPropagation transactionPropagation, IList ruleList )
+			: base(transactionPropagation)
+		{
+			_rollbackRules = ruleList;
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.RuleBasedTransactionAttribute"/>
+		/// class.
+		/// </summary>
+		public RuleBasedTransactionAttribute( )
+		{
+			_rollbackRules = new ArrayList();
+		}
+
+		/// <summary>
+		/// Sets the rollback rules list for this transaction attribute.
+		/// </summary>
+		public IList RollbackRules
+		{
+			set { _rollbackRules = value; }
+		}
+
+		/// <summary>
+		/// Will a transaction be rolled back if the supplied <parameref name="exception"/>
+		/// is thrown during the lifecycle of a transaction to which this attribute is applied?
+		/// </summary>
+		/// <param name="exception">The offending <see cref="System.Exception"/>.</param>
+		/// <returns>True if the exception should cause a rollback, false otherwise.</returns>
+		public override bool RollbackOn(Exception exception)
+		{
+			RollbackRuleAttribute finalAttribute = null;
+			int deepest = Int32.MaxValue;
+
+			if ( _rollbackRules != null )
+			{
+				foreach ( RollbackRuleAttribute rule in _rollbackRules )
+				{
+					int depth = rule.GetDepth( exception );
+					if ( ( depth >= 0 ) && ( depth < deepest ) )
+					{
+						deepest = depth;
+						finalAttribute = rule;
+					}
+				}
+			}
+			if ( null == finalAttribute )
+			{
+				return base.RollbackOn( exception );
+			}
+			return !( finalAttribute is NoRollbackRuleAttribute );
+		}
+
+		/// <summary>
+		/// Returns a <see cref="System.String"/> representation of this instance.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> representation of this instance.
+		/// </returns>
+		public override string ToString()
+		{
+			StringBuilder result = new StringBuilder();
+			result.Append(DefinitionDescription);
+			SortedSet rules = new SortedSet();
+			foreach ( RollbackRuleAttribute rule in _rollbackRules )
+			{
+				string sign = ( rule is NoRollbackRuleAttribute ) ? COMMIT_RULE_PREFIX : ROLLBACK_RULE_PREFIX;
+				rules.Add( sign + rule.ExceptionName );
+			}
+			foreach ( string rule in rules )
+			{
+				result.Append(',');
+				result.Append(rule);
+			}
+			return result.ToString( );
+		}
+		/// <summary>
+		/// Adds a <see cref="Spring.Transaction.Interceptor.RollbackRuleAttribute"/> to this
+		/// attributes list of rollback rules.
+		/// </summary>
+		/// <param name="rule">
+		/// The <see cref="Spring.Transaction.Interceptor.RollbackRuleAttribute"/> to add.
+		/// </param>
+		public void AddRollbackRule( RollbackRuleAttribute rule )
+		{
+			_rollbackRules.Add( rule );
+		}
+
+		/// <summary>
+		/// Clears the rollback rules for this attribute.
+		/// </summary>
+		public void ClearRollbackRules()
+		{
+			_rollbackRules.Clear();
+		}
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAspectSupport.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAspectSupport.cs
new file mode 100644
index 00000000..661c6759
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAspectSupport.cs
@@ -0,0 +1,496 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections.Specialized;
+using System.Reflection;
+using Common.Logging;
+using Spring.Objects.Factory;
+using Spring.Threading;
+using Spring.Util;
+using IsolationLevel=System.Data.IsolationLevel;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Superclass for transaction aspects, such as the AOP Alliance-compatible
+	/// <see cref="Spring.Transaction.Interceptor.TransactionInterceptor"/>.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	///  This enables the underlying Spring transaction infrastructure to be used
+	///  to easily implement an aspect for any aspect system.
+	/// </p>
+	/// <p>
+	/// Subclasses are responsible for calling methods in this class in the correct order.
+	/// </p>
+	/// <p>
+	/// Uses the Strategy design pattern. A <see cref="Spring.Transaction.IPlatformTransactionManager"/>
+	/// implementation will perform the actual transaction management
+	/// </p>
+	/// <p>
+	/// A transaction aspect is serializable if its
+	/// <see cref="Spring.Transaction.IPlatformTransactionManager"/> and
+	/// <see cref="Spring.Transaction.Interceptor.ITransactionAttributeSource"/> are serializable.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TransactionAspectSupport.cs,v 1.15 2008/05/27 19:06:57 markpollack Exp $</version>
+	[Serializable]
+	public class TransactionAspectSupport : IInitializingObject
+	{
+        //TODO work on serialization support.
+
+		#region TransactionInfo Class
+		/// <summary>
+		/// Opaque object used to hold transaction information.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Subclasses must pass it back to method on this class, but not see its internals.
+		/// </p>
+		/// </remarks>
+		internal protected class TransactionInfo
+		{
+
+			private ITransactionAttribute _transactionAttribute;
+		    private string _joinpointIdentification;
+            private ITransactionStatus _transactionStatus;
+			private TransactionInfo _oldTransactionInfo;
+
+            /// <summary>
+            /// Creates a new instance of the
+            /// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+            /// class for the supplied <paramref name="transactionAttribute"/>.
+            /// </summary>
+            /// <param name="transactionAttribute">The transaction attributes to associate with any transaction.</param>
+            /// <param name="joinpointIdentification">The info for diagnostic display of joinpoint</param>
+			public TransactionInfo( ITransactionAttribute transactionAttribute, string joinpointIdentification)
+			{
+				_transactionAttribute = transactionAttribute;
+                _joinpointIdentification = joinpointIdentification;
+			}
+
+			/// <summary>
+			/// Does this instance currently have a transaction?
+			/// </summary>
+			/// <value><b>True</b> if this instance has a transaction.</value>
+			public bool HasTransaction
+			{
+				get { return _transactionStatus != null; }
+			}
+
+			/// <summary>
+			/// Gets and sets the <see cref="Spring.Transaction.ITransactionStatus"/> for this object.
+			/// </summary>
+			public ITransactionStatus TransactionStatus
+			{
+				set { _transactionStatus = value; }
+				get { return _transactionStatus; }
+			}
+
+			/// <summary>
+			/// Binds this
+			/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+			/// instance to the thread local storage variable for the current thread and
+			/// backs up the existing
+			/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+			/// object for the current thread.
+			/// </summary>
+			public void BindToThread()
+			{
+                // Expose current TransactionStatus, preserving any existing TransactionStatus
+                // for restoration after this transaction is complete.
+                TransactionInfo currentTransactionInfo = LogicalThreadContext.GetData(CURRENT_TRANSACTIONINFO_SLOTNAME) as TransactionInfo;
+                _oldTransactionInfo = currentTransactionInfo;
+                LogicalThreadContext.SetData(CURRENT_TRANSACTIONINFO_SLOTNAME, this);
+			}
+
+			/// <summary>
+			/// Restores the previous
+			/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+			/// object to the current thread.
+			/// </summary>
+			public void RestoreThreadLocalStatus()
+			{
+                // Use stack to restore old transaction TransactionInfo.
+                // Will be null if none was set.
+                LogicalThreadContext.SetData(CURRENT_TRANSACTIONINFO_SLOTNAME, _oldTransactionInfo);
+			}
+
+			/// <summary>
+			/// Gets the current
+			/// <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> for this
+			/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+			/// object.
+			/// </summary>
+			public ITransactionAttribute TransactionAttribute
+			{
+				get { return _transactionAttribute; }
+			}
+
+            /// <summary>
+            /// Gets the joinpoint identification.
+            /// </summary>
+            /// <value>The joinpoint identification.</value>
+		    public string JoinpointIdentification
+		    {
+		        get { return _joinpointIdentification; }
+		    }
+		}
+		#endregion
+
+	    #region Logging Definition
+
+        [NonSerialized]
+	    protected ILog log = LogManager.GetLogger(typeof (TransactionAspectSupport));
+
+	    #endregion
+
+
+        /// <summary>
+        /// The name in thread local storage where the TransactionInfo object is located
+        /// </summary>
+        public const string CURRENT_TRANSACTIONINFO_SLOTNAME = "TransactionAspectSupport.CurrentTransactionInfoSlotName";
+
+		/// <summary>
+		/// The <see cref="Spring.Transaction.IPlatformTransactionManager"/> currently referenced by
+		/// this aspect
+		/// </summary>
+		private IPlatformTransactionManager _transactionManager;
+
+		/// <summary>
+		/// The <see cref="Spring.Transaction.Interceptor.ITransactionAttributeSource"/> currently
+		/// referenced by this aspect.
+		/// </summary>
+		private ITransactionAttributeSource _transactionAttributeSource;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport"/> class.
+		/// </summary>
+		public TransactionAspectSupport() {}
+
+		/// <summary>
+		/// Gets and sets the <see cref="Spring.Transaction.IPlatformTransactionManager"/> for
+		/// this aspect.
+		/// </summary>
+		public IPlatformTransactionManager TransactionManager
+		{
+			get { return _transactionManager; }
+			set { _transactionManager = value; }
+		}
+
+		/// <summary>
+		/// Gets and sets the
+		/// <see cref="Spring.Transaction.Interceptor.ITransactionAttributeSource"/> for
+		/// this aspect.
+		/// </summary>
+		public ITransactionAttributeSource TransactionAttributeSource
+		{
+			get { return _transactionAttributeSource; }
+			set { _transactionAttributeSource = value; }
+		}
+
+		/// <summary>
+		/// Returns the <see cref="Spring.Transaction.ITransactionStatus"/>
+		/// of the current method invocation.
+		/// </summary>
+		/// <remarks>
+		/// Mainly intended for code that wants to set the current transaction
+		/// rollback-only but not throw an application exception.
+		/// </remarks>
+		/// <exception cref="Spring.Transaction.NoTransactionException">
+		/// If the transaction info cannot be found, because the method was invoked
+		/// outside of an AOP invocation context.
+		/// </exception>
+		public static ITransactionStatus CurrentTransactionStatus
+		{
+			get { return CurrentTransactionInfo.TransactionStatus; }
+		}
+
+		/// <summary>
+		/// Subclasses can use this to return the current
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>.
+		/// </summary>
+		/// <remarks>
+		/// Only subclasses that cannot handle all operations in one method
+		/// need to use this mechanism to get at the current
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>. 
+		/// An around advice such as an AOP Alliance
+		/// <see cref="AopAlliance.Intercept.IMethodInterceptor"/> can hold a reference to the 
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+		/// throughout the aspect method.
+		/// A <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+		/// will be returned even if no transaction was created. The
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo.HasTransaction"/>
+		/// property can be used to query this.
+		/// </remarks>
+		/// <exception cref="Spring.Transaction.NoTransactionException">
+		/// If no transaction has been created by an aspect.
+		/// </exception>
+		protected static TransactionInfo CurrentTransactionInfo
+		{
+			get
+			{
+			    TransactionInfo currentTransactionInfo =
+			        LogicalThreadContext.GetData(CURRENT_TRANSACTIONINFO_SLOTNAME) as TransactionInfo;
+                if (currentTransactionInfo == null)
+				{
+					throw new NoTransactionException("No transaction aspect-managed ITransactionStatus in scope");
+				}
+                return currentTransactionInfo;
+			}
+		}
+		/// <summary>
+		/// Set properties with method names as keys and transaction attribute
+		/// descriptors (parsed via <see cref="Spring.Transaction.Interceptor.TransactionAttributeEditor"/>) as values:
+		/// e.g. key = "MyMethod", value = "PROPAGATION_REQUIRED,readOnly".
+		/// </summary>
+		/// <remarks>
+		/// <note>
+		/// Method names are always applied to the target class, no matter if defined in an
+		/// interface or the class itself.
+		/// </note>
+		/// <p>
+		/// Internally, a
+		/// <see cref="Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource"/>
+		/// will be created from the given properties.
+		/// </p>	
+		/// </remarks>
+		public NameValueCollection TransactionAttributes
+		{
+			set
+			{
+				NameMatchTransactionAttributeSource attributeSource = new NameMatchTransactionAttributeSource();
+			    attributeSource.NameProperties = value;
+				_transactionAttributeSource = attributeSource;
+			}
+		}
+
+		/// <summary>
+		/// Checks that the required properties are set.
+		/// </summary>
+		public void AfterPropertiesSet()
+		{
+			if ( null == _transactionManager)
+			{
+				throw new ArgumentException("IPlatformTransactionManager is required");
+			}
+			if ( null == _transactionAttributeSource )
+			{
+				throw new ArgumentException("Either 'TransactionAttributeSource' or 'TransactionAttribute' property is required: " +
+					"If there are no transactional methods, don't use a TransactionInterceptor " + 
+					"or TransactionProxyFactoryObject." );
+			}
+		}
+
+		/// <summary>
+		/// Create a transaction if necessary
+		/// </summary>
+		/// <param name="method">Method about to execute</param>
+		/// <param name="targetType">Type that the method is on</param>
+		/// <returns>
+		/// A <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/> object,
+		/// whether or not a transaction was created.
+		/// <p>
+		/// The
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo.HasTransaction"/>
+		/// property on the
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+		/// class can be used to tell if there was a transaction created.
+		/// </p>
+		/// </returns>
+		protected TransactionInfo CreateTransactionIfNecessary( MethodInfo method, Type targetType )
+		{
+            // If the transaction attribute is null, the method is non-transactional.
+			ITransactionAttribute sourceAttr = _transactionAttributeSource.ReturnTransactionAttribute( method, targetType );
+
+		    return CreateTransactionIfNecessary(sourceAttr, MethodIdentification(method));
+		}
+
+        /// <summary>
+        /// Creates the transaction if necessary.
+        /// </summary>
+        /// <param name="sourceAttr">The source transaction attribute.</param>
+        /// <param name="joinpointIdentification">The joinpoint identification.</param>
+        /// <returns>Transaction Info for declarative transaction management.</returns>
+	    protected TransactionInfo CreateTransactionIfNecessary(ITransactionAttribute sourceAttr, string joinpointIdentification)
+	    {
+	        ITransactionAttribute txAttr = sourceAttr;
+
+	        if (txAttr != null && txAttr.Name == null)
+	        {
+	            txAttr = new DelegatingTransactionAttributeWithName(txAttr, joinpointIdentification);
+	        }
+
+            TransactionInfo transactionInfo = new TransactionInfo(txAttr, joinpointIdentification);            
+	        if ( txAttr != null )
+	        {
+	            // We need a transaction for this method
+	            #region Instrumentation
+
+	            if (log.IsDebugEnabled)
+	            {
+	                log.Debug("Getting transaction for " + transactionInfo.JoinpointIdentification);
+	            }
+
+	            #endregion
+	            // The transaction manager will flag an error if an incompatible tx already exists
+	            transactionInfo.TransactionStatus = _transactionManager.GetTransaction(txAttr);
+	        } 
+	        else
+	        {
+	            // The TransactionInfo.HasTransaction property will return
+	            // false. We created it only to preserve the integrity of
+	            // the ThreadLocal stack maintained in this class.
+	            if (log.IsDebugEnabled)
+	            {
+                    log.Debug("Don't need to create transaction for [" + joinpointIdentification +
+	                          "]: this method isn't transactional");
+	            }
+	        }
+
+	        // We always bind the TransactionInfo to the thread, even if we didn't create
+	        // a new transaction here. This guarantees that the TransactionInfo stack
+	        // will be managed correctly even if no transaction was created by this aspect.
+	        transactionInfo.BindToThread( );
+	        return transactionInfo;
+	    }
+
+        /// <summary>
+        /// Identifies the method by providing the qualfied method name.
+        /// </summary>
+        /// <param name="methodInfo">The method info.</param>
+        /// <returns>qualified mehtod name.</returns>
+        protected string MethodIdentification(MethodInfo methodInfo)
+        {
+            return ObjectUtils.GetQualifiedMethodName(methodInfo);
+        }
+
+	    /// <summary>
+		/// Execute after the successful completion of call, but not after an exception was handled.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Do nothing if we didn't create a transaction.
+		/// </p>
+		/// </remarks>
+		/// <param name="transactionInfo">
+		/// The
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+		/// about the current transaction.
+		/// </param>
+		protected void CommitTransactionAfterReturning( TransactionInfo transactionInfo )
+		{
+			if ( transactionInfo != null && transactionInfo.HasTransaction )
+			{
+                #region Instrumentation
+
+			    if (log.IsDebugEnabled) 
+			    {
+			        log.Debug("Invoking commit for transaction on " + transactionInfo.JoinpointIdentification);
+			    }
+
+			    #endregion
+
+			    _transactionManager.Commit( transactionInfo.TransactionStatus );
+			}
+		}
+
+		/// <summary>
+		/// Handle a exception, closing out the transaction.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// We may commit or roll back, depending on our configuration.
+		/// </p>
+		/// </remarks>
+		/// <param name="transactionInfo">
+		/// The
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+		/// about the current transaction.
+		/// </param>
+		/// <param name="exception">The <see cref="System.Exception"/> encountered.</param>
+		protected void CompleteTransactionAfterThrowing(
+			TransactionInfo transactionInfo, Exception exception )
+		{
+			if ( transactionInfo != null &&  transactionInfo.HasTransaction )
+			{
+                if (log.IsDebugEnabled)
+                {                    
+                    log.Debug("Completing transaction for [" + transactionInfo.JoinpointIdentification + "] after exception: " + exception);
+                }
+
+				if ( transactionInfo.TransactionAttribute.RollbackOn( exception ))
+				{
+				    try
+					{
+						_transactionManager.Rollback( transactionInfo.TransactionStatus );
+					}
+					catch (Exception e)
+					{
+					    log.Error("Application exception overridden by rollback exception", e);
+						throw;
+					}
+				} 
+				else
+				{
+                    // We don't roll back on this exception.
+				    // Will still roll back if TransactionStatus.RollbackOnly is true.
+                    try
+                    {
+                        _transactionManager.Commit(transactionInfo.TransactionStatus);
+                    } catch (Exception e)
+                    {
+                        log.Error("Application exception overriden by commit exception", e);
+                        throw;
+                    }
+
+				}
+			} 
+		}
+		/// <summary>
+		/// Resets the 
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+		/// for this thread.
+		/// </summary>
+		/// <remarks>
+		/// <note>
+		/// Call this in all cases: exceptions or normal return.
+		/// </note>
+		/// </remarks>
+		/// <param name="transactionInfo">
+		/// The 
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.TransactionInfo"/>
+		/// about the current transaction. May be null.
+		/// </param>
+		protected void CleanupTransactionInfo( TransactionInfo transactionInfo )
+		{
+			if ( transactionInfo != null )
+			{
+				transactionInfo.RestoreThreadLocalStatus( );
+			}
+		}
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttribute.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttribute.cs
new file mode 100644
index 00000000..0a461ce5
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttribute.cs
@@ -0,0 +1,203 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using Spring.Transaction.Support;
+
+
+#endregion
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// .NET Attribute for describing transactional behavior of methods in a class. 
+	/// </summary>
+	/// <remarks>This attribute type is generally directly comparable
+	/// to Spring's <see cref="RuleBasedTransactionAttribute"/> class and
+	/// in fact <see cref="AttributesTransactionAttributeSource"/> will
+    /// directly convert the data to a <see cref="RuleBasedTransactionAttribute"/>
+    /// so that Spring's transaction support code does not have to know about
+    /// attributes. If no rules are relevant to the exception it will be treaded
+    /// like DefaultTransactionAttribute, (rolling back on all exceptions).
+	/// <para>
+    /// The default property values are TransactionPropagation.Required, IsolationLevel.ReadCommitted,
+    /// DefaultTransactionDefinition.TIMEOUT_DEFAULT (can be changed, by default is the default
+    /// value of the underlying transaction subsystem)
+    /// ReadOnly = false, and Type.EmtptyTypes specified for Rollbackfor and NoRollbackFor exception
+    /// types.
+    /// </para>
+    /// </remarks>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TransactionAttribute.cs,v 1.8 2007/12/07 07:30:48 markpollack Exp $</version>
+	[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, 
+         Inherited = true)]
+    [Serializable]
+	public class TransactionAttribute : Attribute
+	{
+		#region Fields
+        private TransactionPropagation _transactionPropagation = TransactionPropagation.Required;
+        private IsolationLevel _isolationLevel = IsolationLevel.ReadCommitted;
+        private int _timeout = DefaultTransactionDefinition.TIMEOUT_DEFAULT;
+        private bool _readOnly = false;
+        private Type[] _rollbackTypes = Type.EmptyTypes;
+        private Type[] _noRollbackTypes = Type.EmptyTypes;
+#if NET_2_0
+	    private System.Transactions.EnterpriseServicesInteropOption _esInteropOption =
+            System.Transactions.EnterpriseServicesInteropOption.Automatic;
+#endif	
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TransactionAttribute"/> class.
+        /// </summary>
+		public TransactionAttribute()
+		{
+
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TransactionAttribute"/> class.
+        /// </summary>
+        /// <param name="transactionPropagation">The transaction propagation.</param>
+        public TransactionAttribute(TransactionPropagation transactionPropagation) : this()
+        {
+            _transactionPropagation = transactionPropagation;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TransactionAttribute"/> class.
+        /// </summary>
+        /// <param name="transactionPropagation">The transaction propagation.</param>
+        /// <param name="isolationLevel">The isolation level.</param>
+        public TransactionAttribute(TransactionPropagation transactionPropagation,
+                                    IsolationLevel isolationLevel) : this(transactionPropagation)
+        {
+            _isolationLevel = isolationLevel;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TransactionAttribute"/> class.
+        /// </summary>
+        /// <param name="isolationLevel">The isolation level.</param>
+        public TransactionAttribute(IsolationLevel isolationLevel)
+        {
+            _isolationLevel = isolationLevel;
+        }
+
+		#endregion
+
+		#region Properties
+
+        /// <summary>
+        /// Gets the transaction propagation.
+        /// </summary>
+        /// <remarks>Defaults to TransactionPropagation.Required</remarks>
+        /// <value>The transaction propagation.</value>
+	    public TransactionPropagation TransactionPropagation
+	    {
+	        get { return _transactionPropagation; }
+	    }
+
+        /// <summary>
+        /// Gets the isolation level.
+        /// </summary>
+        /// <remarks>Defaults to IsolationLevel.Unspecified</remarks>
+        /// <value>The isolation level.</value>
+	    public IsolationLevel IsolationLevel
+	    {
+	        get { return _isolationLevel; }
+	    }
+
+        /// <summary>
+        /// Gets or sets the timeout.
+        /// </summary>
+        /// <remarks>Defaults to the default timeout of the underlying transaction system.</remarks>
+        /// <value>The timeout.</value>
+	    public int Timeout
+	    {
+	        get { return _timeout; }
+	        set { _timeout = value; }
+	    }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the transaction is readonly.
+        /// </summary>
+        /// <remarks>Defaults to false</remarks>
+        /// <value><c>true</c> if read-only; otherwise, <c>false</c>.</value>
+	    public bool ReadOnly
+	    {
+	        get { return _readOnly; }
+	        set { _readOnly = value; }
+	    }
+
+        /// <summary>
+        /// Gets or sets the zero or more exception types which
+        /// indicating which exception types must cause a transaction
+        /// rollback.
+        /// </summary>
+        /// <remarks>This is the preferred way to construct a rollback rule,
+        /// matching the exception class and subclasses.</remarks>
+        /// <value>The rollback types.</value>
+	    public Type[] RollbackFor
+	    {
+	        get { return _rollbackTypes; }
+	        set { _rollbackTypes = value; }
+	    }
+
+        /// <summary>
+        /// Gets or sets zero or more exceptions types which
+        /// indicationg which exception type must <c>not</c>
+        /// cause a transaction rollback.
+        /// </summary>
+        /// <remarks>This is the preferred way to construct a rollback rule,
+        /// matching the exception type.</remarks>
+        /// <value>The no rollback for.</value>
+	    public Type[] NoRollbackFor
+	    {
+	        get { return _noRollbackTypes; }
+	        set { _noRollbackTypes = value; }
+	    }
+
+       
+#if NET_2_0
+        /// <summary>
+        /// Gets or sets the enterprise services interop option.
+        /// </summary>
+        /// <value>The enterprise services interop option.</value>
+	    public System.Transactions.EnterpriseServicesInteropOption EnterpriseServicesInteropOption
+	    {
+	        get { return _esInteropOption;}
+            set { _esInteropOption = value; }
+	    }
+#endif
+
+	    #endregion
+
+		#region Methods
+
+		#endregion
+
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeConverter.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeConverter.cs
new file mode 100644
index 00000000..8a91e2ed
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeConverter.cs
@@ -0,0 +1,90 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.ComponentModel;
+using System.Globalization;
+
+namespace Spring.Transaction.Interceptor
+{
+    /// <summary>
+    /// Type converter for <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> 
+    /// objects.
+    /// </summary>
+    /// <remarks>
+    /// Takes <see cref="System.String"/>s of the form
+    /// <p><code>PROPAGATION_NAME,ISOLATION_NAME,readOnly,timeout_NNNN,+Exception1,-Exception2</code></p>
+    /// <p>where only propagation code is required. For example:</p>
+    /// <p><code>PROPAGATION_MANDATORY,ISOLATION_DEFAULT</code></p>
+    /// <p>
+    /// The tokens can be in <strong>any</strong> order. Propagation and isolation codes
+    /// must use the names of the values in the <see cref="Spring.Transaction.TransactionPropagation"/>
+    /// enumeration. Timeout values are in seconds. If no timeout is specified, the transaction
+    /// manager will apply a default timeout specific to the particular transaction manager.
+    /// </p>
+    /// <p>
+    /// A "+" before an exception name substring indicates that transactions should commit even
+    /// if this exception is thrown; a "-" that they should roll back.
+    /// </p>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: TransactionAttributeConverter.cs,v 1.1 2007/12/29 00:28:53 markpollack Exp $</version>
+    public class TransactionAttributeConverter : TypeConverter
+    {
+        /// <summary>
+        /// Returns whether this converter can convert an object of the given type to an ITransactionAttribute, using the specified context.
+        /// </summary>
+        /// <param name="context">An <see cref="T:System.ComponentModel.ITypeDescriptorContext"></see> that provides a format context.</param>
+        /// <param name="sourceType">A <see cref="T:System.Type"></see> that represents the type you want to convert from.</param>
+        /// <returns>
+        /// true if this converter can perform the conversion; otherwise, false.
+        /// </returns>
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof (string))
+            {
+                return true;
+            }
+            return base.CanConvertFrom(context, sourceType);
+        }
+
+        /// <summary>
+        /// Converts from string to ITransactionAttribute
+        /// </summary>
+        /// <param name="context">The context.</param>
+        /// <param name="culture">The culture.</param>
+        /// <param name="val">The string value to convert</param>
+        /// <returns>An ITransactionAttribute instance</returns>
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object val)
+        {
+            if (val is string)
+            {
+                string value = val as string;
+                TransactionAttributeEditor editor = new TransactionAttributeEditor();
+                editor.SetAsText(value);
+                return editor.Value;
+            }
+            return base.ConvertFrom(context, culture, val);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeEditor.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeEditor.cs
new file mode 100644
index 00000000..c64647cb
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeEditor.cs
@@ -0,0 +1,154 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Data;
+using Spring.Util;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Type converter for <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/> 
+	/// objects.
+	/// </summary>
+	/// <remarks>
+	/// Takes <see cref="System.String"/>s of the form
+	/// <p><code>PROPAGATION_NAME,ISOLATION_NAME,readOnly,timeout_NNNN,+Exception1,-Exception2</code></p>
+	/// <p>where only propagation code is required. For example:</p>
+	/// <p><code>PROPAGATION_MANDATORY,ISOLATION_DEFAULT</code></p>
+	/// <p>
+	/// The tokens can be in <strong>any</strong> order. Propagation and isolation codes
+	/// must use the names of the values in the <see cref="Spring.Transaction.TransactionPropagation"/>
+	/// enumeration. Timeout values are in seconds. If no timeout is specified, the transaction
+	/// manager will apply a default timeout specific to the particular transaction manager.
+	/// </p>
+	/// <p>
+	/// A "+" before an exception name substring indicates that transactions should commit even
+	/// if this exception is thrown; a "-" that they should roll back.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: TransactionAttributeEditor.cs,v 1.7 2007/12/07 07:30:48 markpollack Exp $</version>
+	public class TransactionAttributeEditor
+	{
+		private RuleBasedTransactionAttribute _attribute;
+
+		/// <summary>
+		/// Parses the input properties string into a valid <see cref="Spring.Transaction.Interceptor.ITransactionAttribute"/>
+		/// instance
+		/// </summary>
+		/// <param name="transactionProperties">
+		/// The string defining the transactional properties.
+		/// </param>
+		public void SetAsText( string transactionProperties )
+		{
+			if (!StringUtils.HasText(transactionProperties))
+			{
+				_attribute = null;
+			}
+			else
+			{
+				string[] tokens = StringUtils.CommaDelimitedListToStringArray( transactionProperties );
+				RuleBasedTransactionAttribute attribute = new RuleBasedTransactionAttribute();
+				for ( int i = 0; i < tokens.Length; i++ )
+				{
+					string token = tokens[i].Trim();
+					if ( token.StartsWith(DefaultTransactionAttribute.PROPAGATION_CONSTANT_PREFIX))
+					{
+						attribute.PropagationBehavior = convertPropagationValue( token );
+					} else if ( token.StartsWith(DefaultTransactionAttribute.ISOLATION_CONSTANT_PREFIX ) )
+					{
+						attribute.TransactionIsolationLevel = convertIsolationValue( token );
+					} else if ( token.StartsWith(DefaultTransactionAttribute.TIMEOUT_PREFIX ) )
+					{
+						string value = token.Substring(DefaultTransactionAttribute.TIMEOUT_PREFIX.Length);
+						attribute.TransactionTimeout = Convert.ToInt32( value );
+					} else if ( token.StartsWith( DefaultTransactionAttribute.READ_ONLY_MARKER ) )
+					{
+						attribute.ReadOnly = true;
+					} else if ( token.StartsWith( DefaultTransactionAttribute.COMMIT_RULE_PREFIX ) )
+					{
+						attribute.AddRollbackRule( new NoRollbackRuleAttribute(token.Substring( 1 ) ) );
+					} else if ( token.StartsWith( DefaultTransactionAttribute.ROLLBACK_RULE_PREFIX ) )
+					{
+						attribute.AddRollbackRule( new RollbackRuleAttribute( token.Substring( 1 ) ) );
+					} else
+					{
+						throw new ArgumentException("Illegal transaction attribute token: [" + token + "]");
+					}		
+				}
+				_attribute = attribute;
+			}
+		}
+
+		/// <summary>
+		/// Gets the <see cref="Spring.Transaction.Interceptor.RuleBasedTransactionAttribute"/>
+		/// from this editor.
+		/// </summary>
+		public ITransactionAttribute Value
+		{
+			get { return _attribute; }
+		}
+
+		private TransactionPropagation convertPropagationValue( string transactionPropagation )
+		{
+			switch ( transactionPropagation.ToUpper() )
+			{
+				case "PROPAGATION_REQUIRED":
+					return TransactionPropagation.Required;
+				case "PROPAGATION_SUPPORTS":
+					return TransactionPropagation.Supports;
+				case "PROPAGATION_MANDATORY":
+					return TransactionPropagation.Mandatory;
+				case "PROPAGATION_REQUIRES_NEW":
+					return TransactionPropagation.RequiresNew;
+				case "PROPAGATION_NOT_SUPPORTED":
+					return TransactionPropagation.NotSupported;
+				case "PROPAGATION_NEVER":
+					return TransactionPropagation.Never;
+				case "PROPAGATION_NESTED":
+					return TransactionPropagation.Nested;
+				default:
+					throw new ArgumentException("Illegal transaction propagation token: [" + transactionPropagation + "]");
+			}
+		}
+
+		private IsolationLevel convertIsolationValue( string isolationLevel )
+		{
+			switch ( isolationLevel.ToUpper() )
+			{
+				case "ISOLATION_DEFAULT":
+                    return IsolationLevel.ReadCommitted;
+				case "ISOLATION_READUNCOMMITTED":
+					return IsolationLevel.ReadUncommitted;
+				case "ISOLATION_READCOMMITTED":
+					return IsolationLevel.ReadCommitted;
+				case "ISOLATION_REPEATABLEREAD":
+					return IsolationLevel.RepeatableRead;
+				case "ISOLATION_SERIALIZABLE":
+					return IsolationLevel.Serializable;
+				default:
+                    return IsolationLevel.ReadCommitted;
+			}
+		}
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceAdvisor.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceAdvisor.cs
new file mode 100644
index 00000000..b1403cf8
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceAdvisor.cs
@@ -0,0 +1,131 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+using Spring.Aop.Framework;
+using Spring.Aop.Support;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Advisor driven by a <see cref="Spring.Transaction.Interceptor.ITransactionAttributeSource"/>, used to exclude
+	/// a <see cref="Spring.Transaction.Interceptor.TransactionInterceptor"/> from methods that
+	/// are non-transactional.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Because the AOP framework caches advice calculations, this is normally
+	/// faster than just letting the <see cref="Spring.Transaction.Interceptor.TransactionInterceptor"/> 
+	/// run and find out itself that it has no work to do.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: TransactionAttributeSourceAdvisor.cs,v 1.11 2007/12/07 08:10:03 markpollack Exp $</version>
+	[Serializable]
+	public class TransactionAttributeSourceAdvisor : StaticMethodMatcherPointcutAdvisor
+	{
+	    #region Fields
+
+	    private ITransactionAttributeSource _transactionAttributeSource;
+
+	    #endregion
+
+	    #region Constructor(s)
+
+	    /// <summary>
+	    /// Initializes a new instance of the <see cref="TransactionAttributeSourceAdvisor"/> class.
+	    /// </summary>
+	    /// <remarks>
+	    /// 	<p>
+	    /// This is an abstract class, and as such has no publicly
+	    /// visible constructors.
+	    /// </p>
+	    /// </remarks>
+	    public TransactionAttributeSourceAdvisor()
+	    {
+	    }
+
+	    /// <summary>
+	    /// Creates a new instance of the
+	    /// <see cref="Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor"/> class.
+	    /// </summary>
+	    /// <param name="transactionInterceptor">
+	    /// The pre-configured transaction interceptor.
+	    /// </param>
+	    public TransactionAttributeSourceAdvisor( TransactionInterceptor transactionInterceptor )
+	        : base( transactionInterceptor )
+	    {
+	        SetTxAttributeSource(transactionInterceptor);
+	    }
+
+	    #endregion
+
+	    #region Properties
+
+	    /// <summary>
+	    /// Sets the transaction interceptor.
+	    /// </summary>
+	    /// <value>The transaction interceptor.</value>
+	    public TransactionInterceptor TransactionInterceptor
+	    {
+	        set
+	        {
+	            //TODO refactor
+	            Advice = value;
+	            SetTxAttributeSource(value);
+	        }
+        }
+
+        #endregion
+
+	    #region Methods
+
+        /// <summary>
+        /// Tests the input method to see if it's covered by the advisor.
+        /// </summary>
+        /// <param name="method">The method to match.</param>
+        /// <param name="targetClass">The <see cref="System.Type"/> to match against.</param>
+        /// <returns>
+        /// <b>True</b> if the supplied <paramref name="method"/> is covered by the advisor.
+        /// </returns>
+        public override bool Matches(MethodInfo method, Type targetClass)
+        {
+            return (_transactionAttributeSource.ReturnTransactionAttribute(method, targetClass) != null);
+        }
+
+        /// <summary>
+        /// Sets the tx attribute source.
+        /// </summary>
+        /// <param name="transactionInterceptor">The transaction interceptor.</param>
+	    protected void SetTxAttributeSource(TransactionInterceptor transactionInterceptor)
+	    {
+	        if (transactionInterceptor.TransactionAttributeSource == null)
+	        {
+	            throw new AopConfigException("Cannot construct a TransactionAttributeSourceAdvisor using a " +
+	                                         "TransactionInterceptor that has no TransactionAttributeSource configured.");
+	        }
+	        _transactionAttributeSource = transactionInterceptor.TransactionAttributeSource;
+	    }
+
+	    #endregion        
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceEditor.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceEditor.cs
new file mode 100644
index 00000000..18aef49b
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttributeSourceEditor.cs
@@ -0,0 +1,149 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using Spring.Util;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Editor that can convert <see cref="System.String"/> values into
+	/// <see cref="Spring.Transaction.Interceptor.ITransactionAttributeSource"/> instances.
+	/// </summary>
+	/// <remarks>
+	/// The transaction attribute string must be parseable by the
+	/// <see cref="Spring.Transaction.Interceptor.TransactionAttributeEditor"/> in this package.
+	/// <p>
+	/// Strings must be specified in the following syntax:<br/>
+	/// <code>FQCN.methodName=&lt;transaction attribute string&gt;</code> (sans &lt;&gt;).
+	/// </p>
+	/// <example>
+	/// <code>ExampleNamespace.ExampleClass.MyMethod=PROPAGATION_MANDATORY,ISOLATION_DEFAULT</code>
+	///	</example>
+	/// <note>
+	/// The specified class must be the one where the methods are defined; in the case of
+	/// implementing an interface, the interface class name must be specified.
+	/// </note>
+	/// <p>
+	/// This will register all overloaded methods for a given name. Does not support explicit
+	/// registration of certain overloaded methods. Supports wildcard style mappings (in
+	/// the form "xxx*"), e.g. "Notify*" for "Notify" and "NotifyAll".
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: TransactionAttributeSourceEditor.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	public class TransactionAttributeSourceEditor
+	{
+		#region PropertiesEditor Class
+		/// <summary>
+		/// Internal class to parse property values.
+		/// </summary>
+		protected internal class PropertiesEditor
+		{
+			private IDictionary _properties;
+
+			/// <summary>
+			/// Creates a new instance of the
+			/// <see cref="Spring.Transaction.Interceptor.TransactionAttributeSourceEditor.PropertiesEditor"/> class.
+			/// </summary>
+			/// <param name="properties">The property values to be parsed.</param>
+			public PropertiesEditor( string properties )
+			{
+				_properties = new Hashtable();
+				parseProperties( properties );
+			}
+
+			/// <summary>
+			/// Indexer to return values based on index value.
+			/// </summary>
+			public string this[ string index ]
+			{
+				get { return (string) _properties[index]; }
+			}
+
+			/// <summary>
+			/// Returns the collection of keys for properties.
+			/// </summary>
+			public ICollection Keys
+			{
+				get { return _properties.Keys; }
+			}
+
+			private void parseProperties( string properties )
+			{
+				string[] tokens = StringUtils.DelimitedListToStringArray( properties, "\n");
+				foreach ( string token in tokens )
+				{
+					string[] property = token.Split('=');
+					_properties.Add( property[0].Trim(), property[1].Trim());
+				}
+			}
+		}
+		#endregion
+	
+		private ITransactionAttributeSource _attributeSource;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAttributeSourceEditor.PropertiesEditor"/> class.
+		/// </summary>
+		public TransactionAttributeSourceEditor() {}
+
+		/// <summary>
+		/// Parses the input properties <see cref="System.String"/> into a valid
+		/// <see cref="Spring.Transaction.Interceptor.ITransactionAttributeSource"/>
+		/// instance
+		/// </summary>
+		/// <param name="attributeSource">The properties string to be parsed.</param>
+		public void SetAsText( string attributeSource )
+		{
+			MethodMapTransactionAttributeSource source = new MethodMapTransactionAttributeSource();
+			if ( attributeSource == null || attributeSource.Length == 0 )
+			{
+				_attributeSource = null;
+			} else
+			{
+				PropertiesEditor editor = new PropertiesEditor(attributeSource);
+				TransactionAttributeEditor tae = new TransactionAttributeEditor();
+
+				foreach ( string name in editor.Keys )
+				{
+					string value = editor[name];
+					tae.SetAsText( value );
+					ITransactionAttribute transactionAttribute = tae.Value;
+					source.AddTransactionalMethod( name, transactionAttribute );
+				}
+			}
+			_attributeSource = source;
+		}
+
+		/// <summary>
+		/// Gets the <see cref="Spring.Transaction.Interceptor.ITransactionAttributeSource"/>
+		/// from this instance.
+		/// </summary>
+		public ITransactionAttributeSource Value
+		{
+			get { return _attributeSource; }
+		}
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionInterceptor.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionInterceptor.cs
new file mode 100644
index 00000000..9e8731ab
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionInterceptor.cs
@@ -0,0 +1,90 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+using AopAlliance.Intercept;
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// An AOP Alliance <see cref="AopAlliance.Intercept.IMethodInterceptor"/> providing
+	/// declarative transaction management using the common Spring.NET transaction infrastructure.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// That class contains the necessary calls into Spring.NET's underlying
+	/// transaction API: subclasses such as this are responsible for calling
+	/// superclass methods such as
+    /// <see cref="Spring.Transaction.Interceptor.TransactionAspectSupport.CreateTransactionIfNecessary(MethodInfo, Type) "/>
+	/// in the correct order, in the event of normal invocation return or an exception. 
+	/// </p>
+	/// <p>
+	/// <see cref="Spring.Transaction.Interceptor.TransactionInterceptor"/>s are thread-safe.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TransactionInterceptor.cs,v 1.12 2007/09/07 04:46:53 markpollack Exp $</version>
+	[Serializable]
+	public class TransactionInterceptor : TransactionAspectSupport, IMethodInterceptor
+	{
+		/// <summary>
+		/// AOP Alliance invoke call that handles all transaction plumbing. 
+		/// </summary>
+		/// <param name="invocation">
+		/// The method that is to execute in the context of a transaction.
+		/// </param>
+		/// <returns>The return value from the method invocation.</returns>
+		public object Invoke(IMethodInvocation invocation)
+		{
+            // Work out the target class: may be <code>null</code>.
+            // The TransactionAttributeSource should be passed the target class
+            // as well as the method, which may be from an interface.
+			Type targetType = ( invocation.This != null ) ? invocation.This.GetType() : null;
+
+            // If the transaction attribute is null, the method is non-transactional.
+			TransactionInfo txnInfo = CreateTransactionIfNecessary( invocation.Method, targetType );
+			object returnValue = null;
+
+			try
+			{
+                // This is an around advice.
+                // Invoke the next interceptor in the chain.
+                // This will normally result in a target object being invoked.
+				returnValue = invocation.Proceed();
+			} 
+			catch ( Exception ex )
+			{
+                // target invocation exception
+				CompleteTransactionAfterThrowing( txnInfo, ex );
+                throw;
+			} 
+			finally
+			{
+				CleanupTransactionInfo( txnInfo );
+			}
+			CommitTransactionAfterReturning( txnInfo );
+			return returnValue;
+		}
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionProxyFactoryObject.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionProxyFactoryObject.cs
new file mode 100644
index 00000000..0b05b2aa
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionProxyFactoryObject.cs
@@ -0,0 +1,353 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+
+using Spring.Aop;
+using Spring.Aop.Framework;
+using Spring.Aop.Framework.Adapter;
+using Spring.Aop.Framework.DynamicProxy;
+using Spring.Aop.Support;
+using Spring.Aop.Target;
+using Spring.Core.TypeResolution;
+using Spring.Objects.Factory;
+
+#endregion
+
+namespace Spring.Transaction.Interceptor
+{
+	/// <summary>
+	/// Proxy factory object for simplified declarative transaction handling.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Alternative to the standard AOP <see cref="Spring.Aop.Framework.ProxyFactoryObject"/>
+	/// with a <see cref="Spring.Transaction.Interceptor.TransactionInterceptor"/>.
+	/// </p>
+	/// <p>
+	/// This class is intended to cover the <i>typical</i> case of declarative
+	/// transaction demarcation: namely, wrapping a (singleton) target object with a
+	/// transactional proxy, proxying all the interfaces that the target implements.
+	/// </p>
+	/// <p>
+	/// Internally, a <see cref="Spring.Transaction.Interceptor.TransactionInterceptor"/> 
+	/// instance is used, but the user of this class does not have to care. Optionally, an
+	/// <see cref="Spring.Aop.IPointcut"/> can be specified to cause conditional invocation of
+	/// the underlying <see cref="Spring.Transaction.Interceptor.TransactionInterceptor"/>.
+	/// </p> 
+	/// <p>
+	/// The
+	/// <see cref="Spring.Transaction.Interceptor.TransactionProxyFactoryObject.PreInterceptors"/>
+	/// and
+	/// <see cref="Spring.Transaction.Interceptor.TransactionProxyFactoryObject.PostInterceptors"/>
+	/// properties can be set to add additional interceptors to the mix.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Dmitriy Kopylenko</author>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: TransactionProxyFactoryObject.cs,v 1.7 2007/08/01 17:56:16 markpollack Exp $</version>
+	public class TransactionProxyFactoryObject : ProxyConfig, IFactoryObject, IInitializingObject
+	{
+		private TransactionInterceptor _transactionInterceptor;
+		private object _target;
+		private Type[] _proxyInterfaces;
+		private TruePointcut _pointcut;
+		private object[] _preInterceptors;
+		private object[] _postInterceptors;
+		private IAdvisorAdapterRegistry _advisorAdapterRegistry = GlobalAdvisorAdapterRegistry.Instance;
+		private object _proxy;
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.Interceptor.TransactionProxyFactoryObject"/> class.
+		/// </summary>
+		public TransactionProxyFactoryObject()
+		{
+			_transactionInterceptor = new TransactionInterceptor();
+		}
+
+		/// <summary>
+		/// Set the transaction manager for this factory.
+		/// </summary>
+		/// <remarks>
+		/// It is this instance that will perform actual transaction management: this class is
+		/// just a way of invoking it.
+		/// </remarks>
+		public IPlatformTransactionManager PlatformTransactionManager
+		{
+			set { _transactionInterceptor.TransactionManager = value; }
+		}
+
+		/// <summary>
+		/// Set the target object, i.e. the object to be wrapped with a transactional proxy.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The target may be any object, in which case a
+		/// <see cref="Spring.Aop.Target.SingletonTargetSource"/> will
+		/// be created. If it is a <see cref="EmptyTargetSource"/>, no wrapper
+		/// <see cref="EmptyTargetSource"/> is created: this enables the use of a pooling
+		/// or prototype <see cref="EmptyTargetSource"/>.
+		/// </p>
+		/// </remarks>
+		public object Target
+		{
+			set { _target = value; }
+		}
+
+		/// <summary>
+		/// Specify the set of interfaces being proxied.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If left null (the default), the AOP infrastructure works
+		/// out which interfaces need proxying by analyzing the target,
+		/// proxying <b>all</b> of the interfaces that the target object implements.
+		/// </p>
+		/// </remarks>
+		public string[] ProxyInterfaces
+		{
+			set { _proxyInterfaces = TypeResolutionUtils.ResolveInterfaceArray( value ); }
+		}
+
+		/// <summary>
+		/// Set properties with method names as keys and transaction attribute
+		/// descriptors as values.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The various transaction attribute descriptors are parsed via
+		/// an instance of the
+		/// <see cref="Spring.Transaction.Interceptor.TransactionAttributeEditor"/> class.
+		/// </p>
+		/// <note>
+		/// Method names are always applied to the target class, no matter if defined in an
+		/// interface or the class itself.
+		/// </note>
+		/// <p>
+		/// Internally, a
+		/// <see cref="Spring.Transaction.Interceptor.NameMatchTransactionAttributeSource"/>
+		/// will be created from the given properties.
+		/// </p>
+		/// </remarks>
+		/// <example>
+		/// <p>
+		/// An example string (method name and transaction attributes) might be:
+		/// </p>
+		/// <p>
+		/// key = "myMethod", value = "PROPAGATION_REQUIRED,readOnly".
+		/// </p>
+		/// </example>
+		public NameValueCollection TransactionAttributes
+		{
+			set { _transactionInterceptor.TransactionAttributes = value; }
+		}
+
+		/// <summary>
+		/// Set the transaction attribute source which is used to find transaction
+		/// attributes.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// If specifying a <see cref="System.String"/> property value, an
+		/// appropriate <see cref="System.ComponentModel.TypeConverter"/>
+		/// implementation will create a
+		/// <see cref="Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource"/>
+		/// from the value.
+		/// </p>
+		/// </remarks>
+		public ITransactionAttributeSource TransactionAttributeSource
+		{
+			set { _transactionInterceptor.TransactionAttributeSource = value; }
+		}
+
+		/// <summary>
+		/// Set a pointcut, i.e an object that can cause conditional invocation
+		/// of the <see cref="Spring.Transaction.Interceptor.TransactionInterceptor"/>
+		/// depending on method and attributes passed.
+		/// </summary>
+		/// <remarks>
+		/// <note>
+		/// Additional interceptors are always invoked.
+		/// </note>
+		/// </remarks>
+		public TruePointcut TruePointcut
+		{
+			set { _pointcut = value; }
+		}
+
+		/// <summary>
+		/// Set additional interceptors (or advisors) to be applied before the
+		/// implicit transaction interceptor.
+		/// </summary>
+		public object[] PreInterceptors
+		{
+			set { _preInterceptors = value; }
+		}
+
+		/// <summary>
+		/// Set additional interceptors (or advisors) to be applied after the
+		/// implicit transaction interceptor.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Note that this is just necessary if you rely on those interceptors in general.
+		/// </p>
+		/// </remarks>
+		public object[] PostInterceptors
+		{
+			set { _postInterceptors = value; }
+		}
+
+		/// <summary>
+		/// Specify the <see cref="Spring.Aop.Framework.Adapter.IAdvisorAdapterRegistry"/> to use.
+		/// </summary>
+		/// <remarks>The default instance is the global AdvisorAdapterRegistry.</remarks>
+		public IAdvisorAdapterRegistry AdvisorAdapterRegistry
+		{
+			set { _advisorAdapterRegistry = value; }
+		}
+
+		#region IFactoryObject Members
+		/// <summary>
+		/// Returns the object <see cref="System.Type"/> for this proxy factory.
+		/// </summary>
+		public Type ObjectType
+		{
+			get
+			{
+				if ( _proxy != null )
+				{
+					return _proxy.GetType();
+				} 
+				else if ( _target != null && _target is ITargetSource )
+				{
+					return _target.GetType();
+				} 
+				else 
+				{
+					return null;
+				}
+			}
+		}
+		/// <summary>
+		/// Returns the object wrapped by this proxy factory.
+		/// </summary>
+		/// <returns>The target object proxy.</returns>
+		public object GetObject()
+		{
+			return _proxy;
+		}
+
+		/// <summary>
+		/// Is this object a singleton?  Always returns <b>true</b> in this implementation.
+		/// </summary>
+		public bool IsSingleton
+		{
+			get
+			{
+				return true;
+			}
+		}
+		#endregion
+
+		#region IInitializingObject Members
+		/// <summary>
+		/// Method run after all the properties have been set for this object.
+		/// Responsible for actual proxy creation.
+		/// </summary>
+		public void AfterPropertiesSet()
+		{
+			_transactionInterceptor.AfterPropertiesSet();
+
+			if ( _target == null )
+			{
+				throw new ArgumentException("'target' is required.");
+			}
+			ProxyFactory proxyFactory = new ProxyFactory();
+
+			if ( _preInterceptors != null )
+			{
+				for ( int i = 0; i < _preInterceptors.Length; i++ )
+				{
+					proxyFactory.AddAdvisor(_advisorAdapterRegistry.Wrap(_preInterceptors[i]));
+				}
+			}
+			if ( _pointcut != null )
+			{
+				IAdvisor advice = new DefaultPointcutAdvisor(_pointcut, _transactionInterceptor);
+				proxyFactory.AddAdvisor(advice);
+			} 
+			else
+			{
+				proxyFactory.AddAdvisor( new TransactionAttributeSourceAdvisor( _transactionInterceptor ) );
+			}
+			if ( _postInterceptors != null )
+			{
+				for ( int i = 0; i < _postInterceptors.Length; i++ )
+				{
+					proxyFactory.AddAdvisor(_advisorAdapterRegistry.Wrap(_postInterceptors[i]));
+				}
+			}
+			proxyFactory.CopyFrom(this);
+			proxyFactory.TargetSource = createTargetSource(_target);
+			if ( _proxyInterfaces != null )
+			{
+				proxyFactory.Interfaces = _proxyInterfaces;
+			} 
+			else if ( !ProxyTargetType )
+			{
+				if ( _target is ITargetSource )
+				{
+					throw new AopConfigException("Either 'ProxyInterfaces' or 'ProxyTargetType' is required " +
+						"when using an ITargetSource as 'target'");
+				}
+				proxyFactory.Interfaces = AopUtils.GetAllInterfaces(_target);
+			}
+			_proxy = proxyFactory.GetProxy();
+		}
+		#endregion
+
+		/// <summary>
+		/// Set the target or <see cref="Spring.Aop.ITargetSource"/>.
+		/// </summary>
+		/// <param name="target">
+		/// The target. If this is an implementation of the <see cref="Spring.Aop.ITargetSource"/>
+		/// interface, it is used as our <see cref="Spring.Aop.ITargetSource"/>; otherwise it is
+		/// wrapped in a <see cref="Spring.Aop.Target.SingletonTargetSource"/>.
+		/// </param>
+		/// <returns>An <see cref="Spring.Aop.ITargetSource"/> for this object.</returns>
+		protected ITargetSource createTargetSource( object target )
+		{
+			if ( target is ITargetSource )
+			{
+				return (ITargetSource) target;
+			} else
+			{
+				return new SingletonTargetSource( target );
+			}
+		}
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/InvalidIsolationLevelException.cs b/src/Spring/Spring.Data/Transaction/InvalidIsolationLevelException.cs
new file mode 100644
index 00000000..5b2547dd
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/InvalidIsolationLevelException.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Runtime.Serialization;
+
+namespace Spring.Transaction
+{
+	
+	/// <summary>
+	/// Exception that gets thrown when an invalid isolation level is specified,
+	/// i.e. an isolation level that the transaction manager implementation
+	/// doesn't support.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: InvalidIsolationLevelException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	[Serializable]
+	public class InvalidIsolationLevelException : TransactionUsageException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.InvalidIsolationLevelException"/> class.
+		/// </summary>
+		public InvalidIsolationLevelException( ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.InvalidIsolationLevelException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public InvalidIsolationLevelException( String message ) : base(message) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.InvalidIsolationLevelException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public InvalidIsolationLevelException(string message, Exception rootCause)
+			: base(message, rootCause) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.InvalidIsolationLevelException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected InvalidIsolationLevelException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/InvalidTimeoutException.cs b/src/Spring/Spring.Data/Transaction/InvalidTimeoutException.cs
new file mode 100644
index 00000000..f4f2c31e
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/InvalidTimeoutException.cs
@@ -0,0 +1,130 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Runtime.Serialization;
+
+namespace Spring.Transaction
+{
+	/// <summary> 
+	/// Exception that gets thrown when an invalid timeout is specified,
+	/// for example when the transaction manager implementation doesn't support timeouts.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: InvalidTimeoutException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	[Serializable]
+	public class InvalidTimeoutException : TransactionUsageException, ISerializable
+	{
+		/// <summary>
+		/// Invalid timeout value.
+		/// </summary>
+		private int _timeout = -1;
+
+		/// <summary>
+		/// Returns the invalid timeout for this exception.
+		/// </summary>
+		public int Timeout
+		{
+			get
+			{
+				return _timeout;
+			}
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.InvalidTimeoutException"/> class
+		/// with the specified message and timeout value.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="timeout">The (possibly invalid) timeout value.</param>
+		public InvalidTimeoutException(string message, int timeout):base(message)
+		{
+			_timeout = timeout;
+		}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.InvalidTimeoutException"/> class.
+		/// </summary>
+		public InvalidTimeoutException( ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.InvalidTimeoutException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public InvalidTimeoutException( String message ) : base(message) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.InvalidTimeoutException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public InvalidTimeoutException(string message, Exception rootCause)
+			: base(message, rootCause) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.InvalidTimeoutException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected InvalidTimeoutException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) 
+		{
+			_timeout = info.GetInt32( "timeout" );
+		}
+
+		/// <summary>
+		/// Override of <see cref="System.Exception.GetObjectData(SerializationInfo, StreamingContext)"/>
+		/// to allow for private serialization.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		public override void GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+			info.AddValue( "timeout", _timeout );
+			base.GetObjectData( info, context );
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/NestedTransactionNotSupportedException.cs b/src/Spring/Spring.Data/Transaction/NestedTransactionNotSupportedException.cs
new file mode 100644
index 00000000..fadda7d6
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/NestedTransactionNotSupportedException.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Runtime.Serialization;
+
+namespace Spring.Transaction
+{
+	/// <summary>
+	/// Exception thrown when attempting to work with a nested transaction
+	/// but nested transactions are not supported by the underlying backend.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: NestedTransactionNotSupportedException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	[Serializable]
+	public class NestedTransactionNotSupportedException : CannotCreateTransactionException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.NestedTransactionNotSupportedException"/> class.
+		/// </summary>
+		public NestedTransactionNotSupportedException( ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.NestedTransactionNotSupportedException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public NestedTransactionNotSupportedException( String message ) : base(message) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.NestedTransactionNotSupportedException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public NestedTransactionNotSupportedException(string message, Exception rootCause)
+			: base(message, rootCause) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.NestedTransactionNotSupportedException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected NestedTransactionNotSupportedException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/NoTransactionException.cs b/src/Spring/Spring.Data/Transaction/NoTransactionException.cs
new file mode 100644
index 00000000..863010d6
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/NoTransactionException.cs
@@ -0,0 +1,80 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Runtime.Serialization;
+
+namespace Spring.Transaction
+{
+	/// <summary>
+	/// Exception thrown when an operation is attempted that relies on an existing
+	/// transaction (such as setting rollback status) and there is no existing transaction.
+	/// This represents an illegal usage of the transaction API.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: NoTransactionException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	[Serializable]
+	public class NoTransactionException : TransactionUsageException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.NoTransactionException"/> class.
+		/// </summary>
+		public NoTransactionException( ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.NoTransactionException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public NoTransactionException( String message ) : base(message) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.NoTransactionException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public NoTransactionException(string message, Exception rootCause)
+			: base(message, rootCause) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.NoTransactionException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected NoTransactionException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/Support/AbstractPlatformTransactionManager.cs b/src/Spring/Spring.Data/Transaction/Support/AbstractPlatformTransactionManager.cs
new file mode 100644
index 00000000..d286696a
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/AbstractPlatformTransactionManager.cs
@@ -0,0 +1,1179 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Data;
+using Common.Logging;
+
+namespace Spring.Transaction.Support
+{
+    /// <summary>
+    /// Abstract base class that allows for easy implementation of concrete platform transaction managers.
+    /// </summary>
+    /// <remarks>
+    /// <p>Provides the following workflow handling:
+    /// <ul>
+    /// <li>Determines if there is an existing transaction</li>
+    /// <li>Applies the appropriate propagation behavior</li>
+    /// <li>Suspends and resumes transactions if necessary</li>
+    /// <li>Checks the rollback-only flag on commit</li>
+    /// <li>Applies the appropriate modification on rollback (actual rollback or setting rollback-only)</li>
+    /// <li>Triggers registered synchronization callbacks (if transaction synchronization is active)</li>
+    /// </ul>
+    /// </p>
+    /// <p>
+    /// Transaction synchronization is a generic mechanism for registering
+    /// callbacks that get invoked at transaction completion time. The same mechanism
+    /// can also be used for custom synchronization efforts.
+    /// </p>
+    /// <p>
+    /// The state of this class is serializable. It's up to subclasses if
+    /// they wish to make their state to be serializable.
+    /// They should implement <see cref="System.Runtime.Serialization.ISerializable"/> if they need
+    /// to restore any transient state.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <author>Griffin Caprio (.NET)</author>
+    [Serializable]
+    public abstract class AbstractPlatformTransactionManager : IPlatformTransactionManager
+    {
+        #region Private SuspendedResourcesHolder Helper class
+
+        private class SuspendedResourcesHolder
+        {
+            private IList _suspendedSynchronizations;
+            private object _suspendedResources;
+            private string _name;
+            private bool _readOnly;
+            private IsolationLevel _isolationLevel;
+            private bool _wasActive;
+
+
+            public SuspendedResourcesHolder(object suspendedResources)
+            {
+                _suspendedResources = suspendedResources;
+            }
+
+            public SuspendedResourcesHolder(IList suspendedSynchronizations, object suspendedResources,
+                                             string name, bool readOnly, IsolationLevel isolationLevel, bool wasActive)
+            {
+                _suspendedSynchronizations = suspendedSynchronizations;
+                _suspendedResources = suspendedResources;
+                _name = name;
+                _readOnly = readOnly;
+                _isolationLevel = isolationLevel;
+                _wasActive = wasActive;
+            }
+
+            public IList SuspendedSynchronizations
+            {
+                get { return _suspendedSynchronizations; }
+            }
+
+            public object SuspendedResources
+            {
+                get { return _suspendedResources; }
+            }
+
+
+            public string Name
+            {
+                get { return _name; }
+            }
+
+            public bool ReadOnly
+            {
+                get { return _readOnly; }
+            }
+
+            public IsolationLevel IsolationLevel
+            {
+                get { return _isolationLevel; }
+            }
+
+            public bool WasActive
+            {
+                get { return _wasActive; }
+            }
+        }
+
+        #endregion
+
+        #region Private Variables
+
+        private TransactionSynchronizationState _transactionSyncState = TransactionSynchronizationState.Always;
+        private bool _nestedTransactionsAllowed;
+        private bool _rollbackOnCommitFailure;
+        private bool _failEarlyOnGlobalRollbackOnly;
+        private int _defaultTimeout = DefaultTransactionDefinition.TIMEOUT_DEFAULT;
+
+        #region Logging Definition
+
+        [NonSerialized()] protected ILog log = LogManager.GetLogger(typeof (AbstractPlatformTransactionManager));
+
+        #endregion
+
+        #endregion
+
+        #region Public Properties
+
+        /// <summary>
+        /// Sets and gets when this transaction manager should activate the thread-bound
+        /// transaction synchronization support. Default is "always".
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Note that transaction synchronization isn't supported for
+        /// multiple concurrent transactions by different transaction managers.
+        /// Only one transaction manager is allowed to activate it at any time.
+        /// </p>
+        /// <see cref="Spring.Transaction.Support.TransactionSynchronizationState"/>
+        /// </remarks>
+        public TransactionSynchronizationState TransactionSynchronization
+        {
+            set { _transactionSyncState = value; }
+            get { return _transactionSyncState; }
+        }
+
+        /// <summary>
+        /// Sets and gets whether nested transactions are allowed. Default is false.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Typically initialized with an appropriate default by the
+        /// concrete transaction manager subclass.
+        /// </p>
+        /// </remarks>
+        public bool NestedTransactionsAllowed
+        {
+            get { return _nestedTransactionsAllowed; }
+            set { _nestedTransactionsAllowed = value; }
+        }
+
+        /// <summary>
+        /// Sets and gets a flag that determines whether or not the
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoRollback(DefaultTransactionStatus)"/>
+        /// method must be invoked if a call to the
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoCommit(DefaultTransactionStatus)"/>
+        /// method fails. Default is false.
+        /// </summary>
+        /// <remarks>
+        /// Typically not necessary and thus to be avoided as it can override the
+        /// commit exception with a subsequent rollback exception.
+        /// </remarks>
+        public bool RollbackOnCommitFailure
+        {
+            get { return _rollbackOnCommitFailure; }
+            set { _rollbackOnCommitFailure = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to fail early in case of the transaction being
+        /// globally marked as rollback-only.
+        /// </summary>
+        /// <remarks>
+        ///  Default is "false", only causing an UnexpectedRollbackException at the
+        ///  outermost transaction boundary. Switch this flag on to cause an
+        ///  UnexpectedRollbackException as early as the global rollback-only marker
+        ///  has been first detected, even from within an inner transaction boundary.
+        /// </remarks>
+        /// <value>
+        /// 	<c>true</c> if fail early on global rollback; otherwise, <c>false</c>.
+        /// </value>
+        public bool FailEarlyOnGlobalRollbackOnly
+        {
+            get { return _failEarlyOnGlobalRollbackOnly; }
+            set { _failEarlyOnGlobalRollbackOnly = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the default timeout that this transaction manager should apply if there
+        /// is no timeout specified at the transaction level, in seconds.
+        /// </summary>
+        /// <remarks>Returns DefaultTransactionDefinition.TIMEOUT_DEFAULT to indicate the
+        /// underlying transaction infrastructure's default timeout.</remarks>
+        /// <value>The default timeout.</value>
+        public int DefaultTimeout
+        {
+            get
+            {
+                return _defaultTimeout;
+            }
+            set
+            {
+                if (_defaultTimeout < DefaultTransactionDefinition.TIMEOUT_DEFAULT)
+                {
+                    throw new InvalidTimeoutException("Invalid default timeout", _defaultTimeout);
+                } 
+                _defaultTimeout = value;
+            }
+        }
+
+        #endregion
+
+        #region Abstract Methods
+
+        /// <summary>
+        /// Return the current transaction object.
+        /// </summary>
+        /// <returns>The current transaction object.</returns>
+        /// <exception cref="Spring.Transaction.CannotCreateTransactionException">
+        /// If transaction support is not available.
+        /// </exception>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of lookup or system errors.
+        /// </exception>
+        protected abstract object DoGetTransaction();
+
+        /// <summary>
+        /// Check if the given transaction object indicates an existing transaction
+        /// (that is, a transaction which has already started).
+        /// </summary>
+        /// <remarks>
+        /// The result will be evaluated according to the specified propagation
+        /// behavior for the new transaction. An existing transaction might get
+        /// suspended (in case of PROPAGATION_REQUIRES_NEW), or the new transaction
+        /// might participate in the existing one (in case of PROPAGATION_REQUIRED).
+        /// Default implementation returns false, assuming that detection of or
+        /// participating in existing transactions is generally not supported.
+        /// Subclasses are of course encouraged to provide such support.</remarks>
+        /// <param name="transaction">
+        /// Transaction object returned by
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+        /// </param>
+        /// <returns>True if there is an existing transaction.</returns>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of system errors.
+        /// </exception>
+        protected virtual bool IsExistingTransaction(object transaction)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Begin a new transaction with the given transaction definition.
+        /// </summary>
+        /// <remarks>
+        /// Does not have to care about applying the propagation behavior,
+        /// as this has already been handled by this abstract manager.
+        /// </remarks>
+        /// <param name="transaction">
+        /// Transaction object returned by
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+        /// </param>
+        /// <param name="definition">
+        /// <see cref="Spring.Transaction.ITransactionDefinition"/> instance, describing
+        /// propagation behavior, isolation level, timeout etc.
+        /// </param>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of creation or system errors.
+        /// </exception>
+        protected abstract void DoBegin(object transaction, ITransactionDefinition definition);
+
+        /// <summary>
+        /// Suspend the resources of the current transaction.
+        /// </summary>
+        /// <remarks>
+        /// Transaction synchronization will already have been suspended.
+        /// <para>
+        /// Default implementation throws a TransactionSuspensionNotSupportedException,
+        /// assuming that transaction suspension is generally not supported.
+        /// </para>
+        /// </remarks>
+        /// <param name="transaction">
+        /// Transaction object returned by
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+        /// </param>
+        /// <returns>
+        /// An object that holds suspended resources (will be kept unexamined for passing it into
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoResume"/>.)
+        /// </returns>
+        /// <exception cref="Spring.Transaction.IllegalTransactionStateException">
+        /// If suspending is not supported by the transaction manager implementation.
+        /// </exception>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// in case of system errors.
+        /// </exception>
+        protected virtual object DoSuspend(object transaction)
+        {
+            throw new TransactionSuspensionNotSupportedException(
+                "Transaction manager [" + GetType().Name + "] does not support transaction suspension");
+        }
+
+        /// <summary>
+        /// Resume the resources of the current transaction.
+        /// </summary>
+        /// <remarks>Transaction synchronization will be resumed afterwards.
+        /// <para>
+        /// Default implementation throws a TransactionSuspensionNotSupportedException,
+        /// assuming that transaction suspension is generally not supported.
+        /// </para>
+        /// </remarks>
+        /// <param name="transaction">
+        /// Transaction object returned by
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+        /// </param>
+        /// <param name="suspendedResources">
+        /// The object that holds suspended resources as returned by
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoSuspend"/>.
+        /// </param>
+        /// <exception cref="Spring.Transaction.IllegalTransactionStateException">
+        /// If suspending is not supported by the transaction manager implementation.
+        /// </exception>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of system errors.
+        /// </exception>
+        protected virtual void DoResume(object transaction, object suspendedResources)
+        {
+            throw new TransactionSuspensionNotSupportedException(
+                "Transaction manager [" + GetType().Name + "] does not support transaction suspension");
+        }
+
+        /// <summary>
+        /// Perform an actual commit on the given transaction.
+        /// </summary>
+        /// <param name="status">The status representation of the transaction.</param>
+        /// <remarks>
+        /// <p>
+        /// An implementation does not need to check the rollback-only flag.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of system errors.
+        /// </exception>
+        protected abstract void DoCommit(DefaultTransactionStatus status);
+
+        /// <summary>
+        /// Perform an actual rollback on the given transaction.
+        /// </summary>
+        /// <param name="status">The status representation of the transaction.</param>
+        /// <remarks>
+        /// An implementation does not need to check the new transaction flag.
+        /// </remarks>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of system errors.
+        /// </exception>
+        protected abstract void DoRollback(DefaultTransactionStatus status);
+
+        /// <summary>
+        /// Set the given transaction rollback-only. Only called on rollback
+        /// if the current transaction takes part in an existing one.
+        /// </summary>
+        /// <remarks>Default implementation throws an IllegalTransactionStateException,
+        /// assuming that participating in existing transactions is generally not
+        /// supported. Subclasses are of course encouraged to provide such support.
+        /// </remarks>
+        /// <param name="status">The status representation of the transaction.</param>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In the case of system errors.
+        /// </exception>
+        protected virtual void DoSetRollbackOnly(DefaultTransactionStatus status)
+        {
+            throw new IllegalTransactionStateException(
+                "Participating in existing transactions is not supported - when 'IsExistingTransaction' " +
+                "returns true, appropriate 'DoSetRollbackOnly' behavior must be provided");
+        }
+
+        /// <summary>
+        /// Return whether to use a savepoint for a nested transaction. Default is true,
+        /// which causes delegation to <see cref="Spring.Transaction.Support.DefaultTransactionStatus"/>
+        /// for holding a savepoint.
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// <p>
+        /// Subclasses can override this to return false, causing a further
+        /// invocation of
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoBegin"/>
+        /// despite an already existing transaction.
+        /// </p>
+        /// </remarks>
+        protected virtual bool UseSavepointForNestedTransaction()
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// Cleanup resources after transaction completion.
+        /// </summary>
+        /// <param name="transaction">
+        /// Transaction object returned by
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>.
+        /// </param>
+        /// <remarks>
+        /// <p>
+        /// Called after <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoCommit"/>
+        /// and
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoRollback"/>
+        /// execution on any outcome.
+        /// </p>
+        /// <p>
+        /// Should not throw any exceptions but just issue warnings on errors.
+        /// </p>
+        /// <p>
+        /// Default implementation does nothing.
+        /// </p>
+        /// </remarks>
+        protected virtual void DoCleanupAfterCompletion(object transaction)
+        {
+        }
+
+        #endregion
+
+        #region IPlatformTransactionManager Members
+
+        /// <summary>
+        /// Return a currently active transaction or create a new one.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation handles propagation behavior.
+        /// </p>
+        /// <p>
+        /// Delegates to
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoGetTransaction"/>,
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.IsExistingTransaction"/>,
+        /// and
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoBegin"/>.
+        /// </p>
+        /// <p>
+        /// Note that parameters like isolation level or timeout will only be applied
+        /// to new transactions, and thus be ignored when participating in active ones.
+        /// Furthermore, they aren't supported by every transaction manager:
+        /// a proper implementation should throw an exception when custom values
+        /// that it doesn't support are specified.
+        /// </p>
+        /// </remarks>
+        /// <param name="definition">
+        /// <see cref="Spring.Transaction.ITransactionDefinition"/> instance (can be null for
+        /// defaults), describing propagation behavior, isolation level, timeout etc.
+        /// </param>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In case of lookup, creation, or system errors.
+        /// </exception>
+        /// <returns>
+        /// <see cref="Spring.Transaction.ITransactionStatus"/> representing the new or current transaction.
+        /// </returns>
+        public ITransactionStatus GetTransaction(ITransactionDefinition definition)
+        {
+            object transaction = DoGetTransaction();
+            bool debugEnabled = log.IsDebugEnabled;
+            bool newSynchronization;
+
+            if (debugEnabled)
+            {
+                log.Debug("Using transaction object [" + transaction + "]");
+            }
+
+            if (definition == null)
+            {
+                definition = new DefaultTransactionDefinition();
+            }
+            if (IsExistingTransaction(transaction))
+            {
+                // Existing transaction found -> check propagation behavior to find out how to behave.
+                return HandleExistingTransaction(definition, transaction, debugEnabled);
+            }
+
+            // Check definition settings for new transaction.
+            if (definition.TransactionTimeout < DefaultTransactionDefinition.TIMEOUT_DEFAULT)
+            {
+                throw new InvalidTimeoutException("Invalid transaction timeout", definition.TransactionTimeout);
+            }
+
+            // No existing transaction found -> check propagation behavior to find out how to proceed.
+            if (definition.PropagationBehavior == TransactionPropagation.Mandatory)
+            {
+                throw new IllegalTransactionStateException(
+                    "Transaction propagation 'mandatory' but no existing transaction found");
+            }
+            else if (definition.PropagationBehavior == TransactionPropagation.Required ||
+                     definition.PropagationBehavior == TransactionPropagation.RequiresNew ||
+                      definition.PropagationBehavior == TransactionPropagation.Nested)
+            {
+                object suspendedResources = Suspend(null);
+                if (debugEnabled)
+                {
+                    log.Debug("Creating new transaction with name [" + definition.Name + "]:" + definition);
+                }
+                try
+                {
+                    DoBegin(transaction, definition);
+                } catch (TransactionException)
+                {
+                    Resume(null, suspendedResources);
+                    throw;
+                }
+                newSynchronization = (_transactionSyncState != TransactionSynchronizationState.Never);
+                return NewTransactionStatus(definition, transaction, true, newSynchronization, debugEnabled,
+                                            suspendedResources);
+            }
+            else
+            {
+                // Create "empty" transaction: no actual transaction, but potentially synchronization.
+                newSynchronization = (_transactionSyncState == TransactionSynchronizationState.Always);
+                return NewTransactionStatus(definition, null, false, newSynchronization, debugEnabled, null);
+
+            }
+
+        }
+
+        private ITransactionStatus HandleExistingTransaction(ITransactionDefinition definition, object transaction, bool debugEnabled)
+        {
+            //bool newSynchronization;
+            if (definition.PropagationBehavior == TransactionPropagation.Never)
+            {
+                throw new IllegalTransactionStateException(
+                    "Transaction propagation 'never' but existing transaction found.");
+            }
+            if (definition.PropagationBehavior == TransactionPropagation.NotSupported)
+            {
+                if (debugEnabled)
+                {
+                    log.Debug("Suspending current transaction");
+                }
+                object suspendedResources = Suspend(transaction);
+                bool newSynchronization = (_transactionSyncState == TransactionSynchronizationState.Always);
+                return
+                    NewTransactionStatus(definition, null, false, newSynchronization, debugEnabled,
+                                         suspendedResources);
+            }
+
+            if (definition.PropagationBehavior == TransactionPropagation.RequiresNew)
+            {
+                if (debugEnabled)
+                {
+                    log.Debug("Suspending current transaction, creating new transaction with name [" +
+                              definition.Name + "]:" + definition);
+                }
+                object suspendedResources = Suspend(transaction);
+                try
+                {
+                    DoBegin(transaction, definition);
+                }
+                catch (TransactionException beginEx)
+                {
+                    try
+                    {
+                        Resume(transaction, suspendedResources);
+                    }
+                    catch (TransactionException resumeEx)
+                    {
+                        log.Error(
+                            "Inner transaction begin exception overridden by outer transaction resume exception");
+                        log.Error("Begin Transaction Exception", beginEx);
+                        log.Error("Resume Transaction Exception", resumeEx);
+                        throw;
+                    }
+                    throw;
+                }
+                bool newSynchronization = (_transactionSyncState != TransactionSynchronizationState.Never);
+                return
+                    NewTransactionStatus(definition, transaction, true, newSynchronization, debugEnabled, suspendedResources);
+            }
+            if (definition.PropagationBehavior == TransactionPropagation.Nested)
+            {
+                if (!NestedTransactionsAllowed)
+                {
+                    throw new NestedTransactionNotSupportedException(
+                        "Transaction manager does not allow nested transactions by default - " +
+                        "specify 'NestedTransactionsAllowed' property with value 'true'");
+                }
+                if (debugEnabled)
+                {
+                    log.Debug("Creating nested transaction with name [" + definition.Name + "]:" + definition);
+                }
+
+                if (UseSavepointForNestedTransaction())
+                {
+                    DefaultTransactionStatus status =
+                        NewTransactionStatus(definition, transaction, false, false, debugEnabled, null);
+                    status.CreateAndHoldSavepoint(DateTime.Now.ToLongTimeString());
+                    return status;
+                }
+                else
+                {
+                    DoBegin(transaction, definition);
+                    bool newSynchronization = (_transactionSyncState != TransactionSynchronizationState.Never);
+                    return NewTransactionStatus(definition, transaction, true, newSynchronization, debugEnabled, null);
+
+                }
+            }
+            // Assumably PROPAGATION_SUPPORTS.
+            if (debugEnabled) {
+			    log.Debug("Participating in existing transaction");
+		    }
+            bool newSynch = (_transactionSyncState != TransactionSynchronizationState.Never);
+            return NewTransactionStatus(definition, transaction, false, newSynch, debugEnabled, null);
+
+        }
+
+        /// <summary>
+        /// This implementation of commit handles participating in existing transactions
+        /// and programmatic rollback requests.
+        /// </summary>
+        /// <remarks>
+        /// </remarks>
+        /// <param name="transactionStatus">
+        /// ITransactionStatus object returned by the
+        /// <see cref="Spring.Transaction.IPlatformTransactionManager.GetTransaction"/>() method.
+        /// </param>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In case of commit or system errors.
+        /// </exception>
+        public void Commit(ITransactionStatus transactionStatus)
+        {
+            if (transactionStatus.Completed)
+            {
+                throw new IllegalTransactionStateException(
+                    "Transaction is already completed - do not call commit or rollback more than once per transaction");
+            }
+
+            DefaultTransactionStatus defaultStatus = (DefaultTransactionStatus) transactionStatus;
+            if (defaultStatus.LocalRollbackOnly)
+            {
+                if (defaultStatus.Debug)
+                {
+                    log.Debug("Transaction code has requested rollback");
+                }
+                ProcessRollback(defaultStatus);
+                return;
+            }
+            if ( !ShouldCommitOnGlobalRollbackOnly && defaultStatus.GlobalRollbackOnly)
+            {
+                if (defaultStatus.Debug)
+                {
+                    log.Debug("Global transaction is marked as rollback-only but transactional code requested commit");
+                }
+                ProcessRollback(defaultStatus);
+                // Throw UnexpectedRollbackException only at outermost transaction boundary
+                // or if explicitly asked to.
+                if (defaultStatus.IsNewTransaction || FailEarlyOnGlobalRollbackOnly)
+                {
+                    throw new UnexpectedRollbackException(
+                            "Transaction rolled back because it has been marked as rollback-only");
+                }
+                return;
+            }
+            ProcessCommit(defaultStatus);
+           
+        }
+
+        protected virtual bool ShouldCommitOnGlobalRollbackOnly
+        {
+            get { return false; }
+        }
+
+        private void ProcessCommit(DefaultTransactionStatus status)
+        {
+            try
+            {
+                bool beforeCompletionInvoked = false;
+                try
+                {
+                    TriggerBeforeCommit(status);
+                    TriggerBeforeCompletion(status);
+                    beforeCompletionInvoked = true;
+                    bool globalRollbackOnly = false;
+                    if (status.IsNewTransaction || FailEarlyOnGlobalRollbackOnly)
+                    {
+                        globalRollbackOnly = status.GlobalRollbackOnly;
+                    }
+                    if (status.HasSavepoint)
+                    {
+                        status.ReleaseHeldSavepoint();
+                    }
+                    else if (status.IsNewTransaction)
+                    {
+                        DoCommit(status);
+                    }
+                    // Throw UnexpectedRollbackException if we have a global rollback-only
+                    // marker but still didn't get a corresponding exception from commit.
+                    if (globalRollbackOnly)
+                    {
+                        throw new UnexpectedRollbackException(
+                                "Transaction silently rolled back because it has been marked as rollback-only");
+                    }
+                }
+                catch (UnexpectedRollbackException)
+                {
+                    TriggerAfterCompletion(status, TransactionSynchronizationStatus.Rolledback);
+                    throw;
+                }
+                catch (TransactionException ex)
+                {
+                    if (RollbackOnCommitFailure)
+                    {
+                        DoRollbackOnCommitException(status, ex);
+                    }
+                    else
+                    {
+                        TriggerAfterCompletion(status, TransactionSynchronizationStatus.Unknown);
+                    }
+                    throw;
+                }
+                catch (Exception ex)
+                {
+                    if (!beforeCompletionInvoked)
+                    {
+                        TriggerBeforeCompletion(status);
+                    }
+                    DoRollbackOnCommitException(status, ex);
+                    throw;
+                }
+                // Trigger AfterCommit callbacks, with an exception thrown there
+                // propagated to callers but the transaction still considered as commited.
+                try
+                {
+                    TriggerAfterCommit(status);
+                }
+                finally
+                {
+                    TriggerAfterCompletion(status, TransactionSynchronizationStatus.Committed);
+                }
+            }
+            finally
+            {
+                CleanupAfterCompletion(status);
+            }
+        }
+
+        private void TriggerAfterCommit(DefaultTransactionStatus status)
+        {
+            if (status.NewSynchronization)
+            {
+                if (status.Debug)
+                {
+                    log.Debug("Trigger AfterCommit Synchronization");
+                }
+                IList synchronizations = TransactionSynchronizationManager.Synchronizations;
+                foreach (ITransactionSynchronization currentTxnSynchronization in synchronizations)
+                {
+                    try
+                    {
+                        currentTxnSynchronization.AfterCommit();
+                    }
+                    catch (Exception e)
+                    {
+                        log.Error("TransactionSynchronization.AfterCommit thew exception", e);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Roll back the given transaction, with regard to its status.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This implementation handles participating in existing transactions.
+        /// </p>
+        /// <p>
+        /// Delegates to
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoRollback"/>,
+        /// and
+        /// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager.DoSetRollbackOnly"/>.
+        /// </p>
+        /// <p>
+        /// If the transaction wasn't a new one, just set it rollback-only
+        /// to take part in the surrounding transaction properly.
+        /// </p>
+        /// </remarks>
+        /// <param name="transactionStatus">
+        /// ITransactionStatusObject returned by the
+        /// <see cref="Spring.Transaction.IPlatformTransactionManager.GetTransaction"/>() method.
+        /// </param>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In case of system errors.
+        /// </exception>
+        public void Rollback(ITransactionStatus transactionStatus)
+        {
+            if (transactionStatus.Completed)
+            {
+                throw new IllegalTransactionStateException(
+                    "Transaction is already completed - do not call commit or rollback more than once per transaction");
+            }
+            DefaultTransactionStatus defaultStatus = (DefaultTransactionStatus) transactionStatus;
+            ProcessRollback(defaultStatus);
+        }
+
+        private void ProcessRollback(DefaultTransactionStatus status)
+        {
+            try
+            {
+                try
+                {
+                    TriggerBeforeCompletion(status);
+                    if (status.HasSavepoint)
+                    {
+                        if (status.Debug)
+                        {
+                            log.Debug("Rolling back transaction to savepoint.");
+                        }
+                        status.RollbackToHeldSavepoint();
+                    }
+                    else if (status.IsNewTransaction)
+                    {
+                        if (status.Debug)
+                        {
+                            log.Debug("Initiating transaction rollback");
+                        }
+                        DoRollback(status);
+                    }
+                    else if (status.HasTransaction())
+                    {
+                        if (status.LocalRollbackOnly)
+                        {
+                            if(status.Debug)
+                            {
+                                log.Debug("Participating transaction failed - marking existing transaction as rollback-only");
+                            }
+                        }
+                        DoSetRollbackOnly(status);
+                    }
+                    else
+                    {
+                        log.Debug("Should roll back transaction but cannot - no transaction available.");
+                    }
+                }
+                catch (Exception)
+                {
+                    TriggerAfterCompletion(status, TransactionSynchronizationStatus.Unknown);
+                    throw;
+                }
+                TriggerAfterCompletion(status, TransactionSynchronizationStatus.Rolledback);
+            }
+            finally
+            {
+                CleanupAfterCompletion(status);
+            }
+        }
+
+        #endregion
+
+        #region Protected Method
+
+        private DefaultTransactionStatus NewTransactionStatus(ITransactionDefinition definition,
+                                              object transaction, bool newTransaction,
+                                              bool newSynchronization, bool debug,
+                                              object suspendedResources)
+        {
+            bool actualNewSynchronization = newSynchronization &&
+                                !TransactionSynchronizationManager.SynchronizationActive;
+            if (actualNewSynchronization)
+            {
+                TransactionSynchronizationManager.ActualTransactionActive = (transaction != null);
+                TransactionSynchronizationManager.CurrentTransactionIsolationLevel =
+                    definition.TransactionIsolationLevel;
+                TransactionSynchronizationManager.CurrentTransactionReadOnly = definition.ReadOnly;
+                TransactionSynchronizationManager.CurrentTransactionName = definition.Name;
+                TransactionSynchronizationManager.InitSynchronization();
+            }
+            return
+                new DefaultTransactionStatus(transaction, newTransaction, actualNewSynchronization, definition.ReadOnly, debug,
+                                             suspendedResources);
+        }
+
+        /// <summary>
+        /// Determines the timeout to use for the given definition.  Will fall back to this manager's default
+        /// timeout if the transaction definition doesn't specify a non-default value.
+        /// </summary>
+        /// <param name="definition">The transaction definition.</param>
+        /// <returns>the actual timeout to use.</returns>
+        protected int DetermineTimeout(ITransactionDefinition definition)
+        {
+            if (definition.TransactionTimeout != DefaultTransactionDefinition.TIMEOUT_DEFAULT)
+            {
+                return definition.TransactionTimeout;
+            }
+            return _defaultTimeout;
+        }
+
+        #endregion
+
+        #region Private Methods
+
+
+
+
+
+        /// <summary>
+        /// Suspend the given transaction. Suspends transaction synchronization first,
+        /// then delegates to the doSuspend template method.
+        /// </summary>
+        /// <param name="transaction">the current transaction object</param>
+        /// <returns>an object that holds suspended resources</returns>
+        private object Suspend(object transaction)
+        {
+            if (TransactionSynchronizationManager.SynchronizationActive)
+            {
+                IList suspendedSynchronizations = DoSuspendSynchronization();
+
+                try
+                {
+                    object suspendedResources = null;
+                    if (transaction != null)
+                    {
+                        suspendedResources = DoSuspend(transaction);
+                    }
+
+                    string name = TransactionSynchronizationManager.CurrentTransactionName;
+                    TransactionSynchronizationManager.CurrentTransactionName = null;
+                    bool readOnly = TransactionSynchronizationManager.CurrentTransactionReadOnly;
+                    TransactionSynchronizationManager.CurrentTransactionReadOnly = false;
+                    IsolationLevel isolationLevel = TransactionSynchronizationManager.CurrentTransactionIsolationLevel;
+                    TransactionSynchronizationManager.CurrentTransactionIsolationLevel = IsolationLevel.Unspecified;
+                    bool wasActive = TransactionSynchronizationManager.ActualTransactionActive;
+                    TransactionSynchronizationManager.ActualTransactionActive = false;
+
+
+                    return new SuspendedResourcesHolder(suspendedSynchronizations, suspendedResources,
+                        name, readOnly, isolationLevel, wasActive);
+
+                } catch (TransactionException)
+                {
+                    // DoSuspend failed - original transaction is still active
+                    DoResumeSynchronization(suspendedSynchronizations);
+                    throw;
+                }
+            }
+            else if (transaction != null)
+            {
+                // Transaction active but no synchronization active.
+                object suspendedResources = DoSuspend(transaction);
+                return new SuspendedResourcesHolder(suspendedResources);                
+            }
+            else
+            {
+                // Neither transaction nor synchronization active.
+                return null;
+            }
+
+        }
+
+        private IList DoSuspendSynchronization()
+        {
+            IList suspendedSynchronizations = TransactionSynchronizationManager.Synchronizations;
+            foreach (ITransactionSynchronization currentTxnSynchronization in suspendedSynchronizations)
+            {
+                currentTxnSynchronization.Suspend();
+            }
+            TransactionSynchronizationManager.ClearSynchronization();
+            return suspendedSynchronizations;
+        }
+
+        private void DoResumeSynchronization(IList suspendedSynchronizations)
+        {
+            TransactionSynchronizationManager.InitSynchronization();
+            foreach (ITransactionSynchronization currentTxnSynchronization in suspendedSynchronizations)
+            {
+                currentTxnSynchronization.Resume();
+                TransactionSynchronizationManager.RegisterSynchronization(currentTxnSynchronization);
+            }
+        }
+
+        /// <summary>
+        /// Resume the given transaction. Delegates to the doResume template method
+        /// first, then resuming transaction synchronization.
+        /// </summary>
+        /// <param name="transaction">the current transaction object</param>
+        /// <param name="suspendedResources"> the object that holds suspended resources, as returned by suspend</param>
+        private void Resume(object transaction, object suspendedResources)
+        {
+            SuspendedResourcesHolder resourcesHolder = (SuspendedResourcesHolder) suspendedResources;
+            if (resourcesHolder != null)
+            {
+                object suspendedResourcesObject = resourcesHolder.SuspendedResources;
+                if (suspendedResourcesObject != null)
+                {
+                    DoResume(transaction, suspendedResourcesObject);
+                }
+                IList suspendedSynchronizations = resourcesHolder.SuspendedSynchronizations;
+                if (suspendedSynchronizations != null)
+                {
+                    TransactionSynchronizationManager.ActualTransactionActive = resourcesHolder.WasActive;
+                    TransactionSynchronizationManager.CurrentTransactionIsolationLevel = resourcesHolder.IsolationLevel;
+                    TransactionSynchronizationManager.CurrentTransactionReadOnly = resourcesHolder.ReadOnly;
+                    TransactionSynchronizationManager.CurrentTransactionName = resourcesHolder.Name;
+                    DoResumeSynchronization(suspendedSynchronizations);
+                }
+                
+            }
+        }
+
+
+
+        /// <summary>
+        /// Invoke doRollback, handling rollback exceptions properly.
+        /// </summary>
+        /// <param name="status">object representing the transaction</param>
+        /// <param name="exception">the thrown application exception or error</param>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// in case of a rollback error
+        /// </exception>
+        private void DoRollbackOnCommitException(DefaultTransactionStatus status, Exception exception)
+        {
+            try
+            {
+                if (status.IsNewTransaction)
+                {
+                    if (status.Debug)
+                    {
+                        log.Debug("Initiating transaction rollback on commit exception.");
+                    }
+                    DoRollback(status);
+                }
+                else if (status.HasTransaction())
+                {
+                    if (status.Debug)
+                    {
+                        log.Debug("Marking existing transaction as rollback-only after commit exception", exception);
+                    }
+                    DoSetRollbackOnly(status);
+                }
+            }
+            catch (Exception)
+            {
+                //TODO investigate rollback behavior...
+                log.Error("Commit exception overridden by rollback exception", exception);
+                TriggerAfterCompletion(status, TransactionSynchronizationStatus.Unknown);
+                throw;
+            }
+            TriggerAfterCompletion(status, TransactionSynchronizationStatus.Rolledback);
+        }
+
+        /// <summary>
+        /// Trigger beforeCommit callback.
+        /// </summary>
+        /// <param name="status">object representing the transaction</param>
+        private void TriggerBeforeCommit(DefaultTransactionStatus status)
+        {
+            if (status.NewSynchronization)
+            {
+                IList synchronizations = TransactionSynchronizationManager.Synchronizations;
+                foreach (ITransactionSynchronization currentTxnSynchronization in synchronizations)
+                {
+                    currentTxnSynchronization.BeforeCommit(status.ReadOnly);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Trigger beforeCompletion callback.
+        /// </summary>
+        /// <param name="status">object representing the transaction</param>
+        private void TriggerBeforeCompletion(DefaultTransactionStatus status)
+        {
+            if (status.NewSynchronization)
+            {
+                if (status.Debug)
+                {
+                    log.Debug("Trigger BeforeCompletion Synchronization");
+                }
+                IList synchronizations = TransactionSynchronizationManager.Synchronizations;
+                foreach (ITransactionSynchronization synchronization in synchronizations)
+                {
+                    try
+                    {
+                        synchronization.BeforeCompletion();
+                    }
+                    catch (Exception e)
+                    {
+                        log.Error("TransactionSynchronization.BeforeCompletion threw exception", e);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Trigger afterCompletion callback, handling exceptions properly.
+        /// </summary>
+        /// <param name="status">object representing the transaction</param>
+        /// <param name="completionStatus">
+        /// Completion status according to <see cref="Spring.Transaction.Support.TransactionSynchronizationStatus"/>
+        /// </param>
+        private void TriggerAfterCompletion(DefaultTransactionStatus status, TransactionSynchronizationStatus completionStatus)
+        {
+            if (status.NewSynchronization)
+            {
+                IList synchronizations = TransactionSynchronizationManager.Synchronizations;
+                if (!status.HasTransaction() || status.IsNewTransaction)
+                {
+                    if (status.Debug)
+                    {
+                        log.Debug("Triggering afterCompletion synchronization");
+                    }
+                    InvokeAfterCompletion(synchronizations, completionStatus);
+                }
+                else
+                {
+                    //TODO investigate parallel of JTA/System.Txs
+                    log.Info("Transaction controlled outside of spring tx manager.");
+                }
+            }
+        }
+
+        private void InvokeAfterCompletion(IList synchronizations, TransactionSynchronizationStatus status)
+        {
+            foreach (ITransactionSynchronization synchronization in synchronizations)
+            {
+                try
+                {
+                    synchronization.AfterCompletion(status);
+                } catch (Exception e)
+                {
+                    log.Error("TransactionSynchronization.AfterCompletion threw exception", e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Clean up after completion, clearing synchronization if necessary,
+        /// and invoking doCleanupAfterCompletion.
+        /// </summary>
+        /// <param name="status">object representing the transaction</param>
+        private void CleanupAfterCompletion(DefaultTransactionStatus status)
+        {
+            status.Completed = true;
+            if (status.NewSynchronization)
+            {
+                TransactionSynchronizationManager.Clear();                
+            }
+            if (status.IsNewTransaction)
+            {
+                DoCleanupAfterCompletion(status.Transaction);
+            }
+            if (status.SuspendedResources != null)
+            {
+                if (status.Debug)
+                {
+                    log.Debug("Resuming suspended transaction");
+                }
+                Resume(status.Transaction, status.SuspendedResources);
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionDefinition.cs b/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionDefinition.cs
new file mode 100644
index 00000000..52dd0725
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionDefinition.cs
@@ -0,0 +1,289 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Data;
+using System.Text;
+
+namespace Spring.Transaction.Support
+{
+	/// <summary>
+	/// Default implementation of the <see cref="Spring.Transaction.ITransactionDefinition"/>
+	/// interface, offering object-style configuration and sensible default values.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Base class for both <see cref="System.SystemException"/> and
+	/// <see cref="Spring.Transaction.Interceptor.DefaultTransactionAttribute"/>.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: DefaultTransactionDefinition.cs,v 1.15 2007/12/07 08:10:03 markpollack Exp $</version>
+	[Serializable]
+	public class DefaultTransactionDefinition : ITransactionDefinition
+	{
+		/// <summary>
+		/// Prefix for Propagation settings.
+		/// </summary>
+		public static readonly string PROPAGATION_CONSTANT_PREFIX = "PROPAGATION";
+
+		/// <summary>
+		/// Prefix for IsolationLevel settings.
+		/// </summary>
+		public static readonly string ISOLATION_CONSTANT_PREFIX = "ISOLATION";
+
+		/// <summary>
+		/// Prefix for transaction timeout values in description strings.
+		/// </summary>
+		public static readonly string TIMEOUT_PREFIX = "timeout_";
+
+		/// <summary>
+		/// Marker for read-only transactions in description strings.
+		/// </summary>
+		public static readonly string READ_ONLY_MARKER = "readOnly";
+
+		/// <summary>
+		/// The default transaction timeout.
+		/// </summary>
+		public const int TIMEOUT_DEFAULT = -1;
+
+	    //TODO Refactoring to sync with Spring 2.0 for nt/enums for various default values.
+	    
+		private TransactionPropagation _transactionPropagation = TransactionPropagation.Required;
+		private IsolationLevel _transactionIsolationLevel = IsolationLevel.ReadCommitted;
+		private int _timeout = DefaultTransactionDefinition.TIMEOUT_DEFAULT;
+	    private bool _readOnly = false;
+        private string _name = null;
+#if NET_2_0
+	    private System.Transactions.EnterpriseServicesInteropOption _esInteropOption;
+
+#endif
+		
+		/// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Transaction.Support.DefaultTransactionDefinition"/> class.
+		/// </summary>
+		public DefaultTransactionDefinition() {}
+
+		/// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Transaction.Support.DefaultTransactionDefinition"/> class
+        /// with the supplied <see cref="Spring.Transaction.TransactionPropagation"/>
+        /// behaviour.
+		/// </summary>
+		/// <param name="transactionPropagation">
+		/// The desired <see cref="Spring.Transaction.TransactionPropagation"/> behavior.
+		/// </param>
+		public DefaultTransactionDefinition( TransactionPropagation transactionPropagation )
+		{
+			_transactionPropagation = transactionPropagation;
+		}
+
+		#region ITransactionDefinition Members
+
+        // TODO change method name to same as type returned (TransactionPropagation)
+
+
+
+		/// <summary>
+		/// Gets / Sets the <see cref="Spring.Transaction.TransactionPropagation">propagation</see>
+		/// behavior.
+		/// </summary>
+		public TransactionPropagation PropagationBehavior
+		{
+			get { return _transactionPropagation; }
+			set { _transactionPropagation = value; }
+		}
+
+
+        // TODO change method name to same as type returned (TransactionPropagation)
+
+        
+		/// <summary>
+		/// Return the isolation level of type <see cref="System.Data.IsolationLevel"/>.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Only makes sense in combination with
+		/// <see cref="Spring.Transaction.TransactionPropagation.Required"/> and
+		/// <see cref="Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+		/// </p>
+		/// <p>
+		/// Note that a transaction manager that does not support custom isolation levels
+		/// will throw an exception when given any other level than
+		/// <see cref="System.Data.IsolationLevel.Unspecified"/>.
+		/// </p>
+		/// </remarks>
+		public IsolationLevel TransactionIsolationLevel
+		{
+			get { return _transactionIsolationLevel; }
+			set { _transactionIsolationLevel = value; }
+		}
+
+		/// <summary>
+		/// Return the transaction timeout.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Must return a number of seconds, or -1.
+		/// Only makes sense in combination with
+		/// <see cref="Spring.Transaction.TransactionPropagation.Required"/> and
+		/// <see cref="Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+		/// Note that a transaction manager that does not support timeouts will
+		/// throw an exception when given any other timeout than -1.
+		/// </p>
+		/// </remarks>
+		public int TransactionTimeout
+		{
+			get { return _timeout; }
+			set 
+			{ 
+				if ( value < DefaultTransactionDefinition.TIMEOUT_DEFAULT ) 
+				{	
+					throw new ArgumentException( "Timeout must be a positive integer or DefaultTransactionDefinition.TIMEOUT_DEFAULT" );
+				}
+				_timeout = value;
+			}
+		}
+		
+		/// <summary>
+		/// Get whether to optimize as read-only transaction.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// This just serves as hint for the actual transaction subsystem,
+		/// it will <i>not necessarily</i> cause failure of write accesses.
+		/// </p>
+		/// <p>
+		/// Only makes sense in combination with
+		/// <see cref="Spring.Transaction.TransactionPropagation.Required"/> and
+		/// <see cref="Spring.Transaction.TransactionPropagation.RequiresNew"/>.
+		/// </p>
+		/// <p>
+		/// A transaction manager that cannot interpret the read-only hint
+		/// will <i>not</i> throw an exception when given <c>ReadOnly=true</c>.
+		/// </p>
+		/// </remarks>
+		public bool ReadOnly
+		{
+			get { return _readOnly; }
+			set { _readOnly = value; }
+		}
+
+        /// <summary>
+        /// Return the name of this transaction.  Can be null.
+        /// </summary>
+        /// <value></value>
+        /// <remarks>
+        /// This will be used as a transaction name to be shown in a
+        /// transaction monitor, if applicable.  In the case of Spring
+        /// declarative transactions, the exposed name will be the fully
+        /// qualified type name + "." method name + assembly (by default).
+        /// </remarks>
+	    public string Name
+	    {
+	        get { return _name; }
+            set { _name = value;}
+	    }
+
+#if NET_2_0
+        /// <summary>
+        /// Gets the enterprise services interop option.
+        /// </summary>
+        /// <value>The enterprise services interop option.</value>
+        public System.Transactions.EnterpriseServicesInteropOption EnterpriseServicesInteropOption
+        {
+            get { return _esInteropOption; }
+            set { _esInteropOption = value; }
+        }
+#endif
+
+	    #endregion
+
+		/// <summary>
+        /// An override of the default <see cref="System.Object.Equals(object)"/> method.
+		/// </summary>
+		/// <param name="obj">The <see cref="System.Object"/> to compare to.</param>
+		/// <returns>True if the objects are equal.</returns>
+		public override bool Equals(object obj)
+		{
+			return ( obj is ITransactionDefinition ) && ToString().Equals( obj.ToString() );
+		}
+
+		/// <summary>
+        /// An override of the default <see cref="System.Object.GetHashCode"/> method that returns the
+        /// hashcode of the
+        /// <see cref="Spring.Transaction.Support.DefaultTransactionDefinition.DefinitionDescription"/>
+        /// property.
+		/// </summary>
+		/// <returns>
+		/// The hashcode of the
+		/// <see cref="Spring.Transaction.Support.DefaultTransactionDefinition.DefinitionDescription"/>
+		/// property.
+        /// </returns>
+		public override int GetHashCode()
+		{
+			return ToString().GetHashCode();
+		}
+
+		/// <summary>
+		/// An override of the default <see cref="System.Object.ToString"/> method that returns a string
+		/// representation of the
+		/// <see cref="Spring.Transaction.Support.DefaultTransactionDefinition.DefinitionDescription"/>
+		/// property.
+		/// </summary>
+        /// <returns>
+        /// A string representation of the
+        /// <see cref="Spring.Transaction.Support.DefaultTransactionDefinition.DefinitionDescription"/>
+        /// property.
+        /// </returns>
+		public override string ToString()
+		{
+			return DefinitionDescription;
+		}
+
+		/// <summary>
+		/// Returns a <see cref="System.String"/> representation of the
+		/// <see cref="Spring.Transaction.Support.DefaultTransactionDefinition.DefinitionDescription"/>
+		/// property.
+		/// </summary>
+		protected string DefinitionDescription
+		{
+			get 
+			{ 
+				StringBuilder builder = new StringBuilder();
+				builder.Append( PROPAGATION_CONSTANT_PREFIX +"_" + PropagationBehavior );
+				builder.Append( "," );
+				builder.Append( ISOLATION_CONSTANT_PREFIX + "_" +TransactionIsolationLevel );
+				if ( TransactionTimeout != DefaultTransactionDefinition.TIMEOUT_DEFAULT ) 
+				{
+					builder.Append( ",timeout_" + _timeout );
+				}	
+				if ( ReadOnly ) 
+				{
+					builder.Append( ",readOnly" );
+				}
+				return builder.ToString();
+			}
+		}
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionStatus.cs b/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionStatus.cs
new file mode 100644
index 00000000..3f176273
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/DefaultTransactionStatus.cs
@@ -0,0 +1,328 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+
+namespace Spring.Transaction.Support
+{
+	/// <summary>
+	/// Default implementation of the <see cref="Spring.Transaction.ITransactionStatus"/> interface,
+	/// used by <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager"/>.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Holds all status information that
+	/// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager"/>
+	/// needs internally, including a generic transaction object determined by
+	/// the concrete transaction manager implementation.
+	/// </p>
+	/// <p>
+	/// Supports delegating savepoint-related methods to a transaction object
+	/// that implements the <see cref="Spring.Transaction.ISavepointManager"/> interface.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: DefaultTransactionStatus.cs,v 1.14 2007/12/06 06:23:33 markpollack Exp $</version>
+	public class DefaultTransactionStatus : ITransactionStatus
+	{
+		private object _transaction;
+        private bool _newTransaction;
+        private bool _newSynchronization;
+        private bool _readOnly;
+        private readonly bool _debug;
+		private object _suspendedResources;
+		
+	    private string _savepoint;
+		private bool _rollbackOnly;
+	    private bool _completed = false;
+
+	    /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Transaction.Support.DefaultTransactionStatus"/> class.
+        /// </summary>
+        /// <param name="transaction">The underlying transaction object that can hold state for the internal
+        /// transaction implementation.</param>
+        /// <param name="newTransaction">True if the transaction is new, else false if participating in an existing transaction.</param>
+        /// <param name="newSynchronization">True if a new transaction synchronization has been opened for the given
+        /// <paramref name="transaction"/>.</param>
+        /// <param name="readOnly">True if the transaction is read only.</param>
+        /// <param name="debug">if set to <c>true</c>, enable debug log in tx managers.</param>
+        /// <param name="suspendedResources">The suspended resources for the given <paramref name="transaction"/>.</param>
+		public DefaultTransactionStatus( object transaction, 
+											bool newTransaction, 
+											bool newSynchronization,
+											bool readOnly,
+                                            bool debug,
+											object suspendedResources)
+		{
+			_transaction = transaction;
+			_newTransaction = newTransaction;
+			_newSynchronization = newSynchronization;
+			_readOnly = readOnly;
+            _debug = debug;
+			_suspendedResources = suspendedResources;
+		}
+
+		#region Properties
+
+        /// <summary>
+        /// Gets a value indicating whether the progress of this transaction is debugged. 
+        /// This is used by AbstractPlatformTransactionManager as an optimization, to prevent repeated
+        /// calls to log.IsDebug. Not really intended for client code.</summary>
+        /// <value><c>true</c> if debug; otherwise, <c>false</c>.</value>
+	    public bool Debug
+	    {
+	        get { return _debug; }
+	    }
+
+	    /// <summary>
+		/// Returns the underlying transaction object.
+		/// </summary>
+		public object Transaction
+		{
+			get { return _transaction; }
+		}
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the Transaction is completed, that is commited or rolled back.
+        /// </summary>
+        /// <value><c>true</c> if completed; otherwise, <c>false</c>.</value>
+	    public bool Completed
+	    {
+	        get { return _completed; }
+	        set { _completed = value; }
+	    }
+
+	    /// <summary>
+		/// Returns true if the underlying transaction is read only.
+		/// </summary>
+		public bool ReadOnly
+		{
+			get { return _readOnly; }
+		}
+
+		/// <summary>
+		/// Flag indicating if a new transaction synchronization has been opened
+		/// for this transaction.
+		/// </summary>
+		public bool NewSynchronization
+		{
+			get { return _newSynchronization; }
+		}
+
+		/// <summary>
+		/// Returns suspended resources for this transaction.
+		/// </summary>
+		public object SuspendedResources
+		{
+			get { return _suspendedResources; }
+		}
+
+		/// <summary>
+		/// Gets and sets the savepoint for the current transaction, if any. 
+		/// </summary>
+		public string Savepoint
+		{
+			get { return _savepoint; }
+			set { _savepoint = value; }
+		}
+
+		/// <summary>
+		/// Returns a flag indicating if the transaction has a savepoint.
+		/// </summary>
+		public bool HasSavepoint
+		{
+			get { return ( _savepoint != null ); }
+		}
+
+        /// <summary>
+        /// Determines whether there is an actual transaction active.
+        /// </summary>
+        /// <returns>
+        /// 	<c>true</c> if there is an actual transaction active; otherwise, <c>false</c>.
+        /// </returns>
+	    public bool HasTransaction()
+	    {
+	        return Transaction != null;
+	    }
+
+		/// <summary>
+		/// Return the underlying transaction as a
+		/// <see cref="Spring.Transaction.ISavepointManager"/>, if possible.
+		/// </summary>
+		/// <exception cref="Spring.Transaction.NestedTransactionNotSupportedException">
+		/// If the underlying transaction does not support savepoints.
+		/// </exception>
+		protected ISavepointManager SavepointManager
+		{
+			get 
+			{ 
+				if ( ! IsTransactionSavepointManager ) 
+				{
+					throw new NestedTransactionNotSupportedException(
+						"Transaction object [" + Transaction + "] does not support savepoints.");
+				}	
+				return ( ISavepointManager) Transaction;
+			} 
+		}
+		/// <summary>
+		/// Return true if the underlying transaction implements the
+		/// <see cref="Spring.Transaction.ISavepointManager"/> interface.
+		/// </summary>
+		public bool IsTransactionSavepointManager
+		{
+			get { return ( Transaction is ISavepointManager ); }
+		}
+		#endregion
+
+		#region ITransactionStatus Members
+		/// <summary>
+		/// Returns <b>true</b> if the transaction is new, else <b>false</b> if participating
+		/// in an existing transaction.
+		/// </summary>
+		public bool IsNewTransaction
+		{
+			get
+			{
+				return ( HasTransaction() && _newTransaction );
+			}
+		}
+
+		/// <summary>
+		/// Determine the rollbackOnly flag via checking both this
+		/// <see cref="Spring.Transaction.ITransactionStatus"/>
+		/// and the transaction object, provided that the latter implements the
+		/// <see cref="Spring.Transaction.Support.ISmartTransactionObject"/> interface.
+		/// </summary>
+		/// <remarks>The property can only be set to true.</remarks>
+		public bool RollbackOnly
+		{
+			get { 
+				return ( LocalRollbackOnly || GlobalRollbackOnly); 
+			}
+            
+			set	{ if (value) {_rollbackOnly = value;} } 
+		}
+		#endregion
+
+
+        /// <summary>
+        /// Determine the rollback-only flag via checking this TransactionStatus.  Will only
+        /// return true if the application set the property RollbackOnly to true on this
+        /// TransactionStatus object.
+        /// </summary>
+        /// <value><c>true</c> if [local rollback only]; otherwise, <c>false</c>.</value>
+	    public bool LocalRollbackOnly
+	    {
+            get
+            {
+                return _rollbackOnly;
+            }
+        }
+
+	    public bool GlobalRollbackOnly
+	    {
+	        get
+	        {
+	            return ((_transaction is ISmartTransactionObject) &&
+	                    ((ISmartTransactionObject) _transaction).RollbackOnly);
+	        }
+	    }
+		#region ISavepointManager Members
+		/// <summary>
+		/// This implementation delegates to the underlying transaction object
+		/// (if it implements the <see cref="Spring.Transaction.ISavepointManager"/> interface)
+		/// to create a savepoint.
+		/// </summary>
+		/// <exception cref="Spring.Transaction.NestedTransactionNotSupportedException">
+		/// If the underlying transaction does not support savepoints.
+		/// </exception>
+		public void CreateSavepoint( string savepoint )
+		{
+			SavepointManager.CreateSavepoint( savepoint );
+		}
+
+		/// <summary>
+		/// This implementation delegates to the underlying transaction object
+		/// (if it implements the <see cref="Spring.Transaction.ISavepointManager"/> interface)
+		/// to rollback to the supplied <paramref name="savepoint"/>.
+		/// </summary>
+		/// <param name="savepoint">The savepoint to rollback to.</param>
+		public void RollbackToSavepoint( string savepoint )
+		{
+			SavepointManager.RollbackToSavepoint( savepoint );
+		}
+
+		/// <summary>
+		/// This implementation delegates to the underlying transaction object
+		/// (if it implements the <see cref="Spring.Transaction.ISavepointManager"/> interface)
+		/// to release the supplied <paramref name="savepoint"/>.
+		/// </summary>
+		/// <param name="savepoint">The savepoint to release.</param>
+		public void ReleaseSavepoint( string savepoint)
+		{
+			SavepointManager.ReleaseSavepoint( savepoint );
+		}
+
+		#endregion
+		/// <summary>
+		/// Create a savepoint and hold it for the transaction.
+		/// </summary>
+		/// <exception cref="Spring.Transaction.NestedTransactionNotSupportedException">
+		/// If the underlying transaction does not support savepoints.
+		/// </exception>
+		public void CreateAndHoldSavepoint( string savepoint ) 
+		{
+			SavepointManager.CreateSavepoint( savepoint );
+			Savepoint = savepoint;
+		}
+
+		/// <summary>
+		/// Roll back to the savepoint that is held for the transaction.
+		/// </summary>
+		/// <exception cref="Spring.Transaction.TransactionUsageException">
+		/// If no save point has been created.
+		/// </exception>
+		public void RollbackToHeldSavepoint() 
+		{
+			if ( ! HasSavepoint ) 
+			{
+				throw new TransactionUsageException( "No savepoint associated with current transaction" );
+			}
+			SavepointManager.RollbackToSavepoint( Savepoint );
+		}
+
+		/// <summary>
+		/// Release the savepoint that is held for the transaction.
+		/// </summary>
+		/// <exception cref="Spring.Transaction.TransactionUsageException">
+		/// If no save point has been created.
+		/// </exception>
+		public void ReleaseHeldSavepoint() 
+		{
+			if ( ! HasSavepoint ) 
+			{
+				throw new TransactionUsageException( "No savepoint associated with current transaction" );
+			}
+			SavepointManager.ReleaseSavepoint( Savepoint );
+		}
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Support/ISmartTransactionObject.cs b/src/Spring/Spring.Data/Transaction/Support/ISmartTransactionObject.cs
new file mode 100644
index 00000000..34b1b659
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/ISmartTransactionObject.cs
@@ -0,0 +1,51 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Transaction.Support
+{
+	/// <summary>
+	/// Interface to be implemented by transaction objects that are able to
+	/// return an internal rollback-only marker, typically from a another
+	/// transaction that has participated and marked it as rollback-only.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Autodetected by <see cref="Spring.Transaction.Support.DefaultTransactionStatus"/>,
+	/// to always return a current rollbackOnly flag even if not resulting from the current
+	/// <see cref="Spring.Transaction.ITransactionStatus"/>.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <version>$Id: ISmartTransactionObject.cs,v 1.6 2007/08/29 03:42:20 markpollack Exp $</version>
+	public interface ISmartTransactionObject
+	{
+	    /// <summary>
+	    /// Return whether the transaction is internally marked as rollback-only.
+	    /// </summary>
+	    /// <returns>True of the transaction is marked as rollback-only.</returns>
+        bool RollbackOnly
+        { 
+            get;
+        }
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Support/ITransactionCallback.cs b/src/Spring/Spring.Data/Transaction/Support/ITransactionCallback.cs
new file mode 100644
index 00000000..1e889632
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/ITransactionCallback.cs
@@ -0,0 +1,50 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+
+namespace Spring.Transaction.Support
+{
+    /// <summary>
+    /// Callback interface for transactional code. 
+    /// </summary>
+    /// <remarks>
+    /// <p>To be used with <see cref="Spring.Transaction.Support.TransactionTemplate"/>'s Execute
+    /// methods.
+    /// </p>
+    /// <p>
+    /// Typically used to gather various calls to transaction-unaware low-level
+    /// services into a higher-level method implementation with transaction
+    /// demarcation.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ITransactionCallback.cs,v 1.4 2007/08/01 23:32:39 markpollack Exp $</version>
+    public interface ITransactionCallback 
+    {
+        /// <summary>
+        /// Gets called by TransactionTemplate.Execute within a 
+        /// transaction context.
+        /// </summary>
+        /// <param name="status">The associated transaction status.</param>
+        /// <returns>A result object or <c>null</c>.</returns>
+        object DoInTransaction(ITransactionStatus status);
+    }
+}
diff --git a/src/Spring/Spring.Data/Transaction/Support/ITransactionOperations.cs b/src/Spring/Spring.Data/Transaction/Support/ITransactionOperations.cs
new file mode 100644
index 00000000..a606c762
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/ITransactionOperations.cs
@@ -0,0 +1,65 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+namespace Spring.Transaction.Support
+{
+    /// <summary>
+    /// Interface specifying basic transaction exectuion operations.
+    /// </summary>
+    /// <remarks>
+    /// Implemented by <see cref="TransactionTemplate"/>.  Not often used directly,
+    /// but a useful option to enhance testability, as it can easily be mocked or stubbed.
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollac (.NET)</author>
+    /// <version>$Id: ITransactionOperations.cs,v 1.1 2007/08/01 18:53:14 markpollack Exp $</version>
+    public interface ITransactionOperations
+    {
+        /// <summary>
+        /// Executes the the action specified by the given delegate callback within a transaction.
+        /// </summary>
+        /// <remarks>Allows for returning a result object created within the transaction, that is,
+        /// a domain object or a collection of domain objects.  An exception thrown by the callback
+        /// is treated as a fatal exception that enforces a rollback.  Such an exception gets
+        /// propagated to the caller of the template.
+        /// </remarks>
+        /// <param name="transactionMethod">The delegate that specifies the transactional action.</param>
+        /// <returns>A result object returned by the callback, or <code>null</code> if one</returns>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In case of initialization or system errors.
+        /// </exception>
+        object Execute(TransactionDelegate transactionMethod);
+
+        /// <summary>
+        /// Executes the action specified by the given callback object within a transaction.
+        /// </summary>
+        /// <remarks>Allows for returning a result object created within the transaction, that is,
+        /// a domain object or a collection of domain objects.  An exception thrown by the callback
+        /// is treated as a fatal exception that enforces a rollback.  Such an exception gets
+        /// propagated to the caller of the template.
+        /// </remarks>
+        /// <param name="action">The callback object that specifies the transactional action.</param>
+        /// <returns>A result object returned by the callback, or <code>null</code> if one</returns>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In case of initialization or system errors.
+        /// </exception>
+        object Execute(ITransactionCallback action);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/Support/ITransactionSynchronization.cs b/src/Spring/Spring.Data/Transaction/Support/ITransactionSynchronization.cs
new file mode 100644
index 00000000..94f11b8b
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/ITransactionSynchronization.cs
@@ -0,0 +1,130 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Transaction.Support
+{
+	/// <summary>
+	/// Interface for transaction synchronization callbacks.
+	/// </summary>
+	/// <remarks>
+	/// Supported by <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager"/>.
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: ITransactionSynchronization.cs,v 1.7 2006/11/24 05:57:46 markpollack Exp $</version>
+	public interface ITransactionSynchronization
+	{
+        /// <summary>
+        /// Suspend this synchronization. 
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Supposed to unbind resources from
+        /// <see cref="Spring.Transaction.Support.TransactionSynchronizationManager"/>
+        /// if managing any.
+        /// </p>
+        /// </remarks>
+		void Suspend();
+
+        /// <summary>
+        /// Resume this synchronization.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Supposed to rebind resources from
+        /// <see cref="Spring.Transaction.Support.TransactionSynchronizationManager"/>
+        /// if managing any.
+        /// </p>
+        /// </remarks>
+		void Resume();
+
+        /// <summary>
+        /// Invoked before transaction commit (before
+        /// <see cref="Spring.Transaction.Support.ITransactionSynchronization.BeforeCompletion"/>)
+        /// Can e.g. flush transactional O/R Mapping sessions to the database
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This callback does not mean that the transaction will actually be
+        /// commited.  A rollback decision can still occur after this method
+        /// has been called.  This callback is rather meant to perform work 
+        /// that's only relevant if a commit still has a chance
+        /// to happen, such as flushing SQL statements to the database.
+        /// </para>
+        /// <para>
+        /// Note that exceptions will get propagated to the commit caller and cause a
+        /// rollback of the transaction.</para>
+        /// <para>
+        /// (note: do not throw TransactionException subclasses here!)
+        /// </para>
+        /// </remarks>
+        /// <param name="readOnly">
+        /// If the transaction is defined as a read-only transaction.
+        /// </param>
+		void BeforeCommit( bool readOnly );
+
+        /// <summary>
+        /// Invoked after transaction commit.
+        /// </summary>
+        /// <remarks>Can e.g. commit further operations that are supposed to follow on
+        /// a successful commit of the main transaction.
+        /// Throws exception in case of errors; will be propagated to the caller.
+        /// Note: To not throw TransactionExeption sbuclasses here!
+        /// </remarks>
+        /// 
+        void AfterCommit();
+	    
+        /// <summary>
+        /// Invoked before transaction commit/rollback (after
+        /// <see cref="Spring.Transaction.Support.ITransactionSynchronization.BeforeCommit"/>,
+        /// even if
+        /// <see cref="Spring.Transaction.Support.ITransactionSynchronization.BeforeCommit"/>
+        /// threw an exception).
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Can e.g. perform resource cleanup.
+        /// </p>
+        /// <p>
+        /// Note that exceptions will get propagated to the commit caller
+        /// and cause a rollback of the transaction.
+        /// </p>
+        /// </remarks>
+		void BeforeCompletion();
+
+        /// <summary>
+        /// Invoked after transaction commit/rollback.
+        /// </summary>
+        /// <param name="status">
+        /// Status according to <see cref="Spring.Transaction.Support.TransactionSynchronizationStatus"/>
+        /// </param>
+        /// <remarks>
+        /// Can e.g. perform resource cleanup, in this case after transaction completion.
+        /// <p>
+        /// Note that exceptions will get propagated to the commit or rollback
+        /// caller, although they will not influence the outcome of the transaction.
+        /// </p>
+        /// </remarks>
+		void AfterCompletion( TransactionSynchronizationStatus status );
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Support/ResourceHolderSupport.cs b/src/Spring/Spring.Data/Transaction/Support/ResourceHolderSupport.cs
new file mode 100644
index 00000000..0a4bf827
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/ResourceHolderSupport.cs
@@ -0,0 +1,199 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Transaction.Support
+{
+	/// <summary>
+	/// Convenient base class for resource holders.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Features rollback-only support transactions. Can expire after a certain number of
+	/// seconds or milliseconds, to determine transactional timeouts.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: ResourceHolderSupport.cs,v 1.9 2007/01/30 20:12:29 markpollack Exp $</version>
+	public abstract class ResourceHolderSupport
+	{
+		private bool synchronizedWithTransaction = false;
+		private bool rollbackOnly = false;
+		private DateTime deadline;
+        private int referenceCount = 0;
+		
+		/// <summary>
+		/// Mark the resource as synchronized with a transaction.
+		/// </summary>
+		public bool SynchronizedWithTransaction
+		{
+			get { return synchronizedWithTransaction; }
+			set { synchronizedWithTransaction = value; }
+		}
+
+        /// <summary>
+        /// Get or set whether the resource is synchronized with a transaction.
+        /// </summary>
+        /// <value><c>true</c> if synchronized; otherwise, <c>false</c>.</value>
+		public bool RollbackOnly
+		{
+			get { return rollbackOnly; }
+            set { rollbackOnly = value;}
+		}
+
+		/// <summary>
+		/// Return the expiration deadline of this object.
+		/// </summary>
+		public DateTime Deadline
+		{
+			get { return deadline; }
+		}
+
+		/// <summary>
+		/// Return whether this object has an associated timeout.
+		/// </summary>
+		public bool HasTimeout
+		{
+			get { return ( deadline != DateTime.MinValue ); }	
+		}
+
+		/// <summary>
+		/// Return the time to live for this object in seconds.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Rounds up eagerly, e.g. '9.00001' to '10'.
+		/// </p>
+		/// </remarks>
+		/// <exception cref="System.ArgumentException">
+		/// If no deadline has been set.
+		/// </exception>
+		public int TimeToLiveInSeconds
+		{
+			get
+			{
+			    int secs = (int)Math.Ceiling( TimeToLiveInMilliseconds / 1000 );
+                checkTransactionTimeout(secs <= 0);
+                return secs;
+			}
+		}
+
+		/// <summary>
+		/// Return the time to live for this object in milliseconds.
+		/// </summary>
+		/// <exception cref="System.ArgumentException">
+		/// If no deadline has been set.
+		/// </exception>
+		public double TimeToLiveInMilliseconds
+		{
+			get
+			{
+				if ( deadline == DateTime.MinValue )
+				{
+					throw new ArgumentException( "No deadline specified for this resource holder.");
+				}
+                TimeSpan duration = deadline - DateTime.Now;
+                checkTransactionTimeout(duration.TotalMilliseconds <= 0);
+			    if (duration.TotalMilliseconds > 0)
+			    {
+                    return duration.TotalMilliseconds;
+			    }
+			    else
+			    {
+                    return 0;
+			    }
+			}
+		}
+
+        /// <summary>
+        /// Sets the timeout for this object in milliseconds.
+        /// </summary>
+        /// <value>Number of milliseconds until expiration.</value>
+        public long TimeoutInMillis
+        {
+            set
+            {
+                deadline = DateTime.Now.AddMilliseconds(value);
+            }
+        }
+
+        /// <summary>
+        /// Sets the timeout for this object in seconds.
+        /// </summary>
+        /// <value>Number of seconds until expiration.</value>
+        public int TimeoutInSeconds
+        {
+            set
+            {
+                TimeoutInMillis = value * 1000;
+            }
+        }
+
+        private void checkTransactionTimeout(bool deadlineReached)
+        {
+            if (deadlineReached)
+            {
+                RollbackOnly = true;
+                throw new TransactionTimedOutException("Transaction timed out: deadline was " + Deadline);
+            }
+        }
+
+
+		/// <summary>
+		/// Clear the transaction state of this resource holder.
+		/// </summary>
+		public virtual void Clear()
+		{
+		    synchronizedWithTransaction = false;
+		    rollbackOnly = false;
+		    deadline = DateTime.MinValue;
+		}
+
+        /// <summary>
+        /// Increase the reference count by one because the holder has been requested.
+        /// </summary>
+        public void Requested()
+        {
+            referenceCount++;
+        }
+
+        /// <summary>
+        /// Decrease the reference count by one because the holder has been released.
+        /// </summary>
+        public void Released()
+        {
+            referenceCount--;
+        }
+
+        /// <summary>
+        /// Return wheterh there are still open references to this holder
+        /// </summary>
+        public bool IsOpen
+        {
+            get
+            {
+                return (referenceCount > 0);
+            }
+        }
+       
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionCallbackWithoutResult.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionCallbackWithoutResult.cs
new file mode 100644
index 00000000..3c3304cc
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/TransactionCallbackWithoutResult.cs
@@ -0,0 +1,75 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Transaction.Support
+{
+	/// <summary>
+	/// Simple convenience class for TransactionCallback implementation.
+	/// Allows for implementing a DoInTransaction version without result,
+	/// i.e. without the need for a return statement.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TransactionCallbackWithoutResult.cs,v 1.3 2006/06/21 14:07:30 markpollack Exp $</version>
+	public abstract class TransactionCallbackWithoutResult : ITransactionCallback
+	{
+		#region Methods
+
+        /// <summary>
+        /// Gets called by TransactionTemplate.execute within a transactional context
+        /// when no return value is required.
+        /// </summary>
+        /// <param name="status">The status.</param>
+        /// <remarks>
+        /// Does not need to care about transactions itself, although it can retrieve
+        /// and influence the status of the current transaction via the given status
+        /// object, e.g. setting rollback-only.
+        /// A RuntimeException thrown by the callback is treated as application
+        /// exception that enforces a rollback. An exception gets propagated to the
+        /// caller of the template.
+        /// </remarks>
+        public abstract void DoInTransactionWithoutResult(ITransactionStatus status);
+
+	    #endregion
+
+        #region ITransactionCallback Members
+
+        /// <summary>
+        /// Gets called by TransactionTemplate.Execute within a
+        /// transaction context.
+        /// </summary>
+        /// <param name="status">The associated transaction status.</param>
+        /// <returns>a result object or <c>null</c></returns>
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            DoInTransactionWithoutResult(status);
+            return null;
+        }
+
+
+
+	    #endregion
+    }
+}
diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionDelegate.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionDelegate.cs
new file mode 100644
index 00000000..964ee795
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/TransactionDelegate.cs
@@ -0,0 +1,42 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+namespace Spring.Transaction.Support
+{
+
+    /// <summary>
+    /// Callback delegate for performing actions within a transactional context.
+    /// </summary>
+    /// <remarks>
+    /// <p>To be used with <see cref="TransactionTemplate"/>'s Execute
+    /// methods.
+    /// </p>
+    /// <p>
+    /// Typically used to gather various calls to transaction-unaware low-level
+    /// services into a higher-level method implementation with transaction
+    /// demarcation.
+    /// </p>
+    /// </remarks>
+    /// <param name="status">The status of the transaction, can be used to
+    /// trigger a rollback the current transaction by settings its
+    /// RollbackOnly property to true.</param>
+    /// <returns>A result object or <c>null</c>.</returns>
+    public delegate object TransactionDelegate(ITransactionStatus status);
+}
diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationAdapter.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationAdapter.cs
new file mode 100644
index 00000000..590994d2
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationAdapter.cs
@@ -0,0 +1,146 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Transaction.Support
+{
+	/// <summary>
+	/// Adapter for the <see cref="Spring.Transaction.Support.ITransactionSynchronization"/>
+	/// interface.
+	/// </summary>
+	/// <remarks>
+	/// Contains empty implementations of all interface methods, for easy overriding of
+	/// single methods.
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: TransactionSynchronizationAdapter.cs,v 1.7 2006/12/06 00:02:25 markpollack Exp $</version>
+	public abstract class TransactionSynchronizationAdapter : ITransactionSynchronization, IComparable
+	{
+
+
+		#region ITransactionSynchronization Members
+		/// <summary>
+		/// Suspend this synchronization. 
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Supposed to unbind resources from
+		/// <see cref="Spring.Transaction.Support.TransactionSynchronizationManager"/>
+		/// if managing any.
+		/// </p>
+		/// </remarks>
+		public virtual void Suspend() {}
+
+		/// <summary>
+		/// Resume this synchronization.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Supposed to unbind resources from
+        /// <see cref="Spring.Transaction.Support.TransactionSynchronizationManager"/>
+        /// if managing any.
+        /// </p>
+        /// </remarks>
+		public virtual void Resume() {}
+
+		/// <summary>
+		/// Invoked before transaction commit (before
+		/// <see cref="Spring.Transaction.Support.ITransactionSynchronization.BeforeCompletion"/>)
+		/// </summary>
+		/// <param name="readOnly">
+		/// If the transaction is defined as a read-only transaction.
+		/// </param>
+		/// <remarks>
+		/// <p>
+		/// Can flush transactional sessions to the database.
+		/// </p>
+		/// <p>
+		/// Note that exceptions will get propagated to the commit caller and 
+		/// cause a rollback of the transaction.
+		/// </p>
+		/// </remarks>
+		public virtual void BeforeCommit( bool readOnly ) {}
+
+
+        /// <summary>
+        /// Invoked after transaction commit.
+        /// </summary>
+        /// <remarks>Can e.g. commit further operations that are supposed to follow on
+        /// a successful commit of the main transaction.
+        /// Throws exception in case of errors; will be propagated to the caller.
+        /// Note: To not throw TransactionExeption sbuclasses here!
+        /// </remarks>
+	    public virtual void AfterCommit()
+	    {
+	    }
+	    
+		/// <summary>
+		/// Invoked before transaction commit/rollback (after
+		/// <see cref="Spring.Transaction.Support.ITransactionSynchronization.BeforeCommit"/>,
+		/// even if
+		/// <see cref="Spring.Transaction.Support.ITransactionSynchronization.BeforeCommit"/>
+		/// threw an exception).
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Can e.g. perform resource cleanup.
+		/// </p>
+		/// <p>
+		/// Note that exceptions will get propagated to the commit caller
+		/// and cause a rollback of the transaction.
+		/// </p>
+		/// </remarks>
+		public virtual void BeforeCompletion() {}
+
+		/// <summary>
+		/// Invoked after transaction commit/rollback.
+		/// </summary>
+		/// <param name="status">
+		/// Status according to <see cref="Spring.Transaction.Support.TransactionSynchronizationStatus"/>
+		/// </param>
+		/// <remarks>
+		/// Can e.g. perform resource cleanup, in this case after transaction completion.
+		/// <p>
+		/// Note that exceptions will get propagated to the commit or rollback
+		/// caller, although they will not influence the outcome of the transaction.
+		/// </p>
+		/// </remarks>
+		public virtual void AfterCompletion( TransactionSynchronizationStatus status ) {}
+		#endregion
+
+	    ///<summary>
+	    ///Compares the current instance with another object of the same type.
+	    ///</summary>
+	    ///
+	    ///<returns>
+	    ///A 32-bit signed integer that indicates the relative order of the objects being compared. The return value has these meanings: Value Meaning Less than zero This instance is less than obj. Zero This instance is equal to obj. Greater than zero This instance is greater than obj. 
+	    ///</returns>
+	    ///
+	    ///<param name="obj">An object to compare with this instance. </param>
+	    ///<exception cref="T:System.ArgumentException">obj is not the same type as this instance. </exception><filterpriority>2</filterpriority>
+	    public virtual int CompareTo(object obj)
+	    {
+            return Int32.MinValue;
+	    }
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationManager.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationManager.cs
new file mode 100644
index 00000000..65ad218b
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationManager.cs
@@ -0,0 +1,491 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Data;
+using System.Globalization;
+using System.Threading;
+using Spring.Core;
+using Spring.Threading;
+using Spring.Util;
+
+namespace Spring.Transaction.Support
+{
+	/// <summary>
+	/// Internal class that manages resources and transaction synchronizations per thread.
+	/// </summary>
+	/// <remarks>
+	/// Supports one resource per key without overwriting, i.e. a resource needs to
+	/// be removed before a new one can be set for the same key.
+	/// Supports a list of transaction synchronizations if synchronization is active.
+	/// <p>
+	/// Resource management code should check for thread-bound resources via GetResource().
+	/// It is normally not supposed
+	/// to bind resources to threads, as this is the responsiblity of transaction managers.
+	/// A further option is to lazily bind on first use if transaction synchronization
+	/// is active, for performing transactions that span an arbitrary number of resources.
+	/// </p>
+	/// <p>
+	/// Transaction synchronization must be activated and deactivated by a transaction
+	/// manager via
+	/// <see cref="Spring.Transaction.Support.TransactionSynchronizationManager.InitSynchronization">InitSynchronization</see>
+	/// and
+	/// <see cref="Spring.Transaction.Support.TransactionSynchronizationManager.ClearSynchronization">ClearSynchronization</see>.
+	/// This is automatically supported by
+	/// <see cref="Spring.Transaction.Support.AbstractPlatformTransactionManager"/>.
+	/// </p>
+	/// <p>
+	/// Resource management code should only register synchronizations when this
+	/// manager is active, and perform resource cleanup immediately else.
+	/// If transaction synchronization isn't active, there is either no current
+	/// transaction, or the transaction manager doesn't support synchronizations.
+	/// </p>
+	/// Note that this class uses following naming convention for the 
+	/// named 'data slots' for storage of thread local data, 'Spring.Transaction:Name'
+	/// where Name is either 
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: TransactionSynchronizationManager.cs,v 1.19 2008/02/17 13:17:13 markpollack Exp $</version>
+	public sealed class TransactionSynchronizationManager
+	{
+	    #region Logging
+
+	    private static readonly Common.Logging.ILog LOG = Common.Logging.LogManager.GetLogger(typeof (TransactionSynchronizationManager));
+
+	    #endregion
+
+        #region Fields 
+        private static readonly string syncsDataSlotName = "Spring.Transactions:syncList";
+	    
+        private static readonly string resourcesDataSlotName = "Spring.Transactions:resources";
+
+        private static readonly string currentTxReadOnlyDataSlotName = "Spring.Transactions:currentTxReadOnly";
+
+	    private static readonly string currentTxNameDataSlotName = "Spring.Transactions:currentTxName";
+
+        private static readonly string currentTxIsolationLevelDataSlotName = "Spring.Transactions:currentTxIsolationLevel";
+
+        private static readonly string actualTxActiveDataSlotName = "Spring.Transactions:actualTxActive";
+
+	    private static IComparer syncComparer = new OrderComparator();
+
+        #endregion
+
+        #region Management of transaction-associated resource handles
+        /// <summary>
+        /// Return all resources that are bound to the current thread.
+        /// </summary>
+        /// <remarks>Main for debugging purposes.  Resource manager should always
+        /// invoke HasResource for a specific resource key that they are interested in.
+        /// </remarks>
+        /// <returns>IDictionary with resource keys and resource objects or empty 
+        /// dictionary if none is bound.</returns>
+        public static IDictionary ResourceDictionary
+        {
+            get
+            {
+                IDictionary resources = LogicalThreadContext.GetData(resourcesDataSlotName) as IDictionary;
+                if (resources != null)
+                {
+                    //TODO add readonly wrapper in Spring.Collections.
+                    return resources;
+                }
+                else
+                {
+                    return new Hashtable();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Check if there is a resource for the given key bound to the current thread.
+        /// </summary>
+        /// <param name="key">key to check</param>
+        /// <returns>if there is a value bound to the current thread</returns>
+        public static bool HasResource(Object key)
+        {
+            AssertUtils.ArgumentNotNull(key, "Key must not be null");
+            return ResourceDictionary.Contains(key);
+        }
+
+        /// <summary>
+        /// Retrieve a resource for the given key that is bound to the current thread.
+        /// </summary>
+        /// <param name="key">key to check</param>
+        /// <returns>a value bound to the current thread, or null if none.</returns>
+        public static object GetResource(Object key)
+        {
+            AssertUtils.ArgumentNotNull(key, "Key must not be null");
+            IDictionary resources = LogicalThreadContext.GetData(resourcesDataSlotName) as IDictionary;
+            if (resources == null)
+            {
+                return null;
+            }
+            //Check for contains since indexer returning null behavior changes in 2.0
+            if (!resources.Contains(key))
+            {
+                return null;
+            }
+            object val = resources[key];
+            
+            if (val != null && LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Retrieved value [" + Describe(val) + "] for key [" + Describe(key) + "] bound to thread [" +
+                    SystemUtils.ThreadId + "]");
+            }
+            return val;
+        }
+
+        /// <summary>
+        /// Bind the given resource for teh given key to the current thread
+        /// </summary>
+        /// <param name="key">key to bind the value to</param>
+        /// <param name="value">value to bind</param>
+        public static void BindResource(Object key, Object value)
+        {
+            AssertUtils.ArgumentNotNull(key, "Key value for thread local storage of transactional resources must not be null");
+            AssertUtils.ArgumentNotNull(value, "Transactional resource to bind to thread local storage must not be null" );
+
+            IDictionary resources = LogicalThreadContext.GetData(resourcesDataSlotName) as IDictionary;
+            //Set thread local resource storage if not found
+            if (resources == null)
+            {
+                resources = new Hashtable();
+                LogicalThreadContext.SetData(resourcesDataSlotName, resources);
+            }
+            if (resources.Contains(key))
+            {
+                throw new InvalidOperationException("Already value [" + resources[key] + "] for key [" + key +
+                        "] bound to thread [" + SystemUtils.ThreadId + "]");
+            }
+            resources.Add(key, value);
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Bound value [" + Describe(value) + "] for key [" + Describe(key) + "] to thread [" +
+                    SystemUtils.ThreadId + "]");
+            }
+        }
+
+
+        /// <summary>
+        /// Unbind a resource for the given key from the current thread
+        /// </summary>
+        /// <param name="key">key to check</param>
+        /// <returns>the previously bound value</returns>
+        /// <exception cref="InvalidOperationException">if there is no value bound to the thread</exception>
+        public static object UnbindResource(Object key)
+        {
+            AssertUtils.ArgumentNotNull(key, "Key must not be null");
+
+            IDictionary resources = LogicalThreadContext.GetData(resourcesDataSlotName) as IDictionary;
+            if (resources == null || !resources.Contains(key))
+            {
+                throw new InvalidOperationException("No value for key [" + key +  "] bound to thread [" +
+                    SystemUtils.ThreadId + "]");
+            }
+            Object val = resources[key];
+            resources.Remove(key);
+            if (resources.Count == 0)
+            {
+                LogicalThreadContext.FreeNamedDataSlot(resourcesDataSlotName);
+            }
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Removed value [" + Describe(val) + "] for key [" + Describe(key) + "] from thread [" +
+                    SystemUtils.ThreadId + "]");
+            }
+            return val;
+        }
+
+        #endregion
+
+	    /// <summary>
+		/// Activate transaction synchronization for the current thread.
+		/// </summary>
+		/// <remarks>
+		/// Called by transaction manager at the beginning of a transaction.
+		/// </remarks>
+		/// <exception cref="System.InvalidOperationException">
+		/// If synchronization is already active.
+		/// </exception>
+		public static void InitSynchronization() 
+		{
+			if ( SynchronizationActive ) 
+			{
+				throw new InvalidOperationException( "Cannot activate transaction synchronization - already active" );
+			}
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Initializing transaction synchronization");
+            }
+            ArrayList syncs = new ArrayList();
+            LogicalThreadContext.SetData(syncsDataSlotName, syncs);
+		}
+
+		/// <summary>
+		/// Deactivate transaction synchronization for the current thread.
+		/// </summary>
+		/// <remarks>
+		/// Called by transaction manager on transaction cleanup.
+		/// </remarks>
+		/// <exception cref="System.InvalidOperationException">
+		/// If synchronization is not active.
+		/// </exception>
+		public static void ClearSynchronization() 
+		{
+			if ( !SynchronizationActive ) 
+			{
+				throw new InvalidOperationException( "Cannot deactivate transaction synchronization - not active" );
+			}
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug("Clearing transaction synchronization");
+            }
+            LogicalThreadContext.FreeNamedDataSlot(syncsDataSlotName);
+		}
+
+        /// <summary>
+        /// Clears the entire transaction synchronization state for the current thread, registered
+        /// synchronizations as well as the various transaction characteristics.
+        /// </summary>
+        public static void Clear()
+        {
+            ClearSynchronization();
+            CurrentTransactionName = null;
+            CurrentTransactionReadOnly = false;
+            CurrentTransactionIsolationLevel = IsolationLevel.Unspecified;
+            ActualTransactionActive = false;
+        }
+
+		/// <summary>
+		/// Register a new transaction synchronization for the current thread.
+		/// </summary>
+		/// <remarks>
+		/// Typically called by resource management code.
+		/// </remarks>
+		/// <exception cref="System.InvalidOperationException">
+		/// If synchronization is not active.
+		/// </exception>
+		public static void RegisterSynchronization( ITransactionSynchronization synchronization ) 
+		{
+            AssertUtils.ArgumentNotNull(synchronization, "TransactionSynchronization must not be null");
+			if ( !SynchronizationActive ) 
+			{
+				throw new InvalidOperationException( "Transaction synchronization is not active" );
+			}
+            ArrayList syncs = LogicalThreadContext.GetData(syncsDataSlotName) as ArrayList;
+            if (syncs != null)
+            {
+                object root = syncs.SyncRoot;
+                lock (root)
+                {
+                    syncs.Add(synchronization);
+                }
+            }
+        }
+
+        private static string Describe(object obj)
+        {
+            return obj == null ? "" : obj + "@" + obj.GetHashCode().ToString("X");
+        }
+
+	    #region Properties
+
+	    /// <summary>
+	    /// Return an unmodifiable list of all registered synchronizations
+	    /// for the current thread.
+	    /// </summary>
+	    /// <returns>
+	    /// A list of <see cref="Spring.Transaction.Support.ITransactionSynchronization"/>
+	    /// instances.
+	    /// </returns>
+	    /// <exception cref="System.InvalidOperationException">
+	    /// If synchronization is not active.
+	    /// </exception>
+	    public static IList Synchronizations
+	    {
+	        get 
+	        {
+	            if ( ! SynchronizationActive ) 
+	            {
+	                throw new InvalidOperationException( "Transaction synchronization is not active" );
+	            }
+	            ArrayList syncs = LogicalThreadContext.GetData(syncsDataSlotName) as ArrayList;
+	            if (syncs != null)
+	            {
+	                // Sort lazily here, not in registerSynchronization.
+	                object root = syncs.SyncRoot;
+	                lock (root)
+	                {
+	                    syncs.Sort(syncComparer);
+	                }
+	                // Return unmodifiable snapshot, to avoid exceptions
+	                // while iterating and invoking synchronization callbacks that in turn
+	                // might register further synchronizations.
+	                return ArrayList.ReadOnly(syncs);
+	            }
+	            else
+	            {
+	                return ArrayList.ReadOnly(new ArrayList());
+	            }
+	        }
+	    }
+
+	    /// <summary>
+		/// Return if transaction synchronization is active for the current thread.
+		/// </summary>
+		/// <remarks>
+		/// Can be called before
+		/// <see cref="Spring.Transaction.Support.TransactionSynchronizationManager.RegisterSynchronization">InitSynchronization</see>
+		/// to avoid unnecessary instance creation.
+		/// </remarks>
+		public static bool SynchronizationActive
+		{
+			get
+			{
+                IList syncs = LogicalThreadContext.GetData(syncsDataSlotName) as IList;
+                return syncs != null;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the 
+        /// current transaction is read only.
+        /// </summary>
+        /// <remarks> 
+        /// Called by transaction manager on transaction begin and on cleanup.
+        /// Return whether the current transaction is marked as read-only.
+        /// To be called by resource management code when preparing a newly
+        /// created resource (for example, a Hibernate Session).
+        /// <p>Note that transaction synchronizations receive the read-only flag
+        /// as argument for the <code>beforeCommit</code> callback, to be able
+        /// to suppress change detection on commit. The present method is meant
+        /// to be used for earlier read-only checks, for example to set the
+        /// flush mode of a Hibernate Session to FlushMode.Never upfront.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// 	<c>true</c> if current transaction read only; otherwise, <c>false</c>.
+        /// </value>
+        public static bool CurrentTransactionReadOnly
+        {
+            get
+            {
+                return LogicalThreadContext.GetData(currentTxReadOnlyDataSlotName) != null;
+            }
+            set
+            {
+                if (value)
+                {
+                    LogicalThreadContext.SetData(currentTxReadOnlyDataSlotName, true); 
+                }
+                else
+                {
+                    LogicalThreadContext.FreeNamedDataSlot(currentTxReadOnlyDataSlotName);
+                }
+                               
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the current transaction, if any.
+        /// </summary>
+        /// <remarks>Called by the transaction manager on transaction begin and on cleanup.
+        /// To be called by resource management code for optimizations per use case, for
+        /// example to optimize fetch strategies for specific named transactions.</remarks>
+        /// <value>The name of the current transactio or null if none set.</value>
+        public static string CurrentTransactionName
+        {
+            get
+            {
+                return LogicalThreadContext.GetData(currentTxNameDataSlotName) as string;
+            }
+            set
+            {
+                LogicalThreadContext.SetData(currentTxNameDataSlotName, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether there currently is an actual transaction
+        /// active.
+        /// </summary>
+        /// <remarks>This indicates wheter the current thread is associated with an actual
+        /// transaction rather than just with active transaction synchronization.
+        /// <para>Called by the transaction manager on transaction begin and on cleanup.</para>
+        /// <para>To be called by resource management code that wants to discriminate between
+        /// active transaction synchronization (with or without backing resource transaction;
+        /// also on PROPAGATION_SUPPORTS) and an actual transaction being active; on 
+        /// PROPAGATION_REQUIRES, PROPAGATION_REQUIRES_NEW, etC)</para></remarks>
+        /// <value>
+        /// 	<c>true</c> if [actual transaction active]; otherwise, <c>false</c>.
+        /// </value>
+	    public static bool ActualTransactionActive
+	    {
+	        get
+	        {                
+	            return LogicalThreadContext.GetData(actualTxActiveDataSlotName) != null;
+	        }
+            set
+            {
+                if (value)
+                {
+                    LogicalThreadContext.SetData(actualTxActiveDataSlotName, value);
+                }
+                else
+                {
+                    LogicalThreadContext.FreeNamedDataSlot(actualTxActiveDataSlotName);
+                }
+            }
+	    }
+
+
+        /// <summary>
+        /// Gets or sets the current transaction isolation level, if any.
+        /// </summary>
+        /// <remarks>Called by the transaction manager on transaction begin and on cleanup.</remarks>
+        /// <value>The current transaction isolation level.  If no current transaction is 
+        /// active, retrun IsolationLevel.Unspecified</value>
+        public static IsolationLevel CurrentTransactionIsolationLevel
+        {
+            get
+            {
+                object data =
+                    LogicalThreadContext.GetData(currentTxIsolationLevelDataSlotName);
+                if (data != null)
+                {
+                    return (IsolationLevel) data;
+                }
+                else
+                {
+                    return IsolationLevel.Unspecified;
+                }
+            }
+            set
+            {
+                LogicalThreadContext.SetData(currentTxIsolationLevelDataSlotName, value);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationState.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationState.cs
new file mode 100644
index 00000000..29cc83ae
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationState.cs
@@ -0,0 +1,50 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Transaction.Support
+{
+	/// <summary>
+	/// Enumeration containing the state of transaction synchronization.
+    /// </summary>
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <version>$Id: TransactionSynchronizationState.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	public enum TransactionSynchronizationState
+	{
+		/// <summary>
+		/// Always activate transaction synchronization, even for "empty" transactions
+		/// that result from <see cref="Spring.Transaction.TransactionPropagation"/>.
+		/// </summary>
+		/// <seealso cref="Spring.Transaction.TransactionPropagation.Supports"/> with no existing backend transaction.
+		Always,
+		/// <summary>
+		/// Activate transaction synchronization only for actual transactions,
+		/// i.e. not for empty ones that result from <see cref="Spring.Transaction.TransactionPropagation"/>.
+		/// </summary>
+        /// <seealso cref="Spring.Transaction.TransactionPropagation.Supports"/> with no
+        /// existing backend transaction.
+		OnActualTransaction,
+		/// <summary>
+		/// Never active transaction synchronization.
+		/// </summary>
+		Never
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationStatus.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationStatus.cs
new file mode 100644
index 00000000..7a0e3570
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationStatus.cs
@@ -0,0 +1,45 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Transaction.Support
+{
+	/// <summary>
+	/// Enumeration of status values when synchronizing transactions.
+	/// </summary>
+	/// <author>Griffin Caprio</author>
+	/// <version>$Id: TransactionSynchronizationStatus.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	public enum TransactionSynchronizationStatus
+	{
+		/// <summary>
+		/// Completion status in case of proper commit.
+		/// </summary>
+		Committed,
+		/// <summary>
+		/// Completion status in case of proper rollback.
+		/// </summary>
+		Rolledback,
+		/// <summary>
+		/// Completion status in case of heuristic mixed completion or system error.
+		/// </summary>
+		Unknown,
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionTemplate.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionTemplate.cs
new file mode 100644
index 00000000..b5971b87
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/Support/TransactionTemplate.cs
@@ -0,0 +1,218 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 Common.Logging;
+using Spring.Objects.Factory;
+
+namespace Spring.Transaction.Support
+{
+    /// <summary>
+    /// Helper class that simplifies programmatic transaction demarcation and
+    /// transaction exception handling.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// The central methods are
+    /// <see cref="Spring.Transaction.Support.TransactionTemplate.Execute(ITransactionCallback)"/>
+    /// and <see cref="Spring.Transaction.Support.TransactionTemplate.Execute(TransactionDelegate)"/>
+    /// supporting transactional code wrapped in the delegate instance. It handles the
+    /// transaction lifecycle and possible exceptions such that neither the delegate
+    /// implementation nor the calling code needs to explicitly handle transactions.
+    /// </p>
+    /// <p>
+    /// Can be used within a service implementation via direct instantiation with
+    /// a transaction manager reference, or get prepared in an application context
+    /// and given to services as object reference.
+    /// </p>
+    /// <note>
+    /// The transaction manager should always be configured as an object in the application
+    /// context, in the first case given to the service directly, in the second case to the
+    /// prepared template.
+    /// </note>
+    /// <p>
+    /// Supports setting the propagation behavior and the isolation level by name,
+    /// for convenient configuration in context definitions.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author> 
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <version>$Id: TransactionTemplate.cs,v 1.13 2007/08/01 18:53:14 markpollack Exp $</version>
+    public class TransactionTemplate : DefaultTransactionDefinition, ITransactionOperations, IInitializingObject
+    {
+        private IPlatformTransactionManager _platformTransactionManager;
+
+        #region Logging Definition
+
+        protected readonly ILog log = LogManager.GetLogger(typeof(TransactionTemplate));
+
+        #endregion
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Transaction.Support.TransactionTemplate"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Mainly targeted at configuration by an object factory.
+        /// </p>
+        /// <note>
+        /// The
+        /// <see cref="Spring.Transaction.Support.TransactionTemplate.PlatformTransactionManager"/>
+        /// property must be set before any calls to the
+        /// <see cref="Spring.Transaction.Support.TransactionTemplate.Execute(ITransactionCallback)"/>
+        /// or <see cref="Spring.Transaction.Support.TransactionTemplate.Execute(TransactionDelegate)"/>
+        /// method.
+        /// </note>
+        /// </remarks>
+        /// <seealso cref="Spring.Transaction.IPlatformTransactionManager"/>
+        public TransactionTemplate() {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Transaction.Support.TransactionTemplate"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Mainly targeted at configuration by an object factory.
+        /// </p>
+        /// </remarks>
+        /// <param name="platformTransactionManager">
+        /// The transaction management strategy to be used.
+        /// </param>
+        public TransactionTemplate( IPlatformTransactionManager platformTransactionManager ) 
+        {
+            _platformTransactionManager = platformTransactionManager;
+        }
+
+        /// <summary>
+        /// Gets and sets the <see cref="Spring.Transaction.IPlatformTransactionManager"/> to
+        /// be used.
+        /// </summary>
+        public IPlatformTransactionManager PlatformTransactionManager
+        {
+            get { return _platformTransactionManager; }
+            set { _platformTransactionManager = value; }
+        }
+
+        #region IInitializingObject Members
+        /// <summary>
+        /// Ensures that the
+        /// <see cref="Spring.Transaction.Support.TransactionTemplate.PlatformTransactionManager"/>
+        /// has been set.
+        /// </summary>
+        public void AfterPropertiesSet()
+        {
+            if ( _platformTransactionManager == null ) 
+            {
+                throw new ArgumentException( "IPlatformTransactionManager instance is required." );
+            }
+        }
+        #endregion
+
+
+        /// <summary>
+        /// Executes the the action specified by the given delegate callback within a transaction.
+        /// </summary>
+        /// <param name="transactionMethod">The delegate that specifies the transactional action.</param>
+        /// <returns>
+        /// A result object returned by the callback, or <code>null</code> if one
+        /// </returns>
+        /// <remarks>Allows for returning a result object created within the transaction, that is,
+        /// a domain object or a collection of domain objects.  An exception thrown by the callback
+        /// is treated as a fatal exception that enforces a rollback.  Such an exception gets
+        /// propagated to the caller of the template.
+        /// </remarks>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In case of initialization or system errors.
+        /// </exception>
+        public object Execute( TransactionDelegate transactionMethod ) 
+        {
+            ITransactionStatus status = _platformTransactionManager.GetTransaction( this );
+            object result;
+            try
+            {
+                result = transactionMethod( status );
+            } 
+            catch ( Exception ex )
+            {
+                rollbackOnException( status, ex );
+                throw;
+            }
+            _platformTransactionManager.Commit( status );
+            return result;
+        }
+
+
+        /// <summary>
+        /// Executes the action specified by the given callback object within a transaction.
+        /// </summary>
+        /// <param name="action">The callback object that specifies the transactional action.</param>
+        /// <returns>
+        /// A result object returned by the callback, or <code>null</code> if one
+        /// </returns>
+        /// <remarks>Allows for returning a result object created within the transaction, that is,
+        /// a domain object or a collection of domain objects.  An exception thrown by the callback
+        /// is treated as a fatal exception that enforces a rollback.  Such an exception gets
+        /// propagated to the caller of the template.
+        /// </remarks>
+        /// <exception cref="Spring.Transaction.TransactionException">
+        /// In case of initialization or system errors.
+        /// </exception>
+        public object Execute(ITransactionCallback action)
+        {
+            ITransactionStatus status = _platformTransactionManager.GetTransaction( this );
+            object result;
+            try
+            {
+                result = action.DoInTransaction(status);
+            } 
+            catch ( Exception ex )
+            {
+                rollbackOnException( status, ex );
+                throw;
+            }
+            _platformTransactionManager.Commit( status );
+            return result;
+        }
+
+        /// <summary>
+        /// Perform a rollback, handling rollback exceptions properly.
+        /// </summary>
+        /// <param name="status">The object representing the transaction.</param>
+        /// <param name="exception">The thrown application exception or error.</param>
+        private void rollbackOnException( ITransactionStatus status, Exception exception )
+        {
+            if (log.IsDebugEnabled)
+            {
+                log.Debug("Initiating transaction rollback on application exception", exception);
+            }
+            try
+            {
+                _platformTransactionManager.Rollback( status );
+            }
+            catch ( Exception ex )
+            {
+                log.Error("Application exception overridden by rollback exception", ex);
+                throw;
+            }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Data/Transaction/TransactionException.cs b/src/Spring/Spring.Data/Transaction/TransactionException.cs
new file mode 100644
index 00000000..9db40a8f
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/TransactionException.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Runtime.Serialization;
+
+namespace Spring.Transaction
+{
+    /// <summary>
+    /// Base class for all transaction exceptions.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <version>$Id: TransactionException.cs,v 1.7 2006/05/18 21:37:51 markpollack Exp $</version>
+    [Serializable]
+    public abstract class TransactionException : ApplicationException
+    {
+        /// <summary>
+        /// Creates a new instance of the TransactionException class.
+        /// </summary>
+        protected TransactionException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the TransactionException class, with the specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        protected TransactionException (string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the TransactionException class with the specified message
+        /// and root cause.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        protected TransactionException (string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the TransactionException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected TransactionException (
+            SerializationInfo info, StreamingContext context)
+            : base (info, context)
+        {
+        }
+    }
+}
diff --git a/src/Spring/Spring.Data/Transaction/TransactionOutcomeState.cs b/src/Spring/Spring.Data/Transaction/TransactionOutcomeState.cs
new file mode 100644
index 00000000..d25bcafc
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/TransactionOutcomeState.cs
@@ -0,0 +1,37 @@
+#region License
+
+#endregion
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Transaction
+{
+	/// <summary>
+	/// Represents a transaction's current state.
+	/// </summary>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: TransactionOutcomeState.cs,v 1.4 2006/05/18 21:37:51 markpollack Exp $</version>
+	public enum TransactionOutcomeState
+	{
+		/// <summary>
+		/// The transaction state is unknown.
+		/// </summary>
+		Unknown,
+		/// <summary>
+		/// The transaction has been committed.
+		/// </summary>
+		Committed,
+		/// <summary>
+		/// The transaction has been rolled back.
+		/// </summary>
+		Rolledback,
+		/// <summary>
+		/// The transaction is in an unknown, mixed state.
+		/// </summary>
+		Mixed
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/TransactionPropagation.cs b/src/Spring/Spring.Data/Transaction/TransactionPropagation.cs
new file mode 100644
index 00000000..bcb3fe6b
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/TransactionPropagation.cs
@@ -0,0 +1,103 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+namespace Spring.Transaction
+{
+    /// <summary>
+    /// Enumeration describing <a href="http://www.springframework.net/">Spring.NET's</a>
+    /// transaction propagation settings.
+    /// </summary>
+    /// <author>Griffin Caprio (.NET)</author>
+    /// <version>$Id: TransactionPropagation.cs,v 1.7 2007/05/29 20:00:33 markpollack Exp $</version>
+    public enum TransactionPropagation
+    {
+        /// <summary>
+        /// Support a current transaction, create a new one if none exists.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Analogous to System.EnterpriseServices.TransactionOption value of the same name.
+        /// This is typically the default setting of a transaction definition.
+        /// </p>
+        /// </remarks>
+        Required,
+
+        /// <summary>
+        /// Support a current transaction, execute non-transactionally if none exists.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Analogous to System.EnterpriseServices.TransactionOption.Supported.
+        /// </p>
+        /// </remarks>
+        Supports,
+
+        /// <summary>
+        /// Support a current transaction, throw an exception if none exists.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// No corresponding System.EnterpriseServices.TransactionOption value.
+        /// </p>
+        /// </remarks>
+        Mandatory,
+
+        /// <summary>
+        /// Create a new transaction, suspending the current transaction if one exists.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Analogous to System.EnterpriseServices.TransactionOption value of the same name.
+        /// </p>
+        /// </remarks>
+        RequiresNew,
+
+        /// <summary>
+        /// Execute non-transactionally, suspending the current transaction if one exists.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Analogous to System.EnterpriseServices.TransactionOption value of the same name.
+        /// </p>
+        /// </remarks>
+        NotSupported,
+
+        /// <summary>
+        /// Execute non-transactionally, throw an exception if a transaction exists.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Analogous to System.EnterpriseServices.TransactionOption.Disabled.
+        /// </p>
+        /// </remarks>
+        Never,
+
+		/// <summary>
+		/// Execute within a nested transaction if a current transaction exists, else
+		/// behave like <see cref="Spring.Transaction.TransactionPropagation.Required"/>. 
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// There is no analogous feature in TransactionOption.
+		/// </p>
+		/// </remarks>
+		Nested
+    }
+}
diff --git a/src/Spring/Spring.Data/Transaction/TransactionSuspensionNotSupportedException.cs b/src/Spring/Spring.Data/Transaction/TransactionSuspensionNotSupportedException.cs
new file mode 100644
index 00000000..33a6ca98
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/TransactionSuspensionNotSupportedException.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Runtime.Serialization;
+
+namespace Spring.Transaction
+{
+	/// <summary>
+	/// Exception thrown when attempting to suspend an existing transaction
+	/// but transaction suspension is not supported by the underlying backend.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: TransactionSuspensionNotSupportedException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	[Serializable]
+	public class TransactionSuspensionNotSupportedException : CannotCreateTransactionException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.TransactionSuspensionNotSupportedException"/> class.
+		/// </summary>
+		public TransactionSuspensionNotSupportedException( ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.TransactionSuspensionNotSupportedException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public TransactionSuspensionNotSupportedException( String message ) : base(message) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.TransactionSuspensionNotSupportedException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public TransactionSuspensionNotSupportedException(string message, Exception rootCause)
+			: base(message, rootCause) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.TransactionSuspensionNotSupportedException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected TransactionSuspensionNotSupportedException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/TransactionSystemException.cs b/src/Spring/Spring.Data/Transaction/TransactionSystemException.cs
new file mode 100644
index 00000000..31642283
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/TransactionSystemException.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Runtime.Serialization;
+
+namespace Spring.Transaction
+{
+	/// <summary>
+	/// Exception thrown when a general transaction system error is encountered,
+	/// for instance on commit or rollback.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: TransactionSystemException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	[Serializable]
+	public class TransactionSystemException : TransactionException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.TransactionSystemException"/> class.
+		/// </summary>
+		public TransactionSystemException( ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.TransactionSystemException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public TransactionSystemException( String message ) : base(message) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.TransactionSystemException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public TransactionSystemException(string message, Exception rootCause)
+			: base(message, rootCause) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.TransactionSystemException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected TransactionSystemException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/TransactionTimedOutException.cs b/src/Spring/Spring.Data/Transaction/TransactionTimedOutException.cs
new file mode 100644
index 00000000..65d3603f
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/TransactionTimedOutException.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Spring.Transaction
+{
+	/// <summary>
+	/// Exception to be thrown when a transaction has timed out.
+	/// </summary>
+    [Serializable]
+	public class TransactionTimedOutException : TransactionException
+	{
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public TransactionTimedOutException() : base()
+        {
+            
+        }
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Transaction.TransactionTimedOutException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public TransactionTimedOutException( String message ) : base(message) {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Transaction.TransactionTimedOutException"/> class.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public TransactionTimedOutException(string message, Exception rootCause)
+            : base(message, rootCause) {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Transaction.TransactionTimedOutException"/> class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected TransactionTimedOutException(
+            SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
diff --git a/src/Spring/Spring.Data/Transaction/TransactionUsageException.cs b/src/Spring/Spring.Data/Transaction/TransactionUsageException.cs
new file mode 100644
index 00000000..faf62557
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/TransactionUsageException.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Runtime.Serialization;
+
+namespace Spring.Transaction
+{
+	/// <summary> 
+	/// Superclass for exceptions caused by inappropriate usage of 
+	/// a <a href="http://www.springframework.net/">Spring.NET</a> transaction API.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: TransactionUsageException.cs,v 1.6 2006/05/18 21:37:51 markpollack Exp $</version>
+	[Serializable]
+	public class TransactionUsageException : TransactionException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.TransactionUsageException"/> class.
+		/// </summary>
+		public TransactionUsageException( ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.TransactionUsageException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public TransactionUsageException( String message ) : base(message) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.TransactionUsageException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public TransactionUsageException(string message, Exception rootCause)
+			: base(message, rootCause) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.TransactionUsageException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected TransactionUsageException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Data/Transaction/UnexpectedRollbackException.cs b/src/Spring/Spring.Data/Transaction/UnexpectedRollbackException.cs
new file mode 100644
index 00000000..7de89163
--- /dev/null
+++ b/src/Spring/Spring.Data/Transaction/UnexpectedRollbackException.cs
@@ -0,0 +1,78 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Runtime.Serialization;
+
+namespace Spring.Transaction
+{
+	/// <summary>
+	/// Thrown when an attempt to commit a transaction resulted in an unexpected rollback.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Griffin Caprio (.NET)</author>
+	/// <version>$Id: UnexpectedRollbackException.cs,v 1.5 2006/05/18 21:37:51 markpollack Exp $</version>
+	[Serializable]
+	public class UnexpectedRollbackException : TransactionException
+	{
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.UnexpectedRollbackException"/> class.
+		/// </summary>
+		public UnexpectedRollbackException( ) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.UnexpectedRollbackException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		public UnexpectedRollbackException( String message ) : base(message) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.UnexpectedRollbackException"/> class.
+		/// </summary>
+		/// <param name="message">
+		/// A message about the exception.
+		/// </param>
+		/// <param name="rootCause">
+		/// The root exception that is being wrapped.
+		/// </param>
+		public UnexpectedRollbackException(string message, Exception rootCause)
+			: base(message, rootCause) {}
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Transaction.UnexpectedRollbackException"/> class.
+		/// </summary>
+		/// <param name="info">
+		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+		/// that holds the serialized object data about the exception being thrown.
+		/// </param>
+		/// <param name="context">
+		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+		/// that contains contextual information about the source or destination.
+		/// </param>
+		protected UnexpectedRollbackException(
+			SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Messaging.Nms/Context/ILifecycle.cs b/src/Spring/Spring.Messaging.Nms/Context/ILifecycle.cs
new file mode 100644
index 00000000..a939cee0
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Context/ILifecycle.cs
@@ -0,0 +1,15 @@
+
+namespace Spring.Context
+{
+    interface ILifecycle
+    {
+        void Start();
+
+        void Stop();
+
+        bool IsRunning
+        {
+            get;
+        }
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs
new file mode 100644
index 00000000..95d923e5
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs
@@ -0,0 +1,315 @@
+#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 Spring.Transaction.Support;
+using Spring.Util;
+using NMS;
+
+namespace Spring.Messaging.Nms.IConnections
+{
+    /// <summary> Helper class for obtaining transactional NMS resources
+    /// for a given IConnectionFactory.
+    ///
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    public abstract class ConnectionFactoryUtils
+    {
+        
+
+        /// <summary> Obtain a NMS ISession that is synchronized with the current transaction, if any.</summary>
+        /// <param name="cf">the IConnectionFactory to obtain a ISession for
+        /// </param>
+        /// <param name="existingCon">the existing NMS IConnection to obtain a ISession for
+        /// (may be <code>null</code>)
+        /// </param>
+        /// <param name="acknowledgementMode">whether to allow for a local NMS transaction
+        /// that is synchronized with a Spring-managed transaction (where the main transaction
+        /// might be a JDBC-based one for a specific DataSource, for example), with the NMS
+        /// transaction committing right after the main transaction. If not allowed, the given
+        /// IConnectionFactory needs to handle transaction enlistment underneath the covers.
+        /// </param>
+        /// <returns> the transactional ISession, or <code>null</code> if none found
+        /// </returns>
+        /// <throws>  NMSException in case of NMS failure </throws>
+        public static ISession GetTransactionalSession(IConnectionFactory cf, IConnection existingCon,  bool synchedLocalTransactionAllowed)
+        {
+
+            return DoGetTransactionalSession(cf, new AnonymousClassResourceFactory(existingCon, cf, synchedLocalTransactionAllowed));
+        }
+
+        /// <summary> Obtain a NMS ISession that is synchronized with the current transaction, if any.</summary>
+        /// <param name="resourceKey">the TransactionSynchronizationManager key to bind to
+        /// (usually the IConnectionFactory)
+        /// </param>
+        /// <param name="resourceFactory">the ResourceFactory to use for extracting or creating
+        /// NMS resources
+        /// </param>
+        /// <returns> the transactional ISession, or <code>null</code> if none found
+        /// </returns>
+        /// <throws>NMSException in case of NMS failure </throws>
+        public static ISession DoGetTransactionalSession(System.Object resourceKey, ConnectionFactoryUtils.ResourceFactory resourceFactory)
+        {
+
+            AssertUtils.ArgumentNotNull(resourceKey, "Resource key must not be null");
+            AssertUtils.ArgumentNotNull(resourceKey, "ResourceFactory must not be null");
+
+            NmsResourceHolder resourceHolder = (NmsResourceHolder)TransactionSynchronizationManager.GetResource(resourceKey);
+            if (resourceHolder != null)
+            {
+                ISession rssession = resourceFactory.GetSession(resourceHolder);
+                if (rssession != null || resourceHolder.Frozen)
+                {
+                    return rssession;
+                }
+            }
+            if (!TransactionSynchronizationManager.SynchronizationActive)
+            {
+                return null;
+            }
+            NmsResourceHolder conHolderToUse = resourceHolder;
+            if (conHolderToUse == null)
+            {
+                conHolderToUse = new NmsResourceHolder();
+            }
+            NMS.IConnection con = resourceFactory.GetConnection(conHolderToUse);
+            ISession session = null;
+            try
+            {
+                bool isExistingCon = (con != null);
+                if (!isExistingCon)
+                {
+                    con = resourceFactory.CreateConnection();
+                    conHolderToUse.AddConnection(con);
+                }
+                session = resourceFactory.CreateSession(con);
+                conHolderToUse.AddSession(session, con);
+                if (!isExistingCon)
+                {
+                    con.Start();
+                }
+            }
+            catch (NMSException)
+            {
+                if (session != null)
+                {
+                    try
+                    {
+                        session.Close();
+                    }
+                    catch (System.Exception)
+                    {
+                        // ignore
+                    }
+                }
+                if (con != null)
+                {
+                    try
+                    {
+                        con.Close();
+                    }
+                    catch (System.Exception)
+                    {
+                        // ignore
+                    }
+                }
+                throw;
+            }
+            if (conHolderToUse != resourceHolder)
+            {
+                TransactionSynchronizationManager.RegisterSynchronization(new NmsResourceSynchronization(resourceKey, conHolderToUse, resourceFactory.AcknowledgementMode));
+                conHolderToUse.SynchronizedWithTransaction = true;
+                TransactionSynchronizationManager.BindResource(resourceKey, conHolderToUse);
+            }
+            return session;
+        }
+		
+		
+
+
+        #region ResourceFactory helper classes
+
+        private class AnonymousClassResourceFactory : ConnectionFactoryUtils.ResourceFactory
+        {
+            private IConnection existingCon;
+            private IConnectionFactory cf;
+            private bool synchedLocalTransactionAllowed;
+
+            public AnonymousClassResourceFactory(NMS.IConnection existingCon, IConnectionFactory cf, bool synchedLocalTransactionAllowed)
+            {
+                InitBlock(existingCon, cf, synchedLocalTransactionAllowed);
+            }
+
+            private void InitBlock(NMS.IConnection existingCon, IConnectionFactory cf, bool synchedLocalTransactionAllowed)
+            {
+                this.existingCon = existingCon;
+                this.cf = cf;
+                this.synchedLocalTransactionAllowed = synchedLocalTransactionAllowed;
+            }
+			
+            public virtual ISession GetSession(NmsResourceHolder holder)
+            {
+               return holder.GetSession(typeof(ISession), existingCon);
+            }
+            
+            public virtual NMS.IConnection GetConnection(NmsResourceHolder holder)
+            {
+               return (existingCon != null ? existingCon : holder.GetConnection());
+            }
+			
+            public virtual NMS.IConnection CreateConnection()
+            {
+                return cf.CreateConnection();
+            }
+            
+            public virtual ISession CreateSession(NMS.IConnection con)
+            {
+                return con.CreateSession(synchedLocalTransactionAllowed);
+            }
+        }
+        #endregion
+
+        #region Helper classes/interfaces
+
+        /// <summary> Callback interface for resource creation.
+        /// Serving as argument for the <code>DoGetTransactionalSession</code> method.
+        /// </summary>
+        public interface ResourceFactory
+        {
+
+            /// <summary> Fetch an appropriate ISession from the given NmsResourceHolder.</summary>
+            /// <param name="holder">the NmsResourceHolder
+            /// </param>
+            /// <returns> an appropriate ISession fetched from the holder,
+            /// or <code>null</code> if none found
+            /// </returns>
+            ISession GetSession(NmsResourceHolder holder);
+
+            /// <summary> Fetch an appropriate IConnection from the given NmsResourceHolder.</summary>
+            /// <param name="holder">the NmsResourceHolder
+            /// </param>
+            /// <returns> an appropriate IConnection fetched from the holder,
+            /// or <code>null</code> if none found
+            /// </returns>
+            IConnection GetConnection(NmsResourceHolder holder);
+
+            /// <summary> Create a new NMS IConnection for registration with a NmsResourceHolder.</summary>
+            /// <returns> the new NMS IConnection
+            /// </returns>
+            /// <throws>NMSException if thrown by NMS API methods </throws>
+            IConnection CreateConnection();
+
+            /// <summary> Create a new NMS ISession for registration with a NmsResourceHolder.</summary>
+            /// <param name="con">the NMS IConnection to create a ISession for
+            /// </param>
+            /// <returns> the new NMS ISession
+            /// </returns>
+            /// <throws>NMSException if thrown by NMS API methods </throws>
+            ISession CreateSession(NMS.IConnection con);
+
+
+            /// <summary>
+            /// Return whether to allow for a local NMS transaction that is synchronized with
+            /// a Spring-managed transaction (where the main transaction might be a ADO.NET-based
+            /// one for a specific IDbProvider, for example), with the NMS transaction
+            /// committing right after the main transaction.
+            /// Returns whether to allow for synchronizing a local NMS transaction
+            /// </summary>
+            /// 
+            bool SynchedLocalTransactionAllowed
+            { 
+                get;
+            }
+        }
+
+        /// <summary> Callback for resource cleanup at the end of a non-native NMS transaction
+        /// </summary>
+        private class NmsResourceSynchronization : TransactionSynchronizationAdapter
+        {
+
+            private object resourceKey;
+
+            private NmsResourceHolder resourceHolder;
+
+            private AcknowledgementMode acknowledgementMode;
+
+            private bool holderActive = true;
+
+            public NmsResourceSynchronization(object resourceKey, NmsResourceHolder resourceHolder, AcknowledgementMode acknowledgementMode)
+            {
+                this.resourceKey = resourceKey;
+                this.resourceHolder = resourceHolder;
+                this.acknowledgementMode = acknowledgementMode;
+            }
+
+            public override void Suspend()
+            {
+                if (this.holderActive)
+                {
+                    TransactionSynchronizationManager.UnbindResource(resourceKey);
+                }
+            }
+
+            public override void Resume()
+            {
+                if (this.holderActive)
+                {
+                    TransactionSynchronizationManager.BindResource(resourceKey, resourceHolder);
+                }
+            }
+
+            public override void BeforeCompletion()
+            {
+                TransactionSynchronizationManager.UnbindResource(this.resourceKey);
+                this.holderActive = false;
+                if (this.acknowledgementMode != AcknowledgementMode.Transactional)
+                {
+                    this.resourceHolder.CloseAll();
+                }
+            }
+
+            //TODO bring in new Spring.Data library to Integration project which has this method in interface.
+            public override void AfterCommit()
+            {
+                if (this.acknowledgementMode == AcknowledgementMode.Transactional)
+                {
+                    try
+                    {
+                        this.resourceHolder.CommitAll();
+                    }
+                    catch (NMSException ex)
+                    {
+                        throw new SynchedLocalTransactionFailedException("Local NMS transaction failed to commit", ex);
+                    }
+                }
+            }
+
+            //TODO bring in new Spring.Data library to Integration project which has this method in interface
+            public override void AfterCompletion(TransactionSynchronizationStatus status)
+            {
+                if (this.acknowledgementMode == AcknowledgementMode.Transactional)
+                {
+                    this.resourceHolder.CloseAll();
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs
new file mode 100644
index 00000000..085ccf77
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs
@@ -0,0 +1,223 @@
+#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.Collections;
+using Common.Logging;
+using Spring.Collections;
+using Spring.Transaction.Support;
+using Spring.Util;
+using NMS;
+
+namespace Spring.Messaging.Nms.IConnections
+{
+    /// <summary> IConnection holder, wrapping a NMS IConnection and a NMS ISession.
+    /// NmsTransactionManager binds instances of this class to the thread,
+    /// for a given NMS IConnectionFactory.
+    ///
+    /// <p>Note: This is an SPI class, not intended to be used by applications.</p>
+    ///
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    public class NmsResourceHolder : ResourceHolderSupport
+    {
+        #region Logging
+
+        private static readonly ILog logger = LogManager.GetLogger(typeof(NmsResourceHolder));
+
+        #endregion
+
+        #region Fields
+
+        private bool frozen;
+
+        private IList connections = new LinkedList();
+
+        private IList sessions = new LinkedList();
+
+        private IDictionary sessionsPerIConnection = new Hashtable();
+
+        #endregion
+
+
+        #region Constructor (s)
+
+        /// <summary> Create a new NmsResourceHolder that is open for resources to be added.</summary>
+        public NmsResourceHolder()
+        {
+            this.frozen = false;
+        }
+
+        /// <summary> Create a new NmsResourceHolder for the given NMS resources.</summary>
+        /// <param name="connection">the NMS IConnection
+        /// </param>
+        /// <param name="session">the NMS ISession
+        /// </param>
+       public NmsResourceHolder(NMS.IConnection connection, ISession session)
+        {
+            AddConnection(connection);
+            AddSession(session, connection);
+            this.frozen = true;
+        }
+        #endregion
+        
+        #region Properties
+
+        virtual public bool Frozen
+        {
+            get
+            {
+                return frozen;
+            }
+
+        }
+        #endregion
+
+        #region Methods
+        
+        public void AddConnection(NMS.IConnection connection)
+        {
+            //TODO - update Assert utility class...
+            //Assert.isTrue(!this.frozen, "Cannot add IConnection because NmsResourceHolder is frozen");
+            AssertUtils.ArgumentNotNull(connection, "IConnection must not be null");
+            if (!connections.Contains(connection))
+            {
+                connections.Add(connection);
+            }
+        }
+
+        public void AddSession(ISession session)
+        {
+            AddSession(session, null);
+        }
+
+        public void AddSession(ISession session, NMS.IConnection connection)
+        {
+            //TOOD update AssertUtils class
+            //Assert.isTrue(!this.frozen, "Cannot add ISession because NmsResourceHolder is frozen");
+            AssertUtils.ArgumentNotNull(session, "ISession must not be null");
+            if (!sessions.Contains(session))
+            {
+                sessions.Add(session);
+                if (connection != null)
+                {
+                    IList sessionsList = (IList)sessionsPerIConnection[connection];
+                    if (sessionsList == null)
+                    {
+                        sessionsList = new LinkedList();
+                        sessionsPerIConnection[connection] = sessionsList;
+                    }
+                    sessionsList.Add(session);
+                }
+            }
+        }
+
+        public virtual NMS.IConnection GetConnection()
+        {
+            return (!(this.connections.Count == 0) ? (NMS.IConnection)this.connections[0] : null);
+        }
+
+        public virtual NMS.IConnection GetConnection(System.Type connectionType)
+        {
+            throw new NotImplementedException();
+            //TODO Updae CollectionUtils...
+            //return (NMS.IConnection)CollectionUtils.FindValueOfType(this.connections, connectionType);
+        }
+
+       public virtual ISession GetSession()
+        {
+           return (!(this.sessions.Count == 0) ? (ISession)this.sessions[0] : null);
+        }
+
+        public virtual ISession GetSession(Type sessionType)
+        {
+            return GetSession(sessionType, null);
+        }
+
+        public virtual ISession GetSession(System.Type sessionType, NMS.IConnection connection)
+        {
+            IList sessions = this.sessions;
+            if (connection != null)
+            {
+                sessions = (IList)sessionsPerIConnection[connection];
+            }
+            throw new NotImplementedException();
+            //TODO update collection utils
+            //return (ISession)CollectionUtils.FindValueOfType(sessions, sessionType);
+        }
+
+        public virtual void CommitAll()
+        {
+            foreach (ISession session in sessions)
+            {
+				session.Commit();
+				
+				// TODO are these exceptions valid?
+//                try
+//                {
+//                    session.Commit();
+//                }
+//                catch (TransactionInProgressException ex)
+//                {
+//                    // Ignore -> can only happen in case of a distributed transaction.
+//                }
+//                catch (IllegalStateException ex)
+//                {
+//                    // Ignore -> can only happen in case of a distributed transaction.
+//                }
+            }
+        }
+        
+        public virtual void CloseAll()
+        {
+            foreach (ISession session in sessions)
+            {
+                try
+                {
+                    session.Close();
+                }
+                catch (Exception ex)
+                {
+                    logger.Debug("Could not close NMS ISession after transaction", ex);
+                }
+            }
+            foreach (NMS.IConnection connection in connections)
+            {
+                try
+                {
+                    try
+                    {
+                        connection.Stop();
+                    }
+                    finally
+                    {
+                        connection.Close();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    logger.Debug("Could not close NMS IConnection after transaction", ex);
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SynchedLocalTransactionFailedException.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SynchedLocalTransactionFailedException.cs
new file mode 100644
index 00000000..fe74651c
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SynchedLocalTransactionFailedException.cs
@@ -0,0 +1,85 @@
+#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.Runtime.Serialization;
+
+namespace Spring.Messaging.Nms.IConnections
+{
+    //TODO should we have a generic spring exception for NMS?
+    
+    /// <summary> Exception thrown when a synchronized local transaction failed to complete
+    /// (after the main transaction has already completed).
+    /// </summary>
+    /// <author>Jergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    [Serializable]
+    public class SynchedLocalTransactionFailedException : ApplicationException
+    {
+        #region Constructor (s) / Destructor
+        /// <summary>Creates a new instance of the SynchedLocalTransactionFailedException class.</summary>
+        public SynchedLocalTransactionFailedException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the SynchedLocalTransactionFailedException class. with the specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public SynchedLocalTransactionFailedException (string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the SynchedLocalTransactionFailedException class with the specified message
+        /// and root cause.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public SynchedLocalTransactionFailedException (string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the SynchedLocalTransactionFailedException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected SynchedLocalTransactionFailedException(
+            SerializationInfo info, StreamingContext context)
+            : base (info, context)
+        {
+        }
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageCreator.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageCreator.cs
new file mode 100644
index 00000000..fe840aee
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageCreator.cs
@@ -0,0 +1,42 @@
+#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 NMS;
+
+namespace Spring.Messaging.Nms
+{
+    /// <summary> Creates a NMS message given a ISession</summary>
+    /// <remarks>
+    /// <p>The <code>ISession</code> typically is provided by an instance
+    /// of the NmsTemplate class.</p>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    public interface IMessageCreator
+    {
+        /// <summary> Create a IMessage to be sent.</summary>
+        /// <param name="session">the NMS ISession to be used to create the
+        /// <code>IMessage</code> (never <code>null</code>)
+        /// </param>
+        /// <returns> the <code>IMessage</code> to be sent
+        /// </returns>
+        /// <throws>NMSException if thrown by NMS API methods </throws>
+        IMessage CreateMessage(ISession session);
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageListener.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageListener.cs
new file mode 100644
index 00000000..75ec0acc
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageListener.cs
@@ -0,0 +1,29 @@
+#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 NMS;
+
+namespace Spring.Messaging.Nms
+{
+	public interface IMessageListener
+	{
+		void OnMessage(IMessage message);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessagePostProcessor.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessagePostProcessor.cs
new file mode 100644
index 00000000..8567a061
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessagePostProcessor.cs
@@ -0,0 +1,46 @@
+#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 NMS;
+
+namespace Spring.Messaging.Nms
+{
+    /// <summary> To be used with NmsTemplate's send method that
+    /// convert an object to a message.
+    /// </summary>
+    /// <remarks>
+    /// It allows for further modification of the message after it has been processed
+    /// by the converter. This is useful for setting of NMS Header and Properties.
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    public interface IMessagePostProcessor
+    {
+        /// <summary> Apply a IMessagePostProcessor to the message. The returned message is
+        /// typically a modified version of the original.
+        /// </summary>
+        /// <param name="message">the NMS message from the IMessageConverter
+        /// </param>
+        /// <returns> the modified version of the IMessage
+        /// </returns>
+        /// <throws>NMSException if thrown by NMS API methods </throws>
+        IMessage PostProcessMessage(IMessage message);
+        
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/INmsOperations.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/INmsOperations.cs
new file mode 100644
index 00000000..47a75ceb
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/INmsOperations.cs
@@ -0,0 +1,383 @@
+#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 NMS;
+
+namespace Spring.Messaging.Nms
+{
+    /// <summary>Specifies a basic set of NMS operations.
+	/// </summary>
+	/// <remarks>
+	/// <p>Implemented by NmsTemplate. Not often used but a useful option
+	/// to enhance testability, as it can easily be mocked or stubbed.</p>
+	/// 
+	/// <p>Provides <code>NmsTemplate's</code> <code>send(..)</code> and
+	/// <code>receive(..)</code> methods that mirror various NMS API methods.
+	/// See the NMS specification and NMS API docs for details on those methods.
+	/// </p>
+	/// </remarks>
+	/// <author>Mark Pollack</author>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Mark Pollack (.NET)</author>
+    public interface INmsOperations
+    {
+        /// <summary> Execute the action specified by the given action object within
+		/// a NMS ISession.
+		/// <p>Note: The value of isPubSubDomain affects the behavior of this method.
+		/// If isPubSubDomain equals true, then a ISession is passed to the callback.
+		/// If false, then a ISession is passed to the callback.</p>
+		/// </summary>
+		/// <param name="action">callback object that exposes the session
+		/// </param>
+		/// <returns> the result object from working with the session
+		/// </returns>
+		/// <throws>NMSException if there is any problem </throws>
+		object Execute(ISessionCallback action);
+		
+		/// <summary> Send a message to a NMS destination. The callback gives access to
+		/// the NMS session and IMessageProducer in order to do more complex
+		/// send operations.
+		/// </summary>
+		/// <param name="action">callback object that exposes the session/producer pair
+		/// </param>
+		/// <returns> the result object from working with the session
+		/// </returns>
+		/// <throws>NMSException  if there is any problem </throws>
+		object Execute(IProducerCallback action);
+		
+		
+		//-------------------------------------------------------------------------
+		// Convenience methods for sending messages
+		//-------------------------------------------------------------------------
+		
+		/// <summary> Send a message to the default destination.
+		/// <p>This will only work with a default destination specified!</p>
+		/// </summary>
+		/// <param name="messageCreator">callback to create a message
+		/// </param>
+		/// <throws>NMSException if there is any problem</throws>
+		void Send(IMessageCreator messageCreator);
+		
+		/// <summary> Send a message to the specified destination.
+		/// The IMessageCreator callback creates the message given a ISession.
+		/// </summary>
+		/// <param name="destination">the destination to send this message to
+		/// </param>
+		/// <param name="messageCreator">callback to create a message
+		/// </param>
+		/// <throws>NMSException if there is any problem</throws>
+		void Send(IDestination destination, IMessageCreator messageCreator);
+		
+		/// <summary> Send a message to the specified destination.
+		/// The IMessageCreator callback creates the message given a ISession.
+		/// </summary>
+		/// <param name="destinationName">the name of the destination to send this message to
+		/// (to be resolved to an actual destination by a DestinationResolver)
+		/// </param>
+		/// <param name="messageCreator">callback to create a message
+		/// </param>
+		/// <throws>NMSException if there is any problem</throws>
+		void Send(string destinationName, IMessageCreator messageCreator);
+
+        //-------------------------------------------------------------------------
+        // Convenience methods for sending messages
+        //-------------------------------------------------------------------------
+
+        /// <summary> Send a message to the default destination.
+        /// <p>This will only work with a default destination specified!</p>
+        /// </summary>
+        /// <param name="messageCreatorDelegate">delegate callback to create a message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        void SendWithDelegate(IMessageCreatorDelegate messageCreatorDelegate);
+
+        /// <summary> Send a message to the specified destination.
+        /// The IMessageCreator callback creates the message given a ISession.
+        /// </summary>
+        /// <param name="destination">the destination to send this message to
+        /// </param>
+        /// <param name="messageCreatorDelegate">delegate callback to create a message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        void SendWithDelegate(IDestination destination, IMessageCreatorDelegate messageCreatorDelegate);
+
+        /// <summary> Send a message to the specified destination.
+        /// The IMessageCreator callback creates the message given a ISession.
+        /// </summary>
+        /// <param name="destinationName">the name of the destination to send this message to
+        /// (to be resolved to an actual destination by a DestinationResolver)
+        /// </param>
+        /// <param name="messageCreatorDelegate">delegate callback to create a message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        void SendWithDelegate(string destinationName, IMessageCreatorDelegate messageCreatorDelegate);
+		
+		//-------------------------------------------------------------------------
+		// Convenience methods for sending auto-converted messages
+		//-------------------------------------------------------------------------
+		
+		/// <summary> Send the given object to the default destination, converting the object
+		/// to a NMS message with a configured IMessageConverter.
+		/// <p>This will only work with a default destination specified!</p>
+		/// </summary>
+		/// <param name="message">the object to convert to a message
+		/// </param>
+		/// <throws>NMSException if there is any problem</throws>
+		void ConvertAndSend(object message);
+		
+		/// <summary> Send the given object to the specified destination, converting the object
+		/// to a NMS message with a configured IMessageConverter.
+		/// </summary>
+		/// <param name="destination">the destination to send this message to
+		/// </param>
+		/// <param name="message">the object to convert to a message
+		/// </param>
+		/// <throws>NMSException if there is any problem</throws>
+		void ConvertAndSend(IDestination destination, object message);
+		
+		/// <summary> Send the given object to the specified destination, converting the object
+		/// to a NMS message with a configured IMessageConverter.
+		/// </summary>
+		/// <param name="destinationName">the name of the destination to send this message to
+		/// (to be resolved to an actual destination by a DestinationResolver)
+		/// </param>
+		/// <param name="message">the object to convert to a message
+		/// </param>
+		/// <throws>NMSException if there is any problem</throws>
+		void ConvertAndSend(string destinationName, object message);
+		
+		/// <summary> Send the given object to the default destination, converting the object
+		/// to a NMS message with a configured IMessageConverter. The IMessagePostProcessor
+		/// callback allows for modification of the message after conversion.
+		/// <p>This will only work with a default destination specified!</p>
+		/// </summary>
+		/// <param name="message">the object to convert to a message
+		/// </param>
+		/// <param name="postProcessor">the callback to modify the message
+		/// </param>
+		/// <throws>NMSException if there is any problem</throws>
+		void ConvertAndSend(object message, IMessagePostProcessor postProcessor);
+		
+		/// <summary> Send the given object to the specified destination, converting the object
+		/// to a NMS message with a configured IMessageConverter. The IMessagePostProcessor
+		/// callback allows for modification of the message after conversion.
+		/// </summary>
+		/// <param name="destination">the destination to send this message to
+		/// </param>
+		/// <param name="message">the object to convert to a message
+		/// </param>
+		/// <param name="postProcessor">the callback to modify the message
+		/// </param>
+		/// <throws>NMSException if there is any problem</throws>
+		void ConvertAndSend(IDestination destination, object message, IMessagePostProcessor postProcessor);
+		
+		/// <summary> Send the given object to the specified destination, converting the object
+		/// to a NMS message with a configured IMessageConverter. The IMessagePostProcessor
+		/// callback allows for modification of the message after conversion.
+		/// </summary>
+		/// <param name="destinationName">the name of the destination to send this message to
+		/// (to be resolved to an actual destination by a DestinationResolver)
+		/// </param>
+		/// <param name="message">the object to convert to a message.
+		/// </param>
+		/// <param name="postProcessor">the callback to modify the message
+		/// </param>
+		/// <throws>NMSException if there is any problem</throws>
+		void ConvertAndSend(string destinationName, object message, IMessagePostProcessor postProcessor);
+		
+		
+		//-------------------------------------------------------------------------
+		// Convenience methods for receiving messages
+		//-------------------------------------------------------------------------
+		
+		/// <summary> Receive a message synchronously from the default destination, but only
+		/// wait up to a specified time for delivery.
+		/// <p>This method should be used carefully, since it will block the thread
+		/// until the message becomes available or until the timeout value is exceeded.</p>
+		/// <p>This will only work with a default destination specified!</p>
+		/// </summary>
+		/// <returns> the message received by the consumer, or <code>null</code> if the timeout expires
+		/// </returns>
+		/// <throws>NMSException if there is any problem</throws>
+		IMessage Receive();
+		
+		/// <summary> Receive a message synchronously from the specified destination, but only
+		/// wait up to a specified time for delivery.
+		/// <p>This method should be used carefully, since it will block the thread
+		/// until the message becomes available or until the timeout value is exceeded.</p>
+		/// </summary>
+		/// <param name="destination">the destination to receive a message from
+		/// </param>
+		/// <returns> the message received by the consumer, or <code>null</code> if the timeout expires
+		/// </returns>
+		/// <throws>NMSException if there is any problem</throws>
+		IMessage Receive(IDestination destination);
+		
+		/// <summary> Receive a message synchronously from the specified destination, but only
+		/// wait up to a specified time for delivery.
+		/// <p>This method should be used carefully, since it will block the thread
+		/// until the message becomes available or until the timeout value is exceeded.</p>
+		/// </summary>
+		/// <param name="destinationName">the name of the destination to send this message to
+		/// (to be resolved to an actual destination by a DestinationResolver)
+		/// </param>
+		/// <returns> the message received by the consumer, or <code>null</code> if the timeout expires
+		/// </returns>
+		/// <throws>NMSException if there is any problem</throws>
+		IMessage Receive(string destinationName);
+		
+		/// <summary> Receive a message synchronously from the default destination, but only
+		/// wait up to a specified time for delivery.
+		/// <p>This method should be used carefully, since it will block the thread
+		/// until the message becomes available or until the timeout value is exceeded.</p>
+		/// <p>This will only work with a default destination specified!</p>
+		/// </summary>
+		/// <param name="messageSelector">the NMS message selector expression (or <code>null</code> if none).
+		/// See the NMS specification for a detailed definition of selector expressions.
+		/// </param>
+		/// <returns> the message received by the consumer, or <code>null</code> if the timeout expires
+		/// </returns>
+		/// <throws>NMSException if there is any problem</throws>
+		IMessage ReceiveSelected(string messageSelector);
+		
+		/// <summary> Receive a message synchronously from the specified destination, but only
+		/// wait up to a specified time for delivery.
+		/// <p>This method should be used carefully, since it will block the thread
+		/// until the message becomes available or until the timeout value is exceeded.</p>
+		/// </summary>
+		/// <param name="destination">the destination to receive a message from
+		/// </param>
+		/// <param name="messageSelector">the NMS message selector expression (or <code>null</code> if none).
+		/// See the NMS specification for a detailed definition of selector expressions.
+		/// </param>
+		/// <returns> the message received by the consumer, or <code>null</code> if the timeout expires
+		/// </returns>
+		/// <throws>NMSException if there is any problem</throws>
+		IMessage ReceiveSelected(IDestination destination, string messageSelector);
+		
+		/// <summary> Receive a message synchronously from the specified destination, but only
+		/// wait up to a specified time for delivery.
+		/// <p>This method should be used carefully, since it will block the thread
+		/// until the message becomes available or until the timeout value is exceeded.</p>
+		/// </summary>
+		/// <param name="destinationName">the name of the destination to send this message to
+		/// (to be resolved to an actual destination by a DestinationResolver)
+		/// </param>
+		/// <param name="messageSelector">the NMS message selector expression (or <code>null</code> if none).
+		/// See the NMS specification for a detailed definition of selector expressions.
+		/// </param>
+		/// <returns> the message received by the consumer, or <code>null</code> if the timeout expires
+		/// </returns>
+		/// <throws>NMSException if there is any problem</throws>
+		IMessage ReceiveSelected(string destinationName, string messageSelector);
+		
+		
+		//-------------------------------------------------------------------------
+		// Convenience methods for receiving auto-converted messages
+		//-------------------------------------------------------------------------
+		
+		/// <summary> Receive a message synchronously from the default destination, but only
+		/// wait up to a specified time for delivery. Convert the message into an
+		/// object with a configured IMessageConverter.
+		/// <p>This method should be used carefully, since it will block the thread
+		/// until the message becomes available or until the timeout value is exceeded.</p>
+		/// <p>This will only work with a default destination specified!</p>
+		/// </summary>
+		/// <returns> the message produced for the consumer or <code>null</code> if the timeout expires.
+		/// </returns>
+		/// <throws>NMSException if there is any problem</throws>
+		object ReceiveAndConvert();
+		
+		/// <summary> Receive a message synchronously from the specified destination, but only
+		/// wait up to a specified time for delivery. Convert the message into an
+		/// object with a configured IMessageConverter.
+		/// <p>This method should be used carefully, since it will block the thread
+		/// until the message becomes available or until the timeout value is exceeded.</p>
+		/// </summary>
+		/// <param name="destination">the destination to receive a message from
+		/// </param>
+		/// <returns> the message produced for the consumer or <code>null</code> if the timeout expires.
+		/// </returns>
+		/// <throws>NMSException if there is any problem</throws>
+		object ReceiveAndConvert(IDestination destination);
+		
+		/// <summary> Receive a message synchronously from the specified destination, but only
+		/// wait up to a specified time for delivery. Convert the message into an
+		/// object with a configured IMessageConverter.
+		/// <p>This method should be used carefully, since it will block the thread
+		/// until the message becomes available or until the timeout value is exceeded.</p>
+		/// </summary>
+		/// <param name="destinationName">the name of the destination to send this message to
+		/// (to be resolved to an actual destination by a DestinationResolver)
+		/// </param>
+		/// <returns> the message produced for the consumer or <code>null</code> if the timeout expires.
+		/// </returns>
+		/// <throws>NMSException if there is any problem</throws>
+		object ReceiveAndConvert(string destinationName);
+		
+		/// <summary> Receive a message synchronously from the default destination, but only
+		/// wait up to a specified time for delivery. Convert the message into an
+		/// object with a configured IMessageConverter.
+		/// <p>This method should be used carefully, since it will block the thread
+		/// until the message becomes available or until the timeout value is exceeded.</p>
+		/// <p>This will only work with a default destination specified!</p>
+		/// </summary>
+		/// <param name="messageSelector">the NMS message selector expression (or <code>null</code> if none).
+		/// See the NMS specification for a detailed definition of selector expressions.
+		/// </param>
+		/// <returns> the message produced for the consumer or <code>null</code> if the timeout expires.
+		/// </returns>
+		/// <throws>NMSException if there is any problem</throws>
+		object ReceiveSelectedAndConvert(string messageSelector);
+		
+		/// <summary> Receive a message synchronously from the specified destination, but only
+		/// wait up to a specified time for delivery. Convert the message into an
+		/// object with a configured IMessageConverter.
+		/// <p>This method should be used carefully, since it will block the thread
+		/// until the message becomes available or until the timeout value is exceeded.</p>
+		/// </summary>
+		/// <param name="destination">the destination to receive a message from
+		/// </param>
+		/// <param name="messageSelector">the NMS message selector expression (or <code>null</code> if none).
+		/// See the NMS specification for a detailed definition of selector expressions.
+		/// </param>
+		/// <returns> the message produced for the consumer or <code>null</code> if the timeout expires.
+		/// </returns>
+		/// <throws>NMSException if there is any problem</throws>
+		object ReceiveSelectedAndConvert(IDestination destination, string messageSelector);
+		
+		/// <summary> Receive a message synchronously from the specified destination, but only
+		/// wait up to a specified time for delivery. Convert the message into an
+		/// object with a configured IMessageConverter.
+		/// <p>This method should be used carefully, since it will block the thread
+		/// until the message becomes available or until the timeout value is exceeded.</p>
+		/// </summary>
+		/// <param name="destinationName">the name of the destination to send this message to
+		/// (to be resolved to an actual destination by a DestinationResolver)
+		/// </param>
+		/// <param name="messageSelector">the NMS message selector expression (or <code>null</code> if none).
+		/// See the NMS specification for a detailed definition of selector expressions.
+		/// </param>
+		/// <returns> the message produced for the consumer or <code>null</code> if the timeout expires.
+		/// </returns>
+		/// <throws>NMSException if there is any problem</throws>
+		object ReceiveSelectedAndConvert(string destinationName, string messageSelector);
+	}
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IProducerCallback.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IProducerCallback.cs
new file mode 100644
index 00000000..fdc85e02
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IProducerCallback.cs
@@ -0,0 +1,48 @@
+#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 NMS;
+
+namespace Spring.Messaging.Nms
+{
+    /// <summary> Callback for sending a message to a NMS destination.</summary>
+    /// <remarks>
+    /// <p>To be used with the NmsTemplate.Execute(IProducerCallback)
+    /// method, often implemented as an anonymous inner class.</p>
+    /// 
+    /// <p>The typical implementation will perform multiple operations on the
+    /// supplied NMS ISession and IMessageProducer. </p>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    public interface IProducerCallback
+    {
+        /// <summary> Perform operations on the given ISession and IMessageProducer.
+        /// The message producer is not associated with any destination.
+        /// </summary>
+        /// <param name="session">the NMS <code>ISession</code> object to use
+        /// </param>
+        /// <param name="producer">the NMS <code>IMessageProducer</code> object to use
+        /// </param>
+        /// <returns> a result object from working with the <code>ISession</code>, if any (can be <code>null</code>) 
+        /// </returns>
+        object DoInNms(ISession session, IMessageProducer producer);
+	
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/ISessionCallback.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/ISessionCallback.cs
new file mode 100644
index 00000000..022b6aa3
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/ISessionCallback.cs
@@ -0,0 +1,47 @@
+#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 NMS;
+
+namespace Spring.Messaging.Nms
+{
+    /// <summary> Callback for executing any number of operations on a provided
+    /// ISession
+    /// </summary>
+    /// <remarks>
+    /// <p>To be used with the NmsTemplate.Execute(ISessionCallback)}
+    /// method, often implemented as an anonymous inner class.</p>
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <seealso cref="NmsTemplate.Execute(ISessionCallback,bool)">
+    /// </seealso>
+    public interface ISessionCallback
+    {
+        /// <summary> Execute any number of operations against the supplied NMS
+        /// ISession, possibly returning a result.
+        /// </summary>
+        /// <param name="session">the NMS <code>ISession</code>
+        /// </param>
+        /// <returns> a result object from working with the <code>ISession</code>, if any (so can be <code>null</code>) 
+        /// </returns>
+        /// <throws>NMSException if there is any problem </throws>
+        object DoInNms(ISession session);
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs
new file mode 100644
index 00000000..b975b2c4
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs
@@ -0,0 +1,588 @@
+using System;
+using System.Collections;
+using Spring.Context;
+using Spring.Messaging.Nms.Support;
+using Spring.Messaging.Nms.Support.IDestinations;
+using Spring.Util;
+using NMS;
+
+namespace Spring.Messaging.Nms.Listener
+{
+    public abstract class AbstractMessageListenerContainer : NmsDestinationAccessor, ILifecycle, IDisposable
+    {
+        private String clientId;
+
+        private object destination;
+
+        private String messageSelector;
+
+        private object messageListener;
+
+        private bool subscriptionDurable = false;
+
+        private string durableSubscriptionName;
+
+        private ExceptionListener exceptionListener;
+
+        private bool exposeListenerISession = true;
+
+        private bool autoStartup = true;
+
+        private IConnection sharedConnection;
+
+
+        private volatile bool active = false;
+
+        private bool running = false;
+
+        private IList pausedTasks = new Spring.Collections.LinkedList();
+
+        private object lifecycleMonitor = new object();
+
+
+        private object sharedConnectionMonitor = new object();
+
+        #region Properties
+
+        /// <summary> Set whether to automatically start the listener after initialization.
+        /// <p>Default is "true"; set this to "false" to allow for manual startup.</p>
+        /// </summary>
+        virtual public bool AutoStartup
+        {
+            set { this.autoStartup = value; }
+        }
+
+
+        public string ClientId
+        {
+            set { clientId = value; }
+            get { return clientId;  }
+        }
+
+
+        public IDestination Destination
+        {
+            get
+            {
+                return (this.destination is IDestination ? (IDestination) this.destination : null);
+            }
+            set
+            {
+                AssertUtils.ArgumentNotNull(value, "destination");
+                destination = value;
+                if (destination is ITopic && !(destination is IQueue))
+                {
+			        PubSubDomain = true;
+		        }
+                
+            }
+        }
+
+        virtual public bool Active
+        {
+            get
+            {
+                lock (this.lifecycleMonitor)
+                {
+                    return this.active;
+                }
+            }
+
+        }
+        
+        public string DestinationName
+        {
+            get
+            {
+                return (this.destination is string ? (string) this.destination : null);
+	
+            }
+            set
+            {
+                AssertUtils.ArgumentNotNull(value, "destinationName must not be null");
+                this.destination = value;
+            }
+        }
+
+
+        public string MessageSelector
+        {
+            get { return messageSelector; }
+            set { messageSelector = value; }
+        }
+
+
+        public object MessageListener
+        {
+            set
+            {
+                CheckMessageListener(value);
+                if (durableSubscriptionName == null)
+                {
+                    // Use message listener class name as default name for a durable subscription.
+                    durableSubscriptionName = value.GetType().FullName;
+                }
+                messageListener = value;
+            }
+            get
+            {
+                return messageListener;
+            }
+        }
+
+
+        public bool SubscriptionDurable
+        {
+            get { return subscriptionDurable; }
+            set { subscriptionDurable = value; }
+        }
+
+
+        public string DurableSubscriptionName
+        {
+            get
+            {
+                return durableSubscriptionName;
+            }
+            set
+            {
+                AssertUtils.ArgumentNotNull(value, "durableSubscriptionName must not be null");
+                durableSubscriptionName = value;
+            }
+        }
+
+
+        public ExceptionListener ExceptionListener
+        {
+            get { return exceptionListener; }
+            set { exceptionListener = value; }
+        }
+
+
+        public bool ExposeListenerSession
+        {
+            get { return exposeListenerISession; }
+            set { exposeListenerISession = value; }
+        }
+
+
+        public object LifecycleMonitor
+        {
+            get { return lifecycleMonitor; }
+        }
+
+
+        public IConnection SharedConnection
+        {
+            get
+            {
+                if (!SharedConnectionEnabled)
+                {
+                    throw new System.SystemException("This message listener container does not maintain a shared IConnection");
+                }
+                lock (this.sharedConnectionMonitor)
+                {
+                    if (this.sharedConnection == null)
+                    {
+                        //TODO SharedConnectionNotInitializedException
+                        throw new ApplicationException("This message listener container's shared IConnection has not been initialized yet");
+                    }
+                    return this.sharedConnection;
+                }
+            }
+        }
+
+        #endregion
+
+        public void Start()
+        {
+            DoStart();
+        }
+
+        private void DoStart()
+        {
+            lock (this.lifecycleMonitor)
+            {
+                running = true;
+                System.Threading.Monitor.PulseAll(this.lifecycleMonitor);
+
+                //TODO - PausedTasks
+            }
+
+            if (SharedConnectionEnabled)
+            {
+                StartSharedConnection();
+            }
+        }
+
+        protected virtual void StartSharedConnection()
+        {
+            lock (sharedConnectionMonitor)
+            {
+                if (sharedConnection != null)
+                {
+                    try
+                    {
+                        sharedConnection.Start();
+                    }
+                    catch (Exception ex)
+                    {
+                        logger.Debug("Ignoring IConnection start exception - assuming already started", ex);
+                    }
+                }
+            }
+        }
+
+        public void Stop()
+        {
+            DoStop();
+        }
+
+        public bool IsRunning
+        {
+            get
+            {
+                lock (lifecycleMonitor)
+                {
+                    return running;
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            Shutdown();
+        }
+
+        public virtual void Shutdown()
+        {
+            logger.Debug("Shutting down message listener container");
+            bool wasRunning = false;
+            lock (this.lifecycleMonitor)
+            {
+                wasRunning = this.running;
+                this.running = false;
+                this.active = false;
+                System.Threading.Monitor.PulseAll(this.lifecycleMonitor);
+            }
+            try
+            {
+                DestroyListener();
+            }
+            finally
+            {
+                lock (this.sharedConnectionMonitor)
+                {
+                    NmsUtils.CloseConnection(this.sharedConnection, wasRunning);
+                }
+            }
+        }
+
+        protected virtual void DoStop()
+        {
+            lock (this.lifecycleMonitor)
+            {
+                this.running = false;
+                System.Threading.Monitor.PulseAll(this.lifecycleMonitor);
+            }
+
+            if (SharedConnectionEnabled)
+            {
+                StopSharedConnection();
+            }
+        }
+
+        protected virtual void StopSharedConnection()
+        {
+            lock (this.sharedConnectionMonitor)
+            {
+                if (this.sharedConnection != null)
+                {
+                    try
+                    {
+                        this.sharedConnection.Stop();
+                    }
+                    catch (System.InvalidOperationException ex)
+                    {
+                        logger.Debug("Ignoring IConnection stop exception - assuming already stopped", ex);
+                    }
+                }
+            }
+        }
+
+
+        #region Template methods for listeners
+        public virtual void ExecuteListener(ISession session, IMessage message)
+        {
+            try
+            {
+                DoExecuteListener(session, message);
+            }
+            //UPGRADE_NOTE: Exception 'java.lang.Throwable' was converted to 'System.Exception' which has different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1100'"
+            catch (System.Exception ex)
+            {
+                HandleListenerException(ex);
+            }
+        }
+        
+
+        protected virtual void DoExecuteListener(ISession session, IMessage message)
+        {
+            try
+            {
+                InvokeListener(session, message);
+            }
+            catch (Exception ex)
+            {
+                RollbackOnExceptionIfNecessary(session, ex);
+                throw;
+            }
+            CommitIfNecessary(session, message);
+        }
+
+        private void CommitIfNecessary(ISession session, IMessage message)
+        {
+            //TODO
+            //logger.Info("CommitIfNecessary not implemented");
+        }
+
+        private void RollbackOnExceptionIfNecessary(ISession session, Exception ex)
+        {
+            //TODO
+            //logger.Info("RollbackOnExceptionIfNecessary not implemented");
+        }
+
+
+        protected internal virtual void InvokeListener(ISession session, IMessage message)
+        {
+            if (MessageListener is ISessionAwareMessageListener)
+            {
+                DoInvokeListener((ISessionAwareMessageListener) MessageListener, session, message);
+            }
+            else
+            {
+                if (MessageListener is IMessageListener)
+                {
+                   DoInvokeListener((IMessageListener) MessageListener, message);
+                }
+                else
+                {
+                    throw new System.ArgumentException("Only IMessageListener and ISessionAwareMessageListener supported");
+                }
+            }
+        }
+
+        protected virtual void DoInvokeListener(IMessageListener listener, IMessage message)
+        {
+            listener.OnMessage(message);
+        }
+
+        protected virtual void DoInvokeListener(ISessionAwareMessageListener listener, ISession session, IMessage message)
+        {
+            IConnection conToClose = null;
+            ISession sessionToClose = null;
+            try
+            {
+                ISession sessionToUse = session;
+                if (!ExposeListenerSession)
+                {
+                    //We need to expose a separate Session.
+                    conToClose = CreateConnection();
+                    sessionToClose = CreateSession(conToClose);
+                    sessionToUse = sessionToClose;
+                }
+                // Actually invoke the message listener
+                if (logger.IsDebugEnabled)
+                {
+                    logger.Debug("Invoking listener with message of type [" + message.GetType() + 
+                        "] and session [" + sessionToUse + "]");
+                }
+                listener.OnMessage(message, sessionToUse);
+                if (sessionToUse != session)
+                {
+                    if (sessionToUse.Transacted)
+                    {
+                        NmsUtils.CommitIfNecessary(sessionToUse);
+                    }                        
+                }
+            } finally
+            {
+                NmsUtils.CloseSession(sessionToClose);
+                NmsUtils.CloseConnection(conToClose);
+            }
+        }
+        
+        protected  virtual void HandleListenerException(System.Exception ex)
+        {
+            if (ex is NMSException)
+            {
+                InvokeExceptionListener((NMSException)ex);
+            }
+            if (Active)
+            {
+                // Regular case: failed while active.
+                // Log at error level.
+                logger.Error("Execution of NMS message listener failed", ex);
+            }
+            else
+            {
+                // Rare case: listener thread failed after container shutdown.
+                // Log at debug level, to avoid spamming the shutdown log.
+                logger.Debug("Listener exception after container shutdown", ex);
+            }
+        }
+
+        protected virtual void InvokeExceptionListener(NMSException ex)
+        {
+            ExceptionListener exceptionListener = ExceptionListener;
+            if (exceptionListener != null)
+            {
+               exceptionListener(ex);
+            }
+        }
+        
+        #endregion
+
+        public override void AfterPropertiesSet()
+        {
+            base.AfterPropertiesSet();
+
+            if (this.destination == null)
+            {
+                throw new System.ArgumentException("destination or destinationName is required");
+            }
+            if (this.messageListener == null)
+            {
+                throw new System.ArgumentException("messageListener is required");
+            }
+            if (SubscriptionDurable && !PubSubDomain)
+            {
+                throw new System.ArgumentException("A durable subscription requires a topic (pub-sub domain)");
+            }
+
+            Initialize();
+        }
+
+        public virtual void Initialize()
+        {
+            try
+            {
+                lock (this.lifecycleMonitor)
+                {
+                    this.active = true;
+                    System.Threading.Monitor.PulseAll(this.lifecycleMonitor);
+                }
+
+                if (SharedConnectionEnabled)
+                {
+                    EstablishSharedConnection();
+                }
+
+                if (this.autoStartup)
+                {
+                    DoStart();
+                }
+
+                RegisterListener();
+            }
+            catch (Exception)
+            {
+                lock (this.sharedConnectionMonitor)
+                {
+                    NmsUtils.CloseConnection(this.sharedConnection);
+                }
+                throw;
+            }
+        }
+
+        protected virtual void EstablishSharedConnection()
+        {
+            RefreshSharedConnection();
+        }
+
+        protected void RefreshSharedConnection()
+        {
+            bool running = IsRunning;
+            lock (this.sharedConnectionMonitor)
+            {
+                NmsUtils.CloseConnection(this.sharedConnection, running);
+                
+                IConnection con = CreateConnection();
+                try
+                {
+                    PrepareSharedConnection(con);
+                }
+                catch (Exception)
+                {
+                    NmsUtils.CloseConnection(con);
+                    throw;
+                }
+                this.sharedConnection = con;
+            }
+        }
+
+        protected virtual void PrepareSharedConnection(IConnection connection)
+        {
+            if (ClientId != null)
+            {
+               connection.ClientId = ClientId;
+            }
+        }
+        #region Template methods to be implemented by subclasses
+
+        /// <summary> Return whether a shared NMS IConnection should be maintained
+        /// by this listener container base class.
+        /// </summary>
+        /// <seealso cref="SharedConnection">
+        /// </seealso>
+        protected abstract bool SharedConnectionEnabled
+        {
+            get;
+        }
+
+        /// <summary> Register the specified listener on the underlying NMS IConnection.
+        /// <p>Subclasses need to implement this method for their specific
+        /// listener management process.</p>
+        /// </summary>
+        /// <throws>  NMSException if registration failed </throws>
+        /// <seealso cref="IMessageListener">
+        /// </seealso>
+        /// <seealso cref="SharedConnection">
+        /// </seealso>
+        protected abstract void RegisterListener();
+
+        /// <summary> Destroy the registered listener.
+        /// The NMS IConnection will automatically be closed <i>afterwards</i>
+        /// <p>Subclasses need to implement this method for their specific
+        /// listener management process.</p>
+        /// </summary>
+        /// <throws>  NMSException if destruction failed </throws>
+        protected abstract void DestroyListener();
+
+        #endregion
+
+        protected virtual IConnection CreateConnection()
+        {
+            return ConnectionFactory.CreateConnection();
+        }
+
+        protected virtual ISession CreateSession(IConnection con)
+        {
+            return con.CreateSession(SessionAcknowledgeMode);
+        }
+
+        protected virtual bool IsClientAcknowledge(ISession session)
+        {
+            return (session.AcknowledgementMode == AcknowledgementMode.ClientAcknowledge);
+        }
+
+        protected virtual void CheckMessageListener(System.Object messageListener)
+        {
+            AssertUtils.ArgumentNotNull(messageListener, "IMessage Listener can not be null");
+            if (!(messageListener is IMessageListener || messageListener is ISessionAwareMessageListener))
+            {
+                throw new System.ArgumentException("messageListener needs to be of type [" + typeof(IMessageListener).FullName + "] or [" + typeof(ISessionAwareMessageListener).FullName + "]");
+            }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs
new file mode 100644
index 00000000..5be23271
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs
@@ -0,0 +1,284 @@
+using System;
+using System.Collections;
+using Common.Logging;
+using Spring.Expressions;
+using Spring.Messaging.Nms.Support;
+using Spring.Messaging.Nms.Support.Converter;
+using Spring.Messaging.Nms.Support.IDestinations;
+using Spring.Util;
+using NMS;
+
+namespace Spring.Messaging.Nms.Listener.Adapter
+{
+    public class MessageListenerAdapter : IMessageListener
+    {
+        #region Logging
+
+        private readonly ILog logger = LogManager.GetLogger(typeof (MessageListenerAdapter));
+
+        #endregion
+
+        private object delegateObject;
+
+        private string defaultListenerMethod = "HandleMessage";
+
+        private IExpression processingExpression;
+
+        private object defaultResponseDestination;
+
+        private IDestinationResolver destinationResolver = new DynamicDestinationResolver();
+
+        private IMessageConverter messageConverter;
+
+        public MessageListenerAdapter()
+        {
+            InitDefaultStrategies();
+            delegateObject = this;
+            processingExpression = Spring.Expressions.Expression.Parse(defaultListenerMethod + "(#convertedObject)");
+        }
+
+        public MessageListenerAdapter(object delegateObject)
+        {
+            InitDefaultStrategies();
+            this.delegateObject = delegateObject;
+        }
+
+        // TODO name change?
+
+        public object DelegateObject
+        {
+            get { return delegateObject; }
+            set { delegateObject = value; }
+        }
+
+        public string DefaultListenerMethod
+        {
+            get { return defaultListenerMethod; }
+            set
+            {
+                defaultListenerMethod = value;
+            }
+        }
+
+
+        public object DefaultResponseDestination
+        {
+            set { defaultResponseDestination = value; }
+        }
+
+        public string DefaultResponseDestinationQueueName
+        {
+            set { defaultResponseDestination = new DestinationNameHolder(value, false); }
+        }
+
+        public string DefaultResponseDestinationTopicName
+        {
+            set { defaultResponseDestination = new DestinationNameHolder(value, true); }
+        }
+
+
+        public IDestinationResolver DestinationResolver
+        {
+            get { return destinationResolver; }
+            set
+            {
+                AssertUtils.ArgumentNotNull(value, "DestinationResolver must not be null");
+                destinationResolver = value;
+            }
+        }
+
+        public IMessageConverter MessageConverter
+        {
+            get { return messageConverter; }
+            set { messageConverter = value; }
+        }
+
+        private void InitDefaultStrategies()
+        {
+            MessageConverter = new SimpleMessageConverter();
+        }
+
+        protected virtual void HandleListenerException(Exception e)
+        {
+            logger.Error("Listener execution failed", e);
+        }
+
+        protected virtual string GetListenerMethodName(IMessage originalIMessage, object extractedMessage)
+        {
+            return DefaultListenerMethod;
+        }
+
+
+        public void OnMessage(IMessage message)
+        {
+            try
+            {
+                OnMessage(message, null);
+            }
+            catch (Exception e)
+            {
+                HandleListenerException(e);
+            }
+        }
+
+        public void OnMessage(IMessage message, ISession session)
+        {
+            object convertedMessage = ExtractIMessage(message);
+
+
+            IDictionary vars = new Hashtable();
+            vars["convertedObject"] = convertedMessage;
+
+            //Need to parse each time since have overloaded methods and
+            //expression processor caches target of first invocation.
+            //TODO - use regular reflection.
+            processingExpression = Expression.Parse(defaultListenerMethod + "(#convertedObject)");
+            
+            //Invoke message handler method and get result.
+            object result = processingExpression.GetValue(delegateObject, vars);
+            if (result != null)
+            {
+                HandleResult(result, message, session);
+            }
+            else
+            {
+                logger.Debug("No result object given - no result to handle");
+            }
+        }
+
+        private void HandleResult(object result, IMessage request, ISession session)
+        {
+            if (session != null)
+            {
+                if (logger.IsDebugEnabled)
+                {
+                    logger.Debug("Listener method returned result [" + result +
+                                 "] - generating response message for it");
+                }
+                IMessage response = BuildMessage(session, result);
+                PostProcessResponse(request, response);
+                IDestination destination = GetResponseDestination(request, response, session);
+                SendResponse(session, destination, response);
+            }
+            else
+            {
+                if (logger.IsDebugEnabled)
+                {
+                    logger.Debug("Listener method returned result [" + result +
+                                 "]: not generating response message for it because of no NMS ISession given");
+                }
+            }
+        }
+
+        protected virtual IMessage BuildMessage(ISession session, Object result)
+        {
+            IMessageConverter converter = MessageConverter;
+            if (converter != null)
+            {
+                return converter.ToMessage(result, session);
+            }
+            else
+            {
+                //TODO ' use as '
+                IMessage msg = result as IMessage;
+                if (msg == null)
+                {
+                    throw new IMessageConversionException(
+                        "No IMessageConverter specified - cannot handle message [" + result + "]");
+                }
+                return msg;
+            }
+        }
+
+        protected virtual void PostProcessResponse(IMessage request, IMessage response)
+        {
+            response.NMSCorrelationID = request.NMSCorrelationID;
+        }
+        
+        protected virtual IDestination GetResponseDestination(IMessage request, IMessage response, ISession session)
+        {
+            IDestination replyTo = request.NMSReplyTo;
+            if (replyTo == null)
+            {
+                replyTo = ResolveDefaultResponseDestination(session);
+                if (replyTo == null)
+                {
+                    throw new InvalidDestinationException("Cannot determine response destination: " +
+                            "Request message does not contain reply-to destination, and no default response destination set.");
+                }
+            }
+            return replyTo;
+        }
+        
+        protected virtual IDestination ResolveDefaultResponseDestination(ISession session)
+        {
+            IDestination dest = defaultResponseDestination as IDestination;
+            if (dest != null)
+            {
+                return dest;
+            }
+
+            DestinationNameHolder destNameHolder = defaultResponseDestination as DestinationNameHolder;
+            if (destNameHolder != null)
+            {
+                return DestinationResolver.ResolveDestinationName(session, destNameHolder.Name, destNameHolder.IsTopic);
+            }
+            
+            return null;
+        }
+        
+        protected virtual void SendResponse(ISession session, IDestination destination, IMessage response)
+        {
+            IMessageProducer producer = session.CreateProducer(destination);
+            try
+            {
+                PostProcessProducer(producer, response);
+                producer.Send(response);
+            }
+            finally
+            {
+                NmsUtils.CloseMessageProducer(producer);
+            }
+        }
+        
+        protected virtual void 	PostProcessProducer(IMessageProducer producer, IMessage response)
+        {
+            
+        }
+        
+        
+        private object ExtractIMessage(IMessage message)
+        {
+            IMessageConverter converter = MessageConverter;
+            if (converter != null)
+            {
+                return converter.FromMessage(message);
+            }
+            return message;
+        }
+    }
+
+    internal class DestinationNameHolder
+    {
+        private string name;
+
+        private bool isTopic;
+
+        public DestinationNameHolder(string name, bool isTopic)
+        {
+            this.name = name;
+            this.isTopic = isTopic;
+        }
+
+
+        public string Name
+        {
+            get { return name; }
+        }
+
+        public bool IsTopic
+        {
+            get { return isTopic; }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/DefaultMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/DefaultMessageListenerContainer.cs
new file mode 100644
index 00000000..f952d7f4
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/DefaultMessageListenerContainer.cs
@@ -0,0 +1,6 @@
+namespace Spring.Messaging.Nms.Listener
+{
+    public class DefaultMessageListenerContainer
+    {
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/ISessionAwareMessageListener.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/ISessionAwareMessageListener.cs
new file mode 100644
index 00000000..90b105f4
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/ISessionAwareMessageListener.cs
@@ -0,0 +1,19 @@
+using NMS;
+
+namespace Spring.Messaging.Nms.Listener
+{
+    public interface ISessionAwareMessageListener
+    {
+
+        /// <summary> Callback for processing a received NMS message.
+        /// Implementors are supposed to process the given IMessage,
+        /// typically sending reply messages through the given ISession.
+        /// </summary>
+        /// <param name="message">the received NMS message
+        /// </param>
+        /// <param name="session">the underlying NMS ISession
+        /// </param>
+        /// <throws>  NMSException if thrown by NMS methods </throws>
+        void OnMessage(IMessage message, ISession session);
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs
new file mode 100644
index 00000000..aeed04ff
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs
@@ -0,0 +1,133 @@
+using Spring.Collections;
+using Spring.Messaging.Nms.Support;
+using NMS;
+
+namespace Spring.Messaging.Nms.Listener
+{
+    public class SimpleMessageListenerContainer : AbstractMessageListenerContainer
+    {
+        private bool pubSubNoLocal = false;
+
+        private int concurrentConsumers = 1;
+
+        //private TaskExecutor taskExecutor;
+
+        private ISet sessions;
+
+        private ISet consumers;
+
+
+        public int ConcurrentConsumers
+        {
+            get { return concurrentConsumers; }
+            set { concurrentConsumers = value; }
+        }
+
+        public bool PubSubNoLocal
+        {
+            get { return pubSubNoLocal; }
+            set { pubSubNoLocal = value; }
+        }
+
+        protected override bool SharedConnectionEnabled
+        {
+            get { return true; }
+        }
+
+        protected override void RegisterListener()
+        {
+            this.sessions = new HashedSet();
+            this.consumers = new HashedSet();
+            for (int i = 0; i < this.concurrentConsumers; i++)
+            {
+                ISession session = CreateSession(SharedConnection);
+                IMessageConsumer consumer = CreateListenerConsumer(session);
+                this.sessions.Add(session);
+                this.consumers.Add(consumer);
+            }
+        }
+
+        private IMessageConsumer CreateListenerConsumer(ISession session)
+        {
+            IDestination destination = Destination;
+            if (destination == null)
+            {
+                destination = ResolveDestinationName(session, DestinationName);
+            }
+            IMessageConsumer consumer = CreateConsumer(session, destination);
+            //TODO TaskExectuor abstraction would go here...
+			
+	        SimpleMessageListener listener = new SimpleMessageListener(this, session);
+            consumer.Listener += new NMS.MessageListener(listener.OnMessage); 
+            return consumer;
+        }
+
+        protected override void DestroyListener()
+        {
+            logger.Debug("Closing NMS IMessageConsumers");
+            foreach (IMessageConsumer messageConsumer in consumers)
+            {
+                NmsUtils.CloseMessageConsumer(messageConsumer);
+            }
+            logger.Debug("Closing NMS ISessions");
+            foreach (ISession session in sessions)
+            {
+                NmsUtils.CloseSession(session);
+            }
+        }
+
+        public override void AfterPropertiesSet()
+        {
+            if (this.concurrentConsumers <= 0)
+            {
+                throw new System.ArgumentException("concurrentConsumers value must be at least 1 (one)");
+            }
+            if (SubscriptionDurable && this.concurrentConsumers != 1)
+            {
+                throw new System.ArgumentException("Only 1 concurrent consumer supported for durable subscription");
+            }
+
+            base.AfterPropertiesSet();
+        }
+
+        protected IMessageConsumer CreateConsumer(ISession session, IDestination destination)
+        {
+            // Only pass in the NoLocal flag in case of a Topic:
+            // Some NMS providers, such as WebSphere MQ 6.0, throw IllegalStateException
+            // in case of the NoLocal flag being specified for a Queue.
+            if (PubSubDomain)
+            {
+                if (SubscriptionDurable && destination is ITopic)
+                {
+                    return session.CreateDurableConsumer(
+                        (ITopic) destination, DurableSubscriptionName, MessageSelector, PubSubNoLocal);
+                }
+                else
+                {
+                    return session.CreateConsumer(destination, MessageSelector, PubSubNoLocal);
+                }
+            }
+            else
+            {
+                return session.CreateConsumer(destination, MessageSelector);
+            }
+        }
+    }
+
+    internal class SimpleMessageListener : IMessageListener
+    {
+        private SimpleMessageListenerContainer container;
+        private ISession session;
+
+        public SimpleMessageListener(SimpleMessageListenerContainer container, ISession session)
+        {
+            this.container = container;
+            this.session = session;
+        }
+
+        public void OnMessage(IMessage message)
+        {
+            container.ExecuteListener(session, message);
+        }
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/MessageCreatorDelegate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/MessageCreatorDelegate.cs
new file mode 100644
index 00000000..80ee0db2
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/MessageCreatorDelegate.cs
@@ -0,0 +1,35 @@
+#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 NMS;
+
+namespace Spring.Messaging.Nms
+{
+    /// <summary>
+    /// Delegate that creates a NMS message given a ISession
+    /// </summary>
+    /// <param name="session">the NMS ISession to be used to create the
+    /// <code>IMessage</code> (never <code>null</code>) 
+    /// </param>
+    /// <returns> the <code>IMessage</code> to be sent
+    /// </returns>
+    /// <throws>NMSException if thrown by NMS API methods </throws>
+    public delegate IMessage IMessageCreatorDelegate(ISession session);
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsGatewaySupport.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsGatewaySupport.cs
new file mode 100644
index 00000000..42d4bc33
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsGatewaySupport.cs
@@ -0,0 +1,116 @@
+#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 Common.Logging;
+using Spring.Objects.Factory;
+using NMS;
+
+namespace Spring.Messaging.Nms
+{
+    /// <summary>
+    /// Convenient super class for application classes that need NMS access.
+    /// </summary>
+    /// <remarks>
+    ///  Requires a IConnectionFactory or a NmsTemplate instance to be set.
+    ///  It will create its own NmsTemplate if a IConnectionFactory is passed in.
+    ///  A custom NmsTemplate instance can be created for a given IConnectionFactory
+    ///  through overriding the <code>createNmsTemplate</code> method.
+    ///
+    /// </remarks>
+    public class NmsGatewaySupport : IInitializingObject
+    {
+
+        #region Logging
+
+        protected readonly ILog logger = LogManager.GetLogger(typeof(NmsGatewaySupport));
+
+        #endregion
+        
+        private NmsTemplate jmsTemplate;
+
+
+        /// <summary>
+        /// Gets or sets the NMS template for the gateway.
+        /// </summary>
+        /// <value>The NMS template.</value>
+        public NmsTemplate NmsTemplate
+        {
+            get { return jmsTemplate; }
+            set { jmsTemplate = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets he NMS connection factory to be used by the gateway.
+	    /// Will automatically create a NmsTemplate for the given IConnectionFactory.
+        /// </summary>
+        /// <value>The connection factory.</value>
+        public IConnectionFactory ConnectionFactory
+        {
+            get
+            {
+                return (jmsTemplate != null ? this.jmsTemplate.ConnectionFactory : null);
+            }
+            set
+            {
+                this.jmsTemplate = CreateNmsTemplate(value);
+            }
+        }
+
+        /// <summary>
+        /// Creates a NmsTemplate for the given IConnectionFactory.
+        /// </summary>
+	    /// <remarks>Only invoked if populating the gateway with a IConnectionFactory reference.
+	    /// Can be overridden in subclasses to provide a different NmsTemplate instance
+	    /// </remarks>
+	    ///
+	    /// <param name="connectionFactory">The connection factory.</param>
+        /// <returns></returns>
+        protected virtual NmsTemplate CreateNmsTemplate(IConnectionFactory connectionFactory)
+        {
+            return new NmsTemplate(connectionFactory);
+        }
+
+        public void AfterPropertiesSet()
+        {
+            if (jmsTemplate == null)
+            {
+                throw new ArgumentException("connectionFactory or jmsTemplate is required");
+            }
+            try
+            {
+                InitGateway();
+            }
+            catch (Exception e)
+            {
+                throw new ObjectInitializationException("Initialization of the NMS gateway failed: " + e.Message, e);
+            }
+        }
+
+        /// <summary>
+        /// Subclasses can override this for custom initialization behavior.
+	    /// Gets called after population of this instance's properties.
+        /// </summary>
+        protected virtual void InitGateway()
+        {
+            
+        }
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsTemplate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsTemplate.cs
new file mode 100644
index 00000000..2074225e
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsTemplate.cs
@@ -0,0 +1,1425 @@
+#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 Spring.Messaging.Nms.IConnections;
+using Spring.Messaging.Nms.Support;
+using Spring.Messaging.Nms.Support.Converter;
+using Spring.Messaging.Nms.Support.IDestinations;
+using Spring.Transaction.Support;
+using Spring.Util;
+using NMS;
+
+namespace Spring.Messaging.Nms
+{
+    /// <summary> Helper class that simplifies NMS access code.</summary>
+    /// <remarks>
+    /// <para>If you want to use dynamic destination creation, you must specify
+    /// the type of NMS destination to create, using the "pubSubDomain" property.
+    /// For other operations, this is not necessary.
+    /// Point-to-Point (Queues) is the default domain.</para>
+    ///
+    /// <para>Default settings for NMS ISessions are "not transacted" and "auto-acknowledge".</para>
+    ///
+    /// <para>This template uses a DynamicDestinationResolver and a SimpleMessageConverter
+    /// as default strategies for resolving a destination name or converting a message,
+    /// respectively.</para>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    public class NmsTemplate : NmsDestinationAccessor, INmsOperations
+    {
+        #region Fields
+
+        public static readonly long DEFAULT_RECEIVE_TIMEOUT = -1;
+
+
+        private NmsTemplateResourceFactory transactionalResourceFactory;
+
+
+        private object defaultDestination;
+
+        private IMessageConverter messageConverter;
+
+
+        private bool messageIdEnabled = true;
+
+        private bool messageTimestampEnabled = true;
+
+        private bool pubSubNoLocal = false;
+
+        private long receiveTimeout = DEFAULT_RECEIVE_TIMEOUT;
+
+        private bool explicitQosEnabled = false;
+
+        private byte priority = NMSConstants.defaultPriority;
+		
+		private bool persistent = NMSConstants.defaultPersistence;
+		
+		private TimeSpan timeToLive;
+		
+        private bool cacheNmsResources = true;
+
+        private NmsResources jmsResources = new NmsResources();
+        
+        #endregion
+
+        #region Constructor (s)
+
+        /// <summary> Create a new NmsTemplate.</summary>
+        /// <remarks>
+        /// <p>Note: The IConnectionFactory has to be set before using the instance.
+        /// This constructor can be used to prepare a NmsTemplate via an ObjectFactory,
+        /// typically setting the IConnectionFactory.</p>
+        /// </remarks>
+        public NmsTemplate()
+        {
+            transactionalResourceFactory = new NmsTemplateResourceFactory(this);
+            InitDefaultStrategies();
+        }
+
+
+        /// <summary> Create a new NmsTemplate, given a IConnectionFactory.</summary>
+        /// <param name="connectionFactory">the IConnectionFactory to obtain IConnections from
+        /// </param>
+        public NmsTemplate(IConnectionFactory connectionFactory)
+            : this()
+        {
+            ConnectionFactory = connectionFactory;
+            AfterPropertiesSet();
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary> Initialize the default implementations for the template's strategies:
+        /// DynamicDestinationResolver and SimpleMessageConverter.
+        /// </summary>
+        protected virtual void InitDefaultStrategies()
+        {
+            MessageConverter = new SimpleMessageConverter();
+        }
+
+        private void CheckDefaultDestination()
+        {
+            if (defaultDestination == null)
+            {
+                throw new SystemException(
+                    "No defaultDestination or defaultDestinationName specified. Check configuration of NmsTemplate.");
+            }
+        }
+
+        private void CheckMessageConverter()
+        {
+            if (MessageConverter == null)
+            {
+                throw new SystemException("No messageConverter registered. Check configuration of NmsTemplate.");
+            }
+        }
+
+        /// <summary> Execute the action specified by the given action object within a
+        /// NMS ISession.
+        /// </summary>
+        /// <remarks> Generalized version of <code>execute(ISessionCallback)</code>,
+        /// allowing the NMS IConnection to be started on the fly.
+        /// <p>Use <code>execute(ISessionCallback)</code> for the general case.
+        /// Starting the NMS IConnection is just necessary for receiving messages,
+        /// which is preferably achieved through the <code>receive</code> methods.</p>
+        /// </remarks>
+        /// <param name="action">callback object that exposes the session
+        /// </param>
+        /// <param name="startConnection">Start the connection before performing callback action.
+        /// </param>
+        /// <returns> the result object from working with the session
+        /// </returns>
+        /// <throws>  NMSException if there is any problem </throws>
+        public virtual object Execute(ISessionCallback action, bool startConnection)
+        {
+            AssertUtils.ArgumentNotNull(action, "Callback object must not be null");
+
+            IConnection conToClose = null;
+            ISession sessionToClose = null;
+            try
+            {
+                ISession sessionToUse =
+                    ConnectionFactoryUtils.DoGetTransactionalSession(ConnectionFactory, transactionalResourceFactory);
+                if (sessionToUse == null)
+                {
+                    conToClose = CreateConnection();
+                    sessionToClose = CreateSession(conToClose);
+                    if (startConnection)
+                    {
+                        conToClose.Start();
+                    }
+                    sessionToUse = sessionToClose;
+                }
+                if (logger.IsDebugEnabled)
+                {
+                    logger.Debug("Executing callback on NMS ISession [" + sessionToUse + "]");
+                }
+                return action.DoInNms(sessionToUse);
+            }
+            //TODO make sure don't want to do exception translation.
+            //TODO investigate options to not close session/connection via caching since
+            //these objects are thread safe in tibco ems.
+            finally
+            {
+                if (!CacheNmsResources)
+                {
+                    NmsUtils.CloseSession(sessionToClose);
+                    NmsUtils.CloseConnection(conToClose, startConnection);
+                }
+                //TODO No IConnectionFactory interface so can't create
+                //     non closing impl of IConnection  Need NMS.
+            }
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the default destination to be used on send/receive operations that do not
+        /// have a destination parameter.
+        /// </summary>
+        /// <remarks>Alternatively, specify a "defaultDestinationName", to be
+        /// dynamically resolved via the DestinationResolver.</remarks>
+        /// <value>The default destination.</value>
+        virtual public IDestination DefaultDestination
+        {
+            get { return (defaultDestination as IDestination); }
+
+            set { defaultDestination = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the name of the default destination name
+        /// to be used on send/receive operations that
+        /// do not have a destination parameter.
+        /// </summary>
+        /// <remarks>
+        /// Alternatively, specify a NMS IDestination object as "DefaultDestination"
+        /// </remarks>
+        /// <value>The name of the default destination.</value>
+        virtual public string DefaultDestinationName
+        {
+            get { return (defaultDestination as string); }
+
+            set { defaultDestination = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the message converter for this template.
+        /// </summary>
+        /// <remarks>
+        /// Used to resolve
+        /// Object parameters to convertAndSend methods and Object results
+        /// from receiveAndConvert methods.
+        /// <p>The default converter is a SimpleMessageConverter, which is able
+        /// to handle IBytesMessages, ITextMessages and IObjectMessages.</p>
+        /// </remarks>
+        /// <value>The message converter.</value>
+        virtual public IMessageConverter MessageConverter
+        {
+            get { return messageConverter; }
+
+            set { messageConverter = value; }
+        }
+
+
+        //TODO check tibco support for message id...prob yes..
+        /// <summary>
+        /// Gets or sets a value indicating whether IMessageIds are.
+        /// </summary>
+        /// <value><c>true</c> if [message id enabled]; otherwise, <c>false</c>.</value>
+        virtual public bool MessageIdEnabled
+        {
+            get { return messageIdEnabled; }
+
+            set { messageIdEnabled = value; }
+        }
+
+        //TODO check tibco support for message id...prob yes.., so don't really need it then.
+        /// <summary>
+        /// Gets or sets a value indicating whether message timestamps are enabled.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if [message timestamp enabled]; otherwise, <c>false</c>.
+        /// </value>
+        virtual public bool MessageTimestampEnabled
+        {
+            get { return messageTimestampEnabled; }
+
+            set { messageTimestampEnabled = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to inhibit the delivery of messages published by its own connection.
+        ///
+        /// </summary>
+        /// <value><c>true</c> if inhibit the delivery of messages published by its own connection; otherwise, <c>false</c>.</value>
+        virtual public bool PubSubNoLocal
+        {
+            get { return pubSubNoLocal; }
+
+            set { pubSubNoLocal = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the receive timeout to use for recieve calls.
+        /// </summary>
+        /// <remarks>The default is -1, which means no timeout.</remarks>
+        /// <value>The receive timeout.</value>
+        virtual public long ReceiveTimeout
+        {
+            get { return receiveTimeout; }
+
+            set { receiveTimeout = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to use explicit Quality of Service values.
+        /// </summary>
+        /// <remarks>If "true", then the values of deliveryMode, priority, and timeToLive
+        /// will be used when sending a message. Otherwise, the default values,
+        /// that may be set administratively, will be used</remarks>
+        /// <value><c>true</c> if use explicit QoS values; otherwise, <c>false</c>.</value>
+        virtual public bool ExplicitQosEnabled
+        {
+            get { return explicitQosEnabled; }
+
+            set { explicitQosEnabled = value; }
+        }
+
+        /// <summary>
+        /// Sets a value indicating whether message delivery should be persistent or non-persistent
+        /// </summary>
+        /// <remarks>
+        /// This will set the delivery to persistent or non-persistent
+        /// <p>Default it "true" aka delivery mode "PERSISTENT".</p>
+        /// </remarks>
+        /// <value><c>true</c> if [delivery persistent]; otherwise, <c>false</c>.</value>
+        virtual public bool Persistent
+        {
+			get { return persistent; }
+			
+            set { persistent = value; }
+        }
+
+
+        //TODO verify admin...
+
+        /// <summary>
+        /// Gets or sets the priority when sending.
+        /// </summary>
+        /// <remarks>Since a default value may be defined administratively,
+        /// this is only used when "isExplicitQosEnabled" equals "true".</remarks>
+        /// <value>The priority.</value>
+        virtual public byte Priority
+        {
+            get { return priority; }
+
+            set { priority = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the time to live when sending
+        /// </summary>
+        /// <remarks>Since a default value may be defined administratively,
+        /// this is only used when "isExplicitQosEnabled" equals "true".</remarks>
+        /// <value>The time to live.</value>
+        virtual public TimeSpan TimeToLive
+        {
+            get { return timeToLive; }
+
+            set { timeToLive = value; }
+        }
+
+
+        virtual public bool CacheNmsResources
+        {
+            get { return cacheNmsResources; }
+            set { cacheNmsResources = value; }
+        }
+
+        #endregion
+
+        protected virtual object DoConvertFromMessage(IMessage message)
+        {
+            if (message != null)
+            {
+                return MessageConverter.FromMessage(message);
+            }
+            return null;
+        }
+
+        #region NMS Factory Methods
+
+        /// <summary> Fetch an appropriate IConnection from the given NmsResourceHolder.
+        /// </summary>
+        /// <param name="holder">the NmsResourceHolder
+        /// </param>
+        /// <returns> an appropriate IConnection fetched from the holder,
+        /// or <code>null</code> if none found
+        /// </returns>
+        protected virtual IConnection GetConnection(NmsResourceHolder holder)
+        {
+            return holder.GetConnection();
+        }
+
+        /// <summary> Fetch an appropriate ISession from the given NmsResourceHolder.
+        /// </summary>
+        /// <param name="holder">the NmsResourceHolder
+        /// </param>
+        /// <returns> an appropriate ISession fetched from the holder,
+        /// or <code>null</code> if none found
+        /// </returns>
+        protected virtual ISession GetSession(NmsResourceHolder holder)
+        {
+            return holder.GetSession();
+        }
+
+        /// <summary>Create a NMS IConnection via this template's IConnectionFactory.
+        /// </summary>
+        /// <remarks>If CacheNmsResource is true, then the connection
+        /// will be created upon the first invocation and will retrun the same
+        /// connection on all subsequent calls.
+        /// </remarks>
+        /// <returns>A NMS IConnection
+        /// </returns>
+        /// <throws>NMSException if thrown by NMS API methods </throws>
+        protected virtual IConnection CreateConnection()
+        {
+            if (this.CacheNmsResources)
+            {
+                if (jmsResources.Connection ==  null)
+                {
+                    jmsResources.Connection = ConnectionFactory.CreateConnection();
+                }
+                return jmsResources.Connection;
+
+            }
+            else
+            {
+                return ConnectionFactory.CreateConnection();
+            }
+            
+        }
+
+        /// <summary> Create a NMS ISession for the given IConnection.
+        /// <p>This implementation uses NMS 1.1 API.</p>
+        /// </summary>
+        /// <param name="con">the NMS IConnection to create a ISession for
+        /// </param>
+        /// <returns> the new NMS ISession
+        /// </returns>
+        /// <throws>NMSException if thrown by NMS API methods </throws>
+        protected virtual ISession CreateSession(IConnection con)
+        {
+            if (CacheNmsResources)
+            {
+                if (jmsResources.Session == null)
+                {
+                    jmsResources.Session = jmsResources.Connection.CreateSession(SessionAcknowledgeMode);
+                }
+                return jmsResources.Session;
+            }
+            else
+            {
+                return con.CreateSession(SessionAcknowledgeMode);
+            }
+        }
+
+
+        /// <summary> Create a NMS IMessageProducer for the given ISession and IDestination,
+        /// configuring it to disable message ids and/or timestamps (if necessary).
+        /// <p>Delegates to <code>doCreateProducer</code> for creation of the raw
+        /// NMS IMessageProducer, which needs to be specific to NMS 1.1 or 1.0.2.</p>
+        /// </summary>
+        /// <param name="session">the NMS ISession to create a IMessageProducer for
+        /// </param>
+        /// <param name="destination">the NMS IDestination to create a IMessageProducer for
+        /// </param>
+        /// <returns> the new NMS IMessageProducer
+        /// </returns>
+        /// <throws>  NMSException if thrown by NMS API methods </throws>
+        /// <seealso cref="DoCreateProducer">
+        /// </seealso>
+        /// <seealso cref="MessageIdEnabled">
+        /// </seealso>
+        /// <seealso cref="MessageTimestampEnabled">
+        /// </seealso>
+        protected virtual IMessageProducer CreateProducer(ISession session, IDestination destination)
+        {
+            IMessageProducer producer = DoCreateProducer(session, destination);
+            if (!MessageIdEnabled)
+            {
+                producer.DisableMessageID = true;
+            }
+            if (!MessageTimestampEnabled)
+            {
+                producer.DisableMessageTimestamp = true;
+            }
+            return producer;
+        }
+
+
+        /// <summary> Create a raw NMS IMessageProducer for the given ISession and IDestination.
+        /// <p>This implementation uses NMS 1.1 API.</p>
+        /// </summary>
+        /// <param name="session">the NMS ISession to create a IMessageProducer for
+        /// </param>
+        /// <param name="destination">the NMS IDestination to create a IMessageProducer for
+        /// </param>
+        /// <returns> the new NMS IMessageProducer
+        /// </returns>
+        /// <throws>NMSException if thrown by NMS API methods </throws>
+        protected virtual IMessageProducer DoCreateProducer(ISession session, IDestination destination)
+        {
+            if (CacheNmsResources)
+            {
+                if (jmsResources.MessageProducer == null)
+                {
+                    jmsResources.MessageProducer = session.CreateProducer(destination);
+                }
+                return jmsResources.MessageProducer;
+            }
+            else
+            {
+                return session.CreateProducer(destination);
+            }
+        }
+
+        /// <summary> Create a NMS IMessageConsumer for the given ISession and IDestination.
+        /// <p>This implementation uses NMS 1.1 API.</p>
+        /// </summary>
+        /// <param name="session">the NMS ISession to create a IMessageConsumer for
+        /// </param>
+        /// <param name="destination">the NMS IDestination to create a IMessageConsumer for
+        /// </param>
+        /// <param name="messageSelector">the message selector for this consumer (can be <code>null</code>)
+        /// </param>
+        /// <returns> the new NMS IMessageConsumer
+        /// </returns>
+        /// <throws>  NMSException if thrown by NMS API methods </throws>
+        protected virtual IMessageConsumer CreateConsumer(ISession session, IDestination destination,
+                                                         string messageSelector)
+        {
+            // Only pass in the NoLocal flag in case of a Topic:
+            // Some NMS providers, such as WebSphere MQ 6.0, throw IllegalStateException
+            // in case of the NoLocal flag being specified for a Queue.
+            if (PubSubDomain)
+            {
+                return session.CreateConsumer(destination, messageSelector, PubSubNoLocal);
+            }
+            else
+            {
+                return session.CreateConsumer(destination, messageSelector);
+            }
+        }
+
+        //TODO refactor to not pass null as a 'switch' for behavior.
+        
+        protected internal virtual void DoSend(ISession session, IDestination destination, IMessageCreatorDelegate messageCreatorDelegate)
+        {
+            AssertUtils.ArgumentNotNull(messageCreatorDelegate, "IMessageCreatorDelegate must not be null");
+            DoSend(session, destination, null, messageCreatorDelegate);
+        }
+
+        protected internal virtual void DoSend(ISession session, IDestination destination, IMessageCreator messageCreator)
+        {
+            AssertUtils.ArgumentNotNull(messageCreator, "IMessageCreator must not be null");
+            DoSend(session, destination, messageCreator, null);
+        }
+
+        /// <summary> Send the given NMS message.</summary>
+        /// <param name="session">the NMS ISession to operate on
+        /// </param>
+        /// <param name="destination">the NMS IDestination to send to
+        /// </param>
+        /// <param name="messageCreator">callback to create a NMS IMessage
+        /// </param>
+        /// <param name="messageCreatorDelegate">delegate callback to create a NMS IMessage
+        /// </param>
+        /// <throws>NMSException if thrown by NMS API methods </throws>
+        protected internal virtual void DoSend(ISession session, IDestination destination, IMessageCreator messageCreator,
+                                               IMessageCreatorDelegate messageCreatorDelegate)
+        {
+
+
+            IMessageProducer producer = CreateProducer(session, destination);
+            try
+            {
+                
+                IMessage message = null;
+                if (messageCreator != null)
+                {
+                    message = messageCreator.CreateMessage(session) ;
+                }
+                else {
+                    message = messageCreatorDelegate(session);
+                }
+                if (logger.IsDebugEnabled)
+                {
+                    logger.Debug("Sending created message [" + message + "]");
+                }
+                DoSend(producer, message);
+
+                // Check commit - avoid commit call within a JTA transaction.
+                if (session.Transacted && !TransactionSynchronizationManager.HasResource(ConnectionFactory))
+                {
+                    // Transacted session created by this template -> commit.
+                    NmsUtils.CommitIfNecessary(session);
+                }
+            }
+            finally
+            {
+                CloseProducer(producer);
+            }
+        }
+
+        private void CloseProducer(IMessageProducer producer)
+        {
+            if (!CacheNmsResources)
+            {
+                NmsUtils.CloseMessageProducer(producer);
+            }
+        }
+
+        /// <summary> Actually send the given NMS message.</summary>
+        /// <param name="producer">the NMS IMessageProducer to send with
+        /// </param>
+        /// <param name="message">the NMS IMessage to send
+        /// </param>
+        /// <throws>  NMSException if thrown by NMS API methods </throws>
+        protected virtual void DoSend(IMessageProducer producer, IMessage message)
+        {
+            if (ExplicitQosEnabled)
+            {
+                producer.Send(message, Persistent, Priority, TimeToLive);
+            }
+            else
+            {
+                producer.Send(message);
+            }
+        }
+
+
+        #endregion
+
+        #region INmsOperations Implementation
+
+        /// <summary> Execute the action specified by the given action object within
+        /// a NMS ISession.
+        /// <p>Note: The value of isPubSubDomain affects the behavior of this method.
+        /// If isPubSubDomain equals true, then a ISession is passed to the callback.
+        /// If false, then a ISession is passed to the callback.</p>
+        /// </summary>
+        /// <param name="action">callback object that exposes the session
+        /// </param>
+        /// <returns> the result object from working with the session
+        /// </returns>
+        /// <throws>NMSException if there is any problem </throws>
+        public object Execute(ISessionCallback action)
+        {
+            return Execute(action, false);
+        }
+
+        /// <summary> Send a message to a NMS destination. The callback gives access to
+        /// the NMS session and IMessageProducer in order to do more complex
+        /// send operations.
+        /// </summary>
+        /// <param name="action">callback object that exposes the session/producer pair
+        /// </param>
+        /// <returns> the result object from working with the session
+        /// </returns>
+        /// <throws>NMSException  if there is any problem </throws>
+        public object Execute(IProducerCallback action)
+        {
+            return Execute(new ProducerCreatorCallback(this, action));
+        }
+
+        /// <summary> Send a message to the default destination.
+        /// <p>This will only work with a default destination specified!</p>
+        /// </summary>
+        /// <param name="messageCreatorDelegate">delegate callback to create a message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        public void SendWithDelegate(IMessageCreatorDelegate messageCreatorDelegate)
+        {
+            CheckDefaultDestination();
+            if (DefaultDestination != null)
+            {
+                SendWithDelegate(DefaultDestination, messageCreatorDelegate);
+            }
+            else
+            {
+                SendWithDelegate(DefaultDestinationName, messageCreatorDelegate);
+            }
+        }
+
+        /// <summary> Send a message to the specified destination.
+        /// The IMessageCreator callback creates the message given a ISession.
+        /// </summary>
+        /// <param name="destination">the destination to send this message to
+        /// </param>
+        /// <param name="messageCreatorDelegate">delegate callback to create a message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        public void SendWithDelegate(IDestination destination, IMessageCreatorDelegate messageCreatorDelegate)
+        {
+            Execute(new SendDestinationCallback(this, destination, messageCreatorDelegate), false);
+        }
+
+        /// <summary> Send a message to the specified destination.
+        /// The IMessageCreator callback creates the message given a ISession.
+        /// </summary>
+        /// <param name="destinationName">the name of the destination to send this message to
+        /// (to be resolved to an actual destination by a DestinationResolver)
+        /// </param>
+        /// <param name="messageCreatorDelegate">delegate callback to create a message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        public void SendWithDelegate(string destinationName, IMessageCreatorDelegate messageCreatorDelegate)
+        {
+            Execute(new SendDestinationCallback(this, destinationName, messageCreatorDelegate), false);
+        }
+
+        /// <summary> Send a message to the default destination.
+        /// <p>This will only work with a default destination specified!</p>
+        /// </summary>
+        /// <param name="messageCreator">callback to create a message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        public void Send(IMessageCreator messageCreator)
+        {
+            CheckDefaultDestination();
+            if (DefaultDestination != null)
+            {
+                Send(DefaultDestination, messageCreator);
+            }
+            else
+            {
+                Send(DefaultDestinationName, messageCreator);
+            }
+        }
+
+        /// <summary> Send a message to the specified destination.
+        /// The IMessageCreator callback creates the message given a ISession.
+        /// </summary>
+        /// <param name="destination">the destination to send this message to
+        /// </param>
+        /// <param name="messageCreator">callback to create a message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        public void Send(IDestination destination, IMessageCreator messageCreator)
+        {
+            
+            Execute(new SendDestinationCallback(this, destination, messageCreator), false);
+        }
+
+        /// <summary> Send a message to the specified destination.
+        /// The IMessageCreator callback creates the message given a ISession.
+        /// </summary>
+        /// <param name="destinationName">the destination to send this message to
+        /// </param>
+        /// <param name="messageCreator">callback to create a message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        public void Send(string destinationName, IMessageCreator messageCreator)
+        {
+            Execute(new SendDestinationCallback(this, destinationName, messageCreator), false);
+        }
+        /// <summary> Send the given object to the default destination, converting the object
+        /// to a NMS message with a configured IMessageConverter.
+        /// <p>This will only work with a default destination specified!</p>
+        /// </summary>
+        /// <param name="message">the object to convert to a message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        public void ConvertAndSend(object message)
+        {
+            CheckDefaultDestination();
+            if (DefaultDestination != null)
+            {
+                ConvertAndSend(DefaultDestination, message);
+            }
+            else
+            {
+                ConvertAndSend(DefaultDestinationName, message);
+            }
+        }
+
+        /// <summary> Send the given object to the specified destination, converting the object
+        /// to a NMS message with a configured IMessageConverter.
+        /// </summary>
+        /// <param name="destination">the destination to send this message to
+        /// </param>
+        /// <param name="message">the object to convert to a message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        public void ConvertAndSend(IDestination destination, object message)
+        {
+            CheckMessageConverter();
+            Send(destination, new SimpleMessageCreator(this, message));
+        }
+
+        /// <summary> Send the given object to the specified destination, converting the object
+        /// to a NMS message with a configured IMessageConverter.
+        /// </summary>
+        /// <param name="destinationName">the name of the destination to send this message to
+        /// (to be resolved to an actual destination by a DestinationResolver)
+        /// </param>
+        /// <param name="message">the object to convert to a message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        public void ConvertAndSend(string destinationName, object message)
+        {
+            Send(destinationName, new SimpleMessageCreator(this, message));
+        }
+
+        /// <summary> Send the given object to the default destination, converting the object
+        /// to a NMS message with a configured IMessageConverter. The IMessagePostProcessor
+        /// callback allows for modification of the message after conversion.
+        /// <p>This will only work with a default destination specified!</p>
+        /// </summary>
+        /// <param name="message">the object to convert to a message
+        /// </param>
+        /// <param name="postProcessor">the callback to modify the message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        public void ConvertAndSend(object message, IMessagePostProcessor postProcessor)
+        {
+            CheckDefaultDestination();
+            if (DefaultDestination != null)
+            {
+                ConvertAndSend(DefaultDestination, message, postProcessor);
+            }
+            else
+            {
+                ConvertAndSend(DefaultDestinationName, message, postProcessor);
+            }
+        }
+
+        /// <summary> Send the given object to the specified destination, converting the object
+        /// to a NMS message with a configured IMessageConverter. The IMessagePostProcessor
+        /// callback allows for modification of the message after conversion.
+        /// </summary>
+        /// <param name="destination">the destination to send this message to
+        /// </param>
+        /// <param name="message">the object to convert to a message
+        /// </param>
+        /// <param name="postProcessor">the callback to modify the message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        public void ConvertAndSend(IDestination destination, object message, IMessagePostProcessor postProcessor)
+        {
+            CheckMessageConverter();
+            Send(destination, new ConvertAndSendMessageCreator(this, message, postProcessor));
+            
+        }
+
+        /// <summary> Send the given object to the specified destination, converting the object
+        /// to a NMS message with a configured IMessageConverter. The IMessagePostProcessor
+        /// callback allows for modification of the message after conversion.
+        /// </summary>
+        /// <param name="destinationName">the name of the destination to send this message to
+        /// (to be resolved to an actual destination by a DestinationResolver)
+        /// </param>
+        /// <param name="message">the object to convert to a message.
+        /// </param>
+        /// <param name="postProcessor">the callback to modify the message
+        /// </param>
+        /// <throws>NMSException if there is any problem</throws>
+        public void ConvertAndSend(string destinationName, object message, IMessagePostProcessor postProcessor)
+        {
+            CheckMessageConverter();
+            Send(destinationName, new ConvertAndSendMessageCreator(this, message, postProcessor));
+  
+        }
+
+        /// <summary> Receive a message synchronously from the default destination, but only
+        /// wait up to a specified time for delivery.
+        /// <p>This method should be used carefully, since it will block the thread
+        /// until the message becomes available or until the timeout value is exceeded.</p>
+        /// <p>This will only work with a default destination specified!</p>
+        /// </summary>
+        /// <returns> the message received by the consumer, or <code>null</code> if the timeout expires
+        /// </returns>
+        /// <throws>NMSException if there is any problem</throws>
+        public IMessage Receive()
+        {
+            CheckDefaultDestination();
+            if (DefaultDestination != null)
+            {
+                return Receive(DefaultDestination);
+            }
+            else
+            {
+                return Receive(DefaultDestinationName);
+            }
+        }
+
+        /// <summary> Receive a message synchronously from the specified destination, but only
+        /// wait up to a specified time for delivery.
+        /// <p>This method should be used carefully, since it will block the thread
+        /// until the message becomes available or until the timeout value is exceeded.</p>
+        /// </summary>
+        /// <param name="destination">the destination to receive a message from
+        /// </param>
+        /// <returns> the message received by the consumer, or <code>null</code> if the timeout expires
+        /// </returns>
+        /// <throws>NMSException if there is any problem</throws>
+        public IMessage Receive(IDestination destination)
+        {
+            return Execute(new ReceiveCallback(this, destination)) as IMessage;
+        }
+
+
+        /// <summary> Receive a message synchronously from the specified destination, but only
+        /// wait up to a specified time for delivery.
+        /// <p>This method should be used carefully, since it will block the thread
+        /// until the message becomes available or until the timeout value is exceeded.</p>
+        /// </summary>
+        /// <param name="destinationName">the name of the destination to send this message to
+        /// (to be resolved to an actual destination by a DestinationResolver)
+        /// </param>
+        /// <returns> the message received by the consumer, or <code>null</code> if the timeout expires
+        /// </returns>
+        /// <throws>NMSException if there is any problem</throws>
+        public IMessage Receive(string destinationName)
+        {
+            return Execute(new ReceiveCallback(this, destinationName)) as IMessage;
+        }
+
+        /// <summary> Receive a message synchronously from the default destination, but only
+        /// wait up to a specified time for delivery.
+        /// <p>This method should be used carefully, since it will block the thread
+        /// until the message becomes available or until the timeout value is exceeded.</p>
+        /// <p>This will only work with a default destination specified!</p>
+        /// </summary>
+        /// <param name="messageSelector">the NMS message selector expression (or <code>null</code> if none).
+        /// See the NMS specification for a detailed definition of selector expressions.
+        /// </param>
+        /// <returns> the message received by the consumer, or <code>null</code> if the timeout expires
+        /// </returns>
+        /// <throws>NMSException if there is any problem</throws>
+        public IMessage ReceiveSelected(string messageSelector)
+        {
+            CheckDefaultDestination();
+            if (DefaultDestination!= null)
+            {
+                return ReceiveSelected(DefaultDestination, messageSelector);
+            }
+            else
+            {
+                return ReceiveSelected(DefaultDestinationName, messageSelector);
+            }
+        }
+
+        /// <summary> Receive a message synchronously from the specified destination, but only
+        /// wait up to a specified time for delivery.
+        /// <p>This method should be used carefully, since it will block the thread
+        /// until the message becomes available or until the timeout value is exceeded.</p>
+        /// </summary>
+        /// <param name="destination">the destination to receive a message from
+        /// </param>
+        /// <param name="messageSelector">the NMS message selector expression (or <code>null</code> if none).
+        /// See the NMS specification for a detailed definition of selector expressions.
+        /// </param>
+        /// <returns> the message received by the consumer, or <code>null</code> if the timeout expires
+        /// </returns>
+        /// <throws>NMSException if there is any problem</throws>
+        public IMessage ReceiveSelected(IDestination destination, string messageSelector)
+        {
+            return Execute(new ReceiveSelectedCallback(this, destination, messageSelector), true) as IMessage;
+        }
+
+        /// <summary> Receive a message synchronously from the specified destination, but only
+        /// wait up to a specified time for delivery.
+        /// <p>This method should be used carefully, since it will block the thread
+        /// until the message becomes available or until the timeout value is exceeded.</p>
+        /// </summary>
+        /// <param name="destinationName">the name of the destination to send this message to
+        /// (to be resolved to an actual destination by a DestinationResolver)
+        /// </param>
+        /// <param name="messageSelector">the NMS message selector expression (or <code>null</code> if none).
+        /// See the NMS specification for a detailed definition of selector expressions.
+        /// </param>
+        /// <returns> the message received by the consumer, or <code>null</code> if the timeout expires
+        /// </returns>
+        /// <throws>NMSException if there is any problem</throws>
+        public IMessage ReceiveSelected(string destinationName, string messageSelector)
+        {
+            return Execute(new ReceiveSelectedCallback(this, destinationName, messageSelector), true) as IMessage;
+        
+        }
+        
+        protected virtual IMessage DoReceive(ISession session, IDestination destination, string messageSelector)
+        {
+            return DoReceive(session, CreateConsumer(session, destination, messageSelector));
+        }
+        
+        protected virtual IMessage DoReceive(ISession session, IMessageConsumer consumer)
+        {
+            try
+            {
+                long timeout = ReceiveTimeout;
+                NmsResourceHolder resourceHolder =
+                (NmsResourceHolder)TransactionSynchronizationManager.GetResource(ConnectionFactory);
+                if (resourceHolder != null && resourceHolder.HasTimeout)
+                {
+                    timeout = Convert.ToInt64(resourceHolder.TimeToLiveInMilliseconds);
+                }
+                IMessage message = (timeout > 0)
+                                      ? consumer.Receive(new TimeSpan(timeout))
+                                      : consumer.Receive();
+                if (session.Transacted)
+                {
+                    // Commit necessary - but avoid commit call within a JTA transaction.
+                    if (resourceHolder == null)
+                    {
+                        // Transacted session created by this template -> commit.
+                        NmsUtils.CommitIfNecessary(session);
+                    }
+                }
+                else if (ClientAcknowledge(session))
+                {
+                    // Manually acknowledge message, if any.
+                    if (message != null)
+                    {
+                        message.Acknowledge();
+                    }
+                }
+                return message;
+            }
+            finally
+            {
+                NmsUtils.CloseMessageConsumer(consumer);
+            }
+        }
+
+        /// <summary>
+        /// Returns whether the ISession is in client acknowledgement mode.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <returns>true ifin client ack mode, false otherwise</returns>
+        protected virtual bool ClientAcknowledge(ISession session)
+        {
+            return (session.AcknowledgementMode == AcknowledgementMode.ClientAcknowledge);
+        }
+
+
+        /// <summary> Receive a message synchronously from the default destination, but only
+        /// wait up to a specified time for delivery. Convert the message into an
+        /// object with a configured IMessageConverter.
+        /// <p>This method should be used carefully, since it will block the thread
+        /// until the message becomes available or until the timeout value is exceeded.</p>
+        /// <p>This will only work with a default destination specified!</p>
+        /// </summary>
+        /// <returns> the message produced for the consumer or <code>null</code> if the timeout expires.
+        /// </returns>
+        /// <throws>NMSException if there is any problem</throws>
+        public object ReceiveAndConvert()
+        {
+            CheckMessageConverter();
+            return DoConvertFromMessage(Receive());
+        }
+
+        /// <summary> Receive a message synchronously from the specified destination, but only
+        /// wait up to a specified time for delivery. Convert the message into an
+        /// object with a configured IMessageConverter.
+        /// <p>This method should be used carefully, since it will block the thread
+        /// until the message becomes available or until the timeout value is exceeded.</p>
+        /// </summary>
+        /// <param name="destination">the destination to receive a message from
+        /// </param>
+        /// <returns> the message produced for the consumer or <code>null</code> if the timeout expires.
+        /// </returns>
+        /// <throws>NMSException if there is any problem</throws>
+        public object ReceiveAndConvert(IDestination destination)
+        {
+            CheckMessageConverter();
+            return DoConvertFromMessage(Receive(destination));
+        }
+
+
+        /// <summary> Receive a message synchronously from the specified destination, but only
+        /// wait up to a specified time for delivery. Convert the message into an
+        /// object with a configured IMessageConverter.
+        /// <p>This method should be used carefully, since it will block the thread
+        /// until the message becomes available or until the timeout value is exceeded.</p>
+        /// </summary>
+        /// <param name="destinationName">the name of the destination to send this message to
+        /// (to be resolved to an actual destination by a DestinationResolver)
+        /// </param>
+        /// <returns> the message produced for the consumer or <code>null</code> if the timeout expires.
+        /// </returns>
+        /// <throws>NMSException if there is any problem</throws>
+        public object ReceiveAndConvert(string destinationName)
+        {
+            CheckMessageConverter();
+            return DoConvertFromMessage(Receive(destinationName));
+        }
+
+        /// <summary> Receive a message synchronously from the default destination, but only
+        /// wait up to a specified time for delivery. Convert the message into an
+        /// object with a configured IMessageConverter.
+        /// <p>This method should be used carefully, since it will block the thread
+        /// until the message becomes available or until the timeout value is exceeded.</p>
+        /// <p>This will only work with a default destination specified!</p>
+        /// </summary>
+        /// <param name="messageSelector">the NMS message selector expression (or <code>null</code> if none).
+        /// See the NMS specification for a detailed definition of selector expressions.
+        /// </param>
+        /// <returns> the message produced for the consumer or <code>null</code> if the timeout expires.
+        /// </returns>
+        /// <throws>NMSException if there is any problem</throws>
+        public object ReceiveSelectedAndConvert(string messageSelector)
+        {
+            CheckMessageConverter();
+            return DoConvertFromMessage(ReceiveSelected(messageSelector)); ;
+        }
+
+        /// <summary> Receive a message synchronously from the specified destination, but only
+        /// wait up to a specified time for delivery. Convert the message into an
+        /// object with a configured IMessageConverter.
+        /// <p>This method should be used carefully, since it will block the thread
+        /// until the message becomes available or until the timeout value is exceeded.</p>
+        /// </summary>
+        /// <param name="destination">the destination to receive a message from
+        /// </param>
+        /// <param name="messageSelector">the NMS message selector expression (or <code>null</code> if none).
+        /// See the NMS specification for a detailed definition of selector expressions.
+        /// </param>
+        /// <returns> the message produced for the consumer or <code>null</code> if the timeout expires.
+        /// </returns>
+        /// <throws>NMSException if there is any problem</throws>
+        public object ReceiveSelectedAndConvert(IDestination destination, string messageSelector)
+        {
+            CheckMessageConverter();
+            return DoConvertFromMessage(ReceiveSelected(destination, messageSelector));
+        }
+
+        /// <summary> Receive a message synchronously from the specified destination, but only
+        /// wait up to a specified time for delivery. Convert the message into an
+        /// object with a configured IMessageConverter.
+        /// <p>This method should be used carefully, since it will block the thread
+        /// until the message becomes available or until the timeout value is exceeded.</p>
+        /// </summary>
+        /// <param name="destinationName">the name of the destination to send this message to
+        /// (to be resolved to an actual destination by a DestinationResolver)
+        /// </param>
+        /// <param name="messageSelector">the NMS message selector expression (or <code>null</code> if none).
+        /// See the NMS specification for a detailed definition of selector expressions.
+        /// </param>
+        /// <returns> the message produced for the consumer or <code>null</code> if the timeout expires.
+        /// </returns>
+        /// <throws>NMSException if there is any problem</throws>
+        public object ReceiveSelectedAndConvert(string destinationName, string messageSelector)
+        {
+            CheckMessageConverter();
+            return DoConvertFromMessage(ReceiveSelected(destinationName, messageSelector));
+        }
+
+        #endregion
+
+        #region Supporting Internal Classes
+
+        private class NmsTemplateResourceFactory : ConnectionFactoryUtils.ResourceFactory
+        {
+            private NmsTemplate enclosingTemplateInstance;
+			
+            public NmsTemplateResourceFactory(NmsTemplate enclosingInstance)
+            {
+                InitBlock(enclosingInstance);
+            }
+
+            private void InitBlock(NmsTemplate enclosingInstance)
+            {
+                enclosingTemplateInstance = enclosingInstance;
+            }
+
+            public NmsTemplate Enclosing_Instance
+            {
+                get { return enclosingTemplateInstance; }
+            }
+
+            public virtual IConnection GetConnection(NmsResourceHolder holder)
+            {
+                return Enclosing_Instance.GetConnection(holder);
+            }
+
+            public virtual ISession GetSession(NmsResourceHolder holder)
+            {
+                return Enclosing_Instance.GetSession(holder);
+            }
+
+            public virtual IConnection CreateConnection()
+            {
+                return Enclosing_Instance.CreateConnection();
+            }
+
+            public virtual ISession CreateSession(IConnection con)
+            {
+                return Enclosing_Instance.CreateSession(con);
+            }
+
+            public bool SynchedLocalTransactionAllowed
+            {
+                get { return Enclosing_Instance.SessionTransacted; }
+            }
+        }
+
+        private class ProducerCreatorCallback : ISessionCallback
+        {
+            private NmsTemplate jmsTemplate;
+            private IProducerCallback producerCallback;
+
+            public ProducerCreatorCallback(NmsTemplate jmsTemplate, IProducerCallback producerCallback)
+            {
+                this.jmsTemplate = jmsTemplate;
+            }
+
+            public object DoInNms(ISession session)
+            {
+                IMessageProducer producer = jmsTemplate.CreateProducer(session, null);
+                try
+                {
+                    return producerCallback.DoInNms(session, producer);
+                }
+                finally
+                {
+                    NmsUtils.CloseMessageProducer(producer);
+                }
+
+            }
+        }
+
+        private class ReceiveCallback : ISessionCallback
+        {
+            private NmsTemplate jmsTemplate;
+            private IDestination destination;
+            private string destinationName;
+
+
+            public ReceiveCallback(NmsTemplate jmsTemplate, string destinationName)
+            {
+                this.jmsTemplate = jmsTemplate;
+                this.destinationName = destinationName;
+            }
+
+            public ReceiveCallback(NmsTemplate jmsTemplate, IDestination destination)
+            {
+                this.jmsTemplate = jmsTemplate;
+                this.destination = destination;
+            }
+
+            public object DoInNms(ISession session)
+            {
+                if (destination != null)
+                {
+                    return jmsTemplate.DoReceive(session, destination, null);
+                }
+                else
+                {
+                    return jmsTemplate.DoReceive(session,
+                                                 jmsTemplate.ResolveDestinationName(session, destinationName),
+                                                 null);
+                }
+                
+            }
+        }
+
+        private class ConvertAndSendMessageCreator : IMessageCreator
+        {
+            private NmsTemplate jmsTemplate;
+            private object objectToConvert;
+            private IMessagePostProcessor messagePostProcessor;
+
+            public ConvertAndSendMessageCreator(NmsTemplate jmsTemplate, object message, IMessagePostProcessor messagePostProcessor)
+            {
+                this.jmsTemplate = jmsTemplate;
+                objectToConvert = message;
+                this.messagePostProcessor = messagePostProcessor;
+            }
+
+            public IMessage CreateMessage(ISession session)
+            {
+                IMessage msg = jmsTemplate.MessageConverter.ToMessage(objectToConvert, session);
+                return messagePostProcessor.PostProcessMessage(msg);
+            }
+        }
+
+        private class ReceiveSelectedCallback : ISessionCallback
+        {
+            private NmsTemplate jmsTemplate;
+            private string messageSelector;
+            private string destinationName;
+            private IDestination destination;
+
+            public ReceiveSelectedCallback(NmsTemplate jmsTemplate,
+                               IDestination destination,
+                               string messageSelector)
+            {
+                this.jmsTemplate = jmsTemplate;
+                this.destination = destination;
+                this.messageSelector = messageSelector;
+            }
+            public ReceiveSelectedCallback(NmsTemplate jmsTemplate,
+                                           string destinationName,
+                                           string messageSelector)
+            {
+                this.jmsTemplate = jmsTemplate;
+                this.destinationName = destinationName;
+                this.messageSelector = messageSelector;
+            }
+
+            public object DoInNms(ISession session)
+            {
+                if (destination != null)
+                {
+                    return jmsTemplate.DoReceive(session, destination, messageSelector);
+                }
+                else
+                {
+                    return jmsTemplate.DoReceive(session,
+                                                 jmsTemplate.ResolveDestinationName(session, destinationName),
+                                                 messageSelector);
+                }
+
+            }
+
+        }
+        
+        #endregion
+    }
+
+    /// <summary>
+    /// This is a TIBCO specific class so that we can reuse connections, session, and
+    /// message producers instead of creating/destroying them on each operation.
+    /// </summary>
+    internal class NmsResources
+    {
+        private IConnection connection;
+        private ISession session;
+        private IMessageProducer messageProducer;
+
+        public IConnection Connection
+        {
+            get { return connection; }
+            set { connection = value; }
+        }
+
+        public ISession Session
+        {
+            get { return session; }
+            set { session = value; }
+        }
+
+        public IMessageProducer MessageProducer
+        {
+            get { return messageProducer; }
+            set { messageProducer = value; }
+        }
+    }
+
+
+    internal class SimpleMessageCreator : IMessageCreator
+    {
+        private NmsTemplate jmsTemplate;
+        private object objectToConvert;
+        
+        public SimpleMessageCreator(NmsTemplate jmsTemplate, object objectToConvert)
+        {
+            this.jmsTemplate = jmsTemplate;
+            this.objectToConvert = objectToConvert;
+        }
+
+        public IMessage CreateMessage(ISession session)
+        {
+            return jmsTemplate.MessageConverter.ToMessage(objectToConvert, session);
+        }
+
+
+    }
+
+
+
+    internal class SendDestinationCallback : ISessionCallback
+    {
+        private string destinationName;
+        private IDestination destination;
+        private NmsTemplate jmsTemplate;
+        private IMessageCreator messageCreator;
+        private IMessageCreatorDelegate messageCreatorDelegate;
+
+        public SendDestinationCallback(NmsTemplate jmsTemplate, string destinationName, IMessageCreator messageCreator)
+        {
+            this.jmsTemplate = jmsTemplate;
+            this.destinationName = destinationName;
+            this.messageCreator = messageCreator;
+        }
+
+        public SendDestinationCallback(NmsTemplate jmsTemplate, IDestination destination, IMessageCreator messageCreator)
+        {
+            this.jmsTemplate = jmsTemplate;
+            this.destination = destination;
+            this.messageCreator = messageCreator;
+        }
+
+        public SendDestinationCallback(NmsTemplate jmsTemplate, string destinationName, IMessageCreatorDelegate messageCreatorDelegate)
+        {
+            this.jmsTemplate = jmsTemplate;
+            this.destinationName = destinationName;
+            this.messageCreatorDelegate = messageCreatorDelegate;
+        }
+
+        public SendDestinationCallback(NmsTemplate jmsTemplate, IDestination destination, IMessageCreatorDelegate messageCreatorDelegate)
+        {
+            this.jmsTemplate = jmsTemplate;
+            this.destination = destination;
+            this.messageCreatorDelegate = messageCreatorDelegate;
+        }
+
+
+        public object DoInNms(ISession session)
+        {
+            if (destination == null)
+            {
+                destination = jmsTemplate.ResolveDestinationName(session, destinationName);
+            }
+            if (messageCreator != null)
+            {
+                jmsTemplate.DoSend(session, destination, messageCreator);
+            }
+            else
+            {
+                jmsTemplate.DoSend(session, destination, messageCreatorDelegate);
+            }
+            return null;
+        }
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs
new file mode 100644
index 00000000..2453709b
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs
@@ -0,0 +1,55 @@
+#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 NMS;
+
+namespace Spring.Messaging.Nms.Support.Converter
+{
+    /// <summary> Strategy interface that specifies a IMessageConverter
+    /// between .NET objects and NMS messages.
+    /// 
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    public interface IMessageConverter
+    {
+        /// <summary> Convert a .NET object to a NMS IMessage using the supplied session
+        /// to create the message object.
+        /// </summary>
+        /// <param name="objectToConvert">the object to convert
+        /// </param>
+        /// <param name="session">the ISession to use for creating a NMS IMessage
+        /// </param>
+        /// <returns> the NMS IMessage
+        /// </returns>
+        /// <throws>NMSException if thrown by NMS API methods </throws>
+        /// <throws>IMessageConversionException in case of conversion failure </throws>
+        IMessage ToMessage(object objectToConvert, ISession session);
+
+        /// <summary> Convert from a NMS IMessage to a .NET object.</summary>
+        /// <param name="message">the message to convert
+        /// </param>
+        /// <returns> the converted .NET object
+        /// </returns>
+        /// <throws>IMessageConversionException in case of conversion failure </throws>
+        object FromMessage(IMessage message);
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/MessageConversionException.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/MessageConversionException.cs
new file mode 100644
index 00000000..c7fbca9f
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/MessageConversionException.cs
@@ -0,0 +1,85 @@
+#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.Runtime.Serialization;
+
+namespace Spring.Messaging.Nms.Support.Converter
+{
+    /// <summary> Thrown by IMessageConverter implementations when the conversion
+    /// of an object to/from a IMessage fails.
+    /// 
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    [Serializable]
+    public class IMessageConversionException : ApplicationException
+    {
+        //TODO add jms root exception hierarchy?....
+        #region Constructor (s) / Destructor
+        /// <summary>Creates a new instance of the IMessageConverterException class.</summary>
+        public IMessageConversionException()
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the IMessageConverterException class. with the specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        public IMessageConversionException(string message)
+            : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the IMessageConverterException class with the specified message
+        /// and root cause.
+        /// </summary>
+        /// <param name="message">
+        /// A message about the exception.
+        /// </param>
+        /// <param name="rootCause">
+        /// The root exception that is being wrapped.
+        /// </param>
+        public IMessageConversionException(string message, Exception rootCause)
+            : base(message, rootCause)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the IMessageConverterException class.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception being thrown.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        protected IMessageConversionException(
+            SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs
new file mode 100644
index 00000000..0fcf3c02
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs
@@ -0,0 +1,233 @@
+#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.Collections;
+using System.Runtime.Serialization;
+using NMS;
+
+namespace Spring.Messaging.Nms.Support.Converter
+{
+    /// <summary> A simple message converter that can handle ITextMessages, IBytesMessages,
+    /// IMapMessages, and IObjectMessages. Used as default by NmsTemplate, for
+    /// <code>ConvertAndSend</code> and <code>ReceiveAndConvert</code> operations.
+    ///
+    /// <p>Converts a String to a NMS ITextMessage, a byte array to a NMS IBytesMessage,
+    /// a Map to a NMS IMapMessage, and a Serializable object to a NMS IObjectMessage
+    /// (or vice versa).</p>
+    ///
+    ///
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    public class SimpleMessageConverter : IMessageConverter
+    {
+        /// <summary> Convert a .NET object to a NMS IMessage using the supplied session
+        /// to create the message object.
+        /// </summary>
+        /// <param name="objectToConvert">the object to convert
+        /// </param>
+        /// <param name="session">the ISession to use for creating a NMS IMessage
+        /// </param>
+        /// <returns> the NMS IMessage
+        /// </returns>
+        /// <throws>NMSException if thrown by NMS API methods </throws>
+        /// <throws>IMessageConversionException in case of conversion failure </throws>
+        public IMessage ToMessage(object objectToConvert, ISession session)
+        {
+            if (objectToConvert is IMessage)
+            {
+                return (IMessage) objectToConvert;
+            }
+            else if (objectToConvert is string)
+            {
+                return CreateMessageForString((string) objectToConvert, session);
+            }
+            else if (objectToConvert is sbyte[])
+            {
+                return CreateMessageForByteArray((byte[]) objectToConvert, session);
+            }
+            else if (objectToConvert is IDictionary)
+            {
+                return CreateMessageForMap((IDictionary) objectToConvert, session);
+            }
+            else if (objectToConvert is ISerializable)
+            {
+                return
+                    CreateMessageForSerializable(((ISerializable) objectToConvert), session);
+            }
+            else
+            {
+                throw new IMessageConversionException("Cannot convert object [" + objectToConvert + "] to NMS message");
+            }
+        }
+
+        /// <summary> Convert from a NMS IMessage to a .NET object.</summary>
+        /// <param name="message">the message to convert
+        /// </param>
+        /// <returns> the converted .NET object
+        /// </returns>
+        /// <throws>IMessageConversionException in case of conversion failure </throws>
+        public object FromMessage(IMessage message)
+        {
+            if (message is ITextMessage)
+            {
+                return ExtractStringFromMessage((ITextMessage) message);
+            }
+            else if (message is IBytesMessage)
+            {
+                return ExtractByteArrayFromMessage((IBytesMessage) message);
+            }
+            else if (message is IMapMessage)
+            {
+                return ExtractMapFromMessage((IMapMessage) message);
+            }
+            else if (message is IObjectMessage)
+            {
+                return ExtractSerializableFromMessage((IObjectMessage) message);
+            }
+            else
+            {
+                return message;
+            }
+        }
+
+        #region To Converter Methods
+
+        /// <summary> Create a NMS ITextMessage for the given String.</summary>
+        /// <param name="text">the String to convert
+        /// </param>
+        /// <param name="session">current NMS session
+        /// </param>
+        /// <returns> the resulting message
+        /// </returns>
+        /// <throws>  NMSException if thrown by NMS methods </throws>
+        protected virtual ITextMessage CreateMessageForString(string text, ISession session)
+        {
+            return session.CreateTextMessage((text));
+        }
+
+        /// <summary> Create a NMS IBytesMessage for the given byte array.</summary>
+        /// <param name="bytes">the byyte array to convert
+        /// </param>
+        /// <param name="session">current NMS session
+        /// </param>
+        /// <returns> the resulting message
+        /// </returns>
+        /// <throws>  NMSException if thrown by NMS methods </throws>
+        protected virtual IBytesMessage CreateMessageForByteArray(byte[] bytes, ISession session)
+        {
+            IBytesMessage message = session.CreateBytesMessage();
+            message.Content = bytes;
+            return message;
+        }
+
+        /// <summary> Create a NMS IMapMessage for the given Map.</summary>
+        /// <param name="map">the Map to convert
+        /// </param>
+        /// <param name="session">current NMS session
+        /// </param>
+        /// <returns> the resulting message
+        /// </returns>
+        /// <throws>  NMSException if thrown by NMS methods </throws>
+        protected virtual IMapMessage CreateMessageForMap(IDictionary map, ISession session)
+        {
+            IMapMessage mapMessage = session.CreateMapMessage();
+            foreach (DictionaryEntry entry in map)
+            {
+                if (!(entry.Key is string))
+                {
+                    //UPGRADE_TODO: The equivalent in .NET for method 'java.lang.Class.getName' may return a different value. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1043'"
+                    throw new IMessageConversionException("Cannot convert non-String key of type [" +
+                                                         (entry.Key != null ? entry.Key.GetType().FullName : null) +
+                                                         "] to IMapMessage entry");
+                }
+                mapMessage.Body[entry.Key.ToString()] = entry.Value;
+            }
+            return mapMessage;
+        }
+
+        /// <summary> Create a NMS IObjectMessage for the given Serializable object.</summary>
+        /// <param name="objectToSend">the Serializable object to convert
+        /// </param>
+        /// <param name="session">current NMS session
+        /// </param>
+        /// <returns> the resulting message
+        /// </returns>
+        /// <throws>  NMSException if thrown by NMS methods </throws>
+        protected virtual IObjectMessage CreateMessageForSerializable(
+            ISerializable objectToSend, ISession session)
+        {
+            return session.CreateObjectMessage(objectToSend);
+        }
+
+        #endregion
+
+        #region From Converter Mehtods
+
+        /// <summary> Extract a String from the given ITextMessage.</summary>
+        /// <param name="message">the message to convert
+        /// </param>
+        /// <returns> the resulting String
+        /// </returns>
+        /// <throws>  NMSException if thrown by NMS methods </throws>
+        protected virtual string ExtractStringFromMessage(ITextMessage message)
+        {
+            return message.Text;
+        }
+
+        /// <summary> Extract a byte array from the given IBytesMessage.</summary>
+        /// <param name="message">the message to convert
+        /// </param>
+        /// <returns> the resulting byte array
+        /// </returns>
+        /// <throws>  NMSException if thrown by NMS methods </throws>
+        protected virtual byte[] ExtractByteArrayFromMessage(IBytesMessage message)
+        {
+			return message.Content;
+        }
+
+        /// <summary> Extract a IDictionary from the given IMapMessage.</summary>
+        /// <param name="message">the message to convert
+        /// </param>
+        /// <returns> the resulting Map
+        /// </returns>
+        /// <throws>  NMSException if thrown by NMS methods </throws>
+        protected virtual IDictionary ExtractMapFromMessage(IMapMessage message)
+        {
+            IDictionary dictionary = new Hashtable();
+            IEnumerator e = message.Body.Keys.GetEnumerator();
+            while (e.MoveNext())
+            {
+                String key = (String) e.Current;
+                dictionary.Add(key, message.Body[key]);
+            }
+            return dictionary;
+        }
+
+        protected virtual object ExtractSerializableFromMessage(
+            IObjectMessage message)
+        {
+            return message.Body as ISerializable;
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs
new file mode 100644
index 00000000..7587e40f
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs
@@ -0,0 +1,78 @@
+#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 Spring.Util;
+using NMS;
+
+namespace Spring.Messaging.Nms.Support.IDestinations
+{
+    /// <summary> Simple DestinationResolver implementation resolving destination names
+    /// as dynamic destinations.</summary>
+    ///
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    public class DynamicDestinationResolver : IDestinationResolver
+    {
+        /// <summary> Resolve the given destination name, either as located resource
+        /// or as dynamic destination.
+        /// </summary>
+        /// <param name="session">the current NMS ISession
+        /// </param>
+        /// <param name="destinationName">the name of the destination
+        /// </param>
+        /// <param name="pubSubDomain"><code>true</code> if the domain is pub-sub, <code>false</code> if P2P
+        /// </param>
+        /// <returns> the NMS destination (either a topic or a queue)
+        /// </returns>
+        /// <throws>NMSException if resolution failed </throws>
+        public IDestination ResolveDestinationName(ISession session, string destinationName, bool pubSubDomain)
+        {
+            AssertUtils.ArgumentNotNull(session, "ISession must not be null");
+            AssertUtils.ArgumentNotNull(destinationName, "IDestination name must not be null");
+            if (pubSubDomain)
+            {
+                return ResolveTopic(session, destinationName);
+            }
+            else
+            {
+                return ResolveQueue(session, destinationName);
+            }
+        }
+
+
+        /// <summary> Resolve the given destination name to a Topic.</summary>
+        /// <param name="session">the current NMS ISession
+        /// </param>
+        /// <param name="topicName">the name of the desired Topic.
+        /// </param>
+        /// <returns> the NMS Topic name
+        /// </returns>
+        /// <throws>NMSException if resolution failed </throws>
+        protected internal virtual IDestination ResolveTopic(ISession session, System.String topicName)
+        {
+            return session.GetTopic(topicName);
+        }
+
+        protected internal virtual IDestination ResolveQueue(ISession session, string queueName)
+        {
+            return session.GetQueue(queueName);
+        }
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs
new file mode 100644
index 00000000..ea19c104
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs
@@ -0,0 +1,58 @@
+#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 NMS;
+
+namespace Spring.Messaging.Nms.Support.IDestinations
+{
+    /// <summary> Strategy interface for resolving NMS destinations.
+    /// </summary>
+    /// <remarks>
+    /// <para>Used by NmsTemplate for resolving
+    /// destination names from simple Strings to actual
+    /// IDestination implementation instances.
+    /// </para>
+    /// 
+    /// <para>The default DestinationResolver implementation used by
+    /// NmsTemplate instances is the
+    /// DynamicDestinationResolver class. Consider using the
+    /// JndiDestinationResolver for more advanced scenarios.
+    /// </para>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    public interface IDestinationResolver
+    {
+        /// <summary> Resolve the given destination name, either as located resource
+        /// or as dynamic destination.
+        /// </summary>
+        /// <param name="session">the current NMS ISession
+        /// </param>
+        /// <param name="destinationName">the name of the destination
+        /// </param>
+        /// <param name="pubSubDomain"><code>true</code> if the domain is pub-sub, <code>false</code> if P2P
+        /// </param>
+        /// <returns> the NMS destination (either a topic or a queue)
+        /// </returns>
+        /// <throws>NMSException if resolution failed </throws>
+        IDestination ResolveDestinationName(ISession session, string destinationName, bool pubSubDomain);
+	
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs
new file mode 100644
index 00000000..37ec23ae
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs
@@ -0,0 +1,103 @@
+#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 Spring.Util;
+using NMS;
+
+namespace Spring.Messaging.Nms.Support.IDestinations
+{
+    /// <summary> Base class for NmsTemplate} and other
+    /// NMS-accessing gateway helpers, adding destination-related properties to
+    /// NmsAccessor's common properties.
+    /// </summary>
+    /// <remarks>
+    /// <p>Not intended to be used directly. See NmsTemplate.</p>
+    /// 
+    /// </remarks>
+    /// <author>Juergen Hoeller </author>
+    /// <author>Mark Pollack (.NET)</author>
+    public class NmsDestinationAccessor : NmsAccessor
+    {
+        #region Fields
+        
+        private IDestinationResolver destinationResolver = new DynamicDestinationResolver();
+
+        private bool pubSubDomain = false;
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the destination resolver that is to be used to resolve
+        /// IDestination references for this accessor.
+        /// </summary>
+        /// <remarks>The default resolver is a DynamicDestinationResolver. Specify a
+        /// JndiDestinationResolver for resolving destination names as JNDI locations.
+        /// </remarks>
+        /// <value>The destination resolver.</value>
+        virtual public IDestinationResolver DestinationResolver
+        {
+            get
+            {
+                return destinationResolver;
+            }
+
+            set
+            {
+                AssertUtils.ArgumentNotNull(value, "DestinationResolver must not be null");
+                this.destinationResolver = value;
+            }
+
+        }
+
+
+        /// <summary>
+        /// Gets or sets a value indicating whether Publish/Subscribe
+        /// domain (Topics) is used. Otherwise, the Point-to-Point domain
+        /// (Queues) is used.
+        /// 
+        /// </summary>
+        /// <remarks>this
+        /// setting tells what type of destination to create if dynamic destinations are enabled.</remarks>
+        /// <value><c>true</c> if Publish/Subscribe domain; otherwise, <c>false</c>
+        /// for the Point-to-Point domain.</value>
+        public virtual bool PubSubDomain
+        {
+            get
+            {
+                return pubSubDomain;
+            }
+
+            set
+            {
+                this.pubSubDomain = value;
+            }
+
+        }
+		
+        #endregion
+
+        public virtual IDestination ResolveDestinationName(ISession session, System.String destinationName)
+        {
+            return DestinationResolver.ResolveDestinationName(session, destinationName, PubSubDomain);
+        }
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs
new file mode 100644
index 00000000..9e47e2a4
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs
@@ -0,0 +1,130 @@
+#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 Common.Logging;
+using Spring.Objects.Factory;
+using NMS;
+
+namespace Spring.Messaging.Nms.Support
+{
+    /// <summary> Base class for NmsTemplate and other
+    /// NMS-accessing gateway helpers</summary>
+    /// <remarks>It defines common properties like the
+    /// IConnectionFactory}. The subclass
+    /// NmsIDestinationAccessor adds
+    /// further, destination-related properties.
+    ///
+    /// Not intended to be used directly. See NmsTemplate.
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    public class NmsAccessor : IInitializingObject
+    {
+        #region Logging
+
+        protected readonly ILog logger = LogManager.GetLogger(typeof(NmsAccessor));
+
+        #endregion
+        
+        #region Fields
+        
+        private IConnectionFactory connectionFactory;
+        private bool sessionTransacted = false;
+        private AcknowledgementMode sessionAcknowledgeMode = AcknowledgementMode.AutoAcknowledge;
+
+        #endregion
+
+        #region Properties
+
+
+        /// <summary>
+        /// Gets or sets the connection factory to use for obtaining NMS IConnections.
+        /// </summary>
+        /// <value>The connection factory.</value>
+        virtual public IConnectionFactory ConnectionFactory
+        {
+            get
+            {
+                return connectionFactory;
+            }
+
+            set
+            {
+                this.connectionFactory = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the session acknowledge mode for NMS Sessions including whether or not the session is transacted
+        /// </summary>
+        /// <remarks>
+        /// Set the NMS acknowledgement mode that is used when creating a NMS
+        /// ISession to send a message. The default is ISession.AUTO_ACKNOWLEDGE.
+        /// <p>Vendor-specific extensions to the acknowledgment mode can be set here as well.</p>
+        /// </remarks>
+        /// <value>The session acknowledge mode.</value>
+        virtual public AcknowledgementMode SessionAcknowledgeMode
+        {
+            get
+            {
+                return sessionAcknowledgeMode;
+            }
+
+            set
+            {
+                this.sessionAcknowledgeMode = value;
+            }
+
+        }
+
+        /// <summary>
+        /// Set the transaction mode that is used when creating a NMS Session.
+        /// Default is "false".
+        /// </summary>
+        /// <remarks>
+        /// <para>Setting this flag to "true" will use a short local NMS transaction
+        /// when running outside of a managed transaction, and a synchronized local
+        /// NMS transaction in case of a managed transaction being present. 
+        /// The latter has the effect of a local NMS
+        /// transaction being managed alongside the main transaction (which might
+        /// be a native ADO.NET transaction), with the NMS transaction committing
+        /// right after the main transaction.
+        /// </para> 
+        /// </remarks>
+        public bool SessionTransacted
+        {
+            get { return sessionTransacted; }
+            set { sessionTransacted = value; }
+        }
+
+        #endregion
+        
+        
+        public virtual void AfterPropertiesSet()
+        {
+            if (ConnectionFactory == null)
+            {
+                throw new ArgumentException("ConnectionFactory is required");
+            }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsUtils.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsUtils.cs
new file mode 100644
index 00000000..b22472e8
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsUtils.cs
@@ -0,0 +1,239 @@
+#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 Common.Logging;
+using Spring.Util;
+using NMS;
+
+namespace Spring.Messaging.Nms.Support
+{
+    public abstract class NmsUtils
+    {
+        #region Logging
+
+        private static readonly ILog logger = LogManager.GetLogger(typeof(NmsUtils));
+
+        #endregion
+
+        /// <summary> Close the given NMS IConnection and ignore any thrown exception.
+        /// This is useful for typical <code>finally</code> blocks in manual NMS code.
+        /// </summary>
+        /// <param name="con">the NMS IConnection to close (may be <code>null</code>)
+        /// </param>
+        public static void CloseConnection(IConnection con)
+        {
+            CloseConnection(con, false);
+        }
+
+        /// <summary> Close the given NMS IConnection and ignore any thrown exception.
+        /// This is useful for typical <code>finally</code> blocks in manual NMS code.
+        /// </summary>
+        /// <param name="con">the NMS IConnection to close (may be <code>null</code>)
+        /// </param>
+        /// <param name="stop">whether to call <code>stop()</code> before closing
+        /// </param>
+        public static void CloseConnection(IConnection con, bool stop)
+        {
+            if (con != null)
+            {
+                try
+                {
+                    if (stop)
+                    {
+                        try
+                        {
+                            con.Stop();
+                        }
+                        finally
+                        {
+                            con.Close();
+                        }
+                    }
+                    else
+                    {
+                        con.Close();
+                    }
+                }
+                catch (NMSException ex)
+                {
+                    logger.Debug("Could not close NMS IConnection", ex);
+                }
+                catch (Exception ex)
+                {
+                    // We don't trust the NMS provider: It might throw another exception.
+                    logger.Debug("Unexpected exception on closing NMS IConnection", ex);
+                }
+            }
+        }
+        
+        /// <summary> Close the given NMS ISession and ignore any thrown exception.
+		/// This is useful for typical <code>finally</code> blocks in manual NMS code.
+		/// </summary>
+		/// <param name="session">the NMS ISession to close (may be <code>null</code>)
+		/// </param>
+		public static void CloseSession(ISession session)
+        {
+            if (session != null)
+            {
+                try
+                {
+                    session.Close();
+                }
+                catch (NMSException ex)
+                {
+                    logger.Debug("Could not close NMS ISession", ex);
+                }
+                catch (Exception ex)
+                {
+                    // We don't trust the NMS provider: It might throw RuntimeException or Error.
+                    logger.Debug("Unexpected exception on closing NMS ISession", ex);
+                }
+            }
+        }
+        
+        /// <summary> Close the given NMS IMessageProducer and ignore any thrown exception.
+		/// This is useful for typical <code>finally</code> blocks in manual NMS code.
+		/// </summary>
+		/// <param name="producer">the NMS IMessageProducer to close (may be <code>null</code>)
+		/// </param>
+        public static void CloseMessageProducer(IMessageProducer producer)
+        {
+            if (producer != null)
+            {
+                try
+                {
+                    producer.Dispose();
+                }
+                catch (NMSException ex)
+                {
+                    logger.Debug("Could not close NMS IMessageProducer", ex);
+                }
+                catch (Exception ex)
+                {
+                    // We don't trust the NMS provider: It might throw RuntimeException or Error.
+                    logger.Debug("Unexpected exception on closing NMS IMessageProducer", ex);
+                }
+            }
+        }
+
+        /// <summary> Close the given NMS IMessageConsumer and ignore any thrown exception.
+        /// This is useful for typical <code>finally</code> blocks in manual NMS code.
+        /// </summary>
+        /// <param name="consumer">the NMS IMessageConsumer to close (may be <code>null</code>)
+        /// </param>
+        public static void CloseMessageConsumer(IMessageConsumer consumer)
+        {
+            if (consumer != null)
+            {
+                try
+                {
+                    consumer.Close();
+                }
+                catch (NMSException ex)
+                {
+                    logger.Debug("Could not close NMS IMessageConsumer", ex);
+                }
+                catch (Exception ex)
+                {
+                    // We don't trust the NMS provider: It might throw RuntimeException or Error.
+                    logger.Debug("Unexpected exception on closing NMS IMessageConsumer", ex);
+                }
+            }
+        }
+/*
+        /// <summary> Close the given NMS QueueRequestor and ignore any thrown exception.
+        /// This is useful for typical <code>finally</code> blocks in manual NMS code.
+        /// </summary>
+        /// <param name="requestor">the NMS QueueRequestor to close (may be <code>null</code>)
+        /// </param>
+ */
+//        public static void CloseQueueRequestor(QueueRequestor requestor)
+//        {
+//            if (requestor != null)
+//            {
+//                try
+//                {
+//                    requestor.Close();
+//                }
+//                catch (NMSException ex)
+//                {
+//                    logger.Debug("Could not close NMS QueueRequestor", ex);
+//                }
+//                catch (Exception ex)
+//                {
+//                    // We don't trust the NMS provider: It might throw RuntimeException or Error.
+//                    logger.Debug("Unexpected exception on closing NMS QueueRequestor", ex);
+//                }
+//            }
+//        }
+
+
+        /// <summary> Commit the ISession if not within a distributed transaction.</summary>
+        /// <remarks>Needs investigation - no distributed tx in EMS</remarks>
+        /// <param name="session">the NMS ISession to commit
+        /// </param>
+        /// <throws>  NMSException if committing failed </throws>
+        public static void CommitIfNecessary(ISession session)
+        {
+		    AssertUtils.ArgumentNotNull(session, "ISession must not be null");
+			
+			session.Commit();
+
+			// TODO Investigate
+			
+//		    try {
+//			    session.Commit();
+//		    }
+//		    catch (TransactionInProgressException ex) {
+//		        // TODO Investigate
+//			    // Ignore -> can only happen in case of a JTA transaction.
+//		    }
+//		    catch (IllegalStateException ex) {
+//		        // TODO Investigate
+//			    // Ignore -> can only happen in case of a JTA transaction.
+//		    }
+	    }
+
+        /// <summary> Rollback the ISession if not within a distributed transaction.</summary>
+        /// <remarks>Needs investigation - no distributed tx in EMS</remarks>
+        /// <param name="session">the NMS ISession to rollback
+        /// </param>
+        /// <throws>  NMSException if committing failed </throws>
+	    public static void RollbackIfNecessary(ISession session)
+        {
+		    AssertUtils.ArgumentNotNull(session, "ISession must not be null");
+			session.Rollback();
+
+			// TODO Investigate
+
+//		    try {
+//			    session.Rollback();
+//		    }
+//		    catch (TransactionInProgressException ex) {
+//			    // Ignore -> can only happen in case of a JTA transaction.
+//		    }
+//		    catch (IllegalStateException ex) {
+//			    // Ignore -> can only happen in case of a JTA transaction.
+//		    }
+	    }
+        
+    }
+}
diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2003.csproj b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2003.csproj
new file mode 100644
index 00000000..14b503f6
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2003.csproj
@@ -0,0 +1,259 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{C17B27C2-4343-45BA-9A21-73C3CEC19BAD}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Messaging.Nms"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = "Spring.Messaging.Nms.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = "1591;0168;1570;1574"
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.NET.2003\Spring.Messaging.Nms\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.NET.2003\Spring.Messaging.Nms.2003\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "Spring.Data"
+                    AssemblyName = "Spring.Data"
+                    HintPath = "..\..\..\lib\net\1.1\Spring.Data.dll"
+                />
+                <Reference
+                    Name = "ActiveMQ"
+                    AssemblyName = "ActiveMQ"
+                    HintPath = "..\..\..\lib\net\1.1\ActiveMQ.dll"
+                />
+                <Reference
+                    Name = "antlr.runtime"
+                    AssemblyName = "antlr.runtime"
+                    HintPath = "..\..\..\lib\net\1.1\antlr.runtime.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\net\1.1\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "NMS"
+                    AssemblyName = "NMS"
+                    HintPath = "..\..\..\lib\net\1.1\NMS.dll"
+                />
+                <Reference
+                    Name = "Spring.Aop"
+                    AssemblyName = "Spring.Aop"
+                    HintPath = "..\..\..\lib\net\1.1\Spring.Aop.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\lib\net\1.1\Spring.Core.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "Context\ILifecycle.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\.DS_Store"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Messaging\Nms\IMessageCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\IMessageListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\IMessagePostProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\INmsOperations.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\IProducerCallback.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\ISessionCallback.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\MessageCreatorDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\NmsGatewaySupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\NmsTemplate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Connections\ConnectionFactoryUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Connections\NmsResourceHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Connections\SynchedLocalTransactionFailedException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Listener\AbstractMessageListenerContainer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Listener\DefaultMessageListenerContainer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Listener\ISessionAwareMessageListener.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Listener\SimpleMessageListenerContainer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Listener\Adapter\MessageListenerAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Support\NmsAccessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Support\NmsUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Support\Converter\IMessageConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Support\Converter\MessageConversionException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Support\Converter\SimpleMessageConverter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Support\Destinations\DynamicDestinationResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Support\Destinations\IDestinationResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Messaging\Nms\Support\Destinations\NmsDestinationAccessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2005.csproj b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2005.csproj
new file mode 100644
index 00000000..ce149c7f
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2005.csproj
@@ -0,0 +1,100 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{AEB1578C-9018-4D49-B440-789F38DD2F29}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Messaging.Nms</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2005\Spring.Messaging.Nms\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\build\VS.NET.2005\Spring.Messaging.Nms\Debug\Spring.Messaging.Nms.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2005\Spring.Messaging.Nms\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="NMS, Version=4.0.0.0, Culture=neutral">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\NMS.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Context\ILifecycle.cs" />
+    <Compile Include="Messaging\Nms\Connections\ConnectionFactoryUtils.cs" />
+    <Compile Include="Messaging\Nms\Connections\NmsResourceHolder.cs" />
+    <Compile Include="Messaging\Nms\Connections\SynchedLocalTransactionFailedException.cs" />
+    <Compile Include="Messaging\Nms\IMessageCreator.cs" />
+    <Compile Include="Messaging\Nms\IMessageListener.cs" />
+    <Compile Include="Messaging\Nms\IMessagePostProcessor.cs" />
+    <Compile Include="Messaging\Nms\INmsOperations.cs" />
+    <Compile Include="Messaging\Nms\IProducerCallback.cs" />
+    <Compile Include="Messaging\Nms\ISessionCallback.cs" />
+    <Compile Include="Messaging\Nms\Listener\AbstractMessageListenerContainer.cs" />
+    <Compile Include="Messaging\Nms\Listener\Adapter\MessageListenerAdapter.cs" />
+    <Compile Include="Messaging\Nms\Listener\DefaultMessageListenerContainer.cs" />
+    <Compile Include="Messaging\Nms\Listener\ISessionAwareMessageListener.cs" />
+    <Compile Include="Messaging\Nms\Listener\SimpleMessageListenerContainer.cs" />
+    <Compile Include="Messaging\Nms\MessageCreatorDelegate.cs" />
+    <Compile Include="Messaging\Nms\NmsGatewaySupport.cs" />
+    <Compile Include="Messaging\Nms\NmsTemplate.cs" />
+    <Compile Include="Messaging\Nms\Support\Converter\IMessageConverter.cs" />
+    <Compile Include="Messaging\Nms\Support\Converter\MessageConversionException.cs" />
+    <Compile Include="Messaging\Nms\Support\Converter\SimpleMessageConverter.cs" />
+    <Compile Include="Messaging\Nms\Support\Destinations\DynamicDestinationResolver.cs" />
+    <Compile Include="Messaging\Nms\Support\Destinations\IDestinationResolver.cs" />
+    <Compile Include="Messaging\Nms\Support\Destinations\NmsDestinationAccessor.cs" />
+    <Compile Include="Messaging\Nms\Support\NmsAccessor.cs" />
+    <Compile Include="Messaging\Nms\Support\NmsUtils.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Messaging\.DS_Store" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2005.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
new file mode 100644
index 00000000..02564930
--- /dev/null
+++ b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<project name="Spring.Messaging.Nms" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+    <target name="build">
+        <csc target="library" define="${current.build.defines.csc}"
+                warnaserror="false"
+            debug="${current.build.debug}"
+            output="${current.bin.dir}/${project::get-name()}.dll"
+            doc="${current.bin.dir}/${project::get-name()}.xml"
+            >
+            <arg line="${compiler.args}"/>
+            <nowarn>
+                <warning number="1591" />
+            </nowarn>
+            <sources failonempty="true">
+                <include name="**/*.cs" />
+                <include name="../GenCommonAssemblyInfo.cs" />
+            </sources>
+		        <references basedir="${current.bin.dir}">
+			        <include name="*.dll" />
+			        <exclude name="${project::get-name()}.dll" />
+				<exclude name="CloverRuntime.dll" />
+		        </references>
+        </csc>
+    </target>
+
+</project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/AdaptableJobFactory.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/AdaptableJobFactory.cs
new file mode 100644
index 00000000..aea613ed
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/AdaptableJobFactory.cs
@@ -0,0 +1,111 @@
+/*
+* 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.
+*/
+using System;
+using System.Threading;
+
+using Quartz;
+using Quartz.Spi;
+using Quartz.Util;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary> 
+	/// JobFactory implementation that supports <see cref="ThreadStart" />
+	/// objects as well as standard Quartz <see cref="IJob" /> instances.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Marko Lahma (.NET)</author>
+	/// <seealso cref="DelegatingJob" />
+	/// <seealso cref="AdaptJob(object)" />
+	public class AdaptableJobFactory : IJobFactory
+	{
+        /// <summary>
+        /// Called by the scheduler at the time of the trigger firing, in order to
+        /// produce a <see cref="IJob"/> instance on which to call Execute.
+        /// </summary>
+        /// <remarks>
+        /// It should be extremely rare for this method to throw an exception -
+        /// basically only the the case where there is no way at all to instantiate
+        /// and prepare the Job for execution.  When the exception is thrown, the
+        /// Scheduler will move all triggers associated with the Job into the
+        /// <see cref="TriggerState.Error"/> state, which will require human
+        /// intervention (e.g. an application restart after fixing whatever
+        /// configuration problem led to the issue wih instantiating the Job.
+        /// </remarks>
+        /// <param name="bundle">The TriggerFiredBundle from which the <see cref="JobDetail"/>
+        /// and other info relating to the trigger firing can be obtained.</param>
+        /// <returns>the newly instantiated Job</returns>
+        /// <throws>SchedulerException if there is a problem instantiating the Job.</throws>
+		public virtual IJob NewJob(TriggerFiredBundle bundle)
+		{
+			try
+			{
+				object jobObject = CreateJobInstance(bundle);
+				return AdaptJob(jobObject);
+			}
+			catch (Exception ex)
+			{
+				throw new SchedulerException("Job instantiation failed", ex);
+			}
+		}
+
+		/// <summary> 
+		/// Create an instance of the specified job class.
+		/// <p>
+		/// Can be overridden to post-process the job instance.
+		/// </p>
+		/// </summary>
+		/// <param name="bundle">
+		/// The TriggerFiredBundle from which the JobDetail
+		/// and other info relating to the trigger firing can be obtained.
+		/// </param>
+		/// <returns>The job instance.</returns>
+		protected virtual object CreateJobInstance(TriggerFiredBundle bundle)
+		{
+			return ObjectUtils.InstantiateType(bundle.JobDetail.JobType);
+		}
+
+		/// <summary> 
+		/// Adapt the given job object to the Quartz Job interface.
+		/// </summary>
+		/// <remarks>
+		/// The default implementation supports straight Quartz Jobs
+		/// as well as Runnables, which get wrapped in a DelegatingJob.
+        /// </remarks>
+		/// <param name="jobObject">
+		/// The original instance of the specified job class.
+		/// </param>
+		/// <returns>The adapted Quartz Job instance.</returns>
+		/// <seealso cref="DelegatingJob" />
+		protected virtual IJob AdaptJob(object jobObject)
+		{
+			if (jobObject is IJob)
+			{
+				return (IJob) jobObject;
+			}
+            else if (jobObject is ThreadStart)
+			{
+                return new DelegatingJob((ThreadStart)jobObject);
+			}
+			else
+			{
+				throw new ArgumentException(
+                    string.Format("Unable to execute job class [{0}]: only [IJob] and [ThreadStart] supported.",
+					              jobObject.GetType().FullName));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/CronTriggerObject.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/CronTriggerObject.cs
new file mode 100644
index 00000000..e0466316
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/CronTriggerObject.cs
@@ -0,0 +1,202 @@
+/*
+* Copyright 2002-2007 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.
+*/
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+using Quartz;
+using Spring.Objects.Factory;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary>
+	/// Convenience subclass of Quartz's CronTrigger type, making property based
+	/// usage easier.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// CronTrigger itself is already property based but lacks sensible defaults.
+	/// This class uses the Spring object name as job name, the Quartz default group
+	/// ("DEFAULT") as job group, the current time as start time, and indefinite
+	/// repetition, if not specified.
+	/// </p>
+	/// <p>
+	/// This class will also register the trigger with the job name and group of
+	/// a given <see cref="JobDetail" />. This allows <see cref="SchedulerFactoryObject" />
+	/// to automatically register a trigger for the corresponding JobDetail,
+	/// instead of registering the JobDetail separately.
+	/// </p>
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <seealso cref="Trigger.Name" />
+    /// <seealso cref="Trigger.Group" />
+    /// <seealso cref="Trigger.StartTimeUtc" />
+    /// <seealso cref="Trigger.JobName" />
+    /// <seealso cref="Trigger.JobGroup" />
+	/// <seealso cref="JobDetail" />
+	/// <seealso cref="SchedulerFactoryObject.Triggers" />
+	/// <seealso cref="SchedulerFactoryObject.JobDetails" />
+	public class CronTriggerObject : CronTrigger, IJobDetailAwareTrigger, IObjectNameAware, IInitializingObject
+	{
+		private JobDetail jobDetail;
+		private string objectName;
+        private readonly Constants constants = new Constants(typeof(MisfirePolicy.CronTrigger), typeof(MisfirePolicy));
+
+
+		/// <summary> 
+		/// Register objects in the JobDataMap via a given Map.
+		/// </summary>
+		/// <remarks>
+		/// These objects will be available to this Trigger only,
+		/// in contrast to objects in the JobDetail's data map.
+		/// </remarks>
+		/// <seealso cref="JobDetailObject.JobDataAsMap" />
+		public virtual IDictionary JobDataAsMap
+		{
+			set { JobDataMap.PutAll(value); }
+		}
+
+		/// <summary> 
+		/// Set the misfire instruction via the name of the corresponding
+		/// constant in the CronTrigger class.
+		/// Default is <code>MISFIRE_INSTRUCTION_SMART_POLICY</code>.
+		/// </summary>
+        /// <seealso cref="MisfirePolicy.CronTrigger.FireOnceNow" />
+        /// <seealso cref="MisfirePolicy.CronTrigger.DoNothing" />
+        /// <seealso cref="MisfirePolicy.SmartPolicy" />
+		public virtual string MisfireInstructionName
+		{
+			set 
+			{
+				MisfireInstruction = constants.AsNumber(value); 
+			}
+		}
+
+        /// <summary>
+        /// Set the name of the object in the object factory that created this object.
+        /// </summary>
+        /// <value>The name of the object in the factory.</value>
+        /// <remarks>
+        /// <p>
+        /// Invoked after population of normal object properties but before an init
+        /// callback like <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// method or a custom init-method.
+        /// </p>
+        /// </remarks>
+		public virtual string ObjectName
+		{
+			set { objectName = value; }
+		}
+
+		/// <summary> 
+		/// Set the JobDetail that this trigger should be associated with.
+		/// </summary>
+		/// <remarks>
+		/// This is typically used with a object reference if the JobDetail
+		/// is a Spring-managed object. Alternatively, the trigger can also
+		/// be associated with a job by name and group.
+		/// </remarks>
+		/// <seealso cref="Trigger.JobName" />
+		/// <seealso cref="Trigger.JobGroup" />
+		public virtual JobDetail JobDetail
+		{
+			get { return jobDetail; }
+			set { jobDetail = value; }
+		}
+
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method allows the object instance to perform the kind of
+        /// initialization only possible when all of it's dependencies have
+        /// been injected (set), and to throw an appropriate exception in the
+        /// event of misconfiguration.
+        /// </p>
+        /// <p>
+        /// Please do consult the class level documentation for the
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+        /// description of exactly <i>when</i> this method is invoked. In
+        /// particular, it is worth noting that the
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and <see cref="Spring.Context.IApplicationContextAware"/>
+        /// callbacks will have been invoked <i>prior</i> to this method being
+        /// called.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as the failure to set a
+        /// required property) or if initialization fails.
+        /// </exception>
+		public virtual void AfterPropertiesSet()
+		{
+			if (Name == null)
+			{
+				Name = objectName;
+			}
+			if (Group == null)
+			{
+                Group = SchedulerConstants.DEFAULT_GROUP;
+			}
+			if (StartTimeUtc == DateTime.MinValue)
+			{
+				StartTimeUtc = DateTime.UtcNow;
+			}
+			if (TimeZone == null)
+			{
+				TimeZone = TimeZone.CurrentTimeZone;
+			}
+			if (jobDetail != null)
+			{
+				JobName = jobDetail.Name;
+				JobGroup = jobDetail.Group;
+			}
+		}
+	}
+
+    /// <summary>
+    /// Helper class to map constant names to their values.
+    /// </summary>
+    internal class Constants
+    {
+        private readonly Type[] types;
+
+        public Constants(params Type[] reflectedTypes)
+        {
+            types = reflectedTypes;
+        }
+
+        public int AsNumber(string field)
+        {
+            foreach (Type type in types)
+            {
+                FieldInfo fi = type.GetField(field);
+                if (fi != null)
+                {
+                    return Convert.ToInt32(fi.GetValue(null));
+                }
+            }
+
+            // not found
+            throw new Exception(string.Format("Unknown field '{0}'", field));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/DelegatingJob.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/DelegatingJob.cs
new file mode 100644
index 00000000..afd67c1e
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/DelegatingJob.cs
@@ -0,0 +1,82 @@
+/*
+* 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.
+*/
+using System;
+using System.Threading;
+
+using Quartz;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary> 
+	/// Simple Quartz IJob adapter that delegates to a
+    /// given <see cref="ThreadStart" /> instance.
+    /// </summary>
+    /// <remarks>
+	/// Typically used in combination with property injection on the
+	/// Runnable instance, receiving parameters from the Quartz JobDataMap
+	/// that way instead of via the JobExecutionContext.
+    /// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Marko Lahma (.NET)</author>
+	/// <seealso cref="SpringObjectJobFactory" />
+	/// <seealso cref="IJob.Execute(JobExecutionContext)" />
+	public class DelegatingJob : IJob
+	{
+        private ThreadStart delegateInstance;
+
+        /// <summary>
+        /// Return the wrapped Runnable implementation.
+        /// </summary>
+        /// <value>The delegate.</value>
+        public virtual ThreadStart Delegate
+		{
+			get { return delegateInstance; }
+		}
+
+		/// <summary> 
+		/// Create a new DelegatingJob.
+		/// </summary>
+		/// <param name="delegateInstance">
+		/// The Runnable implementation to delegate to.
+		/// </param>
+        public DelegatingJob(ThreadStart delegateInstance)
+		{
+			if (delegateInstance == null)
+			{
+				throw new ArgumentException("Delegate must not be null", "delegateInstance");
+			}
+			this.delegateInstance = delegateInstance;
+		}
+
+
+		/// <summary> 
+        /// Delegates execution to the underlying ThreadStart,
+		/// converting any Exception thrown to a Quartz JobExecutionException
+		/// (as required by the Job contract).
+		/// </summary>
+		public virtual void Execute(JobExecutionContext context)
+		{
+            try
+            {
+                delegateInstance.Invoke();
+            }
+            catch (Exception ex)
+            {
+                throw new JobExecutionException(ex);
+            }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/IJobDetailAwareTrigger.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/IJobDetailAwareTrigger.cs
new file mode 100644
index 00000000..bd64614b
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/IJobDetailAwareTrigger.cs
@@ -0,0 +1,49 @@
+/*
+* Copyright 2002-2005 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.
+*/
+using Quartz;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary> 
+	/// Interface to be implemented by Quartz Triggers that are aware
+	/// of the JobDetail object that they are associated with.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// SchedulerFactoryObject will auto-detect Triggers that implement this
+	/// interface and register them for the respective JobDetail accordingly.
+	/// </p>
+	/// 
+	/// <p>
+	/// The alternative is to configure a Trigger for a Job name and group:
+	/// This involves the need to register the JobDetail object separately
+	/// with SchedulerFactoryObject.
+	/// </p>
+    /// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <seealso cref="SchedulerFactoryObject.Triggers" />
+	/// <seealso cref="SchedulerFactoryObject.JobDetails" />
+	/// <seealso cref="Trigger.JobName" />
+	/// <seealso cref="Trigger.JobGroup" />
+	public interface IJobDetailAwareTrigger
+	{
+		/// <summary> 
+		/// Return the JobDetail that this Trigger is associated with.
+		/// </summary>
+		/// <returns>The associated JobDetail, or <code>null</code> if none</returns>
+		JobDetail JobDetail { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/ISchedulerContextAware.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/ISchedulerContextAware.cs
new file mode 100644
index 00000000..54c46a7d
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/ISchedulerContextAware.cs
@@ -0,0 +1,41 @@
+/*
+* 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.
+*/
+using Quartz;
+using Quartz.Spi;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary> 
+	/// Callback interface to be implemented by Spring-managed
+	/// Quartz artifacts that need access to the SchedulerContext
+	/// (without having natural access to it).
+	/// </summary>
+	/// <remarks>
+	/// Currently only supported for custom JobFactory implementations
+	/// that are passed in via Spring's SchedulerFactoryObject.
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <seealso cref="IJobFactory" /> 
+	/// <seealso cref="SchedulerFactoryObject.JobFactory" />
+	public interface ISchedulerContextAware
+	{
+		/// <summary>
+		/// Set the SchedulerContext of the current Quartz Scheduler.
+		/// </summary>
+		/// <seealso cref="IScheduler.Context" />
+		SchedulerContext SchedulerContext { set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/ISchedulingTaskExecutor.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/ISchedulingTaskExecutor.cs
new file mode 100644
index 00000000..0112e7b5
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/ISchedulingTaskExecutor.cs
@@ -0,0 +1,36 @@
+/*
+* 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.
+*/
+
+namespace Spring.Scheduling
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public interface ISchedulingTaskExecutor : ITaskExecutor
+	{
+		/// <summary>
+		/// Gets a value indicating whether´this instance prefers short lived tasks.
+		/// </summary>
+		/// <value>
+		/// 	<c>true</c> if prefers short lived tasks; otherwise, <c>false</c>.
+		/// </value>
+		bool PrefersShortLivedTasks
+		{
+			get;
+		}
+
+	}
+}
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/ITaskExecutor.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/ITaskExecutor.cs
new file mode 100644
index 00000000..29158527
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/ITaskExecutor.cs
@@ -0,0 +1,31 @@
+/*
+* 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.
+*/
+
+using System.Threading;
+
+namespace Spring.Scheduling
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public interface ITaskExecutor
+	{
+		/// <summary>
+		/// Executes this instance.
+		/// </summary>
+		void Execute(ThreadStart runnable);
+	}
+}
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/JobDetailObject.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/JobDetailObject.cs
new file mode 100644
index 00000000..1b53eac2
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/JobDetailObject.cs
@@ -0,0 +1,216 @@
+/*
+* 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.
+*/
+using System;
+using System.Collections;
+using Quartz;
+using Spring.Context;
+using Spring.Objects.Factory;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary> 
+	/// Convenience subclass of Quartz' JobDetail class that eases properties based
+	/// usage.
+	/// </summary>
+	/// <remarks>
+	/// <see cref="JobDetail" /> itself is already a object but lacks
+	/// sensible defaults. This class uses the Spring object name as job name,
+	/// and the Quartz default group ("DEFAULT") as job group if not specified.
+    /// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <seealso cref="JobDetail.Name" />
+	/// <seealso cref="JobDetail.Group" />
+	/// <seealso cref="SchedulerConstants.DEFAULT_GROUP" /> 
+	public class JobDetailObject : JobDetail, IObjectNameAware, IApplicationContextAware, IInitializingObject
+	{
+        private Type actualJobType;
+        private string objectName;
+        private IApplicationContext applicationContext;
+        private string applicationContextJobDataKey;
+
+		/// <summary> 
+		/// Overridden to support any job class, to allow a custom JobFactory
+		/// to adapt the given job class to the Quartz Job interface.
+		/// </summary>
+		/// <seealso cref="SchedulerFactoryObject.JobFactory" />
+		public override Type JobType
+		{
+			get { return (actualJobType != null ? actualJobType : base.JobType); }
+
+			set
+			{
+				if (value != null && !typeof (IJob).IsAssignableFrom(value))
+				{
+					base.JobType = typeof (DelegatingJob);
+					actualJobType = value;
+				}
+				else
+				{
+					base.JobType = value;
+				}
+			}
+		}
+
+		/// <summary> 
+		/// Register objects in the JobDataMap via a given Map.
+		/// </summary>
+		/// <remarks>
+		/// These objects will be available to this Job only,
+		/// in contrast to objects in the SchedulerContext.
+		/// <p>
+		/// Note: When using persistent Jobs whose JobDetail will be kept in the
+		/// database, do not put Spring-managed objects or an ApplicationContext
+		/// reference into the JobDataMap but rather into the SchedulerContext.
+		/// </p>
+		/// </remarks>
+		/// <seealso cref="SchedulerFactoryObject.SchedulerContextAsMap" />
+		public virtual IDictionary JobDataAsMap
+		{
+			set
+			{
+                if (value == null)
+                {
+                    throw new ArgumentException("Value cannot be null", "value");
+                }
+			    JobDataMap.PutAll(value);
+			}
+		}
+
+        /// <summary>
+        /// Set the name of the object in the object factory that created this object.
+        /// </summary>
+        /// <value>The name of the object in the factory.</value>
+        /// <remarks>
+        /// Invoked after population of normal object properties but before an init
+        /// callback like <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// method or a custom init-method.
+        /// </remarks>
+		public virtual string ObjectName
+		{
+			set { objectName = value; }
+		}
+
+        /// <summary>
+        /// Set the <see cref="Spring.Context.IApplicationContext"/> that this
+        /// object runs in.
+        /// </summary>
+        /// <value></value>
+        /// <remarks>
+        /// <p>
+        /// Normally this call will be used to initialize the object.
+        /// </p>
+        /// <p>
+        /// Invoked after population of normal object properties but before an
+        /// init callback such as
+        /// <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// or a custom init-method. Invoked after the setting of any
+        /// <see cref="Spring.Context.IResourceLoaderAware"/>'s
+        /// <see cref="Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+        /// property.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Context.ApplicationContextException">
+        /// In the case of application context initialization errors.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If thrown by any application context methods.
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectInitializationException"/>
+		public virtual IApplicationContext ApplicationContext
+		{
+			set { applicationContext = value; }
+			get { return applicationContext; }
+		}
+
+		/// <summary>
+		/// Set the key of an IApplicationContext reference to expose in the JobDataMap,
+		/// for example "applicationContext". Default is none.
+		/// Only applicable when running in a Spring ApplicationContext.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// In case of a QuartzJobObject, the reference will be applied to the Job
+		/// instance as object property. An "applicationContext" attribute will correspond
+		/// to a "setApplicationContext" method in that scenario.
+		/// </p>
+		/// <p>
+		/// Note that ObjectFactory callback interfaces like IApplicationContextAware
+		/// are not automatically applied to Quartz Job instances, because Quartz
+		/// itself is responsible for the lifecycle of its Jobs.
+		/// </p>
+		/// <p>
+		/// <b>Note: When using persistent job stores where JobDetail contents will
+		/// be kept in the database, do not put an IApplicationContext reference into
+		/// the JobDataMap but rather into the SchedulerContext.</b>
+		/// </p>
+        /// </remarks>
+		/// <seealso cref="SchedulerFactoryObject.ApplicationContextSchedulerContextKey" /> 
+		/// <seealso cref="IApplicationContext" />
+		public virtual string ApplicationContextJobDataKey
+		{
+			set { applicationContextJobDataKey = value; }
+		}
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method allows the object instance to perform the kind of
+        /// initialization only possible when all of it's dependencies have
+        /// been injected (set), and to throw an appropriate exception in the
+        /// event of misconfiguration.
+        /// </p>
+        /// <p>
+        /// Please do consult the class level documentation for the
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+        /// description of exactly <i>when</i> this method is invoked. In
+        /// particular, it is worth noting that the
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and <see cref="Spring.Context.IApplicationContextAware"/>
+        /// callbacks will have been invoked <i>prior</i> to this method being
+        /// called.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as the failure to set a
+        /// required property) or if initialization fails.
+        /// </exception>
+		public virtual void AfterPropertiesSet()
+		{
+			if (Name == null)
+			{
+				Name = objectName;
+			}
+			if (Group == null)
+			{
+				Group = SchedulerConstants.DEFAULT_GROUP;
+			}
+			if (applicationContextJobDataKey != null)
+			{
+				if (applicationContext == null)
+				{
+					throw new ArgumentException("JobDetailObject needs to be set up in an IApplicationContext " +
+					                          "to be able to handle an 'applicationContextJobDataKey'");
+				}
+				JobDataMap.Put(applicationContextJobDataKey, applicationContext);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/LocalTaskExecutorThreadPool.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/LocalTaskExecutorThreadPool.cs
new file mode 100644
index 00000000..6d3196ef
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/LocalTaskExecutorThreadPool.cs
@@ -0,0 +1,135 @@
+/*
+* 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.
+*/
+using System.Threading;
+
+using Common.Logging;
+using Quartz;
+using Quartz.Spi;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary> 
+	/// Quartz ThreadPool adapter that delegates to a Spring-managed
+	/// TaskExecutor instance, specified on SchedulerFactoryObject.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <seealso cref="SchedulerFactoryObject.TaskExecutor" />
+	public class LocalTaskExecutorThreadPool : IThreadPool
+	{
+        /// <summary>
+        /// Logger available to subclasses.
+        /// </summary>
+        protected ILog logger;
+
+        private ITaskExecutor taskExecutor;
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LocalTaskExecutorThreadPool"/> class.
+        /// </summary>
+		public LocalTaskExecutorThreadPool()
+		{
+			logger = LogManager.GetLogger(GetType());
+		}
+
+        /// <summary>
+        /// Gets the size of the pool.
+        /// </summary>
+        /// <value>The size of the pool.</value>
+		public virtual int PoolSize
+		{
+			get { return - 1; }
+		}
+
+        /// <summary>
+        /// Called by the QuartzScheduler before the <see cref="T:System.Threading.ThreadPool"/> is
+        /// used, in order to give the it a chance to Initialize.
+        /// </summary>
+		public virtual void Initialize()
+		{
+			// Absolutely needs thread-bound TaskExecutor to Initialize.
+			taskExecutor = SchedulerFactoryObject.ConfigTimeTaskExecutor;
+			if (taskExecutor == null)
+			{
+				throw new SchedulerConfigException("No local TaskExecutor found for configuration - " +
+				                                   "'taskExecutor' property must be set on SchedulerFactoryObject");
+			}
+		}
+
+        /// <summary>
+        /// Called by the QuartzScheduler to inform the <see cref="T:System.Threading.ThreadPool"/>
+        /// that it should free up all of it's resources because the scheduler is
+        /// shutting down.
+        /// </summary>
+        /// <param name="waitForJobsToComplete"></param>
+		public virtual void Shutdown(bool waitForJobsToComplete)
+		{
+		}
+
+
+        /// <summary>
+        /// Execute the given <see cref="T:Quartz.IThreadRunnable"/> in the next
+        /// available <see cref="T:System.Threading.Thread"/>.
+        /// </summary>
+        /// <param name="runnable"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// The implementation of this interface should not throw exceptions unless
+        /// there is a serious problem (i.e. a serious misconfiguration). If there
+        /// are no available threads, rather it should either queue the Runnable, or
+        /// block until a thread is available, depending on the desired strategy.
+        /// </remarks>
+		public virtual bool RunInThread(IThreadRunnable runnable)
+		{
+			if (runnable == null)
+			{
+				return false;
+			}
+			try
+			{
+				taskExecutor.Execute(new ThreadStart(runnable.Run));
+				return true;
+			}
+			catch (TaskRejectedException ex)
+			{
+				logger.Error("Task has been rejected by TaskExecutor", ex);
+				return false;
+			}
+		}
+
+        /// <summary>
+        /// Determines the number of threads that are currently available in in
+        /// the pool.  Useful for determining the number of times
+        /// <see cref="M:Quartz.Spi.IThreadPool.RunInThread(Quartz.IThreadRunnable)"/>  can be called before returning
+        /// false.
+        /// </summary>
+        /// <returns>
+        /// the number of currently available threads
+        /// </returns>
+        /// <remarks>
+        /// The implementation of this method should block until there is at
+        /// least one available thread.
+        /// </remarks>
+		public virtual int BlockForAvailableThreads()
+		{
+			// The present implementation always returns 1, making Quartz (1.6)
+			// always schedule any tasks that it feels like scheduling.
+			// This could be made smarter for specific TaskExecutors,
+			// for example calling <code>getMaximumPoolSize() - getActiveCount()</code>
+			// on a <code>java.util.concurrent.ThreadPoolExecutor</code>.
+			return 1;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/MethodInvokingJob.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/MethodInvokingJob.cs
new file mode 100644
index 00000000..ba59c7c6
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/MethodInvokingJob.cs
@@ -0,0 +1,89 @@
+/*
+* 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.
+*/
+
+using System;
+using System.Reflection;
+
+using Common.Logging;
+
+using Quartz;
+
+using Spring.Objects.Support;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary> 
+    /// Quartz Job implementation that invokes a specified method.
+    /// Automatically applied by MethodInvokingJobDetailFactoryObject.
+    /// </summary>
+    public class MethodInvokingJob : QuartzJobObject
+    {
+        private static readonly ILog logger = LogManager.GetLogger(typeof(MethodInvokingJob));
+        private MethodInvoker methodInvoker;
+        private string errorMessage;
+
+        /// <summary>
+        /// Set the MethodInvoker to use.
+        /// </summary>
+        public virtual MethodInvoker MethodInvoker
+        {
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentException("Method invoker cannot be null", "value");
+                }
+                methodInvoker = value;
+                errorMessage =
+                    string.Format("Could not invoke method '{0}' on target object [{1}]", methodInvoker.TargetMethod,
+                                  methodInvoker.TargetObject);
+            }
+        }
+
+
+        /// <summary>
+        /// Invoke the method via the MethodInvoker.
+        /// </summary>
+        /// <param name="context"></param>
+        protected override void ExecuteInternal(JobExecutionContext context)
+        {
+            if (methodInvoker == null)
+            {
+                throw new JobExecutionException("Could not execute job when method invoker is null");
+            }
+            try
+            {
+                methodInvoker.Invoke();
+            }
+            catch (TargetInvocationException ex)
+            {
+                logger.Warn(errorMessage, ex.GetBaseException());
+                if (ex.GetBaseException() is JobExecutionException)
+                {
+                    throw ex.GetBaseException();
+                }
+                throw new JobExecutionException(errorMessage, ex.GetBaseException());
+
+            }
+            catch (Exception ex)
+            {
+                logger.Warn(errorMessage, ex);
+                throw new JobExecutionException(errorMessage, ex);
+            }
+        }
+    }
+
+}
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/MethodInvokingJobDetailFactoryObject.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/MethodInvokingJobDetailFactoryObject.cs
new file mode 100644
index 00000000..92bab59b
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/MethodInvokingJobDetailFactoryObject.cs
@@ -0,0 +1,246 @@
+/*
+* 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.
+*/
+
+using System;
+
+using Quartz;
+
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Support;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary> 
+	/// IFactoryObject that exposes a JobDetail object that delegates job execution
+	/// to a specified (static or non-static) method. Avoids the need to implement
+	/// a one-line Quartz Job that just invokes an existing service method.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Derived from ArgumentConverting MethodInvoker to share common properties and behavior
+	/// with MethodInvokingFactoryObject.
+	/// </p>
+	///  <p>
+	/// Supports both concurrently running jobs and non-currently running
+	/// ones through the "concurrent" property. Jobs created by this
+	/// MethodInvokingJobDetailFactoryObject are by default volatile and durable
+	/// (according to Quartz terminology).
+	/// </p>
+	/// <p><b>NOTE: JobDetails created via this FactoryObject are <i>not</i>
+	/// serializable and thus not suitable for persistent job stores.</b>
+	/// You need to implement your own Quartz Job as a thin wrapper for each case
+	/// where you want a persistent job to delegate to a specific service method.
+	/// </p>
+    /// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Alef Arendsen</author>
+	/// <seealso cref="Concurrent" />
+	/// <seealso cref="MethodInvokingFactoryObject" />
+	public class MethodInvokingJobDetailFactoryObject : ArgumentConvertingMethodInvoker, IFactoryObject, IObjectNameAware,
+	                                                  IInitializingObject
+	{
+		private string name;
+		private string group;
+		private bool concurrent = true;
+		private string[] jobListenerNames;
+		private string objectName;
+		private JobDetail jobDetail;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MethodInvokingJobDetailFactoryObject"/> class.
+        /// </summary>
+		public MethodInvokingJobDetailFactoryObject()
+		{
+            group = SchedulerConstants.DEFAULT_GROUP;
+		}
+
+
+		/// <summary> 
+		/// Set the name of the job.
+		/// Default is the object name of this FactoryObject.
+		/// </summary>
+		/// <seealso cref="JobDetail.Name" />
+		public virtual string Name
+		{
+			set { name = value; }
+		}
+
+		/// <summary> 
+		/// Set the group of the job.
+		/// Default is the default group of the Scheduler.
+		/// </summary>
+		/// <seealso cref="JobDetail.Group" />
+        /// <seealso cref="SchedulerConstants.DEFAULT_GROUP" />
+		public virtual string Group
+		{
+			set { group = value; }
+		}
+
+		/// <summary> 
+		/// Specify whether or not multiple jobs should be run in a concurrent
+		/// fashion. The behavior when one does not want concurrent jobs to be
+		/// executed is realized through adding the <see cref="IStatefulJob" /> interface.
+		/// More information on stateful versus stateless jobs can be found
+		/// <a href="http://www.opensymphony.com/quartz/tutorial.html#jobsMore">here</a>.
+		/// <p>
+		/// The default setting is to run jobs concurrently.
+		/// </p>
+		/// </summary>
+		public virtual bool Concurrent
+		{
+			set { concurrent = value; }
+		}
+
+		/// <summary> 
+		/// Set a list of JobListener names for this job, referring to
+		/// non-global JobListeners registered with the Scheduler.
+		/// </summary>
+		/// <remarks>
+		/// A JobListener name always refers to the name returned
+		/// by the JobListener implementation.
+		/// </remarks>
+		/// <seealso cref="SchedulerFactoryObject.JobListeners" />
+		/// <seealso cref="IJobListener.Name" />
+		public virtual string[] JobListenerNames
+		{
+			set { jobListenerNames = value; }
+		}
+
+        /// <summary>
+        /// Set the name of the object in the object factory that created this object.
+        /// </summary>
+        /// <value>The name of the object in the factory.</value>
+        /// <remarks>
+        /// Invoked after population of normal object properties but before an init
+        /// callback like <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// method or a custom init-method.
+        /// </remarks>
+		public virtual string ObjectName
+		{
+			set { objectName = value; }
+		}
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the object
+        /// managed by this factory.
+        /// </summary>
+        /// <returns>
+        /// An instance (possibly shared or independent) of the object managed by
+        /// this factory.
+        /// </returns>
+        /// <remarks>
+        /// <note type="caution">
+        /// If this method is being called in the context of an enclosing IoC container and
+        /// returns <see langword="null"/>, the IoC container will consider this factory
+        /// object as not being fully initialized and throw a corresponding (and most
+        /// probably fatal) exception.
+        /// </note>
+        /// </remarks>
+		public object GetObject()
+		{
+			return jobDetail;
+		}
+
+        /// <summary>
+        /// Return the <see cref="System.Type"/> of object that this
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/> creates, or
+        /// <see langword="null"/> if not known in advance.
+        /// </summary>
+        /// <value></value>
+		public virtual Type ObjectType
+		{
+			get { return typeof (JobDetail); }
+		}
+
+        /// <summary>
+        /// Is the object managed by this factory a singleton or a prototype?
+        /// </summary>
+        /// <value></value>
+		public virtual bool IsSingleton
+		{
+			get { return true; }
+		}
+
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method allows the object instance to perform the kind of
+        /// initialization only possible when all of it's dependencies have
+        /// been injected (set), and to throw an appropriate exception in the
+        /// event of misconfiguration.
+        /// </p>
+        /// <p>
+        /// Please do consult the class level documentation for the
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+        /// description of exactly <i>when</i> this method is invoked. In
+        /// particular, it is worth noting that the
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and <see cref="Spring.Context.IApplicationContextAware"/>
+        /// callbacks will have been invoked <i>prior</i> to this method being
+        /// called.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as the failure to set a
+        /// required property) or if initialization fails.
+        /// </exception>
+		public virtual void AfterPropertiesSet()
+		{
+			Prepare();
+
+			// Use specific name if given, else fall back to object name.
+			string jobDetailName = (name != null ? name : objectName);
+
+			// Consider the concurrent flag to choose between stateful and stateless job.
+			Type jobType = (concurrent ? typeof (MethodInvokingJob) : typeof (StatefulMethodInvokingJob));
+
+			// Build JobDetail instance.
+			jobDetail = new JobDetail(jobDetailName, group, jobType);
+			jobDetail.JobDataMap.Put("methodInvoker", this);
+			jobDetail.Volatile = true;
+			jobDetail.Durable = true;
+
+			// Register job listener names.
+			if (jobListenerNames != null)
+			{
+				for (int i = 0; i < jobListenerNames.Length; i++)
+				{
+					jobDetail.AddJobListener(jobListenerNames[i]);
+				}
+			}
+
+			PostProcessJobDetail(jobDetail);
+		}
+
+		/// <summary>
+		/// Callback for post-processing the JobDetail to be exposed by this FactoryObject.
+		/// <p>
+		/// The default implementation is empty. Can be overridden in subclasses.
+		/// </p>
+		/// </summary>
+		/// <param name="detail">the JobDetail prepared by this FactoryObject</param>
+		protected virtual void PostProcessJobDetail(JobDetail detail)
+		{
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/MethodInvokingRunnable.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/MethodInvokingRunnable.cs
new file mode 100644
index 00000000..39b0173f
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/MethodInvokingRunnable.cs
@@ -0,0 +1,132 @@
+/*
+* 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.
+*/
+using System;
+using System.Reflection;
+
+using Common.Logging;
+
+using Quartz;
+
+using Spring.Objects.Factory;
+using Spring.Objects.Support;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary> 
+    /// Adapter that implements the Runnable interface as a configurable
+    /// method invocation based on Spring's MethodInvoker.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Derives from ArgumentConvertingMethodInvoker, inheriting common
+    /// configuration properties from MethodInvoker.
+    /// </p>
+    /// 
+    /// <p>
+    /// Useful to generically encapsulate a method invocation as timer task for
+    /// <code>java.util.Timer</code>, in combination with a DelegatingTimerTask adapter.
+    /// Can also be used with JDK 1.5's <code>java.util.concurrent.Executor</code>
+    /// abstraction, which works with plain Runnables.
+    /// </p>
+    /// <p>
+    /// Extended by Spring's MethodInvokingTimerTaskFactoryObject adapter
+    /// for <code>TimerTask</code>. Note that you can populate a
+    /// ScheduledTimerTask object with a plain MethodInvokingRunnable instance
+    /// as well, which will automatically get wrapped with a DelegatingTimerTask.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <seealso cref="MethodInvoker" />
+    /// <seealso cref="ArgumentConvertingMethodInvoker" />
+    public class MethodInvokingRunnable : ArgumentConvertingMethodInvoker, IInitializingObject, IThreadRunnable
+    {
+        /// <summary>
+        /// Logger instance shared by this instance and its sub-class instances.
+        /// </summary>
+        protected ILog logger;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MethodInvokingRunnable"/> class.
+        /// </summary>
+        public MethodInvokingRunnable()
+        {
+            logger = LogManager.GetLogger(GetType());
+        }
+
+
+        /// <summary>
+        /// Gets the invocation failure message.
+        /// </summary>
+        /// <value>The invocation failure message.</value>
+        protected virtual string InvocationFailureMessage
+        {
+            get { return string.Format("Invocation of method '{0}' on target object [{1}] failed", TargetMethod, TargetObject); }
+        }
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        /// <remarks>
+        /// 	<p>
+        /// This method allows the object instance to perform the kind of
+        /// initialization only possible when all of it's dependencies have
+        /// been injected (set), and to throw an appropriate exception in the
+        /// event of misconfiguration.
+        /// </p>
+        /// 	<p>
+        /// Please do consult the class level documentation for the
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+        /// description of exactly <i>when</i> this method is invoked. In
+        /// particular, it is worth noting that the
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and <see cref="Spring.Context.IApplicationContextAware"/>
+        /// callbacks will have been invoked <i>prior</i> to this method being
+        /// called.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as the failure to set a
+        /// required property) or if initialization fails.
+        /// </exception>
+        public virtual void AfterPropertiesSet()
+        {
+            Prepare();
+        }
+
+        /// <summary>
+        /// This method has to be implemented in order that starting of the thread causes the object's
+        /// run method to be called in that separately executing thread.
+        /// </summary>
+        public virtual void Run()
+        {
+            try
+            {
+                Invoke();
+            }
+            catch (TargetInvocationException ex)
+            {
+                logger.Error(InvocationFailureMessage, ex);
+                // Do not throw exception, else the main loop of the Timer will stop!
+            }
+            catch (Exception ex)
+            {
+                logger.Error(InvocationFailureMessage, ex);
+                // Do not throw exception, else the main loop of the Timer will stop!
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/QuartzJobObject.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/QuartzJobObject.cs
new file mode 100644
index 00000000..795457ae
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/QuartzJobObject.cs
@@ -0,0 +1,83 @@
+/*
+* 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.
+*/
+using Quartz;
+using Spring.Objects;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary> 
+	/// Simple implementation of the Quartz Job interface, applying the
+	/// passed-in JobDataMap and also the SchedulerContext as object property
+	/// values. This is appropriate because a new Job instance will be created
+	/// for each execution. JobDataMap entries will override SchedulerContext
+	/// entries with the same keys.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// For example, let's assume that the JobDataMap contains a key
+	/// "myParam" with value "5": The Job implementation can then expose
+	/// a object property "myParam" of type int to receive such a value,
+	/// i.e. a method "setMyParam(int)". This will also work for complex
+	/// types like business objects etc.
+	/// </p>
+	/// 
+	/// <p>
+	/// Note: The QuartzJobObject class itself only implements the standard
+	/// Quartz IJob interface. Let your subclass explicitly implement the 
+	/// Quartz IStatefulJob interface to  mark your concrete job object as stateful.
+	/// </p>
+    /// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <seealso cref="JobExecutionContext.MergedJobDataMap" />
+	/// <seealso cref="IScheduler.Context" />
+	/// <seealso cref="JobDetailObject.JobDataAsMap" />
+	/// <seealso cref="CronTriggerObject.JobDataAsMap" />
+	/// <seealso cref="SchedulerFactoryObject.SchedulerContextAsMap" />
+	/// <seealso cref="SpringObjectJobFactory" />
+	/// <seealso cref="SchedulerFactoryObject.JobFactory" />
+	public abstract class QuartzJobObject : IJob
+	{
+		/// <summary> 
+		/// This implementation applies the passed-in job data map as object property
+		/// values, and delegates to <code>ExecuteInternal</code> afterwards.
+		/// </summary>
+		/// <seealso cref="ExecuteInternal" />
+		public void Execute(JobExecutionContext context)
+		{
+			try
+			{
+				ObjectWrapper bw = new ObjectWrapper(this);
+				MutablePropertyValues pvs = new MutablePropertyValues();
+				pvs.AddAll(context.Scheduler.Context);
+				pvs.AddAll(context.MergedJobDataMap);
+				bw.SetPropertyValues(pvs, true);
+			}
+			catch (SchedulerException ex)
+			{
+				throw new JobExecutionException(ex);
+			}
+			ExecuteInternal(context);
+		}
+
+		/// <summary> 
+		/// Execute the actual job. The job data map will already have been
+		/// applied as object property values by execute. The contract is
+		/// exactly the same as for the standard Quartz execute method.
+		/// </summary>
+		/// <seealso cref="Execute" />
+		protected abstract void ExecuteInternal(JobExecutionContext context);
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/ResourceJobSchedulingDataProcessor.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/ResourceJobSchedulingDataProcessor.cs
new file mode 100644
index 00000000..037ebc58
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/ResourceJobSchedulingDataProcessor.cs
@@ -0,0 +1,84 @@
+/*
+* Copyright 2002-2005 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.
+*/
+using System.IO;
+
+using Quartz.Xml;
+
+using Spring.Context;
+using Spring.Core.IO;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary> 
+	/// Subclass of Quartz' JobSchedulingDataProcessor that considers
+	/// given filenames as Spring resource locations.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <seealso cref="IResourceLoader" /> 
+	public class ResourceJobSchedulingDataProcessor : JobSchedulingDataProcessor, IResourceLoaderAware
+	{
+		private IResourceLoader resourceLoader;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ResourceJobSchedulingDataProcessor"/> class.
+        /// </summary>
+		public ResourceJobSchedulingDataProcessor()
+		{
+			resourceLoader = new ConfigurableResourceLoader();
+		}
+
+
+        /// <summary>
+        /// Gets and sets the <see cref="Spring.Core.IO.IResourceLoader"/>
+        /// that this object runs in.
+        /// </summary>
+        /// <value></value>
+        /// <remarks>
+        /// Invoked <b>after</b> population of normal objects properties but
+        /// before an init callback such as
+        /// <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet()"/>
+        /// or a custom init-method. Invoked <b>before</b> setting
+        /// <see cref="Spring.Context.IApplicationContextAware"/>'s
+        /// <see cref="Spring.Context.IApplicationContextAware.ApplicationContext"/>
+        /// property.
+        /// </remarks>
+		public virtual IResourceLoader ResourceLoader
+		{
+			set { resourceLoader = (value != null ? value : new ConfigurableResourceLoader()); }
+			get { return resourceLoader; }
+		}
+
+        /// <summary>
+        /// Returns an <see cref="T:System.IO.Stream"/> from the fileName as a resource.
+        /// </summary>
+        /// <param name="fileName">Name of the file.</param>
+        /// <returns>
+        /// an <see cref="T:System.IO.Stream"/> from the fileName as a resource.
+        /// </returns>
+		protected override Stream GetInputStream(string fileName)
+		{
+			try
+			{
+				return resourceLoader.GetResource(fileName).InputStream;
+			}
+			catch (IOException ex)
+			{
+				throw new SchedulingException("Could not load job scheduling data XML file", ex);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SchedulerFactoryObject.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SchedulerFactoryObject.cs
new file mode 100644
index 00000000..6a4aa818
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SchedulerFactoryObject.cs
@@ -0,0 +1,1084 @@
+/*
+* 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.
+*/
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+using System.Threading;
+
+using Common.Logging;
+
+using Quartz;
+using Quartz.Impl;
+using Quartz.Simpl;
+using Quartz.Spi;
+using Quartz.Util;
+using Quartz.Xml;
+
+using Spring.Context;
+using Spring.Core.IO;
+using Spring.Objects.Factory;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary> 
+    /// FactoryObject that sets up a Quartz Scheduler and exposes it for object references.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Allows registration of JobDetails, Calendars and Triggers, automatically
+    /// starting the scheduler on initialization and shutting it down on destruction.
+    /// In scenarios that just require static registration of jobs at startup, there
+    /// is no need to access the Scheduler instance itself in application code.
+    /// </p>
+    /// 
+    /// <p>
+    /// For dynamic registration of jobs at runtime, use a object reference to
+    /// this SchedulerFactoryObject to get direct access to the Quartz Scheduler
+    /// (<see cref="IScheduler" />). This allows you to create new jobs
+    /// and triggers, and also to control and monitor the entire Scheduler.
+    /// </p>
+    /// 
+    /// <p>
+    /// Note that Quartz instantiates a new Job for each execution, in
+    /// contrast to Timer which uses a TimerTask instance that is shared
+    /// between repeated executions. Just JobDetail descriptors are shared.
+    /// </p>
+    /// 
+    /// <p>
+    /// When using persistent jobs, it is strongly recommended to perform all
+    /// operations on the Scheduler within Spring-managed transactions.
+    /// Else, database locking will not properly work and might even break.
+    /// </p>
+    /// <p>
+    /// The preferred way to achieve transactional execution is to demarcate
+    /// declarative transactions at the business facade level, which will
+    /// automatically apply to Scheduler operations performed within those scopes.
+    /// Alternatively, define a TransactionProxyFactoryObject for the Scheduler itself.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Marko Lahma (.NET)</author>
+    /// <seealso cref="IScheduler" />
+    /// <seealso cref="ISchedulerFactory" />
+    /// <seealso cref="StdSchedulerFactory" />
+    public class SchedulerFactoryObject : IFactoryObject, IApplicationContextAware, IInitializingObject, IDisposable
+    {
+        private const string CONTEXT_KEY_CONFIG_TIME_TASK_EXECUTOR = "sched_factory_conf_t_t_exec";
+        
+        /// <summary>
+        /// Default thread count to be set to thread pool.
+        /// </summary>
+        public const int DEFAULT_THREAD_COUNT = 10;
+        
+        /// <summary>
+        /// Property name for thread count in thread pool.
+        /// </summary>
+        public const string PROP_THREAD_COUNT = "quartz.threadPool.threadCount";
+
+        /// <summary>
+        /// Logger for this instance and its sub-class instances.
+        /// </summary>
+        protected ILog logger;
+
+        private IApplicationContext applicationContext;
+        private string applicationContextSchedulerContextKey;
+        private bool autoStartup = true;
+        private IDictionary calendars;
+        private IResource configLocation;
+        private IJobListener[] globalJobListeners;
+        private ITriggerListener[] globalTriggerListeners;
+        private ArrayList jobDetails;
+        private IJobFactory jobFactory;
+        private IJobListener[] jobListeners;
+        private string[] jobSchedulingDataLocations;
+        private bool overwriteExistingJobs = false;
+        private NameValueCollection quartzProperties;
+        private IScheduler  scheduler;
+        private IDictionary schedulerContextMap;
+        private Type schedulerFactoryType;
+        private ISchedulerListener[] schedulerListeners;
+        private string schedulerName;
+        private int startupDelay = 0;
+        private ITaskExecutor taskExecutor;
+        private ITriggerListener[] triggerListeners;
+        private ArrayList triggers;
+        private bool waitForJobsToCompleteOnShutdown = false;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SchedulerFactoryObject"/> class.
+        /// </summary>
+        public SchedulerFactoryObject()
+        {
+            logger = LogManager.GetLogger(GetType());
+            schedulerFactoryType = typeof (StdSchedulerFactory);
+            jobFactory = new AdaptableJobFactory();
+        }
+
+
+        /// <summary>
+        /// Set the Quartz SchedulerFactory implementation to use.
+        /// </summary>
+        /// <remarks>
+        /// Default is StdSchedulerFactory, reading in the standard
+        /// quartz.properties from Quartz' dll. To use custom Quartz
+        /// properties, specify "configLocation" or "quartzProperties".
+        /// </remarks>
+        /// <value>The scheduler factory class.</value>
+        /// <seealso cref="StdSchedulerFactory"/>
+        /// <seealso cref="ConfigLocation"/>
+        /// <seealso cref="QuartzProperties"/>
+        public virtual Type SchedulerFactoryType
+        {
+            set
+            {
+                if (value == null || !typeof (ISchedulerFactory).IsAssignableFrom(value))
+                {
+                    throw new ArgumentException("schedulerFactoryType must implement [Quartz.ISchedulerFactory]");
+                }
+                schedulerFactoryType = value;
+            }
+        }
+
+        /// <summary>
+        /// Set the name of the Scheduler to fetch from the SchedulerFactory.
+        /// If not specified, the default Scheduler will be used.
+        /// </summary>
+        /// <value>The name of the scheduler.</value>
+        /// <seealso cref="ISchedulerFactory.GetScheduler(string)"/>
+        /// <seealso cref="ISchedulerFactory.GetScheduler()"/>
+        public virtual string SchedulerName
+        {
+            set { schedulerName = value; }
+        }
+
+        /// <summary> 
+        /// Set the location of the Quartz properties config file, for example
+        /// as assembly resource "assembly:quartz.properties".
+        /// </summary>
+        /// <remarks>
+        /// Note: Can be omitted when all necessary properties are specified
+        /// locally via this object, or when relying on Quartz' default configuration.
+        /// </remarks>
+        /// <seealso cref="QuartzProperties" />
+        public virtual IResource ConfigLocation
+        {
+            set { configLocation = value; }
+        }
+
+        /// <summary> 
+        /// Set Quartz properties, like "quartz.threadPool.type".
+        /// </summary>
+        /// <remarks>
+        /// Can be used to override values in a Quartz properties config file,
+        /// or to specify all necessary properties locally.
+        /// </remarks>
+        /// <seealso cref="ConfigLocation" />
+        public virtual NameValueCollection QuartzProperties
+        {
+            set { quartzProperties = value; }
+        }
+
+        /// <summary>
+        /// Set the Spring TaskExecutor to use as Quartz backend.
+        /// Exposed as thread pool through the Quartz SPI.
+        /// </summary>
+        /// <remarks>
+        /// By default, a Quartz SimpleThreadPool will be used, configured through
+        /// the corresponding Quartz properties.
+        /// </remarks>
+        /// <value>The task executor.</value>
+        /// <seealso cref="QuartzProperties"/>
+        /// <seealso cref="LocalTaskExecutorThreadPool"/>
+        public virtual ITaskExecutor TaskExecutor
+        {
+            set { taskExecutor = value; }
+        }
+
+        /// <summary> 
+        /// Register objects in the Scheduler context via a given Map.
+        /// These objects will be available to any Job that runs in this Scheduler.
+        /// </summary>
+        /// <remarks>
+        /// Note: When using persistent Jobs whose JobDetail will be kept in the
+        /// database, do not put Spring-managed object or an ApplicationContext
+        /// reference into the JobDataMap but rather into the SchedulerContext.
+        /// </remarks>
+        /// <value>
+        /// Map with string keys and any objects as
+        /// values (for example Spring-managed objects)
+        /// </value>
+        /// <seealso cref="JobDetailObject.JobDataAsMap" />
+        public virtual IDictionary SchedulerContextAsMap
+        {
+            set { schedulerContextMap = value; }
+        }
+
+        /// <summary>
+        /// Set the key of an IApplicationContext reference to expose in the
+        /// SchedulerContext, for example "applicationContext". Default is none.
+        /// Only applicable when running in a Spring ApplicationContext.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Note: When using persistent Jobs whose JobDetail will be kept in the
+        /// database, do not put an IApplicationContext reference into the JobDataMap
+        /// but rather into the SchedulerContext.
+        /// </p>
+        /// 	
+        /// <p>
+        /// In case of a QuartzJobObject, the reference will be applied to the Job
+        /// instance as object property. An "applicationContext" attribute will
+        /// correspond to a "setApplicationContext" method in that scenario.
+        /// </p>
+        /// 	
+        /// <p>
+        /// Note that ObjectFactory callback interfaces like IApplicationContextAware
+        /// are not automatically applied to Quartz Job instances, because Quartz
+        /// itself is reponsible for the lifecycle of its Jobs.
+        /// </p>
+        /// </remarks>
+        /// <value>The application context scheduler context key.</value>
+        /// <seealso cref="JobDetailObject.ApplicationContextJobDataKey"/>
+        public virtual string ApplicationContextSchedulerContextKey
+        {
+            set { applicationContextSchedulerContextKey = value; }
+        }
+
+        /// <summary> 
+        /// Set the Quartz JobFactory to use for this Scheduler.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Default is Spring's <see cref="AdaptableJobFactory" />, which supports
+        /// standard Quartz <see cref="IJob" /> instances.
+        /// </p>
+        /// <p>
+        /// Specify an instance of Spring's <see cref="SpringObjectJobFactory" /> here
+        /// (typically as an inner object definition) to automatically populate a
+        /// job's object properties from the specified job data map and scheduler
+        /// context.
+        /// </p>
+        /// </remarks>
+        /// <seealso cref="AdaptableJobFactory" />
+        /// <seealso cref="SpringObjectJobFactory" />
+        public virtual IJobFactory JobFactory
+        {
+            set { jobFactory = value; }
+        }
+
+        /// <summary> 
+        /// Set whether any jobs defined on this SchedulerFactoryObject should overwrite
+        /// existing job definitions. Default is "false", to not overwrite already
+        /// registered jobs that have been read in from a persistent job store.
+        /// </summary>
+        public virtual bool OverwriteExistingJobs
+        {
+            set { overwriteExistingJobs = value; }
+        }
+
+        /// <summary> 
+        /// Set the location of a Quartz job definition XML file that follows the
+        /// "job_scheduling_data" XSD. Can be specified to automatically
+        /// register jobs that are defined in such a file, possibly in addition
+        /// to jobs defined directly on this SchedulerFactoryObject.
+        /// </summary>
+        /// <seealso cref="ResourceJobSchedulingDataProcessor" />
+        /// <seealso cref="JobSchedulingDataProcessor" />
+        public virtual string JobSchedulingDataLocation
+        {
+            set { jobSchedulingDataLocations = new string[] {value}; }
+        }
+
+        /// <summary>
+        /// Set the locations of Quartz job definition XML files that follow the
+        /// "job_scheduling_data" XSD. Can be specified to automatically
+        /// register jobs that are defined in such files, possibly in addition
+        /// to jobs defined directly on this SchedulerFactoryObject.
+        /// </summary>
+        /// <value>The job scheduling data locations.</value>
+        /// <seealso cref="ResourceJobSchedulingDataProcessor"/>
+        /// <seealso cref="JobSchedulingDataProcessor"/>
+        public virtual string[] JobSchedulingDataLocations
+        {
+            set { jobSchedulingDataLocations = value; }
+        }
+
+        /// <summary> 
+        /// Register a list of JobDetail objects with the Scheduler that
+        /// this FactoryObject creates, to be referenced by Triggers.
+        /// <p>This is not necessary when a Trigger determines the JobDetail
+        /// itself: In this case, the JobDetail will be implicitly registered
+        /// in combination with the Trigger.</p>
+        /// </summary>
+        /// <seealso cref="Triggers" />
+        /// <seealso cref="JobDetail" />
+        /// <seealso cref="JobDetailObject" />
+        /// <seealso cref="IJobDetailAwareTrigger" />
+        /// <seealso cref="Trigger.JobName" />
+        public virtual JobDetail[] JobDetails
+        {
+            set
+            {
+                // Use modifiable ArrayList here, to allow for further adding of
+                // JobDetail objects during autodetection of JobDetailAwareTriggers.
+                jobDetails = new ArrayList(value);
+            }
+        }
+
+        /// <summary>
+        /// Register a list of Quartz ICalendar objects with the Scheduler
+        /// that this FactoryObject creates, to be referenced by Triggers.
+        /// </summary>
+        /// <value>The calendars.</value>
+        /// <seealso cref="ICalendar"/>
+        /// <seealso cref="Trigger.CalendarName"/>
+        public virtual IDictionary Calendars
+        {
+            set { calendars = value; }
+        }
+
+        /// <summary> 
+        /// Register a list of Trigger objects with the Scheduler that
+        /// this FactoryObject creates.
+        /// <p>
+        /// If the Trigger determines the corresponding JobDetail itself,
+        /// the job will be automatically registered with the Scheduler.
+        /// Else, the respective JobDetail needs to be registered via the
+        /// "jobDetails" property of this FactoryObject.
+        /// </p>
+        /// </summary>
+        /// <seealso cref="JobDetails" />
+        /// <seealso cref="JobDetail" />
+        /// <seealso cref="IJobDetailAwareTrigger" />
+        /// <seealso cref="CronTriggerObject" />
+        public virtual Trigger[] Triggers
+        {
+            set { triggers = new ArrayList(value); }
+        }
+
+        /// <summary> 
+        /// Specify Quartz SchedulerListeners to be registered with the Scheduler.
+        /// </summary>
+        public virtual ISchedulerListener[] SchedulerListeners
+        {
+            set { schedulerListeners = value; }
+        }
+
+        /// <summary> 
+        /// Specify global Quartz JobListeners to be registered with the Scheduler.
+        /// Such JobListeners will apply to all Jobs in the Scheduler.
+        /// </summary>
+        public virtual IJobListener[] GlobalJobListeners
+        {
+            set { globalJobListeners = value; }
+        }
+
+        /// <summary>
+        /// Specify named Quartz JobListeners to be registered with the Scheduler.
+        /// Such JobListeners will only apply to Jobs that explicitly activate
+        /// them via their name.
+        /// </summary>
+        /// <value>The job listeners.</value>
+        /// <seealso cref="IJobListener.Name"/>
+        /// <seealso cref="JobDetail.AddJobListener"/>
+        /// <seealso cref="JobDetail.JobListenerNames"/>
+        public virtual IJobListener[] JobListeners
+        {
+            set { jobListeners = value; }
+        }
+
+        /// <summary>
+        /// Specify global Quartz TriggerListeners to be registered with the Scheduler.
+        /// Such TriggerListeners will apply to all Triggers in the Scheduler.
+        /// </summary>
+        /// <value>The global trigger listeners.</value>
+        public virtual ITriggerListener[] GlobalTriggerListeners
+        {
+            set { globalTriggerListeners = value; }
+        }
+
+        /// <summary> 
+        /// Specify named Quartz TriggerListeners to be registered with the Scheduler.
+        /// Such TriggerListeners will only apply to Triggers that explicitly activate
+        /// them via their name.
+        /// </summary>
+        /// <seealso cref="ITriggerListener.Name" />
+        /// <seealso cref="Trigger.AddTriggerListener" />
+        /// <seealso cref="Trigger.TriggerListenerNames" />
+        /// <seealso cref="Trigger.TriggerListenerNames" />
+        public virtual ITriggerListener[] TriggerListeners
+        {
+            set { triggerListeners = value; }
+        }
+
+        /// <summary> 
+        /// Set whether to automatically start the scheduler after initialization.
+        /// Default is "true"; set this to "false" to allow for manual startup.
+        /// </summary>
+        public virtual bool AutoStartup
+        {
+            set { autoStartup = value; }
+        }
+
+        /// <summary> 
+        /// Set the number of seconds to wait after initialization before
+        /// starting the scheduler asynchronously. Default is 0, meaning
+        /// immediate synchronous startup on initialization of this object.
+        /// </summary>
+        /// <remarks>
+        /// Setting this to 10 or 20 seconds makes sense if no jobs
+        /// should be run before the entire application has started up.
+        /// </remarks>
+        public virtual int StartupDelay
+        {
+            set { startupDelay = value; }
+        }
+
+        /// <summary>
+        /// Set whether to wait for running jobs to complete on Shutdown.
+        /// Default is "false".
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if [wait for jobs to complete on Shutdown]; otherwise, <c>false</c>.
+        /// </value>
+        /// <seealso cref="IScheduler.Shutdown(bool)"/>
+        public virtual bool WaitForJobsToCompleteOnShutdown
+        {
+            set { waitForJobsToCompleteOnShutdown = value; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this <see cref="SchedulerFactoryObject"/> is running.
+        /// </summary>
+        /// <value><c>true</c> if running; otherwise, <c>false</c>.</value>
+        public virtual bool Running
+        {
+            get
+            {
+                if (scheduler != null)
+                {
+                    try
+                    {
+                        return !scheduler.InStandbyMode;
+                    }
+                    catch (SchedulerException)
+                    {
+                        return false;
+                    }
+                }
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Return the TaskExecutor for the currently configured Quartz Scheduler,
+        /// to be used by LocalTaskExecutorThreadPool.
+        /// </summary>
+        /// <remarks>
+        /// This instance will be set before initialization of the corresponding
+        /// Scheduler, and reset immediately afterwards. It is thus only available
+        /// during configuration.
+        /// </remarks>
+        public static ITaskExecutor ConfigTimeTaskExecutor
+        {
+            get { return (ITaskExecutor) LogicalThreadContext.GetData(CONTEXT_KEY_CONFIG_TIME_TASK_EXECUTOR); }
+        }
+
+        #region IApplicationContextAware Members
+
+        /// <summary>
+        /// Set the <see cref="Spring.Context.IApplicationContext"/> that this
+        /// object runs in.
+        /// </summary>
+        /// <value></value>
+        /// <remarks>
+        /// <p>
+        /// Normally this call will be used to initialize the object.
+        /// </p>
+        /// <p>
+        /// Invoked after population of normal object properties but before an
+        /// init callback such as
+        /// <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// or a custom init-method. Invoked after the setting of any
+        /// <see cref="Spring.Context.IResourceLoaderAware"/>'s
+        /// <see cref="Spring.Context.IResourceLoaderAware.ResourceLoader"/>
+        /// property.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Context.ApplicationContextException">
+        /// In the case of application context initialization errors.
+        /// </exception>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// If thrown by any application context methods.
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectInitializationException"/>
+        public virtual IApplicationContext ApplicationContext
+        {
+            set { applicationContext = value; }
+            get { return applicationContext; }
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        /// <summary>
+        /// Shut down the Quartz scheduler on object factory Shutdown,
+        /// stopping all scheduled jobs.
+        /// </summary>
+        public virtual void Dispose()
+        {
+            logger.Info("Shutting down Quartz Scheduler");
+            scheduler.Shutdown(waitForJobsToCompleteOnShutdown);
+        }
+
+        #endregion
+
+        #region IFactoryObject Members
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the object
+        /// managed by this factory.
+        /// </summary>
+        /// <returns>
+        /// An instance (possibly shared or independent) of the object managed by
+        /// this factory.
+        /// </returns>
+        /// <remarks>
+        /// <note type="caution">
+        /// If this method is being called in the context of an enclosing IoC container and
+        /// returns <see langword="null"/>, the IoC container will consider this factory
+        /// object as not being fully initialized and throw a corresponding (and most
+        /// probably fatal) exception.
+        /// </note>
+        /// </remarks>
+        public object GetObject()
+        {
+            return scheduler;
+        }
+
+        /// <summary>
+        /// Return the <see cref="System.Type"/> of object that this
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/> creates, or
+        /// <see langword="null"/> if not known in advance.
+        /// </summary>
+        /// <value></value>
+        public virtual Type ObjectType
+        {
+            get { return (scheduler != null) ? scheduler.GetType() : typeof (IScheduler); }
+        }
+
+        /// <summary>
+        /// Is the object managed by this factory a singleton or a prototype?
+        /// </summary>
+        /// <value></value>
+        public virtual bool IsSingleton
+        {
+            get { return true; }
+        }
+
+        #endregion
+
+        //---------------------------------------------------------------------
+        // Implementation of IInitializingObject interface
+        //---------------------------------------------------------------------
+
+        #region IInitializingObject Members
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        /// <remarks>
+        /// 	<p>
+        /// This method allows the object instance to perform the kind of
+        /// initialization only possible when all of it's dependencies have
+        /// been injected (set), and to throw an appropriate exception in the
+        /// event of misconfiguration.
+        /// </p>
+        /// 	<p>
+        /// Please do consult the class level documentation for the
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+        /// description of exactly <i>when</i> this method is invoked. In
+        /// particular, it is worth noting that the
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and <see cref="Spring.Context.IApplicationContextAware"/>
+        /// callbacks will have been invoked <i>prior</i> to this method being
+        /// called.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as the failure to set a
+        /// required property) or if initialization fails.
+        /// </exception>
+        public virtual void AfterPropertiesSet()
+        {
+            // Create SchedulerFactory instance.
+            ISchedulerFactory schedulerFactory = (ISchedulerFactory) ObjectUtils.InstantiateType(schedulerFactoryType);
+
+            InitSchedulerFactory(schedulerFactory);
+
+            // Get Scheduler instance from SchedulerFactory.
+            scheduler = CreateScheduler(schedulerFactory, schedulerName);
+            if (jobFactory != null)
+            {
+                if (jobFactory is ISchedulerContextAware)
+                {
+                    ((ISchedulerContextAware) jobFactory).SchedulerContext = scheduler.Context;
+                }
+                scheduler.JobFactory = jobFactory;
+            }
+
+
+            PopulateSchedulerContext();
+            RegisterListeners();
+            RegisterJobsAndTriggers();
+
+            // Start Scheduler immediately, if demanded.
+            if (autoStartup)
+            {
+                StartScheduler(scheduler, startupDelay);
+            }
+        }
+
+        #endregion
+
+        /// <summary> 
+        /// Load and/or apply Quartz properties to the given SchedulerFactory.
+        /// </summary>
+        /// <param name="schedulerFactory">the SchedulerFactory to Initialize</param>
+        private void InitSchedulerFactory(ISchedulerFactory schedulerFactory)
+        {
+            if (configLocation != null || quartzProperties != null || schedulerName != null ||
+                taskExecutor != null)
+            {
+                if (!(schedulerFactory is StdSchedulerFactory))
+                {
+                    throw new ArgumentException("StdSchedulerFactory required for applying Quartz properties");
+                }
+
+                NameValueCollection mergedProps = new NameValueCollection();
+
+                // Set necessary default properties here, as Quartz will not apply
+                // its default configuration when explicitly given properties.
+                if (taskExecutor != null)
+                {
+                    mergedProps[StdSchedulerFactory.PROP_THREAD_POOL_CLASS] =
+                        typeof (LocalTaskExecutorThreadPool).FullName;
+                }
+                else
+                {
+                    mergedProps.Set(StdSchedulerFactory.PROP_THREAD_POOL_CLASS, typeof (SimpleThreadPool).Name);
+                    mergedProps[PROP_THREAD_COUNT] = Convert.ToString(DEFAULT_THREAD_COUNT);
+                }
+
+                if (configLocation != null)
+                {
+                    if (logger.IsInfoEnabled)
+                    {
+                        logger.Info("Loading Quartz config from [" + configLocation + "]");
+                    }
+                    using (StreamReader sr = new StreamReader(configLocation.InputStream))
+                    {
+                        string line;
+                        while ((line =sr.ReadLine()) != null)
+                        {
+                            string[] lineItems = line.Split('=');
+                            if (lineItems.Length == 2)
+                            {
+                                mergedProps[lineItems[0]] = lineItems[1];
+                            }
+                        } 
+                    }
+                    
+                }
+
+                MergePropertiesIntoMap(quartzProperties, mergedProps);
+
+
+                // Make sure to set the scheduler name as configured in the Spring configuration.
+                if (schedulerName != null)
+                {
+                    mergedProps.Add(StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME, schedulerName);
+                }
+
+                ((StdSchedulerFactory) schedulerFactory).Initialize(mergedProps);
+            }
+        }
+
+        /// <summary>
+        /// Merges the properties into map. This effectively also
+        /// overwrites existing properties with same key in map.
+        /// </summary>
+        /// <param name="properties">The properties to merge into given map.</param>
+        /// <param name="map">The map to merge to.</param>
+        protected virtual void MergePropertiesIntoMap(NameValueCollection properties, NameValueCollection map)
+        {
+            foreach (string key in properties.Keys)
+            {
+                map[key] = properties[key];
+            }
+        }
+
+
+        /// <summary>
+        /// Create the Scheduler instance for the given factory and scheduler name.
+        /// Called by afterPropertiesSet.
+        /// </summary>
+        /// <remarks>
+        /// Default implementation invokes SchedulerFactory's <code>GetScheduler</code>
+        /// method. Can be overridden for custom Scheduler creation.
+        /// </remarks>
+        /// <param name="schedulerFactory">the factory to create the Scheduler with</param>
+        /// <param name="schedName">the name of the scheduler to create</param>
+        /// <returns>the Scheduler instance</returns>
+        /// <seealso cref="AfterPropertiesSet"/>
+        /// <seealso cref="ISchedulerFactory.GetScheduler()"/>
+        protected virtual IScheduler CreateScheduler(ISchedulerFactory schedulerFactory, string schedName)
+        {
+            // StdSchedulerFactory's default "getScheduler" implementation
+            // uses the scheduler name specified in the Quartz properties,
+            // which we have set before (in "InitSchedulerFactory").
+            return schedulerFactory.GetScheduler();
+        }
+
+        /// <summary>
+        /// Expose the specified context attributes and/or the current
+        /// IApplicationContext in the Quartz SchedulerContext.
+        /// </summary>
+        private void PopulateSchedulerContext()
+        {
+            // Put specified objects into Scheduler context.
+            if (schedulerContextMap != null)
+            {
+                scheduler.Context.PutAll(schedulerContextMap);
+            }
+
+            // Register IApplicationContext in Scheduler context.
+            if (applicationContextSchedulerContextKey != null)
+            {
+                if (applicationContext == null)
+                {
+                    throw new SystemException("SchedulerFactoryObject needs to be set up in an IApplicationContext " +
+                                              "to be able to handle an 'applicationContextSchedulerContextKey'");
+                }
+                scheduler.Context.Put(applicationContextSchedulerContextKey, applicationContext);
+            }
+        }
+
+
+        /// <summary> 
+        /// Register all specified listeners with the Scheduler.
+        /// </summary>
+        private void RegisterListeners()
+        {
+            if (schedulerListeners != null)
+            {
+                for (int i = 0; i < schedulerListeners.Length; i++)
+                {
+                    scheduler.AddSchedulerListener(schedulerListeners[i]);
+                }
+            }
+            if (globalJobListeners != null)
+            {
+                for (int i = 0; i < globalJobListeners.Length; i++)
+                {
+                    scheduler.AddGlobalJobListener(globalJobListeners[i]);
+                }
+            }
+            if (jobListeners != null)
+            {
+                for (int i = 0; i < jobListeners.Length; i++)
+                {
+                    scheduler.AddJobListener(jobListeners[i]);
+                }
+            }
+            if (globalTriggerListeners != null)
+            {
+                for (int i = 0; i < globalTriggerListeners.Length; i++)
+                {
+                    scheduler.AddGlobalTriggerListener(globalTriggerListeners[i]);
+                }
+            }
+            if (triggerListeners != null)
+            {
+                for (int i = 0; i < triggerListeners.Length; i++)
+                {
+                    scheduler.AddTriggerListener(triggerListeners[i]);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Register jobs and triggers (within a transaction, if possible).
+        /// </summary>
+        private void RegisterJobsAndTriggers()
+        {
+            try
+            {
+                if (jobSchedulingDataLocations != null)
+                {
+                    ResourceJobSchedulingDataProcessor dataProcessor = new ResourceJobSchedulingDataProcessor();
+                    if (applicationContext != null)
+                    {
+                        dataProcessor.ResourceLoader = applicationContext;
+                    }
+                    for (int i = 0; i < jobSchedulingDataLocations.Length; i++)
+                    {
+                        dataProcessor.ProcessFileAndScheduleJobs(jobSchedulingDataLocations[i], scheduler,
+                                                                 overwriteExistingJobs);
+                    }
+                }
+
+                // Register JobDetails.
+                if (jobDetails != null)
+                {
+                    foreach (JobDetail jobDetail in jobDetails)
+                    {
+                        AddJobToScheduler(jobDetail);
+                    }
+                }
+                else
+                {
+                    // Create empty list for easier checks when registering triggers.
+                    jobDetails = new ArrayList();
+                }
+
+                // Register Calendars.
+                if (calendars != null)
+                {
+                    foreach (DictionaryEntry entry in calendars)
+                    {
+                        string calendarName = (string) entry.Key;
+                        ICalendar calendar = (ICalendar) entry.Value;
+                        scheduler.AddCalendar(calendarName, calendar, true, true);
+                    }
+                }
+
+                // Register Triggers.
+                if (triggers != null)
+                {
+                    foreach (Trigger trigger in triggers)
+                    {
+                        AddTriggerToScheduler(trigger);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is SchedulerException)
+                {
+                    throw;
+                }
+                throw new SchedulerException("Registration of jobs and triggers failed: " + ex.Message, ex);
+            }
+        }
+
+        /// <summary>
+        /// Add the given job to the Scheduler, if it doesn't already exist.
+        /// Overwrites the job in any case if "overwriteExistingJobs" is set.
+        /// </summary>
+        /// <param name="jobDetail">the job to add</param>
+        /// <returns>
+        /// 	<code>true</code> if the job was actually added,
+        /// <code>false</code> if it already existed before
+        /// </returns>
+        /// <seealso cref="OverwriteExistingJobs"/>
+        private bool AddJobToScheduler(JobDetail jobDetail)
+        {
+            if (overwriteExistingJobs || scheduler.GetJobDetail(jobDetail.Name, jobDetail.Group) == null)
+            {
+                scheduler.AddJob(jobDetail, true);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Add the given trigger to the Scheduler, if it doesn't already exist.
+        /// Overwrites the trigger in any case if "overwriteExistingJobs" is set.
+        /// </summary>
+        /// <param name="trigger">the trigger to add</param>
+        /// <returns>
+        /// 	<code>true</code> if the trigger was actually added,
+        /// <code>false</code> if it already existed before
+        /// </returns>
+        /// <seealso cref="OverwriteExistingJobs"/>
+        private bool AddTriggerToScheduler(Trigger trigger)
+        {
+            bool triggerExists = (scheduler.GetTrigger(trigger.Name, trigger.Group) != null);
+            if (!triggerExists || overwriteExistingJobs)
+            {
+                // Check if the Trigger is aware of an associated JobDetail.
+                if (trigger is IJobDetailAwareTrigger)
+                {
+                    JobDetail jobDetail = ((IJobDetailAwareTrigger) trigger).JobDetail;
+                    // Automatically register the JobDetail too.
+                    if (!jobDetails.Contains(jobDetail) && AddJobToScheduler(jobDetail))
+                    {
+                        jobDetails.Add(jobDetail);
+                    }
+                }
+                if (!triggerExists)
+                {
+                    try
+                    {
+                        scheduler.ScheduleJob(trigger);
+                    }
+                    catch (ObjectAlreadyExistsException ex)
+                    {
+                        if (logger.IsDebugEnabled)
+                        {
+                            logger.Debug(
+                                string.Format(
+                                    "Unexpectedly found existing trigger, assumably due to cluster race condition: {0} - can safely be ignored",
+                                    ex.Message));
+                        }
+                        if (overwriteExistingJobs)
+                        {
+                            scheduler.RescheduleJob(trigger.Name, trigger.Group, trigger);
+                        }
+                    }
+                }
+                else
+                {
+                    scheduler.RescheduleJob(trigger.Name, trigger.Group, trigger);
+                }
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+
+        /// <summary>
+        /// Start the Quartz Scheduler, respecting the "startDelay" setting.
+        /// </summary>
+        /// <param name="sched">the Scheduler to start</param>
+        /// <param name="startDelay">the number of seconds to wait before starting
+        /// the Scheduler asynchronously</param>
+        protected virtual void StartScheduler(IScheduler sched, int startDelay)
+        {
+            if (startDelay <= 0)
+            {
+                logger.Info("Starting Quartz Scheduler now");
+                sched.Start();
+            }
+            else
+            {
+                if (logger.IsInfoEnabled)
+                {
+                    logger.Info(
+                        string.Format("Will start Quartz Scheduler [{0}] in {1} seconds", sched.SchedulerName,
+                                      startDelay));
+                }
+                QuartzThread schedulerThread = new AnonymousClassThread(this);
+                schedulerThread.Name = "Quartz Scheduler [" + sched.SchedulerName + "]";
+                schedulerThread.Start();
+            }
+        }
+
+
+        //---------------------------------------------------------------------
+        // Implementation of Lifecycle interface
+        //---------------------------------------------------------------------
+
+        /// <summary>
+        /// Starts this instance.
+        /// </summary>
+        public virtual void Start()
+        {
+            if (scheduler != null)
+            {
+                try
+                {
+                    scheduler.Start();
+                }
+                catch (SchedulerException ex)
+                {
+                    throw new SchedulingException("Could not start Quartz Scheduler", ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Stops this instance.
+        /// </summary>
+        public virtual void Stop()
+        {
+            if (scheduler != null)
+            {
+                try
+                {
+                    scheduler.Standby();
+                }
+                catch (SchedulerException ex)
+                {
+                    throw new SchedulingException("Could not stop Quartz Scheduler", ex);
+                }
+            }
+        }
+
+        #region Nested type: AnonymousClassThread
+
+        private class AnonymousClassThread : QuartzThread
+        {
+            private readonly SchedulerFactoryObject schedulerFactoryObject;
+
+            public AnonymousClassThread(SchedulerFactoryObject enclosingInstance)
+            {
+                schedulerFactoryObject = enclosingInstance;
+            }
+
+            
+            public override void Run()
+            {
+                try
+                {
+                    Thread.Sleep(schedulerFactoryObject.startupDelay*1000);
+                }
+                catch (ThreadInterruptedException)
+                {
+                    // simply proceed
+                }
+                if (schedulerFactoryObject.logger.IsInfoEnabled)
+                {
+                    schedulerFactoryObject.logger.Info("Starting Quartz Scheduler now, after delay of " +
+                                                   schedulerFactoryObject.startupDelay +
+                                                   " seconds");
+                }
+                try
+                {
+                    schedulerFactoryObject.scheduler.Start();
+                }
+                catch (SchedulerException ex)
+                {
+                    throw new SchedulingException("Could not start Quartz Scheduler after delay", ex);
+                }
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SchedulingException.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SchedulingException.cs
new file mode 100644
index 00000000..a5a68a92
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SchedulingException.cs
@@ -0,0 +1,27 @@
+using System;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary>
+	/// Generic scheduling exception.
+	/// </summary>
+	public class SchedulingException : Exception
+	{
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SchedulingException"/> class.
+        /// </summary>
+        /// <param name="message">The message.</param>
+		public SchedulingException(string message) : base(message)
+		{
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SchedulingException"/> class.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        /// <param name="ex">The original exception.</param>
+		public SchedulingException(string message, Exception ex) : base(message, ex)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SimpleThreadPoolTaskExecutor.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SimpleThreadPoolTaskExecutor.cs
new file mode 100644
index 00000000..84e335de
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SimpleThreadPoolTaskExecutor.cs
@@ -0,0 +1,127 @@
+/*
+* 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.
+*/
+using System;
+using System.Threading;
+
+using Quartz;
+using Quartz.Simpl;
+using Spring.Objects.Factory;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary> 
+	/// Subclass of Quartz's SimpleThreadPool that implements Spring's
+	/// TaskExecutor interface and listens to Spring lifecycle callbacks.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <seealso cref="SimpleThreadPool" />
+	/// <seealso cref="ITaskExecutor" />
+	/// <seealso cref="SchedulerFactoryObject.TaskExecutor" />
+	public class SimpleThreadPoolTaskExecutor : SimpleThreadPool, ISchedulingTaskExecutor, IInitializingObject, IDisposable
+	{
+		private bool waitForJobsToCompleteOnShutdown = false;
+
+		/// <summary>
+		/// Set whether to wait for running jobs to complete on Shutdown.
+		/// Default is "false".
+		/// </summary>
+		/// <value>
+		/// 	<c>true</c> if [wait for jobs to complete on shutdown]; otherwise, <c>false</c>.
+		/// </value>
+		/// <seealso cref="SimpleThreadPool.Shutdown(bool)"/>
+		public virtual bool WaitForJobsToCompleteOnShutdown
+		{
+			set { waitForJobsToCompleteOnShutdown = value; }
+		}
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        /// <remarks>
+        /// 	<p>
+        /// This method allows the object instance to perform the kind of
+        /// initialization only possible when all of it's dependencies have
+        /// been injected (set), and to throw an appropriate exception in the
+        /// event of misconfiguration.
+        /// </p>
+        /// 	<p>
+        /// Please do consult the class level documentation for the
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+        /// description of exactly <i>when</i> this method is invoked. In
+        /// particular, it is worth noting that the
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and <see cref="Spring.Context.IApplicationContextAware"/>
+        /// callbacks will have been invoked <i>prior</i> to this method being
+        /// called.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as the failure to set a
+        /// required property) or if initialization fails.
+        /// </exception>
+		public virtual void AfterPropertiesSet()
+		{
+			Initialize();
+		}
+
+        /// <summary>
+        /// Executes the specified task.
+        /// </summary>
+        /// <param name="task">The task.</param>
+		public virtual void Execute(ThreadStart task)
+		{
+			if (task == null)
+			{
+				throw new ArgumentException("Runnable must not be null", "task");
+			}
+			if (!RunInThread(new ThreadRunnableDelegate(task)))
+			{
+				throw new SchedulingException("Quartz SimpleThreadPool already shut down");
+			}
+		}
+
+		/// <summary> This task executor prefers short-lived work units.</summary>
+		public virtual bool PrefersShortLivedTasks
+		{
+			get { return true; }
+		}
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+		public virtual void Dispose()
+		{
+			Shutdown(waitForJobsToCompleteOnShutdown);
+		}
+
+        internal class ThreadRunnableDelegate : IThreadRunnable
+        {
+            private ThreadStart ts;
+
+
+            public ThreadRunnableDelegate(ThreadStart ts)
+            {
+                this.ts = ts;
+            }
+
+            public void Run()
+            {
+                ts.Invoke();
+            }
+        }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SimpleTriggerObject.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SimpleTriggerObject.cs
new file mode 100644
index 00000000..b4bb4959
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SimpleTriggerObject.cs
@@ -0,0 +1,195 @@
+/*
+* Copyright 2002-2007 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.
+*/
+using System;
+using System.Collections;
+using Quartz;
+using Spring.Objects.Factory;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary> 
+	/// Convenience subclass of Quartz's <see cref="SimpleTrigger" />
+	/// class, making properties based usage easier.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// SimpleTrigger itself is already a PONO but lacks sensible defaults.
+	/// This class uses the Spring object name as job name, the Quartz default group
+	/// ("DEFAULT") as job group, the current time as start time, and indefinite
+	/// repetition, if not specified.
+	/// </p>
+	/// 
+	/// <p>
+	/// This class will also register the trigger with the job name and group of
+	/// a given <see cref="JobDetail" />. This allows <see cref="SchedulerFactoryObject" />
+	/// to automatically register a trigger for the corresponding JobDetail,
+	/// instead of registering the JobDetail separately.
+	/// </p>
+    /// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <seealso cref="Trigger.Name" />
+    /// <seealso cref="Trigger.Group" />
+    /// <seealso cref="Trigger.StartTimeUtc" />
+    /// <seealso cref="Trigger.JobName" />
+    /// <seealso cref="Trigger.JobGroup" />
+    /// <seealso cref="SimpleTriggerObject.JobDetail" />
+	/// <seealso cref="SchedulerFactoryObject.Triggers" />
+	/// <seealso cref="SchedulerFactoryObject.JobDetails" />
+	/// <seealso cref="CronTriggerObject" />
+	public class SimpleTriggerObject : SimpleTrigger, IJobDetailAwareTrigger, IObjectNameAware, IInitializingObject
+	{
+		private long startDelay = 0;
+		private JobDetail jobDetail;
+		private string objectName;
+        private readonly Constants constants = new Constants(typeof(MisfirePolicy.SimpleTrigger), typeof(MisfirePolicy));
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimpleTriggerObject"/> class.
+        /// </summary>
+        public SimpleTriggerObject()
+        {
+            RepeatCount = REPEAT_INDEFINITELY;
+        }
+
+		/// <summary> 
+		/// Register objects in the JobDataMap via a given Map.
+		/// <p>
+		/// These objects will be available to this Trigger only,
+		/// in contrast to objects in the JobDetail's data map.
+		/// </p>
+		/// </summary>
+		/// <seealso cref="JobDetailObject.JobDataAsMap" />
+		public virtual IDictionary JobDataAsMap
+		{
+			set { JobDataMap.PutAll(value); }
+		}
+
+		/// <summary> 
+		/// Set the misfire instruction via the name of the corresponding
+		/// constant in the SimpleTrigger class.
+        /// Default is <see cref="MisfirePolicy.SmartPolicy" />.
+		/// </summary>
+		/// <seealso cref="MisfirePolicy.SimpleTrigger.FireNow" />
+        /// <seealso cref="MisfirePolicy.SimpleTrigger.RescheduleNextWithExistingCount" />
+        /// <seealso cref="MisfirePolicy.SimpleTrigger.RescheduleNextWithRemainingCount" />
+        /// <seealso cref="MisfirePolicy.SimpleTrigger.RescheduleNowWithExistingRepeatCount" />
+        /// <seealso cref="MisfirePolicy.SimpleTrigger.RescheduleNowWithRemainingRepeatCount" />
+        /// <seealso cref="MisfirePolicy.SmartPolicy" />
+		public virtual string MisfireInstructionName
+		{
+			set 
+			{ 
+				MisfireInstruction = constants.AsNumber(value); 
+			}
+		}
+
+		/// <summary> 
+		/// Set the delay before starting the job for the first time.
+		/// The given number of milliseconds will be added to the current
+		/// time to calculate the start time. Default is 0.
+		/// </summary>
+		/// <remarks>
+		/// This delay will just be applied if no custom start time was
+		/// specified. However, in typical usage within a Spring context,
+		/// the start time will be the container startup time anyway.
+		/// Specifying a relative delay is appropriate in that case.
+		/// </remarks>
+		/// <seealso cref="Trigger.StartTimeUtc" />
+		public virtual long StartDelay
+		{
+			set { startDelay = value; }
+		}
+
+        /// <summary>
+        /// Set the name of the object in the object factory that created this object.
+        /// </summary>
+        /// <value>The name of the object in the factory.</value>
+        /// <remarks>
+        /// <p>
+        /// Invoked after population of normal object properties but before an init
+        /// callback like <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// method or a custom init-method.
+        /// </p>
+        /// </remarks>
+		public virtual string ObjectName
+		{
+			set { objectName = value; }
+		}
+        
+		/// <summary> 
+		/// Set the JobDetail that this trigger should be associated with.
+		/// <p>
+		/// This is typically used with a object reference if the JobDetail
+		/// is a Spring-managed object. Alternatively, the trigger can also
+		/// be associated with a job by name and group.
+		/// </p>
+		/// </summary>
+		public virtual JobDetail JobDetail
+		{
+			get { return jobDetail; }
+			set { jobDetail = value; }
+		}
+
+
+        /// <summary>
+        /// Invoked by an <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// after it has injected all of an object's dependencies.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method allows the object instance to perform the kind of
+        /// initialization only possible when all of it's dependencies have
+        /// been injected (set), and to throw an appropriate exception in the
+        /// event of misconfiguration.
+        /// </p>
+        /// <p>
+        /// Please do consult the class level documentation for the
+        /// <see cref="Spring.Objects.Factory.IObjectFactory"/> interface for a
+        /// description of exactly <i>when</i> this method is invoked. In
+        /// particular, it is worth noting that the
+        /// <see cref="Spring.Objects.Factory.IObjectFactoryAware"/>
+        /// and <see cref="Spring.Context.IApplicationContextAware"/>
+        /// callbacks will have been invoked <i>prior</i> to this method being
+        /// called.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as the failure to set a
+        /// required property) or if initialization fails.
+        /// </exception>
+		public virtual void AfterPropertiesSet()
+		{
+			if (Name == null)
+			{
+				Name = objectName;
+			}
+			if (Group == null)
+			{
+                Group = SchedulerConstants.DEFAULT_GROUP;
+			}
+			if (StartTimeUtc == DateTime.MinValue)
+			{
+				StartTimeUtc = DateTime.UtcNow.AddMilliseconds(startDelay);
+			}
+			if (jobDetail != null)
+			{
+				JobName = jobDetail.Name;
+				JobGroup = jobDetail.Group;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SpringObjectJobFactory.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SpringObjectJobFactory.cs
new file mode 100644
index 00000000..1b513b4f
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SpringObjectJobFactory.cs
@@ -0,0 +1,120 @@
+/*
+* 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.
+*/
+using Quartz;
+using Quartz.Spi;
+using Spring.Objects;
+
+namespace Spring.Scheduling.Quartz
+{
+	/// <summary> 
+	/// Subclass of AdaptableJobFactory that also supports Spring-style
+	/// dependency injection on object properties. This is essentially the direct
+	/// equivalent of Spring's QuartzJobObject in the shape of a
+	/// Quartz JobFactory.
+	/// </summary>
+	/// <remarks>
+	/// Applies scheduler context, job data map and trigger data map entries
+	/// as object property values. If no matching object property is found, the entry
+	/// is by default simply ignored. This is analogous to QuartzJobObject's behavior.
+	/// </remarks>
+	/// <author>Juergen Hoeller</author>
+	/// <seealso cref="SchedulerFactoryObject.JobFactory" />
+	/// <seealso cref="QuartzJobObject" />
+	public class SpringObjectJobFactory : AdaptableJobFactory, ISchedulerContextAware
+	{
+        private string[] ignoredUnknownProperties;
+        private SchedulerContext schedulerContext;
+
+		/// <summary> 
+		/// Specify the unknown properties (not found in the object) that should be ignored.
+		/// </summary>
+		/// <remarks>
+		/// Default is <code>null</code>, indicating that all unknown properties
+		/// should be ignored. Specify an empty array to throw an exception in case
+		/// of any unknown properties, or a list of property names that should be
+		/// ignored if there is no corresponding property found on the particular
+		/// job class (all other unknown properties will still trigger an exception).
+		/// </remarks>
+		public virtual string[] IgnoredUnknownProperties
+		{
+			set { ignoredUnknownProperties = value; }
+		}
+
+        /// <summary>
+        /// Set the SchedulerContext of the current Quartz Scheduler.
+        /// </summary>
+        /// <value></value>
+        /// <seealso cref="IScheduler.Context"/>
+		public virtual SchedulerContext SchedulerContext
+		{
+			set { schedulerContext = value; }
+		}
+
+
+		/// <summary> 
+		/// Create the job instance, populating it with property values taken
+		/// from the scheduler context, job data map and trigger data map.
+		/// </summary>
+		protected override object CreateJobInstance(TriggerFiredBundle bundle)
+		{
+			ObjectWrapper ow = new ObjectWrapper(bundle.JobDetail.JobType);
+			if (IsEligibleForPropertyPopulation(ow.WrappedInstance))
+			{
+				MutablePropertyValues pvs = new MutablePropertyValues();
+				if (schedulerContext != null)
+				{
+					pvs.AddAll(schedulerContext);
+				}
+				pvs.AddAll(bundle.JobDetail.JobDataMap);
+				pvs.AddAll(bundle.Trigger.JobDataMap);
+				if (ignoredUnknownProperties != null)
+				{
+					for (int i = 0; i < ignoredUnknownProperties.Length; i++)
+					{
+						string propName = ignoredUnknownProperties[i];
+						if (pvs.Contains(propName))
+						{
+							pvs.Remove(propName);
+						}
+					}
+					ow.SetPropertyValues(pvs);
+				}
+				else
+				{
+					ow.SetPropertyValues(pvs, true);
+				}
+			}
+			return ow.WrappedInstance;
+		}
+
+		/// <summary> 
+		/// Return whether the given job object is eligible for having
+		/// its object properties populated.
+		/// <p>
+		/// The default implementation ignores QuartzJobObject instances,
+		/// which will inject object properties themselves.
+		/// </p>
+		/// </summary>
+		/// <param name="jobObject">
+		/// The job object to introspect.
+		/// </param>
+		/// <seealso cref="QuartzJobObject" />
+		protected virtual bool IsEligibleForPropertyPopulation(object jobObject)
+		{
+			return (!(jobObject is QuartzJobObject));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/StatefulMethodInvokingJob.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/StatefulMethodInvokingJob.cs
new file mode 100644
index 00000000..64a08956
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/StatefulMethodInvokingJob.cs
@@ -0,0 +1,31 @@
+/*
+* 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.
+*/
+
+using Quartz;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary>
+    /// Extension of the MethodInvokingJob, implementing the StatefulJob interface.
+    /// Quartz checks whether or not jobs are stateful and if so,
+    /// won't let jobs interfere with each other.
+    /// </summary>
+    public class StatefulMethodInvokingJob : MethodInvokingJob, IStatefulJob
+    {
+        // No implementation, just an addition of the tag interface StatefulJob
+        // in order to allow stateful method invoking jobs.
+    }
+}
diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/TaskRejectedException.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/TaskRejectedException.cs
new file mode 100644
index 00000000..3cc03eec
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/TaskRejectedException.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Spring.Scheduling
+{
+	/// <summary>
+	/// Summary description for TaskRejectedException.
+	/// </summary>
+	public class TaskRejectedException : ApplicationException
+	{
+	}
+}
diff --git a/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2003.csproj b/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2003.csproj
new file mode 100644
index 00000000..cc9fe1c0
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2003.csproj
@@ -0,0 +1,205 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{0C0D8C65-90DE-4914-9940-4C684C54971B}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Scheduling.Quartz"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = "Spring.Scheduling.Quartz.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.NET.2003\Spring.Scheduling.Quartz\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.NET.2003\Spring.Scheduling.Quartz\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\lib\net\1.1\Spring.Core.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\net\1.1\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "Quartz"
+                    AssemblyName = "Quartz"
+                    HintPath = "..\..\..\lib\net\1.1\Quartz.dll"
+                />
+                <Reference
+                    Name = "Nullables"
+                    AssemblyName = "Nullables"
+                    HintPath = "..\..\..\lib\net\1.1\Nullables.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "Scheduling\Quartz\AdaptableJobFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\CronTriggerObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\DelegatingJob.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\IJobDetailAwareTrigger.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\ISchedulerContextAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\ISchedulingTaskExecutor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\ITaskExecutor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\JobDetailObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\LocalTaskExecutorThreadPool.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\MethodInvokingJob.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\MethodInvokingJobDetailFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\MethodInvokingRunnable.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\QuartzJobObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\ResourceJobSchedulingDataProcessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\SchedulerFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\SchedulingException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\SimpleThreadPoolTaskExecutor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\SimpleTriggerObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\SpringObjectJobFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\StatefulMethodInvokingJob.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\TaskRejectedException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2005.csproj b/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2005.csproj
new file mode 100644
index 00000000..615b42cc
--- /dev/null
+++ b/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2005.csproj
@@ -0,0 +1,79 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E823D54C-CE82-4868-929F-5F95A999F61E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Scheduling.Quartz</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2005\Spring.Scheduling.Quartz\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\build\VS.NET.2005\Spring.Scheduling.Quartz\Debug\Spring.Scheduling.Quartz.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2005\Spring.Scheduling.Quartz\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Quartz, Version=0.6.0.21049, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\Quartz.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Scheduling\Quartz\AdaptableJobFactory.cs" />
+    <Compile Include="Scheduling\Quartz\CronTriggerObject.cs" />
+    <Compile Include="Scheduling\Quartz\DelegatingJob.cs" />
+    <Compile Include="Scheduling\Quartz\IJobDetailAwareTrigger.cs" />
+    <Compile Include="Scheduling\Quartz\ISchedulerContextAware.cs" />
+    <Compile Include="Scheduling\Quartz\ISchedulingTaskExecutor.cs" />
+    <Compile Include="Scheduling\Quartz\ITaskExecutor.cs" />
+    <Compile Include="Scheduling\Quartz\JobDetailObject.cs" />
+    <Compile Include="Scheduling\Quartz\LocalTaskExecutorThreadPool.cs" />
+    <Compile Include="Scheduling\Quartz\MethodInvokingJob.cs" />
+    <Compile Include="Scheduling\Quartz\MethodInvokingJobDetailFactoryObject.cs" />
+    <Compile Include="Scheduling\Quartz\MethodInvokingRunnable.cs" />
+    <Compile Include="Scheduling\Quartz\QuartzJobObject.cs" />
+    <Compile Include="Scheduling\Quartz\ResourceJobSchedulingDataProcessor.cs" />
+    <Compile Include="Scheduling\Quartz\SchedulerFactoryObject.cs" />
+    <Compile Include="Scheduling\Quartz\SchedulingException.cs" />
+    <Compile Include="Scheduling\Quartz\SimpleThreadPoolTaskExecutor.cs" />
+    <Compile Include="Scheduling\Quartz\SimpleTriggerObject.cs" />
+    <Compile Include="Scheduling\Quartz\SpringObjectJobFactory.cs" />
+    <Compile Include="Scheduling\Quartz\StatefulMethodInvokingJob.cs" />
+    <Compile Include="Scheduling\Quartz\TaskRejectedException.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/App.config b/src/Spring/Spring.Services/App.config
new file mode 100644
index 00000000..f93d71ae
--- /dev/null
+++ b/src/Spring/Spring.Services/App.config
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--@ <code> @-->
+<configuration>
+
+	<configSections>
+		<section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
+		<sectionGroup name="spring">
+			<section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core" />
+			<section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core" />
+		</sectionGroup>
+	</configSections>
+	  
+	<spring>
+		<context type="Spring.Context.Support.XmlApplicationContext, Spring.Core">
+			<resource uri="file://~/service-process-definition.xml" />
+		</context>		
+	</spring>
+
+	<system.runtime.remoting>
+	<application>
+		<channels>
+		<channel ref="http" port="1234" />		
+		</channels>
+	</application>
+	</system.runtime.remoting>
+ 
+  <log4net>
+    <!-- see http://logging.apache.org/log4net/release/manual/introduction.html -->
+    <appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%d [%t] %-5p %c{1} - %m%n" />
+      </layout>
+      <file value="logs/Spring.Service.Process.log" />
+      <appendToFile value="true" />
+      <maximumFileSize value="500KB" />
+      <maxSizeRollBackups value="5" />
+    </appender>
+    <appender name="OutputDebugString" type="log4net.Appender.OutputDebugStringAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%d{HH:mm:ss,fff} %-5p %c{2}(line:%L) - %m%n" />
+      </layout>
+    </appender>
+    <root>
+      <level value="OFF" />
+    </root>
+	  <logger name="Spring.Services">
+		  <level value="ALL" />
+      <appender-ref ref="RollingFile" />
+      <appender-ref ref="OutputDebugString" />
+	  </logger>	  
+  </log4net>
+
+</configuration>
+<!--@ </code> @-->
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/AssemblyInfo.cs b/src/Spring/Spring.Services/AssemblyInfo.cs
new file mode 100644
index 00000000..a085cc31
--- /dev/null
+++ b/src/Spring/Spring.Services/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle("Spring.Net Portable Service Abstractions support")]
+[assembly: AssemblyDescription("Interfaces and classes that provide portable service abstractions in Spring.Net")]
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServices.keys b/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServices.keys
new file mode 100644
index 00000000..bad27a8c
Binary files /dev/null and b/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServices.keys differ
diff --git a/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServicesExporter.cs b/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServicesExporter.cs
new file mode 100644
index 00000000..db4b0c36
--- /dev/null
+++ b/src/Spring/Spring.Services/EnterpriseServices/EnterpriseServicesExporter.cs
@@ -0,0 +1,318 @@
+#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
+
+#if (!NET_1_0)
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.EnterpriseServices;
+using System.IO;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Objects.Factory;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.EnterpriseServices
+{
+    /// <summary>
+    /// Exports specified components as ServicedComponents.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This class will create ServicedComponent wrapper for each of the
+    /// specified components and register them with the Component Services.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: EnterpriseServicesExporter.cs,v 1.6 2007/05/16 10:03:24 oakinger Exp $</version>
+    public class EnterpriseServicesExporter : IInitializingObject, IObjectFactoryAware
+    {
+        #region Fields
+
+        private IObjectFactory objectFactory;
+
+        private IList components = new ArrayList();
+        private string applicationName;
+        private string applicationId;
+        private ActivationOption activationMode = ActivationOption.Library;
+        private string description;
+        private ApplicationAccessControlAttribute accessControl;
+        private ApplicationQueuingAttribute applicationQueuing;
+        private IList roles;
+
+        private string assemblyName;
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates new enterprise services exporter.
+        /// </summary>
+        public EnterpriseServicesExporter()
+        {
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets list of components to export.
+        /// </summary>
+        public IList Components
+        {
+            get { return components; }
+            set { components = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets COM+ application name.
+        /// </summary>
+        public string ApplicationName
+        {
+            get { return applicationName; }
+            set { applicationName = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets application identifier (GUID). Defaults to generated GUID if not specified.
+        /// </summary>
+        public string ApplicationId
+        {
+            get { return applicationId; }
+            set { applicationId = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets application activation mode, which can be either <b>Server</b> or <b>Library</b> (default).
+        /// </summary>
+        public ActivationOption ActivationMode
+        {
+            get { return activationMode; }
+            set { activationMode = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets application description.
+        /// </summary>
+        public string Description
+        {
+            get { return description; }
+            set { description = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets access control attribute.
+        /// </summary>
+        public ApplicationAccessControlAttribute AccessControl
+        {
+            get { return accessControl; }
+            set { accessControl = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets application queuing attribute.
+        /// </summary>
+        public ApplicationQueuingAttribute ApplicationQueuing
+        {
+            get { return applicationQueuing; }
+            set { applicationQueuing = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets application roles.
+        /// </summary>
+        public IList Roles
+        {
+            get { return roles; }
+            set { roles = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets name of the generated assembly that will contain serviced components.
+        /// </summary>
+        public string Assembly
+        {
+            get { return assemblyName; }
+            set { assemblyName = value; }
+        }
+
+        #endregion
+
+        #region IInitializingObject Members
+
+        /// <summary>
+        /// Called by Spring container after object is configured in order to initialize it.
+        /// </summary>
+        public void AfterPropertiesSet()
+        {
+            if (roles != null && roles.Count > 0)
+            {
+                RefreshRoles();
+            }
+            Export();
+        }
+
+        #endregion
+
+        #region IObjectFactoryAware Members
+
+        /// <summary>
+        /// Sets object factory instance.
+        /// </summary>
+        public IObjectFactory ObjectFactory
+        {
+            set { objectFactory = value; }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Creates ServicedComponent wrappers for the specified components and registers
+        /// them with COM+ Component Services.
+        /// </summary>
+        public virtual void Export()
+        {
+            AssemblyName an = new AssemblyName();
+            an.Name = assemblyName;
+            an.Version = new Version("1.0.0.0");
+            an.KeyPair = new StrongNameKeyPair(GetKeyPair());
+            AssemblyBuilder proxyAssembly = AppDomain.CurrentDomain.DefineDynamicAssembly(an, AssemblyBuilderAccess.RunAndSave);
+            ModuleBuilder module = proxyAssembly.DefineDynamicModule(assemblyName, assemblyName + ".dll", true);
+            ApplyAssemblyAttributes(proxyAssembly);
+
+            foreach (ServicedComponentExporter definition in components)
+            {
+                definition.CreateWrapperType(module, objectFactory);
+            }
+
+            proxyAssembly.Save(assemblyName + ".dll");
+
+            RegistrationConfig config = new RegistrationConfig();
+            config.Application = applicationName;
+            config.AssemblyFile = AppDomain.CurrentDomain.DynamicDirectory + assemblyName + ".dll";
+            config.InstallationFlags = InstallationFlags.FindOrCreateTargetApplication;
+
+            RegistrationHelper regHelper = new RegistrationHelper();
+            regHelper.InstallAssemblyFromConfig(ref config);
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        /// <summary>
+        /// Reads key pair from embedded resource.
+        /// </summary>
+        /// <returns>Key pair as a byte array.</returns>
+        private byte[] GetKeyPair()
+        {
+            using (Stream keys = GetType().Assembly.GetManifestResourceStream("Spring.EnterpriseServices.EnterpriseServices.keys"))
+            {
+                byte[] bytes = new byte[keys.Length];
+                keys.Read(bytes, 0, (int) keys.Length);
+                return bytes;
+            }
+        }
+
+        /// <summary>
+        /// Applies custom attributes to generated assembly.
+        /// </summary>
+        /// <param name="assembly">Dynamic assembly to apply attributes to.</param>
+        private void ApplyAssemblyAttributes(AssemblyBuilder assembly)
+        {
+            assembly.SetCustomAttribute(ReflectionUtils.CreateCustomAttribute(typeof(ApplicationNameAttribute), applicationName));
+            assembly.SetCustomAttribute(ReflectionUtils.CreateCustomAttribute(typeof(ApplicationActivationAttribute), activationMode));
+            if (applicationId != null)
+            {
+                assembly.SetCustomAttribute(ReflectionUtils.CreateCustomAttribute(typeof(ApplicationIDAttribute), applicationId));
+            }
+            if (description != null)
+            {
+                assembly.SetCustomAttribute(ReflectionUtils.CreateCustomAttribute(typeof(DescriptionAttribute), description));
+                assembly.SetCustomAttribute(ReflectionUtils.CreateCustomAttribute(typeof(AssemblyDescriptionAttribute), description));
+            }
+            if (accessControl != null)
+            {
+                assembly.SetCustomAttribute(ReflectionUtils.CreateCustomAttribute(accessControl));
+            }
+            if (applicationQueuing != null)
+            {
+                assembly.SetCustomAttribute(ReflectionUtils.CreateCustomAttribute(applicationQueuing));
+            }
+            if (roles != null)
+            {
+                foreach (SecurityRoleAttribute role in roles)
+                {
+                    assembly.SetCustomAttribute(ReflectionUtils.CreateCustomAttribute(typeof(SecurityRoleAttribute),
+                                                                                      new object[] {role.Role}, role));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Replaces roles expressed using string with appropriate SecurityRoleAttribute instance.
+        /// </summary>
+        private void RefreshRoles()
+        {
+            for (int i = 0; i < roles.Count; i++)
+            {
+                object role = roles[i];
+                if (role is string)
+                {
+                    roles[i] = ParseRole((string) role);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Parses string representation of SecurityRoleAttribute.
+        /// </summary>
+        /// <param name="roleString">Role definition string.</param>
+        /// <returns>Configured SecurityRoleAttribute instance.</returns>
+        private SecurityRoleAttribute ParseRole(string roleString)
+        {
+            string[] parts = roleString.Split(':');
+            SecurityRoleAttribute role = new SecurityRoleAttribute(parts[0].Trim());
+            if (parts.Length > 1)
+            {
+                role.Description = parts[1].Trim();
+            }
+            if (parts.Length > 2)
+            {
+                role.SetEveryoneAccess = bool.Parse(parts[2].Trim());
+            }
+
+            return role;
+        }
+
+        #endregion
+    }
+}
+
+#endif // (!NET_1_0)
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentExporter.cs b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentExporter.cs
new file mode 100644
index 00000000..cce34421
--- /dev/null
+++ b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentExporter.cs
@@ -0,0 +1,225 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#if (!NET_1_0)
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.EnterpriseServices;
+using System.Reflection.Emit;
+
+using Spring.Core.TypeResolution;
+using Spring.Objects.Factory;
+using Spring.Proxy;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.EnterpriseServices
+{
+    /// <summary>
+    /// Encapsulates information necessary to create ServicedComponent
+    /// wrapper around target class.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Instances of this class should be used as elements in the Components
+    /// list of the <see cref="EnterpriseServicesExporter"/> class, which will
+    /// register them with COM+ Services.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ServicedComponentExporter.cs,v 1.9 2007/07/31 18:18:19 bbaia Exp $</version>
+    public class ServicedComponentExporter : IInitializingObject, IObjectNameAware
+    {
+        #region Fields
+
+        private string _objectName;
+        private string _targetName;
+        private string[] _interfaces;
+        private IList _typeAttributes = new ArrayList();
+        private IDictionary _memberAttributes = new Hashtable();
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="ServicedComponentExporter"/> class.
+        /// </summary>
+        public ServicedComponentExporter()
+        {}
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets name of the target object that should be exposed as a serviced component.
+        /// </summary>
+        public string TargetName
+        {
+            get { return _targetName; }
+            set { _targetName = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the list of interfaces whose methods should be exported.
+        /// </summary>
+        /// <remarks>
+        /// The default value of this property is all the interfaces
+        /// implemented or inherited by the target type.
+        /// </remarks>
+        /// <value>The interfaces to export.</value>
+        public string[] Interfaces
+        {
+            get { return _interfaces; }
+            set { _interfaces = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a list of custom attributes
+        /// that should be applied to a proxy class.
+        /// </summary>
+        public IList TypeAttributes
+        {
+            get { return _typeAttributes; }
+            set { _typeAttributes = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a dictionary of custom attributes
+        /// that should be applied to proxy members.
+        /// </summary>
+        /// <remarks>
+        /// Map key is an expression that members can be matched against. Value is a list
+        /// of attributes that should be applied to each member that matches expression.
+        /// </remarks>
+        public IDictionary MemberAttributes
+        {
+            get { return _memberAttributes; }
+            set { _memberAttributes = value; }
+        }
+
+        #endregion
+
+        #region IInitializingObject Members
+
+        /// <summary>
+        /// Validate configuration.
+        /// </summary>
+        public void AfterPropertiesSet()
+        {
+            ValidateConfiguration();
+        }
+
+        #endregion
+
+        #region IObjectNameAware Members
+
+        /// <summary>
+        /// Set the name of the object in the object factory
+        /// that created this object.
+        /// </summary>
+        public string ObjectName
+        {
+            set { _objectName = value; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        private void ValidateConfiguration()
+        {
+            if (TargetName == null)
+            {
+                throw new ArgumentException("The TargetName property is required.");
+            }
+        }
+
+        /// <summary>
+        /// Creates ServicedComponent wrapper around target class.
+        /// </summary>
+        /// <param name="module">Dynamic module builder to use</param>
+        /// <param name="objectFactory">Object factory to get target from.</param>
+        internal Type CreateWrapperType(ModuleBuilder module, IObjectFactory objectFactory)
+        {
+            // create wrapper using appropriate proxy builder
+            IProxyTypeBuilder proxyBuilder = new ServicedComponentProxyTypeBuilder(module);
+            proxyBuilder.Name = _objectName;
+            proxyBuilder.TargetType = objectFactory.GetType(TargetName);
+            if (_interfaces != null && _interfaces.Length > 0)
+            {
+                proxyBuilder.Interfaces = TypeResolutionUtils.ResolveInterfaceArray(_interfaces);
+            }
+            proxyBuilder.TypeAttributes = TypeAttributes;
+            proxyBuilder.MemberAttributes = MemberAttributes;
+
+            Type componentType = proxyBuilder.BuildProxyType();
+
+            // create and register client-side proxy factory for component
+
+            return componentType;
+        }
+
+        #endregion
+
+        #region ServicedComponentProxyTypeBuilder inner class definition
+
+        private sealed class ServicedComponentProxyTypeBuilder : CompositionProxyTypeBuilder
+        {
+            #region Fields
+
+            private ModuleBuilder module;
+
+            #endregion
+
+            #region Constructor(s) / Destructor
+
+            public ServicedComponentProxyTypeBuilder(ModuleBuilder module)
+            {
+                this.module = module;
+
+                BaseType = typeof(ServicedComponent);
+            }
+
+            #endregion
+
+            #region Protected Methods
+
+            protected override TypeBuilder CreateTypeBuilder(string name, Type baseType)
+            {
+                return module.DefineType(name,
+                    System.Reflection.TypeAttributes.BeforeFieldInit | System.Reflection.TypeAttributes.Public,
+                    baseType);
+            }
+
+            #endregion
+        }
+
+        #endregion
+    }
+}
+
+#endif // (!NET_1_0)
diff --git a/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentFactory.cs b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentFactory.cs
new file mode 100644
index 00000000..aa476b19
--- /dev/null
+++ b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentFactory.cs
@@ -0,0 +1,183 @@
+#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
+
+#if (!NET_1_0)
+
+#region Imports
+
+using System;
+
+using Spring.Util;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.EnterpriseServices
+{
+    /// <summary>
+    /// Factory Object that instantiates and configures ServicedComponent.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This factory object should be used to instantiate and configure
+    /// serviced components created by <see cref="ServicedComponentExporter"/>.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ServicedComponentFactory.cs,v 1.7 2007/05/16 10:03:25 oakinger Exp $</version>
+    public class ServicedComponentFactory : IConfigurableFactoryObject, IInitializingObject
+    {
+        #region Fields
+
+        private string name;
+        private string server;
+
+        private bool isSingleton;
+        private IObjectDefinition productTemplate;
+
+        private Type componentType;
+        private object singletonInstance;
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates new instance of serviced component factory.
+        /// </summary>
+        public ServicedComponentFactory()
+        {
+            this.isSingleton = false;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets component name, as registered with COM+ Services.
+        /// </summary>
+        public string Name
+        {
+            get { return name; }
+            set { name = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets name of the remote server that COM+ component is registered with.
+        /// </summary>
+        public string Server
+        {
+            get { return server; }
+            set { server = value; }
+        }
+
+        #endregion
+
+        #region IConfigurableFactoryObject Members
+
+        /// <summary>
+        /// Returns configured instance of the serviced component.
+        /// </summary>
+        /// <returns>Configured instance of the serviced component.</returns>
+        public object GetObject()
+        {
+            if (IsSingleton)
+            {
+                if (singletonInstance == null)
+                {
+                    singletonInstance = CreateInstance();
+                }
+                return singletonInstance;
+            }
+            else
+            {
+                return CreateInstance();
+            }
+        }
+
+        /// <summary>
+        /// Returns type of serviced component.
+        /// </summary>
+        public Type ObjectType
+        {
+            get { return componentType; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether serviced component should be treated as singleton. Default is <b>false</b>.
+        /// </summary>
+        public bool IsSingleton
+        {
+            get { return isSingleton; }
+            set { isSingleton = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the template object definition
+        /// that should be used to configure proxy instance.
+        /// </summary>
+        public IObjectDefinition ProductTemplate
+        {
+            get { return productTemplate; }
+            set { productTemplate = value; }
+        }
+
+        #endregion
+
+        #region IInitializingObject Members
+
+        /// <summary>
+        /// Initializes factory object.
+        /// </summary>
+        public void AfterPropertiesSet()
+        {
+            ValidateConfiguration();
+            componentType = Type.GetTypeFromProgID(Name, Server);
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        private void ValidateConfiguration()
+        {
+            if (Name == null)
+            {
+                throw new ArgumentException("The Name property is required.");
+            }
+        }
+
+        /// <summary>
+        /// Creates new instance of serviced component.
+        /// </summary>
+        /// <returns>New instance of serviced component.</returns>
+        private object CreateInstance()
+        {
+            return Activator.CreateInstance(componentType);
+        }
+
+        #endregion
+    }
+}
+
+#endif // (!NET_1_0)
diff --git a/src/Spring/Spring.Services/Remoting/CaoExporter.cs b/src/Spring/Spring.Services/Remoting/CaoExporter.cs
new file mode 100644
index 00000000..8852124b
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/CaoExporter.cs
@@ -0,0 +1,294 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Remoting;
+
+using Spring.Context;
+using Spring.Core;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Support;
+using Spring.Remoting.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Remoting
+{
+	/// <summary>
+	/// Registers an object type on the server
+	/// as a Client Activated Object (CAO).
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+	/// <author>Mark Pollack</author>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: CaoExporter.cs,v 1.12 2007/11/07 19:03:09 bbaia Exp $</version>
+	public class CaoExporter : ConfigurableLifetime, IApplicationContextAware, IObjectFactoryAware, IInitializingObject, IDisposable
+	{
+		#region Logging
+
+		private static readonly Common.Logging.ILog LOG = Common.Logging.LogManager.GetLogger(typeof(CaoExporter));
+
+		#endregion
+
+		#region Fields
+
+		private string targetName;
+        private string[] interfaces;
+
+		private IApplicationContext applicationContext;
+		private AbstractObjectFactory objectFactory;
+
+		private CaoRemoteFactory remoteFactory;
+
+		#endregion
+
+		#region Constructor(s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="CaoExporter"/> class.
+		/// </summary>
+		public CaoExporter()
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets or sets the name of the target object definition.
+		/// </summary>
+		public string TargetName
+		{
+			get { return targetName; }
+			set { targetName = value; }
+		}
+
+        /// <summary>
+        /// Gets or sets the list of interfaces whose methods should be exported.
+        /// </summary>
+        /// <remarks>
+        /// The default value of this property is all the interfaces 
+        /// implemented or inherited by the target type.
+        /// </remarks>
+        /// <value>The interfaces to export.</value>
+        public string[] Interfaces
+        {
+            get { return interfaces; }
+            set { interfaces = value; }
+        }
+
+		#endregion
+
+		#region IApplicationContextAware Members
+
+		/// <summary>
+		/// Gets or sets the <see cref="Spring.Context.IApplicationContext"/> that this
+		/// object runs in.
+		/// </summary>
+		public IApplicationContext ApplicationContext
+		{
+			get { return applicationContext; }
+			set { applicationContext = value; }
+		}
+
+		#endregion
+
+		#region IObjectFactoryAware Members
+
+		/// <summary>
+		/// Sets object factory to use.
+		/// </summary>
+		public IObjectFactory ObjectFactory
+		{
+			set { objectFactory = (AbstractObjectFactory) value; }
+		}
+
+		#endregion
+
+		#region IInitializingObject Members
+
+		/// <summary>
+		/// Publish the object 
+		/// </summary>
+		public void AfterPropertiesSet()
+		{
+			ValidateConfiguration();
+			Export();
+		}
+
+		#endregion
+
+		#region IDisposable Members
+
+		/// <summary>
+		/// Disconnect the remote object from the registered remoting channels.
+		/// </summary>
+		public void Dispose()
+		{
+			RemotingServices.Disconnect(remoteFactory);
+		}
+
+		#endregion
+
+		#region Private Methods
+
+		private void ValidateConfiguration()
+		{
+			if (TargetName == null)
+			{
+				throw new ArgumentException("The TargetName property is required.");
+			}
+		}
+
+		private void Export()
+		{
+			remoteFactory = new CaoRemoteFactory(this, targetName, interfaces, objectFactory);
+
+			RemotingServices.Marshal(remoteFactory, targetName);
+
+			#region Instrumentation
+
+			if (LOG.IsDebugEnabled)
+			{
+				LOG.Debug(String.Format("Target '{0}' registered.", targetName));
+			}
+
+			#endregion
+		}
+
+		#endregion
+
+        #region BaseCao inner class definition
+
+        /// <summary>
+        /// This class extends <see cref="Spring.Remoting.Support.BaseRemoteObject"/> to allow CAOs
+        /// to be disconnect from the client.
+        /// </summary>
+        public abstract class BaseCao : BaseRemoteObject, IDisposable
+        {
+            #region IDisposable Members
+
+            void IDisposable.Dispose()
+            {
+                RemotingServices.Disconnect(this);
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #region CaoRemoteFactory inner class definition
+
+        private sealed class CaoRemoteFactory : MarshalByRefObject, ICaoRemoteFactory
+		{
+			#region Fields
+
+			private AbstractObjectFactory objectFactory;
+			private string targetName;
+            private RemoteObjectFactory remoteObjectFactory;
+
+			#endregion
+
+			#region Constructor(s) / Destructor
+
+			/// <summary>
+			/// Create a new instance of the RemoteFactory.
+			/// </summary>
+            public CaoRemoteFactory(ILifetime lifetime, string targetName, 
+                string[] interfaces, AbstractObjectFactory objectFactory)
+			{
+				this.targetName = targetName;
+				this.objectFactory = objectFactory;
+
+                this.remoteObjectFactory = new RemoteObjectFactory();
+                this.remoteObjectFactory.BaseType = typeof(BaseCao);
+                this.remoteObjectFactory.Interfaces = interfaces;
+                this.remoteObjectFactory.Infinite = lifetime.Infinite;
+                this.remoteObjectFactory.InitialLeaseTime = lifetime.InitialLeaseTime;
+                this.remoteObjectFactory.RenewOnCallTime = lifetime.RenewOnCallTime;
+                this.remoteObjectFactory.SponsorshipTimeout = lifetime.SponsorshipTimeout;
+			}
+
+			#endregion
+
+			#region Membres de ICaoRemoteFactory
+
+			/// <summary>
+			/// Returns the CAO proxy.
+			/// </summary>
+			/// <returns>The remote object.</returns>
+			public object GetObject()
+			{
+				remoteObjectFactory.Target = objectFactory.GetObject(targetName);
+                
+                return remoteObjectFactory.GetObject();
+			}
+
+			/// <summary>
+			/// Returns the CAO proxy using the
+			/// argument list to call the constructor. 
+			/// </summary>
+			/// <remarks>
+			/// The matching of arguments to call the constructor is done
+			/// by type. The alternative ways, by index and by constructor
+			/// name are not supported.
+			/// </remarks>
+			/// <param name="constructorArguments">Constructor 
+			/// arguments used to create the object.</param>
+			/// <returns>The remote object.</returns>
+			public object GetObject(object[] constructorArguments)
+			{
+				RootObjectDefinition mergedObjectDefinition = objectFactory.GetMergedObjectDefinition(targetName, false);
+
+				if (typeof(IFactoryObject).IsAssignableFrom(mergedObjectDefinition.ObjectType))
+				{
+					throw new NotSupportedException(
+                        "Client activated objects with constructor arguments is not supported with IFactoryObject implementations.");
+				}
+
+                remoteObjectFactory.Target = objectFactory.GetObject(targetName, constructorArguments);
+
+                return remoteObjectFactory.GetObject();
+			}
+
+			#endregion
+
+            #region Overrided Methods
+
+            /// <summary>
+            /// Set infinite lifetime.
+            /// </summary>
+            public override object InitializeLifetimeService()
+            {
+                return null;
+            }
+
+            #endregion
+        }
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Remoting/CaoFactoryObject.cs b/src/Spring/Spring.Services/Remoting/CaoFactoryObject.cs
new file mode 100644
index 00000000..37f9bb86
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/CaoFactoryObject.cs
@@ -0,0 +1,151 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+
+using Spring.Objects.Factory;
+using Spring.Remoting.Support;
+
+#endregion
+
+namespace Spring.Remoting
+{
+    /// <summary>
+    /// Factory for creating a reference to a 
+    /// client activated object (CAO).
+    /// </summary>
+	/// <author>Aleksandar Seovic</author>
+	/// <author>Mark Pollack</author>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: CaoFactoryObject.cs,v 1.4 2006/09/13 20:20:14 bbaia Exp $</version>
+    public class CaoFactoryObject : IFactoryObject, IInitializingObject
+    {
+		#region Fields
+
+        private string remoteTargetName;
+        private string serviceUrl;
+		private object[] constructorArguments;
+
+		#endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The remote target name to activate.
+        /// </summary>
+        public string RemoteTargetName
+        {
+            get { return remoteTargetName; }
+            set { remoteTargetName = value; }
+        }
+
+        /// <summary>
+        /// The Uri of the remote type.
+        /// </summary>
+        public string ServiceUrl
+        {
+            get { return serviceUrl; }
+            set { serviceUrl = value; }
+        }
+
+		/// <summary>
+		/// Argument list used to call the CAO constructor.
+		/// </summary>
+		public object[] ConstructorArguments
+		{
+			get { return constructorArguments; }
+			set { constructorArguments = value; }
+		}
+
+        #endregion
+
+		#region Constructor(s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="CaoFactoryObject"/> class.
+		/// </summary>
+		public CaoFactoryObject()
+		{
+		}
+
+		#endregion
+
+		#region IInitializingObject Members
+
+        /// <summary>
+        /// Callback method called once all factory properties have been set.
+        /// </summary>
+        /// <exception cref="System.Exception">if an error occured</exception>
+        public void AfterPropertiesSet()
+        {
+			if (RemoteTargetName == null)
+			{
+				throw new ArgumentException("The RemoteTargetName property is required.");
+			}
+
+            if (ServiceUrl == null)
+            {
+                throw new ArgumentException("The ServiceUrl property is required.");
+            }
+        }
+
+		#endregion
+
+		#region IFactoryObject Members
+
+		/// <summary>
+		/// Always return false.
+		/// </summary>
+		public bool IsSingleton
+		{
+			get { return false; }
+		}
+
+		/// <summary>
+		/// The type of object to be created.
+		/// </summary>
+		public Type ObjectType
+		{
+			get { return typeof(MarshalByRefObject); }
+		}
+
+		/// <summary>
+		/// Return the CAO proxy.
+		/// </summary>
+		/// <returns>the CAO proxy</returns>
+		public object GetObject()
+		{
+			ICaoRemoteFactory remoteFactory = (ICaoRemoteFactory) Activator.GetObject(typeof(ICaoRemoteFactory), serviceUrl.TrimEnd('/') + '/' + remoteTargetName);
+			
+			if (constructorArguments != null)
+			{
+				return remoteFactory.GetObject(constructorArguments);
+			}
+			else
+			{
+				return remoteFactory.GetObject();
+			}
+		}
+
+		#endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Remoting/Config/RemotingNamespaceParser.cs b/src/Spring/Spring.Services/Remoting/Config/RemotingNamespaceParser.cs
new file mode 100644
index 00000000..89e6f129
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/Config/RemotingNamespaceParser.cs
@@ -0,0 +1,491 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System.Xml;
+
+using Spring.Context.Support;
+using Spring.Core.TypeResolution;
+using Spring.Objects;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Xml;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Remoting.Config
+{
+    /// <summary>
+    /// Implementation of the custom configuration parser for remoting definitions.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: RemotingNamespaceParser.cs,v 1.3 2007/10/08 14:57:34 bbaia Exp $</version>
+    [
+        NamespaceParser(
+            Namespace = "http://www.springframework.net/remoting",
+            SchemaLocationAssemblyHint = typeof(RemotingNamespaceParser),
+            SchemaLocation = "/Spring.Remoting.Config/spring-remoting-1.1.xsd")
+    ]
+    public sealed class RemotingNamespaceParser  : ObjectsNamespaceParser
+    {
+        private const string RemotingTypePrefix = "remoting: ";
+
+        static RemotingNamespaceParser()
+        {
+            TypeRegistry.RegisterType(
+                RemotingTypePrefix + RemotingConfigurerConstants.RemotingConfigurerElement,
+                typeof(RemotingConfigurer));
+            TypeRegistry.RegisterType(
+                RemotingTypePrefix + SaoFactoryObjectConstants.SaoFactoryObjectElement,
+                typeof(SaoFactoryObject));
+            TypeRegistry.RegisterType(
+                RemotingTypePrefix + CaoFactoryObjectConstants.CaoFactoryObjectElement,
+                typeof(CaoFactoryObject));
+            TypeRegistry.RegisterType(
+                RemotingTypePrefix + RemoteObjectFactoryConstants.RemoteObjectFactoryElement, 
+                typeof(RemoteObjectFactory));
+            TypeRegistry.RegisterType(
+                RemotingTypePrefix + SaoExporterConstants.SaoExporterElement, 
+                typeof(SaoExporter));
+            TypeRegistry.RegisterType(
+                RemotingTypePrefix + CaoExporterConstants.CaoExporterElement, 
+                typeof(CaoExporter));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemotingNamespaceParser"/> class.
+        /// </summary>
+        public RemotingNamespaceParser()
+        {}
+
+
+        /// <summary>
+        /// Parse the specified element and register any resulting
+        /// IObjectDefinitions with the IObjectDefinitionRegistry that is
+        /// embedded in the supplied ParserContext.
+        /// </summary>
+        /// <param name="element">The element to be parsed into one or more IObjectDefinitions</param>
+        /// <param name="parserContext">The object encapsulating the current state of the parsing
+        /// process.</param>
+        /// <returns>
+        /// The primary IObjectDefinition (can be null as explained above)
+        /// </returns>
+        /// <remarks>
+        /// Implementations should return the primary IObjectDefinition
+        /// that results from the parse phase if they wish to used nested
+        /// inside (for example) a <code>&lt;property&gt;</code> tag.
+        /// <para>Implementations may return null if they will not
+        /// be used in a nested scenario.
+        /// </para>
+        /// </remarks>
+        public override IObjectDefinition ParseElement(XmlElement element, ParserContext parserContext)
+        {
+            string name = element.GetAttribute(ObjectDefinitionConstants.IdAttribute);
+            IConfigurableObjectDefinition remotingDefinition = ParseRemotingDefinition(element, name, parserContext);
+            if (!StringUtils.HasText(name))
+            {
+                name = ObjectDefinitionReaderUtils.GenerateObjectName(remotingDefinition, parserContext.Registry);
+            }
+            parserContext.Registry.RegisterObjectDefinition(name, remotingDefinition);
+
+            return null;
+        }
+
+
+
+        /// <summary>
+        /// Parses remoting definitions.
+        /// </summary>
+        /// <param name="element">Validator XML element.</param>
+        /// <param name="name">The name of the object definition.</param>
+        /// <param name="parserContext">The parser context.</param>
+        /// <returns>A remoting object definition.</returns>
+        private IConfigurableObjectDefinition ParseRemotingDefinition(
+            XmlElement element, string name, ParserContext parserContext)
+        {
+            switch (element.LocalName)
+            {
+                case RemotingConfigurerConstants.RemotingConfigurerElement:
+                    return ParseRemotingConfigurer(element, name, parserContext);
+                case SaoFactoryObjectConstants.SaoFactoryObjectElement:
+                    return ParseSaoFactoryObject(element, name, parserContext);
+                case CaoFactoryObjectConstants.CaoFactoryObjectElement:
+                    return ParseCaoFactoryObject(element, name, parserContext);
+                case RemoteObjectFactoryConstants.RemoteObjectFactoryElement:
+                    return ParseRemoteObjectFactory(element, name, parserContext);
+                case SaoExporterConstants.SaoExporterElement:
+                    return ParseSaoExporter(element, name, parserContext);
+                case CaoExporterConstants.CaoExporterElement:
+                    return ParseCaoExporter(element, name, parserContext);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Parses the RemotingConfigurer definition.
+        /// </summary>
+        /// <param name="element">The element to parse.</param>
+        /// <param name="name">The name of the object definition.</param>
+        /// <param name="parserContext">The parser context.</param>
+        /// <returns>RemotingConfigurer object definition.</returns>
+        private IConfigurableObjectDefinition ParseRemotingConfigurer(
+            XmlElement element, string name, ParserContext parserContext)
+        {
+            string typeName = GetTypeName(element);
+            string filename = element.GetAttribute(RemotingConfigurerConstants.FilenameAttribute);
+            string useConfigFile = element.GetAttribute(RemotingConfigurerConstants.UseConfigFileAttribute);
+            string ensureSecurity = element.GetAttribute(RemotingConfigurerConstants.EnsureSecurityAttribute);
+
+            MutablePropertyValues properties = new MutablePropertyValues();
+            if (StringUtils.HasText(filename))
+            {
+                properties.Add("Filename", filename);
+            }
+            if (StringUtils.HasText(useConfigFile))
+            {
+                properties.Add("UseConfigFile", useConfigFile);
+            }
+            if (StringUtils.HasText(ensureSecurity))
+            {
+                properties.Add("EnsureSecurity", ensureSecurity);
+            }
+
+            IConfigurableObjectDefinition cod = parserContext.ReaderContext.ObjectDefinitionFactory.CreateObjectDefinition(
+                typeName, null, parserContext.ReaderContext.Reader.Domain);
+            cod.PropertyValues = properties;
+            return cod;
+        }
+
+        /// <summary>
+        /// Parses the SaoFactoryObject definition.
+        /// </summary>
+        /// <param name="element">The element to parse.</param>
+        /// <param name="name">The name of the object definition.</param>
+        /// <param name="parserContext">The parser context.</param>
+        /// <returns>SaoFactoryObject object definition.</returns>
+        private IConfigurableObjectDefinition ParseSaoFactoryObject(
+            XmlElement element, string name, ParserContext parserContext)
+        {
+            string typeName = GetTypeName(element);
+            string serviceInterface = element.GetAttribute(SaoFactoryObjectConstants.ServiceInterfaceAttribute);
+            string serviceUrl = element.GetAttribute(SaoFactoryObjectConstants.ServiceUrlAttribute);
+
+            MutablePropertyValues properties = new MutablePropertyValues();
+            if (StringUtils.HasText(serviceInterface))
+            {
+                properties.Add("ServiceInterface", serviceInterface);
+            }
+            if (StringUtils.HasText(serviceUrl))
+            {
+                properties.Add("ServiceUrl", serviceUrl);
+            }
+            IConfigurableObjectDefinition cod = parserContext.ReaderContext.ObjectDefinitionFactory.CreateObjectDefinition(
+                typeName, null, parserContext.ReaderContext.Reader.Domain);
+            cod.PropertyValues = properties;
+            return cod;
+        }
+
+        /// <summary>
+        /// Parses the CaoFactoryObject definition.
+        /// </summary>
+        /// <param name="element">The element to parse.</param>
+        /// <param name="name">The name of the object definition.</param>
+        /// <param name="parserContext">The parser context.</param>
+        /// <returns>CaoFactoryObject object definition.</returns>
+        private IConfigurableObjectDefinition ParseCaoFactoryObject(
+            XmlElement element, string name, ParserContext parserContext)
+        {
+            string typeName = GetTypeName(element);
+            string remoteTargetName = element.GetAttribute(CaoFactoryObjectConstants.RemoteTargetNameAttribute);
+            string serviceUrl = element.GetAttribute(CaoFactoryObjectConstants.ServiceUrlAttribute);
+
+            MutablePropertyValues properties = new MutablePropertyValues();
+            if (StringUtils.HasText(remoteTargetName))
+            {
+                properties.Add("RemoteTargetName", remoteTargetName);
+            }
+            if (StringUtils.HasText(serviceUrl))
+            {
+                properties.Add("ServiceUrl", serviceUrl);
+            }
+
+            foreach (XmlElement child in element.ChildNodes)
+            {
+                switch (child.LocalName)
+                {
+                    case CaoFactoryObjectConstants.ConstructorArgumentsElement:
+                        properties.Add("ConstructorArguments", base.GetList(child, name, parserContext.ParserHelper));
+                        break;
+                }
+            }
+
+            IConfigurableObjectDefinition cod = parserContext.ReaderContext.ObjectDefinitionFactory.CreateObjectDefinition(
+                typeName, null, parserContext.ReaderContext.Reader.Domain);
+            cod.PropertyValues = properties;
+
+            return cod;
+        }
+
+        /// <summary>
+        /// Parses the RemoteObjectFactory definition.
+        /// </summary>
+        /// <param name="element">The element to parse.</param>
+        /// <param name="name">The name of the object definition.</param>
+        /// <param name="parserContext">The parser context.</param>
+        /// <returns>RemoteObjectFactory object definition.</returns>
+        private IConfigurableObjectDefinition ParseRemoteObjectFactory(
+            XmlElement element, string name, ParserContext parserContext)
+        {
+            string typeName = GetTypeName(element);
+            string targetName = element.GetAttribute(RemoteObjectFactoryConstants.TargetNameAttribute);
+            string infinite = element.GetAttribute(RemoteObjectFactoryConstants.InfiniteAttribute);
+
+            MutablePropertyValues properties = new MutablePropertyValues();
+            if (StringUtils.HasText(targetName))
+            {
+                properties.Add("Target", targetName);
+            }
+            if (StringUtils.HasText(infinite))
+            {
+                properties.Add("Infinite", infinite);
+            }
+
+            foreach (XmlElement child in element.ChildNodes)
+            {
+                switch (child.LocalName)
+                {
+                    case LifeTimeConstants.LifeTimeElement:
+                        ParseLifeTime(properties, child, parserContext);
+                        break;
+                    case InterfacesConstants.InterfacesElement:
+                        properties.Add("Interfaces", base.GetList(child, name, parserContext.ParserHelper));
+                        break;
+                }
+            }
+
+            IConfigurableObjectDefinition cod = parserContext.ReaderContext.ObjectDefinitionFactory.CreateObjectDefinition(
+                typeName, null, parserContext.ReaderContext.Reader.Domain);
+            cod.PropertyValues = properties;
+
+            return cod;
+        }
+
+        /// <summary>
+        /// Parses the SaoExporter definition.
+        /// </summary>
+        /// <param name="element">The element to parse.</param>
+        /// <param name="name">The name of the object definition.</param>
+        /// <param name="parserContext">The parser context.</param>
+        /// <returns>SaoExporter object definition.</returns>
+        private IConfigurableObjectDefinition ParseSaoExporter(
+            XmlElement element, string name, ParserContext parserContext)
+        {
+            string typeName = GetTypeName(element);
+            string targetName = element.GetAttribute(SaoExporterConstants.TargetNameAttribute);
+            string applicationName = element.GetAttribute(SaoExporterConstants.ApplicationNameAttribute);
+            string serviceName = element.GetAttribute(SaoExporterConstants.ServiceNameAttribute);
+            string infinite = element.GetAttribute(SaoExporterConstants.InfiniteAttribute);
+
+            MutablePropertyValues properties = new MutablePropertyValues();
+            if (StringUtils.HasText(targetName))
+            {
+                properties.Add("TargetName", targetName);
+            }
+            if (StringUtils.HasText(applicationName))
+            {
+                properties.Add("ApplicationName", applicationName);
+            }
+            if (StringUtils.HasText(serviceName))
+            {
+                properties.Add("ServiceName", serviceName);
+            }
+            if (StringUtils.HasText(infinite))
+            {
+                properties.Add("Infinite", infinite);
+            }
+
+            foreach (XmlElement child in element.ChildNodes)
+            {
+                switch (child.LocalName)
+                {
+                    case LifeTimeConstants.LifeTimeElement:
+                        ParseLifeTime(properties, child, parserContext);
+                        break;
+                    case InterfacesConstants.InterfacesElement:
+                        properties.Add("Interfaces", base.GetList(child, name, parserContext.ParserHelper));
+                        break;
+                }
+            }
+
+            IConfigurableObjectDefinition cod = parserContext.ReaderContext.ObjectDefinitionFactory.CreateObjectDefinition(
+                typeName, null, parserContext.ReaderContext.Reader.Domain);
+            cod.PropertyValues = properties;
+            return cod;
+        }
+
+        /// <summary>
+        /// Parses the CaoExporter definition.
+        /// </summary>
+        /// <param name="element">The element to parse.</param>
+        /// <param name="name">The name of the object definition.</param>
+        /// <param name="parserContext">The parser context.</param>
+        /// <returns>CaoExporter object definition.</returns>
+        private IConfigurableObjectDefinition ParseCaoExporter(
+            XmlElement element, string name, ParserContext parserContext)
+        {
+            string typeName = GetTypeName(element);
+            string targetName = element.GetAttribute(CaoExporterConstants.TargetNameAttribute);
+            string infinite = element.GetAttribute(CaoExporterConstants.InfiniteAttribute);
+
+            MutablePropertyValues properties = new MutablePropertyValues();
+            if (StringUtils.HasText(targetName))
+            {
+                properties.Add("TargetName", targetName);
+            }
+            if (StringUtils.HasText(infinite))
+            {
+                properties.Add("Infinite", infinite);
+            }
+
+            foreach (XmlElement child in element.ChildNodes)
+            {
+                switch (child.LocalName)
+                {
+                    case LifeTimeConstants.LifeTimeElement:
+                        ParseLifeTime(properties, child, parserContext);
+                        break;
+                    case InterfacesConstants.InterfacesElement:
+                        properties.Add("Interfaces", base.GetList(child, name, parserContext.ParserHelper));
+                        break;
+                }
+            }
+
+            IConfigurableObjectDefinition cod = parserContext.ReaderContext.ObjectDefinitionFactory.CreateObjectDefinition(
+                typeName, null, parserContext.ReaderContext.Reader.Domain);
+            cod.PropertyValues = properties;
+
+            return cod;
+        }
+
+        /// <summary>
+        /// Parses the LifeTime definition.
+        /// </summary>
+        private void ParseLifeTime(MutablePropertyValues properties, XmlElement child, ParserContext parserContext)
+        {
+            string initialLeaseTime = child.GetAttribute(LifeTimeConstants.InitialLeaseTimeAttribute);
+            string renewOnCallTime = child.GetAttribute(LifeTimeConstants.RenewOnCallTimeAttribute);
+            string sponsorshipTimeout = child.GetAttribute(LifeTimeConstants.SponsorshipTimeoutAttribute);
+
+            if (StringUtils.HasText(initialLeaseTime))
+            {
+                properties.Add("InitialLeaseTime", initialLeaseTime);
+            }
+            if (StringUtils.HasText(renewOnCallTime))
+            {
+                properties.Add("RenewOnCallTime", renewOnCallTime);
+            }
+            if (StringUtils.HasText(sponsorshipTimeout))
+            {
+                properties.Add("SponsorshipTimeout", sponsorshipTimeout);
+            }
+        }
+
+        /// <summary>
+        /// Gets the name of the object type for the specified element.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        /// <returns>The name of the object type.</returns>
+        private string GetTypeName(XmlElement element)
+        {
+            string typeName = element.GetAttribute(ObjectDefinitionConstants.TypeAttribute);
+            if (StringUtils.IsNullOrEmpty(typeName))
+            {
+                return RemotingTypePrefix + element.LocalName;
+            }
+            return typeName;
+        }
+
+        #region Element & Attribute Name Constants
+
+        private class RemotingConfigurerConstants
+        {
+            public const string RemotingConfigurerElement = "configurer";
+            public const string FilenameAttribute = "filename";
+            public const string UseConfigFileAttribute = "useConfigFile";
+            public const string EnsureSecurityAttribute = "ensureSecurity";
+        }
+
+        private class SaoFactoryObjectConstants
+        {
+            public const string SaoFactoryObjectElement = "saoFactory";
+            public const string ServiceInterfaceAttribute = "serviceInterface";
+            public const string ServiceUrlAttribute = "serviceUrl";
+        }
+
+        private class CaoFactoryObjectConstants
+        {
+            public const string CaoFactoryObjectElement = "caoFactory";
+            public const string ConstructorArgumentsElement = "constructor-args";
+            public const string RemoteTargetNameAttribute = "remoteTargetName";
+            public const string ServiceUrlAttribute = "serviceUrl";
+        }
+
+        private class LifeTimeConstants
+        {
+            public const string LifeTimeElement = "lifeTime";
+            public const string InitialLeaseTimeAttribute = "initialLeaseTime";
+            public const string RenewOnCallTimeAttribute = "renewOnCallTime";
+            public const string SponsorshipTimeoutAttribute = "sponsorshipTimeout";
+        }
+
+        private class InterfacesConstants
+        {
+            public const string InterfacesElement = "interfaces";
+        }
+
+        private class RemoteObjectFactoryConstants
+        {
+            public const string RemoteObjectFactoryElement = "remoteObjectFactory";
+            public const string TargetNameAttribute = "targetName";
+            public const string InfiniteAttribute = "infinite";
+        }
+
+        private class SaoExporterConstants
+        {
+            public const string SaoExporterElement = "saoExporter";
+            public const string TargetNameAttribute = "targetName";
+            public const string ApplicationNameAttribute = "applicationName";
+            public const string ServiceNameAttribute = "serviceName";
+            public const string InfiniteAttribute = "infinite";
+        }
+
+        private class CaoExporterConstants
+        {
+            public const string CaoExporterElement = "caoExporter";
+            public const string TargetNameAttribute = "targetName";
+            public const string InfiniteAttribute = "infinite";
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Remoting/Config/spring-remoting-1.1.xsd b/src/Spring/Spring.Services/Remoting/Config/spring-remoting-1.1.xsd
new file mode 100644
index 00000000..16878986
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/Config/spring-remoting-1.1.xsd
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema xmlns="http://www.springframework.net/remoting"
+          xmlns:objects="http://www.springframework.net" 
+          xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+          xmlns:vs="http://schemas.microsoft.com/Visual-Studio-Intellisense" 
+          targetNamespace="http://www.springframework.net/remoting" 
+          elementFormDefault="qualified" attributeFormDefault="unqualified" 
+          vs:friendlyname="Spring.NET Remoting Framework Configuration" vs:ishtmlschema="false" vs:iscasesensitive="true" vs:requireattributequotes="true" vs:defaultnamespacequalifier="" vs:defaultnsprefix="">
+
+  <xs:import namespace="http://www.springframework.net"/>
+
+  <xs:annotation>
+    <xs:documentation>
+      Spring.NET Remoting Framework Config Schema Definition
+
+      Author: Bruno Baia
+
+      This file defines a configuration schema for the remoting framework
+      object definitions. Using elements from this schema instead of the
+      standard object definitions can greatly simplify remoting configuration.
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:complexType name="remotingConfigurerType">
+    <xs:annotation>
+      <xs:documentation>Configures the remoting infrastructure.</xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="filename" type="objects:nonNullString" use="optional">
+      <xs:annotation>
+        <xs:documentation>The name of the remoting configurationn file.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="useConfigFile" type="xs:boolean" use="optional">
+      <xs:annotation>
+        <xs:documentation>Indicates whether a configuration file is used. Default is true.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ensureSecurity" type="xs:boolean" use="optional">
+      <xs:annotation>
+        <xs:documentation>Indicates whether the security is enabled. Default is false.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+
+  <xs:complexType name="saoFactoryObjectType">
+    <xs:annotation>
+      <xs:documentation>Creates a reference to a server activated object (SAO).</xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="id" type="xs:ID" use="optional">
+      <xs:annotation>
+        <xs:documentation>The id of the created object.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="serviceInterface" type="objects:nonNullString" use="required">
+      <xs:annotation>
+        <xs:documentation>The remote service interface.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="serviceUrl" type="objects:nonNullString" use="required">
+      <xs:annotation>
+        <xs:documentation>The URI of the well known object.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+
+  <xs:complexType name="caoFactoryObjectType">
+    <xs:annotation>
+      <xs:documentation>Creates a reference to a client activated object (CAO).</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="constructor-args" minOccurs="0" maxOccurs="1">
+        <xs:annotation>
+          <xs:documentation>The arguments used to call the CAO constructor.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:group ref="objects:objectList" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute name="id" type="xs:ID" use="optional">
+      <xs:annotation>
+        <xs:documentation>The id of the created object.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="remoteTargetName" type="objects:nonNullString" use="required">
+      <xs:annotation>
+        <xs:documentation>The remote target name to activate.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="serviceUrl" type="objects:nonNullString" use="required">
+      <xs:annotation>
+        <xs:documentation>The Uri of the remote type.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+
+  <xs:complexType name="lifeTimeType">
+    <xs:annotation>
+      <xs:documentation>Defines the lifetime policy of the remoteobject.</xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="initialLeaseTime" type="objects:nonNullString" use="optional">
+      <xs:annotation>
+        <xs:documentation>The initial time for the lease.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="renewOnCallTime" type="objects:nonNullString" use="optional">
+      <xs:annotation>
+        <xs:documentation>The amount of time to add to the current lease time after each call.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sponsorshipTimeout" type="objects:nonNullString" use="optional">
+      <xs:annotation>
+        <xs:documentation>The amount of time to wait for a sponsor to respond with a lease renewal time.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+
+  <xs:complexType name="remoteObjectFactoryType">
+    <xs:annotation>
+      <xs:documentation>Creates a MarshalByRefObject wrapper around target class.</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="lifeTime" type="lifeTimeType" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="interfaces" minOccurs="0" maxOccurs="1">
+        <xs:annotation>
+          <xs:documentation>The list of interfaces to wrap.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:group ref="objects:objectList" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute name="id" type="xs:ID" use="optional">
+      <xs:annotation>
+        <xs:documentation>The id of the created remote object to be referenced.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="targetName" type="objects:nonNullString" use="required">
+      <xs:annotation>
+        <xs:documentation>The target object.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="infinite" type="xs:boolean" use="optional">
+      <xs:annotation>
+        <xs:documentation>Indicates whether the remote object has infinite lifetime.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+
+  <xs:complexType name="saoExporterType">
+    <xs:annotation>
+      <xs:documentation>Registers an object as a Server Activated Object (SAO).</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="lifeTime" type="lifeTimeType" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="interfaces" minOccurs="0" maxOccurs="1">
+        <xs:annotation>
+          <xs:documentation>The list of interfaces whose methods should be exported.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:group ref="objects:objectList" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute name="id" type="xs:ID" use="optional">
+      <xs:annotation>
+        <xs:documentation>The id of the exporter to be referenced.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="targetName" type="objects:nonNullString" use="required">
+      <xs:annotation>
+        <xs:documentation>The target object to export.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="applicationName" type="objects:nonNullString" use="optional">
+      <xs:annotation>
+        <xs:documentation>The name of the remote application.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="serviceName" type="objects:nonNullString" use="required">
+      <xs:annotation>
+        <xs:documentation>The name of the exported remote service.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="infinite" type="xs:boolean" use="optional">
+      <xs:annotation>
+        <xs:documentation>Indicates whether the remote object has infinite lifetime.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+
+  <xs:complexType name="caoExporterType">
+    <xs:annotation>
+      <xs:documentation>Registers an object as a Client Activated Object (CAO).</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="lifeTime" type="lifeTimeType" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="interfaces" minOccurs="0" maxOccurs="1">
+        <xs:annotation>
+          <xs:documentation>The list of interfaces whose methods should be exported.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:group ref="objects:objectList" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute name="id" type="xs:ID" use="optional">
+      <xs:annotation>
+        <xs:documentation>The id of the exporter to be referenced.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="targetName" type="objects:nonNullString" use="required">
+      <xs:annotation>
+        <xs:documentation>The target object to export.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="infinite" type="xs:boolean" use="optional">
+      <xs:annotation>
+        <xs:documentation>Indicates whether the remote object has infinite lifetime.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+
+  <xs:element name="configurer" type="remotingConfigurerType"/>
+  <xs:element name="saoFactory" type="saoFactoryObjectType"/>
+  <xs:element name="caoFactory" type="caoFactoryObjectType"/>
+  <xs:element name="remoteObjectFactory" type="remoteObjectFactoryType"/>
+  <xs:element name="saoExporter" type="saoExporterType"/>
+  <xs:element name="caoExporter" type="caoExporterType"/>
+
+</xs:schema>
diff --git a/src/Spring/Spring.Services/Remoting/Config/spring-remoting-1.1.xsx b/src/Spring/Spring.Services/Remoting/Config/spring-remoting-1.1.xsx
new file mode 100644
index 00000000..ff71343b
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/Config/spring-remoting-1.1.xsx
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.-->
+<XSDDesignerLayout Style="LeftRight" />
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Remoting/RemoteObjectFactory.cs b/src/Spring/Spring.Services/Remoting/RemoteObjectFactory.cs
new file mode 100644
index 00000000..dd8050d4
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/RemoteObjectFactory.cs
@@ -0,0 +1,184 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Proxy;
+using Spring.Objects.Factory;
+using Spring.Remoting.Support;
+using Spring.Util;
+using Spring.Core.TypeResolution;
+
+#endregion
+
+namespace Spring.Remoting
+{
+	/// <summary>
+	/// Factory for creating MarshalByRefObject wrapper around target class.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: RemoteObjectFactory.cs,v 1.8 2007/07/31 18:18:19 bbaia Exp $</version>
+	public class RemoteObjectFactory : ConfigurableLifetime, IInitializingObject, IFactoryObject
+	{
+		#region Fields
+
+		private object target;
+        private Type baseType = typeof(BaseRemoteObject);
+        private string[] interfaces;
+
+		private ConstructorInfo proxyConstructor;
+
+		#endregion
+
+		#region Constructor(s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the MarshalByRefObjectFactory.
+		/// </summary>
+		public RemoteObjectFactory()
+		{
+        }
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets or sets the target object.
+		/// </summary>
+		public object Target
+		{
+			get { return target; }
+			set { target = value; }
+		}
+
+        /// <summary>
+        /// Gets or sets the <see cref="Spring.Remoting.Support.BaseRemoteObject"/> class or subclass 
+        /// that the proxy must inherit from.
+        /// </summary>
+        public Type BaseType
+        {
+            get { return baseType; }
+            set { baseType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the list of interfaces to wrap.
+        /// </summary>
+        /// <remarks>
+        /// The default value of this property is all the interfaces 
+        /// implemented or inherited by the target type.
+        /// </remarks>
+        /// <value>The interfaces to export.</value>
+        public string[] Interfaces
+        {
+            get { return interfaces; }
+            set { interfaces = value; }
+        }
+
+		#endregion
+
+		#region IInitializingObject Members
+
+		/// <summary>
+		/// Initializes factory object.
+		/// </summary>
+		public void AfterPropertiesSet()
+		{
+			ValidateConfiguration();
+            GenerateProxy();
+		}
+
+		#endregion
+
+		#region IFactoryObject Members
+
+		/// <summary>
+		/// Returns type of the remotable target proxy.
+		/// </summary>
+		public Type ObjectType
+		{
+			get
+			{
+				return (proxyConstructor != null) ? proxyConstructor.DeclaringType : target.GetType();
+			}
+		}
+
+		/// <summary>
+		/// Creates new instance of the remotable target proxy.
+		/// </summary>
+		/// <returns>New instance of the remotable target proxy.</returns>
+		public object GetObject()
+		{
+			if (proxyConstructor == null)
+				GenerateProxy();
+
+			return proxyConstructor.Invoke(new object[1]{ target });
+		}
+
+		/// <summary>
+		/// Always returns false.
+		/// </summary>
+		public bool IsSingleton
+		{
+			get
+			{
+				return false;
+			}
+		}
+
+		#endregion
+
+		#region Private Methods
+
+		private void ValidateConfiguration()
+		{
+			if (Target == null)
+			{
+				throw new ArgumentException("The Target property is required.");
+			}
+            if (!typeof(BaseRemoteObject).IsAssignableFrom(BaseType))
+            {
+                throw new ArgumentException("The type BaseRemoteObject cannot be assigned from BaseType.");
+            }
+		}
+
+		private void GenerateProxy()
+		{
+            IProxyTypeBuilder builder = new RemoteObjectProxyTypeBuilder(this);
+            builder.TargetType = target.GetType();
+            builder.BaseType = baseType;
+            if (interfaces != null && interfaces.Length > 0)
+            {
+                builder.Interfaces = TypeResolutionUtils.ResolveInterfaceArray(interfaces);
+            }
+
+			Type remotableObjectType = builder.BuildProxyType();
+
+			proxyConstructor = remotableObjectType.GetConstructor(new Type[1] { builder.TargetType });
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs b/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs
new file mode 100644
index 00000000..f1d4e019
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs
@@ -0,0 +1,170 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Remoting;
+
+using Common.Logging;
+using Spring.Core;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Remoting
+{
+    /// <summary>
+    /// Convenience class to configure remoting infrastructure from the IoC container.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: RemotingConfigurer.cs,v 1.7 2007/10/08 14:57:34 bbaia Exp $</version>
+    public class RemotingConfigurer : IObjectFactoryPostProcessor, IOrdered
+    {
+		#region Fields
+
+        private static readonly ILog log = LogManager.GetLogger(typeof(RemotingConfigurer));
+
+        private int _order = Int32.MinValue;
+
+        private IResource _filename;
+        private bool _useConfigFile = true;
+        private bool _ensureSecurity = false;
+
+		#endregion
+
+		#region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemotingConfigurer"/> class.
+        /// </summary>
+        public RemotingConfigurer()
+        {}
+
+		#endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the name of the remoting configuration file.
+        /// </summary>
+        /// <remarks>
+        /// If filename is <see langword="null"/> or not set, 
+        /// current AppDomain's configuration file will be used.
+        /// </remarks>
+        public IResource Filename
+        {
+            get { return _filename; }
+            set { _filename = value; }
+        }
+
+        /// <summary>
+        /// Indicates whether a configuration file is used.
+        /// Default value is <see langword="true"/>.
+        /// </summary>
+        /// <remarks>
+        /// If <see langword="false"/>, default remoting configuration will be used.
+        /// </remarks>
+        public bool UseConfigFile
+        {
+            get { return _useConfigFile; }
+            set { _useConfigFile = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets if security is enabled.
+        /// </summary>
+        /// <remarks>
+        /// This property is only available since .NET Framework 2.0.
+        /// </remarks>
+        public bool EnsureSecurity
+        {
+            get { return _ensureSecurity; }
+            set
+            {
+#if NET_2_0
+                _ensureSecurity = value;
+#else
+                throw new NotSupportedException(
+                    "The EnsureSecurity property is supported only on .Net Framework 2.0.");
+#endif
+            }
+        }
+        
+        #endregion
+
+        #region IObjectFactoryPostProcessor Members
+
+        /// <summary>
+        /// Modify the application context's internal object factory after its
+        /// standard initialization.
+        /// </summary>
+        /// <param name="factory">
+        /// The object factory used by the application context.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Factory.Config.IObjectFactoryPostProcessor.PostProcessObjectFactory(IConfigurableListableObjectFactory)"/>
+        public void PostProcessObjectFactory(IConfigurableListableObjectFactory factory)
+        {
+            string filename = null;
+            if (UseConfigFile)
+            {
+                filename = (Filename == null) 
+                    ? AppDomain.CurrentDomain.SetupInformation.ConfigurationFile 
+                    : Filename.File.FullName;
+            }
+#if NET_2_0
+            RemotingConfiguration.Configure(filename, EnsureSecurity);
+#else
+            RemotingConfiguration.Configure(filename);
+#endif
+            #region Instrumentation
+
+            if (log.IsDebugEnabled)
+            {
+                if (filename == null)
+                {
+                    log.Debug("Default remoting infrastructure loaded.");
+                }
+                else
+                {
+                    log.Debug(String.Format("Remoting infrastructure configured using file '{0}'.", filename));
+                }
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #region IOrdered Members
+
+        /// <summary>
+        /// Return the order value of this object, 
+        /// where a higher value means greater in terms of sorting.
+        /// </summary>
+        public int Order
+        {
+            get { return _order; }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Remoting/SaoExporter.cs b/src/Spring/Spring.Services/Remoting/SaoExporter.cs
new file mode 100644
index 00000000..2b1f853d
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/SaoExporter.cs
@@ -0,0 +1,341 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.Remoting;
+
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Proxy;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Support;
+using Spring.Remoting.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Remoting
+{
+	/// <summary>
+	/// Publishes an instance of an object under
+	/// a given url as a Server Activated Object (SAO).
+	/// </summary>
+	/// <remarks>
+	/// Object can be exported either as SingleCall or Singleton.
+	/// </remarks>
+	/// <author>Aleksandar Seovic</author>
+	/// <author>Mark Pollack</author>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: SaoExporter.cs,v 1.18 2007/07/31 18:18:19 bbaia Exp $</version>
+	public class SaoExporter : ConfigurableLifetime, IApplicationContextAware, IObjectFactoryAware, IInitializingObject, IDisposable
+	{
+		#region Logging
+
+		private static readonly Common.Logging.ILog LOG = Common.Logging.LogManager.GetLogger(typeof(SaoExporter));
+
+		#endregion
+
+		#region Fields
+
+		private string targetName;
+		private string applicationName;
+		private string serviceName;
+        private string[] interfaces;
+
+		private IApplicationContext applicationContext;
+		private IObjectFactory objectFactory;
+
+		private MarshalByRefObject remoteObject;
+
+		#endregion
+
+		#region Constructor(s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="SaoExporter"/> class.
+		/// </summary>
+		public SaoExporter()
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets or sets the name of the target object definition.
+		/// </summary>
+		public string TargetName
+		{
+			get { return targetName; }
+			set { targetName = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the name of the remote application.
+		/// </summary>
+		public string ApplicationName
+		{
+			get { return applicationName; }
+			set { applicationName = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the name of the exported remote service.
+		/// <remarks>
+		/// The name that will be used in the URI to refer to this service.
+		/// This will be of the form, tcp://host:port/ServiceName or
+		/// tcp://host:port/ApplicationName/ServiceName
+		/// </remarks>
+		/// </summary>
+		public string ServiceName
+		{
+			get { return serviceName; }
+			set { serviceName = value; }
+		}
+
+        /// <summary>
+        /// Gets or sets the list of interfaces whose methods should be exported.
+        /// </summary>
+        /// <remarks>
+        /// The default value of this property is all the interfaces 
+        /// implemented or inherited by the target type.
+        /// </remarks>
+        /// <value>The interfaces to export.</value>
+        public string[] Interfaces
+        {
+            get { return interfaces; }
+            set { interfaces = value; }
+        }
+
+		#endregion
+
+		#region IApplicationContextAware Members
+
+		/// <summary>
+		/// Gets or sets the <see cref="Spring.Context.IApplicationContext"/> that this
+		/// object runs in.
+		/// </summary>
+		public IApplicationContext ApplicationContext
+		{
+			get { return applicationContext; }
+			set { applicationContext = value; }
+		}
+
+		#endregion
+
+		#region IObjectFactoryAware Members
+
+		/// <summary>
+		/// Sets object factory to use.
+		/// </summary>
+		public IObjectFactory ObjectFactory
+		{
+			set { objectFactory = value; }
+		}
+
+		#endregion
+
+		#region IInitializingObject Members
+
+		/// <summary>
+		/// Publish the object 
+		/// </summary>
+		public void AfterPropertiesSet()
+		{
+			ValidateConfiguration();
+			Export();
+		}
+
+		#endregion
+
+		#region IDisposable Members
+
+		/// <summary>
+		/// Disconnect the remote object from the registered remoting channels.
+		/// </summary>
+		public void Dispose()
+		{
+			RemotingServices.Disconnect(remoteObject);
+		}
+
+		#endregion
+		
+		#region Private Methods
+
+		private void ValidateConfiguration()
+		{
+			if (TargetName == null)
+			{
+				throw new ArgumentException("The TargetName property is required.");
+			}
+
+			if (ServiceName == null)
+			{
+				throw new ArgumentException("The ServiceName property is required.");
+			}
+		}
+
+		private void Export()
+		{
+            IProxyTypeBuilder builder = new SaoRemoteObjectProxyTypeBuilder(applicationContext.Name, targetName, this);
+			builder.TargetType = this.objectFactory.GetType(targetName);
+            if (interfaces != null && interfaces.Length > 0)
+            {
+                builder.Interfaces = TypeResolutionUtils.ResolveInterfaceArray(interfaces);
+            }
+
+			ConstructorInfo proxyConstructor = 
+				builder.BuildProxyType().GetConstructor(Type.EmptyTypes);
+
+			string objectUri = (applicationName != null ? applicationName + "/" + serviceName : serviceName);
+
+			remoteObject = (MarshalByRefObject) proxyConstructor.Invoke(ObjectUtils.EmptyObjects);
+
+			RemotingServices.Marshal(remoteObject, objectUri);
+
+			#region Instrumentation
+
+			if (LOG.IsDebugEnabled)
+			{
+				LOG.Debug(String.Format("Target '{0}' exported as '{1}'.", targetName, objectUri));
+			}
+
+			#endregion
+		}
+
+		#endregion
+
+		#region SaoRemoteObjectProxyTypeBuilder inner class definition
+
+        /// <summary>
+        /// Builds a proxy type based on <see cref="BaseRemoteObject"/> to wrap a target object 
+        /// that is intended to be remotable.
+        /// </summary>
+        /// <remarks>
+        /// The wrapped target object is retrieved by name from the IoC container.
+        /// </remarks>
+        private sealed class SaoRemoteObjectProxyTypeBuilder : RemoteObjectProxyTypeBuilder
+        {
+            #region Fields
+
+            private static readonly MethodInfo TimeSpan_FromTicks =
+                typeof(TimeSpan).GetMethod("FromTicks", BindingFlags.Public | BindingFlags.Static);
+
+            private static readonly MethodInfo ContextRegistry_GetContext =
+                typeof(ContextRegistry).GetMethod("GetContext", new Type[1] { typeof(string) });
+
+            private static readonly MethodInfo IObjectFactory_GetObject =
+                typeof(IObjectFactory).GetMethod("GetObject", new Type[1] { typeof(string) });
+
+            private string contextName;
+            private string targetObjectName;
+
+            #endregion
+
+            #region Constructor(s) / Destructor
+
+            /// <summary>
+            /// Creates a new instance of the 
+            /// <see cref="SaoRemoteObjectProxyTypeBuilder"/> class.
+            /// </summary>
+            /// <param name="contextName">
+            /// The name of the target object definition.
+            /// </param>
+            /// <param name="targetObjectName">
+            /// The name of the application context that this object runs in.
+            /// </param>
+            /// <param name="lifetime">
+            /// The lifetime properties to be applied to the target object.
+            /// </param>
+            public SaoRemoteObjectProxyTypeBuilder(string contextName, string targetObjectName, ILifetime lifetime)
+                : base(lifetime)
+            {
+                this.contextName = contextName;
+                this.targetObjectName = targetObjectName;
+
+                Name = "SaoRemoteObjectProxy";
+                BaseType = typeof(BaseRemoteObject);
+            }
+
+            #endregion
+
+            #region IProxyTypeGenerator Members
+
+            /// <summary>
+            /// Generates the IL instructions that pushes 
+            /// the target instance on which calls should be delegated to.
+            /// </summary>
+            /// <param name="il">The IL generator to use.</param>
+            public override void PushTarget(ILGenerator il)
+            {
+                il.Emit(OpCodes.Ldstr, this.contextName);
+                il.Emit(OpCodes.Call, ContextRegistry_GetContext);
+                il.Emit(OpCodes.Ldstr, this.targetObjectName);
+                il.Emit(OpCodes.Callvirt, IObjectFactory_GetObject);
+            }
+
+            #endregion
+
+            #region Protected Methods
+
+            /// <summary>
+            /// Implements constructors for the proxy class.
+            /// </summary>
+            /// <param name="builder">
+            /// The <see cref="System.Reflection.Emit.TypeBuilder"/> to use.
+            /// </param>
+            protected override void ImplementConstructors(TypeBuilder builder)
+            {
+                MethodAttributes attributes = MethodAttributes.Public |
+                    MethodAttributes.HideBySig | MethodAttributes.SpecialName |
+                    MethodAttributes.RTSpecialName;
+                ConstructorBuilder cb = builder.DefineConstructor(attributes,
+                  CallingConventions.Standard, Type.EmptyTypes);
+
+                ILGenerator il = cb.GetILGenerator();
+                GenerateRemoteObjectLifetimeInitialization(il);
+                il.Emit(OpCodes.Ret);
+            }
+
+            /// <summary>
+            /// Deaclares a field that holds the target object instance.
+            /// </summary>
+            /// <param name="builder">
+            /// The <see cref="System.Type"/> builder to use for code generation.
+            /// </param>
+            protected override void DeclareTargetInstanceField(TypeBuilder builder)
+            {
+            }
+
+            #endregion
+        }
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Remoting/SaoFactoryObject.cs b/src/Spring/Spring.Services/Remoting/SaoFactoryObject.cs
new file mode 100644
index 00000000..7b102bd7
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/SaoFactoryObject.cs
@@ -0,0 +1,141 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using Spring.Objects.Factory;
+
+#endregion
+
+namespace Spring.Remoting
+{
+    /// <summary>
+    /// Factory for creating a reference to a 
+    /// remote server activated object (SAO).
+    /// </summary>
+    /// <remarks>
+    /// This is useful alternative to adminstrative type registration on
+    /// the client when you would like the client to have only 
+    /// a reference to the interface that an SAO implements and not the
+    /// actual SAO implentation. 
+    /// </remarks>
+	/// <author>Aleksandar Seovic</author>
+	/// <author>Mark Pollack</author>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: SaoFactoryObject.cs,v 1.7 2006/05/17 17:45:39 bbaia Exp $</version>
+    public class SaoFactoryObject : IFactoryObject, IInitializingObject
+    {
+		#region Fields
+
+        private Type serviceInterface;
+        private string serviceUrl;
+
+		#endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The remote service interface.
+        /// </summary>
+        public Type ServiceInterface
+        {
+            get { return serviceInterface; }
+            set { serviceInterface = value; }
+        }
+
+        /// <summary>
+        /// The URI of the well known object
+        /// </summary>
+        public string ServiceUrl
+        {
+            get { return serviceUrl; }
+            set { serviceUrl = value; }
+        }
+
+        #endregion
+
+		#region Constructor(s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the SaoFactoryObject class.
+		/// </summary>
+		public SaoFactoryObject()
+		{
+		}
+
+		#endregion
+
+		#region IInitializingObject Members
+
+		/// <summary>
+		/// Callback method called once all factory properties have been set.
+		/// </summary>
+		/// <exception cref="System.Exception">if an error occured</exception>
+		public void AfterPropertiesSet()
+		{
+			if (ServiceUrl == null)
+			{
+				throw new ArgumentException("The ServiceUrl property is required.");
+			}
+
+			if (ServiceInterface == null)
+			{
+				throw new ArgumentException("The ServiceInterface property is required.");
+			}
+
+			if (!ServiceInterface.IsInterface)
+			{
+				throw new ArgumentException("ServiceInterface must be an interface");
+			}
+		}
+
+		#endregion
+
+		#region IFactoryObject Members
+
+		/// <summary>
+		/// Is the object managed by this factory a singleton or a prototype?
+		/// </summary>
+		public bool IsSingleton
+		{
+			get { return false; }
+		}
+
+		/// <summary>
+		/// The type of object to be created.
+		/// </summary>
+		public Type ObjectType
+		{
+			get { return serviceInterface; }
+		}
+
+		/// <summary>
+		/// Return the SAO proxy.
+		/// </summary>
+		/// <returns>the SAO proxy</returns>
+		public object GetObject()
+		{
+			return Activator.GetObject(serviceInterface, serviceUrl);
+		}
+
+		#endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Remoting/Support/BaseRemoteObject.cs b/src/Spring/Spring.Services/Remoting/Support/BaseRemoteObject.cs
new file mode 100644
index 00000000..f12b5141
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/Support/BaseRemoteObject.cs
@@ -0,0 +1,164 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Remoting.Lifetime;
+
+#endregion
+
+namespace Spring.Remoting.Support
+{
+    /// <summary>
+    /// This class extends <see cref="MarshalByRefObject"/> to allow users
+    /// to define object lifecycle details by simply setting its properties.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Remoting exporters uses this class as a base proxy class
+    /// in order to support lifecycle configuration when exporting 
+    /// a remote object.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: BaseRemoteObject.cs,v 1.1 2006/09/13 20:20:16 bbaia Exp $</version>
+    public abstract class BaseRemoteObject : MarshalByRefObject
+    {
+		#region Fields
+
+        private bool isInfinite = false;
+        private TimeSpan initialLeaseTime = TimeSpan.Zero;
+        private TimeSpan renewOnCallTime = TimeSpan.Zero;
+        private TimeSpan sponsorshipTimeout = TimeSpan.Zero;
+
+		#endregion
+
+		#region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseRemoteObject"/> class.
+        /// </summary>
+        public BaseRemoteObject()
+        {}
+
+		#endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance has infinite lifetime.
+        /// </summary>
+        /// <value>
+        /// <see langword="true"/> if this instance has infinite lifetime; 
+        /// otherwise, <see langword="false" /> .
+        /// </value>
+        public bool IsInfinite
+        {
+            get { return isInfinite; }
+            set { isInfinite = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the initial lease time.
+        /// </summary>
+        /// <value>The initial lease time.</value>
+        public TimeSpan InitialLeaseTime
+        {
+            get { return initialLeaseTime; }
+            set { initialLeaseTime = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the amount of time lease should be 
+        /// extended for on each call to this object.
+        /// </summary>
+        /// <value>The amount of time lease should be 
+        /// extended for on each call to this object.</value>
+        public TimeSpan RenewOnCallTime
+        {
+            get { return renewOnCallTime; }
+            set { renewOnCallTime = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the amount of time lease manager will for this object's
+        /// sponsors to respond.
+        /// </summary>
+        /// <value>The amount of time lease manager will for this object's
+        /// sponsors to respond.</value>
+        public TimeSpan SponsorshipTimeout
+        {
+            get { return sponsorshipTimeout; }
+            set { sponsorshipTimeout = value; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Obtains a lifetime service object to control the lifetime policy for this instance.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This method uses property values to configure <see cref="ILease"/> for this object.
+        /// </p>
+        /// <p>
+        /// It is very much inspired by Ingo Rammer's example in Chapter 6 of "Advanced .NET Remoting",
+        /// but is modified slightly to make it more "Spring-friendly". Basically, the main difference is that
+        /// instead of pulling lease configuration from the .NET config file, this implementation relies
+        /// on Spring DI to get appropriate values injected, which makes it much more flexible.
+        /// </p>
+        /// </remarks>
+        /// <returns>
+        /// An object of type <see cref="T:System.Runtime.Remoting.Lifetime.ILease"/> used to control the
+        /// lifetime policy for this instance. This is the current lifetime service object for
+        /// this instance if one exists; otherwise, a new lifetime service object initialized to the value
+        /// of the <see cref="P:System.Runtime.Remoting.Lifetime.LifetimeServices.LeaseManagerPollTime" qualify="true"/> property.
+        /// </returns>
+        /// <exception cref="T:System.Security.SecurityException">The immediate caller does not have infrastructure permission. </exception>
+        public override object InitializeLifetimeService()
+        {
+            if (this.isInfinite)
+            {
+                return null;
+            }
+
+            ILease lease = (ILease) base.InitializeLifetimeService();
+            if (this.initialLeaseTime != TimeSpan.Zero)
+            {
+                lease.InitialLeaseTime = this.initialLeaseTime;
+            }
+            if (this.renewOnCallTime != TimeSpan.Zero)
+            {
+                lease.RenewOnCallTime = this.renewOnCallTime;
+            }
+            if (this.sponsorshipTimeout != TimeSpan.Zero)
+            {
+                lease.SponsorshipTimeout = this.sponsorshipTimeout;
+            }
+
+            return lease;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Remoting/Support/ConfigurableLifetime.cs b/src/Spring/Spring.Services/Remoting/Support/ConfigurableLifetime.cs
new file mode 100644
index 00000000..c32cdcc3
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/Support/ConfigurableLifetime.cs
@@ -0,0 +1,95 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Remoting.Support
+{
+    /// <summary>
+    /// Configurable implementation of the <see cref="ILifetime"/> interface.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: ConfigurableLifetime.cs,v 1.1 2006/09/13 20:20:16 bbaia Exp $</version>
+    public class ConfigurableLifetime : ILifetime
+    {
+        #region Fields
+
+        private bool infinite = true;
+        private TimeSpan initialLeaseTime = TimeSpan.Zero;
+        private TimeSpan renewOnCallTime = TimeSpan.Zero;
+        private TimeSpan sponsorshipTimeout = TimeSpan.Zero;
+
+        #endregion
+
+        #region ILifetime Members
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance has infinite lifetime.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if this instance has infinite lifetime; otherwise, <c>false</c>.
+        /// </value>
+        public bool Infinite
+        {
+            get { return infinite; }
+            set { infinite = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the initial lease time.
+        /// </summary>
+        /// <value>The initial lease time.</value>
+        public TimeSpan InitialLeaseTime
+        {
+            get { return initialLeaseTime; }
+            set { initialLeaseTime = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the amount of time lease 
+        /// should be extended for on each call to this object.
+        /// </summary>
+        /// <value>The amount of time lease should be 
+        /// extended for on each call to this object.</value>
+        public TimeSpan RenewOnCallTime
+        {
+            get { return renewOnCallTime; }
+            set { renewOnCallTime = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the amount of time lease manager  
+        /// will for this object's sponsors to respond.
+        /// </summary>
+        /// <value>The amount of time lease manager will for this object's
+        /// sponsors to respond.</value>
+        public TimeSpan SponsorshipTimeout
+        {
+            get { return sponsorshipTimeout; }
+            set { sponsorshipTimeout = value; }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Services/Remoting/Support/ICaoRemoteFactory.cs b/src/Spring/Spring.Services/Remoting/Support/ICaoRemoteFactory.cs
new file mode 100644
index 00000000..37dbaadc
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/Support/ICaoRemoteFactory.cs
@@ -0,0 +1,63 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+
+#endregion
+
+namespace Spring.Remoting.Support
+{
+	/// <summary>
+	/// Interface for a CAO based object factory.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Provides a well known location for clients to retrieve
+	/// references to CAO references.
+	/// </p>
+	/// </remarks>
+	/// <author>Aleksandar Seovic</author>
+	/// <author>Mark Pollack</author>
+	/// <author>Bruno Baia</author>
+    /// <version>$Id: ICaoRemoteFactory.cs,v 1.1 2006/09/13 20:20:16 bbaia Exp $</version>
+    public interface ICaoRemoteFactory
+	{
+        /// <summary>
+        /// Returns the CAO proxy.
+        /// </summary>
+        /// <returns>The remote object.</returns>
+        object GetObject();
+
+        /// <summary>
+        /// Returns the CAO proxy using the
+        /// argument list to call the constructor. 
+        /// </summary>
+        /// <remarks>
+        /// The matching of arguments to call the constructor is done
+        /// by type. The alternative ways, by index and by constructor
+        /// name are not supported.
+        /// </remarks>
+        /// <param name="constructorArguments">Constructor 
+        /// arguments used to create the object.</param>
+        /// <returns>The remote object.</returns>
+        object GetObject(object[] constructorArguments);
+	}
+}
diff --git a/src/Spring/Spring.Services/Remoting/Support/ILifetime.cs b/src/Spring/Spring.Services/Remoting/Support/ILifetime.cs
new file mode 100644
index 00000000..b94e25c0
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/Support/ILifetime.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Remoting.Support
+{
+    /// <summary>
+    /// Defines lifetime's properties of remote objects that is used by Spring.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: ILifetime.cs,v 1.1 2006/09/13 20:20:16 bbaia Exp $</version>
+    public interface ILifetime
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance has infinite lifetime.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if this instance has infinite lifetime; otherwise, <c>false</c>.
+        /// </value>
+        bool Infinite { get; }
+
+        /// <summary>
+        /// Gets the initial lease time.
+        /// </summary>
+        /// <value>The initial lease time.</value>
+        TimeSpan InitialLeaseTime { get; }
+
+        /// <summary>
+        /// Gets the amount of time lease 
+        /// should be extended for on each call to this object.
+        /// </summary>
+        /// <value>The amount of time lease should be 
+        /// extended for on each call to this object.</value>
+        TimeSpan RenewOnCallTime { get; }
+
+        /// <summary>
+        /// Gets the amount of time lease manager 
+        /// will for this object's sponsors to respond.
+        /// </summary>
+        /// <value>The amount of time lease manager will for this object's
+        /// sponsors to respond.</value>
+        TimeSpan SponsorshipTimeout { get; }
+    }
+}
diff --git a/src/Spring/Spring.Services/Remoting/Support/RemoteObjectProxyTypeBuilder.cs b/src/Spring/Spring.Services/Remoting/Support/RemoteObjectProxyTypeBuilder.cs
new file mode 100644
index 00000000..89c857f6
--- /dev/null
+++ b/src/Spring/Spring.Services/Remoting/Support/RemoteObjectProxyTypeBuilder.cs
@@ -0,0 +1,177 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Proxy;
+
+#endregion
+
+namespace Spring.Remoting.Support
+{
+    /// <summary>
+    /// Builds a proxy type based on <see cref="BaseRemoteObject"/> to wrap a target object 
+    /// that is intended to be remotable.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: RemoteObjectProxyTypeBuilder.cs,v 1.3 2006/11/12 01:37:47 bbaia Exp $</version>
+    internal class RemoteObjectProxyTypeBuilder : CompositionProxyTypeBuilder
+    {
+        #region Fields
+
+        private static readonly MethodInfo TimeSpan_FromTicks =
+            typeof(TimeSpan).GetMethod("FromTicks", BindingFlags.Public | BindingFlags.Static);
+
+        private static readonly MethodInfo BaseRemoteObject_IsInfinite =
+            typeof(BaseRemoteObject).GetMethod("set_IsInfinite", BindingFlags.Public | BindingFlags.Instance);
+
+        private static readonly MethodInfo BaseRemoteObject_InitialLeaseTime =
+            typeof(BaseRemoteObject).GetMethod("set_InitialLeaseTime", BindingFlags.Public | BindingFlags.Instance);
+
+        private static readonly MethodInfo BaseRemoteObject_RenewOnCallTime =
+            typeof(BaseRemoteObject).GetMethod("set_RenewOnCallTime", BindingFlags.Public | BindingFlags.Instance);
+
+        private static readonly MethodInfo BaseRemoteObject_SponsorshipTimeout =
+            typeof(BaseRemoteObject).GetMethod("set_SponsorshipTimeout", BindingFlags.Public | BindingFlags.Instance);
+
+        private ILifetime lifetime;
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="RemoteObjectProxyTypeBuilder"/> class.
+        /// </summary>
+        /// <param name="lifetime">
+        /// The lifetime properties to be applied to the target object.
+        /// </param>
+        public RemoteObjectProxyTypeBuilder(ILifetime lifetime)
+        {
+            this.lifetime = lifetime;
+
+            Name = "RemoteObjectProxy";            
+        }
+
+        #endregion
+
+        #region IProxyTypeBuilder Members
+
+        /// <summary>
+        /// Creates a remotable proxy type based on <see cref="BaseRemoteObject"/>.
+        /// </summary>
+        /// <returns>The generated proxy class.</returns>
+        /// <exception cref="System.ArgumentException">
+        /// If the <see cref="IProxyTypeBuilder.BaseType"/> is not
+        /// an instance of <see cref="BaseRemoteObject"/>.
+        /// </exception>
+        public override Type BuildProxyType()
+        {
+            if (!typeof(BaseRemoteObject).IsAssignableFrom(this.BaseType))
+            {
+                throw new ArgumentException(
+                    "BaseRemoteObject cannot be assigned from BaseType.", "BaseType");
+            }
+
+            return base.BuildProxyType();
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Implements constructors for the proxy class.
+        /// </summary>
+        /// <param name="builder">
+        /// The <see cref="System.Reflection.Emit.TypeBuilder"/> to use.
+        /// </param>
+        protected override void ImplementConstructors(TypeBuilder builder)
+        {
+            MethodAttributes attributes = MethodAttributes.Public |
+                MethodAttributes.HideBySig | MethodAttributes.SpecialName |
+                MethodAttributes.RTSpecialName;
+            ConstructorBuilder cb = builder.DefineConstructor(attributes,
+                CallingConventions.Standard,
+                new Type[1] { TargetType });
+
+            ILGenerator il = cb.GetILGenerator();
+
+            GenerateRemoteObjectLifetimeInitialization(il);
+
+            PushProxy(il);
+            il.Emit(OpCodes.Ldarg_1);
+            il.Emit(OpCodes.Stfld, targetInstance);
+
+            il.Emit(OpCodes.Ret);
+        }
+
+        /// <summary>
+        /// Generate initialization code for <see cref="BaseRemoteObject"/>'s lifetime properties.
+        /// </summary>
+        /// <param name="il">ILGenerator</param>
+        protected void GenerateRemoteObjectLifetimeInitialization(ILGenerator il)
+        {
+            // Set IsInfinite Property
+            if (this.lifetime.Infinite)
+            {
+                PushProxy(il);
+                il.Emit(OpCodes.Ldc_I4_1);	// true
+                il.Emit(OpCodes.Call, BaseRemoteObject_IsInfinite);
+            }
+            else
+            {
+                // Set InitialLeaseTime Property
+                if (this.lifetime.InitialLeaseTime != TimeSpan.Zero)
+                {
+                    PushProxy(il);
+                    il.Emit(OpCodes.Ldc_I8, this.lifetime.InitialLeaseTime.Ticks);
+                    il.Emit(OpCodes.Call, TimeSpan_FromTicks);
+                    il.Emit(OpCodes.Call, BaseRemoteObject_InitialLeaseTime);
+                }
+
+                // Set RenewOnCallTime Property
+                if (this.lifetime.RenewOnCallTime != TimeSpan.Zero)
+                {
+                    PushProxy(il);
+                    il.Emit(OpCodes.Ldc_I8, this.lifetime.RenewOnCallTime.Ticks);
+                    il.Emit(OpCodes.Call, TimeSpan_FromTicks);
+                    il.Emit(OpCodes.Call, BaseRemoteObject_RenewOnCallTime);
+                }
+
+                // Set SponsorshipTimeout Property
+                if (this.lifetime.SponsorshipTimeout != TimeSpan.Zero)
+                {
+                    PushProxy(il);
+                    il.Emit(OpCodes.Ldc_I8, this.lifetime.SponsorshipTimeout.Ticks);
+                    il.Emit(OpCodes.Call, TimeSpan_FromTicks);
+                    il.Emit(OpCodes.Call, BaseRemoteObject_SponsorshipTimeout);
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs
new file mode 100644
index 00000000..0e369b7e
--- /dev/null
+++ b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs
@@ -0,0 +1,78 @@
+#if NET_3_0
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.ServiceModel;
+using System.ServiceModel.Activation;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.ServiceModel.Activation
+{
+    /// <summary>
+    /// Factory that provides instances of <see cref="Spring.ServiceModel.ServiceHost" /> 
+    /// to host objects created by Spring's IoC container.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: ServiceHostFactory.cs,v 1.2 2007/05/18 21:04:37 bbaia Exp $</version>
+    public class ServiceHostFactory : ServiceHostFactoryBase
+    {
+        /// <summary>
+        /// Creates a <see cref="Spring.ServiceModel.ServiceHost"/> for 
+        /// a specified Spring-managed object with a specific base address.
+        /// </summary>
+        /// <param name="reference">
+        /// A reference to a Spring-managed object 'contextName:objectName'.
+        /// </param>
+        /// <param name="baseAddresses">
+        /// The <see cref="System.Array"/> of type <see cref="System.Uri"/> that contains 
+        /// the base addresses for the service hosted.
+        /// </param>
+        /// <returns>
+        /// A <see cref="Spring.ServiceModel.ServiceHost"/> for the Spring-managed object.
+        /// </returns>
+        /// <exception cref="System.ArgumentException">
+        /// If the Service attribute in the ServiceHost directive was not provided.
+        /// </exception>
+        public override ServiceHostBase CreateServiceHost(string reference, Uri[] baseAddresses)
+        {
+            if (StringUtils.IsNullOrEmpty(reference))
+            {
+                throw new ArgumentException("The service name was not provided in the ServiceHost directive.", "Service");
+            }
+
+            string[] refSplitted = reference.Split(':');
+            if (refSplitted.Length == 2)
+            {
+                return new ServiceHost(refSplitted[0], refSplitted[1], baseAddresses);
+            }
+            else
+            {
+                return new ServiceHost(reference, baseAddresses);
+            }
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs b/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs
new file mode 100644
index 00000000..bf3449dd
--- /dev/null
+++ b/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs
@@ -0,0 +1,222 @@
+#if NET_3_0
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using Spring.Util;
+using Spring.Context;
+using Spring.Core.TypeResolution;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Support;
+using Spring.ServiceModel.Support;
+using Spring.Context.Support;
+using Spring.Proxy;
+
+#endregion
+
+namespace Spring.ServiceModel
+{
+	/// <summary>
+	/// Registers an object type on the server as a WCF service.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: ServiceExporter.cs,v 1.2 2007/09/21 14:26:26 bbaia Exp $</version>
+	public class ServiceExporter : IApplicationContextAware, IObjectFactoryAware, IInitializingObject, IDisposable
+	{
+		#region Logging
+
+		private static readonly Common.Logging.ILog LOG = Common.Logging.LogManager.GetLogger(typeof(ServiceExporter));
+
+		#endregion
+
+		#region Fields
+
+		private string targetName;
+        private string[] _contracts;
+        private IList _typeAttributes = new ArrayList();
+        private IDictionary _memberAttributes = new Hashtable();
+
+		private IApplicationContext applicationContext;
+		private AbstractObjectFactory objectFactory;
+
+		private System.ServiceModel.ServiceHost serviceHost;
+
+		#endregion
+
+		#region Constructor(s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the <see cref="ServiceExporter"/> class.
+		/// </summary>
+        public ServiceExporter()
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets or sets the name of the target object definition.
+		/// </summary>
+		public string TargetName
+		{
+			get { return targetName; }
+			set { targetName = value; }
+		}
+
+        /// <summary>
+        /// Gets or sets the list of service contracts.
+        /// </summary>
+        /// <remarks>
+        /// If not set, all the interfaces implemented or inherited 
+        /// by the target type will be used.
+        /// </remarks>
+        /// <value>The interfaces.</value>
+        public string[] Contracts
+        {
+            get { return _contracts; }
+            set { _contracts = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a list of custom attributes 
+        /// that should be applied to the WCF service class.
+        /// </summary>
+        public IList TypeAttributes
+        {
+            get { return _typeAttributes; }
+            set { _typeAttributes = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a dictionary of custom attributes 
+        /// that should be applied to the WCF service members.
+        /// </summary>
+        /// <remarks>
+        /// Dictionary key is an expression that members can be matched against. 
+        /// Value is a list of attributes that should be applied 
+        /// to each member that matches expression.
+        /// </remarks>
+        public IDictionary MemberAttributes
+        {
+            get { return _memberAttributes; }
+            set { _memberAttributes = value; }
+        }
+
+		#endregion
+
+		#region IApplicationContextAware Members
+
+		/// <summary>
+		/// Gets or sets the <see cref="Spring.Context.IApplicationContext"/> that this
+		/// object runs in.
+		/// </summary>
+		public IApplicationContext ApplicationContext
+		{
+			get { return applicationContext; }
+			set { applicationContext = value; }
+		}
+
+		#endregion
+
+		#region IObjectFactoryAware Members
+
+		/// <summary>
+		/// Sets object factory to use.
+		/// </summary>
+		public IObjectFactory ObjectFactory
+		{
+			set { objectFactory = (AbstractObjectFactory) value; }
+		}
+
+		#endregion
+
+		#region IInitializingObject Members
+
+		/// <summary>
+		/// Publish the object 
+		/// </summary>
+		public void AfterPropertiesSet()
+		{
+			ValidateConfiguration();
+			Export();
+		}
+
+		#endregion
+
+		#region IDisposable Members
+
+		/// <summary>
+		/// Closes the service host.
+		/// </summary>
+		public void Dispose()
+		{
+            serviceHost.Close();
+		}
+
+		#endregion
+
+		#region Private Methods
+
+		private void ValidateConfiguration()
+		{
+			if (TargetName == null)
+			{
+				throw new ArgumentException("The TargetName property is required.");
+			}
+		}
+
+		private void Export()
+		{
+            string contextName = (applicationContext.Name == AbstractApplicationContext.DefaultRootContextName) ? null : applicationContext.Name;
+            Type targetType = objectFactory.GetType(targetName);
+            IProxyTypeBuilder builder = new ServiceProxyTypeBuilder(contextName, targetName, targetType);
+            if (Contracts != null && Contracts.Length > 0)
+            {
+                builder.Interfaces = TypeResolutionUtils.ResolveInterfaceArray(Contracts);
+            }
+            builder.TypeAttributes = TypeAttributes;
+            builder.MemberAttributes = MemberAttributes;
+
+            Type serviceType = builder.BuildProxyType();
+
+            serviceHost = new System.ServiceModel.ServiceHost(serviceType);
+            serviceHost.Open();
+
+            #region Instrumentation
+
+            if (LOG.IsDebugEnabled)
+            {
+                LOG.Debug(String.Format("The service '{0}' is ready and can now be accessed.", targetName));
+            }
+
+            #endregion
+		}
+
+		#endregion
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/ServiceModel/ServiceHost.cs b/src/Spring/Spring.Services/ServiceModel/ServiceHost.cs
new file mode 100644
index 00000000..23224a0b
--- /dev/null
+++ b/src/Spring/Spring.Services/ServiceModel/ServiceHost.cs
@@ -0,0 +1,97 @@
+#if NET_3_0
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+
+using Spring.Util;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.ServiceModel.Support;
+
+#endregion
+
+namespace Spring.ServiceModel
+{
+    /// <summary>
+    /// Provides a host for Spring-managed services.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: ServiceHost.cs,v 1.1 2007/05/18 21:04:37 bbaia Exp $</version>
+    public class ServiceHost : System.ServiceModel.ServiceHost
+    {
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.ServiceModel.ServiceHost"/> class.
+        /// </summary>
+        /// <param name="serviceName">The name of the service within Spring's IoC container.</param>
+        /// <param name="baseAddresses">The base addresses for the hosted service.</param>
+        public ServiceHost(string serviceName, params Uri[] baseAddresses)
+            : this(null, serviceName, baseAddresses)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.ServiceModel.ServiceHost"/> class.
+        /// </summary>
+        /// <param name="contextName">The name of the context to use.</param>
+        /// <param name="serviceName">The name of the service within Spring's IoC container.</param>
+        /// <param name="baseAddresses">The base addresses for the hosted service.</param>
+        public ServiceHost(string contextName, string serviceName, params Uri[] baseAddresses)
+            : base(CreateServiceType(contextName, serviceName), baseAddresses)
+        {
+        }
+
+        private static Type CreateServiceType(string contextName, string serviceName)
+        {
+            if (StringUtils.IsNullOrEmpty(serviceName))
+            {
+                throw new ArgumentException("The service name cannot be null or an empty string.", "serviceName");
+            }
+
+            IApplicationContext ctx;
+            if (StringUtils.IsNullOrEmpty(contextName))
+            {
+                ctx = ContextRegistry.GetContext();
+                if (ctx == null)
+                {
+                    throw new ArgumentException("No context registered.");
+                }
+            }
+            else
+            {
+                ctx = ContextRegistry.GetContext(contextName);
+                if (ctx == null)
+                {
+                    throw new ArgumentException(string.Format("Context '{0}' is not registered.", contextName));
+                }
+            }
+            Type serviceType = ctx.GetType(serviceName);
+
+            return new ServiceProxyTypeBuilder(contextName, serviceName, serviceType).BuildProxyType();
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs b/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs
new file mode 100644
index 00000000..5dbd1730
--- /dev/null
+++ b/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs
@@ -0,0 +1,137 @@
+#if NET_3_0
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Proxy;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects.Factory;
+
+#endregion
+
+namespace Spring.ServiceModel.Support
+{
+    /// <summary>
+    /// Builds a WCF service type.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: ServiceProxyTypeBuilder.cs,v 1.1 2007/05/18 21:04:37 bbaia Exp $</version>
+    public class ServiceProxyTypeBuilder : CompositionProxyTypeBuilder
+    {
+        #region Fields
+
+        private static readonly MethodInfo GetObject =
+            typeof(IObjectFactory).GetMethod("GetObject", new Type[] { typeof(string) });
+
+        private static readonly MethodInfo GetContext =
+            typeof(ContextRegistry).GetMethod("GetContext", Type.EmptyTypes);
+
+        private static readonly MethodInfo GetContextByName =
+            typeof(ContextRegistry).GetMethod("GetContext", new Type[] { typeof(string) });
+
+        private string contextName;
+        private string serviceName;
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="Spring.ServiceModel.Support.ServiceProxyTypeBuilder"/> class.
+        /// </summary>
+        /// <param name="contextName">The name of the context to use.</param>
+        /// <param name="serviceName">The name of the service within Spring's IoC container.</param>
+        /// <param name="serviceType">The type of the service.</param>
+        public ServiceProxyTypeBuilder(string contextName, string serviceName, Type serviceType)
+        {
+            this.contextName = contextName;
+            this.serviceName = serviceName;
+
+            this.Name = (contextName == null) ? serviceName : contextName + "." + serviceName;
+            this.TargetType = serviceType;
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Implements constructors for the proxy class.
+        /// </summary>
+        /// <remarks>
+        /// This implementation generates a constructor 
+        /// that gets instance of the target object using 
+        /// <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>.
+        /// </remarks>
+        /// <param name="builder">
+        /// The <see cref="System.Type"/> builder to use.
+        /// </param>
+        protected override void ImplementConstructors(TypeBuilder builder)
+        {
+            MethodAttributes attributes = MethodAttributes.Public |
+                MethodAttributes.HideBySig | MethodAttributes.SpecialName |
+                MethodAttributes.RTSpecialName;
+
+            ConstructorBuilder cb = builder.DefineConstructor(
+                attributes, CallingConventions.Standard, Type.EmptyTypes);
+
+            ILGenerator il = cb.GetILGenerator();
+
+            il.Emit(OpCodes.Ldarg_0);
+            if (contextName == null)
+            {
+                // call ContextRegistry.GetContext()
+                il.EmitCall(OpCodes.Call, GetContext, null);
+            }
+            else
+            {
+                // call ContextRegistry.GetContext(contextName)
+                il.Emit(OpCodes.Ldstr, contextName);
+                il.EmitCall(OpCodes.Call, GetContextByName, null);
+            }
+            il.Emit(OpCodes.Ldstr, serviceName);
+            il.EmitCall(OpCodes.Callvirt, GetObject, null);
+            il.Emit(OpCodes.Stfld, targetInstance);
+
+            il.Emit(OpCodes.Ret);
+        }
+
+        /// <summary>
+        /// Creates an appropriate type builder.
+        /// </summary>
+        /// <param name="name">The name to use for the proxy type name.</param>
+        /// <param name="baseType">The type to extends if provided.</param>
+        /// <returns>The type builder to use.</returns>
+        protected override TypeBuilder CreateTypeBuilder(string name, Type baseType)
+        {
+            return DynamicProxyManager.CreateTypeBuilder(name, baseType);
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Spring.Services.2003.csproj b/src/Spring/Spring.Services/Spring.Services.2003.csproj
new file mode 100644
index 00000000..9942bbd7
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.2003.csproj
@@ -0,0 +1,213 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Services"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = "Spring.Services.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Services\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "true"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Services\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "system.enterpriseservices"
+                    AssemblyName = "System.EnterpriseServices"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\system.enterpriseservices.dll"
+                />
+                <Reference
+                    Name = "system.web.services"
+                    AssemblyName = "System.Web.Services"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\system.web.services.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CommonAssemblyInfo.cs"
+                    Link = "..\CommonAssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Services.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "EnterpriseServices\EnterpriseServices.keys"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "EnterpriseServices\EnterpriseServicesExporter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "EnterpriseServices\ServicedComponentExporter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "EnterpriseServices\ServicedComponentFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\CaoExporter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\CaoFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\RemoteObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\RemotingConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\SaoExporter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\SaoFactoryObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\Config\RemotingNamespaceParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\Config\spring-remoting-1.1.xsd"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Remoting\Support\BaseRemoteObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\Support\ConfigurableLifetime.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\Support\ICaoRemoteFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\Support\ILifetime.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\Support\RemoteObjectProxyTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Services\WebServiceProxyFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Services/Spring.Services.2005.csproj b/src/Spring/Spring.Services/Spring.Services.2005.csproj
new file mode 100644
index 00000000..6ae0f84d
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.2005.csproj
@@ -0,0 +1,149 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Services</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>Spring.Services.xml</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.EnterpriseServices">
+      <Name>system.enterpriseservices</Name>
+    </Reference>
+    <Reference Include="System.Web.Services">
+      <Name>system.web.services</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="EnterpriseServices\EnterpriseServicesExporter.cs" />
+    <Compile Include="EnterpriseServices\ServicedComponentExporter.cs" />
+    <Compile Include="EnterpriseServices\ServicedComponentFactory.cs" />
+    <Compile Include="Remoting\CaoExporter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\CaoFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\Config\RemotingNamespaceParser.cs" />
+    <Compile Include="Remoting\RemotingConfigurer.cs" />
+    <Compile Include="Remoting\RemoteObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\Support\BaseRemoteObject.cs" />
+    <Compile Include="Remoting\Support\ConfigurableLifetime.cs" />
+    <Compile Include="Remoting\Support\ICaoRemoteFactory.cs" />
+    <Compile Include="Remoting\Support\ILifetime.cs" />
+    <Compile Include="Remoting\Support\RemoteObjectProxyTypeBuilder.cs" />
+    <Compile Include="Remoting\SaoExporter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\SaoFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\Services\WebServiceProxyFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <EmbeddedResource Include="EnterpriseServices\EnterpriseServices.keys" />
+    <EmbeddedResource Include="Remoting\Config\spring-remoting-1.1.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <None Include="Spring.Services.build" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Spring.Services.2008.csproj b/src/Spring/Spring.Services/Spring.Services.2008.csproj
new file mode 100644
index 00000000..e714fe3d
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.2008.csproj
@@ -0,0 +1,156 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Services</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <MinFrameworkVersionRequired>3.0</MinFrameworkVersionRequired>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Services\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0;NET_3_0</DefineConstants>
+    <DocumentationFile>Spring.Services.xml</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Services\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0;NET_3_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.EnterpriseServices">
+      <Name>system.enterpriseservices</Name>
+    </Reference>
+    <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.Services">
+      <Name>system.web.services</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="EnterpriseServices\EnterpriseServicesExporter.cs" />
+    <Compile Include="EnterpriseServices\ServicedComponentExporter.cs" />
+    <Compile Include="EnterpriseServices\ServicedComponentFactory.cs" />
+    <Compile Include="Remoting\CaoExporter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\CaoFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\Config\RemotingNamespaceParser.cs" />
+    <Compile Include="Remoting\RemotingConfigurer.cs" />
+    <Compile Include="Remoting\RemoteObjectFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\Support\BaseRemoteObject.cs" />
+    <Compile Include="Remoting\Support\ConfigurableLifetime.cs" />
+    <Compile Include="Remoting\Support\ICaoRemoteFactory.cs" />
+    <Compile Include="Remoting\Support\ILifetime.cs" />
+    <Compile Include="Remoting\Support\RemoteObjectProxyTypeBuilder.cs" />
+    <Compile Include="Remoting\SaoExporter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\SaoFactoryObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ServiceModel\Activation\ServiceHostFactory.cs" />
+    <Compile Include="ServiceModel\ServiceExporter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ServiceModel\ServiceHost.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ServiceModel\Support\ServiceProxyTypeBuilder.cs" />
+    <Compile Include="Web\Services\WebServiceProxyFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <EmbeddedResource Include="EnterpriseServices\EnterpriseServices.keys" />
+    <EmbeddedResource Include="Remoting\Config\spring-remoting-1.1.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <None Include="Spring.Services.build" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.2005.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.2005.csproj
new file mode 100644
index 00000000..17f37da2
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.2005.csproj
@@ -0,0 +1,263 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B8381347-51A1-4850-828C-3170FA93846C}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Services.WindowsService.Common</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring.Services</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.WindowsService.Common\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>Spring.Services.WindowsService.Common.xml</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.WindowsService.Common\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>Spring.Services.WindowsService.Common.xml</DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="cscompmgd">
+      <Name>cscompmgd</Name>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.DirectoryServices">
+      <Name>System.DirectoryServices</Name>
+    </Reference>
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.Runtime.Remoting">
+      <Name>System.Runtime.Remoting</Name>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization.Formatters.Soap">
+      <Name>System.Runtime.Serialization.Formatters.Soap</Name>
+    </Reference>
+    <Reference Include="System.Web">
+      <Name>System.Web</Name>
+    </Reference>
+    <Reference Include="System.Windows.Forms">
+      <Name>System.Windows.Forms</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Services.WindowsService.Common.build" />
+    <Compile Include="WindowsService\Common\Application.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\ApplicationHost.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\DefaultService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\AggregatedDeployEventDispatcher.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\ApplicationWatcherManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\DefaultApplicationWatcherFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\DefaultDeployer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\DeployEventAggregator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\DeployEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\DeployManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\DeployStatus.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\FileSystem\FileSystemApplicationWatcher.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\FileSystem\FileSystemDeployLocation.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\FileSystem\FileSystemMonitor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\FileSystem\IFileSystemEventFilter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\FileSystem\RegularExpressionFilter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\FileSystem\RegularExpressionFilterConfigurer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\ForwardingDeployEventDispatcher.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\IApplicationHostManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\IApplicationWatcher.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\IApplicationWatcherConfigurer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\IApplicationWatcherFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\IDeployer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\IDeployEventDispatcher.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\IDeployEventSource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\IDeployLocation.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\NullApplicationWatcher.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\NullWatcherConfigurer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\SeparateAppDomainHostManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Deploy\SpringAssembliesDeployer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\DisposableSupport.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Gui\ApplicationMonitor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Gui\CursorChanger.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\IApplication.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\IApplicationHost.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\IServiceSupport.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\ITrigger.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Localizer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\ServiceSupport.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\SpringService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\ThreadingTimerTrigger.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Common\Utils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <EmbeddedResource Include="WindowsService\Common\Gui\ApplicationMonitor.resx">
+      <DependentUpon>ApplicationMonitor.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\sandbox\src\Spring\Spring.Threading\Spring.Threading.2005.csproj">
+      <Project>{4640D873-95DC-4130-98E2-2B931D390C20}</Project>
+      <Name>Spring.Threading.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.build b/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.build
new file mode 100644
index 00000000..b7864879
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.build
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<project name="Spring.Services.WindowsService.Common" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+-->
+   <target name="build">
+    <csc target="library" define="${current.build.defines.csc}" 
+         warnaserror="false"
+         debug="${current.build.debug}" 
+         output="${current.bin.dir}/${project::get-name()}.dll" 
+         doc="${current.bin.dir}/${project::get-name()}.xml">
+      <arg line="${compiler.args}"/>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+      <sources failonempty="true">
+        <include name="WindowsService/Common/**/*.cs" />
+        <include name="../CommonAssemblyInfo.cs" />
+      </sources>
+      <references basedir="${current.bin.dir}">
+        <include name="*.dll"/>
+        <exclude name="${project::get-name()}.dll"/>
+      </references>
+    </csc>
+   </target>
+    
+</project>
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.csproj
new file mode 100644
index 00000000..8bb7fa39
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.WindowsService.Common.csproj
@@ -0,0 +1,359 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{B8381347-51A1-4850-828C-3170FA93846C}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Services.WindowsService.Common"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.Services"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = "Spring.Services.WindowsService.Common.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Common\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = "Spring.Services.WindowsService.Common.xml"
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Common\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "System.Windows.Forms"
+                    AssemblyName = "System.Windows.Forms"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "System.Runtime.Remoting"
+                    AssemblyName = "System.Runtime.Remoting"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Runtime.Remoting.dll"
+                />
+                <Reference
+                    Name = "System.Web"
+                    AssemblyName = "System.Web"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
+                />
+                <Reference
+                    Name = "System.Runtime.Serialization.Formatters.Soap"
+                    AssemblyName = "System.Runtime.Serialization.Formatters.Soap"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Runtime.Serialization.Formatters.Soap.dll"
+                />
+                <Reference
+                    Name = "System.DirectoryServices"
+                    AssemblyName = "System.DirectoryServices"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.DirectoryServices.dll"
+                />
+                <Reference
+                    Name = "cscompmgd"
+                    AssemblyName = "cscompmgd"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\cscompmgd.dll"
+                />
+                <Reference
+                    Name = "Spring.Threading"
+                    Project = "{4640D873-95DC-4130-98E2-2B931D390C20}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "Spring.Services.WindowsService.Common.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Application.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\ApplicationHost.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\DefaultService.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\DisposableSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\IApplication.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\IApplicationHost.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\IServiceSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\ITrigger.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Localizer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\ServiceSupport.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\SpringService.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\ThreadingTimerTrigger.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Utils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\AggregatedDeployEventDispatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\ApplicationWatcherManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\DefaultApplicationWatcherFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\DefaultDeployer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\DeployEventAggregator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\DeployEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\DeployManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\DeployStatus.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\ForwardingDeployEventDispatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\IApplicationHostManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\IApplicationWatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\IApplicationWatcherConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\IApplicationWatcherFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\IDeployer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\IDeployEventDispatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\IDeployEventSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\IDeployLocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\NullApplicationWatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\NullWatcherConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\SeparateAppDomainHostManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\SpringAssembliesDeployer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\FileSystem\FileSystemApplicationWatcher.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\FileSystem\FileSystemDeployLocation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\FileSystem\FileSystemMonitor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\FileSystem\IFileSystemEventFilter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\FileSystem\RegularExpressionFilter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\FileSystem\RegularExpressionFilterConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Gui\ApplicationMonitor.cs"
+                    SubType = "UserControl"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Gui\ApplicationMonitor.resx"
+                    DependentUpon = "ApplicationMonitor.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Gui\CursorChanger.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Gui.build b/src/Spring/Spring.Services/Spring.Services.WindowsService.Gui.build
new file mode 100644
index 00000000..e50f9ce8
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.WindowsService.Gui.build
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<project name="Spring.Services.WindowsService.Gui" default="build">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+-->
+   <target name="build">
+      <csc target="winexe" define="${current.build.defines.csc}" 
+  	   warnaserror="false" 
+           nowarn="${nowarn.numbers}" 
+	   debug="${current.build.debug}" 
+           win32icon="../../../icons/spring.ico"
+	   output="${current.bin.dir}/${project::get-name()}.exe">
+		<!-- doc="${build.dir}/bin/${project::get-name()}.xml" -->
+ 	 <arg line="${compiler.args}"/>
+         <sources failonempty="true">
+            <include name="WindowsService/Gui/**/*.cs" />
+            <include name="../CommonAssemblyInfo.cs" />
+         </sources>
+         <references basedir="${current.bin.dir}">
+            <include name="*.dll"/>
+            <exclude name="${project::get-name()}.dll"/>
+         </references>
+         <resources>
+            <include name="WindowsService/Gui/**/*.resx"/>
+         </resources>
+      </csc>
+   </target>
+    
+</project>
+
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Gui.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Gui.csproj
new file mode 100644
index 00000000..901aa215
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.WindowsService.Gui.csproj
@@ -0,0 +1,164 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{B6EC8215-FE1F-4178-9B92-4B9921DA0A5C}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = "..\..\..\icons\spring32-16.ico"
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Services.WindowsService.Gui"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "WinExe"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring.Services"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = "Spring.Services.WindowsService.Gui.Program"
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Gui\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Gui\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "System.Windows.Forms"
+                    AssemblyName = "System.Windows.Forms"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
+                />
+                <Reference
+                    Name = "System.ServiceProcess"
+                    AssemblyName = "System.ServiceProcess"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.ServiceProcess.dll"
+                />
+                <Reference
+                    Name = "Spring.Services.WindowsService.Common"
+                    Project = "{B8381347-51A1-4850-828C-3170FA93846C}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "System.Runtime.Remoting"
+                    AssemblyName = "System.Runtime.Remoting"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Runtime.Remoting.dll"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Threading"
+                    Project = "{4640D873-95DC-4130-98E2-2B931D390C20}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "Spring.Services.WindowsService.Gui.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "WindowsService\Gui\ConfigurationForm.cs"
+                    SubType = "Form"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Gui\ConfigurationForm.resx"
+                    DependentUpon = "ConfigurationForm.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "WindowsService\Gui\Controller.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Gui\Manager.cs"
+                    SubType = "Form"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Gui\Manager.resx"
+                    DependentUpon = "Manager.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "WindowsService\Gui\TrayMonitor.cs"
+                    SubType = "Form"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Gui\TrayMonitor.resx"
+                    DependentUpon = "TrayMonitor.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.2005.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.2005.csproj
new file mode 100644
index 00000000..791324de
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.2005.csproj
@@ -0,0 +1,119 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{832EB570-71D3-4847-92CA-56E8225576D7}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>..\..\..\icons\spring32-16.ico</ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Services.WindowsService.Installer</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Spring.Services</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>Spring.Services.WindowsService.Installer.ServiceInstaller</StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.WindowsService.Installer\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>Spring.Services.WindowsService.Installer.xml</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.WindowsService.Installer\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Configuration.Install">
+      <Name>System.Configuration.Install</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Runtime.Remoting">
+      <Name>System.Runtime.Remoting</Name>
+    </Reference>
+    <Reference Include="System.ServiceProcess">
+      <Name>System.ServiceProcess</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Services.WindowsService.Installer.build" />
+    <Compile Include="WindowsService\Installer\SvcInstaller.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="Spring.Services.WindowsService.Common.2005.csproj">
+      <Project>{B8381347-51A1-4850-828C-3170FA93846C}</Project>
+      <Name>Spring.Services.WindowsService.Common.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>copy "$(ProjectDir)WindowsService\Process\service-process-definition.xml" "$(TargetDir)"</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.build b/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.build
new file mode 100644
index 00000000..beaa1fab
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.build
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<project name="Spring.Services.WindowsService.Installer" default="build">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+-->
+
+   <target name="build">
+        <csc target="exe" define="${current.build.defines.csc}" 
+             warnaserror="false"
+             debug="${current.build.debug}" 
+             win32icon="../../../icons/spring.ico"
+             output="${current.bin.dir}/${project::get-name()}.exe" 
+             doc="${current.bin.dir}/${project::get-name()}.xml">
+	<arg line="${compiler.args}"/>
+        <nowarn>
+          <warning number="${nowarn.numbers}" />
+        </nowarn>
+         <sources failonempty="true">
+            <include name="WindowsService/Installer/**/*.cs" />
+            <include name="../CommonAssemblyInfo.cs" />
+         </sources>
+         <references basedir="${current.bin.dir}">
+            <include name="*.dll"/>
+            <exclude name="${project::get-name()}.dll"/>
+         </references>
+        </csc>
+   </target>
+    
+</project>
+
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.csproj
new file mode 100644
index 00000000..be617a8c
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.WindowsService.Installer.csproj
@@ -0,0 +1,129 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{36790A24-6817-4A43-AFF6-FA9E0FDEC8D3}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = "..\..\..\icons\spring32-16.ico"
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Services.WindowsService.Installer"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                PreBuildEvent = ""
+                PostBuildEvent = 'copy "$(ProjectDir)WindowsService\Process\service-process-definition.xml" "$(TargetDir)"'
+                RootNamespace = "Spring.Services"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = "Spring.Services.WindowsService.Installer.ServiceInstaller"
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = "Spring.Services.WindowsService.Installer.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Installer\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Installer\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.ServiceProcess"
+                    AssemblyName = "System.ServiceProcess"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.ServiceProcess.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "System.Configuration.Install"
+                    AssemblyName = "System.Configuration.Install"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Configuration.Install.dll"
+                />
+                <Reference
+                    Name = "Spring.Services.WindowsService.Common"
+                    Project = "{B8381347-51A1-4850-828C-3170FA93846C}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "System.Runtime.Remoting"
+                    AssemblyName = "System.Runtime.Remoting"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Runtime.Remoting.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "Spring.Services.WindowsService.Installer.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "WindowsService\Installer\SvcInstaller.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.2005.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.2005.csproj
new file mode 100644
index 00000000..5e323f5d
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.2005.csproj
@@ -0,0 +1,140 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{36790A24-6817-4A43-AFF6-FA9E0FDEC8D3}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>..\..\..\icons\spring32-16.ico</ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Services.WindowsService.Process</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>Spring.Services</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.WindowsService.Process\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>Spring.Services.WindowsService.Process.xml</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.WindowsService.Process\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Configuration.Install">
+      <Name>System.Configuration.Install</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Runtime.Remoting">
+      <Name>System.Runtime.Remoting</Name>
+    </Reference>
+    <Reference Include="System.ServiceProcess">
+      <Name>System.ServiceProcess</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="Spring.Services.WindowsService.Process.build" />
+    <None Include="WindowsService\Process\service-process-definition.xml" />
+    <Content Include="WindowsService\Process\App.ico" />
+    <Compile Include="WindowsService\Process\Service.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WindowsService\Process\ServiceInstaller.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <EmbeddedResource Include="WindowsService\Process\Service.resx">
+      <DependentUpon>Service.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="WindowsService\Process\ServiceInstaller.resx">
+      <DependentUpon>ServiceInstaller.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\sandbox\src\Spring\Spring.Threading\Spring.Threading.2005.csproj">
+      <Project>{4640D873-95DC-4130-98E2-2B931D390C20}</Project>
+      <Name>Spring.Threading.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="Spring.Services.2005.csproj">
+      <Project>{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}</Project>
+      <Name>Spring.Services.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="Spring.Services.WindowsService.Common.2005.csproj">
+      <Project>{B8381347-51A1-4850-828C-3170FA93846C}</Project>
+      <Name>Spring.Services.WindowsService.Common.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>copy "$(ProjectDir)WindowsService\Process\service-process-definition.xml" "$(TargetDir)"</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.build b/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.build
new file mode 100644
index 00000000..e5a11f4d
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.build
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<project name="Spring.Services.WindowsService.Process" default="build">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+-->
+   <target name="build">
+        <csc target="exe" define="${current.build.defines.csc}" 
+             warnaserror="false"
+             debug="${current.build.debug}" 
+             win32icon="../../../icons/spring.ico"
+             output="${current.bin.dir}/${project::get-name()}.exe" 
+             doc="${current.bin.dir}/${project::get-name()}.xml">
+	<arg line="${compiler.args}"/>
+        <nowarn>
+          <warning number="${nowarn.numbers}" />
+        </nowarn>
+         <sources failonempty="true">
+            <include name="WindowsService/Process/**/*.cs" />
+            <include name="../CommonAssemblyInfo.cs" />
+         </sources>
+         <references basedir="${current.bin.dir}">
+            <include name="*.dll"/>
+            <exclude name="${project::get-name()}.dll"/>
+         </references>
+        </csc>
+        <copy todir="${current.bin.dir}" overwrite="true">
+          <fileset basedir="WindowsService/Process">
+            <include name="service-process-definition.xml"/>
+          </fileset>
+        </copy>
+        <copy tofile="${current.bin.dir}/${project::get-name()}.exe.config" 
+            file="App.config" overwrite="true">
+        </copy>
+   </target>
+    
+</project>
+
diff --git a/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.csproj b/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.csproj
new file mode 100644
index 00000000..836014b7
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.WindowsService.Process.csproj
@@ -0,0 +1,166 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{36790A24-6817-4A43-AFF6-FA9E0FDEC8D3}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = "..\..\..\icons\spring32-16.ico"
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Services.WindowsService.Process"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "WinExe"
+                PreBuildEvent = ""
+                PostBuildEvent = 'copy "$(ProjectDir)WindowsService\Process\service-process-definition.xml" "$(TargetDir)"'
+                RootNamespace = "Spring.Services"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = "Spring.Services.WindowsService.Process.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Process\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Process\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.ServiceProcess"
+                    AssemblyName = "System.ServiceProcess"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.ServiceProcess.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "System.Configuration.Install"
+                    AssemblyName = "System.Configuration.Install"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Configuration.Install.dll"
+                />
+                <Reference
+                    Name = "Spring.Services.WindowsService.Common"
+                    Project = "{B8381347-51A1-4850-828C-3170FA93846C}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "System.Runtime.Remoting"
+                    AssemblyName = "System.Runtime.Remoting"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Runtime.Remoting.dll"
+                />
+                <Reference
+                    Name = "Spring.Threading"
+                    Project = "{4640D873-95DC-4130-98E2-2B931D390C20}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Services.2003"
+                    Project = "{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "App.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Spring.Services.WindowsService.Process.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "WindowsService\Process\App.ico"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "WindowsService\Process\Service.cs"
+                    SubType = "Component"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Process\Service.resx"
+                    DependentUpon = "Service.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "WindowsService\Process\ServiceInstaller.cs"
+                    SubType = "Component"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Process\ServiceInstaller.resx"
+                    DependentUpon = "ServiceInstaller.cs"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "WindowsService\Process\service-process-definition.xml"
+                    BuildAction = "None"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Services/Spring.Services.build b/src/Spring/Spring.Services/Spring.Services.build
new file mode 100644
index 00000000..53ffbe1f
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.build
@@ -0,0 +1,47 @@
+<?xml version="1.0" ?>
+<project name="Spring.Services" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+  <!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+-->
+  <target name="build">
+    
+    <!-- TO REMOVE : for .NET 3.0 build -->
+    <!--<property if="${net-2.0}" name="current.build.defines.csc" value="${current.build.defines.csc},NET_3_0" />-->
+
+    <!-- build Spring.Services -->
+    <csc target="library" define="${current.build.defines.csc}"
+		     warnaserror="true"
+		     debug="${current.build.debug}"
+                     output="${current.bin.dir}/${project::get-name()}.dll"
+                     doc="${current.bin.dir}/${project::get-name()}.xml"
+		     >
+      <arg line="${compiler.args}"/>
+      <nowarn>
+        <warning number="${nowarn.numbers}" />
+      </nowarn>
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+        <include name="../GenCommonAssemblyInfo.cs" />
+        <exclude name="**/WindowsService/**" />
+      </sources>
+      <resources prefix="Spring" dynamicprefix="true" failonempty="true">
+        <include name="**/*.keys" />
+        <include name="**/*.xsd" />
+        <exclude name="**/obj/**" />
+      </resources>
+      <references basedir="${current.bin.dir}">
+        <include name="Common.Logging.dll"/>
+        <include name="Spring.Core.dll" />
+        <include name="Spring.Aop.dll" />
+        <include name="Spring.Web.dll" />
+
+        <!-- TO REMOVE : for .NET 3.0 build -->
+        <!--<include if="${net-2.0}" name="C:\Program Files\Reference Assemblies\Microsoft\Framework\v3.0\System.ServiceModel.dll" />-->
+        
+      </references>
+    </csc>
+  </target>
+</project>
diff --git a/src/Spring/Spring.Services/Spring.Services.xml b/src/Spring/Spring.Services/Spring.Services.xml
new file mode 100644
index 00000000..2aa5d087
--- /dev/null
+++ b/src/Spring/Spring.Services/Spring.Services.xml
@@ -0,0 +1,1275 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Spring.Services</name>
+    </assembly>
+    <members>
+        <member name="T:Spring.Web.Services.WebServiceProxyFactory">
+            <summary>
+            Factory Object that dynamically implements service interface for web service.
+            </summary>
+            <remarks>
+            <p>
+            This factory object should be used to obtain reference to a web service
+            that can be safely cast to a service interface, which allows client code to code 
+            against interface, and not directly against the web service.
+            </p>
+            <p>
+            The WSDL contract needs to conform to WS-I Basic Profiles.
+            </p>
+            </remarks>
+            <author>Bruno Baia</author>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: WebServiceProxyFactory.cs,v 1.33 2008/02/24 19:10:12 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Web.Services.WebServiceProxyFactory.proxyConstructor">
+            <summary>
+            The web service proxy default constructor.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.#ctor">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Web.Services.WebServiceProxyFactory"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.GetObject">
+            <summary>
+            Creates new instance of the web service proxy.
+            </summary>
+            <returns>New instance of the web service proxy.</returns>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.AfterPropertiesSet">
+            <summary>
+            Initializes factory object.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.ValidateConfiguration">
+            <summary>
+            Validates the configuration.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.GenerateProxy">
+            <summary>
+            Generates the web service proxy type.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.GetWsDocuments(Spring.Core.IO.IResource)">
+            <summary>
+            Gets XML Web Services documents from a Spring resource.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.ClientProtocolType">
+            <summary>
+            Gets or sets the base type that web service proxy should inherit.
+            </summary>
+            <remarks>
+            Default is <see cref="T:System.Web.Services.Protocols.SoapHttpClientProtocol"/>
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.WebServiceProxyBaseType">
+            <summary>
+            Gets or sets the base type that web service proxy should inherit.
+            </summary>
+            <remarks>
+            Default is <see cref="T:System.Web.Services.Protocols.SoapHttpClientProtocol"/>
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.ServiceUri">
+            <summary>
+            Gets or sets the URI for an <see cref="T:Spring.Core.IO.IResource"/> 
+            that contains the web service description (WSDL).
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.ProxyType">
+            <summary>
+            Gets or sets type of the proxy class to wrap.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.ServiceInterface">
+            <summary>
+            Gets or sets service interface that proxy should implement.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.Credential">
+            <summary>
+            Gets or sets the <see cref="T:System.Net.NetworkCredential"/> instance 
+            to use when connecting to a server that requires authentication.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.ProxyUrl">
+            <summary>
+            Gets or sets the url of the proxy server to use for retrieving the WSDL.
+            </summary>
+            <remarks>
+            <p>
+            This only applies when using an <see cref="T:Spring.Core.IO.UrlResource"/> as uri.
+            </p>
+            <p>
+            The default is to use the system proxy setting.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.ProxyCredential">
+            <summary>
+            Gets or sets the <see cref="T:System.Net.NetworkCredential"/> instance 
+            to use when connecting to a proxy server that requires authentication.
+            </summary>
+            <remarks>
+            <p>
+            This only applies when using an <see cref="T:Spring.Core.IO.UrlResource"/> as uri.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.BindingName">
+            <summary>
+            Gets or sets the web service binding name to use for the proxy.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.TypeAttributes">
+            <summary>
+            Gets or sets a list of custom attributes 
+            that should be applied to a proxy class.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.MemberAttributes">
+            <summary>
+            Gets or sets a dictionary of custom attributes 
+            that should be applied to web service members.
+            </summary>
+            <remarks>
+            Dictionary key is an expression that members can be matched against. 
+            Value is a list of attributes that should be applied 
+            to each member that matches expression.
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.ObjectType">
+            <summary>
+            Returns type of the web service proxy.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.IsSingleton">
+            <summary>
+            Always returns false.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceProxyFactory.ProductTemplate">
+            <summary>
+            Gets or sets the template object definition 
+            that should be used to configure proxy instance.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder">
+            <summary>
+            Proxy type builder that can be used to create a proxy for 
+            <see cref="T:System.Web.Services.Protocols.SoapHttpClientProtocol"/> derived classes.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.#ctor(Spring.Core.IO.IResource,System.Web.Services.Discovery.DiscoveryClientDocumentCollection,System.String)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder"/> class.
+            </summary>
+            <param name="serviceUri">The URI that contains the Web Service meta info (WSDL).</param>
+            <param name="wsDocuments">The XML Web Service documents to use to create the proxy.</param>
+            <param name="bindingName">The name of the Web Service binding to use.</param>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.BuildProxyType">
+            <summary>
+            Creates the proxy type.
+            </summary>
+            <returns>The generated proxy class.</returns>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.PushTarget(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the target instance on which calls should be delegated to.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.ImplementConstructors(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements constructors for the proxy class.
+            </summary>
+            <param name="builder">
+            The <see cref="T:System.Reflection.Emit.TypeBuilder"/> to use.
+            </param>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.GetWsBinding(System.Web.Services.Description.ServiceDescriptionCollection,System.String)">
+            <summary>
+            Search and returns the binding for the specified name.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.GetWsUrl(System.Web.Services.Description.ServiceDescriptionCollection,System.Web.Services.Description.Binding)">
+            <summary>
+            Search and returns the url for the specified binding.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.GetOperation(System.Web.Services.Description.ServiceDescriptionCollection,System.Web.Services.Description.Binding,System.Reflection.MethodInfo)">
+            <summary>
+            Search and returns the operation that matches the specified method.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.GetOperationBinding(System.Web.Services.Description.Operation,System.Web.Services.Description.Binding)">
+            <summary>
+            Search and returns the OperationBinding that matches the specified Operation.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.GetMembersMapping(System.String,System.Web.Services.Description.MessagePartCollection,System.Web.Services.Description.SoapBodyBinding,System.Web.Services.Description.SoapBindingStyle)">
+            <summary>
+            Search and returns the type mapping between method parameters/return value 
+            and the element parts of a literal-use SOAP message.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.CreateWebServiceBindingAttribute(System.Web.Services.Description.Binding)">
+            <summary>
+            Creates a <see cref="T:System.Web.Services.WebServiceBindingAttribute"/> that should be applied to proxy type.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.CreateSoapMethodAttribute(System.Web.Services.Description.Operation,System.Web.Services.Description.OperationBinding,System.Web.Services.Description.SoapOperationBinding,System.Xml.Serialization.XmlMembersMapping,System.Xml.Serialization.XmlMembersMapping)">
+            <summary>
+            Creates a <see cref="T:System.Web.Services.Protocols.SoapDocumentMethodAttribute"/> or a <see cref="T:System.Web.Services.Protocols.SoapRpcMethodAttribute"/>
+            that should be applied to proxy method.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.SoapHttpClientProxyMethodBuilder">
+            <summary>
+            Proxy method builder that can be used to create a proxy method 
+            for web services operation invocation.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.SoapHttpClientProxyMethodBuilder.#ctor(System.Reflection.Emit.TypeBuilder,Spring.Proxy.IProxyTypeGenerator)">
+            <summary>
+            Creates a new instance of the method builder.
+            </summary>
+            <param name="typeBuilder">The type builder to use.</param>
+            <param name="proxyGenerator">
+            The <see cref="T:Spring.Proxy.IProxyTypeGenerator"/> implementation to use.
+            </param>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.SoapHttpClientProxyTypeBuilder.SoapHttpClientProxyMethodBuilder.GenerateMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Generates the proxy method.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+            <param name="method">The method to proxy.</param>
+            <param name="interfaceMethod">
+            The interface definition of the method, if applicable.
+            </param>
+        </member>
+        <member name="T:Spring.Web.Services.WebServiceProxyFactory.WebServiceProxyProxyTypeBuilder">
+            <summary>
+            Proxy type builder that can be used to create a proxy for 
+            .Net-generated proxy class that can be safely cast to a service interface.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.WebServiceProxyProxyTypeBuilder.#ctor">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Web.Services.WebServiceProxyFactory.WebServiceProxyProxyTypeBuilder"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceProxyFactory.WebServiceProxyProxyTypeBuilder.GetInterfaceMapping(System.Type,System.Type)">
+            <summary>
+            Gets the mapping of the interface to proxy 
+            into the actual methods on the target type 
+            that does not need to implement that interface.
+            </summary>
+            <remarks>
+            <p>
+            As the proxy type does not implement the interface, 
+            we try to find matching methods.
+            </p>
+            </remarks>
+            <param name="targetType">
+            The <see cref="T:System.Type"/> of the target object.
+            </param>
+            <param name="intf">The interface to implement.</param>
+            <returns>
+            An interface mapping for the interface to proxy.
+            </returns>
+        </member>
+        <member name="T:Spring.Remoting.Support.ConfigurableLifetime">
+            <summary>
+            Configurable implementation of the <see cref="T:Spring.Remoting.Support.ILifetime"/> interface.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: ConfigurableLifetime.cs,v 1.1 2006/09/13 20:20:16 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Remoting.Support.ILifetime">
+            <summary>
+            Defines lifetime's properties of remote objects that is used by Spring.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: ILifetime.cs,v 1.1 2006/09/13 20:20:16 bbaia Exp $</version>
+        </member>
+        <member name="P:Spring.Remoting.Support.ILifetime.Infinite">
+            <summary>
+            Gets or sets a value indicating whether this instance has infinite lifetime.
+            </summary>
+            <value>
+            <c>true</c> if this instance has infinite lifetime; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Remoting.Support.ILifetime.InitialLeaseTime">
+            <summary>
+            Gets the initial lease time.
+            </summary>
+            <value>The initial lease time.</value>
+        </member>
+        <member name="P:Spring.Remoting.Support.ILifetime.RenewOnCallTime">
+            <summary>
+            Gets the amount of time lease 
+            should be extended for on each call to this object.
+            </summary>
+            <value>The amount of time lease should be 
+            extended for on each call to this object.</value>
+        </member>
+        <member name="P:Spring.Remoting.Support.ILifetime.SponsorshipTimeout">
+            <summary>
+            Gets the amount of time lease manager 
+            will for this object's sponsors to respond.
+            </summary>
+            <value>The amount of time lease manager will for this object's
+            sponsors to respond.</value>
+        </member>
+        <member name="P:Spring.Remoting.Support.ConfigurableLifetime.Infinite">
+            <summary>
+            Gets or sets a value indicating whether this instance has infinite lifetime.
+            </summary>
+            <value>
+            <c>true</c> if this instance has infinite lifetime; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="P:Spring.Remoting.Support.ConfigurableLifetime.InitialLeaseTime">
+            <summary>
+            Gets or sets the initial lease time.
+            </summary>
+            <value>The initial lease time.</value>
+        </member>
+        <member name="P:Spring.Remoting.Support.ConfigurableLifetime.RenewOnCallTime">
+            <summary>
+            Gets or sets the amount of time lease 
+            should be extended for on each call to this object.
+            </summary>
+            <value>The amount of time lease should be 
+            extended for on each call to this object.</value>
+        </member>
+        <member name="P:Spring.Remoting.Support.ConfigurableLifetime.SponsorshipTimeout">
+            <summary>
+            Gets or sets the amount of time lease manager  
+            will for this object's sponsors to respond.
+            </summary>
+            <value>The amount of time lease manager will for this object's
+            sponsors to respond.</value>
+        </member>
+        <member name="T:Spring.Remoting.SaoFactoryObject">
+            <summary>
+            Factory for creating a reference to a 
+            remote server activated object (SAO).
+            </summary>
+            <remarks>
+            This is useful alternative to adminstrative type registration on
+            the client when you would like the client to have only 
+            a reference to the interface that an SAO implements and not the
+            actual SAO implentation. 
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <author>Mark Pollack</author>
+            <author>Bruno Baia</author>
+            <version>$Id: SaoFactoryObject.cs,v 1.7 2006/05/17 17:45:39 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Remoting.SaoFactoryObject.#ctor">
+            <summary>
+            Creates a new instance of the SaoFactoryObject class.
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.SaoFactoryObject.AfterPropertiesSet">
+            <summary>
+            Callback method called once all factory properties have been set.
+            </summary>
+            <exception cref="T:System.Exception">if an error occured</exception>
+        </member>
+        <member name="M:Spring.Remoting.SaoFactoryObject.GetObject">
+            <summary>
+            Return the SAO proxy.
+            </summary>
+            <returns>the SAO proxy</returns>
+        </member>
+        <member name="P:Spring.Remoting.SaoFactoryObject.ServiceInterface">
+            <summary>
+            The remote service interface.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.SaoFactoryObject.ServiceUrl">
+            <summary>
+            The URI of the well known object
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.SaoFactoryObject.IsSingleton">
+            <summary>
+            Is the object managed by this factory a singleton or a prototype?
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.SaoFactoryObject.ObjectType">
+            <summary>
+            The type of object to be created.
+            </summary>
+        </member>
+        <member name="T:Spring.EnterpriseServices.EnterpriseServicesExporter">
+            <summary>
+            Exports specified components as ServicedComponents.
+            </summary>
+            <remarks>
+            <p>
+            This class will create ServicedComponent wrapper for each of the
+            specified components and register them with the Component Services.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: EnterpriseServicesExporter.cs,v 1.6 2007/05/16 10:03:24 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.EnterpriseServices.EnterpriseServicesExporter.#ctor">
+            <summary>
+            Creates new enterprise services exporter.
+            </summary>
+        </member>
+        <member name="M:Spring.EnterpriseServices.EnterpriseServicesExporter.AfterPropertiesSet">
+            <summary>
+            Called by Spring container after object is configured in order to initialize it.
+            </summary>
+        </member>
+        <member name="M:Spring.EnterpriseServices.EnterpriseServicesExporter.Export">
+            <summary>
+            Creates ServicedComponent wrappers for the specified components and registers
+            them with COM+ Component Services.
+            </summary>
+        </member>
+        <member name="M:Spring.EnterpriseServices.EnterpriseServicesExporter.GetKeyPair">
+            <summary>
+            Reads key pair from embedded resource.
+            </summary>
+            <returns>Key pair as a byte array.</returns>
+        </member>
+        <member name="M:Spring.EnterpriseServices.EnterpriseServicesExporter.ApplyAssemblyAttributes(System.Reflection.Emit.AssemblyBuilder)">
+            <summary>
+            Applies custom attributes to generated assembly.
+            </summary>
+            <param name="assembly">Dynamic assembly to apply attributes to.</param>
+        </member>
+        <member name="M:Spring.EnterpriseServices.EnterpriseServicesExporter.RefreshRoles">
+            <summary>
+            Replaces roles expressed using string with appropriate SecurityRoleAttribute instance.
+            </summary>
+        </member>
+        <member name="M:Spring.EnterpriseServices.EnterpriseServicesExporter.ParseRole(System.String)">
+            <summary>
+            Parses string representation of SecurityRoleAttribute.
+            </summary>
+            <param name="roleString">Role definition string.</param>
+            <returns>Configured SecurityRoleAttribute instance.</returns>
+        </member>
+        <member name="P:Spring.EnterpriseServices.EnterpriseServicesExporter.Components">
+            <summary>
+            Gets or sets list of components to export.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.EnterpriseServicesExporter.ApplicationName">
+            <summary>
+            Gets or sets COM+ application name.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.EnterpriseServicesExporter.ApplicationId">
+            <summary>
+            Gets or sets application identifier (GUID). Defaults to generated GUID if not specified.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.EnterpriseServicesExporter.ActivationMode">
+            <summary>
+            Gets or sets application activation mode, which can be either <b>Server</b> or <b>Library</b> (default).
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.EnterpriseServicesExporter.Description">
+            <summary>
+            Gets or sets application description.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.EnterpriseServicesExporter.AccessControl">
+            <summary>
+            Gets or sets access control attribute.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.EnterpriseServicesExporter.ApplicationQueuing">
+            <summary>
+            Gets or sets application queuing attribute.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.EnterpriseServicesExporter.Roles">
+            <summary>
+            Gets or sets application roles.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.EnterpriseServicesExporter.Assembly">
+            <summary>
+            Gets or sets name of the generated assembly that will contain serviced components.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.EnterpriseServicesExporter.ObjectFactory">
+            <summary>
+            Sets object factory instance.
+            </summary>
+        </member>
+        <member name="T:Spring.Remoting.Config.RemotingNamespaceParser">
+            <summary>
+            Implementation of the custom configuration parser for remoting definitions.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: RemotingNamespaceParser.cs,v 1.3 2007/10/08 14:57:34 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Remoting.Config.RemotingNamespaceParser.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Remoting.Config.RemotingNamespaceParser"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.Config.RemotingNamespaceParser.ParseElement(System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parse the specified element and register any resulting
+            IObjectDefinitions with the IObjectDefinitionRegistry that is
+            embedded in the supplied ParserContext.
+            </summary>
+            <param name="element">The element to be parsed into one or more IObjectDefinitions</param>
+            <param name="parserContext">The object encapsulating the current state of the parsing
+            process.</param>
+            <returns>
+            The primary IObjectDefinition (can be null as explained above)
+            </returns>
+            <remarks>
+            Implementations should return the primary IObjectDefinition
+            that results from the parse phase if they wish to used nested
+            inside (for example) a <code>&lt;property&gt;</code> tag.
+            <para>Implementations may return null if they will not
+            be used in a nested scenario.
+            </para>
+            </remarks>
+        </member>
+        <member name="M:Spring.Remoting.Config.RemotingNamespaceParser.ParseRemotingDefinition(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parses remoting definitions.
+            </summary>
+            <param name="element">Validator XML element.</param>
+            <param name="name">The name of the object definition.</param>
+            <param name="parserContext">The parser context.</param>
+            <returns>A remoting object definition.</returns>
+        </member>
+        <member name="M:Spring.Remoting.Config.RemotingNamespaceParser.ParseRemotingConfigurer(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parses the RemotingConfigurer definition.
+            </summary>
+            <param name="element">The element to parse.</param>
+            <param name="name">The name of the object definition.</param>
+            <param name="parserContext">The parser context.</param>
+            <returns>RemotingConfigurer object definition.</returns>
+        </member>
+        <member name="M:Spring.Remoting.Config.RemotingNamespaceParser.ParseSaoFactoryObject(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parses the SaoFactoryObject definition.
+            </summary>
+            <param name="element">The element to parse.</param>
+            <param name="name">The name of the object definition.</param>
+            <param name="parserContext">The parser context.</param>
+            <returns>SaoFactoryObject object definition.</returns>
+        </member>
+        <member name="M:Spring.Remoting.Config.RemotingNamespaceParser.ParseCaoFactoryObject(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parses the CaoFactoryObject definition.
+            </summary>
+            <param name="element">The element to parse.</param>
+            <param name="name">The name of the object definition.</param>
+            <param name="parserContext">The parser context.</param>
+            <returns>CaoFactoryObject object definition.</returns>
+        </member>
+        <member name="M:Spring.Remoting.Config.RemotingNamespaceParser.ParseRemoteObjectFactory(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parses the RemoteObjectFactory definition.
+            </summary>
+            <param name="element">The element to parse.</param>
+            <param name="name">The name of the object definition.</param>
+            <param name="parserContext">The parser context.</param>
+            <returns>RemoteObjectFactory object definition.</returns>
+        </member>
+        <member name="M:Spring.Remoting.Config.RemotingNamespaceParser.ParseSaoExporter(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parses the SaoExporter definition.
+            </summary>
+            <param name="element">The element to parse.</param>
+            <param name="name">The name of the object definition.</param>
+            <param name="parserContext">The parser context.</param>
+            <returns>SaoExporter object definition.</returns>
+        </member>
+        <member name="M:Spring.Remoting.Config.RemotingNamespaceParser.ParseCaoExporter(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parses the CaoExporter definition.
+            </summary>
+            <param name="element">The element to parse.</param>
+            <param name="name">The name of the object definition.</param>
+            <param name="parserContext">The parser context.</param>
+            <returns>CaoExporter object definition.</returns>
+        </member>
+        <member name="M:Spring.Remoting.Config.RemotingNamespaceParser.ParseLifeTime(Spring.Objects.MutablePropertyValues,System.Xml.XmlElement,Spring.Objects.Factory.Xml.ParserContext)">
+            <summary>
+            Parses the LifeTime definition.
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.Config.RemotingNamespaceParser.GetTypeName(System.Xml.XmlElement)">
+            <summary>
+            Gets the name of the object type for the specified element.
+            </summary>
+            <param name="element">The element.</param>
+            <returns>The name of the object type.</returns>
+        </member>
+        <member name="T:Spring.Remoting.RemotingConfigurer">
+            <summary>
+            Convenience class to configure remoting infrastructure from the IoC container.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: RemotingConfigurer.cs,v 1.7 2007/10/08 14:57:34 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Remoting.RemotingConfigurer.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Remoting.RemotingConfigurer"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.RemotingConfigurer.PostProcessObjectFactory(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)">
+            <summary>
+            Modify the application context's internal object factory after its
+            standard initialization.
+            </summary>
+            <param name="factory">
+            The object factory used by the application context.
+            </param>
+            <seealso cref="M:Spring.Objects.Factory.Config.IObjectFactoryPostProcessor.PostProcessObjectFactory(Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)"/>
+        </member>
+        <member name="P:Spring.Remoting.RemotingConfigurer.Filename">
+            <summary>
+            Gets or sets the name of the remoting configuration file.
+            </summary>
+            <remarks>
+            If filename is <see langword="null"/> or not set, 
+            current AppDomain's configuration file will be used.
+            </remarks>
+        </member>
+        <member name="P:Spring.Remoting.RemotingConfigurer.UseConfigFile">
+            <summary>
+            Indicates whether a configuration file is used.
+            Default value is <see langword="true"/>.
+            </summary>
+            <remarks>
+            If <see langword="false"/>, default remoting configuration will be used.
+            </remarks>
+        </member>
+        <member name="P:Spring.Remoting.RemotingConfigurer.EnsureSecurity">
+            <summary>
+            Gets or sets if security is enabled.
+            </summary>
+            <remarks>
+            This property is only available since .NET Framework 2.0.
+            </remarks>
+        </member>
+        <member name="P:Spring.Remoting.RemotingConfigurer.Order">
+            <summary>
+            Return the order value of this object, 
+            where a higher value means greater in terms of sorting.
+            </summary>
+        </member>
+        <member name="T:Spring.Remoting.Support.BaseRemoteObject">
+            <summary>
+            This class extends <see cref="T:System.MarshalByRefObject"/> to allow users
+            to define object lifecycle details by simply setting its properties.
+            </summary>
+            <remarks>
+            <p>
+            Remoting exporters uses this class as a base proxy class
+            in order to support lifecycle configuration when exporting 
+            a remote object.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: BaseRemoteObject.cs,v 1.1 2006/09/13 20:20:16 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Remoting.Support.BaseRemoteObject.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Remoting.Support.BaseRemoteObject"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.Support.BaseRemoteObject.InitializeLifetimeService">
+            <summary>
+            Obtains a lifetime service object to control the lifetime policy for this instance.
+            </summary>
+            <remarks>
+            <p>
+            This method uses property values to configure <see cref="T:System.Runtime.Remoting.Lifetime.ILease"/> for this object.
+            </p>
+            <p>
+            It is very much inspired by Ingo Rammer's example in Chapter 6 of "Advanced .NET Remoting",
+            but is modified slightly to make it more "Spring-friendly". Basically, the main difference is that
+            instead of pulling lease configuration from the .NET config file, this implementation relies
+            on Spring DI to get appropriate values injected, which makes it much more flexible.
+            </p>
+            </remarks>
+            <returns>
+            An object of type <see cref="T:System.Runtime.Remoting.Lifetime.ILease"/> used to control the
+            lifetime policy for this instance. This is the current lifetime service object for
+            this instance if one exists; otherwise, a new lifetime service object initialized to the value
+            of the <see cref="P:System.Runtime.Remoting.Lifetime.LifetimeServices.LeaseManagerPollTime" qualify="true"/> property.
+            </returns>
+            <exception cref="T:System.Security.SecurityException">The immediate caller does not have infrastructure permission. </exception>
+        </member>
+        <member name="P:Spring.Remoting.Support.BaseRemoteObject.IsInfinite">
+            <summary>
+            Gets or sets a value indicating whether this instance has infinite lifetime.
+            </summary>
+            <value>
+            <see langword="true"/> if this instance has infinite lifetime; 
+            otherwise, <see langword="false" /> .
+            </value>
+        </member>
+        <member name="P:Spring.Remoting.Support.BaseRemoteObject.InitialLeaseTime">
+            <summary>
+            Gets or sets the initial lease time.
+            </summary>
+            <value>The initial lease time.</value>
+        </member>
+        <member name="P:Spring.Remoting.Support.BaseRemoteObject.RenewOnCallTime">
+            <summary>
+            Gets or sets the amount of time lease should be 
+            extended for on each call to this object.
+            </summary>
+            <value>The amount of time lease should be 
+            extended for on each call to this object.</value>
+        </member>
+        <member name="P:Spring.Remoting.Support.BaseRemoteObject.SponsorshipTimeout">
+            <summary>
+            Gets or sets the amount of time lease manager will for this object's
+            sponsors to respond.
+            </summary>
+            <value>The amount of time lease manager will for this object's
+            sponsors to respond.</value>
+        </member>
+        <member name="T:Spring.Remoting.Support.RemoteObjectProxyTypeBuilder">
+            <summary>
+            Builds a proxy type based on <see cref="T:Spring.Remoting.Support.BaseRemoteObject"/> to wrap a target object 
+            that is intended to be remotable.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: RemoteObjectProxyTypeBuilder.cs,v 1.3 2006/11/12 01:37:47 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Remoting.Support.RemoteObjectProxyTypeBuilder.#ctor(Spring.Remoting.Support.ILifetime)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Remoting.Support.RemoteObjectProxyTypeBuilder"/> class.
+            </summary>
+            <param name="lifetime">
+            The lifetime properties to be applied to the target object.
+            </param>
+        </member>
+        <member name="M:Spring.Remoting.Support.RemoteObjectProxyTypeBuilder.BuildProxyType">
+            <summary>
+            Creates a remotable proxy type based on <see cref="T:Spring.Remoting.Support.BaseRemoteObject"/>.
+            </summary>
+            <returns>The generated proxy class.</returns>
+            <exception cref="T:System.ArgumentException">
+            If the <see cref="P:Spring.Proxy.IProxyTypeBuilder.BaseType"/> is not
+            an instance of <see cref="T:Spring.Remoting.Support.BaseRemoteObject"/>.
+            </exception>
+        </member>
+        <member name="M:Spring.Remoting.Support.RemoteObjectProxyTypeBuilder.ImplementConstructors(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements constructors for the proxy class.
+            </summary>
+            <param name="builder">
+            The <see cref="T:System.Reflection.Emit.TypeBuilder"/> to use.
+            </param>
+        </member>
+        <member name="M:Spring.Remoting.Support.RemoteObjectProxyTypeBuilder.GenerateRemoteObjectLifetimeInitialization(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generate initialization code for <see cref="T:Spring.Remoting.Support.BaseRemoteObject"/>'s lifetime properties.
+            </summary>
+            <param name="il">ILGenerator</param>
+        </member>
+        <member name="T:Spring.Remoting.Support.ICaoRemoteFactory">
+            <summary>
+            Interface for a CAO based object factory.
+            </summary>
+            <remarks>
+            <p>
+            Provides a well known location for clients to retrieve
+            references to CAO references.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <author>Mark Pollack</author>
+            <author>Bruno Baia</author>
+            <version>$Id: ICaoRemoteFactory.cs,v 1.1 2006/09/13 20:20:16 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Remoting.Support.ICaoRemoteFactory.GetObject">
+            <summary>
+            Returns the CAO proxy.
+            </summary>
+            <returns>The remote object.</returns>
+        </member>
+        <member name="M:Spring.Remoting.Support.ICaoRemoteFactory.GetObject(System.Object[])">
+            <summary>
+            Returns the CAO proxy using the
+            argument list to call the constructor. 
+            </summary>
+            <remarks>
+            The matching of arguments to call the constructor is done
+            by type. The alternative ways, by index and by constructor
+            name are not supported.
+            </remarks>
+            <param name="constructorArguments">Constructor 
+            arguments used to create the object.</param>
+            <returns>The remote object.</returns>
+        </member>
+        <member name="T:Spring.Remoting.SaoExporter">
+            <summary>
+            Publishes an instance of an object under
+            a given url as a Server Activated Object (SAO).
+            </summary>
+            <remarks>
+            Object can be exported either as SingleCall or Singleton.
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <author>Mark Pollack</author>
+            <author>Bruno Baia</author>
+            <version>$Id: SaoExporter.cs,v 1.18 2007/07/31 18:18:19 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Remoting.SaoExporter.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Remoting.SaoExporter"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.SaoExporter.AfterPropertiesSet">
+            <summary>
+            Publish the object 
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.SaoExporter.Dispose">
+            <summary>
+            Disconnect the remote object from the registered remoting channels.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.SaoExporter.TargetName">
+            <summary>
+            Gets or sets the name of the target object definition.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.SaoExporter.ApplicationName">
+            <summary>
+            Gets or sets the name of the remote application.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.SaoExporter.ServiceName">
+            <summary>
+            Gets or sets the name of the exported remote service.
+            <remarks>
+            The name that will be used in the URI to refer to this service.
+            This will be of the form, tcp://host:port/ServiceName or
+            tcp://host:port/ApplicationName/ServiceName
+            </remarks>
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.SaoExporter.Interfaces">
+            <summary>
+            Gets or sets the list of interfaces whose methods should be exported.
+            </summary>
+            <remarks>
+            The default value of this property is all the interfaces 
+            implemented or inherited by the target type.
+            </remarks>
+            <value>The interfaces to export.</value>
+        </member>
+        <member name="P:Spring.Remoting.SaoExporter.ApplicationContext">
+            <summary>
+            Gets or sets the <see cref="T:Spring.Context.IApplicationContext"/> that this
+            object runs in.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.SaoExporter.ObjectFactory">
+            <summary>
+            Sets object factory to use.
+            </summary>
+        </member>
+        <member name="T:Spring.Remoting.SaoExporter.SaoRemoteObjectProxyTypeBuilder">
+            <summary>
+            Builds a proxy type based on <see cref="T:Spring.Remoting.Support.BaseRemoteObject"/> to wrap a target object 
+            that is intended to be remotable.
+            </summary>
+            <remarks>
+            The wrapped target object is retrieved by name from the IoC container.
+            </remarks>
+        </member>
+        <member name="M:Spring.Remoting.SaoExporter.SaoRemoteObjectProxyTypeBuilder.#ctor(System.String,System.String,Spring.Remoting.Support.ILifetime)">
+            <summary>
+            Creates a new instance of the 
+            <see cref="T:Spring.Remoting.SaoExporter.SaoRemoteObjectProxyTypeBuilder"/> class.
+            </summary>
+            <param name="contextName">
+            The name of the target object definition.
+            </param>
+            <param name="targetObjectName">
+            The name of the application context that this object runs in.
+            </param>
+            <param name="lifetime">
+            The lifetime properties to be applied to the target object.
+            </param>
+        </member>
+        <member name="M:Spring.Remoting.SaoExporter.SaoRemoteObjectProxyTypeBuilder.PushTarget(System.Reflection.Emit.ILGenerator)">
+            <summary>
+            Generates the IL instructions that pushes 
+            the target instance on which calls should be delegated to.
+            </summary>
+            <param name="il">The IL generator to use.</param>
+        </member>
+        <member name="M:Spring.Remoting.SaoExporter.SaoRemoteObjectProxyTypeBuilder.ImplementConstructors(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements constructors for the proxy class.
+            </summary>
+            <param name="builder">
+            The <see cref="T:System.Reflection.Emit.TypeBuilder"/> to use.
+            </param>
+        </member>
+        <member name="M:Spring.Remoting.SaoExporter.SaoRemoteObjectProxyTypeBuilder.DeclareTargetInstanceField(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Deaclares a field that holds the target object instance.
+            </summary>
+            <param name="builder">
+            The <see cref="T:System.Type"/> builder to use for code generation.
+            </param>
+        </member>
+        <member name="T:Spring.Remoting.CaoFactoryObject">
+            <summary>
+            Factory for creating a reference to a 
+            client activated object (CAO).
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Mark Pollack</author>
+            <author>Bruno Baia</author>
+            <version>$Id: CaoFactoryObject.cs,v 1.4 2006/09/13 20:20:14 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Remoting.CaoFactoryObject.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Remoting.CaoFactoryObject"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.CaoFactoryObject.AfterPropertiesSet">
+            <summary>
+            Callback method called once all factory properties have been set.
+            </summary>
+            <exception cref="T:System.Exception">if an error occured</exception>
+        </member>
+        <member name="M:Spring.Remoting.CaoFactoryObject.GetObject">
+            <summary>
+            Return the CAO proxy.
+            </summary>
+            <returns>the CAO proxy</returns>
+        </member>
+        <member name="P:Spring.Remoting.CaoFactoryObject.RemoteTargetName">
+            <summary>
+            The remote target name to activate.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.CaoFactoryObject.ServiceUrl">
+            <summary>
+            The Uri of the remote type.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.CaoFactoryObject.ConstructorArguments">
+            <summary>
+            Argument list used to call the CAO constructor.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.CaoFactoryObject.IsSingleton">
+            <summary>
+            Always return false.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.CaoFactoryObject.ObjectType">
+            <summary>
+            The type of object to be created.
+            </summary>
+        </member>
+        <member name="T:Spring.Remoting.CaoExporter">
+            <summary>
+            Registers an object type on the server
+            as a Client Activated Object (CAO).
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Mark Pollack</author>
+            <author>Bruno Baia</author>
+            <version>$Id: CaoExporter.cs,v 1.12 2007/11/07 19:03:09 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Remoting.CaoExporter.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Remoting.CaoExporter"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.CaoExporter.AfterPropertiesSet">
+            <summary>
+            Publish the object 
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.CaoExporter.Dispose">
+            <summary>
+            Disconnect the remote object from the registered remoting channels.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.CaoExporter.TargetName">
+            <summary>
+            Gets or sets the name of the target object definition.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.CaoExporter.Interfaces">
+            <summary>
+            Gets or sets the list of interfaces whose methods should be exported.
+            </summary>
+            <remarks>
+            The default value of this property is all the interfaces 
+            implemented or inherited by the target type.
+            </remarks>
+            <value>The interfaces to export.</value>
+        </member>
+        <member name="P:Spring.Remoting.CaoExporter.ApplicationContext">
+            <summary>
+            Gets or sets the <see cref="T:Spring.Context.IApplicationContext"/> that this
+            object runs in.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.CaoExporter.ObjectFactory">
+            <summary>
+            Sets object factory to use.
+            </summary>
+        </member>
+        <member name="T:Spring.Remoting.CaoExporter.BaseCao">
+            <summary>
+            This class extends <see cref="T:Spring.Remoting.Support.BaseRemoteObject"/> to allow CAOs
+            to be disconnect from the client.
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.CaoExporter.CaoRemoteFactory.#ctor(Spring.Remoting.Support.ILifetime,System.String,System.String[],Spring.Objects.Factory.Support.AbstractObjectFactory)">
+            <summary>
+            Create a new instance of the RemoteFactory.
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.CaoExporter.CaoRemoteFactory.GetObject">
+            <summary>
+            Returns the CAO proxy.
+            </summary>
+            <returns>The remote object.</returns>
+        </member>
+        <member name="M:Spring.Remoting.CaoExporter.CaoRemoteFactory.GetObject(System.Object[])">
+            <summary>
+            Returns the CAO proxy using the
+            argument list to call the constructor. 
+            </summary>
+            <remarks>
+            The matching of arguments to call the constructor is done
+            by type. The alternative ways, by index and by constructor
+            name are not supported.
+            </remarks>
+            <param name="constructorArguments">Constructor 
+            arguments used to create the object.</param>
+            <returns>The remote object.</returns>
+        </member>
+        <member name="M:Spring.Remoting.CaoExporter.CaoRemoteFactory.InitializeLifetimeService">
+            <summary>
+            Set infinite lifetime.
+            </summary>
+        </member>
+        <member name="T:Spring.EnterpriseServices.ServicedComponentExporter">
+            <summary>
+            Encapsulates information necessary to create ServicedComponent
+            wrapper around target class.
+            </summary>
+            <remarks>
+            <p>
+            Instances of this class should be used as elements in the Components
+            list of the <see cref="T:Spring.EnterpriseServices.EnterpriseServicesExporter"/> class, which will
+            register them with COM+ Services.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ServicedComponentExporter.cs,v 1.9 2007/07/31 18:18:19 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.EnterpriseServices.ServicedComponentExporter.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.EnterpriseServices.ServicedComponentExporter"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.EnterpriseServices.ServicedComponentExporter.AfterPropertiesSet">
+            <summary>
+            Validate configuration.
+            </summary>
+        </member>
+        <member name="M:Spring.EnterpriseServices.ServicedComponentExporter.CreateWrapperType(System.Reflection.Emit.ModuleBuilder,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Creates ServicedComponent wrapper around target class.
+            </summary>
+            <param name="module">Dynamic module builder to use</param>
+            <param name="objectFactory">Object factory to get target from.</param>
+        </member>
+        <member name="P:Spring.EnterpriseServices.ServicedComponentExporter.TargetName">
+            <summary>
+            Gets or sets name of the target object that should be exposed as a serviced component.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.ServicedComponentExporter.Interfaces">
+            <summary>
+            Gets or sets the list of interfaces whose methods should be exported.
+            </summary>
+            <remarks>
+            The default value of this property is all the interfaces
+            implemented or inherited by the target type.
+            </remarks>
+            <value>The interfaces to export.</value>
+        </member>
+        <member name="P:Spring.EnterpriseServices.ServicedComponentExporter.TypeAttributes">
+            <summary>
+            Gets or sets a list of custom attributes
+            that should be applied to a proxy class.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.ServicedComponentExporter.MemberAttributes">
+            <summary>
+            Gets or sets a dictionary of custom attributes
+            that should be applied to proxy members.
+            </summary>
+            <remarks>
+            Map key is an expression that members can be matched against. Value is a list
+            of attributes that should be applied to each member that matches expression.
+            </remarks>
+        </member>
+        <member name="P:Spring.EnterpriseServices.ServicedComponentExporter.ObjectName">
+            <summary>
+            Set the name of the object in the object factory
+            that created this object.
+            </summary>
+        </member>
+        <member name="T:Spring.Remoting.RemoteObjectFactory">
+            <summary>
+            Factory for creating MarshalByRefObject wrapper around target class.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: RemoteObjectFactory.cs,v 1.8 2007/07/31 18:18:19 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Remoting.RemoteObjectFactory.#ctor">
+            <summary>
+            Creates a new instance of the MarshalByRefObjectFactory.
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.RemoteObjectFactory.AfterPropertiesSet">
+            <summary>
+            Initializes factory object.
+            </summary>
+        </member>
+        <member name="M:Spring.Remoting.RemoteObjectFactory.GetObject">
+            <summary>
+            Creates new instance of the remotable target proxy.
+            </summary>
+            <returns>New instance of the remotable target proxy.</returns>
+        </member>
+        <member name="P:Spring.Remoting.RemoteObjectFactory.Target">
+            <summary>
+            Gets or sets the target object.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.RemoteObjectFactory.BaseType">
+            <summary>
+            Gets or sets the <see cref="T:Spring.Remoting.Support.BaseRemoteObject"/> class or subclass 
+            that the proxy must inherit from.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.RemoteObjectFactory.Interfaces">
+            <summary>
+            Gets or sets the list of interfaces to wrap.
+            </summary>
+            <remarks>
+            The default value of this property is all the interfaces 
+            implemented or inherited by the target type.
+            </remarks>
+            <value>The interfaces to export.</value>
+        </member>
+        <member name="P:Spring.Remoting.RemoteObjectFactory.ObjectType">
+            <summary>
+            Returns type of the remotable target proxy.
+            </summary>
+        </member>
+        <member name="P:Spring.Remoting.RemoteObjectFactory.IsSingleton">
+            <summary>
+            Always returns false.
+            </summary>
+        </member>
+        <member name="T:Spring.EnterpriseServices.ServicedComponentFactory">
+            <summary>
+            Factory Object that instantiates and configures ServicedComponent.
+            </summary>
+            <remarks>
+            <p>
+            This factory object should be used to instantiate and configure
+            serviced components created by <see cref="T:Spring.EnterpriseServices.ServicedComponentExporter"/>.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ServicedComponentFactory.cs,v 1.7 2007/05/16 10:03:25 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.EnterpriseServices.ServicedComponentFactory.#ctor">
+            <summary>
+            Creates new instance of serviced component factory.
+            </summary>
+        </member>
+        <member name="M:Spring.EnterpriseServices.ServicedComponentFactory.GetObject">
+            <summary>
+            Returns configured instance of the serviced component.
+            </summary>
+            <returns>Configured instance of the serviced component.</returns>
+        </member>
+        <member name="M:Spring.EnterpriseServices.ServicedComponentFactory.AfterPropertiesSet">
+            <summary>
+            Initializes factory object.
+            </summary>
+        </member>
+        <member name="M:Spring.EnterpriseServices.ServicedComponentFactory.CreateInstance">
+            <summary>
+            Creates new instance of serviced component.
+            </summary>
+            <returns>New instance of serviced component.</returns>
+        </member>
+        <member name="P:Spring.EnterpriseServices.ServicedComponentFactory.Name">
+            <summary>
+            Gets or sets component name, as registered with COM+ Services.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.ServicedComponentFactory.Server">
+            <summary>
+            Gets or sets name of the remote server that COM+ component is registered with.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.ServicedComponentFactory.ObjectType">
+            <summary>
+            Returns type of serviced component.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.ServicedComponentFactory.IsSingleton">
+            <summary>
+            Gets or sets whether serviced component should be treated as singleton. Default is <b>false</b>.
+            </summary>
+        </member>
+        <member name="P:Spring.EnterpriseServices.ServicedComponentFactory.ProductTemplate">
+            <summary>
+            Gets or sets the template object definition
+            that should be used to configure proxy instance.
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs b/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs
new file mode 100644
index 00000000..e3643fcd
--- /dev/null
+++ b/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs
@@ -0,0 +1,1178 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+using System.Net;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Web.Services;
+using System.Web.Services.Description;
+using System.Web.Services.Protocols;
+using System.Web.Services.Discovery;
+
+using Spring.Core;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+using Spring.Proxy;
+using Spring.Util;
+using Spring.Objects;
+using Spring.Core.IO;
+using Spring.Expressions;
+
+#endregion
+
+namespace Spring.Web.Services
+{
+    /// <summary>
+    /// Factory Object that dynamically implements service interface for web service.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This factory object should be used to obtain reference to a web service
+    /// that can be safely cast to a service interface, which allows client code to code 
+    /// against interface, and not directly against the web service.
+    /// </p>
+    /// <p>
+    /// The WSDL contract needs to conform to WS-I Basic Profiles.
+    /// </p>
+    /// </remarks>
+    /// <author>Bruno Baia</author>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: WebServiceProxyFactory.cs,v 1.33 2008/02/24 19:10:12 bbaia Exp $</version>
+    public class WebServiceProxyFactory : IConfigurableFactoryObject, IInitializingObject
+    {
+        #region Logging
+
+        private static readonly Common.Logging.ILog LOG = Common.Logging.LogManager.GetLogger(typeof(WebServiceProxyFactory));
+
+        #endregion
+
+        #region Fields
+
+        private IObjectDefinition _productTemplate;
+        private Type _webServiceProxyBaseType = typeof(SoapHttpClientProtocol);
+        private IResource _serviceUri;
+        private Type _proxyType;
+        private Type _serviceInterface;
+        private NetworkCredential _credential;
+        private string _proxyUrl;
+        private NetworkCredential _proxyCredential;
+        private string _bindingName;
+        private IList _typeAttributes = new ArrayList();
+        private IDictionary _memberAttributes = new Hashtable();
+
+        /// <summary>
+        /// The web service proxy default constructor.
+        /// </summary>
+        protected ConstructorInfo proxyConstructor;
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the 
+        /// <see cref="WebServiceProxyFactory"/> class.
+        /// </summary>
+        public WebServiceProxyFactory()
+        {
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the base type that web service proxy should inherit.
+        /// </summary>
+        /// <remarks>
+        /// Default is <see cref="System.Web.Services.Protocols.SoapHttpClientProtocol"/>
+        /// </remarks>
+        [Obsolete("This property is obsolete, it has been replaced by WebServiceProxyBaseType")]
+        public Type ClientProtocolType
+        {
+            get { return _webServiceProxyBaseType; }
+            set { _webServiceProxyBaseType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the base type that web service proxy should inherit.
+        /// </summary>
+        /// <remarks>
+        /// Default is <see cref="System.Web.Services.Protocols.SoapHttpClientProtocol"/>
+        /// </remarks>
+        public Type WebServiceProxyBaseType
+        {
+            get { return _webServiceProxyBaseType; }
+            set { _webServiceProxyBaseType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the URI for an <see cref="Spring.Core.IO.IResource"/> 
+        /// that contains the web service description (WSDL).
+        /// </summary>
+        public IResource ServiceUri
+        {
+            get { return _serviceUri; }
+            set { _serviceUri = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets type of the proxy class to wrap.
+        /// </summary>
+        public Type ProxyType
+        {
+            get { return _proxyType; }
+            set { _proxyType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets service interface that proxy should implement.
+        /// </summary>
+        public Type ServiceInterface
+        {
+            get { return _serviceInterface; }
+            set { _serviceInterface = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="System.Net.NetworkCredential"/> instance 
+        /// to use when connecting to a server that requires authentication.
+        /// </summary>
+        public NetworkCredential Credential
+        {
+            get { return _credential; }
+            set { _credential = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the url of the proxy server to use for retrieving the WSDL.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This only applies when using an <see cref="Spring.Core.IO.UrlResource"/> as uri.
+        /// </p>
+        /// <p>
+        /// The default is to use the system proxy setting.
+        /// </p>
+        /// </remarks>
+        public string ProxyUrl
+        {
+            get { return _proxyUrl; }
+            set { _proxyUrl = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="System.Net.NetworkCredential"/> instance 
+        /// to use when connecting to a proxy server that requires authentication.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This only applies when using an <see cref="Spring.Core.IO.UrlResource"/> as uri.
+        /// </p>
+        /// </remarks>
+        public NetworkCredential ProxyCredential
+        {
+            get { return _proxyCredential; }
+            set { _proxyCredential = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the web service binding name to use for the proxy.
+        /// </summary>
+        public string BindingName
+        {
+            get { return _bindingName; }
+            set { _bindingName = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a list of custom attributes 
+        /// that should be applied to a proxy class.
+        /// </summary>
+        public IList TypeAttributes
+        {
+            get { return _typeAttributes; }
+            set { _typeAttributes = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a dictionary of custom attributes 
+        /// that should be applied to web service members.
+        /// </summary>
+        /// <remarks>
+        /// Dictionary key is an expression that members can be matched against. 
+        /// Value is a list of attributes that should be applied 
+        /// to each member that matches expression.
+        /// </remarks>
+        public IDictionary MemberAttributes
+        {
+            get { return _memberAttributes; }
+            set { _memberAttributes = value; }
+        }
+
+        #endregion
+
+        #region IConfigurableFactoryObject Members
+
+        /// <summary>
+        /// Returns type of the web service proxy.
+        /// </summary>
+        public virtual Type ObjectType
+        {
+            get { return (proxyConstructor != null ? proxyConstructor.DeclaringType : ServiceInterface); }
+        }
+
+        /// <summary>
+        /// Creates new instance of the web service proxy.
+        /// </summary>
+        /// <returns>New instance of the web service proxy.</returns>
+        public virtual object GetObject()
+        {
+            if (proxyConstructor == null)
+            {
+                GenerateProxy();
+            }
+
+            return ObjectUtils.InstantiateType(proxyConstructor, ObjectUtils.EmptyObjects);
+        }
+
+        /// <summary>
+        /// Always returns false.
+        /// </summary>
+        public virtual bool IsSingleton
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Gets or sets the template object definition 
+        /// that should be used to configure proxy instance.
+        /// </summary>
+        public virtual IObjectDefinition ProductTemplate
+        {
+            get { return _productTemplate; }
+            set { _productTemplate = value; }
+        }
+
+        #endregion
+
+        #region IInitializingObject Members
+
+        /// <summary>
+        /// Initializes factory object.
+        /// </summary>
+        public virtual void AfterPropertiesSet()
+        {
+            ValidateConfiguration();
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Validates the configuration.
+        /// </summary>
+        protected virtual void ValidateConfiguration()
+        {
+            if (ServiceUri == null && ProxyType == null)
+            {
+                throw new ArgumentException("ServiceUri or ProxyType property is required.");
+            }
+            if (ServiceInterface == null)
+            {
+                throw new ArgumentException("The ServiceInterface property is required.");
+            }
+            if (!ServiceInterface.IsInterface)
+            {
+                throw new ArgumentException("ServiceInterface must be an interface");
+            }
+            if (WebServiceProxyBaseType.IsSealed)
+            {
+                throw new ArgumentException("Web service client proxy cannot be created for a sealed class [" + WebServiceProxyBaseType.FullName + "]");
+            }
+        }
+
+        /// <summary>
+        /// Generates the web service proxy type.
+        /// </summary>
+        protected virtual void GenerateProxy()
+        {
+            IProxyTypeBuilder builder;
+            if (ProxyType != null)
+            {
+                // Wrap .NET generated proxy class or another
+                builder = new WebServiceProxyProxyTypeBuilder();
+                builder.TargetType = ProxyType;
+            }
+            else
+            {
+                // Dynamically generates proxy class from WSDL
+                builder = new SoapHttpClientProxyTypeBuilder(
+                    ServiceUri, GetWsDocuments(ServiceUri), BindingName);
+                builder.BaseType = WebServiceProxyBaseType;
+            }
+
+            builder.Interfaces = ReflectionUtils.ToInterfaceArray(ServiceInterface);
+            builder.TypeAttributes = TypeAttributes;
+            builder.MemberAttributes = MemberAttributes;
+
+            Type wrapper = builder.BuildProxyType();
+
+            proxyConstructor = wrapper.GetConstructor(Type.EmptyTypes);
+
+            #region Instrumentation
+
+            if (LOG.IsDebugEnabled)
+            {
+                if (ServiceUri != null)
+                {
+                    LOG.Debug(
+                        String.Format("Generated client proxy type [{0}] for web service [{1}]", wrapper.FullName,
+                                      ServiceUri.Description));
+                }
+                else if (ProxyType != null)
+                {
+                    LOG.Debug(
+                        String.Format("Generated client proxy type [{0}] for web service based on provided proxy type [{1}]", wrapper.FullName,
+                                      ProxyType.FullName));
+                }
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        /// <summary>
+        /// Gets XML Web Services documents from a Spring resource.
+        /// </summary>
+        private DiscoveryClientDocumentCollection GetWsDocuments(IResource resource)
+        {
+            try
+            {
+                if (ServiceUri is UrlResource || 
+                    ServiceUri is FileSystemResource)
+                {
+                    DiscoveryClientProtocol dcProtocol = new DiscoveryClientProtocol();
+                    dcProtocol.AllowAutoRedirect = true;
+                    dcProtocol.Credentials = CreateCredentials();
+                    dcProtocol.Proxy = ConfigureProxy();
+                    dcProtocol.DiscoverAny(resource.Uri.AbsoluteUri);
+                    dcProtocol.ResolveAll();
+
+                    return dcProtocol.Documents;
+                }
+                else
+                {
+                    DiscoveryClientDocumentCollection dcdc = new DiscoveryClientDocumentCollection();
+                    dcdc[resource.Description] = ServiceDescription.Read(resource.InputStream);
+                    return dcdc;
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new ArgumentException(String.Format("Couldn't retrieve the description of the web service located at '{0}'.", resource.Description), ex);
+            }
+        }
+
+        private IWebProxy ConfigureProxy()
+        {
+            IWebProxy webProxy = null;
+            if (ProxyUrl != null)
+            {
+                webProxy = new WebProxy(ProxyUrl);
+            }
+            if (ProxyCredential != null)
+            {
+                if (webProxy == null)
+                {
+#if !NET_2_0
+                    webProxy = GlobalProxySelection.Select;
+#else
+                    webProxy = WebRequest.DefaultWebProxy;
+#endif
+                }
+                webProxy.Credentials = ProxyCredential;
+            }
+
+            return webProxy;
+        }
+
+        private ICredentials CreateCredentials()
+        {
+            if (Credential != null)
+            {
+                CredentialCache credentialCache = new CredentialCache();
+
+                Uri wsUri = new Uri(ServiceUri.Uri.AbsoluteUri.Substring(0, ServiceUri.Uri.AbsoluteUri.Length - ServiceUri.Uri.AbsolutePath.Length));
+                IEnumerator enumerator = AuthenticationManager.RegisteredModules;
+                while (enumerator.MoveNext())
+                {
+                    credentialCache.Add(wsUri, ((IAuthenticationModule)enumerator.Current).AuthenticationType, Credential);
+                }
+
+                return credentialCache;
+            }
+            else
+            {
+                return CredentialCache.DefaultCredentials;
+            }
+        }
+
+        #endregion
+
+        #region SoapHttpClientProxyTypeBuilder inner class implementation
+
+        /// <summary>
+        /// Proxy type builder that can be used to create a proxy for 
+        /// <see cref="System.Web.Services.Protocols.SoapHttpClientProtocol"/> derived classes.
+        /// </summary>
+        private sealed class SoapHttpClientProxyTypeBuilder : AbstractProxyTypeBuilder
+        {
+            #region Logging
+
+            private static readonly Common.Logging.ILog LOG = Common.Logging.LogManager.GetLogger(typeof(SoapHttpClientProxyTypeBuilder));
+
+            #endregion
+
+            #region Fields
+
+            // Binding/Type related
+            private IResource serviceUri;
+            private ServiceDescriptionCollection wsDescriptions;
+            private XmlSchemaImporter schemaImporter;
+            private Binding wsBinding;
+            private string wsUrl;
+
+            // Operation/Method related
+            private Operation operation;
+            private OperationBinding operationBinding;
+            private SoapOperationBinding soapOperationBinding;
+            private XmlMembersMapping inputMembersMapping;
+            private XmlMembersMapping outputMembersMapping;
+
+            #endregion
+
+            #region Constructor(s) / Destructor
+
+            /// <summary>
+            /// Creates a new instance of the 
+            /// <see cref="SoapHttpClientProxyTypeBuilder"/> class.
+            /// </summary>
+            /// <param name="serviceUri">The URI that contains the Web Service meta info (WSDL).</param>
+            /// <param name="wsDocuments">The XML Web Service documents to use to create the proxy.</param>
+            /// <param name="bindingName">The name of the Web Service binding to use.</param>
+            public SoapHttpClientProxyTypeBuilder(IResource serviceUri,
+                DiscoveryClientDocumentCollection wsDocuments, string bindingName)
+            {
+                this.serviceUri = serviceUri;
+
+                Name = "SoapHttpClientProxy";
+                ProxyTargetAttributes = false;
+
+                Initialize(wsDocuments, bindingName);
+            }
+
+            #endregion
+
+            #region IProxyTypeBuilder Members
+
+            /// <summary>
+            /// Creates the proxy type.
+            /// </summary>
+            /// <returns>The generated proxy class.</returns>
+            public override Type BuildProxyType()
+            {
+                if (Interfaces == null || Interfaces.Length == 0)
+                {
+                    throw new ArgumentException(
+                        "Web service client proxy must implement at least one interface.");
+                }
+
+                TypeBuilder typeBuilder = CreateTypeBuilder(Name, BaseType);
+
+                // apply custom attributes to the proxy type.
+                ApplyTypeAttributes(typeBuilder, TargetType);
+
+                // create constructors
+                ImplementConstructors(typeBuilder);
+
+                // implement service interfaces
+                foreach (Type intf in Interfaces)
+                {
+                    ImplementInterface(typeBuilder,
+                        new SoapHttpClientProxyMethodBuilder(typeBuilder, this),
+                        intf, TargetType);
+                }
+
+                return typeBuilder.CreateType();
+            }
+
+            #endregion
+
+            #region IProxyTypeGenerator Members
+
+            /// <summary>
+            /// Generates the IL instructions that pushes 
+            /// the target instance on which calls should be delegated to.
+            /// </summary>
+            /// <param name="il">The IL generator to use.</param>
+            public override void PushTarget(ILGenerator il)
+            {
+                PushProxy(il);
+            }
+
+            #endregion
+
+            #region Protected Methods
+
+            /// <summary>
+            /// Implements constructors for the proxy class.
+            /// </summary>
+            /// <param name="builder">
+            /// The <see cref="System.Reflection.Emit.TypeBuilder"/> to use.
+            /// </param>
+            protected override void ImplementConstructors(TypeBuilder builder)
+            {
+                MethodAttributes attributes = MethodAttributes.Public |
+                    MethodAttributes.HideBySig | MethodAttributes.SpecialName |
+                    MethodAttributes.RTSpecialName;
+                ConstructorBuilder cb = builder.DefineConstructor(attributes,
+                    CallingConventions.Standard, Type.EmptyTypes);
+
+                ILGenerator il = cb.GetILGenerator();
+
+                PushProxy(il);
+                il.Emit(OpCodes.Call, this.BaseType.GetConstructor(Type.EmptyTypes));
+
+                // Set Url Property
+                PushProxy(il);
+                il.Emit(OpCodes.Ldstr, this.wsUrl);
+                il.Emit(OpCodes.Call, this.BaseType.GetMethod("set_Url", BindingFlags.Public | BindingFlags.Instance));
+
+                il.Emit(OpCodes.Ret);
+            }
+
+            protected override void ApplyMethodAttributes(
+                MethodBuilder methodBuilder, MethodInfo targetMethod)
+            {
+                MoveToMethod(targetMethod);
+
+                base.ApplyMethodAttributes(methodBuilder, targetMethod);
+            }
+
+            protected override IList GetTypeAttributes(Type type)
+            {
+                IList attrs = base.GetTypeAttributes(type);
+
+                // Add the WebServiceBindingAttribute
+                attrs.Add(CreateWebServiceBindingAttribute(this.wsBinding));
+
+                return attrs;
+            }
+
+            protected override IList GetMethodAttributes(MethodInfo method)
+            {
+                IList attrs = base.GetMethodAttributes(method);
+
+                // Add the SoapMethodAttribute
+                attrs.Add(CreateSoapMethodAttribute(
+                    operation, operationBinding, soapOperationBinding, inputMembersMapping, outputMembersMapping));
+
+                return attrs;
+            }
+
+#if NET_2_0
+            protected override IList GetMethodReturnTypeAttributes(MethodInfo method)
+            {
+                IList attrs = base.GetMethodReturnTypeAttributes(method);
+
+                // Add the XmlElementAttribute if needed
+                if (operation.Messages.Output != null)
+                {
+                    if (method.ReturnType != typeof(void))
+                    {
+                        if (outputMembersMapping.Count > 0)
+                        {
+                            XmlMemberMapping outMemberMapping = outputMembersMapping[0];
+                            bool useMemberName = (outMemberMapping.MemberName != operation.Name + "Result");
+                            bool useNamespace = outMemberMapping.Namespace != outputMembersMapping.Namespace;
+                            if (useMemberName || useNamespace)
+                            {
+                                ReflectionUtils.CustomAttributeBuilderBuilder cabb =
+                                    new ReflectionUtils.CustomAttributeBuilderBuilder(typeof(XmlElementAttribute));
+                                if (useMemberName)
+                                {
+                                    cabb.AddPropertyValue("ElementName", outMemberMapping.MemberName);
+                                }
+                                if (useNamespace)
+                                {
+                                    cabb.AddPropertyValue("Namespace", outMemberMapping.Namespace);
+                                }
+
+                                attrs.Add(cabb.Build());
+                            }
+                        }
+                    }
+                }
+
+                return attrs;
+            }
+#endif
+/*
+            protected override IList GetMethodParameterAttributes(MethodInfo method, ParameterInfo paramInfo)
+            {
+                IList attrs = base.GetMethodParameterAttributes(method, paramInfo);
+
+                // Add the XmlElementAttribute if needed
+                XmlMemberMapping inMemberMapping = inputMembersMapping[paramInfo.Position];
+                if (inMemberMapping.Namespace != inputMembersMapping.Namespace)
+                {
+                    CustomAttributeBuilderBuilder cabb =
+                                new CustomAttributeBuilderBuilder(typeof(XmlElementAttribute));
+                    cabb.AddPropertyValue("Namespace", inMemberMapping.Namespace);
+
+                    attrs.Add(cabb.Build());
+                }
+
+                return attrs;
+            }
+*/
+
+            #endregion
+
+            #region Private Methods
+
+            private void Initialize(DiscoveryClientDocumentCollection wsDocuments, string bindingName)
+            {
+                // Service descriptions
+                this.wsDescriptions = new ServiceDescriptionCollection();
+                XmlSchemas schemas = new XmlSchemas();
+                foreach (DictionaryEntry entry in wsDocuments)
+                {
+                    if (entry.Value is ServiceDescription)
+                    {
+                        this.wsDescriptions.Add((ServiceDescription)entry.Value);
+                    }
+                    if (entry.Value is XmlSchema)
+                    {
+                        schemas.Add((XmlSchema)entry.Value);
+                    }
+                }
+
+                // XmlSchemaImporter
+                foreach (ServiceDescription serviceDescription in this.wsDescriptions)
+                {
+                    foreach (XmlSchema schema in serviceDescription.Types.Schemas)
+                    {
+                        if (schemas[schema.TargetNamespace] == null)
+                        {
+                            schemas.Add(schema);
+                        }
+                    }
+                }
+                this.schemaImporter = new XmlSchemaImporter(schemas);
+
+                this.wsBinding = GetWsBinding(this.wsDescriptions, bindingName);
+                this.wsUrl = GetWsUrl(this.wsDescriptions, this.wsBinding);
+            }
+
+            /// <summary>
+            /// Search and returns the binding for the specified name.
+            /// </summary>
+            private Binding GetWsBinding(ServiceDescriptionCollection serviceDescriptions, string bindingName)
+            {
+                if (bindingName != null)
+                {
+                    // Search for a specific binding
+                    foreach (ServiceDescription description in serviceDescriptions)
+                    {
+                        foreach (Binding binding in description.Bindings)
+                        {
+                            if (binding.Name == bindingName)
+                            {
+                                return binding;
+                            }
+                        }
+                    }
+                    throw new ApplicationException(String.Format("Binding '{0}' does not exist in the WSDL document located at '{1}'", bindingName, this.serviceUri.Description));
+                }
+                else
+                {
+                    // Use the first one
+                    foreach (ServiceDescription description in serviceDescriptions)
+                    {
+                        foreach (Binding binding in description.Bindings)
+                        {
+                            #region Instrumentation
+
+                            if (LOG.IsInfoEnabled)
+                            {
+                                LOG.Info(String.Format("The binding '{0}', found in the WSDL document located at '{1}', will be use.", binding.Name, this.serviceUri.Description));
+                            }
+
+                            #endregion
+
+                            return binding;
+                        }
+                    }
+                    throw new ApplicationException(String.Format("No bindings exists in the WSDL document located at '{0}'", this.serviceUri.Description));
+                }
+            }
+
+            /// <summary>
+            /// Search and returns the url for the specified binding.
+            /// </summary>
+            private string GetWsUrl(ServiceDescriptionCollection serviceDescriptions, Binding binding)
+            {
+                foreach (ServiceDescription description in serviceDescriptions)
+                {
+                    foreach (Service service in description.Services)
+                    {
+                        foreach (Port port in service.Ports)
+                        {
+                            if (port.Binding.Name == binding.Name)
+                            {
+                                SoapAddressBinding soapAddress = (SoapAddressBinding)port.Extensions.Find(typeof(SoapAddressBinding));
+                                return soapAddress.Location;
+                            }
+                        }
+                    }
+                }
+                throw new ApplicationException(String.Format("No SoapAddressBinding has been found for binding '{0}' in the WSDL document located at '{1}'.", binding.Name, serviceUri));
+            }
+
+            /// <summary>
+            /// Search and returns the operation that matches the specified method.
+            /// </summary>
+            private Operation GetOperation(ServiceDescriptionCollection descriptions, Binding binding, MethodInfo method)
+            {
+                PortType portType = descriptions.GetPortType(binding.Type);
+                foreach (Operation operation in portType.Operations)
+                {
+                    if (operation.Name == method.Name)
+                    {
+                        return operation;
+                    }
+                }
+                throw new ApplicationException(String.Format("No Operation has been found for the method '{0}' in the WSDL document located at '{1}'.", method.Name, serviceUri.Description));
+            }
+
+            /// <summary>
+            /// Search and returns the OperationBinding that matches the specified Operation.
+            /// </summary>
+            private OperationBinding GetOperationBinding(Operation operation, Binding binding)
+            {
+                foreach (OperationBinding operationBinding in binding.Operations)
+                {
+                    if (operation.IsBoundBy(operationBinding))
+                    {
+                        return operationBinding;
+                    }
+                }
+                throw new ApplicationException(String.Format("No OperationBinding matches the Operation '{0}' in the WSDL document located at '{2}'.", operation.Name, this.serviceUri.Description));
+            }
+
+            /// <summary>
+            /// Search and returns the type mapping between method parameters/return value 
+            /// and the element parts of a literal-use SOAP message.
+            /// </summary>
+            private XmlMembersMapping GetMembersMapping(string messageName, MessagePartCollection messageParts, SoapBodyBinding soapBodyBinding, SoapBindingStyle soapBindingStyle)
+            {
+#if NET_2_0
+                if (soapBindingStyle == SoapBindingStyle.Rpc)
+                {
+                    SoapSchemaMember[] soapSchemaMembers = new SoapSchemaMember[messageParts.Count];
+                    for (int i = 0; i < messageParts.Count; i++)
+                    {
+                        SoapSchemaMember ssm = new SoapSchemaMember();
+                        ssm.MemberName = messageParts[i].Name;
+                        ssm.MemberType = messageParts[i].Type;
+                        soapSchemaMembers[i] = ssm;
+                    }
+                    return this.schemaImporter.ImportMembersMapping(messageName, soapBodyBinding.Namespace, soapSchemaMembers);
+                }
+                else
+                {
+                    return this.schemaImporter.ImportMembersMapping(messageParts[0].Element);
+                }
+#else
+				return this.schemaImporter.ImportMembersMapping(messageParts[0].Element);
+#endif
+            }
+
+            private void MoveToMethod(MethodInfo targetMethod)
+            {
+                operation = GetOperation(this.wsDescriptions, this.wsBinding, targetMethod);
+                operationBinding = GetOperationBinding(operation, this.wsBinding);
+                soapOperationBinding = (SoapOperationBinding)operationBinding.Extensions.Find(typeof(SoapOperationBinding));
+
+                string inputMessageName = (!StringUtils.IsNullOrEmpty(operationBinding.Input.Name) && (soapOperationBinding.Style != SoapBindingStyle.Rpc)) ? operationBinding.Input.Name : operation.Name;
+                SoapBodyBinding inputSoapBodyBinding = (SoapBodyBinding)operationBinding.Input.Extensions.Find(typeof(SoapBodyBinding));
+
+#if !NET_2_0
+				if (soapOperationBinding.Style == SoapBindingStyle.Rpc &&
+					inputSoapBodyBinding.Use == SoapBindingUse.Literal)
+				{
+					throw new NotSupportedException("rpc-literal SOAP messages are not supported on .NET Framework 1.1");
+				}
+#endif
+                if (inputSoapBodyBinding.Use != SoapBindingUse.Literal)
+                {
+                    throw new NotSupportedException("WebServiceProxyFactory only supports document-literal and rpc-literal SOAP messages to conform to WS-I Basic Profiles.");
+                }
+
+                Message inputMessage = this.wsDescriptions.GetMessage(operation.Messages.Input.Message);
+                inputMembersMapping = GetMembersMapping(inputMessageName, inputMessage.Parts, inputSoapBodyBinding, soapOperationBinding.Style);
+
+                outputMembersMapping = null;
+                if (operation.Messages.Output != null)
+                {
+                    string outputMessageName = (!StringUtils.IsNullOrEmpty(operationBinding.Output.Name) && (soapOperationBinding.Style != SoapBindingStyle.Rpc)) ? operationBinding.Output.Name : (operation.Name + "Response");
+                    SoapBodyBinding outputSoapBodyBinding = (SoapBodyBinding)operationBinding.Output.Extensions.Find(typeof(SoapBodyBinding));
+                    Message outputMessage = this.wsDescriptions.GetMessage(operation.Messages.Output.Message);
+                    outputMembersMapping = GetMembersMapping(outputMessageName, outputMessage.Parts, outputSoapBodyBinding, soapOperationBinding.Style);
+                }
+            }
+
+            /// <summary>
+            /// Creates a <see cref="WebServiceBindingAttribute"/> that should be applied to proxy type.
+            /// </summary>
+            private CustomAttributeBuilder CreateWebServiceBindingAttribute(Binding wsBinding)
+            {
+                ReflectionUtils.CustomAttributeBuilderBuilder cabb =
+                    new ReflectionUtils.CustomAttributeBuilderBuilder(typeof(WebServiceBindingAttribute));
+
+                cabb.AddContructorArgument(this.wsBinding.Name);
+                cabb.AddPropertyValue("Namespace", this.wsBinding.ServiceDescription.TargetNamespace);
+
+                return cabb.Build();
+            }
+
+#if !NET_2_0
+            private static readonly PropertyInfo XmlMembersMapping_ElementName =
+                typeof(XmlMembersMapping).GetProperty("ElementName");
+
+            private static readonly PropertyInfo XmlMembersMapping_Namespace = 
+                typeof(XmlMembersMapping).GetProperty("Namespace");
+#endif
+
+            /// <summary>
+            /// Creates a <see cref="SoapDocumentMethodAttribute"/> or a <see cref="SoapRpcMethodAttribute"/>
+            /// that should be applied to proxy method.
+            /// </summary>
+            private static CustomAttributeBuilder CreateSoapMethodAttribute(Operation operation,
+                OperationBinding operationBinding, SoapOperationBinding soapOperationBinding,
+                XmlMembersMapping inputMembersMapping, XmlMembersMapping outputMembersMapping)
+            {
+                ReflectionUtils.CustomAttributeBuilderBuilder cabb;
+
+#if !NET_2_0
+                // Access XmlMembersMapping.ElementName and .Namespace property using reflection [SPRNET-520]
+                string inputMembersMappingElementName = XmlMembersMapping_ElementName.GetValue(inputMembersMapping, null) as string;
+                string inputMembersMappingNamespace = XmlMembersMapping_Namespace.GetValue(inputMembersMapping, null) as string;
+#else
+                string inputMembersMappingElementName = inputMembersMapping.ElementName;
+                string inputMembersMappingNamespace = inputMembersMapping.Namespace;
+#endif
+
+                if (soapOperationBinding.Style == SoapBindingStyle.Rpc)
+                {
+                    cabb = new ReflectionUtils.CustomAttributeBuilderBuilder(typeof(SoapRpcMethodAttribute));
+                }
+                else
+                {
+                    cabb = new ReflectionUtils.CustomAttributeBuilderBuilder(typeof(SoapDocumentMethodAttribute));
+                    cabb.AddPropertyValue("ParameterStyle", SoapParameterStyle.Wrapped);
+                }
+
+                cabb.AddContructorArgument(soapOperationBinding.SoapAction);
+
+#if NET_2_0
+                cabb.AddPropertyValue("Use", SoapBindingUse.Literal);
+#else
+                if (soapOperationBinding.Style != SoapBindingStyle.Rpc)
+                {
+                    cabb.AddPropertyValue("Use", SoapBindingUse.Literal);
+                }
+#endif
+
+                if (inputMembersMappingElementName.Length > 0 &&
+                    inputMembersMappingElementName != operation.Name)
+                {
+                    cabb.AddPropertyValue("RequestElementName", inputMembersMappingElementName);
+                }
+
+                if (inputMembersMappingNamespace != null)
+                {
+                    cabb.AddPropertyValue("RequestNamespace", inputMembersMappingNamespace);
+                }
+
+                if (outputMembersMapping == null)
+                {
+                    cabb.AddPropertyValue("OneWay", true);
+                }
+                else
+                {
+#if !NET_2_0
+                    // Access XmlMembersMapping.ElementName and .Namespace property using reflection [SPRNET-520]
+                    string outputMembersMappingElementName = XmlMembersMapping_ElementName.GetValue(outputMembersMapping, null) as string;
+                    string outputMembersMappingNamespace = XmlMembersMapping_Namespace.GetValue(outputMembersMapping, null) as string;
+#else
+                    string outputMembersMappingElementName = outputMembersMapping.ElementName;
+                    string outputMembersMappingNamespace = outputMembersMapping.Namespace;
+#endif
+                    if (outputMembersMappingElementName.Length > 0 &&
+                        outputMembersMappingElementName != (operation.Name + "Response"))
+                    {
+                        cabb.AddPropertyValue("ResponseElementName", outputMembersMappingElementName);
+                    }
+
+                    if (outputMembersMappingNamespace != null)
+                    {
+                        cabb.AddPropertyValue("ResponseNamespace", outputMembersMappingNamespace);
+                    }
+                }
+
+                return cabb.Build();
+            }
+
+            #endregion
+
+            #region SoapHttpClientProxyMethodBuilder inner class implementation
+
+            /// <summary>
+            /// Proxy method builder that can be used to create a proxy method 
+            /// for web services operation invocation.
+            /// </summary>
+            private sealed class SoapHttpClientProxyMethodBuilder : AbstractProxyMethodBuilder
+            {
+                #region Fields
+
+                private static readonly MethodInfo Invoke =
+                    typeof(SoapHttpClientProtocol).GetMethod("Invoke", BindingFlags.NonPublic | BindingFlags.Instance);
+
+                #endregion
+
+                #region Constructor(s) / Destructor
+
+                /// <summary>
+                /// Creates a new instance of the method builder.
+                /// </summary>
+                /// <param name="typeBuilder">The type builder to use.</param>
+                /// <param name="proxyGenerator">
+                /// The <see cref="IProxyTypeGenerator"/> implementation to use.
+                /// </param>
+                public SoapHttpClientProxyMethodBuilder(
+                    TypeBuilder typeBuilder, IProxyTypeGenerator proxyGenerator)
+                    : base(typeBuilder, proxyGenerator, false)
+                {
+                }
+
+                #endregion
+
+                #region Protected Methods
+
+                /// <summary>
+                /// Generates the proxy method.
+                /// </summary>
+                /// <param name="il">The IL generator to use.</param>
+                /// <param name="method">The method to proxy.</param>
+                /// <param name="interfaceMethod">
+                /// The interface definition of the method, if applicable.
+                /// </param>
+                protected override void GenerateMethod(
+                    ILGenerator il, MethodInfo method, MethodInfo interfaceMethod)
+                {
+                    // In Parameters
+                    ArrayList inParams = new ArrayList();
+                    // Ref or Out Parameters
+                    ArrayList refOutParams = new ArrayList();
+
+                    foreach (ParameterInfo paramInfo in interfaceMethod.GetParameters())
+                    {
+                        if (paramInfo.IsRetval || paramInfo.IsOut)
+                        {
+                            refOutParams.Add(paramInfo);
+                        }
+                        else
+                        {
+                            inParams.Add(paramInfo);
+                        }
+                    }
+
+                    proxyGenerator.PushTarget(il);
+
+                    // Parameter #1
+                    il.Emit(OpCodes.Ldstr, interfaceMethod.Name);
+
+                    // Parameter #2
+                    LocalBuilder parameters = il.DeclareLocal(typeof(Object[]));
+                    il.Emit(OpCodes.Ldc_I4, inParams.Count);
+                    il.Emit(OpCodes.Newarr, typeof(Object));
+                    il.Emit(OpCodes.Stloc, parameters);
+
+                    int paramIndex = 0;
+                    foreach (ParameterInfo paramInfo in inParams)
+                    {
+                        il.Emit(OpCodes.Ldloc, parameters);
+                        il.Emit(OpCodes.Ldc_I4, paramIndex);
+                        il.Emit(OpCodes.Ldarg, paramInfo.Position + 1);
+                        if (paramInfo.ParameterType.IsValueType)
+                        {
+                            il.Emit(OpCodes.Box, paramInfo.ParameterType);
+                        }
+                        il.Emit(OpCodes.Stelem_Ref);
+
+                        paramIndex++;
+                    }
+
+                    il.Emit(OpCodes.Ldloc, parameters);
+
+                    // Call Invoke method and save result
+                    LocalBuilder results = il.DeclareLocal(typeof(Object[]));
+                    il.EmitCall(OpCodes.Callvirt, Invoke, null);
+                    il.Emit(OpCodes.Stloc, results);
+
+                    int resultIndex = (interfaceMethod.ReturnType == typeof(void) ? 0 : 1);
+                    foreach (ParameterInfo paramInfo in refOutParams)
+                    {
+                        il.Emit(OpCodes.Ldarg, paramInfo.Position + 1);
+                        il.Emit(OpCodes.Ldloc, results);
+
+                        // Cast / Unbox the return value
+                        il.Emit(OpCodes.Ldc_I4, resultIndex);
+                        il.Emit(OpCodes.Ldelem_Ref);
+
+                        Type elementType = paramInfo.ParameterType.GetElementType();
+                        if (elementType.IsValueType)
+                        {
+                            il.Emit(OpCodes.Unbox, elementType);
+                            il.Emit(OpCodes.Ldobj, elementType);
+                            il.Emit(OpCodes.Stobj, elementType);
+                        }
+                        else
+                        {
+                            il.Emit(OpCodes.Castclass, elementType);
+                            il.Emit(OpCodes.Stind_Ref);
+                        }
+
+                        resultIndex++;
+                    }
+
+                    if (interfaceMethod.ReturnType != typeof(void))
+                    {
+                        il.Emit(OpCodes.Ldloc, results);
+
+                        // Cast / Unbox the return value
+                        il.Emit(OpCodes.Ldc_I4_0);
+                        il.Emit(OpCodes.Ldelem_Ref);
+                        if (interfaceMethod.ReturnType.IsValueType)
+                        {
+                            il.Emit(OpCodes.Unbox, interfaceMethod.ReturnType);
+                            il.Emit(OpCodes.Ldobj, interfaceMethod.ReturnType);
+                        }
+                        else
+                        {
+                            il.Emit(OpCodes.Castclass, interfaceMethod.ReturnType);
+                        }
+                    }
+                }
+
+                #endregion
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #region WebServiceProxyProxyTypeBuilder inner class implementation
+
+        /// <summary>
+        /// Proxy type builder that can be used to create a proxy for 
+        /// .Net-generated proxy class that can be safely cast to a service interface.
+        /// </summary>
+        private sealed class WebServiceProxyProxyTypeBuilder : InheritanceProxyTypeBuilder
+        {
+            #region Constructor(s) / Destructor
+
+            /// <summary>
+            /// Creates a new instance of the 
+            /// <see cref="WebServiceProxyProxyTypeBuilder"/> class.
+            /// </summary>
+            public WebServiceProxyProxyTypeBuilder()
+            {
+                this.Name = "WebServiceProxyProxy";
+            }
+
+            #endregion
+
+            #region Protected Methods
+
+            /// <summary>
+            /// Gets the mapping of the interface to proxy 
+            /// into the actual methods on the target type 
+            /// that does not need to implement that interface.
+            /// </summary>
+            /// <remarks>
+            /// <p>
+            /// As the proxy type does not implement the interface, 
+            /// we try to find matching methods.
+            /// </p>
+            /// </remarks>
+            /// <param name="targetType">
+            /// The <see cref="System.Type"/> of the target object.
+            /// </param>
+            /// <param name="intf">The interface to implement.</param>
+            /// <returns>
+            /// An interface mapping for the interface to proxy.
+            /// </returns>
+            protected override InterfaceMapping GetInterfaceMapping(
+                Type targetType, Type intf)
+            {
+                InterfaceMapping mapping;
+
+                mapping.TargetType = targetType;
+                mapping.InterfaceType = intf;
+                mapping.InterfaceMethods = intf.GetMethods();
+                mapping.TargetMethods = ReflectionUtils.GetMatchingMethods(
+                    targetType, mapping.InterfaceMethods, true);
+
+                return mapping;
+            }
+
+            #endregion
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Testing.NUnit/AssemblyInfo.cs b/src/Spring/Spring.Testing.NUnit/AssemblyInfo.cs
new file mode 100644
index 00000000..074c740a
--- /dev/null
+++ b/src/Spring/Spring.Testing.NUnit/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle("Spring.Net NUnit support")]
+[assembly: AssemblyDescription("Interfaces and classes that provide NUnit integration in Spring.Net")]
\ No newline at end of file
diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2003.csproj b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2003.csproj
new file mode 100644
index 00000000..c551dce0
--- /dev/null
+++ b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2003.csproj
@@ -0,0 +1,136 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{6B8639E3-88BB-4F7B-9F23-699E84C30D58}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Testing.NUnit"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = "Spring.Testing.NUnit.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = "1587, 1591, 219, 162"
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Testing.NUnit\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Testing.NUnit\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Data.2003"
+                    Project = "{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\Net\1.1\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CommonAssemblyInfo.cs"
+                    Link = "..\CommonAssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Testing\NUnit\AbstractDependencyInjectionSpringContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Testing\NUnit\AbstractSpringContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Testing\NUnit\AbstractTransactionalDbProviderSpringContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Testing\NUnit\AbstractTransactionalSpringContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2005.csproj b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2005.csproj
new file mode 100644
index 00000000..3deea103
--- /dev/null
+++ b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.2005.csproj
@@ -0,0 +1,73 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Testing.NUnit</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Testing.NUnit\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>Spring.Testing.NUnit.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Testing.NUnit\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1587, 1591, 219, 162, 618</NoWarn>
+    <DocumentationFile>Spring.Testing.NUnit.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Testing\NUnit\AbstractDependencyInjectionSpringContextTests.cs" />
+    <Compile Include="Testing\NUnit\AbstractSpringContextTests.cs" />
+    <Compile Include="Testing\NUnit\AbstractTransactionalDbProviderSpringContextTests.cs" />
+    <Compile Include="Testing\NUnit\AbstractTransactionalSpringContextTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data\Spring.Data.2005.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build
new file mode 100644
index 00000000..e1f14052
--- /dev/null
+++ b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build
@@ -0,0 +1,36 @@
+<?xml version="1.0" ?>
+<project name="Spring.Testing.NUnit" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+    <target name="build">
+        <csc target="library" define="${current.build.defines.csc}"
+                warnaserror="false"
+            debug="${current.build.debug}"
+            output="${current.bin.dir}/${project::get-name()}.dll"
+            doc="${current.bin.dir}/${project::get-name()}.xml"
+            >
+            <arg line="${compiler.args}"/>
+            <nowarn>
+                <warning number="219" />
+                <warning number="162" />
+                <warning number="1591" />
+            </nowarn>
+            <sources failonempty="true">
+                <include name="**/*.cs" />
+                <include name="../GenCommonAssemblyInfo.cs" />
+            </sources>
+		        <references basedir="${current.bin.dir}">
+			        <include name="System.Data.dll" />
+			        <include name="*.dll" />
+			        <exclude name="${project::get-name()}.dll" />
+				<exclude name="CloverRuntime.dll" />
+		        </references>
+        </csc>
+    </target>
+
+</project>
+
diff --git a/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.xml b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.xml
new file mode 100644
index 00000000..8cc6569d
--- /dev/null
+++ b/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.xml
@@ -0,0 +1,503 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Spring.Testing.NUnit</name>
+    </assembly>
+    <members>
+        <member name="T:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests">
+             <summary>
+             Convenient superclass for tests depending on a Spring context.
+             The test instance itself is populated by Dependency Injection.
+             </summary>
+             
+             <remarks>
+             <p>Really for integration testing, not unit testing.
+             You should <i>not</i> normally use the Spring container
+             for unit tests: simply populate your objects in plain NUnit tests!</p>
+            
+             <p>This supports two modes of populating the test:
+             <ul>
+             <li>Via Property Dependency Injection. Simply express dependencies on objects
+             in the test fixture, and they will be satisfied by autowiring by type.</li>
+             <li>Via Field Injection. Declare protected variables of the required type
+             which match named beans in the context. This is autowire by name,
+             rather than type. This approach is based on an approach originated by
+             Ara Abrahmian. Property Dependency Injection is the default: set the
+             "populateProtectedVariables" property to true in the constructor to switch
+             on Field Injection.</li>
+             </ul></p>
+            
+             <p>This class will normally cache contexts based on a <i>context key</i>:
+             normally the config locations String array describing the Spring resource
+             descriptors making up the context. Unless the <code>SetDirty()</code> method
+             is called by a test, the context will not be reloaded, even across different
+             subclasses of this test. This is particularly beneficial if your context is
+             slow to construct, for example if you are using Hibernate and the time taken
+             to load the mappings is an issue.</p>
+            
+             <p>If you don't want this behavior, you can override the <code>ContextKey</code>
+             property, most likely to return the test class. In conjunction with this you would
+             probably override the <code>GetContext</code> method, which by default loads
+             the locations specified by the <code>ConfigLocations</code> property.</p>
+            
+             <p><b>WARNING:</b> When doing integration tests from within VS.NET, only use
+             assembly resource URLs. Else, you may see misleading failures when changing
+             context locations.</p>
+             </remarks>
+             
+             <author>Rod Johnson</author>
+             <author>Rob Harrop</author>
+             <author>Rick Evans</author>
+             <author>Aleksandar Seovic (.NET)</author>
+             <version>$Id: AbstractDependencyInjectionSpringContextTests.cs,v 1.4 2008/03/14 12:02:45 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Testing.NUnit.AbstractSpringContextTests">
+            <summary>
+            Superclass for NUnit test cases using a Spring context.
+            </summary>
+            <remarks>
+            <p>Maintains a cache of contexts by key. This has significant performance
+            benefit if initializing the context would take time. While initializing a 
+            Spring context itself is very quick, some objects in a context, such as
+            a LocalSessionFactoryObject for working with NHibernate, may take time to
+            initialize. Hence it often makes sense to do that initializing once.</p>
+            <p>Normally you won't extend this class directly but rather extend one
+            of its subclasses.</p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: AbstractSpringContextTests.cs,v 1.2 2007/08/20 18:38:11 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Testing.NUnit.AbstractSpringContextTests.contextKeyToContextMap">
+            <summary>
+            Map of context keys returned by subclasses of this class, to
+            Spring contexts.
+            </summary>
+        </member>
+        <member name="F:Spring.Testing.NUnit.AbstractSpringContextTests.logger">
+            <summary>
+            Logger available to subclasses.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractSpringContextTests.#ctor">
+            <summary>
+            Default constructor for AbstractSpringContextTests.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractSpringContextTests.SetDirty(System.String[])">
+            <summary>
+            Set custom locations dirty. This will cause them to be reloaded
+            from the cache before the next test case is executed.
+            </summary>
+            <remarks>
+            Call this method only if you change the state of a singleton
+            object, potentially affecting future tests.
+            </remarks>
+            <param name="locations">Locations </param>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractSpringContextTests.HasCachedContext(System.Object)">
+            <summary>
+            Returns <c>true</c> if context for the specified 
+            <paramref name="contextKey"/> is cached.
+            </summary>
+            <param name="contextKey">Context key to check.</param>
+            <returns>
+            <c>true</c> if context for the specified 
+            <paramref name="contextKey"/> is cached, 
+            <c>false</c> otherwise.
+            </returns>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractSpringContextTests.ContextKeyString(System.Object)">
+            <summary>
+            Converts context key to string.
+            </summary>
+            <remarks>
+            Subclasses can override this to return a string representation of
+            their contextKey for use in logging.
+            </remarks>
+            <param name="contextKey">Context key to convert.</param>
+            <returns>
+            String representation of the specified <paramref name="contextKey"/>.  Null if 
+            contextKey is null.
+            </returns>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractSpringContextTests.AddContext(System.Object,Spring.Context.IConfigurableApplicationContext)">
+            <summary>
+            Caches application context.
+            </summary>
+            <param name="key">Key to use.</param>
+            <param name="context">Context to cache.</param>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractSpringContextTests.GetContext(System.Object)">
+            <summary>
+            Returns cached context if present, or loads it if not.
+            </summary>
+            <param name="key">Context key.</param>
+            <returns>Spring application context associated with the specified key.</returns>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractSpringContextTests.LoadContextLocations(System.String[])">
+            <summary>
+            Loads application context from the specified resource locations.
+            </summary>
+            <param name="locations">Resources to load object definitions from.</param>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractSpringContextTests.LoadContext(System.Object)">
+            <summary>
+            Loads application context based on user-defined key.
+            </summary>
+            <remarks>
+            Unless overriden by the user, this method will alway throw 
+            a <see cref="T:System.NotSupportedException"/>. 
+            </remarks>
+            <param name="key">User-defined key.</param>
+        </member>
+        <member name="F:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.applicationContext">
+            <summary>
+            Application context this test will run against.
+            </summary>
+        </member>
+        <member name="F:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.managedVariableNames">
+            <summary>
+            Holds names of the fields that should be used for field injection.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.#ctor">
+            <summary>
+            Default constructor for AbstractDependencyInjectionSpringContextTests.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.SetDirty">
+            <summary>
+            Called to say that the "applicationContext" instance variable is dirty and
+            should be reloaded. We need to do this if a test has modified the context
+            (for example, by replacing an object definition).
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.SetUp">
+            <summary>
+            Test setup method.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.InjectDependencies">
+            <summary>
+            Inject dependencies into 'this' instance (that is, this test instance).
+            </summary>
+            <remarks>
+            <p>The default implementation populates protected variables if the
+            <see cref="P:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.PopulateProtectedVariables"/> property is set, else
+            uses autowiring if autowiring is switched on (which it is by default).</p>
+            <p>You can certainly override this method if you want to totally control
+            how dependencies are injected into 'this' instance.</p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.LoadContextLocations(System.String[])">
+            <summary>
+            Loads application context from the specified resource locations.
+            </summary>
+            <param name="locations">Resources to load object definitions from.</param>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.InitManagedVariableNames">
+            <summary>
+            Retrieves the names of the fields that should be used for field injection.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.InjectProtectedVariables">
+            <summary>
+            Injects protected fields using Field Injection.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.BeforeProtectedVariableInjection(System.Reflection.FieldInfo)">
+            <summary>
+            Called right before a field is being injected
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.OnSetUp">
+            <summary>
+            Subclasses can override this method in order to 
+            add custom test setup logic.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.TearDown">
+            <summary>
+            Test teardown method.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.OnTearDown">
+            <summary>
+            Subclasses can override this method in order to 
+            add custom test teardown logic.
+            </summary>
+        </member>
+        <member name="P:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.PopulateProtectedVariables">
+            <summary>
+            Gets or sets a flag specifying whether to populate protected 
+            variables of this test case.
+            </summary>
+            <value>
+            A flag specifying whether to populate protected variables of this test case. 
+            Default is <b>false</b>.
+            </value>
+        </member>
+        <member name="P:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.AutowireMode">
+            <summary>
+            Gets or sets the autowire mode for test properties set by Dependency Injection.
+            </summary>
+            <value>
+            The autowire mode for test properties set by Dependency Injection.
+            The default is <see cref="F:Spring.Objects.Factory.Config.AutoWiringMode.ByType"/>.
+            </value>
+        </member>
+        <member name="P:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.DependencyCheck">
+            <summary>
+            Gets or sets a flag specifying whether or not dependency checking 
+            should be performed for test properties set by Dependency Injection.
+            </summary>
+            <value>
+            <p>A flag specifying whether or not dependency checking 
+            should be performed for test properties set by Dependency Injection.</p>
+            <p>The default is <b>true</b>, meaning that tests cannot be run
+            unless all properties are populated.</p>
+            </value>
+        </member>
+        <member name="P:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.LoadCount">
+            <summary>
+            Gets the current number of context load attempts.
+            </summary>
+        </member>
+        <member name="P:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.ContextKey">
+            <summary>
+            Gets a key for this context. Usually based on config locations, but
+            a subclass overriding buildContext() might want to return its class.
+            </summary>
+        </member>
+        <member name="P:Spring.Testing.NUnit.AbstractDependencyInjectionSpringContextTests.ConfigLocations">
+            <summary>
+            Subclasses must implement this property to return the locations of their
+            config files. A plain path will be treated as a file system location.
+            </summary>
+            <value>An array of config locations</value>
+        </member>
+        <member name="T:Spring.Testing.NUnit.AbstractTransactionalDbProviderSpringContextTests">
+            <summary>
+            Subclass of AbstractTransactionalSpringContextTests that adds some convenience
+            functionality for ADO.NET access. Expects a IDbProvider object
+            to be defined in the Spring application context.
+            </summary>
+            <remarks>
+            This class exposes a AdoTemplate and provides an easy way to delete from the
+            database in a new transaction.
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AbstractTransactionalDbProviderSpringContextTests.cs,v 1.3 2007/08/03 19:51:16 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests">
+             <summary>
+             Convenient superclass for tests that should occur in a transaction, but normally
+             will roll the transaction back on the completion of each test.
+             </summary>
+             <remarks>
+             <p>This is useful in a range of circumstances, allowing the following benefits:</p>
+             <ul>
+             <li>Ability to delete or insert any data in the database, without affecting other tests</li>
+             <li>Providing a transactional context for any code requiring a transaction</li>
+             <li>Ability to write anything to the database without any need to clean up.</li>
+             </ul>
+            
+             <p>This class is typically very fast, compared to traditional setup/teardown scripts.</p>
+            
+             <p>If data should be left in the database, call the <code>SetComplete()</code>
+             method in each test. The "DefaultRollback" property, which defaults to "true",
+             determines whether transactions will complete by default.</p>
+            
+             <p>It is even possible to end the transaction early; for example, to verify lazy
+             loading behavior of an O/R mapping tool. (This is a valuable away to avoid
+             unexpected errors when testing a web UI, for example.)  Simply call the
+             <code>endTransaction()</code> method. Execution will then occur without a
+             transactional context.</p>
+            
+             <p>The <code>StartNewTransaction()</code> method may be called after a call to
+             <code>EndTransaction()</code> if you wish to create a new transaction, quite
+             independent of the old transaction. The new transaction's default fate will be to
+             roll back, unless <code>setComplete()</code> is called again during the scope of the
+             new transaction. Any number of transactions may be created and ended in this way.
+             The final transaction will automatically be rolled back when the test case is
+             torn down.</p>
+            
+             <p>Transactional behavior requires a single object in the context implementing the
+             IPlatformTransactionManager interface. This will be set by the superclass's
+             Dependency Injection mechanism. If using the superclass's Field Injection mechanism,
+             the implementation should be named "transactionManager". This mechanism allows the
+             use of this superclass even when there's more than one transaction manager in the context.</p>
+             
+             <p><i>This superclass can also be used without transaction management, if no
+             IPlatformTransactionManager object is found in the context provided. Be careful about
+             using this mode, as it allows the potential to permanently modify data.
+             This mode is available only if dependency checking is turned off in
+             the AbstractDependencyInjectionSpringContextTests superclass. The non-transactional
+             capability is provided to enable use of the same subclass in different environments.</i></p>
+             
+             </remarks>
+                 
+             <author>Rod Johnson</author>
+             <author>Juergen Hoeller</author>
+             <author>Rick Evans</author>
+             <author>Mark Pollack (.NET)</author>
+             <version>$Id: AbstractTransactionalSpringContextTests.cs,v 1.3 2007/06/01 14:05:57 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.transactionManager">
+            <summary>
+            The transaction manager to use
+            </summary>
+        </member>
+        <member name="F:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.defaultRollback">
+            <summary>
+            Should we roll back by default?
+            </summary>
+        </member>
+        <member name="F:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.complete">
+            <summary>
+            Should we commit the current transaction?
+            </summary>
+        </member>
+        <member name="F:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.transactionsStarted">
+            <summary>
+            Number of transactions started
+            </summary>
+        </member>
+        <member name="F:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.transactionDefinition">
+            <summary>
+            Default transaction definition is used.
+            Subclasses can change this to cause different behaviour.
+            </summary>
+        </member>
+        <member name="F:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.transactionStatus">
+            <summary>
+            TransactionStatus for this test. Typical subclasses won't need to use it.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.PreventTransaction">
+            <summary>
+            Prevents the transaction.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.OnSetUp">
+            <summary>
+            Creates a transaction
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.OnSetUpBeforeTransaction">
+            <summary>
+            Callback method called before transaction is setup.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.OnSetUpInTransaction">
+            <summary>
+            Callback method called after transaction is setup.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.OnTearDown">
+            <summary>
+            rollback the transaction.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.OnTearDownInTransaction">
+            <summary>
+            Callback before rolling back the transaction.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.OnTearDownAfterTransaction">
+            <summary>
+            Callback after rolling back the transaction.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.SetComplete">
+            <summary>
+            Set the complete flag..
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.EndTransaction">
+            <summary>
+            Ends the transaction.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.StartNewTransaction">
+            <summary>
+            Starts the new transaction.
+            </summary>
+        </member>
+        <member name="P:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.TransactionManager">
+            <summary>
+            Sets the transaction manager to use.
+            </summary>
+        </member>
+        <member name="P:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.DefaultRollback">
+            <summary>
+            Sets the default rollback flag.
+            </summary>
+        </member>
+        <member name="P:Spring.Testing.NUnit.AbstractTransactionalSpringContextTests.TransactionDefinition">
+            <summary>
+            Set the <see cref="T:Spring.Transaction.ITransactionDefinition"/> to be used
+            </summary>
+            <remarks>
+            Defaults to <see cref="T:Spring.Transaction.Support.DefaultTransactionDefinition"/>
+            </remarks>
+        </member>
+        <member name="F:Spring.Testing.NUnit.AbstractTransactionalDbProviderSpringContextTests.adoTemplate">
+            <summary>
+            Holds the <see cref="P:Spring.Testing.NUnit.AbstractTransactionalDbProviderSpringContextTests.AdoTemplate"/> that this base class manages
+            </summary>
+        </member>
+        <member name="F:Spring.Testing.NUnit.AbstractTransactionalDbProviderSpringContextTests.zappedTables">
+            <summary>
+            Did this test delete any tables? If so, we forbid transaction completion,
+            and only allow rollback.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalDbProviderSpringContextTests.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Testing.NUnit.AbstractTransactionalDbProviderSpringContextTests"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalDbProviderSpringContextTests.DeleteFromTables(System.String[])">
+            <summary>
+            Convenient method to delete all rows from these tables.
+            Calling this method will make avoidance of rollback by calling
+            SetComplete() impossible.
+            </summary>
+            <param name="names"></param>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalDbProviderSpringContextTests.SetComplete">
+            <summary>
+            Overridden to prevent the transaction committing if a number of tables have been
+            cleared, as a defensive measure against accidental <i>permanent</i> wiping of a database.
+            </summary>
+        </member>
+        <member name="M:Spring.Testing.NUnit.AbstractTransactionalDbProviderSpringContextTests.CountRowsInTable(System.String)">
+            <summary>
+            Counts the rows in given table.
+            </summary>
+            <param name="tableName">Name of the table to count rows in.</param>
+            <returns>The number of rows in the table</returns>
+        </member>
+        <member name="P:Spring.Testing.NUnit.AbstractTransactionalDbProviderSpringContextTests.DbProvider">
+            <summary>
+            Sets the DbProvider, via Dependency Injection.
+            </summary>
+            <value>The IDbProvider.</value>
+        </member>
+        <member name="P:Spring.Testing.NUnit.AbstractTransactionalDbProviderSpringContextTests.AdoTemplate">
+            <summary>
+            Gets or sets the AdoTemplate that this base class manages.
+            </summary>
+            <value>The ADO template.</value>
+        </member>
+    </members>
+</doc>
diff --git a/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractDependencyInjectionSpringContextTests.cs b/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractDependencyInjectionSpringContextTests.cs
new file mode 100644
index 00000000..a0d2bc04
--- /dev/null
+++ b/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractDependencyInjectionSpringContextTests.cs
@@ -0,0 +1,370 @@
+#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.Collections;
+using System.Reflection;
+
+using NUnit.Framework;
+
+using Spring.Context;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+
+namespace Spring.Testing.NUnit
+{
+    /// <summary>
+    /// Convenient superclass for tests depending on a Spring context.
+    /// The test instance itself is populated by Dependency Injection.
+    /// </summary>
+    /// 
+    /// <remarks>
+    /// <p>Really for integration testing, not unit testing.
+    /// You should <i>not</i> normally use the Spring container
+    /// for unit tests: simply populate your objects in plain NUnit tests!</p>
+    ///
+    /// <p>This supports two modes of populating the test:
+    /// <ul>
+    /// <li>Via Property Dependency Injection. Simply express dependencies on objects
+    /// in the test fixture, and they will be satisfied by autowiring by type.</li>
+    /// <li>Via Field Injection. Declare protected variables of the required type
+    /// which match named beans in the context. This is autowire by name,
+    /// rather than type. This approach is based on an approach originated by
+    /// Ara Abrahmian. Property Dependency Injection is the default: set the
+    /// "populateProtectedVariables" property to true in the constructor to switch
+    /// on Field Injection.</li>
+    /// </ul></p>
+    ///
+    /// <p>This class will normally cache contexts based on a <i>context key</i>:
+    /// normally the config locations String array describing the Spring resource
+    /// descriptors making up the context. Unless the <code>SetDirty()</code> method
+    /// is called by a test, the context will not be reloaded, even across different
+    /// subclasses of this test. This is particularly beneficial if your context is
+    /// slow to construct, for example if you are using Hibernate and the time taken
+    /// to load the mappings is an issue.</p>
+    ///
+    /// <p>If you don't want this behavior, you can override the <code>ContextKey</code>
+    /// property, most likely to return the test class. In conjunction with this you would
+    /// probably override the <code>GetContext</code> method, which by default loads
+    /// the locations specified by the <code>ConfigLocations</code> property.</p>
+    ///
+    /// <p><b>WARNING:</b> When doing integration tests from within VS.NET, only use
+    /// assembly resource URLs. Else, you may see misleading failures when changing
+    /// context locations.</p>
+    /// </remarks>
+    /// 
+    /// <author>Rod Johnson</author>
+    /// <author>Rob Harrop</author>
+    /// <author>Rick Evans</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: AbstractDependencyInjectionSpringContextTests.cs,v 1.4 2008/03/14 12:02:45 oakinger Exp $</version>
+    public abstract class AbstractDependencyInjectionSpringContextTests : AbstractSpringContextTests
+    {
+        private bool populateProtectedVariables = false;
+        private AutoWiringMode autowireMode = AutoWiringMode.ByType;
+        private bool dependencyCheck = true;
+
+        /// <summary>
+        /// Application context this test will run against.
+        /// </summary>
+        protected IConfigurableApplicationContext applicationContext;
+
+        /// <summary>
+        /// Holds names of the fields that should be used for field injection.
+        /// </summary>
+        protected string[] managedVariableNames;
+        private int loadCount = 0;
+
+        /// <summary>
+        /// Default constructor for AbstractDependencyInjectionSpringContextTests.
+        /// </summary>
+        public AbstractDependencyInjectionSpringContextTests()
+        {}
+
+        /// <summary>
+        /// Gets or sets a flag specifying whether to populate protected 
+        /// variables of this test case.
+        /// </summary>
+        /// <value>
+        /// A flag specifying whether to populate protected variables of this test case. 
+        /// Default is <b>false</b>.
+        /// </value>
+        public bool PopulateProtectedVariables
+        {
+            get { return populateProtectedVariables; }
+            set { populateProtectedVariables = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the autowire mode for test properties set by Dependency Injection.
+        /// </summary>
+        /// <value>
+        /// The autowire mode for test properties set by Dependency Injection.
+        /// The default is <see cref="AutoWiringMode.ByType"/>.
+        /// </value>
+        public AutoWiringMode AutowireMode
+        {
+            get { return autowireMode; }
+            set { autowireMode = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a flag specifying whether or not dependency checking 
+        /// should be performed for test properties set by Dependency Injection.
+        /// </summary>
+        /// <value>
+        /// <p>A flag specifying whether or not dependency checking 
+        /// should be performed for test properties set by Dependency Injection.</p>
+        /// <p>The default is <b>true</b>, meaning that tests cannot be run
+        /// unless all properties are populated.</p>
+        /// </value>
+        public bool DependencyCheck
+        {
+            get { return dependencyCheck; }
+            set { dependencyCheck = value; }
+        }
+
+        /// <summary>
+        /// Gets the current number of context load attempts.
+        /// </summary>
+        public int LoadCount
+        {
+            get { return loadCount; }
+        }
+
+        /// <summary>
+        /// Called to say that the "applicationContext" instance variable is dirty and
+        /// should be reloaded. We need to do this if a test has modified the context
+        /// (for example, by replacing an object definition).
+        /// </summary>
+        public void SetDirty()
+        {
+            SetDirty(ConfigLocations);
+        }
+
+        /// <summary>
+        /// Test setup method.
+        /// </summary>
+        [SetUp]
+        protected virtual void SetUp()
+        {
+            this.applicationContext = GetContext(ContextKey);
+            InjectDependencies();
+            try
+            {
+                OnSetUp();
+            }
+            catch (Exception ex)
+            {
+                logger.Error("Setup error", ex);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Inject dependencies into 'this' instance (that is, this test instance).
+        /// </summary>
+        /// <remarks>
+        /// <p>The default implementation populates protected variables if the
+        /// <see cref="PopulateProtectedVariables"/> property is set, else
+        /// uses autowiring if autowiring is switched on (which it is by default).</p>
+        /// <p>You can certainly override this method if you want to totally control
+        /// how dependencies are injected into 'this' instance.</p>
+        /// </remarks>
+        protected virtual void InjectDependencies()
+        {
+            if (PopulateProtectedVariables)
+            {
+                if (this.managedVariableNames == null)
+                {
+                    InitManagedVariableNames();
+                }
+                InjectProtectedVariables();
+            }
+            else if (AutowireMode != AutoWiringMode.No)
+            {
+                IConfigurableListableObjectFactory factory = this.applicationContext.ObjectFactory;
+                ((AbstractObjectFactory) factory).IgnoreDependencyType(typeof(AutoWiringMode));
+                factory.AutowireObjectProperties(this, AutowireMode, DependencyCheck);
+            }
+        }
+
+        /// <summary>
+        /// Gets a key for this context. Usually based on config locations, but
+        /// a subclass overriding buildContext() might want to return its class.
+        /// </summary>
+        protected virtual object ContextKey
+        {
+            get { return ConfigLocations; }
+        }
+
+        /// <summary>
+        /// Loads application context from the specified resource locations.
+        /// </summary>
+        /// <param name="locations">Resources to load object definitions from.</param>
+        protected override IConfigurableApplicationContext LoadContextLocations(string[] locations)
+        {
+            ++this.loadCount;
+            return base.LoadContextLocations(locations);
+        }
+
+        /// <summary>
+        /// Retrieves the names of the fields that should be used for field injection.
+        /// </summary>
+        protected virtual void InitManagedVariableNames()
+        {
+            ArrayList managedVarNames = new ArrayList();
+            Type type = GetType();
+
+            do
+            {
+                FieldInfo[] fields =
+                    type.GetFields(BindingFlags.DeclaredOnly | BindingFlags.NonPublic | BindingFlags.Instance);
+                if (logger.IsDebugEnabled)
+                {
+                    logger.Debug("Found " + fields.Length + " fields on " + type);
+                }
+
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    FieldInfo field = fields[i];
+                    if (logger.IsDebugEnabled)
+                    {
+                        logger.Debug("Candidate field: " + field);
+                    }
+                    if (IsProtectedInstanceField(field))
+                    {
+                        object oldValue = field.GetValue(this);
+                        if (oldValue == null)
+                        {
+                            managedVarNames.Add(field.Name);
+                            if (logger.IsDebugEnabled)
+                            {
+                                logger.Debug("Added managed variable '" + field.Name + "'");
+                            }
+                        }
+                        else
+                        {
+                            if (logger.IsDebugEnabled)
+                            {
+                                logger.Debug("Rejected managed variable '" + field.Name + "'");
+                            }
+                        }
+                    }
+                }
+                type = type.BaseType;
+            } while (type != typeof (AbstractDependencyInjectionSpringContextTests));
+
+            this.managedVariableNames = (string[]) managedVarNames.ToArray(typeof (string));
+        }
+
+        private static bool IsProtectedInstanceField(FieldInfo field)
+        {
+            return field.IsFamily;
+        }
+
+        /// <summary>
+        /// Injects protected fields using Field Injection.
+        /// </summary>
+        protected virtual void InjectProtectedVariables()
+        {
+            for (int i = 0; i < this.managedVariableNames.Length; i++)
+            {
+                string fieldName = this.managedVariableNames[i];
+                Object obj = null;
+                try
+                {
+                    FieldInfo field = GetType().GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance);
+                    if (field != null)
+                    {
+                        BeforeProtectedVariableInjection(field);
+                        obj = this.applicationContext.GetObject(fieldName, field.FieldType);
+                        field.SetValue(this, obj);
+                        if (logger.IsDebugEnabled)
+                        {
+                            logger.Debug("Populated field: " + field);
+                        }
+                    }
+                    else
+                    {
+                        if (logger.IsWarnEnabled)
+                        {
+                            logger.Warn("No field with name '" + fieldName + "'");
+                        }
+                    }
+                }
+                catch (NoSuchObjectDefinitionException)
+                {
+                    if (logger.IsWarnEnabled)
+                    {
+                        logger.Warn("No object definition with name '" + fieldName + "'");
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called right before a field is being injected
+        /// </summary>
+        protected virtual void BeforeProtectedVariableInjection(FieldInfo fieldInfo)
+        {
+
+        }
+
+        /// <summary>
+        /// Subclasses can override this method in order to 
+        /// add custom test setup logic.
+        /// </summary>
+        protected virtual void OnSetUp()
+        {}
+
+        /// <summary>
+        /// Test teardown method.
+        /// </summary>
+        [TearDown]
+        protected void TearDown()
+        {
+            try
+            {
+                OnTearDown();
+            }
+            catch (Exception ex)
+            {
+                logger.Error("OnTearDown error", ex);
+            }
+        }
+
+        /// <summary>
+        /// Subclasses can override this method in order to 
+        /// add custom test teardown logic.
+        /// </summary>
+        protected virtual void OnTearDown()
+        {}
+
+
+        /// <summary>
+        /// Subclasses must implement this property to return the locations of their
+        /// config files. A plain path will be treated as a file system location.
+        /// </summary>
+        /// <value>An array of config locations</value>
+        protected abstract string[] ConfigLocations { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractSpringContextTests.cs b/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractSpringContextTests.cs
new file mode 100644
index 00000000..7476c857
--- /dev/null
+++ b/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractSpringContextTests.cs
@@ -0,0 +1,191 @@
+/*
+ * 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.
+ */
+
+using System;
+using System.Collections;
+using Common.Logging;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Util;
+
+namespace Spring.Testing.NUnit
+{
+    /// <summary>
+    /// Superclass for NUnit test cases using a Spring context.
+    /// </summary>
+    /// <remarks>
+    /// <p>Maintains a cache of contexts by key. This has significant performance
+    /// benefit if initializing the context would take time. While initializing a 
+    /// Spring context itself is very quick, some objects in a context, such as
+    /// a LocalSessionFactoryObject for working with NHibernate, may take time to
+    /// initialize. Hence it often makes sense to do that initializing once.</p>
+    /// <p>Normally you won't extend this class directly but rather extend one
+    /// of its subclasses.</p>
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: AbstractSpringContextTests.cs,v 1.2 2007/08/20 18:38:11 markpollack Exp $</version>
+    public abstract class AbstractSpringContextTests 
+    {
+        /// <summary>
+        /// Map of context keys returned by subclasses of this class, to
+        /// Spring contexts.
+        /// </summary>
+	    private static IDictionary contextKeyToContextMap = new Hashtable();
+
+        /// <summary>
+        /// Logger available to subclasses.
+        /// </summary>
+        protected ILog logger;
+
+        /// <summary>
+        /// Default constructor for AbstractSpringContextTests.
+        /// </summary>
+	    public AbstractSpringContextTests()
+        {
+            logger = LogManager.GetLogger(GetType());
+        }
+
+        /// <summary>
+        /// Set custom locations dirty. This will cause them to be reloaded
+        /// from the cache before the next test case is executed.
+        /// </summary>
+        /// <remarks>
+        /// Call this method only if you change the state of a singleton
+        /// object, potentially affecting future tests.
+        /// </remarks>
+        /// <param name="locations">Locations </param>
+	    protected void SetDirty(string[] locations) 
+        {
+		    String keyString = ContextKeyString(locations);
+		    IConfigurableApplicationContext ctx =
+				    (IConfigurableApplicationContext) contextKeyToContextMap[keyString];
+	        contextKeyToContextMap.Remove(keyString);
+
+            if (ctx != null) 
+            {
+			    ctx.Dispose();
+		    }
+	    }
+
+        /// <summary>
+        /// Returns <c>true</c> if context for the specified 
+        /// <paramref name="contextKey"/> is cached.
+        /// </summary>
+        /// <param name="contextKey">Context key to check.</param>
+        /// <returns>
+        /// <c>true</c> if context for the specified 
+        /// <paramref name="contextKey"/> is cached, 
+        /// <c>false</c> otherwise.
+        /// </returns>
+	    protected bool HasCachedContext(object contextKey) 
+        {
+		    return contextKeyToContextMap.Contains(contextKey);
+	    }
+
+        /// <summary>
+        /// Converts context key to string.
+        /// </summary>
+        /// <remarks>
+        /// Subclasses can override this to return a string representation of
+        /// their contextKey for use in logging.
+        /// </remarks>
+        /// <param name="contextKey">Context key to convert.</param>
+        /// <returns>
+        /// String representation of the specified <paramref name="contextKey"/>.  Null if 
+        /// contextKey is null.
+        /// </returns>
+	    protected virtual string ContextKeyString(object contextKey) 
+        {
+            if (contextKey == null)
+            {
+                return null;
+            }
+		    if (contextKey is string[]) 
+            {
+			    return StringUtils.ArrayToCommaDelimitedString((string[]) contextKey);
+		    }
+		    else 
+            {
+			    return contextKey.ToString();
+		    }
+	    }
+
+        /// <summary>
+        /// Caches application context.
+        /// </summary>
+        /// <param name="key">Key to use.</param>
+        /// <param name="context">Context to cache.</param>
+	    public void AddContext(object key, IConfigurableApplicationContext context) 
+        {
+            AssertUtils.ArgumentNotNull(context, "context", "ApplicationContext must not be null");
+		    contextKeyToContextMap[ContextKeyString(key)] = context;
+	    }
+
+        /// <summary>
+        /// Returns cached context if present, or loads it if not.
+        /// </summary>
+        /// <param name="key">Context key.</param>
+        /// <returns>Spring application context associated with the specified key.</returns>
+	    protected IConfigurableApplicationContext GetContext(object key) 
+        {
+		    string keyString = ContextKeyString(key);
+		    IConfigurableApplicationContext ctx =
+				    (IConfigurableApplicationContext) contextKeyToContextMap[keyString];
+		    if (ctx == null) 
+            {
+			    if (key is string[]) 
+                {
+				    ctx = LoadContextLocations((string[]) key);
+			    }
+			    else 
+                {
+				    ctx = LoadContext(key);
+			    }
+			    contextKeyToContextMap[keyString] = ctx;
+		    }
+		    return ctx;
+	    }
+
+
+	    /// <summary>
+	    /// Loads application context from the specified resource locations.
+	    /// </summary>
+	    /// <param name="locations">Resources to load object definitions from.</param>
+	    protected virtual IConfigurableApplicationContext LoadContextLocations(string[] locations) 
+        {
+		    if (logger.IsInfoEnabled) 
+            {
+			    logger.Info("Loading config for: " + StringUtils.ArrayToCommaDelimitedString(locations));
+		    }
+		    return new XmlApplicationContext(locations);
+	    }
+
+        /// <summary>
+        /// Loads application context based on user-defined key.
+        /// </summary>
+        /// <remarks>
+        /// Unless overriden by the user, this method will alway throw 
+        /// a <see cref="NotSupportedException"/>. 
+        /// </remarks>
+        /// <param name="key">User-defined key.</param>
+        protected virtual IConfigurableApplicationContext LoadContext(object key) 
+        {
+		    throw new NotSupportedException("Subclasses may override this");
+	    }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractTransactionalDbProviderSpringContextTests.cs b/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractTransactionalDbProviderSpringContextTests.cs
new file mode 100644
index 00000000..5bc0b7c0
--- /dev/null
+++ b/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractTransactionalDbProviderSpringContextTests.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Data;
+using Spring.Data;
+using Spring.Data.Common;
+using Spring.Data.Core;
+
+namespace Spring.Testing.NUnit
+{
+    /// <summary>
+    /// Subclass of AbstractTransactionalSpringContextTests that adds some convenience
+    /// functionality for ADO.NET access. Expects a IDbProvider object
+    /// to be defined in the Spring application context.
+    /// </summary>
+    /// <remarks>
+    /// This class exposes a AdoTemplate and provides an easy way to delete from the
+    /// database in a new transaction.
+    /// </remarks>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AbstractTransactionalDbProviderSpringContextTests.cs,v 1.3 2007/08/03 19:51:16 markpollack Exp $</version>
+    public abstract class AbstractTransactionalDbProviderSpringContextTests : AbstractTransactionalSpringContextTests
+    {
+        /// <summary>
+        /// Holds the <see cref="AdoTemplate"/> that this base class manages
+        /// </summary>
+        protected AdoTemplate adoTemplate;
+
+        /// <summary>
+        /// Did this test delete any tables? If so, we forbid transaction completion,
+        /// and only allow rollback.
+        /// </summary>
+        private bool zappedTables;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AbstractTransactionalDbProviderSpringContextTests"/> class.
+        /// </summary>
+        public AbstractTransactionalDbProviderSpringContextTests()
+        {
+        }
+
+        /// <summary>
+        /// Sets the DbProvider, via Dependency Injection.
+        /// </summary>
+        /// <value>The IDbProvider.</value>
+        public IDbProvider DbProvider
+        {
+            set { adoTemplate = new AdoTemplate(value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the AdoTemplate that this base class manages.
+        /// </summary>
+        /// <value>The ADO template.</value>
+        public AdoTemplate AdoTemplate
+        {
+            get { return adoTemplate; }
+        }
+
+        /// <summary>
+        /// Convenient method to delete all rows from these tables.
+        /// Calling this method will make avoidance of rollback by calling
+        /// SetComplete() impossible.
+        /// </summary>
+        /// <param name="names"></param>
+        protected void DeleteFromTables(String[] names)
+        {
+            for (int i = 0; i < names.Length; i++)
+            {
+                int rowCount = this.adoTemplate.ExecuteNonQuery(CommandType.Text, "DELETE FROM " + names[i]);
+                if (logger.IsInfoEnabled)
+                {
+                    logger.Info("Deleted " + rowCount + " rows from table " + names[i]);
+                }
+            }
+            this.zappedTables = true;
+        }
+
+        /// <summary>
+        /// Overridden to prevent the transaction committing if a number of tables have been
+        /// cleared, as a defensive measure against accidental <i>permanent</i> wiping of a database.
+        /// </summary>
+        protected override void SetComplete()
+        {
+            if (this.zappedTables)
+            {
+                throw new InvalidOperationException("Cannot set complete after deleting tables");
+            }
+            base.SetComplete();
+        }
+
+        /// <summary>
+        /// Counts the rows in given table.
+        /// </summary>
+        /// <param name="tableName">Name of the table to count rows in.</param>
+        /// <returns>The number of rows in the table</returns>
+        protected int CountRowsInTable(String tableName)
+        {
+            return (int) adoTemplate.ExecuteScalar(CommandType.Text, "SELECT COUNT(0) FROM " + tableName); 
+
+        }
+        
+        //TODO ExecuteScript...
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractTransactionalSpringContextTests.cs b/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractTransactionalSpringContextTests.cs
new file mode 100644
index 00000000..a5345cc4
--- /dev/null
+++ b/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractTransactionalSpringContextTests.cs
@@ -0,0 +1,286 @@
+using System;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+namespace Spring.Testing.NUnit
+{
+    /// <summary>
+    /// Convenient superclass for tests that should occur in a transaction, but normally
+    /// will roll the transaction back on the completion of each test.
+    /// </summary>
+    /// <remarks>
+    /// <p>This is useful in a range of circumstances, allowing the following benefits:</p>
+    /// <ul>
+    /// <li>Ability to delete or insert any data in the database, without affecting other tests</li>
+    /// <li>Providing a transactional context for any code requiring a transaction</li>
+    /// <li>Ability to write anything to the database without any need to clean up.</li>
+    /// </ul>
+    ///
+    /// <p>This class is typically very fast, compared to traditional setup/teardown scripts.</p>
+    ///
+    /// <p>If data should be left in the database, call the <code>SetComplete()</code>
+    /// method in each test. The "DefaultRollback" property, which defaults to "true",
+    /// determines whether transactions will complete by default.</p>
+    ///
+    /// <p>It is even possible to end the transaction early; for example, to verify lazy
+    /// loading behavior of an O/R mapping tool. (This is a valuable away to avoid
+    /// unexpected errors when testing a web UI, for example.)  Simply call the
+    /// <code>endTransaction()</code> method. Execution will then occur without a
+    /// transactional context.</p>
+    ///
+    /// <p>The <code>StartNewTransaction()</code> method may be called after a call to
+    /// <code>EndTransaction()</code> if you wish to create a new transaction, quite
+    /// independent of the old transaction. The new transaction's default fate will be to
+    /// roll back, unless <code>setComplete()</code> is called again during the scope of the
+    /// new transaction. Any number of transactions may be created and ended in this way.
+    /// The final transaction will automatically be rolled back when the test case is
+    /// torn down.</p>
+    ///
+    /// <p>Transactional behavior requires a single object in the context implementing the
+    /// IPlatformTransactionManager interface. This will be set by the superclass's
+    /// Dependency Injection mechanism. If using the superclass's Field Injection mechanism,
+    /// the implementation should be named "transactionManager". This mechanism allows the
+    /// use of this superclass even when there's more than one transaction manager in the context.</p>
+    /// 
+    /// <p><i>This superclass can also be used without transaction management, if no
+    /// IPlatformTransactionManager object is found in the context provided. Be careful about
+    /// using this mode, as it allows the potential to permanently modify data.
+    /// This mode is available only if dependency checking is turned off in
+    /// the AbstractDependencyInjectionSpringContextTests superclass. The non-transactional
+    /// capability is provided to enable use of the same subclass in different environments.</i></p>
+    /// 
+    /// </remarks>
+    ///     
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AbstractTransactionalSpringContextTests.cs,v 1.3 2007/06/01 14:05:57 oakinger Exp $</version>
+    public abstract class AbstractTransactionalSpringContextTests : AbstractDependencyInjectionSpringContextTests
+    {
+        /// <summary>
+        /// The transaction manager to use
+        /// </summary>
+        protected IPlatformTransactionManager transactionManager;
+
+        /// <summary>
+        /// Should we roll back by default?
+        /// </summary>
+        private bool defaultRollback = true;
+
+        /// <summary>
+        /// Should we commit the current transaction?
+        /// </summary>
+        private bool complete = false;
+
+        /// <summary>
+        /// Number of transactions started
+        /// </summary>
+        private int transactionsStarted = 0;
+
+        /// <summary>
+        /// Default transaction definition is used.
+        /// Subclasses can change this to cause different behaviour.
+        /// </summary>
+        private ITransactionDefinition transactionDefinition = new DefaultTransactionDefinition();
+
+        /// <summary>
+        /// TransactionStatus for this test. Typical subclasses won't need to use it.
+        /// </summary>
+        protected ITransactionStatus transactionStatus;
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AbstractTransactionalSpringContextTests"/> class.
+        /// </summary>
+        public AbstractTransactionalSpringContextTests()
+        {
+        }
+
+        /// <summary>
+        /// Sets the transaction manager to use.
+        /// </summary>
+        public IPlatformTransactionManager TransactionManager
+        {
+            set { transactionManager = value; }
+        }
+
+        /// <summary>
+        /// Sets the default rollback flag.
+        /// </summary>
+        public bool DefaultRollback
+        {
+            set { defaultRollback = value; }
+        }
+
+        /// <summary>
+        /// Set the <see cref="ITransactionDefinition"/> to be used
+        /// </summary>
+        /// <remarks>
+        /// Defaults to <see cref="DefaultTransactionDefinition"/>
+        /// </remarks>
+        protected ITransactionDefinition TransactionDefinition
+        {
+            set { transactionDefinition = value; }
+        }
+
+        /// <summary>
+        /// Prevents the transaction.
+        /// </summary>
+        protected virtual void PreventTransaction()
+        {
+            this.transactionDefinition = null;
+        }
+
+
+        /// <summary>
+        /// Creates a transaction
+        /// </summary>
+        protected override void OnSetUp()
+        {
+            this.complete = !this.defaultRollback;
+
+            if (this.transactionManager == null)
+            {
+                logger.Info("No transaction manager set: test will NOT run within a transaction");
+            }
+            else if (this.transactionDefinition == null)
+            {
+                logger.Info("No transaction definition set: test will NOT run within a transaction");
+            }
+            else
+            {
+                OnSetUpBeforeTransaction();
+                StartNewTransaction();
+                try
+                {
+                    OnSetUpInTransaction();
+                }
+                catch (Exception)
+                {
+                    EndTransaction();
+                    throw;
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Callback method called before transaction is setup.
+        /// </summary>
+        protected virtual void OnSetUpBeforeTransaction()
+        {
+        }
+
+        /// <summary>
+        /// Callback method called after transaction is setup.
+        /// </summary>
+        protected virtual void OnSetUpInTransaction()
+        {
+        }
+
+        /// <summary>
+        /// rollback the transaction.
+        /// </summary>
+        protected override void OnTearDown()
+        {
+            // Call onTearDownInTransaction and end transaction if the transaction is still active.
+            if (this.transactionStatus != null && !this.transactionStatus.Completed)
+            {
+                try
+                {
+                    OnTearDownInTransaction();
+                }
+                finally
+                {
+                    EndTransaction();
+                }
+            }
+            // Call onTearDownAfterTransaction if there was at least one transaction,
+            // even if it has been completed early through an endTransaction() call.
+            if (this.transactionsStarted > 0)
+            {
+                OnTearDownAfterTransaction();
+            }
+        }
+
+        /// <summary>
+        /// Callback before rolling back the transaction.
+        /// </summary>
+        protected virtual void OnTearDownInTransaction()
+        {
+        }
+
+        /// <summary>
+        /// Callback after rolling back the transaction.
+        /// </summary>
+        protected virtual void OnTearDownAfterTransaction()
+        {
+        }
+
+        /// <summary>
+        /// Set the complete flag..
+        /// </summary>
+        protected virtual void SetComplete()
+        {
+            if (this.transactionManager == null)
+            {
+                throw new InvalidOperationException("No transaction manager set");
+            }
+            this.complete = true;
+        }
+
+        /// <summary>
+        /// Ends the transaction.
+        /// </summary>
+        protected virtual void EndTransaction()
+        {
+            if (this.transactionStatus != null)
+            {
+                try
+                {
+                    if (!this.complete)
+                    {
+                        this.transactionManager.Rollback(this.transactionStatus);
+                        logger.Info("Rolled back transaction after test execution");
+                    }
+                    else
+                    {
+                        this.transactionManager.Commit(this.transactionStatus);
+                        logger.Info("Committed transaction after test execution");
+                    }
+                }
+                finally
+                {
+                    this.transactionStatus = null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Starts the new transaction.
+        /// </summary>
+        protected void StartNewTransaction()
+        {
+            if (this.transactionStatus != null)
+            {
+                throw new InvalidOperationException("Cannot start new transaction without ending existing transaction: " +
+                                                "Invoke endTransaction() before startNewTransaction()");
+            }
+            if (this.transactionManager == null)
+            {
+                throw new InvalidOperationException("No transaction manager set");
+            }
+
+            this.transactionStatus = this.transactionManager.GetTransaction(this.transactionDefinition);
+            ++this.transactionsStarted;
+            this.complete = !this.defaultRollback;
+
+            if (logger.IsInfoEnabled)
+            {
+                logger.Info("Began transaction (" + this.transactionsStarted + "): transaction manager [" +
+                            this.transactionManager + "]; default rollback = " + this.defaultRollback);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web.Extensions/AssemblyInfo.cs b/src/Spring/Spring.Web.Extensions/AssemblyInfo.cs
new file mode 100644
index 00000000..9dc950a5
--- /dev/null
+++ b/src/Spring/Spring.Web.Extensions/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle("Spring.Net ASP.NET AJAX 1.0 support")]
+[assembly: AssemblyDescription("Interfaces and classes that provide ASP.NET AJAX 1.0 support in Spring.Net")]
\ No newline at end of file
diff --git a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2005.csproj b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2005.csproj
new file mode 100644
index 00000000..46fb6f94
--- /dev/null
+++ b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.2005.csproj
@@ -0,0 +1,69 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E5E287D2-EE2C-4C99-87CA-EB27B35ABF7B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Web.Extensions</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Web.Extensions\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>Spring.Web.Extensions.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Web.Extensions\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\System.Web.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Services" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Web\Script\Services\ScriptHandlerFactory.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Web\Spring.Web.2005.csproj">
+      <Project>{BA4789EB-281A-48EA-8763-28B9F0596A18}</Project>
+      <Name>Spring.Web.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build
new file mode 100644
index 00000000..f00086cf
--- /dev/null
+++ b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build
@@ -0,0 +1,37 @@
+<?xml version="1.0" ?>
+<project name="Spring.Web.Extensions" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+-->
+	<target name="build">
+		<!-- build Spring.Web.Extensions -->
+		<csc target="library" define="${current.build.defines.csc}" 
+		     warnaserror="true"
+		     debug="${current.build.debug}" 
+		     output="${current.bin.dir}/${project::get-name()}.dll" 
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+		     >
+			<arg line="${compiler.args}"/>	
+			<nowarn>
+				<warning number="${nowarn.numbers}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../GenCommonAssemblyInfo.cs" />
+			</sources>
+			<resources basedir="Resources">
+				<include name="**/*" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+				<include name="Spring.Core.dll" />
+				<include name="Spring.Web.dll" />
+				<include name="System.Web.Extensions.dll" />
+				<include name="System.Web.dll" />
+				<include name="System.Web.Services.dll" />
+			</references>
+		</csc>
+	</target>
+</project>
diff --git a/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.xml b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.xml
new file mode 100644
index 00000000..65f389c0
--- /dev/null
+++ b/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Spring.Web.Extensions</name>
+    </assembly>
+    <members>
+        <member name="T:Spring.Web.Script.Services.ScriptHandlerFactory">
+            <summary>
+            An <see cref="T:System.Web.IHttpHandlerFactory"/> implementation that 
+            creates a handler object for either ASP.NET AJAX 1.0 or Spring web services.
+            </summary>
+            <author>Bruno Baia</author>
+            <author>Thomas Broyer</author>
+            <version>$Id: ScriptHandlerFactory.cs,v 1.2 2008/03/27 11:11:22 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Script.Services.ScriptHandlerFactory.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Web.Script.Services.ScriptHandlerFactory"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Script.Services.ScriptHandlerFactory.GetHandler(System.Web.HttpContext,System.String,System.String,System.String)">
+            <summary>
+            Retrieves an instance of the <see cref="T:System.Web.IHttpHandler"/> 
+            implementation for handling web service requests 
+            for both Spring and ASP.NET AJAX 1.0 web services.
+            </summary>
+            <param name="context">The current HTTP context.</param>
+            <param name="requestType">The type of HTTP request (GET or POST).</param>
+            <param name="url">The url of the web service.</param>
+            <param name="pathTranslated">The physical application path for the web service.</param>
+            <returns>The web service handler object.</returns>
+        </member>
+        <member name="M:Spring.Web.Script.Services.ScriptHandlerFactory.ReleaseHandler(System.Web.IHttpHandler)">
+            <summary>
+            Enables a factory to reuse an existing handler instance.
+            </summary>
+            <param name="handler">The <see cref="T:System.Web.IHttpHandler"/> object to reuse.</param>
+        </member>
+    </members>
+</doc>
diff --git a/src/Spring/Spring.Web.Extensions/Web/Script/Services/ScriptHandlerFactory.cs b/src/Spring/Spring.Web.Extensions/Web/Script/Services/ScriptHandlerFactory.cs
new file mode 100644
index 00000000..bc3d7cf9
--- /dev/null
+++ b/src/Spring/Spring.Web.Extensions/Web/Script/Services/ScriptHandlerFactory.cs
@@ -0,0 +1,131 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Web;
+using System.Web.Script.Services;
+
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Util;
+using Spring.Web.Services;
+using Spring.Web.Support;
+
+#endregion
+
+namespace Spring.Web.Script.Services
+{
+    /// <summary>
+    /// An <see cref="System.Web.IHttpHandlerFactory"/> implementation that 
+    /// creates a handler object for either ASP.NET AJAX 1.0 or Spring web services.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <author>Thomas Broyer</author>
+    /// <version>$Id: ScriptHandlerFactory.cs,v 1.2 2008/03/27 11:11:22 bbaia Exp $</version>
+    public class ScriptHandlerFactory : AbstractHandlerFactory, IHttpHandlerFactory
+    {
+        private static readonly Type scriptHandlerFactoryType =
+            typeof(ScriptServiceAttribute).Assembly.GetType("System.Web.Script.Services.ScriptHandlerFactory");
+
+        private static readonly FieldInfo scriptHandlerFactory_webServiceHandlerFactory =
+            scriptHandlerFactoryType.GetField("_webServiceHandlerFactory", BindingFlags.NonPublic | BindingFlags.Instance);
+
+        private static readonly Type webServiceDataType =
+            typeof(ScriptServiceAttribute).Assembly.GetType("System.Web.Script.Services.WebServiceData");
+
+        private static readonly ConstructorInfo webServiceData_ctor =
+            webServiceDataType.GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance, null, new Type[] { typeof(Type), typeof(bool) }, null);
+
+        private static readonly MethodInfo webServiceData_GetCacheKey =
+            webServiceDataType.GetMethod("GetCacheKey", BindingFlags.NonPublic | BindingFlags.Static, null, new Type[] { typeof(string) }, null);
+
+
+        private readonly IHttpHandlerFactory scriptHandlerFactory =
+            (IHttpHandlerFactory)Activator.CreateInstance(scriptHandlerFactoryType, true);
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="ScriptHandlerFactory"/> class.
+        /// </summary>
+        public ScriptHandlerFactory()
+            : base()
+        {
+            scriptHandlerFactory_webServiceHandlerFactory.SetValue(
+                this.scriptHandlerFactory,
+                new WebServiceHandlerFactory());
+        }
+
+        /// <summary>
+        /// Retrieves an instance of the <see cref="System.Web.IHttpHandler"/> 
+        /// implementation for handling web service requests 
+        /// for both Spring and ASP.NET AJAX 1.0 web services.
+        /// </summary>
+        /// <param name="context">The current HTTP context.</param>
+        /// <param name="requestType">The type of HTTP request (GET or POST).</param>
+        /// <param name="url">The url of the web service.</param>
+        /// <param name="pathTranslated">The physical application path for the web service.</param>
+        /// <returns>The web service handler object.</returns>
+        public override IHttpHandler GetHandler(HttpContext context, string requestType, string url, string pathTranslated)
+        {
+            string filename = VirtualPathUtility.ToAbsolute(context.Request.FilePath);
+            string cacheKey = (string)webServiceData_GetCacheKey.Invoke(
+                null, new object[] { VirtualPathUtility.ToAbsolute(context.Request.FilePath) });
+            object webServiceData = context.Cache.Get(cacheKey);
+            if (webServiceData == null)
+            {
+                IConfigurableApplicationContext appContext =
+                    WebApplicationContext.GetContext(url) as IConfigurableApplicationContext;
+
+                if (appContext == null)
+                {
+                    throw new InvalidOperationException(
+                        "Implementations of IApplicationContext must also implement IConfigurableApplicationContext");
+                }
+
+                string appRelativeVirtualPath = WebUtils.GetAppRelativePath(url);
+                NamedObjectDefinition nod = FindWebObjectDefinition(appRelativeVirtualPath, appContext.ObjectFactory);
+
+                if (nod != null)
+                {
+                    Type serviceType = appContext.GetType(nod.Name);
+                    object[] attrs = serviceType.GetCustomAttributes(typeof(ScriptServiceAttribute), false);
+                    if (attrs.Length > 0)
+                    {
+                        webServiceData = webServiceData_ctor.Invoke(new object[] { serviceType, false });
+                        context.Cache.Insert(cacheKey, webServiceData);
+                    }
+                }
+            }
+
+            return this.scriptHandlerFactory.GetHandler(context, requestType, url, pathTranslated);
+        }
+
+        /// <summary>
+        /// Enables a factory to reuse an existing handler instance.
+        /// </summary>
+        /// <param name="handler">The <see cref="System.Web.IHttpHandler" /> object to reuse.</param>
+        public override void ReleaseHandler(IHttpHandler handler)
+        {
+            this.scriptHandlerFactory.ReleaseHandler(handler);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/AssemblyInfo.cs b/src/Spring/Spring.Web/AssemblyInfo.cs
new file mode 100644
index 00000000..0b12a9a4
--- /dev/null
+++ b/src/Spring/Spring.Web/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+using System.Reflection;
+using System.Web.UI;
+
+[assembly: AssemblyTitle("Spring.Net Web Application Support")]
+[assembly: AssemblyDescription("Interfaces and classes that provide web application support in Spring.Net")]
+[assembly: TagPrefix("Spring.Web.UI.Controls", "spring")]
+//[assembly: AssemblyKeyFile(@"C:\users\aseovic\projects\OpenSource\Spring.Net\Spring.Net.PrivateKey.keys")]
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Caching/AspNetCache.cs b/src/Spring/Spring.Web/Caching/AspNetCache.cs
new file mode 100644
index 00000000..911b5c17
--- /dev/null
+++ b/src/Spring/Spring.Web/Caching/AspNetCache.cs
@@ -0,0 +1,310 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Web;
+using System.Web.Caching;
+using Common.Logging;
+using Spring.Util;
+
+namespace Spring.Caching
+{
+    /// <summary>
+    /// An <see cref="ICache"/> implementation backed by ASP.NET Cache (see <see cref="HttpRuntime.Cache"/>).
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Because ASP.NET Cache uses strings as cache keys, you need to ensure
+    /// that the key object type has properly implemented <b>ToString</b> method.
+    /// </para>
+    /// <para>
+    /// Despite the shared underlying <see cref="HttpRuntime.Cache"/>, it is possible to use more than
+    /// one instance of <see cref="AspNetCache"/> without interfering each other.
+    /// </para>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: AspNetCache.cs,v 1.6 2007/09/14 18:26:26 oakinger Exp $</version>
+    public class AspNetCache : AbstractCache
+    {
+        #region Internal Abstractions
+
+        /// <summary>
+        /// Abstracts the underlying runtime cache
+        /// </summary>
+        public interface IRuntimeCache : IEnumerable
+        {
+            /// <summary>
+            /// Insert an item into the cache.
+            /// </summary>
+            void Insert(string key, object value, CacheDependency dependencies, DateTime absoluteExpiration,
+                   TimeSpan slidingExpiration, CacheItemPriority priority, CacheItemRemovedCallback onRemoveCallback);
+
+            /// <summary>
+            /// Removes an item from the cache.
+            /// </summary>
+            /// <param name="key">The key of the item to remove</param>
+            /// <returns>The object that has been removed from the cache</returns>
+            object Remove(string key);
+
+            /// <summary>
+            /// Retrieve an item with the specified key from the cache.
+            /// </summary>
+            /// <param name="key">The key of the item to be retrieved</param>
+            /// <returns>The item, if found. <value>null</value> otherwise</returns>
+            object Get(string key);
+        }
+
+        /// <summary>
+        /// Actually delegates all calls to the underlying <see cref="HttpRuntime.Cache"/>
+        /// </summary>
+        private class RuntimeCache : IRuntimeCache
+        {
+            private readonly Cache _runtimeCache = HttpRuntime.Cache;
+
+            public object Remove(string key)
+            {
+                return _runtimeCache.Remove(key);
+            }
+
+            public void Insert(string key, object value, CacheDependency dependencies, DateTime absoluteExpiration, TimeSpan slidingExpiration, CacheItemPriority priority, CacheItemRemovedCallback onRemoveCallback )
+            {
+                _runtimeCache.Insert(key, value, dependencies, absoluteExpiration, slidingExpiration, priority, onRemoveCallback);
+            }
+
+            public object Get(string key)
+            {
+                return _runtimeCache.Get(key);
+            }
+
+            public IEnumerator GetEnumerator()
+            {
+                return _runtimeCache.GetEnumerator();
+            }
+        }
+
+        #endregion
+
+        #region Fields
+
+        // logger instance for this class
+        private static readonly ILog Log = LogManager.GetLogger(typeof(AspNetCache));
+        // the concrete cache implementation
+        private readonly IRuntimeCache _cache;
+        // the (unique!) name of this particular cache instance.
+        private readonly string _cacheName;
+
+        // hold default values for this cache instance.
+        private CacheItemPriority _priority = CacheItemPriority.Default;
+        private bool _slidingExpiration = false;
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="AspNetCache"/> 
+        /// </summary>
+        public AspNetCache() 
+            :this(new RuntimeCache())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="AspNetCache"/>
+        /// with the specified <see cref="IRuntimeCache"/> implementation.
+        /// </summary>
+        /// <param name="runtimeCache"></param>
+        public AspNetCache(IRuntimeCache runtimeCache)
+        {
+            _cache = runtimeCache;
+            // noop
+            _cacheName = typeof(AspNetCache).FullName + "[" + this.GetHashCode() + "].";            
+        }
+
+        #region Configurable Properties
+
+        /// <summary>
+        /// Gets/Sets a flag, whether to use sliding expiration policy.
+        /// </summary>
+        public bool SlidingExpiration
+        {
+            get { return _slidingExpiration; }
+            set { _slidingExpiration = value; }
+        }
+
+        /// <summary>
+        /// Gets/Sets a default priority to be applied to all items inserted into this cache.
+        /// </summary>
+        public CacheItemPriority Priority
+        {
+            get { return _priority; }
+            set { _priority = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Gets a collection of all cache item keys.
+        /// </summary>
+        public override ICollection Keys
+        {
+            get
+            {
+                ArrayList keys = new ArrayList();
+                
+                foreach (DictionaryEntry entry in _cache)
+                {
+                    string key = (string) entry.Key;
+                    if (key.StartsWith(_cacheName))
+                    {
+                        keys.Add(key.Substring(_cacheName.Length));
+                    }
+                }
+
+                return keys;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves an item from the cache.
+        /// </summary>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        /// <returns>
+        /// Item for the specified <paramref name="key"/>, or <c>null</c>.
+        /// </returns>
+        public override object Get(object key)
+        {
+            return key == null ? null : _cache.Get(GenerateKey(key));
+        }
+
+        /// <summary>
+        /// Removes an item from the cache.
+        /// </summary>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        public override void Remove(object key)
+        {
+            if (key != null)
+            {
+                if (Log.IsDebugEnabled) Log.Debug(string.Format("removing item '{0}' from cache '{1}'", key, this._cacheName));
+                _cache.Remove(GenerateKey(key));
+            }
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache.
+        /// </summary>
+        /// <remarks>
+        /// Items inserted using this method have default <see cref="Priority"/> and default <see cref="SlidingExpiration"/>
+        /// </remarks>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        /// <param name="value">
+        /// Item value.
+        /// </param>
+        /// <param name="timeToLive">
+        /// Item's time-to-live (TTL).
+        /// </param>
+        protected override void DoInsert(object key, object value, TimeSpan timeToLive)
+        {
+            this.Insert( key, value, timeToLive, _slidingExpiration, _priority );
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache.
+        /// </summary>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        /// <param name="value">
+        /// Item value.
+        /// </param>
+        /// <param name="timeToLive">
+        /// Item's time-to-live.
+        /// </param>
+        /// <param name="slidingExpiration">
+        /// Flag specifying whether the item's time-to-live should be reset
+        /// when the item is accessed.
+        /// </param>
+        public void Insert(object key, object value, TimeSpan timeToLive, bool slidingExpiration)
+        {
+            this.Insert(key, value, timeToLive, slidingExpiration, _priority);            
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache.
+        /// </summary>
+        /// <param name="key">
+        /// Item key.
+        /// </param>
+        /// <param name="value">
+        /// Item value.
+        /// </param>
+        /// <param name="timeToLive">
+        /// Item's time-to-live.
+        /// </param>
+        /// <param name="slidingExpiration">
+        /// Flag specifying whether the item's time-to-live should be reset
+        /// when the item is accessed.
+        /// </param>
+        /// <param name="itemPriority">
+        /// Item priority.
+        /// </param>
+        public void Insert(object key, object value, TimeSpan timeToLive, bool slidingExpiration, CacheItemPriority itemPriority)
+        {
+            AssertUtils.ArgumentNotNull(key, "key");
+            AssertUtils.State( TimeSpan.Zero <= timeToLive, "timeToLive" );
+
+            if (Log.IsDebugEnabled) Log.Debug(string.Format("adding item '{0}' to cache '{1}'", key, this._cacheName));
+
+            if (TimeSpan.Zero < timeToLive)
+            {
+                if (slidingExpiration)
+                {
+                    TimeSpan slidingExpirationSpan = timeToLive;
+                    _cache.Insert(GenerateKey(key), value, null, Cache.NoAbsoluteExpiration, slidingExpirationSpan, itemPriority, null);
+                }
+                else
+                {
+                    DateTime absoluteExpiration = DateTime.Now.Add(timeToLive);
+                    _cache.Insert(GenerateKey(key), value, null, absoluteExpiration, Cache.NoSlidingExpiration, itemPriority, null);
+                }
+            }
+            else
+            {
+                _cache.Insert(GenerateKey(key), value, null, Cache.NoAbsoluteExpiration, Cache.NoSlidingExpiration, itemPriority, null);
+            }
+        }
+
+        /// <summary>
+        /// Generate a key to be used for the underlying <see cref="Cache"/> implementation.
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public string GenerateKey( object key )
+        {
+            return _cacheName + key;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs b/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs
new file mode 100644
index 00000000..42339d19
--- /dev/null
+++ b/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs
@@ -0,0 +1,153 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Web;
+using Common.Logging;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: HttpApplicationConfigurer.cs,v 1.2 2007/07/29 19:39:42 markpollack Exp $</version>
+    public class HttpApplicationConfigurer
+    {
+        private static readonly ILog Log = LogManager.GetLogger(typeof(HttpApplicationConfigurer));
+
+        #region ModuleDefinitionsTable class
+
+        private class ModuleDefinitionsTable : Hashtable
+        {
+            public void Add(string key, IObjectDefinition value)
+            {
+                lock(SyncRoot)
+                {
+                    base[key] = value;
+                }
+            }
+
+            public IObjectDefinition this[string key]
+            {
+                get
+                {
+                    lock (SyncRoot)
+                    {
+                        return (IObjectDefinition) base[key];
+                    }
+                }
+            }
+
+            public override void Add(object key, object value)
+            {
+                AssertUtils.AssertArgumentType(key, "key", typeof(string), "Key must be a string");
+                AssertUtils.AssertArgumentType(value, "value", typeof(IObjectDefinition), "Key must be a string");
+                this.Add((string)key, (IObjectDefinition)value);
+            }
+
+            public override object this[object key]
+            {
+                get
+                {
+                    return this[(string)key];
+                }
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Holds shared application Template
+        /// </summary>
+        private static volatile IObjectDefinition s_applicationDefinition = null;
+        /// <summary>
+        /// Holds shared modules Templates
+        /// </summary>
+        private static readonly ModuleDefinitionsTable s_moduleDefinitions = new ModuleDefinitionsTable();
+
+        /// <summary>
+        /// Gets or Sets the shared application template
+        /// </summary>
+        public IObjectDefinition ApplicationTemplate
+        {
+            // no need for lock because of "volatile"
+            get { return s_applicationDefinition; }
+            set { s_applicationDefinition = value; }
+        }
+
+        /// <summary>
+        /// Gets the dictionary of shared module templates
+        /// </summary>
+        /// <remarks>
+        /// to synchronize access to the dictionary, use <see cref="ICollection.SyncRoot"/> property.
+        /// </remarks>
+        public IDictionary ModuleTemplates
+        {
+            get { return s_moduleDefinitions; }
+        }
+
+        /// <summary>
+        /// Configures the <see paramref="app"/> instance and its modules.
+        /// </summary>
+        /// <remarks>
+        /// When called, configures <see paramref="app"/> using the <see cref="IApplicationContext"/> instance 
+        /// provided in <paramref name="appContext"/> and the templates available in
+        /// <see cref="ApplicationTemplate"/> and <see cref="ModuleTemplates"/>.
+        /// </remarks>
+        /// <param name="appContext">the application context instance to be used for resolving object references.</param>
+        /// <param name="app">the <see cref="HttpApplication"/> instance to be configured.</param>
+        public static void Configure(IConfigurableApplicationContext appContext, HttpApplication app)
+        {
+            IObjectDefinition applicationDefinition = s_applicationDefinition;
+            if (s_applicationDefinition != null)
+            {                
+                appContext.ObjectFactory.ConfigureObject(app, "ApplicationTemplate", applicationDefinition);
+            }
+            
+            lock(s_moduleDefinitions.SyncRoot)
+            {
+                HttpModuleCollection modules = app.Modules;
+                foreach(DictionaryEntry moduleEntry in s_moduleDefinitions)
+                {
+					string moduleName = (string) moduleEntry.Key;
+                    IObjectDefinition od = s_moduleDefinitions[moduleName];
+                    IHttpModule module = modules[moduleName];
+                    if (module != null)
+                    {
+                        appContext.ObjectFactory.ConfigureObject(module, moduleName, od);
+                    }
+                    else
+                    {
+                        throw ConfigurationUtils.CreateConfigurationException(string.Format("failed applying module template '{0}' - no matching module found", moduleName));
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs b/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs
new file mode 100644
index 00000000..ac47dd89
--- /dev/null
+++ b/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs
@@ -0,0 +1,377 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+using System.Reflection;
+using System.Web;
+using System.Web.Hosting;
+using Common.Logging;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Web application context, taking the context definition files
+    /// from the file system or from URLs. 
+    ///
+    /// Treats resource paths as web resources, when using
+    /// IApplicationContext.GetResource. Resource paths are considered relative
+    /// to the virtual directory.
+    ///
+    /// Note: In case of multiple config locations, later object definitions will
+    /// override ones defined in earlier loaded files. This can be leveraged to
+    /// deliberately override certain object definitions via an extra XML file.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    public class WebApplicationContext : AbstractXmlApplicationContext
+    {
+        /// <summary>
+        /// The <see cref="Common.Logging.ILog"/> instance for this class.
+        /// </summary>
+        private static readonly ILog log = LogManager.GetLogger(typeof(WebApplicationContext));
+
+        // holds construction info for debugging output
+        private DateTime _constructionTimeStamp;
+        private string _constructionUrl;
+
+        private readonly string[] _configurationLocations;
+
+        /// <summary>
+        /// Create a new WebApplicationContext, loading the definitions
+        /// from the given XML resource.
+        /// </summary>
+        /// <param name="configurationLocations">Names of configuration resources.</param>
+        public WebApplicationContext(params string[] configurationLocations)
+            : this(null, false, null, configurationLocations)
+        {
+        }
+
+        /// <summary>
+        /// Create a new WebApplicationContext, loading the definitions
+        /// from the given XML resource.
+        /// </summary>
+        /// <param name="name">The application context name.</param>
+        /// <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+        /// <param name="configurationLocations">Names of configuration resources.</param>
+        public WebApplicationContext(string name, bool caseSensitive, params string[] configurationLocations)
+            : this(name, caseSensitive, null, configurationLocations)
+        {
+        }
+
+        /// <summary>
+        /// Create a new WebApplicationContext with the given parent,
+        /// loading the definitions from the given XML resources.
+        /// </summary>
+        /// <param name="name">The application context name.</param>
+        /// <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+        /// <param name="parentContext">The parent context.</param>
+        /// <param name="configurationLocations">Names of configuration resources.</param>
+        public WebApplicationContext(string name, bool caseSensitive, IApplicationContext parentContext,
+                                     params string[] configurationLocations) : base(name, caseSensitive, parentContext)
+        {
+            _configurationLocations = configurationLocations;
+            DefaultResourceProtocol = WebUtils.DEFAULT_RESOURCE_PROTOCOL;
+            Refresh();
+
+            // remember creation info for debug output
+            this._constructionTimeStamp = DateTime.Now;
+            if (HttpContext.Current != null)
+            {
+                this._constructionUrl = HttpContext.Current.Request.RawUrl;
+            }
+            if (log.IsDebugEnabled)
+            {
+                log.Debug("created instance " + this.ToString());
+            }
+        }
+
+        /// <summary>
+        /// returns detailed instance information for debugging
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            //return base.ToString() + " - created on " + _constructionTimeStamp + "\n\ncreated by:" + _constructionUrl + "\n" + _constructionStackTrace.ToString();
+            return string.Format("[{0}]:{1}({2})", this.Name, this.GetType().Name, base.GetHashCode().ToString());
+        }
+
+
+        /// <summary>
+        /// Since the HttpRuntime discards it's configurationsection cache, we maintain our own context cache.
+        /// Despite it really speeds up context-lookup, since we don't have to go through the whole HttpConfigurationSystem
+        /// </summary>
+        private static readonly Hashtable s_webContextCache = CollectionsUtil.CreateCaseInsensitiveHashtable();
+
+        static WebApplicationContext()
+        {
+            // register for ContextRegistry.Cleared event - we need to discard our cache in this case
+            ContextRegistry.Cleared += new EventHandler(OnContextRegistryCleared);
+
+#if NET_2_0 && !MONO
+            if (HttpRuntime.AppDomainAppVirtualPath != null) // check if we're within an ASP.NET AppDomain!
+            {
+                // ensure HttpRuntime has been fully initialized!
+                // this is a problem,.if ASP.NET Web Administration Application is used. This app does not fully set up the AppDomain...
+                HttpRuntime runtime =
+                    (HttpRuntime)
+                    typeof(HttpRuntime).GetField("_theRuntime", BindingFlags.Static | BindingFlags.NonPublic).GetValue(null);
+
+                bool beforeFirstRequest = false;
+                lock (runtime)
+                {
+                    beforeFirstRequest =
+                        (bool)
+                        typeof(HttpRuntime).GetField("_beforeFirstRequest", BindingFlags.Instance | BindingFlags.NonPublic).
+                            GetValue(runtime);
+                }
+                log.Debug("BeforeFirstRequest:" + beforeFirstRequest);
+                if (beforeFirstRequest)
+                {
+                    try
+                    {
+                        string firstRequestPath = HttpRuntime.AppDomainAppVirtualPath.TrimEnd('/') + "/dummy.context";
+                        log.Info("Forcing first request " + firstRequestPath);
+                        HttpRuntime.ProcessRequest(
+                            new SimpleWorkerRequest(firstRequestPath, string.Empty, new StringWriter()));
+                        log.Info("Successfully processed first request!");
+                    }
+                    catch (Exception ex)
+                    {
+                        log.Error("Failed processing first request", ex);
+                        throw;
+                    }
+                }
+            }
+#endif
+        }
+
+        /// <summary>
+        /// EventHandler for ContextRegistry.Cleared event. Discards webContextCache.
+        /// </summary>
+        private static void OnContextRegistryCleared(object sender, EventArgs ev)
+        {
+            lock (s_webContextCache)
+            {
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug("received ContextRegistry.Cleared event - clearing webContextCache");
+                }
+                s_webContextCache.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Returns the root context of this web application
+        /// </summary>
+        public static IApplicationContext GetRootContext()
+        {
+            return GetContextInternal( ("" + HttpRuntime.AppDomainAppVirtualPath).TrimEnd('/') + "/dummy.context");
+        }
+
+        /// <summary>
+        /// Returns the web application context for the given (absolute!) virtual path
+        /// </summary>
+        public static IApplicationContext GetContext(string virtualPath)
+        {
+            return GetContextInternal(virtualPath);
+        }
+
+        /// <summary>
+        /// Returns the web application context for the current request's filepath
+        /// </summary>
+        public static IApplicationContext Current
+        {
+            get
+            {
+                string requestUrl = HttpContext.Current.Request.FilePath;
+                return GetContextInternal(requestUrl);
+            }
+        }
+
+        private static IApplicationContext GetContextInternal(string virtualPath)
+        {
+            string virtualDirectory = WebUtils.GetVirtualDirectory(virtualPath);
+            string contextName = virtualDirectory;
+            if ( 0 == string.Compare( contextName , ("" + HttpRuntime.AppDomainAppVirtualPath).TrimEnd('/') + "/", true) )
+            {
+                contextName = DefaultRootContextName;
+            }
+
+            lock (s_webContextCache)
+            {
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(string.Format("looking up web context '{0}' in WebContextCache", contextName));
+                }
+                // first lookup in our own cache
+                IApplicationContext context = (IApplicationContext) s_webContextCache[contextName];
+                if (context != null)
+                {
+                    // found - nothing to do anymore
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(
+                            string.Format("returning WebContextCache hit '{0}' for vpath '{1}' ", context, contextName));
+                    }
+                    return context;
+                }
+
+                // lookup ContextRegistry
+                lock (ContextRegistry.SyncRoot)
+                {
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(string.Format("looking up web context '{0}' in ContextRegistry", contextName));
+                    }
+
+                    if (ContextRegistry.IsContextRegistered(contextName))
+                    {
+                        context = ContextRegistry.GetContext(contextName);
+                    }
+
+                    if (context == null)
+                    {
+                        // finally ask HttpConfigurationSystem for the requested context
+                        try
+                        {
+                            if (log.IsDebugEnabled)
+                            {
+                                log.Debug(
+                                    string.Format(
+                                        "web context for vpath '{0}' not found. Force creation using filepath '{1}'",
+                                        contextName, virtualPath));
+                            }
+
+                            // assure context is resolved to the given virtualDirectory
+                            using (new HttpContextSwitch(virtualDirectory))
+                            {
+                                context = (IApplicationContext)ConfigurationUtils.GetSection(ContextSectionName);
+                            }
+
+                            if (context != null)
+                            {
+                                if (log.IsDebugEnabled)
+                                    log.Debug(string.Format("got context '{0}' for vpath '{1}'", context, contextName));
+                            }
+                            else
+                            {
+                                if (log.IsDebugEnabled)
+                                    log.Debug(string.Format("no context defined for vpath '{0}'", contextName));
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            if (log.IsErrorEnabled)
+                            {
+                                log.Error(string.Format("failed creating context '{0}'", contextName), ex);
+                            }
+#if NET_1_1
+                            if (ConfigurationUtils.IsConfigurationException(ex))
+                            {
+                                if (ex.InnerException != null)
+                                {
+                                    throw ex.InnerException;
+                                }
+                            }
+#endif
+                            throw;
+                        }
+                    }
+                }
+
+                // add it to the cache
+                // Note: use 'contextName' not 'context.Name' here - the same context may be used for different paths!
+                s_webContextCache.Add(contextName, context);
+                if (log.IsDebugEnabled)
+                {
+                    log.Debug(
+                        string.Format("added context '{0}' to WebContextCache for vpath '{1}'", context, contextName));
+                }
+
+                if (context != null)
+                {
+                    // register this context and all ParentContexts by their name - parent contexts may be additionally created by the HttpRuntime
+                    IApplicationContext parentContext = context;
+                    while (parentContext != null)
+                    {
+                        if (!s_webContextCache.ContainsKey(parentContext.Name))
+                        {
+                            s_webContextCache.Add(parentContext.Name, parentContext);
+                            if (log.IsDebugEnabled)
+                            {
+                                log.Debug(
+                                    string.Format("added parent context '{0}' to WebContextCache for vpath '{1}'",
+                                                  parentContext, parentContext.Name));
+                            }
+                        }
+                        parentContext = parentContext.ParentContext;
+                    }
+                }
+                return context;
+            } // lock(s_webContextCache)
+        }
+
+        /// <summary>
+        /// Initializes object definition reader.
+        /// </summary>
+        /// <param name="objectDefinitionReader">Reader to initialize.</param>
+        protected override void InitObjectDefinitionReader(XmlObjectDefinitionReader objectDefinitionReader)
+        {
+            NamespaceParserRegistry.RegisterParser(typeof(WebObjectsNamespaceParser));
+        }
+
+        /// <summary>
+        /// Return an array of resource locations, referring to the XML object
+        /// definition files that this context should be built with.
+        /// </summary>
+        /// <returns>an array of resource locations, or null if none</returns>
+        protected override string[] ConfigurationLocations
+        {
+            get { return _configurationLocations; }
+        }
+
+        /// <summary>
+        /// Creates web object factory for this context using parent context's factory as a parent.
+        /// </summary>
+        /// <returns>Web object factory to use.</returns>
+        protected override DefaultListableObjectFactory CreateObjectFactory()
+        {
+            string contextPath = this.Name;
+            if (contextPath == DefaultRootContextName)
+            {
+                contextPath = "/";
+            }
+            else
+            {
+                contextPath = contextPath + "/";
+            }
+            return new WebObjectFactory(contextPath, this.CaseSensitive, GetInternalParentObjectFactory());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs b/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs
new file mode 100644
index 00000000..18eba512
--- /dev/null
+++ b/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs
@@ -0,0 +1,135 @@
+#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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Web;
+using System.Web.Configuration;
+using System.Web.Hosting;
+using System.Xml;
+using Common.Logging;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Creates an <see cref="Spring.Context.IApplicationContext"/> instance
+    /// using context definitions supplied in a custom configuration and
+    /// configures the <see cref="ContextRegistry"/> with that instance.
+    /// </summary>
+    /// <remarks>
+    /// This class extends <see cref="ContextHandler">ContextHandler</see> with
+    /// web specific behaviour. It uses <see cref="WebApplicationContext">WebApplicationContext</see>
+    /// as default Context-Type.
+    /// </remarks>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: WebContextHandler.cs,v 1.8 2008/03/13 20:07:43 bbaia Exp $</version>
+    public class WebContextHandler : ContextHandler
+    {
+        private static readonly ILog Log = LogManager.GetLogger(typeof(WebContextHandler));
+
+        /// <summary>
+        /// Sets default context type to <see cref="WebApplicationContext"/>
+        /// </summary>
+        protected override Type DefaultApplicationContextType
+        {
+            get { return typeof(WebApplicationContext); }
+        }
+
+        /// <summary>
+        /// Sets default case-sensitivity to 'false' for web-applications
+        /// </summary>
+        protected override bool DefaultCaseSensitivity
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Gets the context name from the given <see cref="HttpConfigurationContext"/>
+        /// </summary>
+        protected override string GetContextName(object configContext, XmlElement contextElement)
+        {
+            string contextName = ((HttpConfigurationContext) configContext).VirtualPath;
+            // NET 2.0 returns "/" for root path
+            if (contextName == "/")
+            {
+                contextName = String.Empty;
+            }
+            return contextName;
+        }
+
+        /// <summary>
+        /// Throws a configuration exception, if child contexts are specified.
+        /// </summary>
+        /// <remarks>
+        /// Nesting contexts in webapplications is done by explicitly declaring
+        /// spring context sections for each directory.
+        /// </remarks>
+        protected override void CreateChildContexts(IApplicationContext parentContext, object configContext,
+                                                    XmlNode[] childContexts)
+        {
+            // disable child contexts in webapps
+            if (childContexts.Length > 0)
+            {
+                throw ConfigurationUtils.CreateConfigurationException(
+                    String.Format("Nested Child Contexts are not allowed in Web Applications. Use Web.config hierarchy instead."), childContexts[0]);
+            }
+        }
+
+        /// <summary>
+        /// Handles web specific details of context instantiation.
+        /// </summary>
+        protected override IApplicationContext InstantiateContext(IApplicationContext parent, object configContext,
+                                                                  string contextName, Type contextType,
+                                                                  bool caseSensitive, string[] resources)
+        {
+            HttpConfigurationContext httpConfigurationContext = (HttpConfigurationContext) configContext;
+
+            // ASP.NET may scavenge it's configuration section cache if memory usage is too high.
+            // Thus a handler may be called more than once for the same context.
+            // Return registered context in this case.
+            if (ContextRegistry.IsContextRegistered(contextName))
+            {
+                IApplicationContext ctx = ContextRegistry.GetContext(contextName);
+                if (Log.IsDebugEnabled)
+                {
+                    Log.Debug(
+                        string.Format("web context '{0}' already registered - returning existing instance {1}",
+                                      contextName, ctx));
+                }
+                return ctx;
+            }
+
+            // for rewriting path during context instantiation
+            string vpath = httpConfigurationContext.VirtualPath;
+            if (!vpath.EndsWith("/")) vpath = vpath + "/";
+            using (new HttpContextSwitch(vpath))
+            {
+                return
+                    base.InstantiateContext(parent, configContext, contextName, contextType, caseSensitive, resources);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs b/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs
new file mode 100644
index 00000000..26311495
--- /dev/null
+++ b/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs
@@ -0,0 +1,268 @@
+#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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Reflection;
+using System.Web;
+using System.Web.Caching;
+using System.Web.SessionState;
+
+using Common.Logging;
+using Spring.Core.IO;
+using Spring.Core.TypeConversion;
+using Spring.Core.TypeResolution;
+using Spring.Expressions;
+using Spring.Objects.Factory.Support;
+using Spring.Threading;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Provides various support for proper handling requests.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: WebSupportModule.cs,v 1.15 2007/08/08 17:48:19 bbaia Exp $</version>
+    public class WebSupportModule : IHttpModule
+    {
+        private static readonly ILog s_log;
+
+        private static bool s_isInitialized = false;
+
+        // Required for Session End event handling
+        private static int CACHEKEYPREFIXLENGTH = 0;
+        private static CacheItemRemovedCallback s_originalCallback;
+
+        /// <summary>
+        /// For webapplications always
+        /// <ul>
+        /// <li>convert IResources using the current context.</li>
+        /// <li>use "web" as default resource protocol</li>
+        /// <li>use <see cref="HybridContextStorage"/> as default threading storage</li>
+        /// </ul>
+        /// </summary>
+        static WebSupportModule()
+        {
+            s_log = LogManager.GetLogger(typeof(WebSupportModule));
+
+            // register additional resource handler
+            ResourceHandlerRegistry.RegisterResourceHandler(WebUtils.DEFAULT_RESOURCE_PROTOCOL, typeof(WebResource));
+            // replace default IResource converter
+            TypeConverterRegistry.RegisterConverter(typeof(IResource),
+                                                    new ResourceConverter(
+                                                        new ConfigurableResourceLoader(WebUtils.DEFAULT_RESOURCE_PROTOCOL)));
+            // default to hybrid thread storage implementation
+            LogicalThreadContext.SetStorage(new HybridContextStorage());
+
+            s_log.Debug("Set default resource protocol to 'web' and installed HttpContext-aware HybridContextStorage");
+        }
+
+        /// <summary>
+        /// Registers this module for all events required by the Spring.Web framework
+        /// </summary>
+        public virtual void Init(HttpApplication app)
+        {
+            lock (typeof(WebSupportModule))
+            {
+                s_log.Debug("Initializing Application instance");
+                if (!s_isInitialized)
+                {
+                    HttpModuleCollection modules = app.Modules;
+                    foreach (string moduleKey in modules.AllKeys)
+                    {
+                        if (modules[moduleKey] is SessionStateModule)
+                        {
+#if !NET_1_1
+                            HookSessionEvent((SessionStateModule) modules[moduleKey]);
+#else
+                            HookSessionEvent11();
+#endif
+                        }
+                    }
+                }
+                s_isInitialized = true;
+
+                // signal, that VirtualEnvironment is ready to accept 
+                // handler registrations for EndRequest and EndSession events
+                VirtualEnvironment.SetInitialized();
+            }
+
+            app.EndRequest += new EventHandler(VirtualEnvironment.RaiseEndRequest);
+
+            // ensure context is instantiated
+            IConfigurableApplicationContext appContext = WebApplicationContext.GetRootContext() as IConfigurableApplicationContext;
+            // configure this app + it's module instances
+            if (appContext == null)
+            {
+                throw new InvalidOperationException("Implementations of IApplicationContext must also implement IConfigurableApplicationContext");
+            }
+            HttpApplicationConfigurer.Configure(appContext, app);
+        }
+
+        /// <summary>
+        /// Disposes this instance
+        /// </summary>
+        public virtual void Dispose()
+        {
+            // noop
+        }
+
+        #region Session Handling Stuff
+
+        private static void OnCacheItemRemoved(string key, object value, CacheItemRemovedReason reason)
+        {
+            s_log.Debug("end session " + key + " because of " + reason);
+
+            try
+            {
+                HttpSessionState ss = CreateSessionState(key, value);
+
+                VirtualEnvironment.RaiseEndSession(ss, reason);
+            }
+            catch (Exception ex)
+            {
+                string msg = "Failure during EndSession event handling";
+                // are we on a current request?
+                if (HttpContext.Current != null)
+                {
+                    s_log.Error(msg, ex);
+                }
+                else
+                {
+                    // this is an async session timout - log as fatal since this is the thread's exit point!
+                    s_log.Fatal(msg, ex);
+                }
+            }
+            finally
+            {
+                if (s_originalCallback != null)
+                {
+                    s_originalCallback(key, value, reason);
+                }                
+            }
+        }
+
+#if !NET_1_1
+        private static void HookSessionEvent(SessionStateModule sessionStateModule)
+        {
+            // Hook only into InProcState - all others ignore SessionEnd anyway
+            object store = ExpressionEvaluator.GetValue(sessionStateModule, "_store");
+            if ((store != null) && store.GetType().Name == "InProcSessionStateStore")
+            {
+                s_log.Debug("attaching to InProcSessionStateStore");
+                s_originalCallback = (CacheItemRemovedCallback) ExpressionEvaluator.GetValue(store, "_callback");
+                ExpressionEvaluator.SetValue(store, "_callback", new CacheItemRemovedCallback(OnCacheItemRemoved));
+
+                CACHEKEYPREFIXLENGTH = (int) ExpressionEvaluator.GetValue(store, "CACHEKEYPREFIXLENGTH");
+            }
+        }
+
+        private static HttpSessionState CreateSessionState(string key, object state)
+        {
+            string id = key.Substring(CACHEKEYPREFIXLENGTH);
+            ISessionStateItemCollection sessionItems =
+                (ISessionStateItemCollection) ExpressionEvaluator.GetValue(state, "_sessionItems");
+            HttpStaticObjectsCollection staticObjects =
+                (HttpStaticObjectsCollection) ExpressionEvaluator.GetValue(state, "_staticObjects");
+            int timeout = (int) ExpressionEvaluator.GetValue(state, "_timeout");
+            TypeRegistry.RegisterType("SessionStateModule", typeof(SessionStateModule));
+            HttpCookieMode cookieMode =
+                (HttpCookieMode) ExpressionEvaluator.GetValue(null, "SessionStateModule.s_configCookieless");
+            SessionStateMode stateMode =
+                (SessionStateMode) ExpressionEvaluator.GetValue(null, "SessionStateModule.s_configMode");
+            HttpSessionStateContainer container = new HttpSessionStateContainer(
+                id
+                , sessionItems
+                , staticObjects
+                , timeout
+                , false
+                , cookieMode
+                , stateMode
+                , true
+                );
+
+            return (HttpSessionState) Activator.CreateInstance(
+                                          typeof(HttpSessionState)
+                                          , BindingFlags.Instance | BindingFlags.NonPublic
+                                          , null
+                                          , new object[] {container}
+                                          , CultureInfo.InvariantCulture
+                                          );
+        }
+#else
+        private static Type t_SessionDictionary;
+
+        private static void HookSessionEvent11()
+        {
+            // Hook only into InProcState - all others ignore SessionEnd anyway
+            t_SessionDictionary = typeof(HttpSessionState).Assembly.GetType("System.Web.SessionState.SessionDictionary");
+
+            Type t_InProcStateClientManager =
+                typeof(HttpSessionState).Assembly.GetType("System.Web.SessionState.InProcStateClientManager");
+
+            TypeRegistry.RegisterType( "InProcStateClientManager", t_InProcStateClientManager );
+
+            CacheItemRemovedCallback circ = new CacheItemRemovedCallback( OnCacheItemRemoved );
+            CACHEKEYPREFIXLENGTH = (int)ExpressionEvaluator.GetValue(null, "InProcStateClientManager.CACHEKEYPREFIXLENGTH");
+            s_originalCallback = (CacheItemRemovedCallback)ExpressionEvaluator.GetValue(null, "InProcStateClientManager.s_callback");
+            ExpressionEvaluator.SetValue(null, "InProcStateClientManager.s_callback", circ);
+        }
+
+        private static HttpSessionState CreateSessionState(string key, object state1)
+        {
+            string id = key.Substring(CACHEKEYPREFIXLENGTH);
+            object dict = ExpressionEvaluator.GetValue(state1, "dict");
+            if (dict == null)
+            {
+                dict = Activator.CreateInstance(t_SessionDictionary, true);
+            }
+            object staticObjects = ExpressionEvaluator.GetValue(state1, "staticObjects");
+            int timeout = (int)ExpressionEvaluator.GetValue(state1, "timeout");
+            bool isCookieless = (bool)ExpressionEvaluator.GetValue(state1, "isCookieless");
+
+            HttpSessionState state2 = (HttpSessionState)Activator.CreateInstance(
+                typeof(HttpSessionState)
+                , BindingFlags.Instance|BindingFlags.NonPublic
+                , null
+                , new object[]
+                    {
+                        id,
+                        dict,
+                        staticObjects,
+                        timeout,
+                        false,
+                        isCookieless,
+                        SessionStateMode.InProc,
+                        true
+                    }
+                , CultureInfo.InvariantCulture
+                );
+            return state2;
+        }
+#endif
+
+        #endregion Session Handling Stuff
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Core/IO/WebResource.cs b/src/Spring/Spring.Web/Core/IO/WebResource.cs
new file mode 100644
index 00000000..3a628bfe
--- /dev/null
+++ b/src/Spring/Spring.Web/Core/IO/WebResource.cs
@@ -0,0 +1,197 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.IO;
+using Spring.Core.IO;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+    /// <summary>
+    /// <see cref="Spring.Core.IO.IResource"/> implementation specifically
+    /// for resources served up from a web server.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Uses the <c>System.Web.HttpContext.Current.Server.MapPath</c>
+    /// method to resolve the file name for a given resource.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: WebResource.cs,v 1.14 2008/03/14 12:02:45 oakinger Exp $</version>
+    public class WebResource : FileSystemResource
+    {
+        private string absolutePath;
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Core.IO.WebResource"/> class.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the file system resource (on the server).
+        /// </param>
+        public WebResource(string resourceName)
+            : base(resourceName)
+        {
+        }
+
+        /// <summary>
+        /// Gets those characters that are valid path separators for the
+        /// resource type.
+        /// </summary>
+        /// <value>
+        /// Those characters that are valid path separators for the resource
+        /// type.
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.AbstractResource.PathSeparatorChars"/>
+        protected override char[] PathSeparatorChars
+        {
+            get { return new char[] {'/'}; }
+        }
+
+        /// <summary>
+        /// Resolves the <see cref="System.IO.FileInfo"/> handle 
+        /// for the supplied <paramref name="resourceName"/>.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the file system resource.
+        /// </param>
+        /// <returns>
+        /// The <see cref="System.IO.FileInfo"/> handle for this resource.
+        /// </returns>
+        protected override FileInfo ResolveFileHandle(string resourceName)
+        {
+            this.absolutePath = ResolveResourceNameWithoutProtocol(resourceName);
+            if(!this.absolutePath.StartsWith("/"))
+            {
+                string currentPath = VirtualEnvironment.CurrentVirtualFilePath;
+                int n = currentPath.LastIndexOfAny(new char[] {'/', '\\'});
+                if(n >= 0)
+                {
+                    currentPath = currentPath.Substring(0, n);
+                }
+                this.absolutePath = currentPath + '/' + this.absolutePath;
+            }
+
+            return new FileInfo(VirtualEnvironment.MapPath(this.absolutePath));
+        }
+
+        /// <summary>
+        /// Resolves the root location for the supplied <paramref name="resourceName"/>.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the file system resource.
+        /// </param>
+        /// <returns>
+        /// The root location of the resource.
+        /// </returns>
+        protected override string ResolveRootLocation(string resourceName)
+        {
+            return string.Empty;
+        }
+
+        /// <summary>
+        /// Resolves the path for the supplied <paramref name="resourceName"/>.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the file system resource.
+        /// </param>
+        /// <returns>
+        /// The current path of the resource.
+        /// </returns>
+        protected override string ResolveResourcePath(string resourceName)
+        {
+            string path = this.absolutePath.TrimStart(PathSeparatorChars);
+            int n = path.LastIndexOfAny(PathSeparatorChars);
+            if(n > 0)
+            {
+                path = path.Substring(0, n);
+            }
+            else
+            {
+                path = string.Empty;
+            }
+
+            return path;
+        }
+
+        /// <summary>
+        /// Resolves the presence of the
+        /// <paramref name="basePathPlaceHolder"/> value
+        /// in the supplied <paramref name="resourceName"/> into a path.
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the resource.
+        /// </param>
+        /// <param name="basePathPlaceHolder">
+        /// The string that is a placeholder for a base path.
+        /// </param>
+        /// <returns>
+        /// The name of the resource with any <paramref name="basePathPlaceHolder"/>
+        /// value having been resolved into an actual path.
+        /// </returns>
+        protected override string ResolveBasePathPlaceHolder(
+            string resourceName, string basePathPlaceHolder)
+        {
+            if(StringUtils.HasText(resourceName)
+               && resourceName.TrimStart().StartsWith(basePathPlaceHolder))
+            {
+                return resourceName.Replace(basePathPlaceHolder, VirtualEnvironment.ApplicationVirtualPath.TrimEnd('/'));
+            }
+            return resourceName;
+        }
+
+        /// <summary>
+        /// Does the supplied <paramref name="resourceName"/> relative ?
+        /// </summary>
+        /// <param name="resourceName">
+        /// The name of the resource to test.
+        /// </param>
+        /// <returns>
+        /// <see langword="true"/> if resource name is relative; 
+        /// otherwise <see langword="false"/>.
+        /// </returns>
+        protected override bool IsRelativeResource(string resourceName)
+        {
+            return (!
+                    (resourceName.StartsWith("/") ||
+                     resourceName.StartsWith(BasePathPlaceHolder)));
+        }
+
+        /// <summary>
+        /// Factory Method. Create a new instance of the current resource type using the given resourceName
+        /// </summary>
+        protected override IResource CreateResourceInstance(string resourceName)
+        {
+            return new WebResource(resourceName);
+        }
+
+        /// <summary>
+        /// The ResourceLoader to be used for resolving relative resources
+        /// </summary>
+        protected override IResourceLoader GetResourceLoader()
+        {
+            return new ConfigurableResourceLoader(WebUtils.DEFAULT_RESOURCE_PROTOCOL);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/DataBinding/DataSourceItemFormatter.cs b/src/Spring/Spring.Web/DataBinding/DataSourceItemFormatter.cs
new file mode 100644
index 00000000..ad80c4c9
--- /dev/null
+++ b/src/Spring/Spring.Web/DataBinding/DataSourceItemFormatter.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Collections;
+using System.Web.UI;
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// This formatter acts as an adapter to a datasource. It parses a given datasource into 
+    /// a table to allow converting back and forth between objects and their keys during formatting.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// The DataSourceItemFormatter expects the "source" to have 2 properties named "DataSourceField" and "DataValueField".
+    /// </para>
+    /// </remarks>
+    public class DataSourceItemFormatter : IBindingAwareFormatter
+    {
+        private string _dataSourceFieldName;
+        private string _dataValueFieldName;
+
+        [ThreadStatic]
+        private Hashtable _dataItemsByKey;
+        [ThreadStatic] 
+        private string _dataItemKeyField;
+
+        /// <summary>
+        /// Initialize this instance.
+        /// </summary>
+        /// <param name="dataSourceField">The name of the "source"s property containing the dataSource</param>
+        /// <param name="dataValueField">The name of the "source"s property containing the name of the key property</param>
+        public DataSourceItemFormatter(string dataSourceField, string dataValueField)
+        {
+            this._dataSourceFieldName = dataSourceField;
+            if(dataValueField == null)
+            {
+                throw new ArgumentNullException("DataValueField must not be null.");
+            }
+            this._dataValueFieldName = dataValueField;
+        }
+
+        /// <summary>
+        /// Sets the bindingContext for the current thread.
+        /// </summary>
+        /// <param name="source">The source object</param>
+        /// <param name="target">The target object</param>
+        /// <param name="variables">Variables to be used during binding</param>
+        /// <param name="direction">The current binding's direction</param>
+        public void SetBindingContext(object source, object target, IDictionary variables, BindingDirection direction)
+        {
+            // Extract dataSource from source object
+            IEnumerable dataSource = DataBinder.GetPropertyValue(source, this._dataSourceFieldName) as IEnumerable;
+            // Extract dataItemKeyField from source object
+            string dataItemKeyField = DataBinder.GetPropertyValue(source, this._dataValueFieldName) as String;
+
+            Initialize(dataSource, dataItemKeyField, direction);
+        }
+
+        /// <summary>
+        /// Reset the current thread's binding context.
+        /// </summary>
+        public void ClearBindingContext()
+        {
+            _dataItemsByKey = null;
+            _dataItemKeyField = null;
+        }
+
+        /// <summary>
+        /// Initialize a new instance.
+        /// </summary>
+        /// <param name="dataSource">The datasource containing list items</param>
+        /// <param name="dataItemKeyField">The name of the listitem's property that evaluates to the item's key</param>
+        /// <param name="direction">The direction of the current binding</param>
+        private void Initialize(IEnumerable dataSource, string dataItemKeyField, BindingDirection direction)
+        {
+            _dataItemKeyField = dataItemKeyField;
+
+            // if we are binding from target to source only, we can save some performance 
+            // here because only Format() will be called.
+            if (direction != (direction&BindingDirection.TargetToSource))
+            {
+                if(dataSource == null)
+                {
+                    throw new ArgumentNullException(
+                        string.Format("DataSource must not be null."));
+                }
+
+                _dataItemsByKey = new Hashtable();
+                foreach(object dataItem in dataSource)
+                {
+                    string key = Format(dataItem);
+                    this._dataItemsByKey.Add(key, dataItem);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the key of the specified value object.
+        /// </summary>
+        /// <param name="value">The value to extract the key from.</param>
+        /// <returns>Key extracted from <paramref name="value"/>.</returns>
+        public string Format(object value)
+        {
+            return DataBinder.GetPropertyValue(value, this._dataItemKeyField, null);
+        }
+
+        /// <summary>
+        /// Return the object with the specified key from the datasource.
+        /// </summary>
+        /// <param name="key">The key of the object.</param>
+        /// <returns>Parsed <paramref name="value"/>.</returns>
+        public object Parse(string key)
+        {
+            object item = this._dataItemsByKey[key];
+            if (item==null)
+            {
+                throw new ArgumentOutOfRangeException("key", key, string.Format("Item with key {0} does not exist", key));
+            }
+            return item;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/DataBinding/HttpRequestBindingContainer.cs b/src/Spring/Spring.Web/DataBinding/HttpRequestBindingContainer.cs
new file mode 100644
index 00000000..9ecf3339
--- /dev/null
+++ b/src/Spring/Spring.Web/DataBinding/HttpRequestBindingContainer.cs
@@ -0,0 +1,170 @@
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Web;
+using Spring.Core;
+using Spring.Expressions;
+using Spring.Globalization;
+using Spring.Objects;
+using Spring.Util;
+using Spring.Validation;
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// Binds agroup of HTTP request multi-valued items to the data model.
+    /// </summary>
+    /// <remarks>
+    /// Due to the fact, that browsers don't send the values of unchecked checkboxes, you 
+    /// can't use <see cref="HttpRequestListBindingContainer"/> for binding to checkboxes.
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: HttpRequestBindingContainer.cs,v 1.6 2008/02/05 20:40:26 aseovic Exp $</version>
+    public class HttpRequestListBindingContainer : BaseBindingContainer
+    {
+        private string[] requestParams;
+        private ConstructorInfo itemCtor;
+        private IExpression targetExpression;
+        
+        /// <summary>
+        /// Creates a new instance of <see cref="HttpRequestListBindingContainer"/>.
+        /// </summary>
+        /// <param name="requestParams">
+        /// Comma separated list of multi-valued request parameters that
+        /// should be used to create a target item.
+        /// </param>
+        /// <param name="targetList">
+        /// Expression that identifies a target list items should be added to.
+        /// </param>
+        /// <param name="itemType">
+        /// The type of the target item.
+        /// </param>
+        public HttpRequestListBindingContainer(string requestParams, string targetList, Type itemType)
+        {
+            this.requestParams = requestParams.Split(',');
+            this.targetExpression = Expression.Parse(targetList);
+            this.itemCtor = itemType.GetConstructor(Type.EmptyTypes);
+            if (this.itemCtor == null)
+            {
+                throw new ArgumentException("Type [{0}] does not have a default constructor. " +
+                                            "A default constructor for the item type is required for collection data binding.",
+                                            itemType.FullName);
+            }
+        }
+
+        /// <summary>
+        /// Adds the <see cref="SimpleExpressionBinding"/> binding.
+        /// </summary>
+        /// <remarks>
+        /// This is a convinience method for adding <b>SimpleExpressionBinding</b>,
+        /// one of the most often used binding types, to the bindings list.
+        /// </remarks>
+        /// <param name="sourceExpression">
+        /// The source expression.
+        /// </param>
+        /// <param name="targetExpression">
+        /// The target expression.
+        /// </param>
+        /// <param name="direction">
+        /// Binding direction.
+        /// </param>
+        /// <param name="formatter">
+        /// <see cref="IFormatter"/> to use for value formatting and parsing.
+        /// </param>
+        /// <returns>
+        /// Added <see cref="SimpleExpressionBinding"/> instance.
+        /// </returns>
+        public override IBinding AddBinding(string sourceExpression, string targetExpression, BindingDirection direction,
+                                            IFormatter formatter)
+        {
+            // setup variable for each HTTP request parameter
+            return base.AddBinding("#" + sourceExpression, targetExpression, direction, formatter);
+        }
+
+        /// <summary>
+        /// Binds source object to target object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        public override void BindSourceToTarget(object source, object target, IValidationErrors validationErrors, IDictionary variables)
+        {
+            HttpRequest request;
+            if (HttpContext.Current == null || (HttpContext.Current.Request) == null)
+            {
+                throw new InvalidOperationException("Cannot perform Request data binding without a valid HTTP request.");
+            }
+            request = HttpContext.Current.Request;
+            IList targetList = targetExpression.GetValue(target) as IList;
+            if (targetList == null)
+            {
+                throw new ArgumentException("Target property has to be initialized to an instance of IList interface.");
+            }
+
+            if (request.Params.GetValues(requestParams[0]) != null)
+            {
+                int valueCount = request.Params.GetValues(requestParams[0]).Length;
+                for (int i = 0; i < valueCount; i++)
+                {
+                    IDictionary vars = new Hashtable();
+                    foreach (string paramName in requestParams)
+                    {
+                        vars[paramName] = request.Params.GetValues(paramName)[i];
+                    }
+                    
+                    object targetItem;
+                    bool addToList;
+                    if (i < targetList.Count)
+                    {
+                        targetItem = targetList[i];
+                        addToList = false;
+                    }
+                    else
+                    {
+                        targetItem = itemCtor.Invoke(ObjectUtils.EmptyObjects);
+                        addToList = true;
+                    }
+                    
+                    foreach (IBinding binding in Bindings)
+                    {
+                        binding.BindSourceToTarget(null, targetItem, validationErrors, vars);
+                    }
+                    
+                    if (addToList)
+                    {
+                        targetList.Add(targetItem);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Binds target object to source object.
+        /// </summary>
+        /// <param name="source">
+        /// The source object.
+        /// </param>
+        /// <param name="target">
+        /// The target object.
+        /// </param>
+        /// <param name="validationErrors">
+        /// Validation errors collection that type conversion errors should be added to.
+        /// </param>
+        /// <param name="variables">
+        /// Variables that should be used during expression evaluation.
+        /// </param>
+        public override void BindTargetToSource(object source, object target, IValidationErrors validationErrors, IDictionary variables)
+        {
+            // can't bind to a read-only Request object...
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/DataBinding/IBindingAwareFormatter.cs b/src/Spring/Spring.Web/DataBinding/IBindingAwareFormatter.cs
new file mode 100644
index 00000000..2f5b4bad
--- /dev/null
+++ b/src/Spring/Spring.Web/DataBinding/IBindingAwareFormatter.cs
@@ -0,0 +1,24 @@
+using System.Collections;
+using Spring.Globalization;
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public interface IBindingAwareFormatter : IFormatter
+    {
+        /// <summary>
+        /// Sets the binding context of this formatter.
+        /// </summary>
+        /// <param name="source"></param>
+        /// <param name="target"></param>
+        /// <param name="variables"></param>
+        /// <param name="direction"></param>
+        void SetBindingContext(object source, object target, IDictionary variables, BindingDirection direction);
+        /// <summary>
+        /// Clears the binding context of this formatter.
+        /// </summary>
+        void ClearBindingContext();
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/DataBinding/IWebDataBound.cs b/src/Spring/Spring.Web/DataBinding/IWebDataBound.cs
new file mode 100644
index 00000000..bc09c068
--- /dev/null
+++ b/src/Spring/Spring.Web/DataBinding/IWebDataBound.cs
@@ -0,0 +1,31 @@
+using System;
+using Spring.Context;
+using Spring.Globalization;
+
+namespace Spring.DataBinding
+{
+	/// <summary>
+	/// A page or control must implement this interface to support spring's databinding infrastructure.
+	/// </summary>
+	/// <remarks>
+	/// <seealso cref="IDataBound"/>
+	/// <seealso cref="IBindingContainer"/>
+	/// <seealso cref="Spring.Web.UI.Controls.DataBindingPanel"/>
+	/// </remarks>
+	public interface IWebDataBound : IDataBound
+	{
+		/// <summary>
+		/// Return the UniqueID of this page or control.
+		/// </summary>
+		string UniqueID { get; }
+		/// <summary>
+		/// Return the <see cref="IApplicationContext"/> where <see cref="IFormatter"/> 
+		/// instances should be optained from.
+		/// </summary>
+		IApplicationContext ApplicationContext { get; }
+		/// <summary>
+		/// This event is raised to initialize bindings for <see cref="IDataBound.BindingManager" />.
+		/// </summary>
+		event EventHandler DataBindingsInitialized;
+	}
+}
diff --git a/src/Spring/Spring.Web/DataBinding/MultipleSelectionListControlBinding.cs b/src/Spring/Spring.Web/DataBinding/MultipleSelectionListControlBinding.cs
new file mode 100644
index 00000000..916b9cec
--- /dev/null
+++ b/src/Spring/Spring.Web/DataBinding/MultipleSelectionListControlBinding.cs
@@ -0,0 +1,163 @@
+using System;
+using System.Collections;
+using System.Web.UI.WebControls;
+using Spring.DataBinding;
+using Spring.Globalization;
+
+namespace Spring.DataBinding
+{
+    ///<summary>
+    /// Handles binding of a multiple selection ListControl to a target's IList property.
+    ///</summary>
+    public class MultipleSelectionListControlBinding : SimpleExpressionBinding
+    {
+        ///<summary>
+        /// Creates a new instance of this binding.
+        ///</summary>
+        ///<param name="sourceExpression">The expression that will evaluate to the <see cref="ListControl"/> acting as the source</param>
+        ///<param name="targetExpression">The expression that will evaluate to an <see cref="IList"/> property acting as the target</param>
+        /// <param name="direction">Binding's direction</param>
+        ///<param name="itemFormatter">An optional formatter converting target items into <see cref="ListItem.Value"/> and back</param>
+        /// <remarks>
+        /// If no formatter is specified, a <see cref="DataSourceItemFormatter"/> will be used.
+        /// </remarks>
+        public MultipleSelectionListControlBinding(string sourceExpression, string targetExpression, BindingDirection direction,
+                                                   IFormatter itemFormatter)
+            :base(sourceExpression, targetExpression, itemFormatter)
+        {
+            this.Direction = direction;
+            if (itemFormatter == null)
+            {
+                this.Formatter = new DataSourceItemFormatter("DataSource", "DataValueField");
+            }
+        }
+
+        /// <summary>
+        /// Actually performs unbinding the ListControl's selected values into the target's <see cref="IList"/>
+        /// </summary>
+        protected override void DoBindSourceToTarget(object source, object target, IDictionary variables)
+        {
+            // retrieve targetlist
+            IList targetList = this.GetTargetValue(target,variables) as IList;
+            if(targetList == null)
+            {
+                throw new ArgumentException(string.Format("Target property must evaluate to an instance of {0}.", typeof(IList).FullName));
+            }
+
+            // retrieve ListControl to be unbound
+            source = this.GetSourceValue(source, variables);
+            ListControl listControl = source as ListControl;
+            if(listControl == null)
+            {
+                throw new ArgumentException(string.Format("Source property must evaluate to an instance of {0}.", typeof(ListControl).FullName));
+            }
+
+            // reset target list
+            targetList.Clear();
+
+            // set binding context if applicable
+            IBindingAwareFormatter bindingAwareFormatter = this.Formatter as IBindingAwareFormatter;
+            if (bindingAwareFormatter != null)
+            {
+                bindingAwareFormatter.SetBindingContext(source, target, variables, BindingDirection.SourceToTarget);
+            }
+
+            // (re-)add selected items to the target list
+            try
+            {
+                IFormatter formatter = this.Formatter;
+                ListItemCollection listItems = listControl.Items;
+                foreach(ListItem listItem in listControl.Items)
+                {
+                    if (listItem.Selected)
+                    {
+                        // formatter must return an object applicable to the targetlist.
+                        object item = formatter.Parse(listItem.Value);
+                        targetList.Add(item);
+                    }
+                }
+            }
+            finally
+            {
+                if(bindingAwareFormatter != null)
+                {
+                    bindingAwareFormatter.ClearBindingContext();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Actually performs binding the targetlist to the ListControl.
+        /// </summary>
+        protected override void DoBindTargetToSource(object source, object target, IDictionary variables)
+        {
+            // retrieve targetlist
+            IList targetList = this.GetTargetValue(target, variables) as IList;
+            if (targetList == null)
+            {
+                throw new ArgumentException("Target property has to be initialized to an instance of IList interface.");
+            }
+
+            // retrieve ListControl to be bound
+            source = this.GetSourceValue(source, variables);
+            ListControl listControl = source as ListControl;
+            if(listControl == null)
+            {
+                throw new ArgumentException(string.Format("Source property has to be initialized to an instance of {0}.", typeof(ListControl).FullName));
+            }
+
+            // clear control's selection
+            listControl.ClearSelection();
+            ListItemCollection listItems = listControl.Items;
+
+            // set binding context if applicable
+            IBindingAwareFormatter bindingAwareFormatter = this.Formatter as IBindingAwareFormatter;
+            if(bindingAwareFormatter != null)
+            {
+                bindingAwareFormatter.SetBindingContext(source, target, variables, BindingDirection.TargetToSource);
+            }
+
+            // select all items in ListControl matching keys in targetlist
+            try
+            {
+                IFormatter formatter = this.Formatter;
+                foreach(object objectItem in targetList)
+                {
+                    string key = formatter.Format(objectItem);
+                    ListItem item = listItems.FindByValue(key);
+                    if (item != null)
+                    {
+                        item.Selected = true;
+                    }
+                    else
+                    {
+                        throw new ArgumentOutOfRangeException("value", key, string.Format("Value '{0}' does not exist", key ));
+                    }
+                }
+            }
+            finally
+            {
+                if(bindingAwareFormatter != null)
+                {
+                    bindingAwareFormatter.ClearBindingContext();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Setting source value is not allowed in this bindingType.
+        /// </summary>
+        protected override void SetSourceValue(object source, object value, IDictionary variables)
+        {
+            throw new InvalidOperationException(string.Format("Setting source value in '{0}' is not allowed.",this.GetType().FullName));
+        }
+
+        /// <summary>
+        /// Setting target value is not allowed in this bindingType.
+        /// </summary>
+        protected override void SetTargetValue(object target, object value, IDictionary variables)
+        {
+            throw new InvalidOperationException(string.Format("Setting target value in '{0}' is not allowed.", this.GetType().FullName));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Globalization/AspNetResourceCache.cs b/src/Spring/Spring.Web/Globalization/AspNetResourceCache.cs
new file mode 100644
index 00000000..213143d1
--- /dev/null
+++ b/src/Spring/Spring.Web/Globalization/AspNetResourceCache.cs
@@ -0,0 +1,54 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Web;
+using System.Web.Caching;
+
+namespace Spring.Globalization
+{
+    /// <summary>
+    /// Resource cache implementation that uses ASP.NET <see cref="Cache"/> to cache resources.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AspNetResourceCache.cs,v 1.6 2007/08/03 06:08:59 oakinger Exp $</version>
+    internal class AspNetResourceCache : AbstractResourceCache
+    {
+        /// <summary>
+        /// Gets the list of resources from cache.
+        /// </summary>
+        /// <param name="cacheKey">Cache key to use for lookup.</param>
+        /// <returns>A list of cached resources for the specified target object and culture.</returns>
+        protected override IList GetResources(string cacheKey)
+        {
+            return (IList)HttpRuntime.Cache[cacheKey];
+        }
+
+        /// <summary>
+        /// Puts the list of resources in the cache.
+        /// </summary>
+        /// <param name="cacheKey">Cache key to use for the specified resources.</param>
+        /// <param name="resources">A list of resources to cache.</param>
+        protected override void PutResources(string cacheKey, IList resources)
+        {
+            HttpRuntime.Cache[cacheKey] = resources;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Globalization/Resolvers/CookieCultureResolver.cs b/src/Spring/Spring.Web/Globalization/Resolvers/CookieCultureResolver.cs
new file mode 100644
index 00000000..5fd45e42
--- /dev/null
+++ b/src/Spring/Spring.Web/Globalization/Resolvers/CookieCultureResolver.cs
@@ -0,0 +1,85 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Globalization;
+using System.Web;
+
+namespace Spring.Globalization.Resolvers
+{
+    /// <summary>
+    /// Culture resolver that uses cookie to store culture information.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CookieCultureResolver.cs,v 1.4 2007/08/25 14:26:35 oakinger Exp $</version>
+    public class CookieCultureResolver : DefaultWebCultureResolver
+    {
+        private const string CultureKey = "Spring.UserLocale";
+
+        /// <summary>
+        /// Resolves the culture from the request.
+        /// </summary>
+        /// <remarks>
+        /// If the culture cookie doesn't exist, this method will return 
+        /// the value of the 'Accept-Language' request header, or if no
+        /// headers are specified, the culture of the current server thread.
+        /// </remarks>
+        /// <returns>Culture that should be used to render view.</returns>
+        public override CultureInfo ResolveCulture()
+        {
+            HttpCookie cookie = HttpContext.Current.Request.Cookies[CultureKey];
+
+            if (cookie != null)
+            {
+                return base.GetCulture(cookie.Value);
+            }
+            else
+            {
+                return base.GetDefaultLocale();
+            }
+        }
+
+        /// <summary>
+        /// Sets the culture.
+        /// </summary>
+        /// <param name="culture">The new culture or <code>null</code> to clear the culture.</param>
+        public override void SetCulture(CultureInfo culture)
+        {
+            HttpCookie cookie = CreateCookie(culture);
+            HttpContext.Current.Request.Cookies.Set(cookie);
+            HttpContext.Current.Response.Cookies.Add(cookie);
+        }
+
+        /// <summary>
+        /// Creates cookie for the specified culture.
+        /// </summary>
+        /// <param name="culture">Culture to store in a cookie.</param>
+        /// <returns>Created cookie.</returns>
+        private HttpCookie CreateCookie(CultureInfo culture)
+        {
+            HttpCookie cookie = new HttpCookie(CultureKey);
+            cookie.Domain = HttpContext.Current.Request.Url.Host;
+            cookie.Expires = DateTime.MaxValue;
+            cookie.Value = culture.Name;
+
+            return cookie;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Globalization/Resolvers/DefaultWebCultureResolver.cs b/src/Spring/Spring.Web/Globalization/Resolvers/DefaultWebCultureResolver.cs
new file mode 100644
index 00000000..59418ac5
--- /dev/null
+++ b/src/Spring/Spring.Web/Globalization/Resolvers/DefaultWebCultureResolver.cs
@@ -0,0 +1,101 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Globalization;
+using System.Threading;
+using System.Web;
+using Spring.Util;
+
+namespace Spring.Globalization.Resolvers
+{
+    /// <summary>
+    /// Default culture resolver for web applications. Contains some common utility methods for web culture resolvers.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DefaultWebCultureResolver.cs,v 1.5 2007/08/25 14:26:35 oakinger Exp $</version>
+    public class DefaultWebCultureResolver : DefaultCultureResolver
+    {
+        /// <summary>
+        /// Returns default culture. If <see cref="DefaultCultureResolver.DefaultCulture"/> property is not set, 
+        /// it tries to get culture from the request headers
+        /// and falls back to a current thread's culture if no headers are available.
+        /// </summary>
+        /// <returns>Default culture to use.</returns>
+        protected override CultureInfo GetDefaultLocale()
+        {
+            if (DefaultCulture != null)
+            {
+                return base.DefaultCulture;
+            }
+
+            CultureInfo culture = GetCulture(GetRequestLanguage());
+            if (culture != null)
+            {
+                return culture;
+            }
+
+            return Thread.CurrentThread.CurrentUICulture;
+        }
+
+        /// <summary>
+        /// Extracts the users favorite language from "accept-language" header of the current request.
+        /// </summary>
+        /// <returns>a language string if any or <c>null</c>, if no languages have been sent with the request</returns>
+        protected virtual string GetRequestLanguage()
+        {
+            HttpContext context = HttpContext.Current;
+            if (context != null && context.Request != null && ArrayUtils.HasLength(context.Request.UserLanguages))
+            {                
+                return context.Request.UserLanguages[0];
+            }
+            return null;    
+        }
+
+        /// <summary>
+        /// Resolves a culture by name.
+        /// </summary>
+        /// <param name="cultureName">the name of the culture to get</param>
+        /// <returns>a (possible neutral!) <see cref="CultureInfo"/> or <c>null</c>, if culture could not be resolved</returns>
+        public CultureInfo GetCulture(string cultureName)
+        {
+            try { return new CultureInfo(cultureName.Split(';')[0]); } catch { }
+            return null;
+        }
+
+        /// <summary>
+        /// Resolves the culture from the context.
+        /// </summary>
+        /// <returns>Culture that should be used to render view.</returns>
+        public override CultureInfo ResolveCulture()
+        {
+            return GetDefaultLocale();
+        }
+
+        /// <summary>
+        /// Not supported for this implementation.
+        /// </summary>
+        /// <param name="culture">The new culture or <code>null</code> to clear the culture.</param>
+        public override void SetCulture(CultureInfo culture)
+        {
+            throw new NotSupportedException("Cannot change a default culture in a web application - use a different culture resolution strategy.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Globalization/Resolvers/RequestCultureResolver.cs b/src/Spring/Spring.Web/Globalization/Resolvers/RequestCultureResolver.cs
new file mode 100644
index 00000000..932f5e42
--- /dev/null
+++ b/src/Spring/Spring.Web/Globalization/Resolvers/RequestCultureResolver.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Globalization;
+using System.Threading;
+using System.Web;
+using Spring.Util;
+
+namespace Spring.Globalization.Resolvers
+{
+    /// <summary>
+    /// Culture resolver that uses request headers to determine culture. If no languages
+    /// are specified in the request headers, it returns default culture specifed, and 
+    /// if no default culture was specifed it returns current culture for the executing 
+    /// server thread.
+    /// </summary>
+    /// <remarks>
+    /// <b>Note:</b> This culture resolver cannot be used to change the culture 
+    /// because request headers cannot be modified. In order to change the culture
+    /// when using this culture resolver user has to change language settings in
+    /// the web browser.
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: RequestCultureResolver.cs,v 1.4 2007/08/25 14:26:35 oakinger Exp $</version>
+    public class RequestCultureResolver : DefaultWebCultureResolver
+    {
+        /// <summary>
+        /// Tries to determine culture from the request headers. If no languages
+        /// are specified in the request headers, it returns default culture specifed, and 
+        /// if no default culture was specifed it returns current culture for the executing 
+        /// server thread.
+        /// </summary>
+        /// <returns>Culture that should be used to render view.</returns>
+        public override CultureInfo ResolveCulture()
+        {
+            HttpContext context = HttpContext.Current;
+
+            CultureInfo culture = GetCulture(GetRequestLanguage());
+            if (culture != null)
+            {
+                return culture;
+            }
+
+            if (DefaultCulture != null)
+            {
+                return base.DefaultCulture;
+            }
+
+            return Thread.CurrentThread.CurrentUICulture;
+        }
+
+        /// <summary>
+        /// Not supported for this resolver implementation
+        /// </summary>
+        /// <param name="culture">The new culture or <code>null</code> to clear the culture.</param>
+        public override void SetCulture(CultureInfo culture)
+        {
+            throw new NotSupportedException("Cannot change HTTP request headers - use a different culture resolution strategy.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Globalization/Resolvers/SessionCultureResolver.cs b/src/Spring/Spring.Web/Globalization/Resolvers/SessionCultureResolver.cs
new file mode 100644
index 00000000..592d25f6
--- /dev/null
+++ b/src/Spring/Spring.Web/Globalization/Resolvers/SessionCultureResolver.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Globalization;
+using System.Web;
+using Spring.Util;
+
+namespace Spring.Globalization.Resolvers
+{
+    /// <summary>
+    /// Culture resolver that uses HTTP session to store culture information.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SessionCultureResolver.cs,v 1.3 2007/08/25 14:26:35 oakinger Exp $</version>
+    public class SessionCultureResolver : DefaultWebCultureResolver
+    {
+        private const string CultureKey = "Spring.UserLocale";
+
+        /// <summary>
+        /// Resolves the culture from the request.
+        /// </summary>
+        /// <remarks>
+        /// If culture information doesn't exist in the session, it will be created and its value will 
+        /// be set to the value of the 'Accept-Language' request header, or if no
+        /// headers are specified to the culture of the current server thread.
+        /// </remarks>
+        /// <returns>Culture that should be used to render view.</returns>
+        public override CultureInfo ResolveCulture()
+        {
+            CultureInfo culture = SessionCulture;
+            if (culture != null)
+            {
+                return culture;
+            }
+            else
+            {
+                return base.GetDefaultLocale();
+            }
+        }
+
+        /// <summary>
+        /// Sets the culture.
+        /// </summary>
+        /// <param name="culture">The new culture or <code>null</code> to clear the culture.</param>
+        public override void SetCulture(CultureInfo culture)
+        {
+            SessionCulture = culture;
+        }
+
+        /// <summary>
+        /// Gets/Sets the current session's culture.
+        /// </summary>
+        protected virtual CultureInfo SessionCulture
+        {
+            set
+            {
+                AssertUtils.ArgumentNotNull(value, "SessionCulture");
+                HttpContext.Current.Session[CultureKey] = value;
+            }
+            get
+            {
+                CultureInfo culture = HttpContext.Current.Session[CultureKey] as CultureInfo;
+                return culture;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/ChildWebObjectDefinition.cs b/src/Spring/Spring.Web/Objects/Factory/Support/ChildWebObjectDefinition.cs
new file mode 100644
index 00000000..a38e163b
--- /dev/null
+++ b/src/Spring/Spring.Web/Objects/Factory/Support/ChildWebObjectDefinition.cs
@@ -0,0 +1,164 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Globalization;
+using System.Web;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Web object definitions extend <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+    /// by adding scope property.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This is the most common type of object definition in ASP.Net web applications
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ChildWebObjectDefinition.cs,v 1.3 2007/08/01 23:10:46 markpollack Exp $</version>
+    public class ChildWebObjectDefinition : ChildObjectDefinition, IWebObjectDefinition
+    {
+        private ObjectScope _scope = ObjectScope.Default;
+        private string _pageName;
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.ChildWebObjectDefinition"/> class
+        /// for a singleton, providing property values and constructor arguments.
+        /// </summary>
+        /// <param name="parentName">Name of the parent object definition.</param>
+        /// <param name="type">The class of the object to instantiate.</param>
+        /// <param name="arguments">
+        /// The <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+        /// to be applied to a new instance of the object.
+        /// </param>
+        /// <param name="properties">
+        /// The <see cref="Spring.Objects.MutablePropertyValues"/> to be applied to
+        /// a new instance of the object.
+        /// </param>
+        public ChildWebObjectDefinition(string parentName, Type type, ConstructorArgumentValues arguments, MutablePropertyValues properties) : base(parentName, type, arguments, properties)
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.ChildWebObjectDefinition"/> class
+        /// for a singleton, providing property values and constructor arguments.
+        /// </summary>
+        /// <param name="parentName">Name of the parent object definition.</param>
+        /// <param name="typeName">The class name of the object to instantiate.</param>
+        /// <param name="arguments">
+        /// The <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+        /// to be applied to a new instance of the object.
+        /// </param>
+        /// <param name="properties">
+        /// The <see cref="Spring.Objects.MutablePropertyValues"/> to be applied to
+        /// a new instance of the object.
+        /// </param>
+        public ChildWebObjectDefinition(string parentName, string typeName, ConstructorArgumentValues arguments, MutablePropertyValues properties) : base(parentName, typeName, arguments, properties)
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.ChildWebObjectDefinition"/> class
+        /// for an .aspx page, providing property values.
+        /// </summary>
+        /// <param name="parentName">Name of the parent object definition.</param>
+        /// <param name="pageName">Name of the .aspx page to instantiate.</param>
+        /// <param name="properties">
+        /// The <see cref="Spring.Objects.MutablePropertyValues"/> to be applied to
+        /// a new instance of the object.
+        /// </param>
+        public ChildWebObjectDefinition(string parentName, string pageName, MutablePropertyValues properties)
+            : base(parentName, WebObjectUtils.GetPageType(pageName), null, properties)
+        {
+			_pageName = WebUtils.CombineVirtualPaths(HttpContext.Current.Request.CurrentExecutionFilePath, pageName);
+		}
+
+        #endregion
+
+        /// <summary>
+        /// Object scope.
+        /// </summary>
+        public ObjectScope Scope
+        {
+            get { return _scope; }
+            set { _scope = value; }
+        }
+
+        /// <summary>
+        /// Returns true if web object is .aspx page.
+        /// </summary>
+        public bool IsPage
+        {
+            get { return _pageName != null; }
+        }
+
+        /// <summary>
+        /// Gets the rooted url of the .aspx page, if object definition represents page.
+        /// </summary>
+        public string PageName
+        {
+            get { return _pageName; }
+        }
+
+        /// <summary>
+        /// Forces ASP pages to be treated as prototypes all the time inorder to comply with ASP.Net requirements.
+        /// </summary>
+        public override bool IsSingleton
+        {
+            get
+            {
+                if (IsPage)
+                {
+                    return false;
+                }
+                else
+                {
+                    return base.IsSingleton;
+                }
+            }
+            set { base.IsSingleton = value; }
+        }
+
+        /// <summary>
+        /// A <see cref="System.String"/> that represents the current
+        /// <see cref="System.Object"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents the current
+        /// <see cref="System.Object"/>.
+        /// </returns>
+        public override string ToString()
+        {
+            return string.Format(
+                CultureInfo.InvariantCulture,
+                "Child web object with class [{0}] defined in {1}",
+                (IsPage ? PageName : ObjectTypeName),
+                ResourceDescription);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/IWebObjectDefinition.cs b/src/Spring/Spring.Web/Objects/Factory/Support/IWebObjectDefinition.cs
new file mode 100644
index 00000000..8a7ed3b6
--- /dev/null
+++ b/src/Spring/Spring.Web/Objects/Factory/Support/IWebObjectDefinition.cs
@@ -0,0 +1,45 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Defines additional members web object definitions need to implement.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IWebObjectDefinition.cs,v 1.2 2007/03/26 14:58:38 oakinger Exp $</version>
+    public interface IWebObjectDefinition
+    {
+        /// <summary>
+        /// Gets or sets scope for the web object (application, session or request)
+        /// </summary>
+        ObjectScope Scope { get; set; }
+
+        /// <summary>
+        /// Returns true if web object is .aspx page.
+        /// </summary>
+        bool IsPage { get; }
+
+		/// <summary>
+		/// Gets the rooted url of the .aspx page, if object definition represents page.
+		/// </summary>
+		string PageName { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/ObjectScope.cs b/src/Spring/Spring.Web/Objects/Factory/Support/ObjectScope.cs
new file mode 100644
index 00000000..9d611f9f
--- /dev/null
+++ b/src/Spring/Spring.Web/Objects/Factory/Support/ObjectScope.cs
@@ -0,0 +1,52 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// The possible object scope values.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ObjectScope.cs,v 1.1 2007/02/17 06:57:44 bbaia Exp $</version>
+    public enum ObjectScope
+    {
+        /// <summary>
+        /// Application scope.
+        /// </summary>
+        Application = 0,
+
+        /// <summary>
+        /// Session scope.
+        /// </summary>
+        Session = 1,
+
+        /// <summary>
+        /// Request scope.
+        /// </summary>
+        Request = 2,
+
+        /// <summary>
+        /// Default scope (currently
+        /// <see cref="Spring.Objects.Factory.Support.ObjectScope.Application"/>).
+        /// </summary>
+        /// <seealso cref="Spring.Objects.Factory.Support.ObjectScope.Application"/>
+        Default = Application
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/RootWebObjectDefinition.cs b/src/Spring/Spring.Web/Objects/Factory/Support/RootWebObjectDefinition.cs
new file mode 100644
index 00000000..064749f8
--- /dev/null
+++ b/src/Spring/Spring.Web/Objects/Factory/Support/RootWebObjectDefinition.cs
@@ -0,0 +1,221 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Web;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Web object definitions extend <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/>
+    /// by adding scope property.
+    /// </summary>
+    /// <remarks>
+    /// 	<p>
+    /// This is the most common type of object definition in ASP.Net web applications
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: RootWebObjectDefinition.cs,v 1.4 2007/08/01 23:10:46 markpollack Exp $</version>
+    public class RootWebObjectDefinition : RootObjectDefinition, IWebObjectDefinition
+    {
+        private ObjectScope _scope = ObjectScope.Default;
+        private string _pageName;
+
+        #region Constructors
+
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+        /// for a singleton, providing property values and constructor arguments.
+        /// </summary>
+        /// <param name="type">
+        /// The type of the object to instantiate.
+        /// </param>
+        /// <param name="properties">
+        /// The <see cref="Spring.Objects.MutablePropertyValues"/> to be applied to
+        /// a new instance of the object.
+        /// </param>
+        /// <param name="arguments">
+        /// The <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+        /// to be applied to a new instance of the object.
+        /// </param>
+        public RootWebObjectDefinition(
+            Type type,
+            ConstructorArgumentValues arguments,
+            MutablePropertyValues properties)
+            : base(type, arguments, properties)
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+        /// for a singleton, providing property values and constructor arguments.
+        /// </summary>
+        /// <param name="typeName">
+        /// The assembly qualified <see cref="System.Type.FullName"/> of the object to instantiate.
+        /// </param>
+        /// <param name="properties">
+        /// The <see cref="Spring.Objects.MutablePropertyValues"/> to be applied to
+        /// a new instance of the object.
+        /// </param>
+        /// <param name="arguments">
+        /// The <see cref="Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+        /// to be applied to a new instance of the object.
+        /// </param>
+        /// <remarks>
+        /// <p>
+        /// Takes an object class name to avoid eager loading of the object class.
+        /// </p>
+        /// </remarks>
+        public RootWebObjectDefinition(
+            string typeName,
+            ConstructorArgumentValues arguments,
+            MutablePropertyValues properties)
+            : base(typeName, arguments, properties)
+        {}
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootWebObjectDefinition"/> class
+        /// for an .aspx page, providing property values.
+        /// </summary>
+        /// <param name="pageName">
+        /// Name of the .aspx page to instantiate.
+        /// </param>
+        /// <param name="properties">
+        /// The <see cref="Spring.Objects.MutablePropertyValues"/> to be applied to
+        /// a new instance of the object.
+        /// </param>
+        public RootWebObjectDefinition(
+            string pageName,
+            MutablePropertyValues properties)
+            : base(WebObjectUtils.GetPageType(pageName), null, properties)
+        {
+            _pageName = WebUtils.CombineVirtualPaths(HttpContext.Current.Request.CurrentExecutionFilePath, pageName);
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.RootWebObjectDefinition"/> class
+        /// </summary>
+        /// <param name="other">
+        /// The definition that is to be copied.
+        /// </param>
+        /// <remarks>
+        /// <p>
+        /// Deep copy constructor.
+        /// </p>
+        /// </remarks>
+        public RootWebObjectDefinition(IObjectDefinition other) : base(other)
+        {
+            if (other is IWebObjectDefinition)
+            {
+                this._scope = ((IWebObjectDefinition) other).Scope;
+                this._pageName = ((IWebObjectDefinition) other).PageName;
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Object scope.
+        /// </summary>
+        public ObjectScope Scope
+        {
+            get { return _scope; }
+            set { _scope = value; }
+        }
+
+        /// <summary>
+        /// Returns true if web object is .aspx page.
+        /// </summary>
+        public bool IsPage
+        {
+            get { return _pageName != null; }
+        }
+
+        /// <summary>
+		/// Gets the rooted url of the .aspx page, if object definition represents page.
+		/// </summary>
+        public string PageName
+        {
+            get { return _pageName; }
+        }
+
+        /// <summary>
+        /// Forces ASP pages to be treated as prototypes all the time inorder to comply with ASP.Net requirements.
+        /// </summary>
+        public override bool IsSingleton
+        {
+            get
+            {
+                if (IsPage)
+                {
+                    return false;
+                }
+                else
+                {
+                    return base.IsSingleton;
+                }
+            }
+            set { base.IsSingleton = value; }
+        }
+
+        /// <summary>
+        /// Overrides this object's values using values from <c>other</c> argument.
+        /// </summary>
+        /// <param name="other">The object to copy values from.</param>
+        public override void OverrideFrom(IObjectDefinition other)
+        {
+            base.OverrideFrom(other);
+            if (other is IWebObjectDefinition)
+            {
+                this._scope = ((IWebObjectDefinition) other).Scope;
+                this._pageName = ((IWebObjectDefinition) other).PageName;
+            }
+        }
+
+        /// <summary>
+        /// A <see cref="System.String"/> that represents the current
+        /// <see cref="System.Object"/>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents the current
+        /// <see cref="System.Object"/>.
+        /// </returns>
+        public override string ToString()
+        {
+            return string.Format(
+                CultureInfo.InvariantCulture,
+                "Root web object with class [{0}] defined in {1}",
+                (IsPage ? PageName : ObjectTypeName),
+                ResourceDescription);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/WebInstantiationStrategy.cs b/src/Spring/Spring.Web/Objects/Factory/Support/WebInstantiationStrategy.cs
new file mode 100644
index 00000000..32f1c122
--- /dev/null
+++ b/src/Spring/Spring.Web/Objects/Factory/Support/WebInstantiationStrategy.cs
@@ -0,0 +1,86 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Object instantiation strategy for use in
+    /// <see cref="Spring.Objects.Factory.Support.WebObjectFactory"/>.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This strategy checks if objects id ASP.Net page and if it is uses
+    /// PageParser to compile and instantiate page instance. Otherwise it
+    /// delagates call to its parent.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: WebInstantiationStrategy.cs,v 1.4 2008/05/02 16:44:50 markpollack Exp $</version>
+    [Serializable]
+    public class WebInstantiationStrategy : MethodInjectingInstantiationStrategy
+    {
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.WebInstantiationStrategy"/> class.
+        /// </summary>
+        public WebInstantiationStrategy()
+        {}
+
+        /// <summary>
+        /// Instantiate an instance of the object described by the supplied
+        /// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+        /// </summary>
+        /// <param name="definition">
+        /// The definition of the object that is to be instantiated.
+        /// </param>
+        /// <param name="name">
+        /// The name associated with the object definition. The name can be the null
+        /// or zero length string if we're autowiring an object that doesn't belong
+        /// to the supplied <paramref name="factory"/>.
+        /// </param>
+        /// <param name="factory">
+        /// The owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// </param>
+        /// <returns>
+        /// An instance of the object described by the supplied
+        /// <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+        /// </returns>
+        public override object Instantiate(
+            RootObjectDefinition definition, string name, IObjectFactory factory)
+        {
+            if (definition is IWebObjectDefinition && ((IWebObjectDefinition) definition).IsPage)
+            {
+                return WebObjectUtils.CreatePageInstance(((IWebObjectDefinition) definition).PageName);
+            }
+            else
+            {
+                return base.Instantiate(definition, name, factory);
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectDefinitionFactory.cs b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectDefinitionFactory.cs
new file mode 100644
index 00000000..8332f4a4
--- /dev/null
+++ b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectDefinitionFactory.cs
@@ -0,0 +1,113 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Custom implementation of <see cref="IObjectDefinitionFactory"/>
+    /// for web applications.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This implementation adds support for .aspx pages and scoped objects.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: WebObjectDefinitionFactory.cs,v 1.9 2008/04/07 00:19:55 bbaia Exp $</version>
+    public class WebObjectDefinitionFactory : DefaultObjectDefinitionFactory
+    {
+
+        /// <summary>
+        /// Factory style method for getting concrete
+        /// <see cref="IConfigurableObjectDefinition"/>
+        /// instances.
+        /// </summary>
+        /// <remarks>If no parent is specified, a RootWebObjectDefinition is created, otherwise a 
+        /// ChildWebObjectDefinition.</remarks>
+        /// <param name="typeName">The <see cref="System.Type"/> of the defined object.</param>
+        /// <param name="parent">The name of the parent object definition (if any).</param>
+        /// <param name="domain">The <see cref="System.AppDomain"/> against which any class names
+        /// will be resolved into <see cref="System.Type"/> instances.</param>
+        /// <returns>
+        /// An
+        /// <see cref="IConfigurableObjectDefinition"/>
+        /// instance.
+        /// </returns>
+        public override AbstractObjectDefinition CreateObjectDefinition(string typeName, string parent, AppDomain domain)
+        {
+            Type objectType = null;
+            bool isPage = StringUtils.HasText(typeName) && typeName.ToLower().EndsWith(".aspx");
+            bool isControl = StringUtils.HasText(typeName) && 
+                             (typeName.ToLower().EndsWith(".ascx") || typeName.ToLower().EndsWith(".master"));
+            
+            if (!(isPage || isControl) && StringUtils.HasText(typeName) && domain != null)
+            {
+                try
+                {
+                    objectType = TypeResolutionUtils.ResolveType(typeName);
+                }
+                // try later....
+                catch { }
+            }
+
+            if (StringUtils.IsNullOrEmpty(parent))
+            {
+                if (objectType != null)
+                {
+                    return new RootWebObjectDefinition(objectType, new ConstructorArgumentValues(), new MutablePropertyValues());
+                }
+                else if (isPage)
+                {
+                    return new RootWebObjectDefinition(typeName, new MutablePropertyValues());
+                }
+                else
+                {
+                    return new RootWebObjectDefinition(typeName, new ConstructorArgumentValues(), new MutablePropertyValues());
+                }
+            }
+            else
+            {
+                if (objectType != null)
+                {
+                    return new ChildWebObjectDefinition(parent, objectType, new ConstructorArgumentValues(), new MutablePropertyValues());
+                }
+                else if (isPage)
+                {
+                    return new ChildWebObjectDefinition(parent, typeName, new MutablePropertyValues());
+                }
+                else
+                {
+                    return new ChildWebObjectDefinition(parent, typeName, new ConstructorArgumentValues(), new MutablePropertyValues());
+                }
+            }        
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectFactory.cs b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectFactory.cs
new file mode 100644
index 00000000..1b223e84
--- /dev/null
+++ b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectFactory.cs
@@ -0,0 +1,497 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Web;
+using System.Web.Caching;
+using System.Web.SessionState;
+using Common.Logging;
+using Spring.Context.Support;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Concrete implementation of
+    /// <see cref="Spring.Objects.Factory.IListableObjectFactory"/> that knows 
+    /// how to handle <see cref="IWebObjectDefinition"/>s.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This class should only be used within the context of an ASP.NET web application.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: WebObjectFactory.cs,v 1.10 2008/05/29 12:13:27 oakinger Exp $</version>
+    public class WebObjectFactory : DefaultListableObjectFactory
+    {
+        private readonly static ILog log = LogManager.GetLogger(typeof(WebObjectFactory));
+
+        private readonly static string OBJECTTABLEKEY = "spring.objects";
+
+        private delegate IDictionary ObjectDictionaryCreationHandler();
+
+        /// <summary>
+        /// Holds the virtual path this factory has been created from.
+        /// </summary>
+        private readonly string contextPath;
+        /// <summary>
+        /// Holds the handler reference for creating an object dictionary
+        /// matching this factory's case-sensitivity
+        /// </summary>
+        private readonly ObjectDictionaryCreationHandler createObjectDictionary;
+
+        #region Constructor (s) / Destructor
+
+        static WebObjectFactory()
+        {
+            EnsureEventHandlersRegistered();
+        }
+
+        /// <summary>
+        /// Registers events handlers with <see cref="WebSupportModule"/> to ensure
+        /// proper disposal of 'request'- and 'session'-scoped objects
+        /// </summary>
+        private static void EnsureEventHandlersRegistered()
+        {
+            if (log.IsDebugEnabled) log.Debug("hooking up event handlers");
+            VirtualEnvironment.EndRequest += new VirtualEnvironment.RequestEventHandler(OnEndRequest);
+            VirtualEnvironment.EndSession += new VirtualEnvironment.SessionEventHandler(OnEndSession);
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.WebObjectFactory"/> class.
+        /// </summary>
+        /// <param name="contextPath">The virtual path resources will be relative resolved to.</param>
+        /// <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+        public WebObjectFactory(string contextPath, bool caseSensitive)
+            : this(contextPath, caseSensitive, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Support.WebObjectFactory"/> class.
+        /// </summary>
+        /// <param name="contextPath">The virtual path resources will be relative resolved to.</param>
+        /// <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+        /// <param name="parentFactory">
+        /// The parent object factory.
+        /// </param>
+        public WebObjectFactory(string contextPath, bool caseSensitive, IObjectFactory parentFactory)
+            : base(caseSensitive, parentFactory)
+        {
+            this.contextPath = contextPath;
+            this.createObjectDictionary = (caseSensitive)
+                                            ? new ObjectDictionaryCreationHandler(CreateCaseSensitiveDictionary)
+                                            : new ObjectDictionaryCreationHandler(CreateCaseInsensitiveDictionary);
+
+            InstantiationStrategy = new WebInstantiationStrategy();
+        }
+
+        #endregion
+
+        #region Convenience accessors for Http* objects
+
+        /// <summary>
+        /// Convinience accessor for HttpContext
+        /// </summary>
+        private HttpContext Context
+        {
+            get { return HttpContext.Current; }
+        }
+
+        /// <summary>
+        /// Get the table of 'request'-scoped objects.
+        /// </summary>
+        protected virtual IDictionary Request
+        {
+            get
+            {
+                IDictionary objecttable = null;
+                if (this.Context != null)
+                {
+                    objecttable = this.Context.Items[OBJECTTABLEKEY] as IDictionary;
+                    if (objecttable == null)
+                    {
+                        this.Context.Items[OBJECTTABLEKEY] = CreateObjectDictionary();
+                    }
+                }
+                return objecttable;
+            }
+        }
+
+        /// <summary>
+        /// Get the table of 'session'-scoped objects. Returns null, if Session is disabled.
+        /// </summary>
+        protected virtual IDictionary Session
+        {
+            get
+            {
+                IDictionary objecttable = null;
+                if ((Context != null) && (Context.Session != null))
+                {
+                    objecttable = Context.Session[OBJECTTABLEKEY] as IDictionary;
+                    if (objecttable == null)
+                    {
+                        Context.Session[OBJECTTABLEKEY] = CreateObjectDictionary();
+                    }
+                }
+                return objecttable;
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Creates a dictionary matching this factory's case sensitivity behaviour.
+        /// </summary>
+        protected IDictionary CreateObjectDictionary()
+        {
+            return createObjectDictionary();
+        }
+
+        /// <summary>
+        /// Creates the root object definition.
+        /// </summary>
+        /// <param name="templateDefinition">The template definition.</param>
+        /// <returns>Root object definition.</returns>
+        protected override RootObjectDefinition CreateRootObjectDefinition(IObjectDefinition templateDefinition)
+        {
+            return new RootWebObjectDefinition(templateDefinition);
+        }
+
+        /// <summary>
+        /// Tries to find cached object for the specified name. 
+        /// </summary>
+        /// <remarks>
+        /// This implementation tries to find object first in the Request scope,
+        /// then in the Session scope and finally in the Application scope.
+        /// </remarks>
+        /// <param name="objectName">Object name to look for.</param>
+        /// <returns>Cached object if found, null otherwise.</returns>
+        protected override object GetSingleton(string objectName)
+        {
+            object instance = null;
+
+            instance = GetScopedSingleton(objectName, this.Request);
+            if (instance != null) return instance;
+
+            instance = GetScopedSingleton(objectName, this.Session);
+            if (instance != null) return instance;
+
+            instance = base.GetSingleton(objectName);
+            return instance;
+        }
+
+        /// <summary>
+        /// Looks up an <paramref name="objectName"/> in the specified cache dictionary.
+        /// </summary>
+        /// <param name="objectName">the name to lookup.</param>
+        /// <param name="scopedSingletonCache">the cache dictionary to search</param>
+        /// <returns>the found instance. null otherwise</returns>
+        protected object GetScopedSingleton(string objectName, IDictionary scopedSingletonCache)
+        {
+            if (scopedSingletonCache == null) return null;
+
+            lock (scopedSingletonCache.SyncRoot)
+            {
+                object instance = scopedSingletonCache[objectName];
+                if (instance == TemporarySingletonPlaceHolder)
+                {
+                    throw new ObjectCurrentlyInCreationException(objectName);
+                }
+
+                return instance;
+            }
+        }
+
+        /// <summary>
+        /// Creates a singleton instance for the specified object name and definition.
+        /// </summary>
+        /// <param name="objectName">
+        /// The object name (will be used as the key in the singleton cache key).
+        /// </param>
+        /// <param name="objectDefinition">The object definition.</param>
+        /// <param name="arguments">
+        /// The arguments to use if creating a prototype using explicit arguments to
+        /// a static factory method. It is invalid to use a non-null arguments value
+        /// in any other case.
+        /// </param>
+        /// <returns>The created object instance.</returns>
+        protected override object CreateAndCacheSingletonInstance(
+            string objectName, RootObjectDefinition objectDefinition, object[] arguments)
+        {
+            if (objectDefinition is IWebObjectDefinition
+                && ((IWebObjectDefinition)objectDefinition).Scope != ObjectScope.Application)
+            {
+                ObjectScope scope = ((IWebObjectDefinition)objectDefinition).Scope;
+
+                if (scope == ObjectScope.Request)
+                {
+                    IDictionary requestCache = this.Request;
+                    if (requestCache == null)
+                    {
+                        throw new ObjectCreationException(string.Format("'request' scoped web singleton object '{0}' requires a valid Request.", objectName));
+                    }
+
+                    object instance = CreateAndCacheScopedSingletonInstance(objectName, objectDefinition, arguments, requestCache);
+                    return instance;
+                }
+                else if (scope == ObjectScope.Session)
+                {
+                    IDictionary sessionCache = this.Session;
+                    if (sessionCache == null)
+                    {
+                        throw new ObjectCreationException(string.Format("'session' scoped web singleton object '{0}' requires a valid Session.", objectName));
+                    }
+                    object instance = CreateAndCacheScopedSingletonInstance(objectName, objectDefinition, arguments, sessionCache);
+                    return instance;
+                }
+
+                throw new ObjectDefinitionException("Web singleton objects must be either request, session or application scoped.");
+            }
+
+            return base.CreateAndCacheSingletonInstance(objectName, objectDefinition, arguments);
+        }
+
+        /// <summary>
+        /// Creates a singleton instance for the specified object name and definition 
+        /// and caches the instance in the specified dictionary
+        /// </summary>
+        /// <param name="objectName">
+        /// The object name (will be used as the key in the singleton cache key).
+        /// </param>
+        /// <param name="objectDefinition">The object definition.</param>
+        /// <param name="arguments">
+        /// The arguments to use if creating a prototype using explicit arguments to
+        /// a static factory method. It is invalid to use a non-null arguments value
+        /// in any other case.
+        /// </param>
+        /// <param name="scopedSingletonCache">the dictionary to be used for caching singleton instances</param>
+        /// <returns>The created object instance.</returns>
+        /// <remarks>
+        /// If the object is successfully created, <paramref name="scopedSingletonCache"/> 
+        /// contains the cached instance with the key <paramref name="objectName"/>.
+        /// </remarks>
+        protected virtual object CreateAndCacheScopedSingletonInstance(string objectName, RootObjectDefinition objectDefinition, object[] arguments, IDictionary scopedSingletonCache)
+        {
+            object instance;
+            lock (scopedSingletonCache.SyncRoot)
+            {
+                instance = scopedSingletonCache[objectName];
+                if (instance == TemporarySingletonPlaceHolder)
+                {
+                    throw new ObjectCurrentlyInCreationException(objectName);
+                }
+                else if (instance == null)
+                {
+                    scopedSingletonCache.Add(objectName, TemporarySingletonPlaceHolder);
+                    try
+                    {
+                        instance = CreateObject(objectName, objectDefinition, arguments, true);
+                        AssertUtils.ArgumentNotNull(instance, "instance");
+                        scopedSingletonCache[objectName] = instance;
+                    }
+                    catch
+                    {
+                        scopedSingletonCache.Remove(objectName);
+                        throw;
+                    }
+                }
+            }
+            return instance;
+        }
+
+        /// <summary>
+        /// Add the created, but yet unpopulated singleton to the singleton cache
+        /// to be able to resolve circular references
+        /// </summary>
+        /// <param name="objectName">the name of the object to add to the cache.</param>
+        /// <param name="objectDefinition">the definition used to create and populated the object.</param>
+        /// <param name="rawSingletonInstance">the raw object instance.</param>
+        /// <remarks>
+        /// Derived classes may override this method to select the right cache based on the object definition.
+        /// </remarks>
+        protected override void AddEagerlyCachedSingleton(string objectName, IObjectDefinition objectDefinition, object rawSingletonInstance)
+        {
+            if (objectDefinition is IWebObjectDefinition
+                && ((IWebObjectDefinition)objectDefinition).Scope != ObjectScope.Application)
+            {
+                ObjectScope scope = ((IWebObjectDefinition) objectDefinition).Scope;
+                if (scope == ObjectScope.Request)
+                {
+                    this.Request[objectName] = rawSingletonInstance;
+                }
+                else if (scope == ObjectScope.Session)
+                {
+                    this.Session[objectName] = rawSingletonInstance;                    
+                }
+                else
+                {
+                    throw new ObjectDefinitionException("Web singleton objects must be either request, session or application scoped.");                    
+                }
+            }
+            else
+            {
+                base.AddEagerlyCachedSingleton(objectName, objectDefinition, rawSingletonInstance);
+            }
+        }
+
+        /// <summary>
+        /// Remove the specified singleton from the singleton cache that has 
+        /// been added before by a call to <see cref="AddEagerlyCachedSingleton"/>
+        /// </summary>
+        /// <param name="objectName">the name of the object to remove from the cache.</param>
+        /// <param name="objectDefinition">the definition used to create and populated the object.</param>
+        /// <remarks>
+        /// Derived classes may override this method to select the right cache based on the object definition.
+        /// </remarks>
+        protected override void RemoveEagerlyCachedSingleton(string objectName, IObjectDefinition objectDefinition)
+        {
+            if (objectDefinition is IWebObjectDefinition
+                && ((IWebObjectDefinition)objectDefinition).Scope != ObjectScope.Application)
+            {
+                ObjectScope scope = ((IWebObjectDefinition) objectDefinition).Scope;
+                if (scope == ObjectScope.Request)
+                {
+                    this.Request.Remove(objectName);
+                }
+                else if (scope == ObjectScope.Session)
+                {
+                    this.Session.Remove(objectName);
+                }
+                else
+                {
+                    throw new ObjectDefinitionException("Web singleton objects must be either request, session or application scoped.");                    
+                }
+            }
+            else
+            {
+                base.RemoveEagerlyCachedSingleton(objectName, objectDefinition);
+            }
+        }
+
+        /// <summary>
+        /// Injects dependencies into the supplied <paramref name="target"/> instance
+        /// using the named object definition.
+        /// </summary>
+        /// <param name="target">
+        /// The object instance that is to be so configured.
+        /// </param>
+        /// <param name="name">
+        /// The name of the object definition expressing the dependencies that are to
+        /// be injected into the supplied <parameref name="target"/> instance.
+        /// </param>
+        /// <seealso cref="Spring.Objects.Factory.IObjectFactory.ConfigureObject(object, string)"/>
+        public override object ConfigureObject(object target, string name)
+        {
+            // always configure object relative to contextPath
+            using (new HttpContextSwitch(contextPath))
+            {
+                return base.ConfigureObject(target, name);
+            }
+        }
+
+        /// <summary>
+        /// Disposes all 'request'-scoped objects at the end of each Request
+        /// </summary>
+        private static void OnEndRequest(HttpContext context)
+        {
+            IDictionary items = context.Items[OBJECTTABLEKEY] as IDictionary;
+
+            if (items != null)
+            {
+                log.Debug("disposing 'request'-scoped item cache");
+                ArrayList keys = new ArrayList(items.Keys);
+                for (int i = 0; i < keys.Count; i++)
+                {
+                    IDisposable d = items[keys[i]] as IDisposable;
+                    if (d != null)
+                    {
+                        d.Dispose();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Disposes all 'session'-scoped objects at the end of a session
+        /// </summary>
+        private static void OnEndSession(HttpSessionState session, CacheItemRemovedReason reason)
+        {
+            IDictionary items = null;
+            try
+            {
+                items = session[OBJECTTABLEKEY] as IDictionary;
+            }
+            catch
+            {
+                // ignore exceptions while accessing session
+            }
+            if (items != null)
+            {
+                log.Debug("disposing 'session'-scoped item cache");
+                object key = null;
+                try
+                {
+                    ArrayList keys = new ArrayList(items.Keys);
+                    for (int i = 0; i < keys.Count; i++)
+                    {
+                        key = keys[i];
+                        IDisposable d = items[key] as IDisposable;
+                        if (d != null)
+                        {
+                            d.Dispose();
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    log.Fatal(string.Format("error during disposing session item with key '{0}'", key), ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates a case insensitive hashtable instance
+        /// </summary>
+        private static IDictionary CreateCaseInsensitiveDictionary()
+        {
+            return CollectionsUtil.CreateCaseInsensitiveHashtable();
+        }
+
+        /// <summary>
+        /// Creates a case sensitive hashtable instance
+        /// </summary>
+        private static IDictionary CreateCaseSensitiveDictionary()
+        {
+            return new Hashtable();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectUtils.cs b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectUtils.cs
new file mode 100644
index 00000000..d275a148
--- /dev/null
+++ b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectUtils.cs
@@ -0,0 +1,293 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#if !NET_1_1
+using System.Web.Compilation;
+#endif
+#if NET_1_1
+using System.Reflection;
+using System.Web.UI;
+#endif
+using System;
+using System.IO;
+using System.Web;
+using Common.Logging;
+using Spring.Util;
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Miscellaneous utility methods to support web functionality within Spring.Objects
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: WebObjectUtils.cs,v 1.3 2008/01/27 23:29:55 oakinger Exp $</version>
+    public sealed class WebObjectUtils
+    {
+        private static ILog s_log = LogManager.GetLogger(typeof(WebObjectUtils));
+
+        // CLOVER:OFF
+
+#if NET_1_1   
+        // Required method for resolving control types
+    	private static MethodInfo miGetCompiledUserControlType = null;
+    	
+    	static WebObjectUtils()
+    	{
+			Type tUserControlParser = typeof(System.Web.UI.UserControl).Assembly.GetType("System.Web.UI.UserControlParser");    		
+			miGetCompiledUserControlType =
+				tUserControlParser.GetMethod("GetCompiledUserControlType", BindingFlags.Static | BindingFlags.NonPublic);					
+    	}
+#endif
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Util.WebUtils"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is a utility class, and as such exposes no public constructors.
+        /// </p>
+        /// </remarks>
+        private WebObjectUtils()
+        {}
+
+        // CLOVER:ON
+
+
+        /// <summary>
+        /// Creates an instance of the ASPX page
+        /// referred to by the supplied <paramref name="pageUrl"/>.
+        /// </summary>
+        /// <param name="pageUrl">
+        /// The URL of the ASPX page.
+        /// </param>
+        /// <returns>Page instance.</returns>
+        /// <exception cref="Spring.Objects.Factory.ObjectCreationException">
+        /// If this method is not called in the scope of an active web session
+        /// (i.e. the implementation this method depends on this code executing
+        /// in the environs of a running web server such as IIS); or if the
+        /// page could not be instantiated (for whatever reason, such as the
+        /// ASPX <paramref name="pageUrl"/> not actually existing).
+        /// </exception>
+        public static IHttpHandler CreatePageInstance(string pageUrl)
+        {
+            if (s_log.IsDebugEnabled)
+            {
+                s_log.Debug("creating page instance '" + pageUrl + "'");
+            }
+            if (HttpContext.Current == null)
+            {
+                throw new ObjectCreationException(
+                    "Unable to instantiate page. HttpContext is not defined.");
+            }
+            IHttpHandler page = null;
+            try
+            {
+#if NET_1_1
+                HttpContext context = HttpContext.Current;
+            	string physicalPath = context.Server.MapPath(pageUrl);
+				s_log.Debug(string.Format("constructing page virtual path '{0}' from physical file '{1}'", pageUrl, physicalPath));
+            	page = PageParser.GetCompiledPageInstance(pageUrl, physicalPath, context);
+#else
+                HttpContext ctx = HttpContext.Current;
+                if (ctx == null)
+                {
+                    throw new ObjectCreationException("Unable to get page type. HttpContext is not defined.");
+                }
+
+                string rootedVPath = WebUtils.CombineVirtualPaths(ctx.Request.CurrentExecutionFilePath, pageUrl);
+                if (s_log.IsDebugEnabled)
+                {
+                    s_log.Debug("page vpath is " + rootedVPath);
+                }
+
+                page = BuildManager.CreateInstanceFromVirtualPath(rootedVPath, 
+                                                                  typeof(IHttpHandler)) as IHttpHandler;
+#endif            
+            }
+            catch (HttpException httpEx)
+            {
+                string msg = String.Format("Unable to instantiate page [{0}]: {1}", pageUrl, httpEx.Message);
+                if(httpEx.GetHttpCode() == 404)
+                {
+                    throw new FileNotFoundException(msg);
+                }
+                s_log.Error(msg, httpEx);
+                throw new ObjectCreationException(msg, httpEx);
+            }
+            catch (Exception ex)
+            {
+                // in case of FileNotFound recreate the exception for clarity
+                FileNotFoundException fnfe = ex as FileNotFoundException;
+                if (fnfe != null)
+                {
+                    string fmsg = String.Format("Unable to instantiate page [{0}]: The file '{1}' does not exist.", pageUrl, fnfe.Message);
+                    throw new FileNotFoundException(fmsg);
+                }
+
+                string msg = String.Format("Unable to instantiate page [{0}]", pageUrl);
+                s_log.Error(msg, ex);
+                throw new ObjectCreationException(msg, ex);
+            }
+            return page;
+        }
+
+        /// <summary>
+        /// Returns the <see cref="System.Type"/> of the ASPX page
+        /// referred to by the supplied <paramref name="pageUrl"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// As indicated by the exception that can be thrown by this method,
+        /// the ASPX page referred to by the supplied <paramref name="pageUrl"/>
+        /// does have to be instantiated in order to determine its 
+        /// see cref="System.Type"/>
+        /// </p>
+        /// </remarks>
+        /// <param name="pageUrl">
+        /// The filename of the ASPX page.
+        /// </param>
+        /// <returns>
+        /// The <see cref="System.Type"/> of the ASPX page
+        /// referred to by the supplied <paramref name="pageUrl"/>.
+        /// </returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="pageUrl"/> is <see langword="null"/> or
+        /// contains only whitespace character(s).
+        /// </exception>
+        /// <exception cref="Spring.Objects.Factory.ObjectCreationException">
+        /// If this method is not called in the scope of an active web session
+        /// (i.e. the implementation this method depends on this code executing
+        /// in the environs of a running web server such as IIS); or if the
+        /// page could not be instantiated (for whatever reason, such as the
+        /// ASPX <paramref name="pageUrl"/> not actually existing).
+        /// </exception>
+        public static Type GetPageType(string pageUrl)
+        {
+            AssertUtils.ArgumentHasText(pageUrl, "pageUrl");
+
+            HttpContext ctx = HttpContext.Current;
+            if (ctx == null)
+            {
+                throw new ObjectCreationException("Unable to get page type. HttpContext is not defined.");
+            }
+
+            try
+            {
+                Type pageType = GetCompiledPageType(pageUrl);
+                return pageType;
+            }
+            catch (Exception ex)
+            {
+                string msg = String.Format("Unable to get page type for url [{0}]", pageUrl);
+                s_log.Error(msg, ex);
+                throw new ObjectCreationException(msg, ex);
+            }
+        }
+
+        /// <summary>
+        /// Calls the underlying ASP.NET infrastructure to obtain the compiled page type 
+        /// relative to the current <see cref="HttpRequest.CurrentExecutionFilePath"/>.
+        /// </summary>
+        /// <param name="pageUrl">
+        /// The filename of the ASPX page relative to the current <see cref="HttpRequest.CurrentExecutionFilePath"/>
+        /// </param>
+        /// <returns>
+        /// The <see cref="System.Type"/> of the ASPX page
+        /// referred to by the supplied <paramref name="pageUrl"/>.
+        /// </returns>
+        public static Type GetCompiledPageType(string pageUrl)
+        {
+            if (s_log.IsDebugEnabled)
+            {
+                s_log.Debug("getting page type for " + pageUrl);
+            }
+
+            string rootedVPath = WebUtils.CombineVirtualPaths(HttpContext.Current.Request.CurrentExecutionFilePath, pageUrl);
+            if (s_log.IsDebugEnabled)
+            {
+                s_log.Debug("page vpath is " + rootedVPath);
+            }
+
+            Type pageType = null;
+#if NET_2_0
+            pageType = BuildManager.GetCompiledType(rootedVPath); // requires rooted virtual path!
+#else
+            pageType = CreatePageInstance(pageUrl).GetType();
+#endif
+
+            if (s_log.IsDebugEnabled)
+            {
+                s_log.Debug(string.Format("got page type '{0}' for vpath '{1}'", pageType.FullName, rootedVPath));
+            }
+            return pageType;
+        }
+
+
+        /// <summary>
+        /// Gets the controls type from a given filename
+        /// </summary>
+        public static Type GetControlType(string controlName)
+        {
+            AssertUtils.ArgumentHasText(controlName, "controlName");
+            if (s_log.IsDebugEnabled)
+            {
+                s_log.Debug("getting control type for " + controlName);
+            }
+
+            HttpContext ctx = HttpContext.Current;
+            if (ctx == null)
+            {
+                throw new ObjectCreationException("Unable to get control type. HttpContext is not defined.");
+            }
+
+            string rootedVPath = WebUtils.CombineVirtualPaths(ctx.Request.CurrentExecutionFilePath, controlName);
+
+            if (s_log.IsDebugEnabled)
+            {
+                s_log.Debug("control vpath is " + rootedVPath);
+            }
+
+            Type controlType = null;
+            try
+            {
+#if NET_2_0
+                controlType = BuildManager.GetCompiledType(rootedVPath); // requires rooted virtual path!
+#else
+              controlType = (Type) miGetCompiledUserControlType.Invoke(null, new object[] { rootedVPath, null, ctx });
+#endif
+            }
+            catch(HttpException httpEx)
+            {
+                // for better error-handling suppress 404 HttpExceptions here
+                if (httpEx.GetHttpCode() == 404)
+                {
+                    throw new FileNotFoundException(string.Format("Control '{0}' does not exist", rootedVPath));
+                }
+                throw;
+            }
+
+            if (s_log.IsDebugEnabled)
+            {
+                s_log.Debug(string.Format("got control type '{0}' for vpath '{1}'", controlType.FullName, rootedVPath));
+            }
+            return controlType;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectsNamespaceParser.cs b/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectsNamespaceParser.cs
new file mode 100644
index 00000000..e83cb4ba
--- /dev/null
+++ b/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectsNamespaceParser.cs
@@ -0,0 +1,206 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Web;
+using System.Xml;
+
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// A custom implementation of the
+    /// <see cref="INamespaceParser"/>
+    /// interface that properly handles web application specific attributes,
+    /// such as object scope.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Parses object definitions according to the standard Spring.NET schema.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: WebObjectsNamespaceParser.cs,v 1.1 2007/08/07 23:22:30 markpollack Exp $</version>
+    /// <see cref="ObjectsNamespaceParser"/>
+    public class WebObjectsNamespaceParser : ObjectsNamespaceParser
+    {
+        private IObjectDefinitionFactory objectDefinitionFactory;
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="WebObjectsNamespaceParser"/> class.
+        /// </summary>
+        public WebObjectsNamespaceParser()
+        {
+            objectDefinitionFactory = new WebObjectDefinitionFactory();
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Parses an object definition and set various web related properties
+        /// if the definition is an <see cref="RootWebObjectDefinition"/>.
+        /// </summary>
+        /// <param name="element">The object definition element.</param>
+        /// <param name="id">The id / name of the object definition.</param>
+        /// <param name="parserHelper">the parser helper</param>
+        /// <returns>The object (definition).</returns>
+        /// <remarks>
+        /// 	<p>
+        /// The <i>'various web related properties'</i> currently includes the
+        /// intended scope of the object.
+        /// </p>
+        /// </remarks>
+        /// <see cref="Spring.Objects.Factory.Support.ObjectScope"/>
+        /// <see cref="Spring.Objects.Factory.Support.IWebObjectDefinition"/>
+        protected override IConfigurableObjectDefinition ParseObjectDefinition(
+            XmlElement element, string id, ObjectDefinitionParserHelper parserHelper)
+        {
+            parserHelper.ReaderContext.ObjectDefinitionFactory = objectDefinitionFactory;
+            IConfigurableObjectDefinition definition = base.ParseObjectDefinition(element, id, parserHelper);
+            IWebObjectDefinition webDefinition = definition as IWebObjectDefinition;
+            
+            if (webDefinition != null)
+            {
+                webDefinition.Scope = GetScope(element.GetAttribute(ObjectDefinitionConstants.ScopeAttribute));
+
+                // force request and session scoped objects to be lazily initialized...
+                if (webDefinition.Scope != ObjectScope.Application)
+                {
+                    definition.IsLazyInit = true;
+                }
+            	
+            	string typeName = element.GetAttribute(ObjectDefinitionConstants.TypeAttribute);
+	        	if (typeName.EndsWith(".ascx") || typeName.EndsWith(".master"))
+	        	{
+	        		definition.IsAbstract = true;	
+	        	}				        	
+            }
+        	
+            return definition;
+        }
+
+        /// <summary>
+        /// Calculates an id for an object definition.
+        /// </summary>
+        /// <param name="element">
+        /// The element containing the object definition.
+        /// </param>
+        /// <param name="aliases">
+        /// The list of names defined for the object; may be <see lang="null"/>
+        /// or even empty.
+        /// </param>
+        /// <returns>
+        /// A calculated object definition id.
+        /// </returns>
+        /// <seealso cref="ObjectsNamespaceParser.CalculateId"/>.
+        protected override string CalculateId(XmlElement element, ArrayList aliases)
+        {
+            string id = null;
+        	string strTypeName = element.GetAttribute(ObjectDefinitionConstants.TypeAttribute).ToLower();
+            if (strTypeName.EndsWith(".aspx"))
+            {
+                string url = element.GetAttribute(ObjectDefinitionConstants.TypeAttribute);
+                //id = WebUtils.GetPageName(url);
+                //Type pageType = WebUtils.GetPageType(url);
+                System.Web.UI.Page page = (System.Web.UI.Page)WebObjectUtils.CreatePageInstance(url);
+#if NET_2_0
+                id = page.AppRelativeVirtualPath.Substring(1);
+#else
+				string appPath = HttpContext.Current.Request.ApplicationPath.TrimEnd('\\', '/');
+				id = page.TemplateSourceDirectory.TrimEnd('\\','/') + "/" + WebUtils.GetPageName(url) + ".aspx";
+				if (id.ToLower().StartsWith(appPath.ToLower()))
+				{
+					id = id.Substring(appPath.Length);
+				}
+#endif
+                for(int ai=0;ai<aliases.Count;ai++)
+                {
+                    string alias = (string)aliases[ai];
+                    if (StringUtils.HasText(alias) && alias[0]=='~')
+                    {
+                        aliases[ai] = "/"+alias.Substring(1).TrimStart('/','\\');
+                    }
+                }
+            }
+        	else if (strTypeName.EndsWith(".ascx") || strTypeName.EndsWith(".master"))
+        	{
+                id = WebObjectUtils.GetControlType(strTypeName).FullName;
+        	}
+        	else
+            {
+                id = base.CalculateId(element, aliases);
+            }
+            return id;
+        }
+
+        /// <summary>
+        /// Gets the scope out of the supplied <paramref name="value"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If the supplied <paramref name="value"/> is invalid
+        /// (i.e. it does not resolve to one of the 
+        /// <see cref="Spring.Objects.Factory.Support.ObjectScope"/> values),
+        /// then the return value of this method call will be
+        /// <see cref="Spring.Objects.Factory.Support.ObjectScope.Default"/>;
+        /// no exception will be raised (although the value of the invalid
+        /// scope <paramref name="value"/> will be logged).
+        /// </p>
+        /// </remarks>
+        /// <param name="value">The string containing the scope name.</param>
+        /// <returns>The scope.</returns>
+        /// <seealso cref="Spring.Objects.Factory.Support.ObjectScope"/>
+        private ObjectScope GetScope(string value)
+        {
+            ObjectScope scope = ObjectScope.Default;
+            if (StringUtils.HasText(value))
+            {
+                try
+                {
+                    scope = (ObjectScope) Enum.Parse(typeof(ObjectScope), value, true);
+                }
+                catch (ArgumentException ex)
+                {
+                    #region Instrumentation
+
+                    if (log.IsDebugEnabled)
+                    {
+                        log.Debug(string.Format("Error while parsing object scope : '{0}' is an invalid value.",
+                                                value), ex);
+                    }
+
+                    #endregion
+                }
+            }
+            return scope;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Spring.Web.2003.csproj b/src/Spring/Spring.Web/Spring.Web.2003.csproj
new file mode 100644
index 00000000..fb6e4f56
--- /dev/null
+++ b/src/Spring/Spring.Web/Spring.Web.2003.csproj
@@ -0,0 +1,672 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Web"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = "Spring.Web.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Web\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Web\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                />
+                <Reference
+                    Name = "system.web"
+                    AssemblyName = "System.Web"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\system.web.dll"
+                />
+                <Reference
+                    Name = "system.web.services"
+                    AssemblyName = "System.Web.Services"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\system.web.services.dll"
+                />
+                <Reference
+                    Name = "system.enterpriseservices"
+                    AssemblyName = "System.EnterpriseServices"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\system.enterpriseservices.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "antlr.runtime"
+                    AssemblyName = "antlr.runtime"
+                    HintPath = "..\..\..\lib\Net\1.1\antlr.runtime.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CommonAssemblyInfo.cs"
+                    Link = "..\CommonAssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Web.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Caching\AspNetCache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\HttpApplicationConfigurer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\WebApplicationContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\WebContextHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\WebSupportModule.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\WebResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\DataSourceItemFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\HttpRequestBindingContainer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\IBindingAwareFormatter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\IWebDataBound.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\MultipleSelectionListControlBinding.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\AspNetResourceCache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Resolvers\CookieCultureResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Resolvers\DefaultWebCultureResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Resolvers\RequestCultureResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Resolvers\SessionCultureResolver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ChildWebObjectDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\IWebObjectDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ObjectScope.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\RootWebObjectDefinition.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\WebInstantiationStrategy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\WebObjectDefinitionFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\WebObjectFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\WebObjectUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\WebObjectsNamespaceParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\HttpContextStorage.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\HybridContextStorage.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ControlAccessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ControlCollectionAccessor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\HttpContextSwitch.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\IVirtualEnvironment.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\VirtualEnvironment.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\WebUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Process\IProcess.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Process\IProcessAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Process\ProcessManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Providers\ConfigurableActiveDirectoryMembershipProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Providers\ConfigurableSqlMembershipProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Providers\ConfigurableSqlProfileProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Providers\ConfigurableSqlRoleProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Providers\ConfigurableXmlSiteMapProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Providers\IMembershipProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Providers\IProfileProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Providers\IRoleProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Providers\ISiteMapProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Providers\MembershipProviderAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Providers\ProfileProviderAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Providers\RoleProviderAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Providers\SiteMapProviderAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Services\WebServiceExporter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Services\WebServiceHandlerFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\AbstractHandlerFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\AbstractProcessHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\ContextMonitor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\ControlInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\IInterceptionStrategy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\InterceptControlCollectionOwnerStrategy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\InterceptControlCollectionStrategy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\ISharedStateAware.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\ISupportsWebDependencyInjection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\MimeMediaType.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\PageHandlerFactory.cs"
+                    SubType = "ASPXCodeBehind"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\Result.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\ResultMode.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\Script.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\SharedStateResourceCache.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\SupportsWebDependencyInjectionMethodBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\SupportsWebDependencyInjectionOwnerProxy.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\SupportsWebDependencyInjectionTypeBuilder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\WebDependencyInjectionUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\AbstractWizard.cs"
+                    SubType = "ASPXCodeBehind"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\DialogAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\IValidationContainer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\MasterPage.cs"
+                    SubType = "ASPXCodeBehind"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Page.cs"
+                    SubType = "ASPXCodeBehind"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\UserControl.cs"
+                    SubType = "ASPXCodeBehind"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\AbstractBaseValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\AbstractValidationControl.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\Calendar.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\CheckBoxList.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\CheckBoxValidator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\Content.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\ContentPlaceHolder.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\ContentReplacer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\ControlState.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\DataBindingAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\DataBindingPanel.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\Form.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\Head.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\LocalizedImage.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\MultiView.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\Panel.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\RadioButtonGroup.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\TabCommandEventArgs.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\TabCommandEventHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\TabContainer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\TabularMultiView.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\TabularView.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\TabularViewCollection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\ValidationError.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\ValidationSummary.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\View.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\ViewCollection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Validation\AbstractValidationErrorsRenderer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Validation\DivValidationErrorsRenderer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Validation\IconValidationErrorsRenderer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Validation\IValidationErrorsRenderer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Validation\SpanValidationErrorsRenderer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/src/Spring/Spring.Web/Spring.Web.2005.csproj b/src/Spring/Spring.Web/Spring.Web.2005.csproj
new file mode 100644
index 00000000..426d2008
--- /dev/null
+++ b/src/Spring/Spring.Web/Spring.Web.2005.csproj
@@ -0,0 +1,290 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BA4789EB-281A-48EA-8763-28B9F0596A18}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Web</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Web\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>Spring.Web.xml</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Web\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.DirectoryServices" />
+    <Reference Include="System.EnterpriseServices">
+      <Name>system.enterpriseservices</Name>
+    </Reference>
+    <Reference Include="System.Web">
+      <Name>system.web</Name>
+    </Reference>
+    <Reference Include="System.Web.Services">
+      <Name>system.web.services</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Caching\AspNetCache.cs" />
+    <Compile Include="Context\Support\HttpApplicationConfigurer.cs" />
+    <Compile Include="Context\Support\WebApplicationContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\WebContextHandler.cs" />
+    <Compile Include="Context\Support\WebSupportModule.cs" />
+    <Compile Include="Core\IO\WebResource.cs" />
+    <Compile Include="DataBinding\DataSourceItemFormatter.cs" />
+    <Compile Include="DataBinding\HttpRequestBindingContainer.cs" />
+    <Compile Include="DataBinding\IBindingAwareFormatter.cs" />
+    <Compile Include="DataBinding\IWebDataBound.cs" />
+    <Compile Include="DataBinding\MultipleSelectionListControlBinding.cs" />
+    <Compile Include="Globalization\AspNetResourceCache.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\UI\IValidationContainer.cs" />
+    <Compile Include="Web\Support\MimeMediaType.cs" />
+    <Compile Include="Web\Support\SharedStateResourceCache.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\Resolvers\CookieCultureResolver.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\Resolvers\DefaultWebCultureResolver.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\Resolvers\RequestCultureResolver.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\Resolvers\SessionCultureResolver.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\ChildWebObjectDefinition.cs" />
+    <Compile Include="Objects\Factory\Support\IWebObjectDefinition.cs" />
+    <Compile Include="Objects\Factory\Support\ObjectScope.cs" />
+    <Compile Include="Objects\Factory\Support\RootWebObjectDefinition.cs" />
+    <Compile Include="Objects\Factory\Support\WebInstantiationStrategy.cs" />
+    <Compile Include="Objects\Factory\Support\WebObjectDefinitionFactory.cs" />
+    <Compile Include="Objects\Factory\Support\WebObjectFactory.cs" />
+    <Compile Include="Objects\Factory\Support\WebObjectUtils.cs" />
+    <Compile Include="Objects\Factory\Xml\WebObjectsNamespaceParser.cs" />
+    <Compile Include="Threading\HttpContextStorage.cs" />
+    <Compile Include="Threading\HybridContextStorage.cs" />
+    <Compile Include="Util\ControlAccessor.cs" />
+    <Compile Include="Util\ControlCollectionAccessor.cs" />
+    <Compile Include="Util\HttpContextSwitch.cs" />
+    <Compile Include="Util\IVirtualEnvironment.cs" />
+    <Compile Include="Util\VirtualEnvironment.cs" />
+    <Compile Include="Util\WebUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\Support\AbstractProcessHandler.cs" />
+    <Compile Include="Web\Process\IProcess.cs" />
+    <Compile Include="Web\Process\IProcessAware.cs" />
+    <Compile Include="Web\Providers\ConfigurableActiveDirectoryMembershipProvider.cs" />
+    <Compile Include="Web\Providers\ConfigurableSqlMembershipProvider.cs" />
+    <Compile Include="Web\Providers\ConfigurableSqlProfileProvider.cs" />
+    <Compile Include="Web\Providers\ConfigurableSqlRoleProvider.cs" />
+    <Compile Include="Web\Providers\ConfigurableXmlSiteMapProvider.cs" />
+    <Compile Include="Web\Providers\IMembershipProvider.cs" />
+    <Compile Include="Web\Providers\IProfileProvider.cs" />
+    <Compile Include="Web\Providers\IRoleProvider.cs" />
+    <Compile Include="Web\Providers\ISiteMapProvider.cs" />
+    <Compile Include="Web\Providers\MembershipProviderAdapter.cs" />
+    <Compile Include="Web\Providers\ProfileProviderAdapter.cs" />
+    <Compile Include="Web\Providers\RoleProviderAdapter.cs" />
+    <Compile Include="Web\Providers\SiteMapProviderAdapter.cs" />
+    <Compile Include="Web\Services\WebServiceExporter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\Services\WebServiceHandlerFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\Support\AbstractHandlerFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\Process\ProcessManager.cs" />
+    <Compile Include="Web\Support\ContextMonitor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\Support\ControlInterceptor.cs" />
+    <Compile Include="Web\Support\IInterceptionStrategy.cs" />
+    <Compile Include="Web\Support\InterceptControlCollectionOwnerStrategy.cs" />
+    <Compile Include="Web\Support\InterceptControlCollectionStrategy.cs" />
+    <Compile Include="Web\Support\ISharedStateAware.cs" />
+    <Compile Include="Web\Support\ISupportsWebDependencyInjection.cs" />
+    <Compile Include="Web\Support\PageHandlerFactory.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Web\Support\Result.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\Support\ResultMode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\Support\Script.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\Support\SupportsWebDependencyInjectionMethodBuilder.cs" />
+    <Compile Include="Web\Support\SupportsWebDependencyInjectionOwnerProxy.cs" />
+    <Compile Include="Web\Support\SupportsWebDependencyInjectionTypeBuilder.cs" />
+    <Compile Include="Web\Support\WebDependencyInjectionUtils.cs" />
+    <Compile Include="Web\UI\AbstractWizard.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Web\UI\Controls\AbstractBaseValidator.cs" />
+    <Compile Include="Web\UI\Controls\AbstractValidationControl.cs" />
+    <Compile Include="Web\UI\Controls\Calendar.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\UI\Controls\CheckBoxList.cs" />
+    <Compile Include="Web\UI\Controls\CheckBoxValidator.cs" />
+    <Compile Include="Web\UI\Controls\Content.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\UI\Controls\ContentPlaceholder.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\UI\Controls\ContentReplacer.cs" />
+    <Compile Include="Web\UI\Controls\ControlState.cs" />
+    <Compile Include="Web\UI\Controls\DataBindingAdapter.cs" />
+    <Compile Include="Web\UI\Controls\DataBindingPanel.cs" />
+    <Compile Include="Web\UI\Controls\Form.cs" />
+    <Compile Include="Web\UI\Controls\Head.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\UI\Controls\LocalizedImage.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\UI\Controls\MultiView.cs" />
+    <Compile Include="Web\UI\Controls\Panel.cs" />
+    <Compile Include="Web\UI\Controls\RadioButtonGroup.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\UI\Controls\TabCommandEventArgs.cs" />
+    <Compile Include="Web\UI\Controls\TabCommandEventHandler.cs" />
+    <Compile Include="Web\UI\Controls\TabContainer.cs" />
+    <Compile Include="Web\UI\Controls\TabularMultiView.cs" />
+    <Compile Include="Web\UI\Controls\TabularView.cs" />
+    <Compile Include="Web\UI\Controls\TabularViewCollection.cs" />
+    <Compile Include="Web\UI\Controls\ValidationError.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\UI\Controls\ValidationSummary.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\UI\Controls\View.cs" />
+    <Compile Include="Web\UI\Controls\ViewCollection.cs" />
+    <Compile Include="Web\UI\DialogAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\UI\MasterPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Web\UI\Page.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Web\UI\UserControl.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Web\UI\Validation\AbstractValidationErrorsRenderer.cs" />
+    <Compile Include="Web\UI\Validation\DivValidationErrorsRenderer.cs" />
+    <Compile Include="Web\UI\Validation\IconValidationErrorsRenderer.cs" />
+    <Compile Include="Web\UI\Validation\IValidationErrorsRenderer.cs" />
+    <Compile Include="Web\UI\Validation\SpanValidationErrorsRenderer.cs" />
+    <None Include="Spring.Web.build" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Spring.Web.build b/src/Spring/Spring.Web/Spring.Web.build
new file mode 100644
index 00000000..b2b2f87e
--- /dev/null
+++ b/src/Spring/Spring.Web/Spring.Web.build
@@ -0,0 +1,37 @@
+<?xml version="1.0" ?>
+<project name="Spring.Web" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+-->
+	<target name="build">
+		<!-- build Spring.Web -->
+		<csc target="library" define="${current.build.defines.csc}" 
+		     warnaserror="true"
+		     debug="${current.build.debug}" 
+		     output="${current.bin.dir}/${project::get-name()}.dll" 
+		     doc="${current.bin.dir}/${project::get-name()}.xml"
+		     >
+			<arg line="${compiler.args}"/>	
+			<nowarn>
+				<warning number="${nowarn.numbers}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../GenCommonAssemblyInfo.cs" />
+			</sources>
+			<resources basedir="Resources">
+				<include name="**/*" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+			        <include name="Common.Logging.dll"/>
+				<include name="antlr.runtime.dll" />
+				<include name="Spring.Core.dll" />
+				<include name="Spring.Aop.dll" />
+				<include name="Microsoft.Web.Services2.dll" />
+			</references>
+		</csc>
+	</target>
+</project>
diff --git a/src/Spring/Spring.Web/Spring.Web.xml b/src/Spring/Spring.Web/Spring.Web.xml
new file mode 100644
index 00000000..9417e17b
--- /dev/null
+++ b/src/Spring/Spring.Web/Spring.Web.xml
@@ -0,0 +1,7820 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Spring.Web</name>
+    </assembly>
+    <members>
+        <member name="T:Spring.Web.UI.Controls.ValidationError">
+            <summary>
+            This control should be used to display field-level validation errors.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Jonathan Allenby</author>
+            <version>$Id: ValidationError.cs,v 1.11 2008/03/19 12:07:14 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.AbstractValidationControl">
+            <summary>
+            Provides common functionality to all validation renderer controls.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: AbstractValidationControl.cs,v 1.1 2008/03/19 12:07:14 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.AbstractValidationControl.CreateValidationErrorsRenderer">
+            <summary>
+            Create the default <see cref="T:Spring.Web.UI.Validation.IValidationErrorsRenderer"/> 
+            for this ValidationControl if none is configured.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.AbstractValidationControl.ResolveErrorMessages">
+            <summary>
+            Resolves the <see cref="P:Spring.Web.UI.Controls.AbstractValidationControl.ValidationContainer"/>'s list of validation errors to a list
+            of <see cref="T:System.String"/> elements containing the error messages to be rendered.
+            </summary>
+            <returns>a list containing <see cref="T:System.String"/> elements</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.AbstractValidationControl.Render(System.Web.UI.HtmlTextWriter)">
+            <summary>
+            Renders error messages using the specified <see cref="P:Spring.Web.UI.Controls.AbstractValidationControl.Renderer"/>.
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.AbstractValidationControl.Provider">
+            <summary>
+            Gets or sets the provider.
+            </summary>
+            <value>The provider.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.AbstractValidationControl.Renderer">
+            <summary>
+            Gets or sets the validation errors renderer to use. 
+            </summary>
+            <remarks>
+            If not explicitly specified, defaults to <see cref="T:Spring.Web.UI.Validation.SpanValidationErrorsRenderer"/>.
+            </remarks>
+            <value>The validation errors renderer to use.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.AbstractValidationControl.MessageSource">
+            <summary>
+            Gets the MessageSource to be used for resolve error messages
+            </summary>
+            <remarks>
+            By default, returns <see cref="P:Spring.Web.UI.Controls.AbstractValidationControl.ValidationContainer"/>'s MessageSource.
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.AbstractValidationControl.ValidationContainer">
+            <summary>
+            Gets the <see cref="T:Spring.Web.UI.IValidationContainer"/>, who's <see cref="P:Spring.Web.UI.IValidationContainer.ValidationErrors"/> 
+            shall be rendered by this control.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.ValidationError.CreateValidationErrorsRenderer">
+            <summary>
+            Create the default <see cref="T:Spring.Web.UI.Validation.SpanValidationErrorsRenderer"/> 
+            for this ValidationControl if none is configured.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.TabCommandEventArgs">
+            <summary>
+            Provides information about a command raised from a <see cref="T:Spring.Web.UI.Controls.TabContainer"/>
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: TabCommandEventArgs.cs,v 1.1 2007/07/24 13:33:27 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabCommandEventArgs.#ctor(System.String,System.Int32)">
+            <summary>
+            Initializes a new instance.
+            </summary>
+            <param name="commandName">The name of the command raised by a <see cref="T:Spring.Web.UI.Controls.TabContainer"/>.</param>
+            <param name="tabIndex">The index of the tab that raised this event.</param>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.TabCommandEventArgs.TabIndex">
+            <summary>
+            Returns the index of the tab that raised this command.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.ContentPlaceHolder">
+            <summary>
+            Represents ContentPlaceHolder control that can be used to define placeholders
+            within the master page.
+            </summary>
+            <remarks>
+            Any content defined within this control will be treated as a default content 
+            for the placeholder and will be rendered unless the child page overrides it
+            by defining matching <see cref="T:Spring.Web.UI.Controls.Content"/> control.
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ContentPlaceholder.cs,v 1.6 2006/09/08 06:21:31 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.Content">
+            <summary>
+            Represents Content control that can be used to populate or override placeholders
+            within the master page.
+            </summary>
+            <remarks>
+            Any content defined within this control will override default content
+            in the matching <see cref="T:Spring.Web.UI.Controls.ContentPlaceHolder"/> control
+            within the master page
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: Content.cs,v 1.6 2007/07/24 13:33:27 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Web.Providers.IMembershipProvider">
+            <summary>
+            An Interface for <see cref="T:Spring.Web.Providers.MembershipProviderAdapter"/> class.
+            </summary>
+            <author>Damjan Tomic</author>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.Initialize(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Initializes the provider.
+            </summary>
+            
+            <param name="config">A collection of the name/value pairs representing the provider-specific 
+             attributes specified in the configuration for this provider.
+             The <c>providerId</c> attribute is mandatory.
+             </param>
+            <param name="name">The friendly name of the provider.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+            <exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+            <exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.CreateUser(System.String,System.String,System.String,System.String,System.String,System.Boolean,System.Object,System.Web.Security.MembershipCreateStatus@)">
+            <summary>
+            Adds a new membership user to the data source.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Security.MembershipUser"></see> object populated with the information for the newly created user.
+            </returns>
+            
+            <param name="isApproved">Whether or not the new user is approved to be validated.</param>
+            <param name="passwordAnswer">The password answer for the new user</param>
+            <param name="username">The user name for the new user. </param>
+            <param name="providerUserKey">The unique identifier from the membership data source for the user.</param>
+            <param name="password">The password for the new user. </param>
+            <param name="passwordQuestion">The password question for the new user.</param>
+            <param name="email">The e-mail address for the new user.</param>
+            <param name="status">A <see cref="T:System.Web.Security.MembershipCreateStatus"></see> enumeration value indicating whether the user was created successfully.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.ChangePasswordQuestionAndAnswer(System.String,System.String,System.String,System.String)">
+            <summary>
+            Processes a request to update the password question and answer for a membership user.
+            </summary>
+            
+            <returns>
+            true if the password question and answer are updated successfully; otherwise, false.
+            </returns>
+            
+            <param name="newPasswordQuestion">The new password question for the specified user. </param>
+            <param name="newPasswordAnswer">The new password answer for the specified user. </param>
+            <param name="username">The user to change the password question and answer for. </param>
+            <param name="password">The password for the specified user. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.GetPassword(System.String,System.String)">
+            <summary>
+            Gets the password for the specified user name from the data source.
+            </summary>
+            
+            <returns>
+            The password for the specified user name.
+            </returns>
+            
+            <param name="username">The user to retrieve the password for. </param>
+            <param name="answer">The password answer for the user. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.ChangePassword(System.String,System.String,System.String)">
+            <summary>
+            Processes a request to update the password for a membership user.
+            </summary>
+            
+            <returns>
+            true if the password was updated successfully; otherwise, false.
+            </returns>
+            
+            <param name="newPassword">The new password for the specified user. </param>
+            <param name="oldPassword">The current password for the specified user. </param>
+            <param name="username">The user to update the password for. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.ResetPassword(System.String,System.String)">
+            <summary>
+            Resets a user's password to a new, automatically generated password.
+            </summary>
+            
+            <returns>
+            The new password for the specified user.
+            </returns>
+            
+            <param name="username">The user to reset the password for. </param>
+            <param name="answer">The password answer for the specified user. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.UpdateUser(System.Web.Security.MembershipUser)">
+            <summary>
+            Updates information about a user in the data source.
+            </summary>
+            
+            <param name="user">A <see cref="T:System.Web.Security.MembershipUser"></see> object that represents the user to update and the updated information for the user. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.ValidateUser(System.String,System.String)">
+            <summary>
+            Verifies that the specified user name and password exist in the data source.
+            </summary>
+            
+            <returns>
+            true if the specified username and password are valid; otherwise, false.
+            </returns>
+            
+            <param name="username">The name of the user to validate. </param>
+            <param name="password">The password for the specified user. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.UnlockUser(System.String)">
+            <summary>
+            Clears a lock so that the membership user can be validated.
+            </summary>
+            
+            <returns>
+            true if the membership user was successfully unlocked; otherwise, false.
+            </returns>
+            
+            <param name="userName">The membership user to clear the lock status for.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.GetUser(System.Object,System.Boolean)">
+            <summary>
+            Gets information from the data source for a user based on the unique identifier for the membership user. Provides an option to update the last-activity date/time stamp for the user.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Security.MembershipUser"></see> object populated with the specified user's information from the data source.
+            </returns>
+            
+            <param name="providerUserKey">The unique identifier for the membership user to get information for.</param>
+            <param name="userIsOnline">true to update the last-activity date/time stamp for the user; false to return user information without updating the last-activity date/time stamp for the user.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.GetUser(System.String,System.Boolean)">
+            <summary>
+            Gets information from the data source for a user. Provides an option to update the last-activity date/time stamp for the user.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Security.MembershipUser"></see> object populated with the specified user's information from the data source.
+            </returns>
+            
+            <param name="username">The name of the user to get information for. </param>
+            <param name="userIsOnline">true to update the last-activity date/time stamp for the user; false to return user information without updating the last-activity date/time stamp for the user. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.GetUserNameByEmail(System.String)">
+            <summary>
+            Gets the user name associated with the specified e-mail address.
+            </summary>
+            
+            <returns>
+            The user name associated with the specified e-mail address. If no match is found, return null.
+            </returns>
+            
+            <param name="email">The e-mail address to search for. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.DeleteUser(System.String,System.Boolean)">
+            <summary>
+            Removes a user from the membership data source. 
+            </summary>
+            
+            <returns>
+            true if the user was successfully deleted; otherwise, false.
+            </returns>
+            
+            <param name="username">The name of the user to delete.</param>
+            <param name="deleteAllRelatedData">true to delete data related to the user from the database; false to leave data related to the user in the database.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.GetAllUsers(System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            Gets a collection of all the users in the data source in pages of data.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Security.MembershipUserCollection"></see> collection that contains a page of pageSize<see cref="T:System.Web.Security.MembershipUser"></see> objects beginning at the page specified by pageIndex.
+            </returns>
+            
+            <param name="totalRecords">The total number of matched users.</param>
+            <param name="pageIndex">The index of the page of results to return. pageIndex is zero-based.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.GetNumberOfUsersOnline">
+            <summary>
+            Gets the number of users currently accessing the application.
+            </summary>
+            
+            <returns>
+            The number of users currently accessing the application.
+            </returns>
+            
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.FindUsersByName(System.String,System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            Gets a collection of membership users where the user name contains the specified user name to match.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Security.MembershipUserCollection"></see> collection that contains a page of pageSize<see cref="T:System.Web.Security.MembershipUser"></see> objects beginning at the page specified by pageIndex.
+            </returns>
+            
+            <param name="totalRecords">The total number of matched users.</param>
+            <param name="pageIndex">The index of the page of results to return. pageIndex is zero-based.</param>
+            <param name="usernameToMatch">The user name to search for.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IMembershipProvider.FindUsersByEmail(System.String,System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            Gets a collection of membership users where the e-mail address contains the specified e-mail address to match.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Security.MembershipUserCollection"></see> collection that contains a page of pageSize<see cref="T:System.Web.Security.MembershipUser"></see> objects beginning at the page specified by pageIndex.
+            </returns>
+            
+            <param name="totalRecords">The total number of matched users.</param>
+            <param name="pageIndex">The index of the page of results to return. pageIndex is zero-based.</param>
+            <param name="emailToMatch">The e-mail address to search for.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="P:Spring.Web.Providers.IMembershipProvider.Name">
+            <summary>
+            Gets the friendly name used to refer to the provider during configuration.
+            </summary>
+            
+            <returns>
+            The friendly name used to refer to the provider during configuration.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.IMembershipProvider.Description">
+            <summary>
+            Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+            </summary>
+            
+            <returns>
+            A brief, friendly description suitable for display in administrative tools or other UIs.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.IMembershipProvider.EnablePasswordRetrieval">
+            <summary>
+            Indicates whether the membership provider is configured to allow users to retrieve their passwords.
+            </summary>
+            
+            <returns>
+            true if the membership provider is configured to support password retrieval; otherwise, false. The default is false.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.IMembershipProvider.EnablePasswordReset">
+            <summary>
+            Indicates whether the membership provider is configured to allow users to reset their passwords.
+            </summary>
+            
+            <returns>
+            true if the membership provider supports password reset; otherwise, false. The default is true.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.IMembershipProvider.RequiresQuestionAndAnswer">
+            <summary>
+            Gets a value indicating whether the membership provider is configured to require the user to answer a password question for password reset and retrieval.
+            </summary>
+            
+            <returns>
+            true if a password answer is required for password reset and retrieval; otherwise, false. The default is true.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.IMembershipProvider.ApplicationName">
+            <summary>
+            The name of the application using the custom membership provider.
+            </summary>
+            
+            <returns>
+            The name of the application using the custom membership provider.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.IMembershipProvider.MaxInvalidPasswordAttempts">
+            <summary>
+            Gets the number of invalid password or password-answer attempts allowed before the membership user is locked out.
+            </summary>
+            
+            <returns>
+            The number of invalid password or password-answer attempts allowed before the membership user is locked out.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.IMembershipProvider.PasswordAttemptWindow">
+            <summary>
+            Gets the number of minutes in which a maximum number of invalid password or password-answer attempts are allowed before the membership user is locked out.
+            </summary>
+            
+            <returns>
+            The number of minutes in which a maximum number of invalid password or password-answer attempts are allowed before the membership user is locked out.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.IMembershipProvider.RequiresUniqueEmail">
+            <summary>
+            Gets a value indicating whether the membership provider is configured to require a unique e-mail address for each user name.
+            </summary>
+            
+            <returns>
+            true if the membership provider requires a unique e-mail address; otherwise, false. The default is true.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.IMembershipProvider.PasswordFormat">
+            <summary>
+            Gets a value indicating the format for storing passwords in the membership data store.
+            </summary>
+            
+            <returns>
+            One of the <see cref="T:System.Web.Security.MembershipPasswordFormat"></see> values indicating the format for storing passwords in the data store.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.IMembershipProvider.MinRequiredPasswordLength">
+            <summary>
+            Gets the minimum length required for a password.
+            </summary>
+            
+            <returns>
+            The minimum length required for a password. 
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.IMembershipProvider.MinRequiredNonAlphanumericCharacters">
+            <summary>
+            Gets the minimum number of special characters that must be present in a valid password.
+            </summary>
+            
+            <returns>
+            The minimum number of special characters that must be present in a valid password.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.IMembershipProvider.PasswordStrengthRegularExpression">
+            <summary>
+            Gets the regular expression used to evaluate a password.
+            </summary>
+            
+            <returns>
+            A regular expression used to evaluate a password.
+            </returns>
+            
+        </member>
+        <member name="T:Spring.Web.Providers.ConfigurableSqlProfileProvider">
+             <summary>
+            
+             </summary>
+             <author>Erich Eichinger</author>
+             <version>$Id: ConfigurableSqlProfileProvider.cs,v 1.1 2007/07/26 14:43:56 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Web.Providers.IProfileProvider">
+            <summary>
+            An Interface for <see cref="T:Spring.Web.Providers.IProfileProvider"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+            as the Id of wrapped provider (defined in the Spring context).  
+            </p>    
+            </remarks>
+            <author>Damjan Tomic</author>
+        </member>
+        <member name="M:Spring.Web.Providers.IProfileProvider.Initialize(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Initializes the provider.
+            </summary>
+            
+            <param name="config">A collection of the name/value pairs representing the provider-specific 
+             attributes specified in the configuration for this provider.
+             The <c>providerId</c> attribute is mandatory.
+             </param>
+            <param name="name">The friendly name of the provider.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+            <exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+            <exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>      
+        </member>
+        <member name="M:Spring.Web.Providers.IProfileProvider.GetPropertyValues(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection)">
+            <summary>
+            Returns the collection of settings property values for the specified application instance and settings property group.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Configuration.SettingsPropertyValueCollection"></see> containing the values for the specified settings property group.
+            </returns>
+            
+            <param name="context">A <see cref="T:System.Configuration.SettingsContext"></see> describing the current application use.</param>
+            <param name="collection">A <see cref="T:System.Configuration.SettingsPropertyCollection"></see> containing the settings property group whose values are to be retrieved.</param><filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Spring.Web.Providers.IProfileProvider.SetPropertyValues(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyValueCollection)">
+            <summary>
+            Sets the values of the specified group of property settings.
+            </summary>
+            
+            <param name="context">A <see cref="T:System.Configuration.SettingsContext"></see> describing the current application usage.</param>
+            <param name="collection">A <see cref="T:System.Configuration.SettingsPropertyValueCollection"></see> representing the group of property settings to set.</param><filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Spring.Web.Providers.IProfileProvider.DeleteProfiles(System.Web.Profile.ProfileInfoCollection)">
+            <summary>
+            When overridden in a derived class, deletes profile properties and information for the supplied list of profiles.
+            </summary>
+            
+            <returns>
+            The number of profiles deleted from the data source.
+            </returns>
+            
+            <param name="profiles">A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see>  of information about profiles that are to be deleted.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IProfileProvider.DeleteProfiles(System.String[])">
+            <summary>
+            When overridden in a derived class, deletes profile properties and information for profiles that match the supplied list of user names.
+            </summary>
+            
+            <returns>
+            The number of profiles deleted from the data source.
+            </returns>
+            
+            <param name="usernames">A string array of user names for profiles to be deleted.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IProfileProvider.DeleteInactiveProfiles(System.Web.Profile.ProfileAuthenticationOption,System.DateTime)">
+            <summary>
+            When overridden in a derived class, deletes all user-profile data for profiles in which the last activity date occurred before the specified date.
+            </summary>
+            
+            <returns>
+            The number of profiles deleted from the data source.
+            </returns>
+            
+            <param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are deleted.</param>
+            <param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see>  value of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IProfileProvider.GetNumberOfInactiveProfiles(System.Web.Profile.ProfileAuthenticationOption,System.DateTime)">
+            <summary>
+            When overridden in a derived class, returns the number of profiles in which the last activity date occurred on or before the specified date.
+            </summary>
+            
+            <returns>
+            The number of profiles in which the last activity date occurred on or before the specified date.
+            </returns>
+            
+            <param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+            <param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see>  of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IProfileProvider.GetAllProfiles(System.Web.Profile.ProfileAuthenticationOption,System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            When overridden in a derived class, retrieves user profile data for all profiles in the data source.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user-profile information for all profiles in the data source.
+            </returns>
+            
+            <param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+            <param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+            <param name="pageIndex">The index of the page of results to return.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IProfileProvider.GetAllInactiveProfiles(System.Web.Profile.ProfileAuthenticationOption,System.DateTime,System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            When overridden in a derived class, retrieves user-profile data from the data source for profiles in which the last activity date occurred on or before the specified date.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user-profile information about the inactive profiles.
+            </returns>
+            
+            <param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+            <param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see>  of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+            <param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+            <param name="pageIndex">The index of the page of results to return.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IProfileProvider.FindProfilesByUserName(System.Web.Profile.ProfileAuthenticationOption,System.String,System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            When overridden in a derived class, retrieves profile information for profiles in which the user name matches the specified user names.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user-profile information for profiles where the user name matches the supplied usernameToMatch parameter.
+            </returns>
+            
+            <param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+            <param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+            <param name="pageIndex">The index of the page of results to return.</param>
+            <param name="usernameToMatch">The user name to search for.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IProfileProvider.FindInactiveProfilesByUserName(System.Web.Profile.ProfileAuthenticationOption,System.String,System.DateTime,System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            When overridden in a derived class, retrieves profile information for profiles in which the last activity date occurred on or before the specified date and the user name matches the specified user name.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user profile information for inactive profiles where the user name matches the supplied usernameToMatch parameter.
+            </returns>
+            
+            <param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+            <param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see> value of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+            <param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+            <param name="pageIndex">The index of the page of results to return.</param>
+            <param name="usernameToMatch">The user name to search for.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="P:Spring.Web.Providers.IProfileProvider.Name">
+            <summary>
+            Gets the friendly name used to refer to the provider during configuration.
+            </summary>
+            
+            <returns>
+            The friendly name used to refer to the provider during configuration.
+            </returns>
+        </member>
+        <member name="P:Spring.Web.Providers.IProfileProvider.Description">
+            <summary>
+            Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+            </summary>
+            
+            <returns>
+            A brief, friendly description suitable for display in administrative tools or other UIs.
+            </returns>
+        </member>
+        <member name="P:Spring.Web.Providers.IProfileProvider.ApplicationName">
+            <summary>
+            Gets or sets the name of the currently running application.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.String"></see> that contains the application's shortened name, which does not contain a full path or extension, for example, SimpleAppSettings.
+            </returns>
+            <filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Spring.Web.Providers.ConfigurableSqlProfileProvider.Initialize(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Initializes the provider.
+            </summary>
+            
+            <param name="config">
+             <para>
+             A collection of the name/value pairs representing the provider-specific 
+             attributes specified in the configuration for this provider.
+             </para>
+             Values may be overridden by specifying them in <see cref="P:Spring.Web.Providers.ConfigurableSqlProfileProvider.Parameters"/> list.
+             </param>
+            <param name="name">The friendly name of the provider.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+            <exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+            <exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        </member>
+        <member name="P:Spring.Web.Providers.ConfigurableSqlProfileProvider.ConnectionStringName">
+            <summary>
+            The ConnectionString to be used
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Providers.ConfigurableSqlProfileProvider.Parameters">
+            <summary>
+            A collection of the name/value pairs representing the provider-specific
+            attributes specified in the configuration for this provider.
+            </summary> 
+        </member>
+        <member name="T:Spring.Globalization.Resolvers.RequestCultureResolver">
+            <summary>
+            Culture resolver that uses request headers to determine culture. If no languages
+            are specified in the request headers, it returns default culture specifed, and 
+            if no default culture was specifed it returns current culture for the executing 
+            server thread.
+            </summary>
+            <remarks>
+            <b>Note:</b> This culture resolver cannot be used to change the culture 
+            because request headers cannot be modified. In order to change the culture
+            when using this culture resolver user has to change language settings in
+            the web browser.
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: RequestCultureResolver.cs,v 1.4 2007/08/25 14:26:35 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Globalization.Resolvers.DefaultWebCultureResolver">
+            <summary>
+            Default culture resolver for web applications. Contains some common utility methods for web culture resolvers.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DefaultWebCultureResolver.cs,v 1.5 2007/08/25 14:26:35 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.DefaultWebCultureResolver.GetDefaultLocale">
+            <summary>
+            Returns default culture. If <see cref="P:Spring.Globalization.Resolvers.DefaultCultureResolver.DefaultCulture"/> property is not set, 
+            it tries to get culture from the request headers
+            and falls back to a current thread's culture if no headers are available.
+            </summary>
+            <returns>Default culture to use.</returns>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.DefaultWebCultureResolver.GetRequestLanguage">
+            <summary>
+            Extracts the users favorite language from "accept-language" header of the current request.
+            </summary>
+            <returns>a language string if any or <c>null</c>, if no languages have been sent with the request</returns>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.DefaultWebCultureResolver.GetCulture(System.String)">
+            <summary>
+            Resolves a culture by name.
+            </summary>
+            <param name="cultureName">the name of the culture to get</param>
+            <returns>a (possible neutral!) <see cref="T:System.Globalization.CultureInfo"/> or <c>null</c>, if culture could not be resolved</returns>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.DefaultWebCultureResolver.ResolveCulture">
+            <summary>
+            Resolves the culture from the context.
+            </summary>
+            <returns>Culture that should be used to render view.</returns>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.DefaultWebCultureResolver.SetCulture(System.Globalization.CultureInfo)">
+            <summary>
+            Not supported for this implementation.
+            </summary>
+            <param name="culture">The new culture or <code>null</code> to clear the culture.</param>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.RequestCultureResolver.ResolveCulture">
+            <summary>
+            Tries to determine culture from the request headers. If no languages
+            are specified in the request headers, it returns default culture specifed, and 
+            if no default culture was specifed it returns current culture for the executing 
+            server thread.
+            </summary>
+            <returns>Culture that should be used to render view.</returns>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.RequestCultureResolver.SetCulture(System.Globalization.CultureInfo)">
+            <summary>
+            Not supported for this resolver implementation
+            </summary>
+            <param name="culture">The new culture or <code>null</code> to clear the culture.</param>
+        </member>
+        <member name="T:Spring.Web.UI.Validation.IValidationErrorsRenderer">
+            <summary>
+            This interface should be implemented by all validation errors renderers.
+            </summary>
+            <remarks>
+            <para>
+            Validation errors renderers are used to decouple rendering behavior from the 
+            validation errors controls such as <see cref="T:Spring.Web.UI.Controls.ValidationError"/> and
+            <see cref="T:Spring.Web.UI.Controls.ValidationSummary"/>.
+            </para>
+            <para>
+            This allows users to change how validation errors are rendered by simply pluggin in
+            appropriate renderer implementation into the validation errors controls using 
+            Spring.NET dependency injection.
+            </para>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IValidationErrorsRenderer.cs,v 1.1 2007/08/02 19:50:28 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Validation.IValidationErrorsRenderer.RenderErrors(Spring.Web.UI.Page,System.Web.UI.HtmlTextWriter,System.Collections.IList)">
+            <summary>
+            Renders validation errors using specified <see cref="T:System.Web.UI.HtmlTextWriter"/>.
+            </summary>
+            <param name="page">Web form instance.</param>
+            <param name="writer">An HTML writer to use.</param>
+            <param name="errors">The list of validation errors.</param>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.ContentReplacer">
+            <summary>
+            Represents Content control that can be used to populate or override placeholders
+            anywhere within the page.
+            </summary>
+            <remarks>
+            <para>
+            Any content defined within this control will override default content
+            in the matching control specified by <see cref="P:Spring.Web.UI.Controls.ContentReplacer.ContentPlaceHolderID"/> anywhere
+            within the page.
+            </para>
+            <para>
+            In contrast to <see cref="T:Spring.Web.UI.Controls.Content"/> control, ContentReplacer can replace the content of 
+            any control within the current page - it is not limited to replacing ContentPlaceholders on master pages.
+            </para>
+            <para>
+            This technique is useful if you want to group e.g. rendering navigation elements on 1 ascx control, but your 
+            design requires navigation elements to be distributed across different places within the HTML code.
+            </para>
+            </remarks>
+            <author>Erich Eichinger</author>
+            <version>$Id: ContentReplacer.cs,v 1.3 2007/07/24 13:33:27 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.ContentReplacer.OnPreRender(System.EventArgs)">
+            <summary>
+            Overriden to correctly redirect rendermethod calls.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.ContentReplacer.RenderChildControls(System.Web.UI.HtmlTextWriter,System.Web.UI.Control)">
+            <summary>
+            Renders child controls
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.ContentReplacer.RenderNothing(System.Web.UI.HtmlTextWriter,System.Web.UI.Control)">
+            <summary>
+            Render nothing.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.ContentReplacer.ContentPlaceHolderID">
+            <summary>
+            Specifies the unique id of the control, who's content is to be replaced.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.PageHandlerFactory">
+            <summary>
+            Implementation of <see cref="T:System.Web.IHttpHandlerFactory"/> that retrieves
+            configured <see cref="T:System.Web.IHttpHandler"/> instances from Spring web application context.
+            </summary>
+            <remarks>
+            <para>
+            This handler factory uses the page name from the URL, without the extension,
+            to find the handler object in the Spring context. This means that the target object 
+            definition doesn't need to resolve to an .aspx page -- it can be any valid 
+            object that implements <see cref="T:System.Web.IHttpHandler"/> interface.
+            </para>
+            <para>
+            If the specified page is not found in the Spring application context, this
+            handler factory falls back to the standard ASP.NET behavior and tries 
+            to find physical page with a given name.
+            </para>
+            <para>
+            In either case, handlers that implement <see cref="T:Spring.Context.IApplicationContextAware"/>
+            and <see cref="T:Spring.Web.Support.ISharedStateAware"/> will be provided with the references
+            to appropriate Spring.NET application context (based on the request URL) 
+            and a <see cref="T:System.Collections.IDictionary"/> that should be used to store the information
+            that needs to be shared by all instances of the handler.
+            </para>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: PageHandlerFactory.cs,v 1.41 2008/05/15 12:35:27 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Web.Support.AbstractHandlerFactory">
+            <summary>
+            Provides base functionality for Spring.NET context-aware
+            <see cref="T:System.Web.IHttpHandlerFactory"/> implementations.
+            </summary>
+            <remarks>
+            <p>
+            Provides derived classes with a default implementation of
+            <see cref="M:System.Web.IHttpHandlerFactory.ReleaseHandler(System.Web.IHttpHandler)"/> method.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AbstractHandlerFactory.cs,v 1.5 2008/03/19 18:05:08 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Support.AbstractHandlerFactory.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Web.Support.AbstractHandlerFactory"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is an abstract class and as such provides no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.Support.AbstractHandlerFactory.GetHandler(System.Web.HttpContext,System.String,System.String,System.String)">
+            <summary>
+            Returns an appropriate <see cref="T:System.Web.IHttpHandler"/> implementation.
+            </summary>
+            <param name="context">
+            An instance of the <see cref="T:System.Web.HttpContext"/> class that
+            provides references to intrinsic server objects.
+            </param>
+            <param name="requestType">
+            The HTTP method of the request.
+            </param>
+            <param name="url">The request URL.</param>
+            <param name="pathTranslated">
+            The physical path of the requested resource.
+            </param>
+            <returns>
+            A new <see cref="T:System.Web.IHttpHandler"/> object that processes
+            the request.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.Support.AbstractHandlerFactory.ReleaseHandler(System.Web.IHttpHandler)">
+            <summary>
+            Enables a factory to release an existing
+            <see cref="T:System.Web.IHttpHandler"/> instance.
+            </summary>
+            <param name="handler">
+            The <see cref="T:System.Web.IHttpHandler"/> object to release.
+            </param>
+        </member>
+        <member name="M:Spring.Web.Support.AbstractHandlerFactory.FindWebObjectDefinition(System.String,Spring.Objects.Factory.Config.IConfigurableListableObjectFactory)">
+            <summary>
+            DO NOT USE - this is subject to change!
+            </summary>
+            <param name="appRelativeVirtualPath"></param>
+            <param name="objectFactory"></param>
+            <returns>
+            This method requires registrars to follow the convention of registering web object definitions using their
+            application relative urls (~/mypath/mypage.aspx). 
+            </returns>
+            <remarks>
+            Resolve an object definition by url.
+            </remarks>
+        </member>
+        <member name="T:Spring.Web.Support.AbstractHandlerFactory.NamedObjectDefinition">
+            <summary>
+            DO NOT USE - this is subject to change!
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.AbstractHandlerFactory.NamedObjectDefinition.#ctor(System.String,Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            DO NOT USE
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.AbstractHandlerFactory.NamedObjectDefinition.Name">
+            <summary>
+            DO NOT USE
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.AbstractHandlerFactory.NamedObjectDefinition.ObjectDefinition">
+            <summary>
+            DO NOT USE
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.PageHandlerFactory.GetHandler(System.Web.HttpContext,System.String,System.String,System.String)">
+            <summary>
+            Retrieves instance of the configured page from Spring web application context, 
+            or if page is not defined in Spring config file tries to find it using standard
+            ASP.Net mechanism.
+            </summary>
+            <param name="context">Current HttpContext</param>
+            <param name="requestType">Type of HTTP request (GET, POST, etc.)</param>
+            <param name="url">Requested page URL</param>
+            <param name="physicalPath">Translated server path for the page</param>
+            <returns>Instance of the IHttpHandler object that should be used to process request.</returns>
+        </member>
+        <member name="T:Spring.Web.Support.PageHandlerWrapper">
+            <summary>
+            Wrapper for handlers that do not require <see cref="T:System.Web.SessionState.HttpSessionState"/>.
+            </summary>
+            <remarks>
+            NOTE: This class has to extend System.Web.UI.Page instead of simply 
+            implementing IHttpHandler in order for Server.Transfer to work properly.
+            This in turn requires explicit IHttpHandler implementation in order to
+            override non-virtual methods from the base Page class.
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.Support.PageHandlerWrapper.#ctor(Spring.Context.IApplicationContext,System.String,System.String,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Web.Support.PageHandlerWrapper"/> class.
+            </summary>
+            <param name="appContext">Application context instance to retrieve page from.</param>
+            <param name="pageName">Name of the page object to execute.</param>
+            <param name="url">Requested page URL.</param>
+            <param name="path">Translated server path for the page.</param>
+        </member>
+        <member name="M:Spring.Web.Support.PageHandlerWrapper.#ctor(Spring.Context.IApplicationContext,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Web.Support.PageHandlerWrapper"/> class.
+            </summary>
+            <param name="appContext">Application context instance to retrieve page from.</param>
+            <param name="pageName">Name of the page object to execute.</param>
+        </member>
+        <member name="M:Spring.Web.Support.PageHandlerWrapper.CreatePageInstance">
+            <summary>
+            Creates a page instance corresponding to this handler's url.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.PageHandlerWrapper.GetOrCreateProcessHandler(System.Web.HttpContext)">
+            <summary>
+            Gets or - if not found - creates a process handler instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.PageHandlerWrapper.ApplyDependencyInjection(System.Web.IHttpHandler)">
+            <summary>
+            Apply dependency injection stuff on the handler.
+            </summary>
+            <param name="handler"></param>
+        </member>
+        <member name="M:Spring.Web.Support.PageHandlerWrapper.ApplySharedState(System.Web.IHttpHandler)">
+            <summary>
+            Applies <see cref="P:Spring.Web.Support.PageHandlerWrapper.HandlerState"/> to the given handler if applicable.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.PageHandlerWrapper.CheckIfPageWasRecompiled(System.Web.IHttpHandler)">
+            <summary>
+            Checks, if page has been recompiled. Creates/discards handlerState if necessary.
+            </summary>
+            <param name="handler"></param>
+        </member>
+        <member name="P:Spring.Web.Support.PageHandlerWrapper.SyncRoot">
+            <summary>
+            Use for sync access to this PageHandler instance.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.PageHandlerWrapper.HandlerState">
+            <summary>
+            Gets <see cref="T:System.Collections.IDictionary"/> that contains handler state. 
+            </summary>
+            <remarks>
+            This <see cref="T:System.Collections.IDictionary"/> will be assigned to the <c>SharedState</c>
+            property of <see cref="T:System.Web.IHttpHandler"/> instances that implement
+            <see cref="T:Spring.Web.Support.ISharedStateAware"/> interface.
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.Support.PageHandlerWrapper.System#Web#IHttpHandler#IsReusable">
+            <summary>
+            Returns true because this wrapper handler can be reused.
+            Actual page is instantiated at the beginning of the ProcessRequest method.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.SessionAwarePageHandlerWrapper">
+            <summary>
+            Wrapper for handlers that require <see cref="T:System.Web.SessionState.HttpSessionState"/>.
+            </summary>
+            <remarks>
+            Delays page object instantiation until ProcessRequest is called
+            in order to be able to access session state.
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.Support.SessionAwarePageHandlerWrapper.#ctor(Spring.Context.IApplicationContext,System.String,System.String,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Web.Support.SessionAwarePageHandlerWrapper"/> class.
+            </summary>
+            <param name="appContext">Application context instance to retrieve page from.</param>
+            <param name="pageName">Name of the page object to execute.</param>
+            <param name="url">Requested page URL.</param>
+            <param name="path">Translated server path for the page.</param>
+        </member>
+        <member name="M:Spring.Web.Support.SessionAwarePageHandlerWrapper.#ctor(Spring.Context.IApplicationContext,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Web.Support.SessionAwarePageHandlerWrapper"/> class.
+            </summary>
+            <param name="appContext">Application context instance to retrieve page from.</param>
+            <param name="pageName">Name of the page object to execute.</param>
+        </member>
+        <member name="T:Spring.Web.Services.WebServiceHandlerFactory">
+            <summary>
+            An <see cref="T:System.Web.IHttpHandlerFactory"/> implementation that
+            retrieves configured <c>WebService</c> objects from the Spring.NET web
+            application context.
+            </summary>
+            <remarks>
+            This handler factory uses web service name from the URL, without the extension,
+            to find web service object in the Spring context.
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: WebServiceHandlerFactory.cs,v 1.12 2008/03/19 18:05:08 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceHandlerFactory.System#Web#IHttpHandlerFactory#GetHandler(System.Web.HttpContext,System.String,System.String,System.String)">
+            <summary>
+            Retrieves instance of the page from Spring web application context.
+            </summary>
+            <param name="context">current HttpContext</param>
+            <param name="requestType">type of HTTP request (GET, POST, etc.)</param>
+            <param name="url">requested page URL</param>
+            <param name="path">translated server path for the page</param>
+            <returns>instance of the configured page object</returns>
+        </member>
+        <member name="T:Spring.Web.Process.IProcessAware">
+            <summary>
+            Interface that should be implemented by all <see cref="T:System.Web.IHttpHandler"/>s
+            that want to be aware of the <see cref="T:Spring.Web.Process.IProcess"/> they belong to. 
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IProcessAware.cs,v 1.2 2006/05/18 21:37:52 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Web.Process.IProcessAware.Process">
+            <summary>
+            Gets or sets a process instance.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.AbstractProcessHandler">
+            <summary>
+            An abstract base class that defines common behavior for different process implementations.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AbstractProcessHandler.cs,v 1.1 2007/08/03 08:31:25 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Web.Process.IProcess">
+            <summary>
+            An interface that different process implementations need to support.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Process.IProcess.Start(System.String)">
+            <summary>
+            Starts the process.
+            </summary>
+            <param name="referrerUrl">Referrer URL.</param>
+        </member>
+        <member name="M:Spring.Web.Process.IProcess.SetView(System.String)">
+            <summary>
+            Resolves view for the specified view name.
+            </summary>
+            <param name="viewName">Name of the view to go to.</param>
+        </member>
+        <member name="M:Spring.Web.Process.IProcess.End">
+            <summary>
+            Ends the process.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Process.IProcess.Id">
+            <summary>
+            Unique ID of this process instance.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Process.IProcess.Controller">
+            <summary>
+            Controller for the component.
+            </summary>
+            <remarks>
+            Process controller will be shared by all the views 
+            that belong to this process.
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.Process.IProcess.CurrentView">
+            <summary>
+            Gets the name of the current view.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Process.IProcess.ViewChanged">
+            <summary>
+            Gets the the flag that indicates if selected view 
+            has changed during the current request.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.ISharedStateAware">
+            <summary>
+            This interface should be implemented by <see cref="T:System.Web.IHttpHandler"/>s that want to 
+            have access to the shared state for the handler.
+            </summary>
+            <remarks>
+            <p>
+            Shared state is very useful if you have data that needs to be shared by all instances
+            of the same page (or other <see cref="T:System.Web.IHttpHandler"/>). 
+            </p>
+            <p>
+            For example, <see cref="T:Spring.Web.UI.Page"/> class implements this interface, which allows  
+            each page derived from it to cache localizalization resources and parsed data binding 
+            expressions only once and then reuse the cached values, regardless of how many instances 
+            of the page are created.
+            </p>
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.Support.ISharedStateAware.SharedState">
+            <summary>
+            Gets or sets the <see cref="T:System.Collections.IDictionary"/> that should be used
+            to store shared state for the <see cref="T:System.Web.IHttpHandler"/>.
+            </summary>
+            <value>
+            The <see cref="T:System.Collections.IDictionary"/> that should be used
+            to store shared state for the <see cref="T:System.Web.IHttpHandler"/>.
+            </value>
+        </member>
+        <member name="F:Spring.Web.Support.AbstractProcessHandler.ProcessIdParamName">
+            <summary>
+            Parameter name that is used for process ID.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.AbstractProcessHandler.#ctor">
+            <summary>
+            Creates instance of the process and registers it with the <see cref="T:Spring.Web.Process.ProcessManager"/>.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.AbstractProcessHandler.Start(System.String)">
+            <summary>
+            Starts the process.
+            </summary>
+            <param name="url">Process URL.</param>
+        </member>
+        <member name="M:Spring.Web.Support.AbstractProcessHandler.SetView(System.String)">
+            <summary>
+            Resolves and sets the view for the specified view name.
+            </summary>
+            <param name="viewName">Name of the view to go to.</param>
+        </member>
+        <member name="M:Spring.Web.Support.AbstractProcessHandler.End">
+            <summary>
+            Ends the process by unregistering it from the <see cref="T:Spring.Web.Process.ProcessManager"/>. 
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.AbstractProcessHandler.NavigateToStartView">
+            <summary>
+            Method that needs to be implemented by specific process implementations
+            in order to navigate to the first view in the process.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.AbstractProcessHandler.NavigateToCurrentView">
+            <summary>
+            Method that needs to be implemented by specific process implementations
+            in order to navigate to the current view.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.AbstractProcessHandler.System#Web#IHttpHandler#ProcessRequest(System.Web.HttpContext)">
+            <summary>
+            Processes the request by delegating to appropriate view, which could be
+            another process.
+            </summary>
+            <param name="context"></param>
+        </member>
+        <member name="P:Spring.Web.Support.AbstractProcessHandler.Id">
+            <summary>
+            Unique ID of this component instance.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.AbstractProcessHandler.Parent">
+            <summary>
+            Gets or sets the parent process.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.AbstractProcessHandler.SharedState">
+            <summary>
+            Returns a thread-safe dictionary that contains state that is shared by 
+            all views of this component.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.AbstractProcessHandler.Controller">
+            <summary>
+            Controller for the component.
+            </summary>
+            <remarks>
+            Process controller will be shared by all the views 
+            that belong to this component.
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.Support.AbstractProcessHandler.DefaultView">
+            <summary>
+            Default view for the component.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.AbstractProcessHandler.CurrentView">
+            <summary>
+            Gets the name of the current view.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.AbstractProcessHandler.ViewChanged">
+            <summary>
+            Gets the the flag that indicates if selected view 
+            has changed during the current request.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.AbstractProcessHandler.Views">
+            <summary>
+            Gets a map of process views.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.AbstractProcessHandler.ProcessUrl">
+            <summary>
+            Gets the process URL.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.AbstractProcessHandler.System#Web#IHttpHandler#IsReusable">
+            <summary>
+            Returns true because this wrapper handler can be reused.
+            Actual page is instantiated at the beginning of the ProcessRequest method.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.AbstractProcessHandler.ApplicationContext">
+            <summary>
+            Gets or sets the application context.
+            </summary>
+        </member>
+        <member name="T:Spring.Util.IVirtualEnvironment">
+            <summary>
+            Abstracts the underlying infrastructure of a HttpRequest
+            </summary>
+        </member>
+        <member name="M:Spring.Util.IVirtualEnvironment.MapPath(System.String)">
+            <summary>
+            Maps a virtual path to it's physical location
+            </summary>
+        </member>
+        <member name="P:Spring.Util.IVirtualEnvironment.ApplicationVirtualPath">
+            <summary>
+            The virtual (rooted) path of the current Application with trailing slash
+            </summary>
+            <remarks>
+            For the site rooted applications, "/" will be returned, for all others "/..someappdir../"
+            </remarks>
+        </member>
+        <member name="P:Spring.Util.IVirtualEnvironment.CurrentVirtualPath">
+            <summary>
+            The virtual (rooted) path of the current Request including <see cref="P:System.Web.HttpRequest.PathInfo"/>
+            </summary>
+        </member>
+        <member name="P:Spring.Util.IVirtualEnvironment.CurrentVirtualFilePath">
+            <summary>
+            The virtual (rooted) path of the current Request without trailing <see cref="P:System.Web.HttpRequest.PathInfo"/>
+            </summary>
+        </member>
+        <member name="P:Spring.Util.IVirtualEnvironment.CurrentExecutionFilePath">
+            <summary>
+            The virtual (rooted) path of the currently executing script
+            </summary>
+            <remarks>
+            Normally this property is the same as <see cref="P:Spring.Util.IVirtualEnvironment.CurrentVirtualPath"/>. 
+            In case of <see cref="M:System.Web.HttpServerUtility.Transfer(System.String,System.Boolean)"/>, this property returns the current script 
+            whereas CurrentVirtualPath returns the original script path.
+            </remarks>
+        </member>
+        <member name="T:Spring.Util.ControlCollectionAccessor">
+            <summary>
+            Helper class for easier access to reflected ControlCollection members.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: ControlCollectionAccessor.cs,v 1.3 2008/05/13 23:23:03 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Util.ControlCollectionAccessor.GetTarget">
+            <summary>
+            Returns the underlying ControlCollection instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Util.ControlCollectionAccessor.GetTargetType">
+            <summary>
+            Returns the type of the underlying ControlCollection instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Util.ControlCollectionAccessor.#ctor(System.Web.UI.ControlCollection)">
+            <summary>
+            Creates a new Accessor for a given <see cref="T:System.Web.UI.ControlCollection"/>.
+            </summary>
+            <param name="controls">The <see cref="T:System.Web.UI.ControlCollection"/> to be accessed</param>
+        </member>
+        <member name="P:Spring.Util.ControlCollectionAccessor.Owner">
+            <summary>
+            Gets or sets the owner of the underlying ControlCollection.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.WebObjectDefinitionFactory">
+            <summary>
+            Custom implementation of <see cref="T:Spring.Objects.Factory.Support.IObjectDefinitionFactory"/>
+            for web applications.
+            </summary>
+            <remarks>
+            <p>
+            This implementation adds support for .aspx pages and scoped objects.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: WebObjectDefinitionFactory.cs,v 1.9 2008/04/07 00:19:55 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectDefinitionFactory.CreateObjectDefinition(System.String,System.String,System.AppDomain)">
+            <summary>
+            Factory style method for getting concrete
+            <see cref="T:Spring.Objects.Factory.Support.IConfigurableObjectDefinition"/>
+            instances.
+            </summary>
+            <remarks>If no parent is specified, a RootWebObjectDefinition is created, otherwise a 
+            ChildWebObjectDefinition.</remarks>
+            <param name="typeName">The <see cref="T:System.Type"/> of the defined object.</param>
+            <param name="parent">The name of the parent object definition (if any).</param>
+            <param name="domain">The <see cref="T:System.AppDomain"/> against which any class names
+            will be resolved into <see cref="T:System.Type"/> instances.</param>
+            <returns>
+            An
+            <see cref="T:Spring.Objects.Factory.Support.IConfigurableObjectDefinition"/>
+            instance.
+            </returns>
+        </member>
+        <member name="T:Spring.Core.IO.WebResource">
+            <summary>
+            <see cref="T:Spring.Core.IO.IResource"/> implementation specifically
+            for resources served up from a web server.
+            </summary>
+            <remarks>
+            <p>
+            Uses the <c>System.Web.HttpContext.Current.Server.MapPath</c>
+            method to resolve the file name for a given resource.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: WebResource.cs,v 1.14 2008/03/14 12:02:45 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Core.IO.WebResource.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Core.IO.WebResource"/> class.
+            </summary>
+            <param name="resourceName">
+            The name of the file system resource (on the server).
+            </param>
+        </member>
+        <member name="M:Spring.Core.IO.WebResource.ResolveFileHandle(System.String)">
+            <summary>
+            Resolves the <see cref="T:System.IO.FileInfo"/> handle 
+            for the supplied <paramref name="resourceName"/>.
+            </summary>
+            <param name="resourceName">
+            The name of the file system resource.
+            </param>
+            <returns>
+            The <see cref="T:System.IO.FileInfo"/> handle for this resource.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.WebResource.ResolveRootLocation(System.String)">
+            <summary>
+            Resolves the root location for the supplied <paramref name="resourceName"/>.
+            </summary>
+            <param name="resourceName">
+            The name of the file system resource.
+            </param>
+            <returns>
+            The root location of the resource.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.WebResource.ResolveResourcePath(System.String)">
+            <summary>
+            Resolves the path for the supplied <paramref name="resourceName"/>.
+            </summary>
+            <param name="resourceName">
+            The name of the file system resource.
+            </param>
+            <returns>
+            The current path of the resource.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.WebResource.ResolveBasePathPlaceHolder(System.String,System.String)">
+            <summary>
+            Resolves the presence of the
+            <paramref name="basePathPlaceHolder"/> value
+            in the supplied <paramref name="resourceName"/> into a path.
+            </summary>
+            <param name="resourceName">
+            The name of the resource.
+            </param>
+            <param name="basePathPlaceHolder">
+            The string that is a placeholder for a base path.
+            </param>
+            <returns>
+            The name of the resource with any <paramref name="basePathPlaceHolder"/>
+            value having been resolved into an actual path.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.WebResource.IsRelativeResource(System.String)">
+            <summary>
+            Does the supplied <paramref name="resourceName"/> relative ?
+            </summary>
+            <param name="resourceName">
+            The name of the resource to test.
+            </param>
+            <returns>
+            <see langword="true"/> if resource name is relative; 
+            otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Core.IO.WebResource.CreateResourceInstance(System.String)">
+            <summary>
+            Factory Method. Create a new instance of the current resource type using the given resourceName
+            </summary>
+        </member>
+        <member name="M:Spring.Core.IO.WebResource.GetResourceLoader">
+            <summary>
+            The ResourceLoader to be used for resolving relative resources
+            </summary>
+        </member>
+        <member name="P:Spring.Core.IO.WebResource.PathSeparatorChars">
+            <summary>
+            Gets those characters that are valid path separators for the
+            resource type.
+            </summary>
+            <value>
+            Those characters that are valid path separators for the resource
+            type.
+            </value>
+            <seealso cref="P:Spring.Core.IO.AbstractResource.PathSeparatorChars"/>
+        </member>
+        <member name="T:Spring.Context.Support.WebSupportModule">
+            <summary>
+            Provides various support for proper handling requests.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: WebSupportModule.cs,v 1.15 2007/08/08 17:48:19 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Context.Support.WebSupportModule.#cctor">
+            <summary>
+            For webapplications always
+            <ul>
+            <li>convert IResources using the current context.</li>
+            <li>use "web" as default resource protocol</li>
+            <li>use <see cref="T:Spring.Threading.HybridContextStorage"/> as default threading storage</li>
+            </ul>
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.WebSupportModule.Init(System.Web.HttpApplication)">
+            <summary>
+            Registers this module for all events required by the Spring.Web framework
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.WebSupportModule.Dispose">
+            <summary>
+            Disposes this instance
+            </summary>
+        </member>
+        <member name="T:Spring.Context.Support.WebApplicationContext">
+             <summary>
+             Web application context, taking the context definition files
+             from the file system or from URLs. 
+            
+             Treats resource paths as web resources, when using
+             IApplicationContext.GetResource. Resource paths are considered relative
+             to the virtual directory.
+            
+             Note: In case of multiple config locations, later object definitions will
+             override ones defined in earlier loaded files. This can be leveraged to
+             deliberately override certain object definitions via an extra XML file.
+             </summary>
+             <author>Aleksandar Seovic</author>
+        </member>
+        <member name="F:Spring.Context.Support.WebApplicationContext.log">
+            <summary>
+            The <see cref="T:Common.Logging.ILog"/> instance for this class.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.WebApplicationContext.#ctor(System.String[])">
+            <summary>
+            Create a new WebApplicationContext, loading the definitions
+            from the given XML resource.
+            </summary>
+            <param name="configurationLocations">Names of configuration resources.</param>
+        </member>
+        <member name="M:Spring.Context.Support.WebApplicationContext.#ctor(System.String,System.Boolean,System.String[])">
+            <summary>
+            Create a new WebApplicationContext, loading the definitions
+            from the given XML resource.
+            </summary>
+            <param name="name">The application context name.</param>
+            <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+            <param name="configurationLocations">Names of configuration resources.</param>
+        </member>
+        <member name="M:Spring.Context.Support.WebApplicationContext.#ctor(System.String,System.Boolean,Spring.Context.IApplicationContext,System.String[])">
+            <summary>
+            Create a new WebApplicationContext with the given parent,
+            loading the definitions from the given XML resources.
+            </summary>
+            <param name="name">The application context name.</param>
+            <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+            <param name="parentContext">The parent context.</param>
+            <param name="configurationLocations">Names of configuration resources.</param>
+        </member>
+        <member name="M:Spring.Context.Support.WebApplicationContext.ToString">
+            <summary>
+            returns detailed instance information for debugging
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="F:Spring.Context.Support.WebApplicationContext.s_webContextCache">
+            <summary>
+            Since the HttpRuntime discards it's configurationsection cache, we maintain our own context cache.
+            Despite it really speeds up context-lookup, since we don't have to go through the whole HttpConfigurationSystem
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.WebApplicationContext.OnContextRegistryCleared(System.Object,System.EventArgs)">
+            <summary>
+            EventHandler for ContextRegistry.Cleared event. Discards webContextCache.
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.WebApplicationContext.GetRootContext">
+            <summary>
+            Returns the root context of this web application
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.WebApplicationContext.GetContext(System.String)">
+            <summary>
+            Returns the web application context for the given (absolute!) virtual path
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.WebApplicationContext.InitObjectDefinitionReader(Spring.Objects.Factory.Xml.XmlObjectDefinitionReader)">
+            <summary>
+            Initializes object definition reader.
+            </summary>
+            <param name="objectDefinitionReader">Reader to initialize.</param>
+        </member>
+        <member name="M:Spring.Context.Support.WebApplicationContext.CreateObjectFactory">
+            <summary>
+            Creates web object factory for this context using parent context's factory as a parent.
+            </summary>
+            <returns>Web object factory to use.</returns>
+        </member>
+        <member name="P:Spring.Context.Support.WebApplicationContext.Current">
+            <summary>
+            Returns the web application context for the current request's filepath
+            </summary>
+        </member>
+        <member name="P:Spring.Context.Support.WebApplicationContext.ConfigurationLocations">
+            <summary>
+            Return an array of resource locations, referring to the XML object
+            definition files that this context should be built with.
+            </summary>
+            <returns>an array of resource locations, or null if none</returns>
+        </member>
+        <member name="T:Spring.Web.UI.DialogAttribute">
+            <summary>
+            Specifies that page should be treated as a dialog, meaning that after processing
+            is over user should return to the referring page.
+            </summary>
+            <remarks>
+            <p>
+            Pages marked with this attribute will have "close" result predefined.
+            </p>
+            <p>
+            Developers should call SetResult("close") from the event handler
+            in order to return control back to the calling page.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DialogAttribute.cs,v 1.3 2006/05/18 21:37:52 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.AbstractBaseValidator">
+            <summary>
+            Provides functions required for implementing validators 
+            but are unfortunately not accessible from <see cref="T:System.Web.UI.WebControls.BaseValidator"/>
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: AbstractBaseValidator.cs,v 1.1 2007/07/31 10:40:58 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.AbstractBaseValidator.RegisterClientScriptBlock(System.Type,System.String,System.String)">
+            <summary>
+            Registers a javascript-block to be rendered.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.AbstractBaseValidator.IsClientScriptBlockRegistered(System.Type,System.String)">
+            <summary>
+            Checks, if a certain javascript-block is already registered.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.AbstractBaseValidator.AddExpandoAttribute(System.Web.UI.HtmlTextWriter,System.String,System.String,System.String,System.Boolean)">
+            <summary>
+            Adds an attribute to be rendered for clientside validation.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.AbstractBaseValidator.EnableLegacyRendering">
+            <summary>
+            Is "XHTML 1.0 Transitional" rendering allowed?
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.IValidationContainer">
+            <summary>
+            Abstracts access to properties required for 
+            handling validation and error rendering
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: IValidationContainer.cs,v 1.1 2008/03/19 12:07:15 oakinger Exp $</version>
+        </member>
+        <member name="P:Spring.Web.UI.IValidationContainer.MessageSource">
+            <summary>
+            Gets the MessageSource to be used for 
+            resolving error ids into messages
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.IValidationContainer.ValidationErrors">
+            <summary>
+            Gets the list of validation errors kept by this container.
+            </summary>
+        </member>
+        <member name="T:Spring.DataBinding.IWebDataBound">
+            <summary>
+            A page or control must implement this interface to support spring's databinding infrastructure.
+            </summary>
+            <remarks>
+            <seealso cref="T:Spring.DataBinding.IDataBound"/>
+            <seealso cref="T:Spring.DataBinding.IBindingContainer"/>
+            <seealso cref="T:Spring.Web.UI.Controls.DataBindingPanel"/>
+            </remarks>
+        </member>
+        <member name="P:Spring.DataBinding.IWebDataBound.UniqueID">
+            <summary>
+            Return the UniqueID of this page or control.
+            </summary>
+        </member>
+        <member name="P:Spring.DataBinding.IWebDataBound.ApplicationContext">
+            <summary>
+            Return the <see cref="T:Spring.Context.IApplicationContext"/> where <see cref="T:Spring.Globalization.IFormatter"/> 
+            instances should be optained from.
+            </summary>
+        </member>
+        <member name="E:Spring.DataBinding.IWebDataBound.DataBindingsInitialized">
+            <summary>
+            This event is raised to initialize bindings for <see cref="P:Spring.DataBinding.IDataBound.BindingManager"/>.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.TabularMultiView">
+            <summary>
+            The <see cref="T:Spring.Web.UI.Controls.TabularMultiView"/> control allows you to build ASP.NET Web pages that present 
+            the user with content arranged in tabular form.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: TabularMultiView.cs,v 1.1 2007/07/24 13:33:28 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabularMultiView.#ctor">
+            <summary>
+            Initializes a new instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabularMultiView.#ctor(System.Web.UI.HtmlTextWriterTag)">
+            <summary>
+            Initializes a new instance with the given container tag to be used for rendering.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabularMultiView.CreateTabContainer">
+            <summary>
+            Create the container for tab items.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabularMultiView.CreateContent(Spring.Web.UI.Controls.TabContainer,System.Web.UI.WebControls.MultiView)">
+            <summary>
+            Creates TabContainer and MultiView 
+            </summary>
+        </member>
+        <member name="F:Spring.Web.UI.Controls.TabularMultiView._parsedViews">
+            <summary>
+            keeps parsed views until multiView is created
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabularMultiView.OnInit(System.EventArgs)">
+            <summary>
+            Initialize this control.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabularMultiView.CreateChildControls">
+            <summary>
+            Creates child controls.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabularMultiView.AddParsedSubObject(System.Object)">
+            <summary>
+            Adds the element to the collection of child controls.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabularMultiView.RebuildTabs">
+            <summary>
+            Called if ActiveViewIndex is changed
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.TabularMultiView.TabularMenuCSS">
+            <summary>
+            Set the style class of the panel containing the Tabs.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.TabularMultiView.TabularMenuItemCSS">
+            <summary>
+            Set the style class of each Tab item.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.TabularMultiView.TabularMenuSelectedItemCSS">
+            <summary>
+            Set the style class of the currently selected Tab item.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.TabularMultiView.TabularBodyCSS">
+            <summary>
+            Set the style class of the panel containing all <see cref="T:Spring.Web.UI.Controls.TabularView"/> controls.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.TabularMultiView.ActiveTabIndex">
+            <summary>
+            Gets or sets the index of the active View control within a <see cref="T:Spring.Web.UI.Controls.TabularMultiView"/> control.
+            </summary>
+        </member>
+        <member name="E:Spring.Web.UI.Controls.TabularMultiView.ActiveTabChanged">
+            <summary>
+            Occurs, if the active tab has changed.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.InterceptControlCollectionOwnerStrategy">
+            <summary>
+            This strategy replaces the original collection's owner with an intercepting proxy
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: InterceptControlCollectionOwnerStrategy.cs,v 1.1 2007/08/01 23:11:01 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Web.Support.IInterceptionStrategy">
+            <summary>
+            Any concrete interception strategy must implement this interface
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: IInterceptionStrategy.cs,v 1.1 2007/08/01 23:11:00 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Support.IInterceptionStrategy.Intercept(Spring.Context.IApplicationContext,Spring.Util.ControlAccessor,Spring.Util.ControlCollectionAccessor)">
+            <summary>
+            Any implementation must never throw an exception from this method. 
+            Instead <c>false</c> must be returned to indicate interception failure.
+            </summary>
+            <returns>
+            <c>true</c>, if interception succeeded. <c>false</c> otherwise.
+            </returns>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.ChildWebObjectDefinition">
+            <summary>
+            Web object definitions extend <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+            by adding scope property.
+            </summary>
+            <remarks>
+            <p>
+            This is the most common type of object definition in ASP.Net web applications
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ChildWebObjectDefinition.cs,v 1.3 2007/08/01 23:10:46 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.IWebObjectDefinition">
+            <summary>
+            Defines additional members web object definitions need to implement.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IWebObjectDefinition.cs,v 1.2 2007/03/26 14:58:38 oakinger Exp $</version>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IWebObjectDefinition.Scope">
+            <summary>
+            Gets or sets scope for the web object (application, session or request)
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IWebObjectDefinition.IsPage">
+            <summary>
+            Returns true if web object is .aspx page.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.IWebObjectDefinition.PageName">
+            <summary>
+            Gets the rooted url of the .aspx page, if object definition represents page.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ChildWebObjectDefinition.#ctor(System.String,System.Type,Spring.Objects.Factory.Config.ConstructorArgumentValues,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.ChildWebObjectDefinition"/> class
+            for a singleton, providing property values and constructor arguments.
+            </summary>
+            <param name="parentName">Name of the parent object definition.</param>
+            <param name="type">The class of the object to instantiate.</param>
+            <param name="arguments">
+            The <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            to be applied to a new instance of the object.
+            </param>
+            <param name="properties">
+            The <see cref="T:Spring.Objects.MutablePropertyValues"/> to be applied to
+            a new instance of the object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ChildWebObjectDefinition.#ctor(System.String,System.String,Spring.Objects.Factory.Config.ConstructorArgumentValues,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.ChildWebObjectDefinition"/> class
+            for a singleton, providing property values and constructor arguments.
+            </summary>
+            <param name="parentName">Name of the parent object definition.</param>
+            <param name="typeName">The class name of the object to instantiate.</param>
+            <param name="arguments">
+            The <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            to be applied to a new instance of the object.
+            </param>
+            <param name="properties">
+            The <see cref="T:Spring.Objects.MutablePropertyValues"/> to be applied to
+            a new instance of the object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ChildWebObjectDefinition.#ctor(System.String,System.String,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.ChildWebObjectDefinition"/> class
+            for an .aspx page, providing property values.
+            </summary>
+            <param name="parentName">Name of the parent object definition.</param>
+            <param name="pageName">Name of the .aspx page to instantiate.</param>
+            <param name="properties">
+            The <see cref="T:Spring.Objects.MutablePropertyValues"/> to be applied to
+            a new instance of the object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.ChildWebObjectDefinition.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.ChildWebObjectDefinition.Scope">
+            <summary>
+            Object scope.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.ChildWebObjectDefinition.IsPage">
+            <summary>
+            Returns true if web object is .aspx page.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.ChildWebObjectDefinition.PageName">
+            <summary>
+            Gets the rooted url of the .aspx page, if object definition represents page.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.ChildWebObjectDefinition.IsSingleton">
+            <summary>
+            Forces ASP pages to be treated as prototypes all the time inorder to comply with ASP.Net requirements.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.TabCommandEventHandler">
+            <summary>
+            Represents the method that will handle the TabCommand event. 
+            </summary>
+            <param name="sender">The source of the event.</param>
+            <param name="e">A <see cref="T:Spring.Web.UI.Controls.TabCommandEventArgs"/> that contains the event data.</param>
+            <author>Erich Eichinger</author>
+            <version>$Id: TabCommandEventHandler.cs,v 1.1 2007/07/24 13:33:28 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.LocalizedImage">
+            <summary>
+            This control should be used instead of standard HTML <c>head</c> tag
+            in order to render dynamicaly registered head scripts and stylesheets.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: LocalizedImage.cs,v 1.4 2006/05/18 21:37:52 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.LocalizedImage.OnPreRender(System.EventArgs)">
+            <summary>
+            Tries to determine full URL for the localized image before it's rendered.
+            </summary>
+            <param name="e"></param>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.LocalizedImage.ImageName">
+            <summary>
+            Name of the image file.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.LocalizedImage.Page">
+            <summary>
+            Gets a reference to the <see cref="T:Spring.Web.UI.Page"/> instance that contains the
+            server control.
+            </summary>
+            <value></value>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.Calendar">
+            <summary>
+            Displays a pop-up DHTML calendar.
+            </summary>
+            <remarks>
+            <p>
+            Credit: this control uses a slightly modified version of the 
+            <a href="http://www.dynarch.com/projects/calendar/">Dynarch.com DHTML Calendar</a>,
+            written by Mihai Bazon.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: Calendar.cs,v 1.13 2007/12/07 21:06:35 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.Calendar.OnPreRender(System.EventArgs)">
+            <summary>
+            Registers necessary scripts and stylesheet.
+            </summary>
+            <param name="e">
+            An <see cref="T:System.EventArgs"/> object that contains the event data.
+            </param>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.Calendar.Render(System.Web.UI.HtmlTextWriter)">
+            <summary>
+            Renders a hidden input field that stores the value for the radio button group.
+            </summary>
+            <param name="writer">
+            <see cref="T:System.Web.UI.HtmlTextWriter"/> to use for rendering.
+            </param>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.Calendar.RaisePostDataChangedEvent">
+            <summary>
+            Raises the <c>SelectionChanged</c> event.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.Calendar.LoadPostData(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Loads postback data into the control.
+            </summary>
+            <param name="postDataKey">
+            The key that should be used to retrieve data.
+            </param>
+            <param name="postCollection">The postback data collection.</param>
+            <returns><see lang="true"/> if data has changed.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.Calendar.OnDateChanged(System.EventArgs)">
+            <summary>
+            The method that is called on postback if the date has changed.
+            </summary>
+            <param name="e">
+            The event argument (empty and unused).
+            </param>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.Calendar.Page">
+            <summary>
+            Gets a reference to the <see cref="T:Spring.Web.UI.Page"/> instance that contains the
+            server control.
+            </summary>
+            <value>
+            A reference to the <see cref="T:Spring.Web.UI.Page"/> instance that contains the
+            server control.
+            </value>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.Calendar.SelectedDate">
+            <summary>
+            The selected date.
+            </summary>
+            <value>The selected date.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.Calendar.Format">
+            <summary>
+            The date format that is to be used.
+            </summary>
+            <value>A valid date format string.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.Calendar.AllowEditing">
+            <summary>
+            Is direct editing of the date allowed?
+            </summary>
+            <value>
+            <see lang="true"/> if direct editing of the date is allowed?</value>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.Calendar.Skin">
+            <summary>
+            The (CSS) style.
+            </summary>
+            <value>The style for the calendar.</value>
+        </member>
+        <member name="E:Spring.Web.UI.Controls.Calendar.DateChanged">
+            <summary>
+            Occurs when the value of the radio button group changes between postbacks to the server.
+            </summary>
+        </member>
+        <member name="T:Spring.Util.WebUtils">
+            <summary>
+            Miscellaneous web utility methods.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: WebUtils.cs,v 1.32 2008/03/19 18:05:07 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Util.WebUtils.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Util.WebUtils"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="F:Spring.Util.WebUtils.DEFAULT_RESOURCE_PROTOCOL">
+            <summary>
+            Default protocol used for resolving resources in web applications
+            </summary>
+        </member>
+        <member name="M:Spring.Util.WebUtils.GetPageName(System.String)">
+            <summary>
+            Extracts the bare ASPX page name without any extension from the
+            supplied <paramref name="url"/>.
+            </summary>
+            <example>
+            <p>
+            Examples of what would be returned from this method given a url would be:
+            </p>
+            <p>
+            <list type="bullet">
+            <item><description>'Login.aspx' =&gt; 'Login'</description></item>
+            <item><description>'~/Login.aspx' =&gt; 'Login'</description></item>
+            <item><description>'~/B2B/SignUp.aspx' =&gt; 'SignUp'</description></item>
+            <item><description>'B2B/Foo/FooServices.aspx' =&gt; 'FooServices'</description></item>
+            </list>
+            </p>
+            </example>
+            <param name="url">The full URL to the ASPX page.</param>
+            <returns>
+            The bare ASPX page name without any extension.
+            </returns>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="url"/> is <see langword="null"/> or
+            contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Util.WebUtils.GetVirtualDirectory(System.String)">
+            <summary>
+            Returns only the directory portion of a virtual path
+            </summary>
+            <remarks>
+            The returned path is guaranteed to always have a leading and a trailing slash.<br/>
+            If a path does not end with a file-extension it is assumed to be a directory
+            </remarks>
+        </member>
+        <member name="M:Spring.Util.WebUtils.CreateAbsolutePath(System.String,System.String)">
+            <summary>
+            Returns absolute path that can be referenced within plain HTML.
+            </summary>
+            <remarks>
+            <p>
+            If relative path starts with '/' (forward slash), no concatenation will occur
+            and it will be assumed that the relative path specified is indeed the absolute path
+            and will be returned verbatim.</p>
+            <p>
+            Otherwise, relative path will be appended to the application path, while making sure that 
+            path separators are not duplicated between the paths.</p>
+            </remarks>
+            <param name="applicationPath">Application path.</param>
+            <param name="relativePath">Relative path to combine with the application path.</param>
+            <returns>Absolute path.</returns>
+        </member>
+        <member name="M:Spring.Util.WebUtils.CombineVirtualPaths(System.String,System.String)">
+            <summary>
+            Combines a rooted base path with a relative path.
+            </summary>
+            <param name="rootPath">Must be a path starting with '/'</param>
+            <param name="relativePath">the path to be combined. May start with basepath Placeholder '~'</param>
+            <returns>the combined path</returns>
+            <remarks>
+            If relativePath starts with '~', rootPath is ignored and '~' resolves to the current AppDomain's application virtual path<br/>
+            If relativePath start with '/', rootPath is ignored and relativePath is returned as-is.
+            </remarks>
+        </member>
+        <member name="M:Spring.Util.WebUtils.GetAppRelativePath(System.String)">
+            <summary>
+            Gets the application-relative virtual path portion of the given absolute URL.
+            </summary>
+            <param name="url">the absolute url</param>
+            <returns>the url relative to the current application's virtual path</returns>
+        </member>
+        <member name="M:Spring.Util.WebUtils.GetRelativePath(System.String,System.String)">
+            <summary>
+            Gets the virtual path portion of the given absolute URL 
+            relative to the given base path.
+            </summary>
+            <remarks>
+            Base path comparison is done case insensitive.
+            </remarks>
+            <param name="basePath">the absolute base path</param>
+            <param name="url">the absolute url</param>
+            <returns>the url relative to the given basePath</returns>
+        </member>
+        <member name="T:Spring.Util.HttpContextSwitch">
+            <summary>
+            Performs a <see cref="M:System.Web.HttpContext.RewritePath(System.String)"/>. Original path will be restored on <see cref="M:Spring.Util.HttpContextSwitch.Dispose"/>
+            </summary>
+            <remarks>
+            Rewrites the current HttpContext's filepath to &lt;directory&gt;/currentcontext.dummy.<br/>
+            This affects resolving resources by calls to <see cref="M:Spring.Util.ConfigurationUtils.GetSection(System.String)"/> and <see cref="M:System.Web.HttpRequest.MapPath(System.String)"/><br/>
+            Original path is restored during <see cref="M:Spring.Util.HttpContextSwitch.Dispose"/>.
+            </remarks>
+            <example>
+            <code>
+            using( new HttpContextSwitch( "/path" ) )
+            {
+                Response.Write( Request.FilePath ); // writes "/path/currentcontext.dummy" to response.
+            }
+            // Request.FilePath has been reset to original url here
+            </code>
+            </example>
+            <author>Erich Eichinger</author>
+            <version>$Id: HttpContextSwitch.cs,v 1.1 2007/08/01 23:10:51 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Util.HttpContextSwitch.#ctor(System.String)">
+            <summary>
+            Performs an immediate call to <see cref="M:System.Web.HttpContext.RewritePath(System.String)"/>
+            </summary>
+            <param name="virtualDirectory">a directory path (without trailing filename!)</param>
+        </member>
+        <member name="M:Spring.Util.HttpContextSwitch.Dispose">
+            <summary>
+            Restores original path if necessary
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.ObjectScope">
+            <summary>
+            The possible object scope values.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ObjectScope.cs,v 1.1 2007/02/17 06:57:44 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.ObjectScope.Application">
+            <summary>
+            Application scope.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.ObjectScope.Session">
+            <summary>
+            Session scope.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.ObjectScope.Request">
+            <summary>
+            Request scope.
+            </summary>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.ObjectScope.Default">
+            <summary>
+            Default scope (currently
+            <see cref="F:Spring.Objects.Factory.Support.ObjectScope.Application"/>).
+            </summary>
+            <seealso cref="F:Spring.Objects.Factory.Support.ObjectScope.Application"/>
+        </member>
+        <member name="T:Spring.Web.Support.MimeMediaType">
+            <summary>
+            Represents a MIME media type as defined by http://www.iana.org/assignments/media-types/
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: MimeMediaType.cs,v 1.1 2007/11/28 23:26:10 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Support.MimeMediaType.Parse(System.String)">
+            <summary>
+            Parses a string into a <see cref="T:Spring.Web.Support.MimeMediaType"/> instance.
+            </summary>
+            <param name="mediaType">a valid string representation of a mediaType</param>
+            <returns>a new <see cref="T:Spring.Web.Support.MimeMediaType"/> instance</returns>
+        </member>
+        <member name="M:Spring.Web.Support.MimeMediaType.#ctor">
+            <summary>
+            Creates a new media type instance representing a generic "application/octet-stream"
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.MimeMediaType.#ctor(System.String)">
+            <summary>
+            Creates a new media type instance representing a generic content type 
+            with an unspecified subtype (e.g. "text/*")
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.MimeMediaType.#ctor(System.String,System.String)">
+            <summary>
+            Creates a new media type instance representing a particular media type 
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.MimeMediaType.ToString">
+            <summary>
+            Returns a string representation of this <see cref="T:Spring.Web.Support.MimeMediaType"/> instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.MimeMediaType.Equals(Spring.Web.Support.MimeMediaType)">
+            <summary>
+            Compares this instance to another
+            </summary>
+            <param name="other">another <see cref="T:Spring.Web.Support.MimeMediaType"/> instance</param>
+        </member>
+        <member name="M:Spring.Web.Support.MimeMediaType.Equals(System.Object)">
+            <summary>
+            Determines whether the specified <see cref="T:System.Object"></see> is equal to the current <see cref="T:Spring.Web.Support.MimeMediaType"></see>.
+            </summary>
+            <returns>
+            true if the specified <see cref="T:System.Object"></see> is equal to the current <see cref="T:Spring.Web.Support.MimeMediaType"></see>; otherwise, false.
+            </returns>
+            <param name="obj">The <see cref="T:System.Object"></see> to compare with the current <see cref="T:Spring.Web.Support.MimeMediaType"></see>.</param>
+        </member>
+        <member name="M:Spring.Web.Support.MimeMediaType.GetHashCode">
+            <summary>
+            Serves as a hash function for a particular type. <see cref="M:System.Object.GetHashCode"></see> is suitable for use in hashing algorithms and data structures like a hash table.
+            </summary>
+            <returns>
+            A hash code for the current <see cref="T:Spring.Web.Support.MimeMediaType"></see>.
+            </returns>
+        </member>
+        <member name="P:Spring.Web.Support.MimeMediaType.ContentType">
+            <summary>
+            Gets the content type of this media type instance
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.MimeMediaType.SubType">
+            <summary>
+            Gets the subtype of this media type instance
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.MimeMediaType.Application">
+            <summary>
+            Predefines common application media types
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Application.Octet">
+            <summary>
+            Represents "application/octet-stream"
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Application.Pdf">
+            <summary>
+            Represents "application/pdf"
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Application.Rtf">
+            <summary>
+            Represents "application/rtf"
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Application.Soap">
+            <summary>
+            Represents "application/soap+xml"
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Application.Zip">
+            <summary>
+            Represents "application/zip"
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.MimeMediaType.Image">
+            <summary>
+            Predefines common image media types
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Image.Gif">
+            <summary>
+            Represents "image/gif"
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Image.Jpeg">
+            <summary>
+            Represents "image/jpeg"
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Image.Tiff">
+            <summary>
+            Represents "image/tiff"
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.MimeMediaType.Text">
+            <summary>
+            Predefines common text media types
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Text.Html">
+            <summary>
+            Represents "text/html"
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Text.Plain">
+            <summary>
+            Represents "text/plain"
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Text.RichText">
+            <summary>
+            Represents "text/richtext"
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Text.Xml">
+            <summary>
+            Represents "text/xml"
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Text.Javascript">
+            <summary>
+            Represents "text/javascript"
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.MimeMediaType.Text.Css">
+            <summary>
+            Represents "text/css"
+            </summary>
+        </member>
+        <member name="T:Spring.Context.Support.WebContextHandler">
+            <summary>
+            Creates an <see cref="T:Spring.Context.IApplicationContext"/> instance
+            using context definitions supplied in a custom configuration and
+            configures the <see cref="T:Spring.Context.Support.ContextRegistry"/> with that instance.
+            </summary>
+            <remarks>
+            This class extends <see cref="T:Spring.Context.Support.ContextHandler">ContextHandler</see> with
+            web specific behaviour. It uses <see cref="T:Spring.Context.Support.WebApplicationContext">WebApplicationContext</see>
+            as default Context-Type.
+            </remarks>
+            <author>Erich Eichinger</author>
+            <version>$Id: WebContextHandler.cs,v 1.8 2008/03/13 20:07:43 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Context.Support.WebContextHandler.GetContextName(System.Object,System.Xml.XmlElement)">
+            <summary>
+            Gets the context name from the given <see cref="T:System.Web.Configuration.HttpConfigurationContext"/>
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.WebContextHandler.CreateChildContexts(Spring.Context.IApplicationContext,System.Object,System.Xml.XmlNode[])">
+            <summary>
+            Throws a configuration exception, if child contexts are specified.
+            </summary>
+            <remarks>
+            Nesting contexts in webapplications is done by explicitly declaring
+            spring context sections for each directory.
+            </remarks>
+        </member>
+        <member name="M:Spring.Context.Support.WebContextHandler.InstantiateContext(Spring.Context.IApplicationContext,System.Object,System.String,System.Type,System.Boolean,System.String[])">
+            <summary>
+            Handles web specific details of context instantiation.
+            </summary>
+        </member>
+        <member name="P:Spring.Context.Support.WebContextHandler.DefaultApplicationContextType">
+            <summary>
+            Sets default context type to <see cref="T:Spring.Context.Support.WebApplicationContext"/>
+            </summary>
+        </member>
+        <member name="P:Spring.Context.Support.WebContextHandler.DefaultCaseSensitivity">
+            <summary>
+            Sets default case-sensitivity to 'false' for web-applications
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.InterceptControlCollectionStrategy">
+            <summary>
+            This strategy enhances a ControlCollection's type by 
+            dynamically implementing ISupportsWebDependencyInjection on this type
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: InterceptControlCollectionStrategy.cs,v 1.2 2008/05/13 14:22:47 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Web.Support.InterceptControlCollectionStrategy.s_collectionMethods">
+            <summary>
+            The list of methods to be intercepted for a ControlCollection
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.InterceptControlCollectionStrategy.s_interceptedCollectionTypeCache">
+            <summary>
+            Holds a table of already known intercepted ControlCollection types
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.InterceptControlCollectionStrategy.Intercept(Spring.Context.IApplicationContext,Spring.Util.ControlAccessor,Spring.Util.ControlCollectionAccessor)">
+            <summary>
+            Intercepts the given <see cref="T:System.Web.UI.ControlCollection"/> by dynamically deriving 
+            the original type and let it implement <see cref="T:Spring.Web.Support.ISupportsWebDependencyInjection"/>.
+            </summary>
+            <param name="defaultApplicationContext">the ApplicationContext to be set on the collection instance.</param>
+            <param name="ctlAccessor">a wrapper around the owner control instance.</param>
+            <param name="ctlColAccessor">a wrapper around the collection instance.</param>
+            <returns><value>true</value>, if interception was successful.  <value>false</value> otherwise</returns>
+        </member>
+        <member name="T:Spring.Web.Support.InterceptControlCollectionStrategy.InjectDependenciesCallbackHandler">
+            <summary>
+            Holds a reference to the static(!) callback-method to be used during generation of intercepted ControlCollection-Types
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Providers.ConfigurableSqlMembershipProvider">
+            <summary>
+            A spring configurable version of <see cref="T:System.Web.Security.SqlMembershipProvider"/>
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: ConfigurableSqlMembershipProvider.cs,v 1.1 2007/07/26 14:43:56 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Providers.ConfigurableSqlMembershipProvider.Initialize(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Initializes the provider.
+            </summary>
+            
+            <param name="config">
+             <para>
+             A collection of the name/value pairs representing the provider-specific 
+             attributes specified in the configuration for this provider.
+             </para>
+             Values may be overridden by specifying them in <see cref="P:Spring.Web.Providers.ConfigurableSqlMembershipProvider.Parameters"/> list.
+             </param>
+            <param name="name">The friendly name of the provider.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+            <exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+            <exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        </member>
+        <member name="P:Spring.Web.Providers.ConfigurableSqlMembershipProvider.ConnectionStringName">
+            <summary>
+            The ConnectionString to be used
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Providers.ConfigurableSqlMembershipProvider.Parameters">
+            <summary>
+            A collection of the name/value pairs representing the provider-specific
+            attributes specified in the configuration for this provider.
+            </summary> 
+        </member>
+        <member name="T:Spring.Caching.AspNetCache">
+            <summary>
+            An <see cref="T:Spring.Caching.ICache"/> implementation backed by ASP.NET Cache (see <see cref="P:System.Web.HttpRuntime.Cache"/>).
+            </summary>
+            <remarks>
+            <para>
+            Because ASP.NET Cache uses strings as cache keys, you need to ensure
+            that the key object type has properly implemented <b>ToString</b> method.
+            </para>
+            <para>
+            Despite the shared underlying <see cref="P:System.Web.HttpRuntime.Cache"/>, it is possible to use more than
+            one instance of <see cref="T:Spring.Caching.AspNetCache"/> without interfering each other.
+            </para>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <author>Erich Eichinger</author>
+            <version>$Id: AspNetCache.cs,v 1.6 2007/09/14 18:26:26 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Caching.AspNetCache.#ctor">
+            <summary>
+            Initializes a new instance of <see cref="T:Spring.Caching.AspNetCache"/> 
+            </summary>
+        </member>
+        <member name="M:Spring.Caching.AspNetCache.#ctor(Spring.Caching.AspNetCache.IRuntimeCache)">
+            <summary>
+            Initializes a new instance of <see cref="T:Spring.Caching.AspNetCache"/>
+            with the specified <see cref="T:Spring.Caching.AspNetCache.IRuntimeCache"/> implementation.
+            </summary>
+            <param name="runtimeCache"></param>
+        </member>
+        <member name="M:Spring.Caching.AspNetCache.Get(System.Object)">
+            <summary>
+            Retrieves an item from the cache.
+            </summary>
+            <param name="key">
+            Item key.
+            </param>
+            <returns>
+            Item for the specified <paramref name="key"/>, or <c>null</c>.
+            </returns>
+        </member>
+        <member name="M:Spring.Caching.AspNetCache.Remove(System.Object)">
+            <summary>
+            Removes an item from the cache.
+            </summary>
+            <param name="key">
+            Item key.
+            </param>
+        </member>
+        <member name="M:Spring.Caching.AspNetCache.DoInsert(System.Object,System.Object,System.TimeSpan)">
+            <summary>
+            Inserts an item into the cache.
+            </summary>
+            <remarks>
+            Items inserted using this method have default <see cref="P:Spring.Caching.AspNetCache.Priority"/> and default <see cref="P:Spring.Caching.AspNetCache.SlidingExpiration"/>
+            </remarks>
+            <param name="key">
+            Item key.
+            </param>
+            <param name="value">
+            Item value.
+            </param>
+            <param name="timeToLive">
+            Item's time-to-live (TTL).
+            </param>
+        </member>
+        <member name="M:Spring.Caching.AspNetCache.Insert(System.Object,System.Object,System.TimeSpan,System.Boolean)">
+            <summary>
+            Inserts an item into the cache.
+            </summary>
+            <param name="key">
+            Item key.
+            </param>
+            <param name="value">
+            Item value.
+            </param>
+            <param name="timeToLive">
+            Item's time-to-live.
+            </param>
+            <param name="slidingExpiration">
+            Flag specifying whether the item's time-to-live should be reset
+            when the item is accessed.
+            </param>
+        </member>
+        <member name="M:Spring.Caching.AspNetCache.Insert(System.Object,System.Object,System.TimeSpan,System.Boolean,System.Web.Caching.CacheItemPriority)">
+            <summary>
+            Inserts an item into the cache.
+            </summary>
+            <param name="key">
+            Item key.
+            </param>
+            <param name="value">
+            Item value.
+            </param>
+            <param name="timeToLive">
+            Item's time-to-live.
+            </param>
+            <param name="slidingExpiration">
+            Flag specifying whether the item's time-to-live should be reset
+            when the item is accessed.
+            </param>
+            <param name="itemPriority">
+            Item priority.
+            </param>
+        </member>
+        <member name="M:Spring.Caching.AspNetCache.GenerateKey(System.Object)">
+            <summary>
+            Generate a key to be used for the underlying <see cref="T:System.Web.Caching.Cache"/> implementation.
+            </summary>
+            <param name="key"></param>
+            <returns></returns>
+        </member>
+        <member name="P:Spring.Caching.AspNetCache.SlidingExpiration">
+            <summary>
+            Gets/Sets a flag, whether to use sliding expiration policy.
+            </summary>
+        </member>
+        <member name="P:Spring.Caching.AspNetCache.Priority">
+            <summary>
+            Gets/Sets a default priority to be applied to all items inserted into this cache.
+            </summary>
+        </member>
+        <member name="P:Spring.Caching.AspNetCache.Keys">
+            <summary>
+            Gets a collection of all cache item keys.
+            </summary>
+        </member>
+        <member name="T:Spring.Caching.AspNetCache.IRuntimeCache">
+            <summary>
+            Abstracts the underlying runtime cache
+            </summary>
+        </member>
+        <member name="M:Spring.Caching.AspNetCache.IRuntimeCache.Insert(System.String,System.Object,System.Web.Caching.CacheDependency,System.DateTime,System.TimeSpan,System.Web.Caching.CacheItemPriority,System.Web.Caching.CacheItemRemovedCallback)">
+            <summary>
+            Insert an item into the cache.
+            </summary>
+        </member>
+        <member name="M:Spring.Caching.AspNetCache.IRuntimeCache.Remove(System.String)">
+            <summary>
+            Removes an item from the cache.
+            </summary>
+            <param name="key">The key of the item to remove</param>
+            <returns>The object that has been removed from the cache</returns>
+        </member>
+        <member name="M:Spring.Caching.AspNetCache.IRuntimeCache.Get(System.String)">
+            <summary>
+            Retrieve an item with the specified key from the cache.
+            </summary>
+            <param name="key">The key of the item to be retrieved</param>
+            <returns>The item, if found. <value>null</value> otherwise</returns>
+        </member>
+        <member name="T:Spring.Caching.AspNetCache.RuntimeCache">
+            <summary>
+            Actually delegates all calls to the underlying <see cref="P:System.Web.HttpRuntime.Cache"/>
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.Panel">
+            <summary>
+            This panel provides the same features as <see cref="T:System.Web.UI.WebControls.Panel"/>, but provides additional means with regards to Spring.
+            </summary>
+            <remarks>
+            In some cases, automatic dependency injection can cause performance problems. In this case,you can use a Panel for finer-grained control
+            over which controls are to be injected or not.
+            </remarks>
+            <author>Erich Eichinger</author>
+            <version>$Id: Panel.cs,v 1.3 2008/03/09 15:20:37 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Web.Support.ISupportsWebDependencyInjection">
+            <summary>
+            "Contract"-interface of the Web-DI infrastructure.
+            </summary>
+            <remarks>
+            This interface supports Spring's DI infrastructure and normally doesn't need to be implemented<br/>
+            <br/>
+            Any Page, Control or ControlCollection implementing this interface guarantees to 
+            call <see cref="M:Spring.Web.Support.WebDependencyInjectionUtils.InjectDependenciesRecursive(Spring.Context.IApplicationContext,System.Web.UI.Control)"/> on any control being added 
+            before it is actually added to the child-collection.
+            </remarks>
+            <example>
+            <p>The following example shows, how to make a Control support the DI-infrastructure:</p>
+            <code language="c#">
+            class MyControl : Control, ISupportsWebDependencyInjection
+            {
+            	private IApplicationContext _defaultApplicationContext;
+            
+            	public IApplicationContext DefaultApplicationContext
+            	{
+            		get { return _defaultApplicationContext; }
+            		set { _defaultApplicationContext = value; }
+            	}
+            
+            	override protected AddedControl( Control control, int index )
+            	{
+            		WebUtils.InjectDependenciesRecursive( _defaultApplicationContext, control );
+            		base.AddedControl( control, index );
+            	}
+            }
+            </code>
+            </example>
+            <example>
+            <p>The following example shows, how to make a ControlCollection support the DI-infrastructure:</p>
+            <p>Note, that you MUST implement the single-argument constructor <c>ControlCollection( Control owner )</c>!</p>
+            <code language="c#">
+            class MyControlCollection : ControlCollection, ISupportsWebDependencyInjection
+            {
+            	private IApplicationContext _defaultApplicationContext;
+            
+            	public MyControlCollection( Control owner ) : base( owner )
+            	{}
+            
+            	public IApplicationContext DefaultApplicationContext
+            	{
+            		get { return _defaultApplicationContext; }
+            		set { _defaultApplicationContext = value; }
+            	}
+            
+            	override public Add( Control child )
+            	{
+            		WebUtils.InjectDependenciesRecursive( _defaultApplicationContext, child );
+            		base.Add( child );
+            	}
+            
+            	override public AddAt( int index, Control child )
+            	{
+            		WebUtils.InjectDependenciesRecursive( _defaultApplicationContext, child );
+            		base.AddAt( index, child );
+            	}
+            }
+            </code>
+            </example>
+            <author>Erich Eichinger</author>
+            <version>$Id: ISupportsWebDependencyInjection.cs,v 1.2 2007/08/01 23:11:00 markpollack Exp $</version>
+        </member>
+        <member name="P:Spring.Web.Support.ISupportsWebDependencyInjection.DefaultApplicationContext">
+            <summary>
+            Holds the default <see cref="T:Spring.Context.IApplicationContext"/> instance to be used during injecting a control-tree.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.Panel.Render(System.Web.UI.HtmlTextWriter)">
+            <summary>
+            Overridden to suppress rendering this control's tag
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.Panel.OnPreInitRecursive(System.EventArgs)">
+            <summary>
+            This method is invoked right before InitRecursive() is called for this Panel and
+            ensures, that dependencies get injected on child controls before their Init event is raised.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.Panel.AddedControl(System.Web.UI.Control,System.Int32)">
+            <summary>
+            Injects dependencies into control before adding it.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.Panel.CreateControlCollection">
+            <summary>
+            Overridden to automatically aquire a reference to 
+            root application context to use for DI.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.Panel.SuppressDependencyInjection">
+            <summary>
+            This flag controls, whether DI on child controls will be done or not
+            </summary>
+            <remarks>By default, DI will be done</remarks>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.Panel.RenderContainerTag">
+            <summary>
+            This flag controls, whether this Panel's tag will be rendered.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.Panel.Spring#Web#Support#ISupportsWebDependencyInjection#DefaultApplicationContext">
+            <summary>
+            Sets / Gets the ApplicationContext instance used to configure this control
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.SupportsWebDependencyInjectionOwnerProxy">
+            <summary>
+            Wraps a Control to make it DI aware
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: SupportsWebDependencyInjectionOwnerProxy.cs,v 1.2 2008/05/13 14:22:47 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Support.SupportsWebDependencyInjectionOwnerProxy.#ctor(Spring.Context.IApplicationContext,System.Web.UI.Control)">
+            <summary>
+            Wraps a control to make it DI aware
+            </summary>
+            <param name="defaultApplicationContext"></param>
+            <param name="targetControl"></param>
+        </member>
+        <member name="M:Spring.Web.Support.SupportsWebDependencyInjectionOwnerProxy.AddedControl(System.Web.UI.Control,System.Int32)">
+            <summary>
+            Performs DI before adding the control to it's parent
+            </summary>
+            <param name="control"></param>
+            <param name="index"></param>
+        </member>
+        <member name="M:Spring.Web.Support.SupportsWebDependencyInjectionOwnerProxy.RemovedControl(System.Web.UI.Control)">
+            <summary>
+            Delegates call to decorated control
+            </summary>
+            <param name="control"></param>
+        </member>
+        <member name="T:Spring.Web.Providers.ISiteMapProvider">
+            <summary>
+            An Interface for <see cref="T:Spring.Web.Providers.SiteMapProviderAdapter"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+            as the Id of wrapped provider (defined in the Spring context).  
+            </p>    
+            </remarks>
+            <author>Damjan Tomic</author>
+        </member>
+        <member name="M:Spring.Web.Providers.ISiteMapProvider.Initialize(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Initializes the provider.
+            </summary>
+            
+            <param name="config">A collection of the name/value pairs representing the provider-specific 
+             attributes specified in the configuration for this provider.
+             The <c>providerId</c> attribute is mandatory.
+             </param>
+            <param name="name">The friendly name of the provider.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+            <exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+            <exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.ISiteMapProvider.FindSiteMapNode(System.Web.HttpContext)">
+            <summary>
+            Retrieves a <see cref="T:System.Web.SiteMapNode"></see> object that represents the currently requested page using the specified <see cref="T:System.Web.HttpContext"></see> object.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if no corresponding <see cref="T:System.Web.SiteMapNode"></see> can be found in the <see cref="T:System.Web.SiteMapNode"></see> or if the page context is null. 
+            </returns>
+            
+            <param name="context">The <see cref="T:System.Web.HttpContext"></see> used to match node information with the URL of the requested page.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.ISiteMapProvider.FindSiteMapNodeFromKey(System.String)">
+            <summary>
+            Retrieves a <see cref="T:System.Web.SiteMapNode"></see> object based on a specified key.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the page identified by key; otherwise, null, if no corresponding <see cref="T:System.Web.SiteMapNode"></see> is found or if security trimming is enabled and the <see cref="T:System.Web.SiteMapNode"></see> cannot be returned for the current user. The default is null.
+            </returns>
+            
+            <param name="key">A lookup key with which a <see cref="T:System.Web.SiteMapNode"></see> is created.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.ISiteMapProvider.FindSiteMapNode(System.String)">
+            <summary>
+            When overridden in a derived class, retrieves a <see cref="T:System.Web.SiteMapNode"></see> object that represents the page at the specified URL.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the page identified by rawURL; otherwise, null, if no corresponding <see cref="T:System.Web.SiteMapNode"></see> is found or if security trimming is enabled and the <see cref="T:System.Web.SiteMapNode"></see> cannot be returned for the current user.
+            </returns>
+            
+            <param name="rawUrl">A URL that identifies the page for which to retrieve a <see cref="T:System.Web.SiteMapNode"></see>. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.ISiteMapProvider.GetChildNodes(System.Web.SiteMapNode)">
+            <summary>
+            When overridden in a derived class, retrieves the child nodes of a specific <see cref="T:System.Web.SiteMapNode"></see>.
+            </summary>
+            
+            <returns>
+            A read-only <see cref="T:System.Web.SiteMapNodeCollection"></see> that contains the immediate child nodes of the specified <see cref="T:System.Web.SiteMapNode"></see>; otherwise, null or an empty collection, if no child nodes exist.
+            </returns>
+            
+            <param name="node">The <see cref="T:System.Web.SiteMapNode"></see> for which to retrieve all child nodes. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.ISiteMapProvider.GetCurrentNodeAndHintAncestorNodes(System.Int32)">
+            <summary>
+            Provides an optimized lookup method for site map providers when retrieving the node for the currently requested page and fetching the parent and ancestor site map nodes for the current page.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+            </returns>
+            
+            <param name="upLevel">The number of ancestor site map node generations to get. A value of -1 indicates that all ancestors might be retrieved and cached by the provider.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">upLevel is less than -1.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.ISiteMapProvider.GetCurrentNodeAndHintNeighborhoodNodes(System.Int32,System.Int32)">
+            <summary>
+            Provides an optimized lookup method for site map providers when retrieving the node for the currently requested page and fetching the site map nodes in the proximity of the current node.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+            </returns>
+            
+            <param name="upLevel">The number of ancestor <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no ancestor nodes are retrieved and -1 indicates that all ancestors might be retrieved and cached by the provider.</param>
+            <param name="downLevel">The number of child <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no descendant nodes are retrieved and a -1 indicates that all descendant nodes might be retrieved and cached by the provider.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">upLevel or downLevel is less than -1.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.ISiteMapProvider.GetParentNode(System.Web.SiteMapNode)">
+            <summary>
+            When overridden in a derived class, retrieves the parent node of a specific <see cref="T:System.Web.SiteMapNode"></see> object.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the parent of node; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> has no parent or security trimming is enabled and the parent node is not accessible to the current user.
+            </returns>
+            
+            <param name="node">The <see cref="T:System.Web.SiteMapNode"></see> for which to retrieve the parent node. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.ISiteMapProvider.GetParentNodeRelativeToCurrentNodeAndHintDownFromParent(System.Int32,System.Int32)">
+            <summary>
+            Provides an optimized lookup method for site map providers when retrieving an ancestor node for the currently requested page and fetching the descendant nodes for the ancestor.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents an ancestor <see cref="T:System.Web.SiteMapNode"></see> of the currently requested page; otherwise, null, if the current or ancestor <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+            </returns>
+            
+            <param name="relativeDepthFromWalkup">The number of descendant node levels to retrieve from the target ancestor node. </param>
+            <param name="walkupLevels">The number of ancestor node levels to traverse when retrieving the requested ancestor node. </param>
+            <exception cref="T:System.ArgumentOutOfRangeException">walkupLevels or relativeDepthFromWalkup is less than 0.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.ISiteMapProvider.GetParentNodeRelativeToNodeAndHintDownFromParent(System.Web.SiteMapNode,System.Int32,System.Int32)">
+            <summary>
+            Provides an optimized lookup method for site map providers when retrieving an ancestor node for the specified <see cref="T:System.Web.SiteMapNode"></see> object and fetching its child nodes.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents an ancestor of node; otherwise, null, if the current or ancestor <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+            </returns>
+            
+            <param name="relativeDepthFromWalkup">The number of descendant node levels to retrieve from the target ancestor node.</param>
+            <param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that acts as a reference point for walkupLevels and relativeDepthFromWalkup. </param>
+            <param name="walkupLevels">The number of ancestor node levels to traverse when retrieving the requested ancestor node.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">The value specified for walkupLevels or relativeDepthFromWalkup is less than 0.</exception>
+            <exception cref="T:System.ArgumentNullException">node is null.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.ISiteMapProvider.HintAncestorNodes(System.Web.SiteMapNode,System.Int32)">
+            <summary>
+            Provides a method that site map providers can override to perform an optimized retrieval of one or more levels of parent and ancestor nodes, relative to the specified <see cref="T:System.Web.SiteMapNode"></see> object. 
+            </summary>
+            
+            <param name="upLevel">The number of ancestor <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no ancestor nodes are retrieved and -1 indicates that all ancestors might be retrieved and cached.</param>
+            <param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that acts as a reference point for upLevel.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">upLevel is less than -1.</exception>
+            <exception cref="T:System.ArgumentNullException">node is null.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.ISiteMapProvider.HintNeighborhoodNodes(System.Web.SiteMapNode,System.Int32,System.Int32)">
+            <summary>
+            Provides a method that site map providers can override to perform an optimized retrieval of nodes found in the proximity of the specified node. 
+            </summary>
+            
+            <param name="upLevel">The number of ancestor <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no ancestor nodes are retrieved and -1 indicates that all ancestors (and their descendant nodes to the level of node) might be retrieved and cached.</param>
+            <param name="downLevel">The number of descendant <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no descendant nodes are retrieved and -1 indicates that all descendant nodes might be retrieved and cached.</param>
+            <param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that acts as a reference point for upLevel.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">upLevel or downLevel is less than -1.</exception>
+            <exception cref="T:System.ArgumentNullException">node is null.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.ISiteMapProvider.IsAccessibleToUser(System.Web.HttpContext,System.Web.SiteMapNode)">
+            <summary>
+            Retrieves a Boolean value indicating whether the specified <see cref="T:System.Web.SiteMapNode"></see> object can be viewed by the user in the specified context.
+            </summary>
+            
+            <returns>
+            true if security trimming is enabled and node can be viewed by the user or security trimming is not enabled; otherwise, false.
+            </returns>
+            
+            <param name="context">The <see cref="T:System.Web.HttpContext"></see> that contains user information.</param>
+            <param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that is requested by the user.</param>
+            <exception cref="T:System.ArgumentNullException">context is null.- or -node is null.</exception>
+        </member>
+        <member name="P:Spring.Web.Providers.ISiteMapProvider.Name">
+            <summary>
+            Gets the friendly name used to refer to the provider during configuration.
+            </summary>
+            
+            <returns>
+            The friendly name used to refer to the provider during configuration.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.ISiteMapProvider.Description">
+            <summary>
+            Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+            </summary>
+            
+            <returns>
+            A brief, friendly description suitable for display in administrative tools or other UIs.
+            </returns>
+                    
+        </member>
+        <member name="P:Spring.Web.Providers.ISiteMapProvider.CurrentNode">
+            <summary>
+            Gets the <see cref="T:System.Web.SiteMapNode"></see> object that represents the currently requested page.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.ISiteMapProvider.ParentProvider">
+            <summary>
+            Gets or sets the parent <see cref="T:System.Web.SiteMapProvider"></see> object of the current provider.
+            </summary>
+            
+            <returns>
+            The parent provider of the current <see cref="T:System.Web.SiteMapProvider"></see>.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.ISiteMapProvider.RootProvider">
+            <summary>
+            Gets the root <see cref="T:System.Web.SiteMapProvider"></see> object in the current provider hierarchy.
+            </summary>
+            
+            <returns>
+            An <see cref="T:System.Web.SiteMapProvider"></see> that is the top-level site map provider in the provider hierarchy that the current provider belongs to.
+            </returns>
+            
+            <exception cref="T:System.Configuration.Provider.ProviderException">There is a circular reference to the current site map provider. </exception>
+        </member>
+        <member name="P:Spring.Web.Providers.ISiteMapProvider.RootNode">
+            <summary>
+            Gets the root <see cref="T:System.Web.SiteMapNode"></see> object of the site map data that the current provider represents.
+            </summary>
+            
+            <returns>
+            The root <see cref="T:System.Web.SiteMapNode"></see> of the current site map data provider. The default implementation performs security trimming on the returned node.
+            </returns>
+            
+        </member>
+        <member name="T:Spring.Threading.HybridContextStorage">
+            <summary>
+            Implements <see cref="T:Spring.Threading.IThreadStorage"/> by using both <see cref="T:System.Web.HttpContext"/> and <see cref="T:System.Runtime.Remoting.Messaging.CallContext"/> and choosing dynamically between them.
+            </summary>
+            <remarks>
+            In web applications a single Request may be executed on different threads. In this case HttpContext.Current is the only invariant.<br/>
+            This implementation dynamically chooses between <see cref="T:System.Runtime.Remoting.Messaging.CallContext">System.Runtime.Remoting.Messaging.CallContext</see> 
+            and <see cref="T:System.Web.HttpContext">System.Web.HttpContext</see> to store data.
+            </remarks>
+            <author>Erich Eichinger</author>
+            <version>$Id: HybridContextStorage.cs,v 1.1 2007/02/02 21:31:25 oakinger Exp $</version>  
+        </member>
+        <member name="M:Spring.Threading.HybridContextStorage.GetData(System.String)">
+            <summary>
+            Retrieves an object with the specified name.
+            </summary>
+            <param name="name">The name of the item.</param>
+            <returns>The object in the context associated with the specified name or null if no object has been stored previously</returns>
+        </member>
+        <member name="M:Spring.Threading.HybridContextStorage.SetData(System.String,System.Object)">
+            <summary>
+            Stores a given object and associates it with the specified name.
+            </summary>
+            <param name="name">The name with which to associate the new item.</param>
+            <param name="value">The object to store in the call context.</param>
+        </member>
+        <member name="M:Spring.Threading.HybridContextStorage.FreeNamedDataSlot(System.String)">
+            <summary>
+            Empties a data slot with the specified name.
+            </summary>
+            <param name="name">The name of the data slot to empty.</param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.WebObjectUtils">
+            <summary>
+            Miscellaneous utility methods to support web functionality within Spring.Objects
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: WebObjectUtils.cs,v 1.3 2008/01/27 23:29:55 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectUtils.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Util.WebUtils"/> class.
+            </summary>
+            <remarks>
+            <p>
+            This is a utility class, and as such exposes no public constructors.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectUtils.CreatePageInstance(System.String)">
+            <summary>
+            Creates an instance of the ASPX page
+            referred to by the supplied <paramref name="pageUrl"/>.
+            </summary>
+            <param name="pageUrl">
+            The URL of the ASPX page.
+            </param>
+            <returns>Page instance.</returns>
+            <exception cref="T:Spring.Objects.Factory.ObjectCreationException">
+            If this method is not called in the scope of an active web session
+            (i.e. the implementation this method depends on this code executing
+            in the environs of a running web server such as IIS); or if the
+            page could not be instantiated (for whatever reason, such as the
+            ASPX <paramref name="pageUrl"/> not actually existing).
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectUtils.GetPageType(System.String)">
+            <summary>
+            Returns the <see cref="T:System.Type"/> of the ASPX page
+            referred to by the supplied <paramref name="pageUrl"/>.
+            </summary>
+            <remarks>
+            <p>
+            As indicated by the exception that can be thrown by this method,
+            the ASPX page referred to by the supplied <paramref name="pageUrl"/>
+            does have to be instantiated in order to determine its 
+            see cref="System.Type"/&gt;
+            </p>
+            </remarks>
+            <param name="pageUrl">
+            The filename of the ASPX page.
+            </param>
+            <returns>
+            The <see cref="T:System.Type"/> of the ASPX page
+            referred to by the supplied <paramref name="pageUrl"/>.
+            </returns>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="pageUrl"/> is <see langword="null"/> or
+            contains only whitespace character(s).
+            </exception>
+            <exception cref="T:Spring.Objects.Factory.ObjectCreationException">
+            If this method is not called in the scope of an active web session
+            (i.e. the implementation this method depends on this code executing
+            in the environs of a running web server such as IIS); or if the
+            page could not be instantiated (for whatever reason, such as the
+            ASPX <paramref name="pageUrl"/> not actually existing).
+            </exception>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectUtils.GetCompiledPageType(System.String)">
+            <summary>
+            Calls the underlying ASP.NET infrastructure to obtain the compiled page type 
+            relative to the current <see cref="P:System.Web.HttpRequest.CurrentExecutionFilePath"/>.
+            </summary>
+            <param name="pageUrl">
+            The filename of the ASPX page relative to the current <see cref="P:System.Web.HttpRequest.CurrentExecutionFilePath"/>
+            </param>
+            <returns>
+            The <see cref="T:System.Type"/> of the ASPX page
+            referred to by the supplied <paramref name="pageUrl"/>.
+            </returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectUtils.GetControlType(System.String)">
+            <summary>
+            Gets the controls type from a given filename
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.DataBindingAdapter">
+            <summary>
+            May be used to wrap controls for databinding that don't accept unknown attributes.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.DataBindingAdapter.AddParsedSubObject(System.Object)">
+            <summary>
+            Overridden to ensure only 1 control is wrapped by this adapter
+            </summary>
+            <param name="obj"></param>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.DataBindingAdapter.Render(System.Web.UI.HtmlTextWriter)">
+            <summary>
+            Overridden to render wrapped control only.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.DataBindingAdapter.WrappedControl">
+            <summary>
+            Returns the control wrapped by this adapter or null.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.SupportsWebDependencyInjectionTypeBuilder">
+            <summary>
+            This TypeBuilder dynamically implements the <see cref="T:Spring.Web.Support.ISupportsWebDependencyInjection"/> contract on a given type.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: SupportsWebDependencyInjectionTypeBuilder.cs,v 1.1 2007/08/01 23:11:01 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Support.SupportsWebDependencyInjectionTypeBuilder.#ctor(System.Type,System.Reflection.MethodInfo[],System.Reflection.MethodInfo)">
+            <summary>
+            Creates a new TypeBuilder instance.
+            </summary>
+            <param name="targetType">The base type the proxy shall be derived from</param>
+            <param name="methodsToIntercept">The methods to be injected with a call to <c>staticCallbackMethod</c></param>
+            <param name="staticCallbackMethod">The <b>static</b> callback method to be injected into <c>methodsToIntercept</c></param>
+        </member>
+        <member name="M:Spring.Web.Support.SupportsWebDependencyInjectionTypeBuilder.BuildProxyType">
+            <summary>
+            Creates a proxy that inherits the proxied object's class.
+            </summary>
+            <remarks/>
+            <returns>The generated proxy type.</returns>
+        </member>
+        <member name="M:Spring.Web.Support.SupportsWebDependencyInjectionTypeBuilder.ImplementIDependencyInjectionAware(System.Reflection.Emit.TypeBuilder,System.Type,System.Reflection.FieldInfo)">
+            <summary>
+            Actually implements the <see cref="T:Spring.Web.Support.ISupportsWebDependencyInjection"/> interface.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.SupportsWebDependencyInjectionTypeBuilder.DeclareApplicationContextInstanceField(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Declares field that holds the <see cref="P:Spring.Web.Support.ISupportsWebDependencyInjection.DefaultApplicationContext"/>.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.SupportsWebDependencyInjectionTypeBuilder.IsSpringAwareControlProxy(System.Type)">
+            <summary>
+            Determines if the specified <paramref name="type"/> 
+            is one of those generated by this builder.
+            </summary>
+            <param name="type">The type to check.</param>
+            <returns>
+            <see langword="true"/> if the type is a SpringAwareControl-based proxy;
+            otherwise <see langword="false"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Web.Support.ResultMode">
+            <summary>
+            The various result modes.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ResultMode.cs,v 1.3 2007/04/19 07:49:01 oakinger Exp $</version>
+            <seealso cref="T:Spring.Web.Support.Result"/>
+        </member>
+        <member name="F:Spring.Web.Support.ResultMode.Transfer">
+            <summary>
+            A server-side transfer.
+            </summary>
+            <remarks>
+            <p>
+            Issues a server-side transfer using the
+            <see cref="M:System.Web.HttpServerUtility.Transfer(System.String)"/> method.
+            </p>
+            </remarks>
+            <seealso cref="M:System.Web.HttpServerUtility.Transfer(System.String)"/>
+        </member>
+        <member name="F:Spring.Web.Support.ResultMode.Redirect">
+            <summary>
+            A redirect.
+            </summary>
+            <remarks>
+            <p>
+            Issues a redirect (to the user-agent - typically a browser) using
+            the <see cref="M:System.Web.HttpResponse.Redirect(System.String)"/> method.
+            </p>
+            </remarks>
+            <seealso cref="M:System.Web.HttpResponse.Redirect(System.String)"/>
+        </member>
+        <member name="F:Spring.Web.Support.ResultMode.TransferNoPreserve">
+            <summary>
+            A server-side transfer.
+            </summary>
+            <remarks>
+            <p>
+            Issues a server-side transfer using the
+            <see cref="M:System.Web.HttpServerUtility.Transfer(System.String,System.Boolean)"/> method with parameter 'preserveForm=false'.
+            </p>
+            </remarks>
+            <seealso cref="M:System.Web.HttpServerUtility.Transfer(System.String,System.Boolean)"/>
+        </member>
+        <member name="T:Spring.Web.Support.ContextMonitor">
+            <summary>
+            <see cref="T:System.Web.IHttpHandler"/> implementation that allows users to monitor state 
+            of the Spring.NET web application context.
+            </summary>
+            <remarks>
+            <p>
+            
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ContextMonitor.cs,v 1.3 2007/07/29 19:39:48 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Support.ContextMonitor.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Web.Support.ContextMonitor"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.ContextMonitor.ProcessRequest(System.Web.HttpContext)">
+            <summary>
+            Processes HTTP request.
+            </summary>
+            <param name="context">An <see cref="T:System.Web.HttpContext"/> object that provides references to the intrinsic server objects (for example, <see langword="Request"/>, <see langword="Response"/>, <see langword="Session"/>, and <see langword="Server"/>)<see langword=""/> used to service HTTP requests.</param>
+        </member>
+        <member name="P:Spring.Web.Support.ContextMonitor.IsReusable">
+            <summary>
+            Gets a value indicating whether another request can use
+            this <see cref="T:System.Web.IHttpHandler"/> instance.
+            </summary>
+            <value><c>True</c> if this handler is reusable, <c>False</c> otherwise.</value>
+        </member>
+        <member name="T:Spring.DataBinding.IBindingAwareFormatter">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:Spring.DataBinding.IBindingAwareFormatter.SetBindingContext(System.Object,System.Object,System.Collections.IDictionary,Spring.DataBinding.BindingDirection)">
+            <summary>
+            Sets the binding context of this formatter.
+            </summary>
+            <param name="source"></param>
+            <param name="target"></param>
+            <param name="variables"></param>
+            <param name="direction"></param>
+        </member>
+        <member name="M:Spring.DataBinding.IBindingAwareFormatter.ClearBindingContext">
+            <summary>
+            Clears the binding context of this formatter.
+            </summary>
+        </member>
+        <member name="T:Spring.DataBinding.HttpRequestListBindingContainer">
+            <summary>
+            Binds agroup of HTTP request multi-valued items to the data model.
+            </summary>
+            <remarks>
+            Due to the fact, that browsers don't send the values of unchecked checkboxes, you 
+            can't use <see cref="T:Spring.DataBinding.HttpRequestListBindingContainer"/> for binding to checkboxes.
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: HttpRequestBindingContainer.cs,v 1.6 2008/02/05 20:40:26 aseovic Exp $</version>
+        </member>
+        <member name="M:Spring.DataBinding.HttpRequestListBindingContainer.#ctor(System.String,System.String,System.Type)">
+            <summary>
+            Creates a new instance of <see cref="T:Spring.DataBinding.HttpRequestListBindingContainer"/>.
+            </summary>
+            <param name="requestParams">
+            Comma separated list of multi-valued request parameters that
+            should be used to create a target item.
+            </param>
+            <param name="targetList">
+            Expression that identifies a target list items should be added to.
+            </param>
+            <param name="itemType">
+            The type of the target item.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.HttpRequestListBindingContainer.AddBinding(System.String,System.String,Spring.DataBinding.BindingDirection,Spring.Globalization.IFormatter)">
+            <summary>
+            Adds the <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> binding.
+            </summary>
+            <remarks>
+            This is a convinience method for adding <b>SimpleExpressionBinding</b>,
+            one of the most often used binding types, to the bindings list.
+            </remarks>
+            <param name="sourceExpression">
+            The source expression.
+            </param>
+            <param name="targetExpression">
+            The target expression.
+            </param>
+            <param name="direction">
+            Binding direction.
+            </param>
+            <param name="formatter">
+            <see cref="T:Spring.Globalization.IFormatter"/> to use for value formatting and parsing.
+            </param>
+            <returns>
+            Added <see cref="T:Spring.DataBinding.SimpleExpressionBinding"/> instance.
+            </returns>
+        </member>
+        <member name="M:Spring.DataBinding.HttpRequestListBindingContainer.BindSourceToTarget(System.Object,System.Object,Spring.Validation.IValidationErrors,System.Collections.IDictionary)">
+            <summary>
+            Binds source object to target object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="M:Spring.DataBinding.HttpRequestListBindingContainer.BindTargetToSource(System.Object,System.Object,Spring.Validation.IValidationErrors,System.Collections.IDictionary)">
+            <summary>
+            Binds target object to source object.
+            </summary>
+            <param name="source">
+            The source object.
+            </param>
+            <param name="target">
+            The target object.
+            </param>
+            <param name="validationErrors">
+            Validation errors collection that type conversion errors should be added to.
+            </param>
+            <param name="variables">
+            Variables that should be used during expression evaluation.
+            </param>
+        </member>
+        <member name="T:Spring.Web.UI.Validation.DivValidationErrorsRenderer">
+            <summary>
+            Implementation of <see cref="T:Spring.Web.UI.Validation.IValidationErrorsRenderer"/> that renders
+            validation errors within a <c>div</c> element, using breaks between the
+            errors.
+            </summary>
+            <remarks>
+            This renderer's behavior is consistent with standard ASP.NET behavior of
+            the validation summary, and is used as default renderer for Spring.NET
+            control.
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: DivValidationErrorsRenderer.cs,v 1.1 2007/08/02 19:50:28 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Web.UI.Validation.AbstractValidationErrorsRenderer">
+            <summary>
+            This class provides common members for all validation errors renderers.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AbstractValidationErrorsRenderer.cs,v 1.1 2007/08/02 19:50:28 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Validation.AbstractValidationErrorsRenderer.RenderErrors(Spring.Web.UI.Page,System.Web.UI.HtmlTextWriter,System.Collections.IList)">
+            <summary>
+            Renders validation errors using specified <see cref="T:System.Web.UI.HtmlTextWriter"/>.
+            </summary>
+            <param name="page">Web form instance.</param>
+            <param name="writer">An HTML writer to use.</param>
+            <param name="errors">The list of validation errors.</param>
+        </member>
+        <member name="P:Spring.Web.UI.Validation.AbstractValidationErrorsRenderer.CssClass">
+            <summary>
+            Gets or sets the name of the CSS class that should be used.
+            </summary>
+            <value>
+            The name of the CSS class that should be used
+            </value>
+        </member>
+        <member name="M:Spring.Web.UI.Validation.DivValidationErrorsRenderer.RenderErrors(Spring.Web.UI.Page,System.Web.UI.HtmlTextWriter,System.Collections.IList)">
+            <summary>
+            Renders validation errors using specified <see cref="T:System.Web.UI.HtmlTextWriter"/>.
+            </summary>
+            <param name="page">Web form instance.</param>
+            <param name="writer">An HTML writer to use.</param>
+            <param name="errors">The list of validation errors.</param>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.RequiredCheckBoxValidator">
+            <summary>
+            This validator allows for validating a CheckBox's "Checked" state.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: CheckBoxValidator.cs,v 1.1 2007/07/31 10:40:59 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.RequiredCheckBoxValidator.ControlPropertiesValid">
+            <summary>
+            Validates this validator's properties are set correctly.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.RequiredCheckBoxValidator.EvaluateIsValid">
+            <summary>
+            Returns the state of the checkbox's Checked property
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.RequiredCheckBoxValidator.AddAttributesToRender(System.Web.UI.HtmlTextWriter)">
+            <summary>
+            Adds attributes required for clientside validation
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.RequiredCheckBoxValidator.OnPreRender(System.EventArgs)">
+            <summary>
+            Ensures the evaluation javascript functionblock is registered
+            </summary>
+            <param name="e"></param>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.RootWebObjectDefinition">
+            <summary>
+            Web object definitions extend <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/>
+            by adding scope property.
+            </summary>
+            <remarks>
+            	<p>
+            This is the most common type of object definition in ASP.Net web applications
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: RootWebObjectDefinition.cs,v 1.4 2007/08/01 23:10:46 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootWebObjectDefinition.#ctor(System.Type,Spring.Objects.Factory.Config.ConstructorArgumentValues,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+            for a singleton, providing property values and constructor arguments.
+            </summary>
+            <param name="type">
+            The type of the object to instantiate.
+            </param>
+            <param name="properties">
+            The <see cref="T:Spring.Objects.MutablePropertyValues"/> to be applied to
+            a new instance of the object.
+            </param>
+            <param name="arguments">
+            The <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            to be applied to a new instance of the object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootWebObjectDefinition.#ctor(System.String,Spring.Objects.Factory.Config.ConstructorArgumentValues,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootObjectDefinition"/> class
+            for a singleton, providing property values and constructor arguments.
+            </summary>
+            <param name="typeName">
+            The assembly qualified <see cref="P:System.Type.FullName"/> of the object to instantiate.
+            </param>
+            <param name="properties">
+            The <see cref="T:Spring.Objects.MutablePropertyValues"/> to be applied to
+            a new instance of the object.
+            </param>
+            <param name="arguments">
+            The <see cref="T:Spring.Objects.Factory.Config.ConstructorArgumentValues"/>
+            to be applied to a new instance of the object.
+            </param>
+            <remarks>
+            <p>
+            Takes an object class name to avoid eager loading of the object class.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootWebObjectDefinition.#ctor(System.String,Spring.Objects.MutablePropertyValues)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootWebObjectDefinition"/> class
+            for an .aspx page, providing property values.
+            </summary>
+            <param name="pageName">
+            Name of the .aspx page to instantiate.
+            </param>
+            <param name="properties">
+            The <see cref="T:Spring.Objects.MutablePropertyValues"/> to be applied to
+            a new instance of the object.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootWebObjectDefinition.#ctor(Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.RootWebObjectDefinition"/> class
+            </summary>
+            <param name="other">
+            The definition that is to be copied.
+            </param>
+            <remarks>
+            <p>
+            Deep copy constructor.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootWebObjectDefinition.OverrideFrom(Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Overrides this object's values using values from <c>other</c> argument.
+            </summary>
+            <param name="other">The object to copy values from.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.RootWebObjectDefinition.ToString">
+            <summary>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </summary>
+            <returns>
+            A <see cref="T:System.String"/> that represents the current
+            <see cref="T:System.Object"/>.
+            </returns>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.RootWebObjectDefinition.Scope">
+            <summary>
+            Object scope.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.RootWebObjectDefinition.IsPage">
+            <summary>
+            Returns true if web object is .aspx page.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.RootWebObjectDefinition.PageName">
+            <summary>
+            Gets the rooted url of the .aspx page, if object definition represents page.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.RootWebObjectDefinition.IsSingleton">
+            <summary>
+            Forces ASP pages to be treated as prototypes all the time inorder to comply with ASP.Net requirements.
+            </summary>
+        </member>
+        <member name="T:Spring.DataBinding.DataSourceItemFormatter">
+            <summary>
+            This formatter acts as an adapter to a datasource. It parses a given datasource into 
+            a table to allow converting back and forth between objects and their keys during formatting.
+            </summary>
+            <remarks>
+            <para>
+            The DataSourceItemFormatter expects the "source" to have 2 properties named "DataSourceField" and "DataValueField".
+            </para>
+            </remarks>
+        </member>
+        <member name="M:Spring.DataBinding.DataSourceItemFormatter.#ctor(System.String,System.String)">
+            <summary>
+            Initialize this instance.
+            </summary>
+            <param name="dataSourceField">The name of the "source"s property containing the dataSource</param>
+            <param name="dataValueField">The name of the "source"s property containing the name of the key property</param>
+        </member>
+        <member name="M:Spring.DataBinding.DataSourceItemFormatter.SetBindingContext(System.Object,System.Object,System.Collections.IDictionary,Spring.DataBinding.BindingDirection)">
+            <summary>
+            Sets the bindingContext for the current thread.
+            </summary>
+            <param name="source">The source object</param>
+            <param name="target">The target object</param>
+            <param name="variables">Variables to be used during binding</param>
+            <param name="direction">The current binding's direction</param>
+        </member>
+        <member name="M:Spring.DataBinding.DataSourceItemFormatter.ClearBindingContext">
+            <summary>
+            Reset the current thread's binding context.
+            </summary>
+        </member>
+        <member name="M:Spring.DataBinding.DataSourceItemFormatter.Initialize(System.Collections.IEnumerable,System.String,Spring.DataBinding.BindingDirection)">
+            <summary>
+            Initialize a new instance.
+            </summary>
+            <param name="dataSource">The datasource containing list items</param>
+            <param name="dataItemKeyField">The name of the listitem's property that evaluates to the item's key</param>
+            <param name="direction">The direction of the current binding</param>
+        </member>
+        <member name="M:Spring.DataBinding.DataSourceItemFormatter.Format(System.Object)">
+            <summary>
+            Returns the key of the specified value object.
+            </summary>
+            <param name="value">The value to extract the key from.</param>
+            <returns>Key extracted from <paramref name="value"/>.</returns>
+        </member>
+        <member name="M:Spring.DataBinding.DataSourceItemFormatter.Parse(System.String)">
+            <summary>
+            Return the object with the specified key from the datasource.
+            </summary>
+            <param name="key">The key of the object.</param>
+            <returns>Parsed <paramref name="value"/>.</returns>
+        </member>
+        <member name="T:Spring.Context.Support.HttpApplicationConfigurer">
+             <summary>
+            
+             </summary>
+             <author>Erich Eichinger</author>
+             <version>$Id: HttpApplicationConfigurer.cs,v 1.2 2007/07/29 19:39:42 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Context.Support.HttpApplicationConfigurer.s_applicationDefinition">
+            <summary>
+            Holds shared application Template
+            </summary>
+        </member>
+        <member name="F:Spring.Context.Support.HttpApplicationConfigurer.s_moduleDefinitions">
+            <summary>
+            Holds shared modules Templates
+            </summary>
+        </member>
+        <member name="M:Spring.Context.Support.HttpApplicationConfigurer.Configure(Spring.Context.IConfigurableApplicationContext,System.Web.HttpApplication)">
+            <summary>
+            Configures the <see paramref="app"/> instance and its modules.
+            </summary>
+            <remarks>
+            When called, configures <see paramref="app"/> using the <see cref="T:Spring.Context.IApplicationContext"/> instance 
+            provided in <paramref name="appContext"/> and the templates available in
+            <see cref="P:Spring.Context.Support.HttpApplicationConfigurer.ApplicationTemplate"/> and <see cref="P:Spring.Context.Support.HttpApplicationConfigurer.ModuleTemplates"/>.
+            </remarks>
+            <param name="appContext">the application context instance to be used for resolving object references.</param>
+            <param name="app">the <see cref="T:System.Web.HttpApplication"/> instance to be configured.</param>
+        </member>
+        <member name="P:Spring.Context.Support.HttpApplicationConfigurer.ApplicationTemplate">
+            <summary>
+            Gets or Sets the shared application template
+            </summary>
+        </member>
+        <member name="P:Spring.Context.Support.HttpApplicationConfigurer.ModuleTemplates">
+            <summary>
+            Gets the dictionary of shared module templates
+            </summary>
+            <remarks>
+            to synchronize access to the dictionary, use <see cref="P:System.Collections.ICollection.SyncRoot"/> property.
+            </remarks>
+        </member>
+        <member name="T:Spring.Web.Providers.SiteMapProviderAdapter">
+            <summary>
+            Wrapper for <see cref="T:System.Web.SiteMapProvider"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+            as the Id of wrapped provider (defined in the Spring context).  
+            </p>    
+            </remarks>
+            <author>Damjan Tomic</author>
+        </member>
+        <member name="F:Spring.Web.Providers.SiteMapProviderAdapter.wrappedProvider">
+            <summary>
+            Reference to wrapped provider (defined in Spring context).
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.Initialize(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Initializes the provider.
+            </summary>
+            
+            <param name="config">A collection of the name/value pairs representing the provider-specific 
+             attributes specified in the configuration for this provider.
+             The <c>providerId</c> attribute may be used to override the name being used for looking up an object definition.
+             </param>
+            <param name="name">The friendly name of the provider.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+            <exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+            <exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.FindSiteMapNode(System.Web.HttpContext)">
+            <summary>
+            Retrieves a <see cref="T:System.Web.SiteMapNode"></see> object that represents the currently requested page using the specified <see cref="T:System.Web.HttpContext"></see> object.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if no corresponding <see cref="T:System.Web.SiteMapNode"></see> can be found in the <see cref="T:System.Web.SiteMapNode"></see> or if the page context is null. 
+            </returns>
+            
+            <param name="context">The <see cref="T:System.Web.HttpContext"></see> used to match node information with the URL of the requested page.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.FindSiteMapNodeFromKey(System.String)">
+            <summary>
+            Retrieves a <see cref="T:System.Web.SiteMapNode"></see> object based on a specified key.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the page identified by key; otherwise, null, if no corresponding <see cref="T:System.Web.SiteMapNode"></see> is found or if security trimming is enabled and the <see cref="T:System.Web.SiteMapNode"></see> cannot be returned for the current user. The default is null.
+            </returns>
+            
+            <param name="key">A lookup key with which a <see cref="T:System.Web.SiteMapNode"></see> is created.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.FindSiteMapNode(System.String)">
+            <summary>
+            When overridden in a derived class, retrieves a <see cref="T:System.Web.SiteMapNode"></see> object that represents the page at the specified URL.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the page identified by rawURL; otherwise, null, if no corresponding <see cref="T:System.Web.SiteMapNode"></see> is found or if security trimming is enabled and the <see cref="T:System.Web.SiteMapNode"></see> cannot be returned for the current user.
+            </returns>
+            
+            <param name="rawUrl">A URL that identifies the page for which to retrieve a <see cref="T:System.Web.SiteMapNode"></see>. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.GetChildNodes(System.Web.SiteMapNode)">
+            <summary>
+            When overridden in a derived class, retrieves the child nodes of a specific <see cref="T:System.Web.SiteMapNode"></see>.
+            </summary>
+            
+            <returns>
+            A read-only <see cref="T:System.Web.SiteMapNodeCollection"></see> that contains the immediate child nodes of the specified <see cref="T:System.Web.SiteMapNode"></see>; otherwise, null or an empty collection, if no child nodes exist.
+            </returns>
+            
+            <param name="node">The <see cref="T:System.Web.SiteMapNode"></see> for which to retrieve all child nodes. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.GetCurrentNodeAndHintAncestorNodes(System.Int32)">
+            <summary>
+            Provides an optimized lookup method for site map providers when retrieving the node for the currently requested page and fetching the parent and ancestor site map nodes for the current page.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+            </returns>
+            
+            <param name="upLevel">The number of ancestor site map node generations to get. A value of -1 indicates that all ancestors might be retrieved and cached by the provider.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">upLevel is less than -1.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.GetCurrentNodeAndHintNeighborhoodNodes(System.Int32,System.Int32)">
+            <summary>
+            Provides an optimized lookup method for site map providers when retrieving the node for the currently requested page and fetching the site map nodes in the proximity of the current node.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+            </returns>
+            
+            <param name="upLevel">The number of ancestor <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no ancestor nodes are retrieved and -1 indicates that all ancestors might be retrieved and cached by the provider.</param>
+            <param name="downLevel">The number of child <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no descendant nodes are retrieved and a -1 indicates that all descendant nodes might be retrieved and cached by the provider.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">upLevel or downLevel is less than -1.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.GetParentNode(System.Web.SiteMapNode)">
+            <summary>
+            When overridden in a derived class, retrieves the parent node of a specific <see cref="T:System.Web.SiteMapNode"></see> object.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the parent of node; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> has no parent or security trimming is enabled and the parent node is not accessible to the current user.
+            </returns>
+            
+            <param name="node">The <see cref="T:System.Web.SiteMapNode"></see> for which to retrieve the parent node. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.GetParentNodeRelativeToCurrentNodeAndHintDownFromParent(System.Int32,System.Int32)">
+            <summary>
+            Provides an optimized lookup method for site map providers when retrieving an ancestor node for the currently requested page and fetching the descendant nodes for the ancestor.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents an ancestor <see cref="T:System.Web.SiteMapNode"></see> of the currently requested page; otherwise, null, if the current or ancestor <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+            </returns>
+            
+            <param name="relativeDepthFromWalkup">The number of descendant node levels to retrieve from the target ancestor node. </param>
+            <param name="walkupLevels">The number of ancestor node levels to traverse when retrieving the requested ancestor node. </param>
+            <exception cref="T:System.ArgumentOutOfRangeException">walkupLevels or relativeDepthFromWalkup is less than 0.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.GetParentNodeRelativeToNodeAndHintDownFromParent(System.Web.SiteMapNode,System.Int32,System.Int32)">
+            <summary>
+            Provides an optimized lookup method for site map providers when retrieving an ancestor node for the specified <see cref="T:System.Web.SiteMapNode"></see> object and fetching its child nodes.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents an ancestor of node; otherwise, null, if the current or ancestor <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+            </returns>
+            
+            <param name="relativeDepthFromWalkup">The number of descendant node levels to retrieve from the target ancestor node.</param>
+            <param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that acts as a reference point for walkupLevels and relativeDepthFromWalkup. </param>
+            <param name="walkupLevels">The number of ancestor node levels to traverse when retrieving the requested ancestor node.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">The value specified for walkupLevels or relativeDepthFromWalkup is less than 0.</exception>
+            <exception cref="T:System.ArgumentNullException">node is null.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.GetRootNodeCore">
+            <summary>
+             This method is marked as protected and should never be called.
+            </summary>
+            <exception cref="T:System.NotSupportedException"></exception>
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the root node of the set of nodes that the current provider manages. 
+            </returns>
+            
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.HintAncestorNodes(System.Web.SiteMapNode,System.Int32)">
+            <summary>
+            Provides a method that site map providers can override to perform an optimized retrieval of one or more levels of parent and ancestor nodes, relative to the specified <see cref="T:System.Web.SiteMapNode"></see> object. 
+            </summary>
+            
+            <param name="upLevel">The number of ancestor <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no ancestor nodes are retrieved and -1 indicates that all ancestors might be retrieved and cached.</param>
+            <param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that acts as a reference point for upLevel.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">upLevel is less than -1.</exception>
+            <exception cref="T:System.ArgumentNullException">node is null.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.HintNeighborhoodNodes(System.Web.SiteMapNode,System.Int32,System.Int32)">
+            <summary>
+            Provides a method that site map providers can override to perform an optimized retrieval of nodes found in the proximity of the specified node. 
+            </summary>
+            
+            <param name="upLevel">The number of ancestor <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no ancestor nodes are retrieved and -1 indicates that all ancestors (and their descendant nodes to the level of node) might be retrieved and cached.</param>
+            <param name="downLevel">The number of descendant <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no descendant nodes are retrieved and -1 indicates that all descendant nodes might be retrieved and cached.</param>
+            <param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that acts as a reference point for upLevel.</param>
+            <exception cref="T:System.ArgumentOutOfRangeException">upLevel or downLevel is less than -1.</exception>
+            <exception cref="T:System.ArgumentNullException">node is null.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.SiteMapProviderAdapter.IsAccessibleToUser(System.Web.HttpContext,System.Web.SiteMapNode)">
+            <summary>
+            Retrieves a Boolean value indicating whether the specified <see cref="T:System.Web.SiteMapNode"></see> object can be viewed by the user in the specified context.
+            </summary>
+            
+            <returns>
+            true if security trimming is enabled and node can be viewed by the user or security trimming is not enabled; otherwise, false.
+            </returns>
+            
+            <param name="context">The <see cref="T:System.Web.HttpContext"></see> that contains user information.</param>
+            <param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that is requested by the user.</param>
+            <exception cref="T:System.ArgumentNullException">context is null.- or -node is null.</exception>
+        </member>
+        <member name="P:Spring.Web.Providers.SiteMapProviderAdapter.Name">
+            <summary>
+            Gets the friendly name used to refer to the provider during configuration.
+            </summary>
+            
+            <returns>
+            The friendly name used to refer to the provider during configuration.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.SiteMapProviderAdapter.Description">
+            <summary>
+            Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+            </summary>
+            
+            <returns>
+            A brief, friendly description suitable for display in administrative tools or other UIs.
+            </returns>
+                    
+        </member>
+        <member name="P:Spring.Web.Providers.SiteMapProviderAdapter.CurrentNode">
+            <summary>
+            Gets the <see cref="T:System.Web.SiteMapNode"></see> object that represents the currently requested page.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.SiteMapProviderAdapter.ParentProvider">
+            <summary>
+            Gets or sets the parent <see cref="T:System.Web.SiteMapProvider"></see> object of the current provider.
+            </summary>
+            
+            <returns>
+            The parent provider of the current <see cref="T:System.Web.SiteMapProvider"></see>.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.SiteMapProviderAdapter.RootProvider">
+            <summary>
+            Gets the root <see cref="T:System.Web.SiteMapProvider"></see> object in the current provider hierarchy.
+            </summary>
+            
+            <returns>
+            An <see cref="T:System.Web.SiteMapProvider"></see> that is the top-level site map provider in the provider hierarchy that the current provider belongs to.
+            </returns>
+            
+            <exception cref="T:System.Configuration.Provider.ProviderException">There is a circular reference to the current site map provider. </exception>
+        </member>
+        <member name="P:Spring.Web.Providers.SiteMapProviderAdapter.RootNode">
+            <summary>
+            Gets the root <see cref="T:System.Web.SiteMapNode"></see> object of the site map data that the current provider represents.
+            </summary>
+            
+            <returns>
+            The root <see cref="T:System.Web.SiteMapNode"></see> of the current site map data provider. The default implementation performs security trimming on the returned node.
+            </returns>
+            
+        </member>
+        <member name="T:Spring.Web.Providers.IRoleProvider">
+            <summary>
+            An Interface for <see cref="T:Spring.Web.Providers.RoleProviderAdapter"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+            as the Id of wrapped provider (defined in the Spring context).  
+            </p>    
+            </remarks>
+            <author>Damjan Tomic</author>
+        </member>
+        <member name="M:Spring.Web.Providers.IRoleProvider.Initialize(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Initializes the provider.
+            </summary>
+            
+            <param name="config">A collection of the name/value pairs representing the provider-specific 
+             attributes specified in the configuration for this provider.
+             The <c>providerId</c> attribute is mandatory.
+             </param>
+            <param name="name">The friendly name of the provider.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+            <exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+            <exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>      
+        </member>
+        <member name="M:Spring.Web.Providers.IRoleProvider.IsUserInRole(System.String,System.String)">
+            <summary>
+            Gets a value indicating whether the specified user is in the specified role for the configured applicationName.
+            </summary>
+            
+            <returns>
+            true if the specified user is in the specified role for the configured applicationName; otherwise, false.
+            </returns>
+            
+            <param name="username">The user name to search for.</param>
+            <param name="roleName">The role to search in.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IRoleProvider.GetRolesForUser(System.String)">
+            <summary>
+            Gets a list of the roles that a specified user is in for the configured applicationName.
+            </summary>
+            
+            <returns>
+            A string array containing the names of all the roles that the specified user is in for the configured applicationName.
+            </returns>
+            
+            <param name="username">The user to return a list of roles for.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IRoleProvider.CreateRole(System.String)">
+            <summary>
+            Adds a new role to the data source for the configured applicationName.
+            </summary>
+            
+            <param name="roleName">The name of the role to create.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IRoleProvider.DeleteRole(System.String,System.Boolean)">
+            <summary>
+            Removes a role from the data source for the configured applicationName.
+            </summary>
+            
+            <returns>
+            true if the role was successfully deleted; otherwise, false.
+            </returns>
+            
+            <param name="throwOnPopulatedRole">If true, throw an exception if roleName has one or more members and do not delete roleName.</param>
+            <param name="roleName">The name of the role to delete.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.IRoleProvider.RoleExists(System.String)">
+            <summary>
+            Gets a value indicating whether the specified role name already exists in the role data source for the configured applicationName.
+            </summary>
+            
+            <returns>
+            true if the role name already exists in the data source for the configured applicationName; otherwise, false.
+            </returns>
+            
+            <param name="roleName">The name of the role to search for in the data source. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.IRoleProvider.AddUsersToRoles(System.String[],System.String[])">
+            <summary>
+            Adds the specified user names to the specified roles for the configured applicationName.
+            </summary>
+            
+            <param name="roleNames">A string array of the role names to add the specified user names to. </param>
+            <param name="usernames">A string array of user names to be added to the specified roles. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.IRoleProvider.RemoveUsersFromRoles(System.String[],System.String[])">
+            <summary>
+            Removes the specified user names from the specified roles for the configured applicationName.
+            </summary>
+            
+            <param name="roleNames">A string array of role names to remove the specified user names from. </param>
+            <param name="usernames">A string array of user names to be removed from the specified roles. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.IRoleProvider.GetUsersInRole(System.String)">
+            <summary>
+            Gets a list of users in the specified role for the configured applicationName.
+            </summary>
+            
+            <returns>
+            A string array containing the names of all the users who are members of the specified role for the configured applicationName.
+            </returns>
+            
+            <param name="roleName">The name of the role to get the list of users for. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.IRoleProvider.GetAllRoles">
+            <summary>
+            Gets a list of all the roles for the configured applicationName.
+            </summary>
+            
+            <returns>
+            A string array containing the names of all the roles stored in the data source for the configured applicationName.
+            </returns>
+            
+        </member>
+        <member name="M:Spring.Web.Providers.IRoleProvider.FindUsersInRole(System.String,System.String)">
+            <summary>
+            Gets an array of user names in a role where the user name contains the specified user name to match.
+            </summary>
+            
+            <returns>
+            A string array containing the names of all the users where the user name matches usernameToMatch and the user is a member of the specified role.
+            </returns>
+            
+            <param name="usernameToMatch">The user name to search for.</param>
+            <param name="roleName">The role to search in.</param>
+        </member>
+        <member name="P:Spring.Web.Providers.IRoleProvider.Name">
+            <summary>
+            Gets the friendly name used to refer to the provider during configuration.
+            </summary>
+            
+            <returns>
+            The friendly name used to refer to the provider during configuration.
+            </returns>
+        </member>
+        <member name="P:Spring.Web.Providers.IRoleProvider.Description">
+            <summary>
+            Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+            </summary>
+            
+            <returns>
+            A brief, friendly description suitable for display in administrative tools or other UIs.
+            </returns>
+        </member>
+        <member name="P:Spring.Web.Providers.IRoleProvider.ApplicationName">
+            <summary>
+            Gets or sets the name of the application to store and retrieve role information for.
+            </summary>
+            
+            <returns>
+            The name of the application to store and retrieve role information for.
+            </returns>
+            
+        </member>
+        <member name="T:Spring.Web.Providers.ConfigurableSqlRoleProvider">
+            <summary>
+            A spring-configurable version of <see cref="T:System.Web.Security.SqlRoleProvider"/>
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: ConfigurableSqlRoleProvider.cs,v 1.1 2007/07/26 14:43:56 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Providers.ConfigurableSqlRoleProvider.Initialize(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Initializes the provider.
+            </summary>
+            
+            <param name="config">
+             <para>
+             A collection of the name/value pairs representing the provider-specific 
+             attributes specified in the configuration for this provider.
+             </para>
+             Values may be overridden by specifying them in <see cref="P:Spring.Web.Providers.ConfigurableSqlRoleProvider.Parameters"/> list.
+             </param>
+            <param name="name">The friendly name of the provider.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+            <exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+            <exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        </member>
+        <member name="P:Spring.Web.Providers.ConfigurableSqlRoleProvider.ConnectionStringName">
+            <summary>
+            The ConnectionString to be used
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Providers.ConfigurableSqlRoleProvider.Parameters">
+            <summary>
+            A collection of the name/value pairs representing the provider-specific
+            attributes specified in the configuration for this provider.
+            </summary> 
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.WebObjectFactory">
+            <summary>
+            Concrete implementation of
+            <see cref="T:Spring.Objects.Factory.IListableObjectFactory"/> that knows 
+            how to handle <see cref="T:Spring.Objects.Factory.Support.IWebObjectDefinition"/>s.
+            </summary>
+            <remarks>
+            <p>
+            This class should only be used within the context of an ASP.NET web application.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: WebObjectFactory.cs,v 1.9 2007/12/16 12:43:48 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Objects.Factory.Support.WebObjectFactory.contextPath">
+            <summary>
+            Holds the virtual path this factory has been created from.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectFactory.EnsureEventHandlersRegistered">
+            <summary>
+            Registers events handlers with <see cref="T:Spring.Context.Support.WebSupportModule"/> to ensure
+            proper disposal of 'request'- and 'session'-scoped objects
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectFactory.#ctor(System.String,System.Boolean)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.WebObjectFactory"/> class.
+            </summary>
+            <param name="contextPath">The virtual path resources will be relative resolved to.</param>
+            <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectFactory.#ctor(System.String,System.Boolean,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.WebObjectFactory"/> class.
+            </summary>
+            <param name="contextPath">The virtual path resources will be relative resolved to.</param>
+            <param name="caseSensitive">Flag specifying whether to make this object factory case sensitive or not.</param>
+            <param name="parentFactory">
+            The parent object factory.
+            </param>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectFactory.CreateRootObjectDefinition(Spring.Objects.Factory.Config.IObjectDefinition)">
+            <summary>
+            Creates the root object definition.
+            </summary>
+            <param name="templateDefinition">The template definition.</param>
+            <returns>Root object definition.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectFactory.GetSingleton(System.String)">
+            <summary>
+            Tries to find cached object for the specified name. 
+            </summary>
+            <remarks>
+            This implementation tries to find object first in the Request scope,
+            then in the Session scope and finally in the Application scope.
+            </remarks>
+            <param name="objectName">Object name to look for.</param>
+            <returns>Cached object if found, null otherwise.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectFactory.CreateAndCacheSingletonInstance(System.String,Spring.Objects.Factory.Support.RootObjectDefinition,System.Object[])">
+            <summary>
+            Creates a singleton instance for the specified object name and definition.
+            </summary>
+            <param name="objectName">
+            The object name (will be used as the key in the singleton cache key).
+            </param>
+            <param name="objectDefinition">The object definition.</param>
+            <param name="arguments">
+            The arguments to use if creating a prototype using explicit arguments to
+            a static factory method. It is invalid to use a non-null arguments value
+            in any other case.
+            </param>
+            <returns>The created object instance.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectFactory.GetObjectKey(System.String)">
+            <summary>
+            Creates hopefully unique key for the scope based on object name.
+            </summary>
+            <param name="name">Object name.</param>
+            <returns>Generated key.</returns>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectFactory.ConfigureObject(System.Object,System.String)">
+            <summary>
+            Injects dependencies into the supplied <paramref name="target"/> instance
+            using the named object definition.
+            </summary>
+            <param name="target">
+            The object instance that is to be so configured.
+            </param>
+            <param name="name">
+            The name of the object definition expressing the dependencies that are to
+            be injected into the supplied <parameref name="target"/> instance.
+            </param>
+            <seealso cref="M:Spring.Objects.Factory.IObjectFactory.ConfigureObject(System.Object,System.String)"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectFactory.OnEndRequest(System.Web.HttpContext)">
+            <summary>
+            Disposes all 'request'-scoped objects at the end of each Request
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebObjectFactory.OnEndSession(System.Web.SessionState.HttpSessionState,System.Web.Caching.CacheItemRemovedReason)">
+            <summary>
+            Disposes all 'session'-scoped objects at the end of a session
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.WebObjectFactory.Context">
+            <summary>
+            Convinience accessor for HttpContext
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.WebObjectFactory.Request">
+            <summary>
+            Get the table of 'request'-scoped objects.
+            </summary>
+        </member>
+        <member name="P:Spring.Objects.Factory.Support.WebObjectFactory.Session">
+            <summary>
+            Get the table of 'session'-scoped objects. Returns null, if Session is disabled.
+            </summary>
+        </member>
+        <member name="T:Spring.Globalization.Resolvers.CookieCultureResolver">
+            <summary>
+            Culture resolver that uses cookie to store culture information.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CookieCultureResolver.cs,v 1.4 2007/08/25 14:26:35 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.CookieCultureResolver.ResolveCulture">
+            <summary>
+            Resolves the culture from the request.
+            </summary>
+            <remarks>
+            If the culture cookie doesn't exist, this method will return 
+            the value of the 'Accept-Language' request header, or if no
+            headers are specified, the culture of the current server thread.
+            </remarks>
+            <returns>Culture that should be used to render view.</returns>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.CookieCultureResolver.SetCulture(System.Globalization.CultureInfo)">
+            <summary>
+            Sets the culture.
+            </summary>
+            <param name="culture">The new culture or <code>null</code> to clear the culture.</param>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.CookieCultureResolver.CreateCookie(System.Globalization.CultureInfo)">
+            <summary>
+            Creates cookie for the specified culture.
+            </summary>
+            <param name="culture">Culture to store in a cookie.</param>
+            <returns>Created cookie.</returns>
+        </member>
+        <member name="T:Spring.DataBinding.MultipleSelectionListControlBinding">
+            <summary>
+             Handles binding of a multiple selection ListControl to a target's IList property.
+            </summary>
+        </member>
+        <member name="M:Spring.DataBinding.MultipleSelectionListControlBinding.#ctor(System.String,System.String,Spring.DataBinding.BindingDirection,Spring.Globalization.IFormatter)">
+            <summary>
+             Creates a new instance of this binding.
+            </summary>
+            <param name="sourceExpression">The expression that will evaluate to the <see cref="T:System.Web.UI.WebControls.ListControl"/> acting as the source</param>
+            <param name="targetExpression">The expression that will evaluate to an <see cref="T:System.Collections.IList"/> property acting as the target</param>
+             <param name="direction">Binding's direction</param>
+            <param name="itemFormatter">An optional formatter converting target items into <see cref="P:System.Web.UI.WebControls.ListItem.Value"/> and back</param>
+             <remarks>
+             If no formatter is specified, a <see cref="T:Spring.DataBinding.DataSourceItemFormatter"/> will be used.
+             </remarks>
+        </member>
+        <member name="M:Spring.DataBinding.MultipleSelectionListControlBinding.DoBindSourceToTarget(System.Object,System.Object,System.Collections.IDictionary)">
+            <summary>
+            Actually performs unbinding the ListControl's selected values into the target's <see cref="T:System.Collections.IList"/>
+            </summary>
+        </member>
+        <member name="M:Spring.DataBinding.MultipleSelectionListControlBinding.DoBindTargetToSource(System.Object,System.Object,System.Collections.IDictionary)">
+            <summary>
+            Actually performs binding the targetlist to the ListControl.
+            </summary>
+        </member>
+        <member name="M:Spring.DataBinding.MultipleSelectionListControlBinding.SetSourceValue(System.Object,System.Object,System.Collections.IDictionary)">
+            <summary>
+            Setting source value is not allowed in this bindingType.
+            </summary>
+        </member>
+        <member name="M:Spring.DataBinding.MultipleSelectionListControlBinding.SetTargetValue(System.Object,System.Object,System.Collections.IDictionary)">
+            <summary>
+            Setting target value is not allowed in this bindingType.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.Page">
+            <summary>
+            Represents an .aspx file, also known as a Web Forms page, requested from a
+            server that hosts an ASP.NET Web application.
+            </summary>
+            <remarks>
+            <p>
+            The <b>Page</b> class is associated with files that have an .aspx extension.
+            These files are compiled at run time as Page objects and cached in server memory.
+            </p>
+            <p>
+            This class extends <see cref="T:System.Web.UI.Page"/> and adds support for master
+            pages similar to upcoming ASP.Net 2.0 master pages feature.
+            </p>
+            <p>
+            It also adds support for automatic localization using local page resource file, and
+            simplifies access to global resources (resources from the message source for the
+            application context).
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: Page.cs,v 1.89 2008/04/03 04:32:29 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Page.OnPreInit(System.EventArgs)">
+            <summary>
+            Initializes Spring.NET page internals and raises the PreInit event.
+            </summary>
+            <param name="e">The <see cref="T:System.EventArgs"/> instance containing the event data.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.InitializeCulture">
+            <summary>
+            Initializes the culture.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.OnInit(System.EventArgs)">
+            <summary>
+            Initializes data model and controls.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.OnPreLoadViewState(System.EventArgs)">
+            <summary>
+            Raises the <see cref="E:Spring.Web.UI.Page.PreLoadViewState"/> event after page initialization.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.RaisePreLoadViewStateEvent">
+            <summary>
+            Raises the PreLoadViewState event for
+            this page and all contained controls.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.PreLoadViewStateRecursive(System.Web.UI.ControlCollection)">
+            <summary>
+            Recursively raises PreLoadViewState event.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.LoadPageStateFromPersistenceMedium">
+            <summary>
+            Overridden to add support for <see cref="E:Spring.Web.UI.Page.PreLoadViewState"/>
+            </summary>
+            <remarks>
+            If necessary override <see cref="M:Spring.Web.UI.Page.LoadPageStateFromPersistenceMediumBase"/> instead of this method.
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.UI.Page.BindFormDataIfNecessary">
+            <summary>
+            If ViewState is disabled, calls <see cref="M:Spring.Web.UI.Page.BindFormData"/> recursively for all controls.
+            </summary>
+            <remarks>
+            If ViewState is disabled, DropDownLists etc. might not fire "Changed" events.
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.UI.Page.BindFormDataRecursive">
+            <summary>
+            Calls <see cref="M:Spring.Web.UI.Page.BindFormData"/> recursively for all controls.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.BindFormDataRecursive(System.Web.UI.ControlCollection)">
+            <summary>
+            Recursively calls <see cref="M:Spring.Web.UI.Page.BindFormData"/> for all controls.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.LoadPageStateFromPersistenceMediumBase">
+            <summary>
+            If necessary override this method instead of <see cref="M:Spring.Web.UI.Page.LoadPageStateFromPersistenceMedium"/>
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.OnLoad(System.EventArgs)">
+            <summary>
+            Initializes dialog result and unbinds data from the controls
+            into a data model.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.OnPreRender(System.EventArgs)">
+            <summary>
+            Binds data from the data model into controls and raises
+            PreRender event afterwards.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.OnInitializeControls(System.EventArgs)">
+            <summary>
+            Raises InitializeControls event.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.LoadControl(System.String)">
+            <summary>
+            Obtains a <see cref="T:System.Web.UI.UserControl"/> object from a user control file
+            and injects dependencies according to Spring config file.
+            </summary>
+            <param name="virtualPath">The virtual path to a user control file.</param>
+            <returns>
+            Returns the specified <see langword="UserControl"/> object, with dependencies injected.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.LoadControl(System.Type,System.Object[])">
+            <summary>
+            Obtains a <see cref="T:System.Web.UI.UserControl"/> object by type
+            and injects dependencies according to Spring config file.
+            </summary>
+            <param name="t">The type of a user control.</param>
+            <param name="parameters">parameters to pass to the control</param>
+            <returns>
+            Returns the specified <see langword="UserControl"/> object, with dependencies injected.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.InitializeModel">
+            <summary>
+            Initializes data model when the page is first loaded.
+            </summary>
+            <remarks>
+            This method should be overriden by the developer
+            in order to initialize data model for the page.
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.UI.Page.LoadModelFromPersistenceMedium">
+            <summary>
+            Retrieves data model from a persistence store.
+            </summary>
+            <remarks>
+            The default implementation uses <see cref="P:System.Web.UI.Page.Session"/> to store and retrieve
+            the model for the current <see cref="P:System.Web.HttpRequest.CurrentExecutionFilePath"/>
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.UI.Page.SaveModelToPersistenceMedium(System.Object)">
+            <summary>
+            Saves data model to a persistence store.
+            </summary>
+            <remarks>
+            The default implementation uses <see cref="P:System.Web.UI.Page.Session"/> to store and retrieve
+            the model for the current <see cref="P:System.Web.HttpRequest.CurrentExecutionFilePath"/>
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.UI.Page.LoadModel(System.Object)">
+            <summary>
+            Loads the saved data model on postback.
+            </summary>
+            <remarks>
+            This method should be overriden by the developer
+            in order to load data model for the page.
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.UI.Page.SaveModel">
+            <summary>
+            Returns a model object that should be saved.
+            </summary>
+            <remarks>
+            This method should be overriden by the developer
+            in order to save data model for the page.
+            </remarks>
+            <returns>
+            A model object that should be saved.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.SetController(System.Object)">
+            <summary>
+            <para>Stores the controller to be returned by <see cref="P:Spring.Web.UI.Page.Controller"/> property.</para>
+            </summary>
+            <remarks>
+            The default implementation uses a field to store the reference. Derived classes may override this behaviour
+            but must ensure to also change the behaviour of <see cref="M:Spring.Web.UI.Page.GetController"/> accordingly.
+            </remarks>
+            <param name="controller">Controller for the page.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.GetController">
+            <summary>
+            <para>Returns the controller stored by <see cref="M:Spring.Web.UI.Page.SetController(System.Object)"/>.</para>
+            </summary>
+            <remarks>
+            The default implementation uses a field to retrieve the reference. Derived classes may override this behaviour
+            but must ensure to also change the behaviour of <see cref="M:Spring.Web.UI.Page.SetController(System.Object)"/> accordingly.
+            </remarks>
+            <returns>
+            The controller for this page.
+            <list type="bullet">
+            <item>If this page is being part of a process, the process' <see cref="P:Spring.Web.Process.IProcess.Controller"/> is returned.</item>
+            <item>If no controller is set, a reference to the page itself is returned.</item>
+            </list>
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.RegisterStyle(System.String,System.String)">
+            <summary>
+            Registers single CSS style with the page.
+            </summary>
+            <param name="name">Style name.</param>
+            <param name="style">Style definition.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.IsStyleRegistered(System.String)">
+            <summary>
+            Returns <c>True</c> if specified style is registered, <c>False</c> otherwise.
+            </summary>
+            <param name="name">Style name.</param>
+            <returns><c>True</c> if specified style is registered, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.RegisterStyleFile(System.String,System.String)">
+            <summary>
+            Registers CSS file with the page.
+            </summary>
+            <param name="key">Style file key.</param>
+            <param name="fileName">Style file name.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.IsStyleFileRegistered(System.String)">
+            <summary>
+            Returns <c>True</c> if specified style file is registered, <c>False</c> otherwise.
+            </summary>
+            <param name="key">Style file key.</param>
+            <returns><c>True</c> if specified style file is registered, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.RegisterHeadScriptBlock(System.String,System.String)">
+            <summary>
+            Registers script block that should be rendered within the <c>head</c> HTML element.
+            </summary>
+            <param name="key">Script key.</param>
+            <param name="script">Script text.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.RegisterHeadScriptBlock(System.String,System.String,System.String)">
+            <summary>
+            Registers script block that should be rendered within the <c>head</c> HTML element.
+            </summary>
+            <param name="key">Script key.</param>
+            <param name="language">Script language.</param>
+            <param name="script">Script text.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.RegisterHeadScriptBlock(System.String,Spring.Web.Support.MimeMediaType,System.String)">
+            <summary>
+            Registers script block that should be rendered within the <c>head</c> HTML element.
+            </summary>
+            <param name="key">Script key.</param>
+            <param name="type">Script language MIME type.</param>
+            <param name="script">Script text.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.RegisterHeadScriptFile(System.String,System.String)">
+            <summary>
+            Registers script file that should be referenced within the <c>head</c> HTML element.
+            </summary>
+            <param name="key">Script key.</param>
+            <param name="fileName">Script file name.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.RegisterHeadScriptFile(System.String,System.String,System.String)">
+            <summary>
+            Registers script file that should be referenced within the <c>head</c> HTML element.
+            </summary>
+            <param name="key">Script key.</param>
+            <param name="language">Script language.</param>
+            <param name="fileName">Script file name.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.RegisterHeadScriptFile(System.String,Spring.Web.Support.MimeMediaType,System.String)">
+            <summary>
+            Registers script file that should be referenced within the <c>head</c> HTML element.
+            </summary>
+            <param name="key">Script key.</param>
+            <param name="type">Script language MIME type.</param>
+            <param name="fileName">Script file name.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.RegisterHeadScriptEvent(System.String,System.String,System.String,System.String)">
+            <summary>
+            Registers script block that should be rendered within the <c>head</c> HTML element.
+            </summary>
+            <param name="key">Script key.</param>
+            <param name="element">Element ID of the event source.</param>
+            <param name="eventName">Name of the event to handle.</param>
+            <param name="script">Script text.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.RegisterHeadScriptEvent(System.String,System.String,System.String,System.String,System.String)">
+            <summary>
+            Registers script block that should be rendered within the <c>head</c> HTML element.
+            </summary>
+            <param name="key">Script key.</param>
+            <param name="language">Script language.</param>
+            <param name="element">Element ID of the event source.</param>
+            <param name="eventName">Name of the event to handle.</param>
+            <param name="script">Script text.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.RegisterHeadScriptEvent(System.String,Spring.Web.Support.MimeMediaType,System.String,System.String,System.String)">
+            <summary>
+            Registers script block that should be rendered within the <c>head</c> HTML element.
+            </summary>
+            <param name="key">Script key.</param>
+            <param name="mimeType">The scripting language's MIME type.</param>
+            <param name="element">Element ID of the event source.</param>
+            <param name="eventName">Name of the event to handle.</param>
+            <param name="script">Script text.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.IsHeadScriptRegistered(System.String)">
+            <summary>
+            Returns <c>True</c> if specified head script is registered, <c>False</c> otherwise.
+            </summary>
+            <param name="key">Script key.</param>
+            <returns><c>True</c> if specified head script is registered, <c>False</c> otherwise.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.SetResult(System.String)">
+            <summary>
+            Redirects user to a URL mapped to specified result name.
+            </summary>
+            <param name="resultName">Result name.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.SetResult(System.String,System.Object)">
+            <summary>
+            Redirects user to a URL mapped to specified result name.
+            </summary>
+            <param name="resultName">Name of the result.</param>
+            <param name="context">The context to use for evaluating the SpEL expression in the Result.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.GetResultUrl(System.String)">
+            <summary>
+            Returns a redirect url string that points to the 
+            <see cref="P:Spring.Web.Support.Result.TargetPage"/> defined by this
+            result evaluated using this Page for expression 
+            </summary>
+            <param name="resultName">Name of the result.</param>
+            <returns>A redirect url string.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.GetResultUrl(System.String,System.Object)">
+            <summary>
+            Returns a redirect url string that points to the 
+            <see cref="P:Spring.Web.Support.Result.TargetPage"/> defined by this
+            result evaluated using this Page for expression 
+            </summary>
+            <param name="resultName">Name of the result.</param>
+            <param name="context">The context to use for evaluating the SpEL expression in the Result</param>
+            <returns>A redirect url string.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.Validate(System.Object,Spring.Validation.IValidator[])">
+            <summary>
+            Evaluates specified validators and returns <c>True</c> if all of them are valid.
+            </summary>
+            <remarks>
+            <p>
+            Each validator can itself represent a collection of other validators if it is
+            an instance of <see cref="T:Spring.Validation.ValidatorGroup"/> or one of its derived types.
+            </p>
+            <p>
+            Please see the Validation Framework section in the documentation for more info.
+            </p>
+            </remarks>
+            <param name="validationContext">Object to validate.</param>
+            <param name="validators">Validators to evaluate.</param>
+            <returns>
+            <c>True</c> if all of the specified validators are valid, <c>False</c> otherwise.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.CreateValidatorParameters">
+            <summary>
+            Creates the validator parameters.
+            </summary>
+            <remarks>
+            <para>
+            This method can be overriden if you want to pass additional parameters
+            to the validation framework, but you should make sure that you call
+            this base implementation in order to add page, session, application,
+            request, response and context to the variables collection.
+            </para>
+            </remarks>
+            <returns>
+            Dictionary containing parameters that should be passed to
+            the data validation framework.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.InitializeDataBindings">
+            <summary>
+            Initializes the data bindings.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.GetBindingManagerKey">
+            <summary>
+            Returns the key to be used for looking up a cached
+            BindingManager instance in <see cref="P:Spring.Web.UI.Page.SharedState"/>.
+            </summary>
+            <returns>a unique key identifying the <see cref="T:Spring.DataBinding.IBindingContainer"/> instance in the <see cref="P:Spring.Web.UI.Page.SharedState"/> dictionary.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.CreateBindingManager">
+             <summary>
+             Creates a new <see cref="T:Spring.DataBinding.IBindingContainer"/> instance.
+             </summary>
+             <remarks>
+             This factory method is called if no <see cref="T:Spring.DataBinding.IBindingContainer"/> could be found in <see cref="P:Spring.Web.UI.Page.SharedState"/>
+             using the key returned by <see cref="M:Spring.Web.UI.Page.GetBindingManagerKey"/>.<br/>
+             <br/>
+            
+             </remarks>
+             <returns>a <see cref="T:Spring.DataBinding.IBindingContainer"/> instance to be used for DataBinding</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.InitializeBindingManager">
+            <summary>
+            Initializes binding manager and data bindings if necessary.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.OnDataBindingsInitialized(System.EventArgs)">
+            <summary>
+            Raises the <see cref="E:Spring.Web.UI.Page.DataBindingsInitialized"/> event.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.BindFormData">
+            <summary>
+            Bind data from model to form.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.UnbindFormData">
+            <summary>
+            Unbind data from form to model.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.OnDataBound(System.EventArgs)">
+            <summary>
+            Raises DataBound event.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.OnDataUnbound(System.EventArgs)">
+            <summary>
+            Raises DataBound event.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.InitializeMessageSource">
+            <summary>
+            Initializes local message source
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Page.GetLocalResourceManager">
+            <summary>
+            Creates and returns local ResourceManager for this page.
+            </summary>
+            <remarks>
+            <para>
+            In ASP.NET 1.1, this method loads local resources from the web application assembly.
+            </para>
+            <para>
+            However, in ASP.NET 2.0, local resources are compiled into a dynamic assembly,
+            so we need to find that assembly and load the resources from it.
+            </para>
+            </remarks>
+            <returns>Local ResourceManager instance.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.GetMessage(System.String)">
+            <summary>
+            Returns message for the specified resource name.
+            </summary>
+            <param name="name">Resource name.</param>
+            <returns>Message text.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.GetMessage(System.String,System.Object[])">
+            <summary>
+            Returns message for the specified resource name.
+            </summary>
+            <param name="name">Resource name.</param>
+            <param name="args">Message arguments that will be used to format return value.</param>
+            <returns>Formatted message text.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.GetResourceObject(System.String)">
+            <summary>
+            Returns resource object for the specified resource name.
+            </summary>
+            <param name="name">Resource name.</param>
+            <returns>Resource object.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.OnUserCultureChanged(System.EventArgs)">
+            <summary>
+            Raises UserLocaleChanged event.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Page.CreateSharedStateKey(System.String)">
+            <summary>
+            Creates a key for shared state, taking into account whether
+            this page belongs to a process or not.
+            </summary>
+            <param name="key">Key suffix</param>
+            <returns>Generated unique shared state key.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Page.AddedControl(System.Web.UI.Control,System.Int32)">
+            <summary>
+            Injects dependencies into control before adding it.
+            </summary>
+        </member>
+        <member name="E:Spring.Web.UI.Page.PreLoadViewState">
+            <summary>
+            PreLoadViewState event.
+            </summary>
+            <remarks>
+            <para>
+            This event is raised if <see cref="P:System.Web.UI.Page.IsPostBack"/> is true
+            immediately before state is restored from ViewState.
+            </para>
+            <para>
+            NOTE: Different from <see cref="M:System.Web.UI.Control.LoadViewState(System.Object)"/>, this event
+            will also be raised if the control has no ViewState or ViewState is disabled.
+            </para>
+            </remarks>
+        </member>
+        <member name="E:Spring.Web.UI.Page.InitializeControls">
+            <summary>
+            This event is raised before Init event and should be used to initialize
+            controls as necessary.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Page.Process">
+            <summary>
+            Gets or sets the process that this page belongs to.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Page.Controller">
+            <summary>
+            Gets or sets controller for the page.
+            </summary>
+            <remarks>
+            <para>
+            Application pages should shadow this property and change its type
+            in order to make calls to controller within the page as simple as possible.
+            </para>
+            <para>
+            If external controller is not specified, page will serve as its own controller,
+            which will allow data binding to work properly.
+            </para>
+            </remarks>
+            <value>Controller for the page. Defaults to the page itself.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Page.SharedState">
+            <summary>
+            Returns a thread-safe dictionary that contains state that is shared by
+            all instances of this page.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Page.PreviousPage">
+            <summary>
+            Overrides the default PreviousPage property to return an instance of <see cref="T:Spring.Web.UI.Page"/>,
+            and to work properly during server-side transfers and executes.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Page.Master">
+            <summary>
+            Gets the master page that determines the overall look of the page.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Page.HasMaster">
+            <summary>
+            Returns true if page uses master page, false otherwise.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Page.Styles">
+            <summary>
+            Gets a dictionary of registered styles.
+            </summary>
+            <value>Registered styles.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Page.StyleFiles">
+            <summary>
+            Gets a dictionary of registered style files.
+            </summary>
+            <value>Registered style files.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Page.HeadScripts">
+            <summary>
+            Gets a dictionary of registered head scripts.
+            </summary>
+            <value>Registered head scripts.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Page.CssRoot">
+            <summary>
+            Gets or sets the CSS root.
+            </summary>
+            <value>The CSS root.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Page.ScriptsRoot">
+            <summary>
+            Gets or sets the scripts root.
+            </summary>
+            <value>The scripts root.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Page.ImagesRoot">
+            <summary>
+            Gets or sets the images root.
+            </summary>
+            <value>The images root.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Page.Results">
+            <summary>
+            Gets or sets map of result names to target URLs
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Page.ValidationErrors">
+            <summary>
+            Gets the validation errors container.
+            </summary>
+            <value>The validation errors container.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Page.Spring#DataBinding#IDataBound#BindingManager">
+            <summary>
+            Expose BindingManager via IDataBound interface
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Page.BindingManager">
+            <summary>
+            Gets the binding manager.
+            </summary>
+            <value>The binding manager.</value>
+        </member>
+        <member name="E:Spring.Web.UI.Page.DataBindingsInitialized">
+            <summary>
+            This event is raised after <see cref="P:Spring.Web.UI.Page.BindingManager"/> as been initialized.
+            </summary>
+        </member>
+        <member name="E:Spring.Web.UI.Page.DataBound">
+            <summary>
+            This event is raised after all controls have been populated with values
+            from the data model.
+            </summary>
+        </member>
+        <member name="E:Spring.Web.UI.Page.DataUnbound">
+            <summary>
+            This event is raised after data model has been populated with values from
+            web controls.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Page.ApplicationContext">
+            <summary>
+            Gets or sets Spring application context of the page.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Page.Localizer">
+            <summary>
+            Gets or sets the localizer.
+            </summary>
+            <value>The localizer.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Page.CultureResolver">
+            <summary>
+            Gets or sets the culture resolver.
+            </summary>
+            <value>The culture resolver.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Page.MessageSource">
+            <summary>
+            Gets or sets the local message source.
+            </summary>
+            <value>The local message source.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Page.UserCulture">
+            <summary>
+            Gets or sets user's culture
+            </summary>
+        </member>
+        <member name="E:Spring.Web.UI.Page.UserCultureChanged">
+            <summary>
+            This event is raised when the value of UserLocale property changes.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Page.Spring#Web#Support#ISupportsWebDependencyInjection#DefaultApplicationContext">
+            <summary>
+            Holds default ApplicationContext instance to be used during DI.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.SupportsWebDependencyInjectionMethodBuilder">
+            <summary>
+            This MethodBuilder emits a Callback-call before calling the base method
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: SupportsWebDependencyInjectionMethodBuilder.cs,v 1.1 2007/08/01 23:11:01 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Support.SupportsWebDependencyInjectionMethodBuilder.#ctor(System.Reflection.Emit.TypeBuilder,Spring.Proxy.IProxyTypeGenerator,System.Reflection.FieldInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Initializes a new instance of a SupportsWebDependencyInjectionMethodBuilder
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.SupportsWebDependencyInjectionMethodBuilder.GenerateMethod(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Inserts a call to a callback-method before actually calling the base-method.
+            </summary>
+            <param name="il">The IL generator to use</param>
+            <param name="method">The method to proxy</param>
+            <param name="interfaceMethod">The interface definition of this method, if applicable</param>
+        </member>
+        <member name="M:Spring.Web.Support.SupportsWebDependencyInjectionMethodBuilder.GenerateCallbackMethodCall(System.Reflection.Emit.ILGenerator,System.Reflection.MethodInfo,System.Reflection.MethodInfo)">
+            <summary>
+            Emits the callback invocation.
+            </summary>
+        </member>
+        <member name="T:Spring.Util.ControlAccessor">
+            <summary>
+            Helper class for easier access to reflected Control members.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: ControlAccessor.cs,v 1.2 2008/05/13 14:22:47 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Util.ControlAccessor.#ctor(System.Web.UI.Control)">
+            <summary>
+            Instantiates a new Accessor.
+            </summary>
+            <param name="control"></param>
+        </member>
+        <member name="M:Spring.Util.ControlAccessor.GetTarget">
+            <summary>
+            Returns the underlying ControlCollection instance.
+            </summary>
+        </member>
+        <member name="P:Spring.Util.ControlAccessor.Controls">
+            <summary>
+            Gets or sets the ControlCollection of the target without accessing the target's <see cref="P:System.Web.UI.Control.Controls"/> property.
+            </summary>
+            <remarks>
+            If the underlying collection is null, it is automatically created.
+            </remarks>
+        </member>
+        <member name="T:Spring.Threading.HttpContextStorage">
+            <summary>
+            Implements <see cref="T:Spring.Threading.IThreadStorage"/> by using <see cref="T:System.Web.HttpContext"/>.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: HttpContextStorage.cs,v 1.1 2007/02/02 21:31:25 oakinger Exp $</version>  
+        </member>
+        <member name="M:Spring.Threading.HttpContextStorage.GetData(System.String)">
+            <summary>
+            Retrieves an object with the specified name.
+            </summary>
+            <param name="name">The name of the item.</param>
+            <returns>The object in the context associated with the specified name or null if no object has been stored previously</returns>
+        </member>
+        <member name="M:Spring.Threading.HttpContextStorage.SetData(System.String,System.Object)">
+            <summary>
+            Stores a given object and associates it with the specified name.
+            </summary>
+            <param name="name">The name with which to associate the new item.</param>
+            <param name="value">The object to store in the call context.</param>
+        </member>
+        <member name="M:Spring.Threading.HttpContextStorage.FreeNamedDataSlot(System.String)">
+            <summary>
+            Empties a data slot with the specified name.
+            </summary>
+            <param name="name">The name of the data slot to empty.</param>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.ValidationSummary">
+            <summary>
+            This control should be used instead of standard ValidationSummary control
+            to display validation errors identified by the Spring.NET validation framework.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <author>Jonathan Allenby</author>
+            <version>$Id: ValidationSummary.cs,v 1.11 2008/03/19 12:07:14 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.ValidationSummary.CreateValidationErrorsRenderer">
+            <summary>
+            Create the default <see cref="T:Spring.Web.UI.Validation.DivValidationErrorsRenderer"/> 
+            for this ValidationControl if none is configured.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.TabularViewCollection">
+            <summary>
+            Holds the collection of <see cref="T:Spring.Web.UI.Controls.TabularView"/> controls in a <see cref="T:Spring.Web.UI.Controls.TabularMultiView"/>.
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: TabularViewCollection.cs,v 1.1 2007/07/24 13:33:28 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabularViewCollection.#ctor(System.Web.UI.Control)">
+            <summary>
+            Initialize a new instance.
+            </summary>
+            <param name="owner"></param>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabularViewCollection.Add(System.Web.UI.Control)">
+            <summary>
+            Add the specified <see cref="T:Spring.Web.UI.Controls.TabularView"/> control to the collection.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabularViewCollection.AddAt(System.Int32,System.Web.UI.Control)">
+            <summary>
+            Add the specified <see cref="T:Spring.Web.UI.Controls.TabularView"/> control to the collection.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.TabularViewCollection.Item(System.Int32)">
+            <summary>
+            Obtain the specified <see cref="T:Spring.Web.UI.Controls.TabularView"/> control from the collection.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.TabContainer">
+            <summary>
+            This control is responsible for rendering tabs.
+            </summary>
+            <remarks>
+            By default, this TabContainer implementation uses <see cref="T:System.Web.UI.WebControls.LinkButton"/> controls to 
+            render tabs. Override <see cref="M:Spring.Web.UI.Controls.TabContainer.CreateTab(Spring.Web.UI.Controls.TabularMultiView,Spring.Web.UI.Controls.TabularView,System.Int32)"/> to change this behaviour.
+            </remarks>
+            <author>Erich Eichinger</author>
+            <version>$Id: TabContainer.cs,v 1.1 2007/07/24 13:33:28 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Web.UI.Controls.TabContainer.SelectTabCommandName">
+            <summary>
+            Represents the command name of the tab to be selected.
+            </summary>
+        </member>
+        <member name="F:Spring.Web.UI.Controls.TabContainer._eventClick">
+            <summary>
+            Key into the eventhandler table.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabContainer.OnBubbleEvent(System.Object,System.EventArgs)">
+            <summary>
+            Catches <see cref="T:System.Web.UI.WebControls.CommandEventArgs"/> with name '<see cref="F:Spring.Web.UI.Controls.TabContainer.SelectTabCommandName"/>' and 
+            raises the <see cref="E:Spring.Web.UI.Controls.TabContainer.Click"/> event.
+            </summary>
+            <param name="source">The source of the event.</param>
+            <param name="args">contains event information.</param>
+            <returns></returns>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabContainer.OnTabClickedCommand(System.Object,System.Web.UI.WebControls.CommandEventArgs)">
+            <summary>
+            Raises the <see cref="E:Spring.Web.UI.Controls.TabContainer.Click"/> event.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.TabContainer.CreateTab(Spring.Web.UI.Controls.TabularMultiView,Spring.Web.UI.Controls.TabularView,System.Int32)">
+            <summary>
+            Creates a new tab for the specified <c>view</c> within the given <c>container</c>.
+            </summary>
+            <param name="container">The <see cref="T:Spring.Web.UI.Controls.TabularMultiView"/> containing the <c>view</c></param>
+            <param name="view">The <see cref="T:Spring.Web.UI.Controls.TabularView"/> for which a new tab is to be created.</param>
+            <param name="index">The index of the tab to be created.</param>
+            <remarks>
+            By default, <see cref="T:System.Web.UI.WebControls.LinkButton"/> controls are used for rendering tabs. Override this method to
+            change this behaviour.
+            </remarks>
+        </member>
+        <member name="E:Spring.Web.UI.Controls.TabContainer.Click">
+            <summary>
+            Occurs, when a tab control is clicked.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.Form">
+            <summary>
+            This control allows for suppressing output of the 'action' attribute.
+            </summary>
+            <remarks>
+            the 'action' attribute rendered by the default <see cref="T:System.Web.UI.HtmlControls.HtmlForm"/> control causes troubles 
+            in case of URL-rewriting. See e.g. <a href="http://www.thescripts.com/forum/thread408777.html">'thescripts.com' forum</a>
+            and also <a href="http://opensource.atlassian.com/projects/spring/browse/SPRNET-560">JIRA SPRNET-560</a> for more info.
+            </remarks>
+            <author>Erich Eichinger</author>
+            <version>$Id: Form.cs,v 1.1 2007/07/24 14:32:58 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.Form.RenderAttributes(System.Web.UI.HtmlTextWriter)">
+            <summary>
+            Renders attributes but performs 'action' suppressing logic.
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.Form.SuppressAction">
+            <summary>
+            Sets or Gets a value indicating if the 'action' attribute shall be rendered. Defaults to 'false'
+            </summary>
+            <remarks>
+            The following possibilites are available:
+            <list>
+            <item>If <see cref="P:Spring.Web.UI.Controls.Form.SuppressAction"/> is 'true', rendering of the 'action' attribute is suppressed.</item>
+            <item>If <see cref="P:Spring.Web.UI.Controls.Form.SuppressAction"/> is 'false' and <see cref="P:Spring.Web.UI.Controls.Form.Action"/> is not set,
+                  'action' attribute will.be rendered to <see cref="P:System.Web.HttpRequest.RawUrl"/>
+            </item>
+            <item>If <see cref="P:Spring.Web.UI.Controls.Form.SuppressAction"/> is 'false' and <see cref="P:Spring.Web.UI.Controls.Form.Action"/> is set,
+                  'action' attribute will.be rendered to <see cref="P:Spring.Web.UI.Controls.Form.Action"/>
+            </item>
+            </list>
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.Form.Action">
+            <summary>
+            Sets or Gets an explicit url to be rendered
+            </summary>
+            <remarks>
+            The url specified here is only rendered, if <see cref="P:Spring.Web.UI.Controls.Form.SuppressAction"/> is true.
+            </remarks>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.Form.ActionSupressingHtmlTextWriter">
+            <summary>
+            This wrapper suppresses output of 'action' attributes.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.WebDependencyInjectionUtils">
+             <summary>
+             This is 
+             </summary>
+             <remarks>
+            
+             </remarks>
+             <author>Mark Pollack</author>
+             <version>$Id: WebDependencyInjectionUtils.cs,v 1.3 2008/05/13 14:22:47 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Support.WebDependencyInjectionUtils.InjectDependenciesRecursive(Spring.Context.IApplicationContext,System.Web.UI.Control)">
+            <summary>
+            Injects dependencies into all controls in the hierarchy 
+            based on template definitions in the Spring config file.
+            </summary>
+            <param name="applicationContext">ApplicationContext to be used</param>
+            <param name="control">Control to inject dependencies into.</param>
+        </member>
+        <member name="M:Spring.Web.Support.WebDependencyInjectionUtils.GetControlApplicationContext(Spring.Context.IApplicationContext,System.Web.UI.Control)">
+            <summary>
+            Aquires an ApplicationContext according to a Control's TemplateSourceDirectory
+            </summary>
+            <returns>if availabe, the control's IApplicationContext instance - defaultContext otherwise</returns>
+        </member>
+        <member name="T:Spring.Web.Support.Script">
+            <summary>
+            Base class that describes client side script block or file.
+            </summary>
+            <remarks>
+            <p>
+            Classes that extend this class are used by Spring.Web client-side
+            scripting support.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: Script.cs,v 1.4 2007/11/28 23:26:10 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Support.Script.#ctor(System.String)">
+            <summary>
+            Initialize a new Script object of the specified language
+            </summary>
+            <param name="language">Script language.</param>
+        </member>
+        <member name="M:Spring.Web.Support.Script.#ctor(Spring.Web.Support.MimeMediaType)">
+            <summary>
+            Initialize a new script object of the specified type
+            </summary>
+            <param name="type">a <see cref="T:Spring.Web.Support.MimeMediaType"/></param>
+        </member>
+        <member name="P:Spring.Web.Support.Script.Language">
+            <summary>
+            Gets or sets script language.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.Script.Type">
+            <summary>
+            Gets or sets script mime type
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.ScriptBlock">
+            <summary>
+            Class that describes client side script block.
+            </summary>
+            <remarks>
+            <p>
+            Script blocks are used to insert script code directly into the page,
+            without references to an external file.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: Script.cs,v 1.4 2007/11/28 23:26:10 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Support.ScriptBlock.#ctor(System.String,System.String)">
+            <summary>
+            Default constructor.
+            </summary>
+            <param name="language">Script language.</param>
+            <param name="script">The script text.</param>
+        </member>
+        <member name="M:Spring.Web.Support.ScriptBlock.#ctor(Spring.Web.Support.MimeMediaType,System.String)">
+            <summary>
+            Initialize a new script block instance.
+            </summary>
+            <param name="type">the script language's <see cref="T:Spring.Web.Support.MimeMediaType"/></param>
+            <param name="script">the script body</param>
+        </member>
+        <member name="P:Spring.Web.Support.ScriptBlock.Script">
+            <summary>
+            Gets or sets the script text.
+            </summary>
+            <value>The script text.</value>
+        </member>
+        <member name="T:Spring.Web.Support.ScriptFile">
+            <summary>
+            Class that describes client side script file.
+            </summary>
+            <remarks>
+            <p>
+            Script file references script code in the external file.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: Script.cs,v 1.4 2007/11/28 23:26:10 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Support.ScriptFile.#ctor(System.String,System.String)">
+            <summary>
+            Initialize a new <see cref="T:Spring.Web.Support.ScriptFile"/> instance.
+            </summary>
+            <param name="language">Script language.</param>
+            <param name="fileName">The name of the script file.</param>
+        </member>
+        <member name="M:Spring.Web.Support.ScriptFile.#ctor(Spring.Web.Support.MimeMediaType,System.String)">
+            <summary>
+            Initialize a new <see cref="T:Spring.Web.Support.ScriptFile"/> instance.
+            </summary>
+            <param name="type">the script language's <see cref="T:Spring.Web.Support.MimeMediaType"/></param>
+            <param name="fileName">the (virtual) path to the script</param>
+        </member>
+        <member name="P:Spring.Web.Support.ScriptFile.FileName">
+            <summary>
+            Gets or sets the name of the script file.
+            </summary>
+            <value>The name of the script file.</value>
+        </member>
+        <member name="T:Spring.Web.Support.ScriptEvent">
+            <summary>
+            Class that describes client side script file.
+            </summary>
+            <remarks>
+            <p>
+            Script file references script code in the external file.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: Script.cs,v 1.4 2007/11/28 23:26:10 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Support.ScriptEvent.#ctor(System.String,System.String,System.String,System.String)">
+            <summary>
+            Initialize a new <see cref="T:Spring.Web.Support.ScriptEvent"/> instance.
+            </summary>
+            <param name="language">Script language.</param>
+            <param name="element">Element ID of the event source.</param>
+            <param name="eventName">Name of the event to handle.</param>
+            <param name="script">Script text.</param>
+        </member>
+        <member name="M:Spring.Web.Support.ScriptEvent.#ctor(Spring.Web.Support.MimeMediaType,System.String,System.String,System.String)">
+            <summary>
+            Initialize a new <see cref="T:Spring.Web.Support.ScriptEvent"/> instance.
+            </summary>
+            <param name="type">the script language's <see cref="T:Spring.Web.Support.MimeMediaType"/></param>
+            <param name="element">Element ID of the event source.</param>
+            <param name="eventName">Name of the event to handle.</param>
+            <param name="script">Script text.</param>
+        </member>
+        <member name="P:Spring.Web.Support.ScriptEvent.Element">
+            <summary>
+            Gets or sets the element ID.
+            </summary>
+            <value>The element ID.</value>
+        </member>
+        <member name="P:Spring.Web.Support.ScriptEvent.EventName">
+            <summary>
+            Gets or sets the name of the event.
+            </summary>
+            <value>The name of the event.</value>
+        </member>
+        <member name="T:Spring.Web.Process.ProcessManager">
+            <summary>
+            Singleton that keeps track of all active process instances.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ProcessManager.cs,v 1.2 2006/05/18 21:37:52 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Process.ProcessManager.#ctor">
+            <summary>
+            Creates singleton instance.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Process.ProcessManager.RegisterProcess(Spring.Web.Process.IProcess)">
+            <summary>
+            Registers process instance.
+            </summary>
+            <param name="process">Process instance to register.</param>
+        </member>
+        <member name="M:Spring.Web.Process.ProcessManager.GetProcess(System.String)">
+            <summary>
+            Returns process with the specified ID.
+            </summary>
+            <param name="id">Process ID to use for lookup.</param>
+            <returns>Process with the specified ID, or <c>null</c> if process with that ID is not registered.</returns>
+        </member>
+        <member name="M:Spring.Web.Process.ProcessManager.UnregisterProcess(System.String)">
+            <summary>
+            Unregisters process with the specified ID.
+            </summary>
+            <param name="id">ID of the process to unregister.</param>
+        </member>
+        <member name="T:Spring.Web.Services.WebServiceExporter">
+            <summary>
+            Exports an object as a web service.
+            </summary>
+            <remarks>
+            <p>
+            The exporter will create a web service wrapper for the object that is
+            to be exposed and additionally enable its configuration as a web
+            service.
+            </p>
+            <p>
+            The exported object can be either a standard .NET web service
+            implementation, with methods marked using the standard
+            <see cref="T:System.Web.Services.WebMethodAttribute"/>, or it can be a
+            plain .NET object.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: WebServiceExporter.cs,v 1.33 2008/04/07 11:00:24 bbaia Exp $</version>
+        </member>
+        <member name="F:Spring.Web.Services.WebServiceExporter.objectName">
+            <summary>
+            The name of the object in the factory.
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Services.WebServiceExporter.objectFactory">
+            <summary>
+            The owning factory.
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Services.WebServiceExporter.proxyType">
+            <summary>
+            The generated web service wrapper type.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceExporter.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Web.Services.WebServiceExporter"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceExporter.GetObject">
+            <summary>
+            Return an instance (possibly shared or independent) of the object
+            managed by this factory.
+            </summary>
+            <remarks>
+            <note type="caution">
+            If this method is being called in the context of an enclosing IoC container and
+            returns <see langword="null"/>, the IoC container will consider this factory
+            object as not being fully initialized and throw a corresponding (and most
+            probably fatal) exception.
+            </note>
+            </remarks>
+            <returns>
+            An instance (possibly shared or independent) of the object managed by
+            this factory.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceExporter.AfterPropertiesSet">
+            <summary>
+            Exports specified object as a web service.
+            </summary>
+            <exception cref="T:System.Exception">
+            In the event of misconfiguration (such as failure to set an essential
+            property) or if initialization fails.
+            </exception>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceExporter.ValidateConfiguration">
+            <summary>
+            Validates the configuration.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceExporter.GenerateProxy">
+            <summary>
+            Generates the web service wrapper type.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceExporter.WebServiceBaseType">
+            <summary>
+            Gets or sets the base type that web service should inherit.
+            </summary>
+            <remarks>
+            Default is <see cref="T:System.Web.Services.WebService"/>
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceExporter.TargetName">
+            <summary>
+            Gets or sets the name of the target object that should be exposed as a web service.
+            </summary>
+            <value>
+            The name of the target object that should be exposed as a web service.
+            </value>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceExporter.Description">
+            <summary>
+            Gets or sets the description of the web service (optional).
+            </summary>
+            <value>
+            The web service description.
+            </value>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceExporter.Name">
+            <summary>
+            Gets or sets the name of the web service (optional).
+            </summary>
+            <remarks>
+            <p>
+            Defaults to the value of the exporter's object ID.
+            </p>
+            </remarks>
+            <value>
+            The web service name.
+            </value>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceExporter.Namespace">
+            <summary>
+            Gets or sets the web service namespace.
+            </summary>
+            <value>
+            The web service namespace.
+            </value>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceExporter.Interfaces">
+            <summary>
+            Gets or sets the list of interfaces whose methods should be exposed as web services.
+            </summary>
+            <remarks>
+            If not set, all the interfaces implemented or inherited 
+            by the target type will be used.
+            </remarks>
+            <value>The interfaces.</value>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceExporter.TypeAttributes">
+            <summary>
+            Gets or sets a list of custom attributes 
+            that should be applied to a proxy class.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceExporter.MemberAttributes">
+            <summary>
+            Gets or sets a dictionary of custom attributes 
+            that should be applied to web service members.
+            </summary>
+            <remarks>
+            Dictionary key is an expression that members can be matched against. 
+            Value is a list of attributes that should be applied 
+            to each member that matches expression.
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceExporter.ObjectFactory">
+            <summary>
+            Callback that supplies the owning factory to an object instance.
+            </summary>
+            <value>
+            Owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            (may not be <see langword="null"/>). The object can immediately
+            call methods on the factory.
+            </value>
+            <remarks>
+            <p>
+            Invoked after population of normal object properties but before an init
+            callback like <see cref="T:Spring.Objects.Factory.IInitializingObject"/>'s
+            <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+            method or a custom init-method.
+            </p>
+            </remarks>
+            <exception cref="T:Spring.Objects.ObjectsException">
+            In case of initialization errors.
+            </exception>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceExporter.ObjectType">
+            <summary>
+            Return the <see cref="T:System.Type"/> of object that this
+            <see cref="T:Spring.Objects.Factory.IFactoryObject"/> creates, or
+            <see langword="null"/> if not known in advance.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceExporter.IsSingleton">
+            <summary>
+            Is the object managed by this factory a singleton or a prototype?
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Services.WebServiceExporter.ObjectName">
+            <summary>
+            Set the name of the object in the object factory that created this object.
+            </summary>
+            <value>
+            The name of the object in the factory.
+            </value>
+            <remarks>
+            <p>
+            Invoked after population of normal object properties but before an init
+            callback like <see cref="M:Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>'s
+            <see cref="T:Spring.Objects.Factory.IInitializingObject"/>
+            method or a custom init-method.
+            </p>
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.Services.WebServiceExporter.WebServiceProxyTypeBuilder.ImplementConstructors(System.Reflection.Emit.TypeBuilder)">
+            <summary>
+            Implements constructors for the proxy class.
+            </summary>
+            <remarks>
+            This implementation generates a constructor 
+            that gets instance of the target object using 
+            <see cref="M:Spring.Objects.Factory.IObjectFactory.GetObject(System.String)"/>.
+            </remarks>
+            <param name="builder">
+            The <see cref="T:System.Type"/> builder to use.
+            </param>
+        </member>
+        <member name="T:Spring.Web.UI.Validation.SpanValidationErrorsRenderer">
+            <summary>
+            Implementation of <see cref="T:Spring.Web.UI.Validation.IValidationErrorsRenderer"/> that renders
+            validation errors within a <c>span</c> element, using breaks between the
+            errors.
+            </summary>
+            <remarks>
+            This renderer's behavior is consistent with standard ASP.NET behavior of
+            the control validators, and is used as the default renderer for Spring.NET
+            <see cref="T:Spring.Web.UI.Controls.ValidationError"/> control.
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SpanValidationErrorsRenderer.cs,v 1.1 2007/08/02 19:50:28 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Validation.SpanValidationErrorsRenderer.RenderErrors(Spring.Web.UI.Page,System.Web.UI.HtmlTextWriter,System.Collections.IList)">
+            <summary>
+            Renders validation errors using specified <see cref="T:System.Web.UI.HtmlTextWriter"/>.
+            </summary>
+            <param name="page">Web form instance.</param>
+            <param name="writer">An HTML writer to use.</param>
+            <param name="errors">The list of validation errors.</param>
+        </member>
+        <member name="T:Spring.Web.UI.UserControl">
+            <summary>
+            Extends standard .Net user control by adding data binding and localization functionality.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: UserControl.cs,v 1.54 2008/04/03 05:31:25 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.OnInit(System.EventArgs)">
+            <summary>
+            Initializes user control.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.OnPreLoadViewState(System.EventArgs)">
+            <summary>
+            Raises the <see cref="E:Spring.Web.UI.UserControl.PreLoadViewState"/> event after page initialization.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.System#Web#UI#IPostBackDataHandler#LoadPostData(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            This method is called during a postback if this control has been visible when being rendered to the client.
+            </summary>
+            <remarks>
+            If the controls has been visible when being rendering to the client, <see cref="M:System.Web.UI.Page.RegisterRequiresPostBack(System.Web.UI.Control)"/>
+            has been called during <see cref="M:Spring.Web.UI.UserControl.OnPreRender(System.EventArgs)"/>
+            </remarks>
+            <returns>true if the server control's state changes as a result of the post back; otherwise false.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.LoadPostData(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            This method is called during a postback if this control has been visible when being rendered to the client.
+            </summary>
+            <returns>true if the server control's state changes as a result of the post back; otherwise false.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.System#Web#UI#IPostBackDataHandler#RaisePostDataChangedEvent">
+            <summary>
+            When implemented by a class, signals the server control object to notify the
+            ASP.NET application that the state of the control has changed.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.RaisePostDataChangedEvent">
+            <summary>
+            When implemented by a class, signals the server control object to notify the
+            ASP.NET application that the state of the control has changed.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.OnLoad(System.EventArgs)">
+            <summary>
+            First unbinds data from the controls into a data model and
+            then raises Load event in order to execute all associated handlers.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.OnPreRender(System.EventArgs)">
+            <summary>
+            Binds data from the data model into controls and raises
+            PreRender event afterwards.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.OnInitializeControls(System.EventArgs)">
+            <summary>
+            Raises InitializeControls event.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.LoadControl(System.String)">
+            <summary>
+            Obtains a <see cref="T:System.Web.UI.UserControl"/> object from a user control file
+            and injects dependencies according to Spring config file.
+            </summary>
+            <param name="virtualPath">The virtual path to a user control file.</param>
+            <returns>
+            Returns the specified <see langword="UserControl"/> object, with dependencies injected.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.LoadControl(System.Type,System.Object[])">
+            <summary>
+            Obtains a <see cref="T:System.Web.UI.UserControl"/> object by type
+            and injects dependencies according to Spring config file.
+            </summary>
+            <param name="t">The type of a user control.</param>
+            <param name="parameters">parameters to pass to the control</param>
+            <returns>
+            Returns the specified <see langword="UserControl"/> object, with dependencies injected.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.InitializeModel">
+            <summary>
+            Initializes data model when the page is first loaded.
+            </summary>
+            <remarks>
+            This method should be overriden by the developer
+            in order to initialize data model for the page.
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.LoadModelFromPersistenceMedium">
+            <summary>
+            Retrieves data model from a persistence store.
+            </summary>
+            <remarks>
+            The default implementation uses <see cref="P:System.Web.UI.Page.Session"/> to store and retrieve
+            the model for the current <see cref="P:System.Web.HttpRequest.CurrentExecutionFilePath"/>
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.SaveModelToPersistenceMedium(System.Object)">
+            <summary>
+            Saves data model to a persistence store.
+            </summary>
+            <remarks>
+            The default implementation uses <see cref="P:System.Web.UI.Page.Session"/> to store and retrieve
+            the model for the current <see cref="P:System.Web.HttpRequest.CurrentExecutionFilePath"/>
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.LoadModel(System.Object)">
+            <summary>
+            Loads the saved data model on postback.
+            </summary>
+            <remarks>
+            This method should be overriden by the developer
+            in order to load data model for the page.
+            </remarks>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.SaveModel">
+            <summary>
+            Returns a model object that should be saved.
+            </summary>
+            <remarks>
+            This method should be overriden by the developer
+            in order to save data model for the page.
+            </remarks>
+            <returns>
+            A model object that should be saved.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.SetController(System.Object)">
+            <summary>
+            <para>Stores the controller to be returned by <see cref="P:Spring.Web.UI.UserControl.Controller"/> property.</para>
+            </summary>
+            <remarks>
+            The default implementation uses a field to store the reference. Derived classes may override this behaviour
+            but must ensure to also change the behaviour of <see cref="M:Spring.Web.UI.UserControl.GetController"/> accordingly.
+            </remarks>
+            <param name="controller">Controller for the control.</param>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.GetController">
+            <summary>
+            <para>Returns the controller stored by <see cref="M:Spring.Web.UI.UserControl.SetController(System.Object)"/>.</para>
+            </summary>
+            <remarks>
+            <para>
+            The default implementation uses a field to retrieve the reference.
+            </para>
+            <para>
+            If external controller is not specified, control will serve as its own controller,
+            which will allow data binding to work properly.
+            </para>
+            <para>
+            You may override this method e.g. to return <see cref="P:Spring.Web.UI.Page.Controller"/> in order to
+            have your control bind to the same controller as your page. When overriding this behaviour, derived classes
+            must ensure to also change the behaviour of <see cref="M:Spring.Web.UI.UserControl.SetController(System.Object)"/> accordingly.
+            </para>
+            </remarks>
+            <returns>
+            <para>The controller for this control.</para>
+            <para>If no controller is set, a reference to the control itself is returned.</para>
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.SetResult(System.String)">
+            <summary>
+            Redirects user to a URL mapped to specified result name.
+            </summary>
+            <param name="resultName">Result name.</param>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.SetResult(System.String,System.Object)">
+            <summary>
+            Redirects user to a URL mapped to specified result name.
+            </summary>
+            <param name="resultName">Result name.</param>
+            <param name="context">The context to use for evaluating the SpEL expression in the Result.</param>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.Validate(System.Object,Spring.Validation.IValidator[])">
+            <summary>
+            Evaluates specified validators and returns <c>True</c> if all of them are valid.
+            </summary>
+            <remarks>
+            <p>
+            Each validator can itself represent a collection of other validators if it is
+            an instance of <see cref="T:Spring.Validation.ValidatorGroup"/> or one of its derived types.
+            </p>
+            <p>
+            Please see the Validation Framework section in the documentation for more info.
+            </p>
+            </remarks>
+            <param name="validationContext">Object to validate.</param>
+            <param name="validators">Validators to evaluate.</param>
+            <returns>
+            <c>True</c> if all of the specified validators are valid, <c>False</c> otherwise.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.CreateValidatorParameters">
+            <summary>
+            Creates the validator parameters.
+            </summary>
+            <remarks>
+            <para>
+            This method can be overriden if you want to pass additional parameters
+            to the validation framework, but you should make sure that you call
+            this base implementation in order to add page, session, application,
+            request, response and context to the variables collection.
+            </para>
+            </remarks>
+            <returns>
+            Dictionary containing parameters that should be passed to
+            the data validation framework.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.InitializeDataBindings">
+            <summary>
+            Initializes the data bindings.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.GetBindingManagerKey">
+            <summary>
+            Returns the key to be used for looking up a cached
+            BindingManager instance in <see cref="P:Spring.Web.UI.UserControl.SharedState"/>.
+            </summary>
+            <returns>a unique key identifying the <see cref="T:Spring.DataBinding.IBindingContainer"/> instance in the <see cref="P:Spring.Web.UI.UserControl.SharedState"/> dictionary.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.CreateBindingManager">
+             <summary>
+             Creates a new <see cref="T:Spring.DataBinding.IBindingContainer"/> instance.
+             </summary>
+             <remarks>
+             This factory method is called if no <see cref="T:Spring.DataBinding.IBindingContainer"/> could be found in <see cref="P:Spring.Web.UI.UserControl.SharedState"/>
+             using the key returned by <see cref="M:Spring.Web.UI.UserControl.GetBindingManagerKey"/>.<br/>
+             <br/>
+            
+             </remarks>
+             <returns>a <see cref="T:Spring.DataBinding.IBindingContainer"/> instance to be used for DataBinding</returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.InitializeBindingManager">
+            <summary>
+            Initializes binding manager and data bindings if necessary.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.OnDataBindingsInitialized(System.EventArgs)">
+            <summary>
+            Raises the <see cref="E:Spring.Web.UI.UserControl.DataBindingsInitialized"/> event.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.BindFormData">
+            <summary>
+            Bind data from model to form.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.UnbindFormData">
+            <summary>
+            Unbind data from form to model.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.OnDataBound(System.EventArgs)">
+            <summary>
+            Raises DataBound event.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.OnDataUnbound(System.EventArgs)">
+            <summary>
+            Raises DataBound event.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.InitializeMessageSource">
+            <summary>
+            Initializes local message source
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.GetLocalResourceManager">
+            <summary>
+            Creates and returns local ResourceManager for this page.
+            </summary>
+            <remarks>
+            <para>
+            In ASP.NET 1.1, this method loads local resources from the web application assembly.
+            </para>
+            <para>
+            However, in ASP.NET 2.0, local resources are compiled into the dynamic assembly,
+            so we need to find that assembly instead and load the resources from it.
+            </para>
+            </remarks>
+            <returns>Local ResourceManager instance.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.GetMessage(System.String)">
+            <summary>
+            Returns message for the specified resource name.
+            </summary>
+            <param name="name">Resource name.</param>
+            <returns>Message text.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.GetMessage(System.String,System.Object[])">
+            <summary>
+            Returns message for the specified resource name.
+            </summary>
+            <param name="name">Resource name.</param>
+            <param name="args">Message arguments that will be used to format return value.</param>
+            <returns>Formatted message text.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.GetResourceObject(System.String)">
+            <summary>
+            Returns resource object for the specified resource name.
+            </summary>
+            <param name="name">Resource name.</param>
+            <returns>Resource object.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.CreateSharedStateKey(System.String)">
+            <summary>
+            Creates a key for shared state, taking into account whether
+            this page belongs to a process or not.
+            </summary>
+            <param name="key">Key suffix</param>
+            <returns>Generated unique shared state key.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.UserControl.AddedControl(System.Web.UI.Control,System.Int32)">
+            <summary>
+            Injects dependencies into control before adding it.
+            </summary>
+        </member>
+        <member name="E:Spring.Web.UI.UserControl.PreLoadViewState">
+            <summary>
+            PreLoadViewState event.
+            </summary>
+            <remarks>
+            <para>
+            This event is raised if <see cref="P:System.Web.UI.Page.IsPostBack"/> is true
+            immediately before state is restored from ViewState.
+            </para>
+            <para>
+            NOTE: Different from <see cref="M:System.Web.UI.Control.LoadViewState(System.Object)"/>, this event will always be raised!
+            </para>
+            </remarks>
+        </member>
+        <member name="E:Spring.Web.UI.UserControl.InitializeControls">
+            <summary>
+            This event is raised before Load event and should be used to initialize
+            controls as necessary.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.UserControl.Controller">
+            <summary>
+            Gets or sets controller for the control.
+            </summary>
+            <remarks>
+            <para>
+            Internally calls are delegated to <see cref="M:Spring.Web.UI.UserControl.GetController"/> and <see cref="M:Spring.Web.UI.UserControl.SetController(System.Object)"/>.
+            </para>
+            </remarks>
+            <value>Controller for the control.</value>
+        </member>
+        <member name="P:Spring.Web.UI.UserControl.SharedState">
+            <summary>
+            Returns a thread-safe dictionary that contains state that is shared by
+            all instances of this control.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.UserControl.Results">
+            <summary>
+            Gets or sets map of result names to target URLs
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.UserControl.ValidationErrors">
+            <summary>
+            Gets the validation errors container.
+            </summary>
+            <value>The validation errors container.</value>
+        </member>
+        <member name="P:Spring.Web.UI.UserControl.BindingManager">
+            <summary>
+            Gets the binding manager for this control.
+            </summary>
+            <value>The binding manager.</value>
+        </member>
+        <member name="E:Spring.Web.UI.UserControl.DataBindingsInitialized">
+            <summary>
+            This event is raised after <see cref="P:Spring.Web.UI.UserControl.BindingManager"/> as been initialized.
+            </summary>
+        </member>
+        <member name="E:Spring.Web.UI.UserControl.DataBound">
+            <summary>
+            This event is raised after all controls have been populated with values
+            from the data model.
+            </summary>
+        </member>
+        <member name="E:Spring.Web.UI.UserControl.DataUnbound">
+            <summary>
+            This event is raised after data model has been populated with values from
+            web controls.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.UserControl.ApplicationContext">
+            <summary>
+            Gets or sets Spring application context of the page.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.UserControl.Localizer">
+            <summary>
+            Gets or sets the localizer.
+            </summary>
+            <value>The localizer.</value>
+        </member>
+        <member name="P:Spring.Web.UI.UserControl.MessageSource">
+            <summary>
+            Gets or sets the local message source.
+            </summary>
+            <value>The local message source.</value>
+        </member>
+        <member name="P:Spring.Web.UI.UserControl.UserCulture">
+            <summary>
+            Gets or sets user's culture
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.UserControl.Page">
+            <summary>
+            Overrides Page property to return <see cref="T:Spring.Web.UI.Page"/>
+            instead of <see cref="T:System.Web.UI.Page"/>.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.UserControl.Spring#Web#Support#ISupportsWebDependencyInjection#DefaultApplicationContext">
+            <summary>
+            Holds the default ApplicationContext to be used during DI.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.TabularView">
+            <summary>
+            Represents a control that acts as a container for a group of controls within a <see cref="T:Spring.Web.UI.Controls.TabularMultiView"/> control. 
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: TabularView.cs,v 1.2 2007/07/24 14:32:58 oakinger Exp $</version>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.TabularView.Active">
+            <summary>
+            Indicates if this view is currently active.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.TabularView.TabName">
+            <summary>
+            Get or Set the name of the tab item associated with this view.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.TabularView.TabToolTip">
+            <summary>
+            Get or Set the tooltip text of the tab item associated with this view.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.CheckBoxList">
+            <summary>
+            Adds the <see cref="P:Spring.Web.UI.Controls.CheckBoxList.SelectedValues"/> property to the framework's <see cref="T:System.Web.UI.WebControls.CheckBoxList"/> control.
+            </summary>
+            <remarks>
+            When using Spring.Web's DataBinding, you should use this control for easier binding declaration.
+            </remarks>
+            <author>Erich Eichinger</author>
+            <version>$Id: CheckBoxList.cs,v 1.2 2007/12/14 16:38:44 oakinger Exp $</version>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.CheckBoxList.SelectedValues">
+            <summary>
+            Gets or Sets the list of selected values and checks the <see cref="T:System.Web.UI.WebControls.CheckBox"/>es accordingly
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.AbstractWizard">
+            <summary>
+            Convinience implementation of the wizard-like page controller.
+            </summary>
+            <remarks>
+            <p>
+            Wizard steps are encapsulated within custom user controls. Wizard
+            controller takes care of navigation through steps and loading of the 
+            appropriate user control.
+            </p>
+            <p>
+            Developer implementing wizard needs to inherit from this class and implement
+            abstract, read-only StepPanel property that will be used as a container
+            for the wizard steps. Navigation event handlers should call Previous and Next methods
+            from this class to change current step.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AbstractWizard.cs,v 1.7 2006/05/18 21:37:52 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.AbstractWizard.Previous">
+            <summary>
+            Moves to the previous step in the list, if one exists.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.AbstractWizard.Next">
+            <summary>
+            Moves to the next step in the list, if one exists.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.AbstractWizard.OnInit(System.EventArgs)">
+            <summary>
+            Initializes wizard steps.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.AbstractWizard.OnLoad(System.EventArgs)">
+            <summary>
+            
+            </summary>
+            <param name="e"></param>
+        </member>
+        <member name="M:Spring.Web.UI.AbstractWizard.OnPreRender(System.EventArgs)">
+            <summary>
+            Loads new step into a step panel if step has changed.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.AbstractWizard.InitializeSteps(System.Collections.IList)">
+            <summary>
+            Initializes all the steps.
+            </summary>
+            <param name="stepNames">List of step control names.</param>
+            <returns>List of step control instances.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.AbstractWizard.LoadStep(System.String)">
+            <summary>
+            Loads step control.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.AbstractWizard.Steps">
+            <summary>
+            Gets or sets a list of user controls representing wizard steps.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.AbstractWizard.CurrentStep">
+            <summary>
+            Gets or sets current step using step index.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.AbstractWizard.IsFirst">
+            <summary>
+            Returns true if there are no steps before the current step.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.AbstractWizard.IsLast">
+            <summary>
+            Returns true if there are no steps after the current step.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.AbstractWizard.StepPanel">
+            <summary>
+            Panel that should serve as a container for wizard steps.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Support.Result">
+            <summary>
+            Represents the ASPX result page that an operation maps to.
+            </summary>
+            <remarks>
+            <p>
+            Parameters can reference variables accessible from the page using the
+            standard NAnt style property notation, namely <c>${varName}</c>.
+            </p>
+            <p>
+            The <c>result</c> <see cref="T:System.String"/> that is passed as the sole
+            parameter to the parameterized constructor
+            (<see cref="M:Spring.Web.Support.Result.#ctor(System.String)"/>) must adhere to the
+            following format:
+            </p>
+            <code>
+            [&lt;mode&gt;:]&lt;targetPage&gt;[?param1,param2,...,paramN]
+            </code>
+            <p>
+            Only the <c>targetPage</c> is mandatory.
+            </p>
+            </remarks>
+            <example>
+            <p>
+            Examples of valid <see cref="T:System.String"/> values that can be passed
+            to the the parameterized constructor
+            (<see cref="M:Spring.Web.Support.Result.#ctor(System.String)"/>) include:
+            </p>
+            <p>
+            <list type="bullet">
+            <item><description>Login.aspx</description></item>
+            <item><description>~/Login.aspx</description></item>
+            <item><description>redirect:~/Login.aspx</description></item>
+            <item><description>transfer:~/Login.aspx</description></item>
+            <item><description>transfer:Services/Register.aspx</description></item>
+            <item><description>Login.aspx?username=springboy,password=7623AAjoe</description></item>
+            <item><description>redirect:Login.aspx?username=springboy,password=7623AAjoe</description></item>
+            </list>
+            </p>
+            </example>
+            <author>Aleksandar Seovic</author>
+            <author>Matan Shapira</author>
+            <version>$Id: Result.cs,v 1.13 2008/02/02 09:12:44 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Web.Support.Result.DefaultResultMode">
+            <summary>
+            The default <see cref="T:Spring.Web.Support.ResultMode"/>.
+            </summary>
+            <remarks>
+            <p>
+            Currently defaults to <see cref="F:Spring.Web.Support.ResultMode.Transfer"/>.
+            </p>
+            </remarks>
+            <seealso cref="T:Spring.Web.Support.ResultMode"/>
+        </member>
+        <member name="M:Spring.Web.Support.Result.#ctor">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Web.Support.Result"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.Result.#ctor(System.String)">
+            <summary>
+            Creates a new instance of the <see cref="T:Spring.Web.Support.Result"/> class.
+            </summary>
+            <remarks>
+            <p>
+            See both the class documentation (<see cref="T:Spring.Web.Support.Result"/>)
+            and the reference documentation for the Spring.Web library for a
+            discussion and examples of what values the supplied <paramref name="result"/>
+            can have.
+            </p>
+            </remarks>
+            <param name="result">The result descriptor.</param>
+            <exception cref="T:System.ArgumentNullException">
+            If the supplied <paramref name="result"/> is <see langword="null"/> or
+            contains only whitespace character(s).
+            </exception>
+        </member>
+        <member name="M:Spring.Web.Support.Result.Navigate(System.Object)">
+            <summary>
+            Navigates to the <see cref="P:Spring.Web.Support.Result.TargetPage"/>
+            defined by this result.
+            </summary>
+            <param name="page">
+            The context object for parameter resolution. This is typically
+            a <see cref="T:System.Web.UI.Page"/>.
+            </param>
+        </member>
+        <member name="M:Spring.Web.Support.Result.DoTransfer(System.Object)">
+            <summary>
+            Performs a server-side transfer to the
+            <see cref="P:Spring.Web.Support.Result.TargetPage"/> defined by this result.
+            </summary>
+            <param name="page">
+            The context object for parameter resolution. This is typically
+            a <see cref="T:System.Web.UI.Page"/>.
+            </param>
+            <seealso cref="M:System.Web.HttpServerUtility.Transfer(System.String,System.Boolean)"/>
+        </member>
+        <member name="M:Spring.Web.Support.Result.SetTransferParameters(System.Collections.IDictionary,System.Object)">
+            <summary>
+            Resolves transfer parameters and stores them into <see cref="T:System.Collections.IDictionary"/> instance.
+            </summary>
+            <param name="contextDictionary"></param>
+            <param name="page"></param>
+        </member>
+        <member name="M:Spring.Web.Support.Result.DoRedirect(System.Object)">
+            <summary>
+            Performs a redirect to the
+            <see cref="P:Spring.Web.Support.Result.TargetPage"/> defined by this
+            result.
+            </summary>
+            <param name="page">
+            The context object for parameter resolution. This is typically
+            a <see cref="T:System.Web.UI.Page"/>.
+            </param>
+            <seealso cref="M:System.Web.HttpResponse.Redirect(System.String)"/>
+        </member>
+        <member name="M:Spring.Web.Support.Result.GetRedirectUri(System.Object)">
+            <summary>
+            Returns a redirect url string that points to the 
+            <see cref="P:Spring.Web.Support.Result.TargetPage"/> defined by this
+            result.
+            </summary>
+            <param name="page">
+            A redirect url string.
+            </param>
+        </member>
+        <member name="M:Spring.Web.Support.Result.ExtractAndSetResultMode(System.String)">
+            <summary>
+            Extracts and sets this instance's <see cref="P:Spring.Web.Support.Result.Mode"/>
+            property from the supplied <paramref name="result"/> descriptor.
+            </summary>
+            <remarks>
+            <p>
+            The supplied <paramref name="result"/> descriptor is typically
+            something like <c>/Foo.aspx</c> or
+            <c>redirect:http://www.springframework.net/</c>.
+            </p>
+            </remarks>
+            <param name="result">
+            The result descriptor.
+            </param>
+            <returns>
+            The supplied <paramref name="result"/> without the result mode
+            prefix (if any).
+            </returns>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            If the supplied <paramref name="result"/> starts with an illegal
+            result mode (see <see cref="T:Spring.Web.Support.ResultMode"/>).
+            </exception>
+        </member>
+        <member name="M:Spring.Web.Support.Result.ParseParameters(System.String)">
+            <summary>
+            Parses query parameters from the supplied <paramref name="queryString"/>.
+            </summary>
+            <param name="queryString">
+            The query string (may be <cref lang="null"/>).
+            </param>
+        </member>
+        <member name="P:Spring.Web.Support.Result.Mode">
+            <summary>
+            The <see cref="T:Spring.Web.Support.ResultMode"/>. Defines which
+            method will be used to navigate to the
+            <see cref="P:Spring.Web.Support.Result.TargetPage"/>.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.Result.TargetPage">
+            <summary>
+            The target page.
+            </summary>
+            <remarks>
+            <p>
+            This is the (relative) path to the target page. 
+            </p>
+            </remarks>
+            <example>
+            <p>
+            Examples of valid values would be:
+            </p>
+            <p>
+            <list type="bullet">
+            <item><description>Login.aspx</description></item>
+            <item><description>~/Login.aspx</description></item>
+            <item><description>~/B2B/SignUp.aspx</description></item>
+            <item><description>B2B/Foo/FooServices.aspx</description></item>
+            </list>
+            </p>
+            </example>
+        </member>
+        <member name="P:Spring.Web.Support.Result.Parameters">
+            <summary>
+            The parameters thar are to be passed to the
+            <see cref="P:Spring.Web.Support.Result.TargetPage"/> upon
+            navigation.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Support.Result.PreserveForm">
+            <summary>
+            Indicates, if <see cref="M:System.Web.HttpServerUtility.Transfer(System.String,System.Boolean)"/> should be called with preserverForm='true' | 'false'. Only relevant for ResultMode.TransferXXXX modes.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.Providers.RoleProviderAdapter">
+            <summary>
+            Wrapper for <see cref="T:System.Web.Security.RoleProvider"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+            as the Id of wrapped provider (defined in the Spring context).  
+            </p>    
+            </remarks>
+            <author>Damjan Tomic</author>
+        </member>
+        <member name="F:Spring.Web.Providers.RoleProviderAdapter.wrappedProvider">
+            <summary>
+            Reference to wrapped provider (defined in Spring context).
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Providers.RoleProviderAdapter.Initialize(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Initializes the provider.
+            </summary>
+            
+            <param name="config">A collection of the name/value pairs representing the provider-specific 
+             attributes specified in the configuration for this provider.
+             The <c>providerId</c> attribute may be used to override the name being used for looking up an object definition.
+             </param>
+            <param name="name">The friendly name of the provider.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+            <exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+            <exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>      
+        </member>
+        <member name="M:Spring.Web.Providers.RoleProviderAdapter.IsUserInRole(System.String,System.String)">
+            <summary>
+            Gets a value indicating whether the specified user is in the specified role for the configured applicationName.
+            </summary>
+            
+            <returns>
+            true if the specified user is in the specified role for the configured applicationName; otherwise, false.
+            </returns>
+            
+            <param name="username">The user name to search for.</param>
+            <param name="roleName">The role to search in.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.RoleProviderAdapter.GetRolesForUser(System.String)">
+            <summary>
+            Gets a list of the roles that a specified user is in for the configured applicationName.
+            </summary>
+            
+            <returns>
+            A string array containing the names of all the roles that the specified user is in for the configured applicationName.
+            </returns>
+            
+            <param name="username">The user to return a list of roles for.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.RoleProviderAdapter.CreateRole(System.String)">
+            <summary>
+            Adds a new role to the data source for the configured applicationName.
+            </summary>
+            
+            <param name="roleName">The name of the role to create.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.RoleProviderAdapter.DeleteRole(System.String,System.Boolean)">
+            <summary>
+            Removes a role from the data source for the configured applicationName.
+            </summary>
+            
+            <returns>
+            true if the role was successfully deleted; otherwise, false.
+            </returns>
+            
+            <param name="throwOnPopulatedRole">If true, throw an exception if roleName has one or more members and do not delete roleName.</param>
+            <param name="roleName">The name of the role to delete.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.RoleProviderAdapter.RoleExists(System.String)">
+            <summary>
+            Gets a value indicating whether the specified role name already exists in the role data source for the configured applicationName.
+            </summary>
+            
+            <returns>
+            true if the role name already exists in the data source for the configured applicationName; otherwise, false.
+            </returns>
+            
+            <param name="roleName">The name of the role to search for in the data source. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.RoleProviderAdapter.AddUsersToRoles(System.String[],System.String[])">
+            <summary>
+            Adds the specified user names to the specified roles for the configured applicationName.
+            </summary>
+            
+            <param name="roleNames">A string array of the role names to add the specified user names to. </param>
+            <param name="usernames">A string array of user names to be added to the specified roles. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.RoleProviderAdapter.RemoveUsersFromRoles(System.String[],System.String[])">
+            <summary>
+            Removes the specified user names from the specified roles for the configured applicationName.
+            </summary>
+            
+            <param name="roleNames">A string array of role names to remove the specified user names from. </param>
+            <param name="usernames">A string array of user names to be removed from the specified roles. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.RoleProviderAdapter.GetUsersInRole(System.String)">
+            <summary>
+            Gets a list of users in the specified role for the configured applicationName.
+            </summary>
+            
+            <returns>
+            A string array containing the names of all the users who are members of the specified role for the configured applicationName.
+            </returns>
+            
+            <param name="roleName">The name of the role to get the list of users for. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.RoleProviderAdapter.GetAllRoles">
+            <summary>
+            Gets a list of all the roles for the configured applicationName.
+            </summary>
+            
+            <returns>
+            A string array containing the names of all the roles stored in the data source for the configured applicationName.
+            </returns>
+            
+        </member>
+        <member name="M:Spring.Web.Providers.RoleProviderAdapter.FindUsersInRole(System.String,System.String)">
+            <summary>
+            Gets an array of user names in a role where the user name contains the specified user name to match.
+            </summary>
+            
+            <returns>
+            A string array containing the names of all the users where the user name matches usernameToMatch and the user is a member of the specified role.
+            </returns>
+            
+            <param name="usernameToMatch">The user name to search for.</param>
+            <param name="roleName">The role to search in.</param>
+        </member>
+        <member name="P:Spring.Web.Providers.RoleProviderAdapter.Name">
+            <summary>
+            Gets the friendly name used to refer to the provider during configuration.
+            </summary>
+            
+            <returns>
+            The friendly name used to refer to the provider during configuration.
+            </returns>
+        </member>
+        <member name="P:Spring.Web.Providers.RoleProviderAdapter.Description">
+            <summary>
+            Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+            </summary>
+            
+            <returns>
+            A brief, friendly description suitable for display in administrative tools or other UIs.
+            </returns>
+        </member>
+        <member name="P:Spring.Web.Providers.RoleProviderAdapter.ApplicationName">
+            <summary>
+            Gets or sets the name of the application to store and retrieve role information for.
+            </summary>
+            
+            <returns>
+            The name of the application to store and retrieve role information for.
+            </returns>
+            
+        </member>
+        <member name="T:Spring.Web.Providers.ProfileProviderAdapter">
+            <summary>
+            Wrapper for <see cref="T:System.Web.Profile.ProfileProvider"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+            as the Id of wrapped provider (defined in the Spring context).  
+            </p>    
+            </remarks>
+            <author>Damjan Tomic</author>
+        </member>
+        <member name="F:Spring.Web.Providers.ProfileProviderAdapter.wrappedProvider">
+            <summary>
+            Reference to wrapped provider (defined in Spring context).
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Providers.ProfileProviderAdapter.Initialize(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Initializes the provider.
+            </summary>
+            
+            <param name="config">A collection of the name/value pairs representing the provider-specific 
+             attributes specified in the configuration for this provider.
+             The <c>providerId</c> attribute may be used to override the name being used for looking up an object definition.
+             </param>
+            <param name="name">The friendly name of the provider.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+            <exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+            <exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>      
+        </member>
+        <member name="M:Spring.Web.Providers.ProfileProviderAdapter.GetPropertyValues(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyCollection)">
+            <summary>
+            Returns the collection of settings property values for the specified application instance and settings property group.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Configuration.SettingsPropertyValueCollection"></see> containing the values for the specified settings property group.
+            </returns>
+            
+            <param name="context">A <see cref="T:System.Configuration.SettingsContext"></see> describing the current application use.</param>
+            <param name="collection">A <see cref="T:System.Configuration.SettingsPropertyCollection"></see> containing the settings property group whose values are to be retrieved.</param><filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Spring.Web.Providers.ProfileProviderAdapter.SetPropertyValues(System.Configuration.SettingsContext,System.Configuration.SettingsPropertyValueCollection)">
+            <summary>
+            Sets the values of the specified group of property settings.
+            </summary>
+            
+            <param name="context">A <see cref="T:System.Configuration.SettingsContext"></see> describing the current application usage.</param>
+            <param name="collection">A <see cref="T:System.Configuration.SettingsPropertyValueCollection"></see> representing the group of property settings to set.</param><filterpriority>2</filterpriority>
+        </member>
+        <member name="M:Spring.Web.Providers.ProfileProviderAdapter.DeleteProfiles(System.Web.Profile.ProfileInfoCollection)">
+            <summary>
+            When overridden in a derived class, deletes profile properties and information for the supplied list of profiles.
+            </summary>
+            
+            <returns>
+            The number of profiles deleted from the data source.
+            </returns>
+            
+            <param name="profiles">A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see>  of information about profiles that are to be deleted.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.ProfileProviderAdapter.DeleteProfiles(System.String[])">
+            <summary>
+            When overridden in a derived class, deletes profile properties and information for profiles that match the supplied list of user names.
+            </summary>
+            
+            <returns>
+            The number of profiles deleted from the data source.
+            </returns>
+            
+            <param name="usernames">A string array of user names for profiles to be deleted.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.ProfileProviderAdapter.DeleteInactiveProfiles(System.Web.Profile.ProfileAuthenticationOption,System.DateTime)">
+            <summary>
+            When overridden in a derived class, deletes all user-profile data for profiles in which the last activity date occurred before the specified date.
+            </summary>
+            
+            <returns>
+            The number of profiles deleted from the data source.
+            </returns>
+            
+            <param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are deleted.</param>
+            <param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see>  value of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.ProfileProviderAdapter.GetNumberOfInactiveProfiles(System.Web.Profile.ProfileAuthenticationOption,System.DateTime)">
+            <summary>
+            When overridden in a derived class, returns the number of profiles in which the last activity date occurred on or before the specified date.
+            </summary>
+            
+            <returns>
+            The number of profiles in which the last activity date occurred on or before the specified date.
+            </returns>
+            
+            <param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+            <param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see>  of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.ProfileProviderAdapter.GetAllProfiles(System.Web.Profile.ProfileAuthenticationOption,System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            When overridden in a derived class, retrieves user profile data for all profiles in the data source.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user-profile information for all profiles in the data source.
+            </returns>
+            
+            <param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+            <param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+            <param name="pageIndex">The index of the page of results to return.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.ProfileProviderAdapter.GetAllInactiveProfiles(System.Web.Profile.ProfileAuthenticationOption,System.DateTime,System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            When overridden in a derived class, retrieves user-profile data from the data source for profiles in which the last activity date occurred on or before the specified date.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user-profile information about the inactive profiles.
+            </returns>
+            
+            <param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+            <param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see>  of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+            <param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+            <param name="pageIndex">The index of the page of results to return.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.ProfileProviderAdapter.FindProfilesByUserName(System.Web.Profile.ProfileAuthenticationOption,System.String,System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            When overridden in a derived class, retrieves profile information for profiles in which the user name matches the specified user names.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user-profile information for profiles where the user name matches the supplied usernameToMatch parameter.
+            </returns>
+            
+            <param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+            <param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+            <param name="pageIndex">The index of the page of results to return.</param>
+            <param name="usernameToMatch">The user name to search for.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.ProfileProviderAdapter.FindInactiveProfilesByUserName(System.Web.Profile.ProfileAuthenticationOption,System.String,System.DateTime,System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            When overridden in a derived class, retrieves profile information for profiles in which the last activity date occurred on or before the specified date and the user name matches the specified user name.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user profile information for inactive profiles where the user name matches the supplied usernameToMatch parameter.
+            </returns>
+            
+            <param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+            <param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see> value of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+            <param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+            <param name="pageIndex">The index of the page of results to return.</param>
+            <param name="usernameToMatch">The user name to search for.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="P:Spring.Web.Providers.ProfileProviderAdapter.Name">
+            <summary>
+            Gets the friendly name used to refer to the provider during configuration.
+            </summary>
+            
+            <returns>
+            The friendly name used to refer to the provider during configuration.
+            </returns>
+        </member>
+        <member name="P:Spring.Web.Providers.ProfileProviderAdapter.Description">
+            <summary>
+            Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+            </summary>
+            
+            <returns>
+            A brief, friendly description suitable for display in administrative tools or other UIs.
+            </returns>
+        </member>
+        <member name="P:Spring.Web.Providers.ProfileProviderAdapter.ApplicationName">
+            <summary>
+            Gets or sets the name of the currently running application.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.String"></see> that contains the application's shortened name, which does not contain a full path or extension, for example, SimpleAppSettings.
+            </returns>
+            <filterpriority>2</filterpriority>
+        </member>
+        <member name="T:Spring.Web.Providers.MembershipProviderAdapter">
+            <summary>
+            Wrapper for <see cref="T:System.Web.Security.MembershipProvider"/> class.
+            </summary>
+            <remarks>
+            <p>
+            Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+            as the Id of wrapped provider (defined in the Spring context).  
+            </p>    
+            </remarks>
+            <author>Damjan Tomic</author>
+            <version>$Id: MembershipProviderAdapter.cs,v 1.1 2007/07/26 14:43:56 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Web.Providers.MembershipProviderAdapter.wrappedProvider">
+            <summary>
+            Reference to wrapped provider (defined in Spring context).
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.Initialize(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Initializes the provider.
+            </summary>
+            
+            <param name="config">A collection of the name/value pairs representing the provider-specific 
+             attributes specified in the configuration for this provider.
+             The <c>providerId</c> attribute may be used to override the name being used for looking up an object definition.
+             </param>
+            <param name="name">The friendly name of the provider.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+            <exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+            <exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.CreateUser(System.String,System.String,System.String,System.String,System.String,System.Boolean,System.Object,System.Web.Security.MembershipCreateStatus@)">
+            <summary>
+            Adds a new membership user to the data source.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Security.MembershipUser"></see> object populated with the information for the newly created user.
+            </returns>
+            
+            <param name="isApproved">Whether or not the new user is approved to be validated.</param>
+            <param name="passwordAnswer">The password answer for the new user</param>
+            <param name="username">The user name for the new user. </param>
+            <param name="providerUserKey">The unique identifier from the membership data source for the user.</param>
+            <param name="password">The password for the new user. </param>
+            <param name="passwordQuestion">The password question for the new user.</param>
+            <param name="email">The e-mail address for the new user.</param>
+            <param name="status">A <see cref="T:System.Web.Security.MembershipCreateStatus"></see> enumeration value indicating whether the user was created successfully.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.ChangePasswordQuestionAndAnswer(System.String,System.String,System.String,System.String)">
+            <summary>
+            Processes a request to update the password question and answer for a membership user.
+            </summary>
+            
+            <returns>
+            true if the password question and answer are updated successfully; otherwise, false.
+            </returns>
+            
+            <param name="newPasswordQuestion">The new password question for the specified user. </param>
+            <param name="newPasswordAnswer">The new password answer for the specified user. </param>
+            <param name="username">The user to change the password question and answer for. </param>
+            <param name="password">The password for the specified user. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.GetPassword(System.String,System.String)">
+            <summary>
+            Gets the password for the specified user name from the data source.
+            </summary>
+            
+            <returns>
+            The password for the specified user name.
+            </returns>
+            
+            <param name="username">The user to retrieve the password for. </param>
+            <param name="answer">The password answer for the user. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.ChangePassword(System.String,System.String,System.String)">
+            <summary>
+            Processes a request to update the password for a membership user.
+            </summary>
+            
+            <returns>
+            true if the password was updated successfully; otherwise, false.
+            </returns>
+            
+            <param name="newPassword">The new password for the specified user. </param>
+            <param name="oldPassword">The current password for the specified user. </param>
+            <param name="username">The user to update the password for. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.ResetPassword(System.String,System.String)">
+            <summary>
+            Resets a user's password to a new, automatically generated password.
+            </summary>
+            
+            <returns>
+            The new password for the specified user.
+            </returns>
+            
+            <param name="username">The user to reset the password for. </param>
+            <param name="answer">The password answer for the specified user. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.UpdateUser(System.Web.Security.MembershipUser)">
+            <summary>
+            Updates information about a user in the data source.
+            </summary>
+            
+            <param name="user">A <see cref="T:System.Web.Security.MembershipUser"></see> object that represents the user to update and the updated information for the user. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.ValidateUser(System.String,System.String)">
+            <summary>
+            Verifies that the specified user name and password exist in the data source.
+            </summary>
+            
+            <returns>
+            true if the specified username and password are valid; otherwise, false.
+            </returns>
+            
+            <param name="username">The name of the user to validate. </param>
+            <param name="password">The password for the specified user. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.UnlockUser(System.String)">
+            <summary>
+            Clears a lock so that the membership user can be validated.
+            </summary>
+            
+            <returns>
+            true if the membership user was successfully unlocked; otherwise, false.
+            </returns>
+            
+            <param name="userName">The membership user to clear the lock status for.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.GetUser(System.Object,System.Boolean)">
+            <summary>
+            Gets information from the data source for a user based on the unique identifier for the membership user. Provides an option to update the last-activity date/time stamp for the user.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Security.MembershipUser"></see> object populated with the specified user's information from the data source.
+            </returns>
+            
+            <param name="providerUserKey">The unique identifier for the membership user to get information for.</param>
+            <param name="userIsOnline">true to update the last-activity date/time stamp for the user; false to return user information without updating the last-activity date/time stamp for the user.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.GetUser(System.String,System.Boolean)">
+            <summary>
+            Gets information from the data source for a user. Provides an option to update the last-activity date/time stamp for the user.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Security.MembershipUser"></see> object populated with the specified user's information from the data source.
+            </returns>
+            
+            <param name="username">The name of the user to get information for. </param>
+            <param name="userIsOnline">true to update the last-activity date/time stamp for the user; false to return user information without updating the last-activity date/time stamp for the user. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.GetUserNameByEmail(System.String)">
+            <summary>
+            Gets the user name associated with the specified e-mail address.
+            </summary>
+            
+            <returns>
+            The user name associated with the specified e-mail address. If no match is found, return null.
+            </returns>
+            
+            <param name="email">The e-mail address to search for. </param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.DeleteUser(System.String,System.Boolean)">
+            <summary>
+            Removes a user from the membership data source. 
+            </summary>
+            
+            <returns>
+            true if the user was successfully deleted; otherwise, false.
+            </returns>
+            
+            <param name="username">The name of the user to delete.</param>
+            <param name="deleteAllRelatedData">true to delete data related to the user from the database; false to leave data related to the user in the database.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.GetAllUsers(System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            Gets a collection of all the users in the data source in pages of data.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Security.MembershipUserCollection"></see> collection that contains a page of pageSize<see cref="T:System.Web.Security.MembershipUser"></see> objects beginning at the page specified by pageIndex.
+            </returns>
+            
+            <param name="totalRecords">The total number of matched users.</param>
+            <param name="pageIndex">The index of the page of results to return. pageIndex is zero-based.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.GetNumberOfUsersOnline">
+            <summary>
+            Gets the number of users currently accessing the application.
+            </summary>
+            
+            <returns>
+            The number of users currently accessing the application.
+            </returns>
+            
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.FindUsersByName(System.String,System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            Gets a collection of membership users where the user name contains the specified user name to match.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Security.MembershipUserCollection"></see> collection that contains a page of pageSize<see cref="T:System.Web.Security.MembershipUser"></see> objects beginning at the page specified by pageIndex.
+            </returns>
+            
+            <param name="totalRecords">The total number of matched users.</param>
+            <param name="pageIndex">The index of the page of results to return. pageIndex is zero-based.</param>
+            <param name="usernameToMatch">The user name to search for.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="M:Spring.Web.Providers.MembershipProviderAdapter.FindUsersByEmail(System.String,System.Int32,System.Int32,System.Int32@)">
+            <summary>
+            Gets a collection of membership users where the e-mail address contains the specified e-mail address to match.
+            </summary>
+            
+            <returns>
+            A <see cref="T:System.Web.Security.MembershipUserCollection"></see> collection that contains a page of pageSize<see cref="T:System.Web.Security.MembershipUser"></see> objects beginning at the page specified by pageIndex.
+            </returns>
+            
+            <param name="totalRecords">The total number of matched users.</param>
+            <param name="pageIndex">The index of the page of results to return. pageIndex is zero-based.</param>
+            <param name="emailToMatch">The e-mail address to search for.</param>
+            <param name="pageSize">The size of the page of results to return.</param>
+        </member>
+        <member name="P:Spring.Web.Providers.MembershipProviderAdapter.Name">
+            <summary>
+            Gets the friendly name used to refer to the provider during configuration.
+            </summary>
+            
+            <returns>
+            The friendly name used to refer to the provider during configuration.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.MembershipProviderAdapter.Description">
+            <summary>
+            Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+            </summary>
+            
+            <returns>
+            A brief, friendly description suitable for display in administrative tools or other UIs.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.MembershipProviderAdapter.EnablePasswordRetrieval">
+            <summary>
+            Indicates whether the membership provider is configured to allow users to retrieve their passwords.
+            </summary>
+            
+            <returns>
+            true if the membership provider is configured to support password retrieval; otherwise, false. The default is false.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.MembershipProviderAdapter.EnablePasswordReset">
+            <summary>
+            Indicates whether the membership provider is configured to allow users to reset their passwords.
+            </summary>
+            
+            <returns>
+            true if the membership provider supports password reset; otherwise, false. The default is true.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.MembershipProviderAdapter.RequiresQuestionAndAnswer">
+            <summary>
+            Gets a value indicating whether the membership provider is configured to require the user to answer a password question for password reset and retrieval.
+            </summary>
+            
+            <returns>
+            true if a password answer is required for password reset and retrieval; otherwise, false. The default is true.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.MembershipProviderAdapter.ApplicationName">
+            <summary>
+            The name of the application using the custom membership provider.
+            </summary>
+            
+            <returns>
+            The name of the application using the custom membership provider.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.MembershipProviderAdapter.MaxInvalidPasswordAttempts">
+            <summary>
+            Gets the number of invalid password or password-answer attempts allowed before the membership user is locked out.
+            </summary>
+            
+            <returns>
+            The number of invalid password or password-answer attempts allowed before the membership user is locked out.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.MembershipProviderAdapter.PasswordAttemptWindow">
+            <summary>
+            Gets the number of minutes in which a maximum number of invalid password or password-answer attempts are allowed before the membership user is locked out.
+            </summary>
+            
+            <returns>
+            The number of minutes in which a maximum number of invalid password or password-answer attempts are allowed before the membership user is locked out.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.MembershipProviderAdapter.RequiresUniqueEmail">
+            <summary>
+            Gets a value indicating whether the membership provider is configured to require a unique e-mail address for each user name.
+            </summary>
+            
+            <returns>
+            true if the membership provider requires a unique e-mail address; otherwise, false. The default is true.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.MembershipProviderAdapter.PasswordFormat">
+            <summary>
+            Gets a value indicating the format for storing passwords in the membership data store.
+            </summary>
+            
+            <returns>
+            One of the <see cref="T:System.Web.Security.MembershipPasswordFormat"></see> values indicating the format for storing passwords in the data store.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.MembershipProviderAdapter.MinRequiredPasswordLength">
+            <summary>
+            Gets the minimum length required for a password.
+            </summary>
+            
+            <returns>
+            The minimum length required for a password. 
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.MembershipProviderAdapter.MinRequiredNonAlphanumericCharacters">
+            <summary>
+            Gets the minimum number of special characters that must be present in a valid password.
+            </summary>
+            
+            <returns>
+            The minimum number of special characters that must be present in a valid password.
+            </returns>
+            
+        </member>
+        <member name="P:Spring.Web.Providers.MembershipProviderAdapter.PasswordStrengthRegularExpression">
+            <summary>
+            Gets the regular expression used to evaluate a password.
+            </summary>
+            
+            <returns>
+            A regular expression used to evaluate a password.
+            </returns>
+            
+        </member>
+        <member name="T:Spring.Util.VirtualEnvironment">
+            <summary>
+            Provides platform independent access to HttpRuntime methods
+            </summary>
+            <remarks>
+            For e.g. testing purposes, the default environment implementation may be replaced using <see cref="M:Spring.Util.VirtualEnvironment.SetInstance(Spring.Util.IVirtualEnvironment)"/>.
+            </remarks>
+            <author>Erich Eichinger</author>
+            <version>$Id: VirtualEnvironment.cs,v 1.5 2008/03/14 12:02:45 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Util.VirtualEnvironment.SetInstance(Spring.Util.IVirtualEnvironment)">
+            <summary>
+            Replaces the current enviroment implementation.
+            </summary>
+            <param name="newEnvironment">the new environment implementation to be used</param>
+            <returns>the previously set environment instance</returns>
+        </member>
+        <member name="M:Spring.Util.VirtualEnvironment.MapPath(System.String)">
+            <summary>
+            Maps a virtual path to it's physical location
+            </summary>
+        </member>
+        <member name="M:Spring.Util.VirtualEnvironment.RaiseEndRequest(System.Object,System.EventArgs)">
+            <summary>
+            Receives EndRequest-event from an <see cref="T:System.Web.HttpApplication"/> instance
+            and dispatches it to all handlers registered with this module.
+            </summary>
+            <param name="sender">the HttpApplication instance sending this event</param>
+            <param name="e">always <see cref="F:System.EventArgs.Empty"/></param>
+        </member>
+        <member name="M:Spring.Util.VirtualEnvironment.RaiseEndSession(System.Web.SessionState.HttpSessionState,System.Web.Caching.CacheItemRemovedReason)">
+            <summary>
+            Receives the EndSession-event and dispatches it to all handlers
+            registered with this module.
+            </summary>
+        </member>
+        <member name="M:Spring.Util.VirtualEnvironment.SetInitialized">
+            <summary>
+            Signals, that VirtualEnvironment is ready to accept 
+            handler registrations for EndRequest and EndSession events
+            </summary>
+        </member>
+        <member name="M:Spring.Util.VirtualEnvironment.AssertInitialized">
+            <summary>
+            Ensures, that WebSupportModule has been initialized. Otherwise an exception is thrown.
+            </summary>
+        </member>
+        <member name="P:Spring.Util.VirtualEnvironment.ApplicationVirtualPath">
+            <summary>
+            The virtual (rooted) path of the current Application containing a leading '/' as well as a trailing '/'
+            </summary>
+        </member>
+        <member name="P:Spring.Util.VirtualEnvironment.CurrentVirtualPath">
+            <summary>
+            The virtual (rooted) path of the current Request including <see cref="P:System.Web.HttpRequest.PathInfo"/>
+            </summary>
+        </member>
+        <member name="P:Spring.Util.VirtualEnvironment.CurrentVirtualFilePath">
+            <summary>
+            The virtual (rooted) path of the current Request without trailing <see cref="P:System.Web.HttpRequest.PathInfo"/>
+            </summary>
+        </member>
+        <member name="P:Spring.Util.VirtualEnvironment.CurrentExecutionFilePath">
+            <summary>
+            The virtual (rooted) path of the currently executing script
+            </summary>
+        </member>
+        <member name="E:Spring.Util.VirtualEnvironment.EndRequest">
+            <summary>
+            Register with this event to receive any EndRequest event occuring in the current AppDomain.
+            </summary>
+        </member>
+        <member name="E:Spring.Util.VirtualEnvironment.EndSession">
+            <summary>
+            Register with this event to receive any EndSession event occuring in the current AppDomain
+            </summary>
+            <remarks>
+            This event may be raised asynchronously on it's own thread.
+            Don't rely on e.g. <see cref="P:System.Web.HttpContext.Current"/> being available.
+            </remarks>
+        </member>
+        <member name="P:Spring.Util.VirtualEnvironment.IsInitialized">
+            <summary>
+            Is this VirtualEnviroment ready to accept handler registrations
+            for EndRequest and EndSession events ?
+            </summary>
+        </member>
+        <member name="T:Spring.Util.VirtualEnvironment.RequestEventHandler">
+            <summary>
+            Represents a method that handles Request related events
+            </summary>
+        </member>
+        <member name="T:Spring.Util.VirtualEnvironment.SessionEventHandler">
+            <summary>
+            Represents a method that handles Session related events
+            </summary>
+        </member>
+        <member name="T:Spring.Util.VirtualEnvironment.HttpRuntimeEnvironment">
+            <summary>
+            Implementation for running within HttpRuntime
+            </summary>
+        </member>
+        <member name="T:Spring.Globalization.Resolvers.SessionCultureResolver">
+            <summary>
+            Culture resolver that uses HTTP session to store culture information.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SessionCultureResolver.cs,v 1.3 2007/08/25 14:26:35 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.SessionCultureResolver.ResolveCulture">
+            <summary>
+            Resolves the culture from the request.
+            </summary>
+            <remarks>
+            If culture information doesn't exist in the session, it will be created and its value will 
+            be set to the value of the 'Accept-Language' request header, or if no
+            headers are specified to the culture of the current server thread.
+            </remarks>
+            <returns>Culture that should be used to render view.</returns>
+        </member>
+        <member name="M:Spring.Globalization.Resolvers.SessionCultureResolver.SetCulture(System.Globalization.CultureInfo)">
+            <summary>
+            Sets the culture.
+            </summary>
+            <param name="culture">The new culture or <code>null</code> to clear the culture.</param>
+        </member>
+        <member name="P:Spring.Globalization.Resolvers.SessionCultureResolver.SessionCulture">
+            <summary>
+            Gets/Sets the current session's culture.
+            </summary>
+        </member>
+        <member name="T:Spring.Globalization.AspNetResourceCache">
+            <summary>
+            Resource cache implementation that uses ASP.NET <see cref="T:System.Web.Caching.Cache"/> to cache resources.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: AspNetResourceCache.cs,v 1.6 2007/08/03 06:08:59 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Globalization.AspNetResourceCache.GetResources(System.String)">
+            <summary>
+            Gets the list of resources from cache.
+            </summary>
+            <param name="cacheKey">Cache key to use for lookup.</param>
+            <returns>A list of cached resources for the specified target object and culture.</returns>
+        </member>
+        <member name="M:Spring.Globalization.AspNetResourceCache.PutResources(System.String,System.Collections.IList)">
+            <summary>
+            Puts the list of resources in the cache.
+            </summary>
+            <param name="cacheKey">Cache key to use for the specified resources.</param>
+            <param name="resources">A list of resources to cache.</param>
+        </member>
+        <member name="T:Spring.Web.Providers.ConfigurableXmlSiteMapProvider">
+            <summary>
+            A spring-configurable version of <see cref="T:System.Web.Security.SqlRoleProvider"/>
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: ConfigurableXmlSiteMapProvider.cs,v 1.1 2007/07/26 14:43:56 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Providers.ConfigurableXmlSiteMapProvider.Initialize(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Initializes the provider.
+            </summary>
+            
+            <param name="config">
+             <para>
+             A collection of the name/value pairs representing the provider-specific 
+             attributes specified in the configuration for this provider.
+             </para>
+             Values may be overridden by specifying them in <see cref="P:Spring.Web.Providers.ConfigurableXmlSiteMapProvider.Parameters"/> list.
+             </param>
+            <param name="name">The friendly name of the provider.</param>
+            <exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+            <exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+            <exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        </member>
+        <member name="P:Spring.Web.Providers.ConfigurableXmlSiteMapProvider.SiteMapFile">
+            <summary>
+            The XML file to be used for reading in the sitemap
+            </summary>
+        </member>
+        <member name="P:Spring.Web.Providers.ConfigurableXmlSiteMapProvider.Parameters">
+            <summary>
+            A collection of the name/value pairs representing the provider-specific
+            attributes specified in the configuration for this provider.
+            </summary> 
+        </member>
+        <member name="T:Spring.Objects.Factory.Xml.WebObjectsNamespaceParser">
+            <summary>
+            A custom implementation of the
+            <see cref="T:Spring.Objects.Factory.Xml.INamespaceParser"/>
+            interface that properly handles web application specific attributes,
+            such as object scope.
+            </summary>
+            <remarks>
+            <p>
+            Parses object definitions according to the standard Spring.NET schema.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: WebObjectsNamespaceParser.cs,v 1.1 2007/08/07 23:22:30 markpollack Exp $</version>
+            <see cref="T:Spring.Objects.Factory.Xml.ObjectsNamespaceParser"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.WebObjectsNamespaceParser.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Xml.WebObjectsNamespaceParser"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.WebObjectsNamespaceParser.ParseObjectDefinition(System.Xml.XmlElement,System.String,Spring.Objects.Factory.Xml.ObjectDefinitionParserHelper)">
+            <summary>
+            Parses an object definition and set various web related properties
+            if the definition is an <see cref="T:Spring.Objects.Factory.Support.RootWebObjectDefinition"/>.
+            </summary>
+            <param name="element">The object definition element.</param>
+            <param name="id">The id / name of the object definition.</param>
+            <param name="parserHelper">the parser helper</param>
+            <returns>The object (definition).</returns>
+            <remarks>
+            	<p>
+            The <i>'various web related properties'</i> currently includes the
+            intended scope of the object.
+            </p>
+            </remarks>
+            <see cref="T:Spring.Objects.Factory.Support.ObjectScope"/>
+            <see cref="T:Spring.Objects.Factory.Support.IWebObjectDefinition"/>
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.WebObjectsNamespaceParser.CalculateId(System.Xml.XmlElement,System.Collections.ArrayList)">
+            <summary>
+            Calculates an id for an object definition.
+            </summary>
+            <param name="element">
+            The element containing the object definition.
+            </param>
+            <param name="aliases">
+            The list of names defined for the object; may be <see lang="null"/>
+            or even empty.
+            </param>
+            <returns>
+            A calculated object definition id.
+            </returns>
+            <seealso cref="M:Spring.Objects.Factory.Xml.ObjectsNamespaceParser.CalculateId(System.Xml.XmlElement,System.Collections.ArrayList)"/>.
+        </member>
+        <member name="M:Spring.Objects.Factory.Xml.WebObjectsNamespaceParser.GetScope(System.String)">
+            <summary>
+            Gets the scope out of the supplied <paramref name="value"/>.
+            </summary>
+            <remarks>
+            <p>
+            If the supplied <paramref name="value"/> is invalid
+            (i.e. it does not resolve to one of the 
+            <see cref="T:Spring.Objects.Factory.Support.ObjectScope"/> values),
+            then the return value of this method call will be
+            <see cref="F:Spring.Objects.Factory.Support.ObjectScope.Default"/>;
+            no exception will be raised (although the value of the invalid
+            scope <paramref name="value"/> will be logged).
+            </p>
+            </remarks>
+            <param name="value">The string containing the scope name.</param>
+            <returns>The scope.</returns>
+            <seealso cref="T:Spring.Objects.Factory.Support.ObjectScope"/>
+        </member>
+        <member name="T:Spring.Web.UI.MasterPage">
+            <summary>
+            Spring.NET Master Page implementation for ASP.NET 2.0
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: MasterPage.cs,v 1.15 2008/04/22 15:08:59 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.OnInit(System.EventArgs)">
+            <summary>
+            Initializes user control.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.OnPreRender(System.EventArgs)">
+            <summary>
+            Binds data from the data model into controls and raises
+            PreRender event afterwards.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.OnInitializeControls(System.EventArgs)">
+            <summary>
+            Raises InitializeControls event.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.LoadControl(System.String)">
+            <summary>
+            Obtains a <see cref="T:System.Web.UI.UserControl"/> object from a user control file
+            and injects dependencies according to Spring config file.
+            </summary>
+            <param name="virtualPath">The virtual path to a user control file.</param>
+            <returns>
+            Returns the specified <see langword="UserControl"/> object, with dependencies injected.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.LoadControl(System.Type,System.Object[])">
+            <summary>
+            Obtains a <see cref="T:System.Web.UI.UserControl"/> object by type
+            and injects dependencies according to Spring config file.
+            </summary>
+            <param name="t">The type of a user control.</param>
+            <param name="parameters">parameters to pass to the control</param>
+            <returns>
+            Returns the specified <see langword="UserControl"/> object, with dependencies injected.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.OnDataBound(System.EventArgs)">
+            <summary>
+            Raises DataBound event.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.OnDataUnbound(System.EventArgs)">
+            <summary>
+            Raises DataBound event.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.InitializeMessageSource">
+            <summary>
+            Initializes local message source
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.GetLocalResourceManager">
+            <summary>
+            Creates and returns local ResourceManager for this page.
+            </summary>
+            <remarks>
+            <para>
+            In ASP.NET 1.1, this method loads local resources from the web application assembly.
+            </para>
+            <para>
+            However, in ASP.NET 2.0, local resources are compiled into the dynamic assembly, 
+            so we need to find that assembly instead and load the resources from it.
+            </para>
+            </remarks>
+            <returns>Local ResourceManager instance.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.GetMessage(System.String)">
+            <summary>
+            Returns message for the specified resource name.
+            </summary>
+            <param name="name">Resource name.</param>
+            <returns>Message text.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.GetMessage(System.String,System.Object[])">
+            <summary>
+            Returns message for the specified resource name.
+            </summary>
+            <param name="name">Resource name.</param>
+            <param name="args">Message arguments that will be used to format return value.</param>
+            <returns>Formatted message text.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.GetResourceObject(System.String)">
+            <summary>
+            Returns resource object for the specified resource name.
+            </summary>
+            <param name="name">Resource name.</param>
+            <returns>Resource object.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.Validate(System.Object,Spring.Validation.IValidator[])">
+            <summary>
+            Evaluates specified validators and returns <c>True</c> if all of them are valid.
+            </summary>
+            <remarks>
+            <p>
+            Each validator can itself represent a collection of other validators if it is
+            an instance of <see cref="T:Spring.Validation.ValidatorGroup"/> or one of its derived types.
+            </p>
+            <p>
+            Please see the Validation Framework section in the documentation for more info.
+            </p>
+            </remarks>
+            <param name="validationContext">Object to validate.</param>
+            <param name="validators">Validators to evaluate.</param>
+            <returns>
+            <c>True</c> if all of the specified validators are valid, <c>False</c> otherwise.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.CreateValidatorParameters">
+            <summary>
+            Creates the validator parameters.
+            </summary>
+            <remarks>
+            <para>
+            This method can be overriden if you want to pass additional parameters
+            to the validation framework, but you should make sure that you call
+            this base implementation in order to add page, session, application,
+            request, response and context to the variables collection.
+            </para>
+            </remarks>
+            <returns>
+            Dictionary containing parameters that should be passed to
+            the data validation framework.
+            </returns>
+        </member>
+        <member name="M:Spring.Web.UI.MasterPage.AddedControl(System.Web.UI.Control,System.Int32)">
+            <summary>
+            Injects dependencies before adding the control.
+            </summary>
+        </member>
+        <member name="E:Spring.Web.UI.MasterPage.InitializeControls">
+            <summary>
+            This event is raised before Load event and should be used to initialize
+            controls as necessary.
+            </summary>
+        </member>
+        <member name="E:Spring.Web.UI.MasterPage.DataBound">
+            <summary>
+            This event is raised after all controls have been populated with values
+            from the data model.
+            </summary>
+        </member>
+        <member name="E:Spring.Web.UI.MasterPage.DataUnbound">
+            <summary>
+            This event is raised after data model has been populated with values from
+            web controls.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.MasterPage.ApplicationContext">
+            <summary>
+            Gets or sets Spring application context.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.MasterPage.Localizer">
+            <summary>
+            Gets or sets the localizer.
+            </summary>
+            <value>The localizer.</value>
+        </member>
+        <member name="P:Spring.Web.UI.MasterPage.MessageSource">
+            <summary>
+            Gets or sets the local message source.
+            </summary>
+            <value>The local message source.</value>
+        </member>
+        <member name="P:Spring.Web.UI.MasterPage.UserCulture">
+            <summary>
+            Gets or sets user's culture
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.MasterPage.ValidationErrors">
+            <summary>
+            Gets the validation errors container.
+            </summary>
+            <value>The validation errors container.</value>
+        </member>
+        <member name="P:Spring.Web.UI.MasterPage.Page">
+            <summary>
+            Overrides Page property to return <see cref="T:Spring.Web.UI.Page"/> 
+            instead of <see cref="T:System.Web.UI.Page"/>.
+            </summary>
+        </member>
+        <member name="P:Spring.Web.UI.MasterPage.Spring#Web#Support#ISupportsWebDependencyInjection#DefaultApplicationContext">
+            <summary>
+            Holds the default ApplicationContext to be used during DI.
+            </summary>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.RadioButtonGroup">
+            <summary>
+            Groups radio button controls and returns the value of the selected control
+            </summary>
+            <remarks>
+            This control alows radio buttons to be data-bound to a data model of the page.
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: RadioButtonGroup.cs,v 1.5 2007/03/16 22:38:55 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.RadioButtonGroup.AddedControl(System.Web.UI.Control,System.Int32)">
+            <summary>
+            Overloaded to track addition of contained <see cref="T:System.Web.UI.WebControls.RadioButton"/> controls.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.RadioButtonGroup.RemovedControl(System.Web.UI.Control)">
+            <summary>
+            Overloaded to track removal of a RadioButton
+            </summary>
+            <param name="control"></param>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.RadioButtonGroup.OnPreRender(System.EventArgs)">
+            <summary>
+            Registers the RadioButtonGroup for PostBack.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.RadioButtonGroup.Render(System.Web.UI.HtmlTextWriter)">
+            <summary>
+            Renders only children of this control.
+            </summary>
+            <param name="writer">HtmlTextWriter to use for rendering.</param>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.RadioButtonGroup.LoadPostData(System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Loads postback data into the control.
+            </summary>
+            <param name="postDataKey">Key that should be used to retrieve data.</param>
+            <param name="postCollection">Postback data collection.</param>
+            <returns>True if data has changed, false otherwise.</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.RadioButtonGroup.RaisePostDataChangedEvent">
+            <summary>
+            Raises SelectionChanged event.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.RadioButtonGroup.OnSelectionChanged(System.EventArgs)">
+            <summary>
+            Method that is called on postback if selected radio button has changed.
+            </summary>
+            <param name="e">Empty event argument.</param>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.RadioButtonGroup.Value">
+            <summary>
+            Gets or sets the ID of the selected radio button.
+            </summary>
+            <value>ID of the selected radio button.</value>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.RadioButtonGroup.AutoPostBack">
+            <summary>
+            Gets or sets whether form should be posted back on every selection change
+            within the radio group.
+            </summary>
+        </member>
+        <member name="E:Spring.Web.UI.Controls.RadioButtonGroup.SelectionChanged">
+            <summary>
+            Occurs when the value of the radio button group changes between postbacks to the server.
+            </summary>
+        </member>
+        <member name="T:Spring.Objects.Factory.Support.WebInstantiationStrategy">
+            <summary>
+            Object instantiation strategy for use in
+            <see cref="T:Spring.Objects.Factory.Support.WebObjectFactory"/>.
+            </summary>
+            <remarks>
+            <p>
+            This strategy checks if objects id ASP.Net page and if it is uses
+            PageParser to compile and instantiate page instance. Otherwise it
+            delagates call to its parent.
+            </p>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: WebInstantiationStrategy.cs,v 1.4 2008/05/02 16:44:50 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebInstantiationStrategy.#ctor">
+            <summary>
+            Creates a new instance of the
+            <see cref="T:Spring.Objects.Factory.Support.WebInstantiationStrategy"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Objects.Factory.Support.WebInstantiationStrategy.Instantiate(Spring.Objects.Factory.Support.RootObjectDefinition,System.String,Spring.Objects.Factory.IObjectFactory)">
+            <summary>
+            Instantiate an instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </summary>
+            <param name="definition">
+            The definition of the object that is to be instantiated.
+            </param>
+            <param name="name">
+            The name associated with the object definition. The name can be the null
+            or zero length string if we're autowiring an object that doesn't belong
+            to the supplied <paramref name="factory"/>.
+            </param>
+            <param name="factory">
+            The owning <see cref="T:Spring.Objects.Factory.IObjectFactory"/>
+            </param>
+            <returns>
+            An instance of the object described by the supplied
+            <paramref name="definition"/> from the supplied <paramref name="factory"/>.
+            </returns>
+        </member>
+        <member name="T:Spring.Web.Support.SharedStateResourceCache">
+            <summary>
+            Resource cache implementation that uses Spring.NET page/handler state to cache resources.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: SharedStateResourceCache.cs,v 1.1 2007/08/03 08:31:25 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.Support.SharedStateResourceCache.GetResources(System.String)">
+            <summary>
+            Gets the list of resources from cache.
+            </summary>
+            <param name="cacheKey">Cache key to use for lookup.</param>
+            <returns>A list of cached resources for the specified target object and culture.</returns>
+        </member>
+        <member name="M:Spring.Web.Support.SharedStateResourceCache.PutResources(System.String,System.Collections.IList)">
+            <summary>
+            Puts the list of resources in the cache.
+            </summary>
+            <param name="cacheKey">Cache key to use for the specified resources.</param>
+            <param name="resources">A list of resources to cache.</param>
+        </member>
+        <member name="T:Spring.Web.UI.Validation.IconValidationErrorsRenderer">
+            <summary>
+            Implementation of <see cref="T:Spring.Web.UI.Validation.IValidationErrorsRenderer"/> that 
+            displays an error image to let user know there is an error, and
+            tooltip to display actual error messages.
+            </summary>
+            <remarks>
+            <para>
+            This renderer's behavior is similar to Windows Forms error provider.
+            </para>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: IconValidationErrorsRenderer.cs,v 1.1 2007/08/02 19:50:28 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Validation.IconValidationErrorsRenderer.RenderErrors(Spring.Web.UI.Page,System.Web.UI.HtmlTextWriter,System.Collections.IList)">
+            <summary>
+            Renders validation errors using specified <see cref="T:System.Web.UI.HtmlTextWriter"/>.
+            </summary>
+            <param name="page">Web form instance.</param>
+            <param name="writer">An HTML writer to use.</param>
+            <param name="errors">The list of validation errors.</param>
+        </member>
+        <member name="P:Spring.Web.UI.Validation.IconValidationErrorsRenderer.IconSrc">
+            <summary>
+            Gets or sets the name of the image file to use as an error icon.
+            </summary>
+            <remarks>
+            <para>
+            Image name should be relative to the value of the <see cref="P:Spring.Web.UI.Page.ImagesRoot"/>
+            property, and should not use leading path separator.
+            </para>
+            </remarks>
+            <value>The name of the image file to use as an error icon.</value>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.Head">
+            <summary>
+            This control should be used instead of standard HTML <c>head</c> tag
+            in order to render dynamicaly registered head scripts and stylesheets.
+            </summary>
+            <remarks>
+            If you need to use ASP.NETs built-in &lt;head&gt; tag, you should nest Spring's <see cref="T:Spring.Web.UI.Controls.Head"/> within ASP.NET's:
+            <example>
+            &lt;html&gt;
+              &lt;head&gt;
+                &lt;title&gt;Some Title&lt;/title&gt;
+                &lt;spring:head&gt;
+                    &lt;-- will render styleblocks etc. here --&gt;
+                &lt;/spring:head&gt;
+              &lt;/head&gt;
+            &lt;/html&gt;
+            </example>
+            </remarks>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: Head.cs,v 1.8 2007/11/28 23:26:19 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.Head.Render(System.Web.UI.HtmlTextWriter)">
+            <summary>
+            Sends server control content to a provided <see cref="T:System.Web.UI.HtmlTextWriter"/> object, which writes the content to
+            be rendered on
+            the client.
+            </summary>
+            <param name="writer">The <see langword="HtmlTextWriter"/> object that receives the server control content.</param>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.Head.DefaultStyleType">
+            <summary>
+            Gets or sets the default mimetype for the &lt;style&gt; element's 'type' attribute
+            </summary>
+            <remarks>
+            Defaults to "text/css"
+            </remarks>
+        </member>
+        <member name="P:Spring.Web.UI.Controls.Head.Page">
+            <summary>
+            Gets a reference to the <see cref="T:Spring.Web.UI.Page"/> instance that contains the
+            server control.
+            </summary>
+            <value></value>
+        </member>
+        <member name="T:Spring.Web.UI.Controls.DataBindingPanel">
+            <summary>
+            Any WebControl placed on a DataBindingPanel may be bound 
+            to a model by adding an attribute "BindingTarget"
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: DataBindingPanel.cs,v 1.13 2008/03/06 20:23:44 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.DataBindingPanel.OnInit(System.EventArgs)">
+            <summary>
+            Registers this control for the <see cref="E:Spring.Web.UI.UserControl.DataBindingsInitialized"/> event of it's container.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.DataBindingPanel.OnPreRender(System.EventArgs)">
+            <summary>
+            Overridden to remove custom binding attributes before rendering.
+            </summary>
+            <param name="e"></param>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.DataBindingPanel.Render(System.Web.UI.HtmlTextWriter)">
+            <summary>
+            Overriden to suppress rendering this control's tag
+            </summary>
+            <param name="writer"></param>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.DataBindingPanel.BindingOwner_DataBindingsInitialized(System.Object,System.EventArgs)">
+            <summary>
+            Called by the containing <see cref="T:Spring.Web.UI.UserControl"/> if bindings must be initialized.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.DataBindingPanel.TraverseControls(Spring.DataBinding.IWebDataBound,System.Web.UI.ControlCollection,Spring.Web.UI.Controls.DataBindingPanel.TraversalAction)">
+            <summary>
+            Adds all controls on this panel to the containing <see cref="P:Spring.Web.UI.UserControl.BindingManager"/>'s binding collection.
+            </summary>
+            <param name="bindingContainer">the usercontrol containing this panel</param>
+            <param name="controls">the <see cref="T:System.Web.UI.ControlCollection"/> of controls to be bound</param>
+            <param name="action">action to be performed on matching controls</param>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.DataBindingPanel.BindControl(Spring.DataBinding.IWebDataBound,System.Web.UI.WebControls.WebControl)">
+            <summary>
+            Retrieves custom binding attributes from a webcontrol and adds a new binding
+            instance to the container's <see cref="P:Spring.Web.UI.UserControl.BindingManager"/> if necessary.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.DataBindingPanel.RemoveBindingAttributes(Spring.DataBinding.IWebDataBound,System.Web.UI.WebControls.WebControl)">
+            <summary>
+            Removes custom binding attributes from a webcontrol to avoid them being rendered.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.DataBindingPanel.AutoProbeBindingType(System.Web.UI.Control)">
+            <summary>
+            Probe for bindingType of know controls
+            </summary>
+            <param name="wc">the control, who's bindingType is to be determined</param>
+            <returns>null, if standard binding is to be used or the fully qualified typename of the binding implementation</returns>
+        </member>
+        <member name="M:Spring.Web.UI.Controls.DataBindingPanel.AutoProbeSourceProperty(System.Web.UI.Control)">
+            <summary>
+            Probes for a few know controls and their properties.
+            </summary>
+            <returns>
+            The 'BindingSource' expression to be used for binding this control.
+            </returns>
+        </member>
+        <member name="T:Spring.Web.Support.ControlInterceptor">
+            <summary>
+            Support Class providing a method to ensure a control has been intercepted
+            </summary>
+            <author>Erich Eichinger</author>
+            <version>$Id: ControlInterceptor.cs,v 1.2 2008/05/13 14:22:47 oakinger Exp $</version>
+        </member>
+        <member name="F:Spring.Web.Support.ControlInterceptor.s_availableInterceptionStrategies">
+            <summary>
+            Holds all available interception strategies
+            </summary>
+        </member>
+        <member name="F:Spring.Web.Support.ControlInterceptor.s_cachedInterceptionStrategies">
+            <summary>
+            Holds a control.GetType()->IInterceptionStrategy table.
+            </summary>
+        </member>
+        <member name="M:Spring.Web.Support.ControlInterceptor.EnsureControlIntercepted(Spring.Context.IApplicationContext,System.Web.UI.Control)">
+            <summary>
+            Ensures, a control has been intercepted to support Web-DI. If not, the control will be intercepted.
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/src/Spring/Spring.Web/Threading/HttpContextStorage.cs b/src/Spring/Spring.Web/Threading/HttpContextStorage.cs
new file mode 100644
index 00000000..4c0d19e0
--- /dev/null
+++ b/src/Spring/Spring.Web/Threading/HttpContextStorage.cs
@@ -0,0 +1,41 @@
+using System.Web;
+
+namespace Spring.Threading
+{
+    /// <summary>
+    /// Implements <see cref="IThreadStorage"/> by using <see cref="HttpContext"/>.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: HttpContextStorage.cs,v 1.1 2007/02/02 21:31:25 oakinger Exp $</version>  
+    public class HttpContextStorage : IThreadStorage
+    {
+        /// <summary>
+        /// Retrieves an object with the specified name.
+        /// </summary>
+        /// <param name="name">The name of the item.</param>
+        /// <returns>The object in the context associated with the specified name or null if no object has been stored previously</returns>
+        public object GetData(string name)
+        {
+            return HttpContext.Current.Items[name];
+        }
+
+        /// <summary>
+        /// Stores a given object and associates it with the specified name.
+        /// </summary>
+        /// <param name="name">The name with which to associate the new item.</param>
+        /// <param name="value">The object to store in the call context.</param>
+        public void SetData(string name, object value)
+        {
+            HttpContext.Current.Items[name] = value;
+        }
+
+        /// <summary>
+        /// Empties a data slot with the specified name.
+        /// </summary>
+        /// <param name="name">The name of the data slot to empty.</param>
+        public void FreeNamedDataSlot(string name)
+        {
+            HttpContext.Current.Items.Remove(name);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Threading/HybridContextStorage.cs b/src/Spring/Spring.Web/Threading/HybridContextStorage.cs
new file mode 100644
index 00000000..7d76ea6d
--- /dev/null
+++ b/src/Spring/Spring.Web/Threading/HybridContextStorage.cs
@@ -0,0 +1,71 @@
+using System.Runtime.Remoting.Messaging;
+using System.Web;
+
+namespace Spring.Threading
+{
+    /// <summary>
+    /// Implements <see cref="IThreadStorage"/> by using both <see cref="HttpContext"/> and <see cref="CallContext"/> and choosing dynamically between them.
+    /// </summary>
+    /// <remarks>
+    /// In web applications a single Request may be executed on different threads. In this case HttpContext.Current is the only invariant.<br/>
+    /// This implementation dynamically chooses between <see cref="System.Runtime.Remoting.Messaging.CallContext">System.Runtime.Remoting.Messaging.CallContext</see> 
+    /// and <see cref="System.Web.HttpContext">System.Web.HttpContext</see> to store data.
+    /// </remarks>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: HybridContextStorage.cs,v 1.1 2007/02/02 21:31:25 oakinger Exp $</version>  
+    public class HybridContextStorage : IThreadStorage
+    {
+        /// <summary>
+        /// Retrieves an object with the specified name.
+        /// </summary>
+        /// <param name="name">The name of the item.</param>
+        /// <returns>The object in the context associated with the specified name or null if no object has been stored previously</returns>
+        public object GetData(string name)
+        {
+            HttpContext ctx = HttpContext.Current;
+            if(ctx == null)
+            {
+                return CallContext.GetData(name);
+            }
+            else
+            {
+                return ctx.Items[name];
+            }
+        }
+
+        /// <summary>
+        /// Stores a given object and associates it with the specified name.
+        /// </summary>
+        /// <param name="name">The name with which to associate the new item.</param>
+        /// <param name="value">The object to store in the call context.</param>
+        public void SetData(string name, object value)
+        {
+            HttpContext ctx = HttpContext.Current;
+            if(ctx == null)
+            {
+                CallContext.SetData(name, value);
+            }
+            else
+            {
+                ctx.Items[name] = value;
+            }
+        }
+
+        /// <summary>
+        /// Empties a data slot with the specified name.
+        /// </summary>
+        /// <param name="name">The name of the data slot to empty.</param>
+        public void FreeNamedDataSlot(string name)
+        {
+            HttpContext ctx = HttpContext.Current;
+            if(ctx == null)
+            {
+                CallContext.FreeNamedDataSlot(name);
+            }
+            else
+            {
+                ctx.Items.Remove(name);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Util/ControlAccessor.cs b/src/Spring/Spring.Web/Util/ControlAccessor.cs
new file mode 100644
index 00000000..27a5cc20
--- /dev/null
+++ b/src/Spring/Spring.Web/Util/ControlAccessor.cs
@@ -0,0 +1,301 @@
+#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
+
+#region Imports
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Web.UI;
+using Spring.Reflection.Dynamic;
+using Spring.Web.Support;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Helper class for easier access to reflected Control members.
+	/// </summary>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: ControlAccessor.cs,v 1.2 2008/05/13 14:22:47 oakinger Exp $</version>
+	internal class ControlAccessor
+	{
+		private static readonly MethodInfo s_miClear = GetMethod("Clear");
+        private static MethodInfo GetMethod(string name)
+        {
+            return typeof(Control).GetMethod(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
+        }
+        private static FieldInfo GetField(string name)
+        {
+            return typeof(Control).GetField(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
+        }
+
+        private delegate ControlCollection CreateControlCollectionDelegate(Control target);
+        private delegate void AddedControlDelegate(Control target, Control control, int index);
+        private delegate void RemovedControlDelegate(Control target, Control control);
+        private delegate void VoidMethodDelegate(Control target);
+
+#if NET_2_0
+        private static readonly CreateControlCollectionDelegate BaseCreateControlCollection = (CreateControlCollectionDelegate) Delegate.CreateDelegate(typeof(CreateControlCollectionDelegate), GetMethod("CreateControlCollection"));
+	    private static readonly AddedControlDelegate BaseAddedControl = (AddedControlDelegate) Delegate.CreateDelegate(typeof (AddedControlDelegate), GetMethod("AddedControl"));
+	    private static readonly RemovedControlDelegate BaseRemovedControl = (RemovedControlDelegate) Delegate.CreateDelegate(typeof (RemovedControlDelegate), GetMethod("RemovedControl"));
+	    private static readonly VoidMethodDelegate BaseClearNamingContainer = (VoidMethodDelegate) Delegate.CreateDelegate(typeof (VoidMethodDelegate), GetMethod("ClearNamingContainer"));
+#else
+        private class DynamicMethodWrapper
+        {
+            private IDynamicMethod _method;
+
+            public DynamicMethodWrapper(IDynamicMethod method)
+            {
+                _method = method;
+            }
+
+            public static CreateControlCollectionDelegate CreateControlCollection(MethodInfo methodInfo)
+            {
+                IDynamicMethod method = new SafeMethod(methodInfo);
+                return new CreateControlCollectionDelegate(new DynamicMethodWrapper(method).CreateControlCollectionInternal);
+            }
+
+            public static AddedControlDelegate AddedControl(MethodInfo methodInfo)
+            {
+                IDynamicMethod method = new SafeMethod(methodInfo);
+                return new AddedControlDelegate(new DynamicMethodWrapper(method).AddedControlInternal);
+            }
+
+            public static RemovedControlDelegate RemovedControl(MethodInfo methodInfo)
+            {
+                IDynamicMethod method = new SafeMethod(methodInfo);
+                return new RemovedControlDelegate(new DynamicMethodWrapper(method).RemovedControlInternal);
+            }
+
+            public static VoidMethodDelegate ClearNamingContainer(MethodInfo methodInfo)
+            {
+                IDynamicMethod method = new SafeMethod(methodInfo);
+                return new VoidMethodDelegate(new DynamicMethodWrapper(method).ClearNamingContainerInternal);
+            }
+
+            private ControlCollection CreateControlCollectionInternal(Control target)
+            {
+                return (ControlCollection) _method.Invoke(target, null);
+            }
+
+            private void AddedControlInternal(Control target, Control control, int index)
+            {
+                _method.Invoke(target, new object[] { control, index });
+            }
+
+            private void RemovedControlInternal(Control target, Control control)
+            {
+                _method.Invoke(target, new object[] { control });
+            }
+
+            private void ClearNamingContainerInternal(Control target)
+            {
+                _method.Invoke(target, null);
+            }
+        }
+
+        private static readonly CreateControlCollectionDelegate BaseCreateControlCollection = DynamicMethodWrapper.CreateControlCollection(GetMethod("CreateControlCollection"));
+        private static readonly AddedControlDelegate BaseAddedControl = DynamicMethodWrapper.AddedControl(GetMethod("AddedControl"));
+        private static readonly RemovedControlDelegate BaseRemovedControl = DynamicMethodWrapper.RemovedControl(GetMethod("RemovedControl"));
+        private static readonly VoidMethodDelegate BaseClearNamingContainer = DynamicMethodWrapper.ClearNamingContainer(GetMethod("ClearNamingContainer"));
+#endif
+
+        private readonly Control _targetControl;
+
+		/// <summary>
+		/// Instantiates a new Accessor.
+		/// </summary>
+		/// <param name="control"></param>
+		public ControlAccessor(Control control)
+		{
+			this._targetControl = control;
+		}
+
+		/// <summary>
+		/// Returns the underlying ControlCollection instance.
+		/// </summary>
+		public Control GetTarget()
+		{
+			return _targetControl;
+		}
+
+		/// <summary>
+		/// Gets or sets the ControlCollection of the target without accessing the target's <see cref="Control.Controls"/> property.
+		/// </summary>
+		/// <remarks>
+		/// If the underlying collection is null, it is automatically created.
+		/// </remarks>
+		public ControlCollection Controls
+		{
+			get
+			{
+				ControlCollection controls = GetChildControlCollection();
+				if (controls == null)
+				{
+                    controls = InterceptControlCollectionStrategy.TryCreateCollection(_targetControl);
+                    if (controls == null)
+                    {
+					    controls = BaseCreateControlCollection(_targetControl);                        
+                    }
+				    SetChildControlCollection(controls);
+				}
+				return controls;
+			}
+			set { SetChildControlCollection(value); }
+		}
+
+		public void AddedControl(Control control, int index)
+		{
+		    BaseAddedControl(_targetControl, control, index);
+		}
+
+		public void RemovedControl(Control control)
+		{
+		    BaseRemovedControl(_targetControl, control);
+
+			if (!_targetControl.HasControls())
+			{
+				// clear naming table etc. if collection has been cleared
+				// this is because we can't intercept Control.ClearNamingTable(),
+				// which is called by ControlCollection.Clear() after removing all controls
+				StackFrame frame = new StackFrame(3, false);
+				if (frame.GetMethod() == s_miClear)
+				{
+					if (_targetControl is INamingContainer)
+					{
+						//s_miClearNamingContainer.Invoke(_targetControl, null);
+					    BaseClearNamingContainer(_targetControl);
+					}
+				}
+			}
+		}
+
+#if NET_2_0
+        private delegate ControlCollection GetControlsDelegate(Control target);
+        private delegate void SetControlsDelegate(Control target, ControlCollection controls);
+
+        private static readonly GetControlsDelegate GetChildControlCollectionInternal = GetGetControlsDelegate();
+        private static readonly SetControlsDelegate SetChildControlCollectionInternal = GetSetControlsDelegate();
+
+        private ControlCollection GetChildControlCollection()
+        {
+            return GetChildControlCollectionInternal(_targetControl);
+        }
+
+        private void SetChildControlCollection(ControlCollection controls)
+        {
+            SetChildControlCollectionInternal(_targetControl, controls);
+        }
+
+        private static GetControlsDelegate GetGetControlsDelegate()
+        {
+            FieldInfo occasionalFields = GetField("_occasionalFields");
+            MethodInfo ensureOccasionalFields = GetMethod("EnsureOccasionalFields");
+            FieldInfo controls = occasionalFields.FieldType.GetField("Controls");
+
+            System.Reflection.Emit.DynamicMethod dm = new System.Reflection.Emit.DynamicMethod("get_Controls", typeof(ControlCollection), new Type[] { typeof(Control) }, typeof(Control).Module, true);
+            ILGenerator il = dm.GetILGenerator();
+            Label occFieldsNull = il.DefineLabel();
+            Label retControls = il.DefineLabel();
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldfld, occasionalFields);
+            il.Emit(OpCodes.Brfalse_S, occFieldsNull);
+            il.MarkLabel(retControls);
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldfld, occasionalFields);
+            il.Emit(OpCodes.Ldfld, controls);
+            il.Emit(OpCodes.Ret);
+            il.MarkLabel(occFieldsNull);
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Call, ensureOccasionalFields);
+            il.Emit(OpCodes.Br, retControls);
+
+            return (GetControlsDelegate) dm.CreateDelegate(typeof(GetControlsDelegate));
+        }
+
+        private static SetControlsDelegate GetSetControlsDelegate()
+        {
+            FieldInfo occasionalFields = GetField("_occasionalFields");
+            MethodInfo ensureOccasionalFields = GetMethod("EnsureOccasionalFields");
+            FieldInfo controls = occasionalFields.FieldType.GetField("Controls");
+
+            System.Reflection.Emit.DynamicMethod dm = new System.Reflection.Emit.DynamicMethod("set_Controls", null, new Type[] { typeof(Control), typeof(ControlCollection) }, typeof(Control).Module, true);
+            ILGenerator il = dm.GetILGenerator();
+            Label occFieldsNull = il.DefineLabel();
+            Label setControls = il.DefineLabel();
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldfld, occasionalFields);
+            il.Emit(OpCodes.Brfalse_S, occFieldsNull);
+            il.MarkLabel(setControls);
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldfld, occasionalFields);
+            il.Emit(OpCodes.Ldarg_1);
+            il.Emit(OpCodes.Stfld, controls);
+            il.Emit(OpCodes.Ret);
+            il.MarkLabel(occFieldsNull);
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Call, ensureOccasionalFields);
+            il.Emit(OpCodes.Br, setControls);
+
+            return (SetControlsDelegate) dm.CreateDelegate(typeof(SetControlsDelegate));            
+        }
+
+//		private static readonly Type s_tOccasionalFields = typeof(Control).GetNestedType("OccasionalFields", BindingFlags.NonPublic);
+//
+//	    private static readonly VoidMethodDelegate EnsureOccasionalFields = (VoidMethodDelegate) Delegate.CreateDelegate(typeof (VoidMethodDelegate), GetMethod("EnsureOccasionalFields"));
+//        private static readonly IDynamicField _occasionalFields = SafeField.CreateFrom(GetField("_occasionalFields"));
+//	    private static readonly IDynamicField _controls = SafeField.CreateFrom(s_tOccasionalFields.GetField("Controls"));
+//
+//		private ControlCollection GetChildControlCollection()
+//		{
+//			// we *must not* simply call control.Controls here! 
+//			// Some controls (e.g. Repeater overload this property and call Control.EnsureChildControls() 
+//			// which causes Control.ChildControlsCreated flag to be set and prevents children from being created after loading viewstate!
+//
+//		    EnsureOccasionalFields(_targetControl);
+//
+//			object occasionalFields = _occasionalFields.GetValue(_targetControl);
+//			object childControls =  _controls.GetValue(occasionalFields);
+//			return (ControlCollection) childControls;
+//		}
+//
+//		private void SetChildControlCollection( ControlCollection controls )
+//		{
+//		    EnsureOccasionalFields(_targetControl);
+//
+//			object occasionalFields = _occasionalFields.GetValue(_targetControl);
+//            _controls.SetValue(occasionalFields, controls);
+//		}
+#else
+	    private static readonly IDynamicField fControls = SafeField.CreateFrom(GetField("_controls"));
+
+		private ControlCollection GetChildControlCollection()
+		{
+		    return (ControlCollection)fControls.GetValue(_targetControl);
+		}
+
+		private void SetChildControlCollection(ControlCollection controls)
+		{
+            fControls.SetValue(_targetControl, controls);
+		}
+#endif
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Util/ControlCollectionAccessor.cs b/src/Spring/Spring.Web/Util/ControlCollectionAccessor.cs
new file mode 100644
index 00000000..e06dcf1d
--- /dev/null
+++ b/src/Spring/Spring.Web/Util/ControlCollectionAccessor.cs
@@ -0,0 +1,76 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Web.UI;
+using Spring.Reflection.Dynamic;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Helper class for easier access to reflected ControlCollection members.
+	/// </summary>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: ControlCollectionAccessor.cs,v 1.3 2008/05/13 23:23:03 oakinger Exp $</version>
+	internal class ControlCollectionAccessor
+	{
+	    private static readonly IDynamicField _owner = new SafeField(typeof (ControlCollection).GetField("_owner", BindingFlags.Instance | BindingFlags.NonPublic));
+		private readonly ControlCollection _controls;
+	    private readonly Type _controlsType;
+
+		/// <summary>
+		/// Returns the underlying ControlCollection instance.
+		/// </summary>
+		public ControlCollection GetTarget()
+		{
+			return _controls;
+		}
+
+		/// <summary>
+		/// Returns the type of the underlying ControlCollection instance.
+		/// </summary>
+		public Type GetTargetType()
+		{
+			return _controlsType;
+		}
+
+		/// <summary>
+		/// Creates a new Accessor for a given <see cref="ControlCollection"/>.
+		/// </summary>
+		/// <param name="controls">The <see cref="ControlCollection"/> to be accessed</param>
+		public ControlCollectionAccessor(ControlCollection controls)
+		{
+			_controls = controls;
+		    _controlsType = controls.GetType();
+		}
+
+		/// <summary>
+		/// Gets or sets the owner of the underlying ControlCollection.
+		/// </summary>
+		public Control Owner
+		{
+			get { return (Control) _owner.GetValue(_controls); }
+			set { _owner.SetValue(_controls, value); }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Util/HttpContextSwitch.cs b/src/Spring/Spring.Web/Util/HttpContextSwitch.cs
new file mode 100644
index 00000000..397244aa
--- /dev/null
+++ b/src/Spring/Spring.Web/Util/HttpContextSwitch.cs
@@ -0,0 +1,101 @@
+#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
+
+#region Imports
+
+using System;
+using System.Web;
+using Common.Logging;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Performs a <see cref="HttpContext.RewritePath(string)"/>. Original path will be restored on <see cref="Dispose"/>
+    /// </summary>
+    /// <remarks>
+    /// Rewrites the current HttpContext's filepath to &lt;directory&gt;/currentcontext.dummy.<br/>
+    /// This affects resolving resources by calls to <see cref="Spring.Util.ConfigurationUtils.GetSection"/> and <see cref="HttpRequest.MapPath(string)"/><br/>
+    /// Original path is restored during <see cref="HttpContextSwitch.Dispose"/>.
+    /// </remarks>
+    /// <example>
+    /// <code>
+    /// using( new HttpContextSwitch( "/path" ) )
+    /// {
+    ///     Response.Write( Request.FilePath ); // writes "/path/currentcontext.dummy" to response.
+    /// }
+    /// // Request.FilePath has been reset to original url here
+    /// </code>
+    /// </example>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: HttpContextSwitch.cs,v 1.1 2007/08/01 23:10:51 markpollack Exp $</version>
+    public class HttpContextSwitch : IDisposable
+    {
+        private HttpContext savedContext;
+        private string originalUrl;
+        private static readonly ILog log = LogManager.GetLogger(typeof(HttpContextSwitch));
+
+        /// <summary>
+        /// Performs an immediate call to <see cref="HttpContext.RewritePath(string)"/>
+        /// </summary>
+        /// <param name="virtualDirectory">a directory path (without trailing filename!)</param>
+        public HttpContextSwitch( string virtualDirectory )
+        {
+            HttpContext currentContext = HttpContext.Current;
+            if (currentContext == null) return; // no webrequest
+
+            virtualDirectory = WebUtils.GetVirtualDirectory(virtualDirectory);
+            string currentFileDirectory = WebUtils.GetVirtualDirectory(currentContext.Request.FilePath);
+            // only switch path if necessary
+            if (string.Compare( virtualDirectory, currentFileDirectory, true ) != 0)
+            {
+                savedContext = currentContext;
+                originalUrl = savedContext.Request.Url.PathAndQuery;
+                string newPath = virtualDirectory + "currentcontext.dummy";
+#if NET_2_0
+                savedContext.RewritePath( newPath, false );
+#else
+                savedContext.RewritePath( newPath );
+#endif
+                if (log.IsDebugEnabled) log.Debug("rewriting path from " + originalUrl + " to " + newPath + " results in " + savedContext.Request.FilePath);
+            }
+        }
+
+        /// <summary>
+        /// Restores original path if necessary
+        /// </summary>
+        public void Dispose()
+        {
+            if (savedContext != null)
+            {
+                if (log.IsDebugEnabled) log.Debug("restoring original path from " + savedContext.Request.FilePath + " back to " + originalUrl);
+                HttpContext context = savedContext;
+                savedContext = null;
+#if NET_2_0
+                context.RewritePath( originalUrl, false );
+#else
+				context.RewritePath( originalUrl );
+#endif
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Util/IVirtualEnvironment.cs b/src/Spring/Spring.Web/Util/IVirtualEnvironment.cs
new file mode 100644
index 00000000..1ef9331f
--- /dev/null
+++ b/src/Spring/Spring.Web/Util/IVirtualEnvironment.cs
@@ -0,0 +1,70 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Reflection;
+using System.Web;
+using System.Web.UI;
+using Common.Logging;
+using Spring.Context;
+using Spring.Objects.Factory;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Abstracts the underlying infrastructure of a HttpRequest
+    /// </summary>
+    public interface IVirtualEnvironment
+    {
+        /// <summary>
+        /// The virtual (rooted) path of the current Application with trailing slash
+        /// </summary>
+        /// <remarks>
+        /// For the site rooted applications, "/" will be returned, for all others "/..someappdir../"
+        /// </remarks>
+        string ApplicationVirtualPath { get; }
+        /// <summary>
+        /// The virtual (rooted) path of the current Request including <see cref="HttpRequest.PathInfo"/>
+        /// </summary>
+        string CurrentVirtualPath { get; }
+        /// <summary>
+        /// The virtual (rooted) path of the current Request without trailing <see cref="HttpRequest.PathInfo"/>
+        /// </summary>
+        string CurrentVirtualFilePath { get; }
+        /// <summary>
+        /// The virtual (rooted) path of the currently executing script
+        /// </summary>
+        /// <remarks>
+        /// Normally this property is the same as <see cref="CurrentVirtualPath"/>. 
+        /// In case of <see cref="HttpServerUtility.Transfer(string,bool)"/>, this property returns the current script 
+        /// whereas CurrentVirtualPath returns the original script path.
+        /// </remarks>
+        string CurrentExecutionFilePath { get; }
+        /// <summary>
+        /// Maps a virtual path to it's physical location
+        /// </summary>
+        string MapPath( string virtualPath );
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Util/VirtualEnvironment.cs b/src/Spring/Spring.Web/Util/VirtualEnvironment.cs
new file mode 100644
index 00000000..53443793
--- /dev/null
+++ b/src/Spring/Spring.Web/Util/VirtualEnvironment.cs
@@ -0,0 +1,286 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Web;
+using System.Web.Caching;
+using System.Web.SessionState;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Provides platform independent access to HttpRuntime methods
+    /// </summary>
+    /// <remarks>
+    /// For e.g. testing purposes, the default environment implementation may be replaced using <see cref="SetInstance(IVirtualEnvironment)" />.
+    /// </remarks>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: VirtualEnvironment.cs,v 1.5 2008/03/14 12:02:45 oakinger Exp $</version>
+    public sealed class VirtualEnvironment
+    {
+        // default to standard HttpRuntime
+        private static IVirtualEnvironment instance = new HttpRuntimeEnvironment();
+
+        /// <summary>
+        /// Represents a method that handles Request related events
+        /// </summary>
+        public delegate void RequestEventHandler(HttpContext context);
+
+        /// <summary>
+        /// Represents a method that handles Session related events
+        /// </summary>
+        public delegate void SessionEventHandler(HttpSessionState session, CacheItemRemovedReason reason);
+
+        private static readonly object syncEndRequestEvent = new object();
+        private static RequestEventHandler s_requestEvent;
+        private static readonly object syncEndSessionEvent = new object();
+        private static SessionEventHandler s_sessionEvent;
+
+        private static volatile bool s_isInitialized = false;
+
+        /// <summary>
+        /// Replaces the current enviroment implementation.
+        /// </summary>
+        /// <param name="newEnvironment">the new environment implementation to be used</param>
+        /// <returns>the previously set environment instance</returns>
+        public static IVirtualEnvironment SetInstance(IVirtualEnvironment newEnvironment)
+        {
+            IVirtualEnvironment prevEnvironment = instance;
+            instance = newEnvironment;
+            return prevEnvironment;
+        }
+
+        #region default IVirtualEnvironment Adapter for HttpRuntime         
+
+        /// <summary>
+        /// Implementation for running within HttpRuntime
+        /// </summary>
+        private class HttpRuntimeEnvironment : IVirtualEnvironment
+        {
+            public string ApplicationVirtualPath
+            {
+                get { 
+                    string appPath = HttpRuntime.AppDomainAppVirtualPath;
+                    if (!appPath.EndsWith("/")) appPath = appPath + "/";
+                    return appPath;
+                }
+            }
+
+            public string CurrentVirtualPath
+            {
+                get { return HttpContext.Current.Request.Path; }
+            }
+
+            public string CurrentVirtualFilePath
+            {
+                get { return HttpContext.Current.Request.FilePath; }
+            }
+
+            public string CurrentExecutionFilePath
+            {
+                get { return HttpContext.Current.Request.CurrentExecutionFilePath; }
+            }
+
+            public string MapPath(string virtualPath)
+            {
+                HttpContext ctx = HttpContext.Current;
+                if (ctx != null)
+                {
+                    return ctx.Request.MapPath(virtualPath);
+                }
+#if NET_2_0
+
+                if (VirtualPathUtility.IsAbsolute(virtualPath) && virtualPath.StartsWith(HttpRuntime.AppDomainAppVirtualPath))
+                {
+                    virtualPath = VirtualPathUtility.ToAppRelative(virtualPath);
+                }
+                if (VirtualPathUtility.IsAppRelative(virtualPath))
+                {
+                    virtualPath = virtualPath.Substring(2); // strip "~/"
+                    string physicalPath = Path.Combine(HttpRuntime.AppDomainAppPath, virtualPath);
+                    return physicalPath;
+                }
+#endif
+                throw new ArgumentException("can't map context relative path outside a context");
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// The virtual (rooted) path of the current Application containing a leading '/' as well as a trailing '/'
+        /// </summary>
+        public static string ApplicationVirtualPath
+        {
+            get { return instance.ApplicationVirtualPath; }
+        }
+
+        /// <summary>
+        /// The virtual (rooted) path of the current Request including <see cref="HttpRequest.PathInfo"/>
+        /// </summary>
+        public static string CurrentVirtualPath
+        {
+            get { return instance.CurrentVirtualPath; }
+        }
+
+        /// <summary>
+        /// The virtual (rooted) path of the current Request without trailing <see cref="HttpRequest.PathInfo"/>
+        /// </summary>
+        public static string CurrentVirtualFilePath
+        {
+            get { return instance.CurrentVirtualFilePath; }
+        }
+
+        /// <summary>
+        /// The virtual (rooted) path of the currently executing script
+        /// </summary>
+        public static string CurrentExecutionFilePath
+        {
+            get { return instance.CurrentExecutionFilePath; }
+        }
+
+        /// <summary>
+        /// Maps a virtual path to it's physical location
+        /// </summary>
+        public static string MapPath(string virtualPath)
+        {
+            return instance.MapPath(virtualPath);
+        }
+
+        /// <summary>
+        /// Receives EndRequest-event from an <see cref="HttpApplication"/> instance
+        /// and dispatches it to all handlers registered with this module.
+        /// </summary>
+        /// <param name="sender">the HttpApplication instance sending this event</param>
+        /// <param name="e">always <see cref="EventArgs.Empty"/></param>
+        public static void RaiseEndRequest(object sender, EventArgs e)
+        {
+            // NOTE: don't sync here for performance reasons.
+            // It is assumed, that all handlers are registered during application startup
+            if (s_requestEvent != null)
+            {
+                s_requestEvent(((HttpApplication)sender).Context);
+            }
+        }
+
+        /// <summary>
+        /// Receives the EndSession-event and dispatches it to all handlers
+        /// registered with this module.
+        /// </summary>
+        public static void RaiseEndSession(HttpSessionState sessionState, CacheItemRemovedReason reason)
+        {
+            // NOTE: don't sync here for performance reasons.
+            // It is assumed, that all handlers are registered during application startup
+            if (s_sessionEvent != null)
+            {
+                s_sessionEvent(sessionState, reason);
+            }
+        }
+
+        /// <summary>
+        /// Register with this event to receive any EndRequest event occuring in the current AppDomain.
+        /// </summary>
+        public static event RequestEventHandler EndRequest
+        {
+            add
+            {
+                AssertInitialized();
+                lock (syncEndRequestEvent)
+                {
+                    s_requestEvent += value;
+                }
+            }
+            remove
+            {
+                AssertInitialized();
+                lock (syncEndRequestEvent)
+                {
+                    s_requestEvent -= value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Register with this event to receive any EndSession event occuring in the current AppDomain
+        /// </summary>
+        /// <remarks>
+        /// This event may be raised asynchronously on it's own thread.
+        /// Don't rely on e.g. <see cref="HttpContext.Current"/> being available.
+        /// </remarks>
+        public static event SessionEventHandler EndSession
+        {
+            add
+            {
+                AssertInitialized();
+                lock (syncEndSessionEvent)
+                {
+                    s_sessionEvent += value;
+                }
+            }
+            remove
+            {
+                AssertInitialized();
+                lock (syncEndSessionEvent)
+                {
+                    s_sessionEvent -= value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Signals, that VirtualEnvironment is ready to accept 
+        /// handler registrations for EndRequest and EndSession events
+        /// </summary>
+        public static void SetInitialized()
+        {
+            s_isInitialized = true;
+        }
+
+        /// <summary>
+        /// Is this VirtualEnviroment ready to accept handler registrations
+        /// for EndRequest and EndSession events ?
+        /// </summary>
+        public static bool IsInitialized
+        {
+            get { return s_isInitialized; }
+        }
+
+        /// <summary>
+        /// Ensures, that WebSupportModule has been initialized. Otherwise an exception is thrown.
+        /// </summary>
+        private static void AssertInitialized()
+        {
+            if (!s_isInitialized)
+            {
+                string msg =
+                    @"WebSupportModule not initialized. Did you forget to add " +
+                    @"<add name=""Spring"" type=""Spring.Context.Support.WebSupportModule, Spring.Web""/> " +
+                    @"to your web.config's <httpModules>-section?";
+                throw ConfigurationUtils.CreateConfigurationException(msg);
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Util/WebUtils.cs b/src/Spring/Spring.Web/Util/WebUtils.cs
new file mode 100644
index 00000000..f0858fe5
--- /dev/null
+++ b/src/Spring/Spring.Web/Util/WebUtils.cs
@@ -0,0 +1,246 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Miscellaneous web utility methods.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: WebUtils.cs,v 1.32 2008/03/19 18:05:07 oakinger Exp $</version>
+    public sealed class WebUtils
+    {
+        #region Constructor (s) / Destructor
+
+        // CLOVER:OFF
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Util.WebUtils"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is a utility class, and as such exposes no public constructors.
+        /// </p>
+        /// </remarks>
+        private WebUtils()
+        {}
+
+        // CLOVER:ON
+
+        #endregion
+
+        /// <summary>
+        /// Default protocol used for resolving resources in web applications
+        /// </summary>
+        internal static readonly string DEFAULT_RESOURCE_PROTOCOL = "web";
+
+        /// <summary>
+        /// Extracts the bare ASPX page name without any extension from the
+        /// supplied <paramref name="url"/>.
+        /// </summary>
+        /// <example>
+        /// <p>
+        /// Examples of what would be returned from this method given a url would be:
+        /// </p>
+        /// <p>
+        /// <list type="bullet">
+        /// <item><description>'Login.aspx' => 'Login'</description></item>
+        /// <item><description>'~/Login.aspx' => 'Login'</description></item>
+        /// <item><description>'~/B2B/SignUp.aspx' => 'SignUp'</description></item>
+        /// <item><description>'B2B/Foo/FooServices.aspx' => 'FooServices'</description></item>
+        /// </list>
+        /// </p>
+        /// </example>
+        /// <param name="url">The full URL to the ASPX page.</param>
+        /// <returns>
+        /// The bare ASPX page name without any extension.
+        /// </returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="url"/> is <see langword="null"/> or
+        /// contains only whitespace character(s).
+        /// </exception>
+        public static string GetPageName(string url)
+        {
+            AssertUtils.ArgumentHasText(url, "url");
+            int lastSlash = url.LastIndexOf('/');
+            int lastDot = url.LastIndexOf('.');
+            if (lastDot < lastSlash)
+            {
+                lastDot = -1;
+            }
+            if (lastDot < 0)
+            {
+                int length = url.Length - lastSlash - 1;
+                return url.Substring(lastSlash + 1, length);
+            }
+
+            return url.Substring(lastSlash + 1, lastDot - lastSlash - 1);
+        }
+
+        /// <summary>
+        /// Returns only the directory portion of a virtual path
+        /// </summary>
+        /// <remarks>
+        /// The returned path is guaranteed to always have a leading and a trailing slash.<br/>
+        /// If a path does not end with a file-extension it is assumed to be a directory
+        /// </remarks>
+        public static string GetVirtualDirectory(string virtualPath)
+        {
+            AssertUtils.ArgumentNotNull(virtualPath, "virtualPath");
+
+            if (virtualPath.Length == 0)
+            {
+                return "/";
+            }
+            
+            if (virtualPath[0] != '/')
+            {
+                virtualPath = "/" + virtualPath;
+            }
+
+            if (virtualPath[virtualPath.Length - 1] != '/')
+            {
+                int iDot = virtualPath.LastIndexOf('.');
+                int iSlash = virtualPath.LastIndexOf('/');
+                if (iDot < iSlash) iDot = -1;
+                if (iDot > -1)
+                {
+                    virtualPath = virtualPath.Substring(0, iSlash + 1);
+                }
+                else
+                {
+                    virtualPath = virtualPath + "/";
+                }
+            }
+            return virtualPath;
+        }
+
+        /// <summary>
+        /// Returns absolute path that can be referenced within plain HTML.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If relative path starts with '/' (forward slash), no concatenation will occur
+        /// and it will be assumed that the relative path specified is indeed the absolute path
+        /// and will be returned verbatim.</p>
+        /// <p>
+        /// Otherwise, relative path will be appended to the application path, while making sure that 
+        /// path separators are not duplicated between the paths.</p>
+        /// </remarks>
+        /// <param name="applicationPath">Application path.</param>
+        /// <param name="relativePath">Relative path to combine with the application path.</param>
+        /// <returns>Absolute path.</returns>
+        public static string CreateAbsolutePath(string applicationPath, string relativePath)
+        {
+            if (StringUtils.HasLength(relativePath))
+            {
+                if (relativePath.StartsWith("/"))
+                {
+                    return relativePath;
+                }
+
+                if (relativePath.StartsWith("~/"))
+                {
+                    relativePath = relativePath.Substring(2);
+                }
+            }
+
+            applicationPath = (applicationPath == null) ? "" : applicationPath.TrimEnd('/');
+
+            return string.Format("{0}/{1}", applicationPath, relativePath);
+        }
+
+        /// <summary>
+        /// Combines a rooted base path with a relative path.
+        /// </summary>
+        /// <param name="rootPath">Must be a path starting with '/'</param>
+        /// <param name="relativePath">the path to be combined. May start with basepath Placeholder '~'</param>
+        /// <returns>the combined path</returns>
+        /// <remarks>
+        /// If relativePath starts with '~', rootPath is ignored and '~' resolves to the current AppDomain's application virtual path<br/>
+        /// If relativePath start with '/', rootPath is ignored and relativePath is returned as-is.
+        /// </remarks>
+        public static string CombineVirtualPaths(string rootPath, string relativePath)
+        {
+            AssertUtils.ArgumentHasText(rootPath, "rootPath");
+            if (rootPath[0] != '/')
+            {
+                throw new ArgumentException("RootPath must start with '/'", "rootPath");
+            }
+
+            string combinedPath = relativePath;
+
+            if (combinedPath.StartsWith("~/"))
+            {
+                combinedPath = VirtualEnvironment.ApplicationVirtualPath.TrimEnd('/') + relativePath.Substring(1);
+            }
+
+            if (!combinedPath.StartsWith("/"))
+            {
+                combinedPath = GetVirtualDirectory(rootPath).TrimEnd('/') + '/' + relativePath;
+            }
+
+            // TODO: reduce contained directory upwalks here
+
+            return combinedPath;
+        }
+
+        /// <summary>
+        /// Gets the application-relative virtual path portion of the given absolute URL.
+        /// </summary>
+        /// <param name="url">the absolute url</param>
+        /// <returns>the url relative to the current application's virtual path</returns>
+        public static string GetAppRelativePath(string url)
+        {
+            string appPath = VirtualEnvironment.ApplicationVirtualPath;
+            return GetRelativePath(appPath, url);
+        }
+
+        /// <summary>
+        /// Gets the virtual path portion of the given absolute URL 
+        /// relative to the given base path.
+        /// </summary>
+        /// <remarks>
+        /// Base path comparison is done case insensitive.
+        /// </remarks>
+        /// <param name="basePath">the absolute base path</param>
+        /// <param name="url">the absolute url</param>
+        /// <returns>the url relative to the given basePath</returns>
+        public static string GetRelativePath(string basePath, string url)
+        {
+            // strip application path from url
+            string appPath = basePath.TrimEnd('/');
+            string appRelativeVirtualPath = url;
+            if (appRelativeVirtualPath.ToLower().StartsWith(appPath.ToLower()))
+            {
+                appRelativeVirtualPath = appRelativeVirtualPath.Substring(appPath.Length);
+            }
+            return appRelativeVirtualPath;            
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Process/IProcess.cs b/src/Spring/Spring.Web/Web/Process/IProcess.cs
new file mode 100644
index 00000000..9c9617c5
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Process/IProcess.cs
@@ -0,0 +1,52 @@
+using System;
+
+namespace Spring.Web.Process
+{
+    /// <summary>
+    /// An interface that different process implementations need to support.
+    /// </summary>
+    public interface IProcess
+    {
+        /// <summary>
+        /// Unique ID of this process instance.
+        /// </summary>
+        string Id { get; }
+
+        /// <summary>
+        /// Controller for the component.
+        /// </summary>
+        /// <remarks>
+        /// Process controller will be shared by all the views 
+        /// that belong to this process.
+        /// </remarks>
+        object Controller { get; set; }
+
+        /// <summary>
+        /// Gets the name of the current view.
+        /// </summary>
+        string CurrentView { get; }
+
+        /// <summary>
+        /// Gets the the flag that indicates if selected view 
+        /// has changed during the current request.
+        /// </summary>
+        bool ViewChanged { get; }
+        
+        /// <summary>
+        /// Starts the process.
+        /// </summary>
+        /// <param name="referrerUrl">Referrer URL.</param>
+        void Start(string referrerUrl);
+        
+        /// <summary>
+        /// Resolves view for the specified view name.
+        /// </summary>
+        /// <param name="viewName">Name of the view to go to.</param>
+        void SetView(string viewName);
+
+        /// <summary>
+        /// Ends the process.
+        /// </summary>
+        void End();
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Process/IProcessAware.cs b/src/Spring/Spring.Web/Web/Process/IProcessAware.cs
new file mode 100644
index 00000000..d8076e2c
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Process/IProcessAware.cs
@@ -0,0 +1,38 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Web;
+
+namespace Spring.Web.Process
+{
+    /// <summary>
+    /// Interface that should be implemented by all <see cref="IHttpHandler"/>s
+    /// that want to be aware of the <see cref="IProcess"/> they belong to. 
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IProcessAware.cs,v 1.2 2006/05/18 21:37:52 markpollack Exp $</version>
+    public interface IProcessAware
+    {
+        /// <summary>
+        /// Gets or sets a process instance.
+        /// </summary>
+        IProcess Process { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Process/ProcessManager.cs b/src/Spring/Spring.Web/Web/Process/ProcessManager.cs
new file mode 100644
index 00000000..5b5ae354
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Process/ProcessManager.cs
@@ -0,0 +1,70 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+namespace Spring.Web.Process
+{
+    /// <summary>
+    /// Singleton that keeps track of all active process instances.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ProcessManager.cs,v 1.2 2006/05/18 21:37:52 markpollack Exp $</version>
+    public class ProcessManager
+    {
+        private static readonly ProcessManager instance = new ProcessManager();
+
+        private IDictionary processInstances = new Hashtable();
+
+        /// <summary>
+        /// Creates singleton instance.
+        /// </summary>
+        private ProcessManager()
+        {}
+
+        /// <summary>
+        /// Registers process instance.
+        /// </summary>
+        /// <param name="process">Process instance to register.</param>
+        public static void RegisterProcess(IProcess process)
+        {
+            instance.processInstances.Add(process.Id, process);
+        }
+
+        /// <summary>
+        /// Returns process with the specified ID.
+        /// </summary>
+        /// <param name="id">Process ID to use for lookup.</param>
+        /// <returns>Process with the specified ID, or <c>null</c> if process with that ID is not registered.</returns>
+        public static IProcess GetProcess(string id)
+        {
+            return (IProcess) instance.processInstances[id];
+        }
+
+        /// <summary>
+        /// Unregisters process with the specified ID.
+        /// </summary>
+        /// <param name="id">ID of the process to unregister.</param>
+        public static void UnregisterProcess(string id)
+        {
+            instance.processInstances.Remove(id);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs
new file mode 100644
index 00000000..d24b7caa
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs
@@ -0,0 +1,104 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System.Collections.Specialized;
+using System.DirectoryServices;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.Security;
+
+#endregion
+
+namespace Spring.Web.Providers
+{
+/* TBD
+ 
+    /// <summary>
+    /// A spring configurable version of <see cref="ActiveDirectoryMembershipProvider"/>
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ConfigurableActiveDirectoryMembershipProvider.cs,v 1.1 2007/07/26 14:43:56 oakinger Exp $</version>
+    [DirectoryServicesPermission(SecurityAction.InheritanceDemand, Unrestricted = true)]
+    [DirectoryServicesPermission(SecurityAction.LinkDemand, Unrestricted = true)]
+    [AspNetHostingPermission(SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    public class ConfigurableActiveDirectoryMembershipProvider : ActiveDirectoryMembershipProvider, IMembershipProvider
+    {
+        private string connectionStringName;
+        private NameValueCollection parameters;
+
+        /// <summary>
+        /// The ConnectionString to be used
+        /// </summary>
+        public string ConnectionStringName
+        {
+            get { return this.connectionStringName; }
+            set { this.connectionStringName = value; }
+        }
+
+        /// <summary>
+        /// A collection of the name/value pairs representing the provider-specific
+        /// attributes specified in the configuration for this provider.
+        /// </summary> 
+        public NameValueCollection Parameters
+        {
+            get { return this.parameters; }
+            set { this.parameters = value; }
+        }
+
+        ///<summary>
+        ///Initializes the provider.
+        ///</summary>
+        ///
+        ///<param name="config">
+        /// <para>
+        /// A collection of the name/value pairs representing the provider-specific 
+        /// attributes specified in the configuration for this provider.
+        /// </para>
+        /// Values may be overridden by specifying them in <see cref="Parameters"/> list.
+        /// </param>
+        ///<param name="name">The friendly name of the provider.</param>
+        ///<exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+        ///<exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+        ///<exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        public override void Initialize(string name, NameValueCollection config)
+        {
+            lock (this)
+            {
+                if (this.parameters != null)
+                {
+                    foreach (string key in this.parameters.Keys)
+                    {
+                        config[key] = this.parameters[key];
+                    }
+                }
+                config["connectionStringName"] = this.connectionStringName;
+                base.Initialize(name, config);
+            }
+        }
+    }
+*/
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs
new file mode 100644
index 00000000..97353d41
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs
@@ -0,0 +1,104 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System.Collections.Specialized;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.Security;
+
+#endregion
+
+
+namespace Spring.Web.Providers
+{
+    /// <summary>
+    /// A spring configurable version of <see cref="SqlMembershipProvider"/>
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ConfigurableSqlMembershipProvider.cs,v 1.1 2007/07/26 14:43:56 oakinger Exp $</version>
+    [AspNetHostingPermission(SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    public class ConfigurableSqlMembershipProvider : SqlMembershipProvider, IMembershipProvider
+    {
+        private bool initialized = false;
+        private string connectionStringName;
+        private NameValueCollection parameters;
+
+        /// <summary>
+        /// The ConnectionString to be used
+        /// </summary>
+        public string ConnectionStringName
+        {
+            get { return this.connectionStringName; }
+            set { this.connectionStringName = value; }
+        }
+
+        /// <summary>
+        /// A collection of the name/value pairs representing the provider-specific
+        /// attributes specified in the configuration for this provider.
+        /// </summary> 
+        public NameValueCollection Parameters
+        {
+            get { return this.parameters; }
+            set { this.parameters = value; }
+        }
+
+        ///<summary>
+        ///Initializes the provider.
+        ///</summary>
+        ///
+        ///<param name="config">
+        /// <para>
+        /// A collection of the name/value pairs representing the provider-specific 
+        /// attributes specified in the configuration for this provider.
+        /// </para>
+        /// Values may be overridden by specifying them in <see cref="Parameters"/> list.
+        /// </param>
+        ///<param name="name">The friendly name of the provider.</param>
+        ///<exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+        ///<exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+        ///<exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        public override void Initialize(string name, NameValueCollection config)
+        {
+            lock(this)
+            {
+                if (initialized) return;
+
+                if (parameters != null)
+                {
+                    foreach(string key in parameters.Keys)
+                    {
+                        config[key] = parameters[key];
+                    }
+                }
+                config["connectionStringName"] = this.connectionStringName;
+                base.Initialize(name, config);
+
+                initialized = true;
+            }
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs
new file mode 100644
index 00000000..b9907b2d
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs
@@ -0,0 +1,105 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.Profile;
+using System.Web.Security;
+
+#endregion
+
+namespace Spring.Web.Providers
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ConfigurableSqlProfileProvider.cs,v 1.1 2007/07/26 14:43:56 oakinger Exp $</version>
+    [AspNetHostingPermission(SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    public class ConfigurableSqlProfileProvider : SqlProfileProvider, IProfileProvider
+    {
+        private bool initialized = false;
+        private string connectionStringName;
+        private NameValueCollection parameters;
+
+        /// <summary>
+        /// The ConnectionString to be used
+        /// </summary>
+        public string ConnectionStringName
+        {
+            get { return this.connectionStringName; }
+            set { this.connectionStringName = value; }
+        }
+
+        /// <summary>
+        /// A collection of the name/value pairs representing the provider-specific
+        /// attributes specified in the configuration for this provider.
+        /// </summary> 
+        public NameValueCollection Parameters
+        {
+            get { return this.parameters; }
+            set { this.parameters = value; }
+        }
+
+        ///<summary>
+        ///Initializes the provider.
+        ///</summary>
+        ///
+        ///<param name="config">
+        /// <para>
+        /// A collection of the name/value pairs representing the provider-specific 
+        /// attributes specified in the configuration for this provider.
+        /// </para>
+        /// Values may be overridden by specifying them in <see cref="Parameters"/> list.
+        /// </param>
+        ///<param name="name">The friendly name of the provider.</param>
+        ///<exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+        ///<exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+        ///<exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        public override void Initialize(string name, NameValueCollection config)
+        {
+            lock (this)
+            {
+                if (initialized) return;
+
+                if (parameters != null)
+                {
+                    foreach (string key in parameters.Keys)
+                    {
+                        config[key] = parameters[key];
+                    }
+                }
+                config["connectionStringName"] = this.connectionStringName;
+                base.Initialize(name, config);
+
+                initialized = true;
+            }
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs
new file mode 100644
index 00000000..c5d5c46a
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs
@@ -0,0 +1,104 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.Security;
+
+#endregion
+
+namespace Spring.Web.Providers
+{
+    /// <summary>
+    /// A spring-configurable version of <see cref="SqlRoleProvider"/>
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ConfigurableSqlRoleProvider.cs,v 1.1 2007/07/26 14:43:56 oakinger Exp $</version>
+    [AspNetHostingPermission(SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    public class ConfigurableSqlRoleProvider : SqlRoleProvider, IRoleProvider
+    {
+        private bool initialized = false;
+        private string connectionStringName;
+        private NameValueCollection parameters;
+
+        /// <summary>
+        /// The ConnectionString to be used
+        /// </summary>
+        public string ConnectionStringName
+        {
+            get { return this.connectionStringName; }
+            set { this.connectionStringName = value; }
+        }
+
+        /// <summary>
+        /// A collection of the name/value pairs representing the provider-specific
+        /// attributes specified in the configuration for this provider.
+        /// </summary> 
+        public NameValueCollection Parameters
+        {
+            get { return this.parameters; }
+            set { this.parameters = value; }
+        }
+
+        ///<summary>
+        ///Initializes the provider.
+        ///</summary>
+        ///
+        ///<param name="config">
+        /// <para>
+        /// A collection of the name/value pairs representing the provider-specific 
+        /// attributes specified in the configuration for this provider.
+        /// </para>
+        /// Values may be overridden by specifying them in <see cref="Parameters"/> list.
+        /// </param>
+        ///<param name="name">The friendly name of the provider.</param>
+        ///<exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+        ///<exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+        ///<exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        public override void Initialize(string name, NameValueCollection config)
+        {
+            lock (this)
+            {
+                if (initialized) return;
+
+                if (parameters != null)
+                {
+                    foreach (string key in parameters.Keys)
+                    {
+                        config[key] = parameters[key];
+                    }
+                }
+                config["connectionStringName"] = this.connectionStringName;
+                base.Initialize(name, config);
+
+                initialized = true;
+            }
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs
new file mode 100644
index 00000000..3b0f4245
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs
@@ -0,0 +1,103 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if NET_2_0
+
+#region Imports
+
+using System.Collections.Specialized;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.Security;
+
+#endregion
+
+namespace Spring.Web.Providers
+{
+    /// <summary>
+    /// A spring-configurable version of <see cref="SqlRoleProvider"/>
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ConfigurableXmlSiteMapProvider.cs,v 1.1 2007/07/26 14:43:56 oakinger Exp $</version>
+    [AspNetHostingPermission(SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    public class ConfigurableXmlSiteMapProvider : XmlSiteMapProvider, ISiteMapProvider
+    {
+        private bool initialized;
+        private string siteMapFile;
+        private NameValueCollection parameters;
+
+        /// <summary>
+        /// The XML file to be used for reading in the sitemap
+        /// </summary>
+        public string SiteMapFile
+        {
+            get { return this.siteMapFile; }
+            set { this.siteMapFile = value; }
+        }
+
+        /// <summary>
+        /// A collection of the name/value pairs representing the provider-specific
+        /// attributes specified in the configuration for this provider.
+        /// </summary> 
+        public NameValueCollection Parameters
+        {
+            get { return this.parameters; }
+            set { this.parameters = value; }
+        }
+
+        ///<summary>
+        ///Initializes the provider.
+        ///</summary>
+        ///
+        ///<param name="config">
+        /// <para>
+        /// A collection of the name/value pairs representing the provider-specific 
+        /// attributes specified in the configuration for this provider.
+        /// </para>
+        /// Values may be overridden by specifying them in <see cref="Parameters"/> list.
+        /// </param>
+        ///<param name="name">The friendly name of the provider.</param>
+        ///<exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+        ///<exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+        ///<exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        public override void Initialize(string name, NameValueCollection config)
+        {
+            lock (this)
+            {
+                if (initialized) return;
+
+                if (parameters != null)
+                {
+                    foreach (string key in parameters.Keys)
+                    {
+                        config[key] = parameters[key];
+                    }
+                }
+                config["siteMapFile"] = this.siteMapFile;
+                base.Initialize(name, config);
+
+                initialized = true;
+            }
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/IMembershipProvider.cs b/src/Spring/Spring.Web/Web/Providers/IMembershipProvider.cs
new file mode 100644
index 00000000..24f387f9
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Providers/IMembershipProvider.cs
@@ -0,0 +1,361 @@
+#if NET_2_0
+
+using System.Collections.Specialized;
+using System.Web.Security;
+
+namespace Spring.Web.Providers
+{
+    /// <summary>
+    /// An Interface for <see cref="MembershipProviderAdapter"/> class.
+    /// </summary>
+    /// <author>Damjan Tomic</author>
+    public interface IMembershipProvider
+    {
+        ///<summary>
+        ///Initializes the provider.
+        ///</summary>
+        ///
+        ///<param name="config">A collection of the name/value pairs representing the provider-specific 
+        /// attributes specified in the configuration for this provider.
+        /// The <c>providerId</c> attribute is mandatory.
+        /// </param>
+        ///<param name="name">The friendly name of the provider.</param>
+        ///<exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+        ///<exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+        ///<exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        void Initialize(string name, NameValueCollection config);
+
+        ///<summary>
+        ///Gets the friendly name used to refer to the provider during configuration.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The friendly name used to refer to the provider during configuration.
+        ///</returns>
+        ///
+        string Name { get; }
+
+        ///<summary>
+        ///Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+        ///</summary>
+        ///
+        ///<returns>
+        ///A brief, friendly description suitable for display in administrative tools or other UIs.
+        ///</returns>
+        ///
+        string Description { get; }
+
+        ///<summary>
+        ///Adds a new membership user to the data source.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Security.MembershipUser"></see> object populated with the information for the newly created user.
+        ///</returns>
+        ///
+        ///<param name="isApproved">Whether or not the new user is approved to be validated.</param>
+        ///<param name="passwordAnswer">The password answer for the new user</param>
+        ///<param name="username">The user name for the new user. </param>
+        ///<param name="providerUserKey">The unique identifier from the membership data source for the user.</param>
+        ///<param name="password">The password for the new user. </param>
+        ///<param name="passwordQuestion">The password question for the new user.</param>
+        ///<param name="email">The e-mail address for the new user.</param>
+        ///<param name="status">A <see cref="T:System.Web.Security.MembershipCreateStatus"></see> enumeration value indicating whether the user was created successfully.</param>
+        MembershipUser CreateUser(string username, string password, string email,
+                                  string passwordQuestion, string passwordAnswer, bool isApproved,
+                                  object providerUserKey, out MembershipCreateStatus status);
+
+        ///<summary>
+        ///Processes a request to update the password question and answer for a membership user.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the password question and answer are updated successfully; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="newPasswordQuestion">The new password question for the specified user. </param>
+        ///<param name="newPasswordAnswer">The new password answer for the specified user. </param>
+        ///<param name="username">The user to change the password question and answer for. </param>
+        ///<param name="password">The password for the specified user. </param>
+        bool ChangePasswordQuestionAndAnswer(string username, string password,
+                                             string newPasswordQuestion, string newPasswordAnswer);
+
+        ///<summary>
+        ///Gets the password for the specified user name from the data source.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The password for the specified user name.
+        ///</returns>
+        ///
+        ///<param name="username">The user to retrieve the password for. </param>
+        ///<param name="answer">The password answer for the user. </param>
+        string GetPassword(string username, string answer);
+
+        ///<summary>
+        ///Processes a request to update the password for a membership user.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the password was updated successfully; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="newPassword">The new password for the specified user. </param>
+        ///<param name="oldPassword">The current password for the specified user. </param>
+        ///<param name="username">The user to update the password for. </param>
+        bool ChangePassword(string username, string oldPassword, string newPassword);
+
+        ///<summary>
+        ///Resets a user's password to a new, automatically generated password.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The new password for the specified user.
+        ///</returns>
+        ///
+        ///<param name="username">The user to reset the password for. </param>
+        ///<param name="answer">The password answer for the specified user. </param>
+        string ResetPassword(string username, string answer);
+
+        ///<summary>
+        ///Updates information about a user in the data source.
+        ///</summary>
+        ///
+        ///<param name="user">A <see cref="T:System.Web.Security.MembershipUser"></see> object that represents the user to update and the updated information for the user. </param>
+        void UpdateUser(MembershipUser user);
+
+        ///<summary>
+        ///Verifies that the specified user name and password exist in the data source.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the specified username and password are valid; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="username">The name of the user to validate. </param>
+        ///<param name="password">The password for the specified user. </param>
+        bool ValidateUser(string username, string password);
+
+        ///<summary>
+        ///Clears a lock so that the membership user can be validated.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the membership user was successfully unlocked; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="userName">The membership user to clear the lock status for.</param>
+        bool UnlockUser(string userName);
+
+        ///<summary>
+        ///Gets information from the data source for a user based on the unique identifier for the membership user. Provides an option to update the last-activity date/time stamp for the user.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Security.MembershipUser"></see> object populated with the specified user's information from the data source.
+        ///</returns>
+        ///
+        ///<param name="providerUserKey">The unique identifier for the membership user to get information for.</param>
+        ///<param name="userIsOnline">true to update the last-activity date/time stamp for the user; false to return user information without updating the last-activity date/time stamp for the user.</param>
+        MembershipUser GetUser(object providerUserKey, bool userIsOnline);
+
+        ///<summary>
+        ///Gets information from the data source for a user. Provides an option to update the last-activity date/time stamp for the user.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Security.MembershipUser"></see> object populated with the specified user's information from the data source.
+        ///</returns>
+        ///
+        ///<param name="username">The name of the user to get information for. </param>
+        ///<param name="userIsOnline">true to update the last-activity date/time stamp for the user; false to return user information without updating the last-activity date/time stamp for the user. </param>
+        MembershipUser GetUser(string username, bool userIsOnline);
+
+        ///<summary>
+        ///Gets the user name associated with the specified e-mail address.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The user name associated with the specified e-mail address. If no match is found, return null.
+        ///</returns>
+        ///
+        ///<param name="email">The e-mail address to search for. </param>
+        string GetUserNameByEmail(string email);
+
+        ///<summary>
+        ///Removes a user from the membership data source. 
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the user was successfully deleted; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="username">The name of the user to delete.</param>
+        ///<param name="deleteAllRelatedData">true to delete data related to the user from the database; false to leave data related to the user in the database.</param>
+        bool DeleteUser(string username, bool deleteAllRelatedData);
+
+        ///<summary>
+        ///Gets a collection of all the users in the data source in pages of data.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Security.MembershipUserCollection"></see> collection that contains a page of pageSize<see cref="T:System.Web.Security.MembershipUser"></see> objects beginning at the page specified by pageIndex.
+        ///</returns>
+        ///
+        ///<param name="totalRecords">The total number of matched users.</param>
+        ///<param name="pageIndex">The index of the page of results to return. pageIndex is zero-based.</param>
+        ///<param name="pageSize">The size of the page of results to return.</param>
+        MembershipUserCollection GetAllUsers(int pageIndex, int pageSize, out int totalRecords);
+
+        ///<summary>
+        ///Gets the number of users currently accessing the application.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The number of users currently accessing the application.
+        ///</returns>
+        ///
+        int GetNumberOfUsersOnline();
+
+        ///<summary>
+        ///Gets a collection of membership users where the user name contains the specified user name to match.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Security.MembershipUserCollection"></see> collection that contains a page of pageSize<see cref="T:System.Web.Security.MembershipUser"></see> objects beginning at the page specified by pageIndex.
+        ///</returns>
+        ///
+        ///<param name="totalRecords">The total number of matched users.</param>
+        ///<param name="pageIndex">The index of the page of results to return. pageIndex is zero-based.</param>
+        ///<param name="usernameToMatch">The user name to search for.</param>
+        ///<param name="pageSize">The size of the page of results to return.</param>
+        MembershipUserCollection FindUsersByName(string usernameToMatch, int pageIndex, int pageSize,
+                                                 out int totalRecords);
+
+        ///<summary>
+        ///Gets a collection of membership users where the e-mail address contains the specified e-mail address to match.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Security.MembershipUserCollection"></see> collection that contains a page of pageSize<see cref="T:System.Web.Security.MembershipUser"></see> objects beginning at the page specified by pageIndex.
+        ///</returns>
+        ///
+        ///<param name="totalRecords">The total number of matched users.</param>
+        ///<param name="pageIndex">The index of the page of results to return. pageIndex is zero-based.</param>
+        ///<param name="emailToMatch">The e-mail address to search for.</param>
+        ///<param name="pageSize">The size of the page of results to return.</param>
+        MembershipUserCollection FindUsersByEmail(string emailToMatch, int pageIndex, int pageSize,
+                                                  out int totalRecords);
+
+        ///<summary>
+        ///Indicates whether the membership provider is configured to allow users to retrieve their passwords.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the membership provider is configured to support password retrieval; otherwise, false. The default is false.
+        ///</returns>
+        ///
+        bool EnablePasswordRetrieval { get; }
+
+        ///<summary>
+        ///Indicates whether the membership provider is configured to allow users to reset their passwords.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the membership provider supports password reset; otherwise, false. The default is true.
+        ///</returns>
+        ///
+        bool EnablePasswordReset { get; }
+
+        ///<summary>
+        ///Gets a value indicating whether the membership provider is configured to require the user to answer a password question for password reset and retrieval.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if a password answer is required for password reset and retrieval; otherwise, false. The default is true.
+        ///</returns>
+        ///
+        bool RequiresQuestionAndAnswer { get; }
+
+        ///<summary>
+        ///The name of the application using the custom membership provider.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The name of the application using the custom membership provider.
+        ///</returns>
+        ///
+        string ApplicationName { get; set; }
+
+        ///<summary>
+        ///Gets the number of invalid password or password-answer attempts allowed before the membership user is locked out.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The number of invalid password or password-answer attempts allowed before the membership user is locked out.
+        ///</returns>
+        ///
+        int MaxInvalidPasswordAttempts { get; }
+
+        ///<summary>
+        ///Gets the number of minutes in which a maximum number of invalid password or password-answer attempts are allowed before the membership user is locked out.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The number of minutes in which a maximum number of invalid password or password-answer attempts are allowed before the membership user is locked out.
+        ///</returns>
+        ///
+        int PasswordAttemptWindow { get; }
+
+        ///<summary>
+        ///Gets a value indicating whether the membership provider is configured to require a unique e-mail address for each user name.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the membership provider requires a unique e-mail address; otherwise, false. The default is true.
+        ///</returns>
+        ///
+        bool RequiresUniqueEmail { get; }
+
+        ///<summary>
+        ///Gets a value indicating the format for storing passwords in the membership data store.
+        ///</summary>
+        ///
+        ///<returns>
+        ///One of the <see cref="T:System.Web.Security.MembershipPasswordFormat"></see> values indicating the format for storing passwords in the data store.
+        ///</returns>
+        ///
+        MembershipPasswordFormat PasswordFormat { get; }
+
+        ///<summary>
+        ///Gets the minimum length required for a password.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The minimum length required for a password. 
+        ///</returns>
+        ///
+        int MinRequiredPasswordLength { get; }
+
+        ///<summary>
+        ///Gets the minimum number of special characters that must be present in a valid password.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The minimum number of special characters that must be present in a valid password.
+        ///</returns>
+        ///
+        int MinRequiredNonAlphanumericCharacters { get; }
+
+        ///<summary>
+        ///Gets the regular expression used to evaluate a password.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A regular expression used to evaluate a password.
+        ///</returns>
+        ///
+        string PasswordStrengthRegularExpression { get; }
+    }
+}
+#endif
diff --git a/src/Spring/Spring.Web/Web/Providers/IProfileProvider.cs b/src/Spring/Spring.Web/Web/Providers/IProfileProvider.cs
new file mode 100644
index 00000000..93f7421d
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Providers/IProfileProvider.cs
@@ -0,0 +1,201 @@
+#if NET_2_0
+
+using System;
+using System.Collections.Specialized;
+using System.Configuration;
+using System.Web.Profile;
+
+namespace Spring.Web.Providers
+{
+    /// <summary>
+    /// An Interface for <see cref="IProfileProvider"/> class.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+    /// as the Id of wrapped provider (defined in the Spring context).  
+    /// </p>    
+    /// </remarks>
+    /// <author>Damjan Tomic</author>
+    public interface IProfileProvider
+    {
+        ///<summary>
+        ///Initializes the provider.
+        ///</summary>
+        ///
+        ///<param name="config">A collection of the name/value pairs representing the provider-specific 
+        /// attributes specified in the configuration for this provider.
+        /// The <c>providerId</c> attribute is mandatory.
+        /// </param>
+        ///<param name="name">The friendly name of the provider.</param>
+        ///<exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+        ///<exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+        ///<exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>      
+        void Initialize(string name, NameValueCollection config);
+
+        ///<summary>
+        ///Gets the friendly name used to refer to the provider during configuration.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The friendly name used to refer to the provider during configuration.
+        ///</returns>
+        string Name { get; }
+
+        ///<summary>
+        ///Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+        ///</summary>
+        ///
+        ///<returns>
+        ///A brief, friendly description suitable for display in administrative tools or other UIs.
+        ///</returns>
+        string Description { get; }
+
+        ///<summary>
+        ///Returns the collection of settings property values for the specified application instance and settings property group.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Configuration.SettingsPropertyValueCollection"></see> containing the values for the specified settings property group.
+        ///</returns>
+        ///
+        ///<param name="context">A <see cref="T:System.Configuration.SettingsContext"></see> describing the current application use.</param>
+        ///<param name="collection">A <see cref="T:System.Configuration.SettingsPropertyCollection"></see> containing the settings property group whose values are to be retrieved.</param><filterpriority>2</filterpriority>
+        SettingsPropertyValueCollection GetPropertyValues(SettingsContext context,
+                                                          SettingsPropertyCollection collection);
+
+        ///<summary>
+        ///Sets the values of the specified group of property settings.
+        ///</summary>
+        ///
+        ///<param name="context">A <see cref="T:System.Configuration.SettingsContext"></see> describing the current application usage.</param>
+        ///<param name="collection">A <see cref="T:System.Configuration.SettingsPropertyValueCollection"></see> representing the group of property settings to set.</param><filterpriority>2</filterpriority>
+        void SetPropertyValues(SettingsContext context, SettingsPropertyValueCollection collection);
+
+        ///<summary>
+        ///Gets or sets the name of the currently running application.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.String"></see> that contains the application's shortened name, which does not contain a full path or extension, for example, SimpleAppSettings.
+        ///</returns>
+        ///<filterpriority>2</filterpriority>
+        string ApplicationName { get; set; }
+
+        ///<summary>
+        ///When overridden in a derived class, deletes profile properties and information for the supplied list of profiles.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The number of profiles deleted from the data source.
+        ///</returns>
+        ///
+        ///<param name="profiles">A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see>  of information about profiles that are to be deleted.</param>
+        int DeleteProfiles(ProfileInfoCollection profiles);
+
+        ///<summary>
+        ///When overridden in a derived class, deletes profile properties and information for profiles that match the supplied list of user names.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The number of profiles deleted from the data source.
+        ///</returns>
+        ///
+        ///<param name="usernames">A string array of user names for profiles to be deleted.</param>
+        int DeleteProfiles(string[] usernames);
+
+        ///<summary>
+        ///When overridden in a derived class, deletes all user-profile data for profiles in which the last activity date occurred before the specified date.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The number of profiles deleted from the data source.
+        ///</returns>
+        ///
+        ///<param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are deleted.</param>
+        ///<param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see>  value of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+        int DeleteInactiveProfiles(ProfileAuthenticationOption authenticationOption,
+                                   DateTime userInactiveSinceDate);
+
+        ///<summary>
+        ///When overridden in a derived class, returns the number of profiles in which the last activity date occurred on or before the specified date.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The number of profiles in which the last activity date occurred on or before the specified date.
+        ///</returns>
+        ///
+        ///<param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+        ///<param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see>  of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+        int GetNumberOfInactiveProfiles(ProfileAuthenticationOption authenticationOption,
+                                        DateTime userInactiveSinceDate);
+
+        ///<summary>
+        ///When overridden in a derived class, retrieves user profile data for all profiles in the data source.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user-profile information for all profiles in the data source.
+        ///</returns>
+        ///
+        ///<param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+        ///<param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+        ///<param name="pageIndex">The index of the page of results to return.</param>
+        ///<param name="pageSize">The size of the page of results to return.</param>
+        ProfileInfoCollection GetAllProfiles(ProfileAuthenticationOption authenticationOption,
+                                             int pageIndex, int pageSize, out int totalRecords);
+
+        ///<summary>
+        ///When overridden in a derived class, retrieves user-profile data from the data source for profiles in which the last activity date occurred on or before the specified date.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user-profile information about the inactive profiles.
+        ///</returns>
+        ///
+        ///<param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+        ///<param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see>  of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+        ///<param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+        ///<param name="pageIndex">The index of the page of results to return.</param>
+        ///<param name="pageSize">The size of the page of results to return.</param>
+        ProfileInfoCollection GetAllInactiveProfiles(ProfileAuthenticationOption authenticationOption,
+                                                     DateTime userInactiveSinceDate, int pageIndex,
+                                                     int pageSize, out int totalRecords);
+
+        ///<summary>
+        ///When overridden in a derived class, retrieves profile information for profiles in which the user name matches the specified user names.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user-profile information for profiles where the user name matches the supplied usernameToMatch parameter.
+        ///</returns>
+        ///
+        ///<param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+        ///<param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+        ///<param name="pageIndex">The index of the page of results to return.</param>
+        ///<param name="usernameToMatch">The user name to search for.</param>
+        ///<param name="pageSize">The size of the page of results to return.</param>
+        ProfileInfoCollection FindProfilesByUserName(ProfileAuthenticationOption authenticationOption,
+                                                     string usernameToMatch, int pageIndex, int pageSize,
+                                                     out int totalRecords);
+
+        ///<summary>
+        ///When overridden in a derived class, retrieves profile information for profiles in which the last activity date occurred on or before the specified date and the user name matches the specified user name.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user profile information for inactive profiles where the user name matches the supplied usernameToMatch parameter.
+        ///</returns>
+        ///
+        ///<param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+        ///<param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see> value of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+        ///<param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+        ///<param name="pageIndex">The index of the page of results to return.</param>
+        ///<param name="usernameToMatch">The user name to search for.</param>
+        ///<param name="pageSize">The size of the page of results to return.</param>
+        ProfileInfoCollection FindInactiveProfilesByUserName(
+            ProfileAuthenticationOption authenticationOption, string usernameToMatch, DateTime userInactiveSinceDate,
+            int pageIndex, int pageSize, out int totalRecords);
+    }
+}
+#endif
diff --git a/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs b/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs
new file mode 100644
index 00000000..fce67c78
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs
@@ -0,0 +1,188 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System.Collections.Specialized;
+
+#endregion
+
+namespace Spring.Web.Providers
+{
+    /// <summary>
+    /// An Interface for <see cref="RoleProviderAdapter"/> class.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+    /// as the Id of wrapped provider (defined in the Spring context).  
+    /// </p>    
+    /// </remarks>
+    /// <author>Damjan Tomic</author>
+    public interface IRoleProvider
+    {
+        ///<summary>
+        ///Initializes the provider.
+        ///</summary>
+        ///
+        ///<param name="config">A collection of the name/value pairs representing the provider-specific 
+        /// attributes specified in the configuration for this provider.
+        /// The <c>providerId</c> attribute is mandatory.
+        /// </param>
+        ///<param name="name">The friendly name of the provider.</param>
+        ///<exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+        ///<exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+        ///<exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>      
+        void Initialize(string name, NameValueCollection config);
+
+        ///<summary>
+        ///Gets the friendly name used to refer to the provider during configuration.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The friendly name used to refer to the provider during configuration.
+        ///</returns>
+        string Name { get; }
+
+        ///<summary>
+        ///Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+        ///</summary>
+        ///
+        ///<returns>
+        ///A brief, friendly description suitable for display in administrative tools or other UIs.
+        ///</returns>
+        string Description { get; }
+
+        ///<summary>
+        ///Gets a value indicating whether the specified user is in the specified role for the configured applicationName.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the specified user is in the specified role for the configured applicationName; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="username">The user name to search for.</param>
+        ///<param name="roleName">The role to search in.</param>
+        bool IsUserInRole(string username, string roleName);
+
+        ///<summary>
+        ///Gets a list of the roles that a specified user is in for the configured applicationName.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A string array containing the names of all the roles that the specified user is in for the configured applicationName.
+        ///</returns>
+        ///
+        ///<param name="username">The user to return a list of roles for.</param>
+        string[] GetRolesForUser(string username);
+
+        ///<summary>
+        ///Adds a new role to the data source for the configured applicationName.
+        ///</summary>
+        ///
+        ///<param name="roleName">The name of the role to create.</param>
+        void CreateRole(string roleName);
+
+        ///<summary>
+        ///Removes a role from the data source for the configured applicationName.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the role was successfully deleted; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="throwOnPopulatedRole">If true, throw an exception if roleName has one or more members and do not delete roleName.</param>
+        ///<param name="roleName">The name of the role to delete.</param>
+        bool DeleteRole(string roleName, bool throwOnPopulatedRole);
+
+        ///<summary>
+        ///Gets a value indicating whether the specified role name already exists in the role data source for the configured applicationName.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the role name already exists in the data source for the configured applicationName; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="roleName">The name of the role to search for in the data source. </param>
+        bool RoleExists(string roleName);
+
+        ///<summary>
+        ///Adds the specified user names to the specified roles for the configured applicationName.
+        ///</summary>
+        ///
+        ///<param name="roleNames">A string array of the role names to add the specified user names to. </param>
+        ///<param name="usernames">A string array of user names to be added to the specified roles. </param>
+        void AddUsersToRoles(string[] usernames, string[] roleNames);
+
+        ///<summary>
+        ///Removes the specified user names from the specified roles for the configured applicationName.
+        ///</summary>
+        ///
+        ///<param name="roleNames">A string array of role names to remove the specified user names from. </param>
+        ///<param name="usernames">A string array of user names to be removed from the specified roles. </param>
+        void RemoveUsersFromRoles(string[] usernames, string[] roleNames);
+
+        ///<summary>
+        ///Gets a list of users in the specified role for the configured applicationName.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A string array containing the names of all the users who are members of the specified role for the configured applicationName.
+        ///</returns>
+        ///
+        ///<param name="roleName">The name of the role to get the list of users for. </param>
+        string[] GetUsersInRole(string roleName);
+
+        ///<summary>
+        ///Gets a list of all the roles for the configured applicationName.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A string array containing the names of all the roles stored in the data source for the configured applicationName.
+        ///</returns>
+        ///
+        string[] GetAllRoles();
+
+        ///<summary>
+        ///Gets an array of user names in a role where the user name contains the specified user name to match.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A string array containing the names of all the users where the user name matches usernameToMatch and the user is a member of the specified role.
+        ///</returns>
+        ///
+        ///<param name="usernameToMatch">The user name to search for.</param>
+        ///<param name="roleName">The role to search in.</param>
+        string[] FindUsersInRole(string roleName, string usernameToMatch);
+
+        ///<summary>
+        ///Gets or sets the name of the application to store and retrieve role information for.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The name of the application to store and retrieve role information for.
+        ///</returns>
+        ///
+        string ApplicationName { get; set; }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs b/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs
new file mode 100644
index 00000000..bafc8ce3
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs
@@ -0,0 +1,265 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System.Collections.Specialized;
+using System.Web;
+
+#endregion
+
+namespace Spring.Web.Providers
+{
+    /// <summary>
+    /// An Interface for <see cref="SiteMapProviderAdapter"/> class.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+    /// as the Id of wrapped provider (defined in the Spring context).  
+    /// </p>    
+    /// </remarks>
+    /// <author>Damjan Tomic</author>
+    public interface ISiteMapProvider
+    {
+        ///<summary>
+        ///Initializes the provider.
+        ///</summary>
+        ///
+        ///<param name="config">A collection of the name/value pairs representing the provider-specific 
+        /// attributes specified in the configuration for this provider.
+        /// The <c>providerId</c> attribute is mandatory.
+        /// </param>
+        ///<param name="name">The friendly name of the provider.</param>
+        ///<exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+        ///<exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+        ///<exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        void Initialize(string name, NameValueCollection config);
+
+        ///<summary>
+        ///Gets the friendly name used to refer to the provider during configuration.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The friendly name used to refer to the provider during configuration.
+        ///</returns>
+        ///
+        string Name { get; }
+
+        ///<summary>
+        ///Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+        ///</summary>
+        ///
+        ///<returns>
+        ///A brief, friendly description suitable for display in administrative tools or other UIs.
+        ///</returns>
+        ///        
+        string Description { get; }
+
+        ///<summary>
+        ///Retrieves a <see cref="T:System.Web.SiteMapNode"></see> object that represents the currently requested page using the specified <see cref="T:System.Web.HttpContext"></see> object.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if no corresponding <see cref="T:System.Web.SiteMapNode"></see> can be found in the <see cref="T:System.Web.SiteMapNode"></see> or if the page context is null. 
+        ///</returns>
+        ///
+        ///<param name="context">The <see cref="T:System.Web.HttpContext"></see> used to match node information with the URL of the requested page.</param>
+        SiteMapNode FindSiteMapNode(HttpContext context);
+
+        ///<summary>
+        ///Retrieves a <see cref="T:System.Web.SiteMapNode"></see> object based on a specified key.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the page identified by key; otherwise, null, if no corresponding <see cref="T:System.Web.SiteMapNode"></see> is found or if security trimming is enabled and the <see cref="T:System.Web.SiteMapNode"></see> cannot be returned for the current user. The default is null.
+        ///</returns>
+        ///
+        ///<param name="key">A lookup key with which a <see cref="T:System.Web.SiteMapNode"></see> is created.</param>
+        SiteMapNode FindSiteMapNodeFromKey(string key);
+
+        ///<summary>
+        ///When overridden in a derived class, retrieves a <see cref="T:System.Web.SiteMapNode"></see> object that represents the page at the specified URL.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the page identified by rawURL; otherwise, null, if no corresponding <see cref="T:System.Web.SiteMapNode"></see> is found or if security trimming is enabled and the <see cref="T:System.Web.SiteMapNode"></see> cannot be returned for the current user.
+        ///</returns>
+        ///
+        ///<param name="rawUrl">A URL that identifies the page for which to retrieve a <see cref="T:System.Web.SiteMapNode"></see>. </param>
+        SiteMapNode FindSiteMapNode(string rawUrl);
+
+        ///<summary>
+        ///When overridden in a derived class, retrieves the child nodes of a specific <see cref="T:System.Web.SiteMapNode"></see>.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A read-only <see cref="T:System.Web.SiteMapNodeCollection"></see> that contains the immediate child nodes of the specified <see cref="T:System.Web.SiteMapNode"></see>; otherwise, null or an empty collection, if no child nodes exist.
+        ///</returns>
+        ///
+        ///<param name="node">The <see cref="T:System.Web.SiteMapNode"></see> for which to retrieve all child nodes. </param>
+        SiteMapNodeCollection GetChildNodes(SiteMapNode node);
+
+        ///<summary>
+        ///Provides an optimized lookup method for site map providers when retrieving the node for the currently requested page and fetching the parent and ancestor site map nodes for the current page.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+        ///</returns>
+        ///
+        ///<param name="upLevel">The number of ancestor site map node generations to get. A value of -1 indicates that all ancestors might be retrieved and cached by the provider.</param>
+        ///<exception cref="T:System.ArgumentOutOfRangeException">upLevel is less than -1.</exception>
+        SiteMapNode GetCurrentNodeAndHintAncestorNodes(int upLevel);
+
+        ///<summary>
+        ///Provides an optimized lookup method for site map providers when retrieving the node for the currently requested page and fetching the site map nodes in the proximity of the current node.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+        ///</returns>
+        ///
+        ///<param name="upLevel">The number of ancestor <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no ancestor nodes are retrieved and -1 indicates that all ancestors might be retrieved and cached by the provider.</param>
+        ///<param name="downLevel">The number of child <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no descendant nodes are retrieved and a -1 indicates that all descendant nodes might be retrieved and cached by the provider.</param>
+        ///<exception cref="T:System.ArgumentOutOfRangeException">upLevel or downLevel is less than -1.</exception>
+        SiteMapNode GetCurrentNodeAndHintNeighborhoodNodes(int upLevel, int downLevel);
+
+        ///<summary>
+        ///When overridden in a derived class, retrieves the parent node of a specific <see cref="T:System.Web.SiteMapNode"></see> object.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the parent of node; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> has no parent or security trimming is enabled and the parent node is not accessible to the current user.
+        ///</returns>
+        ///
+        ///<param name="node">The <see cref="T:System.Web.SiteMapNode"></see> for which to retrieve the parent node. </param>
+        SiteMapNode GetParentNode(SiteMapNode node);
+
+        ///<summary>
+        ///Provides an optimized lookup method for site map providers when retrieving an ancestor node for the currently requested page and fetching the descendant nodes for the ancestor.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents an ancestor <see cref="T:System.Web.SiteMapNode"></see> of the currently requested page; otherwise, null, if the current or ancestor <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+        ///</returns>
+        ///
+        ///<param name="relativeDepthFromWalkup">The number of descendant node levels to retrieve from the target ancestor node. </param>
+        ///<param name="walkupLevels">The number of ancestor node levels to traverse when retrieving the requested ancestor node. </param>
+        ///<exception cref="T:System.ArgumentOutOfRangeException">walkupLevels or relativeDepthFromWalkup is less than 0.</exception>
+        SiteMapNode GetParentNodeRelativeToCurrentNodeAndHintDownFromParent(int walkupLevels,
+                                                                            int relativeDepthFromWalkup);
+
+        ///<summary>
+        ///Provides an optimized lookup method for site map providers when retrieving an ancestor node for the specified <see cref="T:System.Web.SiteMapNode"></see> object and fetching its child nodes.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents an ancestor of node; otherwise, null, if the current or ancestor <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+        ///</returns>
+        ///
+        ///<param name="relativeDepthFromWalkup">The number of descendant node levels to retrieve from the target ancestor node.</param>
+        ///<param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that acts as a reference point for walkupLevels and relativeDepthFromWalkup. </param>
+        ///<param name="walkupLevels">The number of ancestor node levels to traverse when retrieving the requested ancestor node.</param>
+        ///<exception cref="T:System.ArgumentOutOfRangeException">The value specified for walkupLevels or relativeDepthFromWalkup is less than 0.</exception>
+        ///<exception cref="T:System.ArgumentNullException">node is null.</exception>
+        SiteMapNode GetParentNodeRelativeToNodeAndHintDownFromParent(SiteMapNode node, int walkupLevels,
+                                                                     int relativeDepthFromWalkup);
+
+        ///<summary>
+        ///Provides a method that site map providers can override to perform an optimized retrieval of one or more levels of parent and ancestor nodes, relative to the specified <see cref="T:System.Web.SiteMapNode"></see> object. 
+        ///</summary>
+        ///
+        ///<param name="upLevel">The number of ancestor <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no ancestor nodes are retrieved and -1 indicates that all ancestors might be retrieved and cached.</param>
+        ///<param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that acts as a reference point for upLevel.</param>
+        ///<exception cref="T:System.ArgumentOutOfRangeException">upLevel is less than -1.</exception>
+        ///<exception cref="T:System.ArgumentNullException">node is null.</exception>
+        void HintAncestorNodes(SiteMapNode node, int upLevel);
+
+        ///<summary>
+        ///Provides a method that site map providers can override to perform an optimized retrieval of nodes found in the proximity of the specified node. 
+        ///</summary>
+        ///
+        ///<param name="upLevel">The number of ancestor <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no ancestor nodes are retrieved and -1 indicates that all ancestors (and their descendant nodes to the level of node) might be retrieved and cached.</param>
+        ///<param name="downLevel">The number of descendant <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no descendant nodes are retrieved and -1 indicates that all descendant nodes might be retrieved and cached.</param>
+        ///<param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that acts as a reference point for upLevel.</param>
+        ///<exception cref="T:System.ArgumentOutOfRangeException">upLevel or downLevel is less than -1.</exception>
+        ///<exception cref="T:System.ArgumentNullException">node is null.</exception>
+        void HintNeighborhoodNodes(SiteMapNode node, int upLevel, int downLevel);
+
+        ///<summary>
+        ///Retrieves a Boolean value indicating whether the specified <see cref="T:System.Web.SiteMapNode"></see> object can be viewed by the user in the specified context.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if security trimming is enabled and node can be viewed by the user or security trimming is not enabled; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="context">The <see cref="T:System.Web.HttpContext"></see> that contains user information.</param>
+        ///<param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that is requested by the user.</param>
+        ///<exception cref="T:System.ArgumentNullException">context is null.- or -node is null.</exception>
+        bool IsAccessibleToUser(HttpContext context, SiteMapNode node);
+
+        ///<summary>
+        ///Gets the <see cref="T:System.Web.SiteMapNode"></see> object that represents the currently requested page.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+        ///</returns>
+        ///
+        SiteMapNode CurrentNode { get; }
+
+        ///<summary>
+        ///Gets or sets the parent <see cref="T:System.Web.SiteMapProvider"></see> object of the current provider.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The parent provider of the current <see cref="T:System.Web.SiteMapProvider"></see>.
+        ///</returns>
+        ///
+        System.Web.SiteMapProvider ParentProvider { get; set; }
+
+        ///<summary>
+        ///Gets the root <see cref="T:System.Web.SiteMapProvider"></see> object in the current provider hierarchy.
+        ///</summary>
+        ///
+        ///<returns>
+        ///An <see cref="T:System.Web.SiteMapProvider"></see> that is the top-level site map provider in the provider hierarchy that the current provider belongs to.
+        ///</returns>
+        ///
+        ///<exception cref="T:System.Configuration.Provider.ProviderException">There is a circular reference to the current site map provider. </exception>
+        System.Web.SiteMapProvider RootProvider { get; }
+
+        ///<summary>
+        ///Gets the root <see cref="T:System.Web.SiteMapNode"></see> object of the site map data that the current provider represents.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The root <see cref="T:System.Web.SiteMapNode"></see> of the current site map data provider. The default implementation performs security trimming on the returned node.
+        ///</returns>
+        ///
+        SiteMapNode RootNode { get; }
+    }
+}
+
+#endif
diff --git a/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs
new file mode 100644
index 00000000..e09be99b
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs
@@ -0,0 +1,518 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.Security;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Web.Providers
+{
+    /// <summary>
+    /// Wrapper for <see cref="System.Web.Security.MembershipProvider"/> class.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+    /// as the Id of wrapped provider (defined in the Spring context).  
+    /// </p>    
+    /// </remarks>
+    /// <author>Damjan Tomic</author>
+    /// <version>$Id: MembershipProviderAdapter.cs,v 1.1 2007/07/26 14:43:56 oakinger Exp $</version>
+    [AspNetHostingPermission(SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    public class MembershipProviderAdapter : MembershipProvider, IMembershipProvider
+    {
+        #region Field
+
+        /// <summary>
+        /// Reference to wrapped provider (defined in Spring context).
+        /// </summary>
+        private MembershipProvider wrappedProvider;
+
+        #endregion
+
+        #region ProviderBase members
+
+        ///<summary>
+        ///Initializes the provider.
+        ///</summary>
+        ///
+        ///<param name="config">A collection of the name/value pairs representing the provider-specific 
+        /// attributes specified in the configuration for this provider.
+        /// The <c>providerId</c> attribute may be used to override the name being used for looking up an object definition.
+        /// </param>
+        ///<param name="name">The friendly name of the provider.</param>
+        ///<exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+        ///<exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+        ///<exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        public override void Initialize(string name, NameValueCollection config)
+        {
+            lock (this)
+            {
+                if (config == null) throw new ArgumentNullException("config");
+
+                string providerId = config["providerId"];
+                if (String.IsNullOrEmpty(providerId))
+                    providerId = name;
+                config.Remove("providerId");
+
+                this.wrappedProvider = (MembershipProvider) WebApplicationContext.GetRootContext().GetObject(providerId);
+                this.wrappedProvider.Initialize(name, config);
+            }
+        }
+
+        ///<summary>
+        ///Gets the friendly name used to refer to the provider during configuration.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The friendly name used to refer to the provider during configuration.
+        ///</returns>
+        ///
+        public override string Name
+        {
+            get { return this.wrappedProvider.Name; }
+        }
+
+        ///<summary>
+        ///Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+        ///</summary>
+        ///
+        ///<returns>
+        ///A brief, friendly description suitable for display in administrative tools or other UIs.
+        ///</returns>
+        ///
+        public override string Description
+        {
+            get { return this.wrappedProvider.Description; }
+        }
+
+        #endregion
+
+        #region System.Web.Security.MembershipProvider members
+                
+        ///<summary>
+        ///Adds a new membership user to the data source.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Security.MembershipUser"></see> object populated with the information for the newly created user.
+        ///</returns>
+        ///
+        ///<param name="isApproved">Whether or not the new user is approved to be validated.</param>
+        ///<param name="passwordAnswer">The password answer for the new user</param>
+        ///<param name="username">The user name for the new user. </param>
+        ///<param name="providerUserKey">The unique identifier from the membership data source for the user.</param>
+        ///<param name="password">The password for the new user. </param>
+        ///<param name="passwordQuestion">The password question for the new user.</param>
+        ///<param name="email">The e-mail address for the new user.</param>
+        ///<param name="status">A <see cref="T:System.Web.Security.MembershipCreateStatus"></see> enumeration value indicating whether the user was created successfully.</param>
+        public override MembershipUser CreateUser(string username, string password, string email,
+                                                  string passwordQuestion, string passwordAnswer, bool isApproved,
+                                                  object providerUserKey, out MembershipCreateStatus status)
+        {
+            return this.wrappedProvider.CreateUser(username, password, email, passwordQuestion, passwordAnswer, isApproved, providerUserKey,
+                                       out status);
+        }
+
+        ///<summary>
+        ///Processes a request to update the password question and answer for a membership user.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the password question and answer are updated successfully; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="newPasswordQuestion">The new password question for the specified user. </param>
+        ///<param name="newPasswordAnswer">The new password answer for the specified user. </param>
+        ///<param name="username">The user to change the password question and answer for. </param>
+        ///<param name="password">The password for the specified user. </param>
+        public override bool ChangePasswordQuestionAndAnswer(string username, string password,
+                                                             string newPasswordQuestion, string newPasswordAnswer)
+        {
+            return this.wrappedProvider.ChangePasswordQuestionAndAnswer(username, password, newPasswordQuestion, newPasswordAnswer);
+        }
+
+        ///<summary>
+        ///Gets the password for the specified user name from the data source.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The password for the specified user name.
+        ///</returns>
+        ///
+        ///<param name="username">The user to retrieve the password for. </param>
+        ///<param name="answer">The password answer for the user. </param>
+        public override string GetPassword(string username, string answer)
+        {
+            return this.wrappedProvider.GetPassword(username, answer);
+        }
+
+        ///<summary>
+        ///Processes a request to update the password for a membership user.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the password was updated successfully; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="newPassword">The new password for the specified user. </param>
+        ///<param name="oldPassword">The current password for the specified user. </param>
+        ///<param name="username">The user to update the password for. </param>
+        public override bool ChangePassword(string username, string oldPassword, string newPassword)
+        {
+            return this.wrappedProvider.ChangePassword(username, oldPassword, newPassword);
+        }
+
+        ///<summary>
+        ///Resets a user's password to a new, automatically generated password.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The new password for the specified user.
+        ///</returns>
+        ///
+        ///<param name="username">The user to reset the password for. </param>
+        ///<param name="answer">The password answer for the specified user. </param>
+        public override string ResetPassword(string username, string answer)
+        {
+            return this.wrappedProvider.ResetPassword(username, answer);
+        }
+
+        ///<summary>
+        ///Updates information about a user in the data source.
+        ///</summary>
+        ///
+        ///<param name="user">A <see cref="T:System.Web.Security.MembershipUser"></see> object that represents the user to update and the updated information for the user. </param>
+        public override void UpdateUser(MembershipUser user)
+        {
+            this.wrappedProvider.UpdateUser(user);
+        }
+
+        ///<summary>
+        ///Verifies that the specified user name and password exist in the data source.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the specified username and password are valid; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="username">The name of the user to validate. </param>
+        ///<param name="password">The password for the specified user. </param>
+        public override bool ValidateUser(string username, string password)
+        {
+            return this.wrappedProvider.ValidateUser(username, password);
+        }
+
+        ///<summary>
+        ///Clears a lock so that the membership user can be validated.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the membership user was successfully unlocked; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="userName">The membership user to clear the lock status for.</param>
+        public override bool UnlockUser(string userName)
+        {
+            return this.wrappedProvider.UnlockUser(userName);
+        }
+
+        ///<summary>
+        ///Gets information from the data source for a user based on the unique identifier for the membership user. Provides an option to update the last-activity date/time stamp for the user.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Security.MembershipUser"></see> object populated with the specified user's information from the data source.
+        ///</returns>
+        ///
+        ///<param name="providerUserKey">The unique identifier for the membership user to get information for.</param>
+        ///<param name="userIsOnline">true to update the last-activity date/time stamp for the user; false to return user information without updating the last-activity date/time stamp for the user.</param>
+        public override MembershipUser GetUser(object providerUserKey, bool userIsOnline)
+        {
+            return this.wrappedProvider.GetUser(providerUserKey, userIsOnline);
+        }
+
+        ///<summary>
+        ///Gets information from the data source for a user. Provides an option to update the last-activity date/time stamp for the user.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Security.MembershipUser"></see> object populated with the specified user's information from the data source.
+        ///</returns>
+        ///
+        ///<param name="username">The name of the user to get information for. </param>
+        ///<param name="userIsOnline">true to update the last-activity date/time stamp for the user; false to return user information without updating the last-activity date/time stamp for the user. </param>
+        public override MembershipUser GetUser(string username, bool userIsOnline)
+        {
+            return this.wrappedProvider.GetUser(username, userIsOnline);
+        }
+
+        ///<summary>
+        ///Gets the user name associated with the specified e-mail address.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The user name associated with the specified e-mail address. If no match is found, return null.
+        ///</returns>
+        ///
+        ///<param name="email">The e-mail address to search for. </param>
+        public override string GetUserNameByEmail(string email)
+        {
+             return this.wrappedProvider.GetUserNameByEmail(email);
+        }
+
+        ///<summary>
+        ///Removes a user from the membership data source. 
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the user was successfully deleted; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="username">The name of the user to delete.</param>
+        ///<param name="deleteAllRelatedData">true to delete data related to the user from the database; false to leave data related to the user in the database.</param>
+        public override bool DeleteUser(string username, bool deleteAllRelatedData)
+        {
+            return this.wrappedProvider.DeleteUser(username, deleteAllRelatedData);
+        }
+
+        ///<summary>
+        ///Gets a collection of all the users in the data source in pages of data.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Security.MembershipUserCollection"></see> collection that contains a page of pageSize<see cref="T:System.Web.Security.MembershipUser"></see> objects beginning at the page specified by pageIndex.
+        ///</returns>
+        ///
+        ///<param name="totalRecords">The total number of matched users.</param>
+        ///<param name="pageIndex">The index of the page of results to return. pageIndex is zero-based.</param>
+        ///<param name="pageSize">The size of the page of results to return.</param>
+        public override MembershipUserCollection GetAllUsers(int pageIndex, int pageSize, out int totalRecords)
+        {
+            return this.wrappedProvider.GetAllUsers(pageIndex, pageSize, out totalRecords);
+        }
+
+        ///<summary>
+        ///Gets the number of users currently accessing the application.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The number of users currently accessing the application.
+        ///</returns>
+        ///
+        public override int GetNumberOfUsersOnline()
+        {
+            return this.wrappedProvider.GetNumberOfUsersOnline();
+        }
+
+        ///<summary>
+        ///Gets a collection of membership users where the user name contains the specified user name to match.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Security.MembershipUserCollection"></see> collection that contains a page of pageSize<see cref="T:System.Web.Security.MembershipUser"></see> objects beginning at the page specified by pageIndex.
+        ///</returns>
+        ///
+        ///<param name="totalRecords">The total number of matched users.</param>
+        ///<param name="pageIndex">The index of the page of results to return. pageIndex is zero-based.</param>
+        ///<param name="usernameToMatch">The user name to search for.</param>
+        ///<param name="pageSize">The size of the page of results to return.</param>
+        public override MembershipUserCollection FindUsersByName(string usernameToMatch, int pageIndex, int pageSize,
+                                                                 out int totalRecords)
+        {
+            return this.wrappedProvider.FindUsersByName(usernameToMatch, pageIndex, pageSize, out totalRecords);
+        }
+
+        ///<summary>
+        ///Gets a collection of membership users where the e-mail address contains the specified e-mail address to match.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.Security.MembershipUserCollection"></see> collection that contains a page of pageSize<see cref="T:System.Web.Security.MembershipUser"></see> objects beginning at the page specified by pageIndex.
+        ///</returns>
+        ///
+        ///<param name="totalRecords">The total number of matched users.</param>
+        ///<param name="pageIndex">The index of the page of results to return. pageIndex is zero-based.</param>
+        ///<param name="emailToMatch">The e-mail address to search for.</param>
+        ///<param name="pageSize">The size of the page of results to return.</param>
+        public override MembershipUserCollection FindUsersByEmail(string emailToMatch, int pageIndex, int pageSize,
+                                                                  out int totalRecords)
+        {
+            return this.wrappedProvider.FindUsersByEmail(emailToMatch, pageIndex, pageSize, out totalRecords);
+        }
+
+        ///<summary>
+        ///Indicates whether the membership provider is configured to allow users to retrieve their passwords.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the membership provider is configured to support password retrieval; otherwise, false. The default is false.
+        ///</returns>
+        ///
+        public override bool EnablePasswordRetrieval
+        {
+            get { return this.wrappedProvider.EnablePasswordRetrieval; }
+        }
+
+        ///<summary>
+        ///Indicates whether the membership provider is configured to allow users to reset their passwords.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the membership provider supports password reset; otherwise, false. The default is true.
+        ///</returns>
+        ///
+        public override bool EnablePasswordReset
+        {
+            get { return this.wrappedProvider.EnablePasswordReset; }
+        }
+
+        ///<summary>
+        ///Gets a value indicating whether the membership provider is configured to require the user to answer a password question for password reset and retrieval.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if a password answer is required for password reset and retrieval; otherwise, false. The default is true.
+        ///</returns>
+        ///
+        public override bool RequiresQuestionAndAnswer
+        {
+            get { return this.wrappedProvider.RequiresQuestionAndAnswer; }
+        }
+
+        ///<summary>
+        ///The name of the application using the custom membership provider.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The name of the application using the custom membership provider.
+        ///</returns>
+        ///
+        public override string ApplicationName
+        {
+            get { return this.wrappedProvider.ApplicationName; }
+            set { this.wrappedProvider.ApplicationName = value; }
+        }
+
+        ///<summary>
+        ///Gets the number of invalid password or password-answer attempts allowed before the membership user is locked out.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The number of invalid password or password-answer attempts allowed before the membership user is locked out.
+        ///</returns>
+        ///
+        public override int MaxInvalidPasswordAttempts
+        {
+            get { return this.wrappedProvider.MaxInvalidPasswordAttempts; }
+        }
+
+        ///<summary>
+        ///Gets the number of minutes in which a maximum number of invalid password or password-answer attempts are allowed before the membership user is locked out.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The number of minutes in which a maximum number of invalid password or password-answer attempts are allowed before the membership user is locked out.
+        ///</returns>
+        ///
+        public override int PasswordAttemptWindow
+        {
+            get { return this.wrappedProvider.PasswordAttemptWindow; }
+        }
+
+        ///<summary>
+        ///Gets a value indicating whether the membership provider is configured to require a unique e-mail address for each user name.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the membership provider requires a unique e-mail address; otherwise, false. The default is true.
+        ///</returns>
+        ///
+        public override bool RequiresUniqueEmail
+        {
+            get { return this.wrappedProvider.RequiresUniqueEmail; }
+        }
+
+        ///<summary>
+        ///Gets a value indicating the format for storing passwords in the membership data store.
+        ///</summary>
+        ///
+        ///<returns>
+        ///One of the <see cref="T:System.Web.Security.MembershipPasswordFormat"></see> values indicating the format for storing passwords in the data store.
+        ///</returns>
+        ///
+        public override MembershipPasswordFormat PasswordFormat
+        {
+            get { return this.wrappedProvider.PasswordFormat; }
+        }
+
+        ///<summary>
+        ///Gets the minimum length required for a password.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The minimum length required for a password. 
+        ///</returns>
+        ///
+        public override int MinRequiredPasswordLength
+        {
+            get { return this.wrappedProvider.MinRequiredPasswordLength; }
+        }
+
+        ///<summary>
+        ///Gets the minimum number of special characters that must be present in a valid password.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The minimum number of special characters that must be present in a valid password.
+        ///</returns>
+        ///
+        public override int MinRequiredNonAlphanumericCharacters
+        {
+            get { return this.wrappedProvider.MinRequiredNonAlphanumericCharacters; }
+        }
+
+        ///<summary>
+        ///Gets the regular expression used to evaluate a password.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A regular expression used to evaluate a password.
+        ///</returns>
+        ///
+        public override string PasswordStrengthRegularExpression
+        {
+            get { return this.wrappedProvider.PasswordStrengthRegularExpression; }
+        }        
+  
+        #endregion
+    }        
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/ProfileProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/ProfileProviderAdapter.cs
new file mode 100644
index 00000000..7ed7ec2a
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Providers/ProfileProviderAdapter.cs
@@ -0,0 +1,284 @@
+#if NET_2_0
+
+using System;
+using System.Collections.Specialized;
+using System.Configuration;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.Profile;
+using Spring.Context.Support;
+
+namespace Spring.Web.Providers
+{
+     /// <summary>
+    /// Wrapper for <see cref="System.Web.Profile.ProfileProvider"/> class.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+    /// as the Id of wrapped provider (defined in the Spring context).  
+    /// </p>    
+    /// </remarks>
+    /// <author>Damjan Tomic</author>
+    [AspNetHostingPermission(SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    public class ProfileProviderAdapter : ProfileProvider, IProfileProvider
+     {
+        #region Field
+
+        /// <summary>
+        /// Reference to wrapped provider (defined in Spring context).
+        /// </summary>
+        private ProfileProvider wrappedProvider;
+
+        #endregion
+
+        #region ProviderBase members
+
+        ///<summary>
+        ///Initializes the provider.
+        ///</summary>
+        ///
+        ///<param name="config">A collection of the name/value pairs representing the provider-specific 
+        /// attributes specified in the configuration for this provider.
+        /// The <c>providerId</c> attribute may be used to override the name being used for looking up an object definition.
+        /// </param>
+        ///<param name="name">The friendly name of the provider.</param>
+        ///<exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+        ///<exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+        ///<exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>      
+        public override void Initialize(string name, NameValueCollection config)
+        {
+            lock (this)
+            {
+                if (config == null) throw new ArgumentNullException("config");
+
+                string providerId = config["providerId"];
+                if (String.IsNullOrEmpty(providerId))
+                    providerId = name;
+                config.Remove("providerId");
+
+                this.wrappedProvider = (ProfileProvider)WebApplicationContext.GetRootContext().GetObject(providerId);
+                this.wrappedProvider.Initialize(name, config);
+            }
+        }
+
+        ///<summary>
+        ///Gets the friendly name used to refer to the provider during configuration.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The friendly name used to refer to the provider during configuration.
+        ///</returns>
+        public override string Name
+        {
+            get { return this.wrappedProvider.Name; }
+        }
+
+        ///<summary>
+        ///Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+        ///</summary>
+        ///
+        ///<returns>
+        ///A brief, friendly description suitable for display in administrative tools or other UIs.
+        ///</returns>
+        public override string Description
+        {
+            get { return this.wrappedProvider.Description; }
+        }
+
+        #endregion
+
+        #region System.Web.Profile.ProfileProvider members
+
+         ///<summary>
+         ///Returns the collection of settings property values for the specified application instance and settings property group.
+         ///</summary>
+         ///
+         ///<returns>
+         ///A <see cref="T:System.Configuration.SettingsPropertyValueCollection"></see> containing the values for the specified settings property group.
+         ///</returns>
+         ///
+         ///<param name="context">A <see cref="T:System.Configuration.SettingsContext"></see> describing the current application use.</param>
+         ///<param name="collection">A <see cref="T:System.Configuration.SettingsPropertyCollection"></see> containing the settings property group whose values are to be retrieved.</param><filterpriority>2</filterpriority>
+         public override SettingsPropertyValueCollection GetPropertyValues(SettingsContext context,
+                                                                           SettingsPropertyCollection collection)
+         {
+             return this.wrappedProvider.GetPropertyValues(context, collection);
+         }
+
+         ///<summary>
+         ///Sets the values of the specified group of property settings.
+         ///</summary>
+         ///
+         ///<param name="context">A <see cref="T:System.Configuration.SettingsContext"></see> describing the current application usage.</param>
+         ///<param name="collection">A <see cref="T:System.Configuration.SettingsPropertyValueCollection"></see> representing the group of property settings to set.</param><filterpriority>2</filterpriority>
+         public override void SetPropertyValues(SettingsContext context, SettingsPropertyValueCollection collection)
+         {
+             this.wrappedProvider.SetPropertyValues(context,collection);
+         }
+
+         ///<summary>
+         ///Gets or sets the name of the currently running application.
+         ///</summary>
+         ///
+         ///<returns>
+         ///A <see cref="T:System.String"></see> that contains the application's shortened name, which does not contain a full path or extension, for example, SimpleAppSettings.
+         ///</returns>
+         ///<filterpriority>2</filterpriority>
+         public override string ApplicationName
+         {
+             get { return this.wrappedProvider.ApplicationName; }
+             set { this.wrappedProvider.ApplicationName = value; }
+         }
+
+         ///<summary>
+         ///When overridden in a derived class, deletes profile properties and information for the supplied list of profiles.
+         ///</summary>
+         ///
+         ///<returns>
+         ///The number of profiles deleted from the data source.
+         ///</returns>
+         ///
+         ///<param name="profiles">A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see>  of information about profiles that are to be deleted.</param>
+         public override int DeleteProfiles(ProfileInfoCollection profiles)
+         {
+             return this.wrappedProvider.DeleteProfiles(profiles);
+         }
+
+         ///<summary>
+         ///When overridden in a derived class, deletes profile properties and information for profiles that match the supplied list of user names.
+         ///</summary>
+         ///
+         ///<returns>
+         ///The number of profiles deleted from the data source.
+         ///</returns>
+         ///
+         ///<param name="usernames">A string array of user names for profiles to be deleted.</param>
+         public override int DeleteProfiles(string[] usernames)
+         {
+             return this.wrappedProvider.DeleteProfiles(usernames);
+         }
+
+         ///<summary>
+         ///When overridden in a derived class, deletes all user-profile data for profiles in which the last activity date occurred before the specified date.
+         ///</summary>
+         ///
+         ///<returns>
+         ///The number of profiles deleted from the data source.
+         ///</returns>
+         ///
+         ///<param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are deleted.</param>
+         ///<param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see>  value of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+         public override int DeleteInactiveProfiles(ProfileAuthenticationOption authenticationOption,
+                                                    DateTime userInactiveSinceDate)
+         {
+             return this.wrappedProvider.DeleteInactiveProfiles(authenticationOption, userInactiveSinceDate);
+         }
+
+         ///<summary>
+         ///When overridden in a derived class, returns the number of profiles in which the last activity date occurred on or before the specified date.
+         ///</summary>
+         ///
+         ///<returns>
+         ///The number of profiles in which the last activity date occurred on or before the specified date.
+         ///</returns>
+         ///
+         ///<param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+         ///<param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see>  of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+         public override int GetNumberOfInactiveProfiles(ProfileAuthenticationOption authenticationOption,
+                                                         DateTime userInactiveSinceDate)
+         {
+             return this.wrappedProvider.GetNumberOfInactiveProfiles(authenticationOption, userInactiveSinceDate);
+         }
+
+         ///<summary>
+         ///When overridden in a derived class, retrieves user profile data for all profiles in the data source.
+         ///</summary>
+         ///
+         ///<returns>
+         ///A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user-profile information for all profiles in the data source.
+         ///</returns>
+         ///
+         ///<param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+         ///<param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+         ///<param name="pageIndex">The index of the page of results to return.</param>
+         ///<param name="pageSize">The size of the page of results to return.</param>
+         public override ProfileInfoCollection GetAllProfiles(ProfileAuthenticationOption authenticationOption,
+                                                              int pageIndex, int pageSize, out int totalRecords)
+         {
+             return this.wrappedProvider.GetAllProfiles(authenticationOption, pageIndex, pageSize, out totalRecords);
+         }
+
+         ///<summary>
+         ///When overridden in a derived class, retrieves user-profile data from the data source for profiles in which the last activity date occurred on or before the specified date.
+         ///</summary>
+         ///
+         ///<returns>
+         ///A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user-profile information about the inactive profiles.
+         ///</returns>
+         ///
+         ///<param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+         ///<param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see>  of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+         ///<param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+         ///<param name="pageIndex">The index of the page of results to return.</param>
+         ///<param name="pageSize">The size of the page of results to return.</param>
+         public override ProfileInfoCollection GetAllInactiveProfiles(ProfileAuthenticationOption authenticationOption,
+                                                                      DateTime userInactiveSinceDate, int pageIndex,
+                                                                      int pageSize, out int totalRecords)
+         {
+             return
+                 this.wrappedProvider.GetAllInactiveProfiles(authenticationOption, userInactiveSinceDate, pageIndex, pageSize,
+                                                 out totalRecords);
+         }
+
+         ///<summary>
+         ///When overridden in a derived class, retrieves profile information for profiles in which the user name matches the specified user names.
+         ///</summary>
+         ///
+         ///<returns>
+         ///A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user-profile information for profiles where the user name matches the supplied usernameToMatch parameter.
+         ///</returns>
+         ///
+         ///<param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+         ///<param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+         ///<param name="pageIndex">The index of the page of results to return.</param>
+         ///<param name="usernameToMatch">The user name to search for.</param>
+         ///<param name="pageSize">The size of the page of results to return.</param>
+         public override ProfileInfoCollection FindProfilesByUserName(ProfileAuthenticationOption authenticationOption,
+                                                                      string usernameToMatch, int pageIndex, int pageSize,
+                                                                      out int totalRecords)
+         {
+             return
+                 this.wrappedProvider.FindProfilesByUserName(authenticationOption, usernameToMatch, pageIndex, pageSize,
+                                                 out totalRecords);
+         }
+
+         ///<summary>
+         ///When overridden in a derived class, retrieves profile information for profiles in which the last activity date occurred on or before the specified date and the user name matches the specified user name.
+         ///</summary>
+         ///
+         ///<returns>
+         ///A <see cref="T:System.Web.Profile.ProfileInfoCollection"></see> containing user profile information for inactive profiles where the user name matches the supplied usernameToMatch parameter.
+         ///</returns>
+         ///
+         ///<param name="authenticationOption">One of the <see cref="T:System.Web.Profile.ProfileAuthenticationOption"></see> values, specifying whether anonymous, authenticated, or both types of profiles are returned.</param>
+         ///<param name="userInactiveSinceDate">A <see cref="T:System.DateTime"></see> that identifies which user profiles are considered inactive. If the <see cref="P:System.Web.Profile.ProfileInfo.LastActivityDate"></see> value of a user profile occurs on or before this date and time, the profile is considered inactive.</param>
+         ///<param name="totalRecords">When this method returns, contains the total number of profiles.</param>
+         ///<param name="pageIndex">The index of the page of results to return.</param>
+         ///<param name="usernameToMatch">The user name to search for.</param>
+         ///<param name="pageSize">The size of the page of results to return.</param>
+         public override ProfileInfoCollection FindInactiveProfilesByUserName(
+             ProfileAuthenticationOption authenticationOption, string usernameToMatch, DateTime userInactiveSinceDate,
+             int pageIndex, int pageSize, out int totalRecords)
+         {
+             return this.wrappedProvider.FindInactiveProfilesByUserName(authenticationOption, usernameToMatch, userInactiveSinceDate,
+                                                            pageIndex, pageSize, out totalRecords);            
+         }
+         
+         
+         #endregion
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs
new file mode 100644
index 00000000..803394d0
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs
@@ -0,0 +1,269 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.Security;
+using Spring.Context.Support;
+
+#endregion
+
+
+namespace Spring.Web.Providers
+{
+    /// <summary>
+    /// Wrapper for <see cref="System.Web.Security.RoleProvider"/> class.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+    /// as the Id of wrapped provider (defined in the Spring context).  
+    /// </p>    
+    /// </remarks>
+    /// <author>Damjan Tomic</author>
+    [AspNetHostingPermission(SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    public class RoleProviderAdapter : RoleProvider, IRoleProvider
+    {
+        #region Field
+
+        /// <summary>
+        /// Reference to wrapped provider (defined in Spring context).
+        /// </summary>
+        private RoleProvider wrappedProvider;
+
+        #endregion
+
+        #region ProviderBase members
+
+        ///<summary>
+        ///Initializes the provider.
+        ///</summary>
+        ///
+        ///<param name="config">A collection of the name/value pairs representing the provider-specific 
+        /// attributes specified in the configuration for this provider.
+        /// The <c>providerId</c> attribute may be used to override the name being used for looking up an object definition.
+        /// </param>
+        ///<param name="name">The friendly name of the provider.</param>
+        ///<exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+        ///<exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+        ///<exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>      
+        public override void Initialize(string name, NameValueCollection config)
+        {
+            lock (this)
+            {
+                if (config == null) throw new ArgumentNullException("config");                        
+            
+                string providerId = config["providerId"];            
+                if (String.IsNullOrEmpty(providerId)) 
+                    providerId = name;
+                config.Remove("providerId");
+
+                this.wrappedProvider = (RoleProvider)WebApplicationContext.GetRootContext().GetObject(providerId);
+                this.wrappedProvider.Initialize(name,config);
+            }
+        }
+        
+        ///<summary>
+        ///Gets the friendly name used to refer to the provider during configuration.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The friendly name used to refer to the provider during configuration.
+        ///</returns>
+        public override string Name
+        {
+            get { return this.wrappedProvider.Name; }
+        }
+        
+        ///<summary>
+        ///Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+        ///</summary>
+        ///
+        ///<returns>
+        ///A brief, friendly description suitable for display in administrative tools or other UIs.
+        ///</returns>
+        public override string Description
+        {
+            get { return this.wrappedProvider.Description; }
+        }
+
+        #endregion
+
+        #region System.Web.Security.RoleProvider members
+                
+
+        ///<summary>
+        ///Gets a value indicating whether the specified user is in the specified role for the configured applicationName.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the specified user is in the specified role for the configured applicationName; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="username">The user name to search for.</param>
+        ///<param name="roleName">The role to search in.</param>
+        public override bool IsUserInRole(string username, string roleName)
+        {
+            return this.wrappedProvider.IsUserInRole(username, roleName);
+        }
+
+        ///<summary>
+        ///Gets a list of the roles that a specified user is in for the configured applicationName.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A string array containing the names of all the roles that the specified user is in for the configured applicationName.
+        ///</returns>
+        ///
+        ///<param name="username">The user to return a list of roles for.</param>
+        public override string[] GetRolesForUser(string username)
+        {
+            return this.wrappedProvider.GetRolesForUser(username);
+        }
+
+        ///<summary>
+        ///Adds a new role to the data source for the configured applicationName.
+        ///</summary>
+        ///
+        ///<param name="roleName">The name of the role to create.</param>
+        public override void CreateRole(string roleName)
+        {
+            this.wrappedProvider.CreateRole(roleName);
+        }
+
+        ///<summary>
+        ///Removes a role from the data source for the configured applicationName.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the role was successfully deleted; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="throwOnPopulatedRole">If true, throw an exception if roleName has one or more members and do not delete roleName.</param>
+        ///<param name="roleName">The name of the role to delete.</param>
+        public override bool DeleteRole(string roleName, bool throwOnPopulatedRole)
+        {
+            return this.wrappedProvider.DeleteRole(roleName, throwOnPopulatedRole);
+        }
+
+        ///<summary>
+        ///Gets a value indicating whether the specified role name already exists in the role data source for the configured applicationName.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if the role name already exists in the data source for the configured applicationName; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="roleName">The name of the role to search for in the data source. </param>
+        public override bool RoleExists(string roleName)
+        {
+            return this.wrappedProvider.RoleExists(roleName);
+        }
+
+        ///<summary>
+        ///Adds the specified user names to the specified roles for the configured applicationName.
+        ///</summary>
+        ///
+        ///<param name="roleNames">A string array of the role names to add the specified user names to. </param>
+        ///<param name="usernames">A string array of user names to be added to the specified roles. </param>
+        public override void AddUsersToRoles(string[] usernames, string[] roleNames)
+        {
+            this.wrappedProvider.AddUsersToRoles(usernames,roleNames);
+        }
+
+        ///<summary>
+        ///Removes the specified user names from the specified roles for the configured applicationName.
+        ///</summary>
+        ///
+        ///<param name="roleNames">A string array of role names to remove the specified user names from. </param>
+        ///<param name="usernames">A string array of user names to be removed from the specified roles. </param>
+        public override void RemoveUsersFromRoles(string[] usernames, string[] roleNames)
+        {
+            this.wrappedProvider.RemoveUsersFromRoles(usernames,roleNames);
+        }
+
+        ///<summary>
+        ///Gets a list of users in the specified role for the configured applicationName.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A string array containing the names of all the users who are members of the specified role for the configured applicationName.
+        ///</returns>
+        ///
+        ///<param name="roleName">The name of the role to get the list of users for. </param>
+        public override string[] GetUsersInRole(string roleName)
+        {
+            return this.wrappedProvider.GetUsersInRole(roleName);
+        }
+
+        ///<summary>
+        ///Gets a list of all the roles for the configured applicationName.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A string array containing the names of all the roles stored in the data source for the configured applicationName.
+        ///</returns>
+        ///
+        public override string[] GetAllRoles()
+        {
+            return this.wrappedProvider.GetAllRoles();
+        }
+
+        ///<summary>
+        ///Gets an array of user names in a role where the user name contains the specified user name to match.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A string array containing the names of all the users where the user name matches usernameToMatch and the user is a member of the specified role.
+        ///</returns>
+        ///
+        ///<param name="usernameToMatch">The user name to search for.</param>
+        ///<param name="roleName">The role to search in.</param>
+        public override string[] FindUsersInRole(string roleName, string usernameToMatch)
+        {
+            return this.wrappedProvider.FindUsersInRole(roleName, usernameToMatch);
+        }
+
+        ///<summary>
+        ///Gets or sets the name of the application to store and retrieve role information for.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The name of the application to store and retrieve role information for.
+        ///</returns>
+        ///
+        public override string ApplicationName
+        {
+            get { return this.wrappedProvider.ApplicationName; }
+            set { this.wrappedProvider.ApplicationName = value; }
+        }
+
+        #endregion
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs
new file mode 100644
index 00000000..7652de4f
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs
@@ -0,0 +1,368 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using System.Configuration.Provider;
+using System.Security.Permissions;
+using System.Web;
+using Spring.Context.Support;
+
+#endregion
+
+
+namespace Spring.Web.Providers
+{
+    /// <summary>
+    /// Wrapper for <see cref="System.Web.SiteMapProvider "/> class.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Configuration for this provider <b>requires</b> <c>providerId</c> element set in web.config file, 
+    /// as the Id of wrapped provider (defined in the Spring context).  
+    /// </p>    
+    /// </remarks>
+    /// <author>Damjan Tomic</author>
+    [AspNetHostingPermission(SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    public class SiteMapProviderAdapter : SiteMapProvider, ISiteMapProvider
+    {
+        #region Field
+
+        /// <summary>
+        /// Reference to wrapped provider (defined in Spring context).
+        /// </summary>
+        private SiteMapProvider wrappedProvider;
+
+        #endregion
+
+        #region ProviderBase members
+
+        ///<summary>
+        ///Initializes the provider.
+        ///</summary>
+        ///
+        ///<param name="config">A collection of the name/value pairs representing the provider-specific 
+        /// attributes specified in the configuration for this provider.
+        /// The <c>providerId</c> attribute may be used to override the name being used for looking up an object definition.
+        /// </param>
+        ///<param name="name">The friendly name of the provider.</param>
+        ///<exception cref="T:System.ArgumentNullException">The <paramref name="name"/> or <paramref name="config"/> is null.</exception>
+        ///<exception cref="T:System.InvalidOperationException">An attempt is made to call <see cref="M:System.Configuration.Provider.ProviderBase.Initialize(System.String,System.Collections.Specialized.NameValueCollection)"></see> on a provider after the provider has already been initialized.</exception>
+        ///<exception cref="T:System.ArgumentException">The <paramref name="name"/> has a length of zero or providerId attribute is not set.</exception>
+        public override void Initialize(string name, NameValueCollection config)
+        {
+            if (config == null) throw new ArgumentNullException("config");                        
+            
+            string providerId = config["providerId"];            
+            if (String.IsNullOrEmpty(providerId)) 
+                providerId = name;
+            config.Remove("providerId");
+
+            this.wrappedProvider = (System.Web.SiteMapProvider)WebApplicationContext.GetRootContext().GetObject(providerId);
+            this.wrappedProvider.Initialize(name,config);
+        }
+
+        ///<summary>
+        ///Gets the friendly name used to refer to the provider during configuration.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The friendly name used to refer to the provider during configuration.
+        ///</returns>
+        ///
+        public override string Name
+        {
+            get { return this.wrappedProvider.Name; }
+        }
+
+        ///<summary>
+        ///Gets a brief, friendly description suitable for display in administrative tools or other user interfaces (UIs).
+        ///</summary>
+        ///
+        ///<returns>
+        ///A brief, friendly description suitable for display in administrative tools or other UIs.
+        ///</returns>
+        ///        
+        public override string Description
+        {
+            get { return this.wrappedProvider.Description; }
+        }
+
+        #endregion
+
+        #region System.Web.SiteMapProvider members
+
+        ///<summary>
+        ///Retrieves a <see cref="T:System.Web.SiteMapNode"></see> object that represents the currently requested page using the specified <see cref="T:System.Web.HttpContext"></see> object.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if no corresponding <see cref="T:System.Web.SiteMapNode"></see> can be found in the <see cref="T:System.Web.SiteMapNode"></see> or if the page context is null. 
+        ///</returns>
+        ///
+        ///<param name="context">The <see cref="T:System.Web.HttpContext"></see> used to match node information with the URL of the requested page.</param>
+        public override SiteMapNode FindSiteMapNode(HttpContext context)
+        {
+            return this.wrappedProvider.FindSiteMapNode(context);
+        }
+
+        ///<summary>
+        ///Retrieves a <see cref="T:System.Web.SiteMapNode"></see> object based on a specified key.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the page identified by key; otherwise, null, if no corresponding <see cref="T:System.Web.SiteMapNode"></see> is found or if security trimming is enabled and the <see cref="T:System.Web.SiteMapNode"></see> cannot be returned for the current user. The default is null.
+        ///</returns>
+        ///
+        ///<param name="key">A lookup key with which a <see cref="T:System.Web.SiteMapNode"></see> is created.</param>
+        public override SiteMapNode FindSiteMapNodeFromKey(string key)
+        {
+            return this.wrappedProvider.FindSiteMapNodeFromKey(key);
+        }
+
+        ///<summary>
+        ///When overridden in a derived class, retrieves a <see cref="T:System.Web.SiteMapNode"></see> object that represents the page at the specified URL.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the page identified by rawURL; otherwise, null, if no corresponding <see cref="T:System.Web.SiteMapNode"></see> is found or if security trimming is enabled and the <see cref="T:System.Web.SiteMapNode"></see> cannot be returned for the current user.
+        ///</returns>
+        ///
+        ///<param name="rawUrl">A URL that identifies the page for which to retrieve a <see cref="T:System.Web.SiteMapNode"></see>. </param>
+        public override SiteMapNode FindSiteMapNode(string rawUrl)
+        {
+            return this.wrappedProvider.FindSiteMapNode(rawUrl);
+        }
+
+        ///<summary>
+        ///When overridden in a derived class, retrieves the child nodes of a specific <see cref="T:System.Web.SiteMapNode"></see>.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A read-only <see cref="T:System.Web.SiteMapNodeCollection"></see> that contains the immediate child nodes of the specified <see cref="T:System.Web.SiteMapNode"></see>; otherwise, null or an empty collection, if no child nodes exist.
+        ///</returns>
+        ///
+        ///<param name="node">The <see cref="T:System.Web.SiteMapNode"></see> for which to retrieve all child nodes. </param>
+        public override SiteMapNodeCollection GetChildNodes(SiteMapNode node)
+        {
+            return this.wrappedProvider.GetChildNodes(node);
+        }
+
+        ///<summary>
+        ///Provides an optimized lookup method for site map providers when retrieving the node for the currently requested page and fetching the parent and ancestor site map nodes for the current page.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+        ///</returns>
+        ///
+        ///<param name="upLevel">The number of ancestor site map node generations to get. A value of -1 indicates that all ancestors might be retrieved and cached by the provider.</param>
+        ///<exception cref="T:System.ArgumentOutOfRangeException">upLevel is less than -1.</exception>
+        public override SiteMapNode GetCurrentNodeAndHintAncestorNodes(int upLevel)
+        {
+            return this.wrappedProvider.GetCurrentNodeAndHintAncestorNodes(upLevel);
+        }
+
+        ///<summary>
+        ///Provides an optimized lookup method for site map providers when retrieving the node for the currently requested page and fetching the site map nodes in the proximity of the current node.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+        ///</returns>
+        ///
+        ///<param name="upLevel">The number of ancestor <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no ancestor nodes are retrieved and -1 indicates that all ancestors might be retrieved and cached by the provider.</param>
+        ///<param name="downLevel">The number of child <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no descendant nodes are retrieved and a -1 indicates that all descendant nodes might be retrieved and cached by the provider.</param>
+        ///<exception cref="T:System.ArgumentOutOfRangeException">upLevel or downLevel is less than -1.</exception>
+        public override SiteMapNode GetCurrentNodeAndHintNeighborhoodNodes(int upLevel, int downLevel)
+        {
+            return this.wrappedProvider.GetCurrentNodeAndHintNeighborhoodNodes(upLevel, downLevel);
+        }
+
+        ///<summary>
+        ///When overridden in a derived class, retrieves the parent node of a specific <see cref="T:System.Web.SiteMapNode"></see> object.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the parent of node; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> has no parent or security trimming is enabled and the parent node is not accessible to the current user.
+        ///</returns>
+        ///
+        ///<param name="node">The <see cref="T:System.Web.SiteMapNode"></see> for which to retrieve the parent node. </param>
+        public override SiteMapNode GetParentNode(SiteMapNode node)
+        {
+            return this.wrappedProvider.GetParentNode(node);
+        }
+
+        ///<summary>
+        ///Provides an optimized lookup method for site map providers when retrieving an ancestor node for the currently requested page and fetching the descendant nodes for the ancestor.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents an ancestor <see cref="T:System.Web.SiteMapNode"></see> of the currently requested page; otherwise, null, if the current or ancestor <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+        ///</returns>
+        ///
+        ///<param name="relativeDepthFromWalkup">The number of descendant node levels to retrieve from the target ancestor node. </param>
+        ///<param name="walkupLevels">The number of ancestor node levels to traverse when retrieving the requested ancestor node. </param>
+        ///<exception cref="T:System.ArgumentOutOfRangeException">walkupLevels or relativeDepthFromWalkup is less than 0.</exception>
+        public override SiteMapNode GetParentNodeRelativeToCurrentNodeAndHintDownFromParent(int walkupLevels,
+                                                                                            int relativeDepthFromWalkup)
+        {
+            return this.wrappedProvider.GetParentNodeRelativeToCurrentNodeAndHintDownFromParent(walkupLevels, relativeDepthFromWalkup);
+        }
+
+        ///<summary>
+        ///Provides an optimized lookup method for site map providers when retrieving an ancestor node for the specified <see cref="T:System.Web.SiteMapNode"></see> object and fetching its child nodes.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents an ancestor of node; otherwise, null, if the current or ancestor <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+        ///</returns>
+        ///
+        ///<param name="relativeDepthFromWalkup">The number of descendant node levels to retrieve from the target ancestor node.</param>
+        ///<param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that acts as a reference point for walkupLevels and relativeDepthFromWalkup. </param>
+        ///<param name="walkupLevels">The number of ancestor node levels to traverse when retrieving the requested ancestor node.</param>
+        ///<exception cref="T:System.ArgumentOutOfRangeException">The value specified for walkupLevels or relativeDepthFromWalkup is less than 0.</exception>
+        ///<exception cref="T:System.ArgumentNullException">node is null.</exception>
+        public override SiteMapNode GetParentNodeRelativeToNodeAndHintDownFromParent(SiteMapNode node, int walkupLevels,
+                                                                                     int relativeDepthFromWalkup)
+        {
+            return this.wrappedProvider.GetParentNodeRelativeToNodeAndHintDownFromParent(node, walkupLevels, relativeDepthFromWalkup);
+        }
+
+        ///<summary>
+        /// This method is marked as protected and should never be called.
+        ///</summary>
+        ///<exception cref="NotSupportedException"></exception>
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the root node of the set of nodes that the current provider manages. 
+        ///</returns>
+        ///
+        protected override SiteMapNode GetRootNodeCore()
+        {
+            throw new NotSupportedException("This method should never be called.");
+        }
+
+        ///<summary>
+        ///Provides a method that site map providers can override to perform an optimized retrieval of one or more levels of parent and ancestor nodes, relative to the specified <see cref="T:System.Web.SiteMapNode"></see> object. 
+        ///</summary>
+        ///
+        ///<param name="upLevel">The number of ancestor <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no ancestor nodes are retrieved and -1 indicates that all ancestors might be retrieved and cached.</param>
+        ///<param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that acts as a reference point for upLevel.</param>
+        ///<exception cref="T:System.ArgumentOutOfRangeException">upLevel is less than -1.</exception>
+        ///<exception cref="T:System.ArgumentNullException">node is null.</exception>
+        public override void HintAncestorNodes(SiteMapNode node, int upLevel)
+        {
+            this.wrappedProvider.HintAncestorNodes(node, upLevel);            
+        }
+
+        ///<summary>
+        ///Provides a method that site map providers can override to perform an optimized retrieval of nodes found in the proximity of the specified node. 
+        ///</summary>
+        ///
+        ///<param name="upLevel">The number of ancestor <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no ancestor nodes are retrieved and -1 indicates that all ancestors (and their descendant nodes to the level of node) might be retrieved and cached.</param>
+        ///<param name="downLevel">The number of descendant <see cref="T:System.Web.SiteMapNode"></see> generations to fetch. 0 indicates no descendant nodes are retrieved and -1 indicates that all descendant nodes might be retrieved and cached.</param>
+        ///<param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that acts as a reference point for upLevel.</param>
+        ///<exception cref="T:System.ArgumentOutOfRangeException">upLevel or downLevel is less than -1.</exception>
+        ///<exception cref="T:System.ArgumentNullException">node is null.</exception>
+        public override void HintNeighborhoodNodes(SiteMapNode node, int upLevel, int downLevel)
+        {
+            this.wrappedProvider.HintNeighborhoodNodes(node, upLevel, downLevel);
+        }
+
+        ///<summary>
+        ///Retrieves a Boolean value indicating whether the specified <see cref="T:System.Web.SiteMapNode"></see> object can be viewed by the user in the specified context.
+        ///</summary>
+        ///
+        ///<returns>
+        ///true if security trimming is enabled and node can be viewed by the user or security trimming is not enabled; otherwise, false.
+        ///</returns>
+        ///
+        ///<param name="context">The <see cref="T:System.Web.HttpContext"></see> that contains user information.</param>
+        ///<param name="node">The <see cref="T:System.Web.SiteMapNode"></see> that is requested by the user.</param>
+        ///<exception cref="T:System.ArgumentNullException">context is null.- or -node is null.</exception>
+        public override bool IsAccessibleToUser(HttpContext context, SiteMapNode node)
+        {
+            return this.wrappedProvider.IsAccessibleToUser(context, node);
+        }
+
+        ///<summary>
+        ///Gets the <see cref="T:System.Web.SiteMapNode"></see> object that represents the currently requested page.
+        ///</summary>
+        ///
+        ///<returns>
+        ///A <see cref="T:System.Web.SiteMapNode"></see> that represents the currently requested page; otherwise, null, if the <see cref="T:System.Web.SiteMapNode"></see> is not found or cannot be returned for the current user.
+        ///</returns>
+        ///
+        public override SiteMapNode CurrentNode
+        {
+            get { return this.wrappedProvider.CurrentNode; }
+        }
+
+        ///<summary>
+        ///Gets or sets the parent <see cref="T:System.Web.SiteMapProvider"></see> object of the current provider.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The parent provider of the current <see cref="T:System.Web.SiteMapProvider"></see>.
+        ///</returns>
+        ///
+        public override System.Web.SiteMapProvider ParentProvider
+        {
+            get { return this.wrappedProvider.ParentProvider; }
+            set { this.wrappedProvider.ParentProvider = value; }
+        }
+
+        ///<summary>
+        ///Gets the root <see cref="T:System.Web.SiteMapProvider"></see> object in the current provider hierarchy.
+        ///</summary>
+        ///
+        ///<returns>
+        ///An <see cref="T:System.Web.SiteMapProvider"></see> that is the top-level site map provider in the provider hierarchy that the current provider belongs to.
+        ///</returns>
+        ///
+        ///<exception cref="T:System.Configuration.Provider.ProviderException">There is a circular reference to the current site map provider. </exception>
+        public override System.Web.SiteMapProvider RootProvider
+        {
+            get { return this.wrappedProvider.RootProvider; }
+        }
+
+        ///<summary>
+        ///Gets the root <see cref="T:System.Web.SiteMapNode"></see> object of the site map data that the current provider represents.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The root <see cref="T:System.Web.SiteMapNode"></see> of the current site map data provider. The default implementation performs security trimming on the returned node.
+        ///</returns>
+        ///
+        public override SiteMapNode RootNode
+        {
+            get { return this.wrappedProvider.RootNode; }
+        }                
+
+        #endregion
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs b/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs
new file mode 100644
index 00000000..8dee0d9d
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs
@@ -0,0 +1,503 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Web.Services;
+
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Util;
+using Spring.Proxy;
+
+#endregion
+
+namespace Spring.Web.Services
+{
+    /// <summary>
+    /// Exports an object as a web service.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// The exporter will create a web service wrapper for the object that is
+    /// to be exposed and additionally enable its configuration as a web
+    /// service.
+    /// </p>
+    /// <p>
+    /// The exported object can be either a standard .NET web service
+    /// implementation, with methods marked using the standard
+    /// <see cref="System.Web.Services.WebMethodAttribute"/>, or it can be a
+    /// plain .NET object.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: WebServiceExporter.cs,v 1.33 2008/04/07 11:00:24 bbaia Exp $</version>
+    public class WebServiceExporter : IInitializingObject, IObjectFactoryAware, IFactoryObject, IObjectNameAware
+    {
+        #region Fields
+
+        private Type _webServiceBaseType = typeof(WebService);
+        private string _targetName;
+        private string _description;
+        private string _name;
+        private string _namespace = WebServiceAttribute.DefaultNamespace;
+        private string[] _interfaces;
+        private IList _typeAttributes = new ArrayList();
+        private IDictionary _memberAttributes = new Hashtable();
+
+        /// <summary>
+        /// The name of the object in the factory.
+        /// </summary>
+        protected string objectName;
+        
+        /// <summary>
+        /// The owning factory.
+        /// </summary>
+        protected IObjectFactory objectFactory;
+        
+        /// <summary>
+        /// The generated web service wrapper type.
+        /// </summary>
+        protected Type proxyType;
+
+        #endregion
+
+        #region Constructor(s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Web.Services.WebServiceExporter"/> class.
+        /// </summary>
+        public WebServiceExporter()
+        {}
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the base type that web service should inherit.
+        /// </summary>
+        /// <remarks>
+        /// Default is <see cref="System.Web.Services.WebService"/>
+        /// </remarks>
+        public Type WebServiceBaseType
+        {
+            get { return _webServiceBaseType; }
+            set { _webServiceBaseType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the target object that should be exposed as a web service.
+        /// </summary>
+        /// <value>
+        /// The name of the target object that should be exposed as a web service.
+        /// </value>
+        public string TargetName
+        {
+            get { return _targetName; }
+            set { _targetName = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the description of the web service (optional).
+        /// </summary>
+        /// <value>
+        /// The web service description.
+        /// </value>
+        public string Description
+        {
+            get { return _description; }
+            set { _description = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the web service (optional).
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Defaults to the value of the exporter's object ID.
+        /// </p>
+        /// </remarks>
+        /// <value>
+        /// The web service name.
+        /// </value>
+        public string Name
+        {
+            get 
+            {
+                if (_name == null)
+                {
+                    _name = WebUtils.GetPageName(objectName);
+                }
+                return _name;
+            }
+            set { _name = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the web service namespace.
+        /// </summary>
+        /// <value>
+        /// The web service namespace.
+        /// </value>
+        public string Namespace
+        {
+            get { return _namespace; }
+            set { _namespace = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the list of interfaces whose methods should be exposed as web services.
+        /// </summary>
+        /// <remarks>
+        /// If not set, all the interfaces implemented or inherited 
+        /// by the target type will be used.
+        /// </remarks>
+        /// <value>The interfaces.</value>
+        public string[] Interfaces
+        {
+            get { return _interfaces; }
+            set { _interfaces = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a list of custom attributes 
+        /// that should be applied to a proxy class.
+        /// </summary>
+        public IList TypeAttributes
+        {
+            get { return _typeAttributes; }
+            set { _typeAttributes = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a dictionary of custom attributes 
+        /// that should be applied to web service members.
+        /// </summary>
+        /// <remarks>
+        /// Dictionary key is an expression that members can be matched against. 
+        /// Value is a list of attributes that should be applied 
+        /// to each member that matches expression.
+        /// </remarks>
+        public IDictionary MemberAttributes
+        {
+            get { return _memberAttributes; }
+            set { _memberAttributes = value; }
+        }
+
+        #endregion
+
+        #region IObjectFactoryAware Members
+
+        /// <summary>
+        /// Callback that supplies the owning factory to an object instance.
+        /// </summary>
+        /// <value>
+        /// Owning <see cref="Spring.Objects.Factory.IObjectFactory"/>
+        /// (may not be <see langword="null"/>). The object can immediately
+        /// call methods on the factory.
+        /// </value>
+        /// <remarks>
+        /// <p>
+        /// Invoked after population of normal object properties but before an init
+        /// callback like <see cref="Spring.Objects.Factory.IInitializingObject"/>'s
+        /// <see cref="Spring.Objects.Factory.IInitializingObject.AfterPropertiesSet"/>
+        /// method or a custom init-method.
+        /// </p>
+        /// </remarks>
+        /// <exception cref="Spring.Objects.ObjectsException">
+        /// In case of initialization errors.
+        /// </exception>
+        public virtual IObjectFactory ObjectFactory
+        {
+            set { this.objectFactory = value; }
+        }
+
+        #endregion
+
+        #region IFactoryObject Members
+
+        /// <summary>
+        /// Return an instance (possibly shared or independent) of the object
+        /// managed by this factory.
+        /// </summary>
+        /// <remarks>
+        /// <note type="caution">
+        /// If this method is being called in the context of an enclosing IoC container and
+        /// returns <see langword="null"/>, the IoC container will consider this factory
+        /// object as not being fully initialized and throw a corresponding (and most
+        /// probably fatal) exception.
+        /// </note>
+        /// </remarks>
+        /// <returns>
+        /// An instance (possibly shared or independent) of the object managed by
+        /// this factory.
+        /// </returns>
+        public virtual object GetObject()
+        {
+            // no sense to call this method, because the web service type 
+            // will be instantiated by the .NET infrastructure. (ObjectType is used instead)
+            // Users should use GetObject("TargetName") instead.
+            return new InvalidOperationException(
+                "The web service instance is created and managed by the .NET infrastructure.");
+        }
+
+        /// <summary>
+        /// Return the <see cref="System.Type"/> of object that this
+        /// <see cref="Spring.Objects.Factory.IFactoryObject"/> creates, or
+        /// <see langword="null"/> if not known in advance.
+        /// </summary>
+        public virtual Type ObjectType
+        {
+            get { return (proxyType != null ? proxyType : objectFactory.GetType(TargetName)); }
+        }
+
+        /// <summary>
+        /// Is the object managed by this factory a singleton or a prototype?
+        /// </summary>
+        public virtual bool IsSingleton
+        {
+            get { return false; }
+        }
+
+        #endregion
+
+        #region IObjectNameAware Members
+
+        /// <summary>
+        /// Set the name of the object in the object factory that created this object.
+        /// </summary>
+        /// <value>
+        /// The name of the object in the factory.
+        /// </value>
+        /// <remarks>
+        /// <p>
+        /// Invoked after population of normal object properties but before an init
+        /// callback like <see cref="IInitializingObject.AfterPropertiesSet"/>'s
+        /// <see cref="IInitializingObject"/>
+        /// method or a custom init-method.
+        /// </p>
+        /// </remarks>
+        public string ObjectName
+        {
+            set { this.objectName = value; }
+        }
+
+        #endregion
+
+        #region IInitializingObject Members
+
+        /// <summary>
+        /// Exports specified object as a web service.
+        /// </summary>
+        /// <exception cref="System.Exception">
+        /// In the event of misconfiguration (such as failure to set an essential
+        /// property) or if initialization fails.
+        /// </exception>
+        public virtual void AfterPropertiesSet()
+        {
+            ValidateConfiguration();
+            GenerateProxy();            
+        }
+
+        #endregion
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Validates the configuration.
+        /// </summary>
+        protected virtual void ValidateConfiguration()
+        {
+            if (TargetName == null)
+            {
+                throw new ArgumentException("The TargetName property is required.");
+            }
+        }
+
+        /// <summary>
+        /// Generates the web service wrapper type.
+        /// </summary>
+        protected virtual void GenerateProxy()
+        {
+            IProxyTypeBuilder builder = new WebServiceProxyTypeBuilder(TargetName, Description, Name, Namespace);
+            builder.Name = WebUtils.GetPageName(objectName);
+            builder.BaseType = WebServiceBaseType;
+            builder.TargetType = objectFactory.GetType(TargetName);
+            if (Interfaces != null && Interfaces.Length > 0)
+            {
+                builder.Interfaces = TypeResolutionUtils.ResolveInterfaceArray(Interfaces);
+            }
+            builder.TypeAttributes = TypeAttributes;
+            builder.MemberAttributes = MemberAttributes;
+
+            proxyType = builder.BuildProxyType();
+        }
+
+        #endregion
+
+        #region WebServiceProxyTypeBuilder inner class implementation
+
+        private sealed class WebServiceProxyTypeBuilder : CompositionProxyTypeBuilder
+        {
+            #region Fields
+
+            private static readonly MethodInfo GetObject = 
+                typeof(IObjectFactory).GetMethod("GetObject", new Type[] {typeof(string)});
+
+            private static readonly MethodInfo GetApplicationContext =
+                typeof(WebApplicationContext).GetProperty("Current", BindingFlags.Public | BindingFlags.Static, null, typeof(IApplicationContext), Type.EmptyTypes, null).GetGetMethod();
+
+            private string targetName;
+            private CustomAttributeBuilder webServiceAttribute;
+
+            #endregion
+
+            #region Constructor(s) / Destructor
+
+            public WebServiceProxyTypeBuilder(
+                string targetName, string description, string name, string ns)
+            {
+                this.targetName = targetName;
+
+                // Creates a WebServiceAttribute from configuration info
+                this.webServiceAttribute = CreateWebServiceAttribute(description, name, ns);
+            }
+
+            private static CustomAttributeBuilder CreateWebServiceAttribute(string description, string name, string ns)
+            {
+                ReflectionUtils.CustomAttributeBuilderBuilder cabb = 
+                    new ReflectionUtils.CustomAttributeBuilderBuilder(typeof(WebServiceAttribute));
+                if (StringUtils.HasText(description))
+                {
+                    cabb.AddPropertyValue("Description", description);
+                }
+                if (StringUtils.HasText(name))
+                {
+                    cabb.AddPropertyValue("Name", name);
+                }
+                if (StringUtils.HasText(ns))
+                {
+                    cabb.AddPropertyValue("Namespace", ns);
+                }
+                return cabb.Build();
+            }
+
+            #endregion
+
+            #region Protected Methods
+
+            /// <summary>
+            /// Implements constructors for the proxy class.
+            /// </summary>
+            /// <remarks>
+            /// This implementation generates a constructor 
+            /// that gets instance of the target object using 
+            /// <see cref="Spring.Objects.Factory.IObjectFactory.GetObject(string)"/>.
+            /// </remarks>
+            /// <param name="builder">
+            /// The <see cref="System.Type"/> builder to use.
+            /// </param>
+            protected override void ImplementConstructors(TypeBuilder builder)
+            {
+                MethodAttributes attributes = MethodAttributes.Public |
+					MethodAttributes.HideBySig | MethodAttributes.SpecialName |
+					MethodAttributes.RTSpecialName;
+
+                ConstructorBuilder cb = builder.DefineConstructor(
+                    attributes, CallingConventions.Standard, Type.EmptyTypes);
+
+                ILGenerator il = cb.GetILGenerator();
+
+                il.Emit(OpCodes.Ldarg_0);
+                il.EmitCall(OpCodes.Call, GetApplicationContext, null);
+                il.Emit(OpCodes.Ldstr, targetName);
+                il.EmitCall(OpCodes.Callvirt, GetObject, null);
+                il.Emit(OpCodes.Stfld, targetInstance);
+
+
+                il.Emit(OpCodes.Ret);
+            }
+
+            protected override IList GetTypeAttributes(Type type)
+            {
+                IList attrs = base.GetTypeAttributes(type);
+
+                for (int i = 0; i < attrs.Count; i++)
+                {
+                    if (IsAttributeMatchingType(attrs[i], typeof(WebServiceAttribute)))
+                    {
+                        // override existing WebServiceAttribute
+                        attrs[i] = webServiceAttribute;
+
+                        return attrs;
+                    }
+                }
+
+                // add missing WebServiceAttribute
+                attrs.Add(webServiceAttribute);
+
+                return attrs;
+            }
+
+            protected override IList GetMethodAttributes(MethodInfo method)
+            {
+                IList attrs = base.GetMethodAttributes(method);
+
+                bool containsWebMethodAttribute = false;
+                foreach (object attr in attrs)
+                {
+                    if (IsAttributeMatchingType(attr, typeof(WebMethodAttribute)))
+                    {
+                        containsWebMethodAttribute = true;
+                        break;
+                    }
+                }
+
+                // Creates default WebMethodAttribute if not set yet
+                if (!containsWebMethodAttribute)
+                {
+                    attrs.Add(ReflectionUtils.CreateCustomAttribute(typeof(WebMethodAttribute)));
+                }
+
+                return attrs;
+            }
+
+            protected override TypeBuilder CreateTypeBuilder(string name, Type baseType)
+            {
+                return DynamicProxyManager.CreateTypeBuilder(name, baseType);
+            }
+
+            #endregion
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs b/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs
new file mode 100644
index 00000000..f25c41ee
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs
@@ -0,0 +1,108 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.UI;
+using System.Web.Services;
+
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Util;
+using Spring.Web.Support;
+
+#endregion
+
+namespace Spring.Web.Services
+{
+    /// <summary>
+    /// An <see cref="System.Web.IHttpHandlerFactory"/> implementation that
+    /// retrieves configured <c>WebService</c> objects from the Spring.NET web
+    /// application context.
+    /// </summary>
+    /// <remarks>
+    /// This handler factory uses web service name from the URL, without the extension,
+    /// to find web service object in the Spring context.
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: WebServiceHandlerFactory.cs,v 1.12 2008/03/19 18:05:08 oakinger Exp $</version>
+    [PermissionSet(SecurityAction.InheritanceDemand, Unrestricted=true)]
+    public class WebServiceHandlerFactory : System.Web.Services.Protocols.WebServiceHandlerFactory, IHttpHandlerFactory
+    {
+        private static readonly MethodInfo CoreGetHandler =
+            typeof(System.Web.Services.Protocols.WebServiceHandlerFactory).GetMethod("CoreGetHandler", BindingFlags.NonPublic | BindingFlags.Instance, null,
+                                                                                     new Type[] {typeof(Type), typeof(HttpContext), typeof(HttpRequest), typeof(HttpResponse)}, null);
+
+        /// <summary>
+        /// Retrieves instance of the page from Spring web application context.
+        /// </summary>
+        /// <param name="context">current HttpContext</param>
+        /// <param name="requestType">type of HTTP request (GET, POST, etc.)</param>
+        /// <param name="url">requested page URL</param>
+        /// <param name="path">translated server path for the page</param>
+        /// <returns>instance of the configured page object</returns>
+        IHttpHandler IHttpHandlerFactory.GetHandler(HttpContext context, string requestType, string url, string path)
+        {
+            new AspNetHostingPermission(AspNetHostingPermissionLevel.Minimal).Demand();
+
+            IConfigurableApplicationContext appContext =
+                WebApplicationContext.GetContext(url) as IConfigurableApplicationContext;
+            
+            if (appContext == null)
+            {
+                throw new InvalidOperationException(
+                    "Implementations of IApplicationContext must also implement IConfigurableApplicationContext");
+            }
+
+            string appRelativeVirtualPath = WebUtils.GetAppRelativePath(url);
+
+            AbstractHandlerFactory.NamedObjectDefinition nod =
+                AbstractHandlerFactory.FindWebObjectDefinition(appRelativeVirtualPath, appContext.ObjectFactory);
+
+            Type serviceType = null;
+            if (nod != null)
+            {
+                serviceType = appContext.GetType(nod.Name);
+
+                // check if the type defines a Web Service
+                object[] wsAttribute = serviceType.GetCustomAttributes(typeof(WebServiceAttribute), true);
+                if (wsAttribute.Length == 0)
+                {
+                    serviceType = null;
+                }                
+            }
+
+            if (serviceType == null)
+            {
+#if NET_2_0
+                serviceType = WebServiceParser.GetCompiledType(url, context);
+#else
+                serviceType = WebServiceParser.GetCompiledType(path, context);
+#endif
+            }
+
+            return (IHttpHandler) CoreGetHandler.Invoke(this, new object[] {serviceType, context, context.Request, context.Response});
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs b/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs
new file mode 100644
index 00000000..4be9f3c6
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs
@@ -0,0 +1,183 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.IO;
+using System.Web;
+using Common.Logging;
+using Spring.Objects.Factory.Config;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// Provides base functionality for Spring.NET context-aware
+    /// <see cref="System.Web.IHttpHandlerFactory"/> implementations.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Provides derived classes with a default implementation of
+    /// <see cref="IHttpHandlerFactory.ReleaseHandler(IHttpHandler)"/> method.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AbstractHandlerFactory.cs,v 1.5 2008/03/19 18:05:08 oakinger Exp $</version>
+    public abstract class AbstractHandlerFactory : IHttpHandlerFactory
+    {
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Web.Support.AbstractHandlerFactory"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is an abstract class and as such provides no public constructors.
+        /// </p>
+        /// </remarks>
+        protected AbstractHandlerFactory()
+        {}
+
+        /// <summary>
+        /// Returns an appropriate <see cref="System.Web.IHttpHandler"/> implementation.
+        /// </summary>
+        /// <param name="context">
+        /// An instance of the <see cref="System.Web.HttpContext"/> class that
+        /// provides references to intrinsic server objects.
+        /// </param>
+        /// <param name="requestType">
+        /// The HTTP method of the request.
+        /// </param>
+        /// <param name="url">The request URL.</param>
+        /// <param name="pathTranslated">
+        /// The physical path of the requested resource.
+        /// </param>
+        /// <returns>
+        /// A new <see cref="System.Web.IHttpHandler"/> object that processes
+        /// the request.
+        /// </returns>
+        public abstract IHttpHandler GetHandler(
+            HttpContext context, string requestType, string url, string pathTranslated);
+
+        /// <summary>
+        /// Enables a factory to release an existing
+        /// <see cref="System.Web.IHttpHandler"/> instance.
+        /// </summary>
+        /// <param name="handler">
+        /// The <see cref="System.Web.IHttpHandler"/> object to release.
+        /// </param>
+        public virtual void ReleaseHandler(IHttpHandler handler)
+        {}
+
+        /// <summary>
+        /// DO NOT USE - this is subject to change!
+        /// </summary>
+        /// <param name="appRelativeVirtualPath"></param>
+        /// <param name="objectFactory"></param>
+        /// <returns>
+        /// This method requires registrars to follow the convention of registering web object definitions using their
+        /// application relative urls (~/mypath/mypage.aspx). 
+        /// </returns>
+        /// <remarks>
+        /// Resolve an object definition by url.
+        /// </remarks>
+        protected internal static NamedObjectDefinition FindWebObjectDefinition(string appRelativeVirtualPath, IConfigurableListableObjectFactory objectFactory)
+        {
+            ILog Log = LogManager.GetLogger(typeof(AbstractHandlerFactory));
+            bool isDebug = Log.IsDebugEnabled;
+
+            // lookup definition using app-relative url
+            if (isDebug) Log.Debug(string.Format("GetHandler():looking up definition for app-relative url '{0}'", appRelativeVirtualPath));
+            string objectDefinitionName = appRelativeVirtualPath;
+            IObjectDefinition pageDefinition = objectFactory.GetObjectDefinition(appRelativeVirtualPath, true);
+
+            if (pageDefinition == null)
+            {
+                // try using pagename+extension and pagename only
+                string pageExtension = Path.GetExtension(appRelativeVirtualPath);
+                string pageName = WebUtils.GetPageName(appRelativeVirtualPath);
+                // only looks in the specified object factory -- it will *not* search parent contexts
+                pageDefinition = objectFactory.GetObjectDefinition(pageName + pageExtension, false);
+                if (pageDefinition == null)
+                {
+                    pageDefinition = objectFactory.GetObjectDefinition(pageName, false);
+                    if (pageDefinition != null) objectDefinitionName = pageName;
+                }
+                else
+                {
+                    objectDefinitionName = pageName + pageExtension;
+                }
+
+                if (pageDefinition != null)
+                {
+                    if (isDebug)
+                        Log.Debug(string.Format("GetHandler():found definition for page-name '{0}'", objectDefinitionName));
+                }
+                else
+                {
+                    if (isDebug)
+                        Log.Debug(string.Format("GetHandler():no definition found for page-name '{0}'", pageName));
+                }
+            }
+            else
+            {
+                if (isDebug) Log.Debug(string.Format("GetHandler():found definition for page-url '{0}'", appRelativeVirtualPath));
+            }
+
+            return (pageDefinition == null) ? (NamedObjectDefinition)null : new NamedObjectDefinition(objectDefinitionName, pageDefinition);
+        }
+
+        /// <summary>
+        /// DO NOT USE - this is subject to change!
+        /// </summary>
+        protected internal class NamedObjectDefinition
+        {
+            private readonly string _name;
+            private readonly IObjectDefinition _objectDefinition;
+
+            /// <summary>
+            /// DO NOT USE
+            /// </summary>
+            public NamedObjectDefinition(string name, IObjectDefinition objectDefinition)
+            {
+                _name = name;
+                _objectDefinition = objectDefinition;
+            }
+
+            /// <summary>
+            /// DO NOT USE
+            /// </summary>
+            public string Name
+            {
+                get { return _name; }
+            }
+
+            /// <summary>
+            /// DO NOT USE
+            /// </summary>
+            public IObjectDefinition ObjectDefinition
+            {
+                get { return _objectDefinition; }
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/AbstractProcessHandler.cs b/src/Spring/Spring.Web/Web/Support/AbstractProcessHandler.cs
new file mode 100644
index 00000000..cc2060e0
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/AbstractProcessHandler.cs
@@ -0,0 +1,289 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Web;
+using System.Web.SessionState;
+using Spring.Context;
+using Spring.Util;
+using Spring.Web.Process;
+using Spring.Web.Support;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// An abstract base class that defines common behavior for different process implementations.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AbstractProcessHandler.cs,v 1.1 2007/08/03 08:31:25 oakinger Exp $</version>
+    public abstract class AbstractProcessHandler : IProcess, ISharedStateAware, IApplicationContextAware, IHttpHandler, IRequiresSessionState
+    {
+        /// <summary>
+        /// Parameter name that is used for process ID.
+        /// </summary>
+        protected internal const string ProcessIdParamName = "pid";
+
+        #region Fields
+
+        private string id = Guid.NewGuid().ToString("N");
+        private IProcess parent;
+        private object controller;
+        private string defaultView;
+        private string currentView;
+        private IDictionary views = CollectionsUtil.CreateCaseInsensitiveHashtable();
+        private IDictionary sharedState;
+        private IApplicationContext applicationContext;
+        private string processUrl;
+        private bool viewChanged;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates instance of the process and registers it with the <see cref="Spring.Web.Process.ProcessManager"/>.
+        /// </summary>
+        public AbstractProcessHandler()
+        {
+            ProcessManager.RegisterProcess(this);
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Unique ID of this component instance.
+        /// </summary>
+        public string Id
+        {
+            get { return this.id; }
+        }
+
+        /// <summary>
+        /// Gets or sets the parent process.
+        /// </summary>
+        internal IProcess Parent
+        {
+            get { return this.parent; }
+            set { this.parent = value; }
+        }
+
+        /// <summary>
+        /// Returns a thread-safe dictionary that contains state that is shared by 
+        /// all views of this component.
+        /// </summary>
+        public IDictionary SharedState
+        {
+            get { return this.sharedState; }
+            set { this.sharedState = value; }
+        }
+
+        /// <summary>
+        /// Controller for the component.
+        /// </summary>
+        /// <remarks>
+        /// Process controller will be shared by all the views 
+        /// that belong to this component.
+        /// </remarks>
+        public object Controller
+        {
+            get { return this.controller; }
+            set { this.controller = value; }
+        }
+
+        /// <summary>
+        /// Default view for the component.
+        /// </summary>
+        public string DefaultView
+        {
+            get { return this.defaultView; }
+            set { this.defaultView = value; }
+        }
+
+        /// <summary>
+        /// Gets the name of the current view.
+        /// </summary>
+        public string CurrentView
+        {
+            get
+            {
+                if (this.currentView == null)
+                {
+                    this.CurrentView = this.defaultView;
+                }
+                return this.currentView;
+            }
+            set
+            {
+                string oldView = this.currentView;
+                if (this.views.Contains(value))
+                {
+                    this.currentView = (string) this.views[value];
+                }
+                else
+                {
+                    this.currentView = value;
+                }
+                this.viewChanged = (oldView != this.currentView);
+            }
+        }
+
+        /// <summary>
+        /// Gets the the flag that indicates if selected view 
+        /// has changed during the current request.
+        /// </summary>
+        public bool ViewChanged
+        {
+            get { return this.viewChanged; }
+        }
+
+        /// <summary>
+        /// Gets a map of process views.
+        /// </summary>
+        public IDictionary Views
+        {
+            get { return this.views; }
+        }
+
+        /// <summary>
+        /// Gets the process URL.
+        /// </summary>
+        protected string ProcessUrl
+        {
+            get { return this.processUrl; }
+        }
+
+        #endregion
+
+        #region Public methods
+
+        /// <summary>
+        /// Starts the process.
+        /// </summary>
+        /// <param name="url">Process URL.</param>
+        public void Start(string url)
+        {
+            this.processUrl = url;
+            this.NavigateToStartView();
+        }
+
+        /// <summary>
+        /// Resolves and sets the view for the specified view name.
+        /// </summary>
+        /// <param name="viewName">Name of the view to go to.</param>
+        public virtual void SetView(string viewName)
+        {
+            this.CurrentView = viewName;
+            this.NavigateToCurrentView();
+        }
+
+        /// <summary>
+        /// Ends the process by unregistering it from the <see cref="ProcessManager"/>. 
+        /// </summary>
+        public virtual void End()
+        {
+            ProcessManager.UnregisterProcess(this.id);
+            if (this.parent != null)
+            {
+                this.parent.SetView(this.parent.CurrentView);
+            }
+        }
+
+        #endregion
+
+        #region Abstract methods
+
+        /// <summary>
+        /// Method that needs to be implemented by specific process implementations
+        /// in order to navigate to the first view in the process.
+        /// </summary>
+        protected abstract void NavigateToStartView();
+
+        /// <summary>
+        /// Method that needs to be implemented by specific process implementations
+        /// in order to navigate to the current view.
+        /// </summary>
+        protected abstract void NavigateToCurrentView();
+
+        #endregion
+
+        #region IHttpHandler implementation
+
+        /// <summary>
+        /// Processes the request by delegating to appropriate view, which could be
+        /// another process.
+        /// </summary>
+        /// <param name="context"></param>
+        void IHttpHandler.ProcessRequest(HttpContext context)
+        {
+            IHttpHandler handler = (IHttpHandler) this.applicationContext.GetObject(WebUtils.GetPageName(this.CurrentView));
+            this.viewChanged = false;
+
+            if (handler is AbstractProcessHandler)
+            {
+                ((AbstractProcessHandler) handler).Parent = this;
+                // TODO: start child process
+            }
+
+            if (handler is IProcessAware)
+            {
+                ((IProcessAware) handler).Process = this;
+            }
+            if (handler is ISharedStateAware)
+            {
+                ((ISharedStateAware) handler).SharedState = this.sharedState;
+            }
+
+            context.Handler = handler;
+            handler.ProcessRequest(context);
+        }
+
+        /// <summary>
+        /// Returns true because this wrapper handler can be reused.
+        /// Actual page is instantiated at the beginning of the ProcessRequest method.
+        /// </summary>
+        bool IHttpHandler.IsReusable
+        {
+            get { return false; }
+        }
+
+        #endregion
+
+        #region IApplicationContextAware implementation
+
+        /// <summary>
+        /// Gets or sets the application context.
+        /// </summary>
+        public IApplicationContext ApplicationContext
+        {
+            get { return this.applicationContext; }
+            set { this.applicationContext = value; }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/ContextMonitor.cs b/src/Spring/Spring.Web/Web/Support/ContextMonitor.cs
new file mode 100644
index 00000000..66d69310
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/ContextMonitor.cs
@@ -0,0 +1,140 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.IO;
+using System.Web;
+
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// <see cref="IHttpHandler"/> implementation that allows users to monitor state 
+    /// of the Spring.NET web application context.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// 
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ContextMonitor.cs,v 1.3 2007/07/29 19:39:48 markpollack Exp $</version>
+    public class ContextMonitor : IHttpHandler
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContextMonitor"/> class.
+        /// </summary>
+        public ContextMonitor()
+        {}
+
+        /// <summary>
+        /// Processes HTTP request.
+        /// </summary>
+        /// <param name="context">An <see cref="T:System.Web.HttpContext"/> object that provides references to the intrinsic server objects (for example, <see langword="Request"/>, <see langword="Response"/>, <see langword="Session"/>, and <see langword="Server"/>)<see langword=""/> used to service HTTP requests.</param>
+        public void ProcessRequest(HttpContext context)
+        {
+            HttpResponse res = context.Response;
+            res.BufferOutput = true;
+
+            RenderHeader(res.Output, context.Request.ApplicationPath);
+
+
+            IConfigurableApplicationContext appContext =
+                WebApplicationContext.Current as IConfigurableApplicationContext;
+            if (appContext == null)
+            {
+                throw new InvalidOperationException(
+                    "Implementations of IApplicationContext must also implement IConfigurableApplicationContext");
+            }
+
+            string[] names = appContext.GetObjectDefinitionNames();
+            foreach (string name in names)
+            {
+                RenderObjectDefinition(res.Output, name, appContext.ObjectFactory.GetObjectDefinition(name));
+            }
+
+            RenderFooter(res.Output);
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether another request can use
+        /// this <see cref="T:System.Web.IHttpHandler"/> instance.
+        /// </summary>
+        /// <value><c>True</c> if this handler is reusable, <c>False</c> otherwise.</value>
+        public bool IsReusable
+        {
+            get { return true; }
+        }
+
+        private void RenderHeader(TextWriter tw, string contextName)
+        {
+            tw.WriteLine("<html>");
+            tw.WriteLine("  <head>");
+            tw.WriteLine("    <title>Spring.NET Context Monitor - " + contextName + "</title>");
+            tw.WriteLine("  </head>");
+            tw.WriteLine("  <body>");
+            tw.WriteLine("    <table border='1' cellspacing='0' cellpadding='2'>");
+            tw.WriteLine("      <tr>");
+            RenderHeaderCell(tw, "Name");
+            RenderHeaderCell(tw, "Type");
+            RenderHeaderCell(tw, "Is Abstract");
+            RenderHeaderCell(tw, "Is Singleton");
+            RenderHeaderCell(tw, "Is Lazy Init");
+            RenderHeaderCell(tw, "Scope");
+            RenderHeaderCell(tw, "Page Name");
+            tw.WriteLine("  </tr>");
+
+        }
+
+        private void RenderHeaderCell(TextWriter tw, string text)
+        {
+            tw.WriteLine("        <th>" + text + "</th>");
+        }
+
+        private void RenderObjectDefinition(TextWriter tw, string name, IObjectDefinition def)
+        {
+            tw.WriteLine("      <tr>");
+            RenderCell(tw, name);
+            RenderCell(tw, def.ObjectTypeName);
+            RenderCell(tw, def.IsAbstract);
+            RenderCell(tw, def.IsSingleton);
+            RenderCell(tw, def.IsLazyInit);
+            RenderCell(tw, (def is IWebObjectDefinition ? ((IWebObjectDefinition) def).Scope.ToString() : "&nbsp;"));
+            RenderCell(tw, (def is IWebObjectDefinition && ((IWebObjectDefinition) def).IsPage ? ((IWebObjectDefinition) def).PageName : "&nbsp;"));
+            tw.WriteLine("  </tr>");
+        }
+
+        private void RenderCell(TextWriter tw, object value)
+        {
+            tw.WriteLine("        <td>" + (value == null ? "&nbsp;" : value.ToString()) + "</td>");
+        }
+
+        private void RenderFooter(TextWriter tw)
+        {
+            tw.WriteLine("    </table>");
+            tw.WriteLine("  </body>");
+            tw.WriteLine("</html>");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs b/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs
new file mode 100644
index 00000000..ea0d0419
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs
@@ -0,0 +1,134 @@
+#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
+
+#region Imports
+
+using System.Collections;
+using System.Web.UI;
+using Spring.Context;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// Support Class providing a method to ensure a control has been intercepted
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ControlInterceptor.cs,v 1.2 2008/05/13 14:22:47 oakinger Exp $</version>
+    internal sealed class ControlInterceptor
+    {				
+        /// <summary>
+        /// Holds all available interception strategies
+        /// </summary>
+        private static readonly IInterceptionStrategy[] s_availableInterceptionStrategies = new IInterceptionStrategy[]
+            {
+                new InterceptControlCollectionStrategy()
+                , new InterceptControlCollectionOwnerStrategy()
+            };
+		
+        /// <summary>
+        /// Holds a control.GetType()->IInterceptionStrategy table.
+        /// </summary>
+        private static readonly Hashtable s_cachedInterceptionStrategies = new Hashtable();
+		
+        private ControlInterceptor()
+        {
+        }
+
+        /// <summary>
+        /// Ensures, a control has been intercepted to support Web-DI. If not, the control will be intercepted.
+        /// </summary>
+        public static void EnsureControlIntercepted(IApplicationContext defaultApplicationContext, Control control)
+        {
+            if (control is LiteralControl)
+            {
+                return; // nothing more to do
+            }
+
+            // check control itself
+            if (IsDependencyInjectionAware(defaultApplicationContext, control))
+            {
+                return; // nothing more to do
+            }
+
+            // check control's ControlCollection
+            EnsureControlCollectionIntercepted(defaultApplicationContext, control);
+        }
+
+        private static void EnsureControlCollectionIntercepted(IApplicationContext defaultApplicationContext, Control control)
+        {
+            // check the collection
+            ControlAccessor ctlAccessor = new ControlAccessor(control);
+            ControlCollection childControls = ctlAccessor.Controls;
+            if (IsDependencyInjectionAware(defaultApplicationContext, childControls))
+            {
+                return; // nothing more to do				
+            }
+
+            // check, if the collection's owner has already been intercepted
+            ControlCollectionAccessor ctlColAccessor = new ControlCollectionAccessor(childControls);
+            if (IsDependencyInjectionAware(defaultApplicationContext, ctlColAccessor.Owner))
+            {
+                return; // nothing more to do				
+            }
+
+            // lookup strategy in cache
+            IInterceptionStrategy strategy = null;
+            lock(s_cachedInterceptionStrategies)
+            {
+                strategy = (IInterceptionStrategy) s_cachedInterceptionStrategies[control.GetType()];
+            }
+			
+            if (strategy != null)
+            {
+                strategy.Intercept(defaultApplicationContext, ctlAccessor, ctlColAccessor);
+            }
+            else
+            {
+                // probe for a strategy
+                for(int i=0;i<s_availableInterceptionStrategies.Length;i++)
+                {
+                    bool bOk = s_availableInterceptionStrategies[i].Intercept(defaultApplicationContext, ctlAccessor, ctlColAccessor);
+                    if (bOk) break;
+                }
+
+                lock(s_cachedInterceptionStrategies)
+                {					
+                    s_cachedInterceptionStrategies[control.GetType()] = strategy;
+                }
+            }			
+        }
+
+        private static bool IsDependencyInjectionAware(IApplicationContext defaultApplicationContext, object o)
+        {
+            ISupportsWebDependencyInjection diAware = o as ISupportsWebDependencyInjection;
+            if (diAware != null)
+            {
+                // If the ControlCollection is alread DI-aware ensure appContext is set
+                if (diAware.DefaultApplicationContext == null)
+                {
+                    diAware.DefaultApplicationContext = defaultApplicationContext;
+                }
+                return true; // nothing more to do				
+            }
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/IInterceptionStrategy.cs b/src/Spring/Spring.Web/Web/Support/IInterceptionStrategy.cs
new file mode 100644
index 00000000..611ab12d
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/IInterceptionStrategy.cs
@@ -0,0 +1,45 @@
+#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
+
+#region Imports
+
+using Spring.Context;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// Any concrete interception strategy must implement this interface
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: IInterceptionStrategy.cs,v 1.1 2007/08/01 23:11:00 markpollack Exp $</version>
+    internal interface IInterceptionStrategy
+    {
+        /// <summary>
+        /// Any implementation must never throw an exception from this method. 
+        /// Instead <c>false</c> must be returned to indicate interception failure.
+        /// </summary>
+        /// <returns>
+        /// <c>true</c>, if interception succeeded. <c>false</c> otherwise.
+        /// </returns>
+        bool Intercept(IApplicationContext defaultApplicationContext,
+                       ControlAccessor ctlAccessor, ControlCollectionAccessor ctlColAccessor);		
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/ISharedStateAware.cs b/src/Spring/Spring.Web/Web/Support/ISharedStateAware.cs
new file mode 100644
index 00000000..adf0c638
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/ISharedStateAware.cs
@@ -0,0 +1,58 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+using System.Web;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// This interface should be implemented by <see cref="IHttpHandler"/>s that want to 
+    /// have access to the shared state for the handler.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Shared state is very useful if you have data that needs to be shared by all instances
+    /// of the same page (or other <see cref="IHttpHandler"/>). 
+    /// </p>
+    /// <p>
+    /// For example, <see cref="Spring.Web.UI.Page"/> class implements this interface, which allows  
+    /// each page derived from it to cache localizalization resources and parsed data binding 
+    /// expressions only once and then reuse the cached values, regardless of how many instances 
+    /// of the page are created.
+    /// </p>
+    /// </remarks>
+    public interface ISharedStateAware
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="IDictionary"/> that should be used
+        /// to store shared state for the <see cref="IHttpHandler"/>.
+        /// </summary>
+        /// <value>
+        /// The <see cref="IDictionary"/> that should be used
+        /// to store shared state for the <see cref="IHttpHandler"/>.
+        /// </value>
+        IDictionary SharedState { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/ISupportsWebDependencyInjection.cs b/src/Spring/Spring.Web/Web/Support/ISupportsWebDependencyInjection.cs
new file mode 100644
index 00000000..ec884cf8
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/ISupportsWebDependencyInjection.cs
@@ -0,0 +1,100 @@
+#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
+
+#region Imports
+
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+	/// <summary>
+	/// "Contract"-interface of the Web-DI infrastructure.
+	/// </summary>
+	/// <remarks>
+	/// This interface supports Spring's DI infrastructure and normally doesn't need to be implemented<br/>
+	/// <br/>
+	/// Any Page, Control or ControlCollection implementing this interface guarantees to 
+	/// call <see cref="WebDependencyInjectionUtils.InjectDependenciesRecursive"/> on any control being added 
+	/// before it is actually added to the child-collection.
+	/// </remarks>
+	/// <example>
+	/// <p>The following example shows, how to make a Control support the DI-infrastructure:</p>
+	/// <code language="c#">
+	/// class MyControl : Control, ISupportsWebDependencyInjection
+	/// {
+	///		private IApplicationContext _defaultApplicationContext;
+	/// 
+	///		public IApplicationContext DefaultApplicationContext
+	///		{
+	///			get { return _defaultApplicationContext; }
+	///			set { _defaultApplicationContext = value; }
+	///		}
+	/// 
+	///		override protected AddedControl( Control control, int index )
+	///		{
+	///			WebUtils.InjectDependenciesRecursive( _defaultApplicationContext, control );
+	///			base.AddedControl( control, index );
+	///		}
+	/// }
+	/// </code>
+	/// </example>
+	/// <example>
+	/// <p>The following example shows, how to make a ControlCollection support the DI-infrastructure:</p>
+	/// <p>Note, that you MUST implement the single-argument constructor <c>ControlCollection( Control owner )</c>!</p>
+	/// <code language="c#">
+	/// class MyControlCollection : ControlCollection, ISupportsWebDependencyInjection
+	/// {
+	///		private IApplicationContext _defaultApplicationContext;
+	/// 
+	///		public MyControlCollection( Control owner ) : base( owner )
+	///		{}
+	/// 
+	///		public IApplicationContext DefaultApplicationContext
+	///		{
+	///			get { return _defaultApplicationContext; }
+	///			set { _defaultApplicationContext = value; }
+	///		}
+	/// 
+	///		override public Add( Control child )
+	///		{
+	///			WebUtils.InjectDependenciesRecursive( _defaultApplicationContext, child );
+	///			base.Add( child );
+	///		}
+	/// 
+	///		override public AddAt( int index, Control child )
+	///		{
+	///			WebUtils.InjectDependenciesRecursive( _defaultApplicationContext, child );
+	///			base.AddAt( index, child );
+	///		}
+	/// }
+	/// </code>
+	/// </example>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: ISupportsWebDependencyInjection.cs,v 1.2 2007/08/01 23:11:00 markpollack Exp $</version>
+	public interface ISupportsWebDependencyInjection
+	{
+		/// <summary>
+		/// Holds the default <see cref="IApplicationContext"/> instance to be used during injecting a control-tree.
+		/// </summary>
+		IApplicationContext DefaultApplicationContext { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionOwnerStrategy.cs b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionOwnerStrategy.cs
new file mode 100644
index 00000000..ab1a4e6a
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionOwnerStrategy.cs
@@ -0,0 +1,42 @@
+#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
+
+#region Imports
+
+using Spring.Context;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// This strategy replaces the original collection's owner with an intercepting proxy
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: InterceptControlCollectionOwnerStrategy.cs,v 1.1 2007/08/01 23:11:01 markpollack Exp $</version>
+    internal class InterceptControlCollectionOwnerStrategy : IInterceptionStrategy
+    {
+        public bool Intercept(IApplicationContext defaultApplicationContext, ControlAccessor ctlAccessor,
+                              ControlCollectionAccessor ctlColAccessor)
+        {
+            ctlColAccessor.Owner = new SupportsWebDependencyInjectionOwnerProxy(defaultApplicationContext, ctlAccessor.GetTarget() );
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs
new file mode 100644
index 00000000..cc4533b6
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs
@@ -0,0 +1,220 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Web.UI;
+using Spring.Context;
+using Spring.Proxy;
+using Spring.Util;
+using Spring.Web.Support;
+
+#if NET_2_0
+using System.Collections.Generic;
+#else
+using Spring.Reflection.Dynamic;
+#endif
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// This strategy enhances a ControlCollection's type by 
+    /// dynamically implementing ISupportsWebDependencyInjection on this type
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: InterceptControlCollectionStrategy.cs,v 1.2 2008/05/13 14:22:47 oakinger Exp $</version>
+    internal class InterceptControlCollectionStrategy : IInterceptionStrategy
+    {
+        /// <summary>
+        /// Holds a reference to the static(!) callback-method to be used during generation of intercepted ControlCollection-Types
+        /// </summary>
+        private delegate void InjectDependenciesCallbackHandler(IApplicationContext defaultApplicationContext, Control control);
+
+        /// <summary>
+        /// The list of methods to be intercepted for a ControlCollection
+        /// </summary>
+        private static readonly MethodInfo[] s_collectionMethods = new MethodInfo[]
+            {
+                typeof(ControlCollection).GetMethod("Add", BindingFlags.Instance | BindingFlags.Public)
+                , typeof (ControlCollection).GetMethod("AddAt", BindingFlags.Instance | BindingFlags.Public)
+            };
+
+        /// <summary>
+        /// Holds a table of already known intercepted ControlCollection types
+        /// </summary>
+        private static readonly Hashtable s_interceptedCollectionTypeCache = new Hashtable();
+
+        /// <summary>
+        /// Intercepts the given <see cref="ControlCollection"/> by dynamically deriving 
+        /// the original type and let it implement <see cref="ISupportsWebDependencyInjection"/>.
+        /// </summary>
+        /// <param name="defaultApplicationContext">the ApplicationContext to be set on the collection instance.</param>
+        /// <param name="ctlAccessor">a wrapper around the owner control instance.</param>
+        /// <param name="ctlColAccessor">a wrapper around the collection instance.</param>
+        /// <returns><value>true</value>, if interception was successful.  <value>false</value> otherwise</returns>
+        public bool Intercept(IApplicationContext defaultApplicationContext,
+            ControlAccessor ctlAccessor, ControlCollectionAccessor ctlColAccessor)
+        {
+            Type collectionType = ctlColAccessor.GetTargetType();
+            if (collectionType.IsSealed ||
+                !ReflectionUtils.IsTypeVisible(collectionType, DynamicProxyManager.ASSEMBLY_NAME))
+            //  || (null == collectionType.GetConstructor(new Type[] {typeof (Control)}))
+            {
+                return false;
+            }
+
+            // this will enhance the collection's type and create a new instance of this type with fields copied from original collection
+            try
+            {
+                ControlCollection childControls = InterceptCollection(ctlAccessor.GetTarget(), ctlColAccessor.GetTarget() );
+                ((ISupportsWebDependencyInjection)childControls).DefaultApplicationContext = defaultApplicationContext;
+                ctlAccessor.Controls = childControls;
+            }
+            catch
+            {
+                // this may happen, if the ControlCollection doesn't contain a standard-ctor ControlCollection( Control owner)
+                return false;
+            }
+            return true;
+        }
+
+        private static ControlCollection InterceptCollection(Control owner, ControlCollection originalCollection)
+        {
+            CreateControlCollectionDelegate factoryMethod = GetInterceptedCollectionFactory(owner.GetType(), originalCollection.GetType());
+            ControlCollection interceptedCollection = factoryMethod(owner);
+            ReflectionUtils.MemberwiseCopy(originalCollection, interceptedCollection);
+            return interceptedCollection;
+        }
+
+        internal static ControlCollection TryCreateCollection(Control owner)
+        {
+            CreateControlCollectionDelegate factoryMethod = (CreateControlCollectionDelegate)s_collectionFactoryCache[owner.GetType()];
+            if (factoryMethod != null)
+            {
+                return factoryMethod(owner);
+            }
+            return null;
+        }
+
+        private delegate ControlCollection CreateControlCollectionDelegate(Control owner);
+        private static readonly Hashtable s_collectionFactoryCache = new Hashtable();
+
+#if NET_2_0
+        private static CreateControlCollectionDelegate GetInterceptedCollectionFactory(Type ownerType, Type collectionType)
+        {
+            AssertUtils.State( typeof(Control).IsAssignableFrom(ownerType), "ownerType must be of type Control" );
+            AssertUtils.State( typeof(ControlCollection).IsAssignableFrom(collectionType), "collectionType must be of type ControlCollection" );
+
+            CreateControlCollectionDelegate factoryMethod = (CreateControlCollectionDelegate)s_collectionFactoryCache[ownerType];
+            if (factoryMethod == null)
+            {
+                lock (s_collectionFactoryCache)
+                {
+                    factoryMethod = (CreateControlCollectionDelegate)s_collectionFactoryCache[ownerType];
+                    if (factoryMethod == null)
+                    {
+                        Type interceptedCollectionType =
+                            GetInterceptedCollectionType(collectionType, WebDependencyInjectionUtils.InjectDependenciesRecursive);
+
+                        ConstructorInfo ctor =
+                            interceptedCollectionType.GetConstructor(new Type[] { typeof(Control) });
+                        DynamicMethod dm =
+                            new System.Reflection.Emit.DynamicMethod(string.Empty, typeof(ControlCollection),
+                                                                     new Type[] { typeof(Control) });
+                        ILGenerator il = dm.GetILGenerator();
+                        il.Emit(OpCodes.Ldarg_0);
+                        il.Emit(OpCodes.Newobj, ctor);
+                        il.Emit(OpCodes.Ret);
+                        factoryMethod = (CreateControlCollectionDelegate)dm.CreateDelegate(typeof(CreateControlCollectionDelegate));
+                        s_collectionFactoryCache[ownerType] = factoryMethod;
+                    }
+                }
+            }
+            return factoryMethod;
+        }
+#else
+        private class CreateControlCollectionWrapper
+        {
+            private IDynamicConstructor _ctor;
+
+            public CreateControlCollectionWrapper(IDynamicConstructor ctor)
+            {
+                _ctor = ctor;
+            }
+
+            public ControlCollection Create(Control owner)
+            {
+                return (ControlCollection) _ctor.Invoke(new object[] {owner});
+            }
+        }
+
+        private static CreateControlCollectionDelegate GetInterceptedCollectionFactory(Type controlType, Type controlCollectionType)
+        {
+            AssertUtils.State( typeof(Control).IsAssignableFrom(controlType), "controlType must be of type Control" );
+            AssertUtils.State( typeof(ControlCollection).IsAssignableFrom(controlCollectionType), "controlCollectionType must be of type ControlCollection" );
+
+            CreateControlCollectionDelegate factoryMethod = (CreateControlCollectionDelegate)s_collectionFactoryCache[controlType];
+            if (factoryMethod == null)
+            {
+                lock (s_collectionFactoryCache)
+                {
+                    factoryMethod = (CreateControlCollectionDelegate)s_collectionFactoryCache[controlType];
+                    if (factoryMethod == null)
+                    {
+                        Type interceptedCollectionType = GetInterceptedCollectionType(controlCollectionType, new InjectDependenciesCallbackHandler(WebDependencyInjectionUtils.InjectDependenciesRecursive));
+
+                        ConstructorInfo ctor = interceptedCollectionType.GetConstructor(new Type[] {typeof (Control)});
+                        IDynamicConstructor dynCtor = new SafeConstructor(ctor);
+                        s_collectionFactoryCache[controlType] = new CreateControlCollectionDelegate(new CreateControlCollectionWrapper(dynCtor).Create);
+                    }
+                }
+            }
+            return factoryMethod;
+        }
+#endif
+
+        private static Type GetInterceptedCollectionType(Type controlCollectionType, InjectDependenciesCallbackHandler staticCallback)
+        {
+            AssertUtils.State( typeof(ControlCollection).IsAssignableFrom(controlCollectionType), "controlCollectionType must be of type ControlCollection" );
+
+            Type interceptedCollectionType = (Type)s_interceptedCollectionTypeCache[controlCollectionType];
+            if (interceptedCollectionType == null)
+            {
+                lock (s_interceptedCollectionTypeCache)
+                {
+                    MethodInfo callbackMethod = staticCallback.Method;
+                    AssertUtils.State(callbackMethod.IsStatic && callbackMethod.IsPublic, "staticCallback must be a public static method");
+                    interceptedCollectionType = (Type)s_interceptedCollectionTypeCache[controlCollectionType];
+                    if (interceptedCollectionType == null)
+                    {
+                        SupportsWebDependencyInjectionTypeBuilder builder = new SupportsWebDependencyInjectionTypeBuilder(controlCollectionType, s_collectionMethods, callbackMethod);
+                        interceptedCollectionType = builder.BuildProxyType();
+                        s_interceptedCollectionTypeCache[controlCollectionType] = interceptedCollectionType;
+                    }
+                }
+            }
+            return interceptedCollectionType;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/MimeMediaType.cs b/src/Spring/Spring.Web/Web/Support/MimeMediaType.cs
new file mode 100644
index 00000000..5ee08d97
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/MimeMediaType.cs
@@ -0,0 +1,244 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// Represents a MIME media type as defined by http://www.iana.org/assignments/media-types/
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: MimeMediaType.cs,v 1.1 2007/11/28 23:26:10 oakinger Exp $</version>
+    public class MimeMediaType
+    {
+        private static readonly ArrayList ContentTypes = new ArrayList( new string[] {
+                                                            "application", "audio", "example", "image", "message",
+                                                            "model", "multipart", "text", "video"
+                                                        });
+
+        #region Predefined Instances
+
+        /// <summary>
+        /// Predefines common application media types
+        /// </summary>
+        public sealed class Application
+        {
+            /// <summary>
+            /// Represents "application/octet-stream"
+            /// </summary>
+            public static readonly MimeMediaType Octet = Parse("application/octet-stream");
+            /// <summary>
+            /// Represents "application/pdf"
+            /// </summary>
+            public static readonly MimeMediaType Pdf = Parse("application/pdf");
+            /// <summary>
+            /// Represents "application/rtf"
+            /// </summary>
+            public static readonly MimeMediaType Rtf = Parse("application/rtf");
+            /// <summary>
+            /// Represents "application/soap+xml"
+            /// </summary>
+            public static readonly MimeMediaType Soap = Parse("application/soap+xml");
+            /// <summary>
+            /// Represents "application/zip"
+            /// </summary>
+            public static readonly MimeMediaType Zip = Parse("application/zip");
+        }
+
+        /// <summary>
+        /// Predefines common image media types
+        /// </summary>
+        public sealed class Image
+        {
+            /// <summary>
+            /// Represents "image/gif"
+            /// </summary>
+            public static readonly MimeMediaType Gif = Parse("image/gif");
+            /// <summary>
+            /// Represents "image/jpeg"
+            /// </summary>
+            public static readonly MimeMediaType Jpeg = Parse("image/jpeg");
+            /// <summary>
+            /// Represents "image/tiff"
+            /// </summary>
+            public static readonly MimeMediaType Tiff = Parse("image/tiff");
+        }
+
+        /// <summary>
+        /// Predefines common text media types
+        /// </summary>
+        public sealed class Text
+        {
+            /// <summary>
+            /// Represents "text/html"
+            /// </summary>
+            public static readonly MimeMediaType Html = Parse("text/html");
+            /// <summary>
+            /// Represents "text/plain"
+            /// </summary>
+            public static readonly MimeMediaType Plain = Parse("text/plain");
+            /// <summary>
+            /// Represents "text/richtext"
+            /// </summary>
+            public static readonly MimeMediaType RichText = Parse("text/richtext");
+            /// <summary>
+            /// Represents "text/xml"
+            /// </summary>
+            public static readonly MimeMediaType Xml = Parse("text/xml");
+            /// <summary>
+            /// Represents "text/javascript"
+            /// </summary>
+            public static readonly MimeMediaType Javascript = Parse("text/javascript");
+            /// <summary>
+            /// Represents "text/css"
+            /// </summary>
+            public static readonly MimeMediaType Css = Parse("text/css");
+        }
+
+        #endregion
+
+        #region Static Methods
+
+        /// <summary>
+        /// Parses a string into a <see cref="MimeMediaType"/> instance.
+        /// </summary>
+        /// <param name="mediaType">a valid string representation of a mediaType</param>
+        /// <returns>a new <see cref="MimeMediaType"/> instance</returns>
+        public static MimeMediaType Parse(string mediaType)
+        {
+            AssertUtils.ArgumentNotNull(mediaType, "mediaType");
+
+            string[] parts = mediaType.Split('/');
+            if (parts.Length > 2)
+            {
+                throw new ArgumentException("invalid mediaType");
+            }
+
+            if (parts.Length == 1)
+            {
+                return new MimeMediaType(parts[0]);
+            }
+            else
+            {
+                return new MimeMediaType(parts[0], parts[1]);
+            }
+        }
+
+        #endregion Static Methods
+
+        private readonly string _contentType;
+        private readonly string _subType;
+
+        /// <summary>
+        /// Creates a new media type instance representing a generic "application/octet-stream"
+        /// </summary>
+        public MimeMediaType()
+            :this("application", "octet-stream")
+        {
+        }
+
+        /// <summary>
+        /// Creates a new media type instance representing a generic content type 
+        /// with an unspecified subtype (e.g. "text/*")
+        /// </summary>
+        public MimeMediaType(string contentType)
+            : this(contentType, "*")
+        {
+        }
+
+        /// <summary>
+        /// Creates a new media type instance representing a particular media type 
+        /// </summary>
+        public MimeMediaType(string contentType, string subType)
+        {
+            _contentType = contentType.ToLower();
+            if (!ContentTypes.Contains(_contentType))
+            {
+                throw new ArgumentException("unknown content type", "contentType");
+            }
+            _subType = (StringUtils.HasText(subType)) ? subType.ToLower() : "*";
+        }
+
+        /// <summary>
+        /// Gets the content type of this media type instance
+        /// </summary>
+        public string ContentType
+        {
+            get { return _contentType; }
+        }
+
+        /// <summary>
+        /// Gets the subtype of this media type instance
+        /// </summary>
+        public string SubType
+        {
+            get { return _subType; }
+        }
+
+        /// <summary>
+        /// Returns a string representation of this <see cref="MimeMediaType"/> instance.
+        /// </summary>
+        public override string ToString()
+        {
+            return string.Format("{0}/{1}", _contentType, _subType);
+        }
+
+        /// <summary>
+        /// Compares this instance to another
+        /// </summary>
+        /// <param name="other">another <see cref="MimeMediaType"/> instance</param>
+        protected bool Equals(MimeMediaType other)
+        {
+            if (other == null) return false;
+            return Equals(_contentType, other._contentType) && Equals(_subType, other._subType);
+        }
+
+        ///<summary>
+        ///Determines whether the specified <see cref="T:System.Object"></see> is equal to the current <see cref="MimeMediaType"></see>.
+        ///</summary>
+        ///<returns>
+        ///true if the specified <see cref="T:System.Object"></see> is equal to the current <see cref="MimeMediaType"></see>; otherwise, false.
+        ///</returns>
+        ///<param name="obj">The <see cref="T:System.Object"></see> to compare with the current <see cref="MimeMediaType"></see>.</param>
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(this, obj)) return true;
+            return Equals(obj as MimeMediaType);
+        }
+
+        ///<summary>
+        ///Serves as a hash function for a particular type. <see cref="M:System.Object.GetHashCode"></see> is suitable for use in hashing algorithms and data structures like a hash table.
+        ///</summary>
+        ///<returns>
+        ///A hash code for the current <see cref="MimeMediaType"></see>.
+        ///</returns>
+        public override int GetHashCode()
+        {
+            return _contentType.GetHashCode() + 29*_subType.GetHashCode();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/PageHandlerFactory.cs b/src/Spring/Spring.Web/Web/Support/PageHandlerFactory.cs
new file mode 100644
index 00000000..ae15ced7
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/PageHandlerFactory.cs
@@ -0,0 +1,424 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Reflection;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.SessionState;
+using System.Web.UI;
+using Common.Logging;
+using Spring.Collections;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Util;
+using Spring.Web.Process;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// Implementation of <see cref="System.Web.IHttpHandlerFactory"/> that retrieves
+    /// configured <see cref="IHttpHandler"/> instances from Spring web application context.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This handler factory uses the page name from the URL, without the extension,
+    /// to find the handler object in the Spring context. This means that the target object 
+    /// definition doesn't need to resolve to an .aspx page -- it can be any valid 
+    /// object that implements <see cref="IHttpHandler"/> interface.
+    /// </para>
+    /// <para>
+    /// If the specified page is not found in the Spring application context, this
+    /// handler factory falls back to the standard ASP.NET behavior and tries 
+    /// to find physical page with a given name.
+    /// </para>
+    /// <para>
+    /// In either case, handlers that implement <see cref="IApplicationContextAware"/>
+    /// and <see cref="ISharedStateAware"/> will be provided with the references
+    /// to appropriate Spring.NET application context (based on the request URL) 
+    /// and a <see cref="IDictionary"/> that should be used to store the information
+    /// that needs to be shared by all instances of the handler.
+    /// </para>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: PageHandlerFactory.cs,v 1.41 2008/05/15 12:35:27 oakinger Exp $</version>
+    public class PageHandlerFactory : AbstractHandlerFactory
+    {
+        private readonly ILog Log = LogManager.GetLogger(typeof(PageHandlerFactory));
+
+        private readonly IDictionary pageHandlerWrappers = CollectionsUtil.CreateCaseInsensitiveHashtable();
+
+        /// <summary>
+        /// Retrieves instance of the configured page from Spring web application context, 
+        /// or if page is not defined in Spring config file tries to find it using standard
+        /// ASP.Net mechanism.
+        /// </summary>
+        /// <param name="context">Current HttpContext</param>
+        /// <param name="requestType">Type of HTTP request (GET, POST, etc.)</param>
+        /// <param name="url">Requested page URL</param>
+        /// <param name="physicalPath">Translated server path for the page</param>
+        /// <returns>Instance of the IHttpHandler object that should be used to process request.</returns>
+        public override IHttpHandler GetHandler(HttpContext context, string requestType, string url, string physicalPath)
+        {
+            new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Assert();
+
+            bool isDebug = Log.IsDebugEnabled;
+
+            if (isDebug) Log.Debug(string.Format("GetHandler():resolving url '{0}'", url));
+
+            IHttpHandler pageHandlerWrapper;
+
+            lock (pageHandlerWrappers.SyncRoot)
+            {
+                pageHandlerWrapper = (PageHandlerWrapper)pageHandlerWrappers[url];
+            }
+
+            if (pageHandlerWrapper != null)
+            {
+                if (isDebug)
+                {
+                    Log.Debug(string.Format("GetHandler():resolved url '{0}' from reusable handler cache", url));
+                }
+            }
+            else
+            {
+                IConfigurableApplicationContext appContext =
+                    WebApplicationContext.GetContext(url) as IConfigurableApplicationContext;
+
+                if (appContext == null)
+                {
+                    throw new InvalidOperationException(
+                        "Implementations of IApplicationContext must also implement IConfigurableApplicationContext");
+                }
+
+                string appRelativeVirtualPath = WebUtils.GetAppRelativePath(url);
+                NamedObjectDefinition namedPageDefinition = FindWebObjectDefinition(appRelativeVirtualPath, appContext.ObjectFactory);
+
+                if (namedPageDefinition != null)
+                {
+                    Type pageType = namedPageDefinition.ObjectDefinition.ObjectType;
+                    if (typeof(IRequiresSessionState).IsAssignableFrom(pageType))
+                    {
+                        pageHandlerWrapper = new SessionAwarePageHandlerWrapper(appContext, namedPageDefinition.Name, url, null);
+                    }
+                    else
+                    {
+                        pageHandlerWrapper = new PageHandlerWrapper(appContext, namedPageDefinition.Name, url, null);
+                    }
+                }
+                else
+                {
+                    Type pageType = WebObjectUtils.GetCompiledPageType(url);
+                    if (typeof(IRequiresSessionState).IsAssignableFrom(pageType))
+                    {
+                        pageHandlerWrapper = new SessionAwarePageHandlerWrapper(appContext, appRelativeVirtualPath, url, physicalPath);
+                    }
+                    else
+                    {
+                        pageHandlerWrapper = new PageHandlerWrapper(appContext, appRelativeVirtualPath, url, physicalPath);
+                    }
+                }
+
+                if (pageHandlerWrapper.IsReusable)
+                {
+                    lock (pageHandlerWrappers.SyncRoot)
+                    {
+                        pageHandlerWrappers[url] = pageHandlerWrapper;
+                    }
+                }
+            }
+
+            return pageHandlerWrapper;
+        }
+    }
+
+    /// <summary>
+    /// Wrapper for handlers that do not require <see cref="HttpSessionState"/>.
+    /// </summary>
+    /// <remarks>
+    /// NOTE: This class has to extend System.Web.UI.Page instead of simply 
+    /// implementing IHttpHandler in order for Server.Transfer to work properly.
+    /// This in turn requires explicit IHttpHandler implementation in order to
+    /// override non-virtual methods from the base Page class.
+    /// </remarks>
+    internal class PageHandlerWrapper : Page, IHttpHandler
+    {
+#if NET_2_0
+        private static readonly FieldInfo fiHttpContext_CurrentHandler =
+            typeof(HttpContext).GetField("_currentHandler", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static readonly MethodInfo miPage_SetPreviousPage =
+            typeof(System.Web.UI.Page).GetMethod("SetPreviousPage", BindingFlags.NonPublic | BindingFlags.Instance);
+#endif
+
+        private readonly IApplicationContext appContext;
+        private readonly string pageId;
+        private readonly string url;
+        private readonly string path;
+
+        // cache handler if IsReusable == true
+        // since we don't use sync, make it volatile
+        private volatile IHttpHandler cachedHandler;
+
+        // holds shared state for handlerType
+        private Type handlerType;
+        private IDictionary handlerState;
+
+        private readonly object syncRoot = new object();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PageHandlerWrapper"/> class.
+        /// </summary>
+        /// <param name="appContext">Application context instance to retrieve page from.</param>
+        /// <param name="pageName">Name of the page object to execute.</param>
+        /// <param name="url">Requested page URL.</param>
+        /// <param name="path">Translated server path for the page.</param>
+        public PageHandlerWrapper(IApplicationContext appContext, string pageName, string url, string path)
+        {
+            this.appContext = appContext;
+            this.pageId = pageName;
+            this.url = url;
+            this.path = path;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PageHandlerWrapper"/> class.
+        /// </summary>
+        /// <param name="appContext">Application context instance to retrieve page from.</param>
+        /// <param name="pageName">Name of the page object to execute.</param>
+        public PageHandlerWrapper(IApplicationContext appContext, string pageName)
+            : this(appContext, pageName, null, null)
+        {
+        }
+
+        #region Properties
+
+        /// <summary>
+        /// Use for sync access to this PageHandler instance.
+        /// </summary>
+        public object SyncRoot
+        {
+            get { return syncRoot; }
+        }
+
+        /// <summary>
+        /// Gets <see cref="IDictionary"/> that contains handler state. 
+        /// </summary>
+        /// <remarks>
+        /// This <see cref="IDictionary"/> will be assigned to the <c>SharedState</c>
+        /// property of <see cref="IHttpHandler"/> instances that implement
+        /// <see cref="ISharedStateAware"/> interface.
+        /// </remarks>
+        public IDictionary HandlerState
+        {
+            get { return handlerState; }
+        }
+
+        #endregion
+
+        void IHttpHandler.ProcessRequest(HttpContext context)
+        {
+            IHttpHandler handler = cachedHandler;
+
+            if (handler == null)
+            {
+                if (path != null)
+                {
+                    handler = CreatePageInstance();
+                }
+                else
+                {
+                    handler = GetOrCreateProcessHandler(context);
+                }
+
+                // note, that we don't care about sync here. The last call wins (it's the most current handler instance anyway)
+                if (handler.IsReusable) cachedHandler = handler;
+            }
+
+            // replace handler proxy on context with "real" handler
+            if (this == context.Handler)
+            {
+                context.Handler = handler;
+            }
+
+#if NET_2_0
+            // this may happen under load, if GetHandler() 
+            // and ProcessRequest() are executed under different threads
+            // fix this...
+            if (this == context.CurrentHandler)
+            {
+                fiHttpContext_CurrentHandler.SetValue(context, handler);
+            }
+
+            if (handler is System.Web.UI.Page)
+            {
+                System.Web.UI.Page page = (Page) handler;
+
+                // During Server.Transfer/Execute() the PreviousPage property gets set
+                if (this.PreviousPage != null)
+                {
+                    miPage_SetPreviousPage.Invoke(page, new object[] { this.PreviousPage });
+                }
+            }
+#endif
+
+            ApplySharedState(handler);
+            ApplyDependencyInjection(handler);
+
+            handler.ProcessRequest(context);
+        }
+
+        /// <summary>
+        /// Returns true because this wrapper handler can be reused.
+        /// Actual page is instantiated at the beginning of the ProcessRequest method.
+        /// </summary>
+        bool IHttpHandler.IsReusable
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// Creates a page instance corresponding to this handler's url.
+        /// </summary>
+        private IHttpHandler CreatePageInstance()
+        {
+            IHttpHandler handler;
+            handler = WebObjectUtils.CreatePageInstance(url);
+            if (handler is IApplicationContextAware)
+            {
+                ((IApplicationContextAware)handler).ApplicationContext = appContext;
+            }
+            return handler;
+        }
+
+        /// <summary>
+        /// Gets or - if not found - creates a process handler instance.
+        /// </summary>
+        private IHttpHandler GetOrCreateProcessHandler(HttpContext context)
+        {
+            IHttpHandler handler = null;
+            string processId = context.Request[AbstractProcessHandler.ProcessIdParamName];
+            if (processId != null)
+            {
+                handler = (IHttpHandler)ProcessManager.GetProcess(processId);
+            }
+
+            if (handler == null)
+            {
+                handler = (IHttpHandler)this.appContext.GetObject(this.pageId);
+                if (handler is IProcess)
+                {
+                    ((IProcess)handler).Start(url);
+                }
+            }
+            return handler;
+        }
+
+        /// <summary>
+        /// Apply dependency injection stuff on the handler.
+        /// </summary>
+        /// <param name="handler"></param>
+        private void ApplyDependencyInjection(IHttpHandler handler)
+        {
+            if (handler is Control)
+            {
+                ControlInterceptor.EnsureControlIntercepted(appContext, (Control)handler);
+            }
+            else
+            {
+                if (handler is ISupportsWebDependencyInjection)
+                {
+                    ((ISupportsWebDependencyInjection)handler).DefaultApplicationContext = appContext;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Applies <see cref="HandlerState"/> to the given handler if applicable.
+        /// </summary>
+        private void ApplySharedState(IHttpHandler handler)
+        {
+            if (handler is ISharedStateAware)
+            {
+                CheckIfPageWasRecompiled(handler);
+                ((ISharedStateAware)handler).SharedState = this.handlerState;
+            }
+        }
+
+        /// <summary>
+        /// Checks, if page has been recompiled. Creates/discards handlerState if necessary.
+        /// </summary>
+        /// <param name="handler"></param>
+        private void CheckIfPageWasRecompiled(IHttpHandler handler)
+        {
+            if (handlerType != handler.GetType())
+            {
+                lock (SyncRoot)
+                {
+                    if (handlerType != handler.GetType())
+                    {
+                        // discard old handlerState and cache new pagetype
+                        handlerState = new SynchronizedHashtable();
+                        handlerType = handler.GetType();
+                    }
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Wrapper for handlers that require <see cref="HttpSessionState"/>.
+    /// </summary>
+    /// <remarks>
+    /// Delays page object instantiation until ProcessRequest is called
+    /// in order to be able to access session state.
+    /// </remarks>
+    internal class SessionAwarePageHandlerWrapper : PageHandlerWrapper, IRequiresSessionState
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionAwarePageHandlerWrapper"/> class.
+        /// </summary>
+        /// <param name="appContext">Application context instance to retrieve page from.</param>
+        /// <param name="pageName">Name of the page object to execute.</param>
+        /// <param name="url">Requested page URL.</param>
+        /// <param name="path">Translated server path for the page.</param>
+        public SessionAwarePageHandlerWrapper(IApplicationContext appContext, string pageName, string url, string path)
+            : base(appContext, pageName, url, path)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionAwarePageHandlerWrapper"/> class.
+        /// </summary>
+        /// <param name="appContext">Application context instance to retrieve page from.</param>
+        /// <param name="pageName">Name of the page object to execute.</param>
+        public SessionAwarePageHandlerWrapper(IApplicationContext appContext, string pageName)
+            : base(appContext, pageName)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/Result.cs b/src/Spring/Spring.Web/Web/Support/Result.cs
new file mode 100644
index 00000000..996f7d6c
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/Result.cs
@@ -0,0 +1,393 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Text;
+using System.Web;
+using Spring.Expressions;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// Represents the ASPX result page that an operation maps to.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Parameters can reference variables accessible from the page using the
+    /// standard NAnt style property notation, namely <c>${varName}</c>.
+    /// </p>
+    /// <p>
+    /// The <c>result</c> <see cref="System.String"/> that is passed as the sole
+    /// parameter to the parameterized constructor
+    /// (<see cref="Spring.Web.Support.Result(string)"/>) must adhere to the
+    /// following format:
+    /// </p>
+    /// <code>
+    /// [&lt;mode&gt;:]&lt;targetPage&gt;[?param1,param2,...,paramN]
+    /// </code>
+    /// <p>
+    /// Only the <c>targetPage</c> is mandatory.
+    /// </p>
+    /// </remarks>
+    /// <example>
+    /// <p>
+    /// Examples of valid <see cref="System.String"/> values that can be passed
+    /// to the the parameterized constructor
+    /// (<see cref="Spring.Web.Support.Result(string)"/>) include:
+    /// </p>
+    /// <p>
+    /// <list type="bullet">
+    /// <item><description>Login.aspx</description></item>
+    /// <item><description>~/Login.aspx</description></item>
+    /// <item><description>redirect:~/Login.aspx</description></item>
+    /// <item><description>transfer:~/Login.aspx</description></item>
+    /// <item><description>transfer:Services/Register.aspx</description></item>
+    /// <item><description>Login.aspx?username=springboy,password=7623AAjoe</description></item>
+    /// <item><description>redirect:Login.aspx?username=springboy,password=7623AAjoe</description></item>
+    /// </list>
+    /// </p>
+    /// </example>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Matan Shapira</author>
+    /// <version>$Id: Result.cs,v 1.13 2008/02/02 09:12:44 oakinger Exp $</version>
+    [Serializable]
+    public class Result
+    {
+        #region Constants
+
+        /// <summary>
+        /// The default <see cref="Spring.Web.Support.ResultMode"/>.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Currently defaults to <see cref="Spring.Web.Support.ResultMode.Transfer"/>.
+        /// </p>
+        /// </remarks>
+        /// <seealso cref="Spring.Web.Support.ResultMode"/>
+        public const ResultMode DefaultResultMode = ResultMode.Transfer;
+
+        #endregion
+
+        #region Fields
+
+        private ResultMode mode = DefaultResultMode;
+        private string targetPage;
+        private IDictionary parameters;
+
+        #endregion
+
+        #region Constructor (s) / Destructor
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Web.Support.Result"/> class.
+        /// </summary>
+        public Result()
+        { }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Web.Support.Result"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// See both the class documentation (<see cref="Spring.Web.Support.Result"/>)
+        /// and the reference documentation for the Spring.Web library for a
+        /// discussion and examples of what values the supplied <paramref name="result"/>
+        /// can have.
+        /// </p>
+        /// </remarks>
+        /// <param name="result">The result descriptor.</param>
+        /// <exception cref="System.ArgumentNullException">
+        /// If the supplied <paramref name="result"/> is <see langword="null"/> or
+        /// contains only whitespace character(s).
+        /// </exception>
+        public Result(string result)
+        {
+            AssertUtils.ArgumentHasText(result, "result");
+            result = ExtractAndSetResultMode(result);
+            int indexOfQueryStringDelimiter = result.IndexOf('?');
+            if (indexOfQueryStringDelimiter > 0)
+            {
+                ParseParameters(result.Substring(indexOfQueryStringDelimiter + 1));
+                result = result.Substring(0, indexOfQueryStringDelimiter);
+            }
+            targetPage = result.Trim();
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The <see cref="Spring.Web.Support.ResultMode"/>. Defines which
+        /// method will be used to navigate to the
+        /// <see cref="Spring.Web.Support.Result.TargetPage"/>.
+        /// </summary>
+        public ResultMode Mode
+        {
+            get { return mode; }
+            set { mode = value; }
+        }
+
+        /// <summary>
+        /// The target page.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// This is the (relative) path to the target page. 
+        /// </p>
+        /// </remarks>
+        /// <example>
+        /// <p>
+        /// Examples of valid values would be:
+        /// </p>
+        /// <p>
+        /// <list type="bullet">
+        /// <item><description>Login.aspx</description></item>
+        /// <item><description>~/Login.aspx</description></item>
+        /// <item><description>~/B2B/SignUp.aspx</description></item>
+        /// <item><description>B2B/Foo/FooServices.aspx</description></item>
+        /// </list>
+        /// </p>
+        /// </example>
+        public string TargetPage
+        {
+            get { return targetPage; }
+            set { targetPage = value; }
+        }
+
+        /// <summary>
+        /// The parameters thar are to be passed to the
+        /// <see cref="Spring.Web.Support.Result.TargetPage"/> upon
+        /// navigation.
+        /// </summary>
+        public IDictionary Parameters
+        {
+            get { return parameters; }
+            set { parameters = value; }
+        }
+
+        /// <summary>
+        /// Indicates, if <see cref="HttpServerUtility.Transfer(string,bool)"/> should be called with preserverForm='true' | 'false'. Only relevant for ResultMode.TransferXXXX modes.
+        /// </summary>
+        public bool PreserveForm
+        {
+            get { return (Mode == ResultMode.Transfer); }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Navigates to the <see cref="Spring.Web.Support.Result.TargetPage"/>
+        /// defined by this result.
+        /// </summary>
+        /// <param name="page">
+        /// The context object for parameter resolution. This is typically
+        /// a <see cref="System.Web.UI.Page"/>.
+        /// </param>
+        public virtual void Navigate(object page)
+        {
+            switch (Mode)
+            {
+                case ResultMode.Redirect:
+                    DoRedirect(page);
+                    break;
+                case ResultMode.Transfer:
+                case ResultMode.TransferNoPreserve:
+                    DoTransfer(page);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(string.Format("Unknown ResultMode {0}", Mode));
+            }
+        }
+
+        /// <summary>
+        /// Performs a server-side transfer to the
+        /// <see cref="Spring.Web.Support.Result.TargetPage"/> defined by this result.
+        /// </summary>
+        /// <param name="page">
+        /// The context object for parameter resolution. This is typically
+        /// a <see cref="System.Web.UI.Page"/>.
+        /// </param>
+        /// <seealso cref="System.Web.HttpServerUtility.Transfer(string,bool)"/>
+        protected virtual void DoTransfer(object page)
+        {
+            HttpContext ctx = HttpContext.Current;
+            SetTransferParameters(ctx.Items, page);
+            ctx.Server.Transfer(TargetPage, PreserveForm);
+        }
+
+        /// <summary>
+        /// Resolves transfer parameters and stores them into <see cref="IDictionary" /> instance.
+        /// </summary>
+        /// <param name="contextDictionary"></param>
+        /// <param name="page"></param>
+        protected void SetTransferParameters(IDictionary contextDictionary, object page)
+        {
+            if (this.parameters != null && this.parameters.Count > 0)
+            {
+                foreach (DictionaryEntry entry in this.parameters)
+                {
+                    string value = entry.Value.ToString();
+                    if (IsRuntimeExpression(value))
+                    {
+                        contextDictionary[entry.Key] = ResolveRuntimeExpression(page, value);
+                    }
+                    else
+                    {
+                        contextDictionary[entry.Key] = entry.Value;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Performs a redirect to the
+        /// <see cref="Spring.Web.Support.Result.TargetPage"/> defined by this
+        /// result.
+        /// </summary>
+        /// <param name="page">
+        /// The context object for parameter resolution. This is typically
+        /// a <see cref="System.Web.UI.Page"/>.
+        /// </param>
+        /// <seealso cref="System.Web.HttpResponse.Redirect(string)"/>
+        protected virtual void DoRedirect(object page)
+        {
+            HttpContext.Current.Response.Redirect(GetRedirectUri(page));
+        }
+
+        /// <summary>
+        /// Returns a redirect url string that points to the 
+        /// <see cref="Spring.Web.Support.Result.TargetPage"/> defined by this
+        /// result.
+        /// </summary>
+        /// <param name="page">
+        /// A redirect url string.
+        /// </param>
+        public string GetRedirectUri(object page)
+        {
+            StringBuilder url = new StringBuilder(256);
+            url.Append(TargetPage);
+            if (parameters != null && parameters.Count > 0)
+            {
+                char separator = '?';
+                foreach (DictionaryEntry entry in parameters)
+                {
+                    url.Append(separator);
+                    url.Append(entry.Key).Append('=');
+                    string value = entry.Value.ToString();
+                    if (IsRuntimeExpression(value))
+                    {
+                        url.Append(HttpContext.Current.Server.UrlEncode(
+                                    ResolveRuntimeExpression(page, value).ToString()));
+                    }
+                    else
+                    {
+                        url.Append(HttpContext.Current.Server.UrlEncode(value));
+                    }
+                    separator = '&';
+                }
+            }
+            return url.ToString();
+        }
+
+        private static bool IsRuntimeExpression(string value)
+        {
+            // allow for 2 alternative prefixes (SPRNET-864)
+            return (value.StartsWith("${") || value.StartsWith("%{")) && value.EndsWith("}");
+        }
+
+        private static object ResolveRuntimeExpression(object page, string value)
+        {
+            return ExpressionEvaluator.GetValue(page, value.Substring(2, value.Length - 3));
+        }
+
+        /// <summary>
+        /// Extracts and sets this instance's <see cref="Spring.Web.Support.Result.Mode"/>
+        /// property from the supplied <paramref name="result"/> descriptor.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// The supplied <paramref name="result"/> descriptor is typically
+        /// something like <c>/Foo.aspx</c> or
+        /// <c>redirect:http://www.springframework.net/</c>.
+        /// </p>
+        /// </remarks>
+        /// <param name="result">
+        /// The result descriptor.
+        /// </param>
+        /// <returns>
+        /// The supplied <paramref name="result"/> without the result mode
+        /// prefix (if any).
+        /// </returns>
+        /// <exception cref="System.ArgumentOutOfRangeException">
+        /// If the supplied <paramref name="result"/> starts with an illegal
+        /// result mode (see <see cref="Spring.Web.Support.ResultMode"/>).
+        /// </exception>
+        private string ExtractAndSetResultMode(string result)
+        {
+            int indexOfResultModeDelimiter = result.IndexOf(':');
+            if (indexOfResultModeDelimiter > 0)
+            {
+                try
+                {
+                    Mode = (ResultMode)Enum.Parse(typeof(ResultMode),
+                                                   result.Substring(0, indexOfResultModeDelimiter), true);
+                    return result.Substring(indexOfResultModeDelimiter + 1);
+                }
+                catch
+                {
+                    throw new ArgumentOutOfRangeException("result", result, "Illegal result mode.");
+                }
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Parses query parameters from the supplied <paramref name="queryString"/>.
+        /// </summary>
+        /// <param name="queryString">
+        /// The query string (may be <cref lang="null"/>).
+        /// </param>
+        private void ParseParameters(string queryString)
+        {
+            if (StringUtils.HasText(queryString))
+            {
+                this.parameters = new Hashtable();
+                string[] nameValuePairs = queryString.Split("&,".ToCharArray());
+                foreach (string pair in nameValuePairs)
+                {
+                    int n = pair.IndexOf('=');
+                    if (n > 0)
+                    {
+                        string name = pair.Substring(0, n);
+                        string val = pair.Substring(n + 1).Trim();
+                        this.parameters[name] = val;
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/ResultMode.cs b/src/Spring/Spring.Web/Web/Support/ResultMode.cs
new file mode 100644
index 00000000..6c0aca1e
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/ResultMode.cs
@@ -0,0 +1,74 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// The various result modes.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ResultMode.cs,v 1.3 2007/04/19 07:49:01 oakinger Exp $</version>
+    /// <seealso cref="Spring.Web.Support.Result"/>
+    [Serializable]
+    public enum ResultMode
+    {
+        /// <summary>
+        /// A server-side transfer.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Issues a server-side transfer using the
+        /// <see cref="System.Web.HttpServerUtility.Transfer(string)"/> method.
+        /// </p>
+        /// </remarks>
+        /// <seealso cref="System.Web.HttpServerUtility.Transfer(string)"/>
+        Transfer = 0,
+
+        /// <summary>
+        /// A redirect.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Issues a redirect (to the user-agent - typically a browser) using
+        /// the <see cref="System.Web.HttpResponse.Redirect(string)"/> method.
+        /// </p>
+        /// </remarks>
+        /// <seealso cref="System.Web.HttpResponse.Redirect(string)"/>
+        Redirect = 1,
+
+        /// <summary>
+        /// A server-side transfer.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Issues a server-side transfer using the
+        /// <see cref="System.Web.HttpServerUtility.Transfer(string,bool)"/> method with parameter 'preserveForm=false'.
+        /// </p>
+        /// </remarks>
+        /// <seealso cref="System.Web.HttpServerUtility.Transfer(string,bool)"/>
+        TransferNoPreserve = 2
+    }
+}
diff --git a/src/Spring/Spring.Web/Web/Support/Script.cs b/src/Spring/Spring.Web/Web/Support/Script.cs
new file mode 100644
index 00000000..6798eb2a
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/Script.cs
@@ -0,0 +1,235 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 Spring.Util;
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// Base class that describes client side script block or file.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Classes that extend this class are used by Spring.Web client-side
+    /// scripting support.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: Script.cs,v 1.4 2007/11/28 23:26:10 oakinger Exp $</version>
+    internal abstract class Script
+    {
+        internal static readonly MimeMediaType DefaultType = MimeMediaType.Text.Javascript;
+
+        private string language;
+        private MimeMediaType type;
+
+        /// <summary>
+        /// Initialize a new Script object of the specified language
+        /// </summary>
+        /// <param name="language">Script language.</param>
+        public Script(string language)
+        {
+            this.language = language;
+        }
+
+        /// <summary>
+        /// Initialize a new script object of the specified type
+        /// </summary>
+        /// <param name="type">a <see cref="MimeMediaType"/></param>
+        public Script(MimeMediaType type)
+        {
+            this.Type = type;
+        }
+
+        /// <summary>
+        /// Gets or sets script language.
+        /// </summary>
+        public string Language
+        {
+            get { return language; }
+            set { language = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets script mime type
+        /// </summary>
+        public MimeMediaType Type
+        {
+            get { return type; }
+            set { AssertUtils.ArgumentNotNull(value, "Type"); type = value; }
+        }
+    }
+
+    /// <summary>
+    /// Class that describes client side script block.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Script blocks are used to insert script code directly into the page,
+    /// without references to an external file.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: Script.cs,v 1.4 2007/11/28 23:26:10 oakinger Exp $</version>
+    internal class ScriptBlock : Script
+    {
+        private string script;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        /// <param name="language">Script language.</param>
+        /// <param name="script">The script text.</param>
+        public ScriptBlock(string language, string script) : base(language)
+        {
+            this.script = script;
+        }
+
+        /// <summary>
+        /// Initialize a new script block instance.
+        /// </summary>
+        /// <param name="type">the script language's <see cref="MimeMediaType"/></param>
+        /// <param name="script">the script body</param>
+        public ScriptBlock(MimeMediaType type, string script) : base(type)
+        {
+            this.script = script;
+        }
+
+        /// <summary>
+        /// Gets or sets the script text.
+        /// </summary>
+        /// <value>The script text.</value>
+        public string Script
+        {
+            get { return script; }
+            set { script = value; }
+        }
+    }
+
+    /// <summary>
+    /// Class that describes client side script file.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Script file references script code in the external file.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: Script.cs,v 1.4 2007/11/28 23:26:10 oakinger Exp $</version>
+    internal class ScriptFile : Script
+    {
+        private string fileName;
+
+        /// <summary>
+        /// Initialize a new <see cref="ScriptFile"/> instance.
+        /// </summary>
+        /// <param name="language">Script language.</param>
+        /// <param name="fileName">The name of the script file.</param>
+        public ScriptFile(string language, string fileName) : base(language)
+        {
+            this.fileName = fileName;
+        }
+
+        /// <summary>
+        /// Initialize a new <see cref="ScriptFile"/> instance.
+        /// </summary>
+        /// <param name="type">the script language's <see cref="MimeMediaType"/></param>
+        /// <param name="fileName">the (virtual) path to the script</param>
+        public ScriptFile(MimeMediaType type, string fileName)
+            : base(type)
+        {
+            this.fileName = fileName;
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the script file.
+        /// </summary>
+        /// <value>The name of the script file.</value>
+        public string FileName
+        {
+            get { return fileName; }
+            set { fileName = value; }
+        }
+    }
+
+    /// <summary>
+    /// Class that describes client side script file.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Script file references script code in the external file.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: Script.cs,v 1.4 2007/11/28 23:26:10 oakinger Exp $</version>
+    internal class ScriptEvent : ScriptBlock
+    {
+        private string element;
+        private string eventName;
+
+        /// <summary>
+        /// Initialize a new <see cref="ScriptEvent"/> instance.
+        /// </summary>
+        /// <param name="language">Script language.</param>
+        /// <param name="element">Element ID of the event source.</param>
+        /// <param name="eventName">Name of the event to handle.</param>
+        /// <param name="script">Script text.</param>
+        public ScriptEvent(string language, string element, string eventName, string script) : base(language, script)
+        {
+            this.element = element;
+            this.eventName = eventName;
+        }
+
+        /// <summary>
+        /// Initialize a new <see cref="ScriptEvent"/> instance.
+        /// </summary>
+        /// <param name="type">the script language's <see cref="MimeMediaType"/></param>
+        /// <param name="element">Element ID of the event source.</param>
+        /// <param name="eventName">Name of the event to handle.</param>
+        /// <param name="script">Script text.</param>
+        public ScriptEvent(MimeMediaType type, string element, string eventName, string script)
+            : base(type, script)
+        {
+            this.element = element;
+            this.eventName = eventName;
+        }
+
+        /// <summary>
+        /// Gets or sets the element ID.
+        /// </summary>
+        /// <value>The element ID.</value>
+        public string Element
+        {
+            get { return element; }
+            set { element = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the event.
+        /// </summary>
+        /// <value>The name of the event.</value>
+        public string EventName
+        {
+            get { return eventName; }
+            set { eventName = value; }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/SharedStateResourceCache.cs b/src/Spring/Spring.Web/Web/Support/SharedStateResourceCache.cs
new file mode 100644
index 00000000..e9e633af
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/SharedStateResourceCache.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System.Collections;
+using Spring.Globalization;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// Resource cache implementation that uses Spring.NET page/handler state to cache resources.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SharedStateResourceCache.cs,v 1.1 2007/08/03 08:31:25 oakinger Exp $</version>
+    internal class SharedStateResourceCache : AbstractResourceCache
+    {
+        private readonly ISharedStateAware sharedStateHolder;
+
+        public SharedStateResourceCache(ISharedStateAware sharedStateHolder)
+        {
+            AssertUtils.ArgumentNotNull(sharedStateHolder, "sharedStateHolder");
+            this.sharedStateHolder = sharedStateHolder;
+        }
+
+        /// <summary>
+        /// Gets the list of resources from cache.
+        /// </summary>
+        /// <param name="cacheKey">Cache key to use for lookup.</param>
+        /// <returns>A list of cached resources for the specified target object and culture.</returns>
+        protected override IList GetResources(string cacheKey)
+        {
+            return (IList) this.sharedStateHolder.SharedState[cacheKey];
+        }
+
+        /// <summary>
+        /// Puts the list of resources in the cache.
+        /// </summary>
+        /// <param name="cacheKey">Cache key to use for the specified resources.</param>
+        /// <param name="resources">A list of resources to cache.</param>
+        protected override void PutResources(string cacheKey, IList resources)
+        {
+            this.sharedStateHolder.SharedState[cacheKey] = resources;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionMethodBuilder.cs b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionMethodBuilder.cs
new file mode 100644
index 00000000..c8fa570c
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionMethodBuilder.cs
@@ -0,0 +1,94 @@
+#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
+
+#region Imports
+
+using System.Reflection;
+using System.Reflection.Emit;
+using Spring.Proxy;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// This MethodBuilder emits a Callback-call before calling the base method
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: SupportsWebDependencyInjectionMethodBuilder.cs,v 1.1 2007/08/01 23:11:01 markpollack Exp $</version>
+    internal class SupportsWebDependencyInjectionMethodBuilder : BaseProxyMethodBuilder
+    {
+        private FieldInfo _appContextField;
+        private MethodInfo _callbackMethod;
+
+        /// <summary>
+        /// Initializes a new instance of a SupportsWebDependencyInjectionMethodBuilder
+        /// </summary>
+        public SupportsWebDependencyInjectionMethodBuilder(TypeBuilder typeBuilder, IProxyTypeGenerator proxyGenerator,
+                                                           FieldInfo appContextField, MethodInfo callbackMethod)
+            : base(typeBuilder, proxyGenerator, true)
+        {
+            _appContextField = appContextField;
+            _callbackMethod = callbackMethod;
+        }
+
+        /// <summary>
+        /// Inserts a call to a callback-method before actually calling the base-method.
+        /// </summary>
+        /// <param name="il">The IL generator to use</param>
+        /// <param name="method">The method to proxy</param>
+        /// <param name="interfaceMethod">The interface definition of this method, if applicable</param>
+        protected override void GenerateMethod(ILGenerator il, MethodInfo method, MethodInfo interfaceMethod)
+        {
+            this.GenerateCallbackMethodCall(il, method, interfaceMethod);
+            base.GenerateMethod(il, method, interfaceMethod);
+        }
+
+        /// <summary>
+        /// Emits the callback invocation.
+        /// </summary>
+        private void GenerateCallbackMethodCall(ILGenerator il, MethodInfo method, MethodInfo interfaceMethod)
+        {
+            // setup parameters for call
+
+            // IApplicationContext is always first parameter!
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldfld, _appContextField);
+
+            // lookup parameters needed for callback - they are matched by type in order!
+            ParameterInfo[] callbackParams = _callbackMethod.GetParameters();
+            ParameterInfo[] paramArray = method.GetParameters();
+
+            for (int j = 1; j < callbackParams.Length; j++)
+            {
+                for (int i = 0; i < paramArray.Length; i++)
+                {
+                    if (paramArray[i].ParameterType == callbackParams[j].ParameterType)
+                    {
+                        il.Emit(OpCodes.Ldarg_S, i + 1);
+                        break;
+                    }
+                }
+            }
+
+            // invoke static(!) callback
+            il.EmitCall(OpCodes.Call, _callbackMethod, null);
+            return;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs
new file mode 100644
index 00000000..6711a42d
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs
@@ -0,0 +1,81 @@
+#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
+
+#region Imports
+
+using System.Web.UI;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Util;
+using Spring.Web.Support;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// Wraps a Control to make it DI aware
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: SupportsWebDependencyInjectionOwnerProxy.cs,v 1.2 2008/05/13 14:22:47 oakinger Exp $</version>
+    internal class SupportsWebDependencyInjectionOwnerProxy : Control, ISupportsWebDependencyInjection
+    {
+        // Control Fields and Methods	    
+        private readonly ControlAccessor _targetControl;
+        private IApplicationContext _defaultApplicationContext;
+
+        /// <summary>
+        /// Wraps a control to make it DI aware
+        /// </summary>
+        /// <param name="defaultApplicationContext"></param>
+        /// <param name="targetControl"></param>
+        public SupportsWebDependencyInjectionOwnerProxy(IApplicationContext defaultApplicationContext, Control targetControl)
+        {
+            _defaultApplicationContext = defaultApplicationContext;
+            _targetControl = new ControlAccessor(targetControl);
+        }
+
+        public IApplicationContext DefaultApplicationContext
+        {
+            get { return this._defaultApplicationContext; }
+            set { this._defaultApplicationContext = value; }
+        }
+
+        /// <summary>
+        /// Performs DI before adding the control to it's parent
+        /// </summary>
+        /// <param name="control"></param>
+        /// <param name="index"></param>
+        protected override void AddedControl(Control control, int index)
+        {
+            // do DI
+            WebDependencyInjectionUtils.InjectDependenciesRecursive(_defaultApplicationContext, control);
+
+            _targetControl.AddedControl(control, index);
+        }
+
+        /// <summary>
+        /// Delegates call to decorated control
+        /// </summary>
+        /// <param name="control"></param>
+        protected override void RemovedControl(Control control)
+        {
+            _targetControl.RemovedControl(control);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionTypeBuilder.cs b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionTypeBuilder.cs
new file mode 100644
index 00000000..e929a85e
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionTypeBuilder.cs
@@ -0,0 +1,197 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using Spring.Context;
+using Spring.Proxy;
+using Spring.Web.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// This TypeBuilder dynamically implements the <see cref="ISupportsWebDependencyInjection"/> contract on a given type.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: SupportsWebDependencyInjectionTypeBuilder.cs,v 1.1 2007/08/01 23:11:01 markpollack Exp $</version>
+    internal class SupportsWebDependencyInjectionTypeBuilder : InheritanceProxyTypeBuilder
+    {
+        private const string PROXY_TYPE_NAME = "SupportsWebDependencyInjectionControlProxy";
+
+        private MethodInfo[] _methodsToIntercept;
+        private MethodInfo _staticCallbackMethod;
+
+        /// <summary>
+        /// Creates a new TypeBuilder instance.
+        /// </summary>
+        /// <param name="targetType">The base type the proxy shall be derived from</param>
+        /// <param name="methodsToIntercept">The methods to be injected with a call to <c>staticCallbackMethod</c></param>
+        /// <param name="staticCallbackMethod">The <b>static</b> callback method to be injected into <c>methodsToIntercept</c></param>
+        public SupportsWebDependencyInjectionTypeBuilder(Type targetType, MethodInfo[] methodsToIntercept, MethodInfo staticCallbackMethod)
+        {
+            Name = PROXY_TYPE_NAME;
+
+            base.TargetType = targetType;
+			
+            if (methodsToIntercept == null || methodsToIntercept.Length == 0)
+            {
+                throw new ArgumentException("No methods specified to be intercepted");
+            }			
+            _methodsToIntercept = methodsToIntercept;
+			
+            if (!staticCallbackMethod.IsStatic)
+            {
+                throw new ArgumentException("CallbackMethod must be static");
+            }
+            _staticCallbackMethod = staticCallbackMethod;
+        }
+
+        /// <summary>
+        /// Creates a proxy that inherits the proxied object's class.
+        /// </summary>
+        /// <remarks/>
+        /// <returns>The generated proxy type.</returns>
+        public override Type BuildProxyType()
+        {
+            BaseType = TargetType;
+            if (BaseType.IsSealed ||
+                !ReflectionUtils.IsTypeVisible(BaseType, DynamicProxyManager.ASSEMBLY_NAME))
+            {
+                throw new ArgumentException("Inheritance proxy cannot be created for a sealed or non-public class [" +
+                                            BaseType.FullName + "]");
+            }
+
+            TypeBuilder typeBuilder = CreateTypeBuilder(Name, BaseType);
+
+            // declare field to hold reference to applicationContext
+            FieldBuilder appContextField = DeclareApplicationContextInstanceField(typeBuilder);
+
+            // create constructors
+            ImplementConstructors(typeBuilder);
+
+            // Implement IDependencyInjectionAware if necessary
+            if (!typeof (ISupportsWebDependencyInjection).IsAssignableFrom(BaseType))
+            {
+                ImplementIDependencyInjectionAware(typeBuilder, BaseType, appContextField);
+            }
+
+            // proxy base virtual methods
+            BaseProxyMethodBuilder proxyMethodBuilder =
+                new SupportsWebDependencyInjectionMethodBuilder(typeBuilder, this, appContextField, _staticCallbackMethod);
+            foreach (MethodInfo methodToIntercept in _methodsToIntercept)
+            {
+                proxyMethodBuilder.BuildProxyMethod(methodToIntercept, null);
+            }
+
+            return typeBuilder.CreateType();
+        }
+
+        /// <summary>
+        /// Actually implements the <see cref="ISupportsWebDependencyInjection"/> interface.
+        /// </summary>
+        private void ImplementIDependencyInjectionAware(TypeBuilder typeBuilder, Type targetType, FieldInfo appContextField)
+        {
+            Type intf = typeof (ISupportsWebDependencyInjection);
+
+            // Add interface declaration to type
+            typeBuilder.AddInterfaceImplementation(intf);
+
+            // get interface property
+            PropertyInfo piApplicationContext = intf.GetProperty("DefaultApplicationContext");
+
+            // define property
+            string fullPropertyName = typeof (ISupportsWebDependencyInjection).FullName + "." + piApplicationContext.Name;
+            PropertyBuilder appContextProperty =
+                typeBuilder.DefineProperty(fullPropertyName, PropertyAttributes.None, typeof (IApplicationContext), null);
+
+            MethodAttributes methodAtts = MethodAttributes.Private | MethodAttributes.HideBySig | MethodAttributes.SpecialName |
+                                          MethodAttributes.NewSlot | MethodAttributes.Virtual | MethodAttributes.Final;
+
+            // implement getter
+            MethodInfo getApplicationContextMethod = piApplicationContext.GetGetMethod();
+            string getterMethodName = typeof (ISupportsWebDependencyInjection).FullName + "." + getApplicationContextMethod.Name;
+            MethodBuilder mbGet =
+                typeBuilder.DefineMethod(getterMethodName,
+                                         methodAtts,
+                                         getApplicationContextMethod.CallingConvention, getApplicationContextMethod.ReturnType,
+                                         Type.EmptyTypes);
+
+
+            ILGenerator ilGet = mbGet.GetILGenerator();
+            ilGet.Emit(OpCodes.Ldarg_0);
+            ilGet.Emit(OpCodes.Ldfld, appContextField);
+            ilGet.Emit(OpCodes.Ret);
+
+            typeBuilder.DefineMethodOverride(mbGet, getApplicationContextMethod);
+            appContextProperty.SetGetMethod(mbGet);
+
+            // implement setter
+            MethodInfo setApplicationContextMethod = piApplicationContext.GetSetMethod();
+            string setterMethodName = typeof (ISupportsWebDependencyInjection).FullName + "." + setApplicationContextMethod.Name;
+            MethodBuilder mbSet = typeBuilder.DefineMethod(setterMethodName, methodAtts,
+                                                           setApplicationContextMethod.CallingConvention,
+                                                           setApplicationContextMethod.ReturnType,
+                                                           new Type[] {typeof (IApplicationContext)});
+
+            ILGenerator ilSet = mbSet.GetILGenerator();
+            ilSet.Emit(OpCodes.Ldarg_0);
+            ilSet.Emit(OpCodes.Ldarg_1);
+            ilSet.Emit(OpCodes.Stfld, appContextField);
+            ilSet.Emit(OpCodes.Ret);
+
+            typeBuilder.DefineMethodOverride(mbSet, setApplicationContextMethod);
+            appContextProperty.SetSetMethod(mbSet);
+        }
+
+        /// <summary>
+        /// Declares field that holds the <see cref="ISupportsWebDependencyInjection.DefaultApplicationContext"/>.
+        /// </summary>
+        private FieldBuilder DeclareApplicationContextInstanceField(TypeBuilder builder)
+        {
+            FieldBuilder applicationContextField;
+            applicationContextField =
+                builder.DefineField("_defaultApplicationContext", typeof (IApplicationContext), FieldAttributes.Private);
+            return applicationContextField;
+        }
+
+        #region Public Methods
+
+        /// <summary>
+        /// Determines if the specified <paramref name="type"/> 
+        /// is one of those generated by this builder.
+        /// </summary>
+        /// <param name="type">The type to check.</param>
+        /// <returns>
+        /// <see langword="true"/> if the type is a SpringAwareControl-based proxy;
+        /// otherwise <see langword="false"/>.
+        /// </returns>
+        public static bool IsSpringAwareControlProxy(Type type)
+        {
+            return type.FullName.StartsWith(PROXY_TYPE_NAME);
+        }
+
+        #endregion		
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/Support/WebDependencyInjectionUtils.cs b/src/Spring/Spring.Web/Web/Support/WebDependencyInjectionUtils.cs
new file mode 100644
index 00000000..22a70d26
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/Support/WebDependencyInjectionUtils.cs
@@ -0,0 +1,117 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Web.UI;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Util;
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// This is 
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: WebDependencyInjectionUtils.cs,v 1.3 2008/05/13 14:22:47 oakinger Exp $</version>
+    public class WebDependencyInjectionUtils
+    {
+        /// <summary>
+        /// Injects dependencies into all controls in the hierarchy 
+        /// based on template definitions in the Spring config file.
+        /// </summary>
+        /// <param name="applicationContext">ApplicationContext to be used</param>
+        /// <param name="control">Control to inject dependencies into.</param>
+        public static void InjectDependenciesRecursive(IApplicationContext applicationContext, Control control)
+        {
+            if (applicationContext != null)
+            {
+                InjectDependenciesRecursiveInternal(applicationContext, control);
+            }
+        }
+
+        private static void InjectDependenciesRecursiveInternal(IApplicationContext appContext, Control control)
+        {
+            if (control is LiteralControl) return; // nothing to do
+
+            ISupportsWebDependencyInjection diControl = control as ISupportsWebDependencyInjection;
+            if (diControl != null && diControl.DefaultApplicationContext != null)
+            {
+                return; // nothing to do anymore - control cares for its children
+            }
+
+            // "intercept" Control to make it DI-aware
+            ControlInterceptor.EnsureControlIntercepted(appContext, control);
+
+            // if the control is a UserControl, use ApplicationContext from it's physical location
+            IApplicationContext appContextToUse = appContext;
+            UserControl userControl = control as UserControl;
+            if (userControl != null)
+            {
+                appContextToUse = GetControlApplicationContext(appContext, userControl);
+            }
+
+            // set ApplicationContext instance
+            if (control is IApplicationContextAware)
+            {
+                ((IApplicationContextAware)control).ApplicationContext = appContextToUse;
+            }
+
+            // inject dependencies using control's context
+            appContextToUse.ConfigureObject(control, control.GetType().FullName);
+
+            // and now go for control's children
+            if (control.HasControls())
+            {
+                ControlCollection childControls = control.Controls;
+                int childCount = childControls.Count;
+                for (int i = 0; i < childCount; i++)
+                {
+                    Control c = childControls[i];
+                    if (!(c is LiteralControl))
+                    {
+                        InjectDependenciesRecursiveInternal(appContext, c);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Aquires an ApplicationContext according to a Control's TemplateSourceDirectory
+        /// </summary>
+        /// <returns>if availabe, the control's IApplicationContext instance - defaultContext otherwise</returns>
+        private static IApplicationContext GetControlApplicationContext(IApplicationContext defaultContext, Control control)
+        {
+            // use control's directory for resolving context
+            string srcDir = control.TemplateSourceDirectory;
+            if (StringUtils.HasLength(srcDir))
+            {
+                if (!srcDir.EndsWith("/")) srcDir += "/";
+                return WebApplicationContext.GetContext(srcDir);
+            }
+            else
+            {
+                return defaultContext;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/AbstractWizard.cs b/src/Spring/Spring.Web/Web/UI/AbstractWizard.cs
new file mode 100644
index 00000000..e12c2a44
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/AbstractWizard.cs
@@ -0,0 +1,190 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace Spring.Web.UI
+{
+    /// <summary>
+    /// Convinience implementation of the wizard-like page controller.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// Wizard steps are encapsulated within custom user controls. Wizard
+    /// controller takes care of navigation through steps and loading of the 
+    /// appropriate user control.
+    /// </p>
+    /// <p>
+    /// Developer implementing wizard needs to inherit from this class and implement
+    /// abstract, read-only StepPanel property that will be used as a container
+    /// for the wizard steps. Navigation event handlers should call Previous and Next methods
+    /// from this class to change current step.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AbstractWizard.cs,v 1.7 2006/05/18 21:37:52 markpollack Exp $</version>
+    public abstract class AbstractWizard : Page
+    {
+        private IList steps;
+
+        /// <summary>
+        /// Gets or sets a list of user controls representing wizard steps.
+        /// </summary>
+        public IList Steps
+        {
+            get { return steps; }
+            set { steps = value; }
+        }
+
+        #region Wizard navigation members
+
+        /// <summary>
+        /// Gets or sets current step using step index.
+        /// </summary>
+        public int CurrentStep
+        {
+            get
+            {
+                if (ViewState["__wizard.CurrentStep"] == null)
+                {
+                    ViewState["__wizard.CurrentStep"] = 0;
+                }
+                return (int) ViewState["__wizard.CurrentStep"];
+            }
+            set { ViewState["__wizard.CurrentStep"] = value; }
+        }
+
+        /// <summary>
+        /// Returns true if there are no steps before the current step.
+        /// </summary>
+        public bool IsFirst
+        {
+            get { return CurrentStep == 0; }
+        }
+
+        /// <summary>
+        /// Returns true if there are no steps after the current step.
+        /// </summary>
+        public bool IsLast
+        {
+            get { return CurrentStep == Steps.Count - 1; }
+        }
+
+        /// <summary>
+        /// Moves to the previous step in the list, if one exists.
+        /// </summary>
+        public void Previous()
+        {
+            if (!IsFirst)
+            {
+                CurrentStep--;
+            }
+        }
+
+        /// <summary>
+        /// Moves to the next step in the list, if one exists.
+        /// </summary>
+        public void Next()
+        {
+            if (!IsLast)
+            {
+                CurrentStep++;
+            }
+        }
+
+        #endregion
+
+        #region Page lifecycle methods
+
+        /// <summary>
+        /// Initializes wizard steps.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeSteps(steps);
+            base.OnInit(e);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+        }
+
+        /// <summary>
+        /// Loads new step into a step panel if step has changed.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected override void OnPreRender(EventArgs e)
+        {
+            for (int i = 0; i < StepPanel.Controls.Count; i++)
+            {
+                StepPanel.Controls[i].Visible = (i == CurrentStep);
+            }
+            base.OnPreRender(e);
+        }
+
+        /// <summary>
+        /// Initializes all the steps.
+        /// </summary>
+        /// <param name="stepNames">List of step control names.</param>
+        /// <returns>List of step control instances.</returns>
+        private void InitializeSteps(IList stepNames)
+        {
+            foreach (string stepName in stepNames)
+            {
+                Control step = LoadStep(stepName);
+                StepPanel.Controls.Add(step);
+            }
+        }
+
+        /// <summary>
+        /// Loads step control.
+        /// </summary>
+        private Control LoadStep(string stepControlName)
+        {
+            Control step = LoadControl(stepControlName);
+
+            int start = stepControlName.LastIndexOf('/');
+            int end = stepControlName.LastIndexOf('.');
+            step.ID = stepControlName.Substring(start + 1, end - start - 1);
+
+            return step;
+        }
+
+        #endregion
+
+        #region Abstract members
+
+        /// <summary>
+        /// Panel that should serve as a container for wizard steps.
+        /// </summary>
+        protected abstract Panel StepPanel { get; }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/AbstractBaseValidator.cs b/src/Spring/Spring.Web/Web/UI/Controls/AbstractBaseValidator.cs
new file mode 100644
index 00000000..8d7724c0
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/AbstractBaseValidator.cs
@@ -0,0 +1,133 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Import
+
+using System;
+using System.Reflection;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+	/// <summary>
+	/// Provides functions required for implementing validators 
+	/// but are unfortunately not accessible from <see cref="BaseValidator"/>
+	/// </summary>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: AbstractBaseValidator.cs,v 1.1 2007/07/31 10:40:58 oakinger Exp $</version>
+	public abstract class AbstractBaseValidator : System.Web.UI.WebControls.BaseValidator
+    {
+		/// <summary>
+		/// Registers a javascript-block to be rendered.
+		/// </summary>
+		protected void RegisterClientScriptBlock(Type type, string key, string script)
+		{
+#if NET_2_0
+                this.Page.ClientScript.RegisterClientScriptBlock(
+                    typeof(RequiredCheckBoxValidator)
+                    , "RequiredCheckBoxValidatorEvaluateIsChecked"
+                    ,
+@"
+<script type=""text/javascript"">
+function RequiredCheckBoxValidatorEvaluateIsChecked(val)
+{
+  var control;
+  control = document.getElementById(val.controltovalidate);
+  return control.checked;
+}
+</script>
+"
+                    );
+#else
+			key = type.FullName + "." + key;
+			this.Page.RegisterClientScriptBlock(
+				key
+				,
+				@"
+<script type=""text/javascript"">
+function RequiredCheckBoxValidatorEvaluateIsChecked(val)
+{
+  var control;
+  control = document.getElementById(val.controltovalidate);
+  return control.checked;
+}
+</script>
+"
+				);
+#endif
+		}
+
+		/// <summary>
+		/// Checks, if a certain javascript-block is already registered.
+		/// </summary>
+    	protected bool IsClientScriptBlockRegistered(Type type, string key)
+    	{
+#if NET_2_0
+			return this.Page.ClientScript.IsClientScriptBlockRegistered(type, key);
+#else
+    		return this.Page.IsClientScriptBlockRegistered( type.FullName + "." + key );
+#endif
+    	}
+
+		/// <summary>
+		/// Adds an attribute to be rendered for clientside validation.
+		/// </summary>
+        protected void AddExpandoAttribute(HtmlTextWriter writer, string controlId, string attributeName, string attributeValue, bool encode)
+        {
+#if NET_2_0
+
+            typeof(System.Web.UI.WebControls.BaseValidator).InvokeMember("AddExpandoAttribute"
+                                                                         ,
+                                                                         BindingFlags.InvokeMethod | BindingFlags.NonPublic
+                                                                         | BindingFlags.Instance
+                                                                         , null
+                                                                         , this
+                                                                         , new object[] {writer, controlId, attributeName, attributeValue, encode}
+                );
+#else
+			if (writer != null)
+			{
+				writer.AddAttribute(attributeName, attributeValue);
+			}
+#endif
+        }
+
+		/// <summary>
+		/// Is "XHTML 1.0 Transitional" rendering allowed?
+		/// </summary>
+        protected bool EnableLegacyRendering
+        {
+            get
+            {
+#if NET_2_0
+                return
+                    (bool) typeof(System.Web.UI.WebControls.BaseValidator).GetProperty("EnableLegacyRendering",
+                                                                                       BindingFlags.Instance
+                                                                                       | BindingFlags.NonPublic).GetValue(this, null);
+#else
+				return (this.Page != null);
+#endif
+            }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs b/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs
new file mode 100644
index 00000000..42d2a1f7
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs
@@ -0,0 +1,138 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System.Collections;
+using System.Web.UI;
+using Spring.Context;
+using Spring.Web.UI.Validation;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// Provides common functionality to all validation renderer controls.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: AbstractValidationControl.cs,v 1.1 2008/03/19 12:07:14 oakinger Exp $</version>
+    public abstract class AbstractValidationControl : Control
+    {
+        private string provider;
+        private IValidationErrorsRenderer renderer;
+
+        /// <summary>
+        /// Gets or sets the provider.
+        /// </summary>
+        /// <value>The provider.</value>
+        public string Provider
+        {
+            get
+            {
+                if (this.provider == null)
+                {
+                    return this.ID;
+                }
+                return this.provider;
+            }
+            set { this.provider = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the validation errors renderer to use. 
+        /// </summary>
+        /// <remarks>
+        /// If not explicitly specified, defaults to <see cref="SpanValidationErrorsRenderer"/>.
+        /// </remarks>
+        /// <value>The validation errors renderer to use.</value>
+        public IValidationErrorsRenderer Renderer
+        {
+            get
+            {
+                if (this.renderer == null)
+                {
+                    this.renderer = CreateValidationErrorsRenderer();
+                }
+                return this.renderer;
+            }
+            set { this.renderer = value; }
+        }
+
+        /// <summary>
+        /// Gets the MessageSource to be used for resolve error messages
+        /// </summary>
+        /// <remarks>
+        /// By default, returns <see cref="ValidationContainer"/>'s MessageSource.
+        /// </remarks>
+        protected virtual IMessageSource MessageSource
+        {
+            get { return ValidationContainer.MessageSource; }
+        }
+
+        /// <summary>
+        /// Create the default <see cref="IValidationErrorsRenderer"/> 
+        /// for this ValidationControl if none is configured.
+        /// </summary>
+        protected abstract IValidationErrorsRenderer CreateValidationErrorsRenderer();
+
+        /// <summary>
+        /// Gets the <see cref="IValidationContainer"/>, who's <see cref="IValidationContainer.ValidationErrors"/> 
+        /// shall be rendered by this control.
+        /// </summary>
+        protected virtual IValidationContainer ValidationContainer
+        {
+            get
+            {
+                for(Control parent=this.Parent; parent!=null; parent=parent.Parent)
+                {
+                    IValidationContainer container = parent as IValidationContainer;
+                    if (container != null)
+                    {
+                        return container;
+                    }                    
+                }
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Resolves the <see cref="ValidationContainer"/>'s list of validation errors to a list
+        /// of <see cref="string"/> elements containing the error messages to be rendered.
+        /// </summary>
+        /// <returns>a list containing <see cref="string"/> elements</returns>
+        protected virtual IList ResolveErrorMessages()
+        {
+            IList errorMessages;
+            errorMessages = this.ValidationContainer.ValidationErrors.GetResolvedErrors(this.Provider, this.MessageSource);
+            return errorMessages;
+        }
+
+        /// <summary>
+        /// Renders error messages using the specified <see cref="Renderer"/>.
+        /// </summary>
+        /// <param name="writer"></param>
+        protected override void Render(HtmlTextWriter writer)
+        {
+            IList errorMessages = ResolveErrorMessages();
+            Renderer.RenderErrors(Page as Spring.Web.UI.Page, writer, errorMessages);   
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Calendar.cs b/src/Spring/Spring.Web/Web/UI/Controls/Calendar.cs
new file mode 100644
index 00000000..d3cea716
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/Calendar.cs
@@ -0,0 +1,288 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using System.IO;
+using System.Threading;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// Displays a pop-up DHTML calendar.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+	/// Credit: this control uses a slightly modified version of the 
+	/// <a href="http://www.dynarch.com/projects/calendar/">Dynarch.com DHTML Calendar</a>,
+	/// written by Mihai Bazon.
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: Calendar.cs,v 1.13 2007/12/07 21:06:35 oakinger Exp $</version>
+    [ValidationProperty("SelectedDate")]
+    public class Calendar : WebControl, IPostBackDataHandler
+    {
+    	private const string AllowEditingViewStateKey = "AllowEditing";
+    	private const string DateFormatViewStateKey = "Format";
+    	private const string SelectedDateViewStateKey = "SelectedDate";
+    	private static readonly object EventDateChanged = new object();
+
+        private string skin;
+
+        /// <summary>
+        /// Registers necessary scripts and stylesheet.
+        /// </summary>
+        /// <param name="e">
+        /// An <see cref="System.EventArgs"/> object that contains the event data.
+        /// </param>
+        protected override void OnPreRender(EventArgs e)
+        {
+            if (skin != null)
+            {
+                Page.RegisterStyleFile("CalendarStyle", WebUtils.CreateAbsolutePath(Page.ScriptsRoot, "Calendar/calendar-" + skin + ".css"));
+            }
+            Page.RegisterHeadScriptFile("Calendar", WebUtils.CreateAbsolutePath(Page.ScriptsRoot,"Calendar/calendar.js"));
+            Page.RegisterHeadScriptFile("CalendarLanguage", WebUtils.CreateAbsolutePath(Page.ScriptsRoot, "Calendar/lang/calendar-" + Page.UserCulture.Name + ".js"));
+            Page.RegisterHeadScriptFile("CalendarSetup", WebUtils.CreateAbsolutePath(Page.ScriptsRoot,"Calendar/calendar-setup.js"));
+        }
+
+        /// <summary>
+        /// Gets a reference to the <see cref="Spring.Web.UI.Page"/> instance that contains the
+        /// server control.
+        /// </summary>
+        /// <value>
+		/// A reference to the <see cref="Spring.Web.UI.Page"/> instance that contains the
+		/// server control.
+        /// </value>
+        private new Page Page
+        {
+            get { return base.Page as Page; }
+        }
+
+        /// <summary>
+        /// The selected date.
+        /// </summary>
+        /// <value>The selected date.</value>
+        public DateTime SelectedDate
+        {
+            get
+            {
+                if (this.ViewState[SelectedDateViewStateKey] == null)
+                {
+                    return DateTime.Now;
+                }
+                return (DateTime) this.ViewState[SelectedDateViewStateKey];
+            }
+            set { this.ViewState[SelectedDateViewStateKey] = value; }
+        }
+
+        /// <summary>
+        /// The date format that is to be used.
+        /// </summary>
+        /// <value>A valid date format string.</value>
+        public string Format
+        {
+            get
+            {
+                if (this.ViewState[DateFormatViewStateKey] == null)
+                {
+                    return Thread.CurrentThread.CurrentCulture.DateTimeFormat.ShortDatePattern;
+                }
+                return (string) this.ViewState[DateFormatViewStateKey];
+            }
+            set { this.ViewState[DateFormatViewStateKey] = value; }
+        }
+
+        /// <summary>
+        /// Is direct editing of the date allowed?
+        /// </summary>
+        /// <value>
+        /// <see lang="true"/> if direct editing of the date is allowed?</value>
+        public bool AllowEditing
+        {
+        	get
+        	{
+        		if (this.ViewState[AllowEditingViewStateKey] == null)
+        		{
+        			return true;
+        		}
+        		return (bool) this.ViewState[AllowEditingViewStateKey];
+        	}
+        	set { this.ViewState[AllowEditingViewStateKey] = value; }
+        }
+
+    	/// <summary>
+    	/// The (CSS) style.
+    	/// </summary>
+    	/// <value>The style for the calendar.</value>
+    	public string Skin
+    	{
+    		get { return skin; }
+    		set { skin = value; }
+    	}
+
+    	/// <summary>
+    	/// Renders a hidden input field that stores the value for the radio button group.
+    	/// </summary>
+    	/// <param name="writer">
+    	/// <see cref="System.Web.UI.HtmlTextWriter"/> to use for rendering.
+    	/// </param>
+    	protected override void Render(HtmlTextWriter writer)
+    	{
+           writer.AddAttribute(HtmlTextWriterAttribute.Cellspacing, "0");
+           writer.AddAttribute(HtmlTextWriterAttribute.Cellpadding, "0");
+
+           writer.RenderBeginTag(HtmlTextWriterTag.Table);
+           writer.RenderBeginTag(HtmlTextWriterTag.Tr);                   
+           writer.RenderBeginTag(HtmlTextWriterTag.Td);
+           
+    	   RenderTextBox(writer);
+           
+    	   writer.RenderEndTag();            
+           writer.RenderBeginTag(HtmlTextWriterTag.Td);
+           
+    	   RenderButton(writer);
+           
+    	   writer.RenderEndTag();            
+           writer.RenderEndTag();
+           writer.RenderEndTag();
+
+           RenderSetupScript(writer);
+    	}
+
+    	private void RenderTextBox(HtmlTextWriter writer)
+    	{
+    	    writer.AddAttribute(HtmlTextWriterAttribute.Id, ClientID);    		
+    	    writer.AddAttribute(HtmlTextWriterAttribute.Type, "text");    	                
+    	    writer.AddAttribute(HtmlTextWriterAttribute.Name, UniqueID);    	    
+    	    writer.AddAttribute(HtmlTextWriterAttribute.Value, (SelectedDate != DateTime.MinValue ? SelectedDate.ToString(Format) : ""));
+    		    		
+    	    if (!AllowEditing)
+    		{
+                writer.AddAttribute(HtmlTextWriterAttribute.ReadOnly, "readonly");    			
+    		}
+    		base.AddAttributesToRender(writer);
+            
+            writer.RenderBeginTag(HtmlTextWriterTag.Input);    	    
+    		writer.RenderEndTag();
+    	}
+
+    	private void RenderButton(HtmlTextWriter writer)
+    	{
+    	    writer.AddAttribute(HtmlTextWriterAttribute.Id, ClientID + "_button");
+    	    writer.AddAttribute(HtmlTextWriterAttribute.Src, WebUtils.CreateAbsolutePath(Page.ScriptsRoot, "Calendar/img.gif"));
+            writer.AddAttribute(HtmlTextWriterAttribute.Border, "0");
+
+    	    writer.RenderBeginTag(HtmlTextWriterTag.Img);    	        		
+    	    writer.RenderEndTag();
+    	}
+
+    	private void RenderSetupScript(HtmlTextWriter writer)
+    	{    	    
+    		writer.AddAttribute("language", "javascript");    	
+    	    
+            writer.RenderBeginTag(HtmlTextWriterTag.Script);
+    		writer.WriteLine("Calendar.setup({");
+    		writer.WriteLine("    inputField : \"" + ClientID + "\",");
+    		writer.WriteLine("    button     : \"" + ClientID + "_button\"");
+    		writer.WriteLine("});");
+    		writer.RenderEndTag();
+    	}
+
+    	#region IPostBackDataHandler Members
+
+    	/// <summary>
+    	/// Raises the <c>SelectionChanged</c> event.
+    	/// </summary>
+    	public void RaisePostDataChangedEvent()
+    	{
+    		OnDateChanged(EventArgs.Empty);
+    	}
+
+    	/// <summary>
+    	/// Loads postback data into the control.
+    	/// </summary>
+    	/// <param name="postDataKey">
+    	/// The key that should be used to retrieve data.
+    	/// </param>
+    	/// <param name="postCollection">The postback data collection.</param>
+    	/// <returns><see lang="true"/> if data has changed.</returns>
+    	public bool LoadPostData(string postDataKey, NameValueCollection postCollection)
+    	{
+    		DateTime dateValue;
+    		string dateString = postCollection[postDataKey];
+    		if (StringUtils.HasText(dateString))
+    		{
+    			try
+    			{
+    				dateValue = DateTime.Parse(dateString);
+    			}
+    			catch (FormatException)
+    			{
+    				dateValue = DateTime.MinValue;
+    			}
+    		}
+    		else
+    		{
+    			dateValue = DateTime.MinValue;
+    		}
+    		bool changed = dateValue != this.SelectedDate;
+    		if (changed)
+    		{
+    			this.ViewState[SelectedDateViewStateKey] = dateValue;
+    		}
+    		return changed;
+    	}
+
+    	#endregion
+
+    	/// <summary>
+    	/// The method that is called on postback if the date has changed.
+    	/// </summary>
+    	/// <param name="e">
+    	/// The event argument (empty and unused).
+    	/// </param>
+    	protected virtual void OnDateChanged(EventArgs e)
+    	{
+    		EventHandler handler = (EventHandler) base.Events[EventDateChanged];
+    		if (handler != null)
+    		{
+    			handler(this, e);
+    		}
+    	}
+
+    	/// <summary>
+    	/// Occurs when the value of the radio button group changes between postbacks to the server.
+    	/// </summary>
+    	public event EventHandler DateChanged
+    	{
+    		add { base.Events.AddHandler(EventDateChanged, value); }
+    		remove { base.Events.RemoveHandler(EventDateChanged, value); }
+    	}
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxList.cs b/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxList.cs
new file mode 100644
index 00000000..293776a5
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxList.cs
@@ -0,0 +1,72 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System.Collections;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+	/// <summary>
+	///	Adds the <see cref="SelectedValues"/> property to the framework's <see cref="System.Web.UI.WebControls.CheckBoxList"/> control.
+	/// </summary>
+	/// <remarks>
+	/// When using Spring.Web's DataBinding, you should use this control for easier binding declaration.
+	/// </remarks>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: CheckBoxList.cs,v 1.2 2007/12/14 16:38:44 oakinger Exp $</version>
+	public class CheckBoxList : System.Web.UI.WebControls.CheckBoxList
+	{
+		/// <summary>
+		/// Gets or Sets the list of selected values and checks the <see cref="CheckBox"/>es accordingly
+		/// </summary>
+		public string[] SelectedValues
+		{
+			get
+			{
+				ArrayList vals = new ArrayList();
+				foreach( ListItem item in this.Items )
+				{
+					if (item.Selected) vals.Add(item.Value);
+				}
+				return (string[]) vals.ToArray(typeof (string));
+			}
+			set
+			{
+				if (value == null || value.Length == 0)
+				{
+					this.ClearSelection();
+				}
+				else
+				{
+					ArrayList vals = new ArrayList(value);
+					foreach(ListItem item in this.Items)
+					{
+						item.Selected = (vals.Contains(item.Value));
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxValidator.cs b/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxValidator.cs
new file mode 100644
index 00000000..09f35a02
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/CheckBoxValidator.cs
@@ -0,0 +1,111 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+	/// <summary>
+	/// This validator allows for validating a CheckBox's "Checked" state.
+	/// </summary>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: CheckBoxValidator.cs,v 1.1 2007/07/31 10:40:59 oakinger Exp $</version>
+	[ToolboxData("<{0}:RequiredCheckBoxValidator runat=\"server\" ErrorMessage=\"RequiredCheckBoxValidator\"></{0}:RequiredCheckBoxValidator>")]
+    public class RequiredCheckBoxValidator : AbstractBaseValidator
+    {
+		/// <summary>
+		/// Validates this validator's properties are set correctly.
+		/// </summary>
+		/// <returns></returns>
+        protected override bool ControlPropertiesValid()
+        {
+            string controlName = this.ControlToValidate;
+            if(controlName.Length == 0)
+            {
+                return base.ControlPropertiesValid();
+            }
+            return true;
+        }
+
+		/// <summary>
+		/// Returns the state of the checkbox's Checked property
+		/// </summary>
+		/// <returns></returns>
+        protected override bool EvaluateIsValid()
+        {
+            CheckBox controlToValidate = this.NamingContainer.FindControl(this.ControlToValidate) as CheckBox;
+            if(controlToValidate == null)
+            {
+                return false;
+            }
+
+            return controlToValidate.Checked;
+        }
+
+		/// <summary>
+		/// Adds attributes required for clientside validation
+		/// </summary>
+		/// <param name="writer"></param>
+        protected override void AddAttributesToRender(HtmlTextWriter writer)
+        {
+            base.AddAttributesToRender(writer);
+            if(base.RenderUplevel)
+            {
+                string controlId = this.ClientID;
+                writer = base.EnableLegacyRendering ? writer : null;
+                base.AddExpandoAttribute(writer, controlId, "evaluationfunction", "RequiredCheckBoxValidatorEvaluateIsChecked", false);
+                base.AddExpandoAttribute(writer, controlId, "initialvalue", "", true);
+            }
+        }
+
+		/// <summary>
+		/// Ensures the evaluation javascript functionblock is registered
+		/// </summary>
+		/// <param name="e"></param>
+        protected override void OnPreRender(EventArgs e)
+        {
+            base.OnPreRender(e);
+            if (!base.IsClientScriptBlockRegistered(typeof(RequiredCheckBoxValidator), "RequiredCheckBoxValidatorEvaluateIsChecked"))
+            {
+                base.RegisterClientScriptBlock(
+                    typeof(RequiredCheckBoxValidator)
+                    , "RequiredCheckBoxValidatorEvaluateIsChecked"
+                    ,
+@"
+<script type=""text/javascript"">
+function RequiredCheckBoxValidatorEvaluateIsChecked(val)
+{
+  var control;
+  control = document.getElementById(val.controltovalidate);
+  return control.checked;
+}
+</script>
+"
+                    );
+            }
+        }
+    }
+}
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Content.cs b/src/Spring/Spring.Web/Web/UI/Controls/Content.cs
new file mode 100644
index 00000000..0186e910
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/Content.cs
@@ -0,0 +1,63 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Web.UI;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// Represents Content control that can be used to populate or override placeholders
+    /// within the master page.
+    /// </summary>
+    /// <remarks>
+    /// Any content defined within this control will override default content
+    /// in the matching <see cref="Spring.Web.UI.Controls.ContentPlaceHolder"/> control
+    /// within the master page
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: Content.cs,v 1.6 2007/07/24 13:33:27 oakinger Exp $</version>
+#if NET_2_0
+	public class Content : System.Web.UI.WebControls.Content
+	{}
+#else
+    [Designer("System.Web.UI.Design.ReadWriteControlDesigner, System.Design")]
+    [PersistChildren(true)]
+    [ParseChildren(false)]
+    public class Content : Control
+    {
+        private String contentPlaceHolderID;
+
+        /// <summary>
+        /// Id of the <see cref="Spring.Web.UI.Controls.ContentPlaceHolder"/> to override.
+        /// </summary>
+        public String ContentPlaceHolderID
+        {
+            get { return contentPlaceHolderID; }
+            set { contentPlaceHolderID = value; }
+        }
+    }
+#endif
+}
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ContentPlaceholder.cs b/src/Spring/Spring.Web/Web/UI/Controls/ContentPlaceholder.cs
new file mode 100644
index 00000000..3cbf459e
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/ContentPlaceholder.cs
@@ -0,0 +1,75 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.ComponentModel;
+using System.Web.UI;
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// Represents ContentPlaceHolder control that can be used to define placeholders
+    /// within the master page.
+    /// </summary>
+    /// <remarks>
+    /// Any content defined within this control will be treated as a default content 
+    /// for the placeholder and will be rendered unless the child page overrides it
+    /// by defining matching <see cref="Spring.Web.UI.Controls.Content"/> control.
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ContentPlaceholder.cs,v 1.6 2006/09/08 06:21:31 oakinger Exp $</version>
+#if NET_2_0
+	public class ContentPlaceHolder : System.Web.UI.WebControls.ContentPlaceHolder
+	{}
+#else
+    [Designer("System.Web.UI.Design.ReadWriteControlDesigner, System.Design")]
+    [PersistChildren(true)]
+    [ParseChildren(false)]
+    public class ContentPlaceHolder : Control
+    {
+        private Content content;
+
+        /// <summary>
+        /// Association to content control defined in the child page
+        /// </summary>
+        public Content Content
+        {
+            get { return content; }
+            set { content = value; }
+        }
+
+        /// <summary>
+        /// Renders either its own (default) content or content defined if the associated
+        /// <see cref="Spring.Web.UI.Controls.Content"/> control.
+        /// </summary>
+        /// <param name="writer">HtmlTextWriter that should be used for output</param>
+        protected override void Render(HtmlTextWriter writer)
+        {
+            if (content == null)
+            {
+                base.Render(writer);
+            }
+            else
+            {
+                content.RenderControl(writer);
+            }
+        }
+    }
+#endif	
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs b/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs
new file mode 100644
index 00000000..9d74e543
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs
@@ -0,0 +1,157 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+using System.Web.UI;
+using Common.Logging;
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// Represents Content control that can be used to populate or override placeholders
+    /// anywhere within the page.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Any content defined within this control will override default content
+    /// in the matching control specified by <see cref="ContentPlaceHolderID"/> anywhere
+    /// within the page.
+    /// </para>
+    /// <para>
+    /// In contrast to <see cref="Content"/> control, ContentReplacer can replace the content of 
+    /// any control within the current page - it is not limited to replacing ContentPlaceholders on master pages.
+    /// </para>
+    /// <para>
+    /// This technique is useful if you want to group e.g. rendering navigation elements on 1 ascx control, but your 
+    /// design requires navigation elements to be distributed across different places within the HTML code.
+    /// </para>
+    /// </remarks>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ContentReplacer.cs,v 1.3 2007/07/24 13:33:27 oakinger Exp $</version>
+    public class ContentReplacer : Control
+    {
+        private static readonly ILog log = LogManager.GetLogger(typeof(ContentReplacer));
+
+        private string contentPlaceHolderID;
+
+        /// <summary>
+        /// Specifies the unique id of the control, who's content is to be replaced.
+        /// </summary>
+        public string ContentPlaceHolderID
+        {
+            get { return contentPlaceHolderID; }
+            set { contentPlaceHolderID = value; }
+        }
+
+        /// <summary>
+        /// Overriden to correctly redirect rendermethod calls.
+        /// </summary>
+        protected override void OnPreRender(EventArgs e)
+        {
+            base.OnPreRender(e);
+
+			// if our container is not visible, don't replace placeholder's content
+			if (!Visible) return;
+
+            //log.Debug(string.Format("OnPreRender Content['{0}']", this.contentPlaceHolderID));
+#if NET_1_1
+            Control ctlRoot = this.Page;
+            if (ctlRoot is Spring.Web.UI.Page)
+            {
+				MasterPage masterPage = ((Spring.Web.UI.Page) ctlRoot).Master;
+				if (masterPage != null)
+				{
+					ctlRoot = masterPage;
+				}
+            }
+#else
+            Control ctlRoot = (this.Page.Master != null) ? (Control)this.Page.Master : (Control)this.Page;
+#endif
+            Control ctl = ctlRoot.FindControl(this.contentPlaceHolderID);
+            if (ctl != null)
+            {
+                log.Debug(string.Format("OnPreRender Content['{0}'] found placeholder - replacing RenderMethod",this.contentPlaceHolderID));
+
+                RenderMethod myRenderMethod = GetRenderMethod();
+                //log.Debug(string.Format("OnPreRender Content['{0}'] renderMethod found={1}", this.contentPlaceHolderID,(myRenderMethod != null ? "true" : "false")));
+
+                // prevent content control from rendering itself
+                this.SetRenderMethodDelegate(new RenderMethod(RenderNothing));
+                if (myRenderMethod == null)
+                {
+                    myRenderMethod = new RenderMethod(RenderChildControls);
+                }
+                // instead replace placeholder's rendermethod to render this control's content
+                ctl.SetRenderMethodDelegate(myRenderMethod);
+            }
+            else
+            {
+                throw new ArgumentException(string.Format("No ContentPlaceHolder with id '{0}' defined on this page.", this.contentPlaceHolderID));
+            }
+        }
+
+        /// <summary>
+        /// Renders child controls
+        /// </summary>
+        private void RenderChildControls(HtmlTextWriter output, Control container)
+        {
+            if (this.HasControls())
+            {
+                foreach (Control ctl in this.Controls)
+                {
+                    ctl.RenderControl(output);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Render nothing.
+        /// </summary>
+        private void RenderNothing(HtmlTextWriter output, Control container)
+        {
+            // do nothing
+        }
+
+#if NET_2_0
+        private static readonly PropertyInfo piRareFieldsEnsured =
+            typeof(Control).GetProperty("RareFieldsEnsured", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static readonly FieldInfo fiRenderMethod = 
+            typeof(Control).GetNestedType("ControlRareFields",BindingFlags.NonPublic).GetField("RenderMethod");
+
+        private RenderMethod GetRenderMethod()
+        {
+            object o = piRareFieldsEnsured.GetValue(this, null);
+            RenderMethod myRenderMethod = (RenderMethod) fiRenderMethod.GetValue(o);
+            return myRenderMethod;
+        }
+#else
+        private static readonly FieldInfo fiRenderMethod = 
+            typeof(Control).GetField("_renderMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+
+        private RenderMethod GetRenderMethod()
+        {
+            RenderMethod myRenderMethod = (RenderMethod)fiRenderMethod.GetValue(this);
+            return myRenderMethod;
+        }
+#endif
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ControlState.cs b/src/Spring/Spring.Web/Web/UI/Controls/ControlState.cs
new file mode 100644
index 00000000..9aa16ec2
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/ControlState.cs
@@ -0,0 +1,45 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+#if !NET_2_0
+	/// <summary>
+	/// Enumeration representing a control's current initialization state.
+	/// </summary>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: ControlState.cs,v 1.1 2007/07/24 13:33:27 oakinger Exp $</version>
+	internal enum ControlState
+	{
+		Constructed,
+		ChildrenInitialized,
+		Initialized,
+		ViewStateLoaded,
+		Loaded,
+		PreRendered
+	}
+#endif //!NET_2_0
+}
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/DataBindingAdapter.cs b/src/Spring/Spring.Web/Web/UI/Controls/DataBindingAdapter.cs
new file mode 100644
index 00000000..59c234b3
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/DataBindingAdapter.cs
@@ -0,0 +1,52 @@
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// May be used to wrap controls for databinding that don't accept unknown attributes.
+    /// </summary>
+    [ParseChildren(false)]
+    public class DataBindingAdapter : WebControl
+    {
+        private Control wrappedControl;
+
+        /// <summary>
+        /// Overridden to ensure only 1 control is wrapped by this adapter
+        /// </summary>
+        /// <param name="obj"></param>
+        protected override void AddParsedSubObject(object obj)
+        {
+            if(obj is Control && (wrappedControl == null) && (!(obj is LiteralControl)))
+            {
+                wrappedControl = (Control) obj;
+                this.Controls.Add(wrappedControl);
+            }
+            else if(!(obj is LiteralControl))
+            {
+                throw new HttpException(
+                    string.Format("DataBindingAdapter can only have 1 non-literal child", new object[] { obj.GetType().Name }));
+            }
+        }
+
+		/// <summary>
+		/// Returns the control wrapped by this adapter or null.
+		/// </summary>
+        public Control WrappedControl
+        {
+            get { return this.wrappedControl; }
+        }
+
+		/// <summary>
+		/// Overridden to render wrapped control only.
+		/// </summary>
+        protected override void Render(HtmlTextWriter writer)
+        {
+            if (wrappedControl != null)
+            {
+                wrappedControl.RenderControl(writer);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs b/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs
new file mode 100644
index 00000000..9de9efc0
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs
@@ -0,0 +1,383 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Reflection;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+using Common.Logging;
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.DataBinding;
+using Spring.Globalization;
+using Spring.Objects;
+using Spring.Util;
+using AttributeCollection=System.Web.UI.AttributeCollection;
+using BindingDirection=Spring.DataBinding.BindingDirection;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// Any WebControl placed on a DataBindingPanel may be bound 
+    /// to a model by adding an attribute "BindingTarget"
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: DataBindingPanel.cs,v 1.13 2008/03/06 20:23:44 oakinger Exp $</version>
+    [PersistChildren(true),
+    ToolboxData("<{0}:DataBindingPanel runat=\"server\" Width=\"125px\" Height=\"50px\"> </{0}:DataBindingPanel>"), 
+    ParseChildren(false),
+#if NET_1_1
+    Designer("System.Web.UI.Design.WebControls.PanelDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), 
+#else
+    Designer("System.Web.UI.Design.WebControls.PanelContainerDesigner, System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), 
+#endif
+    AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal), 
+    AspNetHostingPermission(SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    public class DataBindingPanel : Panel
+    {
+        private const string ATTR_BINDINGTARGET = "BindingTarget";
+        private const string ATTR_BINDINGSOURCE = "BindingSource";
+        private const string ATTR_BINDINGDIRECTION = "BindingDirection";
+        private const string ATTR_BINDINGFORMATTER = "BindingFormatter";
+        private const string ATTR_BINDINGTYPE = "BindingType";
+        private const string ATTR_MESSAGEID = "MessageId";
+        private const string ATTR_ERRORPROVIDERS = "ErrorProviders";
+
+        private static readonly ILog Log = LogManager.GetLogger(typeof(DataBindingPanel));
+
+        private delegate void TraversalAction(IWebDataBound bindingContainer, WebControl wc);
+
+        /// <summary>
+        /// Registers this control for the <see cref="UserControl.DataBindingsInitialized"/> event of it's container.
+        /// </summary>
+        protected override void OnInit(EventArgs e)
+        {
+            RegisterDataControl(this, new EventHandler(BindingOwner_DataBindingsInitialized));
+            base.OnInit(e);
+        }
+
+        /// <summary>
+        /// Overridden to remove custom binding attributes before rendering.
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPreRender(EventArgs e)
+        {
+            // remove custom attributes
+            if (this.HasControls())
+            {
+                this.TraverseControls(null, this.Controls, new TraversalAction(this.RemoveBindingAttributes));
+            }
+
+            base.OnPreRender(e);
+        }
+
+        /// <summary>
+        /// Overriden to suppress rendering this control's tag
+        /// </summary>
+        /// <param name="writer"></param>
+        protected override void Render(HtmlTextWriter writer)
+        {
+            base.RenderContents(writer);
+        }
+
+        /// <summary>
+        /// Called by the containing <see cref="UserControl"/> if bindings must be initialized.
+        /// </summary>
+        private void BindingOwner_DataBindingsInitialized(object sender, EventArgs e)
+        {
+            IWebDataBound bindingContainer = (IWebDataBound) sender;
+            if (this.HasControls())
+            {
+                this.TraverseControls(bindingContainer, this.Controls, new TraversalAction(this.BindControl));
+            }
+        }
+
+        /// <summary>
+        /// Adds all controls on this panel to the containing <see cref="UserControl.BindingManager"/>'s binding collection.
+        /// </summary>
+        /// <param name="bindingContainer">the usercontrol containing this panel</param>
+        /// <param name="controls">the <see cref="ControlCollection"/> of controls to be bound</param>
+        /// <param name="action">action to be performed on matching controls</param>
+        private void TraverseControls(IWebDataBound bindingContainer, ControlCollection controls, TraversalAction action)
+        {
+            foreach (Control control in controls)
+            {
+                // DataBindingPanels must not be nested
+                if (control is DataBindingPanel)
+                {
+                    throw new HttpException("Controls of type DataBindingPanel must not be nested");
+                }
+
+                // abort recursion on LiteralControl or nested UserControl
+                if (control is LiteralControl
+                    || control is UserControl)
+                {
+                    continue;
+                }
+
+                // if it's a WebControl, check for binding-related attributes
+                WebControl wc = control as WebControl;
+                if (wc != null)
+                {
+                    try
+                    {
+                        action(bindingContainer, wc);
+                    }
+                    catch (Exception ex)
+                    {
+                        string msg =
+                            string.Format("Error executing action on control '{0}' of type '{1}'", wc.UniqueID,
+                                          wc.GetType().FullName);
+                        Log.Error(msg, ex);
+                        throw new HttpException(msg, ex);
+                    }
+                }
+
+                if (control.HasControls())
+                {
+                    this.TraverseControls(bindingContainer, control.Controls, action);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Retrieves custom binding attributes from a webcontrol and adds a new binding
+        /// instance to the container's <see cref="UserControl.BindingManager"/> if necessary.
+        /// </summary>
+        private void BindControl(IWebDataBound dataBound, WebControl theControl)
+        {
+            // special handling of adapted controls
+            DataBindingAdapter adapterControl = theControl as DataBindingAdapter;
+
+            Control wc = (adapterControl != null && adapterControl.WrappedControl != null) ? adapterControl.WrappedControl : theControl;
+
+            AttributeCollection attributeCollection = theControl.Attributes;
+            string bindingTarget = attributeCollection[ATTR_BINDINGTARGET];
+
+            // at least a BindingTarget must be specified
+            if (bindingTarget == null)
+            {
+                return;
+            }
+            attributeCollection.Remove(ATTR_BINDINGTARGET);
+
+            // determine direction
+            BindingDirection bindingDirection = BindingDirection.Bidirectional;
+            string strBindingDirection = attributeCollection[ATTR_BINDINGDIRECTION];
+            if (strBindingDirection != null)
+            {
+                bindingDirection = (BindingDirection) Enum.Parse(typeof(BindingDirection), strBindingDirection);
+            }
+
+            // determine BindingSource
+            string bindingSource = attributeCollection[ATTR_BINDINGSOURCE];
+            if (bindingSource == null)
+            {
+                bindingSource = AutoProbeSourceProperty(wc);
+            }
+            attributeCollection.Remove(ATTR_BINDINGSOURCE);
+
+            // get formatter if any
+            IFormatter bindingFormatter = null;
+            string bindingFormatterName = attributeCollection[ATTR_BINDINGFORMATTER];
+            if (bindingFormatterName != null)
+            {
+                bindingFormatter = (IFormatter) dataBound.ApplicationContext.GetObject(bindingFormatterName);
+                attributeCollection.Remove(ATTR_BINDINGFORMATTER);
+            }
+
+            // determine source expression
+            string containerName = dataBound.UniqueID;
+            string controlName = wc.UniqueID;
+            string relativeControlName = null;
+            if ( dataBound is System.Web.UI.Page )
+            {
+                relativeControlName = string.Format("FindControl('{0}')", controlName);
+            }
+            else if ( (Control)dataBound != this.NamingContainer)
+            {
+                relativeControlName = (controlName.StartsWith(containerName)) ? controlName.Substring(containerName.Length + 1) : controlName;
+                relativeControlName = string.Format("FindControl('{0}')", relativeControlName);
+            }
+            else
+            {
+                relativeControlName = wc.ID;
+            }
+            // if no bindingSource, expression evaluates to the bound control
+            bindingSource = (StringUtils.HasLength(bindingSource))
+                                ? relativeControlName + "." + bindingSource
+                                : relativeControlName;
+
+            Log.Debug(
+                string.Format("binding control '{0}' relative to '{1}' using expression '{2}'", controlName,
+                              containerName, bindingSource));
+
+            //get bindingType if any
+            IBinding binding = null;
+            string bindingTypeName = attributeCollection[ATTR_BINDINGTYPE];
+            if (bindingTypeName == null)
+            {
+                bindingTypeName = AutoProbeBindingType(wc);
+            }
+
+            // get messageId and errorProviders list
+            string messageId = attributeCollection[ATTR_MESSAGEID];
+            string errorProvidersText = attributeCollection[ATTR_ERRORPROVIDERS];
+            string[] errorProviders = null;
+            if (StringUtils.HasLength(errorProvidersText))
+            {
+                errorProviders = (string[])new Spring.Core.TypeConversion.StringArrayConverter().ConvertFrom(errorProvidersText);
+            }
+
+            // add binding to BindingManager
+            if (bindingTypeName != null)
+            {
+                binding = CreateBindingInstance(bindingTypeName, bindingSource, bindingTarget, bindingDirection, bindingFormatter);
+                binding = dataBound.BindingManager.AddBinding(binding);
+            }
+            else
+            {
+                binding = dataBound.BindingManager.AddBinding(bindingSource, bindingTarget, bindingDirection, bindingFormatter);
+            }
+
+            // set error message
+            if (StringUtils.HasLength(messageId))
+            {
+                binding.SetErrorMessage( messageId, errorProviders );
+            }
+        }
+
+        /// <summary>
+        /// Removes custom binding attributes from a webcontrol to avoid them being rendered.
+        /// </summary>
+        private void RemoveBindingAttributes(IWebDataBound dataBound, WebControl wc)
+        {
+            AttributeCollection attributeCollection = wc.Attributes;
+            attributeCollection.Remove(ATTR_BINDINGTARGET);
+            attributeCollection.Remove(ATTR_BINDINGSOURCE);
+            attributeCollection.Remove(ATTR_BINDINGTYPE);
+            attributeCollection.Remove(ATTR_BINDINGFORMATTER);
+        }
+
+        /// <summary>
+        /// Probe for bindingType of know controls
+        /// </summary>
+        /// <param name="wc">the control, who's bindingType is to be determined</param>
+        /// <returns>null, if standard binding is to be used or the fully qualified typename of the binding implementation</returns>
+        protected virtual string AutoProbeBindingType(Control wc)
+        {
+            if (wc is ListBox && ((ListBox) wc).SelectionMode == ListSelectionMode.Multiple)
+            {
+                return typeof(MultipleSelectionListControlBinding).FullName;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Probes for a few know controls and their properties.
+        /// </summary>
+        /// <returns>
+        /// The 'BindingSource' expression to be used for binding this control.
+        /// </returns>
+        protected virtual string AutoProbeSourceProperty(Control wc)
+        {
+            if (wc is ListBox && ((ListBox) wc).SelectionMode == ListSelectionMode.Multiple)
+            {
+                return null; // force evaluate to control itself
+            }
+            else if (wc is CheckBoxList)
+            {
+                return "SelectedValues";
+            }
+            else if (wc is ListControl)
+            {
+                return "SelectedValue";
+            }
+            else if (wc is CheckBox)
+            {
+                return "Checked";
+            }
+            else if (wc is TextBox)
+            {
+                return "Text";
+            }
+#if NET_2_0
+            else if (wc is HiddenField)
+            {
+                return "Value";
+            }
+#endif
+            else if (wc is RadioButtonGroup)
+            {
+                return "Value";
+            }
+            else if (wc is DataBindingAdapter)
+            {
+                throw new ArgumentNullException("Attribute 'BindingSource' is mandatory when using DataBindingAdapter");
+            }
+
+            throw new ArgumentNullException("Attribute 'BindingSource' is missing and control is of unknown type");
+        }
+
+        private static IBinding CreateBindingInstance(string bindingTypeName, string bindingSource, string bindingTarget, BindingDirection bindingDirection, IFormatter bindingFormatter)
+        {
+            IBinding binding;
+            Type bindingType = TypeResolutionUtils.ResolveType(bindingTypeName);
+            ConstructorInfo ctor =
+                bindingType.GetConstructor(new Type[] {typeof(string), typeof(string), typeof(BindingDirection), typeof(IFormatter)});
+
+            if (ctor == null)
+            {
+                throw new ArgumentException(string.Format("Specified BindingType '{0}' does not implement constructor (string,string,BindingDirection,IFormatter)",bindingTypeName));
+            }
+            binding =
+                (IBinding)
+                ObjectUtils.InstantiateType(ctor, new object[] {bindingSource, bindingTarget, bindingDirection, bindingFormatter});
+            return binding;
+        }
+
+        private static void RegisterDataControl(Control control, EventHandler initializeBindingHandler)
+        {
+            GetBindingContainerControl(control).DataBindingsInitialized += initializeBindingHandler;
+        }
+
+        private static IWebDataBound GetBindingContainerControl(Control control)
+        {
+            Control parent = control;
+            while (parent != null)
+            {
+                if (parent is IWebDataBound)
+                {
+                    return (IWebDataBound) parent;
+                }
+                parent = parent.Parent;
+            }
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Form.cs b/src/Spring/Spring.Web/Web/UI/Controls/Form.cs
new file mode 100644
index 00000000..37dca733
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/Form.cs
@@ -0,0 +1,118 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// This control allows for suppressing output of the 'action' attribute.
+    /// </summary>
+    /// <remarks>
+    /// the 'action' attribute rendered by the default <see cref="HtmlForm"/> control causes troubles 
+    /// in case of URL-rewriting. See e.g. <a href="http://www.thescripts.com/forum/thread408777.html">'thescripts.com' forum</a>
+    /// and also <a href="http://opensource.atlassian.com/projects/spring/browse/SPRNET-560">JIRA SPRNET-560</a> for more info.
+    /// </remarks>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: Form.cs,v 1.1 2007/07/24 14:32:58 oakinger Exp $</version>
+    public class Form : HtmlForm
+    {
+        private bool suppressAction = false;
+        private string action = null;
+
+        /// <summary>
+        /// Sets or Gets a value indicating if the 'action' attribute shall be rendered. Defaults to 'false'
+        /// </summary>
+        /// <remarks>
+        /// The following possibilites are available:
+        /// <list>
+        /// <item>If <see cref="SuppressAction"/> is 'true', rendering of the 'action' attribute is suppressed.</item>
+        /// <item>If <see cref="SuppressAction"/> is 'false' and <see cref="Action"/> is not set,
+        ///       'action' attribute will.be rendered to <see cref="HttpRequest.RawUrl"/>
+        /// </item>
+        /// <item>If <see cref="SuppressAction"/> is 'false' and <see cref="Action"/> is set,
+        ///       'action' attribute will.be rendered to <see cref="Action"/>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        public bool SuppressAction
+        {
+            get { return this.suppressAction; }
+            set { this.suppressAction = value; }
+        }
+
+        /// <summary>
+        /// Sets or Gets an explicit url to be rendered
+        /// </summary>
+        /// <remarks>
+        /// The url specified here is only rendered, if <see cref="SuppressAction"/> is true.
+        /// </remarks>
+        public string Action
+        {
+            get { return this.action; }
+            set { this.action = value; }
+        }
+
+        /// <summary>
+        /// Renders attributes but performs 'action' suppressing logic.
+        /// </summary>
+        /// <param name="writer"></param>
+        protected override void RenderAttributes(HtmlTextWriter writer)
+        {
+            base.RenderAttributes(new ActionSupressingHtmlTextWriter(writer));
+            if (!this.suppressAction)
+            {
+                string url = (StringUtils.HasText(this.action)) ? this.action : Context.Request.RawUrl;
+                writer.WriteAttribute("action", url, true);
+            }
+        }
+
+        #region Nested type: ActionSupressingHtmlTextWriter
+
+        /// <summary>
+        /// This wrapper suppresses output of 'action' attributes.
+        /// </summary>
+        private class ActionSupressingHtmlTextWriter : HtmlTextWriter
+        {
+            public ActionSupressingHtmlTextWriter(HtmlTextWriter wrappedWriter)
+                : base(wrappedWriter.InnerWriter)
+            {
+            }
+
+            public override void WriteAttribute(string name, string value, bool fEncode)
+            {
+                if (string.Compare(name, "action", true) != 0)
+                {
+                    base.WriteAttribute(name, value, fEncode);
+                }
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Head.cs b/src/Spring/Spring.Web/Web/UI/Controls/Head.cs
new file mode 100644
index 00000000..fc55867c
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/Head.cs
@@ -0,0 +1,189 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.IO;
+using System.Web.UI;
+using Spring.Util;
+using Spring.Web.Support;
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// This control should be used instead of standard HTML <c>head</c> tag
+    /// in order to render dynamicaly registered head scripts and stylesheets.
+    /// </summary>
+    /// <remarks>
+    /// If you need to use ASP.NETs built-in &lt;head&gt; tag, you should nest Spring's <see cref="Head"/> within ASP.NET's:
+    /// <example>
+    /// &lt;html&gt;
+    ///   &lt;head&gt;
+    ///     &lt;title&gt;Some Title&lt;/title&gt;
+    ///     &lt;spring:head&gt;
+    ///         &lt;-- will render styleblocks etc. here --&gt;
+    ///     &lt;/spring:head&gt;
+    ///   &lt;/head&gt;
+    /// &lt;/html&gt;
+    /// </example>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: Head.cs,v 1.8 2007/11/28 23:26:19 oakinger Exp $</version>
+    public class Head : Control
+    {
+        private string _defaultStyleType = "text/css";
+
+        /// <summary>
+        /// Gets or sets the default mimetype for the &lt;style&gt; element's 'type' attribute
+        /// </summary>
+        /// <remarks>
+        /// Defaults to "text/css"
+        /// </remarks>
+        public string DefaultStyleType
+        {
+            get { return _defaultStyleType; }
+            set { _defaultStyleType = value; }
+        }
+
+        /// <summary>
+        /// Gets a reference to the <see cref="T:Spring.Web.UI.Page"/> instance that contains the
+        /// server control.
+        /// </summary>
+        /// <value></value>
+        private new Page Page
+        {
+            get { return base.Page as Page; }
+        }
+
+        /// <summary>
+        /// Sends server control content to a provided <see cref="T:System.Web.UI.HtmlTextWriter"/> object, which writes the content to
+        /// be rendered on
+        /// the client.
+        /// </summary>
+        /// <param name="writer">The <see langword="HtmlTextWriter"/> object that receives the server control content.</param>
+        protected override void Render(HtmlTextWriter writer)
+        {
+#if NET_1_1
+            bool hasIntrinsicHead = false;
+#else
+            bool hasIntrinsicHead = (this.Page.Header != null);
+#endif
+            // don't render begin/end element if we are nested within an ASP.NET <head> control
+            if (!hasIntrinsicHead)
+            {
+                writer.RenderBeginTag(HtmlTextWriterTag.Head);
+            }
+
+            RenderChildren(writer);
+            RenderStyleBlocks(writer);
+            RenderStyleFiles(writer);
+            RenderHeadScripts(writer);
+
+            if (!hasIntrinsicHead)
+            {
+                writer.RenderEndTag();
+            }
+        }
+
+        private void RenderStyleBlocks(HtmlTextWriter writer)
+        {
+            if (Page.Styles.Count > 0)
+            {
+                writer.AddAttribute(HtmlTextWriterAttribute.Type, _defaultStyleType);
+                writer.RenderBeginTag(HtmlTextWriterTag.Style);
+
+                foreach (DictionaryEntry style in Page.Styles)
+                {
+                    writer.WriteLine(style.Key + " { " + style.Value + " }");
+                }
+                writer.RenderEndTag();
+            }
+        }
+
+        private void RenderStyleFiles(HtmlTextWriter writer)
+        {
+            foreach (DictionaryEntry file in Page.StyleFiles)
+            {
+                writer.AddAttribute("rel", "stylesheet");
+                writer.AddAttribute(HtmlTextWriterAttribute.Type, "text/css");
+                writer.AddAttribute(HtmlTextWriterAttribute.Href, WebUtils.CreateAbsolutePath(Page.CssRoot, (string)file.Value));
+
+                writer.RenderBeginTag(HtmlTextWriterTag.Link);
+                writer.RenderEndTag();
+            }
+        }
+
+        private void RenderHeadScripts(HtmlTextWriter writer)
+        {
+            foreach (DictionaryEntry scriptEntry in Page.HeadScripts)
+            {
+                object script = scriptEntry.Value;
+                if (script is ScriptEvent)
+                {
+                    RenderScriptEvent(writer, script as ScriptEvent);
+                }
+                else if (script is ScriptFile)
+                {
+                    RenderScriptFile(writer, script as ScriptFile);
+                }
+                else if (script is ScriptBlock)
+                {
+                    RenderScriptBlock(writer, script as ScriptBlock);
+                }
+            }
+        }
+
+        private void RenderScriptBlock(HtmlTextWriter writer, ScriptBlock script)
+        {
+            RenderCommonScriptAttributes(writer, script);
+            writer.RenderBeginTag(HtmlTextWriterTag.Script);
+            writer.WriteLine(script.Script);
+            writer.RenderEndTag();
+        }
+
+        private void RenderScriptFile(HtmlTextWriter writer, ScriptFile script)
+        {
+            RenderCommonScriptAttributes(writer, script);
+            writer.AddAttribute(HtmlTextWriterAttribute.Src, WebUtils.CreateAbsolutePath(Page.ScriptsRoot, script.FileName));
+
+            writer.RenderBeginTag(HtmlTextWriterTag.Script);
+            writer.RenderEndTag();
+        }
+
+        private void RenderScriptEvent(HtmlTextWriter writer, ScriptEvent script)
+        {
+            RenderCommonScriptAttributes(writer, script);
+            writer.AddAttribute(HtmlTextWriterAttribute.For, script.Element);
+            writer.AddAttribute("event", script.EventName);
+
+            writer.RenderBeginTag(HtmlTextWriterTag.Script);
+            writer.WriteLine(script.Script);
+            writer.RenderEndTag();
+        }
+
+        private void RenderCommonScriptAttributes(HtmlTextWriter writer, Script script)
+        {
+            if (StringUtils.HasLength(script.Language))
+            {
+                writer.AddAttribute("language", script.Language);
+            }
+            writer.AddAttribute("type", script.Type.ToString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/LocalizedImage.cs b/src/Spring/Spring.Web/Web/UI/Controls/LocalizedImage.cs
new file mode 100644
index 00000000..8977b0d3
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/LocalizedImage.cs
@@ -0,0 +1,85 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.IO;
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// This control should be used instead of standard HTML <c>head</c> tag
+    /// in order to render dynamicaly registered head scripts and stylesheets.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: LocalizedImage.cs,v 1.4 2006/05/18 21:37:52 markpollack Exp $</version>
+    public class LocalizedImage : System.Web.UI.WebControls.Image
+    {
+        private string imageName;
+
+        /// <summary>
+        /// Tries to determine full URL for the localized image before it's rendered.
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPreRender(EventArgs e)
+        {
+            base.OnPreRender(e);
+            this.ImageUrl = DetermineLocalizedUrl();
+        }
+
+        /// <summary>
+        /// Name of the image file.
+        /// </summary>
+        public string ImageName
+        {
+            get { return imageName; }
+            set { imageName = value; }
+        }
+
+        /// <summary>
+        /// Gets a reference to the <see cref="T:Spring.Web.UI.Page"/> instance that contains the
+        /// server control.
+        /// </summary>
+        /// <value></value>
+        new private Page Page
+        {
+            get { return base.Page as Page; }
+        }
+
+        private string DetermineLocalizedUrl()
+        {
+            ArrayList localeParts = new ArrayList(Page.UserCulture.Name.Split('-'));
+            while (localeParts.Count > 0 && !FileExists(localeParts))
+            {
+                localeParts.RemoveAt(localeParts.Count - 1);
+            }
+
+            string locale = String.Join("-", (string[]) localeParts.ToArray(typeof(string)));
+            return Page.ImagesRoot + (locale.Length > 0 ? "/" + locale : "") + "/" + this.ImageName;
+        }
+
+        private bool FileExists(ArrayList localeParts)
+        {
+            string locale = String.Join("-", (string[]) localeParts.ToArray(typeof(string)));
+            string url = Page.ImagesRoot + "/" + locale + "/" + this.ImageName;
+            return File.Exists(Page.Server.MapPath(url));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/MultiView.cs b/src/Spring/Spring.Web/Web/UI/Controls/MultiView.cs
new file mode 100644
index 00000000..e6cf94bb
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/MultiView.cs
@@ -0,0 +1,448 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Reflection;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+#if !NET_2_0
+	/// <summary>
+	/// This controls provides MultiView introduced with ASP.NET 2.0 for NET 1.1 Platform
+	/// </summary>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: MultiView.cs,v 1.1 2007/07/24 13:33:27 oakinger Exp $</version>
+	[
+		DefaultEvent("ActiveViewChanged")
+			, ToolboxData("<{0}:MultiView runat=\"server\"></{0}:MultiView>")
+			, ParseChildren(false, null)
+			, AspNetHostingPermission(SecurityAction.LinkDemand, Level=AspNetHostingPermissionLevel.Minimal)
+			, AspNetHostingPermission(SecurityAction.InheritanceDemand, Level=AspNetHostingPermissionLevel.Minimal)]
+	public class MultiView : Control
+	{
+		#region Constants
+
+		/// <summary>
+		/// Represents the command name associated with the next View control to display in a MultiView control. This field is read-only.
+		/// </summary>
+		public static readonly string NextViewCommandName = "NextView";
+		/// <summary>
+		/// Represents the command name associated with the previous View control to display in a MultiView control. This field is read-only.
+		/// </summary>
+		public static readonly string PreviousViewCommandName = "PrevView";
+		/// <summary>
+		/// Represents the command name associated with changing the active View control in a MultiView control, based on a specified View id. This field is read-only.
+		/// </summary>
+		public static readonly string SwitchViewByIDCommandName = "SwitchViewByID";
+		/// <summary>
+		/// Represents the command name associated with changing the active View control in a MultiView control based on a specified View index. This field is read-only.
+		/// </summary>
+		public static readonly string SwitchViewByIndexCommandName = "SwitchViewByIndex";
+
+		#endregion
+
+		#region Fields
+
+		private static readonly FieldInfo s_fiControlState =
+			typeof(Control).GetField("_controlState", BindingFlags.Instance | BindingFlags.NonPublic);
+
+
+		private int _activeViewIndex = -1;
+		private int _cachedActiveViewIndex = -1;
+		private bool _controlStateApplied;
+		private static readonly object _eventActiveViewChanged = new object();
+		private bool _ignoreBubbleEvents;
+
+		#endregion
+
+		#region Construction
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="MultiView"/> class.
+		/// </summary>
+		public MultiView()
+		{
+			// intentionally left empty
+		}
+
+		#endregion
+
+		#region Events
+
+		/// <summary>
+		/// Occurs when the active View control of a MultiView control changes between posts to the server.
+		/// </summary>
+		public event EventHandler ActiveViewChanged
+		{
+			add { base.Events.AddHandler(_eventActiveViewChanged, value); }
+			remove { base.Events.RemoveHandler(_eventActiveViewChanged, value); }
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets or sets the index of the active View control within a MultiView control.
+		/// </summary>
+		[DefaultValue(-1)]
+		public virtual int ActiveViewIndex
+		{
+			get
+			{
+				if (_cachedActiveViewIndex > -1)
+				{
+					return _cachedActiveViewIndex;
+				}
+				return _activeViewIndex;
+			}
+			set
+			{
+				if (value < -1)
+				{
+					throw new ArgumentOutOfRangeException("value",
+						string.Format(
+						"MultiView_ActiveViewIndex_less_than_minus_one",
+						new object[] {value}));
+				}
+				if ((Views.Count == 0) && (ControlState < ControlState.ChildrenInitialized))
+				{
+					_cachedActiveViewIndex = value;
+				}
+				else
+				{
+					if (value >= Views.Count)
+					{
+						throw new ArgumentOutOfRangeException("value",
+							string.Format(
+							"MultiView_ActiveViewIndex_equal_or_greater_than_count",
+							new object[] {value, Views.Count}));
+					}
+					int num = (_cachedActiveViewIndex != -1) ? -1 : _activeViewIndex;
+					_activeViewIndex = value;
+					_cachedActiveViewIndex = -1;
+					if (((num != value) && (num != -1)) && (num < Views.Count))
+					{
+						Views[num].Active = false;
+						if (ShouldTriggerViewEvent)
+						{
+							Views[num].OnDeactivate(EventArgs.Empty);
+						}
+					}
+					if (((num != value) && (Views.Count != 0)) && (value != -1))
+					{
+						Views[value].Active = true;
+						if (ShouldTriggerViewEvent)
+						{
+							Views[value].OnActivate(EventArgs.Empty);
+							OnActiveViewChanged(EventArgs.Empty);
+						}
+					}
+				}
+			}
+		}
+
+
+		/// <summary>
+		/// Gets the collection of View controls in the MultiView control.
+		/// </summary>
+		[
+		PersistenceMode(PersistenceMode.InnerDefaultProperty)
+		, Browsable(false)
+		]
+		public virtual ViewCollection Views
+		{
+			get { return (ViewCollection) Controls; }
+		}
+
+		/// <summary>
+		/// Return the current lifecycle state of this control.
+		/// </summary>
+		private ControlState ControlState
+		{
+			get { return (ControlState) s_fiControlState.GetValue(this); }
+		}
+
+		#endregion
+
+		/// <summary>
+		/// Sets the specified View control to the active view within a MultiView control.
+		/// </summary>
+		/// <param name="view">A View control to set as the active view within a MultiView control.</param>
+		public void SetActiveView(View view)
+		{
+			int index = Views.IndexOf(view);
+			if (index < 0)
+			{
+				throw new HttpException(
+					string.Format("MultiView_view_not_found", new object[] {(view == null) ? "null" : view.ID, ID}));
+			}
+			ActiveViewIndex = index;
+		}
+
+		/// <summary>
+		/// Returns the current active View control within a MultiView control. 
+		/// </summary>
+		/// <returns>A View control that represents the active view within a MultiView control.</returns>
+		public View GetActiveView()
+		{
+			int activeViewIndex = ActiveViewIndex;
+			if (activeViewIndex >= Views.Count)
+			{
+				throw new Exception("MultiView_ActiveViewIndex_out_of_range");
+			}
+			if (activeViewIndex < 0)
+			{
+				return null;
+			}
+			View view = Views[activeViewIndex];
+			if (!view.Active)
+			{
+				UpdateActiveView(activeViewIndex);
+			}
+			return view;
+		}
+
+		/// <summary>
+		/// Mark this control to ignore <see cref="OnBubbleEvent"/>
+		/// </summary>
+		internal void IgnoreBubbleEvents()
+		{
+			_ignoreBubbleEvents = true;
+		}
+
+		/// <summary>
+		/// Adds the element to the collection of child controls.
+		/// </summary>
+		protected override void AddParsedSubObject(object obj)
+		{
+			if (obj is View)
+			{
+				Controls.Add((Control) obj);
+			}
+			else if (!(obj is LiteralControl))
+			{
+				throw new HttpException(
+					string.Format("MultiView_cannot_have_children_of_type", new object[] {obj.GetType().Name}));
+			}
+		}
+
+		/// <summary>
+		/// Creates a new <see cref="ViewCollection"/> instance.
+		/// </summary>
+		/// <returns></returns>
+		protected override ControlCollection CreateControlCollection()
+		{
+			return new ViewCollection(this);
+		}
+
+		/// <summary>
+		/// Restores view-state information from a previous page request.
+		/// </summary>
+		protected override void LoadViewState(object savedState)
+		{
+			base.LoadViewState(savedState);
+			ActiveViewIndex = (int) ViewState["_activeViewIndex"];
+			_controlStateApplied = true;
+		}
+
+		/// <summary>
+		/// Saves view-state information to the page response.
+		/// </summary>
+		protected override object SaveViewState()
+		{
+			ViewState["_activeViewIndex"] = ActiveViewIndex;
+			return base.SaveViewState();
+		}
+
+		/// <summary>
+		/// Raises the <see cref="ActiveViewChanged"/> event.
+		/// </summary>
+		protected virtual void OnActiveViewChanged(EventArgs e)
+		{
+			EventHandler handler = (EventHandler) base.Events[_eventActiveViewChanged];
+			if (handler != null)
+			{
+				handler(this, e);
+			}
+		}
+
+		/// <summary>
+		/// Captures know commands.
+		/// </summary>
+		protected override bool OnBubbleEvent(object source, EventArgs e)
+		{
+			if (!_ignoreBubbleEvents && (e is CommandEventArgs))
+			{
+				CommandEventArgs args = (CommandEventArgs) e;
+				string commandName = args.CommandName;
+				if (commandName == NextViewCommandName)
+				{
+					if (ActiveViewIndex < (Views.Count - 1))
+					{
+						ActiveViewIndex++;
+					}
+					else
+					{
+						ActiveViewIndex = -1;
+					}
+					return true;
+				}
+				if (commandName == PreviousViewCommandName)
+				{
+					if (ActiveViewIndex > -1)
+					{
+						ActiveViewIndex--;
+					}
+					return true;
+				}
+				if (commandName == SwitchViewByIDCommandName)
+				{
+					View view = FindControl((string) args.CommandArgument) as View;
+					if ((view == null) || (view.Parent != this))
+					{
+						throw new HttpException(
+							string.Format("MultiView_invalid_view_id",
+							              new object[]
+							              	{ID, (string) args.CommandArgument, SwitchViewByIDCommandName}));
+					}
+					SetActiveView(view);
+					return true;
+				}
+				if (commandName == SwitchViewByIndexCommandName)
+				{
+					int num;
+					try
+					{
+						num = int.Parse((string) args.CommandArgument, CultureInfo.InvariantCulture);
+					}
+					catch (FormatException)
+					{
+						throw new FormatException(
+							string.Format("MultiView_invalid_view_index_format",
+							              new object[] {(string) args.CommandArgument, SwitchViewByIndexCommandName}));
+					}
+					ActiveViewIndex = num;
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/// <summary>
+		/// Initialize this control.
+		/// </summary>
+		/// <param name="e"></param>
+		protected override void OnInit(EventArgs e)
+		{
+			base.OnInit(e);
+			if (_cachedActiveViewIndex > -1)
+			{
+				ActiveViewIndex = _cachedActiveViewIndex;
+				_cachedActiveViewIndex = -1;
+				GetActiveView();
+			}
+		}
+
+		/// <summary>
+		/// Handle removal of a view.
+		/// </summary>
+		/// <param name="ctl"></param>
+		protected override void RemovedControl(Control ctl)
+		{
+			if (((View) ctl).Active && (ActiveViewIndex < Views.Count))
+			{
+				GetActiveView();
+			}
+			base.RemovedControl(ctl);
+		}
+
+		/// <summary>
+		/// Render the currently active view.
+		/// </summary>
+		/// <param name="writer"></param>
+		protected override void Render(HtmlTextWriter writer)
+		{
+			View activeView = GetActiveView();
+			if (activeView != null)
+			{
+				activeView.RenderControl(writer);
+			}
+		}
+
+		/// <summary>
+		/// Switches from the currently active view to the specified view.
+		/// </summary>
+		/// <param name="activeViewIndex"></param>
+		private void UpdateActiveView(int activeViewIndex)
+		{
+			for (int i = 0; i < Views.Count; i++)
+			{
+				View view = Views[i];
+				if (i == activeViewIndex)
+				{
+					view.Active = true;
+					if (ShouldTriggerViewEvent)
+					{
+						view.OnActivate(EventArgs.Empty);
+					}
+				}
+				else if (view.Active)
+				{
+					view.Active = false;
+					if (ShouldTriggerViewEvent)
+					{
+						view.OnDeactivate(EventArgs.Empty);
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Indicates if view events are ready to be raised.
+		/// </summary>
+		private bool ShouldTriggerViewEvent
+		{
+			get
+			{
+				if (_controlStateApplied)
+				{
+					return true;
+				}
+				if (this.Page != null)
+				{
+					return !this.Page.IsPostBack;
+				}
+				return false;
+			}
+		}
+	}
+#endif // !NET_2_0
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Panel.cs b/src/Spring/Spring.Web/Web/UI/Controls/Panel.cs
new file mode 100644
index 00000000..cd189094
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/Panel.cs
@@ -0,0 +1,191 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Reflection;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Util;
+using Spring.Web.Support;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// This panel provides the same features as <see cref="System.Web.UI.WebControls.Panel"/>, but provides additional means with regards to Spring.
+    /// </summary>
+    /// <remarks>
+    /// In some cases, automatic dependency injection can cause performance problems. In this case,you can use a Panel for finer-grained control
+    /// over which controls are to be injected or not.
+    /// </remarks>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: Panel.cs,v 1.3 2008/03/09 15:20:37 oakinger Exp $</version>
+    [PersistChildren(true),
+    ToolboxData("<{0}:Panel runat=\"server\" Width=\"125px\" Height=\"50px\"> </{0}:Panel>"),
+    ParseChildren(false),
+#if NET_1_1
+    Designer("System.Web.UI.Design.WebControls.PanelDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), 
+#else
+    Designer("System.Web.UI.Design.WebControls.PanelContainerDesigner, System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"),
+#endif
+    AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal),
+    AspNetHostingPermission(SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    public class Panel : System.Web.UI.WebControls.Panel, ISupportsWebDependencyInjection
+    {
+        // this helper class intercepts the first call to the child controls 
+        // collection from within InitRecursive().
+        // InitRecursive() is called right after the control has been added to it's parent's children.
+        private class InitRecursiveInterceptingControlsCollection : ControlCollection
+        {
+            private bool _passedInitRecursiveCheck = false;
+
+            public InitRecursiveInterceptingControlsCollection(Control owner) : base(owner)
+            {
+            }
+
+            public override Control this[int index]
+            {
+                get
+                {
+                    // the following check relies on the fact, that ControlCollection is set readonly 
+                    // right before InitRecursive() is called on each child control
+                    if (!_passedInitRecursiveCheck
+                        && this.IsReadOnly)
+                    {
+                            _passedInitRecursiveCheck = true;
+                            ((Panel)this.Owner).OnPreInitRecursive(EventArgs.Empty);
+                    }
+                    return base[index];
+                }
+            }
+        }
+
+        private bool _suppressDependencyInjection;
+        private bool _renderContainerTag;
+
+        /// <summary>
+        /// This flag controls, whether DI on child controls will be done or not
+        /// </summary>
+        /// <remarks>By default, DI will be done</remarks>
+        public bool SuppressDependencyInjection
+        {
+            get { return _suppressDependencyInjection; }
+            set { _suppressDependencyInjection = value; }
+        }
+
+        /// <summary>
+        /// This flag controls, whether this Panel's tag will be rendered.
+        /// </summary>
+        public bool RenderContainerTag
+        {
+            get { return _renderContainerTag; }
+            set { _renderContainerTag = value; }
+        }
+
+        /// <summary>
+        /// Overridden to suppress rendering this control's tag
+        /// </summary>
+        /// <param name="writer"></param>
+        protected override void Render(HtmlTextWriter writer)
+        {
+            if (_renderContainerTag)
+            {
+                base.Render(writer);
+            }
+            else
+            {
+                base.RenderContents(writer);
+            }
+        }
+
+        /// <summary>
+        /// This method is invoked right before InitRecursive() is called for this Panel and
+        /// ensures, that dependencies get injected on child controls before their Init event is raised.
+        /// </summary>
+        protected virtual void OnPreInitRecursive(EventArgs e)
+        {
+            if (!_suppressDependencyInjection 
+                && _defaultApplicationContext == null)
+            {
+                // obtain appContext of the closed parent template (.ascx/.aspx) control
+                IApplicationContext appCtx = WebApplicationContext.GetContext(this.TemplateSourceDirectory.TrimEnd('/') + "/");
+                // NOTE: _defaultApplicationContext will be set during DI!
+                WebDependencyInjectionUtils.InjectDependenciesRecursive(appCtx, this);
+            }
+        }
+
+        #region Dependency Injection Support
+
+        private IApplicationContext _defaultApplicationContext;
+
+        /// <summary>
+        /// Sets / Gets the ApplicationContext instance used to configure this control
+        /// </summary>
+        IApplicationContext ISupportsWebDependencyInjection.DefaultApplicationContext
+        {
+            get { return _defaultApplicationContext; }
+            set { _defaultApplicationContext = value; }
+        }
+
+        /// <summary>
+        /// Injects dependencies into control before adding it.
+        /// </summary>
+        protected override void AddedControl(Control control, int index)
+        {
+            if (!_suppressDependencyInjection 
+                && _defaultApplicationContext != null)
+            {
+                WebDependencyInjectionUtils.InjectDependenciesRecursive(_defaultApplicationContext, control);
+            }
+            base.AddedControl(control, index);
+        }
+
+        /// <summary>
+        /// Overridden to automatically aquire a reference to 
+        /// root application context to use for DI.
+        /// </summary>
+        protected override ControlCollection CreateControlCollection()
+        {
+            // set root application context to signal, that we care 
+            // for our children ourselves
+            if (_suppressDependencyInjection)
+            {
+                _defaultApplicationContext = WebApplicationContext.GetRootContext();
+                return base.CreateControlCollection();
+            }
+            else
+            {
+                return new InitRecursiveInterceptingControlsCollection(this);
+            }
+        }
+
+        #endregion Dependency Injection Support
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/RadioButtonGroup.cs b/src/Spring/Spring.Web/Web/UI/Controls/RadioButtonGroup.cs
new file mode 100644
index 00000000..d44be09b
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/RadioButtonGroup.cs
@@ -0,0 +1,198 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using Spring.Util;
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// Groups radio button controls and returns the value of the selected control
+    /// </summary>
+    /// <remarks>
+    /// This control alows radio buttons to be data-bound to a data model of the page.
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: RadioButtonGroup.cs,v 1.5 2007/03/16 22:38:55 oakinger Exp $</version>
+    [ParseChildren(false)]
+    public class RadioButtonGroup : WebControl, IPostBackDataHandler
+    {
+        private static readonly object EventSelectionChanged = new object();
+
+        private ArrayList options = new ArrayList();
+
+		/// <summary>
+		/// Overloaded to track addition of contained <see cref="RadioButton"/> controls.
+		/// </summary>
+		protected override void AddedControl(Control control, int index)
+		{
+			if (control is RadioButton)
+			{
+				RadioButton option = (RadioButton)control;
+				option.GroupName = this.ID + "Group";
+				option.AutoPostBack = this.AutoPostBack;
+				if(option.Attributes["value"] == null) option.Attributes["value"] = option.ID;
+				option.Checked = (0 == string.Compare(this.Value, option.Attributes["value"]));
+				options.Add(control);
+			}
+			base.AddedControl (control, index);
+		}
+
+		/// <summary>
+		/// Overloaded to track removal of a RadioButton
+		/// </summary>
+		/// <param name="control"></param>
+		protected override void RemovedControl(Control control)
+		{
+			int index = -1;
+			for(int i=0;i<options.Count;i++)
+			{
+				if (control == options[i]) index = i;
+			}
+			if (index > -1) options.RemoveAt(index);
+
+			base.RemovedControl (control);
+		}
+
+        /// <summary>
+        /// Gets or sets the ID of the selected radio button.
+        /// </summary>
+        /// <value>ID of the selected radio button.</value>
+        public string Value
+        {
+            get { return (string) this.ViewState["value"]; }
+            set
+            {
+                this.ViewState["value"] = value;
+                foreach(RadioButton option in this.options)
+                {
+                    option.Checked = (0==string.Compare(value, option.Attributes["value"]));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether form should be posted back on every selection change
+        /// within the radio group.
+        /// </summary>
+        [DefaultValue(false)]
+        public virtual bool AutoPostBack
+        {
+            get
+            {
+                object autoPostBack = this.ViewState["AutoPostBack"];
+                if (autoPostBack != null)
+                {
+                    return (bool) autoPostBack;
+                }
+                return false;
+            }
+            set
+            {
+                this.ViewState["AutoPostBack"] = value;
+                foreach(RadioButton option in this.options)
+                {
+                    option.AutoPostBack = value;
+                }
+            }
+        }
+
+		/// <summary>
+		/// Registers the RadioButtonGroup for PostBack.
+		/// </summary>
+        protected override void OnPreRender(EventArgs e)
+        {
+            base.OnPreRender(e);
+            if (this.Visible)
+            {
+                Page.RegisterRequiresPostBack(this);
+            }
+        }
+
+        /// <summary>
+        /// Renders only children of this control.
+        /// </summary>
+        /// <param name="writer">HtmlTextWriter to use for rendering.</param>
+        protected override void Render(HtmlTextWriter writer)
+        {
+            this.RenderChildren(writer);
+        }
+
+        #region IPostBackDataHandler Members
+
+        /// <summary>
+        /// Loads postback data into the control.
+        /// </summary>
+        /// <param name="postDataKey">Key that should be used to retrieve data.</param>
+        /// <param name="postCollection">Postback data collection.</param>
+        /// <returns>True if data has changed, false otherwise.</returns>
+        public bool LoadPostData(string postDataKey, NameValueCollection postCollection)
+        {
+            string newValue = postCollection[postDataKey+"Group"];
+
+            if (0 != string.Compare(newValue,this.Value))
+            {
+                this.ViewState["value"] = newValue;
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Raises SelectionChanged event.
+        /// </summary>
+        public void RaisePostDataChangedEvent()
+        {
+            OnSelectionChanged(EventArgs.Empty);
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Method that is called on postback if selected radio button has changed.
+        /// </summary>
+        /// <param name="e">Empty event argument.</param>
+        protected virtual void OnSelectionChanged(EventArgs e)
+        {
+            EventHandler handler = (EventHandler) base.Events[RadioButtonGroup.EventSelectionChanged];
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Occurs when the value of the radio button group changes between postbacks to the server.
+        /// </summary>
+        public event EventHandler SelectionChanged
+        {
+            add { base.Events.AddHandler(RadioButtonGroup.EventSelectionChanged, value); }
+            remove { base.Events.RemoveHandler(RadioButtonGroup.EventSelectionChanged, value); }
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventArgs.cs b/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventArgs.cs
new file mode 100644
index 00000000..725f14ca
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventArgs.cs
@@ -0,0 +1,55 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+using System.Web.UI.WebControls;
+
+namespace Spring.Web.UI.Controls
+{
+	/// <summary>
+	/// Provides information about a command raised from a <see cref="TabContainer"/>
+	/// </summary>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: TabCommandEventArgs.cs,v 1.1 2007/07/24 13:33:27 oakinger Exp $</version>
+	public class TabCommandEventArgs : CommandEventArgs
+	{
+		/// <summary>
+		/// Initializes a new instance.
+		/// </summary>
+		/// <param name="commandName">The name of the command raised by a <see cref="TabContainer"/>.</param>
+		/// <param name="tabIndex">The index of the tab that raised this event.</param>
+		public TabCommandEventArgs(string commandName, int tabIndex) : base(commandName, tabIndex)
+		{
+		}
+
+		/// <summary>
+		/// Returns the index of the tab that raised this command.
+		/// </summary>
+		public int TabIndex
+		{
+			get { return (int) base.CommandArgument; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventHandler.cs b/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventHandler.cs
new file mode 100644
index 00000000..db0ad439
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/TabCommandEventHandler.cs
@@ -0,0 +1,37 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+	/// <summary>
+	/// Represents the method that will handle the TabCommand event. 
+	/// </summary>
+	/// <param name="sender">The source of the event.</param>
+	/// <param name="e">A <see cref="TabCommandEventArgs"/> that contains the event data.</param>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: TabCommandEventHandler.cs,v 1.1 2007/07/24 13:33:28 oakinger Exp $</version>
+	public delegate void TabCommandEventHandler(object sender, TabCommandEventArgs e);
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/TabContainer.cs b/src/Spring/Spring.Web/Web/UI/Controls/TabContainer.cs
new file mode 100644
index 00000000..82ae2fab
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/TabContainer.cs
@@ -0,0 +1,118 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+	/// <summary>
+	/// This control is responsible for rendering tabs.
+	/// </summary>
+	/// <remarks>
+	/// By default, this TabContainer implementation uses <see cref="LinkButton"/> controls to 
+	/// render tabs. Override <see cref="CreateTab"/> to change this behaviour.
+	/// </remarks>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: TabContainer.cs,v 1.1 2007/07/24 13:33:28 oakinger Exp $</version>
+	public class TabContainer : Control
+	{
+		/// <summary>
+		/// Represents the command name of the tab to be selected.
+		/// </summary>
+		public static readonly string SelectTabCommandName = "SelectTab";
+
+		/// <summary>
+		/// Key into the eventhandler table.
+		/// </summary>
+		private static readonly object _eventClick = new object();
+
+		/// <summary>
+		/// Occurs, when a tab control is clicked.
+		/// </summary>
+		public event TabCommandEventHandler Click
+		{
+			add { base.Events.AddHandler(_eventClick, value); }
+			remove { base.Events.RemoveHandler(_eventClick, value); }
+		}
+
+		/// <summary>
+		/// Catches <see cref="CommandEventArgs"/> with name '<see cref="SelectTabCommandName"/>' and 
+		/// raises the <see cref="Click"/> event.
+		/// </summary>
+		/// <param name="source">The source of the event.</param>
+		/// <param name="args">contains event information.</param>
+		/// <returns></returns>
+		protected override bool OnBubbleEvent(object source, EventArgs args)
+		{
+			CommandEventArgs cea = args as CommandEventArgs;
+			if (cea != null && cea.CommandName == SelectTabCommandName)
+			{
+				this.OnTabClickedCommand(source, (CommandEventArgs) args);
+				return true;
+			}
+
+			return base.OnBubbleEvent(source, args);
+		}
+
+		/// <summary>
+		/// Raises the <see cref="Click"/> event.
+		/// </summary>
+		protected virtual void OnTabClickedCommand(object sender, CommandEventArgs args)
+		{
+			TabCommandEventHandler handler = (TabCommandEventHandler) base.Events[_eventClick];
+			if (handler != null)
+			{
+				handler(sender, new TabCommandEventArgs(args.CommandName, Int32.Parse((string) args.CommandArgument)));
+			}
+		}
+
+		/// <summary>
+		/// Creates a new tab for the specified <c>view</c> within the given <c>container</c>.
+		/// </summary>
+		/// <param name="container">The <see cref="TabularMultiView"/> containing the <c>view</c></param>
+		/// <param name="view">The <see cref="TabularView"/> for which a new tab is to be created.</param>
+		/// <param name="index">The index of the tab to be created.</param>
+		/// <remarks>
+		/// By default, <see cref="LinkButton"/> controls are used for rendering tabs. Override this method to
+		/// change this behaviour.
+		/// </remarks>
+		protected internal virtual void CreateTab(TabularMultiView container, TabularView view, int index)
+		{
+			LinkButton btnTab = new LinkButton();
+			btnTab.Text = view.TabName;
+			btnTab.CommandName = "SelectTab";
+			btnTab.CommandArgument = "" + index;
+			btnTab.ID = "Tab" + index;
+			btnTab.ToolTip = view.TabToolTip;
+			btnTab.Enabled = !view.Active;
+
+			WebControl span = new WebControl(HtmlTextWriterTag.Span);
+			span.CssClass = (view.Active) ? container.TabularMenuSelectedItemCSS : container.TabularMenuItemCSS;
+			span.Controls.Add(btnTab);
+			this.Controls.Add(span);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/TabularMultiView.cs b/src/Spring/Spring.Web/Web/UI/Controls/TabularMultiView.cs
new file mode 100644
index 00000000..f06ae0ae
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/TabularMultiView.cs
@@ -0,0 +1,300 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+	/// <summary>
+	/// The <see cref="TabularMultiView"/> control allows you to build ASP.NET Web pages that present 
+	/// the user with content arranged in tabular form.
+	/// </summary>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: TabularMultiView.cs,v 1.1 2007/07/24 13:33:28 oakinger Exp $</version>
+	[ToolboxData("<{0}:TabularMultiView runat=\"server\"></{0}:TabularMultiView>")]
+	[ParseChildren(false)]
+	public class TabularMultiView : WebControl
+	{
+		#region Style Properties
+
+		private string m_MenuStyle = "TabMenu";
+		private string m_BodyStyle = "TabBody";
+		private string m_TabItemStyle = "TabItem";
+		private string m_TabSelectedItemStyle = "TabSelectedItem";
+
+		/// <summary>
+		/// Set the style class of the panel containing the Tabs.
+		/// </summary>
+		[Bindable(true), Category("Appearance"), DefaultValue(typeof(string), "TabMenu")]
+		public string TabularMenuCSS
+		{
+			get { return m_MenuStyle; }
+			set { m_MenuStyle = value; }
+		}
+
+		/// <summary>
+		/// Set the style class of each Tab item.
+		/// </summary>
+		[Bindable(true), DefaultValue(typeof(string), "TabItem"), Category("Appearance")]
+		public string TabularMenuItemCSS
+		{
+			get { return (m_TabItemStyle); }
+			set { m_TabItemStyle = value; }
+		}
+
+		/// <summary>
+		/// Set the style class of the currently selected Tab item.
+		/// </summary>
+		[Bindable(true), DefaultValue(typeof(string), "TabSelectedItem"), Category("Appearance")]
+		public string TabularMenuSelectedItemCSS
+		{
+			get { return m_TabSelectedItemStyle; }
+			set { m_TabSelectedItemStyle = value; }
+		}
+
+		/// <summary>
+		/// Set the style class of the panel containing all <see cref="TabularView"/> controls.
+		/// </summary>
+		[Bindable(true), Category("Appearance"), DefaultValue(typeof(string), "TabBody")]
+		public string TabularBodyCSS
+		{
+			get { return m_BodyStyle; }
+			set { m_BodyStyle = value; }
+		}
+
+		#endregion
+
+		#region Public Members
+
+		/// <summary>
+		/// Initializes a new instance.
+		/// </summary>
+		public TabularMultiView()
+			: this(HtmlTextWriterTag.Div)
+		{
+		}
+
+		/// <summary>
+		/// Initializes a new instance with the given container tag to be used for rendering.
+		/// </summary>
+		protected TabularMultiView(HtmlTextWriterTag containerTag)
+			: base(containerTag)
+		{
+		}
+
+		/// <summary>
+		/// Gets or sets the index of the active View control within a <see cref="TabularMultiView"/> control.
+		/// </summary>
+		public int ActiveTabIndex
+		{
+			get
+			{
+				if (!_controlStateInitialized)
+				{
+					return _activeViewIndexCached;
+				}
+				else
+				{
+					return _multiView.ActiveViewIndex;
+				}
+			}
+			set
+			{
+				if (!_controlStateInitialized)
+				{
+					_activeViewIndexCached = value;
+				}
+				else
+				{
+					_multiView.ActiveViewIndex = value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Occurs, if the active tab has changed.
+		/// </summary>
+		public event EventHandler ActiveTabChanged
+		{
+			add { base.Events.AddHandler(_eventActiveTabChanged, value); }
+			remove { base.Events.RemoveHandler(_eventActiveTabChanged, value); }
+		}
+
+		#endregion Public Members
+
+		#region Customizable Members
+
+		/// <summary>
+		/// Create the container for tab items.
+		/// </summary>
+		protected virtual TabContainer CreateTabContainer()
+		{
+			return new TabContainer();
+		}
+
+		/// <summary>
+		/// Creates TabContainer and MultiView 
+		/// </summary>
+		protected virtual Control CreateContent(TabContainer menu, MultiView body)
+		{
+			Control content = new Control();
+
+			WebControl menuPanel = new WebControl(HtmlTextWriterTag.Div);
+			menuPanel.CssClass = TabularMenuCSS;
+			menuPanel.Controls.Add(menu);
+			content.Controls.Add(menuPanel);
+
+			WebControl bodyPanel = new WebControl(HtmlTextWriterTag.Div);
+			bodyPanel.CssClass = TabularBodyCSS;
+			bodyPanel.Controls.Add(body);
+			content.Controls.Add(bodyPanel);
+
+			return content;
+		}
+
+		#endregion
+
+		#region Fields
+
+		private static readonly object _eventActiveTabChanged = new object();
+
+		private int _activeViewIndexCached = -1;
+		private bool _controlStateInitialized = false;
+
+		private TabContainer _tabContainer;
+		private MultiView _multiView;
+
+		/// <summary>
+		/// keeps parsed views until multiView is created
+		/// </summary>
+		private ArrayList _parsedViews = new ArrayList();
+
+		#endregion
+
+		/// <summary>
+		/// Initialize this control.
+		/// </summary>
+		protected override void OnInit(EventArgs e)
+		{
+			BuildControlTree();
+
+			base.OnInit(e);
+		}
+
+		private void BuildControlTree()
+		{
+			_controlStateInitialized = true;
+
+			EnsureChildControls();
+		}
+
+		/// <summary>
+		/// Creates child controls.
+		/// </summary>
+		protected override void CreateChildControls()
+		{
+			// create menu tabstrip
+			_tabContainer = CreateTabContainer();
+			_tabContainer.Click += new TabCommandEventHandler(OnSelectTabCommand);
+
+			// create multiview container
+			_multiView = new MultiView();
+			_multiView.ActiveViewChanged += new EventHandler(OnActiveViewChanged);
+
+			// add views previously parsed
+			for (int i = 0; i < _parsedViews.Count; i++) _multiView.Controls.Add((Control) _parsedViews[i]);
+			_parsedViews = null;
+
+			// select defined view
+			if (_activeViewIndexCached != -1)
+			{
+				_multiView.ActiveViewIndex = _activeViewIndexCached;
+				_activeViewIndexCached = -1;
+			}
+
+			// create content pane
+			Control content = CreateContent(_tabContainer, _multiView);
+			Controls.Add(content);
+
+			RebuildTabs();
+		}
+
+		/// <summary>
+		/// Adds the element to the collection of child controls.
+		/// </summary>
+		protected override void AddParsedSubObject(object obj)
+		{
+			// remember parsed views for later
+			if (obj is TabularView)
+			{
+				_parsedViews.Add(obj);
+			}
+			else if (!(obj is LiteralControl))
+			{
+				throw new HttpException(
+					string.Format("TabularMultiView_cannot_have_children_of_type '{0}'", obj.GetType().FullName));
+			}
+		}
+
+		/// <summary>
+		/// Called if ActiveViewIndex is changed
+		/// </summary>
+		private void RebuildTabs()
+		{
+			_tabContainer.Controls.Clear();
+
+			ViewCollection views = _multiView.Views;
+			for (int i = 0; i < views.Count; i++)
+			{
+				TabularView view = (TabularView) views[i];
+				_tabContainer.CreateTab(this, view, i);
+			}
+		}
+
+		private void OnSelectTabCommand(object sender, TabCommandEventArgs e)
+		{
+			int selectedIndex = e.TabIndex;
+			if (selectedIndex != _multiView.ActiveViewIndex)
+			{
+				// will trigger OnActiveViewChanged
+				_multiView.ActiveViewIndex = selectedIndex;
+				RebuildTabs();
+			}
+		}
+
+		private void OnActiveViewChanged(object sender, EventArgs e)
+		{
+			EventHandler handler = (EventHandler) base.Events[_eventActiveTabChanged];
+			if (handler != null)
+			{
+				handler(this, e);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/TabularView.cs b/src/Spring/Spring.Web/Web/UI/Controls/TabularView.cs
new file mode 100644
index 00000000..0ad74d99
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/TabularView.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System.Reflection;
+using System.ComponentModel;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+	/// <summary>
+	/// Represents a control that acts as a container for a group of controls within a <see cref="TabularMultiView"/> control. 
+	/// </summary>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: TabularView.cs,v 1.2 2007/07/24 14:32:58 oakinger Exp $</version>
+	[ToolboxData("<{0}:TabularView runat=\"server\"></{0}:TabularView>")]
+	public class TabularView : View
+	{
+#if NET_2_0
+		private static readonly PropertyInfo s_fiActive =
+			typeof(View).GetProperty("Active", BindingFlags.Instance | BindingFlags.NonPublic);
+
+		/// <summary>
+		/// Indicates if this view is currently active.
+		/// </summary>
+		public bool Active
+		{
+			get { return (bool) s_fiActive.GetValue(this, null); }
+		}
+#endif
+		private string m_TabToolTip;
+
+		/// <summary>
+		/// Get or Set the name of the tab item associated with this view.
+		/// </summary>
+		[Description("Name of the tab.")
+			, NotifyParentProperty(true)
+			, DefaultValue("Tab")
+			, Category("Behavior")]
+		public string TabName
+		{
+			get
+			{
+				string str = (string) ViewState["m_TabName"];
+				return str;
+			}
+			set { ViewState["m_TabName"] = value; }
+		}
+
+		/// <summary>
+		/// Get or Set the tooltip text of the tab item associated with this view.
+		/// </summary>
+		[Description("Tooltip of the tab.")
+			, NotifyParentProperty(true)
+			, DefaultValue("")
+			, Category("Behavior")]
+		public string TabToolTip
+		{
+			get { return m_TabToolTip; }
+			set { m_TabToolTip = value; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/TabularViewCollection.cs b/src/Spring/Spring.Web/Web/UI/Controls/TabularViewCollection.cs
new file mode 100644
index 00000000..f1535767
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/TabularViewCollection.cs
@@ -0,0 +1,83 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+	/// <summary>
+	/// Holds the collection of <see cref="TabularView"/> controls in a <see cref="TabularMultiView"/>.
+	/// </summary>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: TabularViewCollection.cs,v 1.1 2007/07/24 13:33:28 oakinger Exp $</version>
+	[
+		AspNetHostingPermission(SecurityAction.LinkDemand, Level=AspNetHostingPermissionLevel.Minimal)
+			, AspNetHostingPermission(SecurityAction.InheritanceDemand, Level=AspNetHostingPermissionLevel.Minimal)]
+	public class TabularViewCollection : ViewCollection
+	{
+		/// <summary>
+		/// Initialize a new instance.
+		/// </summary>
+		/// <param name="owner"></param>
+		public TabularViewCollection(Control owner) : base(owner)
+		{
+		}
+
+		/// <summary>
+		/// Add the specified <see cref="TabularView"/> control to the collection.
+		/// </summary>
+		public override void Add(Control v)
+		{
+			if (!(v is TabularView))
+			{
+				throw new ArgumentException("ViewCollection_must_contain_view");
+			}
+			base.Add(v);
+		}
+
+		/// <summary>
+		/// Add the specified <see cref="TabularView"/> control to the collection.
+		/// </summary>
+		public override void AddAt(int index, Control v)
+		{
+			if (!(v is TabularView))
+			{
+				throw new ArgumentException("ViewCollection_must_contain_view");
+			}
+			base.AddAt(index, v);
+		}
+
+		/// <summary>
+		/// Obtain the specified <see cref="TabularView"/> control from the collection.
+		/// </summary>
+		public new TabularView this[int i]
+		{
+			get { return (TabularView) base[i]; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ValidationError.cs b/src/Spring/Spring.Web/Web/UI/Controls/ValidationError.cs
new file mode 100644
index 00000000..6c035010
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/ValidationError.cs
@@ -0,0 +1,46 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using Spring.Web.UI.Validation;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// This control should be used to display field-level validation errors.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Jonathan Allenby</author>
+    /// <version>$Id: ValidationError.cs,v 1.11 2008/03/19 12:07:14 oakinger Exp $</version>
+    public class ValidationError : AbstractValidationControl
+    {
+        /// <summary>
+        /// Create the default <see cref="SpanValidationErrorsRenderer"/> 
+        /// for this ValidationControl if none is configured.
+        /// </summary>
+        protected override IValidationErrorsRenderer CreateValidationErrorsRenderer()
+        {
+            return new SpanValidationErrorsRenderer();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ValidationSummary.cs b/src/Spring/Spring.Web/Web/UI/Controls/ValidationSummary.cs
new file mode 100644
index 00000000..3f56d6d7
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/ValidationSummary.cs
@@ -0,0 +1,47 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using Spring.Web.UI.Validation;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// This control should be used instead of standard ValidationSummary control
+    /// to display validation errors identified by the Spring.NET validation framework.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Jonathan Allenby</author>
+    /// <version>$Id: ValidationSummary.cs,v 1.11 2008/03/19 12:07:14 oakinger Exp $</version>
+    public class ValidationSummary : AbstractValidationControl
+    {
+        /// <summary>
+        /// Create the default <see cref="DivValidationErrorsRenderer"/> 
+        /// for this ValidationControl if none is configured.
+        /// </summary>
+        protected override IValidationErrorsRenderer CreateValidationErrorsRenderer()
+        {
+            return new DivValidationErrorsRenderer();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/View.cs b/src/Spring/Spring.Web/Web/UI/Controls/View.cs
new file mode 100644
index 00000000..9fe2b6e9
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/View.cs
@@ -0,0 +1,136 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.UI;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+#if !NET_2_0
+	/// <summary>
+	/// Represents a control that acts as a container for a group of controls within a <see cref="MultiView"/> control.
+	/// </summary>
+	[ParseChildren(false, null)
+		, ToolboxData("<{0}:View runat=\"server\"></{0}:View>")
+		, AspNetHostingPermission(SecurityAction.LinkDemand, Level=AspNetHostingPermissionLevel.Minimal)
+		, AspNetHostingPermission(SecurityAction.InheritanceDemand, Level=AspNetHostingPermissionLevel.Minimal)]
+	public class View : Control
+	{
+		private bool _active;
+		private static readonly object _eventActivate = new object();
+		private static readonly object _eventDeactivate = new object();
+
+		/// <summary>
+		/// Occurs when the current View control becomes the active view.
+		/// </summary>
+		public event EventHandler Activate
+		{
+			add { base.Events.AddHandler(_eventActivate, value); }
+			remove { base.Events.RemoveHandler(_eventActivate, value); }
+		}
+
+		/// <summary>
+		/// Occurs when the current active View control becomes inactive.
+		/// </summary>
+		public event EventHandler Deactivate
+		{
+			add { base.Events.AddHandler(_eventDeactivate, value); }
+			remove { base.Events.RemoveHandler(_eventDeactivate, value); }
+		}
+
+		/// <summary>
+		/// Raises the <see cref="Activate"/> event of the View control.
+		/// </summary>
+		protected internal virtual void OnActivate(EventArgs e)
+		{
+			EventHandler handler = (EventHandler) base.Events[_eventActivate];
+			if (handler != null)
+			{
+				handler(this, e);
+			}
+		}
+
+		/// <summary>
+		/// Raises the <see cref="Deactivate"/> event of the View control. 
+		/// </summary>
+		protected internal virtual void OnDeactivate(EventArgs e)
+		{
+			EventHandler handler = (EventHandler) base.Events[_eventDeactivate];
+			if (handler != null)
+			{
+				handler(this, e);
+			}
+		}
+
+		/// <summary>
+		/// Gets a value that indicates, if this control has been instantiated by a designer.
+		/// </summary>
+		protected bool DesignMode
+		{
+			get { return Context == null; }
+		}
+
+		/// <summary>
+		/// Gets or Sets a value that indicates, if this control is currently active.
+		/// </summary>
+		internal bool Active
+		{
+			get { return _active; }
+			set
+			{
+				_active = value;
+				base.Visible = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value that indicates, whether this view will be rendered as UI.
+		/// </summary>
+		public override bool Visible
+		{
+			get
+			{
+				if (Parent == null)
+				{
+					return Active;
+				}
+				if (Active)
+				{
+					return Parent.Visible;
+				}
+				return false;
+			}
+			set
+			{
+				if (!DesignMode)
+				{
+					throw new InvalidOperationException("View_CannotSetVisible");
+				}
+			}
+		}
+	}
+#endif // !NET_2_0
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ViewCollection.cs b/src/Spring/Spring.Web/Web/UI/Controls/ViewCollection.cs
new file mode 100644
index 00000000..81ffb7de
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Controls/ViewCollection.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Security.Permissions;
+using System.Web;
+using System.Web.UI;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+#if !NET_2_0
+	/// <summary>
+	/// Represents a collection container that enables a <see cref="MultiView"/> control to maintain a list of its child controls.
+	/// </summary>
+	/// <author>Erich Eichinger</author>
+	/// <version>$Id: ViewCollection.cs,v 1.1 2007/07/24 13:33:28 oakinger Exp $</version>
+	[
+		AspNetHostingPermission(SecurityAction.LinkDemand, Level=AspNetHostingPermissionLevel.Minimal)
+			, AspNetHostingPermission(SecurityAction.InheritanceDemand, Level=AspNetHostingPermissionLevel.Minimal)]
+	public class ViewCollection : ControlCollection
+	{
+		/// <summary>
+		/// Initializes a new instance.
+		/// </summary>
+		/// <param name="owner"></param>
+		public ViewCollection(Control owner) : base(owner)
+		{
+		}
+
+		/// <summary>
+		/// Add the specified <see cref="View"/> control to the collection.
+		/// </summary>
+		public override void Add(Control v)
+		{
+			if (!(v is View))
+			{
+				throw new ArgumentException("ViewCollection_must_contain_view");
+			}
+			base.Add(v);
+		}
+
+		/// <summary>
+		/// Add the specified <see cref="View"/> control to the collection.
+		/// </summary>
+		public override void AddAt(int index, Control v)
+		{
+			if (!(v is View))
+			{
+				throw new ArgumentException("ViewCollection_must_contain_view");
+			}
+			base.AddAt(index, v);
+		}
+
+		/// <summary>
+		/// Obtain the specified <see cref="View"/> control from the collection.
+		/// </summary>
+		public new View this[int i]
+		{
+			get { return (View) base[i]; }
+		}
+	}
+#endif // !NET_2_0
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/DialogAttribute.cs b/src/Spring/Spring.Web/Web/UI/DialogAttribute.cs
new file mode 100644
index 00000000..0cafaa86
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/DialogAttribute.cs
@@ -0,0 +1,44 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Web.UI
+{
+	/// <summary>
+	/// Specifies that page should be treated as a dialog, meaning that after processing
+	/// is over user should return to the referring page.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Pages marked with this attribute will have "close" result predefined.
+	/// </p>
+	/// <p>
+	/// Developers should call SetResult("close") from the event handler
+	/// in order to return control back to the calling page.
+	/// </p>
+	/// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DialogAttribute.cs,v 1.3 2006/05/18 21:37:52 markpollack Exp $</version>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+    public class DialogAttribute : Attribute
+	{
+	}
+}
diff --git a/src/Spring/Spring.Web/Web/UI/IValidationContainer.cs b/src/Spring/Spring.Web/Web/UI/IValidationContainer.cs
new file mode 100644
index 00000000..019d8363
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/IValidationContainer.cs
@@ -0,0 +1,48 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using Spring.Context;
+using Spring.Validation;
+
+#endregion
+
+namespace Spring.Web.UI
+{
+    /// <summary>
+    /// Abstracts access to properties required for 
+    /// handling validation and error rendering
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: IValidationContainer.cs,v 1.1 2008/03/19 12:07:15 oakinger Exp $</version>
+    public interface IValidationContainer
+    {
+        /// <summary>
+        /// Gets the MessageSource to be used for 
+        /// resolving error ids into messages
+        /// </summary>
+        IMessageSource MessageSource { get; }
+        /// <summary>
+        /// Gets the list of validation errors kept by this container.
+        /// </summary>
+        IValidationErrors ValidationErrors { get; } 
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/MasterPage.cs b/src/Spring/Spring.Web/Web/UI/MasterPage.cs
new file mode 100644
index 00000000..e1ec4937
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/MasterPage.cs
@@ -0,0 +1,513 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Web.UI;
+using Spring.Validation;
+using Spring.Web.UI.Controls;
+using IValidator = Spring.Validation.IValidator;
+
+#if NET_2_0
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Globalization;
+using Spring.Util;
+using System.ComponentModel;
+using System.Globalization;
+using System.Reflection;
+using System.Resources;
+using System.Web;
+using System.Web.Compilation;
+using Spring.Web.Support;
+#endif
+
+#endregion Imports
+
+namespace Spring.Web.UI
+{
+#if !NET_2_0
+    
+    #region ASP.NET 1.1 Spring Master Page Implementation
+
+    /// <summary>
+    /// Spring.NET Master Page implementation for ASP.NET 1.1
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: MasterPage.cs,v 1.15 2008/04/22 15:08:59 markpollack Exp $</version>
+    public class MasterPage : UserControl
+    {
+        /// <summary>
+        /// Initializes master page.
+        /// </summary>
+        public void Initialize(Page childPage)
+        {
+            InitializeAsUserControl(childPage);
+            this.ID = "masterPage";
+
+            Control[] controls = new Control[childPage.Controls.Count];
+            childPage.Controls.CopyTo(controls, 0);
+
+            for (int i = 0; i < controls.Length; i++)
+            {
+                if (controls[i] is Content)
+                {
+                    Content content = (Content) controls[i];
+                    ContentPlaceHolder placeholder = (ContentPlaceHolder) this.FindControl(content.ContentPlaceHolderID);
+                    if (placeholder == null)
+                    {
+                        throw new ArgumentException("Content placeholder " + content.ContentPlaceHolderID + " does not exist in the master page.");
+                    }
+                    
+                    placeholder.Content = content;
+                }
+            }
+
+            childPage.Controls.AddAt(0, this);
+        }
+
+
+		/// <summary>
+		/// Delegate validation errors to the owning page.
+		/// </summary>
+    	public override IValidationErrors ValidationErrors
+    	{
+    		get { return Page.ValidationErrors; }
+    	}
+    }
+
+    #endregion    
+
+#else
+
+    #region ASP.NET 2.0 Spring Master Page Implementation
+
+    
+    /// <summary>
+    /// Spring.NET Master Page implementation for ASP.NET 2.0
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: MasterPage.cs,v 1.15 2008/04/22 15:08:59 markpollack Exp $</version>
+    public class MasterPage : System.Web.UI.MasterPage, IApplicationContextAware, ISupportsWebDependencyInjection
+    {
+        #region Instance Fields
+
+        private ILocalizer localizer;
+        private IValidationErrors validationErrors = new ValidationErrors();
+        private IMessageSource messageSource;
+        private IApplicationContext applicationContext;
+        private IApplicationContext defaultApplicationContext;
+
+        #endregion
+
+        #region Control lifecycle methods
+        
+        /// <summary>
+        /// Initializes user control.
+        /// </summary>
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeMessageSource();
+            
+            base.OnInit(e);
+
+            // initialize controls
+            OnInitializeControls(EventArgs.Empty);            
+        }
+
+        /// <summary>
+        /// Binds data from the data model into controls and raises
+        /// PreRender event afterwards.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected override void OnPreRender(EventArgs e)
+        {
+            if (localizer != null)
+            {
+                localizer.ApplyResources(this, messageSource, UserCulture);
+            }
+            else if (Page.Localizer != null)
+            {
+                Page.Localizer.ApplyResources(this, messageSource, UserCulture);
+            }
+
+            base.OnPreRender(e);
+        }
+
+        /// <summary>
+        /// This event is raised before Load event and should be used to initialize
+        /// controls as necessary.
+        /// </summary>
+        public event EventHandler InitializeControls;
+
+        /// <summary>
+        /// Raises InitializeControls event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnInitializeControls(EventArgs e)
+        {
+            if (InitializeControls != null)
+            {
+                InitializeControls(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Obtains a <see cref="T:System.Web.UI.UserControl"/> object from a user control file
+        /// and injects dependencies according to Spring config file.
+        /// </summary>
+        /// <param name="virtualPath">The virtual path to a user control file.</param>
+        /// <returns>
+        /// Returns the specified <see langword="UserControl"/> object, with dependencies injected.
+        /// </returns>
+        protected new Control LoadControl(string virtualPath)
+        {
+            Control control = base.LoadControl(virtualPath);
+            WebDependencyInjectionUtils.InjectDependenciesRecursive(defaultApplicationContext,control);
+            return control;
+        }
+
+        /// <summary>
+        /// Obtains a <see cref="T:System.Web.UI.UserControl"/> object by type
+        /// and injects dependencies according to Spring config file.
+        /// </summary>
+        /// <param name="t">The type of a user control.</param>
+        /// <param name="parameters">parameters to pass to the control</param>
+        /// <returns>
+        /// Returns the specified <see langword="UserControl"/> object, with dependencies injected.
+        /// </returns>
+        protected new Control LoadControl( Type t, params object[] parameters)
+        {
+            Control control = base.LoadControl( t, parameters );
+            WebDependencyInjectionUtils.InjectDependenciesRecursive(defaultApplicationContext,control);
+            return control;
+        }
+
+        #endregion Control lifecycle methods
+
+        #region Data binding events
+
+        /// <summary>
+        /// This event is raised after all controls have been populated with values
+        /// from the data model.
+        /// </summary>
+        public event EventHandler DataBound;
+
+        /// <summary>
+        /// Raises DataBound event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnDataBound(EventArgs e)
+        {
+            if (DataBound != null)
+            {
+                DataBound(this, e);
+            }
+        }
+
+        /// <summary>
+        /// This event is raised after data model has been populated with values from
+        /// web controls.
+        /// </summary>
+        public event EventHandler DataUnbound;
+
+        /// <summary>
+        /// Raises DataBound event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnDataUnbound(EventArgs e)
+        {
+            if (DataUnbound != null)
+            {
+                DataUnbound(this, e);
+            }
+        }
+
+        #endregion
+
+        #region Application context support
+
+        /// <summary>
+        /// Gets or sets Spring application context.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual IApplicationContext ApplicationContext
+        {
+            get { return applicationContext; }
+            set { applicationContext = value; }
+        }
+
+        #endregion
+
+        #region Message source and localization support
+
+        /// <summary>
+        /// Gets or sets the localizer.
+        /// </summary>
+        /// <value>The localizer.</value>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ILocalizer Localizer
+        {
+            get { return localizer; }
+            set
+            {
+                localizer = value;
+                if (localizer.ResourceCache is NullResourceCache)
+                {
+                    localizer.ResourceCache = new AspNetResourceCache();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the local message source.
+        /// </summary>
+        /// <value>The local message source.</value>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IMessageSource MessageSource
+        {
+            get { return messageSource; }
+            set
+            {
+                messageSource = value;
+                if (messageSource != null && messageSource is AbstractMessageSource)
+                {
+                    ((AbstractMessageSource) messageSource).ParentMessageSource = applicationContext;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes local message source
+        /// </summary>
+        protected void InitializeMessageSource()
+        {
+            if (MessageSource == null)
+            {
+                string key = GetType().FullName + ".MessageSource";
+                MessageSource = (IMessageSource) Context.Cache.Get(key);
+
+                if (MessageSource == null)
+                {
+                    ResourceSetMessageSource defaultMessageSource = new ResourceSetMessageSource();
+                    ResourceManager rm = GetLocalResourceManager();
+                    if (rm != null)
+                    {
+                        defaultMessageSource.ResourceManagers.Add(rm);
+                    }
+                    Context.Cache.Insert(key, defaultMessageSource);
+                    MessageSource = defaultMessageSource;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates and returns local ResourceManager for this page.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// In ASP.NET 1.1, this method loads local resources from the web application assembly.
+        /// </para>
+        /// <para>
+        /// However, in ASP.NET 2.0, local resources are compiled into the dynamic assembly, 
+        /// so we need to find that assembly instead and load the resources from it.
+        /// </para>
+        /// </remarks>
+        /// <returns>Local ResourceManager instance.</returns>
+        private ResourceManager GetLocalResourceManager()
+        {
+            object resourceProvider = Page.GetLocalResourceProvider.Invoke(typeof(ResourceExpressionBuilder), new object[] {this});
+            MethodInfo GetLocalResourceAssembly =
+                    resourceProvider.GetType().GetMethod("GetLocalResourceAssembly", BindingFlags.NonPublic | BindingFlags.Instance);
+            Assembly localResourceAssembly = (Assembly) GetLocalResourceAssembly.Invoke(resourceProvider, null);
+            if (localResourceAssembly != null)
+            {
+                return new ResourceManager(VirtualPathUtility.GetFileName(this.AppRelativeVirtualPath), localResourceAssembly);
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Returns message for the specified resource name.
+        /// </summary>
+        /// <param name="name">Resource name.</param>
+        /// <returns>Message text.</returns>
+        public string GetMessage(string name)
+        {
+            return messageSource.GetMessage(name, UserCulture);
+        }
+
+        /// <summary>
+        /// Returns message for the specified resource name.
+        /// </summary>
+        /// <param name="name">Resource name.</param>
+        /// <param name="args">Message arguments that will be used to format return value.</param>
+        /// <returns>Formatted message text.</returns>
+        public string GetMessage(string name, params object[] args)
+        {
+            return messageSource.GetMessage(name, UserCulture, args);
+        }
+
+        /// <summary>
+        /// Returns resource object for the specified resource name.
+        /// </summary>
+        /// <param name="name">Resource name.</param>
+        /// <returns>Resource object.</returns>
+        public object GetResourceObject(string name)
+        {
+            return messageSource.GetResourceObject(name, UserCulture);
+        }
+
+        /// <summary>
+        /// Gets or sets user's culture
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual CultureInfo UserCulture
+        {
+            get { return Page.UserCulture; }
+            set { Page.UserCulture = value; }
+        }
+
+        #endregion
+
+        #region Validation support
+
+        /// <summary>
+        /// Evaluates specified validators and returns <c>True</c> if all of them are valid.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Each validator can itself represent a collection of other validators if it is
+        /// an instance of <see cref="ValidatorGroup"/> or one of its derived types.
+        /// </p>
+        /// <p>
+        /// Please see the Validation Framework section in the documentation for more info.
+        /// </p>
+        /// </remarks>
+        /// <param name="validationContext">Object to validate.</param>
+        /// <param name="validators">Validators to evaluate.</param>
+        /// <returns>
+        /// <c>True</c> if all of the specified validators are valid, <c>False</c> otherwise.
+        /// </returns>
+        public virtual bool Validate(object validationContext, params IValidator[] validators)
+        {
+            IDictionary contextParams = CreateValidatorParameters();
+            bool result = true;
+            foreach (IValidator validator in validators)
+            {
+                if (validator == null)
+                {
+                    throw new ArgumentException("Validator is not defined.");
+                }
+                result = validator.Validate(validationContext, contextParams, this.validationErrors) && result;
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Gets the validation errors container.
+        /// </summary>
+        /// <value>The validation errors container.</value>
+        public virtual IValidationErrors ValidationErrors
+        {
+            get { return validationErrors; }
+        }
+
+        /// <summary>
+        /// Creates the validator parameters.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This method can be overriden if you want to pass additional parameters
+        /// to the validation framework, but you should make sure that you call
+        /// this base implementation in order to add page, session, application,
+        /// request, response and context to the variables collection.
+        /// </para>
+        /// </remarks>
+        /// <returns>
+        /// Dictionary containing parameters that should be passed to
+        /// the data validation framework.
+        /// </returns>
+        protected virtual IDictionary CreateValidatorParameters()
+        {
+            IDictionary parameters = new ListDictionary();
+            parameters["page"] = this.Page;
+            parameters["usercontrol"] = this;
+            parameters["session"] = this.Session;
+            parameters["application"] = this.Application;
+            parameters["request"] = this.Request;
+            parameters["response"] = this.Response;
+            parameters["context"] = this.Context;
+
+            return parameters;
+        }
+
+        #endregion
+
+        #region Spring Page support
+
+        /// <summary>
+        /// Overrides Page property to return <see cref="Spring.Web.UI.Page"/> 
+        /// instead of <see cref="System.Web.UI.Page"/>.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Page Page
+        {
+            get { return (Page) base.Page; }
+        }
+
+        #endregion
+    
+        #region Dependency Injection Support
+
+        /// <summary>
+        /// Holds the default ApplicationContext to be used during DI.
+        /// </summary>
+        IApplicationContext ISupportsWebDependencyInjection.DefaultApplicationContext
+        {
+            get { return defaultApplicationContext; }
+            set { defaultApplicationContext = value; }
+        }
+
+        /// <summary>
+        /// Injects dependencies before adding the control.
+        /// </summary>
+        protected override void AddedControl(Control control,int index)
+        {
+            WebDependencyInjectionUtils.InjectDependenciesRecursive(defaultApplicationContext,control);
+            base.AddedControl(control,index);
+        }
+
+		#endregion Dependency Injection Support
+    }
+
+    #endregion
+
+#endif
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Page.cs b/src/Spring/Spring.Web/Web/UI/Page.cs
new file mode 100644
index 00000000..b8f34263
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Page.cs
@@ -0,0 +1,1667 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Globalization;
+using System.Reflection;
+using System.Resources;
+using System.Security.Permissions;
+using System.Threading;
+using System.Web;
+using System.Web.UI;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Core;
+using Spring.DataBinding;
+using Spring.Globalization;
+using Spring.Globalization.Resolvers;
+using Spring.Util;
+using Spring.Validation;
+using Spring.Web.Process;
+using Spring.Web.Support;
+#if NET_2_0
+using System.Web.Compilation;
+#endif
+using IValidator=Spring.Validation.IValidator;
+
+#endregion
+
+namespace Spring.Web.UI
+{
+    /// <summary>
+    /// Represents an .aspx file, also known as a Web Forms page, requested from a
+    /// server that hosts an ASP.NET Web application.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// The <b>Page</b> class is associated with files that have an .aspx extension.
+    /// These files are compiled at run time as Page objects and cached in server memory.
+    /// </p>
+    /// <p>
+    /// This class extends <see cref="System.Web.UI.Page"/> and adds support for master
+    /// pages similar to upcoming ASP.Net 2.0 master pages feature.
+    /// </p>
+    /// <p>
+    /// It also adds support for automatic localization using local page resource file, and
+    /// simplifies access to global resources (resources from the message source for the
+    /// application context).
+    /// </p>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: Page.cs,v 1.89 2008/04/03 04:32:29 markpollack Exp $</version>
+    [AspNetHostingPermission(SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    [AspNetHostingPermission(SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+    public class Page : System.Web.UI.Page, IHttpHandler, IApplicationContextAware, ISharedStateAware, IProcessAware,
+                        ISupportsWebDependencyInjection, IWebDataBound, IValidationContainer
+    {
+        #region Constants
+
+        private static readonly object EventInitializeControls = new object();
+        private static readonly object EventPreLoadViewState = new object();
+        private static readonly object EventDataBindingsInitialized = new object();
+        private static readonly object EventDataBound = new object();
+        private static readonly object EventDataUnbound = new object();
+#if !NET_2_0
+        private static readonly object EventPreInit = new object();
+        private static readonly object EventInitComplete = new object();
+#else
+        internal static readonly MethodInfo GetLocalResourceProvider =
+                typeof(ResourceExpressionBuilder).GetMethod("GetLocalResourceProvider", BindingFlags.NonPublic | BindingFlags.Static, null,
+                                                            new Type[] {typeof(TemplateControl)}, null);
+#endif
+
+        #endregion
+
+        #region Instance Fields
+
+#if !NET_2_0
+        private static readonly FieldInfo _fiRequestValueCollection =
+            typeof(System.Web.UI.Page).GetField("_requestValueCollection",
+                                                BindingFlags.Instance | BindingFlags.NonPublic);
+
+        private bool passedPreInit = false;
+        private bool passedInit = false;
+        private bool passedTrackViewState = false;
+
+        private MasterPage master;
+        private String masterPageFile;
+#endif
+        private IProcess process;
+        private object controller;
+        private IDictionary sharedState;
+
+        private ILocalizer localizer;
+        private ICultureResolver cultureResolver = new DefaultWebCultureResolver();
+        private IMessageSource messageSource;
+        private IBindingContainer bindingManager;
+        private IValidationErrors validationErrors = new ValidationErrors();
+
+        private IDictionary results;
+        private IApplicationContext applicationContext;
+        private IApplicationContext defaultApplicationContext;
+        private string traceCategory = "Spring.Page";
+
+        private IDictionary styles = new ListDictionary();
+        private IDictionary styleFiles = new ListDictionary();
+        private IDictionary headScripts = new ListDictionary();
+        private string cssRoot = "CSS";
+        private string scriptsRoot = "Scripts";
+        private string imagesRoot = "Images";
+
+        #endregion
+
+        #region Page lifecycle methods
+
+#if !NET_2_0
+        /// <summary>
+        /// Determines the type of request made for the Page class.
+        /// </summary>
+        /// <returns>
+        /// If the post back used the POST method, the form information is returned from the Context object.
+        /// If the postback used the GET method, the query string information is returned.
+        /// If the page is being requested for the first time, a null reference (Nothing in Visual Basic) is returned.
+        /// </returns>
+        /// <remarks>
+        /// Adds support for OnPreInit() in NET 1.1.<br/>
+        /// Overriding this method is the closest match to NET 2.0 OnPreInit()-behaviour.
+        /// </remarks>
+        protected override NameValueCollection DeterminePostBackMode()
+        {
+            NameValueCollection requestValueCollection = base.DeterminePostBackMode();
+            if (!passedPreInit)
+            {
+                _fiRequestValueCollection.SetValue(this, requestValueCollection);
+                passedPreInit = true;
+                OnPreInit(EventArgs.Empty);
+            }
+            return requestValueCollection;
+        }
+
+        /// <summary>
+        /// Overridden to add support for <see cref="OnInitComplete"/>.
+        /// </summary>
+        protected override void TrackViewState()
+        {
+            base.TrackViewState();
+            if (passedInit && !passedTrackViewState)
+            {
+                passedTrackViewState = true;
+                OnInitComplete(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether view state is enabled for this page.
+        /// </summary>
+        protected internal bool IsViewStateEnabled
+        {
+            get
+            {
+                for (Control parent = this; parent != null; parent = parent.Parent)
+                {
+                    if (!parent.EnableViewState)
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Initializes Spring.NET page internals and raises the PreInit event.
+        /// </summary>
+        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+#if !NET_2_0
+        protected virtual void OnPreInit(EventArgs e)
+#else
+        protected override void OnPreInit(EventArgs e)
+#endif
+        {
+            InitializeCulture();
+            InitializeMessageSource();
+#if !NET_2_0
+            EventHandler handler = (EventHandler) base.Events[EventPreInit];
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+#else
+            base.OnPreInit(e);
+#endif
+        }
+
+#if !NET_2_0
+        /// <summary>
+        /// PreInit event.
+        /// </summary>
+        public event EventHandler PreInit
+        {
+            add { base.Events.AddHandler(EventPreInit, value); }
+            remove { base.Events.RemoveHandler(EventPreInit, value); }
+        }
+#endif
+
+        /// <summary>
+        /// Initializes the culture.
+        /// </summary>
+#if !NET_2_0
+        protected virtual void InitializeCulture()
+#else
+        protected override void InitializeCulture()
+#endif
+        {
+            CultureInfo userCulture = this.UserCulture;
+            Thread.CurrentThread.CurrentUICulture = userCulture;
+            if (userCulture.IsNeutralCulture)
+            {
+                Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(userCulture.Name);
+            }
+            else
+            {
+                Thread.CurrentThread.CurrentCulture = userCulture;
+            }
+        }
+
+#if !NET_2_0
+        /// <summary>
+        /// Gets a value indicating whether this instance is in design mode.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance is in design mode; otherwise, <c>false</c>.
+        /// </value>
+        protected bool DesignMode
+        {
+            get { return this.Context == null; }
+        }
+#endif
+
+        /// <summary>
+        /// Initializes data model and controls.
+        /// </summary>
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeBindingManager();
+
+            if (!IsPostBack)
+            {
+                InitializeModel();
+            }
+            else
+            {
+                LoadModel(LoadModelFromPersistenceMedium());
+            }
+
+#if !NET_2_0
+            if (HasMaster)
+            {
+                Trace.Write(traceCategory, "Initialize Master");
+                master = (MasterPage) this.LoadControl(MasterPageFile);
+                master.Initialize(this);
+            }
+#endif
+            base.OnInit(e);
+
+            // initialize controls
+            Trace.Write(traceCategory, "Initialize Controls");
+            OnInitializeControls(EventArgs.Empty);
+
+#if !NET_2_0
+            passedInit = true;
+#endif
+        }
+
+
+#if !NET_2_0
+        /// <summary>
+        /// Raises the <see cref="InitComplete"/> event after page initialization.
+        /// </summary>
+        protected virtual void OnInitComplete(EventArgs e)
+        {
+            EventHandler handler = (EventHandler) base.Events[EventInitComplete];
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// InitComplete event.
+        /// </summary>
+        public event EventHandler InitComplete
+        {
+            add { base.Events.AddHandler(EventInitComplete, value); }
+            remove { base.Events.RemoveHandler(EventInitComplete, value); }
+        }
+#endif
+        /// <summary>
+        /// Raises the <see cref="PreLoadViewState"/> event after page initialization.
+        /// </summary>
+        protected virtual void OnPreLoadViewState(EventArgs e)
+        {
+            EventHandler handler = (EventHandler) base.Events[EventPreLoadViewState];
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// PreLoadViewState event.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This event is raised if <see cref="System.Web.UI.Page.IsPostBack"/> is true
+        /// immediately before state is restored from ViewState.
+        /// </para>
+        /// <para>
+        /// NOTE: Different from <see cref="System.Web.UI.Control.LoadViewState(object)"/>, this event
+        /// will also be raised if the control has no ViewState or ViewState is disabled.
+        /// </para>
+        /// </remarks>
+        public event EventHandler PreLoadViewState
+        {
+            add { base.Events.AddHandler(EventPreLoadViewState, value); }
+            remove { base.Events.RemoveHandler(EventPreLoadViewState, value); }
+        }
+
+        /// <summary>
+        /// Raises the PreLoadViewState event for
+        /// this page and all contained controls.
+        /// </summary>
+        private void RaisePreLoadViewStateEvent()
+        {
+            this.OnPreLoadViewState(EventArgs.Empty);
+            if (this.HasControls())
+            {
+                PreLoadViewStateRecursive(this.Controls);
+            }
+        }
+
+        /// <summary>
+        /// Recursively raises PreLoadViewState event.
+        /// </summary>
+        private void PreLoadViewStateRecursive(ControlCollection controls)
+        {
+            for (int i = 0; i < controls.Count; i++)
+            {
+                Control control = controls[i];
+
+                if (control is UserControl)
+                {
+                    ((UserControl) control).OnPreLoadViewState(EventArgs.Empty);
+                }
+
+                if (control.HasControls())
+                {
+                    PreLoadViewStateRecursive(control.Controls);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Overridden to add support for <see cref="PreLoadViewState"/>
+        /// </summary>
+        /// <remarks>
+        /// If necessary override <see cref="LoadPageStateFromPersistenceMediumBase"/> instead of this method.
+        /// </remarks>
+        protected override object LoadPageStateFromPersistenceMedium()
+        {
+            RaisePreLoadViewStateEvent();
+
+            // If ViewState is disabled, use BindFormData() to populate controls.
+            BindFormDataIfNecessary();
+
+            // continue with default behaviour
+            return LoadPageStateFromPersistenceMediumBase();
+        }
+
+        /// <summary>
+        /// If ViewState is disabled, calls <see cref="BindFormData"/> recursively for all controls.
+        /// </summary>
+        /// <remarks>
+        /// If ViewState is disabled, DropDownLists etc. might not fire "Changed" events.
+        /// </remarks>
+        protected virtual void BindFormDataIfNecessary()
+        {
+            if (!IsViewStateEnabled)
+            {
+                BindFormDataRecursive();
+            }
+        }
+
+        /// <summary>
+        /// Calls <see cref="BindFormData"/> recursively for all controls.
+        /// </summary>
+        protected void BindFormDataRecursive()
+        {
+            this.BindFormData();
+            if (this.HasControls())
+            {
+                BindFormDataRecursive(this.Controls);
+            }
+        }
+
+        /// <summary>
+        /// Recursively calls <see cref="BindFormData"/> for all controls.
+        /// </summary>
+        private void BindFormDataRecursive(ControlCollection controls)
+        {
+            for(int i = 0; i < controls.Count; i++)
+            {
+                Control control = controls[i];
+
+                if(control is UserControl)
+                {
+                    ((UserControl)control).BindFormData();
+                }
+
+                if(control.HasControls())
+                {
+                    BindFormDataRecursive(control.Controls);
+                }
+            }
+        }
+
+        /// <summary>
+        /// If necessary override this method instead of <see cref="LoadPageStateFromPersistenceMedium"/>
+        /// </summary>
+        protected virtual object LoadPageStateFromPersistenceMediumBase()
+        {
+            return base.LoadPageStateFromPersistenceMedium();
+        }
+
+        /// <summary>
+        /// Initializes dialog result and unbinds data from the controls
+        /// into a data model.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected override void OnLoad(EventArgs e)
+        {
+            // create dialog result if necessary
+//            if (GetType().IsDefined(typeof(DialogAttribute), true))
+//            {
+//                if (!IsPostBack)
+//                {
+//                    ViewState["__dialogResult"] = "redirect:" + Request.UrlReferrer.AbsoluteUri;
+//                }
+//                Results["close"] = new Result((string) ViewState["__dialogResult"]);
+//            }
+
+            if (IsPostBack)
+            {
+                // unbind form data
+                UnbindFormData();
+            }
+
+
+            Trace.Write(traceCategory, "Execute Handlers for Load Event");
+            base.OnLoad(e);
+        }
+
+        /// <summary>
+        /// Binds data from the data model into controls and raises
+        /// PreRender event afterwards.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected override void OnPreRender(EventArgs e)
+        {
+            if (Process == null || !Process.ViewChanged)
+            {
+                // bind data from model to form
+                BindFormData();
+
+                if (localizer != null)
+                {
+                    Trace.Write(traceCategory, "Apply Localized Resources");
+                    localizer.ApplyResources(this, messageSource, UserCulture);
+                }
+            }
+
+            base.OnPreRender(e);
+
+            object modelToSave = SaveModel();
+            if (modelToSave != null)
+            {
+                SaveModelToPersistenceMedium(modelToSave);
+            }
+        }
+
+        /// <summary>
+        /// This event is raised before Init event and should be used to initialize
+        /// controls as necessary.
+        /// </summary>
+        public event EventHandler InitializeControls
+        {
+            add { base.Events.AddHandler(EventInitializeControls, value); }
+            remove { base.Events.RemoveHandler(EventInitializeControls, value); }
+        }
+
+        /// <summary>
+        /// Raises InitializeControls event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnInitializeControls(EventArgs e)
+        {
+            EventHandler handler = (EventHandler) base.Events[EventInitializeControls];
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Obtains a <see cref="T:System.Web.UI.UserControl"/> object from a user control file
+        /// and injects dependencies according to Spring config file.
+        /// </summary>
+        /// <param name="virtualPath">The virtual path to a user control file.</param>
+        /// <returns>
+        /// Returns the specified <see langword="UserControl"/> object, with dependencies injected.
+        /// </returns>
+        protected new Control LoadControl(string virtualPath)
+        {
+            Control control = base.LoadControl(virtualPath);
+            WebDependencyInjectionUtils.InjectDependenciesRecursive(defaultApplicationContext, control);
+            return control;
+        }
+
+#if NET_2_0
+    /// <summary>
+    /// Obtains a <see cref="T:System.Web.UI.UserControl"/> object by type
+    /// and injects dependencies according to Spring config file.
+    /// </summary>
+    /// <param name="t">The type of a user control.</param>
+    /// <param name="parameters">parameters to pass to the control</param>
+    /// <returns>
+    /// Returns the specified <see langword="UserControl"/> object, with dependencies injected.
+    /// </returns>
+        protected new Control LoadControl(Type t, params object[] parameters)
+        {
+            Control control = base.LoadControl(t, parameters);
+            WebDependencyInjectionUtils.InjectDependenciesRecursive(defaultApplicationContext, control);
+            return control;
+        }
+#endif
+
+        #endregion
+
+        #region Model Management Support
+
+        /// <summary>
+        /// Initializes data model when the page is first loaded.
+        /// </summary>
+        /// <remarks>
+        /// This method should be overriden by the developer
+        /// in order to initialize data model for the page.
+        /// </remarks>
+        protected virtual void InitializeModel()
+        {
+        }
+
+        /// <summary>
+        /// Retrieves data model from a persistence store.
+        /// </summary>
+        /// <remarks>
+        /// The default implementation uses <see cref="System.Web.UI.Page.Session"/> to store and retrieve
+        /// the model for the current <see cref="System.Web.HttpRequest.CurrentExecutionFilePath" />
+        /// </remarks>
+        protected virtual object LoadModelFromPersistenceMedium()
+        {
+            return Session[Request.CurrentExecutionFilePath + ".Model"];
+        }
+
+        /// <summary>
+        /// Saves data model to a persistence store.
+        /// </summary>
+        /// <remarks>
+        /// The default implementation uses <see cref="System.Web.UI.Page.Session"/> to store and retrieve
+        /// the model for the current <see cref="System.Web.HttpRequest.CurrentExecutionFilePath" />
+        /// </remarks>
+        protected virtual void SaveModelToPersistenceMedium(object modelToSave)
+        {
+            Session[Request.CurrentExecutionFilePath + ".Model"] = modelToSave;
+        }
+
+        /// <summary>
+        /// Loads the saved data model on postback.
+        /// </summary>
+        /// <remarks>
+        /// This method should be overriden by the developer
+        /// in order to load data model for the page.
+        /// </remarks>
+        protected virtual void LoadModel(object savedModel)
+        {
+        }
+
+        /// <summary>
+        /// Returns a model object that should be saved.
+        /// </summary>
+        /// <remarks>
+        /// This method should be overriden by the developer
+        /// in order to save data model for the page.
+        /// </remarks>
+        /// <returns>
+        /// A model object that should be saved.
+        /// </returns>
+        protected virtual object SaveModel()
+        {
+            return null;
+        }
+
+        #endregion
+
+        #region Process and Controller support
+
+        /// <summary>
+        /// Gets or sets the process that this page belongs to.
+        /// </summary>
+        public IProcess Process
+        {
+            get { return this.process; }
+            set { this.process = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets controller for the page.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Application pages should shadow this property and change its type
+        /// in order to make calls to controller within the page as simple as possible.
+        /// </para>
+        /// <para>
+        /// If external controller is not specified, page will serve as its own controller,
+        /// which will allow data binding to work properly.
+        /// </para>
+        /// </remarks>
+        /// <value>Controller for the page. Defaults to the page itself.</value>
+        public object Controller
+        {
+            get { return GetController(); }
+            set { SetController(value); }
+        }
+
+        /// <summary>
+        /// <para>Stores the controller to be returned by <see cref="Controller"/> property.</para>
+        /// </summary>
+        /// <remarks>
+        /// The default implementation uses a field to store the reference. Derived classes may override this behaviour
+        /// but must ensure to also change the behaviour of <see cref="GetController"/> accordingly.
+        /// </remarks>
+        /// <param name="controller">Controller for the page.</param>
+        protected virtual void SetController(object controller)
+        {
+            this.controller = controller;
+        }
+
+        /// <summary>
+        /// <para>Returns the controller stored by <see cref="SetController"/>.</para>
+        /// </summary>
+        /// <remarks>
+        /// The default implementation uses a field to retrieve the reference. Derived classes may override this behaviour
+        /// but must ensure to also change the behaviour of <see cref="SetController"/> accordingly.
+        /// </remarks>
+        /// <returns>
+        /// The controller for this page.
+        /// <list type="bullet">
+        /// <item>If this page is being part of a process, the process' <see cref="IProcess.Controller"/> is returned.</item>
+        /// <item>If no controller is set, a reference to the page itself is returned.</item>
+        /// </list>
+        /// </returns>
+        protected virtual object GetController()
+        {
+            if (controller == null)
+            {
+                if (process != null)
+                {
+                    return process.Controller;
+                }
+                else
+                {
+                    return this;
+                }
+            }
+            return controller;
+        }
+
+        #endregion
+
+        #region Shared State support
+
+        /// <summary>
+        /// Returns a thread-safe dictionary that contains state that is shared by
+        /// all instances of this page.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IDictionary SharedState
+        {
+            get { return this.sharedState; }
+            set { this.sharedState = value; }
+        }
+
+#if NET_2_0
+    /// <summary>
+    /// Overrides the default PreviousPage property to return an instance of <see cref="Spring.Web.UI.Page"/>,
+    /// and to work properly during server-side transfers and executes.
+    /// </summary>
+        public new Page PreviousPage
+        {
+            get { return this.Context.PreviousHandler as Page; }
+        }
+#endif
+
+        #endregion
+
+        #region Master Page support
+
+#if !NET_2_0
+        /// <summary>
+        /// Reference to a master page template.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Master page can be any user control that defines form element and one or more &lt;spring:ContentPlaceHolder/&gt; controls.
+        /// Placeholders in the master page can contain default content that will be replaced by the content defined in child pages.
+        /// </p>
+        /// <p>
+        /// Child pages should only define content they want to override using appropriate &lt;spring:Content/&gt; control
+        /// that references appropriate content placeholder in the master page. Child pages don't have to define
+        /// content elements for every placeholder in the master page. In that case, child page will simply inherit
+        /// default content from the placeholder.
+        /// </p>
+        /// </remarks>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public MasterPage Master
+        {
+            get { return master; }
+        }
+
+        /// <summary>
+        /// Convinience property that allows users to specify master page using its file name
+        /// </summary>
+        public String MasterPageFile
+        {
+            get { return masterPageFile; }
+            set { masterPageFile = value; }
+        }
+
+        /// <summary>
+        /// Renders this page, taking master page into account.
+        /// </summary>
+        /// <param name="writer">The <see langword="HtmlTextWriter"/> object that receives the server control content.</param>
+        protected override void Render(HtmlTextWriter writer)
+        {
+            if (HasMaster)
+            {
+                Master.RenderControl(writer);
+            }
+            else
+            {
+                base.Render(writer);
+            }
+        }
+#else
+    /// <summary>
+    /// Gets the master page that determines the overall look of the page.
+    /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new MasterPage Master
+        {
+            get { return (MasterPage) base.Master; }
+        }
+
+#endif
+
+        /// <summary>
+        /// Returns true if page uses master page, false otherwise.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool HasMaster
+        {
+            get { return Master != null || MasterPageFile != null; }
+        }
+
+        #endregion
+
+        #region CSS support
+
+        /// <summary>
+        /// Gets a dictionary of registered styles.
+        /// </summary>
+        /// <value>Registered styles.</value>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IDictionary Styles
+        {
+            get { return styles; }
+        }
+
+        /// <summary>
+        /// Gets a dictionary of registered style files.
+        /// </summary>
+        /// <value>Registered style files.</value>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IDictionary StyleFiles
+        {
+            get { return styleFiles; }
+        }
+
+        /// <summary>
+        /// Registers single CSS style with the page.
+        /// </summary>
+        /// <param name="name">Style name.</param>
+        /// <param name="style">Style definition.</param>
+        public void RegisterStyle(string name, string style)
+        {
+            styles[name] = style;
+        }
+
+        /// <summary>
+        /// Returns <c>True</c> if specified style is registered, <c>False</c> otherwise.
+        /// </summary>
+        /// <param name="name">Style name.</param>
+        /// <returns><c>True</c> if specified style is registered, <c>False</c> otherwise.</returns>
+        public bool IsStyleRegistered(string name)
+        {
+            return styles.Contains(name);
+        }
+
+        /// <summary>
+        /// Registers CSS file with the page.
+        /// </summary>
+        /// <param name="key">Style file key.</param>
+        /// <param name="fileName">Style file name.</param>
+        public void RegisterStyleFile(string key, string fileName)
+        {
+            styleFiles[key] = fileName;
+        }
+
+        /// <summary>
+        /// Returns <c>True</c> if specified style file is registered, <c>False</c> otherwise.
+        /// </summary>
+        /// <param name="key">Style file key.</param>
+        /// <returns><c>True</c> if specified style file is registered, <c>False</c> otherwise.</returns>
+        public bool IsStyleFileRegistered(string key)
+        {
+            return styleFiles.Contains(key);
+        }
+
+        #endregion
+
+        #region Client script support
+
+        /// <summary>
+        /// Gets a dictionary of registered head scripts.
+        /// </summary>
+        /// <value>Registered head scripts.</value>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IDictionary HeadScripts
+        {
+            get { return headScripts; }
+        }
+
+        /// <summary>
+        /// Registers script block that should be rendered within the <c>head</c> HTML element.
+        /// </summary>
+        /// <param name="key">Script key.</param>
+        /// <param name="script">Script text.</param>
+        public void RegisterHeadScriptBlock(string key, string script)
+        {
+            RegisterHeadScriptBlock(key, Script.DefaultType, script);
+        }
+
+        /// <summary>
+        /// Registers script block that should be rendered within the <c>head</c> HTML element.
+        /// </summary>
+        /// <param name="key">Script key.</param>
+        /// <param name="language">Script language.</param>
+        /// <param name="script">Script text.</param>
+        [Obsolete("The 'language' attribute is deprecated. Please use RegisterHeadScriptBlock(string key, MimeMediaType type, string script) instead", false)]
+        public void RegisterHeadScriptBlock(string key, string language, string script)
+        {
+            headScripts[key] = new ScriptBlock(language, script);
+        }
+
+        /// <summary>
+        /// Registers script block that should be rendered within the <c>head</c> HTML element.
+        /// </summary>
+        /// <param name="key">Script key.</param>
+        /// <param name="type">Script language MIME type.</param>
+        /// <param name="script">Script text.</param>
+        public void RegisterHeadScriptBlock(string key, MimeMediaType type, string script)
+        {
+            headScripts[key] = new ScriptBlock(type, script);
+        }
+
+        /// <summary>
+        /// Registers script file that should be referenced within the <c>head</c> HTML element.
+        /// </summary>
+        /// <param name="key">Script key.</param>
+        /// <param name="fileName">Script file name.</param>
+        public void RegisterHeadScriptFile(string key, string fileName)
+        {
+            RegisterHeadScriptFile(key, Script.DefaultType, fileName);
+        }
+
+        /// <summary>
+        /// Registers script file that should be referenced within the <c>head</c> HTML element.
+        /// </summary>
+        /// <param name="key">Script key.</param>
+        /// <param name="language">Script language.</param>
+        /// <param name="fileName">Script file name.</param>
+        [Obsolete("The 'language' attribute is deprecated. Please use RegisterHeadScriptFile(string key, MimeMediaType type, string filename) instead", false)]
+        public void RegisterHeadScriptFile(string key, string language, string fileName)
+        {
+            headScripts[key] = new ScriptFile(language, fileName);
+        }
+
+        /// <summary>
+        /// Registers script file that should be referenced within the <c>head</c> HTML element.
+        /// </summary>
+        /// <param name="key">Script key.</param>
+        /// <param name="type">Script language MIME type.</param>
+        /// <param name="fileName">Script file name.</param>
+        public void RegisterHeadScriptFile(string key, MimeMediaType type, string fileName)
+        {
+            headScripts[key] = new ScriptFile(type, fileName);
+        }
+
+        /// <summary>
+        /// Registers script block that should be rendered within the <c>head</c> HTML element.
+        /// </summary>
+        /// <param name="key">Script key.</param>
+        /// <param name="element">Element ID of the event source.</param>
+        /// <param name="eventName">Name of the event to handle.</param>
+        /// <param name="script">Script text.</param>
+        public void RegisterHeadScriptEvent(string key, string element, string eventName, string script)
+        {
+            RegisterHeadScriptEvent(key, Script.DefaultType, element, eventName, script);
+        }
+
+        /// <summary>
+        /// Registers script block that should be rendered within the <c>head</c> HTML element.
+        /// </summary>
+        /// <param name="key">Script key.</param>
+        /// <param name="language">Script language.</param>
+        /// <param name="element">Element ID of the event source.</param>
+        /// <param name="eventName">Name of the event to handle.</param>
+        /// <param name="script">Script text.</param>
+        [Obsolete("The 'language' attribute is deprecated. Please use RegisterHeadScriptEvent(string key, MimeMediaType mimeType, string element, string eventName, string script) instead")]
+        public void RegisterHeadScriptEvent(string key, string language, string element, string eventName, string script)
+        {
+            headScripts[key] = new ScriptEvent(language, element, eventName, script);
+        }
+
+        /// <summary>
+        /// Registers script block that should be rendered within the <c>head</c> HTML element.
+        /// </summary>
+        /// <param name="key">Script key.</param>
+        /// <param name="mimeType">The scripting language's MIME type.</param>
+        /// <param name="element">Element ID of the event source.</param>
+        /// <param name="eventName">Name of the event to handle.</param>
+        /// <param name="script">Script text.</param>
+        public void RegisterHeadScriptEvent(string key, MimeMediaType mimeType, string element, string eventName, string script)
+        {
+            headScripts[key] = new ScriptEvent(mimeType, element, eventName, script);
+        }
+
+        /// <summary>
+        /// Returns <c>True</c> if specified head script is registered, <c>False</c> otherwise.
+        /// </summary>
+        /// <param name="key">Script key.</param>
+        /// <returns><c>True</c> if specified head script is registered, <c>False</c> otherwise.</returns>
+        public bool IsHeadScriptRegistered(string key)
+        {
+            return headScripts.Contains(key);
+        }
+
+        #endregion
+
+        #region Well-known folders support
+
+        /// <summary>
+        /// Gets or sets the CSS root.
+        /// </summary>
+        /// <value>The CSS root.</value>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string CssRoot
+        {
+            get { return WebUtils.CreateAbsolutePath(Request.ApplicationPath, cssRoot); }
+            set { cssRoot = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the scripts root.
+        /// </summary>
+        /// <value>The scripts root.</value>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string ScriptsRoot
+        {
+            get { return WebUtils.CreateAbsolutePath(Request.ApplicationPath, scriptsRoot); }
+            set { scriptsRoot = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the images root.
+        /// </summary>
+        /// <value>The images root.</value>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string ImagesRoot
+        {
+            get { return WebUtils.CreateAbsolutePath(Request.ApplicationPath, imagesRoot); }
+            set { imagesRoot = value; }
+        }
+
+        #endregion
+
+        #region Result support
+
+        /// <summary>
+        /// Gets or sets map of result names to target URLs
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IDictionary Results
+        {
+            get
+            {
+                if (results == null)
+                {
+                    results = new Hashtable();
+                }
+                return results;
+            }
+            set
+            {
+                results = new Hashtable();
+                foreach (DictionaryEntry entry in value)
+                {
+                    if (entry.Value is Result)
+                    {
+                        results[entry.Key] = entry.Value;
+                    }
+                    else if (entry.Value is String)
+                    {
+                        results[entry.Key] = new Result((string) entry.Value);
+                    }
+                    else
+                    {
+                        throw new TypeMismatchException(
+                            "Unable to create result object. Please use either String or Result instances to define results.");
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Redirects user to a URL mapped to specified result name.
+        /// </summary>
+        /// <param name="resultName">Result name.</param>
+        protected internal void SetResult(string resultName)
+        {
+            GetResult(resultName).Navigate(this);
+        }
+
+
+        /// <summary>
+        /// Redirects user to a URL mapped to specified result name.
+        /// </summary>
+        /// <param name="resultName">Name of the result.</param>
+        /// <param name="context">The context to use for evaluating the SpEL expression in the Result.</param>
+        protected internal void SetResult(string resultName, object context)
+        {
+            GetResult(resultName).Navigate(context);
+        }
+
+
+        /// <summary>
+        /// Returns a redirect url string that points to the 
+        /// <see cref="Spring.Web.Support.Result.TargetPage"/> defined by this
+        /// result evaluated using this Page for expression 
+        /// </summary>
+        /// <param name="resultName">Name of the result.</param>
+        /// <returns>A redirect url string.</returns>
+        protected internal string GetResultUrl(string resultName)
+        {
+            Result result = GetResult(resultName);
+            return ResolveUrl(result.GetRedirectUri(this));
+        }
+
+        /// <summary>
+        /// Returns a redirect url string that points to the 
+        /// <see cref="Spring.Web.Support.Result.TargetPage"/> defined by this
+        /// result evaluated using this Page for expression 
+        /// </summary>
+        /// <param name="resultName">Name of the result.</param>
+        /// <param name="context">The context to use for evaluating the SpEL expression in the Result</param>
+        /// <returns>A redirect url string.</returns>
+        protected internal string GetResultUrl(string resultName, object context)
+        {
+            Result result = GetResult(resultName);
+            return ResolveUrl(result.GetRedirectUri(context));
+        }
+
+
+        private Result GetResult(string resultName)
+        {
+            Result result = (Result)Results[resultName];
+            if (result == null)
+            {
+                throw new ArgumentException(
+                    string.Format("No URL mapping found for the specified result '{0}'.", resultName), "resultName");
+            }
+            return result;
+        }
+
+
+
+        #endregion
+
+        #region Validation support
+
+        /// <summary>
+        /// Evaluates specified validators and returns <c>True</c> if all of them are valid.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Each validator can itself represent a collection of other validators if it is
+        /// an instance of <see cref="ValidatorGroup"/> or one of its derived types.
+        /// </p>
+        /// <p>
+        /// Please see the Validation Framework section in the documentation for more info.
+        /// </p>
+        /// </remarks>
+        /// <param name="validationContext">Object to validate.</param>
+        /// <param name="validators">Validators to evaluate.</param>
+        /// <returns>
+        /// <c>True</c> if all of the specified validators are valid, <c>False</c> otherwise.
+        /// </returns>
+        public bool Validate(object validationContext, params IValidator[] validators)
+        {
+            IDictionary contextParams = CreateValidatorParameters();
+            bool result = true;
+            foreach (IValidator validator in validators)
+            {
+                if (validator == null)
+                {
+                    throw new ArgumentException("Validator is not defined.");
+                }
+                result = validator.Validate(validationContext, contextParams, this.validationErrors) && result;
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Gets the validation errors container.
+        /// </summary>
+        /// <value>The validation errors container.</value>
+        public virtual IValidationErrors ValidationErrors
+        {
+            get { return validationErrors; }
+        }
+
+        /// <summary>
+        /// Creates the validator parameters.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This method can be overriden if you want to pass additional parameters
+        /// to the validation framework, but you should make sure that you call
+        /// this base implementation in order to add page, session, application,
+        /// request, response and context to the variables collection.
+        /// </para>
+        /// </remarks>
+        /// <returns>
+        /// Dictionary containing parameters that should be passed to
+        /// the data validation framework.
+        /// </returns>
+        protected virtual IDictionary CreateValidatorParameters()
+        {
+            IDictionary parameters = new ListDictionary();
+            parameters["page"] = this;
+            parameters["session"] = this.Session;
+            parameters["application"] = this.Application;
+            parameters["request"] = this.Request;
+            parameters["response"] = this.Response;
+            parameters["context"] = this.Context;
+
+            return parameters;
+        }
+
+        #endregion
+
+        #region Data binding support
+
+        /// <summary>
+        /// Initializes the data bindings.
+        /// </summary>
+        protected virtual void InitializeDataBindings()
+        {
+        }
+
+        /// <summary>
+        /// Returns the key to be used for looking up a cached
+        /// BindingManager instance in <see cref="SharedState"/>.
+        /// </summary>
+        /// <returns>a unique key identifying the <see cref="IBindingContainer"/> instance in the <see cref="SharedState"/> dictionary.</returns>
+        protected virtual string GetBindingManagerKey()
+        {
+            return CreateSharedStateKey("DataBindingManager");
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="IBindingContainer"/> instance.
+        /// </summary>
+        /// <remarks>
+        /// This factory method is called if no <see cref="IBindingContainer"/> could be found in <see cref="SharedState"/>
+        /// using the key returned by <see cref="GetBindingManagerKey"/>.<br/>
+        /// <br/>
+        ///
+        /// </remarks>
+        /// <returns>a <see cref="IBindingContainer"/> instance to be used for DataBinding</returns>
+        protected virtual IBindingContainer CreateBindingManager()
+        {
+            return new BaseBindingManager();
+        }
+
+		/// <summary>
+		/// Expose BindingManager via IDataBound interface
+		/// </summary>
+    	IBindingContainer IDataBound.BindingManager
+    	{
+    		get { return this.BindingManager; }
+    	}
+
+        /// <summary>
+        /// Gets the binding manager.
+        /// </summary>
+        /// <value>The binding manager.</value>
+        protected IBindingContainer BindingManager
+        {
+            get { return this.bindingManager; }
+        }
+
+        /// <summary>
+        /// Initializes binding manager and data bindings if necessary.
+        /// </summary>
+        private void InitializeBindingManager()
+        {
+            IDictionary sharedState = this.SharedState;
+
+            string key = GetBindingManagerKey();
+            this.bindingManager = sharedState[key] as BaseBindingManager;
+            if (this.bindingManager == null)
+            {
+                // access to shared state must be synchronized
+                lock (this.SharedState.SyncRoot)
+                {
+                    this.bindingManager = sharedState[key] as BaseBindingManager;
+                    if (this.bindingManager == null)
+                    {
+                        Trace.Write(traceCategory, "Initialize Data Bindings");
+                        this.bindingManager = CreateBindingManager();
+                        if (this.bindingManager == null)
+                        {
+                            throw new ArgumentNullException("bindingManager",
+                                                            "CreateBindingManager() must not return null");
+                        }
+                        InitializeDataBindings();
+                        sharedState[key] = this.bindingManager;
+                        OnDataBindingsInitialized(EventArgs.Empty);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Raises the <see cref="DataBindingsInitialized"/> event.
+        /// </summary>
+        protected virtual void OnDataBindingsInitialized(EventArgs e)
+        {
+            EventHandler handler = (EventHandler)base.Events[EventDataBindingsInitialized];
+
+            if(handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// This event is raised after <see cref="BindingManager"/> as been initialized.
+        /// </summary>
+        public event EventHandler DataBindingsInitialized
+        {
+            add
+            {
+                base.Events.AddHandler(EventDataBindingsInitialized, value);
+            }
+            remove
+            {
+                base.Events.RemoveHandler(EventDataBindingsInitialized, value);
+            }
+        }
+
+        /// <summary>
+        /// Bind data from model to form.
+        /// </summary>
+        protected virtual void BindFormData()
+        {
+            if (BindingManager.HasBindings)
+            {
+                Trace.Write(traceCategory, "Bind Data Model onto Controls");
+
+                BindingManager.BindTargetToSource(this, Controller, ValidationErrors);
+            }
+            OnDataBound(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Unbind data from form to model.
+        /// </summary>
+        protected virtual void UnbindFormData()
+        {
+            if (BindingManager.HasBindings)
+            {
+                Trace.Write(traceCategory, "Unbind Controls into Data Model");
+
+                BindingManager.BindSourceToTarget(this, Controller, ValidationErrors);
+            }
+            OnDataUnbound(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// This event is raised after all controls have been populated with values
+        /// from the data model.
+        /// </summary>
+        public event EventHandler DataBound
+        {
+            add { base.Events.AddHandler(EventDataBound, value); }
+            remove { base.Events.RemoveHandler(EventDataBound, value); }
+        }
+
+        /// <summary>
+        /// Raises DataBound event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnDataBound(EventArgs e)
+        {
+            EventHandler handler = (EventHandler) base.Events[EventDataBound];
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// This event is raised after data model has been populated with values from
+        /// web controls.
+        /// </summary>
+        public event EventHandler DataUnbound
+        {
+            add { base.Events.AddHandler(EventDataUnbound, value); }
+            remove { base.Events.RemoveHandler(EventDataUnbound, value); }
+        }
+
+        /// <summary>
+        /// Raises DataBound event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnDataUnbound(EventArgs e)
+        {
+            EventHandler handler = (EventHandler) base.Events[EventDataUnbound];
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        #endregion
+
+        #region Application context support
+
+        /// <summary>
+        /// Gets or sets Spring application context of the page.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual IApplicationContext ApplicationContext
+        {
+            get { return applicationContext; }
+            set { applicationContext = value; }
+        }
+
+        #endregion
+
+        #region Message source and localization support
+
+        /// <summary>
+        /// Gets or sets the localizer.
+        /// </summary>
+        /// <value>The localizer.</value>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ILocalizer Localizer
+        {
+            get { return this.localizer; }
+            set
+            {
+                this.localizer = value;
+                if (this.localizer.ResourceCache is NullResourceCache)
+                {
+                    this.localizer.ResourceCache = new SharedStateResourceCache(this);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the culture resolver.
+        /// </summary>
+        /// <value>The culture resolver.</value>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ICultureResolver CultureResolver
+        {
+            get
+            {
+//                if (cultureResolver == null)
+//                {
+//                    cultureResolver = new DefaultWebCultureResolver();
+//                }
+                return cultureResolver;
+            }
+            set { cultureResolver = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the local message source.
+        /// </summary>
+        /// <value>The local message source.</value>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IMessageSource MessageSource
+        {
+            get { return messageSource; }
+            set
+            {
+                messageSource = value;
+                if (messageSource != null && messageSource is AbstractMessageSource)
+                {
+                    ((AbstractMessageSource) messageSource).ParentMessageSource = applicationContext;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes local message source
+        /// </summary>
+        private void InitializeMessageSource()
+        {
+            if (MessageSource == null)
+            {
+                string MessageSourceKey = CreateSharedStateKey("MessageSource");
+                if (this.SharedState[MessageSourceKey] == null)
+                {
+                    lock (this.SharedState.SyncRoot)
+                    {
+                        if (this.SharedState[MessageSourceKey] == null)
+                        {
+                            ResourceSetMessageSource defaultMessageSource = new ResourceSetMessageSource();
+                            defaultMessageSource.UseCodeAsDefaultMessage = true;
+                            ResourceManager rm = GetLocalResourceManager();
+                            if (rm != null)
+                            {
+                                defaultMessageSource.ResourceManagers.Add(rm);
+                            }
+                            this.SharedState[MessageSourceKey] = defaultMessageSource;
+                        }
+                    }
+                }
+
+                MessageSource = (IMessageSource) this.SharedState[MessageSourceKey];
+            }
+        }
+
+        /// <summary>
+        /// Creates and returns local ResourceManager for this page.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// In ASP.NET 1.1, this method loads local resources from the web application assembly.
+        /// </para>
+        /// <para>
+        /// However, in ASP.NET 2.0, local resources are compiled into a dynamic assembly,
+        /// so we need to find that assembly and load the resources from it.
+        /// </para>
+        /// </remarks>
+        /// <returns>Local ResourceManager instance.</returns>
+        private ResourceManager GetLocalResourceManager()
+        {
+#if !NET_2_0
+            return new ResourceManager(GetType().BaseType);
+#else
+            object resourceProvider = GetLocalResourceProvider.Invoke(typeof(ResourceExpressionBuilder), new object[] {this});
+            MethodInfo GetLocalResourceAssembly =
+                    resourceProvider.GetType().GetMethod("GetLocalResourceAssembly", BindingFlags.NonPublic | BindingFlags.Instance);
+            Assembly localResourceAssembly = (Assembly) GetLocalResourceAssembly.Invoke(resourceProvider, null);
+            if (localResourceAssembly != null)
+            {
+                return new ResourceManager(VirtualPathUtility.GetFileName(this.AppRelativeVirtualPath), localResourceAssembly);
+            }
+
+            return null;
+#endif
+        }
+
+        /// <summary>
+        /// Returns message for the specified resource name.
+        /// </summary>
+        /// <param name="name">Resource name.</param>
+        /// <returns>Message text.</returns>
+        public string GetMessage(string name)
+        {
+            return messageSource.GetMessage(name, UserCulture);
+        }
+
+        /// <summary>
+        /// Returns message for the specified resource name.
+        /// </summary>
+        /// <param name="name">Resource name.</param>
+        /// <param name="args">Message arguments that will be used to format return value.</param>
+        /// <returns>Formatted message text.</returns>
+        public string GetMessage(string name, params object[] args)
+        {
+            return messageSource.GetMessage(name, UserCulture, args);
+        }
+
+        /// <summary>
+        /// Returns resource object for the specified resource name.
+        /// </summary>
+        /// <param name="name">Resource name.</param>
+        /// <returns>Resource object.</returns>
+        public object GetResourceObject(string name)
+        {
+            return messageSource.GetResourceObject(name, UserCulture);
+        }
+
+        /// <summary>
+        /// Gets or sets user's culture
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual CultureInfo UserCulture
+        {
+            get { return CultureResolver.ResolveCulture(); }
+            set
+            {
+                CultureResolver.SetCulture(value);
+                Thread.CurrentThread.CurrentUICulture = value;
+                if (value.IsNeutralCulture)
+                {
+                    Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(value.Name);
+                }
+                else
+                {
+                    Thread.CurrentThread.CurrentCulture = value;
+                }
+                OnUserCultureChanged(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// This event is raised when the value of UserLocale property changes.
+        /// </summary>
+        public event EventHandler UserCultureChanged;
+
+        /// <summary>
+        /// Raises UserLocaleChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnUserCultureChanged(EventArgs e)
+        {
+            if (UserCultureChanged != null)
+            {
+                UserCultureChanged(this, e);
+            }
+        }
+
+        #endregion
+
+        #region Helper methods
+
+        /// <summary>
+        /// Creates a key for shared state, taking into account whether
+        /// this page belongs to a process or not.
+        /// </summary>
+        /// <param name="key">Key suffix</param>
+        /// <returns>Generated unique shared state key.</returns>
+        protected string CreateSharedStateKey(string key)
+        {
+            if (this.Process != null)
+            {
+                return this.Process.CurrentView + "." + key;
+            }
+            else
+            {
+                return key;
+            }
+        }
+
+        #endregion
+
+        #region Dependency Injection Support
+
+        /// <summary>
+        /// Holds default ApplicationContext instance to be used during DI.
+        /// </summary>
+        IApplicationContext ISupportsWebDependencyInjection.DefaultApplicationContext
+        {
+            get { return defaultApplicationContext; }
+            set { defaultApplicationContext = value; }
+        }
+
+        /// <summary>
+        /// Injects dependencies into control before adding it.
+        /// </summary>
+        protected override void AddedControl(Control control, int index)
+        {
+            WebDependencyInjectionUtils.InjectDependenciesRecursive(defaultApplicationContext, control);
+            base.AddedControl(control, index);
+        }
+
+        #endregion Dependency Injection Support
+
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/UserControl.cs b/src/Spring/Spring.Web/Web/UI/UserControl.cs
new file mode 100644
index 00000000..7306003d
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/UserControl.cs
@@ -0,0 +1,1066 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Globalization;
+using System.Reflection;
+using System.Resources;
+using System.Web;
+#if NET_2_0
+using System.Web.Compilation;
+#endif
+using System.Web.UI;
+using Spring.Collections;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Core;
+using Spring.DataBinding;
+using Spring.Globalization;
+using Spring.Validation;
+using Spring.Web.Support;
+using IValidator = Spring.Validation.IValidator;
+
+#endregion
+
+namespace Spring.Web.UI
+{
+    /// <summary>
+    /// Extends standard .Net user control by adding data binding and localization functionality.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: UserControl.cs,v 1.54 2008/04/03 05:31:25 markpollack Exp $</version>
+    public class UserControl : System.Web.UI.UserControl, IApplicationContextAware, IWebDataBound, ISupportsWebDependencyInjection,
+                               IPostBackDataHandler,IValidationContainer
+    {
+        #region Static fields
+
+        private static readonly object EventPreLoadViewState = new object();
+        private static readonly object EventDataBindingsInitialized = new object();
+        private static readonly object EventDataBound = new object();
+        private static readonly object EventDataUnbound = new object();
+
+        #endregion
+
+        #region Instance Fields
+
+        private object controller;
+        private ILocalizer localizer;
+        private IMessageSource messageSource;
+        private IDictionary sharedState;
+        private IBindingContainer bindingManager;
+        private IValidationErrors validationErrors = new ValidationErrors();
+        private IDictionary results;
+        private IApplicationContext applicationContext;
+        private IApplicationContext defaultApplicationContext;
+        private bool needsUnbind = false;
+
+        #endregion
+
+        #region Control lifecycle methods
+
+#if !NET_2_0
+        /// <summary>
+        /// Gets a value indicating whether this instance is in design mode.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance is in design mode; otherwise, <c>false</c>.
+        /// </value>
+        protected bool DesignMode
+        {
+            get { return this.Context == null; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether view state is enabled for this page.
+        /// </summary>
+        protected internal bool IsViewStateEnabled
+        {
+            get
+            {
+                for (Control parent = this; parent != null; parent = parent.Parent)
+                {
+                    if (!parent.EnableViewState)
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Initializes user control.
+        /// </summary>
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeMessageSource();
+            InitializeBindingManager();
+
+            if (!IsPostBack)
+            {
+                InitializeModel();
+            }
+            else
+            {
+                LoadModel(LoadModelFromPersistenceMedium());
+            }
+
+            base.OnInit(e);
+
+            OnInitializeControls(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Raises the <see cref="PreLoadViewState"/> event after page initialization.
+        /// </summary>
+        protected internal virtual void OnPreLoadViewState(EventArgs e)
+        {
+            EventHandler handler = (EventHandler) base.Events[EventPreLoadViewState];
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// PreLoadViewState event.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This event is raised if <see cref="System.Web.UI.Page.IsPostBack"/> is true
+        /// immediately before state is restored from ViewState.
+        /// </para>
+        /// <para>
+        /// NOTE: Different from <see cref="System.Web.UI.Control.LoadViewState(object)"/>, this event will always be raised!
+        /// </para>
+        /// </remarks>
+        public event EventHandler PreLoadViewState
+        {
+            add { base.Events.AddHandler(EventPreLoadViewState, value); }
+            remove { base.Events.RemoveHandler(EventPreLoadViewState, value); }
+        }
+
+        /// <summary>
+        /// This method is called during a postback if this control has been visible when being rendered to the client.
+        /// </summary>
+        /// <remarks>
+        /// If the controls has been visible when being rendering to the client, <see cref="System.Web.UI.Page.RegisterRequiresPostBack"/>
+        /// has been called during <see cref="OnPreRender"/>
+        /// </remarks>
+        /// <returns>true if the server control's state changes as a result of the post back; otherwise false.</returns>
+        bool IPostBackDataHandler.LoadPostData(string postDataKey, NameValueCollection postCollection)
+        {
+            return LoadPostData(postDataKey, postCollection);
+        }
+
+        /// <summary>
+        /// This method is called during a postback if this control has been visible when being rendered to the client.
+        /// </summary>
+        /// <returns>true if the server control's state changes as a result of the post back; otherwise false.</returns>
+        protected virtual bool LoadPostData(string postDataKey, NameValueCollection postCollection)
+        {
+            // mark this control for unbinding form data during OnLoad()
+            this.needsUnbind = true;
+            return false;
+        }
+
+        /// <summary>
+        /// When implemented by a class, signals the server control object to notify the
+        /// ASP.NET application that the state of the control has changed.
+        /// </summary>
+        void IPostBackDataHandler.RaisePostDataChangedEvent()
+        {
+            RaisePostDataChangedEvent();
+        }
+
+        /// <summary>
+        /// When implemented by a class, signals the server control object to notify the
+        /// ASP.NET application that the state of the control has changed.
+        /// </summary>
+        protected virtual void RaisePostDataChangedEvent()
+        {
+            return;
+        }
+
+
+        /// <summary>
+        /// First unbinds data from the controls into a data model and
+        /// then raises Load event in order to execute all associated handlers.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected override void OnLoad(EventArgs e)
+        {
+            if (IsPostBack && needsUnbind)
+            {
+                // unbind form data
+                UnbindFormData();
+            }
+            base.OnLoad(e);
+        }
+
+        /// <summary>
+        /// Binds data from the data model into controls and raises
+        /// PreRender event afterwards.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected override void OnPreRender(EventArgs e)
+        {
+            if (Visible)
+            {
+                // causes IPostBackDataHandler.LoadPostData() to be called on next postback.
+                // this is used for indicating a required call to UnbindFormData()
+                Page.RegisterRequiresPostBack(this);
+
+                BindFormData();
+
+                if (localizer != null)
+                {
+                    localizer.ApplyResources(this, messageSource, UserCulture);
+                }
+                else if (Page.Localizer != null)
+                {
+                    Page.Localizer.ApplyResources(this, messageSource, UserCulture);
+                }
+            }
+
+            base.OnPreRender(e);
+
+            object modelToSave = SaveModel();
+            if (modelToSave != null)
+            {
+                SaveModelToPersistenceMedium(modelToSave);
+            }
+        }
+
+        /// <summary>
+        /// This event is raised before Load event and should be used to initialize
+        /// controls as necessary.
+        /// </summary>
+        public event EventHandler InitializeControls;
+
+        /// <summary>
+        /// Raises InitializeControls event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnInitializeControls(EventArgs e)
+        {
+            if (InitializeControls != null)
+            {
+                InitializeControls(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Obtains a <see cref="T:System.Web.UI.UserControl"/> object from a user control file
+        /// and injects dependencies according to Spring config file.
+        /// </summary>
+        /// <param name="virtualPath">The virtual path to a user control file.</param>
+        /// <returns>
+        /// Returns the specified <see langword="UserControl"/> object, with dependencies injected.
+        /// </returns>
+        protected new Control LoadControl(string virtualPath)
+        {
+            Control control = base.LoadControl(virtualPath);
+            WebDependencyInjectionUtils.InjectDependenciesRecursive(defaultApplicationContext, control);
+            return control;
+        }
+
+#if NET_2_0
+        /// <summary>
+        /// Obtains a <see cref="T:System.Web.UI.UserControl"/> object by type
+        /// and injects dependencies according to Spring config file.
+        /// </summary>
+        /// <param name="t">The type of a user control.</param>
+        /// <param name="parameters">parameters to pass to the control</param>
+        /// <returns>
+        /// Returns the specified <see langword="UserControl"/> object, with dependencies injected.
+        /// </returns>
+        protected new Control LoadControl( Type t, params object[] parameters)
+        {
+            Control control = base.LoadControl( t, parameters );
+            WebDependencyInjectionUtils.InjectDependenciesRecursive(defaultApplicationContext, control);
+            return control;
+        }
+#endif
+
+        #endregion
+
+        #region Model Management Support
+
+        /// <summary>
+        /// Initializes data model when the page is first loaded.
+        /// </summary>
+        /// <remarks>
+        /// This method should be overriden by the developer
+        /// in order to initialize data model for the page.
+        /// </remarks>
+        protected virtual void InitializeModel()
+        {
+        }
+
+        /// <summary>
+        /// Retrieves data model from a persistence store.
+        /// </summary>
+        /// <remarks>
+        /// The default implementation uses <see cref="System.Web.UI.Page.Session"/> to store and retrieve
+        /// the model for the current <see cref="System.Web.HttpRequest.CurrentExecutionFilePath" />
+        /// </remarks>
+        protected virtual object LoadModelFromPersistenceMedium()
+        {
+            return Session[Request.CurrentExecutionFilePath + this.UniqueID + ".Model"];
+        }
+
+        /// <summary>
+        /// Saves data model to a persistence store.
+        /// </summary>
+        /// <remarks>
+        /// The default implementation uses <see cref="System.Web.UI.Page.Session"/> to store and retrieve
+        /// the model for the current <see cref="System.Web.HttpRequest.CurrentExecutionFilePath" />
+        /// </remarks>
+        protected virtual void SaveModelToPersistenceMedium(object modelToSave)
+        {
+            Session[Request.CurrentExecutionFilePath + this.UniqueID + ".Model"] = modelToSave;
+        }
+
+        /// <summary>
+        /// Loads the saved data model on postback.
+        /// </summary>
+        /// <remarks>
+        /// This method should be overriden by the developer
+        /// in order to load data model for the page.
+        /// </remarks>
+        protected virtual void LoadModel(object savedModel)
+        {
+        }
+
+        /// <summary>
+        /// Returns a model object that should be saved.
+        /// </summary>
+        /// <remarks>
+        /// This method should be overriden by the developer
+        /// in order to save data model for the page.
+        /// </remarks>
+        /// <returns>
+        /// A model object that should be saved.
+        /// </returns>
+        protected virtual object SaveModel()
+        {
+            return null;
+        }
+
+        #endregion<
+
+        #region Controller Support
+
+        /// <summary>
+        /// Gets or sets controller for the control.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Internally calls are delegated to <see cref="GetController"/> and <see cref="SetController"/>.
+        /// </para>
+        /// </remarks>
+        /// <value>Controller for the control.</value>
+        public object Controller
+        {
+            get { return GetController(); }
+            set { SetController(value); }
+        }
+
+        /// <summary>
+        /// <para>Stores the controller to be returned by <see cref="Controller"/> property.</para>
+        /// </summary>
+        /// <remarks>
+        /// The default implementation uses a field to store the reference. Derived classes may override this behaviour
+        /// but must ensure to also change the behaviour of <see cref="GetController"/> accordingly.
+        /// </remarks>
+        /// <param name="controller">Controller for the control.</param>
+        protected virtual void SetController(object controller)
+        {
+            this.controller = controller;
+        }
+
+        /// <summary>
+        /// <para>Returns the controller stored by <see cref="SetController"/>.</para>
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// The default implementation uses a field to retrieve the reference.
+        /// </para>
+        /// <para>
+        /// If external controller is not specified, control will serve as its own controller,
+        /// which will allow data binding to work properly.
+        /// </para>
+        /// <para>
+        /// You may override this method e.g. to return <see cref="Spring.Web.UI.Page.Controller"/> in order to
+        /// have your control bind to the same controller as your page. When overriding this behaviour, derived classes
+        /// must ensure to also change the behaviour of <see cref="SetController"/> accordingly.
+        /// </para>
+        /// </remarks>
+        /// <returns>
+        /// <para>The controller for this control.</para>
+        /// <para>If no controller is set, a reference to the control itself is returned.</para>
+        /// </returns>
+        protected virtual object GetController()
+        {
+            if(controller == null)
+            {
+                return this;
+            }
+            return controller;
+        }
+
+        #endregion Controller Support
+
+        #region Shared State support
+
+        /// <summary>
+        /// Returns a thread-safe dictionary that contains state that is shared by
+        /// all instances of this control.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        protected IDictionary SharedState
+        {
+            get
+            {
+                if (sharedState == null)
+                {
+                    string thisTypeKey = this.GetType().FullName + this.GetType().GetHashCode() + ".SharedState";
+
+                    sharedState = Application[thisTypeKey] as IDictionary;
+                    if (sharedState==null)
+                    {
+                        Application.Lock();
+                        try
+                        {
+                            sharedState = Application[thisTypeKey] as IDictionary;
+                            if (sharedState == null)
+                            {
+                                sharedState = new SynchronizedHashtable();
+                                Application.Add(thisTypeKey, sharedState);
+                            }
+                        }
+                        finally
+                        {
+                            Application.UnLock();
+                        }
+                    }
+                }
+                return sharedState;
+            }
+        }
+
+        #endregion Shared State support
+
+        #region Result support
+
+        /// <summary>
+        /// Gets or sets map of result names to target URLs
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IDictionary Results
+        {
+            get
+            {
+                if (results == null)
+                {
+                    results = new Hashtable();
+                }
+                return results;
+            }
+            set
+            {
+                results = new Hashtable();
+                foreach (DictionaryEntry entry in value)
+                {
+                    if (entry.Value is Result)
+                    {
+                        results[entry.Key] = entry.Value;
+                    }
+                    else if (entry.Value is String)
+                    {
+                        results[entry.Key] = new Result((string)entry.Value);
+                    }
+                    else
+                    {
+                        throw new TypeMismatchException(
+                            "Unable to create result object. Please use either String or Result instances to define results.");
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Redirects user to a URL mapped to specified result name.
+        /// </summary>
+        /// <param name="resultName">Result name.</param>
+        protected void SetResult(string resultName)
+        {
+            Result result = (Result)Results[resultName];
+            if (result == null)
+            {
+                // bubble up result in the hierarchy
+                Control parent = this.Parent;
+                while(parent != null)
+                {
+                    if (parent is UserControl)
+                    {
+                        ((UserControl)parent).SetResult(resultName);
+                        return;
+                    }
+                    else if (parent is Page)
+                    {
+                        ((Page) parent).SetResult(resultName);
+                        return;
+                    }
+                    parent = parent.Parent;
+                }
+                throw new ArgumentException(string.Format("No URL mapping found for the specified result '{0}'.", resultName), "resultName");
+            }
+
+            result.Navigate(this);
+        }
+
+        /// <summary>
+        /// Redirects user to a URL mapped to specified result name.
+        /// </summary>
+        /// <param name="resultName">Result name.</param>
+        /// <param name="context">The context to use for evaluating the SpEL expression in the Result.</param>
+        protected void SetResult(string resultName, object context)
+        {
+            Result result = (Result)Results[resultName];
+            if (result == null)
+            {
+                // bubble up result in the hierarchy
+                Control parent = this.Parent;
+                while (parent != null)
+                {
+                    if (parent is UserControl)
+                    {
+                        ((UserControl)parent).SetResult(resultName, context);
+                        return;
+                    }
+                    else if (parent is Page)
+                    {
+                        ((Page)parent).SetResult(resultName, context);
+                        return;
+                    }
+                    parent = parent.Parent;
+                }
+                throw new ArgumentException(string.Format("No URL mapping found for the specified result '{0}'.", resultName), "resultName");
+            }
+
+            result.Navigate(context);
+        }
+
+        #endregion
+
+        #region Validation support
+
+        /// <summary>
+        /// Evaluates specified validators and returns <c>True</c> if all of them are valid.
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// Each validator can itself represent a collection of other validators if it is
+        /// an instance of <see cref="ValidatorGroup"/> or one of its derived types.
+        /// </p>
+        /// <p>
+        /// Please see the Validation Framework section in the documentation for more info.
+        /// </p>
+        /// </remarks>
+        /// <param name="validationContext">Object to validate.</param>
+        /// <param name="validators">Validators to evaluate.</param>
+        /// <returns>
+        /// <c>True</c> if all of the specified validators are valid, <c>False</c> otherwise.
+        /// </returns>
+        public bool Validate(object validationContext, params IValidator[] validators)
+        {
+            IDictionary contextParams = CreateValidatorParameters();
+            bool result = true;
+            foreach (IValidator validator in validators)
+            {
+                if (validator == null)
+                {
+                    throw new ArgumentException("Validator is not defined.");
+                }
+                result = validator.Validate(validationContext, contextParams, this.validationErrors) && result;
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Gets the validation errors container.
+        /// </summary>
+        /// <value>The validation errors container.</value>
+        public virtual IValidationErrors ValidationErrors
+        {
+            get { return validationErrors; }
+        }
+
+        /// <summary>
+        /// Creates the validator parameters.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This method can be overriden if you want to pass additional parameters
+        /// to the validation framework, but you should make sure that you call
+        /// this base implementation in order to add page, session, application,
+        /// request, response and context to the variables collection.
+        /// </para>
+        /// </remarks>
+        /// <returns>
+        /// Dictionary containing parameters that should be passed to
+        /// the data validation framework.
+        /// </returns>
+        protected virtual IDictionary CreateValidatorParameters()
+        {
+            IDictionary parameters = new ListDictionary();
+            parameters["page"] = this.Page;
+            parameters["usercontrol"] = this;
+            parameters["session"] = this.Session;
+            parameters["application"] = this.Application;
+            parameters["request"] = this.Request;
+            parameters["response"] = this.Response;
+            parameters["context"] = this.Context;
+
+            return parameters;
+        }
+
+        #endregion
+
+        #region Data binding support
+
+        /// <summary>
+        /// Initializes the data bindings.
+        /// </summary>
+        protected virtual void InitializeDataBindings()
+        {}
+
+        /// <summary>
+        /// Returns the key to be used for looking up a cached
+        /// BindingManager instance in <see cref="SharedState"/>.
+        /// </summary>
+        /// <returns>a unique key identifying the <see cref="IBindingContainer"/> instance in the <see cref="SharedState"/> dictionary.</returns>
+        protected virtual string GetBindingManagerKey()
+        {
+            return "DataBindingManager";
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="IBindingContainer"/> instance.
+        /// </summary>
+        /// <remarks>
+        /// This factory method is called if no <see cref="IBindingContainer"/> could be found in <see cref="SharedState"/>
+        /// using the key returned by <see cref="GetBindingManagerKey"/>.<br/>
+        /// <br/>
+        ///
+        /// </remarks>
+        /// <returns>a <see cref="IBindingContainer"/> instance to be used for DataBinding</returns>
+        protected virtual IBindingContainer CreateBindingManager()
+        {
+            return new BaseBindingManager();
+        }
+
+        /// <summary>
+        /// Gets the binding manager for this control.
+        /// </summary>
+        /// <value>The binding manager.</value>
+        public IBindingContainer BindingManager
+        {
+            get { return this.bindingManager; }
+        }
+
+        /// <summary>
+        /// Initializes binding manager and data bindings if necessary.
+        /// </summary>
+        private void InitializeBindingManager()
+        {
+            IDictionary sharedState = this.SharedState;
+
+            string key = GetBindingManagerKey();
+            this.bindingManager = sharedState[key] as BaseBindingManager;
+            if (this.bindingManager == null)
+            {
+                lock(sharedState.SyncRoot)
+                {
+                    this.bindingManager = sharedState[key] as BaseBindingManager;
+                    if (this.bindingManager == null)
+                    {
+                        try
+                        {
+                            this.bindingManager = CreateBindingManager();
+                            if(bindingManager == null)
+                            {
+                                throw new ArgumentNullException("bindingManager",
+                                                                "CreateBindingManager() must not return null");
+                            }
+                            InitializeDataBindings();
+                        }
+                        catch
+                        {
+                            this.bindingManager = null;
+                            throw;
+                        }
+                        sharedState[key] = this.bindingManager;
+                        this.OnDataBindingsInitialized(EventArgs.Empty);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Raises the <see cref="DataBindingsInitialized"/> event.
+        /// </summary>
+        protected virtual void OnDataBindingsInitialized(EventArgs e)
+        {
+            EventHandler handler = (EventHandler)base.Events[EventDataBindingsInitialized];
+
+            if(handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// This event is raised after <see cref="BindingManager"/> as been initialized.
+        /// </summary>
+        public event EventHandler DataBindingsInitialized
+        {
+            add
+            {
+                base.Events.AddHandler(EventDataBindingsInitialized, value);
+            }
+            remove
+            {
+                base.Events.RemoveHandler(EventDataBindingsInitialized, value);
+            }
+        }
+
+        /// <summary>
+        /// Bind data from model to form.
+        /// </summary>
+        protected internal virtual void BindFormData()
+        {
+            if(BindingManager.HasBindings)
+            {
+                BindingManager.BindTargetToSource(this, Controller, Page.ValidationErrors);
+            }
+            OnDataBound(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Unbind data from form to model.
+        /// </summary>
+        protected internal virtual void UnbindFormData()
+        {
+            if(BindingManager.HasBindings)
+            {
+                BindingManager.BindSourceToTarget(this, Controller, Page.ValidationErrors);
+            }
+            OnDataUnbound(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// This event is raised after all controls have been populated with values
+        /// from the data model.
+        /// </summary>
+        public event EventHandler DataBound
+        {
+            add
+            {
+                base.Events.AddHandler(EventDataBound, value);
+            }
+            remove
+            {
+                base.Events.RemoveHandler(EventDataBound, value);
+            }
+        }
+
+        /// <summary>
+        /// Raises DataBound event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnDataBound(EventArgs e)
+        {
+            EventHandler handler = (EventHandler) base.Events[EventDataBound];
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// This event is raised after data model has been populated with values from
+        /// web controls.
+        /// </summary>
+        public event EventHandler DataUnbound
+        {
+            add
+            {
+                base.Events.AddHandler(EventDataUnbound, value);
+            }
+            remove
+            {
+                base.Events.RemoveHandler(EventDataUnbound, value);
+            }
+        }
+
+        /// <summary>
+        /// Raises DataBound event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnDataUnbound(EventArgs e)
+        {
+            EventHandler handler = (EventHandler) base.Events[EventDataUnbound];
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        #endregion
+
+        #region Application context support
+
+        /// <summary>
+        /// Gets or sets Spring application context of the page.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual IApplicationContext ApplicationContext
+        {
+            get { return applicationContext; }
+            set { applicationContext = value; }
+        }
+
+        #endregion
+
+        #region Message source and localization support
+
+        /// <summary>
+        /// Gets or sets the localizer.
+        /// </summary>
+        /// <value>The localizer.</value>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ILocalizer Localizer
+        {
+            get { return localizer; }
+            set
+            {
+                localizer = value;
+                if (localizer.ResourceCache is NullResourceCache)
+                {
+                    localizer.ResourceCache = new AspNetResourceCache();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the local message source.
+        /// </summary>
+        /// <value>The local message source.</value>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IMessageSource MessageSource
+        {
+            get { return messageSource; }
+            set
+            {
+                messageSource = value;
+                if (messageSource != null && messageSource is AbstractMessageSource)
+                {
+                    ((AbstractMessageSource) messageSource).ParentMessageSource = applicationContext;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes local message source
+        /// </summary>
+        protected void InitializeMessageSource()
+        {
+            if (this.MessageSource == null)
+            {
+                string key = CreateSharedStateKey("MessageSource");
+                IDictionary sharedState = this.SharedState;
+                IMessageSource messageSource = sharedState[key] as IMessageSource;
+                if (messageSource == null)
+                {
+                    lock(sharedState.SyncRoot)
+                    {
+                        messageSource = sharedState[key] as IMessageSource;
+                        if (messageSource == null)
+                        {
+                            ResourceSetMessageSource defaultMessageSource = new ResourceSetMessageSource();
+                            defaultMessageSource.UseCodeAsDefaultMessage = true;
+                            ResourceManager rm = GetLocalResourceManager();
+                            if (rm != null)
+                            {
+                                defaultMessageSource.ResourceManagers.Add(rm);
+                            }
+                            sharedState[key] = defaultMessageSource;
+                            messageSource = defaultMessageSource;
+                        }
+                    }
+                }
+                this.MessageSource = messageSource;
+            }
+        }
+
+        /// <summary>
+        /// Creates and returns local ResourceManager for this page.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// In ASP.NET 1.1, this method loads local resources from the web application assembly.
+        /// </para>
+        /// <para>
+        /// However, in ASP.NET 2.0, local resources are compiled into the dynamic assembly,
+        /// so we need to find that assembly instead and load the resources from it.
+        /// </para>
+        /// </remarks>
+        /// <returns>Local ResourceManager instance.</returns>
+        private ResourceManager GetLocalResourceManager()
+#if !NET_2_0
+        {
+            return new ResourceManager(GetType().BaseType);
+        }
+#else
+        {
+            object resourceProvider = Page.GetLocalResourceProvider.Invoke(typeof(ResourceExpressionBuilder), new object[] {this});
+            MethodInfo GetLocalResourceAssembly =
+                    resourceProvider.GetType().GetMethod("GetLocalResourceAssembly", BindingFlags.NonPublic | BindingFlags.Instance);
+            Assembly localResourceAssembly = (Assembly) GetLocalResourceAssembly.Invoke(resourceProvider, null);
+            if (localResourceAssembly != null)
+            {
+                return new ResourceManager(VirtualPathUtility.GetFileName(this.AppRelativeVirtualPath), localResourceAssembly);
+            }
+            return null;
+        }
+#endif
+
+        /// <summary>
+        /// Returns message for the specified resource name.
+        /// </summary>
+        /// <param name="name">Resource name.</param>
+        /// <returns>Message text.</returns>
+        public string GetMessage(string name)
+        {
+            return messageSource.GetMessage(name, UserCulture);
+        }
+
+        /// <summary>
+        /// Returns message for the specified resource name.
+        /// </summary>
+        /// <param name="name">Resource name.</param>
+        /// <param name="args">Message arguments that will be used to format return value.</param>
+        /// <returns>Formatted message text.</returns>
+        public string GetMessage(string name, params object[] args)
+        {
+            return messageSource.GetMessage(name, UserCulture, args);
+        }
+
+        /// <summary>
+        /// Returns resource object for the specified resource name.
+        /// </summary>
+        /// <param name="name">Resource name.</param>
+        /// <returns>Resource object.</returns>
+        public object GetResourceObject(string name)
+        {
+            return messageSource.GetResourceObject(name, UserCulture);
+        }
+
+        /// <summary>
+        /// Gets or sets user's culture
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual CultureInfo UserCulture
+        {
+            get { return Page.UserCulture; }
+            set { Page.UserCulture = value; }
+        }
+
+        #endregion
+
+        #region Spring Page support
+
+        /// <summary>
+        /// Overrides Page property to return <see cref="Spring.Web.UI.Page"/>
+        /// instead of <see cref="System.Web.UI.Page"/>.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Page Page
+        {
+            get { return (Page) base.Page; }
+        }
+
+        #endregion
+
+        #region Helper Methods
+
+        /// <summary>
+        /// Creates a key for shared state, taking into account whether
+        /// this page belongs to a process or not.
+        /// </summary>
+        /// <param name="key">Key suffix</param>
+        /// <returns>Generated unique shared state key.</returns>
+        protected string CreateSharedStateKey(string key)
+        {
+            return key;
+        }
+
+        #endregion
+
+        #region Dependency Injection Support
+
+        /// <summary>
+        /// Holds the default ApplicationContext to be used during DI.
+        /// </summary>
+        IApplicationContext ISupportsWebDependencyInjection.DefaultApplicationContext
+        {
+            get { return defaultApplicationContext; }
+            set { defaultApplicationContext = value;  }
+        }
+
+        /// <summary>
+        /// Injects dependencies into control before adding it.
+        /// </summary>
+        protected override void AddedControl(Control control,int index)
+        {
+            WebDependencyInjectionUtils.InjectDependenciesRecursive( defaultApplicationContext, control );
+            base.AddedControl(control,index);
+        }
+
+        #endregion Dependency Injection Support
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Validation/AbstractValidationErrorsRenderer.cs b/src/Spring/Spring.Web/Web/UI/Validation/AbstractValidationErrorsRenderer.cs
new file mode 100644
index 00000000..fea552bf
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Validation/AbstractValidationErrorsRenderer.cs
@@ -0,0 +1,56 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Web.UI;
+using Page=Spring.Web.UI.Page;
+
+namespace Spring.Web.UI.Validation
+{
+    /// <summary>
+    /// This class provides common members for all validation errors renderers.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AbstractValidationErrorsRenderer.cs,v 1.1 2007/08/02 19:50:28 markpollack Exp $</version>
+    public abstract class AbstractValidationErrorsRenderer : IValidationErrorsRenderer
+    {
+        private string cssClass;
+
+        /// <summary>
+        /// Gets or sets the name of the CSS class that should be used.
+        /// </summary>
+        /// <value>
+        /// The name of the CSS class that should be used
+        /// </value>
+        public string CssClass
+        {
+            get { return this.cssClass; }
+            set { this.cssClass = value; }
+        }
+
+        /// <summary>
+        /// Renders validation errors using specified <see cref="HtmlTextWriter"/>.
+        /// </summary>
+        /// <param name="page">Web form instance.</param>
+        /// <param name="writer">An HTML writer to use.</param>
+        /// <param name="errors">The list of validation errors.</param>
+        public abstract void RenderErrors(Page page, HtmlTextWriter writer, IList errors);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Validation/DivValidationErrorsRenderer.cs b/src/Spring/Spring.Web/Web/UI/Validation/DivValidationErrorsRenderer.cs
new file mode 100644
index 00000000..faac260e
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Validation/DivValidationErrorsRenderer.cs
@@ -0,0 +1,69 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Web.UI;
+using Spring.Web.UI.Validation;
+using Page=Spring.Web.UI.Page;
+
+namespace Spring.Web.UI.Validation
+{
+    /// <summary>
+    /// Implementation of <see cref="IValidationErrorsRenderer"/> that renders
+    /// validation errors within a <c>div</c> element, using breaks between the
+    /// errors.
+    /// </summary>
+    /// <remarks>
+    /// This renderer's behavior is consistent with standard ASP.NET behavior of
+    /// the validation summary, and is used as default renderer for Spring.NET
+    /// control.
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DivValidationErrorsRenderer.cs,v 1.1 2007/08/02 19:50:28 markpollack Exp $</version>
+    public class DivValidationErrorsRenderer : AbstractValidationErrorsRenderer
+    {
+        /// <summary>
+        /// Renders validation errors using specified <see cref="HtmlTextWriter"/>.
+        /// </summary>
+        /// <param name="page">Web form instance.</param>
+        /// <param name="writer">An HTML writer to use.</param>
+        /// <param name="errors">The list of validation errors.</param>
+        public override void RenderErrors(Page page, HtmlTextWriter writer, IList errors)
+        {
+            if (CssClass != null)
+            {
+                writer.AddAttribute(HtmlTextWriterAttribute.Class, CssClass);
+            }
+            
+            writer.AddAttribute(HtmlTextWriterAttribute.Id, "ctl00_body_validationSummary");
+            
+            writer.RenderBeginTag(HtmlTextWriterTag.Div);
+            if (errors != null && errors.Count > 0)
+            {
+                foreach (string error in errors)
+                {
+                    writer.WriteLine(error);
+                    writer.WriteFullBeginTag("br /");
+                }
+            }            
+            writer.RenderEndTag();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Validation/IValidationErrorsRenderer.cs b/src/Spring/Spring.Web/Web/UI/Validation/IValidationErrorsRenderer.cs
new file mode 100644
index 00000000..ea335b1c
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Validation/IValidationErrorsRenderer.cs
@@ -0,0 +1,57 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Web.UI;
+
+using Spring.Web.UI.Controls;
+
+using Page=Spring.Web.UI.Page;
+
+namespace Spring.Web.UI.Validation
+{
+    /// <summary>
+    /// This interface should be implemented by all validation errors renderers.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// Validation errors renderers are used to decouple rendering behavior from the 
+    /// validation errors controls such as <see cref="ValidationError"/> and
+    /// <see cref="ValidationSummary"/>.
+    /// </para>
+    /// <para>
+    /// This allows users to change how validation errors are rendered by simply pluggin in
+    /// appropriate renderer implementation into the validation errors controls using 
+    /// Spring.NET dependency injection.
+    /// </para>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IValidationErrorsRenderer.cs,v 1.1 2007/08/02 19:50:28 markpollack Exp $</version>
+    public interface IValidationErrorsRenderer
+    {
+        /// <summary>
+        /// Renders validation errors using specified <see cref="HtmlTextWriter"/>.
+        /// </summary>
+        /// <param name="page">Web form instance.</param>
+        /// <param name="writer">An HTML writer to use.</param>
+        /// <param name="errors">The list of validation errors.</param>
+        void RenderErrors(Page page, HtmlTextWriter writer, IList errors);
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Validation/IconValidationErrorsRenderer.cs b/src/Spring/Spring.Web/Web/UI/Validation/IconValidationErrorsRenderer.cs
new file mode 100644
index 00000000..0ff2b409
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Validation/IconValidationErrorsRenderer.cs
@@ -0,0 +1,86 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Text;
+using System.Web.UI;
+using Spring.Web.UI.Validation;
+using Page=Spring.Web.UI.Page;
+
+namespace Spring.Web.UI.Validation
+{
+    /// <summary>
+    /// Implementation of <see cref="IValidationErrorsRenderer"/> that 
+    /// displays an error image to let user know there is an error, and
+    /// tooltip to display actual error messages.
+    /// </summary>
+    /// <remarks>
+    /// <para>
+    /// This renderer's behavior is similar to Windows Forms error provider.
+    /// </para>
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IconValidationErrorsRenderer.cs,v 1.1 2007/08/02 19:50:28 markpollack Exp $</version>
+    public class IconValidationErrorsRenderer : AbstractValidationErrorsRenderer
+    {
+        private string iconSrc;
+
+        /// <summary>
+        /// Gets or sets the name of the image file to use as an error icon.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Image name should be relative to the value of the <see cref="Spring.Web.UI.Page.ImagesRoot"/>
+        /// property, and should not use leading path separator.
+        /// </para>
+        /// </remarks>
+        /// <value>The name of the image file to use as an error icon.</value>
+        public string IconSrc
+        {
+            get { return this.iconSrc; }
+            set { this.iconSrc = value; }
+        }
+
+        /// <summary>
+        /// Renders validation errors using specified <see cref="HtmlTextWriter"/>.
+        /// </summary>
+        /// <param name="page">Web form instance.</param>
+        /// <param name="writer">An HTML writer to use.</param>
+        /// <param name="errors">The list of validation errors.</param>
+        public override void RenderErrors(Page page, HtmlTextWriter writer, IList errors)
+        {
+            if (errors != null && errors.Count > 0)
+            {
+                StringBuilder sb = new StringBuilder();
+                string separator = "";
+                foreach (string error in errors)
+                {
+                    sb.Append(separator).Append(error);
+                    separator = "\n";
+                }
+                writer.AddAttribute(HtmlTextWriterAttribute.Src, page.ImagesRoot + "/" + IconSrc);
+                writer.AddAttribute(HtmlTextWriterAttribute.Title, sb.ToString());
+
+                writer.RenderBeginTag(HtmlTextWriterTag.Img);                
+                writer.RenderEndTag();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/Spring.Web/Web/UI/Validation/SpanValidationErrorsRenderer.cs b/src/Spring/Spring.Web/Web/UI/Validation/SpanValidationErrorsRenderer.cs
new file mode 100644
index 00000000..98aaab46
--- /dev/null
+++ b/src/Spring/Spring.Web/Web/UI/Validation/SpanValidationErrorsRenderer.cs
@@ -0,0 +1,71 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.Web.UI;
+
+using Spring.Web.UI.Controls;
+using Spring.Web.UI.Validation;
+using Page=Spring.Web.UI.Page;
+
+namespace Spring.Web.UI.Validation
+{
+    /// <summary>
+    /// Implementation of <see cref="IValidationErrorsRenderer"/> that renders
+    /// validation errors within a <c>span</c> element, using breaks between the
+    /// errors.
+    /// </summary>
+    /// <remarks>
+    /// This renderer's behavior is consistent with standard ASP.NET behavior of
+    /// the control validators, and is used as the default renderer for Spring.NET
+    /// <see cref="ValidationError"/> control.
+    /// </remarks>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SpanValidationErrorsRenderer.cs,v 1.1 2007/08/02 19:50:28 markpollack Exp $</version>
+    public class SpanValidationErrorsRenderer : AbstractValidationErrorsRenderer
+    {
+        /// <summary>
+        /// Renders validation errors using specified <see cref="HtmlTextWriter"/>.
+        /// </summary>
+        /// <param name="page">Web form instance.</param>
+        /// <param name="writer">An HTML writer to use.</param>
+        /// <param name="errors">The list of validation errors.</param>
+        public override void RenderErrors(Page page, HtmlTextWriter writer, IList errors)
+        {
+            if (errors != null && errors.Count > 0)
+            {
+                if (CssClass != null)
+                {
+                    writer.AddAttribute(HtmlTextWriterAttribute.Class, CssClass);
+                }
+                
+                writer.RenderBeginTag(HtmlTextWriterTag.Span);
+
+                foreach (string error in errors)
+                {
+                    writer.Write(error);
+                    writer.Write(" ");
+                }                
+                writer.RenderEndTag();
+                
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Spring/readme.txt b/src/Spring/readme.txt
new file mode 100644
index 00000000..5a8a6a85
--- /dev/null
+++ b/src/Spring/readme.txt
@@ -0,0 +1,25 @@
+This folder is where source code for all subprojects of Spring.Net are located.
+
+There should be one subproject under this directory for each of the assemblies
+that will be produced when Spring.Net is built. Each subproject should be named
+exactly how the target assembly should be named, without .dll at the end.
+
+Currently identified subprojects are:
+
+Each subproject should set root namespace to "Spring". Source code should always be in subdirectories matching
+the namespace. For example, Spring.Aop subproject will have following hierarchy:
+
+\Spring.Aop
+	\Aop				
+		\Framework		
+			\AutoProxy
+			...
+		\Interceptor
+		\Support
+		\Target
+		...
+	\Spring.Aop.2003.csproj	(project file)
+	\AssemblyInfo.cs
+
+Other subprojects should have similar structure.
+
diff --git a/test/Spring/CommonAssemblyInfo.cs b/test/Spring/CommonAssemblyInfo.cs
new file mode 100644
index 00000000..9833ea63
--- /dev/null
+++ b/test/Spring/CommonAssemblyInfo.cs
@@ -0,0 +1,58 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Spring.Net Unit Tests")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.1.1.0")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing.
+//
+// Notes:
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+
+// *IMPORTANT*: for Mono compatibility one must not use these attributes if strong name is not used!
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+//[assembly: AssemblyKeyName("")]
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Advice/DebugAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Advice/DebugAdvice.cs
new file mode 100644
index 00000000..41e2c090
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Advice/DebugAdvice.cs
@@ -0,0 +1,92 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.Aop.Advice
+{
+	/// <summary>
+	/// Convenience <see cref="AopAlliance.Intercept.IMethodInterceptor"/>
+	/// implementation that displays verbose information about intercepted
+	/// invocations to the system console.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// Can be introduced into an interceptor chain to serve as a useful low
+	/// level debugging aid.
+	/// </p>
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Federico Spinazzi (.NET)</author>
+	/// <author>Aleksandar Seovic (.NET)</author>
+	/// <version>$Id: DebugAdvice.cs,v 1.1 2007/08/08 07:45:36 markpollack Exp $</version>
+	/// <seealso cref="System.Console"/>
+	public sealed class DebugAdvice : IMethodInterceptor
+	{
+		private int _count;
+
+		/// <summary>
+		/// Gets the count of the number of times this interceptor has been
+		/// invoked.
+		/// </summary>
+		/// <returns>
+		/// The count of the number of times this interceptor has been invoked.
+		/// </returns>
+		public int Count
+		{
+			get { return _count; }
+		}
+
+		/// <summary>
+		/// Displays verbose information about intercepted invocations to the
+		/// system console.
+		/// </summary>
+		/// <param name="invocation">
+		/// The method invocation that is being intercepted.
+		/// </param>
+		/// <returns>
+		/// The result of the call to the
+		/// <see cref="AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+		/// the supplied <paramref name="invocation"/>; this return value may
+		/// well have been intercepted by the interceptor.
+		/// </returns>
+		/// <exception cref="System.Exception">
+		/// If any of the interceptors in the chain or the target object itself
+		/// throws an exception.
+		/// </exception>
+		/// <seealso cref="System.Console"/>
+		/// <seealso cref="AopAlliance.Intercept.IMethodInterceptor.Invoke(IMethodInvocation)"/>
+		public object Invoke(IMethodInvocation invocation)
+		{
+			++_count;
+			Console.Out.WriteLine("{0} [count={1}, invocation='{2}']",
+				typeof(DebugAdvice).Name, _count, invocation);
+			object returnValue = invocation.Proceed();
+			Console.Out.WriteLine("{0} ['{1}' invocation returned '{2}']",
+				typeof(DebugAdvice).Name, invocation.Method.Name, returnValue);
+			return returnValue;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.cs
new file mode 100644
index 00000000..bd590ca6
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.cs
@@ -0,0 +1,102 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Aop.Framework;
+using Spring.Aop.Framework.DynamicProxy;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Aop.Config
+{
+    /// <summary>
+    /// This class contains tests for the custom aop namespace.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AopNamespaceParserTests.cs,v 1.7 2007/08/09 03:06:37 markpollack Exp $</version>
+    [TestFixture]
+    public class AopNamespaceParserTests
+    {
+
+       private IApplicationContext ctx;
+
+        [SetUp]
+        public void Setup()
+        {
+            NamespaceParserRegistry.RegisterParser(typeof(AopNamespaceParser));
+            //ctx = new XmlApplicationContext( "assembly://Spring.Aop.Tests/Spring.Aop.Config/AopNamespaceParserTests.xml");
+            ctx = new XmlApplicationContext(ReadOnlyXmlTestResource.GetFilePath("AopNamespaceParserTests.xml", this.GetType()));
+        }
+
+
+
+        [Test]
+        public void Registered()
+        {
+            Assert.IsNotNull(NamespaceParserRegistry.GetParser("http://www.springframework.net/aop"));
+
+
+            IPointcut pointcut = ctx["getDescriptionCalls"] as IPointcut;
+            Assert.IsNotNull(pointcut);
+            Assert.IsFalse(AopUtils.IsAopProxy(pointcut));
+
+
+            ITestObject testObject = ctx["testObject"] as ITestObject;
+            Assert.IsNotNull(testObject);
+            Assert.IsTrue(AopUtils.IsAopProxy(testObject), "Object should be an AOP proxy");
+
+            IAdvised advised = testObject as IAdvised;
+            Assert.IsNotNull(advised);            
+            IAdvisor[] advisors = advised.Advisors;
+            Assert.IsTrue(advisors.Length > 0, "Advisors should not be empty");
+            
+           
+        }
+
+        [Test]
+        public void AdviceInvokedCorrectly()
+        {
+            CountingBeforeAdvice getDescriptionCounter = ctx.GetObject("getDescriptionCounter") as CountingBeforeAdvice;
+            Assert.IsNotNull(getDescriptionCounter);
+
+            ITestObject testObject = GetTestObject();
+
+            Assert.AreEqual(0,getDescriptionCounter.GetCalls("GetDescription"),"Incorrect initial getDescription count");
+
+            testObject.GetDescription();
+
+            Assert.AreEqual(1, getDescriptionCounter.GetCalls("GetDescription"), "Incorrect getDescription count");
+
+        }
+
+        private ITestObject GetTestObject()
+        {
+            return ctx.GetObject("testObject", typeof (ITestObject)) as ITestObject;
+        }
+
+        
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.xml b/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.xml
new file mode 100644
index 00000000..33d3bf00
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects xmlns="http://www.springframework.net"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:aop="http://www.springframework.net/aop">
+
+	<aop:config>
+
+		<aop:advisor id="getDescriptionAdvisor" pointcut-ref="getDescriptionCalls" advice-ref="getDescriptionCounter"/>
+
+	</aop:config>
+
+  <object id="getDescriptionCalls" type="Spring.Aop.Support.SdkRegularExpressionMethodPointcut, Spring.Aop">
+    <property name="patterns">
+      <list>
+        <value>.*GetDescription.*</value>
+      </list>
+    </property>
+  </object>
+	
+	<object id="getDescriptionCounter" type="Spring.Aop.Framework.CountingBeforeAdvice, Spring.Aop.Tests"/>
+
+	<object name="testObject" type="Spring.Objects.TestObject, Spring.Core.Tests"/>
+  
+
+
+</objects>
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs
new file mode 100644
index 00000000..9e6e3032
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs
@@ -0,0 +1,248 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Reflection;
+
+using AopAlliance.Intercept;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Unit tests for the AbstractMethodInvocation class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+    /// <author>Bruno Baia</author>
+	/// <version>$Id: AbstractMethodInvocationTests.cs,v 1.2 2008/02/06 18:29:05 bbaia Exp $</version>
+	[TestFixture]
+	public abstract class AbstractMethodInvocationTests
+	{
+        protected abstract AbstractMethodInvocation CreateMethodInvocation(
+            object proxy, object target, MethodInfo method, MethodInfo onProxyMethod, 
+            object[] arguments, Type targetType, IList interceptors);
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithNullMethod()
+		{
+            CreateMethodInvocation(null, this, null, null, null, GetType(), null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithNullTarget()
+		{
+            CreateMethodInvocation(null, null, null, null, null, GetType(), null);
+		}
+
+		[Test]
+		public void ProceedWithNullInterceptorChain()
+		{
+			Target target = new Target();
+            AbstractMethodInvocation join = CreateMethodInvocation(
+                null, target, target.GetTargetMethodNoArgs(), null, null, target.GetType(), null);
+			string score = (string) join.Proceed();
+			Assert.AreEqual(Target.DefaultScore + Target.Suffix, score);
+		}
+
+		[Test]
+		public void ProceedWithEmptyInterceptorChain()
+		{
+			Target target = new Target();
+            AbstractMethodInvocation join = CreateMethodInvocation(
+                null, target, target.GetTargetMethodNoArgs(), null, null, target.GetType(), new ArrayList());
+			string score = (string) join.Proceed();
+			Assert.AreEqual(Target.DefaultScore + Target.Suffix, score);
+		}
+
+		[Test]
+		public void ToStringWithoutArguments()
+		{
+			Target target = new Target();
+            AbstractMethodInvocation join = CreateMethodInvocation(
+                null, target, target.GetTargetMethodNoArgs(), null, null, target.GetType(), new ArrayList());
+			CheckToStringDoesntThrowAnException(join);
+		}
+
+		[Test]
+		public void ToStringWithArguments()
+		{
+			Target target = new Target();
+            AbstractMethodInvocation join = CreateMethodInvocation(
+                null, target, target.GetTargetMethod(), null, new string[] { "Five" }, target.GetType(), new ArrayList());
+			CheckToStringDoesntThrowAnException(join);
+		}
+
+		[Test]
+		public void ToStringMustNotInvokeToStringOnTarget()
+		{
+			Target target = new TargetWithBadToString();
+            AbstractMethodInvocation join = CreateMethodInvocation(
+                null, target, target.GetTargetMethodNoArgs(), null, null, target.GetType(), new ArrayList());
+			// if it hits the target the test will fail with NotSupportedException...
+			CheckToStringDoesntThrowAnException(join);
+		}
+
+		private static string CheckToStringDoesntThrowAnException(AbstractMethodInvocation join)
+		{
+			return join.ToString();
+		}
+
+		public class Target
+		{
+			public const string Suffix = "!!!";
+			public const string DefaultScore = "ONE HUNDRED AND EIGHTY";
+
+			public MethodInfo GetTargetMethodNoArgs()
+			{
+				return GetType().GetMethod("BullseyeMethod", Type.EmptyTypes);
+			}
+
+			public MethodInfo GetTargetMethod()
+			{
+				return GetType().GetMethod("BullseyeMethod", new Type[] {typeof (string)});
+			}
+
+			public string BullseyeMethod()
+			{
+				return BullseyeMethod(DefaultScore);
+			}
+
+			public string BullseyeMethod(string score)
+			{
+				return score + Suffix;
+			}
+		}
+
+		public interface ICommand
+		{
+			void Execute();
+		}
+
+		public sealed class BadCommand : ICommand
+		{
+			public void Execute()
+			{
+				throw new NotImplementedException();
+			}
+
+			public MethodInfo GetTargetMethod()
+			{
+				return GetType().GetMethod("Execute", Type.EmptyTypes);
+			}
+		}
+
+		private sealed class TargetWithBadToString : Target
+		{
+			public override string ToString()
+			{
+				throw new NotSupportedException("ToString");
+			}
+		}
+
+		[Test]
+		public void ValidInvocation()
+		{
+			Target target = new Target();
+			IDynamicMock mock = new DynamicMock(typeof (IMethodInterceptor));
+            AbstractMethodInvocation join = CreateMethodInvocation(
+                null, target, target.GetTargetMethodNoArgs(), null, null, target.GetType(), new object[] { mock.Object });
+			mock.ExpectAndReturn("Invoke", target.BullseyeMethod().ToLower(CultureInfo.InvariantCulture));
+
+			string score = (string) join.Proceed();
+			Assert.AreEqual(Target.DefaultScore.ToLower(CultureInfo.InvariantCulture) + Target.Suffix, score);
+			mock.Verify();
+		}
+
+		[Test]
+		public void UnwrapsTargetInvocationException_NoInterceptors()
+		{
+			BadCommand target = new BadCommand();
+            AbstractMethodInvocation join = CreateMethodInvocation(
+                null, target, target.GetTargetMethod(), null, null, target.GetType(), new object[] { });
+			try
+			{
+				join.Proceed();
+			}
+			catch (NotImplementedException)
+			{
+				// this is good, we want this exception to bubble up...
+			}
+			catch (TargetInvocationException)
+			{
+				Assert.Fail("Must have unwrapped this.");
+			}
+		}
+
+		[Test]
+		public void UnwrapsTargetInvocationException_WithInterceptor()
+		{
+			BadCommand target = new BadCommand();
+			IDynamicMock mock = new DynamicMock(typeof (IMethodInterceptor));
+            AbstractMethodInvocation join = CreateMethodInvocation(
+                null, target, target.GetTargetMethod(), null, null, target.GetType(), new object[] { mock.Object });
+			mock.ExpectAndReturn("Invoke", null);
+			try
+			{
+				join.Proceed();
+			}
+			catch (NotImplementedException)
+			{
+				// this is good, we want this exception to bubble up...
+			}
+			catch (TargetInvocationException)
+			{
+				Assert.Fail("Must have unwrapped this.");
+			}
+			mock.Verify();
+		}
+
+		[Test]
+		public void UnwrapsTargetInvocationException_WithInterceptorThatThrowsAnException()
+		{
+			BadCommand target = new BadCommand();
+			IDynamicMock mock = new DynamicMock(typeof (IMethodInterceptor));
+            AbstractMethodInvocation join = CreateMethodInvocation(
+                null, target, target.GetTargetMethod(), null, null, target.GetType(), new object[] { mock.Object });
+			mock.ExpectAndThrow("Invoke", new NotImplementedException());
+			try
+			{
+				join.Proceed();
+			}
+			catch (NotImplementedException)
+			{
+				// this is good, we want this exception to bubble up...
+			}
+			catch (TargetInvocationException)
+			{
+				Assert.Fail("Must have unwrapped this.");
+			}
+			mock.Verify();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AdvisorAdapterRegistrationTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AdvisorAdapterRegistrationTests.cs
new file mode 100644
index 00000000..a20e60c3
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AdvisorAdapterRegistrationTests.cs
@@ -0,0 +1,86 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+using System;
+using System.Text;
+
+using NUnit.Framework;
+
+using Spring.Aop;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects;
+using Spring.Objects.Factory.Xml;
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+	/// <summary>
+	/// TestCase for AdvisorAdapterRegistrationManager mechanism.
+	/// </summary>
+	/// <author>Dmitriy Kopylenko</author>
+	/// <author>Simon White (.NET)</author>
+	[TestFixture]
+	public class AdvisorAdapterRegistrationTests
+	{
+		[Test]
+		public void AdvisorAdapterRegistrationManagerNotPresentInContext() 
+		{
+			string configLocation = ReadOnlyXmlTestResource.GetFilePath("withoutBPPContext.xml", typeof(AdvisorAdapterRegistrationTests));
+			IApplicationContext ctx = new XmlApplicationContext(configLocation);
+			ITestObject to = (ITestObject) ctx.GetObject("testObject");
+			// just invoke any method to see if advice fired
+			try 
+			{
+				to.ReturnsThis();
+				Assert.Fail("Should throw UnknownAdviceTypeException");
+			}
+			catch (UnknownAdviceTypeException) 
+			{
+				// expected
+				Assert.AreEqual(0, GetAdviceImpl(to).InvocationCounter);
+			}
+		}
+
+		[Test]
+		public void AdvisorAdapterRegistrationManagerPresentInContext() 
+		{
+			string configLocation = ReadOnlyXmlTestResource.GetFilePath("withBPPContext.xml", typeof(AdvisorAdapterRegistrationTests));
+			IApplicationContext ctx = new XmlApplicationContext(configLocation);
+			ITestObject to = (ITestObject) ctx.GetObject("testObject");
+			// just invoke any method to see if advice fired
+			try 
+			{
+				to.ReturnsThis();
+				Assert.AreEqual(1, GetAdviceImpl(to).InvocationCounter);
+			}
+			catch (UnknownAdviceTypeException) 
+			{
+				Assert.Fail("Should not throw UnknownAdviceTypeException");
+			}
+		}
+
+		private SimpleBeforeAdviceImpl GetAdviceImpl(ITestObject to) 
+		{
+			IAdvised advised = (IAdvised) to;
+			IAdvisor advisor = advised.Advisors[0];
+			return (SimpleBeforeAdviceImpl) advisor.Advice;
+		}
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs
new file mode 100644
index 00000000..bc50b3c5
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs
@@ -0,0 +1,96 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using AopAlliance.Intercept;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+	/// <summary>
+	/// Unit tests for the AfterReturningAdviceInterceptor class.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	[TestFixture]
+	public sealed class AfterReturningAdviceInterceptorTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void PassNullAdviceToCtor()
+		{
+			new AfterReturningAdviceInterceptor(null);
+		}
+
+		[Test]
+		public void IsNotInvokedIfServiceObjectThrowsException()
+		{
+			IDynamicMock mockAdvice = new DynamicMock(typeof (IAfterReturningAdvice));
+			IAfterReturningAdvice afterAdvice = (IAfterReturningAdvice) mockAdvice.Object;
+
+			IDynamicMock mockInvocation = new DynamicMock(typeof (IMethodInvocation));
+			IMethodInvocation invocation = (IMethodInvocation) mockInvocation.Object;
+			mockInvocation.ExpectAndThrow("Proceed", new FormatException(), null);
+
+			try
+			{
+				AfterReturningAdviceInterceptor interceptor = new AfterReturningAdviceInterceptor(afterAdvice);
+				interceptor.Invoke(invocation);
+				Assert.Fail("Must have thrown a FormatException by this point.");
+			}
+			catch (FormatException)
+			{
+			}
+
+			mockAdvice.Verify(); // must not have been called...
+			mockInvocation.Verify();
+		}
+
+		[Test]
+		public void JustPassesAfterReturningAdviceExceptionUpWithoutAnyWrapping()
+		{
+			IDynamicMock mockAdvice = new DynamicMock(typeof (IAfterReturningAdvice));
+			IAfterReturningAdvice afterAdvice = (IAfterReturningAdvice) mockAdvice.Object;
+			mockAdvice.ExpectAndThrow("AfterReturning", new FormatException(), new object[] { null, null, null, null});
+
+			IDynamicMock mockInvocation = new DynamicMock(typeof (IMethodInvocation));
+			IMethodInvocation invocation = (IMethodInvocation) mockInvocation.Object;
+			mockInvocation.ExpectAndReturn("Proceed", null);
+
+			try
+			{
+				AfterReturningAdviceInterceptor interceptor = new AfterReturningAdviceInterceptor(afterAdvice);
+				interceptor.Invoke(invocation);
+				Assert.Fail("Must have thrown a FormatException by this point.");
+			}
+			catch (FormatException)
+			{
+			}
+
+			mockAdvice.Verify();
+			mockInvocation.Verify();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs
new file mode 100644
index 00000000..4eb9c444
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs
@@ -0,0 +1,288 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Runtime.Remoting;
+using System.Web;
+using AopAlliance.Intercept;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+	/// <summary>
+	/// Unit tests for the ThrowsAdviceInterceptor class.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	[TestFixture]
+	public sealed class ThrowsAdviceInterceptorTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void NoHandlerMethods()
+		{
+			new ThrowsAdviceInterceptor(new object());
+		}
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void PassNullAdviceToCtor()
+        {
+            new ThrowsAdviceInterceptor(null);
+        }
+
+		[Test]
+		public void NotInvoked()
+		{
+			MyThrowsHandler th = new MyThrowsHandler();
+			ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
+			object ret = new object();
+
+			IDynamicMock mc = new DynamicMock(typeof (IMethodInvocation));
+			IMethodInvocation mi = (IMethodInvocation) mc.Object;
+			mi.Proceed();
+			mc.SetValue("Proceed", ret);
+			Assert.AreEqual(ret, ti.Invoke(mi));
+			Assert.AreEqual(0, th.GetCalls());
+			mc.Verify();
+		}
+
+		[Test]
+		public void NoHandlerMethodForThrowable()
+		{
+			MyThrowsHandler th = new MyThrowsHandler();
+			ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
+			Assert.AreEqual(2, ti.HandlerMethodCount);
+			Exception ex = new Exception();
+			IDynamicMock mc = new DynamicMock(typeof (IMethodInvocation));
+			IMethodInvocation mi = (IMethodInvocation) mc.Object;
+			mi.Proceed();
+			mc.ExpectAndThrow("Proceed", ex, null);
+			try
+			{
+				ti.Invoke(mi);
+				Assert.Fail();
+			}
+			catch (Exception caught)
+			{
+				Assert.AreEqual(ex, caught);
+			}
+			Assert.AreEqual(0, th.GetCalls());
+			mc.Verify();
+		}
+
+		[Test]
+		public void CorrectHandlerUsed()
+		{
+			MyThrowsHandler th = new MyThrowsHandler();
+			ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
+			HttpException ex = new HttpException();
+			IDynamicMock mc = new DynamicMock(typeof (IMethodInvocation));
+			IMethodInvocation mi = (IMethodInvocation) mc.Object;
+			mi.Proceed();
+			mc.ExpectAndThrow("Proceed", ex, null);
+			try
+			{
+				ti.Invoke(mi);
+				Assert.Fail();
+			}
+			catch (Exception caught)
+			{
+				Assert.AreEqual(ex, caught);
+			}
+			Assert.AreEqual(1, th.GetCalls());
+			Assert.AreEqual(1, th.GetCalls("HttpException"));
+			mc.Verify();
+        }
+
+        [Test]
+        public void NestedInnerExceptionsAreNotPickedUp()
+        {
+            MyThrowsHandler throwsHandler = new MyThrowsHandler();
+            ThrowsAdviceInterceptor throwsInterceptor = new ThrowsAdviceInterceptor(throwsHandler);
+            // nest the exceptions; make sure the advice gets applied because of the inner exception...
+            Exception exception = new FormatException("Parent", new HttpException("Inner"));
+            IDynamicMock mockInvocation = new DynamicMock(typeof (IMethodInvocation));
+            IMethodInvocation invocation = (IMethodInvocation) mockInvocation.Object;
+            invocation.Proceed();
+            mockInvocation.ExpectAndThrow("Proceed", exception, null);
+            try
+            {
+                throwsInterceptor.Invoke(invocation);
+                Assert.Fail("Must have failed (by throwing an exception by this point - check the mock).");
+            }
+            catch (Exception caught)
+            {
+                Assert.AreEqual(exception, caught);
+            }
+            Assert.AreEqual(0, throwsHandler.GetCalls(),
+                "Must NOT have been handled, 'cos the HttpException was wrapped by " +
+                "another Exception that did not have a handler.");
+            Assert.AreEqual(0, throwsHandler.GetCalls("HttpException"),
+                "Similarly, must NOT have been handled, 'cos the HttpException was wrapped by " +
+                "another Exception that did not have a handler.");
+            mockInvocation.Verify();
+        }
+
+	    [Test]
+        [ExpectedException(typeof(ArgumentException))]
+	    public void ChokesOnHandlerWhereMultipleMethodsAreApplicable()
+	    {
+            object throwsHandler = new MultipleMethodsAreApplicableThrowsHandler();
+            new ThrowsAdviceInterceptor(throwsHandler);
+	    }
+
+		[Test]
+		public void CorrectHandlerUsedForSubclass()
+		{
+			MyThrowsHandler th = new MyThrowsHandler();
+			ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
+			// Extends RemotingException
+			RemotingTimeoutException ex = new RemotingTimeoutException();
+			IDynamicMock mc = new DynamicMock(typeof (IMethodInvocation));
+			IMethodInvocation mi = (IMethodInvocation) mc.Object;
+			mi.Proceed();
+			mc.ExpectAndThrow("Proceed", ex, null);
+			try
+			{
+				ti.Invoke(mi);
+				Assert.Fail();
+			}
+			catch (Exception caught)
+			{
+				Assert.AreEqual(ex, caught);
+			}
+			Assert.AreEqual(1, th.GetCalls());
+			Assert.AreEqual(1, th.GetCalls("RemotingException"));
+			mc.Verify();
+		}
+
+		[Test]
+		public void HandlerMethodThrowsException()
+		{
+			Exception exception = new Exception();
+			MyThrowsHandler handler = new ThrowingMyHandler(exception);
+			ThrowsAdviceInterceptor interceptor = new ThrowsAdviceInterceptor(handler);
+			// extends RemotingException...
+			RemotingTimeoutException ex = new RemotingTimeoutException();
+			IDynamicMock mc = new DynamicMock(typeof (IMethodInvocation));
+			IMethodInvocation invocation = (IMethodInvocation) mc.Object;
+			invocation.Proceed();
+			mc.ExpectAndThrow("Proceed", ex, null);
+			try
+			{
+				interceptor.Invoke(invocation);
+				Assert.Fail("Should not have reached this point, should have thrown an exception.");
+			}
+			catch (Exception caught)
+			{
+				Assert.AreEqual(exception, caught);
+			}
+			Assert.AreEqual(1, handler.GetCalls());
+			Assert.AreEqual(1, handler.GetCalls("RemotingException"));
+			mc.Verify();
+		}
+
+        #region Helper Classes
+
+        private sealed class MultipleMethodsAreApplicableThrowsHandler
+        {
+            public void AfterThrowing(
+                MethodInfo method, object[] args, object target, RemotingException ex)
+            {
+            }
+
+            public void AfterThrowing(RemotingException ex)
+            {
+            }
+        }
+
+	    private class ThrowingMyHandler : MyThrowsHandler
+	    {
+	        private Exception exception;
+
+	        public ThrowingMyHandler(Exception ex)
+	        {
+	            this.exception = ex;
+	        }
+
+	        public override void AfterThrowing(RemotingException ex)
+	        {
+	            base.AfterThrowing(ex);
+	            throw exception;
+	        }
+	    }
+
+	    public class MyThrowsHandler : MethodCounter, IThrowsAdvice
+	    {
+	        public void AfterThrowing(
+	            MethodInfo m, object[] args, object target, HttpException ex)
+	        {
+	            Count("HttpException");
+	        }
+
+	        public virtual void AfterThrowing(RemotingException ex)
+	        {
+	            Count("RemotingException");
+	        }
+
+	        // not valid, wrong number of arguments...
+	        public void AfterThrowing(MethodInfo m, Exception ex)
+	        {
+	            throw new NotSupportedException("Shouldn't be called");
+	        }
+	    }
+
+	    public interface IEcho
+	    {
+	        int A { get; set; }
+
+	        int EchoException(int i, Exception t);
+	    }
+
+	    public class Echo : IEcho
+	    {
+	        private int a;
+
+	        public int A
+	        {
+	            get { return a; }
+	            set { a = value; }
+	        }
+
+	        public virtual int EchoException(int i, Exception ex)
+	        {
+	            if (ex != null)
+	            {
+	                throw ex;
+	            }
+	            return i;
+	        }
+	    }
+
+	    #endregion
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/UnknownAdviceTypeExceptionTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/UnknownAdviceTypeExceptionTests.cs
new file mode 100644
index 00000000..22637562
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/UnknownAdviceTypeExceptionTests.cs
@@ -0,0 +1,45 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Aop.Framework.Adapter
+{
+	/// <summary>
+	/// Unit tests for the UnknownAdviceTypeException class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: UnknownAdviceTypeExceptionTests.cs,v 1.2 2006/04/09 07:19:05 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class UnknownAdviceTypeExceptionTests
+    {
+        [Test]
+        public void InstantiationWithNullAdviceDoesNotThrowAnotherException()
+        {
+            new UnknownAdviceTypeException(null);
+        }
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AopContextTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AopContextTests.cs
new file mode 100644
index 00000000..e682ad8e
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AopContextTests.cs
@@ -0,0 +1,131 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Threading;
+
+using NUnit.Framework;
+
+using Spring.Objects;
+using AopAlliance.Intercept;
+using Spring.Threading;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Unit tests for the AopContext class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: AopContextTests.cs,v 1.6 2007/05/30 21:06:25 oakinger Exp $</version>
+	[TestFixture]
+	public sealed class AopContextTests
+	{
+		[SetUp]
+		public void SetUp()
+		{
+			// makes sure the context is always empty before any unit test...
+			try
+			{
+				do
+				{
+					AopContext.PopProxy();
+				} while (true);
+			}
+			catch (AopConfigException)
+			{
+			}
+		}
+
+		[Test]
+		[ExpectedException(typeof (AopConfigException))]
+		public void CurrentProxyChokesIfNoAopProxyIsOnTheStack()
+		{
+			AopContext.CurrentProxy.ToString();
+		}
+
+		[Test]
+		public void CurrentProxyStackJustPeeksItDoesntPop()
+		{
+			string foo = "Foo";
+			AopContext.PushProxy(foo);
+			object fooref = AopContext.CurrentProxy;
+			Assert.IsTrue(ReferenceEquals(foo, fooref),
+			              "Not the exact same instance (must be).");
+			// must not have been popped off the stack by looking at it...
+			object foorefref = AopContext.CurrentProxy;
+			Assert.IsTrue(ReferenceEquals(fooref, foorefref),
+			              "Not the exact same instance (must be).");
+		}
+
+		[Test]
+		[ExpectedException(typeof (AopConfigException))]
+		public void PopProxyWithNothingOnStack()
+		{
+			AopContext.PopProxy();
+        }
+
+        #region CurrentProxyIsThreadSafe
+
+        [Test(Description = "http://opensource.atlassian.com/projects/spring/browse/SPRNET-341")]
+        public void CurrentProxyIsThreadSafe()
+        {
+            AsyncTestMethod t1 = new AsyncTestMethod(100, new ThreadStart(ProxyTestObjectAndExposeProxy));
+            AsyncTestMethod t2 = new AsyncTestMethod(100, new ThreadStart(ProxyTestObjectAndExposeProxy));
+            t1.Start();
+            t2.Start();
+
+            t1.AssertNoException();
+            t2.AssertNoException();
+        }
+
+        private void ProxyTestObjectAndExposeProxy()
+        {
+            TestObject target = new TestObject();
+            target.Age = 26;
+
+            ProxyFactory pf = new ProxyFactory();
+            pf.ExposeProxy = true;
+            pf.Target = target;
+            pf.AddAdvice(new TestAopContextInterceptor());
+
+            ITestObject proxy = pf.GetProxy() as ITestObject;
+            Assert.IsNotNull(proxy);
+            Assert.AreEqual(target.Age, proxy.Age, "Incorrect age");
+        }
+
+        private class TestAopContextInterceptor : IMethodInterceptor
+        {
+            public object Invoke(IMethodInvocation invocation)
+            {
+                Assert.IsNotNull(AopContext.CurrentProxy);
+                Object ret = invocation.Proceed();
+                Assert.IsNotNull(AopContext.CurrentProxy);
+                return ret;
+            }
+        }
+
+        #endregion
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs
new file mode 100644
index 00000000..f0ff1d50
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs
@@ -0,0 +1,146 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Aop.Framework.DynamicProxy;
+using Spring.Aop.Support;
+using Spring.Context.Support;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Aop.Framework.AutoProxy
+{
+    /// <summary>
+    /// Tests for auto proxy creation combined with factory object and circular references.
+    /// </summary>
+    /// <author>Erich Eichinger (.NET)</author>
+    /// <version>$Id: AdvisorAutoProxyCreatorCircularReferencesTests.cs,v 1.4 2007/09/07 01:53:01 markpollack Exp $</version>
+    [TestFixture]
+    public class AdvisorAutoProxyCreatorCircularReferencesTests
+    {
+        [Test]
+        public void TestAutoProxyCreation()
+        {
+            XmlApplicationContext context = new XmlApplicationContext(ReadOnlyXmlTestResource.GetFilePath("advisorAutoProxyCreatorCircularReferencesTests.xml", typeof(AdvisorAutoProxyCreatorCircularReferencesTests)));
+            // direct deps of AutoProxyCreator are not eligable for proxying
+            Assert.IsFalse(AopUtils.IsAopProxy(context.GetObject("aapc")));
+            Assert.IsFalse(AopUtils.IsAopProxy(context.GetObject("testAdvisor")));
+            Assert.IsFalse(AopUtils.IsAopProxy(context.GetObject("&testObjectFactory")));
+            Assert.IsFalse(AopUtils.IsAopProxy(context.GetObject("someOtherObject")));
+
+            // this one is completely independent
+            Assert.IsTrue(AopUtils.IsAopProxy(context.GetObject("independentObject")));
+
+            // products of the factory created at runtime should be proxied
+            Assert.IsTrue(AopUtils.IsAopProxy(context.GetObject("testObjectFactory")));
+        }
+    }
+
+    #region Support Classes
+
+    public class TestAdvisor : StaticMethodMatcherPointcutAdvisor
+    {
+        private ITestObject testObject;
+
+        public ITestObject TestObject
+        {
+            get { return this.testObject; }
+            set { this.testObject = value; }
+        }
+
+        public override bool Matches(MethodInfo method, Type targetType)
+        {
+            return true;
+        }
+    }
+
+    public class SomeOtherObject
+    {}
+
+    public class IndependentObject
+    { }
+    
+    public class TestObjectFactoryObject : IFactoryObject, IInitializingObject
+    {
+        private bool initialized = false;
+        private ITestObject testObject;
+        private SomeOtherObject someOtherObject;
+
+        public TestObjectFactoryObject()
+        {
+        }
+
+        public SomeOtherObject SomeOtherObject
+        {
+            get { return this.someOtherObject; }
+            set { this.someOtherObject = value; }
+        }
+
+        public object GetObject()
+        {
+            // return product only, if factory has been fully initialized!
+            if (!initialized)
+            {
+                return null;
+            }
+            else
+            {
+                return testObject;
+            }
+        }
+
+        public Type ObjectType
+        {
+            get
+            {
+                // return type only if we are ready to deliver our product!
+                if (!initialized)
+                {
+                    return null;
+                }
+                else
+                {
+                    return typeof(ITestObject);
+                }
+            }
+        }
+
+        public bool IsSingleton
+        {
+            get { return true; }
+        }
+
+        public void AfterPropertiesSet()
+        {
+            Assert.IsNotNull(someOtherObject);
+            testObject = new TestObject();
+            initialized = true;
+        }
+    }
+
+    #endregion
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorTests.cs
new file mode 100644
index 00000000..f5d3f30c
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorTests.cs
@@ -0,0 +1,121 @@
+#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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Aop.Framework.DynamicProxy;
+using Spring.Context.Support;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Xml;
+using Spring.Threading;
+
+#endregion#region License
+
+namespace Spring.Aop.Framework.AutoProxy
+{
+    /// <summary>
+    /// Tests for auto proxy creation by advisor recognition.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: AdvisorAutoProxyCreatorTests.cs,v 1.4 2007/08/01 17:56:25 markpollack Exp $</version>
+    [TestFixture]
+    public class AdvisorAutoProxyCreatorTests
+    {
+        private static string ADVISOR_APC_OBJECT_NAME = "aapc";
+
+        protected virtual IObjectFactory ObjectFactory
+        {
+            get
+            {
+                string configLocation = ReadOnlyXmlTestResource.GetFilePath("advisorAutoProxyCreator.xml", typeof(AdvisorAutoProxyCreatorTests));
+                return new XmlApplicationContext(configLocation);
+            }
+        }
+
+        [Test]
+        public void DefaultExclusionPrefix()
+        {
+            DefaultAdvisorAutoProxyCreator aapc = (DefaultAdvisorAutoProxyCreator)ObjectFactory.GetObject(ADVISOR_APC_OBJECT_NAME);
+            Assert.AreEqual(ADVISOR_APC_OBJECT_NAME + DefaultAdvisorAutoProxyCreator.SEPARATOR, aapc.AdvisorObjectNamePrefix);
+            Assert.IsFalse(aapc.UsePrefix);
+        }
+
+        /// <summary>
+        /// No pointcuts match the methods on NoSetterProperties therefore 
+        /// there should be proxying.
+        /// </summary> 
+        [Test]
+        public void NoProxy()
+        {
+            IObjectFactory of = ObjectFactory;
+            object o = of.GetObject("noSetterPropertiesObject");
+            Assert.IsFalse(AopUtils.IsAopProxy(o));
+        }
+
+        /// <summary>
+        /// A pointcut matches the property (i.e. method set_Age) on TestObject
+        /// therefore there should be proxying.
+        /// </summary> 
+        [Test]
+        public void HasProxy()
+        {
+            IObjectFactory of = ObjectFactory;
+            object o = of.GetObject("testObject");
+            Assert.IsTrue(AopUtils.IsAopProxy(o), "Expected TestObject to be proxied");
+        }
+        
+        [Test]
+        public void RegexpApplied()
+        {
+            IObjectFactory of = ObjectFactory;
+            ITestObject testObject = (ITestObject)of.GetObject("testObject");
+            MethodCounter counter = (MethodCounter)of.GetObject("CountingAdvice");
+            Assert.AreEqual(0,counter.GetCalls());
+            testObject.Spouse = new TestObject("Daniela", 23);
+            Assert.AreEqual(0, counter.GetCalls());
+            testObject.Name = "foo";
+            Assert.AreEqual(1, counter.GetCalls());
+            
+        }
+        
+        [Test]
+        public void SetLTCValue()
+        {
+            IObjectFactory of = ObjectFactory;
+            ITestObject testObject = (ITestObject)of.GetObject("testObject");
+            OrderedLogicalThreadContextCheckAdvisor orderedBeforeLTCSet =
+                (OrderedLogicalThreadContextCheckAdvisor)of.GetObject("orderedBeforeLTCSet");
+            Assert.AreEqual(0, orderedBeforeLTCSet.CountingBeforeAdvice.GetCalls());
+
+            Assert.IsNull(LogicalThreadContext.GetData(LogicalThreadContextAdvice.ORDERING_SLOT));
+            Assert.AreEqual(4, testObject.Age, "Initial value of age for test object is not correct.");
+            int newAge = 5;
+            testObject.Age = newAge;
+            Assert.AreEqual(1, orderedBeforeLTCSet.CountingBeforeAdvice.GetCalls());
+
+            Assert.AreEqual(newAge, testObject.Age, "Assigned value of age for test object is not correct.");
+            Assert.IsNotNull(LogicalThreadContext.GetData(LogicalThreadContextAdvice.ORDERING_SLOT));
+           
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/CreatesTestObject.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/CreatesTestObject.cs
new file mode 100644
index 00000000..5863c088
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/CreatesTestObject.cs
@@ -0,0 +1,82 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 Spring.Objects;
+using Spring.Objects.Factory;
+
+namespace Spring.Aop.Framework.AutoProxy
+{
+    /// <summary>
+    /// This is simple implementation of IFactoryObject that creates a TestObject.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: CreatesTestObject.cs,v 1.1 2007/09/07 01:53:02 markpollack Exp $</version>
+    public class CreatesTestObject : IFactoryObject, IInitializingObject
+    {
+        private bool initialized = false;
+        private ITestObject testObject;
+
+        public CreatesTestObject()
+        {
+        }
+
+
+        public object GetObject()
+        {
+            // return product only, if factory has been fully initialized!
+            if (!initialized)
+            {
+                return null;
+            }
+            else
+            {
+                return testObject;
+            }
+        }
+
+        public Type ObjectType
+        {
+            get
+            {
+                // return type only if we are ready to deliver our product!
+                if (!initialized)
+                {
+                    return null;
+                }
+                else
+                {
+                    return typeof(ITestObject);
+                }
+            }
+        }
+
+        public bool IsSingleton
+        {
+            get { return true; }
+        }
+
+        public void AfterPropertiesSet()
+        {
+            testObject = new TestObject();
+            initialized = true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/LogicalThreadContextAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/LogicalThreadContextAdvice.cs
new file mode 100644
index 00000000..234fd3db
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/LogicalThreadContextAdvice.cs
@@ -0,0 +1,39 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System.Reflection;
+using Spring.Threading;
+
+#endregion
+
+namespace Spring.Aop.Framework.AutoProxy
+{
+    public class LogicalThreadContextAdvice : IMethodBeforeAdvice
+    {
+        public static string ORDERING_SLOT = "ordering_slot";
+
+        public void Before(MethodInfo method, object[] args, object target)
+        {
+            LogicalThreadContext.SetData(ORDERING_SLOT, new object());
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/NoSetterProperties.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/NoSetterProperties.cs
new file mode 100644
index 00000000..2d67b5d4
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/NoSetterProperties.cs
@@ -0,0 +1,44 @@
+#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.Text;
+
+namespace Spring.Aop.Framework.AutoProxy
+{
+    public class NoSetterProperties
+    {
+        public string FancyName
+        {
+            get
+            {
+                return "Joe Suave";
+            }
+        }
+        
+        public void DoWork()
+        {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < 100; i++)
+            {
+                sb.Append(i);
+            }
+        }
+    }
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreatorTests.cs
new file mode 100644
index 00000000..996001f7
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreatorTests.cs
@@ -0,0 +1,162 @@
+#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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Aop.Interceptor;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects;
+using Spring.Objects.Factory.Xml;
+
+#endregion#region License
+
+namespace Spring.Aop.Framework.AutoProxy
+{
+    /// <summary>
+    /// Tests for ObjectNameAutoProxyCreator functionality
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: ObjectNameAutoProxyCreatorTests.cs,v 1.6 2007/09/07 01:53:01 markpollack Exp $</version>
+    [TestFixture]
+    public class ObjectNameAutoProxyCreatorTests
+    {
+        private IApplicationContext ctx;
+
+        [SetUp]
+        public void SetUp()
+        {
+            string configLocation =
+                ReadOnlyXmlTestResource.GetFilePath("objectNameAutoProxyCreatorTests.xml",
+                                                    typeof (ObjectNameAutoProxyCreatorTests));
+            ctx = new XmlApplicationContext(configLocation);
+        }
+
+        [Test]
+        public void NoProxy()
+        {
+            ITestObject testObject = (ITestObject) ctx.GetObject("noproxy");
+            Assert.IsFalse(AopUtils.IsAopProxy(testObject), testObject + " is not an AOP proxy");
+            Assert.AreEqual("noproxy", testObject.Name);
+        }
+
+        [Test]
+        public void ProxyWithExactNameMatch()
+        {
+            ITestObject testObject = (ITestObject) ctx.GetObject("testObject");
+            ProxyAssertions(testObject, 1);
+            Assert.AreEqual("SimpleTestObject", testObject.Name);
+        }
+
+        [Test]
+        public void ProxyWithDoubleProxying()
+        {
+            ITestObject testObject = (ITestObject)ctx.GetObject("doubleProxy");
+            ProxyAssertions(testObject, 2);
+            Assert.AreEqual("doubleProxy", testObject.Name);
+        }
+
+        [Test]
+        public void ProxyWithWildcardMatchSuffix()
+        {
+            ITestObject testObject = (ITestObject) ctx.GetObject("SmithFamilyMember");
+            ProxyAssertions(testObject, 1);
+            Assert.AreEqual("John Smith", testObject.Name);
+        }
+
+        [Test]
+        public void ProxyWithTwoWildcardsMatch()
+        {
+            ITestObject testObject = (ITestObject)ctx.GetObject("twoWildcardsTestObject");
+            ProxyAssertions(testObject, 1);
+            Assert.AreEqual("Damjan Tomic", testObject.Name);
+        }
+
+        [Test]
+        public void AppliesToCreatedObjectsNotFactoryObject()
+        {
+            ITestObject testObject = (ITestObject) ctx.GetObject("factoryObject");
+            ProxyAssertions(testObject, 1);
+        }
+
+        [Test]
+        public void DecoratorProxyWithWildcardMatch()
+        {
+            ITestObject testObject = (ITestObject)ctx.GetObject("decoratorProxy");
+            DecoratorProxyAssertions(testObject);
+            Assert.AreEqual("decoratorProxy", testObject.Name);
+        }
+
+        [Test]
+        public void FrozenProxy()
+        {
+            ITestObject testObject = (ITestObject)ctx.GetObject("frozen");
+            Assert.IsTrue( ((IAdvised)testObject).IsFrozen);
+        }
+
+        [Test]
+        public void Introduction()
+        {
+            object obj = ctx.GetObject("introductionUsingDecorator");
+            Assert.IsNotNull(obj as IIsModified);
+            ITestObject testObject = (ITestObject) obj;
+            NopInterceptor nop = (NopInterceptor)ctx.GetObject("introductionNopInterceptor");
+            Assert.AreEqual(0, nop.Count);
+            Assert.IsTrue(AopUtils.IsCompositionAopProxy(testObject), testObject + " is not an Composition AOP Proxy");
+            int age = 5;
+            testObject.Age = age;
+            Assert.AreEqual(age, testObject.Age);
+            Assert.IsNotNull(testObject as IIsModified);
+            Assert.IsTrue(((IIsModified)testObject).IsModified);
+            Assert.AreEqual(3, nop.Count);
+            Assert.AreEqual("introductionUsingDecorator", testObject.Name);
+        }
+
+
+        private void ProxyAssertions(ITestObject testObject, int nopInterceptorCount)
+        {
+            NopInterceptor nop = (NopInterceptor) ctx.GetObject("nopInterceptor");
+            Assert.AreEqual(0, nop.Count);
+            Assert.IsTrue(AopUtils.IsCompositionAopProxy(testObject), testObject + " is not an AOP Proxy");
+            int age = 5;
+            testObject.Age = age;
+            Assert.AreEqual(age, testObject.Age);
+            Assert.AreEqual(2 * nopInterceptorCount, nop.Count);
+        }
+
+        private void DecoratorProxyAssertions(ITestObject testObject)
+        {
+            CountingBeforeAdvice cba = (CountingBeforeAdvice) ctx.GetObject("countingBeforeAdvice");
+            NopInterceptor nop = (NopInterceptor)ctx.GetObject("nopInterceptor");
+            Assert.AreEqual(0, cba.GetCalls());
+            Assert.AreEqual(0, nop.Count);
+            Assert.IsTrue(AopUtils.IsDecoratorAopProxy(testObject), testObject + " is not an AOP Proxy");
+            //extra advice calls are due to test IsDecoratorAopProxy and call to .GetType in impl
+            Assert.AreEqual(1, nop.Count);
+            Assert.AreEqual(1, cba.GetCalls());
+            int age = 5;
+            testObject.Age = age;
+            Assert.AreEqual(age, testObject.Age);
+            Assert.AreEqual(3, nop.Count);
+            Assert.AreEqual(3, cba.GetCalls());
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/OrderedLogicalThreadContextCheckAdvisor.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/OrderedLogicalThreadContextCheckAdvisor.cs
new file mode 100644
index 00000000..9c77cfa5
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/OrderedLogicalThreadContextCheckAdvisor.cs
@@ -0,0 +1,110 @@
+#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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Aop.Support;
+using Spring.Objects.Factory;
+using Spring.Threading;
+
+#endregion
+
+namespace Spring.Aop.Framework.AutoProxy
+{
+    /// <summary> 
+    /// Before advisor that allow us to manipulate ordering to check
+    /// that superclass sorting works correctly.
+    /// </summary>
+    /// <remarks>
+    /// It doesn't actually do anything except count
+    /// method invocations and check for presence of a value in the 
+    /// LogicalThreadContext.
+    /// </remarks>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: OrderedLogicalThreadContextCheckAdvisor.cs,v 1.2 2006/09/15 21:25:17 markpollack Exp $</version>
+    public class OrderedLogicalThreadContextCheckAdvisor : StaticMethodMatcherPointcutAdvisor, IInitializingObject
+    {
+        
+        public virtual bool RequireLTCHasValue
+        {
+            get { return requireLtcHasValue; }
+
+            set { requireLtcHasValue = value; }
+        }
+
+        public virtual CountingBeforeAdvice CountingBeforeAdvice
+        {
+            get { return (CountingBeforeAdvice) Advice; }
+        }
+
+        /// <summary> Should we insist on the presence of a transaction attribute or refuse to accept one?</summary>
+        private bool requireLtcHasValue = false;
+
+       
+        public virtual void AfterPropertiesSet()
+        {
+            Advice = new LTCCountingBeforeAdvice(this);           
+        }
+
+        public override bool Matches(MethodInfo method, Type targetClass)
+        {
+            return method.Name.StartsWith("set_Age");
+        }
+
+
+        private class LTCCountingBeforeAdvice : CountingBeforeAdvice
+        {
+            private OrderedLogicalThreadContextCheckAdvisor enclosingInstance;
+
+            public LTCCountingBeforeAdvice(OrderedLogicalThreadContextCheckAdvisor enclosingInstance)
+            {
+                this.enclosingInstance = enclosingInstance;
+            }
+
+
+            public OrderedLogicalThreadContextCheckAdvisor EnclosingInstance
+            {
+                get { return enclosingInstance; }
+            }
+
+            public override void Before(MethodInfo method, object[] args, object target)
+            {
+                // do check for presence of LTC value....
+                if (EnclosingInstance.requireLtcHasValue)
+                {
+                    if (LogicalThreadContext.GetData(LogicalThreadContextAdvice.ORDERING_SLOT) == null)
+                    {
+                        throw new SystemException("Expected object in LTC ORDERING_SLOT");
+                    }
+                }
+                else
+                {
+                    if (LogicalThreadContext.GetData(LogicalThreadContextAdvice.ORDERING_SLOT) != null)
+                    {
+                        throw new SystemException("Expected no object in LTC ORDERING_SLOT");
+                    }
+                }
+                base.Before(method, args, target);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/advisorAutoProxyCreatorCircularReferencesTests.xml b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/advisorAutoProxyCreatorCircularReferencesTests.xml
new file mode 100644
index 00000000..a3ec4d4e
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/advisorAutoProxyCreatorCircularReferencesTests.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd"
+    default-autowire="byType"
+>
+    <description>
+        Reproduces a problem with AutoProxyCreators, IFactoryObjects,
+        circular dependencies and a certain order of object definitions
+    </description>
+
+    <!-- start instantiating a factoryobject -->
+    <object id="testObjectFactory" type="Spring.Aop.Framework.AutoProxy.TestObjectFactoryObject, Spring.Aop.Tests">
+        <property name="SomeOtherObject" ref="someOtherObject" />
+    </object>
+
+    <!-- note that testAdvisor is defined *after* 'testObjectFactory'! -->
+    <object id="testAdvisor" type="Spring.Aop.Framework.AutoProxy.TestAdvisor, Spring.Aop.Tests">
+        <property name="testObject" ref="testObjectFactory" />  <!-- ref on testObjectFactory closes the dep circle -->
+    </object>
+
+<!--
+  This object can be instantiated without any additional deps 
+- which causes the AutoProxyCreator to do its job
+-->
+    <object id="someOtherObject" type="Spring.Aop.Framework.AutoProxy.SomeOtherObject, Spring.Aop.Tests" />
+
+<!-- this object is not a direct or indirect dependency of aapc -->
+    <object id="independentObject" type="Spring.Aop.Framework.AutoProxy.IndependentObject, Spring.Aop.Tests" />
+
+  
+    <!-- match everything -->
+    <object id="aapc" type="Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator, Spring.Aop"/>
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingAfterReturningAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingAfterReturningAdvice.cs
new file mode 100644
index 00000000..4f16260c
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingAfterReturningAdvice.cs
@@ -0,0 +1,43 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+using System;
+using System.Reflection;
+using Spring.Aop.Framework;
+#endregion
+
+namespace Spring.Aop.Framework
+{
+    /// <summary>
+    /// Simple after returning advice example that we can use for counting checks.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Bruno Baia (.NET)</author>
+    /// <version>$Id: CountingAfterReturningAdvice.cs,v 1.2 2007/03/16 04:01:47 aseovic Exp $</version>
+    [Serializable]
+    public class CountingAfterReturningAdvice : MethodCounter, IAfterReturningAdvice
+    {
+        public void AfterReturning(object returnValue, MethodInfo method, object[] args, object target)
+        {
+            Count(method);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingBeforeAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingBeforeAdvice.cs
new file mode 100644
index 00000000..51e58546
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingBeforeAdvice.cs
@@ -0,0 +1,43 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+using System;
+using System.Reflection;
+using Spring.Aop.Framework;
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Simple before advice example that we can use for counting checks.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Choy Rim (.NET)</author>
+	/// <version>$Id: CountingBeforeAdvice.cs,v 1.6 2007/03/16 04:01:47 aseovic Exp $</version>
+    [Serializable]
+    public class CountingBeforeAdvice : MethodCounter, IMethodBeforeAdvice
+	{
+		public virtual void Before(MethodInfo method, object[] args, object target)
+		{
+			Count(method);
+		}
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingMultiAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingMultiAdvice.cs
new file mode 100644
index 00000000..2a3b5e18
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingMultiAdvice.cs
@@ -0,0 +1,55 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Aop.Framework;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+    /// <summary>
+    /// Advice object that implements <i>multiple</i> Advice interfaces.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Bruno Baia (.NET)</author>
+    /// <version>$Id: CountingMultiAdvice.cs,v 1.1 2006/08/10 18:45:57 bbaia Exp $</version>
+    public class CountingMultiAdvice : MethodCounter,
+        IMethodBeforeAdvice, IAfterReturningAdvice, IThrowsAdvice
+    {
+        public void Before(MethodInfo method, object[] args, object target)
+        {
+            Count(method);
+        }
+
+        public void AfterReturning(object returnValue, MethodInfo method, object[] args, object target)
+        {
+            Count(method);
+        }
+
+        public void AfterThrowing(ApplicationException aex)
+        {
+            Count(aex.GetType().Name);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingThrowsAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingThrowsAdvice.cs
new file mode 100644
index 00000000..6e08fe16
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingThrowsAdvice.cs
@@ -0,0 +1,50 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using Spring.Aop.Framework;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+    /// <summary>
+    /// Simple throw advice example that we can use for counting checks.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Bruno Baia (.NET)</author>
+    /// <version>$Id: CountingThrowsAdvice.cs,v 1.2 2007/03/16 04:01:47 aseovic Exp $</version>
+    [Serializable]
+    public class CountingThrowsAdvice : MethodCounter, IThrowsAdvice
+    {
+        public void AfterThrowing(Exception ex)
+        {
+            Count(ex.GetType().Name);
+        }
+
+        public void AfterThrowing(ApplicationException aex)
+        {
+            Count(aex.GetType().Name);
+        }
+    }
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicMethodInvocationTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicMethodInvocationTests.cs
new file mode 100644
index 00000000..1374af7e
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicMethodInvocationTests.cs
@@ -0,0 +1,46 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Collections;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Unit tests for the DynamicMethodInvocation class.
+	/// </summary>
+    /// <author>Bruno Baia</author>
+	/// <version>$Id: DynamicMethodInvocationTests.cs,v 1.2 2008/02/06 18:29:05 bbaia Exp $</version>
+	[TestFixture]
+    public class DynamicMethodInvocationTests : AbstractMethodInvocationTests
+	{
+        protected override AbstractMethodInvocation CreateMethodInvocation(object proxy, object target, MethodInfo method, MethodInfo onProxyMethod, object[] arguments, Type targetType, IList interceptors)
+        {
+            return new DynamicMethodInvocation(proxy, target, method, onProxyMethod, arguments, targetType, interceptors);
+        }
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs
new file mode 100644
index 00000000..82e25e26
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs
@@ -0,0 +1,2490 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Threading;
+using System.Reflection;
+using System.Collections;
+using System.Web;
+using System.Diagnostics;
+using System.Runtime.Remoting;
+
+using AopAlliance.Aop;
+using AopAlliance.Intercept;
+using Spring.Aop.Target;
+using Spring.Aop.Framework;
+using Spring.Aop.Framework.Adapter;
+using Spring.Aop.Interceptor;
+using Spring.Aop.Support;
+using Spring.Expressions;
+using Spring.Objects;
+using Spring.Proxy;
+using Spring.Threading;
+using Spring.Util;
+
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// Useful base class for Aop proxy test cases.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Bruno Baia (.NET)</author>
+    /// <version>$Id: AbstractAopProxyTests.cs,v 1.21 2008/05/21 08:04:52 bbaia Exp $</version>
+    public abstract class AbstractAopProxyTests
+    {
+        protected MockTargetSource mockTargetSource = new MockTargetSource();
+
+        /*
+         * Make a clean target source available if code wants to use it.
+         * The target must be set. Verification will be automatic in tearDown
+         * to ensure that it was used appropriately by code.
+         */
+
+        [TestFixtureSetUp]
+        public void FixtureSetUp()
+        {
+            SystemUtils.RegisterLoadedAssemblyResolver();
+        }
+
+        [SetUp]
+        protected void SetUp()
+        {
+            mockTargetSource.Reset();
+        }
+
+        [TearDown]
+        protected void TearDown()
+        {
+            mockTargetSource.Verify();
+        }
+
+        protected abstract object CreateProxy(AdvisedSupport advisedSupport);
+
+        protected abstract Type CreateAopProxyType(AdvisedSupport advisedSupport);
+
+        protected virtual IAopProxy CreateAopProxy(AdvisedSupport advisedSupport)
+        {
+            Type proxyType = CreateAopProxyType(advisedSupport);
+            ConstructorInfo proxyCtorInfo = proxyType.GetConstructor(new Type[] { typeof(IAdvised) });
+
+            ExpressionEvaluator.GetValue(advisedSupport, "Activate()");
+            return (IAopProxy)proxyCtorInfo.Invoke(new object[] { advisedSupport });
+        }
+
+        [Test(Description = "Simple test that if we set values we can get them out again.")]
+        public void ValuesStick()
+        {
+            int age1 = 33;
+            int age2 = 37;
+            string name = "tony";
+
+            TestObject target = new TestObject();
+            target.Age = age1;
+            ProxyFactory pf1 = new ProxyFactory(target);
+            pf1.AddAdvisor(new DefaultPointcutAdvisor(new NopInterceptor()));
+            pf1.AddAdvisor(new DefaultPointcutAdvisor(new TimestampIntroductionInterceptor()));
+            ITestObject to = target;
+
+            Assert.AreEqual(age1, to.Age);
+            to.Age = age2;
+            Assert.AreEqual(age2, to.Age);
+            Assert.IsNull(to.Name);
+            to.Name = name;
+            Assert.AreEqual(name, to.Name);
+        }
+
+        [Test]
+        public void InterceptorInvokedWithNoTarget()
+        {
+            int age = 26;
+            DynamicMock mock = new DynamicMock(typeof(IMethodInterceptor));
+            mock.SetValue("Invoke", age);
+            IMethodInterceptor mi = (IMethodInterceptor)mock.Object;
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.AddAdvice(mi);
+            advised.Interfaces = new Type[] { typeof(ITestObject) };
+
+            ITestObject to = CreateProxy(advised) as ITestObject;
+            Assert.IsNotNull(to);
+            Assert.IsTrue(to.Age == age, "Incorrect age");
+            mock.Verify();
+        }
+
+        [Test]
+        public void ProxyAProxy()
+        {
+            ITestObject target = new TestObject();
+            target.Age = 26;
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = target;
+            advised.AddAdvice(new NopInterceptor());
+            IAopProxy aop = CreateAopProxy(advised);
+            ITestObject proxy1 = (ITestObject)aop.GetProxy();
+            Assert.AreEqual(target.Age, proxy1.Age, "Incorrect age");
+
+            advised = new AdvisedSupport();
+            advised.Target = proxy1;
+            advised.AddAdvice(new NopInterceptor());
+            aop = CreateAopProxy(advised);
+            ITestObject proxy2 = (ITestObject)aop.GetProxy();
+            Assert.AreEqual(target.Age, proxy2.Age, "Incorrect age");
+        }
+
+        #region ProxyAProxyWhereClassExplicitlyImplementsInterfacesWithSameMethodNamesAndSignatures
+
+        // SPRNET-655
+        [Test]
+        public void ProxyAProxyWhereClassExplicitlyImplementsInterfacesWithSameMethodNamesAndSignatures()
+        {
+            TheCommand target = new TheCommand();
+
+            // proxy
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = target;
+            advised.AddAdvice(new NopInterceptor());
+            object proxy = CreateProxy(advised);
+
+            // proxy again
+            advised = new AdvisedSupport();
+            advised.Target = proxy;
+            advised.AddAdvice(new NopInterceptor());
+            proxy = CreateAopProxy(advised);
+
+            IServiceCommand serviceCommand = proxy as IServiceCommand;
+            Assert.IsNotNull(serviceCommand);
+            serviceCommand.Execute();
+
+            IBusinessCommand businessCommand = proxy as IBusinessCommand;
+            Assert.IsNotNull(businessCommand);
+            businessCommand.Execute();
+
+            Assert.AreEqual(1, serviceCommand.ServiceCount);
+            Assert.AreEqual(1, businessCommand.BusinessCount);
+        }
+
+        public interface IServiceCommand
+        {
+            int ServiceCount { get; }
+
+            void Execute();
+        }
+
+        public interface IBusinessCommand
+        {
+            int BusinessCount { get; }
+
+            void Execute();
+        }
+
+        public class TheCommand : IServiceCommand, IBusinessCommand
+        {
+            #region IServiceCommand Members
+
+            private int _serviceCount = 0;
+            int IServiceCommand.ServiceCount
+            {
+                get { return _serviceCount; }
+            }
+
+            void IServiceCommand.Execute()
+            {
+                _serviceCount++;
+            }
+
+            #endregion
+
+            #region IBusinessCommand Members
+
+            private int _businessCount = 0;
+            int IBusinessCommand.BusinessCount
+            {
+                get { return _businessCount; }
+            }
+
+            void IBusinessCommand.Execute()
+            {
+                _businessCount++;
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        [Test]
+        public void EqualsMethod()
+        {
+            TestObject target = new TestObject();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(ITestObject) });
+            advised.Target = target;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+            object proxy = aopProxy.GetProxy();
+
+            Assert.IsNotNull(proxy);
+            Assert.AreEqual(target, proxy, "Equals() returned false");
+        }
+
+        [Test]
+        public void GetHashCodeMethod()
+        {
+            TestObject target = new TestObject();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(ITestObject) });
+            advised.Target = target;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+            object proxy = aopProxy.GetProxy();
+
+            Assert.IsNotNull(proxy);
+            Assert.AreEqual(target.GetHashCode(), proxy.GetHashCode(), "GetHashCode() not equal");
+        }
+
+        #region ProxyMethodWithRefOutParameters
+
+        [Test]
+        public void ProxyMethodWithRefOutParametersWithDirectCall()
+        {
+            PublicRefOutTestObject target = new PublicRefOutTestObject();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IRefOutTestObject) });
+            advised.Target = target;
+
+            IAopProxy aopProxy = CreateAopProxy(advised);
+            IRefOutTestObject proxy = aopProxy.GetProxy() as IRefOutTestObject;
+            Assert.IsNotNull(proxy);
+
+            TestsProxyMethodWithRefOutParameters(proxy);
+        }
+
+        [Test]
+        public void ProxyMethodWithRefOutParametersWithDynamicReflection()
+        {
+            PublicRefOutTestObject target = new PublicRefOutTestObject();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IRefOutTestObject) });
+            advised.Target = target;
+            NopInterceptor ni = new NopInterceptor();
+            advised.AddAdvice(ni);
+
+            IAopProxy aopProxy = CreateAopProxy(advised);
+            IRefOutTestObject proxy = aopProxy.GetProxy() as IRefOutTestObject;
+            Assert.IsNotNull(proxy);
+
+            TestsProxyMethodWithRefOutParameters(proxy);
+
+            Assert.AreEqual(1, ni.Count);
+        }
+
+        [Test]
+        public virtual void ProxyMethodWithRefOutParametersWithStandardReflection()
+        {
+            InternalRefOutTestObject target = new InternalRefOutTestObject();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IRefOutTestObject) });
+            advised.Target = target;
+            NopInterceptor ni = new NopInterceptor();
+            advised.AddAdvice(ni);
+
+            IAopProxy aopProxy = CreateAopProxy(advised);
+            IRefOutTestObject proxy = aopProxy.GetProxy() as IRefOutTestObject;
+            Assert.IsNotNull(proxy);
+
+            TestsProxyMethodWithRefOutParameters(proxy);
+
+            Assert.AreEqual(1, ni.Count);
+        }
+
+        private void TestsProxyMethodWithRefOutParameters(IRefOutTestObject instance)
+        {
+            int valueType = 0;
+            TestObject obj = null;
+            EnumValue enumValue = EnumValue.Initial;
+            bool refValueType = false;
+            int outValueType;
+            String refObj = null;
+            TestObject outObj;
+            EnumValue refEnum = EnumValue.Initial;
+            EnumValue outEnum = EnumValue.Initial;
+            Guid refGuid = Guid.NewGuid();
+            Guid outGuid = Guid.NewGuid();
+
+            instance.DoIt(valueType, obj, enumValue, ref refValueType, out outValueType, ref refObj, out outObj, ref refEnum, out outEnum, ref refGuid, out outGuid);
+
+            Assert.AreEqual(0, valueType);
+            Assert.AreEqual(null, obj);
+            Assert.AreEqual(EnumValue.Initial, enumValue);
+            Assert.AreEqual(true, refValueType);
+            Assert.AreEqual(1, outValueType);
+            Assert.AreEqual("RefObj", refObj);
+            Assert.IsNotNull(outObj);
+            Assert.AreEqual("OutObj", outObj.Name);
+            Assert.AreEqual(EnumValue.Ref, refEnum);
+            Assert.AreEqual(EnumValue.Out, outEnum);
+            Assert.AreEqual(Guid.Empty, refGuid);
+            Assert.AreEqual(Guid.Empty, outGuid);
+        }
+
+        public enum EnumValue
+        {
+            Initial,
+            Ref,
+            Out,
+            Another
+        }
+
+        public interface IRefOutTestObject
+        {
+            int DoIt(int valueType, TestObject obj, EnumValue enumValue, 
+                ref bool refValueType, out int outValueType,
+                ref String refObj, out TestObject outObj,
+                ref EnumValue refEnum, out EnumValue outEnum, 
+                ref Guid refGuid, out Guid outGuid);
+        }
+
+        public class PublicRefOutTestObject : IRefOutTestObject
+        {
+            public int DoIt(int valueType, TestObject obj, EnumValue enumValue,
+                ref bool refValueType, out int outValueType,
+                ref String refObj, out TestObject outObj,
+                ref EnumValue refEnum, out EnumValue outEnum, 
+                ref Guid refGuid, out Guid outGuid)
+            {
+                valueType++;
+                obj = new TestObject("Bruno", 27);
+                enumValue = EnumValue.Another;
+                refValueType = true;
+                outValueType = 1;
+                refObj += "RefObj";
+                outObj = new TestObject("OutObj", 27);
+                refEnum = EnumValue.Ref;
+                outEnum = EnumValue.Out;
+                refGuid = Guid.Empty;
+                outGuid = Guid.Empty;
+
+                return 0;
+            }
+        }
+
+        internal class InternalRefOutTestObject : PublicRefOutTestObject
+        {
+        }
+
+        #endregion
+
+        #region ProxyGenericMethodWithRefOutParameters
+
+#if NET_2_0
+        [Test]
+        public void ProxyGenericMethodWithRefOutParametersWithDirectCall()
+        {
+            PublicRefOutGenericTestObject target = new PublicRefOutGenericTestObject();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IRefOutGenericTestObject) });
+            advised.Target = target;
+
+            IAopProxy aopProxy = CreateAopProxy(advised);
+            IRefOutGenericTestObject proxy = aopProxy.GetProxy() as IRefOutGenericTestObject;
+            Assert.IsNotNull(proxy);
+
+            TestsProxyGenericMethodWithRefOutParameters(proxy);
+        }
+
+        [Test]
+        public void ProxyGenericMethodWithRefOutParametersWithDynamicReflection()
+        {
+            PublicRefOutGenericTestObject target = new PublicRefOutGenericTestObject();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IRefOutGenericTestObject) });
+            advised.Target = target;
+            NopInterceptor ni = new NopInterceptor();
+            advised.AddAdvice(ni);
+
+            IAopProxy aopProxy = CreateAopProxy(advised);
+            IRefOutGenericTestObject proxy = aopProxy.GetProxy() as IRefOutGenericTestObject;
+            Assert.IsNotNull(proxy);
+
+            TestsProxyGenericMethodWithRefOutParameters(proxy);
+
+            Assert.AreEqual(3, ni.Count);
+        }
+
+        [Test]
+        public virtual void ProxyGenericMethodWithRefOutParametersWithStandardReflection()
+        {
+            InternalRefOutGenericTestObject target = new InternalRefOutGenericTestObject();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IRefOutGenericTestObject) });
+            advised.Target = target;
+            NopInterceptor ni = new NopInterceptor();
+            advised.AddAdvice(ni);
+
+            IAopProxy aopProxy = CreateAopProxy(advised);
+            IRefOutGenericTestObject proxy = aopProxy.GetProxy() as IRefOutGenericTestObject;
+            Assert.IsNotNull(proxy);
+
+            TestsProxyGenericMethodWithRefOutParameters(proxy);
+
+            Assert.AreEqual(3, ni.Count);
+        }
+
+        private void TestsProxyGenericMethodWithRefOutParameters(IRefOutGenericTestObject instance)
+        {
+            EnumValue enumValue = EnumValue.Another;
+            EnumValue refEnum = EnumValue.Ref;
+            EnumValue outEnum = EnumValue.Out;
+            EnumValue enumResult = instance.DoIt<EnumValue>(enumValue, ref refEnum, out outEnum);
+            Assert.AreEqual(EnumValue.Another, refEnum);
+            Assert.AreEqual(EnumValue.Another, outEnum);
+            Assert.AreEqual(EnumValue.Another, enumResult);
+
+            TestObject objectValue = new TestObject("Value", 28);
+            TestObject refObject = new TestObject("Ref", 28);
+            TestObject outObject = new TestObject("Out", 28);
+            TestObject objectResult = instance.DoIt<TestObject>(objectValue, ref refObject, out outObject);
+            Assert.AreEqual("Value", refObject.Name);
+            Assert.AreEqual("Value", outObject.Name);
+            Assert.AreEqual("Value", objectResult.Name);
+
+            int intValue = 1;
+            int refInt = 2;
+            int outInt = 3;
+            int intResult = instance.DoIt<int>(intValue, ref refInt, out outInt);
+            Assert.AreEqual(1, refInt);
+            Assert.AreEqual(1, outInt);
+            Assert.AreEqual(1, intResult);
+        }
+
+        public interface IRefOutGenericTestObject
+        {
+            T DoIt<T>(T param, ref T refParam, out T outParam);
+        }
+
+        public class PublicRefOutGenericTestObject : IRefOutGenericTestObject
+        {
+            public T DoIt<T>(T paramValue, ref T refParam, out T outParam)
+            {
+                refParam = paramValue;
+                outParam = paramValue;
+
+                return paramValue;
+            }
+        }
+
+        internal class InternalRefOutGenericTestObject : PublicRefOutGenericTestObject
+        {
+        }
+#endif
+        #endregion
+
+        [Test]
+        public void ToStringMethod()
+        {
+            TestObject target = new TestObject();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(ITestObject) });
+            advised.Target = target;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+            object proxy = aopProxy.GetProxy();
+
+            Assert.IsNotNull(proxy);
+            Assert.AreEqual(target.ToString(), proxy.ToString(), "ToString() not equal");
+        }
+
+#if NET_2_0
+        [Test]
+        public void InterceptGenericMethod()
+        {
+            AbstractProxyTypeBuilderTests.ClassWithGenericMethod target = 
+                new AbstractProxyTypeBuilderTests.ClassWithGenericMethod();
+            mockTargetSource.SetTarget(target);
+
+            NopInterceptor ni = new NopInterceptor();
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.TargetSource = mockTargetSource;
+            advised.AddAdvice(ni);
+
+            AbstractProxyTypeBuilderTests.InterfaceWithGenericMethod proxy =
+                CreateProxy(advised) as AbstractProxyTypeBuilderTests.InterfaceWithGenericMethod;
+            Assert.IsNotNull(proxy);
+
+            proxy.PolymorphicMethod<int>();
+            proxy.PolymorphicMethod<string>();
+
+            string result1 = proxy.PolymorphicMethod("coucou");
+            Assert.AreEqual("coucou", result1);
+
+            proxy.WithGenericParameter<string>();
+
+            proxy.WithGenericParameterAndGenericArgument<string>("ola");
+
+            string result2 = proxy.WithGenericParameterAndGenericArgumentAndGenericReturnType<string>("ola");
+            Assert.AreEqual("ola", result2);
+
+            proxy.WithInterfaceConstraint<bool>();
+
+            proxy.WithBaseTypeConstraint<DerivedTestObject>();
+
+            proxy.WithBaseTypeAndInterfaceConstraints<DerivedTestObject>();
+
+            proxy.WithMixedConstraint<bool, DerivedTestObject>();
+            Assert.AreEqual(10, ni.Count);
+        }
+
+        [Test]
+        public void InterceptGenericInterface()
+        {
+            AbstractProxyTypeBuilderTests.ClassThatImplementsGenericInterface<TestObject> target = 
+                new AbstractProxyTypeBuilderTests.ClassThatImplementsGenericInterface<TestObject>();
+            mockTargetSource.SetTarget(target);
+
+            NopInterceptor ni = new NopInterceptor();
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.TargetSource = mockTargetSource;
+            advised.AddAdvice(ni);
+
+            AbstractProxyTypeBuilderTests.GenericInterface<TestObject> proxy = 
+                CreateProxy(advised) as AbstractProxyTypeBuilderTests.GenericInterface<TestObject>;
+            Assert.IsNotNull(proxy);
+
+            TestObject to1 = proxy.Create();
+            Assert.IsNotNull(to1);
+
+            TestObject to2 = proxy.Populate(new TestObject());
+            Assert.IsNotNull(to2);
+            Assert.AreEqual("Populated", to2.Name);
+
+            Assert.AreEqual(2, ni.Count);
+        }
+#endif
+
+        #region MultiThreadedProxyCreation
+
+        [Test(Description = "http://opensource.atlassian.com/projects/spring/browse/SPRNET-340")]
+        public void MultiThreadedProxyCreation()
+        {
+            MultiThreadedProxyCreation(5);
+        }
+
+        private void MultiThreadedProxyCreation(int howMany)
+        {
+            AsyncTestMethod[] threads = new AsyncTestMethod[howMany];
+            for (int i = 0; i < howMany; i++)
+                threads[i] = new AsyncTestMethod(10, new ThreadStart(ProxyTestObject));
+            for (int i = 0; i < howMany; i++)
+                threads[i].Start();
+            for (int i = 0; i < howMany; i++)
+                threads[i].AssertNoException();
+        }
+
+        private void ProxyTestObject()
+        {
+            TestObject target = new TestObject();
+            target.Age = 26;
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = target;
+            advised.AddAdvice(new NopInterceptor());
+
+            ITestObject proxy = CreateProxy(advised) as ITestObject;
+            Assert.IsNotNull(proxy);
+            Assert.AreEqual(target.Age, proxy.Age, "Incorrect age");
+        }
+
+        #endregion
+
+        #region Attributes
+
+        [Test]
+        public void ProxyTargetTypeAttributes()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            object[] attrs = proxy.GetType().GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 1 attribute applied to the target type.");
+            Assert.AreEqual(1, attrs.Length, "Should have had 1 attribute applied to the target type.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the target type.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetTypeAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            advised.ProxyTargetAttributes = false;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            object[] attrs = proxy.GetType().GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the target type.");
+        }
+
+        [Test]
+        public void ProxyTargetMethodAttributes()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            MethodInfo method = proxy.GetType().GetMethod("Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests+IMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetType().GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(1, attrs.Length, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the target method.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetMethodAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            advised.ProxyTargetAttributes = false;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            MethodInfo method = proxy.GetType().GetMethod("Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests+IMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetType().GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the target method.");
+        }
+
+        [Test]
+        public void ProxyTargetMethodParameterAttributes()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            MethodInfo method = proxy.GetType().GetMethod("Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests+IMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetType().GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetParameters()[1].GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 1 attribute applied to the method's parameter.");
+            Assert.AreEqual(1, attrs.Length, "Should have had 1 attribute applied to the method's parameter.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the method's parameter.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetMethodParameterAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            advised.ProxyTargetAttributes = false;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            MethodInfo method = proxy.GetType().GetMethod("Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests+IMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetType().GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetParameters()[1].GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's parameter.");
+        }
+
+#if NET_2_0
+        [Test]
+        public void ProxyTargetMethodReturnValueAttributes()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            MethodInfo method = proxy.GetType().GetMethod("Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests+IMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetType().GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.ReturnTypeCustomAttributes.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 1 attribute applied to the method's return value.");
+            Assert.AreEqual(1, attrs.Length, "Should have had 1 attribute applied to the method's return value.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the method's return value.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetMethodReturnValueAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            advised.ProxyTargetAttributes = false;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            MethodInfo method = proxy.GetType().GetMethod("Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests+IMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetType().GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.ReturnTypeCustomAttributes.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's return value.");
+        }
+#endif
+
+        public sealed class MarkerAttribute : Attribute
+        {
+        }
+
+        public interface IMarkerInterface
+        {
+            void MarkerMethod(int param1, string param2);
+        }
+
+        [Marker]
+        public class MarkerClass : IMarkerInterface
+        {
+            [Marker]
+            [return: Marker]
+            public void MarkerMethod(int param1, [Marker]string param2)
+            {
+            }
+
+            [Marker]
+            [return: Marker]
+            public virtual void MarkerVirtualMethod(int param1, [Marker]string param2)
+            {
+            }
+        }
+
+        #endregion
+
+        [Test]
+        public void AddAdviceAtRuntime()
+        {
+            TestObject target = new TestObject();
+            CountingBeforeAdvice cba = new CountingBeforeAdvice();
+
+            ProxyFactory pf = new ProxyFactory(target);
+            ITestObject proxy = (ITestObject)CreateProxy(pf);
+
+            proxy.Age.ToString();
+            Assert.AreEqual(0, cba.GetCalls());
+            ((IAdvised)proxy).AddAdvice(cba);
+            proxy.Age.ToString();
+            Assert.AreEqual(1, cba.GetCalls());
+        }
+
+        [Test]
+        public void SerializationAdviceAndTargetNotSerializable()
+        {
+            TestObject to = new TestObject();
+            Assert.IsFalse(SerializationTestUtils.IsSerializable(to));
+
+            ProxyFactory pf = new ProxyFactory(to);
+
+            pf.AddAdvice(new NopInterceptor());
+            ITestObject proxy = (ITestObject)CreateAopProxy(pf).GetProxy();
+
+            Assert.IsFalse(SerializationTestUtils.IsSerializable(proxy));
+        }
+
+        [Test]
+        public void SerializationAdviceNotSerializable()
+        {
+            SerializablePerson sp = new SerializablePerson();
+            Assert.IsTrue(SerializationTestUtils.IsSerializable(sp));
+
+            ProxyFactory pf = new ProxyFactory(sp);
+
+            // This isn't serializable
+            IAdvice i = new NopInterceptor();
+            pf.AddAdvice(i);
+            Assert.IsFalse(SerializationTestUtils.IsSerializable(i));
+            Object proxy = CreateAopProxy(pf).GetProxy();
+
+            Assert.IsFalse(SerializationTestUtils.IsSerializable(proxy));
+        }
+
+        [Test]
+        public void SerializationSerializableTargetAndAdvice()
+        {
+            SerializablePerson personTarget = new SerializablePerson();
+            personTarget.Name = "jim";
+            personTarget.Age = 26;
+
+            Assert.IsTrue(SerializationTestUtils.IsSerializable(personTarget));
+
+            ProxyFactory pf = new ProxyFactory(personTarget);
+
+            CountingThrowsAdvice cta = new CountingThrowsAdvice();
+
+            pf.AddAdvice(new SerializableNopInterceptor());
+            // Try various advice types
+            pf.AddAdvice(new CountingBeforeAdvice());
+            pf.AddAdvice(new CountingAfterReturningAdvice());
+            pf.AddAdvice(cta);
+            IPerson p = (IPerson) CreateAopProxy(pf).GetProxy();
+
+            p.Echo(null);
+            Assert.AreEqual(0, cta.GetCalls());
+            try 
+            {
+                p.Echo(new Exception());
+            }
+            catch (Exception) 
+            {
+            }
+            Assert.AreEqual(1, cta.GetCalls());
+
+            // Will throw exception if it fails
+            IPerson p2 = (IPerson) SerializationTestUtils.SerializeAndDeserialize(p);
+            Assert.AreNotSame(p, p2);
+            Assert.AreEqual(p.GetName(), p2.GetName());
+            Assert.AreEqual(p.GetAge(), p2.GetAge());
+            Assert.IsTrue(AopUtils.IsAopProxy(p2), "Deserialized object is an AOP proxy");
+
+            IAdvised a1 = (IAdvised)p;
+            IAdvised a2 = (IAdvised)p2;
+            // Check we can manipulate state of p2
+            Assert.AreEqual(a1.Advisors.Length, a2.Advisors.Length);
+
+            // This should work as SerializablePerson is equal
+            Assert.AreEqual(p, p2, "Proxies should be equal, even after one was serialized");
+
+            // Check we can add a new advisor to the target
+            NopInterceptor ni = new NopInterceptor();
+            p2.GetAge();
+            Assert.AreEqual(0, ni.Count);
+            a2.AddAdvice(ni);
+            p2.GetAge();
+            Assert.AreEqual(1, ni.Count);
+
+            cta = (CountingThrowsAdvice) a2.Advisors[3].Advice;
+            p2.Echo(null);
+            Assert.AreEqual(1, cta.GetCalls());
+            try 
+            {
+                p2.Echo(new Exception());
+            }
+            catch (Exception)
+            {
+
+            }
+            Assert.AreEqual(2, cta.GetCalls());
+        }
+
+        #region OneAdvisedObjectCallsAnother
+
+        /// <summary>
+        /// Check that the two MethodInvocations necessary are independent 
+        /// and don't conflict.
+        /// </summary>
+        [Test]
+        public void OneAdvisedObjectCallsAnother() 
+        {
+            int age1 = 33;
+            int age2 = 37;
+
+            TestObject target1 = new TestObject();
+            ProxyFactory pf1 = new ProxyFactory(target1);
+            // Permit proxy and invocation checkers to get context from AopContext
+            pf1.ExposeProxy = true;
+            NopInterceptor di1 = new NopInterceptor();
+            pf1.AddAdvice(0, di1);
+            pf1.AddAdvice(1, new ProxyMatcherInterceptor());
+            pf1.AddAdvice(2, new MethodInvocationMatcherInterceptor());
+            ITestObject advised1 = (ITestObject) pf1.GetProxy();
+            advised1.Age = age1; // = 1 invocation
+
+            TestObject target2 = new TestObject();
+            ProxyFactory pf2 = new ProxyFactory(target2);
+            pf2.ExposeProxy = true;
+            NopInterceptor di2 = new NopInterceptor();
+            pf2.AddAdvice(0, di2);
+            pf2.AddAdvice(1, new ProxyMatcherInterceptor());
+            pf2.AddAdvice(2, new MethodInvocationMatcherInterceptor());
+            ITestObject advised2 = (ITestObject) CreateProxy(pf2);
+            advised2.Age = age2;
+            advised1.Spouse = advised2; // = 2 invocations
+
+            Assert.AreEqual(age1, advised1.Age, "Advised one has correct age"); // = 3 invocations
+            Assert.AreEqual(age2, advised2.Age, "Advised two has correct age");
+            // Means extra call on advised 2
+            Assert.AreEqual(age2, advised1.Spouse.Age, "Advised one spouse has correct age"); // = 4 invocations on 1 and another one on 2
+            Assert.AreEqual(4, di1.Count, "one was invoked correct number of times");
+            // Got hit by call to advised1.getSpouse().Age
+            Assert.AreEqual(3, di2.Count, "one was invoked correct number of times");
+        }
+
+        private class MethodInvocationMatcherInterceptor : IMethodInterceptor
+        {
+            public object Invoke(IMethodInvocation invocation)
+            {
+                MethodInfo m = invocation.Method;
+                Object retval = invocation.Proceed();
+                Assert.AreEqual(m, invocation.Method, "Method invocation should have same method on way back");
+                return retval;
+            }
+        }
+
+        private class ProxyMatcherInterceptor : IMethodInterceptor
+        {
+            public object Invoke(IMethodInvocation invocation)
+            {
+                Object proxy = AopContext.CurrentProxy;
+                Object ret = invocation.Proceed();
+                Assert.IsTrue(proxy == AopContext.CurrentProxy, "Proxy should be the same on way back");
+                return ret;
+            }
+        }
+
+        #endregion
+
+        [Test]
+        public void Reentrance()
+        {
+            int age1 = 33;
+
+            TestObject target1 = new TestObject();
+            ProxyFactory pf1 = new ProxyFactory(target1);
+            NopInterceptor di1 = new NopInterceptor();
+            pf1.AddAdvice(0, di1);
+            ITestObject advised1 = (ITestObject)CreateProxy(pf1);
+
+            advised1.Age = age1; // = 1 invocation
+            advised1.Spouse = advised1; // = 2 invocations
+
+            Assert.AreEqual(2, di1.Count, "one was invoked correct number of times");
+
+            Assert.AreEqual(age1, advised1.Age, "Advised one has correct age"); // = 3 invocations
+            Assert.AreEqual(3, di1.Count, "one was invoked correct number of times");
+
+            // = 5 invocations, as reentrant call to spouse is advised also
+            Assert.AreEqual(age1, advised1.Spouse.Age, "Advised spouse has correct age");
+
+            Assert.AreEqual(5, di1.Count, "one was invoked correct number of times");
+        }
+
+        [Test]
+        public void TargetCanGetProxy()
+        {
+            NopInterceptor di = new NopInterceptor();
+            INeedsToSeeProxy target = new TargetChecker();
+            ProxyFactory proxyFactory = new ProxyFactory(target);
+            proxyFactory.ExposeProxy = true;
+            Assert.IsTrue(proxyFactory.ExposeProxy);
+
+            proxyFactory.AddAdvice(0, di);
+            INeedsToSeeProxy proxied = (INeedsToSeeProxy)CreateProxy(proxyFactory);
+
+            Assert.AreEqual(0, di.Count);
+            Assert.AreEqual(0, target.Count);
+            proxied.IncrementViaThis();
+            Assert.AreEqual(1, target.Count, "Increment happened");
+
+            Assert.AreEqual(1, di.Count, "Only one invocation via AOP as use of this wasn't proxied");
+            // 1 invocation
+            Assert.AreEqual(1, proxied.Count, "Increment happened");
+            proxied.IncrementViaProxy(); // 2 invoocations
+            Assert.AreEqual(2, target.Count, "Increment happened");
+            Assert.AreEqual(4, di.Count, "3 more invocations via AOP as the first call was reentrant through the proxy");
+        }
+
+        /// <summary>
+        /// Check that although a method is eligible for advice chain optimization and 
+        /// direct reflective invocation, it doesn't happen if we've asked to see the proxy, 
+        /// so as to guarantee a consistent programming model.
+        /// </summary>
+        [Test]
+        public void TargetCanGetProxyEvenIfNoAdviceChain()
+        {
+            NeedsToSeeProxy target = new NeedsToSeeProxy();
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(INeedsToSeeProxy) });
+            advised.Target = target;
+            advised.ExposeProxy = true;
+
+            // Now let's try it with the special target
+            IAopProxy aop = CreateAopProxy(advised);
+            INeedsToSeeProxy proxied = (INeedsToSeeProxy)aop.GetProxy();
+
+            // It will complain if it can't get the proxy
+            proxied.IncrementViaProxy();
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException))]
+        public void TargetCantGetProxyByDefault()
+        {
+            NeedsToSeeProxy et = new NeedsToSeeProxy();
+            ProxyFactory pf1 = new ProxyFactory(et);
+            Assert.IsFalse(pf1.ExposeProxy);
+            INeedsToSeeProxy proxied = (INeedsToSeeProxy)CreateProxy(pf1);
+            proxied.IncrementViaProxy();
+        }
+
+        #region TargetReturnsThis
+
+        [Test(Description = "Test that the proxy returns itself when the target returns 'this'.")]
+        public void TargetReturnsThis()
+        {
+            // Test return value
+            TestObject raw = new OwnSpouse();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(ITestObject) });
+            advised.Target = raw;
+
+            ITestObject to = (ITestObject) CreateProxy(advised);
+            Assert.IsTrue(to.Spouse == to, "this return is wrapped in proxy");
+        }
+
+        public class OwnSpouse : TestObject
+        {
+            public override ITestObject Spouse
+            {
+                get { return this; }
+            }
+        }
+
+        #endregion        
+
+        [Test]
+        public void TargetThrowsException() 
+        {
+            Exception expectedException = new ApplicationException();
+
+            // Test return value
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(ITestObject) });
+            advised.Target = new TestObject();
+            IAopProxy aop = CreateAopProxy(advised);
+
+            try 
+            {
+                ITestObject to = (ITestObject) aop.GetProxy();
+                to.Exceptional(expectedException);
+                Assert.Fail("Should have thrown exception raised by target");
+            }
+            catch (Exception ex) 
+            {
+                Assert.AreEqual(expectedException, ex, "exception matches");
+            }
+        }
+
+        #region InterceptorThrowsException
+
+        [Test]
+        public void InterceptorThrowsException()
+        {
+            Exception expectedException = new ApplicationException();
+
+            IMethodInterceptor mi = new ThrowExceptionInterceptor(expectedException);
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(ITestObject) });
+            advised.Target = new TestObject();
+            advised.AddAdvice(mi);
+            IAopProxy aop = CreateAopProxy(advised);
+
+            try
+            {
+                ITestObject to = (ITestObject)aop.GetProxy();
+                to.Name = "Bruno";
+                Assert.Fail("Should have thrown exception raised by interceptor");
+            }
+            catch (Exception ex)
+            {
+                Assert.AreEqual(expectedException, ex, "exception matches");
+            }
+        }
+
+        private class ThrowExceptionInterceptor : IMethodInterceptor
+        {
+            private Exception _exception;
+
+            public ThrowExceptionInterceptor(Exception ex)
+            {
+                _exception = ex;
+            }
+
+            public object Invoke(IMethodInvocation invocation)
+            {
+                throw _exception;
+            }
+        }
+
+        #endregion
+
+        // TODO : Introduction tests
+/*
+        [Test(Description = "Test stateful interceptor")]
+        public void MixinWithIntroductionAdvisor()
+        {
+            TestObject to = new TestObject();
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(ITestObject) });
+            advised.AddAdvisor(new LockMixinAdvisor());
+            advised.Target = to;
+
+            CheckTestObjectIntroduction(advised);
+        }
+
+        [Test]
+        public void MixinWithIntroductionInfo()
+        {
+            TestObject to = new TestObject();
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(ITestObject) });
+            advised.AddAdvice(new LockMixin());
+            advised.Target = to;
+
+            CheckTestObjectIntroduction(advised);
+        }
+
+        private void CheckTestObjectIntroduction(AdvisedSupport advised) 
+        {
+            int newAge = 65;
+
+            ITestObject ito = (ITestObject) CreateProxy(advised);
+            ito.Age = newAge;
+            Assert.IsTrue(ito.Age == newAge);
+
+            ILockable lockable = (ILockable) ito;
+            Assert.IsFalse(lockable.Locked());
+            lockable.DoLock();
+
+            Assert.IsTrue(ito.Age == newAge);
+            try 
+            {
+                ito.Age = 1;
+                Assert.Fail("Setters should fail when locked");
+            }
+            catch (LockedException) 
+            {
+                // ok
+            }
+            Assert.IsTrue(ito.Age == newAge);
+
+            // Unlock
+            Assert.IsTrue(lockable.Locked());
+            lockable.Unlock();
+            ito.Age = 1;
+            Assert.IsTrue(ito.Age == 1);
+        }
+*/
+
+        #region MultipleProceedCalls
+
+        [Test]
+        public void MultipleProceedCalls()
+        {
+            TestObject to = new TestObject();
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(ITestObject) });
+            advised.Target = to;
+            advised.AddAdvice(new RetryAdvice());
+            NopInterceptor ni = new NopInterceptor();
+            advised.AddAdvice(ni);
+
+            ITestObject ito = (ITestObject)CreateProxy(advised);
+            ito.Age = 27;
+
+            Assert.AreEqual(2, ni.Count);
+        }
+
+        public class RetryAdvice : IMethodInterceptor
+        {
+            public object Invoke(IMethodInvocation invocation)
+            {
+                invocation.Proceed();
+                return invocation.Proceed();
+            }
+        }
+
+        #endregion
+
+        #region ReplaceArgument
+
+        [Test]
+        public void ReplaceArgument()
+        {
+            TestObject to = new TestObject();
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(ITestObject) });
+            advised.Target = to;
+            advised.AddAdvisor(new StringSetterNullReplacementAdvisor(new StringSetterNullReplacementAdvice()));
+
+            ITestObject ito = (ITestObject)CreateProxy(advised);
+            int newAge = 5;
+            ito.Age = newAge;
+            Assert.IsTrue(ito.Age == newAge);
+            String newName = "greg";
+            ito.Name = newName;
+            Assert.AreEqual(newName, ito.Name);
+
+            ito.Name = null;
+
+            // Null replacement magic should work
+            Assert.IsTrue(ito.Name.Equals(""));
+        }
+
+        [Test]
+        public void ReplaceArgumentDescendingPropagation()
+        {
+            TestObject to = new TestObject();
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(ITestObject) });
+            advised.Target = to;
+            advised.AddAdvisor(new StringSetterNullReplacementAdvisor(new StringSetterNullReplacementAdvice()));
+            NopInterceptor ni = new NopInterceptor();
+            advised.AddAdvisor(new StringSetterNullReplacementAdvisor(ni));
+
+            ITestObject ito = (ITestObject)CreateProxy(advised);
+            int newAge = 5;
+            ito.Age = newAge;
+            Assert.IsTrue(ito.Age == newAge);
+            String newName = "greg";
+            ito.Name = newName;
+            Assert.AreEqual(newName, ito.Name);
+
+            ito.Name = null;
+
+            // Null replacement magic should work
+            Assert.IsTrue(ito.Name.Equals(""));
+
+            // StringSetterNullReplacementAdvisor should not be fire twice
+            Assert.AreEqual(0, ni.Count);
+        }
+
+        [Test]
+        public void ReplaceArgumentAscendingPropagation()
+        {
+            TestObject to = new TestObject();
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(ITestObject) });
+            advised.Target = to;
+            advised.AddAdvice(new CheckArgumentsAfterProceedAdvice());
+            advised.AddAdvisor(new StringSetterNullReplacementAdvisor(new StringSetterNullReplacementAdvice()));
+
+            ITestObject ito = (ITestObject)CreateProxy(advised);
+            ito.Name = null;
+        }
+
+        /// <summary>
+        /// Fires on setter methods that take a string.
+        /// </summary>
+        public class StringSetterNullReplacementAdvisor : DynamicMethodMatcherPointcutAdvisor
+        {
+            public StringSetterNullReplacementAdvisor(IAdvice advice)
+                : base(advice)
+            {
+            }
+
+            public override bool Matches(MethodInfo method, Type targetType, object[] args)
+            {
+                return (args[0] == null);
+            }
+
+            public override bool Matches(MethodInfo method, Type targetType)
+            {
+                return method.Name.StartsWith("set_") &&
+                    method.GetParameters().Length == 1 &&
+                    method.GetParameters()[0].ParameterType == typeof(string);
+            }
+        }
+
+        /// <summary>
+        /// Replaces null arg with "".
+        /// </summary>
+        public class StringSetterNullReplacementAdvice : IMethodInterceptor
+        {
+            public object Invoke(IMethodInvocation invocation)
+            {
+                // We know it can only be invoked if there's a single parameter of type string
+                invocation.Arguments[0] = "";
+                return invocation.Proceed();
+            }
+        }
+
+        public class CheckArgumentsAfterProceedAdvice : IMethodInterceptor
+        {
+            public object Invoke(IMethodInvocation invocation)
+            {
+                object returnValue = invocation.Proceed();
+
+                // Null replacement magic should work
+                Assert.IsNotNull(invocation.Arguments[0]);
+
+                return returnValue;
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// http://forum.springframework.net/showthread.php?t=504
+        /// </summary>
+        [Test]
+        public void CanCastProxyToIAdvised()
+        {
+            TestObject to = new TestObject();
+            AdvisedSupport advisedSupport = new AdvisedSupport();
+            advisedSupport.Target = to;
+            NopInterceptor ni = new NopInterceptor();
+            advisedSupport.AddAdvice(0, ni);
+
+            ITestObject ito = (ITestObject)CreateProxy(advisedSupport);
+            Assert.AreEqual(0, ni.Count);
+            ito.Age = 23;
+            Assert.AreEqual(23, ito.Age);
+            Assert.AreEqual(2, ni.Count);
+
+            IAdvised advised = (IAdvised)ito;
+            Assert.AreEqual(1, advised.Advisors.Length, "Have 1 advisor");
+            Assert.AreEqual(ni, advised.Advisors[0].Advice);
+            NopInterceptor ni2 = new NopInterceptor();
+            advised.AddAdvice(1, ni2);
+            ito.Name = "Bruno";
+            Assert.AreEqual(3, ni.Count);
+            Assert.AreEqual(1, ni2.Count);
+            // will remove ni
+            advised.RemoveAdvisor(0);
+            Assert.IsNotNull(ito.Age);
+            // Unchanged
+            Assert.AreEqual(3, ni.Count);
+            Assert.AreEqual(2, ni2.Count);
+
+            CountingBeforeAdvice cba = new CountingBeforeAdvice();
+            Assert.AreEqual(0, cba.GetCalls());
+            advised.AddAdvice(cba);
+            ito.Age = 16;
+            Assert.AreEqual(16, ito.Age);
+            Assert.AreEqual(2, cba.GetCalls());
+        }
+
+        [Test]
+        public void CannotAddInterceptorWhenFrozen()
+        {
+            TestObject target = new TestObject();
+            target.Age = 21;
+            ProxyFactory pf = new ProxyFactory(target);
+            Assert.IsFalse(pf.IsFrozen);
+            pf.AddAdvice(new NopInterceptor());
+            ITestObject proxied = (ITestObject)CreateProxy(pf);
+            pf.IsFrozen = true;
+            try
+            {
+                pf.AddAdvice(0, new NopInterceptor());
+                Assert.Fail("Shouldn't be able to add interceptor when frozen");
+            }
+            catch (AopConfigException ex)
+            {
+                Assert.IsTrue(ex.Message.IndexOf("frozen") > -1);
+            }
+
+            // Check it still works: proxy factory state shouldn't have been corrupted
+            Assert.AreEqual(target.Age, proxied.Age);
+            Assert.AreEqual(1, ((IAdvised)proxied).Advisors.Length);
+        }
+
+        [Test(Description = "Check that casting to Advised can't get around advice freeze.")]
+        public void CannotAddAdvisorWhenFrozenUsingCast()
+        {
+            TestObject target = new TestObject();
+            target.Age = 21;
+            ProxyFactory pf = new ProxyFactory(target);
+            Assert.IsFalse(pf.IsFrozen);
+            pf.AddAdvice(new NopInterceptor());
+            ITestObject proxied = (ITestObject)CreateProxy(pf);
+            pf.IsFrozen = true;
+            IAdvised advised = (IAdvised)proxied;
+
+            Assert.IsTrue(pf.IsFrozen);
+            try
+            {
+                advised.AddAdvisor(new DefaultPointcutAdvisor(new NopInterceptor()));
+                Assert.Fail("Shouldn't be able to add Advisor when frozen");
+            }
+            catch (AopConfigException ex)
+            {
+                Assert.IsTrue(ex.Message.IndexOf("frozen") > -1);
+            }
+
+            // Check it still works: proxy factory state shouldn't have been corrupted
+            Assert.AreEqual(target.Age, proxied.Age);
+            Assert.AreEqual(1, advised.Advisors.Length);
+        }
+
+        [Test]
+        public void CannotRemoveAdvisorWhenFrozen()
+        {
+            TestObject target = new TestObject();
+            target.Age = 21;
+            ProxyFactory pf = new ProxyFactory(target);
+            Assert.IsFalse(pf.IsFrozen);
+            pf.AddAdvice(new NopInterceptor());
+            ITestObject proxied = (ITestObject)CreateProxy(pf);
+            pf.IsFrozen = true;
+            IAdvised advised = (IAdvised)proxied;
+
+            Assert.IsTrue(pf.IsFrozen);
+            try
+            {
+                advised.RemoveAdvisor(0);
+                Assert.Fail("Shouldn't be able to remove Advisor when frozen");
+            }
+            catch (AopConfigException ex)
+            {
+                Assert.IsTrue(ex.Message.IndexOf("frozen") > -1);
+            }
+
+            // Didn't get removed
+            Assert.AreEqual(1, advised.Advisors.Length);
+            pf.IsFrozen = false;
+            // Can now remove it
+            advised.RemoveAdvisor(0);
+            // Check it still works: proxy factory state shouldn't have been corrupted
+            Assert.AreEqual(target.Age, proxied.Age);
+            Assert.AreEqual(0, advised.Advisors.Length);
+        }
+
+        [Test(Description = "Check that the string is informative.")]
+        public void ProxyConfigString()
+        {
+            TestObject target = new TestObject();
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.Interfaces = new Type[] { typeof(ITestObject) };
+            pf.AddAdvice(new NopInterceptor());
+            IMethodBeforeAdvice mba = new CountingBeforeAdvice();
+            IAdvisor advisor = new DefaultPointcutAdvisor(new NameMatchMethodPointcut(), mba);
+            pf.AddAdvisor(advisor);
+            ITestObject proxied = (ITestObject)CreateProxy(pf);
+
+            String proxyConfigString = ((IAdvised)proxied).ToProxyConfigString();
+            Assert.IsTrue(proxyConfigString.IndexOf(advisor.ToString()) != -1);
+            Assert.IsTrue(proxyConfigString.IndexOf("1 interface") != -1);
+        }
+
+        // TODO : Opaque can be implemented if really usefull (To increase performance)
+/*
+        public void testCanPreventCastToAdvisedUsingOpaque() 
+        {
+            TestObject target = new TestObject();
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.Interfaces = new Type[] { typeof(ITestObject) };
+            pf.AddAdvice(new NopInterceptor());
+            CountingBeforeAdvice mba = new CountingBeforeAdvice();
+            NameMatchMethodPointcut nmmp = new NameMatchMethodPointcut();
+            nmmp.MappedName = "set_Age";
+            IAdvisor advisor = new DefaultPointcutAdvisor(nmmp, mba);
+            pf.AddAdvisor(advisor);
+            Assert.IsFalse(pf.Opaque, "Opaque defaults to false");
+            pf.Opaque = true;
+            Assert.IsTrue(pf.Opaque, "Opaque now true for this config");
+            ITestObject proxied = (ITestObject) CreateProxy(pf);
+            proxied.Age = 10;
+            Assert.AreEqual(10, proxied.Age);
+            Assert.AreEqual(1, mba.GetCalls());
+
+            Assert.IsFalse(proxied is IAdvised, "Cannot be cast to Advised", );
+        }
+ */
+
+        // TODO AdviceSupportListeners test
+        #region AdviceSupportListeners
+/*
+        [Test]
+        public void AdviceSupportListeners()
+        {
+            TestObject target = new TestObject();
+            target.Age = 21;
+
+            ProxyFactory pf = new ProxyFactory(target);
+            CountingAdvisorListener l = new CountingAdvisorListener(pc);
+            pf.AddListener(l);
+            RefreshCountingAdvisorChainFactory acf = new RefreshCountingAdvisorChainFactory();
+            // Should be automatically added as a listener
+            pf.AdvisorChainFactory(acf);
+            Assert.IsFalse(pf.isActive());
+            Assert.AreEqual(0, l.activates);
+            Assert.AreEqual(0, acf.refreshes);
+            ITestObject proxied = (ITestObject)CreateProxy(pf);
+            Assert.AreEqual(1, acf.refreshes);
+            Assert.AreEqual(1, l.activates);
+            Assert.IsTrue(pc.isActive());
+            Assert.AreEqual(target.Age, proxied.Age);
+            Assert.AreEqual(0, l.adviceChanges);
+            NopInterceptor ni = new NopInterceptor();
+            pf.addAdvice(0, ni);
+            Assert.AreEqual(1, l.adviceChanges);
+            Assert.AreEqual(2, acf.refreshes);
+            Assert.AreEqual(target.Age, proxied.Age);
+            pf.removeAdvice(ni);
+            Assert.AreEqual(2, l.adviceChanges);
+            Assert.AreEqual(3, acf.refreshes);
+            Assert.AreEqual(target.Age, proxied.Age);
+            pf.getProxy();
+            Assert.AreEqual(1, l.activates);
+
+            pf.RemoveListener(l);
+            Assert.AreEqual(2, l.adviceChanges);
+            pf.AddAdvisor(new DefaultPointcutAdvisor(new NopInterceptor()));
+            // No longer counting
+            Assert.AreEqual(2, l.adviceChanges);
+        }
+
+        public class CountingAdvisorListener : IAdvisedSupportListener 
+        {
+            public int adviceChanges;
+            public int activates;
+            private AdvisedSupport expectedSource;
+
+            public CountingAdvisorListener(AdvisedSupport expectedSource) 
+            {
+                this.expectedSource = expectedSource;
+            }
+
+            public void AdviceChanged(AdvisedSupport source)
+            {
+                Assert.AreEqual(expectedSource, source);
+                ++adviceChanges;
+            }
+
+            public void Activated(AdvisedSupport source) 
+            {
+                Assert.AreEqual(expectedSource,source);
+                ++activates;
+            }
+        }
+
+        public class RefreshCountingAdvisorChainFactory : IAdvisorChainFactory 
+        {
+            public int refreshes;
+
+            public void  AdviceChanged(AdvisedSupport source) 
+            {
+                ++refreshes;
+            }
+
+            public IList GetInterceptors(IAdvised advised, object proxy, string methodId, MethodInfo method, Type targetType)
+            {
+                return AdvisorChainFactoryUtils.CalculateInterceptors(advised, proxy, method, targetType);
+            }   
+
+            public void  Activated(AdvisedSupport source) 
+            {
+                ++refreshes;
+            }
+        }
+*/
+        #endregion
+
+        #region DynamicMethodPointcut
+
+        [Test]
+        public void DynamicMethodPointcutThatAlwaysAppliesStatically()
+        {
+            TestObject to = new TestObject();
+            ProxyFactory pf = new ProxyFactory(new Type[] { typeof(ITestObject) });
+            TestDynamicPointcutAdvisor dp = new TestDynamicPointcutAdvisor(new NopInterceptor(), "get_Age");
+            pf.AddAdvisor(dp);
+            pf.Target = to;
+            ITestObject it = (ITestObject) CreateProxy(pf);
+            Assert.AreEqual(dp.count, 0);
+            int age = it.Age;
+            Assert.AreEqual(dp.count, 1);
+            it.Age = 11;
+            Assert.AreEqual(it.Age, 11);
+            Assert.AreEqual(dp.count, 2);
+        }
+
+        [Test]
+        public void DynamicMethodPointcutThatAppliesStaticallyOnlyToSetters()
+        {
+            TestObject to = new TestObject();
+            ProxyFactory pf = new ProxyFactory(new Type[] { typeof(ITestObject) });
+            // Could apply dynamically to property Age but not to property Name
+            ForSettersOnlyPointcutAdvisor dp = new ForSettersOnlyPointcutAdvisor(new NopInterceptor(), "Age");
+            pf.AddAdvisor(dp);
+            this.mockTargetSource.SetTarget(to);
+            pf.TargetSource = mockTargetSource;
+            ITestObject it = (ITestObject)CreateProxy(pf);
+            Assert.AreEqual(dp.count, 0);
+            int age = it.Age;
+            // Statically vetoed
+            Assert.AreEqual(0, dp.count);
+            it.Age = 11;
+            Assert.AreEqual(it.Age, 11);
+            Assert.AreEqual(dp.count, 1);
+            // Applies statically but not dynamically
+            it.Name = "joe";
+            Assert.AreEqual(dp.count, 1);
+        }
+
+        private class TestDynamicPointcutAdvisor : DynamicMethodMatcherPointcutAdvisor
+        {
+            private string pattern;
+            public int count = 0;
+
+            public TestDynamicPointcutAdvisor(IAdvice advice, string pattern)
+                :
+                base(advice)
+            {
+                this.pattern = pattern;
+            }
+
+            public override bool Matches(MethodInfo method, Type targetType, object[] args)
+            {
+                bool run = method.Name.IndexOf(pattern) != -1;
+                if (run) ++count;
+                return run;
+            }
+        }
+
+        private class ForSettersOnlyPointcutAdvisor : TestDynamicPointcutAdvisor
+        {
+            public ForSettersOnlyPointcutAdvisor(IAdvice advice, string pattern)
+                :
+                base(advice, pattern)
+            {
+            }
+
+            public override bool Matches(MethodInfo method, Type targetType)
+            {
+                return method.Name.StartsWith("set_");
+            }
+        }
+
+        #endregion
+
+        #region StaticMethodPointcut
+
+        [Test]
+        public void StaticMethodPointcut()
+        {
+            TestObject to = new TestObject();
+            ProxyFactory pf = new ProxyFactory(new Type[] { typeof(ITestObject) });
+            NopInterceptor ni = new NopInterceptor();
+            TestStaticPointcutAdvisor sp = new TestStaticPointcutAdvisor(ni, "get_Age");
+            pf.AddAdvisor(sp);
+            pf.Target = to;
+            ITestObject it = (ITestObject) CreateProxy(pf);
+            Assert.AreEqual(ni.Count, 0);
+            int age = it.Age;
+            Assert.AreEqual(ni.Count, 1);
+            it.Age = 11;
+            Assert.AreEqual(it.Age, 11);
+            Assert.AreEqual(ni.Count, 2);
+        }
+
+        private class TestStaticPointcutAdvisor : StaticMethodMatcherPointcutAdvisor
+        {
+            private string pattern;
+            private int count;
+
+            public TestStaticPointcutAdvisor(IAdvice advice, String pattern)
+                :
+                base(advice)
+            {
+                this.pattern = pattern;
+            }
+
+            public override bool Matches(MethodInfo method, Type targetType)
+            {
+                bool run = method.Name.IndexOf(pattern) != -1;
+                if (run) ++count;
+                return run;
+            }
+        }
+
+        #endregion
+
+        #region CloneInvocationToProceedThreeTimes
+
+        // TODO ? ReflectiveMethodInvocation is not Cloneable
+/*
+        [Test(Description="There are times when we want to call proceed() twice.")]
+        public void CloneInvocationToProceedThreeTimes() 
+        {
+            //We can do this if we clone the invocation.
+
+            TestObject to = new TestObject();
+            ProxyFactory pf = new ProxyFactory(to);
+            pf.AddInterface(typeof(ITestObject));
+
+            TwoBirthdayAdvice twoBirthdayAdvice = new TwoBirthdayAdvice();
+
+            TwoBirthdayPointcutAdvisor sp = new TwoBirthdayPointcutAdvisor(twoBirthdayAdvice);
+            pf.AddAdvisor(sp);
+            ITestObject ito = (ITestObject)CreateProxy(pf);
+
+            int age = 20;
+            ito.Age = age;
+            Assert.AreEqual(age, ito.Age);
+            // Should return the age before the third, AOP-induced birthday
+            Assert.AreEqual(age + 2, ito.haveBirthday());
+            // Return the final age produced by 3 birthdays
+            Assert.AreEqual(age + 3, ito.Age);
+        }
+
+        private class TwoBirthdayPointcutAdvisor : StaticMethodMatcherPointcutAdvisor
+        {
+            public TwoBirthdayPointcutAdvisor(IAdvice advice)
+                : base(advice)
+            {
+            }
+
+            public override bool Matches(MethodInfo method, Type targetType)
+            {
+                return "haveBirthday".Equals(method.Name);
+            }
+        }
+
+        private class TwoBirthdayAdvice : IMethodInterceptor
+        {
+            public object Invoke(IMethodInvocation invocation)
+            {
+                // Clone the invocation to proceed three times
+                // "The Moor's Last Sigh": this technology can cause premature aging
+                IMethodInvocation clone1 = ((ReflectiveMethodInvocation)invocation).InvocableClone();
+                IMethodInvocation clone2 = ((ReflectiveMethodInvocation)invocation).InvocableClone();
+                clone1.Proceed();
+                clone2.Proceed();
+                return invocation.Proceed();
+            }
+        }
+
+//    // We want to change the arguments on a clone: it shouldn't affect the original.
+//    public void testCanChangeArgumentsIndependentlyOnClonedInvocation() throws Throwable 
+//    {
+//        TestObject to = new TestObject();
+//        ProxyFactory pc = new ProxyFactory(to);
+//        pc.addInterface(typeof(ITestObject));
+
+//        // Changes the name, then changes it back.
+//        MethodInterceptor nameReverter = new MethodInterceptor() {
+//            public Object invoke(MethodInvocation mi) throws Throwable {
+//                MethodInvocation clone = ((ReflectiveMethodInvocation) mi).invocableClone();
+//                String oldName = ((ITestObject) mi.getThis()).Name;
+//                clone.getArguments()[0] = oldName;
+//                // Original method invocation should be unaffected by changes to argument list of clone
+//                mi.proceed();
+//                return clone.proceed();
+//            }
+//        };
+
+//        class NameSaver implements MethodInterceptor {
+//            private List names = new LinkedList();
+
+//            public Object invoke(MethodInvocation mi) throws Throwable {
+//                names.add(mi.getArguments()[0]);
+//                return mi.proceed();
+//            }
+//        }
+
+//        NameSaver saver = new NameSaver();
+
+//        pc.addAdvisor(new DefaultPointcutAdvisor(Pointcuts.SETTERS, nameReverter));
+//        pc.addAdvisor(new DefaultPointcutAdvisor(Pointcuts.SETTERS, saver));
+//        ITestObject it = (ITestObject) createProxy(pc);
+
+//        String name1 = "tony";
+//        String name2 = "gordon";
+
+//        to.setName(name1);
+//        Assert.AreEqual(name1, to.Name);
+
+//        it.setName(name2);
+//        // NameReverter saved it back
+//        Assert.AreEqual(name1, it.Name);
+//        Assert.AreEqual(2, saver.names.size());
+//        Assert.AreEqual(name2, saver.names.get(0));
+//        Assert.AreEqual(name1, saver.names.get(1));
+//    }
+*/
+        #endregion
+
+        #region OverloadedMethodsWithDifferentAdvice
+
+        [Test]
+        public void OverloadedMethodsWithDifferentAdvice()
+        {
+            Overloads target = new Overloads();
+            ProxyFactory pf = new ProxyFactory(target);
+            NopInterceptor overloadVoid = new NopInterceptor();
+            pf.AddAdvisor(new OverloadVoidPointcutAdvisor(overloadVoid));
+            NopInterceptor overloadInt = new NopInterceptor();
+            pf.AddAdvisor(new OverloadIntPointcutAdvisor(overloadInt));
+
+            IOverloads proxy = (IOverloads) CreateProxy(pf);
+
+            Assert.AreEqual(0, overloadInt.Count);
+            Assert.AreEqual(0, overloadVoid.Count);
+            proxy.Overload();
+            Assert.AreEqual(0, overloadInt.Count);
+            Assert.AreEqual(1, overloadVoid.Count);
+            Assert.AreEqual(25, proxy.Overload(25));
+            Assert.AreEqual(1, overloadInt.Count);
+            Assert.AreEqual(1, overloadVoid.Count);
+            proxy.NoAdvice();
+            Assert.AreEqual(1, overloadInt.Count);
+            Assert.AreEqual(1, overloadVoid.Count);
+        }
+
+        public interface IOverloads 
+        {
+            void Overload();
+            int Overload(int i);
+            string Overload(string foo);
+            void NoAdvice();
+        }
+
+        public class Overloads : IOverloads 
+        {
+            public void Overload() 
+            {
+            }
+
+            public int Overload(int i) 
+            {
+                return i;
+            }
+
+            public string Overload(string foo) 
+            {
+                return foo;
+            }
+
+            public void NoAdvice() 
+            {
+            }
+        }
+
+        private class OverloadVoidPointcutAdvisor : StaticMethodMatcherPointcutAdvisor
+        {
+            public OverloadVoidPointcutAdvisor(IAdvice advice)
+                : base(advice)
+            {
+            }
+
+            public override bool Matches(MethodInfo method, Type targetType)
+            {
+                return method.Name.Equals("Overload") && method.GetParameters().Length == 0;
+            }
+        }
+
+        private class OverloadIntPointcutAdvisor : StaticMethodMatcherPointcutAdvisor
+        {
+            public OverloadIntPointcutAdvisor(IAdvice advice)
+                : base(advice)
+            {
+            }
+
+            public override bool Matches(MethodInfo method, Type targetType)
+            {
+                return method.Name.Equals("Overload") && method.GetParameters().Length == 1 &&
+                        method.GetParameters()[0].ParameterType == typeof(int);
+            }
+        }
+
+        #endregion
+
+        // TODO : IAdvised.TargetSource is read only (no setter)
+/*
+        [Test]
+        public void ExistingProxyChangesTarget()
+        {
+            TestObject to1 = new TestObject();
+            to1.Age = 33;
+
+            TestObject to2 = new TestObject();
+            to2.Age = 26;
+            to2.Name = "Juergen";
+            TestObject to3 = new TestObject();
+            to3.Age = 37;
+            ProxyFactory pf = new ProxyFactory(to1);
+            NopInterceptor nop = new NopInterceptor();
+            pf.AddAdvice(nop);
+            ITestObject proxy = (ITestObject)CreateProxy(pf);
+            Assert.AreEqual(nop.Count, 0);
+            Assert.AreEqual(to1.Age, proxy.Age);
+            Assert.AreEqual(nop.Count, 1);
+            // Change to a new static target
+            pf.Target = to2;
+            Assert.AreEqual(to2.Age, proxy.Age);
+            Assert.AreEqual(nop.Count, 2);
+
+            // Change to a new dynamic target
+            HotSwappableTargetSource hts = new HotSwappableTargetSource(to3);
+            pf.TargetSource = hts;
+            Assert.AreEqual(to3.Age, proxy.Age);
+            Assert.AreEqual(nop.Count, 3);
+            hts.Swap(to1);
+            Assert.AreEqual(to1.Age, proxy.Age);
+            to1.Name = "Colin";
+            Assert.AreEqual(to1.Name, proxy.Name);
+            Assert.AreEqual(nop.Count, 5);
+
+            // Change back, relying on casting to Advised
+            IAdvised advised = (IAdvised)proxy;
+            Assert.AreSame(hts, advised.TargetSource);
+            SingletonTargetSource sts = new SingletonTargetSource(to2);
+            advised.TargetSource = sts;
+            Assert.AreEqual(to2.Name, proxy.Name);
+            Assert.AreSame(sts, advised.TargetSource);
+            Assert.AreEqual(to2.Age, proxy.Age);
+        }
+
+        [Test]
+        public void ProxyIsBoundBeforeTargetSourceInvoked() 
+        {
+            TestObject target = new TestObject();
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.AddAdvice(new DebugInterceptor());
+            pf.ExposeProxy = true;
+            ITestObject proxy = (ITestObject) CreateProxy(pf);
+            IAdvised config = (IAdvised) proxy;
+            // This class just checks proxy is bound before getTarget() call
+            config.setTargetSource(new TargetSource() {
+                public Class getTargetClass() {
+                    return TestObject.class;
+                }
+
+                public boolean isStatic() {
+                    return false;
+                }
+
+                public Object getTarget() throws Exception {
+                    Assert.AreEqual(proxy, AopContext.currentProxy());
+                    return target;
+                }
+
+                public void releaseTarget(Object target) throws Exception {				
+                }			
+            });
+	
+            // Just test anything: it will fail if context wasn't found
+            Assert.AreEqual(0, proxy.Age);
+        }
+*/
+
+        #region BeforeAdvisorIsInvoked
+
+        [Test]
+        public void BeforeAdvisorIsInvoked() 
+        {
+            CountingBeforeAdvice cba = new CountingBeforeAdvice();
+            IAdvisor matchesNoArgsAdvisor = new NoArgsMethodPointcutAdvisor(cba);
+            TestObject target = new TestObject();
+            target.Age = 80;
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.AddAdvice(new NopInterceptor());
+            pf.AddAdvisor(matchesNoArgsAdvisor);
+            Assert.AreEqual(matchesNoArgsAdvisor, pf.Advisors[1], "Advisor was added");
+            ITestObject proxied = (ITestObject)CreateProxy(pf);
+            Assert.AreEqual(0, cba.GetCalls());
+            Assert.AreEqual(0, cba.GetCalls("get_Age"));
+            Assert.AreEqual(target.Age, proxied.Age);
+            Assert.AreEqual(1, cba.GetCalls());
+            Assert.AreEqual(1, cba.GetCalls("get_Age"));
+            Assert.AreEqual(0, cba.GetCalls("set_Age"));
+            // Won't be advised
+            proxied.Age = 26;
+            Assert.AreEqual(1, cba.GetCalls());
+            Assert.AreEqual(26, proxied.Age);
+        }
+
+        private class NoArgsMethodPointcutAdvisor : StaticMethodMatcherPointcutAdvisor
+        {
+            public NoArgsMethodPointcutAdvisor(IAdvice advice)
+                : base(advice)
+            {
+            }
+
+            public override bool Matches(MethodInfo method, Type targetType)
+            {
+                return method.GetParameters().Length == 0;
+            }
+        }
+
+        #endregion
+
+        // TODO : Multi advice not supported ?
+        #region MultiAdvice
+
+        [Test]
+        [Ignore("Multi advice not supported for now.")]
+        public void MultiAdvice()
+        {
+            CountingMultiAdvice cma = new CountingMultiAdvice();
+            IAdvisor matchesNoArgsAdvisor = new NoArgsOrNotExceptionalMethodPointcutAdvisor(cma);
+            TestObject target = new TestObject();
+            target.Age = 80;
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.AddAdvice(new NopInterceptor());
+            pf.AddAdvisor(matchesNoArgsAdvisor);
+            Assert.AreEqual(matchesNoArgsAdvisor, pf.Advisors[1], "Advisor was added");
+            ITestObject proxied = (ITestObject)CreateProxy(pf);
+
+            Assert.AreEqual(0, cma.GetCalls());
+            Assert.AreEqual(0, cma.GetCalls("get_Age"));
+            Assert.AreEqual(target.Age, proxied.Age);
+            Assert.AreEqual(2, cma.GetCalls());
+            Assert.AreEqual(2, cma.GetCalls("get_Age"));
+            Assert.AreEqual(0, cma.GetCalls("set_Age"));
+            // Won't be advised
+            proxied.Age = 26;
+            Assert.AreEqual(2, cma.GetCalls());
+            Assert.AreEqual(26, proxied.Age);
+            Assert.AreEqual(4, cma.GetCalls());
+            try
+            {
+                proxied.Exceptional(new ApplicationException("foo"));
+                Assert.Fail("Should have thrown ApplicationException");
+            }
+            catch (ApplicationException)
+            {
+                // expected
+            }
+            Assert.AreEqual(6, cma.GetCalls());
+        }
+
+        private class NoArgsOrNotExceptionalMethodPointcutAdvisor : StaticMethodMatcherPointcutAdvisor
+        {
+            public NoArgsOrNotExceptionalMethodPointcutAdvisor(IAdvice advice)
+                : base(advice)
+            {
+            }
+
+            public override bool Matches(MethodInfo method, Type targetType)
+            {
+                return method.GetParameters().Length == 0 || method.Name == "Exceptional";
+            }
+        }
+
+        #endregion
+
+        #region BeforeAdviceThrowsException
+
+        [Test]
+        public void BeforeAdviceThrowsException() 
+        {
+            ApplicationException aex = new ApplicationException();
+            CountingBeforeNonSetterAdvice ba = new CountingBeforeNonSetterAdvice(aex);
+
+            TestObject target = new TestObject();
+            target.Age = 80;
+            NopInterceptor nop1 = new NopInterceptor();
+            NopInterceptor nop2 = new NopInterceptor(2);
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.AddAdvice(nop1);
+            pf.AddAdvice(ba);
+            pf.AddAdvice(nop2);
+            ITestObject proxied = (ITestObject)CreateProxy(pf);
+            // Won't throw an exception
+            Assert.AreEqual(target.Age, proxied.Age);
+            Assert.AreEqual(1, ba.GetCalls());
+            Assert.AreEqual(1, ba.GetCalls("get_Age"));
+            Assert.AreEqual(1, nop1.Count);
+            Assert.AreEqual(1, nop2.Count);
+            // Will fail, after invoking Nop1
+            try 
+            {
+                proxied.Age = 26;
+                Assert.Fail("before advice should have ended chain");
+            }
+            catch (ApplicationException ex) 
+            {
+                Assert.AreEqual(aex, ex);
+            }
+            Assert.AreEqual(2, ba.GetCalls());
+            Assert.AreEqual(2, nop1.Count);
+            // Nop2 didn't get invoked when the exception was thrown
+            Assert.AreEqual(1, nop2.Count);
+            // Shouldn't have changed value in joinpoint
+            Assert.AreEqual(target.Age, proxied.Age);
+        }
+
+        private class CountingBeforeNonSetterAdvice : CountingBeforeAdvice
+        {
+            private Exception _exception;
+
+            public CountingBeforeNonSetterAdvice(Exception ex)
+            {
+                _exception = ex;
+            }
+
+            public override void  Before(MethodInfo method, object[] args, object target)
+            {
+ 	             base.Before(method, args, target);
+
+                 if (method.Name.StartsWith("set_"))
+                    throw _exception;
+            }
+        }
+
+        #endregion
+
+        #region AfterReturningAdvisorIsInvoked
+
+        [Test]
+        public void AfterReturningAdvisorIsInvoked() 
+        {
+            SummingAfterAdvice aa = new SummingAfterAdvice();
+            IAdvisor matchesIntAdvisor = new ReturnsIntPointcutAdvisor(aa);
+            TestObject target = new TestObject();
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.AddAdvice(new NopInterceptor());
+            pf.AddAdvisor(matchesIntAdvisor);
+            Assert.AreEqual(matchesIntAdvisor, pf.Advisors[1], "Advisor was added");
+            ITestObject proxied = (ITestObject)CreateProxy(pf);
+            Assert.AreEqual(0, aa.sum);
+            int i1 = 12;
+            int i2 = 13;
+
+            // Won't be advised
+            proxied.Age = i1;
+            Assert.AreEqual(i1, proxied.Age);
+            Assert.AreEqual(i1, aa.sum);
+            proxied.Age = i2;
+            Assert.AreEqual(i2, proxied.Age);
+            Assert.AreEqual(i1 + i2, aa.sum);
+            Assert.AreEqual(i2, proxied.Age);
+        }
+
+        private class SummingAfterAdvice : IAfterReturningAdvice
+        {
+            public int sum;
+
+            public void AfterReturning(Object returnValue, MethodInfo method, Object[] args, Object target)
+            {
+                sum += ((int)returnValue);
+            }
+        }
+
+        private class ReturnsIntPointcutAdvisor : StaticMethodMatcherPointcutAdvisor
+        {
+            public ReturnsIntPointcutAdvisor(IAdvice advice)
+                : base(advice)
+            {
+            }
+
+            public override bool Matches(MethodInfo method, Type targetType)
+            {
+                return method.ReturnType == typeof(int);
+            }
+        }
+
+        #endregion
+
+        [Test]
+        public void AfterReturningAdvisorIsNotInvokedOnException()
+        {
+            CountingAfterReturningAdvice car = new CountingAfterReturningAdvice();
+            TestObject target = new TestObject();
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.AddAdvice(new NopInterceptor());
+            pf.AddAdvice(car);
+            Assert.AreEqual(car, pf.Advisors[1].Advice, "Advice was wrapped in Advisor and added");
+            ITestObject proxied = (ITestObject)CreateProxy(pf);
+            Assert.AreEqual(0, car.GetCalls());
+            int age = 10;
+            proxied.Age = age;
+            Assert.AreEqual(age, proxied.Age);
+            Assert.AreEqual(2, car.GetCalls());
+            Exception ex = new Exception();
+            // On exception it won't be invoked
+            try
+            {
+                proxied.Exceptional(ex);
+                Assert.Fail("Should have thrown Exception");
+            }
+            catch (Exception caught)
+            {
+                Assert.AreSame(ex, caught);
+            }
+            Assert.AreEqual(2, car.GetCalls());
+        }
+
+        #region ThrowsAdvisorIsInvoked
+
+        [Test]
+        public void ThrowsAdvisorIsInvoked()
+        {
+            // Reacts to HttpException and RemotingException
+            ThrowsAdviceInterceptorTests.MyThrowsHandler th = new ThrowsAdviceInterceptorTests.MyThrowsHandler();
+            IAdvisor matchesEchoAdvisor = new EchoPointcutAdvisor(th);
+            ThrowsAdviceInterceptorTests.Echo target = new ThrowsAdviceInterceptorTests.Echo();
+            target.A = 16;
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.AddAdvice(new NopInterceptor());
+            pf.AddAdvisor(matchesEchoAdvisor);
+            Assert.AreEqual(matchesEchoAdvisor, pf.Advisors[1], "Advisor was added");
+            ThrowsAdviceInterceptorTests.IEcho proxied = (ThrowsAdviceInterceptorTests.IEcho)CreateProxy(pf);
+            Assert.AreEqual(0, th.GetCalls());
+            Assert.AreEqual(target.A, proxied.A);
+            Assert.AreEqual(0, th.GetCalls());
+            Exception ex = new Exception();
+            // Will be advised but doesn't match
+            try
+            {
+                proxied.EchoException(1, ex);
+                Assert.Fail("Should have thrown Exception");
+            }
+            catch (Exception caught)
+            {
+                Assert.AreEqual(ex, caught);
+            }
+            
+            ex = new HttpException();
+            try 
+            {
+                proxied.EchoException(1, ex);
+                Assert.Fail("Should have thrown HttpException");
+            }
+            catch (HttpException caught) 
+            {
+                Assert.AreEqual(ex, caught);
+            }
+            Assert.AreEqual(1, th.GetCalls("HttpException"));
+        }
+
+        private class EchoPointcutAdvisor : StaticMethodMatcherPointcutAdvisor
+        {
+            public EchoPointcutAdvisor(IAdvice advice)
+                : base(advice)
+            {
+            }
+
+            public override bool Matches(MethodInfo method, Type targetType)
+            {
+                return method.Name.StartsWith("Echo");
+            }
+        }
+
+        #endregion
+
+        [Test]
+        public void AddThrowsAdviceWithoutAdvisor()
+        {
+            // Reacts to ServletException and RemoteException
+            ThrowsAdviceInterceptorTests.MyThrowsHandler th = new ThrowsAdviceInterceptorTests.MyThrowsHandler();
+
+            ThrowsAdviceInterceptorTests.Echo target = new ThrowsAdviceInterceptorTests.Echo();
+            target.A = 16;
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.AddAdvice(new NopInterceptor());
+            pf.AddAdvice(th);
+            ThrowsAdviceInterceptorTests.IEcho proxied = (ThrowsAdviceInterceptorTests.IEcho)CreateProxy(pf);
+            Assert.AreEqual(0, th.GetCalls());
+            Assert.AreEqual(target.A, proxied.A);
+            Assert.AreEqual(0, th.GetCalls());
+            Exception ex = new Exception();
+            // Will be advised but doesn't match
+            try 
+            {
+                proxied.EchoException(1, ex);
+                Assert.Fail("Should have thrown Exception");
+            }
+            catch (Exception caught) 
+            {
+                Assert.AreEqual(ex, caught);
+            }
+
+            // Subclass of RemoteException
+            ex = new RemotingTimeoutException();
+            try 
+            {
+                proxied.EchoException(1, ex);
+                Assert.Fail("Should have thrown RemotingTimeoutException");
+            }
+            catch (RemotingTimeoutException caught)
+            {
+                Assert.AreEqual(ex, caught);
+            }
+            Assert.AreEqual(1, th.GetCalls("RemotingException"));
+        }
+
+        #region Arguments
+
+        [Test]
+        public void ArgumentsModification()
+        {
+        }
+
+
+        public interface ITargetClass
+        {
+            string TargetMethod(string arg);
+        }
+
+        public class TargetClass : ITargetClass
+        {
+            public string TargetMethod(string arg)
+            {
+                if (arg == null)
+                {
+                    throw new ArgumentException();
+                }
+                return arg;
+            }
+        }
+
+        public class Interceptor1 : IMethodInterceptor
+        {
+            #region IMethodInterceptor Members
+
+            public object Invoke(IMethodInvocation invocation)
+            {
+                invocation.Proceed();
+
+                return invocation.Arguments[0];
+            }
+
+            #endregion
+        }
+
+        public class Interceptor2 : IMethodInterceptor
+        {
+            #region IMethodInterceptor Members
+
+            public object Invoke(IMethodInvocation invocation)
+            {
+                invocation.Arguments[0] = null;
+
+                return invocation.Proceed();
+            }
+
+            #endregion
+        }
+
+#endregion
+
+
+        #region Helper classes definitions
+
+        public interface INeedsToSeeProxy
+        {
+            int Count { get; }
+
+            void IncrementViaThis();
+
+            void IncrementViaProxy();
+
+            void Increment();
+        }
+
+        public class NeedsToSeeProxy : INeedsToSeeProxy
+        {
+            private int _count;
+            public int Count
+            {
+                get { return _count; }
+            }
+
+            public void IncrementViaThis()
+            {
+                this.Increment();
+            }
+
+            public void IncrementViaProxy()
+            {
+                INeedsToSeeProxy thisViaProxy = (INeedsToSeeProxy)AopContext.CurrentProxy;
+                thisViaProxy.Increment();
+                IAdvised advised = (IAdvised)thisViaProxy;
+                CheckAdvised(advised);
+            }
+
+            protected virtual void CheckAdvised(IAdvised advised)
+            {
+            }
+
+            public void Increment()
+            {
+                ++_count;
+            }
+        }
+
+        public class TargetChecker : NeedsToSeeProxy
+        {
+            protected override void CheckAdvised(IAdvised advised)
+            {
+                // TODO replace this check: no longer possible
+                //Assert.AreEqual(advised.getTarget(), this);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs
new file mode 100644
index 00000000..1a3fbb87
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs
@@ -0,0 +1,223 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Aop.Framework;
+using Spring.Aop.Interceptor;
+using Spring.Aop.Support;
+using Spring.Collections;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// Unit tests for the AopUtils class.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Choy Rim (.NET)</author>
+    /// <version>$Id: AopUtilsTests.cs,v 1.2 2008/03/21 10:49:37 oakinger Exp $</version>
+    [TestFixture]
+    public sealed class AopUtilsTests
+    {
+        [Test]
+        public void GetAllInterfaces()
+        {
+            DerivedTestObject testObject = new DerivedTestObject();
+            IList interfaces = new ArrayList(testObject.GetType().GetInterfaces());
+            Assert.AreEqual(8, interfaces.Count, "Incorrect number of interfaces");
+            Assert.IsTrue(interfaces.Contains(typeof (ITestObject)), "Does not contain ITestObject");
+            Assert.IsTrue(interfaces.Contains(typeof (IOther)), "Does not contain IOther");
+        }
+
+        [Test]
+        public void PointcutCanNeverApply()
+        {
+            IPointcut pointcut = new NeverMatchesPointcut();
+            Assert.IsFalse(AopUtils.CanApply(pointcut, typeof (Object), null));
+        }
+
+        [Test]
+        public void PointcutAlwaysApplies()
+        {
+            Assert.IsTrue(AopUtils.CanApply(new DefaultPointcutAdvisor(new NopInterceptor()), typeof (Object), null));
+            Assert.IsTrue(AopUtils.CanApply(new DefaultPointcutAdvisor(new NopInterceptor()), typeof (TestObject), new Type[] {typeof (ITestObject)}));
+        }
+
+        [Test]
+        public void PointcutAppliesToOneMethodOnObject()
+        {
+            IPointcut pointcut = new OneMethodTestPointcut();
+            Assert.IsTrue(AopUtils.CanApply(pointcut, typeof (object), null),
+                          "Must return true if we're not proxying interfaces.");
+            Assert.IsFalse(AopUtils.CanApply(pointcut, typeof (object),
+                                             new Type[] {typeof (ITestObject)}),
+                           "Must return false if we're proxying interfaces.");
+        }
+
+        [Test]
+        public void PointcutAppliesToOneInterfaceOfSeveral()
+        {
+            IPointcut pointcut = new OneInterfaceTestPointcut();
+
+            // Will return true if we're proxying interfaces including ITestObject 
+            Assert.IsTrue(AopUtils.CanApply(pointcut, typeof (TestObject), new Type[] {typeof (ITestObject), typeof (IComparable)}));
+
+            // Will return true if we're proxying interfaces including ITestObject 
+            Assert.IsFalse(AopUtils.CanApply(pointcut, typeof (TestObject), new Type[] {typeof (IComparable)}));
+        }
+
+        [Test]
+        public void CanApplyWithAdvisorYieldsTrueIfAdvisorIsNotKnownAdvisorType()
+        {
+            IAdvisor advisor = (IAdvisor) new DynamicMock(typeof (IAdvisor)).Object;
+            Assert.IsTrue(AopUtils.CanApply(advisor, typeof (TestObject), null));
+        }
+
+        [Test]
+        public void CanApplyWithAdvisorYieldsTrueIfAdvisorIsNull()
+        {
+            Assert.IsTrue(AopUtils.CanApply((IAdvisor) null, typeof (TestObject), null));
+        }
+
+        [Test]
+        public void GetAllInterfacesWithNull()
+        {
+            Type[] interfaces = AopUtils.GetAllInterfaces(null);
+            Assert.IsNotNull(interfaces,
+                             "Must never return null, even if the argument is null.");
+            Assert.AreEqual(0, interfaces.Length,
+                            "Must return an empty array is the argument is null.");
+        }
+
+        [Test]
+        public void GetAllInterfacesWithObjectThatDoesntImpementAnything()
+        {
+            ImplementsNothing instance = new ImplementsNothing();
+            Type[] interfaces = AopUtils.GetAllInterfaces(instance);
+            Assert.IsNotNull(interfaces,
+                             "Must never return null, even if the argument doesn't implement any interfaces.");
+            Assert.AreEqual(0, interfaces.Length,
+                            "Must return an empty array is the argument doesn't implement any interfaces.");
+        }
+
+        [Test]
+        public void GetAllInterfacesSunnyDay()
+        {
+            ImplementsTwoInterfaces instance = new ImplementsTwoInterfaces();
+            Type[] interfaces = AopUtils.GetAllInterfaces(instance);
+            Assert.IsNotNull(interfaces, "Must never return null.");
+            Assert.AreEqual(2, interfaces.Length,
+                            "Implements two interfaces.");
+            ISet ifaces = new ListSet(interfaces);
+            Assert.IsTrue(
+                ifaces.ContainsAll(
+                    new Type [] {typeof(IDisposable), typeof(ICloneable)}),
+                "Did not find the correct interfaces.");
+        }
+
+        [Test]
+        public void GetAllInterfacesWithObjectThatInheritsInterfaces()
+        {
+            InheritsOneInterface instance = new InheritsOneInterface();
+            Type[] interfaces = AopUtils.GetAllInterfaces(instance);
+            Assert.IsNotNull(interfaces, "Must never return null.");
+            Assert.AreEqual(1, interfaces.Length,
+                            "Inherited one interface from superclass.");
+            Type iface = interfaces[0];
+            Assert.IsNotNull(iface, "Returned interface cannot be null.");
+            Assert.AreEqual(typeof(IDisposable), iface, "Wrong interface returned.");
+        }
+
+        [Test]
+        public void CanApplyWithTrueIntroductionAdvisor()
+        {
+            DynamicMock mockIntroAdvisor = new DynamicMock(typeof (IIntroductionAdvisor));
+            mockIntroAdvisor.ExpectAndReturn("TypeFilter", TrueTypeFilter.True);
+            IAdvisor advisor = (IAdvisor) mockIntroAdvisor.Object;
+            Assert.IsTrue(AopUtils.CanApply(advisor, typeof (TestObject), null));
+            mockIntroAdvisor.Verify();
+        }
+
+        #region Helper Classes
+
+        private sealed class OneMethodTestPointcut : StaticMethodMatcherPointcut
+        {
+            public override bool Matches(MethodInfo m, Type targetClass)
+            {
+                return m.Name.Equals("GetHashCode");
+            }
+        }
+
+        private sealed class OneInterfaceTestPointcut : StaticMethodMatcherPointcut
+        {
+            public override bool Matches(MethodInfo m, Type targetClass)
+            {
+                return m.Name.Equals("ReturnsThis");
+            }
+        }
+
+        private sealed class NeverMatchesPointcut : StaticMethodMatcherPointcut
+        {
+            public override bool Matches(MethodInfo m, Type targetClass)
+            {
+                return false;
+            }
+        }
+
+        private sealed class ImplementsNothing
+        {
+        }
+
+        private abstract class ImplementsOneInterface : IDisposable
+        {
+            public void Dispose()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private sealed class InheritsOneInterface : ImplementsOneInterface
+        {
+        }
+
+        private sealed class ImplementsTwoInterfaces : IDisposable, ICloneable
+        {
+            public void Dispose()
+            {
+                throw new NotImplementedException();
+            }
+
+            public object Clone()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CachedAopProxyFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CachedAopProxyFactoryTests.cs
new file mode 100644
index 00000000..06eb0bfb
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CachedAopProxyFactoryTests.cs
@@ -0,0 +1,181 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Collections;
+
+using NUnit.Framework;
+using Spring.Objects;
+using Spring.Aop.Support;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+	/// <summary>
+    /// Unit tests for the CachedAopProxyFactoryTests class.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: CachedAopProxyFactoryTests.cs,v 1.1 2007/08/04 01:20:11 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class CachedAopProxyFactoryTests : DefaultAopProxyFactoryTests
+	{
+        protected override IAopProxy CreateAopProxy(AdvisedSupport advisedSupport)
+        {
+            IAopProxyFactory apf = new CachedAopProxyFactory();
+            return apf.CreateAopProxy(advisedSupport);
+        }
+
+        [SetUp]
+        public void SetUp()
+        {
+            // Clear Aop proxy type cache
+            Assert.IsNotNull(TypeCacheField);
+            TypeCacheField.SetValue(null, new Hashtable());
+        }
+
+        [Test]
+        public void DoesNotCacheWithDifferentBaseType()
+        {
+            // Decorated-based proxy (BaseType == TargetType)
+            AdvisedSupport advisedSupport = new AdvisedSupport();
+            advisedSupport.ProxyTargetType = true;
+            advisedSupport.Target = new TestObject();
+            CreateAopProxy(advisedSupport);
+
+            // Composition-based proxy (BaseType = BaseCompositionAopProxy)
+            advisedSupport = new AdvisedSupport();
+            advisedSupport.ProxyTargetType = false;
+            advisedSupport.Target = new TestObject();
+            CreateAopProxy(advisedSupport);
+
+            AssertAopProxyTypeCacheCount(2);
+        }
+
+        [Test]
+        public void DoesNotCacheWithDifferentTargetType()
+        {
+            AdvisedSupport advisedSupport = new AdvisedSupport();
+            advisedSupport.Target = new BadCommand();
+            CreateAopProxy(advisedSupport);
+
+            advisedSupport = new AdvisedSupport();
+            advisedSupport.Target = new GoodCommand();
+            CreateAopProxy(advisedSupport);
+
+            AssertAopProxyTypeCacheCount(2);
+        }
+
+        [Test]
+        public void DoesNotCacheWithDifferentInterfaces()
+        {
+            AdvisedSupport advisedSupport = new AdvisedSupport();
+            advisedSupport.Target = new TestObject();
+            CreateAopProxy(advisedSupport);
+
+            advisedSupport = new AdvisedSupport();
+            advisedSupport.Target = new TestObject();
+            advisedSupport.AddInterface(typeof(IPerson));
+            CreateAopProxy(advisedSupport);
+
+            AssertAopProxyTypeCacheCount(2);
+
+            // Same with Introductions
+            advisedSupport = new AdvisedSupport();
+            advisedSupport.Target = new TestObject();
+            TimestampIntroductionInterceptor ti = new TimestampIntroductionInterceptor();
+            ti.TimeStamp = new DateTime(666L);
+            IIntroductionAdvisor introduction = new DefaultIntroductionAdvisor(ti, typeof(ITimeStamped));
+            advisedSupport.AddIntroduction(introduction);
+            CreateAopProxy(advisedSupport);
+
+            AssertAopProxyTypeCacheCount(3);
+        }
+
+        [Test]
+        public void DoesCacheWithTwoDecoratorBasedProxy()
+        {
+            AdvisedSupport advisedSupport = new AdvisedSupport();
+            advisedSupport.ProxyTargetType = true;
+            advisedSupport.Target = new TestObject();
+            CreateAopProxy(advisedSupport);
+
+            advisedSupport = new AdvisedSupport();
+            advisedSupport.ProxyTargetType = true;
+            advisedSupport.Target = new TestObject();
+            CreateAopProxy(advisedSupport);
+
+            AssertAopProxyTypeCacheCount(1);
+        }
+
+        [Test]
+        public void DoesCacheWithTwoCompositionBasedProxy()
+        {
+            AdvisedSupport advisedSupport = new AdvisedSupport();
+            advisedSupport.Target = new TestObject();
+            CreateAopProxy(advisedSupport);
+
+            advisedSupport = new AdvisedSupport();
+            advisedSupport.Target = new TestObject();
+            CreateAopProxy(advisedSupport);
+
+            AssertAopProxyTypeCacheCount(1);
+        }
+
+
+        private static readonly FieldInfo TypeCacheField =
+            typeof(CachedAopProxyFactory).GetField("typeCache", BindingFlags.Static | BindingFlags.NonPublic);
+
+        private void AssertAopProxyTypeCacheCount(int count)
+        {
+            Assert.IsNotNull(TypeCacheField);
+            Hashtable cache = TypeCacheField.GetValue(null) as Hashtable;
+            Assert.IsNotNull(cache);
+            Assert.AreEqual(count, cache.Count);
+        }
+
+        #region Helper classes definitions
+
+        public interface ICommand
+        {
+            void Execute();
+        }
+
+        public sealed class BadCommand : ICommand
+        {
+            public void Execute()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public sealed class GoodCommand : ICommand
+        {
+            public void Execute()
+            {
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CompositionAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CompositionAopProxyTests.cs
new file mode 100644
index 00000000..10ea964e
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CompositionAopProxyTests.cs
@@ -0,0 +1,114 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// Additional and overridden tests for the composition-based proxy.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Bruno Baia (.NET)</author>
+    /// <version>$Id: CompositionAopProxyTests.cs,v 1.4 2007/08/02 04:15:37 markpollack Exp $</version>
+    [TestFixture]
+    public class CompositionAopProxyTests : AbstractAopProxyTests
+    {
+        protected override object CreateProxy(AdvisedSupport advisedSupport)
+        {
+            Assert.IsFalse(advisedSupport.ProxyTargetType, "Not forcible decorator-based proxy");
+            object proxy = CreateAopProxy(advisedSupport).GetProxy();
+            Assert.IsTrue(AopUtils.IsCompositionAopProxy(proxy), "Should be a composition-based proxy: " + proxy.GetType());
+            return proxy;
+        }
+
+        protected override Type CreateAopProxyType(AdvisedSupport advisedSupport)
+        {
+            return new CompositionAopProxyTypeBuilder(advisedSupport).BuildProxyType();
+        }
+
+        [Test]
+        public void ProxyIsJustInterface()
+        {
+            TestObject target = new TestObject();
+            target.Age = 32;
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = target;
+            advised.Interfaces = new Type[] { typeof(ITestObject) };
+
+            object proxy = CreateProxy(advised);
+
+            Assert.IsTrue(proxy is ITestObject);
+            Assert.IsFalse(proxy is TestObject);
+        }
+
+        #region ReturnsThisWhenProxyIsIncompatible
+
+        [Test]
+        public void ReturnsThisWhenProxyIsIncompatible() 
+        {
+		    FooBar obj = new FooBar();
+
+		    AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = obj;
+            advised.Interfaces = new Type[] { typeof(IFoo) };
+
+            IFoo proxy = (IFoo)CreateProxy(advised);
+
+            Assert.AreSame(obj, proxy.GetBarThis(),
+                "Target should be returned when return types are incompatible");
+		    Assert.AreSame(proxy, proxy.GetFooThis(),
+                "Proxy should be returned when return types are compatible");
+	    }
+
+    	public interface IFoo 
+        {
+		    IBar GetBarThis();
+		    IFoo GetFooThis();
+        }
+
+	    public interface IBar 
+        {
+	    }
+
+	    public class FooBar : IFoo, IBar 
+        {
+		    public IBar GetBarThis() 
+            {
+			    return this;
+		    }
+
+		    public IFoo GetFooThis() 
+            {
+			    return this;
+		    }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs
new file mode 100644
index 00000000..7c76c3b3
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs
@@ -0,0 +1,351 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Aop.Interceptor;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// Additional and overridden tests for the decorator-based proxy.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Bruno Baia (.NET)</author>
+    /// <version>$Id: DecoratorAopProxyTests.cs,v 1.6 2008/05/21 08:04:52 bbaia Exp $</version>
+    [TestFixture]
+    public class DecoratorAopProxyTests : AbstractAopProxyTests
+    {
+        protected override object CreateProxy(AdvisedSupport advisedSupport)
+        {
+            advisedSupport.ProxyTargetType = true;
+            object proxy = CreateAopProxy(advisedSupport).GetProxy();
+            Assert.IsTrue(AopUtils.IsDecoratorAopProxy(proxy));
+            return proxy;
+        }
+
+        protected override Type CreateAopProxyType(AdvisedSupport advisedSupport)
+        {
+            return new DecoratorAopProxyTypeBuilder(advisedSupport).BuildProxyType(); 
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException))]
+        public void CannotProxySealedClass()
+        {
+            SealedTestObject target = new SealedTestObject();
+            mockTargetSource.SetTarget(target);
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { });
+            advised.TargetSource = mockTargetSource;
+
+            IAopProxy aop = CreateAopProxy(advised);
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException))]
+        public void CannotProxyNonPublicClass()
+        {
+            NonPublicTestObject target = new NonPublicTestObject();
+            mockTargetSource.SetTarget(target);
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { });
+            advised.TargetSource = mockTargetSource;
+
+            IAopProxy aop = CreateAopProxy(advised);
+        }
+
+        [Test]
+        public void ProxyCanBeClassAndInterface()
+        {
+            TestObject target = new TestObject();
+            target.Age = 32;
+            mockTargetSource.SetTarget(target);
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.TargetSource = mockTargetSource;
+            IAopProxy aop = CreateAopProxy(advised);
+
+            object proxy = aop.GetProxy();
+            Assert.IsTrue(AopUtils.IsDecoratorAopProxy(proxy), "Should be a decorator-based proxy");
+            Assert.IsTrue(proxy is ITestObject);
+            Assert.IsTrue(proxy is TestObject);
+
+            ITestObject itb = (ITestObject)proxy;
+            Assert.AreEqual(32, itb.Age, "Incorrect age");
+            TestObject tb = (TestObject)proxy;
+            Assert.AreEqual(32, tb.Age, "Incorrect age");
+        }
+
+        [Test]
+        public void InterceptVirtualMethod()
+        {
+            DoesNotImplementInterfaceTestObject target = new DoesNotImplementInterfaceTestObject();
+            target.Name = "Bruno";
+            mockTargetSource.SetTarget(target);
+
+            NopInterceptor ni = new NopInterceptor();
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.TargetSource = mockTargetSource;
+            advised.AddAdvice(ni);
+
+            DoesNotImplementInterfaceTestObject proxy = CreateProxy(advised) as DoesNotImplementInterfaceTestObject;
+            Assert.IsNotNull(proxy);
+
+            Assert.AreEqual(target.Name, proxy.Name, "Incorrect name");
+            proxy.Name = "Bruno Baia";
+            Assert.AreEqual("Bruno Baia", proxy.Name, "Incorrect name");
+
+            Assert.AreEqual(3, ni.Count);
+        }
+
+        [Test]
+        public void CannotInterceptFinalMethodThatDoesNotBelongToAnInterface()
+        {
+            DoesNotImplementInterfaceTestObject target = new DoesNotImplementInterfaceTestObject();
+            target.Location = "Paris";
+            mockTargetSource.SetTarget(target);
+
+            NopInterceptor ni = new NopInterceptor();
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.TargetSource = mockTargetSource;
+            advised.AddAdvice(ni);
+
+            DoesNotImplementInterfaceTestObject proxy = CreateProxy(advised) as DoesNotImplementInterfaceTestObject;
+            Assert.IsNotNull(proxy);
+
+            // Location is final and doesn't belong to an interface so can't proxy.
+            // method call goes directly to the proxy 
+            // and will not have access to the valid _location field
+            Assert.IsNull(proxy.Location);
+
+            Assert.AreEqual(0, ni.Count);
+        }
+
+        [Test]
+        public void InterceptFinalMethodThatBelongsToAnInterface()
+        {
+            TestObject target = new TestObject();
+            target.Name = "Bruno";
+            mockTargetSource.SetTarget(target);
+
+            NopInterceptor ni = new NopInterceptor();
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.TargetSource = mockTargetSource;
+            advised.AddAdvice(ni);
+
+            // Cast to the interface that method belongs to
+            ITestObject proxy = CreateProxy(advised) as ITestObject;
+            Assert.IsNotNull(proxy);
+
+            Assert.AreEqual(target.Name, proxy.Name, "Incorrect name");
+            proxy.Name = "Bruno Baia";
+            Assert.AreEqual("Bruno Baia", proxy.Name, "Incorrect name");
+
+            Assert.AreEqual(3, ni.Count);
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException), "Cannot create decorator-based IAopProxy for a non visible class [Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests+InternalRefOutTestObject]")]
+        public override void ProxyMethodWithRefOutParametersWithStandardReflection()
+        {
+ 	        base.ProxyMethodWithRefOutParametersWithStandardReflection();
+        }
+
+#if NET_2_0
+        [Test]
+        [ExpectedException(typeof(AopConfigException), "Cannot create decorator-based IAopProxy for a non visible class [Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests+InternalRefOutGenericTestObject]")]
+        public override void ProxyGenericMethodWithRefOutParametersWithStandardReflection()
+        {
+            base.ProxyGenericMethodWithRefOutParametersWithStandardReflection();
+        }
+#endif
+
+        #region Attributes
+
+        [Test]
+        public void ProxyTargetVirtualMethodAttributes()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            MethodInfo method = proxy.GetType().GetMethod("MarkerVirtualMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(1, attrs.Length, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the target method.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetVirtualMethodAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            advised.ProxyTargetAttributes = false;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            MethodInfo method = proxy.GetType().GetMethod("MarkerVirtualMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the target method.");
+        }
+
+        [Test]
+        public void ProxyTargetVirtualMethodParameterAttributes()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            MethodInfo method = proxy.GetType().GetMethod("MarkerVirtualMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetParameters()[1].GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 1 attribute applied to the method's parameter.");
+            Assert.AreEqual(1, attrs.Length, "Should have had 1 attribute applied to the method's parameter.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the method's parameter.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetVirtualMethodParameterAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            advised.ProxyTargetAttributes = false;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            MethodInfo method = proxy.GetType().GetMethod("MarkerVirtualMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetParameters()[1].GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's parameter.");
+        }
+
+#if NET_2_0
+        [Test]
+        public void ProxyTargetVirtualMethodReturnValueAttributes()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            MethodInfo method = proxy.GetType().GetMethod("MarkerVirtualMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.ReturnTypeCustomAttributes.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 1 attribute applied to the method's return value.");
+            Assert.AreEqual(1, attrs.Length, "Should have had 1 attribute applied to the method's return value.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the method's return value.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetVirtualMethodReturnValueAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            MarkerClass target = new MarkerClass();
+
+            AdvisedSupport advised = new AdvisedSupport(new Type[] { typeof(IMarkerInterface) });
+            advised.Target = target;
+            advised.ProxyTargetAttributes = false;
+            IAopProxy aopProxy = CreateAopProxy(advised);
+
+            object proxy = aopProxy.GetProxy();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to GetProxy() was null.");
+
+            MethodInfo method = proxy.GetType().GetMethod("MarkerVirtualMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.ReturnTypeCustomAttributes.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's return value.");
+        }
+#endif
+
+        #endregion
+
+        #region Helper classes definitions
+
+        internal class NonPublicTestObject
+        {
+        }
+
+        public sealed class SealedTestObject
+        {
+        }
+
+        public class DoesNotImplementInterfaceTestObject
+        {
+            // virtual property
+            private string _name;
+            public virtual string Name
+            {
+                get { return _name; }
+                set { _name = value; }
+            }
+
+            // final method
+            private string _location;
+            public string Location
+            {
+                get { return _location; }
+                set { _location = value; }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs
new file mode 100644
index 00000000..143f572b
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs
@@ -0,0 +1,108 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+	/// <summary>
+    /// Unit tests for the DefaultAopProxyFactory class.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: DefaultAopProxyFactoryTests.cs,v 1.1 2007/08/04 01:20:11 bbaia Exp $</version>
+	[TestFixture]
+    public class DefaultAopProxyFactoryTests
+	{
+        protected virtual IAopProxy CreateAopProxy(AdvisedSupport advisedSupport)
+        {
+            IAopProxyFactory apf = new DefaultAopProxyFactory();
+            return apf.CreateAopProxy(advisedSupport);
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException), "Cannot create IAopProxy with null ProxyConfig")]
+        public void NullConfig()
+        {
+            CreateAopProxy(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException), "Cannot create IAopProxy with no advisors and no target source")]
+        public void NoInterceptorsAndNoTarget()
+        {
+            AdvisedSupport advisedSupport = new AdvisedSupport(new Type[] { typeof(ITestObject) });
+            CreateAopProxy(advisedSupport);
+        }
+
+        [Test]
+        public void TargetDoesNotImplementAnyInterfaces()
+        {
+            AdvisedSupport advisedSupport = new AdvisedSupport();
+            advisedSupport.ProxyTargetType = false;
+            advisedSupport.Target = new DoesNotImplementAnyInterfacesTestObject();
+            
+            IAopProxy aopProxy = CreateAopProxy(advisedSupport);
+            Assert.IsNotNull(aopProxy);
+            Assert.IsTrue(AopUtils.IsDecoratorAopProxy(aopProxy));
+        }
+
+        [Test]
+        public void TargetImplementsAnInterface()
+        {
+            AdvisedSupport advisedSupport = new AdvisedSupport();
+            advisedSupport.Target = new TestObject();
+
+            IAopProxy aopProxy = CreateAopProxy(advisedSupport);
+            Assert.IsNotNull(aopProxy);
+
+            Assert.IsTrue(AopUtils.IsCompositionAopProxy(aopProxy));
+        }
+
+        [Test]
+        public void TargetImplementsAnInterfaceWithProxyTargetTypeSetToTrue()
+        {
+            AdvisedSupport advisedSupport = new AdvisedSupport();
+            advisedSupport.ProxyTargetType = true;
+            advisedSupport.Target = new TestObject();
+
+            IAopProxy aopProxy = CreateAopProxy(advisedSupport);
+            Assert.IsNotNull(aopProxy);
+            Assert.IsTrue(AopUtils.IsDecoratorAopProxy(aopProxy));
+        }
+
+        #region Helper classes definitions
+
+        public class DoesNotImplementAnyInterfacesTestObject
+        {
+            public virtual void SomeMethod()
+            {
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs
new file mode 100644
index 00000000..15bcba58
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs
@@ -0,0 +1,343 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+using Spring.Objects;
+using Spring.Aop.Interceptor;
+using Spring.Proxy;
+using System.Reflection;
+using Spring.Expressions;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// Additional and overridden tests for the inheritance-based proxy.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: InheritanceAopProxyTests.cs,v 1.2 2008/03/03 09:29:17 bbaia Exp $</version>
+    [TestFixture]
+    public class InheritanceAopProxyTests
+    {
+        protected object CreateProxy(AdvisedSupport advisedSupport)
+        {
+            Type proxyType = new InheritanceAopProxyTypeBuilder(advisedSupport).BuildProxyType();
+            ConstructorInfo proxyCtorInfo = proxyType.GetConstructor(new Type[] { typeof(IAdvised) });
+
+            ExpressionEvaluator.GetValue(advisedSupport, "Activate()");
+            return ((IAopProxy)proxyCtorInfo.Invoke(new object[] { advisedSupport })).GetProxy();
+        }
+
+        [Test]
+        public void DirectCall()
+        {
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = new InheritanceTestObject();
+
+            object proxy = CreateProxy(advised);
+            //DynamicProxyManager.SaveAssembly();
+
+            Assert.IsTrue(proxy is InheritanceTestObject);
+            InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
+            proxiedClass.Name = "DirectCall";
+            Assert.AreEqual("DirectCall", proxiedClass.Name);
+
+            Assert.IsTrue(proxy is IIncrementable);
+            IIncrementable proxiedIntf = proxy as IIncrementable;
+            proxiedIntf.Increment();
+            Assert.AreEqual(1, proxiedIntf.Value);            
+        }
+
+        [Test]
+        public void ProxyTargetTypeOnly()
+        {
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = new InheritanceTestObject("ProxyTargetTypeOnly");
+
+            object proxy = CreateProxy(advised);
+            //DynamicProxyManager.SaveAssembly();
+
+            Assert.IsTrue(proxy is InheritanceTestObject);
+            InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
+            Assert.AreNotEqual("ProxyTargetTypeOnly", proxiedClass.Name);
+        }
+
+        [Test]
+        public void CallBaseConstructor()
+        {
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = new InheritanceTestObject();
+
+            object proxy = CreateProxy(advised);
+            //DynamicProxyManager.SaveAssembly();
+
+            Assert.IsTrue(proxy is InheritanceTestObject);
+            InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
+            Assert.AreEqual("InheritanceTestObject", proxiedClass.Name);
+        }
+
+        [Test]
+        public void InterceptVirtualMethod()
+        {
+            NopInterceptor ni = new NopInterceptor();
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = new InheritanceTestObject();
+            advised.AddAdvice(ni);
+
+            object proxy = CreateProxy(advised);
+            //DynamicProxyManager.SaveAssembly();
+
+            Assert.IsTrue(proxy is InheritanceTestObject);
+            InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
+            proxiedClass.Name = "InterceptVirtualMethod";
+            Assert.AreEqual("InterceptVirtualMethod", proxiedClass.Name);
+            Assert.AreEqual(2, ni.Count);
+        }
+
+#if NET_2_0
+        [Test]
+        public void InterceptVirtualGenericMethod()
+        {
+            NopInterceptor ni = new NopInterceptor();
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = new AnotherTestObject();
+            advised.AddAdvice(ni);
+
+            object proxy = CreateProxy(advised);
+            //DynamicProxyManager.SaveAssembly();
+
+            Assert.IsTrue(proxy is AnotherTestObject);
+            AnotherTestObject proxiedClass = proxy as AnotherTestObject;
+            Assert.AreEqual(typeof(int), proxiedClass.GenericMethod<int>());
+            Assert.AreEqual(1, ni.Count);
+        }
+
+        public class AnotherTestObject
+        {
+            public virtual Type GenericMethod<T>()
+            {
+                return typeof(T);
+            }
+
+            // Test ambiguous match
+            public virtual Type GenericMethod()
+            {
+                return typeof(string);
+            }
+        }
+#endif
+
+        [Test]
+        public void DoesNotInterceptFinalMethod()
+        {
+            NopInterceptor ni = new NopInterceptor();
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = new InheritanceTestObject();
+            advised.AddAdvice(ni);
+
+            object proxy = CreateProxy(advised);
+            //DynamicProxyManager.SaveAssembly();
+
+            Assert.IsTrue(proxy is InheritanceTestObject);
+            InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
+            proxiedClass.Name = "DoesNotInterceptFinalMethod";
+            Assert.AreEqual("DoesNotInterceptFinalMethod", proxiedClass.Name);
+            Assert.AreEqual(2, ni.Count);
+
+            proxiedClass.Reset();
+            Assert.AreEqual(2, ni.Count);
+            Assert.AreEqual("InheritanceTestObject", proxiedClass.Name);
+            Assert.AreEqual(3, ni.Count);
+        }
+
+        [Test]
+        public void InterceptVirtualMethodThatBelongsToAnInterface()
+        {
+            NopInterceptor ni = new NopInterceptor();
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = new InheritanceTestObject();
+            advised.AddAdvice(ni);
+
+            object proxy = CreateProxy(advised);
+            //DynamicProxyManager.SaveAssembly();
+
+            Assert.IsTrue(proxy is InheritanceTestObject);
+            InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
+            proxiedClass.Increment();
+            Assert.AreEqual(1, ni.Count);
+
+            Assert.IsTrue(proxy is IIncrementable);
+            IIncrementable proxiedInterface = proxy as IIncrementable;
+            proxiedInterface.Increment();
+            Assert.AreEqual(2, ni.Count);
+        }
+
+        [Test]
+        public void InterceptNonVirtualMethodThatBelongsToAnInterface()
+        {
+            NopInterceptor ni = new NopInterceptor();
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = new InheritanceTestObject();
+            advised.AddAdvice(ni);
+
+            object proxy = CreateProxy(advised);
+            //DynamicProxyManager.SaveAssembly();
+
+            Assert.IsTrue(proxy is InheritanceTestObject);
+            InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
+            Assert.AreEqual(0, proxiedClass.Value);
+            Assert.AreEqual(0, ni.Count);
+
+            Assert.IsTrue(proxy is IIncrementable);
+            IIncrementable proxiedInterface = proxy as IIncrementable;
+            proxiedInterface.Increment();
+            Assert.AreEqual(1, proxiedInterface.Value);
+            Assert.AreEqual(2, ni.Count);
+        }
+
+        [Test]
+        public void InterceptThisCalls()
+        {
+            NopInterceptor ni = new NopInterceptor();
+
+            AdvisedSupport advised = new AdvisedSupport();
+            advised.Target = new InheritanceTestObject();
+            advised.AddAdvice(ni);
+
+            object proxy = CreateProxy(advised);
+            //DynamicProxyManager.SaveAssembly();
+
+            Assert.IsTrue(proxy is InheritanceTestObject);
+            InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
+            proxiedClass.IncrementTwice();
+            Assert.AreEqual(2, ni.Count);
+            Assert.AreEqual(2, proxiedClass.Value);
+        }
+
+        //[Test]
+        //public void InterceptProtectedMethod()
+        //{
+        //    NopInterceptor ni = new NopInterceptor();
+
+        //    AdvisedSupport advised = new AdvisedSupport();
+        //    advised.Target = new InheritanceTestObject();
+        //    advised.AddAdvice(ni);
+
+        //    object proxy = CreateProxy(advised);
+        //    //DynamicProxyManager.SaveAssembly();
+
+        //    Assert.IsTrue(proxy is InheritanceTestObject);
+        //    InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
+        //    proxiedClass.Todo();
+        //    Assert.AreEqual(1, ni.Count);
+        //}
+    }
+
+    #region Helper Classes
+
+    public interface IIncrementable
+    {
+        int Value {get; set;}
+        void Increment();
+    }
+
+    public class InheritanceTestObject : IIncrementable
+    {
+        // virtual method
+        private string _name;
+        public virtual string Name
+        {
+            get { return _name; }
+            set { _name = value; }
+        }
+
+        // many constructors
+        public InheritanceTestObject() : this("InheritanceTestObject", 0)
+        {
+        }
+
+        public InheritanceTestObject(string name) : this(name, 0)
+        {
+        }
+
+        public InheritanceTestObject(string name, int value)
+        {
+            this._name = name;
+            this._value = value;
+        }
+
+        #region IIncrementable Members
+
+        // non virtual method that belongs to an interface
+        private int _value;
+        public int Value
+        {
+            get { return _value; }
+            set { _value = value; }
+        }
+
+        // virtual method that belongs to an interface too
+        public virtual void Increment()
+        {
+            // this call
+            this._value++;
+        }
+
+        #endregion
+
+        // final method
+        public void Reset()
+        {
+            this._name = "InheritanceTestObject";
+            this._value = 0;
+        }
+
+        // this call
+        public void IncrementTwice()
+        {
+            this.Increment();
+            this.Increment();
+        }
+
+        // protected method call
+        public void Todo()
+        {
+            ProtectedTodo();
+        }
+
+        protected virtual void ProtectedTodo()
+        {
+
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/MockTargetSource.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/MockTargetSource.cs
new file mode 100644
index 00000000..a304066d
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/MockTargetSource.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using Spring.Aop.Target;
+
+#endregion
+
+namespace Spring.Aop.Framework.DynamicProxy
+{
+    /// <summary>
+    /// Useful <see cref="Spring.Aop.ITargetSource"/> implementation 
+    /// that checks calls to GetTarget and ReleaseTarget.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Bruno Baia (.NET)</author>
+    /// <version>$Id: MockTargetSource.cs,v 1.1 2006/08/10 18:45:58 bbaia Exp $</version>
+    public class MockTargetSource : ITargetSource
+    {
+        private object _target;
+
+        public int gets;
+        public int releases;
+
+        public void Reset()
+        {
+            this._target = null;
+            gets = releases = 0;
+        }
+
+        public void SetTarget(Object target)
+        {
+            this._target = target;
+        }
+
+        public void Verify()
+        {
+            if (gets != releases)
+                throw new Exception("Expectation failed: " + gets + " gets and " + releases + " releases");
+        }
+
+        #region ITargetSource Members
+
+        public Type TargetType
+        {
+            get { return _target.GetType(); }
+        }
+
+        public bool IsStatic
+        {
+            get { return false; }
+        }
+
+        public object GetTarget()
+        {
+            ++gets;
+            return _target;
+        }
+
+        public void ReleaseTarget(object target)
+        {
+            if (target != this._target)
+                throw new Exception("Released wrong target");
+            ++releases;
+        }
+
+        #endregion
+    }
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/HashtableCachingAdvisorChainFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/HashtableCachingAdvisorChainFactoryTests.cs
new file mode 100644
index 00000000..29479b95
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/HashtableCachingAdvisorChainFactoryTests.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Unit tests for the HashtableCachingAdvisorChainFactory class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: HashtableCachingAdvisorChainFactoryTests.cs,v 1.2 2006/04/09 07:19:05 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class HashtableCachingAdvisorChainFactoryTests
+    {
+        #region SetUp
+        
+        /// <summary>
+        /// The setup logic executed before the execution of this test fixture.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void FixtureSetUp()
+        {
+        }
+
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public void SetUp()
+        {
+        }
+        
+        #endregion
+
+        #region TearDown
+        
+        /// <summary>
+        /// The tear down logic executed after the execution of each individual test.
+        /// </summary>
+        [TearDown]
+        public void TearDown()
+        {
+        }
+
+        /// <summary>
+        /// The tear down logic executed after the entire test fixture has executed.
+        /// </summary>
+        [TestFixtureTearDown]
+        public void FixtureTearDown()
+        {
+        }
+        
+        #endregion
+
+        [Test]
+        public void Instantiation() {
+
+        }
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/IIsModified.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/IIsModified.cs
new file mode 100644
index 00000000..2a2f4dde
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/IIsModified.cs
@@ -0,0 +1,27 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+namespace Spring.Aop.Framework
+{
+	public interface IIsModified
+	{
+        bool IsModified { get; set; }
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ITimeStamped.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ITimeStamped.cs
new file mode 100644
index 00000000..09be9cfd
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ITimeStamped.cs
@@ -0,0 +1,39 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+#region Imports
+using System;
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// This interface can be implemented by cacheable objects
+	/// or cache entries, to enable the freshness of objects
+	/// to be checked.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Choy Rim (.NET)</author>
+	/// <version>$Id: ITimeStamped.cs,v 1.1 2004/08/01 10:20:20 choyrim Exp $</version>
+	public interface ITimeStamped
+	{
+		/// <summary>
+		/// Return the timestamp for this object.
+		/// </summary>
+		DateTime TimeStamp { get; }
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/IsModifiedMixin.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/IsModifiedMixin.cs
new file mode 100644
index 00000000..d3a31fbd
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/IsModifiedMixin.cs
@@ -0,0 +1,43 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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 AopAlliance.Aop;
+using Spring.Aop.Support;
+
+namespace Spring.Aop.Framework
+{
+    public class IsModifiedMixin : IIsModified, IAdvice
+    {
+        private bool isModified = true;
+
+        public virtual bool IsModified
+        {
+            get { return isModified; }
+            set { isModified = value; }
+        }
+    }
+
+    public class IsModifiedAdvisor : DefaultIntroductionAdvisor
+    {
+        public IsModifiedAdvisor()
+            : base(new IsModifiedMixin())
+        {}
+    }
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/MethodCounter.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/MethodCounter.cs
new file mode 100644
index 00000000..04fbadba
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/MethodCounter.cs
@@ -0,0 +1,67 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+#region Imports
+using System;
+using System.Collections;
+using System.Reflection;
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Useful base class for counting advices etc.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Choy Rim (.NET)</author>
+	/// <version>$Id: MethodCounter.cs,v 1.2 2007/03/16 04:01:47 aseovic Exp $</version>
+	[Serializable]
+    public class MethodCounter
+	{
+		/// <summary>Method name --> count, does not understand overloading </summary>
+		private Hashtable map = new Hashtable();
+		private int allCount;
+		
+		protected internal virtual void Count(MethodBase m)
+		{
+			Count(m.Name);
+		}
+		
+		protected internal virtual void Count(string methodName)
+		{
+			int count = GetCalls(methodName);
+			++count;
+			map[methodName] = count;
+			++allCount;
+		}
+		
+		public virtual int GetCalls(string methodName)
+		{
+			int count = 0;
+			if ( map.ContainsKey(methodName) ) 
+			{
+				count = (int) map[methodName];
+			}
+			return count;
+		}
+		
+		public virtual int GetCalls()
+		{
+			return allCount;
+		}
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/PrototypeTargetTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/PrototypeTargetTests.cs
new file mode 100644
index 00000000..21fa9e44
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/PrototypeTargetTests.cs
@@ -0,0 +1,101 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+using System;
+
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Xml;
+using AopAlliance.Intercept;
+
+using NUnit.Framework;
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Simon White (.NET)</author>
+	[TestFixture]
+	public class PrototypeTargetTests
+	{
+		[Test]
+		public void PrototypeProxyWithPrototypeTarget()
+		{
+			TestObjectImpl.constructionCount = 0;
+			IObjectFactory iof = new XmlObjectFactory(new ReadOnlyXmlTestResource("prototypeTarget.xml", GetType()));
+			for (int i = 0 ; i < 10 ; i++)
+			{
+				int crap = TestObjectImpl.constructionCount;
+				TestObject to = (TestObject) iof.GetObject("testObjectPrototype");
+				crap = TestObjectImpl.constructionCount;
+				to.DoSomething();
+			}
+			TestInterceptor interceptor = (TestInterceptor) iof.GetObject("testInterceptor");
+			Assert.AreEqual(10, TestObjectImpl.constructionCount);
+			Assert.AreEqual(10, interceptor.invocationCount);
+		}
+
+		[Test]
+		public void SingletonProxyWithPrototypeTarget() 
+		{
+			TestObjectImpl.constructionCount = 0;
+			IObjectFactory iof = new XmlObjectFactory(new ReadOnlyXmlTestResource("prototypeTarget.xml", GetType()));
+			for (int i = 0; i < 10; i++) 
+			{
+				TestObject to = (TestObject) iof.GetObject("testObjectSingleton");
+				to.DoSomething();
+			}
+			TestInterceptor interceptor = (TestInterceptor) iof.GetObject("testInterceptor");
+			Assert.AreEqual(1, TestObjectImpl.constructionCount);
+			Assert.AreEqual(10, interceptor.invocationCount);
+		}
+
+		public interface TestObject
+		{
+			void DoSomething();
+		}
+
+		public class TestObjectImpl : TestObject
+		{
+			public static int constructionCount = 0;
+
+			public TestObjectImpl() 
+			{
+				constructionCount++;
+			}
+
+			public void DoSomething() 
+			{
+			}
+		}
+
+		public class TestInterceptor : IMethodInterceptor 
+		{
+			public int invocationCount = 0;
+
+			public object Invoke(IMethodInvocation methodInvocation)
+			{
+				invocationCount++;
+				return methodInvocation.Proceed();
+			}
+		}
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs
new file mode 100644
index 00000000..d982d3bf
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs
@@ -0,0 +1,44 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Unit tests for the ProxyConfig class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: ProxyConfigTests.cs,v 1.2 2006/04/09 07:19:05 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class ProxyConfigTests
+	{
+		[Test]
+		public void Instantiation()
+		{
+
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs
new file mode 100644
index 00000000..1d45e7dd
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs
@@ -0,0 +1,1095 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Security.Policy;
+using System.Collections;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Web;
+
+using AopAlliance.Aop;
+using AopAlliance.Intercept;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Aop.Advice;
+using Spring.Aop.Framework.Adapter;
+using Spring.Aop.Framework.DynamicProxy;
+using Spring.Aop.Interceptor;
+using Spring.Aop.Support;
+using Spring.Aop.Target;
+using Spring.Context;
+using Spring.Core.IO;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+using Spring.Proxy;
+using Spring.Threading;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+    /// <summary>
+    /// Integration test cases for the ProxyFactoryObject, using an XML object factory.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Federico Spinazzi (.NET)</author>
+    /// <author>Choy Rim (.NET)</author>
+    /// <author>Aleksandar Seovic (.NET)</author>
+    /// <version>$Id: ProxyFactoryObjectTests.cs,v 1.35 2007/12/07 17:59:31 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class ProxyFactoryObjectTests
+    {
+        private IObjectFactory factory;
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.factory = new XmlObjectFactory(new ReadOnlyXmlTestResource("proxyFactoryTests.xml", GetType()));
+        }
+
+
+        [Test]
+        public void TargetThrowsInvalidCastException()
+        {
+            Exception expectedException = new InvalidCastException();
+            ITestObject test1 = (ITestObject)factory.GetObject("test1");
+            try
+            {
+                test1.Exceptional(expectedException);
+                Assert.Fail("Should have thrown exception raised by target");
+            }
+            catch (Exception ex)
+            {
+                Assert.AreEqual(expectedException, ex, "exception matches");
+                Assert.AreEqual(1, test1.ExceptionMethodCallCount);
+            }
+        }
+
+        [Test]
+        public void IsCompositionProxy()
+        {
+            ITestObject test1 = (ITestObject)factory.GetObject("test1");
+            Assert.IsTrue(AopUtils.IsCompositionAopProxy(test1), "test1 is a composition proxy");
+        }
+
+        [Test]
+        public void GetObjectTypeWithDirectTarget()
+        {
+            IObjectFactory bf = new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("proxyFactoryTargetSourceTests.xml",
+                                            GetType()));
+
+            // We have a counting before advice here
+            CountingBeforeAdvice cba = (CountingBeforeAdvice)bf.GetObject("countingBeforeAdvice");
+            Assert.AreEqual(0, cba.GetCalls());
+
+            ITestObject tb = (ITestObject)bf.GetObject("directTarget");
+            Assert.IsTrue(tb.Name.Equals("Adam"));
+            Assert.AreEqual(1, cba.GetCalls());
+
+            ProxyFactoryObject pfb = (ProxyFactoryObject)bf.GetObject("&directTarget");
+            Assert.IsTrue(typeof(ITestObject).IsAssignableFrom(pfb.ObjectType), "Has correct object type");
+        }
+
+        [Test]
+        public void GetObjectTypeWithTargetViaTargetSource()
+        {
+            IObjectFactory bf = new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("proxyFactoryTargetSourceTests.xml",
+                                            GetType()));
+            ITestObject tb = (ITestObject)bf.GetObject("viaTargetSource");
+            Assert.IsTrue(tb.Name.Equals("Adam"));
+            ProxyFactoryObject pfb = (ProxyFactoryObject)bf.GetObject("&viaTargetSource");
+            Assert.IsTrue(typeof(ITestObject).IsAssignableFrom(pfb.ObjectType), "Has correct object type");
+        }
+
+        [Test]
+        public void GetObjectTypeWithNoTargetOrTargetSource()
+        {
+            IObjectFactory bf =
+				new XmlObjectFactory(new ReadOnlyXmlTestResource("proxyFactoryTargetSourceTests.xml", GetType()));
+            bf.GetObject("noTarget");
+            IFactoryObject pfb = (ProxyFactoryObject)bf.GetObject("&noTarget");
+            Assert.IsTrue(typeof(ITestObject).IsAssignableFrom(pfb.ObjectType), "Has correct object type");
+        }
+
+        /// <summary>
+        /// The instances are equal, but do not have object identity.
+        /// Interceptors and interfaces and the target are the same.
+        /// </summary>
+        [Test]
+        public void SingletonInstancesAreEqual()
+        {
+            ITestObject test1 = (ITestObject)factory.GetObject("test1");
+            ITestObject test1_1 = (ITestObject)factory.GetObject("test1");
+            Assert.AreEqual(test1, test1_1, "Singleton instances ==");
+            test1.Age = 25;
+            Assert.AreEqual(test1.Age, test1_1.Age);
+            test1.Age = 250;
+            Assert.AreEqual(test1.Age, test1_1.Age);
+            IAdvised pc1 = (IAdvised)test1;
+            IAdvised pc2 = (IAdvised)test1_1;
+            Assert.AreEqual(pc1.Advisors, pc2.Advisors);
+            int oldLength = pc1.Advisors.Length;
+            NopInterceptor di = new NopInterceptor();
+            pc1.AddAdvice(1, di);
+            Assert.AreEqual(pc1.Advisors, pc2.Advisors);
+            Assert.AreEqual(oldLength + 1, pc2.Advisors.Length, "Now have one more advisor");
+            Assert.AreEqual(di.Count, 0);
+            test1.Age = (5);
+            Assert.AreEqual(test1_1.Age, test1.Age);
+            Assert.AreEqual(di.Count, 3);
+        }
+
+        [Test]
+        public void PrototypeInstancesAreNotEqual()
+        {
+            ITestObject test2 = (ITestObject)factory.GetObject("prototype");
+            ITestObject test2_1 = (ITestObject)factory.GetObject("prototype");
+            Assert.IsTrue(test2 != test2_1, "Prototype instances !=");
+            Assert.IsTrue(TestObject.Equals(test2, test2_1), "Prototype instances equal");
+        }
+
+        [Test]
+        public void PrototypeInstancesAreIndependent()
+        {
+            IObjectFactory objectFactory = new XmlObjectFactory(new ReadOnlyXmlTestResource("prototypeTests.xml", GetType()));
+            // Initial count value set in object factory XML 
+            int INITIAL_COUNT = 10;
+
+
+            // Check it works without AOP
+            ISideEffectObject raw = (ISideEffectObject)objectFactory.GetObject("prototypeTarget");
+            Assert.AreEqual(INITIAL_COUNT, raw.Count);
+            raw.doWork();
+            Assert.AreEqual(INITIAL_COUNT + 1, raw.Count);
+            raw = (ISideEffectObject)objectFactory.GetObject("prototypeTarget");
+            Assert.AreEqual(INITIAL_COUNT, raw.Count);
+
+            // Now try with advised instances
+            ISideEffectObject prototype2FirstInstance = (ISideEffectObject)objectFactory.GetObject("prototype");
+            Assert.AreEqual(INITIAL_COUNT, prototype2FirstInstance.Count);
+            prototype2FirstInstance.doWork();
+            Assert.AreEqual(INITIAL_COUNT + 1, prototype2FirstInstance.Count);
+
+            ISideEffectObject prototype2SecondInstance = (ISideEffectObject)objectFactory.GetObject("prototype");
+            Assert.IsFalse(prototype2FirstInstance == prototype2SecondInstance, "Prototypes are not ==");
+            Assert.AreEqual(INITIAL_COUNT, prototype2SecondInstance.Count);
+            Assert.AreEqual(INITIAL_COUNT + 1, prototype2FirstInstance.Count);
+
+
+        }
+
+
+        /// <summary> Test invoker is automatically added to manipulate target</summary>
+        [Test]
+        public void AutoInvoker()
+        {
+            String name = "Hieronymous";
+            TestObject target = (TestObject)factory.GetObject("test");
+            target.Name = name;
+            ITestObject autoInvoker = (ITestObject)factory.GetObject("autoInvoker");
+            Assert.IsTrue(autoInvoker.Name.Equals(name));
+        }
+
+        [Test]
+        public void CanGetFactoryReferenceAndManipulate()
+        {
+            ITestObject to = (ITestObject)factory.GetObject("test1");
+            // no exception 
+            string dummy = to.Name;
+
+            IAdvised config = (IAdvised)to;
+            Assert.AreEqual(1, config.Advisors.Length, "Object should have only one advisors");
+
+            Exception ex = new NotSupportedException("Invoke");
+            // Add evil interceptor to head of list
+            config.AddAdvice(0, new EvilMethodInterceptor(ex));
+            Assert.AreEqual(2, config.Advisors.Length, "The advisor count is wrong after adding an advisor programmatically.");
+
+            try
+            {
+                // evil interceptor should throw exception
+                dummy = to.Name;
+                Assert.Fail("Evil interceptor added programmatically should fail all method calls, but it didn't");
+            }
+            catch (Exception thrown)
+            {
+                Assert.AreEqual(thrown, ex, "The thrown exception is not the one we were looking for.");
+            }
+        }
+
+        /// <summary>
+        /// Must see effect immediately on behaviour.
+        /// </summary>
+        [Test]
+        public void CanAddAndRemoveIntroductionsOnSingleton()
+        {
+            try
+            {
+                ITimeStamped ts = (ITimeStamped)factory.GetObject("test1");
+                Assert.Fail("Shouldn't implement ITimeStamped before manipulation");
+            }
+            catch (InvalidCastException)
+            {
+            }
+
+            ProxyFactoryObject config = (ProxyFactoryObject)factory.GetObject("&test1");
+            long time = 666L;
+            TimestampIntroductionInterceptor ti = new TimestampIntroductionInterceptor();
+            ti.TimeStamp = new DateTime(time);
+            IIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(ti, typeof(ITimeStamped));
+
+            // add to front of introduction chain
+            int oldCount = config.Introductions.Length;
+            config.AddIntroduction(0, advisor);
+            Assert.IsTrue(config.Introductions.Length == oldCount + 1);
+
+            ITimeStamped ts2 = (ITimeStamped)factory.GetObject("test1");
+            Assert.IsTrue(ts2.TimeStamp == new DateTime(time));
+
+            // Can remove
+            config.RemoveIntroduction(advisor);
+            Assert.IsTrue(config.Introductions.Length == oldCount);
+
+            // Existing reference will still work
+            object o = ts2.TimeStamp;
+
+            // But new proxies should not implement ITimeStamped
+            try
+            {
+                ts2 = (ITimeStamped)factory.GetObject("test1");
+                Assert.Fail("Should no longer implement ITimeStamped");
+            }
+            catch (InvalidCastException)
+            {
+                // expected...
+            }
+
+            // Now check non-effect of removing interceptor that isn't there
+            oldCount = config.Advisors.Length;
+            config.RemoveAdvice(new DebugAdvice());
+            Assert.IsTrue(config.Advisors.Length == oldCount);
+
+            ITestObject it = (ITestObject)ts2;
+            DebugAdvice debugInterceptor = new DebugAdvice();
+            config.AddAdvice(0, debugInterceptor);
+            object foo = it.Spouse;
+            Assert.AreEqual(1, debugInterceptor.Count);
+            config.RemoveAdvice(debugInterceptor);
+            foo = it.Spouse;
+            // not invoked again
+            Assert.IsTrue(debugInterceptor.Count == 1);
+        }
+
+        /// <summary> Try adding and removing interfaces and interceptors on prototype.
+        /// Changes will only affect future references obtained from the factory.
+        /// Each instance will be independent.
+        /// </summary>
+        [Test]
+        public void CanAddAndRemoveAspectInterfacesOnPrototype()
+        {
+            try
+            {
+                ITimeStamped ts = (ITimeStamped)factory.GetObject("test2");
+                Assert.Fail("Shouldn't implement ITimeStamped before manipulation");
+            }
+            catch (InvalidCastException)
+            {
+            }
+
+            IAdvised config = (IAdvised)factory.GetObject("&test2");
+            long time = 666L;
+            TimestampIntroductionInterceptor ti = new TimestampIntroductionInterceptor();
+            ti.TimeStamp = new DateTime(time);
+            IIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(ti, typeof(ITimeStamped));
+
+            // add to front of introduction chain
+            int oldCount = config.Introductions.Length;
+            config.AddIntroduction(0, advisor);
+            Assert.IsTrue(config.Introductions.Length == oldCount + 1);
+
+            ITimeStamped ts2 = (ITimeStamped)factory.GetObject("test2");
+            Assert.IsTrue(ts2.TimeStamp == new DateTime(time));
+
+            // Can remove
+            config.RemoveIntroduction(advisor);
+            Assert.IsTrue(config.Introductions.Length == oldCount);
+
+            // Existing reference will still work
+            object o = ts2.TimeStamp;
+
+            // But new proxies should not implement ITimeStamped
+            try
+            {
+                ts2 = (ITimeStamped)factory.GetObject("test2");
+                Assert.Fail("Should no longer implement ITimeStamped");
+            }
+            catch (InvalidCastException)
+            {
+            }
+
+            // Now check non-effect of removing interceptor that isn't there
+            ITestObject it = (ITestObject)factory.GetObject("test2");
+            config = (IAdvised)it;
+
+            oldCount = config.Advisors.Length;
+            config.RemoveAdvice(new DebugAdvice());
+            Assert.IsTrue(config.Advisors.Length == oldCount);
+
+            DebugAdvice debugInterceptor = new DebugAdvice();
+            config.AddAdvice(0, debugInterceptor);
+            object foo = it.Spouse;
+            Assert.AreEqual(1, debugInterceptor.Count);
+            config.RemoveAdvice(debugInterceptor);
+            foo = it.Spouse;
+            // not invoked again
+            Assert.IsTrue(debugInterceptor.Count == 1);
+        }
+
+        /// <summary>
+        /// Note that we can't add or remove interfaces without reconfiguring the
+        /// singleton. 
+        /// </summary>
+        [Test]
+        public void CanAddAndRemoveAspectInterfacesOnSingletonByCasting()
+        {
+            ITestObject it = (ITestObject)factory.GetObject("test1");
+            IAdvised pc = (IAdvised)it;
+            object name = it.Age;
+            NopInterceptor di = new NopInterceptor();
+            pc.AddAdvice(0, di);
+            Assert.AreEqual(0, di.Count);
+            it.Age = 25;
+            Assert.AreEqual(25, it.Age);
+            Assert.AreEqual(2, di.Count);
+        }
+
+        [Test]
+        public void MethodPointcuts()
+        {
+            ITestObject tb = (ITestObject)factory.GetObject("pointcuts");
+            PointcutForVoid.Reset();
+            Assert.IsTrue((PointcutForVoid.methodNames.Count == 0), "No methods intercepted");
+            object o = tb.Age;
+            Assert.IsTrue((PointcutForVoid.methodNames.Count == 0), "Not void: shouldn't have intercepted");
+            tb.Age = 1;
+            o = tb.Age;
+            tb.Name = "Tristan";
+            tb.ToString();
+            Assert.AreEqual(2, PointcutForVoid.methodNames.Count, "Recorded wrong number of invocations");
+            Assert.AreEqual("set_Age", PointcutForVoid.methodNames[0]);
+            Assert.AreEqual("set_Name", PointcutForVoid.methodNames[1]);
+        }
+
+        [Test]
+        public void CanAddThrowsAdviceWithoutAdvisor()
+        {
+            IObjectFactory f = new XmlObjectFactory(new ReadOnlyXmlTestResource("throwsAdvice.xml", GetType()));
+            ThrowsAdviceInterceptorTests.MyThrowsHandler th =
+                (ThrowsAdviceInterceptorTests.MyThrowsHandler)f.GetObject("throwsAdvice");
+            CountingBeforeAdvice cba = (CountingBeforeAdvice)f.GetObject("countingBeforeAdvice");
+            Assert.AreEqual(0, cba.GetCalls());
+            Assert.AreEqual(0, th.GetCalls());
+            ThrowsAdviceInterceptorTests.IEcho echo = (ThrowsAdviceInterceptorTests.IEcho)f.GetObject("throwsAdvised");
+            echo.A = 12;
+            Assert.AreEqual(1, cba.GetCalls());
+            Assert.AreEqual(0, th.GetCalls());
+            Exception expected = new Exception();
+            try
+            {
+                echo.EchoException(1, expected);
+                Assert.Fail();
+            }
+            catch (Exception ex)
+            {
+                Assert.AreEqual(expected, ex);
+            }
+            // No throws handler method: count should still be 0
+            Assert.AreEqual(0, th.GetCalls());
+
+            // Handler knows how to handle this exception
+            expected = new HttpException();
+            try
+            {
+                echo.EchoException(1, expected);
+                Assert.Fail();
+            }
+            catch (HttpException ex)
+            {
+                Assert.AreEqual(expected, ex);
+            }
+            // One match
+            Assert.AreEqual(1, th.GetCalls("HttpException"));
+        }
+
+        /// <summary> Checks that globals get invoked,
+        /// and that they can add aspect interfaces unavailable
+        /// to other objects. These interfaces don't need
+        /// to be included in proxiedInterface [].
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(InvalidCastException))]
+        public void GlobalsCanAddAspectInterfaces()
+        {
+            IAddedGlobalInterface agi = (IAddedGlobalInterface)factory.GetObject("autoInvoker");
+            Assert.IsTrue(agi.GlobalsAdded == -1);
+
+            ProxyFactoryObject pfb = (ProxyFactoryObject)factory.GetObject("&validGlobals");
+            Assert.AreEqual(2, pfb.Advisors.Length, "Proxy should have 1 global and 1 explicit advisor");
+            Assert.AreEqual(1, pfb.Introductions.Length, "Proxy should have 1 global introduction");
+
+            agi.GlobalsAdded = ((IAdvised)agi).Introductions.Length;
+            Assert.IsTrue(agi.GlobalsAdded == 1);
+
+            IApplicationEventListener l = (IApplicationEventListener)factory.GetObject("validGlobals");
+            agi = (IAddedGlobalInterface)l;
+            Assert.IsTrue(agi.GlobalsAdded == -1);
+            agi = (IAddedGlobalInterface)factory.GetObject("test1");
+        }
+
+        [Test]
+        public void IsSingletonFalseReturnsNew_ProxyInstance_NotNewProxyTargetSource()
+        {
+            IDynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+            GoodCommand target = new GoodCommand();
+            mock.ExpectAndReturn("GetObject", target, "singleton");
+            mock.ExpectAndReturn("GetObject", target, "singleton");
+            IObjectFactory factory = (IObjectFactory)mock.Object;
+
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.ProxyInterfaces = new string[] { typeof(ICommand).FullName };
+            fac.IsSingleton = false;
+            fac.TargetName = "singleton";
+            fac.ObjectFactory = factory;
+            fac.AddAdvice(new NopInterceptor());
+
+            ICommand one = (ICommand)fac.GetObject();
+            ICommand two = (ICommand)fac.GetObject();
+            Assert.IsFalse(ReferenceEquals(one, two));
+
+            mock.Verify();
+        }
+
+        [Test]
+        public void IsSingletonTrueReturnsNew_ProxyInstance_NotNewProxyTargetSource()
+        {
+            IDynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+            GoodCommand target = new GoodCommand();
+            mock.ExpectAndReturn("GetObject", target, "singleton");
+            IObjectFactory factory = (IObjectFactory)mock.Object;
+
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.ProxyInterfaces = new string[] { typeof(ICommand).FullName };
+            fac.IsSingleton = true; // default, just being explicit...
+            fac.TargetName = "singleton";
+            fac.ObjectFactory = factory;
+            fac.AddAdvice(new NopInterceptor());
+
+            ICommand one = (ICommand)fac.GetObject();
+            ICommand two = (ICommand)fac.GetObject();
+            Assert.IsTrue(ReferenceEquals(one, two));
+
+            mock.Verify();
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException))]
+        public void AddAdvisorWhenConfigIsFrozen()
+        {
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.IsFrozen = true;
+            fac.AddAdvisor(new PointcutForVoid());
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException))]
+        public void RemoveAdvisorWhenConfigIsFrozen()
+        {
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.IsFrozen = true;
+            fac.RemoveAdvisor(new PointcutForVoid());
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException))]
+        public void ReplaceAdvisorWhenConfigIsFrozen()
+        {
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.IsFrozen = true;
+            fac.ReplaceAdvisor(new PointcutForVoid(), new PointcutForVoid());
+        }
+
+        [Test]
+        public void TargetAtEndOfInterceptorList()
+        {
+            GoodCommand target = new GoodCommand();
+            NopInterceptor advice = new NopInterceptor();
+
+            IDynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+            mock.ExpectAndReturn("GetObject", advice, "advice");
+            mock.ExpectAndReturn("GetObject", target, "singleton");
+            mock.ExpectAndReturn("GetType", typeof(GoodCommand), "singleton");
+            IObjectFactory factory = (IObjectFactory)mock.Object;
+
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.ProxyInterfaces = new string[] { typeof(ICommand).FullName };
+            fac.IsSingleton = true; // default, just being explicit...
+            fac.InterceptorNames = new string[] { "advice", "singleton" };
+            fac.ObjectFactory = factory;
+
+            ICommand one = (ICommand)fac.GetObject();
+            ICommand two = (ICommand)fac.GetObject();
+            Assert.IsTrue(ReferenceEquals(one, two));
+            one.Execute();
+            Assert.AreEqual(1, advice.Count);
+            two.Execute();
+            Assert.AreEqual(2, advice.Count);
+
+            mock.Verify();
+        }
+
+        [Test]
+        public void MakeSurePrototypeTargetIsNotNeedlesslyCreatedDuringInitialization_Unit()
+        {
+            GoodCommand target = new GoodCommand();
+            NopInterceptor advice = new NopInterceptor();
+
+            IDynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+            mock.ExpectAndReturn("IsSingleton", true); // advice is a singleton...
+            mock.ExpectAndReturn("GetObject", advice, "advice");
+            mock.ExpectAndReturn("GetType", typeof(GoodCommand), "prototype");
+
+            mock.ExpectAndReturn("GetObject", advice, "advice");
+            mock.ExpectAndReturn("GetObject", target, "prototype");
+
+            IObjectFactory factory = (IObjectFactory)mock.Object;
+
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.ProxyInterfaces = new string[] { typeof(ICommand).FullName };
+            fac.IsSingleton = false;
+            fac.InterceptorNames = new string[] { "advice", "prototype" };
+            fac.ObjectFactory = factory;
+
+            fac.GetObject();
+            mock.Verify();
+        }
+
+        [Test]
+        public void MakeSurePrototypeTargetIsNotNeedlesslyCreatedDuringInitialization_Integration()
+        {
+            try
+            {
+                RootObjectDefinition advice = new RootObjectDefinition(typeof(NopInterceptor));
+                // prototype target...
+                RootObjectDefinition target = new RootObjectDefinition(typeof(InstantiationCountingCommand), false);
+
+                DefaultListableObjectFactory ctx = new DefaultListableObjectFactory();
+                ctx.RegisterObjectDefinition("advice", advice);
+                ctx.RegisterObjectDefinition("prototype", target);
+
+                ProxyFactoryObject fac = new ProxyFactoryObject();
+                fac.ProxyInterfaces = new string[] { typeof(ICommand).FullName };
+                fac.IsSingleton = false;
+                fac.InterceptorNames = new string[] { "advice", "prototype" };
+                fac.ObjectFactory = ctx;
+
+                Assert.AreEqual(0, InstantiationCountingCommand.NumberOfInstantiations,
+                                "Prototype target instance is being (needlessly) created during PFO initialization.");
+                fac.GetObject();
+                Assert.AreEqual(1, InstantiationCountingCommand.NumberOfInstantiations, "Expected 1 inst");
+                fac.GetObject();
+                Assert.AreEqual(2, InstantiationCountingCommand.NumberOfInstantiations);
+            }
+            finally
+            {
+                InstantiationCountingCommand.NumberOfInstantiations = 0;
+            }
+        }
+
+        [Test]
+        public void SingletonProxyWithPrototypeTarget()
+        {
+            try
+            {
+                RootObjectDefinition advice = new RootObjectDefinition(typeof(NopInterceptor));
+                // prototype target...
+                RootObjectDefinition target = new RootObjectDefinition(typeof(InstantiationCountingCommand), false);
+
+                DefaultListableObjectFactory ctx = new DefaultListableObjectFactory();
+                ctx.RegisterObjectDefinition("advice", advice);
+                ctx.RegisterObjectDefinition("prototype", target);
+
+                ProxyFactoryObject fac = new ProxyFactoryObject();
+                fac.ProxyInterfaces = new string[] { typeof(ICommand).FullName };
+                fac.IsSingleton = true;
+                fac.InterceptorNames = new string[] { "advice", "prototype" };
+                fac.ObjectFactory = ctx;
+
+                Assert.AreEqual(1, InstantiationCountingCommand.NumberOfInstantiations, "First Call");
+                fac.GetObject();
+                Assert.AreEqual(1, InstantiationCountingCommand.NumberOfInstantiations, "Second Call");
+                fac.GetObject();
+                Assert.AreEqual(1, InstantiationCountingCommand.NumberOfInstantiations, "Third Call");
+            }
+
+            finally
+            {
+                InstantiationCountingCommand.NumberOfInstantiations = 0;
+            }
+        }
+
+        public class InstantiationCountingCommand : ICommand
+        {
+            private static int numberOfInstantiations = 0;
+
+            public InstantiationCountingCommand()
+            {
+                ++numberOfInstantiations;
+            }
+
+            public static int NumberOfInstantiations
+            {
+                get { return numberOfInstantiations; }
+                set { numberOfInstantiations = value; }
+            }
+
+            public void Execute()
+            {
+            }
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException))]
+        public void NullNameInInterceptorNamesArray()
+        {
+            IObjectFactory factory = (IObjectFactory)new DynamicMock(typeof(IObjectFactory)).Object;
+
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.ProxyInterfaces = new string[] { typeof(ICommand).FullName };
+            fac.IsSingleton = false;
+            fac.InterceptorNames = new string[] { null, null };
+            fac.ObjectFactory = factory;
+        }
+
+        [Test]
+        public void PassEmptyInterceptorNamesArray_WithTargetThatImplementsAnInterfaceCanBeCastToSaidInterface()
+        {
+            IObjectFactory factory = (IObjectFactory)new DynamicMock(typeof(IObjectFactory)).Object;
+
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.ProxyInterfaces = new string[] { };
+            fac.Target = new GoodCommand();
+            fac.ObjectFactory = factory;
+
+            IAdvised advised = fac.GetObject() as IAdvised;
+            Assert.IsNotNull(advised);
+
+            ICommand cmd = fac.GetObject() as ICommand;
+            Assert.IsNotNull(cmd);
+
+            DoesntImplementAnyInterfaces obj = fac.GetObject() as DoesntImplementAnyInterfaces;
+            Assert.IsNull(obj);
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException))]
+        public void PassNullToTheProxyInterfacesProperty()
+        {
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.ProxyInterfaces = null;
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException))]
+        public void PassClassNotInterfaceNameToTheProxyInterfacesProperty()
+        {
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.ProxyInterfaces = new string[] { typeof(GoodCommand).FullName };
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException))]
+        public void PassRubbishNameToTheProxyInterfacesProperty()
+        {
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.ProxyInterfaces = new string[] { "Hey" };
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException))]
+        public void PassNullElementListToTheProxyInterfacesProperty()
+        {
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.ProxyInterfaces = new string[] { null };
+        }
+
+        [Test]
+        public void ProxiedObjectUnwrapsTargetInvocationException()
+        {
+            ProxyFactoryObject fac = new ProxyFactoryObject();
+            fac.AddInterface(typeof(ICommand));
+            fac.AddAdvice(new NopInterceptor());
+            fac.Target = new BadCommand();
+
+            ICommand cmd = (ICommand)fac.GetObject();
+            try
+            {
+                cmd.Execute();
+            }
+            catch (NotImplementedException)
+            {
+                // this is good, we want this exception to bubble up...
+            }
+            catch (TargetInvocationException)
+            {
+                Assert.Fail("Must have unwrapped this.");
+            }
+        }
+
+        [Test]
+        public void FactoryWrapsObjectInSingletonTargetSource()
+        {
+            IObjectFactory bf = new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("proxyFactoryTargetSourceTests.xml",
+                                            GetType()));
+            ITestObject tb = (ITestObject)bf.GetObject("viaTargetSource");
+            Assert.IsTrue(tb.Name.Equals("Adam"));
+            ProxyFactoryObject pfb = (ProxyFactoryObject)bf.GetObject("&viaTargetSource");
+            Assert.IsTrue(typeof(ITestObject).IsAssignableFrom(pfb.ObjectType), "Has correct object type");
+            Assert.AreEqual(typeof(SingletonTargetSource), pfb.TargetSource.GetType(), "Incorrect target source, expected singleton");
+        }
+
+        [Test(Description = "http://opensource.atlassian.com/projects/spring/browse/SPRNET-293")]
+        public void SupportsTransparentProxyAsTarget()
+        {
+            AppDomain domain = null;
+            try
+            {
+                AppDomainSetup setup = new AppDomainSetup();
+                setup.ApplicationBase = Environment.CurrentDirectory;
+                domain = AppDomain.CreateDomain("Spring", new Evidence(AppDomain.CurrentDomain.Evidence), setup);
+                object command = domain.CreateInstanceAndUnwrap(GetType().Assembly.FullName, typeof(RemotableCommand).FullName);
+
+                ProxyFactoryObject fac = new ProxyFactoryObject();
+                fac.AddInterface(typeof(ICommand));
+                fac.AddAdvice(new NopInterceptor());
+                fac.Target = command;
+
+                IAdvised advised = fac.GetObject() as IAdvised;
+                Assert.IsNotNull(advised);
+
+                ICommand cmd = fac.GetObject() as ICommand;
+                Assert.IsNotNull(cmd);
+
+                cmd.Execute();
+            }
+            finally
+            {
+                AppDomain.Unload(domain);
+            }
+        }
+
+        [Test(Description = "http://opensource.atlassian.com/projects/spring/browse/SPRNET-500")]
+        public void NotAccessibleInterfaceProxying()
+        {
+                const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+                <objects xmlns='http://www.springframework.net'>
+                <object id='MyProxy' type='Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop'>
+                    <property name='ProxyInterfaces'>
+                        <list>
+                            <value>Spring.Aop.Framework.HelperInterface2, Spring.Aop.Tests</value>
+                        </list>
+                    </property>
+                    <property name='TargetName' value='MyTarget' />
+                    <property name='InterceptorNames'>
+                        <list>
+                            <value>MyInterceptor</value>
+                        </list>
+                    </property>
+                </object>
+                <object id='MyTarget' type='Spring.Aop.Framework.HelperClassForNotAccessibleInterfaceProxyingTest, Spring.Aop.Tests'/>
+	            <object id='MyInterceptor' type='Spring.Aop.Interceptor.NopInterceptor'/>
+               </objects>";
+
+
+                MemoryStream stream = new MemoryStream(new UTF8Encoding().GetBytes(xml));
+                IResource resource = new InputStreamResource(stream, "Test ProxyFactoryObject");
+                XmlObjectFactory objectFactory = new XmlObjectFactory(resource, null);
+
+                HelperInterface2 hc = (HelperInterface2)objectFactory.GetObject("MyProxy");
+                Console.WriteLine(hc.SecondDoSomething());                                
+        }
+
+        [Test]
+        public void ProxyFactoryObjectIsThreadSafe()
+        {
+            const int WORKERS = 10;
+
+            AsyncTestMethod[] workers = new AsyncTestMethod[WORKERS];
+            for(int i=0;i<WORKERS;i++)
+            {
+                workers[i] = new AsyncTestMethod( 1, new ThreadStart( CallGetObject ) );
+            }
+
+            for(int i=0;i<WORKERS;i++)
+            {
+                workers[i].Start();
+            }
+
+            for(int i=0;i<WORKERS;i++)
+            {
+                workers[i].AssertNoException();
+            }
+        }
+
+        private void CallGetObject()
+        {
+            ProxyFactoryObject proxyFactory = (ProxyFactoryObject) this.factory.GetObject("&concurrentPrototype");
+
+            ITestObject prevTestObject = null;
+
+            for(int i=0;i<20;i++)
+            {
+                ITestObject o = proxyFactory.GetObject() as ITestObject;
+                Assert.IsNotNull(o);
+                Assert.AreNotSame( prevTestObject, o );
+                prevTestObject = o;
+                Thread.Sleep( 0 );
+            }
+        }
+
+        [Test]
+        public void ProxyTypeDoesntChangeIfSameConfig()
+        {
+            ProxyFactoryObject factoryObject = (ProxyFactoryObject) this.factory.GetObject( "&concurrentPrototype" );
+            Type testObjectType1 = factoryObject.GetObject().GetType();
+            Type testObjectType2 = factoryObject.GetObject().GetType();
+
+            Assert.AreSame(testObjectType1, testObjectType2);
+        }
+
+        [Test]
+        public void ProxyTypeChangesIfConfigChanges()
+        {
+            ProxyFactoryObject factoryObject = (ProxyFactoryObject) this.factory.GetObject( "&concurrentPrototype" );
+            Type testObjectType1 = factoryObject.GetObject().GetType();
+            
+            factoryObject.Interfaces = new Type[] {};
+            Type testObjectType2 = factoryObject.GetObject().GetType();
+
+            Assert.AreNotSame( testObjectType1,testObjectType2 );
+        }
+
+        #region WorkerThread Class
+
+        public class WorkerThread
+        {
+            private Exception _exception;
+            private Thread _thread;
+            private WaitCallback _callback;
+            private object _arg;
+
+            public WorkerThread(string name, WaitCallback callback,object arg)
+            {
+                this._arg = arg;
+                this._callback = callback;
+                _thread = new Thread( new ThreadStart( Run ) );
+                _thread.IsBackground = true;
+                _thread.Name = name;
+            }
+
+            public void Start()
+            {
+                _thread.Start();
+            }
+
+            public void Join()
+            {
+                if (_thread.IsAlive)
+                {
+                    _thread.Join();
+                }
+            }
+
+            public Exception Exception
+            {
+                get { return this._exception; }
+            }
+
+            private void Run()
+            {
+                try
+                {
+                    _callback( _arg );
+                }
+                catch(Exception ex)
+                {
+                    _exception = ex;
+                }
+            }
+        }
+
+        #endregion WorkerThread Class
+
+        #region Helper Classes
+
+        public interface ICommand
+        {
+            void Execute();
+        }
+
+        public sealed class BadCommand : ICommand
+        {
+            public void Execute()
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public sealed class GoodCommand : ICommand
+        {
+            public void Execute()
+            {
+            }
+        }
+
+        public sealed class RemotableCommand : MarshalByRefObject, ICommand
+        {
+            public void Execute()
+            {
+            }
+        }
+
+        /// <summary>
+        /// Fires only on void methods. Saves list of methods intercepted.
+        /// </summary>
+        public class PointcutForVoid : DynamicMethodMatcherPointcutAdvisor
+        {
+            private class AnonymousClassMethodInterceptor1 : IMethodInterceptor
+            {
+                public Object Invoke(IMethodInvocation invocation)
+                {
+                    methodNames.Add(invocation.Method.Name);
+                    return invocation.Proceed();
+                }
+            }
+
+            public static IList methodNames;
+
+            public static void Reset()
+            {
+                methodNames.Clear();
+            }
+
+            public PointcutForVoid()
+                : base(new AnonymousClassMethodInterceptor1())
+            {
+            }
+
+            /// <summary>
+            /// Must fire only if it returns void.
+            /// </summary>
+            public override bool Matches(MethodInfo method, Type targetType, object[] args)
+            {
+                return method.ReturnType == typeof(void);
+            }
+
+            static PointcutForVoid()
+            {
+                methodNames = new ArrayList();
+            }
+        }
+
+        /// <summary> Aspect interface</summary>
+        public interface IAddedGlobalInterface
+        {
+            int GlobalsAdded { get; set; }
+        }
+
+        /// <summary> Use as a global interceptor. Checks that 
+        /// global interceptors can add aspect interfaces.
+        /// NB: Add only via global interceptors in XML file.
+        /// </summary>
+        public class GlobalIntroduction : IAdvice, IAddedGlobalInterface
+        {
+            private int globalsAdded = -1;
+
+            public int GlobalsAdded
+            {
+                get { return globalsAdded; }
+                set { globalsAdded = value; }
+            }
+        }
+
+        private class EvilMethodInterceptor : IMethodInterceptor
+        {
+            private Exception ex;
+
+            public EvilMethodInterceptor(Exception ex)
+            {
+                this.ex = ex;
+            }
+
+            public object Invoke(IMethodInvocation invocation)
+            {
+                throw ex;
+            }
+        }
+
+        #endregion
+    }
+
+    #region HelpersForNotAccessibleInterfaceProxyingTest
+
+    public class HelperClassForNotAccessibleInterfaceProxyingTest : HelperInterface1, HelperInterface2
+    {
+        public string FirstDoSomething()
+        {
+            return "FirstDoSomething (internal interface implementation)";
+        }
+
+        public string SecondDoSomething()
+        {
+            return "SecondDoSomething (public interface implementation)";
+        }
+    }
+
+    internal interface HelperInterface1
+    {
+        string FirstDoSomething();
+    }
+
+    public interface HelperInterface2
+    {
+        string SecondDoSomething();
+    }
+
+    #endregion
+
+
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs
new file mode 100644
index 00000000..b8e09904
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs
@@ -0,0 +1,608 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+using AopAlliance.Aop;
+using AopAlliance.Intercept;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Aop.Interceptor;
+using Spring.Aop.Support;
+using Spring.Objects;
+using Spring.Proxy;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+    /// <summary>
+    /// Unit tests for the ProxyFactory class.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Choy Rim (.NET)</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: ProxyFactoryTests.cs,v 1.22 2008/03/21 10:49:38 oakinger Exp $</version>
+    [TestFixture]
+    public sealed class ProxyFactoryTests
+    {
+        public interface IDoubleClickable
+        {
+            event EventHandler DoubleClick;
+
+            void FireDoubleClickEvent();
+        }
+
+        public interface IDoubleClickableIntroduction :
+            IDoubleClickable, IAdvice
+        {
+        }
+
+        private class DoubleClickableIntroduction :
+            IDoubleClickableIntroduction
+        {
+            public event EventHandler DoubleClick;
+
+            public void FireDoubleClickEvent()
+            {
+                if (DoubleClick != null)
+                {
+                    DoubleClick(this, EventArgs.Empty);
+                }
+            }
+        }
+
+        [Test]
+        public void AddAndRemoveEventHandlerThroughIntroduction()
+        {
+            TestObject target = new TestObject();
+            DoubleClickableIntroduction dci = new DoubleClickableIntroduction();
+            DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(dci);
+            CountingBeforeAdvice countingBeforeAdvice = new CountingBeforeAdvice();
+            target.Name = "SOME-NAME";
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.AddIntroduction(advisor);
+            pf.AddAdvisor(new DefaultPointcutAdvisor(countingBeforeAdvice));
+            object proxy = pf.GetProxy();
+            ITestObject to = proxy as ITestObject;
+            Assert.IsNotNull(to);
+            Assert.AreEqual("SOME-NAME", to.Name);
+            IDoubleClickable doubleClickable = proxy as IDoubleClickable;
+            // add event handler through introduction
+            doubleClickable.DoubleClick += new EventHandler(OnClick);
+            OnClickWasCalled = false;
+            doubleClickable.FireDoubleClickEvent();
+            Assert.IsTrue(OnClickWasCalled);
+            Assert.AreEqual(3, countingBeforeAdvice.GetCalls());
+            // remove event handler through introduction
+            doubleClickable.DoubleClick -= new EventHandler(OnClick);
+            OnClickWasCalled = false;
+            doubleClickable.FireDoubleClickEvent();
+            Assert.IsFalse(OnClickWasCalled);
+            Assert.AreEqual(5, countingBeforeAdvice.GetCalls());
+        }
+
+        private bool OnClickWasCalled = false;
+
+        private void OnClick(object sender, EventArgs e)
+        {
+            OnClickWasCalled = true;
+        }
+
+        [Test]
+        public void CacheTest()
+        {
+
+            for (int i = 0; i < 2; i++)
+            {
+                TestObject target = new TestObject();
+                NopInterceptor nopInterceptor = new NopInterceptor();
+                CountingBeforeAdvice countingBeforeAdvice = new CountingBeforeAdvice();
+                ProxyFactory pf = new ProxyFactory();
+                pf.Target = target;
+                pf.AddAdvice(nopInterceptor);
+                pf.AddAdvisor(new DefaultPointcutAdvisor(countingBeforeAdvice));
+                object proxy = pf.GetProxy();
+            }
+
+            // fails when running in resharper/testdriven.net 
+            // DynamicProxyManager.SaveAssembly();
+
+        }
+
+        [Test]
+        public void AddAndRemoveEventHandlerThroughInterceptor()
+        {
+            TestObject target = new TestObject();
+            NopInterceptor nopInterceptor = new NopInterceptor();
+            CountingBeforeAdvice countingBeforeAdvice = new CountingBeforeAdvice();
+            target.Name = "SOME-NAME";
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.AddAdvice(nopInterceptor);
+            pf.AddAdvisor(new DefaultPointcutAdvisor(countingBeforeAdvice));
+            object proxy = pf.GetProxy();
+            ITestObject to = proxy as ITestObject;
+            // add event handler through proxy
+            to.Click += new EventHandler(OnClick);
+            OnClickWasCalled = false;
+            to.OnClick();
+            Assert.IsTrue(OnClickWasCalled);
+            Assert.AreEqual(2, countingBeforeAdvice.GetCalls());
+            // remove event handler through proxy
+            to.Click -= new EventHandler(OnClick);
+            OnClickWasCalled = false;
+            to.OnClick();
+            Assert.IsFalse(OnClickWasCalled);
+            Assert.AreEqual(4, countingBeforeAdvice.GetCalls());
+        }
+
+        private class TestObject2 : TestObject
+        {
+            public bool EqualsOverrideWasCalled = false;
+
+            public override bool Equals(object obj)
+            {
+                EqualsOverrideWasCalled = true;
+                return true;
+            }
+
+            public override int GetHashCode()
+            {
+                return base.GetHashCode();
+            }
+        }
+
+        [Test]
+        public void CallsEqualsOverride()
+        {
+            TestObject2 target = new TestObject2();
+            target.Name = "SOME-NAME";
+            ProxyFactory pf = new ProxyFactory(target);
+            object proxy = pf.GetProxy();
+            ITestObject to = proxy as ITestObject;
+            Assert.IsNotNull(to);
+            Assert.AreEqual("SOME-NAME", to.Name);
+
+            target.EqualsOverrideWasCalled = false;
+            Assert.IsTrue(to.Equals(proxy));
+            Assert.IsTrue(target.EqualsOverrideWasCalled);
+
+            target.EqualsOverrideWasCalled = false;
+            Assert.IsTrue(proxy.Equals(to));
+            Assert.IsTrue(target.EqualsOverrideWasCalled);
+
+            target.EqualsOverrideWasCalled = false;
+            Assert.IsTrue(target.Equals(to));
+            Assert.IsTrue(target.EqualsOverrideWasCalled);
+
+            target.EqualsOverrideWasCalled = false;
+            Assert.IsTrue(to.Equals(target));
+            Assert.IsTrue(target.EqualsOverrideWasCalled);
+        }
+
+        [Test]
+        public void CreateProxyFactoryWithoutTargetThenSetTarget()
+        {
+            TestObject target = new TestObject();
+            target.Name = "Adam";
+            NopInterceptor nopInterceptor = new NopInterceptor();
+            CountingBeforeAdvice countingBeforeAdvice = new CountingBeforeAdvice();
+            ProxyFactory pf = new ProxyFactory();
+            pf.Target = target;
+            pf.AddAdvice(nopInterceptor);
+            pf.AddAdvisor(new DefaultPointcutAdvisor(countingBeforeAdvice));
+            object proxy = pf.GetProxy();
+            ITestObject to = (ITestObject) proxy;
+            Assert.AreEqual("Adam", to.Name);
+            Assert.AreEqual(1, countingBeforeAdvice.GetCalls());
+        }
+
+        [Test]
+        [ExpectedException(typeof (AopConfigException))]
+        public void InstantiateWithNullTarget()
+        {
+            new ProxyFactory((object) null);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void AddNullInterface()
+        {
+            new ProxyFactory().AddInterface(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof (AopConfigException))]
+        public void AddInterfaceWhenConfigurationIsFrozen()
+        {
+            ProxyFactory factory = new ProxyFactory();
+            factory.IsFrozen = true;
+            factory.AddInterface(typeof(ITestObject));
+        }
+
+        [Test]
+        public void IndexOfMethods()
+        {
+            TestObject target = new TestObject();
+            ProxyFactory pf = new ProxyFactory(target);
+            NopInterceptor nop = new NopInterceptor();
+            IAdvisor advisor = new DefaultPointcutAdvisor(new CountingBeforeAdvice());
+            IAdvised advised = (IAdvised) pf.GetProxy();
+            // Can use advised and ProxyFactory interchangeably
+            advised.AddAdvice(nop);
+            pf.AddAdvisor(advisor);
+            Assert.AreEqual(- 1, pf.IndexOf((IInterceptor) null));
+            Assert.AreEqual(- 1, pf.IndexOf(new NopInterceptor()));
+            Assert.AreEqual(0, pf.IndexOf(nop));
+            Assert.AreEqual(- 1, advised.IndexOf((IAdvisor) null));
+            Assert.AreEqual(1, pf.IndexOf(advisor));
+            Assert.AreEqual(- 1, advised.IndexOf(new DefaultPointcutAdvisor(null)));
+        }
+
+        [Test]
+        public void RemoveAdvisorByReference()
+        {
+            TestObject target = new TestObject();
+            ProxyFactory pf = new ProxyFactory(target);
+            NopInterceptor nop = new NopInterceptor();
+            CountingBeforeAdvice cba = new CountingBeforeAdvice();
+            IAdvisor advisor = new DefaultPointcutAdvisor(cba);
+            pf.AddAdvice(nop);
+            pf.AddAdvisor(advisor);
+            ITestObject proxied = (ITestObject) pf.GetProxy();
+            proxied.Age = 5;
+            Assert.AreEqual(1, cba.GetCalls());
+            Assert.AreEqual(1, nop.Count);
+            Assert.IsFalse(pf.RemoveAdvisor(null));
+            Assert.IsTrue(pf.RemoveAdvisor(advisor));
+            Assert.AreEqual(5, proxied.Age);
+            Assert.AreEqual(1, cba.GetCalls());
+            Assert.AreEqual(2, nop.Count);
+            Assert.IsFalse(pf.RemoveAdvisor(new DefaultPointcutAdvisor(null)));
+        }
+
+        [Test]
+        public void RemoveAdvisorByIndex()
+        {
+            TestObject target = new TestObject();
+            ProxyFactory pf = new ProxyFactory(target);
+            NopInterceptor nop = new NopInterceptor();
+            CountingBeforeAdvice cba = new CountingBeforeAdvice();
+            IAdvisor advisor = new DefaultPointcutAdvisor(cba);
+            pf.AddAdvice(nop);
+            pf.AddAdvisor(advisor);
+            NopInterceptor nop2 = new NopInterceptor(2); // make instance unique (see SPRNET-847)
+            pf.AddAdvice(nop2);
+            ITestObject proxied = (ITestObject) pf.GetProxy();
+            proxied.Age = 5;
+            Assert.AreEqual(1, cba.GetCalls());
+            Assert.AreEqual(1, nop.Count);
+            Assert.AreEqual(1, nop2.Count);
+            // Removes counting before advisor
+            pf.RemoveAdvisor(1);
+            Assert.AreEqual(5, proxied.Age);
+            Assert.AreEqual(1, cba.GetCalls());
+            Assert.AreEqual(2, nop.Count);
+            Assert.AreEqual(2, nop2.Count);
+            // Removes Nop1
+            pf.RemoveAdvisor(0);
+            Assert.AreEqual(5, proxied.Age);
+            Assert.AreEqual(1, cba.GetCalls());
+            Assert.AreEqual(2, nop.Count);
+            Assert.AreEqual(3, nop2.Count);
+
+            // Check out of bounds
+            try
+            {
+                pf.RemoveAdvisor(- 1);
+                Assert.Fail("Supposed to throw exception");
+            }
+            catch (AopConfigException)
+            {
+                // Ok
+            }
+
+            try
+            {
+                pf.RemoveAdvisor(2);
+                Assert.Fail("Supposed to throw exception");
+            }
+            catch (AopConfigException)
+            {
+                // Ok
+            }
+
+            Assert.AreEqual(5, proxied.Age);
+            Assert.AreEqual(4, nop2.Count);
+        }
+
+        [Test]
+        public void TryRemoveNonProxiedInterface()
+        {
+            ProxyFactory factory = new ProxyFactory(new TestObject ());
+            Assert.IsFalse(factory.RemoveInterface(typeof(IServiceProvider)));
+        }
+
+        [Test]
+        public void RemoveProxiedInterface()
+        {
+            ProxyFactory factory = new ProxyFactory(new TestObject ());
+            Assert.IsTrue(factory.RemoveInterface(typeof(ITestObject)));
+        }
+
+        [Test]
+        public void ReplaceAdvisor()
+        {
+            TestObject target = new TestObject();
+            ProxyFactory pf = new ProxyFactory(target);
+            NopInterceptor nop = new NopInterceptor();
+            CountingBeforeAdvice cba1 = new CountingBeforeAdvice();
+            CountingBeforeAdvice cba2 = new CountingBeforeAdvice();
+            IAdvisor advisor1 = new DefaultPointcutAdvisor(cba1);
+            IAdvisor advisor2 = new DefaultPointcutAdvisor(cba2);
+            pf.AddAdvisor(advisor1);
+            pf.AddAdvice(nop);
+            ITestObject proxied = (ITestObject) pf.GetProxy();
+            // Use the type cast feature
+            // Replace etc methods on advised should be same as on ProxyFactory
+            IAdvised advised = (IAdvised) proxied;
+            proxied.Age = 5;
+            Assert.AreEqual(1, cba1.GetCalls());
+            Assert.AreEqual(0, cba2.GetCalls());
+            Assert.AreEqual(1, nop.Count);
+            Assert.IsFalse(advised.ReplaceAdvisor(null, null));
+            Assert.IsFalse(advised.ReplaceAdvisor(null, advisor2));
+            Assert.IsFalse(advised.ReplaceAdvisor(advisor1, null));
+            Assert.IsTrue(advised.ReplaceAdvisor(advisor1, advisor2));
+            Assert.AreEqual(advisor2, pf.Advisors[0]);
+            Assert.AreEqual(5, proxied.Age);
+            Assert.AreEqual(1, cba1.GetCalls());
+            Assert.AreEqual(2, nop.Count);
+            Assert.AreEqual(1, cba2.GetCalls());
+            Assert.IsFalse(pf.ReplaceAdvisor(new DefaultPointcutAdvisor(null), advisor1));
+        }
+
+        [Test]
+        public void IgnoresAdvisorDuplicates()
+        {
+            CountingBeforeAdvice cba1 = new CountingBeforeAdvice();
+            IAdvisor advisor1 = new DefaultPointcutAdvisor(cba1);
+
+            AdvisedSupport advSup = new AdvisedSupport();
+            advSup.AddAdvisor(advisor1);
+            advSup.AddAdvisor(advisor1);
+
+            Assert.AreEqual(1, advSup.Advisors.Length);
+        }
+
+        private class AnonymousClassTimeStamped : ITimeStamped
+        {
+            public AnonymousClassTimeStamped(ProxyFactoryTests enclosingInstance)
+            {
+                InitBlock(enclosingInstance);
+            }
+
+            private void InitBlock(ProxyFactoryTests enclosingInstance)
+            {
+                this.enclosingInstance = enclosingInstance;
+            }
+
+            private ProxyFactoryTests enclosingInstance;
+
+            public ProxyFactoryTests Enclosing_Instance
+            {
+                get { return enclosingInstance; }
+
+            }
+
+            public DateTime TimeStamp
+            {
+                get { throw new NotSupportedException("TimeStamp"); }
+            }
+        }
+
+        [Test]
+        public void AddRepeatedInterface()
+        {
+            ITimeStamped tst = new AnonymousClassTimeStamped(this);
+            ProxyFactory pf = new ProxyFactory(tst);
+            // We've already implicitly added this interface.
+            // This call should be ignored without error
+            pf.AddInterface(typeof (ITimeStamped));
+            // All cool
+            ITimeStamped ts = (ITimeStamped) pf.GetProxy();
+        }
+
+        internal class TestObjectSubclass : TestObject, IComparable
+        {
+            public override int CompareTo(Object arg0)
+            {
+                throw new NotSupportedException("compareTo");
+            }
+        }
+
+        [Test]
+        public void GetsAllInterfaces()
+        {
+            // Extend to get new interface
+            TestObjectSubclass raw = new TestObjectSubclass();
+            ProxyFactory factory = new ProxyFactory(raw);
+            Assert.AreEqual(7, factory.Interfaces.Length, "Found correct number of interfaces");
+            //System.out.println("Proxied interfaces are " + StringUtils.arrayToDelimitedString(factory.getProxiedInterfaces(), ","));
+            ITestObject tb = (ITestObject) factory.GetProxy();
+            Assert.IsTrue(tb is IOther, "Picked up secondary interface");
+
+            raw.Age = 25;
+            Assert.IsTrue(tb.Age == raw.Age);
+
+            DateTime t = new DateTime(2004, 8, 1);
+            TimestampIntroductionInterceptor ti = new TimestampIntroductionInterceptor(t);
+
+            Console.WriteLine(StringUtils.ArrayToDelimitedString(factory.Interfaces, "/"));
+
+            //factory.addAdvisor(0, new DefaultIntroductionAdvisor(ti, typeof(ITimeStamped)));
+            factory.AddIntroduction(
+                new DefaultIntroductionAdvisor(ti, typeof (ITimeStamped))
+                );
+
+            Console.WriteLine(StringUtils.ArrayToDelimitedString(factory.Interfaces, "/"));
+
+            ITimeStamped ts = (ITimeStamped) factory.GetProxy();
+            Assert.IsTrue(ts.TimeStamp == t);
+            // Shouldn't fail;
+            ((IOther) ts).Absquatulate();
+        }
+
+        private class AnonymousClassInterceptor : IInterceptor
+        {
+        }
+
+        [Test]
+        public void CanOnlyAddMethodInterceptors()
+        {
+            ProxyFactory factory = new ProxyFactory(new TestObject());
+            factory.AddAdvice(0, new NopInterceptor());
+            try
+            {
+                factory.AddAdvice(0, new AnonymousClassInterceptor());
+                Assert.Fail("Should only be able to add MethodInterceptors");
+            }
+            catch (AopConfigException)
+            {
+            }
+
+            // Check we can still use it
+            IOther other = (IOther) factory.GetProxy();
+            other.Absquatulate();
+        }
+
+        [Test]
+        public void InterceptorInclusionMethods()
+        {
+            NopInterceptor di = new NopInterceptor();
+            NopInterceptor diUnused = new NopInterceptor(1); // // make instance unique (see SPRNET-847)
+            ProxyFactory factory = new ProxyFactory(new TestObject());
+            factory.AddAdvice(0, di);
+            ITestObject tb = (ITestObject) factory.GetProxy();
+            Assert.IsTrue(factory.AdviceIncluded(di));
+            Assert.IsTrue(!factory.AdviceIncluded(diUnused));
+            Assert.IsTrue(factory.CountAdviceOfType(typeof (NopInterceptor)) == 1);
+
+            factory.AddAdvice(0, diUnused);
+            Assert.IsTrue(factory.AdviceIncluded(diUnused));
+            Assert.IsTrue(factory.CountAdviceOfType(typeof (NopInterceptor)) == 2);
+        }
+
+        [Test]
+        public void AddAdvisedSupportListener()
+        {
+            IDynamicMock mock = new DynamicMock(typeof(IAdvisedSupportListener));
+            IAdvisedSupportListener listener = (IAdvisedSupportListener) mock.Object;
+
+            mock.Expect("Activated");
+            ProxyFactory factory = new ProxyFactory(new TestObject());
+            factory.AddListener(listener);
+            factory.GetProxy();
+            mock.Verify();
+        }
+
+        [Test]
+        public void AdvisedSupportListenerMethodsAreCalledAppropriately()
+        {
+            IDynamicMock mock = new DynamicMock(typeof(IAdvisedSupportListener));
+            IAdvisedSupportListener listener = (IAdvisedSupportListener) mock.Object;
+
+            mock.Expect("Activated");
+            mock.Expect("AdviceChanged");
+            mock.Expect("InterfacesChanged");
+
+            ProxyFactory factory = new ProxyFactory(new TestObject());
+            factory.AddListener(listener);
+
+            // must fire the Activated callback...
+            factory.GetProxy();
+            // must fire the AdviceChanged callback...
+            factory.AddAdvice(new NopInterceptor());
+            // must fire the InterfacesChanged callback...
+            factory.AddInterface(typeof(ISerializable));
+
+            mock.Verify();
+        }
+
+        [Test]
+        public void AdvisedSupportListenerMethodsAre_NOT_CalledIfProxyHasNotBeenCreated()
+        {
+            IDynamicMock mock = new DynamicMock(typeof(IAdvisedSupportListener));
+            IAdvisedSupportListener listener = (IAdvisedSupportListener) mock.Object;
+
+            ProxyFactory factory = new ProxyFactory(new TestObject());
+            factory.AddListener(listener);
+
+            // must not fire the AdviceChanged callback...
+            factory.AddAdvice(new NopInterceptor());
+            // must not fire the InterfacesChanged callback...
+            factory.AddInterface(typeof(ISerializable));
+
+            mock.Verify();
+        }
+
+        [Test]
+        public void AddNullAdvisedSupportListenerIsOk()
+        {
+            ProxyFactory factory = new ProxyFactory(new TestObject());
+            factory.AddListener(null);
+        }
+
+        [Test]
+        public void RemoveNullAdvisedSupportListenerIsOk()
+        {
+            ProxyFactory factory = new ProxyFactory(new TestObject());
+            factory.RemoveListener(null);
+        }
+
+        [Test]
+        public void RemoveAdvisedSupportListener()
+        {
+            IDynamicMock mock = new DynamicMock(typeof(IAdvisedSupportListener));
+            IAdvisedSupportListener listener = (IAdvisedSupportListener) mock.Object;
+
+            ProxyFactory factory = new ProxyFactory(new TestObject());
+            factory.AddListener(listener);
+            factory.RemoveListener(listener);
+
+            factory.GetProxy();
+
+            // check that no lifecycle callback methods were invoked on the listener...
+            mock.Verify();
+        }
+
+        [Test]
+        [ExpectedException(typeof(AopConfigException))]
+        public void Frozen_RemoveAdvisor()
+        {
+            ProxyFactory factory = new ProxyFactory();
+            factory.IsFrozen = true;
+            factory.RemoveAdvisor(null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ReflectiveMethodInvocationTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ReflectiveMethodInvocationTests.cs
new file mode 100644
index 00000000..2cb5fb4f
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ReflectiveMethodInvocationTests.cs
@@ -0,0 +1,47 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Collections;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+    /// <summary>
+    /// Unit tests for the ReflectiveMethodInvocation class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: ReflectiveMethodInvocationTests.cs,v 1.8 2008/02/06 18:29:05 bbaia Exp $</version>
+    [TestFixture]
+    public class ReflectiveMethodInvocationTests : AbstractMethodInvocationTests
+    {
+        protected override AbstractMethodInvocation CreateMethodInvocation(object proxy, object target, MethodInfo method, MethodInfo onProxyMethod, object[] arguments, Type targetType, IList interceptors)
+        {
+            return new ReflectiveMethodInvocation(proxy, target, method, onProxyMethod, arguments, targetType, interceptors);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/TimestampIntroductionInterceptor.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/TimestampIntroductionInterceptor.cs
new file mode 100644
index 00000000..03818c48
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/TimestampIntroductionInterceptor.cs
@@ -0,0 +1,67 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+#region Imports
+using System;
+
+using AopAlliance.Aop;
+using AopAlliance.Intercept;
+
+#endregion
+
+namespace Spring.Aop.Framework
+{
+	/// <summary>
+	/// Test introduction ported from Spring.Java.
+	/// </summary>
+	/// <remarks>
+	/// The name is deceptive because it isn't implemented as an interceptor.
+	/// It's an introduction which is handled differently in Spring.NET.
+	/// Keeping the name is useful as a placeholder for future porting work.
+	/// </remarks>
+	/// <author>Spring.Java Folks</author>
+	/// <author>Choy Rim (.NET)</author>
+	public class TimestampIntroductionInterceptor : IAdvice, ITimeStamped, IInterceptor
+	{
+		private DateTime ts;
+
+		public TimestampIntroductionInterceptor() 
+		{
+		}
+
+		public TimestampIntroductionInterceptor(DateTime ts) 
+		{
+			this.ts = ts;
+		}
+	
+		#region ITimeStamped Members
+
+		public DateTime TimeStamp
+		{
+			get
+			{
+				return this.ts;
+			}
+			set
+			{
+				this.ts = value;
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/UnsupportedInterceptor.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/UnsupportedInterceptor.cs
new file mode 100644
index 00000000..7929424b
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/UnsupportedInterceptor.cs
@@ -0,0 +1,13 @@
+using System;
+using AopAlliance.Intercept;
+
+namespace Spring.Aop.Framework
+{
+	public class UnsupportedInterceptor : IMethodInterceptor
+	{
+	  public object Invoke(IMethodInvocation invocation)
+	  {
+	    throw new NotImplementedException(invocation.Method.Name);
+	  }
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/ISimpleBeforeAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/ISimpleBeforeAdvice.cs
new file mode 100644
index 00000000..9f44ea21
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/ISimpleBeforeAdvice.cs
@@ -0,0 +1,34 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+using System;
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Simple BeforeAdvice targeted for testing
+	/// </summary>
+	/// <author>Dmitriy Kopylenko</author>
+	/// <author>Simon White (.NET)</author>
+	public interface ISimpleBeforeAdvice : IBeforeAdvice
+	{
+		void Before();
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Interceptor/NopInterceptor.cs b/test/Spring/Spring.Aop.Tests/Aop/Interceptor/NopInterceptor.cs
new file mode 100644
index 00000000..05087806
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Interceptor/NopInterceptor.cs
@@ -0,0 +1,86 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Aop.Interceptor
+{
+	/// <summary>
+	/// Trivial interceptor that can be introduced into an interceptor chain to
+	/// aid in debugging.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Choy Rim (.NET)</author>
+	/// <version>$Id: NopInterceptor.cs,v 1.6 2008/01/14 20:49:47 oakinger Exp $</version>
+	public class NopInterceptor : IMethodBeforeAdvice
+	{
+	    protected int instanceId;
+		protected int count;
+
+
+	    public NopInterceptor() : this(0)
+	    {
+	    }
+
+        public NopInterceptor(int instanceId)
+	    {
+	        this.instanceId = instanceId;
+	    }
+
+	    public int InstanceId
+	    {
+	        get { return instanceId; }
+	    }
+
+	    public int Count
+		{
+			get { return this.count; }
+		}
+
+		public void Before(MethodInfo method, object[] args, object target)
+		{
+			++count;
+		}
+
+		public override bool Equals(Object other)
+		{
+			if (!(other is NopInterceptor))
+			{
+				return false;
+			}
+			if (this == other)
+			{
+				return true;
+			}
+			return (instanceId == ((NopInterceptor) other).InstanceId) 
+                && (count == ((NopInterceptor) other).count);
+		}
+
+		public override int GetHashCode()
+		{
+			return instanceId + 13 * count;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Interceptor/SerializableNopInterceptor.cs b/test/Spring/Spring.Aop.Tests/Aop/Interceptor/SerializableNopInterceptor.cs
new file mode 100644
index 00000000..b25ad5a8
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Interceptor/SerializableNopInterceptor.cs
@@ -0,0 +1,52 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+using System;
+using System.Runtime.Serialization;
+#endregion
+
+namespace Spring.Aop.Interceptor
+{
+	/// <summary>
+	/// Subclass of NopInterceptor that is serializable and
+	/// can be used to test proxy serialization.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	[Serializable]
+	public sealed class SerializableNopInterceptor : NopInterceptor, ISerializable
+	{
+		public SerializableNopInterceptor()
+		{
+		}
+
+		public SerializableNopInterceptor(SerializationInfo info, StreamingContext ctxt)
+		{
+			this.instanceId = (int) info.GetValue("InstanceId", typeof(int));
+            this.count = (int)info.GetValue("Count", typeof(int));
+        }
+
+		public void GetObjectData(SerializationInfo info, StreamingContext ctxt)
+		{
+            info.AddValue("InstanceId", InstanceId);
+			info.AddValue("Count", Count);
+		}
+
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceAdapter.cs b/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceAdapter.cs
new file mode 100644
index 00000000..96e09301
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceAdapter.cs
@@ -0,0 +1,51 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+using System;
+
+using AopAlliance.Aop;
+using AopAlliance.Intercept;
+
+using Spring.Aop.Framework.Adapter;
+#endregion
+
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	/// <author>Dmitriy Kopylenko</author>
+	/// <author>Simon White (.NET)</author>
+	public class SimpleBeforeAdviceAdapter : IAdvisorAdapter
+	{
+		#region IAdvisorAdapter Members
+		public bool SupportsAdvice(IAdvice advice)
+		{
+			return advice is ISimpleBeforeAdvice;
+		}
+
+		public IInterceptor GetInterceptor(IAdvisor advisor)
+		{
+			ISimpleBeforeAdvice advice = (ISimpleBeforeAdvice) advisor.Advice;
+			return new SimpleBeforeAdviceInterceptor(advice) ;
+		}
+		#endregion
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceImpl.cs b/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceImpl.cs
new file mode 100644
index 00000000..a39c8856
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceImpl.cs
@@ -0,0 +1,57 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+using System;
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	/// <author>Dmitriy Kopylenko</author>
+	/// <author>Simon White (.NET)</author>
+	public class SimpleBeforeAdviceImpl : ISimpleBeforeAdvice
+	{
+		private int _invocationCounter;
+
+		#region Properties
+		public int InvocationCounter
+		{
+			get
+			{
+				return _invocationCounter;
+			}
+		}
+		#endregion
+
+		#region Constructors
+		public SimpleBeforeAdviceImpl()
+		{
+		}
+		#endregion
+
+		#region ISimpleBeforeAdvice Members
+		public void Before()
+		{
+			++_invocationCounter;
+		}
+		#endregion
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceInterceptor.cs b/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceInterceptor.cs
new file mode 100644
index 00000000..e97328a7
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/SimpleBeforeAdviceInterceptor.cs
@@ -0,0 +1,51 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+using System;
+
+using AopAlliance.Intercept;
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	/// <author>Dmitriy Kopylenko</author>
+	/// <author>Simon White (.NET)</author>
+	public class SimpleBeforeAdviceInterceptor : IMethodInterceptor
+	{
+		private ISimpleBeforeAdvice _advice;
+	
+		#region Constructors
+		public SimpleBeforeAdviceInterceptor(ISimpleBeforeAdvice advice) 
+		{
+			this._advice = advice;
+		}
+		#endregion
+
+		#region IMethodInterceptor Members
+		public object Invoke(IMethodInvocation mi)
+		{
+			_advice.Before();
+			return mi.Proceed();
+		}
+		#endregion
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/AbstractRegularExpressionMethodPointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/AbstractRegularExpressionMethodPointcutTests.cs
new file mode 100644
index 00000000..cc1684f9
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Support/AbstractRegularExpressionMethodPointcutTests.cs
@@ -0,0 +1,109 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+using System;
+using System.Reflection;
+
+using Spring.Util;
+
+using NUnit.Framework;
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Unit tests for the AbstractRegularExpressionMethodPointcut class.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Dmitriy Kopylenko</author>
+	/// <author>Simon White (.NET)</author>
+	public abstract class AbstractRegularExpressionMethodPointcutTests
+	{
+		private AbstractRegularExpressionMethodPointcut pointcut;
+
+		[SetUp]
+		protected void SetUp()
+		{
+			pointcut = GetRegexpMethodPointcut();
+		}
+
+		protected abstract AbstractRegularExpressionMethodPointcut GetRegexpMethodPointcut();
+
+		[Test]
+		public void NoPatternSupplied()
+		{
+			NoPatternSuppliedTests(pointcut);
+		}
+
+		[Test]
+		public void SerializationWithNoPatternSupplied()
+		{
+			pointcut = (AbstractRegularExpressionMethodPointcut) SerializationTestUtils.SerializeAndDeserialize(pointcut);
+			NoPatternSuppliedTests(pointcut);
+		}
+
+		protected void NoPatternSuppliedTests(AbstractRegularExpressionMethodPointcut rpc)
+		{
+			Assert.IsFalse(rpc.Matches(typeof(object).GetMethod("GetHashCode"), typeof(int)));
+			Assert.IsFalse(rpc.Matches(typeof(object).GetMethod("GetType"), typeof(Type)));
+			Assert.AreEqual(0, rpc.Patterns.Length);
+		}
+
+		[Test]
+		public void ExactMatch()
+		{
+			pointcut.Pattern = "System.Object.GetHashCode";
+			ExactMatchTests(pointcut);
+			pointcut = (AbstractRegularExpressionMethodPointcut) SerializationTestUtils.SerializeAndDeserialize(pointcut);
+			ExactMatchTests(pointcut);
+		}
+
+		protected void ExactMatchTests(AbstractRegularExpressionMethodPointcut rpc)
+		{
+			// assumes rpc.setPattern("java.lang.Object.hashCode");
+			Assert.IsTrue(rpc.Matches(typeof(object).GetMethod("GetHashCode"), typeof(int)));
+			Assert.IsFalse(rpc.Matches(typeof(object).GetMethod("GetType"), typeof(Type)));
+		}
+
+		[Test]
+		public void Wildcard()
+		{
+			pointcut.Pattern = ".*Object.GetHashCode";
+			Assert.IsTrue(pointcut.Matches(typeof(object).GetMethod("GetHashCode"), typeof(int)));
+			Assert.IsFalse(pointcut.Matches(typeof(object).GetMethod("GetType"), typeof(Type)));
+		}
+
+		[Test]
+		public void WildcardForOneClass()
+		{
+			pointcut.Pattern = "System.Object.*";
+			Assert.IsTrue(pointcut.Matches(typeof(object).GetMethod("GetHashCode"), typeof(int)));
+			Assert.IsTrue(pointcut.Matches(typeof(object).GetMethod("GetType"), typeof(Type)));
+		}
+
+		[Test]
+		public void MatchesObjectClass()
+		{
+			pointcut.Pattern = "System.Object.*";
+			Assert.IsTrue(pointcut.Matches(typeof(Exception).GetMethod("GetHashCode"), typeof(TargetException)));
+			// Doesn't match
+			Assert.IsFalse(pointcut.Matches(typeof(Exception).GetMethod("ToString"), typeof(Exception)));
+		}
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/AttributeMatchMethodPointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/AttributeMatchMethodPointcutTests.cs
new file mode 100644
index 00000000..560bd9aa
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Support/AttributeMatchMethodPointcutTests.cs
@@ -0,0 +1,229 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using System.Reflection;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Unit tests for the AttributeMatchMethodPointcut class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+    /// <author>Ronald Wildenberg</author>
+	/// <version>$Id: AttributeMatchMethodPointcutTests.cs,v 1.3 2007/05/21 16:44:08 bbaia Exp $</version>
+	[TestFixture]
+	public sealed class AttributeMatchMethodPointcutTests
+	{
+		[Test]
+		public void InstantiationWithASunnyDayAttributeType()
+		{
+			new AttributeMatchMethodPointcut(typeof(SerializableAttribute));
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void InstantiationWithNonAttributeType()
+		{
+			new AttributeMatchMethodPointcut(GetType());
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void AttributeSetterWithNonAttributeType()
+		{
+			AttributeMatchMethodPointcut cut = new AttributeMatchMethodPointcut();
+			cut.Attribute = GetType();
+		}
+
+		[Test]
+		public void AttributeSetterWithNullType()
+		{
+			AttributeMatchMethodPointcut cut = new AttributeMatchMethodPointcut();
+			cut.Attribute = null; // must allow this (no Exception)...
+		}
+
+		[Test]
+		public void AttributeSetterWithASunnyDayAttributeType()
+		{
+			AttributeMatchMethodPointcut cut = new AttributeMatchMethodPointcut();
+			cut.Attribute = typeof(SerializableAttribute); // must allow this too (no Exception)...
+		}
+
+		[Test]
+		public void MatchesWithASunnyDayAttributeTypeAndNoInheritance()
+		{
+			AttributeMatchMethodPointcut cut = new AttributeMatchMethodPointcut();
+			cut.Attribute = typeof(MarkupAttribute);
+			bool matches = cut.Matches(typeof(WithMarkup).GetMethod("Bing"), null);
+			Assert.IsTrue(matches, "Method was decorated with the target attribute, so this must match.");
+		}
+
+		[Test]
+		public void MatchesWithASunnyDayAttributeTypeAndInheritance()
+		{
+			AttributeMatchMethodPointcut cut = new AttributeMatchMethodPointcut();
+			cut.Attribute = typeof(MarkupAttribute);
+			bool matches = cut.Matches(typeof(InheritedWithMarkup).GetMethod("Bing"), null);
+			Assert.IsTrue(matches, "Inherited method was decorated with the target attribute, so this must match.");
+		}
+
+		[Test]
+		public void MatchesWithAMethodThatDontMatchTheAttributeTypeAndNoInheritance()
+		{
+			AttributeMatchMethodPointcut cut = new AttributeMatchMethodPointcut();
+			cut.Attribute = typeof(MarkupAttribute);
+			bool matches = cut.Matches(typeof(WithMarkup).GetMethod("RiloKiley"), null);
+			Assert.IsFalse(matches, "Method was not decorated with the target attribute, so this must not match.");
+		}
+
+		[Test]
+		public void MatchesWithAnInheritedMethodThatDontMatchTheAttributeTypeAndNoInheritance()
+		{
+			AttributeMatchMethodPointcut cut = new AttributeMatchMethodPointcut();
+			cut.Attribute = typeof(MarkupAttribute);
+			bool matches = cut.Matches(typeof(InheritedWithMarkup).GetMethod("RiloKiley"), null);
+			Assert.IsFalse(matches, "Inherited method was not decorated with the target attribute, so this must not match.");
+		}
+
+        /// <summary>
+        /// Confirms that without interfaces checking, a method that is implemented from an interface, will not match.
+        /// </summary>
+        [Test]
+        public void MatchesWithAnInterfaceMethodThatMatchesTheAttributeTypeAndNoCheckInterfaces()
+        {
+            AttributeMatchMethodPointcut cut = new AttributeMatchMethodPointcut();
+            cut.Attribute = typeof(MarkupAttribute);
+            cut.CheckInterfaces = false;
+            bool matches = cut.Matches(typeof(ImplementingClass).GetMethod("OtherTestMethod"), null);
+            Assert.IsFalse(matches, "Implementing method was not decorated with the target attribute, so this must not match since CheckInterfaces is false.");
+        }
+
+        /// <summary>
+        /// Confirms that with interface checking, a method that is implementing an interface method 
+        /// where the attribute is defined will match.
+        /// </summary>
+        [Test]
+        public void MatchesWithAnInterfaceMethodThatMatchesTheAttributeTypeAndCheckInterfaces()
+        {
+            AttributeMatchMethodPointcut cut = new AttributeMatchMethodPointcut();
+            cut.Attribute = typeof(MarkupAttribute);
+            cut.CheckInterfaces = true;
+            bool matches = cut.Matches(typeof(ImplementingClass).GetMethod("OtherTestMethod"), null);
+            Assert.IsTrue(matches, "Implementing method was not decorated with the target attribute, " + 
+                "but the method from the interface was, so this must match.");
+        }
+
+        /// <summary>
+        /// Confirms that with interfaces checking, a method that is indirectly implementing an interface method
+        /// where the attribute is defined will match.
+        /// </summary>
+        [Test]
+        public void MatchesWithAnIndirectInterfaceMethodThatMatchesTheAttributeTypeAndCheckInterfaces()
+        {
+            AttributeMatchMethodPointcut cut = new AttributeMatchMethodPointcut();
+            cut.Attribute = typeof(MarkupAttribute);
+            cut.CheckInterfaces = true;
+            bool matches = cut.Matches(typeof(ImplementingClass).GetMethod("TestMethod", new Type[] { }), null);
+            Assert.IsTrue(matches, "Implementing method was not decorated with the target attribute, but the" +
+                " method from an indirectly implemented interface was, so this must match.");
+        }
+
+        /// <summary>
+        /// Confirms that overloading methods do not match, whatever the attributes.
+        /// </summary>
+        [Test]
+        public void MatchesWithAnOverloadedInterfaceMethod()
+        {
+            AttributeMatchMethodPointcut cut = new AttributeMatchMethodPointcut();
+            cut.Attribute = typeof(MarkupAttribute);
+            cut.CheckInterfaces = true;
+            bool matches = cut.Matches(typeof(ImplementingClass).GetMethod("TestMethod", new Type[] { typeof(string) }), null);
+            Assert.IsFalse(matches, "Overloaded method from an implemented interface is not decorated with" +
+                " the attribute, so should not match.");
+        }
+
+        /// <summary>
+        /// Confirms that methods, defined in a subclass of a class that implements an interface that
+        /// has methods that have been decorated with an attribute, match.
+        /// </summary>
+        [Test]
+        public void MatchesWithAnIndirectInterfaceMethodFromSubclassThatMatchesTheAttributeTypeAndCheckInterfaces()
+        {
+            AttributeMatchMethodPointcut cut = new AttributeMatchMethodPointcut();
+            cut.Attribute = typeof(MarkupAttribute);
+            cut.CheckInterfaces = true;
+            bool matches = cut.Matches(typeof(InheritedImplementingClass).GetMethod("TestMethod", new Type[] { }), null);
+            Assert.IsTrue(matches, "Implementing method from subclass was not decorated with the target attribute " +
+                "but the method from an indirectly implemented interface was, so this must match.");
+        }
+
+        #region Helper classes definitions
+
+        [AttributeUsage(AttributeTargets.Method)]
+		private sealed class MarkupAttribute : Attribute {}
+
+		private class WithMarkup 
+		{
+			[Markup]
+			public void Bing() {}
+
+			public void RiloKiley() {}
+		}
+
+		private sealed class InheritedWithMarkup : WithMarkup
+		{
+        }
+
+        private interface SuperInterface
+        {
+            [Markup]
+            void TestMethod();
+
+            void TestMethod(string param);
+        }
+
+        private interface SubInterface : SuperInterface
+        {
+            [Markup]
+            void OtherTestMethod();
+        }
+
+        private class ImplementingClass : SubInterface
+        {
+            public void TestMethod() {}
+
+            public void TestMethod(string param) {}
+
+            public void OtherTestMethod() {}
+        }
+
+        private sealed class InheritedImplementingClass : ImplementingClass
+        {
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/ControlFlowPointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/ControlFlowPointcutTests.cs
new file mode 100644
index 00000000..75f6ede7
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Support/ControlFlowPointcutTests.cs
@@ -0,0 +1,228 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using NUnit.Framework;
+using Spring.Aop.Framework;
+using Spring.Aop.Interceptor;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Unit tests for the ControlFlowPointcut class.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	[TestFixture]
+	public sealed class ControlFlowPointcutTests
+	{
+		[Test]
+		[Category("Integration")]
+		public void Matches()
+		{
+			SerializablePerson target = new SerializablePerson();
+			target.SetAge(27);
+			ControlFlowPointcut cflow = new ControlFlowPointcut(typeof(One), "GetAge");
+			ProxyFactory factory = new ProxyFactory(target);
+			NopInterceptor nop = new NopInterceptor();
+			IPerson proxied = (IPerson) factory.GetProxy();
+			factory.AddAdvisor(new DefaultPointcutAdvisor(cflow, nop));
+
+			// not advised, not under One...
+			Assert.AreEqual(target.GetAge(), proxied.GetAge());
+			Assert.AreEqual(0, nop.Count, "Whoops, appear to be advising when not under One's cflow.");
+
+			// will be advised...
+			One one = new One();
+			Assert.AreEqual(27, one.GetAge(proxied));
+			Assert.AreEqual(1, nop.Count, "Not advising when under One's cflow (must be).");
+
+			// won't be advised...
+			Assert.AreEqual(target.GetAge(), new One().NoMatch(proxied));
+			Assert.AreEqual(1, nop.Count, "Whoops, appear to be advising when under One's cflow scope, BUT NOT under a target method's cflow scope.");
+			Assert.AreEqual(3, cflow.EvaluationCount, "Pointcut not invoked the correct number of times.");
+		}
+
+		private sealed class One
+		{
+            // attribute is required so that the delegated call is NOT jitted away...
+            [MethodImpl(MethodImplOptions.NoInlining)]
+			public int GetAge(IPerson proxied)
+			{
+				return proxied.GetAge();
+			}
+
+			public int NoMatch(IPerson proxied)
+			{
+				return proxied.GetAge();
+			}
+
+            // similarly, attribute is required so that the delegated call is NOT jitted away...
+            [MethodImpl(MethodImplOptions.NoInlining)]
+			public void Set(IPerson proxied)
+			{
+				proxied.SetAge(5);
+			}
+		}
+
+		/// <summary>
+		/// Check that we can use a cflow pointcut only in conjunction with
+		/// a static pointcut: e.g. all setter methods that are invoked under
+		/// a particular class.
+		/// </summary>
+		/// <remarks>
+		/// This greatly reduces the number of calls to the cflow pointcut,
+		/// meaning that it's not so prohibitively expensive.
+		/// </remarks>
+		[Test]
+		[Category("Integration")]
+		public void SelectiveApplication()
+		{
+			SerializablePerson target = new SerializablePerson();
+			target.SetAge(27);
+			NopInterceptor nop = new NopInterceptor();
+			ControlFlowPointcut cflow = new ControlFlowPointcut(typeof (One));
+			IPointcut settersUnderOne = Pointcuts.Intersection(SetterPointcut.Instance, cflow);
+			ProxyFactory pf = new ProxyFactory(target);
+			IPerson proxied = (IPerson) pf.GetProxy();
+			pf.AddAdvisor(new DefaultPointcutAdvisor(settersUnderOne, nop));
+
+			// Not advised, not under One
+			target.SetAge(16);
+			Assert.AreEqual(0, nop.Count);
+
+			// Not advised; under One but not a setter
+			Assert.AreEqual(16, new One().GetAge(proxied));
+			Assert.AreEqual(0, nop.Count);
+
+			// Won't be advised
+			new One().Set(proxied);
+			Assert.AreEqual(1, nop.Count);
+
+			// We saved most evaluations
+			Assert.AreEqual(1, cflow.EvaluationCount);
+		}
+
+		[Test]
+		public void EvaluationCountIncrementedEvenIfPointcutDoesNotMatch()
+		{
+			ControlFlowPointcut cut = new ControlFlowPointcut(typeof(One));
+			cut.Matches(null, null, null); // args are ingored in this impl...
+			Assert.AreEqual(1, cut.EvaluationCount);
+			cut.Matches(null, null, null); // args are ingored in this impl...
+			Assert.AreEqual(2, cut.EvaluationCount);
+		}
+
+		[Test]
+		public void EvaluationCountIncrementedOnEveryMatch()
+		{
+			Type oneType = typeof(One);
+			ControlFlowPointcut cut = new ControlFlowPointcut(oneType);
+			MethodInfo method = oneType.GetMethod("GetAge");
+			cut.Matches(method, oneType, null);
+			Assert.AreEqual(1, cut.EvaluationCount);
+			cut.Matches(method, oneType, null);
+			Assert.AreEqual(2, cut.EvaluationCount);
+		}
+
+		[Test]
+		public void DefaultClassFilterImplAlwaysMatchesRegardless()
+		{
+			Type oneType = typeof(One);
+			ControlFlowPointcut cut = new ControlFlowPointcut(oneType);
+			ITypeFilter filter = cut.TypeFilter;
+			Assert.IsTrue(filter.Matches(oneType),
+				"Must always match regardless of the supplied argument Type.");
+			Assert.IsTrue(filter.Matches(GetType()),
+				"Must always match even if the supplied argument Type is not " +
+				"a match for the Type supplied in the ctor.");
+			Assert.IsTrue(filter.Matches(null), // args are ingored in this impl...
+				"Must always match even if the supplied argument Type is null");
+		}
+
+		[Test]
+		public void StaticMethodMatchImplAlwaysMatchesRegardless()
+		{
+			Type oneType = typeof(One);
+			ControlFlowPointcut cut = new ControlFlowPointcut(oneType);
+			IMethodMatcher filter = cut.MethodMatcher;
+			MethodInfo method = oneType.GetMethod("GetAge");
+			Assert.IsTrue(filter.Matches(method, oneType),
+				"Must always match regardless of the supplied arguments.");
+			Assert.IsTrue(filter.Matches(method, GetType()),
+				"Must always match even if the supplied argument method and Type are not " +
+				"a match for the name and Type supplied in the ctor.");
+			Assert.IsTrue(filter.Matches(null, null), // args are ingored in this impl...
+				"Must always match even if the supplied arguments are null");
+		}
+
+		[Test]
+		public void DynamicMethodMatchWithJustTypeSpecifiedInCtor()
+		{
+			ControlFlowPointcut cut = new ControlFlowPointcut(GetType());
+			IMethodMatcher filter = cut.MethodMatcher;
+			Assert.IsTrue(filter.Matches(null, null, null), // args are ingored in this impl...
+				"Must match - under cflow of Type specified in ctor");
+		}
+
+		[Test]
+		public void DynamicMethodMatchWithTypeAndMethodNameSpecifiedInCtor()
+		{
+			ControlFlowPointcut cut = new ControlFlowPointcut(
+				GetType(), "DynamicMethodMatchWithTypeAndMethodNameSpecifiedInCtor");
+			IMethodMatcher filter = cut.MethodMatcher;
+			Assert.IsTrue(filter.Matches(null, null, null), // args are ingored in this impl...
+				"Must match - under cflow of Type specified in ctor");
+		}
+
+		[Test]
+		public void DynamicMethodMatchWithTypeAndMethodNameSpecifiedInCtorNoMatch()
+		{
+			ControlFlowPointcut cut = new ControlFlowPointcut(GetType(), "KiloRiley");
+			IMethodMatcher filter = cut.MethodMatcher;
+			Assert.IsFalse(filter.Matches(null, null, null), // args are ingored in this impl...
+				"Must not match - under cflow of Type specified in ctor, but no match on method name.");
+		}
+
+		#region Helper Classes
+
+		/// <summary>
+		/// Pointcut to catch all methods beginning with 'Set'.
+		/// </summary>
+		private class SetterPointcut : StaticMethodMatcherPointcut
+		{
+			public static SetterPointcut Instance = new SetterPointcut();
+
+			public override bool Matches(MethodInfo methodBase, Type targetType)
+			{
+				return methodBase.Name.StartsWith("Set");
+			}
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/DelegatingIntroductionInterceptorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/DelegatingIntroductionInterceptorTests.cs
new file mode 100644
index 00000000..9b401c2e
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Support/DelegatingIntroductionInterceptorTests.cs
@@ -0,0 +1,190 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+#region Imports
+using System;
+using System.Collections;
+
+using NUnit.Framework;
+using DotNetMock.Dynamic;
+
+using AopAlliance.Aop;
+using Spring.Aop.Framework;
+using Spring.Objects;
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Translation of DelegatingIntroductionInterceptor unit tests to Spring.NET.
+	/// </summary>
+	/// <remarks>
+	/// Spring.NET doesn't have a DelegatingIntroductionInterceptor because it handles
+	/// introductions without using interception. So all the unit tests show how similar
+	/// things can be done in Spring.NET.
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Choy Rim (.NET)</author>
+	/// <version>$Id: DelegatingIntroductionInterceptorTests.cs,v 1.6 2004/10/10 08:01:49 gcaprio Exp $</version>
+	[TestFixture]
+	public class DelegatingIntroductionInterceptorTests
+	{
+		private static readonly DateTime EXPECTED_TIMESTAMP = new DateTime(2004,8,1);
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void testNullTarget()
+		{
+			DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(null, typeof(ITimeStamped));
+		}
+
+		public interface ITimeStampedIntroduction: ITimeStamped, IAdvice
+		{
+		}
+
+		[Test]
+		public void testIntroductionInterceptorWithDelegation()
+		{
+			TestObject raw = new TestObject();
+			Assert.IsTrue(! (raw is ITimeStamped));
+			ProxyFactory factory = new ProxyFactory(raw);
+	
+			IDynamicMock tsControl = new DynamicMock(typeof(ITimeStampedIntroduction));
+			ITimeStampedIntroduction ts = (ITimeStampedIntroduction) tsControl.Object;
+			tsControl.ExpectAndReturn("TimeStamp", EXPECTED_TIMESTAMP);
+
+			DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(ts);
+			factory.AddIntroduction(advisor);
+
+			ITimeStamped tsp = (ITimeStamped) factory.GetProxy();
+			Assert.IsTrue(tsp.TimeStamp == EXPECTED_TIMESTAMP);
+	
+			tsControl.Verify();
+		}
+
+		// we have to mark the ISubTimeStamped interface with the IAdvice marker
+		// in order to use it as an introduction.
+		public interface ISubTimeStampedIntroduction: ISubTimeStamped, IAdvice
+		{
+		}
+	
+		public void testIntroductionInterceptorWithInterfaceHierarchy() 
+		{
+			TestObject raw = new TestObject();
+			Assert.IsTrue(! (raw is ISubTimeStamped));
+			ProxyFactory factory = new ProxyFactory(raw);
+
+			IDynamicMock tsControl = new DynamicMock(typeof(ISubTimeStampedIntroduction));
+			ISubTimeStampedIntroduction ts = (ISubTimeStampedIntroduction) tsControl.Object;
+			tsControl.ExpectAndReturn("TimeStamp", EXPECTED_TIMESTAMP);
+
+			DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(ts);
+			// we must add introduction, not an advisor
+			factory.AddIntroduction(advisor);
+
+			object proxy = factory.GetProxy();
+			ISubTimeStamped tsp = (ISubTimeStamped) proxy;
+			Assert.IsTrue(tsp.TimeStamp == EXPECTED_TIMESTAMP);
+
+			tsControl.Verify();
+		}
+
+		public void testIntroductionInterceptorWithSuperInterface()  
+		{
+			TestObject raw = new TestObject();
+			Assert.IsTrue(! (raw is ITimeStamped));
+			ProxyFactory factory = new ProxyFactory(raw);
+
+			IDynamicMock tsControl = new DynamicMock(typeof(ISubTimeStampedIntroduction));
+			ISubTimeStamped ts = (ISubTimeStamped) tsControl.Object;
+			tsControl.ExpectAndReturn("TimeStamp", EXPECTED_TIMESTAMP);
+
+			factory.AddIntroduction(0, new DefaultIntroductionAdvisor(
+				(ISubTimeStampedIntroduction)ts,
+				typeof(ITimeStamped))
+				);
+
+			ITimeStamped tsp = (ITimeStamped) factory.GetProxy();
+			Assert.IsTrue(!(tsp is ISubTimeStamped));
+			Assert.IsTrue(tsp.TimeStamp == EXPECTED_TIMESTAMP);
+
+			tsControl.Verify();
+		}
+
+		/// <summary>
+		/// test introduction.
+		/// <note>It must include the IAdvice marker interface to be a
+		/// valid introduction.</note>
+		/// </summary>
+		private class Test : ITimeStamped, ITest, IAdvice
+		{
+			private DateTime _timestamp;
+
+			public Test(DateTime timestamp) 
+			{
+				_timestamp = timestamp;
+			}
+			public void foo() 
+			{
+			}
+			public DateTime TimeStamp 
+			{
+				get 
+				{
+					return _timestamp;
+				}
+			}
+		}
+
+		public void testAutomaticInterfaceRecognitionInDelegate() 
+		{
+			IIntroductionAdvisor ia = new DefaultIntroductionAdvisor(new Test(EXPECTED_TIMESTAMP));
+		
+			TestObject target = new TestObject();
+			ProxyFactory pf = new ProxyFactory(target);
+			pf.AddIntroduction(0, ia);
+
+			ITimeStamped ts = (ITimeStamped) pf.GetProxy();
+		
+			Assert.IsTrue(ts.TimeStamp == EXPECTED_TIMESTAMP);
+			((ITest) ts).foo();
+		
+			int age = ((ITestObject) ts).Age;
+		}
+
+		/*
+		 * The rest of the tests in the original tested subclassing the
+		 * DelegatingIntroductionInterceptor.
+		 * 
+		 * Since we don't need to subclass anything to make a delegating
+		 * introduction, the rest of the tests are not necessary.
+		 */
+
+		// must be public to be used for AOP
+		// AOP creates a new assembly which must have access to the
+		// interfaces that it intends to expose.
+		public interface ITest 
+		{
+			void foo();
+		}
+
+		public interface ISubTimeStamped : ITimeStamped 
+		{
+		}
+
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/RegularExpressionMethodPointcutAdvisorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/RegularExpressionMethodPointcutAdvisorTests.cs
new file mode 100644
index 00000000..11a00b7e
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Support/RegularExpressionMethodPointcutAdvisorTests.cs
@@ -0,0 +1,135 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+using System;
+
+using Spring.Aop.Framework;
+using Spring.Aop.Interceptor;
+using Spring.Context.Support;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Xml;
+using Spring.Util;
+
+using NUnit.Framework;
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Unit tests for RegularExpressionMethodPointcutAdvisorTests.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	[TestFixture]
+	public class RegularExpressionMethodPointcutAdvisorTests
+	{
+        [TestFixtureSetUp]
+        public void FixtureSetUp()
+        {
+            SystemUtils.RegisterLoadedAssemblyResolver();
+        }
+
+		/// <summary>
+		/// Basic use case, a single pattern defined.
+		/// </summary>
+		[Test]
+		public void SinglePattern()
+		{
+			IObjectFactory iof = new XmlObjectFactory(new ReadOnlyXmlTestResource("RegularExpressionSetterTests.xml", GetType()));
+			IPerson advised = (IPerson) iof.GetObject("SettersAdvised");
+			// Interceptor behind regexp advisor
+			NopInterceptor nop = (NopInterceptor) iof.GetObject("NopInterceptor");
+			Assert.AreEqual(0, nop.Count);
+			
+			int newAge = 12;
+			// Not advised
+			advised.Exceptional(null);
+			Assert.AreEqual(0, nop.Count);
+			advised.SetAge(newAge);
+			Assert.AreEqual(newAge, advised.GetAge());
+			// Only setter fired
+			Assert.AreEqual(1, nop.Count);
+		}
+
+		/// <summary>
+		/// Multiple patterns defined within a single advisor.
+		/// </summary>
+		[Test]
+		public void MultiplePatterns()
+		{
+			IObjectFactory iof = new XmlObjectFactory(new ReadOnlyXmlTestResource("RegularExpressionSetterTests.xml", GetType()));
+			IPerson advised = (IPerson) iof.GetObject("SettersAndReturnsThisAdvised");
+			
+		    // Interceptor behind regexp advisor
+			NopInterceptor nop = (NopInterceptor) iof.GetObject("NopInterceptor");
+			Assert.AreEqual(0, nop.Count);
+		
+			int newAge = 12;
+			// Not advised
+			advised.Exceptional(null);
+			Assert.AreEqual(0, nop.Count);
+			
+			// This is proxied
+			advised.ReturnsThis();
+			Assert.AreEqual(1, nop.Count);
+			
+			// Only setter is advised
+		    advised.SetAge(newAge);
+			Assert.AreEqual(2, nop.Count);
+
+		    Assert.AreEqual(newAge, advised.GetAge());
+			Assert.AreEqual(2, nop.Count);
+		}
+
+		[Test]
+		public void Serialization()
+		{
+            IObjectFactory iof = new XmlObjectFactory(new ReadOnlyXmlTestResource("RegularExpressionSetterTests.xml", GetType()));
+			IPerson p = (IPerson) iof.GetObject("SerializableSettersAdvised");
+			// Interceptor behind regexp advisor
+			NopInterceptor nop = (NopInterceptor) iof.GetObject("NopInterceptor");
+			Assert.AreEqual(0, nop.Count);
+		
+			int newAge = 12;
+			// Not advised
+			Assert.AreEqual(0, p.GetAge());
+			Assert.AreEqual(0, nop.Count);
+			
+			// This is proxied
+			p.SetAge(newAge);
+			Assert.AreEqual(1, nop.Count);
+			p.SetAge(newAge);
+			Assert.AreEqual(newAge, p.GetAge());
+			// Only setter fired
+			Assert.AreEqual(2, nop.Count);
+			
+			// Serialize and continue...
+			p = (IPerson) SerializationTestUtils.SerializeAndDeserialize(p);
+			Assert.AreEqual(newAge, p.GetAge());
+			// Remembers count, but we need to get a new reference to nop...
+			nop = (SerializableNopInterceptor) ((IAdvised) p).Advisors[0].Advice;
+			Assert.AreEqual(2, nop.Count);
+			Assert.AreEqual("SerializableSettersAdvised", p.GetName());
+			p.SetAge(newAge + 1);
+			Assert.AreEqual(3, nop.Count);
+			Assert.AreEqual(newAge + 1, p.GetAge());
+		}
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/RootTypeFilterTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/RootTypeFilterTests.cs
new file mode 100644
index 00000000..445935ed
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Support/RootTypeFilterTests.cs
@@ -0,0 +1,46 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Unit tests for the RootTypeFilter class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: RootTypeFilterTests.cs,v 1.2 2006/04/09 07:19:06 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class RootTypeFilterTests
+    {
+        [Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+        public void InstantiationWithNullRootType()
+		{
+			new RootTypeFilter(null);
+        }
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/SdkRegularExpressionMethodPointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/SdkRegularExpressionMethodPointcutTests.cs
new file mode 100644
index 00000000..b113491f
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Support/SdkRegularExpressionMethodPointcutTests.cs
@@ -0,0 +1,139 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+using System;
+using System.Text.RegularExpressions;
+using Common.Logging;
+using Common.Logging.Simple;
+using NUnit.Framework;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Unit tests for the SdkRegularExpressionMethodPointcut class.
+	/// </summary>
+	/// <author>Dmitriy Kopylenko</author>
+	/// <author>Rick Evans (.NET)</author>
+	[TestFixture]
+	public sealed class SdkRegularExpressionMethodPointcutTests : AbstractRegularExpressionMethodPointcutTests
+	{
+        /// <summary>
+        /// The setup logic executed before the execution of this test fixture.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void FixtureSetUp()
+        {
+            // enable (null appender) logging, to ensure that the logging code is exercised
+            LogManager.Adapter = new NoOpLoggerFactoryAdapter(); 
+        }
+
+		/// <summary>
+		/// Returns the method pointcut implementation to be tested.
+		/// </summary>
+		/// <returns>The implementation.</returns>
+		protected override AbstractRegularExpressionMethodPointcut GetRegexpMethodPointcut() 
+		{
+			return new SdkRegularExpressionMethodPointcut();
+		}
+
+	    [Test]
+	    public void InstantiationViaSerialization()
+	    {
+	    	SdkRegularExpressionMethodPointcut initial = new SdkRegularExpressionMethodPointcut();
+            initial.Pattern = "Foo";
+	    	SdkRegularExpressionMethodPointcut pcut = (SdkRegularExpressionMethodPointcut) SerializationTestUtils.SerializeAndDeserialize(initial);
+            Assert.IsNotNull(pcut, "Deserialized instance must (obviously) not be null.");
+            Assert.AreEqual(initial.Pattern, pcut.Pattern, "Pattern property not deserialized correctly.");
+        }
+
+        /// <summary>
+        /// This exercises the logger after deserialization.
+        /// </summary>
+        [Test]
+        public void TryMatchesAfterSerialization()
+        {
+        	SdkRegularExpressionMethodPointcut initial = new SdkRegularExpressionMethodPointcut();
+            initial.Pattern = "Foo";
+        	SdkRegularExpressionMethodPointcut pcut = (SdkRegularExpressionMethodPointcut) SerializationTestUtils.SerializeAndDeserialize(initial);
+            Assert.IsNotNull(pcut, "Deserialized instance must (obviously) not be null.");
+            Type type = GetType();
+            bool isMatch = pcut.Matches(type.GetMethod("ForMatchingPurposesOnly"), type);
+            Assert.IsFalse(isMatch, "Whoops, should not be matching here at all.");
+        }
+
+        public void ForMatchingPurposesOnly ()
+        {
+        }
+	    
+	    [Test]
+        public void MixedPatternsAndDefaultOptions()
+	    {
+            Type type = GetType();
+            SdkRegularExpressionMethodPointcut pcut = new SdkRegularExpressionMethodPointcut();
+
+	        pcut.DefaultOptions = RegexOptions.None;
+            pcut.Patterns = new object[] {"forMatching*", new Regex("xyz*", RegexOptions.Compiled)};
+            Assert.IsFalse(pcut.Matches(type.GetMethod("ForMatchingPurposesOnly"), type));
+            
+	        pcut.DefaultOptions = RegexOptions.IgnoreCase;
+            pcut.Patterns = new object[] { "forMatching*", new Regex("xyz*", RegexOptions.Compiled) };
+            Assert.IsTrue(pcut.Matches(type.GetMethod("ForMatchingPurposesOnly"), type));
+
+	        pcut.DefaultOptions = RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace;
+            pcut.Patterns = new object[] { "for matc \nhing*", new Regex("xyz*", RegexOptions.Compiled) };
+            Assert.IsTrue(pcut.Matches(type.GetMethod("ForMatchingPurposesOnly"), type));
+        }
+
+        [ExpectedException(typeof(ArgumentNullException))]
+	    [Test]
+	    public void SetPatternToNull()
+	    {
+        	SdkRegularExpressionMethodPointcut pcut = new SdkRegularExpressionMethodPointcut();
+            pcut.Pattern = null;
+        }
+
+        [ExpectedException(typeof(ArgumentNullException))]
+        [Test]
+        public void SetPatternsPluralToNull()
+        {
+        	SdkRegularExpressionMethodPointcut pcut = new SdkRegularExpressionMethodPointcut();
+            pcut.Patterns = null;
+        }
+
+        [ExpectedException(typeof(ArgumentNullException))]
+        [Test]
+        public void SetPatternsPluralToStringArrayWithNullValue()
+        {
+        	SdkRegularExpressionMethodPointcut pcut = new SdkRegularExpressionMethodPointcut();
+            pcut.Patterns = new string[] { null };
+        }
+
+	    [Test]
+	    public void InstantiationWithSuppliedPattern()
+	    {
+	    	SdkRegularExpressionMethodPointcut pcut = new SdkRegularExpressionMethodPointcut("Foo");
+            Assert.AreEqual("Foo", pcut.Pattern, "Pattern supplied via the ctor was not set.");
+	    }
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/TypeFiltersTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/TypeFiltersTests.cs
new file mode 100644
index 00000000..5a2fc844
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Support/TypeFiltersTests.cs
@@ -0,0 +1,68 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Aop.Support
+{
+	/// <summary>
+	/// Unit tests for the TypeFilters class.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Choy Rim (.NET)</author>
+	/// <version>$Id: TypeFiltersTests.cs,v 1.2 2005/07/21 16:01:12 springboy Exp $</version>
+	[TestFixture]
+	public sealed class TypeFiltersTests
+	{
+		private ITypeFilter exceptionFilter = new RootTypeFilter(typeof (Exception));
+		private ITypeFilter itoFilter = new RootTypeFilter(typeof (ITestObject));
+		private ITypeFilter hasRootCauseFilter = new RootTypeFilter(typeof (StackOverflowException));
+
+		[Test]
+		public void Union()
+		{
+			Assert.IsTrue(exceptionFilter.Matches(typeof (SystemException)));
+			Assert.IsFalse(exceptionFilter.Matches(typeof (TestObject)));
+			Assert.IsFalse(itoFilter.Matches(typeof (Exception)));
+			Assert.IsTrue(itoFilter.Matches(typeof (TestObject)));
+			ITypeFilter union = TypeFilters.Union(exceptionFilter, itoFilter);
+			Assert.IsTrue(union.Matches(typeof (SystemException)));
+			Assert.IsTrue(union.Matches(typeof (TestObject)));
+		}
+
+		[Test]
+		public void Intersection()
+		{
+			Assert.IsTrue(exceptionFilter.Matches(typeof (SystemException)));
+			Assert.IsTrue(hasRootCauseFilter.Matches(typeof (StackOverflowException)));
+
+			ITypeFilter intersection = TypeFilters.Intersection(exceptionFilter, hasRootCauseFilter);
+			Assert.IsFalse(intersection.Matches(typeof (SystemException)));
+			Assert.IsFalse(intersection.Matches(typeof (TestObject)));
+			Assert.IsTrue(intersection.Matches(typeof (StackOverflowException)));
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/EmptyTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/EmptyTargetSourceTests.cs
new file mode 100644
index 00000000..048a63ba
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Target/EmptyTargetSourceTests.cs
@@ -0,0 +1,63 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// Unit tests for the EmptyTargetSource class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: EmptyTargetSourceTests.cs,v 1.2 2006/04/09 07:19:06 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class EmptyTargetSourceTests
+    {
+		[Test]
+		public void Deserialization()
+		{
+			ITargetSource deserializedVersion
+				= (ITargetSource) SerializationTestUtils.SerializeAndDeserialize(
+				EmptyTargetSource.Empty);
+			Assert.IsTrue(Object.ReferenceEquals(EmptyTargetSource.Empty, deserializedVersion),
+				"Singleton instance not being deserialized correctly");
+		}
+
+		[Test]
+		public void IsSerializable()
+		{
+			Assert.IsTrue(SerializationTestUtils.IsSerializable(EmptyTargetSource.Empty),
+				"EmptyTargetSource.Empty must be serializable.");
+		}
+
+		[Test]
+		public void IsStatic()
+		{
+			Assert.IsTrue(EmptyTargetSource.Empty.IsStatic, "Must be static.");
+		}
+    }
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/HotSwappableTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/HotSwappableTargetSourceTests.cs
new file mode 100644
index 00000000..76141c8e
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Target/HotSwappableTargetSourceTests.cs
@@ -0,0 +1,124 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// Unit tests for the HotSwappableTargetSource class.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Federico Spinazzi (.NET)</author>
+	/// <version>$Id: HotSwappableTargetSourceTests.cs,v 1.4 2006/04/09 07:19:06 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class HotSwappableTargetSourceTests
+	{
+		/// <summary>Initial count value set in Object factory XML </summary>
+		private const int INITIAL_COUNT = 10;
+
+		private IObjectFactory ObjectFactory;
+
+		[SetUp]
+		public void SetUp()
+		{
+			this.ObjectFactory = new XmlObjectFactory(
+				new ReadOnlyXmlTestResource("hotSwapTests.xml", GetType()));
+		}
+
+		/// <summary>
+		/// We must simulate container shutdown, which should clear threads.
+		/// </summary>
+		[TearDown]
+		public void TearDown()
+		{
+			this.ObjectFactory.Dispose();
+		}
+
+		[Test]
+		[Category("Integration")]
+		public void ValidSwaps()
+		{
+			ISideEffectObject target1 = (ISideEffectObject) ObjectFactory.GetObject("target1");
+			ISideEffectObject target2 = (ISideEffectObject) ObjectFactory.GetObject("target2");
+
+			ISideEffectObject proxied = (ISideEffectObject) ObjectFactory.GetObject("swappable");
+			//	assertEquals(target1, ((Advised) proxied).getTarget());
+			Assert.AreEqual(target1.Count, proxied.Count);
+			proxied.doWork();
+			Assert.AreEqual(INITIAL_COUNT + 1, proxied.Count);
+
+			HotSwappableTargetSource swapper = (HotSwappableTargetSource) ObjectFactory.GetObject("swapper");
+			Object old = swapper.Swap(target2);
+			Assert.AreEqual(target1, old, "Correct old target was returned");
+
+			// TODO should be able to make this assertion: need to fix target handling
+			// in AdvisedSupport
+			//assertEquals(target2, ((Advised) proxied).getTarget());
+
+			Assert.AreEqual(20, proxied.Count);
+			proxied.doWork();
+			Assert.AreEqual(21, target2.Count);
+
+			// Swap it back
+			swapper.Swap(target1);
+			Assert.AreEqual(target1.Count, proxied.Count);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void RejectsSwapToNull()
+		{
+			HotSwappableTargetSource source = new HotSwappableTargetSource(null);
+			source.Swap(null);
+		}
+
+		[Test]
+		public void SwapDoesIndeedReturnTheOldTarget()
+		{
+			HotSwappableTargetSource source = new HotSwappableTargetSource(this);
+			object foo = source.Swap(new SideEffectObject());
+			Assert.IsTrue(object.ReferenceEquals(this, foo),
+				"Swap() is not returning the old target.");
+		}
+
+		[Test]
+		public void InstantiationWithNullIsOk()
+		{
+			new HotSwappableTargetSource(null);
+		}
+
+		[Test]
+		public void InstantiationWithInitialTarget()
+		{
+			HotSwappableTargetSource source = new HotSwappableTargetSource(this);
+			object foo = source.GetTarget();
+			Assert.IsTrue(object.ReferenceEquals(this, foo),
+				"Ctor is not storing the supplied target.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs
new file mode 100644
index 00000000..c0d21c45
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs
@@ -0,0 +1,141 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Common.Logging;
+using Common.Logging.Simple;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// Unit tests for the PrototypeTargetSource class.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Federico Spinazzi</author>
+	/// <version>$Id: PrototypeTargetSourceTests.cs,v 1.8 2007/07/28 07:33:22 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class PrototypeTargetSourceTests
+	{
+		/// <summary>
+		/// The setup logic executed before the execution of this test fixture.
+		/// </summary>
+		[TestFixtureSetUp]
+		public void FixtureSetUp()
+		{
+			// enable (null appender) logging, just to ensure that the logging code is correct
+            LogManager.Adapter = new NoOpLoggerFactoryAdapter(); 
+		}
+
+        /// <summary>
+        ///  Test that multiple invocations of the prototype object will result
+        ///  in no change to visible state, as a new instance is used.
+        ///  With the singleton, there will be change.
+        /// </summary>
+        [Test]
+        public void PrototypeAndSingletonBehaveDifferently()
+        {
+            int initialCount = 10;
+            IObjectFactory of = new XmlObjectFactory(new ReadOnlyXmlTestResource("prototypeTargetSourceTests.xml", GetType()));
+            ISideEffectObject singleton = (ISideEffectObject) of.GetObject("singleton");
+            Assert.AreEqual(initialCount, singleton.Count);
+            singleton.doWork();
+            Assert.AreEqual(initialCount + 1, singleton.Count);
+
+            ISideEffectObject prototype = (ISideEffectObject) of.GetObject("prototype");
+            Assert.AreEqual(initialCount, prototype.Count);
+            singleton.doWork();
+            Assert.AreEqual(initialCount, prototype.Count);
+
+            ISideEffectObject prototypeByName = (ISideEffectObject) of.GetObject("prototypeByName");
+            Assert.AreEqual(initialCount, prototypeByName.Count);
+            singleton.doWork();
+            Assert.AreEqual(initialCount, prototypeByName.Count);
+        }
+
+		[Test]
+		public void TargetType()
+		{
+			SideEffectObject target = new SideEffectObject();
+			IDynamicMock mock = new DynamicMock(typeof (IObjectFactory));
+			mock.ExpectAndReturn("IsPrototype", true);
+			mock.ExpectAndReturn("GetType", typeof(SideEffectObject));
+			PrototypeTargetSource source = new PrototypeTargetSource();
+			source.ObjectFactory = (IObjectFactory) mock.Object;
+			Assert.AreEqual(target.GetType(), source.TargetType, "Wrong TargetType being returned.");
+			mock.Verify();
+		}
+
+		[Test]
+		public void IsStatic()
+		{
+			PrototypeTargetSource source = new PrototypeTargetSource();
+			Assert.IsFalse(source.IsStatic, "Must not be static.");
+		}
+
+		[Test]
+		public void WithNonSingletonTargetObject()
+		{
+			IDynamicMock mock = new DynamicMock(typeof (IObjectFactory));
+			const string objectName = "Foo";
+			mock.ExpectAndReturn("IsPrototype", false, objectName);
+			PrototypeTargetSource source = new PrototypeTargetSource();
+			source.TargetObjectName = objectName;
+			try
+			{
+				source.ObjectFactory = (IObjectFactory) mock.Object;
+				Assert.Fail("Should have thrown an ObjectDefinitionStoreException by this point.");
+			}
+			catch (ObjectDefinitionStoreException)
+			{
+				mock.Verify();
+			}
+		}
+
+		[Test]
+		public void GetTarget()
+		{
+			SideEffectObject target = new SideEffectObject();
+			IDynamicMock mock = new DynamicMock(typeof (IObjectFactory));
+			mock.ExpectAndReturn("IsPrototype", true);
+			mock.ExpectAndReturn("GetObject", target);
+			PrototypeTargetSource source = new PrototypeTargetSource();
+			source.ObjectFactory = (IObjectFactory) mock.Object;
+			Assert.IsTrue(object.ReferenceEquals(source.GetTarget(), target),
+			              "Initial target source reference not being returned by GetTarget().");
+			mock.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void AfterPropertiesSetWithoutTargetObjectNameBeingSet()
+		{
+			PrototypeTargetSource source = new PrototypeTargetSource();
+			source.AfterPropertiesSet();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/SimplePoolTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/SimplePoolTargetSourceTests.cs
new file mode 100644
index 00000000..9426db2d
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Target/SimplePoolTargetSourceTests.cs
@@ -0,0 +1,96 @@
+using NUnit.Framework;
+using Spring.Aop.Target;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Xml;
+/*
+* Copyright 2002-2004 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.
+*/
+namespace Spring.Aop.Target
+{
+	
+	/// <summary> Tests for pooling invoker interceptor
+	/// TODO need to make these tests stronger: it's hard to
+	/// make too many assumptions about a pool
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Federico Spinazzi (.Net)</author>
+	/// <version>  $Id: SimplePoolTargetSourceTests.cs,v 1.3 2006/02/08 08:31:05 aseovic Exp $
+	/// </version>
+    [TestFixture]
+    public class SimplePoolTargetSourceTests
+	{
+		
+		/// <summary>Initial count value set in Object factory XML </summary>
+		private const int INITIAL_COUNT = 10;
+		
+		private XmlObjectFactory objectFactory;
+	
+        [SetUp]
+		public void SetUp()
+		{
+			objectFactory = new XmlObjectFactory(new ReadOnlyXmlTestResource("simplePoolTests.xml", GetType()));
+		}
+		
+		/// <summary> We must simulate container shutdown, which should clear threads.</summary>
+		[TearDown]
+		public void TearDown()
+		{
+			// Will call pool.close()
+			this.objectFactory.Dispose();
+		}
+		
+		private void  Functionality(System.String name)
+		{
+			ISideEffectObject pooled = (ISideEffectObject) objectFactory.GetObject(name);
+			Assert.AreEqual(INITIAL_COUNT, pooled.Count);
+			pooled.doWork();
+			Assert.AreEqual(INITIAL_COUNT + 1, pooled.Count);
+			
+			pooled = (ISideEffectObject) objectFactory.GetObject(name);
+			// Just check that it works--we can't make assumptions
+			// about the count
+			pooled.doWork();
+			//Assert.AreEqual(INITIAL_COUNT + 1, pooled.Count );
+		}
+		
+		[Test]
+        public virtual void  Functionality()
+		{
+			Functionality("pooled");
+		}
+		
+        [Test]
+		public virtual void  FunctionalityWithNoInterceptors()
+		{
+			Functionality("pooledNoInterceptors");
+		}
+		
+        [Test]
+		public virtual void  ConfigMixin()
+		{
+			ISideEffectObject pooled = (ISideEffectObject) objectFactory.GetObject("pooledWithMixin");
+			Assert.AreEqual(INITIAL_COUNT, pooled.Count);
+			PoolingConfig conf = (PoolingConfig) objectFactory.GetObject("pooledWithMixin");
+			// TODO one invocation from setup
+			// assertEquals(1, conf.getInvocations());
+			pooled.doWork();
+			//	assertEquals("No objects active", 0, conf.getActive());
+			Assert.AreEqual(25, conf.MaxSize, "Correct target source");
+			//		assertTrue("Some free", conf.getFree() > 0);
+			//assertEquals(2, conf.getInvocations());
+			Assert.AreEqual(25, conf.MaxSize);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/SingletonTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/SingletonTargetSourceTests.cs
new file mode 100644
index 00000000..1ead5fa5
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Target/SingletonTargetSourceTests.cs
@@ -0,0 +1,82 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Aop.Target
+{
+	/// <summary>
+	/// Unit tests for the SingletonTargetSource class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: SingletonTargetSourceTests.cs,v 1.2 2006/04/09 07:19:06 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class SingletonTargetSourceTests
+	{
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void InstantiationWithNullTargetSource()
+		{
+			new SingletonTargetSource(null);
+		}
+
+		[Test]
+		public void TargetType()
+		{
+			SingletonTargetSource source = new SingletonTargetSource(this);
+			Assert.AreEqual(GetType(), source.TargetType, "Wrong TargetType being returned.");
+		}
+
+		[Test]
+		public void IsStatic()
+		{
+			SingletonTargetSource source = new SingletonTargetSource(this);
+			Assert.IsTrue(source.IsStatic, "Must be static.");
+		}
+
+		[Test]
+		public void GetTarget()
+		{
+			SingletonTargetSource source = new SingletonTargetSource(this);
+			Assert.IsTrue(object.ReferenceEquals(source.GetTarget(), this),
+				"Same target source reference not being returned by GetTarget().");
+		}
+
+		[Test]
+		public void EqualsSameInstance()
+		{
+			SingletonTargetSource lhs = new SingletonTargetSource(this);
+			SingletonTargetSource rhs = new SingletonTargetSource(this);
+			Assert.AreEqual(lhs, rhs, "Equals() not correct for same instance comparison.");
+		}
+
+		[Test]
+		public void EqualsNullInstance()
+		{
+			SingletonTargetSource lhs = new SingletonTargetSource(this);
+			Assert.IsFalse(lhs.Equals(null), "Equals() not correct for null instance comparison.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/ThreadLocalTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/ThreadLocalTargetSourceTests.cs
new file mode 100644
index 00000000..90898a57
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/Target/ThreadLocalTargetSourceTests.cs
@@ -0,0 +1,158 @@
+/*
+* Copyright 2002-2004 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.
+*/
+using System;
+using System.IO;
+using System.Reflection;
+using System.Threading;
+using Common.Logging;
+using NUnit.Framework;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Xml;
+
+namespace Spring.Aop.Target
+{
+    /// <author>Rod Johnson</author>
+    /// <author>Federico Spinazzi</author>
+    /// <version>  $Id: ThreadLocalTargetSourceTests.cs,v 1.5 2006/11/13 07:04:51 markpollack Exp $
+    /// </version>
+    [TestFixture]
+    public class ThreadLocalTargetSourceTests
+    {
+        /// <summary>Initial count value set in Object factory XML </summary>
+        private const int INITIAL_COUNT = 10;
+
+        private XmlObjectFactory ObjectFactory;
+
+        private ILog log;
+
+        [SetUp]
+        public void SetUp ()
+        {
+            this.ObjectFactory = new XmlObjectFactory (
+                new ReadOnlyXmlTestResource ("threadLocalTests.xml", GetType ()));
+            //TODO-LOGGING XmlConfigurator.Configure (new FileInfo ("Spring.Aop.Tests.dll.config"));
+            log = LogManager.GetLogger (MethodBase.GetCurrentMethod ().DeclaringType);
+        }
+
+        /// <summary> We must simulate container shutdown, which should clear threads.</summary>
+        [TearDown]
+        public void TearDown ()
+        {
+            this.ObjectFactory.Dispose ();
+        }
+
+        /// <summary> Check we can use two different ThreadLocalTargetSources
+        /// managing objects of different types without them interfering
+        /// with one another.
+        /// </summary>
+        [Test]
+        public virtual void UseDifferentManagedInstancesInSameThread ()
+        {
+            ISideEffectObject apartment = (ISideEffectObject) ObjectFactory.GetObject ("apartment");
+            Assert.AreEqual (INITIAL_COUNT, apartment.Count);
+            apartment.doWork ();
+            Assert.AreEqual (INITIAL_COUNT + 1, apartment.Count);
+
+            ITestObject test = (ITestObject) ObjectFactory.GetObject ("threadLocal2");
+            Assert.AreEqual ("Rod", test.Name);
+            Assert.AreEqual ("Kerry", test.Spouse.Name);
+        }
+
+        [Test]
+        public virtual void ReuseInSameThread ()
+        {
+            ISideEffectObject apartment = (ISideEffectObject) ObjectFactory.GetObject ("apartment");
+            Assert.AreEqual (INITIAL_COUNT, apartment.Count);
+            apartment.doWork ();
+            Assert.AreEqual (INITIAL_COUNT + 1, apartment.Count);
+
+            apartment = (ISideEffectObject) ObjectFactory.GetObject ("apartment");
+            Assert.AreEqual (INITIAL_COUNT + 1, apartment.Count);
+        }
+
+        /// <summary> Relies on introduction
+        /// 
+        /// </summary>
+        [Test]
+        public virtual void CanGetStatsViaMixinIfThereIsAnInterceptorTakingCareOfThem ()
+        {
+            IThreadLocalTargetSourceStats stats = (IThreadLocalTargetSourceStats) ObjectFactory.GetObject ("apartment");
+            Assert.AreEqual (0, stats.Invocations);
+            ISideEffectObject apartment = (ISideEffectObject) ObjectFactory.GetObject ("apartment");
+            apartment.doWork ();
+            Assert.AreEqual (1, stats.Invocations);
+            Assert.AreEqual (0, stats.Hits);
+            apartment.doWork ();
+            Assert.AreEqual (2, stats.Invocations);
+            Assert.AreEqual (1, stats.Hits);
+            // Only one thread so only one object can have been bound
+            Assert.AreEqual (1, stats.Objects);
+        }
+
+
+        public class Runner
+        {
+            private ILog log = LogManager.GetLogger (MethodBase.GetCurrentMethod ().DeclaringType);
+            private ThreadLocalTargetSourceTests factory;
+            public ISideEffectObject mine;
+
+            public Runner (ThreadLocalTargetSourceTests enclosingInstance)
+            {
+                this.factory = enclosingInstance;
+            }
+
+            public virtual void Run ()
+            {
+                log.Debug ("getting object");
+                this.mine = (ISideEffectObject) factory.ObjectFactory.GetObject ("apartment");
+                log.Debug (String.Format ("got object; hash code: {0}", this.mine.GetHashCode ()));
+                Assert.AreEqual (ThreadLocalTargetSourceTests.INITIAL_COUNT, mine.Count);
+                mine.doWork ();
+                Assert.AreEqual (ThreadLocalTargetSourceTests.INITIAL_COUNT + 1, mine.Count);
+            }
+        }
+
+        [Test]
+        public virtual void NewThreadHasOwnInstance ()
+        {
+            ISideEffectObject apartment = (ISideEffectObject) ObjectFactory.GetObject ("apartment");
+            log.Debug (String.Format ("got object; hash code: {0}", apartment.GetHashCode ()));
+            Assert.AreEqual (INITIAL_COUNT, apartment.Count);
+            apartment.doWork ();
+            apartment.doWork ();
+            apartment.doWork ();
+            Assert.AreEqual (INITIAL_COUNT + 3, apartment.Count);
+
+            Runner r = new Runner (this);
+            Thread t = new Thread (new ThreadStart (r.Run));
+            t.Start ();
+            t.Join ();
+
+            Assert.IsNotNull (r);
+
+            // Check it didn't affect the other thread's copy
+            Assert.AreEqual (INITIAL_COUNT + 3, apartment.Count);
+
+            // When we use other thread's copy in this thread 
+            // it should behave like ours
+            Assert.AreEqual (INITIAL_COUNT + 3, r.mine.Count);
+
+            // Bound to two threads
+            Assert.AreEqual (2, ((IThreadLocalTargetSourceStats) apartment).Objects);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/TrueMethodMatcherTests.cs b/test/Spring/Spring.Aop.Tests/Aop/TrueMethodMatcherTests.cs
new file mode 100644
index 00000000..0522e392
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/TrueMethodMatcherTests.cs
@@ -0,0 +1,78 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Unit tests for the TrueMethodMatcher class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: TrueMethodMatcherTests.cs,v 1.3 2006/04/09 07:19:06 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class TrueMethodMatcherTests
+    {
+		[Test]
+		public void Deserialization()
+		{
+			IMethodMatcher deserializedVersion
+				= (IMethodMatcher) SerializationTestUtils.SerializeAndDeserialize(
+				TrueMethodMatcher.True);
+			Assert.IsTrue(Object.ReferenceEquals(TrueMethodMatcher.True, deserializedVersion),
+				"Singleton instance not being deserialized correctly");
+		}
+
+		[Test]
+		public void IsSerializable()
+		{
+			Assert.IsTrue(SerializationTestUtils.IsSerializable(TrueMethodMatcher.True),
+				"TrueMethodMatcher must be serializable.");
+		}
+
+		[Test]
+		public void AlwaysMatchesEvenOnNullArguments()
+		{
+			Assert.IsTrue(TrueMethodMatcher.True.Matches(null, null),
+				"Must always match (return true).");
+		}
+
+		[Test]
+		public void AlwaysMatches()
+		{
+			Assert.IsTrue(TrueMethodMatcher.True.Matches(
+				(MethodInfo) MethodBase.GetCurrentMethod(), GetType()),
+				"Must always match (return true).");
+		}
+
+		[Test]
+		public void IsRuntime()
+		{
+			Assert.IsFalse(TrueMethodMatcher.True.IsRuntime, "Must NOT be runtime.");
+		}
+    }
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/TruePointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/TruePointcutTests.cs
new file mode 100644
index 00000000..92710dc8
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/TruePointcutTests.cs
@@ -0,0 +1,57 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Unit tests for the TruePointcut class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: TruePointcutTests.cs,v 1.2 2006/04/09 07:19:06 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class TruePointcutTests
+    {
+		[Test]
+		public void Deserialization()
+		{
+			IPointcut deserializedVersion
+				= (IPointcut) SerializationTestUtils.SerializeAndDeserialize(
+				TruePointcut.True);
+			Assert.IsTrue(Object.ReferenceEquals(TruePointcut.True, deserializedVersion),
+				"Singleton instance not being deserialized correctly");
+		}
+
+		[Test]
+		public void IsSerializable()
+		{
+			Assert.IsTrue(SerializationTestUtils.IsSerializable(TruePointcut.True),
+				"TruePointcut must be serializable.");
+		}
+	}
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/TrueTypeFilterTests.cs b/test/Spring/Spring.Aop.Tests/Aop/TrueTypeFilterTests.cs
new file mode 100644
index 00000000..79848407
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aop/TrueTypeFilterTests.cs
@@ -0,0 +1,75 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Aop
+{
+	/// <summary>
+	/// Unit tests for the TrueTypeFilter class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: TrueTypeFilterTests.cs,v 1.3 2006/04/09 07:19:06 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class TrueTypeFilterTests
+	{
+		[Test]
+		public void Deserialization()
+		{
+			ITypeFilter deserializedVersion
+				= (ITypeFilter) SerializationTestUtils.SerializeAndDeserialize(
+					TrueTypeFilter.True);
+			Assert.IsTrue(Object.ReferenceEquals(TrueTypeFilter.True, deserializedVersion),
+			              "Singleton instance not being deserialized correctly");
+		}
+
+		[Test]
+		public void IsSerializable()
+		{
+			Assert.IsTrue(SerializationTestUtils.IsSerializable(TrueTypeFilter.True),
+			              "TrueClassFilter must be serializable.");
+		}
+
+		[Test]
+		public void AlwaysMatchesEvenOnNullArgument()
+		{
+			Assert.IsTrue(TrueTypeFilter.True.Matches(null),
+			              "Must always match (return true).");
+		}
+
+		[Test]
+		public void AlwaysMatches()
+		{
+			Assert.IsTrue(TrueTypeFilter.True.Matches(GetType()),
+			              "Must always match (return true).");
+		}
+		[Test]
+			public void ToStringAlwaysTrue()
+		{
+			Assert.AreEqual("TrueTypeFilter.True", TrueTypeFilter.True.ToString() );
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/AopExceptionTests.cs b/test/Spring/Spring.Aop.Tests/AopExceptionTests.cs
new file mode 100644
index 00000000..0637d707
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/AopExceptionTests.cs
@@ -0,0 +1,46 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring
+{
+    /// <summary>
+    /// Unit tests for all of the exception classes in the Spring.Aop library...
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: AopExceptionTests.cs,v 1.3 2006/04/09 07:19:04 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class AopExceptionTests : ExceptionsTest
+    {
+        [TestFixtureSetUp]
+        public void FixtureSetUp ()
+        {
+            AssemblyToCheck = Assembly.GetAssembly (typeof (Spring.Aop.TruePointcut));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs
new file mode 100644
index 00000000..41ec6a54
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs
@@ -0,0 +1,140 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using NUnit.Framework;
+using Spring.Aop.Framework;
+using Spring.Caching;
+using Spring.Context;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Aspects.Cache
+{
+    /// <summary>
+    /// Unit tests for the CacheParameterAdvice class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CacheAspectIntegrationTests.cs,v 1.4 2007/08/03 14:38:39 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class CacheAspectIntegrationTests
+    {
+        private IApplicationContext context;
+        private CacheAspect cacheAspect;
+        private ICache cache;
+
+        [SetUp]
+        public void SetUp()
+        {
+            cache = new NonExpiringCache();
+
+            context = new XmlApplicationContext();
+            ((IConfigurableApplicationContext) context).ObjectFactory.RegisterSingleton("inventors", cache);
+
+            cacheAspect = new CacheAspect();
+            cacheAspect.ApplicationContext = context;
+        }
+
+        [Test]
+        public void TestCaching()
+        {
+            ProxyFactory pf = new ProxyFactory(new InventorStore());
+            pf.AddAdvisors(cacheAspect);
+
+            IInventorStore store = (IInventorStore) pf.GetProxy();
+
+            Assert.AreEqual(0, cache.Count);
+            
+            IList inventors = store.GetAll();
+            Assert.AreEqual(2, cache.Count);
+
+            store.Delete((Inventor) inventors[0]);
+            Assert.AreEqual(1, cache.Count);
+
+            Inventor tesla = store.Load("Nikola Tesla");
+            Assert.AreEqual(2, cache.Count);
+
+            store.Save(tesla);
+            Assert.AreEqual(2, cache.Count);
+            Assert.AreEqual("Serbian", ((Inventor)cache.Get("Nikola Tesla")).Nationality);
+
+            store.DeleteAll();
+            Assert.AreEqual(0, cache.Count);
+        }
+    }
+
+    #region Inner Class : CacheParameterTarget
+
+    public interface IInventorStore
+    {
+        IList GetAll();
+        Inventor Load(string name);
+        void Save(Inventor inventor);
+        void Delete(Inventor inventor);
+        void DeleteAll();
+    }
+
+    public sealed class InventorStore : IInventorStore
+    {
+        private IDictionary inventors = new ListDictionary();
+
+        public InventorStore()
+        {
+            Inventor tesla = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), null);
+            Inventor pupin = new Inventor("Mihajlo Pupin", new DateTime(1854, 10, 9), null);
+            inventors.Add("Nikola Tesla", tesla);
+            inventors.Add("Mihajlo Pupin", pupin);
+        }
+
+        [CacheResultItems("inventors", "Name")]
+        public IList GetAll()
+        {
+            return new ArrayList(inventors.Values);
+        }
+
+        [CacheResult("inventors", "#name")]
+        public Inventor Load(string name)
+        {
+            return (Inventor) inventors[name];
+        }
+
+        public void Save([CacheParameter("inventors", "Name")] Inventor inventor)
+        {
+            inventor.Nationality = "Serbian";
+        }
+
+        [InvalidateCache("inventors", Keys = "#inventor.Name")]
+        public void Delete(Inventor inventor)
+        {
+        }
+
+        [InvalidateCache("inventors")]
+        public void DeleteAll()
+        {
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs
new file mode 100644
index 00000000..890768bc
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs
@@ -0,0 +1,143 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Caching;
+using Spring.Context;
+
+#endregion
+
+namespace Spring.Aspects.Cache
+{
+    /// <summary>
+    /// Unit tests for the CacheParameterAdvice class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CacheParameterAdviceTests.cs,v 1.6 2007/04/01 15:05:33 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class CacheParameterAdviceTests
+    {
+        private IDynamicMock mockContext;
+        private CacheParameterAdvice advice;
+        private ICache cache;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mockContext = new DynamicMock(typeof (IApplicationContext));
+
+            advice = new CacheParameterAdvice();
+            advice.ApplicationContext = (IApplicationContext) mockContext.Object;
+
+            cache = new NonExpiringCache();
+        }
+
+        [Test]
+        public void TestSimpleParameterCaching()
+        {
+            MethodInfo method = typeof(SimpleCacheParameterTarget).GetMethod("Save");
+            object[] args = new object[] {new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian")};
+
+            ExpectCacheInstanceRetrieval("cache", cache);
+
+            // parameter value should be added to cache
+            advice.AfterReturning(null, method, args, null);
+            Assert.AreEqual(1, cache.Count);
+            Assert.AreEqual(args[0], cache.Get("Nikola Tesla"));
+
+            mockContext.Verify();
+        }
+
+        [Test]
+        public void TestMultipleParameterCaching()
+        {
+            MethodInfo method = typeof(MultipleCacheParameterTarget).GetMethod("Save");
+            object[] args = new object[] { new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian") };
+
+            ExpectCacheInstanceRetrieval("cache", cache);
+            ExpectCacheInstanceRetrieval("cache", cache);      
+
+            // parameter value should be added to both cache
+            advice.AfterReturning(null, method, args, null);
+            Assert.AreEqual(2, cache.Count);
+            Assert.AreEqual(args[0], cache.Get("Nikola Tesla"));
+            Assert.AreEqual(args[0], cache.Get("Serbian"));
+
+            mockContext.Verify();
+        }
+
+        [Test]
+        public void TestConditionParameterCaching()
+        {
+            MethodInfo method = typeof(ConditionCacheParameterTarget).GetMethod("Save");
+            object[] args = new object[] { new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian") };
+
+            // parameter value should not be added to cache
+            advice.AfterReturning(null, method, args, null);
+            Assert.AreEqual(0, cache.Count);
+
+            mockContext.Verify();
+        }
+
+        #region Helper methods
+
+        private void ExpectCacheInstanceRetrieval(string cacheName, ICache cache)
+        {
+            mockContext.ExpectAndReturn("GetObject", cache, cacheName);
+        }
+
+        #endregion
+    }
+
+    #region Inner Class : CacheParameterTarget
+
+    public interface ICacheParameterTarget
+    {
+        void Save(Inventor inventor);
+    }
+
+    public sealed class SimpleCacheParameterTarget : ICacheParameterTarget
+    {
+        public void Save([CacheParameter("cache", "Name")] Inventor inventor)
+        {
+        }
+    }
+
+    public sealed class MultipleCacheParameterTarget : ICacheParameterTarget
+    {
+        public void Save([CacheParameter("cache", "Name")][CacheParameter("cache", "Nationality")] Inventor inventor)
+        {
+        }
+    }
+
+    public sealed class ConditionCacheParameterTarget : ICacheParameterTarget
+    {
+        public void Save([CacheParameter("cache", "Name", Condition = "Nationality == 'French'")] Inventor inventor)
+        {
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs
new file mode 100644
index 00000000..b0076038
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs
@@ -0,0 +1,394 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+using System.Reflection;
+using AopAlliance.Intercept;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Caching;
+using Spring.Context;
+
+#endregion
+
+namespace Spring.Aspects.Cache
+{
+    /// <summary>
+    /// Unit tests for the CacheResultAdvice class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CacheResultAdviceTests.cs,v 1.4 2007/08/22 20:16:51 oakinger Exp $</version>
+    [TestFixture]
+    public sealed class CacheResultAdviceTests
+    {
+        private IDynamicMock mockInvocation;
+        private IDynamicMock mockContext;
+        private CacheResultAdvice advice;
+        private ICache resultCache;
+        private ICache itemCache;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mockInvocation = new DynamicMock(typeof(IMethodInvocation));
+            mockContext = new DynamicMock(typeof(IApplicationContext));
+
+            advice = new CacheResultAdvice();
+            advice.ApplicationContext = (IApplicationContext) mockContext.Object;
+
+            resultCache = new NonExpiringCache();
+            itemCache = new NonExpiringCache();
+        }
+
+        /// <summary>
+        /// Change History:
+        /// 2007-08-22 (oakinger): changed behaviour to cache null values as well
+        /// </summary>
+        [Test]
+        public void CacheResultOfMethodThatReturnsNull()
+        {
+            MethodInfo method = typeof(CacheResultTarget).GetMethod("ReturnsNothing");
+            object expectedReturnValue = null;
+
+            ExpectAttributeRetrieval(method);
+            ExpectCacheKeyGeneration(method, null);
+            ExpectCacheInstanceRetrieval("results", resultCache);
+            ExpectCallToProceed(expectedReturnValue);
+
+            // check that the null retVal is cached as well - it might be 
+            // the result of an expensive webservice/database call etc.
+            object returnValue = advice.Invoke((IMethodInvocation) mockInvocation.Object);
+            Assert.AreEqual(expectedReturnValue, returnValue);
+            Assert.AreEqual(1, resultCache.Count);
+
+            mockInvocation.Verify();
+            mockContext.Verify();
+        }
+
+        [Test]
+        public void CacheResultOfMethodThatReturnsObject()
+        {
+            MethodInfo method = typeof(CacheResultTarget).GetMethod("ReturnsScalar");
+            object expectedReturnValue = CacheResultTarget.Scalar;
+
+            ExpectAttributeRetrieval(method);
+            ExpectCacheKeyGeneration(method, null);
+            ExpectCacheInstanceRetrieval("results", resultCache);
+            ExpectCallToProceed(expectedReturnValue);
+
+            // return value should be added to cache
+            object returnValue = advice.Invoke((IMethodInvocation) mockInvocation.Object);
+            Assert.AreEqual(expectedReturnValue, returnValue);
+            Assert.AreEqual(1, resultCache.Count);
+
+            // and again, but without Proceed()...
+            ExpectAttributeRetrieval(method);
+            ExpectCacheKeyGeneration(method, null);
+            ExpectCacheInstanceRetrieval("results", resultCache);
+
+            // cached value should be returned
+            object cachedValue = advice.Invoke((IMethodInvocation) mockInvocation.Object);
+            Assert.AreEqual(expectedReturnValue, cachedValue);
+            Assert.AreEqual(1, resultCache.Count);
+            Assert.AreSame(returnValue, cachedValue);
+
+            mockInvocation.Verify();
+            mockContext.Verify();
+        }
+
+        [Test]
+        public void CacheResultOfMethodThatReturnsCollection()
+        {
+            MethodInfo method = typeof(CacheResultTarget).GetMethod("ReturnsCollection");
+            object expectedReturnValue = new object[] {"one", "two", "three"};
+
+            ExpectAttributeRetrieval(method);
+            ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
+            ExpectCacheInstanceRetrieval("results", resultCache);
+            ExpectCallToProceed(new object[] { "one", "two", "three" });
+
+            // return value should be added to cache
+            object returnValue = advice.Invoke((IMethodInvocation)mockInvocation.Object);
+            Assert.AreEqual(expectedReturnValue, returnValue);
+            Assert.AreEqual(1, resultCache.Count);
+
+            // and again, but without Proceed()...
+            ExpectAttributeRetrieval(method);
+            ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
+            ExpectCacheInstanceRetrieval("results", resultCache);
+
+            // cached value should be returned
+            object cachedValue = advice.Invoke((IMethodInvocation)mockInvocation.Object);
+            Assert.AreEqual(expectedReturnValue, cachedValue);
+            Assert.AreNotSame(expectedReturnValue, cachedValue);
+            Assert.AreEqual(expectedReturnValue, resultCache.Get(5));
+            Assert.AreEqual(1, resultCache.Count);
+            Assert.AreSame(returnValue, cachedValue);
+            Assert.AreSame(cachedValue, resultCache.Get(5));
+
+            mockInvocation.Verify();
+            mockContext.Verify();
+        }
+
+        [Test]
+        public void CacheResultAndItemsOfMethodThatReturnsCollection()
+        {
+            MethodInfo method = typeof(CacheResultTarget).GetMethod("ReturnsCollectionAndItems");
+            object expectedReturnValue = new object[] { "one", "two", "three" };
+
+            ExpectAttributeRetrieval(method);
+            ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
+            ExpectCacheInstanceRetrieval("results", resultCache);
+            ExpectCallToProceed(new object[] { "one", "two", "three" });
+            ExpectCacheInstanceRetrieval("items", itemCache);
+
+            // return value should be added to result cache and each item to item cache
+            object returnValue = advice.Invoke((IMethodInvocation)mockInvocation.Object);
+            Assert.AreEqual(expectedReturnValue, returnValue);
+            Assert.AreEqual(1, resultCache.Count);
+            Assert.AreEqual(3, itemCache.Count);
+
+            // and again, but without Proceed() and item cache access...
+            ExpectAttributeRetrieval(method);
+            ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
+            ExpectCacheInstanceRetrieval("results", resultCache);
+
+            // cached value should be returned
+            object cachedValue = advice.Invoke((IMethodInvocation)mockInvocation.Object);
+            Assert.AreEqual(expectedReturnValue, cachedValue);
+            Assert.AreNotSame(expectedReturnValue, cachedValue);
+            Assert.AreEqual(expectedReturnValue, resultCache.Get(5));
+            Assert.AreEqual(1, resultCache.Count);
+            Assert.AreEqual(3, itemCache.Count);
+            Assert.AreSame(returnValue, cachedValue);
+            Assert.AreSame(cachedValue, resultCache.Get(5));
+
+            mockInvocation.Verify();
+            mockContext.Verify();
+        }
+
+        [Test]
+        public void CacheOnlyItemsOfMethodThatReturnsCollection()
+        {
+            MethodInfo method = typeof(CacheResultTarget).GetMethod("ReturnsItems");
+            object expectedReturnValue = new object[] { "one", "two", "three" };
+
+            ExpectAttributeRetrieval(method);
+            ExpectCallToProceed(new object[] { "one", "two", "three" });
+            ExpectCacheInstanceRetrieval("items", itemCache);
+
+            // return value should be added to result cache and each item to item cache
+            object returnValue = advice.Invoke((IMethodInvocation)mockInvocation.Object);
+            Assert.AreEqual(expectedReturnValue, returnValue);
+            Assert.AreEqual(0, resultCache.Count);
+            Assert.AreEqual(3, itemCache.Count);
+
+            // and again, but without Proceed() and item cache access...
+            ExpectAttributeRetrieval(method);
+            ExpectCallToProceed(new object[] { "one", "two", "three" });
+            ExpectCacheInstanceRetrieval("items", itemCache);
+
+            // new return value should be returned
+            object newReturnValue = advice.Invoke((IMethodInvocation)mockInvocation.Object);
+            Assert.AreEqual(expectedReturnValue, newReturnValue);
+            Assert.AreEqual(0, resultCache.Count);
+            Assert.AreEqual(3, itemCache.Count);
+            Assert.AreEqual("two", itemCache.Get("two"));
+            Assert.AreNotSame(returnValue, newReturnValue);
+
+            mockInvocation.Verify();
+            mockContext.Verify();
+        }
+
+        [Test]
+        public void CacheOnlyItemsOfMethodThatReturnsCollectionWithinTwoDifferentCaches()
+        {
+            MethodInfo method = typeof(CacheResultTarget).GetMethod("MultipleCacheResultItems");
+            object expectedReturnValue = new object[] { "one", "two", "three" };
+
+            ExpectAttributeRetrieval(method);
+            ExpectCallToProceed(new object[] { "one", "two", "three" });
+            ExpectCacheInstanceRetrieval("items", itemCache);
+            ExpectCacheInstanceRetrieval("items", itemCache);
+
+            // return value should be added to result cache and each item to item cache
+            object returnValue = advice.Invoke((IMethodInvocation)mockInvocation.Object);
+            Assert.AreEqual(expectedReturnValue, returnValue);
+            Assert.AreEqual(0, resultCache.Count);
+            Assert.AreEqual(6, itemCache.Count);
+
+            // and again, but without Proceed() and item cache access...
+            ExpectAttributeRetrieval(method);
+            ExpectCallToProceed(new object[] { "one", "two", "three" });
+            ExpectCacheInstanceRetrieval("items", itemCache);
+            ExpectCacheInstanceRetrieval("items", itemCache);
+
+            // new return value should be returned
+            object newReturnValue = advice.Invoke((IMethodInvocation)mockInvocation.Object);
+            Assert.AreEqual(expectedReturnValue, newReturnValue);
+            Assert.AreEqual(0, resultCache.Count);
+            Assert.AreEqual(6, itemCache.Count);
+            Assert.AreEqual("two", itemCache.Get("two"));
+            Assert.AreEqual("two", itemCache.Get("TWO"));
+            Assert.AreNotSame(returnValue, newReturnValue);
+
+            mockInvocation.Verify();
+            mockContext.Verify();
+        }
+
+        [Test]
+        public void CacheOnlyItemsOfMethodThatReturnsCollectionOnCondition()
+        {
+            MethodInfo method = typeof(CacheResultTarget).GetMethod("CacheResultItemsWithCondition");
+            object expectedReturnValue = new object[] { "one", "two", "three" };
+
+            ExpectAttributeRetrieval(method);
+            ExpectCallToProceed(new object[] { "one", "two", "three" });
+            ExpectCacheInstanceRetrieval("items", itemCache);
+
+            // return value should be added to result cache and each item to item cache
+            object returnValue = advice.Invoke((IMethodInvocation)mockInvocation.Object);
+            Assert.AreEqual(expectedReturnValue, returnValue);
+            Assert.AreEqual(2, itemCache.Count);
+            Assert.AreEqual("two", itemCache.Get("two"));
+            Assert.AreEqual("three", itemCache.Get("three"));
+
+            mockInvocation.Verify();
+            mockContext.Verify();
+        }
+
+        [Test]
+        public void CacheResultOfMethodThatReturnsCollectionOnCondition()
+        {
+            MethodInfo method = typeof(CacheResultTarget).GetMethod("CacheResultWithCondition");
+            object expectedReturnValue = new object[] { };
+
+            ExpectAttributeRetrieval(method);
+            ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
+            ExpectCacheInstanceRetrieval("results", resultCache);
+            ExpectCallToProceed(new object[] { });
+
+            // return value should not be added to cache
+            object returnValue = advice.Invoke((IMethodInvocation)mockInvocation.Object);
+            Assert.AreEqual(expectedReturnValue, returnValue);
+            Assert.AreEqual(0, resultCache.Count);
+
+            mockInvocation.Verify();
+            mockContext.Verify();
+        }
+
+
+        #region Helper methods
+
+        private void ExpectAttributeRetrieval(MethodInfo method)
+        {
+            mockInvocation.ExpectAndReturn("Method", method);
+            mockInvocation.ExpectAndReturn("Method", method);
+        }
+
+        private void ExpectCacheKeyGeneration(MethodInfo method, params object[] arguments)
+        {
+            mockInvocation.ExpectAndReturn("Method", method);
+            mockInvocation.ExpectAndReturn("Arguments", arguments);
+        }
+
+        private void ExpectCacheInstanceRetrieval(string cacheName, ICache cache)
+        {
+            mockContext.ExpectAndReturn("GetObject", cache, cacheName);
+        }
+
+        private void ExpectCallToProceed(object expectedReturnValue)
+        {
+            mockInvocation.ExpectAndReturn("Proceed", expectedReturnValue);
+        }
+
+        #endregion
+
+    }
+
+    #region Inner Class : CacheResultTarget
+
+    public interface ICacheResultTarget
+    {
+        void ReturnsNothing();
+        int ReturnsScalar();
+        ICollection ReturnsCollection(int key, params object[] elements);
+        ICollection ReturnsCollectionAndItems(int key, params object[] elements);
+        ICollection ReturnsItems(int key, params object[] elements);
+    }
+
+    public sealed class CacheResultTarget : ICacheResultTarget
+    {
+        public const int Scalar = int.MaxValue;
+
+        [CacheResult("results", "'key'")]
+        public void ReturnsNothing()
+        {
+        }
+
+        [CacheResult("results", "'key'")]
+        public int ReturnsScalar()
+        {
+            return Scalar;
+        }
+
+        [CacheResult("results", "#key")]
+        public ICollection ReturnsCollection(int key, params object[] elements)
+        {
+            return elements;
+        }
+
+        [CacheResult("results", "#key")]
+        [CacheResultItems("items", "#this")]
+        public ICollection ReturnsCollectionAndItems(int key, params object[] elements)
+        {
+            return elements;
+        }
+
+        [CacheResultItems("items", "#this")]
+        public ICollection ReturnsItems(int key, params object[] elements)
+        {
+            return elements;
+        }
+
+        [CacheResultItems("items", "#this")]
+        [CacheResultItems("items", "#this.ToUpper()")]
+        public ICollection MultipleCacheResultItems(int key, params object[] elements)
+        {
+            return elements;
+        }
+
+        [CacheResultItems("items", "#this", Condition="#this.StartsWith('t')")]
+        public ICollection CacheResultItemsWithCondition(int key, params object[] elements)
+        {
+            return elements;
+        }
+
+        [CacheResult("results", "#key", Condition="#this.Length > 0")]
+        public ICollection CacheResultWithCondition(int key, params object[] elements)
+        {
+            return elements;
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs
new file mode 100644
index 00000000..c1c4f814
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs
@@ -0,0 +1,189 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Caching;
+using Spring.Context;
+
+#endregion
+
+namespace Spring.Aspects.Cache
+{
+    /// <summary>
+    /// Unit tests for the InvalidateCacheAdvice class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: InvalidateCacheAdviceTests.cs,v 1.4 2007/04/01 15:05:34 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class InvalidateCacheAdviceTests
+    {
+        private IDynamicMock mockContext;
+        private InvalidateCacheAdvice advice;
+        private ICache cache;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mockContext = new DynamicMock(typeof (IApplicationContext));
+
+            advice = new InvalidateCacheAdvice();
+            advice.ApplicationContext = (IApplicationContext) mockContext.Object;
+
+            cache = new NonExpiringCache();
+            cache.Insert(1, "one");
+            cache.Insert(2, "two");
+            cache.Insert(3, "three");
+        }
+
+        [Test]
+        public void TestSingleKeyInvalidation()
+        {
+            MethodInfo method = typeof(InvalidateCacheTarget).GetMethod("InvalidateSingle");
+            object[] args = new object[] { 2 };
+
+            ExpectCacheInstanceRetrieval("cache", cache);
+
+            Assert.AreEqual(3, cache.Count);
+
+            // item "two" should be removed from cache
+            advice.AfterReturning(null, method, args, null);
+            Assert.AreEqual(2, cache.Count);
+            Assert.IsNull(cache.Get(2));
+
+            mockContext.Verify();
+        }
+
+        [Test]
+        public void TestMultiKeyInvalidation()
+        {
+            MethodInfo method = typeof(InvalidateCacheTarget).GetMethod("InvalidateMulti");
+            object[] args = new object[] { 2 };
+
+            ExpectCacheInstanceRetrieval("cache", cache);
+
+            Assert.AreEqual(3, cache.Count);
+
+            // all items except item "two" should be removed from cache
+            advice.AfterReturning(null, method, args, null);
+            Assert.AreEqual(1, cache.Count);
+            Assert.AreEqual("two", cache.Get(2));
+
+            mockContext.Verify();
+        }
+
+        [Test]
+        public void TestWholeCacheInvalidation()
+        {
+            MethodInfo method = typeof(InvalidateCacheTarget).GetMethod("InvalidateAll");
+
+            ExpectCacheInstanceRetrieval("cache", cache);
+
+            Assert.AreEqual(3, cache.Count);
+
+            // all items should be removed from cache
+            advice.AfterReturning(null, method, null, null);
+            Assert.AreEqual(0, cache.Count);
+
+            mockContext.Verify();
+        }
+
+        [Test]
+        public void TestMultipleCachesInvalidation()
+        {
+            MethodInfo method = typeof(InvalidateCacheTarget).GetMethod("InvalidateMultipleCaches");
+            object[] args = new object[] { 2 };
+
+            ExpectCacheInstanceRetrieval("cache", cache);
+            ExpectCacheInstanceRetrieval("cache", cache);
+
+            Assert.AreEqual(3, cache.Count);
+
+            // item "two" should be removed from cache
+            // all items except item "two" should be removed from cache
+            advice.AfterReturning(null, method, args, null);
+            Assert.AreEqual(0, cache.Count);
+
+            mockContext.Verify();
+        }
+
+        [Test]
+        public void TestConditionInvalidation()
+        {
+            MethodInfo method = typeof(InvalidateCacheTarget).GetMethod("InvalidateWithCondition");
+            object[] args = new object[] { 3 };
+
+            Assert.AreEqual(3, cache.Count);
+
+            // no items should be removed from cache
+            advice.AfterReturning(null, method, args, null);
+            Assert.AreEqual(3, cache.Count);
+            Assert.AreEqual("three", cache.Get(3));
+
+            mockContext.Verify();
+        }
+
+        #region Helper methods
+
+        private void ExpectCacheInstanceRetrieval(string cacheName, ICache cache)
+        {
+            mockContext.ExpectAndReturn("GetObject", cache, cacheName);
+        }
+
+        #endregion
+    }
+
+    #region Inner Class : InvalidateCacheTarget
+
+    public sealed class InvalidateCacheTarget
+    {
+        [InvalidateCache("cache", Keys = "#key")]
+        public void InvalidateSingle(int key)
+        {
+        }
+
+        [InvalidateCache("cache", Keys = "{1, 2, 3} - { #key }")]
+        public void InvalidateMulti(int key)
+        {
+        }
+
+        [InvalidateCache("cache")]
+        public void InvalidateAll()
+        {
+        }
+
+        [InvalidateCache("cache", Keys = "#key")]
+        [InvalidateCache("cache", Keys = "{1, 2, 3} - { #key }")]
+        public void InvalidateMultipleCaches(int key)
+        {
+        }
+
+        [InvalidateCache("cache", Keys = "{1, 2, 3} - { #key }", Condition="#key != 3")]
+        public void InvalidateWithCondition(int key)
+        {
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs
new file mode 100644
index 00000000..834efa56
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs
@@ -0,0 +1,336 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using Common.Logging;
+using Common.Logging.Simple;
+using NUnit.Framework;
+using Spring.Aop.Framework;
+using Spring.Aspects.Exceptions;
+using Spring.Expressions;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Aspects.Exceptions
+{
+    /// <summary>
+    /// This class contains tests for ExceptionHandlerAdvice
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: ExceptionHandlerAspectIntegrationTests.cs,v 1.6 2008/02/26 00:03:43 markpollack Exp $</version>
+    [TestFixture]
+    public class ExceptionHandlerAspectIntegrationTests
+    {
+        private ExceptionHandlerAdvice exceptionHandlerAdvice;
+
+        [SetUp]
+        public void Setup()
+        {
+            LogManager.Adapter = new ConsoleOutLoggerFactoryAdapter(new NameValueCollection());
+            exceptionHandlerAdvice = new ExceptionHandlerAdvice();
+        }
+
+        [Test]
+        public void LoggingTest()
+        {
+
+
+            LogExceptionHandler logHandler = new LogExceptionHandler();
+            string testText = @"#log.Debug('Hello World, exception message = ' + #e.Message + ', target method = ' + #method.Name)";
+            logHandler.SourceExceptionNames.Add("ArithmeticException");
+            logHandler.ActionExpressionText = testText;
+
+            exceptionHandlerAdvice.ExceptionHandlers.Add(logHandler);
+            
+            ProxyFactory pf = new ProxyFactory(new TestObject());
+            pf.AddAdvice(exceptionHandlerAdvice);
+            ITestObject to = (ITestObject) pf.GetProxy();
+
+            try
+            {
+                to.Exceptional(new ArithmeticException());
+                Assert.Fail("Should have thrown exception when only logging");
+            } catch (ArithmeticException)
+            {
+                //TODO need to create adapter implementation to replay logged text.
+            }
+
+        }
+
+        [Test]
+        public void LoggingTestWithString()
+        {
+            string logHandlerText = "on exception name ArithmeticException log 'My Message, Method Name ' + #method.Name";
+
+            ExecuteLoggingHandler(logHandlerText);
+        }
+
+
+        [Test]
+        public void LoggingTestWithConstraintExpression()
+        {
+            string logHandlerText = "on exception (#e is T(System.ArithmeticException)) log 'My Message, Method Name ' + #method.Name";
+
+            ExecuteLoggingHandler(logHandlerText);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void LoggingTestWithBadString()
+        {
+            string logHandlerText = "on foobar name ArithmeticException log 'My Message, Method Name ' + #method.Name";
+
+            ExecuteLoggingHandler(logHandlerText);
+        }
+
+        [Test]
+        public void LoggingTestWithInvalidConstraintExpression()
+        {
+            string logHandlerText = "on exception (#e is System.FooBar) log 'My Message, Method Name ' + #method.Name";
+
+            ExecuteLoggingHandler(logHandlerText);
+            
+            //No exception is expected.  
+
+            //TODO need to make sure log statement was executed.
+        }
+
+        [Test]
+        public void LoggingTestWithNonBooleanConstraintExpression()
+        {
+            string logHandlerText = "on exception (1+1) log 'My Message, Method Name ' + #method.Name";
+
+            ExecuteLoggingHandler(logHandlerText);
+
+            //No exception is expected.  
+
+            //TODO need to make sure log statement was executed.
+        }
+
+        private void ExecuteLoggingHandler(string logHandlerText)
+        {
+            ITestObject to = CreateTestObjectProxy(logHandlerText);
+
+            try
+            {
+                to.Exceptional(new ArithmeticException());
+            }
+            catch (ArithmeticException)
+            {
+                //TODO assert logging occured.
+            }
+        }
+
+
+
+        [Test]
+        public void TranslationWithString()
+        {
+            string translationHandlerText =
+                "on exception name ArithmeticException translate new System.InvalidOperationException('My Message, Method Name ' + #method.Name, #e)";
+
+            ITestObject to = CreateTestObjectProxy(translationHandlerText);
+            try
+            {
+                to.Exceptional(new ArithmeticException("Bad Math"));
+                Assert.Fail("Should have thrown exception");
+            }
+            catch (InvalidOperationException e)
+            {
+                Assert.IsInstanceOfType(typeof(ArithmeticException), e.InnerException, "Inner exception.");
+                Assert.AreEqual("My Message, Method Name Exceptional", e.Message);
+            } catch (Exception e)
+            {
+                Assert.IsInstanceOfType(typeof(InvalidOperationException), e, "wrong exception type thrown.");
+            }
+        }
+
+        [Test]
+        public void WrapWithString()
+        {
+            string translationHandlerText =
+                "on exception name ArithmeticException wrap System.InvalidOperationException 'My Message'";
+
+            ITestObject to = CreateTestObjectProxy(translationHandlerText);
+            try
+            {
+                to.Exceptional(new ArithmeticException("Bad Math"));
+                Assert.Fail("Should have thrown exception");
+            }
+            catch (InvalidOperationException e)
+            {
+                Assert.IsInstanceOfType(typeof(ArithmeticException), e.InnerException);
+                Assert.AreEqual("My Message", e.Message);
+            }
+            catch (Exception e)
+            {
+                Assert.IsInstanceOfType(typeof(InvalidOperationException), e);
+            }
+        }
+
+        [Test]
+        public void WrapWithStringDefaultMessage()
+        {
+            string translationHandlerText =
+                "on exception name ArithmeticException wrap System.InvalidOperationException";
+
+            ITestObject to = CreateTestObjectProxy(translationHandlerText);
+            try
+            {
+                to.Exceptional(new ArithmeticException("Bad Math"));
+                Assert.Fail("Should have thrown exception");
+            }
+            catch (InvalidOperationException e)
+            {
+                Assert.IsInstanceOfType(typeof(ArithmeticException), e.InnerException);
+                Assert.AreEqual("Wrapped ArithmeticException", e.Message);
+            }
+            catch (Exception e)
+            {
+                Assert.IsInstanceOfType(typeof(InvalidOperationException), e);
+            }
+        }
+
+
+        [Test]
+        public void ReplaceWithString()
+        {
+            string translationHandlerText =
+                "on exception name ArithmeticException replace System.InvalidOperationException 'My Message'";
+
+            ITestObject to = CreateTestObjectProxy(translationHandlerText);
+            try
+            {
+                to.Exceptional(new ArithmeticException("Bad Math"));
+                Assert.Fail("Should have thrown exception");
+            }
+            catch (InvalidOperationException e)
+            {
+                Assert.IsNull(e.InnerException);
+                Assert.AreEqual("My Message", e.Message);
+            }
+            catch (Exception e)
+            {
+                Assert.IsInstanceOfType(typeof(InvalidOperationException), e);
+            }
+        }
+
+        [Test]
+        public void ReplaceWithStringDefaultMessage()
+        {
+            string translationHandlerText =
+                "on exception name ArithmeticException replace System.InvalidOperationException";
+
+            ITestObject to = CreateTestObjectProxy(translationHandlerText);
+            try
+            {
+                to.Exceptional(new ArithmeticException("Bad Math"));
+                Assert.Fail("Should have thrown exception");
+            }
+            catch (InvalidOperationException e)
+            {
+                Assert.IsNull(e.InnerException);
+                Assert.AreEqual("Replaced ArithmeticException", e.Message);
+            }
+            catch (Exception e)
+            {
+                Assert.IsInstanceOfType(typeof(InvalidOperationException), e);
+            }
+        }
+
+        [Test]
+        public void SwallowWithString()
+        {
+            string returnHandlerText = "on exception name ArithmeticException swallow";
+            ITestObject to = CreateTestObjectProxy(returnHandlerText);
+            try
+            {
+                to.Exceptional(new ArithmeticException("Bad Math"));                
+            } catch (Exception)
+            {
+                Assert.Fail("Should not have thrown exception");   
+            }
+        }
+
+
+        [Test]
+        public void ReturnWithString()
+        {
+            string returnHandlerText = "on exception name ArithmeticException return 12";
+            ITestObject to = CreateTestObjectProxy(returnHandlerText);
+            try
+            {
+                int retVal = to.ExceptionalWithReturnValue(new ArithmeticException("Bad Math"));
+                Assert.AreEqual(12, retVal);
+            }
+            catch (Exception)
+            {
+                Assert.Fail("Should not have thrown exception");
+            }
+        }
+
+        [Test]
+        public void ChainLogAndWrap()
+        {
+            string logHandlerText = "on exception name ArithmeticException log 'My Message, Method Name ' + #method.Name";
+            string translationHandlerText = "on exception name ArithmeticException wrap System.InvalidOperationException 'My Message'";
+            exceptionHandlerAdvice.ExceptionHandlers.Add(logHandlerText);
+            exceptionHandlerAdvice.ExceptionHandlers.Add(translationHandlerText);
+            exceptionHandlerAdvice.AfterPropertiesSet();
+            ProxyFactory pf = new ProxyFactory(new TestObject());
+            pf.AddAdvice(exceptionHandlerAdvice);
+            ITestObject to = (ITestObject)pf.GetProxy();
+            try
+            {
+                to.Exceptional(new ArithmeticException("Bad Math"));
+                Assert.Fail("Should have thrown exception");
+            }
+            catch (InvalidOperationException e)
+            {
+                Assert.IsNotNull(e.InnerException);
+                Exception innerEx = e.InnerException;
+                Assert.AreEqual("My Message", e.Message);
+                Assert.AreEqual("Bad Math", innerEx.Message);
+            }
+            catch (Exception e)
+            {
+                Assert.IsInstanceOfType(typeof(InvalidOperationException), e);
+            }
+
+
+        }
+
+        private ITestObject CreateTestObjectProxy(string logHandlerText)
+        {
+            exceptionHandlerAdvice.ExceptionHandlers.Add(logHandlerText);
+            exceptionHandlerAdvice.AfterPropertiesSet();
+
+            ProxyFactory pf = new ProxyFactory(new TestObject());
+            pf.AddAdvice(exceptionHandlerAdvice);
+            return (ITestObject)pf.GetProxy();
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs
new file mode 100644
index 00000000..bfb1983c
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs
@@ -0,0 +1,190 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Text;
+using AopAlliance.Intercept;
+using Common.Logging;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+#endregion
+
+namespace Spring.Aspects.Logging
+{
+    /// <summary>
+    /// This class contains tests for SimpleLoggingAdvice
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: SimpleLoggingAdviceTests.cs,v 1.4 2008/04/04 14:59:47 bbaia Exp $</version>
+    [TestFixture]
+    public class SimpleLoggingAdviceTests
+    {
+        private MockRepository mocks;
+
+        [SetUp]
+        public void Setup()
+        {
+            mocks = new MockRepository();
+        }
+
+        [Test]
+        public void SunnyDayLoggingCorrectly()
+        {
+            ILog log = (ILog)mocks.CreateMock(typeof(ILog));
+            IMethodInvocation methodInvocation = (IMethodInvocation)mocks.CreateMock(typeof(IMethodInvocation));
+
+            MethodInfo mi = typeof(string).GetMethod("ToString", Type.EmptyTypes);
+            //two additional calls the method are to retrieve the method name on entry/exit...
+            Expect.Call(methodInvocation.Method).Return(mi).Repeat.Any();
+
+            Expect.Call(log.IsTraceEnabled).Return(true).Repeat.Any();
+            log.Trace("Entering ToString");
+            
+            Expect.Call(methodInvocation.Proceed()).Return(null);
+
+            log.Trace("Exiting ToString");
+            
+            mocks.ReplayAll();
+
+            TestableSimpleLoggingAdvice loggingAdvice = new TestableSimpleLoggingAdvice(true);
+            loggingAdvice.CallInvokeUnderLog(methodInvocation, log);
+
+            mocks.VerifyAll();
+
+        }
+
+        [Test]
+        public void SunnyDayLoggingCorrectlyDebugLevel()
+        {
+            ILog log = (ILog)mocks.CreateMock(typeof(ILog));
+            IMethodInvocation methodInvocation = (IMethodInvocation)mocks.CreateMock(typeof(IMethodInvocation));
+
+            MethodInfo mi = typeof(string).GetMethod("ToString", Type.EmptyTypes);
+            //two additional calls the method are to retrieve the method name on entry/exit...
+            Expect.Call(methodInvocation.Method).Return(mi).Repeat.Any();
+
+            Expect.Call(log.IsTraceEnabled).Return(false).Repeat.Any();
+            Expect.Call(log.IsDebugEnabled).Return(true).Repeat.Any();
+            log.Debug("Entering ToString");
+            
+            Expect.Call(methodInvocation.Proceed()).Return(null);
+
+            log.Debug("Exiting ToString");
+
+            mocks.ReplayAll();
+
+            TestableSimpleLoggingAdvice loggingAdvice = new TestableSimpleLoggingAdvice(true);
+            loggingAdvice.LogLevel = LogLevel.Debug;
+            Assert.IsTrue(loggingAdvice.CallIsInterceptorEnabled(methodInvocation, log));
+            loggingAdvice.CallInvokeUnderLog(methodInvocation, log);
+
+            mocks.VerifyAll();
+
+        }
+
+
+        [Test]
+        public void ExceptionPathStillLogsCorrectly()
+        {
+            ILog log = (ILog)mocks.CreateMock(typeof(ILog));
+            IMethodInvocation methodInvocation = (IMethodInvocation)mocks.CreateMock(typeof(IMethodInvocation));
+
+            MethodInfo mi = typeof(string).GetMethod("ToString", Type.EmptyTypes);
+            //two additional calls the method are to retrieve the method name on entry/exit...
+            Expect.Call(methodInvocation.Method).Return(mi).Repeat.Any();
+
+            Expect.Call(log.IsTraceEnabled).Return(true).Repeat.Any();
+            log.Trace("Entering...");
+
+            LastCall.On(log).IgnoreArguments();
+
+            Exception e = new ArgumentException("bad value");
+            Expect.Call(methodInvocation.Proceed()).Throw(e);
+
+            log.Trace("Exception...", e);
+            LastCall.On(log).IgnoreArguments();
+
+            mocks.ReplayAll();
+
+            TestableSimpleLoggingAdvice loggingAdvice = new TestableSimpleLoggingAdvice(true);
+            try
+            {
+                loggingAdvice.CallInvokeUnderLog(methodInvocation, log);
+                Assert.Fail("Must have propagated the IllegalArgumentException.");
+            }
+            catch (ArgumentException)
+            {
+
+            }
+
+            mocks.VerifyAll();
+
+        }
+
+
+        [Test]
+        public void SunnyDayLoggingAllOptionalInformationCorrectly()
+        {
+            ILog log = (ILog)mocks.CreateMock(typeof(ILog));
+            IMethodInvocation methodInvocation = (IMethodInvocation)mocks.CreateMock(typeof(IMethodInvocation));
+
+            MethodInfo mi = typeof(Dog).GetMethod("Bark");
+            //two additional calls the method are to retrieve the method name on entry/exit...
+            Expect.Call(methodInvocation.Method).Return(mi).Repeat.Any();
+            int[] luckyNumbers = new int[]{1, 2, 3};
+            object[] args = new object[] {"hello", luckyNumbers};
+
+
+            Expect.Call(methodInvocation.Arguments).Return(args);
+
+            Expect.Call(log.IsTraceEnabled).Return(true).Repeat.Any();
+            log.Trace("Entering...");
+            LastCall.IgnoreArguments();
+
+            Expect.Call(methodInvocation.Proceed()).Return(4);
+
+            log.Trace("Exiting...");
+            LastCall.IgnoreArguments();
+
+            mocks.ReplayAll();
+
+            TestableSimpleLoggingAdvice loggingAdvice = new TestableSimpleLoggingAdvice(true);
+            loggingAdvice.LogExecutionTime = true;
+            loggingAdvice.LogMethodArguments = true;
+            loggingAdvice.LogUniqueIdentifier = true;
+
+            loggingAdvice.CallInvokeUnderLog(methodInvocation, log);
+
+            mocks.VerifyAll();
+        }
+    }  
+  
+    public class Dog 
+    {
+        public int Bark(string message, int[] luckyNumbers)
+        {
+            return 4;
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Logging/TestableSimpleLoggingAdvice.cs b/test/Spring/Spring.Aop.Tests/Aspects/Logging/TestableSimpleLoggingAdvice.cs
new file mode 100644
index 00000000..c83fea8b
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Logging/TestableSimpleLoggingAdvice.cs
@@ -0,0 +1,71 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 AopAlliance.Intercept;
+using Common.Logging;
+
+namespace Spring.Aspects.Logging
+{
+    /// <summary>
+    /// This is simple wrapper to expose the protected methood InvokeUnderLog in the class
+    /// SimpleLoggingAdvice for testing purposes.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: TestableSimpleLoggingAdvice.cs,v 1.2 2007/12/06 17:17:24 markpollack Exp $</version>
+    public class TestableSimpleLoggingAdvice : SimpleLoggingAdvice
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TestableSimpleLoggingAdvice"/> class.
+        /// </summary>
+        /// <param name="useDynamicLogger">if set to <c>true</c> [use dynamic logger].</param>
+        public TestableSimpleLoggingAdvice(bool useDynamicLogger) : base(useDynamicLogger)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TestableSimpleLoggingAdvice"/> class.
+        /// </summary>
+        public TestableSimpleLoggingAdvice()
+        {
+        }
+
+        /// <summary>
+        /// Calls the protected InvokeUnderLog method
+        /// </summary>
+        /// <param name="invocation">The invocation.</param>
+        /// <param name="log">The log.</param>
+        /// <returns>The result of the call to IMethodInvocation.Proceed()</returns>
+        public object CallInvokeUnderLog(IMethodInvocation invocation, ILog log)
+        {
+            return InvokeUnderLog(invocation, log);
+        }
+
+        /// <summary>
+        /// Calls the IsInterceptorEnabled method.
+        /// </summary>
+        /// <param name="invocation">The invocation.</param>
+        /// <param name="log">The log.</param>
+        /// <returns>The result of the protected method IsInterceptorEnabled</returns>
+        public bool CallIsInterceptorEnabled(IMethodInvocation invocation, ILog log)
+        {
+            return IsInterceptorEnabled(invocation, log);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/RetryAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/RetryAdviceTests.cs
new file mode 100644
index 00000000..326a597a
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aspects/RetryAdviceTests.cs
@@ -0,0 +1,176 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Aop.Framework;
+
+#endregion
+
+namespace Spring.Aspects
+{
+    /// <summary>
+    /// This class contains tests for RetryAdvice
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: RetryAdviceTests.cs,v 1.3 2008/03/17 20:25:41 markpollack Exp $</version>
+    [TestFixture]
+    public class RetryAdviceTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+        }
+
+        [Test]
+        public void TestSunnyDay()
+        {
+            InvokeOncePassOnceFail(false, false);
+            InvokeOncePassOnceFail(false, true);
+            InvokeOncePassOnceFail(true, false);
+            InvokeOncePassOnceFail(true, true);
+
+        }
+
+        [Test]
+        public void TestUnexpectedException()
+        {
+            InvokeOnceFailWithUnexceptedException(false, false);
+        }
+
+        private static void InvokeOncePassOnceFail(bool useExceptionName, bool isDelay)
+        {
+            ITestRemoteService rs = GetRemoteService(2, useExceptionName, isDelay);
+
+            rs.DoTransfer();
+
+            rs = GetRemoteService(3, useExceptionName, isDelay);
+            try
+            {
+                rs.DoTransfer();
+                Assert.Fail("Should have failed.");
+            } catch (ArithmeticException)
+            {
+                
+            }
+        }
+        private static void InvokeOnceFailWithUnexceptedException(bool useExceptionName, bool isDelay)
+        {
+            ITestRemoteService rs = GetRemoteService(3, useExceptionName, isDelay);
+            try
+            {
+                rs.DoTransfer2();
+                Assert.Fail("Should have failed.");
+            }
+            catch (ArgumentException)
+            {
+
+            }
+        }
+
+        private static ITestRemoteService GetRemoteService(int numFailures, bool usingExceptionName, bool isDelay)
+        {
+            TestRemoteService remoteService = new TestRemoteService();
+            remoteService.NumFailures = numFailures;
+            ProxyFactory factory = new ProxyFactory(remoteService);
+            RetryAdvice retryAdvice = new RetryAdvice();
+            if (usingExceptionName)
+            {
+                if (isDelay)
+                {
+                    retryAdvice.RetryExpression = "on exception name ArithmeticException retry 3x delay 1s";
+                }
+                else
+                {
+                    retryAdvice.RetryExpression = "on exception name ArithmeticException retry 3x rate (1*#n + 0.5)";
+                }
+            }
+            else
+            {
+                if (isDelay)
+                {
+                    retryAdvice.RetryExpression = "on exception (#e is T(System.ArithmeticException)) retry 3x delay 1s";
+                }
+                else
+                {
+                    retryAdvice.RetryExpression = "on exception (#e is T(System.ArithmeticException)) retry 3x rate (1*#n + 0.5)";
+                }
+            }
+            retryAdvice.AfterPropertiesSet();
+            factory.AddAdvice(retryAdvice);
+            ITestRemoteService rs = factory.GetProxy() as ITestRemoteService;
+            Assert.IsNotNull(rs);
+            return rs;
+        }
+    }
+
+    public interface ITestRemoteService
+    {
+        void DoTransfer();
+        void DoTransfer2();
+    }
+
+    public class TestRemoteService : ITestRemoteService
+    {
+        private int numFailures;
+        private int count = 0;
+        private bool throwArithmeticException = false;
+
+
+        public int NumFailures
+        {
+            get { return numFailures; }
+            set { numFailures = value; }
+        }
+
+        public bool ThrowArithmeticException
+        {
+            get
+            {
+
+                if (count < NumFailures)
+                {
+                    count++;
+                    return true;
+                }
+                else
+                {
+                    return throwArithmeticException;
+                }
+            }
+            set { throwArithmeticException = value; }
+        }
+
+        public void DoTransfer()
+        {
+            if (ThrowArithmeticException)
+            {
+                throw new ArithmeticException("can't do the math");
+            }
+        }
+
+        public void DoTransfer2()
+        {
+            throw new ArgumentException("bad argument");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs
new file mode 100644
index 00000000..e34b9a8b
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs
@@ -0,0 +1,113 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Validation;
+using Spring.Validation.Actions;
+
+#endregion
+
+namespace Spring.Aspects.Validation
+{
+    /// <summary>
+    /// Unit tests for the CacheParameterAdvice class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ParameterValidationAdviceTests.cs,v 1.2 2008/04/02 23:00:46 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class ParameterValidationAdviceTests
+    {
+        private IDynamicMock mockContext;
+        private ParameterValidationAdvice advice;
+        private RequiredValidator requiredValidator;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mockContext = new DynamicMock(typeof (IApplicationContext));
+
+            advice = new ParameterValidationAdvice();
+            advice.ApplicationContext = (IApplicationContext) mockContext.Object;
+
+            requiredValidator = new RequiredValidator();
+            requiredValidator.Actions.Add(new ErrorMessageAction("error.required", "errors"));
+        }
+
+        [Test]
+        public void TestValidArgument()
+        {
+            MethodInfo method = typeof(ValidationTarget).GetMethod("Save");
+            Inventor inventor = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            ValidationTarget target = new ValidationTarget();
+            object[] args = new object[] {inventor};
+
+            ExpectValidatorRetrieval("required", requiredValidator);
+            advice.Before(method, args, target);
+            method.Invoke(target, args);
+
+            Assert.AreEqual("NIKOLA TESLA", inventor.Name);
+
+            mockContext.Verify();
+        }
+
+        [Test]
+        [ExpectedException(typeof(ValidationException))]
+        public void TestInvalidArgument()
+        {
+            MethodInfo method = typeof(ValidationTarget).GetMethod("Save");
+
+            ExpectValidatorRetrieval("required", requiredValidator);
+            advice.Before(method, new object[] { null }, new ValidationTarget());
+            mockContext.Verify();
+        }
+
+        #region Helper methods
+
+        private void ExpectValidatorRetrieval(string validatorName, IValidator validator)
+        {
+            mockContext.ExpectAndReturn("GetObject", validator, validatorName);
+        }
+
+        #endregion
+    }
+
+    #region Inner Class : ValidationTarget
+
+    public interface IValidationTarget
+    {
+        void Save(Inventor inventor);
+    }
+
+    public sealed class ValidationTarget : IValidationTarget
+    {
+        public void Save([Validated("required")] Inventor inventor)
+        {
+            inventor.Name = inventor.Name.ToUpper();
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/AssemblyInfo.cs b/test/Spring/Spring.Aop.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..95b35428
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Spring.Aop Tests")]
+[assembly: AssemblyDescription("Unit tests for Spring.Aop assembly")]
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/AutoProxy/advisorAutoProxyCreator.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/AutoProxy/advisorAutoProxyCreator.xml
new file mode 100644
index 00000000..b77334a8
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/AutoProxy/advisorAutoProxyCreator.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+  <description>
+    Matches all Advisors in the factory: we don't use a prefix
+  </description>
+
+  <object id="aapc" type="Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator, Spring.Aop"/>
+
+
+  <!--
+		Depending on the order value, these object should appear
+		before or after the LTCRegExpAdvisor. Thus we configure
+		them to check for the presence of a thread local variable.
+		The LTCRegExpAdvisor's order value is 10.
+	-->  
+
+  <object id="orderedBeforeLTCSet" type="Spring.Aop.Framework.AutoProxy.OrderedLogicalThreadContextCheckAdvisor, Spring.Aop.Tests">
+    <property name="Order" value="9"/>
+    <property name="RequireLTCHasValue" value="false"/>
+  </object>
+
+  <object id="orderedAfterLTCSet" type="Spring.Aop.Framework.AutoProxy.OrderedLogicalThreadContextCheckAdvisor, Spring.Aop.Tests">
+    <property name="Order" value="11"/>
+    <property name="RequireLTCHasValue" value="true"/>
+  </object>
+
+  <object id="orderedAfterLTCSet2" type="Spring.Aop.Framework.AutoProxy.OrderedLogicalThreadContextCheckAdvisor, Spring.Aop.Tests">
+    <description>Don't set order value: should remain int.MAXVALUE, so it's non-ordered</description>
+    <property name="RequireLTCHasValue" value="true"/>
+  </object>
+
+  <object id="LTCAdvice" type="Spring.Aop.Framework.AutoProxy.LogicalThreadContextAdvice, Spring.Aop.Tests"/>
+  
+  <object id="LTCRegExpAdvisor" type="Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor, Spring.Aop">
+    <property name="advice" ref="LTCAdvice"/>
+    <property name="pattern" value=".*set_A.*"/>
+    <property name="Order" value="10"/>
+  </object>
+  
+  <object id="CountingAdvice" type="Spring.Aop.Framework.CountingAfterReturningAdvice, Spring.Aop.Tests"/>
+
+  <object id="CountingAdvisor" type="Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor, Spring.Aop">
+    <property name="advice" ref="CountingAdvice"/>
+    <property name="pattern" value=".*set_N.*"/>
+  </object>
+
+  <object id="testObject" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="SimpleTestObject"/>
+    <property name="Age" value="4"/>
+  </object>
+  
+  
+  <object id="otherTestObject" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="OtherSimpleTestObject"/>
+    <property name="Age" value="2"/>
+  </object>
+  
+  
+  <object id="testObjectFactory" type="Spring.Objects.Factory.DummyFactory">
+    <property name="otherTestObject" ref="otherTestObject" />
+  </object>
+  
+
+  <object id="noSetterPropertiesObject" type="Spring.Aop.Framework.AutoProxy.NoSetterProperties, Spring.Aop.Tests"/>
+
+  
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/AutoProxy/objectNameAutoProxyCreatorTests.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/AutoProxy/objectNameAutoProxyCreatorTests.xml
new file mode 100644
index 00000000..8f36c728
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/AutoProxy/objectNameAutoProxyCreatorTests.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+  <object id="FrozenProxyCreator" type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+    <property name="ObjectNames">
+      <list>
+        <value>frozen</value>
+      </list>
+    </property>
+    <property name="InterceptorNames">
+      <list>
+        <value>nopInterceptor</value>
+      </list>
+    </property>
+    <property name="IsFrozen" value="true"/>
+  </object>
+  
+  <object id="ProxyCreator" type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+    <property name="ObjectNames">
+      <list>
+       <value>*Wildcards*</value>
+        <value>testObject</value>
+        <value>myTestObj*</value>
+        <value>*FamilyMember</value>
+        <value>doubleProxy</value>
+      </list>
+    </property>
+    <property name="InterceptorNames">
+      <list>
+        <value>nopInterceptor</value>
+      </list>
+    </property>
+  </object>
+
+  <object id="FactoryProxyCreator" type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+    <property name="ObjectNames">
+      <list>
+        <value>factoryObject</value>
+      </list>
+    </property>
+    <property name="InterceptorNames">
+      <list>
+        <value>nopInterceptor</value>
+      </list>
+    </property>
+  </object>
+
+  <object id="DoubleFactoryProxyCreator" type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+    <property name="ObjectNames">
+      <list>
+        <value>doubleProxy</value>
+      </list>
+    </property>
+    <property name="InterceptorNames">
+      <list>
+        <value>nopInterceptor</value>
+      </list>
+    </property>
+  </object>
+
+  <object id="DecoratorFactoryProxyCreator" type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+    <property name="ObjectNames">
+      <list>
+        <value>decoratorProx*</value>
+      </list>
+    </property>
+    <property name="ProxyTargetType" value="true"/>
+    <property name="InterceptorNames">
+      <list>
+        <value>nopInterceptor</value>
+        <value>countingBeforeAdvice</value>
+      </list>
+    </property>
+  </object>
+
+  
+  <object id="IntroductionBeanNameProxyCreator" type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+    <property name="ObjectNames">
+      <list>
+        <value>*introductionUsingDecorator</value>
+      </list>
+    </property>
+    <property name="InterceptorNames">
+      <list>
+        <value>introductionNopInterceptor</value>
+        <value>isModifiedAdvisor</value>
+      </list>
+    </property>
+  </object>
+  
+
+  <object id="factoryObject" type="Spring.Aop.Framework.AutoProxy.CreatesTestObject, Spring.Aop.Tests">
+    
+  </object>
+
+  <object id="noproxy" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="noproxy"/>
+  </object>
+
+  <object id="testObject" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="SimpleTestObject"/>
+  </object>
+
+  <object id="myTestObj1Name" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="SimpleTestObject1"/>
+  </object>
+
+  <object id="SmithFamilyMember" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="John Smith"/>
+  </object>
+
+  <object id="twoWildcardsTestObject" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="Damjan Tomic"/>
+  </object>
+  
+  <object id="doubleProxy" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="doubleProxy"/>
+  </object>
+
+  <object id="decoratorProxy" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="decoratorProxy"/>
+  </object>
+
+  <object id="frozen" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="frozen"/>
+  </object>
+
+
+  <object id="introductionUsingDecorator" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="introductionUsingDecorator"/>
+  </object>
+
+  <object id="second-introductionUsingDecorator" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="second-introductionUsingDecorator"/>
+  </object>
+
+
+  <object id="nopInterceptor" type="Spring.Aop.Interceptor.NopInterceptor, Spring.Aop.Tests"/>
+
+  <object id="countingBeforeAdvice" type="Spring.Aop.Framework.CountingBeforeAdvice, Spring.Aop.Tests"/>
+
+  <!--
+  <object id="factory-introductionUsingDecorator" type="Spring.Aop.Framework.AutoProxy.CreatesTestObject, Spring.Aop.Tests"/>
+  -->
+  
+  <object id="isModifiedAdvisor" type="Spring.Aop.Framework.IsModifiedAdvisor, Spring.Aop.Tests"/>
+
+  <object id="introductionNopInterceptor" type="Spring.Aop.Interceptor.NopInterceptor, Spring.Aop.Tests"/>
+  
+  
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/adapter/withBPPContext.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/adapter/withBPPContext.xml
new file mode 100644
index 00000000..ede07cad
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/adapter/withBPPContext.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects xmlns="http://www.springframework.net">
+	<object id="testObjectTarget" type="Spring.Objects.TestObject"/>
+	
+	<object id="simpleBeforeAdvice" type="Spring.Aop.SimpleBeforeAdviceImpl"/>
+	
+	<object id="simpleBeforeAdviceAdvisor" type="Spring.Aop.Support.DefaultPointcutAdvisor">
+		<constructor-arg><ref local="simpleBeforeAdvice"/></constructor-arg>
+  </object>
+   	
+  <object id="testObject" type="Spring.Aop.Framework.ProxyFactoryObject">
+  	<property name="targetName"><value>testObjectTarget</value></property>
+    <property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>
+    <property name="interceptorNames"><value>simpleBeforeAdviceAdvisor</value></property>
+	</object>
+	
+	<object id="testAdvisorAdapter" type="Spring.Aop.SimpleBeforeAdviceAdapter"/>
+	
+	<object id="adapterRegistrationManager" type="Spring.Aop.Framework.Adapter.AdvisorAdapterRegistrationManager"/>
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/adapter/withoutBPPContext.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/adapter/withoutBPPContext.xml
new file mode 100644
index 00000000..80b5a46a
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/adapter/withoutBPPContext.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects xmlns="http://www.springframework.net">
+	<object id="testObjectTarget" type="Spring.Objects.TestObject"/>
+	
+	<object id="simpleBeforeAdvice" type="Spring.Aop.SimpleBeforeAdviceImpl"/>
+	
+	<object id="simpleBeforeAdviceAdvisor" type="Spring.Aop.Support.DefaultPointcutAdvisor">
+		<constructor-arg><ref local="simpleBeforeAdvice"/></constructor-arg>
+  </object>
+   	
+  <object id="testObject" type="Spring.Aop.Framework.ProxyFactoryObject">
+  	<property name="targetName"><value>testObjectTarget</value></property>
+    <property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>
+    <property name="interceptorNames"><value>simpleBeforeAdviceAdvisor</value></property>
+	</object>
+	
+	<object id="testAdvisorAdapter" type="Spring.Aop.SimpleBeforeAdviceAdapter"/>
+	
+</objects>
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/innerBeanTarget.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/innerBeanTarget.xml
new file mode 100644
index 00000000..e757d0c8
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/innerBeanTarget.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	Test that inner object for target means that we can use
+	autowire without ambiguity from target and proxy.
+	$Id: innerBeanTarget.xml,v 1.4 2005/03/05 23:54:02 gcaprio Exp $
+-->
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+	<object id="nopInterceptor" type="Spring.Aop.Interceptor.NopInterceptor">
+	</object>
+	
+	<object id="testObject"
+		type="Spring.Aop.Framework.ProxyFactoryObject"
+	> 
+			<property name="target">
+				<object type="Spring.Objects.TestObject">	
+					<property name="name"><value>innerObjectTarget</value></property>
+				</object>
+			</property>
+			
+			<property name="interceptorNames">
+				<value>nopInterceptor</value>
+			</property>
+	</object>
+	
+	<!--	
+		Autowire would fail if distinct target and proxy:
+		we expect just to have proxy
+	-->
+	<object id="autowireCheck" 
+		type="Spring.Aop.Framework.ProxyFactoryObjectTests$DependsOnITestObject"
+			autowire="constructor" />
+	
+</objects>		
+	
+	
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/prototypeTarget.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/prototypeTarget.xml
new file mode 100644
index 00000000..1eb013fb
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/prototypeTarget.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+	<object id="testObjectTarget"
+					type="Spring.Aop.Framework.PrototypeTargetTests+TestObjectImpl"
+		  		    singleton="false"/>
+
+	<object id="testInterceptor" type="Spring.Aop.Framework.PrototypeTargetTests+TestInterceptor"/>
+
+	<object id="testObjectPrototype" type="Spring.Aop.Framework.ProxyFactoryObject">
+		<property name="targetName"><value>testObjectTarget</value></property>
+		<!--<property name="target"><ref local="testObjectTarget"/></property>-->
+		<property name="proxyInterfaces">
+			<value>Spring.Aop.Framework.PrototypeTargetTests+TestObject</value>
+		</property>
+		<property name="IsSingleton">
+			<value>false</value>
+		</property>
+		<property name="interceptorNames">
+			<list>
+				<value>testInterceptor</value>
+			</list>
+		</property>
+	</object>
+
+	<object id="testObjectSingleton" type="Spring.Aop.Framework.ProxyFactoryObject">
+		<property name="targetName"><value>testObjectTarget</value></property>
+		<property name="proxyInterfaces">
+			<value>Spring.Aop.Framework.PrototypeTargetTests+TestObject</value>
+		</property>
+		<property name="IsSingleton">
+			<value>true</value>
+		</property>
+		<property name="interceptorNames">
+			<list>
+				<value>testInterceptor</value>
+			</list>
+		</property>
+	</object>
+
+</objects>
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/prototypeTests.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/prototypeTests.xml
new file mode 100644
index 00000000..8583e242
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/prototypeTests.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	Tests for independent prototype behaviour.
+-->
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+
+	
+	<object id="test" type="Spring.Objects.Factory.SideEffectObject">	
+		<property name="count"><value>10</value></property>
+	</object>	
+	
+	<object id="prototypeTarget" type="Spring.Objects.Factory.SideEffectObject" singleton="false">	
+		<property name="count"><value>10</value></property>
+	</object>
+
+	<object id="debugInterceptor" type="Spring.Aop.Interceptor.NopInterceptor"/>
+	
+		
+	<object id="singleton" type="Spring.Aop.Framework.ProxyFactoryObject">
+	    <property name="TargetName"><value>test</value></property>
+	    <property name="InterceptorNames"><value>debugInterceptor</value></property>
+	</object>
+	
+    <object id="prototype" type="Spring.Aop.Framework.ProxyFactoryObject">
+	    <property name="TargetName"><value>prototypeTarget</value></property>
+	    <property name="InterceptorNames"><value>debugInterceptor</value></property>
+	    <property name="IsSingleton"><value>false</value></property>
+	</object>
+		
+	
+	<!--  OLD XML
+
+	<object id="target" type="Spring.Objects.TestObject">	
+		<property name="name"><value>Adam</value></property>
+	</object>
+	
+	-->
+	
+</objects>		
+	
+	
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/proxyFactoryDoubleTargetSourceTests.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/proxyFactoryDoubleTargetSourceTests.xml
new file mode 100644
index 00000000..e5debf88
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/proxyFactoryDoubleTargetSourceTests.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	Tests for misconfiguring the proxy factory object using target name 
+	as well as set by the targetSource property
+-->	
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+	<object id="eveTargetSource" type="Spring.Aop.Target.SingletonTargetSource">
+		<constructor-arg>
+			<object type="Spring.Objects.TestObject">
+				<property name="name"><value>Eve</value></property>
+			</object>
+		</constructor-arg>
+	</object>
+	
+	<object id="adam" type="Spring.Objects.TestObject">
+		<property name="name"><value>Adam</value></property>
+	</object>
+	
+	<object id="adamTargetSource" type="Spring.Aop.Target.SingletonTargetSource">
+		<constructor-arg>
+			<ref local="adam"/>
+		</constructor-arg>
+	</object>
+	
+	<object id="countingBeforeAdvice"
+		type="Spring.Aop.Framework.CountingBeforeAdvice"
+	/>
+	
+	<object id="doubleTarget"
+		type="Spring.Aop.Framework.ProxyFactoryObject"> 
+		<property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>
+		<!-- this is the one used and NOT the one set by targetSource -->
+	    <property name="targetName"><value>adamTargetSource</value></property>	
+		<property name="interceptorNames"><value>countingBeforeAdvice</value></property>
+		
+		<property name="targetSource"><ref object="eveTargetSource"/></property>
+	</object>
+	
+	<!-- but this is also possible -->
+	<object id="arbitraryTarget"
+		type="Spring.Aop.Framework.ProxyFactoryObject"> 
+		<property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>
+		<!-- this is the one used and NOT the one set by targetSource -->
+		<property name="targetName"><value>adam</value></property>
+		<property name="targetSource"><ref local="eveTargetSource"/></property>
+	</object>
+
+		
+</objects>		
+	
+	
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/proxyFactoryTargetSourceTests.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/proxyFactoryTargetSourceTests.xml
new file mode 100644
index 00000000..a9f66538
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/proxyFactoryTargetSourceTests.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	Tests for independent prototype behaviour.
+-->
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+	<!-- Simple target -->
+	<object id="target" type="Spring.Objects.TestObject">	
+		<property name="name" value="Adam"/>
+	</object>
+	
+	<!-- Simple target -->
+	<object id="testPrototypeTarget" type="Spring.Objects.TestObject" singleton="false">	
+		<property name="name" value="Eve"/>
+	</object>
+	
+	<object id="nopInterceptor" type="Spring.Aop.Interceptor.NopInterceptor"/>
+	
+	<object id="countingBeforeAdvice" type="Spring.Aop.Framework.CountingBeforeAdvice"/>
+
+	<object id="targetSource" type="Spring.Aop.Target.SingletonTargetSource">
+		<constructor-arg ref="target"/>
+	</object>
+
+	<object id="directTarget" type="Spring.Aop.Framework.ProxyFactoryObject"> 
+		<property name="targetName" value="target"/>
+		<property name="interceptorNames" value="countingBeforeAdvice,nopInterceptor"/>
+	</object>
+	
+	<object id="viaPrototypeTargetSource" type="Spring.Aop.Framework.ProxyFactoryObject"> 
+		<property name="targetName" value="testPrototypeTarget"/>
+	</object>
+	
+	<object id="viaTargetSource" type="Spring.Aop.Framework.ProxyFactoryObject"> 
+		<property name="targetName" value="targetSource"/>
+		<property name="interceptorNames" value="nopInterceptor"/>
+	</object>
+	
+	<object id="unsupportedInterceptor" type="Spring.Aop.Framework.UnsupportedInterceptor"/>
+
+	<!--
+		specifies no target or target source, just the interceptor names...
+	-->
+	<object id="noTarget" type="Spring.Aop.Framework.ProxyFactoryObject">
+    <property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>
+		<property name="interceptorNames"><value>nopInterceptor,unsupportedInterceptor</value></property>
+	</object>
+
+	<object id="prototypeTarget" type="Spring.Aop.Framework.ProxyFactoryObject"> 
+		<property name="interceptorNames" value="nopInterceptor,target"/>
+	</object>
+</objects>		
+	
+	
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/proxyFactoryTests.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/proxyFactoryTests.xml
new file mode 100644
index 00000000..cbc06c6c
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/proxyFactoryTests.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+	<!-- Simple target -->
+	<object id="test" type="Spring.Objects.TestObject">	
+		<property name="name"><value>custom</value></property>
+		<property name="age"><value>666</value></property>
+	</object>
+	
+	<object id="debugInterceptor" type="Spring.Aop.Interceptor.NopInterceptor"/>
+	
+	<object id="test1" type="Spring.Aop.Framework.ProxyFactoryObject">	
+		<property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>		
+		<property name="target"><ref local="test"/></property>	
+		<property name="interceptorNames"><value>debugInterceptor</value></property>		
+	</object>
+	
+	<!--
+		Check that invoker is automatically added to wrap target.
+		Non pointcut object name should be wrapped in invoker.
+	-->
+	<object id="autoInvoker" type="Spring.Aop.Framework.ProxyFactoryObject">	
+		<!-- 
+			Aspect interfaces don't need to be included here.
+			They may, for example, be added by global introductions.
+		 -->
+		<property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>		
+		<property name="targetName"><value>test</value></property>
+		<property name="interceptorNames"><value>global*</value></property>
+		<property name="introductionNames"><value>global*</value></property>
+	</object>
+	
+	<object id="prototype" type="Spring.Aop.Framework.ProxyFactoryObject">	
+		<property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>		
+		<property name="isSingleton"><value>false</value></property>
+		<property name="targetName"><value>test</value></property>		
+	</object>
+
+	<object id="concurrentPrototypeTest" type="Spring.Objects.TestObject" singleton="false">
+		<property name="name"><value>custom</value></property>
+		<property name="age"><value>666</value></property>
+	</object>
+	
+	<object id="concurrentPrototypeTarget" type="Spring.Aop.Target.PrototypeTargetSource, Spring.Aop" singleton="false">
+		<property name="TargetObjectName"><idref object="concurrentPrototypeTest"/></property>
+	</object>
+	
+	<object id="concurrentPrototype" type="Spring.Aop.Framework.ProxyFactoryObject">	
+		<property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>		
+		<property name="isSingleton"><value>false</value></property>
+		<property name="isFrozen"><value>false</value></property>
+		<property name="targetName"><value>concurrentPrototypeTarget</value></property>		
+		<property name="interceptorNames"><value>global*</value></property>
+	</object>
+	
+	<object id="test2" type="Spring.Aop.Framework.ProxyFactoryObject">	
+		<property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>		
+		<property name="isSingleton"><value>false</value></property>
+		<property name="targetName"><value>test</value></property>		
+	</object>
+	
+	<object id="pointcuts" type="Spring.Aop.Framework.ProxyFactoryObject">	
+		<property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>		
+		<property name="targetName"><value>test</value></property>		
+		<property name="interceptorNames"><value>pointcutForVoid</value></property>		
+	</object>
+	
+	<object id="pointcutForVoid" type="Spring.Aop.Framework.ProxyFactoryObjectTests+PointcutForVoid"/>
+	
+	<!--
+		Invalid test for global pointcuts.
+		Must have target because there are no interceptors.
+	-->
+	<!--
+	<object id="noInterceptorNamesWithoutTarget" 
+			type="Spring.Aop.Framework.ProxyFactoryObject"
+	>	
+		<property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>			
+		
+	</object>
+	
+	<object id="noInterceptorNamesWithTarget" 
+			type="Spring.Aop.Framework.ProxyFactoryObject"
+	>	
+		<property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>	
+		<property name="target"><ref local="test"/></property>					
+		
+	</object>
+	-->
+	
+	<!-- Same effect as noInterceptor names: also invalid -->
+	<!--
+	<object id="emptyInterceptorNames" type="Spring.Aop.Framework.ProxyFactoryObject">	
+		<property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>			
+		<property name="interceptorNames"><value/></property>
+	</object>
+	-->
+	
+	<!--
+		Invalid test for global pointcuts.
+		Must have target after *.
+	-->
+	<!--
+	<object id="globalsWithoutTarget" 
+			type="Spring.Aop.Framework.ProxyFactoryObject"
+	>	
+		<property name="proxyInterfaces"><value>Spring.Objects.ITestObject</value></property>			
+		<property name="interceptorNames"><value>global*</value></property>
+	</object>
+	-->
+	
+	
+	<object id="validGlobals" singleton="true" type="Spring.Aop.Framework.ProxyFactoryObject">	
+		<property name="proxyInterfaces"><value>Spring.Context.IApplicationEventListener</value></property>			
+		<property name="targetName"><value>target2</value></property>		
+		<property name="interceptorNames"><value>debugInterceptor,global*</value></property>
+		<property name="introductionNames"><value>global*</value></property>
+	</object>
+	
+	<!--
+		Global debug interceptor
+	-->
+	<object id="global_debug" type="Spring.Aop.Advice.DebugAdvice"/>
+	
+	<!--
+		Will add introduction to all Objects exposing globals
+	-->
+	<object id="global_introduction" type="Spring.Aop.Framework.ProxyFactoryObjectTests+GlobalIntroduction" singleton="false" />
+	
+	<object id="target2" type="Spring.Context.Events.ConsoleListener,Spring.Core"/>
+
+</objects>		
+	
+	
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/serializationTests.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/serializationTests.xml
new file mode 100644
index 00000000..99b2811c
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/serializationTests.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	Tests for independent prototype behaviour.
+-->
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+	<object id="nopInterceptor" type="Spring.Aop.Interceptor.NopInterceptor">
+	</object>
+	
+	<object id="serializableNopInterceptor" type="Spring.Aop.Interceptor.SerializableNopInterceptor">
+	</object>
+	
+	<object id="serializableSingleton" 
+			type="Spring.Aop.Framework.ProxyFactoryObject"
+	>	
+		<property name="interceptorNames"><value>serializableNopInterceptor</value></property>	
+		<property name="proxyInterfaces"><value>Spring.Objects.Person</value></property>		
+		<property name="target">
+			<object type="Spring.Objects.SerializablePerson">
+				<property name="name"><value>serializableSingleton</value></property>
+			</object>
+		</property>
+	</object>
+	
+	
+	<object id="prototypeTarget" type="Spring.Objects.SerializablePerson">
+		<property name="name"><value>serializablePrototype</value></property>
+	</object>
+
+	<object id="serializablePrototype" 
+			type="Spring.Aop.Framework.ProxyFactoryObject"
+	>	
+		<property name="interceptorNames"><value>serializableNopInterceptor,prototypeTarget</value></property>		
+		<property name="proxyInterfaces"><value>Spring.Objects.Person</value></property>	
+		
+		<property name="singleton"><value>false</value></property>
+	</object>
+	
+	
+	<object id="interceptorNotSerializableSingleton" 
+			type="Spring.Aop.Framework.ProxyFactoryObject"
+	>	
+		<property name="interceptorNames"><value>nopInterceptor</value></property>		
+		<property name="target">
+			<object type="Spring.Objects.SerializablePerson" />
+		</property>
+	</object>
+	
+</objects>		
+	
+	
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/throwsAdvice.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/throwsAdvice.xml
new file mode 100644
index 00000000..80f3c092
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Framework/throwsAdvice.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+	Tests for throws advice.
+	$Id: throwsAdvice.xml,v 1.6 2007/03/09 17:44:40 aseovic Exp $
+-->
+<objects xmlns="http://www.springframework.net">
+    <!-- Simple target -->
+    <object id="target" type="Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptorTests+Echo"/>
+    <object id="nopInterceptor" type="Spring.Aop.Interceptor.NopInterceptor"/>
+    <object id="countingBeforeAdvice" type="Spring.Aop.Framework.CountingBeforeAdvice"/>
+    <object id="throwsAdvice"
+            type="Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptorTests+MyThrowsHandler"/>
+    <object id="throwsAdvised" type="Spring.Aop.Framework.ProxyFactoryObject">
+        <property name="target" ref="target"/>
+        <property name="interceptorNames"
+                  value="countingBeforeAdvice,nopInterceptor,throwsAdvice"/>
+    </object>
+</objects>
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Support/RegularExpressionSetterTests.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Support/RegularExpressionSetterTests.xml
new file mode 100644
index 00000000..347f0f1b
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Support/RegularExpressionSetterTests.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+	<!-- Simple target -->
+	<object id="Test" type="Spring.Objects.SerializablePerson">	
+		<property name="name"><value>custom</value></property>
+		<property name="age"><value>666</value></property>
+	</object>
+	
+	<object id="NopInterceptor" type="Spring.Aop.Interceptor.SerializableNopInterceptor">
+	</object>
+	
+	<object id="SettersAdvisor" type="Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor">
+		<property name="advice"><ref local="NopInterceptor"/></property>
+		<property name="pattern"><value>.*Set.*</value></property>
+	</object>
+	
+	<object id="SettersAdvised" type="Spring.Aop.Framework.ProxyFactoryObject">	
+		<property name="proxyInterfaces"><value>Spring.Objects.IPerson</value></property>		
+		<property name="target"><ref local="Test"/></property>	
+		<property name="interceptorNames"><value>SettersAdvisor</value></property>		
+	</object>
+	
+	<object id="SerializableSettersAdvised" type="Spring.Aop.Framework.ProxyFactoryObject">	
+		<property name="proxyInterfaces"><value>Spring.Objects.IPerson</value></property>		
+		<property name="target">
+			<object type="Spring.Objects.SerializablePerson">
+				<property name="name"><value>SerializableSettersAdvised</value></property>
+			</object>
+		</property>
+		<property name="interceptorNames"><value>SettersAdvisor</value></property>	
+	</object>
+	
+	<!-- Illustrates use of multiple patterns -->
+	<object id="SettersAndReturnsThisAdvisor" type="Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor">
+		<property name="advice"><ref local="NopInterceptor"/></property>
+		<property name="patterns">
+			<list>
+				<value>.*Set.*</value>
+				<value>.*ReturnsThis</value>
+			</list>
+		</property>
+	</object>
+	
+	<object id="SettersAndReturnsThisAdvised" type="Spring.Aop.Framework.ProxyFactoryObject">	
+		<property name="proxyInterfaces"><value>Spring.Objects.IPerson</value></property>		
+		
+		<property name="proxyTargetType"><value>true</value></property>
+		<property name="target"><ref local="Test"/></property>	
+		<property name="interceptorNames"><value>SettersAndReturnsThisAdvisor</value></property>		
+	</object>
+	
+</objects>
+	
+	
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/commonsPoolTests.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/commonsPoolTests.xml
new file mode 100644
index 00000000..f34d925f
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/commonsPoolTests.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<objects xmlns="http://www.springframework.net">
+	<object id="prototypeTest" type="Spring.Objects.Factory.SideEffectObject" singleton="false">
+		<property name="count">
+			<value>10</value>
+		</property>
+	</object>
+	<object id="poolTargetSource" type="Spring.Aop.Target.CommonsPoolTargetSource">
+		<property name="targetobjectName">
+			<value>prototypeTest</value>
+		</property>
+		<property name="maxSize">
+			<value>25</value>
+		</property>
+	</object>
+	<object id="poolConfigAdvisor" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject">
+		<property name="targetObject">
+			<ref local="poolTargetSource" />
+		</property>
+		<property name="targetMethod">
+			<value>GetPoolingConfigMixin</value>
+		</property>
+	</object>
+	<object id="nop" type="Spring.Aop.Interceptor.NopInterceptor" />
+	<!--
+		This will create a object for each thread ("apartment")
+	-->
+	<object id="pooled" type="Spring.Aop.Framework.ProxyFactoryObject">
+		<property name="targetSource">
+			<ref local="poolTargetSource" />
+		</property>
+		<property name="interceptorNames">
+			<value>nop</value>
+		</property>
+	</object>
+	<object id="pooledNoInterceptors" type="Spring.Aop.Framework.ProxyFactoryObject">
+		<property name="targetSource">
+			<ref local="poolTargetSource" />
+		</property>
+	</object>
+	<object id="pooledWithMixin" type="Spring.Aop.Framework.ProxyFactoryObject">
+		<property name="targetSource">
+			<ref local="poolTargetSource" />
+		</property>
+		<property name="interceptorNames">
+			<value>poolConfigAdvisor</value>
+		</property>
+		<!-- Necessary as have a mixin and want to avoid losing the class,
+			 because there's no target interface -->
+		<property name="proxyTargetType">
+			<value>true</value>
+		</property>
+	</object>
+</objects>
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/hotSwapTests.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/hotSwapTests.xml
new file mode 100644
index 00000000..3e3a2b35
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/hotSwapTests.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<objects xmlns="http://www.springframework.net">
+	<!-- Simple target -->
+	<object id="target1" type="Spring.Objects.Factory.SideEffectObject">
+		<property name="count" value="10"/>
+	</object>
+	<object id="target2" type="Spring.Objects.Factory.SideEffectObject" singleton="true">
+		<property name="count" value="20"/>
+	</object>
+	<!-- 
+		Hot swappable target source...
+	-->
+	<object id="swapper" type="Spring.Aop.Target.HotSwappableTargetSource">
+		<constructor-arg ref="target1"/>
+	</object>
+	<object id="swappable" type="Spring.Aop.Framework.ProxyFactoryObject">
+		<property name="targetSource" ref="swapper"/>
+	</object>
+</objects>
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/prototypeTargetSourceTests.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/prototypeTargetSourceTests.xml
new file mode 100644
index 00000000..6ffa6d5e
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/prototypeTargetSourceTests.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	Tests for independent prototype behaviour.
+-->
+
+<objects xmlns="http://www.springframework.net">
+
+	
+	<object id="test" type="Spring.Objects.Factory.SideEffectObject">	
+		<property name="count"><value>10</value></property>
+	</object>
+	
+	<object id="prototypeTest" type="Spring.Objects.Factory.SideEffectObject" singleton="false">	
+		<property name="count"><value>10</value></property>
+	</object>
+	
+	<object id="prototypeTargetSource" type="Spring.Aop.Target.PrototypeTargetSource, Spring.Aop">
+	    <property name="TargetObjectName"><value>prototypeTest</value></property>
+	</object>
+	
+	<object id="debugInterceptor" type="Spring.Aop.Interceptor.NopInterceptor, Spring.Aop.Tests"/>
+	
+	<object id="singleton" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+	    <property name="TargetName"><value>test</value></property>
+	    <property name="InterceptorNames"><value>debugInterceptor</value></property>
+	</object>
+	
+    <object id="prototype" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+	    <property name="TargetSource"><ref object="prototypeTargetSource"/></property>
+	    <property name="InterceptorNames"><value>debugInterceptor</value></property>
+	</object>
+	
+	<object id="prototypeByName" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+	    <property name="TargetName"><value>prototypeTest</value></property>
+	    <property name="InterceptorNames"><value>debugInterceptor</value></property>
+	</object>
+	
+</objects>		
+	
+	
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/simplePoolTests.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/simplePoolTests.xml
new file mode 100644
index 00000000..94253981
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/simplePoolTests.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<objects xmlns="http://www.springframework.net">
+	<object id="prototypeTest" type="Spring.Objects.Factory.SideEffectObject" singleton="false">
+		<property name="count">
+			<value>10</value>
+		</property>
+	</object>
+	<object id="poolTargetSource" type="Spring.Aop.Target.SimplePoolTargetSource">
+		<property name="targetobjectName">
+			<value>prototypeTest</value>
+		</property>
+		<property name="maxSize">
+			<value>25</value>
+		</property>
+	</object>
+	<object id="poolConfigAdvisor" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject">
+		<property name="targetObject">
+			<ref local="poolTargetSource" />
+		</property>
+		<property name="targetMethod">
+			<value>GetPoolingConfigMixin</value>
+		</property>
+	</object>
+	<object id="nop" type="Spring.Aop.Interceptor.NopInterceptor" />
+	<!--
+		This will create a object for each thread ("apartment")
+	-->
+	<object id="pooled" type="Spring.Aop.Framework.ProxyFactoryObject">
+		<property name="targetSource">
+			<ref local="poolTargetSource" />
+		</property>
+		<property name="interceptorNames">
+			<value>nop</value>
+		</property>
+	</object>
+	<object id="pooledNoInterceptors" type="Spring.Aop.Framework.ProxyFactoryObject">
+		<property name="targetSource">
+			<ref local="poolTargetSource" />
+		</property>
+	</object>
+	<object id="pooledWithMixin" type="Spring.Aop.Framework.ProxyFactoryObject">
+		<property name="targetSource">
+			<ref local="poolTargetSource" />
+		</property>
+		<property name="introductionNames">
+			<value>poolConfigAdvisor</value>
+		</property>
+		<!-- Necessary as have a mixin and want to avoid losing the class,
+			 because there's no target interface -->
+		<property name="proxyTargetType">
+			<value>true</value>
+		</property>
+	</object>
+</objects>
diff --git a/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/threadLocalTests.xml b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/threadLocalTests.xml
new file mode 100644
index 00000000..3629123b
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Data/Spring/Aop/Target/threadLocalTests.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<objects xmlns="http://www.springframework.net">
+	<object id="prototypeTest" type="Spring.Objects.Factory.SideEffectObject" singleton="false">
+		<property name="count">
+			<value>10</value>
+		</property>
+	</object>
+	<object id="threadLocalTs" type="Spring.Aop.Target.ThreadLocalTargetSource">
+		<property name="targetobjectName">
+			<value>prototypeTest</value>
+		</property>
+	</object>
+	<object id="debugInterceptor" type="Spring.Aop.Interceptor.NopInterceptor" />
+	<!--
+		We want to invoke the getStatsMixin method on our ThreadLocal invoker
+	-->
+	<object id="statsAdvisor" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject">
+		<property name="targetObject">
+			<ref local="threadLocalTs" />
+		</property>
+		<property name="targetMethod">
+			<value>GetStatsMixin</value>
+		</property>
+	</object>
+	<!--
+		This will create a object for each thread ("apartment")
+	-->
+	<object id="apartment" type="Spring.Aop.Framework.ProxyFactoryObject">
+		<!-- in java:
+		<property name="interceptorNames"><value>debugInterceptor,statsAdvisor</value></property>
+		-->
+		<property name="introductionNames">
+			<value>statsAdvisor</value>
+		</property>
+		<property name="interceptorNames">
+			<value>debugInterceptor</value>
+		</property>
+		<property name="targetSource">
+			<ref local="threadLocalTs" />
+		</property>
+		<!-- Necessary as have a mixin and want to avoid losing the class,
+			 because there's no target interface
+		 -->
+		<property name="proxyTargetType">
+			<value>true</value>
+		</property>
+	</object>
+	<!-- ================ Definitions for second ThreadLocalTargetSource ====== -->
+	<object id="wife" type="Spring.Objects.TestObject">
+		<property name="name">
+			<value>Kerry</value>
+		</property>
+	</object>
+	<object id="test" singleton="false" type="Spring.Objects.TestObject">
+		<property name="name">
+			<value>Rod</value>
+		</property>
+		<property name="spouse">
+			<ref local="wife" />
+		</property>
+	</object>
+	<object id="threadLocalTs2" type="Spring.Aop.Target.ThreadLocalTargetSource">
+		<property name="targetobjectName">
+			<value>test</value>
+		</property>
+	</object>
+	<object id="threadLocal2" type="Spring.Aop.Framework.ProxyFactoryObject">
+		<property name="targetSource">
+			<ref local="threadLocalTs2" />
+		</property>
+	</object>
+</objects>
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2002.csproj b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2002.csproj
new file mode 100644
index 00000000..1e805fd9
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2002.csproj
@@ -0,0 +1,516 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.0.9955"
+        SchemaVersion = "1.0"
+        ProjectGuid = "{F856BCAE-421E-469A-B75F-E41E5BA7F160}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Aop.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                RootNamespace = "Spring"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_0"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2002\Spring.Aop.Tests\Debug-1.0\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "1"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2002\Spring.Aop.Tests\Release-1.0\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.Tests.2002"
+                    Project = "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Aop.2002"
+                    Project = "{828F16E3-20A4-4EC4-A8F4-CD95B8ED44C9}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core.2002"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "System.Web"
+                    AssemblyName = "System.Web"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Web.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.0\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "antlr.runtime"
+                    AssemblyName = "antlr.runtime"
+                    HintPath = "..\..\..\lib\Net\1.0\antlr.runtime.dll"
+                />
+                <Reference
+                    Name = "DotNetMock"
+                    AssemblyName = "DotNetMock"
+                    HintPath = "..\..\..\lib\Net\1.0\DotNetMock.dll"
+                />
+                <Reference
+                    Name = "DotNetMock.Framework"
+                    AssemblyName = "DotNetMock.Framework"
+                    HintPath = "..\..\..\lib\Net\1.0\DotNetMock.Framework.dll"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\Net\1.0\nunit.framework.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AopExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\ISimpleBeforeAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\SimpleBeforeAdviceAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\SimpleBeforeAdviceImpl.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\SimpleBeforeAdviceInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\TrueMethodMatcherTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\TruePointcutTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\TrueTypeFilterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Advice\DebugAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Config\AopNamespaceParserTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Config\AopNamespaceParserTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Aop\Framework\AbstractMethodInvocationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AopContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\CountingAfterReturningAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\CountingBeforeAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\CountingMultiAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\CountingThrowsAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicMethodInvocationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\HashtableCachingAdvisorChainFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ITimeStamped.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\MethodCounter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\PrototypeTargetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ProxyConfigTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ProxyFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ProxyFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ReflectiveMethodInvocationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\TimestampIntroductionInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\UnsupportedInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\AdvisorAdapterRegistrationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\AfterReturningAdviceInterceptorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\ThrowsAdviceInterceptorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\UnknownAdviceTypeExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\AdvisorAutoProxyCreatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\LogicalThreadContextAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\NoSetterProperties.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\ObjectNameAutoProxyCreatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\OrderedLogicalThreadContextCheckAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\AbstractAopProxyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\CompositionAopProxyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\DecoratorAopProxyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\MockTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Interceptor\NopInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Interceptor\SerializableNopInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AbstractRegularExpressionMethodPointcutTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AttributeMatchMethodPointcutTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\ControlFlowPointcutTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\DelegatingIntroductionInterceptorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\RegularExpressionMethodPointcutAdvisorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\RootTypeFilterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\SdkRegularExpressionMethodPointcutTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\TypeFiltersTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\EmptyTargetSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\HotSwappableTargetSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\PrototypeTargetSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\SimplePoolTargetSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\SingletonTargetSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\ThreadLocalTargetSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheAspectIntegrationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheParameterAdviceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheResultAdviceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\InvalidateCacheAdviceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Exception\ExceptionHandlerAspectIntegrationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\innerBeanTarget.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\prototypeTarget.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\prototypeTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\proxyFactoryDoubleTargetSourceTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\proxyFactoryTargetSourceTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\proxyFactoryTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\serializationTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\throwsAdvice.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\adapter\withBPPContext.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\adapter\withoutBPPContext.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\AutoProxy\advisorAutoProxyCreator.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\AutoProxy\objectNameAutoProxyCreatorTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Support\RegularExpressionSetterTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Target\commonsPoolTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Target\hotSwapTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Target\prototypeTargetSourceTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Target\simplePoolTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Target\threadLocalTests.xml"
+                    BuildAction = "Content"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2003.csproj b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2003.csproj
new file mode 100644
index 00000000..f55936fe
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2003.csproj
@@ -0,0 +1,554 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{2111596A-0327-4C9D-8919-294FBD988A23}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Aop.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = 'echo "Copying .xml files for tests"&#xd;&#xa;xcopy "$(ProjectDir)Data" "..\..\..\..\build\VS.Net.2003\Spring.Aop.Tests\$(ConfigurationName)\" /y /s /q&#xd;&#xa;'
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1;DEBUG_DYNAMIC"
+                    DocumentationFile = "Spring.Aop.Tests.xml"
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = "0618"
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Aop.Tests\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "3"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Aop.Tests\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "System.Web"
+                    AssemblyName = "System.Web"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
+                />
+                <Reference
+                    Name = "DotNetMock"
+                    AssemblyName = "DotNetMock"
+                    HintPath = "..\..\..\lib\Net\1.1\DotNetMock.dll"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\Net\1.1\nunit.framework.dll"
+                    Private = "True"
+                />
+                <Reference
+                    Name = "Spring.Aop.2003"
+                    Project = "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core.Tests.2003"
+                    Project = "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AopExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Aop.Tests.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Aop\ISimpleBeforeAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\SimpleBeforeAdviceAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\SimpleBeforeAdviceImpl.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\SimpleBeforeAdviceInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\TrueMethodMatcherTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\TruePointcutTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\TrueTypeFilterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Advice\DebugAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Config\AopNamespaceParserTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Config\AopNamespaceParserTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Aop\Framework\AbstractMethodInvocationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AopContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\CountingAfterReturningAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\CountingBeforeAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\CountingMultiAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\CountingThrowsAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicMethodInvocationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\HashtableCachingAdvisorChainFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\IIsModified.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\IsModifiedMixin.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ITimeStamped.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\MethodCounter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\PrototypeTargetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ProxyConfigTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ProxyFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ProxyFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\ReflectiveMethodInvocationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\TimestampIntroductionInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\UnsupportedInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\AdvisorAdapterRegistrationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\AfterReturningAdviceInterceptorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\ThrowsAdviceInterceptorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\Adapter\UnknownAdviceTypeExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\AdvisorAutoProxyCreatorCircularReferencesTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\advisorAutoProxyCreatorCircularReferencesTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\AdvisorAutoProxyCreatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\CreatesTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\LogicalThreadContextAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\NoSetterProperties.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\ObjectNameAutoProxyCreatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\AutoProxy\OrderedLogicalThreadContextCheckAdvisor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\AbstractAopProxyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\AopUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\CachedAopProxyFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\CompositionAopProxyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\DecoratorAopProxyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\DefaultAopProxyFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Framework\DynamicProxy\MockTargetSource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Interceptor\NopInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Interceptor\SerializableNopInterceptor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AbstractRegularExpressionMethodPointcutTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\AttributeMatchMethodPointcutTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\ControlFlowPointcutTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\DelegatingIntroductionInterceptorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\RegularExpressionMethodPointcutAdvisorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\RootTypeFilterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\SdkRegularExpressionMethodPointcutTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Support\TypeFiltersTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\EmptyTargetSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\HotSwappableTargetSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\PrototypeTargetSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\SimplePoolTargetSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\SingletonTargetSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aop\Target\ThreadLocalTargetSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheAspectIntegrationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheParameterAdviceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\CacheResultAdviceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Cache\InvalidateCacheAdviceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Aspects\Exception\ExceptionHandlerAspectIntegrationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\innerBeanTarget.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\prototypeTarget.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\prototypeTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\proxyFactoryDoubleTargetSourceTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\proxyFactoryTargetSourceTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\proxyFactoryTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\serializationTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\throwsAdvice.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\adapter\withBPPContext.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\adapter\withoutBPPContext.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\AutoProxy\advisorAutoProxyCreator.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Framework\AutoProxy\objectNameAutoProxyCreatorTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Support\RegularExpressionSetterTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Target\commonsPoolTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Target\hotSwapTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Target\prototypeTargetSourceTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Target\simplePoolTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Aop\Target\threadLocalTests.xml"
+                    BuildAction = "Content"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2005.csproj b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2005.csproj
new file mode 100644
index 00000000..2bb99b17
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2005.csproj
@@ -0,0 +1,306 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2111596A-0327-4C9D-8919-294FBD988A23}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Aop.Tests</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Aop.Tests\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0;DEBUG_DYNAMIC</DefineConstants>
+    <DocumentationFile>Spring.Aop.Tests.xml</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>0618</NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>3</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Aop.Tests\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>618</NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DotNetMock, Version=0.7.4.0, Culture=neutral, PublicKeyToken=805ea88df19095f6">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\DotNetMock.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.5.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Web">
+      <Name>System.Web</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AopExceptionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Advice\DebugAdvice.cs" />
+    <Compile Include="Aop\Config\AopNamespaceParserTests.cs" />
+    <Compile Include="Aop\Framework\Adapter\AdvisorAdapterRegistrationTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\AfterReturningAdviceInterceptorTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\ThrowsAdviceInterceptorTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\Adapter\UnknownAdviceTypeExceptionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\AopContextTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\AutoProxy\AdvisorAutoProxyCreatorCircularReferencesTests.cs" />
+    <Compile Include="Aop\Framework\AutoProxy\AdvisorAutoProxyCreatorTests.cs" />
+    <Compile Include="Aop\Framework\AutoProxy\LogicalThreadContextAdvice.cs" />
+    <Compile Include="Aop\Framework\AutoProxy\NoSetterProperties.cs" />
+    <Compile Include="Aop\Framework\AutoProxy\ObjectNameAutoProxyCreatorTests.cs" />
+    <Compile Include="Aop\Framework\AutoProxy\OrderedLogicalThreadContextCheckAdvisor.cs" />
+    <Compile Include="Aop\Framework\AbstractMethodInvocationTests.cs" />
+    <Compile Include="Aop\Framework\AutoProxy\CreatesTestObject.cs" />
+    <Compile Include="Aop\Framework\DynamicMethodInvocationTests.cs" />
+    <Compile Include="Aop\Framework\CountingAfterReturningAdvice.cs" />
+    <Compile Include="Aop\Framework\CountingBeforeAdvice.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\CountingMultiAdvice.cs" />
+    <Compile Include="Aop\Framework\CountingThrowsAdvice.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\AbstractAopProxyTests.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\AopUtilsTests.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\CachedAopProxyFactoryTests.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\CompositionAopProxyTests.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\InheritanceAopProxyTests.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\DecoratorAopProxyTests.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\DefaultAopProxyFactoryTests.cs" />
+    <Compile Include="Aop\Framework\DynamicProxy\MockTargetSource.cs" />
+    <Compile Include="Aop\Framework\HashtableCachingAdvisorChainFactoryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\IIsModified.cs" />
+    <Compile Include="Aop\Framework\IsModifiedMixin.cs" />
+    <Compile Include="Aop\Framework\ITimeStamped.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\MethodCounter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\PrototypeTargetTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\ProxyConfigTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\ProxyFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\ProxyFactoryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\ReflectiveMethodInvocationTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\TimestampIntroductionInterceptor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Framework\UnsupportedInterceptor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Interceptor\NopInterceptor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Interceptor\SerializableNopInterceptor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\ISimpleBeforeAdvice.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\SimpleBeforeAdviceAdapter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\SimpleBeforeAdviceImpl.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\SimpleBeforeAdviceInterceptor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\AbstractRegularExpressionMethodPointcutTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\AttributeMatchMethodPointcutTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\ControlFlowPointcutTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\DelegatingIntroductionInterceptorTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\RegularExpressionMethodPointcutAdvisorTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\RootTypeFilterTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\SdkRegularExpressionMethodPointcutTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Support\TypeFiltersTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\EmptyTargetSourceTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\HotSwappableTargetSourceTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\PrototypeTargetSourceTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\SimplePoolTargetSourceTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\SingletonTargetSourceTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\Target\ThreadLocalTargetSourceTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\TrueMethodMatcherTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\TruePointcutTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aop\TrueTypeFilterTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Aspects\Cache\CacheResultAdviceTests.cs" />
+    <Compile Include="Aspects\Cache\CacheParameterAdviceTests.cs" />
+    <Compile Include="Aspects\Cache\CacheAspectIntegrationTests.cs" />
+    <Compile Include="Aspects\Cache\InvalidateCacheAdviceTests.cs" />
+    <Compile Include="Aspects\Exception\ExceptionHandlerAspectIntegrationTests.cs" />
+    <Compile Include="Aspects\Logging\SimpleLoggingAdviceTests.cs" />
+    <Compile Include="Aspects\Logging\TestableSimpleLoggingAdvice.cs" />
+    <Compile Include="Aspects\RetryAdviceTests.cs" />
+    <Compile Include="Aspects\Validation\ParameterValidationAdviceTests.cs" />
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <None Include="Spring.Aop.Tests.build" />
+    <None Include="Spring.Aop.Tests.dll.config" />
+    <EmbeddedResource Include="Aop\Config\AopNamespaceParserTests.xml" />
+    <EmbeddedResource Include="Data\Spring\Aop\Framework\adapter\withBPPContext.xml" />
+    <EmbeddedResource Include="Data\Spring\Aop\Framework\adapter\withoutBPPContext.xml" />
+    <EmbeddedResource Include="Aop\Framework\AutoProxy\advisorAutoProxyCreatorCircularReferencesTests.xml" />
+    <Content Include="Data\Spring\Aop\Framework\AutoProxy\advisorAutoProxyCreator.xml" />
+    <Content Include="Data\Spring\Aop\Framework\AutoProxy\objectNameAutoProxyCreatorTests.xml" />
+    <Content Include="Data\Spring\Aop\Framework\innerBeanTarget.xml" />
+    <Content Include="Data\Spring\Aop\Framework\prototypeTarget.xml" />
+    <Content Include="Data\Spring\Aop\Framework\prototypeTests.xml" />
+    <Content Include="Data\Spring\Aop\Framework\proxyFactoryDoubleTargetSourceTests.xml" />
+    <Content Include="Data\Spring\Aop\Framework\proxyFactoryTargetSourceTests.xml" />
+    <Content Include="Data\Spring\Aop\Framework\proxyFactoryTests.xml" />
+    <Content Include="Data\Spring\Aop\Framework\serializationTests.xml" />
+    <Content Include="Data\Spring\Aop\Framework\throwsAdvice.xml" />
+    <Content Include="Data\Spring\Aop\Support\RegularExpressionSetterTests.xml" />
+    <Content Include="Data\Spring\Aop\Target\commonsPoolTests.xml" />
+    <Content Include="Data\Spring\Aop\Target\hotSwapTests.xml" />
+    <Content Include="Data\Spring\Aop\Target\prototypeTargetSourceTests.xml" />
+    <Content Include="Data\Spring\Aop\Target\simplePoolTests.xml" />
+    <Content Include="Data\Spring\Aop\Target\threadLocalTests.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2005.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>echo "Copying .xml files for tests"
+xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Aop.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2005\Spring.Aop.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
new file mode 100644
index 00000000..b4883cc4
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build
@@ -0,0 +1,64 @@
+<?xml version="1.0" ?>
+<project name="Spring.Aop.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+-->
+	<target name="build">
+		<!-- build Spring.Aop -->
+		<csc target="library" define="${current.build.defines.csc}"
+		     warnaserror="true"
+		     debug="${current.build.debug}"
+                     output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml">
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+			</sources>
+			<resources basedir="Resources">
+				<include name="**/*" />
+			</resources>
+			<resources basedir="Data" prefix="" dynamicprefix="true" failonempty="true">
+					<include name="**/*" />
+			</resources>
+			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
+					<include name="**/*.xml" />
+					<exclude name="Data/**/*" />
+					<exclude name="obj/**/*" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+				<exclude name="CloverRuntime.dll" />
+			</references>
+		</csc>
+		<copy todir="${current.bin.dir}">
+			<fileset basedir="${project::get-base-directory()}/Data">
+				<include name="**/*.xml" />
+			</fileset>
+		</copy>
+	</target>
+	<target name="test" depends="build">
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			  outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
+		</nunit2outproc>
+	</target>
+
+	<target name="test-mono-1.0" >
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll"
+			      appconfig="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll.config" />
+		</nunit2outproc>
+	</target>
+</project>
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.dll.config b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.dll.config
new file mode 100644
index 00000000..7aec1f96
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.dll.config
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2002-2005 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.
+-->
+<configuration>
+    <configSections>
+        <sectionGroup name="common">
+            <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+        </sectionGroup>
+    </configSections>
+
+    <common>
+        <logging>
+          <factoryAdapter type="Common.Logging.Simple.NoOpLoggerFactoryAdapter, Common.Logging">
+            </factoryAdapter>
+        </logging>
+    </common>
+</configuration>
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.xml b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.xml
new file mode 100644
index 00000000..fdc729b2
--- /dev/null
+++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.xml
@@ -0,0 +1,854 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Spring.Aop.Tests</name>
+    </assembly>
+    <members>
+        <member name="T:Spring.Aspects.RetryAdviceTests">
+            <summary>
+            This class contains tests for RetryAdvice
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: RetryAdviceTests.cs,v 1.3 2008/03/17 20:25:41 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aspects.Cache.CacheParameterAdviceTests">
+            <summary>
+            Unit tests for the CacheParameterAdvice class.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CacheParameterAdviceTests.cs,v 1.6 2007/04/01 15:05:33 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.TrueMethodMatcherTests">
+            <summary>
+            Unit tests for the TrueMethodMatcher class.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: TrueMethodMatcherTests.cs,v 1.3 2006/04/09 07:19:06 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.MethodCounter">
+            <summary>
+            Useful base class for counting advices etc.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Choy Rim (.NET)</author>
+            <version>$Id: MethodCounter.cs,v 1.2 2007/03/16 04:01:47 aseovic Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Framework.MethodCounter.map">
+            <summary>Method name --> count, does not understand overloading </summary>
+        </member>
+        <member name="T:Spring.Aop.TruePointcutTests">
+            <summary>
+            Unit tests for the TruePointcut class.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: TruePointcutTests.cs,v 1.2 2006/04/09 07:19:06 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.ITimeStamped">
+            <summary>
+            This interface can be implemented by cacheable objects
+            or cache entries, to enable the freshness of objects
+            to be checked.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Choy Rim (.NET)</author>
+            <version>$Id: ITimeStamped.cs,v 1.1 2004/08/01 10:20:20 choyrim Exp $</version>
+        </member>
+        <member name="P:Spring.Aop.Framework.ITimeStamped.TimeStamp">
+            <summary>
+            Return the timestamp for this object.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.CachedAopProxyFactoryTests">
+            <summary>
+            Unit tests for the CachedAopProxyFactoryTests class.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: CachedAopProxyFactoryTests.cs,v 1.1 2007/08/04 01:20:11 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.DefaultAopProxyFactoryTests">
+            <summary>
+            Unit tests for the DefaultAopProxyFactory class.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: DefaultAopProxyFactoryTests.cs,v 1.1 2007/08/04 01:20:11 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.AbstractMethodInvocationTests">
+            <summary>
+            Unit tests for the AbstractMethodInvocation class.
+            </summary>
+            <author>Rick Evans</author>
+            <author>Bruno Baia</author>
+            <version>$Id: AbstractMethodInvocationTests.cs,v 1.2 2008/02/06 18:29:05 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Support.TypeFiltersTests">
+            <summary>
+            Unit tests for the TypeFilters class.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Choy Rim (.NET)</author>
+            <version>$Id: TypeFiltersTests.cs,v 1.2 2005/07/21 16:01:12 springboy Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Support.ControlFlowPointcutTests">
+            <summary>
+            Unit tests for the ControlFlowPointcut class.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="M:Spring.Aop.Support.ControlFlowPointcutTests.SelectiveApplication">
+            <summary>
+            Check that we can use a cflow pointcut only in conjunction with
+            a static pointcut: e.g. all setter methods that are invoked under
+            a particular class.
+            </summary>
+            <remarks>
+            This greatly reduces the number of calls to the cflow pointcut,
+            meaning that it's not so prohibitively expensive.
+            </remarks>
+        </member>
+        <member name="T:Spring.Aop.Support.ControlFlowPointcutTests.SetterPointcut">
+            <summary>
+            Pointcut to catch all methods beginning with 'Set'.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Support.AttributeMatchMethodPointcutTests">
+            <summary>
+            Unit tests for the AttributeMatchMethodPointcut class.
+            </summary>
+            <author>Rick Evans</author>
+            <author>Ronald Wildenberg</author>
+            <version>$Id: AttributeMatchMethodPointcutTests.cs,v 1.3 2007/05/21 16:44:08 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Support.AttributeMatchMethodPointcutTests.MatchesWithAnInterfaceMethodThatMatchesTheAttributeTypeAndNoCheckInterfaces">
+            <summary>
+            Confirms that without interfaces checking, a method that is implemented from an interface, will not match.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.AttributeMatchMethodPointcutTests.MatchesWithAnInterfaceMethodThatMatchesTheAttributeTypeAndCheckInterfaces">
+            <summary>
+            Confirms that with interface checking, a method that is implementing an interface method 
+            where the attribute is defined will match.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.AttributeMatchMethodPointcutTests.MatchesWithAnIndirectInterfaceMethodThatMatchesTheAttributeTypeAndCheckInterfaces">
+            <summary>
+            Confirms that with interfaces checking, a method that is indirectly implementing an interface method
+            where the attribute is defined will match.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.AttributeMatchMethodPointcutTests.MatchesWithAnOverloadedInterfaceMethod">
+            <summary>
+            Confirms that overloading methods do not match, whatever the attributes.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.AttributeMatchMethodPointcutTests.MatchesWithAnIndirectInterfaceMethodFromSubclassThatMatchesTheAttributeTypeAndCheckInterfaces">
+            <summary>
+            Confirms that methods, defined in a subclass of a class that implements an interface that
+            has methods that have been decorated with an attribute, match.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.ProxyFactoryObjectTests">
+            <summary>
+            Integration test cases for the ProxyFactoryObject, using an XML object factory.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Federico Spinazzi (.NET)</author>
+            <author>Choy Rim (.NET)</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: ProxyFactoryObjectTests.cs,v 1.35 2007/12/07 17:59:31 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObjectTests.SingletonInstancesAreEqual">
+            <summary>
+            The instances are equal, but do not have object identity.
+            Interceptors and interfaces and the target are the same.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObjectTests.AutoInvoker">
+            <summary> Test invoker is automatically added to manipulate target</summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObjectTests.CanAddAndRemoveIntroductionsOnSingleton">
+            <summary>
+            Must see effect immediately on behaviour.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObjectTests.CanAddAndRemoveAspectInterfacesOnPrototype">
+            <summary> Try adding and removing interfaces and interceptors on prototype.
+            Changes will only affect future references obtained from the factory.
+            Each instance will be independent.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObjectTests.CanAddAndRemoveAspectInterfacesOnSingletonByCasting">
+            <summary>
+            Note that we can't add or remove interfaces without reconfiguring the
+            singleton. 
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObjectTests.GlobalsCanAddAspectInterfaces">
+            <summary> Checks that globals get invoked,
+            and that they can add aspect interfaces unavailable
+            to other objects. These interfaces don't need
+            to be included in proxiedInterface [].
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.ProxyFactoryObjectTests.PointcutForVoid">
+            <summary>
+            Fires only on void methods. Saves list of methods intercepted.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.ProxyFactoryObjectTests.PointcutForVoid.Matches(System.Reflection.MethodInfo,System.Type,System.Object[])">
+            <summary>
+            Must fire only if it returns void.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.ProxyFactoryObjectTests.IAddedGlobalInterface">
+            <summary> Aspect interface</summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.ProxyFactoryObjectTests.GlobalIntroduction">
+            <summary> Use as a global interceptor. Checks that 
+            global interceptors can add aspect interfaces.
+            NB: Add only via global interceptors in XML file.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.AutoProxy.AdvisorAutoProxyCreatorCircularReferencesTests">
+            <summary>
+            Tests for auto proxy creation combined with factory object and circular references.
+            </summary>
+            <author>Erich Eichinger (.NET)</author>
+            <version>$Id: AdvisorAutoProxyCreatorCircularReferencesTests.cs,v 1.4 2007/09/07 01:53:01 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.AfterReturningAdviceInterceptorTests">
+            <summary>
+            Unit tests for the AfterReturningAdviceInterceptor class.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="T:Spring.Aspects.Logging.SimpleLoggingAdviceTests">
+            <summary>
+            This class contains tests for SimpleLoggingAdvice
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: SimpleLoggingAdviceTests.cs,v 1.4 2008/04/04 14:59:47 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.ProxyConfigTests">
+            <summary>
+            Unit tests for the ProxyConfig class.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: ProxyConfigTests.cs,v 1.2 2006/04/09 07:19:05 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.AutoProxy.OrderedLogicalThreadContextCheckAdvisor">
+            <summary> 
+            Before advisor that allow us to manipulate ordering to check
+            that superclass sorting works correctly.
+            </summary>
+            <remarks>
+            It doesn't actually do anything except count
+            method invocations and check for presence of a value in the 
+            LogicalThreadContext.
+            </remarks>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: OrderedLogicalThreadContextCheckAdvisor.cs,v 1.2 2006/09/15 21:25:17 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Framework.AutoProxy.OrderedLogicalThreadContextCheckAdvisor.requireLtcHasValue">
+            <summary> Should we insist on the presence of a transaction attribute or refuse to accept one?</summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.CountingBeforeAdvice">
+            <summary>
+            Simple before advice example that we can use for counting checks.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Choy Rim (.NET)</author>
+            <version>$Id: CountingBeforeAdvice.cs,v 1.6 2007/03/16 04:01:47 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aspects.Logging.TestableSimpleLoggingAdvice">
+            <summary>
+            This is simple wrapper to expose the protected methood InvokeUnderLog in the class
+            SimpleLoggingAdvice for testing purposes.
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: TestableSimpleLoggingAdvice.cs,v 1.2 2007/12/06 17:17:24 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Logging.TestableSimpleLoggingAdvice.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.Logging.TestableSimpleLoggingAdvice"/> class.
+            </summary>
+            <param name="useDynamicLogger">if set to <c>true</c> [use dynamic logger].</param>
+        </member>
+        <member name="M:Spring.Aspects.Logging.TestableSimpleLoggingAdvice.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Spring.Aspects.Logging.TestableSimpleLoggingAdvice"/> class.
+            </summary>
+        </member>
+        <member name="M:Spring.Aspects.Logging.TestableSimpleLoggingAdvice.CallInvokeUnderLog(AopAlliance.Intercept.IMethodInvocation,Common.Logging.ILog)">
+            <summary>
+            Calls the protected InvokeUnderLog method
+            </summary>
+            <param name="invocation">The invocation.</param>
+            <param name="log">The log.</param>
+            <returns>The result of the call to IMethodInvocation.Proceed()</returns>
+        </member>
+        <member name="M:Spring.Aspects.Logging.TestableSimpleLoggingAdvice.CallIsInterceptorEnabled(AopAlliance.Intercept.IMethodInvocation,Common.Logging.ILog)">
+            <summary>
+            Calls the IsInterceptorEnabled method.
+            </summary>
+            <param name="invocation">The invocation.</param>
+            <param name="log">The log.</param>
+            <returns>The result of the protected method IsInterceptorEnabled</returns>
+        </member>
+        <member name="T:Spring.Aop.Framework.CountingThrowsAdvice">
+            <summary>
+            Simple throw advice example that we can use for counting checks.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Bruno Baia (.NET)</author>
+            <version>$Id: CountingThrowsAdvice.cs,v 1.2 2007/03/16 04:01:47 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreatorTests">
+            <summary>
+            Tests for ObjectNameAutoProxyCreator functionality
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: ObjectNameAutoProxyCreatorTests.cs,v 1.6 2007/09/07 01:53:01 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.AdvisorAdapterRegistrationTests">
+            <summary>
+            TestCase for AdvisorAdapterRegistrationManager mechanism.
+            </summary>
+            <author>Dmitriy Kopylenko</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="T:Spring.Aop.SimpleBeforeAdviceInterceptor">
+            <summary>
+            
+            </summary>
+            <author>Dmitriy Kopylenko</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="T:Spring.Aop.Interceptor.SerializableNopInterceptor">
+            <summary>
+            Subclass of NopInterceptor that is serializable and
+            can be used to test proxy serialization.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="T:Spring.Aop.Interceptor.NopInterceptor">
+            <summary>
+            Trivial interceptor that can be introduced into an interceptor chain to
+            aid in debugging.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Choy Rim (.NET)</author>
+            <version>$Id: NopInterceptor.cs,v 1.6 2008/01/14 20:49:47 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.ProxyFactoryTests">
+            <summary>
+            Unit tests for the ProxyFactory class.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Choy Rim (.NET)</author>
+            <author>Rick Evans (.NET)</author>
+            <version>$Id: ProxyFactoryTests.cs,v 1.22 2008/03/21 10:49:38 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.CountingAfterReturningAdvice">
+            <summary>
+            Simple after returning advice example that we can use for counting checks.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Bruno Baia (.NET)</author>
+            <version>$Id: CountingAfterReturningAdvice.cs,v 1.2 2007/03/16 04:01:47 aseovic Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Advice.DebugAdvice">
+            <summary>
+            Convenience <see cref="T:AopAlliance.Intercept.IMethodInterceptor"/>
+            implementation that displays verbose information about intercepted
+            invocations to the system console.
+            </summary>
+            <remarks>
+            <p>
+            Can be introduced into an interceptor chain to serve as a useful low
+            level debugging aid.
+            </p>
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Federico Spinazzi (.NET)</author>
+            <author>Aleksandar Seovic (.NET)</author>
+            <version>$Id: DebugAdvice.cs,v 1.1 2007/08/08 07:45:36 markpollack Exp $</version>
+            <seealso cref="T:System.Console"/>
+        </member>
+        <member name="M:Spring.Aop.Advice.DebugAdvice.Invoke(AopAlliance.Intercept.IMethodInvocation)">
+            <summary>
+            Displays verbose information about intercepted invocations to the
+            system console.
+            </summary>
+            <param name="invocation">
+            The method invocation that is being intercepted.
+            </param>
+            <returns>
+            The result of the call to the
+            <see cref="M:AopAlliance.Intercept.IJoinpoint.Proceed"/> method of
+            the supplied <paramref name="invocation"/>; this return value may
+            well have been intercepted by the interceptor.
+            </returns>
+            <exception cref="T:System.Exception">
+            If any of the interceptors in the chain or the target object itself
+            throws an exception.
+            </exception>
+            <seealso cref="T:System.Console"/>
+            <seealso cref="M:AopAlliance.Intercept.IMethodInterceptor.Invoke(AopAlliance.Intercept.IMethodInvocation)"/>
+        </member>
+        <member name="P:Spring.Aop.Advice.DebugAdvice.Count">
+            <summary>
+            Gets the count of the number of times this interceptor has been
+            invoked.
+            </summary>
+            <returns>
+            The count of the number of times this interceptor has been invoked.
+            </returns>
+        </member>
+        <member name="T:Spring.Aspects.Cache.CacheResultAdviceTests">
+            <summary>
+            Unit tests for the CacheResultAdvice class.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CacheResultAdviceTests.cs,v 1.4 2007/08/22 20:16:51 oakinger Exp $</version>
+        </member>
+        <member name="M:Spring.Aspects.Cache.CacheResultAdviceTests.CacheResultOfMethodThatReturnsNull">
+            <summary>
+            Change History:
+            2007-08-22 (oakinger): changed behaviour to cache null values as well
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Target.PrototypeTargetSourceTests">
+            <summary>
+            Unit tests for the PrototypeTargetSource class.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Federico Spinazzi</author>
+            <version>$Id: PrototypeTargetSourceTests.cs,v 1.8 2007/07/28 07:33:22 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Target.PrototypeTargetSourceTests.FixtureSetUp">
+            <summary>
+            The setup logic executed before the execution of this test fixture.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Target.PrototypeTargetSourceTests.PrototypeAndSingletonBehaveDifferently">
+            <summary>
+             Test that multiple invocations of the prototype object will result
+             in no change to visible state, as a new instance is used.
+             With the singleton, there will be change.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Target.EmptyTargetSourceTests">
+            <summary>
+            Unit tests for the EmptyTargetSource class.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: EmptyTargetSourceTests.cs,v 1.2 2006/04/09 07:19:06 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.ISimpleBeforeAdvice">
+            <summary>
+            Simple BeforeAdvice targeted for testing
+            </summary>
+            <author>Dmitriy Kopylenko</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.DecoratorAopProxyTests">
+            <summary>
+            Additional and overridden tests for the decorator-based proxy.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Bruno Baia (.NET)</author>
+            <version>$Id: DecoratorAopProxyTests.cs,v 1.6 2008/05/21 08:04:52 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests">
+            <summary>
+            Useful base class for Aop proxy test cases.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Bruno Baia (.NET)</author>
+            <version>$Id: AbstractAopProxyTests.cs,v 1.21 2008/05/21 08:04:52 bbaia Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests.OneAdvisedObjectCallsAnother">
+            <summary>
+            Check that the two MethodInvocations necessary are independent 
+            and don't conflict.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests.TargetCanGetProxyEvenIfNoAdviceChain">
+            <summary>
+            Check that although a method is eligible for advice chain optimization and 
+            direct reflective invocation, it doesn't happen if we've asked to see the proxy, 
+            so as to guarantee a consistent programming model.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests.CanCastProxyToIAdvised">
+            <summary>
+            http://forum.springframework.net/showthread.php?t=504
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests.StringSetterNullReplacementAdvisor">
+            <summary>
+            Fires on setter methods that take a string.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests.StringSetterNullReplacementAdvice">
+            <summary>
+            Replaces null arg with "".
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.AopUtilsTests">
+            <summary>
+            Unit tests for the AopUtils class.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Choy Rim (.NET)</author>
+            <version>$Id: AopUtilsTests.cs,v 1.2 2008/03/21 10:49:37 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Aspects.Exceptions.ExceptionHandlerAspectIntegrationTests">
+            <summary>
+            This class contains tests for ExceptionHandlerAdvice
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: ExceptionHandlerAspectIntegrationTests.cs,v 1.6 2008/02/26 00:03:43 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aspects.Cache.CacheAspectIntegrationTests">
+            <summary>
+            Unit tests for the CacheParameterAdvice class.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: CacheAspectIntegrationTests.cs,v 1.4 2007/08/03 14:38:39 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Target.SimplePoolTargetSourceTests">
+            <summary> Tests for pooling invoker interceptor
+            TODO need to make these tests stronger: it's hard to
+            make too many assumptions about a pool
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Federico Spinazzi (.Net)</author>
+            <version>  $Id: SimplePoolTargetSourceTests.cs,v 1.3 2006/02/08 08:31:05 aseovic Exp $
+            </version>
+        </member>
+        <member name="F:Spring.Aop.Target.SimplePoolTargetSourceTests.INITIAL_COUNT">
+            <summary>Initial count value set in Object factory XML </summary>
+        </member>
+        <member name="M:Spring.Aop.Target.SimplePoolTargetSourceTests.TearDown">
+            <summary> We must simulate container shutdown, which should clear threads.</summary>
+        </member>
+        <member name="T:Spring.Aop.SimpleBeforeAdviceAdapter">
+            <summary>
+            
+            </summary>
+            <author>Dmitriy Kopylenko</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.CompositionAopProxyTests">
+            <summary>
+            Additional and overridden tests for the composition-based proxy.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Juergen Hoeller</author>
+            <author>Bruno Baia (.NET)</author>
+            <version>$Id: CompositionAopProxyTests.cs,v 1.4 2007/08/02 04:15:37 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Config.AopNamespaceParserTests">
+            <summary>
+            This class contains tests for the custom aop namespace.
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: AopNamespaceParserTests.cs,v 1.7 2007/08/09 03:06:37 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Target.HotSwappableTargetSourceTests">
+            <summary>
+            Unit tests for the HotSwappableTargetSource class.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Federico Spinazzi (.NET)</author>
+            <version>$Id: HotSwappableTargetSourceTests.cs,v 1.4 2006/04/09 07:19:06 markpollack Exp $</version>
+        </member>
+        <member name="F:Spring.Aop.Target.HotSwappableTargetSourceTests.INITIAL_COUNT">
+            <summary>Initial count value set in Object factory XML </summary>
+        </member>
+        <member name="M:Spring.Aop.Target.HotSwappableTargetSourceTests.TearDown">
+            <summary>
+            We must simulate container shutdown, which should clear threads.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.SimpleBeforeAdviceImpl">
+            <summary>
+            
+            </summary>
+            <author>Dmitriy Kopylenko</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="T:Spring.Aop.Framework.HashtableCachingAdvisorChainFactoryTests">
+            <summary>
+            Unit tests for the HashtableCachingAdvisorChainFactory class.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: HashtableCachingAdvisorChainFactoryTests.cs,v 1.2 2006/04/09 07:19:05 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.HashtableCachingAdvisorChainFactoryTests.FixtureSetUp">
+            <summary>
+            The setup logic executed before the execution of this test fixture.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.HashtableCachingAdvisorChainFactoryTests.SetUp">
+            <summary>
+            The setup logic executed before the execution of each individual test.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.HashtableCachingAdvisorChainFactoryTests.TearDown">
+            <summary>
+            The tear down logic executed after the execution of each individual test.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Framework.HashtableCachingAdvisorChainFactoryTests.FixtureTearDown">
+            <summary>
+            The tear down logic executed after the entire test fixture has executed.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.CountingMultiAdvice">
+            <summary>
+            Advice object that implements <i>multiple</i> Advice interfaces.
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Bruno Baia (.NET)</author>
+            <version>$Id: CountingMultiAdvice.cs,v 1.1 2006/08/10 18:45:57 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Target.ThreadLocalTargetSourceTests">
+            <author>Rod Johnson</author>
+            <author>Federico Spinazzi</author>
+            <version>  $Id: ThreadLocalTargetSourceTests.cs,v 1.5 2006/11/13 07:04:51 markpollack Exp $
+            </version>
+        </member>
+        <member name="F:Spring.Aop.Target.ThreadLocalTargetSourceTests.INITIAL_COUNT">
+            <summary>Initial count value set in Object factory XML </summary>
+        </member>
+        <member name="M:Spring.Aop.Target.ThreadLocalTargetSourceTests.TearDown">
+            <summary> We must simulate container shutdown, which should clear threads.</summary>
+        </member>
+        <member name="M:Spring.Aop.Target.ThreadLocalTargetSourceTests.UseDifferentManagedInstancesInSameThread">
+            <summary> Check we can use two different ThreadLocalTargetSources
+            managing objects of different types without them interfering
+            with one another.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Target.ThreadLocalTargetSourceTests.CanGetStatsViaMixinIfThereIsAnInterceptorTakingCareOfThem">
+            <summary> Relies on introduction
+            
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Support.DelegatingIntroductionInterceptorTests">
+            <summary>
+            Translation of DelegatingIntroductionInterceptor unit tests to Spring.NET.
+            </summary>
+            <remarks>
+            Spring.NET doesn't have a DelegatingIntroductionInterceptor because it handles
+            introductions without using interception. So all the unit tests show how similar
+            things can be done in Spring.NET.
+            </remarks>
+            <author>Rod Johnson</author>
+            <author>Choy Rim (.NET)</author>
+            <version>$Id: DelegatingIntroductionInterceptorTests.cs,v 1.6 2004/10/10 08:01:49 gcaprio Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Support.DelegatingIntroductionInterceptorTests.Test">
+            <summary>
+            test introduction.
+            <note>It must include the IAdvice marker interface to be a
+            valid introduction.</note>
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.MockTargetSource">
+            <summary>
+            Useful <see cref="T:Spring.Aop.ITargetSource"/> implementation 
+            that checks calls to GetTarget and ReleaseTarget.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Bruno Baia (.NET)</author>
+            <version>$Id: MockTargetSource.cs,v 1.1 2006/08/10 18:45:58 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicProxy.InheritanceAopProxyTests">
+            <summary>
+            Additional and overridden tests for the inheritance-based proxy.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: InheritanceAopProxyTests.cs,v 1.2 2008/03/03 09:29:17 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.UnknownAdviceTypeExceptionTests">
+            <summary>
+            Unit tests for the UnknownAdviceTypeException class.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: UnknownAdviceTypeExceptionTests.cs,v 1.2 2006/04/09 07:19:05 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aspects.Validation.ParameterValidationAdviceTests">
+            <summary>
+            Unit tests for the CacheParameterAdvice class.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: ParameterValidationAdviceTests.cs,v 1.2 2008/04/02 23:00:46 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Support.AbstractRegularExpressionMethodPointcutTests">
+            <summary>
+            Unit tests for the AbstractRegularExpressionMethodPointcut class.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Dmitriy Kopylenko</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="T:Spring.Aop.Framework.ReflectiveMethodInvocationTests">
+            <summary>
+            Unit tests for the ReflectiveMethodInvocation class.
+            </summary>
+            <author>Rick Evans</author>
+            <author>Bruno Baia</author>
+            <version>$Id: ReflectiveMethodInvocationTests.cs,v 1.8 2008/02/06 18:29:05 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.DynamicMethodInvocationTests">
+            <summary>
+            Unit tests for the DynamicMethodInvocation class.
+            </summary>
+            <author>Bruno Baia</author>
+            <version>$Id: DynamicMethodInvocationTests.cs,v 1.2 2008/02/06 18:29:05 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.Adapter.ThrowsAdviceInterceptorTests">
+            <summary>
+            Unit tests for the ThrowsAdviceInterceptor class.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="T:Spring.Aop.Support.SdkRegularExpressionMethodPointcutTests">
+            <summary>
+            Unit tests for the SdkRegularExpressionMethodPointcut class.
+            </summary>
+            <author>Dmitriy Kopylenko</author>
+            <author>Rick Evans (.NET)</author>
+        </member>
+        <member name="M:Spring.Aop.Support.SdkRegularExpressionMethodPointcutTests.FixtureSetUp">
+            <summary>
+            The setup logic executed before the execution of this test fixture.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.SdkRegularExpressionMethodPointcutTests.GetRegexpMethodPointcut">
+            <summary>
+            Returns the method pointcut implementation to be tested.
+            </summary>
+            <returns>The implementation.</returns>
+        </member>
+        <member name="M:Spring.Aop.Support.SdkRegularExpressionMethodPointcutTests.TryMatchesAfterSerialization">
+            <summary>
+            This exercises the logger after deserialization.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Framework.TimestampIntroductionInterceptor">
+            <summary>
+            Test introduction ported from Spring.Java.
+            </summary>
+            <remarks>
+            The name is deceptive because it isn't implemented as an interceptor.
+            It's an introduction which is handled differently in Spring.NET.
+            Keeping the name is useful as a placeholder for future porting work.
+            </remarks>
+            <author>Spring.Java Folks</author>
+            <author>Choy Rim (.NET)</author>
+        </member>
+        <member name="T:Spring.Aop.Framework.AutoProxy.CreatesTestObject">
+            <summary>
+            This is simple implementation of IFactoryObject that creates a TestObject.
+            </summary>
+            <author>Mark Pollack</author>
+            <version>$Id: CreatesTestObject.cs,v 1.1 2007/09/07 01:53:02 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.AutoProxy.AdvisorAutoProxyCreatorTests">
+            <summary>
+            Tests for auto proxy creation by advisor recognition.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Mark Pollack (.NET)</author>
+            <version>$Id: AdvisorAutoProxyCreatorTests.cs,v 1.4 2007/08/01 17:56:25 markpollack Exp $</version>
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AdvisorAutoProxyCreatorTests.NoProxy">
+            <summary>
+            No pointcuts match the methods on NoSetterProperties therefore 
+            there should be proxying.
+            </summary> 
+        </member>
+        <member name="M:Spring.Aop.Framework.AutoProxy.AdvisorAutoProxyCreatorTests.HasProxy">
+            <summary>
+            A pointcut matches the property (i.e. method set_Age) on TestObject
+            therefore there should be proxying.
+            </summary> 
+        </member>
+        <member name="T:Spring.Aop.Framework.PrototypeTargetTests">
+            <summary>
+            
+            </summary>
+            <author>Juergen Hoeller</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="T:Spring.AopExceptionTests">
+            <summary>
+            Unit tests for all of the exception classes in the Spring.Aop library...
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: AopExceptionTests.cs,v 1.3 2006/04/09 07:19:04 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Target.SingletonTargetSourceTests">
+            <summary>
+            Unit tests for the SingletonTargetSource class.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: SingletonTargetSourceTests.cs,v 1.2 2006/04/09 07:19:06 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Framework.AopContextTests">
+            <summary>
+            Unit tests for the AopContext class.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: AopContextTests.cs,v 1.6 2007/05/30 21:06:25 oakinger Exp $</version>
+        </member>
+        <member name="T:Spring.Aspects.Cache.InvalidateCacheAdviceTests">
+            <summary>
+            Unit tests for the InvalidateCacheAdvice class.
+            </summary>
+            <author>Aleksandar Seovic</author>
+            <version>$Id: InvalidateCacheAdviceTests.cs,v 1.4 2007/04/01 15:05:34 bbaia Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.TrueTypeFilterTests">
+            <summary>
+            Unit tests for the TrueTypeFilter class.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: TrueTypeFilterTests.cs,v 1.3 2006/04/09 07:19:06 markpollack Exp $</version>
+        </member>
+        <member name="T:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisorTests">
+            <summary>
+            Unit tests for RegularExpressionMethodPointcutAdvisorTests.
+            </summary>
+            <author>Rod Johnson</author>
+            <author>Simon White (.NET)</author>
+        </member>
+        <member name="M:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisorTests.SinglePattern">
+            <summary>
+            Basic use case, a single pattern defined.
+            </summary>
+        </member>
+        <member name="M:Spring.Aop.Support.RegularExpressionMethodPointcutAdvisorTests.MultiplePatterns">
+            <summary>
+            Multiple patterns defined within a single advisor.
+            </summary>
+        </member>
+        <member name="T:Spring.Aop.Support.RootTypeFilterTests">
+            <summary>
+            Unit tests for the RootTypeFilter class.
+            </summary>
+            <author>Rick Evans</author>
+            <version>$Id: RootTypeFilterTests.cs,v 1.2 2006/04/09 07:19:06 markpollack Exp $</version>
+        </member>
+    </members>
+</doc>
diff --git a/test/Spring/Spring.Core.Tests/AssemblyInfo.cs b/test/Spring/Spring.Core.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..2e09197e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Spring.Core Tests")]
+[assembly: AssemblyDescription("Unit tests for Spring.Core assembly")]
diff --git a/test/Spring/Spring.Core.Tests/Caching/AbstractCacheTests.cs b/test/Spring/Spring.Core.Tests/Caching/AbstractCacheTests.cs
new file mode 100644
index 00000000..80ece55e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Caching/AbstractCacheTests.cs
@@ -0,0 +1,181 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Threading;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+#endregion
+
+namespace Spring.Caching
+{
+    /// <summary>
+    /// Tests <see cref="AbstractCache"/> behaviour to ensure, 
+    /// that derived classes maybe rely on this default behaviour
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: AbstractCacheTests.cs,v 1.1 2007/08/25 14:26:36 oakinger Exp $</version>
+    [TestFixture]
+    public class AbstractCacheTests
+    {
+        #region ExposingAbstractCache utility class
+
+        /// <summary>
+        /// Exposes DoInsert() method for testing
+        /// </summary>
+        public abstract class ExposingAbstractCache : AbstractCache
+        {
+            protected override void DoInsert(object key, object value, TimeSpan timeToLive)
+            {
+                DoInsertExposed(key, value, timeToLive);
+            }
+
+            public abstract void DoInsertExposed(object key, object value, TimeSpan timeToLive);
+        }
+
+        #endregion
+
+        TimeSpan expectedPerItemTTL;
+        TimeSpan expectedPerCacheTTL;
+        MockRepository mocks;
+        ExposingAbstractCache cache;
+        string[] KEYS = new string[] { "keyA", "keyB" };
+
+        [SetUp]
+        public void SetUp()
+        {
+            mocks = new MockRepository();
+            cache = (ExposingAbstractCache)mocks.PartialMock(typeof(ExposingAbstractCache));
+
+            expectedPerItemTTL = new TimeSpan(0, 0, 10);
+            expectedPerCacheTTL = new TimeSpan(0, 0, 20);
+
+            cache.TimeToLive = expectedPerCacheTTL;
+        }
+
+        [Test]
+        public void TestDefaults()
+        {
+            ExposingAbstractCache localCache = (ExposingAbstractCache)mocks.PartialMock(typeof(ExposingAbstractCache));
+            Assert.AreEqual(TimeSpan.Zero, localCache.TimeToLive);
+            Assert.AreEqual(false, localCache.EnforceTimeToLive);
+        }
+
+        [Test]
+        public void AppliesPerCacheDefaultsIfNoPerItemValuesGiven()
+        {
+            // set expectations
+            cache.DoInsertExposed("key", "value", expectedPerCacheTTL);
+            mocks.ReplayAll();
+            // verify
+            cache.Insert("key", "value", expectedPerCacheTTL);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void AppliesPerCacheDefaultsIfTTLLessThanZero()
+        {
+            // set expectations
+            cache.DoInsertExposed("key", "value", expectedPerCacheTTL);
+            cache.DoInsertExposed("key", "value", expectedPerCacheTTL);
+            cache.DoInsertExposed("key", "value", expectedPerCacheTTL);
+            cache.DoInsertExposed("key", "value", expectedPerCacheTTL);
+            mocks.ReplayAll();
+            // verify
+            cache.Insert("key", "value", new TimeSpan(Timeout.Infinite));
+            cache.Insert("key", "value", new TimeSpan(-1));
+            cache.Insert("key", "value", new TimeSpan(Int64.MinValue));
+            cache.Insert("key", "value", TimeSpan.MinValue);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void AppliesPerCacheDefaultsIfEnfored()
+        {
+            // set expectations
+            cache.DoInsertExposed("key", "value", expectedPerCacheTTL);
+            mocks.ReplayAll();
+            // verify
+            cache.EnforceTimeToLive = true;
+            cache.Insert("key", "value", expectedPerItemTTL);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void AppliesZeroTTLIfTTLIsZero()
+        {
+            // set expectations
+            cache.DoInsertExposed("key", "value", TimeSpan.Zero);                        
+            mocks.ReplayAll();
+            // verify
+            cache.Insert("key", "value", TimeSpan.Zero);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void AppliesPerItemTTLIfTTLGreaterZero()
+        {
+            // set expectations
+            cache.DoInsertExposed("key", "value", expectedPerItemTTL);            
+            mocks.ReplayAll();
+            // verify
+            cache.Insert("key", "value", expectedPerItemTTL);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void RemoveAllCausesCallsToRemove()
+        {
+            // set expectations
+            cache.Remove(KEYS[0]);
+            cache.Remove(KEYS[1]);
+            mocks.ReplayAll();
+            // verify
+            cache.RemoveAll(KEYS);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ClearCausesCallToRemoveAllUsingKeys()
+        {
+            // set expectations
+            Expect.Call(cache.Keys).Return(KEYS);
+            cache.RemoveAll(KEYS);
+            mocks.ReplayAll();
+            // verify
+            cache.Clear();
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void CountUsingKeys()
+        {
+            // set expectations
+            Expect.Call(cache.Keys).Return(this.KEYS);
+            mocks.ReplayAll();
+            // verify
+            Assert.AreEqual( this.KEYS.Length, cache.Count );
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Caching/BaseCacheAttributeTests.cs b/test/Spring/Spring.Core.Tests/Caching/BaseCacheAttributeTests.cs
new file mode 100644
index 00000000..5d50d5b7
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Caching/BaseCacheAttributeTests.cs
@@ -0,0 +1,85 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Caching
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: BaseCacheAttributeTests.cs,v 1.1 2007/08/29 17:30:00 oakinger Exp $</version>
+    [TestFixture]
+    public class BaseCacheAttributeTests
+    {
+        private BaseCacheAttribute att;
+
+        private class DerivedCacheAttribute : BaseCacheAttribute
+        {
+        }
+
+        public string TestProperty
+        {
+            get { return "OK"; }
+        }
+
+        [SetUp]
+        public void SetUp()
+        {
+            att = new DerivedCacheAttribute();
+        }
+
+        [Test]
+        public void CacheNameIsSet()
+        {
+            att.CacheName = "MyCache";
+            Assert.AreEqual("MyCache", att.CacheName);
+        }
+
+        [Test]
+        public void KeyIsParsed()
+        {
+            att.Key = "TestProperty";
+            string result = att.KeyExpression.GetValue(this) as string;
+            Assert.AreEqual("OK", result);
+        }
+
+        [Test]
+        public void ConditionIsParsed()
+        {
+            att.Condition = "TestProperty";
+            string result = att.ConditionExpression.GetValue(this) as string;
+            Assert.AreEqual("OK", result);
+        }
+
+        [Test]
+        public void AllowsForExtendedTimeSpanConverterSyntax()
+        {
+            att.TimeToLive = "5ms";
+            Assert.AreEqual( new TimeSpan(0,0,0,0,5), att.TimeToLiveTimeSpan );
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Collections/AbstractQueueTests.cs b/test/Spring/Spring.Core.Tests/Collections/AbstractQueueTests.cs
new file mode 100644
index 00000000..0039b9cf
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Collections/AbstractQueueTests.cs
@@ -0,0 +1,225 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Unit tests for the AbstractQueue class.
+	/// </summary>
+	/// <author>Griffin Caprio</author>
+	/// <version>$Id: AbstractQueueTests.cs,v 1.7 2006/09/30 18:39:24 gcaprio Exp $</version>
+	[TestFixture]
+	public sealed class AbstractQueueTests
+	{
+		private sealed class SucceedQueue : AbstractQueue
+		{
+			
+			public override int Count
+			{
+				get { return 0; }
+			}
+			public override int Capacity
+			{
+				get
+				{
+					return 0;
+				}
+			}
+			public override bool Offer(object x)
+			{
+				if (x == null)
+				{
+					throw new NullReferenceException();
+				}
+				return true;
+			}
+
+			public override object Peek()
+			{
+				return Int32.Parse("1");
+			}
+
+			public override object Poll()
+			{
+				return Int32.Parse("1");
+			}
+
+			public override IEnumerator GetEnumerator()
+			{
+				return null;
+			}
+
+			public override void CopyTo(Array array, Int32 index)
+			{
+			}
+
+			public override object SyncRoot
+			{
+				get { return null; }
+
+			}
+
+			public override Boolean IsSynchronized
+			{
+				get { return false; }
+
+			}
+
+			public override bool IsEmpty
+			{
+				get { throw new NotImplementedException(); }
+			}
+		}
+
+		private sealed class FailQueue : AbstractQueue
+		{
+			public override int Count
+			{
+				get { return 0; }
+			}
+			public override int Capacity
+			{
+				get
+				{
+					return 0;
+				}
+			}
+			public override bool Offer(object x)
+			{
+				if (x == null)
+				{
+					throw new NullReferenceException();
+				}
+				return false;
+			}
+
+			public override object Peek()
+			{
+				return null;
+			}
+
+			public override object Poll()
+			{
+				return null;
+			}
+
+			public override IEnumerator GetEnumerator()
+			{
+				return null;
+			}
+
+			public override void CopyTo(Array array, Int32 index)
+			{
+			}
+
+			public override object SyncRoot
+			{
+				get { return null; }
+			}
+
+			public override Boolean IsSynchronized
+			{
+				get { return false; }
+			}
+
+			public override bool IsEmpty
+			{
+				get { throw new NotImplementedException(); }
+			}
+		}
+
+		[Test]
+		public void AddSucceed()
+		{
+			SucceedQueue q = new SucceedQueue();
+			Assert.IsTrue(q.Add(Int32.Parse("2")));
+		}
+
+		[Test]
+		[ExpectedException(typeof (InvalidOperationException))]
+		public void AddFail()
+		{
+			FailQueue q = new FailQueue();
+			q.Add(Int32.Parse("1"));
+		}
+
+		[Test]
+		[ExpectedException(typeof (NullReferenceException))]
+		public void AddNPE()
+		{
+			SucceedQueue q = new SucceedQueue();
+			q.Add(null);
+		}
+
+		[Test]
+		public void RemoveSucceed()
+		{
+			SucceedQueue q = new SucceedQueue();
+			q.Remove();
+		}
+
+		[Test]
+		[ExpectedException(typeof (NoElementsException))]
+		public void RemoveFail()
+		{
+			FailQueue q = new FailQueue();
+			q.Remove();
+		}
+
+		[Test]
+		public void ElementSucceed()
+		{
+			SucceedQueue q = new SucceedQueue();
+			q.Element();
+		}
+
+		[Test]
+		[ExpectedException(typeof (NoElementsException))]
+		public void ElementF()
+		{
+			FailQueue q = new FailQueue();
+			q.Element();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void AddAll1()
+		{
+			SucceedQueue q = new SucceedQueue();
+			q.AddAll(null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void AddAllSelf()
+		{
+			SucceedQueue q = new SucceedQueue();
+			q.AddAll(q);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Collections/HashedSetTests.cs b/test/Spring/Spring.Core.Tests/Collections/HashedSetTests.cs
new file mode 100644
index 00000000..52fffe4f
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Collections/HashedSetTests.cs
@@ -0,0 +1,49 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Unit tests for the HashedSet class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: HashedSetTests.cs,v 1.3 2006/04/09 07:19:06 markpollack Exp $</version>
+    [TestFixture]
+    public class HashedSetTests : SetTests
+    {
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public override void SetUp () 
+        {
+            Set = new HashedSet ();
+            SetForSetOps = new HashedSet ();
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Collections/HybridSetTests.cs b/test/Spring/Spring.Core.Tests/Collections/HybridSetTests.cs
new file mode 100644
index 00000000..894e5078
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Collections/HybridSetTests.cs
@@ -0,0 +1,49 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Unit tests for the HybridSet class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: HybridSetTests.cs,v 1.3 2006/04/09 07:19:06 markpollack Exp $</version>
+	[TestFixture]
+    public class HybridSetTests : SetTests
+    {
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public override void SetUp () 
+        {
+            Set = new HybridSet ();
+            SetForSetOps = new HybridSet ();
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Collections/ImmutableSetTests.cs b/test/Spring/Spring.Core.Tests/Collections/ImmutableSetTests.cs
new file mode 100644
index 00000000..8804c55a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Collections/ImmutableSetTests.cs
@@ -0,0 +1,206 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Unit tests for the ImmutableSet wrapper class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ImmutableSetTests.cs,v 1.2 2006/04/09 07:19:06 markpollack Exp $</version>
+	[TestFixture]
+    public class ImmutableSetTests
+    {
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public void SetUp () {
+            Set = new ImmutableSet (new HybridSet (new object [] {1, 2, 3}));
+        }
+
+        /// <summary>
+        /// The tear down logic executed after the execution of each individual test.
+        /// </summary>
+        [TearDown]
+        public void TearDown () {
+            Set = null;
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void Add()
+        {
+            Set.Add (1);
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void AddAll()
+        {
+            Set.AddAll (new int [] {4, 5, 6});
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void Remove()
+        {
+            Set.Remove (1);
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void RemoveAll()
+        {
+            object [] removed = new object [] {1, 3};
+            Set.RemoveAll (removed);
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void RetainAll()
+        {
+            Set.RetainAll (new object [] {1, 9});
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void Clear()
+        {
+            Set.Clear ();
+        }        
+
+        [Test]
+        public void IsEmpty() {
+            Assert.IsFalse (Set.IsEmpty);
+            ISet mySet = new ImmutableSet (new HybridSet ());
+            Assert.IsTrue (mySet.IsEmpty);
+        }       
+
+        [Test]
+        public void Contains() {
+            Assert.IsFalse (Set.Contains ("Funk"));
+            Assert.IsTrue (Set.Contains (1));
+        }
+
+        [Test]
+        public void ContainsAll() {
+            Assert.IsFalse (Set.ContainsAll (new object [] {"Funk", 1, 2, 3}));
+            Assert.IsTrue (Set.ContainsAll (new object [] {1, 3, 2}));
+        }      
+
+        [Test]
+        public void CopyTo() {
+            int [] expected = new int [] {1, 2, 3};
+            int [] actual = new int [Set.Count];
+            Set.CopyTo (actual, 0);
+            Assert.AreEqual (expected.Length, actual.Length);
+            for (int i = 0; i < expected.Length; ++i) {
+                Assert.AreEqual (expected [i], actual [i]);
+            }
+        } 
+
+        [Test]
+        public void EnumeratesOk () {
+            int [] expected = new int [] {1, 2, 3};
+            int i = 0;
+            foreach (int actual in Set) {
+                Assert.AreEqual (expected [i++], actual);
+            }
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void ClonedInstanceMustStillBeImmutable () 
+        {
+            ISet clone = (ISet) Set.Clone ();
+            clone.Add ("bad chair, bad chair");
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void MinusYieldsImmutableCone () 
+        {
+            ISet mySet = new ListSet (new int [] {1, 2});
+            ISet clone = Set.Minus (mySet);
+            Assert.IsNotNull (clone);
+            Assert.AreEqual (1, clone.Count);
+            clone.Add ("bad chair, bad chair");
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void UnionYieldsImmutableCone () 
+        {
+            ISet mySet = new ListSet (new int [] {1, 4});
+            ISet clone = Set.Union (mySet);
+            Assert.IsNotNull (clone);
+            Assert.AreEqual (4, clone.Count);
+            clone.Add ("bad chair, bad chair");
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void IntersectionYieldsImmutableCone () 
+        {
+            ISet mySet = new ListSet (new int [] {1, 4});
+            ISet clone = Set.Intersect (mySet);
+            Assert.IsNotNull (clone);
+            Assert.AreEqual (1, clone.Count);
+            clone.Add ("bad chair, bad chair");
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void ExclusiveOrYieldsImmutableCone () 
+        {
+            ISet mySet = new ListSet (new int [] {1, 4});
+            ISet clone = Set.ExclusiveOr (mySet);
+            Assert.IsNotNull (clone);
+            Assert.AreEqual (3, clone.Count);
+            clone.Add ("bad chair, bad chair");
+        }
+
+        /// <summary>
+        /// The ISet being tested.
+        /// </summary>
+        protected virtual ISet Set 
+        {
+            get 
+            {
+                return _set;
+            }
+            set 
+            {
+                _set = value;
+            }
+        }
+
+        private ISet _set;
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Collections/LinkedListTests.cs b/test/Spring/Spring.Core.Tests/Collections/LinkedListTests.cs
new file mode 100644
index 00000000..ddbe82f1
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Collections/LinkedListTests.cs
@@ -0,0 +1,250 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Set of tests for Spring.Util.LinkedList.
+	/// </summary>
+	/// <author>Simon White</author>
+	[TestFixture]
+	public sealed class LinkedListTests
+	{
+		[Test]
+		public void AddMultipleObjects()
+		{
+			LinkedList ll = new LinkedList();
+			ll.Add("item1");
+			ll.Add("item2");
+			ll.Add("item3");
+			Assert.IsTrue(ll.Count == 3, "Expected 3 items not " + ll.Count);
+			Assert.IsTrue(ll[0].Equals("item1"), "Expected first element to be \"item1\" not " + ll[0]);
+			Assert.IsTrue(ll[1].Equals("item2"), "Expected second element to be \"item2\" not " + ll[1]);
+		}
+
+		[Test]
+		public void Insert()
+		{
+			LinkedList ll = new LinkedList();
+			ll.Add("item1");
+			ll.Add("item2");
+			ll.Insert(1, "item1andahalf");
+			Assert.IsTrue(ll.Count == 3, "Expected 3 items not " + ll.Count);
+			Assert.IsTrue(ll[0].Equals("item1"), "Expected first element to be \"item1\" not " + ll[0]);
+			Assert.IsTrue(ll[1].Equals("item1andahalf"), "Expected second element to be \"item1andahalf\" not " + ll[1]);
+			Assert.IsTrue(ll[2].Equals("item2"), "Expected third element to be \"item2\" not " + ll[0]);
+		}
+
+		[Test]
+		public void RemoveAt()
+		{
+			LinkedList ll = new LinkedList();
+			ll.Add("item1");
+			ll.Add("item2");
+			ll.Add("item3");
+			ll.RemoveAt(1);
+			Assert.IsTrue(ll.Count == 2, "Expected 2 items not " + ll.Count);
+			Assert.IsTrue(ll[0].Equals("item1"), "Expected first element to be \"item1\" not " + ll[0]);
+			Assert.IsTrue(ll[1].Equals("item3"), "Expected second element to be \"item3\" not " + ll[1]);
+		}
+
+		[Test]
+		public void RemoveObject()
+		{
+			string item1 = "item1";
+			string item2 = "item2";
+			string item3 = "item3";
+			LinkedList ll = new LinkedList();
+			ll.Add(item1);
+			ll.Add(item2);
+			ll.Add(item3);
+			ll.Remove(item2);
+			Assert.IsTrue(ll.Count == 2, "Expected 2 items not " + ll.Count);
+			Assert.IsTrue(ll[0].Equals("item1"), "Expected first element to be \"item1\" not " + ll[0]);
+			Assert.IsTrue(ll[1].Equals("item3"), "Expected second element to be \"item3\" not " + ll[1]);
+		}
+
+		[Test]
+		[ExpectedException(typeof(System.ArgumentOutOfRangeException))]
+		public void RemoveAtOnEmptyLinkedList()
+		{
+			LinkedList ll = new LinkedList();
+			ll.RemoveAt(0);
+		}
+
+		[Test]
+		public void Enumerator()
+		{
+			LinkedList ll = new LinkedList();
+			ll.Add("item1");
+			ll.Add("item2");
+			ll.Add("item3");
+			IEnumerator ienum = ll.GetEnumerator();
+			Assert.IsTrue(ienum.MoveNext());
+			Assert.IsTrue(ienum.Current.Equals("item1"), "Expected first element to be \"item1\" not " + ienum.Current);
+			Assert.IsTrue(ienum.MoveNext());
+			Assert.IsTrue(ienum.Current.Equals("item2"), "Expected second element to be \"item2\" not " + ienum.Current);
+		}
+
+		[Test]
+		[ExpectedException(typeof(System.InvalidOperationException))]
+		public void EnumeratorModification()
+		{
+			LinkedList ll = new LinkedList();
+			ll.Add("item1");
+			ll.Add("item2");
+			ll.Add("item3");
+			IEnumerator ienum = ll.GetEnumerator();
+			Assert.IsTrue(ienum.MoveNext());
+			ll.RemoveAt(0);
+			ienum.MoveNext();
+			Assert.Fail("Expected enumerator to fail with InvalidOperationException");
+		}
+
+		[Test]
+		public void ConstructorWithIList()
+		{
+			ArrayList al = new ArrayList();
+			al.Add("al1");
+			al.Add("al2");
+			al.Add("al3");
+			LinkedList ll = new LinkedList(al);
+			Assert.IsTrue(ll.Count == 3, "Expected 3 items not " + ll.Count);
+			Assert.IsTrue(ll[0].Equals("al1"), "Expected first element to be \"al1\" not " + ll[0]);
+			Assert.IsTrue(ll[1].Equals("al2"), "Expected second element to be \"al2\" not " + ll[1]);
+		}
+
+		[Test]
+		public void IndexOfObject()
+		{
+			string item1 = "item1";
+			string item2 = "item2";
+			string item3 = "item3";
+			LinkedList ll = new LinkedList();
+			ll.Add(item1);
+			ll.Add(item2);
+			ll.Add(item3);
+			int index = ll.IndexOf(item2);
+			Assert.IsTrue(index == 1, "Expected index of 1 not " + index);
+		}
+
+		[Test]
+		public void CopyToWithZeroIndex()
+		{
+			LinkedList ll = new LinkedList();
+			ll.Add("item1");
+			ll.Add("item2");
+			ll.Add("item3");
+			string[] strings = new string[3];
+			ll.CopyTo(strings, 0);
+			Assert.IsTrue(strings[0].Equals("item1"), "Expected first element to be \"item1\" not " + strings[0]);
+			Assert.IsTrue(strings[1].Equals("item2"), "Expected second element to be \"item2\" not " + strings[1]);
+			Assert.IsTrue(strings[2].Equals("item3"), "Expected third element to be \"item3\" not " + strings[2]);
+		}
+
+		[Test]
+		public void CopyToWithNonZeroIndex()
+		{
+			LinkedList ll = new LinkedList();
+			ll.Add("item1");
+			ll.Add("item2");
+			ll.Add("item3");
+			string[] strings = new string[5];
+			strings[0] = "string1";
+			strings[1] = "string2";
+			ll.CopyTo(strings, 2);
+			Assert.IsTrue(strings[0].Equals("string1"), "Expected first element to be \"string1\" not " + strings[0]);
+			Assert.IsTrue(strings[1].Equals("string2"), "Expected second element to be \"string2\" not " + strings[1]);
+			Assert.IsTrue(strings[2].Equals("item1"), "Expected third element to be \"item1\" not " + strings[2]);
+			Assert.IsTrue(strings[3].Equals("item2"), "Expected fourth element to be \"item2\" not " + strings[3]);
+			Assert.IsTrue(strings[4].Equals("item3"), "Expected fifth element to be \"item3\" not " + strings[4]);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void CopyToWithNullArray()
+		{
+			LinkedList ll = new LinkedList();
+			ll.Add("item1");
+			ll.CopyTo(null, 0);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentOutOfRangeException))]
+		public void CopyToWithNegativeIndex()
+		{
+			LinkedList ll = new LinkedList();
+			ll.Add("item1");
+			string[] strings = new string[1];
+			ll.CopyTo(strings, -1);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentOutOfRangeException))]
+		public void CopyToWithIndexGreaterThanArrayLength()
+		{
+			LinkedList ll = new LinkedList();
+			ll.Add("item1");
+			string[] strings = new string[1];
+			ll.CopyTo(strings, 2);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void CopyToWithInsufficientSizeArray()
+		{
+			LinkedList ll = new LinkedList();
+			ll.Add("item1");
+			ll.Add("item2");
+			string[] strings = new string[2];
+			ll.CopyTo(strings, 1);
+		}
+
+		[Test]
+		public void Contains()
+		{
+			LinkedList ll = new LinkedList();
+			Assert.IsFalse(ll.Contains("Foo"));
+            
+			ll = new LinkedList();
+			Assert.IsFalse(ll.Contains(null));
+			ll.Add("Foo");
+			ll.Add(null);
+			ll.Add("Bar");
+			Assert.IsTrue(ll.Contains(null));
+			Assert.IsTrue(ll.Contains("Bar"));
+			Assert.IsTrue(ll.Contains("Foo"));
+
+			ll = new LinkedList();
+			ll.Add("Foo");
+			ll.Add("Bar");
+			Assert.IsFalse(ll.Contains(null));
+		}
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Collections/ListSetTests.cs b/test/Spring/Spring.Core.Tests/Collections/ListSetTests.cs
new file mode 100644
index 00000000..ff61f180
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Collections/ListSetTests.cs
@@ -0,0 +1,49 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Unit tests for the ListSet class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ListSetTests.cs,v 1.3 2006/04/09 07:19:06 markpollack Exp $</version>
+	[TestFixture]
+    public class ListSetTests : SetTests
+    {
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public override void SetUp () 
+        {
+            Set = new ListSet ();
+            SetForSetOps = new ListSet ();
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Collections/PriorityQueueTests.cs b/test/Spring/Spring.Core.Tests/Collections/PriorityQueueTests.cs
new file mode 100644
index 00000000..096e032c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Collections/PriorityQueueTests.cs
@@ -0,0 +1,463 @@
+using System;
+using System.Collections;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+using NUnit.Framework;
+using Spring.Util;
+
+namespace Spring.Collections
+{
+	[TestFixture]
+	public class PriorityQueueTests
+	{
+		protected static Int32 zero = Int32.Parse("0");
+		protected static Int32 one = Int32.Parse("1");
+		protected static Int32 two = Int32.Parse("2");
+		protected static Int32 three = Int32.Parse("3");
+		protected static Int32 four = Int32.Parse("4");
+		protected static Int32 five = Int32.Parse("5");
+		protected static Int32 six = Int32.Parse("6");
+		protected static Int32 seven = Int32.Parse("7");
+		protected static Int32 eight = Int32.Parse("8");
+		protected static Int32 nine = Int32.Parse("9");
+		protected static Int32 m1 = Int32.Parse("-1");
+		protected static Int32 m2 = Int32.Parse("-2");
+		protected static Int32 m3 = Int32.Parse("-3");
+		protected static Int32 m4 = Int32.Parse("-4");
+		protected static Int32 m5 = Int32.Parse("-5");
+		protected static Int32 m10 = Int32.Parse("-10");
+		private int SIZE = 20;
+
+		internal class MyReverseComparator : IComparer
+		{
+			public virtual int Compare(Object x, Object y)
+			{
+				int i = (int)x;
+				int j = (int)y;
+				if (i < j)
+					return 1;
+				if (i > j)
+					return - 1;
+				return 0;
+			}
+		}
+
+		private PriorityQueue populatedQueue(int n)
+		{
+			PriorityQueue q = new PriorityQueue(n);
+			Assert.IsTrue((q.Count == 0));
+			for (int i = n - 1; i >= 0; i -= 2)
+				Assert.IsTrue(q.Offer(i));
+			for (int i = (n & 1); i < n; i += 2)
+				Assert.IsTrue(q.Offer(i));
+			Assert.IsFalse((q.Count == 0));
+			Assert.AreEqual(n, q.Count);
+			return q;
+		}
+
+		[Test]
+		public void CreateUnboundedQueue()
+		{
+			Assert.AreEqual(0, new PriorityQueue(SIZE).Count);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void ThrowsArgumentExceptionForZeroCapacity()
+		{
+			new PriorityQueue(0);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void ThrowsArgumentNullExceptionForNullCollection()
+		{
+			PriorityQueue q = new PriorityQueue((ICollection) null);
+		}
+
+		[Test]
+			[ExpectedException(typeof(ArgumentNullException))]
+		public void ThrowsArgumentNullExceptionForNullCollectionElements()
+		{
+			object[] ints = new object[SIZE];
+			PriorityQueue q = new PriorityQueue(new ArrayList(ints));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void ThrowsArgumentNullExceptionForSomeNullCollectionElements()
+		{
+			object[] ints = new object[SIZE];
+			for (int i = 0; i < SIZE - 1; ++i)
+				ints[i] = i;
+			PriorityQueue q = new PriorityQueue(new ArrayList(ints));
+		}
+
+		[Test]
+		public void ConstructorFromExistingCollection()
+		{
+			Int32[] ints = new Int32[SIZE];
+			for (int i = 0; i < SIZE; ++i)
+				ints[i] = i;
+			PriorityQueue q = new PriorityQueue(new ArrayList(ints));
+			for (int i = 0; i < SIZE; ++i)
+				Assert.AreEqual(ints[i], q.Poll());
+			Assert.IsTrue( q.IsEmpty );
+		}
+
+		[Test]
+		public void ConstructorUsingComparator()
+		{
+			MyReverseComparator cmp = new MyReverseComparator();
+			PriorityQueue q = new PriorityQueue(SIZE, cmp);
+			Assert.AreEqual(cmp, q.Comparator());
+			Int32[] ints = new Int32[SIZE];
+			for (int i = 0; i < SIZE; ++i)
+				ints[i] = i;
+			q.AddAll(new ArrayList(ints));
+			for (int i = SIZE - 1; i >= 0; --i)
+				Assert.AreEqual(ints[i], q.Poll());
+			Assert.IsTrue( q.IsEmpty );
+		}
+
+		[Test]
+		public void IsEmpty()
+		{
+			PriorityQueue q = new PriorityQueue(2);
+			Assert.IsTrue( q.IsEmpty );
+			q.Add(1);
+			Assert.IsFalse( q.IsEmpty );
+			q.Add(2);
+			q.Remove();
+			q.Remove();
+			Assert.IsTrue( q.IsEmpty );
+		}
+
+		[Test]
+		public void Size()
+		{
+			PriorityQueue q = populatedQueue(SIZE);
+			for (int i = 0; i < SIZE; ++i)
+			{
+				Assert.AreEqual(SIZE - i, q.Count);
+				q.Remove();
+			}
+			for (int i = 0; i < SIZE; ++i)
+			{
+				Assert.AreEqual(i, q.Count);
+				q.Add(i);
+			}
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void OfferWithNullObject()
+		{
+			PriorityQueue q = new PriorityQueue(1);
+			q.Offer(null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void AddWithNullObject()
+		{
+			PriorityQueue q = new PriorityQueue(1);
+			q.Add(null);
+		}
+
+		[Test]
+		public void OfferWithComparableElements()
+		{
+			PriorityQueue q = new PriorityQueue(1);
+			Assert.IsTrue(q.Offer(zero));
+			Assert.IsTrue(q.Offer(one));
+		}
+
+		[Test]
+		[ExpectedException(typeof (InvalidCastException))]
+		public void OfferNonComparable()
+		{
+			PriorityQueue q = new PriorityQueue(1);
+			q.Offer(new Object());
+			q.Offer(new Object());
+			q.Offer(new Object());
+		}
+
+		[Test]
+		public void AddWithComparableElements()
+		{
+			PriorityQueue q = new PriorityQueue(SIZE);
+			for (int i = 0; i < SIZE; ++i)
+			{
+				Assert.AreEqual(i, q.Count);
+				Assert.IsTrue(q.Add(i));
+			}
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void AddAllWithNullElements()
+		{
+			PriorityQueue q = new PriorityQueue(1);
+			q.AddAll(null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void AddAllWithCollectionWithNullElements()
+		{
+			PriorityQueue q = new PriorityQueue(SIZE);
+			object[] ints = new object[SIZE];
+			q.AddAll(new ArrayList(ints));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void AddAllWithCollectionWithSomeNullElements()
+		{
+			PriorityQueue q = new PriorityQueue(SIZE);
+			object[] ints = new object[SIZE];
+			for (int i = 0; i < SIZE - 1; ++i)
+				ints[i] = i;
+			q.AddAll(new ArrayList(ints));
+		}
+
+		[Test]
+		public void AddAllWithCollection()
+		{
+			Int32[] empty = new Int32[0];
+			Int32[] ints = new Int32[SIZE];
+			for (int i = 0; i < SIZE; ++i)
+				ints[i] = (SIZE - 1 - i);
+			PriorityQueue q = new PriorityQueue(SIZE);
+			Assert.IsFalse(q.AddAll(new ArrayList(empty)));
+			Assert.IsTrue(q.AddAll(new ArrayList(ints)));
+			for (int i = 0; i < SIZE; ++i)
+				Assert.AreEqual(i, q.Poll());
+		}
+
+		[Test]
+		public void Poll()
+		{
+			PriorityQueue q = populatedQueue(SIZE);
+			for (int i = 0; i < SIZE; ++i)
+			{
+				Assert.AreEqual(i, (q.Poll()));
+			}
+			Assert.IsNull(q.Poll());
+		}
+
+		[Test]
+		public void Peek()
+		{
+			PriorityQueue q = populatedQueue(SIZE);
+			for (int i = 0; i < SIZE; ++i)
+			{
+				Assert.AreEqual(i, (q.Peek()));
+				q.Poll();
+				Assert.IsTrue(q.Peek() == null || i != (int)(q.Peek()));
+			}
+			Assert.IsNull(q.Peek());
+		}
+
+		[Test]
+		[ExpectedException(typeof (NoElementsException))]
+		public void Element()
+		{
+			PriorityQueue q = populatedQueue(SIZE);
+			for (int i = 0; i < SIZE; ++i)
+			{
+				Assert.AreEqual(i, (q.Element()));
+				q.Poll();
+			}
+			q.Element();
+		}
+
+		[Test]
+		[ExpectedException(typeof (NoElementsException))]
+		public void Remove()
+		{
+			PriorityQueue q = populatedQueue(SIZE);
+			for (int i = 0; i < SIZE; ++i)
+			{
+				Assert.AreEqual(i, (q.Remove()));
+			}
+			q.Remove();
+		}
+
+		[Test]
+		public void RemoveElement()
+		{
+			PriorityQueue q = populatedQueue(SIZE);
+			for (int i = 1; i < SIZE; i += 2)
+			{
+				Assert.IsTrue(q.Remove(i));
+			}
+			for (int i = 0; i < SIZE; i += 2)
+			{
+				Assert.IsTrue(q.Remove(i));
+				Assert.IsFalse(q.Remove((i + 1)));
+			}
+			Assert.IsTrue((q.Count == 0));
+		}
+
+		[Test]
+		public void Contains()
+		{
+			PriorityQueue q = populatedQueue(SIZE);
+			for (int i = 0; i < SIZE; ++i)
+			{
+				Assert.IsTrue(CollectionUtils.Contains(q, i));
+				q.Poll();
+				Assert.IsFalse(CollectionUtils.Contains(q, i));
+			}
+		}
+
+		[Test]
+		public void Clear()
+		{
+			PriorityQueue q = populatedQueue(SIZE);
+			q.Clear();
+			Assert.IsTrue((q.Count == 0));
+			Assert.AreEqual(0, q.Count);
+			q.Add(1);
+			Assert.IsFalse((q.Count == 0));
+			q.Clear();
+			Assert.IsTrue((q.Count == 0));
+		}
+
+		[Test]
+		public void ContainsAll()
+		{
+			PriorityQueue q = populatedQueue(SIZE);
+			PriorityQueue p = new PriorityQueue(SIZE);
+			for (int i = 0; i < SIZE; ++i)
+			{
+				Assert.IsTrue(CollectionUtils.ContainsAll(q, p));
+				Assert.IsFalse(CollectionUtils.ContainsAll(p, q));
+				p.Add(i);
+			}
+			Assert.IsTrue(CollectionUtils.ContainsAll(p, q));
+		}
+
+		[Test]
+		public void RemoveAll()
+		{
+			for (int i = 1; i < SIZE; ++i)
+			{
+				PriorityQueue q = populatedQueue(SIZE);
+				PriorityQueue p = populatedQueue(i);
+				CollectionUtils.RemoveAll(q, p);
+				Assert.AreEqual(SIZE - i, q.Count);
+				for (int j = 0; j < i; ++j)
+				{
+					Int32 I = (int) p.Remove();
+					Assert.IsFalse(CollectionUtils.Contains(q, I));
+				}
+			}
+		}
+
+		[Test]
+		public void ToArrayObject()
+		{
+			PriorityQueue q = populatedQueue(SIZE);
+			Object[] o = (Object[]) CollectionUtils.ToArrayList(q).ToArray(typeof (object));
+			Array.Sort(o);
+			for (int i = 0; i < o.Length; i++)
+				Assert.AreEqual(o[i], q.Poll());
+		}
+
+		[Test]
+		public void ToArrayNonObject()
+		{
+			PriorityQueue q = populatedQueue(SIZE);
+			Int32[] ints = (Int32[]) CollectionUtils.ToArrayList(q).ToArray(typeof (int));
+			Array.Sort(ints);
+			for (int i = 0; i < ints.Length; i++)
+				Assert.AreEqual(ints[i], q.Poll());
+		}
+
+		[Test]
+		public void Iterator()
+		{
+			PriorityQueue q = populatedQueue(SIZE);
+			int i = 0;
+			IEnumerator it = q.GetEnumerator();
+			while (it.MoveNext())
+			{
+				Assert.IsTrue(CollectionUtils.Contains(q, it.Current));
+				++i;
+			}
+			Assert.AreEqual(i, SIZE);
+		}
+
+		[Test]
+		public void Serialization()
+		{
+			PriorityQueue q = populatedQueue(SIZE);
+			MemoryStream bout = new MemoryStream(10000);
+
+			BinaryFormatter formatter = new BinaryFormatter();
+			formatter.Serialize(bout, q);
+
+			MemoryStream bin = new MemoryStream(bout.ToArray());
+			BinaryFormatter formatter2 = new BinaryFormatter();
+
+			PriorityQueue r = (PriorityQueue) formatter2.Deserialize(bin);
+
+			Assert.AreEqual(q.Count, r.Count);
+			while (!(q.Count == 0))
+				Assert.AreEqual(q.Remove(), r.Remove());
+		}
+		[Test]
+			[ExpectedException(typeof(ArgumentException))]
+			public void QueueCopyToArrayWithSmallerDestinationArray()
+		{
+			PriorityQueue source = populatedQueue(SIZE);
+			object[] dest = new object[SIZE/2];
+			source.CopyTo(dest);
+		}
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void QueueCopyToArrayWithIndexOutOfDestinationArrayRange()
+		{
+			PriorityQueue source = populatedQueue(SIZE);
+			object[] dest = new object[SIZE/2];
+			source.CopyTo(dest, 11);
+		}
+		[Test]
+		[ExpectedException(typeof(IndexOutOfRangeException))]
+			public void QueueCopyToArrayWithValidSizeButInvalidStartingIndex()
+		{
+			PriorityQueue source = populatedQueue(SIZE);
+			object[] dest = new object[SIZE];
+			source.CopyTo(dest, 10);
+		}
+		[Test]
+			public void CompleteQueueCopyToArrayWithValidSize()
+		{
+			PriorityQueue source = populatedQueue(SIZE);
+			object[] dest = new object[SIZE];
+			source.CopyTo(dest);
+			for ( int i = 0; i < SIZE; i++ )
+			{
+				Assert.AreEqual(source.Poll(), dest[i]);
+			}
+		}
+		[Test]
+			public void PartialQueueCopyToArrayWithValidSize()
+		{
+			PriorityQueue source = populatedQueue(SIZE);
+			object[] dest = new object[SIZE*2];
+			source.CopyTo(dest, SIZE / 2);
+			for ( int i = 0; i < SIZE; i++ )
+			{
+				Assert.IsNull(dest[i]);
+			}
+			for ( int i = SIZE; i < SIZE / 2; i++ )
+			{
+				Assert.AreEqual(dest[i], i - SIZE / 2 );
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Collections/SetTests.cs b/test/Spring/Spring.Core.Tests/Collections/SetTests.cs
new file mode 100644
index 00000000..75f5925d
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Collections/SetTests.cs
@@ -0,0 +1,341 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using Spring.Collections;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// <b>Base</b> class for tests on the <see cref="Spring.Collections.ISet"/>
+	/// interface.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// This defines a set of tests that exercise the contract of the set interface.
+    /// Subclasses need only supply a concrete ISET imnplementation instance... this
+    /// instance must be set on the Set property exposed by this class in the
+    /// SetUp method. The Set instance must be empty for the start of each new test.
+    /// </p>
+    /// <p>
+    /// The SetForSetOps needs to be set during the SetUp method too.
+    /// </p>
+    /// </remarks>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: SetTests.cs,v 1.3 2006/04/09 07:19:06 markpollack Exp $</version>
+    public abstract class SetTests
+    {
+        protected static readonly object StuffOne = "This Is";
+
+        protected static readonly object StuffTwo = "Uncle";
+
+        protected static readonly object StuffThree = "Bob";
+
+        protected readonly object [] UniqueStuff = new object [] {StuffOne, StuffTwo, StuffThree};
+
+        protected readonly object [] DuplicatedStuff = new object [] {StuffOne, StuffTwo, StuffTwo};
+
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        public abstract void SetUp ();
+
+        /// <summary>
+        /// The tear down logic executed after the execution of each individual test.
+        /// </summary>
+        [TearDown]
+        public virtual void TearDown () {
+            Set = null;
+            SetForSetOps = null;
+        }
+
+        [Test]
+        public void Union() 
+        {
+            Set.AddAll (UniqueStuff);
+            SetForSetOps.AddAll (new object [] {"Bar", StuffOne});
+            ISet union = Set.Union (SetForSetOps);
+            Assert.IsTrue (union.Count == UniqueStuff.Length + 1);
+            Assert.IsFalse (object.ReferenceEquals (union, Set), "Got back same instance after set operation.");
+            Assert.IsTrue (Set.Count == UniqueStuff.Length);
+            Assert.IsTrue (SetForSetOps.Count == 2);
+        }
+
+        [Test]
+        public void Intersect() 
+        {
+            Set.AddAll (UniqueStuff);
+            SetForSetOps.AddAll (new object [] {"Bar", StuffOne});
+            ISet intersection = Set.Intersect (SetForSetOps);
+            Assert.IsTrue (intersection.Count == 1);
+            Assert.IsFalse (object.ReferenceEquals (intersection, Set), "Got back same instance after set operation.");
+            Assert.IsTrue (Set.Count == UniqueStuff.Length);
+            Assert.IsTrue (SetForSetOps.Count == 2);
+        }
+
+        [Test]
+        public void Minus()
+        {
+            Set.AddAll (UniqueStuff);
+            SetForSetOps.AddAll (new object [] {"Bar", StuffOne});
+            ISet minus = Set.Minus (SetForSetOps);
+            Assert.IsTrue (minus.Count == UniqueStuff.Length - 1);
+            Assert.IsFalse (object.ReferenceEquals (minus, Set), "Got back same instance after set operation.");
+            Assert.IsTrue (Set.Count == UniqueStuff.Length);
+            Assert.IsTrue (SetForSetOps.Count == 2);
+        }
+
+        [Test]
+        public void ExclusiveOr()
+        {
+            Set.AddAll (UniqueStuff);
+            SetForSetOps.AddAll (new object [] {"Bar", StuffOne});
+            ISet xor = Set.ExclusiveOr (SetForSetOps);
+            Assert.IsTrue (xor.Count == 3);
+            Assert.IsTrue (xor.ContainsAll (new object [] {"Bar", StuffTwo, StuffThree}));
+            Assert.IsFalse (object.ReferenceEquals (xor, Set), "Got back same instance after set operation.");
+            Assert.IsTrue (Set.Count == UniqueStuff.Length);
+            Assert.IsTrue (SetForSetOps.Count == 2);
+        }
+
+        [Test]
+        public void Contains()
+        {
+            Set.AddAll (UniqueStuff);
+            Assert.IsTrue (Set.Contains (StuffThree));
+            Assert.IsFalse (Set.Contains ("SourDough"));
+        }
+
+        [Test]
+        public void ContainsAll()
+        {
+            Set.AddAll (UniqueStuff);
+            Assert.IsTrue (Set.ContainsAll (new object [] {StuffThree, StuffTwo, StuffOne}));
+        }
+
+        [Test]
+        public void IsEmpty ()
+        {
+            Set.Add (StuffOne);
+            Set.Remove (StuffOne);
+            Assert.IsTrue (Set.IsEmpty);
+        }
+
+        [Test]
+        public void Add()
+        {
+            Assert.IsTrue (Set.Add (StuffOne));
+            Assert.IsTrue (Set.Count == 1, "Added 1 unique item, but the Count property wasn't sitting at 1.");
+        }
+
+        [Test]
+        public void AddNull()
+        {
+            if (SupportsNull) 
+            {
+                Assert.IsTrue (Set.Add (StuffOne));
+                Assert.IsTrue (Set.Add (null));
+                Assert.IsTrue (Set.Count == 2, "Added 2 unique item (one null), but the Count property wasn't sitting at 2.");
+                Assert.IsFalse (Set.Add (null));
+                Assert.IsTrue (Set.Count == 2, "Added null to a set already containing null, but the Count property changed.");
+            }
+        }
+
+        [Test]
+        public void EnumeratesNull()
+        {
+            if (SupportsNull) 
+            {
+                Set.AddAll (new object [] {StuffOne, null, StuffTwo});
+                bool gotNull = false;
+                foreach (object o in Set) 
+                {
+                    if (o == null)
+                    {
+                        gotNull = true;
+                        break;
+                    }
+                }
+                Assert.IsTrue (gotNull, "Stuffed a null value into the set but didn't get it back when enumerating over the set.");
+            }
+        }
+
+        [Test]
+        public void CopiesNull () 
+        {
+            if (SupportsNull) 
+            {
+                object [] expected = new object [] {StuffOne, null, StuffTwo};
+                Set.AddAll (expected);
+                object [] actual = new object [expected.Length];
+                Set.CopyTo (actual, 0);
+                bool gotNull = false;
+                foreach (object o in actual) 
+                {
+                    if (o == null)
+                    {
+                        gotNull = true;
+                        break;
+                    }
+                }
+                Assert.IsTrue (gotNull, "Copied a set with a null value into an array, but the resulting array did not contain a a null.");
+            }
+        }
+
+        [Test]
+        public void AddDuplicate()
+        {
+            Set.Add (StuffOne);
+            Assert.IsFalse (Set.Add (StuffOne));
+            Assert.IsTrue (Set.Count == 1, "Added 2 duplicate items, but the Count property wasn't sitting at 1.");
+        }
+
+        [Test]
+        public void AddAll()
+        {
+            Assert.IsTrue (Set.AddAll (UniqueStuff));
+            Assert.IsTrue (Set.Count == UniqueStuff.Length, "Added 3 unique items, but the Count property wasn't sitting at 3.");
+        }
+
+        [Test]
+        public void AddAllDuplicated()
+        {
+            Assert.IsTrue (Set.AddAll (DuplicatedStuff));
+            Assert.IsTrue (Set.Count == 2, "Added 3 (2 duplicated) items, but the Count property wasn't sitting at 2.");
+        }
+
+        [Test]
+        public void Remove()
+        {
+            Set.AddAll (UniqueStuff);
+            Set.Remove (StuffOne);
+            Assert.IsTrue (Set.Count == (UniqueStuff.Length - 1));
+            Assert.IsFalse (Set.Contains (StuffOne));
+            Assert.IsTrue (Set.Contains (StuffTwo));
+            Assert.IsTrue (Set.Contains (StuffThree));
+        }
+
+        [Test]
+        public void RemoveNull()
+        {
+            if (SupportsNull) 
+            {
+                Set.AddAll (UniqueStuff);
+                Assert.IsFalse (Set.Remove (null));
+                Set.Add (null);
+                Assert.IsTrue (Set.Remove (null));
+            }
+        }
+
+        [Test]
+        public void RemoveAll()
+        {
+            Set.AddAll (UniqueStuff);
+            object [] removed = new object [] {StuffOne, StuffTwo};
+            Set.RemoveAll (removed);
+            Assert.IsTrue (Set.Count == (UniqueStuff.Length - removed.Length));
+            Assert.IsFalse (Set.Contains (StuffOne));
+            Assert.IsFalse (Set.Contains (StuffTwo));
+            Assert.IsTrue (Set.Contains (StuffThree));
+        }
+
+        [Test]
+        public void RetainAll()
+        {
+            Set.AddAll (UniqueStuff);
+            Set.RetainAll (new object [] {StuffOne, StuffTwo});
+            Assert.IsTrue (Set.Count == 2);
+            Assert.IsTrue (Set.Contains (StuffOne));
+            Assert.IsTrue (Set.Contains (StuffTwo));
+            Assert.IsFalse (Set.Contains (StuffThree));
+        }
+
+        [Test]
+        public void Clear()
+        {
+            Set.AddAll (UniqueStuff);
+            Set.Clear ();
+            Assert.IsTrue (Set.Count == 0, "Calling Clear () did not remove all of the elements.");
+        }
+
+        /// <summary>
+        /// The ISet being tested.
+        /// </summary>
+        protected virtual ISet Set 
+        {
+            get 
+            {
+                return _set;
+            }
+            set 
+            {
+                _set = value;
+            }
+        }
+
+        /// <summary>
+        /// An extra ISet instance for use during the set operation tests.
+        /// </summary>
+        protected virtual ISet SetForSetOps
+        {
+            get 
+            {
+                return _setForSetOps;
+            }
+            set 
+            {
+                _setForSetOps = value;
+            }
+        }
+
+        /// <summary>
+        /// Does the Set being tested support the addition of null values?
+        /// </summary>
+        /// <remarks>
+        /// <p>
+        /// If true, then the tests that test the handling of the null value
+        /// will be executed.
+        /// </p>
+        /// </remarks>
+        protected bool SupportsNull
+        {
+            get 
+            {
+                return _setSupportsNullValue;
+            }
+            set 
+            {
+                _setSupportsNullValue = value;
+            }
+        }
+
+        private ISet _set;
+        private ISet _setForSetOps;
+        private bool _setSupportsNullValue = true;
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Collections/SortedSetTests.cs b/test/Spring/Spring.Core.Tests/Collections/SortedSetTests.cs
new file mode 100644
index 00000000..7cd619eb
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Collections/SortedSetTests.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Unit tests for the SortedSet class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: SortedSetTests.cs,v 1.3 2006/04/09 07:19:06 markpollack Exp $</version>
+	[TestFixture]
+    public class SortedSetTests : SetTests
+    {
+        [TestFixtureSetUp]
+        public void Init () 
+        {
+            SupportsNull = false;
+        }
+
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public override void SetUp () 
+        {
+            Set = new SortedSet ();
+            SetForSetOps = new SortedSet ();
+        }
+
+        [Test]
+        public void IsOrdered () 
+        {
+            ISet mySet = new SortedSet (new int [] {2, 4, 5, 1, 3, 0});
+            int j = 0;
+            foreach (object o in mySet) 
+            {
+                Assert.AreEqual (j++, o, "Found element out of order while iterating over SortedSet");
+            }
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Collections/StaticSetTests.cs b/test/Spring/Spring.Core.Tests/Collections/StaticSetTests.cs
new file mode 100644
index 00000000..558bd9cc
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Collections/StaticSetTests.cs
@@ -0,0 +1,129 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Collections
+{
+	/// <summary>
+	/// Unit tests for the static methods of the Set class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: StaticSetTests.cs,v 1.3 2006/04/09 07:19:06 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class StaticSetTests
+    {
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public void SetUp ()
+        {
+            one = new ListSet (new object [] {1, "Foo", 2});
+            two = new ListSet (new object [] {1, 3});
+        }
+
+        [Test]
+        public void Xor ()
+        {
+            ISet actual = Set.ExclusiveOr (one, two);
+            Assert.IsNotNull (actual);
+            Assert.AreEqual (3, actual.Count);
+            Assert.IsTrue (actual.ContainsAll (new object [] {"Foo", 2, 3}));
+            CheckThatOriginalsHaveNotBeenModified ();
+
+            Assert.IsNull (Set.ExclusiveOr (null, null));
+
+            actual = Set.ExclusiveOr (null, two);
+            Assert.AreEqual (two, actual);
+
+            actual = Set.ExclusiveOr (one, null);
+            Assert.AreEqual (one, actual);
+        }
+
+        [Test]
+        public void Minus ()
+        {
+            ISet actual = Set.Minus (one, two);
+            Assert.IsNotNull (actual);
+            Assert.AreEqual (2, actual.Count);
+            Assert.IsTrue (actual.ContainsAll (new object [] {"Foo", 2}));
+            CheckThatOriginalsHaveNotBeenModified ();
+
+            Assert.IsNull (Set.Minus (null, two));
+        }
+
+        [Test]
+        public void Union ()
+        {
+            ISet actual = Set.Union (one, two);
+            Assert.IsNotNull (actual);
+            Assert.AreEqual (4, actual.Count);
+            Assert.IsTrue (actual.ContainsAll (new object [] {1, "Foo", 2, 3}));
+            CheckThatOriginalsHaveNotBeenModified ();
+
+            Assert.IsNull (Set.Union (null, null));
+
+            actual = Set.Union (null, two);
+            Assert.AreEqual (two, actual);
+
+            actual = Set.Union (one, null);
+            Assert.AreEqual (one, actual);
+        }
+
+        [Test]
+        public void Intersect ()
+        {
+            ISet actual = Set.Intersect (one, two);
+            Assert.IsNotNull (actual);
+            Assert.AreEqual (1, actual.Count);
+            Assert.IsTrue (actual.Contains (1));
+            CheckThatOriginalsHaveNotBeenModified ();
+
+            Assert.IsNull (Set.Intersect (null, null));
+
+            actual = Set.Intersect (null, two);
+            Assert.AreEqual (0, actual.Count);
+
+            actual = Set.Intersect (one, null);
+            Assert.AreEqual (0, actual.Count);
+        }
+
+        private void CheckThatOriginalsHaveNotBeenModified () 
+        {
+            Assert.IsNotNull (one, "Set operation modified the original sets.");
+            Assert.AreEqual (3, one.Count, "Set operation modified the original sets.");
+            Assert.IsTrue (one.ContainsAll (new object [] {1, "Foo", 2}), "Set operation modified the original sets.");
+
+            Assert.IsNotNull (two, "Set operation modified the original sets.");
+            Assert.AreEqual (2, two.Count, "Set operation modified the original sets.");
+            Assert.IsTrue (two.ContainsAll (new object [] {1, 3}), "Set operation modified the original sets.");
+        }
+
+        private ISet one;
+        private ISet two;
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/CommonTypes.cs b/test/Spring/Spring.Core.Tests/CommonTypes.cs
new file mode 100644
index 00000000..7f64d128
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/CommonTypes.cs
@@ -0,0 +1,367 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+using System.ComponentModel;
+using DotNetMock;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+
+namespace Spring
+{
+	public class MockConfigurableObjectFactory : MockObject, IConfigurableObjectFactory
+	{
+		private ExpectationCounter _destroyCalls = new ExpectationCounter("MockConfigurableObjectFactory.DestroySingletonCalls");
+
+		public void SetDisposeCalls(int expectedCalls)
+		{
+			_destroyCalls.Expected = expectedCalls;
+		}
+
+		#region IConfigurableObjectFactory Members
+
+		public void RegisterSingleton(string objectName, object singletonObject)
+		{
+		}
+
+		public void Dispose()
+		{
+			_destroyCalls.Inc();
+		}
+
+		public void IgnoreDependencyType(Type type)
+		{
+		}
+
+
+	    public bool IsCurrentlyInCreation(string objectName)
+	    {
+	        throw new NotImplementedException();
+	    }
+
+	    public void AddObjectPostProcessor(IObjectPostProcessor objectPostProcessor)
+		{
+		}
+
+		public int ObjectPostProcessorCount
+		{
+			get { throw new NotImplementedException(); }
+		}
+
+		public void RegisterAlias(string objectName, string alias)
+		{
+		}
+
+		public void RegisterCustomConverter(Type requiredType, TypeConverter converter)
+		{
+		}
+
+		public bool ContainsSingleton(string name)
+		{
+			throw new NotImplementedException();
+		}
+
+		public IObjectDefinition GetObjectDefinition(string objectName)
+		{
+			return null;
+		}
+
+		public IObjectFactory ParentObjectFactory
+		{
+			set
+			{
+			}
+		}
+
+		#endregion
+
+		#region IHierarchicalObjectFactory Members
+
+		IObjectFactory IHierarchicalObjectFactory.ParentObjectFactory
+		{
+			get { return null; }
+		}
+
+		#endregion
+
+		#region IObjectFactory Members
+
+		public object this[string name]
+		{
+			get { return null; }
+		}
+
+		public bool ContainsObject(string name)
+		{
+			return false;
+		}
+
+		public string[] GetAliases(string name)
+		{
+			return null;
+		}
+
+		public object GetObject(string name, Type requiredType)
+		{
+			return null;
+		}
+
+		object IObjectFactory.GetObject(string name)
+		{
+			return null;
+		}
+
+	    public object GetObject(string name, object[] arguments)
+	    {
+	        return null;
+	    }
+
+	    public object GetObject(string name, Type requiredType, object[] arguments)
+	    {
+	        return null;
+	    }
+
+	    public bool IsSingleton(string name)
+		{
+			return false;
+		}
+
+
+	    public bool IsPrototype(string name)
+	    {
+	        return false;
+	    }
+
+	    public Type GetType(string name)
+		{
+			return null;
+		}
+
+
+
+	    public bool IsTypeMatch(string name, Type targetType)
+	    {
+	        return false;
+	    }
+
+	    public object ConfigureObject(object target)
+		{
+		    return null;
+		}
+
+        public object ConfigureObject(object target, string name)
+		{
+            return null;
+        }
+
+		#endregion
+	}
+
+	public class MockObjectFactory : MockObject, IObjectFactory
+	{
+		private Exception _exceptionToThrow = null;
+
+		public Exception ExceptionToThrow
+		{
+			get { return _exceptionToThrow; }
+			set { _exceptionToThrow = value; }
+		}
+
+		#region IObjectFactory Members
+
+		public object this[string name]
+		{
+			get
+			{
+				innerExecute();
+				return null;
+			}
+		}
+
+		public bool ContainsObject(string name)
+		{
+			innerExecute();
+			return false;
+		}
+
+		public string[] GetAliases(string name)
+		{
+			innerExecute();
+			return null;
+		}
+
+		public object GetObject(string name, Type requiredType)
+		{
+			innerExecute();
+			return null;
+		}
+
+		object IObjectFactory.GetObject(string name)
+		{
+			innerExecute();
+			return null;
+		}
+
+	    public object GetObject(string name, object[] arguments)
+	    {
+            innerExecute();
+            return null;
+	    }
+
+	    public object GetObject(string name, Type requiredType, object[] arguments)
+	    {
+            innerExecute();
+            return null;
+	    }
+
+	    public bool IsSingleton(string name)
+		{
+			innerExecute();
+			return false;
+		}
+
+
+	    public bool IsPrototype(string name)
+	    {
+            innerExecute();
+	        return false;
+	    }
+
+	    public Type GetType(string name)
+		{
+			innerExecute();
+			return null;
+		}
+
+
+	    public bool IsTypeMatch(string name, Type targetType)
+	    {
+	        innerExecute();
+	        return false;
+	    }
+
+	    public object ConfigureObject(object target)
+		{
+            return null;
+        }
+
+        public object ConfigureObject(object target, string name)
+		{
+            return null;
+        }
+
+		#endregion
+
+		private void innerExecute()
+		{
+			if (_exceptionToThrow != null)
+			{
+				throw _exceptionToThrow;
+			}
+		}
+
+		public void Dispose()
+		{
+		}
+	}
+
+    public class Inventor
+    {
+        public string Name;
+        public string Nationality;
+        public string[] Inventions;
+#if NET_2_0
+        public DateTime? DateOfGraduation;
+#endif
+        private DateTime dob;
+        private Place pob;
+
+        public Inventor() : this(null, DateTime.MinValue, null)
+        {}
+
+        public Inventor(string name, DateTime dateOfBirth, string nationality)
+        {
+            this.Name = name;
+            this.dob = dateOfBirth;
+            this.Nationality = nationality;
+            this.pob = new Place();
+        }
+
+        public DateTime DOB
+        {
+            get { return dob; }
+            set { dob = value; }
+        }
+
+        public Place PlaceOfBirth
+        {
+            get { return pob; }
+        }
+
+        public int GetAge(DateTime on)
+        {
+            // not very accurate, but it will do the job ;-)
+            return on.Year - dob.Year;
+        }
+    }
+
+    public class Place
+    {
+        public string City;
+        public string Country;
+    }
+
+    public class Society
+    {
+        public string Name = "League of Extraordinary Gentlemen";
+        public static string Advisors = "advisors";
+        public static string President = "president";
+
+        private IList members = new ArrayList();
+        private IDictionary officers = new Hashtable();
+
+        public IList Members
+        {
+            get { return members; }
+        }
+
+        public IDictionary Officers
+        {
+            get { return officers; }
+        }
+
+        public bool IsMember(string name)
+        {
+            bool found = false;
+            foreach (Inventor inventor in members)
+            {
+                if (inventor.Name == name)
+                {
+                    found = true;
+                    break;
+                }
+            }
+            return found;
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/ApplicationEventArgsTests.cs b/test/Spring/Spring.Core.Tests/Context/ApplicationEventArgsTests.cs
new file mode 100644
index 00000000..63536cd6
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/ApplicationEventArgsTests.cs
@@ -0,0 +1,35 @@
+using System;
+using NUnit.Framework;
+
+namespace Spring.Context
+{
+	[TestFixture]
+	public class ApplicationEventArgsTests
+	{
+		private ApplicationEventArgs _args;
+
+		[SetUp]
+		public void Init()
+		{
+			_args = new ApplicationEventArgs();
+		}
+
+		[TearDown]
+		public void Destroy()
+		{
+			_args = null;
+		}
+
+		[Test]
+		public void ArgsTimeStamp()
+		{
+			Assert.IsTrue(_args.TimeStamp.ToString("MM/dd/yyyy").Equals(DateTime.Now.ToString("MM/dd/yyyy")));
+		}
+
+		[Test]
+		public void ArgsMilliTimestamp()
+		{
+			Assert.IsTrue((_args.TimeStamp.Ticks - 621355968000000000)/10000 == _args.EventTimeMilliseconds);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/CommonTypes.cs b/test/Spring/Spring.Core.Tests/Context/CommonTypes.cs
new file mode 100644
index 00000000..584cd96f
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/CommonTypes.cs
@@ -0,0 +1,584 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports 
+
+using System;
+using System.Collections;
+using System.Globalization;
+using DotNetMock;
+using Spring.Context.Support;
+using Spring.Core.IO;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Context
+{
+	/// <summary>
+	/// This class contains common mock implementations of Context interfaces,
+	/// used for testing.
+	/// </summary>
+	public class MockMessageSource : MockObject, IMessageSource
+	{
+		private ExpectationCounter _getMessageCalls = new ExpectationCounter("MockMessageSource.GetMessageCounter");
+		private ExpectationString _getMessageCode = new ExpectationString("MockMessageSource.GetMessageCode");
+        private ExpectationString _getMessageDefaultMessage = new ExpectationString("MockMessageSource.GetMessageDefaultMessage");
+		private ExpectationArray _getMessageArguments = new ExpectationArray("MockMessageSource.GetMessageArguments");
+
+		private string _getMessageReturn = null;
+
+
+	    public MockMessageSource()
+	    {
+            // this is to ensure, that no expectations may be violated
+	        _getMessageCalls.Expected = -1;
+	        _getMessageCode.Expected = "something very, very unlikely " + Guid.NewGuid();
+	        _getMessageDefaultMessage.Expected = "something very, very unlikely " + Guid.NewGuid();
+	        _getMessageArguments.Expected = new object[] { "something very, very unlikely " + Guid.NewGuid() };
+	    }
+
+	    public void SetExpectedGetMessageCalls(int calls)
+		{
+			_getMessageCalls.Expected = calls;
+		}
+
+        public void SetExpectedGetMessageDefaultMessage(string defaultMessage)
+        {
+            _getMessageDefaultMessage.Expected = defaultMessage;
+        }
+
+		public void SetExpectedGetMessageArguments(object[] arguments)
+		{
+			_getMessageArguments.Expected = arguments;
+		}
+
+		public void SetExpectedGetMessageReturn(string message)
+		{
+			_getMessageReturn = message;
+		}
+
+		public void SetExpectedGetMessageCode(string code)
+		{
+			_getMessageCode.Expected = code;
+		}
+
+		#region IMessageSource Members
+
+		public string GetMessage(IMessageSourceResolvable resolvable, CultureInfo culture)
+		{
+			_getMessageCalls.Inc();
+			return _getMessageReturn;
+		}
+
+		public string GetMessage(string name, CultureInfo culture, params object[] args)
+		{
+			_getMessageCalls.Inc();
+			_getMessageCode.Actual = name;
+			_getMessageArguments.Actual = args;
+			return _getMessageReturn;
+		}
+
+		public string GetMessage(string name)
+		{
+			_getMessageCalls.Inc();
+			_getMessageCode.Actual = name;
+			return _getMessageReturn;
+		}
+
+		public string GetMessage(string name, params object[] args)
+		{
+			_getMessageCalls.Inc();
+			_getMessageCode.Actual = name;
+			_getMessageArguments.Actual = args;
+			return _getMessageReturn;
+		}
+
+
+	    public string GetMessage(string name, string defaultMessage, CultureInfo culture, params object[] arguments)
+	    {
+            _getMessageCalls.Inc();
+            _getMessageCode.Actual = name;
+	        _getMessageDefaultMessage.Actual = defaultMessage;
+            _getMessageArguments.Actual = arguments;
+            return _getMessageReturn;
+	    }
+
+	    public string GetMessage(string name, CultureInfo cultureInfo)
+		{
+			_getMessageCalls.Inc();
+			_getMessageCode.Actual = name;
+			return _getMessageReturn;
+		}
+
+		public object GetResourceObject(string name, CultureInfo culture)
+		{
+			return null;
+		}
+
+		public object GetResourceObject(string name)
+		{
+			return null;
+		}
+
+		public void ApplyResources(object value, string objectName, CultureInfo cultureInfo)
+		{
+		}
+
+		#endregion
+	}
+
+	public class MockMessageResolvable : MockObject, IMessageSourceResolvable
+	{
+		private string[] _codes;
+		private string _defaultMessage;
+		private object[] _arguments;
+		private ExpectationCounter _getCodesCalls = new ExpectationCounter("MockMessageSource.Codes");
+
+		public void SetExpectedCodesCalls(int calls)
+		{
+			_getCodesCalls.Expected = calls;
+		}
+
+		public void SetCode(string code)
+		{
+			SetCodes(new string[] {code});
+		}
+
+		public void SetCodes(string[] codes)
+		{
+			_codes = codes;
+		}
+
+		public void SetDefaultMessage(String defaultMessage)
+		{
+			_defaultMessage = defaultMessage;
+		}
+
+		public void SetArguments(object[] arguments)
+		{
+			_arguments = arguments;
+		}
+
+		#region IMessageSourceResolvable Members
+
+		public object[] GetArguments()
+		{
+			return _arguments;
+		}
+
+		public string[] GetCodes()
+		{
+			_getCodesCalls.Inc();
+			return _codes;
+		}
+
+		public string DefaultMessage
+		{
+			get { return _defaultMessage; }
+		}
+
+		#endregion
+	}
+
+	[Serializable]
+	public class MockContextAwareObject : MarshalByRefObject,
+		IApplicationContextAware, IMessageSourceAware,  IResourceLoaderAware
+	{
+		private IApplicationContext _applicationContext;
+		private IResourceLoader _resourceLoader;
+		private IMessageSource _messageSource;
+
+		public IApplicationContext GetApplicationContext()
+		{
+			return _applicationContext;
+		}
+
+		public IApplicationContext ApplicationContext
+		{
+			set { _applicationContext = value; }
+			get { return _applicationContext; }
+		}
+
+		public IResourceLoader ResourceLoader
+		{
+			set { _resourceLoader = value; }
+			get { return _resourceLoader; }
+		}
+
+		public IMessageSource MessageSource
+		{
+			get { return _messageSource; }
+			set { _messageSource = value; }
+		}
+	}
+
+	public class MockApplicationContext : AbstractApplicationContext, IMockObject
+	{
+		private string _mockName;
+		private bool _isVerified;
+		private DefaultListableObjectFactory factory;
+		private ExpectationCounter _closeCalls = new ExpectationCounter("MockConfigurableApplicationContext.CloseCalls");
+
+		public void SetCloseCalls(int expectedCalls)
+		{
+			_closeCalls.Expected = expectedCalls;
+		}
+
+		public MockApplicationContext() : this(null, null)
+		{
+		}
+
+		public MockApplicationContext(string name) : this(name, null)
+		{
+			_mockName = name;
+			factory = new DefaultListableObjectFactory();
+//			factory.AddObjectPostProcessor(new ApplicationContextAwareProcessor(this));
+		}
+
+		public MockApplicationContext(string name, IApplicationContext parentContext) : base(name, true, parentContext)
+		{
+			_mockName = name;
+			factory = new DefaultListableObjectFactory();
+//			factory.AddObjectPostProcessor(new ApplicationContextAwareProcessor(this));
+		}
+
+		public override IConfigurableListableObjectFactory ObjectFactory
+		{
+			get { return factory; }
+		}
+
+		protected override void RefreshObjectFactory()
+		{
+		}
+
+		public void RegisterSingleton()
+		{
+			RootObjectDefinition mcaoDef = new RootObjectDefinition(typeof (MockContextAwareObject), new MutablePropertyValues(), true);
+			factory.RegisterObjectDefinition("mcao-single", mcaoDef);
+		}
+
+		public void RegisterObject()
+		{
+			RootObjectDefinition mcaoDef = new RootObjectDefinition(typeof (MockContextAwareObject), new MutablePropertyValues(), false);
+			factory.RegisterObjectDefinition("mcao-proto", mcaoDef);
+		}
+
+		public override void Dispose()
+		{
+			_closeCalls.Inc();
+		}
+
+		#region IMockObject Members
+
+		public void NotImplemented(string methodName)
+		{
+			throw new NotImplementedException(methodName + " is not currently implemented");
+		}
+
+		public string MockName
+		{
+			get { return _mockName; }
+			set { _mockName = value; }
+		}
+
+		#endregion
+
+		#region IVerifiable Members
+
+		public void Verify()
+		{
+			Verifier.Verify(this);
+			_isVerified = true;
+		}
+
+		public bool IsVerified
+		{
+			get { return _isVerified; }
+		}
+
+		#endregion
+	}
+
+	public class MockDefaultApplicationContext : MockObject, IApplicationContext
+	{
+		public void Dispose()
+		{
+		}
+
+		#region IApplicationContext Members
+
+		public DateTime StartupDate
+		{
+			get { return new DateTime(); }
+		}
+
+		public event ApplicationEventHandler ContextEvent;
+
+		public long StartupDateMilliseconds
+		{
+			get { return 0; }
+		}
+
+		public string Name
+		{
+			get { return AbstractApplicationContext.DefaultRootContextName; }
+			set
+			{
+			}
+		}
+
+		public IApplicationContext ParentContext
+		{
+			get { return null; }
+			set
+			{
+			}
+		}
+
+		#endregion
+
+		#region IListableObjectFactory Members
+
+		public string[] GetObjectDefinitionNames(Type type)
+		{
+			return null;
+		}
+
+		public IObjectDefinition GetObjectDefinition(string name)
+		{
+			return null;
+		}
+
+		public IObjectDefinition GetObjectDefinition(string name, bool includeAncestors)
+		{
+			return null;
+		}
+
+		string[] IListableObjectFactory.GetObjectDefinitionNames()
+		{
+			return null;
+		}
+
+		public string[] GetObjectNamesForType(Type type)
+		{
+			return null;
+		}
+
+		public string[] GetObjectNamesForType(
+			Type type, bool includePrototypes, bool includeFactoryObjects)
+		{
+			return null;
+		}
+
+		public IDictionary GetObjectsOfType(Type type)
+		{
+			return null;
+		}
+
+		public IDictionary GetObjectsOfType(
+			Type type, bool includePrototypes, bool includeFactoryObjects)
+		{
+			return null;
+		}
+
+		public int ObjectDefinitionCount
+		{
+			get { return 0; }
+		}
+
+		public bool ContainsObjectDefinition(string name)
+		{
+			return false;
+		}
+
+		#endregion
+
+		#region IObjectFactory Members
+
+		public object this[string name]
+		{
+			get { return null; }
+		}
+
+		public bool ContainsObject(string name)
+		{
+			return false;
+		}
+
+		public string[] GetAliases(string name)
+		{
+			return null;
+		}
+
+		public object GetObject(string name, Type requiredType)
+		{
+			return null;
+		}
+
+		object IObjectFactory.GetObject(string name)
+		{
+			return null;
+		}
+
+	    public object GetObject(string name, object[] arguments)
+	    {
+	        return null;
+	    }
+
+	    public object GetObject(string name, Type requiredType, object[] arguments)
+	    {
+	        return null;
+	    }
+
+	    public bool IsSingleton(string name)
+		{
+			return false;
+		}
+
+
+	    public bool IsPrototype(string name)
+	    {
+	        return false;
+	    }
+
+	    public Type GetType(string name)
+		{
+			return null;
+		}
+
+
+	    public bool IsTypeMatch(string name, Type targetType)
+	    {
+	        return false;
+	    }
+
+	    public object ConfigureObject(object target)
+		{
+            return null;
+        }
+
+		public object ConfigureObject(object target, string name)
+		{
+            return null;
+        }
+
+        public object ConfigureObject(object target, string name, IObjectDefinition definition)
+        {
+            return null;
+        }
+
+		#endregion
+
+		#region IHierarchicalObjectFactory Members
+
+		public IObjectFactory ParentObjectFactory
+		{
+			get { return null; }
+		}
+
+		#endregion
+
+		#region IMessageSource Members
+
+		string IMessageSource.GetMessage(IMessageSourceResolvable resolvable, CultureInfo culture)
+		{
+			return null;
+		}
+
+		string IMessageSource.GetMessage(string name, CultureInfo culture, params object[] args)
+		{
+			return null;
+		}
+
+		string IMessageSource.GetMessage(string name)
+		{
+			return null;
+		}
+
+		string IMessageSource.GetMessage(string name, params object[] args)
+		{
+			return null;
+		}
+
+		string IMessageSource.GetMessage(string name, CultureInfo cultureInfo)
+		{
+			return null;
+		}
+
+		object IMessageSource.GetResourceObject(string name, CultureInfo culture)
+		{
+			return null;
+		}
+
+		object IMessageSource.GetResourceObject(string name)
+		{
+			return null;
+		}
+
+
+	    public string GetMessage(string name, string defaultMessage, CultureInfo culture, params object[] arguments)
+	    {
+	        return null;
+	    }
+
+	    void IMessageSource.ApplyResources(object value, string objectName, CultureInfo cultureInfo)
+		{
+		}
+
+		#endregion
+
+		#region IResourceLoader Members
+
+		public IResource GetResource(string location)
+		{
+			return null;
+		}
+
+		#endregion
+
+		#region IEventRegistry Members
+
+		public void PublishEvents(object sourceObject)
+		{
+			throw new NotImplementedException();
+		}
+
+		public void Subscribe(object subscriber)
+		{
+			throw new NotImplementedException();
+		}
+
+		public void Subscribe(object subscriber, Type targetSourceType)
+		{
+			throw new NotImplementedException();
+		}
+
+		#endregion
+
+		public void PublishEvent(object sender, ApplicationEventArgs e)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/ContextExceptionTests.cs b/test/Spring/Spring.Core.Tests/Context/ContextExceptionTests.cs
new file mode 100644
index 00000000..3d5a6028
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/ContextExceptionTests.cs
@@ -0,0 +1,46 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Context
+{
+    /// <summary>
+    /// Unit tests for all of the exception classes in the Spring.Context library...
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ContextExceptionTests.cs,v 1.2 2006/04/09 07:19:06 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class ContextExceptionTests : ExceptionsTest
+    {
+        [TestFixtureSetUp]
+        public void FixtureSetUp ()
+        {
+            AssemblyToCheck = Assembly.GetAssembly (typeof (Spring.Context.ApplicationContextException));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Context/ContextListenerObject.cs b/test/Spring/Spring.Core.Tests/Context/ContextListenerObject.cs
new file mode 100644
index 00000000..9844a6a3
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/ContextListenerObject.cs
@@ -0,0 +1,104 @@
+using System;
+using Spring.Context.Events;
+
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+namespace Spring.Context
+{
+	/// <summary>
+	/// Test object for receiving application context events.
+	/// </summary>
+	/// <author>Mark Pollack</author>
+	public sealed class ContextListenerObject : IApplicationContextAware, IApplicationEventListener
+	{
+		private IApplicationContext _ctx;
+		private bool _appListenerContextRefreshed = false;
+		private bool _appListenerContextClosed = false;
+		private bool _ctxRefreshed = false;
+		private bool _ctxClosed = false;
+
+		public ContextListenerObject()
+		{
+		}
+
+		public IApplicationContext ApplicationContext
+		{
+			set
+			{
+				_ctx = value;
+				_ctx.ContextEvent += new ApplicationEventHandler(ContextRefreshedHandler);
+			}
+			get { return _ctx; }
+		}
+
+		public bool AppListenerContextRefreshed
+		{
+			get { return _appListenerContextRefreshed; }
+		}
+
+		public bool AppListenerContextClosed
+		{
+			get { return _appListenerContextClosed; }
+		}
+
+		public bool CtxRefreshed
+		{
+			get { return _ctxRefreshed; }
+		}
+
+		public bool CtxClosed
+		{
+			get { return _ctxClosed; }
+		}
+
+		public void HandleApplicationEvent(object source, ApplicationEventArgs e)
+		{
+			ContextEventArgs ctxArgs = e as ContextEventArgs;
+			if (ctxArgs != null)
+			{
+				if (ctxArgs.Event == ContextEventArgs.ContextEvent.Refreshed)
+				{
+					_appListenerContextRefreshed = true;
+				}
+				if (ctxArgs.Event == ContextEventArgs.ContextEvent.Closed)
+				{
+					_appListenerContextClosed = true;
+				}
+			}
+		}
+
+		private void ContextRefreshedHandler(object sender, ApplicationEventArgs e)
+		{
+			ContextEventArgs args = e as ContextEventArgs;
+			if (args != null)
+			{
+				if (args.Event == ContextEventArgs.ContextEvent.Refreshed)
+				{
+					_ctxRefreshed = true;
+				}
+				else if (args.Event == ContextEventArgs.ContextEvent.Closed)
+				{
+					_ctxClosed = true;
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/EventListenerAttributeTests.cs b/test/Spring/Spring.Core.Tests/Context/EventListenerAttributeTests.cs
new file mode 100644
index 00000000..52be8067
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/EventListenerAttributeTests.cs
@@ -0,0 +1,44 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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 NUnit.Framework;
+
+namespace Spring.Context
+{
+	[TestFixture]
+	public sealed class EventListenerAttributeTests
+	{
+		[Test]
+		public void ReadEventListenerAttribute()
+		{
+			Attribute[] attributes = Attribute.GetCustomAttributes(typeof (IApplicationEventListener));
+			bool found = false;
+			foreach (Attribute attribute in attributes)
+			{
+				if (attribute is EventListenerAttribute)
+				{
+					found = true;
+				}
+			}
+			Assert.IsTrue(found, "EventListener Attribute not found");
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Events/ConsoleListenerTests.cs b/test/Spring/Spring.Core.Tests/Context/Events/ConsoleListenerTests.cs
new file mode 100644
index 00000000..fd83b843
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Events/ConsoleListenerTests.cs
@@ -0,0 +1,36 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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 NUnit.Framework;
+
+namespace Spring.Context.Events
+{
+	[TestFixture]
+	public class ConsoleListenerTests
+	{
+		[Test]
+		public void ConsoleOnApplicationEvent()
+		{
+			ConsoleListener listener = new ConsoleListener();
+			listener.HandleApplicationEvent( this, new ApplicationEventArgs() );
+		}
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs
new file mode 100644
index 00000000..488deec1
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs
@@ -0,0 +1,314 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	[TestFixture]
+	public class AbstractApplicationContextTests
+	{
+		private MockApplicationContext _context;
+
+		[SetUp]
+		public void Init()
+		{
+			EverythingAwareObject.InstanceCount = 0;
+			EverythingAwareObjectFactoryPostProcessor.InstanceCount = 0;
+			EverythingAwareObjectPostProcessor.InstanceCount = 0;
+			_context = new MockApplicationContext("MockApplicationContextName");
+		}
+
+		[TearDown]
+		public void Destroy()
+		{
+			_context.Dispose();
+			_context = null;
+		}
+
+
+        public void ContextAwareDisplayName()
+        {
+            
+        }
+		/// <summary>
+		/// Tests the case where there is an object in the context with the name of the
+		/// default message source name, that is NOT an IMessageSource.
+		/// </summary>
+		[Test]
+		public void InvalidMessageSourceObject()
+		{
+			RootObjectDefinition def = new RootObjectDefinition(typeof (TestObject));
+			((DefaultListableObjectFactory) _context.ObjectFactory)
+				.RegisterObjectDefinition(AbstractApplicationContext.MessageSourceObjectName, def);
+			_context.Refresh();
+			object foo = _context
+				.GetObject(AbstractApplicationContext.MessageSourceObjectName);
+			Assert.IsTrue(foo is ITestObject,
+				"Registered non-IMessageSource object under the default message source name, but " +
+				"failed to get it out of the context. Object retrieved is of type [ " + foo.GetType() + "].");
+		}
+
+		/// <summary>
+		/// Tests the case where there is an object in the context with the name of the
+		/// default event registry name, that is NOT an IEventRegistry.
+		/// </summary>
+		[Test]
+		public void InvalidEventRegistryObject()
+		{
+			RootObjectDefinition def = new RootObjectDefinition(typeof (TestObject));
+			((DefaultListableObjectFactory) _context.ObjectFactory)
+				.RegisterObjectDefinition(AbstractApplicationContext.EventRegistryObjectName, def);
+			_context.Refresh();
+			object foo = _context
+				.GetObject(AbstractApplicationContext.EventRegistryObjectName);
+			Assert.IsTrue(foo is ITestObject,
+				"Registered non-IEventRegistry object under the default message source name, but " +
+				"failed to get it out of the context. Object retrieved is of type [ " + foo.GetType() + "].");
+		}
+
+		[Test]
+		public void ContextAwareSingletonWasCalledBack()
+		{
+			_context.RegisterSingleton();
+			_context.Refresh();
+			MockContextAwareObject mcao1 = (MockContextAwareObject)_context.GetObject("mcao-single");
+			Assert.IsTrue(mcao1.ApplicationContext == _context, "context");
+			object mcao2 = _context.GetObject("mcao-single");
+			Assert.IsTrue(mcao1 == mcao2, "same");
+			Assert.IsTrue(_context.IsSingleton("mcao-single"), "singleton?");
+		}
+
+		[Test]
+		public void ContextAwarePrototypeWasCalledBack()
+		{
+			_context.RegisterObject();
+			_context.Refresh();
+			MockContextAwareObject mcao1 = (MockContextAwareObject)_context.GetObject("mcao-proto");
+			Assert.IsTrue(mcao1.ApplicationContext == _context, "context");
+			Assert.IsTrue(! _context.IsSingleton("mcao-proto"), "singleton");
+			MockContextAwareObject mcao2 = (MockContextAwareObject) _context.GetObject("mcao-proto");
+			Assert.IsTrue(mcao1 != mcao2, "instance");
+
+		}
+
+		[Test]
+		public void ContextAwareSingletonGetName()
+		{
+			_context.RegisterSingleton();
+			_context.Refresh();
+			MockContextAwareObject mcao1 = (MockContextAwareObject)_context.GetObject("mcao-single");
+			Assert.AreEqual(mcao1.ApplicationContext.Name, "MockApplicationContextName");
+		}
+
+		[Test]
+		public void ContextAwarePrototypeGetName()
+		{
+			_context.RegisterObject();
+			_context.Refresh();
+			MockContextAwareObject mcao1 = (MockContextAwareObject)_context.GetObject("mcao-proto");
+			Assert.AreEqual(mcao1.ApplicationContext.Name, "MockApplicationContextName");
+		}
+
+		[Test]
+		public void ParentNull()
+		{
+			Assert.IsNull(_context.ParentContext, "parent is not null");
+		}
+
+		[Test]
+		public void ParentNotNullGrandparentNull()
+		{
+			IApplicationContext parentContext = new MockApplicationContext("MockApplicationContextParent");
+			_context = new MockApplicationContext("MockApplicationContextName", parentContext);
+			Assert.IsNotNull(_context.ParentContext, "parent is null");
+			Assert.IsNull(_context.ParentContext.ParentContext, "parent is null");
+		}
+
+		#region OrderOfKnownProcessorInterfaces Utility Classes
+
+		public enum ObjectProcessingState
+		{
+			SetObjectName,
+			SetObjectFactory,
+			SetApplicationContext,
+			PostProcessObjectFactory,
+			ObjectPostProcessorBeforeInitialization,
+			ObjectPostProcessorAfterInitialization,
+		}
+
+		public class EverythingAwareObject :
+			IObjectNameAware,
+			IObjectFactoryAware,
+			IApplicationContextAware
+		{
+			public static int InstanceCount = 0;
+
+			private ObjectProcessingState currentState;
+
+			public EverythingAwareObject()
+			{
+				InstanceCount++;
+			}
+
+			public EverythingAwareObject(int expectObjectPostProcessorInstances)
+				:this()
+			{
+				// ensure postprocessor has been instantiated *before* this object
+				Assert.AreEqual(expectObjectPostProcessorInstances, EverythingAwareObjectPostProcessor.InstanceCount);
+			}
+
+			public ObjectProcessingState CurrentState
+			{
+				get { return currentState;}
+				set { currentState = value; }
+			}
+
+			public IApplicationContext ApplicationContext
+			{
+				get { throw new NotImplementedException(); }
+				set
+				{
+					Assert.AreEqual(ObjectProcessingState.SetApplicationContext, this.CurrentState);
+					this.CurrentState++;
+				}
+			}
+
+			public string ObjectName
+			{
+				set
+				{
+					Assert.AreEqual(ObjectProcessingState.SetObjectName, this.CurrentState);
+					this.CurrentState++;
+				}
+			}
+
+			public IObjectFactory ObjectFactory
+			{
+				set
+				{
+					Assert.AreEqual(ObjectProcessingState.SetObjectFactory, this.CurrentState);
+					this.CurrentState++;
+				}
+			}
+		}
+
+		public class EverythingAwareObjectFactoryPostProcessor : EverythingAwareObject,
+			IObjectFactoryPostProcessor
+		{
+			public new static int InstanceCount = 0;
+
+			public EverythingAwareObjectFactoryPostProcessor()
+			{
+				InstanceCount++;
+			}
+
+			public void PostProcessObjectFactory(IConfigurableListableObjectFactory factory)
+			{
+				Assert.AreEqual(ObjectProcessingState.PostProcessObjectFactory, CurrentState);
+				CurrentState++;
+			}
+		}
+
+		public class EverythingAwareObjectPostProcessor : EverythingAwareObjectFactoryPostProcessor,
+			IObjectPostProcessor
+		{
+			public new static int InstanceCount = 0;
+
+			public EverythingAwareObjectPostProcessor()
+			{
+				InstanceCount++;
+			}
+
+			public EverythingAwareObjectPostProcessor(int expectObjectFactoryPostProcessorInstances)
+				:this()
+			{
+				// ensure factorypostprocessor has been instantiated *before* this object
+				Assert.AreEqual(expectObjectFactoryPostProcessorInstances, EverythingAwareObjectFactoryPostProcessor.InstanceCount);
+			}
+
+			public object PostProcessBeforeInitialization(object instance, string name)
+			{
+				Assert.AreNotEqual(this, instance);
+				Assert.AreEqual(ObjectProcessingState.ObjectPostProcessorBeforeInitialization, CurrentState);
+				CurrentState++;
+				return instance;
+			}
+
+			public object PostProcessAfterInitialization(object instance, string objectName)
+			{
+				Assert.AreNotEqual(this, instance);
+				Assert.AreEqual(ObjectProcessingState.ObjectPostProcessorAfterInitialization, CurrentState);
+				CurrentState++;
+				return instance;
+			}
+		}
+
+		#endregion
+
+		[Test]
+		public void OrderOfKnownProcessorInterfaces()
+		{
+			DefaultListableObjectFactory objectFactory = (DefaultListableObjectFactory)this._context.ObjectFactory;
+			RootObjectDefinition def;
+			def = new RootObjectDefinition(typeof(EverythingAwareObjectPostProcessor));
+			objectFactory.RegisterObjectDefinition("everythingAwareObjectPostProcessor", def);
+			_context.Refresh();
+		}
+
+		[Test]
+		public void OrderOfKnownProcessorInstantiation()
+		{
+			DefaultListableObjectFactory objectFactory = (DefaultListableObjectFactory)this._context.ObjectFactory;
+			RootObjectDefinition def;
+			// note the order of registration (checks instantiation does not occur in order of registration)
+			def = new RootObjectDefinition(typeof(EverythingAwareObject));
+			def.ConstructorArgumentValues.AddIndexedArgumentValue(0, 1);
+			objectFactory.RegisterObjectDefinition("everythingAwareObject", def);
+			def = new RootObjectDefinition(typeof(EverythingAwareObjectPostProcessor));
+			def.ConstructorArgumentValues.AddIndexedArgumentValue(0, 1);
+			objectFactory.RegisterObjectDefinition("everythingAwareObjectPostProcessor", def);
+			def = new RootObjectDefinition(typeof(EverythingAwareObjectFactoryPostProcessor));
+			objectFactory.RegisterObjectDefinition("everythingAwareObjectFactoryPostProcessor", def);
+			_context.Refresh();
+		}
+
+		[Test]
+		public void DefaultObjectFactoryProcessorsDontGetAddedTwice()
+		{
+			MockApplicationContext myContext = new MockApplicationContext("myContext");
+			DefaultListableObjectFactory objectFactory = (DefaultListableObjectFactory)myContext.ObjectFactory;
+			Assert.AreEqual(0, objectFactory.ObjectPostProcessorCount);
+			myContext.Refresh();
+			int defaultProcessors = objectFactory.ObjectPostProcessors.Count;
+			myContext.Refresh();
+			Assert.AreEqual(defaultProcessors, objectFactory.ObjectPostProcessors.Count);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs
new file mode 100644
index 00000000..9e444438
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs
@@ -0,0 +1,225 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <author></author>
+    /// <version>$Id: AbstractMessageSourceTests.cs,v 1.6 2007/08/23 14:31:18 oakinger Exp $</version>
+    [TestFixture]
+	public sealed class AbstractMessageSourceTests : AbstractMessageSource
+	{
+		[SetUp]
+		public void Init()
+		{
+			resetMe();
+		}
+
+		[Test]
+		[ExpectedException(typeof (NoSuchMessageException))]
+		public void GetResolvableNullCodes()
+		{
+			MockMessageResolvable res = new MockMessageResolvable();
+			res.SetExpectedCodesCalls(1);
+			GetMessage(res, CultureInfo.CurrentCulture);
+			res.Verify();
+		}
+
+		[Test]
+		public void GetResolvableDefaultsToParentMessageSource()
+		{
+		    string MSGCODE = "nullCode";
+            object[] MSGARGS = new object[] { "arg1", "arg2" };
+
+            MockMessageResolvable res = new MockMessageResolvable();
+            res.SetExpectedCodesCalls(1);
+            res.SetArguments(MSGARGS);
+            res.SetCode(MSGCODE);
+
+			MockMessageSource parentSource = new MockMessageSource();
+			parentSource.SetExpectedGetMessageCalls(1);
+            parentSource.SetExpectedGetMessageCode(MSGCODE);
+            parentSource.SetExpectedGetMessageDefaultMessage(null);
+            parentSource.SetExpectedGetMessageArguments(res.GetArguments());
+			parentSource.SetExpectedGetMessageReturn("MockMessageSource");
+			ParentMessageSource = parentSource;
+
+			Assert.AreEqual("MockMessageSource", GetMessage(res, CultureInfo.CurrentCulture), "My Message");
+			parentSource.Verify();
+			res.Verify();
+		}
+
+		[Test]
+		public void GetMessageParentMessageSource()
+		{
+		    object[] args = new object[] {"arguments"};
+			MockMessageSource parentSource = new MockMessageSource();
+			parentSource.SetExpectedGetMessageCalls(1);
+            parentSource.SetExpectedGetMessageCode("null");
+            parentSource.SetExpectedGetMessageDefaultMessage(null);
+            parentSource.SetExpectedGetMessageArguments(args);
+			parentSource.SetExpectedGetMessageReturn("my parent message");
+			ParentMessageSource = parentSource;
+			Assert.AreEqual("my parent message", GetMessage("null", "message", CultureInfo.CurrentCulture, args[0]));
+			parentSource.Verify();
+		}
+
+		[Test]
+		public void GetMessageResolvableDefaultMessage()
+		{
+			MockMessageResolvable res = new MockMessageResolvable();
+			res.SetDefaultMessage("MyDefaultMessage");
+			res.SetCode(null);
+			Assert.AreEqual("MyDefaultMessage", GetMessage(res, CultureInfo.CurrentCulture), "Default");
+			res.Verify();
+		}
+
+		[Test]
+		public void GetMessageResolvableReturnsFirstCode()
+		{
+			MockMessageResolvable res = new MockMessageResolvable();
+			UseCodeAsDefaultMessage = true;
+			res.SetCode("null");
+			Assert.AreEqual("null", GetMessage(res, CultureInfo.CurrentCulture), "Code");
+			res.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof (NoSuchMessageException))]
+		public void GetMessageResolvableNoValidMessage()
+		{
+			MockMessageResolvable res = new MockMessageResolvable();
+			res.SetCode(null);
+			GetMessage(res, CultureInfo.CurrentCulture);
+		}
+
+		[Test]
+		public void GetMessageResolvableValidMessageAndCode()
+		{
+			MockMessageResolvable res = new MockMessageResolvable();
+			res.SetCode("code1");
+			res.SetArguments(new object[] {"my", "arguments"});
+			Assert.AreEqual("my arguments", GetMessage(res, CultureInfo.CurrentCulture), "Resolve");
+			res.Verify();
+		}
+
+		[Test]
+		public void GetMessageResolvableValidMessageAndCodeNullCulture()
+		{
+			MockMessageResolvable res = new MockMessageResolvable();
+			res.SetCode("code1");
+			res.SetArguments(new object[] {"my", "arguments"});
+			Assert.AreEqual("my arguments", GetMessage(res, null), "Resolve");
+			res.Verify();
+		}
+
+		[Test]
+        [ExpectedException(typeof(NoSuchMessageException))]
+		public void GetMessageNullCode()
+		{
+			Assert.IsNull(GetMessage(null));
+		}
+
+		[Test]
+		public void GetMessageValidMessageAndCode()
+		{
+			Assert.AreEqual("my arguments", GetMessage("code1", new object[] {"my", "arguments"}), "Resolve");
+		}
+
+		[Test]
+		public void GetMessageValidMessageAndCodeNullCulture()
+		{
+			Assert.AreEqual("my arguments", GetMessage("code1", null, new object[] {"my", "arguments"}), "Resolve");
+		}
+
+		[Test]
+		public void GetMessageUseDefaultCode()
+		{
+			UseCodeAsDefaultMessage = true;
+			Assert.AreEqual("null", GetMessage("null", new object[] {"arguments"}), "message");
+			Assert.IsTrue(UseCodeAsDefaultMessage, "default");
+		}
+
+		[Test]
+		[ExpectedException(typeof (NoSuchMessageException))]
+		public void GetMessageNoValidMessage()
+		{
+			GetMessage("null", new object[] {"arguments"});
+		}
+
+		[Test]
+		public void GetMessageWithResolvableArguments()
+		{
+			MockMessageResolvable res = new MockMessageResolvable();
+			res.SetCode("code1");
+			res.SetArguments(new object[] {"my", "resolvable"});
+			Assert.AreEqual("spring my resolvable", GetMessage("code2", CultureInfo.CurrentCulture, new object[] {"spring", res}), "Resolve");
+			res.Verify();
+		}
+
+		[Test]
+		public void GetMessageResolvableValidMessageAndCodNullMessageFormat()
+		{
+			MockMessageResolvable res = new MockMessageResolvable();
+			res.SetDefaultMessage("myDefaultMessage");
+			res.SetCode("nullCode");
+			Assert.AreEqual("myDefaultMessage", GetMessage(res, null), "Resolve");
+			res.Verify();
+		}
+
+		private void resetMe()
+		{
+			ParentMessageSource = null;
+			UseCodeAsDefaultMessage = false;
+		}
+
+		protected override string ResolveMessage(string code, CultureInfo cultureInfo)
+		{
+			if (code.Equals("null"))
+			{
+				return null;
+			}
+			else if (code.Equals("nullCode"))
+			{
+				return null;
+			}            
+			else
+			{
+				return "{0} {1}";
+			}
+		}
+
+		protected override object ResolveObject(string code, CultureInfo cultureInfo)
+		{
+			return null;
+		}
+
+		protected override void ApplyResourcesToObject(object value, string objectName, CultureInfo cultureInfo)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextAwareProcessorTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextAwareProcessorTests.cs
new file mode 100644
index 00000000..533430f7
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextAwareProcessorTests.cs
@@ -0,0 +1,151 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Security.Policy;
+using NUnit.Framework;
+
+namespace Spring.Context.Support
+{
+	[TestFixture]
+	public sealed class ApplicationContextAwareProcessorTests
+	{
+		[Test]
+		public void AttachResourceLoader()
+		{
+			MockApplicationContext ctx = new MockApplicationContext("MockApplicationContext");
+			ApplicationContextAwareProcessor processor = new ApplicationContextAwareProcessor(ctx);
+			MockContextAwareObject obj = new MockContextAwareObject();
+			Assert.IsNull(obj.ResourceLoader, "ResourceLoader Does Not Equal");
+			MockContextAwareObject obj2 = (MockContextAwareObject) processor.PostProcessBeforeInitialization(obj, "MyContextAwareObject");
+			Assert.AreEqual(ctx, obj2.ResourceLoader, "ResourceLoader Does Not Equal");
+		}
+
+		[Test]
+		public void DoNotAttachResourceLoaderForRegularObject()
+		{
+			MockApplicationContext ctx = new MockApplicationContext();
+			ApplicationContextAwareProcessor processor = new ApplicationContextAwareProcessor(ctx);
+			object obj = new object();
+			object obj1 = processor.PostProcessBeforeInitialization(obj, "MyContextAwareObject");
+			Assert.AreEqual(obj, obj1, "Objects don't equal");
+		}
+
+		[Test]
+		public void AttachContext()
+		{
+			MockApplicationContext ctx = new MockApplicationContext();
+			ApplicationContextAwareProcessor processor = new ApplicationContextAwareProcessor(ctx);
+			MockContextAwareObject obj = new MockContextAwareObject();
+			Assert.IsNull(obj.GetApplicationContext(), "Context Does Not Equal");
+			MockContextAwareObject obj2 = (MockContextAwareObject) processor.PostProcessBeforeInitialization(obj, "MyContextAwareObject");
+			Assert.AreEqual(ctx, obj2.GetApplicationContext(), "Context Does Not Equal");
+		}
+
+		[Test]
+		public void DoNotAttachContextForRegularObject()
+		{
+			MockApplicationContext ctx = new MockApplicationContext();
+			ApplicationContextAwareProcessor processor = new ApplicationContextAwareProcessor(ctx);
+			object obj = new object();
+			object obj1 = processor.PostProcessBeforeInitialization(obj, "MyContextAwareObject");
+			Assert.AreEqual(obj, obj1, "Objects don't equal");
+		}
+
+		[Test]
+		public void AfterInitReturnsSameInstanceAsWasPassedIn()
+		{
+			MockApplicationContext ctx = new MockApplicationContext();
+			ApplicationContextAwareProcessor processor = new ApplicationContextAwareProcessor(ctx);
+			object obj = new object();
+			object obj1 = processor.PostProcessAfterInitialization(obj, "MyContextAwareObject");
+			Assert.AreEqual(obj, obj1, "Objects don't equal");
+		}
+
+		[Test]
+		public void AlwaysIgnoresProxiedMessageSourceAwareObjects()
+		{
+			PostProcessTProxiedObject(new ProcessedObjectChecker(
+				_AlwaysIgnoresProxiedMessageSourceAwareObjects));
+		}
+
+		private void _AlwaysIgnoresProxiedMessageSourceAwareObjects(MockContextAwareObject obj) 
+		{
+			Assert.IsNull(obj.MessageSource,
+				"Transparent proxy IMessageSourceAware object was not ignored (must be).");
+		}
+
+		[Test]
+		public void AlwaysIgnoresProxiedResourceLoaderAwareObjects()
+		{
+			PostProcessTProxiedObject(new ProcessedObjectChecker(
+				_AlwaysIgnoresProxiedResourceLoaderAwareObjects));
+		}
+
+		private void _AlwaysIgnoresProxiedResourceLoaderAwareObjects(MockContextAwareObject obj) 
+		{
+			Assert.IsNull(obj.ResourceLoader,
+				"Transparent proxy IResourceLoaderAware object was not ignored (must be).");
+		}
+
+		[Test]
+		public void AlwaysIgnoresProxiedApplicationContextAwareAwareObjects()
+		{
+			PostProcessTProxiedObject(new ProcessedObjectChecker(
+				_AlwaysIgnoresProxiedApplicationContextAwareAwareObjects));
+		}
+
+		private void _AlwaysIgnoresProxiedApplicationContextAwareAwareObjects(MockContextAwareObject obj) 
+		{
+			Assert.IsNull(obj.ApplicationContext,
+				"Transparent proxy IApplicationContextAwareAware object was not ignored (must be).");
+		}
+
+		private void PostProcessTProxiedObject(ProcessedObjectChecker test) 
+		{
+			AppDomain domain = null;
+			try
+			{
+				AppDomainSetup setup = new AppDomainSetup();
+				setup.ApplicationBase = Environment.CurrentDirectory;
+				domain = AppDomain.CreateDomain("Spring", new Evidence(AppDomain.CurrentDomain.Evidence), setup);
+				object foo = domain.CreateInstanceAndUnwrap(GetType().Assembly.FullName, typeof(MockContextAwareObject).FullName);
+	
+				MockApplicationContext ctx = new MockApplicationContext();
+				ApplicationContextAwareProcessor processor = new ApplicationContextAwareProcessor(ctx);
+				MockContextAwareObject afterFoo = (MockContextAwareObject) processor.PostProcessBeforeInitialization(foo, "MyContextAwareObject");
+				test(afterFoo);
+			}
+			finally
+			{
+				try
+				{
+					AppDomain.Unload(domain);
+				}
+				catch (Exception ex)
+				{
+					Console.Write("Error unloading AppDomain used during testing : " + ex);
+				}
+			}
+		}
+
+		private delegate void ProcessedObjectChecker(MockContextAwareObject obj);
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextExtensionTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextExtensionTests.cs
new file mode 100644
index 00000000..5e2dbf01
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextExtensionTests.cs
@@ -0,0 +1,66 @@
+using NUnit.Framework;
+
+using Spring.Objects;
+
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Test configuration of the application context with custom parsers,
+    /// resource handlers, and type aliases.
+    /// </summary>
+    [TestFixture]
+    public class ApplicationContextExtensionTests
+    {
+        /// <summary>
+        /// Create an instance of the test.
+        /// </summary>
+        public ApplicationContextExtensionTests()
+        {}
+
+        /// <summary>
+        /// Test using a custom parser to create our familiar "TestObject"
+        /// </summary>
+        [Test]
+        public void UsingCustomParsers()
+        {
+            ContextRegistry.Clear();
+            IApplicationContext ctx = ContextRegistry.GetContext();
+            Assert.IsNotNull(ctx);
+
+            IApplicationContext parentCtx = ContextRegistry.GetContext("Parent");
+            Assert.IsNotNull(parentCtx, "Parent context not registered.");
+
+            TestObject to = (TestObject) ctx.GetObject("Parent");
+            Assert.IsNotNull(to);
+            Assert.IsTrue(TestObjectConfigParser.ParseElementCalled);
+
+            TestObject to2 = (TestObject) ctx.GetObject("testObject");
+            Assert.AreEqual(12, to2.Age);
+            Assert.AreEqual("John", to2.Name);
+
+            Assert.AreEqual(2, ctx.ObjectDefinitionCount);
+
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ApplicationObjectSupportTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationObjectSupportTests.cs
new file mode 100644
index 00000000..c5643d17
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationObjectSupportTests.cs
@@ -0,0 +1,405 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using NUnit.Framework;
+using Spring.Core.IO;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	[TestFixture]
+	public class ApplicationObjectSupportTests
+	{
+		internal class MyApplicationObjectSupport : ApplicationObjectSupport
+		{
+			private bool _init = false;
+
+			public MyApplicationObjectSupport() : base()
+			{
+			}
+
+			public MyApplicationObjectSupport(IApplicationContext applicationContext) : base(applicationContext)
+			{
+			}
+
+			protected override Type RequiredType
+			{
+				get { return typeof (MockApplicationContext); }
+			}
+
+			protected override void InitApplicationContext()
+			{
+				_init = true;
+			}
+
+			public bool Init
+			{
+				get { return _init; }
+			}
+		}
+
+		internal class MyContext2 : IApplicationContext
+		{
+			public void Dispose()
+			{
+			}
+
+			#region IApplicationContext Members
+
+			public IApplicationContext ParentContext
+			{
+				get { return null; }
+				set
+				{
+				}
+			}
+
+			public DateTime StartupDate
+			{
+				get { return new DateTime(); }
+			}
+
+			public event ApplicationEventHandler ContextEvent;
+
+			public long StartupDateMilliseconds
+			{
+				get { return 0; }
+			}
+
+			public string Name
+			{
+				get { return AbstractApplicationContext.DefaultRootContextName; }
+				set
+				{
+				}
+			}
+
+			#endregion
+
+			#region IListableObjectFactory Members
+
+            public IObjectDefinition GetObjectDefinition(string name)
+            {
+                return null;
+            }
+
+            public IObjectDefinition GetObjectDefinition(string name, bool includeAncestors)
+            {
+                return null;
+            }
+
+            public string[] GetObjectDefinitionNames(Type type)
+			{
+				return null;
+			}
+
+			public string[] GetObjectNamesForType(Type type)
+			{
+				return null;
+			}
+
+			public string[] GetObjectNamesForType(
+				Type type, bool includePrototypes, bool includeFactoryObjects)
+			{
+				return null;
+			}
+
+			string[] IListableObjectFactory.GetObjectDefinitionNames()
+			{
+				return null;
+			}
+
+			public IDictionary GetObjectsOfType(Type type)
+			{
+				return null;
+			}
+
+			public IDictionary GetObjectsOfType(Type type, bool includePrototypes, bool includeFactoryObjects)
+			{
+				return null;
+			}
+
+			public int ObjectDefinitionCount
+			{
+				get { return 0; }
+			}
+
+			public bool ContainsObjectDefinition(string name)
+			{
+				return false;
+			}
+
+			#endregion
+
+			#region IObjectFactory Members
+
+			public object this[string name]
+			{
+				get { return null; }
+			}
+
+			public bool ContainsObject(string name)
+			{
+				return false;
+			}
+
+			public string[] GetAliases(string name)
+			{
+				return null;
+			}
+
+			public object GetObject(string name, Type requiredType)
+			{
+				return null;
+			}
+
+			object IObjectFactory.GetObject(string name)
+			{
+				return null;
+			}
+
+		    public object GetObject(string name, object[] arguments)
+		    {
+		        return null;
+		    }
+
+		    public object GetObject(string name, Type requiredType, object[] arguments)
+		    {
+		        return null;
+		    }
+
+		    public bool IsSingleton(string name)
+			{
+				return false;
+			}
+
+
+		    public bool IsPrototype(string name)
+		    {
+		        return false;
+		    }
+
+		    public Type GetType(string name)
+			{
+				return null;
+			}
+
+
+		    public bool IsTypeMatch(string name, Type targetType)
+		    {
+		        return false;
+		    }
+
+		    public object ConfigureObject(object target)
+			{
+                return null;
+            }
+
+			public object ConfigureObject(object target, string name)
+			{
+                return null;
+            }
+
+            public object ConfigureObject(object target, string name, IObjectDefinition definition)
+            {
+                return null;
+            }
+
+			#endregion
+
+			#region IHierarchicalObjectFactory Members
+
+			public IObjectFactory ParentObjectFactory
+			{
+				get { return null; }
+			}
+
+			#endregion
+
+			#region IMessageSource Members
+
+			public string GetMessage(IMessageSourceResolvable resolvable, CultureInfo culture)
+			{
+				return null;
+			}
+
+			string IMessageSource.GetMessage(string name, CultureInfo culture, params object[] args)
+			{
+				return null;
+			}
+
+			string IMessageSource.GetMessage(string name)
+			{
+				return null;
+			}
+
+			string IMessageSource.GetMessage(string name, params object[] args)
+			{
+				return null;
+			}
+
+			string IMessageSource.GetMessage(string name, CultureInfo cultureInfo)
+			{
+				return null;
+			}
+
+		    public string GetMessage(string name, string defaultMessage, CultureInfo culture, params object[] arguments)
+		    {
+		        return null;
+		    }
+
+		    object IMessageSource.GetResourceObject(string name, CultureInfo culture)
+			{
+				return null;
+			}
+
+			object IMessageSource.GetResourceObject(string name)
+			{
+				return null;
+			}
+
+			void IMessageSource.ApplyResources(object value, string objectName, CultureInfo cultureInfo)
+			{
+			}
+
+			#endregion
+
+			#region IResourceLoader Members
+
+			public IResource GetResource(string location)
+			{
+				return null;
+			}
+
+			#endregion
+
+			#region IEventRepository Members
+
+			public void PublishEvents(object sourceObject)
+			{
+				throw new NotImplementedException();
+			}
+
+			public void Subscribe(object subscriber)
+			{
+				throw new NotImplementedException();
+			}
+
+			public void Subscribe(object subscriber, Type targetSourceType)
+			{
+				throw new NotImplementedException();
+			}
+
+			#endregion
+
+			public void PublishEvent(object sender, ApplicationEventArgs e)
+			{
+				throw new NotImplementedException();
+			}
+		}
+
+		internal class MyContext2Subclass : MyContext2
+		{
+		}
+
+		internal class MyApplicationObjectSupportConcrete : ApplicationObjectSupport
+		{
+			private bool _init;
+
+			public MyApplicationObjectSupportConcrete() : base()
+			{
+			}
+
+			public MyApplicationObjectSupportConcrete(IApplicationContext applicationContext) : base(applicationContext)
+			{
+			}
+
+			protected override void InitApplicationContext()
+			{
+				base.InitApplicationContext();
+				_init = true;
+			}
+
+			public bool Init
+			{
+				get { return _init; }
+			}
+		}
+
+
+		[Test]
+		[ExpectedException(typeof (ApplicationContextException))]
+		public void InvalidContextSubclass()
+		{
+			ApplicationObjectSupport support = new MyApplicationObjectSupport();
+			support.ApplicationContext = new MyContext2();
+		}
+
+		[Test]
+		public void ValidContextSubClassOfAContext()
+		{
+			MyApplicationObjectSupportConcrete support = new MyApplicationObjectSupportConcrete();
+			support.ApplicationContext = new MyContext2();
+		}
+
+		[Test]
+		public void ValidContextIApplicationContext()
+		{
+			MyApplicationObjectSupportConcrete support = new MyApplicationObjectSupportConcrete();
+			support.ApplicationContext = new MyContext2();
+			Assert.IsTrue(support.Init);
+			Assert.IsNotNull(support.MessageSourceAccessor);
+		}
+
+		[Test]
+		public void ValidContextSubClass()
+		{
+			MyApplicationObjectSupport support = new MyApplicationObjectSupport();
+			support.ApplicationContext = new MockApplicationContext();
+			Assert.IsTrue(support.Init);
+		}
+
+		[Test]
+		public void ReinitWithSameContext()
+		{
+			MockApplicationContext ctx = new MockApplicationContext();
+			ApplicationObjectSupport support = new MyApplicationObjectSupport(ctx);
+			support.ApplicationContext = ctx;
+			Assert.AreEqual(ctx, support.ApplicationContext);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ApplicationContextException))]
+		public void ReinitWithDiffContext()
+		{
+			MockApplicationContext ctx = new MockApplicationContext();
+			ApplicationObjectSupport support = new MyApplicationObjectSupport(ctx);
+			support.ApplicationContext = new MockApplicationContext();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/Assembler.cs b/test/Spring/Spring.Core.Tests/Context/Support/Assembler.cs
new file mode 100644
index 00000000..c38a4c77
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/Assembler.cs
@@ -0,0 +1,57 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+namespace Spring.Context.Support
+{
+    #region Test Utility Classes
+
+    #endregion
+
+
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: Assembler.cs,v 1.2 2007/07/17 14:55:47 oakinger Exp $</version>
+    public class Assembler
+    {
+        private Service service;
+        private Logic logic;
+        private string name;
+
+        public Logic Logic
+        {
+            set { logic = value; }
+        }
+
+        public Service Service
+        {
+            set { service = value; }
+        }
+
+
+        public string ObjectName
+        {
+            set { name = value; }
+        }
+
+        public void Test()
+        {
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs
new file mode 100644
index 00000000..0b040436
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs
@@ -0,0 +1,172 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Configuration;
+using System.IO;
+using System.Security.Policy;
+using System.Xml;
+using NUnit.Framework;
+using Spring.Objects;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// Unit tests for the ContextHandler class.
+	/// </summary>
+    /// <author>Mark Pollack</author>
+    /// <author>Rick Evans</author>
+	[TestFixture]
+	public sealed class ContextHandlerTests
+	{
+		private XmlElement configurationElement;
+
+		[SetUp]
+		public void SetUp()
+		{
+			ContextRegistry.Clear();
+		}
+
+		[Test]
+		public void CreateContextSuccessful()
+		{
+			const string xmlData =
+				@"<context type='Spring.Context.Support.XmlApplicationContext, Spring.Core'>
+	<resource uri='assembly://Spring.Core.Tests/Spring.Resources/SimpleAppContext.xml'/>
+</context>";
+			CreateConfigurationElement(xmlData);
+
+			ContextHandler ctxHandler = new ContextHandler();
+			IApplicationContext ctx = (IApplicationContext) ctxHandler.Create(null, null, configurationElement);
+			Assert.AreEqual(ctx, ContextRegistry.GetContext());
+			Assert.AreEqual(1, ContextRegistry.GetContext().ObjectDefinitionCount);
+		}
+
+		/// <summary>
+		/// Expect failure when using a type that does not inherit from IApplicationContext
+		/// </summary>
+		[Test]
+#if NET_2_0
+        [ExpectedException(typeof(ConfigurationErrorsException))]
+#else
+        [ExpectedException(typeof(ConfigurationException))]
+#endif
+		public void ContextNotOfCorrectType()
+		{
+			const string xmlData =
+				@"<context type='Spring.Objects.TestObject, Spring.Core.Tests'>
+	<resource uri='assembly://Spring.Core.Tests/Spring.Resources/SimpleAppContext.xml'/>
+</context>";
+			CreateConfigurationElement(xmlData);
+			ContextHandler ctxHandler = new ContextHandler();
+			ctxHandler.Create(null, null, configurationElement);
+		}
+
+		[Test]
+#if NET_2_0
+        [ExpectedException(typeof(ConfigurationErrorsException))]
+#else
+        [ExpectedException(typeof(ConfigurationException))]
+#endif
+		public void CreatedFromNullXmlElement()
+		{
+			ContextHandler ctxHandler = new ContextHandler();
+			ctxHandler.Create(null, null, null);
+		}
+
+		[Test]
+		public void DefaultsToXmlApplicationContextType()
+		{
+			const string xmlData =
+				@"<context>
+	<resource uri='assembly://Spring.Core.Tests/Spring.Resources/SimpleAppContext.xml'/>
+</context>";
+			CreateConfigurationElement(xmlData);
+			ContextHandler ctxHandler = new ContextHandler();
+			IApplicationContext ctx = (IApplicationContext) ctxHandler.Create(null, null, configurationElement);
+			Assert.AreEqual(typeof (XmlApplicationContext), ctx.GetType(),
+			                "Default type is not the XmlApplicationContext type; it must be.");
+		}
+
+#if NET_2_0
+        [ExpectedException(typeof(ConfigurationErrorsException))]
+#else
+        [ExpectedException(typeof(ConfigurationException))]
+#endif
+        [Test(Description="SPRNET-105")]
+		public void ChokesIfChildContextsUseTheSameName()
+		{
+			const string xmlData =
+				@"<context>
+	<resource uri='assembly://Spring.Core.Tests/Spring.Resources/SimpleAppContext.xml'/>
+	<context/>
+</context>";
+			CreateConfigurationElement(xmlData);
+			ContextHandler ctxHandler = new ContextHandler();
+			ctxHandler.Create(null, null, configurationElement);
+        }
+
+        private void CreateConfigurationElement(string xmlData)
+        {
+            XmlDocument xmlDoc = new XmlDocument();
+            xmlDoc.Load(new StringReader(xmlData));
+            configurationElement = xmlDoc.DocumentElement;
+        }
+
+        // integration test; touches just about every class in the Spring.NET core...
+        [Test]
+        public void LoadParentChildContextsHierarchy()
+        {
+            //need a second section for another independent test as CongfigurationSettings.GetConfig will 
+		    //not be called twice by .NET
+            IApplicationContext ctx
+                = (IApplicationContext) ConfigurationUtils.GetSection("spring2/context");
+
+            Assert.IsNotNull(ctx);
+            IApplicationContext parentCtx = ContextRegistry.GetContext("Parent");
+            Assert.IsNotNull(parentCtx, "Parent context not registered.");
+            Assert.AreEqual("Parent", parentCtx.Name, "Parent's DisplayName property not picked up from config file.");
+            IApplicationContext childCtx = ContextRegistry.GetContext("Child");
+            Assert.IsNotNull(childCtx, "Child context not registered.");
+            Assert.AreEqual("Child", childCtx.Name, "Child's DisplayName property not picked up from config file.");
+            Assert.AreEqual("Parent", childCtx.ParentContext.Name);
+            IApplicationContext grandchildCtx = ContextRegistry.GetContext("Grandchild");
+            Assert.IsNotNull(grandchildCtx, "Grandchild context not registered.");
+            Assert.AreEqual("Grandchild", grandchildCtx.Name, "Grandchild's DisplayName property not picked up from config file.");
+            Assert.AreEqual("Child", grandchildCtx.ParentContext.Name);
+
+            // ensure proper objects have been loaded into the correct context...
+            Assert.IsTrue(parentCtx.ContainsObjectDefinition("Parent"), "Parent context object not present (must be).");
+            Assert.IsFalse(parentCtx.ContainsObjectDefinition("Child"), "Wrong (child context) object present in Parent context.");
+
+            Assert.IsTrue(childCtx.ContainsObjectDefinition("Child"), "Child context object not present (must be).");
+            Assert.IsFalse(childCtx.ContainsObjectDefinition("Parent"), "Wrong (parent context) object present in Child context.");
+
+            Assert.IsTrue(grandchildCtx.ContainsObjectDefinition("Grandchild"), "Grandchild context object not present (must be).");
+            Assert.IsFalse(grandchildCtx.ContainsObjectDefinition("Child"), "Wrong (parent context) object present in Grandchild context.");
+            Assert.IsFalse(grandchildCtx.ContainsObjectDefinition("Parent"), "Wrong (parent context) object present in Grandchild context.");
+        }
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs
new file mode 100644
index 00000000..64f96534
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs
@@ -0,0 +1,157 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Xml;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// Unit tests for the ContextRegistry class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: ContextRegistryTests.cs,v 1.9 2008/03/21 10:49:38 oakinger Exp $</version>
+	[TestFixture]
+	public sealed class ContextRegistryTests
+	{
+		[SetUp]
+		public void SetUp() 
+		{
+			ContextRegistry.Clear();
+		}
+
+
+        /// <summary>
+        /// This handler simulates calls to ContextRegistry during context creation
+        /// </summary>
+        private static object GetContextRecursive(object parent, object context, XmlNode section)
+        {
+            return ContextRegistry.GetContext(); // this must fail!
+        }
+
+        [Test]
+        public void ThrowsInvalidOperationExceptionOnRecursiveCallsToGetContext()
+        {
+            HookableContextHandler.CreateContextFromSectionHandler prevInst = HookableContextHandler.SetSectionHandler(
+                new HookableContextHandler.CreateContextFromSectionHandler(GetContextRecursive));
+            try
+            {
+                ContextRegistry.GetContext("somename");                
+            }
+            catch(Exception ex)
+            {
+                InvalidOperationException rootCause = ex.GetBaseException() as InvalidOperationException;
+                Assert.IsNotNull(rootCause);
+                Assert.AreEqual("root context is currently in creation.", rootCause.Message.Substring(0, 38));
+            }
+            finally
+            {
+                HookableContextHandler.SetSectionHandler(prevInst);
+            }
+        }
+
+		[Test]
+		public void RegisterRootContext()
+		{
+			MockApplicationContext ctx = new MockApplicationContext();
+			ContextRegistry.RegisterContext(ctx);
+			IApplicationContext context = ContextRegistry.GetContext();
+			Assert.IsNotNull(context,
+				"Root context is null even though a context has been registered.");
+			Assert.IsTrue(Object.ReferenceEquals(ctx, context),
+				"Root context was not the same as the first context registered (it must be).");
+		}
+
+        [Test]
+        public void RegisterNamedRootContext()
+        {
+            const string ctxName = "bingo";
+            MockApplicationContext ctx = new MockApplicationContext(ctxName);
+            ContextRegistry.RegisterContext(ctx);
+            IApplicationContext rootContext = ContextRegistry.GetContext();
+            Assert.IsNotNull(rootContext,
+                "Root context is null even though a context has been registered.");
+            Assert.AreEqual(ctxName, rootContext.Name,
+                "Root context name is different even though the root context has been registered under the lookup name.");
+        }
+
+		[Test]
+		public void RegisterNamedContext()
+		{
+			const string ctxName = "bingo";
+			MockApplicationContext ctx = new MockApplicationContext(ctxName);
+			ContextRegistry.RegisterContext(ctx);
+			IApplicationContext context = ContextRegistry.GetContext(ctxName);
+			Assert.IsNotNull(context,
+				"Named context is null even though a context has been registered under the lookup name.");
+			Assert.IsTrue(Object.ReferenceEquals(ctx, context),
+				"Named context was not the same as the registered context (it must be).");
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void GetContextWithNullName()
+		{
+			ContextRegistry.GetContext(null);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void GetContextWithEmptyName()
+		{
+			ContextRegistry.GetContext("");
+		}
+
+		[Test]
+		public void GetContextNotRegisteredReturnsNull()
+		{
+			IApplicationContext context = ContextRegistry.GetContext("bingo");
+			Assert.IsNull(context,
+				"Named context is not null even though a context has not been registered under the lookup name.");
+		}
+#if NET_2_0
+        // TODO : Add support for .NET 1.x
+        [Test]
+        public void ClearWithConfigurationSection()
+        {
+            IApplicationContext ctx1 = ContextRegistry.GetContext();
+            ContextRegistry.Clear();
+            IApplicationContext ctx2 = ContextRegistry.GetContext();
+
+            Assert.AreNotSame(ctx1, ctx2);
+        }
+#endif
+
+		[Test(Description="SPRNET-105")]
+		[ExpectedException(typeof(ApplicationContextException))]
+		public void ChokesIfChildContextRegisteredUnderNameOfAnExistingContext()
+		{
+			MockApplicationContext original = new MockApplicationContext("original");
+			ContextRegistry.RegisterContext(original);
+			MockApplicationContext duplicate = new MockApplicationContext("original");
+			ContextRegistry.RegisterContext(duplicate);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs
new file mode 100644
index 00000000..ce4327d6
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs
@@ -0,0 +1,109 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Text;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// Unit tests for the DefaultMessageSourceResolvable class.
+	/// </summary>
+	[TestFixture]
+	public sealed class DefaultMessageSourceResolvableTests
+	{
+		[Test]
+		public void InstantiationWithASingleCodeDefaultsToEmptyDefaultMessage()
+		{
+			DefaultMessageSourceResolvable dmr = new DefaultMessageSourceResolvable("foo");
+			Assert.AreEqual(string.Empty, dmr.DefaultMessage,
+							"Not defaulting to non null empty string value (it must).");
+		}
+		
+		[Test]
+		public void NullLastCode()
+		{
+			DefaultMessageSourceResolvable dmr = new DefaultMessageSourceResolvable(null, null);
+			Assert.IsNull(dmr.LastCode);
+		}
+
+		[Test]
+		public void LastCode()
+		{
+			DefaultMessageSourceResolvable dmr = new DefaultMessageSourceResolvable(new string[] {"code1"}, null);
+			Assert.AreEqual("code1", dmr.LastCode);
+		}
+
+		[Test]
+		public void ResolvableToString()
+		{
+			string[] codes = new string[] {"code1", "code2"};
+			object[] arguments = new object[] {"argument1", "argument2"};
+			string defaultMessage = "defaultMessage";
+			DefaultMessageSourceResolvable dmr = new DefaultMessageSourceResolvable(codes, arguments, defaultMessage);
+			Assert.AreEqual(getResolvableString(), dmr.ToString(), "to string");
+		}
+
+		[Test]
+		public void ResolvableToStringNullArguments()
+		{
+			string[] codes = new string[] {"code1", "code2"};
+			string defaultMessage = "defaultMessage";
+			DefaultMessageSourceResolvable dmr = new DefaultMessageSourceResolvable(codes, null, defaultMessage);
+			Assert.AreEqual(getResolvableStringNull(), dmr.ToString(), "to string");
+		}
+
+		[Test]
+		public void DefaultResolvableFromExistingResolvable()
+		{
+			MockMessageResolvable mockResolvable = new MockMessageResolvable();
+			mockResolvable.SetExpectedCodesCalls(1);
+			mockResolvable.SetCode("code1FromMock");
+			mockResolvable.SetDefaultMessage("defaultMessageFromMock");
+			mockResolvable.SetArguments(new object[] {"ArgumentFromMock"});
+			DefaultMessageSourceResolvable dmr = new DefaultMessageSourceResolvable(mockResolvable);
+			Assert.AreEqual("defaultMessageFromMock", dmr.DefaultMessage, "default");
+			Assert.AreEqual("code1FromMock", dmr.LastCode, "codes");
+			Assert.AreEqual("ArgumentFromMock", (dmr.GetArguments())[0], "arguments");
+			mockResolvable.Verify();
+		}
+
+		private string getResolvableString()
+		{
+			StringBuilder builder = new StringBuilder();
+			builder.Append("codes=[code1,code2]; arguments=[(String)[argument1], (String)[argument2]]; ");
+			builder.Append("defaultMessage=[defaultMessage]");
+			return builder.ToString();
+		}
+
+		private string getResolvableStringNull()
+		{
+			StringBuilder builder = new StringBuilder();
+			builder.Append("codes=[code1,code2]; arguments=[null]; ");
+			builder.Append("defaultMessage=[defaultMessage]");
+			return builder.ToString();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs
new file mode 100644
index 00000000..e12bc6ad
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs
@@ -0,0 +1,268 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// Unit tests for the DelegatingMessageSource class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: DelegatingMessageSourceTests.cs,v 1.3 2006/04/09 07:19:07 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class DelegatingMessageSourceTests
+    {
+		private const string LookupKey = "rick";
+		private DynamicMock _mock;
+		private IMessageSource _messageSource;
+
+		private DynamicMock TheMock
+		{
+			get { return _mock; }
+		}
+
+		private IMessageSource MockMessageSource
+		{
+			get { return _messageSource; }
+		}
+
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public void SetUp()
+        {
+			_mock = new DynamicMock(typeof(IMessageSource));
+			_messageSource = (IMessageSource) _mock.Object;
+        }
+
+        [Test]
+        public void Instantiation()
+		{
+			DelegatingMessageSource source = new DelegatingMessageSource();
+			Assert.IsNotNull(source.ParentMessageSource,
+				"ParentMessageSource property must *never* be null.");
+		}
+
+		[Test]
+		public void InstantiationWithSuppliedParentMessageSource()
+		{
+			DelegatingMessageSource source
+				= new DelegatingMessageSource(MockMessageSource);
+			Assert.IsNotNull(source.ParentMessageSource,
+				"ParentMessageSource property must *never* be null.");
+			Assert.IsTrue(Object.ReferenceEquals(source.ParentMessageSource, MockMessageSource));
+		}
+
+		[Test]
+		public void GetMessage()
+		{
+			const string expectedName = "Rick Evans";
+			TheMock.ExpectAndReturn("GetMessage", expectedName, LookupKey);
+			DelegatingMessageSource source
+				= new DelegatingMessageSource(MockMessageSource);
+			string name = source.GetMessage(LookupKey);
+			Assert.AreEqual(expectedName, name);
+			TheMock.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof(NoSuchMessageException))]
+		public void GetMessageNoDelegateTarget()
+		{
+			DelegatingMessageSource source = new DelegatingMessageSource();
+			source.GetMessage(LookupKey);
+		}
+
+		[Test]
+		public void GetMessageWithCulture()
+		{
+			const string expectedName = "Rick Evans";
+			TheMock.ExpectAndReturn("GetMessage", expectedName, LookupKey, CultureInfo.InvariantCulture);
+			DelegatingMessageSource source
+				= new DelegatingMessageSource(MockMessageSource);
+			string name = source.GetMessage(LookupKey, CultureInfo.InvariantCulture);
+			Assert.AreEqual(expectedName, name);
+			TheMock.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof(NoSuchMessageException))]
+		public void GetMessageWithCultureNoDelegateTarget()
+		{
+			DelegatingMessageSource source = new DelegatingMessageSource();
+			source.GetMessage(LookupKey, CultureInfo.InvariantCulture);
+		}
+
+		[Test]
+		public void GetMessageWithParams()
+		{
+			const string expectedName = "Rick Evans";
+			TheMock.ExpectAndReturn("GetMessage", expectedName, LookupKey, new string[] { "Rick", "Evans" });
+			DelegatingMessageSource source
+				= new DelegatingMessageSource(MockMessageSource);
+			string name = source.GetMessage(LookupKey, "Rick", "Evans");
+			Assert.AreEqual(expectedName, name);
+			TheMock.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof(NoSuchMessageException))]
+		public void GetMessageWithParamsNoDelegateTarget()
+		{
+			DelegatingMessageSource source = new DelegatingMessageSource();
+			source.GetMessage(LookupKey, "Rick", "Evans");
+		}
+
+		[Test]
+		public void GetMessageWithCultureAndParams()
+		{
+			const string expectedName = "Rick Evans";
+			TheMock.ExpectAndReturn("GetMessage", expectedName, LookupKey, CultureInfo.InvariantCulture, new string[] { "Rick", "Evans" });
+			DelegatingMessageSource source
+				= new DelegatingMessageSource(MockMessageSource);
+			string name = source.GetMessage(LookupKey, CultureInfo.InvariantCulture, "Rick", "Evans");
+			Assert.AreEqual(expectedName, name);
+			TheMock.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof(NoSuchMessageException))]
+		public void GetMessageWithCultureAndParamsNoDelegateTarget()
+		{
+			DelegatingMessageSource source = new DelegatingMessageSource();
+			source.GetMessage(LookupKey, CultureInfo.InvariantCulture, "Rick", "Evans");
+		}
+
+		[Test]
+		public void GetMessageWithMessageSourceResolvableAndCulture()
+		{
+			const string expectedName = "Rick Evans";
+			DelegatingMessageSource source
+				= new DelegatingMessageSource(MockMessageSource);
+			TheMock.ExpectAndReturn("GetMessage", expectedName, null, CultureInfo.InvariantCulture);
+			string name = source.GetMessage(
+				(IMessageSourceResolvable) null, CultureInfo.InvariantCulture);
+			Assert.AreEqual(expectedName, name);
+			TheMock.Verify();
+		}
+
+		[Test]
+		public void GetMessageWithNoParentMessageSourceAndMessageSourceResolvableAndCulture()
+		{
+			const string expectedName = "Rick Evans";
+			DynamicMock mock = new DynamicMock(typeof(IMessageSourceResolvable));
+			IMessageSourceResolvable resolvable = (IMessageSourceResolvable) mock.Object;
+			mock.ExpectAndReturn("DefaultMessage", "Rick Evans");
+			mock.ExpectAndReturn("DefaultMessage", "Rick Evans");
+			DelegatingMessageSource source = new DelegatingMessageSource();
+			string name = source.GetMessage(resolvable, CultureInfo.InvariantCulture);
+			Assert.AreEqual(expectedName, name);
+			mock.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof(NoSuchMessageException))]
+		public void GetMessageWithNoParentMessageSourceAndNullDefaultMessageSourceResolvableWithNoCodesAndCulture()
+		{
+			IMessageSourceResolvable resolver = new DefaultMessageSourceResolvable(
+				new string[] {}, new object[] {}, string.Empty);
+			DelegatingMessageSource source = new DelegatingMessageSource();
+			source.GetMessage(resolver, CultureInfo.InvariantCulture);
+		}
+
+		[Test]
+		[ExpectedException(typeof(NoSuchMessageException))]
+		public void GetMessageWithNoParentMessageSourceAndNullDefaultMessageSourceResolvableAndCulture()
+		{
+			IMessageSourceResolvable resolver = new DefaultMessageSourceResolvable(
+				new string[] {"foo"}, new object[] {}, string.Empty);
+			DelegatingMessageSource source = new DelegatingMessageSource();
+			source.GetMessage(resolver, CultureInfo.InvariantCulture);
+		}
+
+		[Test]
+		public void GetResourceObject()
+		{
+			const string expectedName = "Rick Evans";
+			TheMock.ExpectAndReturn("GetResourceObject", expectedName, LookupKey);
+			DelegatingMessageSource source
+				= new DelegatingMessageSource(MockMessageSource);
+			string name = (string) source.GetResourceObject(LookupKey);
+			Assert.AreEqual(expectedName, name);
+			TheMock.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof(ApplicationContextException))]
+		public void GetResourceObjectWithNoParentMessageSource()
+		{
+			DelegatingMessageSource source = new DelegatingMessageSource();
+			source.GetResourceObject(LookupKey);
+		}
+
+		[Test]
+		public void GetResourceObjectWithCulture()
+		{
+			const string expectedName = "Rick Evans";
+			TheMock.ExpectAndReturn("GetResourceObject", expectedName, LookupKey, CultureInfo.InvariantCulture);
+			DelegatingMessageSource source
+				= new DelegatingMessageSource(MockMessageSource);
+			string name = (string) source.GetResourceObject(LookupKey, CultureInfo.InvariantCulture);
+			Assert.AreEqual(expectedName, name);
+			TheMock.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof(ApplicationContextException))]
+		public void GetResourceObjectWithNoParentMessageSourceWithCulture()
+		{
+			DelegatingMessageSource source = new DelegatingMessageSource();
+			source.GetResourceObject(LookupKey, CultureInfo.InvariantCulture);
+		}
+
+		[Test]
+		public void ApplyResources()
+		{
+			const string expectedName = "Rick Evans";
+			TheMock.ExpectAndReturn("ApplyResources", expectedName, 12, "rick", CultureInfo.InvariantCulture);
+			DelegatingMessageSource source
+				= new DelegatingMessageSource(MockMessageSource);
+			source.ApplyResources(12, "rick", CultureInfo.InvariantCulture);
+			TheMock.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof(ApplicationContextException))]
+		public void ApplyResourcesWithNoParentMessageSource()
+		{
+			DelegatingMessageSource source = new DelegatingMessageSource();
+			source.ApplyResources(12, "rick", CultureInfo.InvariantCulture);
+		}
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/Logic.cs b/test/Spring/Spring.Core.Tests/Context/Support/Logic.cs
new file mode 100644
index 00000000..74cc23a2
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/Logic.cs
@@ -0,0 +1,48 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 Spring.Objects.Factory;
+
+namespace Spring.Context.Support
+{
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: Logic.cs,v 1.1 2007/07/10 05:48:37 markpollack Exp $</version>
+    public class Logic : IObjectNameAware
+    {
+        
+        private string objectName;
+        private Assembler assembler;
+
+
+        public Assembler Assembler
+        {
+            set { assembler = value; }
+        }
+
+        #region IObjectNameAware Members
+
+        public string ObjectName
+        {
+            set { objectName = value; }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/MessageSourceAccessorTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/MessageSourceAccessorTests.cs
new file mode 100644
index 00000000..36dace6b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/MessageSourceAccessorTests.cs
@@ -0,0 +1,138 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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.Globalization;
+
+using NUnit.Framework;
+using Rhino.Mocks;
+using Spring.Globalization;
+
+namespace Spring.Context.Support
+{
+    [TestFixture]
+    public class MessageSourceAccessorTests
+    {
+        [TestFixtureSetUp]
+        public void TestFixtureSetUp()
+        {
+            CultureTestScope.Set();
+        }
+
+        [TestFixtureTearDown]
+        public void TestFixtureTearDown()
+        {
+            CultureTestScope.Reset();
+        }
+
+        private readonly string MSGCODE = "code1";
+        private readonly CultureInfo MSGCULTURE = new CultureInfo("fr");
+        private readonly object[] MSGARGS = new object[] { "argument1" };
+        private readonly string MSGRESULT = "my message";
+
+
+        private MockRepository mocks;
+        private IMessageSource mockMsgSource;
+        private IMessageSourceResolvable mockMsgSourceResolvable;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mocks = new MockRepository();
+            mockMsgSource = (IMessageSource) mocks.CreateMock(typeof(IMessageSource));
+            mockMsgSourceResolvable = (IMessageSourceResolvable) mocks.CreateMock(typeof(IMessageSourceResolvable));
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void GetMessageCodeCultureArgs()
+        {
+            Expect.Call(mockMsgSource.GetMessage(MSGCODE, MSGCULTURE, MSGARGS)).Return(MSGRESULT);
+            mocks.ReplayAll();
+
+            MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource);
+            Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE, MSGCULTURE, MSGARGS));
+        }
+
+        [Test]
+        public void GetMessageCodeArgs()
+        {
+            Expect.Call(mockMsgSource.GetMessage(MSGCODE, MSGCULTURE, MSGARGS)).Return(MSGRESULT);
+            mocks.ReplayAll();
+
+            MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource, MSGCULTURE);
+            Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE, MSGARGS));
+        }
+
+        [Test]
+        public void GetMessageCodeArgsDefaultsToCurrentUICulture()
+        {
+            Expect.Call(mockMsgSource.GetMessage(MSGCODE, CultureInfo.CurrentUICulture, MSGARGS)).Return(MSGRESULT);
+            mocks.ReplayAll();
+
+            MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource);
+            Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE, MSGARGS));
+        }
+
+        [Test]
+        public void GetMessageCodeCulture()
+        {
+            Expect.Call(mockMsgSource.GetMessage(MSGCODE, MSGCULTURE)).Return(MSGRESULT);
+            mocks.ReplayAll();
+
+            MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource);
+            Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE, MSGCULTURE));
+        }
+
+        [Test]
+        public void GetMessageCodeDefaultsToCurrentUICulture()
+        {
+            Expect.Call(mockMsgSource.GetMessage(MSGCODE, CultureInfo.CurrentUICulture)).Return(MSGRESULT);
+            mocks.ReplayAll();
+
+            MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource);
+            Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE));
+        }
+
+        [Test]
+        public void GetMessageResolvableCulture()
+        {
+            Expect.Call(mockMsgSource.GetMessage(mockMsgSourceResolvable, MSGCULTURE)).Return(MSGRESULT);            
+            mocks.ReplayAll();
+
+            MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource);
+            Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(mockMsgSourceResolvable, MSGCULTURE));
+        }
+
+        [Test]
+        public void GetMessageResolvableDefaultsToCurrentUICulture()
+        {
+            Expect.Call(mockMsgSource.GetMessage(mockMsgSourceResolvable, CultureInfo.CurrentUICulture)).Return(MSGRESULT);
+            mocks.ReplayAll();
+
+            MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource);
+            Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(mockMsgSourceResolvable));
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs
new file mode 100644
index 00000000..cb9f6d17
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs
@@ -0,0 +1,126 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Configuration;
+using System.Xml;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+    /// Unit tests for the NamespaceParsersSectionHandler class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	[TestFixture]
+    public sealed class NamespaceParsersSectionHandlerTests
+	{
+		[Test]
+		public void ParseSectionSunnyDay()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<parsers>
+	<parser namespace='http://schemas.springframework.net/testobject' type='Spring.Context.Support.TestObjectConfigParser, Spring.Core.Tests' schemaLocation='assembly://Spring.Core.Tests/Spring.Context.Support/testobject.xsd'/>
+</parsers>";
+
+			NamespaceParsersSectionHandler handler = new NamespaceParsersSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void ParseSectionWithHandlerThatDoesNotImplement_IXmlObjectDefinitionParser()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<parsers>
+	<parser namespace='http://schemas.springframework.net/2' type='Spring.Context.Support.NamespaceParsersSectionHandlerTests, Spring.Core.Tests' schemaLocation='assembly://Spring.Core.Tests/Spring.Context.Support/testobject.xsd'/>
+</parsers>";
+
+			NamespaceParsersSectionHandler handler = new NamespaceParsersSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		[Test]
+		[ExpectedException(typeof (TypeLoadException))]
+		public void ParseSectionWithBadTypeForHandler()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<parsers>
+	<parser namespace='http://schemas.springframework.net/2' type='Rubbish' schemaLocation='assembly://Spring.Core.Tests/Spring.Context.Support/testobject.xsd'/>
+</parsers>";
+
+			NamespaceParsersSectionHandler handler = new NamespaceParsersSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		[Test]
+		public void ParseSectionWithNoChildParserNamespaceElements()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<parsers>
+	<!-- now't in here -->
+</parsers>";
+
+			NamespaceParsersSectionHandler handler = new NamespaceParsersSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void ParseSectionWithEmptyType()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<parsers>
+	<parser namespace='http://schemas.springframework.net/3' type='' schemaLocation='assembly://Spring.Core.Tests/Spring.Context.Support/testobject.xsd'/>
+</parsers>";
+
+			NamespaceParsersSectionHandler handler = new NamespaceParsersSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		[Test]
+#if NET_2_0
+        [ExpectedException(typeof(ConfigurationErrorsException))]
+#else
+        [ExpectedException(typeof (ConfigurationException))]
+#endif
+		public void WithParserElementThatIsMissingTheTypeAttribute()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<parsers>
+	<parser namespace='http://schemas.springframework.net/3'/>
+</parsers>";
+
+			NamespaceParsersSectionHandler handler = new NamespaceParsersSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		private static XmlNode BuildConfigurationSection(string xml)
+		{
+			XmlDocument doc = new XmlDocument();
+			doc.LoadXml(xml);
+			return doc.DocumentElement;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/NullMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/NullMessageSourceTests.cs
new file mode 100644
index 00000000..8def2dad
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/NullMessageSourceTests.cs
@@ -0,0 +1,61 @@
+#region License
+
+/*
+ * Copyright 2004 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 NUnit.Framework;
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// Unit tests for the NullMessageSource class.
+	/// </summary>
+	/// <author></author>
+	/// <version>$Id: NullMessageSourceTests.cs,v 1.3 2007/07/02 21:24:48 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class NullMessageSourceTests
+	{
+		[Test]
+		public void CanonicalInstanceIsNotNull()
+		{
+			Assert.IsNotNull(NullMessageSource.Null);
+		}
+
+		[Test]
+		public void ResolveMessageSpitsbackWhatItWasGiven()
+		{
+			const string expected = "foo";
+			string message = NullMessageSource.Null.GetMessage(expected);
+			Assert.AreEqual(expected, message);
+		}
+
+		[Test]
+		public void ResolveObjectReturnsNull()
+		{
+			object anObject = NullMessageSource.Null.GetResourceObject("");
+			Assert.IsNull(anObject);
+		}
+
+		[Test]
+		public void ApplyResourcesDoesNothing()
+		{
+			NullMessageSource.Null.ApplyResources("", "foo", null);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs
new file mode 100644
index 00000000..8f1a5087
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs
@@ -0,0 +1,425 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+using System.Resources;
+using System.Text;
+using NUnit.Framework;
+using Spring.Globalization;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Unit tests for the ResourceSetMessageSource class.
+    /// </summary>
+    /// <author></author>
+    /// <version>$Id: ResourceSetMessageSourceTests.cs,v 1.13 2007/07/18 21:26:07 oakinger Exp $</version>
+    [TestFixture]
+    public sealed class ResourceSetMessageSourceTests
+    {
+        private ResourceSetMessageSource messageSource;
+
+        private const string ResourceNamespace = "Spring.Resources";
+        private const string ResourceFileName = "Spring.Context.Tests";
+        // The namespace is added during the build...
+        private const string ResourceBaseName = ResourceNamespace + "." + ResourceFileName;
+        private IList resourceManagerList;
+
+        [TestFixtureSetUp]
+        public void TestFixtureSetUp()
+        {
+            CultureTestScope.Set();
+        }
+
+        [TestFixtureTearDown]
+        public void TestFixtureTearDown()
+        {
+            CultureTestScope.Reset();
+        }
+
+        /// <summary>
+        /// Populate a known ResourceManager in the resourceManagerList.
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            messageSource = new ResourceSetMessageSource();
+            resourceManagerList = new ArrayList();
+            Assembly ass = this.GetType().Assembly;
+            resourceManagerList.Add(new ResourceManager(ResourceBaseName, ass));
+        }
+
+        [TearDown]
+        public void Destroy()
+        {
+            messageSource = null;
+        }
+
+        public void DoTestMessageAccess(bool hasParentContext, bool useCodeAsDefaultMessage)
+        {
+            StaticApplicationContext ac = new StaticApplicationContext();
+            if (hasParentContext)
+            {
+                StaticApplicationContext parent = new StaticApplicationContext();
+                parent.Refresh();
+                ac.ParentContext = parent;
+            }
+
+            MutablePropertyValues pvs = new MutablePropertyValues();
+            pvs.Add("resourceManagers", resourceManagerList);
+            if (useCodeAsDefaultMessage)
+            {
+                pvs.Add("UseCodeAsDefaultMessage", true);
+            }
+            ac.RegisterSingleton("messageSource", typeof(ResourceSetMessageSource), pvs);
+            ac.Refresh();
+
+
+            // Localizaiton fallbacks
+            GetMessageLocalizaitonFallbacks(ac);
+
+            // MessageSourceAccessor functionality
+            MessageSourceAccessor accessor = new MessageSourceAccessor(ac);
+            Assert.AreEqual("message3", accessor.GetMessage("code3", CultureInfo.CurrentUICulture, (object[])null));
+
+            // IMessageSourceResolveable
+            Assert.AreEqual("message3", ac.GetMessage("code3", CultureInfo.CurrentUICulture, (object[]) null));
+            IMessageSourceResolvable resolvable = new DefaultMessageSourceResolvable("code3");
+            
+            Assert.AreEqual("message3", ac.GetMessage(resolvable, CultureInfo.CurrentUICulture));
+            resolvable = new DefaultMessageSourceResolvable(new string[] {"code4", "code3"});
+            Assert.AreEqual("message3", ac.GetMessage(resolvable, CultureInfo.CurrentUICulture));
+
+            Assert.AreEqual("message3", ac.GetMessage("code3", CultureInfo.CurrentUICulture, (object[])null));
+            resolvable = new DefaultMessageSourceResolvable(new string[] { "code4", "code3" });
+            Assert.AreEqual("message3", ac.GetMessage(resolvable, CultureInfo.CurrentUICulture));
+
+            object[] arguments = new object[] { "Hello", new DefaultMessageSourceResolvable(new string[]{"code1"}) };
+            Assert.AreEqual("Hello, message1", ac.GetMessage("hello", CultureInfo.CurrentUICulture, arguments));
+            
+
+            // test default message without and with args
+            Assert.AreEqual("default", ac.GetMessage(null, "default", CultureInfo.CurrentUICulture, null));
+            Assert.AreEqual("default", ac.GetMessage(null, "default", CultureInfo.CurrentUICulture, arguments));
+
+            /* not supported 
+            Assert.AreEqual("{0}, default", ac.GetMessage(null, "{0}, default", CultureInfo.CurrentUICulture, null));
+             */
+            
+            Assert.AreEqual("Hello, default", ac.GetMessage(null, "{0}, default", CultureInfo.CurrentUICulture, arguments));
+
+            // test resolvable with default message, without and with args
+            resolvable = new DefaultMessageSourceResolvable(null, null, "default");
+            Assert.AreEqual("default", ac.GetMessage(resolvable, CultureInfo.CurrentUICulture));
+            resolvable = new DefaultMessageSourceResolvable(null, arguments, "default");
+            Assert.AreEqual("default", ac.GetMessage(resolvable, CultureInfo.CurrentUICulture));
+
+            /* not supported 
+                resolvable = new DefaultMessageSourceResolvable(null, null, "{0}, default");
+                Assert.AreEqual("{0}, default", ac.GetMessage(resolvable, CultureInfo.CurrentUICulture));
+            */
+
+            resolvable = new DefaultMessageSourceResolvable(null, arguments, "{0}, default");
+            Assert.AreEqual("Hello, default", ac.GetMessage(resolvable, CultureInfo.CurrentUICulture));
+
+
+            // test message args
+            Assert.AreEqual("Arg1, Arg2", ac.GetMessage("hello", CultureInfo.CurrentUICulture, new object[]{"Arg1", "Arg2"}));
+
+            /* not supported 
+                Assert.AreEqual("{0}, {1}", ac.GetMessage("hello", CultureInfo.CurrentUICulture, null));
+            */
+
+
+            /* not supported 
+                Assert.AreEqual("Hello\nWorld", ac.GetMessage("escaped"));
+            }
+            else
+            {
+                Assert.AreEqual("Hello\\nWorld", ac.GetMessage("escaped"));
+            }
+            */
+
+
+            try
+            {
+                Assert.AreEqual("MyNonExistantMessage", ac.GetMessage("MyNonExistantMessage"));
+                if (!useCodeAsDefaultMessage)
+                {
+                    Assert.Fail("Should have thrown NoSuchMessagException");
+                }
+            }
+            catch (NoSuchMessageException e)
+            {
+                if (useCodeAsDefaultMessage)
+                {
+                    Assert.Fail("Should have returned code as default message.");
+                    e.ToString();
+                }
+            }
+
+        }
+
+        [Test]
+        public void SimpleFormat()
+        {
+            string msg = String.Format(CultureInfo.CurrentUICulture, "\"Hello World\"");
+            Assert.AreEqual("\"Hello World\"", msg);
+        }
+
+        [Test]
+        public void MessageAccessFallbackTurnedOff()
+        {
+            DoTestMessageAccess(false, false);
+        }
+
+
+        [Test]
+        public void MessageAccessFallbackTurnedOn()
+        {
+            DoTestMessageAccess(false, true);
+        }
+
+
+        [Test]
+        public void MessageAccessWithParentAndFallbackTurnedOff()
+        {
+            DoTestMessageAccess(true, false);
+        }
+
+
+        /// <summary>
+        /// Test to string shows expected message with base name listing.
+        /// </summary>
+        [Test]
+        public void ResourceSetMessageSourceToString()
+        {
+            messageSource.ResourceManagers = resourceManagerList;
+            Assert.AreEqual("ResourceSetMessageSource with ResourceManagers of base names = [Spring.Resources.Spring.Context.Tests]",
+                            messageSource.ToString(), "ToString not as expected");
+        }
+
+        /// <summary>
+        /// Happy day scenario where the requested message key is found and substitutions are made.
+        /// </summary>
+        [Test]
+        public void ResourceSetMessageSourceGetMessage()
+        {
+            messageSource.ResourceManagers = resourceManagerList;
+            GetMessageLocalizaitonFallbacks(messageSource);
+        }
+
+        private void GetMessageLocalizaitonFallbacks(IMessageSource msgSource)
+        {
+            Assert.AreEqual("This is Spring.NET",
+                            msgSource.GetMessage("MyMessage", new object[] { "Spring", ".NET" }), "message not as expected");
+
+            Assert.AreEqual("Isso e Spring.NET",
+                            msgSource.GetMessage("MyMessage", new CultureInfo("pt-BR"), new object[] { "Spring", ".NET" }), "message not as expected");
+
+            Assert.AreEqual("Visual Studio loves Spring.NET",
+                            msgSource.GetMessage("MyNewMessage", new object[] { "Spring", ".NET" }), "message not as expected");
+
+            // test localization fallbacks
+            Assert.AreEqual("Visual Studio loves Spring.NET",
+                            msgSource.GetMessage("MyNewMessage", new CultureInfo("pt-BR"), new object[] { "Spring", ".NET" }), "message not as expected");
+
+            Assert.AreEqual("Ovo je Spring.NET",
+                            msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianLatinCultureName), new object[] { "Spring", ".NET" }), "message not as expected");
+
+            Assert.AreEqual("Ово је Spring.NET",
+                            msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName),
+                                                     new object[] { "Spring", ".NET" }), "message not as expected");
+
+            Assert.AreEqual("Visual Studio voli Spring.NET",
+                            msgSource.GetMessage("MyNewMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName), new object[] { "Spring", ".NET" }), "message not as expected");
+
+            Assert.AreEqual("First name",
+                            msgSource.GetMessage("field.firstname", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName)), "message not as expected");
+        }
+
+        /// <summary>
+        /// Test the happy day scenario of returning an object
+        /// </summary>
+        [Test]
+        public void GetResource()
+        {
+            //Add another resource manager to the list
+            Assembly ass = Assembly.LoadWithPartialName("Spring.Core.Tests");
+            string baseName = "Spring" + "." + "Resources.Images";
+
+            resourceManagerList.Add(new ResourceManager(baseName, ass));
+            messageSource.ResourceManagers = resourceManagerList;
+            object obj = messageSource.GetResourceObject("bubblechamber", CultureInfo.CurrentCulture);
+            Assert.IsNotNull(obj, "expected to retrieve object form resource set");
+            Bitmap bitMap = null;
+
+            //.NET 1.0 returns this as a base64 string while .NET 1.1 returns it as a Bitmap
+            //There are some isues with resx compatability between framework versions.
+            if (obj is string)
+            {
+                //thanks dotnetdave for the string to bitmap cookbook.
+                //http://www.vsdntips.com/Tips/VS.NET/Csharp/76.aspx
+                string ImageText = obj as string;
+                Byte[] bitmapData = new Byte[ImageText.Length];
+                bitmapData = Convert.FromBase64String(FixBase64ForImage(ImageText));
+                MemoryStream streamBitmap = new MemoryStream(bitmapData);
+                bitMap = new Bitmap((Bitmap)Image.FromStream(streamBitmap));
+
+            }
+            else
+            {
+                bitMap = obj as Bitmap;
+            }
+            Assert.IsNotNull(bitMap, "expected to retrieve BitMap. Instead Type = " + obj.GetType());
+            Assert.AreEqual(146, bitMap.Size.Width, "Width of image wrong");
+            Assert.AreEqual(119, bitMap.Size.Height, "Height of image wrong");
+
+            object obj2 = messageSource.GetResourceObject("notExist", CultureInfo.CurrentCulture);
+            Assert.IsNull(obj2, "non existent resourse found");
+        }
+
+        private string FixBase64ForImage(string Image)
+        {
+            StringBuilder sbText = new StringBuilder(Image, Image.Length);
+            sbText.Replace("\r\n", String.Empty);
+            sbText.Replace(" ", String.Empty);
+            return sbText.ToString();
+        }
+
+#if ! NET_1_0
+        /// <summary>
+        /// Test applying a family of resources to an object.
+        /// </summary>
+        [Test]
+        public void ApplyResources()
+        {
+            //Add another resource manager to the list
+            TestObject to = new TestObject();
+            ComponentResourceManager mgr = new ComponentResourceManager(to.GetType());
+            resourceManagerList.Add(mgr);
+            messageSource.ResourceManagers = resourceManagerList;
+
+            messageSource.ApplyResources(to, "testObject", CultureInfo.CurrentCulture);
+            Assert.AreEqual("Mark", to.Name);
+            Assert.AreEqual(35, to.Age);
+        }
+#endif
+
+        /// <summary>
+        /// Test when the code being resolves itself implements IMessageResolvable.
+        /// </summary>
+        [Test]
+        public void MessageResolveableGetMessage()
+        {
+            string[] codes = { "field.firstname" };
+            DefaultMessageSourceResolvable dmr = new DefaultMessageSourceResolvable(codes, null);
+
+            messageSource.ResourceManagers = resourceManagerList;
+            Assert.AreEqual(messageSource.GetMessage("error.required", CultureInfo.CurrentCulture, dmr, "dude!"), "First name is required dude!", "message not as expected");
+        }
+
+        /// <summary>
+        /// Get exception when resource doesn't exist.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(NoSuchMessageException))]
+        public void ResourceSetMessageSourceGetNonExistantResource()
+        {
+            messageSource.ResourceManagers = resourceManagerList;
+            messageSource.GetMessage("MyNonExistantMessage", CultureInfo.CurrentCulture, new object[] { "Spring", ".NET" });
+        }
+
+#if !NET_2_0
+		/// <summary>
+		/// Test resource whose value is null
+		/// </summary>
+		[Test]
+		public void ResourceSetMessageSourceGetNullResource()
+		{
+			messageSource.ResourceManagers = resourceManagerList;
+			object resource = messageSource.GetResourceObject("MyNullMessage", CultureInfo.InvariantCulture);
+			Assert.AreEqual(String.Empty, resource, "should've returned empty string");
+		}
+#endif
+
+#if NET_2_0
+        /// <summary>
+        /// Test resource whose value is null.
+        /// </summary>
+        [Test]
+        [Ignore("See SPRNET-246")]
+        public void GetNullResourceIn2PointOh()
+        {
+            messageSource.ResourceManagers = resourceManagerList;
+            object resource = messageSource.GetResourceObject("MyNullMessage", CultureInfo.InvariantCulture);
+            Assert.AreEqual(String.Empty, resource, "should've returned empty string");
+        }
+#endif
+
+        /// <summary>
+        /// Exercise repeated requests to hit the cache of MessageSets.  Note order of test is not assured
+        /// in NUnit.
+        /// </summary>
+        [Test]
+        public void ResourceSetMessageSourceCachedMessage()
+        {
+            messageSource.ResourceManagers = resourceManagerList;
+            Assert.AreEqual("This is Spring.NET", messageSource.GetMessage("MyMessage", CultureInfo.InvariantCulture, new object[] { "Spring", ".NET" }), "message");
+            Assert.AreEqual("Visual Studio loves Spring.NET", messageSource.GetMessage("MyNewMessage", CultureInfo.InvariantCulture, "Spring", ".NET"), "message");
+            Assert.AreEqual("This is Spring.NET", messageSource.GetMessage("MyMessage", CultureInfo.InvariantCulture, new object[] { "Spring", ".NET" }), "message");
+        }
+
+        /// <summary>
+        /// Test when there are two resource managers listed.
+        /// </summary>
+        [Test]
+        public void TwoResourceManagers()
+        {
+            //Add another resource manager to the list
+            Assembly ass = Assembly.LoadWithPartialName("Spring.Core.Tests");
+            string baseName = "Spring" + "." + "Resources.SampleResources";
+            resourceManagerList.Add(new ResourceManager(baseName, ass));
+
+            messageSource.ResourceManagers = resourceManagerList;
+
+            //Repeat the test for the first resource manager
+
+            Assert.AreEqual("This is Spring.NET",
+                            messageSource.GetMessage("MyMessage", new object[] { "Spring", ".NET" }), "message not as expected");
+
+            //Now with the newly added one
+            Assert.AreEqual("Hello Mr. Anderson",
+                            messageSource.GetMessage("message",
+                                                     new object[] { "Mr.", "Anderson" }), "message not as expected");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/Service.cs b/test/Spring/Spring.Core.Tests/Context/Support/Service.cs
new file mode 100644
index 00000000..8fefee3d
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/Service.cs
@@ -0,0 +1,75 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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;
+
+namespace Spring.Context.Support
+{  
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: Service.cs,v 1.1 2007/07/10 05:48:37 markpollack Exp $</version>
+    public class Service : IApplicationContextAware, IMessageSourceAware, IDisposable
+    {
+        private IApplicationContext applicationContext;
+        private IMessageSource messageSource;
+        private IResourceLoaderAware[] resources;
+        private bool properlyDestroyed = false;
+
+        public IApplicationContext ApplicationContext
+        {
+            get { return applicationContext; }
+            set { applicationContext = value; }
+        }
+
+        public IMessageSource MessageSource
+        {
+            set
+            {
+                if (messageSource != null)
+                {
+                    throw new InvalidOperationException("MessageSource should not be set twice");
+                }
+                messageSource = value;
+            }
+            get
+            {
+                return messageSource;
+            }
+
+        }
+
+
+        public IResourceLoaderAware[] Resources
+        {
+            get { return resources; }
+            set { resources = value; }
+        }
+
+        public bool ProperlyDestroyed
+        {
+            get { return properlyDestroyed; }
+        }
+
+        public void Dispose()
+        {
+            properlyDestroyed = true;
+            //TODO - try to get object while destroying, expect ObjectCreationNotAllowedException
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/StaticApplicationContextTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/StaticApplicationContextTests.cs
new file mode 100644
index 00000000..4c750c88
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/StaticApplicationContextTests.cs
@@ -0,0 +1,49 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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.Globalization;
+using NUnit.Framework;
+
+namespace Spring.Context.Support
+{
+    [TestFixture]
+    public class StaticApplicationContextTests
+    {
+        [Test]
+        public void AddMessageTest()
+        {
+            StaticApplicationContext ctx = new StaticApplicationContext();
+            ctx.Refresh();
+            ctx.AddMessage("code1", CultureInfo.CurrentUICulture, "this is {0}");
+            Assert.AreEqual("this is Spring.NET", ctx.GetMessage("code1", "Spring.NET"));
+        }
+
+        [Test]
+        public void RegisterObjectPrototype()
+        {
+            StaticApplicationContext ctx = new StaticApplicationContext();
+            ctx.RegisterPrototype("my object", typeof(MockContextAwareObject), null);
+            MockContextAwareObject ctx1 = (MockContextAwareObject) ctx.GetObject("my object");
+            MockContextAwareObject ctx2 = (MockContextAwareObject) ctx.GetObject("my object");
+            Assert.IsTrue(ctx1 != ctx2);
+            Assert.IsTrue(!ctx.IsSingleton("my object"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/StaticMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/StaticMessageSourceTests.cs
new file mode 100644
index 00000000..3755b8e9
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/StaticMessageSourceTests.cs
@@ -0,0 +1,219 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Globalization;
+using NUnit.Framework;
+using Spring.Globalization;
+using Spring.Objects;
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Unit tests for the StaticMessageSource class.
+    /// </summary>
+    /// <author></author>
+    /// <version>$Id: StaticMessageSourceTests.cs,v 1.9 2007/07/24 17:26:40 oakinger Exp $</version>
+    [TestFixture]
+    public sealed class StaticMessageSourceTests
+    {
+        [TestFixtureSetUp]
+        public void TestFixtureSetUp()
+        {
+            CultureTestScope.Set();
+        }
+
+        [TestFixtureTearDown]
+        public void TestFixtureTearDown()
+        {
+            CultureTestScope.Reset();
+        }
+
+        [Test]
+        public void GetMessageDefaultsToCurrentUICulture()
+        {
+            StaticMessageSource msgSource = new StaticMessageSource();
+            msgSource.AddMessage("code", CultureInfo.CurrentUICulture, "{0}");
+            Assert.AreEqual("my message", msgSource.GetMessage("code", "my message"), "message");
+
+            try
+            {
+                msgSource.GetMessage("code", CultureInfo.CurrentCulture);
+                Assert.Fail("message");
+            }
+            catch(NoSuchMessageException)
+            {}
+        }
+
+        [Test]
+        public void GetMessageCode()
+        {
+            StaticMessageSource msgSource = new StaticMessageSource();
+            msgSource.AddMessage("code", CultureInfo.CurrentUICulture, "{0} {1}");
+            Assert.AreEqual("my message",
+                            msgSource.GetMessage("code", CultureInfo.CurrentUICulture, new object[] {"my", "message"}),
+                            "message");
+        }
+
+        [Test]
+        public void StaticMessageSourceToString()
+        {
+            StaticMessageSource msgSource = new StaticMessageSource();
+            msgSource.AddMessage("code1", CultureInfo.CurrentUICulture, "{0} {1}");
+            Assert.AreEqual("StaticMessageSource : ['code1_" + CultureInfo.CurrentUICulture.Name + "' : '{0} {1}']",
+                            msgSource.ToString());
+        }
+
+
+        [Test]
+        public void ApplyResources()
+        {
+            TestObject value = new TestObject();
+            StaticMessageSource msgSource = new StaticMessageSource();
+#if ! NET_1_0
+            msgSource.ApplyResources(value, "testObject", CultureInfo.InvariantCulture);
+            Assert.AreEqual("Mark", value.Name, "Name property value not applied.");
+            Assert.AreEqual(35, value.Age, "Age property value not applied.");
+#else
+            try
+            {
+                msgSource.ApplyResources(value, "testObject", CultureInfo.InvariantCulture);
+                Assert.Fail("Should not be supported in 1.0");
+            } catch (NotSupportedException e)
+            {
+                Assert.AreEqual("Operation not supported in .NET 1.0 Release.",
+                                e.Message);
+            }
+#endif
+        }
+
+        [Test]
+        public void ApplyResourcesWithNullObject()
+        {
+            TestObject value = new TestObject();
+            StaticMessageSource msgSource = new StaticMessageSource();
+#if ! NET_1_0
+            msgSource.ApplyResources(null, "testObject", CultureInfo.InvariantCulture);
+            Assert.AreEqual(null, value.Name);
+            Assert.AreEqual(0, value.Age);
+#else
+            try
+            {
+                msgSource.ApplyResources(null, "testObject", CultureInfo.InvariantCulture);
+                Assert.Fail("Should not be supported in 1.0");
+            } catch (NotSupportedException e)
+            {
+                Assert.AreEqual("Operation not supported in .NET 1.0 Release.",
+                                e.Message);
+            }
+#endif
+        }
+
+        [Test]
+        public void ApplyResourcesWithNullLookupKey()
+        {
+            TestObject value = new TestObject();
+            StaticMessageSource msgSource = new StaticMessageSource();
+#if ! NET_1_0
+            try 
+            {
+                msgSource.ApplyResources(value, null, CultureInfo.InvariantCulture);
+                Assert.Fail("ArgumentNullException was expected");
+            } catch (ArgumentNullException e)
+            {
+                Assert.IsNotNull(e);
+            }
+            Assert.AreEqual(null, value.Name);
+            Assert.AreEqual(0, value.Age);
+#else
+            try
+            {
+                msgSource.ApplyResources(value, null, CultureInfo.InvariantCulture);
+                Assert.Fail("Should not be supported in 1.0");
+            } 
+            catch (NotSupportedException e)
+            {
+                Assert.AreEqual("Operation not supported in .NET 1.0 Release.",
+                                e.Message);                
+            }
+#endif
+        }
+
+        [Test]
+        public void GetResourceObjectWithCodeAndCulture()
+        {
+            TestObject value = new TestObject("Rick", 30);
+            StaticMessageSource msgSource = new StaticMessageSource();
+            msgSource.AddObject("rick", CultureInfo.InstalledUICulture, value);
+
+            TestObject retrieved = (TestObject)
+                                   msgSource.GetResourceObject("rick", CultureInfo.InstalledUICulture);
+            Assert.IsNotNull(retrieved,
+                             "Object previously added to StaticMessageSource was not retrieved " +
+                             "when using same lookup code and CultureInfo.");
+            Assert.IsTrue(ReferenceEquals(value, retrieved),
+                          "Object returned from StaticMessageSource was not the same one " +
+                          "that was previously added (it must be).");
+        }
+
+        [Test]
+        public void GetResourceObjectWithCode()
+        {
+            TestObject value = new TestObject("Rick", 30);
+            StaticMessageSource msgSource = new StaticMessageSource();
+            msgSource.AddObject("rick", CultureInfo.CurrentUICulture, value);
+
+            TestObject retrieved = (TestObject)
+                                   msgSource.GetResourceObject("rick");
+            Assert.IsNotNull(retrieved,
+                             "Object previously added to StaticMessageSource was not retrieved " +
+                             "when using same lookup code.");
+            Assert.IsTrue(ReferenceEquals(value, retrieved),
+                          "Object returned from StaticMessageSource was not the same one " +
+                          "that was previously added (it must be).");
+        }
+
+        [Test]
+        public void GetResourceObjectThatAintPreviouslyBeenAddedDoesntYieldAnything()
+        {
+            StaticMessageSource msgSource = new StaticMessageSource();
+            TestObject retrieved = (TestObject)
+                                   msgSource.GetResourceObject("rick");
+            Assert.IsNull(retrieved,
+                          "Getting 'some (?) weird object out of an empty StaticMessageSource");
+        }
+
+        [Test]
+        public void GetResourceObjectWithCodeAssumesCurrentUICulture()
+        {
+            TestObject value = new TestObject("Rick", 30);
+            StaticMessageSource msgSource = new StaticMessageSource();
+            msgSource.AddObject("rick", CultureInfo.InvariantCulture, value);
+
+            // assumes object was previously added using CultureInfo.CurrentUICulture
+            TestObject retrieved = (TestObject)
+                                   msgSource.GetResourceObject("rick");
+            Assert.IsNull(retrieved,
+                          "Object previously added to StaticMessageSource " +
+                          "(using CultureInfo.InvariantCulture) was (wrongly) retrieved " +
+                          "when using same lookup code.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/TestObjectConfigParser.cs b/test/Spring/Spring.Core.Tests/Context/Support/TestObjectConfigParser.cs
new file mode 100644
index 00000000..2b8b1e7c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/TestObjectConfigParser.cs
@@ -0,0 +1,100 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Xml;
+using Spring.Objects;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// A simple parser to create TestObjects.
+    /// </summary>
+    public class TestObjectConfigParser : ObjectsNamespaceParser
+    {
+        /// <summary>
+        /// Has the method been called?
+        /// </summary>
+        public static bool ParseElementCalled = false;
+
+        /// <summary>
+        /// Create an instance of the parser
+        /// </summary>
+        public TestObjectConfigParser()
+        {
+        }
+
+        /// <summary>
+        /// Parse the specified element and register any resulting
+        /// IObjectDefinitions with the IObjectDefinitionRegistry that is
+        /// embedded in the supplied ParserContext.
+        /// </summary>
+        /// <param name="element">The element to be parsed into one or more IObjectDefinitions</param>
+        /// <param name="parserContext">The object encapsulating the current state of the parsing
+        /// process.</param>
+        /// <returns>
+        /// The primary IObjectDefinition (can be null as explained above)
+        /// </returns>
+        /// <remarks>
+        /// Implementations should return the primary IObjectDefinition
+        /// that results from the parse phase if they wish to used nested
+        /// inside (for example) a <code>&lt;property&gt;</code> tag.
+        /// <para>Implementations may return null if they will not
+        /// be used in a nested scenario.
+        /// </para>
+        /// </remarks>
+        public override IObjectDefinition ParseElement(XmlElement element, ParserContext parserContext)
+        {
+            ParseElementCalled = true;
+            ObjectDefinitionHolder holder = ParseTestObjectDefinition(element, parserContext);
+            ObjectDefinitionReaderUtils.RegisterObjectDefinition(holder, parserContext.Registry);
+            return null;
+        }
+
+
+        private ObjectDefinitionHolder ParseTestObjectDefinition(XmlElement rootElement, ParserContext parserContext)
+        {
+            MutablePropertyValues properties = new MutablePropertyValues();
+            
+            XmlNodeList childNodes = rootElement.ChildNodes;
+
+            //Get all properties (from non whitespace nodes)
+            foreach (XmlNode childNode in childNodes)
+            {                
+                if (XmlNodeType.Whitespace != childNode.NodeType)
+                {
+                    properties.Add(new PropertyValue(childNode.LocalName, childNode.InnerText));
+                }
+            }
+            IConfigurableObjectDefinition od = new RootObjectDefinition(typeof (TestObject), null, properties);
+            od.IsSingleton = false;
+
+            //HardCoded for now.
+            string id = "testObject";
+            //id = ObjectDefinitionReaderUtils.GenerateObjectName(od, reader.ObjectReader.Registry);
+
+            return new ObjectDefinitionHolder(od, id);
+
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs
new file mode 100644
index 00000000..62a99918
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs
@@ -0,0 +1,222 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Configuration;
+using System.Xml;
+using NUnit.Framework;
+using Spring.Core.TypeResolution;
+using Spring.Objects;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+	/// <summary>
+	/// Unit tests for the TypeAliasesSectionHandler class.
+	/// </summary>
+	[TestFixture]
+	public sealed class TypeAliasesSectionHandlerTests
+	{
+		[Test]
+		public void ParseSectionSunnyDay()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<typeAliases>
+	<alias name='fiona.apple' type='Spring.Objects.TestObject, Spring.Core.Tests'/>
+</typeAliases>";
+
+			Assert.IsNull(TypeRegistry.ResolveType("fiona.apple"), "TypeRegistry already contains an alias for the type being tested (it must not).");
+
+			TypeAliasesSectionHandler handler = new TypeAliasesSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+
+			Type type = TypeRegistry.ResolveType("fiona.apple");
+			Assert.AreEqual(typeof (TestObject), type, "The type alias was not registered by the TypeAliasesSectionHandler.");
+		}
+
+#if NET_2_0
+        [Test]
+        public void WithGenericType()
+        {
+            const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<typeAliases>
+	<alias name='myDictionary' type='System.Collections.Generic.Dictionary&lt;int,string>'/>
+</typeAliases>";
+
+            TypeAliasesSectionHandler handler = new TypeAliasesSectionHandler();
+            handler.Create(null, null, BuildConfigurationSection(xml));
+        }
+
+        [Test]
+        public void WithGenericTypeDefinition()
+        {
+            const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<typeAliases>
+	<alias name='gDictionary' type='System.Collections.Generic.Dictionary&lt;,>'/>
+    <alias name='myDictionary' type='gDictionary&lt;string, int>'/>
+</typeAliases>";
+
+            TypeAliasesSectionHandler handler = new TypeAliasesSectionHandler();
+            handler.Create(null, null, BuildConfigurationSection(xml));
+        }
+#endif
+
+		[Test]
+		[ExpectedException(typeof (TypeLoadException))]
+		public void WithNonExistentType()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<typeAliases>
+	<alias name='fiona.apple' type='schwing'/>
+</typeAliases>";
+
+			TypeAliasesSectionHandler handler = new TypeAliasesSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void WithEmptyTypeName()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<typeAliases>
+	<alias name='fiona.apple' type=''/>
+</typeAliases>";
+
+			TypeAliasesSectionHandler handler = new TypeAliasesSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void WithWhitespacedTypeName()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<typeAliases>
+	<alias name='fiona.apple' type=' 
+  
+'/>
+</typeAliases>";
+
+			TypeAliasesSectionHandler handler = new TypeAliasesSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void WithEmptyAlias()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<typeAliases>
+	<alias name='' type='Spring.Objects.TestObject, Spring.Core.Tests'/>
+</typeAliases>";
+
+			TypeAliasesSectionHandler handler = new TypeAliasesSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void WithWhitespacedAlias()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<typeAliases>
+	<alias name='
+ ' type='Spring.Objects.TestObject, Spring.Core.Tests'/>
+</typeAliases>";
+
+			TypeAliasesSectionHandler handler = new TypeAliasesSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		[Test]
+		public void ParseSectionWithNoChildParserNamespaceElements()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<typeAliases>
+	<!-- now't in here -->
+</typeAliases>";
+
+			TypeAliasesSectionHandler handler = new TypeAliasesSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		[Test]
+		public void ParseSectionWithGuffChildParserNamespaceElementsIsAllowed()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<typeAliases>
+	<!-- some guff elements -->
+	<so/>
+	<hot/>
+	<right/>
+	<now/>
+</typeAliases>";
+
+			TypeAliasesSectionHandler handler = new TypeAliasesSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		[Test]
+#if NET_2_0
+        [ExpectedException(typeof(ConfigurationErrorsException))]
+#else
+        [ExpectedException(typeof (ConfigurationException))]
+#endif
+		public void WithAliasElementThatIsMissingTheNameAttribute()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<typeAliases>
+	<alias type='Spring.Objects.TestObject, Spring.Core.Tests'/>
+</typeAliases>";
+
+			TypeAliasesSectionHandler handler = new TypeAliasesSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		[Test]
+#if NET_2_0
+        [ExpectedException(typeof(ConfigurationErrorsException))]
+#else
+        [ExpectedException(typeof (ConfigurationException))]
+#endif
+		public void WithAliasElementThatIsMissingTheTypeAttribute()
+		{
+			const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<typeAliases>
+	<alias name='bing'/>
+</typeAliases>";
+
+			TypeAliasesSectionHandler handler = new TypeAliasesSectionHandler();
+			handler.Create(null, null, BuildConfigurationSection(xml));
+		}
+
+		private static XmlNode BuildConfigurationSection(string xml)
+		{
+			XmlDocument doc = new XmlDocument();
+			doc.LoadXml(xml);
+			return doc.DocumentElement;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/XmlApplicationContextTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/XmlApplicationContextTests.cs
new file mode 100644
index 00000000..48da4adc
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/XmlApplicationContextTests.cs
@@ -0,0 +1,351 @@
+#region License
+
+/*
+ * Copyright 2005 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 NUnit.Framework;
+using Spring.Core;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Xml;
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    /// Test creation of application context from XML.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    [TestFixture]
+    public sealed class XmlApplicationContextTests
+    {
+        [Test]
+        public void SingleConfigLocation()
+        {
+            XmlApplicationContext ctx =
+                new XmlApplicationContext(false, "assembly://Spring.Core.Tests/Spring.Context.Support/simpleContext.xml");
+            Assert.IsTrue(ctx.ContainsObject("someMessageSource"));
+            ctx.Dispose();
+        }
+
+        [Test]
+        public void MultipleConfigLocations()
+        {
+            XmlApplicationContext ctx =
+                new XmlApplicationContext(false, "assembly://Spring.Core.Tests/Spring.Context.Support/contextB.xml",
+                                          "assembly://Spring.Core.Tests/Spring.Context.Support/contextC.xml",
+                                          "assembly://Spring.Core.Tests/Spring.Context.Support/contextA.xml");
+            Assert.IsTrue(ctx.ContainsObject("service"));
+            Assert.IsTrue(ctx.ContainsObject("logicOne"));
+            Assert.IsTrue(ctx.ContainsObject("logicTwo"));
+            Service service = (Service) ctx.GetObject("service");
+            ctx.Refresh();
+            Assert.IsTrue(service.ProperlyDestroyed);
+            service = (Service) ctx.GetObject("service");
+            ctx.Dispose();
+            Assert.IsTrue(service.ProperlyDestroyed);
+        }
+
+        [Test]
+        public void ContextWithInvalidValueType()
+        {
+            try
+            {
+                XmlApplicationContext ctx =
+                    new XmlApplicationContext(false,
+                                              "assembly://Spring.Core.Tests/Spring.Context.Support/invalidValueType.xml");
+                Assert.Fail("Should have thrown ObjectCreationException for context", ctx);
+            }
+            catch (ObjectCreationException ex)
+            {
+                Assert.IsTrue(ex.Message.IndexOf((typeof (TypeMismatchException).Name)) != -1);
+                Assert.IsTrue(ex.Message.IndexOf(("UseCodeAsDefaultMessage")) != -1);
+            }
+        }
+
+        [Test]
+        [Ignore("Need to add Spring.TypeLoadException")]
+        public void ContextWithInvalidLazyType()
+        {
+            XmlApplicationContext ctx =
+                new XmlApplicationContext(false,
+                                          "assembly://Spring.Core.Tests/Spring.Context.Support/invalidType.xml");
+            Assert.IsTrue(ctx.ContainsObject("someMessageSource"));
+            ctx.GetObject("someMessageSource");
+        }
+
+        [Test]
+        public void CaseInsensitiveContext()
+        {
+            XmlApplicationContext ctx =
+                new XmlApplicationContext(false, "assembly://Spring.Core.Tests/Spring.Context.Support/objects.xml");
+            Assert.IsTrue(ctx.ContainsObject("goran"));
+            Assert.IsTrue(ctx.ContainsObject("Goran"));
+            Assert.IsTrue(ctx.ContainsObject("GORAN"));
+            Assert.AreEqual(ctx.GetObject("goran"), ctx.GetObject("GORAN"));
+        }
+
+        [Test]
+        public void FactoryObjectsAreNotInstantiatedBeforeObjectFactoryPostProcessorsAreApplied()
+        {
+            XmlApplicationContext ctx = new XmlApplicationContext("Spring/Context/Support/SPRNET-192.xml");
+            LogFactoryObject logFactory = (LogFactoryObject) ctx["&log"];
+            Assert.AreEqual("foo", logFactory.LogName);
+        }
+
+        /// <summary>
+        /// Make sure that if an IObjectPostProcessor is defined as abstract
+        /// the creation of an IApplicationContext will not try to instantiate it.
+        /// </summary>
+        [Test]
+        public void ContextWithPostProcessors()
+        {
+            CountingObjectPostProcessor.Count = 0;
+            CoutingObjectFactoryPostProcessor.Count = 0;
+
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Core.Tests/Spring.Context.Support/objects.xml");
+
+            Assert.IsTrue(ctx.ContainsObject("abstractObjectProcessorPrototype"));
+            Assert.IsTrue(ctx.ContainsObject("abstractFactoryProcessorPrototype"));
+
+            Assert.AreEqual(0, CountingObjectPostProcessor.Count);
+            Assert.AreEqual(0, CoutingObjectFactoryPostProcessor.Count);
+        }
+
+        /// <summary>
+        /// Make sure that ConfigureObject() completly configures target 
+        /// object (goes through whole lifecycle of object creation and 
+        /// applies all processors).
+        /// </summary>
+        [Test]
+        public void ConfigureObject()
+        {
+            const string objDefLocation = "assembly://Spring.Core.Tests/Spring.Context.Support/objects.xml";
+
+            XmlApplicationContext xmlContext = new XmlApplicationContext(new string[] {objDefLocation});
+
+            object objGoran = xmlContext.GetObject("goran");
+            Assert.IsTrue(objGoran is TestObject);
+            TestObject fooGet = objGoran as TestObject;
+
+            TestObject fooConfigure = new TestObject();
+            xmlContext.ConfigureObject(fooConfigure, "goran");
+            Assert.IsNotNull(fooGet);
+            Assert.AreEqual(fooGet.Name, fooConfigure.Name);
+            Assert.AreEqual(fooGet.Age, fooConfigure.Age);
+            Assert.AreEqual(fooGet.ObjectName, fooConfigure.ObjectName);
+            Assert.IsNotNull(fooGet.ObjectName);
+            Assert.AreEqual(xmlContext, fooGet.ApplicationContext);
+            Assert.AreEqual(xmlContext, fooConfigure.ApplicationContext);
+        }
+
+
+        [Test]
+        public void ContextLifeCycle()
+        {
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Core.Tests/Spring.Context/contextlifecycle.xml");
+            IConfigurableApplicationContext configCtx = ctx as IConfigurableApplicationContext;
+            Assert.IsNotNull(configCtx);
+            ContextListenerObject clo;
+            using (configCtx)
+            {
+                clo = configCtx["contextListenerObject"] as ContextListenerObject;
+                Assert.IsNotNull(clo);
+                Assert.IsTrue(clo.AppListenerContextRefreshed,
+                              "Object did not receive context refreshed event via IApplicationListener");
+                Assert.IsTrue(clo.CtxRefreshed, "Object did not receive context refreshed event via direct wiring");
+            }
+            Assert.IsTrue(clo.AppListenerContextClosed,
+                          "Object did not receive context closed event via IApplicationContextListener");
+            Assert.IsTrue(clo.CtxClosed, "Object did not receive context closed event via direct wiring.");
+        }
+
+        [Test]
+        public void RefreshDisposesExistingObjectFactory_SPRNET479()
+        {
+            string tmp = typeof (DestroyTester).FullName;
+            Console.WriteLine(tmp);
+
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Core.Tests/Spring.Context.Support/objects.xml");
+
+            DestroyTester destroyTester = (DestroyTester) ctx.GetObject("destroyTester");
+            DisposeTester disposeTester = (DisposeTester) ctx.GetObject("disposeTester");
+            Assert.IsFalse(destroyTester.IsDestroyed);
+            Assert.IsFalse(disposeTester.IsDisposed);
+
+            ((IConfigurableApplicationContext) ctx).Refresh();
+
+            Assert.IsTrue(destroyTester.IsDestroyed);
+            Assert.IsTrue(disposeTester.IsDisposed);
+        }
+
+        [Test]
+        public void GenericApplicationContextWithXmlObjectDefinitions()
+        {
+            GenericApplicationContext ctx = new GenericApplicationContext();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(ctx);
+            reader.LoadObjectDefinitions("assembly://Spring.Core.Tests/Spring.Context.Support/contextB.xml");
+            reader.LoadObjectDefinitions("assembly://Spring.Core.Tests/Spring.Context.Support/contextC.xml");
+            reader.LoadObjectDefinitions("assembly://Spring.Core.Tests/Spring.Context.Support/contextA.xml");
+            ctx.Refresh();
+
+            Assert.IsTrue(ctx.ContainsObject("service"));
+            Assert.IsTrue(ctx.ContainsObject("logicOne"));
+            Assert.IsTrue(ctx.ContainsObject("logicTwo"));
+            ctx.Dispose();
+
+        }
+
+        [Test]
+        public void GenericApplicationContextConstructorTests()
+        {
+            IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Core.Tests/Spring.Context/contextlifecycle.xml");
+            GenericApplicationContext genericCtx = new GenericApplicationContext(ctx);
+            genericCtx = new GenericApplicationContext("test", true, ctx);
+        }
+
+        #region Helper classes
+
+        public class DisposeTester : IDisposable
+        {
+            private bool isDisposed = false;
+
+            public bool IsDisposed
+            {
+                get { return isDisposed; }
+            }
+
+            public void Dispose()
+            {
+                if (isDisposed) throw new InvalidOperationException("must not be disposed twice");
+                isDisposed = true;
+            }
+        }
+
+        public class DestroyTester
+        {
+            private bool isDestroyed = false;
+
+            public bool IsDestroyed
+            {
+                get { return isDestroyed; }
+            }
+
+            public void DestroyMe()
+            {
+                if (isDestroyed) throw new InvalidOperationException("must not be destroyed twice");
+                isDestroyed = true;
+            }
+        }
+
+        /// <summary>
+        /// Utility class to keep track of object construction.
+        /// </summary>
+        public class CountingObjectPostProcessor : IObjectPostProcessor
+        {
+            private static int count;
+
+            /// <summary>
+            /// Property Count (int)
+            /// </summary>
+            public static int Count
+            {
+                get { return count; }
+                set { count = value; }
+            }
+
+            /// <summary>
+            /// Create an instance and increment the counter
+            /// </summary>
+            public CountingObjectPostProcessor()
+            {
+                count++;
+            }
+
+            #region IObjectPostProcessor Members
+
+            /// <summary>
+            /// No op implementation
+            /// </summary>
+            /// <param name="obj">object to process</param>
+            /// <param name="objectName">name of object</param>
+            /// <returns>processed object</returns>
+            public object PostProcessAfterInitialization(object obj, string objectName)
+            {
+                return obj;
+            }
+
+            /// <summary>
+            /// No op implementation
+            /// </summary>
+            /// <param name="obj">object to process</param>
+            /// <param name="name">name of object</param>
+            /// <returns>processed object</returns>
+            public object PostProcessBeforeInitialization(object obj, string name)
+            {
+                return obj;
+            }
+
+            #endregion
+        }
+
+
+        /// <summary>
+        /// Utility class to keep track of object construction.
+        /// </summary>
+        public class CoutingObjectFactoryPostProcessor : IObjectFactoryPostProcessor
+        {
+            private static int count;
+
+            /// <summary>
+            /// Property Count (int)
+            /// </summary>
+            public static int Count
+            {
+                get { return count; }
+                set { count = value; }
+            }
+
+            /// <summary>
+            /// Create an instance and increment the counter
+            /// </summary>
+            public CoutingObjectFactoryPostProcessor()
+            {
+                count++;
+            }
+
+            #region IObjectFactoryPostProcessor Members
+
+            /// <summary>
+            /// no op
+            /// </summary>
+            /// <param name="factory">factory to post process</param>
+            public void PostProcessObjectFactory(IConfigurableListableObjectFactory factory)
+            {
+            }
+
+            #endregion
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/contextA.xml b/test/Spring/Spring.Core.Tests/Context/Support/contextA.xml
new file mode 100644
index 00000000..fc0aa240
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/contextA.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <import resource="import1.xml"/>
+
+  <object name="service" type="Spring.Context.Support.Service, Spring.Core.Tests">
+    
+  </object>
+  
+  <object id="logicTwo" type="Spring.Context.Support.Logic, Spring.Core.Tests">
+    <property name="assembler" ref="assemblerOne"/>
+  </object>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/contextB.xml b/test/Spring/Spring.Core.Tests/Context/Support/contextB.xml
new file mode 100644
index 00000000..a3b6568e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/contextB.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+  
+  <object id="logicOne" type="Spring.Context.Support.Logic, Spring.Core.Tests">
+    <property name="assembler" ref="assemblerTwo"/>
+  </object>
+  
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/contextC.xml b/test/Spring/Spring.Core.Tests/Context/Support/contextC.xml
new file mode 100644
index 00000000..4c9abac8
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/contextC.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+  
+  <object id="logicTwo" type="Spring.Context.Support.Logic, Spring.Core.Tests">
+    <property name="assembler" ref="assemblerOne"/>
+  </object>
+  
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/import1.xml b/test/Spring/Spring.Core.Tests/Context/Support/import1.xml
new file mode 100644
index 00000000..dabd9953
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/import1.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+
+  <object id="assemblerOne" type="Spring.Context.Support.Assembler, Spring.Core.Tests">
+    <property name="service" ref="service"/>
+    <property name="logic" ref="logicOne"/>
+  </object>
+
+  
+  <object id="assemblerTwo" type="Spring.Context.Support.Assembler, Spring.Core.Tests">
+    <property name="logic" ref="logicTwo"/>
+  </object>
+  
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/invalidType.xml b/test/Spring/Spring.Core.Tests/Context/Support/invalidType.xml
new file mode 100644
index 00000000..5e0032b1
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/invalidType.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+
+  <object id="someMessageSource" name="myMessageSource"
+          type="Spring.Context.Support.StaticMessageSourc, Spring.Core" lazy-init="true">
+  </object>
+
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/invalidValueType.xml b/test/Spring/Spring.Core.Tests/Context/Support/invalidValueType.xml
new file mode 100644
index 00000000..3cb3307c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/invalidValueType.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<objects xmlns="http://www.springframework.net">
+
+
+  <object id="someMessageSource" name="myMessageSource"
+          type="Spring.Context.Support.StaticMessageSource, Spring.Core">
+    <property name="UseCodeAsDefaultMessage" value="yyy"/>
+  </object>
+
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/objects.xml b/test/Spring/Spring.Core.Tests/Context/Support/objects.xml
new file mode 100644
index 00000000..d31ba0bb
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/objects.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<objects xmlns="http://www.springframework.net">
+  <object id="abstractObjectProcessorPrototype"
+          type="Spring.Context.Support.XmlApplicationContextTests+CountingObjectPostProcessor, Spring.Core.Tests"
+          abstract="true">
+  </object>
+
+  <object id="abstractFactoryProcessorPrototype"
+          type="Spring.Context.Support.XmlApplicationContextTests+CoutingObjectFactoryPostProcessor, Spring.Core.Tests"
+          abstract="true">
+  </object>
+
+  <object id='goran' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+    <property name='Name' value='Goran'/>
+  </object>
+
+  <object id="testObjectContainer_lazy" 
+          type="Spring.Expressions.TestObjectContainer, Spring.Core.Tests"
+          lazy-init="true">
+    <property name="TestObject" expression="@(goran)" />
+  </object>
+
+  <object id='disposeTester' type='Spring.Context.Support.XmlApplicationContextTests+DisposeTester, Spring.Core.Tests' />
+  <object id='destroyTester' type='Spring.Context.Support.XmlApplicationContextTests+DestroyTester, Spring.Core.Tests' destroy-method='DestroyMe'/>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/simpleContext.xml b/test/Spring/Spring.Core.Tests/Context/Support/simpleContext.xml
new file mode 100644
index 00000000..48161fe4
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/simpleContext.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+
+  <object id="someMessageSource" name="myMessageSource" 
+          type="Spring.Context.Support.StaticMessageSource, Spring.Core">
+
+  </object>
+
+  <object type="Spring.Context.Support.XmlApplicationContext, Spring.Core" lazy-init="true">
+    <constructor-arg value="file://SomeNonExistentFile.xml"/>
+  </object>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/testobject.xsd b/test/Spring/Spring.Core.Tests/Context/Support/testobject.xsd
new file mode 100644
index 00000000..242311ae
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/testobject.xsd
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xs:schema targetNamespace="http://schemas.springframework.net/testobject" elementFormDefault="qualified"
+  xmlns="http://schemas.springframework.net/testobject" xmlns:mstns="http://schemas.springframework.net/testobject"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="testobject">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="age" type="xs:positiveInteger" />
+        <xs:element name="name" type="xs:string" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/testobject.xsx b/test/Spring/Spring.Core.Tests/Context/Support/testobject.xsx
new file mode 100644
index 00000000..ff71343b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/Support/testobject.xsx
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.-->
+<XSDDesignerLayout Style="LeftRight" />
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Context/contextlifecycle.xml b/test/Spring/Spring.Core.Tests/Context/contextlifecycle.xml
new file mode 100644
index 00000000..553f7c8c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Context/contextlifecycle.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns="http://www.springframework.net" 
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	    xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+   <description>
+   Tests for notificaton on application lifecycle events.
+   </description>
+
+   <object id="contextListenerObject" type="Spring.Context.ContextListenerObject, Spring.Core.Tests"/>   
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/ComposedCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/ComposedCriteriaTests.cs
new file mode 100644
index 00000000..2a5aa955
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/ComposedCriteriaTests.cs
@@ -0,0 +1,78 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System.Text.RegularExpressions;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core
+{
+	[TestFixture]
+	public class ComposedCriteriaTests : ComposedCriteria
+	{
+		public ComposedCriteriaTests() : base() {}
+		public ComposedCriteriaTests( ICriteria criteria ) : base( criteria ) {}
+		[Test]
+		public void IsSatisfiedWithNoCriteria()
+		{
+			ComposedCriteriaTests composedCriteria = new ComposedCriteriaTests();
+			Assert.IsTrue(composedCriteria.IsSatisfied("foo"));
+		}
+
+		[Test]
+		public void SatifiesMyUpperCaseCriteria()
+		{
+			ComposedCriteriaTests composedCriteria = new ComposedCriteriaTests(new MyUpperCaseCriteria());
+			Assert.IsTrue(composedCriteria.IsSatisfied("HELLO"));
+			Assert.IsFalse(composedCriteria.IsSatisfied("hello"));
+		}
+
+		[Test]
+		public void SatifiesTwoCriteria()
+		{
+			ComposedCriteriaTests composedCriteria = new ComposedCriteriaTests();
+			composedCriteria.Add(new MyUpperCaseCriteria());
+			composedCriteria.Add(new MyStringCriteria());
+			Assert.IsTrue(composedCriteria.IsSatisfied("HELLO"));
+			Assert.IsFalse(composedCriteria.IsSatisfied("GOODBYE"));
+			Assert.IsTrue( composedCriteria.Criteria.Count == 2 );
+		}
+
+		internal class MyUpperCaseCriteria : ICriteria
+		{
+			public bool IsSatisfied(object datum)
+			{
+				return Regex.Match((string) datum, "[A-Z]").Success;
+			}
+		}
+
+		internal class MyStringCriteria : ICriteria
+		{
+			public bool IsSatisfied(object datum)
+			{
+				return datum.ToString().ToLower() == "hello";
+			}
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/ControlFlowFactoryTests.cs b/test/Spring/Spring.Core.Tests/Core/ControlFlowFactoryTests.cs
new file mode 100644
index 00000000..3c8a12bb
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/ControlFlowFactoryTests.cs
@@ -0,0 +1,123 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Core
+{
+	/// <summary>
+	/// Unit tests for the default IControlFlow implementation returned by the
+	/// ControlFlowFactory class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: ControlFlowFactoryTests.cs,v 1.2 2006/04/09 07:24:48 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class ControlFlowFactoryTests
+	{
+		[Test]
+		public void CreateControlFlow()
+		{
+			IControlFlow cflow = ControlFlowFactory.CreateControlFlow();
+			Assert.IsNotNull(cflow, "The ControlFlowFactory factory class is returning a " +
+				"null IControlFlow instance (it, obviously, must not)");
+		}
+
+		[Test]
+		public void CreateControlFlowReturnsDistinctInstance()
+		{
+			IControlFlow cflow1 = ControlFlowFactory.CreateControlFlow();
+			IControlFlow cflow2 = ControlFlowFactory.CreateControlFlow();
+			Assert.IsFalse(Object.ReferenceEquals(cflow1, cflow2), "The ControlFlowFactory " +
+				"factory class is not returning distinct IControlFlow instances (its always " +
+				"the same instance)");
+		}
+
+		[Test]
+		public void DefaultCflowUnderThisTest()
+		{
+			IControlFlow cflow = ControlFlowFactory.CreateControlFlow();
+			bool isUnder = cflow.Under(GetType());
+			Assert.IsTrue(isUnder, string.Format(
+				"The IControlFlow implementation created by the ControlFlowFactory factory class " +
+					"would appear to have a faulty Under(Type) implementation : [{0}]", cflow.GetType()));
+		}
+
+		[Test]
+		public void DefaultCflowIsNotUnderSomeArbitraryClass()
+		{
+			IControlFlow cflow = ControlFlowFactory.CreateControlFlow();
+			bool isUnder = cflow.Under(typeof (TestObject));
+			Assert.IsFalse(isUnder, string.Format(
+				"The IControlFlow implementation created by the ControlFlowFactory factory class " +
+					"would appear to have a faulty Under(Type) implementation : [{0}]", cflow.GetType()));
+		}
+
+		[Test]
+		public void DefaultCflowUnderThisTestAndTestMethodName()
+		{
+			IControlFlow cflow = ControlFlowFactory.CreateControlFlow();
+			bool isUnder = cflow.Under(GetType(), MethodBase.GetCurrentMethod().Name);
+			Assert.IsTrue(isUnder, string.Format(
+				"The IControlFlow implementation created by the ControlFlowFactory factory class " +
+					"would appear to have a faulty Under(Type,string) implementation : [{0}]",
+				cflow.GetType()));
+		}
+
+		[Test]
+		public void DefaultCflowIsNotUnderThisTestAndSomeRandomMethodName()
+		{
+			IControlFlow cflow = ControlFlowFactory.CreateControlFlow();
+			bool isUnder = cflow.Under(GetType(), "PlayingYouALikeTheFoolYouAre");
+			Assert.IsFalse(isUnder, string.Format(
+				"The IControlFlow implementation created by the ControlFlowFactory factory class " +
+					"would appear to have a faulty Under(Type,string) implementation : [{0}]",
+				cflow.GetType()));
+		}
+
+		[Test]
+		public void DefaultCflowUnderToken()
+		{
+			IControlFlow cflow = ControlFlowFactory.CreateControlFlow();
+			bool isUnder = cflow.UnderToken("Cflow");
+			Assert.IsTrue(isUnder, string.Format(
+				"The IControlFlow implementation created by the ControlFlowFactory factory " +
+					"class would appear to have a faulty UnderToken(string) implementation : [{0}]",
+				cflow.GetType()));
+		}
+
+		[Test]
+		public void DefaultCflowIsNotUnderSomeArbitraryToken()
+		{
+			IControlFlow cflow = ControlFlowFactory.CreateControlFlow();
+			bool isUnder = cflow.UnderToken("GoatsCheeseAndSoda");
+			Assert.IsFalse(isUnder, string.Format(
+				"The IControlFlow implementation created by the ControlFlowFactory factory class " +
+					"would appear to have a faulty UnderToken(string) implementation : [{0}]",
+				cflow.GetType()));
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/IO/AssemblyResourceTest.cs b/test/Spring/Spring.Core.Tests/Core/IO/AssemblyResourceTest.cs
new file mode 100644
index 00000000..a4e95777
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/IO/AssemblyResourceTest.cs
@@ -0,0 +1,252 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+    /// <summary>
+    /// Unit tests for AssemblyResource
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Federico Spinazzi</author>
+    /// <version>$Id: AssemblyResourceTest.cs,v 1.10 2007/08/08 17:49:59 bbaia Exp $</version>
+    [TestFixture]
+    public class AssemblyResourceTest
+    {
+        #region SetUp/TearDown
+
+        [SetUp]
+        public void SetUp()
+        {}
+
+        [TearDown]
+        public void TearDown()
+        {}
+
+        #endregion
+
+        /// <summary>
+        /// Use incorrect format for an assembly resource.  Using
+        /// comma delimited instead of '/'.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(UriFormatException))]
+        public void CreateWithMalformedResourceName()
+        {
+            new AssemblyResource("assembly://Spring.Core.Tests,Spring.TestResource.txt");
+        }
+
+        /// <summary>
+        /// Use old format, no longer supported (actually never publicly released)
+        /// that used 'dot' notation to seperate the namespace and resource name.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(UriFormatException))]
+        public void CreateWithObsoleteResourceName()
+        {
+            new AssemblyResource("assembly://Spring.Core.Tests/Spring.TestResource.txt");
+        }
+
+        /// <summary>
+        /// Use the correct format but with an invalid assembly name.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(FileNotFoundException))]
+        public void CreateFromInvalidAssembly()
+        {
+            new AssemblyResource("assembly://Xyz.Invalid.Assembly/Spring/TestResource.txt");
+        }
+
+        /// <summary>
+        /// Sunny day scenario that creates IResources and ensures the
+        /// correct contents can be read from them.
+        /// </summary>
+        [Test]
+        public void CreateValidAssemblyResource()
+        {
+            IResource res = new AssemblyResource("assembly://Spring.Core.Tests/Spring/TestResource.txt");
+            AssertResourceContent(res, "Spring.TestResource.txt");
+            IResource res2 = new AssemblyResource("assembly://Spring.Core.Tests/Spring.Core.IO/TestResource.txt");
+            AssertResourceContent(res2, "Spring.Core.IO.TestResource.txt");
+        }
+
+        /// <summary>
+        /// Use correct assembly name, but incorrect namespace and resource name.
+        /// </summary>
+        [Test]
+        public void CreateInvalidAssemblyResource()
+        {
+            IResource res = new AssemblyResource("assembly://Spring.Core.Tests/Xyz/InvalidResource.txt");
+            Assert.IsFalse(res.Exists, "Exists should return false");
+            Assert.IsNull(res.InputStream, "Stream should be null");
+        }
+
+        [Test]
+        public void CreateRelativeWhenNotRelative()
+        {
+            IResource res = new AssemblyResource("assembly://Spring.Core.Tests/Spring/TestResource.txt");
+            IResource res2 = res.CreateRelative("Spring.Core.Tests/Spring.Core.IO/TestResource.txt");
+            AssertResourceContent(res2, "Spring.Core.IO.TestResource.txt");
+        }
+
+        /// <summary>
+        /// Test creating a resource relative to the location of the first.
+        /// The first resource is physically located in the root of the project since
+        /// the default namespace of the Spring.Core.Tests project is
+        /// 'Spring'.  The notation './IO/TestResource.txt' will navigate
+        /// down to the 'Spring.Core.IO' namespace and CreateRelative will
+        /// then retrieve the similarly named TestResource.txt located there.
+        /// </summary>
+        [Test]
+        public void CreateRelativeInChildNamespace()
+        {
+            IResource res = new AssemblyResource("assembly://Spring.Core.Tests/Spring/TestResource.txt");
+            IResource res2 = res.CreateRelative("./Core.IO/TestResource.txt");
+            AssertResourceContent(res2, "Spring.Core.IO.TestResource.txt");
+        }
+
+        /// <summary>
+        /// Test creating a resource relative to the location of the first.
+        /// The first resource is physically located in the root of the project since
+        /// the default namespace of the Spring.Core.Tests project is
+        /// 'Spring'.  The notation 'IO/TestResource.txt' will navigate
+        /// down to the 'Spring.Core.IO' namespace and CreateRelative will
+        /// then retrieve the similarly named TestResource.txt located there.
+        /// </summary>
+        [Test]
+        public void CreateRelativeInChildNamespaceWithoutPrefix()
+        {
+            IResource res = new AssemblyResource("assembly://Spring.Core.Tests/Spring/TestResource.txt");
+            IResource res2 = res.CreateRelative("Core.IO/TestResource.txt");
+            AssertResourceContent(res2, "Spring.Core.IO.TestResource.txt");
+        }
+
+        /// <summary>
+        /// Test creating a resource relative to the root of the assembly.
+        /// The first resource is physically located in the root of the project since
+        /// the default namespace of the Spring.Core.Tests project is
+        /// 'Spring'.  The notation '/Spring.Core.IO/TestResource.txt' will navigate
+        /// down to the 'Spring.Core.IO' namespace and CreateRelative will
+        /// then retrieve the similarly named TestResource.txt located there.
+        /// </summary>
+        [Test]
+        public void CreateRelativeToRoot()
+        {
+            IResource res = new AssemblyResource("assembly://Spring.Core.Tests/Spring/TestResource.txt");
+            IResource res2 = res.CreateRelative("/Spring.Core.IO/TestResource.txt");
+            AssertResourceContent(res2, "Spring.Core.IO.TestResource.txt");
+        }
+
+        /// <summary>
+        /// Test creating a resource relative to the location of the first.
+        /// The first resource is physically located in the Spring.Core.IO directory
+        /// of the project and corresponds to the namespace 'Spring.Core.IO'.
+        /// The notation '../../TestResource.txt' will navigate up to the
+        /// root 'Spring' namespace and CreateRelative will then
+        /// retrieve the similarly named TestResource.txt located there
+        /// </summary>
+        [Test]
+        public void CreateRelativeInParentNamespace()
+        {
+            IResource res = new AssemblyResource("assembly://Spring.Core.Tests/Spring.Core.IO/TestResource.txt");
+            IResource res2 = res.CreateRelative("../../TestResource.txt");
+            AssertResourceContent(res2, "Spring.TestResource.txt");
+        }
+
+        /// <summary>
+        /// Test creating a resource relative to the location of the first.
+        /// The first resource is physically located in the Spring.Core.IO
+        /// directory of the project and corresponds to the namespace
+        /// 'Spring.Core.IO'.  The notation '../../Objects/Factory/TestResource.txt'
+        /// will navigate up to the root 'Spring' namespace and then down
+        /// into the 'Spring.Object.Factory' namespace and CreateRelative
+        /// will then retrieve the similarly named TestResource.txt located there.
+        /// </summary>
+        [Test]
+        public void CreateRelativeInNotStraightParentNamespace()
+        {
+            IResource res = new AssemblyResource("assembly://Spring.Core.Tests/Spring.Core.IO/TestResource.txt");
+            IResource res2 = res.CreateRelative("../../Objects/Factory/TestResource.txt");
+            AssertResourceContent(res2, "Spring.Objects.Factory.TestResource.txt");
+        }
+
+        /// <summary>
+        /// Test creating a resource relative to the location of the first.
+        /// In this case the first resource is an assembly and the second is
+        /// uses the file URI.
+        /// The file URI used three slashes '///' which is interpreted to
+        /// mean the root of where the assembly is located on the file system.
+        /// The file 'abstract.xml' is located under Spring.Data in the VS.NET project
+        /// but a build-event copies these files under the location
+        /// of Spring.Core.Tests.dll.
+        /// </summary>
+        [Test]
+        public void CreateRelativeWithAReferenceToAFileResource()
+        {
+            IResource res = new AssemblyResource("assembly://Spring.Core.Tests/Spring.Core.IO/TestResource.txt");
+            string path = "Spring/Objects/Factory/Xml/abstract.xml";
+            IResource res2 = res.CreateRelative("file://~/" + path);
+            using (StreamReader r = File.OpenText(path))
+            {
+                string content = r.ReadToEnd();
+                using (StreamReader reader = new StreamReader(res2.InputStream))
+                {
+                    Assert.AreEqual(content, reader.ReadToEnd(), "Resource content is not as expected");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Try to create a relative resource, but use too many '..' to navigate
+        /// past the root namespace, off into la-la land.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(UriFormatException))]
+        public void TooMuchParentNamespacesAbove()
+        {
+            IResource res = new AssemblyResource("assembly://Spring.Core.Tests/Spring.Core.IO/TestResource.txt");
+            IResource res2 = res.CreateRelative("../../../../TestResource.txt");
+            AssertResourceContent(res2, "Spring.TestResource.txt");
+        }
+
+        /// <summary>
+        /// Utility method to compare a resource that contains a single string with
+        /// an exemplar.
+        /// </summary>
+        /// <param name="res">The resource to read a line from</param>
+        /// <param name="expectedContent">the expected value of the line.</param>
+        private void AssertResourceContent(IResource res, string expectedContent)
+        {
+            Assert.IsTrue(res.Exists);
+            using (StreamReader reader = new StreamReader(res.InputStream))
+            {
+                Assert.AreEqual(expectedContent, reader.ReadLine(), "Resource content is not as expected");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/IO/ConfigurableResourceLoaderTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/ConfigurableResourceLoaderTests.cs
new file mode 100644
index 00000000..4fad0307
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/IO/ConfigurableResourceLoaderTests.cs
@@ -0,0 +1,187 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+	/// <summary>
+	/// Unit tests for the ConfigurableResourceLoader class.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: ConfigurableResourceLoaderTests.cs,v 1.6 2007/08/08 17:49:59 bbaia Exp $</version>
+	[TestFixture]
+	public sealed class ConfigurableResourceLoaderTests
+	{
+		private ConfigurableResourceLoader loader;
+
+        [SetUp]
+        public void SetUp()
+        {
+            loader = new ConfigurableResourceLoader();
+        }
+
+		#region ConfigurableResourceLoader.GetResource Tests
+
+		/// <summary>
+		/// Tests that loader correctly loads files specified by absolute name, regardless
+		/// of the fact whether protocol name is specified or not.
+		/// </summary>
+		[Test]
+		public void GetAbsoluteFileSystemResource()
+		{
+			string fileName = Path.GetTempFileName();
+			try
+			{
+				IResource withoutProtocol = loader.GetResource(fileName);
+				Assert.IsNotNull(withoutProtocol, "Resource should not be null");
+				Assert.IsTrue(withoutProtocol is FileSystemResource, "Expected FileSystemResource");
+				Assert.IsTrue(withoutProtocol.Exists, "Resource should exist but it does not");
+
+				IResource withProtocol = loader.GetResource("file:///" + fileName);
+				Assert.IsNotNull(withProtocol, "Resource should not be null");
+				Assert.IsTrue(withProtocol is FileSystemResource, "Expected FileSystemResource");
+				Assert.IsTrue(withProtocol.Exists, "Resource should exist but it does not");
+			}
+			finally
+			{
+				new FileInfo(fileName).Delete();
+			}
+		}
+
+	    [Test]
+	    public void GetResourceThatSupportsTheSpecialHomeCharacter()
+	    {
+	        string filename = "foo.txt";
+            FileInfo expectedFile =
+                new FileInfo(Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, filename)));
+            StreamWriter writer = expectedFile.CreateText();
+            FileSystemResource res = (FileSystemResource) loader.GetResource("~/" + filename);
+            Assert.AreEqual(expectedFile.FullName, res.File.FullName);
+            try
+            {
+                writer.Close();
+            }
+            catch (IOException)
+            {
+            }
+            try
+            {
+                expectedFile.Delete();
+            }
+            catch (IOException)
+            {
+            }
+        }
+
+        [Test]
+        public void GetResourceThatSupportsTheSpecialHomeCharacter_WithLeadingWhitespace()
+        {
+            string filename = "foo.txt";
+            FileInfo expectedFile =
+                new FileInfo(Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, filename)));
+            StreamWriter writer = expectedFile.CreateText();
+            FileSystemResource res = (FileSystemResource) loader.GetResource("   ~/" + filename);
+            Assert.AreEqual(expectedFile.FullName, res.File.FullName);
+            try
+            {
+                writer.Close();
+            }
+            catch (IOException)
+            {
+            }
+            try
+            {
+                expectedFile.Delete();
+            }
+            catch (IOException)
+            {
+            }
+        }
+
+		/// <summary>
+		/// Tests that loader correctly loads files specified by relative name, regardless
+		/// of the fact whether protocol name is specified or not.
+		/// </summary>
+		[Test]
+		public void GetRelativeFileSystemResource()
+		{
+			string fileName = "test.tmp";
+			FileInfo fi = new FileInfo(fileName);
+			FileStream fs = fi.Create();
+			fs.Close();
+
+			try
+			{
+				IResource withoutProtocol = loader.GetResource(fileName);
+				Assert.IsNotNull(withoutProtocol, "Resource should not be null");
+				Assert.IsTrue(withoutProtocol is FileSystemResource, "Expected FileSystemResource");
+				Assert.IsTrue(withoutProtocol.Exists, "Resource should exist but it does not");
+
+				IResource withProtocol = loader.GetResource("file://" + fileName);
+				Assert.IsNotNull(withProtocol, "Resource should not be null");
+				Assert.IsTrue(withProtocol is FileSystemResource, "Expected FileSystemResource");
+				Assert.IsTrue(withProtocol.Exists, "Resource should exist but it does not");
+			}
+			finally
+			{
+				fi.Delete();
+			}
+		}
+
+		/// <summary>
+		/// Tests that loader can load UrlResource over HTTP protocol
+		/// </summary>
+		[Test]
+		[Explicit]
+		public void GetHttpUrlResource()
+		{
+			IResource res = loader.GetResource("http://www.springframework.net/license.html");
+			Assert.IsNotNull(res, "Resource should not be null");
+            Assert.AreEqual(typeof(UrlResource), res.GetType());
+		}
+
+		/// <summary>
+		/// Tests that loader can load UrlResource over assembly pseudo protocol
+		/// </summary>
+		[Test]
+		public void GetAssemblyResource()
+		{
+			IResource res = loader.GetResource("assembly://Spring.Core.Tests/Spring/TestResource.txt");
+			Assert.IsNotNull(res, "Resource should not be null");
+			Assert.AreEqual(typeof(AssemblyResource), res.GetType());
+		}
+
+		#endregion
+
+		[Test]
+		[ExpectedException(typeof(UriFormatException))]
+		public void GetResourceForNonMappedProtocol()
+		{
+			new ConfigurableResourceLoader().GetResource("beep://foo.xml");
+        }
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs
new file mode 100644
index 00000000..39015805
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs
@@ -0,0 +1,325 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Reflection;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+    /// <summary>
+    /// Common Unit tests for all FileSystemResource derived classes.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: FileSystemResourceCommonTests.cs,v 1.4 2007/08/08 17:49:59 bbaia Exp $</version>
+    public abstract class FileSystemResourceCommonTests
+    {
+        protected const string TemporaryFileName = "temp.file";
+
+        protected abstract FileSystemResource CreateResourceInstance(string resourceName);
+
+        /// <summary>
+        /// Creates a FileInfo instance representing the original location of the given assembly
+        /// </summary>
+        /// <remarks>
+        /// Use this instead of the "Assembly.Location" property to get the original location before shadow copying!
+        /// </remarks>
+        protected static FileInfo GetAssemblyLocation(Assembly assembly)
+        {
+            return new FileInfo(new Uri(assembly.CodeBase).LocalPath);
+        }
+
+        protected static FileInfo CreateFileForTheCurrentDirectory()
+        {
+            return new FileInfo(Path.GetFullPath(
+                                    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, TemporaryFileName)));
+        }
+
+        [Test]
+        public void CreateFileSystemResourceWithPathName()
+        {
+            FileSystemResource fileSystemResource = CreateResourceInstance(TemporaryFileName);
+            Assert.AreEqual(TemporaryFileName, fileSystemResource.File.Name);
+        }
+
+        [Test]
+        public void FileSystemResourceExists()
+        {
+            FileInfo file = GetAssemblyLocation(Assembly.GetExecutingAssembly());
+            FileSystemResource fileSystemResource = CreateResourceInstance("~/" + file.Name);
+            Assert.IsTrue(fileSystemResource.Exists);
+        }
+
+        [Test]
+        public void FileSystemResourceNotExists()
+        {
+            Assert.IsFalse(CreateResourceInstance("asdfasfadf").Exists);
+        }
+
+        [Test]
+        [ExpectedException(typeof(FileNotFoundException))]
+        public void FileSystemResourceOpenNonExistanceFile()
+        {
+            FileSystemResource fileSystemResource = CreateResourceInstance(TemporaryFileName);
+            Stream inputStream = fileSystemResource.InputStream;
+            inputStream.Close();
+        }
+
+        [Test]
+        public void FileSystemResourceValidInputStream()
+        {
+            FileInfo file = GetAssemblyLocation(Assembly.GetExecutingAssembly());
+            FileSystemResource fileSystemResource = CreateResourceInstance("~/" + file.Name);
+            using(Stream inputStream = fileSystemResource.InputStream)
+            {
+                Assert.IsNotNull(inputStream);
+            }
+        }
+
+        [Test]
+        public void FileSystemResourceGivesOpenedInputStream()
+        {
+            FileInfo file = GetAssemblyLocation(Assembly.GetExecutingAssembly());
+            FileSystemResource fileSystemResource = CreateResourceInstance("~/" + file.Name);
+            using(Stream inputStream = fileSystemResource.InputStream)
+            {
+                Assert.IsTrue(inputStream.CanRead);
+            }
+        }
+
+        [Test]
+        public void GetDescription()
+        {
+            FileSystemResource fileSystemResource = CreateResourceInstance(TemporaryFileName);
+            string expectedDescription = "file [" + fileSystemResource.File.FullName + "]";
+            Assert.AreEqual(expectedDescription, fileSystemResource.Description);
+        }
+
+        [Test]
+        public void GetURL()
+        {
+            FileSystemResource fileSystemResource = CreateResourceInstance(TemporaryFileName);
+            Assert.IsNotNull(fileSystemResource.Uri);
+        }
+
+        /// <summary>
+        /// Even though the 'root' resource points to a nonexistent subdirectory, surfing 'up' to the parent
+        /// via a relative path should still work...
+        /// </summary>
+        [Test]
+        public void CreateRelativeFromNonExistentOriginalResource()
+        {
+            // a suitable subdirectory of total pish
+            IResource resource = CreateResourceInstance("dork/muller.venken");
+            Assert.IsFalse(resource.Exists,
+                           "This test needs to feed off of a base resource that explicitly *doesn't* exist; but the resource seems to exist anyway.");
+            IResource relative =
+                resource.CreateRelative("../" + GetAssemblyLocation(Assembly.GetExecutingAssembly()).Name);
+            Assert.IsTrue(relative.Exists);
+        }
+
+        [Test]
+        public void CreateRelativeResourceIsEqualToOriginalAfterBouncingUpAndDownTheDirectoryTree()
+        {
+            IResource resource = new FileSystemResource(GetAssemblyLocation(Assembly.GetExecutingAssembly()).FullName);
+            IResource relative =
+                resource.CreateRelative("foo/bar/../../" + GetAssemblyLocation(Assembly.GetExecutingAssembly()).Name);
+            Assert.IsTrue(relative.Exists);
+            Assert.IsTrue(resource.Equals(relative));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void CreateRelativeWithNullRelativePath()
+        {
+            IResource resource = CreateResourceInstance(".");
+            resource.CreateRelative(null);
+        }
+
+        [Test]
+        public void CreateRelativeWithEmptyRelativePath()
+        {
+            IResource resource = CreateResourceInstance("boba.licious");
+            IResource relative = resource.CreateRelative(string.Empty);
+            Assert.IsFalse(relative.Exists);
+        }
+
+        [Test]
+        public void RelativeResourceWhenNotRelative()
+        {
+            IResource res = CreateResourceInstance("dummy.txt");
+            IResource res2 = CreateResourceInstance("/index.html");
+
+            IResource rel0 = res.CreateRelative("/index.html");
+            Assert.IsTrue(rel0 is FileSystemResource);
+            Assert.AreEqual(res2.File.FullName, rel0.File.FullName);
+        }
+
+        [Test]
+        public void RelativeResourceFromRoot()
+        {
+            FileSystemResource res = CreateResourceInstance(@"/dummy.txt");
+            FileSystemResource res2;
+
+            IResource rel0 = res.CreateRelative("/index.html");
+            Assert.IsTrue(rel0 is FileSystemResource);
+            res2 = CreateResourceInstance("/index.html");
+            Assert.AreEqual(res2.File.FullName, rel0.File.FullName);
+
+            IResource rel1 = res.CreateRelative(@"index.html");
+            Assert.IsTrue(rel1 is FileSystemResource);
+            res2 = CreateResourceInstance("/index.html");
+            Assert.AreEqual(res2.File.FullName, rel1.File.FullName);
+
+            IResource rel2 = res.CreateRelative(@"samples/artfair/index.html");
+            Assert.IsTrue(rel2 is FileSystemResource);
+            res2 = CreateResourceInstance("/samples/artfair/index.html");
+            Assert.AreEqual(res2.File.FullName, rel2.File.FullName);
+
+            IResource rel3 = res.CreateRelative(@"./samples/artfair/index.html");
+            Assert.IsTrue(rel3 is FileSystemResource);
+            res2 = CreateResourceInstance("/samples/artfair/index.html");
+            Assert.AreEqual(res2.File.FullName, rel3.File.FullName);
+        }
+
+        [Test]
+        public void RelativeResourceFromSubfolder()
+        {
+            FileSystemResource res = CreateResourceInstance(@"/samples/artfair/dummy.txt");
+            FileSystemResource resExpected;
+
+            IResource rel0 = res.CreateRelative(@"/index.html");
+            Assert.IsTrue(rel0 is FileSystemResource);
+            resExpected = CreateResourceInstance("/index.html");
+            Assert.AreEqual(resExpected.File.FullName, rel0.File.FullName);
+
+            IResource rel1 = res.CreateRelative(@"index.html");
+            Assert.IsTrue(rel1 is FileSystemResource);
+            resExpected = CreateResourceInstance("/samples/artfair/index.html");
+            Assert.AreEqual(resExpected.File.FullName, rel1.File.FullName);
+
+            IResource rel2 = res.CreateRelative(@"demo\index.html");
+            Assert.IsTrue(rel2 is FileSystemResource);
+            resExpected = CreateResourceInstance("/samples/artfair/demo/index.html");
+            Assert.AreEqual(resExpected.File.FullName, rel2.File.FullName);
+
+            IResource rel3 = res.CreateRelative(@"./demo/index.html");
+            Assert.IsTrue(rel3 is FileSystemResource);
+            resExpected = CreateResourceInstance("/samples/artfair/demo/index.html");
+            Assert.AreEqual(resExpected.File.FullName, rel3.File.FullName);
+
+            IResource rel4 = res.CreateRelative(@"../calculator/index.html");
+            Assert.IsTrue(rel4 is FileSystemResource);
+            resExpected = CreateResourceInstance("/samples/calculator/index.html");
+            Assert.AreEqual(resExpected.File.FullName, rel4.File.FullName);
+
+            IResource rel5 = res.CreateRelative(@"..\..\index.html");
+            resExpected = CreateResourceInstance("/index.html");
+            Assert.AreEqual(resExpected.File.FullName, rel5.File.FullName);
+        }
+
+        [Test]
+        [ExpectedException(typeof(UriFormatException))]
+        public void RelativeResourceTooManyBackLevels()
+        {
+            FileSystemResource res = CreateResourceInstance("/samples/artfair/dummy.txt");
+            res.CreateRelative("../../../index.html");
+        }
+
+        [Test]
+        public void SupportsAndResolvesTheSpecialHomeCharacter_SunnyDay()
+        {
+            FileInfo file =
+                new FileInfo(Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, TemporaryFileName)));
+            StreamWriter writer = file.CreateText();
+            FileSystemResource res = CreateResourceInstance("~/" + TemporaryFileName);
+            Assert.IsTrue(res.File.Exists);
+            Assert.AreEqual(file.FullName.ToLower(), res.File.FullName.ToLower());
+            try
+            {
+                writer.Close();
+            }
+            catch(IOException)
+            {}
+            try
+            {
+                file.Delete();
+            }
+            catch(IOException)
+            {}
+        }
+
+        [Test]
+        public void SupportsAndResolvesTheSpecialHomeCharacter_SunnyDayEvenWithLeadingWhitespace()
+        {
+            FileInfo file =
+                new FileInfo(Path.GetFullPath(
+                                 Path.Combine(AppDomain.CurrentDomain.BaseDirectory, TemporaryFileName)));
+            StreamWriter writer = file.CreateText();
+            FileSystemResource res = CreateResourceInstance("    ~/" + TemporaryFileName);
+            Assert.AreEqual(file.FullName.ToLower(), res.File.FullName.ToLower());
+            try
+            {
+                writer.Close();
+            }
+            catch(IOException)
+            {}
+            try
+            {
+                file.Delete();
+            }
+            catch(IOException)
+            {}
+        }
+
+        [Test]
+        public void SupportsAndResolvesTheSpecialHomeCharacter_OnlyIfSpecialHomeCharacterIsFirstCharacter()
+        {
+            FileSystemResource res = CreateResourceInstance("foo~.txt");
+            // must not have replaced ~; its only valid at the start of a resource name...
+            Assert.AreEqual("foo~.txt", res.File.Name);
+        }
+
+        [Test]
+        public void Resolution_PlainVanilla()
+        {
+            FileInfo file = CreateFileForTheCurrentDirectory();
+            IResource res = CreateResourceInstance(TemporaryFileName);
+            Assert.AreEqual(file.FullName.ToLower(), res.File.FullName.ToLower(),
+                            "The bare file name all by itself must have resolved to a file in the current " +
+                            "directory of the currently executing domain.");
+        }
+
+        [Test]
+        public void Resolution_WithSpecialHomeCharacter()
+        {
+            FileInfo file = CreateFileForTheCurrentDirectory();
+            IResource res = CreateResourceInstance("~/" + TemporaryFileName);
+            Assert.AreEqual(file.FullName.ToLower(), res.File.FullName.ToLower(),
+                            "The file name with ~/ must have resolved to a file " +
+                            "in the current directory of the currently executing domain.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceTests.cs
new file mode 100644
index 00000000..3f4e4642
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceTests.cs
@@ -0,0 +1,320 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+    /// <summary>
+    /// Unit tests for the FileSystemResourceTest class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: FileSystemResourceTests.cs,v 1.9 2007/08/08 17:49:59 bbaia Exp $</version>
+    [TestFixture]
+    public class FileSystemResourceTests : FileSystemResourceCommonTests
+    {
+        protected override FileSystemResource CreateResourceInstance( string resourceName )
+        {
+            return new FileSystemResource(resourceName);
+        }
+        
+        [Test]
+        [ExpectedException(typeof (UriFormatException))]
+        public void RelativeUncResourceTooManyBackLevels()
+        {
+            FileSystemResource res = new FileSystemResource(@"\\server\share\samples\artfair\dummy.txt");
+            res.CreateRelative(@"..\..\..\index.html");
+        }
+
+        [Test(Description="SPRNET-89")]
+        public void SPRNET_89_SupportUrlEncodedLocationsWithSpaces()
+        {
+            string path = Path.GetFullPath("spaced dir");
+            Directory.CreateDirectory(path);
+            string filePath = Path.Combine(path, "spaced file.txt");
+            using (StreamWriter text = File.CreateText(filePath))
+            {
+                text.WriteLine("hello world");
+            }
+            FileSystemResource res = new FileSystemResource(new Uri(filePath).AbsoluteUri);
+            using (Stream s = res.InputStream)
+            {
+                using (TextReader reader = new StreamReader(s))
+                {
+                    Assert.AreEqual("hello world", reader.ReadLine());
+                }
+            }
+        }
+
+        [Test(Description = "http://opensource.atlassian.com/projects/spring/browse/SPRNET-320")]
+        public void SupportsSpecialUriCharacter()
+        {
+            string path = Path.GetFullPath("dir#");
+            Directory.CreateDirectory(path);
+            string filePath = Path.Combine(path, "file.txt");
+            using (StreamWriter text = File.CreateText(filePath))
+            {
+                text.WriteLine("hello world");
+            }
+            FileSystemResource res = new FileSystemResource(new Uri(filePath).AbsoluteUri);
+            using (Stream s = res.InputStream)
+            {
+                using (TextReader reader = new StreamReader(s))
+                {
+                    Assert.AreEqual("hello world", reader.ReadLine());
+                }
+            }
+        }
+        
+        [Test]
+        public void Resolution_WithProtocolAndSpecialHomeCharacter()
+        {
+            FileInfo file = CreateFileForTheCurrentDirectory();
+            IResource res = new FileSystemResource("file://~/" + TemporaryFileName);
+            Assert.AreEqual(file.FullName, res.File.FullName,
+                "The file name with file://~ must have resolved to a file " +
+                "in the current directory of the currently executing domain.");
+        }
+
+        [Test]
+        public void Resolution_WithProtocolAndSpecialHomeCharacterParentDirectory()
+        {
+            FileInfo file = new FileInfo(Path.GetFullPath(
+                Path.Combine(AppDomain.CurrentDomain.BaseDirectory, TemporaryFileName)));
+            IResource res = new FileSystemResource("file://~/../" + TemporaryFileName);
+            string fileNameOneDirectoryUp = file.Directory.Parent.FullName + "\\" + TemporaryFileName;
+            Assert.AreEqual(fileNameOneDirectoryUp, res.File.FullName,
+                "The file name with file://~/.. must have resolved to a file " +
+                "in the parent directory of the currently executing domain.");
+        }
+        
+        [Test]
+        public void CreateRelativeWithParent()
+        {
+            // use the filename of the declaring assembly as the root...
+            string rootpath = GetType().Assembly.Location;
+            DirectoryInfo rootdir = new DirectoryInfo(Path.GetDirectoryName(rootpath));
+            _testCreateRelative(rootpath, rootdir.Parent.FullName, @"../");
+        }
+
+        [Test]
+        public void CreateRelativeWithSuperParent()
+        {
+            // use the filename of the declaring assembly as the root...
+            string rootpath = GetType().Assembly.Location;
+            DirectoryInfo rootdir = new DirectoryInfo(Path.GetDirectoryName(rootpath));
+            _testCreateRelative(rootpath, rootdir.Parent.Parent.FullName, @"..\..\");
+        }
+
+        [Test]
+        public void CreateRelativeInSameDirectory()
+        {
+            // use the filename of the declaring assembly as the root...
+            string rootpath = GetType().Assembly.Location;
+            DirectoryInfo rootdir = new DirectoryInfo(Path.GetDirectoryName(rootpath));
+            _testCreateRelative(rootpath, rootdir.FullName, @".\");
+        }
+
+        [Test]
+        public void CreateRelativeInSubdirectoryDirectory()
+        {
+            string subdirname = "Stuff";
+            // use the filename of the declaring assembly as the root...
+            string rootpath = GetType().Assembly.Location;
+            DirectoryInfo rootdir = new DirectoryInfo(Path.GetDirectoryName(rootpath));
+            DirectoryInfo subdir = rootdir.CreateSubdirectory(subdirname);
+            try
+            {
+                _testCreateRelative(rootpath, subdir.FullName, subdirname + "/");
+                // let's get obtuse... specify the parent directory of the subdirectory (i.e. the root directory again)
+                _testCreateRelative(rootpath, rootdir.FullName, subdirname + "/../");
+            }
+            finally
+            {
+                if (subdir.Exists)
+                {
+                    try
+                    {
+                        subdir.Delete();
+                    }
+                    catch (IOException)
+                    {
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Helper method...
+        /// </summary>
+        private void _testCreateRelative(string rootPath, string targetPath, string relativePath)
+        {
+            string filename = "stuff.txt";
+            FileInfo file = new FileInfo(Path.GetFullPath(Path.Combine(targetPath, filename)));
+            // create a temporary file in whatever 'targetpath' dir we've been passed...
+            StreamWriter writer = file.CreateText();
+            // test that the CreateRelative () method works with the supplied 'relativePath'
+            IResource resource = new FileSystemResource(rootPath);
+            IResource relative = resource.CreateRelative(relativePath + filename);
+            Assert.IsTrue(relative.Exists);
+            if (file.Exists)
+            {
+                try
+                {
+                    writer.Close();
+                    file.Delete();
+                }
+                catch (IOException)
+                {
+                }
+            }
+        }
+        
+        [Test]
+        public void RelativeLocalFileSystemResourceWhenNotRelative()
+        {
+            FileSystemResource res = new FileSystemResource(@"C:\dummy.txt");
+
+            IResource rel0 = res.CreateRelative(@"c:\index.html");
+            Assert.IsTrue(rel0 is FileSystemResource);
+            Assert.AreEqual(@"file [c:\index.html]", rel0.Description);
+        }
+
+        [Test]
+        public void RelativeLocalFileSystemResourceFromRoot()
+        {
+            FileSystemResource res = new FileSystemResource(@"c:\dummy.txt");
+
+            IResource rel0 = res.CreateRelative(@"\index.html");
+            Assert.IsTrue(rel0 is FileSystemResource);
+            Assert.AreEqual(@"file [c:\index.html]", rel0.Description);
+
+            IResource rel1 = res.CreateRelative(@"index.html");
+            Assert.IsTrue(rel1 is FileSystemResource);
+            Assert.AreEqual(@"file [c:\index.html]", rel1.Description);
+
+            IResource rel2 = res.CreateRelative(@"samples/artfair/index.html");
+            Assert.IsTrue(rel2 is FileSystemResource);
+            Assert.AreEqual(@"file [c:\samples\artfair\index.html]", rel2.Description);
+
+            IResource rel3 = res.CreateRelative(@".\samples\artfair\index.html");
+            Assert.IsTrue(rel3 is FileSystemResource);
+            Assert.AreEqual(@"file [c:\samples\artfair\index.html]", rel3.Description);
+        }
+
+        [Test]
+        public void RelativeLocalFileSystemResourceFromSubfolder()
+        {
+            FileSystemResource res = new FileSystemResource(@"c:\samples\artfair\dummy.txt");
+
+            IResource rel0 = res.CreateRelative(@"/index.html");
+            Assert.IsTrue(rel0 is FileSystemResource);
+            Assert.AreEqual(@"file [c:\index.html]", rel0.Description);
+
+            IResource rel1 = res.CreateRelative(@"index.html");
+            Assert.IsTrue(rel1 is FileSystemResource);
+            Assert.AreEqual(@"file [c:\samples\artfair\index.html]", rel1.Description);
+
+            IResource rel2 = res.CreateRelative(@"demo\index.html");
+            Assert.IsTrue(rel2 is FileSystemResource);
+            Assert.AreEqual(@"file [c:\samples\artfair\demo\index.html]", rel2.Description);
+
+            IResource rel3 = res.CreateRelative(@"./demo/index.html");
+            Assert.IsTrue(rel3 is FileSystemResource);
+            Assert.AreEqual(@"file [c:\samples\artfair\demo\index.html]", rel3.Description);
+
+            IResource rel4 = res.CreateRelative(@"../calculator/index.html");
+            Assert.IsTrue(rel4 is FileSystemResource);
+            Assert.AreEqual(@"file [c:\samples\calculator\index.html]", rel4.Description);
+
+            IResource rel5 = res.CreateRelative(@"..\..\index.html");
+            Assert.IsTrue(rel5 is FileSystemResource);
+            Assert.AreEqual(@"file [c:\index.html]", rel5.Description);
+        }      
+        
+        [Test]
+        public void RelativeUncResourceWhenNotRelative()
+        {
+            FileSystemResource res = new FileSystemResource(@"\\server\share\dummy.txt");
+
+            IResource rel0 = res.CreateRelative(@"\\server\share\index.html");
+            Assert.IsTrue(rel0 is FileSystemResource);
+            Assert.AreEqual(@"file [\\server\share\index.html]", rel0.Description);
+        }
+
+        [Test]
+        public void RelativeUncResourceFromRoot()
+        {
+            FileSystemResource res = new FileSystemResource(@"\\server\share\dummy.txt");
+
+            IResource rel0 = res.CreateRelative(@"\index.html");
+            Assert.IsTrue(rel0 is FileSystemResource);
+            Assert.AreEqual(@"file [\\server\share\index.html]", rel0.Description);
+
+            IResource rel1 = res.CreateRelative(@"index.html");
+            Assert.IsTrue(rel1 is FileSystemResource);
+            Assert.AreEqual(@"file [\\server\share\index.html]", rel1.Description);
+
+            IResource rel2 = res.CreateRelative(@"samples/artfair/index.html");
+            Assert.IsTrue(rel2 is FileSystemResource);
+            Assert.AreEqual(@"file [\\server\share\samples\artfair\index.html]", rel2.Description);
+
+            IResource rel3 = res.CreateRelative(@".\samples\artfair\index.html");
+            Assert.IsTrue(rel3 is FileSystemResource);
+            Assert.AreEqual(@"file [\\server\share\samples\artfair\index.html]", rel3.Description);
+        }
+
+        [Test]
+        public void RelativeUncResourceFromSubfolder()
+        {
+            FileSystemResource res = new FileSystemResource(@"\\server\share\samples\artfair\dummy.txt");
+
+            IResource rel0 = res.CreateRelative(@"/index.html");
+            Assert.IsTrue(rel0 is FileSystemResource);
+            Assert.AreEqual(@"file [\\server\share\index.html]", rel0.Description);
+
+            IResource rel1 = res.CreateRelative(@"index.html");
+            Assert.IsTrue(rel1 is FileSystemResource);
+            Assert.AreEqual(@"file [\\server\share\samples\artfair\index.html]", rel1.Description);
+
+            IResource rel2 = res.CreateRelative(@"demo\index.html");
+            Assert.IsTrue(rel2 is FileSystemResource);
+            Assert.AreEqual(@"file [\\server\share\samples\artfair\demo\index.html]", rel2.Description);
+
+            IResource rel3 = res.CreateRelative(@"./demo/index.html");
+            Assert.IsTrue(rel3 is FileSystemResource);
+            Assert.AreEqual(@"file [\\server\share\samples\artfair\demo\index.html]", rel3.Description);
+
+            IResource rel4 = res.CreateRelative(@"../calculator/index.html");
+            Assert.IsTrue(rel4 is FileSystemResource);
+            Assert.AreEqual(@"file [\\server\share\samples\calculator\index.html]", rel4.Description);
+
+            IResource rel5 = res.CreateRelative(@"..\..\index.html");
+            Assert.IsTrue(rel5 is FileSystemResource);
+            Assert.AreEqual(@"file [\\server\share\index.html]", rel5.Description);
+        }        
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/IO/InputStreamResourceTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/InputStreamResourceTests.cs
new file mode 100644
index 00000000..951e1d6b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/IO/InputStreamResourceTests.cs
@@ -0,0 +1,111 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.IO;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+	/// <summary>
+	/// Unit tests for the InputStreamResource class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: InputStreamResourceTests.cs,v 1.5 2007/08/08 17:49:59 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class InputStreamResourceTests
+    {
+        [Test]
+        public void Instantiation () 
+        {
+            FileInfo file = null;
+            Stream stream = null;
+            try 
+            {
+                file = new FileInfo ("Instantiation");
+                stream = file.Create ();
+                InputStreamResource res = new InputStreamResource (stream, "A temporary resource.");
+                Assert.IsTrue (res.IsOpen);
+                Assert.IsTrue (res.Exists);
+                Assert.IsNotNull (res.InputStream);
+            } 
+            finally 
+            {
+                try 
+                {
+                    if (stream != null) 
+                    {
+                        stream.Close ();
+                    }
+                    if (file != null
+                        && file.Exists) 
+                    {
+                        file.Delete ();
+                    }
+                } 
+                catch {}
+            }
+        }
+
+        [Test]
+        [ExpectedException (typeof (ArgumentNullException))]
+        public void InstantiationWithNull () {
+            new InputStreamResource (null, "A null resource.");
+        }
+
+        [Test]
+        [ExpectedException (typeof (InvalidOperationException))]
+        public void ReadStreamMultipleTimes () 
+        {
+            FileInfo file = null;
+            Stream stream = null;
+            try 
+            {
+                file = new FileInfo ("ReadStreamMultipleTimes");
+                stream = file.Create ();
+                // attempting to read this stream twice is an error...
+                InputStreamResource res = new InputStreamResource (stream, "A temporary resource.");
+                Stream streamOne = res.InputStream;
+                Stream streamTwo = res.InputStream; // should bail here
+            } 
+            finally 
+            {
+                try 
+                {
+                    if (stream != null) 
+                    {
+                        stream.Close ();
+                    }
+                    if (file != null
+                        && file.Exists) 
+                    {
+                        file.Delete ();
+                    }
+                } 
+                catch {}
+            }
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/IO/ResourceConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/ResourceConverterTests.cs
new file mode 100644
index 00000000..e10d7009
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/IO/ResourceConverterTests.cs
@@ -0,0 +1,116 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using Common.Logging;
+using Common.Logging.Simple;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+	/// <summary>
+	/// Unit tests for the ResourceConverter class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: ResourceConverterTests.cs,v 1.7 2007/08/08 17:49:59 bbaia Exp $</version>
+	[TestFixture]
+	public sealed class ResourceConverterTests
+	{
+		/// <summary>
+		/// The setup logic executed before the execution of this test fixture.
+		/// </summary>
+		[TestFixtureSetUp]
+		public void FixtureSetUp()
+		{
+			// enable (null appender) logging, just to ensure that the logging code is correct
+            LogManager.Adapter = new NoOpLoggerFactoryAdapter(); 
+		}
+
+		[Test]
+		public void CanConvertFrom()
+		{
+			ResourceConverter vrt = new ResourceConverter();
+			Assert.IsTrue(vrt.CanConvertFrom(typeof (string)), "Conversion from a string instance must be supported.");
+			Assert.IsFalse(vrt.CanConvertFrom(typeof (int)));
+		}
+
+		[Test]
+		public void ConvertFrom()
+		{
+			ResourceConverter vrt = new ResourceConverter();
+			object actual = vrt.ConvertFrom("file://localhost/");
+			Assert.IsNotNull(actual);
+			IResource res = actual as IResource;
+			Assert.IsNotNull(res);
+			Assert.IsFalse(res.Exists);
+		}
+
+		[Test]
+		[ExpectedException(typeof (NotSupportedException))]
+		public void ConvertFromNullReference()
+		{
+			ResourceConverter vrt = new ResourceConverter();
+			vrt.ConvertFrom(null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (NotSupportedException))]
+		public void ConvertFromNonSupportedOptionBails()
+		{
+			ResourceConverter vrt = new ResourceConverter();
+			vrt.ConvertFrom(new TestFixtureAttribute());
+		}
+
+		[Test]
+		public void ConvertFromWithEnvironmentVariableExpansion()
+		{
+			// TODO : won't pass on anything other than Win9x boxes...
+			ResourceConverter vrt = new ResourceConverter();
+			string path = @"${userprofile}\foo.txt";
+			IResource resource = (IResource) vrt.ConvertFrom(path);
+
+			string userprofile = Environment.GetEnvironmentVariable("userprofile");
+
+			Assert.IsFalse(resource.Exists,
+			               "Darn. Should be supplying a rubbish non-existant resource. " +
+			               	"You don't actually have a file called 'foo.txt' in your user directory do you?");
+			Assert.IsTrue(resource.Description.IndexOf(userprofile) > -1,
+			              "Environment variable not expanded.");
+		}
+
+		[Test]
+		public void DoesNotChokeOnUnresolvableEnvironmentVariableExpansion()
+		{
+			ResourceConverter vrt = new ResourceConverter();
+			string path = @"${_go_ahead_I_wish_you_would_}\foo.txt";
+			IResource resource = (IResource) vrt.ConvertFrom(path);
+
+			Assert.IsFalse(resource.Exists,
+			               "Darn. Should be supplying a rubbish non-existant resource. " +
+			               	"You don't actually have a file called 'foo.txt' in your user directory do you?");
+			Assert.IsTrue(resource.Description.IndexOf("_go_ahead_I_wish_you_would_") > -1,
+			              "Rubbish environment variable not preserved as-is.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/IO/ResourceHandlerRegistryTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/ResourceHandlerRegistryTests.cs
new file mode 100644
index 00000000..079ebacb
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/IO/ResourceHandlerRegistryTests.cs
@@ -0,0 +1,129 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+	/// <summary>
+	/// Unit tests for the ConfigurableResourceLoader class.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: ResourceHandlerRegistryTests.cs,v 1.4 2007/08/08 17:49:59 bbaia Exp $</version>
+	[TestFixture]
+	public sealed class ResourceHandlerRegistryTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void WithNullProtocolName()
+		{
+			ResourceHandlerRegistry.RegisterResourceHandler(null, GetType());
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void WithNullIResourceHandlerType()
+		{
+            ResourceHandlerRegistry.RegisterResourceHandler("beep", (Type) null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void WithWhitespacedProtocolName()
+		{
+            ResourceHandlerRegistry.RegisterResourceHandler("\t   ", GetType());
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void WithNonIResourceHandlerType()
+		{
+            ResourceHandlerRegistry.RegisterResourceHandler("beep", GetType());
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void WithIResourceHandlerTypeWithNoValidCtor()
+		{
+            ResourceHandlerRegistry.RegisterResourceHandler("beep", typeof(IncompatibleResource));
+		}
+
+        [Test]
+        public void AddProtocolMappingSilentlyOverwritesExistingProtocol()
+        {
+            ResourceHandlerRegistry.RegisterResourceHandler("beep", typeof(FileSystemResource));
+            // overwrite, must not complain...
+            ResourceHandlerRegistry.RegisterResourceHandler("beep", typeof(AssemblyResource));
+            IResource res = new ConfigurableResourceLoader().GetResource("beep://Spring.Core.Tests/Spring/TestResource.txt");
+            Assert.IsNotNull(res, "Resource must not be null");
+            Assert.AreEqual(typeof(AssemblyResource), res.GetType(),
+                "The original IResource Type associated with the 'beep' protocol " +
+                "must have been overwritten; expecting an AssemblyResource 'cos " +
+                "we registered it last under the 'beep' protocol.");
+        }
+
+		/// <summary>
+		/// Deso <b>not</b> expose a constructor that takes a single string argument.
+		/// </summary>
+		private sealed class IncompatibleResource : IResource 
+		{
+			public bool IsOpen
+			{
+				get { throw new NotImplementedException(); }
+			}
+
+			public Uri Uri
+			{
+				get { throw new NotImplementedException(); }
+			}
+
+			public FileInfo File
+			{
+				get { throw new NotImplementedException(); }
+			}
+
+			public string Description
+			{
+				get { throw new NotImplementedException(); }
+			}
+
+			public bool Exists
+			{
+				get { throw new NotImplementedException(); }
+			}
+
+			public IResource CreateRelative(string relativePath)
+			{
+				throw new NotImplementedException();
+			}
+
+			public Stream InputStream
+			{
+				get { throw new NotImplementedException(); }
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/IO/TestResource.txt b/test/Spring/Spring.Core.Tests/Core/IO/TestResource.txt
new file mode 100644
index 00000000..eb53c8a8
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/IO/TestResource.txt
@@ -0,0 +1 @@
+Spring.Core.IO.TestResource.txt
diff --git a/test/Spring/Spring.Core.Tests/Core/IO/UrlResourceTest.cs b/test/Spring/Spring.Core.Tests/Core/IO/UrlResourceTest.cs
new file mode 100644
index 00000000..e986f107
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/IO/UrlResourceTest.cs
@@ -0,0 +1,166 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+    /// <summary>
+    /// Unit tests for the UrlResource class.
+    /// </summary>
+    [TestFixture]
+    public sealed class UrlResourceTests
+    {
+        private const string FILE_PROTOCOL_PREFIX = "file:///";
+
+        [Test]
+        public void CreateUrlResourceWithGivenPath()
+        {
+            UrlResource urlResource = new UrlResource(FILE_PROTOCOL_PREFIX + "C:/temp");
+            Assert.AreEqual("C:/temp", urlResource.Uri.AbsolutePath);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void CreateInvalidUrlResource()
+        {
+            string uri = null;
+            new UrlResource(uri);
+        }
+
+        [Test]
+        public void GetValidFileInfo()
+        {
+            UrlResource urlResource = new UrlResource(FILE_PROTOCOL_PREFIX + "C:/temp");
+            Assert.AreEqual("C:\\temp", urlResource.File.FullName);
+        }
+
+        [Test]
+        public void ExistsValidHttp()
+        {
+            UrlResource urlResource = new UrlResource("http://www.springframework.net/");
+            Assert.IsTrue(urlResource.Exists);
+        }
+
+        [Test]
+        [ExpectedException(typeof(FileNotFoundException))]
+        public void GetInvalidFileInfo()
+        {
+            UrlResource urlResource = new UrlResource("http://www.springframework.net/");
+            FileInfo file = urlResource.File;
+            file.GetType();
+		}
+
+		[Test]
+		[ExpectedException(typeof(FileNotFoundException))]
+		public void GetInvalidFileInfoWithOddPort()
+		{
+			UrlResource urlResource = new UrlResource("http://www.springframework.net:76/");
+			FileInfo file = urlResource.File;
+			file.GetType();
+		}
+
+        [Test]
+        public void GetDescription()
+        {
+            UrlResource urlResource = new UrlResource(FILE_PROTOCOL_PREFIX + "C:/temp");
+            Assert.AreEqual("URL [file:///C:/temp]", urlResource.Description);
+        }
+
+        [Test]
+        public void GetValidInputStreamForFileProtocol()
+        {
+            string fileName = Path.GetTempFileName();
+            FileStream fs = File.Create(fileName);
+            fs.Close();
+            using (Stream inputStream = new UrlResource(FILE_PROTOCOL_PREFIX + fileName).InputStream)
+            {
+                Assert.IsTrue(inputStream.CanRead);
+            }
+        }
+
+        [Test]
+        public void RelativeResourceFromRoot()
+        {
+            UrlResource res = new UrlResource("http://www.springframework.net/documentation.html");
+
+            IResource rel0 = res.CreateRelative("/index.html");
+            Assert.IsTrue(rel0 is UrlResource);
+            Assert.AreEqual("URL [http://www.springframework.net/index.html]", rel0.Description);
+
+            IResource rel1 = res.CreateRelative("index.html");
+            Assert.IsTrue(rel1 is UrlResource);
+            Assert.AreEqual("URL [http://www.springframework.net/index.html]", rel1.Description);
+
+            IResource rel2 = res.CreateRelative("samples/artfair/index.html");
+            Assert.IsTrue(rel2 is UrlResource);
+            Assert.AreEqual("URL [http://www.springframework.net/samples/artfair/index.html]", rel2.Description);
+
+            IResource rel3 = res.CreateRelative("./samples/artfair/index.html");
+            Assert.IsTrue(rel3 is UrlResource);
+            Assert.AreEqual("URL [http://www.springframework.net/samples/artfair/index.html]", rel3.Description);
+        }
+
+        [Test]
+        public void RelativeResourceFromSubfolder()
+        {
+            UrlResource res = new UrlResource("http://www.springframework.net/samples/artfair/download.html");
+
+            IResource rel0 = res.CreateRelative("/index.html");
+            Assert.IsTrue(rel0 is UrlResource);
+            Assert.AreEqual("URL [http://www.springframework.net/index.html]", rel0.Description);
+
+            IResource rel1 = res.CreateRelative("index.html");
+            Assert.IsTrue(rel1 is UrlResource);
+            Assert.AreEqual("URL [http://www.springframework.net/samples/artfair/index.html]", rel1.Description);
+
+            IResource rel2 = res.CreateRelative("demo/index.html");
+            Assert.IsTrue(rel2 is UrlResource);
+            Assert.AreEqual("URL [http://www.springframework.net/samples/artfair/demo/index.html]", rel2.Description);
+
+            IResource rel3 = res.CreateRelative("./demo/index.html");
+            Assert.IsTrue(rel3 is UrlResource);
+            Assert.AreEqual("URL [http://www.springframework.net/samples/artfair/demo/index.html]", rel3.Description);
+
+            IResource rel4 = res.CreateRelative("../calculator/index.html");
+            Assert.IsTrue(rel4 is UrlResource);
+            Assert.AreEqual("URL [http://www.springframework.net/samples/calculator/index.html]", rel4.Description);
+
+            IResource rel5 = res.CreateRelative("../../index.html");
+            Assert.IsTrue(rel5 is UrlResource);
+            Assert.AreEqual("URL [http://www.springframework.net/index.html]", rel5.Description);
+        }
+
+        [Test]
+        [ExpectedException(typeof(UriFormatException))]
+        public void RelativeResourceTooManyBackLevels()
+        {
+            UrlResource res = new UrlResource("http://www.springframework.net/samples/artfair/download.html");
+            res.CreateRelative("../../../index.html");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/MethodGenericArgumentsCountCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/MethodGenericArgumentsCountCriteriaTests.cs
new file mode 100644
index 00000000..b551bbbf
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/MethodGenericArgumentsCountCriteriaTests.cs
@@ -0,0 +1,104 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core
+{
+	/// <summary>
+    /// Unit tests for the MethodGenericArgumentsCountCriteria class.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: MethodGenericArgumentsCountCriteriaTests.cs,v 1.1 2007/08/04 01:05:52 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class MethodGenericArgumentsCountCriteriaTests
+    {
+        [Test]
+        public void Instantiation () 
+        {
+            MethodGenericArgumentsCountCriteria criteria = new MethodGenericArgumentsCountCriteria();
+            Assert.AreEqual (0, criteria.ExpectedGenericArgumentCount);
+            criteria = new MethodGenericArgumentsCountCriteria(10);
+            Assert.AreEqual(10, criteria.ExpectedGenericArgumentCount);
+        }
+
+        [Test]
+        [ExpectedException (typeof (ArgumentOutOfRangeException))]
+        public void InstantiationBailsWithGenericArgumentCountSetToLessThanZero () 
+        {
+            MethodGenericArgumentsCountCriteria criteria = new MethodGenericArgumentsCountCriteria(-10);
+        }
+
+        [Test]
+        [ExpectedException (typeof (ArgumentOutOfRangeException))]
+        public void BailsWhenExpectedGenericArgumentCountSetToLessThanZero() 
+        {
+            MethodGenericArgumentsCountCriteria criteria = new MethodGenericArgumentsCountCriteria();
+            criteria.ExpectedGenericArgumentCount = -12;
+        }
+
+        [Test]
+        public void IsSatisfied () 
+        {
+            MethodGenericArgumentsCountCriteria criteria = new MethodGenericArgumentsCountCriteria();
+            MethodInfo method = GetType().GetMethod("NoGenericArgument", BindingFlags.Public | BindingFlags.Instance);
+            Assert.IsTrue(criteria.IsSatisfied(method));
+
+            criteria = new MethodGenericArgumentsCountCriteria(1);
+            method = GetType().GetMethod("OneGenericArgument", BindingFlags.Public | BindingFlags.Instance);
+            Assert.IsTrue (criteria.IsSatisfied (method));
+
+            criteria = new MethodGenericArgumentsCountCriteria(2);
+            method = GetType().GetMethod("TwoGenericArguments", BindingFlags.Public | BindingFlags.Instance);
+            Assert.IsTrue (criteria.IsSatisfied (method));
+        }
+
+        [Test]
+        public void IsNotSatisfiedWithNull () 
+        {
+            MethodGenericArgumentsCountCriteria criteria = new MethodGenericArgumentsCountCriteria();
+            Assert.IsFalse (criteria.IsSatisfied (null));
+        }
+
+        // some methods for testing signatures...
+        public void NoGenericArgument()
+        {
+        }
+
+        public void OneGenericArgument<T>()
+        {
+        }
+
+        public void TwoGenericArguments<T,U>()
+        {
+        }
+	}
+}
+
+#endif
diff --git a/test/Spring/Spring.Core.Tests/Core/MethodParametersCountCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/MethodParametersCountCriteriaTests.cs
new file mode 100644
index 00000000..1a65be37
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/MethodParametersCountCriteriaTests.cs
@@ -0,0 +1,141 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core
+{
+	/// <summary>
+	/// Unit tests for the MethodParametersCountCriteria class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: MethodParametersCountCriteriaTests.cs,v 1.3 2007/09/20 14:35:29 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class MethodParametersCountCriteriaTests
+    {
+        [Test]
+        public void Instantiation () 
+        {
+            MethodParametersCountCriteria criteria = new MethodParametersCountCriteria ();
+            Assert.AreEqual (0, criteria.ExpectedParameterCount);
+            criteria = new MethodParametersCountCriteria (10);
+            Assert.AreEqual (10, criteria.ExpectedParameterCount);
+        }
+
+        [Test]
+        [ExpectedException (typeof (ArgumentOutOfRangeException))]
+        public void InstantiationBailsWithParameterCountSetToLessThanZero () 
+        {
+            MethodParametersCountCriteria criteria = new MethodParametersCountCriteria (-10);
+        }
+
+        [Test]
+        [ExpectedException (typeof (ArgumentOutOfRangeException))]
+        public void BailsWhenExpectedParameterCountSetToLessThanZero () 
+        {
+            MethodParametersCountCriteria criteria = new MethodParametersCountCriteria ();
+            criteria.ExpectedParameterCount = -12;
+        }
+
+        [Test]
+        public void IsSatisfiedWithNoParameter () 
+        {
+            MethodParametersCountCriteria criteria = new MethodParametersCountCriteria ();
+            MethodInfo method = GetType ().GetMethod ("NoParameter", BindingFlags.Public | BindingFlags.Instance);
+            Assert.IsTrue (criteria.IsSatisfied (method));
+
+            criteria = new MethodParametersCountCriteria(0);
+            method = GetType().GetMethod("NoParameter", BindingFlags.Public | BindingFlags.Instance);
+            Assert.IsTrue(criteria.IsSatisfied(method));
+
+            criteria = new MethodParametersCountCriteria();
+            criteria.ExpectedParameterCount = 0;
+            method = GetType().GetMethod("NoParameter", BindingFlags.Public | BindingFlags.Instance);
+            Assert.IsTrue(criteria.IsSatisfied(method));
+        }
+
+        [Test]
+        public void IsSatisfiedWithOneParameter () 
+        {
+            MethodParametersCountCriteria criteria = new MethodParametersCountCriteria (1);
+            MethodInfo method = GetType().GetMethod("OneParameter", BindingFlags.Public | BindingFlags.Instance);
+            Assert.IsTrue (criteria.IsSatisfied (method));
+        }
+
+        [Test]
+        public void IsSatisfiedWithTwoParameters () 
+        {
+            MethodParametersCountCriteria criteria = new MethodParametersCountCriteria(2);
+            MethodInfo method = GetType().GetMethod("TwoParameters", BindingFlags.Public | BindingFlags.Instance);
+            Assert.IsTrue (criteria.IsSatisfied (method));
+        }
+
+        [Test]
+        public void IsSatisfiedWithParamsParameters () 
+        {
+            MethodParametersCountCriteria criteria = new MethodParametersCountCriteria(1);
+            MethodInfo method = GetType().GetMethod("ParamsParameters", BindingFlags.Public | BindingFlags.Instance);
+            Assert.IsFalse(criteria.IsSatisfied(method));
+
+            criteria = new MethodParametersCountCriteria(2);
+            method = GetType().GetMethod("ParamsParameters", BindingFlags.Public | BindingFlags.Instance);
+            Assert.IsTrue(criteria.IsSatisfied(method));
+
+            criteria = new MethodParametersCountCriteria (3);
+            method = GetType().GetMethod("ParamsParameters", BindingFlags.Public | BindingFlags.Instance);
+            Assert.IsTrue (criteria.IsSatisfied (method));
+
+            criteria = new MethodParametersCountCriteria(5);
+            method = GetType().GetMethod("ParamsParameters", BindingFlags.Public | BindingFlags.Instance);
+            Assert.IsTrue(criteria.IsSatisfied(method));
+        }
+
+        [Test]
+        public void IsNotSatisfiedWithNull () 
+        {
+            MethodParametersCountCriteria criteria = new MethodParametersCountCriteria ();
+            Assert.IsFalse (criteria.IsSatisfied (null));
+        }
+
+        // some methods for testing signatures...
+        public void NoParameter () 
+        {
+        }
+
+        public void OneParameter (int foo) 
+        {
+        }
+
+        public void TwoParameters (int foo, int bar) 
+        {
+        }
+
+        public void ParamsParameters(int foo, int bar, params string[] strs)
+        {
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/MethodParametersCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/MethodParametersCriteriaTests.cs
new file mode 100644
index 00000000..69551603
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/MethodParametersCriteriaTests.cs
@@ -0,0 +1,124 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using NUnit.Framework;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Core
+{
+	/// <summary>
+	/// Unit tests for the MethodParametersCriteria class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: MethodParametersCriteriaTests.cs,v 1.2 2007/09/20 14:20:47 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class MethodParametersCriteriaTests
+    {
+        [Test]
+        public void IsNotSatisfiedWithNull () {
+            MethodParametersCriteria criteria = new MethodParametersCriteria ();
+            Assert.IsFalse (criteria.IsSatisfied (null), "Was satisified with null.");
+        }
+
+        [Test]
+        public void IsSatisfiedWithNoParametersByDefault () 
+        {
+            MethodParametersCriteria criteria = new MethodParametersCriteria ();
+            MethodInfo method = GetType ().GetMethod ("Foo");
+            Assert.IsTrue (criteria.IsSatisfied (method), "Was not satisified with a method that takes no parameters by default.");
+        }
+
+        [Test]
+        public void IsSatisfied () 
+        {
+            MethodParametersCriteria criteria  = new MethodParametersCriteria (
+                new Type [] {typeof (string), typeof (DBNull), typeof (TestObject)});
+            MethodInfo method = GetType ().GetMethod ("BoJangles");
+            Assert.IsTrue (criteria.IsSatisfied (method), "Was not satisified with a method that takes a whole buncha parameters.");
+
+            method = GetType ().GetMethod ("BadBobbyBoJangles");
+            Assert.IsFalse (criteria.IsSatisfied (method), "Was satisified with a (bad) method that takes a whole buncha parameters.");
+        }
+
+        [Test]
+        public void IsSatisfiedIsPolymorphic () 
+        {
+            // i.e. derived types satisfy the criteria if a base type or interface is
+            // specified as one of the parameter types
+            MethodParametersCriteria criteria
+                = new MethodParametersCriteria (new Type [] {typeof (TestObject)});
+            MethodInfo method = GetType ().GetMethod ("Diddly");
+            Assert.IsTrue (criteria.IsSatisfied (method), "Was not satisified with a method that takes a base class as a parameter.");
+        }
+
+        [Test]
+        public void IsSatisfiedWithParamsParameters()
+        {
+            MethodParametersCriteria criteria = new MethodParametersCriteria(new Type[] { typeof(int), typeof(string) });
+            MethodInfo method = GetType().GetMethod("ParamsParameters");
+            Assert.IsTrue(criteria.IsSatisfied(method), "Was not satisified with a method that takes a parameter array ('params') as a parameter.");
+
+            criteria = new MethodParametersCriteria(new Type[] { typeof(int), typeof(string[]) });
+            method = GetType().GetMethod("ParamsParameters");
+            Assert.IsTrue(criteria.IsSatisfied(method), "Was not satisified with a method that takes a parameter array ('params') as a parameter.");
+
+            criteria = new MethodParametersCriteria(new Type[] { typeof(int) });
+            method = GetType().GetMethod("ParamsParameters");
+            Assert.IsTrue(criteria.IsSatisfied(method), "Was not satisified with a method that takes a parameter array ('params') as a parameter.");
+
+            criteria = new MethodParametersCriteria(new Type[] { typeof(int), typeof(string), typeof(string), typeof(string) });
+            method = GetType().GetMethod("ParamsParameters");
+            Assert.IsTrue(criteria.IsSatisfied(method), "Was not satisified with a method that takes a parameter array ('params') as a parameter.");
+
+            criteria = new MethodParametersCriteria(new Type[] { typeof(int), typeof(string[]), typeof(string) });
+            method = GetType().GetMethod("ParamsParameters");
+            Assert.IsFalse(criteria.IsSatisfied(method), "Was not satisified with a method that takes a parameter array ('params') as a parameter.");
+        }
+
+        // some methods for testing signatures...
+        public void Foo () 
+        {
+        }
+
+        public DateTime BoJangles (string one, DBNull two, TestObject three) 
+        {
+            return DateTime.Now;
+        }
+
+        public void BadBobbyBoJangles (string one, DBNull two, string bing) 
+        {
+        }
+
+        public void Diddly (ITestObject three) 
+        {
+        }
+
+        public void ParamsParameters(int foo, params string[] strs)
+        {
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/MethodReturnTypeCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/MethodReturnTypeCriteriaTests.cs
new file mode 100644
index 00000000..7714385a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/MethodReturnTypeCriteriaTests.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using NUnit.Framework;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Core
+{
+	/// <summary>
+	/// Unit tests for the MethodReturnTypeCriteria class.
+    /// </summary>
+    /// <version>$Id: MethodReturnTypeCriteriaTests.cs,v 1.1 2007/08/04 01:05:52 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class MethodReturnTypeCriteriaTests
+    {
+        [Test]
+        public void IsSatisfied () {
+            MethodReturnTypeCriteria criteria = new MethodReturnTypeCriteria (typeof (bool));
+            MethodInfo method = GetType ().GetMethod ("SomeKindOfWonderful", BindingFlags.NonPublic | BindingFlags.Instance);
+            Assert.IsTrue (criteria.IsSatisfied (method));
+        }
+
+        private bool SomeKindOfWonderful () 
+        {
+            return true;
+        }
+
+        [Test]
+        public void IsSatisfiedWithVoidByDefault () 
+        {
+            MethodReturnTypeCriteria criteria = new MethodReturnTypeCriteria ();
+            MethodInfo method = GetType ().GetMethod ("IsSatisfied");
+            Assert.IsTrue (criteria.IsSatisfied (method));
+        }
+        
+        [Test]
+        public void IsNotSatisfiedWithNull () {
+            MethodReturnTypeCriteria criteria = new MethodReturnTypeCriteria ();
+            Assert.IsFalse (criteria.IsSatisfied (null));
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/OrderComparatorTests.cs b/test/Spring/Spring.Core.Tests/Core/OrderComparatorTests.cs
new file mode 100644
index 00000000..e0c691d3
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/OrderComparatorTests.cs
@@ -0,0 +1,82 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core
+{
+	/// <summary>
+	/// Unit tests for the OrderComparator class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: OrderComparatorTests.cs,v 1.2 2006/04/09 07:24:48 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class OrderComparatorTests
+    {
+        [Test]
+        public void OrdersCorrectly ()
+        {
+            Ordered one = new Ordered (1);
+            Ordered fifty = new Ordered (50);
+            string max = "Max"; // should be stuck at the end 'cos it doesnt implement IOrdered
+            object [] list = new object [] {max, one, fifty};
+            Array.Sort (list, new OrderComparator ());
+            Assert.AreEqual (one, list [0]);
+            Assert.AreEqual (fifty, list [1]);
+            Assert.AreEqual (max, list [2]);
+        }
+
+        [Test]
+        public void DoesntBailWhenFedNulls ()
+        {
+            Ordered one = new Ordered (1);
+            object [] list = new object [] {null, one, null};
+            Array.Sort (list, new OrderComparator ());
+            Assert.AreEqual (one, list [0]);
+            Assert.AreEqual (null, list [1]);
+            Assert.AreEqual (null, list [2]);
+        }
+
+        internal sealed class Ordered : IOrdered
+        {
+            public Ordered (int order) 
+            {
+                _order = order;
+            }
+
+            public int Order
+            {
+                get
+                {
+                    return _order;
+                }
+            }
+
+            private int _order;
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/RegularExpressionEventNameCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/RegularExpressionEventNameCriteriaTests.cs
new file mode 100644
index 00000000..d5a89b60
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/RegularExpressionEventNameCriteriaTests.cs
@@ -0,0 +1,71 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Text.RegularExpressions;
+using System.Reflection;
+
+using Spring.Objects;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core
+{
+	/// <summary>
+	/// Unit tests for the RegularExpressionEventNameCriteria class.
+    /// </summary>
+	[TestFixture]
+    public class RegularExpressionEventNameCriteriaTests
+    {
+        [Test]
+        public void IsSatisfied () {
+        	RegularExpressionEventNameCriteria criteria = new RegularExpressionEventNameCriteria("Click");
+            EventInfo evt = typeof(TestObject).GetEvent("Click");
+            Assert.IsTrue (criteria.IsSatisfied (evt));
+        }
+
+        [Test]
+        public void IsNotSatisfiedWithGarbage () 
+        {
+        	RegularExpressionEventNameCriteria criteria = new RegularExpressionEventNameCriteria ("BingoBango");
+            EventInfo evt = typeof(TestObject).GetEvent("Click");
+            Assert.IsFalse (criteria.IsSatisfied (evt));
+        }
+
+        [Test]
+        public void IsNotSatisfiedWithNull () 
+        {
+            RegularExpressionEventNameCriteria criteria = new RegularExpressionEventNameCriteria("Click");
+            Assert.IsFalse (criteria.IsSatisfied (null));
+        }
+
+        [Test]
+        public void IsSatisfiedWithAnythingByDefault () 
+        {
+        	RegularExpressionEventNameCriteria criteria = new RegularExpressionEventNameCriteria ();
+            EventInfo evt = typeof (TestObject).GetEvent ("Click");
+            Assert.IsTrue (criteria.IsSatisfied (evt));
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/RegularExpressionMethodNameCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/RegularExpressionMethodNameCriteriaTests.cs
new file mode 100644
index 00000000..44a667c1
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/RegularExpressionMethodNameCriteriaTests.cs
@@ -0,0 +1,70 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using Spring.Objects;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core
+{
+    /// <summary>
+    /// Unit tests for the RegularExpressionMethodNameCriteria class.
+    /// </summary>
+    [TestFixture]
+    public class RegularExpressionMethodNameCriteriaTests
+    {
+        [Test]
+        public void IsSatisfied () 
+        {
+        	RegularExpressionMethodNameCriteria criteria = new RegularExpressionMethodNameCriteria ("Click");
+            MethodInfo method = typeof(TestObject).GetMethod("OnClick");
+            Assert.IsTrue (criteria.IsSatisfied (method));
+        }
+
+        [Test]
+        public void IsNotSatisfiedWithGarbage () 
+        {
+        	RegularExpressionMethodNameCriteria criteria = new RegularExpressionMethodNameCriteria ("BingoBango");
+            MethodInfo method = typeof(TestObject).GetMethod("OnClick");
+            Assert.IsFalse (criteria.IsSatisfied (method));
+        }
+
+        [Test]
+        public void IsNotSatisfiedWithNull () 
+        {
+            RegularExpressionMethodNameCriteria criteria = new RegularExpressionMethodNameCriteria("OnClick");
+            Assert.IsFalse (criteria.IsSatisfied (null));
+        }
+
+        [Test]
+        public void IsSatisfiedWithAnythingByDefault () 
+        {
+        	RegularExpressionMethodNameCriteria criteria = new RegularExpressionMethodNameCriteria ();
+            MethodInfo method = typeof(TestObject).GetMethod("OnClick");
+            Assert.IsTrue (criteria.IsSatisfied (method));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/CredentialConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/CredentialConverterTests.cs
new file mode 100644
index 00000000..12c8d1ee
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/CredentialConverterTests.cs
@@ -0,0 +1,144 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Net;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Unit tests for the CredentialConverter class.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: CredentialConverterTests.cs,v 1.1 2007/07/31 18:21:01 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class CredentialConverterTests
+    {
+        [Test]
+        [ExpectedException(typeof(NotSupportedException))]
+        public void ConvertFromNullReference()
+        {
+            CredentialConverter cc = new CredentialConverter();
+            cc.ConvertFrom(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(NotSupportedException))]
+        public void ConvertFromNonSupportedOptionBails()
+        {
+            CredentialConverter cc = new CredentialConverter();
+            cc.ConvertFrom(12);
+        }
+
+        [Test]
+        public void ConvertFrom()
+        {
+            CredentialConverter cc = new CredentialConverter();
+            object credential = cc.ConvertFrom(@"Spring\bbaia:sprnet");
+            Assert.IsNotNull(credential);
+            Assert.IsTrue(credential is NetworkCredential);
+            
+            NetworkCredential nc = (NetworkCredential)credential;
+            Assert.AreEqual("Spring", nc.Domain);
+            Assert.AreEqual("bbaia", nc.UserName);
+            Assert.AreEqual("sprnet", nc.Password);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void ConvertFromEmptyString()
+        {
+            CredentialConverter cc = new CredentialConverter();
+            cc.ConvertFrom(string.Empty);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void ConvertFromMalformedString()
+        {
+            CredentialConverter cc = new CredentialConverter();
+            object credential = cc.ConvertFrom(@"Spring:bbaia\sprnet");
+        }
+
+        [Test]
+        public void ConvertFromStringWithoutDomain()
+        {
+            CredentialConverter cc = new CredentialConverter();
+            object credential = cc.ConvertFrom(@"bbaia:sprnet");
+            Assert.IsNotNull(credential);
+            Assert.IsTrue(credential is NetworkCredential);
+
+            NetworkCredential nc = (NetworkCredential)credential;
+            Assert.AreEqual(string.Empty, nc.Domain);
+            Assert.AreEqual("bbaia", nc.UserName);
+            Assert.AreEqual("sprnet", nc.Password);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void ConvertFromStringWithIncorrectDomain()
+        {
+            CredentialConverter cc = new CredentialConverter();
+            object credential = cc.ConvertFrom(@"\bbaia:sprnet");
+        }
+
+        [Test]
+        public void ConvertFromStringWithoutPassword()
+        {
+            CredentialConverter cc = new CredentialConverter();
+            object credential = cc.ConvertFrom(@"Spring\bbaia");
+            Assert.IsNotNull(credential);
+            Assert.IsTrue(credential is NetworkCredential);
+
+            NetworkCredential nc = (NetworkCredential)credential;
+            Assert.AreEqual("Spring", nc.Domain);
+            Assert.AreEqual("bbaia", nc.UserName);
+            Assert.AreEqual(string.Empty, nc.Password);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void ConvertFromStringWithIncorrectPassword()
+        {
+            CredentialConverter cc = new CredentialConverter();
+            object credential = cc.ConvertFrom(@"\bbaia:");
+        }
+
+        [Test]
+        public void ConvertFromStringWithUsernameOnly()
+        {
+            CredentialConverter cc = new CredentialConverter();
+            object credential = cc.ConvertFrom(@"bbaia");
+            Assert.IsNotNull(credential);
+            Assert.IsTrue(credential is NetworkCredential);
+
+            NetworkCredential nc = (NetworkCredential)credential;
+            Assert.AreEqual(string.Empty, nc.Domain);
+            Assert.AreEqual("bbaia", nc.UserName);
+            Assert.AreEqual(string.Empty, nc.Password);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/CustomNumberConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/CustomNumberConverterTests.cs
new file mode 100644
index 00000000..4453bbd2
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/CustomNumberConverterTests.cs
@@ -0,0 +1,135 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.TypeConversion 
+{
+    /// <summary>
+    /// Unit tests for the CustomNumberConverter class.
+    /// </summary>
+    /// <version>$Id: CustomNumberConverterTests.cs,v 1.1 2007/07/31 18:21:01 bbaia Exp $</version>
+    [TestFixture]
+    public class CustomNumberConverterTests 
+    {
+        [Test]
+        public void Instantiation () 
+        {
+            CustomNumberConverter verter
+                = new CustomNumberConverter (typeof (int), null, true);
+            // mmm, this should still pass... it aint a number though
+            verter
+                = new CustomNumberConverter (typeof (bool), null, true);
+        }
+
+        [Test]
+        [ExpectedException (typeof (ArgumentException))]
+        public void InstantiationWithNonPrimitiveType () 
+        {
+            CustomNumberConverter verter
+                = new CustomNumberConverter (
+                typeof (CustomNumberConverterTests), null, true);
+        }
+
+        [Test]
+        public void CanConvertFromString () 
+        {
+            CustomNumberConverter verter
+                = new CustomNumberConverter (typeof (int), null, true);
+            Assert.IsTrue (verter.CanConvertFrom (typeof (string)));
+            Assert.IsFalse (verter.CanConvertFrom (null));
+        }
+
+        [Test]
+        public void ConvertsEmptyStringToZeroWhenAllowed () 
+        {
+            CustomNumberConverter verter
+                = new CustomNumberConverter (typeof (int), null, true);
+            int actual = (int) verter.ConvertFrom (
+                null, CultureInfo.CurrentUICulture, string.Empty);
+            Assert.AreEqual (0, actual);
+        }
+
+        [Test]
+        public void ConvertFromSupportedNumericType () 
+        {
+            Type [] numTypes = new Type [] {
+                typeof (int),
+                typeof (uint),
+                typeof (short),
+                typeof (ushort),
+                typeof (long),
+                typeof (ulong),
+                typeof (float),
+                typeof (double),
+            };
+            int expected = 12;
+            foreach (Type numType in numTypes) 
+            {
+                try 
+                {
+                    CustomNumberConverter verter
+                        = new CustomNumberConverter (numType, null, true);
+                    object actual = verter.ConvertFrom (
+                        null, CultureInfo.CurrentUICulture, expected.ToString ());
+                    Assert.AreEqual (expected, actual);
+                } 
+                catch (Exception ex) 
+                {
+                    Assert.Fail ("Bailed when converting type '" + numType + "' : " + ex);
+                }
+            }
+        }
+
+        [Test]
+        [ExpectedException (typeof (FormatException))]
+        public void BailsOnEmptyStringWhenNotAllowed () 
+        {
+            CustomNumberConverter verter
+                = new CustomNumberConverter (typeof (int), null, false);
+            verter.ConvertFrom (null, CultureInfo.CurrentUICulture, string.Empty);
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void ConvertFromNonSupportedNumericTypeOptionBails () 
+        {
+            CustomNumberConverter verter
+                = new CustomNumberConverter (typeof (char), null, false);
+            object foo = verter.ConvertFrom ("12");
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void ConvertFromNonSupportedOptionBails () 
+        {
+            CustomNumberConverter verter
+                = new CustomNumberConverter (typeof (int), null, false);
+            object foo = verter.ConvertFrom (12);
+        } 
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/FileInfoConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/FileInfoConverterTests.cs
new file mode 100644
index 00000000..d4a28e15
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/FileInfoConverterTests.cs
@@ -0,0 +1,82 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Unit tests for the FileInfoConverter class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: FileInfoConverterTests.cs,v 1.1 2007/07/31 18:21:01 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class FileInfoConverterTests
+    {
+        [Test]
+        public void CanConvertFrom()
+        {
+            FileInfoConverter vrt = new FileInfoConverter();
+            Assert.IsTrue(vrt.CanConvertFrom(typeof (string)), "Conversion from a string instance must be supported.");
+            Assert.IsFalse(vrt.CanConvertFrom(typeof (int)));
+        }
+
+        [Test]
+        public void ConvertFrom()
+        {
+            FileInfoConverter vrt = new FileInfoConverter();
+            object file = vrt.ConvertFrom("././ManAhShoahDoLoveThoseGrits");
+            Assert.IsNotNull(file);
+            Assert.AreEqual(typeof (FileInfo), file.GetType());
+        }
+
+        [Test]
+        public void FileConverter()
+        {
+            FileInfoConverter converter = new FileInfoConverter();
+            object file = converter.ConvertFrom("C:/test/myfile.txt");
+            Assert.IsNotNull(file);
+            Assert.IsTrue(file is FileInfo);
+            Assert.AreEqual(new FileInfo("C:/test/myfile.txt").FullName, ((FileInfo) file).FullName);
+        }
+
+        [Test]
+        [ExpectedException(typeof (NotSupportedException))]
+        public void ConvertFromNullReference()
+        {
+            FileInfoConverter vrt = new FileInfoConverter();
+            vrt.ConvertFrom(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof (NotSupportedException))]
+        public void ConvertFromNonSupportedOptionBails()
+        {
+            FileInfoConverter vrt = new FileInfoConverter();
+            vrt.ConvertFrom(12);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/NameValueConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/NameValueConverterTests.cs
new file mode 100644
index 00000000..16383aaf
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/NameValueConverterTests.cs
@@ -0,0 +1,90 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+
+using NUnit.Framework;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+	/// <summary>
+	/// Unit tests for the NameValueConverter class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: NameValueConverterTests.cs,v 1.1 2007/07/31 18:21:01 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class NameValueConverterTests
+    {
+        [Test]
+        public void CanConvertFromString () 
+        {
+            NameValueConverter vrt = new NameValueConverter ();
+            Assert.IsTrue (vrt.CanConvertFrom (typeof (string)), "Conversion from a string instance must be supported.");
+        }
+
+		[Test]
+		public void CanConvertOnlyFromString()
+		{
+			NameValueConverter vrt = new NameValueConverter ();
+			Assert.IsFalse(vrt.CanConvertFrom(typeof(TestObject)),
+				"Seem to be able to convert from non-supported Type.");
+		}
+
+		[Test]
+        public void ConvertFrom () 
+        {
+            string xml =
+                "<foo>" + 
+                "	<add key=\"one\" value=\"1\"/>" +
+                "	<add key=\"two\" value=\"2\"/>" +
+                "</foo>"; 
+            NameValueConverter vrt = new NameValueConverter ();
+            NameValueCollection actual = vrt.ConvertFrom (xml) as NameValueCollection;
+            Assert.IsNotNull (actual);
+            Assert.AreEqual (2, actual.Count);
+            Assert.AreEqual ("one", actual.GetKey (0));
+            Assert.AreEqual ("two", actual.GetKey (1));
+            Assert.AreEqual ("1", actual ["one"]);
+            Assert.AreEqual ("2", actual ["two"]);
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void ConvertFromNullReference () 
+        {
+            NameValueConverter vrt = new NameValueConverter ();
+            vrt.ConvertFrom (null);
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void ConvertFromNonSupportedOptionBails () 
+        {
+            NameValueConverter vrt = new NameValueConverter ();
+            vrt.ConvertFrom (true);
+        } 
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RGBColorConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RGBColorConverterTests.cs
new file mode 100644
index 00000000..a3602220
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RGBColorConverterTests.cs
@@ -0,0 +1,130 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Drawing;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Unit tests for the RGBColorConverter class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: RGBColorConverterTests.cs,v 1.1 2007/07/31 18:21:01 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class RGBColorConverterTests
+    {
+        [Test]
+        public void ConvertFromRGB()
+        {
+            Color expected = Color.BlanchedAlmond;
+            RGBColorConverter converter = new RGBColorConverter();
+            Color actual =
+                (Color) converter.ConvertFrom(String.Format("{0}, {1}, {2}", expected.R, expected.G, expected.B));
+            Assert.AreEqual(expected.A, actual.A);
+            Assert.AreEqual(expected.R, actual.R);
+            Assert.AreEqual(expected.G, actual.G);
+            Assert.AreEqual(expected.B, actual.B);
+        }
+
+        [Test]
+        [ExpectedException(typeof (FormatException))]
+        public void ConvertFromCommaSeparatedListWithNotEnoughValues()
+        {
+            RGBColorConverter converter = new RGBColorConverter();
+            converter.ConvertFrom("255, 235");
+        }
+
+        [Test]
+        [ExpectedException(typeof (FormatException))]
+        public void ConvertFromCommaSeparatedListWithOutOfRangeValue()
+        {
+            RGBColorConverter converter = new RGBColorConverter();
+            converter.ConvertFrom("255, 235, 4567");
+        }
+
+        [Test]
+        [ExpectedException(typeof (NotSupportedException))]
+        public void ConvertFromNullReference()
+        {
+            RGBColorConverter vrt = new RGBColorConverter();
+            vrt.ConvertFrom(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof (NotSupportedException))]
+        public void ConvertFromEmptyString()
+        {
+            RGBColorConverter vrt = new RGBColorConverter();
+            vrt.ConvertFrom(string.Empty);
+        }
+
+        [Test]
+        [ExpectedException(typeof (FormatException))]
+        public void ConvertFromGarbageBails()
+        {
+            RGBColorConverter vrt = new RGBColorConverter();
+            vrt.ConvertFrom("*&&%%^£");
+        }
+
+        [Test]
+        [ExpectedException(typeof (NotSupportedException))]
+        public void ConvertFromNonSupportedOptionBails()
+        {
+            RGBColorConverter vrt = new RGBColorConverter();
+            vrt.ConvertFrom(12);
+        }
+
+        [Test]
+        public void ConvertFromName()
+        {
+            Color expected = Color.BlanchedAlmond;
+            RGBColorConverter vrt = new RGBColorConverter();
+            Color actual = (Color) vrt.ConvertFrom(expected.Name);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void ConvertFromARGB()
+        {
+            Color expected = Color.BlanchedAlmond;
+            RGBColorConverter converter = new RGBColorConverter();
+            Color actual =
+                (Color) converter.ConvertFrom(String.Format("{0}, {1}, {2}, {3}", expected.A, expected.R, expected.G, expected.B));
+            Assert.AreEqual(expected.A, actual.A);
+            Assert.AreEqual(expected.R, actual.R);
+            Assert.AreEqual(expected.G, actual.G);
+            Assert.AreEqual(expected.B, actual.B);
+        }
+
+        [Test]
+        public void CanConvertFrom()
+        {
+            RGBColorConverter vrt = new RGBColorConverter();
+            Assert.IsTrue(vrt.CanConvertFrom(typeof (string)), "Conversion from a string instance must be supported.");
+            Assert.IsFalse(vrt.CanConvertFrom(typeof (int)));
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegexConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegexConverterTests.cs
new file mode 100644
index 00000000..c0452df3
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegexConverterTests.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Text.RegularExpressions;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Unit tests for the RegexConverter class.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: RegexConverterTests.cs,v 1.1 2007/07/31 18:21:01 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class RegexConverterTests
+    {
+        [Test]
+        [ExpectedException(typeof(NotSupportedException))]
+        public void ConvertFromNullReference()
+        {
+            RegexConverter rc = new RegexConverter();
+            rc.ConvertFrom(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(NotSupportedException))]
+        public void ConvertFromNonSupportedOptionBails()
+        {
+            RegexConverter rc = new RegexConverter();
+            rc.ConvertFrom(12);
+        }
+
+        [Test]
+        public void ConvertFrom()
+        {
+            RegexConverter rc = new RegexConverter();
+            object regex = rc.ConvertFrom("[a-z]");
+            Assert.IsNotNull(regex);
+            Assert.IsTrue(regex is Regex);
+            Assert.IsFalse(((Regex)regex).IsMatch("2"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs
new file mode 100644
index 00000000..0d27226a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs
@@ -0,0 +1,91 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using Microsoft.Win32;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Unit tests for the RegistryKeyConverter class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: RegistryKeyConverterTests.cs,v 1.1 2007/07/31 18:21:01 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class RegistryKeyConverterTests
+    {
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void ConvertFromNullReference()
+        {
+            RegistryKeyConverter rkc = new RegistryKeyConverter();
+            rkc.ConvertFrom(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(NotSupportedException))]
+        public void ConvertFromNonSupportedOptionBails()
+        {
+            RegistryKeyConverter rkc = new RegistryKeyConverter();
+            rkc.ConvertFrom(12);
+        }
+
+        [Test]
+        public void ConvertFrom()
+        {
+            RegistryKeyConverter rkc = new RegistryKeyConverter();
+            Assert.AreEqual(Registry.CurrentUser, rkc.ConvertFrom("HKEY_CURRENT_USER"));
+            Assert.AreEqual(Registry.CurrentUser.OpenSubKey("Software").Name,
+                            ((RegistryKey) rkc.ConvertFrom(@"HKEY_CURRENT_USER\Software")).Name);
+            Assert.AreEqual(Registry.CurrentUser.OpenSubKey("Software").OpenSubKey("Microsoft").Name,
+                            ((RegistryKey) rkc.ConvertFrom(@"HKEY_CURRENT_USER\Software\Microsoft")).Name);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void ConvertFromEmptyString()
+        {
+            RegistryKeyConverter rkc = new RegistryKeyConverter();
+            rkc.ConvertFrom(string.Empty);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException), @"Registry key [HKEY_CURRENT_USER\sdgsdfgsdfgxadas] does not exist.")]
+        public void ConvertFromBadKeyString()
+        {
+            RegistryKeyConverter rkc = new RegistryKeyConverter();
+            rkc.ConvertFrom(@"HKEY_CURRENT_USER\sdgsdfgsdfgxadas\Xyz\Abc");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException), "Invalid root hive name [HKEY_ERROR].")]
+        public void ConvertFromBadHiveString()
+        {
+            RegistryKeyConverter rkc = new RegistryKeyConverter();
+            rkc.ConvertFrom(@"HKEY_ERROR\sdgsdfgsdfgxadas");
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/ResourceManagerTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/ResourceManagerTests.cs
new file mode 100644
index 00000000..bd38da6b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/ResourceManagerTests.cs
@@ -0,0 +1,136 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using System.Resources;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+	/// <summary>
+	/// Unit tests for the ResourceManagerConverter class.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+	[TestFixture]
+    public sealed class ResourceManagerConverterTests
+    {
+        /// <summary>
+        /// Test that we indicate we can convert from strings only.
+        /// </summary>
+        [Test]
+        public void CanConvertFrom () 
+        {
+            ResourceManagerConverter cvt = new ResourceManagerConverter ();
+            Assert.IsTrue (cvt.CanConvertFrom (typeof (string)), "Conversion from a string instance must be supported.");
+            Assert.IsFalse (cvt.CanConvertFrom (null));
+        }
+
+        /// <summary>
+        /// Test sunny day scenario to convert from resource name, assembly name string pair
+        /// </summary>
+        [Test]
+        public void ConvertFrom () 
+        {
+            
+            ResourceManagerConverter cvt = new ResourceManagerConverter();
+            object actual = cvt.ConvertFrom ("Spring.TestResource.txt, Spring.Core.Tests");
+            Assert.IsNotNull (actual);
+            Assert.AreEqual (typeof (ResourceManager), actual.GetType());
+
+        }
+        
+        /// <summary>
+        /// Test passing a null instance and see if expected exception is raised
+        /// </summary>
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void ConvertFromNullReference () 
+        {
+            ResourceManagerConverter cvt = new ResourceManagerConverter();
+            object foo = cvt.ConvertFrom (null);
+        }
+
+        /// <summary>
+        /// Test passing a single string with no ','
+        /// </summary>
+        [Test]
+        [ExpectedException (typeof (ArgumentException))]
+        public void ConvertFromSingleString () 
+        {
+            ResourceManagerConverter cvt = new ResourceManagerConverter();
+            object foo = cvt.ConvertFrom ("Spring.TestResource.txt");
+        }
+
+        /// <summary>
+        /// Test passing a single ','
+        /// </summary>
+        [Test]
+        [ExpectedException (typeof (ArgumentException))]
+        public void ConvertFromSingleComma () 
+        {
+            ResourceManagerConverter cvt = new ResourceManagerConverter();
+            object foo = cvt.ConvertFrom (",");
+        }
+
+        /// <summary>
+        /// Test passing only assembly name
+        /// </summary>
+        [Test]
+        [ExpectedException (typeof (ArgumentException))]
+        public void ConvertFromOnlyAssemblyNAme () 
+        {
+            ResourceManagerConverter cvt = new ResourceManagerConverter();
+            object foo = cvt.ConvertFrom (",Spring.Core.Tests");
+        }
+
+        /// <summary>
+        /// Test passing only assembly name
+        /// </summary>
+        [Test]
+        [ExpectedException (typeof (ArgumentException))]
+        public void ConvertFromOnlyResourceName() 
+        {
+            ResourceManagerConverter cvt = new ResourceManagerConverter();
+            object foo = cvt.ConvertFrom ("Spring.TestResource.txt,");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void ConvertFromBadAssembly() 
+        {
+            ResourceManagerConverter cvt = new ResourceManagerConverter();
+            object foo = cvt.ConvertFrom ("Spring.TestResource.txt, FooAssembly");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void ConvertFromBad_App_GlobalResources()
+        {
+            ResourceManagerConverter cvt = new ResourceManagerConverter();
+            object foo = cvt.ConvertFrom("Spring.TestResource.txt, "+ResourceManagerConverter.APP_GLOBALRESOURCES_ASSEMBLYNAME);
+        }        
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RuntimeTypeConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RuntimeTypeConverterTests.cs
new file mode 100644
index 00000000..ac50caeb
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RuntimeTypeConverterTests.cs
@@ -0,0 +1,88 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+	/// <summary>
+	/// Unit tests for the RuntimeTypeConverter class.
+	/// </summary>
+	/// <version>$Id: RuntimeTypeConverterTests.cs,v 1.1 2007/07/31 18:21:01 bbaia Exp $</version>
+	[TestFixture]
+    public class RuntimeTypeConverterTests
+    {
+        [Test]
+        public void CanConvertFrom ()
+        {
+            RuntimeTypeConverter cnv = new RuntimeTypeConverter ();
+            Assert.IsTrue (cnv.CanConvertFrom (typeof (string)), "Mmm... I can't convert from a string to a Type.");
+            Assert.IsFalse (cnv.CanConvertFrom (GetType ()), "Mmm... managed to convert to a Type from a Type of this test. Boing!");
+        }
+
+        [Test]
+        public void CanConvertTo ()
+        {
+            RuntimeTypeConverter cnv = new RuntimeTypeConverter ();
+            Assert.IsTrue (cnv.CanConvertTo (typeof (Type)), "Mmm... I can't convert to a Type at all.");
+            Assert.IsFalse (cnv.CanConvertTo (typeof (void)), "Mmm... managed to convert to a Type from a bad type. Boing!");
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void ConvertFromNonSupportedType () 
+        {
+            RuntimeTypeConverter cnv = new RuntimeTypeConverter ();
+            object foo = cnv.ConvertFrom (12);
+        }
+
+        [Test]
+        public void ConvertFromString () 
+        {
+            RuntimeTypeConverter cnv = new RuntimeTypeConverter ();
+            object foo = cnv.ConvertFrom ("System.String");
+            Assert.IsNotNull (foo);
+            Assert.AreEqual ("System.RuntimeType", foo.GetType ().FullName);
+        }
+
+        [Test]
+        public void ConvertToString () 
+        {
+            RuntimeTypeConverter cnv = new RuntimeTypeConverter ();
+            object foo = cnv.ConvertTo (typeof (string), typeof (string));
+            Assert.IsNotNull (foo);
+            Assert.AreEqual (typeof (string).AssemblyQualifiedName, foo);
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void ConvertToStringFromNonSupportedType () 
+        {
+            RuntimeTypeConverter cnv = new RuntimeTypeConverter ();
+            object foo = cnv.ConvertTo (typeof (string), GetType ());
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/StreamConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/StreamConverterTests.cs
new file mode 100644
index 00000000..f8943bad
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/StreamConverterTests.cs
@@ -0,0 +1,80 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Net;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+	/// <summary>
+	/// Unit tests for the StreamConverter class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: StreamConverterTests.cs,v 1.1 2007/07/31 18:21:01 bbaia Exp $</version>
+	[TestFixture]
+	public sealed class StreamConverterTests
+	{
+		[Test]
+		public void CanConvertFrom()
+		{
+			StreamConverter vrt = new StreamConverter();
+			Assert.IsTrue(vrt.CanConvertFrom(typeof (string)),
+			              "Conversion from a string instance must be supported.");
+			Assert.IsFalse(vrt.CanConvertFrom(typeof (int)));
+		}
+
+		[Test]
+		[Explicit] // requires one to be connected to the 'net...
+		public void ConvertFrom()
+		{
+			StreamConverter vrt = new StreamConverter();
+			Stream actual = vrt.ConvertFrom("http://www.springframework.net/") as Stream;
+			Assert.IsNotNull(actual);
+		}
+
+		[Test]
+        [Explicit] // fails if there is a transparent proxy that redirects to error page for non existing URL
+		[ExpectedException(typeof (WebException))]
+		public void ConvertFromValidButNonExistingStreamResource()
+		{
+			new StreamConverter().ConvertFrom("http://www.aaaabbbbccccddd.com");
+		}
+
+		[Test]
+		[ExpectedException(typeof (NotSupportedException))]
+		public void ConvertFromNullReference()
+		{
+			new StreamConverter().ConvertFrom(null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (NotSupportedException))]
+		public void ConvertFromNonSupportedOptionBails()
+		{
+			new StreamConverter().ConvertFrom(12);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/StringArrayConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/StringArrayConverterTests.cs
new file mode 100644
index 00000000..7e82ca8e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/StringArrayConverterTests.cs
@@ -0,0 +1,156 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Threading;
+using NUnit.Framework;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+	/// <summary>
+	/// Unit tests for the StringArrayConverter class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: StringArrayConverterTests.cs,v 1.1 2007/07/31 18:21:02 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class StringArrayConverterTests
+    {
+        [Test]
+        public void CanConvertFrom()
+        {
+            StringArrayConverter vrt = new StringArrayConverter();
+            Assert.IsTrue(vrt.CanConvertFrom(typeof (string)), "Conversion from a string instance must be supported.");
+            Assert.IsFalse(vrt.CanConvertFrom(null));
+        }
+
+        [Test]
+        public void ConvertFrom()
+        {
+            object[] expected = new object[] {"1", "Foo", "3"};
+            StringArrayConverter vrt = new StringArrayConverter();
+            object actual = vrt.ConvertFrom("1,Foo,3");
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(typeof (string[]), actual.GetType());
+            Assert.AreEqual(3, ((string[]) actual).Length, "Wrong number of elements in the resulting array.");
+            Assert.IsTrue(ArrayUtils.AreEqual(expected, (string[]) actual),
+                "Individual array elements not correctly converted.");
+        }
+
+        [Test]
+        public void ConvertFromPreservesExtraneousWhitespace()
+        {
+            object[] expected = new object[] {"1 ", " Foo ", " 3"};
+            StringArrayConverter vrt = new StringArrayConverter();
+            object actual = vrt.ConvertFrom("1 , Foo , 3");
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(typeof (string[]), actual.GetType());
+            Assert.IsTrue(ArrayUtils.AreEqual(expected, (string[]) actual),
+                "Individual array elements not correctly converted (check the whitespace?).");
+        }
+
+        [Test]
+        [ExpectedException(typeof (NotSupportedException))]
+        public void ConvertFromNullReference()
+        {
+            StringArrayConverter vrt = new StringArrayConverter();
+            vrt.ConvertFrom(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof (NotSupportedException))]
+        public void ConvertFromNonSupportedOptionBails()
+        {
+            StringArrayConverter vrt = new StringArrayConverter();
+            vrt.ConvertFrom(12);
+        }
+
+        [Test]
+        public void EnsureCultureListSeparatorIsIgnored()
+        {
+            CultureInfo originalCulture = Thread.CurrentThread.CurrentCulture;
+            try
+            {
+                CultureInfo frenchCulture = new CultureInfo("fr-FR");
+                Thread.CurrentThread.CurrentCulture = frenchCulture;
+                object[] expected = new object[] {"1", "Foo", "3"};
+                StringArrayConverter vrt = new StringArrayConverter();
+                // France uses the ';' (semi-colon) to separate list items...
+                object actual = vrt.ConvertFrom("1,Foo,3");
+                Assert.IsNotNull(actual);
+                Assert.AreEqual(typeof (string[]), actual.GetType());
+                Assert.IsTrue(ArrayUtils.AreEqual(expected, (string[]) actual),
+                              "Individual array elements not correctly converted.");
+            }
+            finally
+            {
+                Thread.CurrentThread.CurrentCulture = originalCulture;
+            }
+        }
+
+	    [Test]
+        [ExpectedException(typeof(ArgumentException))]
+	    public void EmptyListSeparator()
+	    {
+	        StringArrayConverter vrt = new StringArrayConverter();
+            vrt.ListSeparator = string.Empty;
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TooLongListSeparator()
+        {
+            StringArrayConverter vrt = new StringArrayConverter();
+            vrt.ListSeparator = "  ";
+        }
+
+        [Test]
+        public void CustomListSeparator()
+        {
+            object[] expected = new object[] {"1", "Foo", "3"};
+            StringArrayConverter vrt = new StringArrayConverter();
+            const string customSeparator = "#";
+            vrt.ListSeparator = customSeparator;
+            object actual = vrt.ConvertFrom(string.Format("1{0}Foo{0}3", customSeparator));
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(typeof (string[]), actual.GetType());
+            Assert.IsTrue(ArrayUtils.AreEqual(expected, (string[]) actual),
+                "Individual array elements not correctly converted.");
+        }
+
+	    [Test]
+	    public void NullingTheListSeparatorMakesItRevertToTheDefault()
+	    {
+            object[] expected = new object[] {"1", "Foo", "3"};
+	        StringArrayConverter vrt = new StringArrayConverter();
+            vrt.ListSeparator = null;
+            object actual = vrt.ConvertFrom("1,Foo,3");
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(typeof (string[]), actual.GetType());
+            Assert.IsTrue(ArrayUtils.AreEqual(expected, (string[]) actual),
+                "Individual array elements not correctly converted.");
+	    }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TimeSpanConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TimeSpanConverterTests.cs
new file mode 100644
index 00000000..7ca68e7c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TimeSpanConverterTests.cs
@@ -0,0 +1,133 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Unit tests for the TimeSpanConverter class.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: TimeSpanConverterTests.cs,v 1.2 2007/08/29 17:29:41 oakinger Exp $</version>
+    [TestFixture]
+    public sealed class TimeSpanConverterTests
+    {
+        [Test]
+        [ExpectedException(typeof(NotSupportedException))]
+        public void ConvertFromNullReference()
+        {
+            TimeSpanConverter tsc = new TimeSpanConverter();
+            tsc.ConvertFrom(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(NotSupportedException))]
+        public void ConvertFromNonSupportedOptionBails()
+        {
+            TimeSpanConverter tsc = new TimeSpanConverter();
+            tsc.ConvertFrom(12);
+        }
+
+        [Test]
+        [ExpectedException(typeof(FormatException))]
+        public void ConvertFromStringMalformed()
+        {
+            TimeSpanConverter tsc = new TimeSpanConverter();
+            tsc.ConvertFrom("15a");
+        }
+
+        [Test]
+        public void BaseConvertFrom()
+        {
+            TimeSpanConverter tsc = new TimeSpanConverter();
+            object timeSpan = tsc.ConvertFrom("00:00:10");
+            Assert.IsNotNull(timeSpan);
+            Assert.IsTrue(timeSpan is TimeSpan);
+            Assert.AreEqual(TimeSpan.FromSeconds(10), (TimeSpan)timeSpan);
+        }
+
+        [Test]
+        public void ConvertFrom()
+        {
+            TimeSpanConverter tsc = new TimeSpanConverter();
+            object timeSpan = tsc.ConvertFrom("1000");
+            Assert.IsNotNull(timeSpan);
+            Assert.IsTrue(timeSpan is TimeSpan);
+            Assert.AreEqual(TimeSpan.Parse("1000"), (TimeSpan)timeSpan);
+        }
+
+        [Test]
+        public void ConvertFromStringWithMilliSecondSpecifier()
+        {
+            TimeSpanConverter tsc = new TimeSpanConverter();
+            object timeSpan = tsc.ConvertFrom("100ms");
+            Assert.IsNotNull(timeSpan);
+            Assert.IsTrue(timeSpan is TimeSpan);
+            Assert.AreEqual(TimeSpan.FromMilliseconds(100), (TimeSpan)timeSpan);
+        }
+
+        [Test]
+        public void ConvertFromStringWithSecondSpecifier()
+        {
+            TimeSpanConverter tsc = new TimeSpanConverter();
+            object timeSpan = tsc.ConvertFrom("10s");
+            Assert.IsNotNull(timeSpan);
+            Assert.IsTrue(timeSpan is TimeSpan);
+            Assert.AreEqual(TimeSpan.FromSeconds(10), (TimeSpan)timeSpan);
+        }
+
+        [Test]
+        public void ConvertFromStringWithMinuteSpecifier()
+        {
+            TimeSpanConverter tsc = new TimeSpanConverter();
+            object timeSpan = tsc.ConvertFrom("2m");
+            Assert.IsNotNull(timeSpan);
+            Assert.IsTrue(timeSpan is TimeSpan);
+            Assert.AreEqual(TimeSpan.FromMinutes(2), (TimeSpan)timeSpan);
+        }
+
+        [Test]
+        public void ConvertFromStringWithHourSpecifier()
+        {
+            TimeSpanConverter tsc = new TimeSpanConverter();
+            object timeSpan = tsc.ConvertFrom("1H");
+            Assert.IsNotNull(timeSpan);
+            Assert.IsTrue(timeSpan is TimeSpan);
+            Assert.AreEqual(TimeSpan.FromHours(1), (TimeSpan)timeSpan);
+        }
+
+        [Test]
+        public void ConvertFromStringWithDaySpecifier()
+        {
+            TimeSpanConverter tsc = new TimeSpanConverter();
+            object timeSpan = tsc.ConvertFrom("1d");
+            Assert.IsNotNull(timeSpan);
+            Assert.IsTrue(timeSpan is TimeSpan);
+            Assert.AreEqual(TimeSpan.FromDays(1), (TimeSpan)timeSpan);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConverterRegistryTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConverterRegistryTests.cs
new file mode 100644
index 00000000..b7a4cc72
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConverterRegistryTests.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+	/// <summary>
+    /// Unit tests for the TypeConverterRegistry class.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: TypeConverterRegistryTests.cs,v 1.1 2007/07/31 18:21:02 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class TypeConverterRegistryTests
+    {
+        [Test]
+        public void GetConverterForEnums()
+        {
+            TypeConverter converter = TypeConverterRegistry.GetConverter(typeof(DayOfWeek));
+            Assert.IsTrue(converter is EnumConverter);
+        }
+
+        [Test]
+        public void GetInternalConverter()
+        {
+            TypeConverter converter = TypeConverterRegistry.GetConverter(typeof(int));
+            Assert.IsTrue(converter is Int32Converter);
+        }
+
+        [Test]
+        public void GetSpringConverter()
+        {
+            TypeConverter converter = TypeConverterRegistry.GetConverter(typeof(string[]));
+            Assert.IsTrue(converter is StringArrayConverter);
+        }
+
+        [Test]
+        public void RegisterConverter()
+        {
+            TypeConverterRegistry.RegisterConverter("System.DateTime", "System.ComponentModel.DateTimeConverter");
+        }
+
+        [Test]
+        [ExpectedException(typeof(TypeLoadException))]
+        public void RegisterConverterWithNonResolvableType()
+        {
+            TypeConverterRegistry.RegisterConverter("Systemm.DateTime", "System.ComponentModel.DateTimeConverter");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void RegisterConverterWithNonTypeConverter()
+        {
+            TypeConverterRegistry.RegisterConverter("System.DateTime", "System.DateTime");
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/UniqueKeyConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/UniqueKeyConverterTests.cs
new file mode 100644
index 00000000..77df652b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/UniqueKeyConverterTests.cs
@@ -0,0 +1,125 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.ComponentModel;
+using NUnit.Framework;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+    /// <summary>
+    /// Tests <see cref="UniqueKeyConverter"/> functionality.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: UniqueKeyConverterTests.cs,v 1.1 2007/08/22 20:17:05 oakinger Exp $</version>
+    [TestFixture]
+    public class UniqueKeyConverterTests
+    {
+        [Test]
+        public void CanConvertFromStringOnly()
+        {
+            TypeConverter c = new UniqueKeyConverter();
+            Assert.IsTrue(c.CanConvertFrom(typeof(string)));
+            Assert.IsFalse(c.CanConvertFrom(typeof(object)));
+        }
+
+        [Test]
+        public void CanConvertToStringOnly()
+        {
+            TypeConverter c = new UniqueKeyConverter();
+            Assert.IsTrue(c.CanConvertTo(typeof(string)));
+            Assert.IsFalse(c.CanConvertTo(typeof(object)));
+        }
+
+        [Test]
+        public void ConvertToStringOrUniqueKeyOnly()
+        {
+            TypeConverter c = new UniqueKeyConverter();
+            UniqueKey key = UniqueKey.GetInstanceScoped(new object(), "PartialKey");
+
+            c.ConvertTo(key, typeof(UniqueKey));
+            c.ConvertTo(key, typeof(string));
+            try
+            {
+                c.ConvertTo(key, typeof(object));
+                Assert.Fail();
+            }
+            catch(NotSupportedException) {}
+        }
+
+        [Test]
+        public void ConvertFromStringOrUniqueKeyOnly()
+        {
+            TypeConverter c = new UniqueKeyConverter();
+            UniqueKey key = UniqueKey.GetInstanceScoped(new object(), "PartialKey");
+            c.ConvertFrom(key);
+            c.ConvertFrom(key.ToString());
+            try
+            {
+                c.ConvertFrom(new object());
+                Assert.Fail();
+            }
+            catch(NotSupportedException) {}
+        }
+
+        [Test]
+        public void ConvertFromReturnsNullIfInputNull()
+        {
+            TypeConverter c = new UniqueKeyConverter();
+            Assert.IsNull(c.ConvertFrom(null)); 
+        }
+
+        [Test]
+        public void ConvertToReturnsNullIfInputNull()
+        {
+            TypeConverter c = new UniqueKeyConverter();
+            Assert.IsNull(c.ConvertTo(null, typeof(string)));
+        }
+
+        [Test]
+        public void ConvertToEqualsToString()
+        {
+            object testObject = new object();
+            UniqueKey key = UniqueKey.GetInstanceScoped(testObject, "PartialKey");
+
+            TypeConverter c = new UniqueKeyConverter();
+            string stringKey = (string) c.ConvertTo(key, typeof(string));
+            Assert.AreEqual(key.ToString(), stringKey);
+        }
+
+        [Test]
+        public void ConvertToAndFromAreInSync()
+        {
+            object testObject = new object();
+            UniqueKey expectedKey = UniqueKey.GetInstanceScoped(testObject, "PartialKey");
+
+            TypeConverter c = new UniqueKeyConverter();
+            string stringKey = (string)c.ConvertTo(expectedKey, typeof(string));
+            UniqueKey key2 = (UniqueKey) c.ConvertFrom(stringKey);
+            Assert.AreEqual( expectedKey, key2 );
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/UriConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/UriConverterTests.cs
new file mode 100644
index 00000000..5043ddc9
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/UriConverterTests.cs
@@ -0,0 +1,87 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.TypeConversion
+{
+	/// <summary>
+	/// Unit tests for the UriConverter class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: UriConverterTests.cs,v 1.1 2007/07/31 18:21:02 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class UriConverterTests
+    {
+        [Test]
+        public void CanConvertFrom () 
+        {
+            UriConverter vrt = new UriConverter ();
+            Assert.IsTrue (vrt.CanConvertFrom (typeof (string)), "Conversion from a string instance must be supported.");
+            Assert.IsFalse (vrt.CanConvertFrom (typeof (int)));
+        }
+
+        [Test]
+        public void ConvertFrom () 
+        {
+            UriConverter vrt = new UriConverter ();
+            object actual = vrt.ConvertFrom ("svn://localhost/Spring/trunk/");
+            Assert.IsNotNull (actual);
+            Assert.AreEqual (typeof (System.Uri), actual.GetType ());
+        }
+
+        [Test]
+        public void ConvertFromMalformedUriBails () 
+        {
+            try 
+            {
+                UriConverter vrt = new UriConverter ();
+                object actual = vrt.ConvertFrom ("$TheAngelGang");
+            } 
+            catch (Exception ex) 
+            {
+                // check that the inner exception was doe to the malformed URL
+                Assert.IsTrue (ex.InnerException is UriFormatException);
+            }
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void ConvertFromNullReference () 
+        {
+            UriConverter vrt = new UriConverter ();
+            object actual = vrt.ConvertFrom (null);
+        }
+
+        [Test]
+        [ExpectedException (typeof (NotSupportedException))]
+        public void ConvertFromNonSupportedOptionBails () 
+        {
+            UriConverter vrt = new UriConverter ();
+            object actual = vrt.ConvertFrom (12);
+        } 
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs
new file mode 100644
index 00000000..48555ea6
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs
@@ -0,0 +1,57 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Core.TypeResolution
+{
+	/// <summary>
+	/// Unit tests for the CachedTypeResolver class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: CachedTypeResolverTests.cs,v 1.1 2007/07/31 18:21:02 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class CachedTypeResolverTests
+    {
+        [Test]
+        [ExpectedException(typeof(TypeLoadException))]
+        public void ResolveWithNullTypeName() {
+
+        	IDynamicMock mock = new DynamicMock(typeof(ITypeResolver));
+			ITypeResolver mockResolver = (ITypeResolver) mock.Object;
+
+            CachedTypeResolver resolver = new CachedTypeResolver(mockResolver);
+            resolver.Resolve(null);
+        }
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void InstantiateWithNullTypeResolver()
+		{
+			new CachedTypeResolver(null);
+		}
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs
new file mode 100644
index 00000000..7e22d854
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs
@@ -0,0 +1,94 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Data;
+
+using NUnit.Framework;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Core.TypeResolution
+{
+    /// <summary>
+    /// Unit tests for the GenericTypeResolver class.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: GenericTypeResolverTests.cs,v 1.2 2007/08/16 05:42:33 markpollack Exp $</version>
+    [TestFixture]
+    public class GenericTypeResolverTests : TypeResolverTests
+    {
+        protected override ITypeResolver GetTypeResolver()
+        {
+            return new GenericTypeResolver();
+        }
+
+        [Test]
+        public void ResolveLocalAssemblyGenericType()
+        {
+            Type t = GetTypeResolver().Resolve("Spring.Objects.TestGenericObject< int, string>");
+            Assert.AreEqual(typeof(TestGenericObject<int,string>), t);
+        }
+
+        [Test]
+        public void ResolveLocalAssemblyGenericTypeDefinition()
+        {
+            // CLOVER:ON
+            Type t = GetTypeResolver().Resolve("Spring.Objects.TestGenericObject< ,>");
+            // CLOVER:OFF
+            Assert.AreEqual(typeof(TestGenericObject<,>), t);
+        }
+
+        [Test]
+        [ExpectedException(typeof(TypeLoadException))]
+        public void ResolveLocalAssemblyGenericTypeOpen()
+        {
+            GetTypeResolver().Resolve("Spring.Objects.TestGenericObject<int >");
+        }
+
+        [Test]
+        public void ResolveGenericTypeWithAssemblyName()
+        {
+            Type t = GetTypeResolver().Resolve("System.Collections.Generic.Stack<string>, System");
+            Assert.AreEqual(typeof(System.Collections.Generic.Stack<string>), t);
+        }
+
+        [Test]
+        [ExpectedException(typeof(TypeLoadException))]
+        public void ResolveAmbiguousGenericTypeWithAssemblyName()
+        {
+            Type t = GetTypeResolver().Resolve("Spring.Objects.TestGenericObject<System.Collections.Generic.Stack<int>, System, string>");
+        }
+
+        [Test]
+        [ExpectedException(typeof(TypeLoadException))]
+        public void ResolveMalformedGenericType()
+        {
+            Type t = GetTypeResolver().Resolve("Spring.Objects.TestGenericObject<int, <string>>");
+        }
+    }
+}
+
+#endif
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs
new file mode 100644
index 00000000..8631e5ff
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs
@@ -0,0 +1,738 @@
+#region License
+
+/* 
+ * Copyright © 2002-2005 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 
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Util;
+using IBar=Spring.Objects.Factory.IBar;
+using Spring.Context;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Core.TypeResolution
+{
+	/// <summary>
+	/// Unit tests for the TypeRegistry class.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+	/// <author>Rick Evans</author>
+	[TestFixture]
+	public sealed class TypeRegistryTests
+	{
+		[Test]
+		public void TestAliasResolution()
+		{
+			TypeRegistry.RegisterType("Foo", typeof (Foo));
+			TypeRegistry.RegisterType("Bar", "Spring.Objects.Factory.Bar, Spring.Core.Tests");
+
+			Assert.AreEqual(TypeRegistry.ResolveType("Foo"), typeof (Foo));
+			Assert.AreEqual(TypeRegistry.ResolveType("Bar"), typeof (Bar));
+
+			IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Core.Tests/Spring.Core.TypeResolution/aliasedObjects.xml");
+
+			Foo foo = ctx.GetObject("aliasedType") as Foo;
+			Assert.IsNotNull(foo);
+			Assert.IsNotNull(foo.Bar);
+			Assert.AreEqual(foo.Bar, typeof (Bar));
+			Assert.IsTrue(typeof (IBar).IsAssignableFrom(foo.Bar));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void ResolveTypeWithNullAliasArg()
+		{
+			TypeRegistry.ResolveType(null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void ResolveTypeWithEmptyAliasArg()
+		{
+			TypeRegistry.ResolveType(string.Empty);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void ResolveTypeWithWhitespacedAliasArg()
+		{
+			TypeRegistry.ResolveType("   ");
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void RegisterTypeWithNullAliasArg()
+		{
+			TypeRegistry.RegisterType(null, typeof (TestObject));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void RegisterTypeWithEmptyAliasArg()
+		{
+			TypeRegistry.RegisterType(string.Empty, typeof (TestObject));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void RegisterTypeWithWhitespacedAliasArg()
+		{
+			TypeRegistry.RegisterType("   ", typeof (TestObject));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void RegisterTypeWithNullTypeArg()
+		{
+			TypeRegistry.RegisterType("foo", (Type) null);
+		}
+
+		public void RegisterTypeWithNullTypeStringArg()
+		{
+			TypeRegistry.RegisterType("foo", (String) null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void RegisterTypeWithEmptyTypeStringArg()
+		{
+			TypeRegistry.RegisterType("foo", string.Empty);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void RegisterTypeWithWhitespacedTypeStringArg()
+		{
+			TypeRegistry.RegisterType("foo", "   ");
+		}
+
+		[Test]
+		public void ReturnsNullIfNoTypeAliasRegistered()
+		{
+			Type type = TypeRegistry.ResolveType("panko");
+			Assert.IsNull(type, "Must return null if no Type is registered under the supplied alias.");
+		}
+
+		[Test]
+		public void RegisteringAnAliasTwiceDoesNotThrowException()
+		{
+			const string Alias = "foo";
+
+			TypeRegistry.RegisterType(Alias, typeof (TestObject));
+			TypeRegistry.RegisterType(Alias, GetType());
+
+			Type type = TypeRegistry.ResolveType(Alias);
+			Assert.AreEqual(GetType(), type, "Overriding Type was not registered.");
+		}
+
+		[Test]
+		public void ResolveIntegerByName()
+		{
+			Assert.AreEqual(typeof (int),
+			                TypeRegistry.ResolveType("int"));
+		}
+
+		[Test]
+		public void ResolveChar()
+		{
+			Assert.AreEqual(typeof (char),
+			                TypeRegistry.ResolveType(TypeRegistry.CharAlias));
+		}
+
+		[Test]
+		public void ResolveInteger()
+		{
+			Assert.AreEqual(typeof (int),
+			                TypeRegistry.ResolveType(TypeRegistry.Int32Alias));
+		}
+
+		[Test]
+		public void ResolveDecimal()
+		{
+			Assert.AreEqual(typeof (decimal),
+			                TypeRegistry.ResolveType(TypeRegistry.DecimalAlias));
+		}
+
+		[Test]
+		public void ResolveUnsignedIntegerByName()
+		{
+			Assert.AreEqual(typeof (uint),
+			                TypeRegistry.ResolveType("uint"));
+		}
+
+		[Test]
+		public void ResolveUnsignedInteger()
+		{
+			Assert.AreEqual(typeof (uint),
+			                TypeRegistry.ResolveType(TypeRegistry.UInt32Alias));
+		}
+
+		[Test]
+		public void ResolveFloatByName()
+		{
+			Assert.AreEqual(typeof (float),
+			                TypeRegistry.ResolveType("float"));
+		}
+
+		[Test]
+		public void ResolveFloat()
+		{
+			Assert.AreEqual(typeof (float),
+			                TypeRegistry.ResolveType(TypeRegistry.FloatAlias));
+		}
+
+		[Test]
+		public void ResolveDoubleByName()
+		{
+			Assert.AreEqual(typeof (double),
+			                TypeRegistry.ResolveType("double"));
+		}
+
+		[Test]
+		public void ResolveDouble()
+		{
+			Assert.AreEqual(typeof (double),
+			                TypeRegistry.ResolveType(TypeRegistry.DoubleAlias));
+		}
+
+		[Test]
+		public void ResolveLongByName()
+		{
+			Assert.AreEqual(typeof (long),
+			                TypeRegistry.ResolveType("long"));
+		}
+
+		[Test]
+		public void ResolveLong()
+		{
+			Assert.AreEqual(typeof (long),
+			                TypeRegistry.ResolveType(TypeRegistry.Int64Alias));
+		}
+
+		[Test]
+		public void ResolveUnsignedLongByName()
+		{
+			Assert.AreEqual(typeof (ulong),
+			                TypeRegistry.ResolveType("ulong"));
+		}
+
+		[Test]
+		public void ResolveUnsignedLong()
+		{
+			Assert.AreEqual(typeof (ulong),
+			                TypeRegistry.ResolveType(TypeRegistry.UInt64Alias));
+		}
+
+		[Test]
+		public void ResolveShortByName()
+		{
+			Assert.AreEqual(typeof (short),
+			                TypeRegistry.ResolveType("short"));
+		}
+
+		[Test]
+		public void ResolveShort()
+		{
+			Assert.AreEqual(typeof (short),
+			                TypeRegistry.ResolveType(TypeRegistry.Int16Alias));
+		}
+
+		[Test]
+		public void ResolveUnsignedShortByName()
+		{
+			Assert.AreEqual(typeof (ushort),
+			                TypeRegistry.ResolveType("ushort"));
+		}
+
+		[Test]
+		public void ResolveUnsignedShort()
+		{
+			Assert.AreEqual(typeof (ushort),
+			                TypeRegistry.ResolveType(TypeRegistry.UInt16Alias));
+		}
+
+		[Test]
+		public void ResolveDate()
+		{
+			Assert.AreEqual(typeof (DateTime),
+			                TypeRegistry.ResolveType(TypeRegistry.DateAlias));
+		}
+
+		[Test]
+		public void ResolveBool()
+		{
+			Assert.AreEqual(typeof (bool),
+			                TypeRegistry.ResolveType(TypeRegistry.BoolAlias));
+		}
+
+		[Test]
+		public void ResolveIntegerByVBName()
+		{
+			Assert.AreEqual(typeof (int),
+			                TypeRegistry.ResolveType("Integer"));
+		}
+
+		[Test]
+		public void ResolveVBInteger()
+		{
+			Assert.AreEqual(typeof (int),
+			                TypeRegistry.ResolveType(TypeRegistry.Int32AliasVB));
+		}
+
+		[Test]
+		public void ResolveVBDecimal()
+		{
+			Assert.AreEqual(typeof (decimal),
+			                TypeRegistry.ResolveType(TypeRegistry.DecimalAliasVB));
+		}
+
+		[Test]
+		public void ResolveSingleByName()
+		{
+			Assert.AreEqual(typeof (float),
+			                TypeRegistry.ResolveType("Single"));
+		}
+
+		[Test]
+		public void ResolveSingle()
+		{
+			Assert.AreEqual(typeof (float),
+			                TypeRegistry.ResolveType(TypeRegistry.SingleAlias));
+		}
+
+		[Test]
+		public void ResolveVBDouble()
+		{
+			Assert.AreEqual(typeof (double),
+			                TypeRegistry.ResolveType(TypeRegistry.DoubleAliasVB));
+		}
+
+		[Test]
+		public void ResolveVBLong()
+		{
+			Assert.AreEqual(typeof (long),
+			                TypeRegistry.ResolveType(TypeRegistry.Int64AliasVB));
+		}
+
+		[Test]
+		public void ResolveVBShort()
+		{
+			Assert.AreEqual(typeof (short),
+			                TypeRegistry.ResolveType(TypeRegistry.Int16AliasVB));
+		}
+
+		[Test]
+		public void ResolveVBDate()
+		{
+			Assert.AreEqual(typeof (DateTime),
+			                TypeRegistry.ResolveType(TypeRegistry.DateAliasVB));
+		}
+
+		[Test]
+		public void ResolveVBBool()
+		{
+			Assert.AreEqual(typeof (bool),
+			                TypeRegistry.ResolveType(TypeRegistry.BoolAliasVB));
+		}
+
+        [Test]
+        public void ResolveString()
+        {
+            Assert.AreEqual(typeof(string),
+                            TypeRegistry.ResolveType(TypeRegistry.StringAlias));
+        }
+
+        [Test]
+        public void ResolveVBString()
+        {
+            Assert.AreEqual(typeof(string),
+                            TypeRegistry.ResolveType(TypeRegistry.StringAliasVB));
+        }
+
+		[Test]
+		public void ResolveStringArray()
+		{
+			Assert.AreEqual(typeof (string[]),
+			                TypeRegistry.ResolveType(TypeRegistry.StringArrayAlias));
+		}
+
+		[Test]
+		public void ResolveVBStringArray()
+		{
+			Assert.AreEqual(typeof (string[]),
+			                TypeRegistry.ResolveType(TypeRegistry.StringArrayAliasVB));
+		}
+
+        [Test]
+        public void ResolveObject()
+        {
+            Assert.AreEqual(typeof(object),
+                            TypeRegistry.ResolveType(TypeRegistry.ObjectAlias));
+        }
+
+        [Test]
+        public void ResolveVBObject()
+        {
+            Assert.AreEqual(typeof(object),
+                            TypeRegistry.ResolveType(TypeRegistry.ObjectAliasVB));
+        }
+
+        [Test]
+        public void ResolveObjectArray()
+        {
+            Assert.AreEqual(typeof(object[]),
+                            TypeRegistry.ResolveType(TypeRegistry.ObjectArrayAlias));
+        }
+
+        [Test]
+        public void ResolveVBObjectArray()
+        {
+            Assert.AreEqual(typeof(object[]),
+                            TypeRegistry.ResolveType(TypeRegistry.ObjectArrayAliasVB));
+        }
+
+		[Test]
+		public void ResolveCharArray()
+		{
+			Assert.AreEqual(typeof (char[]),
+			                TypeRegistry.ResolveType(TypeRegistry.CharArrayAlias));
+		}
+
+		[Test]
+		public void ResolveVBCharArray()
+		{
+			Assert.AreEqual(typeof (char[]),
+			                TypeRegistry.ResolveType(TypeRegistry.CharArrayAliasVB));
+		}
+
+		[Test]
+		public void ResolveInt32Array()
+		{
+			Assert.AreEqual(typeof (int[]),
+			                TypeRegistry.ResolveType(TypeRegistry.Int32ArrayAlias));
+		}
+
+		[Test]
+		public void ResolveVBInt32Array()
+		{
+			Assert.AreEqual(typeof (int[]),
+			                TypeRegistry.ResolveType(TypeRegistry.Int32ArrayAliasVB));
+		}
+
+		[Test]
+		public void ResolveInt16Array()
+		{
+			Assert.AreEqual(typeof (short[]),
+			                TypeRegistry.ResolveType(TypeRegistry.Int16ArrayAlias));
+		}
+
+		[Test]
+		public void ResolveVBInt16Array()
+		{
+			Assert.AreEqual(typeof (short[]),
+			                TypeRegistry.ResolveType(TypeRegistry.Int16ArrayAliasVB));
+		}
+
+		[Test]
+		public void ResolveInt64Array()
+		{
+			Assert.AreEqual(typeof (long[]),
+			                TypeRegistry.ResolveType(TypeRegistry.Int64ArrayAlias));
+		}
+
+		[Test]
+		public void ResolveVBInt64Array()
+		{
+			Assert.AreEqual(typeof (long[]),
+			                TypeRegistry.ResolveType(TypeRegistry.Int64ArrayAliasVB));
+		}
+
+		[Test]
+		public void ResolveUInt16Array()
+		{
+			Assert.AreEqual(typeof (ushort[]),
+			                TypeRegistry.ResolveType(TypeRegistry.UInt16ArrayAlias));
+		}
+
+		[Test]
+		public void ResolveUInt32Array()
+		{
+			Assert.AreEqual(typeof (uint[]),
+			                TypeRegistry.ResolveType(TypeRegistry.UInt32ArrayAlias));
+		}
+
+		[Test]
+		public void ResolveUInt64Array()
+		{
+			Assert.AreEqual(typeof (ulong[]),
+			                TypeRegistry.ResolveType(TypeRegistry.UInt64ArrayAlias));
+		}
+
+		[Test]
+		public void ResolveBoolArray()
+		{
+			Assert.AreEqual(typeof (bool[]),
+			                TypeRegistry.ResolveType(TypeRegistry.BoolArrayAlias));
+		}
+
+		[Test]
+		public void ResolveVBBoolArray()
+		{
+			Assert.AreEqual(typeof (bool[]),
+			                TypeRegistry.ResolveType(TypeRegistry.BoolArrayAliasVB));
+		}
+
+		[Test]
+		public void ResolveDateArray()
+		{
+			Assert.AreEqual(typeof (DateTime[]),
+			                TypeRegistry.ResolveType(TypeRegistry.DateTimeArrayAlias));
+		}
+
+		[Test]
+		public void ResolveVBDateArray()
+		{
+			Assert.AreEqual(typeof (DateTime[]),
+			                TypeRegistry.ResolveType(TypeRegistry.DateTimeArrayAliasVB));
+		}
+
+		[Test]
+		public void ResolveFloatArray()
+		{
+			Assert.AreEqual(typeof (float[]),
+			                TypeRegistry.ResolveType(TypeRegistry.FloatArrayAlias));
+		}
+
+		[Test]
+		public void ResolveVBSingleArray()
+		{
+			Assert.AreEqual(typeof (float[]),
+			                TypeRegistry.ResolveType(TypeRegistry.SingleArrayAliasVB));
+		}
+
+		[Test]
+		public void ResolveDoubleArray()
+		{
+			Assert.AreEqual(typeof (double[]),
+			                TypeRegistry.ResolveType(TypeRegistry.DoubleArrayAlias));
+		}
+
+		[Test]
+		public void ResolveVBDoubleArray()
+		{
+			Assert.AreEqual(typeof (double[]),
+			                TypeRegistry.ResolveType(TypeRegistry.DoubleArrayAliasVB));
+		}
+
+#if NET_2_0
+        [Test]
+        public void ResolveNullableChar()
+        {
+            Assert.AreEqual(typeof(char?),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableCharAlias));
+            Assert.AreEqual(typeof(Nullable<char>),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableCharAlias));
+        }
+
+        [Test]
+        public void ResolveNullableInteger()
+        {
+            Assert.AreEqual(typeof(int?),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableInt32Alias));
+            Assert.AreEqual(typeof(Nullable<int>),
+                TypeRegistry.ResolveType(TypeRegistry.NullableInt32Alias));
+        }
+
+        [Test]
+        public void ResolveNullableDecimal()
+        {
+            Assert.AreEqual(typeof(decimal?),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableDecimalAlias));
+            Assert.AreEqual(typeof(Nullable<decimal>),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableDecimalAlias));
+        }
+
+        [Test]
+        public void ResolveNullableUnsignedInteger()
+        {
+            Assert.AreEqual(typeof(uint?),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableUInt32Alias));
+            Assert.AreEqual(typeof(Nullable<uint>),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableUInt32Alias));
+        }
+
+        [Test]
+        public void ResolveNullableFloat()
+        {
+            Assert.AreEqual(typeof(float?),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableFloatAlias));
+            Assert.AreEqual(typeof(Nullable<float>),
+                           TypeRegistry.ResolveType(TypeRegistry.NullableFloatAlias));
+        }
+
+        [Test]
+        public void ResolveNullableDouble()
+        {
+            Assert.AreEqual(typeof(double?),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableDoubleAlias));
+            Assert.AreEqual(typeof(Nullable<double>),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableDoubleAlias));
+        }
+
+        [Test]
+        public void ResolveNullableLong()
+        {
+            Assert.AreEqual(typeof(long?),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableInt64Alias));
+            Assert.AreEqual(typeof(Nullable<long>),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableInt64Alias));
+        }
+
+        [Test]
+        public void ResolveNullableUnsignedLong()
+        {
+            Assert.AreEqual(typeof(ulong?),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableUInt64Alias));
+            Assert.AreEqual(typeof(Nullable<ulong>),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableUInt64Alias));
+        }
+
+        [Test]
+        public void ResolveNullableShort()
+        {
+            Assert.AreEqual(typeof(short?),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableInt16Alias));
+            Assert.AreEqual(typeof(Nullable<short>),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableInt16Alias));
+        }
+
+        [Test]
+        public void ResolveNullableUnsignedShort()
+        {
+            Assert.AreEqual(typeof(ushort?),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableUInt16Alias));
+            Assert.AreEqual(typeof(Nullable<ushort>),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableUInt16Alias));
+        }
+
+        [Test]
+        public void ResolveNullableBool()
+        {
+            Assert.AreEqual(typeof(bool?),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableBoolAlias));
+            Assert.AreEqual(typeof(Nullable<bool>),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableBoolAlias));
+        }
+
+        [Test]
+        public void ResolveNullableCharArray()
+        {
+            Assert.AreEqual(typeof(char?[]),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableCharArrayAlias));
+        }
+
+        [Test]
+        public void ResolveNullableInt32Array()
+        {
+            Assert.AreEqual(typeof(int?[]),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableInt32ArrayAlias));
+        }
+
+        [Test]
+        public void ResolveNullableDecimalArray()
+        {
+            Assert.AreEqual(typeof(decimal?[]),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableDecimalArrayAlias));
+        }
+
+        [Test]
+        public void ResolveNullableInt16Array()
+        {
+            Assert.AreEqual(typeof(short?[]),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableInt16ArrayAlias));
+        }
+
+        [Test]
+        public void ResolveNullableInt64Array()
+        {
+            Assert.AreEqual(typeof(long?[]),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableInt64ArrayAlias));
+        }
+
+        [Test]
+        public void ResolveNullableUInt16Array()
+        {
+            Assert.AreEqual(typeof(ushort?[]),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableUInt16ArrayAlias));
+        }
+
+        [Test]
+        public void ResolveNullableUInt32Array()
+        {
+            Assert.AreEqual(typeof(uint?[]),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableUInt32ArrayAlias));
+        }
+
+        [Test]
+        public void ResolveNullableUInt64Array()
+        {
+            Assert.AreEqual(typeof(ulong?[]),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableUInt64ArrayAlias));
+        }
+
+        [Test]
+        public void ResolveNullableBoolArray()
+        {
+            Assert.AreEqual(typeof(bool?[]),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableBoolArrayAlias));
+        }
+
+        [Test]
+        public void ResolveNullableFloatArray()
+        {
+            Assert.AreEqual(typeof(float?[]),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableFloatArrayAlias));
+        }
+
+        [Test]
+        public void ResolveNullableDoubleArray()
+        {
+            Assert.AreEqual(typeof(double?[]),
+                            TypeRegistry.ResolveType(TypeRegistry.NullableDoubleArrayAlias));
+        }
+#endif
+	}
+
+	internal class Foo
+	{
+		private Type bar;
+
+		public Type Bar
+		{
+			get { return bar; }
+			set { bar = value; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolutionUtilsTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolutionUtilsTests.cs
new file mode 100644
index 00000000..bcfa2a02
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolutionUtilsTests.cs
@@ -0,0 +1,122 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using NUnit.Framework;
+
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Core.TypeResolution
+{
+	/// <summary>
+    /// Unit tests for the TypeResolutionUtils class.
+	/// </summary>
+	/// <version>$Id: TypeResolutionUtilsTests.cs,v 1.2 2007/08/02 14:19:03 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class TypeResolutionUtilsTests
+    {
+        [Test]
+        public void ResolveFromAssemblyQualifiedName()
+        {
+            Type testObjectType = TypeResolutionUtils.ResolveType("Spring.Objects.TestObject, Spring.Core.Tests");
+            Assert.IsNotNull(testObjectType);
+			Assert.IsTrue(testObjectType.Equals(typeof (TestObject)));
+        }
+
+		[Test]
+		[ExpectedException(typeof(TypeLoadException))]
+		public void ResolveFromBadAssemblyQualifiedName()
+		{
+			TypeResolutionUtils.ResolveType("Spring.Objects.TestObject, Spring.Core.FooTests");
+		}
+
+        [Test]
+        public void ResolveFromShortName()
+        {
+            Type testObjectType = TypeResolutionUtils.ResolveType("Spring.Objects.TestObject");
+            Assert.IsNotNull(testObjectType);
+			Assert.IsTrue(testObjectType.Equals(typeof (TestObject)));
+        }
+
+		[Test]
+		[ExpectedException(typeof(TypeLoadException))]
+		public void ResolveFromBadShortName()
+		{
+			TypeResolutionUtils.ResolveType("Spring.Objects.FooBarTestObject");
+		}
+
+
+
+
+        [Test]
+        public void ResolveInterfaceArrayFromStringArray()
+        {
+            Type[] expected = new Type[] { typeof(IFoo) };
+            string[] input = new string[] { typeof(IFoo).AssemblyQualifiedName };
+            Type[] actual = TypeResolutionUtils.ResolveInterfaceArray(input);
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected.Length, actual.Length);
+            Assert.AreEqual(expected[0], actual[0]);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void ResolveInterfaceArrayFromStringArrayWithNonInterfaceTypes()
+        {
+            string[] input = new string[] { GetType().AssemblyQualifiedName };
+            TypeResolutionUtils.ResolveInterfaceArray(input);
+        }
+
+        [Test]
+        public void MethodMatch()
+        {
+            MethodInfo absquatulateMethod = typeof(TestObject).GetMethod("Absquatulate");
+            Assert.IsTrue(TypeResolutionUtils.MethodMatch("*", absquatulateMethod), "Should match '*'");
+            Assert.IsTrue(TypeResolutionUtils.MethodMatch("*tulate", absquatulateMethod), "Should match '*tulate'");
+            Assert.IsTrue(TypeResolutionUtils.MethodMatch("Absqua*", absquatulateMethod), "Should match 'Absqua*'");
+            Assert.IsTrue(TypeResolutionUtils.MethodMatch("*quatul*", absquatulateMethod), "Should match '*quatul*'");
+            Assert.IsTrue(TypeResolutionUtils.MethodMatch("Absquatulate", absquatulateMethod), "Should match 'Absquatulate'");
+            Assert.IsTrue(TypeResolutionUtils.MethodMatch("Absquatulate()", absquatulateMethod), "Should match 'Absquatulate()'");
+            Assert.IsTrue(TypeResolutionUtils.MethodMatch("Absquatulate()", absquatulateMethod), "Should match 'Absquatulate()'");
+            Assert.IsFalse(TypeResolutionUtils.MethodMatch("Absquatulate(string)", absquatulateMethod), "Should not match 'Absquatulate(string)'");
+
+            MethodInfo addPeriodicElementMethod = typeof(TestObject).GetMethod("AddPeriodicElement");
+            Assert.IsTrue(TypeResolutionUtils.MethodMatch("AddPeriodicElement", addPeriodicElementMethod), "Should match 'AddPeriodicElement'");
+            Assert.IsFalse(TypeResolutionUtils.MethodMatch("AddPeriodicElement()", addPeriodicElementMethod), "Should not match 'AddPeriodicElement()'");
+            Assert.IsFalse(TypeResolutionUtils.MethodMatch("AddPeriodicElement(string)", addPeriodicElementMethod), "Should not match 'AddPeriodicElement(string)'");
+            Assert.IsTrue(TypeResolutionUtils.MethodMatch("AddPeriodicElement(string, string)", addPeriodicElementMethod), "Should match 'AddPeriodicElement(string, string)'");
+        }
+
+        #region Helper classes
+
+        internal interface IFoo
+        {
+            bool Spanglish(string foo, object[] args);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolverTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolverTests.cs
new file mode 100644
index 00000000..b072338d
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolverTests.cs
@@ -0,0 +1,102 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using NUnit.Framework;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Core.TypeResolution
+{
+    /// <summary>
+    /// Unit tests for the TypeResolver class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: TypeResolverTests.cs,v 1.1 2007/07/31 18:21:02 bbaia Exp $</version>
+    [TestFixture]
+    public class TypeResolverTests
+    {
+        protected virtual ITypeResolver GetTypeResolver()
+        {
+            return new TypeResolver();
+        }
+
+        [Test]
+        public void ResolveLocalAssemblyType()
+        {
+            Type t = GetTypeResolver().Resolve("Spring.Objects.TestObject");
+            Assert.AreEqual(typeof (TestObject), t);
+        }
+
+        [Test]
+        public void ResolveWithPartialAssemblyName()
+        {
+            Type t = GetTypeResolver().Resolve("System.Data.IDbConnection, System.Data");
+            Assert.AreEqual(typeof (IDbConnection), t);
+        }
+
+        /// <summary>
+        /// Tests that the resolve method throws the correct exception
+        /// when supplied a load of old rubbish as a type name.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof (TypeLoadException))]
+        public void ResolveWithNonExistentTypeName()
+        {
+            GetTypeResolver().Resolve("RaskolnikovsDilemma, System.StPetersburg");
+        }
+
+        [Test]
+        [ExpectedException(typeof(TypeLoadException))]
+        public void ResolveBadArgs()
+        {
+            GetTypeResolver().Resolve(null);
+        }
+
+        [Test]
+        public void ResolveLocalAssemblyTypeWithFullAssemblyQualifiedName()
+        {
+            Type t = GetTypeResolver().Resolve(typeof(TestObject).AssemblyQualifiedName);
+            Assert.AreEqual(typeof (TestObject), t);
+        }
+
+        [Test]
+        [ExpectedException(typeof(TypeLoadException))]
+        public void LoadTypeFromSystemAssemblySpecifyingOnlyTheAssemblyDisplayName()
+        {
+            string stringType = typeof(string).FullName + ", System";
+            Type t = GetTypeResolver().Resolve(stringType);
+            Assert.AreEqual(typeof(string), t);
+        }
+
+        [Test]
+        public void LoadTypeFromSystemAssemblySpecifyingTheFullAssemblyName()
+        {
+            string stringType = typeof(string).AssemblyQualifiedName;
+            Type t = GetTypeResolver().Resolve(stringType);
+            Assert.AreEqual(typeof(string), t);
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/aliasedObjects.xml b/test/Spring/Spring.Core.Tests/Core/TypeResolution/aliasedObjects.xml
new file mode 100644
index 00000000..7c826c49
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/aliasedObjects.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+
+<objects xmlns="http://www.springframework.net">
+ 
+  <object id="aliasedType" type="Foo">
+      <property name="Bar" value="Bar"/>
+  </object>
+  
+</objects>		
diff --git a/test/Spring/Spring.Core.Tests/CoreExceptionTests.cs b/test/Spring/Spring.Core.Tests/CoreExceptionTests.cs
new file mode 100644
index 00000000..47d84c23
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/CoreExceptionTests.cs
@@ -0,0 +1,45 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring
+{
+    /// <summary>
+    /// Unit tests for all of the exception classes in the Spring.Core library...
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: CoreExceptionTests.cs,v 1.3 2007/01/03 06:27:43 aseovic Exp $</version>
+    [TestFixture]
+    public sealed class CoreExceptionTests : ExceptionsTest
+    {
+        [TestFixtureSetUp]
+        public void FixtureSetUp()
+        {
+            AssemblyToCheck = Assembly.GetAssembly(typeof (ObjectsException));
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/PathMatcher/EmptyPattern.test b/test/Spring/Spring.Core.Tests/Data/PathMatcher/EmptyPattern.test
new file mode 100644
index 00000000..62820826
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/PathMatcher/EmptyPattern.test
@@ -0,0 +1,14 @@
+--pattern--
+
+--match--
+c:/spring/service/deploy/app/db/foo.db
+c:/spring/service/deploy/app/spaced dir/db/foo.db
+c:/spring/service/deploy/app/db/backup/foo
+c:/spring/service/deploy/app/ab/backup/foo
+//server/share/service/deploy/app/db/backup/foo
+
+## Bug fix
+--pattern--
+C:\Documents and Settings\fede\Desktop\Spring.Net\build\VS.Net\Spring.Services.WindowsService.Process\Debug\deploy\copia di cassini/**
+--match--
+C:\Documents and Settings\fede\Desktop\Spring.Net\build\VS.Net\Spring.Services.WindowsService.Process\Debug\deploy\copia di cassini\service.xml
diff --git a/test/Spring/Spring.Core.Tests/Data/PathMatcher/Examples.test b/test/Spring/Spring.Core.Tests/Data/PathMatcher/Examples.test
new file mode 100644
index 00000000..a2863e6d
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/PathMatcher/Examples.test
@@ -0,0 +1,128 @@
+# <examples>
+
+## <example name="">
+## <pattern>
+## </pattern>
+## <match>
+## </match>
+## <dont.match>
+## </dont.match>
+## </example>
+
+# <example name="filename">
+# <pattern>
+foo?bar.*
+# </pattern>
+# <match>
+fooAbar.txt
+foo1bar.txt
+foo_bar.txt
+foo-bar.txt
+# </match>
+# <dont.match>
+foo.bar.txt
+foo/bar.txt
+foo\bar.txt
+# </dont.match>
+# </example>
+
+# <example name="filename-all">
+# <pattern>
+*.*
+# </pattern>
+# <match>
+foo.db
+.db
+foo
+foo.bar.db
+foo.db.db
+db.db.db
+# </match>
+# <dont.match>
+c:/
+c:/foo.db
+c:/foo
+c:/.db
+c:/foo.foo.db
+//server/foo
+# </dont.match>
+# </example>
+
+# <example name="slashes">
+# <pattern>
+spring/foo.bar
+# </pattern>
+# <match>
+c:\spring\foo.bar
+c:/spring\foo.bar
+c:/spring/foo.bar
+/spring/foo.bar
+\spring\foo.bar
+# </match>
+# <dont.match>
+# </dont.match>
+# </example>
+
+# <example name="case-sensitive">
+# <pattern>
+**/db/**/*.DB
+# </pattern>
+# <match>
+c:/spring/service/deploy/app/db/foo.DB
+# </match>
+# <dont.match>
+c:/spring/service/deploy/app/DB/foo.DB
+c:spring/service/deploy/app/spaced dir/DB/foo.DB
+//server/share/service/deploy/app/DB/backup/foo.db
+# </dont.match>
+# </example>
+
+# <example name="double-subdir">
+# <pattern>
+**/bin/**/tmp/**
+# </pattern>
+# <match>
+c:/spring/foo/bin/bar/tmp/a
+c:/spring/foo/bin/tmp/a/b.c
+# </match>
+# <dont.match>
+c:/spring/foo/bin/bar/temp/a
+c:/tmp/foo/bin/bar/a/b.c
+# </dont.match>
+# </example>
+
+# <example name="subdir">
+# <pattern>
+**/db/**
+# </pattern>
+# <match>
+/db
+//server/db
+c:/db
+c:/spring/app/db/foo.db
+//Program Files/App/spaced dir/db/foo.db
+/home/spring/spaced dir/db/v1/foo.db
+# </match>
+# <dont.match>
+c:/spring/app/db-v1/foo.db
+/home/spring/spaced dir/db-v1/foo.db
+# </dont.match>
+# </example>
+
+# <example name="subdir-2">
+# <pattern>
+**/.spring-assemblies*/**
+# </pattern>
+# <match>
+c:/.spring-assemblies
+c:/.spring-assembliesabcd73xs
+c:/app/.spring-assembliesabcd73xs
+c:/app/.spring-assembliesabcd73xs/foo.dll
+//server/app/.spring-assembliesabcd73xs
+# </match>
+# <dont.match>
+c:/app/.spring-assemblie
+# </dont.match>
+# </example>
+
+# </examples>
diff --git a/test/Spring/Spring.Core.Tests/Data/PathMatcher/InBetween.test b/test/Spring/Spring.Core.Tests/Data/PathMatcher/InBetween.test
new file mode 100644
index 00000000..2cb6ba3d
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/PathMatcher/InBetween.test
@@ -0,0 +1,64 @@
+# <examples>
+# <example name="subdirs">
+--pattern--
+# <pattern>
+**/db/**/*.db
+# </pattern>
+--match--
+# <match>
+c:/spring/service/deploy/app/db/foo.db
+c:/spring/service/deploy/app/spaced dir/db/foo.db
+# </match>
+--dont-match--
+# <dont.match>
+c:/spring/service/deploy/app/db/backup/foo
+c:/spring/service/deploy/app/ab/backup/foo
+//server/share/service/deploy/app/db/backup/foo
+# </dont.match>
+# </example>
+
+--pattern--
+**/app/db/**/*.db
+--match--
+c:/spring/service/deploy/app/db/foo.db
+--dont-match--
+c:/spring/service/deploy/app/spaced dir/db/foo.db
+c:/spring/service/deploy/app/db/backup/foo
+c:/spring/service/deploy/app/ab/backup/foo
+//server/share/service/deploy/app/db/backup/foo
+
+--pattern--
+**/app/db/**
+--match--
+c:/spring/service/deploy/app/db/foo.db
+c:/spring/service/deploy/app/db/backup/foo
+//server/share/service/deploy/app/db/backup/foo
+c:/spring/service/deploy/app/db
+--dont-match--
+c:/spring/service/deploy/app/spaced dir/db/foo.db
+c:/spring/service/deploy/app/ab/backup/foo
+c:/spring/service/deploy/application/spaced dir/db/foo.db
+
+--pattern--
+**/*b/**
+--match--
+c:/spring/service/deploy/app/db/foo.db
+c:/spring/service/deploy/app/db/backup/foo
+//server/share/service/deploy/app/db/backup/foo
+c:/spring/service/deploy/app/spaced dir/db/foo.db
+c:/spring/service/deploy/app/ab/backup/foo
+c:/spring/service/deploy/app/db
+
+--pattern--
+**/app/*b/**
+--match--
+c:/spring/service/deploy/app/db/foo.db
+c:/spring/service/deploy/app/db/backup/foo
+//server/share/service/deploy/app/db/backup/foo
+c:/spring/service/deploy/app/ab/backup/foo
+c:/spring/service/deploy/app/db
+--dont-match--
+c:/spring/service/deploy/app/spaced dir/db/foo.db
+c:/spring/service/deploy/application/spaced dir/db/foo.db
+
+# </examples>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/PathMatcher/MatchAll.test b/test/Spring/Spring.Core.Tests/Data/PathMatcher/MatchAll.test
new file mode 100644
index 00000000..37d17c1d
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/PathMatcher/MatchAll.test
@@ -0,0 +1,20 @@
+--pattern--
+**/**
+--match--
+c:/spring/service/deploy/app/db/foo.db
+c:/spring/service/deploy/app/db/backup/foo
+//server/share/service/deploy/app/db/backup/foo
+
+--pattern--
+**/**/**
+--match--
+c:/spring/service/deploy/app/db/foo.db
+c:/spring/service/deploy/app/db/backup/foo
+//server/share/service/deploy/app/db/backup/foo
+
+--pattern--
+**/*.*
+--match--
+c:/spring/service/deploy/app/db/foo.db
+c:/spring/service/deploy/app/db/backup/foo
+//server/share/service/deploy/app/db/backup/foo
diff --git a/test/Spring/Spring.Core.Tests/Data/PathMatcher/PatternsAreCaseSensitive.test b/test/Spring/Spring.Core.Tests/Data/PathMatcher/PatternsAreCaseSensitive.test
new file mode 100644
index 00000000..3027f242
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/PathMatcher/PatternsAreCaseSensitive.test
@@ -0,0 +1,30 @@
+--pattern--
+**/DB/**/*.db
+--match--
+c:/spring/service/deploy/app/DB/foo.db
+c:/spring/service/deploy/app/spaced dir/DB/foo.db
+--dont-match--
+c:/spring/service/deploy/app/db/foo.DB
+c:/spring/service/deploy/app/DB/foo.DB
+c:/spring/service/deploy/app/db/backup/foo
+//server/share/service/deploy/app/db/backup/foo
+
+--pattern--
+**/db/**/*.DB
+--match--
+c:/spring/service/deploy/app/db/foo.DB
+--dont-match--
+c:/spring/service/deploy/app/DB/foo.DB
+c:/spring/service/deploy/app/DB/backup/foo
+c:/spring/service/deploy/app/spaced dir/DB/foo.DB
+//server/share/service/deploy/app/DB/backup/foo
+
+--pattern--
+**/DB/**/*.DB
+--match--
+c:/spring/service/deploy/app/DB/foo.DB
+c:/spring/service/deploy/app/spaced dir/DB/foo.DB
+--dont-match--
+c:/spring/service/deploy/app/db/foo.DB
+c:/spring/service/deploy/app/DB/backup/foo
+//server/share/service/deploy/app/DB/backup/foo
diff --git a/test/Spring/Spring.Core.Tests/Data/PathMatcher/SingleCaracters.test b/test/Spring/Spring.Core.Tests/Data/PathMatcher/SingleCaracters.test
new file mode 100644
index 00000000..eb362d3f
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/PathMatcher/SingleCaracters.test
@@ -0,0 +1,21 @@
+#
+# this is a comment line for the test
+#
+--pattern--
+**/a??/db/**
+--match--
+c:/spring/service/deploy/app/db/foo.db
+c:/spring/service/deploy/app/db/backup/foo
+//server/share/service/deploy/app/db/backup/foo
+--dont-match--
+c:/spring/service/deploy/app/spaced dir/db/foo.db
+c:/spring/service/deploy/app/ab/backup/foo
+c:/spring/service/deploy/application/ab/backup/foo
+
+--pattern--
+c:\fo?\*.bat
+--match--
+c:/fo1/autoexec.bat
+--dont-match--
+c:/fo/autoexec.bat
+c:/foob/autoexec.bat
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/PathMatcher/SlurpPrependedDirectories.test b/test/Spring/Spring.Core.Tests/Data/PathMatcher/SlurpPrependedDirectories.test
new file mode 100644
index 00000000..08fd8199
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/PathMatcher/SlurpPrependedDirectories.test
@@ -0,0 +1,94 @@
+--pattern--
+**/db/**
+--match--
+/db
+//server/db
+c:/db
+c:/spring/service/deploy/app/db/foo
+c:/spring/service/deploy/app/db/foo.db
+c:/spring/service/deploy/app/spaced dir/db
+c:/spring/service/deploy/app/db/backup/foo
+--dont-match--
+c:/spring/service/deploy/app/adb/foo.db
+c:/spring/service/deploy/app/dba/foo.db
+c:/spring/service/deploy/app/adba/foo.db
+
+--pattern--
+c:/bin/**/*.*
+--match--
+c:/bin/foo/foo.log
+--dont-match--
+c:/bar/bin/foo.log
+
+--pattern--
+c:/**/bin/**/*.*
+--match--
+c:/bin/foo/foo.log
+c:/bar/bin/foo.log
+
+--pattern--
+**/db*/**
+--match--
+/db
+//server/db
+c:/db
+c:/spring/service/deploy/app/db/foo
+c:/spring/service/deploy/app/db/foo.db
+c:/spring/service/deploy/app/spaced dir/db
+c:/spring/service/deploy/app/db/backup/foo
+c:/spring/service/deploy/app/dba/foo.db
+--dont-match--
+c:/spring/service/deploy/app/adba/foo.db
+c:/spring/service/deploy/app/adb/foo.db
+
+--pattern--
+**/*db*/**
+--match--
+/db
+//server/db
+c:/db
+c:/spring/service/deploy/app/db/foo
+c:/spring/service/deploy/app/db/foo.db
+c:/spring/service/deploy/app/spaced dir/db
+c:/spring/service/deploy/app/db/backup/foo
+c:/spring/service/deploy/app/dba/foo.db
+c:/spring/service/deploy/app/adba/foo.db
+c:/spring/service/deploy/app/adb/foo.db
+--dont-match--
+x:/qwrty/zxpv
+
+--pattern--
+**/db/foo
+--match--
+c:/spring/service/deploy/app/db/foo
+--dont-match--
+c:/spring/service/deploy/app/db/foo.db
+c:/spring/service/deploy/app/spaced dir/db/foo.db
+c:/spring/service/deploy/app/db/backup/foo
+//server/share/service/deploy/app/db/backup/foo
+
+--pattern--
+**/*.log
+--match--
+c:/spring/service/deploy/app/db/foo.log
+c:/foo.log
+c:/foolog.log
+c:/foo.bar.log
+c:/foo.log.log
+--dont-match--
+c:/foo.db
+c:/foo.log.db
+
+--pattern--
+**/fo?.log
+--match--
+c:/spring/service/deploy/app/db/foo.log
+c:/foo.log
+--dont-match--
+c:/foo.db
+c:/foo.log.db
+c:/fo.log
+c:/orfo.log
+c:/foolog.log
+c:/foo.bar.log
+c:/foo.log.log
diff --git a/test/Spring/Spring.Core.Tests/Data/PathMatcher/SpringAssembliesPrefix.test b/test/Spring/Spring.Core.Tests/Data/PathMatcher/SpringAssembliesPrefix.test
new file mode 100644
index 00000000..9bf763af
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/PathMatcher/SpringAssembliesPrefix.test
@@ -0,0 +1,11 @@
+--pattern--
+**/.spring-assemblies*/**
+--match--
+c:/.spring-assembliesabcd73xs
+c:/app/.spring-assembliesabcd73xs
+c:/app/.spring-assembliesabcd73xs/foo.dll
+//server/app/.spring-assembliesabcd73xs
+--dont-match--
+c:/spring/service/deploy/app/db/backup/foo
+c:/spring/service/deploy/app/ab/backup/foo
+//server/share/service/deploy/app/db/backup/foo
diff --git a/test/Spring/Spring.Core.Tests/Data/PathMatcher/ThisDirectory.test b/test/Spring/Spring.Core.Tests/Data/PathMatcher/ThisDirectory.test
new file mode 100644
index 00000000..b754fa77
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/PathMatcher/ThisDirectory.test
@@ -0,0 +1,39 @@
+--pattern--
+*.*
+--match--
+foo.db
+.db
+foo
+foo.bar.db
+foo.db.db
+db.db.db
+--dont-match--
+c:/foo.db
+c:/foo
+c:/.db
+c:/foo.foo.db
+c:/
+d:/spring/service/deploy/app/db/foo.db
+d:/spring/service/deploy/app/spaced dir/db/foo.db
+d:/spring/service/deploy/app/db/backup/foo
+d:/spring/service/deploy/app/ab/backup/foo
+//server/share/service/deploy/app/db/backup/foo
+
+
+--pattern--
+c:/*.db
+--match--
+c:/foo.db
+c:/foo.foo.db
+c:/.db
+c:/.foo.db
+--dont-match--
+c:/
+c:/foo.db.foo
+c:/.db.foo
+c:/foo/bar.db
+d:/spring/service/deploy/app/db/foo.db
+d:/spring/service/deploy/app/spaced dir/db/foo.db
+d:/spring/service/deploy/app/db/backup/foo
+d:/spring/service/deploy/app/ab/backup/foo
+//server/share/service/deploy/app/db/backup/foo
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Context/Support/SPRNET-192.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Context/Support/SPRNET-192.xml
new file mode 100644
index 00000000..035714e7
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Context/Support/SPRNET-192.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	<object name="log" type="Spring.Objects.Factory.Config.LogFactoryObject, Spring.Core">
+		<property name="logName">
+			<value>${log}</value>
+		</property>
+	</object>
+	<object name="appConfigPropertyHolder" type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core">
+		<property name="IgnoreResourceNotFound" value="true" />
+		<property name="properties">
+			<name-values>
+				<add key="log" value="foo" />
+			</name-values>
+		</property>
+	</object>
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/AnotherDaoConfig.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/AnotherDaoConfig.xml
new file mode 100644
index 00000000..ad89d3d6
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/AnotherDaoConfig.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<configSections>
+		<section name="DaoConfiguration" type="System.Configuration.NameValueSectionHandler, System" />
+	</configSections>
+	<!-- intended to be merged with DaoConfig.xml that contains same configuration section name -->
+	<!-- the value should be added or not depending on the PropertyResourceConfigurer Append property -->
+	<DaoConfiguration>
+		<add key="connection.string" value="Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=Ernie;"/>
+	</DaoConfiguration>
+</configuration>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/DaoConfig.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/DaoConfig.xml
new file mode 100644
index 00000000..2d9a1861
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/DaoConfig.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<configSections>
+		<section name="DaoConfiguration" type="System.Configuration.NameValueSectionHandler, System" />
+	</configSections>
+	<!-- intended to be merged with App.config that contains same configuration section name -->
+	<!-- but with the maxresults key-value pair -->
+	<DaoConfiguration>
+	        <add key="connection.string" value="Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=;"/>
+	</DaoConfiguration>
+</configuration>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/DatabaseConfig.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/DatabaseConfig.xml
new file mode 100644
index 00000000..e519cf1e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/DatabaseConfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<configuration> 
+
+  <DatabaseConfiguration>
+
+    <add key="connection.string" value="Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=Ernie;"/>
+  </DatabaseConfiguration>
+    
+</configuration>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPC-SPRNET-55.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPC-SPRNET-55.xml
new file mode 100644
index 00000000..6fec83b4
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPC-SPRNET-55.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright © 2002-2005 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.
+-->
+<objects xmlns="http://www.springframework.net" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	<object name="myConnection" type="System.Data.OleDb.OleDbConnection, System.Data"> 
+		<property name="connectionstring">
+			<value>${connection.string}</value>
+		</property>
+	</object>
+	<!-- SPRNET-55 -->
+	<!-- append case -->
+	<object name="appendDao" type="Spring.Objects.TestObjectDAO, Spring.Core.Tests ">
+		<property name="maxResults" value="${maxResults}"/>
+		<property name="dbConnection" ref="myConnection"/>
+	</object>
+	<object name="appendConfigurer" type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core">
+		<property name="lastLocationOverrides" value="false"/>
+		<property name="locations">
+			<list>
+				<value>config://</value>
+				<value>file://Spring/Objects/Factory/Config/DaoConfig.xml</value>
+				<value>file://Spring/Objects/Factory/Config/AnotherDaoConfig.xml</value>
+			</list>
+		</property>
+		<property name="configSections" value="DaoConfiguration"/>
+	</object>
+	<!-- no append case -->
+	<object name="noAppendDao" type="Spring.Objects.TestObjectDAO, Spring.Core.Tests ">
+		<property name="maxResults" value="${maxResults}"/>
+		<property name="dbConnection" ref="myConnection"/>
+	</object>
+	<object name="noAppendConfigurer" type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core">
+		<property name="locations">
+			<list>
+				<value>config://</value>
+				<value>file://Spring/Objects/Factory/Config/DaoConfig.xml</value>
+				<value>file://Spring/Objects/Factory/Config/AnotherDaoConfig.xml</value>
+			</list>
+		</property>
+		<property name="configSections" value="DaoConfiguration"/>
+	</object>
+	<!-- SPRNET-55 -->
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPCTwoLocationsOneSectionTests.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPCTwoLocationsOneSectionTests.xml
new file mode 100644
index 00000000..56c7a129
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPCTwoLocationsOneSectionTests.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2004 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.
+-->
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+    
+
+        <object name="testObjectDao" type="Spring.Objects.TestObjectDAO, Spring.Core.Tests ">
+          <property name="maxResults"><value>${maxResults}</value></property>
+          <property name="dbConnection"><ref object="myConnection"/></property>
+        </object>
+    
+        <object name="myConnection" type="System.Data.OleDb.OleDbConnection, System.Data"> 
+          <property name="connectionstring"> 
+            <value>${connection.string}</value> 
+          </property> 
+        </object>
+        
+        <object name="appConfigPropertyHolder" 
+               type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core">
+          <property name="locations">
+            <list>
+              <value>config://</value>
+              <value>file://Spring/Objects/Factory/Config/DaoConfig.xml</value>
+            </list>
+          </property>
+          <property name="configSections">          
+            <value>DaoConfiguration</value>                              
+          </property>
+        </object>
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPCTwoLocationsTwoSectionsTests.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPCTwoLocationsTwoSectionsTests.xml
new file mode 100644
index 00000000..b107cca2
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPCTwoLocationsTwoSectionsTests.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2004 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.
+-->
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+    
+
+        <object name="testObjectDao" type="Spring.Objects.TestObjectDAO, Spring.Core.Tests ">
+          <property name="maxResults"><value>${maxResults}</value></property>
+          <property name="dbConnection"><ref object="myConnection"/></property>
+        </object>
+    
+        <object name="myConnection" type="System.Data.OleDb.OleDbConnection, System.Data"> 
+          <property name="connectionstring"> 
+            <value>${connection.string}</value> 
+          </property> 
+        </object>
+        
+        <object name="appConfigPropertyHolder" 
+               type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core">
+          <property name="locations">
+            <list>
+              <value>config://</value>
+              <value>file://Spring/Objects/Factory/Config/DatabaseConfig.xml</value>
+            </list>
+          </property>
+          <property name="configSections">          
+            <value>DaoConfiguration,DatabaseConfiguration</value>                              
+          </property>
+        </object>
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPCWithTypesTests.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPCWithTypesTests.xml
new file mode 100644
index 00000000..731cdff2
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPCWithTypesTests.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2004 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.
+-->
+<objects xmlns="http://www.springframework.net">
+
+  <object name="testObject" type="${objectType}">
+    <property name="Pets">
+      <list element-type="${listElementType}">
+        <value>Gribouille</value>
+        <value>Blutch</value>
+      </list>
+    </property>
+    <property name="PeriodicTable">
+      <dictionary key-type="${dictionaryKeyType}" value-type="${dictionaryValueType}">
+        <entry key="C" value="carbon"/>
+        <entry key="O" value="oxygen"/>        
+      </dictionary>
+    </property>
+    <property name="Computers">
+      <set element-type="${setElementType}">
+        <value>mine</value>
+        <value>your</value>
+      </set>
+    </property>
+  </object>
+
+  <object type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core">
+    <property name="properties">
+      <name-values>
+        <add key="objectType" value="Spring.Objects.TestObject, Spring.Core.Tests" />
+        <add key="listElementType" value="string" />
+        <add key="dictionaryKeyType" value="string" />
+        <add key="dictionaryValueType" value="string" />
+        <add key="setElementType" value="string" />
+      </name-values>
+    </property>
+  </object>
+  
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.xml
new file mode 100644
index 00000000..ffbe0665
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2004 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.
+-->
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+    
+
+        <object name="testObjectDao" type="Spring.Objects.TestObjectDAO, Spring.Core.Tests ">
+          <property name="maxResults"><value>${maxResults}</value></property>
+          <property name="dbConnection"><ref object="myConnection"/></property>
+        </object>
+    
+        <object name="myConnection" type="System.Data.OleDb.OleDbConnection, System.Data"> 
+          <property name="connectionstring"> 
+            <value>${connection.string}</value> 
+          </property> 
+        </object>
+        
+        <object name="appConfigPropertyHolder" 
+               type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core">          
+          <property name="configSections">          
+            <value>DaoConfiguration,DatabaseConfiguration</value>                              
+          </property>                     
+        </object>
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PropertyResourceConfigurerTests.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PropertyResourceConfigurerTests.xml
new file mode 100644
index 00000000..0b687a98
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PropertyResourceConfigurerTests.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+	<object id="OverrideConfigurer" type="Spring.Objects.Factory.Config.PropertyOverrideConfigurer">
+		<property name="Properties">
+			<name-values>
+				<add key="Test2.Name" value="Overriden Name"/>
+			</name-values>
+		</property>
+	</object>
+	
+	<object id="PlaceholderConfigurer" type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer">
+		<property name="Properties">
+			<name-values>
+				<add key="DefaultName" value="DefName"/>
+			</name-values>
+		</property>
+	</object>
+	
+	<object id="Test1" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name">
+      <value>A ${DefaultName}</value>
+    </property>
+  </object>
+	
+	<object id="Test2" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name">
+      <value>Start Name</value>
+    </property>
+  </object>
+	
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/TypeAliases.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/TypeAliases.xml
new file mode 100644
index 00000000..6f905130
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/TypeAliases.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <object type="Spring.Objects.Factory.Config.TypeAliasConfigurer">
+    <property name="TypeAliases">
+      <dictionary>
+        <entry key="TestObject" value="Spring.Objects.TestObject, Spring.Core.Tests" />
+      </dictionary>
+    </property>
+  </object>
+
+  <object id="testObject1" type="TestObject"/>
+
+  <object id="baseTestObject" type="TestObject" abstract="true"/>
+  <object id="testObject2" parent="baseTestObject"/>
+
+  <object id="testObject3" type="TestObject">
+    <constructor-arg name="name" value="Bruno"/>
+    <constructor-arg name="age" value="26"/>
+  </object>
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/one.properties b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/one.properties
new file mode 100644
index 00000000..e9414362
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/one.properties
@@ -0,0 +1,2 @@
+name=Aleks Seovic
+age=32
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/two.properties b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/two.properties
new file mode 100644
index 00000000..a32a1994
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/two.properties
@@ -0,0 +1,2 @@
+name=Aleksandar Seovic
+family=Marija,Ana,Nadja
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/Resources/resource-imports.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/Resources/resource-imports.xml
new file mode 100644
index 00000000..a83af33e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/Resources/resource-imports.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+    <object id="rick" type="Spring.Objects.TestObject, Spring.Core.Tests">
+        <property name="name">
+            <value>Rick</value>
+        </property>
+    </object>
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/abstract.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/abstract.xml
new file mode 100644
index 00000000..815d854b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/abstract.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd"">
+    <object id="myAbstract" abstract="true" type="Spring.Objects.TestObject, Spring.Core.Tests" />
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/autowire.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/autowire.xml
new file mode 100644
index 00000000..14fdf8fa
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/autowire.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="rod1" type="Spring.Objects.Factory.XmlDependenciesObject, Spring.Core.Tests"
+      autowire="byType"
+      dependency-check="objects">
+		<!-- Should pick up spouse automatically --></object>
+	
+  <object id="rod1a" type="Spring.Objects.Factory.XmlDependenciesObject, Spring.Core.Tests"
+      autowire="autodetect"
+      dependency-check="objects">
+		<!-- Should pick up spouse automatically --></object>
+	
+  <object id="rod2" type="Spring.Objects.Factory.XmlDependenciesObject, Spring.Core.Tests"
+      autowire="byName"
+      dependency-check="objects">
+		<!-- Should pick up spouse automatically --></object>
+	
+  <object id="rod3" type="Spring.Objects.Factory.XmlConstructorDependenciesObject, Spring.Core.Tests"
+      autowire="constructor"
+      dependency-check="objects">
+		<!-- Should pick up spouse automatically --></object>
+	
+  <object id="rod3a" type="Spring.Objects.Factory.XmlConstructorDependenciesObject, Spring.Core.Tests"
+      autowire="autodetect"
+      dependency-check="objects">
+		<!-- Should pick up spouse automatically --></object>
+	
+  <object id="rod4" type="Spring.Objects.Factory.XmlConstructorDependenciesObject, Spring.Core.Tests"
+      singleton="false"
+      dependency-check="objects">
+		<!-- Should not pick up spouse automatically --></object>
+	
+  <object id="rod5" type="Spring.Objects.Factory.XmlDependenciesObject, Spring.Core.Tests"
+      singleton="false"
+      autowire="constructor">
+		<!-- Should pick up spouse automatically --></object>
+	
+  <object id="other" type="Spring.Objects.IndexedTestObject, Spring.Core.Tests"/>
+	
+  <object id="parentAppCtx" type="org.springframework.context.support.ClassPathXmlApplicationContext, Spring.Core.Tests">
+    <constructor-arg>
+      <value>/Spring.Objects/Factory.Xmlcollections.xml</value>
+    </constructor-arg>
+  </object>
+	
+  <object id="childAppCtx" type="org.springframework.context.support.ClassPathXmlApplicationContext, Spring.Core.Tests">
+    <constructor-arg>
+      <list>
+        <value>/Spring.Objects/Factory.Xmlconstructor-arg.xml</value>
+        <value>/Spring.Objects/Factory.Xmlinitializers.xml</value>
+      </list>
+    </constructor-arg>
+    <constructor-arg>
+      <ref object="parentAppCtx"/>
+    </constructor-arg>
+  </object>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/bad-external-resources.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/bad-external-resources.xml
new file mode 100644
index 00000000..a2aa53b4
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/bad-external-resources.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+    <!-- doesn't exist, so test must bail -->
+    <import resource="jarv/malina.roper" />
+    <object id="something" type="Spring.Objects.TestObject, Spring.Core.Tests">
+        <property name="name">
+            <value>Summat</value>
+        </property>
+    </object>
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/bad-named-constructor-arg.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/bad-named-constructor-arg.xml
new file mode 100644
index 00000000..2e03c6aa
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/bad-named-constructor-arg.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="bothNamedAndIndexedOnSameCtorArg" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <constructor-arg name="name" index="0">
+      <value>Isaac Newton</value>
+    </constructor-arg>
+    <constructor-arg name="age" index="1">
+      <value>87</value>
+    </constructor-arg>
+  </object>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/child.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/child.xml
new file mode 100644
index 00000000..80fd52f7
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/child.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="inheritsFromParentFactory"
+      parent="inheritedTestObject">
+    <property name="name">
+      <value>override</value>
+    </property>
+		<!-- age should inherit value of 1 from parent -->
+  </object>
+	
+  <object id="protoypeInheritsFromParentFactorySingleton"
+      parent="inheritedTestObject"
+      singleton="false">
+    <property name="name">
+      <value>prototypeOverridesInheritedSingleton</value>
+    </property>
+		<!-- age should inherit value of 1 from parent -->
+  </object>
+	
+  <object id="prototypeInheritsFromParentFactoryPrototype"
+      parent="inheritedTestObjectPrototype"
+      singleton="false">
+    <property name="name">
+      <value>prototype-override</value>
+    </property>
+		<!-- age should inherit value of 2 from parent -->
+  </object>
+	
+  <object id="singletonInheritsFromParentFactoryPrototype"
+      parent="inheritedTestObjectPrototype"
+      singleton="true">
+    <property name="name">
+      <value>prototype-override</value>
+    </property>
+		<!-- age should inherit value of 2 from parent -->
+  </object>
+	
+  <object id="inheritedTestObject" parent="inheritedTestObject">
+    <property name="name">
+      <value>overrideParentObject</value>
+    </property>
+		<!-- age should inherit value of 1 from parent -->
+  </object>
+	
+  <object id="bogusParent"
+      parent="bogus"
+      singleton="false"></object>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/classnotfound.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/classnotfound.xml
new file mode 100644
index 00000000..4b43cd02
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/classnotfound.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="classNotFound" type="Spring.Objects.TestObject, Spring.Core.Tests"/>
+
+</objects>		
+	
+	
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collections.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collections.xml
new file mode 100644
index 00000000..b0ff4f72
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collections.xml
@@ -0,0 +1,549 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<objects xmlns="http://www.springframework.net">
+	<description>
+		Tests for list and map handling in an XML object definition file.
+	</description>
+	<object id="mapWithStringKeysSpecifiedAsElements" type="Spring.Objects.Factory.Config.DictionaryFactoryObject, Spring.Core">
+		<property name="SourceDictionary">
+			<dictionary>
+				<entry>
+					<key> 
+						<value>rick</value>
+					</key>
+					<value>Rick Evans</value>
+				</entry>
+				<entry>
+					<key>
+						<value>uncleelvis</value>
+					</key>
+					<value>Elvis Orten</value>
+				</entry>
+			</dictionary>
+		</property>
+	</object>
+	<object id="mapWithKeyRefAttributeShortcuts"
+		type="Spring.Objects.Factory.Config.DictionaryFactoryObject, Spring.Core">
+		<property name="SourceDictionary">
+			<dictionary>
+				<entry key-ref="rick">
+					<value>Rick Evans</value>
+				</entry>
+				<entry key-ref="uncleelvis">
+					<value>Elvis Orten</value>
+				</entry>
+			</dictionary>
+		</property>
+	</object>
+	<object id="mapWithNonStringKeys" type="Spring.Objects.Factory.Config.DictionaryFactoryObject, Spring.Core">
+		<property name="SourceDictionary">
+			<dictionary>
+				<entry>
+					<key>
+						<ref local="rick"/>
+					</key>
+					<value>Rick Evans</value>
+				</entry>
+				<entry>
+					<key>
+						<ref local="uncleelvis"/>
+					</key>
+					<value>Elvis Orten</value>
+				</entry>
+			</dictionary>
+		</property>
+	</object>
+	<object id="validEmptyWithDescription" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<description>
+			I have no properties and I'm happy without them. 
+		</description>
+	</object>
+	<object id="readOnlyDictionary" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="periodicTable">
+			<dictionary>
+				<entry key="hydrogen">
+					<value>1</value>
+				</entry>
+				<entry key="carbon">
+					<value>12</value>
+				</entry>
+			</dictionary>
+		</property>
+	</object>
+	<object id="readOnlySet" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name">
+			<value>Mark</value>
+		</property>
+		<property name="age">
+			<value>35</value>
+		</property>
+		<property name="computers">
+			<set>
+				<value>Dell</value>
+				<value>IBM T41</value>
+			</set>
+		</property>
+	</object>
+	<object id="aleks" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name">
+			<value>Aleks</value>
+		</property>
+		<property name="age">
+			<value>30</value>
+		</property>
+		<property name="pets">
+			<list>
+				<value>Nadja</value>
+			</list>
+		</property>
+	</object>
+	<object id="jenny" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name">
+			<value>Jenny</value>
+		</property>
+		<property name="age">
+			<value>30</value>
+		</property>
+		<property name="spouse">
+			<ref local="david" />
+		</property>
+	</object>
+	<object id="david" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<description>
+			Simple object, without any collections.
+		</description>
+		<property name="name">
+			<description>The name of the user</description>
+			<value>David</value>
+		</property>
+		<property name="age">
+			<value>27</value>
+		</property>
+	</object>
+	<object id="rod" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name">
+			<value>Rod</value>
+		</property>
+		<property name="age">
+			<value>32</value>
+		</property>
+		<property name="friends">
+			<description>List of Rod's friends</description>
+			<list>
+				<ref local="jenny" />
+				<ref local="david" />
+			</list>
+		</property>
+	</object>
+	<object id="pJenny" type="Spring.Objects.TestObject, Spring.Core.Tests" singleton="false">
+		<property name="name">
+			<value>Jenny</value>
+		</property>
+		<property name="age">
+			<value>30</value>
+		</property>
+		<property name="spouse">
+			<ref local="david" />
+		</property>
+	</object>
+	<object id="pDavid" type="Spring.Objects.TestObject, Spring.Core.Tests" singleton="false">
+		<property name="name">
+			<value>David</value>
+		</property>
+		<property name="age">
+			<value>27</value>
+		</property>
+	</object>
+	<object id="pRod" type="Spring.Objects.TestObject, Spring.Core.Tests" singleton="false">
+		<property name="name">
+			<value>Rod</value>
+		</property>
+		<property name="age">
+			<value>32</value>
+		</property>
+		<property name="friends">
+			<list>
+				<ref local="pJenny" />
+				<ref local="pDavid" />
+			</list>
+		</property>
+	</object>
+	<object id="loner" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name">
+			<value>loner</value>
+		</property>
+		<property name="age">
+			<value>26</value>
+		</property>
+		<property name="friends">
+			<list>
+				<ref local="david" />
+			</list>
+		</property>
+	</object>
+	<object id="jumble" type="Spring.Objects.Factory.Xml.MixedCollectionObject, Spring.Core.Tests">
+		<property name="jumble">
+			<list>
+				<ref local="david" />
+				<value>literal</value>
+				<ref local="jenny" />
+				<idref local="rod" />
+			</list>
+		</property>
+	</object>
+	
+
+	<object id="objectWithIndexer" type="Spring.Objects.TestObject, Spring.Core.Tests">	 
+	    <property name="[0]" value="my string value"/>	    
+	</object>
+
+	
+	<object id="objectWithTypedFriends" type="Spring.Objects.TestObject, Spring.Core.Tests">
+	    <property name="TypedFriends">
+	       <list>
+	            <ref local="david"/>
+	       </list>
+	    </property>
+	</object>
+	
+	<object id="verbose" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name">
+			<value>verbose</value>
+		</property>
+	</object>
+	<object id="verbose2" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name">
+			<idref local="verbose" />
+		</property>
+	</object>
+	<object id="verbose3" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name">
+			<idref object="verbose" />
+		</property>
+	</object>
+	<object id="aliased" type="Spring.Objects.TestObject, Spring.Core.Tests" name="myalias">
+		<property name="name">
+			<value>aliased</value>
+		</property>
+	</object>
+	<object id="multiAliased" type="Spring.Objects.TestObject, Spring.Core.Tests" name="alias1,alias2">
+		<property name="name">
+			<value>aliased</value>
+		</property>
+	</object>
+	<object type="Spring.Objects.TestObject, Spring.Core.Tests" name="aliasWithoutId1,aliasWithoutId2,aliasWithoutId3">
+		<property name="name">
+			<value>aliased</value>
+		</property>
+	</object>
+	<object type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name">
+			<null />
+		</property>
+	</object>
+	<object id="emptyMap" type="Spring.Objects.Factory.HasMap, Spring.Core.Tests">
+		<property name="map">
+			<dictionary></dictionary>
+		</property>
+	</object>
+	<object id="literalMap" type="Spring.Objects.Factory.HasMap, Spring.Core.Tests">
+		<property name="map">
+			<dictionary>
+				<entry key="foo">
+					<value>bar</value>
+				</entry>
+				<entry key="fi">
+					<value>fum</value>
+				</entry>
+				<entry key="fa">
+					<null />
+				</entry>
+			</dictionary>
+		</property>
+	</object>
+	<object id="mixedMap" type="Spring.Objects.Factory.HasMap, Spring.Core.Tests">
+		<property name="map">
+			<dictionary>
+				<entry key="foo">
+					<value>bar</value>
+				</entry>
+				<entry key="jenny">
+					<ref local="jenny" />
+				</entry>
+				<entry key="david">
+					<idref object="david" />
+				</entry>
+			</dictionary>
+		</property>
+	</object>
+	<object id="pMixedMap" type="Spring.Objects.Factory.HasMap, Spring.Core.Tests" singleton="false">
+		<property name="map">
+			<dictionary>
+				<entry key="foo">
+					<value>bar</value>
+				</entry>
+				<entry key="jenny">
+					<ref local="pJenny" />
+				</entry>
+			</dictionary>
+		</property>
+	</object>
+	<object id="mixedMapWithList" type="Spring.Objects.Factory.HasMap, Spring.Core.Tests">
+		<property name="map">
+			<dictionary>
+				<entry key="foo">
+					<value>bar</value>
+				</entry>
+				<entry key="jenny">
+					<ref local="jenny" />
+				</entry>
+				<entry key="list">
+					<list>
+						<value>zero</value>
+						<dictionary>
+							<entry key="fo">
+								<value>bar</value>
+							</entry>
+							<entry key="jen">
+								<ref local="jenny" />
+							</entry>
+						</dictionary>
+						<list>
+							<ref local="jenny" />
+							<value>ba</value>
+						</list>
+						<null />
+					</list>
+				</entry>
+				<entry key="map">
+					<dictionary>
+						<entry key="foo">
+							<value>bar</value>
+						</entry>
+						<entry key="jenny">
+							<ref local="jenny" />
+						</entry>
+					</dictionary>
+				</entry>
+			</dictionary>
+		</property>
+	</object>
+	<object id="emptySet" type="Spring.Objects.Factory.HasMap, Spring.Core.Tests">
+		<property name="set">
+			<set></set>
+		</property>
+	</object>
+	<object id="set" type="Spring.Objects.Factory.HasMap, Spring.Core.Tests">
+		<property name="set">
+			<set>
+				<value>bar</value>
+				<ref local="jenny" />
+				<null />
+			</set>
+		</property>
+	</object>
+	<object id="emptyValue" type="Spring.Objects.Factory.HasMap, Spring.Core.Tests">
+		<property name="props">
+			<name-values>
+				<add key="foo" value="" />
+			</name-values>
+		</property>
+	</object>
+	<object id="emptyProps" type="Spring.Objects.Factory.HasMap, Spring.Core.Tests">
+		<property name="props">
+			<name-values></name-values>
+		</property>
+	</object>
+	<object id="props" type="Spring.Objects.Factory.HasMap, Spring.Core.Tests">
+		<property name="props">
+			<name-values>
+				<add key="foo" value="bar" />
+				<add key="2" value="TWO" />
+			</name-values>
+		</property>
+	</object>
+  <object id="delimitedProps" type="Spring.Objects.Factory.HasMap, Spring.Core.Tests">
+    <property name="props">
+      <name-values>
+        <add key="foo" value="bar1,bar2,bar3" delimiters=","/>
+        <add key="days" value="monday,tuesday.wednesday:thursday'friday!saturday|sunday" delimiters=",.:'!|"/>
+      </name-values>
+    </property>
+  </object>
+  <object id="objectArray" type="Spring.Objects.Factory.HasMap, Spring.Core.Tests">
+		<property name="objectArray">
+			<list>
+				<value>one</value>
+				<ref local="jenny" />
+			</list>
+		</property>
+	</object>
+	<object id="classArray" type="Spring.Objects.Factory.HasMap, Spring.Core.Tests">
+		<property name="classArray">
+			<list>
+				<value>System.String</value>
+				<value>System.Exception</value>
+			</list>
+		</property>
+	</object>
+	<object id="listFactory" type="Spring.Objects.Factory.Config.ListFactoryObject, Spring.Core">
+		<property name="SourceList">
+			<list>
+				<value>bar</value>
+				<value>jenny</value>
+			</list>
+		</property>
+		<property name="TargetListType">
+			<value>Spring.Collections.LinkedList</value>
+		</property>
+	</object>
+	<object id="pListFactory" type="Spring.Objects.Factory.Config.ListFactoryObject, Spring.Core">
+		<property name="SourceList">
+			<list>
+				<value>bar</value>
+				<value>jenny</value>
+			</list>
+		</property>
+		<property name="TargetListType">
+			<value>Spring.Collections.LinkedList</value>
+		</property>
+		<property name="IsSingleton">
+			<value>true</value>
+		</property>
+	</object>
+	<object id="setFactory" type="Spring.Objects.Factory.Config.SetFactoryObject, Spring.Core">
+		<property name="SourceSet">
+			<set>
+				<value>bar</value>
+				<value>jenny</value>
+			</set>
+		</property>
+		<property name="TargetSetType">
+			<value>Spring.Collections.HybridSet</value>
+		</property>
+	</object>
+	<object id="pSetFactory" type="Spring.Objects.Factory.Config.SetFactoryObject, Spring.Core">
+		<property name="SourceSet">
+			<set>
+				<value>bar</value>
+				<value>jenny</value>
+			</set>
+		</property>
+		<property name="TargetSetType">
+			<value>Spring.Collections.HybridSet</value>
+		</property>
+		<property name="IsSingleton">
+			<value>true</value>
+		</property>
+	</object>
+	<object id="mapFactory" type="Spring.Objects.Factory.Config.DictionaryFactoryObject, Spring.Core">
+		<property name="SourceDictionary">
+			<dictionary>
+				<entry key="foo">
+					<value>bar</value>
+				</entry>
+				<entry key="jen">
+					<value>jenny</value>
+				</entry>
+			</dictionary>
+		</property>
+		<property name="TargetDictionaryType">
+			<value>System.Collections.Hashtable</value>
+		</property>
+	</object>
+	<object id="pMapFactory" type="Spring.Objects.Factory.Config.DictionaryFactoryObject, Spring.Core">
+		<property name="SourceDictionary">
+			<dictionary>
+				<entry key="foo">
+					<value>bar</value>
+				</entry>
+				<entry key="jen">
+					<value>jenny</value>
+				</entry>
+			</dictionary>
+		</property>
+		<property name="TargetDictionaryType">
+			<value>System.Collections.Hashtable</value>
+		</property>
+		<property name="IsSingleton">
+			<value>true</value>
+		</property>
+	</object>
+	<object id="mapWithEntryValueShortcut" type="Spring.Objects.Factory.Config.DictionaryFactoryObject, Spring.Core">
+		<property name="SourceDictionary">
+			<dictionary>
+				<entry key="rob" value="robert" />
+				<entry key="jen" value="jenny" />
+			</dictionary>
+		</property>
+	</object>
+	<object id="mapWithValueRefAttributeShortcuts" type="Spring.Objects.Factory.Config.DictionaryFactoryObject, Spring.Core">
+		<property name="SourceDictionary">
+			<dictionary>
+				<entry key="rick" value-ref="rick" />
+				<entry key="uncleelvis" value-ref="uncleelvis" />
+			</dictionary>
+		</property>
+	</object>
+	<object id="rick" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<constructor-arg index="0"><value>Rick Evans</value></constructor-arg>
+		<constructor-arg index="1"><value>30</value></constructor-arg>
+	</object>
+	<object id="uncleelvis" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<constructor-arg index="0"><value>Uncle Elvis</value></constructor-arg>
+		<constructor-arg index="1"><value>47</value></constructor-arg>
+	</object>
+
+  <!-- Definitions for typed lists/dictionaries and generics -->
+  <object id="nonGenericExpressionHolder" type="Spring.Objects.Factory.Xml.NonGenericExpressionHolder, Spring.Core.Tests">
+    <property name="ExpressionsList">
+      <list element-type="Spring.Expressions.IExpression, Spring.Core">
+        <value>1 + 1</value>
+        <value>date('1974-8-24').Month</value>
+        <value>'Aleksandar Seovic'.ToUpper()</value>
+        <value>DateTime.Today > date('1974-8-24')</value>
+      </list>
+    </property>
+    <property name="ExpressionsDictionary">
+      <dictionary key-type="string" value-type="Spring.Expressions.IExpression, Spring.Core">
+        <entry key="0">
+          <value>1 + 1</value>
+        </entry>
+        <entry key="1">
+          <value>date('1974-8-24').Month</value>
+        </entry>
+        <entry key="2">
+          <value>'Aleksandar Seovic'.ToUpper()</value>
+        </entry>
+        <entry key="3">
+          <value>DateTime.Today > date('1974-8-24')</value>
+        </entry>
+      </dictionary>
+    </property>
+  </object>
+  <object id="genericExpressionHolder" type="Spring.Objects.Factory.Xml.GenericExpressionHolder, Spring.Core.Tests">
+    <property name="ExpressionsList">
+      <list element-type="Spring.Expressions.IExpression, Spring.Core">
+        <value>1 + 1</value>
+        <value>date('1974-8-24').Month</value>
+        <value>'Aleksandar Seovic'.ToUpper()</value>
+        <value>DateTime.Today > date('1974-8-24')</value>
+      </list>
+    </property>
+    <property name="ExpressionsDictionary">
+      <dictionary key-type="string" value-type="Spring.Expressions.IExpression, Spring.Core">
+        <entry key="0">
+          <value>1 + 1</value>
+        </entry>
+        <entry key="1">
+          <value>date('1974-8-24').Month</value>
+        </entry>
+        <entry key="2">
+          <value>'Aleksandar Seovic'.ToUpper()</value>
+        </entry>
+        <entry key="3">
+          <value>DateTime.Today > date('1974-8-24')</value>
+        </entry>
+      </dictionary>
+    </property>
+  </object>
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/constructor-arg.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/constructor-arg.xml
new file mode 100644
index 00000000..cc909e98
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/constructor-arg.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<objects xmlns="http://www.springframework.net" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+	<object id="rod10" type="Spring.Objects.Factory.Xml.ConstructorDependenciesObject, Spring.Core.Tests"
+		singleton="false">
+		<constructor-arg index="0" type="System.String">
+			<null />
+		</constructor-arg>
+	</object>
+	<object id="objectWithCtorArgRefShortcuts" type="Spring.Objects.TestObject, Spring.Core.Tests"
+		singleton="false">
+		<constructor-arg ref="kerry2" />
+	</object>
+	<object id="objectWithCtorArgValueShortcuts" type="Spring.Objects.TestObject, Spring.Core.Tests"
+		singleton="false">
+		<constructor-arg name="name" type="string" value="Rick" />
+		<constructor-arg name="age" type="int" value="30" />
+	</object>
+	<object id="rod1" type="Spring.Objects.Factory.Xml.ConstructorDependenciesObject, Spring.Core.Tests">
+		<constructor-arg ref="kerry2"/>
+	</object>
+	<object id="rod2" type="Spring.Objects.Factory.Xml.ConstructorDependenciesObject, Spring.Core.Tests"
+		autowire="constructor">
+		<constructor-arg index="1" ref="kerry1"/>
+		<constructor-arg index="0" ref="kerry2"/>
+		<constructor-arg ref="other"/>
+	</object>
+	<object id="rod3" type="Spring.Objects.Factory.Xml.ConstructorDependenciesObject, Spring.Core.Tests"
+		autowire="constructor">
+		<constructor-arg index="0" ref="kerry2"/>
+		<constructor-arg index="1" ref="kerry2"/>
+	</object>
+	<object id="rod4" type="Spring.Objects.Factory.Xml.DerivedConstructorDependenciesObject, Spring.Core.Tests"
+		autowire="constructor">
+		<constructor-arg index="0">
+			<description>bird</description>
+			<ref object="kerry2"/>
+		</constructor-arg>
+		<constructor-arg ref="kerry2"/>
+	</object>
+	<object id="rod5" type="Spring.Objects.Factory.Xml.DerivedConstructorDependenciesObject, Spring.Core.Tests">
+		<constructor-arg index="1">
+			<description>wife</description>
+			<ref object="kerry1"/>
+		</constructor-arg>
+		<constructor-arg index="3">
+			<description>mmm</description>
+			<value>99</value>
+		</constructor-arg>
+		<constructor-arg ref="other"/>
+		<constructor-arg index="4" value="myname"/>
+		<constructor-arg index="0" ref="kerry2"/>
+	</object>
+	<object id="rod6" type="Spring.Objects.Factory.Xml.DerivedConstructorDependenciesObject, Spring.Core.Tests">
+		<constructor-arg index="1" ref="kerry1"/>
+		<constructor-arg ref="other"/>
+		<constructor-arg index="0" ref="kerry2"/>
+	</object>
+	<object id="rod7" type="Spring.Objects.Factory.Xml.DerivedConstructorDependenciesObject, Spring.Core.Tests"
+		singleton="false">
+		<constructor-arg index="1" ref="kerry1"/>
+		<constructor-arg ref="other"/>
+		<constructor-arg ref="other"/>
+		<constructor-arg index="0" ref="kerry2"/>
+	</object>
+	<object id="rod8" type="Spring.Objects.Factory.Xml.DerivedConstructorDependenciesObject, Spring.Core.Tests"
+		singleton="false">
+		<constructor-arg index="2" ref="other"/>
+		<constructor-arg index="0" ref="kerry2"/>
+	</object>
+	<object id="rod9" type="Spring.Objects.Factory.Xml.ConstructorDependenciesObject, Spring.Core.Tests"
+		singleton="false">
+		<constructor-arg type="int" value="99" />
+	</object>
+	<object id="rod11" type="Spring.Objects.Factory.Xml.ConstructorDependenciesObject, Spring.Core.Tests"
+		singleton="false">
+		<constructor-arg index="0">
+			<ref local="kerry2" />
+		</constructor-arg>
+	</object>
+	<object id="rod12" type="Spring.Objects.Factory.Xml.ConstructorDependenciesObject, Spring.Core.Tests"
+		singleton="false">
+		<constructor-arg index="0">
+			<ref local="kerry1" />
+		</constructor-arg>
+	</object>
+	<object id="rod13" type="Spring.Objects.Factory.Xml.ConstructorDependenciesObject, Spring.Core.Tests"
+		singleton="false">
+		<constructor-arg index="0">
+			<ref local="kerry1" />
+		</constructor-arg>
+		<constructor-arg index="1">
+			<ref local="kerry2" />
+		</constructor-arg>
+	</object>
+	<object id="kerry1" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name" value="Kerry1"/>
+	</object>
+	<object id="kerry2" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name" value="Kerry2"/>
+	</object>
+	<object id="other" type="Spring.Objects.IndexedTestObject, Spring.Core.Tests" />
+	<object id="objectWithBoolean" type="Spring.Objects.Factory.Xml.SingleSimpleTypeConstructorObject"
+		singleton="false">
+		<constructor-arg type="bool" value="true"/>
+	</object>
+	<object id="objectWithBooleanAndString" type="Spring.Objects.Factory.Xml.SingleSimpleTypeConstructorObject"
+		singleton="false">
+		<constructor-arg type="bool" value="true"/>
+		<constructor-arg type="string" value="A String"/>
+	</object>
+	<object id="objectWithDoubleBoolean" type="Spring.Objects.Factory.Xml.DoubleBooleanConstructorObject"
+		autowire="constructor" singleton="false">
+		<constructor-arg type="bool" value="true"/>
+	</object>
+	<object id="ctorArgsAllNamed" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<constructor-arg name="name" value="Isaac Newton"/>
+		<constructor-arg name="age" value="87"/>
+	</object>
+	<object id="grabCtorArgFromMethodInvokingFactoryObject" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<constructor-arg name="name">
+			<object type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core">
+				<property name="TargetObject">
+					<object type="Spring.Objects.TestObject, Spring.Core.Tests">
+						<property name="name" value="Isaac Newton"/>
+					</object>
+				</property>
+				<property name="TargetMethod" value="GetNameWithHonorific"/>
+				<property name="NamedArguments">
+					<dictionary>
+						<entry key="lettersAfterName" value="Phd, PPQ, MC, DJ"/>
+						<entry key="isFemale" value="false"/>
+					</dictionary>
+				</property>
+			</object>
+		</constructor-arg>
+		<constructor-arg name="age" value="198"/>
+	</object>
+	<object id="bool" type="Spring.Objects.Factory.Config.MethodInvokingFactoryObject, Spring.Core">
+		<property name="TargetType" value="System.Boolean"/>
+		<property name="TargetMethod" value="Parse"/>
+		<property name="Arguments">
+			<list>
+				<value>False</value>
+			</list>
+		</property>
+	</object>
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/default-autowire.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/default-autowire.xml
new file mode 100644
index 00000000..da455470
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/default-autowire.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd"
+	default-dependency-check="objects" default-autowire="byType">
+	
+  <object id="rod1" type="Spring.Objects.Factory.Xml.DependenciesObject, Spring.Core.Tests">
+		<!-- Should pick up spouse automatically -->
+  </object>
+	
+  <object id="rod2" type="Spring.Objects.Factory.Xml.DependenciesObject, Spring.Core.Tests">
+		<!-- Should pick up spouse automatically -->
+  </object>
+	
+  <object id="spouse" type="Spring.Objects.TestObject, Spring.Core.Tests" dependency-check="none" autowire="no">
+    <property name="name">
+      <value>Kerry</value>
+    </property>
+  </object>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/default-lazy-init.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/default-lazy-init.xml
new file mode 100644
index 00000000..ffd66205
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/default-lazy-init.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd"
+	default-lazy-init="true">
+	
+  <object id="lazy-and-bad"
+      type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+BadInitializer, Spring.Core.Tests"
+      init-method="init2"/>
+
+  <object id="init-and-ib-no-init-in-local-object-def"
+     type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+InitAndIB, Spring.Core.Tests"
+     init-method="customInit"
+     destroy-method="customDestroy"/>
+  
+  <object id="init-and-ib"
+      type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+InitAndIB, Spring.Core.Tests"
+      lazy-init="false"
+      init-method="customInit"
+      destroy-method="customDestroy"/>
+	
+  <object id="prototype" type="Spring.Objects.TestObject, Spring.Core.Tests" singleton="false"/>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/dependenciesmaterializethis.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/dependenciesmaterializethis.xml
new file mode 100644
index 00000000..b69aba9a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/dependenciesmaterializethis.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Replicates a failure because of the dependence of prototype and singleton on
+  the dao. Involves factory objects.
+  -->
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+  <!-- Not available in .NET, so I commented it out (I'll add something else later) Rick, 9th July 2004 -->
+  <!--
+  <object id="dataSource" type="org.apache.commons.dbcp.BasicDataSource, Spring.Core.Tests"/>
+  -->
+
+  <!-- Transaction manager that delegates to JTA (for a transactional JNDI DataSource) -->
+  <!-- Not in .NET it don't, so I commented it out (I'll add something else later) Rick, 9th July 2004 -->
+  <!--
+  <object id="transactionManager" type="org.springframework.jdbc.datasource.DataSourceTransactionManager, Spring.Core.Tests">
+    <property name="dataSource">
+      <ref local="dataSource"/>
+    </property>
+  </object>
+  -->
+
+  <object id="dao" type="Spring.Objects.Factory.Xml.DummyDao, Spring.Core.Tests"
+      autowire="constructor">
+  </object>
+	
+  <object id="boPrototype"
+      autowire="constructor" type="Spring.Objects.Factory.Xml.DummyBo, Spring.Core.Tests"
+      singleton="false"/>
+	
+  <!-- Class ain't implemented yet Rick, 9th July 2004 -->
+  <!--
+  <object id="prototypeTargetSource"
+      type="Spring.Aop.Target.PrototypeTargetSource, Spring.Core.Tests">
+    <property name="targetObjectName">
+      <value>boPrototype</value>
+    </property>
+  </object>
+  -->
+	
+  <!-- Refers to commented out 'transactionManager' object (see above) Rick, 9th July 2004 -->
+  <!--
+  <object id="prototypeBenchmark" type="org.springframework.transaction.interceptor.TransactionProxyFactoryObject, Spring.Core.Tests">
+    <property name="transactionManager">
+      <ref local="transactionManager"/>
+    </property>
+    <property name="target">
+      <ref local="prototypeTargetSource"/>
+    </property>
+    <property name="proxyInterfaces">
+      <value>Spring.Objects.Factory.XmlDummyBo</value>
+    </property>
+    <property name="transactionAttributes">
+      <props>
+        <prop key="placeOrder">PROPAGATION_REQUIRED</prop>
+      </props>
+    </property>
+  </object>
+  -->
+	
+  <object id="boSingleton" autowire="constructor" type="Spring.Objects.Factory.Xml.DummyBo, Spring.Core.Tests"/>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/enums.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/enums.xml
new file mode 100644
index 00000000..23fa1a72
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/enums.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net">
+	
+  <object id="rod" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="name">
+      <value>Rod</value>
+    </property>
+    <property name="FileMode">
+      <value>Create</value>
+    </property>
+  </object>
+  <!--
+  <object id="fileModeFactory" type="Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject, Spring.Core">
+        <property name="targetType">
+            <value>System.IO.FileMode, Mscorlib</value>
+        </property>
+        <property name="targetProperty">
+            <value>Create</value>
+        </property>
+  </object>
+  -->
+</objects> 
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/event-wiring-prototypes.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/event-wiring-prototypes.xml
new file mode 100644
index 00000000..c70b4b92
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/event-wiring-prototypes.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<!--
+In here, we check the behavior of event wiring to prototypes.
+-->
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+	<!-- prototype event source -->
+	<object id="source"
+	 type="Spring.Objects.TestObject, Spring.Core.Tests"
+	 singleton="false"
+	 />
+
+  <object id="instanceSink" type="Spring.Objects.TestEventHandler, Spring.Core.Tests">
+    <!-- wired up to an event exposed on prototype instance -->
+    <listener event="Click" method="HandleEvent">
+        <ref object="source"/>
+    </listener>
+  </object>
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/event-wiring.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/event-wiring.xml
new file mode 100644
index 00000000..aa22b70b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/event-wiring.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="source" type="Spring.Objects.TestObject, Spring.Core.Tests"/>
+
+  <object id="prototypeSource" type="Spring.Objects.TestObject, Spring.Core.Tests" singleton="false"/>
+
+  <object id="staticEventListener" type="Spring.Objects.TestEventHandler, Spring.Core.Tests">
+    <!-- wired up to a static event -->
+    <listener event="StaticClick" method="HandleEvent">
+        <ref type="Spring.Objects.TestObject, Spring.Core.Tests"/>
+    </listener>
+  </object>
+
+  <object id="instanceEventListener" type="Spring.Objects.TestEventHandler, Spring.Core.Tests">
+    <!-- wired up to an event exposed on an instance -->
+    <listener event="Click" method="HandleEvent">
+        <ref object="source"/>
+    </listener>
+  </object>
+
+
+  <object id="prototypeEventListener" type="Spring.Objects.TestEventHandler, Spring.Core.Tests" singleton="false">
+    <!-- wired up to an event exposed on an object created as a prototype -->
+    <listener event="Click" method="HandleEvent">
+        <ref object="source"/>
+    </listener>
+  </object>
+
+  <object id="autowiredEventListener" type="Spring.Objects.TestEventHandler, Spring.Core.Tests">
+    <!--
+    autowired up to all events exposed on an instance
+    listener method signature defaults to 'On${event}', e.g. 'OnClick', 'OnFoo', etc
+    -->
+    <!--
+    <listener>
+        <ref object="source"/>
+    </listener>
+    -->
+    <!--
+    autowired up to the named event exposed on an instance...
+    searches for appropriately named method with matching signature (in this case 'OnClick')
+    -->
+    <!--
+    <listener event="Click">
+        <ref object="source"/>
+    </listener>
+    -->
+    <!--
+    autowired up to all events exposed on an instance, limiting the search for
+    hander methods to those matching the supplied regex (in this case, starting with 'Handle'
+    and ending with the name of any event exposed on the source, e.g. 'HandleClick',
+    HandleSubmitted', etc)
+    -->
+    <listener method="Handle.+">
+        <ref object="source"/>
+    </listener>
+    <!--
+    autowired up to the named event exposed on an instance, limiting the search for
+    hander methods to those matching the supplied regex (in this case, starting with 'My',
+    ending with 'Listener', and having the name of the named event, e.g. 'MyClickListener', etc)
+    inbetween
+    -->
+    <!--
+    <listener event="Click" method="My${event}Listener">
+        <ref object="source"/>
+    </listener>
+    -->
+    <!--
+    autowired up to those events starting with 'My' exposed on an instance
+    -->
+    <!--
+    <listener event="My.*">
+        <ref object="source"/>
+    </listener>
+    -->
+  </object>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/expressions.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/expressions.xml
new file mode 100644
index 00000000..55dbe364
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/expressions.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<objects xmlns="http://www.springframework.net">
+  
+  <object id="to1" type="Spring.Objects.ExpressionTestObject, Spring.Core.Tests">
+    <constructor-arg name="someString" expression="date('1974-08-24').ToString('m')"/>
+    <property name="ExpressionOne" value="DateTime.Today"/>
+    <property name="ExpressionTwo" value="String.Empty"/>
+    <property name="SomeDate" expression="date('2004-08-14', 'yyyy-MM-dd')"/>
+    <property name="SomeDictionary">
+      <dictionary>
+        <entry key="method1" expression="@[WebMethod(Description = 'My First Web Method')]"/>
+        <entry key="method2" expression="@[WebMethod(Description = 'My Second Web Method')]"/>
+      </dictionary>
+    </property>
+  </object>
+
+  <object id="to2" type="Spring.Objects.ExpressionTestObject, Spring.Core.Tests">
+    <constructor-arg name="someString">
+      <expression value="ToString('m')">
+        <property name="Context" expression="date('1974-08-24')"/>
+      </expression>
+    </constructor-arg>
+    <property name="ExpressionOne" value="DateTime.Today"/>
+    <property name="ExpressionTwo" value="String.Empty"/>
+    <property name="SomeDate">
+      <expression value="SomeDate">
+        <property name="Context" ref="to1"/>
+      </expression>
+    </property>
+    <property name="SomeDictionary">
+      <dictionary>
+        <entry key="method1">
+          <expression value="@[WebMethod(Description = 'My First Web Method')]" />
+        </entry>
+        <entry key="method2">
+          <expression value="@[WebMethod(Description = #desc)]">
+            <property name="Variables">
+              <dictionary>
+                <entry key="desc" value="My Second Web Method"/>
+              </dictionary>
+            </property>
+          </expression>
+        </entry>
+      </dictionary>
+    </property>
+  </object>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/external-resources.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/external-resources.xml
new file mode 100644
index 00000000..8f4db0bf
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/external-resources.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<objects xmlns="http://www.springframework.net" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+    <import resource="./Resources/resource-imports.xml" />
+	<object id="jenny" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name">
+			<value>Jenny</value>
+		</property>
+	</object>
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/factory-methods.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/factory-methods.xml
new file mode 100644
index 00000000..2335252b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/factory-methods.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+    <object id="default" type="Spring.Objects.Factory.Xml.FactoryMethods, Spring.Core.Tests"
+        factory-method="DefaultInstance">
+        <!-- No constructor-arg elements -->
+        <property name="valUe" value="setterString"/> <!-- case is jumbled up on purpose -->
+    </object>
+    <object id="testObjectOnly" type="Spring.Objects.Factory.Xml.FactoryMethods, Spring.Core.Tests"
+        factory-method="NewInstance">
+        <constructor-arg ref="juergen"/>
+    </object>
+    <object id="full" type="Spring.Objects.Factory.Xml.FactoryMethods, Spring.Core.Tests"
+        factory-method="newInsTance"> <!-- case is jumbled up on purpose -->
+        <constructor-arg index="0" ref="juergen"/>
+        <constructor-arg index="1" value="gotcha"/>
+        <constructor-arg index="2" value="27"/>
+    </object>
+    <object id="defaultPrototype" type="Spring.Objects.Factory.Xml.FactoryMethods, Spring.Core.Tests"
+        singleton="false" factory-method="defaultInstance">
+        <!-- No constructor-arg elements -->
+        <property name="value" value="setterString"/>
+    </object>
+    <object id="testObjectOnlyPrototype" type="Spring.Objects.Factory.Xml.FactoryMethods, Spring.Core.Tests"
+        factory-method="newInstance" singleton="false">
+        <constructor-arg ref="juergen"/>
+        <property name="value" value="testObjectOnlyPrototypeDISetterString"/>
+    </object>
+    <object id="fullPrototype" type="Spring.Objects.Factory.Xml.FactoryMethods, Spring.Core.Tests"
+        factory-method="newInstance" singleton="false">
+        <constructor-arg index="0" ref="juergen"/>
+        <constructor-arg index="1" value="gotcha"/>
+        <constructor-arg index="2" value="27"/>
+    </object>
+    <object id="noMatchPrototype" type="Spring.Objects.Factory.Xml.FactoryMethods, Spring.Core.Tests"
+        factory-method="newInstance" singleton="false">
+        <constructor-arg index="0" ref="juergen"/>
+        <constructor-arg index="1" value="27"/>
+        <constructor-arg index="2" value="gotcha"/>
+        <constructor-arg index="3" value="bogus"/>
+    </object>
+    <object id="juergen" type="Spring.Objects.TestObject, Spring.Core.Tests">
+        <property name="name" value="Juergen"/>
+    </object>
+    <!--
+		The class is the factory class, not the created class 
+	-->
+    <object id="externalFactoryMethodWithoutArgs" type="Spring.Objects.Factory.Xml.TestObjectCreator, Spring.Core.Tests"
+        factory-method="createTestObject"></object>
+    <object id="externalFactoryMethodWithArgs" type="Spring.Objects.Factory.Xml.TestObjectCreator, Spring.Core.Tests"
+        factory-method="creATETestoBject"> <!-- case is jumbled up on purpose -->
+        <constructor-arg index="0" value="Rod"/>
+        <constructor-arg index="1" value="33"/>
+    </object>
+    <object id="instanceFactoryMethodWithoutArgs" factory-object="instanceFactory" factory-method="defaultInstance" />
+    <object id="instanceFactoryMethodOverloads" factory-object="instanceFactory" factory-method="createInstance" singleton="false"/>
+
+    <object id="instanceFactory" type="Spring.Objects.Factory.Xml.InstanceFactory">
+        <property name="factoryObjectProperty" value="instanceFactory"/>
+    </object>
+
+
+   
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/factorycircle.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/factorycircle.xml
new file mode 100644
index 00000000..1cb38d5b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/factorycircle.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="singletonFactory" type="Spring.Objects.Factory.DummyFactory, Spring.Core.Tests">
+    <property name="otherTestObject">
+      <ref local="singletonFactory"/>
+    </property>
+  </object>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/field-props-factory.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/field-props-factory.xml
new file mode 100644
index 00000000..519bbfd5
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/field-props-factory.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+    <object id="cultureAware" type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests">
+        <property name="culturE">
+            <ref local="cultureFactory" />
+        </property>
+    </object>
+    <object id="cultureFactory" type="Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject, Spring.Core">
+        <property name="staticProperTY">
+            <value>System.Globalization.CultureInfo.CurrentUICulture, Mscorlib</value>
+        </property>
+    </object>
+    
+    <object id="instanceCultureAware" type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests">
+        <property name="culturE">
+            <ref local="instanceCultureFactory" />
+        </property>
+    </object>
+    <object id="instanceCultureFactory" type="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject, Spring.Core">
+        <property name="targetobjecT">
+            <ref local="instanceCultureAwareSource"/>
+        </property>
+        <property name="targetFIELd">
+            <value>DefauLT</value>
+        </property>
+    </object>
+    <object id="instanceCultureAwareSource" type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests"/>
+    
+    <object id="withTypesField" type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests">
+        <property name="TYPES">
+            <ref local="emptyTypesFactory" />
+        </property>
+    </object>
+    <object id="emptyTypesFactory" type="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject, Spring.Core">
+        <property name="targetTYPE">
+            <value>System.Type, Mscorlib</value>
+        </property>
+        <property name="targetFIELd">
+            <value>EmPTytypeS</value>
+        </property>
+    </object>
+    
+    <object id="instancePropertyCultureAware" type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests">
+        <property name="culturE">
+            <ref local="instancePropertyCultureFactory" />
+        </property>
+    </object>
+    <object id="instancePropertyCultureFactory" type="Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject, Spring.Core">
+        <property name="targetobjecT">
+            <ref local="instancePropertyCultureAwareSource"/>
+        </property>
+        <property name="targetproperTY">
+            <value>MyDefaultCulture</value>
+        </property>
+    </object>
+    <object id="instancePropertyCultureAwareSource" type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests"/>
+    
+    <object id="rubbishProperty" type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests">
+        <property name="culturE">
+            <ref local="rubbishPropertyCultureFactory" />
+        </property>
+    </object>
+    <object id="rubbishPropertyCultureFactory" type="Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject, Spring.Core">
+        <property name="staticProperTY">
+            <value>System.Globalization.CultureInfo.LittleBobbyBoJangles, Mscorlib</value>
+        </property>
+    </object>
+    
+    <object id="rubbishField" type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+MyTestObject, Spring.Core.Tests">
+        <property name="culturE">
+            <ref local="rubbishFieldCultureFactory" />
+        </property>
+    </object>
+    <object id="rubbishFieldCultureFactory" type="Spring.Objects.Factory.Config.FieldRetrievingFactoryObject, Spring.Core">
+        <property name="staticProperTY">
+            <value>System.Type.Foo, Mscorlib</value>
+        </property>
+    </object>
+ 
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/initializers.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/initializers.xml
new file mode 100644
index 00000000..b3e4ba81
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/initializers.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="init-method1"
+      type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+DoubleInitializer, Spring.Core.Tests"
+      init-method="Init">
+    <property name="num">
+      <value>7</value>
+    </property>
+  </object>
+	
+  <object id="init-method2"
+      type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+BadInitializer, Spring.Core.Tests"
+      init-method="Init2"
+      singleton="false"/>
+	
+  <object id="init-method3"
+      type="Spring.Objects.TestObject, Spring.Core.Tests"
+      init-method="Init"
+      singleton="false"/>
+	
+  <object id="init-and-ib"
+      type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+InitAndIB, Spring.Core.Tests"
+      lazy-init="true"
+      init-method="CustomInit"
+      destroy-method="CustomDestroy"/>
+	
+  <object id="dependingObject"
+      type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+DependingObject, Spring.Core.Tests"
+      depends-on="preparingObject1, preparingObject2"/>
+	
+  <object id="preparingObject1"
+      type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+PreparingObject1, Spring.Core.Tests"/>
+	
+  <object id="preparingObject2"
+      type="Spring.Objects.Factory.Xml.XmlObjectFactoryTests+PreparingObject2, Spring.Core.Tests"/>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/invalid-factory.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/invalid-factory.xml
new file mode 100644
index 00000000..0562f3e8
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/invalid-factory.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="invalidFactory" type="Spring.Objects.Factory.DummyFactory, Spring.Core.Tests" singleton="false">
+    <property name="singleton">
+      <value>false</value>
+    </property>
+  </object>
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/invalid.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/invalid.xml
new file mode 100644
index 00000000..69245f80
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/invalid.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+	
+  <object id="jenny" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="name">
+      <value>Jenny</value>
+    </property>
+    <property name="age">
+      <value>30</value>
+    </property>
+    <property name="spouse">
+		<!-- Could use id and href -->
+      <ref local="david"/>
+    </property>
+  </object>
+	
+  <bogus></bogus>
+
+</objects>		
+	
+	
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/invoke-factory.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/invoke-factory.xml
new file mode 100644
index 00000000..4110be9c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/invoke-factory.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+    <object id="culture" type="Spring.Objects.Factory.Config.PropertyRetrievingFactoryObject, Spring.Core">
+        <property name="TargetType">
+            <value>System.Globalization.CultureInfo, Mscorlib</value>
+        </property>
+        <property name="TargetProperty">
+            <value>InstalledUICulture</value>
+        </property>
+    </object>
+    <object id="culturalObject" type="Spring.Objects.TestObject, Spring.Core.Tests">
+        <property name="MyCulture">
+            <ref object="culture" />
+        </property>
+    </object>
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/lazy-init-multithreaded.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/lazy-init-multithreaded.xml
new file mode 100644
index 00000000..cb51e834
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/lazy-init-multithreaded.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd"
+	default-lazy-init="true">
+	
+  <object id="lazyObject"
+      type="Spring.Objects.LazyTestObject, Spring.Core.Tests"
+      lazy-init="true"/>
+      
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/locale.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/locale.xml
new file mode 100644
index 00000000..0942242f
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/locale.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+  <object id="jenny" type="Spring.Objects.TestObject, Spring.Core.Tests">   
+    <property name="Date" value="30/10/07"/>    
+    <property name="Size" value="30,30"/>
+  </object>
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/no-objects.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/no-objects.xml
new file mode 100644
index 00000000..68baf049
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/no-objects.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+	<!--
+	
+	Yes, this file intentionally has no object definitions. c.f. SPRNET-83 
+	
+	-->
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/notfullyspecified.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/notfullyspecified.xml
new file mode 100644
index 00000000..96307ff9
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/notfullyspecified.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+  <!-- not a fully specified name -->
+  <!-- <object id="connection" type="System.Data.OleDb.OleDbConnection, System.Data, Version=1.0.5000.0, Culture=neutral"> -->
+  <object id="connectionNotFullySpecified" type="System.Data.OleDb.OleDbConnection, System.Data">
+    <property name="connectionstring">
+      <value>Provider=SQLOLEDB</value>
+    </property>
+  </object>
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/parent.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/parent.xml
new file mode 100644
index 00000000..82ab464c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/parent.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+	<object id="inheritedTestObject" type="Spring.Objects.TestObject, Spring.Core.Tests" abstract="true">
+		<property name="name"><value>parent</value></property>
+		<property name="age"><value>1</value></property>
+	</object>
+	
+    <object id="inheritedTestObjectWithoutClass" abstract="true">
+		<property name="name"><value>parent</value></property>
+		<property name="age"><value>1</value></property>
+	</object>
+	
+	<object id="inheritedTestObjectPrototype" 
+		type="Spring.Objects.TestObject, Spring.Core.Tests"
+		singleton="false">
+		<property name="name"><value>parent</value></property>
+		<property name="age"><value>2</value></property>
+	</object>
+	
+    <object id="inheritedTestObjectSingleton" type="Spring.Objects.TestObject, Spring.Core.Tests"/>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/reftypes.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/reftypes.xml
new file mode 100644
index 00000000..9f4c4b71
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/reftypes.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="jenny" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name">
+      <value>Jenny</value>
+    </property>
+    <property name="Age">
+      <value>30</value>
+    </property>
+    <property name="Spouse">
+      <ref local="david"/>
+    </property>
+  </object>
+	
+  <object id="david" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="name">
+      <value><![CDATA[David]]></value>
+    </property>
+    <property name="age">
+      <value>27</value>
+    </property>
+    <property name="spouse">
+      <ref local="jenny"/>
+    </property>
+  </object>
+	
+  <object id="jenks" type="Spring.Objects.TestObject, Spring.Core.Tests" singleton="false">
+    <property name="name">
+      <value>Andrew</value>
+    </property>
+    <property name="age">
+      <value>36</value>
+    </property>
+    <property name="spouse">
+      <ref local="jenny"/>
+    </property>
+  </object>
+	
+  <object id="emma" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="name">
+      <value>Emma</value>
+    </property>
+    <property name="Age">
+      <value>31</value>
+    </property>
+    <property name="spouse">
+      <ref local="jenks"/>
+    </property>
+  </object>
+	
+  <object id="georgia" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="name">
+      <value>Georgia</value>
+    </property>
+    <property name="age">
+      <value>33</value>
+    </property>
+    <property name="spouse">
+      <ref local="jenks"/>
+    </property>
+  </object>
+	
+  <object id="ego" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="name">
+      <value>ego</value>
+    </property>
+    <property name="age">
+      <value>1</value>
+    </property>
+    <property name="spouse">
+      <ref local="ego"/>
+    </property>
+  </object>
+	
+  <object id="hasInnerObjects" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <constructor-arg>
+      <value>hasInner</value>
+    </constructor-arg>
+    <constructor-arg index="1" type="System.Int32">
+      <value>5</value>
+    </constructor-arg>
+    <property name="spouse">
+      <object type="Spring.Objects.TestObject, Spring.Core.Tests">
+        <property name="name">
+          <value>inner1</value>
+        </property>
+        <property name="age">
+          <value>6</value>
+        </property>
+      </object>
+    </property>
+    <property name="friends">
+      <list>
+        <object type="Spring.Objects.DerivedTestObject, Spring.Core.Tests">
+          <property name="name">
+            <value>inner2</value>
+          </property>
+          <property name="age">
+            <value>7</value>
+          </property>
+        </object>
+        <object type="Spring.Objects.Factory.DummyFactory, Spring.Core.Tests"/>
+      </list>
+    </property>
+    <property name="someMap">
+      <dictionary>
+        <entry key="someKey">
+          <object type="Spring.Objects.TestObject, Spring.Core.Tests">
+            <constructor-arg>
+              <value>inner3</value>
+            </constructor-arg>
+            <constructor-arg type="System.Int32">
+              <value>8</value>
+            </constructor-arg>
+          </object>
+        </entry>
+      </dictionary>
+    </property>
+  </object>
+
+  <object id="prototypeHasInnerObjects" type="Spring.Objects.TestObject, Spring.Core.Tests" singleton="false">
+    <constructor-arg>
+      <value>hasInner</value>
+    </constructor-arg>
+    <constructor-arg index="1" type="System.Int32">
+      <value>5</value>
+    </constructor-arg>
+    <property name="spouse">
+      <object type="Spring.Objects.TestObject, Spring.Core.Tests">
+        <property name="name">
+          <value>inner1</value>
+        </property>
+        <property name="age">
+          <value>6</value>
+        </property>
+      </object>
+    </property>
+    <property name="friends">
+      <list>
+        <object type="Spring.Objects.DerivedTestObject, Spring.Core.Tests">
+          <property name="name">
+            <value>inner2</value>
+          </property>
+          <property name="age">
+            <value>7</value>
+          </property>
+		  <property name="friends">
+			<list>
+				<object type="Spring.Objects.DerivedTestObject, Spring.Core.Tests">
+				<property name="name">
+					<value>innerFriendOfAFriend</value>
+				</property>
+				<property name="age">
+					<value>7</value>
+				</property>
+				</object>
+			</list>
+		  </property>
+        </object>
+        <object type="Spring.Objects.Factory.DummyFactory, Spring.Core.Tests"/>
+      </list>
+    </property>
+    <property name="someMap">
+      <dictionary>
+        <entry key="someKey">
+          <object type="Spring.Objects.TestObject, Spring.Core.Tests">
+            <constructor-arg>
+              <value>inner3</value>
+            </constructor-arg>
+            <constructor-arg type="System.Int32">
+              <value>8</value>
+            </constructor-arg>
+          </object>
+        </entry>
+      </dictionary>
+    </property>
+  </object>
+
+</objects>
+	
+	
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/resource.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/resource.xml
new file mode 100644
index 00000000..2750ff7e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/resource.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<objects xmlns="http://www.springframework.net">
+    <object id="resource1" type="Spring.Objects.ResourceTestObject, Spring.Core.Tests">
+        <property name="resource">
+            <value>file:///temp/spring-test.properties</value>
+        </property>
+        <property name="inputStream">
+            <value>file:///temp/spring-test.properties</value>
+        </property>
+    </object>
+    <object id="resource2" type="Spring.Objects.ResourceTestObject, Spring.Core.Tests">
+        <constructor-arg index="0">
+            <value>file:///temp/spring-test.properties</value>
+        </constructor-arg>
+        <constructor-arg index="1">
+            <value>file:///temp/spring-test.properties</value>
+        </constructor-arg>
+    </object>
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/satisfiedalldependencycheck.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/satisfiedalldependencycheck.xml
new file mode 100644
index 00000000..5fcd9bba
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/satisfiedalldependencycheck.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="a" type="Spring.Objects.Factory.Xml.DependenciesObject, Spring.Core.Tests"
+      dependency-check="objects">
+    <property name="spouse">
+      <ref local="kerry"/>
+    </property>
+    <property name="age">
+      <value>33</value>
+    </property>
+    <property name="name">
+      <value>Rod</value>
+    </property>
+  </object>
+	
+  <object id="kerry" type="Spring.Objects.TestObject, Spring.Core.Tests"
+      dependency-check="none"/>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/satisfiedobjectdependencycheck.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/satisfiedobjectdependencycheck.xml
new file mode 100644
index 00000000..78b77126
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/satisfiedobjectdependencycheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="a" type="Spring.Objects.Factory.Xml.DependenciesObject, Spring.Core.Tests"
+      dependency-check="objects">
+    <property name="spouse">
+      <ref local="kerry"/>
+    </property>
+  </object>
+	
+  <object id="kerry" type="Spring.Objects.TestObject, Spring.Core.Tests"
+      dependency-check="none">
+  </object>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/satisfiedsimpledependencycheck.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/satisfiedsimpledependencycheck.xml
new file mode 100644
index 00000000..57c7b142
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/satisfiedsimpledependencycheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="a" type="Spring.Objects.Factory.Xml.DependenciesObject, Spring.Core.Tests"
+      dependency-check="simple">
+    <property name="age">
+      <value>33</value>
+    </property>
+    <property name="name">
+      <value>Rod</value>
+    </property>
+  </object>
+
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/schema-validation.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/schema-validation.xml
new file mode 100644
index 00000000..1abbfb88
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/schema-validation.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd" xmlns="http://www.springframework.net">
+
+  <object id="foo" type="Spring.Objects.TestObject, Spring.Core.Tests"/>
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/test.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/test.xml
new file mode 100644
index 00000000..a17a8609
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/test.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="rod" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="name">
+      <value>Rod</value>
+    </property>
+    <property name="age">
+      <value>31</value>
+    </property>
+    <property name="spouse">
+      <ref object="father"/>
+    </property>
+  </object>
+	
+  <object id="roderick" parent="rod">
+    <property name="name">
+      <value>Roderick</value>
+    </property>
+		<!-- Should inherit age -->
+  </object>
+	
+  <object id="kerry" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="name">
+      <value>Kerry</value>
+    </property>
+    <property name="age">
+      <value>34</value>
+    </property>
+    <property name="spouse">
+      <ref local="rod"/>
+    </property>
+  </object>
+	
+  <object id="kathy" type="Spring.Objects.TestObject, Spring.Core.Tests" singleton="false">
+    <property name="name">
+      <value>Kathy</value>
+    </property>
+    <property name="age">
+      <value>28</value>
+    </property>
+    <property name="spouse">
+      <ref object="father"/>
+    </property>
+  </object>
+	
+  <object id="typeMismatch" type="Spring.Objects.TestObject, Spring.Core.Tests" singleton="false">
+    <property name="name">
+      <value>typeMismatch</value>
+    </property>
+    <property name="age">
+      <value>34x</value>
+    </property>
+    <property name="spouse">
+      <ref local="rod"/>
+    </property>
+  </object>
+
+	<!--
+		Tests of lifecycle callbacks
+	-->
+  <object id="mustBeInitialized" type="Spring.Objects.Factory.MustBeInitialized, Spring.Core.Tests"></object>
+	
+  <object id="lifecycle" type="Spring.Objects.Factory.LifecycleObject, Spring.Core.Tests"></object>
+
+
+	<!-- Factory objects are automatically treated differently -->
+  <object id="singletonFactory" type="Spring.Objects.Factory.DummyFactory, Spring.Core.Tests"></object>
+	
+  <object id="prototypeFactory" type="Spring.Objects.Factory.DummyFactory, Spring.Core.Tests">
+    <property name="issingleton">
+      <value>false</value>
+    </property>
+  </object>
+
+	<!-- Check that the circular reference resolution mechanism doesn't break
+	     repeated references to the same FactoryObject -->
+  <object id="factoryReferencer" type="Spring.Objects.Factory.Xml.DummyReferencer, Spring.Core.Tests">
+    <property name="testObject1">
+      <ref object="singletonFactory"/>
+    </property>
+    <property name="testObject2">
+      <ref local="singletonFactory"/>
+    </property>
+  </object>
+
+	<!-- Check that the circular reference resolution mechanism doesn't break
+	     prototype instantiation -->
+  <object id="prototypeReferencer" type="Spring.Objects.Factory.Xml.DummyReferencer, Spring.Core.Tests" singleton="false">
+    <property name="testObject1">
+      <ref local="kathy"/>
+    </property>
+    <property name="testObject2">
+      <ref object="kathy"/>
+    </property>
+  </object>
+	
+  <object id="listenerVeto" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="name">
+      <value>listenerVeto</value>
+    </property>
+    <property name="age">
+      <value>66</value>
+    </property>
+  </object>
+	
+  <object id="validEmpty" type="Spring.Objects.TestObject, Spring.Core.Tests"/>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/unsatisfiedAllDependencyCheckMissingSimple.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/unsatisfiedAllDependencyCheckMissingSimple.xml
new file mode 100644
index 00000000..0845836c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/unsatisfiedAllDependencyCheckMissingSimple.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="a" type="Spring.Objects.Factory.XmlDependenciesObject, Spring.Core.Tests"
+      dependency-check="simple">
+    <property name="name">
+      <value>tony</value>
+    </property>
+    <property name="spouse">
+      <ref local="kerry"></property> -->
+	</object>
+	
+    <object id="kerry" type="Spring.Objects.TestObject, Spring.Core.Tests"
+        dependency-check="none"></object>
+
+  </objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/unsatisfiedalldependencycheckmissingobjects.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/unsatisfiedalldependencycheckmissingobjects.xml
new file mode 100644
index 00000000..fa622191
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/unsatisfiedalldependencycheckmissingobjects.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+  <object id="a" type="Spring.Objects.Factory.Xml.DependenciesObject, Spring.Core.Tests"
+      dependency-check="all">
+    <property name="age">
+      <value>33</value>
+    </property>
+    <property name="name">
+      <value>Rod</value>
+    </property>
+  </object>
+
+
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/unsatisfiedobjectdependencycheck.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/unsatisfiedobjectdependencycheck.xml
new file mode 100644
index 00000000..8c076799
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/unsatisfiedobjectdependencycheck.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="a" type="Spring.Objects.Factory.Xml.DependenciesObject, Spring.Core.Tests"
+      dependency-check="objects">
+		<!-- <property name="name"><value>Rod</value></property> --></object>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/unsatisfiedsimpledependencycheck.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/unsatisfiedsimpledependencycheck.xml
new file mode 100644
index 00000000..aa9b87b7
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/unsatisfiedsimpledependencycheck.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+  <object id="a" type="Spring.Objects.Factory.Xml.DependenciesObject, Spring.Core.Tests"
+      dependency-check="simple">
+		<!-- <property name="name"><value>Rod</value></property> --></object>
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/wellformed-but-bad.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/wellformed-but-bad.xml
new file mode 100644
index 00000000..1b469413
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/wellformed-but-bad.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<objects xmlns="http://www.springframework.net" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	<object id="no.parent.factory" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="spouse"><ref parent="declared.in.some.other.factory"/></property>
+	</object>
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/concurrent.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/concurrent.xml
new file mode 100644
index 00000000..48863bbf
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/concurrent.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+  <object id="object1"
+      type="Spring.Objects.Factory.ConcurrentObjectFactoryTests$ConcurrentObject, Spring.Core.Tests"
+      singleton="false">
+    <property name="date">
+      <value>2004/08/08</value>
+    </property>
+  </object>
+  <object id="object2"
+      type="Spring.Objects.Factory.ConcurrentObjectFactoryTests$ConcurrentObject, Spring.Core.Tests"
+      singleton="false">
+    <property name="date">
+      <value>2000/02/02</value>
+    </property>
+  </object>
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/leaf.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/leaf.xml
new file mode 100644
index 00000000..2c48f507
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/leaf.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+  <object id="test3" type="Spring.Objects.TestObject, Spring.Core.Tests" singleton="false">
+    <property name="name">
+      <value>custom</value>
+    </property>
+    <property name="age">
+      <value>25</value>
+    </property>
+  </object>
+
+</objects>		
+	
+	
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/middle.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/middle.xml
new file mode 100644
index 00000000..c817458c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/middle.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+	<!-- Simple target -->
+	<object id="test" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name">
+			<value>custom</value>
+		</property>
+		<property name="age">
+			<value>666</value>
+		</property>
+	</object>
+	<!--
+		Check that invoker is automatically added to wrap target.
+		Non pointcut object name should be wrapped in invoker.
+	-->
+	<object id="numberTestObject" type="Spring.Objects.NumberTestObject, Spring.Core.Tests" />
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/root.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/root.xml
new file mode 100644
index 00000000..8cdb7ee8
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/root.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+  
+	<object id="indexedObject" type="Spring.Objects.IndexedTestObject, Spring.Core.Tests" />
+	<!-- Overridden by next factory -->
+	<object id="test" type="Spring.Objects.TestObject, Spring.Core.Tests">
+		<property name="name">
+			<value>custom</value>
+		</property>
+		<property name="age">
+			<value>25</value>
+		</property>
+	</object>
+	<object id="testFactory1" type="Spring.Objects.Factory.DummyFactory, Spring.Core.Tests" />
+	<object id="testFactory2" type="Spring.Objects.Factory.DummyFactory, Spring.Core.Tests">
+		<property name="IsSingleton">
+			<value>false</value>
+		</property>
+	</object>
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/DataBinding/BaseBindingManagerTests.cs b/test/Spring/Spring.Core.Tests/DataBinding/BaseBindingManagerTests.cs
new file mode 100644
index 00000000..af7c08ed
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/DataBinding/BaseBindingManagerTests.cs
@@ -0,0 +1,326 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+using NUnit.Framework;
+using Spring.Core;
+using Spring.Globalization.Formatters;
+using Spring.Objects;
+using Spring.Validation;
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// Test cases for the BaseBindingManager.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: BaseBindingManagerTests.cs,v 1.6 2008/03/20 14:02:47 oakinger Exp $</version>
+    [TestFixture]
+    public class BaseBindingManagerTests
+    {
+        private BaseBindingManager mgr;
+
+        [TestFixtureSetUp]
+        public void SetUp()
+        {
+            mgr = new BaseBindingManager();
+            mgr.AddBinding("['name']", "Name");
+            mgr.AddBinding("['dob']", "DOB");
+#if NET_2_0 // test nullable type
+            mgr.AddBinding("['dateofgraduation']", "DateOfGraduation");
+#endif
+            mgr.AddBinding("['inventions']", "Inventions");
+            mgr.AddBinding("['cityOfBirth']", "PlaceOfBirth.City");
+            mgr.AddBinding("['countryOfBirth']", "PlaceOfBirth.Country");
+        }
+
+        [Test]
+        public void WithoutTypeConversion()
+        {
+            Hashtable source = new Hashtable();
+            Inventor target = new Inventor();
+
+            source["name"] = "Nikola Tesla";
+            source["dob"] = new DateTime(1856, 7, 9);
+#if NET_2_0
+            // I know this is pupin's graduation year but I need a date here
+            source["dateofgraduation"] = new DateTime(1883,1,1);
+#endif
+            source["inventions"] = new string[] {"One", "Two"};
+
+            mgr.BindSourceToTarget(source, target, null);
+
+            Assert.IsTrue(mgr.HasBindings);
+            Assert.AreEqual("Nikola Tesla", target.Name);
+            Assert.AreEqual(new DateTime(1856, 7, 9), target.DOB);
+            Assert.AreEqual(new string[] {"One", "Two"}, target.Inventions);
+            Assert.IsNull(target.PlaceOfBirth.City);
+            Assert.IsNull(target.PlaceOfBirth.Country);
+
+            target.Name = "Tesla, Nikola";
+            target.DOB = DateTime.Today;
+            target.PlaceOfBirth.City = "Smiljan";
+            target.PlaceOfBirth.Country = "Lika";
+
+            mgr.BindTargetToSource(source, target, null);
+            Assert.AreEqual("Tesla, Nikola", source["name"]);
+            Assert.AreEqual(DateTime.Today, source["dob"]);
+            Assert.AreEqual("One", ((string[]) source["inventions"])[0]);
+            Assert.AreEqual("Smiljan", source["cityOfBirth"]);
+            Assert.AreEqual("Lika", source["countryOfBirth"]);
+        }
+
+        [Test]
+        public void WithTypeConversion()
+        {
+            Hashtable source = new Hashtable();
+            Inventor target = new Inventor();
+
+            source["name"] = "Nikola Tesla";
+            source["dob"] = "1856-7-9";
+            source["inventions"] = "One,Two";
+#if NET_2_0
+            // I know this is pupin's graduation year but I need a date here
+            source["dateofgraduation"] = "1883-1-1";
+#endif
+
+            mgr.BindSourceToTarget(source, target, null);
+
+            Assert.IsTrue(mgr.HasBindings);
+            Assert.AreEqual("Nikola Tesla", target.Name);
+            Assert.AreEqual(new DateTime(1856, 7, 9), target.DOB);
+            Assert.AreEqual(new string[] {"One", "Two"}, target.Inventions);
+            Assert.IsNull(target.PlaceOfBirth.City);
+            Assert.IsNull(target.PlaceOfBirth.Country);
+
+            target.Name = "Tesla, Nikola";
+            target.DOB = DateTime.Today;
+            target.PlaceOfBirth.City = "Smiljan";
+            target.PlaceOfBirth.Country = "Lika";
+
+            mgr.BindTargetToSource(source, target, null);
+            Assert.AreEqual("Tesla, Nikola", source["name"]);
+            Assert.AreEqual(DateTime.Today, source["dob"]);
+            Assert.AreEqual("One", ((string[]) source["inventions"])[0]);
+            Assert.AreEqual("Smiljan", source["cityOfBirth"]);
+            Assert.AreEqual("Lika", source["countryOfBirth"]);
+
+        }
+
+#if NET_2_0
+        [Test]
+        public void BindNullValues()
+        {
+            Hashtable source;
+            Inventor target;
+
+            target = new Inventor();
+            source = new Hashtable();
+
+            // this is legal (dog is nullable)
+            BaseBindingManager mgr = new BaseBindingManager();
+            mgr.AddBinding("['dateofgraduation']", "DateOfGraduation");
+
+            source["dateofgraduation"] = null;
+            target.DateOfGraduation = DateTime.Now;
+            mgr.BindSourceToTarget(source, target, null);
+            Assert.IsNull(target.DateOfGraduation);
+
+            source["dateofgraduation"] = DateTime.Now;
+            mgr.BindTargetToSource(source, target, null);
+            Assert.IsNull(source["dateofgraduation"]);
+        }
+
+        [Test]
+        public void BindNullValuesWithFormatter()
+        {
+            Hashtable source;
+            Inventor target;
+
+            target = new Inventor();
+            source = new Hashtable();
+
+            // this is legal (dog is nullable)
+            BaseBindingManager mgr = new BaseBindingManager();
+            mgr.AddBinding("['dateofgraduation']", "DateOfGraduation", new HasTextFilteringFormatter(null, null));
+
+            source["dateofgraduation"] = string.Empty;
+            target.DateOfGraduation = DateTime.Now;
+            mgr.BindSourceToTarget(source, target, null);
+            Assert.IsNull(target.DateOfGraduation);
+        }
+#endif
+
+        [Test]
+        public void UnhandledTypeConversionExceptionSourceToTarget()
+        {
+            BaseBindingManager dbm = new BaseBindingManager();
+            Hashtable source = new Hashtable();
+            source["boolValue"] = false;
+            Inventor target = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            
+            dbm.AddBinding("['boolValue']", "DOB");
+
+            try
+            {
+                dbm.BindSourceToTarget(source, target, null);
+                Assert.Fail("Binding boolean to date should throw an exception.");
+            }
+            catch (TypeMismatchException)
+            {}
+
+            // make sure that the old value doesn't override current invalid value
+            dbm.BindTargetToSource(source, target, null);
+            Assert.AreEqual(false, source["boolValue"]);
+        }
+
+        [Test]
+        public void UnhandledTypeConversionExceptionTargetToSource()
+        {
+            BaseBindingManager dbm = new BaseBindingManager();
+            Inventor st = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            st.Inventions = new string[] {"Invention One", "Invention Two"};
+
+            dbm.AddBinding("pob", "DOB");
+
+            try
+            {
+                dbm.BindTargetToSource(st, st, null);
+                Assert.Fail("Binding date to custom Place type should throw an exception.");
+            }
+            catch (TypeMismatchException)
+            {}
+
+            // make sure that the old value doesn't override current invalid value
+            dbm.BindSourceToTarget(st, st, null);
+            Assert.AreEqual(new DateTime(1856, 7, 9), st.DOB);
+        }
+
+        [Test]
+        public void HandledTypeConversionExceptionSourceToTarget()
+        {
+            BaseBindingManager dbm = new BaseBindingManager();
+            IValidationErrors errors = new ValidationErrors();
+            Hashtable source = new Hashtable();
+            source["boolValue"] = false;
+            Inventor target = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+
+            SimpleExpressionBinding binding = new SimpleExpressionBinding("['boolValue']", "DOB");
+            binding.SetErrorMessage("error", "errors");
+            dbm.AddBinding(binding);
+
+            dbm.BindSourceToTarget(source, target, errors);
+            Assert.IsFalse(binding.IsValid);
+            Assert.IsFalse(errors.IsEmpty);
+            Assert.AreEqual(1, errors.GetErrors("errors").Count);
+
+            // make sure that the old value doesn't override current invalid value
+            dbm.BindTargetToSource(source, target, errors);
+            Assert.AreEqual(false, source["boolValue"]);
+        }
+
+        [Test]
+        public void HandledTypeConversionExceptionTargetToSource()
+        {
+            BaseBindingManager dbm = new BaseBindingManager();
+            IValidationErrors errors = new ValidationErrors();
+            Inventor st = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            st.Inventions = new string[] {"Invention One", "Invention Two"};
+
+            SimpleExpressionBinding binding = new SimpleExpressionBinding("pob", "DOB");
+            binding.SetErrorMessage("error", "errors");
+            dbm.AddBinding(binding);
+
+            dbm.BindTargetToSource(st, st, errors);
+            Assert.IsFalse(binding.IsValid);
+            Assert.IsFalse(errors.IsEmpty);
+            Assert.AreEqual(1, errors.GetErrors("errors").Count);
+
+            // make sure that the old value doesn't override current invalid value
+            dbm.BindSourceToTarget(st, st, errors);
+            Assert.AreEqual(new DateTime(1856, 7, 9), st.DOB);
+        }
+
+        [Test]
+        public void DirectionSourceToTarget()
+        {
+            BaseBindingManager dbm = new BaseBindingManager();
+            Inventor source = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            Hashtable target = new Hashtable();
+            
+            dbm.AddBinding("Name", "['name']", BindingDirection.SourceToTarget);
+            dbm.BindSourceToTarget(source, target, null);
+            Assert.AreEqual("Nikola Tesla", target["name"]);
+
+            target["name"] = "Mihajlo Pupin";
+            dbm.BindTargetToSource(source, target, null);
+            Assert.AreEqual("Nikola Tesla", source.Name);
+        }
+
+        [Test]
+        public void DirectionTargetToSource()
+        {
+            BaseBindingManager dbm = new BaseBindingManager();
+            Inventor source = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            Hashtable target = new Hashtable();
+            
+            dbm.AddBinding("Name", "['name']", BindingDirection.TargetToSource);
+            dbm.BindSourceToTarget(source, target, null);
+            Assert.IsNull(target["name"]);
+
+            target["name"] = "Mihajlo Pupin";
+            dbm.BindTargetToSource(source, target, null);
+            Assert.AreEqual("Mihajlo Pupin", source.Name);
+        }
+
+//    	[Test]
+//		public void ResetBindingStates()
+//    	{
+//    		BaseBindingManager dbm = new BaseBindingManager();
+//			Inventor source = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+//			Hashtable target = new Hashtable();
+//            
+//			dbm.AddBinding("Name", "['name']");
+//    		dbm.AddBinding("WrongProperty", "['wrongproperty']");
+//    		
+//			try
+//			{
+//				dbm.BindSourceToTarget(source, target, null);
+//				throw new AssertionException("should throw InvalidPropertyException");
+//			} catch(Spring.Objects.InvalidPropertyException) {} // ok
+//    		
+//    		// will ignore previously failed bindings - bindingState is false
+//    		dbm.BindSourceToTarget(source, target, null);
+//    		
+//    		// now reset states
+//    		dbm.ResetBindingStates();
+//    		
+//    		// now throws again
+//			try
+//			{
+//				dbm.BindSourceToTarget(source, target, null);
+//				throw new AssertionException("should throw InvalidPropertyException");
+//			} 
+//			catch(Spring.Objects.InvalidPropertyException) {} // ok    		
+//    	}
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/DataBinding/SimpleExpressionBindingTests.cs b/test/Spring/Spring.Core.Tests/DataBinding/SimpleExpressionBindingTests.cs
new file mode 100644
index 00000000..75f122b7
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/DataBinding/SimpleExpressionBindingTests.cs
@@ -0,0 +1,71 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 NUnit.Framework;
+
+namespace Spring.DataBinding
+{
+    /// <summary>
+    /// Test cases for the SimpleExpressionBinding class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SimpleExpressionBindingTests.cs,v 1.1 2006/11/21 05:47:00 aseovic Exp $</version>
+    [TestFixture]
+    public class SimpleExpressionBindingTests
+    {
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void WithNullMesageId()
+        {
+            new SimpleExpressionBinding("exp", "exp").SetErrorMessage(null, "errors");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void WithEmptyMesageId()
+        {
+            new SimpleExpressionBinding("exp", "exp").SetErrorMessage("", "errors");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void WithWhitespaceMesageId()
+        {
+            new SimpleExpressionBinding("exp", "exp").SetErrorMessage("\t   ", "errors");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void WithNullProviders()
+        {
+            new SimpleExpressionBinding("exp", "exp").SetErrorMessage("error", null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void WithEmptyProviders()
+        {
+            new SimpleExpressionBinding("exp", "exp").SetErrorMessage("error", new string[0]);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/ExceptionsTest.cs b/test/Spring/Spring.Core.Tests/ExceptionsTest.cs
new file mode 100644
index 00000000..506f5f2a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/ExceptionsTest.cs
@@ -0,0 +1,434 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring
+{
+	/// <summary>
+	/// Tests the various exception classes.
+	/// </summary>
+	/// <remarks>
+	/// <para>
+	/// Shamelessly lifted from the NAnt test suite.
+	/// </para>
+	/// </remarks>
+	public abstract class ExceptionsTest : StandardsComplianceTest
+	{
+		protected ExceptionsTest()
+		{
+			CheckedType = typeof (Exception);
+		}
+
+		#region Tests
+
+		[Test]
+		public void TestStandardsCompliance()
+		{
+			ProcessAssembly(AssemblyToCheck);
+		}
+
+		[Test]
+		public void TestThisTest()
+		{
+			ProcessAssembly(Assembly.GetAssembly(GetType()));
+		}
+
+		#endregion
+
+		#region Methods
+
+		protected override void CheckStandardsCompliance(Assembly assembly, Type t)
+		{
+			// check to see that the exception is correctly named, with "Exception" at the end
+			bool nameIsValid = t.Name.EndsWith("Exception");
+			Assert.IsTrue(nameIsValid, t.Name + " class name must end with Exception.");
+			if (t.IsAbstract)
+			{
+				return;
+			}
+			// Does the exception have the 3 standard constructors?
+			// Default constructor
+			CheckPublicConstructor(t, "()");
+			// Constructor with a single string parameter
+			CheckPublicConstructor(t, "(string message)", typeof (String));
+			// Constructor with a string and an inner exception
+			CheckPublicConstructor(t, "(string message, Exception inner)",
+			                       typeof (String), typeof (Exception));
+			// check to see if the serialization constructor is present
+			// if exception is sealed, constructor should be private
+			// if exception is not sealed, constructor should be protected
+			if (t.IsSealed)
+			{
+				// check to see if the private serialization constructor is present...
+				CheckPrivateConstructor(t, "(SerializationInfo info, StreamingContext context)",
+				                        typeof (SerializationInfo),
+				                        typeof (StreamingContext));
+			}
+			else
+			{
+				// check to see if the protected serialization constructor is present...
+				CheckProtectedConstructor(t, "(SerializationInfo info, StreamingContext context)",
+				                          typeof (SerializationInfo),
+				                          typeof (StreamingContext));
+			}
+			// check to see if the type is marked as serializable
+			Assert.IsTrue(t.IsSerializable, t.Name + " is not serializable, missing [Serializable]?");
+			// check to see if there are any public fields. These should be properties instead...
+			FieldInfo[] publicFields = t.GetFields(BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.Instance);
+			if (publicFields.Length != 0)
+			{
+				foreach (FieldInfo fieldInfo in publicFields)
+				{
+					Assert.Fail(t.Name + "." + fieldInfo.Name + " is a public field, should be exposed through property instead.");
+				}
+			}
+			// If this exception has any fields, check to make sure it has a 
+			// version of GetObjectData. If not, it does't serialize those fields.
+			FieldInfo[] fields =
+				t.GetFields(BindingFlags.DeclaredOnly | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+			if (fields.Length != 0)
+			{
+				if (t.GetMethod("GetObjectData", BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.Instance) == null)
+				{
+					Assert.Fail(t.Name + " does not implement GetObjectData but has private fields.");
+				}
+			}
+			if (!t.IsAbstract)
+			{
+				CheckInstantiation(t);
+			}
+		}
+
+		private void CheckPublicConstructor(Type t, string description, params Type[] parameters)
+		{
+			// locate constructor
+			ConstructorInfo ci =
+				t.GetConstructor(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, null, parameters, null);
+			// fail if constructor does not exist
+			Assert.IsNotNull(ci, t.Name + description + " is a required constructor.");
+			// fail if constructor is private
+			Assert.IsFalse(ci.IsPrivate, t.Name + description + " is private, must be public.");
+			// fail if constructor is protected
+			Assert.IsFalse(ci.IsFamily, t.Name + description + " is internal, must be public.");
+			// fail if constructor is internal
+			Assert.IsFalse(ci.IsAssembly, t.Name + description + " is internal, must be public.");
+			// fail if constructor is protected internal
+			Assert.IsFalse(ci.IsFamilyOrAssembly, t.Name + description + " is protected internal, must be public.");
+			// sanity check to make sure the constructor is public
+			Assert.IsTrue(ci.IsPublic, t.Name + description + " is not public, must be public.");
+		}
+
+		private void CheckProtectedConstructor(Type t, string description, params Type[] parameters)
+		{
+			// locate constructor
+			ConstructorInfo ci =
+				t.GetConstructor(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, null, parameters, null);
+			// fail if constructor does not exist
+			Assert.IsNotNull(ci, t.Name + description + " is a required constructor.");
+			// fail if constructor is public
+			Assert.IsFalse(ci.IsPublic, t.Name + description + " is public, must be protected.");
+			// fail if constructor is private
+			Assert.IsFalse(ci.IsPrivate, t.Name + description + " is private, must be public or protected.");
+			// fail if constructor is internal
+			Assert.IsFalse(ci.IsAssembly, t.Name + description + " is internal, must be protected.");
+			// fail if constructor is protected internal
+			Assert.IsFalse(ci.IsFamilyOrAssembly, t.Name + description + " is protected internal, must be protected.");
+			// sanity check to make sure the constructor is protected
+			Assert.IsTrue(ci.IsFamily, t.Name + description + " is not protected, must be protected.");
+		}
+
+		private void CheckPrivateConstructor(Type t, string description, params Type[] parameters)
+		{
+			// locate constructor
+			ConstructorInfo ci =
+				t.GetConstructor(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, null, parameters, null);
+			// fail if constructor does not exist
+			Assert.IsNotNull(ci, t.Name + description + " is a required constructor.");
+			// fail if constructor is public
+			Assert.IsFalse(ci.IsPublic, t.Name + description + " is public, must be private.");
+			// fail if constructor is protected
+			Assert.IsFalse(ci.IsFamily, t.Name + description + " is protected, must be private.");
+			// fail if constructor is internal
+			Assert.IsFalse(ci.IsAssembly, t.Name + description + " is internal, must be private.");
+			// fail if constructor is protected internal
+			Assert.IsFalse(ci.IsFamilyOrAssembly, t.Name + description + " is protected internal, must be private.");
+			// sanity check to make sure the constructor is private
+			Assert.IsTrue(ci.IsPrivate, t.Name + description + " is not private, must be private.");
+		}
+
+		/// <summary>
+		/// If we've got here, then the standards compliance tests have passed...
+		/// </summary>
+		/// <param name="t">The exception type being tested.</param>
+		private void CheckInstantiation(Type t)
+		{
+			// attempt to instantiate the 3 standard ctors...
+			ConstructorInfo ctor = t.GetConstructor(Type.EmptyTypes);
+			try
+			{
+				ctor.Invoke(null);
+			}
+			catch (Exception ex)
+			{
+				Assert.Fail("Ctor () for '" + t.Name + "' threw an exception : " + ex.Message);
+			}
+			ctor = t.GetConstructor(new Type[] {typeof (string)});
+			try
+			{
+				Exception ex = (Exception) ctor.Invoke(new object[] {"My Fingers Turn To Fists"});
+				Assert.IsNotNull(ex.Message, t.Name + "'s Message was null.");
+			}
+			catch (Exception ex)
+			{
+				Assert.Fail("Ctor (string) for '" + t.Name + "' threw an exception : " + ex.Message);
+			}
+			ctor = t.GetConstructor(new Type[] {typeof (string), typeof (Exception)});
+			try
+			{
+				Exception ex = (Exception) ctor.Invoke(new object[] {"My Fingers Turn To Fists", new FormatException("Bing")});
+				Assert.IsNotNull(ex.Message, t.Name + "'s Message was null.");
+				Assert.IsNotNull(ex.InnerException, t.Name + "'s InnerException was null.");
+				Assert.AreEqual("Bing", ex.InnerException.Message);
+			}
+			catch (Exception ex)
+			{
+				Assert.Fail("Ctor (string, Exception) for '" + t.Name + "' threw an exception : " + ex.Message);
+			}
+			// test the serialization ctor
+			try
+			{
+				ctor = t.GetConstructor(new Type[] {typeof (string)});
+				Exception ex = (Exception) ctor.Invoke(new object[] {"HungerHurtsButStarvingWorks"});
+                BinaryFormatter bf = new BinaryFormatter();
+                MemoryStream ms = new MemoryStream();
+                bf.Serialize(ms, ex);
+                ms.Seek(0,0);
+                Exception inex = (Exception)bf.Deserialize(ms);
+				Assert.IsNotNull(inex);
+			}
+			catch (Exception ex)
+			{
+				Assert.Fail("Ctor (Serialization) for '" + t.Name + "' threw an exception : " + ex.Message);
+			}
+
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// We will test all of the exceptions in this assembly for their correctness.
+		/// </summary>
+		protected Assembly AssemblyToCheck
+		{
+			get { return _assemblyToCheck; }
+			set { _assemblyToCheck = value; }
+		}
+
+		#endregion
+
+		private Assembly _assemblyToCheck = null;
+	}
+
+	#region Inner Class : SimpleTestException
+
+	/// <summary>
+	/// Do nothing exception to verify that the exception tester
+	/// is working correctly.
+	/// </summary>
+	[Serializable]
+	public class SimpleTestException : ApplicationException
+	{
+		#region Public Instance Constructors
+
+		public SimpleTestException()
+		{
+		}
+
+		public SimpleTestException(string message) : base(message)
+		{
+		}
+
+		public SimpleTestException(string message, Exception inner)
+			: base(message, inner)
+		{
+		}
+
+		#endregion Public Instance Constructors
+
+		#region Protected Instance Constructors
+
+		// deserialization constructor
+		protected SimpleTestException(
+			SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{
+		}
+
+		#endregion Protected Instance Constructors
+	}
+
+	#endregion
+
+	#region Inner Class : TestException
+
+	/// <summary>
+	/// Exception to verify that the exception tester is working correctly.
+	/// </summary>
+	[Serializable]
+	public class TestException : ApplicationException, ISerializable
+	{
+		#region Private Instance Fields
+
+		private int _value;
+
+		#endregion Private Instance Fields
+
+		#region Public Instance Constructors
+
+		public TestException()
+		{
+		}
+
+		public TestException(string message) : base(message)
+		{
+		}
+
+		public TestException(string message, Exception inner)
+			: base(message, inner)
+		{
+		}
+
+		// constructors that take the added value
+		public TestException(string message, int value) : base(message)
+		{
+			_value = value;
+		}
+
+		#endregion Public Instance Constructors
+
+		#region Protected Instance Constructors
+
+		// deserialization constructor
+		protected TestException(SerializationInfo info, StreamingContext context) : base(info, context)
+		{
+			_value = info.GetInt32("Value");
+		}
+
+		#endregion Protected Instance Constructors
+
+		#region Public Instance Properties
+
+		public int Value
+		{
+			get { return _value; }
+		}
+
+		#endregion Public Instance Properties
+
+		#region Override implementation of ApplicationException
+
+		// Called by the frameworks during serialization
+		// to fetch the data from an object.
+		public override void GetObjectData(
+			SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData(info, context);
+			info.AddValue("Value", _value);
+		}
+
+		// overridden Message property. This will give the
+		// proper textual representation of the exception,
+		// with the added field value.
+		public override string Message
+		{
+			get
+			{
+				// NOTE: should be localized...
+				string s =
+					string.Format(
+						CultureInfo.InvariantCulture, "Value: {0}", _value);
+				return base.Message + Environment.NewLine + s;
+			}
+		}
+
+		#endregion Override implementation of ApplicationException
+	}
+
+	#endregion
+
+	#region Inner Class : SealedTestException
+
+	/// <summary>
+	/// Exception to verify that the exception tester is working on
+	/// sealed exception.
+	/// </summary>
+	[Serializable]
+	public sealed class SealedTestException : TestException
+	{
+		#region Public Instance Constructors
+
+		public SealedTestException()
+		{
+		}
+
+		public SealedTestException(string message) : base(message)
+		{
+		}
+
+		public SealedTestException(string message, Exception inner)
+			: base(message, inner)
+		{
+		}
+
+		// constructors that take the added value
+		public SealedTestException(string message, int value)
+			: base(message, value)
+		{
+		}
+
+		#endregion Public Instance Constructors
+
+		#region Private Instance Constructors
+
+		// deserialization constructor
+		private SealedTestException(
+			SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{
+		}
+
+		#endregion Private Instance Constructors
+	}
+
+	#endregion
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs
new file mode 100644
index 00000000..627d6f70
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs
@@ -0,0 +1,2940 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.EnterpriseServices;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Runtime.Serialization.Formatters.Soap;
+using System.Text;
+using System.Threading;
+using System.Web.Services;
+using antlr.collections;
+using NUnit.Framework;
+using Spring.Collections;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Core;
+using Spring.Core.TypeResolution;
+using Spring.Expressions;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Threading;
+using Spring.Util;
+using Foo = Spring.Expressions.Foo;
+
+#endregion
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// This class contains tests for ExpressionEvaluator.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ExpressionEvaluatorTests.cs,v 1.72 2008/03/20 23:58:16 oakinger Exp $</version>
+    [TestFixture]
+    public sealed class ExpressionEvaluatorTests
+    {
+        #region Helper classes for threading tests
+
+        public class AsyncTestExpressionEvaluation : AsyncTestTask
+        {
+            private IExpression exp;
+            private object rootContext;
+            private object expected;
+            private IDictionary variables;
+
+            public AsyncTestExpressionEvaluation(int iterations, IExpression exp, object rootContext, object expected,
+                                                 IDictionary variables)
+                : base(iterations)
+            {
+                this.exp = exp;
+                this.rootContext = rootContext;
+                this.expected = expected;
+                this.variables = variables;
+            }
+
+            public override void DoExecute()
+            {
+                object result = exp.GetValue(rootContext, variables);
+                Assert.AreEqual(expected, result);
+            }
+        }
+
+        #endregion
+
+        private Inventor tesla;
+        private Inventor pupin;
+        private Society ieee;
+
+        #region SetUp and TearDown
+
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public void SetUp()
+        {
+            ContextRegistry.Clear();
+            tesla = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            tesla.Inventions = new string[]
+                {
+                    "Telephone repeater", "Rotating magnetic field principle",
+                    "Polyphase alternating-current system", "Induction motor",
+                    "Alternating-current power transmission", "Tesla coil transformer",
+                    "Wireless communication", "Radio", "Fluorescent lights"
+                };
+            tesla.PlaceOfBirth.City = "Smiljan";
+
+            pupin = new Inventor("Mihajlo Pupin", new DateTime(1854, 10, 9), "Serbian");
+            pupin.Inventions =
+                new string[] { "Long distance telephony & telegraphy", "Secondary X-Ray radiation", "Sonar" };
+            pupin.PlaceOfBirth.City = "Idvor";
+            pupin.PlaceOfBirth.Country = "Serbia";
+
+            ieee = new Society();
+            ieee.Members.Add(tesla);
+            ieee.Members.Add(pupin);
+            ieee.Officers["president"] = pupin;
+            ieee.Officers["advisors"] = new Inventor[] { tesla, pupin };
+            // not historically accurate, but I need an array in the map ;-)
+
+            TypeRegistry.RegisterType("Society", typeof(Society));
+        }
+
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            //DynamicCodeManager.SaveAssembly();
+        }
+
+        #endregion
+
+        #region Serialization Tests
+
+        /// <summary>
+        /// GetObjectData() is not overridden on purpose !!!
+        /// </summary>
+        [Serializable]
+        private class SerializationTestExpression : BaseNode
+        {
+            private int testValue = 0;
+
+            public int TestValue
+            {
+                get { return testValue; }
+            }
+
+            public SerializationTestExpression(int testValue)
+            {
+                this.testValue = testValue;
+            }
+
+            protected SerializationTestExpression(SerializationInfo info, StreamingContext context)
+                : base(info, context)
+            {
+            }
+
+            protected override object Get(object context, EvaluationContext evalContext)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        /// <summary>
+        /// Tests serialization + deserialization of all BaseNode derived types
+        /// </summary>
+        [Test]
+        public void AllExpressionNodeTypesAreSerializable()
+        {
+            Type[] possibleTypes = typeof(BaseNode).Assembly.GetTypes();
+
+            BinaryFormatter formatter = new BinaryFormatter();
+
+            // look for all BaseNode derived types defined in assembly Spring.Core
+            for (int i = 0; i < possibleTypes.Length; i++)
+            {
+                Type t = possibleTypes[i];
+                if (t != typeof(BaseNode)
+                    && typeof(BaseNode).IsAssignableFrom(t)
+                    && (!t.IsAbstract)
+                    )
+                {
+                    //Console.WriteLine("testing " + t.FullName);
+
+                    // create using for public default ctor
+                    IExpression exp = (IExpression)Activator.CreateInstance(t, true);
+                    // serialize and deserialize it
+                    exp = SerializeDeserializeExpression(exp);
+                    exp = SerializeDeserializeExpressionUsingSoap(exp);
+                }
+            }
+        }
+
+        /// <summary>
+        /// <see cref="SpringAST"/> implements <see cref="ISerializable"/>.
+        /// Thus members in derived classes won't get automatically serialized.
+        /// </summary>
+        [Test]
+        public void MembersDontGetSerializedByDefault()
+        {
+            SerializationTestExpression exp = new SerializationTestExpression(5);
+            Assert.AreEqual(5, exp.TestValue);
+            SerializationTestExpression exp2 = (SerializationTestExpression)SerializeDeserializeExpression(exp);
+            Assert.AreEqual(0, exp2.TestValue);
+        }
+
+        /// <summary>
+        /// This test ensures, that the default node-type is serializable.
+        /// </summary>
+        /// <remarks>
+        /// date() is parsed into DateLiteralNode( down:&lt;default node type&gt; ).
+        /// Normally antlr.CommonAST is the default node used by antlr. To enable serialization, Spring
+        /// uses a custom ASTFactory in <see cref="Expression.Parse"/>
+        /// </remarks>
+        [Test]
+        public void ExpressionDateLiteralNodeMaintainsStateAfterSerialization()
+        {
+            IExpression exp = Expression.Parse("date('08-24-1974', 'MM-dd-yyyy')");
+
+            Assert.AreEqual(new DateTime(1974, 8, 24), exp.GetValue(null));
+
+            exp = SerializeDeserializeExpression(exp);
+
+            Assert.AreEqual(new DateTime(1974, 8, 24), exp.GetValue(null));
+        }
+
+        private static IExpression SerializeDeserializeExpression(IExpression exp)
+        {
+            byte[] data;
+            BinaryFormatter formatter = new BinaryFormatter();
+            using (MemoryStream ms = new MemoryStream())
+            {
+                formatter.Serialize(ms, exp);
+                ms.Flush();
+                data = ms.ToArray();
+            }
+
+            using (MemoryStream ms = new MemoryStream(data))
+            {
+                exp = (IExpression)formatter.Deserialize(ms);
+            }
+
+            return exp;
+        }
+
+        private static IExpression SerializeDeserializeExpressionUsingSoap(IExpression exp)
+        {
+            string xml;
+            SoapFormatter formatter = new SoapFormatter();
+            using (MemoryStream ms = new MemoryStream())
+            {
+                formatter.Serialize(ms, exp);
+                ms.Position = 0;
+                byte[] b = new byte[ms.Length];
+                ms.Read(b, 0, (int)ms.Length);
+                xml = Encoding.ASCII.GetString(b, 0, b.Length);
+            }
+            using (StringReader sr = new StringReader(xml))
+            {
+                byte[] b = Encoding.ASCII.GetBytes(xml);
+                Stream stream = new MemoryStream(b);
+                exp = (IExpression)formatter.Deserialize(stream);
+            }
+            return exp;
+        }
+
+        #endregion Serialization Tests
+
+        /// <summary>
+        /// Should throw exception for null root object
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(NullValueInNestedPathException))]
+        public void NullRoot()
+        {
+            ExpressionEvaluator.GetValue(null, "dummy.expression");
+        }
+
+        /// <summary>
+        /// Should throw exception for null root object
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(NotSupportedException))]
+        public void TryingToSetTheValueOfNonSettableNode()
+        {
+            ExpressionEvaluator.SetValue(null, "10", 5);
+        }
+
+        /// <summary>
+        /// Should return root itself for empty expression
+        /// </summary>
+        [Test]
+        public void GetNullOrEmptyExpression()
+        {
+            DateTime now = DateTime.Now;
+            Assert.AreEqual(ExpressionEvaluator.GetValue(now, null), now);
+            Assert.AreEqual(ExpressionEvaluator.GetValue(now, ""), now);
+        }
+
+        /// <summary>
+        /// Should fail when setting value for the empty expression
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(NotSupportedException))]
+        public void SetNullOrEmptyExpression()
+        {
+            ExpressionEvaluator.SetValue("xyz", null, "abc");
+        }
+
+        /// <summary>
+        /// Tests null literal.
+        /// </summary>
+        [Test]
+        public void TestNullLiteral()
+        {
+            Assert.IsNull(ExpressionEvaluator.GetValue(null, "null"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "'xyz' == null"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "null != 'xyz'"));
+        }
+
+        [Test]
+        public void TestUnicode()
+        {
+            Assert.AreEqual("\u6f22\u5b57", ExpressionEvaluator.GetValue(null, "'\u6f22\u5b57'"));
+        }
+        /// <summary>
+        /// Tests string literals.
+        /// </summary>
+        [Test]
+        public void TestStringLiterals()
+        {
+            Assert.AreEqual("literal string", ExpressionEvaluator.GetValue(null, "'literal string'"));
+            Assert.AreEqual("literal 'string", ExpressionEvaluator.GetValue(null, "'literal ''string'"));
+            Assert.AreEqual(string.Empty, ExpressionEvaluator.GetValue(null, "''"));
+            Assert.AreEqual("escaped \t string \n", ExpressionEvaluator.GetValue(null, "'escaped \t string \n'"));
+            //Debug.Write(ExpressionEvaluator.GetValue(null, "'escaped\tstring\nsecond line\n\nfourth line'"));
+        }
+
+        /// <summary>
+        /// Tests integer literals.
+        /// </summary>
+        [Test]
+        public void TestIntLiterals()
+        {
+            object int32 = ExpressionEvaluator.GetValue(null, Int32.MaxValue.ToString());
+            object int64 = ExpressionEvaluator.GetValue(null, Int64.MaxValue.ToString());
+            Assert.AreEqual(int32, Int32.MaxValue);
+            Assert.AreEqual(int64, Int64.MaxValue);
+            Assert.IsTrue(int32 is Int32);
+            Assert.IsTrue(int64 is Int64);
+            Assert.AreEqual(Int64.MaxValue.ToString(),
+                            ExpressionEvaluator.GetValue(null, Int64.MaxValue.ToString() + ".ToString()"));
+            Assert.AreEqual(Int64.MaxValue.ToString(), ExpressionEvaluator.GetValue(null, "long.MaxValue.ToString()"));
+            Assert.AreEqual(32, ExpressionEvaluator.GetValue(null, "0x20"));
+        }
+
+        /// <summary>
+        /// Tests hexadecimal integer literals.
+        /// </summary>
+        [Test]
+        public void TestHexLiterals()
+        {
+            IExpression exp = Expression.Parse("0x20");
+            Assert.AreEqual(32, exp.GetValue());
+            Assert.AreEqual(32, exp.GetValue());
+            Assert.AreEqual(255, ExpressionEvaluator.GetValue(null, "0xFF"));
+            Assert.AreEqual(Int32.MaxValue, ExpressionEvaluator.GetValue(null, "0x7FFFFFFF"));
+            Assert.AreEqual(Int64.MaxValue, ExpressionEvaluator.GetValue(null, "0x7FFFFFFFFFFFFFFF"));
+            Assert.AreEqual(Int32.MinValue, ExpressionEvaluator.GetValue(null, "0x80000000"));
+            Assert.AreEqual(Int64.MinValue, ExpressionEvaluator.GetValue(null, "0x8000000000000000"));
+        }
+
+        /// <summary>
+        /// Tests real literals.
+        /// </summary>
+        [Test]
+        public void TestRealLiterals()
+        {
+            IExpression exp = Expression.Parse("3.402823E+38");
+            exp.GetValue();
+            object s = exp.GetValue();
+            object d = ExpressionEvaluator.GetValue(null, "1.797693E+308");
+            object dec = ExpressionEvaluator.GetValue(null, "1000.00m");
+
+
+            Assert.IsTrue(s is Double);
+            Assert.IsTrue(d is Double);
+            Assert.IsTrue(dec is Decimal);
+
+            Assert.AreEqual(s, 3.402823E+38);
+            Assert.AreEqual(d, 1.797693E+308);
+
+            Assert.AreEqual(5.25F, ExpressionEvaluator.GetValue(null, "5.25f"));
+            Assert.AreEqual(0.75d, ExpressionEvaluator.GetValue(null, "0.75D"));
+
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "1000 == 1e3 and 1e+4 != 1000"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "100 < 1000.00m and 10000.00 > 1000"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "100 < 1000.00 and 10000.00m > 1e2"));
+        }
+
+        /// <summary>
+        /// Tests boolean literals.
+        /// </summary>
+        [Test]
+        public void TestBooleanLiterals()
+        {
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false"));
+        }
+
+        /// <summary>
+        /// Tests date literals.
+        /// </summary>
+        [Test]
+        public void TestDateLiterals()
+        {
+            IExpression exp = Expression.Parse("date('1974/08/24')");
+            Assert.AreEqual(exp.GetValue(), new DateTime(1974, 8, 24));
+            Assert.AreEqual(exp.GetValue(), new DateTime(1974, 8, 24));
+            Assert.AreEqual(ExpressionEvaluator.GetValue(null, "date('1974-08-24')"), new DateTime(1974, 8, 24));
+            Assert.AreEqual(ExpressionEvaluator.GetValue(null, "date('08-24-1974', 'MM-dd-yyyy')"),
+                            new DateTime(1974, 8, 24));
+            Assert.AreEqual(ExpressionEvaluator.GetValue(null, "date('08/24/1974', 'MM/dd/yyyy')"),
+                            new DateTime(1974, 8, 24));
+            Assert.AreEqual(ExpressionEvaluator.GetValue(null, "date('1974-08-24 12:35:06Z', 'u')"),
+                            new DateTime(1974, 8, 24, 12, 35, 6));
+            Assert.AreEqual(ExpressionEvaluator.GetValue(null, "date('1974/08/24').Year"), 1974);
+            Assert.AreEqual(ExpressionEvaluator.GetValue(null, "date('1974/08/24').AddYears(31).Year"), 2005);
+        }
+
+        /// <summary>
+        /// Tests simple property and field accessors and mutators
+        /// </summary>
+        [Test]
+        public void TestSimplePropertyAccess()
+        {
+            Assert.AreEqual(DateTime.Today, ExpressionEvaluator.GetValue(null, "DateTime.Today"));
+            Assert.AreEqual("Nikola Tesla", ExpressionEvaluator.GetValue(tesla, "Name"));
+            Assert.AreEqual("Idvor", ExpressionEvaluator.GetValue(pupin, "PlaceOfBirth.City"));
+            ExpressionEvaluator.SetValue(tesla, "PlaceOfBirth.Country", "Croatia");
+            Assert.AreEqual("Croatia", ExpressionEvaluator.GetValue(tesla, "PlaceOfBirth.Country"));
+            ExpressionEvaluator.SetValue(pupin, "Name", "Michael Pupin");
+            Assert.AreEqual("Michael Pupin", ExpressionEvaluator.GetValue(pupin, "Name"));
+            Assert.AreEqual(new DateTime(1856, 7, 9), ExpressionEvaluator.GetValue(tesla, "DOB"));
+            Assert.AreEqual(1856, ExpressionEvaluator.GetValue(tesla, "DOB.Year"));
+        }
+
+        /// <summary>
+        /// Tests that simple property and field accessors and mutators are case-insensitive.
+        /// </summary>
+        [Test]
+        public void SimplePropertyAccessIsCaseInsensitive()
+        {
+            Assert.AreEqual("Nikola Tesla", ExpressionEvaluator.GetValue(tesla, "nAme"));
+            Assert.AreEqual("Idvor", ExpressionEvaluator.GetValue(pupin, "Placeofbirth.city"));
+            ExpressionEvaluator.SetValue(tesla, "PlaceOfBirth.CountRY", "Croatia");
+            Assert.AreEqual("Croatia", ExpressionEvaluator.GetValue(tesla, "Placeofbirth.COUNtry"));
+            ExpressionEvaluator.SetValue(pupin, "NAME", "Michael Pupin");
+            Assert.AreEqual("Michael Pupin", ExpressionEvaluator.GetValue(pupin, "name"));
+            Assert.AreEqual(new DateTime(1856, 7, 9), ExpressionEvaluator.GetValue(tesla, "dob"));
+            Assert.AreEqual(1856, ExpressionEvaluator.GetValue(tesla, "DOb.YEar"));
+        }
+
+        /// <summary>
+        /// Tests setting and getting shadowed properties
+        /// </summary>
+        [Test]
+        public void TestShadowedPropertyAccess()
+        {
+            ShadowingTestsMostSpezializedClass o;
+
+            // test read
+            o = new ShadowingTestsMostSpezializedClass();
+            o.SomeValue = "SomeString";
+            Assert.AreEqual("SomeString", ExpressionEvaluator.GetValue(o, "SomeValue"));
+
+            // test write
+            o = new ShadowingTestsMostSpezializedClass();
+            ExpressionEvaluator.SetValue(o, "SomeValue", "SomeOtherString");
+            Assert.AreEqual("SomeOtherString", o.SomeValue);
+
+            // test readonly shadowed
+            o = new ShadowingTestsMostSpezializedClass();
+            ((ShadowingTestsBaseClass)o).ReadonlyShadowedValue = "SomeString1";
+            Assert.AreEqual("SomeString1", ExpressionEvaluator.GetValue(o, "ReadonlyShadowedValue"));
+            try
+            {
+                ExpressionEvaluator.SetValue(o, "ReadonlyShadowedValue", "SomeString2");
+                Assert.Fail("Setting readonly property should throw NotWritablePropertyException");
+            }
+            catch (NotWritablePropertyException)
+            { }
+            Assert.AreEqual("SomeString1", ExpressionEvaluator.GetValue(o, "ReadonlyShadowedValue"));
+
+            // test writeonly shadowed
+            o = new ShadowingTestsMostSpezializedClass();
+            ExpressionEvaluator.SetValue(o, "WriteonlyShadowedValue", "SomeString3");
+            Assert.AreEqual("SomeString3", ((ShadowingTestsBaseClass)o).WriteonlyShadowedValue);
+            try
+            {
+                ExpressionEvaluator.GetValue(o, "WriteonlyShadowedValue");
+                Assert.Fail("Getting writeonly property should throw NotReadablePropertyException");
+            }
+            catch (NotReadablePropertyException)
+            { }
+        }
+
+        /// <summary>
+        /// Tests indexed property and field accessors and mutators
+        /// </summary>
+        [Test]
+        public void TestIndexedPropertyAccess()
+        {
+            TypeRegistry.RegisterType("Society", typeof(Society));
+
+            // arrays and lists
+            Assert.AreEqual("Induction motor", ExpressionEvaluator.GetValue(tesla, "Inventions[3]"));
+            Assert.AreEqual("Nikola Tesla", ExpressionEvaluator.GetValue(ieee, "Members[0].Name"));
+            Assert.AreEqual("Wireless communication", ExpressionEvaluator.GetValue(ieee, "Members[0].Inventions[6]"));
+
+            // maps
+            Assert.AreEqual(pupin, ExpressionEvaluator.GetValue(ieee, "Officers['president']"));
+            Assert.AreEqual("Idvor", ExpressionEvaluator.GetValue(ieee, "Officers['president'].PlaceOfBirth.City"));
+            Assert.AreEqual(tesla, ExpressionEvaluator.GetValue(ieee, "Officers['advisors'][0]"));
+            Assert.AreEqual("Polyphase alternating-current system",
+                            ExpressionEvaluator.GetValue(ieee, "Officers['advisors'][0].Inventions[2]"));
+
+            // maps with non-literal parameters
+            IDictionary vars = new Hashtable();
+            vars["prez"] = "president";
+            Assert.AreEqual(pupin, ExpressionEvaluator.GetValue(ieee, "Officers[#prez]", vars));
+
+            Assert.AreEqual(pupin, ExpressionEvaluator.GetValue(ieee, "Officers[Society.President]"));
+            Assert.AreEqual("Idvor", ExpressionEvaluator.GetValue(ieee, "Officers[Society.President].PlaceOfBirth.City"));
+            Assert.AreEqual(tesla, ExpressionEvaluator.GetValue(ieee, "Officers[Society.Advisors][0]"));
+            Assert.AreEqual("Polyphase alternating-current system",
+                            ExpressionEvaluator.GetValue(ieee, "Officers[Society.Advisors][0].Inventions[2]"));
+
+            // try to set some values
+            ExpressionEvaluator.SetValue(ieee, "Officers['advisors'][0].PlaceOfBirth.Country", "Croatia");
+            Assert.AreEqual("Croatia", ExpressionEvaluator.GetValue(tesla, "PlaceOfBirth.Country"));
+            ExpressionEvaluator.SetValue(ieee, "Officers['president'].Name", "Michael Pupin");
+            Assert.AreEqual("Michael Pupin", ExpressionEvaluator.GetValue(pupin, "Name"));
+            ExpressionEvaluator.SetValue(ieee, "Officers['advisors']", new Inventor[] { pupin, tesla });
+            Assert.AreEqual(pupin, ExpressionEvaluator.GetValue(ieee, "Officers['advisors'][0]"));
+            Assert.AreEqual(tesla, ExpressionEvaluator.GetValue(ieee, "Officers['advisors'][1]"));
+
+            // generic indexer
+            Bar bar = new Bar();
+            Foo foo = new Foo();
+            IExpression exp = Expression.Parse("[1]");
+            Assert.AreEqual(2, exp.GetValue(bar));
+            Assert.AreEqual(2, exp.GetValue(bar));
+            Assert.AreEqual("test_1", ExpressionEvaluator.GetValue(foo, "[1, 'test']"));
+        }
+
+        /// <summary>
+        /// Tests indexer access with invalid number of indices
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(InvalidPropertyException))]
+        public void TestIndexedPropertyAccessWithInvalidNumberOfIndices()
+        {
+            ExpressionEvaluator.GetValue(tesla, "Inventions[3, 2]");
+        }
+
+        /// <summary>
+        /// Tests method accessors
+        /// </summary>
+        [Test]
+        public void TestMethodAccess()
+        {
+            Guid guid = Guid.NewGuid();
+
+            TypeRegistry.RegisterType("Guid", typeof(Guid));
+            Assert.AreEqual(guid.ToString(), ExpressionEvaluator.GetValue(guid, "ToString()"));
+            Assert.AreEqual(guid.ToString("n"), ExpressionEvaluator.GetValue(guid, "ToString('n')"));
+            Assert.AreEqual(16, ExpressionEvaluator.GetValue(null, "Guid.NewGuid().ToByteArray().Length"));
+
+            Assert.AreEqual(2005 - tesla.DOB.Year,
+                            ExpressionEvaluator.GetValue(ieee, "Members[0].GetAge(date('2005-01-01'))"));
+        }
+
+        [Test]
+        public void TestMethodEvaluationOnDifferentContextType()
+        {
+            IExpression expression = Expression.Parse("ToString('dummy', null)");
+            Assert.AreEqual("dummy", expression.GetValue(0m, null));
+            Assert.AreEqual("dummy", expression.GetValue(0, null));
+        }
+
+        [Test]
+        public void TestMethodEvaluationOnDifferentArgumentTypes()
+        {
+            IExpression expression = Expression.Parse("Foo(#var1)");
+            MethodInvokationCases testContext = new MethodInvokationCases();
+            Hashtable args = new Hashtable();
+            args["var1"] = "myString";
+            Assert.AreEqual("myString", expression.GetValue(testContext, args));
+            args["var1"] = 12;
+            Assert.AreEqual(12, expression.GetValue(testContext, args));
+        }
+
+        /// <summary>
+        /// Tests missing method accessors
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestMissingMethodAccess()
+        {
+            ExpressionEvaluator.GetValue("xyz", "ToStringilyLingily()");
+        }
+
+        /// <summary>
+        /// Tests projection node
+        /// </summary>
+        [Test]
+        public void TestProjection()
+        {
+            IList placesOfBirth = (IList)ExpressionEvaluator.GetValue(ieee, "Members.!{PlaceOfBirth.City}");
+
+            Assert.AreEqual(2, placesOfBirth.Count);
+            Assert.AreEqual("Smiljan", placesOfBirth[0]);
+            Assert.AreEqual("Idvor", placesOfBirth[1]);
+
+            IList names = (IList)ExpressionEvaluator.GetValue(ieee, "Officers['advisors'].!{Name}");
+            Assert.AreEqual(2, names.Count);
+            Assert.AreEqual("Nikola Tesla", names[0]);
+            Assert.AreEqual("Mihajlo Pupin", names[1]);
+        }
+
+        /// <summary>
+        /// Tests selection node
+        /// </summary>
+        [Test]
+        public void TestSelection()
+        {
+            IList memberSelection =
+                (IList)ExpressionEvaluator.GetValue(ieee, "Members.?{PlaceOfBirth.City == 'Smiljan'}");
+
+            Assert.AreEqual(1, memberSelection.Count);
+            Assert.AreEqual("Nikola Tesla", ((Inventor)memberSelection[0]).Name);
+
+            IList serbianOfficers =
+                (IList)ExpressionEvaluator.GetValue(ieee, "Officers['advisors'].?{Nationality == 'Serbian'}");
+            Assert.AreEqual(2, serbianOfficers.Count);
+            Assert.AreEqual("Nikola Tesla", ((Inventor)serbianOfficers[0]).Name);
+            Assert.AreEqual("Mihajlo Pupin", ((Inventor)serbianOfficers[1]).Name);
+
+            Inventor first =
+                (Inventor)ExpressionEvaluator.GetValue(ieee, "Officers['advisors'].^{Nationality == 'Serbian'}");
+            Assert.AreEqual("Nikola Tesla", first.Name);
+
+            Inventor last =
+                (Inventor)ExpressionEvaluator.GetValue(ieee, "Officers['advisors'].${Nationality == 'Serbian'}");
+            Assert.AreEqual("Mihajlo Pupin", last.Name);
+        }
+
+        /// <summary>
+        /// Tests type node
+        /// </summary>
+        [Test]
+        public void TestTypeNode()
+        {
+            IExpression exp = Expression.Parse("T(DateTime)");
+            exp.GetValue();
+            Assert.AreEqual(typeof(DateTime), exp.GetValue());
+
+            Assert.AreEqual(typeof(DateTime), ExpressionEvaluator.GetValue(null, "T(System.DateTime)"));
+            Assert.AreEqual(typeof(DateTime[]), ExpressionEvaluator.GetValue(null, "T(System.DateTime[], mscorlib)"));
+            Assert.AreEqual(typeof(ExpressionEvaluator), ExpressionEvaluator.GetValue(null, "T(Spring.Expressions.ExpressionEvaluator, Spring.Core)"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(tesla, "T(System.DateTime) == DOB.GetType()"));
+        }
+
+        /// <summary>
+        /// Tests type node
+        /// </summary>
+        [Test]
+        [Ignore("does not work yet due to parser expecting ID production within T(ID)")]
+        public void TestTypeNodeWithAssemblyQualifiedName()
+        {
+            Assert.AreEqual(typeof(ExpressionEvaluator), ExpressionEvaluator.GetValue(null, string.Format("T({0})", typeof(ExpressionEvaluator).AssemblyQualifiedName)));
+        }
+
+        /// <summary>
+        /// Tests constructor node
+        /// </summary>
+        [Test]
+        public void TestConstructor()
+        {
+            TypeRegistry.RegisterType(typeof(Inventor));
+
+            IExpression exp = Expression.Parse("new System.DateTime(2004, 8, 14)");
+            Assert.AreEqual(1000, ExpressionEvaluator.GetValue(null, "new Decimal(1000)"));
+            Assert.AreEqual(new DateTime(2004, 8, 14), exp.GetValue(null));
+            Assert.AreEqual(new DateTime(2004, 8, 14), exp.GetValue("xyz"));
+            Assert.AreEqual(new DateTime(1974, 8, 24),
+                            ExpressionEvaluator.GetValue(null, "new DateTime(2004, 8, 14).AddDays(10).AddYears(-30)"));
+
+            // test named arguments
+            Inventor ana =
+                (Inventor)
+                ExpressionEvaluator.GetValue(null,
+                                             "new Inventor(Name = 'Ana Maria Seovic', DOB = date('2004-08-14'), Nationality = 'American')");
+            Assert.AreEqual("Ana Maria Seovic", ana.Name);
+            Assert.AreEqual(new DateTime(2004, 8, 14), ana.DOB);
+            Assert.AreEqual("American", ana.Nationality);
+
+            Inventor aleks =
+                (Inventor)
+                ExpressionEvaluator.GetValue(null,
+                                             "new Inventor('Aleksandar Seovic', date('1974-08-24'), 'Serbian', Inventions = {'SPELL'})");
+            Assert.AreEqual("Aleksandar Seovic", aleks.Name);
+            Assert.AreEqual(new DateTime(1974, 8, 24), aleks.DOB);
+            Assert.AreEqual("Serbian", aleks.Nationality);
+            Assert.AreEqual(1, aleks.Inventions.Length);
+            Assert.AreEqual("SPELL", aleks.Inventions[0]);
+        }
+
+        /// <summary>
+        /// Tests missing constructor
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestMissingConstructor()
+        {
+            ExpressionEvaluator.GetValue(null, "new Decimal('xyz')");
+        }
+
+        /// <summary>
+        /// Tests expression list node
+        /// </summary>
+        [Test]
+        public void TestExpressionList()
+        {
+            TypeRegistry.RegisterType("Inventor", typeof(Inventor));
+            Assert.AreEqual(3,
+                            ExpressionEvaluator.GetValue(ieee.Members,
+                                                         "(Add(new Inventor('Aleksandar Seovic', date('1974-08-24'), 'Serbian')); Count)"));
+            Assert.AreEqual(3,
+                            ExpressionEvaluator.GetValue(ieee,
+                                                         "Members.(Add(new Inventor('Ana Maria Seovic', date('2004-08-14'), 'Serbian')); RemoveAt(1); Count)"));
+            Assert.AreEqual("Aleksandar Seovic",
+                            ExpressionEvaluator.GetValue(ieee.Members,
+                                                         "([1].PlaceOfBirth.City = 'Beograd'; [1].PlaceOfBirth.Country = 'Serbia'; [1].Name)"));
+            Assert.AreEqual("Beograd", ((Inventor)ieee.Members[1]).PlaceOfBirth.City);
+        }
+
+        /// <summary>
+        /// Tests assignment node
+        /// </summary>
+        [Test]
+        public void TestAssignNode()
+        {
+            Inventor inventor = new Inventor();
+            Assert.AreEqual("Aleksandar Seovic", ExpressionEvaluator.GetValue(inventor, "Name = 'Aleksandar Seovic'"));
+            Assert.AreEqual(new DateTime(1974, 8, 24),
+                            ExpressionEvaluator.GetValue(inventor, "DOB = date('1974-08-24')"));
+            Assert.AreEqual("Serbian", ExpressionEvaluator.GetValue(inventor, "Nationality = 'Serbian'"));
+            Assert.AreEqual("Ana Maria Seovic",
+                            ExpressionEvaluator.GetValue(inventor,
+                                                         "(DOB = date('2004-08-14'); Name = 'Ana Maria Seovic')"));
+            Assert.AreEqual(new DateTime(2004, 8, 14), inventor.DOB);
+            ExpressionEvaluator.GetValue(ieee, "Officers['vp'] = Members[0]");
+            Assert.AreEqual("Nikola Tesla", ((Inventor)ieee.Officers["vp"]).Name);
+        }
+
+        /// <summary>
+        /// Tests default node
+        /// </summary>
+        [Test]
+        public void TestDefaultNode()
+        {
+            Assert.AreEqual("default", ExpressionEvaluator.GetValue(null, "null ?? 'default'"));
+            Assert.AreEqual(1, ExpressionEvaluator.GetValue(null, "null ?? 2 * 2 - 3"));
+            Assert.AreEqual("Nikola Tesla", ExpressionEvaluator.GetValue(tesla, "null ?? #root.Name"));
+
+            Assert.AreEqual("default", ExpressionEvaluator.GetValue(null, "'default' ?? 'xyz'"));
+            Assert.AreEqual(1, ExpressionEvaluator.GetValue(null, "2 * 2 - 3 ?? 5"));
+            Assert.AreEqual("Nikola Tesla", ExpressionEvaluator.GetValue(tesla, "#root.Name ?? 'Pupin'"));
+        }
+
+        /// <summary>
+        /// Tests variable node
+        /// </summary>
+        [Test]
+        public void TestVariableNode()
+        {
+            IDictionary vars = new Hashtable();
+            vars["newName"] = "Aleksandar Seovic";
+            Assert.AreEqual("Ana Maria Seovic",
+                            ExpressionEvaluator.GetValue(null, "#newName = 'Ana Maria Seovic'", vars));
+            Assert.AreEqual("Ana Maria Seovic", ExpressionEvaluator.GetValue(tesla, "Name = #newName", vars));
+            Assert.AreEqual("Nikola Tesla",
+                            ExpressionEvaluator.GetValue(tesla, "(#oldName = Name; Name = 'Nikola Tesla')", vars));
+            Assert.AreEqual("Nikola Tesla", ((Inventor)ExpressionEvaluator.GetValue(tesla, "#this", vars)).Name);
+            Assert.AreEqual("Nikola Tesla",
+                            ExpressionEvaluator.GetValue(tesla, "(Nationality = 'Srbin'; #this).Name", vars));
+            Assert.AreEqual("Nikola Tesla", tesla.Name);
+            Assert.AreEqual("Srbin", tesla.Nationality);
+            Assert.AreEqual("Ana Maria Seovic", vars["oldName"]);
+            Assert.AreEqual(tesla, ExpressionEvaluator.GetValue(tesla, "#root", vars));
+        }
+
+
+        /// <summary>
+        /// Try to set 'this' variable
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TryToSetThis()
+        {
+            ExpressionEvaluator.SetValue(null, "#this", "xyz");
+        }
+
+        /// <summary>
+        /// Try to set 'root' variable
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TryToSetRoot()
+        {
+            ExpressionEvaluator.SetValue(null, "#root", "xyz");
+        }
+
+        /// <summary>
+        /// Tests ternary node
+        /// </summary>
+        [Test]
+        public void TestTernaryNode()
+        {
+            IExpression exp = Expression.Parse("true ? 'trueExp' : 'falseExp'");
+            exp.GetValue();
+
+            Assert.AreEqual("trueExp", exp.GetValue());
+            Assert.AreEqual("falseExp", ExpressionEvaluator.GetValue(null, "false ? 'trueExp' : 'falseExp'"));
+            Assert.AreEqual("trueExp", ExpressionEvaluator.GetValue(null, "(true ? 'trueExp' : 'falseExp')"));
+            Assert.AreEqual("falseExp", ExpressionEvaluator.GetValue(null, "(false ? 'trueExp' : 'falseExp')"));
+
+            ExpressionEvaluator.SetValue(ieee, "Name", "IEEE");
+            IDictionary vars = new Hashtable();
+            vars["queryName"] = "Nikola Tesla";
+            string expression =
+                @"IsMember(#queryName)
+                    ? #queryName + ' is a member of the ' + Name + ' Society'
+                    : #queryName + ' is not a member of ' + Name + ' Society'";
+            Assert.AreEqual("Nikola Tesla is a member of the IEEE Society",
+                            ExpressionEvaluator.GetValue(ieee, expression, vars));
+        }
+
+        /// <summary>
+        /// Tests logical OR operator
+        /// </summary>
+        [Test]
+        public void TestLogicalOrOperator()
+        {
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true or true"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false or false"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true or false"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "false or true"));
+            string expression = @"IsMember('Nikola Tesla') or IsMember('Albert Einstien')";
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(ieee, expression));
+        }
+
+        /// <summary>
+        /// Tests logical AND operator
+        /// </summary>
+        [Test]
+        public void TestLogicalAndOperator()
+        {
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true and true"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false and false"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "true and false"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false and true"));
+            string expression = @"IsMember('Nikola Tesla') and IsMember('Mihajlo Pupin')";
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(ieee, expression));
+        }
+
+        /// <summary>
+        /// Tests logical NOT operator
+        /// </summary>
+        [Test]
+        public void TestLogicalNotOperator()
+        {
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "!true"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "!false"));
+            string expression = @"IsMember('Nikola Tesla') and !IsMember('Mihajlo Pupin')";
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(ieee, expression));
+        }
+
+        /// <summary>
+        /// Tests logical operator presedance
+        /// </summary>
+        [Test]
+        public void TestLogicalOperatorPresedance()
+        {
+            // NOT over AND
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "!false and false"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "!false and true"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "!true and false"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "!true and true"));
+
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "!(false and false)"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "!(false and true)"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "!(true and false)"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "!(true and true)"));
+
+            // NOT over OR
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "!false or false"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "!false or true"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "!true or false"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "!true or true"));
+
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "!(false or false)"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "!(false or true)"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "!(true or false)"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "!(true or true)"));
+
+            // AND over OR
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false and false or false"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "false and false or true"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false and true or false"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "false and true or true"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "true and false or false"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true and false or true"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true and true or false"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true and true or true"));
+
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false and (false or false)"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false and (false or true)"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false and (true or false)"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false and (true or true)"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "true and (false or false)"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true and (false or true)"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true and (true or false)"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true and (true or true)"));
+        }
+
+        /// <summary>
+        /// Tests equality operator.
+        /// </summary>
+        [Test]
+        public void TestEqualityOperator()
+        {
+            // Null
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "null == null"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "null == 'xyz'"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "123 == null"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "null == 123"));
+
+            // Bool
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "false == false"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true == true"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false == true"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "true == false"));
+
+            // Int
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "2 == 2"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "-5 == -5"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "2 == -5"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "-5 == 2"));
+
+            // String
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'test' == 'test'"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "'Test' == 'test'"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "'test' == 'Test'"));
+
+            // DateTime
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "date('1974-08-24') == date('1974-08-24')"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "DateTime.Today == DateTime.Today"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "DateTime.Today == date('1974-08-24')"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "date('1974-08-24') == DateTime.Today"));
+
+            // Enums
+            Foo foo = new Foo(FooType.One);
+            TypeRegistry.RegisterType("FooType", typeof(FooType));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(foo, "Type == FooType.One"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(foo, "Type == 'One'"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(foo, "Type == 'Two'"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(foo, "FooType.One == Type"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(foo, "'One' == Type"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(foo, "'Two' == Type"));
+        }
+
+        /// <summary>
+        /// Tests inequality operator.
+        /// </summary>
+        [Test]
+        public void TestInqualityOperator()
+        {
+            // Null
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "null != null"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "123 != null"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "null != 'xyz'"));
+
+            // Bool
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false != false"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "true != true"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "false != true"));
+
+            // Int
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "2 != 2.0"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "-5.0 != -5"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "2.0 != -5"));
+
+            // String
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "'test' != 'test'"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'Test' != 'test'"));
+
+            // DateTime
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "date('1974-08-24') != date('1974-08-24')"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "DateTime.Today != DateTime.Today"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "DateTime.Today != date('1974-08-24')"));
+        }
+
+        /// <summary>
+        /// Tests less than operator.
+        /// </summary>
+        [Test]
+        public void TestLessThanOperator()
+        {
+            // Null
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "null < null"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "123 < null"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "null < 'xyz'"));
+
+            // Bool
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "false < true"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "true < true"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "true < false"));
+
+            // Int
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "2 < 2.0"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "-5.0 < 2"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "2 < -5.0"));
+
+            // String
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "'test' < 'test'"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "'Test' < 'test'"));
+
+            // DateTime
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "date('1974-08-24') < date('1974-08-24')"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "date('1974-08-24') < DateTime.Today"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "DateTime.Today < date('1974-08-24')"));
+        }
+
+        /// <summary>
+        /// Tests less than or equal operator.
+        /// </summary>
+        [Test]
+        public void TestLessThanOrEqualOperator()
+        {
+            // Null
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "null <= null"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "123 <= null"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "null <= 'xyz'"));
+
+            // Bool
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "false <= true"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true <= true"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "true <= false"));
+
+            // Int
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "2 <= 2.0"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "-5.0 <= 2"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "2.0 <= -5"));
+
+            // String
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'test' <= 'test'"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "'Test' <= 'test'"));
+
+            // DateTime
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "date('1974-08-24') <= date('1974-08-24')"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "date('1974-08-24') <= DateTime.Today"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "DateTime.Today <= date('1974-08-24')"));
+        }
+
+        /// <summary>
+        /// Tests greater than operator.
+        /// </summary>
+        [Test]
+        public void TestGreaterThanOperator()
+        {
+            // Null
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "null > null"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "123 > null"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "null > 'xyz'"));
+
+            // Bool
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false > true"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "true > true"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true > false"));
+
+            // Int
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "2 > 2.0"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "-5.0 > 2"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "2 > -5.0"));
+
+            // String
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "'test' > 'test'"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'Test' > 'test'"));
+
+            // DateTime
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "date('1974-08-24') > date('1974-08-24')"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "date('1974-08-24') > DateTime.Today"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "DateTime.Today > date('1974-08-24')"));
+        }
+
+        /// <summary>
+        /// Tests greater than or equal operator.
+        /// </summary>
+        [Test]
+        public void TestGreaterThanOrEqualOperator()
+        {
+            // Null
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "null >= null"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "123 >= null"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "null >= 'xyz'"));
+
+            // Bool
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "false >= true"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true >= true"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "true >= false"));
+
+            // Int
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "2.0 >= 2"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "-5 >= 2.0"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "2.0 >= -5"));
+
+            // String
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'test' >= 'test'"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'Test' >= 'test'"));
+
+            // DateTime
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "date('1974-08-24') >= date('1974-08-24')"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "date('1974-08-24') >= DateTime.Today"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "DateTime.Today >= date('1974-08-24')"));
+        }
+
+        /// <summary>
+        /// Tests IN operator.
+        /// </summary>
+        [Test]
+        public void TestInOperator()
+        {
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "null in null"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "3 in {1, 2, 3, 4, 5}"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "!(3 in {1, 2, 3, 4, 5})"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'xyz' in new string[] {'abc', 'xyz'}"));
+            Assert.IsTrue(
+                (bool)ExpressionEvaluator.GetValue(null, "'xyz' in #{'abc' : 'Value 1', 'xyz' : DateTime.Today}"));
+        }
+
+        /// <summary>
+        /// Tests IS operator.
+        /// </summary>
+        [Test]
+        public void TestIsOperator()
+        {
+            TypeRegistry.RegisterType(typeof(IList));
+            TypeRegistry.RegisterType(typeof(IDictionary));
+
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "null is null"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "5 is null"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "null is int"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "5 is int"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "!(5 is int)"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "{1, 2, 3, 4, 5} is IList"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "new string[] {'abc', 'xyz'} is T(string[])"));
+            Assert.IsTrue(
+                (bool)ExpressionEvaluator.GetValue(null, "#{'abc' : 'Value 1', 'xyz' : DateTime.Today} is IDictionary"));
+        }
+
+        /// <summary>
+        /// Tests BETWEEN operator.
+        /// </summary>
+        [Test]
+        public void TestBetweenOperator()
+        {
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "null between {1, 5}"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "0 between {1, 5}"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "1 between {1, 5}"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "3 between {1, 5}"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "5 between {1, 5}"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "6 between {1, 5}"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "!(6 between {1, 5})"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'efg' between {'abc', 'xyz'}"));
+            Assert.IsTrue(
+                (bool)ExpressionEvaluator.GetValue(null, "DateTime.Today between {DateTime.Today, DateTime.Now}"));
+            Assert.IsFalse(
+                (bool)ExpressionEvaluator.GetValue(null, "DateTime.Today between {DateTime.Now, DateTime.Now}"));
+        }
+
+        /// <summary>
+        /// Tests LIKE operator.
+        /// </summary>
+        [Test]
+#if !NET_2_0
+        [ExpectedException(typeof(NotSupportedException))]
+#endif
+        public void TestLikeOperator()
+        {
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'A' like '?'"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "'Abc' like '?'"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'Abc' like '[A-Z]b?'"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'Abc' like '*'"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'Aleksandar' like 'Aleks*'"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'Ana Maria Seovic' like '*Maria*'"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, "'Marija Seovic' like '*Seovic'"));
+        }
+
+        /// <summary>
+        /// Tests MATCHES operator.
+        /// </summary>
+        [Test]
+        public void TestMatchesOperator()
+        {
+            string emailCheck =
+                @"^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$";
+
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(emailCheck, "'A' matches #this"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(emailCheck, "'aleks@seovic.com' matches #this"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(emailCheck, "'@seovic.com' matches #this"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(emailCheck, "'seovic.com' matches #this"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(emailCheck, "'aleks' matches #this"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(emailCheck, "'aleks@' matches #this"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(emailCheck, "'aleks@seovic' matches #this"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "'5.0067' matches '^-?\\d+(\\.\\d{2})?$'"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(null, @"'5.00' matches '^-?\d+(\.\d{2})?$'"));
+        }
+
+        /// <summary>
+        /// Type coercion failure.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestTypeCoercionForUncoercableTypes()
+        {
+            ExpressionEvaluator.GetValue(null, "'xyz' > 123");
+        }
+
+        /// <summary>
+        /// Type comparison failure.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestComparisonOfInstancesThatDoNotImplementIComparable()
+        {
+            IDictionary vars = new Hashtable();
+            vars["tesla"] = tesla;
+            vars["pupin"] = pupin;
+            ExpressionEvaluator.GetValue(null, "#tesla > #pupin", vars);
+        }
+
+        /// <summary>
+        /// Tests addition operator.
+        /// </summary>
+        [Test]
+        public void TestAddOperator()
+        {
+            // numbers
+            Assert.AreEqual(2, ExpressionEvaluator.GetValue(null, "1 + 1"));
+            Assert.AreEqual(2, ExpressionEvaluator.GetValue(null, "1e0 + 1"));
+            Assert.AreEqual(0, ExpressionEvaluator.GetValue(null, "-1e0 + 1"));
+            Assert.AreEqual(-2, ExpressionEvaluator.GetValue(null, "-1e0 + -1"));
+            Assert.AreEqual(Decimal.Parse("2.0", NumberFormatInfo.InvariantInfo),
+                            ExpressionEvaluator.GetValue(null, "1.0m + 1.0"));
+            Assert.AreEqual(9, ExpressionEvaluator.GetValue(null, "2.0 + 3e0 + 4"));
+
+            // strings
+            Assert.AreEqual("test string", ExpressionEvaluator.GetValue(null, "'test' + ' ' + 'string'"));
+            Assert.AreEqual("test 2", ExpressionEvaluator.GetValue(null, "'test' + ' ' + 2"));
+            Assert.AreEqual("test " + DateTime.Today.ToString(),
+                            ExpressionEvaluator.GetValue(null, "'test' + ' ' + DateTime.Today"));
+
+            // dates
+            DateTime anaDOB = new DateTime(2004, 8, 14);
+            DateTime aleksDOB = new DateTime(1974, 8, 24);
+            TimeSpan diff = anaDOB - aleksDOB;
+            IDictionary vars = new Hashtable();
+            vars["ts"] = diff;
+
+            Assert.AreEqual(anaDOB, ExpressionEvaluator.GetValue(null, "date('1974-08-24') + #ts", vars));
+            Assert.AreEqual(new DateTime(1974, 8, 29), ExpressionEvaluator.GetValue(null, "date('1974-08-24') + 5"));
+            Assert.AreEqual(new DateTime(1974, 8, 29),
+                            ExpressionEvaluator.GetValue(null, "date('1974-08-24') + '5.0:0'"));
+        }
+
+        /// <summary>
+        /// Tests addition operator with invalid arguments.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestAddOperatorWithInvalidArguments()
+        {
+            ExpressionEvaluator.GetValue(null, "DateTime.Today + false");
+        }
+
+        /// <summary>
+        /// Tests subtraction operator.
+        /// </summary>
+        [Test]
+        public void TestSubtractOperator()
+        {
+            // numbers
+            Assert.AreEqual(2, ExpressionEvaluator.GetValue(null, "3 - 1"));
+            Assert.AreEqual(-2, ExpressionEvaluator.GetValue(null, "1 - 3"));
+            Assert.AreEqual(4, ExpressionEvaluator.GetValue(null, "1 - -3"));
+            Assert.AreEqual(Decimal.Parse("-9000.00", NumberFormatInfo.InvariantInfo),
+                            ExpressionEvaluator.GetValue(null, "1000.00m - 1e4"));
+            Assert.AreEqual(-5, ExpressionEvaluator.GetValue(null, "2.0 - 3e0 - 4"));
+
+            // dates
+            DateTime anaDOB = new DateTime(2004, 8, 14);
+            DateTime aleksDOB = new DateTime(1974, 8, 24);
+            TimeSpan diff = anaDOB - aleksDOB;
+            IDictionary vars = new Hashtable();
+            vars["ts"] = diff;
+
+            Assert.AreEqual(aleksDOB, ExpressionEvaluator.GetValue(null, "date('2004-08-14') - #ts", vars));
+            Assert.AreEqual(diff, ExpressionEvaluator.GetValue(null, "date('2004-08-14') - date('1974-08-24')"));
+            Assert.AreEqual(new DateTime(1974, 8, 19), ExpressionEvaluator.GetValue(null, "date('1974-08-24') - 5"));
+            Assert.AreEqual(new DateTime(1974, 8, 19),
+                            ExpressionEvaluator.GetValue(null, "date('1974-08-24') - '5.0:0'"));
+        }
+
+        /// <summary>
+        /// Tests subtraction operator with invalid arguments.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestSubtractOperatorWithInvalidArguments()
+        {
+            ExpressionEvaluator.GetValue(null, "DateTime.Today - false");
+        }
+
+        /// <summary>
+        /// Tests multiplication operator.
+        /// </summary>
+        [Test]
+        public void TestMultiplyOperator()
+        {
+            Assert.AreEqual(4, ExpressionEvaluator.GetValue(null, "2 * 2"));
+            Assert.AreEqual(-6, ExpressionEvaluator.GetValue(null, "2 * -3"));
+            Assert.AreEqual(6, ExpressionEvaluator.GetValue(null, "-2 * -3"));
+            Assert.AreEqual(Decimal.Parse("1000000.00", NumberFormatInfo.InvariantInfo),
+                            ExpressionEvaluator.GetValue(null, "1000.00m * 1e3"));
+            Assert.AreEqual(24, ExpressionEvaluator.GetValue(null, "2.0 * 3e0 * 4"));
+        }
+
+        /// <summary>
+        /// Tests multiplication operator with invalid arguments.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestMultiplyOperatorWithInvalidArguments()
+        {
+            ExpressionEvaluator.GetValue(null, "DateTime.Today * false");
+        }
+
+        /// <summary>
+        /// Tests division operator.
+        /// </summary>
+        [Test]
+        public void TestDivideOperator()
+        {
+            Assert.AreEqual(1, ExpressionEvaluator.GetValue(null, "2 / 2"));
+            Assert.AreEqual(-2, ExpressionEvaluator.GetValue(null, "6 / -3"));
+            Assert.AreEqual(2, ExpressionEvaluator.GetValue(null, "-6 / -3"));
+            Assert.AreEqual(Decimal.Parse("1.00", NumberFormatInfo.InvariantInfo),
+                            ExpressionEvaluator.GetValue(null, "1000.00m / 1e3"));
+            Assert.AreEqual(1, ExpressionEvaluator.GetValue(null, "8.0 / 4e0 / 2"));
+        }
+
+        /// <summary>
+        /// Tests division operator with invalid arguments.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestDivideOperatorWithInvalidArguments()
+        {
+            ExpressionEvaluator.GetValue(null, "DateTime.Today / false");
+        }
+
+        /// <summary>
+        /// Tests modulus operator.
+        /// </summary>
+        [Test]
+        public void TestModulusOperator()
+        {
+            Assert.AreEqual(0, ExpressionEvaluator.GetValue(null, "2 % 2"));
+            Assert.AreEqual(2, ExpressionEvaluator.GetValue(null, "6 % -4"));
+            Assert.AreEqual(-1, ExpressionEvaluator.GetValue(null, "-6 % -5"));
+            Assert.AreEqual(Decimal.Parse("5.00", NumberFormatInfo.InvariantInfo),
+                            ExpressionEvaluator.GetValue(null, "1005.00m % 1e3"));
+            Assert.AreEqual(1, ExpressionEvaluator.GetValue(null, "8.0 % 5e0 % 2"));
+        }
+
+        /// <summary>
+        /// Tests modulus operator with invalid arguments.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestModulusOperatorWithInvalidArguments()
+        {
+            ExpressionEvaluator.GetValue(null, "DateTime.Today % false");
+        }
+
+        /// <summary>
+        /// Tests power operator.
+        /// </summary>
+        [Test]
+        public void TestPowerOperator()
+        {
+            Assert.AreEqual(8, ExpressionEvaluator.GetValue(null, "2 ^ +3"));
+            Assert.AreEqual(16, ExpressionEvaluator.GetValue(null, "-2 ^ 4"));
+            Assert.AreEqual(-32, ExpressionEvaluator.GetValue(null, "-2 ^ 5"));
+            Assert.AreEqual(.0625, ExpressionEvaluator.GetValue(null, "4 ^ -2"));
+            Assert.AreEqual(2, ExpressionEvaluator.GetValue(null, "+4 ^ .5"));
+        }
+
+        /// <summary>
+        /// Tests power operator with invalid arguments.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestPowerOperatorWithInvalidArguments()
+        {
+            ExpressionEvaluator.GetValue(null, "DateTime.Today ^ false");
+        }
+
+        /// <summary>
+        /// Tests unary minus operator with invalid argument.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestUnaryMinusOperatorWithInvalidArguments()
+        {
+            ExpressionEvaluator.GetValue(null, "-false");
+        }
+
+        /// <summary>
+        /// Tests unary plus operator with invalid argument.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestUnaryPlusOperatorWithInvalidArguments()
+        {
+            ExpressionEvaluator.GetValue(null, "+false");
+        }
+
+        /// <summary>
+        /// Tests operator precedence.
+        /// </summary>
+        [Test]
+        public void TestOperatorPrecedence()
+        {
+            Assert.AreEqual(-3, ExpressionEvaluator.GetValue(null, "1+2-3*8/2/2"));
+            Assert.AreEqual(-45, ExpressionEvaluator.GetValue(null, "1+2-3*8^2/2/2"));
+            Assert.AreEqual(0, ExpressionEvaluator.GetValue(null, "1+2-3*8/2^2/2"));
+            Assert.AreEqual(-4.5, ExpressionEvaluator.GetValue(null, "1+(2-3*8)/2.0/2"));
+        }
+
+        /// <summary>
+        /// Tests Spring reference when reference to a non-existant object is specified.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(NoSuchObjectDefinitionException))]
+        public void TestReferenceForNonExistantObject()
+        {
+            ContextRegistry.RegisterContext(
+                new XmlApplicationContext(false, "assembly://Spring.Core.Tests/Spring.Context.Support/objects.xml"));
+            ExpressionEvaluator.GetValue(null, "@(dummyRef)");
+        }
+
+        /// <summary>
+        /// Tests Spring reference.
+        /// </summary>
+        [Test]
+        public void TestReference()
+        {
+            ContextRegistry.RegisterContext(
+                new XmlApplicationContext(false, "assembly://Spring.Core.Tests/Spring.Context.Support/objects.xml"));
+            Assert.AreEqual(typeof(TestObject), ExpressionEvaluator.GetValue(null, "@(goran)").GetType());
+
+            IApplicationContext ctx =
+                new XmlApplicationContext(false, "assembly://Spring.Core.Tests/Spring.Context.Support/objects.xml");
+            ctx.Name = "myContext";
+            ContextRegistry.RegisterContext(ctx);
+
+            Assert.AreEqual(typeof(TestObject),
+                            ExpressionEvaluator.GetValue(null, "@(myContext:goran)").GetType());
+        }
+
+        /// <summary>
+        /// Since Expression-References require the context to be added to ContextRegistry,
+        /// they work only if the objectdefinition's "lazy-init" is true.
+        /// </summary>
+        [Test]
+        public void TestReferenceByExpression()
+        {
+            //TODO: write a test showing that expressions don't work without "lazy-init":
+            /*
+              <!-- fails to init context -->
+              <object id="testObjectContainer"
+                      type="Spring.Expressions.TestObjectContainer, Spring.Core.Tests">
+                        <property name="TestObject" expression="@(goran)" />
+              </object>
+             */
+
+            ContextRegistry.RegisterContext(
+                new XmlApplicationContext(false, "assembly://Spring.Core.Tests/Spring.Context.Support/objects.xml"));
+
+            TestObject testObject = ExpressionEvaluator.GetValue(null, "@(goran)") as TestObject;
+
+            TestObjectContainer testObjectContainer =
+                ExpressionEvaluator.GetValue(null, "@(testObjectContainer_lazy)") as TestObjectContainer;
+
+            Assert.IsNotNull(testObject);
+            Assert.AreSame(testObject, testObjectContainer.TestObject);
+        }
+
+        /// <summary>
+        /// Ensure, e.g. context-names my contain a dot
+        /// </summary>
+        [Test]
+        public void TestQualifiedNameMayContainDots()
+        {
+            IApplicationContext ctx =
+                new XmlApplicationContext(false, "assembly://Spring.Core.Tests/Spring.Context.Support/objects.xml");
+            ctx.Name = "my.Context";
+            ContextRegistry.RegisterContext(ctx);
+
+            Assert.AreEqual(typeof(TestObject),
+                            ExpressionEvaluator.GetValue(null, "@(my\\.Context:goran)").GetType());
+        }
+
+        /// <summary>
+        /// Tests attribute expression.
+        /// </summary>
+        [Test]
+        public void TestAttribute()
+        {
+            TypeRegistry.RegisterType("WebMethod", typeof(WebMethodAttribute));
+            TypeRegistry.RegisterType("TransactionOption", typeof(TransactionOption));
+
+            Assert.IsInstanceOfType(typeof(SerializableAttribute),
+                                    ExpressionEvaluator.GetValue(null, "@[System.Serializable]"));
+            Assert.IsInstanceOfType(typeof(SerializableAttribute),
+                                    ExpressionEvaluator.GetValue(null, "@[System.Serializable()]"));
+            Assert.IsInstanceOfType(typeof(WebMethodAttribute), ExpressionEvaluator.GetValue(null, "@[WebMethod]"));
+
+            WebMethodAttribute webMethod = (WebMethodAttribute)ExpressionEvaluator.GetValue(null, "@[WebMethod(true)]");
+            Assert.IsTrue(webMethod.EnableSession);
+
+            webMethod = (WebMethodAttribute)
+                        ExpressionEvaluator.GetValue(
+                            null,
+                            "@[WebMethod(false, CacheDuration = 60, Description = 'my web method', TransactionOption = TransactionOption.Required)]");
+            Assert.AreEqual(60, webMethod.CacheDuration);
+            Assert.AreEqual("my web method", webMethod.Description);
+            Assert.AreEqual(TransactionOption.Required, webMethod.TransactionOption);
+        }
+
+        /// <summary>
+        /// Type lambda expressions.
+        /// </summary>
+        [Test]
+        public void TestLambdaExpressions()
+        {
+            TypeRegistry.RegisterType(typeof(Math));
+
+            // simple function
+            Assert.AreEqual(4,
+                            ExpressionEvaluator.GetValue(null, "(#add = {|x, y| $x + $y}; #add(2, 2))", new Hashtable()));
+            Assert.AreEqual(25,
+                            ExpressionEvaluator.GetValue(null, "(#max = {|x, y| $x > $y ? $x : $y }; #max(5,25))",
+                                                         new Hashtable()));
+
+            // recursive function
+            Assert.AreEqual(120,
+                            ExpressionEvaluator.GetValue(null,
+                                                         "(#fact = {|n| $n <= 1 ? 1 : $n * #fact($n-1) }; #fact(5))",
+                                                         new Hashtable()));
+
+            // function invoked within projection expression
+            string expr = "(#upper = {|txt| $txt.ToUpper() }; !{ #upper(Name) })";
+            IList upperNames = (IList)ExpressionEvaluator.GetValue(ieee.Members, expr, new Hashtable());
+            Assert.AreEqual("NIKOLA TESLA", upperNames[0]);
+            Assert.AreEqual("MIHAJLO PUPIN", upperNames[1]);
+
+            // function that delegates to a function passed as a parameter
+            IDictionary vars = new Hashtable();
+            Expression.RegisterFunction("sqrt", "{|n| Math.Sqrt($n)}", vars);
+            Expression.RegisterFunction("fact", "{|n| $n <= 1 ? 1 : $n * #fact($n-1)}", vars);
+            string expr2 =
+                @"(
+                                #delegate = {|f,n| $f($n) };
+                                #d = #delegate;
+
+                                #result = { #delegate(#sqrt, 4), #d(#fact, 5), #delegate({|n| $n ^ 2 }, 5) }
+                            )";
+            IList results = (IList)ExpressionEvaluator.GetValue(null, expr2, vars);
+            Assert.AreEqual(2, results[0]);
+            Assert.AreEqual(120, results[1]);
+            Assert.AreEqual(25, results[2]);
+
+            // function assignment
+            Assert.AreEqual(120,
+                            ExpressionEvaluator.GetValue(null,
+                                                         "(#fact = {|n| $n <= 1 ? 1 : $n * #fact($n-1) }; #f = #fact; #f(5))",
+                                                         new Hashtable()));
+        }
+
+        #region Collection Processor and Aggregator tests
+
+        [Test]
+        public void TestCountAggregator()
+        {
+            int[] arr = new int[] { 24, 8, 14, 8 };
+            Assert.AreEqual(4, ExpressionEvaluator.GetValue(arr, "count()"));
+            Assert.AreEqual(3, ExpressionEvaluator.GetValue(null, "{1, 5, -3}.count()"));
+            Assert.AreEqual(0, ExpressionEvaluator.GetValue(null, "count()"));
+        }
+
+        [Test]
+        public void TestSumAggregator()
+        {
+            int[] arr = new int[] { 24, 8, 14, 8 };
+            Assert.AreEqual(54, ExpressionEvaluator.GetValue(arr, "sum()"));
+            Assert.AreEqual(13, ExpressionEvaluator.GetValue(null, "{1, 5, -3, 10}.sum()"));
+
+            object[] arr2 = new object[] { 5, 5.8, 12.2, 1 };
+            object result = ExpressionEvaluator.GetValue(arr2, "sum()");
+            Assert.IsInstanceOfType(typeof(double), result);
+            Assert.AreEqual(24, result);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestSumAggregatorWithNonNumber()
+        {
+            object[] arr = new object[] { 5, "ana", 12.2, 1 };
+            ExpressionEvaluator.GetValue(arr, "sum()");
+        }
+
+        [Test]
+        public void TestAverageAggregator()
+        {
+            int[] arr = new int[] { 24, 8, 16, 8 };
+            Assert.AreEqual(14, ExpressionEvaluator.GetValue(arr, "average()"));
+            Assert.AreEqual(3, ExpressionEvaluator.GetValue(null, "{1, 5, -4, 10}.average()"));
+            Assert.AreEqual(3.5, ExpressionEvaluator.GetValue(null, "{1, 5, -2, 10}.average()"));
+
+            object[] arr2 = new object[] { 5, 5.8, 12.2, 1 };
+            object result = ExpressionEvaluator.GetValue(arr2, "average()");
+            Assert.IsInstanceOfType(typeof(double), result);
+            Assert.AreEqual(6, result);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestAverageAggregatorWithNonNumber()
+        {
+            object[] arr = new object[] { 5, "ana", 12.2, 1 };
+            ExpressionEvaluator.GetValue(arr, "average()");
+        }
+
+        [Test]
+        public void TestMinAggregator()
+        {
+            int[] arr = new int[] { 24, 8, 14, 8 };
+            Assert.AreEqual(8, ExpressionEvaluator.GetValue(arr, "min()"));
+            Assert.AreEqual(-3, ExpressionEvaluator.GetValue(null, "{1, 5, -3, 10}.min()"));
+
+            object[] arr2 = new object[] { 5, 5.8, 12.2, 1 };
+            object result = ExpressionEvaluator.GetValue(arr2, "min()");
+            Assert.IsInstanceOfType(typeof(int), result);
+            Assert.AreEqual(1, result);
+
+            Assert.IsNull(ExpressionEvaluator.GetValue(ObjectUtils.EmptyObjects, "min()"));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestMinAggregatorWithNonComparable()
+        {
+            object[] arr = new object[] { new Object(), new Object() };
+            ExpressionEvaluator.GetValue(arr, "min()");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestMinAggregatorWithMixedTypes()
+        {
+            object[] arr = new object[] { 5, "ana", 12.2, 1 };
+            ExpressionEvaluator.GetValue(arr, "min()");
+        }
+
+        [Test]
+        public void TestMaxAggregator()
+        {
+            int[] arr = new int[] { 24, 8, 14, 8 };
+            Assert.AreEqual(24, ExpressionEvaluator.GetValue(arr, "max()"));
+            Assert.AreEqual(10, ExpressionEvaluator.GetValue(null, "{1, 5, -3, 10}.max()"));
+
+            object[] arr2 = new object[] { 5, 5.8, 12.2, 1 };
+            object result = ExpressionEvaluator.GetValue(arr2, "max()");
+            Assert.IsInstanceOfType(typeof(double), result);
+            Assert.AreEqual(12.2, result);
+
+            Assert.IsNull(ExpressionEvaluator.GetValue(ObjectUtils.EmptyObjects, "max()"));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestMaxAggregatorWithNonComparable()
+        {
+            object[] arr = new object[] { new Object(), new Object() };
+            ExpressionEvaluator.GetValue(arr, "max()");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestMaxAggregatorWithMixedTypes()
+        {
+            object[] arr = new object[] { 5, "ana", 12.2, 1 };
+            ExpressionEvaluator.GetValue(arr, "max()");
+        }
+
+        [Test]
+        public void TestSortProcessor()
+        {
+            int[] arr = new int[] { 24, 8, 14, 6 };
+            Assert.AreEqual(new int[] { 6, 8, 14, 24 }, ExpressionEvaluator.GetValue(arr, "sort()"));
+            Assert.AreEqual(new int[] { 6, 8, 14, 24 }, ExpressionEvaluator.GetValue(arr, "sort(true)"));
+            Assert.AreEqual(new int[] { 24, 14, 8, 6 }, ExpressionEvaluator.GetValue(arr, "sort(false)"));
+
+            string[] arr2 = new string[] { "abc", "xyz", "stuv", "efg", "dcb" };
+            Assert.AreEqual(new string[] { "abc", "dcb", "efg", "stuv", "xyz" },
+                            ExpressionEvaluator.GetValue(arr2, "sort()"));
+
+            DateTime[] arr3 = new DateTime[] { DateTime.Today, DateTime.MaxValue, DateTime.MinValue };
+            Assert.AreEqual(new DateTime[] { DateTime.MinValue, DateTime.Today, DateTime.MaxValue },
+                            ExpressionEvaluator.GetValue(arr3, "sort()"));
+
+            Assert.AreEqual(new object[] { -3.3, 1.2, 5.5 }, ExpressionEvaluator.GetValue(null, "{1.2, 5.5, -3.3}.sort()"));
+            Assert.IsNull(ExpressionEvaluator.GetValue(null, "sort()"));
+
+            ISet set = new ListSet(arr);
+            Assert.AreEqual(new int[] { 6, 8, 14, 24 }, ExpressionEvaluator.GetValue(set, "sort()"));
+        }
+
+        [Test(Description="sort supports any ICollection containing elements of uniform type")]
+        public void TestSortProcessorWithSimpleICollectionType()
+        {
+            Stack stack = new Stack(new int[] { 24, 8, 14, 6 });
+            ExpressionEvaluator.GetValue(stack, "sort()");
+        }
+
+        [Test]
+        public void TestNonNullProcessor()
+        {
+            string[] arr2 = new string[] { "abc", "xyz", null, "abc", "def", null };
+            Assert.AreEqual(new string[] { "abc", "xyz", "abc", "def" },
+                            ExpressionEvaluator.GetValue(arr2, "nonNull()"));
+            Assert.AreEqual(new string[] { "abc", "abc", "def", "xyz" },
+                            ExpressionEvaluator.GetValue(arr2, "nonNull().sort()"));
+        }
+
+        [Test]
+        public void TestDistinctProcessor()
+        {
+            int[] arr = new int[] { 24, 8, 8, 6, 24, 6, 8, 6 };
+            Assert.AreEqual(new int[] { 6, 8, 24 }, ExpressionEvaluator.GetValue(arr, "distinct().sort()"));
+
+            string[] arr2 = new string[] { "abc", "xyz", "abc", "def", null, "def" };
+            Assert.AreEqual(new string[] { null, "abc", "def", "xyz" },
+                            ExpressionEvaluator.GetValue(arr2, "distinct(true).sort()"));
+            Assert.AreEqual(new string[] { "abc", "def", "xyz" },
+                            ExpressionEvaluator.GetValue(arr2, "distinct(false).sort()"));
+            Assert.AreEqual(new string[] { "abc", "def", "xyz" },
+                            ExpressionEvaluator.GetValue(arr2, "distinct().sort()"));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestDistinctProcessorWithInvalidArgumentType()
+        {
+            int[] arr = new int[] { 24, 8, 8, 6, 24, 6, 8, 6 };
+            ExpressionEvaluator.GetValue(arr, "distinct(6)");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestDistinctProcessorWithInvalidNumberOfArguments()
+        {
+            int[] arr = new int[] { 24, 8, 8, 6, 24, 6, 8, 6 };
+            ExpressionEvaluator.GetValue(arr, "distinct(true, 4, 'xyz')");
+        }
+
+        [Test]
+        public void TestConversionProcessor()
+        {
+            object[] arr = new object[] { "0", 1, 1.1m, "1.1", 1.1f };
+            decimal[] result = (decimal[]) ExpressionEvaluator.GetValue(arr, "convert(decimal)");
+            Assert.AreEqual( 0.0m, result[0] );
+            Assert.AreEqual(1.0m, result[1]);
+            Assert.AreEqual(1.1m, result[2]);
+            Assert.AreEqual(1.1m, result[3]);
+            Assert.AreEqual(1.1m, result[4]);
+        }
+
+        [Test]
+        public void TestReverseProcessor()
+        {
+            object[] arr = new object[] { "0", 1, 2.1m, "3", 4.1f };
+            object[] result = new ArrayList( (ICollection) ExpressionEvaluator.GetValue(arr, "reverse()") ).ToArray();
+            Assert.AreEqual(new object[] { 4.1f, "3", 2.1m, 1, "0" }, result);
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Type SetValue.
+        /// </summary>
+        [Test]
+        public void TestSetValue()
+        {
+            IDictionary vars = new Hashtable();
+            vars["tesla"] = tesla;
+            vars["pupin"] = pupin;
+            ExpressionEvaluator.SetValue(null, "#tesla.Name", vars, "Tesla, Nikola");
+            Assert.AreEqual("Tesla, Nikola", tesla.Name);
+        }
+
+        /// <summary>
+        /// Tests property access with null in the path.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(NullValueInNestedPathException))]
+        public void TestPropertyGetWithNullInThePath()
+        {
+            ExpressionEvaluator.GetValue(new Inventor(), "Name.Length");
+        }
+
+        /// <summary>
+        /// Tests property set with null in the path.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(NullValueInNestedPathException))]
+        public void TestPropertySetWithNullInThePath()
+        {
+            ExpressionEvaluator.SetValue(new Inventor(), "Name.Length", 20);
+        }
+
+        /// <summary>
+        /// Tries to set value of the PropertyOrFieldNode that represents type.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(NotSupportedException))]
+        public void TestTypeSet()
+        {
+            ExpressionEvaluator.SetValue(null, "DateTime", 20);
+        }
+
+#if NET_2_0
+
+        /// <summary>
+        /// Reproduce SPRNET-408.
+        /// </summary>
+        /// <remarks>
+        /// http://opensource.atlassian.com/projects/spring/browse/SPRNET-408
+        /// http://forum.springframework.net/showthread.php?t=933
+        /// </remarks>
+        [Test(Description = "Test to reproduce SPRNET-408")]
+        public void TestNullableTypes()
+        {
+            Foo foo = new Foo();
+            Assert.IsNull(ExpressionEvaluator.GetValue(foo, "NullableDate"));
+            Assert.IsNull(ExpressionEvaluator.GetValue(foo, "NullableInt"));
+
+            ExpressionEvaluator.SetValue(foo, "NullableDate", DateTime.Today);
+            ExpressionEvaluator.SetValue(foo, "NullableDate", null);
+            ExpressionEvaluator.SetValue(foo, "NullableDate", "2004-08-14");
+            ExpressionEvaluator.SetValue(foo, "NullableDate", DateTime.Today);
+            ExpressionEvaluator.SetValue(foo, "NullableInt", 1);
+            ExpressionEvaluator.SetValue(foo, "NullableInt", null);
+            ExpressionEvaluator.SetValue(foo, "NullableInt", "5");
+            ExpressionEvaluator.SetValue(foo, "NullableInt", 1);
+
+            Assert.IsInstanceOfType(typeof(DateTime?), ExpressionEvaluator.GetValue(foo, "NullableDate"));
+            Assert.IsInstanceOfType(typeof(Int32?), ExpressionEvaluator.GetValue(foo, "NullableInt"));
+
+            Assert.AreEqual(DateTime.Today, ExpressionEvaluator.GetValue(foo, "NullableDate"));
+            Assert.AreEqual(1, ExpressionEvaluator.GetValue(foo, "NullableInt"));
+
+            int? test = 1;
+            Assert.IsInstanceOfType(typeof(Int32?), ExpressionEvaluator.GetValue(test, "#root"));
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(test, "#root != null"));
+            Assert.AreEqual(1, ExpressionEvaluator.GetValue(test, "#root"));
+
+            test = null;
+            Assert.IsTrue((bool)ExpressionEvaluator.GetValue(test, "#root == null"));
+            Assert.IsNull(ExpressionEvaluator.GetValue(test, "#root"));
+        }
+#endif
+
+        /// <summary>
+        /// Reproduce SPRNET-462.
+        /// </summary>
+        /// <remarks>
+        /// http://opensource.atlassian.com/projects/spring/browse/SPRNET-462
+        /// http://forum.springframework.net/showthread.php?t=1515
+        /// </remarks>
+        [Test(Description = "Test to reproduce SPRNET-462")]
+        public void TestMethodResolutionWithNullArguments()
+        {
+            DateTime today = DateTime.Today;
+            Assert.AreEqual(today.ToString("d"), ExpressionEvaluator.GetValue(today, "ToString('d')"));
+
+            TypeRegistry.RegisterType(typeof(TypeRegistry));
+            try
+            {
+                ExpressionEvaluator.GetValue(null, "TypeRegistry.RegisterType(null)");
+                Assert.Fail("Should throw ArgumentNullException");
+            }
+            catch (ArgumentNullException)
+            { }
+
+            try
+            {
+                ExpressionEvaluator.GetValue(null, "TypeRegistry.RegisterType(null, 'System.Object')");
+                Assert.Fail("Should throw ArgumentNullException");
+            }
+            catch (ArgumentNullException)
+            { }
+
+            try
+            {
+                ExpressionEvaluator.GetValue(null, "TypeRegistry.RegisterType(null, null)");
+                Assert.Fail("Should throw AmbiguousMatchException");
+            }
+            catch (AmbiguousMatchException)
+            { }
+
+            try
+            {
+                ExpressionEvaluator.GetValue(null, "TypeRegistry.RegisterType(null, null, null)");
+                Assert.Fail("Should throw ArgumentException");
+            }
+            catch (ArgumentException)
+            { }
+
+            try
+            {
+                ExpressionEvaluator.GetValue(null, "TypeRegistry.RegisterType(int, string)");
+                Assert.Fail("Should throw ArgumentException");
+            }
+            catch (ArgumentException)
+            { }
+        }
+
+        /// <summary>
+        /// Reproduce SPRNET-464.
+        /// </summary>
+        /// <remarks>
+        /// http://opensource.atlassian.com/projects/spring/browse/SPRNET-464
+        /// http://forum.springframework.net/showthread.php?t=1515
+        /// </remarks>
+        [Test(Description = "Test to reproduce SPRNET-464")]
+        public void TestMethodResolutionWithParamArray()
+        {
+            Foo foo = new Foo();
+            Assert.AreEqual("a|b|c", foo.MethodWithArrayArgument(new string[] { "a", "b", "c" }));
+            Assert.AreEqual("a||c", foo.MethodWithArrayArgument(new string[] { "a", null, "c" }));
+            Assert.AreEqual("a|b|c", foo.MethodWithParamArray("a", "b", "c"));
+            Assert.AreEqual("a||c", foo.MethodWithParamArray("a", null, "c"));
+
+            Assert.AreEqual("a|b|c", ExpressionEvaluator.GetValue(foo, "MethodWithArrayArgument(new string[] { 'a', 'b', 'c' })"));
+            Assert.AreEqual("a||c", ExpressionEvaluator.GetValue(foo, "MethodWithArrayArgument(new string[] { 'a', null, 'c' })"));
+            Assert.AreEqual("a|b|c", ExpressionEvaluator.GetValue(foo, "MethodWithParamArray('a', 'b', 'c')"));
+            Assert.AreEqual("a||c", ExpressionEvaluator.GetValue(foo, "MethodWithParamArray('a', null, 'c')"));
+
+            Assert.AreEqual("a|b|c", ExpressionEvaluator.GetValue(foo, "MethodWithParamArray(false, 'a', 'b', 'c')"));
+            Assert.AreEqual("a||c", ExpressionEvaluator.GetValue(foo, "MethodWithParamArray(false, 'a', null, 'c')"));
+            Assert.AreEqual("A|B|C", ExpressionEvaluator.GetValue(foo, "MethodWithParamArray(true, 'a', 'b', 'c')"));
+            Assert.AreEqual("A||C", ExpressionEvaluator.GetValue(foo, "MethodWithParamArray(true, 'a', null, 'c')"));
+        }
+
+        [Test]
+        public void TestMethodResolutionResolvesToExactMatchOfArgumentTypes()
+        {
+            Hashtable args = new Hashtable();
+            args["bars"] = new Bar[] { new Bar() };
+            Foo foo = new Foo();
+
+            // ensure noone changed our test class
+            Assert.AreEqual("ExactMatch", foo.MethodWithSimilarArguments(1, (Bar[])args["bars"]));
+            Assert.AreEqual("AssignableMatch", foo.MethodWithSimilarArguments(1, (ICollection)args["bars"]));
+
+            Assert.AreEqual("ExactMatch", ExpressionEvaluator.GetValue(foo, "MethodWithSimilarArguments(1, #bars)", args));
+        }
+
+        [Test]
+        public void TestIndexerResolutionResolvesToExactMatchOfArgumentTypes()
+        {
+            Hashtable args = new Hashtable();
+            args["bars"] = new Bar[] { new Bar() };
+            Foo foo = new Foo();
+
+            // ensure noone changed our test class
+            Assert.AreEqual("ExactMatch", foo[(Bar[])args["bars"]]);
+            Assert.AreEqual("AssignableMatch", foo[(ICollection)args["bars"]]);
+
+            Assert.AreEqual("ExactMatch", ExpressionEvaluator.GetValue(foo, "#root[#bars]", args));
+        }
+
+
+        [Test]
+        public void TestCtorResolutionResolvesToExactMatchOfArgumentTypes()
+        {
+            TypeRegistry.RegisterType(typeof(Foo));
+            Hashtable args = new Hashtable();
+            args["bars"] = new Bar[] { new Bar() };
+
+            // ensure noone changed our test class
+            Foo foo1 = new Foo(1, (Bar[])args["bars"]);
+            try
+            {
+                Foo foo2 = new Foo(1, (ICollection)args["bars"]);
+            }
+            catch (InvalidOperationException) { }
+
+            Assert.IsNotNull(ExpressionEvaluator.GetValue(null, "new Foo(1, #bars)", args));
+        }
+
+        [Test]
+        public void TestCtorResolutionWithParamArray()
+        {
+            TypeRegistry.RegisterType(typeof(Foo));
+            Assert.IsNotNull(ExpressionEvaluator.GetValue(null, "new Foo('a', 'b', 'c')"));
+            Assert.IsNotNull(ExpressionEvaluator.GetValue(null, "new Foo('a', null, 'c')"));
+            Assert.IsNotNull(ExpressionEvaluator.GetValue(null, "new Foo(false, 'a', 'b', 'c')"));
+            Assert.IsNotNull(ExpressionEvaluator.GetValue(null, "new Foo(false, 'a', null, 'c')"));
+        }
+
+        /// <summary>
+        /// Reproduce SPRNET-470.
+        /// </summary>
+        /// <remarks>
+        /// http://opensource.atlassian.com/projects/spring/browse/SPRNET-470
+        /// http://forum.springframework.net/showthread.php?t=1574
+        /// </remarks>
+        [Test(Description = "Test to reproduce SPRNET-470")]
+        public void TestPropertyAccessForTypes()
+        {
+            Assert.AreEqual(Int32.MaxValue, ExpressionEvaluator.GetValue(null, "Int32.MaxValue"));
+            Assert.AreEqual(Int32.MaxValue, ExpressionEvaluator.GetValue(null, "T(System.Int32).MaxValue"));
+            Assert.AreEqual(typeof(Int32).FullName, ExpressionEvaluator.GetValue(null, "Int32.FullName"));
+            Assert.AreEqual(typeof(Int32).FullName, ExpressionEvaluator.GetValue(null, "T(System.Int32).FullName"));
+            Assert.IsFalse((bool)ExpressionEvaluator.GetValue(null, "Int32.IsSubclassOf(Int64)"));
+
+            TypeRegistry.RegisterType(typeof(FooType));
+            Assert.AreEqual(FooType.One, ExpressionEvaluator.GetValue(null, "FooType.One"));
+            Assert.AreEqual(typeof(FooType).FullName, ExpressionEvaluator.GetValue(null, "FooType.FullName"));
+        }
+
+        /// <summary>
+        /// Reproduce SPRNET-450
+        /// Try to set/get numeric value from enum type property/field
+        /// </summary>
+        /// <remarks>
+        /// http://opensource.atlassian.com/projects/spring/browse/SPRNET-450
+        /// http://forum.springframework.net/showthread.php?t=1353
+        /// </remarks>
+        [Test]
+        public void TestSetEnumTypePropertyOrFieldFromNumeric()
+        {
+            //object val = Convert.ChangeType((Int16) 1, typeof(Int32));
+            //Assert.AreEqual( typeof(Int32), val.GetType() );
+
+            IExpression expField = Expression.Parse("SampleEnumField");
+            IExpression expProperty = Expression.Parse("SampleEnumProperty");
+            IExpression expFlagsField = Expression.Parse("SampleFlagsEnumField");
+            IExpression expFlagsProperty = Expression.Parse("SampleFlagsEnumProperty");
+
+            TestEnumTypePropertyClass o = new TestEnumTypePropertyClass();
+
+            // test field set operations
+            expField.SetValue(o, TestEnumTypePropertyClass.ESampleEnumType.Trunk);
+            Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
+
+            expField.SetValue(o, ((Int16)1));
+            Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
+
+            expField.SetValue(o, ((Int32)1));
+            Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
+
+            expField.SetValue(o, ((Int64)1));
+            Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
+
+            // test property set operations
+            expProperty.SetValue(o, TestEnumTypePropertyClass.ESampleEnumType.Trunk);
+            Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
+
+            expProperty.SetValue(o, ((Int16)1));
+            Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
+
+            expProperty.SetValue(o, ((Int32)1));
+            Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
+
+            expProperty.SetValue(o, ((Int64)1));
+            Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
+
+            expProperty.SetValue(o, "Trunk");
+            Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
+
+            try
+            {
+                expProperty.SetValue(o, ((double)1.0));
+                Assert.Fail("should throw");
+            }
+            catch (TypeMismatchException e)
+            {
+                Assert.IsTrue(e.Message.StartsWith("Cannot convert property value of type [System.Double]"));
+            }
+
+            try
+            {
+                expProperty.SetValue(o, ((float)1.0));
+                Assert.Fail("should throw");
+            }
+            catch (TypeMismatchException e)
+            {
+                Assert.IsTrue(e.Message.StartsWith("Cannot convert property value of type [System.Single]"));
+            }
+
+            // test get operations
+            object val = expField.GetValue(o);
+            Assert.AreEqual(typeof(TestEnumTypePropertyClass.ESampleEnumType), val.GetType());
+            Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, val);
+
+            val = expProperty.GetValue(o);
+            Assert.AreEqual(typeof(TestEnumTypePropertyClass.ESampleEnumType), val.GetType());
+            Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, val);
+
+            // test bitwise combined enum set
+            try
+            {
+                // not allowed since -1 is not defined in enum
+                expField.SetValue(o, -1);
+                Assert.Fail("should throw");
+            }
+            catch (TypeMismatchException ex)
+            {
+                Assert.IsTrue(
+                    ex.Message.StartsWith("Cannot convert property value of type [System.Int32] to required type"));
+            }
+
+            try
+            {
+                // not allowed since -1 is not a representation of any bitwise combination of the enum's values.
+                expFlagsField.SetValue(o, -1);
+                Assert.Fail("should throw");
+            }
+            catch (TypeMismatchException ex)
+            {
+                Assert.IsTrue(
+                    ex.Message.StartsWith("Cannot convert property value of type [System.Int32] to required type"));
+            }
+
+            expFlagsField.SetValue(o,
+                                   TestEnumTypePropertyClass.ESampleFlagsEnumType.SOME |
+                                   TestEnumTypePropertyClass.ESampleFlagsEnumType.SOMEOTHER);
+            Assert.AreEqual(
+                TestEnumTypePropertyClass.ESampleFlagsEnumType.SOME |
+                TestEnumTypePropertyClass.ESampleFlagsEnumType.SOMEOTHER, o.SampleFlagsEnumField);
+        }
+
+        /// <summary>
+        /// Test to reproduce SPRNET-342, provided on the forum.
+        /// </summary>
+        /// <remarks>
+        /// http://opensource.atlassian.com/projects/spring/browse/SPRNET-342
+        /// http://forum.springframework.net/showthread.php?t=614
+        /// </remarks>
+        [Test]
+        public void ForumTestThread614()
+        {
+            TypeRegistry.RegisterType(typeof(Sample));
+
+            IExpression e = Expression.Parse("new Sample(O, T, H)");
+
+            Sample d1 = new Sample("A", "B", "C");
+            Sample d2 = new Sample("A", "B", "Z");
+
+            Sample tmp1 = (Sample)e.GetValue(d1);
+            Assert.AreEqual("A", tmp1.O);
+            Assert.AreEqual("B", tmp1.T);
+            Assert.AreEqual("C", tmp1.H);
+
+            Sample tmp2 = (Sample)e.GetValue(d2);
+            Assert.AreEqual("A", tmp2.O);
+            Assert.AreEqual("B", tmp2.T);
+            Assert.AreEqual("Z", tmp2.H);
+        }
+
+        /// <summary>
+        /// More "to the point" test to reproduce SPRNET-342
+        /// </summary>
+        /// <remarks>
+        /// http://opensource.atlassian.com/projects/spring/browse/SPRNET-342
+        /// http://forum.springframework.net/showthread.php?t=614
+        /// </remarks>
+        [Test]
+        public void RootContextChangeTest()
+        {
+            IExpression e = Expression.Parse("#root");
+
+            Assert.AreEqual("RootA", e.GetValue("RootA"));
+            Assert.AreEqual("RootB", e.GetValue("RootB"));
+        }
+
+        /// <summary>
+        /// Hopefully detects threading issues during Expression evaluation
+        /// </summary>
+        /// <remarks>
+        /// A single expression instance may be evaluated against different contexts on different threads.
+        /// </remarks>
+        [Test]
+        public void ExpressionEvaluationIsThreadSafe()
+        {
+            IExpression exp = Expression.Parse("PlaceOfBirth.Country");
+
+            Inventor seovic = new Inventor("Aleksandar Seovic", new DateTime(1974, 08, 24), "Serbian");
+
+            AsyncTestTask t1 = new AsyncTestExpressionEvaluation(2000, exp, tesla, tesla.PlaceOfBirth.Country, null).Start();
+            AsyncTestTask t2 = new AsyncTestExpressionEvaluation(2000, exp, pupin, pupin.PlaceOfBirth.Country, null).Start();
+            AsyncTestTask t3 = new AsyncTestExpressionEvaluation(2000, exp, seovic, seovic.PlaceOfBirth.Country, null).Start();
+
+            IExpression exp2 = Expression.Parse("(#fact = {|n| $n <= 1 ? 1 : $n * #fact($n-1) }; #fact(#root))");
+
+            AsyncTestTask t4 = new AsyncTestExpressionEvaluation(2000, exp2, 5, 120, new Hashtable()).Start();
+            AsyncTestTask t5 = new AsyncTestExpressionEvaluation(2000, exp2, 6, 720, new Hashtable()).Start();
+
+            t1.AssertNoException();
+            t2.AssertNoException();
+            t3.AssertNoException();
+            t4.AssertNoException();
+            t5.AssertNoException();
+        }
+
+        /// <summary>
+        /// Hopefully detects threading issues during Expression parsing
+        /// </summary>
+        [Test]
+        public void ExpressionParserIsThreadSafe()
+        {
+            AsyncTestTask t1 = new AsyncTestMethod(200, new ThreadStart(TestOperatorPrecedence)).Start();
+            AsyncTestTask t2 = new AsyncTestMethod(200, new ThreadStart(TestOperatorPrecedence)).Start();
+            AsyncTestTask t3 = new AsyncTestMethod(200, new ThreadStart(TestOperatorPrecedence)).Start();
+
+            t1.AssertNoException();
+            t2.AssertNoException();
+            t3.AssertNoException();
+        }
+
+
+        /// <summary>
+        /// Checks if Expression Language array initializers work properly.
+        /// </summary>
+        [Test]
+        public void TestArrayConstructor()
+        {
+            object obj = ExpressionEvaluator.GetValue(null, "new int[] {3, 4, 5, 6}");
+            Assert.IsNotNull(obj);
+            Assert.IsInstanceOfType(typeof(int[]), obj);
+            int[] intarray = (int[])obj;
+            Assert.AreEqual(4, intarray.Length);
+            for (int i = 0; i < intarray.Length; i++)
+            {
+                Assert.AreEqual(i + 3, intarray[i]);
+            }
+
+            obj = ExpressionEvaluator.GetValue(null, "new long[5]");
+            Assert.IsNotNull(obj);
+            Assert.IsInstanceOfType(typeof(long[]), obj);
+            long[] longarray = obj as long[];
+            Assert.AreEqual(5, longarray.Length);
+            for (int i = 0; i < longarray.Length; i++)
+            {
+                Assert.AreEqual(0, longarray[i]);
+            }
+
+            obj = ExpressionEvaluator.GetValue(null, "new double[4, 5]");
+            Assert.IsNotNull(obj);
+            Assert.IsInstanceOfType(typeof(double[,]), obj);
+            double[,] twodimarray = obj as double[,];
+            Assert.AreEqual(4 * 5, twodimarray.Length);
+            for (int i = 0; i < 4; i++)
+            {
+                for (int j = 0; j < 5; j++)
+                {
+                    Assert.AreEqual(0.0, twodimarray[i, j]);
+                }
+            }
+
+            obj = ExpressionEvaluator.GetValue(null, "new int[Int32.Parse('11')]");
+            Assert.IsNotNull(obj);
+            Assert.IsInstanceOfType(typeof(int[]), obj);
+            intarray = obj as int[];
+            Assert.AreEqual(11, intarray.Length);
+        }
+
+        [Test]
+        public void TestMethodArgumentNodesResolveAgainstThisContext()
+        {
+            IExpression exp;
+
+            // case #root == #this - ToString() will be applied to #this
+            exp = Expression.Parse("long.Parse(ToString())");
+            object result = exp.GetValue(100);
+            Assert.AreEqual((long)100, result);
+
+            // case #root != #this in Projection - ToString() will be applied to #this
+            exp = Expression.Parse("(ToString(); #noop ={|val| $val}; !{#noop(ToString()) } )");
+            result = exp.GetValue(new int[] { 100, 200 }, new Hashtable());
+            Assert.AreEqual(new string[] { "100", "200" }, result);
+
+            // case #root != #this in Selection - ToString() will be applied to #this
+            exp = Expression.Parse("(#noop ={|val| $val}; ?{#noop(ToString()=='100')} )");
+            result = exp.GetValue(new int[] { 100, 200 }, new Hashtable());
+            IList list = new ArrayList();
+            list.Add(100);
+            Assert.AreEqual(list, result);
+        }
+
+        [Test]
+        public void TestAccessVisibility()
+        {
+            AccessVisibilityCases cases = new AccessVisibilityCases();
+
+            try
+            {
+                ExpressionEvaluator.SetValue(cases, "_privateReadonlyField", "notsoreadonly");
+                Assert.Fail("writing to readonly field should throw " + typeof(NotWritablePropertyException).FullName);
+            }
+            catch (NotWritablePropertyException) { }
+
+            try
+            {
+                ExpressionEvaluator.SetValue(cases, "PrivateReadonlyProperty", "notsoreadonly");
+                Assert.Fail("writing to readonly field should throw " + typeof(NotWritablePropertyException).FullName);
+            }
+            catch (NotWritablePropertyException) { }
+
+            Assert.AreEqual("_privateField", ExpressionEvaluator.GetValue(cases, "_privateField"));
+            Assert.AreEqual("_protectedField", ExpressionEvaluator.GetValue(cases, "_protectedField"));
+            Assert.AreEqual("_publicField", ExpressionEvaluator.GetValue(cases, "_publicField"));
+
+            Assert.AreEqual("PrivateProperty", ExpressionEvaluator.GetValue(cases, "PrivateProperty"));
+            Assert.AreEqual("ProtectedProperty", ExpressionEvaluator.GetValue(cases, "ProtectedProperty"));
+            Assert.AreEqual("PublicProperty", ExpressionEvaluator.GetValue(cases, "PublicProperty"));
+
+            Assert.AreEqual("PrivateIndexer", ExpressionEvaluator.GetValue(cases, "#root[1]"));
+            Assert.AreEqual("ProtectedIndexer", ExpressionEvaluator.GetValue(cases, "#root[1.0]"));
+            Assert.AreEqual("PublicIndexer", ExpressionEvaluator.GetValue(cases, "#root['']"));
+
+            Assert.AreEqual("PrivateMethod", ExpressionEvaluator.GetValue(cases, "GetPrivateMethod()"));
+            Assert.AreEqual("ProtectedMethod", ExpressionEvaluator.GetValue(cases, "GetProtectedMethod()"));
+            Assert.AreEqual("PublicMethod", ExpressionEvaluator.GetValue(cases, "GetPublicMethod()"));
+        }
+
+        #region TestAccessVisibility Classes
+
+        internal class AccessVisibilityCases
+        {
+            private readonly string _privateReadonlyField = "_privateReadonlyField";
+            private string _privateField = "_privateField";
+            protected string _protectedField = "_protectedField";
+            public string _publicField = "_publicField";
+
+
+            public AccessVisibilityCases()
+            {
+                Assert.IsTrue(_privateReadonlyField != string.Empty);
+                Assert.IsTrue(_privateField != string.Empty);
+            }
+
+            private string PrivateReadonlyProperty { get { return "PrivateReadonlyProperty"; } }
+            private string PrivateProperty { get { return "PrivateProperty"; } }
+            protected string ProtectedProperty { get { return "ProtectedProperty"; } }
+            public string PublicProperty { get { return "PublicProperty"; } }
+
+            private string this[int intindex] { get { return "PrivateIndexer"; } }
+            protected string this[double strindex] { get { return "ProtectedIndexer"; } }
+            public string this[string strindex] { get { return "PublicIndexer"; } }
+
+            private string GetPrivateMethod() { return "PrivateMethod"; }
+            protected string GetProtectedMethod() { return "ProtectedMethod"; }
+            public string GetPublicMethod() { return "PublicMethod"; }
+        }
+
+        #endregion
+
+        #region TestMethodInvocation Classes
+
+        class MethodInvokationCases
+        {
+            public string Foo(string stringArg) { return stringArg; }
+            public int Foo(int intArg) { return intArg; }
+        }
+
+        #endregion
+
+        #region Set operations tests
+
+        [Test]
+        public void TestUnionOperator()
+        {
+            object o = ExpressionEvaluator.GetValue(null, "{1,2,3} + {3,4,5}");
+            Assert.IsInstanceOfType(typeof(ISet), o);
+            ISet union = (ISet)o;
+            Assert.AreEqual(5, union.Count);
+            Assert.IsTrue(union.Contains(1));
+            Assert.IsTrue(union.Contains(3));
+            Assert.IsTrue(union.Contains(5));
+
+            o = ExpressionEvaluator.GetValue(null, "{1,2,3} + {3,4,5} + {'ivan', 'gox', 'damjao', 5}");
+            Assert.IsInstanceOfType(typeof(ISet), o);
+            union = (ISet)o;
+            Assert.AreEqual(8, union.Count);
+            Assert.IsTrue(union.Contains(1));
+            Assert.IsTrue(union.Contains("ivan"));
+
+            ISet testset = new ListSet();
+            testset.AddAll(new int[] { 1, 2, 3, 5, 8 });
+            o = ExpressionEvaluator.GetValue(testset, "#this + {1, 2, 13, 15}");
+            Assert.IsInstanceOfType(typeof(ISet), o);
+            union = (ISet)o;
+            Assert.AreEqual(7, union.Count);
+            Assert.IsTrue(union.Contains(1));
+            Assert.IsTrue(union.Contains(15));
+
+            o = ExpressionEvaluator.GetValue(null, "#{1:'one', 2:'two', 3:'three'} + #{1:'ivan', 5:'five'}");
+            Assert.IsInstanceOfType(typeof(IDictionary), o);
+            IDictionary result = (IDictionary)o;
+            Assert.AreEqual(4, result.Count);
+            Assert.AreEqual("one", result[1]);
+            Assert.AreEqual("five", result[5]);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestUnionOperatorBad()
+        {
+            object o = ExpressionEvaluator.GetValue(null, "#{1:'one', 2:'two', 3:'three'} + {1, 5}");
+            Assert.IsInstanceOfType(typeof(IDictionary), o);
+        }
+
+        [Test]
+        public void TestIntersectionOperator()
+        {
+            object o = ExpressionEvaluator.GetValue(null, "{111, 'ivan', 23, 24} * {111, 11, 'ivan'}");
+            Assert.IsInstanceOfType(typeof(ISet), o);
+            ISet intersection = (ISet)o;
+            Assert.AreEqual(2, intersection.Count);
+            Assert.IsTrue(intersection.Contains(111));
+            Assert.IsTrue(intersection.Contains("ivan"));
+
+            o = ExpressionEvaluator.GetValue(null, "{24, 25, 'aaa' + 'bb'} * {date('2007/2/5').day * 5, 24 - 1}");
+            Assert.IsInstanceOfType(typeof(ISet), o);
+            intersection = (ISet)o;
+            Assert.AreEqual(1, intersection.Count);
+            Assert.IsTrue(intersection.Contains(25));
+
+            ISet testset = new ListSet();
+            testset.AddAll(new int[] { 1, 2, 3, 5, 8 });
+            o = ExpressionEvaluator.GetValue(testset, "#this * #{1:'one', 10:'ten'}");
+            Assert.IsInstanceOfType(typeof(ISet), o);
+            intersection = (ISet)o;
+            Assert.AreEqual(1, intersection.Count);
+            Assert.IsTrue(intersection.Contains(1));
+
+            o = ExpressionEvaluator.GetValue(null, "#{1:'one', 2:'two', 3:'three'} * #{1:'ivan', 5:'five'}");
+            Assert.IsInstanceOfType(typeof(IDictionary), o);
+            IDictionary result = (IDictionary)o;
+            Assert.AreEqual(1, result.Count);
+            Assert.AreEqual("one", result[1]);
+
+            o = ExpressionEvaluator.GetValue(null, "#{1:'one', 2:'two', 3:'three'} * {1, 2, 5, 7}");
+            Assert.IsInstanceOfType(typeof(IDictionary), o);
+            result = (IDictionary)o;
+            Assert.AreEqual(2, result.Count);
+            Assert.AreEqual("one", result[1]);
+            Assert.AreEqual("two", result[2]);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestIntersectionOperatorBad()
+        {
+            object o = ExpressionEvaluator.GetValue(null, "#{1:'one', 2:'two', 3:'three'} * 'something'");
+            Assert.IsInstanceOfType(typeof(IDictionary), o);
+        }
+
+        [Test]
+        public void TestDifferenceOperator()
+        {
+            object o = ExpressionEvaluator.GetValue(null, "{111, 11} - {14, 12, 11}");
+            Assert.IsInstanceOfType(typeof(ISet), o);
+            ISet diff = (ISet)o;
+            Assert.AreEqual(1, diff.Count);
+            Assert.IsTrue(diff.Contains(111));
+
+            o = ExpressionEvaluator.GetValue(null, "{111, 11} - {14, 12, 11} - {111}");
+            Assert.IsInstanceOfType(typeof(ISet), o);
+            diff = (ISet)o;
+            Assert.AreEqual(0, diff.Count);
+
+            ISet testset = new ListSet();
+            testset.AddAll(new int[] { 1, 2, 3, 5, 8 });
+            o = ExpressionEvaluator.GetValue(testset, "#this - #{1:'one', 10:'ten'}");
+            Assert.IsInstanceOfType(typeof(ISet), o);
+            diff = (ISet)o;
+            Assert.AreEqual(4, diff.Count);
+            Assert.IsFalse(diff.Contains(1));
+
+            o = ExpressionEvaluator.GetValue(null, "#{1:'one', 2:'two', 3:'three'} - #{1:'ivan', 5:'five'}");
+            Assert.IsInstanceOfType(typeof(IDictionary), o);
+            IDictionary result = (IDictionary)o;
+            Assert.AreEqual(2, result.Count);
+            Assert.IsNull(result[1]);
+            Assert.AreEqual("three", result[3]);
+
+            o = ExpressionEvaluator.GetValue(null, "#{1:'one', 2:'two', 3:'three'} - {1, 2, 3, 5, 7}");
+            Assert.IsInstanceOfType(typeof(IDictionary), o);
+            result = (IDictionary)o;
+            Assert.AreEqual(0, result.Count);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestDifferenceOperatorBad()
+        {
+            object o = ExpressionEvaluator.GetValue(null, "#{1:'one', 2:'two', 3:'three'} - 'something'");
+            Assert.IsInstanceOfType(typeof(IDictionary), o);
+        }
+
+        #endregion
+
+        #region Performance tests
+
+        private DateTime start, stop;
+
+        //[Test]
+        public void PerformanceTests()
+        {
+            int n = 10000000;
+            object x = "";
+            IDictionary vars = new Hashtable();
+
+            // tesla.PlaceOfBirth
+            start = DateTime.Now;
+            for (int i = 0; i < n; i++)
+            {
+                x = tesla.PlaceOfBirth;
+            }
+            stop = DateTime.Now;
+            PrintTest("tesla.PlaceOfBirth (direct)", n, Elapsed);
+
+            //            start = DateTime.Now;
+            //            for (int i = 0; i < n; i++)
+            //            {
+            //                x = ExpressionEvaluator.GetValue(tesla, "PlaceOfBirth", vars);
+            //            }
+            //            stop = DateTime.Now;
+            //            PrintTest("tesla.PlaceOfBirth (multi-parse)", n, Elapsed);
+
+            start = DateTime.Now;
+            IExpression exp = Expression.Parse("PlaceOfBirth");
+            for (int i = 0; i < n; i++)
+            {
+                x = exp.GetValue(tesla, vars);
+            }
+            stop = DateTime.Now;
+            PrintTest("tesla.PlaceOfBirth (single-parse)", n, Elapsed);
+
+            // ieee.Officers['advisors'][0].Inventions[2]
+            start = DateTime.Now;
+            for (int i = 0; i < n; i++)
+            {
+                x = ((Inventor)((IList)ieee.Officers["advisors"])[0]).Inventions[2];
+            }
+            stop = DateTime.Now;
+            PrintTest("ieee.Officers['advisors'][0].Inventions[2] (direct)", n, Elapsed);
+
+            //            start = DateTime.Now;
+            //            for (int i = 0; i < n / 10; i++)
+            //            {
+            //                x = ExpressionEvaluator.GetValue(ieee, "Officers['advisors'][0].Inventions[2]", vars);
+            //            }
+            //            stop = DateTime.Now;
+            //            PrintTest("ieee.Officers['advisors'][0].Inventions[2] (multi-parse)", n / 10, Elapsed);
+
+            start = DateTime.Now;
+            exp = Expression.Parse("Officers['advisors'][0].Inventions[2]");
+            for (int i = 0; i < n; i++)
+            {
+                x = exp.GetValue(ieee, vars);
+            }
+            stop = DateTime.Now;
+            PrintTest("ieee.Officers['advisors'][0].Inventions[2] (single-parse)", n, Elapsed);
+
+            x.ToString();
+        }
+
+        private double Elapsed
+        {
+            get { return (stop.Ticks - start.Ticks) / 10000000f; }
+        }
+
+        private static void PrintTest(string name, int iterations, double duration)
+        {
+            Debug.WriteLine(
+                String.Format("{0,-60} {1,12:#,###} {2,12:##0.000} {3,12:#,###}", name, iterations, duration,
+                              iterations / duration));
+        }
+
+        #endregion
+
+        #region Method Inheritance tests
+
+        [Test]
+        public void TestInheritedMethodInvocation()
+        {
+            DerivedSingleMethodTestClass testClass = new DerivedSingleMethodTestClass();
+            Assert.AreEqual("Hello World", ExpressionEvaluator.GetValue(testClass, "#root.GetString()"));
+        }
+
+        [Test]
+        public void TestStaticInheritedMethodInvocation()
+        {
+            Assert.AreEqual("Hello Static World from SingleMethodTestClass", DerivedSingleMethodTestClass.StaticMethod());
+            Assert.AreEqual("Hello Static World from SingleMethodTestClass", ExpressionEvaluator.GetValue(null, string.Format("T({0}).StaticMethod()", typeof(DerivedSingleMethodTestClass).FullName)));
+
+            Assert.AreEqual("SingleMethodTestClass.ShadowedStaticMethod", SingleMethodTestClass.ShadowedStaticMethod());
+            Assert.AreEqual("DerivedSingleMethodTestClass.ShadowedStaticMethod", DerivedSingleMethodTestClass.ShadowedStaticMethod());
+            Assert.AreEqual("SingleMethodTestClass.ShadowedStaticMethod", ExpressionEvaluator.GetValue(null, string.Format("T({0}).ShadowedStaticMethod()", typeof(SingleMethodTestClass).FullName)));
+            Assert.AreEqual("DerivedSingleMethodTestClass.ShadowedStaticMethod", ExpressionEvaluator.GetValue(null, string.Format("T({0}).ShadowedStaticMethod()", typeof(DerivedSingleMethodTestClass).FullName)));
+        }
+
+        #endregion
+
+        private static void DumpNode(AST rootNode, int level)
+        {
+            Trace.WriteLine(new string(' ', level) + rootNode.ToString());
+
+            int numberOfChildren = rootNode.getNumberOfChildren();
+            if (numberOfChildren > 0)
+            {
+                AST node = rootNode.getFirstChild();
+                while (node != null)
+                {
+                    DumpNode(node, level + 2);
+                    node = node.getNextSibling();
+                }
+            }
+        }
+    }
+
+    #region Helper classes
+
+    internal class SingleMethodTestClass
+    {
+        protected static string GetMethodName(MethodBase method)
+        {
+            return method.DeclaringType.Name + "." + method.Name;
+        }
+
+        public static string StaticMethod()
+        {
+            return "Hello Static World from SingleMethodTestClass";
+        }
+
+        public static string ShadowedStaticMethod()
+        {
+            return GetMethodName(MethodInfo.GetCurrentMethod());
+        }
+
+        public string GetString()
+        {
+            return "Hello World";
+        }
+    }
+
+    internal class DerivedSingleMethodTestClass : SingleMethodTestClass
+    {
+        public new static string ShadowedStaticMethod()
+        {
+            return GetMethodName(MethodInfo.GetCurrentMethod());
+        }
+    }
+
+    internal class TestObjectContainer
+    {
+        private TestObject testObject;
+
+        public TestObject TestObject
+        {
+            get { return this.testObject; }
+            set { this.testObject = value; }
+        }
+    }
+
+    internal class TestEnumTypePropertyClass
+    {
+        [Flags]
+        internal enum ESampleFlagsEnumType : int
+        {
+            NONE = 0,
+            SOME = 1,
+            SOMEOTHER = 2,
+        }
+
+        internal enum ESampleEnumType : int
+        {
+            Van = 0,
+            Trunk = 1,
+            Air = 2
+        }
+
+        public ESampleFlagsEnumType SampleFlagsEnumField;
+        public ESampleEnumType SampleEnumField;
+
+        public ESampleFlagsEnumType SampleFlagsEnumProperty
+        {
+            get { return SampleFlagsEnumField; }
+            set { SampleFlagsEnumField = value; }
+        }
+
+        public ESampleEnumType SampleEnumProperty
+        {
+            get { return SampleEnumField; }
+            set { SampleEnumField = value; }
+        }
+    }
+
+    internal sealed class Bar
+    {
+        private int[] numbers = new int[] { 1, 2, 3 };
+
+        public int this[int index]
+        {
+            get { return numbers[index]; }
+        }
+    }
+
+    internal class Foo
+    {
+        private FooType type;
+#if NET_2_0
+        private Nullable<DateTime> nullableDate;
+        private Nullable<Int32> nullableInt;
+#endif
+        public Foo()
+            : this(FooType.One)
+        {
+        }
+
+        public Foo(FooType type)
+        {
+            this.type = type;
+        }
+
+        public Foo(params string[] values)
+        {
+        }
+
+        public Foo(bool flag, params string[] values)
+        {
+        }
+
+        public Foo(int flag, Bar[] bars)
+        {
+        }
+
+        public Foo(int flag, ICollection bars)
+        {
+            throw new InvalidOperationException("should have selected ctor(int, Bar[])");
+        }
+
+        public string this[Bar[] bars]
+        {
+            get { return "ExactMatch"; }
+        }
+
+        public string this[ICollection bars]
+        {
+            get { return "AssignableMatch"; }
+        }
+
+        public object this[int foo, string key]
+        {
+            get { return key + "_" + foo; }
+        }
+
+        public FooType Type
+        {
+            get { return type; }
+        }
+
+#if NET_2_0
+
+        public DateTime? NullableDate
+        {
+            get { return nullableDate; }
+            set { nullableDate = value; }
+        }
+
+        public int? NullableInt
+        {
+            get { return nullableInt; }
+            set { nullableInt = value; }
+        }
+#endif
+
+        public string MethodWithSimilarArguments(int flags, Bar[] bars)
+        {
+            return "ExactMatch";
+        }
+
+        public string MethodWithSimilarArguments(int flags, ICollection bar)
+        {
+            return "AssignableMatch";
+        }
+
+        public string MethodWithArrayArgument(string[] values)
+        {
+            return string.Join("|", values);
+        }
+
+        public string MethodWithParamArray(params string[] values)
+        {
+            return string.Join("|", values);
+        }
+
+        public string MethodWithParamArray(bool uppercase, params string[] values)
+        {
+            string ret = string.Join("|", values);
+            return (uppercase ? ret.ToUpper() : ret);
+        }
+    }
+
+    internal enum FooType
+    {
+        One,
+        Two,
+        Three
+    }
+
+    internal class Sample
+    {
+        public string O;
+        public string T;
+        public string H;
+
+        public Sample(string o, string t, string h)
+        {
+            O = o;
+            T = t;
+            H = h;
+        }
+    }
+
+    #endregion
+
+    #region Shadowing Test Helper Classes
+
+    internal class ShadowingTestsBaseClass
+    {
+        private object _someValue;
+        private object _readonlyShadowedValue;
+        private object _writeonlyShadowedValue;
+
+        public object SomeValue
+        {
+            get { return _someValue; }
+            set { _someValue = value; }
+        }
+
+        public object ReadonlyShadowedValue
+        {
+            get { return _readonlyShadowedValue; }
+            set { _readonlyShadowedValue = value; }
+        }
+
+        public object WriteonlyShadowedValue
+        {
+            get { return _writeonlyShadowedValue; }
+            set { _writeonlyShadowedValue = value; }
+        }
+    }
+
+    internal class ShadowingTestsSpezializedClass : ShadowingTestsBaseClass
+    {
+        public new string SomeValue
+        {
+            get { return (string)base.SomeValue; }
+            set { base.SomeValue = value; }
+        }
+
+        public new string ReadonlyShadowedValue
+        {
+            get { return (string)base.ReadonlyShadowedValue; }
+        }
+
+        public new string WriteonlyShadowedValue
+        {
+            set { base.WriteonlyShadowedValue = value; }
+        }
+    }
+
+    internal class ShadowingTestsMoreSpezializedClass : ShadowingTestsSpezializedClass
+    {
+    }
+
+    internal class ShadowingTestsMostSpezializedClass : ShadowingTestsMoreSpezializedClass
+    {
+    }
+
+    #endregion // Shadowing Test Helper Classes
+
+
+}
diff --git a/test/Spring/Spring.Core.Tests/Expressions/FunctionNodeTests.cs b/test/Spring/Spring.Core.Tests/Expressions/FunctionNodeTests.cs
new file mode 100644
index 00000000..da59a1ab
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Expressions/FunctionNodeTests.cs
@@ -0,0 +1,77 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: FunctionNodeTests.cs,v 1.1 2008/03/20 23:58:16 oakinger Exp $</version>
+    [TestFixture]
+    public class FunctionNodeTests
+    {
+        [Test]
+        public void ExecutesLambdaFunction()
+        {
+            Hashtable vars = new Hashtable();
+            Expression.RegisterFunction("ident", "{|n| $n}", vars);
+
+            FunctionNode fn = new FunctionNode();
+            fn.Text = "ident";
+            StringLiteralNode str = new StringLiteralNode();
+            str.Text = "theValue";
+            fn.addChild(str);
+
+            IExpression exp = fn;
+            Assert.AreEqual(str.Text, exp.GetValue(null, vars));
+        }
+
+        [Test]
+        public void ExecutesDelegate()
+        {
+            Hashtable vars = new Hashtable();
+            vars["ident"] = new IdentityCallback(Identity);
+
+            FunctionNode fn = new FunctionNode();
+            fn.Text = "ident";
+            StringLiteralNode str = new StringLiteralNode();
+            str.Text = "theValue";
+            fn.addChild(str);
+
+            IExpression exp = fn;
+            Assert.AreEqual(str.Text, exp.GetValue(null, vars));
+        }
+
+        private delegate object IdentityCallback(object arg);
+        private object Identity(object arg)
+        {
+            return arg;
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Expressions/MethodNodeTests.cs b/test/Spring/Spring.Core.Tests/Expressions/MethodNodeTests.cs
new file mode 100644
index 00000000..a9e886fa
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Expressions/MethodNodeTests.cs
@@ -0,0 +1,144 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+using Spring.Expressions.Processors;
+
+#endregion
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: MethodNodeTests.cs,v 1.2 2008/03/20 23:58:16 oakinger Exp $</version>
+    [TestFixture]
+    public class MethodNodeTests
+    {
+        private class MyTestCollectionProcessor : ICollectionProcessor
+        {
+            public object Process(ICollection source, object[] args)
+            {
+                return source;
+            }
+        }
+
+        [Test]
+        public void CallCustomCollectionProcessor()
+        {
+            Hashtable vars = new Hashtable();
+            vars["myCollProc"] = new MyTestCollectionProcessor();
+
+            MethodNode mn = new MethodNode();
+            mn.Text = "myCollProc";
+
+            IExpression exp = mn;
+            int[] input = new int[] {1, 2, 3};
+            Assert.AreSame(input, exp.GetValue(input, vars));
+        }
+
+        [Test, Explicit]
+        public void PerformanceOfMethodEvaluationOnDifferentContextTypes()
+        {
+            MethodNode mn = new MethodNode();
+            mn.Text = "ToString";
+
+            TypeNode nln = new TypeNode();
+            nln.Text = "System.Globalization.CultureInfo";
+
+            PropertyOrFieldNode pn = new PropertyOrFieldNode();
+            pn.Text = "InvariantCulture";
+
+
+            Expression exp = new Expression();
+            exp.addChild(nln);
+            exp.addChild(pn);
+
+            StringLiteralNode sln = new StringLiteralNode();
+            sln.Text = "dummy";
+
+            mn.addChild(sln);
+            mn.addChild(exp);
+
+            IExpression mnExp = mn;
+            Assert.AreEqual("dummy", mnExp.GetValue(0m, null));
+
+            int runs = 10000000;
+
+            StopWatch watch = new StopWatch();
+            using (watch.Start("Duration: {0}"))
+            {
+                for (int i = 0; i < runs; i++)
+                {
+                    mnExp.GetValue(0m, null);
+                }
+            }
+        }
+
+        #region StopWatch
+
+        private class StopWatch
+        {
+            private DateTime _startTime;
+            private TimeSpan _elapsed;
+
+            private class Stopper : IDisposable
+            {
+                private readonly StopWatch _owner;
+                private readonly string _format;
+                public Stopper(StopWatch owner, string format) { _owner = owner; _format = format; }
+                public void Dispose() { _owner.Stop(_format); GC.SuppressFinalize(this); }
+            }
+
+            public IDisposable Start(string outputFormat)
+            {
+                Stopper stopper = new Stopper(this, outputFormat);
+                _startTime = DateTime.Now;
+                return stopper;
+            }
+
+            private void Stop(string outputFormat)
+            {
+                _elapsed = DateTime.Now.Subtract(_startTime);
+                if (outputFormat != null)
+                {
+                    Console.WriteLine(outputFormat, _elapsed);
+                }
+            }
+
+            public DateTime StartTime
+            {
+                get { return _startTime; }
+            }
+
+            public TimeSpan Elapsed
+            {
+                get { return _elapsed; }
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Expressions/Processors/ConversionProcessorTests.cs b/test/Spring/Spring.Core.Tests/Expressions/Processors/ConversionProcessorTests.cs
new file mode 100644
index 00000000..82cc91c6
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Expressions/Processors/ConversionProcessorTests.cs
@@ -0,0 +1,97 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+using Spring.Core.TypeConversion;
+using Spring.Globalization;
+
+#endregion
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ConversionProcessorTests.cs,v 1.1 2008/03/20 23:58:17 oakinger Exp $</version>
+    [TestFixture]
+    public class ConversionProcessorTests
+    {
+        [TestFixtureSetUp]
+        public void FixtureSetUp()
+        {
+            CultureTestScope.Set();
+        }
+
+        [TestFixtureTearDown]
+        public void FixtureTearDown()
+        {
+            CultureTestScope.Reset();
+        }
+
+        [Test]
+        public void RequiresTypeArgument()
+        {
+            ConversionProcessor cp = new ConversionProcessor();
+            try
+            {
+                cp.Process(new object[] {0, 1}, null);
+                Assert.Fail("should throw");
+            }
+            catch (ArgumentNullException)
+            {                
+            }
+        }
+
+        [Test]
+        public void ReturnsListAsIsIfNullOrEmpty()
+        {
+            ConversionProcessor cp = new ConversionProcessor();
+            object result;
+            result = cp.Process(null, new object[] { typeof(int) });
+            Assert.IsNull(result);
+            ICollection input = new object[] {};
+            result = cp.Process(input, new object[] { typeof(int) });
+            Assert.AreEqual( input, result );
+        }
+
+        [Test]
+        public void ReturnsTypedArray()
+        {
+            ConversionProcessor cp = new ConversionProcessor();
+            object result = cp.Process( new object[] { 0, 1 }, new object[] { typeof(int) });
+            Assert.IsTrue( result is int[] );
+        }
+
+        [Test]
+        public void UsesTypeConverterRegistryForConversion()
+        {
+            ConversionProcessor cp = new ConversionProcessor();
+            ICollection result = (ICollection) cp.Process(new object[] { "0", 1, 1.1m, "1.1", 1.1f }, new object[] { typeof(decimal) });
+            decimal sum = 0;
+            foreach (decimal element in result) sum += element;
+            Assert.AreEqual( 4.3f, sum );
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Expressions/Processors/OrderByProcessorTests.cs b/test/Spring/Spring.Core.Tests/Expressions/Processors/OrderByProcessorTests.cs
new file mode 100644
index 00000000..5f9d5f9a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Expressions/Processors/OrderByProcessorTests.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Expressions.Processors
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: OrderByProcessorTests.cs,v 1.1 2008/03/20 23:58:17 oakinger Exp $</version>
+    [TestFixture]
+    public class OrderByProcessorTests
+    {
+        [Test]
+        public void OrderByExpressionString()
+        {
+            IExpression exp = Expression.Parse("orderBy('ToString()')");
+            object[] input = new object[] { 'b', 1, 2.0, "a" };
+
+            Assert.AreEqual( new object[] { 1,2.0,"a",'b' }, exp.GetValue(input) );
+        }
+
+        [Test]
+        public void OrderByLambdaFunction()
+        {
+            IExpression exp = Expression.Parse("orderBy({|a,b| $a.ToString().CompareTo($b.ToString())})");
+            object[] input = new object[] { 'b', 1, 2.0, "a" };
+
+            Assert.AreEqual(new object[] { 1, 2.0, "a", 'b' }, exp.GetValue(input));
+
+            Hashtable vars = new Hashtable();
+            Expression.RegisterFunction( "compare", "{|a,b| $a.ToString().CompareTo($b.ToString())}", vars);
+            exp = Expression.Parse("orderBy(#compare)");
+            Assert.AreEqual(new object[] { 1, 2.0, "a", 'b' }, exp.GetValue(input, vars));
+        }
+
+        [Test]
+        public void OrderByDelegate()
+        {
+            Hashtable vars = new Hashtable();
+            vars["compare"] = new CompareCallback(CompareObjects);
+
+            IExpression exp = Expression.Parse("orderBy(#compare)");
+            object[] input = new object[] { 'b', 1, 2.0, "a" };
+
+            Assert.AreEqual(new object[] { 1, 2.0, "a", 'b' }, exp.GetValue(input, vars));
+        }
+
+        private delegate int CompareCallback(object x, object y);
+        private int CompareObjects(object x, object y)
+        {
+            if (x == y) return 0;
+            return x.ToString().CompareTo(""+y);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Expressions/ReferenceNodeTests.cs b/test/Spring/Spring.Core.Tests/Expressions/ReferenceNodeTests.cs
new file mode 100644
index 00000000..0cff296f
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Expressions/ReferenceNodeTests.cs
@@ -0,0 +1,68 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Text;
+using NUnit.Framework;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ReferenceNodeTests.cs,v 1.1 2008/03/20 10:35:55 oakinger Exp $</version>
+    [TestFixture]
+    public class ReferenceNodeTests
+    {
+        public class MyTestObject
+        {
+            public object MyField;    
+        }
+
+        [Test]
+        public void DoesntCallContextRegistryForLocalObjectFactoryReferences()
+        {
+            string xml = string.Format(
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net'>
+	<object id='foo' type='{0}'>
+        <property name='MyField' expression='@(theObject)' />
+    </object>
+</objects>"
+                            , typeof(MyTestObject).AssemblyQualifiedName
+                            );
+
+            XmlObjectFactory of = new XmlObjectFactory(new StringResource(xml, Encoding.UTF8));
+            object theObject = new object();
+            of.RegisterSingleton("theObject", theObject);
+
+            MyTestObject to = (MyTestObject) of.GetObject("foo");
+            Assert.AreSame( theObject, to.MyField );
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Expressions/SelectionNodeTests.cs b/test/Spring/Spring.Core.Tests/Expressions/SelectionNodeTests.cs
new file mode 100644
index 00000000..3621f721
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Expressions/SelectionNodeTests.cs
@@ -0,0 +1,65 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Expressions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: SelectionNodeTests.cs,v 1.1 2008/03/25 22:33:04 oakinger Exp $</version>
+    [TestFixture]
+    public class SelectionNodeTests
+    {
+        [Test]
+        public void RespectsLimits()
+        {
+            char[] input = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n' };
+            char[] result;
+
+            result = Evaluate("?{ true }", input);
+            Assert.AreEqual(input, result);
+            result = Evaluate("?{ true, 5, 10 }", input);
+            Assert.AreEqual( new char[] { 'f', 'g', 'h', 'i', 'j', 'k' }, result );
+            result = Evaluate("?{ true, 5 }", input);
+            Assert.AreEqual(new char[] { 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n' }, result);
+            result = Evaluate("?{ true, 0, 10 }", input);
+            Assert.AreEqual(new char[] { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k' }, result);
+
+            result = Evaluate("?{ T(System.Convert).ToInt32(#this) % 2 == 0, 1, 3 }", input);
+            Assert.AreEqual(new char[] { 'd', 'f', 'h' }, result);
+        }
+
+        private char[] Evaluate(string expression, char[] input)
+        {
+            IExpression expr = Expression.Parse(expression);
+            ICollection collection = (ICollection)expr.GetValue(input);
+            return (char[]) new ArrayList(collection).ToArray(typeof(char));
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Globalization/AbstractLocalizerTests.cs b/test/Spring/Spring.Core.Tests/Globalization/AbstractLocalizerTests.cs
new file mode 100644
index 00000000..4852377b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Globalization/AbstractLocalizerTests.cs
@@ -0,0 +1,154 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+
+using NUnit.Framework;
+
+using Spring.Context;
+
+#endregion
+
+namespace Spring.Globalization
+{
+    /// <summary>
+    /// Unit tests for the localizers.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AbstractLocalizerTests.cs,v 1.5 2007/07/24 17:26:47 oakinger Exp $</version>
+    public abstract class AbstractLocalizerTests
+    {
+        private ILocalizer localizer;
+
+        [TestFixtureSetUp]
+        public void TestFixtureSetUp()
+        {
+            CultureTestScope.Set("de-AT", "sr");
+        }
+
+        [TestFixtureTearDown]
+        public void TestFixtureTearDown()
+        {
+            CultureTestScope.Reset();
+        }
+
+        [SetUp]
+        public void Init()
+        {
+            localizer = CreateLocalizer();
+        }
+
+        [Test]
+        public void TestInvariantCulture()
+        {
+            Inventor tesla = CreateInventor(CultureInfo.InvariantCulture);
+            Assert.AreEqual("Nikola Tesla", tesla.Name);
+            Assert.AreEqual("Serbian", tesla.Nationality);
+            Assert.AreEqual(new DateTime(1856, 7, 9), tesla.DOB);
+            Assert.AreEqual("Croatia", tesla.PlaceOfBirth.Country);
+            Assert.AreEqual("Smiljan", tesla.PlaceOfBirth.City);
+        }
+
+        [Test]
+        public void TestSerbianLatin()
+        {
+            Inventor tesla = CreateInventor(new CultureInfo(CultureInfoUtils.SerbianLatinCultureName));
+            Assert.AreEqual("Nikola Tesla", tesla.Name);
+            Assert.AreEqual("Srbin", tesla.Nationality);
+            Assert.AreEqual(new DateTime(1856, 7, 9), tesla.DOB);
+            Assert.AreEqual("Hrvatska", tesla.PlaceOfBirth.Country);
+            Assert.AreEqual("Smiljan", tesla.PlaceOfBirth.City);
+        }
+
+        [Test]
+        public void TestSerbianCyrillic()
+        {
+            Inventor tesla = CreateInventor(new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName));
+            Assert.AreEqual("�икола Те�ла", tesla.Name);
+            Assert.AreEqual("Србин", tesla.Nationality);
+            Assert.AreEqual(new DateTime(1856, 7, 9), tesla.DOB);
+            Assert.AreEqual("Хрват�ка", tesla.PlaceOfBirth.Country);
+            Assert.AreEqual("Смиљан", tesla.PlaceOfBirth.City);
+        }
+
+        [Test]
+        public void NullReferenceHandling()
+        {
+//            ResourceSetMessageSource messageSource = new ResourceSetMessageSource();
+//            messageSource.ResourceManagers.Add(new ResourceManager("Spring.Resources.Tesla", GetType().Assembly));
+//            ResourceSetLocalizer localizer = new ResourceSetLocalizer();
+            IMessageSource messageSource = CreateMessageSource();
+
+            // target must not be null
+            try
+            {
+                localizer.ApplyResources(null, messageSource, CultureInfo.InvariantCulture);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException) { }
+            try
+            {
+                localizer.ApplyResources(null, messageSource);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException) { }
+
+            // messageSource may be null
+            localizer.ApplyResources(new object(), null);
+            localizer.ApplyResources(new object(), null, CultureInfo.InvariantCulture);
+
+            try
+            {
+                localizer.ApplyResources(new object(), messageSource, null);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException) { }
+        }
+
+        [Test]
+        public void DefaultResolvesUsingCurrentUICulture()
+        {
+            Inventor tesla = CreateInventor(null);
+            Assert.AreEqual("Nikola Tesla", tesla.Name);
+            Assert.AreEqual("Srbin", tesla.Nationality);
+        }
+
+        private Inventor CreateInventor(CultureInfo culture)
+        {
+            Inventor inventor = new Inventor();
+            IMessageSource messageSource = CreateMessageSource();
+            if (culture == null)
+            {
+                localizer.ApplyResources(inventor, messageSource);
+            }
+            else
+            {
+                localizer.ApplyResources(inventor, messageSource, culture);
+            }
+            return inventor;
+        }
+
+        protected abstract ILocalizer CreateLocalizer();
+        protected abstract IMessageSource CreateMessageSource();
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Globalization/CultureInfoUtils.cs b/test/Spring/Spring.Core.Tests/Globalization/CultureInfoUtils.cs
new file mode 100644
index 00000000..eec624ae
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Globalization/CultureInfoUtils.cs
@@ -0,0 +1,61 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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.Globalization;
+
+namespace Spring.Globalization
+{
+    /// <summary>
+    /// Helper class to pick the appropriate culture name for serbian due to changes of the CultureInfo classes
+    /// in recent releases of the .NET framework.
+    /// </summary>
+    /// <remarks>In short, sr-SP-Latn->sr-Latn-CS and sr-SP-Cyrl->sr-Cyrl-CS.  See http://blogs.msdn.com/kierans/archive/2006/08/02/687267.aspx
+    /// and http://blogs.msdn.com/shawnste/archive/2006/11/14/problems-compiling-resources-in-net-2-0-apps-after-updates.aspx for
+    /// additional information.</remarks>
+    /// <author>Mark Pollack</author>
+    public class CultureInfoUtils
+    {
+        private static string srLatn = "sr-SP-Latn";
+        private static string srCyrl = "sr-SP-Cyrl";
+
+        static CultureInfoUtils()
+        {
+            foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.AllCultures))
+            {
+                if (ci.Name.Equals("sr-Latn-CS"))
+                {
+                    srLatn = "sr-Latn-CS";
+                    srCyrl = "sr-Cyrl-CS";
+                    break;
+                }
+            }
+        }
+
+        public static string SerbianCyrillicCultureName
+        {
+            get { return srCyrl; }
+        }
+
+        public static string SerbianLatinCultureName
+        {
+            get { return srLatn; }
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Globalization/CultureTestScope.cs b/test/Spring/Spring.Core.Tests/Globalization/CultureTestScope.cs
new file mode 100644
index 00000000..e6fbd5ca
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Globalization/CultureTestScope.cs
@@ -0,0 +1,80 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Threading;
+
+#endregion
+
+namespace Spring.Globalization
+{
+    /// <summary>
+    /// Helps setting/resetting current thread cultures.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: CultureTestScope.cs,v 1.1 2007/07/24 17:26:47 oakinger Exp $</version>
+    public class CultureTestScope : IDisposable
+    {
+        [ThreadStatic]
+        private static CultureTestScope s_currentScope;
+
+        public static void Set()
+        {
+            Set("en-GB", "de-DE");
+        }
+
+        public static void Set(string culture, string uiCulture)
+        {
+            s_currentScope = new CultureTestScope(culture, uiCulture);
+        }
+
+        public static void Reset()
+        {
+            CultureTestScope scope = s_currentScope; s_currentScope = null;
+            scope.Dispose();
+        }
+
+        private readonly CultureInfo _prevCulture;
+        private readonly CultureInfo _prevUICulture;
+
+        private CultureTestScope(string culture, string uiCulture)
+        {
+            this._prevCulture = Thread.CurrentThread.CurrentCulture;
+            this._prevUICulture = Thread.CurrentThread.CurrentUICulture;
+
+            Thread.CurrentThread.CurrentCulture = new CultureInfo(culture);
+            Thread.CurrentThread.CurrentUICulture = new CultureInfo(uiCulture);
+        }
+
+        void IDisposable.Dispose()
+        {
+            this.Dispose();
+        }
+
+        private void Dispose()
+        {
+            Thread.CurrentThread.CurrentCulture = this._prevCulture;
+            Thread.CurrentThread.CurrentUICulture = this._prevUICulture;
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/BooleanFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/BooleanFormatterTests.cs
new file mode 100644
index 00000000..e69de29b
diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs
new file mode 100644
index 00000000..ec9f4b09
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs
@@ -0,0 +1,160 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 NUnit.Framework;
+
+namespace Spring.Globalization.Formatters
+{
+	/// <summary>
+	/// Unit tests for CurrencyFormatter class.
+	/// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CurrencyFormatterTests.cs,v 1.3 2007/05/04 18:13:22 markpollack Exp $</version>
+    [TestFixture]
+    public class CurrencyFormatterTests
+	{
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void FormatNullValue()
+        {
+            CurrencyFormatter fmt = new CurrencyFormatter();
+            fmt.Format(null);
+        }
+
+        [Test]
+        public void ParseNullOrEmptyValue()
+        {
+            CurrencyFormatter fmt = new CurrencyFormatter();
+            Assert.AreEqual(0, fmt.Parse(null));
+            Assert.IsTrue(fmt.Parse("") is double);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void FormatNonNumber()
+        {
+            CurrencyFormatter fmt = new CurrencyFormatter();
+            fmt.Format("not a number");
+        }
+
+        [Test]
+        public void FormatUsingDefaults()
+        {
+            CurrencyFormatter fmt = new CurrencyFormatter("en-US");
+            Assert.AreEqual("$1,234.00", fmt.Format(1234));
+            Assert.AreEqual("$1,234.56", fmt.Format(1234.56));
+            Assert.AreEqual("($1,234.00)", fmt.Format(-1234));
+            Assert.AreEqual("($1,234.56)", fmt.Format(-1234.56));
+
+            fmt = new CurrencyFormatter(CultureInfoUtils.SerbianLatinCultureName);
+            Assert.AreEqual("1.234,00 Din.", fmt.Format(1234));
+            Assert.AreEqual("1.234,56 Din.", fmt.Format(1234.56));
+            Assert.AreEqual("-1.234,00 Din.", fmt.Format(-1234));
+            Assert.AreEqual("-1.234,56 Din.", fmt.Format(-1234.56));
+
+            fmt = new CurrencyFormatter(CultureInfoUtils.SerbianCyrillicCultureName);
+            Assert.AreEqual("1.234,00 Дин.", fmt.Format(1234));
+            Assert.AreEqual("1.234,56 Дин.", fmt.Format(1234.56));
+            Assert.AreEqual("-1.234,00 Дин.", fmt.Format(-1234));
+            Assert.AreEqual("-1.234,56 Дин.", fmt.Format(-1234.56));
+        }
+
+        [Test]
+        public void ParseUsingDefaults()
+        {
+            CurrencyFormatter fmt = new CurrencyFormatter("en-US");
+            Assert.AreEqual(1234, fmt.Parse("$1,234.00"));
+            Assert.AreEqual(1234.56, fmt.Parse("$1,234.56"));
+            Assert.AreEqual(-1234, fmt.Parse("($1,234.00)"));
+            Assert.AreEqual(-1234.56, fmt.Parse("($1,234.56)"));
+
+            fmt = new CurrencyFormatter(CultureInfoUtils.SerbianLatinCultureName);
+            Assert.AreEqual(1234, fmt.Parse("1.234,00 Din."));
+            Assert.AreEqual(1234.56, fmt.Parse("1.234,56 Din."));
+            Assert.AreEqual(-1234, fmt.Parse("-1.234,00 Din."));
+            Assert.AreEqual(-1234.56, fmt.Parse("-1.234,56 Din."));
+
+            fmt = new CurrencyFormatter(CultureInfoUtils.SerbianCyrillicCultureName);
+            Assert.AreEqual(1234, fmt.Parse("1.234,00 Дин."));
+            Assert.AreEqual(1234.56, fmt.Parse("1.234,56 Дин."));
+            Assert.AreEqual(-1234, fmt.Parse("-1.234,00 Дин."));
+            Assert.AreEqual(-1234.56, fmt.Parse("-1.234,56 Дин."));
+        }
+
+        [Test]
+        public void FormatUsingCustomSettings()
+        {
+            CurrencyFormatter fmt = new CurrencyFormatter("en-US");
+            fmt.DecimalDigits = 0;
+            fmt.NegativePattern = 1;
+            Assert.AreEqual("$1,234", fmt.Format(1234));
+            Assert.AreEqual("$1,235", fmt.Format(1234.56));
+            Assert.AreEqual("-$1,234", fmt.Format(-1234));
+            Assert.AreEqual("-$1,235", fmt.Format(-1234.56));
+
+            fmt = new CurrencyFormatter(CultureInfoUtils.SerbianLatinCultureName);
+            fmt.PositivePattern = 1;
+            fmt.CurrencySymbol = "din";
+            Assert.AreEqual("1.234,00din", fmt.Format(1234));
+            Assert.AreEqual("1.234,56din", fmt.Format(1234.56));
+            Assert.AreEqual("-1.234,00 din", fmt.Format(-1234));
+            Assert.AreEqual("-1.234,56 din", fmt.Format(-1234.56));
+
+            fmt = new CurrencyFormatter(CultureInfoUtils.SerbianCyrillicCultureName);
+            fmt.GroupSizes = new int[] {1, 2};
+            fmt.GroupSeparator = "'";
+            Assert.AreEqual("1'23'4,00 Дин.", fmt.Format(1234));
+            Assert.AreEqual("1'23'4,56 Дин.", fmt.Format(1234.56));
+            Assert.AreEqual("-1'23'4,00 Дин.", fmt.Format(-1234));
+            Assert.AreEqual("-1'23'4,56 Дин.", fmt.Format(-1234.56));
+        }
+
+        [Test]
+        public void ParseUsingCustomSettings()
+        {
+            CurrencyFormatter fmt = new CurrencyFormatter("en-US");
+            fmt.DecimalDigits = 0;
+            fmt.NegativePattern = 1;
+            Assert.AreEqual(1234, fmt.Parse("$1,234"));
+            Assert.AreEqual(1234.56, fmt.Parse("$1,234.56"));
+            Assert.AreEqual(-1234, fmt.Parse("-$1,234"));
+            Assert.AreEqual(-1234.56, fmt.Parse("-$1,234.56"));
+
+            fmt = new CurrencyFormatter("sr-SP-Latn");
+            fmt.PositivePattern = 1;
+            fmt.CurrencySymbol = "din";
+            Assert.AreEqual(1234, fmt.Parse("1.234,00din"));
+            Assert.AreEqual(1234.56, fmt.Parse("1.234,56din"));
+            Assert.AreEqual(-1234, fmt.Parse("-1.234,00 din"));
+            Assert.AreEqual(-1234.56, fmt.Parse("-1.234,56 din"));
+
+            fmt = new CurrencyFormatter(CultureInfoUtils.SerbianCyrillicCultureName);
+            fmt.GroupSizes = new int[] {1, 2};
+            fmt.GroupSeparator = "'";
+            Assert.AreEqual(1234, fmt.Parse("1'23'4,00 Дин."));
+            Assert.AreEqual(1234.56, fmt.Parse("1'23'4,56 Дин."));
+            Assert.AreEqual(-1234, fmt.Parse("-1'23'4,00 Дин."));
+            Assert.AreEqual(-1234.56, fmt.Parse("-1'23'4,56 Дин."));
+        }
+
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs
new file mode 100644
index 00000000..287d52e8
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs
@@ -0,0 +1,99 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 NUnit.Framework;
+
+namespace Spring.Globalization.Formatters
+{
+	/// <summary>
+	/// Unit tests for DateTimeFormatter class.
+	/// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DateTimeFormatterTests.cs,v 1.3 2007/05/04 18:13:22 markpollack Exp $</version>
+    [TestFixture]
+    public class DateTimeFormatterTests
+	{
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void FormatNullValue()
+        {
+            DateTimeFormatter fmt = new DateTimeFormatter("d");
+            fmt.Format(null);
+        }
+
+        [Test]
+        public void ParseNullOrEmptyValue()
+        {
+            DateTimeFormatter fmt = new DateTimeFormatter("d");
+            Assert.AreEqual(DateTime.MinValue, fmt.Parse(null));
+            Assert.IsTrue(fmt.Parse("") is DateTime);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void FormatNonDate()
+        {
+            DateTimeFormatter fmt = new DateTimeFormatter("d");
+            fmt.Format("not a date");
+        }
+
+        [Test]
+        public void FormatUsingDefaults()
+        {
+            DateTimeFormatter fmt = new DateTimeFormatter("d", "en-US");
+            Assert.AreEqual("8/14/2004", fmt.Format(new DateTime(2004, 8, 14)));
+            Assert.AreEqual("8/24/1974", fmt.Format(new DateTime(1974, 8, 24)));
+            
+            fmt = new DateTimeFormatter("dd-MMM-yyyy", "en-US");
+            Assert.AreEqual("14-Aug-2004", fmt.Format(new DateTime(2004, 8, 14)));
+            Assert.AreEqual("24-Aug-1974", fmt.Format(new DateTime(1974, 8, 24)));
+
+            fmt = new DateTimeFormatter("D", CultureInfoUtils.SerbianLatinCultureName);
+            Assert.AreEqual("14. avgust 2004", fmt.Format(new DateTime(2004, 8, 14)));
+            Assert.AreEqual("24. avgust 1974", fmt.Format(new DateTime(1974, 8, 24)));
+
+            fmt = new DateTimeFormatter("dd-MMM-yyyy", CultureInfoUtils.SerbianCyrillicCultureName);
+            Assert.AreEqual("14-авг-2004", fmt.Format(new DateTime(2004, 8, 14)));
+            Assert.AreEqual("24-авг-1974", fmt.Format(new DateTime(1974, 8, 24)));
+        }
+
+        [Test]
+        public void ParseUsingDefaults()
+        {
+            DateTimeFormatter fmt = new DateTimeFormatter("d", "en-US");
+            Assert.AreEqual(new DateTime(2004, 8, 14), fmt.Parse("8/14/2004"));
+            Assert.AreEqual(new DateTime(1974, 8, 24), fmt.Parse("8/24/1974"));
+            
+            fmt = new DateTimeFormatter("dd-MMM-yyyy", "en-US");
+            Assert.AreEqual(new DateTime(2004, 8, 14), fmt.Parse("14-Aug-2004"));
+            Assert.AreEqual(new DateTime(1974, 8, 24), fmt.Parse("24-Aug-1974"));
+
+            fmt = new DateTimeFormatter("D", CultureInfoUtils.SerbianLatinCultureName);
+            Assert.AreEqual(new DateTime(2004, 8, 14), fmt.Parse("14. avgust 2004"));
+            Assert.AreEqual(new DateTime(1974, 8, 24), fmt.Parse("24. avgust 1974"));
+
+            fmt = new DateTimeFormatter("dd-MMM-yyyy", CultureInfoUtils.SerbianCyrillicCultureName);
+            Assert.AreEqual(new DateTime(2004, 8, 14), fmt.Parse("14-авг-2004"));
+            Assert.AreEqual(new DateTime(1974, 8, 24), fmt.Parse("24-авг-1974"));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/FilteringFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/FilteringFormatterTests.cs
new file mode 100644
index 00000000..d647a10e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/FilteringFormatterTests.cs
@@ -0,0 +1,95 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+#endregion
+
+namespace Spring.Globalization.Formatters
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: FilteringFormatterTests.cs,v 1.1 2008/03/20 13:19:47 oakinger Exp $</version>
+    [TestFixture]
+    public class FilteringFormatterTests
+    {
+        public class TestFilteringFormatter : FilteringFormatter
+        {
+            public TestFilteringFormatter(IFormatter underlyingFormatter) : base(underlyingFormatter)
+            {
+            }
+
+            protected override string FilterValueToParse(string value)
+            {
+                return this.DoFilterValueToParse(value);
+            }
+
+            public virtual string DoFilterValueToParse(string value)
+            {
+                return base.FilterValueToParse(value);                
+            }
+
+            protected override object FilterValueToFormat(object value)
+            {
+                return this.DoFilterValueToFormat(value);
+            }
+
+            public virtual object DoFilterValueToFormat(object value)
+            {
+                return base.FilterValueToFormat(value);
+            }
+
+        }
+
+        [Test]
+        public void FiltersOnParseAndFormat()
+        {
+            MockRepository mocks = new MockRepository();
+            IFormatter underlyingFormatter = (IFormatter) mocks.CreateMock(typeof (IFormatter));
+            TestFilteringFormatter formatter = (TestFilteringFormatter) mocks.PartialMock(typeof (TestFilteringFormatter), underlyingFormatter);
+
+            string inputText = "inputText";
+            string filteredInputText = "filteredInputText";
+            object outputValue = new object();
+            object filteredOutputValue = new object();
+
+            using(mocks.Ordered())
+            {
+                Expect.Call(formatter.DoFilterValueToParse(inputText)).Return(filteredInputText);
+                Expect.Call(underlyingFormatter.Parse(filteredInputText)).Return(outputValue);
+
+                Expect.Call(formatter.DoFilterValueToFormat(outputValue)).Return(filteredOutputValue);
+                Expect.Call(underlyingFormatter.Format(filteredOutputValue)).Return(inputText);
+            }
+            mocks.ReplayAll();
+
+            Assert.AreSame(outputValue, formatter.Parse(inputText));
+            Assert.AreEqual(inputText, formatter.Format(outputValue));
+
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/FloatFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/FloatFormatterTests.cs
new file mode 100644
index 00000000..0474bc7f
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/FloatFormatterTests.cs
@@ -0,0 +1,97 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 NUnit.Framework;
+
+namespace Spring.Globalization.Formatters
+{
+	/// <summary>
+	/// Unit tests for FloatFormatter class.
+	/// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: FloatFormatterTests.cs,v 1.3 2006/04/09 07:24:49 markpollack Exp $</version>
+    [TestFixture]
+    public class FloatFormatterTests
+	{
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void FormatNullValue()
+        {
+            FloatFormatter fmt = new FloatFormatter();
+            fmt.Format(null);
+        }
+
+        [Test]
+        public void ParseNullOrEmptyValue()
+        {
+            FloatFormatter fmt = new FloatFormatter();
+            Assert.AreEqual(0, fmt.Parse(null));
+            Assert.IsTrue(fmt.Parse("") is double);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void FormatNonNumber()
+        {
+            FloatFormatter fmt = new FloatFormatter();
+            fmt.Format("not a number");
+        }
+
+        [Test]
+        public void FormatUsingDefaults()
+        {
+            FloatFormatter fmt = new FloatFormatter(FloatFormatter.DefaultFormat, "en-US");
+            Assert.AreEqual("1234.00", fmt.Format(1234));
+            Assert.AreEqual("-1234.00", fmt.Format(-1234));
+
+            fmt = new FloatFormatter(FloatFormatter.DefaultFormat, "sr-SP-Latn");
+            Assert.AreEqual("1234,00", fmt.Format(1234));
+            Assert.AreEqual("-1234,00", fmt.Format(-1234));
+        }
+
+        [Test]
+        public void ParseUsingDefaults()
+        {
+            FloatFormatter fmt = new FloatFormatter(FloatFormatter.DefaultFormat, "en-US");
+            Assert.AreEqual(1234.56, fmt.Parse("1234.56"));
+            Assert.AreEqual(-1234, fmt.Parse("-1234"));
+            Assert.AreEqual(1234.56, fmt.Parse("1.23456e+003"));
+            Assert.AreEqual(-1234, fmt.Parse("-1.234e+003"));
+
+            fmt = new FloatFormatter(FloatFormatter.DefaultFormat, "sr-SP-Cyrl");
+            Assert.AreEqual(1234.56, fmt.Parse("1234,56"));
+            Assert.AreEqual(-1234, fmt.Parse("-1234"));
+            Assert.AreEqual(1234.56, fmt.Parse("1,23456e+003"));
+            Assert.AreEqual(-1234, fmt.Parse("-1,234e+003"));
+        }
+
+        [Test]
+        public void FormatUsingCustomSettings()
+        {
+            FloatFormatter fmt = new FloatFormatter("{0:e3}", "en-US");
+            Assert.AreEqual("1.234e+003", fmt.Format(1234));
+            Assert.AreEqual("-1.234e+003", fmt.Format(-1234));
+            Assert.AreEqual("1.235e+003", fmt.Format(1234.56));
+            Assert.AreEqual("-1.235e+003", fmt.Format(-1234.56));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/HasTextFilteringFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/HasTextFilteringFormatterTests.cs
new file mode 100644
index 00000000..93551515
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/HasTextFilteringFormatterTests.cs
@@ -0,0 +1,63 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Globalization.Formatters
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: HasTextFilteringFormatterTests.cs,v 1.1 2008/03/20 13:19:47 oakinger Exp $</version>
+    [TestFixture]
+    public class HasTextFilteringFormatterTests
+    {
+        [Test]
+        public void ReplacesNullAndWhitespacesByDefaultValue()
+        {
+            string defaultValue = "theDefaultValue";
+            HasTextFilteringFormatter fmt = new HasTextFilteringFormatter(defaultValue, null);
+
+            Assert.AreEqual( defaultValue, fmt.Parse(null));
+            Assert.AreEqual(defaultValue, fmt.Parse(string.Empty));
+            Assert.AreEqual( defaultValue, fmt.Parse("\t \n\r"));
+            Assert.AreEqual(" text \n", fmt.Parse(" text \n"));
+        }
+
+        [Test]
+        public void DoesntAffectFormat()
+        {
+            string defaultValue = "theDefaultValue";
+            HasTextFilteringFormatter fmt = new HasTextFilteringFormatter(defaultValue, null);
+
+            Assert.AreEqual(null, fmt.Format(null));
+            Assert.AreEqual(string.Empty, fmt.Format(string.Empty));
+            Assert.AreEqual("\t \n\r", fmt.Format("\t \n\r"));
+            object o = new object();
+            Assert.AreEqual(o.ToString(), fmt.Format(o));            
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/IntegerFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/IntegerFormatterTests.cs
new file mode 100644
index 00000000..efb79d9e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/IntegerFormatterTests.cs
@@ -0,0 +1,92 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 NUnit.Framework;
+
+namespace Spring.Globalization.Formatters
+{
+	/// <summary>
+	/// Unit tests for IntegerFormatter class.
+	/// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: IntegerFormatterTests.cs,v 1.3 2007/06/01 08:53:06 oakinger Exp $</version>
+    [TestFixture]
+    public class IntegerFormatterTests
+	{
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void FormatNullValue()
+        {
+            IntegerFormatter fmt = new IntegerFormatter();
+            fmt.Format(null);
+        }
+
+        [Test]
+        public void ParseNullOrEmptyValue()
+        {
+            IntegerFormatter fmt = new IntegerFormatter();
+            Assert.AreEqual( 0, fmt.Parse(null));
+            Assert.AreEqual( 0, fmt.Parse(string.Empty) );
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void FormatNonNumber()
+        {
+            IntegerFormatter fmt = new IntegerFormatter();
+            fmt.Format("not a number");
+        }
+
+        [Test]
+        public void FormatUsingDefaults()
+        {
+            IntegerFormatter fmt = new IntegerFormatter();
+            Assert.AreEqual("1234", fmt.Format(1234));
+            Assert.AreEqual("-1234", fmt.Format(-1234));
+        }
+
+        [Test]
+        public void ParseUsingDefaults()
+        {
+            IntegerFormatter fmt = new IntegerFormatter();
+            Assert.AreEqual(1234, fmt.Parse("1234"));
+            Assert.AreEqual(-1234, fmt.Parse("-1234"));
+        }
+
+        [Test]
+        public void FormatUsingCustomSettings()
+        {
+            IntegerFormatter fmt = new IntegerFormatter("{0:00000}");
+            Assert.AreEqual("01234", fmt.Format(1234));
+            Assert.AreEqual("-01234", fmt.Format(-1234));
+
+            fmt = new IntegerFormatter("{0,10}");
+            Assert.AreEqual("      1234", fmt.Format(1234));
+
+            fmt = new IntegerFormatter("{0,-10}");
+            Assert.AreEqual("1234      ", fmt.Format(1234));
+
+            fmt = new IntegerFormatter("{0:(###) ###-####}");
+            Assert.AreEqual("(813) 555-4034", fmt.Format(8135554034));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/NumberFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/NumberFormatterTests.cs
new file mode 100644
index 00000000..9db42539
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/NumberFormatterTests.cs
@@ -0,0 +1,132 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 NUnit.Framework;
+
+namespace Spring.Globalization.Formatters
+{
+	/// <summary>
+	/// Unit tests for NumberFormatter class.
+	/// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: NumberFormatterTests.cs,v 1.2 2006/04/09 07:24:49 markpollack Exp $</version>
+    [TestFixture]
+    public class NumberFormatterTests
+	{
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void FormatNullValue()
+        {
+            NumberFormatter fmt = new NumberFormatter();
+            fmt.Format(null);
+        }
+
+        [Test]
+        public void ParseNullOrEmptyValue()
+        {
+            NumberFormatter fmt = new NumberFormatter();
+            Assert.AreEqual(0, fmt.Parse(null));
+            Assert.IsTrue(fmt.Parse("") is double);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void FormatNonNumber()
+        {
+            NumberFormatter fmt = new NumberFormatter();
+            fmt.Format("not a number");
+        }
+
+        [Test]
+        public void FormatUsingDefaults()
+        {
+            NumberFormatter fmt = new NumberFormatter("en-US");
+            Assert.AreEqual("1,234.00", fmt.Format(1234));
+            Assert.AreEqual("1,234.56", fmt.Format(1234.56));
+            Assert.AreEqual("-1,234.00", fmt.Format(-1234));
+            Assert.AreEqual("-1,234.56", fmt.Format(-1234.56));
+
+            fmt = new NumberFormatter("sr-SP-Latn");
+            Assert.AreEqual("1.234,00", fmt.Format(1234));
+            Assert.AreEqual("1.234,56", fmt.Format(1234.56));
+            Assert.AreEqual("-1.234,00", fmt.Format(-1234));
+            Assert.AreEqual("-1.234,56", fmt.Format(-1234.56));
+        }
+
+        [Test]
+        public void ParseUsingDefaults()
+        {
+            NumberFormatter fmt = new NumberFormatter("en-US");
+            Assert.AreEqual(1234, fmt.Parse("1,234.00"));
+            Assert.AreEqual(1234.56, fmt.Parse("1,234.56"));
+            Assert.AreEqual(-1234, fmt.Parse("-1,234.00"));
+            Assert.AreEqual(-1234.56, fmt.Parse("-1,234.56"));
+
+            fmt = new NumberFormatter("sr-SP-Latn");
+            Assert.AreEqual(1234, fmt.Parse("1.234,00"));
+            Assert.AreEqual(1234.56, fmt.Parse("1.234,56"));
+            Assert.AreEqual(-1234, fmt.Parse("-1.234,00"));
+            Assert.AreEqual(-1234.56, fmt.Parse("-1.234,56"));
+        }
+
+        [Test]
+        public void FormatUsingCustomSettings()
+        {
+            NumberFormatter fmt = new NumberFormatter("en-US");
+            fmt.DecimalDigits = 0;
+            fmt.NegativePattern = 0;
+            Assert.AreEqual("1,234", fmt.Format(1234));
+            Assert.AreEqual("1,235", fmt.Format(1234.56));
+            Assert.AreEqual("(1,234)", fmt.Format(-1234));
+            Assert.AreEqual("(1,235)", fmt.Format(-1234.56));
+
+            fmt = new NumberFormatter("sr-SP-Cyrl");
+            fmt.GroupSizes = new int[] {1, 2};
+            fmt.GroupSeparator = "'";
+            Assert.AreEqual("1'23'4,00", fmt.Format(1234));
+            Assert.AreEqual("1'23'4,56", fmt.Format(1234.56));
+            Assert.AreEqual("-1'23'4,00", fmt.Format(-1234));
+            Assert.AreEqual("-1'23'4,56", fmt.Format(-1234.56));
+        }
+
+        [Test]
+        public void ParseUsingCustomSettings()
+        {
+            NumberFormatter fmt = new NumberFormatter("en-US");
+            fmt.DecimalDigits = 0;
+            fmt.NegativePattern = 0;
+            Assert.AreEqual(1234, fmt.Parse("1,234"));
+            Assert.AreEqual(1234.56, fmt.Parse("1,234.56"));
+            Assert.AreEqual(-1234, fmt.Parse("(1,234)"));
+            Assert.AreEqual(-1234.56, fmt.Parse("(1,234.56)"));
+
+            fmt = new NumberFormatter("sr-SP-Cyrl");
+            fmt.GroupSizes = new int[] {1, 2};
+            fmt.GroupSeparator = "'";
+            Assert.AreEqual(1234, fmt.Parse("1'23'4,00"));
+            Assert.AreEqual(1234.56, fmt.Parse("1'23'4,56"));
+            Assert.AreEqual(-1234, fmt.Parse("-1'23'4,00"));
+            Assert.AreEqual(-1234.56, fmt.Parse("-1'23'4,56"));
+        }
+
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/PercentFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/PercentFormatterTests.cs
new file mode 100644
index 00000000..185e5208
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/PercentFormatterTests.cs
@@ -0,0 +1,113 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 NUnit.Framework;
+
+namespace Spring.Globalization.Formatters
+{
+	/// <summary>
+	/// Unit tests for PercentFormatter class.
+	/// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: PercentFormatterTests.cs,v 1.2 2006/04/09 07:24:49 markpollack Exp $</version>
+    [TestFixture]
+    public class PercentFormatterTests
+	{
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void FormatNullValue()
+        {
+            PercentFormatter fmt = new PercentFormatter();
+            fmt.Format(null);
+        }
+
+        [Test]
+        public void ParseNullOrEmptyValue()
+        {
+            PercentFormatter fmt = new PercentFormatter();
+            Assert.AreEqual(0, fmt.Parse(null));
+            Assert.IsTrue(fmt.Parse("") is double);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void FormatNonNumber()
+        {
+            PercentFormatter fmt = new PercentFormatter();
+            fmt.Format("not a number");
+        }
+
+        [Test]
+        public void FormatUsingDefaults()
+        {
+            PercentFormatter fmt = new PercentFormatter("en-US");
+            Assert.AreEqual("25.00 %", fmt.Format(0.25));
+            Assert.AreEqual("25.34 %", fmt.Format(0.2534));
+
+            fmt = new PercentFormatter("sr-SP-Latn");
+            Assert.AreEqual("25,00%", fmt.Format(0.25));
+            Assert.AreEqual("25,34%", fmt.Format(0.2534));
+        }
+
+        [Test]
+        public void ParseUsingDefaults()
+        {
+            PercentFormatter fmt = new PercentFormatter("en-US");
+            Assert.AreEqual(0.25, fmt.Parse("25.00 %"));
+            Assert.AreEqual(0.2534, fmt.Parse("25.34 %"));
+
+            fmt = new PercentFormatter("sr-SP-Latn");
+            Assert.AreEqual(0.25, fmt.Parse("25,00%"));
+            Assert.AreEqual(0.2534, fmt.Parse("25,34%"));
+        }
+
+        [Test]
+        public void FormatUsingCustomSettings()
+        {
+            PercentFormatter fmt = new PercentFormatter("en-US");
+            fmt.DecimalDigits = 0;
+            fmt.PositivePattern = 1;
+            Assert.AreEqual("25%", fmt.Format(0.25));
+            Assert.AreEqual("25%", fmt.Format(0.2534));
+
+            fmt = new PercentFormatter("sr-SP-Latn");
+            fmt.DecimalDigits = 1;
+            Assert.AreEqual("25,0%", fmt.Format(0.25));
+            Assert.AreEqual("25,3%", fmt.Format(0.2534));
+        }
+
+        [Test]
+        public void ParseUsingCustomSettings()
+        {
+            PercentFormatter fmt = new PercentFormatter("en-US");
+            fmt.DecimalDigits = 0;
+            fmt.PositivePattern = 1;
+            Assert.AreEqual(0.25, fmt.Parse("25%"));
+            Assert.AreEqual(0.2534, fmt.Parse("25.34%"));
+
+            fmt = new PercentFormatter("sr-SP-Latn");
+            fmt.DecimalDigits = 1;
+            Assert.AreEqual(0.25, fmt.Parse("25,0%"));
+            Assert.AreEqual(0.253, fmt.Parse("25,3%"));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Globalization/Localizers/ResourceSetLocalizerTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Localizers/ResourceSetLocalizerTests.cs
new file mode 100644
index 00000000..23b81b7b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Globalization/Localizers/ResourceSetLocalizerTests.cs
@@ -0,0 +1,68 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Resources;
+
+using NUnit.Framework;
+
+using Spring.Context;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Globalization.Localizers
+{
+    /// <summary>
+    /// Unit tests for the ResourceSetLocalizer class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ResourceSetLocalizerTests.cs,v 1.4 2007/07/24 17:26:47 oakinger Exp $</version>
+
+#if ! NET_1_0
+    [TestFixture]
+#endif
+    public sealed class ResourceSetLocalizerTests : AbstractLocalizerTests
+    {
+        protected override ILocalizer CreateLocalizer()
+        {
+            return new ResourceSetLocalizer();
+        }
+
+        protected override IMessageSource CreateMessageSource()
+        {
+            ResourceSetMessageSource messageSource = new ResourceSetMessageSource();
+            messageSource.ResourceManagers.Add(new ResourceManager("Spring.Resources.Tesla", GetType().Assembly));
+            return messageSource;
+        }
+
+        [Test]
+        public void DoesNotThrowOnMissingResource()
+        {
+            ResourceSetMessageSource messageSource = new ResourceSetMessageSource();
+            messageSource.ResourceManagers.Add(new ResourceManager("do not exist", GetType().Assembly));
+            ResourceSetLocalizer localizer = new ResourceSetLocalizer();
+            localizer.ApplyResources(new Inventor(), messageSource, CultureInfo.InvariantCulture);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Globalization/Resolvers/DefaultCultureResolverTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Resolvers/DefaultCultureResolverTests.cs
new file mode 100644
index 00000000..3a2541e7
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Globalization/Resolvers/DefaultCultureResolverTests.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Globalization;
+using System.Threading;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Globalization.Resolvers
+{
+    /// <summary>
+    /// Unit tests for the DefaultCultureResolver class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: DefaultCultureResolverTests.cs,v 1.2 2006/04/09 07:24:50 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class DefaultCultureResolverTests
+    {
+        [Test]
+        public void ResolveCultureYieldsThreadsCultureAfterInitialization()
+        {
+            DefaultCultureResolver resolver = new DefaultCultureResolver();
+            Assert.AreEqual(Thread.CurrentThread.CurrentUICulture, resolver.ResolveCulture(),
+                            "Not defaulting to the culture of the current thread.");
+        }
+
+        [Test]
+        public void DefaultCultureIsNullAfterInitialization()
+        {
+            DefaultCultureResolver resolver = new DefaultCultureResolver();
+            Assert.IsNull(resolver.DefaultCulture, "Must be null until explicitly set.");
+        }
+
+        [Test]
+        public void DefaultCultureIsYieldedForResolveCulture()
+        {
+            DefaultCultureResolver resolver = new DefaultCultureResolver();
+            resolver.DefaultCulture = CultureInfo.InvariantCulture;
+            Assert.AreEqual(CultureInfo.InvariantCulture, resolver.ResolveCulture(),
+                            "Not returning the DefaultCulture (it must if the DefaultCulture " +
+                                "property has been set explicitly).");
+        }
+
+        [Test]
+        public void NullingDefaultCultureYieldsThreadsCultureForResolveCulture()
+        {
+            DefaultCultureResolver resolver = new DefaultCultureResolver();
+            resolver.DefaultCulture = CultureInfo.InvariantCulture;
+            Assert.AreEqual(CultureInfo.InvariantCulture, resolver.ResolveCulture(),
+                            "Not returning the DefaultCulture (it must if the DefaultCulture " +
+                                "property has been set explicitly).");
+            resolver.DefaultCulture = null;
+            Assert.AreEqual(Thread.CurrentThread.CurrentUICulture, resolver.ResolveCulture(),
+                            "Not falling back to the culture of the current thread after " +
+                                "DefaultCulture property is nulled out (it must).");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/HookableContextHandler.cs b/test/Spring/Spring.Core.Tests/HookableContextHandler.cs
new file mode 100644
index 00000000..f8c0add1
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/HookableContextHandler.cs
@@ -0,0 +1,76 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Configuration;
+using System.Xml;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring
+{
+    /// <summary>
+    /// Replace the original context handler with this hookable version for testing ContextRegistry
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: HookableContextHandler.cs,v 1.1 2008/03/21 10:49:38 oakinger Exp $</version>
+    public class HookableContextHandler : ContextHandler, IConfigurationSectionHandler
+    {
+        public delegate object CreateContextFromSectionHandler(object parent, object configContext, XmlNode section);
+
+        private static CreateContextFromSectionHandler s_callback;
+
+        public static CreateContextFromSectionHandler callback
+        {
+            get { return s_callback; }
+        }
+
+        public static CreateContextFromSectionHandler SetSectionHandler(CreateContextFromSectionHandler sectionHandler)
+        {
+            CreateContextFromSectionHandler prevInstance = s_callback;
+            s_callback = sectionHandler;
+            return prevInstance;
+        }
+
+        ///<summary>
+        ///Creates a configuration section handler.
+        ///</summary>
+        ///
+        ///<returns>
+        ///The created section handler object.
+        ///</returns>
+        ///
+        ///<param name="parent">Parent object.</param>
+        ///<param name="section">Section XML node.</param>
+        ///<param name="configContext">Configuration context object.</param><filterpriority>2</filterpriority>
+        new virtual public object Create(object parent, object configContext, XmlNode section)
+        {
+            if (s_callback != null)
+            {
+                return s_callback(parent, configContext, section);
+            }
+
+            return base.Create(parent, configContext, section);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/DerivedTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/DerivedTestObject.cs
new file mode 100644
index 00000000..19b74b5b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/DerivedTestObject.cs
@@ -0,0 +1,58 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects
+{
+    /// <summary>
+    /// Adds some extra interfaces and properties to the base clas
+    /// so that we can test extra odd corner cases and suchlike.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    public class DerivedTestObject : TestObject, IDisposable
+    {
+        public const string NicknamePrefix = "#";
+
+        private bool destroyed;
+        private string nickers;
+
+        public virtual void Dispose()
+        {
+            destroyed = true;
+        }
+
+        public virtual bool WasDestroyed()
+        {
+            return destroyed;
+        }
+
+        public new string Nickname
+        {
+            get { return this.nickers; }
+            set { this.nickers = NicknamePrefix + value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventManipulationUtilsTests.cs b/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventManipulationUtilsTests.cs
new file mode 100644
index 00000000..fab7e53a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventManipulationUtilsTests.cs
@@ -0,0 +1,147 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Events.Support.Tests
+{
+	/// <summary>
+	/// Unit tests for the EventManipulationUtils class.
+	/// </summary>
+	[TestFixture]
+	public sealed class EventManipulationUtilsTests
+	{
+		[Test]
+		public void FoundEventHandlers()
+		{
+			Type pubType = typeof (SimpleEventPublisher);
+			EventInfo[] events = pubType.GetEvents();
+
+			foreach (EventInfo currentEvent in events)
+			{
+				Type eventHandlerType = currentEvent.EventHandlerType;
+				MethodInfo invoke = eventHandlerType.GetMethod("Invoke");
+				Assert.IsNotNull(EventManipulationUtils.GetMethodInfoMatchingSignature(invoke, typeof (SimpleEventSubscriber)));
+			}
+		}
+
+		[Test]
+		public void FoundSomeEventHandlers()
+		{
+			Type pubType = typeof (SimpleEventPublisher);
+			EventInfo[] events = pubType.GetEvents();
+			foreach (EventInfo currentEvent in events)
+			{
+				Type eventHandlerType = currentEvent.EventHandlerType;
+				MethodInfo invoke = eventHandlerType.GetMethod("Invoke");
+				if (currentEvent.Name == "MyFirstEvent" || currentEvent.Name == "MySecondEvent")
+				{
+					Assert.IsNotNull(EventManipulationUtils.GetMethodInfoMatchingSignature(invoke, typeof (SomeEventSubscriber)));
+				}
+				else
+				{
+					Assert.IsNull(EventManipulationUtils.GetMethodInfoMatchingSignature(invoke, typeof (SomeEventSubscriber)));
+				}
+			}
+		}
+
+		[Test]
+		public void FoundNoHandlers()
+		{
+			Type pubType = typeof (SimpleEventPublisher);
+			EventInfo[] events = pubType.GetEvents();
+
+			foreach (EventInfo currentEvent in events)
+			{
+				Type eventHandlerType = currentEvent.EventHandlerType;
+				MethodInfo invoke = eventHandlerType.GetMethod("Invoke");
+				Assert.IsNull(EventManipulationUtils.GetMethodInfoMatchingSignature(invoke, typeof (NoEventSubscriber)));
+			}
+		}
+
+		#region Helper Classes
+
+		internal delegate void Delegate1(object source, string name);
+
+		internal delegate string Delegate2(string name, bool flag);
+
+		internal delegate bool Delegate3(string name, bool flag);
+
+		internal class SimpleEventPublisher
+		{
+			public event Delegate1 MyFirstEvent;
+			public event Delegate2 MySecondEvent;
+			public event Delegate3 MyThirdEvent;
+		}
+
+		internal class SimpleEventSubscriber
+		{
+			public void MyFirstEvent_Handler(object source, string name)
+			{
+			}
+
+			public string MySecondEvent_Handler(string name, bool flag)
+			{
+				return String.Empty;
+			}
+
+			public bool MyThirdEvent_Handler(string name, bool flag)
+			{
+				return false;
+			}
+		}
+
+		internal class NoEventSubscriber
+		{
+			public void MyFirstEvent_Handler(object source, string name, bool flag)
+			{
+			}
+
+			public void MySecondEvent_Handler(string name, bool flag)
+			{
+			}
+
+			public string MyThirdEvent_Handler(string name)
+			{
+				return String.Empty;
+			}
+		}
+
+		internal class SomeEventSubscriber
+		{
+			public void MyFirstEvent_Handler(object source, string name)
+			{
+			}
+
+			public string MySecondEvent_Handler(string name, bool flag)
+			{
+				return String.Empty;
+			}
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventRegistryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventRegistryTests.cs
new file mode 100644
index 00000000..9de96b59
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Events/Support/EventRegistryTests.cs
@@ -0,0 +1,314 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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 NUnit.Framework;
+
+namespace Spring.Objects.Events.Support.Tests
+{
+	[TestFixture]
+	public class EventRegistryTests
+	{
+		#region Helper Classes
+
+		internal delegate void SimpleClientEvent(object sender, MyClientEventArgs args);
+
+		internal delegate string SimpleClientEvent2(MyClientEventArgs args);
+
+		internal class SimpleClient2
+		{
+			public event SimpleClientEvent MyClientEvent;
+
+			public SimpleClient2()
+			{
+			}
+
+			public void ClientMethodThatTriggersEvent()
+			{
+				if (MyClientEvent != null)
+				{
+					MyClientEvent(this, new MyClientEventArgs("Event raised"));
+				}
+			}
+		}
+
+		internal interface ISimpleClient 
+		{
+			event SimpleClientEvent MyClientEvent1;
+			event SimpleClientEvent MyClientEvent2;
+			event SimpleClientEvent2 MyClientEvent3;
+		}
+
+		internal class SimpleClient : ISimpleClient
+		{
+			private string _clientName;
+
+			public event SimpleClientEvent MyClientEvent1;
+			public event SimpleClientEvent MyClientEvent2;
+			public event SimpleClientEvent2 MyClientEvent3;
+
+			public SimpleClient(string clientName)
+			{
+				_clientName = clientName;
+			}
+
+			public void ClientMethodThatTriggersEvent()
+			{
+				if (MyClientEvent1 != null)
+				{
+					MyClientEvent1(this, new MyClientEventArgs("Event raised from " + _clientName));
+				}
+			}
+
+			public void ClientMethodThatTriggersEvent2()
+			{
+				if (MyClientEvent2 != null)
+				{
+					MyClientEvent2(this, new MyClientEventArgs("Event raised from " + _clientName));
+				}
+			}
+
+			public void ClientMethodThatTriggersEvent3()
+			{
+				if (MyClientEvent3 != null)
+				{
+					MyClientEvent3(new MyClientEventArgs("Event raised from " + _clientName));
+				}
+			}
+		}
+
+		internal class MyClientEventArgs : EventArgs
+		{
+			private string _eventMessage;
+
+			public MyClientEventArgs(string eventMessage)
+			{
+				_eventMessage = eventMessage;
+			}
+
+			public string EventMessage
+			{
+				get { return _eventMessage; }
+			}
+		}
+
+		internal class SimpleSubscriber
+		{
+			protected bool _eventRaised = false;
+
+			public SimpleSubscriber()
+			{
+			}
+
+			public bool EventRaised
+			{
+				get { return _eventRaised; }
+			}
+		}
+
+		internal class EventSubscriber : SimpleSubscriber
+		{
+			public EventSubscriber()
+			{
+			}
+
+			public void HandleClientEvents(object sender, MyClientEventArgs args)
+			{
+				_eventRaised = true;
+			}
+		}
+
+		internal class NoEventSubscriber : SimpleSubscriber
+		{
+			public NoEventSubscriber()
+			{
+			}
+
+			public void HandleClientEvents(object sender)
+			{
+				_eventRaised = true;
+			}
+		}
+
+		internal class OtherEventSubscriber : SimpleSubscriber
+		{
+			public OtherEventSubscriber()
+			{
+			}
+
+			public string HandleClientEvents(MyClientEventArgs args)
+			{
+				_eventRaised = true;
+				return String.Empty;
+			}
+		}
+
+		#endregion
+
+		[Test]
+		public void RespectsInheritance()
+		{
+			SimpleClient source = new SimpleClient("foo");
+
+			IEventRegistry registry = new EventRegistry();
+			registry.PublishEvents(source);
+
+			EventSubscriber sub = new EventSubscriber();
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+
+			source.ClientMethodThatTriggersEvent();
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+
+			registry.Subscribe(sub, typeof(ISimpleClient));
+			source.ClientMethodThatTriggersEvent();
+			Assert.IsTrue(sub.EventRaised, "Event Not Raised");
+		}
+
+		[Test]
+		public void PublishAllEvents()
+		{
+			IEventRegistry registry = new EventRegistry();
+			SimpleClient client = new SimpleClient("PublishAllEvents");
+			registry.PublishEvents(client);
+			EventSubscriber sub = new EventSubscriber();
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+
+			client.ClientMethodThatTriggersEvent();
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+
+			registry.Subscribe(sub);
+			client.ClientMethodThatTriggersEvent();
+			Assert.IsTrue(sub.EventRaised, "Event Not Raised");
+		}
+
+		[Test]
+		public void PublishAllEventsMultipleSubscribers()
+		{
+			IEventRegistry registry = new EventRegistry();
+			SimpleClient client = new SimpleClient("PublishAllEvents");
+			registry.PublishEvents(client);
+			EventSubscriber sub = new EventSubscriber();
+			EventSubscriber sub2 = new EventSubscriber();
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+			Assert.IsFalse(sub2.EventRaised, "Event raised");
+
+			client.ClientMethodThatTriggersEvent();
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+			Assert.IsFalse(sub2.EventRaised, "Event raised");
+
+			registry.Subscribe(sub);
+			registry.Subscribe(sub2);
+			client.ClientMethodThatTriggersEvent();
+			Assert.IsTrue(sub.EventRaised, "Event Not Raised");
+			Assert.IsTrue(sub2.EventRaised, "Event Not Raised");
+		}
+
+		[Test]
+		public void PublishAllEventsSubscribeToNamedEvents()
+		{
+			IEventRegistry registry = new EventRegistry();
+			SimpleClient client = new SimpleClient("PublishAllEvents");
+			SimpleClient2 client2 = new SimpleClient2();
+
+			registry.PublishEvents(client);
+			registry.PublishEvents(client2);
+
+			EventSubscriber sub = new EventSubscriber();
+			EventSubscriber sub2 = new EventSubscriber();
+
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+			Assert.IsFalse(sub2.EventRaised, "Event raised");
+
+			client.ClientMethodThatTriggersEvent();
+			client2.ClientMethodThatTriggersEvent();
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+			Assert.IsFalse(sub2.EventRaised, "Event raised");
+
+			registry.Subscribe(sub, typeof (SimpleClient));
+			registry.Subscribe(sub2, typeof (SimpleClient2));
+
+			client.ClientMethodThatTriggersEvent();
+			Assert.IsTrue(sub.EventRaised, "Event Not Raised");
+			Assert.IsFalse(sub2.EventRaised, "Event raised");
+
+			client2.ClientMethodThatTriggersEvent();
+			Assert.IsTrue(sub.EventRaised, "Event Not Raised");
+			Assert.IsTrue(sub2.EventRaised, "Event Not Raised");
+		}
+
+		[Test]
+		public void NoValidEventHandlersOrEventsToSubscribeto()
+		{
+			IEventRegistry registry = new EventRegistry();
+			SimpleClient client = new SimpleClient("PublishAllEvents");
+			NoEventSubscriber sub = new NoEventSubscriber();
+			registry.PublishEvents(client);
+
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+			client.ClientMethodThatTriggersEvent();
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+
+			registry.Subscribe(sub);
+			client.ClientMethodThatTriggersEvent();
+			Assert.IsFalse(sub.EventRaised, "Event Raised");
+		}
+
+		[Test]
+		public void NoPublishers()
+		{
+			IEventRegistry registry = new EventRegistry();
+			SimpleClient client = new SimpleClient("PublishAllEvents");
+			SimpleSubscriber sub = new SimpleSubscriber();
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+
+			client.ClientMethodThatTriggersEvent();
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+
+			registry.Subscribe(sub);
+			client.ClientMethodThatTriggersEvent();
+			Assert.IsFalse(sub.EventRaised, "Event Raised");
+		}
+
+		[Test]
+		public void PublishAllEventsAndSubscribeToSome()
+		{
+			IEventRegistry registry = new EventRegistry();
+			SimpleClient client = new SimpleClient("PublishAllEventsAndSubscribeToSome");
+			registry.PublishEvents(client);
+			EventSubscriber sub = new EventSubscriber();
+			OtherEventSubscriber sub2 = new OtherEventSubscriber();
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+			Assert.IsFalse(sub2.EventRaised, "Event raised");
+
+			client.ClientMethodThatTriggersEvent();
+			Assert.IsFalse(sub.EventRaised, "Event raised");
+
+			client.ClientMethodThatTriggersEvent3();
+			Assert.IsFalse(sub2.EventRaised, "Event raised");
+
+			registry.Subscribe(sub);
+			registry.Subscribe(sub2);
+			client.ClientMethodThatTriggersEvent();
+			client.ClientMethodThatTriggersEvent3();
+			Assert.IsTrue(sub.EventRaised, "Event Not Raised");
+			Assert.IsTrue(sub2.EventRaised, "Event Not Raised");
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/ExpressionTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/ExpressionTestObject.cs
new file mode 100644
index 00000000..dd994577
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/ExpressionTestObject.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections;
+using Spring.Expressions;
+
+namespace Spring.Objects
+{
+    public class ExpressionTestObject
+    {
+        private IExpression expressionOne;
+        private IExpression expressionTwo;
+        private string someString;
+        private DateTime someDate;
+        private IDictionary someDictionary;
+
+        public ExpressionTestObject(string someString)
+        {
+            this.someString = someString;
+        }
+
+        public IExpression ExpressionOne
+        {
+            get { return expressionOne; }
+            set { expressionOne = value; }
+        }
+
+        public IExpression ExpressionTwo
+        {
+            get { return expressionTwo; }
+            set { expressionTwo = value; }
+        }
+
+        public string SomeString
+        {
+            get { return someString; }
+        }
+
+        public DateTime SomeDate
+        {
+            get { return someDate; }
+            set { someDate = value; }
+        }
+
+        public IDictionary SomeDictionary
+        {
+            get { return someDictionary; }
+            set { someDictionary = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractListableObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractListableObjectFactoryTests.cs
new file mode 100644
index 00000000..8e084fff
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractListableObjectFactoryTests.cs
@@ -0,0 +1,117 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory {
+
+	/// <summary>
+	/// Unit tests for the AbstractListableObjectFactory class.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Rick Evans (.NET)</author>
+    public abstract class AbstractListableObjectFactoryTests :
+        AbstractObjectFactoryTests {
+
+        /// <summary>
+        /// Subclasses must initialize this (via the derived ObjectFactory property).
+        /// </summary>
+        protected internal virtual IListableObjectFactory ListableObjectFactory
+        {
+            get
+            {
+                if (!(ObjectFactory is IListableObjectFactory))
+                {
+                    throw new SystemException ("IListableObjectFactory required...");
+                }
+                return (IListableObjectFactory) ObjectFactory;
+            }			
+        }
+
+        /// <summary>
+        /// Subclasses can override this.
+        /// </summary>
+        [Test]
+        public virtual void Count ()
+        {
+            AssertCount (13);
+        }
+		
+        protected internal void AssertCount (int count)
+        {
+            string [] defnames = ListableObjectFactory.GetObjectDefinitionNames ();
+            Assert.IsTrue (
+                defnames.Length == count,
+                string.Format ("We should have {0} objects, not {1}.", count, defnames.Length));
+        }
+		
+        [Test]
+        public virtual void ObjectCount ()
+        {
+            AssertTestObjectCount (9);
+        }
+		
+        public virtual void AssertTestObjectCount (int count)
+        {
+            string [] defnames =
+                ListableObjectFactory.GetObjectNamesForType (typeof (TestObject));
+            Assert.IsTrue (
+                defnames.Length == count,
+                string.Format ("We should have {0} objects for class {1}, not {2}.", count, typeof (TestObject).FullName, defnames.Length));
+        }
+		
+        [Test]
+        public virtual void GetDefinitionsForNoSuchClass ()
+        {
+            string[] defnames =
+                ListableObjectFactory.GetObjectNamesForType (typeof (string));
+            Assert.IsTrue (defnames.Length == 0, "No string definitions");
+        }
+		
+        /// <summary>
+        /// Check that count refers to factory class, not
+        /// object class (we don't know what type factories may return,
+        /// and it may even change over time).
+        /// </summary>
+        [Test]
+        public virtual void GetCountForFactoryClass ()
+        {
+            int count =
+                ListableObjectFactory.GetObjectNamesForType (
+                    typeof (IFactoryObject)).Length;
+            Assert.IsTrue (
+                count == 2,
+                string.Format ("Should have 2 factories, not {0}.", count));
+        }
+		
+        [Test]
+        public virtual void ContainsObjectDefinition ()
+        {
+            Assert.IsTrue (ListableObjectFactory.ContainsObjectDefinition ("rod"));
+            Assert.IsTrue (ListableObjectFactory.ContainsObjectDefinition ("roderick"));
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractObjectFactoryTests.cs
new file mode 100644
index 00000000..df71117a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/AbstractObjectFactoryTests.cs
@@ -0,0 +1,425 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Subclasses must override SetUp () to initialize the object factory
+	/// and any other variables they need.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	public abstract class AbstractObjectFactoryTests
+	{
+		#region Properties
+
+		protected internal abstract IObjectFactory ObjectFactory { get; }
+
+		#endregion
+
+		#region Tests
+
+		/// <summary>
+		/// Roderick objects inherits from rod, overriding name only.
+		/// </summary>
+		[Test]
+		public void Inheritance()
+		{
+			Assert.IsTrue(ObjectFactory.ContainsObject("rod"));
+			Assert.IsTrue(ObjectFactory.ContainsObject("roderick"));
+			TestObject rod = (TestObject) ObjectFactory["rod"];
+			TestObject roderick = (TestObject) ObjectFactory["roderick"];
+			Assert.IsTrue(rod != roderick, "not == ");
+			Assert.IsTrue(rod.Name.Equals("Rod"), "rod.name is Rod");
+			Assert.IsTrue(rod.Age == 31, "rod.age is 31");
+			Assert.IsTrue(roderick.Name.Equals("Roderick"), "roderick.name is Roderick");
+			Assert.IsTrue(roderick.Age == rod.Age, "roderick.age was inherited");
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public virtual void GetObjectWithNullName()
+		{
+			ObjectFactory.GetObject(null);
+		}
+
+		/// <summary>
+		/// Test that InitializingObject objects receive the AfterPropertiesSet () callback.
+		/// </summary>
+		[Test]
+		public void InitializingObjectCallback()
+		{
+			MustBeInitialized mbi =
+				(MustBeInitialized) ObjectFactory["mustBeInitialized"];
+			// The dummy business method will throw an exception if the
+			// AfterPropertiesSet () callback wasn't invoked
+			mbi.BusinessMethod();
+		}
+
+		/// <summary>
+		/// Test that InitializingObject/ObjectFactoryAware/DisposableObject objects
+		/// receive the AfterPropertiesSet () callback before ObjectFactoryAware
+		/// callbacks.
+		/// </summary>
+		[Test]
+		public void LifecycleCallbacks()
+		{
+			LifecycleObject lb = (LifecycleObject) ObjectFactory.GetObject("lifecycle");
+			Assert.AreEqual("lifecycle", lb.ObjectName);
+			// The dummy business method will throw an exception if the
+			// necessary callbacks weren't invoked in the right order
+			lb.BusinessMethod();
+			Assert.IsFalse(lb.Destroyed, "Was destroyed");
+		}
+
+		[Test]
+		public void FindsValidInstance()
+		{
+			object o = ObjectFactory.GetObject("rod");
+			Assert.IsTrue(o is TestObject, "Rod object is a TestObject");
+			TestObject rod = (TestObject) o;
+			Assert.IsTrue(rod.Name.Equals("Rod"), "rod.name is Rod");
+			Assert.IsTrue(rod.Age == 31, "rod.age is 31");
+		}
+
+		[Test]
+		public void GetInstanceByMatchingClass()
+		{
+			object o = ObjectFactory.GetObject("rod", typeof (TestObject));
+			Assert.IsTrue(o is TestObject, "Rod object is a TestObject");
+		}
+
+		[Test]
+		public void GetInstanceByNonmatchingClass()
+		{
+			try
+			{
+				ObjectFactory.GetObject("rod", typeof (IObjectFactory));
+				Assert.Fail("Rod object is not of type IObjectFactory; GetObjectInstance(rod, typeof (IObjectFactory)) should throw ObjectNotOfRequiredTypeException");
+			}
+			catch (ObjectNotOfRequiredTypeException ex)
+			{
+				Assert.IsTrue(ex.ObjectName.Equals("rod"), "Exception has correct object name");
+				Assert.IsTrue(ex.RequiredType.Equals(typeof (IObjectFactory)), "Exception requiredType must be ObjectFactory.class");
+				Assert.IsTrue(typeof (TestObject).IsAssignableFrom(ex.ActualType), "Exception actualType as TestObject.class");
+				Assert.IsTrue(ex.ActualInstance == ObjectFactory.GetObject("rod"), "Actual instance is correct");
+			}
+		}
+
+		[Test]
+		public virtual void GetSharedInstanceByMatchingClass()
+		{
+			object o = ObjectFactory.GetObject("rod", typeof (TestObject));
+			Assert.IsTrue(o is TestObject, "Rod object is a TestObject");
+		}
+
+		[Test]
+		public virtual void GetSharedInstanceByMatchingClassNoCatch()
+		{
+			object o = ObjectFactory.GetObject("rod", typeof (TestObject));
+			Assert.IsTrue(o is TestObject, "Rod object is a TestObject");
+		}
+
+		[Test]
+		public void GetSharedInstanceByNonmatchingClass()
+		{
+			try
+			{
+				ObjectFactory.GetObject("rod", typeof (IObjectFactory));
+				Assert.Fail("Rod object is not of type ObjectFactory; getObjectInstance(rod, ObjectFactory.class) should throw ObjectNotOfRequiredTypeException");
+			}
+			catch (ObjectNotOfRequiredTypeException ex)
+			{
+				// So far, so good
+				Assert.IsTrue(ex.ObjectName.Equals("rod"), "Exception has correct object name");
+				Assert.IsTrue(ex.RequiredType.Equals(typeof (IObjectFactory)), "Exception requiredType must be IObjectFactory class");
+				Assert.IsTrue(typeof (TestObject).IsAssignableFrom(ex.ActualType), "Exception actualType as TestObject class");
+			}
+			catch (Exception ex)
+			{
+				Assert.Fail("Shouldn't throw exception on getting valid instance with matching class : " + ex.Message);
+			}
+		}
+
+		[Test]
+		public virtual void SharedInstancesAreEqual()
+		{
+			try
+			{
+				object o = ObjectFactory.GetObject("rod");
+				Assert.IsTrue(o is TestObject, "Rod object1 is a TestObject");
+				object o1 = ObjectFactory.GetObject("rod");
+				Assert.IsTrue(o1 is TestObject, "Rod object2 is a TestObject");
+				Assert.IsTrue(o == o1, "Object equals applies");
+			}
+			catch
+			{
+				Assert.Fail("Shouldn't throw exception on getting valid instance");
+			}
+		}
+
+		[Test]
+		[ExpectedException(typeof (NoSuchObjectDefinitionException))]
+		public void NotThere()
+		{
+			Assert.IsFalse(ObjectFactory.ContainsObject("Mr Squiggle"));
+			ObjectFactory.GetObject("Mr Squiggle");
+		}
+
+		[Test]
+		public void ValidEmpty()
+		{
+			try
+			{
+				object o = ObjectFactory.GetObject("validEmpty");
+				Assert.IsTrue(o is TestObject, "validEmpty object is a TestObject");
+				TestObject ve = (TestObject) o;
+				Assert.IsTrue(ve.Name == null && ve.Age == 0 && ve.Spouse == null, "Valid empty has defaults");
+			}
+			catch
+			{
+				Assert.Fail("Shouldn't throw exception on valid empty");
+			}
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void RegisterNullCustomTypeConverter()
+		{
+			AbstractObjectFactory fac = ObjectFactory as AbstractObjectFactory;
+			if(fac != null) 
+			{
+				fac.RegisterCustomConverter(null, null);
+			}
+		}
+
+		[Test]
+		public virtual void TypeMismatch()
+		{
+			try
+			{
+				ObjectFactory.GetObject("typeMismatch");
+				Assert.Fail("Shouldn't succeed with type mismatch");
+			}
+			catch (ObjectCreationException wex)
+			{
+				Assert.IsTrue(wex.InnerException is PropertyAccessExceptionsException);
+				PropertyAccessExceptionsException ex = (PropertyAccessExceptionsException) wex.InnerException;
+				// Furthers
+				Assert.IsTrue(ex.ExceptionCount == 1, "Has one error");
+				Assert.IsTrue(ex.GetPropertyAccessException("age") != null, "Error is for field age");
+
+				TestObject tb = (TestObject) ex.ObjectWrapper.WrappedInstance;
+				Assert.IsTrue(tb.Age == 0, "Age still has default");
+				Assert.IsTrue(ex.GetPropertyAccessException("age").PropertyChangeArgs.NewValue.Equals("34x"), "We have rejected age in exception");
+				Assert.IsTrue(tb.Name.Equals("typeMismatch"), "valid name stuck");
+				Assert.IsTrue(tb.Spouse.Name.Equals("Rod"), "valid spouse stuck");
+			}
+		}
+
+		[Test]
+		public virtual void GrandParentDefinitionFoundInObjectFactory()
+		{
+			TestObject dad = (TestObject) ObjectFactory.GetObject("father");
+			Assert.IsTrue(dad.Name.Equals("Albert"), "Dad has correct name");
+		}
+
+        [Test]
+        public virtual void GrandParentDefinitionFoundInObjectFactoryWithType()
+        {
+            TestObject dad = (TestObject)ObjectFactory.GetObject("typedfather", typeof(TestObject));
+            Assert.AreEqual(null, dad.Name, "Dad has not correct name");
+        }
+
+        [Test]
+        public virtual void GrandParentDefinitionFoundInObjectFactoryWithArguments()
+        {
+            TestObject dad = (TestObject)ObjectFactory.GetObject("namedfather", new object[] { "Hugo", 65 } );
+            Assert.AreEqual("Hugo", dad.Name, "Dad has not correct name");
+            Assert.AreEqual(65, dad.Age, "Dad has not correct age");
+        }
+
+        [Test]
+        public virtual void GrandParentDefinitionFoundInObjectFactoryWithTypeAndArguments()
+        {
+            TestObject dad = (TestObject)ObjectFactory.GetObject("typedfather", typeof(TestObject), new object[] { "Chris", 66 });
+            Assert.AreEqual("Chris", dad.Name, "Dad has not correct name");
+            Assert.AreEqual(66, dad.Age, "Dad has not correct age");
+        }
+
+        [Test(Description="Extra check that the type is really passed on to the parent factory")]
+        public virtual void GrandParentDefinitionFoundInObjectFactoryWithTypeAndArgumentsWithWrongType()
+        {
+            try
+            {
+                TestObject dad = (TestObject)ObjectFactory.GetObject("typedfather", typeof(string), new object[] { "Chris", 66 });
+                Assert.Fail("should throw ObjectNotOfRequiredTypeException");
+            }
+            catch (ObjectNotOfRequiredTypeException)
+            {                
+            }
+        }
+
+		[Test]
+		public virtual void FactorySingleton()
+		{
+			Assert.IsTrue(ObjectFactory.IsSingleton("&singletonFactory"));
+			Assert.IsTrue(ObjectFactory.IsSingleton("singletonFactory"));
+			TestObject tb = (TestObject) ObjectFactory.GetObject("singletonFactory");
+			Assert.IsTrue(tb.Name.Equals(DummyFactory.SINGLETON_NAME), "Singleton from factory has correct name, not " + tb.Name);
+			DummyFactory factory = (DummyFactory) ObjectFactory.GetObject("&singletonFactory");
+			TestObject tb2 = (TestObject) ObjectFactory.GetObject("singletonFactory");
+			Assert.IsTrue(tb == tb2, "Singleton references ==");
+			Assert.IsTrue(factory.ObjectFactory != null, "FactoryObject is ObjectFactoryAware");
+		}
+
+		[Test]
+		public virtual void FactoryPrototype()
+		{
+			Assert.IsTrue(ObjectFactory.IsSingleton("&prototypeFactory"));
+			Assert.IsFalse(ObjectFactory.IsSingleton("prototypeFactory"));
+			TestObject tb = (TestObject) ObjectFactory.GetObject("prototypeFactory");
+			Assert.IsTrue(!tb.Name.Equals(DummyFactory.SINGLETON_NAME));
+			TestObject tb2 = (TestObject) ObjectFactory.GetObject("prototypeFactory");
+			Assert.IsTrue(tb != tb2, "Prototype references !=");
+		}
+
+		/// <summary>
+		/// Check that we can get the factory object itself.
+		/// This is only possible if we're dealing with a factory
+		/// </summary>
+		[Test]
+		public virtual void GetFactoryItself()
+		{
+			DummyFactory factory = (DummyFactory) ObjectFactory.GetObject("&singletonFactory");
+			Assert.IsTrue(factory != null);
+		}
+
+		/// <summary>Check that AfterPropertiesSet gets called on factory.</summary>
+		[Test]
+		public virtual void FactoryIsInitialized()
+		{
+			TestObject tb = (TestObject) ObjectFactory.GetObject("singletonFactory");
+			DummyFactory factory = (DummyFactory) ObjectFactory.GetObject("&singletonFactory");
+			Assert.IsTrue(factory.WasInitialized, "Factory was not initialized even though it implemented IInitializingObject");
+		}
+
+		/// <summary>
+		/// It should be illegal to dereference a normal object as a factory.
+		/// </summary>
+		[Test]
+		[ExpectedException(typeof (ObjectIsNotAFactoryException))]
+		public virtual void RejectsFactoryGetOnNormalObject()
+		{
+			ObjectFactory.GetObject("&rod");
+		}
+
+		[Test]
+		[ExpectedException(typeof (ObjectDefinitionStoreException))]
+		public virtual void Aliasing()
+		{
+			if (!(ObjectFactory is AbstractObjectFactory))
+			{
+				return;
+			}
+
+			string alias = "rods alias";
+			try
+			{
+				ObjectFactory.GetObject(alias);
+				Assert.Fail("Shouldn't permit factory get on normal object");
+			}
+			catch (NoSuchObjectDefinitionException ex)
+			{
+				Assert.IsTrue(alias.Equals(ex.ObjectName));
+			}
+
+			// Create alias
+			((AbstractObjectFactory) ObjectFactory).RegisterAlias("rod", alias);
+			object rod = ObjectFactory.GetObject("rod");
+			object aliasRod = ObjectFactory.GetObject(alias);
+			Assert.IsTrue(rod == aliasRod);
+			((AbstractObjectFactory) ObjectFactory).RegisterAlias("father", alias);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void RegisterSingletonWithEmptyName()
+		{
+			((AbstractObjectFactory) ObjectFactory)
+				.RegisterSingleton(Environment.NewLine, DBNull.Value);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void RegisterSingletonWithNullName()
+		{
+			((AbstractObjectFactory) ObjectFactory)
+				.RegisterSingleton(null, DBNull.Value);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void ContainsSingletonWithEmptyName()
+		{
+			((AbstractObjectFactory) ObjectFactory)
+				.ContainsSingleton(Environment.NewLine);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void ContainsSingletonWithNullName()
+		{
+			((AbstractObjectFactory) ObjectFactory)
+				.ContainsSingleton(null);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void AliasWithEmptyName()
+		{
+			((AbstractObjectFactory) ObjectFactory).RegisterAlias(Environment.NewLine, "the whipping boy");
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void AliasWithEmptyAlias()
+		{
+			((AbstractObjectFactory) ObjectFactory).RegisterAlias("rick", Environment.NewLine);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ObjectDefinitionStoreException))]
+		public void ChokesIfNotGivenSupportedIObjectDefinitionImplementation() 
+		{
+			ObjectFactory.GetObject("unsupportedDefinition");
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/MyRequiredAttribute.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/MyRequiredAttribute.cs
new file mode 100644
index 00000000..9a5bfcc0
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/MyRequiredAttribute.cs
@@ -0,0 +1,35 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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;
+
+namespace Spring.Objects.Factory.Attributes
+{
+    /// <summary>
+    /// Custom attribute to indicate required setter property
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: MyRequiredAttribute.cs,v 1.1 2008/04/02 18:02:31 markpollack Exp $</version>
+    [AttributeUsage(AttributeTargets.Property)]
+    public class MyRequiredAttribute : Attribute
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessorTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessorTests.cs
new file mode 100644
index 00000000..2cb91ec0
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessorTests.cs
@@ -0,0 +1,129 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Attributes
+{
+    /// <summary>
+    /// This class contains tests for RequiredAttributeObjectPostProcessor.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: RequiredAttributeObjectPostProcessorTests.cs,v 1.1 2008/04/02 18:02:31 markpollack Exp $</version>
+    [TestFixture]
+    public class RequiredAttributeObjectPostProcessorTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+        }
+
+        [Test]
+        public void WithRequiredPropertyOmitted()
+        {
+            try
+            {
+                XmlApplicationContext ctx =
+                    new XmlApplicationContext(false,
+                                              "assembly://Spring.Core.Tests/Spring.Objects.Factory.Attributes/RequiredWithOneRequiredPropertyOmitted.xml");
+                Assert.Fail("Should have thrown ObjectCreationException");
+            }
+            catch (ObjectCreationException ex)
+            {
+                string message = ex.InnerException.Message;
+                Assert.IsTrue(message.IndexOf("Property") > -1);
+                Assert.IsTrue(message.IndexOf("Age") > -1);
+                Assert.IsTrue(message.IndexOf("testObject") > -1);
+            }
+        }
+
+        [Test]
+        public void WithThreeRequiredPropertiesOmitted()
+        {
+            try
+            {
+                XmlApplicationContext ctx =
+                       new XmlApplicationContext(false,
+                                                 "assembly://Spring.Core.Tests/Spring.Objects.Factory.Attributes/RequiredWithThreeRequiredPropertiesOmitted.xml");
+                Assert.Fail("Should have thrown ObjectCreationException");
+            }
+            catch (ObjectCreationException ex)
+            {
+                string message = ex.InnerException.Message;
+                Assert.IsTrue(message.IndexOf("Properties") > -1);
+                Assert.IsTrue(message.IndexOf("Age") > -1);
+                Assert.IsTrue(message.IndexOf("FavoriteColor") > -1);
+                Assert.IsTrue(message.IndexOf("JobTitle") > -1);
+                Assert.IsTrue(message.IndexOf("testObject") > -1);
+            }
+        }
+
+        [Test]
+        public void WithOnlyRequiredPropertiesSpecified()
+        {
+            XmlApplicationContext ctx =
+                      new XmlApplicationContext(false,
+                                                "assembly://Spring.Core.Tests/Spring.Objects.Factory.Attributes/RequiredWithAllRequiredPropertiesProvided.xml");
+            RequiredTestObject to = (RequiredTestObject) ctx.GetObject("testObject");
+            Assert.AreEqual(24, to.Age);
+            Assert.AreEqual("Blue", to.GetFavoriteColor());               
+        }
+
+        [Test]
+        public void Reflection()
+        {
+            foreach (PropertyInfo pi in typeof(RequiredTestObject).GetProperties(BindingFlags.Instance | BindingFlags.Public))
+            {
+                if (pi.Name.Equals("Age"))
+                {
+                    object[] attribs = pi.GetCustomAttributes(typeof (RequiredAttribute), true);
+                    Assert.Greater(attribs.Length, 0);
+                }
+            }
+
+        }
+
+        [Test]
+        public void WithCustomAttribute()
+        {
+            try
+            {
+                XmlApplicationContext ctx =
+                       new XmlApplicationContext(false,
+                                                 "assembly://Spring.Core.Tests/Spring.Objects.Factory.Attributes/RequiredWithCustomAttribute.xml");
+                Assert.Fail("Should have thrown ObjectCreationException");
+            }
+            catch (ObjectCreationException ex)
+            {
+                string message = ex.InnerException.Message;
+                Assert.IsTrue(message.IndexOf("Property") > -1);
+                Assert.IsTrue(message.IndexOf("Name") > -1);
+                Assert.IsTrue(message.IndexOf("testObject") > -1);
+            }   
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredTestObject.cs
new file mode 100644
index 00000000..5fe6e0be
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredTestObject.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+
+namespace Spring.Objects.Factory.Attributes
+{
+    /// <summary>
+    /// Test object for testing 'required' attribute functionality.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: RequiredTestObject.cs,v 1.1 2008/04/02 18:02:31 markpollack Exp $</version>
+    public class RequiredTestObject : IObjectNameAware, IObjectFactoryAware
+    {
+        private string name;
+
+        private int age;
+
+        private string favoriteColor; 
+
+        private string jobTitle;
+
+        [Required]
+        public int Age
+        {
+            get { return age; }
+            set { age = value; }
+        }
+
+        [MyRequired]
+        public string Name
+        {
+            get { return name; }
+            set { name = value; }
+        }
+
+
+        [Required]
+        public string FavoriteColor
+        {
+            set { favoriteColor = value; }
+        }
+
+        public string GetFavoriteColor()
+        {
+            return favoriteColor;
+        }
+
+        [Required]
+        public string JobTitle
+        {
+            get { return jobTitle; }
+            set { jobTitle = value; }
+        }
+
+        [Required]
+        public string ObjectName
+        {
+            set { }
+        }
+
+        [Required]
+        public IObjectFactory ObjectFactory
+        {
+            set {  }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredWithAllRequiredPropertiesProvided.xml b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredWithAllRequiredPropertiesProvided.xml
new file mode 100644
index 00000000..78138a6e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredWithAllRequiredPropertiesProvided.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects  xmlns="http://www.springframework.net">
+
+  <object type="Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor, Spring.Core"/>
+
+  <object id="testObject" type="Spring.Objects.Factory.Attributes.RequiredTestObject, Spring.Core.Tests">
+    <property name="Age" value="24"/>
+    <property name="FavoriteColor" value="Blue"/>
+    <property name="JobTitle" value="Grand Poobah"/>
+  </object> 
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredWithCustomAttribute.xml b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredWithCustomAttribute.xml
new file mode 100644
index 00000000..d1f311a5
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredWithCustomAttribute.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects  xmlns="http://www.springframework.net">
+
+  <object type="Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor, Spring.Core">
+    <property name="RequiredAttributeType" value="Spring.Objects.Factory.Attributes.MyRequiredAttribute, Spring.Core.Tests"/>
+  </object>
+
+  <object id="testObject" type="Spring.Objects.Factory.Attributes.RequiredTestObject, Spring.Core.Tests"/>
+
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredWithOneRequiredPropertyOmitted.xml b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredWithOneRequiredPropertyOmitted.xml
new file mode 100644
index 00000000..b7206973
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredWithOneRequiredPropertyOmitted.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects  xmlns="http://www.springframework.net">
+
+  <object type="Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor, Spring.Core"/>
+
+  <object id="testObject" type="Spring.Objects.Factory.Attributes.RequiredTestObject, Spring.Core.Tests">
+    <property name="Name" value="Rob Harrop"/>
+    <property name="FavoriteColor" value="Blue"/>
+    <property name="JobTitle" value="Grand Poobah"/>
+  </object> 
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredWithThreeRequiredPropertiesOmitted.xml b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredWithThreeRequiredPropertiesOmitted.xml
new file mode 100644
index 00000000..3ae41a51
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes/RequiredWithThreeRequiredPropertiesOmitted.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects  xmlns="http://www.springframework.net">
+
+  <object type="Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor, Spring.Core"/>
+
+  <object id="testObject" type="Spring.Objects.Factory.Attributes.RequiredTestObject, Spring.Core.Tests">
+    <property name="Name" value="Rob Harrop"/>
+  </object> 
+
+</objects>
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/AbstractFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/AbstractFactoryObjectTests.cs
new file mode 100644
index 00000000..55050f32
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/AbstractFactoryObjectTests.cs
@@ -0,0 +1,86 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the basic functionality of the AbstractFactoryObject class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: AbstractFactoryObjectTests.cs,v 1.3 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class AbstractFactoryObjectTests
+    {
+        [Test]
+        public void DisposeCallbackIsNotInvokedOnDisposeIfInPrototypeMode()
+        {
+        	IDynamicMock mock = new DynamicMock(typeof(IDisposable));
+            DummyFactoryObject factory = new DummyFactoryObject(mock.Object);
+            factory.IsSingleton = false;
+            factory.GetObject();
+            factory.Dispose();
+			// in prototype mode, so the Dispose() method of the object must not be called...
+			mock.Verify();
+        }
+
+        [Test]
+        public void DisposeCallbackIsInvokedOnDispose()
+        {
+			IDynamicMock mock = new DynamicMock(typeof(IDisposable));
+			mock.Expect("Dispose");
+			DummyFactoryObject factory = new DummyFactoryObject(mock.Object);
+            factory.AfterPropertiesSet();
+            factory.Dispose();
+			mock.Verify();
+        }
+
+        private sealed class DummyFactoryObject : AbstractFactoryObject 
+        {
+            public object theObject;
+
+            public DummyFactoryObject() : this (new object())
+            {
+            }
+
+            public DummyFactoryObject(object theObject)
+            {
+                this.theObject = theObject;
+            }
+
+            public override Type ObjectType
+            {
+                get { return typeof(object); }
+            }
+
+            protected override object CreateInstance()
+            {
+                return theObject;
+            }
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CommandLineArgsVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CommandLineArgsVariableSourceTests.cs
new file mode 100644
index 00000000..539ac1e8
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CommandLineArgsVariableSourceTests.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+    /// Unit tests for the CommandLineArgsVariableSource class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: CommandLineArgsVariableSourceTests.cs,v 1.1 2007/03/10 01:44:40 aseovic Exp $</version>
+    [TestFixture]
+    public sealed class CommandLineArgsVariableSourceTests
+    {
+        [Test]
+        public void TestVariablesResolution()
+        {
+            CommandLineArgsVariableSource vs = new CommandLineArgsVariableSource(
+                new string[] {"program.exe", "file.txt", "/name:Aleks Seovic", "/framework:Spring.NET"});
+
+            // existing vars
+            Assert.AreEqual("Spring.NET", vs.ResolveVariable("FRAMEWORK"));
+            Assert.AreEqual("Spring.NET", vs.ResolveVariable("framework"));
+            Assert.AreEqual("Aleks Seovic", vs.ResolveVariable("name"));
+            Assert.AreEqual("Aleks Seovic", vs.ResolveVariable("NAME"));
+
+            // non-existant variable
+            Assert.IsNull(vs.ResolveVariable("dummy"));
+        }
+
+        [Test]
+        public void TestVariablesResolutionWithCustomPrefixAndSeparator()
+        {
+            CommandLineArgsVariableSource vs = new CommandLineArgsVariableSource(
+                new string[] { "program.exe", "file.txt", "--Name=Aleks Seovic", "--Framework=Spring.NET" });
+            vs.ArgumentPrefix = "--";
+            vs.ValueSeparator = "=";
+
+            // existing vars
+            Assert.AreEqual("Spring.NET", vs.ResolveVariable("FRAMEWORK"));
+            Assert.AreEqual("Spring.NET", vs.ResolveVariable("framework"));
+            Assert.AreEqual("Aleks Seovic", vs.ResolveVariable("name"));
+            Assert.AreEqual("Aleks Seovic", vs.ResolveVariable("NAME"));
+
+            // non-existant variable
+            Assert.IsNull(vs.ResolveVariable("dummy"));
+        }
+
+        [Test]
+        [Explicit]
+        public void TestLiveVariablesResolutionWithTestDriven()
+        {
+            CommandLineArgsVariableSource vs = new CommandLineArgsVariableSource();
+            Assert.IsTrue(((string) vs.ResolveVariable("AssemblyName")).StartsWith("TestDriven.TestRunner.Server"));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigSectionVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigSectionVariableSourceTests.cs
new file mode 100644
index 00000000..3ccbb3b8
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigSectionVariableSourceTests.cs
@@ -0,0 +1,70 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Core.IO;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+    /// Unit tests for the ConfigSectionVariableSource class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ConfigSectionVariableSourceTests.cs,v 1.3 2007/08/08 17:49:04 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class ConfigSectionVariableSourceTests
+    {
+        [Test]
+        public void TestVariablesResolutionWithSingleSection()
+        {
+            ConfigSectionVariableSource vs = new ConfigSectionVariableSource();
+            vs.SectionName = "DaoConfiguration";
+
+            // existing vars
+            Assert.AreEqual("1000", vs.ResolveVariable("maxResults"));
+            Assert.AreEqual("1000", vs.ResolveVariable("MAXResults"));
+
+            // non-existant variable
+            Assert.IsNull(vs.ResolveVariable("dummy"));
+        }
+
+        [Test]
+        public void TestVariablesResolutionWithTwoSections()
+        {
+            ConfigSectionVariableSource vs = new ConfigSectionVariableSource();
+            vs.SectionNames = new string[] { "DaoConfiguration", "DatabaseConfiguration" };
+
+            // existing vars
+            Assert.AreEqual("1000", vs.ResolveVariable("maxResults"));
+            Assert.AreEqual("1000", vs.ResolveVariable("MAXResults"));
+            Assert.AreEqual(@"Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=;",
+                            vs.ResolveVariable("connection.string"));
+            Assert.AreEqual(@"Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=;",
+                            vs.ResolveVariable("Connection.String"));
+
+            // non-existant variable
+            Assert.IsNull(vs.ResolveVariable("dummy"));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs
new file mode 100644
index 00000000..13246d8a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs
@@ -0,0 +1,164 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections.Specialized;
+using System.Configuration;
+using System.IO;
+using System.Text;
+
+using NUnit.Framework;
+
+using Spring.Core.IO;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Unit tests for the ConfigurationReader class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ConfigurationReaderTests.cs,v 1.7 2007/08/08 17:49:04 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class ConfigurationReaderTests
+    {
+        private const string SunnyDayXml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<configuration>
+    <configSections>
+        <section name='foo' type='System.Configuration.NameValueSectionHandler, System'/>
+    </configSections>
+	<foo>
+		<add key='rilo' value='kiley'/>
+		<add key='jenny' value='lewis'/>
+	</foo>
+</configuration>";
+
+        [Test]
+        public void ReadSunnyDay()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_ReadSunnyDay)).Run();
+        }
+
+        private void _ReadSunnyDay(out Stream stream)
+        {
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(SunnyDayXml));
+            NameValueCollection props
+                = ConfigurationReader.Read(new InputStreamResource(stream, ""), "foo");
+            Assert.IsNotNull(props, "Failed to read in any properties at all (props is null).");
+            Assert.AreEqual(2, props.Count, "Wrong number of properties read in.");
+            Assert.AreEqual("kiley", props["rilo"], "Wrong value for second property");
+            Assert.AreEqual("lewis", props["jenny"], "Wrong value for second property");
+        }
+
+        [Test]
+        public void ReadWithOverrideOfPreviouslyExistingValues()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_ReadWithOverrideOfPreviouslyExistingValues)).Run();
+        }
+
+        private void _ReadWithOverrideOfPreviouslyExistingValues(out Stream stream)
+        {
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(SunnyDayXml));
+            NameValueCollection defaults = new NameValueCollection();
+            defaults.Add("jenny", "agutter");
+            NameValueCollection props
+                = ConfigurationReader.Read(new InputStreamResource(stream, ""), "foo", defaults);
+            Assert.IsTrue(ReferenceEquals(defaults, props), "Must have got same collection as was passed in.");
+            Assert.AreEqual("lewis", props["jenny"], "Wrong value for overridden property (was not overridden");
+        }
+
+        [Test]
+        public void ReadWithOverrideOfPreviouslyExistingValuesButWithOverrideSwitchedOff()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_ReadWithOverrideOfPreviouslyExistingValuesButWithOverrideSwitchedOff)).Run();
+        }
+
+        private void _ReadWithOverrideOfPreviouslyExistingValuesButWithOverrideSwitchedOff(out Stream stream)
+        {
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(SunnyDayXml));
+            NameValueCollection defaults = new NameValueCollection();
+            defaults.Add("jenny", "agutter");
+            NameValueCollection props
+                = ConfigurationReader.Read(new InputStreamResource(stream, ""), "foo", defaults, false);
+            Assert.IsTrue(ReferenceEquals(defaults, props), "Must have got same collection as was passed in.");
+            Assert.AreEqual("agutter,lewis", props["jenny"], "Wrong value for overridden property (was not overridden");
+        }
+
+        [Test]
+        public void ReadWithNullExistingValuesPassedIn()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_ReadWithNullExistingValuesPassedIn)).Run();
+        }
+
+        private void _ReadWithNullExistingValuesPassedIn(out Stream stream)
+        {
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(SunnyDayXml));
+            NameValueCollection props
+                = ConfigurationReader.Read(new InputStreamResource(stream, ""), "foo", null);
+            Assert.IsNotNull(props, "Failed to read in any properties at all (props is null).");
+            Assert.AreEqual(2, props.Count, "Wrong number of properties read in.");
+            Assert.AreEqual("kiley", props["rilo"], "Wrong value for second property");
+            Assert.AreEqual("lewis", props["jenny"], "Wrong value for second property");
+        }
+
+        [Test]
+        public void ReadWithNoConfigSectionSectionDefaultsToNameValueSectionHandler()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_ReadWithNoConfigSectionSectionDefaultsToNameValueSectionHandler)).Run();
+        }
+
+        private void _ReadWithNoConfigSectionSectionDefaultsToNameValueSectionHandler(out Stream stream)
+        {
+            const string NoConfigSectionXml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<configuration>
+	<foo>
+		<add key='rilo' value='kiley'/>
+		<add key='jenny' value='lewis'/>
+	</foo>
+</configuration>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(NoConfigSectionXml));
+            NameValueCollection props
+                = ConfigurationReader.Read(new InputStreamResource(stream, ""), "foo", null);
+            Assert.IsNotNull(props, "Failed to read in any properties at all (props is null).");
+            Assert.AreEqual(2, props.Count, "Wrong number of properties read in.");
+            Assert.AreEqual("kiley", props["rilo"], "Wrong value for second property");
+            Assert.AreEqual("lewis", props["jenny"], "Wrong value for second property");
+        }
+
+        [Test]
+#if !NET_2_0
+        [ExpectedException(typeof(ConfigurationException), "Cannot read properties; config section 'ELNOMBRE' not found.")]
+#else
+        [ExpectedException(typeof(ConfigurationErrorsException), "Cannot read properties; config section 'ELNOMBRE' not found.")]
+#endif        
+        public void TryReadFromNonExistantConfigSection()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_TryReadFromNonExistantConfigSection)).Run();
+        }
+
+        private void _TryReadFromNonExistantConfigSection(out Stream stream)
+        {
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(SunnyDayXml));
+            ConfigurationReader.Read(new InputStreamResource(stream, ""), "ELNOMBRE", null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConnectionStringsVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConnectionStringsVariableSourceTests.cs
new file mode 100644
index 00000000..1ef5622a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConnectionStringsVariableSourceTests.cs
@@ -0,0 +1,56 @@
+#if NET_2_0
+
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+    /// Unit tests for the ConnectionStringsVariableSource class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ConnectionStringsVariableSourceTests.cs,v 1.2 2007/05/30 17:32:37 oakinger Exp $</version>
+    [TestFixture]
+    public sealed class ConnectionStringsVariableSourceTests
+    {
+        [Test]
+        public void TestVariablesResolution()
+        {
+            ConnectionStringsVariableSource vs = new ConnectionStringsVariableSource();
+
+            // existing vars
+            Assert.AreEqual("mySqlServerConnectionString", vs.ResolveVariable("mySqlDataSource.connectionString"));
+            Assert.AreEqual("System.Data.SqlClient", vs.ResolveVariable("mySqlDataSource.providerName"));
+            Assert.AreEqual("myOracleConnectionString", vs.ResolveVariable("myOracleDataSource.connectionString"));
+            Assert.AreEqual("System.Data.OracleClient", vs.ResolveVariable("myOracleDataSource.providerName"));
+
+            // non-existant variable
+            Assert.IsNull(vs.ResolveVariable("dummy"));
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConstructorArgumentValuesTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConstructorArgumentValuesTests.cs
new file mode 100644
index 00000000..5c43570a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConstructorArgumentValuesTests.cs
@@ -0,0 +1,296 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Collections;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the ConstructorArgumentValues class.
+	/// </summary>
+	/// <author>Rick Evans (.NET)</author>
+	[TestFixture]
+	public sealed class ConstructorArgumentValuesTests
+	{
+		[Test]
+		public void Instantiation()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			Assert.IsNotNull(values.GenericArgumentValues, "The 'GenericArgumentValues' property was not initialised.");
+			Assert.IsNotNull(values.IndexedArgumentValues, "The 'IndexedArgumentValues' property was not initialised.");
+			Assert.IsNotNull(values.NamedArgumentValues, "The 'NamedArgumentValues' property was not initialised.");
+			Assert.AreEqual(0, values.ArgumentCount, "There were some arguments in a newly initialised instance.");
+			Assert.IsTrue(values.Empty, "A newly initialised instance was not initially empty.");
+		}
+
+		[Test]
+		public void GetGenericArgumentValueIgnoresAlreadyUsedValues()
+		{
+			ISet used = new ListSet();
+
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddGenericArgumentValue(1);
+			values.AddGenericArgumentValue(2);
+			values.AddGenericArgumentValue(3);
+
+			Type intType = typeof (int);
+			ConstructorArgumentValues.ValueHolder one = values.GetGenericArgumentValue(intType, used);
+			Assert.AreEqual(1, one.Value);
+			used.Add(one);
+			ConstructorArgumentValues.ValueHolder two = values.GetGenericArgumentValue(intType, used);
+			Assert.AreEqual(2, two.Value);
+			used.Add(two);
+			ConstructorArgumentValues.ValueHolder three = values.GetGenericArgumentValue(intType, used);
+			Assert.AreEqual(3, three.Value);
+			used.Add(three);
+			ConstructorArgumentValues.ValueHolder four = values.GetGenericArgumentValue(intType, used);
+			Assert.IsNull(four);
+		}
+
+		[Test]
+		public void GetGeneric_Untyped_ArgumentValue()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			const string expectedValue = "Rick";
+			values.AddGenericArgumentValue(expectedValue);
+
+			ConstructorArgumentValues.ValueHolder name = values.GetGenericArgumentValue(null, null);
+			Assert.IsNotNull(name,
+				"Must get non-null valueholder back if no required type is specified.");
+			Assert.AreEqual(expectedValue, name.Value);
+		}
+
+		[Test]
+		public void GetGeneric_Untyped_ArgumentValueWithOnlyStronglyTypedValuesInTheCtorValueList()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			const string expectedValue = "Rick";
+			values.AddGenericArgumentValue(expectedValue, typeof(string).FullName);
+
+			ConstructorArgumentValues.ValueHolder name = values.GetGenericArgumentValue(null, null);
+			Assert.IsNull(name,
+				"Must get null valueholder back if no required type is specified but only " +
+				"strongly typed values are present in the ctor values list.");
+		}
+
+		[Test]
+		public void GetArgumentValueIgnoresAlreadyUsedValues()
+		{
+			ISet used = new ListSet();
+
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddGenericArgumentValue(1);
+			values.AddNamedArgumentValue("2", 2);
+			values.AddIndexedArgumentValue(3, 3);
+
+			Type intType = typeof (int);
+			ConstructorArgumentValues.ValueHolder one = values.GetArgumentValue(10, string.Empty, intType, used);
+			Assert.AreEqual(1, one.Value);
+			used.Add(one);
+			ConstructorArgumentValues.ValueHolder two = values.GetArgumentValue(10, "2", intType, used);
+			Assert.AreEqual(2, two.Value);
+			used.Add(two);
+			ConstructorArgumentValues.ValueHolder three = values.GetArgumentValue(3, string.Empty, intType, used);
+			Assert.AreEqual(3, three.Value);
+			used.Add(three);
+			ConstructorArgumentValues.ValueHolder four = values.GetArgumentValue(10, string.Empty, intType, used);
+			Assert.IsNull(four);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void AddNamedArgumentWithNullName()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddNamedArgumentValue(null, 1);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void AddNamedArgumentWithEmptyStringName()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddNamedArgumentValue(string.Empty, 1);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void AddNamedArgumentWithWhitespaceStringName()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddNamedArgumentValue(Environment.NewLine + "  ", 1);
+		}
+
+		[Test]
+		public void AddIndexedArgumentValue()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddIndexedArgumentValue(1, DBNull.Value);
+			Assert.IsFalse(values.Empty, "Added one value, but the collection is sayin' it's empty.");
+			Assert.AreEqual(1, values.ArgumentCount, "Added one value, but the collection ain't sayin' that it's got a single element in it.");
+			Assert.AreEqual(1, values.IndexedArgumentValues.Count, "Added one indexed value, but the collection of indexed values ain't sayin' that it's got a single element in it.");
+		}
+
+		[Test]
+		public void AddGenericArgumentValue()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddGenericArgumentValue(DBNull.Value);
+			Assert.IsFalse(values.Empty, "Added one value, but the collection is sayin' it's empty.");
+			Assert.AreEqual(1, values.ArgumentCount, "Added one value, but the collection ain't sayin' that it's got a single element in it.");
+			Assert.AreEqual(1, values.GenericArgumentValues.Count, "Added one generic value, but the collection of indexed values ain't sayin' that it's got a single element in it.");
+		}
+
+		[Test]
+		public void GetIndexedArgumentValue()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			Assert.IsNull(values.GetIndexedArgumentValue(0, typeof (object)), "Mmm... managed to get a non null instance back from an empty instance.");
+			values.AddIndexedArgumentValue(16, DBNull.Value, typeof (DBNull).FullName);
+			Assert.IsNull(values.GetIndexedArgumentValue(0, typeof (object)), "Mmm... managed to get a non null instance back from an instance that should have now't at the specified index.");
+			ConstructorArgumentValues.ValueHolder value =
+				values.GetIndexedArgumentValue(16, typeof (DBNull));
+			Assert.IsNotNull(value, "Stored a value at a specified index, but got null when retrieving it.");
+			Assert.AreSame(DBNull.Value, value.Value, "The value stored at the specified index was not the exact same instance as was added.");
+			ConstructorArgumentValues.ValueHolder wrongValue =
+				values.GetIndexedArgumentValue(16, typeof (string));
+			Assert.IsNull(wrongValue, "Stored a value at a specified index, and got it (or rather something) back when retrieving it with the wrong Type specified.");
+		}
+
+		[Test]
+		public void GetGenericArgumentValue()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			Assert.IsNull(values.GetGenericArgumentValue(typeof (object)), "Mmm... managed to get a non null instance back from an empty instance.");
+			values.AddGenericArgumentValue(DBNull.Value, typeof (DBNull).FullName);
+			Assert.IsNull(values.GetGenericArgumentValue(typeof (string)), "Mmm... managed to get a non null instance back from an instance that should have now't with the specified Type.");
+			ConstructorArgumentValues.ValueHolder value =
+				values.GetGenericArgumentValue(typeof (DBNull));
+			Assert.IsNotNull(value, "Stored a value of a specified Type, but got null when retrieving it using said Type.");
+			Assert.AreSame(DBNull.Value, value.Value, "The value stored at the specified index was not the exact same instance as was added.");
+		}
+
+		[Test]
+		public void GetArgumentValue()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			Assert.IsNull(values.GetArgumentValue(0, typeof (object)), "Mmm... managed to get a non null instance back from an empty instance.");
+			values.AddGenericArgumentValue(DBNull.Value, typeof (DBNull).FullName);
+			values.AddNamedArgumentValue("foo", DBNull.Value);
+			values.AddIndexedArgumentValue(16, DBNull.Value, typeof (DBNull).FullName);
+			Assert.IsNull(values.GetArgumentValue(100, typeof (string)), "Mmm... managed to get a non null instance back from an instance that should have now't with the specified Type.");
+			ConstructorArgumentValues.ValueHolder value =
+				values.GetArgumentValue(-3, typeof (DBNull));
+			Assert.IsNotNull(value, "Stored a value of a specified Type at a specified index, but got null when retrieving it using the wrong index but the correct Type.");
+			Assert.AreSame(DBNull.Value, value.Value, "The retrieved value was not the exact same instance as was added.");
+			
+			value = values.GetArgumentValue("foo", typeof (DBNull));
+			Assert.IsNotNull(value, "Stored a value of a specified Type under a name, but got null when retrieving it using the wrong name but the correct Type.");
+			Assert.AreSame(DBNull.Value, value.Value, "The retrieved value was not the exact same instance as was added.");
+		}
+
+		[Test]
+		public void AddAllDoesntChokeOnNullArgument()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddAll(null);
+		}
+
+		[Test]
+		public void AddAllFromOther()
+		{
+			ConstructorArgumentValues other = new ConstructorArgumentValues();
+			other.AddIndexedArgumentValue(1, DBNull.Value);
+			other.AddIndexedArgumentValue(2, "Foo");
+			other.AddIndexedArgumentValue(3, 3);
+
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddAll(other);
+			Assert.AreEqual(other.ArgumentCount, values.ArgumentCount,
+				"Must have been the same since one was filled up with the values in the other.");
+		}
+
+		[Test]
+		public void AddRangeOfIndexedArgumentValues()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddIndexedArgumentValue(1, DBNull.Value);
+			values.AddIndexedArgumentValue(2, "Foo");
+			values.AddIndexedArgumentValue(3, 3);
+			new ConstructorArgumentValues(values);
+			Assert.IsFalse(values.Empty, "Added three indexed values(as a range), but the collection is sayin' it's empty.");
+			Assert.AreEqual(3, values.ArgumentCount, "Added three indexed values(as a range), but the collection ain't sayin' that it's got 3 elements in it.");
+			Assert.AreEqual(3, values.IndexedArgumentValues.Count, "Added three indexed values(as a range), but the collection of indexed values ain't sayin' that it's got 3 elements in it.");
+		}
+
+		[Test]
+		public void NamedArgumentsAreCaseInsensitive()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddNamedArgumentValue("foo", "sball");
+			Assert.AreEqual(1, values.NamedArgumentValues.Count, "Added one named argument but it doesn't seem to have been added to the named arguments collection.");
+			Assert.AreEqual(1, values.ArgumentCount, "Added one named argument but it doesn't seem to be reflected in the overall argument count.");
+			Assert.IsTrue(values.ContainsNamedArgument("FOo"), "Mmm, the ContainsNamedArgument() method eveidently IS case sensitive (which is wrong).");
+			ConstructorArgumentValues.ValueHolder arg = values.GetNamedArgumentValue("fOo");
+			Assert.IsNotNull(arg, "The named argument previously added could not be pulled from the ctor arg collection.");
+			Assert.AreEqual("sball", arg.Value, "The value of the named argument passed in is not the same as the one that was pulled out.");
+		}
+
+		[Test]
+		public void AddNamedArgument()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddNamedArgumentValue("foo", "sball");
+			Assert.AreEqual(1, values.NamedArgumentValues.Count, "Added one named argument but it doesn't seem to have been added to the named arguments collection.");
+			Assert.AreEqual(1, values.ArgumentCount, "Added one named argument but it doesn't seem to be reflected in the overall argument count.");
+			ConstructorArgumentValues.ValueHolder arg = values.GetNamedArgumentValue("foo");
+			Assert.IsNotNull(arg, "The named argument previously added could not be pulled from the ctor arg collection.");
+			Assert.AreEqual("sball", arg.Value, "The value of the named argument passed in is not the same as the one that was pulled out.");
+		}
+
+		[Test]
+		public void AddNamedArgumentFromAotherCtorArgCollection()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddNamedArgumentValue("foo", "sball");
+			ConstructorArgumentValues copy = new ConstructorArgumentValues(values);
+			Assert.AreEqual(1, copy.NamedArgumentValues.Count, "Added one named argument but it doesn't seem to have been added to the named arguments collection.");
+			Assert.AreEqual(1, copy.ArgumentCount, "Added one named argument but it doesn't seem to be reflected in the overall argument count.");
+			ConstructorArgumentValues.ValueHolder arg = copy.GetNamedArgumentValue("foo");
+			Assert.IsNotNull(arg, "The named argument previously added could not be pulled from the ctor arg collection.");
+			Assert.AreEqual("sball", arg.Value, "The value of the named argument passed in is not the same as the one that was pulled out.");
+		}
+
+		[Test]
+		public void ValueHolderToStringsNicely()
+		{
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddGenericArgumentValue(1, typeof(int).FullName);
+			ConstructorArgumentValues.ValueHolder vh = values.GetGenericArgumentValue(typeof(int));
+			Assert.AreEqual("'1' [System.Int32]", vh.ToString());
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CustomConverterConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CustomConverterConfigurerTests.cs
new file mode 100644
index 00000000..82b15cf3
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CustomConverterConfigurerTests.cs
@@ -0,0 +1,126 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the CustomConverterConfigurer class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: CustomConverterConfigurerTests.cs,v 1.6 2007/05/11 02:32:31 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class CustomConverterConfigurerTests
+    {
+		[Test]
+		[ExpectedException(typeof(ObjectInitializationException))]
+        public void UseInvalidKeyForConverterMapKey()
+		{
+        	IDictionary converters = new Hashtable();
+			converters.Add(12, typeof(DateTimeConverter));
+
+        	DynamicMock mock = new DynamicMock(typeof(IConfigurableListableObjectFactory));
+			IConfigurableListableObjectFactory factory
+				= (IConfigurableListableObjectFactory) mock.Object;
+
+			CustomConverterConfigurer config = new CustomConverterConfigurer();
+			config.CustomConverters = converters;
+			config.PostProcessObjectFactory(factory);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ObjectInitializationException))]
+		public void UseNonTypeConverterForConverterMapValue()
+		{
+			IDictionary converters = new Hashtable();
+			converters.Add( typeof(DateTime), null);
+
+			DynamicMock mock = new DynamicMock(typeof(IConfigurableListableObjectFactory));
+			IConfigurableListableObjectFactory factory
+				= (IConfigurableListableObjectFactory) mock.Object;
+
+			CustomConverterConfigurer config = new CustomConverterConfigurer();
+			config.CustomConverters = converters;
+			config.PostProcessObjectFactory(factory);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ObjectInitializationException))]
+		public void UseNonResolvableTypeForConverterMapKey()
+		{
+			IDictionary converters = new Hashtable();
+			// purposely misspelled... :D
+			converters.Add("Systemm.Date", typeof(DateTimeConverter));
+
+			DynamicMock mock = new DynamicMock(typeof(IConfigurableListableObjectFactory));
+			IConfigurableListableObjectFactory factory
+				= (IConfigurableListableObjectFactory) mock.Object;
+
+			CustomConverterConfigurer config = new CustomConverterConfigurer();
+			config.CustomConverters = converters;
+			config.PostProcessObjectFactory(factory);
+		}
+
+		/// <summary>
+		/// Just tests that the configurer doesn't blow up and
+		/// doesn't register anything ('cos we ain't supplied anything).
+		/// </summary>
+		[Test]
+		public void DontSupplyAnyCustomConverters()
+		{
+			DynamicMock mock = new DynamicMock(typeof(IConfigurableListableObjectFactory));
+			IConfigurableListableObjectFactory factory
+				= (IConfigurableListableObjectFactory) mock.Object;
+			CustomConverterConfigurer config = new CustomConverterConfigurer();
+			config.CustomConverters = null;
+			config.PostProcessObjectFactory(factory);
+			mock.Verify();
+		}
+
+		[Test]
+		public void SunnyDayScenario()
+		{
+			IDictionary converters = new Hashtable();
+			converters.Add( typeof(DateTime), new DateTimeConverter());
+			converters.Add( typeof(Color), new ColorConverter());
+
+			DynamicMock mock = new DynamicMock(typeof(IConfigurableListableObjectFactory));
+			mock.Expect("RegisterCustomConverter");
+			mock.Expect("RegisterCustomConverter");
+			IConfigurableListableObjectFactory mockFactory
+				= (IConfigurableListableObjectFactory) mock.Object;
+
+			CustomConverterConfigurer config = new CustomConverterConfigurer();
+			config.CustomConverters = converters;
+			config.PostProcessObjectFactory(mockFactory);
+			mock.Verify();
+		}
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateFactoryObjectTests.cs
new file mode 100644
index 00000000..e361bc3a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DelegateFactoryObjectTests.cs
@@ -0,0 +1,180 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the DelegateFactoryObject class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: DelegateFactoryObjectTests.cs,v 1.5 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class DelegateFactoryObjectTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void StaticDelegateWithInstanceMethod()
+		{
+			DelegateFactoryObject fob = new DelegateFactoryObject();
+			fob.DelegateType = typeof (PopHandler);
+			fob.TargetType = typeof (OneThirstyDude);
+			fob.MethodName = "HandlePop";
+			fob.IsSingleton = false;
+			fob.AfterPropertiesSet();
+			fob.GetObject();
+		}
+
+		[Test]
+		public void StaticDelegate()
+		{
+			DelegateFactoryObject fob = new DelegateFactoryObject();
+			fob.DelegateType = typeof (PopHandler);
+			fob.TargetType = typeof (OneThirstyDude);
+			fob.MethodName = "StaticHandlePop";
+			fob.IsSingleton = false;
+			fob.AfterPropertiesSet();
+			PopHandler popper = (PopHandler) fob.GetObject();
+			Assert.IsNotNull(popper);
+			Assert.AreEqual(fob.MethodName, popper.Method.Name);
+		}
+
+		[Test]
+		public void InstanceSingletonDelegate()
+		{
+			DelegateFactoryObject fob = new DelegateFactoryObject();
+			fob.DelegateType = typeof (PopHandler);
+			OneThirstyDude dude = new OneThirstyDude();
+			fob.TargetObject = dude;
+			fob.MethodName = "HandlePop";
+			fob.AfterPropertiesSet();
+			PopHandler popper = (PopHandler) fob.GetObject();
+			Assert.IsNotNull(popper);
+			Assert.AreEqual(fob.MethodName, popper.Method.Name);
+			string soda = "The Drink Of Champions";
+			popper(this, soda);
+			Assert.AreEqual(soda, dude.Soda);
+			PopHandler other = (PopHandler) fob.GetObject();
+			Assert.IsTrue(ReferenceEquals(popper, other));
+		}
+
+		[Test]
+		public void InstancePrototypeDelegate()
+		{
+			DelegateFactoryObject fob = new DelegateFactoryObject();
+			fob.IsSingleton = false;
+			fob.DelegateType = typeof (PopHandler);
+			OneThirstyDude dude = new OneThirstyDude();
+			fob.TargetObject = dude;
+			fob.MethodName = "HandlePop";
+			fob.IsSingleton = false;
+			fob.AfterPropertiesSet();
+			PopHandler one = (PopHandler) fob.GetObject();
+			PopHandler two = (PopHandler) fob.GetObject();
+			Assert.IsFalse(ReferenceEquals(one, two));
+		}
+
+		[Test]
+		public void ObjectType()
+		{
+			DelegateFactoryObject fob = new DelegateFactoryObject();
+			Assert.IsNotNull(fob.ObjectType, "Should never be null (should default to typeof(Delegate)) ");
+			Assert.AreEqual(typeof (Delegate), fob.ObjectType, "Not defaulting to typeof(Delegate).");
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void MissingDelegateType()
+		{
+			DelegateFactoryObject fob = new DelegateFactoryObject();
+			fob.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void BadDelegateType()
+		{
+			DelegateFactoryObject fob = new DelegateFactoryObject();
+			fob.DelegateType = DBNull.Value.GetType();
+			fob.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void NullMethodName()
+		{
+			DelegateFactoryObject fob = new DelegateFactoryObject();
+            fob.DelegateType = typeof (EventHandler);
+            fob.TargetType = typeof (OneThirstyDude);
+			fob.AfterPropertiesSet();
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentException))]
+        public void EmptyMethodName()
+        {
+            DelegateFactoryObject fob = new DelegateFactoryObject();
+            fob.DelegateType = typeof (EventHandler);
+            fob.TargetType = typeof (OneThirstyDude);
+            fob.MethodName = string.Empty;
+            fob.AfterPropertiesSet();
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentException))]
+        public void WhitespacedMethodName()
+        {
+            DelegateFactoryObject fob = new DelegateFactoryObject();
+            fob.DelegateType = typeof (EventHandler);
+            fob.TargetType = typeof (OneThirstyDude);
+            fob.MethodName = "\n";
+            fob.AfterPropertiesSet();
+        }
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void MissingATarget()
+		{
+			DelegateFactoryObject fob = new DelegateFactoryObject();
+			fob.DelegateType = typeof (EventHandler);
+			fob.MethodName = "I Love You Laura Palmer, I Really Do";
+			fob.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void ChokesIfBothTargetTypeAndTargetObjectSupplied()
+		{
+			DelegateFactoryObject fob = new DelegateFactoryObject();
+			fob.DelegateType = typeof (PopHandler);
+			fob.TargetType = typeof (OneThirstyDude);
+			fob.TargetObject = new OneThirstyDude();
+			fob.MethodName = "I Love You Laura Palmer, I Really Do";
+			fob.AfterPropertiesSet();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryFactoryObjectTests.cs
new file mode 100644
index 00000000..bda44582
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryFactoryObjectTests.cs
@@ -0,0 +1,122 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the DictionaryFactoryObject class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: DictionaryFactoryObjectTests.cs,v 1.2 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class DictionaryFactoryObjectTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The Type passed to the TargetDictionaryType property must implement the 'System.Collections.IDictionary' interface.")]
+		public void SetTargetDictionaryTypeToNonDictionaryType()
+		{
+			DictionaryFactoryObject dfo = new DictionaryFactoryObject();
+			dfo.TargetDictionaryType = typeof (ICollection);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The Type passed to the TargetDictionaryType property cannot be an interface; it must be a concrete class that implements the 'System.Collections.IDictionary' interface.")]
+		public void SetTargetDictionaryTypeToDerivedIDictionaryInterfaceType()
+		{
+			DictionaryFactoryObject dfo = new DictionaryFactoryObject();
+			dfo.TargetDictionaryType = typeof (IExtendedDictionary);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The Type passed to the TargetDictionaryType property cannot be abstract (MustInherit in VisualBasic.NET); it must be a concrete class that implements the 'System.Collections.IDictionary' interface.")]
+		public void SetTargetDictionaryTypeToAbstractIDictionaryInterfaceType()
+		{
+			DictionaryFactoryObject dfo = new DictionaryFactoryObject();
+			dfo.TargetDictionaryType = typeof (AbstractDictionary);
+		}
+
+		private interface IExtendedDictionary : IDictionary
+		{
+		}
+
+		private abstract class AbstractDictionary : Hashtable
+		{
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void SetTargetDictionaryTypeToNull()
+		{
+			DictionaryFactoryObject dfo = new DictionaryFactoryObject();
+			dfo.TargetDictionaryType = null;
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The 'SourceDictionary' property cannot be null (Nothing in Visual Basic.NET).")]
+		public void GetObjectWithoutSupplyingASourceDictionary()
+		{
+			DictionaryFactoryObject dfo = new DictionaryFactoryObject();
+			dfo.IsSingleton = false;
+			dfo.GetObject();
+		}
+
+		[Test]
+		public void ObjectTypeReallyIsIDictionary()
+		{
+			Assert.AreEqual(typeof (IDictionary), new DictionaryFactoryObject().ObjectType);
+		}
+
+		[Test]
+		public void GetObjectReallyDoesPopulateANewIDictionaryInstanceWithTheElementsOfTheSourceDictionary()
+		{
+			// man, that has got to be my longest ever test name :D ...
+			IDictionary source = new Hashtable();
+			TestObject rick = new TestObject("Rick", 30);
+			source.Add(rick.Name, rick);
+			TestObject mark = new TestObject("Mark", 35);
+			source.Add(mark.Name, mark);
+			TestObject griffin = new TestObject("Griffin", 21);
+			source.Add(griffin.Name, griffin);
+
+			DictionaryFactoryObject dfo = new DictionaryFactoryObject();
+			dfo.SourceDictionary = source;
+			dfo.AfterPropertiesSet();
+
+			IDictionary dic = (IDictionary) dfo.GetObject();
+			Assert.IsNotNull(dic);
+			Assert.AreEqual(source.Count, dic.Count);
+			foreach (DictionaryEntry entry in dic)
+			{
+				string name = (string) entry.Key;
+				TestObject dude = (TestObject) entry.Value;
+				TestObject originalDude = (TestObject) source[name];
+				Assert.IsTrue(object.ReferenceEquals(dude, originalDude));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EnvironmentVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EnvironmentVariableSourceTests.cs
new file mode 100644
index 00000000..6f267340
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EnvironmentVariableSourceTests.cs
@@ -0,0 +1,53 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Microsoft.Win32;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+    /// Unit tests for the EnvironmentVariableSource class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: EnvironmentVariableSourceTests.cs,v 1.1 2007/03/10 01:44:40 aseovic Exp $</version>
+    [TestFixture]
+    public sealed class EnvironmentVariableSourceTests
+    {
+        [Test]
+        public void TestVariablesResolution()
+        {
+            EnvironmentVariableSource vs = new EnvironmentVariableSource();
+
+            // existing vars
+            Assert.AreEqual(Environment.GetEnvironmentVariable("path"), vs.ResolveVariable("PATH"));
+            Assert.AreEqual(Environment.GetEnvironmentVariable("PATH"), vs.ResolveVariable("path"));
+            Assert.AreEqual(Environment.GetEnvironmentVariable("ComputerName"), vs.ResolveVariable("computerName"));
+
+            // non-existant variable
+            Assert.IsNull(vs.ResolveVariable("dummy"));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EventValuesTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EventValuesTests.cs
new file mode 100644
index 00000000..92ad6b00
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/EventValuesTests.cs
@@ -0,0 +1,147 @@
+using NUnit.Framework;
+
+namespace Spring.Objects.Factory.Config
+{
+	[TestFixture]
+	public class EventValuesTests
+	{
+		[Test]
+			public void EmptyEventValues()
+		{
+			EventValues eventValues = new EventValues();
+			Assert.AreEqual( 0, eventValues.Events.Count );
+		}
+		[Test]
+			public void OneEventValue()
+		{
+			EventValues eventValues = new EventValues();
+			eventValues.AddHandler( new MyEventHandler());
+			Assert.AreEqual( 1, eventValues.Events.Count );
+		}
+		[Test]
+			public void TwoEventHandlersForSameEvent()
+		{
+			EventValues eventValues = new EventValues();
+			eventValues.AddHandler( new MyEventHandler());
+			eventValues.AddHandler( new MyEventHandler());
+			Assert.AreEqual( 1, eventValues.Events.Count );
+		}
+		[Test]
+			public void CopyEventHandlerValues()
+		{
+			EventValues eventValues = new EventValues();
+			eventValues.AddHandler( new MyEventHandler());
+			eventValues.AddHandler( new MyEventHandler());
+			Assert.AreEqual( 1, eventValues.Events.Count );
+			EventValues eventValues2 = new EventValues(eventValues);
+			Assert.AreEqual( 1, eventValues2.Events.Count );
+		}
+		[Test]
+			public void NullEventHandlerValue()
+		{
+			EventValues eventValues = new EventValues();
+			eventValues.AddAll( null );
+			Assert.AreEqual( 0, eventValues.Events.Count );
+		}
+		internal class MyEventHandler : IEventHandlerValue
+		{
+			#region IEventHandlerValue Members
+
+			private object _source = new object();
+			private string _eventName = "MyEvent";
+			private string _methodName = "MyEventHandlerMethod";
+			public object Source
+			{
+				get
+				{
+					return _source;
+				}
+				set
+				{
+					_source = value;
+				}
+			}
+
+			public string EventName
+			{
+				get
+				{
+					return _eventName;
+				}
+				set
+				{
+					_eventName = value;	
+				}
+			}
+
+			public string MethodName
+			{
+				get
+				{
+					return _methodName;
+				}
+				set
+				{
+					_methodName = value;
+				}
+			}
+
+			public void Wire(object source, object handler)
+			{
+			}
+
+			#endregion
+
+		}
+		internal class MyEventHandler2 : IEventHandlerValue
+		{
+			#region IEventHandlerValue Members
+
+			private object _source = new object();
+			private string _eventName = "MyEvent";
+			private string _methodName = "MyEventHandlerMethod";
+			public object Source
+			{
+				get
+				{
+					return _source;
+				}
+				set
+				{
+					_source = value;
+				}
+			}
+
+			public string EventName
+			{
+				get
+				{
+					return _eventName;
+				}
+				set
+				{
+					_eventName = value;	
+				}
+			}
+
+			public string MethodName
+			{
+				get
+				{
+					return _methodName;
+				}
+				set
+				{
+					_methodName = value;
+				}
+			}
+
+			public void Wire(object source, object handler)
+			{
+			}
+
+			#endregion
+
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/FieldRetrievingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/FieldRetrievingFactoryObjectTests.cs
new file mode 100644
index 00000000..00e9a5e1
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/FieldRetrievingFactoryObjectTests.cs
@@ -0,0 +1,232 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Unit tests for the FieldRetrievingFactoryObject class.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: FieldRetrievingFactoryObjectTests.cs,v 1.5 2006/04/09 07:24:50 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class FieldRetrievingFactoryObjectTests
+    {
+        [Test]
+        public void StaticField()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.StaticField = "Spring.Objects.Factory.Config.FinalFielder.Name, Spring.Core.Tests";
+            fac.ObjectName = "foo";
+            fac.AfterPropertiesSet();
+            Assert.AreEqual(typeof (string), fac.ObjectType);
+            object actual = fac.GetObject();
+            Assert.AreEqual(FinalFielder.Name, actual);
+        }
+
+        [Test]
+        public void StaticFieldWithWhitespace()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.StaticField = "\tSpring.Objects.Factory.Config.FinalFielder.Name, Spring.Core.Tests        ";
+            fac.ObjectName = "foo";
+            fac.AfterPropertiesSet();
+            Assert.AreEqual(typeof (string), fac.ObjectType);
+            object actual = fac.GetObject();
+            Assert.AreEqual(FinalFielder.Name, actual);
+        }
+
+        [Test]
+        public void StaticFieldThatAintAssemblyQualifiedShouldStillBeResolved()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.StaticField = "Spring.Objects.Factory.Config.FinalFielder.Name";
+            fac.ObjectName = "foo";
+            fac.AfterPropertiesSet();
+            Assert.AreEqual(typeof (string), fac.ObjectType);
+            object actual = fac.GetObject();
+            Assert.AreEqual(FinalFielder.Name, actual);
+        }
+
+        [Test]
+        public void StaticFieldSystemClass()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.StaticField = "System.DBNull.Value";
+            fac.ObjectName = "foo";
+            fac.AfterPropertiesSet();
+            Assert.AreEqual(typeof (DBNull), fac.ObjectType);
+            object actual = fac.GetObject();
+            Assert.AreEqual(DBNull.Value, actual);
+        }
+
+        [Test]
+        public void UsesObjectNameForStaticField()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.ObjectName = "System.Type.Delimiter";
+            fac.AfterPropertiesSet();
+            Assert.AreEqual(typeof (char), fac.ObjectType);
+            object actual = fac.GetObject();
+            Assert.AreEqual(Type.Delimiter, actual);
+        }
+
+        [Test]
+        public void OnlyUsesObjectNameForStaticFieldIfTheStaticFieldHasNotBeenSet()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.ObjectName = "System.DBNull.Value";
+            fac.StaticField = "Spring.Objects.Factory.Config.FinalFielder.Name";
+            fac.AfterPropertiesSet();
+            Assert.AreEqual(typeof (string), fac.ObjectType);
+            object actual = fac.GetObject();
+            Assert.AreEqual(FinalFielder.Name, actual);
+        }
+
+        [Test]
+        public void StaticFieldViaClassAndFieldName()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.TargetField = "Name";
+            fac.TargetType = typeof (FinalFielder);
+            fac.ObjectName = "foo";
+            fac.AfterPropertiesSet();
+            object actual = fac.GetObject();
+            Assert.AreEqual(FinalFielder.Name, actual);
+        }
+
+        [Test]
+        public void IsSingleton()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            Assert.IsTrue(fac.IsSingleton);
+        }
+
+        [Test]
+        public void InstanceField()
+        {
+            FinalFielder expected = new FinalFielder();
+            expected.Age = 56;
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.TargetObject = expected;
+            fac.TargetField = "Age";
+            fac.ObjectName = "foo";
+            fac.AfterPropertiesSet();
+            object actual = fac.GetObject();
+            Assert.AreEqual(expected.Age, actual);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentException))]
+        public void NothingSet()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.ObjectName = "foo";
+            fac.AfterPropertiesSet();
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentException))]
+        public void JustTargetField()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.TargetField = "Space";
+            fac.ObjectName = "foo";
+            fac.AfterPropertiesSet();
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentException))]
+        public void JustTargetType()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.TargetType = GetType();
+            fac.ObjectName = "foo";
+            fac.AfterPropertiesSet();
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentException))]
+        public void JustTargetObject()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.TargetObject = this;
+            fac.ObjectName = "foo";
+            fac.AfterPropertiesSet();
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentException))]
+        public void BailsWhenStaticFieldPassedGumpfh()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.StaticField = "Goob"; // no field specified
+            fac.ObjectName = "foo";
+            fac.AfterPropertiesSet();
+        }
+
+        [Test]
+        public void StaticFieldIsCaseINsenSiTiVE()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.StaticField = "System.Type.emptytyPES, Mscorlib";
+            fac.ObjectName = "foo";
+            fac.AfterPropertiesSet();
+            Assert.AreEqual(typeof (Type[]), fac.ObjectType);
+            Type[] actual = fac.GetObject() as Type[];
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(Type.EmptyTypes.Length, actual.Length);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ObjectDefinitionStoreException))]
+        public void BailsOnNonExistantField()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.StaticField = "Spring.Objects.Factory.Config.FinalFielder.Rubbish, Spring.Core.Tests";
+            fac.ObjectName = "foo";
+            fac.AfterPropertiesSet();
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentException))]
+        public void BailsWhenBothTargetTypeAndTargetObjectPropsAreSet()
+        {
+            FieldRetrievingFactoryObject fac = new FieldRetrievingFactoryObject();
+            fac.TargetObject = this;
+            fac.TargetType = GetType();
+            fac.AfterPropertiesSet();
+        }
+    }
+
+    internal sealed class FinalFielder
+    {
+        public const string Name = "WalkingTall";
+
+        public int Age = 43;
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ListFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ListFactoryObjectTests.cs
new file mode 100644
index 00000000..e249ac59
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ListFactoryObjectTests.cs
@@ -0,0 +1,120 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the ListFactoryObject class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: ListFactoryObjectTests.cs,v 1.2 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class ListFactoryObjectTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The Type passed to the TargetListType property must implement the 'System.Collections.IList' interface.")]
+		public void SetTargetListTypeToNonListType()
+		{
+			ListFactoryObject lfo = new ListFactoryObject();
+			lfo.TargetListType = typeof (ICollection);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The Type passed to the TargetListType property cannot be an interface; it must be a concrete class that implements the 'System.Collections.IList' interface.")]
+		public void SetTargetListTypeToDerivedIListInterfaceType()
+		{
+			ListFactoryObject lfo = new ListFactoryObject();
+			lfo.TargetListType = typeof (IExtendedList);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The Type passed to the TargetListType property cannot be abstract (MustInherit in VisualBasic.NET); it must be a concrete class that implements the 'System.Collections.IList' interface.")]
+		public void SetTargetListTypeToAbstractIListInterfaceType()
+		{
+			ListFactoryObject lfo = new ListFactoryObject();
+			lfo.TargetListType = typeof (AbstractList);
+		}
+
+		private interface IExtendedList : IList
+		{
+		}
+
+		private abstract class AbstractList : ArrayList
+		{
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void SetTargetListTypeToNull()
+		{
+			ListFactoryObject lfo = new ListFactoryObject();
+			lfo.TargetListType = null;
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The 'SourceList' property cannot be null (Nothing in Visual Basic.NET).")]
+		public void GetObjectWithoutSupplyingASourceList()
+		{
+			ListFactoryObject lfo = new ListFactoryObject();
+			lfo.IsSingleton = false;
+			lfo.GetObject();
+		}
+
+		[Test]
+		public void ObjectTypeReallyIsIList()
+		{
+			Assert.AreEqual(typeof (IList), new ListFactoryObject().ObjectType);
+		}
+
+		[Test]
+		public void GetObjectReallyDoesPopulateANewIListInstanceWithTheElementsOfTheSourceList()
+		{
+			// man, that has got to be my second longest ever test name :D ...
+			IList source = new TestObject[]
+				{
+					new TestObject("Rick", 30),
+					new TestObject("Mark", 35),
+					new TestObject("Griffin", 21),
+				};
+
+			ListFactoryObject lfo = new ListFactoryObject();
+			lfo.SourceList = source;
+			lfo.AfterPropertiesSet();
+
+			IList list = (IList) lfo.GetObject();
+			Assert.IsNotNull(list);
+			Assert.AreEqual(source.Count, list.Count);
+			for (int i = 0; i < list.Count; ++i)
+			{
+				TestObject dude = (TestObject) list[i];
+				TestObject originalDude = (TestObject) source[i];
+				Assert.IsTrue(object.ReferenceEquals(dude, originalDude));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs
new file mode 100644
index 00000000..a8bf2d32
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs
@@ -0,0 +1,136 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Common.Logging;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the LogFactoryObject class.
+	/// </summary>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: LogFactoryObjectTests.cs,v 1.1 2006/11/15 20:31:08 aseovic Exp $</version>
+	[TestFixture]
+	public sealed class LogFactoryObjectTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void CheckThatLogNamePropertyMustBeSet()
+		{
+			LogFactoryObject fac = new LogFactoryObject();
+			fac.GetObject();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void CheckLogNamePropertyWithNullName()
+		{
+			LogFactoryObject fac = new LogFactoryObject();
+			fac.LogName = null;
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void CheckLogNamePropertyWithEmptyName()
+		{
+			LogFactoryObject fac = new LogFactoryObject();
+			fac.LogName = string.Empty;
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void CheckInstantiationWithNullName()
+		{
+			new LogFactoryObject(null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void CheckInstantiationWithEmptyName()
+		{
+			new LogFactoryObject(string.Empty);
+		}
+
+		[Test]
+		public void CheckLogNamePropertyStripsRedundantWhitespaceFromName()
+		{
+			LogFactoryObject fac = new LogFactoryObject();
+			fac.LogName = "   Foo  ";
+			Assert.AreEqual("Foo", fac.LogName);
+		}
+
+		[Test]
+		public void CheckGetObjectWorksWithValidLogName()
+		{
+			LogFactoryObject fac = new LogFactoryObject();
+			fac.LogName = "Foo";
+			ILog log = fac.GetObject() as ILog;
+			Assert.IsNotNull(log, "Mmm... pulled a null ILog instance from a properly configured LogFactoryObject instance.");
+		}
+
+		[Test]
+		public void CheckGetObjectReturnsSharedInstance()
+		{
+			LogFactoryObject fac = new LogFactoryObject();
+			fac.LogName = "Foo";
+			ILog log = fac.GetObject() as ILog;
+			ILog anotherLogInstance = fac.GetObject() as ILog;
+			Assert.IsTrue(log == anotherLogInstance,
+			              "Okay, the LogFactoryObject ain't returning shared instances (it should).");
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The 'LogName' property has not been set.")]
+		public void CheckAfterPropertiesSetBlowsUpIfNotCorrectlyConfigured()
+		{
+			LogFactoryObject fac = new LogFactoryObject();
+			fac.AfterPropertiesSet();
+		}
+
+		[Test]
+		public void CheckAfterPropertiesSetPassesIfCorrectlyConfigured()
+		{
+			LogFactoryObject fac = new LogFactoryObject("Bing!");
+			fac.AfterPropertiesSet();
+		}
+
+		[Test]
+		public void ItsDefinitelyASingletonYeah()
+		{
+			LogFactoryObject fac = new LogFactoryObject("Bing!");
+			Assert.IsTrue(fac.IsSingleton,
+			              "The LogFactoryObject class must be configured to return shared instances (it currently ain't).");
+		}
+
+		[Test]
+		public void ObjectTypePropertyYieldsTheCorrectType()
+		{
+			LogFactoryObject fac = new LogFactoryObject("Bing!");
+			Assert.AreEqual(typeof (ILog), fac.ObjectType,
+			                "Mmm... the LogFactoryObject class ain't giving back ILog types (it must).");
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs
new file mode 100644
index 00000000..2a77ba77
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs
@@ -0,0 +1,297 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+using Spring.Core;
+using Spring.Objects.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Set of unit tests for the MethodInvokingFactoryObject.
+	/// </summary>
+	/// <author>Colin Sampaleanu</author>
+	/// <author>Simon White (.NET)</author>
+	[TestFixture]
+	public class MethodInvokingFactoryObjectTests
+	{
+#if NET_2_0
+        [Test]
+        public void InvokeGenericMethod()
+        {
+            TestClass1 tc1 = new TestClass1();
+            MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+            mcfo.TargetType = typeof(Activator);
+            mcfo.TargetMethod = "CreateInstance<Spring.Objects.TestObject>";
+            mcfo.AfterPropertiesSet();
+
+            object obj = mcfo.GetObject();
+            Assert.IsNotNull(obj);
+            Assert.IsTrue(obj is TestObject);
+        }
+#endif
+		[Test]
+		public void GetSingletonNonStatic()
+		{
+			TestClass1 tc1 = new TestClass1();
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetObject = tc1;
+			mcfo.TargetMethod = "Method1";
+			mcfo.AfterPropertiesSet();
+			int i = (int) mcfo.GetObject();
+			Assert.IsTrue(i == 1);
+			i = (int) mcfo.GetObject();
+			Assert.IsTrue(i == 1);
+			Assert.IsTrue(mcfo.IsSingleton);
+		}
+
+		[Test]
+		public void GetNonSingletonNonStatic()
+		{
+			TestClass1 tc1 = new TestClass1();
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetObject = tc1;
+			mcfo.TargetMethod = "Method1";
+			mcfo.IsSingleton = false;
+			mcfo.AfterPropertiesSet();
+			int i = (int) mcfo.GetObject();
+			Assert.IsTrue(i == 1);
+			i = (int) mcfo.GetObject();
+			Assert.IsTrue(i == 2);
+			Assert.IsFalse(mcfo.IsSingleton);
+		}
+
+		[Test]
+		public void GetSingletonStatic()
+		{
+			TestClass1._staticField1 = 0;
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetType = typeof (TestClass1);
+			mcfo.TargetMethod = "StaticMethod1";
+			mcfo.AfterPropertiesSet();
+			int i = (int) mcfo.GetObject();
+			Assert.IsTrue(i == 1);
+			i = (int) mcfo.GetObject();
+			Assert.IsTrue(i == 1);
+			Assert.IsTrue(mcfo.IsSingleton);
+		}
+
+		[Test]
+		public void GetNonSingletonStatic()
+		{
+			TestClass1._staticField1 = 0;
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+            mcfo.TargetType = typeof(TestClass1);
+            mcfo.TargetMethod = "StaticMethod1";
+			mcfo.IsSingleton = false;
+			mcfo.AfterPropertiesSet();
+			int i = (int) mcfo.GetObject();
+			Assert.IsTrue(i == 1);
+			i = (int) mcfo.GetObject();
+			Assert.IsTrue(i == 2);
+			Assert.IsFalse(mcfo.IsSingleton);
+		}
+
+		[Test]
+		public void InvokingAMethodThatHasAVoidReturnTypeReturnsNullPlaceHolder()
+		{
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetType = typeof (TestClass1);
+			mcfo.TargetMethod = "VoidRetvalMethod";
+			mcfo.AfterPropertiesSet();
+			Assert.AreEqual(MethodInvoker.Void, mcfo.GetObject());
+		}
+
+		[Test]
+		public void GetSupertypesMatchNumArgs()
+		{
+			TestClass1._staticField1 = 0;
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetType = typeof (TestClass1);
+			mcfo.TargetMethod = "Supertypes";
+			mcfo.Arguments = new Object[] {new ArrayList(), new ArrayList(), "hello"};
+			// should pass
+			mcfo.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "Unable to determine which exact method to call; found '2' matches.")]
+		public void GetSupertypesTooManyArgs()
+		{
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetType = typeof (TestClass1);
+			mcfo.TargetMethod = "Supertypes2";
+			mcfo.Arguments = new Object[] {new ArrayList(), new ArrayList(), "hello", "bogus"};
+			mcfo.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (TypeMismatchException))]
+		public void GetMisMatchedArgumentTypes()
+		{
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetType = typeof (TestClass1);
+			mcfo.TargetMethod = "Supertypes";
+			mcfo.Arguments = new Object[] {"1", "2", "3"};
+			mcfo.AfterPropertiesSet();
+			mcfo.Invoke();
+		}
+
+		[Test]
+		public void GetObjectType()
+		{
+			TestClass1 tc1 = new TestClass1();
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetObject = tc1;
+			mcfo.TargetMethod = "Method1";
+			mcfo.AfterPropertiesSet();
+			Assert.IsTrue(typeof (int).Equals(mcfo.ObjectType));
+
+			mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetType = typeof (TestClass1);
+			mcfo.TargetMethod = "VoidRetvalMethod";
+			mcfo.AfterPropertiesSet();
+			Type objType = mcfo.ObjectType;
+			Assert.IsTrue(objType.Equals(MethodInvokingFactoryObject.Void.GetType()));
+
+			// verify that we can call a method with args that are subtypes of the
+			// target method arg types
+			TestClass1._staticField1 = 0;
+			mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetType = typeof (TestClass1);
+			mcfo.TargetMethod = "Supertypes";
+			mcfo.Arguments = new Object[] {new ArrayList(), new ArrayList(), "hello"};
+			mcfo.AfterPropertiesSet();
+			objType = mcfo.ObjectType;
+		}
+
+		[Test]
+		public void ObjectTypeIsNullIfAfterPropertiesSetHasNotYetBeenInvoked()
+		{
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetType = typeof (TestClass1);
+			mcfo.TargetMethod = "VoidRetvalMethod";
+			Assert.IsNull(mcfo.ObjectType,
+				"ObjectType property value must only be set to a non null value " +
+				"AFTER the AfterPropertiesSet() method has been invoked.");
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The 'TargetMethod' property is required.")]
+		public void BailsIfTheTargetMethodPropertyAintSet()
+		{
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (MissingMethodException))]
+		public void AfterPropertiesSetBogusMethod()
+		{
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetObject = this;
+			mcfo.TargetMethod = "whatever";
+			mcfo.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (MissingMethodException))]
+		public void AfterPropertiesSetBogusStaticMethod()
+		{
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetType = typeof (TestClass1);
+			mcfo.TargetMethod = "some.bogus.Method.name";
+			mcfo.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void AfterPropertiesSetStaticMethodMissingArgs()
+		{
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetType = typeof (TestClass1);
+			mcfo.TargetMethod = "Method1";
+			mcfo.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void AfterPropertiesSetMissingMethod()
+		{
+			MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject();
+			mcfo.TargetObject = this;
+			mcfo.AfterPropertiesSet();
+		}
+
+		[Test]
+		public void InvokeWithNullArgument()
+		{
+			MethodInvoker methodInvoker = new MethodInvoker();
+			methodInvoker.TargetType = GetType();
+			methodInvoker.TargetMethod = "NullArgument";
+			methodInvoker.Arguments = new object[] {null};
+			methodInvoker.Prepare();
+			methodInvoker.Invoke();
+		}
+
+		public static void NullArgument(object arg)
+		{
+		}
+
+		// a test class to work with
+		public class TestClass1
+		{
+			public static int _staticField1;
+			public int _field1 = 0;
+
+			public int Method1()
+			{
+				return ++_field1;
+			}
+
+			public static int StaticMethod1()
+			{
+				return ++_staticField1;
+			}
+
+			public static void VoidRetvalMethod()
+			{
+			}
+
+			public static void Supertypes(ICollection c, IList l, string s)
+			{
+			}
+
+			public static void Supertypes2(ICollection c, IList l, string s, object i)
+			{
+			}
+
+			public static void Supertypes2(ICollection c, IList l, string s, string s2)
+			{
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectDefinitionVisitorTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectDefinitionVisitorTests.cs
new file mode 100644
index 00000000..2e441657
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectDefinitionVisitorTests.cs
@@ -0,0 +1,173 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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.Collections;
+using System.Collections.Specialized;
+
+using NUnit.Framework;
+using Spring.Objects.Factory.Support;
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Unit tests for the ObjectDefinitionVisitor class
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    [TestFixture]
+    public class ObjectDefinitionVisitorTests
+    {
+        private NameValueCollectionVariableSource variableSource;
+
+        [SetUp]
+        public void SetUp()
+        {
+            NameValueCollection nvc = new NameValueCollection();
+            nvc.Add("Property", "Value");
+            variableSource = new NameValueCollectionVariableSource(nvc);
+        }
+
+        [Test]
+        public void VisitObjectTypeName()
+        {
+            IObjectDefinition od = new RootObjectDefinition();
+            od.ObjectTypeName = "$Property";
+
+            ObjectDefinitionVisitor odv = new ObjectDefinitionVisitor(variableSource);
+            odv.VisitObjectDefinition(od);
+
+            Assert.AreEqual("Value", od.ObjectTypeName);
+        }
+
+        [Test]
+        public void VisitPropertyValues()
+        {
+            IObjectDefinition od = new RootObjectDefinition();
+            od.PropertyValues.Add("PropertyName", "$Property");
+
+            ObjectDefinitionVisitor odv = new ObjectDefinitionVisitor(variableSource);
+            odv.VisitObjectDefinition(od);
+
+            Assert.AreEqual("Value", od.PropertyValues.GetPropertyValue("PropertyName").Value);
+        }
+
+
+        [Test]
+        public void VisitManagedList()
+        {
+            IObjectDefinition od = new RootObjectDefinition();
+            ManagedList ml = new ManagedList();
+            ml.ElementTypeName = "$Property";
+            ml.Add("$Property");
+            od.PropertyValues.Add("PropertyName", ml);
+
+            ObjectDefinitionVisitor odv = new ObjectDefinitionVisitor(variableSource);
+            odv.VisitObjectDefinition(od);
+
+            ManagedList list = od.PropertyValues.GetPropertyValue("PropertyName").Value as ManagedList;
+
+            Assert.AreEqual("Value", list.ElementTypeName);
+            Assert.AreEqual("Value", list[0]);
+        }
+
+        [Test]
+        public void VisitManagedSet()
+        {
+            IObjectDefinition od = new RootObjectDefinition();
+            ManagedSet ms = new ManagedSet();
+            ms.ElementTypeName = "$Property";
+            ms.Add("$Property");
+            od.PropertyValues.Add("PropertyName", ms);
+
+            ObjectDefinitionVisitor odv = new ObjectDefinitionVisitor(variableSource);
+            odv.VisitObjectDefinition(od);
+
+            ManagedSet set = od.PropertyValues.GetPropertyValue("PropertyName").Value as ManagedSet;
+
+            Assert.AreEqual("Value", set.ElementTypeName);
+            IEnumerator enumerator = set.GetEnumerator();
+            enumerator.MoveNext();
+            Assert.AreEqual("Value", enumerator.Current);
+        }
+
+        [Test]
+        public void VisitManagedDictionary()
+        {
+            IObjectDefinition od = new RootObjectDefinition();
+            ManagedDictionary md = new ManagedDictionary();
+            md.KeyTypeName = "$Property";
+            md.ValueTypeName = "$Property";
+            md.Add("Key", "$Property");
+            od.PropertyValues.Add("PropertyName", md);
+
+            ObjectDefinitionVisitor odv = new ObjectDefinitionVisitor(variableSource);
+            odv.VisitObjectDefinition(od);
+
+            ManagedDictionary dictionary = od.PropertyValues.GetPropertyValue("PropertyName").Value as ManagedDictionary;
+
+            Assert.AreEqual("Value", dictionary.KeyTypeName);
+            Assert.AreEqual("Value", dictionary.ValueTypeName);
+            Assert.AreEqual("Value", dictionary["Key"]);
+        }
+
+        [Test]
+        public void VisitNameValueCollection()
+        {
+            IObjectDefinition od = new RootObjectDefinition();
+            NameValueCollection nvc = new NameValueCollection();
+            nvc["Key"] = "$Property";
+            od.PropertyValues.Add("PropertyName", nvc);
+
+            ObjectDefinitionVisitor odv = new ObjectDefinitionVisitor(variableSource);
+            odv.VisitObjectDefinition(od);
+
+            NameValueCollection visitedNvc =
+                od.PropertyValues.GetPropertyValue("PropertyName").Value as NameValueCollection;
+
+            Assert.AreEqual("Value", visitedNvc["Key"]);
+        }
+
+        #region Helper class
+
+        public class NameValueCollectionVariableSource : IVariableSource
+        {
+            private NameValueCollection properties;
+
+            public NameValueCollectionVariableSource(NameValueCollection properties)
+            {
+                this.properties = properties;
+            }
+
+            public string ResolveVariable(string name)
+            {
+                if (name.StartsWith("$"))
+                {
+                    return properties[name.Substring(1)];
+                }
+                else
+                {
+                    return name;
+                }
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs
new file mode 100644
index 00000000..c435115f
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs
@@ -0,0 +1,109 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the ObjectFactoryCreatingFactoryObject class.
+	/// </summary>
+	/// <author>Colin Sampaleanu</author>
+	/// <author>Simon White (.NET)</author>
+	[TestFixture]
+	public sealed class ObjectFactoryCreatingFactoryObjectTests
+	{
+		[Test]
+		public void SunnyDay()
+		{
+			TestObject dude = new TestObject("Rick Evans", 30);
+			DynamicMock mock = new DynamicMock(typeof (IObjectFactory));
+			const string lookupObjectName = "rick";
+			mock.ExpectAndReturn("GetObject", dude, lookupObjectName);
+			mock.ExpectAndReturn("GetObject", dude, lookupObjectName);
+			ObjectFactoryCreatingFactoryObject factory = new ObjectFactoryCreatingFactoryObject();
+			factory.ObjectFactory = (IObjectFactory) mock.Object;
+			factory.TargetObjectName = lookupObjectName;
+			factory.AfterPropertiesSet();
+
+			IGenericObjectFactory gof = (IGenericObjectFactory) factory.GetObject();
+			IGenericObjectFactory gofOther = (IGenericObjectFactory) factory.GetObject();
+			Assert.IsTrue(Object.ReferenceEquals(gof, gofOther),
+				"Not returning a shared instance (Singleton = true).");
+			TestObject one = (TestObject) gof.GetObject();
+			Assert.IsNotNull(one, "Must never return null (IFactoryObject contract).");
+			TestObject two = (TestObject) gof.GetObject();
+			Assert.IsNotNull(two, "Must never return null (IFactoryObject contract).");
+			Assert.IsTrue(Object.ReferenceEquals(one, two),
+			              "Not returning the same instance.");
+			mock.Verify();
+		}
+
+		[Test]
+		public void PrototypeModeWithSingletonTarget()
+		{
+			TestObject dude = new TestObject("Rick Evans", 30);
+			DynamicMock mock = new DynamicMock(typeof (IObjectFactory));
+			const string lookupObjectName = "rick";
+			mock.ExpectAndReturn("GetObject", dude, lookupObjectName);
+			mock.ExpectAndReturn("GetObject", dude, lookupObjectName);
+			ObjectFactoryCreatingFactoryObject factory = new ObjectFactoryCreatingFactoryObject();
+			factory.ObjectFactory = (IObjectFactory) mock.Object;
+			factory.TargetObjectName = lookupObjectName;
+			factory.IsSingleton = false;
+			factory.AfterPropertiesSet();
+
+			IGenericObjectFactory gofOne = (IGenericObjectFactory) factory.GetObject();
+			IGenericObjectFactory gofTwo = (IGenericObjectFactory) factory.GetObject();
+			Assert.IsFalse(Object.ReferenceEquals(gofOne, gofTwo),
+				"Not returning distinct instances (Prototype = true).");
+			TestObject one = (TestObject) gofOne.GetObject();
+			Assert.IsNotNull(one, "Must never return null (IFactoryObject contract).");
+			TestObject two = (TestObject) gofTwo.GetObject();
+			Assert.IsNotNull(two, "Must never return null (IFactoryObject contract).");
+			Assert.IsTrue(Object.ReferenceEquals(one, two),
+				"Not returning the same instance to singleton object.");
+			mock.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException),
+			"The 'TargetObjectName' property must have a value.")]
+		public void WithMissingObjectName()
+		{
+			ObjectFactoryCreatingFactoryObject factory
+				= new ObjectFactoryCreatingFactoryObject();
+			factory.AfterPropertiesSet();
+		}
+
+		[Test]
+		public void ObjectTypeReallyIsIGenericObjectFactory()
+		{
+			Assert.AreEqual(typeof (IGenericObjectFactory),
+			                new ObjectFactoryCreatingFactoryObject().ObjectType);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectReferenceFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectReferenceFactoryObjectTests.cs
new file mode 100644
index 00000000..33176de5
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectReferenceFactoryObjectTests.cs
@@ -0,0 +1,129 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the ObjectReferenceFactoryObject class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ObjectReferenceFactoryObjectTests.cs,v 1.3 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class ObjectReferenceFactoryObjectTests
+    {
+        [Test]
+		[ExpectedException(typeof(ArgumentException))]
+        public void NullTargetObjectName()
+		{
+			ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
+			// simulate IFactoryObjectAware interface...
+			fac.ObjectFactory = null;
+        }
+		
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void WhitespaceTargetObjectName()
+		{
+			ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
+			fac.TargetObjectName = string.Empty;
+			// simulate IFactoryObjectAware interface...
+			fac.ObjectFactory = null;
+		}
+		
+		[Test]
+		public void FactoryDoesNotContainTargetObject()
+		{
+			DynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+			mock.ExpectAndReturn("ContainsObject", false);
+			IObjectFactory mockFactory = (IObjectFactory) mock.Object;
+
+			ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
+			fac.TargetObjectName = "bojangles";
+			try
+			{
+				// simulate IFactoryObjectAware interface...
+				fac.ObjectFactory = mockFactory;
+				Assert.Fail("Must have bailed with a " +
+					"NoSuchObjectDefinitionException 'cos the object doesn't " +
+					"exist in the associated factory.");
+			}
+			catch (NoSuchObjectDefinitionException)
+			{
+				mock.Verify();
+			}
+		}
+
+		[Test]
+		public void DelegatesThroughToFactoryFor_IsSingleton()
+		{
+			DynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+			mock.ExpectAndReturn("ContainsObject", true);
+			mock.ExpectAndReturn("IsSingleton", true);
+			IObjectFactory mockFactory = (IObjectFactory) mock.Object;
+
+			ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
+			fac.TargetObjectName = "bojangles";
+			fac.ObjectFactory = mockFactory;
+
+			Assert.IsTrue(fac.IsSingleton);
+			mock.Verify();
+		}
+
+		[Test]
+		public void DelegatesThroughToFactoryFor_GetObject()
+		{
+			DynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+			mock.ExpectAndReturn("ContainsObject", true);
+			mock.ExpectAndReturn("GetObject", "Rick");
+			IObjectFactory mockFactory = (IObjectFactory) mock.Object;
+
+			ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
+			fac.TargetObjectName = "bojangles";
+			fac.ObjectFactory = mockFactory;
+
+			Assert.AreEqual("Rick", fac.GetObject());
+			mock.Verify();
+		}
+
+		[Test]
+		public void DelegatesThroughToFactoryFor_ObjectType()
+		{
+			DynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+			mock.ExpectAndReturn("ContainsObject", true);
+			mock.ExpectAndReturn("GetType", GetType());
+			IObjectFactory mockFactory = (IObjectFactory) mock.Object;
+
+			ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
+			fac.TargetObjectName = "bojangles";
+			fac.ObjectFactory = mockFactory;
+
+			Assert.AreEqual(GetType(), fac.ObjectType);
+			mock.Verify();
+		}
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyFileVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyFileVariableSourceTests.cs
new file mode 100644
index 00000000..e6050d65
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyFileVariableSourceTests.cs
@@ -0,0 +1,75 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Core.IO;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+    /// Unit tests for the PropertyFileVariableSource class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: PropertyFileVariableSourceTests.cs,v 1.3 2007/08/08 17:49:04 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class PropertyFileVariableSourceTests
+    {
+        [Test]
+        public void TestVariablesResolutionWithSingleLocation()
+        {
+            PropertyFileVariableSource vs = new PropertyFileVariableSource();
+            vs.Location =
+                new AssemblyResource(
+                    "assembly://Spring.Core.Tests/Spring.Data.Spring.Objects.Factory.Config/one.properties");
+
+            // existing vars
+            Assert.AreEqual("Aleks Seovic", vs.ResolveVariable("name"));
+            Assert.AreEqual("32", vs.ResolveVariable("age"));
+
+            // non-existant variable
+            Assert.IsNull(vs.ResolveVariable("dummy"));
+        }
+
+        [Test]
+        public void TestVariablesResolutionWithTwoLocations()
+        {
+            PropertyFileVariableSource vs = new PropertyFileVariableSource();
+            vs.Locations = new IResource[]
+                {
+                    new AssemblyResource(
+                        "assembly://Spring.Core.Tests/Spring.Data.Spring.Objects.Factory.Config/one.properties"),
+                    new AssemblyResource(
+                        "assembly://Spring.Core.Tests/Spring.Data.Spring.Objects.Factory.Config/two.properties")
+                };
+
+            // existing vars
+            Assert.AreEqual("Aleksandar Seovic", vs.ResolveVariable("name")); // should be overriden by the second file
+            Assert.AreEqual("32", vs.ResolveVariable("age"));
+            Assert.AreEqual("Marija,Ana,Nadja", vs.ResolveVariable("family"));
+
+            // non-existant variable
+            Assert.IsNull(vs.ResolveVariable("dummy"));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyOverrideConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyOverrideConfigurerTests.cs
new file mode 100644
index 00000000..e579c4f6
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyOverrideConfigurerTests.cs
@@ -0,0 +1,190 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections.Specialized;
+using Common.Logging;
+using Common.Logging.Simple;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Context.Support;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the PropertyOverrideConfigurer class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: PropertyOverrideConfigurerTests.cs,v 1.9 2007/10/10 16:31:50 bbaia Exp $</version>
+	[TestFixture]
+	public sealed class PropertyOverrideConfigurerTests
+	{
+		/// <summary>
+		/// The setup logic executed before the execution of this test fixture.
+		/// </summary>
+		[TestFixtureSetUp]
+		public void FixtureSetUp()
+		{
+			// enable (null appender) logging, just to ensure that the logging code is correct
+            LogManager.Adapter = new NoOpLoggerFactoryAdapter(); 
+		}
+
+        [Test]
+        public void AddPropertyValue()
+        {
+            StaticApplicationContext ac = new StaticApplicationContext();
+            ac.RegisterSingleton("tb1", typeof(TestObject), new MutablePropertyValues());
+            ac.RegisterSingleton("tb2", typeof(TestObject), new MutablePropertyValues());
+            MutablePropertyValues pvs = new MutablePropertyValues();
+            pvs.Add("Properties", "<spring-config><add key=\"tb1.Age\" value=\"99\"/><add key=\"tb2.Name\" value=\"test\"/></spring-config>");
+            ac.RegisterSingleton("configurer1", typeof(PropertyOverrideConfigurer), pvs);
+            pvs = new MutablePropertyValues();
+            pvs.Add("Properties", "<spring-config><add key=\"tb2.Age\" value=\"99\"/><add key=\"tb2.Name\" value=\"test\"/></spring-config>");
+            pvs.Add("order", "0");
+            ac.RegisterSingleton("configurer2", typeof(PropertyOverrideConfigurer), pvs);
+            ac.Refresh();
+            TestObject tb1 = (TestObject)ac.GetObject("tb1");
+            TestObject tb2 = (TestObject)ac.GetObject("tb2");
+            Assert.AreEqual(99, tb1.Age);
+            Assert.AreEqual(99, tb2.Age);
+            Assert.AreEqual(null, tb1.Name);
+            Assert.AreEqual("test", tb2.Name);
+        }
+
+		[Test]
+        public void OverridePropertyValue()
+		{
+			StaticApplicationContext ac = new StaticApplicationContext();
+
+            MutablePropertyValues pvs = new MutablePropertyValues();
+            pvs.Add("Age", 27);
+            pvs.Add("Name", "Bruno");
+            ac.RegisterSingleton("tb1", typeof(TestObject), pvs);
+			
+            pvs = new MutablePropertyValues();
+			pvs.Add("Properties", "<spring-config><add key=\"tb1.Age\" value=\"99\"/><add key=\"tb1.Name\" value=\"test\"/></spring-config>");
+			ac.RegisterSingleton("configurer", typeof (PropertyOverrideConfigurer), pvs);
+
+			ac.Refresh();
+			TestObject tb1 = (TestObject) ac.GetObject("tb1");
+			Assert.AreEqual(99, tb1.Age);
+			Assert.AreEqual("test", tb1.Name);
+		}
+
+        [Test]
+        public void OverridePropertyReference()
+        {
+            StaticApplicationContext ac = new StaticApplicationContext();
+            
+            MutablePropertyValues pvs = new MutablePropertyValues();
+            pvs.Add("Spouse", new RuntimeObjectReference("spouse1"));
+            ac.RegisterSingleton("tb1", typeof(TestObject), pvs);
+            
+            ac.RegisterSingleton("spouse1", typeof(TestObject), new MutablePropertyValues());
+            ac.RegisterSingleton("spouse2", typeof(TestObject), new MutablePropertyValues());
+
+            pvs = new MutablePropertyValues();
+            pvs.Add("Properties", "<spring-config><add key=\"tb1.Spouse\" value=\"spouse2\"/></spring-config>");
+            ac.RegisterSingleton("configurer", typeof(PropertyOverrideConfigurer), pvs);
+
+            ac.Refresh();
+            TestObject tb1 = (TestObject)ac.GetObject("tb1");
+            TestObject spouse2 = (TestObject)ac.GetObject("spouse2");
+            Assert.AreEqual(spouse2, tb1.Spouse);
+        }
+
+        [Test]
+        public void OverridePropertyExpression()
+        {
+            StaticApplicationContext ac = new StaticApplicationContext();
+
+            MutablePropertyValues pvs = new MutablePropertyValues();
+            pvs.Add("Age", new ExpressionHolder("26+1"));
+            ac.RegisterSingleton("tb1", typeof(TestObject), pvs);
+
+            pvs = new MutablePropertyValues();
+            pvs.Add("Properties", "<spring-config><add key=\"tb1.Age\" value=\"26-1\"/></spring-config>");
+            ac.RegisterSingleton("configurer", typeof(PropertyOverrideConfigurer), pvs);
+
+            ac.Refresh();
+            TestObject tb1 = (TestObject)ac.GetObject("tb1");
+            Assert.AreEqual(25, tb1.Age);
+        }
+
+		[Test]
+		public void MalformedOverrideKey()
+		{
+			IDynamicMock mock = new DynamicMock(typeof (IConfigurableListableObjectFactory));
+			IConfigurableListableObjectFactory fac = (IConfigurableListableObjectFactory) mock.Object;
+
+			PropertyOverrideConfigurer cfg = new PropertyOverrideConfigurer();
+			NameValueCollection defaultProperties = new NameValueCollection();
+			defaultProperties.Add("malformedKey", "Rick Evans");
+			cfg.Properties = defaultProperties;
+			try
+			{
+				cfg.PostProcessObjectFactory(fac);
+				Assert.Fail("Should have had a FatalObjectException at this point because of a malformed key.");
+			}
+			catch (FatalObjectException)
+			{
+			}
+			mock.Verify();
+		}
+
+		[Test]
+		public void MissingObjectDefinitionDoesntRaiseFatalException()
+		{
+			const string valueTo_NOT_BeOveridden = "Jenny Lewis";
+			TestObject foo = new TestObject(valueTo_NOT_BeOveridden, 30);
+
+			IDynamicMock mock = new DynamicMock(typeof (IConfigurableListableObjectFactory));
+			mock.ExpectAndReturn("GetObjectDefinition", null, "rubbish");
+			IConfigurableListableObjectFactory fac = (IConfigurableListableObjectFactory) mock.Object;
+
+			PropertyOverrideConfigurer cfg = new PropertyOverrideConfigurer();
+			NameValueCollection defaultProperties = new NameValueCollection();
+			defaultProperties.Add("rubbish.Name", "Rick Evans");
+			cfg.Properties = defaultProperties;
+			cfg.PostProcessObjectFactory(fac);
+			Assert.AreEqual(valueTo_NOT_BeOveridden, foo.Name,
+			                "Property value was overridden, but a rubbish objectName root was supplied.");
+
+			mock.Verify();
+		}
+
+		[Test]
+		public void ViaXML()
+		{
+			IResource resource = new ReadOnlyXmlTestResource("PropertyResourceConfigurerTests.xml", GetType());
+			XmlObjectFactory xbf = new XmlObjectFactory(resource);
+			PropertyOverrideConfigurer poc = (PropertyOverrideConfigurer) xbf.GetObject("OverrideConfigurer");
+			Assert.IsNotNull(poc);
+			poc.PostProcessObjectFactory(xbf);
+			TestObject to = (TestObject) xbf.GetObject("Test2");
+			Assert.AreEqual("Overriden Name", to.Name);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPathFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPathFactoryObjectTests.cs
new file mode 100644
index 00000000..f4d6a1c3
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPathFactoryObjectTests.cs
@@ -0,0 +1,172 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the PropertyPathFactoryObject class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: PropertyPathFactoryObjectTests.cs,v 1.3 2007/07/31 00:09:30 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class PropertyPathFactoryObjectTests
+	{
+		[Test]
+		public void GetObject_ViaTargetObjectName()
+		{
+			DynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+			mock.ExpectAndReturn("IsSingleton", true);
+			mock.ExpectAndReturn("GetObject", new TestObject("Fiona Apple", 28), "foo");
+			IObjectFactory mockFactory = (IObjectFactory) mock.Object;
+
+			PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
+			fac.TargetObjectName = "foo";
+			fac.PropertyPath = "name";
+			fac.ObjectFactory = mockFactory;
+			string name = (string) fac.GetObject();
+			Assert.AreEqual("Fiona Apple", name);
+			mock.Verify();
+		}
+
+		[Test]
+		public void GetObject_ViaTargetObjectNameWithNestedPropertyPath()
+		{
+			DynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+			mock.ExpectAndReturn("IsSingleton", true);
+			TestObject target = new TestObject("Fiona Apple", 28);
+			target.Spouse = target; 
+			mock.ExpectAndReturn("GetObject", target, "foo");
+			IObjectFactory mockFactory = (IObjectFactory) mock.Object;
+
+			PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
+			fac.TargetObjectName = "foo";
+			fac.PropertyPath = "spouse.name";
+			fac.ObjectFactory = mockFactory;
+			string name = (string) fac.GetObject();
+			Assert.AreEqual("Fiona Apple", name);
+			mock.Verify();
+		}
+
+		[Test]
+		public void GetObject_ViaObjectName()
+		{
+			DynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+			mock.ExpectAndReturn("IsSingleton", true);
+			mock.ExpectAndReturn("GetObject", new TestObject("Fiona Apple", 28), "foo");
+			IObjectFactory mockFactory = (IObjectFactory) mock.Object;
+
+			PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
+			fac.ObjectName = "foo.name";
+			fac.ObjectFactory = mockFactory;
+			string name = (string) fac.GetObject();
+			Assert.AreEqual("Fiona Apple", name);
+			mock.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void GetObject_ViaObjectNameThatStartsWithAPeriod()
+		{
+			IDynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+			mock.ExpectAndReturn("IsSingleton", true);
+			mock.ExpectAndReturn("GetObject", new TestObject("Fiona Apple", 28), "foo");
+			IObjectFactory mockFactory = (IObjectFactory) mock.Object;
+
+			PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
+			fac.ObjectName = ".foo.name";
+			fac.ObjectFactory = mockFactory;
+		}
+
+		[Test]
+		public void GetObject_MakeSureLeadingAndTrailingWhitspaceIsTrimmed()
+		{
+			IDynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+			mock.ExpectAndReturn("IsSingleton", true);
+			mock.ExpectAndReturn("GetObject", new TestObject("Fiona Apple", 28), "foo");
+			IObjectFactory mockFactory = (IObjectFactory) mock.Object;
+
+			PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
+			fac.ObjectName = "   \nfoo.name  ";
+			fac.ObjectFactory = mockFactory;
+			string name = (string) fac.GetObject();
+			Assert.AreEqual("Fiona Apple", name);
+			mock.Verify();
+		}
+
+		[Test]
+		public void GetObject_ViaObjectNameWithNestedPropertyPath()
+		{
+			DynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+			mock.ExpectAndReturn("IsSingleton", true);
+			TestObject target = new TestObject("Fiona Apple", 28);
+			target.Spouse = target; 
+			mock.ExpectAndReturn("GetObject", target, "foo");
+			IObjectFactory mockFactory = (IObjectFactory) mock.Object;
+
+			PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
+			fac.ObjectName = "foo.spouse.name";
+			fac.ObjectFactory = mockFactory;
+			string name = (string) fac.GetObject();
+			Assert.AreEqual("Fiona Apple", name);
+			mock.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof(NullValueInNestedPathException))]
+		public void GetObject_ViaObjectNameWithNullInNestedPropertyPath()
+		{
+			DynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+			mock.ExpectAndReturn("IsSingleton", true);
+			mock.ExpectAndReturn("GetObject", new TestObject("Fiona Apple", 28), "foo");
+			IObjectFactory mockFactory = (IObjectFactory) mock.Object;
+
+			PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
+			fac.ObjectName = "foo.spouse.name";
+			fac.ObjectFactory = mockFactory;
+			string name = (string) fac.GetObject();
+			Assert.AreEqual("Fiona Apple", name);
+			mock.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof(FatalObjectException))]
+		public void GetObject_PropertyPathEvaluatesToNull()
+		{
+			IDynamicMock mock = new DynamicMock(typeof(IObjectFactory));
+			mock.ExpectAndReturn("IsSingleton", true);
+			mock.ExpectAndReturn("GetObject", new TestObject(null, 28), "foo");
+			IObjectFactory mockFactory = (IObjectFactory) mock.Object;
+
+			PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
+			fac.ObjectName = "foo.name";
+			fac.ObjectFactory = mockFactory;
+			fac.GetObject();
+		}
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs
new file mode 100644
index 00000000..6a4e00db
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs
@@ -0,0 +1,577 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Collections;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the PropertyPlaceholderConfigurer class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: PropertyPlaceholderConfigurerTests.cs,v 1.11 2007/11/26 14:16:29 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class PropertyPlaceholderConfigurerTests
+	{
+	    private static string testConnectionString = @"Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=;";
+        private static string testConnectionStringTwo = @"Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=Ernie;";
+		
+		[Test]
+		[ExpectedException(typeof(ObjectInitializationException))]
+		public void MismatchBetweenNumberOfConfigNamesAndNumberOfLocations()
+		{
+			PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
+			cfg.Locations = new IResource [] {(IResource) new DynamicMock(typeof(IResource)).Object}; // will never get to the point where we check the validity
+			cfg.ConfigSections = new string[] { "", "" };
+			cfg.PostProcessObjectFactory((IConfigurableListableObjectFactory) new DynamicMock(typeof(IConfigurableListableObjectFactory)).Object);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ObjectsException))]
+		public void OneConfigNameIsOKForLotsOfLocations()
+		{
+			PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
+			DynamicMock mock = new DynamicMock(typeof(IResource));
+			mock.ExpectAndReturn("Exists", true);
+			mock.ExpectAndThrow("InputStream", new FileNotFoundException());
+			cfg.Locations = new IResource [] {(IResource) mock.Object};
+			cfg.ConfigSections = new string[] { "" };
+			cfg.PostProcessObjectFactory((IConfigurableListableObjectFactory) new DynamicMock(typeof(IConfigurableListableObjectFactory)).Object);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ObjectInitializationException))]
+		public void ChokesOnBadResourceLocationIfIgnoreBadResourcesFlagNotSetToTrue()
+		{
+			PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
+			cfg.IgnoreResourceNotFound = false;
+			DynamicMock mock = new DynamicMock(typeof(IResource));
+			mock.ExpectAndReturn("Exists", false);
+			cfg.Locations = new IResource [] {(IResource) mock.Object};
+			cfg.ConfigSections = new string[] { "" };
+			cfg.PostProcessObjectFactory((IConfigurableListableObjectFactory) new DynamicMock(typeof(IConfigurableListableObjectFactory)).Object);
+		}
+
+		[Test]
+		public void DoesNotChokeOnBadResourceLocationIfIgnoreBadResourcesFlagSetToTrue()
+		{
+			PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
+			cfg.IgnoreResourceNotFound = true;
+			DynamicMock mockResource = new DynamicMock(typeof(IResource));
+			mockResource.ExpectAndReturn("Exists", false);
+			cfg.Location = (IResource) mockResource.Object;
+			cfg.ConfigSections = new string[] { "" };
+			DynamicMock mockFactory = new DynamicMock(typeof(IConfigurableListableObjectFactory));
+			mockFactory.ExpectAndReturn("GetObjectDefinitionNames", new string[] {});
+			cfg.PostProcessObjectFactory((IConfigurableListableObjectFactory) mockFactory.Object);
+			mockResource.Verify();
+			mockFactory.Verify();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ObjectDefinitionStoreException))]
+		public void WithCircularReference()
+		{
+			StaticApplicationContext ac = new StaticApplicationContext();
+			MutablePropertyValues pvs = new MutablePropertyValues();
+			pvs.Add("age", "${age}");
+			pvs.Add("name", "name${var}");
+			pvs.Add("spouse", new RuntimeObjectReference("${ref}"));
+			ac.RegisterSingleton("tb1", typeof (TestObject), pvs);
+			pvs = new MutablePropertyValues();
+			pvs.Add("age", "${age}");
+			pvs.Add("name", "name${age}");
+			ac.RegisterSingleton("tb2", typeof (TestObject), pvs);
+			pvs = new MutablePropertyValues();
+			pvs.Add("Properties", "<spring-config><add key=\"age\" value=\"99\"/><add key=\"var\" value=\"${m}var\"/><add key=\"ref\" value=\"tb2\"/><add key=\"m\" value=\"${var}\"/></spring-config>");
+			ac.RegisterSingleton("configurer1", typeof (PropertyPlaceholderConfigurer), pvs);
+			pvs = new MutablePropertyValues();
+			pvs.Add("Properties", "<spring-config><add key=\"age\" value=\"98\"/></spring-config>");
+			pvs.Add("order", "0");
+			ac.RegisterSingleton("configurer2", typeof (PropertyPlaceholderConfigurer), pvs);
+			ac.Refresh();
+		}
+
+		[Test]
+		public void WithDefaultProperties()
+		{
+			const string defName = "foo";
+			const string placeholder = "${name}";
+			MutablePropertyValues pvs = new MutablePropertyValues();
+
+			const string theProperty = "name";
+			pvs.Add(theProperty, placeholder);
+			RootObjectDefinition def = new RootObjectDefinition(typeof(TestObject), pvs);
+
+			IDynamicMock mock = new DynamicMock(typeof(IConfigurableListableObjectFactory));
+			mock.ExpectAndReturn("GetObjectDefinitionNames", new string [] {defName});
+			mock.ExpectAndReturn("GetObjectDefinition", def, defName);
+			IConfigurableListableObjectFactory fac = (IConfigurableListableObjectFactory) mock.Object;
+
+			PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
+			NameValueCollection defaultProperties = new NameValueCollection();
+			const string expectedName = "Rick Evans";
+			defaultProperties.Add(theProperty, expectedName);
+			cfg.Properties = defaultProperties;
+			cfg.PostProcessObjectFactory(fac);
+			Assert.AreEqual(expectedName, def.PropertyValues.GetPropertyValue(theProperty).Value,
+				"Property placeholder value was not replaced with the resolved value.");
+
+			mock.Verify();
+		}
+
+		/// <summary>
+		/// Fallback is the default mode. Check if the PROCESSOR_ARCHITECTURE
+		/// variable is replaced.
+		/// </summary>
+		[Test]
+		public void WithEnvironmentVariableFallback()
+		{
+			StaticApplicationContext ac = new StaticApplicationContext();
+			MutablePropertyValues pvs = new MutablePropertyValues();
+			pvs.Add("touchy", "${PROCESSOR_ARCHITECTURE}");
+			ac.RegisterSingleton("to", typeof (TestObject), pvs);
+
+			pvs = new MutablePropertyValues();
+			ac.RegisterSingleton("configurer", typeof (PropertyPlaceholderConfigurer), pvs);
+			ac.Refresh();
+
+			TestObject to = (TestObject) ac["to"];
+			Assert.AreEqual(Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE"),
+				to.Touchy);
+		}
+
+		/// <summary>
+		/// Fallback is the default mode.  Explicity provide a value using the
+		/// property (NameValueCollection Properties) of PropertyPlaceholder.
+		/// Fallback mode will not change the value since it has been explicity set.
+		/// </summary>
+		[Test]
+		public void WithEnvironmentPropertyNotUsed()
+		{
+			StaticApplicationContext ac = new StaticApplicationContext();
+			MutablePropertyValues pvs = new MutablePropertyValues();
+			pvs.Add("touchy", "${PROCESSOR_ARCHITECTURE}");
+			ac.RegisterSingleton("to", typeof (TestObject), pvs);
+
+			pvs = new MutablePropertyValues();
+			NameValueCollection nvc = new NameValueCollection();
+			nvc.Add("PROCESSOR_ARCHITECTURE", "G5");
+			pvs.Add("properties", nvc);
+			ac.RegisterSingleton("configurer", typeof (PropertyPlaceholderConfigurer), pvs);
+			ac.Refresh();
+
+			TestObject to = (TestObject) ac["to"];
+			Assert.AreEqual("G5", to.Touchy, "Fallback mode is not respecting previously set values.");
+		}
+
+		/// <summary>
+		/// Set the environment variable mode to override.  Now expect the environment
+		/// variable setting to override the explicitly defined name value collection.
+		/// </summary>
+		[Test]
+		public void WithOverridingEnvironmentProperty()
+		{
+			StaticApplicationContext ac = new StaticApplicationContext();
+			MutablePropertyValues pvs = new MutablePropertyValues();
+			pvs.Add("touchy", "${PROCESSOR_ARCHITECTURE}");
+			ac.RegisterSingleton("to", typeof (TestObject), pvs);
+
+			pvs = new MutablePropertyValues();
+			NameValueCollection nvc = new NameValueCollection();
+			nvc.Add("PROCESSOR_ARCHITECTURE", "G5");
+			pvs.Add("properties", nvc);
+			pvs.Add("environmentVariableMode", EnvironmentVariableMode.Override);
+			ac.RegisterSingleton("configurer", typeof (PropertyPlaceholderConfigurer), pvs);
+			ac.Refresh();
+
+			TestObject to = (TestObject) ac["to"];
+			Assert.AreEqual(Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE"),
+				to.Touchy);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ObjectDefinitionStoreException),
+			 "Error registering object with name 'to' defined in '' : Could not resolve placeholder 'PROCESSOR_ARCHITECTURE'.")]
+		public void WithUnresolvableEnvironmentProperty()
+		{
+			StaticApplicationContext ac = new StaticApplicationContext();
+			MutablePropertyValues pvs = new MutablePropertyValues();
+			pvs.Add("touchy", "${PROCESSOR_ARCHITECTURE}");
+			ac.RegisterSingleton("to", typeof (TestObject), pvs);
+
+			pvs = new MutablePropertyValues();
+			pvs.Add("environmentVariableMode", EnvironmentVariableMode.Never);
+			ac.RegisterSingleton("configurer", typeof (PropertyPlaceholderConfigurer), pvs);
+			ac.Refresh();
+		}
+
+		[Test]
+		public void WithUnresolvablePlaceholder()
+		{
+			StaticApplicationContext ac = new StaticApplicationContext();
+			MutablePropertyValues pvs = new MutablePropertyValues();
+			pvs.Add("name", "${ref}");
+			ac.RegisterSingleton("tb", typeof (TestObject), pvs);
+			ac.RegisterSingleton("configurer", typeof (PropertyPlaceholderConfigurer), null);
+			try
+			{
+				ac.Refresh();
+				Assert.Fail("Should have thrown ObjectDefinitionStoreException");
+			}
+			catch (ObjectDefinitionStoreException ex)
+			{
+				// expected
+				Assert.IsTrue(ex.Message.IndexOf("ref") != -1);
+			}
+		}
+
+        [Test]
+        public void WithExpressionProperty()
+        {
+            StaticApplicationContext ac = new StaticApplicationContext();
+            MutablePropertyValues pvs = new MutablePropertyValues();
+            pvs.Add("age", new ExpressionHolder("${age}"));
+            ac.RegisterSingleton("to1", typeof(TestObject), pvs);
+
+            pvs = new MutablePropertyValues();
+            NameValueCollection nvc = new NameValueCollection();
+            nvc.Add("age", "'0x7FFFFFFF'");
+            pvs.Add("properties", nvc);
+            ac.RegisterSingleton("configurer", typeof(PropertyPlaceholderConfigurer), pvs);
+            ac.Refresh();
+
+
+            TestObject to1 = (TestObject)ac.GetObject("to1");;
+            Assert.AreEqual(2147483647, to1.Age);
+
+        }
+
+		[Test]
+		public void SunnyDay()
+		{
+			StaticApplicationContext ac = new StaticApplicationContext();
+            
+
+            MutablePropertyValues pvs = new MutablePropertyValues();
+            pvs.Add("age", "${age}");
+            RootObjectDefinition def
+                = new RootObjectDefinition("${fqn}", new ConstructorArgumentValues(), pvs);
+            ac.RegisterObjectDefinition("tb3", def);
+            
+
+
+			pvs = new MutablePropertyValues();
+			pvs.Add("age", "${age}");
+			pvs.Add("name", "name${var}${");
+			pvs.Add("spouse", new RuntimeObjectReference("${ref}"));
+			ac.RegisterSingleton("tb1", typeof (TestObject), pvs);
+
+			ConstructorArgumentValues cas = new ConstructorArgumentValues();
+			cas.AddIndexedArgumentValue(1, "${age}");
+			cas.AddGenericArgumentValue("${var}name${age}");
+
+			pvs = new MutablePropertyValues();
+			ArrayList friends = new ManagedList();
+			friends.Add("na${age}me");
+			friends.Add(new RuntimeObjectReference("${ref}"));
+			pvs.Add("friends", friends);
+
+			ISet someSet = new ManagedSet();
+			someSet.Add("na${age}me");
+			someSet.Add(new RuntimeObjectReference("${ref}"));
+			pvs.Add("someSet", someSet);
+
+			IDictionary someDictionary = new ManagedDictionary();
+			someDictionary["key1"] = new RuntimeObjectReference("${ref}");
+			someDictionary["key2"] = "${age}name";
+			MutablePropertyValues innerPvs = new MutablePropertyValues();
+			someDictionary["key3"] = new RootObjectDefinition(typeof (TestObject), innerPvs);
+			someDictionary["key4"] = new ChildObjectDefinition("tb1", innerPvs);
+			pvs.Add("someMap", someDictionary);
+
+			RootObjectDefinition definition = new RootObjectDefinition(typeof (TestObject), cas, pvs);
+			ac.DefaultListableObjectFactory.RegisterObjectDefinition("tb2", definition);
+
+			pvs = new MutablePropertyValues();
+            pvs.Add("Properties", "<spring-config><add key=\"age\" value=\"98\"/><add key=\"var\" value=\"${m}var\"/><add key=\"ref\" value=\"tb2\"/><add key=\"m\" value=\"my\"/><add key=\"fqn\" value=\"Spring.Objects.TestObject, Spring.Core.Tests\"/></spring-config>");
+			ac.RegisterSingleton("configurer", typeof (PropertyPlaceholderConfigurer), pvs);
+			ac.Refresh();
+
+			TestObject tb1 = (TestObject) ac.GetObject("tb1");
+			TestObject tb2 = (TestObject) ac.GetObject("tb2");
+            TestObject tb3 = (TestObject) ac.GetObject("tb3");
+			Assert.AreEqual(98, tb1.Age);
+			Assert.AreEqual(98, tb2.Age);
+            Assert.AreEqual(98, tb3.Age);
+			Assert.AreEqual("namemyvar${", tb1.Name);
+			Assert.AreEqual("myvarname98", tb2.Name);
+			Assert.AreEqual(tb2, tb1.Spouse);
+			Assert.AreEqual(2, tb2.Friends.Count);
+			IEnumerator ie = tb2.Friends.GetEnumerator();
+			ie.MoveNext();
+			Assert.AreEqual("na98me", ie.Current);
+			ie.MoveNext();
+			Assert.AreEqual(tb2, ie.Current);
+			Assert.AreEqual(2, tb2.SomeSet.Count);
+			Assert.IsTrue(tb2.SomeSet.Contains("na98me"));
+			Assert.IsTrue(tb2.SomeSet.Contains(tb2));
+			Assert.AreEqual(4, tb2.SomeMap.Count);
+			Assert.AreEqual(tb2, tb2.SomeMap["key1"]);
+			Assert.AreEqual("98name", tb2.SomeMap["key2"]);
+			TestObject inner1 = (TestObject) tb2.SomeMap["key3"];
+			TestObject inner2 = (TestObject) tb2.SomeMap["key4"];
+			Assert.AreEqual(0, inner1.Age);
+			Assert.AreEqual(null, inner1.Name);
+			Assert.AreEqual(98, inner2.Age);
+			Assert.AreEqual("namemyvar${", inner2.Name);
+		}
+		
+		/// <summary>
+		/// Makes sure that an appropriate exception is raised when trying
+		/// to resolve this placeholder... ${foo} with this value... foo=ba${foo}r
+		/// </summary>
+		[Test]
+		public void ChokesOnCircularReferenceToPlaceHolder()
+		{
+			RootObjectDefinition def = new RootObjectDefinition();
+			def.ObjectType = typeof (TestObject);
+			ConstructorArgumentValues args = new ConstructorArgumentValues();
+			args.AddNamedArgumentValue("name", "${foo}");
+			def.ConstructorArgumentValues = args;
+
+			NameValueCollection properties = new NameValueCollection();
+			const string expectedName = "ba${foo}r";
+			properties.Add("foo", expectedName);
+			
+			DynamicMock mock = new DynamicMock(typeof (IConfigurableListableObjectFactory));
+			mock.ExpectAndReturn("GetObjectDefinitionNames", new string[] {"foo"});
+			mock.ExpectAndReturn("GetObjectDefinition", def);
+			IConfigurableListableObjectFactory fac
+				= (IConfigurableListableObjectFactory) mock.Object;
+			PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
+			cfg.Properties = properties;
+			try
+			{
+				cfg.PostProcessObjectFactory(fac);
+				Assert.Fail("Should have raised an ObjectDefinitionStoreException by this point.");
+			}
+			catch (ObjectDefinitionStoreException)
+			{
+			}
+			mock.Verify();
+		}
+
+		[Test]
+		public void ReplacesNamedCtorArgument()
+		{
+			RootObjectDefinition def = new RootObjectDefinition();
+			def.ObjectType = typeof (TestObject);
+			ConstructorArgumentValues args = new ConstructorArgumentValues();
+			args.AddNamedArgumentValue("name", "${hope.floats}");
+			def.ConstructorArgumentValues = args;
+
+			NameValueCollection properties = new NameValueCollection();
+			const string expectedName = "Rick";
+			properties.Add("hope.floats", expectedName);
+
+			DynamicMock mock = new DynamicMock(typeof (IConfigurableListableObjectFactory));
+			mock.ExpectAndReturn("GetObjectDefinitionNames", new string[] {"foo"});
+			mock.ExpectAndReturn("GetObjectDefinition", def);
+			IConfigurableListableObjectFactory fac
+				= (IConfigurableListableObjectFactory) mock.Object;
+			PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
+			cfg.Properties = properties;
+			cfg.PostProcessObjectFactory(fac);
+
+			mock.Verify();
+
+			Assert.AreEqual(expectedName,
+				def.ConstructorArgumentValues.GetNamedArgumentValue("name").Value,
+				"Named argument placeholder value was not replaced.");
+		}
+
+		[Test]
+		public void UsingCustomMarkers()
+		{
+			RootObjectDefinition def = new RootObjectDefinition();
+			def.ObjectType = typeof (TestObject);
+			ConstructorArgumentValues args = new ConstructorArgumentValues();
+			args.AddNamedArgumentValue("name", "#hope.floats#");
+			def.ConstructorArgumentValues = args;
+
+			NameValueCollection properties = new NameValueCollection();
+			const string expectedName = "Rick";
+			properties.Add("hope.floats", expectedName);
+
+			DynamicMock mock = new DynamicMock(typeof (IConfigurableListableObjectFactory));
+			mock.ExpectAndReturn("GetObjectDefinitionNames", new string[] {"foo"});
+			mock.ExpectAndReturn("GetObjectDefinition", def);
+			IConfigurableListableObjectFactory fac
+				= (IConfigurableListableObjectFactory) mock.Object;
+			PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
+			cfg.PlaceholderPrefix = cfg.PlaceholderSuffix = "#";
+			cfg.Properties = properties;
+			cfg.PostProcessObjectFactory(fac);
+
+			mock.Verify();
+
+			Assert.AreEqual(expectedName,
+				def.ConstructorArgumentValues.GetNamedArgumentValue("name").Value,
+				"Named argument placeholder value was not replaced.");
+		}
+
+		/// <summary>
+		/// Test that properties can be replaced from NameValueConfiguration sections
+		/// from the main .NET application configuration file.
+		/// </summary>
+		[Test]
+		public void WithAppConfigResolution()
+		{
+			IApplicationContext ctx = new XmlApplicationContext(
+				"file://Spring/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.xml");
+			TestObjectDAO to = (TestObjectDAO) ctx["testObjectDao"];
+			Assert.AreEqual(testConnectionString, to.DbConnection.ConnectionString);
+			Assert.AreEqual(1000, to.MaxResults);
+		}
+
+		/// <summary>
+		/// Test that properties can be replaced from NameValueConfiguration sections
+		/// from the main .NET application configuration file and a seprate .xml file
+		/// on the file system.
+		/// </summary>
+		[Test]
+		public void WithTwoLocations()
+		{
+			IApplicationContext ctx = new XmlApplicationContext(
+				"file://Spring/Objects/Factory/Config/PPCTwoLocationsTwoSectionsTests.xml");
+			TestObjectDAO to = (TestObjectDAO) ctx["testObjectDao"];
+            Assert.AreEqual(testConnectionStringTwo, to.DbConnection.ConnectionString);
+			Assert.AreEqual(1000, to.MaxResults);
+		}
+
+		/// <summary>
+		/// Test that properties can be merged from a NameValueConfiguration section
+		/// in the main .NET application configuration file and a seprate .xml file
+		/// on the file system.
+		/// </summary>
+		[Test]
+		public void WithTwoLocationsOneSection()
+		{
+			IApplicationContext ctx = new XmlApplicationContext(
+				"file://Spring/Objects/Factory/Config/PPCTwoLocationsOneSectionTests.xml");
+			TestObjectDAO to = (TestObjectDAO) ctx["testObjectDao"];
+            Assert.AreEqual(testConnectionString, to.DbConnection.ConnectionString);
+			Assert.AreEqual(1000, to.MaxResults);
+		}
+
+		/// <summary>
+		/// Test that if two locations configure the same properties they are appended
+		/// or not depending on the <see cref="PropertyResourceConfigurer.LastLocationOverrides"/> property
+		/// </summary>
+		[Test(Description="SPRNET-55")]
+		public void WithAppend()
+		{
+			string resourceName = "Spring/Objects/Factory/Config/PPC-SPRNET-55.xml";
+			XmlObjectFactory ctx = new XmlObjectFactory(new FileSystemResource(resourceName));
+			Assert.IsNotNull(ctx);
+			IObjectFactoryPostProcessor processor = (IObjectFactoryPostProcessor) ctx["appendConfigurer"];
+			processor.PostProcessObjectFactory(ctx);
+			TestObjectDAO to = (TestObjectDAO) ctx["appendDao"];
+			Assert.AreEqual(testConnectionString + "," + testConnectionStringTwo, to.DbConnection.ConnectionString);
+			Assert.AreEqual(1000, to.MaxResults);
+
+			ctx = new XmlObjectFactory(new FileSystemResource(resourceName));
+			processor = (IObjectFactoryPostProcessor) ctx["noAppendConfigurer"];
+			processor.PostProcessObjectFactory(ctx);
+
+			to = (TestObjectDAO) ctx["noAppendDao"];
+            Assert.AreEqual(testConnectionStringTwo, to.DbConnection.ConnectionString);
+			Assert.AreEqual(1000, to.MaxResults);
+		}
+
+		[Test]
+		public void WithIgnoreUnresolvablePlaceholder()
+		{
+			const string defName = "foo";
+			const string placeholder = "${name}";
+			TestObject foo = new TestObject(placeholder, 30);
+			MutablePropertyValues pvs = new MutablePropertyValues();
+
+			pvs.Add("name", placeholder);
+			RootObjectDefinition def = new RootObjectDefinition(typeof(TestObject), pvs);
+
+			IDynamicMock mock = new DynamicMock(typeof(IConfigurableListableObjectFactory));
+			mock.ExpectAndReturn("GetObjectDefinitionNames", new string [] {defName});
+			mock.ExpectAndReturn("GetObjectDefinition", def, defName);
+			IConfigurableListableObjectFactory fac = (IConfigurableListableObjectFactory) mock.Object;
+
+			PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
+			cfg.IgnoreUnresolvablePlaceholders = true;
+			cfg.PostProcessObjectFactory(fac);
+			Assert.AreEqual(placeholder, foo.Name);
+
+			mock.Verify();
+		}
+
+		[Test]
+		public void ViaXML()
+		{
+			IResource resource = new ReadOnlyXmlTestResource("PropertyResourceConfigurerTests.xml", GetType());
+			XmlObjectFactory xbf = new XmlObjectFactory(resource);
+			PropertyPlaceholderConfigurer ppc = (PropertyPlaceholderConfigurer) xbf.GetObject("PlaceholderConfigurer");
+			Assert.IsNotNull(ppc);
+			ppc.PostProcessObjectFactory(xbf);
+			TestObject to = (TestObject) xbf.GetObject("Test1");
+			Assert.AreEqual("A DefName", to.Name);
+        }
+
+        [Test]
+        public void WithTypes()
+        {
+            IApplicationContext ctx = new XmlApplicationContext(
+                "file://Spring/Objects/Factory/Config/PPCWithTypesTests.xml");
+            
+            object obj = ctx["testObject"];
+            Assert.IsTrue(obj is TestObject);
+
+            TestObject to = (TestObject)obj;
+
+            Assert.AreEqual(2, to.Pets.Count);
+            Assert.AreEqual(2, to.PeriodicTable.Count);
+            Assert.AreEqual(2, to.Computers.Count);
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs
new file mode 100644
index 00000000..6ce1abfc
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs
@@ -0,0 +1,353 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using NUnit.Framework;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the PropertyRetrievingFactoryObject class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: PropertyRetrievingFactoryObjectTests.cs,v 1.6 2007/07/31 00:09:30 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class PropertyRetrievingFactoryObjectTests
+	{
+		[Test]
+		public void Instantiation()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			Assert.IsNotNull(fac.Arguments);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void BailsWhenStaticPropertyIsSetToNull()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.StaticProperty = null;
+		}
+
+		/// <summary>
+		/// Test support for nested static properties.
+		/// </summary>
+		[Test]
+		public void NestedStaticProperty()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.StaticProperty = "Spring.Objects.Factory.Config.PropertyObject.StaticProperty.Age, Spring.Core.Tests";
+			fac.AfterPropertiesSet();
+			Assert.AreEqual(typeof (int), fac.ObjectType);
+			object actual = fac.GetObject();
+			Assert.AreEqual(PropertyObject.Age, actual);
+		}
+
+		/// <summary>
+		/// Test support for nested indexed static and instance properties.
+		/// </summary>
+		[Test]
+		public void MixOfNestedIndexedStaticAndInstanceProperty()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.StaticProperty = "Spring.Objects.Factory.Config.PropertyObject.StaticProperty.Item, Spring.Core.Tests";
+			fac.Arguments = new object[] {0};
+			fac.AfterPropertiesSet();
+			Assert.AreEqual(typeof (int), fac.ObjectType);
+			object actual = fac.GetObject();
+			Assert.AreEqual(PropertyObject.StaticProperty[0], actual);
+		}
+
+		/// <summary>
+		/// Test support for really really nested indexed static and instance properties.
+		/// </summary>
+		[Test]
+		public void SuperMixOfNestedIndexedStaticAndInstanceProperty()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.StaticProperty = "Spring.Objects.Factory.Config.PropertyObject.StaticProperty.StaticProperty.Item, Spring.Core.Tests";
+			fac.Arguments = new object[] {0};
+			fac.AfterPropertiesSet();
+			Assert.AreEqual(typeof (int), fac.ObjectType);
+			object actual = fac.GetObject();
+			Assert.AreEqual(PropertyObject.StaticProperty[0], actual);
+		}
+
+		[Test]
+		public void ResistsSettingTheArgumentsToNull()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.Arguments = null;
+			Assert.IsNotNull(fac.Arguments);
+		}
+
+		[Test]
+		public void StaticProperty()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.StaticProperty = "Spring.Objects.Factory.Config.PropertyObject.Age, Spring.Core.Tests";
+			fac.AfterPropertiesSet();
+			Assert.AreEqual(typeof (int), fac.ObjectType);
+			object actual = fac.GetObject();
+			Assert.AreEqual(PropertyObject.Age, actual);
+		}
+
+		[Test]
+		public void StaticPropertyThatAintAssemblyQualifiedShouldStillBeResolved()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.StaticProperty = "Spring.Objects.Factory.Config.PropertyObject.Age";
+			fac.AfterPropertiesSet();
+			Assert.AreEqual(typeof (int), fac.ObjectType);
+			object actual = fac.GetObject();
+			Assert.AreEqual(PropertyObject.Age, actual);
+		}
+
+		[Test]
+		public void StaticPropertyViaClassAndFieldName()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.TargetProperty = "Age";
+			fac.TargetType = typeof (PropertyObject);
+			fac.AfterPropertiesSet();
+			object actual = fac.GetObject();
+			Assert.AreEqual(PropertyObject.Age, actual);
+		}
+
+		[Test]
+		public void InstanceProperty()
+		{
+			PropertyObject expected = new PropertyObject();
+			expected.Name = "Haruki Murakami";
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.TargetObject = expected;
+			fac.TargetProperty = "Name";
+			fac.AfterPropertiesSet();
+			object actual = fac.GetObject();
+			Assert.AreEqual(expected.Name, actual);
+		}
+
+		/// <summary>
+		/// Test support for nested properties on an instance.
+		/// </summary>
+		[Test]
+		public void NestedInstanceProperty()
+		{
+			TestObject person = new TestObject();
+			person.Age = 20;
+			TestObject spouse = new TestObject();
+			spouse.Age = 21;
+			person.Spouse = spouse;
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.TargetObject = person;
+			fac.TargetProperty = "spouse.age";
+			fac.AfterPropertiesSet();
+			object actual = fac.GetObject();
+			int expectedAge = 21;
+			Assert.AreEqual(expectedAge, actual);
+		}
+
+		[Test]
+		public void IndexedProperty()
+		{
+			PropertyObject expected = new PropertyObject();
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.TargetObject = expected;
+			fac.TargetProperty = "Item";
+			fac.Arguments = new object[] {2};
+			fac.AfterPropertiesSet();
+			object actual = fac.GetObject();
+			Assert.AreEqual(expected[2], actual);
+		}
+
+		[Test]
+		[ExpectedException(typeof (FatalObjectException))]
+		public void BailsWhenReadingIndexedPropertyWithNoArguments()
+		{
+			PropertyObject expected = new PropertyObject();
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.TargetObject = expected;
+			fac.TargetProperty = "Item";
+			fac.AfterPropertiesSet();
+			fac.GetObject();
+		}
+
+		[Test]
+		[ExpectedException(typeof (NotWritablePropertyException))]
+		public void BailsOnWriteOnlyProperty()
+		{
+			PropertyObject expected = new PropertyObject();
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.TargetObject = expected;
+			fac.TargetProperty = "Greenness";
+			fac.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void BailsOnNonExistantProperty()
+		{
+			PropertyObject expected = new PropertyObject();
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.TargetObject = expected;
+			fac.TargetProperty = "Blister";
+			fac.AfterPropertiesSet();
+		}
+
+		[Test]
+		public void IsSingleton()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.IsSingleton = false;
+			fac.TargetProperty = "Age";
+			fac.TargetType = typeof (PropertyObject);
+			fac.AfterPropertiesSet();
+			object actual = fac.GetObject();
+			Assert.AreEqual(PropertyObject.Age, actual);
+
+			PropertyObject.Age = 94;
+			object tryTwo = fac.GetObject();
+			Assert.AreEqual(PropertyObject.Age, tryTwo);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "One of the TargetType or TargetObject properties must be set.")]
+		public void BailsWhenNotConfigured()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void BailsWhenJustTargetPropertyIsSet()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.TargetProperty = "Funk";
+			fac.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void BailsWhenJustTargetTypeIsSet()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.TargetType = GetType();
+			fac.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The TargetProperty property is required.")]
+		public void BailsWhenJustTargetObjectIsSet()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.TargetObject = this;
+			fac.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void BailsWhenStaticPropertyPassedGumpfh()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.StaticProperty = "Boog"; // no field specified
+		}
+
+		[Test]
+		public void StaticPropertyCaseINsenSiTiVE()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.StaticProperty = "System.Globalization.CultureInfo.CURRENtUiCultURE, Mscorlib";
+			fac.AfterPropertiesSet();
+			Assert.AreEqual(typeof (CultureInfo), fac.ObjectType);
+			CultureInfo actual = fac.GetObject() as CultureInfo;
+			Assert.IsNotNull(actual);
+			Assert.AreEqual(CultureInfo.CurrentUICulture, actual);
+		}
+
+		[Test]
+		public void GetDateTimeDotNowToTestHandlingOfPrototypesIsCorrect()
+		{
+			PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject();
+			fac.TargetType = typeof(DateTime);
+			fac.TargetProperty = "Now";
+			fac.IsSingleton = false;
+			fac.AfterPropertiesSet();
+			DateTime then = (DateTime) fac.GetObject();
+			Assert.IsNotNull(then);
+			DateTime now = (DateTime) fac.GetObject();
+			Assert.IsNotNull(now);
+			Assert.IsFalse(ReferenceEquals(then, now));
+		}
+	}
+
+	internal sealed class PropertyObject
+	{
+		private static int _age = 74;
+
+		public static int Age
+		{
+			get { return _age; }
+			set { _age = value; }
+		}
+
+		private string _name;
+
+		public string Name
+		{
+			get { return _name; }
+			set { _name = value; }
+		}
+
+		private int[] _battingAverage = new int[] {1000, 350, 400};
+
+		public int[] Averages
+		{
+			get { return _battingAverage; }
+		}
+
+		public int this[int index]
+		{
+			get { return _battingAverage[index]; }
+			set { _battingAverage[index] = value; }
+		}
+
+		public bool Greenness
+		{
+			set
+			{
+				// no-op... just here for non-readability
+			}
+		}
+
+		private static readonly PropertyObject _staticProperty = new PropertyObject();
+
+		public static PropertyObject StaticProperty
+		{
+			get { return _staticProperty; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RegistryVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RegistryVariableSourceTests.cs
new file mode 100644
index 00000000..6549a999
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RegistryVariableSourceTests.cs
@@ -0,0 +1,83 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Microsoft.Win32;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the RegistryVariableSource class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: RegistryVariableSourceTests.cs,v 1.3 2007/08/03 08:31:25 oakinger Exp $</version>
+    [TestFixture]
+    public sealed class RegistryVariableSourceTests
+    {
+	    private RegistryKey key;
+
+        [SetUp]
+        public void SetUp()
+        {
+            key = Registry.CurrentUser.CreateSubKey("RegistryVariableSourceTests");
+            key.SetValue("name", "Aleks Seovic");
+#if NET_2_0 
+            key.SetValue("computer_name", "%COMPUTERNAME% is the name of my computer", RegistryValueKind.ExpandString);
+            key.SetValue("age", 32, RegistryValueKind.DWord);
+#endif            
+			key.SetValue("family", new string[] {"Marija", "Ana", "Nadja"});
+            key.SetValue("bday", new byte[] {24, 8, 74});
+			key.Flush();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Registry.CurrentUser.DeleteSubKey("RegistryVariableSourceTests");
+        }
+
+        [Test]
+        public void TestVariablesResolution()
+        {
+            RegistryVariableSource rvs = new RegistryVariableSource();
+            rvs.Key = key;
+
+            // existing vars
+            Assert.AreEqual("Aleks Seovic", rvs.ResolveVariable("name"));
+#if NET_2_0 
+            Assert.AreEqual(Environment.GetEnvironmentVariable("COMPUTERNAME") + " is the name of my computer",
+                            rvs.ResolveVariable("computer_name"));
+            Assert.AreEqual("32", rvs.ResolveVariable("age"));
+#endif            
+			// multi_sz
+			Assert.AreEqual( "Marija,Ana,Nadja", rvs.ResolveVariable("family"));
+			// binary
+            Assert.AreEqual( null, rvs.ResolveVariable("bday"));
+
+            // non-existant variable
+            Assert.IsNull(rvs.ResolveVariable("xyz"));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceHandlerConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceHandlerConfigurerTests.cs
new file mode 100644
index 00000000..32b7fe67
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceHandlerConfigurerTests.cs
@@ -0,0 +1,120 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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.Collections;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Core.IO;
+using Spring.Util;
+
+namespace Spring.Objects.Factory.Config
+{
+    
+    /// <summary>
+    /// Unit tests for the TypeAliasConfigurer class
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    [TestFixture]
+    public class ResourceHandlerConfigurerTests
+    {
+        [Test]
+        public void Serialization()
+        {
+            IDictionary resourceHandlers = new Hashtable();
+            resourceHandlers.Add("httpsss", typeof(UrlResource));
+
+            ResourceHandlerConfigurer resourceHandlerConfiguer = new ResourceHandlerConfigurer();
+            resourceHandlerConfiguer.ResourceHandlers = resourceHandlers;
+
+
+            resourceHandlerConfiguer.Order = 1;
+
+            SerializationTestUtils.SerializeAndDeserialize(resourceHandlerConfiguer);
+        }
+
+        [Test]
+		[ExpectedException(typeof(ObjectInitializationException))]
+        public void UseInvalidTypeForDictionaryValue()
+        {
+            IDictionary resourceHandlers = new Hashtable();
+            resourceHandlers.Add("httpsss", new Hashtable());
+
+            ResourceHandlerConfigurer resourceHandlerConfiguer = new ResourceHandlerConfigurer();
+            resourceHandlerConfiguer.ResourceHandlers = resourceHandlers;
+
+
+            resourceHandlerConfiguer.PostProcessObjectFactory((IConfigurableListableObjectFactory)new DynamicMock(typeof(IConfigurableListableObjectFactory)).Object);
+    
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectInitializationException))]
+        public void UseNonResolvableTypeForDictionaryValue()
+        {
+            IDictionary resourceHandlers = new Hashtable();
+            resourceHandlers.Add("httpsss", "Spring.Core.IO.UrrrrlResource, Spring.Core");
+
+            ResourceHandlerConfigurer resourceHandlerConfiguer = new ResourceHandlerConfigurer();
+            resourceHandlerConfiguer.ResourceHandlers = resourceHandlers;
+
+
+            resourceHandlerConfiguer.PostProcessObjectFactory((IConfigurableListableObjectFactory)new DynamicMock(typeof(IConfigurableListableObjectFactory)).Object);
+    
+        }
+
+        [Test]
+        public void SunnyDayScenarioUsingType()
+        {
+
+
+            IDictionary resourceHandlers = new Hashtable();
+            resourceHandlers.Add("httpsss", typeof(UrlResource));
+
+            CreateConfigurerAndTestNewProtcol(resourceHandlers);
+        }
+
+        [Test]
+        public void SunnyDayScenarioUsingTypeString()
+        {
+            IDictionary typeAliases = new Hashtable();
+            typeAliases.Add("httpsss", "Spring.Core.IO.UrlResource, Spring.Core");
+            CreateConfigurerAndTestNewProtcol(typeAliases);
+
+        }
+
+        private static void CreateConfigurerAndTestNewProtcol(IDictionary resourceHandlers)
+        {
+            ResourceHandlerConfigurer resourceHandlerConfiguer = new ResourceHandlerConfigurer();
+            resourceHandlerConfiguer.ResourceHandlers = resourceHandlers;
+
+            resourceHandlerConfiguer.Order = 1;
+
+
+            resourceHandlerConfiguer.PostProcessObjectFactory((IConfigurableListableObjectFactory)new DynamicMock(typeof(IConfigurableListableObjectFactory)).Object);
+
+            //todo investigate mocking the typeregistry, for now ask the actual one for information.
+            Assert.IsTrue(ResourceHandlerRegistry.IsHandlerRegistered("httpsss"),
+                          "ResourceHandlerConfigurer did not register a protocol handler with the ResourceHandlerRegistry");
+
+            Assert.IsTrue(ResourceHandlerRegistry.IsHandlerRegistered("httpsss"), "Custom IResource not registered.");
+            Assert.AreEqual(1, resourceHandlerConfiguer.Order);
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceManagerFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceManagerFactoryObjectTests.cs
new file mode 100644
index 00000000..1c209e5f
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceManagerFactoryObjectTests.cs
@@ -0,0 +1,85 @@
+#region License
+/*
+ * Copyright 2002-2004 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.IO;
+using System.Resources;
+using NUnit.Framework;
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the ResourceManagerFactoryObject class.
+	/// </summary>
+	/// <author>Mark Pollack</author>
+	[TestFixture]
+	public sealed class ResourceManagerFactoryObjectTests
+	{
+        /// <summary>
+        /// Test basic sunny day usage of the ResourceManagerFactoryObject.
+        /// </summary>
+        [Test]
+        public void CreateResourceManager()
+        {
+            ResourceManagerFactoryObject fac = new ResourceManagerFactoryObject();
+            fac.BaseName = "Spring.Resources.SampleResources";
+            fac.AssemblyName = "Spring.Core.Tests"; 
+            fac.AfterPropertiesSet();
+            Assert.AreEqual( typeof(ResourceManager), fac.ObjectType);
+            object actual = fac.GetObject();
+            Assert.IsNotNull(actual);
+            Assert.AreEqual( typeof(ResourceManager), actual.GetType());
+            ResourceManager rm = (ResourceManager) actual;
+            string message = rm.GetString("message");
+            Assert.AreEqual("Hello {0} {1}", message);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void MissingBaseName()
+		{
+			ResourceManagerFactoryObject fac = new ResourceManagerFactoryObject();
+			fac.AfterPropertiesSet();
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void MissingAssemblyName()
+		{
+			ResourceManagerFactoryObject fac = new ResourceManagerFactoryObject();
+			fac.BaseName = "Spring.Resources.SampleResources";
+			fac.AfterPropertiesSet();
+		}
+
+		[Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void WithRubbishAssemblyName()
+		{
+			ResourceManagerFactoryObject fac = new ResourceManagerFactoryObject();
+			fac.BaseName = "Spring.Resources.SampleResources";
+			fac.AssemblyName = "I'mAJumpedUpPantryBoy"; 
+			fac.AfterPropertiesSet();
+		}
+
+		[Test]
+		public void ObjectTypeReallyIsResourceManager()
+		{
+			Assert.AreEqual(typeof (ResourceManager), new ResourceManagerFactoryObject().ObjectType);
+		}
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RuntimeObjectReferenceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RuntimeObjectReferenceTests.cs
new file mode 100644
index 00000000..8857605a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/RuntimeObjectReferenceTests.cs
@@ -0,0 +1,48 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the RuntimeObjectReference class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: RuntimeObjectReferenceTests.cs,v 1.2 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class RuntimeObjectReferenceTests
+    {
+        [Test]
+        public void InstantiationIsImplictlyNotToParent()
+		{
+			RuntimeObjectReference ror = new RuntimeObjectReference("foo");
+			Assert.IsFalse(ror.IsToParent,
+				"IsToParent property must default to false if not " +
+				"using the explicit variant of the ctor.");
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SetFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SetFactoryObjectTests.cs
new file mode 100644
index 00000000..2628f3f8
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SetFactoryObjectTests.cs
@@ -0,0 +1,95 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Collections;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the SetFactoryObject class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: SetFactoryObjectTests.cs,v 1.2 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class SetFactoryObjectTests
+    {
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The Type passed to the TargetSetType property must implement the 'Spring.Collections.ISet' interface.")]
+		public void SetTargetSetTypeToNonSetType()
+		{
+			SetFactoryObject lfo = new SetFactoryObject();
+			lfo.TargetSetType = typeof (ICollection);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The Type passed to the TargetSetType property cannot be an interface; it must be a concrete class that implements the 'Spring.Collections.ISet' interface.")]
+		public void SetTargetSetTypeToDerivedISetInterfaceType()
+		{
+			SetFactoryObject lfo = new SetFactoryObject();
+			lfo.TargetSetType = typeof (IExtendedSet);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The Type passed to the TargetSetType property cannot be abstract (MustInherit in VisualBasic.NET); it must be a concrete class that implements the 'Spring.Collections.ISet' interface.")]
+		public void SetTargetSetTypeToAbstractISetInterfaceType()
+		{
+			SetFactoryObject lfo = new SetFactoryObject();
+			lfo.TargetSetType = typeof (AbstractSet);
+		}
+
+		private interface IExtendedSet : ISet
+		{
+		}
+
+		private abstract class AbstractSet : HybridSet
+		{
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void SetTargetSetTypeToNull()
+		{
+			SetFactoryObject lfo = new SetFactoryObject();
+			lfo.TargetSetType = null;
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "The 'SourceSet' property cannot be null (Nothing in Visual Basic.NET).")]
+		public void GetObjectWithoutSupplyingASourceSet()
+		{
+			SetFactoryObject lfo = new SetFactoryObject();
+			lfo.IsSingleton = false;
+			lfo.GetObject();
+		}
+
+		[Test]
+		public void ObjectTypeReallyIsISet()
+		{
+			Assert.AreEqual(typeof (ISet), new SetFactoryObject().ObjectType);
+		}
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SpecialFolderVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SpecialFolderVariableSourceTests.cs
new file mode 100644
index 00000000..abc8229c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SpecialFolderVariableSourceTests.cs
@@ -0,0 +1,58 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Microsoft.Win32;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+    /// Unit tests for the SpecialFolderVariableSource class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: SpecialFolderVariableSourceTests.cs,v 1.1 2007/03/10 01:44:40 aseovic Exp $</version>
+    [TestFixture]
+    public sealed class SpecialFolderVariableSourceTests
+    {
+        [Test]
+        public void TestVariablesResolution()
+        {
+            SpecialFolderVariableSource vs = new SpecialFolderVariableSource();
+
+            // existing vars
+            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                            vs.ResolveVariable("ApplicationData"));
+            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory),
+                            vs.ResolveVariable("desktopDirectory"));
+            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles),
+                            vs.ResolveVariable("programFiles"));
+            Assert.AreEqual(Environment.GetFolderPath(Environment.SpecialFolder.Personal),
+                            vs.ResolveVariable("personal"));
+
+            // non-existant variable
+            Assert.IsNull(vs.ResolveVariable("dummy"));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypeAliasConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypeAliasConfigurerTests.cs
new file mode 100644
index 00000000..c070f2e6
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypeAliasConfigurerTests.cs
@@ -0,0 +1,138 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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.Collections;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Collections;
+using Spring.Context.Support;
+using Spring.Core.TypeResolution;
+using Spring.Util;
+using Spring.Objects.Factory.Support;
+using Spring.Context;
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Unit tests for the TypeAliasConfigurer class
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    [TestFixture]
+    public class TypeAliasConfigurerTests
+    {
+        [Test]
+        public void Serialization()
+        {
+            IDictionary typeAliases = new Hashtable();
+            typeAliases.Add("LinkedList", typeof(LinkedList));
+
+            TypeAliasConfigurer typeAliasConfigurer = new TypeAliasConfigurer();
+            typeAliasConfigurer.TypeAliases = typeAliases;
+
+            typeAliasConfigurer.Order = 1;
+
+            SerializationTestUtils.SerializeAndDeserialize(typeAliasConfigurer);
+        }
+
+        [Test]
+		[ExpectedException(typeof(ObjectInitializationException))]
+        public void UseInvalidTypeForDictionaryValue()
+        {
+            IDictionary typeAliases = new Hashtable();
+            typeAliases.Add("LinkedList", new LinkedList());
+
+            TypeAliasConfigurer typeAliasConfigurer = new TypeAliasConfigurer();
+            typeAliasConfigurer.TypeAliases = typeAliases;
+
+            typeAliasConfigurer.PostProcessObjectFactory((IConfigurableListableObjectFactory)new DynamicMock(typeof(IConfigurableListableObjectFactory)).Object);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectInitializationException))]
+        public void UseNonResolvableTypeForDictionaryValue()
+        {
+            IDictionary typeAliases = new Hashtable();
+            typeAliases.Add("LinkedList", "Spring.Collections.LinkkkedList");
+
+            TypeAliasConfigurer typeAliasConfigurer = new TypeAliasConfigurer();
+            typeAliasConfigurer.TypeAliases = typeAliases;
+
+            typeAliasConfigurer.PostProcessObjectFactory((IConfigurableListableObjectFactory)new DynamicMock(typeof(IConfigurableListableObjectFactory)).Object);
+        }
+
+        [Test]
+        public void SunnyDayScenarioUsingType()
+        {
+            IDictionary typeAliases = new Hashtable();
+            typeAliases.Add("LinkedList", typeof(LinkedList));
+
+            CreateConfigurerAndTestLinkedList(typeAliases);
+        }
+
+        [Test]
+        public void SunnyDayScenarioUsingTypeString()
+        {
+            IDictionary typeAliases = new Hashtable();
+            typeAliases.Add("LinkedList", "Spring.Collections.LinkedList, Spring.Core");
+            CreateConfigurerAndTestLinkedList(typeAliases);
+        }
+
+        [Test]
+        public void WithinApplicationContext()
+        {
+            IApplicationContext ctx = new XmlApplicationContext(
+                "file://Spring/Objects/Factory/Config/typeAliases.xml");
+
+            object obj1 = ctx.GetObject("testObject1");
+            Assert.IsNotNull(obj1);
+            Assert.AreEqual(typeof(TestObject), obj1.GetType());
+
+            object obj2 = ctx.GetObject("testObject2");
+            Assert.IsNotNull(obj2);
+            Assert.AreEqual(typeof(TestObject), obj2.GetType());
+
+            object obj3 = ctx.GetObject("testObject3");
+            Assert.IsNotNull(obj3);
+            Assert.AreEqual(typeof(TestObject), obj3.GetType());
+            Assert.AreEqual("Bruno", ((TestObject)obj3).Name);
+            Assert.AreEqual(26, ((TestObject)obj3).Age);
+        }
+
+        private static void CreateConfigurerAndTestLinkedList(IDictionary typeAliases)
+        {
+            TypeAliasConfigurer typeAliasConfigurer = new TypeAliasConfigurer();
+            typeAliasConfigurer.TypeAliases = typeAliases;
+
+            typeAliasConfigurer.Order = 1;
+            
+
+            typeAliasConfigurer.PostProcessObjectFactory((IConfigurableListableObjectFactory)new DynamicMock(typeof(IConfigurableListableObjectFactory)).Object);
+
+            //todo investigate mocking the typeregistry, for now ask the actual one for information.
+            Assert.IsTrue(TypeRegistry.ContainsAlias("LinkedList"),
+                          "TypeAliasConfigurer did not register a type alias with the TypeRegistry");
+
+            Type linkedListType = TypeRegistry.ResolveType("LinkedList");
+            Assert.IsTrue(linkedListType.Equals(typeof(LinkedList)), "Incorrect type resolved.");
+            Assert.AreEqual(1,typeAliasConfigurer.Order);
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypedStringValueTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypedStringValueTests.cs
new file mode 100644
index 00000000..ccbef7d4
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypedStringValueTests.cs
@@ -0,0 +1,93 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+	/// <summary>
+	/// Unit tests for the TypedStringValue class.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: TypedStringValueTests.cs,v 1.4 2007/05/29 20:00:47 markpollack Exp $</version> 
+	[TestFixture]
+	public sealed class TypedStringValueTests
+	{
+		[Test]
+		public void Instantiation()
+		{
+			string expectedNow = DateTime.Now.ToShortDateString();
+			TypedStringValue tsv = new TypedStringValue(expectedNow, typeof (DateTime));
+			Assert.AreEqual(expectedNow, tsv.Value);
+			Assert.AreEqual(typeof (DateTime), tsv.TargetType);
+            tsv = new TypedStringValue(expectedNow);
+            Assert.AreEqual(expectedNow, tsv.Value);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithNullType()
+		{
+			new TypedStringValue(string.Empty, null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void SetTargetTypePropertyToNullType()
+		{
+			TypedStringValue tsv = new TypedStringValue(string.Empty, typeof (DateTime));
+			tsv.TargetType = null;
+		}
+
+		[Test]
+		public void IsSerializable()
+		{
+			Assert.IsTrue(SerializationTestUtils.IsSerializable(new TypedStringValue()),
+				"Must be marked as [Serializable].");
+		}
+
+		[Test]
+		public void Serialization()
+		{
+			TypedStringValue value = new TypedStringValue();
+			Type expectedType = typeof(string);
+			value.TargetType = expectedType;
+			const string expectedValue = "rilo-kiley";
+			value.Value = expectedValue;
+
+			object foo = SerializationTestUtils.SerializeAndDeserialize(value);
+			Assert.IsNotNull(foo, "Serialization roundtrip must never result in null.");
+			TypedStringValue deser = foo as TypedStringValue;
+			Assert.IsNotNull(deser,
+				"Serialization roundtrip yielded the wrong Type of object.");
+			Assert.AreEqual(expectedType, deser.TargetType,
+				"Serialization roundtrip yielded the wrong TargetType.");
+			Assert.AreEqual(expectedValue, deser.Value,
+				"Serialization roundtrip yielded the wrong Value.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariableAccessorTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariableAccessorTests.cs
new file mode 100644
index 00000000..7b01ebb5
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariableAccessorTests.cs
@@ -0,0 +1,265 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// Tests <see cref="VariableAccessor"/> functionality.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: VariableAccessorTests.cs,v 1.1 2007/08/22 20:17:05 oakinger Exp $</version>
+    [TestFixture]
+    public class VariableAccessorTests
+    {
+        private static readonly Guid TESTGUID = Guid.NewGuid();
+        private static readonly Guid TESTGUID_DEFAULT = Guid.NewGuid();
+
+        private static readonly DateTime TESTDATETIME = new DateTime(2007, 07, 06, 11, 12, 13);
+        private static readonly DateTime TESTDATETIME_DEFAULT = TESTDATETIME.AddDays(-1);
+        
+        private class NameValueCollectionVariableSource : IVariableSource
+        {
+            private readonly NameValueCollection nameValues = new NameValueCollection();
+
+            public NameValueCollectionVariableSource Add(string name, string value)
+            {
+                nameValues.Add(name, value);
+                return this;
+            }
+
+            public string ResolveVariable(string name)
+            {
+                return nameValues.Get(name);
+            }
+        }
+
+        private readonly IVariableSource _testVariableSource = new NameValueCollectionVariableSource()
+            .Add("ValidString", "String")
+            .Add("EmptyString", "")
+            .Add("ValidChar", "c")
+            .Add("InvalidChar", "12")
+            .Add("ValidBoolean", "true")
+            .Add("InvalidBoolean", "")
+            .Add("ValidByte", "1")
+            .Add("InvalidByte", "")
+            .Add("ValidInt16", "1")
+            .Add("InvalidInt16", "")
+            .Add("ValidInt32", "1")
+            .Add("InvalidInt32", "")
+            .Add("ValidInt64", "1")
+            .Add("InvalidInt64", "")
+            .Add("ValidFloat", "1")
+            .Add("InvalidFloat", "")
+            .Add("ValidDouble", "1")
+            .Add("InvalidDouble", "")
+            .Add("ValidDecimal", "1")
+            .Add("InvalidDecimal", "")
+            .Add("ValidGuid", TESTGUID.ToString())
+            .Add("InvalidGuid", "")
+            .Add("ValidDateTime", TESTDATETIME.ToString())
+            .Add("InvalidDateTime", "blabla")
+            .Add("ValidDateTimeUtcRoundtripFormatted", TESTDATETIME.ToUniversalTime().ToString("u"))
+            ;
+
+        [Test]
+        public void AcceptsNullVariableSource()
+        {
+            VariableAccessor va = new VariableAccessor(null);
+            Assert.AreEqual("default", va.GetString("somekey", "default"));
+        }
+
+        [Test]
+        public void GetString()
+        {
+            VariableAccessor va = new VariableAccessor(_testVariableSource);
+            Assert.AreEqual("String", va.GetString("ValidString", "DefaultString"));
+            Assert.AreEqual("DefaultString", va.GetString("NonExistingString", "DefaultString"));
+        }
+
+        [Test]
+        public void GetStringIgnoresEmptyString()
+        {
+            VariableAccessor va = new VariableAccessor(_testVariableSource);
+            Assert.AreEqual("DefaultString", va.GetString("EmptyString", "DefaultString"));
+        }
+
+        [Test]
+        public void GetChar()
+        {
+            VariableAccessor va = new VariableAccessor(_testVariableSource);
+            Assert.AreEqual('c', va.GetChar("ValidChar", 'a'));
+            Assert.AreEqual('a', va.GetChar("InvalidChar", 'a', false));
+            try
+            {
+                va.GetChar("InvalidChar", 'a', true);
+                Assert.Fail();
+            }
+            catch { }
+        }
+
+        [Test]
+        public void GetBoolean()
+        {
+            VariableAccessor va = new VariableAccessor(_testVariableSource);
+            Assert.AreEqual(true, va.GetBoolean("ValidBoolean", false));
+            Assert.AreEqual(true, va.GetBoolean("InvalidBoolean", true, false));
+            try
+            {
+                va.GetBoolean("InvalidBoolean", true, true);
+                Assert.Fail();
+            }catch {}
+        }
+
+        [Test]
+        public void GetByte()
+        {
+            VariableAccessor va = new VariableAccessor(_testVariableSource);
+            Assert.AreEqual((byte)1, va.GetByte("ValidByte", 2));
+            Assert.AreEqual((byte)2, va.GetByte("InvalidByte", 2, false));
+            try
+            {
+                va.GetByte("InvalidByte", 2, true);
+                Assert.Fail();
+            }
+            catch { }
+        }
+
+        [Test]
+        public void GetInt16()
+        {
+            VariableAccessor va = new VariableAccessor(_testVariableSource);
+            Assert.AreEqual((short)1, va.GetInt16("ValidInt16", 2));
+            Assert.AreEqual((short)2, va.GetInt16("InvalidInt16", 2, false));
+            try
+            {
+                va.GetInt16("InvalidInt16", 2, true);
+                Assert.Fail();
+            }
+            catch { }
+        }
+
+        [Test]
+        public void GetInt32()
+        {
+            VariableAccessor va = new VariableAccessor(_testVariableSource);
+            Assert.AreEqual((int)1, va.GetInt32("ValidInt32", 2));
+            Assert.AreEqual((int)2, va.GetInt32("InvalidInt32", 2, false));
+            try
+            {
+                va.GetInt32("InvalidInt32", 2, true);
+                Assert.Fail();
+            }
+            catch { }
+        }
+
+        [Test]
+        public void GetInt64()
+        {
+            VariableAccessor va = new VariableAccessor(_testVariableSource);
+            Assert.AreEqual((long)1, va.GetInt64("ValidInt64", 2));
+            Assert.AreEqual((long)2, va.GetInt64("InvalidInt64", 2, false));
+            try
+            {
+                va.GetInt64("InvalidInt64", 2, true);
+                Assert.Fail();
+            }
+            catch { }
+        }
+
+        [Test]
+        public void GetFloat()
+        {
+            VariableAccessor va = new VariableAccessor(_testVariableSource);
+            Assert.AreEqual((float)1, va.GetFloat("ValidFloat", 2.0f));
+            Assert.AreEqual((float)2, va.GetFloat("InvalidFloat", 2.0f, false));
+            try
+            {
+                va.GetFloat("InvalidFloat", 2, true);
+                Assert.Fail();
+            }
+            catch { }
+        }
+
+        [Test]
+        public void GetDouble()
+        {
+            VariableAccessor va = new VariableAccessor(_testVariableSource);
+            Assert.AreEqual((double)1, va.GetDouble("ValidDouble", 2.0));
+            Assert.AreEqual((double)2, va.GetDouble("InvalidDouble", 2.0, false));
+            try
+            {
+                va.GetDouble("InvalidDouble", 2, true);
+                Assert.Fail();
+            }
+            catch { }
+        }
+
+        [Test]
+        public void GetDecimal()
+        {
+            VariableAccessor va = new VariableAccessor(_testVariableSource);
+            Assert.AreEqual((decimal)1, va.GetDecimal("ValidDecimal", 2.0m));
+            Assert.AreEqual((decimal)2, va.GetDecimal("InvalidDecimal", 2.0m, false));
+            try
+            {
+                va.GetDecimal("InvalidDecimal", 2, true);
+                Assert.Fail();
+            }
+            catch { }
+        }
+
+        [Test]
+        public void GetGuid()
+        {
+            VariableAccessor va = new VariableAccessor(_testVariableSource);
+            Assert.AreEqual(TESTGUID, va.GetGuid("ValidGuid", TESTGUID_DEFAULT));
+            Assert.AreEqual(TESTGUID_DEFAULT, va.GetGuid("InvalidGuid", TESTGUID_DEFAULT, false));
+            try
+            {
+                va.GetGuid("InvalidGuid", TESTGUID_DEFAULT, true);
+                Assert.Fail();
+            }
+            catch { }
+        }
+
+        [Test]
+        public void GetDateTime()
+        {
+            VariableAccessor va = new VariableAccessor(_testVariableSource);
+            Assert.AreEqual(TESTDATETIME, va.GetDateTime("ValidDateTime", null, TESTDATETIME_DEFAULT));
+            Assert.AreEqual(TESTDATETIME.ToUniversalTime(), va.GetDateTime("ValidDateTimeUtcRoundtripFormatted", "u", TESTDATETIME_DEFAULT));
+            Assert.AreEqual(TESTDATETIME_DEFAULT, va.GetDateTime("InvalidDateTime", null, TESTDATETIME_DEFAULT, false));
+            try
+            {
+                va.GetDateTime("InvalidDateTime", null, TESTDATETIME_DEFAULT, true);
+                Assert.Fail();
+            }
+            catch { }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariablePlaceholderConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariablePlaceholderConfigurerTests.cs
new file mode 100644
index 00000000..bc48482a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariablePlaceholderConfigurerTests.cs
@@ -0,0 +1,78 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System.Collections;
+using NUnit.Framework;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Config
+{
+    /// <summary>
+    /// This calss contains tests for 
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: VariablePlaceholderConfigurerTests.cs,v 1.1 2007/07/10 05:48:43 markpollack Exp $</version>
+    [TestFixture]
+    public class VariablePlaceholderConfigurerTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+        }
+
+        [Test]
+        public void SunnyDay()
+        {
+            StaticApplicationContext ac = new StaticApplicationContext();
+
+            MutablePropertyValues pvs = new MutablePropertyValues();
+            pvs.Add("age", "${maxResults}");
+            pvs.Add("name", "${name}");
+            ac.RegisterSingleton("tb1", typeof(TestObject), pvs);
+
+            IList variableSources = new ArrayList();
+            CommandLineArgsVariableSource vs1 = new CommandLineArgsVariableSource(
+                new string[] { "program.exe", "file.txt", "/name:Aleks Seovic", "/framework:Spring.NET" });
+            variableSources.Add(vs1);
+
+            ConfigSectionVariableSource vs2 = new ConfigSectionVariableSource();
+            vs2.SectionName = "DaoConfiguration";
+            variableSources.Add(vs2);
+
+
+            pvs = new MutablePropertyValues();
+            pvs.Add("VariableSources", variableSources);
+            
+            ac.RegisterSingleton("configurer", typeof(VariablePlaceholderConfigurer), pvs);
+            ac.Refresh();
+
+            TestObject tb1 = (TestObject)ac.GetObject("tb1");
+            Assert.AreEqual(1000, tb1.Age);
+            Assert.AreEqual("Aleks Seovic", tb1.Name);
+
+        }
+
+        
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryPerfTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryPerfTests.cs
new file mode 100644
index 00000000..2ae2f3e8
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryPerfTests.cs
@@ -0,0 +1,249 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Diagnostics;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Threading;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+    /// <summary>
+    /// This class contains tests related to performance of the object factory implementation.  Ignored by default.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: DefaultListableObjectFactoryPerfTests.cs,v 1.1 2008/01/29 20:11:19 markpollack Exp $</version>
+    [TestFixture]
+    public class DefaultListableObjectFactoryPerfTests
+    {
+
+        private DateTime start, stop;
+
+        [SetUp]
+        public void Setup()
+        {
+        }
+
+        [Test]
+        [Ignore]
+        public void Test()
+        {
+            int numIterations = 10000;
+            start = DateTime.Now;
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            InitFactory(factory);
+            for (int i = 0; i < numIterations; i++)
+            {
+              FFoo foo = (FFoo)factory.GetObject("foo");
+            }
+            stop = DateTime.Now;
+            double timeElapsed = Elapsed;
+            PrintTest("Creations", numIterations, timeElapsed);
+
+
+        }
+
+        private void InitFactory(DefaultListableObjectFactory factory)
+        {
+            Console.WriteLine("init factory");
+            RootObjectDefinition tee = new RootObjectDefinition(typeof(Tee), true);
+            tee.IsLazyInit = true;
+            ConstructorArgumentValues teeValues = new ConstructorArgumentValues();
+            teeValues.AddGenericArgumentValue("test");
+            tee.ConstructorArgumentValues = teeValues;
+
+            RootObjectDefinition bar = new RootObjectDefinition(typeof(BBar), false);
+            ConstructorArgumentValues barValues = new ConstructorArgumentValues();
+            barValues.AddGenericArgumentValue(new RuntimeObjectReference("tee"));
+            barValues.AddGenericArgumentValue(5);
+            bar.ConstructorArgumentValues = barValues;
+
+            RootObjectDefinition foo = new RootObjectDefinition(typeof(FFoo), false);
+            MutablePropertyValues fooValues = new MutablePropertyValues();
+            fooValues.Add("i", 5);
+            fooValues.Add("bar", new RuntimeObjectReference("bar"));
+            fooValues.Add("copy", new RuntimeObjectReference("bar"));
+            fooValues.Add("s", "test");
+            foo.PropertyValues = fooValues;
+
+            factory.RegisterObjectDefinition("foo", foo);
+            factory.RegisterObjectDefinition("bar", bar);
+            factory.RegisterObjectDefinition("tee", tee);
+        }
+
+
+        private double Elapsed
+        {
+            get { return (stop.Ticks - start.Ticks) / 10000000f; }
+        }
+
+        private static void PrintTest(string name, int iterations, double duration)
+        {
+            Debug.WriteLine(
+                String.Format("{0,-60} {1,12:#,###} {2,12:##0.000} {3,12:#,###}", name, iterations, duration,
+                              iterations / duration));
+        }
+
+
+    }
+
+    public class BeanFactoryTask : AsyncTestTask
+    {
+        DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+
+        public BeanFactoryTask(int iterations)
+            : base(iterations)
+        {
+            InitializeFactory();
+            FFoo foo = (FFoo)factory.GetObject("foo");
+            Assert.AreEqual(5, foo.i);
+            Assert.AreEqual("test", foo.s);
+            Assert.AreSame(foo.bar.tee, foo.copy.tee);
+            Assert.AreEqual(5, foo.bar.i);
+            Assert.AreEqual("test", foo.bar.Tee.S);
+        }
+
+        private void InitializeFactory()
+        {
+            Console.WriteLine("init factory");
+            RootObjectDefinition tee = new RootObjectDefinition(typeof(Tee), true);
+            tee.IsLazyInit = true;
+            ConstructorArgumentValues teeValues = new ConstructorArgumentValues();
+            teeValues.AddGenericArgumentValue("test");
+            tee.ConstructorArgumentValues = teeValues;
+
+            RootObjectDefinition bar = new RootObjectDefinition(typeof(BBar), false);
+            ConstructorArgumentValues barValues = new ConstructorArgumentValues();
+            barValues.AddGenericArgumentValue(new RuntimeObjectReference("tee"));
+            barValues.AddGenericArgumentValue(5);
+            bar.ConstructorArgumentValues = barValues;
+
+            RootObjectDefinition foo = new RootObjectDefinition(typeof(FFoo), false);
+            MutablePropertyValues fooValues = new MutablePropertyValues();
+            fooValues.Add("i", 5);
+            fooValues.Add("bar", new RuntimeObjectReference("bar"));
+            fooValues.Add("copy", new RuntimeObjectReference("bar"));
+            fooValues.Add("s", "test");
+            foo.PropertyValues = fooValues;
+
+            factory.RegisterObjectDefinition("foo", foo);
+            factory.RegisterObjectDefinition("bar", bar);
+            factory.RegisterObjectDefinition("tee", tee);
+
+        }
+
+        public override void DoExecute()
+        {
+            FFoo foo = (FFoo)factory.GetObject("foo");
+        }
+    }
+
+    public interface ITee
+    {
+        string S
+        { get; }
+    }
+
+    public class Tee : ITee
+    {
+        private string s;
+
+        public Tee(string s)
+        {
+            this.s = s;
+        }
+
+        public string S
+        {
+            get { return s; }
+        }
+    }
+
+    public interface IBBar
+    {
+        ITee Tee
+        {
+            get;
+        }
+
+        int I
+        {
+            get;
+        }
+    }
+
+    public class BBar : IBBar
+    {
+        public Tee tee;
+        public int i;
+
+        public BBar(Tee tee, int i)
+        {
+            this.tee = tee;
+            this.i = i;
+        }
+
+        public ITee Tee
+        {
+            get { return tee; }
+        }
+
+        public int I
+        {
+            get { return i; }
+        }
+
+    }
+
+    public class FFoo
+    {
+        public BBar bar;
+        public BBar copy;
+        public string s;
+        public int i;
+
+        public int I
+        {
+            set { i = value; }
+        }
+
+
+        public BBar Bar
+        {
+            set { bar = value; }
+        }
+
+        public BBar Copy
+        {
+            set { copy = value; }
+        }
+
+        public string S
+        {
+            set { s = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs
new file mode 100644
index 00000000..7e4791d4
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs
@@ -0,0 +1,1458 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Reflection;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Core.TypeConversion;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Unit tests for the DefaultListableObjectFactory class.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	[TestFixture]
+	public sealed class DefaultListableObjectFactoryTests
+	{
+	    /// <summary>
+		/// The setup logic executed before the execution of this test fixture.
+		/// </summary>
+		[TestFixtureSetUp]
+		public void FixtureSetUp()
+		{
+			// enable (null appender) logging, just to ensure that the logging code is correct :D
+			//XmlConfigurator.Configure();
+		}
+
+		[Test(Description="http://opensource2.atlassian.com/projects/spring/browse/SPRNET-112")]
+		public void ObjectCreatedViaStaticFactoryMethodUsesReturnTypeOfFactoryMethodAsTheObjectType()
+		{
+			RootObjectDefinition def
+				= new RootObjectDefinition(typeof(TestObjectCreator));
+			def.FactoryMethodName = "CreateTestObject";
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			lof.RegisterObjectDefinition("factoryObject", def);
+			IDictionary objs = lof.GetObjectsOfType(typeof(TestObject));
+			Assert.AreEqual(1, objs.Count);
+		}
+
+		[Test(Description="http://opensource2.atlassian.com/projects/spring/browse/SPRNET-112")]
+		public void ObjectCreatedViaInstanceFactoryMethodUsesReturnTypeOfFactoryMethodAsTheObjectType()
+		{
+			RootObjectDefinition def
+				= new RootObjectDefinition(typeof(TestObjectCreator));
+			def.FactoryMethodName = "InstanceCreateTestObject";
+			def.FactoryObjectName = "target";
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			lof.RegisterObjectDefinition("factoryObject", def);
+			lof.RegisterObjectDefinition("target", new RootObjectDefinition(typeof(TestObjectCreator)));
+			IDictionary objs = lof.GetObjectsOfType(typeof(TestObject));
+			Assert.AreEqual(1, objs.Count);
+		}
+#if NET_2_0
+        [Test(Description="http://opensource2.atlassian.com/projects/spring/browse/SPRNET-112")]
+        public void ObjectCreatedViaStaticGenericFactoryMethodUsesReturnTypeOfGenericFactoryMethodAsTheObjectType()
+        {
+            DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+            RootObjectDefinition def
+                = new RootObjectDefinition(typeof(TestGenericObject<int,string>));
+            def.FactoryMethodName = "CreateList<int>";
+            lof.RegisterObjectDefinition("foo", def);
+            IDictionary objs = lof.GetObjectsOfType(typeof(System.Collections.Generic.List<int>));
+            Assert.AreEqual(1, objs.Count);
+        }
+
+        [Test(Description="http://opensource2.atlassian.com/projects/spring/browse/SPRNET-112")]
+        public void ObjectCreatedViaInstanceGenericFactoryMethodUsesReturnTypeOfGenericFactoryMethodAsTheObjectType()
+        {
+            RootObjectDefinition def
+                = new RootObjectDefinition(typeof(TestObjectCreator));
+            def.FactoryMethodName = "CreateInstance<string,int>";
+            def.FactoryObjectName = "target";
+            DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+            lof.RegisterObjectDefinition("factoryObject", def);
+            lof.RegisterObjectDefinition("target", new RootObjectDefinition(typeof(TestGenericObject<int,string>)));
+            IDictionary objs = lof.GetObjectsOfType(typeof(TestGenericObject<string,int>));
+            Assert.AreEqual(1, objs.Count);
+        }
+#endif
+		/// <summary>
+		/// Object instantiation through factory method should not require type attribute.
+		/// </summary>
+		[Test(Description="http://opensource.atlassian.com/projects/spring/browse/SPRNET-130")]
+		public void SPRNET_130()
+		{
+			const string factoryObjectName = "factoryObject";
+			const string exampleObjectName = "exampleObject";
+
+			RootObjectDefinition factoryObjectDefinition
+				= new RootObjectDefinition(typeof(TestObjectFactory));
+			RootObjectDefinition exampleObjectDefinition = new RootObjectDefinition();
+			exampleObjectDefinition.FactoryObjectName = factoryObjectName;
+			exampleObjectDefinition.FactoryMethodName = "GetObject";
+
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			lof.RegisterObjectDefinition(factoryObjectName, factoryObjectDefinition);
+			lof.RegisterObjectDefinition(exampleObjectName, exampleObjectDefinition);
+
+			object exampleObject = lof.GetObject(exampleObjectName);
+			Assert.IsNotNull(exampleObject);
+			object factoryObject = lof.GetObject(factoryObjectName);
+			Assert.IsNotNull(factoryObject);
+		}
+
+		[Test(Description="http://opensource.atlassian.com/projects/spring/browse/SPR-1011")]
+		public void SPR_1011()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			RootObjectDefinition def
+				= new RootObjectDefinition(
+					typeof (StaticFactoryMethodObject));
+			def.FactoryMethodName = "CreateObject";
+			lof.RegisterObjectDefinition("foo", def);
+			IDictionary objs = lof.GetObjectsOfType(typeof (DBNull));
+			Assert.AreEqual(1, objs.Count,
+			                "Must be looking at the RETURN TYPE of the factory method, " +
+			                	"and hence get one DBNull object back.");
+		}
+
+		private sealed class StaticFactoryMethodObject
+		{
+			private StaticFactoryMethodObject()
+			{
+			}
+
+			public static DBNull CreateObject()
+			{
+				return DBNull.Value;
+			}
+		}
+
+		[Test(Description="http://opensource.atlassian.com/projects/spring/browse/SPR-1077")]
+		public void SPR_1077()
+		{
+			DisposableTestObject sing = null;
+			using (DefaultListableObjectFactory lof = new DefaultListableObjectFactory())
+			{
+				RootObjectDefinition singleton
+					= new RootObjectDefinition(typeof (DisposableTestObject));
+				MutablePropertyValues sprops = new MutablePropertyValues();
+				sprops.Add("name", "Rick");
+				singleton.PropertyValues = sprops;
+				lof.RegisterObjectDefinition("singleton", singleton);
+
+				RootObjectDefinition prototype
+					= new RootObjectDefinition(typeof (TestObject));
+				MutablePropertyValues pprops = new MutablePropertyValues();
+				pprops.Add("name", "Jenny");
+				// prototype has dependency on a singleton...
+				pprops.Add("spouse", new RuntimeObjectReference("singleton"));
+				prototype.PropertyValues = pprops;
+				prototype.IsSingleton = false;
+				lof.RegisterObjectDefinition("prototype", prototype);
+
+				sing = (DisposableTestObject) lof.GetObject("singleton");
+
+				lof.GetObject("prototype");
+				lof.GetObject("prototype");
+				lof.GetObject("prototype");
+				lof.GetObject("prototype");
+			}
+			Assert.AreEqual(1, sing.NumTimesDisposed);
+		}
+
+		private sealed class DisposableTestObject : TestObject, IDisposable
+		{
+			private int _numTimesDisposed;
+
+			public int NumTimesDisposed
+			{
+				get { return _numTimesDisposed; }
+			}
+
+			public void Dispose()
+			{
+				++_numTimesDisposed;
+			}
+		}
+
+		[Test]
+		public void GetObjectPostProcessorCount()
+		{
+			DynamicMock mock1 = new DynamicMock(typeof (IObjectPostProcessor));
+			IObjectPostProcessor proc1 = (IObjectPostProcessor) mock1.Object;
+			DynamicMock mock2 = new DynamicMock(typeof (IObjectPostProcessor));
+			IObjectPostProcessor proc2 = (IObjectPostProcessor) mock2.Object;
+
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+
+			const string errMsg = "Wrong number of IObjectPostProcessors being reported by the ObjectPostProcessorCount property.";
+			Assert.AreEqual(0, lof.ObjectPostProcessorCount, errMsg);
+			lof.AddObjectPostProcessor(proc1);
+			Assert.AreEqual(1, lof.ObjectPostProcessorCount, errMsg);
+			lof.AddObjectPostProcessor(proc2);
+			Assert.AreEqual(2, lof.ObjectPostProcessorCount, errMsg);
+		}
+
+		/// <summary>
+		/// The ObjectPostProcessorCount property must only return the count of
+		/// processors registered with the current factory, and not
+		/// surf up any hierarchy.
+		/// </summary>
+		[Test]
+		public void GetObjectPostProcessorCountDoesntRespectHierarchy()
+		{
+			DynamicMock mock1 = new DynamicMock(typeof (IObjectPostProcessor));
+			IObjectPostProcessor proc1 = (IObjectPostProcessor) mock1.Object;
+			DynamicMock mock2 = new DynamicMock(typeof (IObjectPostProcessor));
+			IObjectPostProcessor proc2 = (IObjectPostProcessor) mock2.Object;
+
+			DefaultListableObjectFactory child = new DefaultListableObjectFactory();
+			DefaultListableObjectFactory parent = new DefaultListableObjectFactory(child);
+
+			const string errMsg = "Wrong number of IObjectPostProcessors being reported by the ObjectPostProcessorCount property.";
+			Assert.AreEqual(0, child.ObjectPostProcessorCount, errMsg);
+			Assert.AreEqual(0, parent.ObjectPostProcessorCount, errMsg);
+			child.AddObjectPostProcessor(proc1);
+			Assert.AreEqual(1, child.ObjectPostProcessorCount, errMsg);
+			Assert.AreEqual(0, parent.ObjectPostProcessorCount, errMsg);
+			parent.AddObjectPostProcessor(proc2);
+			Assert.AreEqual(1, child.ObjectPostProcessorCount, errMsg);
+			Assert.AreEqual(1, parent.ObjectPostProcessorCount, errMsg);
+			child.AddObjectPostProcessor(proc2);
+			Assert.AreEqual(2, child.ObjectPostProcessorCount, errMsg);
+			Assert.AreEqual(1, parent.ObjectPostProcessorCount, errMsg);
+		}
+
+		[Test]
+		public void TestIInstantiationAwareObjectPostProcessorsInterception()
+		{
+			ProxyingInstantiationAwareObjectPostProcessorStub proc
+				= new ProxyingInstantiationAwareObjectPostProcessorStub("TheAgony");
+
+			MutablePropertyValues props = new MutablePropertyValues();
+			props.Add("Name", "Rick");
+			RootObjectDefinition toBeProxied
+				= new RootObjectDefinition(typeof (TestObject), props);
+
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			lof.AddObjectPostProcessor(proc);
+			lof.RegisterObjectDefinition("toBeProxied", toBeProxied);
+
+			object proxy = lof["toBeProxied"];
+			Assert.IsNotNull(proxy);
+			Assert.AreEqual("TheAgony", proxy);
+		}
+
+		[Test]
+		public void TestIInstantiationAwareObjectPostProcessorsPassThrough()
+		{
+			NullInstantiationAwareObjectPostProcessorStub proc
+				= new NullInstantiationAwareObjectPostProcessorStub();
+
+			MutablePropertyValues props = new MutablePropertyValues();
+			props.Add("Name", "Rick");
+			RootObjectDefinition not
+				= new RootObjectDefinition(typeof (TestObject), props);
+
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			lof.AddObjectPostProcessor(proc);
+			lof.RegisterObjectDefinition("notToBeProxied", not);
+
+			object foo = lof["notToBeProxied"];
+			Assert.IsNotNull(foo);
+			Assert.AreEqual(typeof (TestObject), foo.GetType());
+			TestObject to = (TestObject) foo;
+			Assert.AreEqual("Rick", to.Name);
+		}
+
+		private sealed class NullInstantiationAwareObjectPostProcessorStub
+			: IInstantiationAwareObjectPostProcessor
+		{
+			public NullInstantiationAwareObjectPostProcessorStub()
+			{
+			}
+
+			public object PostProcessBeforeInitialization(object obj, string name)
+			{
+				return obj;
+			}
+
+			public object PostProcessBeforeInstantiation(Type objectType, string objectName)
+			{
+                //proceed with default instantiation
+				return null;
+			}
+
+		    public bool PostProcessAfterInstantiation(object objectInstance, string objectName)
+		    {
+                //proceed to set properties on the object
+		        return true;
+		    }
+
+		    #region IInstantiationAwareObjectPostProcessor Members
+
+		    public IPropertyValues PostProcessPropertyValues(IPropertyValues pvs, PropertyInfo[] pis, object objectInstance,
+		                                                     string objectName)
+		    {
+		        return pvs;
+		    }
+
+		    #endregion
+
+		    public object PostProcessAfterInitialization(object obj, string objectName)
+			{
+				return obj;
+			}
+		}
+
+		private sealed class ProxyingInstantiationAwareObjectPostProcessorStub
+			: IInstantiationAwareObjectPostProcessor
+		{
+			public ProxyingInstantiationAwareObjectPostProcessorStub()
+			{
+			}
+
+			public ProxyingInstantiationAwareObjectPostProcessorStub(object proxy)
+			{
+				_proxy = proxy;
+			}
+
+			private object _proxy;
+
+			public object Proxy
+			{
+				get { return _proxy; }
+				set { _proxy = value; }
+			}
+
+			public object PostProcessBeforeInitialization(object obj, string name)
+			{
+				throw new NotImplementedException();
+			}
+
+			public object PostProcessBeforeInstantiation(Type objectType, string objectName)
+			{
+				return _proxy;
+			}
+
+		    public bool PostProcessAfterInstantiation(object objectInstance, string objectName)
+		    {
+		        return true;
+		    }
+
+		    #region IInstantiationAwareObjectPostProcessor Members
+
+		    public IPropertyValues PostProcessPropertyValues(IPropertyValues pvs, PropertyInfo[] pis, object objectInstance,
+		                                                     string objectName)
+		    {
+		        return pvs;
+		    }
+
+		    #endregion
+
+		    public object PostProcessAfterInitialization(object obj, string objectName)
+			{
+				throw new NotImplementedException();
+			}
+		}
+
+		[Test]
+		public void PreInstantiateSingletonsMustNotIgnoreObjectsWithUnresolvedObjectTypes()
+		{
+			KnowsIfInstantiated.ClearInstantiationRecord();
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			Assert.IsTrue(!KnowsIfInstantiated.WasInstantiated, "Singleton appears to be instantiated before the test is even run.");
+			RootObjectDefinition def = new RootObjectDefinition();
+			def.ObjectTypeName = typeof (KnowsIfInstantiated).FullName;
+			lof.RegisterObjectDefinition("x1", def);
+			Assert.IsTrue(!KnowsIfInstantiated.WasInstantiated, "Singleton appears to be instantiated before PreInstantiateSingletons() is invoked.");
+			lof.PreInstantiateSingletons();
+			Assert.IsTrue(KnowsIfInstantiated.WasInstantiated, "Singleton was not instantiated by the container (it must be).");
+		}
+
+		[Test]
+		public void LazyInitialization()
+		{
+			KnowsIfInstantiated.ClearInstantiationRecord();
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+
+			RootObjectDefinition def = new RootObjectDefinition();
+			def.ObjectTypeName = typeof (KnowsIfInstantiated).FullName;
+			def.IsLazyInit = true;
+			lof.RegisterObjectDefinition("x1", def);
+
+			Assert.IsTrue(!KnowsIfInstantiated.WasInstantiated, "Singleton appears to be instantiated before the test is even run.");
+			lof.RegisterObjectDefinition("x1", def);
+			Assert.IsTrue(!KnowsIfInstantiated.WasInstantiated, "Singleton appears to be instantiated before PreInstantiateSingletons() is invoked.");
+			lof.PreInstantiateSingletons();
+			Assert.IsFalse(KnowsIfInstantiated.WasInstantiated, "Singleton was instantiated by the container (it must NOT be 'cos LazyInit was set to TRUE).");
+			lof.GetObject("x1");
+			Assert.IsTrue(KnowsIfInstantiated.WasInstantiated, "Singleton was not instantiated by the container (it must be).");
+		}
+
+		[Test]
+		public void SingletonFactoryObjectMustNotCreatePrototypeOnPreInstantiateSingletonsCall()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+
+			RootObjectDefinition def = new RootObjectDefinition();
+			def.ObjectType = typeof (DummyFactory);
+			def.IsSingleton = true;
+			def.PropertyValues.Add("IsSingleton", false);
+
+			DummyFactory.Reset();
+
+			Assert.IsFalse(DummyFactory.WasPrototypeCreated,
+			               "Prototype appears to be instantiated before the test is even run.");
+			lof.RegisterObjectDefinition("x1", def);
+			Assert.IsFalse(DummyFactory.WasPrototypeCreated,
+			               "Prototype instantiated after object definition registration (must NOT be).");
+			lof.PreInstantiateSingletons();
+			Assert.IsFalse(DummyFactory.WasPrototypeCreated,
+			               "Prototype instantiated after call to PreInstantiateSingletons(); must NOT be.");
+			lof.GetObject("x1");
+			Assert.IsTrue(DummyFactory.WasPrototypeCreated, "Prototype was not instantiated.");
+		}
+
+		[Test]
+		public void Empty()
+		{
+			IListableObjectFactory lof = new DefaultListableObjectFactory();
+			Assert.IsTrue(lof.GetObjectDefinitionNames() != null, "No objects defined --> array != null");
+			Assert.IsTrue(lof.GetObjectDefinitionNames().Length == 0, "No objects defined after no arg constructor");
+			Assert.IsTrue(lof.ObjectDefinitionCount == 0, "No objects defined after no arg constructor");
+		}
+
+		[Test]
+		public void ObjectDefinitionCountIsZeroBeforeAnythingIsRegistered()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			Assert.AreEqual(0, lof.ObjectDefinitionCount, "No objects must be defined straight off the bat.");
+		}
+
+		[Test]
+		public void ObjectDefinitionOverriding()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			lof.RegisterObjectDefinition("test", new RootObjectDefinition(typeof (TestObject), null));
+			lof.RegisterObjectDefinition("test", new RootObjectDefinition(typeof (NestedTestObject), null));
+			Assert.IsTrue(lof.GetObject("test") is NestedTestObject);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ObjectDefinitionStoreException))]
+		public void ObjectDefinitionOverridingNotAllowed()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			lof.AllowObjectDefinitionOverriding = false;
+			lof.RegisterObjectDefinition("test", new RootObjectDefinition(typeof (TestObject), null));
+			lof.RegisterObjectDefinition("test", new RootObjectDefinition(typeof (NestedTestObject), null));
+		}
+
+		[Test]
+		public void CustomEditor()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			NumberFormatInfo nfi = new CultureInfo("en-GB", false).NumberFormat;
+			lof.RegisterCustomConverter(typeof (Single), new CustomNumberConverter(typeof (Single), nfi, true));
+			MutablePropertyValues pvs = new MutablePropertyValues();
+			pvs.Add("myFloat", "1.1");
+			lof.RegisterObjectDefinition("testObject", new RootObjectDefinition(typeof (TestObject), pvs));
+			TestObject testObject = (TestObject) lof.GetObject("testObject");
+			Assert.IsTrue(testObject.MyFloat == 1.1f);
+		}
+
+		[Test]
+		public void RegisterExistingSingletonWithReference()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+
+			RootObjectDefinition def = new RootObjectDefinition();
+			def.ObjectType = typeof (TestObject);
+			def.PropertyValues.Add("Name", "Rick");
+			def.PropertyValues.Add("Age", 30);
+			def.PropertyValues.Add("Spouse", new RuntimeObjectReference("singletonObject"));
+			lof.RegisterObjectDefinition("test", def);
+
+			object singletonObject = new TestObject();
+			lof.RegisterSingleton("singletonObject", singletonObject);
+			Assert.IsTrue(lof.IsSingleton("singletonObject"));
+			TestObject test = (TestObject) lof.GetObject("test");
+			Assert.AreEqual(singletonObject, lof.GetObject("singletonObject"));
+			Assert.AreEqual(singletonObject, test.Spouse);
+			Hashtable objectsOfType = (Hashtable) lof.GetObjectsOfType(typeof (TestObject), false, true);
+			Assert.AreEqual(2, objectsOfType.Count);
+			Assert.IsTrue(objectsOfType.ContainsValue(test));
+			Assert.IsTrue(objectsOfType.ContainsValue(singletonObject));
+		}
+
+		[Test]
+		public void ApplyPropertyValues()
+		{
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			MutablePropertyValues properties = new MutablePropertyValues();
+			properties.Add("age", "99");
+			factory.RegisterObjectDefinition("test", new RootObjectDefinition(typeof (TestObject), properties));
+			TestObject obj = new TestObject();
+			Assert.AreEqual(0, obj.Age);
+			factory.ApplyObjectPropertyValues(obj, "test");
+			Assert.AreEqual(99, obj.Age, "Property values were not applied to the existing instance.");
+		}
+
+		[Test]
+		public void ApplyPropertyValuesWithIncompleteDefinition()
+		{
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			MutablePropertyValues properties = new MutablePropertyValues();
+			properties.Add("age", "99");
+			factory.RegisterObjectDefinition("test", new RootObjectDefinition(null, properties));
+			TestObject obj = new TestObject();
+			Assert.AreEqual(0, obj.Age);
+			factory.ApplyObjectPropertyValues(obj, "test");
+			Assert.AreEqual(99, obj.Age, "Property values were not applied to the existing instance.");
+		}
+
+		[Test]
+		public void RegisterExistingSingletonWithAutowire()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			MutablePropertyValues pvs = new MutablePropertyValues();
+			pvs.Add("name", "Tony");
+			pvs.Add("age", "48");
+			RootObjectDefinition rod = new RootObjectDefinition(typeof (DependenciesObject), pvs, true);
+			rod.DependencyCheck = DependencyCheckingMode.Objects;
+			rod.AutowireMode = AutoWiringMode.ByType;
+			lof.RegisterObjectDefinition("test", rod);
+			object singletonObject = new TestObject();
+			lof.RegisterSingleton("singletonObject", singletonObject);
+			Assert.IsTrue(lof.ContainsObject("singletonObject"));
+			Assert.IsTrue(lof.IsSingleton("singletonObject"));
+			Assert.AreEqual(0, lof.GetAliases("singletonObject").Length);
+			DependenciesObject test = (DependenciesObject) lof.GetObject("test");
+			Assert.AreEqual(singletonObject, lof.GetObject("singletonObject"));
+			Assert.AreEqual(singletonObject, test.Spouse);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ObjectDefinitionStoreException))]
+		public void RegisterExistingSingletonWithAlreadyBound()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			object singletonObject = new TestObject();
+			lof.RegisterSingleton("singletonObject", singletonObject);
+			lof.RegisterSingleton("singletonObject", singletonObject);
+		}
+
+		[Test]
+		public void AutowireConstructor()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			RootObjectDefinition rod = new RootObjectDefinition(typeof (TestObject));
+			lof.RegisterObjectDefinition("spouse", rod);
+			ConstructorDependenciesObject cdo = (ConstructorDependenciesObject) lof.Autowire(typeof (ConstructorDependenciesObject),
+			                                                                                 AutoWiringMode.Constructor, true);
+			object spouse = lof.GetObject("spouse");
+			Assert.IsTrue(cdo.Spouse1 == spouse);
+			Assert.IsTrue(ObjectFactoryUtils.ObjectOfType(lof, typeof (TestObject)) == spouse);
+		}
+
+		[Test]
+		public void AutowireObjectByName()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			RootObjectDefinition rodDefinition = new RootObjectDefinition(typeof (TestObject));
+			rodDefinition.PropertyValues.Add("name", "Rod");
+			rodDefinition.AutowireMode = AutoWiringMode.ByName;
+			RootObjectDefinition kerryDefinition = new RootObjectDefinition(typeof (TestObject));
+			kerryDefinition.PropertyValues.Add("name", "Kerry");
+			lof.RegisterObjectDefinition("rod", rodDefinition);
+			lof.RegisterObjectDefinition("Spouse", kerryDefinition);
+			DependenciesObject obj = (DependenciesObject) lof.Autowire(typeof (DependenciesObject),
+			                                                           AutoWiringMode.ByName, true);
+			TestObject objRod = (TestObject) lof.GetObject("rod");
+			Assert.AreEqual(obj.Spouse, objRod.Spouse);
+		}
+
+		[Test]
+		public void AutowireObjectByNameIsNotCaseInsensitive()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			RootObjectDefinition rodDefinition = new RootObjectDefinition(typeof (TestObject));
+			rodDefinition.PropertyValues.Add("name", "Rod");
+			rodDefinition.AutowireMode = AutoWiringMode.ByName;
+			RootObjectDefinition kerryDefinition = new RootObjectDefinition(typeof (TestObject));
+			kerryDefinition.PropertyValues.Add("name", "Kerry");
+			lof.RegisterObjectDefinition("rod", rodDefinition);
+			lof.RegisterObjectDefinition("spouse", kerryDefinition); // property name is Spouse (capital S)
+			TestObject objRod = (TestObject) lof.GetObject("rod");
+			Assert.IsNull(objRod.Spouse, "Mmm, Spouse property appears to have been autowired by name, even though there is no object in the factory with a name 'Spouse'.");
+		}
+
+		[Test]
+		[ExpectedException(typeof (UnsatisfiedDependencyException))]
+		public void AutowireObjectByNameWithDependencyCheck()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			RootObjectDefinition rod = new RootObjectDefinition(typeof (TestObject));
+			lof.RegisterObjectDefinition("Spous", rod);
+			lof.Autowire(typeof (DependenciesObject), AutoWiringMode.ByName, true);
+		}
+
+		[Test]
+		public void AutowireObjectByNameWithNoDependencyCheck()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			RootObjectDefinition rod = new RootObjectDefinition(typeof (TestObject));
+			lof.RegisterObjectDefinition("Spous", rod);
+			DependenciesObject obj = (DependenciesObject) lof.Autowire(typeof (DependenciesObject), AutoWiringMode.ByName, false);
+			Assert.IsNull(obj.Spouse);
+		}
+
+		[Test]
+		public void AutowireObjectByType()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			RootObjectDefinition rod = new RootObjectDefinition(typeof (TestObject));
+			lof.RegisterObjectDefinition("test", rod);
+			DependenciesObject obj = (DependenciesObject) lof.Autowire(typeof (DependenciesObject), AutoWiringMode.ByType, true);
+			TestObject test = (TestObject) lof.GetObject("test");
+			Assert.AreEqual(obj.Spouse, test);
+		}
+
+		[Test]
+		[ExpectedException(typeof (UnsatisfiedDependencyException))]
+		public void AutowireObjectByTypeWithDependencyCheck()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			lof.Autowire(typeof (DependenciesObject), AutoWiringMode.ByType, true);
+			Assert.Fail("Should have thrown UnsatisfiedDependencyException");
+		}
+
+		[Test]
+		public void AutowireObjectByTypeWithNoDependencyCheck()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			DependenciesObject obj = (DependenciesObject) lof.Autowire(typeof (DependenciesObject), AutoWiringMode.ByType, false);
+			Assert.IsNull(obj.Spouse);
+		}
+
+		[Test]
+		public void AutowireExistingObjectByName()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			RootObjectDefinition rod = new RootObjectDefinition(typeof (TestObject));
+			lof.RegisterObjectDefinition("Spouse", rod);
+			DependenciesObject existingObj = new DependenciesObject();
+			lof.AutowireObjectProperties(existingObj, AutoWiringMode.ByName, true);
+			TestObject spouse = (TestObject) lof.GetObject("Spouse");
+			Assert.AreEqual(existingObj.Spouse, spouse);
+			Assert.IsTrue(ObjectFactoryUtils.ObjectOfType(lof, typeof (TestObject)) == spouse);
+		}
+
+		[Test]
+		[ExpectedException(typeof (UnsatisfiedDependencyException))]
+		public void AutowireExistingObjectByNameWithDependencyCheck()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			RootObjectDefinition rod = new RootObjectDefinition(typeof (TestObject));
+			lof.RegisterObjectDefinition("Spous", rod);
+			DependenciesObject existingObj = new DependenciesObject();
+			lof.AutowireObjectProperties(existingObj, AutoWiringMode.ByName, true);
+			Assert.Fail("Should have thrown UnsatisfiedDependencyException");
+		}
+
+		[Test]
+		public void AutowireExistingObjectByNameWithNoDependencyCheck()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			RootObjectDefinition rod = new RootObjectDefinition(typeof (TestObject));
+			lof.RegisterObjectDefinition("Spous", rod);
+			DependenciesObject existingObj = new DependenciesObject();
+			lof.AutowireObjectProperties(existingObj, AutoWiringMode.ByName, false);
+			Assert.IsNull(existingObj.Spouse);
+		}
+
+		[Test]
+		public void AutowireExistingObjectByType()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			RootObjectDefinition rod = new RootObjectDefinition(typeof (TestObject));
+			lof.RegisterObjectDefinition("test", rod);
+			DependenciesObject existingObj = new DependenciesObject();
+			lof.AutowireObjectProperties(existingObj, AutoWiringMode.ByType, true);
+			TestObject test = (TestObject) lof.GetObject("test");
+			Assert.AreEqual(existingObj.Spouse, test);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void AutowireByTypeWithInvalidAutowireMode()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			DependenciesObject obj = new DependenciesObject();
+			lof.AutowireObjectProperties(obj, AutoWiringMode.Constructor, true);
+		}
+
+		[Test]
+		[ExpectedException(typeof (UnsatisfiedDependencyException))]
+		public void AutowireExistingObjectByTypeWithDependencyCheck()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			DependenciesObject existingObj = new DependenciesObject();
+			lof.AutowireObjectProperties(existingObj, AutoWiringMode.ByType, true);
+		}
+
+		[Test]
+		public void AutowireExistingObjectByTypeWithNoDependencyCheck()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			DependenciesObject existingObj = new DependenciesObject();
+			lof.AutowireObjectProperties(existingObj, AutoWiringMode.ByType, false);
+			Assert.IsNull(existingObj.Spouse);
+		}
+
+		[Test]
+		public void AutowireWithNoDependencies()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			RootObjectDefinition rod = new RootObjectDefinition(typeof (TestObject));
+			lof.RegisterObjectDefinition("rod", rod);
+			Assert.AreEqual(1, lof.ObjectDefinitionCount);
+			object registered = lof.Autowire(typeof (NoDependencies), AutoWiringMode.AutoDetect, false);
+			Assert.AreEqual(1, lof.ObjectDefinitionCount);
+			Assert.IsTrue(registered is NoDependencies);
+		}
+
+		[Test]
+		public void AutowireWithSatisfiedObjectDependency()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			MutablePropertyValues pvs = new MutablePropertyValues();
+			pvs.Add(new PropertyValue("name", "Rod"));
+			RootObjectDefinition rood = new RootObjectDefinition(typeof (TestObject), pvs);
+			lof.RegisterObjectDefinition("rod", rood);
+			Assert.AreEqual(1, lof.ObjectDefinitionCount);
+			// Depends on age, name and spouse (TestObject)
+			object registered = lof.Autowire(typeof (DependenciesObject), AutoWiringMode.AutoDetect, true);
+			Assert.AreEqual(1, lof.ObjectDefinitionCount);
+			DependenciesObject kerry = (DependenciesObject) registered;
+			TestObject rod = (TestObject) lof.GetObject("rod");
+			Assert.AreSame(rod, kerry.Spouse);
+		}
+
+		[Test]
+		public void AutowireWithSatisfiedConstructorDependency()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			MutablePropertyValues pvs = new MutablePropertyValues();
+			pvs.Add(new PropertyValue("name", "Rod"));
+			RootObjectDefinition rood = new RootObjectDefinition(typeof (TestObject), pvs);
+			lof.RegisterObjectDefinition("rod", rood);
+			Assert.AreEqual(1, lof.ObjectDefinitionCount);
+			object registered = lof.Autowire(typeof (ConstructorDependency), AutoWiringMode.AutoDetect, false);
+			Assert.AreEqual(1, lof.ObjectDefinitionCount);
+			ConstructorDependency kerry = (ConstructorDependency) registered;
+			TestObject rod = (TestObject) lof.GetObject("rod");
+			Assert.AreSame(rod, kerry._spouse);
+		}
+
+		[Test]
+		[ExpectedException(typeof (UnsatisfiedDependencyException))]
+		public void AutowireWithUnsatisfiedConstructorDependency()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			MutablePropertyValues pvs = new MutablePropertyValues();
+			pvs.Add(new PropertyValue("name", "Rod"));
+			RootObjectDefinition rod = new RootObjectDefinition(typeof (TestObject), pvs);
+			lof.RegisterObjectDefinition("rod", rod);
+			Assert.AreEqual(1, lof.ObjectDefinitionCount);
+			lof.Autowire(typeof (UnsatisfiedConstructorDependency), AutoWiringMode.AutoDetect, true);
+			Assert.Fail("Should have unsatisfied constructor dependency on SideEffectObject");
+		}
+
+		[Test]
+		public void ExtensiveCircularReference()
+		{
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+			for (int i = 0; i < 1000; i++)
+			{
+				MutablePropertyValues pvs = new MutablePropertyValues();
+				pvs.Add(new PropertyValue("Spouse", new RuntimeObjectReference("object" + (i < 99 ? i + 1 : 0))));
+				RootObjectDefinition rod = new RootObjectDefinition(typeof (TestObject), pvs);
+				lof.RegisterObjectDefinition("object" + i, rod);
+			}
+			lof.PreInstantiateSingletons();
+			for (int i = 0; i < 1000; i++)
+			{
+				TestObject obj = (TestObject) lof.GetObject("object" + i);
+				TestObject otherObj = (TestObject) lof.GetObject("object" + (i < 99 ? i + 1 : 0));
+				Assert.IsTrue(obj.Spouse == otherObj);
+			}
+		}
+
+		[Test]
+		public void PullingObjectWithFactoryMethodAlsoInjectsDependencies()
+		{
+			string expectedName = "Terese Raquin";
+			MutablePropertyValues props = new MutablePropertyValues();
+			props.Add(new PropertyValue("Name", expectedName));
+
+			RootObjectDefinition def = new RootObjectDefinition(typeof (MySingleton), props);
+			def.FactoryMethodName = "GetInstance";
+
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			fac.RegisterObjectDefinition("foo", def);
+
+			object foo = fac["foo"];
+			Assert.IsNotNull(foo, "Couldn't pull manually registered instance out of the factory using factory method instantiation.");
+			MySingleton sing = (MySingleton) foo;
+			Assert.AreEqual(expectedName, sing.Name, "Dependency was not resolved pulling manually registered instance out of the factory using factory method instantiation.");
+		}
+
+        [Test(Description = "http://opensource.atlassian.com/projects/spring/browse/SPRNET-368")]
+        public void GetObjectWithCtorArgsAndCtorAutowiring()
+        {
+            using (DefaultListableObjectFactory lof = new DefaultListableObjectFactory())
+            {
+                RootObjectDefinition prototype
+                    = new RootObjectDefinition(typeof(TestObject));
+                prototype.IsSingleton = false;
+                lof.RegisterObjectDefinition("prototype", prototype);
+
+                TestObject to = lof.GetObject("prototype", new object[] { "Bruno", 26, new NestedTestObject("Home") }) as TestObject;
+                Assert.IsNotNull(to);
+                Assert.AreEqual(26, to.Age);
+                Assert.AreEqual("Bruno", to.Name);
+                Assert.AreEqual("Home", to.Doctor.Company);
+            }
+        }
+
+        [Test]
+        public void GetObjectWithCtorArgsOnPrototype()
+        {
+            using (DefaultListableObjectFactory lof = new DefaultListableObjectFactory())
+            {
+                RootObjectDefinition prototype
+                    = new RootObjectDefinition(typeof (TestObject));
+                prototype.IsSingleton = false;                
+                lof.RegisterObjectDefinition("prototype", prototype);
+                
+                TestObject to = lof.GetObject("prototype", new object[] {"Mark", 35}) as TestObject;
+                Assert.IsNotNull(to);
+                Assert.AreEqual(35, to.Age);
+                Assert.AreEqual("Mark", to.Name);
+
+                TestObject to2 = lof.GetObject("prototype", new object[] {35, "Mark"}) as TestObject;
+                Assert.IsNotNull(to2);
+                Assert.AreEqual(35, to2.Age);
+                Assert.AreEqual("Mark", to2.Name);
+            }
+        }
+
+        [Test]
+        public void GetObjectWithCtorArgsOnSingleton()
+        {
+            using (DefaultListableObjectFactory lof = new DefaultListableObjectFactory())
+            {
+                RootObjectDefinition singleton
+                    = new RootObjectDefinition(typeof(TestObject));
+                singleton.IsSingleton = true;
+                lof.RegisterObjectDefinition("singleton", singleton);
+
+                TestObject to = lof.GetObject("singleton", new object[] { "Mark", 35 }) as TestObject;
+                Assert.IsNotNull(to);
+                Assert.AreEqual(35, to.Age);
+                Assert.AreEqual("Mark", to.Name);
+            }
+        }
+
+        [Test]
+        public void GetObjectWithCtorArgsOverrided()
+        {
+            using (DefaultListableObjectFactory lof = new DefaultListableObjectFactory())
+            {
+                ConstructorArgumentValues arguments = new ConstructorArgumentValues();
+                arguments.AddNamedArgumentValue("age", 27);
+                arguments.AddNamedArgumentValue("name", "Bruno");
+                RootObjectDefinition singleton
+                    = new RootObjectDefinition(typeof(TestObject), arguments, new MutablePropertyValues());
+                singleton.IsSingleton = true;
+                lof.RegisterObjectDefinition("singleton", singleton);
+
+                TestObject to = lof.GetObject("singleton", new object[] { "Mark", 35 }) as TestObject;
+                Assert.IsNotNull(to);
+                Assert.AreEqual(35, to.Age);
+                Assert.AreEqual("Mark", to.Name);
+
+                TestObject to2 = lof.GetObject("singleton") as TestObject;
+                Assert.IsNotNull(to2);
+                Assert.AreEqual(27, to2.Age);
+                Assert.AreEqual("Bruno", to2.Name);
+            }
+        }
+
+		[Test]
+		public void CreateObjectWithAllNamedCtorArguments()
+		{
+			string expectedName = "Bingo";
+			int expectedAge = 1023;
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddNamedArgumentValue("age", expectedAge);
+			values.AddNamedArgumentValue("name", expectedName);
+			RootObjectDefinition def = new RootObjectDefinition(typeof (TestObject), values, new MutablePropertyValues());
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			fac.RegisterObjectDefinition("foo", def);
+
+			ITestObject foo = fac["foo"] as ITestObject;
+			Assert.IsNotNull(foo, "Couldn't pull manually registered instance out of the factory.");
+			Assert.AreEqual(expectedName, foo.Name, "Dependency 'name' was not resolved using a named ctor arg.");
+			Assert.AreEqual(expectedAge, foo.Age, "Dependency 'age' was not resolved using a named ctor arg.");
+		}
+
+		[Test]
+		public void CreateObjectWithAllNamedCtorArgumentsIsCaseInsensitive()
+		{
+			string expectedName = "Bingo";
+			int expectedAge = 1023;
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddNamedArgumentValue("aGe", expectedAge);
+			values.AddNamedArgumentValue("naME", expectedName);
+			RootObjectDefinition def = new RootObjectDefinition(typeof (TestObject), values, new MutablePropertyValues());
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			fac.RegisterObjectDefinition("foo", def);
+
+			ITestObject foo = fac["foo"] as ITestObject;
+			Assert.IsNotNull(foo, "Couldn't pull manually registered instance out of the factory.");
+			Assert.AreEqual(expectedName, foo.Name, "Dependency 'name' was not resolved using a named ctor arg.");
+			Assert.AreEqual(expectedAge, foo.Age, "Dependency 'age' was not resolved using a named ctor arg.");
+		}
+
+		[Test]
+		public void CreateObjectWithMixOfNamedAndIndexedCtorArguments()
+		{
+			string expectedName = "Bingo";
+			int expectedAge = 1023;
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddNamedArgumentValue("age", expectedAge);
+			values.AddIndexedArgumentValue(0, expectedName);
+			RootObjectDefinition def = new RootObjectDefinition(typeof (TestObject), values, new MutablePropertyValues());
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			fac.RegisterObjectDefinition("foo", def);
+
+			ITestObject foo = fac["foo"] as ITestObject;
+			Assert.IsNotNull(foo, "Couldn't pull manually registered instance out of the factory.");
+			Assert.AreEqual(expectedName, foo.Name, "Dependency 'name' was not resolved an indexed ctor arg.");
+			Assert.AreEqual(expectedAge, foo.Age, "Dependency 'age' was not resolved using a named ctor arg.");
+		}
+
+		[Test]
+		public void CreateObjectWithMixOfNamedAndIndexedAndAutowiredCtorArguments()
+		{
+			string expectedCompany = "Griffin's Foosball Arcade";
+			MutablePropertyValues autoProps = new MutablePropertyValues();
+			autoProps.Add(new PropertyValue("Company", expectedCompany));
+			RootObjectDefinition autowired = new RootObjectDefinition(typeof (NestedTestObject), autoProps);
+
+			string expectedName = "Bingo";
+			int expectedAge = 1023;
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+			values.AddNamedArgumentValue("age", expectedAge);
+			values.AddIndexedArgumentValue(0, expectedName);
+			RootObjectDefinition def = new RootObjectDefinition(typeof (TestObject), values, new MutablePropertyValues());
+			def.AutowireMode = AutoWiringMode.Constructor;
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			fac.RegisterObjectDefinition("foo", def);
+			fac.RegisterObjectDefinition("doctor", autowired);
+
+			ITestObject foo = fac["foo"] as ITestObject;
+			Assert.IsNotNull(foo, "Couldn't pull manually registered instance out of the factory.");
+			Assert.AreEqual(expectedName, foo.Name, "Dependency 'name' was not resolved an indexed ctor arg.");
+			Assert.AreEqual(expectedAge, foo.Age, "Dependency 'age' was not resolved using a named ctor arg.");
+			Assert.AreEqual(expectedCompany, foo.Doctor.Company, "Dependency 'doctor.Company' was not resolved using autowiring.");
+		}
+
+		[Test]
+		public void CreateObjectWithMixOfIndexedAndTwoNamedSameTypeCtorArguments()
+		{
+			// this object will be passed in as a named constructor argument
+			string expectedCompany = "Griffin's Foosball Arcade";
+			MutablePropertyValues autoProps = new MutablePropertyValues();
+			autoProps.Add(new PropertyValue("Company", expectedCompany));
+			RootObjectDefinition autowired = new RootObjectDefinition(typeof (NestedTestObject), autoProps);
+
+			// this object will be passed in as a named constructor argument
+			string expectedLawyersCompany = "Pollack, Pounce, & Pulverise";
+			MutablePropertyValues lawyerProps = new MutablePropertyValues();
+			lawyerProps.Add(new PropertyValue("Company", expectedLawyersCompany));
+			RootObjectDefinition lawyer = new RootObjectDefinition(typeof (NestedTestObject), lawyerProps);
+
+			// this simple string object will be passed in as an indexed constructor argument
+			string expectedName = "Bingo";
+
+			// this simple integer object will be passed in as a named constructor argument
+			int expectedAge = 1023;
+
+			ConstructorArgumentValues values = new ConstructorArgumentValues();
+
+			// lets mix the order up a little...
+			values.AddNamedArgumentValue("age", expectedAge);
+			values.AddIndexedArgumentValue(0, expectedName);
+			values.AddNamedArgumentValue("doctor", new RuntimeObjectReference("a_doctor"));
+			values.AddNamedArgumentValue("lawyer", new RuntimeObjectReference("a_lawyer"));
+
+			RootObjectDefinition def = new RootObjectDefinition(typeof (TestObject), values, new MutablePropertyValues());
+
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			// the object we're attempting to resolve...
+			fac.RegisterObjectDefinition("foo", def);
+			// the object that will be looked up and passed as a named parameter to a ctor call...
+			fac.RegisterObjectDefinition("a_doctor", autowired);
+			// another object that will be looked up and passed as a named parameter to a ctor call...
+			fac.RegisterObjectDefinition("a_lawyer", lawyer);
+
+			ITestObject foo = fac["foo"] as ITestObject;
+			Assert.IsNotNull(foo, "Couldn't pull manually registered instance out of the factory.");
+			Assert.AreEqual(expectedName, foo.Name, "Dependency 'name' was not resolved an indexed ctor arg.");
+			Assert.AreEqual(expectedAge, foo.Age, "Dependency 'age' was not resolved using a named ctor arg.");
+			Assert.AreEqual(expectedCompany, foo.Doctor.Company, "Dependency 'doctor.Company' was not resolved using autowiring.");
+			Assert.AreEqual(expectedLawyersCompany, foo.Lawyer.Company, "Dependency 'lawyer.Company' was not resolved using another named ctor arg.");
+		}
+
+		[Test]
+		public void CircularDependencyIsCorrectlyDetected()
+		{
+			RootObjectDefinition foo = new RootObjectDefinition(typeof (TestObject));
+			foo.ConstructorArgumentValues.AddNamedArgumentValue("spouse", new RuntimeObjectReference("bar"));
+			RootObjectDefinition bar = new RootObjectDefinition(typeof (TestObject));
+			bar.ConstructorArgumentValues.AddNamedArgumentValue("spouse", new RuntimeObjectReference("foo"));
+
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			fac.RegisterObjectDefinition("foo", foo);
+			fac.RegisterObjectDefinition("bar", bar);
+
+			try
+			{
+				fac.GetObject("foo");
+			}
+			catch (ObjectCreationException ex)
+			{
+				Assert.AreEqual(typeof (ObjectCurrentlyInCreationException), ex.GetBaseException().GetType(),
+				                "Circular dependency was set up; should have caught an ObjectCurrentlyInCreationException instance.");
+			}
+		}
+
+        [Test]
+        public void ConfigurableFactoryObjectInline()
+        {
+            DefaultListableObjectFactory dlof = new DefaultListableObjectFactory();
+
+            RootObjectDefinition everyman = new RootObjectDefinition();
+            everyman.PropertyValues = new MutablePropertyValues();
+            everyman.PropertyValues.Add("name", "Noone");
+            everyman.PropertyValues.Add("age", 9781);
+
+            RootObjectDefinition factory = new RootObjectDefinition();
+            factory.ObjectType = typeof(DummyConfigurableFactory);
+            factory.PropertyValues = new MutablePropertyValues();      
+            factory.PropertyValues.Add("ProductTemplate", everyman);
+            dlof.RegisterObjectDefinition("factory", factory);
+
+            TestObject instance = dlof.GetObject("factory") as TestObject;
+            Assert.IsNotNull(instance);
+
+            Assert.AreEqual("Noone", instance.Name, "Name dependency injected via IConfigurableObjectFactory (instance) failed (was 'Factory singleton').");
+            Assert.AreEqual(9781, instance.Age, "Age dependency injected via IObjectFactory.ConfigureObject(instance) failed (was 25).");
+        }
+
+        [Test]
+        public void ConfigurableFactoryObjectReference()
+        {
+            DefaultListableObjectFactory dlof = new DefaultListableObjectFactory();
+
+            RootObjectDefinition everyman = new RootObjectDefinition();
+            everyman.IsAbstract = true;
+            everyman.PropertyValues = new MutablePropertyValues();
+            everyman.PropertyValues.Add("name", "Noone");
+            everyman.PropertyValues.Add("age", 9781);
+            dlof.RegisterObjectDefinition("everyman", everyman);
+
+            RootObjectDefinition factory = new RootObjectDefinition();
+            factory.ObjectType = typeof(DummyConfigurableFactory);
+            factory.PropertyValues = new MutablePropertyValues();
+            factory.PropertyValues.Add("ProductTemplate", new RuntimeObjectReference("everyman"));
+            dlof.RegisterObjectDefinition("factory", factory);
+
+            TestObject instance = dlof.GetObject("factory") as TestObject;
+            Assert.IsNotNull(instance);
+
+            Assert.AreEqual("Noone", instance.Name, "Name dependency injected via IConfigurableObjectFactory (instance) failed (was 'Factory singleton').");
+            Assert.AreEqual(9781, instance.Age, "Age dependency injected via IObjectFactory.ConfigureObject(instance) failed (was 25).");
+        }
+
+		[Test]
+		public void ConfigureObject()
+		{
+			TestObject instance = new TestObject();
+			RootObjectDefinition everyman = new RootObjectDefinition();
+			everyman.IsAbstract = true;
+			everyman.PropertyValues = new MutablePropertyValues();
+			everyman.PropertyValues.Add("name", "Noone");
+			everyman.PropertyValues.Add("age", 9781);
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			fac.RegisterObjectDefinition(instance.GetType().FullName, everyman);
+            fac.ConfigureObject(instance, instance.GetType().FullName);
+			Assert.AreEqual("Noone", instance.Name, "Name dependency injected via IObjectFactory.ConfigureObject(instance) failed (was null).");
+			Assert.AreEqual(9781, instance.Age, "Age dependency injected via IObjectFactory.ConfigureObject(instance) failed (was null).");
+		}
+
+		[Test]
+		public void ConfigureObjectViaExplicitName()
+		{
+			TestObject instance = new TestObject();
+			RootObjectDefinition everyman = new RootObjectDefinition();
+			everyman.IsAbstract = true;
+			everyman.PropertyValues = new MutablePropertyValues();
+			everyman.PropertyValues.Add("name", "Noone");
+			everyman.PropertyValues.Add("age", 9781);
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			fac.RegisterObjectDefinition("everyman", everyman);
+			fac.ConfigureObject(instance, "everyman");
+            Assert.AreEqual(true, instance.InitCompleted, "AfterPropertiesSet() was not invoked by IObjectFactory.ConfigureObject(instance).");
+            Assert.AreEqual("Noone", instance.Name, "Name dependency injected via IObjectFactory.ConfigureObject(instance) failed (was null).");
+			Assert.AreEqual(9781, instance.Age, "Age dependency injected via IObjectFactory.ConfigureObject(instance) failed (was null).");
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void ConfigureObjectViaNullName()
+		{
+			TestObject instance = new TestObject();
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			fac.ConfigureObject(instance, null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void ConfigureObjectViaLoadOfOldWhitespaceName()
+		{
+			TestObject instance = new TestObject();
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			fac.ConfigureObject(instance, "        \t");
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void ConfigureObjectViaEmptyName()
+		{
+			TestObject instance = new TestObject();
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			fac.ConfigureObject(instance, string.Empty);
+		}
+
+		[Test]
+		public void DisposeCyclesThroughAllSingletonsEvenIfTheirDisposeThrowsAnException()
+		{
+			RootObjectDefinition foo = new RootObjectDefinition(typeof (GoodDisposable));
+			foo.IsSingleton = true;
+			RootObjectDefinition bar = new RootObjectDefinition(typeof (BadDisposable));
+			bar.IsSingleton = true;
+			RootObjectDefinition baz = new RootObjectDefinition(typeof (GoodDisposable));
+			baz.IsSingleton = true;
+
+			using (DefaultListableObjectFactory fac = new DefaultListableObjectFactory())
+			{
+				fac.RegisterObjectDefinition("foo", foo);
+				fac.RegisterObjectDefinition("bar", bar);
+				fac.RegisterObjectDefinition("baz", baz);
+				fac.PreInstantiateSingletons();
+			}
+			Assert.AreEqual(2, GoodDisposable.DisposeCount, "All IDisposable singletons must have their Dispose() method called... one of them bailed, and as a result the rest were (apparently) not Dispose()d.");
+			GoodDisposable.DisposeCount = 0;
+		}
+
+		[Test]
+		public void StaticInitializationViaDependsOnSingletonMethodInvokingFactoryObject()
+		{
+			RootObjectDefinition initializer = new RootObjectDefinition(typeof (MethodInvokingFactoryObject));
+			initializer.PropertyValues.Add("TargetMethod", "Init");
+			initializer.PropertyValues.Add("TargetType", typeof (StaticInitializer).AssemblyQualifiedName);
+
+			RootObjectDefinition foo = new RootObjectDefinition(typeof (TestObject));
+			foo.DependsOn = new string[] {"force-init"};
+
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			fac.RegisterObjectDefinition("foo", foo);
+			fac.RegisterObjectDefinition("force-init", initializer);
+
+			fac.GetObject("foo");
+			Assert.IsTrue(StaticInitializer.InitWasCalled, "Boing");
+		}
+
+		/// <summary>
+		/// There is a similar test in XmlObjectFactoryTests that actually supplies another boolean
+		/// object in the factory that is used to autowire the object; this test puts no such second
+		/// object in the factory, so when the factory tries to autowire the second (missing) argument
+		/// to the ctor, it should (must) choke.
+		/// </summary>
+		[Test]
+		[ExpectedException(typeof (UnsatisfiedDependencyException),
+			"Error creating object with name 'foo' : Unsatisfied dependency " +
+				"expressed through constructor argument with index 1 of type [System.Boolean] : " +
+				"There are '0' objects of type [System.Boolean] for autowiring constructor. There " +
+				"should have been exactly 1 to be able to autowire the 'b2' argument on the constructor of object 'foo'.")]
+		public void DoubleBooleanAutowire()
+		{
+			RootObjectDefinition def = new RootObjectDefinition(typeof (DoubleBooleanConstructorObject));
+			ConstructorArgumentValues args = new ConstructorArgumentValues();
+			args.AddGenericArgumentValue(true, "bool");
+			def.ConstructorArgumentValues = args;
+			def.AutowireMode = AutoWiringMode.Constructor;
+			def.IsSingleton = true;
+
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			fac.RegisterObjectDefinition("foo", def);
+
+			fac.GetObject("foo");
+		}
+
+	    [Test]
+	    public void CanSetPropertyThatUsesNewModifierOnDerivedClass()
+	    {
+            string nick = "Banjo";
+            string expectedNickname = DerivedTestObject.NicknamePrefix + nick;
+
+	        RootObjectDefinition def = new RootObjectDefinition(typeof (DerivedTestObject));
+	        def.PropertyValues.Add("Nickname", nick);
+
+            DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+            fac.RegisterObjectDefinition("foo", def);
+
+            DerivedTestObject tob = (DerivedTestObject) fac.GetObject("foo");
+            Assert.AreEqual(expectedNickname, tob.Nickname,
+                "Property is not being set to the NEWed property on the subclass.");
+        }
+
+        [Test]
+        public void CanSetPropertyThatUsesOddNewModifierOnDerivedClass()
+        {
+            RootObjectDefinition def = new RootObjectDefinition(typeof (DerivedFoo));
+            def.PropertyValues.Add("Bar", new DerivedBar());
+            DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+            fac.RegisterObjectDefinition("foo", def);
+            DerivedFoo foo = (DerivedFoo) fac.GetObject("foo");
+            Assert.AreEqual(typeof(DerivedBar), foo.Bar.GetType());
+        }
+
+		[Test]
+		public void ChildReferencesParentByAnAliasOfTheParent()
+		{
+			const string TheParentsAlias = "theParentsAlias";
+			const int ExpectedAge = 31;
+			const string ExpectedName = "Rick Evans";
+
+			RootObjectDefinition parentDef = new RootObjectDefinition(typeof (TestObject));
+			parentDef.IsAbstract = true;
+			parentDef.PropertyValues.Add("name", ExpectedName);			
+			parentDef.PropertyValues.Add("age", ExpectedAge);
+
+			ChildObjectDefinition childDef = new ChildObjectDefinition(TheParentsAlias);
+			
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			
+			fac.RegisterObjectDefinition("parent", parentDef);
+			fac.RegisterAlias("parent", TheParentsAlias);
+			fac.RegisterObjectDefinition("child", childDef);
+
+			TestObject child = (TestObject) fac.GetObject("child");
+			Assert.AreEqual(ExpectedName, child.Name);
+			Assert.AreEqual(ExpectedAge, child.Age);
+		}
+
+		[Test]
+		public void GetObjectDefinitionResolvesAliases()
+		{
+			const string TheParentsAlias = "theParentsAlias";
+			const int ExpectedAge = 31;
+			const string ExpectedName = "Rick Evans";
+
+			RootObjectDefinition parentDef = new RootObjectDefinition(typeof (TestObject));
+			parentDef.IsAbstract = true;
+			parentDef.PropertyValues.Add("name", ExpectedName);			
+			parentDef.PropertyValues.Add("age", ExpectedAge);
+
+			ChildObjectDefinition childDef = new ChildObjectDefinition(TheParentsAlias);
+			
+			DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
+			
+			fac.RegisterObjectDefinition("parent", parentDef);
+			fac.RegisterAlias("parent", TheParentsAlias);
+			
+			IObjectDefinition od = fac.GetObjectDefinition(TheParentsAlias);
+			Assert.IsNotNull(od);
+		}
+
+		[Test]
+		public void IgnoreObjectPostProcessorDuplicates()
+		{
+			DynamicMock mock1 = new DynamicMock(typeof(IObjectPostProcessor));
+			IObjectPostProcessor proc1 = (IObjectPostProcessor)mock1.Object;
+
+			DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
+
+			const string errMsg = "Wrong number of IObjectPostProcessors being reported by the ObjectPostProcessorCount property.";
+			Assert.AreEqual(0, lof.ObjectPostProcessorCount, errMsg);
+			lof.AddObjectPostProcessor(proc1);
+			Assert.AreEqual(1, lof.ObjectPostProcessorCount, errMsg);
+			lof.AddObjectPostProcessor(proc1);
+			Assert.AreEqual(1, lof.ObjectPostProcessorCount, errMsg);
+		}
+
+		#region Helper Classes
+
+		public class GoodDisposable : IDisposable
+		{
+			public static int DisposeCount = 0;
+
+			public void Dispose()
+			{
+				++DisposeCount;
+			}
+		}
+
+		public class BadDisposable : IDisposable
+		{
+			public void Dispose()
+			{
+				throw new FormatException();
+			}
+		}
+
+		public sealed class MySingleton
+		{
+			private MySingleton()
+			{
+			}
+
+			private static MySingleton _instance = new MySingleton();
+
+			public static MySingleton GetInstance()
+			{
+				return _instance;
+			}
+
+			public string Name
+			{
+				get { return _name; }
+				set { _name = value; }
+			}
+
+			private string _name;
+		}
+
+		public class NoDependencies
+		{
+		}
+
+		public class ConstructorDependency
+		{
+			public TestObject _spouse;
+
+			public ConstructorDependency(TestObject spouse)
+			{
+				this._spouse = spouse;
+			}
+		}
+
+		public class UnsatisfiedConstructorDependency
+		{
+			public UnsatisfiedConstructorDependency(TestObject to, SideEffectObject seo)
+			{
+				_to = to;
+				_seo = seo;
+			}
+
+			public object Seo
+			{
+				get { return _seo; }
+			}
+
+			public TestObject To
+			{
+				get { return _to; }
+			}
+
+			private object _seo;
+			private TestObject _to;
+		}
+
+		private sealed class StaticInitializer
+		{
+			public static bool InitWasCalled = false;
+
+			public static void Init()
+			{
+				InitWasCalled = true;
+			}
+		}
+
+		#endregion
+	}
+
+    public class Foo 
+    {
+        private IBar bar;
+
+        public IBar Bar
+        {
+            get { return bar; }
+            set { bar = value; }
+        }
+    }
+
+    public class DerivedFoo : Foo 
+    {
+        public new IDerivedBar Bar
+        {
+            get { return (IDerivedBar) base.Bar; }
+            set { base.Bar = value; }
+        }
+    }
+
+    public interface IBar {}
+
+    public interface IDerivedBar : IBar {}
+
+    public class Bar : IBar {}
+
+    public class DerivedBar : IDerivedBar {}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/DummyConfigurableFactory.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/DummyConfigurableFactory.cs
new file mode 100644
index 00000000..11299ba7
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/DummyConfigurableFactory.cs
@@ -0,0 +1,53 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Simple factory based on DummyFactory to allow testing 
+    /// of IConfigurableFactoryObject support in AbstractObjectFactory.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+    /// <version>$Id: DummyConfigurableFactory.cs,v 1.2 2007/03/04 20:42:06 bbaia Exp $</version>
+	public class DummyConfigurableFactory : DummyFactory, IConfigurableFactoryObject
+    {
+        #region Fields
+
+        private IObjectDefinition productTemplate;
+
+        #endregion
+
+        #region IConfigurableFactoryObject Members
+
+        public IObjectDefinition ProductTemplate
+        {
+            get { return productTemplate; }
+            set { productTemplate = value; }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/DummyFactory.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/DummyFactory.cs
new file mode 100644
index 00000000..99b16053
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/DummyFactory.cs
@@ -0,0 +1,222 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Simple factory to allow testing of IFactoryObject support in AbstractObjectFactory.
+	/// Depending on whether its singleton property is set, it will return a singleton
+	/// or a prototype instance.
+	/// Implements the IInitializingObject interface, so we can check that factories get
+	/// this lifecycle callback if they want.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	public class DummyFactory :
+		IFactoryObject,
+		IObjectFactoryAware,
+		IObjectNameAware,
+		IInitializingObject,
+		IDisposable
+	{
+		#region Constants
+
+		public const string SINGLETON_NAME = "Factory singleton";
+
+		#endregion
+
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.DummyFactory"/> class.
+		/// </summary>
+		public DummyFactory()
+		{
+			testObject = new TestObject();
+			testObject.Name = SINGLETON_NAME;
+			testObject.Age = 25;
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Was this initialized by invocation of the
+		/// AfterPropertiesSet() method from the IInitializingObject interface?
+		/// </summary>
+		public virtual bool WasInitialized
+		{
+			get { return initialized; }
+		}
+
+		public static bool WasPrototypeCreated
+		{
+			get { return prototypeCreated; }
+		}
+
+		public virtual bool PostProcessed
+		{
+			get { return postProcessed; }
+
+			set { postProcessed = value; }
+		}
+
+		public virtual ITestObject OtherTestObject
+		{
+			get { return otherTestObject; }
+
+			set { otherTestObject = value; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Clear static state.
+		/// </summary>
+		public static void Reset()
+		{
+			prototypeCreated = false;
+		}
+
+		#endregion
+
+		#region Fields
+
+		/// <summary> Default is for factories to return a singleton instance.</summary>
+		private bool singleton = true;
+
+		private String objectName;
+		private IAutowireCapableObjectFactory objectFactory;
+		private bool postProcessed;
+		private bool initialized;
+		private static bool prototypeCreated;
+		private TestObject testObject;
+		private ITestObject otherTestObject;
+
+		#endregion
+
+		#region IFactoryObject Members
+
+		public Type ObjectType
+		{
+			get
+			{
+//				if (!initialized)
+//				{
+//					throw new InvalidOperationException("'ObjectType' must not be called before AfterPropertiesSet()");
+//				}
+				return testObject.GetType();
+			}
+		}
+
+		public object GetObject()
+		{
+//			if (!initialized)
+//			{
+//				throw new InvalidOperationException("GetObject() must not be called before AfterPropertiesSet()");
+//			}
+
+			if (IsSingleton)
+			{
+				return testObject;
+			}
+			else
+			{
+				TestObject prototype = new TestObject("Prototype created at " + DateTime.Now.Millisecond, 11);
+				if (objectFactory != null)
+				{
+					objectFactory.ApplyObjectPostProcessorsBeforeInitialization(prototype, objectName);
+				}
+				prototypeCreated = true;
+				return prototype;
+			}
+		}
+
+		public bool IsSingleton
+		{
+			get { return singleton; }
+			set { singleton = value; }
+		}
+
+		#endregion
+
+		#region IObjectFactoryAware Members
+
+		public IObjectFactory ObjectFactory
+		{
+			get { return objectFactory; }
+			set
+			{
+				objectFactory = (IAutowireCapableObjectFactory) value;
+				objectFactory.ApplyObjectPostProcessorsBeforeInitialization(testObject, objectName);
+			}
+		}
+
+		#endregion
+
+		#region IObjectNameAware Members
+
+		public string ObjectName
+		{
+			get { return objectName; }
+			set { objectName = value; }
+		}
+
+		#endregion
+
+		#region IInitializingObject Members
+
+		public void AfterPropertiesSet()
+		{
+			if (initialized)
+			{
+				throw new SystemException(
+					"Cannot call AfterPropertiesSet twice on the one object.");
+			}
+
+			initialized = true;
+		}
+
+		#endregion
+
+		#region IDisposable Members
+
+		public void Dispose()
+		{
+			if (testObject != null)
+			{
+				testObject.Name = null;
+			}
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/HasMap.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/HasMap.cs
new file mode 100644
index 00000000..b9372d36
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/HasMap.cs
@@ -0,0 +1,121 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+
+using Spring.Collections;
+
+#endregion
+
+namespace Spring.Objects.Factory {
+
+	/// <summary>
+	/// Object exposing a map. Used for object factory tests.
+	/// </summary>
+    public class HasMap {
+
+        #region Properties        
+        public IDictionary Map
+        {
+            get
+            {
+                return _map;
+            }
+            set
+            {
+                _map = value;
+            }
+        }
+
+        public Set Set
+        {
+            get
+            {
+                return _set;
+            }
+            set
+            {
+                _set = value;
+            }
+        }
+
+        public NameValueCollection Props
+        {
+            get
+            {
+                return _props;
+            }
+            set
+            {
+                _props = value;
+            }
+        }
+
+        public object [] ObjectArray
+        {
+            get
+            {
+                return _objectArray;
+            }
+            set
+            {
+                _objectArray = value;
+            }
+        }
+
+        virtual public Type [] ClassArray
+        {
+            get
+            {
+                return _classArray;
+            }
+            set
+            {
+                _classArray = value;
+            }
+        }
+
+        virtual public int [] IntegerArray
+        {
+            get
+            {
+                return _intArray;
+            }
+            set
+            {
+                _intArray = value;
+            }
+        }
+        #endregion
+
+        #region Fields
+        private IDictionary _map;
+        private Set _set;
+        private NameValueCollection _props;
+        private object [] _objectArray;
+        private Type [] _classArray;
+        private int [] _intArray;
+        #endregion
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/ISideEffectObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/ISideEffectObject.cs
new file mode 100644
index 00000000..fdc523e1
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/ISideEffectObject.cs
@@ -0,0 +1,27 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+
+namespace Spring.Objects.Factory
+{
+    public interface ISideEffectObject
+    {
+        int Count { get; set; }
+
+        void doWork();
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/KnowsIfInstantiated.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/KnowsIfInstantiated.cs
new file mode 100644
index 00000000..af0a45be
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/KnowsIfInstantiated.cs
@@ -0,0 +1,42 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Objects.Factory
+{
+	internal sealed class KnowsIfInstantiated
+	{
+		private static bool _instantiated;
+
+		public KnowsIfInstantiated() 
+		{
+			_instantiated = true;
+		}
+
+		public static void ClearInstantiationRecord() 
+		{
+			_instantiated = false;
+		}
+
+		public static bool WasInstantiated
+		{
+			get { return _instantiated; }
+		}
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/LifecycleObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/LifecycleObject.cs
new file mode 100644
index 00000000..2863f741
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/LifecycleObject.cs
@@ -0,0 +1,187 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory {
+
+	/// <summary>
+    /// Simple test of IObjectFactory initialization and lifecycle callbacks.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Rick Evans (.NET)</author>
+    public class LifecycleObject :
+        IObjectNameAware,
+        IInitializingObject,
+        IObjectFactoryAware,
+        IDisposable {
+
+        #region Methods
+        public virtual void PostProcessBeforeInit ()
+        {
+            if (inited)
+            {
+                throw new ApplicationException ("Factory called PostProcessBeforeInit after AfterPropertiesSet");
+            }
+            if (postProcessedBeforeInit)
+            {
+                throw new SystemException("Factory called PostProcessBeforeInit twice");
+            }
+            postProcessedBeforeInit = true;
+        }
+
+        /// <summary>
+        /// Dummy business method that will fail unless the factory
+        /// managed the object's lifecycle correctly
+        /// </summary>
+        public virtual void BusinessMethod ()
+        {
+            if (!inited || !postProcessedAfterInit)
+            {
+                throw new SystemException ("Factory didn't initialize lifecycle object correctly");
+            }
+        }
+		
+        public virtual void PostProcessAfterInit ()
+        {
+            if (!inited)
+            {
+                throw new SystemException("Factory called PostProcessAfterInit before AfterPropertiesSet");
+            }
+            if (postProcessedAfterInit)
+            {
+                throw new SystemException("Factory called PostProcessAfterInit twice");
+            }
+            postProcessedAfterInit = true;
+        }
+        #endregion
+
+        #region Properties
+        public bool Destroyed 
+        {
+            get 
+            {
+                return destroyed;
+            }
+            set 
+            {
+                destroyed = value;
+            }
+        }
+        #endregion
+
+        #region Fields
+        private string objectName;
+        private IObjectFactory owningFactory;
+        private bool postProcessedBeforeInit;
+        private bool inited;
+        private bool postProcessedAfterInit;
+        private bool destroyed;
+        #endregion
+
+        #region IObjectNameAware Members
+        public string ObjectName
+        {
+            get 
+            {
+                return objectName;
+            }
+            set
+            {
+                objectName = value;
+            }
+        }
+        #endregion
+
+        #region IInitializingObject Members
+        public void AfterPropertiesSet ()
+        {
+            if (owningFactory == null)
+            {
+                throw new SystemException ("Factory didn't call ObjectFactory before AfterPropertiesSet on lifecycle object");
+            }
+            if (!postProcessedBeforeInit)
+            {
+                throw new SystemException ("Factory didn't call PostProcessBeforeInit before AfterPropertiesSet on lifecycle object");
+            }
+            if (inited)
+            {
+                throw new SystemException ("Factory called AfterPropertiesSet twice");
+            }
+            inited = true;
+        }
+        #endregion
+
+        #region IObjectFactoryAware Members
+        public IObjectFactory ObjectFactory
+        {
+            get 
+            {
+                return owningFactory;
+            }
+            set
+            {
+                owningFactory = value;
+            }
+        }
+        #endregion
+
+        #region IDisposable Members
+        public void Dispose ()
+        {
+            if (destroyed)
+            {
+                throw new SystemException ("Already destroyed...");
+            }
+            destroyed = true;
+        }
+        #endregion
+
+        #region Inner Class : PostProcessor
+        public class PostProcessor : IObjectPostProcessor
+        {
+			
+            public object PostProcessBeforeInitialization (object obj, string name)
+            {
+                if (obj is LifecycleObject)
+                {
+                    ((LifecycleObject) obj).PostProcessBeforeInit ();
+                }
+                return obj;
+            }
+			
+            public object PostProcessAfterInitialization (object obj, string objectName)
+            {
+                if (obj is LifecycleObject)
+                {
+                    ((LifecycleObject) obj).PostProcessAfterInit ();
+                }
+                return obj;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/MethodReplacerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/MethodReplacerTests.cs
new file mode 100644
index 00000000..2de2739d
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/MethodReplacerTests.cs
@@ -0,0 +1,615 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Unit tests for the method replacement functionality of the Spring IoC container.
+	/// </summary>
+	/// <remarks>
+	/// <p>
+	/// This encapsulates both generic method replacement and its specialization, the
+	/// method lookup variant.
+	/// </p>
+	/// </remarks>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: MethodReplacerTests.cs,v 1.4 2008/05/02 20:08:23 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class MethodReplacerTests
+	{
+		[Test]
+		public void SunnyDayReplaceMethod()
+		{
+			RootObjectDefinition replacerDef = new RootObjectDefinition(typeof (NewsFeedFactory));
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (ReturnsNullNewsFeedManager));
+			managerDef.MethodOverrides.Add(new ReplacedMethodOverride("CreateNewsFeed", "replacer"));
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("replacer", replacerDef);
+			INewsFeedManager manager = (INewsFeedManager) factory["manager"];
+			NewsFeed feed1 = manager.CreateNewsFeed();
+			Assert.IsNotNull(feed1, "The CreateNewsFeed() method is not being replaced.");
+			Assert.AreEqual(NewsFeedFactory.DefaultName, feed1.Name);
+			NewsFeed feed2 = manager.CreateNewsFeed();
+			// NewsFeedFactory always yields a new NewsFeed (see class definition below)...
+			Assert.IsFalse(ReferenceEquals(feed1, feed2));
+		}
+
+        [Test]
+        public void SunnyDayReplaceMethod_WithProtectedVirtual()
+        {
+            RootObjectDefinition replacerDef = new RootObjectDefinition(typeof(NewsFeedFactory));
+
+            RootObjectDefinition managerDef = new RootObjectDefinition(typeof(ProtectedReturnsNullNewsFeedManagerWithVirtualMethod));
+            managerDef.MethodOverrides.Add(new ReplacedMethodOverride("CreateNewsFeed", "replacer"));
+            
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            factory.RegisterObjectDefinition("manager", managerDef);
+            factory.RegisterObjectDefinition("replacer", replacerDef);
+            ProtectedReturnsNullNewsFeedManagerWithVirtualMethod manager = (ProtectedReturnsNullNewsFeedManagerWithVirtualMethod)factory["manager"];
+            NewsFeed feed1 = manager.GrabNewsFeed();
+            Assert.IsNotNull(feed1, "The protected CreateNewsFeed() method is not being replaced.");
+            Assert.AreEqual(NewsFeedFactory.DefaultName, feed1.Name);
+            NewsFeed feed2 = manager.GrabNewsFeed();
+            // NewsFeedFactory always yields a new NewsFeed (see class definition below)...
+            Assert.IsFalse(ReferenceEquals(feed1, feed2));
+            
+        }
+
+		[Test]
+		public void SunnyDayReplaceMethod_WithArgumentAcceptingReplacer()
+		{
+			RootObjectDefinition replacerDef = new RootObjectDefinition(typeof (NewsFeedFactory));
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (NewsFeedManagerWith_Replace_MethodThatTakesArguments));
+			ReplacedMethodOverride theOverride = new ReplacedMethodOverride("CreateNewsFeed", "replacer");
+			// we must specify parameter type fragments...
+			theOverride.AddTypeIdentifier(typeof(string).FullName);
+			managerDef.MethodOverrides.Add(theOverride);
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("replacer", replacerDef);
+			NewsFeedManagerWith_Replace_MethodThatTakesArguments manager = (NewsFeedManagerWith_Replace_MethodThatTakesArguments) factory["manager"];
+			NewsFeed feed1 = manager.CreateNewsFeed("So sad... to be all alone in the world");
+			Assert.IsNotNull(feed1, "The CreateNewsFeed() method is not being replaced.");
+			Assert.AreEqual("So sad... to be all alone in the world", feed1.Name);
+			NewsFeed feed2 = manager.CreateNewsFeed("Oh Muzzy!");
+			// NewsFeedFactory always yields a new NewsFeed (see class definition below)...
+			Assert.IsFalse(ReferenceEquals(feed1, feed2));
+		}
+
+		[Test]
+		public void SunnyDayReplaceMethod_WithArgumentAcceptingReplacerWithNoOverloadingAndNoTypeFragmentsSpecified()
+		{
+			RootObjectDefinition replacerDef = new RootObjectDefinition(typeof (NewsFeedFactory));
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (NewsFeedManagerWith_Replace_MethodThatTakesArguments));
+			ReplacedMethodOverride theOverride = new ReplacedMethodOverride("CreateNewsFeed", "replacer");
+			// no need to specify parameter type fragments if we turn IsOverloaded off (the method is not overloaded)...
+			theOverride.IsOverloaded = false;
+			managerDef.MethodOverrides.Add(theOverride);
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("replacer", replacerDef);
+			NewsFeedManagerWith_Replace_MethodThatTakesArguments manager = (NewsFeedManagerWith_Replace_MethodThatTakesArguments) factory["manager"];
+			NewsFeed feed1 = manager.CreateNewsFeed("So sad... to be all alone in the world");
+			Assert.IsNotNull(feed1, "The CreateNewsFeed() method is not being replaced.");
+			Assert.AreEqual("So sad... to be all alone in the world", feed1.Name);
+			NewsFeed feed2 = manager.CreateNewsFeed("Oh Muzzy!");
+			// NewsFeedFactory always yields a new NewsFeed (see class definition below)...
+			Assert.IsFalse(ReferenceEquals(feed1, feed2));
+		}
+
+		[Test]
+		public void SunnyDayReplaceMethod_WithReplacerThatReturnsVoid()
+		{
+			RootObjectDefinition replacerDef = new RootObjectDefinition(typeof (DoNothingReplacer));
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (NewsFeedManagerThatReturnsVoid));
+			ReplacedMethodOverride theOverride = new ReplacedMethodOverride("DoSomething", "replacer");
+			managerDef.MethodOverrides.Add(theOverride);
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("replacer", replacerDef);
+			NewsFeedManagerThatReturnsVoid manager = (NewsFeedManagerThatReturnsVoid) factory["manager"];
+			manager.DoSomething();
+		}
+
+		/// <summary>
+		/// We don't specify any type fragments, so the method overload check will never pass.
+		/// </summary>
+		[Test]
+		[ExpectedException(typeof(NotImplementedException))]
+		public void SunnyDayReplaceMethod_WithArgumentAcceptingReplacerWithNoTypeFragmentsSpecified()
+		{
+			RootObjectDefinition replacerDef = new RootObjectDefinition(typeof (NewsFeedFactory));
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (NewsFeedManagerWith_Replace_MethodThatTakesArguments));
+			managerDef.MethodOverrides.Add(new ReplacedMethodOverride("CreateNewsFeed", "replacer"));
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("replacer", replacerDef);
+			NewsFeedManagerWith_Replace_MethodThatTakesArguments manager = (NewsFeedManagerWith_Replace_MethodThatTakesArguments) factory["manager"];
+			manager.CreateNewsFeed("So sad... to be all alone in the world");
+		}
+
+		/// <summary>
+		/// A class that requires two lookup method injections.
+		/// </summary>
+		[Test]
+		public void LookupMethodMultiple()
+		{
+			RootObjectDefinition feedDef = new RootObjectDefinition(typeof (NewsFeed));
+			feedDef.IsSingleton = false;
+			feedDef.PropertyValues.Add("name", "Bingo");
+
+			RootObjectDefinition testObjectDef = new RootObjectDefinition(typeof (TestObject));
+			testObjectDef.IsSingleton = false;
+			testObjectDef.PropertyValues.Add("name", "Miki Nakatani");
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (TestObjectAndNewsFeedFactory));
+			managerDef.MethodOverrides.Add(new LookupMethodOverride("CreateNewsFeed", "feed"));
+			managerDef.MethodOverrides.Add(new LookupMethodOverride("CreateTestObject", "test"));
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("feed", feedDef);
+			factory.RegisterObjectDefinition("test", testObjectDef);
+			TestObjectAndNewsFeedFactory manager = (TestObjectAndNewsFeedFactory) factory["manager"];
+
+			INewsFeedManager newsFeedManager = manager;
+			NewsFeed feed1 = newsFeedManager.CreateNewsFeed();
+			Assert.IsNotNull(feed1, "The CreateNewsFeed() method is not being replaced.");
+			NewsFeed feed2 = newsFeedManager.CreateNewsFeed();
+			// assert that the object (prototype) is definitely being looked up each time...
+			Assert.IsFalse(ReferenceEquals(feed1, feed2));
+
+			ITestObjectFactory toFactory = manager;
+			ITestObject to1 = toFactory.CreateTestObject();
+			Assert.IsNotNull(to1, "The CreateTestObject() method is not being replaced.");
+			ITestObject to2 = toFactory.CreateTestObject();
+			// assert that the object (prototype) is definitely being looked up each time...
+			Assert.IsFalse(ReferenceEquals(to1, to2));
+		}
+
+		/// <summary>
+		/// A class that requires both lookup method and replace method injection.
+		/// </summary>
+		[Test]
+		public void LookupAndReplaceMethod()
+		{
+			RootObjectDefinition replacerDef = new RootObjectDefinition(typeof (NewsFeedFactory));
+
+			RootObjectDefinition testObjectDef = new RootObjectDefinition(typeof (TestObject));
+			testObjectDef.IsSingleton = false;
+			testObjectDef.PropertyValues.Add("name", "Miki Nakatani");
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (TestObjectAndNewsFeedFactory));
+			managerDef.MethodOverrides.Add(new ReplacedMethodOverride("CreateNewsFeed", "replacer"));
+			managerDef.MethodOverrides.Add(new LookupMethodOverride("CreateTestObject", "test"));
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("replacer", replacerDef);
+			factory.RegisterObjectDefinition("test", testObjectDef);
+			TestObjectAndNewsFeedFactory manager = (TestObjectAndNewsFeedFactory) factory["manager"];
+
+			INewsFeedManager newsFeedManager = manager;
+			NewsFeed feed1 = newsFeedManager.CreateNewsFeed();
+			Assert.IsNotNull(feed1, "The CreateNewsFeed() method is not being replaced.");
+			NewsFeed feed2 = newsFeedManager.CreateNewsFeed();
+			// assert that the object (prototype) is definitely being looked up each time...
+			Assert.IsFalse(ReferenceEquals(feed1, feed2));
+
+			ITestObjectFactory toFactory = manager;
+			ITestObject to1 = toFactory.CreateTestObject();
+			Assert.IsNotNull(to1, "The CreateTestObject() method is not being replaced.");
+			ITestObject to2 = toFactory.CreateTestObject();
+			// assert that the object (prototype) is definitely being looked up each time...
+			Assert.IsFalse(ReferenceEquals(to1, to2));
+		}
+
+		/// <summary>
+		/// Lookup method injection on an (interface) method that returns null.
+		/// </summary>
+		[Test]
+		public void LookupMethodWithNullMethod()
+		{
+			try
+			{
+				RootObjectDefinition feedDef = new RootObjectDefinition(typeof (NewsFeed));
+				feedDef.IsSingleton = false;
+				feedDef.PropertyValues.Add("name", "Bingo");
+
+				RootObjectDefinition managerDef = new RootObjectDefinition(typeof (ReturnsNullNewsFeedManager));
+				managerDef.MethodOverrides.Add(new LookupMethodOverride("CreateNewsFeed", "feed"));
+
+				DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+				factory.RegisterObjectDefinition("manager", managerDef);
+				factory.RegisterObjectDefinition("feed", feedDef);
+				INewsFeedManager manager = (INewsFeedManager) factory["manager"];
+				NewsFeed feed1 = manager.CreateNewsFeed();
+				Assert.IsNotNull(feed1, "The CreateNewsFeed() method is not being replaced.");
+				NewsFeed feed2 = manager.CreateNewsFeed();
+				// assert that the object (prototype) is definitely being looked up each time...
+				Assert.IsFalse(ReferenceEquals(feed1, feed2));
+			}
+			catch (Exception ex)
+			{
+				Console.Out.WriteLine("ex = {0}", ex);
+			}
+		}
+
+		/// <summary>
+		/// Lookup method injection on an (interface) method that returns null.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// The only difference from the previous (similarly named) test is that
+		/// constructor arguments are passed to the (er) constructor as it (the
+		/// dynamic subclass) is being instantiated by the container.
+		/// </p>
+		/// </remarks>
+		[Test]
+		public void LookupMethodWithNullMethodInstantiatedWithCtorArg()
+		{
+			RootObjectDefinition feedDef = new RootObjectDefinition(typeof (NewsFeed));
+			feedDef.IsSingleton = false;
+			feedDef.PropertyValues.Add("name", "Bingo");
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (ReturnsNullNewsFeedManager));
+			managerDef.MethodOverrides.Add(new LookupMethodOverride("CreateNewsFeed", "feed"));
+			managerDef.ConstructorArgumentValues.AddNamedArgumentValue("name", "Bingo");
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("feed", feedDef);
+			ReturnsNullNewsFeedManager manager = (ReturnsNullNewsFeedManager) factory["manager"];
+			Assert.AreEqual("Bingo", manager.Name);
+			NewsFeed feed1 = manager.CreateNewsFeed();
+			Assert.IsNotNull(feed1, "The CreateNewsFeed() method is not being replaced.");
+			NewsFeed feed2 = manager.CreateNewsFeed();
+			// assert that the object (prototype) is definitely being looked up each time...
+			Assert.IsFalse(ReferenceEquals(feed1, feed2));
+		}
+
+		[Test]
+		public void LookupMethodWithAbstractMethod()
+		{
+			RootObjectDefinition feedDef = new RootObjectDefinition(typeof (NewsFeed));
+			feedDef.IsSingleton = false;
+			feedDef.PropertyValues.Add("name", "Bingo");
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (AbstractNewsFeedManager));
+			managerDef.MethodOverrides.Add(new LookupMethodOverride("CreateNewsFeed", "feed"));
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("feed", feedDef);
+			INewsFeedManager manager = (INewsFeedManager) factory["manager"];
+			NewsFeed feed1 = manager.CreateNewsFeed();
+			Assert.IsNotNull(feed1, "The CreateNewsFeed() method is not being replaced.");
+			NewsFeed feed2 = manager.CreateNewsFeed();
+			// assert that the object (prototype) is definitely being looked up each time...
+			Assert.IsFalse(ReferenceEquals(feed1, feed2));
+		}
+
+		/// <summary>
+		/// Protected methods can also be method injected.
+		/// </summary>
+		[Test]
+		public void LookupMethodWithVirtualProtectedMethod()
+		{
+			RootObjectDefinition feedDef = new RootObjectDefinition(typeof (NewsFeed));
+			feedDef.IsSingleton = false;
+			feedDef.PropertyValues.Add("name", "Bingo");
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (ProtectedReturnsNullNewsFeedManagerWithVirtualMethod));
+			managerDef.MethodOverrides.Add(new LookupMethodOverride("CreateNewsFeed", "feed"));
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("feed", feedDef);
+			ProtectedReturnsNullNewsFeedManagerWithVirtualMethod manager = (ProtectedReturnsNullNewsFeedManagerWithVirtualMethod) factory["manager"];
+			NewsFeed feed1 = manager.GrabNewsFeed();
+			Assert.IsNotNull(feed1, "The CreateNewsFeed() method is not being replaced.");
+			NewsFeed feed2 = manager.GrabNewsFeed();
+			// assert that the object (prototype) is definitely being looked up each time...
+			Assert.IsFalse(ReferenceEquals(feed1, feed2));
+		}
+
+		#region Rainy Day Scenarios
+
+		[Test]
+		[ExpectedException(typeof (ObjectCreationException))]
+		public void FailWithLookupMethodOnSealedClass()
+		{
+			RootObjectDefinition feedDef = new RootObjectDefinition(typeof (NewsFeed));
+			feedDef.IsSingleton = false;
+			feedDef.PropertyValues.Add("name", "Bingo");
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (SealedReturnsNullNewsFeedManager));
+			managerDef.MethodOverrides.Add(new LookupMethodOverride("CreateNewsFeed", "feed"));
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("feed", feedDef);
+			factory.GetObject("manager");
+		}
+
+		[Test]
+		[ExpectedException(typeof (ObjectCreationException))]
+		public void FailWithReplaceMethodOnSealedClass()
+		{
+			RootObjectDefinition replacerDef = new RootObjectDefinition(typeof (NewsFeedFactory));
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (SealedReturnsNullNewsFeedManager));
+			managerDef.MethodOverrides.Add(new ReplacedMethodOverride("CreateNewsFeed", "replacer"));
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("replacer", replacerDef);
+			factory.GetObject("manager");
+		}
+
+		/// <summary>
+		/// Tests that one cannot (obviously) override a protected method that has
+		/// not been explicitly declared virtual on the original class declaration.
+		/// </summary>
+		[Test]
+		[ExpectedException(typeof (ObjectCreationException))]
+		public void FailOnNonVirtualProtectedMethod()
+		{
+			RootObjectDefinition feedDef = new RootObjectDefinition(typeof (NewsFeed));
+			feedDef.IsSingleton = false;
+			feedDef.PropertyValues.Add("name", "Bingo");
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (ProtectedReturnsNullNewsFeedManager));
+			managerDef.MethodOverrides.Add(new LookupMethodOverride("CreateNewsFeed", "feed"));
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("feed", feedDef);
+			factory.GetObject("manager");
+		}
+
+		/// <summary>
+		/// Tests that one cannot (obviously) method inject a method with a void
+		/// return type.
+		/// </summary>
+		[Test]
+		[ExpectedException(typeof (ObjectCreationException))]
+		public void FailOnMethodWithVoidReturnType()
+		{
+			RootObjectDefinition feedDef = new RootObjectDefinition(typeof (NewsFeed));
+			feedDef.IsSingleton = false;
+			feedDef.PropertyValues.Add("name", "Bingo");
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (ReturnsVoidNewsFeedManager));
+			managerDef.MethodOverrides.Add(new LookupMethodOverride("CreateNewsFeed", "feed"));
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("feed", feedDef);
+			factory.GetObject("manager");
+		}
+
+		/// <summary>
+		/// Lookup methods cannot accept any arguments (replace methods can though).
+		/// </summary>
+		[Test]
+		[ExpectedException(typeof (ObjectCreationException))]
+		public void FailOnLookupMethodThatHasArguments()
+		{
+			RootObjectDefinition feedDef = new RootObjectDefinition(typeof (NewsFeed));
+			feedDef.IsSingleton = false;
+			feedDef.PropertyValues.Add("name", "Bingo");
+
+			RootObjectDefinition managerDef = new RootObjectDefinition(typeof (NewsFeedManagerWithLookupMethodThatTakesArguments));
+			managerDef.MethodOverrides.Add(new LookupMethodOverride("CreateNewsFeed", "feed"));
+
+			DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+			factory.RegisterObjectDefinition("manager", managerDef);
+			factory.RegisterObjectDefinition("feed", feedDef);
+			factory.GetObject("manager");
+		}
+
+		#endregion
+	}
+
+
+	public interface INewsFeedManager
+	{
+		NewsFeed CreateNewsFeed();
+	}
+
+	public class ReturnsNullNewsFeedManager : INewsFeedManager
+	{
+		private string name;
+
+		public ReturnsNullNewsFeedManager()
+		{
+		}
+
+		public ReturnsNullNewsFeedManager(string name)
+		{
+			this.name = name;
+		}
+
+		public virtual NewsFeed CreateNewsFeed()
+		{
+			return null;
+		}
+
+		public string Name
+		{
+			get { return name; }
+		}
+	}
+
+	public sealed class SealedReturnsNullNewsFeedManager : INewsFeedManager
+	{
+		public NewsFeed CreateNewsFeed()
+		{
+			return null;
+		}
+	}
+
+	public class ProtectedReturnsNullNewsFeedManager
+	{
+		public NewsFeed GrabNewsFeed()
+		{
+			return CreateNewsFeed();
+		}
+
+		protected NewsFeed CreateNewsFeed()
+		{
+			return null;
+		}
+	}
+
+	public class ProtectedReturnsNullNewsFeedManagerWithVirtualMethod
+	{
+		public NewsFeed GrabNewsFeed()
+		{
+			return CreateNewsFeed();
+		}
+
+		protected virtual NewsFeed CreateNewsFeed()
+		{
+			return null;
+		}
+	}
+
+	/// <summary>
+	/// Just why anyone would want to do method injection on a method with a
+	/// void return type is a question best left for another (earlier) night.
+	/// </summary>
+	public class ReturnsVoidNewsFeedManager
+	{
+		public virtual void CreateNewsFeed()
+		{
+		}
+	}
+
+	public class NewsFeedManagerWithLookupMethodThatTakesArguments
+	{
+		public virtual NewsFeed CreateNewsFeed(string foo, int bar)
+		{
+			return null;
+		}
+	}
+
+	public class NewsFeedManagerThatReturnsVoid
+	{
+		public virtual void DoSomething()
+		{
+		}
+	}
+
+	public class DoNothingReplacer : IMethodReplacer 
+	{
+		public object Implement(object target, MethodInfo method, params object[] arguments)
+		{
+			return null;
+		}
+	}
+
+	public class NewsFeedManagerWith_Replace_MethodThatTakesArguments
+	{
+		public virtual NewsFeed CreateNewsFeed(string headline)
+		{
+			throw new NotImplementedException();
+		}
+	}
+
+	public abstract class AbstractNewsFeedManager : INewsFeedManager
+	{
+		public abstract NewsFeed CreateNewsFeed();
+	}
+
+	public sealed class NewsFeedFactory : IMethodReplacer
+	{
+		public const string DefaultName = "All The News That's Fit To Print";
+
+		public object Implement(object target, MethodInfo method, params object[] arguments)
+		{
+			if (arguments != null && arguments.Length > 0)
+			{
+				string headline = (string) arguments[0];
+				return new NewsFeed(headline);
+			}
+			return new NewsFeed(DefaultName);
+		}
+	}
+
+	public sealed class NewsFeed
+	{
+		private string name;
+
+		public NewsFeed()
+		{
+		}
+
+		public NewsFeed(string name)
+		{
+			this.name = name;
+		}
+
+		public string Name
+		{
+			get { return name; }
+			set { name = value; }
+		}
+	}
+
+	public interface ITestObjectFactory
+	{
+		ITestObject CreateTestObject();
+	}
+
+	public class TestObjectAndNewsFeedFactory : ITestObjectFactory, INewsFeedManager
+	{
+		public virtual ITestObject CreateTestObject()
+		{
+			throw new NotImplementedException();
+		}
+
+		public virtual NewsFeed CreateNewsFeed()
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/MustBeInitialized.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/MustBeInitialized.cs
new file mode 100644
index 00000000..7d2b7020
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/MustBeInitialized.cs
@@ -0,0 +1,68 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory {
+
+	/// <summary>
+	/// Simple test of IObjectFactory initialization.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Rick Evans (.NET)</author>
+    public class MustBeInitialized : IInitializingObject 
+    {
+
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the <see cref="Spring.Objects.Factory.MustBeInitialized"/> class.
+        /// </summary>
+        public MustBeInitialized() {}
+        #endregion
+
+        #region Methods
+        public void AfterPropertiesSet () 
+        {
+            inited = true;
+        }
+
+        /// <summary>
+        /// Dummy business method that will fail unless the factory
+        /// managed the object's lifecycle correctly.
+        /// </summary>
+        public virtual void BusinessMethod ()
+        {
+            if (!inited) 
+            {
+                throw new SystemException (
+                    "Factory didn't call AfterPropertiesSet () on MustBeInitialized object");
+            }
+        }
+        #endregion
+
+        #region Fields
+        private bool inited;
+        #endregion
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/NoSuchObjectDefinitionExceptionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/NoSuchObjectDefinitionExceptionTests.cs
new file mode 100644
index 00000000..c21fa118
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/NoSuchObjectDefinitionExceptionTests.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright 2004 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.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+using NUnit.Framework;
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Unit tests for the NoSuchObjectDefinitionException class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: NoSuchObjectDefinitionExceptionTests.cs,v 1.3 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class NoSuchObjectDefinitionExceptionTests
+	{
+		public const string NotFoundObjectDefinitionName = "myObject";
+
+		public static readonly Type NotFoundObjectDefinitionType = typeof (TestObject);
+
+		[Test]
+		public void SerializesObjectNameFieldCorrectly()
+		{
+			NoSuchObjectDefinitionException ex
+				= new NoSuchObjectDefinitionException(NotFoundObjectDefinitionName, "Cannot dynamically build object key...");
+			NoSuchObjectDefinitionException deserializedException = Serialize(ex);
+			Assert.IsNotNull(deserializedException);
+			Assert.AreEqual(NotFoundObjectDefinitionName, deserializedException.ObjectName, "'ObjectName' property was not serialized correctly.");
+		}
+
+		[Test]
+		public void SerializesObjectTypeFieldCorrectly()
+		{
+			NoSuchObjectDefinitionException ex
+				= new NoSuchObjectDefinitionException(NotFoundObjectDefinitionType, null);
+			NoSuchObjectDefinitionException deserializedException = Serialize(ex);
+			Assert.IsNotNull(deserializedException);
+			Assert.AreEqual(NotFoundObjectDefinitionType, deserializedException.ObjectType, "'ObjectType' property was not serialized correctly.");
+		}
+
+		private NoSuchObjectDefinitionException Serialize(NoSuchObjectDefinitionException inputException)
+		{
+			NoSuchObjectDefinitionException deserializedException = null;
+			string tempDir = Environment.GetEnvironmentVariable("TEMP");
+			string tempFilename = tempDir + @"\foo.dat";
+			FileInfo file = new FileInfo(tempFilename);
+			try
+			{
+				Stream outstream = file.OpenWrite();
+				new BinaryFormatter().Serialize(outstream, inputException);
+				outstream.Flush();
+				outstream.Close();
+				Stream instream = file.OpenRead();
+				deserializedException = new BinaryFormatter().Deserialize(instream) as NoSuchObjectDefinitionException;
+				instream.Close();
+			}
+			finally
+			{
+				try
+				{
+					file.Delete();
+				}
+				catch
+				{
+				}
+			}
+			return deserializedException;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectDefinitionStoreExceptionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectDefinitionStoreExceptionTests.cs
new file mode 100644
index 00000000..100dbeeb
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectDefinitionStoreExceptionTests.cs
@@ -0,0 +1,111 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Core.IO;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Unit tests for the ObjectDefinitionStoreException class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: ObjectDefinitionStoreExceptionTests.cs,v 1.5 2007/08/08 17:49:04 bbaia Exp $</version>
+	[TestFixture]
+	public sealed class ObjectDefinitionStoreExceptionTests
+	{
+		[Test]
+		public void FromResource()
+		{
+			string expectedName = "bing";
+			string expectedResourceDescription = "mock.resource";
+			DynamicMock mock = new DynamicMock(typeof(IResource));
+			mock.ExpectAndReturn("Description", expectedResourceDescription);
+			IResource resource = (IResource) mock.Object;
+			ObjectDefinitionStoreException inex
+				= new ObjectDefinitionStoreException(resource, expectedName, "mmm...");
+			mock.Verify();
+			CheckSerialization(inex, expectedName, expectedResourceDescription);
+		}
+
+		[Test]
+		public void FromNullResource()
+		{
+			string expectedName = "bing";
+			string expectedResourceDescription = string.Empty;
+			ObjectDefinitionStoreException inex
+				= new ObjectDefinitionStoreException(
+				(IResource) null, expectedName, "mmm...");
+			CheckSerialization(inex, expectedName,
+				expectedResourceDescription);
+		}
+
+		[Test]
+		public void SerializesWithNoState()
+		{
+			ObjectDefinitionStoreException inex
+				= new ObjectDefinitionStoreException();
+			CheckSerialization(inex, string.Empty, string.Empty);
+		}
+
+		[Test]
+		public void SerializesWithJustExceptionMessage()
+		{
+			string expectedName = string.Empty;
+			string expectedResourceDescription = string.Empty;
+			string expectedMessage = "Woppadoosa";
+			ObjectDefinitionStoreException inex
+				= new ObjectDefinitionStoreException(expectedMessage);
+			CheckSerialization(inex, expectedName,
+				expectedResourceDescription);
+		}
+
+		[Test]
+		public void SerializesAllState()
+		{
+			string expectedName = "bing";
+			string expectedResourceDescription = "foo.txt";
+			ObjectDefinitionStoreException inex
+				= new ObjectDefinitionStoreException(
+				expectedResourceDescription, expectedName, "mmm...");
+			CheckSerialization(inex, expectedName,
+				expectedResourceDescription);
+		}
+
+		private static void CheckSerialization(
+			ObjectDefinitionStoreException inex, string expectedName,
+			string expectedResourceDescription)
+		{
+			ObjectDefinitionStoreException outex = (ObjectDefinitionStoreException)
+				SerializationTestUtils.SerializeAndDeserialize(inex);
+			Assert.AreEqual(expectedName, outex.ObjectName,
+			                "The 'ObjectName' property was not serialized / deserialized correctly.");
+			Assert.AreEqual(expectedResourceDescription, outex.ResourceDescription,
+				"The 'ResourceDescription' property was not serialized / deserialized correctly.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs
new file mode 100644
index 00000000..f955b16b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs
@@ -0,0 +1,223 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Unit tests for the ObjectFactoryUtils class.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	/// <author>Rick Evans (.NET)</author>
+	[TestFixture]
+	public sealed class ObjectFactoryUtilsTests
+	{
+		private IConfigurableListableObjectFactory _factory;
+
+		[SetUp]
+		public void SetUp()
+		{
+			IObjectFactory grandparent
+				= new XmlObjectFactory(new ReadOnlyXmlTestResource("root.xml", GetType()));
+			IObjectFactory parent
+				= new XmlObjectFactory(new ReadOnlyXmlTestResource("middle.xml", GetType()), grandparent);
+			IConfigurableListableObjectFactory child
+				= new XmlObjectFactory(new ReadOnlyXmlTestResource("leaf.xml", GetType()), parent);
+			_factory = child;
+		}
+
+		/// <summary>
+		/// Check that override doesn't count as two separate objects.
+		/// </summary>
+		[Test]
+		public void CountObjectsIncludingAncestors()
+		{
+			// leaf count...
+			Assert.AreEqual(1, _factory.ObjectDefinitionCount);
+			// count minus duplicate...
+			Assert.AreEqual(6, ObjectFactoryUtils.CountObjectsIncludingAncestors(_factory),
+			                "Should count 6 objects, not " + ObjectFactoryUtils.CountObjectsIncludingAncestors(_factory));
+		}
+
+		[Test]
+		public void ObjectNamesIncludingAncestors()
+		{
+			IList names = ObjectFactoryUtils.ObjectNamesIncludingAncestors(_factory);
+			Assert.AreEqual(6, names.Count);
+		}
+
+		[Test]
+		public void ObjectNamesForType()
+		{
+			IList names = ObjectFactoryUtils.ObjectNamesForTypeIncludingAncestors(_factory, typeof (ITestObject));
+			// includes 2 TestObjects from IFactoryObjects (DummyFactory definitions)
+			Assert.AreEqual(4, names.Count);
+			Assert.IsTrue(names.Contains("test"));
+			Assert.IsTrue(names.Contains("test3"));
+			Assert.IsTrue(names.Contains("testFactory1"));
+			Assert.IsTrue(names.Contains("testFactory2"));
+		}
+
+		[Test]
+		public void CountObjectsIncludingAncestorsWithNonHierarchicalFactory()
+		{
+			StaticListableObjectFactory lof = new StaticListableObjectFactory();
+			lof.AddObject("t1", new TestObject());
+			lof.AddObject("t2", new TestObject());
+			Assert.IsTrue(ObjectFactoryUtils.CountObjectsIncludingAncestors(lof) == 2);
+		}
+
+		[Test]
+		public void HierarchicalResolutionWithOverride()
+		{
+			object test3 = _factory.GetObject("test3");
+			object test = _factory.GetObject("test");
+			object testFactory1 = _factory.GetObject("testFactory1");
+
+			IDictionary objects = ObjectFactoryUtils.ObjectsOfTypeIncludingAncestors(_factory, typeof (ITestObject), true, false);
+			Assert.AreEqual(2, objects.Count);
+			Assert.AreEqual(test3, objects["test3"]);
+			Assert.AreEqual(test, objects["test"]);
+			objects = ObjectFactoryUtils.ObjectsOfTypeIncludingAncestors(_factory, typeof (ITestObject), false, false);
+			Assert.AreEqual(1, objects.Count);
+			Assert.AreEqual(test, objects["test"]);
+			objects = ObjectFactoryUtils.ObjectsOfTypeIncludingAncestors(_factory, typeof (ITestObject), false, true);
+			Assert.AreEqual(2, objects.Count);
+			Assert.AreEqual(test, objects["test"]);
+			Assert.AreEqual(testFactory1, objects["testFactory1"]);
+			objects = ObjectFactoryUtils.ObjectsOfTypeIncludingAncestors(_factory, typeof (ITestObject), true, true);
+			Assert.AreEqual(4, objects.Count);
+			Assert.AreEqual(test3, objects["test3"]);
+			Assert.AreEqual(test, objects["test"]);
+			Assert.AreEqual(testFactory1, objects["testFactory1"]);
+			Assert.IsTrue(objects["testFactory2"] is ITestObject);
+			objects = ObjectFactoryUtils.ObjectsOfTypeIncludingAncestors(_factory, typeof (DummyFactory), true, true);
+			Assert.AreEqual(2, objects.Count);
+			Assert.AreEqual(_factory.GetObject("&testFactory1"), objects["&testFactory1"]);
+			Assert.AreEqual(_factory.GetObject("&testFactory2"), objects["&testFactory2"]);
+			objects = ObjectFactoryUtils.ObjectsOfTypeIncludingAncestors(_factory, typeof (IFactoryObject), true, true);
+			Assert.AreEqual(2, objects.Count);
+			Assert.AreEqual(_factory.GetObject("&testFactory1"), objects["&testFactory1"]);
+			Assert.AreEqual(_factory.GetObject("&testFactory2"), objects["&testFactory2"]);
+		}
+
+		[Test]
+		[ExpectedException(typeof (NoSuchObjectDefinitionException),
+			"No unique object of type [Spring.Objects.ITestObject] is defined : Expected single object but found 4")]
+		public void ObjectOfTypeIncludingAncestorsWithMoreThanOneObjectOfType()
+		{
+			ObjectFactoryUtils.ObjectOfTypeIncludingAncestors(_factory, typeof (ITestObject), true, true);
+		}
+
+		[Test]
+		public void NoObjectsOfTypeIncludingAncestors()
+		{
+			StaticListableObjectFactory lof = new StaticListableObjectFactory();
+			lof.AddObject("foo", new object());
+			IDictionary objects = ObjectFactoryUtils.ObjectsOfTypeIncludingAncestors(lof, typeof (ITestObject), true, false);
+			Assert.IsTrue(objects.Count == 0);
+		}
+
+		[Test]
+		public void ObjectsOfTypeIncludingAncestorsWithStaticFactory()
+		{
+			StaticListableObjectFactory lof = new StaticListableObjectFactory();
+			TestObject t1 = new TestObject();
+			TestObject t2 = new TestObject();
+			DummyFactory t3 = new DummyFactory();
+			DummyFactory t4 = new DummyFactory();
+            t4.IsSingleton = false;
+			lof.AddObject("t1", t1);
+			lof.AddObject("t2", t2);
+			lof.AddObject("t3", t3);
+			t3.AfterPropertiesSet(); // StaticListableObjectFactory does support lifecycle calls.
+            lof.AddObject("t4", t4);
+			t4.AfterPropertiesSet(); // StaticListableObjectFactory does support lifecycle calls.
+			IDictionary objects = ObjectFactoryUtils.ObjectsOfTypeIncludingAncestors(lof, typeof(ITestObject), true, false);
+			Assert.AreEqual(2, objects.Count);
+			Assert.AreEqual(t1, objects["t1"]);
+			Assert.AreEqual(t2, objects["t2"]);
+			objects = ObjectFactoryUtils.ObjectsOfTypeIncludingAncestors(lof, typeof (ITestObject), false, true);
+			Assert.AreEqual(3, objects.Count);
+			Assert.AreEqual(t1, objects["t1"]);
+			Assert.AreEqual(t2, objects["t2"]);
+			Assert.AreEqual(t3.GetObject(), objects["t3"]);
+			objects = ObjectFactoryUtils.ObjectsOfTypeIncludingAncestors(lof, typeof (ITestObject), true, true);
+			Assert.AreEqual(4, objects.Count);
+			Assert.AreEqual(t1, objects["t1"]);
+			Assert.AreEqual(t2, objects["t2"]);
+			Assert.AreEqual(t3.GetObject(), objects["t3"]);
+			Assert.IsTrue(objects["t4"] is TestObject);
+		}
+
+		[Test]
+		public void IsFactoryDereferenceWithNonFactoryObjectName()
+		{
+			Assert.IsFalse(ObjectFactoryUtils.IsFactoryDereference("roob"),
+				"Name that didn't start with the factory object prefix is being reported " +
+				"(incorrectly) as a factory object dereference.");
+		}
+
+		[Test]
+		public void IsFactoryDereferenceWithNullName()
+		{
+			Assert.IsFalse(ObjectFactoryUtils.IsFactoryDereference(null),
+				"Null name that (obviously) didn't start with the factory object prefix is being reported " +
+				"(incorrectly) as a factory object dereference.");
+		}
+
+		[Test]
+		public void IsFactoryDereferenceWithEmptyName()
+		{
+			Assert.IsFalse(ObjectFactoryUtils.IsFactoryDereference(string.Empty),
+				"String.Empty name that (obviously) didn't start with the factory object prefix is being reported " +
+				"(incorrectly) as a factory object dereference.");
+		}
+
+		[Test]
+		public void IsFactoryDereferenceWithJustTheFactoryObjectPrefixCharacter()
+		{
+			Assert.IsFalse(ObjectFactoryUtils.IsFactoryDereference(
+				ObjectFactoryUtils.FactoryObjectPrefix),
+				"Name that consisted solely of the factory object prefix is being reported " +
+				"(incorrectly) as a factory object dereference.");
+		}
+
+		[Test]
+		public void IsFactoryDereferenceSunnyDay()
+		{
+			Assert.IsTrue(ObjectFactoryUtils.IsFactoryDereference(
+				ObjectFactoryUtils.FactoryObjectPrefix + "roob"),
+				"Name that did start with the factory object prefix is not being reported " +
+				"(incorrectly) as a factory object dereference.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/SideEffectObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/SideEffectObject.cs
new file mode 100644
index 00000000..22c59cbf
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/SideEffectObject.cs
@@ -0,0 +1,48 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+
+namespace Spring.Objects.Factory
+{
+	/// <summary>
+	/// Object that changes state on a business invocation, so that
+	/// we can check whether it's been invoked.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	public class SideEffectObject : ISideEffectObject
+	{
+		private int _count;
+
+		public int Count
+		{
+			get
+			{
+				return _count;
+			}
+			set
+			{
+				this._count = value;
+			}
+		}
+
+		public void doWork()
+		{
+			_count++;
+		}
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/AutowireUtilsTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/AutowireUtilsTests.cs
new file mode 100644
index 00000000..dcebd7ff
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/AutowireUtilsTests.cs
@@ -0,0 +1,297 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Unit tests for the AutowireUtilsTests class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: AutowireUtilsTests.cs,v 1.3 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class AutowireUtilsTests
+	{
+		#region GetTypeDifferenceWeight Tests
+
+		[Test]
+		public void GetTypeDifferenceWeightForZeroArgCtor()
+		{
+			int expectedWeight = 0;
+			int actualWeight = AutowireUtils.GetTypeDifferenceWeight(
+				typeof (Fable).GetConstructor(Type.EmptyTypes).GetParameters(), new object[] {});
+			Assert.AreEqual(expectedWeight, actualWeight, "AutowireUtils.GetTypeDifferenceWeight() was wrong, evidently.");
+		}
+
+		[Test]
+		public void GetTypeDifferenceWeightWhenPassingDerivedTypeArgsToBaseTypeCtor()
+		{
+			int expectedWeight = 1;
+			int actualWeight = AutowireUtils.GetTypeDifferenceWeight(
+				typeof (Fable).GetConstructor(
+					new Type[] {typeof (NurseryRhymeCharacter)}).GetParameters(),
+				new object[] {new EnglishCharacter()});
+			Assert.AreEqual(expectedWeight, actualWeight, "AutowireUtils.GetTypeDifferenceWeight() was wrong, evidently.");
+		}
+
+		[Test]
+		public void GetTypeDifferenceWeightWhenPassingExactTypeMatch()
+		{
+			int expectedWeight = 0;
+			int actualWeight = AutowireUtils.GetTypeDifferenceWeight(
+				typeof (Fable).GetConstructor(
+					new Type[] {typeof (EnglishCharacter)}).GetParameters(),
+				new object[] {new EnglishCharacter()});
+			Assert.AreEqual(expectedWeight, actualWeight, "AutowireUtils.GetTypeDifferenceWeight() was wrong, evidently.");
+		}
+
+		/// <summary>
+		/// We want to use the ctor with the most specific argument type... so in the case of the test
+		/// classes used in this test, when we create a new instance of the Fable class using a
+		/// PeterPumpkinEater instance, we want the Fable(PeterPumpkinEater) ctor to be picked in
+		/// preference to any of the (still valid) ctors that accept Types that the PeterPumpkinEater
+		/// class inherits from.
+		/// </summary>
+		[Test]
+		public void UsingTypeDifferenceWeightPicksMostSpecificCtor()
+		{
+			object[] arguments = new object[] {new EnglishCharacter()};
+			ConstructorInfo expectedCtor
+				= typeof (Fable).GetConstructor(new Type[] {typeof (EnglishCharacter)});
+			ConstructorInfo pickedCtor = AssertTypeWeightingPicksCorrectCtor(arguments, typeof (Fable));
+			Assert.IsNotNull(pickedCtor);
+			Assert.AreEqual(expectedCtor, pickedCtor);
+		}
+
+		[Test]
+		public void UsingTypeDifferenceWeightPicksNothingWhenGivenAnIncompatibleArgument()
+		{
+			object[] arguments = new object[] {"This argument is incompatible with any of the Fable ctors."};
+			ConstructorInfo pickedCtor = AssertTypeWeightingPicksCorrectCtor(arguments, typeof (Fable));
+			Assert.IsNull(pickedCtor);
+		}
+
+		[Test]
+		public void UsingTypeDifferenceWeightPicksMostGenericCtorWhenGivenA_NULL_Argument()
+		{
+			// using null means that we can match anything that takes an object as an argument...
+			object[] arguments = new object[] {null};
+			// we'll want to pick the 'least' specific (most generic) ctor that we can find...
+			ConstructorInfo expectedCtor
+				= typeof (Fable).GetConstructor(new Type[] {typeof (FableCharacter)});
+			ConstructorInfo pickedCtor = AssertTypeWeightingPicksCorrectCtor(arguments, typeof (Fable));
+			Assert.IsNotNull(pickedCtor);
+			Assert.AreEqual(expectedCtor, pickedCtor);
+		}
+
+		private static ConstructorInfo AssertTypeWeightingPicksCorrectCtor(object[] arguments, Type ctorType)
+		{
+			ConstructorInfo pickedCtor = null;
+			// we want to pick the ctor that has the lowest type difference weight...
+			ConstructorInfo[] ctors = ctorType.GetConstructors();
+			int weighting = Int32.MaxValue;
+			foreach (ConstructorInfo ctor in ctors)
+			{
+				ParameterInfo[] parameters = ctor.GetParameters();
+				if (parameters.Length == arguments.Length)
+				{
+					int weight = AutowireUtils.GetTypeDifferenceWeight(parameters, arguments);
+					if (weight < weighting)
+					{
+						pickedCtor = ctor;
+						weighting = weight;
+					}
+				}
+			}
+			return pickedCtor;
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException),
+			"Cannot calculate the type difference weight for argument types and arguments with differing lengths.")]
+		public void GetTypeDifferenceWeightWithMismatchedLengths()
+		{
+			AutowireUtils.GetTypeDifferenceWeight(new ParameterInfo[] {}, new object[] {1});
+		}
+
+		[Test]
+		[ExpectedException(typeof (NullReferenceException))]
+		public void GetTypeDifferenceWeightWithNullParameterTypes()
+		{
+			AutowireUtils.GetTypeDifferenceWeight(null, new object[] {});
+		}
+
+		[Test]
+		[ExpectedException(typeof (NullReferenceException))]
+		public void GetTypeDifferenceWeightWithNullArgumentTypes()
+		{
+			AutowireUtils.GetTypeDifferenceWeight(
+				typeof (Fable).GetConstructor(new Type[] {typeof (FableCharacter)}).GetParameters(), null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (NullReferenceException))]
+		public void GetTypeDifferenceWeightWithAllNulls()
+		{
+			AutowireUtils.GetTypeDifferenceWeight(null, null);
+		}
+
+		[Test]
+		public void GetTypeDifferenceWeightWithSameTypes()
+		{
+			int expectedWeight = 0;
+			int actualWeight = AutowireUtils.GetTypeDifferenceWeight(
+				typeof (Fool).GetConstructor(new Type[] {typeof (string)}).GetParameters(),
+				new object[] {"Noob"});
+			Assert.AreEqual(expectedWeight, actualWeight, "AutowireUtils.GetTypeDifferenceWeight() was wrong, evidently.");
+		}
+
+		#endregion
+
+		#region SortConstructors Tests
+
+		[Test]
+		public void SortCtorsReallyIsGreedy()
+		{
+			BindingFlags flags = BindingFlags.Public | BindingFlags.Instance;
+			Type foolType = typeof (Fool);
+			ConstructorInfo[] ctors = foolType.GetConstructors(flags);
+			AutowireUtils.SortConstructors(ctors);
+			ConstructorInfo[] expected = new ConstructorInfo[]
+				{
+					foolType.GetConstructor(new Type[] {typeof (string), typeof (int), typeof (Double), typeof (Fool)}),
+					foolType.GetConstructor(new Type[] {typeof (string), typeof (int)}),
+					foolType.GetConstructor(new Type[] {typeof (string)}),
+					foolType.GetConstructor(Type.EmptyTypes),
+				};
+			Assert.IsTrue(ArrayUtils.AreEqual(expected, ctors), "AutowireUtils.SortConstructors() did not put the greedy public ctors first.");
+		}
+
+		[Test]
+		public void SortCtorsReallyDoesFavourPublicOnes()
+		{
+			BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
+			Type foolType = typeof (Fool);
+			ConstructorInfo[] ctors = foolType.GetConstructors(flags);
+			AutowireUtils.SortConstructors(ctors);
+			ConstructorInfo[] expected = new ConstructorInfo[]
+				{
+					foolType.GetConstructor(new Type[] {typeof (string), typeof (int), typeof (Double), typeof (Fool)}),
+					foolType.GetConstructor(new Type[] {typeof (string), typeof (int)}),
+					foolType.GetConstructor(new Type[] {typeof (string)}),
+					foolType.GetConstructor(Type.EmptyTypes),
+					foolType.GetConstructor(flags, null, new Type[] {typeof (string), typeof (int), typeof (Double)}, null),
+					foolType.GetConstructor(flags, null, new Type[] {typeof (string), typeof (Fool)}, null),
+				};
+			Assert.IsTrue(ArrayUtils.AreEqual(expected, ctors), "AutowireUtils.SortConstructors() did not put the greedy public ctors first.");
+		}
+
+		[Test]
+		public void SortCtorsBailsSilentlyWhenGivenNull()
+		{
+			AutowireUtils.SortConstructors(null);
+		}
+
+		#endregion
+
+		#region Inner Class used to test ctor sorting
+
+		private class Fool
+		{
+			private string _name;
+			private int _age;
+			private Double _money;
+			private Fool _mate;
+
+			public Fool()
+			{
+			}
+
+			public Fool(string name) : this(name, 0)
+			{
+			}
+
+			public Fool(string name, int age) : this(name, age, 10.9D)
+			{
+			}
+
+			protected Fool(string name, int age, Double money)
+			{
+				_name = name;
+				_age = age;
+				_money = money;
+			}
+
+			public Fool(string name, int age, Double money, Fool mate) : this(name, age, money)
+			{
+				_mate = mate;
+			}
+
+			private Fool(string name, Fool mate) : this(name, 0, 10.9D, mate)
+			{
+			}
+		}
+
+		#endregion
+
+		#region Inner Classes (deep inheritance chain) used to test type weighting
+
+		private sealed class Fable
+		{
+			public Fable()
+			{
+			}
+
+			public Fable(FableCharacter character)
+			{
+			}
+
+			public Fable(NurseryRhymeCharacter character)
+			{
+			}
+
+			public Fable(EnglishCharacter character)
+			{
+			}
+		}
+
+		private class FableCharacter
+		{
+		}
+
+		private class NurseryRhymeCharacter : FableCharacter
+		{
+		}
+
+		private sealed class EnglishCharacter : NurseryRhymeCharacter
+		{
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ChildObjectDefinitionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ChildObjectDefinitionTests.cs
new file mode 100644
index 00000000..37926969
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ChildObjectDefinitionTests.cs
@@ -0,0 +1,73 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Unit tests for the ChildObjectDefinition class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ChildObjectDefinitionTests.cs,v 1.3 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class ChildObjectDefinitionTests
+    {
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionValidationException))]
+        public void ChokesIfParentNamePropertyIsNullAtValidationTime()
+        {
+            new ChildObjectDefinition(null, null).Validate();
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionValidationException))]
+        public void ChokesIfParentNamePropertyIsEmptyAtValidationTime()
+        {
+            new ChildObjectDefinition(String.Empty, null).Validate();
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionValidationException))]
+        public void ChokesIfParentNamePropertyIsJustWhitespaceAtValidationTime()
+        {
+            new ChildObjectDefinition("    ", null).Validate();
+        }
+
+	    [Test]
+	    public void Ctor_ParentNameOnly()
+	    {
+	        const string expectedParentName = "foo";
+	        ChildObjectDefinition def = new ChildObjectDefinition(expectedParentName);
+            Assert.AreEqual(expectedParentName, def.ParentName,
+                "ParentName property not initialized correctly by ctor.");
+            Assert.IsNotNull(def.PropertyValues,
+                "PropertyValues must be init'd to a non-null collection if not explicitly supplied.");
+            Assert.AreEqual(0, def.PropertyValues.PropertyValues.Length, 
+                "PropertyValues must be init'd to an empty collection if not explicitly supplied.");
+	    }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DefaultObjectDefinitionFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DefaultObjectDefinitionFactoryTests.cs
new file mode 100644
index 00000000..55b12610
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DefaultObjectDefinitionFactoryTests.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Unit tests for the DefaultObjectDefinitionFactory class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: DefaultObjectDefinitionFactoryTests.cs,v 1.3 2007/05/28 19:14:18 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class DefaultObjectDefinitionFactoryTests
+	{
+		[Test]
+		public void CreateRootDefinition()
+		{
+			DefaultObjectDefinitionFactory factory = new DefaultObjectDefinitionFactory();
+			IConfigurableObjectDefinition definition
+				= factory.CreateObjectDefinition(
+					typeof (TestObject).FullName, null, AppDomain.CurrentDomain);
+			Assert.IsNotNull(definition, "CreateObjectDefinition with no parent is returning null (it must never do so).");
+			Assert.AreEqual(typeof (TestObject), definition.ObjectType);
+			Assert.AreEqual(0, definition.PropertyValues.PropertyValues.Length,
+			                "Must not have any property values as none were passed in.");
+			Assert.AreEqual(0, definition.ConstructorArgumentValues.ArgumentCount,
+			                "Must not have any ctor args as none were passed in.");
+		}
+
+		[Test]
+		public void CreateChildDefinition()
+		{
+			DefaultObjectDefinitionFactory factory = new DefaultObjectDefinitionFactory();
+			IConfigurableObjectDefinition definition
+				= factory.CreateObjectDefinition(
+					typeof (TestObject).FullName, "Aimee Mann", AppDomain.CurrentDomain);
+			Assert.IsNotNull(definition, "CreateObjectDefinition with no parent is returning null (it must never do so).");
+			Assert.AreEqual(typeof (TestObject), definition.ObjectType);
+			Assert.AreEqual(0, definition.PropertyValues.PropertyValues.Length,
+			                "Must not have any property values as none were passed in.");
+			Assert.AreEqual(0, definition.ConstructorArgumentValues.ArgumentCount,
+			                "Must not have any ctor args as none were passed in.");
+		}
+
+		[Test]
+		public void DoesNotResolveTypeNameToFullTypeInstanceIfAppDomainIsNull()
+		{
+			DefaultObjectDefinitionFactory factory = new DefaultObjectDefinitionFactory();
+			IConfigurableObjectDefinition definition
+				= factory.CreateObjectDefinition(
+					typeof (TestObject).FullName, null, null);
+			Assert.IsNotNull(definition, "CreateObjectDefinition with no parent is returning null (it must never do so).");
+			Assert.AreEqual(typeof (TestObject).FullName, definition.ObjectTypeName);
+			Assert.AreEqual(0, definition.PropertyValues.PropertyValues.Length,
+			                "Must not have any property values as none were passed in.");
+			Assert.AreEqual(0, definition.ConstructorArgumentValues.ArgumentCount,
+			                "Must not have any ctor args as none were passed in.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingMethodReplacerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingMethodReplacerTests.cs
new file mode 100644
index 00000000..ad8fbd55
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingMethodReplacerTests.cs
@@ -0,0 +1,82 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Unit tests for the DelegatingMethodReplacer class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: DelegatingMethodReplacerTests.cs,v 1.3 2007/07/30 17:52:33 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class DelegatingMethodReplacerTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithNullDefinition()
+		{
+			IDynamicMock mock = new DynamicMock(typeof (IObjectFactory));
+			new DelegatingMethodReplacer(null, (IObjectFactory) mock.Object);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithNullFactory()
+		{
+            IDynamicMock mock = new DynamicMock(typeof(IConfigurableObjectDefinition));
+            new DelegatingMethodReplacer((IConfigurableObjectDefinition)mock.Object, null);
+		}
+
+		[Test]
+		public void SunnyDayPath()
+		{
+			IDynamicMock mockFactory = new DynamicMock(typeof (IObjectFactory));
+			IDynamicMock mockDefinition = new DynamicMock(typeof (IConfigurableObjectDefinition));
+			IDynamicMock mockReplacer = new DynamicMock(typeof (IMethodReplacer));
+
+			const string ReplacerObjectName = "replacer";
+			mockFactory.ExpectAndReturn("GetObject", mockReplacer.Object, ReplacerObjectName);
+
+			ReplacedMethodOverride ovr = new ReplacedMethodOverride("SunnyDayPath", ReplacerObjectName);
+			MethodOverrides overrides = new MethodOverrides();
+			overrides.Add(ovr);
+			mockDefinition.ExpectAndReturn("MethodOverrides", overrides);
+
+			mockReplacer.ExpectAndReturn("Implement", null);
+            DelegatingMethodReplacer replacer = new DelegatingMethodReplacer((IConfigurableObjectDefinition)mockDefinition.Object, (IObjectFactory)mockFactory.Object);
+			MethodInfo method = (MethodInfo) MethodBase.GetCurrentMethod();
+			replacer.Implement(this, method, new object[] {});
+
+			mockFactory.Verify();
+			mockDefinition.Verify();
+			mockReplacer.Verify();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodOverrideTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodOverrideTests.cs
new file mode 100644
index 00000000..4381e99e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodOverrideTests.cs
@@ -0,0 +1,117 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Unit tests for the LookupMethodOverride class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: LookupMethodOverrideTests.cs,v 1.2 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class LookupMethodOverrideTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithNullMethodName()
+		{
+			new LookupMethodOverride(null, null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithEmptyMethodName()
+		{
+			new LookupMethodOverride(string.Empty, null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithWhitespacedMethodName()
+		{
+			new LookupMethodOverride("  ", null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithNullMethodReplacerObjectName()
+		{
+			new LookupMethodOverride("foo", null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithEmptyMethodReplacerObjectName()
+		{
+			new LookupMethodOverride("foo", string.Empty);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithWhitespacedMethodReplacerObjectName()
+		{
+			new LookupMethodOverride("foo", "  ");
+		}
+
+		[Test]
+		public void Matches_TotallyDifferentMethodName()
+		{
+			LookupMethodOverride methodOverride = new LookupMethodOverride("Bingo", "foo");
+			Assert.IsFalse(methodOverride.Matches(typeof (Feeder).GetMethod("GetGrub")));
+		}
+
+		[Test]
+		public void Matches_MatchingMethodName()
+		{
+			LookupMethodOverride methodOverride = new LookupMethodOverride("GetGrub", "foo");
+			Assert.IsTrue(methodOverride.Matches(typeof (Feeder).GetMethod("GetGrub")));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void MatchesWithNullMethod()
+		{
+			LookupMethodOverride methodOverride = new LookupMethodOverride("Execute", "foo");
+			methodOverride.Matches(null);
+		}
+
+		[Test]
+		public void ToStringWorks()
+		{
+			LookupMethodOverride methodOverride = new LookupMethodOverride("GetGrub", "foo");
+			Assert.AreEqual(typeof (LookupMethodOverride).Name + " for method 'GetGrub'; will return object 'foo'.", methodOverride.ToString());
+		}
+
+		private sealed class Feeder
+		{
+			public object GetGrub()
+			{
+				return null;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodReplacerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodReplacerTests.cs
new file mode 100644
index 00000000..7f66a77e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/LookupMethodReplacerTests.cs
@@ -0,0 +1,83 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Unit tests for the LookupMethodReplacer class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: LookupMethodReplacerTests.cs,v 1.3 2007/07/30 17:52:33 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class LookupMethodReplacerTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithNullDefinition()
+		{
+			IDynamicMock mock = new DynamicMock(typeof (IObjectFactory));
+			new LookupMethodReplacer(null, (IObjectFactory) mock.Object);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithNullFactory()
+		{
+            IDynamicMock mock = new DynamicMock(typeof(IConfigurableObjectDefinition));
+            new LookupMethodReplacer((IConfigurableObjectDefinition)mock.Object, null);
+		}
+
+		[Test]
+		public void SunnyDayPath()
+		{
+			IDynamicMock mockFactory = new DynamicMock(typeof (IObjectFactory));
+			IDynamicMock mockDefinition = new DynamicMock(typeof (IConfigurableObjectDefinition));
+
+			object expectedLookup = new object();
+			const string LookupObjectName = "foo";
+			mockFactory.ExpectAndReturn("GetObject", expectedLookup, LookupObjectName);
+
+			LookupMethodOverride ovr = new LookupMethodOverride("SunnyDayPath", LookupObjectName);
+			MethodOverrides overrides = new MethodOverrides();
+			overrides.Add(ovr);
+			mockDefinition.ExpectAndReturn("MethodOverrides", overrides);
+
+            LookupMethodReplacer replacer = new LookupMethodReplacer((IConfigurableObjectDefinition)mockDefinition.Object, (IObjectFactory)mockFactory.Object);
+
+			MethodInfo method = (MethodInfo) MethodBase.GetCurrentMethod();
+
+			object lookup = replacer.Implement(this, method, new object[] {});
+			Assert.AreSame(expectedLookup, lookup);
+
+			mockFactory.Verify();
+			mockDefinition.Verify();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionBuilderTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionBuilderTests.cs
new file mode 100644
index 00000000..5ff11cc5
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionBuilderTests.cs
@@ -0,0 +1,203 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+using Spring.Context.Support;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// This class contains tests for ObjectDefinitionBuilder
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: ObjectDefinitionBuilderTests.cs,v 1.4 2008/01/28 23:03:05 markpollack Exp $</version>
+    [TestFixture]
+    public class ObjectDefinitionBuilderTests
+    {
+        private IObjectDefinitionFactory odf;
+
+        [SetUp]
+        public void CreateObjectDefinitionBuilder()
+        {
+            odf = new DefaultObjectDefinitionFactory();
+        }
+
+        
+        [Test]
+        public void ObjectName()
+        {
+            ObjectDefinitionBuilder odb =
+                ObjectDefinitionBuilder.RootObjectDefinition(odf, typeof(TestObject).FullName);
+            RootObjectDefinition rod = odb.ObjectDefinition as RootObjectDefinition;
+            Assert.IsNotNull(rod);
+            Assert.IsFalse(rod.HasObjectType);
+            Assert.AreEqual(typeof(TestObject).FullName, rod.ObjectTypeName);
+        }
+
+        [Test]
+        public void ObjectNameWithFactoryMethod()
+        {
+            ObjectDefinitionBuilder odb =
+                ObjectDefinitionBuilder.RootObjectDefinition(odf, typeof(TestObject).FullName, "Create");
+            RootObjectDefinition rod = odb.ObjectDefinition as RootObjectDefinition;
+            Assert.IsNotNull(rod);
+            Assert.IsFalse(rod.HasObjectType);
+            Assert.AreEqual(typeof(TestObject).FullName, rod.ObjectTypeName);
+            Assert.AreEqual("Create", rod.FactoryMethodName);
+        }
+
+        [Test]
+        public void ObjectNameChild()
+        {
+            ObjectDefinitionBuilder odb = ObjectDefinitionBuilder.ChildObjectDefinition(odf, typeof(TestObject).FullName);
+            ChildObjectDefinition rod = odb.ObjectDefinition as ChildObjectDefinition;
+            Assert.IsNotNull(rod);
+            Assert.IsFalse(rod.HasObjectType);
+            Assert.AreEqual(typeof(TestObject).FullName, rod.ParentName);
+        }
+        
+
+        [Test]
+        public void ObjectType()
+        {
+            ObjectDefinitionBuilder odb = ObjectDefinitionBuilder.RootObjectDefinition(odf, typeof (TestObject));
+            RootObjectDefinition rod = odb.ObjectDefinition as RootObjectDefinition;
+            Assert.IsNotNull(rod);
+            Assert.IsTrue(rod.HasObjectType);
+            Assert.AreEqual(typeof (TestObject), rod.ObjectType);
+        }
+
+        [Test]
+        public void ObjectTypeWithFactoryMethod()
+        {
+            ObjectDefinitionBuilder odb =
+                ObjectDefinitionBuilder.RootObjectDefinition(odf, typeof (TestObject), "Create");
+            RootObjectDefinition rod = odb.ObjectDefinition as RootObjectDefinition;
+            Assert.IsNotNull(rod);
+            Assert.IsTrue(rod.HasObjectType);
+            Assert.AreEqual(typeof (TestObject), rod.ObjectType);
+            Assert.AreEqual("Create", rod.FactoryMethodName);
+        }
+
+        [Test]
+        public void ObjectTypeWithSimpleProperty()
+        {
+            string[] dependsOn = new string[] {"A", "B", "C"};
+            ObjectDefinitionBuilder odb = ObjectDefinitionBuilder.RootObjectDefinition(odf, typeof (TestObject));
+
+            odb.SetSingleton(false).AddPropertyReference("Age", "15");
+            foreach (string dep in dependsOn)
+            {
+                odb.AddDependsOn(dep);
+            }
+
+            RootObjectDefinition rod = odb.ObjectDefinition as RootObjectDefinition;
+            Assert.IsNotNull(rod);
+            Assert.IsFalse(rod.IsSingleton);
+            Assert.AreEqual(typeof (TestObject), rod.ObjectType);
+            Assert.AreEqual(dependsOn, rod.DependsOn, "DependsOn not as expected");
+            Assert.IsTrue(rod.PropertyValues.Contains("Age"));
+        }
+
+        [Test]
+        public void Simple()
+        {
+            GenericApplicationContext ctx = new GenericApplicationContext();
+            IObjectDefinitionFactory objectDefinitionFactory = new DefaultObjectDefinitionFactory();
+
+            ObjectDefinitionBuilder builder = ObjectDefinitionBuilder.RootObjectDefinition(objectDefinitionFactory,
+                                                                                           typeof (TestObject));
+            
+            builder.AddPropertyValue("Age", 22)
+                .AddPropertyValue("Name", "Joe")
+                .AddPropertyReference("Spouse", "Spouse")
+                .SetSingleton(false);
+            
+            ctx.RegisterObjectDefinition("TestObject", builder.ObjectDefinition);
+
+            builder = ObjectDefinitionBuilder.RootObjectDefinition(objectDefinitionFactory, typeof(TestObject));
+
+            IList friends = new ArrayList();
+            friends.Add(new TestObject("Dan", 34));
+            friends.Add(new TestObject("Mary", 33));
+            builder.AddPropertyValue("Friends", friends)
+                .AddConstructorArg("Susan")
+                .AddConstructorArg(23)
+                .SetSingleton(false);
+
+           ctx.RegisterObjectDefinition("Spouse", builder.ObjectDefinition);
+
+
+            
+
+            TestObject to = ctx.GetObject("TestObject") as TestObject;
+
+            Assert.IsNotNull(to);
+
+            Assert.AreEqual("Joe", to.Name);
+            Assert.AreEqual(22, to.Age);
+            Assert.AreEqual(2,to.Spouse.Friends.Count);
+            Assert.AreEqual(23, to.Spouse.Age);
+
+            /*
+            AbstractApplicationContext ctx = ContextRegistry.GetContext() as AbstractApplicationContext;
+
+
+
+            //XmlObjectFactory objectFactory = ctx.ObjectFactory as XmlObjectFactory;
+
+            IObjectFactory objectFactory = ctx.ObjectFactory;
+
+            //DefaultListableObjectFactory
+            if (objectFactory != null)
+            {
+                Console.WriteLine("hi");
+            }
+            //objectFactory.RegisterObjectDefinition("TestObject", builder.ObjectDefinition);
+             */
+                
+
+
+
+        }
+
+        public void SimpleReader()
+        {
+            GenericApplicationContext applicationContext = new GenericApplicationContext();
+
+
+            IObjectDefinitionReader objectDefinitionReader = new XmlObjectDefinitionReader(applicationContext);
+
+            objectDefinitionReader.LoadObjectDefinitions("assembly://foo");
+
+            applicationContext.Refresh();
+            
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionReaderUtilsTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionReaderUtilsTests.cs
new file mode 100644
index 00000000..94de5f8e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ObjectDefinitionReaderUtilsTests.cs
@@ -0,0 +1,148 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Unit tests for the ObjectDefinitionReaderUtils class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ObjectDefinitionReaderUtilsTests.cs,v 1.3 2006/04/09 07:24:50 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class ObjectDefinitionReaderUtilsTests
+    {
+        [Test]
+        public void RegisterObjectDefinitionSunnyDay()
+        {
+            IDynamicMock mockRegistry = new DynamicMock(typeof (IObjectDefinitionRegistry));
+            mockRegistry.Expect("RegisterObjectDefinition");
+
+            IDynamicMock mockDefinition = new DynamicMock(typeof (IObjectDefinition));
+            IObjectDefinition definition = (IObjectDefinition) mockDefinition.Object;
+
+            IObjectDefinitionRegistry registry = (IObjectDefinitionRegistry) mockRegistry.Object;
+            ObjectDefinitionHolder holder = new ObjectDefinitionHolder(definition, "foo");
+
+            ObjectDefinitionReaderUtils.RegisterObjectDefinition(holder, registry);
+            mockRegistry.Verify();
+            mockDefinition.Verify();
+        }
+
+        [Test]
+        public void RegisterObjectDefinitionSunnyDayWithAliases()
+        {
+            IDynamicMock mockRegistry = new DynamicMock(typeof (IObjectDefinitionRegistry));
+            mockRegistry.Expect("RegisterObjectDefinition");
+            mockRegistry.Expect("RegisterAlias");
+            mockRegistry.Expect("RegisterAlias");
+
+            IDynamicMock mockDefinition = new DynamicMock(typeof (IObjectDefinition));
+            IObjectDefinition definition = (IObjectDefinition) mockDefinition.Object;
+
+            IObjectDefinitionRegistry registry = (IObjectDefinitionRegistry) mockRegistry.Object;
+            ObjectDefinitionHolder holder
+                = new ObjectDefinitionHolder(definition, "foo", new string[] {"bar", "baz"});
+
+            ObjectDefinitionReaderUtils.RegisterObjectDefinition(holder, registry);
+            mockRegistry.Verify();
+            mockDefinition.Verify();
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void RegisterObjectDefinitionWithNullDefinition()
+        {
+            IDynamicMock mockRegistry = new DynamicMock(typeof (IObjectDefinitionRegistry));
+            IObjectDefinitionRegistry registry = (IObjectDefinitionRegistry) mockRegistry.Object;
+            ObjectDefinitionReaderUtils.RegisterObjectDefinition(null, registry);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void RegisterObjectDefinitionWithNullRegistry()
+        {
+            IDynamicMock mockDefinition = new DynamicMock(typeof (IObjectDefinition));
+            IObjectDefinition definition = (IObjectDefinition) mockDefinition.Object;
+            ObjectDefinitionHolder holder = new ObjectDefinitionHolder(definition, "foo");
+            ObjectDefinitionReaderUtils.RegisterObjectDefinition(holder, null);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void RegisterObjectDefinitionWithAllArgumentsNull()
+        {
+            ObjectDefinitionReaderUtils.RegisterObjectDefinition(null, null);
+        }
+
+        [Test]
+        public void RegisterObjectDefinitionWithDuplicateAlias()
+        {
+            IDynamicMock mockRegistry = new DynamicMock(typeof (IObjectDefinitionRegistry));
+            mockRegistry.Expect("RegisterObjectDefinition");
+
+            // we assume that some other object defition has already been associated with this alias...
+            mockRegistry.ExpectAndThrow("RegisterAlias", new ObjectDefinitionStoreException());
+            IDynamicMock mockDefinition = new DynamicMock(typeof (IObjectDefinition));
+            IObjectDefinition definition = (IObjectDefinition) mockDefinition.Object;
+
+            IObjectDefinitionRegistry registry = (IObjectDefinitionRegistry) mockRegistry.Object;
+            ObjectDefinitionHolder holder
+                = new ObjectDefinitionHolder(definition, "foo", new string[] { "bing" });
+
+            try
+            {
+                ObjectDefinitionReaderUtils.RegisterObjectDefinition(holder, registry);
+                Assert.Fail("Must have thrown an ObjectDefinitionStoreException store by this point.");
+            }
+            catch (ObjectDefinitionStoreException)
+            {
+                // expected...
+            }
+            mockRegistry.Verify();
+            mockDefinition.Verify();
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void GenerateObjectNameWithNullDefinition()
+        {
+            IDynamicMock mockRegistry = new DynamicMock(typeof (IObjectDefinitionRegistry));
+            IObjectDefinitionRegistry registry = (IObjectDefinitionRegistry) mockRegistry.Object;
+            ObjectDefinitionReaderUtils.GenerateObjectName(null, registry);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void GenerateObjectNameWithNullRegistry()
+        {
+            IDynamicMock mockDefinition = new DynamicMock(typeof (IConfigurableObjectDefinition));
+            ObjectDefinitionReaderUtils.GenerateObjectName((IConfigurableObjectDefinition) mockDefinition.Object, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ReplacedMethodOverrideTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ReplacedMethodOverrideTests.cs
new file mode 100644
index 00000000..5445634d
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/ReplacedMethodOverrideTests.cs
@@ -0,0 +1,192 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Unit tests for the ReplacedMethodOverride class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: ReplacedMethodOverrideTests.cs,v 1.2 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class ReplacedMethodOverrideTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithNullMethodName()
+		{
+			new ReplacedMethodOverride(null, null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithEmptyMethodName()
+		{
+			new ReplacedMethodOverride(string.Empty, null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithWhitespacedMethodName()
+		{
+			new ReplacedMethodOverride("  ", null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithNullMethodReplacerObjectName()
+		{
+			new ReplacedMethodOverride("foo", null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithEmptyMethodReplacerObjectName()
+		{
+			new ReplacedMethodOverride("foo", string.Empty);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiationWithWhitespacedMethodReplacerObjectName()
+		{
+			new ReplacedMethodOverride("foo", "  ");
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void AddNullTypeIdentifier()
+		{
+			new ReplacedMethodOverride("foo", "foo").AddTypeIdentifier(null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void AddEmptyTypeIdentifier()
+		{
+			new ReplacedMethodOverride("foo", "foo").AddTypeIdentifier(string.Empty);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void AddWhitespacedTypeIdentifier()
+		{
+			new ReplacedMethodOverride("foo", "foo").AddTypeIdentifier("\n ");
+		}
+
+		[Test]
+		public void Matches_TotallyDifferentMethodName()
+		{
+			ReplacedMethodOverride methodOverride = new ReplacedMethodOverride("Execute", "replacer");
+			Assert.IsFalse(methodOverride.Matches(typeof (Executor).GetMethod("Administer")));
+		}
+
+		[Test]
+		public void Matches_MatchingMethodNameNoOverload()
+		{
+			ReplacedMethodOverride methodOverride = new ReplacedMethodOverride("Administer", "replacer");
+			methodOverride.IsOverloaded = false;
+			Assert.IsTrue(methodOverride.Matches(typeof (Executor).GetMethod("Administer")));
+		}
+
+		[Test]
+		public void Matches_MatchingMethodNameWithOverload()
+		{
+			ReplacedMethodOverride methodOverride = new ReplacedMethodOverride("Execute", "replacer");
+			Assert.IsTrue(methodOverride.Matches(typeof (Executor).GetMethod("Execute", new Type[] {})));
+		}
+
+		[Test]
+		public void Matches_MatchingMethodNameWithOverloadAndTypeIdentifiers()
+		{
+			ReplacedMethodOverride methodOverride = new ReplacedMethodOverride("Execute", "replacer");
+			methodOverride.AddTypeIdentifier(typeof (object).FullName);
+			Assert.IsTrue(methodOverride.Matches(typeof (Executor).GetMethod("Execute", new Type[] {typeof (object)})));
+		}
+
+		[Test]
+		public void Matches_MatchingMethodNameWithOverloadAndBadTypeIdentifiers()
+		{
+			ReplacedMethodOverride methodOverride = new ReplacedMethodOverride("Execute", "replacer");
+			methodOverride.AddTypeIdentifier(GetType().FullName);
+			Assert.IsFalse(methodOverride.Matches(typeof (Executor).GetMethod("Execute", new Type[] {typeof (object)})));
+		}
+
+		[Test]
+		public void Matches_RequiresAllTypeIdentifiers()
+		{
+			ReplacedMethodOverride methodOverride = new ReplacedMethodOverride("Execute", "replacer");
+			methodOverride.AddTypeIdentifier(typeof (object).FullName);
+			Assert.IsFalse(methodOverride.Matches(typeof (Executor).GetMethod("Execute",
+			                                                                  new Type[] {typeof (object), typeof (object)})));
+		}
+
+		[Test]
+		public void Matches_AllTypeIdentifiers()
+		{
+			ReplacedMethodOverride methodOverride = new ReplacedMethodOverride("Execute", "replacer");
+			methodOverride.AddTypeIdentifier(typeof (object).FullName);
+			methodOverride.AddTypeIdentifier(typeof (object).FullName);
+			Assert.IsTrue(methodOverride.Matches(typeof (Executor).GetMethod("Execute",
+			                                                                 new Type[] {typeof (object), typeof (object)})));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void MatchesWithNullMethod()
+		{
+			ReplacedMethodOverride methodOverride = new ReplacedMethodOverride("Execute", "replacer");
+			methodOverride.Matches(null);
+		}
+
+		[Test]
+		public void ToStringWorks()
+		{
+			ReplacedMethodOverride methodOverride = new ReplacedMethodOverride("Execute", "replacer");
+			Assert.AreEqual(typeof(ReplacedMethodOverride).Name + " for method 'Execute'; will call object 'replacer'.", methodOverride.ToString());
+		}
+
+		private sealed class Executor
+		{
+			public void Administer()
+			{
+			}
+
+			public void Execute()
+			{
+			}
+
+			public void Execute(object sender)
+			{
+			}
+
+			public void Execute(object sender, object context)
+			{
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/RootObjectDefinitionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/RootObjectDefinitionTests.cs
new file mode 100644
index 00000000..dbb60b08
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/RootObjectDefinitionTests.cs
@@ -0,0 +1,127 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using Spring.Objects.Support;
+using Spring.Objects.Factory.Config;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Unit tests for the RootObjectDefinition class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: RootObjectDefinitionTests.cs,v 1.6 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class RootObjectDefinitionTests
+    {
+        [Test]
+        [ExpectedException (typeof (ApplicationException))]
+        public void InstantiationWithClassName () 
+        {
+            RootObjectDefinition def
+                = new RootObjectDefinition (typeof (TestObject).AssemblyQualifiedName, new ConstructorArgumentValues (), new MutablePropertyValues ());
+            Assert.IsFalse (def.HasObjectType);
+            Assert.IsNull (def.ObjectType); // must bail...
+        }
+
+        [Test]
+        public void InstantiationFromOther () {
+            RootObjectDefinition other
+                = new RootObjectDefinition (typeof (TestObject), AutoWiringMode.Constructor);
+            other.IsSingleton = false;
+            other.InitMethodName = "Umberto Eco";
+            other.DestroyMethodName = "Pedulismus";
+            other.ConstructorArgumentValues = new ConstructorArgumentValues ();
+            other.DependencyCheck = DependencyCheckingMode.Objects;
+            other.DependsOn = new string [] {"Jimmy", "Joyce"};
+            other.EventHandlerValues = new EventValues ();
+            other.IsAbstract = true;
+            other.IsLazyInit = true;
+            other.FactoryMethodName = "IfINeedYouIllJustUseYourSimpleName";
+            other.FactoryObjectName = "PerspirationShop";
+            other.ResourceDescription = "Ohhh";
+            other.PropertyValues = new MutablePropertyValues ();
+            other.PropertyValues.Add ("Age", 100);
+            InstanceEventHandlerValue handler =
+                new InstanceEventHandlerValue (new TestObject (), "Ping");
+            handler.EventName = "Bing";
+            other.EventHandlerValues.AddHandler (handler);
+            other.ConstructorArgumentValues.AddGenericArgumentValue ("Wulf", "Sternhammer");
+
+            RootObjectDefinition def = new RootObjectDefinition (other);
+
+            // ...
+            Assert.AreEqual (typeof (TestObject), def.ObjectType);
+            Assert.AreEqual (AutoWiringMode.Constructor, def.AutowireMode);
+            Assert.IsFalse (def.IsSingleton);
+            Assert.AreEqual ("Umberto Eco", def.InitMethodName);
+            Assert.AreEqual ("Pedulismus", def.DestroyMethodName);
+            Assert.AreEqual (DependencyCheckingMode.Objects, def.DependencyCheck);
+            Assert.IsTrue (def.IsAbstract);
+            Assert.IsTrue (def.IsLazyInit);
+            Assert.AreEqual ("IfINeedYouIllJustUseYourSimpleName", def.FactoryMethodName);
+            Assert.AreEqual ("PerspirationShop", def.FactoryObjectName);
+            Assert.AreEqual ("Ohhh", def.ResourceDescription);
+            Assert.IsTrue (def.HasConstructorArgumentValues);
+            Assert.AreEqual (other.ConstructorArgumentValues.ArgumentCount, def.ConstructorArgumentValues.ArgumentCount);
+            Assert.AreEqual (other.PropertyValues.PropertyValues.Length, def.PropertyValues.PropertyValues.Length);
+            Assert.AreEqual (other.EventHandlerValues.Events.Count, def.EventHandlerValues.Events.Count);
+        }
+
+        [Test]
+        [ExpectedException (typeof (ObjectDefinitionValidationException))]
+        public void ValidateLazyAndPrototypeCausesBail () 
+        {
+            RootObjectDefinition def
+                = new RootObjectDefinition (typeof (TestObject), AutoWiringMode.No);
+            def.IsLazyInit = true;
+            def.IsSingleton = false;
+            def.Validate ();
+        }
+
+		[Test]
+		public void InstantiationWithNullCtorArgsAndNullPropsDoesNotResultInNullPropertyValues()
+		{
+			RootObjectDefinition def
+				= new RootObjectDefinition (typeof (TestObject), null, null);
+			Assert.IsNotNull(def.ConstructorArgumentValues,
+				"Must never be null, but rather just empty.");
+			Assert.AreEqual(0, def.ConstructorArgumentValues.ArgumentCount,
+				"Must be empty if null was passed to the ctor.");
+			Assert.IsNotNull(def.PropertyValues,
+				"Must never be null, but rather just empty.");
+			Assert.AreEqual(0, def.PropertyValues.PropertyValues.Length,
+				"Must be empty if null was passed to the ctor.");
+		}
+    }
+
+    internal class NoPublicCtors 
+    {
+        protected NoPublicCtors () {}
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/SimpleInstantiationStrategyTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/SimpleInstantiationStrategyTests.cs
new file mode 100644
index 00000000..bd6f9210
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/SimpleInstantiationStrategyTests.cs
@@ -0,0 +1,158 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+	/// <summary>
+	/// Unit tests for the SimpleInstantiationStrategy class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: SimpleInstantiationStrategyTests.cs,v 1.5 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class SimpleInstantiationStrategyTests
+	{
+		#region SetUp
+
+		/// <summary>
+		/// The setup logic executed before the execution of each individual test.
+		/// </summary>
+		[SetUp]
+		public void SetUp()
+		{
+			_singletonDefinition = new RootObjectDefinition(typeof (TestObject), AutoWiringMode.No);
+			_singletonDefinitionWithFactory = new RootObjectDefinition(_singletonDefinition);
+			_singletonDefinitionWithFactory.FactoryMethodName = "GetObject";
+			_singletonDefinitionWithFactory.FactoryObjectName = "TestObjectFactoryDefinition";
+			_testObjectFactory = new RootObjectDefinition(typeof (TestObjectFactory), AutoWiringMode.No);
+			DefaultListableObjectFactory myFactory = new DefaultListableObjectFactory();
+			myFactory.RegisterObjectDefinition("SingletonObjectDefinition", SingletonDefinition);
+			myFactory.RegisterObjectDefinition("SingletonDefinitionWithFactory", SingletonDefinitionWithFactory);
+			myFactory.RegisterObjectDefinition("TestObjectFactoryDefinition", TestObjectFactoryDefinition);
+			_factory = myFactory;
+		}
+
+		#endregion
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiateWithNulls()
+		{
+			SimpleInstantiationStrategy strategy = new SimpleInstantiationStrategy();
+			strategy.Instantiate(null, null, null);
+		}
+
+		[Test]
+		public void InstantiateWithNullObjectName()
+		{
+			SimpleInstantiationStrategy strategy = new SimpleInstantiationStrategy();
+			object obj = strategy.Instantiate(SingletonDefinition, null, Factory);
+			Assert.IsNotNull(obj);
+			Assert.IsTrue(obj is ITestObject);
+			ITestObject actual = (ITestObject) obj;
+			Assert.IsNull(actual.Name);
+			Assert.AreEqual(0, actual.Age);
+		}
+
+		[Test]
+		public void InstantiateWithExplicitCtor()
+		{
+			SimpleInstantiationStrategy strategy = new SimpleInstantiationStrategy();
+			object obj = strategy.Instantiate(
+				SingletonDefinition, null, Factory,
+				SingletonDefinition.ObjectType.GetConstructor(
+					new Type[] {typeof (string), typeof (int)}),
+				new object[] {"Rick", 19});
+			Assert.IsNotNull(obj);
+			Assert.IsTrue(obj is ITestObject);
+			ITestObject actual = (ITestObject) obj;
+			Assert.AreEqual("Rick", actual.Name);
+			Assert.AreEqual(19, actual.Age);
+		}
+
+		[Test]
+		public void InstantiateWithFactoryMethod()
+		{
+			SimpleInstantiationStrategy strategy = new SimpleInstantiationStrategy();
+			object obj = strategy.Instantiate(SingletonDefinitionWithFactory,
+				string.Empty, Factory, typeof (TestObjectFactory).GetMethod("GetObject"), null);
+			Assert.IsNotNull(obj);
+			Assert.IsTrue(obj is ITestObject);
+			ITestObject actual = (ITestObject) obj;
+			Assert.AreEqual(TestObjectFactory.TheName, actual.Name);
+			Assert.AreEqual(TestObjectFactory.TheAge, actual.Age);
+		}
+
+		[Test]
+		public void InstantiateWithDefinitionThatDoesNotHaveAResolvedObjectClass()
+		{
+			RootObjectDefinition def = new RootObjectDefinition();
+			def.ObjectTypeName = typeof(TestObject).FullName;
+
+			SimpleInstantiationStrategy strategy = new SimpleInstantiationStrategy();
+			object foo = strategy.Instantiate(def, "foo", Factory);
+			Assert.IsNotNull(foo);
+			Assert.AreEqual(typeof(TestObject), foo.GetType());
+		}
+
+		private RootObjectDefinition SingletonDefinition
+		{
+			get { return _singletonDefinition; }
+		}
+
+		private RootObjectDefinition SingletonDefinitionWithFactory
+		{
+			get { return _singletonDefinitionWithFactory; }
+		}
+
+		private RootObjectDefinition TestObjectFactoryDefinition
+		{
+			get { return _testObjectFactory; }
+		}
+
+		private IObjectFactory Factory
+		{
+			get { return _factory; }
+		}
+
+		private RootObjectDefinition _singletonDefinition;
+		private RootObjectDefinition _testObjectFactory;
+		private RootObjectDefinition _singletonDefinitionWithFactory;
+		private IObjectFactory _factory;
+	}
+
+	public class TestObjectFactory
+	{
+		public const string TheName = "Old Goriot";
+		public const int TheAge = 78;
+
+		public virtual object GetObject()
+		{
+			return new TestObject(TheName, TheAge);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/TestResource.txt b/test/Spring/Spring.Core.Tests/Objects/Factory/TestResource.txt
new file mode 100644
index 00000000..ea08c0d2
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/TestResource.txt
@@ -0,0 +1 @@
+Spring.Objects.Factory.TestResource.txt
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/UnsupportedObjectDefinitionImplementation.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/UnsupportedObjectDefinitionImplementation.cs
new file mode 100644
index 00000000..a8c16967
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/UnsupportedObjectDefinitionImplementation.cs
@@ -0,0 +1,121 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+
+namespace Spring.Objects.Factory
+{
+	internal class UnsupportedObjectDefinitionImplementation : IObjectDefinition
+	{
+		public MutablePropertyValues PropertyValues
+		{
+			get { throw new NotImplementedException(); }
+		}
+
+		public ConstructorArgumentValues ConstructorArgumentValues
+		{
+			get { throw new NotImplementedException(); }
+		}
+
+		public MethodOverrides MethodOverrides
+		{
+			get { throw new NotImplementedException(); }
+		}
+
+		public EventValues EventHandlerValues
+		{
+			get { throw new NotImplementedException(); }
+		}
+
+		public string ResourceDescription
+		{
+			get { return "UnsupportedObjectDefinitionImplementation_Resource"; }
+		}
+
+        public bool IsTemplate
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+		public bool IsAbstract
+		{
+			get { throw new NotImplementedException(); }
+		}
+
+		public bool IsSingleton
+		{
+			get { throw new NotImplementedException(); }
+		}
+
+	    public bool IsLazyInit
+	    {
+	        get { throw new NotImplementedException(); }
+	    }
+
+	    public Type ObjectType
+		{
+			get { throw new NotImplementedException(); }
+		}
+
+	    public string ObjectTypeName
+	    {
+            get { throw new NotImplementedException(); }
+            set { throw new NotImplementedException(); }
+	    }
+
+	    public AutoWiringMode AutowireMode
+	    {
+	        get { throw new NotImplementedException(); }
+	    }
+
+	    public DependencyCheckingMode DependencyCheck
+	    {
+	        get { throw new NotImplementedException(); }
+	    }
+
+	    public string[] DependsOn
+	    {
+	        get { throw new NotImplementedException(); }
+	    }
+
+	    public string InitMethodName
+	    {
+	        get { throw new NotImplementedException(); }
+	    }
+
+	    public string DestroyMethodName
+	    {
+	        get { throw new NotImplementedException(); }
+	    }
+
+	    public string FactoryMethodName
+	    {
+	        get { throw new NotImplementedException(); }
+	    }
+
+	    public string FactoryObjectName
+	    {
+	        get { throw new NotImplementedException(); }
+	    }
+
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ConstructorDependenciesObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ConstructorDependenciesObject.cs
new file mode 100644
index 00000000..dd83ad09
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ConstructorDependenciesObject.cs
@@ -0,0 +1,110 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+	/// <summary>
+	/// Simple object used to check constructor dependency checking.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	public class ConstructorDependenciesObject
+	{
+		#region Constructor (s) / Destructor
+
+		public ConstructorDependenciesObject(int age)
+		{
+			this.age = age;
+		}
+
+		public ConstructorDependenciesObject(string name)
+		{
+			this.name = name;
+		}
+
+		public ConstructorDependenciesObject(ITestObject spouse1)
+		{
+			this.spouse1 = spouse1;
+		}
+
+		public ConstructorDependenciesObject(ITestObject spouse1, ITestObject spouse2)
+		{
+			this.spouse1 = spouse1;
+			this.spouse2 = spouse2;
+		}
+
+		public ConstructorDependenciesObject(ITestObject spouse1, ITestObject spouse2, IndexedTestObject other)
+		{
+			this.spouse1 = spouse1;
+			this.spouse2 = spouse2;
+			this.other = other;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public int Age
+		{
+			get { return age; }
+
+			set { this.age = value; }
+		}
+
+		public string Name
+		{
+			get { return name; }
+			set { this.name = value; }
+		}
+
+		public ITestObject Spouse1
+		{
+			get { return spouse1; }
+		}
+
+		public ITestObject Spouse2
+		{
+			get { return spouse2; }
+		}
+
+		public IndexedTestObject Other
+		{
+			get { return other; }
+		}
+
+		#endregion
+
+		#region Fields
+
+		private int age;
+		private string name;
+		private ITestObject spouse1;
+		private ITestObject spouse2;
+		private IndexedTestObject other;
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DependenciesObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DependenciesObject.cs
new file mode 100644
index 00000000..020eab94
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DependenciesObject.cs
@@ -0,0 +1,77 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+	/// <summary>
+	/// Simple object used to check dependency checking.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	public class DependenciesObject
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the  DependenciesObject class.
+		/// </summary>
+		public DependenciesObject()
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		public int Age
+		{
+			get { return age; }
+			set { this.age = value; }
+		}
+
+		public string Name
+		{
+			get { return name; }
+			set { this.name = value; }
+		}
+
+		public ITestObject Spouse
+		{
+			get { return spouse; }
+			set { this.spouse = value; }
+		}
+
+		#endregion
+
+		#region Fields
+
+		private int age;
+		private string name;
+		private ITestObject spouse;
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DerivedConstructorDependenciesObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DerivedConstructorDependenciesObject.cs
new file mode 100644
index 00000000..cece1863
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DerivedConstructorDependenciesObject.cs
@@ -0,0 +1,63 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+	/// <summary>
+	/// Simple object used to check derived constructor dependency checking.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	public class DerivedConstructorDependenciesObject : ConstructorDependenciesObject
+	{
+
+		public DerivedConstructorDependenciesObject(
+			ITestObject spouse1, ITestObject spouse2, IndexedTestObject other)
+			: base(spouse1, spouse2, other)
+		{
+		}
+
+		public DerivedConstructorDependenciesObject(
+			ITestObject spouse1, object spouse2, IndexedTestObject other)
+			: base(spouse1, null, other)
+		{
+		}
+
+		public DerivedConstructorDependenciesObject(
+			ITestObject spouse1, ITestObject spouse2, IndexedTestObject other, int age, int otherAge)
+			: base(spouse1, spouse2, other)
+		{
+		}
+
+		public DerivedConstructorDependenciesObject(
+			ITestObject spouse1, ITestObject spouse2, IndexedTestObject other, int age, string name)
+			: base(spouse1, spouse2, other)
+		{
+			Age = age;
+			Name = name;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DoubleBooleanConstructorObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DoubleBooleanConstructorObject.cs
new file mode 100644
index 00000000..d55a76f4
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DoubleBooleanConstructorObject.cs
@@ -0,0 +1,49 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+namespace Spring.Objects.Factory.Xml
+{
+	/// <summary>
+	/// Summary description for DoubleBooleanConstructorObject.
+	/// </summary>
+	public class DoubleBooleanConstructorObject
+	{
+		private bool boolean1;
+		private bool boolean2;
+
+		public bool Boolean2
+		{
+			get { return this.boolean2; }
+			set { this.boolean2 = value; }
+		}
+
+		public bool Boolean1
+		{
+			get { return this.boolean1; }
+			set { this.boolean1 = value; }
+		}
+
+		public DoubleBooleanConstructorObject(bool b1, bool b2)
+		{
+			this.boolean1 = b1;
+			this.boolean2 = b2;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyBo.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyBo.cs
new file mode 100644
index 00000000..b67d48c4
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyBo.cs
@@ -0,0 +1,51 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml {
+
+	/// <summary>
+	/// Summary description for DummyBo.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Rick Evans (.NET)</author>
+	public class DummyBo : IDummyBo 
+    {
+
+        /// <summary>
+        /// Creates a new instance of the  DummyBo class.
+        /// </summary>
+		public DummyBo (DummyDao dao) {
+            this.dao = dao;
+        }
+
+        public void DoSomething () 
+        {
+
+        }
+
+        internal DummyDao dao;
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyDao.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyDao.cs
new file mode 100644
index 00000000..ed1d9291
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyDao.cs
@@ -0,0 +1,44 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Data;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml {
+
+	/// <summary>
+	/// Summary description for DummyDao.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Rick Evans (.NET)</author>
+	public class DummyDao 
+    {
+
+        /// <summary>
+        /// Creates a new instance of the  DummyDao class.
+        /// </summary>
+		public DummyDao () {
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyReferencer.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyReferencer.cs
new file mode 100644
index 00000000..79689b90
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/DummyReferencer.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml {
+
+	/// <summary>
+	/// Summary description for DummyReferencer.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+	public class DummyReferencer 
+    {
+
+        public ITestObject TestObject1
+        {
+            get
+            {
+                return testObject1;
+            }
+            set
+            {
+                this.testObject1 = value;
+            }
+        }
+
+        public ITestObject TestObject2
+        {
+            get
+            {
+                return testObject2;
+            }
+            set
+            {
+                this.testObject2 = value;
+            }
+        }
+		
+        private ITestObject testObject1;
+        private ITestObject testObject2;
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/EventWiringTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/EventWiringTests.cs
new file mode 100644
index 00000000..f9939e49
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/EventWiringTests.cs
@@ -0,0 +1,103 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Unit tests that test the event wiring features of the
+    /// XmlObjectFactory.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <author>Choy Rim (.NET)</author>
+    [TestFixture]
+    public class EventWiringTests
+    {
+        [Ignore("SPRNET-21")]
+        [Test]
+        public virtual void EventWiringInstanceSinkToPrototypeSource()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("event-wiring-prototypes.xml", GetType()));
+            TestEventHandler instanceHandler = factory["instanceSink"] as TestEventHandler;
+            ITestObject source = factory["source"] as ITestObject;
+            // raise the event... handlers should be notified at this point (obviously)
+            source.OnClick();
+            Assert.IsTrue(instanceHandler.EventWasHandled,
+                          "The instance handler did not get notified when the instance event was raised (and was probably not wired up in the first place).");
+        }
+
+        [Test]
+        public virtual void SingletonSourcePrototypeSink()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("event-wiring.xml", GetType()));
+            ITestObject source = factory["source"] as ITestObject;
+            TestEventHandler prototypeEventHandler = factory["prototypeEventListener"] as TestEventHandler;
+            // raise the event... handlers should be notified at this point (obviously)
+            source.OnClick();
+            Assert.IsTrue(prototypeEventHandler.EventWasHandled,
+                          "The prototype instance handler did not get notified when the instance event was raised (and was probably not wired up in the first place).");
+        }
+
+        [Test]
+        public virtual void InstanceEventWiring()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("event-wiring.xml", GetType()));
+            ITestObject source = factory["source"] as ITestObject;
+            TestEventHandler instanceHandler = factory["instanceEventListener"] as TestEventHandler;
+            // raise the event... handlers should be notified at this point (obviously)
+            source.OnClick();
+            Assert.IsTrue(instanceHandler.EventWasHandled,
+                          "The instance handler did not get notified when the instance event was raised (and was probably not wired up in the first place).");
+        }
+
+        [Test]
+        public virtual void StaticEventWiring()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("event-wiring.xml", GetType()));
+            TestEventHandler staticHandler = factory["staticEventListener"] as TestEventHandler;
+            // raise the event... handlers should be notified at this point (obviously)
+            TestObject.OnStaticClick();
+            Assert.IsTrue(staticHandler.EventWasHandled,
+                          "The instance handler did not get notified when the static event was raised (and was probably not wired up in the first place).");
+        }
+
+        [TestFixtureSetUp]
+        public void FixtureSetUp()
+        {
+            // enable (null appender) logging, to ensure that the logging code is exercised
+            // XmlConfigurator.Configure ();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/FactoryMethods.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/FactoryMethods.cs
new file mode 100644
index 00000000..578a9e44
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/FactoryMethods.cs
@@ -0,0 +1,114 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+	/// <summary>
+	/// Test class for Spring.NET's ability to create objects using static
+	/// factory methods, rather than constructors.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: FactoryMethods.cs,v 1.3 2006/04/09 07:24:51 markpollack Exp $</version>
+	public class FactoryMethods
+	{
+		#region Constructor (s) / Destructor
+
+		/// <summary>
+		/// Creates a new instance of the
+		/// <see cref="Spring.Objects.Factory.Xml.FactoryMethods"/> class.
+		/// </summary>
+		/// <remarks>
+		/// <p>
+		/// Constructor is private: not for use outside this class, even by the IoC container.
+		/// </p>
+		/// </remarks>
+		private FactoryMethods(TestObject obj, string name, int number)
+		{
+			_object = obj;
+			_name = name;
+			_number = number;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public TestObject Object
+		{
+			get { return _object; }
+		}
+
+		public string Name
+		{
+			get { return _name; }
+			set { _name = value; }
+		}
+
+		public string Value
+		{
+			get { return _value; }
+			set { _value = value; }
+		}
+
+		public int Number
+		{
+			get { return _number; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		public static FactoryMethods DefaultInstance()
+		{
+			TestObject obj = new TestObject();
+			obj.Name = "defaultInstance";
+			return new FactoryMethods(obj, "default", 0);
+		}
+
+		public static FactoryMethods NewInstance(TestObject obj)
+		{
+			return new FactoryMethods(obj, "default", 0);
+		}
+
+		public static FactoryMethods NewInstance(TestObject obj, string name, int num)
+		{
+			return new FactoryMethods(obj, name, num);
+		}
+
+		#endregion
+
+		#region Fields
+
+		private int _number;
+		private TestObject _object;
+		private string _name = "default";
+		private string _value;
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/IDummyBo.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/IDummyBo.cs
new file mode 100644
index 00000000..ba77f0e0
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/IDummyBo.cs
@@ -0,0 +1,39 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml {
+
+	/// <summary>
+	/// A dummy business object interface :D
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Rick Evans (.NET)</author>
+	public interface IDummyBo 
+    {
+
+        void DoSomething ();
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/InstanceFactory.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/InstanceFactory.cs
new file mode 100644
index 00000000..78e996e9
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/InstanceFactory.cs
@@ -0,0 +1,90 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Data;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+	/// <summary>
+    /// Test class for Spring.NET's ability to create objects using static
+    /// factory methods, rather than constructors.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: InstanceFactory.cs,v 1.3 2007/06/14 19:52:07 markpollack Exp $</version>
+    public class InstanceFactory 
+    {
+        private string _factoryObjectProperty;
+	
+        public string FactoryObjectProperty 
+        {
+            get 
+            {
+                return _factoryObjectProperty;
+
+            }
+            set 
+            {
+                _factoryObjectProperty = value;
+            }
+        }
+	
+        public FactoryMethods DefaultInstance() 
+        {
+            TestObject to = new TestObject();
+            to.Name = FactoryObjectProperty;
+            return FactoryMethods.NewInstance (to);
+        }
+
+        /// <summary>
+        /// Note that overloaded methods are supported.
+        /// </summary>
+        public FactoryMethods NewInstance (TestObject to) 
+        {
+            return FactoryMethods.NewInstance (to);
+        }
+	
+        public FactoryMethods NewInstance (TestObject to, int num, string name) 
+        {
+            return FactoryMethods.NewInstance (to, name, num);
+        }
+
+        public FactoryMethods CreateInstance()
+        {
+            return FactoryMethods.NewInstance(new TestObject(), "DefaultCtor", 0);
+        }
+
+        public FactoryMethods CreateInstance(DataRow dr)
+        {
+            return FactoryMethods.NewInstance(new TestObject(), "DataRowCtor", 0);
+        }
+
+        public FactoryMethods CreateInstance(IDataRecord dr)
+        {
+            return FactoryMethods.NewInstance(new TestObject(), "DataRecordCtor", 0);
+        }
+
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/LocaleTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/LocaleTests.cs
new file mode 100644
index 00000000..98848346
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/LocaleTests.cs
@@ -0,0 +1,72 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using System.Threading;
+using NUnit.Framework;
+using Spring.Core.IO;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// This class contains tests for setting properties that do not parse easily in other locales, such
+    /// as comma delimited strings.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: LocaleTests.cs,v 1.1 2007/08/25 16:08:36 markpollack Exp $</version>
+    [TestFixture]
+    public class LocaleTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+        }
+
+        [Test]
+        public void LocaleTest()
+        {
+            CultureInfo oldCulture = Thread.CurrentThread.CurrentCulture;
+            try
+            {
+                Thread.CurrentThread.CurrentCulture = new CultureInfo("fr-FR");
+
+                IResource resource = new ReadOnlyXmlTestResource("locale.xml", GetType());
+                XmlObjectFactory xof = new XmlObjectFactory(resource);
+                TestObject to = xof.GetObject("jenny") as TestObject;
+                Assert.IsNotNull(to);
+                DateTime d = new DateTime(2007, 10, 30);
+                Assert.AreEqual(d, to.Date);
+                Assert.AreEqual(30, to.Size.Height);
+                Assert.AreEqual(30, to.Size.Width);
+            }
+            finally
+            {
+                Thread.CurrentThread.CurrentCulture = oldCulture;
+            }
+        }
+
+        
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/MixedCollectionObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/MixedCollectionObject.cs
new file mode 100644
index 00000000..1e90e76b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/MixedCollectionObject.cs
@@ -0,0 +1,64 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml {
+
+	/// <summary>
+	/// Summary description for MixedCollectionObject.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Rick Evans (.NET)</author>
+	public class MixedCollectionObject 
+    {
+
+        public MixedCollectionObject ()
+        {
+            ++nrOfInstances;
+        }
+
+        public ICollection Jumble
+        {
+            get
+            {
+                return jumble;
+            }
+            set
+            {
+                this.jumble = value;
+            }
+        }
+		
+        protected internal static int nrOfInstances = 0;
+		
+        public static void ResetStaticState ()
+        {
+            nrOfInstances = 0;
+        }
+		
+        private ICollection jumble;
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/NullAppender.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/NullAppender.cs
new file mode 100644
index 00000000..8325bd75
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/NullAppender.cs
@@ -0,0 +1,45 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+	/// <summary>
+	/// A log4Net appender that does nothing (by intention).
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: NullAppender.cs,v 1.4 2006/11/13 07:04:59 markpollack Exp $</version>
+    
+    public sealed class NullAppender //: AppenderSkeleton
+    {
+	    /*
+        protected override void Append(log4net.Core.LoggingEvent loggingEvent)
+        {
+            // an explicit no-op
+        }
+         */
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ObjectFactorySectionHandlerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ObjectFactorySectionHandlerTests.cs
new file mode 100644
index 00000000..065d1017
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ObjectFactorySectionHandlerTests.cs
@@ -0,0 +1,74 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Xml;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Test the usage of the ObjectFactorySectionHandler.
+    /// </summary>
+	[TestFixture]
+    public class ObjectFactorySectionHandlerTests
+	{
+        private XmlElement _xmlElement;
+
+        [SetUp]
+        public void CreateXmlElement()
+        {
+            XmlDocument xmlDoc = new XmlDocument();
+            string xmlData = "<objects xmlns=\"http://www.springframework.net\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd\"><object name=\"TestVersion\"  type=\"System.Version, Mscorlib\"></object></objects>";
+            xmlDoc.Load(new StringReader(xmlData));
+            _xmlElement = xmlDoc.DocumentElement;
+        }
+
+        /// <summary>
+        /// Test calling the section handler with null values.
+        /// </summary>
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void CreateFactoryUnSuccessful()
+		{
+            ObjectFactorySectionHandler objHandler = new ObjectFactorySectionHandler();
+			objHandler.Create( null, null, null );
+		}
+
+        /// <summary>
+        /// Test calling the section handler with valid XML and make sure no
+        /// exception occurs and the factory has the right number of
+        /// objects.
+        /// </summary>
+        [Test]
+        public void CreateFactorySuccessful()
+        {
+            ObjectFactorySectionHandler objHandler = new ObjectFactorySectionHandler();
+            IListableObjectFactory factory = (IListableObjectFactory)objHandler.Create( null, null, _xmlElement );
+            Assert.AreEqual(1, factory.ObjectDefinitionCount);
+
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ReadOnlyXmlTestResource.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ReadOnlyXmlTestResource.cs
new file mode 100644
index 00000000..36e6d9b5
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ReadOnlyXmlTestResource.cs
@@ -0,0 +1,144 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Text;
+
+using Spring.Core.IO;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml 
+{
+    /// <summary>
+    /// Centralised resource getter for loading all of those XML object
+    /// definition files used in the XML based object factory tests.
+    /// </summary>
+    /// <author>Rick Evans (.NET)</author>
+    /// <author>Erich Eichinger (.NET)</author>
+    public class ReadOnlyXmlTestResource : IResource 
+    {
+        private readonly IResource underlyingResource;
+        private const string TestDataFolder = ".";
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Xml.ReadOnlyXmlTestResource"/> class.
+        /// </summary>
+        /// <param name="fileName">
+        /// The filename/resourcename (e.g. foo.txt) of the XML file containing the object
+        /// definitions.
+        /// </param>
+        public ReadOnlyXmlTestResource (string fileName)
+        {
+            if (ConfigurableResourceLoader.HasProtocol(fileName))
+            {
+                ConfigurableResourceLoader loader = new ConfigurableResourceLoader();
+                underlyingResource = loader.GetResource(fileName);
+            }
+            underlyingResource = new FileSystemResource(fileName);
+        }
+
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.Objects.Factory.Xml.ReadOnlyXmlTestResource"/> class.
+        /// </summary>
+        /// <param name="fileName">
+        /// The filename/resourcename (e.g. foo.txt) of the XML file containing the object
+        /// definitions.
+        /// </param>
+        /// <param name="associatedTestType">
+        /// The <see cref="System.Type"/> of the test class utilising said file.
+        /// </param>
+        public ReadOnlyXmlTestResource (string fileName, Type associatedTestType)
+            : this (ReadOnlyXmlTestResource.GetFilePath (fileName, associatedTestType))
+        {
+        }
+
+        public IResource CreateRelative(string relativePath)
+        {
+            return this.underlyingResource.CreateRelative(relativePath);
+        }
+
+        public bool IsOpen
+        {
+            get { return this.underlyingResource.IsOpen; }
+        }
+
+        public Uri Uri
+        {
+            get { return this.underlyingResource.Uri; }
+        }
+
+        public FileInfo File
+        {
+            get { return this.underlyingResource.File; }
+        }
+
+        public string Description
+        {
+            get { return this.underlyingResource.Description; }
+        }
+
+        public bool Exists
+        {
+            get { return this.underlyingResource.Exists; }
+        }
+
+        public Stream InputStream
+        {
+            get { return this.underlyingResource.InputStream; }
+        }
+
+        public static string GetFilePath (string fileName, Type associatedTestType) 
+        {
+            if (associatedTestType == null) 
+            {
+                return fileName;
+            }
+
+            // check filesystem
+            StringBuilder path = new StringBuilder (TestDataFolder).Append (Path.DirectorySeparatorChar.ToString());
+            path.Append (associatedTestType.Namespace.Replace (".", Path.DirectorySeparatorChar.ToString()));
+            path.Append (Path.DirectorySeparatorChar.ToString()).Append (fileName);
+
+            FileInfo file = new FileInfo(path.ToString());
+            if (file.Exists)
+            {
+                return path.ToString ();
+            }
+            else
+            {
+                // interpret as assembly resource
+                fileName = "assembly://" + associatedTestType.Assembly.FullName + "/" + associatedTestType.Namespace
+                           + "/" + fileName;
+                return fileName;
+            }
+        }
+
+        public override string ToString()
+        {
+            return Description;
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/SingleSimpleTypeConstructorObject.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/SingleSimpleTypeConstructorObject.cs
new file mode 100644
index 00000000..3f32d95c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/SingleSimpleTypeConstructorObject.cs
@@ -0,0 +1,86 @@
+using System;
+
+#region License
+
+/*
+ * Copyright 2004 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
+
+namespace Spring.Objects.Factory.Xml
+{
+	/// <summary>
+	/// Simple object used to test object creation via constuctors with
+	/// simple types.
+	/// </summary>
+	/// <author>Jurgen Hoeller</author>
+	/// <author>Mark Pollack (.NET)</author>
+	public class SingleSimpleTypeConstructorObject
+	{
+		private bool singleBoolean;
+
+		private bool secondBoolean;
+
+		private string testString;
+
+		/// <summary>
+		/// Create an instance using the singleBoolean
+		/// </summary>
+		/// <param name="singleBoolean">true or false</param>
+		public SingleSimpleTypeConstructorObject(bool singleBoolean)
+		{
+			this.singleBoolean = singleBoolean;
+		}
+
+		/// <summary>
+		/// Create an instance using the second boolean and a string
+		/// </summary>
+		/// <param name="testString">test value</param>
+		/// <param name="secondBoolean">true or false</param>
+		public SingleSimpleTypeConstructorObject(string testString, bool secondBoolean)
+		{
+			this.testString = testString;
+			this.secondBoolean = secondBoolean;
+		}
+
+
+		/// <summary>
+		/// Property TestString (string)
+		/// </summary>
+		public string TestString
+		{
+			get { return this.testString; }
+		}
+
+		/// <summary>
+		/// Property SecondBoolean (bool)
+		/// </summary>
+		public bool SecondBoolean
+		{
+			get { return this.secondBoolean; }
+		}
+
+		/// <summary>
+		/// Property SingleBoolean (bool)
+		/// </summary>
+		public bool SingleBoolean
+		{
+			get { return this.singleBoolean; }
+		}
+
+
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/TestObjectCreator.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/TestObjectCreator.cs
new file mode 100644
index 00000000..07048d08
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/TestObjectCreator.cs
@@ -0,0 +1,53 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Test class for Spring's ability to create objects using static factory methods, rather
+    /// than constructors.
+    /// </summary>
+    /// <author>Rod Johnson</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: TestObjectCreator.cs,v 1.3 2006/04/09 07:24:51 markpollack Exp $</version>
+    public class TestObjectCreator
+    {
+        public static TestObject CreateTestObject(string name, int age)
+        {
+            return new TestObject(name, age);
+        }
+
+        public static TestObject CreateTestObject()
+        {
+            return new TestObject("Tristan", 2);
+        }
+
+        public TestObject InstanceCreateTestObject()
+        {
+            return CreateTestObject();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlListableObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlListableObjectFactoryTests.cs
new file mode 100644
index 00000000..15d4ebea
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlListableObjectFactoryTests.cs
@@ -0,0 +1,170 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+	/// <summary>
+	/// Unit tests for the XmlListableObjectFactory class.
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	/// <author>Rick Evans (.NET)</author>
+	[TestFixture]
+	public class XmlListableObjectFactoryTests : AbstractListableObjectFactoryTests
+	{
+		#region Inner Class : AnonymousClassObjectPostProcessor
+
+		private class AnonymousClassObjectPostProcessor : IObjectPostProcessor
+		{
+			public AnonymousClassObjectPostProcessor()
+			{
+			}
+
+			public virtual object PostProcessBeforeInitialization(
+				object obj, string name)
+			{
+				if (obj is TestObject)
+				{
+					((TestObject) obj).PostProcessed = true;
+				}
+				if (obj is DummyFactory)
+				{
+					((DummyFactory) obj).PostProcessed = true;
+				}
+				return obj;
+			}
+
+			public virtual object PostProcessAfterInitialization(
+				object obj, string objectName)
+			{
+				return obj;
+			}
+		}
+
+		#endregion
+
+		protected internal override IObjectFactory ObjectFactory
+		{
+			get { return factory; }
+		}
+
+		private DefaultListableObjectFactory parent;
+		private XmlObjectFactory factory;
+
+		#region Test SetUp
+
+		[SetUp]
+		protected void SetUp()
+		{
+			parent = new DefaultListableObjectFactory();
+			IDictionary m = new Hashtable();
+			m["name"] = "Albert";
+			parent.RegisterObjectDefinition("father", new RootObjectDefinition(typeof (TestObject), new MutablePropertyValues(m)));
+			m = new Hashtable();
+			m["name"] = "Roderick";
+			parent.RegisterObjectDefinition("rod", new RootObjectDefinition(typeof (TestObject), new MutablePropertyValues(m)));
+
+            // for testing dynamic ctor arguments + parent.GetObject() call propagation 
+            parent.RegisterObjectDefinition("namedfather", new RootObjectDefinition(typeof(TestObject), false));
+            parent.RegisterObjectDefinition("typedfather", new RootObjectDefinition(typeof(TestObject), false));
+
+			// add unsupported IObjectDefinition implementation...
+			UnsupportedObjectDefinitionImplementation unsupportedDefinition = new UnsupportedObjectDefinitionImplementation();
+			parent.RegisterObjectDefinition("unsupportedDefinition", unsupportedDefinition);
+
+			this.factory = new XmlObjectFactory(new ReadOnlyXmlTestResource("test.xml", GetType()), parent);
+            
+            // TODO: should this be allowed?
+            //this.factory.RegisterObjectDefinition("typedfather", new RootObjectDefinition(typeof(object), false));
+			this.factory.AddObjectPostProcessor(new AnonymousClassObjectPostProcessor());
+			this.factory.AddObjectPostProcessor(new LifecycleObject.PostProcessor());
+
+			this.factory.PreInstantiateSingletons();
+		}
+
+		#endregion
+
+		[Test]
+		public virtual void FactoryNesting()
+		{
+			ITestObject father = (ITestObject) ObjectFactory.GetObject("father");
+			Assert.IsTrue(father != null, "Object from root context");
+
+			ITestObject rod = (ITestObject) ObjectFactory.GetObject("rod");
+			Assert.IsTrue("Rod".Equals(rod.Name), "Object from child context");
+			Assert.IsTrue(rod.Spouse == father, "Object has external reference");
+
+			rod = (ITestObject) parent.GetObject("rod");
+			Assert.IsTrue("Roderick".Equals(rod.Name), "Object from root context");
+		}
+
+		[Test]
+		public virtual void FactoryReferences()
+		{
+			DummyReferencer dref = (DummyReferencer) ObjectFactory.GetObject("factoryReferencer");
+			Assert.IsTrue(dref.TestObject1 == dref.TestObject2);
+		}
+
+		[Test]
+		public virtual void PrototypeReferences()
+		{
+			// check that not broken by circular reference resolution mechanism
+			DummyReferencer ref1 = (DummyReferencer) ObjectFactory.GetObject("prototypeReferencer");
+			Assert.IsTrue(ref1.TestObject1 != ref1.TestObject2, "Not referencing same Object twice");
+			DummyReferencer ref2 = (DummyReferencer) ObjectFactory.GetObject("prototypeReferencer");
+			Assert.IsTrue(ref1 != ref2, "Not the same referencer");
+			Assert.IsTrue(ref2.TestObject1 != ref2.TestObject2, "Not referencing same Object twice");
+			Assert.IsTrue(ref1.TestObject1 != ref2.TestObject1, "Not referencing same Object twice");
+			Assert.IsTrue(ref1.TestObject2 != ref2.TestObject2, "Not referencing same Object twice");
+			Assert.IsTrue(ref1.TestObject1 != ref2.TestObject2, "Not referencing same Object twice");
+		}
+
+		[Test]
+		public virtual void ObjectPostProcessor()
+		{
+			TestObject kerry = (TestObject) ObjectFactory.GetObject("kerry");
+			TestObject kathy = (TestObject) ObjectFactory.GetObject("kathy");
+			DummyFactory factory = (DummyFactory) ObjectFactory.GetObject("&singletonFactory");
+			TestObject factoryCreated = (TestObject) ObjectFactory.GetObject("singletonFactory");
+			Assert.IsTrue(kerry.PostProcessed);
+			Assert.IsTrue(kathy.PostProcessed);
+			Assert.IsTrue(factory.PostProcessed);
+			Assert.IsTrue(factoryCreated.PostProcessed);
+		}
+
+		/// <summary>
+		/// Test the number of singletons in test.xml
+		/// </summary>
+		[Test]
+		public virtual void CountSingletons()
+		{
+			Assert.AreEqual(10, factory.GetSingletonCount(), "Number of singletons incorrect");
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs
new file mode 100644
index 00000000..81a7b807
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs
@@ -0,0 +1,767 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Text;
+using Common.Logging;
+using Common.Logging.Simple;
+using NUnit.Framework;
+using Spring.Collections;
+using Spring.Core.IO;
+using Spring.Expressions;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Tests for collections in XML object definitions.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: XmlObjectCollectionTests.cs,v 1.9 2007/08/08 17:49:04 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class XmlObjectCollectionTests
+    {
+        /// <summary>
+        /// The setup logic executed before the execution of this test fixture.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void FixtureSetUp()
+        {
+            // enable (null appender) logging, to ensure that the logging code is exercised...
+            LogManager.Adapter = new NoOpLoggerFactoryAdapter(); 
+            //XmlConfigurator.Configure();
+        }
+
+        [Test]
+        public void RefSubelementsBuildCollection()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            //Assert.IsTrue ("5 objects in reftypes, not " + xof.GetObjectDefinitionCount(), xof.GetObjectDefinitionCount() == 5);
+            TestObject jen = (TestObject) xof.GetObject("jenny");
+            TestObject dave = (TestObject) xof.GetObject("david");
+            TestObject rod = (TestObject) xof.GetObject("rod");
+
+            // Must be a list to support ordering
+            // Our object doesn't modify the collection:
+            // of course it could be a different copy in a real object
+            IList friends = (IList) rod.Friends;
+            Assert.IsTrue(friends.Count == 2);
+            Assert.IsTrue(friends[0] == jen, "First friend must be jen, not " + friends[0]);
+            Assert.IsTrue(friends[1] == dave);
+            // Should be ordered
+        }
+
+        [Test]
+        public void RefSubelementsBuildCollectionWithPrototypes()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+
+            TestObject jen = (TestObject) xof.GetObject("pJenny");
+            TestObject dave = (TestObject) xof.GetObject("pDavid");
+            TestObject rod = (TestObject) xof.GetObject("pRod");
+            IList friends = (IList) rod.Friends;
+            Assert.IsTrue(friends.Count == 2);
+            Assert.IsTrue(friends[0].ToString().Equals(jen.ToString()), "First friend must be jen, not " + friends[0]);
+            Assert.IsTrue(friends[0] != jen, "Jen not same instance");
+            Assert.IsTrue(friends[1].ToString().Equals(dave.ToString()));
+            Assert.IsTrue(friends[1] != dave, "Dave not same instance");
+
+            TestObject rod2 = (TestObject) xof.GetObject("pRod");
+            IList friends2 = (IList) rod2.Friends;
+            Assert.IsTrue(friends2.Count == 2);
+            Assert.IsTrue(friends2[0].ToString().Equals(jen.ToString()), "First friend must be jen, not " + friends2[0]);
+            Assert.IsTrue(friends2[0] != friends[0], "Jen not same instance");
+            Assert.IsTrue(friends2[1].ToString().Equals(dave.ToString()));
+            Assert.IsTrue(friends2[1] != friends[1], "Dave not same instance");
+        }
+
+        [Test]
+        public void RefSubelementsBuildCollectionFromSingleElement()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            TestObject loner = (TestObject) xof.GetObject("loner");
+            TestObject dave = (TestObject) xof.GetObject("david");
+            Assert.IsTrue(loner.Friends.Count == 1);
+            bool contains = false;
+            foreach (object friend in loner.Friends)
+            {
+                if (friend == dave)
+                {
+                    contains = true;
+                    break;
+                }
+            }
+            Assert.IsTrue(contains);
+        }
+
+        [Test]
+        public void BuildCollectionFromMixtureOfReferencesAndValues()
+        {
+            MixedCollectionObject.ResetStaticState();
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            MixedCollectionObject jumble = (MixedCollectionObject) xof.GetObject("jumble");
+            Assert.AreEqual(1, MixedCollectionObject.nrOfInstances);
+            xof.GetObject("david", typeof (TestObject));
+            Assert.IsTrue(jumble.Jumble.Count == 4, "Expected 3 elements, not " + jumble.Jumble.Count);
+            IList l = (IList) jumble.Jumble;
+            Assert.IsTrue(l[0].Equals(xof.GetObject("david")));
+            Assert.IsTrue(l[1].Equals("literal"));
+            Assert.IsTrue(l[2].Equals(xof.GetObject("jenny")));
+            Assert.IsTrue(l[3].Equals("rod"));
+        }
+
+        /// <summary>
+        /// Test to see if a type safe custom collection class can be set using normal
+        /// list syntax.  
+        /// </summary>
+        [Test]
+        public void CustomListCollection()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            TestObject objectWithTypedFriends = (TestObject) xof.GetObject("objectWithTypedFriends");
+            TestObjectList tol = objectWithTypedFriends.TypedFriends;
+            Assert.AreEqual(1, tol.Count);
+            Assert.IsTrue(tol[0].Equals(xof.GetObject("david")));
+        }
+
+        /// <summary>
+        /// Test to see if we can set values on a collection class that uses indexers
+        /// </summary>
+        [Test]
+        public void ObjectWithIndexerProperty()
+        {          
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            TestObject testObject = (TestObject) xof.GetObject("objectWithIndexer");
+            Assert.IsNotNull(testObject);
+            Assert.AreEqual("my string value", testObject[0]);
+            
+        }
+        /// <summary>
+        /// Test that properties with name as well as id creating an alias up front.
+        /// </summary>
+        [Test]
+        public void AutoAliasing()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            IList objectNames = xof.GetObjectDefinitionNames();
+            TestObject tb1 = (TestObject) xof.GetObject("aliased");
+            TestObject alias1 = (TestObject) xof.GetObject("myalias");
+            Assert.IsTrue(tb1 == alias1);
+
+            IList tb1Aliases = xof.GetAliases("aliased");
+            Assert.AreEqual(1, tb1Aliases.Count);
+            Assert.IsTrue(tb1Aliases.Contains("myalias"));
+            Assert.IsTrue(objectNames.Contains("aliased"));
+            Assert.IsFalse(objectNames.Contains("myalias"));
+
+            TestObject tb2 = (TestObject) xof.GetObject("multiAliased");
+            TestObject alias2 = (TestObject) xof.GetObject("alias1");
+            TestObject alias3 = (TestObject) xof.GetObject("alias2");
+            Assert.IsTrue(tb2 == alias2);
+            Assert.IsTrue(tb2 == alias3);
+            IList tb2Aliases = xof.GetAliases("multiAliased");
+            Assert.AreEqual(2, tb2Aliases.Count);
+            Assert.IsTrue(tb2Aliases.Contains("alias1"));
+            Assert.IsTrue(tb2Aliases.Contains("alias2"));
+            Assert.IsTrue(objectNames.Contains("multiAliased"));
+            Assert.IsFalse(objectNames.Contains("alias1"));
+            Assert.IsFalse(objectNames.Contains("alias2"));
+
+            TestObject tb3 = (TestObject) xof.GetObject("aliasWithoutId1");
+            TestObject alias4 = (TestObject) xof.GetObject("aliasWithoutId2");
+            TestObject alias5 = (TestObject) xof.GetObject("aliasWithoutId3");
+            Assert.IsTrue(tb3 == alias4);
+            Assert.IsTrue(tb3 == alias5);
+
+            IList tb3Aliases = xof.GetAliases("aliasWithoutId1");
+            Assert.AreEqual(2, tb2Aliases.Count);
+            Assert.IsTrue(tb3Aliases.Contains("aliasWithoutId2"));
+            Assert.IsTrue(tb3Aliases.Contains("aliasWithoutId3"));
+            Assert.IsTrue(objectNames.Contains("aliasWithoutId1"));
+            Assert.IsFalse(objectNames.Contains("aliasWithoutId2"));
+            Assert.IsFalse(objectNames.Contains("aliasWithoutId3"));
+
+            TestObject tb4 = (TestObject) xof.GetObject(typeof (TestObject).FullName);
+            Assert.AreEqual(null, tb4.Name);
+        }
+
+        /// <summary>
+        /// Test that we can add elements to an IList that is exposed as a 
+        /// read only property.  Many classes in the BCL only expose getters to
+        /// modify the content of collections.
+        /// </summary>
+        [Test]
+        public void AddElementsToReadOnlyList()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            //Stream stream = new FileSystemResource("file:///w:/collections.xml").InputStream;
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+
+            TestObject aleks = (TestObject) xof.GetObject("aleks");
+            IList pets = (IList) aleks.Pets;
+            Assert.IsTrue(pets.Count == 1);
+            Assert.IsTrue(pets[0].Equals("Nadja"));
+        }
+
+        /// <summary>
+        /// Test that we can add elements to an IDictionary that is exposed as a
+        /// read-only property.
+        /// </summary>
+        public void AddElementsToReadOnlyDictionary()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+
+            TestObject to = (TestObject) xof.GetObject("readOnlyDictionary");
+            IDictionary table = to.PeriodicTable;
+            Assert.IsTrue(table.Count == 2);
+            Assert.AreEqual("1", table["hydrogen"], "Dictionary Value incorrect");
+            Assert.AreEqual("12", table["carbon"], "Dictionary value incorrect");
+        }
+
+        /// <summary>
+        /// Test that we can add elements to an ISet that is exposed as a 
+        /// read-only property
+        /// </summary>
+        public void AddElementsToReadOnlySet()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+
+            TestObject to = (TestObject) xof.GetObject("readOnlySet");
+            ISet computers = to.Computers;
+            Assert.IsTrue(computers.Count == 2);
+            bool foundDell = false;
+            bool foundIbm = false;
+            foreach (string name in computers)
+            {
+                if (name.Equals("Dell"))
+                {
+                    foundDell = true;
+                }
+                if (name.Equals("IBM T41"))
+                {
+                    foundIbm = true;
+                }
+            }
+            Assert.IsTrue(foundDell, "Dell string not found in ISet");
+            Assert.IsTrue(foundIbm, "IBM T41 not found in ISet");
+        }
+
+        [Test]
+        public void EmptyMap()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            HasMap hasMap = (HasMap) xof.GetObject("emptyMap");
+            Assert.IsTrue(hasMap.Map.Count == 0);
+        }
+
+        [Test]
+        public void MapWithLiteralsOnly()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            HasMap hasMap = (HasMap) xof.GetObject("literalMap");
+            Assert.IsTrue(hasMap.Map.Count == 3);
+            Assert.IsTrue(hasMap.Map["foo"].Equals("bar"));
+            Assert.IsTrue(hasMap.Map["fi"].Equals("fum"));
+            Assert.IsTrue(hasMap.Map["fa"] == null);
+        }
+
+        [Test]
+        public void MapWithLiteralsAndReferences()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            HasMap hasMap = (HasMap) xof.GetObject("mixedMap");
+            Assert.IsTrue(hasMap.Map.Count == 3);
+            Assert.IsTrue(hasMap.Map["foo"].Equals("bar"));
+            TestObject jenny = (TestObject) xof.GetObject("jenny");
+            Assert.IsTrue(hasMap.Map["jenny"] == jenny);
+            Assert.IsTrue(hasMap.Map["david"].Equals("david"));
+        }
+
+        [Test]
+        public void MapWithLiteralsAndPrototypeReferences()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+
+            TestObject jenny = (TestObject) xof.GetObject("pJenny");
+            HasMap hasMap = (HasMap) xof.GetObject("pMixedMap");
+            Assert.IsTrue(hasMap.Map.Count == 2);
+            Assert.IsTrue(hasMap.Map["foo"].Equals("bar"));
+            Assert.IsTrue(hasMap.Map["jenny"].ToString().Equals(jenny.ToString()));
+            Assert.IsTrue(hasMap.Map["jenny"] != jenny, "Not same instance");
+
+            HasMap hasMap2 = (HasMap) xof.GetObject("pMixedMap");
+            Assert.IsTrue(hasMap2.Map.Count == 2);
+            Assert.IsTrue(hasMap2.Map["foo"].Equals("bar"));
+            Assert.IsTrue(hasMap2.Map["jenny"].ToString().Equals(jenny.ToString()));
+            Assert.IsTrue(hasMap2.Map["jenny"] != hasMap.Map["jenny"], "Not same instance");
+        }
+
+        [Test]
+        public void MapWithLiteralsReferencesAndList()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            HasMap hasMap = (HasMap) xof.GetObject("mixedMapWithList");
+            Assert.IsTrue(hasMap.Map.Count == 4);
+            Assert.IsTrue(hasMap.Map["foo"].Equals("bar"));
+            TestObject jenny = (TestObject) xof.GetObject("jenny");
+            Assert.IsTrue(hasMap.Map["jenny"].Equals(jenny));
+
+            // Check list
+            IList l = (IList) hasMap.Map["list"];
+            Assert.IsNotNull(l);
+            Assert.IsTrue(l.Count == 4);
+            Assert.IsTrue(l[0].Equals("zero"));
+            Assert.IsTrue(l[3] == null);
+
+            // Check nested map in list
+            IDictionary m = (IDictionary) l[1];
+            Assert.IsNotNull(m);
+            Assert.IsTrue(m.Count == 2);
+            Assert.IsTrue(m["fo"].Equals("bar"));
+            Assert.IsTrue(m["jen"].Equals(jenny), "Map element 'jenny' should be equal to jenny object, not " + m["jen"]);
+
+            // Check nested list in list
+            l = (IList) l[2];
+            Assert.IsNotNull(l);
+            Assert.IsTrue(l.Count == 2);
+            Assert.IsTrue(l[0].Equals(jenny));
+            Assert.IsTrue(l[1].Equals("ba"));
+
+            // Check nested map
+            m = (IDictionary) hasMap.Map["map"];
+            Assert.IsNotNull(m);
+            Assert.IsTrue(m.Count == 2);
+            Assert.IsTrue(m["foo"].Equals("bar"));
+            Assert.IsTrue(m["jenny"].Equals(jenny),
+                "Map element 'jenny' should be equal to jenny object, not " + m["jenny"]);
+        }
+
+        [Test]
+        public void EmptySet()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            HasMap hasMap = (HasMap) xof.GetObject("emptySet");
+            Assert.IsTrue(hasMap.Set.Count == 0);
+        }
+
+        [Test]
+        public void PopulatedSet()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            HasMap hasMap = (HasMap) xof.GetObject("set");
+            Assert.IsTrue(hasMap.Set.Count == 3);
+            Assert.IsTrue(hasMap.Set.Contains("bar"));
+            TestObject jenny = (TestObject) xof.GetObject("jenny");
+            Assert.IsTrue(hasMap.Set.Contains(jenny));
+            Assert.IsTrue(hasMap.Set.Contains(null));
+        }
+
+        [Test]
+        public void EmptyProps()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            HasMap hasMap = (HasMap) xof.GetObject("emptyProps");
+            Assert.IsTrue(hasMap.Props.Count == 0);
+        }
+
+        /// <summary>
+        /// Test that an empty string value can be placed in a name-value collection
+        /// </summary>
+        [Test]
+        public void EmptyValue()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            HasMap hasMap = (HasMap) xof.GetObject("emptyValue");
+            Assert.AreEqual("", hasMap.Props.Get("foo"), "Expected empty string");
+        }
+
+        [Test]
+        public void PopulatedProps()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            HasMap hasMap = (HasMap) xof.GetObject("props");
+            Assert.AreEqual(2, hasMap.Props.Count);
+            Assert.AreEqual("bar", hasMap.Props["foo"]);
+            Assert.AreEqual("TWO", hasMap.Props["2"]);
+        }
+
+        [Test]
+        public void DelimitedProps()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            HasMap hasMap = (HasMap)xof.GetObject("delimitedProps");
+            Assert.AreEqual(2, hasMap.Props.Count);
+            Assert.AreEqual(3, hasMap.Props.GetValues("foo").Length);
+            Assert.AreEqual(7, hasMap.Props.GetValues("days").Length);
+            Assert.AreEqual("wednesday", hasMap.Props.GetValues("days")[2]);
+        }
+        
+        [Test]
+        public void ObjectArray()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            HasMap hasMap = (HasMap) xof.GetObject("objectArray");
+            Assert.IsTrue(hasMap.ObjectArray.Length == 2);
+            Assert.IsTrue(hasMap.ObjectArray[0].Equals("one"));
+            Assert.IsTrue(hasMap.ObjectArray[1].Equals(xof.GetObject("jenny")));
+        }
+
+        [Test]
+        public void ClassArray()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            HasMap hasMap = (HasMap) xof.GetObject("classArray");
+            Assert.IsTrue(hasMap.ClassArray.Length == 2);
+            Assert.IsTrue(hasMap.ClassArray[0].Equals(typeof (String)));
+            Assert.IsTrue(hasMap.ClassArray[1].Equals(typeof (Exception)));
+        }
+
+        [Test]
+        public void GetDictionaryThatUsesEntryValueShortcut()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("collections.xml", GetType()));
+            IDictionary map = (IDictionary) xof.GetObject("mapWithEntryValueShortcut");
+            Assert.AreEqual(2, map.Count);
+            string v1 = (string) map["rob"];
+            Assert.AreEqual("robert", v1);
+            string v2 = (string) map["jen"];
+            Assert.AreEqual("jenny", v2);
+        }
+
+        [Test]
+        public void GetDictionaryThatUsesStringKeysSpecifiedAsElements()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("collections.xml", GetType()));
+            IDictionary map = (IDictionary) xof.GetObject("mapWithStringKeysSpecifiedAsElements");
+            Assert.AreEqual(2, map.Count);
+            string v1 = (string) map["rick"];
+            Assert.AreEqual("Rick Evans", v1);
+            string v2 = (string) map["uncleelvis"];
+            Assert.AreEqual("Elvis Orten", v2);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ObjectDefinitionStoreException))]
+        public void GetDictionaryThatDoesntSpecifyAnyKeyForAnEntry()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_GetDictionaryThatDoesntSpecifyAnyKeyForAnEntry)).Run();
+        }
+
+        private void _GetDictionaryThatDoesntSpecifyAnyKeyForAnEntry(out Stream stream)
+        {
+            const string xml =
+                      @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='mapWithNoKeyForEntry' type='Spring.Objects.Factory.Config.DictionaryFactoryObject, Spring.Core'>
+		<property name='SourceDictionary'>
+			<dictionary>
+				<entry>
+					<value>Rick Evans</value>
+				</entry>
+			</dictionary>
+		</property>
+	</object>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            new XmlObjectFactory(new InputStreamResource(stream, ""));
+            Assert.Fail("Must have failed to parse <entry/> element with no key.");
+        }
+
+        [Test]
+        public void GetDictionaryWithKeyRefAttributeShortcuts()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("collections.xml", GetType()));
+            IDictionary map = (IDictionary) xof.GetObject("mapWithKeyRefAttributeShortcuts");
+            Assert.AreEqual(2, map.Count);
+            string v1 = (string) map[new TestObject("Rick Evans", 30)];
+            Assert.AreEqual("Rick Evans", v1);
+            string v2 = (string) map[new TestObject("Uncle Elvis", 47)];
+            Assert.AreEqual("Elvis Orten", v2);
+        }
+
+        [Test]
+        public void GetDictionaryWithValueRefAttributeShortcuts()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("collections.xml", GetType()));
+            IDictionary map = (IDictionary) xof.GetObject("mapWithValueRefAttributeShortcuts");
+            Assert.AreEqual(2, map.Count);
+            foreach(string key in map.Keys)
+            {
+                object obj = map[key];
+                Assert.IsNotNull(obj);
+                Assert.AreEqual(typeof(TestObject), obj.GetType(), "Wrong value assigned to value of dictionary.");
+                TestObject tob = (TestObject) obj;
+                if(key == "rick")
+                {
+                    Assert.AreEqual("Rick Evans", tob.Name, "Wrong object value assigned to the 'rick' key.");
+                }
+                else if(key == "uncleelvis")
+                {
+                    Assert.AreEqual("Uncle Elvis", tob.Name, "Wrong object value assigned to the 'uncleelvis' key.");
+                }
+            }
+        }
+
+        [Test]
+        public void CollectionFactoryDefaults()
+        {
+            ListFactoryObject listFactory = new ListFactoryObject();
+            listFactory.SourceList = new ArrayList();
+            listFactory.AfterPropertiesSet();
+            Assert.IsTrue(listFactory.GetObject() is ArrayList);
+
+            SetFactoryObject setFactory = new SetFactoryObject();
+            setFactory.SourceSet = new HybridSet();
+            setFactory.AfterPropertiesSet();
+            Assert.IsTrue(setFactory.GetObject() is HybridSet);
+
+            DictionaryFactoryObject dictionaryFactory = new DictionaryFactoryObject();
+            dictionaryFactory.SourceDictionary = new Hashtable();
+            dictionaryFactory.AfterPropertiesSet();
+            Assert.IsTrue(dictionaryFactory.GetObject() is Hashtable);
+        }
+
+        [Test]
+        public void ListFactory()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            IList list = (IList) xof.GetObject("listFactory");
+            Assert.IsTrue(list is LinkedList);
+            Assert.IsTrue(list.Count == 2);
+            Assert.AreEqual("bar", list[0]);
+            Assert.AreEqual("jenny", list[1]);
+        }
+
+        [Test]
+        public void PrototypeListFactory()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            IList list = (IList) xof.GetObject("pListFactory");
+            Assert.IsTrue(list is LinkedList);
+            Assert.IsTrue(list.Count == 2);
+            Assert.AreEqual("bar", list[0]);
+            Assert.AreEqual("jenny", list[1]);
+        }
+
+        [Test]
+        public void SetFactory()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            Set mySet = (Set) xof.GetObject("setFactory");
+            Assert.IsTrue(mySet is HybridSet);
+            Assert.IsTrue(mySet.Count == 2);
+            Assert.IsTrue(mySet.Contains("bar"));
+            Assert.IsTrue(mySet.Contains("jenny"));
+        }
+
+        [Test]
+        public void PrototypeSetFactory()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            Set mySet = (Set) xof.GetObject("pSetFactory");
+            Assert.IsTrue(mySet is HybridSet);
+            Assert.IsTrue(mySet.Count == 2);
+            Assert.IsTrue(mySet.Contains("bar"));
+            Assert.IsTrue(mySet.Contains("jenny"));
+        }
+
+        [Test]
+        public void DictionaryFactory()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            IDictionary map = (IDictionary) xof.GetObject("mapFactory");
+            Assert.IsTrue(map is Hashtable);
+            Assert.IsTrue(map.Count == 2);
+            Assert.AreEqual("bar", map["foo"]);
+            Assert.AreEqual("jenny", map["jen"]);
+        }
+
+        [Test]
+        public void PrototypeDictionaryFactory()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            IDictionary map = (IDictionary) xof.GetObject("pMapFactory");
+            Assert.IsTrue(map is Hashtable);
+            Assert.IsTrue(map.Count == 2);
+            Assert.AreEqual("bar", map["foo"]);
+            Assert.AreEqual("jenny", map["jen"]);
+        }
+
+        [Test]
+        public void GetDictionaryThatUsesNonStringKeys()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("collections.xml", GetType()));
+            IDictionary map = (IDictionary) xof.GetObject("mapWithNonStringKeys");
+            Assert.AreEqual(2, map.Count);
+            string v1 = (string) map[new TestObject("Rick Evans", 30)];
+            Assert.AreEqual("Rick Evans", v1);
+            string v2 = (string) map[new TestObject("Uncle Elvis", 47)];
+            Assert.AreEqual("Elvis Orten", v2);
+        }
+        
+        [Test]
+        public void TypedNonGenericList()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("collections.xml", GetType()));
+            NonGenericExpressionHolder obj = (NonGenericExpressionHolder) xof.GetObject("nonGenericExpressionHolder");
+            Assert.AreEqual(2, obj[0].GetValue());
+            Assert.AreEqual(8, obj[1].GetValue());
+            Assert.AreEqual("ALEKSANDAR SEOVIC", obj[2].GetValue());
+            Assert.IsTrue((bool) obj[3].GetValue());
+        }
+
+        [Test]
+        public void TypedNonGenericDictionary()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("collections.xml", GetType()));
+            NonGenericExpressionHolder obj = (NonGenericExpressionHolder)xof.GetObject("nonGenericExpressionHolder");
+            Assert.AreEqual(2, obj["0"].GetValue());
+            Assert.AreEqual(8, obj["1"].GetValue());
+            Assert.AreEqual("ALEKSANDAR SEOVIC", obj["2"].GetValue());
+            Assert.IsTrue((bool)obj["3"].GetValue());
+        }
+
+#if NET_2_0
+        [Test]
+        public void TypedGenericList()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("collections.xml", GetType()));
+            GenericExpressionHolder obj = (GenericExpressionHolder)xof.GetObject("genericExpressionHolder");
+            Assert.AreEqual(2, obj[0].GetValue());
+            Assert.AreEqual(8, obj[1].GetValue());
+            Assert.AreEqual("ALEKSANDAR SEOVIC", obj[2].GetValue());
+            Assert.IsTrue((bool)obj[3].GetValue());
+        }
+
+        [Test]
+        public void TypedGenericDictionary()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("collections.xml", GetType()));
+            GenericExpressionHolder obj = (GenericExpressionHolder)xof.GetObject("genericExpressionHolder");
+            Assert.AreEqual(2, obj["0"].GetValue());
+            Assert.AreEqual(8, obj["1"].GetValue());
+            Assert.AreEqual("ALEKSANDAR SEOVIC", obj["2"].GetValue());
+            Assert.IsTrue((bool)obj["3"].GetValue());
+        }
+#endif
+    }
+
+    #region Helper classes
+    
+    public class NonGenericExpressionHolder
+    {
+        private IList expressionsList;
+        private IDictionary expressionsDictionary;
+
+        public IList ExpressionsList
+        {
+            set { this.expressionsList = value; }
+        }
+
+        public IDictionary ExpressionsDictionary
+        {
+            set { this.expressionsDictionary = value; }
+        }
+
+        public IExpression this[int index]
+        {
+            get { return (IExpression)this.expressionsList[index]; }
+        }
+
+        public IExpression this[string key]
+        {
+            get { return (IExpression)this.expressionsDictionary[key]; }
+        }
+    }
+
+#if NET_2_0
+    public class GenericExpressionHolder
+    {
+        private System.Collections.Generic.IList<IExpression> expressionsList;
+        private System.Collections.Generic.IDictionary<string, IExpression> expressionsDictionary;
+
+        public System.Collections.Generic.IList<IExpression> ExpressionsList
+        {
+            set { this.expressionsList = value; }
+        }
+
+        public System.Collections.Generic.IDictionary<string,IExpression> ExpressionsDictionary
+        {
+            set { this.expressionsDictionary = value; }
+        }
+
+        public IExpression this[int index]
+        {
+            get { return this.expressionsList[index]; }
+        }
+
+        public IExpression this[string key]
+        {
+            get { return this.expressionsDictionary[key]; }
+        }
+    }
+#else
+    public class GenericExpressionHolder : NonGenericExpressionHolder
+    {}
+#endif
+    
+    #endregion
+    
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs
new file mode 100644
index 00000000..967e59de
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectDefinitionReaderTests.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using NUnit.Framework;
+
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+    /// <summary>
+    /// Unit tests for the XmlObjectDefinitionReader class.
+    /// </summary>
+    /// <author>Rick Evans (.NET)</author>
+    [TestFixture]
+    public class XmlObjectDefinitionReaderTests
+    {
+        [Test]
+        public void Instantiation()
+        {
+            XmlObjectDefinitionReader reader
+                = new XmlObjectDefinitionReader(
+                    new DefaultListableObjectFactory());
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void LoadObjectDefinitionsWithNullResource()
+        {
+            XmlObjectDefinitionReader reader
+                = new XmlObjectDefinitionReader(
+                    new DefaultListableObjectFactory());
+            reader.LoadObjectDefinitions((string)null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void LoadObjectDefinitionsWithNonExistentResource()
+        {
+            XmlObjectDefinitionReader reader
+                = new XmlObjectDefinitionReader(
+                    new DefaultListableObjectFactory());
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("/dev/null"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectFactoryTests.cs
new file mode 100644
index 00000000..d240ee38
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectFactoryTests.cs
@@ -0,0 +1,1999 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Web.Services;
+using Common.Logging;
+using Common.Logging.Simple;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Context.Support;
+using Spring.Core.IO;
+using Spring.Core.TypeResolution;
+using Spring.Expressions;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{   
+    /// <summary>
+    /// Unit tests for the XmlObjectFactory class.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// There are actually a lot of integration tests in this class too.
+    /// </p>
+    /// </remarks>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: XmlObjectFactoryTests.cs,v 1.80 2008/05/02 20:08:23 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class XmlObjectFactoryTests
+    {
+        /// <summary>
+        /// The setup logic executed before the execution of this test fixture.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void FixtureSetUp()
+        {
+            // enable (null appender) logging, to ensure that the logging code is exercised...
+            //XmlConfigurator.Configure();
+            LogManager.Adapter = new NoOpLoggerFactoryAdapter();
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void ReplacedMethodWithNoReplacerObjectNameSpecified()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_ReplacedMethodWithNoReplacerObjectNameSpecified)).Run();
+        }
+
+        private void _ReplacedMethodWithNoReplacerObjectNameSpecified(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='foo' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+		<!-- the 'name' attribute is required to be a non-null string -->
+		<replaced-method name='bing' replacer=' '/>
+	</object>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void ReplacedMethodWithNoMethodNameSpecified()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_ReplacedMethodWithNoMethodNameSpecified)).Run();
+        }
+
+        private void _ReplacedMethodWithNoMethodNameSpecified(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='foo' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+		<!-- the 'name' attribute is required to be a non-null string -->
+		<replaced-method name=' ' replacer='target'/>
+	</object>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void ValidatesReplacedMethodCorrectly()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_ValidatesReplacedMethodCorrectly)).Run();
+        }
+
+        private void _ValidatesReplacedMethodCorrectly(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='foo' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+		<!-- there is no such method 'hello' on the TestObject class -->
+		<replaced-method name='hello' replacer='target'/>
+	</object>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+        }
+
+        [Test]
+        public void LookupMethodIsParsedAndOperatesCorrectly_SunnyDay()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_LookupMethodIsParsedAndOperatesCorrectly_SunnyDay)).Run();
+        }
+
+        private void _LookupMethodIsParsedAndOperatesCorrectly_SunnyDay(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='factory' type='Spring.Objects.Factory.Support.TestObjectFactory, Spring.Core.Tests'>
+		<lookup-method name='GetObject' object='target'/>
+	</object>
+	<object id='target' type='Spring.Objects.TestObject, Spring.Core.Tests' singleton='false'>
+		<property name='name' value='Fiona Apple'/>
+		<property name='age' value='47'/>
+	</object>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory factory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            TestObjectFactory tof = (TestObjectFactory) factory["factory"];
+            object to = tof.GetObject();
+            Assert.IsNotNull(to);
+            Assert.AreEqual(typeof(TestObject), to.GetType());
+            TestObject target = (TestObject) to;
+            Assert.AreEqual("Fiona Apple", target.Name);
+            Assert.AreEqual(47, target.Age);
+            // pull the prototype out again...
+            TestObject target2 = (TestObject) tof.GetObject();
+            Assert.IsFalse(ReferenceEquals(target, target2));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void ValidatesLookupMethodCorrectly()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_ValidatesLookupMethodCorrectly)).Run();
+        }
+
+        private void _ValidatesLookupMethodCorrectly(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='foo' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+		<!-- there is no such method 'hello' on the TestObject class -->
+		<lookup-method name='hello' object='target'/>
+	</object>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void LookupMethodWithNoMethodNameSpecified()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_LookupMethodWithNoMethodNameSpecified)).Run();
+        }
+
+        private void _LookupMethodWithNoMethodNameSpecified(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='foo' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+		<!-- the 'name' attribute is required to be a non-null string -->
+		<lookup-method name=' ' object='target'/>
+	</object>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory factory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            factory.GetObject("foo");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void LookupMethodWithNoTargetObjectNameSpecified()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_LookupMethodWithNoTargetObjectNameSpecified)).Run();
+        }
+
+        private void _LookupMethodWithNoTargetObjectNameSpecified(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='foo' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+		<!-- the 'name' attribute is required to be a non-null string -->
+		<lookup-method name='bing' object=' '/>
+	</object>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory factory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            factory.GetObject("foo");
+        }
+
+        [Test]
+        public void NonChildObjectDefinitionWithoutATypeReturnsObjectDefinition()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_NonChildObjectDefinitionWithoutATypeReturnsObjectDefinition)).Run();
+        }
+
+        private void _NonChildObjectDefinitionWithoutATypeReturnsObjectDefinition(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='Applicationimpl'/>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory factory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            object obj = factory.GetObject("Applicationimpl");
+            Assert.IsTrue(obj is IObjectDefinition);
+        }
+
+        [Test]
+        public void RegisterAliasViaAliasElement()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_RegisterAliasViaAliasElement)).Run();
+        }
+
+        private void _RegisterAliasViaAliasElement(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+    <alias name='foo' alias='fooAlias'/>
+	<object id='foo' type='Spring.Objects.TestObject,Spring.Core.Tests'/>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory factory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            // pull object out of the factory using the alias name...
+            object foo = factory.GetObject("fooAlias");
+            Assert.IsNotNull(foo, "Alias was obviously not registered otherwise we would not have got a null object back.");
+        }
+
+        [Test]
+        public void RegisterAliasViaAliasElementOrderingIsUnimportant()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_RegisterAliasViaAliasElementOrderingIsUnimportant)).Run();
+        }
+
+        private void _RegisterAliasViaAliasElementOrderingIsUnimportant(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='foo' type='Spring.Objects.TestObject,Spring.Core.Tests'/>
+    <alias name='foo' alias='fooAlias'/>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory factory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            // pull object out of the factory using the alias name...
+            object foo = factory.GetObject("fooAlias");
+            Assert.IsNotNull(foo, "Alias was obviously not registered otherwise we would not have got a null object back.");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void IfTypeAttributeIsPresentItMustNotBeTheEmptyStringValue()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_IfTypeAttributeIsPresentItMustNotBeTheEmptyStringValue)).Run();
+        }
+
+        private void _IfTypeAttributeIsPresentItMustNotBeTheEmptyStringValue(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='foo' type=''/>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory factory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            factory.GetObject("Applicationimpl");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void IfTypeAttributeIsPresentItMustNotBeAnOnlyWhitespaceStringValue()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_IfTypeAttributeIsPresentItMustNotBeAnOnlyWhitespaceStringValue)).Run();
+        }
+
+        private void _IfTypeAttributeIsPresentItMustNotBeAnOnlyWhitespaceStringValue(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='foo' type=' 
+'/>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory factory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            factory.GetObject("Applicationimpl");
+        }
+
+        [Test]
+        public void SimpleStringObject()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_SimpleStringObject)).Run();
+        }
+
+        private void _SimpleStringObject(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='myString' type='System.String'>
+		<constructor-arg index='0' value='foo'/>
+	</object>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory factory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            string myString = (string) factory["myString"];
+            Assert.AreEqual("foo", myString);
+        }
+
+        [Test]
+        public void MethodInvokingFactoryObjectRefsObject()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_MethodInvokingFactoryObjectRefsObject)).Run();
+        }
+
+        private void _MethodInvokingFactoryObjectRefsObject(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='myString' type='System.String'>
+		<constructor-arg type='char[]' value='Bingo'/>
+	</object>
+    <object id='foo' type='Spring.Objects.Factory.Config.MethodInvokingFactoryObject'>
+        <property name='TargetType' value='Spring.Objects.TestObject'/>
+        <property name='TargetMethod' value='Create'/>
+        <property name='Arguments'>
+            <list>
+                <ref local='myString'/>
+            </list>
+        </property>
+    </object>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory factory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            TestObject foo = (TestObject) factory["foo"];
+            Assert.AreEqual("Bingo", foo.Name);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectCreationException))]
+        public void BadParentReference()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("wellformed-but-bad.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+
+            xof.GetObject("no.parent.factory");
+        }
+
+        [Test]
+        public void TypedStringValueIsPickedUp()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_TypedStringValueIsPickedUp)).Run();
+        }
+
+        private void _TypedStringValueIsPickedUp(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='golyadkin' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+		<property name='Hats'><value type='string[]'>trilby,fedora</value></property>
+	</object>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            XmlObjectFactory fac = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            IObjectDefinition def = fac.GetObjectDefinition("golyadkin");
+            PropertyValue value = def.PropertyValues.GetPropertyValue("Hats");
+            Assert.AreEqual(typeof(TypedStringValue), value.Value.GetType());
+            TestObject obj = (TestObject) fac.GetObject("golyadkin");
+            Assert.IsTrue(ArrayUtils.AreEqual(new string[] {"trilby", "fedora"}, obj.Hats));
+        }
+
+        [Test]
+        public void ChildDefinitionWithoutIdOrNameOrALiasGetsOneAutogenerated()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_ChildDefinitionWithoutIdOrNameOrALiasGetsOneAutogenerated)).Run();
+        }
+
+        private void _ChildDefinitionWithoutIdOrNameOrALiasGetsOneAutogenerated(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='mother' abstract='true' type='Spring.Objects.TestObject, Spring.Core.Tests'/>
+	<object parent='mother'/>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            XmlObjectFactory factory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            string[] names = factory.GetObjectDefinitionNames();
+            // mmm, how is one to test this? I have no idea what the generated name is...
+            Assert.AreEqual(2, names.Length, "Should have got two object names, one of which is autogenerated.");
+        }
+
+        /// <summary>
+        /// Tests for the issue described at SPRNET-83. Schema modded to allow
+        /// zero <object/> elements (where previously there HAD to be at least one).
+        /// </summary>
+        [Test]
+        public void AnObjectsFileWithNoObjectsIsOk()
+        {
+            // test just makes sure that no exception is thrown and that
+            // said container doesn't complain about having no objects.
+            IResource resource = new ReadOnlyXmlTestResource("no-objects.xml", GetType());
+            new XmlObjectFactory(resource);
+        }
+
+        [Test]
+        public void ImportsExternalResourcesCorrectly()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("external-resources.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            // object comes from imported file...
+            ITestObject rick = xof["rick"] as ITestObject;
+            Assert.IsNotNull(rick);
+            Assert.AreEqual("Rick", rick.Name);
+            // object comes from base file...
+            ITestObject jenny = xof["jenny"] as ITestObject;
+            Assert.IsNotNull(jenny);
+            Assert.AreEqual("Jenny", jenny.Name);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void ImportsExternalResourcesBailsOnNonExistentResource()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("bad-external-resources.xml", GetType());
+            new XmlObjectFactory(resource);
+        }
+
+        [Test]
+        public void PropertyInvokingFactoryObjectIsWiredCorrectly()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("invoke-factory.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            TestObject actual = xof["culturalObject"] as TestObject;
+            object expected = CultureInfo.InstalledUICulture;
+            Assert.AreEqual(expected, actual.MyCulture);
+        }
+
+        [Test]
+        public void LoadFromConfig()
+        {
+            IObjectFactory factory = ConfigurationUtils.GetSection("objects") as IObjectFactory;
+
+            Assert.IsNotNull(factory, "Factory loaded from config was null.");
+            Assert.IsTrue(factory is IConfigurableListableObjectFactory);
+            IConfigurableListableObjectFactory clof
+                = factory as IConfigurableListableObjectFactory;
+            Assert.IsTrue(clof.ObjectDefinitionCount == 6);
+            Assert.IsNotNull(factory["foo"]);
+        }
+
+        [Test]
+        public void DescriptionButNoProperties()
+        {
+            DefaultListableObjectFactory xof = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(xof);
+            reader.LoadObjectDefinitions(
+                new ReadOnlyXmlTestResource("collections.xml", GetType()));
+            TestObject validEmpty
+                = (TestObject) xof.GetObject("validEmptyWithDescription");
+            Assert.AreEqual(0, validEmpty.Age);
+        }
+
+        /// <summary>
+        /// Uses a separate factory.
+        /// </summary>
+        [Test]
+        public void RefToSeparatePrototypeInstances()
+        {
+            DefaultListableObjectFactory xof = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(xof);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("reftypes.xml", GetType()));
+            Assert.IsTrue(xof.ObjectDefinitionCount == 8, "8 objects in reftypes, not " + xof.ObjectDefinitionCount);
+            TestObject emma = (TestObject) xof.GetObject("emma");
+            TestObject georgia = (TestObject) xof.GetObject("georgia");
+            ITestObject emmasJenks = emma.Spouse;
+            ITestObject georgiasJenks = georgia.Spouse;
+            Assert.IsTrue(emmasJenks != georgiasJenks, "Emma and georgia think they have a different boyfriend.");
+            Assert.IsTrue(emmasJenks.Name.Equals("Andrew"), "Emmas jenks has right name");
+            Assert.IsTrue(emmasJenks != xof.GetObject("jenks"), "Emmas doesn't equal new ref.");
+            Assert.IsTrue(emmasJenks.Name.Equals("Andrew"), "Georgias jenks has right name.");
+            Assert.IsTrue(emmasJenks.Equals(georgiasJenks), "They are object equal.");
+            Assert.IsTrue(emmasJenks.Equals(xof.GetObject("jenks")), "They object equal direct ref.");
+        }
+
+        [Test]
+        public void RefToSingleton()
+        {
+            DefaultListableObjectFactory xof = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(xof);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("reftypes.xml", GetType()));
+            Assert.IsTrue(xof.ObjectDefinitionCount == 8, "8 objects in reftypes, not " + xof.ObjectDefinitionCount);
+            TestObject jen = (TestObject) xof.GetObject("jenny");
+            TestObject dave = (TestObject) xof.GetObject("david");
+            TestObject jenks = (TestObject) xof.GetObject("jenks");
+            ITestObject davesJen = dave.Spouse;
+            ITestObject jenksJen = jenks.Spouse;
+            Assert.IsTrue(davesJen == jenksJen, "1 jen instance");
+            Assert.IsTrue(davesJen == jen, "1 jen instance");
+        }
+
+        [Test]
+        public void InnerObjects()
+        {
+            DefaultListableObjectFactory xof = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(xof);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("reftypes.xml", GetType()));
+            TestObject hasInnerObjects = (TestObject) xof.GetObject("hasInnerObjects");
+            Assert.AreEqual(5, hasInnerObjects.Age);
+            Assert.IsNotNull(hasInnerObjects.Spouse);
+            Assert.AreEqual("inner1", hasInnerObjects.Spouse.Name);
+            Assert.AreEqual(6, hasInnerObjects.Spouse.Age);
+            Assert.IsNotNull(hasInnerObjects.Friends);
+            IList friends = (IList) hasInnerObjects.Friends;
+            Assert.AreEqual(2, friends.Count);
+            DerivedTestObject inner2 = (DerivedTestObject) friends[0];
+            Assert.AreEqual("inner2", inner2.Name);
+            Assert.AreEqual(7, inner2.Age);
+            TestObject innerFactory = (TestObject) friends[1];
+            Assert.AreEqual(DummyFactory.SINGLETON_NAME, innerFactory.Name);
+            Assert.IsNotNull(hasInnerObjects.SomeMap);
+            Assert.IsFalse((hasInnerObjects.SomeMap.Count == 0));
+            TestObject inner3 = (TestObject) hasInnerObjects.SomeMap["someKey"];
+            Assert.AreEqual("inner3", inner3.Name);
+            Assert.AreEqual(8, inner3.Age);
+            xof.Dispose();
+            Assert.IsTrue(inner2.WasDestroyed());
+            Assert.IsTrue(innerFactory.Name == null);
+        }
+
+        [Test]
+        public void InnerObjectsInPrototype()
+        {
+            DefaultListableObjectFactory xof = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(xof);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("reftypes.xml", GetType()));
+            TestObject hasInnerObjects = (TestObject) xof.GetObject("prototypeHasInnerObjects");
+            Assert.AreEqual(5, hasInnerObjects.Age);
+            Assert.IsNotNull(hasInnerObjects.Spouse);
+            Assert.AreEqual("inner1", hasInnerObjects.Spouse.Name);
+            Assert.AreEqual(6, hasInnerObjects.Spouse.Age);
+            Assert.IsNotNull(hasInnerObjects.Friends);
+            IList friends = (IList) hasInnerObjects.Friends;
+            Assert.AreEqual(2, friends.Count);
+            DerivedTestObject inner2 = (DerivedTestObject) friends[0];
+            Assert.AreEqual("inner2", inner2.Name);
+            Assert.AreEqual(7, inner2.Age);
+            IList friendsOfInner = (IList) inner2.Friends;
+            Assert.AreEqual(1, friendsOfInner.Count);
+            DerivedTestObject innerFriendOfAFriend = (DerivedTestObject) friendsOfInner[0];
+            Assert.AreEqual("innerFriendOfAFriend", innerFriendOfAFriend.Name);
+            Assert.AreEqual(7, innerFriendOfAFriend.Age);
+            TestObject innerFactory = (TestObject) friends[1];
+            Assert.AreEqual(DummyFactory.SINGLETON_NAME, innerFactory.Name);
+            Assert.IsNotNull(hasInnerObjects.SomeMap);
+            Assert.IsFalse((hasInnerObjects.SomeMap.Count == 0));
+            TestObject inner3 = (TestObject) hasInnerObjects.SomeMap["someKey"];
+            Assert.AreEqual("inner3", inner3.Name);
+            Assert.AreEqual(8, inner3.Age);
+            xof.Dispose();
+            Assert.IsFalse(inner2.WasDestroyed());
+            Assert.IsFalse(innerFactory.Name == null);
+            Assert.IsFalse(innerFriendOfAFriend.WasDestroyed());
+        }
+
+        [Test]
+        public void SingletonInheritanceFromParentFactorySingleton()
+        {
+            XmlObjectFactory parent = new XmlObjectFactory(new ReadOnlyXmlTestResource("parent.xml", GetType()));
+            XmlObjectFactory child = new XmlObjectFactory(new ReadOnlyXmlTestResource("child.xml", GetType()), parent);
+            TestObject inherits = (TestObject) child.GetObject("inheritsFromParentFactory");
+            // Name property value is overriden
+            Assert.IsTrue(inherits.Name.Equals("override"));
+            // Age property is inherited from object in parent factory
+            Assert.IsTrue(inherits.Age == 1);
+            TestObject inherits2 = (TestObject) child.GetObject("inheritsFromParentFactory");
+            Assert.IsTrue(inherits2 == inherits);
+        }
+
+        [Test]
+        public void PrototypeInheritanceFromParentFactoryPrototype()
+        {
+            XmlObjectFactory parent = new XmlObjectFactory(new ReadOnlyXmlTestResource("parent.xml", GetType()));
+            XmlObjectFactory child = new XmlObjectFactory(new ReadOnlyXmlTestResource("child.xml", GetType()), parent);
+            TestObject inherits = (TestObject) child.GetObject("prototypeInheritsFromParentFactoryPrototype");
+            // Name property value is overridden
+            Assert.IsTrue(inherits.Name.Equals("prototype-override"));
+            // Age property is inherited from object in parent factory
+            Assert.IsTrue(inherits.Age == 2);
+            TestObject inherits2 = (TestObject) child.GetObject("prototypeInheritsFromParentFactoryPrototype");
+            Assert.IsFalse(inherits2 == inherits);
+            inherits2.Age = 13;
+            Assert.IsTrue(inherits2.Age == 13);
+            // Shouldn't have changed first instance
+            Assert.IsTrue(inherits.Age == 2);
+        }
+
+        [Test]
+        public void PrototypeInheritanceFromParentFactorySingleton()
+        {
+            XmlObjectFactory parent = new XmlObjectFactory(new ReadOnlyXmlTestResource("parent.xml", GetType()));
+            XmlObjectFactory child = new XmlObjectFactory(new ReadOnlyXmlTestResource("child.xml", GetType()), parent);
+            TestObject inherits = (TestObject) child.GetObject("protoypeInheritsFromParentFactorySingleton");
+            // Name property value is overridden
+            Assert.IsTrue(inherits.Name.Equals("prototypeOverridesInheritedSingleton"));
+            // Age property is inherited from object in parent factory
+            Assert.IsTrue(inherits.Age == 1);
+            TestObject inherits2 = (TestObject) child.GetObject("protoypeInheritsFromParentFactorySingleton");
+            Assert.IsFalse(inherits2 == inherits);
+            inherits2.Age = 13;
+            Assert.IsTrue(inherits2.Age == 13);
+            // Shouldn't have changed first instance
+            Assert.IsTrue(inherits.Age == 1);
+        }
+
+        [Test]
+        public void DependenciesMaterializeThis()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("dependenciesMaterializeThis.xml", GetType());
+            XmlObjectFactory bf = new XmlObjectFactory(resource);
+            DummyBo bos = (DummyBo) bf.GetObject("boSingleton");
+            DummyBo bop = (DummyBo) bf.GetObject("boPrototype");
+            Assert.IsFalse(bos == bop);
+            Assert.AreEqual(bos.dao, bop.dao);
+        }
+
+        [Test]
+        public void ChildOverridesParentObject()
+        {
+            XmlObjectFactory parent = new XmlObjectFactory(new ReadOnlyXmlTestResource("parent.xml", GetType()));
+            XmlObjectFactory child = new XmlObjectFactory(new ReadOnlyXmlTestResource("child.xml", GetType()), parent);
+            TestObject inherits = (TestObject) child.GetObject("inheritedTestObject");
+            // Name property value is overridden
+            Assert.IsTrue(inherits.Name.Equals("overrideParentObject"));
+            // Age property is inherited from object in parent factory
+            Assert.IsTrue(inherits.Age == 1);
+            TestObject inherits2 = (TestObject) child.GetObject("inheritedTestObject");
+            Assert.IsTrue(inherits2 == inherits);
+        }
+
+        /// <summary>
+        /// Check that a prototype can't inherit from a bogus parent.
+        /// If a singleton does this the factory will fail to load.
+        /// </summary>
+        [Test]
+        [ExpectedException(typeof(NoSuchObjectDefinitionException))]
+        public void BogusParentageFromParentFactory()
+        {
+            XmlObjectFactory parent = new XmlObjectFactory(new ReadOnlyXmlTestResource("parent.xml", GetType()));
+            XmlObjectFactory child = new XmlObjectFactory(new ReadOnlyXmlTestResource("child.xml", GetType()), parent);
+            child.GetObject("bogusParent");
+        }
+
+        /// <summary>
+        /// Note that prototype/singleton distinction is <b>not</b> inherited.
+        /// It's possible for a subclass singleton not to return independent
+        /// instances even if derived from a prototype
+        /// </summary>
+        [Test]
+        public void SingletonInheritsFromParentFactoryPrototype()
+        {
+            XmlObjectFactory parent = new XmlObjectFactory(new ReadOnlyXmlTestResource("parent.xml", GetType()));
+            XmlObjectFactory child = new XmlObjectFactory(new ReadOnlyXmlTestResource("child.xml", GetType()), parent);
+            TestObject inherits = (TestObject) child.GetObject("singletonInheritsFromParentFactoryPrototype");
+            // Name property value is overriden
+            Assert.IsTrue(inherits.Name.Equals("prototype-override"));
+            // Age property is inherited from object in parent factory
+            Assert.IsTrue(inherits.Age == 2);
+            TestObject inherits2 = (TestObject) child.GetObject("singletonInheritsFromParentFactoryPrototype");
+            Assert.IsTrue(inherits2 == inherits);
+        }
+
+        [Test]
+        public void AbstractParentObjects()
+        {
+            XmlObjectFactory parent = new XmlObjectFactory(new ReadOnlyXmlTestResource("parent.xml", GetType()));
+            parent.PreInstantiateSingletons();
+            Assert.IsTrue(parent.IsSingleton("inheritedTestObjectWithoutClass"));
+
+            // abstract objects should not match
+            //TODO add overloaded GetObjectOfType with 1 arg
+            IDictionary tbs = parent.GetObjectsOfType(typeof(TestObject), true, true);
+            Assert.AreEqual(2, tbs.Count);
+            Assert.IsTrue(tbs.Contains("inheritedTestObjectPrototype"));
+            Assert.IsTrue(tbs.Contains("inheritedTestObjectSingleton"));
+
+            // non-abstract object should work, even if it serves as parent
+            object o1 = parent.GetObject("inheritedTestObjectPrototype");
+            Assert.IsTrue(o1 is TestObject);
+
+            // abstract object should return IObjectInstance itself
+            object o2 = parent.GetObject("inheritedTestObjectWithoutClass");
+            Assert.IsTrue(o2 is IObjectDefinition);
+        }
+
+        [Test]
+        public void CircularReferences()
+        {
+            DefaultListableObjectFactory xof = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(xof);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("reftypes.xml", GetType()));
+            TestObject jenny = (TestObject) xof.GetObject("jenny");
+            TestObject david = (TestObject) xof.GetObject("david");
+            TestObject ego = (TestObject) xof.GetObject("ego");
+            Assert.IsTrue(jenny.Spouse == david, "Correct circular reference");
+            Assert.IsTrue(david.Spouse == jenny, "Correct circular reference");
+            Assert.IsTrue(ego.Spouse == ego, "Correct circular reference");
+        }
+
+        [Test]
+        public void FactoryReferenceCircle()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("factoryCircle.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            TestObject tb = (TestObject) xof.GetObject("singletonFactory");
+            DummyFactory db = (DummyFactory) xof.GetObject("&singletonFactory");
+            Assert.IsTrue(tb == db.OtherTestObject);
+        }
+
+        [Test]
+        public void RefSubelement()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            //Assert.IsTrue ("5 objects in reftypes, not " + xof.GetObjectDefinitionCount(), xof.GetObjectDefinitionCount() == 5);
+            TestObject jen = (TestObject) xof.GetObject("jenny");
+            TestObject dave = (TestObject) xof.GetObject("david");
+            Assert.IsTrue(jen.Spouse == dave);
+        }
+
+        [Test]
+        public void PropertyWithLiteralValueSubelement()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            TestObject verbose = (TestObject) xof.GetObject("verbose");
+            Assert.IsTrue(verbose.Name.Equals("verbose"));
+        }
+
+        [Test]
+        public void PropertyWithIdRefLocalAttrSubelement()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            TestObject verbose = (TestObject) xof.GetObject("verbose2");
+            Assert.IsTrue(verbose.Name.Equals("verbose"));
+        }
+
+        [Test]
+        public void PropertyWithIdRefObjectAttrSubelement()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("collections.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            TestObject verbose = (TestObject) xof.GetObject("verbose3");
+            Assert.IsTrue(verbose.Name.Equals("verbose"));
+        }
+
+        [Test]
+        public void EnumProperty()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("enums.xml", GetType()));
+            TestObject obj = factory.GetObject("rod", typeof(TestObject)) as TestObject;
+            Assert.IsNotNull(obj.FileMode);
+            Assert.AreEqual(FileMode.Create, obj.FileMode);
+        }
+
+        [Test]
+        public void InitMethodIsInvoked()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("initializers.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            DoubleInitializer in_Renamed = (DoubleInitializer) xof.GetObject("init-method1");
+            // Initializer should have doubled value
+            Assert.AreEqual(14, in_Renamed.Num);
+        }
+
+        /// <summary>
+        /// Test that if a custom initializer throws an exception, it's handled correctly.
+        /// </summary>
+        [Test]
+        public void InitMethodThrowsException()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("initializers.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            try
+            {
+                xof.GetObject("init-method2");
+                Assert.Fail();
+            }
+            catch (ObjectCreationException ex)
+            {
+                Assert.IsTrue(ex.InnerException is FormatException);
+            }
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectCreationException))]
+        public void NoSuchInitMethod()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("initializers.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            xof.GetObject("init-method3");
+            Assert.Fail();
+        }
+
+        /// <summary>
+        /// Check that InitializingObject method is called first.
+        /// </summary>
+        [Test]
+        public void InitializingObjectAndInitMethod()
+        {
+            InitAndIB.constructed = false;
+            IResource resource = new ReadOnlyXmlTestResource("initializers.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            Assert.IsFalse(InitAndIB.constructed);
+            xof.PreInstantiateSingletons();
+            Assert.IsFalse(InitAndIB.constructed);
+            InitAndIB iib = (InitAndIB) xof.GetObject("init-and-ib");
+            Assert.IsTrue(InitAndIB.constructed);
+            Assert.IsTrue(iib.afterPropertiesSetInvoked && iib.initMethodInvoked);
+            Assert.IsTrue(!iib.destroyed && !iib.customDestroyed);
+            xof.Dispose();
+            Assert.IsTrue(iib.destroyed && iib.customDestroyed);
+            xof.Dispose();
+            Assert.IsTrue(iib.destroyed && iib.customDestroyed);
+        }
+
+        [Test]
+        public void MultiThreadedLazyInit()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("lazy-init-multithreaded.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            
+            LazyWorker lw1 = new LazyWorker(xof);
+            LazyWorker lw2 = new LazyWorker(xof);
+            Thread thread1 = new Thread(new ThreadStart(lw1.DoWork));
+            Thread thread2 = new Thread(new ThreadStart(lw2.DoWork));
+                
+            thread1.Start();
+            Thread.Sleep(1000);
+            thread2.Start();
+            thread1.Join();
+            thread2.Join();            
+            Assert.AreEqual(typeof(LazyTestObject), lw1.ObjectFromContext.GetType());
+            Assert.AreEqual(typeof(LazyTestObject), lw2.ObjectFromContext.GetType());
+            Assert.AreEqual(1, LazyTestObject.Count);
+        }
+
+        /// <summary>
+        /// Check that InitializingObject method is called first.
+        /// </summary>
+        [Test]
+        public void DefaultLazyInit()
+        {
+            InitAndIB.constructed = false;
+            IResource resource = new ReadOnlyXmlTestResource("default-lazy-init.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            Assert.IsFalse(InitAndIB.constructed);
+            xof.PreInstantiateSingletons();
+            Assert.IsTrue(InitAndIB.constructed);
+            try
+            {
+                xof.GetObject("lazy-and-bad");
+            }
+            catch (ObjectCreationException ex)
+            {
+                Assert.IsTrue(ex.InnerException is FormatException);
+            }
+        }
+
+
+        /// <summary>
+        /// Check that InitializingObject method is called first.
+        /// </summary>
+        [Test]
+        public void DefaultLazyInitNoInObjectDef()
+        {
+            InitAndIB.constructed = false;
+            IResource resource = new ReadOnlyXmlTestResource("default-lazy-init.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            Assert.IsFalse(InitAndIB.constructed);
+            xof.PreInstantiateSingletons();
+            Assert.IsTrue(InitAndIB.constructed);
+            try
+            {
+                xof.GetObject("init-and-ib-no-init-in-local-object-def");
+            }
+            catch (ObjectCreationException ex)
+            {
+                Assert.IsTrue(ex.InnerException is FormatException);
+            }
+        }
+        
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void NoSuchXmlFile()
+        {
+            new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("missing.xml", GetType()));
+        }
+
+        [Test]
+        public void InvalidXmlFile()
+        {
+            DefaultListableObjectFactory xof = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(xof);
+            try
+            {
+                reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("invalid.xml", GetType()));
+                Assert.Fail("Should have thrown XmlObjectDefinitionStoreException");
+            }
+#if !NET_1_0
+            catch (XmlObjectDefinitionStoreException e)
+            {
+                Assert.AreEqual(0, e.Message.IndexOf("Line 21 in XML document"));
+            }
+#else
+            catch (XmlObjectDefinitionStoreException)
+            {}
+#endif
+        }
+
+        [Test]
+        public void DefaultXmlResolverIsUsedIfNullSuppliedOrSet()
+        {
+            DefaultListableObjectFactory xof = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(xof, null);
+            try
+            {
+                reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("invalid.xml", GetType()));  
+                Assert.Fail("Should have thrown XmlObjectDefinitionStoreException");
+            }
+#if !NET_1_0
+            catch (XmlObjectDefinitionStoreException e)
+            {
+                Assert.AreEqual(0, e.Message.IndexOf("Line 21 in XML document"));
+            }
+#else
+            catch (XmlObjectDefinitionStoreException)
+            {}
+#endif
+
+        }
+
+        [Test]
+        [ExpectedException(typeof(UnsatisfiedDependencyException))]
+        public void UnsatisfiedObjectDependencyCheck()
+        {
+            XmlObjectFactory xof
+                = new XmlObjectFactory(
+                    new ReadOnlyXmlTestResource(
+                        "unsatisfiedObjectDependencyCheck.xml", GetType()));
+            xof.GetObject("a", typeof(DependenciesObject));
+        }
+
+        [Test]
+        [ExpectedException(typeof(UnsatisfiedDependencyException))]
+        public void UnsatisfiedSimpleDependencyCheck()
+        {
+            XmlObjectFactory xof =
+                new XmlObjectFactory(new ReadOnlyXmlTestResource("unsatisfiedSimpleDependencyCheck.xml", GetType()));
+            xof.GetObject("a", typeof(DependenciesObject));
+        }
+
+        [Test]
+        public void SatisfiedObjectDependencyCheck()
+        {
+            XmlObjectFactory xof
+                = new XmlObjectFactory(
+                    new ReadOnlyXmlTestResource("satisfiedObjectDependencyCheck.xml", GetType()));
+            DependenciesObject a = (DependenciesObject) xof.GetObject("a");
+            Assert.IsNotNull(a.Spouse);
+        }
+
+        [Test]
+        public void SatisfiedSimpleDependencyCheck()
+        {
+            XmlObjectFactory xof =
+                new XmlObjectFactory(
+                    new ReadOnlyXmlTestResource(
+                        "satisfiedSimpleDependencyCheck.xml", GetType()));
+            DependenciesObject a = (DependenciesObject) xof.GetObject("a");
+            Assert.AreEqual(a.Age, 33);
+        }
+
+        [Test]
+        [ExpectedException(typeof(UnsatisfiedDependencyException))]
+        public void UnsatisfiedAllDependencyCheck()
+        {
+            XmlObjectFactory xof
+                = new XmlObjectFactory(
+                    new ReadOnlyXmlTestResource(
+                        "unsatisfiedAllDependencyCheckMissingObjects.xml", GetType()));
+            xof.GetObject("a", typeof(DependenciesObject));
+        }
+
+        [Test]
+        public void SatisfiedAllDependencyCheck()
+        {
+            XmlObjectFactory xof
+                = new XmlObjectFactory(
+                    new ReadOnlyXmlTestResource("satisfiedAllDependencyCheck.xml", GetType()));
+            DependenciesObject a = (DependenciesObject) xof.GetObject("a");
+            Assert.AreEqual(a.Age, 33);
+            Assert.IsNotNull(a.Name);
+            Assert.IsNotNull(a.Spouse);
+        }
+
+        public void Autowire()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("autowire.xml", GetType()));
+            TestObject spouse = new TestObject("kerry", 0);
+            xof.RegisterSingleton("spouse", spouse);
+            DoTestAutowire(xof);
+        }
+
+        public void AutowireWithParent()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("autowire.xml", GetType()));
+            DefaultListableObjectFactory lbf = new DefaultListableObjectFactory();
+            MutablePropertyValues pvs = new MutablePropertyValues();
+            pvs.Add("name", "kerry");
+            lbf.RegisterObjectDefinition("spouse", new RootObjectDefinition(typeof(TestObject), pvs));
+            xof.ParentObjectFactory = lbf;
+            DoTestAutowire(xof);
+        }
+
+        private void DoTestAutowire(XmlObjectFactory xof)
+        {
+            DependenciesObject rod1 = (DependenciesObject) xof.GetObject("rod1");
+            TestObject kerry = (TestObject) xof.GetObject("spouse");
+            // Should have been autowired
+            Assert.AreEqual(kerry, rod1.Spouse);
+
+            DependenciesObject rod1a = (DependenciesObject) xof.GetObject("rod1a");
+            // Should have been autowired
+            Assert.AreEqual(kerry, rod1a.Spouse);
+
+            DependenciesObject rod2 = (DependenciesObject) xof.GetObject("rod2");
+            // Should have been autowired
+            Assert.AreEqual(kerry, rod2.Spouse);
+
+            ConstructorDependenciesObject rod3 = (ConstructorDependenciesObject) xof.GetObject("rod3");
+            IndexedTestObject other = (IndexedTestObject) xof.GetObject("other");
+            // Should have been autowired
+            Assert.AreEqual(kerry, rod3.Spouse1);
+            Assert.AreEqual(kerry, rod3.Spouse2);
+            Assert.AreEqual(other, rod3.Other);
+
+            ConstructorDependenciesObject rod3a = (ConstructorDependenciesObject) xof.GetObject("rod3a");
+            // Should have been autowired
+            Assert.AreEqual(kerry, rod3a.Spouse1);
+            Assert.AreEqual(kerry, rod3a.Spouse2);
+            Assert.AreEqual(other, rod3a.Other);
+
+            try
+            {
+                xof.GetObject("rod4", typeof(ConstructorDependenciesObject));
+                Assert.Fail("Should not have thrown FatalObjectException");
+            }
+            catch (FatalObjectException)
+            {
+                // expected
+            }
+
+            DependenciesObject rod5 = (DependenciesObject) xof.GetObject("rod5");
+            // Should not have been autowired
+            Assert.IsNotNull(rod5.Spouse);
+
+            IObjectFactory appCtx = (IObjectFactory) xof.GetObject("childAppCtx");
+            Assert.IsTrue(appCtx.GetObject("rod1") != null);
+            Assert.IsTrue(appCtx.GetObject("dependingObject") != null);
+            Assert.IsTrue(appCtx.GetObject("jenny") != null);
+        }
+
+        [Test]
+        public void AutowireWithDefault()
+        {
+            XmlObjectFactory xof
+                = new XmlObjectFactory(
+                    new ReadOnlyXmlTestResource("default-autowire.xml", GetType()));
+            DependenciesObject rod1 = (DependenciesObject) xof.GetObject("rod1");
+            // Should have been autowired
+            Assert.IsNotNull(rod1.Spouse);
+            Assert.IsTrue(rod1.Spouse.Name.Equals("Kerry"));
+
+            DependenciesObject rod2 = (DependenciesObject) xof.GetObject("rod2");
+            // Should have been autowired
+            Assert.IsNotNull(rod2.Spouse);
+            Assert.IsTrue(rod2.Spouse.Name.Equals("Kerry"));
+        }
+
+        [Test]
+        public void AutowireByConstructor()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("constructor-arg.xml", GetType()));
+            ConstructorDependenciesObject rod1 = (ConstructorDependenciesObject) xof.GetObject("rod1");
+            TestObject kerry = (TestObject) xof.GetObject("kerry2");
+            // Should have been autowired
+            Assert.AreEqual(kerry, rod1.Spouse1);
+            Assert.AreEqual(0, rod1.Age);
+            Assert.AreEqual(null, rod1.Name);
+
+            ConstructorDependenciesObject rod2 = (ConstructorDependenciesObject) xof.GetObject("rod2");
+            TestObject kerry1 = (TestObject) xof.GetObject("kerry1");
+            TestObject kerry2 = (TestObject) xof.GetObject("kerry2");
+            // Should have been autowired
+            Assert.AreEqual(kerry2, rod2.Spouse1);
+            Assert.AreEqual(kerry1, rod2.Spouse2);
+            Assert.AreEqual(0, rod2.Age);
+            Assert.AreEqual(null, rod2.Name);
+
+            ConstructorDependenciesObject rod = (ConstructorDependenciesObject) xof.GetObject("rod3");
+            IndexedTestObject other = (IndexedTestObject) xof.GetObject("other");
+            // Should have been autowired
+            Assert.AreEqual(kerry, rod.Spouse1);
+            Assert.AreEqual(kerry, rod.Spouse2);
+            Assert.AreEqual(other, rod.Other);
+            Assert.AreEqual(0, rod.Age);
+            Assert.AreEqual(null, rod.Name);
+            xof.GetObject("rod4", typeof(ConstructorDependenciesObject));
+            // Should have been autowired
+            Assert.AreEqual(kerry, rod.Spouse1);
+            Assert.AreEqual(kerry, rod.Spouse2);
+            Assert.AreEqual(other, rod.Other);
+            Assert.AreEqual(0, rod.Age);
+            Assert.AreEqual(null, rod.Name);
+        }
+
+        [Test]
+        public void AutowireByConstructorWithSimpleValues()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("constructor-arg.xml", GetType()));
+            ConstructorDependenciesObject rod5 = (ConstructorDependenciesObject) xof.GetObject("rod5");
+            TestObject kerry1 = (TestObject) xof.GetObject("kerry1");
+            TestObject kerry2 = (TestObject) xof.GetObject("kerry2");
+            IndexedTestObject other = (IndexedTestObject) xof.GetObject("other");
+            // Should have been autowired
+            Assert.AreEqual(kerry2, rod5.Spouse1);
+            Assert.AreEqual(kerry1, rod5.Spouse2);
+            Assert.AreEqual(other, rod5.Other);
+            Assert.AreEqual(99, rod5.Age);
+            Assert.AreEqual("myname", rod5.Name);
+            ConstructorDependenciesObject rod6 = (ConstructorDependenciesObject) xof.GetObject("rod6");
+            // Should have been autowired
+            Assert.AreEqual(kerry2, rod6.Spouse1);
+            Assert.AreEqual(kerry1, rod6.Spouse2);
+            Assert.AreEqual(other, rod6.Other);
+            Assert.AreEqual(0, rod6.Age);
+            Assert.AreEqual(null, rod6.Name);
+        }
+
+        [Test]
+        public void ConstructorArgResolution()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("constructor-arg.xml", GetType()));
+            TestObject kerry1 = (TestObject) xof.GetObject("kerry1");
+            TestObject kerry2 = (TestObject) xof.GetObject("kerry2");
+            ConstructorDependenciesObject rod9 = (ConstructorDependenciesObject) xof.GetObject("rod9");
+            Assert.AreEqual(99, rod9.Age);
+            ConstructorDependenciesObject rod10 = (ConstructorDependenciesObject) xof.GetObject("rod10");
+            Assert.AreEqual(null, rod10.Name);
+            ConstructorDependenciesObject rod11 = (ConstructorDependenciesObject) xof.GetObject("rod11");
+            Assert.AreEqual(kerry2, rod11.Spouse1);
+
+            ConstructorDependenciesObject rod12 = (ConstructorDependenciesObject) xof.GetObject("rod12");
+            Assert.AreEqual(kerry1, rod12.Spouse1);
+            Assert.IsNull(rod12.Spouse2);
+
+            ConstructorDependenciesObject rod13 = (ConstructorDependenciesObject) xof.GetObject("rod13");
+            Assert.AreEqual(kerry1, rod13.Spouse1);
+            Assert.AreEqual(kerry2, rod13.Spouse2);
+        }
+
+        [Test]
+        [ExpectedException(typeof(UnsatisfiedDependencyException))]
+        public void ThrowsExceptionOnTooManyArguments()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("constructor-arg.xml", GetType()));
+            xof.GetObject("rod7", typeof(ConstructorDependenciesObject));
+        }
+
+        [Test]
+        [ExpectedException(typeof(UnsatisfiedDependencyException))]
+        public void ThrowsExceptionOnAmbiguousResolution()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(new ReadOnlyXmlTestResource("constructor-arg.xml", GetType()));
+            xof.GetObject("rod8", typeof(ConstructorDependenciesObject));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void FactoryObjectDefinedAsPrototype()
+        {
+            new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("invalid-factory.xml", GetType()));
+        }
+
+        [Test]
+        public void DependsOn()
+        {
+            PreparingObject1.prepared = false;
+            PreparingObject1.destroyed = false;
+            PreparingObject2.prepared = false;
+            PreparingObject2.destroyed = false;
+            DependingObject.destroyed = false;
+            IResource resource = new ReadOnlyXmlTestResource("initializers.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            xof.PreInstantiateSingletons();
+            xof.Dispose();
+            Assert.IsTrue(PreparingObject1.prepared);
+            Assert.IsTrue(PreparingObject1.destroyed);
+            Assert.IsTrue(PreparingObject2.prepared);
+            Assert.IsTrue(PreparingObject2.destroyed);
+            Assert.IsTrue(DependingObject.destroyed);
+        }
+
+        [Test]
+        public void ClassNotFoundWithDefault()
+        {
+            try
+            {
+                new XmlObjectFactory(
+                    new ReadOnlyXmlTestResource("classNotFound.xml", GetType()));
+            }
+            catch (ObjectDefinitionStoreException ex)
+            {
+                Assert.IsTrue(ex.InnerException is TypeLoadException);
+            }
+        }
+
+        [Test]
+        public void AnObjectCanBeIstantiatedWithANotFullySpecifiedAssemblyName()
+        {
+            IResource resource = new ReadOnlyXmlTestResource("notfullyspecified.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+            IDbConnection connection = (IDbConnection) xof.GetObject("connectionNotFullySpecified");
+            Assert.IsNotNull(connection);
+        }
+
+        [Test]
+        public void ResourceAndInputStream()
+        {
+            //string filename = @"C:\temp\spring-test.properties";
+            string filename = @"/temp/spring-test.properties";
+            FileInfo file = new FileInfo(filename);
+            bool tempDirWasCreated = false;
+            try
+            {
+                if (file.Exists)
+                {
+                    file.Delete();
+                }
+                if (!file.Directory.Exists)
+                {
+                    file.Directory.Create();
+                    tempDirWasCreated = true;
+                }
+                StreamWriter sw = file.CreateText();
+                sw.WriteLine("test");
+                sw.Close();
+
+                IResource resource = new ReadOnlyXmlTestResource("resource.xml", GetType());
+                XmlObjectFactory xof = new XmlObjectFactory(resource);
+
+                ResourceTestObject resource1 = (ResourceTestObject) xof.GetObject("resource1");
+                Assert.IsTrue(resource1.Resource is FileSystemResource);
+                using (StreamReader reader = new StreamReader(resource1.Resource.InputStream))
+                {
+                    string fileText = reader.ReadLine();
+                    Assert.AreEqual("test", fileText, "error using IResource to read file contents");
+                }
+                using (StreamReader reader = new StreamReader(resource1.InputStream))
+                {
+                    string fileText = reader.ReadLine();
+                    Assert.AreEqual("test", fileText, "error using Stream to read file contents");
+                }
+            }
+            finally
+            {
+                if (tempDirWasCreated)
+                {
+                    file.Delete();
+                    // sure hope another process hasn't created the directory
+                    file.Directory.Delete();
+                }
+            }
+        }
+
+        [Test]
+        public void FactoryMethodsSingletonOnTargetClass()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("factory-methods.xml", GetType()));
+
+            FactoryMethods fm = (FactoryMethods) factory["default"];
+            Assert.AreEqual(0, fm.Number);
+            Assert.AreEqual("default", fm.Name);
+            Assert.AreEqual("defaultInstance", fm.Object.Name);
+            Assert.AreEqual("setterString", fm.Value);
+
+            fm = (FactoryMethods) factory["testObjectOnly"];
+            Assert.AreEqual(0, fm.Number);
+            Assert.AreEqual("default", fm.Name);
+            // This comes from the test object
+            Assert.AreEqual("Juergen", fm.Object.Name);
+
+            fm = (FactoryMethods) factory["full"];
+            Assert.AreEqual(27, fm.Number);
+            Assert.AreEqual("gotcha", fm.Name);
+            Assert.AreEqual("Juergen", fm.Object.Name);
+
+            FactoryMethods fm2 = (FactoryMethods) factory["full"];
+            Assert.AreSame(fm, fm2);
+        }
+
+        [Test]
+        public void FactoryMethodsPrototypeOnTargetClass()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("factory-methods.xml", GetType()));
+            FactoryMethods fm = (FactoryMethods) factory["defaultPrototype"];
+            FactoryMethods fm2 = (FactoryMethods) factory["defaultPrototype"];
+            Assert.AreEqual(0, fm.Number);
+            Assert.AreEqual("default", fm.Name);
+            Assert.AreEqual("defaultInstance", fm.Object.Name);
+            Assert.AreEqual("setterString", fm.Value);
+            Assert.AreEqual(fm.Number, fm2.Number);
+            Assert.AreEqual(fm.Value, fm2.Value);
+            // The TestObject is created separately for each object
+            Assert.IsFalse(ReferenceEquals(fm.Object, fm2.Object));
+            Assert.IsFalse(ReferenceEquals(fm, fm2));
+
+            fm = (FactoryMethods) factory["testObjectOnlyPrototype"];
+            fm2 = (FactoryMethods) factory["testObjectOnlyPrototype"];
+            Assert.AreEqual(0, fm.Number);
+            Assert.AreEqual("default", fm.Name);
+            // This comes from the test object
+            Assert.AreEqual("Juergen", fm.Object.Name);
+            Assert.AreEqual(fm.Number, fm2.Number);
+            Assert.AreEqual(fm.Value, fm2.Value);
+            // The TestObject reference is resolved to a prototype in the factory
+            Assert.AreSame(fm.Object, fm2.Object);
+            Assert.IsFalse(ReferenceEquals(fm, fm2));
+
+            fm = (FactoryMethods) factory["fullPrototype"];
+            fm2 = (FactoryMethods) factory["fullPrototype"];
+            Assert.AreEqual(27, fm.Number);
+            Assert.AreEqual("gotcha", fm.Name);
+            Assert.AreEqual("Juergen", fm.Object.Name);
+            Assert.AreEqual(fm.Number, fm2.Number);
+            Assert.AreEqual(fm.Value, fm2.Value);
+            // The TestObject reference is resolved to a prototype in the factory
+            Assert.AreSame(fm.Object, fm2.Object);
+            Assert.IsFalse(ReferenceEquals(fm, fm2));
+        }
+
+        /// <summary>
+        /// Tests where the static factory method is on a different class
+        /// </summary>
+        [Test]
+        public void FactoryMethodsOnExternalClass()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("factory-methods.xml", GetType()));
+            TestObject to = (TestObject) factory["externalFactoryMethodWithoutArgs"];
+            Assert.AreEqual(2, to.Age);
+            Assert.AreEqual("Tristan", to.Name);
+
+            to = (TestObject) factory["externalFactoryMethodWithArgs"];
+            Assert.AreEqual(33, to.Age);
+            Assert.AreEqual("Rod", to.Name);
+        }
+
+        [Test]
+        public void InstanceFactoryMethodWithoutArgs()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("factory-methods.xml", GetType()));
+            FactoryMethods fm = (FactoryMethods) factory["instanceFactoryMethodWithoutArgs"];
+            Assert.AreEqual("instanceFactory", fm.Object.Name);
+        }
+
+        [Test(Description = "http://opensource.atlassian.com/projects/spring/browse/SPRNET-492")]
+        public void InstanceFactoryMethodWithOverloadedArgs()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("factory-methods.xml", GetType()));
+            DataTable table = MakeNamesTable();
+            DataRow row = table.NewRow();
+            //FactoryMethods fm = (FactoryMethods) factory.GetObject("instanceFactoryMethodOverloads", new object[] {row});
+            // Assert.AreEqual("DataRowCtor", fm.Name);
+
+            DynamicMock mock = new DynamicMock(typeof(IDataRecord));
+            IDataRecord dataRecord = (IDataRecord) mock.Object;
+            FactoryMethods fm = (FactoryMethods)factory.GetObject("instanceFactoryMethodOverloads", new object[] { dataRecord });
+            Assert.AreEqual("DataRecordCtor", fm.Name);
+
+
+        }
+
+
+        #region Private Helper Methods for InstanceFactoryMethodWithOverloadedargs
+        private DataTable MakeNamesTable()
+        {
+            // Create a new DataTable titled 'Names.'
+            DataTable namesTable = new DataTable("Names");
+
+            // Add three column objects to the table.
+            DataColumn idColumn = new DataColumn();
+            idColumn.DataType = System.Type.GetType("System.Int32");
+            idColumn.ColumnName = "id";
+            idColumn.AutoIncrement = true;
+            namesTable.Columns.Add(idColumn);
+
+            DataColumn fNameColumn = new DataColumn();
+            fNameColumn.DataType = System.Type.GetType("System.String");
+            fNameColumn.ColumnName = "Fname";
+            fNameColumn.DefaultValue = "Fname";
+            namesTable.Columns.Add(fNameColumn);
+
+            DataColumn lNameColumn = new DataColumn();
+            lNameColumn.DataType = System.Type.GetType("System.String");
+            lNameColumn.ColumnName = "LName";
+            namesTable.Columns.Add(lNameColumn);
+
+            // Create an array for DataColumn objects.
+            DataColumn[] keys = new DataColumn[1];
+            keys[0] = idColumn;
+            namesTable.PrimaryKey = keys;
+
+            // Return the new DataTable.
+            return namesTable;
+        }
+
+        #endregion
+        [Test]
+        [ExpectedException(typeof(ObjectCreationException))]
+        public void FactoryMethodNoMatchingStaticMethod()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("factory-methods.xml", GetType()));
+            factory.GetObject("noMatchPrototype");
+        }
+
+        [Test]
+        public void CanSpecifyFactoryMethodArgumentsOnFactoryMethodPrototype()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("factory-methods.xml", GetType()));
+            TestObject toArg = new TestObject();
+            toArg.Name = "arg1";
+            TestObject toArg2 = new TestObject();
+            toArg2.Name = "arg2";
+            FactoryMethods fm1 = (FactoryMethods) factory.GetObject("testObjectOnlyPrototype", new object[] {toArg});
+            FactoryMethods fm2 = (FactoryMethods) factory.GetObject("testObjectOnlyPrototype", new object[] {toArg2});
+
+            Assert.AreEqual(0, fm1.Number);
+            Assert.AreEqual("default", fm1.Name);
+            // This comes from the test object
+            Assert.AreEqual("arg1", fm1.Object.Name);
+            Assert.AreEqual("arg2", fm2.Object.Name);
+            Assert.AreEqual(fm1.Number, fm2.Number);
+            Assert.AreEqual(fm2.Value, "testObjectOnlyPrototypeDISetterString");
+            Assert.AreEqual(fm2.Value, fm2.Value);
+            // The TestObject reference is resolved to a prototype in the factory
+            Assert.AreSame(fm2.Object, fm2.Object);
+            Assert.IsFalse(ReferenceEquals(fm1, fm2));
+        }
+
+        //[Test]
+        //[ExpectedException(typeof(ObjectDefinitionStoreException))]
+        //public void CannotSpecifyFactoryMethodArgumentsOnSingleton()
+        //{
+        //    DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+        //    XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+        //    reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("factory-methods.xml", GetType()));
+        //    factory.GetObject("testObjectOnly", new object[] {new TestObject()});
+        //}
+
+        //[Test]
+        //[ExpectedException(typeof(ObjectDefinitionStoreException))]
+        //public void CannotSpecifyFactoryMethodArgumentsExceptWithFactoryMethod()
+        //{
+        //    DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+        //    XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+        //    reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("overrides.xml", GetType()));
+        //    factory.GetObject("overrideOnPrototype", new object[] {new TestObject()});
+        //}
+
+        [Test]
+        public void StaticPropertyRetrievingFactoryMethod()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("field-props-factory.xml", GetType()));
+            MyTestObject obj = factory.GetObject("cultureAware", typeof(MyTestObject)) as MyTestObject;
+            Assert.IsNotNull(obj.Culture);
+            Assert.AreEqual(CultureInfo.CurrentUICulture, obj.Culture);
+        }
+
+        [Test]
+        public void StaticFieldRetrievingFactoryMethod()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("field-props-factory.xml", GetType()));
+            MyTestObject obj = factory.GetObject("withTypesField", typeof(MyTestObject)) as MyTestObject;
+            Assert.IsNotNull(obj.Types);
+            Assert.AreEqual(Type.EmptyTypes.Length, obj.Types.Length);
+        }
+
+        [Test]
+        public void InstancePropertyRetrievingFactoryMethod()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("field-props-factory.xml", GetType()));
+            MyTestObject obj = factory.GetObject("instancePropertyCultureAware", typeof(MyTestObject)) as MyTestObject;
+            Assert.IsNotNull(obj.Culture);
+            Assert.AreEqual(new MyTestObject().MyDefaultCulture, obj.Culture);
+        }
+
+        [Test]
+        public void InstanceFieldRetrievingFactoryMethod()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("field-props-factory.xml", GetType()));
+            MyTestObject obj = factory.GetObject("instanceCultureAware", typeof(MyTestObject)) as MyTestObject;
+            Assert.IsNotNull(obj.Culture);
+            Assert.AreEqual(new MyTestObject().Default, obj.Culture);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectCreationException))]
+        public void BailsOnRubbishFieldRetrievingFactoryMethod()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("field-props-factory.xml", GetType()));
+            factory.GetObject("rubbishField", typeof(MyTestObject));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectCreationException))]
+        public void BailsOnRubbishPropertyRetrievingFactoryMethod()
+        {
+            DefaultListableObjectFactory factory = new DefaultListableObjectFactory();
+            XmlObjectDefinitionReader reader = new XmlObjectDefinitionReader(factory);
+            reader.LoadObjectDefinitions(new ReadOnlyXmlTestResource("field-props-factory.xml", GetType()));
+            factory.GetObject("rubbishProperty", typeof(MyTestObject));
+        }
+
+        /// <summary>
+        /// Test creating an object using its 1 arg boolean constructor (amongst
+        /// others) by specifying the constructor arguments type and 
+        /// not its index number.
+        /// </summary>
+        [Test]
+        public void ConstructorArgWithSimpleTypeMatch()
+        {
+            XmlObjectFactory xof
+                = new XmlObjectFactory(
+                    new ReadOnlyXmlTestResource("constructor-arg.xml", GetType()));
+            SingleSimpleTypeConstructorObject obj =
+                (SingleSimpleTypeConstructorObject) xof.GetObject("objectWithBoolean");
+            Assert.IsTrue(obj.SingleBoolean);
+        }
+
+        /// <summary>
+        /// Test creating an object using its two argument constructor (amongst
+        /// others) by specifying both ctor arguments type and not their index
+        /// numbers.
+        /// </summary>
+        [Test]
+        public void ConstructorArgWithDoubleSimpleTypeMatch()
+        {
+            XmlObjectFactory xof
+                = new XmlObjectFactory(
+                    new ReadOnlyXmlTestResource("constructor-arg.xml", GetType()));
+            SingleSimpleTypeConstructorObject obj =
+                (SingleSimpleTypeConstructorObject) xof.GetObject("objectWithBooleanAndString");
+            Assert.IsTrue(obj.SecondBoolean);
+            Assert.AreEqual("A String", obj.TestString);
+        }
+
+        [Test]
+        public void DoubleBooleanAutowire()
+        {
+            XmlObjectFactory xof
+                = new XmlObjectFactory(
+                    new ReadOnlyXmlTestResource("constructor-arg.xml", GetType()));
+            DoubleBooleanConstructorObject obj =
+                (DoubleBooleanConstructorObject) xof.GetObject("objectWithDoubleBoolean");
+            Assert.IsTrue(obj.Boolean1);
+            Assert.IsFalse(obj.Boolean2);
+        }
+
+        [Test]
+        public void ParsesNamedCtorArgsCorrectly()
+        {
+            XmlObjectFactory fac = new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("constructor-arg.xml", GetType()));
+            IObjectDefinition obj = fac.GetObjectDefinition("ctorArgsAllNamed");
+            Assert.AreEqual(2, obj.ConstructorArgumentValues.NamedArgumentValues.Count,
+                            "Should have parsed 2 named ctor args.");
+            ConstructorArgumentValues.ValueHolder nameArg = obj.ConstructorArgumentValues.GetNamedArgumentValue("name");
+            Assert.IsNotNull(nameArg, "Should have parsed the 'name' ctor arg.");
+            Assert.AreEqual("Isaac Newton", nameArg.Value);
+            ConstructorArgumentValues.ValueHolder ageArg = obj.ConstructorArgumentValues.GetNamedArgumentValue("age");
+            Assert.IsNotNull(ageArg, "Should have parsed the 'age' ctor arg.");
+            Assert.AreEqual("87", ageArg.Value);
+        }
+
+        [Test]
+        public void InstantiateObjectViaNamedArgsToInnerMethodInvokingFactoryObject()
+        {
+            XmlObjectFactory fac = new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("constructor-arg.xml", GetType()));
+            ITestObject obj = (ITestObject) fac.GetObject("grabCtorArgFromMethodInvokingFactoryObject");
+            Assert.AreEqual("Mr Isaac Newton Phd PPQ MC DJ", obj.Name);
+            Assert.AreEqual(198, obj.Age);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void BailsWhenBothNameAndIndexAttributesAreAppliedToASingleCtorArg()
+        {
+            new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("bad-named-constructor-arg.xml", GetType()));
+        }
+
+        [Test]
+        public void GetObjectThatUsesCtorArgValueShortcuts()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("constructor-arg.xml", GetType()));
+            TestObject to = (TestObject) xof.GetObject("objectWithCtorArgValueShortcuts");
+            Assert.AreEqual("Rick", to.Name);
+            Assert.AreEqual(30, to.Age);
+        }
+
+        [Test]
+        public void GetObjectThatUsesCtorArgRefShortcuts()
+        {
+            XmlObjectFactory xof = new XmlObjectFactory(
+                new ReadOnlyXmlTestResource("constructor-arg.xml", GetType()));
+            TestObject to = (TestObject) xof.GetObject("objectWithCtorArgRefShortcuts");
+            ITestObject spouse = to.Spouse;
+            Assert.IsNotNull(spouse, "Dependency not wired in when using 'ref' attribute shortcut.");
+            Assert.AreEqual("Kerry2", spouse.Name);
+        }
+
+        [Test(Description="SPR-1313")]
+        public void UseStaticFactoryMethodInnerObjectDefinition()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_UseStaticFactoryMethodInnerObjectDefinition)).Run();
+        }
+
+        private void _UseStaticFactoryMethodInnerObjectDefinition(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='foo' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+        <property name='spouse'>
+            <object
+                factory-method='CreateTestObject'
+                type='Spring.Objects.Factory.Xml.TestObjectCreator, Spring.Core.Tests'/>
+        </property>
+    </object>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory factory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            factory.GetObject("foo");
+        }
+
+        [Test(Description="SPR-1313")]
+        public void UseInstanceFactoryMethodInnerObjectDefinition()
+        {
+            new StreamHelperDecorator(new StreamHelperCallback(_UseInstanceFactoryMethodInnerObjectDefinition)).Run();
+        }
+
+        private void _UseInstanceFactoryMethodInnerObjectDefinition(out Stream stream)
+        {
+            const string xml =
+                @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+	xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+	<object id='foo' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+        <property name='spouse'>
+            <object
+                factory-method='InstanceCreateTestObject' factory-object='creator'/>
+        </property>
+    </object>
+    <object id='creator' type='Spring.Objects.Factory.Xml.TestObjectCreator, Spring.Core.Tests'/>
+</objects>";
+            stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory factory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+            factory.GetObject("foo");
+        }
+
+        [Test]
+        public void TestExpressionAttribute()
+        {
+            TypeRegistry.RegisterType("WebMethod", typeof(WebMethodAttribute));
+            
+            IResource resource = new ReadOnlyXmlTestResource("expressions.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+
+            ExpressionTestObject eto = (ExpressionTestObject) xof.GetObject("to1");
+            Assert.AreEqual(new DateTime(1974, 8, 24).ToString("m"), eto.SomeString);
+            Assert.AreEqual(new DateTime(2004, 8, 14), eto.SomeDate);
+            Assert.IsInstanceOfType(typeof(IExpression), eto.ExpressionOne);
+            Assert.IsInstanceOfType(typeof(IExpression), eto.ExpressionTwo);
+            Assert.AreEqual(DateTime.Today, eto.ExpressionOne.GetValue());
+            Assert.AreEqual(String.Empty, eto.ExpressionTwo.GetValue());
+            Assert.IsInstanceOfType(typeof(WebMethodAttribute), eto.SomeDictionary["method1"]);
+            Assert.IsInstanceOfType(typeof(WebMethodAttribute), eto.SomeDictionary["method2"]);
+            Assert.AreEqual("My First Web Method", ((WebMethodAttribute) eto.SomeDictionary["method1"]).Description);
+            Assert.AreEqual("My Second Web Method", ((WebMethodAttribute) eto.SomeDictionary["method2"]).Description);
+        }
+
+        [Test]
+        public void TestExpressionElement()
+        {
+            TypeRegistry.RegisterType("WebMethod", typeof(WebMethodAttribute));
+
+            IResource resource = new ReadOnlyXmlTestResource("expressions.xml", GetType());
+            XmlObjectFactory xof = new XmlObjectFactory(resource);
+
+            ExpressionTestObject eto = (ExpressionTestObject)xof.GetObject("to2");
+            Assert.AreEqual(new DateTime(1974, 8, 24).ToString("m"), eto.SomeString);
+            Assert.AreEqual(new DateTime(2004, 8, 14), eto.SomeDate);
+            Assert.IsInstanceOfType(typeof(IExpression), eto.ExpressionOne);
+            Assert.IsInstanceOfType(typeof(IExpression), eto.ExpressionTwo);
+            Assert.AreEqual(DateTime.Today, eto.ExpressionOne.GetValue());
+            Assert.AreEqual(String.Empty, eto.ExpressionTwo.GetValue());
+            Assert.IsInstanceOfType(typeof(WebMethodAttribute), eto.SomeDictionary["method1"]);
+            Assert.IsInstanceOfType(typeof(WebMethodAttribute), eto.SomeDictionary["method2"]);
+            Assert.AreEqual("My First Web Method", ((WebMethodAttribute)eto.SomeDictionary["method1"]).Description);
+            Assert.AreEqual("My Second Web Method", ((WebMethodAttribute)eto.SomeDictionary["method2"]).Description);
+        }
+
+        #region Helper Classes
+
+        public class LazyWorker
+        {
+            private XmlObjectFactory xof;
+            private Object objectFromContext;
+            public LazyWorker(XmlObjectFactory xof)
+            {
+               this.xof = xof;        
+            }
+            public void DoWork()
+            {
+                objectFromContext = xof.GetObject("lazyObject");
+            }
+
+            public Object ObjectFromContext
+            {
+                get { return objectFromContext; }
+            }
+        }
+        public sealed class MyTestObject
+        {
+            public readonly CultureInfo Default = new CultureInfo("af-ZA");
+
+            public Type[] Types
+            {
+                get { return _types; }
+                set { _types = value; }
+            }
+
+            public CultureInfo Culture
+            {
+                get { return _culture; }
+                set { _culture = value; }
+            }
+
+            public CultureInfo MyDefaultCulture
+            {
+                get { return Default; }
+            }
+
+            private Type[] _types;
+            private CultureInfo _culture;
+        }
+
+        public class BadInitializer
+        {
+            public void Init2()
+            {
+                throw new FormatException();
+            }
+        }
+
+        public class DoubleInitializer
+        {
+            public int Num
+            {
+                get { return num; }
+                set { num = value; }
+            }
+
+            private int num;
+
+            public void Init()
+            {
+                this.num *= 2;
+            }
+        }
+
+        public class InitAndIB : IInitializingObject, IDisposable
+        {
+            public static bool constructed;
+            public bool afterPropertiesSetInvoked, initMethodInvoked, destroyed, customDestroyed;
+
+            public InitAndIB()
+            {
+                constructed = true;
+            }
+
+            public void AfterPropertiesSet()
+            {
+                if (this.initMethodInvoked)
+                {
+                    Assert.Fail();
+                }
+                this.afterPropertiesSetInvoked = true;
+            }
+
+            public void CustomInit()
+            {
+                if (!this.afterPropertiesSetInvoked)
+                {
+                    Assert.Fail();
+                }
+                this.initMethodInvoked = true;
+            }
+
+            public void Dispose()
+            {
+                if (this.customDestroyed)
+                {
+                    Assert.Fail();
+                }
+                if (this.destroyed)
+                {
+                    throw new ApplicationException("Already destroyed");
+                }
+                this.destroyed = true;
+            }
+
+            public void CustomDestroy()
+            {
+                if (!this.destroyed)
+                {
+                    Assert.Fail();
+                }
+                if (this.customDestroyed)
+                {
+                    throw new ApplicationException("Already customDestroyed");
+                }
+                this.customDestroyed = true;
+            }
+        }
+
+        public class PreparingObject1 : IDisposable
+        {
+            public static bool prepared = false;
+            public static bool destroyed = false;
+
+            public PreparingObject1()
+            {
+                prepared = true;
+            }
+
+            public void Dispose()
+            {
+                destroyed = true;
+            }
+        }
+
+        public class PreparingObject2 : IDisposable
+        {
+            public static bool prepared = false;
+            public static bool destroyed = false;
+
+            public PreparingObject2()
+            {
+                prepared = true;
+            }
+
+            public void Dispose()
+            {
+                destroyed = true;
+            }
+        }
+
+        public class DependingObject : IDisposable
+        {
+            public static bool destroyed = false;
+
+            public DependingObject()
+            {
+                if (!(PreparingObject1.prepared && PreparingObject2.prepared))
+                {
+                    throw new ApplicationException("Need prepared PreparedObjects!");
+                }
+            }
+
+            public void Dispose()
+            {
+                if (PreparingObject1.destroyed || PreparingObject2.destroyed)
+                {
+                    throw new ApplicationException("Should not be destroyed before PreparedObjects");
+                }
+                destroyed = true;
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlParserResolverTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlParserResolverTests.cs
new file mode 100644
index 00000000..bda700c3
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlParserResolverTests.cs
@@ -0,0 +1,103 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Xml;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Objects.Factory.Xml
+{
+	/// <summary>
+	/// Unit tests for the XmlParserResolver class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <author>Aleksandar Seovic  2006.11.21</author>
+	/// <version>$Id: XmlParserResolverTests.cs,v 1.10 2007/08/07 21:23:59 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class XmlParserResolverTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void RegisterParserWithNullType()
+		{
+            NamespaceParserRegistry.RegisterParser((Type) null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void RegisterParserWithBadParserType()
+		{
+            NamespaceParserRegistry.RegisterParser(GetType());
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void RegisterParserWithNullNamespaceWithoutDefaultValues()
+		{
+		    NamespaceParserRegistry.RegisterParser(typeof(NotImplementedXmlObjectDefinitionParser), null, null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+        public void RegisterParserWithEmptyNamespaceWithoutDefaultValues()
+		{
+		    NamespaceParserRegistry.RegisterParser(
+                typeof(NotImplementedXmlObjectDefinitionParser), string.Empty, null);
+		}
+
+		#region Inner Class : NotImplementedXmlObjectDefinitionParser
+
+		private sealed class NotImplementedXmlObjectDefinitionParser : INamespaceParser
+		{
+		    #region IXmlObjectDefinitionParser Members
+
+		    /// <summary>
+		    /// Invoked by <see cref="NamespaceParserRegistry"/> after construction but before any
+		    /// elements have been parsed.
+		    /// </summary>
+		    public void Init()
+		    {
+		        throw new NotImplementedException();
+		    }
+
+		    #endregion
+
+		    public IObjectDefinition ParseElement(XmlElement element, ParserContext parserContext)
+			{
+				throw new NotImplementedException();
+			}
+
+		    public ObjectDefinitionHolder Decorate(XmlNode node, ObjectDefinitionHolder definition,
+		                                           ParserContext parserContext)
+		    {
+		        throw new NotImplementedException();
+		    }
+		    
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/INestedTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/INestedTestObject.cs
new file mode 100644
index 00000000..1064516d
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/INestedTestObject.cs
@@ -0,0 +1,27 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Objects
+{
+	public interface INestedTestObject
+	{
+		string Company { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/IOther.cs b/test/Spring/Spring.Core.Tests/Objects/IOther.cs
new file mode 100644
index 00000000..803f36a8
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/IOther.cs
@@ -0,0 +1,39 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+#endregion
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Alternate nonsense interface used for testing.
+	/// </summary>
+	/// <author>Spring.Java Folks</author>
+	/// <author>Choy Rim (.NET)</author>
+	/// <version>$Id: IOther.cs,v 1.2 2006/04/09 07:24:50 markpollack Exp $</version>
+	public interface IOther
+	{
+
+		/// <summary>
+		/// Nonsense method
+		/// </summary>
+		void Absquatulate();
+
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/IPerson.cs b/test/Spring/Spring.Core.Tests/Objects/IPerson.cs
new file mode 100644
index 00000000..45b36ee2
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/IPerson.cs
@@ -0,0 +1,40 @@
+#region License
+/*
+ * Copyright 2002-2004 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
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Extends the normal test object to provide methods that are
+	/// useful when testing AOP method interception (hence the Get/Set methods).
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	public interface IPerson : ITestObject
+	{
+		int GetAge();
+		void SetAge(int age);
+		string GetName();
+		void SetName(string name);
+
+        /// <summary>
+        /// Test for non-property method matching.
+        /// If the parameter is an exception, it will be thrown rather than returned.
+        /// </summary>
+        object Echo(object obj);
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/ITestObject.cs b/test/Spring/Spring.Core.Tests/Objects/ITestObject.cs
new file mode 100644
index 00000000..e1497c0a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/ITestObject.cs
@@ -0,0 +1,84 @@
+#region License
+/*
+* Copyright 2002-2004 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.Collections;
+
+namespace Spring.Objects
+{
+    public interface ITestObject
+    {
+        event EventHandler Click;
+
+        /// <summary>
+        /// Public method to programmatically raise the <event>Click</event> event
+        /// while testing.
+        /// </summary>
+        void OnClick ();
+
+        int Age
+        {
+            get;
+			set;			
+        }
+
+        ICollection Friends
+        { 
+            get;
+        }
+
+        INestedTestObject Doctor
+        {
+            get;
+        }
+		
+        INestedTestObject Lawyer
+        {
+            get;
+        }
+
+        string Name
+        {
+            get;            
+            set;
+        }
+
+        ITestObject Spouse
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// Gets the exception method call count.
+        /// </summary>
+        /// <value>The exception method call count.</value>
+        int ExceptionMethodCallCount
+        {
+            get;
+        }
+
+        void Exceptional (Exception t);
+
+        int ExceptionalWithReturnValue(Exception t);
+		
+        object ReturnsThis ();
+        string GetDescription();
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/IndexedTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/IndexedTestObject.cs
new file mode 100644
index 00000000..5fc302ff
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/IndexedTestObject.cs
@@ -0,0 +1,87 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Collections;
+
+#endregion
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Another simple object for testing purposes, containing some collection properties.
+	/// </summary>
+	public class IndexedTestObject
+	{
+		private TestObject[] array;
+		private IList list;
+		private ISet set;
+		private IDictionary map;
+
+		public TestObject[] Array
+		{
+			get { return array; }
+			set { array = value; }
+		}
+
+		public IList List
+		{
+			get { return list; }
+			set { list = value; }
+		}
+
+		public ISet Set
+		{
+			get { return set; }
+			set { set = value; }
+		}
+
+		public IDictionary Map
+		{
+			get { return map; }
+			set { map = value; }
+		}
+
+		public IndexedTestObject()
+		{
+			TestObject to0 = new TestObject("name0", 0);
+			TestObject to1 = new TestObject("name1", 0);
+			TestObject to2 = new TestObject("name2", 0);
+			TestObject to3 = new TestObject("name3", 0);
+			TestObject to4 = new TestObject("name4", 0);
+			TestObject to5 = new TestObject("name5", 0);
+			TestObject to6 = new TestObject("name6", 0);
+			TestObject to7 = new TestObject("name7", 0);
+			array = new TestObject[] {to0, to1};
+			list = new ArrayList();
+			list.Add(to2);
+			list.Add(to3);
+			set = new HashedSet();
+			set.Add(to6);
+			set.Add(to7);
+			map = new Hashtable();
+			map["key1"] = to4;
+			map["key2"] = to5;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/LazyTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/LazyTestObject.cs
new file mode 100644
index 00000000..1acc0602
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/LazyTestObject.cs
@@ -0,0 +1,77 @@
+#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
+
+#region Imports
+
+using System;
+using System.Threading;
+
+#endregion
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Object to help test lazy instantiation of singletons from
+	/// multiple threads.  See MultiThreadedLazyInit in 
+	/// XmlObjectFactoryTests.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: LazyTestObject.cs,v 1.1 2006/04/23 19:34:38 markpollack Exp $</version>
+	public class LazyTestObject 
+	{
+		#region Fields
+
+        private static int count = 0;
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="LazyTestObject"/> class
+		/// and sleeps for 2 seconds.
+        /// </summary>
+		public LazyTestObject()
+		{
+            count++;
+		    Thread.Sleep(2000);
+		}
+
+		#endregion
+
+		#region Properties
+
+	    public static int Count
+	    {
+	        get { return count; }
+	        set { count = value; }
+	    }
+
+	    #endregion
+
+		#region Methods
+
+        public override string ToString()
+        {
+            return String.Format("LazyTestObject, Count = [{0}]", count);
+        }
+		#endregion
+
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/MutablePropertyValuesTests.cs b/test/Spring/Spring.Core.Tests/Objects/MutablePropertyValuesTests.cs
new file mode 100644
index 00000000..ac5b09cd
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/MutablePropertyValuesTests.cs
@@ -0,0 +1,198 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Unit tests for the MutablePropertyValues class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: MutablePropertyValuesTests.cs,v 1.2 2006/04/09 07:24:50 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class MutablePropertyValuesTests
+    {
+        #region SetUp
+        /// <summary>
+        /// The setup logic executed before the execution of this test fixture.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void FixtureSetUp () {}
+
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public void SetUp () {}
+        #endregion
+
+        #region TearDown
+        /// <summary>
+        /// The tear down logic executed after the execution of each individual test.
+        /// </summary>
+        [TearDown]
+        public void TearDown () {}
+
+        /// <summary>
+        /// The tear down logic executed after the entire test fixture has executed.
+        /// </summary>
+        [TestFixtureTearDown]
+        public void FixtureTearDown () {}
+        #endregion
+
+        [Test]
+        public void Instantiation () {
+            MutablePropertyValues root = new MutablePropertyValues ();
+            root.Add (new PropertyValue ("Name", "Fiona Apple"));
+            root.Add (new PropertyValue ("Age", 24));
+            MutablePropertyValues props = new MutablePropertyValues (root);
+            Assert.AreEqual (2, props.PropertyValues.Length);
+        }
+
+        [Test]
+        public void InstantiationWithNulls () 
+        {
+            MutablePropertyValues props = new MutablePropertyValues ((IDictionary) null);
+            Assert.AreEqual (0, props.PropertyValues.Length);
+            MutablePropertyValues props2 = new MutablePropertyValues ((IPropertyValues) null);
+            Assert.AreEqual (0, props2.PropertyValues.Length);
+        }
+
+        [Test]
+        public void AddAllInList () 
+        {
+            MutablePropertyValues props = new MutablePropertyValues ();
+            props.AddAll (new PropertyValue [] {
+                new PropertyValue ("Name", "Fiona Apple"),
+                new PropertyValue ("Age", 24)});
+            Assert.AreEqual (2, props.PropertyValues.Length);
+        }
+
+        [Test]
+        public void AddAllInNullList () 
+        {
+            MutablePropertyValues props = new MutablePropertyValues ();
+            props.Add (new PropertyValue ("Name", "Fiona Apple"));
+            props.Add (new PropertyValue ("Age", 24));
+            props.AddAll ((IList) null);
+            Assert.AreEqual (2, props.PropertyValues.Length);
+        }
+
+        [Test]
+        public void RemoveByName () 
+        {
+            MutablePropertyValues props = new MutablePropertyValues ();
+            props.Add (new PropertyValue ("Name", "Fiona Apple"));
+            props.Add (new PropertyValue ("Age", 24));
+            Assert.AreEqual (2, props.PropertyValues.Length);
+            props.Remove ("name");
+            Assert.AreEqual (1, props.PropertyValues.Length);
+        }
+
+        [Test]
+        public void RemoveByPropertyValue () 
+        {
+            MutablePropertyValues props = new MutablePropertyValues ();
+            PropertyValue propName = new PropertyValue ("Name", "Fiona Apple");
+            props.Add (propName);
+            props.Add (new PropertyValue ("Age", 24));
+            Assert.AreEqual (2, props.PropertyValues.Length);
+            props.Remove (propName);
+            Assert.AreEqual (1, props.PropertyValues.Length);
+        }
+
+        [Test]
+        public void Contains () 
+        {
+            MutablePropertyValues props = new MutablePropertyValues ();
+            props.Add (new PropertyValue ("Name", "Fiona Apple"));
+            props.Add (new PropertyValue ("Age", 24));
+            // must be case insensitive to be CLS compliant...
+            Assert.IsTrue (props.Contains ("nAmE"));
+        }
+
+        [Test]
+        public void AddAllInMap () 
+        {
+            MutablePropertyValues props = new MutablePropertyValues ();
+            IDictionary map = new Hashtable ();
+            map.Add ("Name", "Fiona Apple");
+            map.Add ("Age", 24);
+            props.AddAll (map);
+            Assert.AreEqual (2, props.PropertyValues.Length);
+        }
+
+        [Test]
+        public void AddAllInNullMap () 
+        {
+            MutablePropertyValues props = new MutablePropertyValues ();
+            props.Add (new PropertyValue ("Name", "Fiona Apple"));
+            props.AddAll ((IDictionary) null);
+            Assert.AreEqual (1, props.PropertyValues.Length);
+        }
+
+        [Test]
+        public void ChangesSince () 
+        {
+            IDictionary map = new Hashtable ();
+            PropertyValue propName = new PropertyValue ("Name", "Fiona Apple");
+            map.Add (propName.Name, propName.Value);
+            map.Add ("Age", 24);
+            MutablePropertyValues props = new MutablePropertyValues (map);
+            MutablePropertyValues newProps = new MutablePropertyValues (map);
+
+            // change the name... this is the change we'll be looking for
+            newProps.SetPropertyValueAt (new PropertyValue (propName.Name, "Naomi Woolf"), 0);
+            IPropertyValues changes = newProps.ChangesSince (props);
+            Assert.AreEqual (1, changes.PropertyValues.Length);
+            // the name was changed, so its the name property that should be in the changed list
+            Assert.IsTrue (changes.Contains ("name"));
+
+            newProps.Add (new PropertyValue ("Commentator", "Naomi Woolf"));
+            changes = newProps.ChangesSince (props);
+            Assert.AreEqual (2, changes.PropertyValues.Length);
+            // the Commentator was added, so its the Commentator property that should be in the changed list
+            Assert.IsTrue (changes.Contains ("commentator"));
+            // the name was changed, so its the name property that should be in the changed list
+            Assert.IsTrue (changes.Contains ("name"));
+        }
+
+        [Test]
+        public void ChangesSinceWithSelf () 
+        {
+            IDictionary map = new Hashtable ();
+            map.Add ("Name", "Fiona Apple");
+            map.Add ("Age", 24);
+            MutablePropertyValues props = new MutablePropertyValues (map);
+            props.Remove ("name");
+            // get all of the changes between self and self again (there should be none);
+            IPropertyValues changes = props.ChangesSince (props);
+            Assert.AreEqual (0, changes.PropertyValues.Length);
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/NestedTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/NestedTestObject.cs
new file mode 100644
index 00000000..f26ca597
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/NestedTestObject.cs
@@ -0,0 +1,125 @@
+#region License
+
+/*
+* Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.Globalization;
+
+#endregion
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Simple nested test object used for testing object factories, AOP framework etc.
+	/// </summary>
+	/// <author>Trevor D. Cook</author>
+	/// <author>Mark Pollack (.NET)</author>
+	public class NestedTestObject : INestedTestObject
+	{
+		internal string company = string.Empty;
+		private IDictionary _partners = new Hashtable();
+
+		public NestedTestObject()
+		{
+		}
+
+		public NestedTestObject(string comp)
+		{
+			Company = comp;
+		}
+
+		public NestedTestObject(string comp, IDictionary partners)
+		{
+			Company = comp;
+			Partners = partners;
+		}
+
+		public ITestObject this[string partnersSurname]
+		{
+			get { return Partners[partnersSurname] as ITestObject; }
+			set { Partners[partnersSurname] = value; }
+		}
+
+		public string Company
+		{
+			get { return this.company; }
+			set { this.company = value; }
+		}
+
+		/// <summary>
+		/// Maps names (string) to ITestObjects...
+		/// </summary>
+		public IDictionary Partners
+		{
+			get { return _partners; }
+			set { _partners = value; }
+		}
+	}
+
+	#region Inner Class : NestedTestObjectConverter
+
+	public class NestedTestObjectConverter : TypeConverter
+	{
+		public override bool CanConvertTo(
+			ITypeDescriptorContext context, Type destinationType)
+		{
+			if ((destinationType == typeof (NestedTestObjectConverter))
+				|| (destinationType == typeof (InstanceDescriptor)))
+			{
+				return true;
+			}
+			return base.CanConvertTo(context, destinationType);
+		}
+
+		public override bool CanConvertFrom
+			(ITypeDescriptorContext context, Type sourceType)
+		{
+			if (sourceType == typeof (string))
+			{
+				return true;
+			}
+			return base.CanConvertFrom(context, sourceType);
+		}
+
+		public override object ConvertFrom
+			(ITypeDescriptorContext context, CultureInfo culture, object text_obj)
+		{
+			if (text_obj is string)
+			{
+				string text = (string) text_obj;
+				NestedTestObject tb = new NestedTestObject(text);
+				return tb;
+			}
+			return base.ConvertFrom(context, culture, text_obj);
+		}
+
+		public override object ConvertTo(
+			ITypeDescriptorContext context, CultureInfo culture, object param, Type destinationType)
+		{
+			return base.ConvertTo(context, culture, param, destinationType);
+		}
+	}
+
+	#endregion
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/NotWritablePropertyExceptionTests.cs b/test/Spring/Spring.Core.Tests/Objects/NotWritablePropertyExceptionTests.cs
new file mode 100644
index 00000000..a65658fb
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/NotWritablePropertyExceptionTests.cs
@@ -0,0 +1,59 @@
+#region License
+
+/*
+ * Copyright 2004 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 NUnit.Framework;
+using Spring.Core;
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Unit tests for the NotWritablePropertyException class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: NotWritablePropertyExceptionTests.cs,v 1.4 2007/07/31 00:09:24 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class NotWritablePropertyExceptionTests
+	{
+		[Test]
+		public void InstantiationSupplyingPropertyTypeAndRootException()
+		{
+			NotWritablePropertyException ex = new NotWritablePropertyException("Doctor", typeof (TestObject), null);
+			Assert.AreEqual("Doctor", ex.OffendingPropertyName);
+			Assert.AreEqual(typeof(TestObject), ex.ObjectType);
+		}
+
+		[Test]
+		public void InstantiationSupplyingNullPropertyTypeAndRootException()
+		{
+			NotWritablePropertyException ex = new NotWritablePropertyException(null, typeof (TestObject), null);
+			Assert.AreEqual(null, ex.OffendingPropertyName);
+			Assert.AreEqual(typeof(TestObject), ex.ObjectType);
+		}
+
+		[Test]
+		public void InstantiationSupplyingNullPropertyNullTypeAndRootException()
+		{
+			NotWritablePropertyException ex = new NotWritablePropertyException(null, null, null);
+			Assert.AreEqual(null, ex.OffendingPropertyName);
+			Assert.AreEqual(null, ex.ObjectType);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/NumberTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/NumberTestObject.cs
new file mode 100644
index 00000000..66e76965
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/NumberTestObject.cs
@@ -0,0 +1,68 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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;
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	/// <author>Juergen Hoeller</author>
+	public sealed class NumberTestObject
+	{
+		private short _myShort;
+		private int _myInt;
+		private long _myLong;
+
+		public short MyShort
+		{
+			get { return _myShort; }
+			set { _myShort = value; }
+		}
+
+		public int MyInt
+		{
+			get { return _myInt; }
+			set { _myInt = value; }
+		}
+
+		public long MyLong
+		{
+			get { return _myLong; }
+			set { _myLong = value; }
+		}
+
+		public float MyFloat
+		{
+			get { return _myFloat; }
+			set { _myFloat = value; }
+		}
+
+		public double MyDouble
+		{
+			get { return _myDouble; }
+			set { _myDouble = value; }
+		}
+
+		private float _myFloat;
+		private double _myDouble;
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs b/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs
new file mode 100644
index 00000000..ccc0f7c8
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs
@@ -0,0 +1,1655 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+#if NET_2_0
+using System.Collections.Generic;
+#endif
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+using Common.Logging;
+using Common.Logging.Simple;
+using NUnit.Framework;
+using Spring.Collections;
+using Spring.Core;
+using Spring.Core.TypeConversion;
+using Spring.Objects.Factory;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Unit tests for the ObjectWrapper class.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <author>Rick Evans (.NET)</author>
+	/// <version>$Id: ObjectWrapperTests.cs,v 1.14 2007/07/31 18:19:58 bbaia Exp $</version>
+	[TestFixture]
+	public sealed class ObjectWrapperTests
+	{
+		/// <summary>
+		/// The setup logic executed before the execution of this test fixture.
+		/// </summary>
+		[TestFixtureSetUp]
+		public void FixtureSetUp()
+		{
+			// enable logging (to nowhere), just to exercisee the logging code...
+            LogManager.Adapter = new NoOpLoggerFactoryAdapter();
+		}
+
+		#region Classes Used During Tests
+        public class Person
+        {
+            private IList favoriteNames = new ArrayList();
+            private IDictionary properties = new Hashtable();
+            private string sillyString;
+            
+            public Person()
+            {
+                favoriteNames.Add("p1");
+                favoriteNames.Add("p2");
+            }
+            public Person(IList favNums)
+            {
+                favoriteNames = favNums;
+            }
+
+            public string SillyString
+            {
+                get { return sillyString;  }
+            }
+            public IList FavoriteNames
+            {
+                get { return favoriteNames; }
+            }
+            
+            public IDictionary Properties
+            {
+                get { return properties;  }
+            }
+            public string this[int index]
+            {
+                get { return (string)favoriteNames[index]; }
+                set { favoriteNames[index] = value; }
+            }
+            public string this[string keyName]
+            {
+                get { return (string) properties[keyName]; }
+                set { properties.Add(keyName,value); }
+            }
+            public string this[int index, string keyname]
+            {
+                get { return sillyString;  }
+                set { sillyString = index + "-" + keyname + ",val=" + value;}
+            }
+
+        }
+
+#if NET_2_0	    
+	    public class GenericPerson
+        {
+            private List<string> favoriteNames = new List<string>();
+            private IDictionary<string, string> properties = new Dictionary<string, string>();
+       	       
+
+            public GenericPerson()
+            {
+                favoriteNames.Add("p1");
+                favoriteNames.Add("p2");
+            }
+            public GenericPerson(List<string> favNums)
+            {
+                favoriteNames = favNums;
+            }
+
+	        /*
+            public string this[int index]
+            {
+                get { return (string)favoriteNames[index]; }
+                set { favoriteNames[index] = value; }
+            }
+             */
+            public string this[string keyName]
+            {
+                get { return properties[keyName]; }
+                set { properties.Add(keyName, value); }
+            }
+
+        }
+#endif
+	    
+        public class AltPerson
+        {
+            private IList favoriteNames = new ArrayList();
+            public AltPerson()
+            {
+                favoriteNames.Add("ap1");
+                favoriteNames.Add("ap2");
+            }
+            
+            public AltPerson(IList favNums)
+            {
+                favoriteNames = favNums;
+            }
+
+            [IndexerName("FavoriteName")]
+            public string this[int index]
+            {
+                get { return (string)favoriteNames[index]; }
+                set { favoriteNames[index] = value; }
+                
+            }
+
+        }
+		public class NoNullsList : ArrayList
+		{
+			public override int Add(object value)
+			{
+				if (value == null)
+				{
+					throw new NullReferenceException("Adding nulls is not supported in this implementation.");
+				}
+				return base.Add(value);
+			}
+		}
+
+	    
+	    
+		private class Honey
+		{
+			public Honey(IList akas)
+			{
+				_akas = new Aliases(akas);
+			}
+
+			protected Aliases _akas;
+
+			public Aliases AlsoKnownAs
+			{
+				get { return _akas; }
+			}
+
+			public string this[int index]
+			{
+				get { return AlsoKnownAs[index]; }
+			}
+		}
+
+		private class NonReadableHoney : Honey
+		{
+			public NonReadableHoney(IList akas) : base(akas)
+			{
+			}
+
+			new public Aliases AlsoKnownAs
+			{
+				set { _akas = value; }
+			}
+		}
+
+		private class Milk
+		{
+			public Milk(Honey[] honeys)
+			{
+			}
+
+			public Honey[] Honeys
+			{
+				set
+				{
+				}
+			}
+		}
+
+		private sealed class Aliases
+		{
+			private IList _names;
+
+			public Aliases() : this(new ArrayList())
+			{
+			}
+
+			public Aliases(IList names)
+			{
+				_names = names;
+			}
+
+			public string this[int index]
+			{
+				get { return (string) _names[index]; }
+				set { _names[index] = value; }
+			}
+		}
+
+		private sealed class RealNestedTestObject
+		{
+			public TestObject Datum
+			{
+				get { return _datum; }
+				set { _datum = value; }
+			}
+
+			private TestObject _datum;
+		}
+
+		private sealed class WanPropsClass
+		{
+			public bool IsWan
+			{
+				get { return true; }
+			}
+		}
+
+		private sealed class StringAppenderConverter : TypeConverter
+		{
+			public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+			{
+				if (sourceType == typeof (string))
+				{
+					return true;
+				}
+				return base.CanConvertFrom(context, sourceType);
+			}
+
+			public override object ConvertFrom(
+				ITypeDescriptorContext context, CultureInfo culture, object val)
+			{
+				if (val is string)
+				{
+					return "OctopusOil : " + val;
+				}
+				return base.ConvertFrom(context, culture, val);
+			}
+		}
+
+		private sealed class TestStringArrayConverter : TypeConverter
+		{
+			public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+			{
+				if (sourceType == typeof (string[]))
+				{
+					return true;
+				}
+				return base.CanConvertFrom(context, sourceType);
+			}
+
+			public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object val)
+			{
+				if (val is string[])
+				{
+					return "-" + StringUtils.CollectionToCommaDelimitedString(val as string[]) + "-";
+				}
+				return base.ConvertFrom(context, culture, val);
+			}
+		}
+
+		private sealed class TestObjectArrayConverter : TypeConverter
+		{
+			public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+			{
+				if (sourceType == typeof (string))
+				{
+					return true;
+				}
+				return base.CanConvertFrom(context, sourceType);
+			}
+
+			public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object val)
+
+			{
+				if (val is string)
+				{
+					return new TestObject((string) val, 99);
+				}
+				return base.ConvertFrom(context, culture, val);
+			}
+		}
+
+		private sealed class ObjectWithTypeProperty
+		{
+			private Type _type;
+
+			public Type Type
+			{
+				get { return _type; }
+				set { _type = value; }
+			}
+		}
+
+		/// <summary>
+		/// A class for use in testing the object wrapper with read only properties.
+		/// </summary>
+		private sealed class NoRead
+		{
+			public int Age
+			{
+				set
+				{
+				}
+			}
+		}
+
+		private sealed class GetterObject
+		{
+			public string Name
+			{
+				get
+				{
+					if (_name == null)
+					{
+						throw new ApplicationException("name property must be set");
+					}
+					return _name;
+				}
+				set { _name = value; }
+			}
+
+			private string _name;
+		}
+
+		private sealed class ThrowsException
+		{
+			public void DoSomething(Exception t)
+			{
+				throw t;
+			}
+		}
+
+		internal sealed class PrimitiveArrayObject
+		{
+			public int[] Array
+			{
+				get { return array; }
+				set { this.array = value; }
+			}
+
+			private int[] array;
+		}
+
+		private sealed class PropsTest
+		{
+			public NameValueCollection Properties
+			{
+				set
+				{
+				}
+			}
+
+			public String Name
+			{
+				set
+				{
+				}
+			}
+
+			public String[] StringArray
+			{
+				set { this.stringArray = value; }
+			}
+
+			public int[] IntArray
+			{
+				set { this.intArray = value; }
+			}
+
+			public String[] stringArray;
+			public int[] intArray;
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Factory method for getting an ObjectWrapper instance.
+		/// </summary>
+		/// <returns>A new object wrapper (with no WrappedObject).</returns>
+		private ObjectWrapper GetWrapper()
+		{
+			return new ObjectWrapper();
+		}
+
+		/// <summary>
+		/// Factory method for getting an ObjectWrapper instance.
+		/// </summary>
+		/// <param name="objectToBeWrapped">
+		/// The object that is to be wrapped by the returned object wrapper.
+		/// </param>
+		/// <returns>
+		/// A new object wrapper that wraps the supplied <paramref name="objectToBeWrapped"/>.
+		/// </returns>
+		private ObjectWrapper GetWrapper(object objectToBeWrapped)
+		{
+			return new ObjectWrapper(objectToBeWrapped);
+		}
+
+		#endregion
+
+		[Test]
+		[ExpectedException(typeof (TypeMismatchException))]
+		public void SetPropertyUsingValueThatNeedsConversionWithNoCustomConverterRegistered()
+		{
+			ObjectWrapper wrapper = GetWrapper(new TestObject("Rick", 30));
+			// needs conversion to NestedTestObject...
+			wrapper.SetPropertyValue("doctor", "Pollack, Pinch, & Pounce");
+		}
+
+		[Test]
+		[Ignore()]
+		public void GetValueOfCustomIndexerProperty()
+		{
+			ObjectWrapper wrapper = GetWrapper();
+			Honey darwin = new Honey(new string[] {"dickens", "of gaunt"});
+			wrapper.WrappedInstance = darwin;
+			string alias = (string) wrapper.GetPropertyValue("AlsoKnownAs[1]");
+			Assert.AreEqual("of gaunt", alias);
+
+            alias = (string) wrapper.GetPropertyValue("[1]");
+		    Assert.AreEqual("of gaunt", alias, "indexer on object not working.");
+		    wrapper.SetPropertyValue("Item[1]", "of foobar");
+            alias = (string)wrapper.GetPropertyValue("[1]");
+            Assert.AreEqual("of foobar", alias, "indexer on object not working.");
+		    
+		}
+
+        [Test]
+        [Ignore()]
+        public void GetSetIndexerProperties()
+        {
+            IList favNames = new ArrayList();
+            favNames.Add("Master Shake");
+            favNames.Add("Meatwad");
+            favNames.Add("Frylock");
+            Person p = new Person(favNames);
+            ObjectWrapper wrapper = GetWrapper();
+            wrapper.WrappedInstance = p;
+
+            //This is 'new' Spring.Expressions notation, i.e. not "Item[i]" but plain [i].
+            string name = (string)wrapper.GetPropertyValue("[0]");
+            Assert.AreEqual("Master Shake", name);
+            wrapper.SetPropertyValue("[0]", "Carl");
+            name = (string)wrapper.GetPropertyValue("[0]");
+            Assert.AreEqual("Carl", name);
+
+            //Try with Custom Indexer Name.
+            favNames = new ArrayList();
+            favNames.Add("Master Shake");
+            favNames.Add("Meatwad");
+            favNames.Add("Frylock");
+            AltPerson ap = new AltPerson(favNames);
+            wrapper = GetWrapper();
+            wrapper.WrappedInstance = ap;
+
+            name = (string)wrapper.GetPropertyValue("FavoriteName[0]");
+            Assert.AreEqual("Master Shake", name);
+
+        }
+
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void GetValueOfCustomIndexerPropertyWithMalformedIndexer()
+		{
+			ObjectWrapper wrapper = GetWrapper();
+			Honey darwin = new Honey(new string[] {"dickens", "of gaunt"});
+			wrapper.WrappedInstance = darwin;
+			wrapper.GetPropertyValue("AlsoKnownAs[1");
+		}
+
+		[Test]
+		[ExpectedException(typeof (FatalObjectException))]
+		public void GetPropertyTypeWithNullPropertyPath()
+		{
+			GetWrapper().GetPropertyType(null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (FatalObjectException))]
+		public void GetPropertyTypeWithEmptyPropertyPath()
+		{
+			GetWrapper().GetPropertyType(string.Empty);
+		}
+
+		[Test]
+		[ExpectedException(typeof (FatalObjectException))]
+		public void GetPropertyTypeWithWhitespacedPropertyPath()
+		{
+			GetWrapper().GetPropertyType("      ");
+		}
+
+		[Test]
+		public void GetPropertyType()
+		{
+			ObjectWrapper wrapper = GetWrapper(new TestObject());
+			Type propertyType = wrapper.GetPropertyType("name");
+			Assert.AreEqual(typeof (string), propertyType);
+		}
+
+		[Test]
+		public void GetPropertyTypeFromField_SPRNET502()
+		{
+			ObjectWrapper wrapper = GetWrapper(new TestObject());
+			Type propertyType = wrapper.GetPropertyType("FileModeEnum");
+			Assert.AreEqual(typeof (FileMode), propertyType);
+		}
+
+		[Test]
+		public void GetPropertyTypeWithNestedLookup()
+		{
+			TestObject target = new TestObject();
+			target.Spouse = new TestObject("Fiona", 28);
+			ObjectWrapper wrapper = GetWrapper(target);
+			Type propertyType = wrapper.GetPropertyType("spouse.age");
+			Assert.AreEqual(typeof (int), propertyType);
+		}
+
+		[Test]
+		[ExpectedException(typeof (NotWritablePropertyException))]
+		public void SetValueOfCustomIndexerPropertyWithNonReadablePropertyInIndexedPath()
+		{
+			ObjectWrapper wrapper = GetWrapper();
+			Honey[] honeys = new NonReadableHoney[] {new NonReadableHoney(new string[] {"hsu", "feng"})};
+			wrapper.WrappedInstance = new Milk(honeys);
+			wrapper.SetPropertyValue("Honeys[0][0]", "mei");
+		}
+
+		[Test]
+		[ExpectedException(typeof (TypeMismatchException))]
+		public void SetPropertyThatRequiresTypeConversionWithNonConvertibleType()
+		{
+			ObjectWrapper wrapper = GetWrapper();
+			TestObject to = new TestObject();
+			wrapper.WrappedInstance = to;
+			wrapper.SetPropertyValue("RealLawyer", "Noob");
+			Console.Out.WriteLine(to.RealLawyer);
+		}
+
+		/// <summary>
+		/// This test blows up because index is out of range.
+		/// </summary>
+		[Test]
+        [ExpectedException(typeof(InvalidPropertyException))]
+		public void SetIndexedPropertyOnListThatsOutOfRange()
+		{
+			TestObject to = new TestObject();
+			ObjectWrapper wrapper = GetWrapper(to);
+			to.Friends = new NoNullsList();
+			wrapper.SetPropertyValue("Friends[5]", "Inheritance Tax");
+		}
+
+		/// <summary>
+		/// Tests that a property lookup such as <c>foo[0][1]['ben'][12]</c> is ok
+		/// Well, rather it tests that its valid... 'cos man, that shoh ain't ok :D
+		/// </summary>
+		[Test]
+		public void GetChainedIndexers()
+		{
+			Honey to = new Honey(new string[] {"wee", "jakey", "ned"});
+			ObjectWrapper wrapper = GetWrapper(to);
+			Assert.AreEqual('j', wrapper.GetPropertyValue("AlsoKnownAs[1][0]"));
+		}
+
+		/// <summary>
+		/// Test that passing a null value of the object to manipulate with the ObjectWrapper
+		/// will throw a FatalPropertyException with the correct exception message.
+		/// </summary>
+		[Test]
+		[ExpectedException(typeof (FatalObjectException))]
+		public void NullObject()
+		{
+			new ObjectWrapper((object) null);
+		}
+
+		[Test]
+		[ExpectedException(typeof (FatalObjectException))]
+		public void InstantiateWithInterfaceType()
+		{
+			new ObjectWrapper(typeof (IList));
+		}
+
+		[Test]
+		[ExpectedException(typeof (FatalObjectException))]
+		public void InstantiateWithAbstractType()
+		{
+			new ObjectWrapper(typeof (AbstractObjectFactoryTests));
+		}
+
+		[Test]
+		public void InstantiateWithOkType()
+		{
+			IObjectWrapper wrapper = GetWrapper(typeof (TestObject));
+			Assert.IsNotNull(wrapper.WrappedInstance);
+		}
+
+		[Test]
+		public void NestedProperties()
+		{
+			string doctorCompany = "";
+			string lawyerCompany = "Dr. Sueem";
+			TestObject to = new TestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			wrapper.SetPropertyValue("Doctor.Company", doctorCompany);
+			wrapper.SetPropertyValue("Lawyer.Company", lawyerCompany);
+			Assert.AreEqual(doctorCompany, to.Doctor.Company);
+			Assert.AreEqual(lawyerCompany, to.Lawyer.Company);
+		}
+
+		[Test]
+		public void GetterThrowsException()
+		{
+			GetterObject go = new GetterObject();
+			IObjectWrapper wrapper = GetWrapper(go);
+			wrapper.SetPropertyValue("Name", "tom");
+			Assert.IsTrue(go.Name.Equals("tom"), "Expected name to be set to 'tom'");
+		}
+
+		[Test]
+		[ExpectedException(typeof (NotReadablePropertyException))]
+		public void TryToReadTheValueOfAWriteOnlyProperty()
+		{
+			NoRead nr = new NoRead();
+			ObjectWrapper wrapper = GetWrapper(nr);
+			wrapper.GetPropertyValue("Age");
+		}
+
+		[Test]
+        [ExpectedException(typeof(NullValueInNestedPathException))]
+		public void TryToReadAnIndexedValueFromANullProperty()
+		{
+			TestObject o = new TestObject();
+			o.Friends = null;
+			ObjectWrapper wrapper = GetWrapper(o);
+			wrapper.GetPropertyValue("Friends[2]");
+		}
+
+		/// <summary>
+		/// Test that applying an empty MutablePropertyValues does not modify the object contents.
+		/// </summary>
+		[Test]
+		public void EmptyPropertyValuesSet()
+		{
+			TestObject t = new TestObject();
+			int age = 50;
+			string name = "Tony";
+			t.Age = age;
+			t.Name = name;
+			IObjectWrapper wrapper = GetWrapper(t);
+			Assert.IsTrue(t.Age.Equals(age), "Age is not set correctly");
+			Assert.IsTrue(name.Equals(t.Name), "Name is not set correctly");
+			wrapper.SetPropertyValues(new MutablePropertyValues());
+			Assert.IsTrue(t.Age.Equals(age), "Age is not set correctly");
+			Assert.IsTrue(name.Equals(t.Name), "Name is not set correctly");
+		}
+
+		/// <summary>
+		/// Test basic ObjectWrapper functionality by setting properties using MutablePropertyValues.
+		/// </summary>
+		[Test]
+		public void AllValid()
+		{
+			TestObject t = new TestObject();
+			string newName = "tony";
+			int newAge = 65;
+			string newTouchy = "valid";
+			IObjectWrapper wrapper = GetWrapper(t);
+			MutablePropertyValues pvs = new MutablePropertyValues();
+			pvs.Add(new PropertyValue("Age", newAge));
+			pvs.Add(new PropertyValue("Name", newName));
+			pvs.Add(new PropertyValue("Touchy", newTouchy));
+			wrapper.SetPropertyValues(pvs);
+			Assert.IsTrue(t.Name.Equals(newName), "Validly set property must stick");
+			Assert.IsTrue(t.Touchy.Equals(newTouchy), "Validly set property must stick");
+			Assert.IsTrue(t.Age == newAge, "Validly set property must stick");
+		}
+
+		[Test]
+		public void IndividualAllValid()
+		{
+			TestObject t = new TestObject();
+			String newName = "tony";
+			int newAge = 65;
+			string newTouchy = "valid";
+			IObjectWrapper wrapper = GetWrapper(t);
+			wrapper.SetPropertyValue("Age", newAge);
+			wrapper.SetPropertyValue(new PropertyValue("Name", newName));
+			wrapper.SetPropertyValue(new PropertyValue("Touchy", newTouchy));
+			Assert.IsTrue(t.Name.Equals(newName), "Validly set property must stick");
+			Assert.IsTrue(t.Touchy.Equals(newTouchy), "Validly set property must stick");
+			Assert.IsTrue(t.Age == newAge, "Validly set property must stick");
+		}
+
+		[Test]
+		public void SettingAnInvalidValue()
+		{
+			TestObject t = new TestObject();
+			string newName = "tony";
+			try
+			{
+				IObjectWrapper wrapper = GetWrapper(t);
+				MutablePropertyValues pvs = new MutablePropertyValues();
+				pvs.Add(new PropertyValue("Age", "foobar"));
+				pvs.Add(new PropertyValue("Name", newName));
+				wrapper.SetPropertyValues(pvs);
+				Assert.Fail("Should throw exception when setting an invalid value");
+			}
+			catch (PropertyAccessExceptionsException ex)
+			{
+				Assert.IsTrue(ex.ExceptionCount == 1, "Must contain 2 exceptions");
+				// Test validly set property matches
+				Assert.IsTrue(t.Name.Equals(newName), "Validly set property must stick");
+				Assert.IsTrue(t.Age == 0, "Invalidly set property must retain old value");
+			}
+			catch (Exception ex)
+			{
+				Assert.Fail(
+					"Shouldn't throw exception other than PropertyAccessExceptions.  Exception Message = " + ex.Message);
+			}
+		}
+
+		[Test]
+		public void ArrayToStringConversion()
+		{
+			TestObject t = new TestObject();
+			IObjectWrapper wrapper = GetWrapper(t);
+			TypeConverterRegistry.RegisterConverter(typeof(string), new TestStringArrayConverter());
+			wrapper.SetPropertyValue("Name", new string[] {"a", "b"});
+			Assert.AreEqual("-a,b-", t.Name);
+		}
+
+		[Test]
+		public void ArrayToArrayConversion()
+		{
+			IndexedTestObject to = new IndexedTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+            TypeConverterRegistry.RegisterConverter(typeof(TestObject), new TestObjectArrayConverter());
+			wrapper.SetPropertyValue("Array", new string[] {"a", "b"});
+			Assert.AreEqual("a", to.Array[0].Name);
+			Assert.AreEqual("b", to.Array[1].Name);
+		}
+
+		[Test]
+		public void PrimitiveArray()
+		{
+			PrimitiveArrayObject to = new PrimitiveArrayObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			wrapper.SetPropertyValue("Array", new String[] {"1", "2"});
+			Assert.AreEqual(2, to.Array.Length);
+			Assert.AreEqual(1, to.Array[0]);
+			Assert.AreEqual(2, to.Array[1]);
+		}
+
+		[Test]
+		public void PrimitiveArrayFromCommaDelimitedString()
+		{
+			PrimitiveArrayObject to = new PrimitiveArrayObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			wrapper.SetPropertyValue("Array", "1,2");
+			Assert.AreEqual(2, to.Array.Length);
+			Assert.AreEqual(1, to.Array[0]);
+			Assert.AreEqual(2, to.Array[1]);
+		}
+
+		[Test]
+		public void ObjectWrapperUpdates()
+		{
+			TestObject to = new TestObject("Rick", 2);
+			int newAge = 33;
+			ObjectWrapper wrapper = GetWrapper(to);
+			to.Age = newAge;
+			object owAge = wrapper.GetPropertyValue("Age");
+			Assert.IsTrue(owAge is Int32, "Age is an integer");
+			int owi = (int) owAge;
+			Assert.IsTrue(owi == newAge, "Object wrapper must pick up changes");
+		}
+
+		[Test]
+		public void SetWrappedInstanceOfSameClass()
+		{
+			TestObject to = new TestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.Age = 11;
+
+			TestObject to2 = new TestObject();
+			wrapper.WrappedInstance = to2;
+
+			wrapper.SetPropertyValue("Age", 14);
+			Assert.IsTrue(to2.Age == 14, "2nd changed");
+			Assert.IsTrue(to.Age == 11, "1st didn't change");
+		}
+
+		[Test]
+		public void SetWrappedInstanceOfDifferentClass()
+		{
+			ThrowsException tex = new ThrowsException();
+			ObjectWrapper wrapper = GetWrapper(tex);
+			TestObject to2 = new TestObject();
+			wrapper.WrappedInstance = to2;
+
+			wrapper.SetPropertyValue("Age", 14);
+			Assert.IsTrue(to2.Age == 14);
+		}
+
+		[Test]
+		[ExpectedException(typeof (TypeMismatchException))]
+		public void TypeMismatch()
+		{
+			TestObject to = new TestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			wrapper.SetPropertyValue("Age", "foobar");
+		}
+
+		[Test]
+		[ExpectedException(typeof (TypeMismatchException))]
+		public void EmptyValueForPrimitiveProperty()
+		{
+			TestObject to = new TestObject();
+			ObjectWrapper wrapper = GetWrapper(to);
+			wrapper.SetPropertyValue("Age", "");
+		}
+
+		[Test]
+		public void GetProtectedPropertyValue()
+		{
+			TestObject foo = new TestObject();
+			IObjectWrapper wrapper = GetWrapper(foo);
+			string happyPlace = (string) wrapper.GetPropertyValue("HappyPlace");
+			Assert.AreEqual(TestObject.DefaultHappyPlace, happyPlace,
+			                "Failed to read the value of a property with 'protected' access.");
+		}
+
+		[Test]
+		public void SetProtectedPropertyValue()
+		{
+			TestObject foo = new TestObject();
+			IObjectWrapper wrapper = GetWrapper(foo);
+			const string expectedHappyPlace = "The Rockies! Brrr...";
+			wrapper.SetPropertyValue(new PropertyValue("HappyPlace", expectedHappyPlace));
+			string happyPlace = (string) wrapper.GetPropertyValue("HappyPlace");
+			Assert.AreEqual(expectedHappyPlace, happyPlace,
+			                "Failed to read / write the value of a property with 'protected' access.");
+		}
+
+		[Test]
+		public void GetPrivatePropertyValue()
+		{
+			TestObject foo = new TestObject();
+			IObjectWrapper wrapper = GetWrapper(foo);
+			string[] contents = (string[]) wrapper.GetPropertyValue("SamsoniteSuitcase");
+			Assert.IsTrue(ArrayUtils.AreEqual(TestObject.DefaultContentsOfTheSuitcase, contents),
+			              "Failed to read the value of a property with 'private' access.");
+		}
+
+		[Test]
+		public void SetPrivatePropertyValue()
+		{
+			TestObject foo = new TestObject();
+			IObjectWrapper wrapper = GetWrapper(foo);
+			string[] expectedContents = new string[] {"Lloyd's Soul", "Harry's John Denver Records"};
+			wrapper.SetPropertyValue(new PropertyValue("SamsoniteSuitcase", expectedContents));
+			string[] contents = (string[]) wrapper.GetPropertyValue("SamsoniteSuitcase");
+			Assert.IsTrue(ArrayUtils.AreEqual(expectedContents, contents),
+			              "Failed to read / write the value of a property with 'private' access.");
+		}
+
+		[Test]
+		public void GetNestedProperty()
+		{
+			ITestObject rod = new TestObject("rod", 31);
+			ITestObject kerry = new TestObject("kerry", 35);
+			rod.Spouse = kerry;
+			kerry.Spouse = rod;
+			IObjectWrapper wrapper = GetWrapper(rod);
+			int KA = (int) wrapper.GetPropertyValue("Spouse.Age");
+			Assert.IsTrue(KA == 35, "Expected kerry's age to be 35");
+
+			int RA = (int) wrapper.GetPropertyValue("Spouse.Spouse.Age");
+			Assert.IsTrue(RA == 31, "Expected rod's age to be 31");
+
+			ITestObject spousesSpouse = (ITestObject) wrapper.GetPropertyValue("Spouse.Spouse");
+			Assert.IsTrue(rod == spousesSpouse, "spousesSpouse == initial point");
+		}
+
+		[Test]
+		[ExpectedException(typeof (NullValueInNestedPathException))]
+		public void GetNestedPropertyValueNullValue()
+		{
+			TestObject rod = new TestObject("rod", 31);
+			rod.Doctor = new NestedTestObject(null);
+			GetWrapper(rod).GetPropertyValue("Doctor.Company.Length");
+		}
+
+		[Test]
+		public void SetNestedProperty()
+		{
+			ITestObject rod = new TestObject("rod", 31);
+			ITestObject kerry = new TestObject("kerry", 0);
+			IObjectWrapper wrapper = GetWrapper(rod);
+			wrapper.SetPropertyValue("Spouse", kerry);
+
+			Assert.AreEqual(rod.Spouse, kerry, "nested set did not work");
+			wrapper.SetPropertyValue("Spouse.Spouse", rod);
+			Assert.AreEqual(rod, rod.Spouse.Spouse, "Nested set did not work.");
+			wrapper.SetPropertyValue("Spouse.Age", 100);
+			Assert.AreEqual(100, kerry.Age, "Nested setting of primitive property did not work.");
+		}
+
+		[Test]
+		public void SetPropertyValue()
+		{
+			ITestObject bigby = new TestObject("Bigby", 4500);
+			ITestObject snow = new TestObject("Snow", 2500);
+			IObjectWrapper wrapper = GetWrapper(bigby);
+			wrapper.SetPropertyValue("Spouse", snow);
+			Assert.AreEqual(snow, bigby.Spouse);
+		}
+
+		[Test]
+		[ExpectedException(typeof (NullValueInNestedPathException))]
+		public void SetIndexedPropertyValueOnUninitializedPath()
+		{
+			TestObject obj = new TestObject("Bill", 4500);
+			IObjectWrapper wrapper = GetWrapper(obj);
+			wrapper.SetPropertyValue("hats [0]", "Hicks & Co");
+		}
+
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void SetIndexedPropertyValueOnNonIndexableType()
+		{
+			TestObject obj = new TestObject("Bill", 4500);
+			IObjectWrapper wrapper = GetWrapper(obj);
+			wrapper.SetPropertyValue("doctor [0]", "Hicks & Co");
+		}
+
+		[Test]
+		[ExpectedException(typeof (TypeMismatchException))]
+		public void SetPrimitivePropertyToNullReference()
+		{
+			TestObject obj = new TestObject("Bill", 4500);
+			IObjectWrapper wrapper = GetWrapper(obj);
+			wrapper.SetPropertyValue("Age", null);
+		}
+
+		[Test]
+		public void SetPropertyValueIgnoresCase()
+		{
+			ITestObject bigby = new TestObject("Bigby", 4500);
+			ITestObject snow = new TestObject("Snow", 2500);
+			IObjectWrapper wrapper = GetWrapper(bigby);
+			wrapper.SetPropertyValue("spouse", snow);
+			Assert.AreEqual(snow, bigby.Spouse,
+			                "Property setting is not case insensitive with regard to the property name (and for CLS compliance it should be).");
+		}
+
+		[Test]
+		public void IntArrayProperty()
+		{
+			PropsTest pt = new PropsTest();
+			IObjectWrapper wrapper = GetWrapper(pt);
+			wrapper.SetPropertyValue("IntArray", new int[] {4, 5, 2, 3});
+			Assert.IsTrue(pt.intArray.Length == 4, "intArray length = 4");
+			Assert.IsTrue(pt.intArray[0] == 4 && pt.intArray[1] == 5 && pt.intArray[2] == 2 && pt.intArray[3] == 3,
+			              "correct values");
+			wrapper.SetPropertyValue("IntArray", new String[] {"4", "5", "2", "3"});
+			Assert.IsTrue(pt.intArray.Length == 4, "intArray length = 4");
+			Assert.IsTrue(pt.intArray[0] == 4 && pt.intArray[1] == 5 && pt.intArray[2] == 2 && pt.intArray[3] == 3,
+			              "correct values");
+			wrapper.SetPropertyValue("IntArray", 1);
+			Assert.IsTrue(pt.intArray.Length == 1, "intArray length = 1");
+			Assert.IsTrue(pt.intArray[0] == 1, "correct values");
+			wrapper.SetPropertyValue("IntArray", new String[] {"1"});
+			Assert.IsTrue(pt.intArray.Length == 1, "intArray length = 1");
+			Assert.IsTrue(pt.intArray[0] == 1, "correct values");
+		}
+
+		[Test]
+		public void NewWrappedInstancePropertyValuesGet()
+		{
+			ObjectWrapper wrapper = GetWrapper();
+			TestObject t = new TestObject("Tony", 50);
+			wrapper.WrappedInstance = t;
+			Assert.AreEqual(t.Age, wrapper.GetPropertyValue("Age"), "Object wrapper returns wrong property value");
+
+			TestObject u = new TestObject("Udo", 30);
+			wrapper.WrappedInstance = u;
+			Assert.AreEqual(u.Age, wrapper.GetPropertyValue("Age"), "Object wrapper returns cached property value");
+		}
+
+		[Test]
+		public void NewWrappedInstanceNestedPropertyValuesGet()
+		{
+			IObjectWrapper wrapper = GetWrapper();
+			TestObject t = new TestObject("Tony", 50);
+			t.Spouse = new TestObject("Sue", 40);
+			wrapper.WrappedInstance = t;
+			Assert.AreEqual(t.Spouse.Age, wrapper.GetPropertyValue("Spouse.Age"),
+			                "Object wrapper returns wrong nested property value");
+
+			TestObject u = new TestObject("Udo", 30);
+			u.Spouse = new TestObject("Vera", 20);
+			wrapper.WrappedInstance = u;
+			Assert.AreEqual(u.Spouse.Age, wrapper.GetPropertyValue("Spouse.Age"),
+			                "Object wrapper returns cached nested property value");
+		}
+
+		[Test]
+		public void StringArrayProperty()
+		{
+			PropsTest pt = new PropsTest();
+			ObjectWrapper wrapper = GetWrapper(pt);
+
+			wrapper.SetPropertyValue("StringArray", "foo,fi,fi,fum");
+			Assert.IsTrue(pt.stringArray.Length == 4, "StringArray length = 4");
+			Assert.IsTrue(
+				pt.stringArray[0].Equals("foo") && pt.stringArray[1].Equals("fi") && pt.stringArray[2].Equals("fi") &&
+					pt.stringArray[3].Equals("fum"), "in correct values of string array");
+		}
+
+		#region Test for DateTime Properties
+
+		internal class DateTimeTestObject
+		{
+			private DateTime _dt;
+
+			public DateTime TriggerDateTime
+			{
+				get { return _dt; }
+				set { _dt = value; }
+			}
+		}
+
+		[Test]
+		public void SetDateTimeProperty()
+		{
+			DateTimeTestObject o = new DateTimeTestObject();
+			ObjectWrapper wrapper = GetWrapper(o);
+
+			wrapper.SetPropertyValue("TriggerDateTime", "1991-10-10");
+
+			Assert.AreEqual(1991, ((DateTime) wrapper.GetPropertyValue("TriggerDateTime")).Year);
+		}
+
+		#endregion
+
+		#region Test for CultureInfo Properties
+
+		internal class CultureTestObject
+		{
+			private CultureInfo _ci;
+
+			public CultureInfo Cult
+			{
+				get { return _ci; }
+				set { _ci = value; }
+			}
+		}
+
+		[Test]
+		public void SetCultureInfoProperty()
+		{
+			CultureTestObject o = new CultureTestObject();
+			ObjectWrapper wrapper = GetWrapper(o);
+
+			wrapper.SetPropertyValue("Cult", "es-ES");
+
+			Assert.AreEqual("es-ES",
+			                ((CultureInfo) wrapper.GetPropertyValue("Cult")).Name);
+		}
+
+		#endregion
+
+		#region Tests for URI Properties
+
+		internal class URITestObject
+		{
+			private Uri _uri;
+
+			public Uri ResourceIdentifier
+			{
+				get { return _uri; }
+				set { _uri = value; }
+			}
+		}
+
+		[Test]
+		public void SetURIProperty()
+		{
+			URITestObject o = new URITestObject();
+			ObjectWrapper wrapper = GetWrapper(o);
+
+			wrapper.SetPropertyValue("ResourceIdentifier", "http://www.springframework.net");
+			Assert.AreEqual("www.springframework.net",
+			                ((Uri) wrapper.GetPropertyValue("ResourceIdentifier")).Host);
+		}
+
+		#endregion
+
+		#region Tests for Indexed Array Properties
+
+		[Test]
+		public void GetIndexedFromArrayProperty()
+		{
+			PrimitiveArrayObject to = new PrimitiveArrayObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.Array = new int[] {1, 2, 3, 4, 5};
+			Assert.AreEqual(1, (int) wrapper.GetPropertyValue("Array[0]"));
+		}
+
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void GetIndexOutofRangeFromArrayProperty()
+		{
+			PrimitiveArrayObject to = new PrimitiveArrayObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.Array = new int[] {1, 2, 3, 4, 5};
+			wrapper.GetPropertyValue("Array[5]");
+		}
+
+		[Test]
+		public void SetIndexedFromArrayProperty()
+		{
+			PrimitiveArrayObject to = new PrimitiveArrayObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.Array = new int[] {1, 2, 3, 4, 5};
+			wrapper.SetPropertyValue("Array[2]", 6);
+			Assert.AreEqual(6, to.Array[2]);
+		}
+
+		[Test]
+        [ExpectedException(typeof(InvalidPropertyException))]
+		public void SetIndexOutOfRangeFromArrayProperty()
+		{
+			PrimitiveArrayObject to = new PrimitiveArrayObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.Array = new int[] {1, 2, 3, 4, 5};
+			wrapper.SetPropertyValue("Array[5]", 6);
+		}
+
+		/// <summary>
+		/// Test that we bail when attempting to get an indexed property with some guff for the index
+		/// </summary>
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void GetIndexedPropertyValueWithGuffIndexFromArrayProperty()
+		{
+			PrimitiveArrayObject to = new PrimitiveArrayObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.Array = new int[] {1, 2, 3, 4, 5};
+			Assert.AreEqual(1, (int) wrapper.GetPropertyValue("Array[HungerHurtsButStarvingWorks]"));
+		}
+
+		/// <summary>
+		/// Test that we bail when attempting to get an indexed property with some guff for the index
+		/// </summary>
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void GetIndexedPropertyValueWithMissingIndexFromArrayProperty()
+		{
+			PrimitiveArrayObject to = new PrimitiveArrayObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.Array = new int[] {1, 2, 3, 4, 5};
+			Assert.AreEqual(1, (int) wrapper.GetPropertyValue("Array[]"));
+		}
+
+		#endregion
+
+		#region Tests for Indexed List Properties
+
+		internal class ListTestObject
+		{
+			private IList _list;
+			private ArrayList _arrayList;
+
+			public IList List
+			{
+				get { return _list; }
+				set { _list = value; }
+			}
+
+			public ArrayList ArrayList
+			{
+				get { return _arrayList; }
+				set { _arrayList = value; }
+			}
+		}
+
+		[Test]
+		public void GetIndexedFromListProperty()
+		{
+			ListTestObject to = new ListTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.List = new ArrayList(new int[] {1, 2, 3, 4, 5});
+			Assert.AreEqual(1, (int) wrapper.GetPropertyValue("List[0]"));
+		}
+
+		[Test]
+		public void GetIndexedFromArrayListProperty()
+		{
+			ListTestObject to = new ListTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.ArrayList = new ArrayList(new int[] {1, 2, 3, 4, 5});
+			Assert.AreEqual(1, (int) wrapper.GetPropertyValue("ArrayList[0]"));
+		}
+
+		[Test]
+        [ExpectedException(typeof(InvalidPropertyException))]
+		public void GetIndexOutofRangeFromListProperty()
+		{
+			ListTestObject to = new ListTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.List = new ArrayList(new int[] {1, 2, 3, 4, 5});
+			wrapper.GetPropertyValue("List[5]");
+		}
+
+		[Test]
+		public void SetIndexedFromListProperty()
+		{
+			ListTestObject to = new ListTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.List = new ArrayList(new int[] {1, 2, 3, 4, 5});
+			wrapper.SetPropertyValue("List[0]", 6);
+			Assert.AreEqual(6, to.List[0]);
+		}
+
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void SetIndexedFromListPropertyUsingMixOfSingleAndDoubleQuotedDelimeters()
+		{
+			ListTestObject to = new ListTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.List = new ArrayList(new int[] {1, 2, 3, 4, 5});
+			wrapper.SetPropertyValue("List['0\"]", 6);
+			Assert.AreEqual(6, to.List[0]);
+		}
+
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void SetIndexedFromListPropertyUsingNonNumericValueForTheIndex()
+		{
+			ListTestObject to = new ListTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.List = new ArrayList(new int[] {1, 2, 3, 4, 5});
+			wrapper.SetPropertyValue("List[bingo]", 6);
+		}
+
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void SetIndexedFromListPropertyUsingEmptyValueForTheIndex()
+		{
+			ListTestObject to = new ListTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.List = new ArrayList(new int[] {1, 2, 3, 4, 5});
+			wrapper.SetPropertyValue("List[]", 6);
+		}
+
+		[Test]
+		[Ignore("Addition of elements to the list via index that is out of range is not supported anymore.")]
+		public void SetIndexOutOfRangeFromListProperty()
+		{
+			ListTestObject to = new ListTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.List = new ArrayList(new int[] {1, 2, 3, 4, 5});
+			wrapper.SetPropertyValue("List[6]", 6);
+			Assert.AreEqual(6, to.List[6]);
+			Assert.IsNull(to.List[5]);
+			wrapper.SetPropertyValue("List[7]", 7);
+			Assert.AreEqual(7, to.List[7]);
+		}
+
+		/// <summary>
+		/// Test that we bail when attempting to get an indexed property with some guff for the index
+		/// </summary>
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void GetIndexedPropertyValueWithGuffIndexFromListProperty()
+		{
+			ListTestObject to = new ListTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.List = new ArrayList(new int[] {1, 2, 3, 4, 5});
+			Assert.AreEqual(1, (int) wrapper.GetPropertyValue("List[HungerHurtsButStarvingWorks]"));
+		}
+
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void GetIndexedPropertyValueWithMissingIndexFromListProperty()
+		{
+			ListTestObject to = new ListTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.List = new ArrayList(new int[] {1, 2, 3, 4, 5});
+			Assert.AreEqual(1, (int) wrapper.GetPropertyValue("List[]"));
+		}
+
+		#endregion
+
+		#region Tests for Indexed Dictionary Properties
+
+		internal class DictionaryTestObject
+		{
+			private IDictionary _dictionary;
+
+			public IDictionary Dictionary
+			{
+				get { return _dictionary; }
+				set { _dictionary = value; }
+			}
+		}
+
+		[Test]
+		public void GetIndexedFromDictionaryProperty()
+		{
+			DictionaryTestObject to = new DictionaryTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.Dictionary = new Hashtable();
+			to.Dictionary.Add("key1", "value1");
+			Assert.AreEqual("value1", (string) wrapper.GetPropertyValue("Dictionary['key1']"));
+		}
+
+		[Test]
+		public void GetIndexMissingFromDictionaryProperty()
+		{
+			DictionaryTestObject to = new DictionaryTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.Dictionary = new Hashtable();
+			Assert.IsNull(wrapper.GetPropertyValue("Dictionary['notthere']"));
+		}
+
+		[Test]
+		public void SetIndexedFromDictionaryProperty()
+		{
+			DictionaryTestObject to = new DictionaryTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.Dictionary = new Hashtable();
+			wrapper.SetPropertyValue("Dictionary['key1']", "value1");
+			Assert.AreEqual("value1", to.Dictionary["key1"]);
+		}
+
+		[Test]
+		public void SettingADictionaryPropertyJustAddsTheValuesToTheExistingDictionary()
+		{
+			TestObject to = new TestObject();
+			to.AddPeriodicElement("Hsu", "Feng");
+			to.AddPeriodicElement("Piao", "Jin");
+			ObjectWrapper wrapper = GetWrapper(to);
+			IDictionary elements = new Hashtable();
+			elements.Add("Weekend", "News");
+			wrapper.SetPropertyValue("PeriodictabLE", elements);
+			Assert.AreEqual(3, to.PeriodicTable.Count);
+		}
+
+		#endregion
+
+		#region Tests for Indexed Set Properties
+
+		internal class SetTestObject
+		{
+			private ISet _set;
+			private HybridSet _aSet;
+
+			public ISet Set
+			{
+				get { return _set; }
+				set { _set = value; }
+			}
+
+			public HybridSet HybridSet
+			{
+				get { return _aSet; }
+				set { _aSet = value; }
+			}
+		}
+
+		[Test]
+		public void SettingASetPropertyJustAddsTheValuesToTheExistingSet()
+		{
+			TestObject to = new TestObject();
+			to.AddComputerName("Atari 2900");
+			to.AddComputerName("JCN");
+			ObjectWrapper wrapper = GetWrapper(to);
+			wrapper.SetPropertyValue("Computers", new HybridSet(new string[] {"Trusty SNES"}));
+			Assert.AreEqual(3, to.Computers.Count);
+		}
+
+        [Test]
+        [ExpectedException(typeof(InvalidPropertyException))]
+        public void GetIndexFromSetProperty()
+        {
+            SetTestObject to = new SetTestObject();
+            IObjectWrapper wrapper = GetWrapper(to);
+            to.Set = new ListSet(new int[] { 1, 2, 3, 4, 5 });
+            Assert.AreEqual(1, (int)wrapper.GetPropertyValue("Set[1]"));
+        }
+	    
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void GetIndexOutofRangeFromSetProperty()
+		{
+			SetTestObject to = new SetTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.Set = new ListSet(new int[] {1, 2, 3, 4, 5});
+			Assert.AreEqual(1, (int) wrapper.GetPropertyValue("Set[23]"));
+		}
+
+		/// <summary>
+		/// Test that we bail when attempting to get an indexed property with some guff for the index
+		/// </summary>
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void GetIndexedPropertyValueWithGuffIndexFromSetProperty()
+		{
+			SetTestObject to = new SetTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.Set = new ListSet(new int[] {1, 2, 3, 4, 5});
+			Assert.AreEqual(1, (int) wrapper.GetPropertyValue("Set[HungerHurtsButStarvingWorks]"));
+		}
+
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void GetIndexedPropertyValueWithMissingIndexFromSetProperty()
+		{
+			SetTestObject to = new SetTestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			to.Set = new ListSet(new int[] {1, 2, 3, 4, 5});
+            object o = wrapper.GetPropertyValue("Set[]");
+			Assert.AreEqual(1, (int) wrapper.GetPropertyValue("Set[]"));
+		}
+
+		#endregion
+
+		#region Test for Enumeration Properties
+
+		internal class EnumTestObject
+		{
+			private FileMode FileModeEnum;
+
+			public FileMode FileMode
+			{
+				get { return FileModeEnum; }
+				set { FileModeEnum = value; }
+			}
+		}
+
+		[Test]
+		public void SetEnumProperty()
+		{
+			EnumTestObject o = new EnumTestObject();
+			ObjectWrapper wrapper = GetWrapper(o);
+			wrapper.SetPropertyValue("FileMode", FileMode.Create);
+			Assert.AreEqual(FileMode.Create, (FileMode) wrapper.GetPropertyValue("FileMode"));
+		}
+
+		#endregion
+
+		[Test]
+		public void SetTypePropertyWithString()
+		{
+			ObjectWithTypeProperty to = new ObjectWithTypeProperty();
+			IObjectWrapper wrapper = GetWrapper(to);
+			wrapper.SetPropertyValue("Type", "System.DateTime");
+			Assert.AreEqual(typeof (DateTime), to.Type);
+		}
+
+		[Test]
+		[ExpectedException(typeof (InvalidPropertyException))]
+		public void GetIndexedPropertyValueWithNonIndexedType()
+		{
+			TestObject to = new TestObject();
+			IObjectWrapper wrapper = GetWrapper(to);
+			wrapper.GetPropertyValue("FileMode[0]");
+		}
+
+		[Test]
+		[ExpectedException(typeof (NullValueInNestedPathException))]
+		public void SetPropertyValuesWithUnknownProperty()
+		{
+			TestObject to = new TestObject();
+			to.Doctor = null;
+			ObjectWrapper wrapper = GetWrapper(to);
+			wrapper.SetPropertyValue("Doctor.Company", "Bingo");
+		}
+
+        [Test]
+        [ExpectedException(typeof(InvalidPropertyException))]
+        public void SetPropertyValuesFailsWhenSettingNonExistantProperty()
+        {
+            TestObject to = new TestObject();
+            ObjectWrapper wrapper = GetWrapper(to);
+            MutablePropertyValues values = new MutablePropertyValues();
+            values.Add("JeepersCreepersWhereDidYaGetThosePeepers", "OhThisWeirdBatGuySoldEmToMe...");
+            values.Add("Age", 19);
+            // the unknown and ridiculously named property should fail
+            wrapper.SetPropertyValues(values, false);
+        }
+        
+        [Test]
+        public void SetPropertyValuesDoesNotFailWhenSettingNonExistantPropertyWithIgnorUnknownSetToTrue()
+        {
+			TestObject to = new TestObject();
+			ObjectWrapper wrapper = GetWrapper(to);
+			MutablePropertyValues values = new MutablePropertyValues();
+			values.Add("Age", 19);
+			values.Add("JeepersCreepersWhereDidYaGetThosePeepers", "OhThisWeirdBatGuySoldEmToMe...");
+			// the unknown and ridiculously named property should fail
+			wrapper.SetPropertyValues(values, true);
+			Assert.AreEqual(19, to.Age, "The single good property in the property values should have been set though...");
+		}
+
+        [Test]
+        [ExpectedException(typeof(NotWritablePropertyException))]
+        public void SetPropertyValuesFailsWhenSettingReadOnlyProperty()
+        {
+            TestObject to = new TestObject();
+            ObjectWrapper wrapper = GetWrapper(to);
+            MutablePropertyValues values = new MutablePropertyValues();
+            values.Add("ReadOnlyObjectNumber", 123);
+            wrapper.SetPropertyValues(values, false);
+        }
+
+        [Test]
+        public void SetPropertyValuesDoesNotFailWhenSettingReadOnlyPropertyWithIgnorUnknownSetToTrue()
+        {
+            TestObject to = new TestObject();
+            ObjectWrapper wrapper = GetWrapper(to);
+            MutablePropertyValues values = new MutablePropertyValues();
+            values.Add("ObjectNumber", 123);
+            values.Add("Age", 19);
+            wrapper.SetPropertyValues(values, true);
+            Assert.AreEqual(19, to.Age, "The single good property in the property values should have been set though...");
+        }
+
+		[Test]
+		public void SetArrayPropertyValue()
+		{
+			string[] expected = new string[] {"Fedora", "Gacy", "Banjo"};
+			TestObject to = new TestObject();
+			ObjectWrapper wrapper = GetWrapper(to);
+			wrapper.SetPropertyValue("Hats", expected);
+			Assert.IsNotNull(to.Hats);
+			Assert.AreEqual(expected.Length, to.Hats.Length);
+			for (int i = 0; i < expected.Length; ++i)
+			{
+				Assert.AreEqual(expected[i], to.Hats[i]);
+			}
+		}
+
+		[Test]
+		public void TestToString()
+		{
+			ObjectWrapper wrapper = GetWrapper();
+			Assert.IsTrue(wrapper.ToString().IndexOf("Exception encountered") >= 0);
+			wrapper.WrappedInstance = new WanPropsClass();
+			string expected = string.Format(
+				"{0}: wrapping class [{1}]; IsWan={2}",
+				wrapper.GetType().Name, wrapper.WrappedType.FullName, "{True}");
+			Assert.AreEqual(expected, wrapper.ToString());
+		}
+
+		[Test]
+		[ExpectedException(typeof (FatalObjectException))]
+		public void GetPropertyInfoWithNullArgument()
+		{
+			ObjectWrapper wrapper = GetWrapper(new TestObject());
+			wrapper.GetPropertyInfo(null);
+		}
+
+        [Test]
+        [ExpectedException(typeof (FatalReflectionException))]
+        public void GetPropertyInfoWithNonPropertyExpression()
+        {
+            ObjectWrapper wrapper = GetWrapper(new TestObject());
+            wrapper.GetPropertyInfo("2 + 2");
+        }
+
+        [Test]
+        [ExpectedException(typeof (FatalObjectException))]
+        public void GetPropertyInfoWithNonParsableExpression()
+        {
+            ObjectWrapper wrapper = GetWrapper(new TestObject());
+            wrapper.GetPropertyInfo("[");
+        }
+
+		[Test]
+		public void GetNestedPropertyInfo()
+		{
+			RealNestedTestObject o = new RealNestedTestObject();
+			o.Datum = new TestObject();
+			o.Datum.Doctor = new NestedTestObject("Modlin");
+			ObjectWrapper wrapper = GetWrapper(o);
+			PropertyInfo info = wrapper.GetPropertyInfo("Datum.Doctor.Company");
+			Assert.IsNotNull(info);
+		}
+
+		[Test(Description="SPRNET-198")]
+		public void AmbiguousPropertyLookupIsHandledProperlyByLookingAtDerivedClassOnly()
+		{
+			ObjectWrapper wrapper = GetWrapper(new DerivedFoo());
+			wrapper.GetPropertyInfo("Bar");
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/PropertyAccessExceptionsExceptionTests.cs b/test/Spring/Spring.Core.Tests/Objects/PropertyAccessExceptionsExceptionTests.cs
new file mode 100644
index 00000000..be0a59ae
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/PropertyAccessExceptionsExceptionTests.cs
@@ -0,0 +1,72 @@
+#region License
+
+/*
+ * Copyright 2004 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.Collections;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Core;
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Unit tests for the PropertyAccessExceptionsException class.
+    /// </summary>
+    /// <author></author>
+    /// <version>$Id: PropertyAccessExceptionsExceptionTests.cs,v 1.4 2007/07/31 00:09:24 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class PropertyAccessExceptionsExceptionTests
+    {
+        [Test]
+        public void GetNonExistantPropertyException()
+		{
+			ObjectWrapper wrapper = new ObjectWrapper(new TestObject("Rick", 23));
+			PropertyAccessExceptionsException ex
+				= new PropertyAccessExceptionsException(wrapper, new PropertyAccessException[]
+				{
+				});
+			PropertyAccessException nullException = ex.GetPropertyAccessException("Age");
+			Assert.IsNull(nullException);
+        }
+
+		[Test]
+		public void GetPropertyExceptions()
+		{
+			ObjectWrapper wrapper = new ObjectWrapper(new TestObject("Rick", 23));
+			PropertyAccessExceptionsException ex
+				= new PropertyAccessExceptionsException(wrapper, new PropertyAccessException[]
+				{
+					new TypeMismatchException(new PropertyChangeEventArgs("Doctor", new NestedTestObject("Foo"), "rubbish"), typeof (INestedTestObject)),
+					new MethodInvocationException(new TargetInvocationException("Bad format", new FormatException("'12' is not a valid argument for 'foo'..")), new PropertyChangeEventArgs("Friends", new ArrayList(), "trash"))
+				});
+			PropertyAccessException doctorPropertyException = ex.GetPropertyAccessException("Doctor");
+			Assert.IsNotNull(doctorPropertyException);
+			Assert.AreEqual("typeMismatch", doctorPropertyException.ErrorCode);
+			Assert.AreEqual("Foo", ((NestedTestObject) doctorPropertyException.PropertyChangeArgs.OldValue).Company);
+			PropertyAccessException friendsPropertyException = ex.GetPropertyAccessException("Friends");
+			Assert.IsNotNull(friendsPropertyException);
+			Assert.AreEqual("methodInvocation", friendsPropertyException.ErrorCode);
+			Assert.AreEqual(wrapper, ex.ObjectWrapper);
+			Assert.AreEqual(wrapper.WrappedInstance, ex.BindObject);
+			Assert.AreEqual(ex.Message, ex.ToString());
+
+		}
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/PropertyValueTests.cs b/test/Spring/Spring.Core.Tests/Objects/PropertyValueTests.cs
new file mode 100644
index 00000000..06162169
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/PropertyValueTests.cs
@@ -0,0 +1,85 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects
+{
+    /// <summary>
+    /// Unit tests for the PropertyValue class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: PropertyValueTests.cs,v 1.6 2006/04/09 07:24:50 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class PropertyValueTests
+    {
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void InstantiationWithNulls()
+        {
+            new PropertyValue(null, null);
+        }
+
+        [Test]
+        public void Instantiation()
+        {
+            PropertyValue val = new PropertyValue("Age", 12);
+            Assert.AreEqual("Age", val.Name);
+            Assert.AreEqual(12, val.Value);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void InstantiationWithEmptyStringPropertyName()
+        {
+            new PropertyValue(string.Empty, 12);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void InstantiationWithWhitespacePropertyName()
+        {
+            new PropertyValue("  ", 12);
+        }
+
+        [Test]
+        public void TestEquals()
+        {
+            PropertyValue one = new PropertyValue("Age", 12);
+            PropertyValue two = new PropertyValue("Age", 12);
+            Assert.AreEqual(one, two);
+            Assert.AreEqual(one.GetHashCode(), two.GetHashCode());
+            Assert.AreEqual(one, one);
+            Assert.IsFalse(one.Equals("Foo"));
+        }
+
+        [Test]
+        public void TestToString()
+        {
+            PropertyValue one = new PropertyValue("Age", 12);
+            Assert.AreEqual("PropertyValue: name='Age'; value=[12].", one.ToString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/ResourceTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/ResourceTestObject.cs
new file mode 100644
index 00000000..6a908eb5
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/ResourceTestObject.cs
@@ -0,0 +1,57 @@
+#region License
+/*
+ * Copyright © 2002-2005 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
+#region Imports
+using System;
+using System.IO;
+using Spring.Core.IO;
+#endregion
+namespace Spring.Objects
+{
+    /// <summary>
+    /// Object for testing IResource instances.
+    /// </summary>
+    /// <author>Juergen Hoeller</author>
+    /// <author>Mark Pollack (.NET)</author>
+    public class ResourceTestObject
+    {
+        private IResource resource;
+        private Stream inputStream;
+        public ResourceTestObject()
+        {
+        }
+        public ResourceTestObject(IResource resource)
+        {
+            this.resource = resource;
+        }
+        public ResourceTestObject(IResource resource, Stream inputStream)
+        {
+            this.resource = resource;
+            this.inputStream = inputStream;
+        }
+        public IResource Resource
+        {
+            get { return this.resource; }
+            set { this.resource = value; }
+        }
+        public Stream InputStream
+        {
+            get { return this.inputStream; }
+            set { this.inputStream = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/SerializablePerson.cs b/test/Spring/Spring.Core.Tests/Objects/SerializablePerson.cs
new file mode 100644
index 00000000..83f589b2
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/SerializablePerson.cs
@@ -0,0 +1,81 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+using System;
+using System.Runtime.Serialization;
+#endregion
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Serializable implementation of the IPerson interface.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	[Serializable]
+	public class SerializablePerson : TestObject, IPerson, ISerializable
+	{
+		public SerializablePerson()
+		{
+		}
+
+		protected SerializablePerson(SerializationInfo info, StreamingContext ctxt)
+		{
+			this.Age = (int) info.GetValue("Age", typeof(int));
+			this.Name = (string) info.GetValue("Name", typeof(string));
+		}
+
+		public void GetObjectData(SerializationInfo info, StreamingContext ctxt)
+		{
+			info.AddValue("Age", this.Age);
+			info.AddValue("Name", this.Name);
+		}
+
+		public int GetAge()
+		{
+			return this.Age;
+		}
+
+		public void SetAge(int age)
+		{
+			this.Age = age;
+		}
+
+		public string GetName()
+		{
+			return this.Name;
+		}
+
+		public void SetName(string name)
+		{
+			this.Name = name;
+		}
+
+        public object Echo(object obj)
+        {
+            if (obj is Exception)
+            {
+                throw (Exception)obj;
+            }
+            return obj;
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/StaticTestEventHandler.cs b/test/Spring/Spring.Core.Tests/Objects/StaticTestEventHandler.cs
new file mode 100644
index 00000000..0de5a8ac
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/StaticTestEventHandler.cs
@@ -0,0 +1,51 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects {
+
+	/// <summary>
+	/// Exposes a static method that has a signature compatible with the
+	/// EventHandler delegate.
+    /// </summary>
+    /// <version>$Id: StaticTestEventHandler.cs,v 1.3 2006/04/09 07:24:50 markpollack Exp $</version>
+    public class StaticTestEventHandler
+    {
+        public static void HandleArbitraryEvent (object sender, EventArgs e) 
+        {
+            _eventWasHandled = true;
+        }
+
+        public static bool EventWasHandled 
+        {
+            get 
+            {
+                return _eventWasHandled;
+            }
+        }
+
+        protected static bool _eventWasHandled;
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/ArgumentConvertingMethodInvokerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/ArgumentConvertingMethodInvokerTests.cs
new file mode 100644
index 00000000..ff6481a3
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Support/ArgumentConvertingMethodInvokerTests.cs
@@ -0,0 +1,151 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+	/// <summary>
+	/// Unit tests for the ArgumentConvertingMethodInvoker class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ArgumentConvertingMethodInvokerTests.cs,v 1.4 2006/04/09 07:24:51 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class ArgumentConvertingMethodInvokerTests
+    {
+        [Test]
+        public void Invoke () {
+            ArgumentConvertingMethodInvoker vkr = new ArgumentConvertingMethodInvoker ();
+            vkr.TargetObject = new Voker ();
+            vkr.TargetMethod = "Hi";
+            vkr.Arguments = new object [] {"Rick, Mark, Griffin, Si, Choy, Aleks"};
+            vkr.Prepare ();
+            string actual = vkr.Invoke () as string;
+            Assert.IsNotNull (actual);
+            Assert.AreEqual ("Hi Rick, Mark, Griffin, Si, Choy, Aleks", actual);
+        }
+
+        [Test]
+        public void InvokeWithConversion () 
+        {
+            ArgumentConvertingMethodInvoker vkr = new ArgumentConvertingMethodInvoker ();
+            Voker instance = new Voker ();
+            vkr.TargetObject = instance;
+            vkr.TargetMethod = "HiEverybody";
+            // CSV string should be converted to string []
+            vkr.Arguments = new object [] {"Rick, Mark, Griffin, Federico, Choy, Aleks"};
+            vkr.Prepare ();
+            string actual = vkr.Invoke () as string;
+            Assert.IsNotNull (actual);
+            Assert.AreEqual ("Hi ya'll", actual);
+            Assert.IsNotNull (instance.developers);
+		}
+
+		[Test]
+		public void InvokeAllNamedArgumentsWithConversion () 
+		{
+			ArgumentConvertingMethodInvoker vkr = new ArgumentConvertingMethodInvoker ();
+			Voker instance = new Voker ();
+			vkr.TargetObject = instance;
+			vkr.TargetMethod = "HiEverybody";
+			// CSV string should be converted to string []
+			vkr.AddNamedArgument("nameS", new object [] {"Rick, Mark, Griffin, Federico, Choy, Aleks"});
+			vkr.Prepare ();
+			string actual = vkr.Invoke () as string;
+			Assert.IsNotNull (actual);
+			Assert.AreEqual ("Hi ya'll", actual);
+			Assert.IsNotNull (instance.developers);
+		}
+
+        [Test]
+        public void InvokeWithRegisteredConversion () 
+        {
+            ArgumentConvertingMethodInvoker vkr = new ArgumentConvertingMethodInvoker ();
+            // see if custom registration filters thru...
+            vkr.RegisterCustomConverter (typeof (Voker), new VokerConverter ());
+            vkr.TargetType = typeof (Voker);
+            vkr.TargetMethod = "HiVoker";
+            // arg should be converted to Voker
+            vkr.Arguments = new object [] {"Lebowski"};
+            vkr.Prepare ();
+            string actual = vkr.Invoke () as string;
+            Assert.IsNotNull (actual);
+            Assert.AreEqual ("Hi Lebowski", actual);
+        }
+    }
+
+    public sealed class Voker 
+    {
+        public Voker () : this ("HiroProtagonist") {}
+
+        public Voker (string name) 
+        {
+            this.name = name;
+        }
+
+        public string Hi (string name)
+        {
+            return "Hi " + name;
+        }
+
+        public string HiEverybody (string [] names)
+        {
+            developers = names;
+            return "Hi ya'll";
+        }
+
+        public static string HiVoker (Voker buddy) 
+        {
+            return "Hi " + buddy.name;
+        }
+
+        public string [] developers;
+        public string name;
+    }
+
+    public sealed class VokerConverter : System.ComponentModel.TypeConverter 
+    {
+        public override bool CanConvertFrom (
+            System.ComponentModel.ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof (string)) 
+            {
+                return true;
+            }
+            return base.CanConvertFrom (context, sourceType);
+        }
+
+        public override object ConvertFrom (
+            System.ComponentModel.ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value)
+        {
+            if (value is string) 
+            {
+                return new Voker (value as string);
+            }
+            return base.ConvertFrom (context, culture, value);
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/AutoWiringEventHandlerValueTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/AutoWiringEventHandlerValueTests.cs
new file mode 100644
index 00000000..cf493419
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Support/AutoWiringEventHandlerValueTests.cs
@@ -0,0 +1,339 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+    /// <summary>
+    /// Unit tests for the AutoWiringEventHandlerValue class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: AutoWiringEventHandlerValueTests.cs,v 1.3 2006/04/09 07:24:51 markpollack Exp $</version>
+    [TestFixture]
+    public class AutoWiringEventHandlerValueTests
+    {
+        /// <summary>
+        /// Kinda defeats the purpose of the AutoWiringEventHandlerValue class, but
+        /// still a supported and legal option.
+        /// </summary>
+        [Test]
+        public void AutowireExplicitly ()
+        {
+            // create the event source, and a listener to wire to an event (s) on the source
+            PingSource source = new PingSource ();
+            PingListener listener = new PingListener ();
+
+            // wire them up
+            IEventHandlerValue wirer = new AutoWiringEventHandlerValue ();
+            wirer.EventName = "Ping";
+            wirer.MethodName = "OnPing";
+            wirer.Wire (source, listener);
+
+            // raise the event on the source
+            source.OnPing ();
+
+            // ascertain that the event listener was indeed notified of the raised event
+            Assert.IsTrue (listener.GotPing, "The listener was not notified of the raised event.");
+            Assert.IsTrue (listener.PingCount == 1, "The listener was notified more than once for a single raising of the source event (registered to listen more than once?)");
+            Assert.IsFalse (listener.GotPinging, "The listener was (incorrectly) notified of an event that wasn't raised.");
+            Assert.IsFalse (listener.GotPinged, "The listener was (incorrectly) notified of an event that wasn't raised.");
+        }
+
+        [Test]
+        public void AutowireExplicitlyWithBadSignatureMethod ()
+        {
+            // create the event source, and a listener to wire to an event (s) on the source
+            PingSource source = new PingSource ();
+            PingListener listener = new PingListener ();
+
+            // wire them up
+            IEventHandlerValue wirer = new AutoWiringEventHandlerValue ();
+            wirer.EventName = "Ping";
+            wirer.MethodName = "OnPinged"; // signature is incompatible
+            wirer.Wire (source, listener);
+
+            // raise the event on the source
+            source.OnPing ();
+
+            // ascertain that the event listener was not notified of the raised event
+            Assert.IsFalse (listener.GotPing, "The listener was (incorrectly) notified of the raised event.");
+            Assert.IsFalse (listener.GotPinging, "The listener was (incorrectly) notified of an event that wasn't raised.");
+            Assert.IsFalse (listener.GotPinged, "The listener was (incorrectly) notified of an event that wasn't raised.");
+        }
+
+        [Test]
+        public void AutowireAllHandlersWithCompatibleSignatures () 
+        {
+            // create the event source, and a listener to wire to an event (s) on the source
+            PingSource source = new PingSource ();
+            PingListener listener = new PingListener ();
+
+            // wire them up (any methods on the listener that have a compatible signature will be wired up)
+            IEventHandlerValue wirer = new AutoWiringEventHandlerValue ();
+            wirer.EventName = "^Ping$";
+            wirer.Wire (source, listener);
+
+            // raise the event on the source
+            source.OnPing ();
+
+            // ascertain that the event handler was indeed notified of the raised event
+            Assert.IsTrue (listener.GotPing, "The listener was not notified of the raised event.");
+            Assert.IsFalse (listener.GotPinging, "The listener was (incorrectly) notified of an event that wasn't raised.");
+            Assert.IsFalse (listener.GotPinged, "The listener was (incorrectly) notified of an event that wasn't raised.");
+        }
+
+        [Test]
+        public void AutowireAllEventsOnSource () 
+        {
+            // create the event source, and a listener to wire to an event (s) on the source
+            PingSource source = new PingSource ();
+            PingListener listener = new PingListener ();
+
+            // wire them up (any methods on the listener that have a signature compatible
+            // with any event exposed on the source will be wired up)
+            IEventHandlerValue wirer = new AutoWiringEventHandlerValue ();
+            wirer.Wire (source, listener);
+
+            // raise the event (s) on the source
+            source.OnPinging ();
+            source.OnPing ();
+            source.OnPinged ();
+
+            // ascertain that the event listener was indeed notified of the raised event
+            Assert.IsTrue (listener.GotPinging, "The listener was not notified of the raised event.");
+            Assert.IsTrue (listener.GotPing, "The listener was not notified of the raised event.");
+            Assert.IsTrue (listener.GotPinged, "The listener was not notified of the raised event.");
+        }
+
+        [Test]
+        public void AutowiringIsCaseInsensitive () 
+        {
+            // create the event source, and a listener to wire to an event (s) on the source
+            PingSource source = new PingSource ();
+            PingListener listener = new PingListener ();
+
+            // wire them up
+            IEventHandlerValue wirer = new AutoWiringEventHandlerValue ();
+            wirer.EventName = "pInG";
+            wirer.MethodName = "onpiNg";
+            wirer.Wire (source, listener);
+
+            // raise the event (s) on the source
+            source.OnPing ();
+
+            // ascertain that the event listener was indeed notified of the raised event
+            Assert.IsFalse (listener.GotPinging, "The listener was (incorrectly) notified of the raised event.");
+            Assert.IsTrue (listener.GotPing, "The listener was not  notified of the raised event.");
+            Assert.IsFalse (listener.GotPinged, "The listener was (incorrectly) notified of the raised event.");
+        }
+
+        [Test]
+        public void AllCompatibleSignaturesAreWired () 
+        {
+            // create the event source, and a listener to wire to an event (s) on the source
+            PingSource source = new PingSource ();
+            PingListener listener = new PingListener ();
+
+            // wire them up
+            IEventHandlerValue wirer = new AutoWiringEventHandlerValue ();
+            wirer.EventName = "Pinging";
+            wirer.MethodName = ".+"; // both OnPinging and OnPinged have compatible sigs :'(
+            wirer.Wire (source, listener);
+
+            // raise the event (s) on the source
+            source.OnPinging ();
+
+            // ascertain that the event listener was indeed notified of the raised event
+            Assert.IsTrue (listener.GotPinging, "The listener was not notified of the raised event.");
+            Assert.IsFalse (listener.GotPing, "The listener was (incorrectly) notified of the raised event.");
+            // the moral of the story is...
+            //     don't use greedy method name regex's for autowiring, be explicit
+            Assert.IsTrue (listener.GotPinged, "The listener was not notified of the raised event.");
+        }
+
+        [Test]
+        public void TestDefaultMethodMatching ()
+        {
+            // create the event source, and a listener to wire to an event (s) on the source
+            PingSource source = new PingSource ();
+            PingListener listener = new PerversePingListener ();
+
+            // wire them up
+            IEventHandlerValue wirer = new AutoWiringEventHandlerValue ();
+            wirer.EventName = "^Ping$";
+            wirer.MethodName = ".+${event}.+"; // matches 'WhatClubDoYouUsePingAhGood'
+            wirer.Wire (source, listener);
+
+            // raise the event on the source
+            source.OnPing ();
+
+            // ascertain that the event listener was not notified of the raised event
+            Assert.IsTrue (listener.GotPing, "The listener was not notified of the raised event.");
+            Assert.IsFalse (listener.GotPinging, "The listener was (incorrectly) notified of an event that wasn't raised.");
+            Assert.IsFalse (listener.GotPinged, "The listener was (incorrectly) notified of an event that wasn't raised.");
+        }
+    }
+
+    internal class PingEventArgs : EventArgs
+    {
+    }
+
+    internal delegate bool PingEventHandler (object sender, PingEventArgs e);
+
+    internal class PingSource 
+    {
+        public event EventHandler Pinging;
+
+        public event PingEventHandler Ping;
+
+        public event EventHandler Pinged;
+        
+        public void OnPinging () 
+        {
+            if (Pinging != null) 
+            {
+                Pinging (this, EventArgs.Empty);
+            }
+        }
+
+        public void OnPing () 
+        {
+            if (Ping != null) 
+            {
+                Ping (this, new PingEventArgs ());
+            }
+        }
+        
+        public void OnPinged () 
+        {
+            if (Pinged != null) 
+            {
+                Pinged (this, EventArgs.Empty);
+            }
+        }
+    }
+
+    internal class PingListener 
+    {
+        public void OnPinging (object sender, EventArgs e) 
+        {
+            _pinging = true;
+            ++_pingingCount;
+        }
+
+        private bool OnPing (object sender, PingEventArgs e) 
+        {
+            _ping = true;
+            ++_pingCount;
+            return true;
+        }
+
+        public void OnPinged (object sender, EventArgs e) 
+        {
+            _pinged = true;
+            ++_pingedCount;
+        }
+
+        public bool GotPinging 
+        {
+            get 
+            {
+                return _pinging;
+            }
+        }
+
+        public bool GotPing 
+        {
+            get 
+            {
+                return _ping;
+            }
+        }
+
+        public bool GotPinged
+        {
+            get 
+            {
+                return _pinged;
+            }
+        }
+
+        public int PingingCount 
+        {
+            get 
+            {
+                return _pingingCount;
+            }
+        }
+
+        public int PingCount 
+        {
+            get 
+            {
+                return _pingCount;
+            }
+        }
+
+        public int PingedCount 
+        {
+            get 
+            {
+                return _pingedCount;
+            }
+        }
+
+        protected bool _pinging;
+        protected bool _ping;
+        protected bool _pinged;
+
+        protected int _pingingCount;
+        protected int _pingCount;
+        protected int _pingedCount;
+    }
+
+    /// <summary>
+    /// Specialisation with obtuse names for listener methods.
+    /// </summary>
+    internal class PerversePingListener : PingListener
+    {
+        public void PingingListener (object sender, EventArgs e) 
+        {
+            _pinging = true;
+        }
+
+        public bool WhatClubDoYouUsePingAhGood (object sender, PingEventArgs e) 
+        {
+            _ping = true;
+            return true;
+        }
+
+        public void AHotDogImPingedOnMyLiason (object sender, EventArgs e) 
+        {
+            _pinged = true;
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/InstanceEventHandlerValueTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/InstanceEventHandlerValueTests.cs
new file mode 100644
index 00000000..c07a752b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Support/InstanceEventHandlerValueTests.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+	/// <summary>
+	/// Unit tests for the InstanceEventHandlerValue class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: InstanceEventHandlerValueTests.cs,v 1.5 2006/04/09 07:24:51 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class InstanceEventHandlerValueTests
+    {
+        [Test]
+        public void Instantiation () 
+        {
+            PingSource source = new PingSource ();
+            StaticEventHandlerValue wirer
+                = new StaticEventHandlerValue (source, "OnPing");
+            Assert.IsNotNull (wirer.Source);
+            Assert.AreEqual ("OnPing", wirer.MethodName);
+            Assert.IsTrue (wirer.ToString ().IndexOf (wirer.MethodName) > 0);
+        }
+
+        [Test]
+        public void Wire () {
+            InstanceEventHandlerValue wirer = new InstanceEventHandlerValue ();
+            wirer.EventName = "Ping";
+            wirer.MethodName = "OnPing";
+            PingSource source = new PingSource ();
+            PingListener sink = new PingListener ();
+            wirer.Wire (source, sink);
+            source.OnPing ();
+            Assert.IsTrue (sink.GotPing, "The event handler did not get notified when the event was raised.");
+            Assert.AreEqual (1, sink.PingCount, "The event handler was not get notified exactly once when the event was raised exactly once.");
+        }
+
+        [Test]
+        public void WireWithStaticHandler () 
+        {
+            PingSource source = new PingSource ();
+            InstanceEventHandlerValue wirer
+                = new InstanceEventHandlerValue (source, "OnPing");
+            wirer.EventName = "Ping";
+            wirer.Wire (source, typeof (StaticPingListener));
+        }
+
+        [Test]
+        [ExpectedException (typeof (FatalObjectException))]
+        public void BailsIfMethodDoesntExist () 
+        {
+            PingSource source = new PingSource ();
+            InstanceEventHandlerValue wirer
+                = new InstanceEventHandlerValue (source, "Roo");
+            wirer.EventName = "Ping";
+            wirer.Wire (source, typeof (StaticPingListener));
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs
new file mode 100644
index 00000000..7668c8b1
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs
@@ -0,0 +1,335 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+	/// <summary>
+	/// Unit tests for the MethodInvoker class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: MethodInvokerTests.cs,v 1.4 2007/08/04 01:05:41 bbaia Exp $</version>
+	[TestFixture]
+	public sealed class MethodInvokerTests
+	{
+		[Test]
+		public void Instantiation()
+		{
+			MethodInvoker vkr = new MethodInvoker();
+			Assert.IsNotNull(vkr.Arguments);
+		}
+
+		[Test]
+		public void SettingNamedArgumentsToNullJustClearsOutAnyNamedArguments()
+		{
+			MethodInvoker vkr = new MethodInvoker();
+			vkr.AddNamedArgument("age", 10);
+			vkr.NamedArguments = null;
+			Assert.IsNotNull(vkr.NamedArguments);
+			Assert.AreEqual(0, vkr.NamedArguments.Count);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "One of either the 'TargetType' or 'TargetObject' properties is required.")]
+		public void PrepareWithOnlyTargetMethodSet()
+		{
+			MethodInvoker vkr = new MethodInvoker();
+			vkr.TargetMethod = "Foo";
+			vkr.Prepare();
+		}
+
+		[Test]
+		public void ArgumentsProperty()
+		{
+			MethodInvoker vkr = new MethodInvoker();
+			vkr.Arguments = null;
+			Assert.IsNotNull(vkr.Arguments); // should always be the empty object array, never null
+			Assert.AreEqual(0, vkr.Arguments.Length);
+			vkr.Arguments = new string[] {"Chank Pop"};
+			Assert.AreEqual(1, vkr.Arguments.Length);
+		}
+
+        [Test]
+        public void InvokeWithStaticMethod()
+        {
+            MethodInvoker mi = new MethodInvoker();
+            mi.TargetType = typeof(Int32);
+            mi.TargetMethod = "Parse";
+            mi.Arguments = new object[] { "27" };
+            mi.Prepare();
+            object actual = mi.Invoke();
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(typeof(int), actual.GetType());
+            Assert.AreEqual(27, (int)actual);
+        }
+
+#if NET_2_0
+        [Test]
+        public void InvokeWithGenericStaticMethod()
+        {
+            MethodInvoker mi = new MethodInvoker();
+            mi.TargetType = typeof(Activator);
+            mi.TargetMethod = "CreateInstance<Spring.Objects.TestObject>";
+            mi.Prepare();
+            object actual = mi.Invoke();
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(typeof(TestObject), actual.GetType());
+        }
+#endif
+
+		[Test]
+		public void InvokeWithOKArguments()
+		{
+			Foo foo = new Foo();
+			foo.Age = 88;
+			MethodInvoker vkr = new MethodInvoker();
+			vkr.TargetObject = foo;
+			vkr.TargetMethod = "GrowOlder";
+			vkr.Arguments = new object[] {10};
+			vkr.Prepare();
+			object actual = vkr.Invoke();
+			Assert.AreEqual(98, actual);
+		}
+
+		[Test]
+		public void InvokeWithOKArgumentsAndMixedCaseMethodName()
+		{
+			Foo foo = new Foo();
+			foo.Age = 88;
+			MethodInvoker vkr = new MethodInvoker();
+			vkr.TargetObject = foo;
+			vkr.TargetMethod = "growolder";
+			vkr.Arguments = new object[] {10};
+			vkr.Prepare();
+			object actual = vkr.Invoke();
+			Assert.AreEqual(98, actual);
+		}
+
+		[Test]
+		public void InvokeWithNamedArgument()
+		{
+			Foo foo = new Foo();
+			foo.Age = 88;
+			MethodInvoker vkr = new MethodInvoker();
+			vkr.TargetObject = foo;
+			vkr.TargetMethod = "growolder";
+			vkr.AddNamedArgument("years", 10);
+			vkr.Prepare();
+			object actual = vkr.Invoke();
+			Assert.AreEqual(98, actual);
+		}
+
+		[Test]
+		public void InvokeWithMixOfNamedAndPlainVanillaArguments()
+		{
+			int maximumAge = 95;
+			Foo foo = new Foo();
+			foo.Age = 88;
+			MethodInvoker vkr = new MethodInvoker();
+			vkr.TargetObject = foo;
+			vkr.TargetMethod = "GrowOlderUntilMaximumAgeReached";
+			vkr.AddNamedArgument("years", 10);
+			vkr.Arguments = new object[] {maximumAge};
+			vkr.Prepare();
+			object actual = vkr.Invoke();
+			Assert.AreEqual(maximumAge, actual);
+		}
+
+		[Test]
+		public void InvokeWithMixOfNamedAndPlainVanillaArgumentsOfDifferingTypes()
+		{
+			int maximumAge = 95;
+			string expectedStatus = "Old Age Pensioner";
+			Foo foo = new Foo();
+			foo.Age = 88;
+			MethodInvoker vkr = new MethodInvoker();
+			vkr.TargetObject = foo;
+			vkr.TargetMethod = "GrowOlderUntilMaximumAgeReachedAndSetStatusName";
+			vkr.AddNamedArgument("years", 10);
+			vkr.AddNamedArgument("status", expectedStatus);
+			vkr.Arguments = new object[] {maximumAge};
+			vkr.Prepare();
+			object actual = vkr.Invoke();
+			Assert.AreEqual(maximumAge, actual);
+			Assert.AreEqual(expectedStatus, foo.Status);
+		}
+
+		[Test]
+		[ExpectedException(
+			typeof (ArgumentException),
+			"The named argument 'southpaw' could not be found on the 'GrowOlder' method of class [Spring.Objects.Support.MethodInvokerTests+Foo].")]
+		public void InvokeWithNamedArgumentThatDoesNotExist()
+		{
+			Foo foo = new Foo();
+			foo.Age = 88;
+			MethodInvoker vkr = new MethodInvoker();
+			vkr.TargetObject = foo;
+			vkr.TargetMethod = "growolder";
+			vkr.AddNamedArgument("southpaw", 10);
+			vkr.Prepare();
+			object actual = vkr.Invoke();
+			Assert.AreEqual(98, actual);
+		}
+
+		/// <summary>
+		/// Tests CLS case insensitivity compliance...
+		/// </summary>
+		[Test]
+		public void InvokeWithWeIRdLyCasedNamedArgument()
+		{
+			Foo foo = new Foo();
+			foo.Age = 88;
+			MethodInvoker vkr = new MethodInvoker();
+			vkr.TargetObject = foo;
+			vkr.TargetMethod = "gROwOldeR";
+			vkr.AddNamedArgument("YEarS", 10);
+			vkr.Prepare();
+			object actual = vkr.Invoke();
+			Assert.AreEqual(98, actual);
+		}
+
+		[Test]
+		[ExpectedException(typeof (MethodInvocationException), "At least one of the arguments passed to this MethodInvoker was incompatible with the signature of the invoked method.")]
+		public void InvokeWithArgumentOfWrongType()
+		{
+			Foo foo = new Foo();
+			foo.Age = 88;
+			MethodInvoker vkr = new MethodInvoker();
+			vkr.TargetObject = foo;
+			vkr.TargetMethod = "growolder";
+			vkr.AddNamedArgument("years", "Bingo");
+			vkr.Prepare();
+			vkr.Invoke();
+		}
+
+		[Test]
+		public void NamedArgumentsOverwriteEachOther()
+		{
+			Foo foo = new Foo();
+			foo.Age = 88;
+			MethodInvoker vkr = new MethodInvoker();
+			vkr.TargetObject = foo;
+			vkr.TargetMethod = "growolder";
+			vkr.AddNamedArgument("years", 10);
+			// this second setting must overwrite the first...
+			vkr.AddNamedArgument("years", 200);
+			vkr.Prepare();
+			object actual = vkr.Invoke();
+			Assert.IsFalse(98.Equals(actual), "The first named argument setter is sticking; must allow itslf to be overwritten.");
+			Assert.AreEqual(288, actual, "The second named argument was not applied (it must be).");
+		}
+
+		[Test]
+		public void PreparedArgumentsIsNeverNull()
+		{
+			MyMethodInvoker vkr = new MyMethodInvoker();
+			Assert.IsNotNull(vkr.GetPreparedArguments(),
+				"PreparedArguments is null even before Prepare() is called; must NEVER be null.");
+			vkr.NullOutPreparedArguments();
+			Assert.IsNotNull(vkr.GetPreparedArguments(),
+				"PreparedArguments should revert to the empty object[] when set to null; must NEVER be null.");
+		}
+
+		#region Inner Class : Foo
+
+		private sealed class Foo
+		{
+			public Foo()
+			{
+				Age = 0;
+				Status = "Baby";
+			}
+
+			public int GrowOlder()
+			{
+				return GrowOlder(1);
+			}
+
+			public int GrowOlder(int years)
+			{
+				_age += years;
+				return _age;
+			}
+
+			public int GrowOlderUntilMaximumAgeReached(int years, int maximumAge)
+			{
+				_age += years;
+				if (_age > maximumAge)
+				{
+					_age = maximumAge;
+				}
+				return _age;
+			}
+
+			public int GrowOlderUntilMaximumAgeReachedAndSetStatusName(
+				int years, int maximumAge, string status)
+			{
+				Status = status;
+				return GrowOlderUntilMaximumAgeReached(years, maximumAge);
+			}
+
+			private int _age;
+			private string _status;
+
+			public int Age
+			{
+				get { return _age; }
+				set { _age = value; }
+			}
+
+			public string Status
+			{
+				get { return _status; }
+				set { _status = value; }
+			}
+		}
+
+		#endregion 
+
+		#region Inner Class : MyMethodInvoker
+
+		private sealed class MyMethodInvoker : MethodInvoker
+		{
+			public MyMethodInvoker()
+			{
+			}
+
+			public void NullOutPreparedArguments()
+			{
+				PreparedArguments = null;
+			}
+
+			public object[] GetPreparedArguments() 
+			{
+				return PreparedArguments;
+			}
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/MutableSortDefinitionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/MutableSortDefinitionTests.cs
new file mode 100644
index 00000000..7187c285
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Support/MutableSortDefinitionTests.cs
@@ -0,0 +1,95 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+    /// <summary>
+    /// Unit tests for the MutableSortDefinition class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: MutableSortDefinitionTests.cs,v 1.3 2006/04/09 07:24:51 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class MutableSortDefinitionTests
+    {
+        [Test]
+        public void Instantiation () {
+            MutableSortDefinition def = new MutableSortDefinition ();
+            Assert.IsTrue (def.IgnoreCase);
+            Assert.IsTrue (def.Ascending);
+            Assert.IsNotNull (def.Property);
+        }
+
+        [Test]
+        public void InstantiationWithCopy () {
+            ISortDefinition copy = new MutableSortDefinition ("Bing!", false, false);
+            MutableSortDefinition def = new MutableSortDefinition (copy);
+            Assert.IsFalse (def.IgnoreCase);
+            Assert.IsFalse (def.Ascending);
+            Assert.IsNotNull (def.Property);
+            Assert.AreEqual (copy.Property, def.Property);
+        }
+
+        [Test]
+        public void TestEquals () {
+            ISortDefinition copy = new MutableSortDefinition ("Rab", false, false);
+            MutableSortDefinition def = new MutableSortDefinition ("Bing!", false, false);
+            def.Property = "Rab";
+            Assert.AreEqual (copy, def);
+            Assert.AreEqual (copy.GetHashCode (), def.GetHashCode ());
+            Assert.IsFalse (def.Equals (null));
+        }
+
+        [Test]
+        public void PropertySetter () {
+            MutableSortDefinition def = new MutableSortDefinition ();
+            def.Property = null;
+            Assert.IsNotNull (def.Property);
+            Assert.AreEqual (string.Empty, def.Property);
+        }
+
+        [Test]
+        public void TogglesOkWhenPropertyIsSetAgain () 
+        {
+            MutableSortDefinition def = new MutableSortDefinition (true);
+            bool originalAscendingValue = def.Ascending;
+            def.Property = "Name";
+            def.Property = "Name"; // sort order should (must!) be reversed now...
+            Assert.IsFalse (def.Ascending == originalAscendingValue);
+        }
+
+        [Test]
+        public void DoesNotTogglesWhenPropertyIsSetAgain () 
+        {
+            MutableSortDefinition def = new MutableSortDefinition (true);
+            bool originalAscendingValue = def.Ascending;
+            def.Property = "Name";
+            def.Property = "Age"; // sort order must not be toggled (different property)
+            Assert.IsTrue (def.Ascending == originalAscendingValue);
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/PropertyComparatorTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/PropertyComparatorTests.cs
new file mode 100644
index 00000000..ca2dad56
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Support/PropertyComparatorTests.cs
@@ -0,0 +1,224 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+using Spring.Core;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+    /// <summary>
+    /// Unit tests for the PropertyComparator class.
+    /// </summary>
+    /// <remarks>
+    /// <p>
+    /// The sort algorithm for arrays changed between versions 1.1 and 2.0 of the .NET
+    /// Framework. Hence there are two batches of tests in this suite, one for versions
+    /// 1.1 and 2.0 of the .NET Framework respectively.
+    /// </p>
+    /// </remarks>
+    /// <author>Rick Evans</author>
+    /// <author>Michael Loll</author>
+    /// <version>$Id: PropertyComparatorTests.cs,v 1.10 2007/07/31 00:09:35 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class PropertyComparatorTests
+    {
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void InstantiationWithNullArgument()
+        {
+            new PropertyComparator(null);
+        }
+
+        [Test]
+        public void Compare()
+        {
+            ISortDefinition definition = new MutableSortDefinition("Age", false, true);
+
+            PropertyComparator cmp = new PropertyComparator(definition);
+            TestObject one = new TestObject("Rick", 19);
+            TestObject two = new TestObject("Balzac", 205);
+            int actual = cmp.Compare(one, two);
+            Assert.IsTrue(actual < 0); // 19 is less than 205
+        }
+
+        [Test]
+        public void CompareNestedProperty()
+        {
+            ISortDefinition definition = new MutableSortDefinition("Lawyer.Company", true, true);
+
+            PropertyComparator cmp = new PropertyComparator(definition);
+            TestObject one = new TestObject("Rick", 19);
+            one.Lawyer = new NestedTestObject("Gizajoab");
+            TestObject two = new TestObject("Balzac", 205);
+            two.Lawyer = new NestedTestObject("Wallpaperer");
+            int actual = cmp.Compare(one, two);
+            Assert.IsTrue(actual < 0); // Gizajoab is less than Wallpaperer
+        }
+
+        [Test]
+        public void CompareWithNullProperty()
+        {
+            ISortDefinition definition = new MutableSortDefinition("Lawyer.Company", true, true);
+
+            PropertyComparator cmp = new PropertyComparator(definition);
+            TestObject one = new TestObject("Rick", 19);
+            one.Lawyer = new NestedTestObject("Gizajoab");
+            TestObject two = new TestObject("Balzac", 205);
+            // no Lawyer.Company property set on object two...
+            int actual = cmp.Compare(one, two);
+            Assert.IsTrue(actual > 0); // Gizajoab is greater than null
+        }
+
+        [Test]
+        [ExpectedException(typeof(InvalidPropertyException))]
+        public void CompareWithNonExistantProperty()
+        {
+            ISortDefinition definition = new MutableSortDefinition("Deborahs.Banjo", true, true);
+
+            PropertyComparator cmp = new PropertyComparator(definition);
+            TestObject one = new TestObject("Rick", 19);
+            TestObject two = new TestObject("Balzac", 205);
+            int actual = cmp.Compare(one, two);
+            Assert.IsTrue(actual == 0);
+        }
+
+        [Test]
+        public void Sort()
+        {
+            ISortDefinition definition = new MutableSortDefinition("NAmE", true, true);
+
+            TestObject one = new TestObject("Rick", 19);
+            TestObject two = new TestObject("Balzac", 205);
+            TestObject three = new TestObject("Jenny", 89);
+            TestObject[] actual = new TestObject[] {one, two, three};
+            TestObject[] expected = new TestObject[] {two /*Balzac*/, three /*Jenny*/, one /*Rick*/};
+            PropertyComparator.Sort(actual, definition);
+            for (int i = 0; i < actual.Length; ++i)
+            {
+                Assert.AreEqual(expected[i].Name, actual[i].Name);
+            }
+        }
+
+        [Test]
+        public void SortInDescendingOrder()
+        {
+            ISortDefinition definition = new MutableSortDefinition("NAmE", true, false);
+
+            TestObject one = new TestObject("Rick", 19);
+            TestObject two = new TestObject("Balzac", 205);
+            TestObject three = new TestObject("Jenny", 89);
+            TestObject[] actual = new TestObject[] {one, two, three};
+            // Rick comes after Jenny comes after Balzac (descending sort order)...
+            TestObject[] expected = new TestObject[] {one /*Rick*/, three /*Jenny*/, two /*Balzac*/};
+            PropertyComparator.Sort(actual, definition);
+            for (int i = 0; i < actual.Length; ++i)
+            {
+                Assert.AreEqual(expected[i].Name, actual[i].Name);
+            }
+        }
+
+        [Test]
+        [Ignore("Sort ordering is not preserved (unstable) with equal elements (c.f. System.Array.Sort (Array, IComparer)))")]
+        public void OrderingIsUnperturbedWithEqualProps()
+        {
+            ISortDefinition definition = new MutableSortDefinition("Age", false, true);
+
+            TestObject one = new TestObject("Rick", 19);
+            TestObject two = new TestObject("Balzac", 19);
+            TestObject three = new TestObject("Jenny", 19);
+            TestObject[] actual = new TestObject[] {one, two, three};
+            TestObject[] expected = new TestObject[] {one /*Rick*/, two /*Balzac*/, three /*Jenny*/};
+            PropertyComparator.Sort(actual, definition);
+            for (int i = 0; i < actual.Length; ++i)
+            {
+                Assert.AreEqual(expected[i].Name, actual[i].Name);
+            }
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void SortWithNullDefinition()
+        {
+            PropertyComparator.Sort(Type.EmptyTypes, null);
+        }
+
+        [Test]
+        public void CompareWithNullArguments()
+        {
+            ISortDefinition definition = new MutableSortDefinition("Nails", false, true);
+
+            Funk one = new Funk(1, "long");
+            PropertyComparator cmp = new PropertyComparator(definition);
+            Assert.AreEqual(0, cmp.Compare(null, null));
+            // nulls are always last (i.e. greater than)
+            Assert.AreEqual(1, cmp.Compare(null, one));
+            // any non-null instance comes before null (i.e. less than).
+            Assert.AreEqual(-1, cmp.Compare(one, null));
+        }
+
+        /// <summary>
+        /// Validates that a PropertyComparator can return its internal ISortDefinition
+        /// to a consumer for use.
+        /// </summary>
+        [Test(Description = "SPRNET-171")]
+        public void CanGetSortDefinition()
+        {
+            ISortDefinition definition = new MutableSortDefinition("Age", false, true);
+
+            PropertyComparator cmp = new PropertyComparator(definition);
+            ISortDefinition sortDefinition = cmp.SortDefinition;
+
+            Assert.AreSame(definition, sortDefinition);
+            Assert.AreEqual(definition.Property, sortDefinition.Property);
+            Assert.AreEqual(definition.Ascending, sortDefinition.Ascending);
+            Assert.AreEqual(definition.IgnoreCase, sortDefinition.IgnoreCase);
+        }
+
+        internal sealed class Funk
+        {
+            public Funk(int id, string nails)
+            {
+                _id = id;
+                _nails = nails;
+            }
+
+            private string _nails;
+            private int _id;
+
+            public string Nails
+            {
+                get { return _nails; }
+            }
+
+            public int Id
+            {
+                get { return _id; }
+                set { _id = value; }
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/StaticEventHandlerValueTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/StaticEventHandlerValueTests.cs
new file mode 100644
index 00000000..adaf807c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/Support/StaticEventHandlerValueTests.cs
@@ -0,0 +1,99 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Objects.Support
+{
+	/// <summary>
+	/// Unit tests for the StaticEventHandlerValue class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: StaticEventHandlerValueTests.cs,v 1.4 2006/04/09 07:24:51 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class StaticEventHandlerValueTests
+    {
+        [Test]
+        public void Instantiation () 
+        {
+            PingSource source = new PingSource ();
+            StaticEventHandlerValue wirer
+                = new StaticEventHandlerValue (source, "OnPing");
+            Assert.IsNotNull (wirer.Source);
+            Assert.AreEqual ("OnPing", wirer.MethodName);
+            Assert.IsTrue (wirer.ToString ().IndexOf (wirer.MethodName) > 0);
+        }
+
+        [Test]
+        public void Wire () 
+        {
+            PingSource source = new PingSource ();
+            StaticEventHandlerValue wirer
+                = new StaticEventHandlerValue (source, "OnPing");
+            wirer.EventName = "Ping";
+            Type sink = typeof (StaticPingListener);
+            wirer.Wire (source, sink);
+            source.OnPing ();
+            Assert.IsTrue (StaticPingListener.GotPing, "The event handler did not get notified when the event was raised.");
+            Assert.AreEqual (1, StaticPingListener.PingCount, "The event handler was not get notified exactly once when the event was raised exactly once.");
+        }
+
+        [Test]
+        [ExpectedException (typeof (FatalObjectException))]
+        public void WireWithInstanceHandler () 
+        {
+            StaticEventHandlerValue wirer = new StaticEventHandlerValue ();
+            wirer.EventName = "Ping";
+            wirer.MethodName = "OnPing";
+            PingSource source = new PingSource ();
+            wirer.Wire (source, new PingListener ());
+        }
+	}
+
+    internal class StaticPingListener {
+
+        public static bool OnPing (object sender, PingEventArgs e) {
+            _ping = true;
+            ++_pingCount;
+            return true;
+        }
+
+        public static bool GotPing {
+            get {
+                return _ping;
+            }
+        }
+
+        public static int PingCount {
+            get {
+                return _pingCount;
+            }
+        }
+
+        protected static bool _ping;
+        protected static int _pingCount;
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/TestEventHandler.cs b/test/Spring/Spring.Core.Tests/Objects/TestEventHandler.cs
new file mode 100644
index 00000000..c5d3452b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/TestEventHandler.cs
@@ -0,0 +1,46 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Objects {
+
+    internal class TestEventHandler 
+    {
+        public virtual void HandleEvent (object sender, EventArgs e) 
+        {
+            _eventWasHandled = true;
+        }
+
+        public virtual bool EventWasHandled 
+        {
+            get 
+            {
+                return _eventWasHandled;
+            }
+        }
+
+        protected bool _eventWasHandled;
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/TestGenericObject.cs b/test/Spring/Spring.Core.Tests/Objects/TestGenericObject.cs
new file mode 100644
index 00000000..a0376d4a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/TestGenericObject.cs
@@ -0,0 +1,109 @@
+#if NET_2_0
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections.Generic;
+
+#endregion
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Simple test object used for testing generic objects.
+	/// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: TestGenericObject.cs,v 1.2 2006/04/09 07:24:50 markpollack Exp $</version>
+	public class TestGenericObject<T,U>
+	{
+        #region Fields
+
+        private int _id = 0;
+        private string _name = string.Empty;
+        private IList<int> _someGenericList = new List<int>();
+        private IDictionary<string, int> _someGenericDictionary = new Dictionary<string, int>();
+
+        #endregion
+
+		#region Properties
+
+	    public int ID
+	    {
+	        get { return _id; }
+            set { _id = value; }
+	    }
+
+		public string Name
+		{
+			get { return _name; }
+			set { this._name = value; }
+		}
+
+		public IList<int> SomeGenericList
+		{
+			get { return _someGenericList; }
+			set { this._someGenericList = value; }
+		}
+
+		public IDictionary<string,int> SomeGenericDictionary
+		{
+			get { return _someGenericDictionary; }
+			set { this._someGenericDictionary = value; }
+		}
+
+		#endregion
+
+		#region Constructor (s) / Destructor
+
+		public TestGenericObject()
+		{
+		}
+
+		public TestGenericObject(int id)
+		{
+			this._id = id;
+		}
+
+        public TestGenericObject(int id, string name)
+        {
+            this._id = id;
+            this._name = name;
+        }
+
+		#endregion
+
+        #region Methods
+
+        public static List<V> CreateList<V>()
+        {
+            return new List<V>();
+        }
+
+        public TestGenericObject<V,W> CreateInstance<V,W>()
+        {
+            return new TestGenericObject<V,W>();
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/TestObject.cs b/test/Spring/Spring.Core.Tests/Objects/TestObject.cs
new file mode 100644
index 00000000..2336b089
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/TestObject.cs
@@ -0,0 +1,629 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using Spring.Collections;
+using Spring.Context;
+using Spring.Objects.Factory;
+
+#endregion
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Simple test object used for testing object factories, AOP framework etc.
+	/// </summary>
+	/// <author>Rod Johnson</author>
+	/// <author>Mark Pollack (.NET)</author>
+    public class TestObject : MarshalByRefObject, ITestObject, IObjectFactoryAware, IComparable, IOther, IApplicationContextAware, IObjectNameAware, IInitializingObject
+	{
+		#region Event testing members
+
+		public event EventHandler Click;
+
+		public static event EventHandler StaticClick;
+
+		/// <summary>
+		/// Public method to programmatically raise the <event>Click</event> event
+		/// while testing.
+		/// </summary>
+		public void OnClick()
+		{
+			if (Click != null)
+			{
+				Click(this, EventArgs.Empty);
+			}
+		}
+
+		/// <summary>
+		/// Public method to programmatically raise the <b>static</b>
+		/// <event>Click</event> event while testing.
+		/// </summary>
+		public static void OnStaticClick()
+		{
+			if (TestObject.StaticClick != null)
+			{
+				TestObject.StaticClick(typeof (TestObject), EventArgs.Empty);
+			}
+		}
+
+		#endregion
+
+		#region Properties
+
+	    public int ObjectNumber
+	    {
+	        get { return objectNumber; }
+            set { objectNumber = value; }
+	    }
+
+        // for use in ObjectWrapperTests.SetPropertyValuesFailsWhenSettingReadOnlyProperty
+        public int ReadOnlyObjectNumber
+        {
+            get { return objectNumber; }
+        }
+
+	    public IndexedTestObject NestedIndexedObject
+		{
+			get { return nestedIndexedObject; }
+			set { nestedIndexedObject = value; }
+		}
+
+		/// <summary>
+		/// Public Enumeration Property for FileMode.
+		/// </summary>
+		public FileMode FileMode
+		{
+			get { return FileModeEnum; }
+			set { FileModeEnum = value; }
+		}
+
+		public IObjectFactory ObjectFactory
+		{
+			get { return objectFactory; }
+			set { objectFactory = value; }
+		}
+
+		public CultureInfo MyCulture
+		{
+			get { return myCulture; }
+			set { myCulture = value; }
+		}
+
+		public string Touchy
+		{
+			get { return touchy; }
+			set
+			{
+				if (value.IndexOf('.') != - 1)
+				{
+					throw new Exception("Can't contain a .");
+				}
+				if (value.IndexOf(',') != - 1)
+				{
+					throw new FormatException("Number format exception: contains a ,");
+				}
+				this.touchy = value;
+			}
+		}
+
+		public bool PostProcessed
+		{
+			get { return postProcessed; }
+
+			set { this.postProcessed = value; }
+		}
+
+		public string Name
+		{
+			get { return name; }
+			set { this.name = value; }
+		}
+
+		public string Nickname
+		{
+			get { return nickname; }
+			set { this.nickname = value; }
+		}
+
+		public virtual int Age
+		{
+			get { return age; }
+
+			set { this.age = value; }
+		}
+
+		public virtual DateTime Date
+		{
+			get { return date; }
+
+			set { this.date = value; }
+		}
+
+		public virtual Single MyFloat
+		{
+			get { return myFloat; }
+			set { this.myFloat = value; }
+		}
+
+		public virtual ITestObject Spouse
+		{
+			get { return spouse; }
+			set { this.spouse = value; }
+		}
+
+		public virtual ITestObject Sibling
+		{
+			get { return sibling; }
+			set { this.sibling = value; }
+		}
+
+		public virtual INestedTestObject Doctor
+		{
+			get { return doctor; }
+			set { this.doctor = value; }
+		}
+
+		public virtual INestedTestObject Lawyer
+		{
+			get { return lawyer; }
+			set { this.lawyer = value; }
+		}
+
+		public virtual NestedTestObject RealLawyer
+		{
+			get { return myRealLawyer; }
+			set { this.myRealLawyer = value; }
+		}
+
+		/// <summary>
+		/// A collection of friends.
+		/// </summary>
+		public virtual ICollection Friends
+		{
+			get { return friends; }
+			set { this.friends = value; }
+		}
+
+		/// <summary>
+		/// A read-only collection of pets.
+		/// </summary>
+		public virtual ICollection Pets
+		{
+			get { return pets; }
+		}
+
+		public virtual TestObjectList TypedFriends
+		{
+			get { return typedFriends; }
+			set { typedFriends = value; }
+		}
+
+		/// <summary>
+		/// A read-only map of periodic table values.
+		/// </summary>
+		public virtual IDictionary PeriodicTable
+		{
+			get { return periodicTable; }
+		}
+
+		/// <summary>
+		/// A read-only set of computer names
+		/// </summary>
+		public virtual ISet Computers
+		{
+			get { return computers; }
+		}
+
+		public virtual Set SomeSet
+		{
+			get { return someSet; }
+			set { this.someSet = value; }
+		}
+
+		public virtual string[] Hats
+		{
+			get { return hats; }
+			set { hats = value; }
+		}
+
+		public virtual IDictionary SomeMap
+		{
+			get { return someMap; }
+			set { this.someMap = value; }
+		}
+
+		protected virtual string HappyPlace
+		{
+			get { return _happyPlace; }
+			set { _happyPlace = value; }
+		}
+
+		// used in reflective tests, so don't remove this property...
+		private string[] SamsoniteSuitcase
+		{
+			get { return _samsoniteSuitcase; }
+			set { _samsoniteSuitcase = value; }
+		}
+
+		public Type ClassProperty
+		{
+			get { return classProperty; }
+			set { classProperty = value; }
+		}
+
+	    public IApplicationContext ApplicationContext
+	    {
+	        get { return applicationContext; }
+	        set { applicationContext = value; }
+	    }
+
+	    public string ObjectName
+	    {
+            get { return objectName; }
+            set { objectName = value; }
+	    }
+
+	    public int ExceptionMethodCallCount
+	    {
+	        get { return exceptionMethodCallCount; }
+	    }
+
+	    public bool InitCompleted
+	    {
+	        get { return initCompleted; }
+	        set { initCompleted = value; }
+	    }
+
+	    public Size Size
+	    {
+            get { return size; }
+            set { size = value;}
+	    }
+	    #endregion
+
+		#region Indexers
+
+		public string this[int index]
+		{
+			get
+			{
+				if (index < 0 || index >= favoriteQuotes.Length)
+				{
+					throw new ArgumentException("Index out of range");
+				}
+				return favoriteQuotes[index];
+			}
+			set
+			{
+				if (index < 0 || index >= favoriteQuotes.Length)
+				{
+					throw new ArgumentException("index is out of range.");
+				}
+				favoriteQuotes[index] = value;
+			}
+		}
+
+		#endregion
+
+		#region Fields
+
+	    private int exceptionMethodCallCount;
+        private int objectNumber = 0;
+		public FileMode FileModeEnum;
+		private IObjectFactory objectFactory;
+		private bool postProcessed;
+		private int age;
+		private string name;
+		private string nickname;
+		private ITestObject spouse;
+		private ITestObject sibling;
+		private string touchy;
+		private ICollection friends = new LinkedList();
+		private TestObjectList typedFriends = new TestObjectList();
+		private ICollection pets = new LinkedList();
+		private IDictionary periodicTable = new Hashtable();
+
+		private string[] favoriteQuotes = new string[]
+			{
+				"He who ha-ha ho-ho",
+				"The quick brown fox jumped over the lazy dogs."
+			};
+
+		private Type classProperty;
+		private Set computers = new HybridSet();
+		private Set someSet = new HybridSet();
+		private IDictionary someMap = new Hashtable();
+		private DateTime date = DateTime.Now;
+		private Single myFloat = (float) 0.0;
+		private CultureInfo myCulture = CultureInfo.InvariantCulture;
+		private string[] hats = null;
+		private INestedTestObject doctor = new NestedTestObject();
+		private INestedTestObject lawyer = new NestedTestObject();
+		private NestedTestObject myRealLawyer = new NestedTestObject();
+		private IndexedTestObject nestedIndexedObject;
+		private string _happyPlace = DefaultHappyPlace;
+		private string[] _samsoniteSuitcase = DefaultContentsOfTheSuitcase;
+
+		public const string DefaultHappyPlace = "The_SeaBass_Diner";
+
+		public static readonly string[] DefaultContentsOfTheSuitcase
+			= new string[] {"John Pryor's 'Leaving On A Jet Plane' LP"};
+
+	    private IApplicationContext applicationContext;
+	    private string objectName;
+	    private Size size;
+	    private bool initCompleted;
+
+	    #endregion
+
+		#region Constructor (s) / Destructor
+
+		public TestObject()
+		{
+		}
+
+		public TestObject(string name, int age)
+		{
+			this.name = name;
+			this.age = age;
+		}
+
+		public TestObject(string name, int age, INestedTestObject doctor)
+		{
+			this.name = name;
+			this.age = age;
+			this.doctor = doctor;
+		}
+
+		public TestObject(string name, int age, INestedTestObject doctor, INestedTestObject lawyer)
+		{
+			this.name = name;
+			this.age = age;
+			this.doctor = doctor;
+			this.lawyer = lawyer;
+		}
+
+		public TestObject(ITestObject spouse)
+		{
+			this.spouse = spouse;
+		}
+
+		#endregion
+
+        #region Static Methods
+
+        public static TestObject Create(string name)
+		{
+			return new TestObject(name, 30);
+        }
+
+        #endregion
+
+        #region Methods
+
+        public void AfterPropertiesSet()
+        {
+            initCompleted = true;
+        }
+
+        public void AddComputerName(string name)
+		{
+			if (computers == null)
+			{
+				computers = new HybridSet();
+			}
+			computers.Add(name);
+		}
+
+		public void AddPeriodicElement(string name, string element)
+		{
+			if (periodicTable == null)
+			{
+				periodicTable = new Hashtable();
+			}
+			periodicTable.Add(name, element);
+		}
+
+		public string GetNameWithHonorific(bool isFemale, params string[] lettersAfterName)
+		{
+			StringBuilder buffer = new StringBuilder();
+			buffer.Append(isFemale ? "Ms " : "Mr ");
+			buffer.Append(Name);
+			buffer.Append(" ");
+			foreach (string letters in lettersAfterName)
+			{
+				buffer.Append(letters);
+			}
+			return buffer.ToString();
+		}
+
+		public override bool Equals(object other)
+		{
+			return Equals(this, other);
+		}
+
+		new public static bool Equals(object @this, object other)
+		{
+			if (other == null || !(other is ITestObject))
+			{
+				return false;
+			}
+			ITestObject tb2 = (ITestObject) other;
+			ITestObject tb1 = (ITestObject) @this;
+			if (tb2.Age != tb1.Age)
+			{
+				return false;
+			}
+
+			if ((object) tb1.Name == null)
+			{
+				return (object) tb2.Name == null;
+			}
+
+			if (!tb2.Name.Equals(tb1.Name))
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		public override int GetHashCode()
+		{
+			return (name != null ? name.GetHashCode() : base.GetHashCode());
+		}
+
+		public virtual int CompareTo(object other)
+		{
+			if ((object) this.name != null && other is TestObject)
+			{
+				return String.CompareOrdinal(this.name, ((TestObject) other).name);
+			}
+			else
+			{
+				return 1;
+			}
+		}
+
+		public virtual string GetDescription()
+		{
+			string s = "name=" + name + "; age=" + age + "; touchy=" + touchy;
+			s += ("; spouse={" + (spouse != null ? spouse.Name : null) + "}");
+			return s;
+		}
+
+		public override string ToString()
+		{
+			string s = "name=" + name + "; age=" + age + "; touchy=" + touchy;
+			s += ("; spouse={" + (spouse != null ? spouse.Name : null) + "}");
+			return s;
+		}
+
+		/// <summary>
+		/// Throw the given exception
+		/// </summary>
+		/// <param name="t">An exception to throw.</param>
+		public virtual void Exceptional(Exception t)
+		{
+		    exceptionMethodCallCount++;
+			if (t != null)
+			{
+				throw t;
+			}
+		}
+
+
+	    /// <summary>
+        /// Throw the given exception
+        /// </summary>
+        /// <param name="t">An exception to throw.</param>
+        /// <returns>314 if exception is null</returns>
+        public virtual int ExceptionalWithReturnValue(Exception t)
+        {
+            exceptionMethodCallCount++;
+            if (t != null)
+            {
+                throw t;
+            }
+            return 314;
+        }
+
+		/// <summary>
+		/// Return a reference to the object itself. 'Return this'
+		/// </summary>
+		/// <returns>a reference to the object itse.f</returns>
+		public virtual object ReturnsThis()
+		{
+			return this;
+		}
+
+		#endregion
+
+		#region IOther Implementation
+
+		/// <summary>
+		/// Funny Named method.
+		/// </summary>
+		public virtual void Absquatulate()
+		{
+		}
+
+		#endregion
+	}
+
+	#region Inner Class : TestObjectConverter
+
+	public class TestObjectConverter : TypeConverter
+	{
+		public override bool CanConvertTo(
+			ITypeDescriptorContext context, Type destinationType)
+		{
+			if ((destinationType == typeof (TestObjectConverter))
+				|| (destinationType == typeof (InstanceDescriptor)))
+			{
+				return true;
+			}
+			return base.CanConvertTo(context, destinationType);
+		}
+
+		public override bool CanConvertFrom
+			(ITypeDescriptorContext context, Type sourceType)
+		{
+			if (sourceType == typeof (string))
+			{
+				return true;
+			}
+			return base.CanConvertFrom(context, sourceType);
+		}
+
+		public override object ConvertFrom
+			(ITypeDescriptorContext context, CultureInfo culture, object text_obj)
+		{
+			if (text_obj is string)
+			{
+				string text = (string) text_obj;
+				TestObject tb = new TestObject();
+				string[] split = text.Split(new char[] {'_'});
+				tb.Name = split[0];
+				tb.Age = int.Parse(split[1]);
+				return tb;
+			}
+			return base.ConvertFrom(context, culture, text_obj);
+		}
+
+		public override object ConvertTo(
+			ITypeDescriptorContext context, CultureInfo culture, object param, Type destinationType)
+		{
+			return base.ConvertTo(context, culture, param, destinationType);
+		}
+	}
+
+	#endregion
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/TestObject.resx b/test/Spring/Spring.Core.Tests/Objects/TestObject.resx
new file mode 100644
index 00000000..431d10b4
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/TestObject.resx
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" />
+                            <xsd:attribute name="type" type="xsd:string" />
+                            <xsd:attribute name="mimetype" type="xsd:string" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="ResMimeType">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="Version">
+        <value>1.0.0.0</value>
+    </resheader>
+    <resheader name="Reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="Writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="testObject.Name">
+        <value>Mark</value>
+    </data>
+    <data name="testObject.Age" type="System.Int32, mscorlib">
+        <value>35</value>
+    </data>
+    <data name="">
+        <value>Rick</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/TestObjectDAO.cs b/test/Spring/Spring.Core.Tests/Objects/TestObjectDAO.cs
new file mode 100644
index 00000000..bace79e2
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/TestObjectDAO.cs
@@ -0,0 +1,74 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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.Data;
+
+namespace Spring.Objects
+{
+    /// <summary>
+    /// Test class to help test PropertyPlaceholderConfigurer
+    /// </summary>
+    public class TestObjectDAO
+    {
+        /// <summary>
+        /// Create an instance of TestObjectDAO
+        /// </summary>
+        public TestObjectDAO()
+        {
+        }
+
+
+        private int maxResults = 100;
+
+        private IDbConnection dbConnection;
+
+        /// <summary>
+        /// The database connection property
+        /// </summary>
+        public IDbConnection DbConnection
+        {
+            get
+            {
+                return dbConnection;
+            }
+            set
+            {
+                dbConnection = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Maximum number of results to return in a query page.
+        /// </summary>
+        public int MaxResults
+        {
+            get
+            {
+                return maxResults;
+            }
+            set
+            {
+                maxResults = value;
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/TestObjectList.cs b/test/Spring/Spring.Core.Tests/Objects/TestObjectList.cs
new file mode 100644
index 00000000..953f15e1
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/TestObjectList.cs
@@ -0,0 +1,556 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+#endregion
+
+namespace Spring.Objects
+{
+	public interface ITestObjectCollection
+	{
+		int Count { get; }
+
+		bool IsSynchronized { get; }
+
+		object SyncRoot { get; }
+
+		void CopyTo(TestObject[] array, int arrayIndex);
+
+		ITestObjectEnumerator GetEnumerator();
+	}
+
+	public interface ITestObjectList : ITestObjectCollection
+	{
+		bool IsFixedSize { get; }
+
+		bool IsReadOnly { get; }
+
+		TestObject this[int index] { get; set; }
+
+		int Add(TestObject value);
+
+		void Clear();
+
+		bool Contains(TestObject value);
+
+		int IndexOf(TestObject value);
+
+		void Insert(int index, TestObject value);
+
+		void Remove(TestObject value);
+
+		void RemoveAt(int index);
+	}
+
+	public interface ITestObjectEnumerator
+	{
+		TestObject Current { get; }
+
+		bool MoveNext();
+
+		void Reset();
+	}
+
+	[Serializable]
+	public class TestObjectList : ITestObjectList, IList, ICloneable
+	{
+		private const int _defaultCapacity = 16;
+
+		private TestObject[] _array = null;
+		private int _count = 0;
+
+		[NonSerialized] private int _version = 0;
+
+		public TestObjectList()
+		{
+			this._array = new TestObject[_defaultCapacity];
+		}
+
+		public TestObjectList(int capacity)
+		{
+			if (capacity < 0)
+				throw new ArgumentOutOfRangeException("capacity",
+				                                      capacity, "Argument cannot be negative.");
+
+			this._array = new TestObject[capacity];
+		}
+
+		public TestObjectList(TestObjectList collection)
+		{
+			if (collection == null)
+				throw new ArgumentNullException("collection");
+
+			this._array = new TestObject[collection.Count];
+			AddRange(collection);
+		}
+
+		public TestObjectList(TestObject[] array)
+		{
+			if (array == null)
+				throw new ArgumentNullException("array");
+
+			this._array = new TestObject[array.Length];
+			AddRange(array);
+		}
+
+		protected virtual TestObject[] InnerArray
+		{
+			get { return this._array; }
+		}
+
+		public virtual int Capacity
+		{
+			get { return this._array.Length; }
+			set
+			{
+				if (value == this._array.Length) return;
+
+				if (value < this._count)
+					throw new ArgumentOutOfRangeException("Capacity",
+					                                      value, "Value cannot be less than Count.");
+
+				if (value == 0)
+				{
+					this._array = new TestObject[_defaultCapacity];
+					return;
+				}
+
+				TestObject[] newArray = new TestObject[value];
+				Array.Copy(this._array, newArray, this._count);
+				this._array = newArray;
+			}
+		}
+
+		public virtual int Count
+		{
+			get { return this._count; }
+		}
+
+		public virtual bool IsFixedSize
+		{
+			get { return false; }
+		}
+
+		public virtual bool IsReadOnly
+		{
+			get { return false; }
+		}
+
+		public virtual bool IsSynchronized
+		{
+			get { return false; }
+		}
+
+		public virtual bool IsUnique
+		{
+			get { return false; }
+		}
+
+		public virtual TestObject this[int index]
+		{
+			get
+			{
+				ValidateIndex(index);
+				return this._array[index];
+			}
+			set
+			{
+				ValidateIndex(index);
+				++this._version;
+				this._array[index] = value;
+			}
+		}
+
+		object IList.this[int index]
+		{
+			get { return this[index]; }
+			set { this[index] = (TestObject) value; }
+		}
+
+		public virtual object SyncRoot
+		{
+			get { return this; }
+		}
+
+		public virtual int Add(TestObject value)
+		{
+			if (this._count == this._array.Length)
+				EnsureCapacity(this._count + 1);
+
+			++this._version;
+			this._array[this._count] = value;
+			return this._count++;
+		}
+
+		int IList.Add(object value)
+		{
+			return Add((TestObject) value);
+		}
+
+		public virtual void AddRange(TestObjectList collection)
+		{
+			if (collection == null)
+				throw new ArgumentNullException("collection");
+
+			if (collection.Count == 0) return;
+			if (this._count + collection.Count > this._array.Length)
+				EnsureCapacity(this._count + collection.Count);
+
+			++this._version;
+			Array.Copy(collection.InnerArray, 0,
+			           this._array, this._count, collection.Count);
+			this._count += collection.Count;
+		}
+
+		public virtual void AddRange(TestObject[] array)
+		{
+			if (array == null)
+				throw new ArgumentNullException("array");
+
+			if (array.Length == 0) return;
+			if (this._count + array.Length > this._array.Length)
+				EnsureCapacity(this._count + array.Length);
+
+			++this._version;
+			Array.Copy(array, 0, this._array, this._count, array.Length);
+			this._count += array.Length;
+		}
+
+		public virtual int BinarySearch(TestObject value)
+		{
+			return Array.BinarySearch(this._array, 0, this._count, value);
+		}
+
+		public virtual void Clear()
+		{
+			if (this._count == 0) return;
+
+			++this._version;
+			Array.Clear(this._array, 0, this._count);
+			this._count = 0;
+		}
+
+		public virtual object Clone()
+		{
+			TestObjectList collection = new TestObjectList(this._count);
+
+			Array.Copy(this._array, 0, collection._array, 0, this._count);
+			collection._count = this._count;
+			collection._version = this._version;
+
+			return collection;
+		}
+
+		public bool Contains(TestObject value)
+		{
+			return (IndexOf(value) >= 0);
+		}
+
+		bool IList.Contains(object value)
+		{
+			return Contains((TestObject) value);
+		}
+
+		public virtual void CopyTo(TestObject[] array)
+		{
+			CheckTargetArray(array, 0);
+			Array.Copy(this._array, array, this._count);
+		}
+
+		public virtual void CopyTo(TestObject[] array, int arrayIndex)
+		{
+			CheckTargetArray(array, arrayIndex);
+			Array.Copy(this._array, 0, array, arrayIndex, this._count);
+		}
+
+		void ICollection.CopyTo(Array array, int arrayIndex)
+		{
+			CheckTargetArray(array, arrayIndex);
+			CopyTo((TestObject[]) array, arrayIndex);
+		}
+
+		public virtual ITestObjectEnumerator GetEnumerator()
+		{
+			return new Enumerator(this);
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return (IEnumerator) GetEnumerator();
+		}
+
+		public virtual int IndexOf(TestObject value)
+		{
+			return Array.IndexOf(this._array, value, 0, this._count);
+		}
+
+		int IList.IndexOf(object value)
+		{
+			return IndexOf((TestObject) value);
+		}
+
+		public virtual void Insert(int index, TestObject value)
+		{
+			if (index < 0)
+				throw new ArgumentOutOfRangeException("index",
+				                                      index, "Argument cannot be negative.");
+
+			if (index > this._count)
+				throw new ArgumentOutOfRangeException("index",
+				                                      index, "Argument cannot exceed Count.");
+
+			if (this._count == this._array.Length)
+				EnsureCapacity(this._count + 1);
+
+			++this._version;
+			if (index < this._count)
+				Array.Copy(this._array, index,
+				           this._array, index + 1, this._count - index);
+
+			this._array[index] = value;
+			++this._count;
+		}
+
+		void IList.Insert(int index, object value)
+		{
+			Insert(index, (TestObject) value);
+		}
+
+		public virtual void Remove(TestObject value)
+		{
+			int index = IndexOf(value);
+			if (index >= 0) RemoveAt(index);
+		}
+
+		void IList.Remove(object value)
+		{
+			Remove((TestObject) value);
+		}
+
+		public virtual void RemoveAt(int index)
+		{
+			ValidateIndex(index);
+
+			++this._version;
+			if (index < --this._count)
+				Array.Copy(this._array, index + 1,
+				           this._array, index, this._count - index);
+
+			this._array[this._count] = null;
+		}
+
+		public virtual void RemoveRange(int index, int count)
+		{
+			if (index < 0)
+				throw new ArgumentOutOfRangeException("index",
+				                                      index, "Argument cannot be negative.");
+
+			if (count < 0)
+				throw new ArgumentOutOfRangeException("count",
+				                                      count, "Argument cannot be negative.");
+
+			if (index + count > this._count)
+				throw new ArgumentException(
+					"Arguments denote invalid range of elements.");
+
+			if (count == 0) return;
+
+			++this._version;
+			this._count -= count;
+
+			if (index < this._count)
+				Array.Copy(this._array, index + count,
+				           this._array, index, this._count - index);
+
+			Array.Clear(this._array, this._count, count);
+		}
+
+		public virtual void Reverse()
+		{
+			if (this._count <= 1) return;
+			++this._version;
+			Array.Reverse(this._array, 0, this._count);
+		}
+
+		public virtual void Reverse(int index, int count)
+		{
+			if (index < 0)
+				throw new ArgumentOutOfRangeException("index",
+				                                      index, "Argument cannot be negative.");
+
+			if (count < 0)
+				throw new ArgumentOutOfRangeException("count",
+				                                      count, "Argument cannot be negative.");
+
+			if (index + count > this._count)
+				throw new ArgumentException(
+					"Arguments denote invalid range of elements.");
+
+			if (count <= 1 || this._count <= 1) return;
+			++this._version;
+			Array.Reverse(this._array, index, count);
+		}
+
+		public virtual void Sort()
+		{
+			if (this._count <= 1) return;
+			++this._version;
+			Array.Sort(this._array, 0, this._count);
+		}
+
+		public virtual void Sort(IComparer comparer)
+		{
+			if (this._count <= 1) return;
+			++this._version;
+			Array.Sort(this._array, 0, this._count, comparer);
+		}
+
+		public virtual void Sort(int index, int count, IComparer comparer)
+		{
+			if (index < 0)
+				throw new ArgumentOutOfRangeException("index",
+				                                      index, "Argument cannot be negative.");
+
+			if (count < 0)
+				throw new ArgumentOutOfRangeException("count",
+				                                      count, "Argument cannot be negative.");
+
+			if (index + count > this._count)
+				throw new ArgumentException(
+					"Arguments denote invalid range of elements.");
+
+			if (count <= 1 || this._count <= 1) return;
+			++this._version;
+			Array.Sort(this._array, index, count, comparer);
+		}
+
+		public virtual TestObject[] ToArray()
+		{
+			TestObject[] array = new TestObject[this._count];
+			Array.Copy(this._array, array, this._count);
+			return array;
+		}
+
+		public virtual void TrimToSize()
+		{
+			Capacity = this._count;
+		}
+
+		private void CheckEnumIndex(int index)
+		{
+			if (index < 0 || index >= this._count)
+				throw new InvalidOperationException(
+					"Enumerator is not on a collection element.");
+		}
+
+		private void CheckEnumVersion(int version)
+		{
+			if (version != this._version)
+				throw new InvalidOperationException(
+					"Enumerator invalidated by modification to collection.");
+		}
+
+		private void CheckTargetArray(Array array, int arrayIndex)
+		{
+			if (array == null)
+				throw new ArgumentNullException("array");
+			if (array.Rank > 1)
+				throw new ArgumentException(
+					"Argument cannot be multidimensional.", "array");
+
+			if (arrayIndex < 0)
+				throw new ArgumentOutOfRangeException("arrayIndex",
+				                                      arrayIndex, "Argument cannot be negative.");
+			if (arrayIndex >= array.Length)
+				throw new ArgumentException(
+					"Argument must be less than array length.", "arrayIndex");
+
+			if (this._count > array.Length - arrayIndex)
+				throw new ArgumentException(
+					"Argument section must be large enough for collection.", "array");
+		}
+
+		private void EnsureCapacity(int minimum)
+		{
+			int newCapacity = (this._array.Length == 0 ?
+				_defaultCapacity : this._array.Length*2);
+
+			if (newCapacity < minimum) newCapacity = minimum;
+			Capacity = newCapacity;
+		}
+
+		private void ValidateIndex(int index)
+		{
+			if (index < 0)
+				throw new ArgumentOutOfRangeException("index",
+				                                      index, "Argument cannot be negative.");
+
+			if (index >= this._count)
+				throw new ArgumentOutOfRangeException("index",
+				                                      index, "Argument must be less than Count.");
+		}
+
+		[Serializable]
+		private sealed class Enumerator : ITestObjectEnumerator, IEnumerator
+		{
+			private readonly TestObjectList _collection;
+			private readonly int _version;
+			private int _index;
+
+			internal Enumerator(TestObjectList collection)
+			{
+				this._collection = collection;
+				this._version = collection._version;
+				this._index = -1;
+			}
+
+			public TestObject Current
+			{
+				get
+				{
+					this._collection.CheckEnumIndex(this._index);
+					this._collection.CheckEnumVersion(this._version);
+					return this._collection[this._index];
+				}
+			}
+
+			object IEnumerator.Current
+			{
+				get { return Current; }
+			}
+
+			public bool MoveNext()
+			{
+				this._collection.CheckEnumVersion(this._version);
+				return (++this._index < this._collection.Count);
+			}
+
+			public void Reset()
+			{
+				this._collection.CheckEnumVersion(this._version);
+				this._index = -1;
+			}
+		}
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/TypeMismatchExceptionTests.cs b/test/Spring/Spring.Core.Tests/Objects/TypeMismatchExceptionTests.cs
new file mode 100644
index 00000000..40044198
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/TypeMismatchExceptionTests.cs
@@ -0,0 +1,57 @@
+#region License
+
+/*
+ * Copyright 2004 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 NUnit.Framework;
+using Spring.Core;
+
+namespace Spring.Objects
+{
+	/// <summary>
+	/// Unit tests for the TypeMismatchException class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: TypeMismatchExceptionTests.cs,v 1.4 2007/07/31 00:09:24 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class TypeMismatchExceptionTests
+    {
+		[Test]
+		public void InstantiationSupplyingPropertyChangeArgsType()
+		{
+			TypeMismatchException ex = new TypeMismatchException(new PropertyChangeEventArgs("Doctor", new NestedTestObject("Foo"), new TestObject("Hershey", 12)), typeof (INestedTestObject));
+			Assert.AreEqual("typeMismatch", ex.ErrorCode);
+		}
+
+		[Test]
+		public void InstantiationSupplyingPropertyChangeArgsTypeAndRootException()
+		{
+			TypeMismatchException ex = new TypeMismatchException(new PropertyChangeEventArgs("Doctor", new NestedTestObject("Foo"), new TestObject("Hershey", 12)), typeof (INestedTestObject), null);
+			Assert.AreEqual("typeMismatch", ex.ErrorCode);
+		}
+
+		[Test]
+		public void InstantiationSupplyingNullPropertyChangeArgsAndNullType()
+		{
+			TypeMismatchException ex = new TypeMismatchException(null, null, null);
+			Assert.AreEqual("typeMismatch", ex.ErrorCode);
+		}
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Objects/ValidatorTestObject.cs b/test/Spring/Spring.Core.Tests/Objects/ValidatorTestObject.cs
new file mode 100644
index 00000000..e9f2620b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Objects/ValidatorTestObject.cs
@@ -0,0 +1,52 @@
+using System;
+
+namespace Spring.Objects
+
+{
+	/// <summary>
+	/// Test class used for Validator tests.
+	/// </summary>
+	/// <author>Goran Milosavljevic</author>
+	public class Contact
+	{
+		private String m_name;
+		private int m_age;
+		private int m_loan;
+		private string m_creditcard;
+
+		public Contact()
+		{
+		}
+
+		public Contact(string name, int age, int loan)
+		{
+			this.m_name = name;
+			this.m_age = age;
+			this.m_loan = loan;
+		}
+
+		public string Creditcard
+		{
+			get { return m_creditcard; }
+			set { m_creditcard = value; }
+		}
+
+		public int Age
+		{
+			get { return m_age; }
+			set { m_age = value; }
+		}
+
+		public int Loan
+		{
+			get { return m_loan; }
+			set { m_loan = value; }
+		}
+
+		public string Name
+		{
+			get { return m_name; }
+			set { m_name = value; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Pool/Support/SimplePoolTest.cs b/test/Spring/Spring.Core.Tests/Pool/Support/SimplePoolTest.cs
new file mode 100644
index 00000000..0a4a6522
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Pool/Support/SimplePoolTest.cs
@@ -0,0 +1,442 @@
+#region License
+
+/*
+* Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+using System.Threading;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Pool.Support;
+using Spring.Threading;
+
+#endregion
+
+namespace Spring.Pool
+{
+	#region Inner Class : Helper
+
+	public class Helper
+	{
+		private Latch latch;
+		private IObjectPool objectPool;
+		private ISync sync;
+
+		public bool gone = false;
+		public object gotFromPool;
+
+		public Helper(ISync sync, Latch latch)
+		{
+			Init(latch, sync, null);
+		}
+
+		public Helper(Latch latch, ISync sync, IObjectPool objectPool)
+		{
+			Init(latch, sync, objectPool);
+		}
+
+		public void Init(Latch latch, ISync sync, IObjectPool objectPool)
+		{
+			this.sync = sync;
+			this.latch = latch;
+			this.objectPool = objectPool;
+		}
+
+		public void Go()
+		{
+			latch.Release();
+			sync.Acquire();
+			gone = true;
+			sync.Release();
+		}
+
+		public void UsePool()
+		{
+			gotFromPool = objectPool.BorrowObject();
+			latch.Release();
+		}
+	}
+
+	#endregion
+
+	/// <summary>
+	/// Unit tests for the SimplePool class.
+	/// </summary>
+	[TestFixture]
+	public sealed class SimplePoolTests
+	{
+		#region Inner Class : MyFactory (IPoolableObjectFactory implementation)
+
+		private sealed class MyFactory : IPoolableObjectFactory
+		{
+			public object MakeObject()
+			{
+				return new object();
+			}
+
+			public void DestroyObject(object o)
+			{
+			}
+
+			public bool ValidateObject(object o)
+			{
+				return true;
+			}
+
+			public void ActivateObject(object o)
+			{
+			}
+
+			public void PassivateObject(object o)
+			{
+			}
+		}
+
+		#endregion
+
+		private DynamicMock mock;
+		private IPoolableObjectFactory factory;
+		private SimplePool pool;
+		private bool usingMock;
+
+		[SetUp]
+		public void SetUp()
+		{
+			mock = new DynamicMock(typeof (IPoolableObjectFactory));
+			mock.ExpectAndReturn("MakeObject", new object());
+			mock.ExpectAndReturn("ValidateObject", true);
+			mock.Strict = false;
+			factory = (IPoolableObjectFactory) mock.Object;
+			usingMock = true;
+			pool = new SimplePool(factory, 1);
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			if (usingMock)
+			{
+				mock.Verify();
+			}
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void InstantiateWithNullPoolableObjectFactory()
+		{
+			usingMock = false;
+			new SimplePool(null, 10);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void InstantiateSpecifyingZeroPooledItems()
+		{
+			usingMock = false;
+			new SimplePool(factory, 0);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void InstantiateSpecifyingNegativePooledItems()
+		{
+			usingMock = false;
+			new SimplePool(factory, -10000);
+		}
+
+		[Test]
+		public void ActivateOnObjectOnBorrow()
+		{
+			mock.Expect("ActivateObject");
+			Assert.AreEqual(0, pool.NumActive, "active wrong");
+			Assert.AreEqual(1, pool.NumIdle, "idle wrong");
+			pool.BorrowObject();
+			Assert.AreEqual(1, pool.NumActive, "active wrong");
+			Assert.AreEqual(0, pool.NumIdle, "idle wrong");
+		}
+
+		[Test]
+		public void PassivateBusyObjectsBeforeClose()
+		{
+			object o = pool.BorrowObject();
+			mock.Expect("PassivateObject", o);
+			pool.Close();
+		}
+
+		[Test, ExpectedException(typeof (PoolException))]
+		public void NoMoreUsableAfterClose()
+		{
+			PassivateBusyObjectsBeforeClose();
+			pool.BorrowObject();
+		}
+
+		[Test, ExpectedException(typeof (PoolException))]
+		public void ThrowsExceptionWhenOutOfItemsBecauseFailedValidation()
+		{
+			mock = new DynamicMock(typeof (IPoolableObjectFactory));
+			mock.ExpectAndReturn("MakeObject", new object());
+			mock.ExpectAndReturn("ValidateObject", false);
+			factory = (IPoolableObjectFactory) mock.Object;
+			pool = new SimplePool(factory, 1);
+			pool.BorrowObject();
+		}
+
+		[Test]
+		public void PassivateObjectOnReturn()
+		{
+			mock.Expect("PassivateObject");
+			pool.ReturnObject(pool.BorrowObject());
+		}
+
+		[Test]
+		public void DestroyObjectOnClose()
+		{
+			mock.Expect("DestroyObject");
+			pool.BorrowObject();
+			pool.Close();
+		}
+
+		[Test]
+		public void WaitOnBorrowWhenExausted()
+		{
+			usingMock = false;
+			int n = 100;
+			object[] objects = new object[n];
+			pool = new SimplePool(new MyFactory(), n);
+			for (int i = 0; i < n; i++)
+			{
+				objects[i] = pool.BorrowObject();
+			}
+			Latch latch = new Latch();
+			ISync sync = new Latch();
+			Helper helper = new Helper(latch, sync, pool);
+			Thread thread = new Thread(new ThreadStart(helper.UsePool));
+			thread.Start();
+			Assert.AreEqual(n, pool.NumActive);
+			Assert.AreEqual(0, pool.NumIdle);
+			object released = objects[n - 1];
+			pool.ReturnObject(released);
+			latch.Acquire();
+			Assert.AreEqual(n, pool.NumActive);
+			Assert.AreEqual(0, pool.NumIdle);
+			Assert.IsNotNull(helper.gotFromPool, "helper did not get from pool");
+			Assert.AreSame(released, helper.gotFromPool, "got unexpected object");
+		}
+	}
+
+	[TestFixture]
+	public sealed class StessSimplePool
+	{
+		public sealed class QueryPerformance
+		{
+			public interface IQueried
+			{
+				void Run();
+			}
+
+			[DllImport("KERNEL32")]
+			private static extern bool QueryPerformanceCounter(ref long lpPerformanceCount);
+
+			[DllImport("KERNEL32")]
+			private static extern bool QueryPerformanceFrequency(ref long lpFrequency);
+
+			public static float Query(IQueried queried)
+			{
+				long frequency = 0;
+				QueryPerformanceFrequency(ref frequency);
+
+				long startTime = 0;
+				QueryPerformanceCounter(ref startTime);
+
+				queried.Run();
+
+				long endTime = 0;
+				QueryPerformanceCounter(ref endTime);
+
+				float elapsed = (float) (endTime - startTime)/frequency;
+				//            Console.WriteLine("{0:0000.000}ms ", elapsed);
+				//            Console.ReadLine();
+				return elapsed;
+			}
+		}
+
+		private sealed class Pooled : IPoolableObjectFactory, QueryPerformance.IQueried
+		{
+			private int creationTime;
+			private int executionTime;
+
+			public Pooled(int creationTime, int executionTime)
+			{
+				this.creationTime = creationTime;
+				this.executionTime = executionTime;
+				Thread.Sleep(creationTime);
+			}
+
+			public void Run()
+			{
+				Thread.Sleep(executionTime);
+			}
+
+			public object MakeObject()
+			{
+				return new Pooled(creationTime, executionTime);
+			}
+
+			public void DestroyObject(object o)
+			{
+			}
+
+			public bool ValidateObject(object o)
+			{
+				return true;
+			}
+
+			public void ActivateObject(object o)
+			{
+			}
+
+			public void PassivateObject(object o)
+			{
+			}
+		}
+
+		private sealed class Client : QueryPerformance.IQueried
+		{
+			private int repeat;
+			private static int nRun = 0, created = 0;
+			private int id;
+			private ISync run;
+			private SimplePool pool;
+			public bool runned;
+
+			public Client(int id, ISync run, SimplePool pool, int repeat)
+			{
+				this.run = run;
+				this.pool = pool;
+				this.id = id;
+				lock (this.GetType())
+				{
+					created++;
+					//Console.Out.WriteLine("#{0} created (created/run: {1}/{2})...", id, created, nRun);
+				}
+				this.repeat = repeat;
+			}
+
+			public void Run()
+			{
+				lock (this.GetType())
+				{
+					//Console.Out.WriteLine("#{0} running (created/run: {1}/{2})...", id, created, nRun);
+					nRun++;
+				}
+				for (int i = 0; i < repeat; i++)
+				{
+					QueryPerformance.IQueried queried = pool.BorrowObject() as QueryPerformance.IQueried;
+					queried.Run();
+					pool.ReturnObject(queried);
+					runned = true;
+				}
+				run.Release();
+			}
+		}
+
+		private sealed class Job : QueryPerformance.IQueried
+		{
+			private int repeat;
+			private IList clients = new ArrayList();
+			private int poolSize;
+			private int creationTime;
+			private int clientSize;
+			private ISync run;
+			private int executionTime;
+
+			public Job(int size, int creationTime, int clientSize, ISync start, int executionTime, int repeat)
+			{
+				this.poolSize = size;
+				this.creationTime = creationTime;
+				this.clientSize = clientSize;
+				this.run = start;
+				this.executionTime = executionTime;
+				this.repeat = repeat;
+			}
+
+			public void Run()
+			{
+				SimplePool pool = new SimplePool(new Pooled(creationTime, executionTime), poolSize);
+				for (int i = 0; i < clientSize; i++)
+				{
+					Client client = new Client(i, run, pool, repeat);
+					Thread thread = new Thread(new ThreadStart(client.Run));
+					thread.Start();
+					clients.Add(client);
+				}
+				run.Acquire();
+
+				foreach (Client client in clients)
+					Assert.IsTrue(client.runned, "\nclient " + clients.IndexOf(client) + " not runned");
+			}
+
+			public static string Do(int poolSize, int clientSize, int executionTime, int repeat, int creationTime)
+			{
+				ISync start = new Spring.Threading.Semaphore(-(clientSize - 1));
+				Job job = new Job(poolSize, creationTime, clientSize, start, executionTime, repeat);
+				float elapsed = QueryPerformance.Query(job);
+				return String.Format("{0}\t{1}\t{2}\t{3}\t{4}\t{5:0.000} ",
+				                     creationTime, executionTime, poolSize, clientSize, repeat, elapsed);
+			}
+		}
+
+		[Test, Ignore("a try for a stress")]
+		public void ScalingAgainstIncreasingNumberOfThreads()
+		{
+			Console.Out.WriteLine("creationTime\texecutionTime\tpoolSize\tclientSize\trepeat\telapsed");
+
+			Console.Out.WriteLine("ramp pools size");
+			Console.Out.WriteLine(Job.Do(10, 1000, 100, 1, 1));
+			Console.Out.WriteLine(Job.Do(100, 1000, 100, 1, 1));
+			Console.Out.WriteLine(Job.Do(200, 1000, 100, 1, 1));
+			Console.Out.WriteLine(Job.Do(500, 1000, 100, 1, 1));
+			Console.Out.WriteLine(Job.Do(1000, 1000, 100, 1, 1));
+
+			Console.Out.WriteLine("ramp client size");
+			Console.Out.WriteLine(Job.Do(10, 10, 100, 1, 1));
+			Console.Out.WriteLine(Job.Do(10, 100, 100, 1, 1));
+			Console.Out.WriteLine(Job.Do(10, 200, 100, 1, 1));
+			Console.Out.WriteLine(Job.Do(10, 1000, 100, 1, 1));
+
+			Console.Out.WriteLine("ramp load");
+			Console.Out.WriteLine(Job.Do(10, 10, 100, 1, 1));
+			Console.Out.WriteLine(Job.Do(10, 10, 100, 5, 1));
+			Console.Out.WriteLine(Job.Do(10, 10, 100, 10, 1));
+			Console.Out.WriteLine(Job.Do(10, 10, 100, 50, 1));
+			Console.Out.WriteLine(Job.Do(10, 10, 100, 100, 1));
+
+			Console.Out.WriteLine("ramp client size - 2");
+			Console.Out.WriteLine(Job.Do(10, 1, 100, 1, 1));
+			Console.Out.WriteLine(Job.Do(10, 5, 100, 5, 1));
+			Console.Out.WriteLine(Job.Do(10, 10, 100, 10, 1));
+			Console.Out.WriteLine(Job.Do(10, 50, 100, 50, 1));
+			Console.Out.WriteLine(Job.Do(10, 100, 100, 100, 1));
+			Console.Out.WriteLine(Job.Do(10, 1000, 100, 100, 1));
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Proxy/AbstractProxyTypeBuilderTests.cs b/test/Spring/Spring.Core.Tests/Proxy/AbstractProxyTypeBuilderTests.cs
new file mode 100644
index 00000000..33bd0487
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Proxy/AbstractProxyTypeBuilderTests.cs
@@ -0,0 +1,945 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Net;
+using System.Security.Permissions;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Collections;
+using System.Diagnostics;
+using System.Web.Services;
+using System.Runtime.InteropServices;
+
+using NUnit.Framework;
+
+using Spring.Objects;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Proxy
+{
+    /// <summary>
+    /// A base set of unit tests for the various AbstractProxyTypeBuilder subclasses.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: AbstractProxyTypeBuilderTests.cs,v 1.21 2007/12/05 00:28:39 bbaia Exp $</version>
+    public abstract class AbstractProxyTypeBuilderTests
+    {
+        [Test]
+        public void GeneratesProxyNameIfNoneExplicitlySupplied()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            Assert.IsNotNull(builder.Name);
+        }
+
+        [Test]
+        public void DoesNotGenerateProxyNameIfOneIsExplicitlySupplied()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.Name = "Bing";
+            Assert.AreEqual("Bing", builder.Name);
+        }
+
+        [Test]
+        public void AppliesAttributeToType()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(MarkerClass);
+            builder.TypeAttributes = new Attribute[] { new MarkerAttribute() };
+
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            object[] atts = proxy.GetCustomAttributes(false);
+            Assert.IsNotNull(atts, "Should have had 1 custom attribute applied to the generated proxy type.");
+            Assert.AreEqual(1, atts.Length, "Should have had 1 custom attribute applied to the generated proxy type.");
+            Assert.AreEqual(typeof(MarkerAttribute), atts[0].GetType(), "Wrong System.Type of Attribute applied to the generated proxy type.");
+        }
+
+        [Test]
+        public void AppliesStarredMemberAttributesToAllMethods()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(TargetObjectTest);
+            IDictionary atts = new Hashtable();
+            string methodPrefix = typeof(ITargetObjectTest).FullName + ".";
+            atts.Add("*", new Attribute[] { new MarkerAttribute() });
+            builder.MemberAttributes = atts;
+            Type proxy = builder.BuildProxyType();
+            object foo = Activator.CreateInstance(proxy);
+
+            Type fooType = foo.GetType();
+            MethodInfo method = ReflectionUtils.GetMethod(fooType, methodPrefix + "InterfaceMethodWithArguments", new Type[] { typeof(string) });
+            object[] appliedAttributes = method.GetCustomAttributes(false);
+            Assert.AreEqual(1, appliedAttributes.Length,
+                "Custom attribute not applied to member method.");
+            method = ReflectionUtils.GetMethod(fooType, methodPrefix + "InterfaceVirtualMethodWithNoArguments", Type.EmptyTypes);
+            appliedAttributes = method.GetCustomAttributes(false);
+            Assert.AreEqual(1, appliedAttributes.Length,
+                "Custom attribute not applied to member method.");
+        }
+
+        [Test]
+        public void AppliesSpecificMemberAttributesToSpecificMethodOnly()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(TargetObjectTest);
+            IDictionary atts = new Hashtable();
+            atts.Add("InterfaceVirtualMethodWithNoArguments", new Attribute[] { new MarkerAttribute() });
+            builder.MemberAttributes = atts;
+
+            Type proxy = builder.BuildProxyType();
+            object foo = Activator.CreateInstance(proxy);
+
+            Type fooType = foo.GetType();
+            MethodInfo method = ReflectionUtils.GetMethod(fooType, "InterfaceMethodWithArguments", new Type[] { typeof(string) });
+            if (method == null)
+            {
+                method = ReflectionUtils.GetMethod(fooType, "Spring.Proxy.ITargetObjectTest.InterfaceMethodWithArguments", new Type[] { typeof(string) });
+            }
+            object[] appliedAttributes = method.GetCustomAttributes(false);
+            Assert.AreEqual(0, appliedAttributes.Length,
+                "Custom attribute (erroneously) applied to member method.");
+            method = ReflectionUtils.GetMethod(fooType, "InterfaceVirtualMethodWithNoArguments", Type.EmptyTypes);
+            if (method == null)
+            {
+                method = ReflectionUtils.GetMethod(fooType, "Spring.Proxy.ITargetObjectTest.InterfaceVirtualMethodWithNoArguments", Type.EmptyTypes);
+            }
+            appliedAttributes = method.GetCustomAttributes(false);
+            Assert.AreEqual(1, appliedAttributes.Length,
+                "Custom attribute not applied to member method.");
+        }
+
+        [Test]
+        public void ImplementsInterfaceHierarchy()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(MultipleInterfaces);
+
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            object foo = Activator.CreateInstance(proxy);
+            Assert.IsTrue(foo is IBase);
+            Assert.IsTrue(foo is IInherited);
+
+            // try to call proxied interface methods
+            ((IBase)foo).Base();
+            ((IInherited)foo).Base();
+            ((IInherited)foo).Inherited();
+        }
+
+        [Test]
+        public void ProxySpecificTargetTypeAttributeWithReadOnlyProperty()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ClassWithGuidAttribute);
+            
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            
+            object[] attrs = proxy.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 1 attribute applied to the target type.");
+            Assert.AreEqual(1, attrs.Length, "Should have had 1 attribute applied to the target type.");
+            Assert.AreEqual(typeof(GuidAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the target type.");
+
+            GuidAttribute ga = attrs[0] as GuidAttribute;
+            Assert.AreEqual("7cfc9607-e81a-48ac-a080-bda88193607b", ga.Value);
+        }
+
+        [Test]
+        public void ProxySpecificTargetTypeAttributeWithPropertySetterChangingDefaultBehavior()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ClassWithFakeXmlElementAttribute);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("Spring.Proxy.ISomeMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+            object[] attrs = method.GetParameters()[0].GetCustomAttributes(false);
+            Assert.IsNotNull(method);
+            Assert.IsNotNull(attrs, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(1, attrs.Length, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(typeof(FakeXmlElementAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the target method.");
+
+            FakeXmlElementAttribute xea = attrs[0] as FakeXmlElementAttribute;
+            Assert.AreEqual(-1, xea.Order);
+        }
+
+        [Test]
+        public void ProxySpecificTargetTypeAttributeNotInstantiableWithDefaultValues()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ClassWithFakeGenerateScriptTypeAttribute);
+
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            object[] attrs = proxy.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 1 attribute applied to the target type.");
+            Assert.AreEqual(1, attrs.Length, "Should have had 1 attribute applied to the target type.");
+            Assert.AreEqual(typeof(FakeGenerateScriptTypeAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the target type.");
+
+            FakeGenerateScriptTypeAttribute fgsta = attrs[0] as FakeGenerateScriptTypeAttribute;
+            Assert.AreEqual("ScriptName", fgsta.Name);
+        }
+
+        // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=296032
+        // should not fail
+        // Not fixed by .NET 2.0 SP1.
+        [Test]
+        public void ProxySpecificTargetTypeAttributeWithPublicEnumProperty()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ClassWithPublicEnumPropertyAttribute);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("Spring.Proxy.ISomeMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+            object[] attrs = method.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(1, attrs.Length, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(typeof(PublicEnumPropertyAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the target method.");
+
+            PublicEnumPropertyAttribute pepa = attrs[0] as PublicEnumPropertyAttribute;
+            Assert.AreEqual(AttributeTargets.All, pepa.Data);
+        }
+
+        // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=161522
+        // should not fail
+        // Use CustomAttributeData if patch applied (.NET 2.0 SP1).
+        // Use Attribute instance if patch not applied (.NET 2.0 SP1).
+        [Test]
+        public void ProxyWebServiceAttribute()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ClassWithWebServiceAttribute);
+
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            object[] attrs = proxy.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 1 attribute applied to the target type.");
+            Assert.AreEqual(1, attrs.Length, "Should have had 1 attribute applied to the target type.");
+            Assert.AreEqual(typeof(WebServiceAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the target type.");
+
+            WebServiceAttribute wsa = attrs[0] as WebServiceAttribute;
+            Assert.AreEqual("blah", wsa.Name);
+            Assert.AreEqual("http://mynamespace.com", wsa.Namespace);
+        }
+
+        // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=94803
+        [Test]
+#if !NET_2_0
+        [Ignore("GetCustomAttributes() does not return SecurityAttribute in .NET 1.x")]
+#endif
+        public void ProxySecurityAttribute()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ClassWithSecurityAttribute);
+
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            object[] attrs = proxy.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 2 attribute applied to the target type.");
+            Assert.AreEqual(2, attrs.Length, "Should have had 2 attribute applied to the target type.");
+        }
+
+        [Test]
+        public void ProxySpecificTargetTypeAttributeWithArrayConstructor()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ClassWithArrayConstructorAttribute);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            MethodInfo method = proxy.GetMethod("Spring.Proxy.ISomeMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+            object[] attrs = method.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(1, attrs.Length, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(typeof(ArrayConstructorPropertyAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the target method.");
+
+            ArrayConstructorPropertyAttribute acpa = attrs[0] as ArrayConstructorPropertyAttribute;
+            Assert.AreEqual(false, acpa.ReadOnly);
+            Assert.AreEqual(1, acpa.Types.Length);
+            Assert.AreEqual(typeof(string), acpa.Types[0]);
+        }
+
+        [Test]
+        public void ProxySpecificTargetTypeAttributeWithArrayProperty()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ClassWithArrayPropertyAttribute);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            MethodInfo method = proxy.GetMethod("Spring.Proxy.IAnotherMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+            object[] attrs = method.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(1, attrs.Length, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(typeof(ArrayConstructorPropertyAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the target method.");
+
+            ArrayConstructorPropertyAttribute acpa = attrs[0] as ArrayConstructorPropertyAttribute;
+            Assert.AreEqual(true, acpa.ReadOnly);
+            Assert.AreEqual(2, acpa.Types.Length);
+            Assert.AreEqual(typeof(int), acpa.Types[0]);
+            Assert.AreEqual(typeof(string), acpa.Types[1]);
+        }
+
+        [Test]
+        public void ProxyTargetTypeAttributes()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(AnotherMarkerClass);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            object[] attrs = proxy.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 1 attribute applied to the target type.");
+            Assert.AreEqual(1, attrs.Length, "Should have had 1 attribute applied to the target type.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the target type.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetTypeAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(AnotherMarkerClass);
+            builder.ProxyTargetAttributes = false;
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            object[] attrs = proxy.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the target type.");
+        }
+
+        [Test]
+        public void ProxyTargetMethodAttributes()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(AnotherMarkerClass);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("Spring.Proxy.IAnotherMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+            object[] attrs = method.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(1, attrs.Length, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the target method.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetMethodAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(AnotherMarkerClass);
+            builder.ProxyTargetAttributes = false;
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("Spring.Proxy.IAnotherMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+            object[] attrs = method.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the target method.");
+        }
+
+        [Test]
+        public void ProxyTargetMethodParameterAttributes()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(SomeMarkerClass);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("Spring.Proxy.ISomeMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+            object[] attrs = method.GetParameters()[1].GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 1 attribute applied to the method's parameter.");
+            Assert.AreEqual(1, attrs.Length, "Should have had 1 attribute applied to the method's parameter.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the method's parameter.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetMethodParameterAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(SomeMarkerClass);
+            builder.ProxyTargetAttributes = false;
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("Spring.Proxy.ISomeMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+            object[] attrs = method.GetParameters()[1].GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's parameter.");
+        }
+
+#if NET_2_0
+        [Test]
+        public void ProxyTargetMethodReturnValueAttributes()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(SomeMarkerClass);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("Spring.Proxy.ISomeMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+            object[] attrs = method.ReturnTypeCustomAttributes.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 1 attribute applied to the method's return value.");
+            Assert.AreEqual(1, attrs.Length, "Should have had 1 attribute applied to the method's return value.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the method's return value.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetMethodReturnValueAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(SomeMarkerClass);
+            builder.ProxyTargetAttributes = false;
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("Spring.Proxy.ISomeMarkerInterface.MarkerMethod", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (method == null)
+            {
+                method = proxy.GetMethod("MarkerMethod");
+            }
+            Assert.IsNotNull(method);
+            object[] attrs = method.ReturnTypeCustomAttributes.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's return value.");
+        }
+
+        #region ProxyGenericMethod
+
+        [Test]
+        public void ProxyGenericMethod()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ClassWithGenericMethod);
+
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            InterfaceWithGenericMethod foo = Activator.CreateInstance(proxy) as InterfaceWithGenericMethod;
+            Assert.IsNotNull(foo);
+
+            foo.PolymorphicMethod<int>();
+
+            string result1 = foo.PolymorphicMethod("coucou");
+            Assert.AreEqual("coucou", result1);
+
+            foo.WithGenericParameter<string>();
+
+            foo.WithGenericParameterAndGenericArgument<string>("ola");
+
+            string result2 = foo.WithGenericParameterAndGenericArgumentAndGenericReturnType<string>("ola");
+            Assert.AreEqual("ola", result2);
+
+            foo.WithInterfaceConstraint<bool>();
+
+            foo.WithBaseTypeConstraint<DerivedTestObject>();
+
+            foo.WithBaseTypeAndInterfaceConstraints<DerivedTestObject>();
+
+            foo.WithMixedConstraint<bool, DerivedTestObject>();
+        }
+
+        public interface InterfaceWithGenericMethod
+        {
+            void PolymorphicMethod<T>();
+
+            string PolymorphicMethod(string param);
+
+            void WithGenericParameter<T>();
+
+            void WithGenericParameterAndGenericArgument<T>(T obj);
+
+            T WithGenericParameterAndGenericArgumentAndGenericReturnType<T>(T obj);
+
+            void WithInterfaceConstraint<Z>() where Z : IComparable;
+
+            void WithBaseTypeConstraint<Z>() where Z : TestObject;
+
+            void WithBaseTypeAndInterfaceConstraints<Z>() where Z : TestObject, IComparable, IDisposable;
+
+            void WithMixedConstraint<X, Y>()
+                where X : IComparable, new()
+                where Y : TestObject;
+        }
+
+        public class ClassWithGenericMethod : InterfaceWithGenericMethod
+        {
+            public void PolymorphicMethod<T>() { }
+
+            public string PolymorphicMethod(string param)
+            {
+                return param;
+            }
+
+            public void WithGenericParameter<T>() { }
+
+            public void WithGenericParameterAndGenericArgument<T>(T obj) { }
+
+            public T WithGenericParameterAndGenericArgumentAndGenericReturnType<T>(T obj)
+            {
+                return obj;
+            }
+
+            public void WithInterfaceConstraint<Z>() where Z : IComparable { }
+
+            public void WithBaseTypeConstraint<Z>() where Z : TestObject { }
+
+            public void WithBaseTypeAndInterfaceConstraints<Z>() where Z : TestObject, IComparable, IDisposable { }
+
+            public void WithMixedConstraint<X, Y>()
+                where X : IComparable, new()
+                where Y : TestObject
+            { }
+        }
+
+        #endregion
+
+        #region ProxyGenericInterface
+
+        [Test]
+        public void ProxyGenericInterface()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ClassThatImplementsGenericInterface<TestObject>);
+
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            GenericInterface<TestObject> foo = Activator.CreateInstance(proxy) as GenericInterface<TestObject>;
+            Assert.IsNotNull(foo);
+
+            TestObject to1 = foo.Create();
+            Assert.IsNotNull(to1);
+
+            TestObject to2 = foo.Populate(new TestObject());
+            Assert.IsNotNull(to2);
+            Assert.AreEqual("Populated", to2.Name);
+        }
+
+        public interface GenericInterface<T>
+            where T : ITestObject, new()
+        {
+            T Create();
+
+            T Populate(T testObject);
+        }
+
+        public class ClassThatImplementsGenericInterface<T> : GenericInterface<T>
+            where T : ITestObject, new()
+        {
+            public T Create()
+            {
+                return new T();
+            }
+
+            public T Populate(T testObject)
+            {
+                testObject.Name = "Populated";
+
+                return testObject;
+            }
+        }
+
+        #endregion
+#endif
+
+        protected abstract IProxyTypeBuilder GetProxyBuilder();
+
+        #region Helper inner classes definition
+
+        public interface InnerInterface
+        {
+        }
+
+        public class InnerClass : InnerInterface
+        {
+        }
+
+        #endregion
+
+    }
+
+    #region Helper classes definition
+
+    public class DoesntImplementAnyInterfaces
+    {
+    }
+
+    public interface IMarkerInterface
+    {
+    }
+
+    public class MarkerClass : IMarkerInterface
+    {
+    }
+
+    [GuidAttribute("7cfc9607-e81a-48ac-a080-bda88193607b")]
+    public class ClassWithGuidAttribute : IMarkerInterface
+    {
+    }
+
+    public interface IAnotherMarkerInterface
+    {
+        void MarkerMethod();
+    }
+
+    public interface ISomeMarkerInterface
+    {
+        string MarkerMethod(int param1, string param2);
+    }
+
+    // XmlElementAttribute.Order property is only available in .NET 2.0
+    public sealed class FakeXmlElementAttribute : Attribute
+    {
+        private int _order;
+        public int Order
+        {
+            get
+            {
+                return this._order;
+            }
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentException("Negative values are prohibited.", "Order");
+                }
+                this._order = value;
+            }
+        }
+
+        private string _elementName;
+        public string ElementName
+        {
+            get { return _elementName; }
+            set { _elementName = value; }
+        }
+
+        public FakeXmlElementAttribute()
+        {
+            this._order = -1;
+        }
+
+        public FakeXmlElementAttribute(string elementName)
+        {
+            this._order = -1;
+            this._elementName = elementName;
+        }
+    }
+
+    public sealed class FakeGenerateScriptTypeAttribute : Attribute
+    {
+        public FakeGenerateScriptTypeAttribute(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException("name");
+            }
+            this._name = name;
+        }
+
+        private string _name;
+        public string Name
+        {
+            get
+            {
+                return this._name;
+            }
+        }
+    }
+
+    public class ClassWithFakeXmlElementAttribute : ISomeMarkerInterface
+    {
+        public string MarkerMethod([FakeXmlElement("parameter1")] int param1, string param2)
+        {
+            return null;
+        }
+    }
+
+    // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=161522
+    [WebService(Namespace = "http://mynamespace.com", Name = "blah")]
+    public class ClassWithWebServiceAttribute : IMarkerInterface
+    {
+    }
+
+    [FakeGenerateScriptType("ScriptName")]
+    public class ClassWithFakeGenerateScriptTypeAttribute : IMarkerInterface
+    {
+    }
+
+    // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=296032
+    public class ClassWithPublicEnumPropertyAttribute : ISomeMarkerInterface
+    {
+        [PublicEnumProperty(AttributeTargets.All)]
+        public string MarkerMethod(int param1, string param2)
+        {
+            return null;
+        }
+    }
+
+    // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=94803
+    [Marker]
+    [WebPermission(SecurityAction.Deny)]
+    public class ClassWithSecurityAttribute : IMarkerInterface
+    {
+    }
+
+    public class ClassWithArrayConstructorAttribute : ISomeMarkerInterface
+    {
+        [ArrayConstructorPropertyAttribute(false, new Type[1] { typeof(string) })]
+        public string MarkerMethod(int param1, string param2)
+        {
+            return null;
+        }
+    }
+
+    public class ClassWithArrayPropertyAttribute : IAnotherMarkerInterface
+    {
+        [ArrayConstructorPropertyAttribute(ReadOnly = true, Types = new Type[2] { typeof(int), typeof(string) })]
+        public void MarkerMethod()
+        {
+        }
+    }
+
+    public class SomeMarkerClass : ISomeMarkerInterface
+    {
+        [return: Marker]
+        public string MarkerMethod(int param1, [Marker]string param2)
+        {
+            return string.Empty;
+        }
+
+        [return: Marker]
+        public virtual string MarkerVirtualMethod(int param1, [Marker]string param2)
+        {
+            return string.Empty;
+        }
+    }
+
+    [Marker]
+    public class AnotherMarkerClass : IAnotherMarkerInterface
+    {
+        [Marker]
+        public void MarkerMethod()
+        {
+        }
+
+        [Marker]
+        public virtual void MarkerVirtualMethod()
+        {
+        }
+    }
+
+    public class ArrayConstructorPropertyAttribute : Attribute
+    {
+        private bool _readOnly = false;
+        private Type[] _types = Type.EmptyTypes;
+
+        public ArrayConstructorPropertyAttribute()
+        {
+        }
+
+        public ArrayConstructorPropertyAttribute(bool readOnly, Type[] types)
+        {
+            this._readOnly = readOnly;
+            this._types = types;
+        }
+
+        public bool ReadOnly
+        {
+            get { return _readOnly; }
+            set { _readOnly = value; }
+        }
+
+        public Type[] Types
+        {
+            get { return _types; }
+            set { _types = value; }
+        }
+    }
+
+    public class PublicEnumPropertyAttribute : Attribute
+    {
+        private Enum _data;
+
+        public PublicEnumPropertyAttribute(AttributeTargets data)
+        {
+            _data = data;
+        }
+
+        public PublicEnumPropertyAttribute(TypeCode data)
+        {
+            _data = data;
+        }
+
+        public Enum Data
+        {
+            get { return _data; }
+        }
+    }
+
+    public sealed class MarkerAttribute : Attribute
+    {
+        private int _count;
+
+        public int Count
+        {
+            get { return _count; }
+            set { _count = value; }
+        }
+    }
+
+    public interface IBase
+    {
+        void Base();
+    }
+
+    public interface IInherited : IBase
+    {
+        void Inherited();
+    }
+
+    public class MultipleInterfaces : IInherited
+    {
+        #region IInherited Members
+
+        public void Inherited()
+        {
+        }
+
+        #endregion
+
+        #region IBase Members
+
+        public void Base()
+        {
+        }
+
+        #endregion
+    }
+
+    public interface ITargetObjectTest
+    {
+        string InterfaceProperty { get; set; }
+
+        bool InterfaceMethodWithArguments(string code);
+
+        void InterfaceVirtualMethodWithNoArguments();
+    }
+
+    public class TargetObjectTest : ITargetObjectTest
+    {
+        private string _interfaceProperty;
+
+        public TargetObjectTest() { }
+
+        public TargetObjectTest(string interfaceProperty)
+        {
+            _interfaceProperty = interfaceProperty;
+        }
+
+        public virtual string InterfaceProperty
+        {
+            get { return _interfaceProperty; }
+            set { _interfaceProperty = value; }
+        }
+
+        public bool InterfaceMethodWithArguments(string code)
+        {
+            return true;
+        }
+
+        public virtual void InterfaceVirtualMethodWithNoArguments()
+        {
+        }
+
+        public void MethodWithArguments(string code)
+        {
+        }
+    }
+
+    [ProxyIgnore]
+    public interface IFrameworkInterface
+    {
+        void FrameworkMethod();
+    }
+
+    public interface IApplicationInterface
+    {
+        void ApplicationMethod();
+    }
+
+    public class ApplicationClass : IApplicationInterface, IFrameworkInterface
+    {
+        public void FrameworkMethod() { }
+
+        public void ApplicationMethod() { }
+    }
+
+    #endregion
+
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Proxy/CompositionProxyTypeBuilderTests.cs b/test/Spring/Spring.Core.Tests/Proxy/CompositionProxyTypeBuilderTests.cs
new file mode 100644
index 00000000..a0201e8c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Proxy/CompositionProxyTypeBuilderTests.cs
@@ -0,0 +1,138 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Proxy
+{
+	/// <summary>
+	/// Unit tests for the CompositionProxyTypeBuilder class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: CompositionProxyTypeBuilderTests.cs,v 1.6 2006/11/16 02:30:51 bbaia Exp $</version>
+	[TestFixture]
+	public class CompositionProxyTypeBuilderTests : AbstractProxyTypeBuilderTests
+	{
+		[Test]
+		[ExpectedException(typeof (ArgumentException),
+			"Composition proxy target must implement at least one interface.")]
+		public void OnClassThatDoesntImplementAnyInterfaces()
+		{
+			IProxyTypeBuilder builder = GetProxyBuilder();
+			builder.TargetType = typeof (DoesntImplementAnyInterfaces);
+            builder.BuildProxyType();
+		}
+
+		[Test]
+		[ExpectedException(typeof (NullReferenceException))]
+		public void BuildProxyWithNothingSet()
+		{
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.BuildProxyType();
+		}
+
+		[Test]
+		public void ProxyInnerClass()
+		{
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(InnerClass);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            object foo = Activator.CreateInstance(proxy);
+            Assert.IsTrue(foo is InnerInterface);
+            Assert.IsFalse(foo is InnerClass);
+        }
+
+		[Test]
+		public void CheckInterfaceImplementation()
+		{
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof (MarkerClass);
+            Type proxy = builder.BuildProxyType();
+			Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+			object foo = Activator.CreateInstance(proxy);
+			Assert.IsTrue(foo is IMarkerInterface);
+			Assert.IsFalse(foo is MarkerClass);
+		}
+
+        [Test]
+        public void SetsInterfacesToProxy()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(MultipleInterfaces);
+            builder.Interfaces = new Type[] { typeof(IBase) };
+
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            object foo = Activator.CreateInstance(proxy);
+            Assert.IsTrue(foo is IBase);
+            Assert.IsFalse(foo is IInherited);
+
+            // try to call proxied interface methods
+            ((IBase)foo).Base();
+        }
+
+        [Test]
+        public void DoesNotProxyNonProxiableInterface()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ApplicationClass);
+
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            object foo = Activator.CreateInstance(proxy);
+            Assert.IsTrue(foo is IApplicationInterface);
+            Assert.IsFalse(foo is IFrameworkInterface);
+
+            // try to call proxied interface methods
+            ((IApplicationInterface)foo).ApplicationMethod();
+        }
+
+        [Test]
+        public void ForcesNonProxiableInterfacesToBeProxied()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ApplicationClass);
+            builder.Interfaces = new Type[] { typeof(IFrameworkInterface) };
+
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            object foo = Activator.CreateInstance(proxy);
+            Assert.IsFalse(foo is IApplicationInterface);
+            Assert.IsTrue(foo is IFrameworkInterface);
+
+            // try to call proxied interface methods
+            ((IFrameworkInterface)foo).FrameworkMethod();
+        }
+
+		protected override IProxyTypeBuilder GetProxyBuilder()
+		{
+			return new CompositionProxyTypeBuilder();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Proxy/DynamicProxyManagerTests.cs b/test/Spring/Spring.Core.Tests/Proxy/DynamicProxyManagerTests.cs
new file mode 100644
index 00000000..c7d4e9f7
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Proxy/DynamicProxyManagerTests.cs
@@ -0,0 +1,123 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Reflection.Emit;
+using System.Threading;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Proxy
+{
+    /// <summary>
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: DynamicProxyManagerTests.cs,v 1.2 2007/05/02 11:35:43 bbaia Exp $</version>
+    [TestFixture]
+    public class DynamicProxyManagerTests
+    {
+        #region WorkerThread Class
+
+        public class WorkerThread
+        {
+            private Exception _exception;
+            private Thread _thread;
+            private WaitCallback _callback;
+            private object _arg;
+
+            public WorkerThread(WaitCallback callback,object arg)
+            {
+                this._arg = arg;
+                this._callback = callback;
+                _thread = new Thread( new ThreadStart( Run ) );
+            }
+
+            public void Start()
+            {
+                _thread.Start();
+            }
+
+            public void Join()
+            {
+                _thread.Join();
+            }
+
+            public Exception Exception
+            {
+                get { return this._exception; }
+            }
+
+            private void Run()
+            {
+                try
+                {
+                    _callback( _arg );
+                }
+                catch(Exception ex)
+                {
+                    _exception = ex;
+                }
+            }
+        }
+
+        #endregion WorkerThread Class
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void CreateTypeBuilderMustNotBeCalledTwiceWithSameArguments()
+        {
+            TypeBuilder tb1 = DynamicProxyManager.CreateTypeBuilder("testtypename", null);
+            TypeBuilder tb2 = DynamicProxyManager.CreateTypeBuilder("testtypename", typeof(AbstractProxyTypeBuilder) );
+        }
+
+        [Test]
+        public void CreateTypeBuilderIsThreadSafe()
+        {
+            const int WORKERS = 20;
+
+            WorkerThread[] workers = new WorkerThread[WORKERS];
+            for(int i=0;i<WORKERS;i++)
+            {
+                workers[i] = new WorkerThread(new WaitCallback(CallCreateTypeBuilder),  i);
+                workers[i].Start();
+            }
+
+            for(int i=0;i<WORKERS;i++)
+            {
+                workers[i].Join();
+                Assert.AreEqual(null, workers[i].Exception);
+            }
+        }
+
+        private static void CallCreateTypeBuilder(object arg)
+        {
+            int nr = (int) arg;
+
+            for(int i=0;i<100;i++)
+            {
+                DynamicProxyManager.CreateTypeBuilder( "TestType" + nr + "_" + i,typeof( AbstractProxyTypeBuilder ) );
+                Thread.Sleep(0);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Proxy/ExplicitCompositionProxyTypeBuilderTests.cs b/test/Spring/Spring.Core.Tests/Proxy/ExplicitCompositionProxyTypeBuilderTests.cs
new file mode 100644
index 00000000..e124975d
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Proxy/ExplicitCompositionProxyTypeBuilderTests.cs
@@ -0,0 +1,69 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Proxy
+{
+	/// <summary>
+	/// Unit tests for the CompositionProxyTypeBuilder class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: ExplicitCompositionProxyTypeBuilderTests.cs,v 1.3 2006/08/10 18:45:58 bbaia Exp $</version>
+	[TestFixture]
+	public sealed class ExplicitCompositionProxyTypeBuilderTests : CompositionProxyTypeBuilderTests
+	{
+		[Test]
+		public void ExplicitInterfaceImplementation()
+		{
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(MultipleInterfaces);
+            Type proxy = builder.BuildProxyType();
+			Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+			object foo = Activator.CreateInstance(proxy);
+			Assert.IsTrue(foo is IBase);
+			Assert.IsTrue(foo is IInherited);
+
+            Type fooType = foo.GetType();
+		    MethodInfo[] methods = fooType.GetMethods(BindingFlags.DeclaredOnly);
+            Assert.AreEqual(0, methods.Length, "Methods array should be empty.");
+
+            methods = fooType.GetMethods(BindingFlags.DeclaredOnly | BindingFlags.NonPublic | BindingFlags.Instance);
+            Assert.AreEqual(2, methods.Length, "Methods array should have two elements.");
+            Assert.IsTrue(methods[0].Name.IndexOf('.') > 0, "Method should have '.' in the name");
+            Assert.IsTrue(methods[1].Name.IndexOf('.') > 0, "Method should have '.' in the name");
+
+		}
+
+		protected override IProxyTypeBuilder GetProxyBuilder()
+		{
+			CompositionProxyTypeBuilder pb = new CompositionProxyTypeBuilder();
+            pb.ExplicitInterfaceImplementation = true;
+            return pb;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Proxy/InheritanceProxyTypeBuilderTests.cs b/test/Spring/Spring.Core.Tests/Proxy/InheritanceProxyTypeBuilderTests.cs
new file mode 100644
index 00000000..012448df
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Proxy/InheritanceProxyTypeBuilderTests.cs
@@ -0,0 +1,313 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using NUnit.Framework;
+
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Proxy
+{
+    /// <summary>
+    /// Unit tests for the InheritanceProxyTypeBuilder class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: InheritanceProxyTypeBuilderTests.cs,v 1.9 2007/06/27 15:34:47 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class InheritanceProxyTypeBuilderTests : AbstractProxyTypeBuilderTests
+    {
+        [Test]
+        public void OnClassThatDoesntImplementAnyInterfaces()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(DoesntImplementAnyInterfaces);
+            builder.BuildProxyType();
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void WithSealedClass()
+        {
+            InheritanceProxyTypeBuilder builder = (InheritanceProxyTypeBuilder) GetProxyBuilder();
+            builder.TargetType = typeof(SealedClass);
+            builder.BuildProxyType();
+        }
+
+        [Test]
+        public void ProxyInnerClass()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(InnerClass);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            object foo = Activator.CreateInstance(proxy);
+            Assert.IsTrue(foo is InnerInterface);
+            Assert.IsTrue(foo is InnerClass);
+        }
+
+        [Test]
+        public void CheckInheritType()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(DoesntImplementAnyInterfaces);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            object foo = Activator.CreateInstance(proxy);
+            Assert.IsTrue(foo is DoesntImplementAnyInterfaces,
+                          "Using inheritance proxying, so the proxied object must inherit from the base type.");
+        }
+
+        [Test]
+        public void OverrideVirtualMethod()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(TargetObjectTest);
+            Type proxy = builder.BuildProxyType();
+
+            MethodInfo method = ReflectionUtils.GetMethod(proxy, "InterfaceVirtualMethodWithNoArguments", Type.EmptyTypes);
+            
+            Assert.IsNotNull(method, "Should define this method.");
+            Assert.AreEqual(proxy, method.DeclaringType, "Method should be overrided in the proxy class.");
+
+            // call overrided method
+            object foo = Activator.CreateInstance(proxy);
+            Assert.IsTrue(foo is TargetObjectTest);
+            ((TargetObjectTest)foo).InterfaceVirtualMethodWithNoArguments();
+        }
+
+        [Test]
+        public void ImplementFinalMethodThatImplementsInterface()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(TargetObjectTest);
+            Type proxy = builder.BuildProxyType();
+
+            MethodInfo method = ReflectionUtils.GetMethod(proxy, "Spring.Proxy.ITargetObjectTest.InterfaceMethodWithArguments", new Type[] { typeof(string) });
+
+            Assert.IsNotNull(method, "Should define this method.");
+            Assert.AreEqual(proxy, method.DeclaringType, "Method should be defined in the proxy class.");
+
+            // call final interfaced method
+            object foo = Activator.CreateInstance(proxy);
+            Assert.IsTrue(foo is ITargetObjectTest);
+            ((ITargetObjectTest)foo).InterfaceMethodWithArguments("code");
+        }
+
+        [Test]
+        public void DoesNotImplementFinalMethodThatDoesNotImplementInterface()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(TargetObjectTest);
+            Type proxy = builder.BuildProxyType();
+
+            MethodInfo method = ReflectionUtils.GetMethod(proxy, "MethodWithArguments", new Type[] { typeof(string) });
+
+            Assert.IsNotNull(method, "Should define this method.");
+            Assert.AreNotEqual(proxy, method.DeclaringType, "Method can't be proxied.");
+
+            // call base method
+            object foo = Activator.CreateInstance(proxy);
+            Assert.IsTrue(foo is TargetObjectTest);
+            ((TargetObjectTest)foo).MethodWithArguments("code");
+        }
+
+        [Test]
+        public void SetsInterfacesToProxy()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(MultipleInterfaces);
+            builder.Interfaces = new Type[] { typeof(IAnotherMarkerInterface) };
+
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            object foo = Activator.CreateInstance(proxy);
+            Assert.IsTrue(foo is IBase);
+            Assert.IsTrue(foo is IInherited);
+            Assert.IsTrue(foo is IAnotherMarkerInterface);
+
+            // try to call proxied interface methods
+            ((IBase)foo).Base();
+            ((IInherited)foo).Base();
+            ((IInherited)foo).Inherited();
+        }
+
+
+        [Test]
+        public void DoesNotProxyNonProxiableInterface()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ApplicationClass);
+
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            object foo = Activator.CreateInstance(proxy);
+            Assert.IsTrue(foo is IApplicationInterface);
+            Assert.IsTrue(foo is IFrameworkInterface);
+
+            // proxy implements IApplicationInterface and proxy methods
+            Assert.IsNotNull(foo.GetType().GetMethod("Spring.Proxy.IApplicationInterface.ApplicationMethod", BindingFlags.Instance | BindingFlags.NonPublic));
+
+            // proxy implements IFrameworkInterface but should not proxy methods
+            Assert.IsNull(foo.GetType().GetMethod("Spring.Proxy.IFrameworkInterface.FrameworkMethod", BindingFlags.Instance | BindingFlags.NonPublic));
+        }
+
+        [Test]
+        public void ForcesNonProxiableInterfacesToBeProxied()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(ApplicationClass);
+            builder.Interfaces = new Type[] { typeof(IFrameworkInterface) };
+
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+
+            object foo = Activator.CreateInstance(proxy);
+            Assert.IsTrue(foo is IApplicationInterface);
+            Assert.IsTrue(foo is IFrameworkInterface);
+
+            // proxy implements IFrameworkInterface and proxy methods
+            Assert.IsNotNull(foo.GetType().GetMethod("Spring.Proxy.IFrameworkInterface.FrameworkMethod", BindingFlags.Instance | BindingFlags.NonPublic));
+
+            // proxy implements IApplicationInterface but should not proxy methods
+            Assert.IsNull(foo.GetType().GetMethod("Spring.Proxy.IApplicationInterface.ApplicationMethod", BindingFlags.Instance | BindingFlags.NonPublic));
+        }
+
+        [Test]
+        public void ProxyTargetVirtualMethodAttributes()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(AnotherMarkerClass);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("MarkerVirtualMethod");
+            Assert.IsNotNull(method);
+            object[] attrs = method.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(1, attrs.Length, "Should have 1 attribute applied to the target method.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the target method.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetVirtualMethodAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(AnotherMarkerClass);
+            builder.ProxyTargetAttributes = false;
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("MarkerVirtualMethod");
+            Assert.IsNotNull(method);
+            object[] attrs = method.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the target method.");
+        }
+
+        [Test]
+        public void ProxyTargetVirtualMethodParameterAttributes()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(SomeMarkerClass);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("MarkerVirtualMethod");
+            Assert.IsNotNull(method);
+            object[] attrs = method.GetParameters()[1].GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 1 attribute applied to the method's parameter.");
+            Assert.AreEqual(1, attrs.Length, "Should have had 1 attribute applied to the method's parameter.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the method's parameter.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetVirtualMethodParameterAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(SomeMarkerClass);
+            builder.ProxyTargetAttributes = false;
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("MarkerVirtualMethod");
+            Assert.IsNotNull(method);
+            object[] attrs = method.GetParameters()[1].GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's parameter.");
+        }
+
+#if NET_2_0
+        [Test]
+        public void ProxyTargetVirtualMethodReturnValueAttributes()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(SomeMarkerClass);
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("MarkerVirtualMethod");
+            Assert.IsNotNull(method);
+            object[] attrs = method.ReturnTypeCustomAttributes.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs, "Should have had 1 attribute applied to the method's return value.");
+            Assert.AreEqual(1, attrs.Length, "Should have had 1 attribute applied to the method's return value.");
+            Assert.AreEqual(typeof(MarkerAttribute), attrs[0].GetType(), "Wrong System.Type of Attribute applied to the method's return value.");
+        }
+
+        [Test]
+        public void DoesNotProxyTargetVirtualMethodReturnValueAttributesWithProxyTargetAttributesEqualsFalse()
+        {
+            IProxyTypeBuilder builder = GetProxyBuilder();
+            builder.TargetType = typeof(SomeMarkerClass);
+            builder.ProxyTargetAttributes = false;
+            Type proxy = builder.BuildProxyType();
+            Assert.IsNotNull(proxy, "The proxy generated by a (valid) call to BuildProxy() was null.");
+            MethodInfo method = proxy.GetMethod("MarkerVirtualMethod");
+            Assert.IsNotNull(method);
+            object[] attrs = method.ReturnTypeCustomAttributes.GetCustomAttributes(false);
+            Assert.IsNotNull(attrs);
+            Assert.AreEqual(0, attrs.Length, "Should not have attribute applied to the method's return value.");
+        }
+#endif
+
+        protected override IProxyTypeBuilder GetProxyBuilder()
+        {
+            return new InheritanceProxyTypeBuilder();
+        }
+    }
+
+    #region Helper Classes
+
+    public class NotSealedClass
+    {
+        public bool IsAnyoneThere()
+        {
+            return false;
+        }
+    }
+
+    public sealed class SealedClass
+    {}
+
+    #endregion
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/BasePropertyTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/BasePropertyTests.cs
new file mode 100644
index 00000000..17c9a505
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/BasePropertyTests.cs
@@ -0,0 +1,304 @@
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Context.Support;
+
+namespace Spring.Reflection.Dynamic
+{
+    /// <summary>
+    /// Unit tests common for all IDynamicProperty implementations.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: BasePropertyTests.cs,v 1.1 2008/05/17 11:05:27 oakinger Exp $</version>
+    public abstract class BasePropertyTests
+    {
+        protected Inventor tesla;
+        protected Inventor pupin;
+        protected Society ieee;
+
+        #region SetUp and TearDown
+
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public void SetUp()
+        {
+            ContextRegistry.Clear();
+            tesla = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            tesla.Inventions = new string[]
+                {
+                    "Telephone repeater", "Rotating magnetic field principle",
+                    "Polyphase alternating-current system", "Induction motor",
+                    "Alternating-current power transmission", "Tesla coil transformer",
+                    "Wireless communication", "Radio", "Fluorescent lights"
+                };
+            tesla.PlaceOfBirth.City = "Smiljan";
+
+            pupin = new Inventor("Mihajlo Pupin", new DateTime(1854, 10, 9), "Serbian");
+            pupin.Inventions = new string[] { "Long distance telephony & telegraphy", "Secondary X-Ray radiation", "Sonar" };
+            pupin.PlaceOfBirth.City = "Idvor";
+            pupin.PlaceOfBirth.Country = "Serbia";
+
+            ieee = new Society();
+            ieee.Members.Add(tesla);
+            ieee.Members.Add(pupin);
+            ieee.Officers["president"] = pupin;
+            ieee.Officers["advisors"] = new Inventor[] { tesla, pupin }; // not historically accurate, but I need an array in the map ;-)
+        }
+
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            //DynamicReflectionManager.SaveAssembly();
+        }
+
+        #endregion
+
+        protected abstract IDynamicProperty Create(PropertyInfo property);
+
+        [Test]
+        public void TestInstanceProperties()
+        {
+            IDynamicProperty placeOfBirth = Create(typeof(Inventor).GetProperty("PlaceOfBirth"));
+            Assert.AreEqual(tesla.PlaceOfBirth, placeOfBirth.GetValue(tesla));
+
+            IDynamicProperty dateOfBirth = Create(typeof(Inventor).GetProperty("DOB"));
+            Assert.AreEqual(tesla.DOB, dateOfBirth.GetValue(tesla));
+            dateOfBirth.SetValue(tesla, new DateTime(2004, 8, 14));
+            Assert.AreEqual(new DateTime(2004, 8, 14), dateOfBirth.GetValue(tesla));
+
+            DateTime mostImportantDayInTheWorldEver = new DateTime(2004, 8, 14);
+            IDynamicProperty year = Create(typeof(DateTime).GetProperty("Year"));
+            Assert.AreEqual(mostImportantDayInTheWorldEver.Year, year.GetValue(mostImportantDayInTheWorldEver));
+        }
+
+        [Test]
+        public void TestStaticProperties()
+        {
+            IDynamicProperty today = Create(typeof(DateTime).GetProperty("Today"));
+            Assert.AreEqual(DateTime.Today, today.GetValue(null));
+
+            IDynamicProperty myProperty = Create(typeof(MyStaticClass).GetProperty("MyProperty"));
+            myProperty.SetValue(null, "here we go...");
+            Assert.AreEqual("here we go...", myProperty.GetValue(null));
+        }
+
+#if NET_2_0
+        [Test, Ignore("test N/A anymore due to System.Reflection.Emit.DynamicMethod")]
+        [ExpectedException(typeof(MethodAccessException))]
+        public void TestForRestrictiveGetter()
+        {
+            Something something = new Something();
+
+            IDynamicProperty third = Create(typeof(Something).GetProperty("Third"));
+            //this should be ok, because both get and set of the "Third" property are public
+            third.SetValue(something, 456);
+            Assert.AreEqual(456, third.GetValue(something));
+
+            IDynamicProperty first = Create(typeof(Something).GetProperty("First"));
+            first.SetValue(something, 123);
+            //this should cause MethodAccessException, because get is private
+            Assert.AreEqual(123, first.GetValue(something));
+        }
+
+        [Test, Ignore("test N/A anymore due to System.Reflection.Emit.DynamicMethod")]
+        [ExpectedException(typeof(MethodAccessException))]
+        public void TestForRestrictiveSetter()
+        {
+            Something something = new Something();
+
+            IDynamicProperty third = Create(typeof(Something).GetProperty("Third"));
+            third.SetValue(something, 456);
+            //this should be ok, because both get and set of the "Third" property are public
+            Assert.AreEqual(456, third.GetValue(something));
+
+            IDynamicProperty second = Create(typeof(Something).GetProperty("Second"));
+            Assert.AreEqual(2, second.GetValue(something));
+            //this should cause MethodAccessException, because set is private in "Second" property
+            second.SetValue(something, 123);
+
+            //this should never execute
+            Assert.AreEqual(123, second.GetValue(something));
+        }
+#endif
+
+        #region Performance tests
+
+        private DateTime start, stop;
+
+        [Test]
+        [Explicit]
+        public void PerformanceTests()
+        {
+            int n = 10000000;
+            object x = null;
+
+            // tesla.PlaceOfBirth
+            start = DateTime.Now;
+            for (int i = 0; i < n; i++)
+            {
+                x = tesla.PlaceOfBirth;
+            }
+            stop = DateTime.Now;
+            PrintTest("tesla.PlaceOfBirth (direct)", n, Elapsed);
+
+            start = DateTime.Now;
+            IDynamicProperty placeOfBirth = DynamicProperty.Create(typeof(Inventor).GetProperty("PlaceOfBirth"));
+            for (int i = 0; i < n; i++)
+            {
+                x = placeOfBirth.GetValue(tesla);
+            }
+            stop = DateTime.Now;
+            PrintTest("tesla.PlaceOfBirth (dynamic reflection)", n, Elapsed);
+
+            start = DateTime.Now;
+            PropertyInfo placeOfBirthPi = typeof(Inventor).GetProperty("PlaceOfBirth");
+            for (int i = 0; i < n; i++)
+            {
+                x = placeOfBirthPi.GetValue(tesla, null);
+            }
+            stop = DateTime.Now;
+            PrintTest("tesla.PlaceOfBirth (standard reflection)", n, Elapsed);
+        }
+
+        private double Elapsed
+        {
+            get { return (stop.Ticks - start.Ticks) / 10000000f; }
+        }
+
+        private void PrintTest(string name, int iterations, double duration)
+        {
+            Debug.WriteLine(String.Format("{0,-60} {1,12:#,###} {2,12:##0.000} {3,12:#,###}", name, iterations, duration, iterations / duration));
+        }
+
+        #endregion
+    }
+
+    #region IL generation helper classes (they help if you look at them in Reflector ;-)
+
+    public class ValueTypeProperty : IDynamicProperty
+    {
+        public object GetValue(object target)
+        {
+            return ((Inventor)target).DOB;
+        }
+
+        public void SetValue(object target, object value)
+        {
+            ((Inventor)target).DOB = (DateTime)value;
+        }
+    }
+
+    public class ValueTypeTarget : IDynamicProperty
+    {
+        public object GetValue(object target)
+        {
+            return ((MyStruct)target).Year;
+        }
+
+        public void SetValue(object target, object value)
+        {
+            MyStruct o = (MyStruct)target;
+            o.Year = (int)value;
+        }
+    }
+
+    public class StaticProperty : IDynamicProperty
+    {
+        public object GetValue(object target)
+        {
+            return MyStaticClass.MyProperty;
+        }
+
+        public void SetValue(object target, object value)
+        {
+            MyStaticClass.MyProperty = (string)value;
+        }
+    }
+
+    #endregion
+
+    public class MyStaticClass
+    {
+        public const Int64 MyConst = 3456;
+        public static readonly string myReadonlyField = "hohoho";
+        public static string myField;
+
+        public static string MyProperty
+        {
+            get { return myField; }
+            set { myField = value; }
+        }
+    }
+
+    public struct MyStaticStruct
+    {
+        public const int constant = 20;
+        public static int staticYear;
+
+        public static int StaticYear
+        {
+            get { return staticYear; }
+            set { staticYear = value; }
+        }
+    }
+
+    public struct MyStruct
+    {
+        public int year;
+
+        public int Year
+        {
+            get { return year; }
+            set { year = value; }
+        }
+    }
+
+    public class ClassWithNonReadableProperty
+    {
+        private string myProperty;
+
+        public string MyProperty
+        {
+            set { myProperty = value; }
+        }
+    }
+
+#if NET_2_0
+    public class Something
+    {
+        public int First
+        {
+            private get { return first; }
+            set { first = value; }
+        }
+
+        public int Second
+        {
+            get { return second; }
+            private set { second = value; }
+        }
+
+        public int Third
+        {
+            get { return third; }
+            set { third = value; }
+        }
+        public Something()
+        {
+            first = 1;
+            second = 2;
+            third = 3;
+        }
+        private int first;
+        private int second;
+        private int third;
+
+    }
+#endif
+
+}
+
diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicConstructorTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicConstructorTests.cs
new file mode 100644
index 00000000..7f6a13d0
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicConstructorTests.cs
@@ -0,0 +1,152 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+	/// <summary>
+    /// Unit tests for the DynamicConstructor class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DynamicConstructorTests.cs,v 1.1 2007/08/08 04:06:01 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class DynamicConstructorTests
+    {
+        private Inventor tesla;
+        private Inventor pupin;
+        private Society ieee;
+
+	    #region SetUp and TearDown
+
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public void SetUp()
+        {
+            ContextRegistry.Clear();
+            tesla = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            tesla.Inventions = new string[]
+                {
+                    "Telephone repeater", "Rotating magnetic field principle",
+                    "Polyphase alternating-current system", "Induction motor",
+                    "Alternating-current power transmission", "Tesla coil transformer",
+                    "Wireless communication", "Radio", "Fluorescent lights"
+                };
+            tesla.PlaceOfBirth.City = "Smiljan";
+
+            pupin = new Inventor("Mihajlo Pupin", new DateTime(1854, 10, 9), "Serbian");
+            pupin.Inventions = new string[] { "Long distance telephony & telegraphy", "Secondary X-Ray radiation", "Sonar" };
+            pupin.PlaceOfBirth.City = "Idvor";
+            pupin.PlaceOfBirth.Country = "Serbia";
+
+            ieee = new Society();
+            ieee.Members.Add(tesla);
+            ieee.Members.Add(pupin);
+            ieee.Officers["president"] = pupin;
+            ieee.Officers["advisors"] = new Inventor[] { tesla, pupin }; // not historically accurate, but I need an array in the map ;-)
+        }
+	    
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            //DynamicReflectionManager.SaveAssembly();
+        }
+	    
+        #endregion
+        
+	    [Test]
+        public void TestConstructors() 
+        {
+            IDynamicConstructor newInventor = DynamicConstructor.Create(
+                typeof(Inventor).GetConstructor(new Type[] { typeof(string), typeof(DateTime), typeof(string) }));
+            Inventor ana = (Inventor) newInventor.Invoke(new object[] {"Ana Maria Seovic", new DateTime(2004, 8, 14), "Serbian"});
+            Assert.AreEqual("Ana Maria Seovic", ana.Name);
+
+            IDynamicConstructor newDate = DynamicConstructor.Create(
+                typeof(DateTime).GetConstructor(new Type[] { typeof(int), typeof(int), typeof(int) }));
+            Assert.AreEqual(DateTime.Today, newDate.Invoke(new object[] { DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day }));
+        }
+
+        #region Performance tests
+
+        private DateTime start, stop;
+
+        //[Test]
+        public void PerformanceTests()
+        {
+            int n = 10000000;
+            object x = null;
+
+            // new Inventor()
+            start = DateTime.Now;
+            for (int i = 0; i < n; i++)
+            {
+                x = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            }
+            stop = DateTime.Now;
+            PrintTest("new Inventor() (direct)", n, Elapsed);
+
+            start = DateTime.Now;
+            IDynamicConstructor newInventor = DynamicConstructor.Create(
+                typeof(Inventor).GetConstructor(new Type[] { typeof(string), typeof(DateTime), typeof(string) }));
+            for (int i = 0; i < n; i++)
+            {
+                object[] args = new object[] { "Nikola Tesla", new DateTime(1856, 7, 9), "Serbian" };
+                x = newInventor.Invoke(args);
+            }
+            stop = DateTime.Now;
+            PrintTest("new Inventor() (dynamic reflection)", n, Elapsed);
+
+            start = DateTime.Now;
+            ConstructorInfo newInventorCi = 
+                typeof(Inventor).GetConstructor(new Type[] { typeof(string), typeof(DateTime), typeof(string) });
+            for (int i = 0; i < n; i++)
+            {
+                object[] args = new object[] { "Nikola Tesla", new DateTime(1856, 7, 9), "Serbian" };
+                x = newInventorCi.Invoke(args);
+            }
+            stop = DateTime.Now;
+            PrintTest("new Inventor() (standard reflection)", n, Elapsed);
+        }
+
+        private double Elapsed
+        {
+            get { return (stop.Ticks - start.Ticks) / 10000000f; }
+        }
+
+        private void PrintTest(string name, int iterations, double duration)
+        {
+            Debug.WriteLine(String.Format("{0,-60} {1,12:#,###} {2,12:##0.000} {3,12:#,###}", name, iterations, duration, iterations / duration));
+        }
+
+        #endregion
+	    
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicFieldTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicFieldTests.cs
new file mode 100644
index 00000000..5ed6c81a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicFieldTests.cs
@@ -0,0 +1,267 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+	/// <summary>
+    /// Unit tests for the DynamicField class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DynamicFieldTests.cs,v 1.2 2008/05/16 10:02:41 oakinger Exp $</version>
+	[TestFixture]
+    public class DynamicFieldTests
+    {
+        protected Inventor tesla;
+        protected Inventor pupin;
+        protected Society ieee;
+
+	    #region SetUp and TearDown
+
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public void SetUp()
+        {
+            ContextRegistry.Clear();
+            tesla = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            tesla.Inventions = new string[]
+                {
+                    "Telephone repeater", "Rotating magnetic field principle",
+                    "Polyphase alternating-current system", "Induction motor",
+                    "Alternating-current power transmission", "Tesla coil transformer",
+                    "Wireless communication", "Radio", "Fluorescent lights"
+                };
+            tesla.PlaceOfBirth.City = "Smiljan";
+
+            pupin = new Inventor("Mihajlo Pupin", new DateTime(1854, 10, 9), "Serbian");
+            pupin.Inventions = new string[] { "Long distance telephony & telegraphy", "Secondary X-Ray radiation", "Sonar" };
+            pupin.PlaceOfBirth.City = "Idvor";
+            pupin.PlaceOfBirth.Country = "Serbia";
+
+            ieee = new Society();
+            ieee.Members.Add(tesla);
+            ieee.Members.Add(pupin);
+            ieee.Officers["president"] = pupin;
+            ieee.Officers["advisors"] = new Inventor[] { tesla, pupin }; // not historically accurate, but I need an array in the map ;-)
+        }
+	    
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            //DynamicReflectionManager.SaveAssembly();
+        }
+	    
+        #endregion
+        
+        protected virtual IDynamicField Create(FieldInfo field)
+        {
+            return DynamicField.Create(field);
+        }
+
+	    [Test]
+        public void TestInstanceFields() 
+        {
+            IDynamicField name = Create(typeof(Inventor).GetField("Name"));
+	        Assert.AreEqual(tesla.Name, name.GetValue(tesla));
+            name.SetValue(tesla, "Tesla, Nikola");
+            Assert.AreEqual("Tesla, Nikola", tesla.Name);
+            Assert.AreEqual("Tesla, Nikola", name.GetValue(tesla));
+
+            MyStruct myYearHolder = new MyStruct();
+            myYearHolder.Year = 2004;
+            IDynamicField year = Create(typeof(MyStruct).GetField("year", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static));
+            Assert.AreEqual(2004, year.GetValue(myYearHolder));
+        }
+
+        [Test]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void TestAttemptingToSetFieldOfValueTypeInstance()
+        {
+            MyStruct myYearHolder = new MyStruct();
+            IDynamicField year = Create(typeof(MyStruct).GetField("year"));
+            year.SetValue(myYearHolder, 2004);
+        }
+	    
+	    [Test]
+        public void TestStaticFieldsOfClass()
+        {
+            IDynamicField myField = Create(typeof(MyStaticClass).GetField("myField"));
+            myField.SetValue(null, "here we go...");
+
+            IDynamicField myConst = Create(typeof(MyStaticClass).GetField("MyConst"));
+            Assert.AreEqual(3456, myConst.GetValue(null));
+            try {
+                myConst.SetValue(null, 7890);
+            }
+            catch(InvalidOperationException){}
+
+            IDynamicField myReadonlyField = Create(typeof(MyStaticClass).GetField("myReadonlyField"));
+            Assert.AreEqual("hohoho", myReadonlyField.GetValue(null));
+            try {
+                myReadonlyField.SetValue(null, "some other string");
+            }
+            catch(InvalidOperationException){}
+        }
+
+	    [Test]
+        public void TestStaticFieldsOfStruct()
+        {
+            // static readonly
+            IDynamicField maxValue = Create(typeof(DateTime).GetField("MaxValue"));
+            Assert.AreEqual(DateTime.MaxValue, maxValue.GetValue(null));
+            try {
+                maxValue.SetValue(null, DateTime.Now);
+            }
+            catch(InvalidOperationException){}
+
+            // const
+	        IDynamicField int64max = Create(typeof(Int64).GetField("MaxValue", BindingFlags.Public | BindingFlags.Static));
+            Assert.AreEqual(Int64.MaxValue, int64max.GetValue(null));
+            try {
+                int64max.SetValue(null, 0);
+            }
+            catch(InvalidOperationException){}
+
+            // pure static
+            IDynamicField myField = Create(typeof(MyStaticStruct).GetField("staticYear"));
+            myField.SetValue(null, 2008);
+            Assert.AreEqual(2008, myField.GetValue(null));
+        }
+
+        #region Performance tests
+
+        private DateTime start, stop;
+
+        //[Test]
+        public void PerformanceTests()
+        {
+            int n = 10000000;
+            object x = null;
+
+            // tesla.Name
+            start = DateTime.Now;
+            for (int i = 0; i < n; i++)
+            {
+                x = tesla.Name;
+            }
+            stop = DateTime.Now;
+            PrintTest("tesla.Name (direct)", n, Elapsed);
+
+            start = DateTime.Now;
+            IDynamicField placeOfBirth = Create(typeof(Inventor).GetField("Name"));
+            for (int i = 0; i < n; i++)
+            {
+                x = placeOfBirth.GetValue(tesla);
+            }
+            stop = DateTime.Now;
+            PrintTest("tesla.Name (dynamic reflection)", n, Elapsed);
+
+            start = DateTime.Now;
+            FieldInfo placeOfBirthFi = typeof(Inventor).GetField("Name");
+            for (int i = 0; i < n; i++)
+            {
+                x = placeOfBirthFi.GetValue(tesla);
+            }
+            stop = DateTime.Now;
+            PrintTest("tesla.Name (standard reflection)", n, Elapsed);
+        }
+
+        private double Elapsed
+        {
+            get { return (stop.Ticks - start.Ticks) / 10000000f; }
+        }
+
+        private void PrintTest(string name, int iterations, double duration)
+        {
+            Debug.WriteLine(String.Format("{0,-60} {1,12:#,###} {2,12:##0.000} {3,12:#,###}", name, iterations, duration, iterations / duration));
+        }
+
+        #endregion
+	    
+    }
+
+    #region IL generation helper classes (they help if you look at them in Reflector ;-)
+
+    public class ValueTypeField : IDynamicField
+    {
+        public object GetValue(object target)
+        {
+            return ((Inventor) target).Name;
+        }
+
+        public void SetValue(object target, object value)
+        {
+            ((Inventor)target).Name = (string) value;
+        }
+    }
+
+    public class ValueTypeTargetField : IDynamicField
+    {
+        public object GetValue(object target)
+        {
+            return ((MyStruct) target).year;
+        }
+
+        public void SetValue(object target, object value)
+        {
+            MyStruct o = (MyStruct) target;
+            o.Year = (int) value;
+        }
+    }
+    
+    public class StaticField : IDynamicField
+    {
+        public object GetValue(object target)
+        {
+            return MyStaticClass.myField;
+        }
+
+        public void SetValue(object target, object value)
+        {
+            MyStaticClass.myField = (string) value;
+        }
+    }
+
+    public class StaticConst : IDynamicField
+    {
+        public object GetValue(object target)
+        {
+            return MyStaticClass.MyConst;
+        }
+
+        public void SetValue(object target, object value)
+        {
+        }
+    }
+    
+    #endregion
+    
+}
diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicIndexerTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicIndexerTests.cs
new file mode 100644
index 00000000..934fa3b2
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicIndexerTests.cs
@@ -0,0 +1,155 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+	/// <summary>
+    /// Unit tests for the DynamicIndexer class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DynamicIndexerTests.cs,v 1.1 2007/08/08 04:06:01 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class DynamicIndexerTests
+    {
+        private Inventor tesla;
+        private Inventor pupin;
+        private Society ieee;
+
+	    #region SetUp and TearDown
+
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public void SetUp()
+        {
+            ContextRegistry.Clear();
+            tesla = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            tesla.Inventions = new string[]
+                {
+                    "Telephone repeater", "Rotating magnetic field principle",
+                    "Polyphase alternating-current system", "Induction motor",
+                    "Alternating-current power transmission", "Tesla coil transformer",
+                    "Wireless communication", "Radio", "Fluorescent lights"
+                };
+            tesla.PlaceOfBirth.City = "Smiljan";
+
+            pupin = new Inventor("Mihajlo Pupin", new DateTime(1854, 10, 9), "Serbian");
+            pupin.Inventions = new string[] { "Long distance telephony & telegraphy", "Secondary X-Ray radiation", "Sonar" };
+            pupin.PlaceOfBirth.City = "Idvor";
+            pupin.PlaceOfBirth.Country = "Serbia";
+
+            ieee = new Society();
+            ieee.Members.Add(tesla);
+            ieee.Members.Add(pupin);
+            ieee.Officers["president"] = pupin;
+            ieee.Officers["advisors"] = new Inventor[] { tesla, pupin }; // not historically accurate, but I need an array in the map ;-)
+        }
+	    
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            //DynamicReflectionManager.SaveAssembly();
+        }
+	    
+        #endregion
+        
+	    [Test]
+        public void TestIndexers() 
+        {
+            IDynamicIndexer members = DynamicIndexer.Create(typeof(ArrayList).GetProperty("Item"));
+            Inventor nikola = (Inventor) members.GetValue(ieee.Members, new object[] { 0 });
+            Assert.AreEqual(tesla, nikola);
+            members.SetValue(ieee.Members, new object[] { 0 }, new Inventor("Ana Maria Seovic", new DateTime(2004, 8, 14), "Serbian"));
+            Assert.AreEqual("Ana Maria Seovic", ((Inventor) members.GetValue(ieee.Members, 0)).Name);
+            members.SetValue(ieee.Members, 1, tesla);
+            Assert.AreEqual("Nikola Tesla", ((Inventor) members.GetValue(ieee.Members, 1)).Name);
+	        
+            IDynamicIndexer officers = DynamicIndexer.Create(typeof(Hashtable).GetProperty("Item"));
+            Assert.AreEqual(pupin, officers.GetValue(ieee.Officers, new object[] {"president"}));
+            officers.SetValue(ieee.Officers, "president",
+                              new Inventor("Aleksandar Seovic", new DateTime(1974, 8, 24), "Serbian"));
+            Assert.AreEqual("Aleksandar Seovic", ((Inventor)officers.GetValue(ieee.Officers, "president")).Name);
+        }
+
+        #region Performance tests
+
+        private DateTime start, stop;
+
+        //[Test]
+        public void PerformanceTests()
+        {
+            int n = 10000000;
+            object x = null;
+
+            // ieee.Members[0]
+            start = DateTime.Now;
+            for (int i = 0; i < n; i++)
+            {
+                x = ieee.Members[0];
+            }
+            stop = DateTime.Now;
+            PrintTest("ieee.Members[0] (direct)", n, Elapsed);
+
+            start = DateTime.Now;
+            IDynamicIndexer members = DynamicIndexer.Create(typeof(ArrayList).GetProperty("Item"));
+            for (int i = 0; i < n; i++)
+            {
+                x = members.GetValue(ieee.Members, 0);
+            }
+            stop = DateTime.Now;
+            PrintTest("ieee.Members[0] (dynamic reflection)", n, Elapsed);
+
+            start = DateTime.Now;
+            PropertyInfo membersPi = typeof(ArrayList).GetProperty("Item");
+            object[] indexArgs = new object[] { 0 };
+            for (int i = 0; i < n; i++)
+            {
+                x = membersPi.GetValue(ieee.Members, indexArgs);
+            }
+            stop = DateTime.Now;
+            PrintTest("ieee.Members[0] (standard reflection)", n, Elapsed);
+        }
+
+        private double Elapsed
+        {
+            get { return (stop.Ticks - start.Ticks) / 10000000f; }
+        }
+
+        private void PrintTest(string name, int iterations, double duration)
+        {
+            Debug.WriteLine(String.Format("{0,-60} {1,12:#,###} {2,12:##0.000} {3,12:#,###}", name, iterations, duration, iterations / duration));
+        }
+
+        #endregion
+	    
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicMethodTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicMethodTests.cs
new file mode 100644
index 00000000..2b485327
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicMethodTests.cs
@@ -0,0 +1,296 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Context.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+	/// <summary>
+    /// Unit tests for the DynamicMethod class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DynamicMethodTests.cs,v 1.1 2007/08/08 04:06:01 bbaia Exp $</version>
+	[TestFixture]
+    public sealed class DynamicMethodTests
+    {
+        private Inventor tesla;
+        private Inventor pupin;
+        private Society ieee;
+
+	    #region SetUp and TearDown
+
+        /// <summary>
+        /// The setup logic executed before the execution of each individual test.
+        /// </summary>
+        [SetUp]
+        public void SetUp()
+        {
+            ContextRegistry.Clear();
+            tesla = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            tesla.Inventions = new string[]
+                {
+                    "Telephone repeater", "Rotating magnetic field principle",
+                    "Polyphase alternating-current system", "Induction motor",
+                    "Alternating-current power transmission", "Tesla coil transformer",
+                    "Wireless communication", "Radio", "Fluorescent lights"
+                };
+            tesla.PlaceOfBirth.City = "Smiljan";
+
+            pupin = new Inventor("Mihajlo Pupin", new DateTime(1854, 10, 9), "Serbian");
+            pupin.Inventions = new string[] { "Long distance telephony & telegraphy", "Secondary X-Ray radiation", "Sonar" };
+            pupin.PlaceOfBirth.City = "Idvor";
+            pupin.PlaceOfBirth.Country = "Serbia";
+
+            ieee = new Society();
+            ieee.Members.Add(tesla);
+            ieee.Members.Add(pupin);
+            ieee.Officers["president"] = pupin;
+            ieee.Officers["advisors"] = new Inventor[] { tesla, pupin }; // not historically accurate, but I need an array in the map ;-)
+        }
+	    
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            //DynamicReflectionManager.SaveAssembly();
+        }
+	    
+        #endregion
+        
+	    [Test]
+        public void TestInstanceMethods() 
+        {
+            IDynamicMethod getAge = DynamicMethod.Create(typeof(Inventor).GetMethod("GetAge"));
+            Assert.AreEqual(tesla.GetAge(DateTime.Today), getAge.Invoke(tesla, new object[] {DateTime.Today}));
+
+	        MethodTarget target = new MethodTarget();
+            IDynamicMethod test = DynamicMethod.Create(typeof(MethodTarget).GetMethod("MethodReturningString"));
+            Assert.AreEqual(tesla.Name, test.Invoke(target, new object[] { 5, DateTime.Today, new String[] {"xyz", "abc"}, tesla}));
+
+	        ArrayList list = new ArrayList(new string[] {"one", "two", "three"});
+            IDynamicMethod removeAt = DynamicMethod.Create(typeof(ArrayList).GetMethod("RemoveAt"));
+            removeAt.Invoke(list, new object[] {1});
+	        Assert.AreEqual(2, list.Count);
+	        Assert.AreEqual("three", list[1]);
+        }
+
+	    [Test]
+        public void TestStaticMethods()
+        {
+            IDynamicMethod isNullOrEmpty = DynamicMethod.Create(typeof(StringUtils).GetMethod("IsNullOrEmpty"));
+            Assert.IsTrue((bool) isNullOrEmpty.Invoke(null, new object[] { null }));
+            Assert.IsTrue((bool) isNullOrEmpty.Invoke(null, new object[] { String.Empty }));
+            Assert.IsFalse((bool) isNullOrEmpty.Invoke(null, new object[] { "Ana Maria" }));
+        }
+
+	    [Test]
+        public void TestRefOutMethods()
+	    {
+            IDynamicMethod refMethod = DynamicMethod.Create(typeof(MethodTarget).GetMethod("MethodWithRefParameter"));
+
+            MethodTarget target = new MethodTarget();
+            object[] args = new object[] {"aleks", 5};
+	        refMethod.Invoke(target, args);
+            Assert.AreEqual("ALEKS", args[0]);
+            Assert.AreEqual(25, args[1]);
+
+            IDynamicMethod outMethod = DynamicMethod.Create(typeof(MethodTarget).GetMethod("MethodWithOutParameter"));
+            args = new object[] { "aleks", null };
+            outMethod.Invoke(target, args);
+            Assert.AreEqual("ALEKS", args[1]);
+
+            IDynamicMethod refOutMethod = DynamicMethod.Create(typeof(RefOutTestObject).GetMethod("DoIt"));
+            RefOutTestObject refOutTarget = new RefOutTestObject();
+
+            args = new object[] { 0, 1, null };
+            refOutMethod.Invoke(refOutTarget, args);
+            Assert.AreEqual(2, args[1]);
+            Assert.AreEqual("done", args[2]);
+            refOutMethod.Invoke(refOutTarget, args);
+            Assert.AreEqual(3, args[1]);
+            Assert.AreEqual("done", args[2]);
+
+	        int count = 0;
+	        string done;
+            target.DoItCaller(0, ref count, out done);
+            Assert.AreEqual(1, count);
+            Assert.AreEqual("done", done);
+        }
+	    
+        #region Performance tests
+
+        private DateTime start, stop;
+
+        //[Test]
+        public void PerformanceTests()
+        {
+            int n = 10000000;
+            object x = null;
+
+            // tesla.GetAge
+            start = DateTime.Now;
+            for (int i = 0; i < n; i++)
+            {
+                x = tesla.GetAge(DateTime.Today);
+            }
+            stop = DateTime.Now;
+            PrintTest("tesla.GetAge (direct)", n, Elapsed);
+
+            start = DateTime.Now;
+            IDynamicMethod getAge = DynamicMethod.Create(typeof(Inventor).GetMethod("GetAge"));
+            for (int i = 0; i < n; i++)
+            {
+                object[] args = new object[] { DateTime.Today };
+                x = getAge.Invoke(tesla, args);
+            }
+            stop = DateTime.Now;
+            PrintTest("tesla.GetAge (dynamic reflection)", n, Elapsed);
+
+            start = DateTime.Now;
+            MethodInfo getAgeMi = typeof(Inventor).GetMethod("GetAge");
+            for (int i = 0; i < n; i++)
+            {
+                object[] args = new object[] { DateTime.Today };
+                x = getAgeMi.Invoke(tesla, args);
+            }
+            stop = DateTime.Now;
+            PrintTest("tesla.GetAge (standard reflection)", n, Elapsed);
+        }
+
+        private double Elapsed
+        {
+            get { return (stop.Ticks - start.Ticks) / 10000000f; }
+        }
+
+        private void PrintTest(string name, int iterations, double duration)
+        {
+            Debug.WriteLine(String.Format("{0,-60} {1,12:#,###} {2,12:##0.000} {3,12:#,###}", name, iterations, duration, iterations / duration));
+        }
+
+        #endregion
+	    
+    }
+
+    #region IL generation helper classes (they help if you look at them in Reflector ;-)
+
+    public class InstanceMethod : IDynamicMethod
+    {
+        public object Invoke(object target, object[] args)
+        {
+            return ((MethodTarget) target).MethodReturningString(
+                (int) args[0], (DateTime) args[1], (string[]) args[2], (Inventor) args[3]);
+        }
+
+        public object InvokeVoid(object target, object[] args)
+        {
+            ((MethodTarget) target).RemoveAt(5);
+            return null;
+        }
+
+        public object InvokeWithOut(object target, object[] args)
+        {
+            string outVar = null;
+            ((MethodTarget)target).MethodWithOutParameter((string) args[0], out outVar);
+            args[1] = outVar;
+            return null;
+        }
+
+        public object InvokeWithRef(object target, object[] args)
+        {
+            string refVar1 = (string) args[0];
+            int refVar2 = (int) args[0];
+            ((MethodTarget)target).MethodWithRefParameter(ref refVar1, ref refVar2);
+            args[0] = refVar1;
+            args[1] = refVar2;
+            return null;
+        }
+
+        public object InvokeDoIt(object target, object[] args)
+        {
+            int reference = (int) args[1];
+            string output;
+            ((RefOutTestObject) target).DoIt((int) args[0], ref reference, out output);
+            args[1] = reference;
+            args[2] = output;
+            return null;
+        }
+    }
+
+    public class MethodTarget
+    {
+        public string MethodReturningString(int arg1, DateTime arg2, string[] arg3, Inventor arg4)
+        {
+            return arg4.Name;
+        }
+        
+        public void RemoveAt(int index)
+        {}
+
+        public void MethodWithOutParameter(string lower, out string upper)
+        {
+            upper = lower.ToUpper();
+        }
+
+        public void MethodWithRefParameter(ref string lowerUpper, ref int square)
+        {
+            lowerUpper = lowerUpper.ToUpper();
+            square = square * square;
+        }
+
+        public void DoItCaller(int count, ref int reference, out string output)
+        {
+            InstanceMethod caller = new InstanceMethod();
+
+            RefOutTestObject target = new RefOutTestObject();
+            object[] args = new object[] {count, reference, null};
+            caller.InvokeDoIt(target, args);
+
+            reference = (int) args[1];
+            output = (string) args[2];
+        }
+    }
+
+    public interface IRefOutTestObject
+    {
+        void DoIt(int count, ref int reference, out string output);
+    }
+
+    public class RefOutTestObject : IRefOutTestObject
+    {
+        public void DoIt(int count, ref int reference, out string output)
+        {
+            output = "done";
+            reference++;
+        }
+    }
+
+    #endregion
+ 
+   
+}
diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicPropertyTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicPropertyTests.cs
new file mode 100644
index 00000000..021a7893
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/DynamicPropertyTests.cs
@@ -0,0 +1,82 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+	/// <summary>
+    /// Unit tests for the DynamicProperty class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: DynamicPropertyTests.cs,v 1.3 2008/05/17 11:05:27 oakinger Exp $</version>
+	[TestFixture]
+    public class DynamicPropertyTests : BasePropertyTests
+    {
+       protected override IDynamicProperty Create(PropertyInfo property)
+        {
+            return DynamicProperty.Create(property);
+        }
+
+        [Test]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void TestNonReadableProperties()
+        {
+            IDynamicProperty nonReadableProperty = 
+                Create(typeof(ClassWithNonReadableProperty).GetProperty("MyProperty"));
+            nonReadableProperty.GetValue(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void TestNonWritableInstanceProperty()
+        {
+            IDynamicProperty nonWritableProperty =
+                Create(typeof(Inventor).GetProperty("PlaceOfBirth"));
+            nonWritableProperty.SetValue(null, null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void TestAttemptingToSetPropertyOfValueTypeInstance()
+        {
+            MyStruct myYearHolder = new MyStruct();
+            IDynamicProperty year = Create(typeof(MyStruct).GetProperty("Year"));
+            year.SetValue(myYearHolder, 2004);
+        }
+        
+        [Test]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void TestNonWritableStaticProperty()
+        {
+            IDynamicProperty nonWritableProperty =
+                Create(typeof(DateTime).GetProperty("Today"));
+            nonWritableProperty.SetValue(null, null);
+        }	    
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafeFieldTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafeFieldTests.cs
new file mode 100644
index 00000000..0a366d40
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafeFieldTests.cs
@@ -0,0 +1,307 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+    /// <summary>
+    /// Unit tests for the SafeField class. SafeField must pass the same tests 
+    /// as DynamicField plus tests for accessing private members.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: SafeFieldTests.cs,v 1.1 2008/05/16 10:02:41 oakinger Exp $</version>
+    [TestFixture]
+    public class SafeFieldTests : DynamicFieldTests
+    {
+        protected override IDynamicField Create(FieldInfo field)
+        {
+            return new SafeField(field);
+        }
+
+        private static FieldInfo IField(Type type, string fieldName)
+        {
+            return type.GetField(fieldName, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
+        }
+
+        private static FieldInfo SField(Type t, string fieldName)
+        {
+            return t.GetField(fieldName, BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void ThrowsOnNullField()
+        {
+            SafeField field = new SafeField(null);
+        }
+
+        [Test]
+        public void TestStaticMembersOfStruct()
+        {
+            TestStaticMembersOf(typeof(MyStructWithPrivateFields), MyStructWithPrivateFields.GetStaticReadonlyRefValue());
+        }
+
+        [Test]
+        public void TestStaticMembersOfClass()
+        {
+            TestStaticMembersOf(typeof(MyClassWithPrivateFields), MyClassWithPrivateFields.GetStaticReadonlyRefValue());
+        }
+
+        private void TestStaticMembersOf(Type type, object expectedRoRefValue)
+        {
+            // ro const int
+            SafeField constField = new SafeField(SField(type, "constantValue"));
+            Assert.AreEqual(5, constField.GetValue(null));
+            try { constField.SetValue(null, 3); }
+            catch (InvalidOperationException) { }
+
+            // ro static readonly int
+            SafeField roVtField = new SafeField(SField(type, "staticReadonlyVTValue"));
+            Assert.AreEqual(11, roVtField.GetValue(null));
+            try { roVtField.SetValue(null, 10); }
+            catch (InvalidOperationException) { }
+
+            // ro static readonly object
+            SafeField roRefField = new SafeField(SField(type, "staticReadonlyRefValue"));
+            Assert.AreSame(expectedRoRefValue, roRefField.GetValue(null));
+            try { roRefField.SetValue(null, new object()); }
+            catch (InvalidOperationException) { }
+
+            // rw static int
+            SafeField vtField = new SafeField(SField(type, "staticVTValue"));
+            vtField.SetValue(null, 10);
+            Assert.AreEqual(10, vtField.GetValue(null));
+
+            // rw static object
+            SafeField refField = new SafeField(SField(type, "staticRefValue"));
+            object o = new object();
+            refField.SetValue(null, o);
+            Assert.AreSame(o, refField.GetValue(null));
+        }
+
+        [Test]
+        public void TestInstanceMembersOfStruct()
+        {
+            object testref1 = new object();
+            object testref2 = new object();
+            MyStructWithPrivateFields myStruct;
+
+            // ro readonly int
+            myStruct = new MyStructWithPrivateFields(123, testref1, 456, testref2);
+            SafeField instanceReadonlyVtField = new SafeField(IField(myStruct.GetType(), "instanceReadonlyVTValue"));
+            Assert.AreEqual(123, instanceReadonlyVtField.GetValue(myStruct));
+            try { instanceReadonlyVtField.SetValue(myStruct, 10); }
+            catch (InvalidOperationException) { }
+
+            // ro readonly object
+            myStruct = new MyStructWithPrivateFields(123, testref1, 456, testref2);
+            SafeField instanceReadonlyRefField = new SafeField(IField(myStruct.GetType(), "instanceReadonlyRefValue"));
+            Assert.AreSame(testref1, instanceReadonlyRefField.GetValue(myStruct));
+            try { instanceReadonlyRefField.SetValue(myStruct, this); }
+            catch (InvalidOperationException) { }
+
+            // ro int
+            myStruct = new MyStructWithPrivateFields(123, testref1, 456, testref2);
+            SafeField instanceVtField = new SafeField(IField(myStruct.GetType(), "instanceVTValue"));
+            Assert.AreEqual(456, instanceVtField.GetValue(myStruct));
+            try { instanceVtField.SetValue(myStruct, 10); }
+            catch (InvalidOperationException) { }
+
+            // ro object
+            myStruct = new MyStructWithPrivateFields(123, testref1, 456, testref2);
+            SafeField instanceRefField = new SafeField(IField(myStruct.GetType(), "instanceRefValue"));
+            Assert.AreSame(testref2, instanceRefField.GetValue(myStruct));
+            try { instanceRefField.SetValue(myStruct, 10); }
+            catch (InvalidOperationException) { }
+        }
+
+        [Test]
+        public void TestInstanceMembersOfClass()
+        {
+            object testref1 = new object();
+            object testref2 = new object();
+            MyClassWithPrivateFields myClass;
+
+            // ro readonly int
+            myClass = new MyClassWithPrivateFields(123, testref1, 456, testref2);
+            SafeField instanceReadonlyVtField = new SafeField(IField(myClass.GetType(), "instanceReadonlyVTValue"));
+            Assert.AreEqual(123, instanceReadonlyVtField.GetValue(myClass));
+            try { instanceReadonlyVtField.SetValue(myClass, 10); }
+            catch (InvalidOperationException) { }
+
+            // ro readonly object
+            myClass = new MyClassWithPrivateFields(123, testref1, 456, testref2);
+            SafeField instanceReadonlyRefField = new SafeField(IField(myClass.GetType(), "instanceReadonlyRefValue"));
+            Assert.AreSame(testref1, instanceReadonlyRefField.GetValue(myClass));
+            try { instanceReadonlyRefField.SetValue(myClass, this); }
+            catch (InvalidOperationException) { }
+
+            // rw int
+            myClass = new MyClassWithPrivateFields(123, testref1, 456, testref2);
+            SafeField instanceVtField = new SafeField(IField(myClass.GetType(), "instanceVTValue"));
+            Assert.AreEqual(456, instanceVtField.GetValue(myClass));
+            instanceVtField.SetValue(myClass, 9182);
+            Assert.AreEqual(9182, instanceVtField.GetValue(myClass));
+
+            // rw object
+            myClass = new MyClassWithPrivateFields(123, testref1, 456, testref2);
+            SafeField instanceRefField = new SafeField(IField(myClass.GetType(), "instanceRefValue"));
+            Assert.AreSame(testref2, instanceRefField.GetValue(myClass));
+            instanceRefField.SetValue(myClass, testref1);
+            Assert.AreSame(testref1, instanceRefField.GetValue(myClass));
+        }
+
+        [Test, Explicit]
+        public void SafeFieldPerformanceTests()
+        {
+            int runs = 10000000;
+            object myClass = new MyClassWithPrivateFields(123, new object(), 456, new object());
+            FieldInfo fieldClassRefValue = IField(myClass.GetType(), "instanceRefValue");
+            FieldInfo fieldClassVtValue = IField(myClass.GetType(), "instanceVTValue");
+
+            StopWatch stopWatch = new StopWatch();
+            using (stopWatch.Start("Duration Class Set/Get field value: {0}"))
+            {
+                for(int i=0;i<runs;i++)
+                {
+                    SafeField instanceRefField = new SafeField(fieldClassRefValue);
+                    SafeField instanceVtField = new SafeField(fieldClassVtValue);
+            
+                    int res = (int) instanceVtField.GetValue( myClass );
+                    object ores = instanceRefField.GetValue( myClass );
+                }
+            }
+
+            object myStruct = new MyStructWithPrivateFields(123, new object(), 456, new object());
+            FieldInfo fieldStructRefValue = IField(myStruct.GetType(), "instanceRefValue");
+            FieldInfo fieldStructVtValue = IField(myStruct.GetType(), "instanceVTValue");
+            
+            using (stopWatch.Start("Duration Struct Set/Get field value: {0}"))
+            {
+                for(int i=0;i<runs;i++)
+                {
+                    SafeField instanceRefField = new SafeField(fieldStructRefValue);
+                    SafeField instanceVtField = new SafeField(fieldStructVtValue);
+
+                    int res = (int) instanceVtField.GetValue( myStruct );
+                    object ores = instanceRefField.GetValue( myStruct );
+                }
+            }
+
+            /* on my machine prints
+                
+             with System.Reflection.Emit.DynamicMethod generated code:
+                Duration Class Set/Get field value: 00:00:03.2031250
+                Duration Struct Set/Get field value: 00:00:03.5625000
+             
+             with standard reflection:
+                Duration Class Set/Get field value: 00:00:45.4218750
+                Duration Struct Set/Get field value: 00:00:44.5312500
+             
+             */
+        }
+    }
+
+    #region Test Classes
+
+    public struct MyStructWithPrivateFields
+    {
+        // static part
+        private static int staticVTValue;
+        private static object staticRefValue;
+        private static readonly int staticReadonlyVTValue = 11;
+        private static readonly object staticReadonlyRefValue = new object();
+        private const int constantValue = 5;
+
+        public static object GetStaticReadonlyRefValue() { return staticReadonlyRefValue; }
+        public static int GetStaticVTValue() { return staticVTValue; }
+        public static object GetStaticRefValue() { return staticRefValue; }
+
+        static MyStructWithPrivateFields()
+        {
+            staticVTValue = staticReadonlyVTValue + constantValue + 123; // make compiler happy and avoid "unused" warnings
+            staticRefValue = new object();
+        }
+
+        // instance part
+        private int instanceVTValue;
+        private readonly int instanceReadonlyVTValue;
+        private object instanceRefValue;
+        private readonly object instanceReadonlyRefValue;
+
+        public MyStructWithPrivateFields(int roVtValue, object roRefValue, int vtValue, object refValue)
+        {
+            instanceReadonlyVTValue = roVtValue;
+            instanceReadonlyRefValue = roRefValue;
+            instanceVTValue = vtValue;
+            instanceRefValue = refValue;
+        }
+
+        public void SetInstanceVTValue(int val) { instanceVTValue = val; }
+        public void SetInstanceRefValue(object val) { instanceRefValue = val; }
+
+    }
+
+    public class MyClassWithPrivateFields
+    {
+        // static part
+        private static int staticVTValue;
+        private static object staticRefValue;
+        private static readonly int staticReadonlyVTValue = 11;
+        private static readonly object staticReadonlyRefValue = new object();
+        private const int constantValue = 5;
+
+        public static object GetStaticReadonlyRefValue() { return staticReadonlyRefValue; }
+        public static int GetStaticVTValue() { return staticVTValue; }
+        public static object GetStaticRefValue() { return staticRefValue; }
+
+        static MyClassWithPrivateFields()
+        {
+            staticVTValue = staticReadonlyVTValue + constantValue + 654; // make compiler happy and avoid "unused" warnings
+            staticRefValue = new object();
+        }
+
+        // instance part
+        private int instanceVTValue;
+        private readonly int instanceReadonlyVTValue;
+        private object instanceRefValue;
+        private readonly object instanceReadonlyRefValue;
+
+        public MyClassWithPrivateFields(int roVtValue, object roRefValue, int vtValue, object refValue)
+        {
+            instanceReadonlyVTValue = roVtValue;
+            instanceReadonlyRefValue = roRefValue;
+            instanceVTValue = vtValue;
+            instanceRefValue = refValue;
+        }
+
+        public void SetInstanceVTValue(int val) { instanceVTValue = val; }
+        public void SetInstanceRefValue(object val) { instanceRefValue = val; }
+    }
+
+    #endregion
+}
diff --git a/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafePropertyTests.cs b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafePropertyTests.cs
new file mode 100644
index 00000000..f2388504
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Reflection/Dynamic/SafePropertyTests.cs
@@ -0,0 +1,164 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Reflection.Dynamic
+{
+    /// <summary>
+    /// Unit tests for the SafeProperty class. SafeProperty must pass the same tests 
+    /// as DynamicField plus tests for accessing private members.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: SafePropertyTests.cs,v 1.1 2008/05/17 11:05:27 oakinger Exp $</version>
+    [TestFixture]
+    public class SafePropertyTests : BasePropertyTests
+    {
+        protected override IDynamicProperty Create(PropertyInfo property)
+        {
+            return new SafeProperty(property);
+        }
+
+#if NET_2_0
+        [Test]
+        public void TestForRestrictiveSetterWithSafeWrapper()
+        {
+            Something something = new Something();
+
+            IDynamicProperty third = Create(typeof(Something).GetProperty("Third"));
+            third.SetValue(something, 456);
+            //this should be ok, because both get and set of the "Third" property are public
+            Assert.AreEqual(456, third.GetValue(something));
+
+            IDynamicProperty second = Create(typeof(Something).GetProperty("Second"));
+            Assert.AreEqual(2, second.GetValue(something));
+            //this should not cause MethodAccessException because "second" is created using "CreateSafe"
+            second.SetValue(something, 123);
+            
+            Assert.AreEqual(123, second.GetValue(something));
+        }
+
+        [Test]        
+        public void TestForRestrictiveGetterWithSafeWrapper()
+        {
+            Something something = new Something();
+            //new SafeProperty()
+            IDynamicProperty third = Create(typeof(Something).GetProperty("Third"));
+            //this should be ok, because both get and set of the "Third" property are public
+            third.SetValue(something, 456);
+            Assert.AreEqual(456, third.GetValue(something));
+            
+            IDynamicProperty first = Create(typeof(Something).GetProperty("First"));
+            first.SetValue(something, 123);
+            //this should not cause MethodAccessException, "first" is createtd using "CreateSafe"
+            Assert.AreEqual(123, first.GetValue(something));
+        }	
+#endif
+    }
+
+    #region Test Classes
+
+    public class MyClassWithPrivateProperties
+    {
+        public static object s_staticRef;
+        public static int s_staticVt;
+        public object _ref;
+        public int _vt;
+
+        public MyClassWithPrivateProperties(object @ref, int vt)
+        {
+            _ref = @ref;
+            _vt = vt;
+        }
+
+        private static object StaticRef
+        {
+            get { return s_staticRef; }
+            set { s_staticRef = value; }
+        }
+
+        private static object StaticRefRo
+        {
+            get { return s_staticRef; }
+        }
+
+        private static object StaticRefWo
+        {
+            set { s_staticRef = value; }
+        }
+
+        private static int StaticVt
+        {
+            get { return s_staticVt; }
+            set { s_staticVt = value; }
+        }
+
+        private static int StaticVtRo
+        {
+            get { return s_staticVt; }
+        }
+
+        private static int StaticVtWo
+        {
+            set { s_staticVt = value; }
+        }
+
+        private object Ref
+        {
+            get { return _ref; }
+            set { _ref = value; }
+        }
+
+        private object RefRo
+        {
+            get { return _ref; }
+        }
+
+        private object RefWo
+        {
+            set { _ref = value; }
+        }
+
+        private int Vt
+        {
+            get { return _vt; }
+            set { _vt = value; }
+        }
+
+        private int VtRo
+        {
+            get { return _vt; }
+        }
+
+        private int VtWo
+        {
+            set { _vt = value; }
+        }
+    }
+
+
+    #endregion
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Resources/Images.resx b/test/Spring/Spring.Core.Tests/Resources/Images.resx
new file mode 100644
index 00000000..b725b654
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Resources/Images.resx
@@ -0,0 +1,430 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="bubblechamber" type="System.Drawing.Bitmap, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhkgB3APcAAP///zk5OUJCQjkxMXNaWlpCQoxaWoQ5OaVrY4RSSqVjWueUhNaEc5RaSs6Ea3NC
+        Ma1jSmMxIbVzWloxId6Ma0o5MTkYCIRSOUIhENaMY6VrSu+ca8Z7Uq1jObVzSlIpEIRrWlpCMe+lc86E
+        UkIpGIxSKVopCGsxCIRjSu+cWpxjOWM5GK1jKXtCGIxKGIRCEJRrSpRjOWtCIcZ7OaVaGHNaQko5KSEY
+        EPelWueUSr1rIcZrGJxSEFJKQmtSOWNKMVpCKXNSMb2ESu+cSnNKIZxjKZRaIb1zKc57Ka1jGKVzObV7
+        OfelSq1zMb17MeeUOa1rIcZzGNZ7GIRjOXtaMeecQs6MOZRrMb2EOYxjKe+lQpxrKeecOdaMKeeUKYxr
+        OXtaKfetQv+1Qt6cOe+lOeecMbV7IZRrKfetOf+1Od6cMe+lMfetMf+1MVpKKUo5GEpCMZRrEFJKEFpS
+        ECEhGEpKMUJKCEJKGCk5EDE5KSE5GBgxEBAhEEJSSilCORgxKUJKSggQEBAhISlaYylKUilCSkJaY1LG
+        90JSWiExOTlaa0paY0qt51Jre1Kt5yFKYzlSY0JjeyE5Skql50qt7zlacylKY0Kc3kpzlDlrlEKEvUqc
+        3kKU1jlCSkpjezmM1ikxOSEpMUJac0JjhDFKYzFSc0qMzjmEzlJaY1KEvTlrpTlztTl7xlJznEpzpTla
+        hEJrnDFajDFzxjFCWjlScyE5WjljnDFrvSljtSlrxjlKYzFShDFKcyFSpSFatRghMSlKhDFapSFKlEJS
+        czlShDFSlDFKhAgQITlKcyE5czlCWjFCcxg5lCExYzlKjBAxpRAxrTE5WiEpShghShAYOQgQMSExhBAh
+        hAgYlBAYawgQYwgQezk5QlJSYyEhKUJCjDk5ewgIOQgIUggIYwgIazEpe1JKe0I5c0pCazkxWjkpczEh
+        Y1JCcwgAGEIpa0oxY1o5a2tCe0pCSiEYIQgACJRSjEoxQnNKY6VrjJRSc4xKY61re3NCSqVrc6VjawAA
+        ACwAAAAAkgB3AAAI/wCPUcvW69MkRpdOCatFLdC8WRhMWDjxgkQFF0ky0uDh4kSeWnz4/CJlidq0aeGq
+        Cbt06dMnSr6ukdNWLOY1a9vUwbPmK5s+CSPilfOQIoeCR8D8JAJV5IiOHUlexCkzg4OBBCO8aHnihc0T
+        NmDDejEjqVizFWvWeJHSwo+qab2SYeARwk+tdv/y0vtHTxi1vIAB79VbzRKrSwhxMatFxwKGEzwyRoni
+        Y0kSH1CkSOnihbPmLIX84OE2LVQgPokSHavW61oza7k+YdOWTdatW8KYXdvmLp6zePr83TPGrsqCFAYe
+        PUrWLBSJAKD++PEzjceMGQg8gH3SZk0XK2zSqv8FC+aRpUcuvB4RUEpSqWaWLHHjscLPr7+D957ky3dv
+        fv/TaEIJLrUkQsIKLkCBhBReNOhgF0iE4ESDZXTWoBpqVLEFIQO4QEURNLjwwgp6CDLPL8cE0k4zp/RS
+        0Cm44NILLrcks44/FPSjDjm98MNABimwkxQvuyQSQgxFBFBKLXlwI4AAD5TRRlhrjFFGeFWsEZ4XVxix
+        AjArNNjHI534UYwwGCDRRB15/BFINMf0N1gtcebXH3//TGNJIhaY8EIUXYyRQw6CquFgZz8EceihapTR
+        RQ5UcEMDGw46oYMUNMyBx4kpJkPJJqx8csotpzhyim7p6MNPNrcAo88CDBj/8I4vwDQzACgRrPGEAYi4
+        IAULuijDzQM6PPGVsZSm9URaXXkRRylAIOGFAVQc0QIvyfCwVgR/EEIIKNLgxR898yQTyJ149nfMHzfw
+        8N0MagQ6hhVWzIuhF030gEWjDXJRRpVWdNGFFDoAMUAUT1ToAQwOYqqpN95M08xKlFAyCSef3NLLOOKI
+        k8wtteRTjzvZxGgLKB2w4MMMWjhx5RMzLCGFEZKAIkMXU4ZXxrK6iscGC8CkJwUSLMxQRhAyQOFCHoTE
+        EskfqE1DDz3n5iXNL3pNLSdgz1VgRBdqWFHF2DlUUUajVTjhgxNqVchFFVz5e0YFAXAzgCQhWFmhrl4w
+        /+tFFHPQ8Ys37YQTzCeXVHwKK8KsEowswYjzzjqwCSNMMOlQMEQZOYzgwRNacGAFGmwgUQghtUzQFc9a
+        6JpD32qxUMoJD/RBSA9sr6EDIKXYgswPYPjghzTNiBPI1HsFAk6cgo079QAT3ApEB2dbkUO9ZhvqAxV9
+        l1GFlV78W0YZR/jxRyneTFBLEQnDneUTZISv1hzU/JKINMckk401lFwSzC2mYAQjrGENcVxDIdsQxi2k
+        oY8MPGFsIBiB6JZFhjU0AQo+mIYRwoMGY+XgCWOYwVe8IINIJIIUtQACg9TyA1tYwgZJcFAS7qALa4Qj
+        RVRrx36Qd6fByKMbdRhAIv+4UQIkPCEFVvDeGNZggAKoIS3eW9b4uMCVKNQhPgE4QhAGwAKxJWwNVuAK
+        s8DghxPgIRGWwB89gDGJU5yCEoy4jTCsMarLCaMXwAiAP1KQAgZIwAES6GAH16AFLSChD9KAwhMgBDsZ
+        umEQsUhEIbzBAi2VAQylIOIS/5UWM+AhGtsQRzvaQbVj1CJ5gzlef8zAggbUIBqJIIQNSjACPuYAQj0I
+        5Bp2Nr4p/ssLIQhiKSLgBSREQwY7e0K8RMisQxrhbyu4gSQsIZDEtYQVt4gRLjJWjGI4Yx3LsEQB8iGB
+        cnKADEMgw1a8spUokMIGO+hBDcCyli3UgRCACIAl9BD/vQcgAQsPAIQlXLCGD5KBC32Tgh0CUQ5yiOMY
+        pKRHM5rxn+YFDwtI0AAB+lAKS1RAAVUoWw2UoLPx7XJ8DVKLE7qQhEU0wQtP6EAhXKCFMdj0gVxBQh3g
+        kFIv6EAOdOCFJWohDFMEgxWcuEUuEjKJTzAjG/l4xzKyUYtslMMHutIC3NAQBq8sqwa1MMKEvMCCIBRi
+        FkFggRSyQIgkGOERtfhBA5CQgFJEYQ1DqAIXyBAeGvyBGPoTxw1JeQxwHM8/yDuXH3ogBUOVQW2xkA8N
+        pFCEC/xyDRXsGxk4ucuUcsYLZHhCDaQxg11qNUtk8EAhiiCetHSBB3iQxDJ+UY1q/3Cif5fgxCUOwYhe
+        WCMf+khGMK7BClukqWxP6OBW1MmGIljiAzsogg860Y0rMKhBNQBEFPjBiwlgQVcw0AXC1MCFsmE2DpZw
+        BiHWwbFqQLQdtZjGPw6LJ0HMghtBAFujuuCEBnSDQwGAQt/Cg9n4VWmEV1pDFfiqlkX2IARlSMGyvrIG
+        JLihCwkLLfzKEAU7hIIXhKBHMJJ6i9syYhPDXUcBssGKU9iiFNOYwBMGlYOtVGErXnDBI0DhrUQIuG+k
+        80EhuMGCLxwhimRYgi6gADd/fREJcviDN6hxDcG24xj0yB9eksefagBhC1M4wqG8N4MSDKISASjCZ8NT
+        wWSp5f/N8NOssY7AjQ3+a1leMIIPvBJaMtTYWEbwAx9IwQtq3KIY08DFJg5hCoUkw4CX0BhzKgA3Gmvh
+        OpUdgCVIEQIo2KMIOatQCIoBCCRsR6sVRgQQQMsFLXCBC2qJQh8EvQ6HVmOUEpWa1gYzjySwQQ1jcJBa
+        blwEOIABEJIIABWc8EQthCdZlAoPQilVyIKCgRs6IDCl6tAAPpMhpN9+AhHgANtEZKIZwKBGMQKIC1ko
+        RBinCIYqTmGNaYhDHzMYwQdncIFZJOMRQPBDCLoSA1OTga8RisQEylDBKkHgSgYgRCVbDTe+JmEQc7BD
+        IkJ5a4hWIxnIC3kgJiS68FHIC0f/mAULiumDmskTBXNtVmuz+m3vdWGuP6gATLXghTMUAgloQMPBh5CD
+        IYygCoC4QOlIVApp0GMawTiEqC4hC0rcwhrCwCYzhJGNCPCDHz3gxSwI0AAPJGEWJWBDGYQ+7OucQREV
+        kAIZUrAVepWOGBVAQl71qgUp9KATSTDDDdwxjnCE48rtqDfVdv0PLFTobJCvUBCcUVrvqWARAXBBE7oB
+        iBqMVTxqGNTY4FaGMJouPWjwQh184IWVku7gKRjCDKJRhDAk7AV02IUl/kENTbAkjrLoBdevQapc9MIX
+        vhBGMvhxBC15IQuziMIgd0mAz7HhCoooRLYPrqWaskHJFeiA/5aegIQelIIGDZLDL0Jp+JRMQxhbvpMV
+        1tCos8mvCX4ogVrajIQKdMIISBADtcANgPAFC9IgT5BXE6YWV4AERcANUMAGNEAIS9AGVPADCBhSndMD
+        SFBxakADe0Bo4uAMweBGj5MLisEMvXAJmoALvsAMpAUzVtAGOoBWBDYEHDACEqAGYEEFflAI/MA6HQQ3
+        bKACpUAIIUAEQTAIpMBaahEHeNBQHdN+wKBr5zI1XdBZasBsahF2NeAFaNAFL3UEbmAE3RACNkAIoZAO
+        DdADcFABRFACLGBqbLAVY3ABPmAEdRAAL1AHU+AVgSYDP6AEYsAAQ+AEPTAG8FM2ZWAEev8wCrswDdaQ
+        DMBgCi0Rb7KQC7nACqwQDNYgDfxgAEhSArPQB05wh1hQFFqiK2zAD27gBlgFP1riVWiwBt2gC92ACItQ
+        AzrQN80iB9JQQIJleNkADDx0LmzjKD6ACEhgQT7gAVYAWl3gA28wAEUwBl1QAaXgCaEQJmAgCYRQCZYQ
+        DZ3wATTQBUPAFU4gD3+gCKEACjrQBvZECokgA03gARDgBEAACgJmLGGwFhPgB5UQC/TQDsBgKpeAYrKA
+        CyjIDNYADOdgCc2gDITADVQwAxKQAUCxBkJXi5TSA1BwBgNgalrikT1jBSJkKFDEV10RB3wghVMYDsxQ
+        DSH3D0/kHaj/IABm0AVfAB7aBgWFIAAsYCxdQAWLEAnc8AIvQAiNMAqqoAq2EE6dpwRbUARpWAiiAAqz
+        5AM+UAegMAUwUABXMwukAAoBUAAJUAMXIA+gUAiJMAyWUA3TYAq3wAqUoFu3MFzMgQASAAEaoAJYoIhW
+        oAAZ8EGYJXRgwQKzcARI0AlQ0B0cWUHhxlUcpGDz1yxdYAe6cA3Z0DEdUw7AEAiHRQ+cYQZmEAd1IAUw
+        wDYGRilTsAVSUAP04mdQ0AOv8AfcIAqYMAu1IA4SEyPJUAukMAuIcEKzQAgkgARhEIZfUAZDEAN+EAmD
+        EAAPUAIR4A2EYAuqUAy7QAu/8AuZIBB5/xkMk3AIl7AQ2vANGSACTDAEQ8AEscIBQ6AF6ISYOOYDBbAG
+        UtAHMsAGQyB0fFWYXYEEl4Usz+YsoNBQ5DAOnakNwUANIXcGXrAFcMANQKADE7IGrQZF4NEG3ZECaXF9
+        i9AH7hgJkQAK8jALnQAI6NANVBADVBACiDAKsUAKhfABpuYFaTAGI9ACkfAKfEACB1ADPVAIuxALu5AM
+        klAIihANurAL/1ALpxB8kzAJveCQ2bAPDnAP7AAPEsABVUB06nRwQRd0VtAJoIYEiKAMIxAGZEA6bIAG
+        MEAFPAAHSNAF8uADJtUVlBIHfwAKMkEO2eBQwGANi0cPcOADDTAHff8gAHXAGfvHfdrGBgsWFjTADXCQ
+        B4kQYGpwAaHwA0hgKF7QBlLgBp2gDKMwCrMwADIABC1ABGh4nKHQCbPQDQkgAKCAFMBACpIQCoXQLfI1
+        EMLwCZzgiQ4pDenADMVwDg3QnoU0nx1JOmmwBAIwA6lXAPJQmAAKFvnyB3kgBU3gC52ABNx3JV1QB7PA
+        UNtADuzKoMGAZaLpBFYwBYUACiswBZzBWQcHFqsYFmzQBkiACjQQAvIQAGqlAgJwD3wKFucaQ0VAq96Q
+        CLGgC4RQCqQgDd5QBNeBBBdwK4OwC7xADEvyC0phC1hTDa/BCqbgW8HADKtgDM3ADhLQAFaQTgf/R6Zv
+        2gY+ME+u2QNesJxxGrRQ0Afz0QVgkAQFNn8sVAh8UAsyMagcYxa4loUTWgN18AUUYlJpIakElhYzgARI
+        UAI1EAXFJgAtEKoDphZBwA1NgAX80AmKAAmgEAtnlQmFUAgBEAI1IF2gIAAEUADKYAnf8gNF6pYESQ3B
+        sAyaoAmr4BL0lg3XAA/6IA9OgAZDsAZhkAN8RTpqIA/M1AYq0AdgWEFBh1nPRwh5cARt0AVl0Do64wU+
+        EAB2MA84sa4cIwy2MEqBQLXecQRXUANNwIMhGh7p5K//ugRTMAV9UAAo8AVAoAjKQARf0ABKoAExEAKD
+        0ANfoAEz4AFUgAh0/xABLEAE3DAPihAJpAAIpOAtE+AE+FgL76ACI5ABD9AJoTALpfAPzQBAq3AN89ay
+        2ZAN7oAOCCACNzafN8aRbbAErJcG3OEBBMCnm8sGZNAGVxACJcA9MzAGXbsGSdAHd0AEeKAO27CuDpUN
+        b9EOu4tQahC83nEFQVACXaBtNeavaqAEjvUFZrAEM9ABcCAAhTAAwUsvOyUFbYByUeACAUAKJDADXlAC
+        3sAN8vABP2APhPAFU8CV8tAMF+ABI6AC3RAKkJAIryAN/wAMc8QKjPAJ2uki+qMO+CACfHRj7MQGBXAF
+        bSB0WmAGoqtMpAOgXvAFrFcGSwCpmIVQ2OsrwP+IDdsAteIQDM0wSp+1wz11BIAgAGJmvJsLwVWABlWg
+        AVxAL11cAyXgA0FgamqACCzQBkczC7gaH9JQCyzgBBdBBPYABLP0r54DAvegCz3QA6FACInwB6IQCplA
+        StbACYfAWy7RaLggDNfADwtAAZ1sBUD3BJbcBWlAOm2gBH3ABlaABWDBzVVgBdDYBjAgAyHwADO8bW1V
+        Bi5Zuws6gsHgXobSwiqZUlZQBPJwBV0xi2HhBFgwJWugBFpSA6TwNQzjA3UmA3XQFU1QADJwOvJABIrA
+        Cy1gx0BAAAnQCT0wA2WjBUyQAwywD/zQNJBACqVQCJVACLsQCPzjCIfgCJ//4G6rsArFmg0JYACoYAQt
+        QAVpwAY/sGdl2s0+O851+G2zWGNRoAjBUAs8UEQlRAjyegUjvBvtmg2rMA3tkIVdsARv1lps0AVTYGwL
+        qyXMBhYLPIMqEAuesANKUAUe0AdwQAhAgDNXgLVO0AROTAXPFQU1oAyfI7bWkwJhGgawAge8WgqxEAu8
+        UAmFQAsmISDLzAic0CLkYA3B8Myg0CTzYARt4AQCoM2bi86xGLQHNzr7SgYdsAjEEAAXUANXoNiTQilz
+        kAiMzK7ZMA6qkAzVwBlcOHMhOqHyAAZdIZkoAHQCUwbVkgQ2UAQxQFJpQQSEYAnGLdrZVotaUAY+wMR9
+        /xsF3P0FmSsC/QADTzAC91AJgvAIkWCxpZAMyMANr3A806AKmyDTh9AinAkM3ZQIeyAJJCAFMnABefym
+        YJHFcRp0ecwEN/ttZNAALJAER6DNUoAIAyAFadEGZjAP5YDV7FoMwBAOYPN5ws2nXpC8zciRMGCAPjAA
+        J1DX8qBqX7AsaLCfcEAFAmCABcANP1BJa5AGH1wJN0BkVpDj/rkB8cALF4AFClAK5hZZszANpTAMJ2TG
+        x5ANwlAM9404n1gAHeADu0AIuDkP3AB0r4cGZdADVPBs9CIEGTACQYdOdBUEQECdSQAEjyAJGT0lXXDV
+        jcyu1qAK4vAdYJNSz3boYf9xBWsDFliwBFiAvaPADZ0ACvMwAF/IkVfgs0igAl9QAC6gjZ0gBTVeAISQ
+        fXxQADlwAVMQBlowBPgAzQYwA+hgC7OwC4/gBwMgDZFACHwQDcdTDcBQDqbAC8UQI7XyAOpTseB44X9M
+        OkgwDICQAAmgAkIgNitJKTXQByGgCKoACt4ACXkwC0ZgQdIyB7/AyCa8DaqQDUewBLAj1j4TbWqABK/J
+        BmOgBBZGCJhQCJW+CKIwCxegFj6wBWwwA0Jg1Ez6hV0gAIrwy6MwRDOABfOkBTmQAv0ADuBwAX1QJO6h
+        DAOgDcOJGrvXDiq4CuAADC5iDZbwb5kgCX5QCrQwDTb/AAYzEAZVUGa60JNWwFfbjAahTDpUgCs7oAM2
+        UAqu4A1JEAVZ4QNgEAV3QAe1a8KrAAzM9u7CPR7+WtAGbQUhAAckoAuGMACEUAiRAAQ+0ARbwHqkU0hp
+        YAUtrkhClpzlFwmrNQMFgATt2QHdIA3AsAyFUAGVkAmvUAuSAAyPQAiSIAjDQEqqQAmmACrPUA7ZEA6+
+        qQrAIPiZoArBIA104AJEsAJNQgMeGsoMV9RHQAh64FF9qAiWMAskMH+LJAV18Ad6YA27UcLkIG9j1Ugd
+        TCXGi7xeMAM1MAUxYA+hwA3eMAtF4AUFIMRhEecdFAMCAAcRYAjcAAZk4HeQEABS/6ACPtAFTPADmLAI
+        ESAPBDADAvALTfcItvAKxjALf3A/9JAMjOsINC0Lll8MmtAMyWAJg5AIANFnFq9avxJJevRrRZs2bITA
+        QBMRDRswlmDtUvSL1KM9iqa5YOMhhhcwhbhJw7ZN5TZrwbp4KbNG5ho2NNnUvIkz5xolNdS0QdPmSggq
+        PmB4QSKvhxc2EclMfLqmQKcXA1QtQpImySJFLZAI6HHERSFENC40kCBPWqRXllTtSkaIDh9ego5NK8bJ
+        0aZLnIrFsiWpmR8/fw4CW7ZMWiFz024YeTlkHxmgaLygIARs1qhK836VyqTIAg83hXa8IKRHkLWV264F
+        21Jzpv/NnFrI5GzjRU1OJ1nKeCHTpQYLpl6uENrSMOIaLmnSrFHhwUOdPyRm5MhRhUgkUCWQ9FDWB1Kn
+        JA2+OAFF6NUrar5KlZJEAo+kZfToHUt2ixWuYtmaJUvGklJqSSQPG95Y4Y5ODEvGG1AK8MGHK5p4aQ0v
+        lCCFFFVSIaQTbgYhZZRYBOEGiBf68OONPcpJaSVnBDBDtzXUUEO3I7roQogqvLACCSSaKKIJIZsIwQcn
+        ZkDiixqKmEEFbpZqao2omkAiBizS0KIOSEJpoYwqUuiih1FIKEOKPhAhhBsZSoBDB36A6COWSGzZpRRS
+        5sFgD1rauS8WTljpRRhhbOGFlEr/fjFhhwpromGRWZqhBoMorOgJBXkEIGqFUkZxxZIBbCgqAFFWsSQR
+        DOoghIYj8JgGm2tUuuaaPlBowgo1rHBCDSUUqcGJI67I4ocQ4LAhAFBIsKHYRAohgkrhlDiijiYqa6qN
+        LgQYQIk0gushkkWUsQGKESgAAxJSJpBijS368GGKEGYJIQgjCrBllUxGmYYQQiTxg5Bp/plmlVNYOeWT
+        XHKJJRFu4AiiDDTIgJiMMuq4I5plQnEhDTbaWMOJWVFAoQdACElkggeKYIGHPCCZp49BBsFACi/mkAYa
+        bFpkRo0ylvDCC5u8cGGFHvr4IYYtzMDRCSTOUAKpJqgAJAAf/8AoQoogfPBioqbKuKIHQwb4AQs0ZnCj
+        ElEgiYSQASJIpw9Mvi4hiQK6qMmKC8YLIJNdSMnkF0JmKeECPqShJ5BegjHFFFk+ueSWWci8gAqJ0Hji
+        ih+isMOaWEDh4YkwtNCaizG8KAKIOiIpBRRuOvEDkxv6DWCQN3aIgw5hnrkZm5zZuNWmLraoow8wYmSo
+        qY23oIKmoNo4gxAbhgXCj+SaeqoMovsIwgku0AgDilAK8QYTNGcphBBEIlHEjwrAiEiL5/owBA5CRrmI
+        ml0qKCOBPWY5hp5qbgmGI1hxCVMEIxMkQAIHBtCFMDTFCz2Y1hyasQxJcIMI1GtfRGagA/8wlIIbPDhD
+        EOogCj9AwgUvqIQlTJAEPCTDZjd7xhWcYIUrXCEKcaiDH84gM4bQhAtVYIMSvuCwNaQgDBqbQgWkcAQf
+        EAIISOAYG8bgAQv94AhAIYMWhECABhTBG25rRCckoQhFLAIUeehDVrQwhDAgoQ8zmMEAIlGIAVgiAilg
+        gR9CQThvMKMXq1iFJjhxCWeEYgINEAALnhAUJRRCCm2Iwy+KQYcARAMIUQAKG8iwBi3kgHdJmMET1iAF
+        O+zCEhOIQhJWkL4T2EEavmDGzZhxBSUs4Qp9KMQjSlaEJVDIZ2t4wgxioAQ2NLCIDrBCGh5oAyOYAQk+
+        SOQTKFUGNqT/YQlWeBgabJMDCnSgEJAwBCjgwA1CYEIRnrDAA9I4BC1oYQ0NmMEFuDEKbsijFBPAI/hm
+        cR9rrKIYmggGLj4RDGnIAAICuAAZntAFblzADCXIgh6M4Y0kNAERATCCJp8gTcqoawZDmIEM6gCLX5Dg
+        DRWYABBKkYc9zAN3uMOGGmQyM0vAAQpNoOUXUFCDKfygAIjgBpPU0AUt3AMbxfDHE2oQiVA4gQ1eyEIA
+        6nCFbGohDBG5KveGUIUeQOIC/oiHPy7Alj+QEQMhCIEVhkCGMDzgAdyoRCICYI9X/EEFD5AEJF5xjGOU
+        AxebuIUsmKE5SfDAm254AhsusBQoECEJ/3pQRyB20AYePOKUWSvD6KRQgln8IKSDsMQuSDCBQZnGCGnq
+        QzBe2IsuyOQM3AADU3LSszIgoQ6l8AEKCDAFGFwgBujAxS26EYNCvIIWRvBCGpAQhE6EAAnaHAI7bdPO
+        ITDhCp2tAgP0UYAS2MMTiOADJpRhggr4wAoKRUEiFJG6aMwCl9KYhh9mMQxp/IManODEKXBxDWk0YxDe
+        IAEhrvAEDxSiCF6IgQzAoIdaTIMHbNgCLyxRiydqcgouU8RoZ1GKP8TCGy4IwC9c0LM59GERznhhTL0Q
+        Bz9AQTa/tEwXroACLOSADFWISRWsAAJwEAMdInsPQmNQgB/wIABtev8CE7Io3SGgIQ0XqIUPimAPQijC
+        EnQYQCYQ4YdWgGIes2CBczSQiO8mohaE8MQs/qYISSSCcMcIxiZMgYtsaEMYcpJEKKDgBXl0IitdCAAh
+        8GBmEzTFDDSggiIGkAQvfKEPnSBEKQoRghcIIBYBcAEUzuAFLrCBCH/oRDRsdg1sdMEM0pPNbC6DiCZo
+        8zbUqwIXcECBfUhACzFIgAoKkAhC1CAL0BxZDWKwBCxYYQxPqEIVnuCDQoCiFrEQRSpSgQo6IKIZJsbE
+        L2pRgCdk4B6lgMQ0AKQIvY5CbSvYQyH6lx/F9QIXrFAFKXhRiBM8oBMqyI4X3DAIPeghGxZIrhj/lKkB
+        RBRiAkXYgUpn4YIumIkXBZhhz3pWh0qAIhTPIPU1Th3b2cikC1SARA2Y4k5NZpELt0mBCJgwBghUtwGE
+        KIEHxJADNUChD9z4gRJggAIYwKAGNfABN0BRCUy0AhOYaMTX7FELahCiFaKoxSwO0IBkYAJtmcgEJiKR
+        jFhA4gNQIIEiEvGParQjGaaYBCecEQxgGIMXgcB5G27shR/UoQ56iIYgSoClpzzhCItIXQUE8IMklOEJ
+        KugGGJBQhjI4AQwvOYMfEkGHWJLaD0GQSUxosoYm1EAJL5FNNrO4yXZWYQ3GZoMTelKBDmhyDWnQASEK
+        QE3mVGEGQlBCDwhh/whPuMIViBAFmhJBimY8ohSp8EQlquENZBw9M8VYxShEISAu5cHN9JCGKZIRjFOs
+        whrCAEfUJfEDYKrBjaFYAQ3u0IxskEAKEZuRCxSBiUSswAsce0IMOhEFNGzvCITAPDYwAznYA3BwFWao
+        g3Qpg01agy5QAhSwgoZ4tc2TEikpOTYYASzwAixQgTWoAn5wAtsYAhwQglHgBSNAthvrpDDQgEMhBFcw
+        Olown0hwBUVQhVJwhVRoBWngBVgYhU7gBVXIhKebk4oLBULgg0SgB2E4hE04hVMQBlwQBlMqhQE4gjby
+        ARdYhDSxATtIBGEAhgBogSVIgAIYgD4gBEsghP95OAEjOAIpKIAe6IIxiAkv8DWcMIMWwh1mMIMZmREz
+        mIIasIKbAI6a2KSTyyIpuTEySAEYGAEl+Dw0QIJZ4DYyyIEMoBQ36AQnEAOIsQ2IUQJAWJaTmIZOkIGf
+        moVpiAVX0ARTWIRRuJdGkMVWWIRCkARbeIVK8INA4ANvaIdq0IRNmARKCIZeKAboIwVvmAEPQIcCmIEm
+        8gZC2INQAAZakIbRSgQ7UQRAGIBWcAVRKIVo8IZdcC4rmBErmIFfWgMkeINowLhS44IGLIkQoJHZuAmZ
+        4KYFRAMpWSMJoIIawAI1KAAiCIIQ6AErCANMrK5l8wE2+MSHYasZQAEBqID/PiCAJRiDNZCBSJAGScCE
+        V0iFRoCLXZiGZsiETRkF0MCEUSgVwxCEfwAGUzgERrgEX8AFVegFaZiHGcCCTOiGDJCAApAEYIiFQrAG
+        asgDoQMCKNgBKHCB6CmFSEgEs6kEAWgADZgBCNAAK7CCCokDPKAFmKKRJXgXN4DAzbsNm+CkBrqJfXQI
+        QKgBGFgkKCCEAJACfiCA6BqCHNgANOgCOGgC21iD9iGD53iCEaA5hXoCJyAASyiEQSiFoquFUhiGNuMG
+        SVAGcQANYAgGYXiFRAgFJawGVTCFTcgvWVgFXOgFtXkAI3CCEeAAboCE6JOGZFiGWRAAUKgAGoCJHsiD
+        /w+wgD8ohUQYhURwg1wZAzVwgiWoJSW4AgHoA2WIpVmagi+goRhwAs1jwHskg06TCZzwgm6Qh+ciA+MI
+        gR+4Ag6QB3OEmCrQgjb4gh4YTIiMiKbgHtuIiCpIgysohV14hVZIhmKwhVh4BURgSVKgA0KABGMAhlvo
+        BVHYBUEgHGnghFvQBE1ghVW4BVwIBl5IBmlIB2WQh3R4hEGQSj5ohmkIBBPAAD8oERoIgADIA0S4AVDI
+        ulk4gTXILGpig5goAyjIg1kAhVjChitoLd6Zgc2Lx3uUDe+EGJmgAmXAAg1ILCuYgpdQgjGoAQ0QTES8
+        lsCciIdZgy/AAogJgzC4sf+tCoFRKDpFCIdrOMlSaARboBNnm79S8IViGIZY+IVfoIdawC/TVAWBksLh
+        DAV+iEN2AAREKAVC8AOL8YM8KAVF+B5v4AYrg4VQoANlwIRMoIMoGAOurEMvcIIVQJF5IFIzKDYrWIKZ
+        eFLZuIlNipjbcAIf4IAqQIGY0IJFuo0qaAAfsI0q2KQRYIMsuAD7rB4f0JZg8oAl6IAcKII+GAVP6IQ+
+        UMVVeIVMiAVVaIVGCAB+4Ib+FMJXKAQ+ULds0As5G5hPkAVhaIZgMIboSAEDOAAb4IYWkIMvPEJIkEE6
+        6IRHeAVbqIQ/4IZlwYRoOAE1kKYZwCkzIAJ9wQM+sIb/m+HKGJiCgJSpnNAJRRw9NlgCAVACHOACURJW
+        djq9IRACeVCAZOs7MkACODgC0QuDJkMC3aoBkZEHboiEUWiElTSETLiFWMCEWtgFWBgGb+AHzrSGXAgG
+        WqiFZsMPR+AE0pSFW7iFU5CFYpAGeEAAD9AHc7CHWRgAGcgDP2iGULABDFAEUggEQlgFZCCF8oEDIuiD
+        9ZqGEzgCIiCBX6gAIhgAQgiFOdgDYLiZKViCGSoDNZgBYrMCLqCmhojViBiDGAgBAaiCtaoJ01PEThoC
+        AtCAvWQnYZUKH+Ck9swBLY2BKvAAGyiFV4AERUAG6XubWPAFVkQHS/gPXZjKa4AG/4RxBmCYhlCghmko
+        TYKRhWC42oESh3V4h3TIBmEIhqQEN2+wBUKwgBWwBENIhFlIBVrY3gfoGa/Bg0iohRv4g32hgxsYBDjg
+        gRbQg2XAnRqpkTKwgsRlVQ+oJRgISM9hgxlogALoBgfQJojUghRIgehag+rSAALQgg3IAC0QVjZogh5Q
+        g/q0ghr4gQvggHuoBDb1BE8YBljQhFFAh0fIBFcYhVbIhGSohWYghUigBeR1BVWIhVgoBWTwU2CAPk1w
+        UGdQBTAsBWDYBaJUBVvQBUAoBMJwBmIABWVwhVKYhkdwhUywhDzgPyRABUBIAhnoF1zQBF5AnT/AgB+4
+        gz+ohf/4hQkKTEvGG4PF3Tmg44cDmIVuSIFLzIFdrYIMWIDsGIPLHYECyIAU2IAmgxgn6IHn4p7FLAAg
+        CNesgwVRaAVLCFBYiAVgUAVn4AVYdAViiARDqBNYgAUh1IVR6GQlHN5qCKRjxAViiAVeKAZFeIQG04aC
+        MgIZ+ANrUAVRkARYCAZYoAVXCAZnkIYJcAG6mocPyAM+sIRcAAZQcIVXCIREUMNAkIZYqhEuiMfM+04p
+        0ZpnWoQAmIXHYQE0GIFAFoIZGAEhEALYvA4rEAAFcIAUcE+rChMlYAKrcrILSIRIiIRWIAVQPsleKIVW
+        SAVe9j1NwATfE4WDiIViUAVYcIb/ZJgFP5BQmHSEVQiGVTCFT9gEW5iFeXiAHuApAjCEZcAU6kgGZKAF
+        XVAGWqAFUsCEZRAQyVOEUZCEMcoEEWY7byCFadgFM/uFQrBmzftOWI3cGagBDygBgDWlAAibIpIAH3CA
+        DbCxNcqADlCGAqAABsiBIUgBd5qCGEiBfWACJCgBEoiERvC9FD46b/Q9TAiGXFAFTWiFWEgFTaCFRRAF
+        UciE1AQGZqCGP+CDUAAYSriET8BoQOoFamiB7BiCJ8gBJGkCH+iDAACHZBAEYygFYlAFYOAFzSCBFvAD
+        QqEFHpaFqvUF4B0FVigGDdGFUIglGNCZbabtTaqSJbAetWkB/xkIgFrgBqPgh1pQAQcYgTXCjtSqBX4Y
+        BXbohwxwMiqQhxmQALDLBEKIBFE4OmJAOlEYhZqmQXgjhlFg02FI6FlosyAWBgEVBD3gg3+ZBkdwBJrM
+        hWJwBk1IhgBwAAcQAibgAMQsAxqQBEJABmEQBVpoBVXIPrZLhHmoNkuQhH/2hV6wBWlYBlpYBV/Ym1gI
+        hmmoZmxwgib4JdpLNTa4AkW4gjYogvKxgd0GgyCoBW/4W0uoJ0RIALWaAV0IBkvwhnWIFRQQAzHIAl6w
+        hwBQhp5VBKIbhWGY62HwhGUABmD4PlWYa2lT69glhVoABmFQw1bmhUQwCHpoB2C4hJnMUP9bUIViSG4F
+        YIEYOIAvMEM92JQB9wRB4INZIAVNKIZmkAbrTgRp5mVfWAVVWIZXmBNosIZd6IVnwAUpjKlrqoklnQ0n
+        uAACcIInIIBHCIUbKAZEiAIv8IFSkAZLKAADOIdhKIQEGIEhaIEBaQZruIRcgAfncANLqIT0ecxB8IRG
+        2JCVTIWsiwRnqARY8L09R4VOAIVY5gwB0YWSKtuEEIRAaIc4uwRWiEJfKMoWhnJmSAZh6AVgeA9SiIXV
+        TIQ/4BtWuAVuP22COQVN8IXT7uVkwAtNUE1ocLdgsOYLkSkdpUDm7BkdrexC+AOTYAExaIBBkYYOwAEH
+        QAB/QAACSID/HsiEdUiGa6hadSgBMJCvPzAINGuESlgGYgBhdBiFQhBvSNAFQ5AGVagLwjCEZqiFUaAF
+        8klGBXACKpADPyCcdtCEvfgEXGj3YXjaQtgFeV8Fc78FVygGTCAGayCFVxCFWCBhYWAFW1i7iHYGTLgF
+        Db0FZwguYUAGXshoZEgGWyiGmJoRJ6DAHl2CGRBTNpgCfpiBL4CEyQuAIhgGj06GHyhgEeD7DEAAFECH
+        WbCEYrCGbn8EYMBupJPFmoY6Z5iFTgWGRrDpR6CvaZhrWuCGcP4DYBgFUIgEWJCGCIAADgiDLtADP9X5
+        TXCEgjl3UvADSQgAbtCF1xkFHhYGXUKH/2II+IBPhBsggUIoBFKYhU4ohD5vYV0w81tQheIXBG8ABnBY
+        N7M/vYy8CTVYgowdzO/gACYYgiWoAW7gBnFLUTVsgAUQgQXAgQJ2AGRIgAYwh1IoBldAupW8bkjoYE/A
+        hFRAYbW+F12ISm8ACG/JSu1SxE0UolKSgCmKNiqUEyY5qni5I+hYLVWbHK3q1UtYgBvc8qjogKTICRKE
+        LMUitAxYIW6JIM0acIJGkRrd/BAiRUjSH2lCecFyVQsUN26xMnmThk3NmjJsrKhho2bJmDVr2Gj14WQI
+        GTIpylhR8kVdL2vSLKWjsGFDFSspHETzwICCglncIFUiBMlns1qEBv8t8iQq2ShCw2YhghRp1iBXihSR
+        ChVNEQkV92K1BMViiBYtXfB4o1YsmMZVwJgFQ0RIkbQHT9KQ6VJHkZ9SjTJlm/cAzqBQoGaFkOIlSh9R
+        pCpVmpVJGilSiWYREyTITyVXr5A9japVyRIrWtmQYcPmyhQ2aMKCZoIDxz1ouFq4ISQhRQoJGnIg2FWD
+        AwMbMHAPP7pgkskorvg0GSKKlFJLDywowcIFhBCCCCiQLNKKKLrMokgeByhgTzK1JJOOFWFogYQev/zT
+        jCmrmOLLNdbEYhAJkIByxBNjPDEFKZAMw0001pAghRvcFOEDILUA8gASOizCkyR9uKLJjYLsQYr/JYTw
+        MUsikjjTnRfmKQGCeVxtZUUNa6ChHhparDfEBvyccosLUUjCTwpvibABCKTAwIQDOeTAgAMEkBJNAPz4
+        EIA0s+QBiSeIADFDGvDFUosloBRSCCmNKDLIMIRI00kt1jzYTARTBaEHNYG0UwwrmnTUSymlkJCEAIT0
+        YAUaaHghAyl+/EGLkTwg8oMXT3QRAzqxBOBCC7uQAoogiSyTCSl8SFJJKLS8UgodfPByDVRrXKWGFVhU
+        sRUaXfhQFRtahBHselqk4E8xvhhQBiCFWLEBfhR0IwEOQxg6xBA4xGBhARzMwI8klvwxkg0h+FBDBwFE
+        UsoslujyQA+qhALJ/yCGCEcEOtaSIskELqwgyC/L7EJNRo7YYkkhA/SARDezFMKCGFqo6wYkecxizTw2
+        wHEEV2l4oYMPBQhAgq72DNPCAIrckkklfyTyhy7SCVIINmN4sS4bbYQXxhpe+DAFaOSRsV4OczKRzzf4
+        LECAJFAoPBcBDKuIn8I+JDZNAyN0o8gohdjwBQpUPBAAN4Q0MgwgBRTxxAy6+NDAA4QAkg4QD0TziDQg
+        j/2HQIfcQs00MRJTiwtNePEDKdJUYEVYM7hQx8XWJBJAEWx4gQQLPvTAjwsyFDJIHqC8w08RRCBCDCKz
+        /CHJKNwoIohTaqjhRBlbqbdEGW004UOZcb6Jxv8YwJs3hAgivHfFIxcwofAoEICDMJCBCSJIwRC4UINo
+        jG4JLOBGKVChiAi4KS5K8AE3XDMPommBBRWogQSQIAADjCAGPQCGMB7xB0sARRHtmIYjNnGLWkxDFauI
+        BQl0YIQAjIIUtfjBGrSgBDjIIA+ECEYijICEI4QgAIWAAxAKQQgbvEAUtJBEKZqRAC/EoQ88EUUmamGs
+        QiQCG0rAQlTSxIYxKMEMP+hCG8yDhjWQgQtkiOObyCCCAKHBCYqQhxVygAJP5IAJZAjDvbSQBjX0oQRu
+        GUEfStGHTxXAC4YTAxmaMAUCKEMAJZABInrwgxFwABAcCINVvlCJUiTjEYT/uFg72qGJU+TCF8BoBmqk
+        YQFuWGIUlrCEPVxghS70oQ96kISRvOAFOJTiFYlgQRcmMAtCYKATrhgFKOAAAySsAQlUgINrQuENDPgh
+        GthwgprUZ54aEOINV1AjGqrABTXebQbKEEIYkNAHUmDABoqAgIpUxAQ0hCENW+hBDhaQghEUQBQ8EcAR
+        8NUGNLQhDW0oAxIeILRhCMAGF4iBPEaQA0RWoQM9KMUjWvKLQNBjFZuQBS5ukQxixKJihEjGK4BhDUI0
+        QwVS6AM37DCLbLSgDBUKRiwKgZMBjKISgRBfJkBRghJAgQ1l8MIRdtACbsxCS7pgBlTStxX1gYEQ3GjC
+        /0TbRh45qsc8ORBCBsKghh7EhBRUwIGc7nVIYfVgCmGwwghwYIUmHAEGRXDCE9iwhAQkYApOSAMTxDCG
+        I1DBENwARSdAUQEpkFQLTMCCMniBjGKAgh7tUMUhGCGLUxTDFqUQBCFoUYxM8OJB3EDCF+DgBzxYYhou
+        aEMRFMGK25VAHp/CxDQiUYlEIOMYpeCGC6DQBSRk4QUfwEQpgvIUNa21DUfIQx76sIU4qrGt5TFPGPDz
+        hDKEYBBALQETmKCiOJFBDGYQwAys8AM1ILKgYrAC/L5QgG16oAc1SIFnxeCFAsABFH1ABCBqoIQyPCFY
+        WqhBMkAxjF8cwxqpcAQjLv9BS1yUYh6/mIUzVLEMUnDjAsP0whT0kIxpJCENZhgGLTrxgCt0IhGIwIQN
+        k0EEfhDiF8EARiJIgIdH+OEGpWDFMmqBjRaoYQxc2EobtlAAM1BFCWpoA3mDBSc1aoEMZcgCBH3QhUAa
+        Mlj3IuYWxJCDBlhBvha+1xXUrEkjEKEQHEhDQasAgzLAIBK1+MADJDHVuRVBHsmwxC/acQxTUGITm+BE
+        MHAhC174pBKZCEYxptGCQIohDU+YQzNCAbUnhEAGTvACFvKQiOduJwIj6AIqLOGNRSjDEqWIBhwgWIpR
+        2OIaAzADWbAwhiv0AY5xLEuaxNzWN7GBC0tQQg1qEID/WUihovG9V7B2VwM2hGGgEikoZBXZACKwAFS7
+        mIANsIBJNHgABUxgwS5swQ06cOMNfggADGoggNxEIxDL0IQpEr4JVtxCFoQohChiAQtiSEMSF9CCwuaJ
+        6nl04U01+IF5rACIPlTAG7OggwqGgIQIZCIULiiBo6DQgRAA4hGCQMY16hCC8XihB18YTxnYOYX2sSEN
+        FDWP0a0NAiFU4QluAIQayhxfOVF0C5JoQtHslYMRABrQcprBAAKQhwGQgt8zYEIa2EAAGLTBB8nIxKd4
+        AgQk0AYJK+AJPSy9Clbg4hSm4Lsl8nA2XhhkHi6OSxgq0gwSdDwMM1CqGpBAhA/A/6ETHyhECSbmKVLM
+        AwlW8LwVZgCEQSQiGtuwDRjahh7zzLMN7foCFsAs7TfFEcwDXUMPAIGEu8nXAVqwbx+ywIYhxBc/aRCD
+        hdGQBi4U4Chjh8MXhJCDIYTBByUIQg2KMMlCzEISK6gwRcHwB2okwxmr0ASoccFwVQzABcEGgjx0UYgf
+        zIAMVYhXHpphAvWA+QoCGAAQKIJZEUIEFIAN/Eb2LBcJyIAPmEQL+EExCAU2rIEZSEIWdMHPcVfbxBEW
+        cEFardW0DcEatIEXyIM8eEFoTMQaSA03PEAbhAGd7AMmcB0ikYGcaAEXNIEAeIMPzEDRSV8aIEEncEMB
+        wJE+yf8AFPRANOjAvayBHPxCLZiCK1iDahCDLfTCKjgDCbhABZSAF4zB+xDCD5RBnJhBKDTDCRQdF8Te
+        EfSBPKBCAbwBdPWAH9RCEHiBC4yCKvxCInzAB8jajAlCM1xD+5iB2CFBG6hTmlzUEpgHHqlRGoAFGkhB
+        IRTAE9xNFVRBGtjGuNVLBowAOJhDQSGS0a3HenTBFPTAFRzB+fwAGAiAMhQBf4WBGDRABTjBERRAHvgA
+        FkCBHnhDFCLcKqxCM4ADLvRCUkWDDZRAESZWCRRCADTAGsRBISTDCdwNWbyJsxiHD7gBDfiBKCRCC3QB
+        FPjBKtyOIPhEMaiCWmTCNkBFzxH/AhiUifqQV9vUT9qNGbXBjdvMQgGMwAhk4hggQQ/Aj9GFgRDcgzUg
+        AKANgfLhy92A2QzUQAH4gA/IQw+EgBKIwRN4VhgEwSPYwxNUwQ8kwgpMwEUAwyaoAivIwiasQjIIg6oU
+        AijYgDKUgqutwRg4Qc21gAxIgjDYgBrcTR6hUhyxAAsQASEowyx4wxfsQB5UQi1I0TTMgjGYCC2Awzuy
+        QRYEQRQEgBt4gT2qketZQSLKCf/p1RqgADCcARlMBBpcgR8EAZyIRT4wgzngTbC0gUM6AT8AARV0gUXR
+        kRaAIQwAS7lJARRwQzCEAgtkwAz8QB7sQShUAytQgiwIQy+w/8JLAoPrEMIEzEAHxMAUNAAWqMEF+MQe
+        lINmaQAd2ZFOksEabIEN+JsrOAcwAEEScMMqWAIkwMKn0IIzNANPvaMhdgEbyEsebAFywlPbYAWYOWK9
+        mGIREMIRpMEadAEVFEIWlEkOkEEa+MMzOAOmyM96oFINtMQrFEAZdJ3yeYAPjEGcWIEueEMe7MIskABA
+        FgE3hMIvxMIhmIIsBIMwJEMxmIIteI8UeYYmkoEVLIEKXEEIeBE40MEOVAHTmVlYcIEhqgIi0MEiDMAA
+        cAMcSAERVMIyCAIv8MEehMwshEIyXAOboJN5rEEW+EEngIGzTRSYkcESuImbtE1YtE0WnP9gF/yAF7FA
+        RcVJGozANwADFqRBKeILGqgBIIzCKCCEEgAaG5TaRJaiEiRVBJRCMdRCAYgBEtyBJCxDgJ4CK/QCMPzC
+        OiSDK+wC933MADhBE8hnRa2BFYBBIQDDPLgAVwgBB1iBVHABFHSCJgQADSRBor0BEnCBbSzXLMQCNZQC
+        L0hDNMRoD8TAeHAFG5hBH+RBBQRBF4wgj47BErTBHQ1p28hNABhBHRTCz0wUGlAfB5iDMBhAHSFSsBid
+        GGBBCCBCH3glFqjAVCjBGqhADahBFTieIthDB6ACLxTDbbHAHlDDKhxCpjFcMSSDPbiDL7yCJAgAHABC
+        CawBFlwiUbb/gRkkAjBAAjf4gBIgwRgMAQeggBp0gRtUAihIwRLIgw8oa9vEgSUMgB7EFi1MQyyQQjZc
+        Q5toBbVlpwAAARRkgShdgRlUhes5QUVdVSKqQRYITRAgwRa4gatqgaEaADgwAwG0DcOIWbAuWxGwQIq0
+        QR/oaABEACIUQQcQlBUcVhgYgCTwAigkARAExSaYAjNcQzDcgjAUA/mtQve4QBkIpvKFQRUQJRrMgVD8
+        Qc9QQcBdWwHMwBr4gF5owGCdJheYBBTMAqL5AR9YQi2gAyZswzWkKlTMk7qAgQ0UwKtJQQsAAQBOQRCA
+        QQ9QwRVcwRdMwRd8Ux9EAZjJzRXYkQKg/0MyWIM/oF1/4UsppsESWKQmtoESCID0+IElFMESTF8hhUEO
+        OAAcmIoF6IE0UMMmFEM5ZIM6MAMzbEoz2AIi/MEPIAEBhUVo4AsXzEEyJEIJOAEcPIAXPCgVXIABFEEF
+        0MEE2IPaXNURdMIWQAEhrMAPKIMMMBMpiILedkEXmIGEzRE7/UANTAEKJAAikGgFLKMN/IFZDcAUbMER
+        6AAcoAL7WsEYqAAc8FcK7IMz9MNfSV+9GB1tEGUaWEG0NuEkTdI8VoGyEVScjAAzWcwsJAMwAAMuAMM0
+        6EM8WIONCIMAggIoFEGwkAH15ZHU3EEzzMMRVEEXCAARiGUTdAEW/P8AJCjCi/LDESwJEBRBF9AAIcwd
+        jxyAK0kDC/dBN4BBDTRi2k7BVlyVGjSBE7QL+3TBFQSBKq5ZL85CDZRB+oAZFRQBnTBAP+RAG2jAIpTB
+        3RRUsAZLqYVuGyBBCZQVIqKBu4CbGMzASZFCJDRDMphCMchCmfIDA+yDNRRDLGACKQABHGDeDKDBBjik
+        etgYKNRCC4xkGswAIKSeGswRjClCc4wyN/yCEmGBDVjCCkzvGCRABdguM1iDGbCv+nTBHZJXj6pqHMnm
+        VIxB7R0BIJjBkrZNGfQAB4hABkSrwlTYlN6LHk+pBKPBF7iAQcYTPnEBIqUADPgBJESDNKhCMDj/Ayfk
+        AjAMgAeIgDkAAyyMgjQkQQdIxxUYHVGGRhzQUBKgARfc3xF4EpxwgRckQQtgECYk7I5hbylMALTCpxHg
+        wTpYA7qwrxdsBceOlXnI01hSxZtgwQYGwQ8k4nl53A8YSnr9D0UFKy1SKaA9JKBFcyLUwAsSEApoIhqI
+        wQggQR0kQiiQwiH0wjQ8gikkQzRAQRgowDuUwjAUggusQQxYQgvU5d2wAfPSgRRwQTyFhQp0QhF4ARcw
+        ABZEgRR0ARDEAiioQBZYjR9UBgt4wQUMgBzsQYxmg/lUgVTIC1TUKBmMQexZFEURsxWYJRIsyw4EQfuI
+        2RVwwxHgqnoQkPJJ/ykfby24Bas+ucLcKUEBIMESLIG9QNYRBMAveIMwUMIqiAM1KIItTAMcgA4gYAcd
+        hMIFHEEN1EIJiIFlb2IdZMMKkNsYTARZNEGOKoECAEIpAIIUYJs8NAAZSN4sPEQhhMAApCgfZAMzkIP5
+        BPYPXEEcjUd5vMv8pF1FgZlfGwEgAMFcRidFrcEUqOxESbC9BKuUdp3X5rcZVMIrcEMFhMAjXEEZfEEp
+        hoER+MEvJMMmUMIpWAM/TACxSUIL/MAr9IWHsMAc9UAi6IDRHawkTEMc0EbXagF5eAEIAIMMWMFJRUMD
+        5IAXdAEKLAGMPcIyfEARgAIvyFQisDA5UMVWyP+L+mgFkRd00eHRHH14E0CCEcSBALgByIpZHAXBeGH2
+        QYaule+x8rUBGERCIeRBAUhBE6hBBd8LmupBIjC4I/BdMkDAGADBp3kDU1mCHsxCJ3QymgJCJ0RBGsDA
+        GchBMnTeh9vg/HRBDfSAEyABFBgBOijBu1zUGjQBi0XBEZSk3RLD05LDlVlFCCCnOoF0FbTNQ4JuG1wB
+        IZTAFpTJl4UyRcmL1oKunKgBCrSnlk/pFwjAGZG5GJSaFTwWV5NPg8sQMLxDBoigDGRCJhACHLjBAJTC
+        jsiJGDjBLADCEViBEeSfDLiqDVabSd+REIKCDnQBGQiBFTwBFsDAUIqvDHj/QQ0kQDpIAx9IQzGQwziY
+        T6lTQY2C9HjYkRzFkdG1gRrIgxGEAKouaX4HqxlQQUV9eNpFex+oAfLVNPIFqxNsqW8TVKApAxScwLFE
+        4UcEQzbEwwbEFxIEgCZwAw2wgVBbQgyUYhsQgSKEwg4wL421AdUNNgdcGQYKACl4QycYwXqsAQTMixeE
+        gCWwQBGsQzOoxR64wzXQe/10QQjQy1gRuVaEheyR+hXUwA70gSXIgKqOWXr7gBl089GpACLAkQd3s9Ed
+        ppTetxhEhQ/QwR5gginASC9oQywIwzvs0QhEdiSAAhIoHwvkQQh0ZNGZwcPpgYyBAlqFBUEHURVkQQAc
+        /4EUEMBK8IO466QPRoE/PkEMAMOR/cIfAMM1jIM4VIEZgIF4i+qQT4V4gGeS86gZkHU5KkIhdJvyFV0p
+        ioG8FN1lv8kXEAIK7DSWE7QS7LSbiYFZlIAfSMM7N4MNlTAwuMM6oIPQ2ACoJAHy5aBnMIGzuIAf6AIh
+        gMI0fMCL1+VWkEERPEDsdUE3hAIUdC0dkQEW+AAhfE4NDAAtuILYOANAZBsnTg0YH13YrGGTcE1DNmXK
+        sKmChg2ZhWjQoOhWxguQUrbOtGGTZuRFLWyuXGmDxmIbNU1CzDqShiYammw81JiRJoxNNGHCkEHy5k8z
+        SsGELftUq1msXsCWGZiBxf+IJRtltKBZg8rejCs9/BDSE2DZsSRcOOSw2aaJDx8PwDRZ6IFWCS9rtJBp
+        Q8NSIShrLjxIB8gPKWbkBirJc2WhQoaPF1Zhg6YKGZtdAJlxWeBECBVjVqbhIqTNSjFqejhJY3NMDScx
+        ABWA0WY1zzRH/HQBGiZrzzQ0BCXTdOrar0SssmFYZslevgVDmCDpU8tIGjJhCCSiY2kAjRB6/gCjg2T1
+        CCtgHgAqJI8QoR9e1HhB0QlJm6xl4Fia8Jafgn0H8NjFGsTEAeMNLyBzSCE1sGgjh4QWamONOqYozYsl
+        4FtjiTVKI4OM1TBq44waaEtDiRrU0ACLNZRAoQwQ25j/YhYpQOypjS9swEMVSjjpRRt78sjklgEOsOSe
+        DfBJYQgygvCDGzNWm4KQRCTBAIkr9CCkFmlaoK2NC2Lh5oy7nvhiFh8S6qKPHxTqgohBImiiiGhqcMCB
+        OOgghhxyBJIjCwgBXQOLLlxasTKG2sjCEitKY6O00sbY8NHS0ihtjSC6WE2NBFDA4qYCetBBQjD6IEWG
+        JjBCQ4s0iOBjFkpWwQWXbOApQRJNpKEBkQJyYEJJiszooQLdSiBkFEkkecEMPbKhY5ZOjrDJiEda8KKN
+        I2IAYpACrFDIiVmM8IKHUjqRYgwrEHCAgirmCKUYxAbiJg4IFdLqWjfAUIkNIdSQ/3CNJAqhIkKKFlKj
+        C1KPGEMNhdvgwlEz3HC0Q+toyiIWQGSgwYbCBgDjidrK+EAQVYIRp5dTeoEngwl2uWWCCzpxwteeuGiD
+        CEKAmKGOXSzhxRI98OBmGgssmIUEHXRQpgIPhmAhHUIUiYUIIThAwgtUAjBhkFlYQKMLCRgIO4o3FBkw
+        G3LEsWELkRZqmw0z/KgDITasAM0LIrgRgAdCuVhDjSWscKKOAAppQg01rFADDSsYP4ObJkpL1aY0WCgl
+        kl0GiMCPR4xow7c1TPCjlGCasUcdWazJBwcdBnBEmhJ6qIEJJrQACokA7iAkAh94ISYTYpThoxlBEilk
+        Ozq4Kf+GhC6q6KaUf14p5UA0OFDhBUIemYWGh8pgwAF8GGABj2W2gVccN8xwiGCXYDAjCC8wqqIhN0qp
+        hBtQGlyjjIZKM+N+OMoQOUc1pgk2OIITuDC51bABDISohCX01oNM2QR0v3DEKoohDn+4QxjCgEcKmPCC
+        0ZngHsuAQK9sIh0eBKEQESjFKjJhiSk14xftIcQsSrGLTCTDBV4gwC7ygAlgzIMFXnBCBeiQCWCcwAtk
+        qIIVGLAAc3QgDnoYEIHC0S2HuE1iTkDIGqxQhi5wIxZ0cBKhLDIwJWTBDFOIAYdGQhGaxAgMXdgf40Kz
+        Bh8QAQ4FGAH8LOMFE/zBEZwARjD/1tGBfbAjGODgAA6sQIJVTGMChehBDoZgBSw0qQVE8AMJClEMYkjD
+        GzQsxA+gMIMLKIMUlkjGBNSAhCz0oRSlSAQGgICB9rgyAl6wQhVyEEUKsMAOidjGQMQhjmrcZQ1eiEhj
+        GuM3NThBCWswAyHc4IYzQEEJXCwYh9pgBSWshCJsS0MX6uAFklgBBliI4wVYcIExeGAiaPACBn6xiUNY
+        gxqZsMYBcDCCWFijAUNIAQ8iYQo6dMINToyJHwYhiTq4IA+CsEQikJGIZoCiWk8QwxBqMItazKIQD/CC
+        F+ZACF7wghC1JMUHeFCHRLxgDcBcAAPIYIY9SCMbyQxHONrR/4WTNoSoHFFCE7qghoZYIQqdqAF8oNk2
+        trmtDViwglSlSgUqrCQMbFDDDDCEty+0gQwjeEIULEAIfcqCGvMY3QRyUAV+MIMf+RhBF0jgiGV4AxBI
+        eEIQBnFDIkhBCn2QBDfykIhlRIMOEXiAD3QyBCMMIiyzEEABAuAHYqhiF9KwZbXeYAlBfAAJKcCHP7zg
+        gj1YYyA/bccxknoXZyokcU5g5v6K0INuWCshWgkgoCCzEMCJhCQsaYMXgqCQnqBhDE4oQiFq4U6KuOAG
+        paAEK07BDGnwYxa44MYYxmAAYEwjAVoYwgsMYYoalsBrRahDIZJQBETkoRB6uMMfjOGN6v8OghrTEMAT
+        9PiIw3YiGbGAhCpmoYtalOIRJ6DBH2JRjLY6wXtS0AMotuHTY7SDHkk9XHycUIb4KKgMSehEN5DABi5w
+        AQtLKAMXwPvMNThsDVppyBLU4M00ZKEJxUWDGLxQh0jkKg1eOAEfrJsLpDCjHPrghiZAcQQyPKEbwajF
+        BTLwhA+sYh0kgIMXqtCGGHCjBCpQAhHAMIs/SCOjhChEIUgRilrQQAxI6EGykLCFCZSCFn/QBSxWsQwS
+        YEARrgCGM5ZBh7vSYA/LQFs4qtGOQNAjDmowwxac6WGHQAQKgCjFX/S3BoUtZMUyJipRvaqCernNClfR
+        ihaqQIM8RGL/GidIAgb8YItg5CIWybCGNeLBgBJgIhkskAwMhAGMaORADDrogTO8UQgjoKENS3gfRjjS
+        wHIUAnvzCEUnQsE1jByBFDYoQg4uEAlYlEISs6AFKOggCVcUAxwC8obV5PCHcogD0hymBz2YaAYPHy4L
+        W0DcvwphifedWpoDdJtjtki3blIkjWyoAxxyrIUSPKIUU+JDIBQxCVyoQhjTkEQyshEPCsyAG6voSho6
+        UIpm8EMCHvDCBKyRjEjYAH5reMASQFTkmxVjS9woRCikEQIEaWEGYEjGAGbgBEQ84qIkaAEPJvCIaQCj
+        FJagxgHUEAU8SGMckebwpAMhgDN40WBC/wUDKGyQhSRwgxADcEIz8d7M9CWoYCe9wlXZsIQlRMZhbTDD
+        NKAgoR+0RxCFSEQxKCEMaqzCGhNogDLWkY8MpOADrshGByhXCGtsFxEVmEABgJGIWiS+DF5M1Ui8AAaZ
+        R0MQ0ljGk8jKBSt0oQe1aEEVCJAMS0TjBDxwwyPcYIQKgMISobDtC/bgDrNPmh6TrsADlLCwpJpBBoXI
+        wwm4IQ8enEENHBmqGnQABjMwBOJvC8IcBiAFojbBCQvJgQTIsAYwAMGOLQgLIVzBFByhF0DBAjKhF06A
+        CSCAFNhhBMLABUpBFSZACoKAEGJBGB4BEBogPrrhacCADbSACSojVTsqxQtkgBaIQYYEgAbaYH+eYAye
+        oAkAQRpcQDp4ARgegRtm4QWkoAsewB4KgRuSQAqKSRyq79+QkB4CAgA7
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Resources/SampleResources.resx b/test/Spring/Spring.Core.Tests/Resources/SampleResources.resx
new file mode 100644
index 00000000..0efe8412
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Resources/SampleResources.resx
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="message">
+    <value>Hello {0} {1}</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Resources/SimpleAppContext.xml b/test/Spring/Spring.Core.Tests/Resources/SimpleAppContext.xml
new file mode 100644
index 00000000..035c87ea
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Resources/SimpleAppContext.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<objects xmlns="http://www.springframework.net">
+
+  <object id="test" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="name">
+      <value>George</value>
+    </property>
+    <property name="age">
+      <value>25</value>
+    </property>
+  </object>
+  
+</objects>
+
diff --git a/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.pt-BR.resx b/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.pt-BR.resx
new file mode 100644
index 00000000..8114e529
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.pt-BR.resx
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            <xsd:complexType>
+                <xsd:choice maxOccurs="unbounded">
+                    <xsd:element name="data">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" />
+                            <xsd:attribute name="type" type="xsd:string" />
+                            <xsd:attribute name="mimetype" type="xsd:string" />
+                        </xsd:complexType>
+                    </xsd:element>
+                    <xsd:element name="resheader">
+                        <xsd:complexType>
+                            <xsd:sequence>
+                                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                            </xsd:sequence>
+                            <xsd:attribute name="name" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:choice>
+            </xsd:complexType>
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="ResMimeType">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="Version">
+        <value>1.0.0.0</value>
+    </resheader>
+    <resheader name="Reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="Writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="MyMessage">
+        <value>Isso e {0}{1}</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.resx b/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.resx
new file mode 100644
index 00000000..955d5a01
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.resx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="MyMessage" xml:space="preserve">
+    <value>This is {0}{1}</value>
+  </data>
+  <data name="MyNewMessage" xml:space="preserve">
+    <value>Visual Studio loves {0}{1}</value>
+  </data>
+  <data name="MyNullMessage" xml:space="preserve">
+    <value />
+  </data>
+  <data name="error.required" xml:space="preserve">
+    <value>{0} is required {1}</value>
+  </data>
+  <data name="field.firstname" xml:space="preserve">
+    <value>First name</value>
+  </data>
+  <data name="code1" xml:space="preserve">
+    <value>message1</value>
+  </data>
+  <data name="code3" xml:space="preserve">
+    <value>message3</value>
+  </data>
+  <data name="hello" xml:space="preserve">
+    <value>{0}, {1}</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr-Cyrl-CS.resx b/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr-Cyrl-CS.resx
new file mode 100644
index 00000000..fd7e371b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr-Cyrl-CS.resx
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="MyMessage">
+    <value>Ово је {0}{1}</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr-SP-Cyrl.resx b/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr-SP-Cyrl.resx
new file mode 100644
index 00000000..fd7e371b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr-SP-Cyrl.resx
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="MyMessage">
+    <value>Ово је {0}{1}</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr.resx b/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr.resx
new file mode 100644
index 00000000..b3290dff
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr.resx
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="MyMessage">
+    <value>Ovo je {0}{1}</value>
+  </data>
+  <data name="MyNewMessage">
+    <value>Visual Studio voli {0}{1}</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Resources/Tesla.resx b/test/Spring/Spring.Core.Tests/Resources/Tesla.resx
new file mode 100644
index 00000000..4c327d8d
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Resources/Tesla.resx
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.Name" type="System.String">
+    <value>Nikola Tesla</value>
+  </data>
+  <data name="$this.Nationality" type="System.String">
+    <value>Serbian</value>
+  </data>
+  <data name="$this.DOB" type="System.DateTime">
+    <value>7/9/1856</value>
+  </data>
+  <data name="$this.PlaceOfBirth.Country" type="System.String">
+    <value>Croatia</value>
+  </data>
+  <data name="$this.PlaceOfBirth.City" type="System.String">
+    <value>Smiljan</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Resources/Tesla.sr-Cyrl-CS.resx b/test/Spring/Spring.Core.Tests/Resources/Tesla.sr-Cyrl-CS.resx
new file mode 100644
index 00000000..54318df6
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Resources/Tesla.sr-Cyrl-CS.resx
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.Name" type="System.String">
+    <value>�икола Те�ла</value>
+  </data>
+  <data name="$this.Nationality" type="System.String">
+    <value>Србин</value>
+  </data>
+  <data name="$this.PlaceOfBirth.Country" type="System.String">
+    <value>Хрват�ка</value>
+  </data>
+  <data name="$this.PlaceOfBirth.City" type="System.String">
+    <value>Смиљан</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Resources/Tesla.sr-SP-Cyrl.resx b/test/Spring/Spring.Core.Tests/Resources/Tesla.sr-SP-Cyrl.resx
new file mode 100644
index 00000000..54318df6
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Resources/Tesla.sr-SP-Cyrl.resx
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.Name" type="System.String">
+    <value>�икола Те�ла</value>
+  </data>
+  <data name="$this.Nationality" type="System.String">
+    <value>Србин</value>
+  </data>
+  <data name="$this.PlaceOfBirth.Country" type="System.String">
+    <value>Хрват�ка</value>
+  </data>
+  <data name="$this.PlaceOfBirth.City" type="System.String">
+    <value>Смиљан</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Resources/Tesla.sr.resx b/test/Spring/Spring.Core.Tests/Resources/Tesla.sr.resx
new file mode 100644
index 00000000..f8a2665c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Resources/Tesla.sr.resx
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.TrayAutoArrange" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <!-- Spring.NET WebForm Controls localization -->
+  <data name="$this.Nationality" type="System.String">
+    <value>Srbin</value>
+  </data>
+  <data name="$this.PlaceOfBirth.Country" type="System.String">
+    <value>Hrvatska</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2002.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2002.csproj
new file mode 100644
index 00000000..46e78f2a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2002.csproj
@@ -0,0 +1,1734 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.0.9955"
+        SchemaVersion = "1.0"
+        ProjectGuid = "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Core.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                RootNamespace = "Spring"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_0"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2002\Spring.Core.Tests\Debug-1.0\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "1"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2002\Spring.Core.Tests\Release-1.0\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.2002"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\Net\1.0\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "antlr.runtime"
+                    AssemblyName = "antlr.runtime"
+                    HintPath = "..\..\..\lib\Net\1.0\antlr.runtime.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.0\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "DotNetMock"
+                    AssemblyName = "DotNetMock"
+                    HintPath = "..\..\..\lib\Net\1.0\DotNetMock.dll"
+                />
+                <Reference
+                    Name = "DotNetMock.Framework"
+                    AssemblyName = "DotNetMock.Framework"
+                    HintPath = "..\..\..\lib\Net\1.0\DotNetMock.Framework.dll"
+                />
+                <Reference
+                    Name = "System.EnterpriseServices"
+                    AssemblyName = "System.EnterpriseServices"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.EnterpriseServices.dll"
+                />
+                <Reference
+                    Name = "System.Web"
+                    AssemblyName = "System.Web"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Web.dll"
+                />
+                <Reference
+                    Name = "System.Web.Services"
+                    AssemblyName = "System.Web.Services"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Web.Services.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CommonTypes.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CoreExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "ExceptionsTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Core.Tests.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Spring.Core.Tests.dll.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "StandardsComplianceTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "StreamHelperDecorator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TestResource.txt"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Collections\AbstractQueueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\HashedSetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\HybridSetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\ImmutableSetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\LinkedListTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\ListSetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\PriorityQueueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SortedSetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\StaticSetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\ApplicationEventArgsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\CommonTypes.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\ContextExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\contextlifecycle.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Context\ContextListenerObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\EventListenerAttributeTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Events\ConsoleListenerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\AbstractApplicationContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\AbstractMessageSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ApplicationContextAwareProcessorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ApplicationContextExtensionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ApplicationObjectSupportTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\Assembler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\contextA.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Context\Support\contextB.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Context\Support\contextC.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Context\Support\ContextLocatorHandlerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ContextRegistryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\DefaultMessageSourceResolvableTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\DelegatingMessageSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\import1.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Context\Support\invalidType.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Context\Support\invalidValueType.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Context\Support\Logic.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\MessageSourceAccessorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\NamespaceParsersSectionHandlerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\NullMessageSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\objects.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Context\Support\ResourceSetMessageSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\Service.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\simpleContext.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Context\Support\StaticApplicationContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\StaticMessageSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\testobject.xsd"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Context\Support\TestObjectConfigParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\TypeAliasesSectionHandlerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\XmlApplicationContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\ComposedCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\ControlFlowFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodGenericArgumentsCountCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodParametersCountCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodParametersCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodReturnTypeCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\OrderComparatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\RegularExpressionEventNameCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\RegularExpressionMethodNameCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\AssemblyResourceTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ConfigurableResourceLoaderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\FileSystemResourceCommonTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\FileSystemResourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\InputStreamResourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ResourceConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ResourceHandlerRegistryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\TestResource.txt"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Core\IO\UrlResourceTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\CredentialConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\CustomNumberConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\FileInfoConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\NameValueConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RegexConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RegistryKeyConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\ResourceManagerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RGBColorConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RuntimeTypeConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\StreamConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\StringArrayConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\TimeSpanConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\TypeConverterRegistryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\UriConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\aliasedObjects.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\CachedTypeResolverTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\GenericTypeResolverTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeRegistryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeResolutionUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeResolverTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\EmptyPattern.test"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\Examples.test"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\InBetween.test"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\MatchAll.test"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\PatternsAreCaseSensitive.test"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\SingleCaracters.test"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\SlurpPrependedDirectories.test"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\SpringAssembliesPrefix.test"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\ThisDirectory.test"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\concurrent.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\leaf.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\middle.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\root.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\AnotherDaoConfig.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\DaoConfig.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\DatabaseConfig.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\ObjectFactoryCreatingFactoryObjectTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\PPC-SPRNET-55.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\PPCTwoLocationsOneSectionTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\PPCTwoLocationsTwoSectionsTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\PPCWithTypesTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\PropertyPlaceholderConfigurerTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\PropertyResourceConfigurerTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\abstract.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\autowire.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\bad-external-resources.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\bad-named-constructor-arg.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\child.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\classnotfound.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\collections.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\constructor-arg.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\default-autowire.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\default-lazy-init.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\dependenciesmaterializethis.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\enums.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\event-wiring.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\event-wiring-prototypes.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\external-resources.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\factorycircle.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\factory-methods.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\field-props-factory.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\initializers.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\invalid.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\invalid-factory.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\invoke-factory.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\notfullyspecified.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\parent.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\reftypes.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\resource.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\satisfiedalldependencycheck.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\satisfiedobjectdependencycheck.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\satisfiedsimpledependencycheck.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\schema-validation.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\test.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\unsatisfiedalldependencycheckmissingobjects.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\unsatisfiedAllDependencyCheckMissingSimple.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\unsatisfiedobjectdependencycheck.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\unsatisfiedsimpledependencycheck.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\Resources\resource-imports.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "DataBinding\BaseBindingManagerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\SimpleExpressionBindingTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ExpressionEvaluatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\AbstractLocalizerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\CultureInfoUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\CultureTestScope.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\CurrencyFormatterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\DateTimeFormatterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\FloatFormatterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\IntegerFormatterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\NumberFormatterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\PercentFormatterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Localizers\ResourceSetLocalizerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Resolvers\DefaultCultureResolverTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\DerivedTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\ExpressionTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\IndexedTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\INestedTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\IOther.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\IPerson.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\ITestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\LazyTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\MutablePropertyValuesTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\NestedTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\NotWritablePropertyExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\NumberTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\ObjectWrapperTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\PropertyAccessExceptionsExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\PropertyValueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\ResourceTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\SerializablePerson.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\StaticTestEventHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\TestEventHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\TestGenericObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\TestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\TestObject.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Objects\TestObjectDAO.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\TestObjectList.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\TypeMismatchExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Events\Support\EventManipulationUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Events\Support\EventRegistryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\AbstractListableObjectFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\AbstractObjectFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\DefaultListableObjectFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\DummyConfigurableFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\DummyFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\HasMap.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ISideEffectObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\KnowsIfInstantiated.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\LifecycleObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\MethodReplacerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\MustBeInitialized.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\NoSuchObjectDefinitionExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectDefinitionStoreExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectFactoryUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\SideEffectObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\TestResource.txt"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Objects\Factory\UnsupportedObjectDefinitionImplementation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\AbstractFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\CommandLineArgsVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConfigSectionVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConfigurationReaderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConnectionStringsVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConstructorArgumentValuesTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\CustomConverterConfigurerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\DelegateFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\DictionaryFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\EnvironmentVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\EventValuesTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\FieldRetrievingFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ListFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\LogFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\MethodInvokingFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectDefinitionVisitorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectFactoryCreatingFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectReferenceFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyFileVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyOverrideConfigurerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyPathFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyPlaceholderConfigurerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyRetrievingFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\RegistryVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ResourceHandlerConfigurerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ResourceManagerFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\RuntimeObjectReferenceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\SetFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\SpecialFolderVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\TypeAliasConfigurerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\TypedStringValueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AutowireUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ChildObjectDefinitionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DefaultObjectDefinitionFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DelegatingMethodReplacerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\LookupMethodOverrideTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\LookupMethodReplacerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ObjectDefinitionBuilderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ObjectDefinitionReaderUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ReplacedMethodOverrideTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\RootObjectDefinitionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\SimpleInstantiationStrategyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ConstructorDependenciesObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DependenciesObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DerivedConstructorDependenciesObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DoubleBooleanConstructorObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DummyBo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DummyDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DummyReferencer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\EventWiringTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\FactoryMethods.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\IDummyBo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\InstanceFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\MixedCollectionObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\NullAppender.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ReadOnlyXmlTestResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\SingleSimpleTypeConstructorObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\TestObjectCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlListableObjectFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlObjectCollectionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlObjectDefinitionReaderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlObjectFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlParserResolverTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\ArgumentConvertingMethodInvokerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\AutoWiringEventHandlerValueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\InstanceEventHandlerValueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\MethodInvokerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\MutableSortDefinitionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\PropertyComparatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\StaticEventHandlerValueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Pool\Support\SimplePoolTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\AbstractProxyTypeBuilderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\CompositionProxyTypeBuilderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\DynamicProxyManagerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\ExplicitCompositionProxyTypeBuilderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\InheritanceProxyTypeBuilderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicConstructorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicFieldTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicIndexerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicMethodTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicPropertyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Resources\Images.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\SampleResources.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\SimpleAppContext.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Spring.Context.Tests.pt-BR.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Spring.Context.Tests.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Spring.Context.Tests.sr.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Spring.Context.Tests.sr-SP-Cyrl.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Tesla.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Tesla.sr.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Tesla.sr-SP-Cyrl.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Threading\AsyncTestMethod.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\AsyncTestTask.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\CallContextStorageTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\CommonThreadStorageTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\LatchTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\LogicalThreadContextTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\SemaphoreTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\SyncHolderTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\ThreadStaticStorageTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ArrayUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\AssertUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\CollectionUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\DefensiveEventRaiserTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\DelegateInfoTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\EventRaiserTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\NumberUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ObjectUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\PathMatcherTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\PatternMatchUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\PropertiesTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ReflectionUtilsMemberwiseCopyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ReflectionUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\SerializationTestUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\StringUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\AnyValidatorGroupTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ExclusiveValidatorGroupTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\HelperClasses.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidationConfigParserTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidationErrorsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidatorGroupTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidatorReferenceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Actions\ErrorMessageActionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Actions\ExpressionActionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\ConditionValidatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\RegularExpressionValidatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\RequiredValidatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2003.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2003.csproj
new file mode 100644
index 00000000..bd7d0bc4
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2003.csproj
@@ -0,0 +1,1934 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Core.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = 'echo "Copying .xml files for tests"&#xd;&#xa;xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2003\Spring.Core.Tests\$(ConfigurationName)\ /y /s /q /d&#xd;&#xa;copy  "$(ProjectDir)$(TargetFileName)-1.1.config" ..\..\..\..\build\VS.Net.2003\Spring.Core.Tests\$(ConfigurationName)\$(TargetFileName).config'
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = "67,0618"
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Core.Tests\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Core.Tests\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\Net\1.1\nunit.framework.dll"
+                    Private = "True"
+                />
+                <Reference
+                    Name = "DotNetMock"
+                    AssemblyName = "DotNetMock"
+                    HintPath = "..\..\..\lib\Net\1.1\DotNetMock.dll"
+                />
+                <Reference
+                    Name = "antlr.runtime"
+                    AssemblyName = "antlr.runtime"
+                    HintPath = "..\..\..\lib\Net\1.1\antlr.runtime.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "System.Web.Services"
+                    AssemblyName = "System.Web.Services"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.Services.dll"
+                />
+                <Reference
+                    Name = "System.EnterpriseServices"
+                    AssemblyName = "System.EnterpriseServices"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.EnterpriseServices.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Rhino.Mocks"
+                    AssemblyName = "Rhino.Mocks"
+                    HintPath = "..\..\..\lib\Net\1.1\Rhino.Mocks.dll"
+                />
+                <Reference
+                    Name = "System.Runtime.Serialization.Formatters.Soap"
+                    AssemblyName = "System.Runtime.Serialization.Formatters.Soap"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Runtime.Serialization.Formatters.Soap.dll"
+                />
+                <Reference
+                    Name = "System.Windows.Forms"
+                    AssemblyName = "System.Windows.Forms"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CommonTypes.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "CoreExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "ExceptionsTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "HookableContextHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Core.Tests.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Spring.Core.Tests.dll.config"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Spring.Core.Tests.dll-1.1.config"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "StandardsComplianceTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "StopWatch.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "StreamHelperDecorator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "StringResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TestResource.txt"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Caching\AbstractCacheTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\AbstractQueueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\HashedSetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\HybridSetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\ImmutableSetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\LinkedListTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\ListSetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\PriorityQueueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\SortedSetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Collections\StaticSetTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\ApplicationEventArgsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\CommonTypes.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\ContextExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\contextlifecycle.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Context\ContextListenerObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\EventListenerAttributeTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Events\ConsoleListenerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\AbstractApplicationContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\AbstractMessageSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ApplicationContextAwareProcessorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ApplicationContextExtensionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ApplicationObjectSupportTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\Assembler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\contextA.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Context\Support\contextB.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Context\Support\contextC.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Context\Support\ContextLocatorHandlerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\ContextRegistryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\DefaultMessageSourceResolvableTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\DelegatingMessageSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\import1.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Context\Support\invalidType.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Context\Support\invalidValueType.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Context\Support\Logic.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\MessageSourceAccessorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\NamespaceParsersSectionHandlerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\NullMessageSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\objects.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Context\Support\ResourceSetMessageSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\Service.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\simpleContext.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Context\Support\StaticApplicationContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\StaticMessageSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\testobject.xsd"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Context\Support\TestObjectConfigParser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\TypeAliasesSectionHandlerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\XmlApplicationContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\ComposedCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\ControlFlowFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodGenericArgumentsCountCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodParametersCountCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodParametersCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\MethodReturnTypeCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\OrderComparatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\RegularExpressionEventNameCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\RegularExpressionMethodNameCriteriaTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\AssemblyResourceTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ConfigurableResourceLoaderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\FileSystemResourceCommonTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\FileSystemResourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\InputStreamResourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ResourceConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\ResourceHandlerRegistryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\IO\TestResource.txt"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Core\IO\UrlResourceTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\CredentialConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\CustomNumberConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\FileInfoConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\NameValueConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RegexConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RegistryKeyConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\ResourceManagerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RGBColorConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\RuntimeTypeConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\StreamConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\StringArrayConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\TimeSpanConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\TypeConverterRegistryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\UniqueKeyConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeConversion\UriConverterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\aliasedObjects.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\CachedTypeResolverTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\GenericTypeResolverTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeRegistryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeResolutionUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Core\TypeResolution\TypeResolverTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\EmptyPattern.test"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\Examples.test"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\InBetween.test"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\MatchAll.test"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\PatternsAreCaseSensitive.test"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\SingleCaracters.test"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\SlurpPrependedDirectories.test"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\SpringAssembliesPrefix.test"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\PathMatcher\ThisDirectory.test"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Context\Support\SPRNET-192.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\concurrent.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\leaf.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\middle.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\root.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\AnotherDaoConfig.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\DaoConfig.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\DatabaseConfig.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\one.properties"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\PPC-SPRNET-55.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\PPCTwoLocationsOneSectionTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\PPCTwoLocationsTwoSectionsTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\PPCWithTypesTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\PropertyPlaceholderConfigurerTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\PropertyResourceConfigurerTests.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Config\two.properties"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\abstract.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\autowire.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\bad-external-resources.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\bad-named-constructor-arg.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\child.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\classnotfound.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\collections.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\constructor-arg.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\default-autowire.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\default-lazy-init.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\dependenciesmaterializethis.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\enums.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\event-wiring.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\event-wiring-prototypes.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\expressions.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\external-resources.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\factorycircle.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\factory-methods.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\field-props-factory.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\initializers.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\invalid.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\invalid-factory.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\invoke-factory.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\lazy-init-multithreaded.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\no-objects.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\notfullyspecified.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\parent.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\reftypes.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\resource.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\satisfiedalldependencycheck.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\satisfiedobjectdependencycheck.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\satisfiedsimpledependencycheck.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\schema-validation.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\test.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\unsatisfiedalldependencycheckmissingobjects.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\unsatisfiedAllDependencyCheckMissingSimple.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\unsatisfiedobjectdependencycheck.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\unsatisfiedsimpledependencycheck.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\wellformed-but-bad.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Xml\Resources\resource-imports.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "DataBinding\BaseBindingManagerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataBinding\SimpleExpressionBindingTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Expressions\ExpressionEvaluatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\AbstractLocalizerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\CultureInfoUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\CultureTestScope.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\BooleanFormatterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\CurrencyFormatterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\DateTimeFormatterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\FloatFormatterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\IntegerFormatterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\NumberFormatterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Formatters\PercentFormatterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Localizers\ResourceSetLocalizerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Globalization\Resolvers\DefaultCultureResolverTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\DerivedTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\ExpressionTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\IndexedTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\INestedTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\IOther.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\IPerson.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\ITestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\LazyTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\MutablePropertyValuesTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\NestedTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\NotWritablePropertyExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\NumberTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\ObjectWrapperTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\PropertyAccessExceptionsExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\PropertyValueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\ResourceTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\SerializablePerson.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\StaticTestEventHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\TestEventHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\TestGenericObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\TestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\TestObject.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Objects\TestObjectDAO.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\TestObjectList.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\TypeMismatchExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\ValidatorTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Events\Support\EventManipulationUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Events\Support\EventRegistryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\AbstractListableObjectFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\AbstractObjectFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\DefaultListableObjectFactoryPerfTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\DefaultListableObjectFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\DummyConfigurableFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\DummyFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\HasMap.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ISideEffectObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\KnowsIfInstantiated.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\LifecycleObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\MethodReplacerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\MustBeInitialized.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\NoSuchObjectDefinitionExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectDefinitionStoreExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\ObjectFactoryUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\SideEffectObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\TestResource.txt"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Objects\Factory\UnsupportedObjectDefinitionImplementation.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Attributes\MyRequiredAttribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Attributes\RequiredAttributeObjectPostProcessorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Attributes\RequiredTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Attributes\RequiredWithAllRequiredPropertiesProvided.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Objects\Factory\Attributes\RequiredWithCustomAttribute.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Objects\Factory\Attributes\RequiredWithOneRequiredPropertyOmitted.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Objects\Factory\Attributes\RequiredWithThreeRequiredPropertiesOmitted.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\AbstractFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\CommandLineArgsVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConfigSectionVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConfigurationReaderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConnectionStringsVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ConstructorArgumentValuesTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\CustomConverterConfigurerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\DelegateFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\DictionaryFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\EnvironmentVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\EventValuesTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\FieldRetrievingFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ListFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\LogFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\MethodInvokingFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectDefinitionVisitorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectFactoryCreatingFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ObjectReferenceFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyFileVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyOverrideConfigurerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyPathFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyPlaceholderConfigurerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\PropertyRetrievingFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\RegistryVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ResourceHandlerConfigurerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\ResourceManagerFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\RuntimeObjectReferenceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\SetFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\SpecialFolderVariableSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\TypeAliasConfigurerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\TypedStringValueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\VariableAccessorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Config\VariablePlaceholderConfigurerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\AutowireUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ChildObjectDefinitionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DefaultObjectDefinitionFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\DelegatingMethodReplacerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\LookupMethodOverrideTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\LookupMethodReplacerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ObjectDefinitionBuilderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ObjectDefinitionReaderUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\ReplacedMethodOverrideTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\RootObjectDefinitionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\SimpleInstantiationStrategyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ConstructorDependenciesObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DependenciesObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DerivedConstructorDependenciesObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DoubleBooleanConstructorObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DummyBo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DummyDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\DummyReferencer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\EventWiringTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\FactoryMethods.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\IDummyBo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\InstanceFactory.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\MixedCollectionObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\NullAppender.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ObjectFactorySectionHandlerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\ReadOnlyXmlTestResource.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\SingleSimpleTypeConstructorObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\TestObjectCreator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlListableObjectFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlObjectCollectionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlObjectDefinitionReaderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlObjectFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Xml\XmlParserResolverTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\ArgumentConvertingMethodInvokerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\AutoWiringEventHandlerValueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\InstanceEventHandlerValueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\MethodInvokerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\MutableSortDefinitionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\PropertyComparatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Support\StaticEventHandlerValueTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Pool\Support\SimplePoolTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\AbstractProxyTypeBuilderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\CompositionProxyTypeBuilderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\DynamicProxyManagerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\ExplicitCompositionProxyTypeBuilderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Proxy\InheritanceProxyTypeBuilderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\BasePropertyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicConstructorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicFieldTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicIndexerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicMethodTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\DynamicPropertyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\SafeFieldTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Reflection\Dynamic\SafePropertyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Resources\Images.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\SampleResources.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\SimpleAppContext.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Spring.Context.Tests.pt-BR.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Spring.Context.Tests.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Spring.Context.Tests.sr.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Spring.Context.Tests.sr-Cyrl-CS.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Spring.Context.Tests.sr-SP-Cyrl.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Tesla.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Tesla.sr.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Tesla.sr-Cyrl-CS.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Resources\Tesla.sr-SP-Cyrl.resx"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Threading\AsyncTestMethod.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\AsyncTestTask.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\CallContextStorageTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\CommonThreadStorageTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\LatchTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\LogicalThreadContextTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\SemaphoreTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\SyncHolderTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\ThreadStaticStorageTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ArrayUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\AssertUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\CollectionUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\DefensiveEventRaiserTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\DelegateInfoTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\EventRaiserTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\NumberUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ObjectUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\PathMatcherTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\PatternMatchUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\PropertiesTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ReflectionUtilsMemberwiseCopyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ReflectionUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\SerializationTestUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\StringUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\UniqueKeyTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\AnyValidatorGroupTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\CollectionValidatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ExclusiveValidatorGroupTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\HelperClasses.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidationConfigParserTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidationErrorsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidatorGroupTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\ValidatorReferenceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Actions\ErrorMessageActionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Actions\ExpressionActionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\ConditionValidatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\CreditCardValidatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\EmailValidatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\ISBNValidatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\RegularExpressionValidatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\RequiredValidatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\UrlValidatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\Integration\CreditCardValidatorIntegrationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\Integration\EmailValidatorIntegrationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\Integration\ISBNValidatorIntegrationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Validation\Validators\Integration\UrlValidatorIntegrationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj
new file mode 100644
index 00000000..235e7b81
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj
@@ -0,0 +1,871 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Core.Tests</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Core.Tests\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0;DEBUG_DYNAMIC</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>67, 618</NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Core.Tests\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>618</NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DotNetMock, Version=0.7.4.0, Culture=neutral, PublicKeyToken=805ea88df19095f6">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\DotNetMock.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.5.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Caching\AbstractCacheTests.cs" />
+    <Compile Include="Caching\BaseCacheAttributeTests.cs" />
+    <Compile Include="Collections\AbstractQueueTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\HashedSetTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\HybridSetTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\ImmutableSetTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\LinkedListTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\ListSetTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\PriorityQueueTests.cs" />
+    <Compile Include="Collections\SetTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\SortedSetTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Collections\StaticSetTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="CommonTypes.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\ApplicationEventArgsTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\CommonTypes.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\ContextExceptionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\ContextListenerObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\EventListenerAttributeTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Events\ConsoleListenerTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\AbstractApplicationContextTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\AbstractMessageSourceTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\ApplicationContextAwareProcessorTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\ApplicationContextExtensionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\ApplicationObjectSupportTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\Assembler.cs" />
+    <Compile Include="Context\Support\ContextLocatorHandlerTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\ContextRegistryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\NamespaceParsersSectionHandlerTests.cs" />
+    <Compile Include="Context\Support\DefaultMessageSourceResolvableTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\DelegatingMessageSourceTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\Logic.cs" />
+    <Compile Include="Context\Support\MessageSourceAccessorTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\NullMessageSourceTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\ResourceSetMessageSourceTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\Service.cs" />
+    <Compile Include="Context\Support\StaticApplicationContextTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\StaticMessageSourceTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\TestObjectConfigParser.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\TypeAliasesSectionHandlerTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Context\Support\XmlApplicationContextTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="CoreExceptionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\ComposedCriteriaTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\ControlFlowFactoryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\IO\AssemblyResourceTest.cs" />
+    <Compile Include="Core\IO\ConfigurableResourceLoaderTests.cs" />
+    <Compile Include="Core\IO\FileSystemResourceCommonTests.cs" />
+    <Compile Include="Core\IO\FileSystemResourceTests.cs" />
+    <Compile Include="Core\IO\InputStreamResourceTests.cs" />
+    <Compile Include="Core\IO\ResourceConverterTests.cs" />
+    <Compile Include="Core\IO\ResourceHandlerRegistryTests.cs" />
+    <Compile Include="Core\IO\UrlResourceTest.cs" />
+    <Compile Include="Core\MethodGenericArgumentsCountCriteriaTests.cs" />
+    <Compile Include="Core\MethodParametersCountCriteriaTests.cs" />
+    <Compile Include="Core\MethodParametersCriteriaTests.cs" />
+    <Compile Include="Core\MethodReturnTypeCriteriaTests.cs" />
+    <Compile Include="Core\OrderComparatorTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\RegularExpressionEventNameCriteriaTests.cs" />
+    <Compile Include="Core\RegularExpressionMethodNameCriteriaTests.cs" />
+    <Compile Include="Core\TypeConversion\CredentialConverterTests.cs" />
+    <Compile Include="Core\TypeConversion\CustomNumberConverterTests.cs" />
+    <Compile Include="Core\TypeConversion\FileInfoConverterTests.cs" />
+    <Compile Include="Core\TypeConversion\NameValueConverterTests.cs" />
+    <Compile Include="Core\TypeConversion\RegexConverterTests.cs" />
+    <Compile Include="Core\TypeConversion\RegistryKeyConverterTests.cs" />
+    <Compile Include="Core\TypeConversion\ResourceManagerTests.cs" />
+    <Compile Include="Core\TypeConversion\RGBColorConverterTests.cs" />
+    <Compile Include="Core\TypeConversion\RuntimeTypeConverterTests.cs" />
+    <Compile Include="Core\TypeConversion\StreamConverterTests.cs" />
+    <Compile Include="Core\TypeConversion\StringArrayConverterTests.cs" />
+    <Compile Include="Core\TypeConversion\TimeSpanConverterTests.cs" />
+    <Compile Include="Core\TypeConversion\TypeConverterRegistryTests.cs" />
+    <Compile Include="Core\TypeConversion\UriConverterTests.cs" />
+    <Compile Include="Core\TypeResolution\CachedTypeResolverTests.cs" />
+    <Compile Include="Core\TypeResolution\GenericTypeResolverTests.cs" />
+    <Compile Include="Core\TypeResolution\TypeRegistryTests.cs" />
+    <Compile Include="Core\TypeResolution\TypeResolutionUtilsTests.cs" />
+    <Compile Include="Core\TypeResolution\TypeResolverTests.cs" />
+    <Compile Include="DataBinding\SimpleExpressionBindingTests.cs" />
+    <Compile Include="DataBinding\BaseBindingManagerTests.cs" />
+    <Compile Include="ExceptionsTest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\ExpressionEvaluatorTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Expressions\FunctionNodeTests.cs" />
+    <Compile Include="Expressions\MethodNodeTests.cs" />
+    <Compile Include="Expressions\Processors\ConversionProcessorTests.cs" />
+    <Compile Include="Expressions\Processors\OrderByProcessorTests.cs" />
+    <Compile Include="Expressions\ReferenceNodeTests.cs" />
+    <Compile Include="Expressions\SelectionNodeTests.cs" />
+    <Compile Include="Globalization\AbstractLocalizerTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\CultureInfoUtils.cs" />
+    <Compile Include="Globalization\CultureTestScope.cs" />
+    <Compile Include="Globalization\Formatters\BooleanFormatterTests.cs" />
+    <Compile Include="Globalization\Formatters\CurrencyFormatterTests.cs" />
+    <Compile Include="Globalization\Formatters\DateTimeFormatterTests.cs" />
+    <Compile Include="Globalization\Formatters\FilteringFormatterTests.cs" />
+    <Compile Include="Globalization\Formatters\FloatFormatterTests.cs" />
+    <Compile Include="Globalization\Formatters\HasTextFilteringFormatterTests.cs" />
+    <Compile Include="Globalization\Formatters\IntegerFormatterTests.cs" />
+    <Compile Include="Globalization\Formatters\NumberFormatterTests.cs" />
+    <Compile Include="Globalization\Formatters\PercentFormatterTests.cs" />
+    <Compile Include="Globalization\Localizers\ResourceSetLocalizerTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Globalization\Resolvers\DefaultCultureResolverTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="HookableContextHandler.cs" />
+    <Compile Include="Objects\ExpressionTestObject.cs" />
+    <Compile Include="Objects\Factory\Attributes\MyRequiredAttribute.cs" />
+    <Compile Include="Objects\Factory\Attributes\RequiredAttributeObjectPostProcessorTests.cs" />
+    <Compile Include="Objects\Factory\Attributes\RequiredTestObject.cs" />
+    <Compile Include="Objects\Factory\Config\CommandLineArgsVariableSourceTests.cs" />
+    <Compile Include="Objects\Factory\Config\ConfigSectionVariableSourceTests.cs" />
+    <Compile Include="Objects\Factory\Config\ConnectionStringsVariableSourceTests.cs" />
+    <Compile Include="Objects\Factory\Config\ObjectDefinitionVisitorTests.cs" />
+    <Compile Include="Objects\Factory\Config\ResourceHandlerConfigurerTests.cs" />
+    <Compile Include="Objects\Factory\Config\PropertyFileVariableSourceTests.cs" />
+    <Compile Include="Objects\Factory\Config\SpecialFolderVariableSourceTests.cs" />
+    <Compile Include="Objects\Factory\Config\EnvironmentVariableSourceTests.cs" />
+    <Compile Include="Objects\Factory\Config\RegistryVariableSourceTests.cs" />
+    <Compile Include="Objects\Factory\Config\TypeAliasConfigurerTests.cs" />
+    <Compile Include="Objects\Factory\Config\VariableAccessorTests.cs" />
+    <Compile Include="Objects\Factory\Config\VariablePlaceholderConfigurerTests.cs" />
+    <Compile Include="Objects\Factory\DefaultListableObjectFactoryPerfTests.cs" />
+    <Compile Include="Objects\Factory\DummyConfigurableFactory.cs" />
+    <Compile Include="Objects\Factory\Support\ObjectDefinitionBuilderTests.cs" />
+    <Compile Include="Objects\Factory\Xml\LocaleTests.cs" />
+    <Compile Include="Objects\Factory\Xml\ObjectFactorySectionHandlerTests.cs" />
+    <Compile Include="Objects\LazyTestObject.cs" />
+    <Compile Include="Objects\Support\MethodInvokerTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\TestGenericObject.cs" />
+    <Compile Include="Objects\ObjectWrapperTests.cs" />
+    <Compile Include="Objects\DerivedTestObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Events\Support\EventManipulationUtilsTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Events\Support\EventRegistryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\AbstractListableObjectFactoryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\AbstractObjectFactoryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\AbstractFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\ConfigurationReaderTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\ConstructorArgumentValuesTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\CustomConverterConfigurerTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\DelegateFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\DictionaryFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\EventValuesTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\FieldRetrievingFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\ListFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\LogFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\MethodInvokingFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\ObjectFactoryCreatingFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\ObjectReferenceFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\PropertyOverrideConfigurerTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\PropertyPathFactoryObjectTests.cs" />
+    <Compile Include="Objects\Factory\Config\PropertyPlaceholderConfigurerTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\PropertyRetrievingFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\ResourceManagerFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\RuntimeObjectReferenceTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\SetFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Config\TypedStringValueTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\DefaultListableObjectFactoryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\DummyFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\HasMap.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\ISideEffectObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\KnowsIfInstantiated.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\LifecycleObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\MethodReplacerTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\MustBeInitialized.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\NoSuchObjectDefinitionExceptionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\ObjectDefinitionStoreExceptionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\ObjectFactoryUtilsTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\SideEffectObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\AutowireUtilsTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\ChildObjectDefinitionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\DefaultObjectDefinitionFactoryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\DelegatingMethodReplacerTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\LookupMethodOverrideTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\LookupMethodReplacerTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\ObjectDefinitionReaderUtilsTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\ReplacedMethodOverrideTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\RootObjectDefinitionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Support\SimpleInstantiationStrategyTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\UnsupportedObjectDefinitionImplementation.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\ConstructorDependenciesObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\DependenciesObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\DerivedConstructorDependenciesObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\DoubleBooleanConstructorObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\DummyBo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\DummyDao.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\DummyReferencer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\EventWiringTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\FactoryMethods.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\IDummyBo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\InstanceFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\MixedCollectionObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\NullAppender.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\ReadOnlyXmlTestResource.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\SingleSimpleTypeConstructorObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\TestObjectCreator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\XmlListableObjectFactoryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\XmlObjectCollectionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\XmlObjectDefinitionReaderTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\XmlObjectFactoryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Factory\Xml\XmlParserResolverTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\IndexedTestObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\INestedTestObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\IOther.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\IPerson.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\ITestObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\MutablePropertyValuesTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\NestedTestObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\NotWritablePropertyExceptionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\NumberTestObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\PropertyAccessExceptionsExceptionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\PropertyValueTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\ResourceTestObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\SerializablePerson.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\StaticTestEventHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\ArgumentConvertingMethodInvokerTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\AutoWiringEventHandlerValueTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\InstanceEventHandlerValueTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\MutableSortDefinitionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\PropertyComparatorTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\Support\StaticEventHandlerValueTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\TestEventHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\TestObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\TestObjectDAO.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\TestObjectList.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\TypeMismatchExceptionTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Objects\ValidatorTestObject.cs">
+    </Compile>
+    <Compile Include="Pool\Support\SimplePoolTest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Proxy\AbstractProxyTypeBuilderTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Proxy\CompositionProxyTypeBuilderTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Proxy\DynamicProxyManagerTests.cs" />
+    <Compile Include="Proxy\ExplicitCompositionProxyTypeBuilderTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Proxy\InheritanceProxyTypeBuilderTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Reflection\Dynamic\BasePropertyTests.cs" />
+    <Compile Include="Reflection\Dynamic\DynamicConstructorTests.cs" />
+    <Compile Include="Reflection\Dynamic\DynamicFieldTests.cs" />
+    <Compile Include="Reflection\Dynamic\DynamicIndexerTests.cs" />
+    <Compile Include="Reflection\Dynamic\DynamicMethodTests.cs" />
+    <Compile Include="Reflection\Dynamic\DynamicPropertyTests.cs" />
+    <Compile Include="Reflection\Dynamic\SafeFieldTests.cs" />
+    <Compile Include="Reflection\Dynamic\SafePropertyTests.cs" />
+    <Compile Include="StandardsComplianceTest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="StopWatch.cs" />
+    <Compile Include="StreamHelperDecorator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="StringResource.cs" />
+    <Compile Include="Threading\AsyncTestMethod.cs" />
+    <Compile Include="Threading\AsyncTestTask.cs" />
+    <Compile Include="Threading\CallContextStorageTests.cs" />
+    <Compile Include="Threading\LatchTest.cs" />
+    <Compile Include="Threading\LogicalThreadContextTest.cs" />
+    <Compile Include="Threading\SemaphoreTest.cs" />
+    <Compile Include="Threading\SyncHolderTest.cs" />
+    <Compile Include="Threading\CommonThreadStorageTests.cs" />
+    <Compile Include="Threading\ThreadStaticStorageTests.cs" />
+    <Compile Include="Util\ArrayUtilsTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\AssertUtilsTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\CollectionUtilsTests.cs" />
+    <Compile Include="Util\ObjectUtilsTests.cs" />
+    <Compile Include="Util\PatternMatchUtilsTests.cs" />
+    <Compile Include="Util\DefensiveEventRaiserTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\DelegateInfoTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\EventRaiserTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\NumberUtilsTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\PathMatcherTest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\PropertiesTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\ReflectionUtilsMemberwiseCopyTests.cs" />
+    <Compile Include="Util\ReflectionUtilsTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\SerializationTestUtils.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Util\StringUtilsTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\TypeConversion\UniqueKeyConverterTests.cs" />
+    <Compile Include="Util\SystemUtilsTests.cs" />
+    <Compile Include="Util\UniqueKeyTests.cs" />
+    <Compile Include="Validation\Actions\ErrorMessageActionTests.cs" />
+    <Compile Include="Validation\Actions\ExpressionActionTests.cs" />
+    <Compile Include="Validation\AnyValidatorGroupTests.cs" />
+    <Compile Include="Validation\ExclusiveValidatorGroupTests.cs" />
+    <Compile Include="Validation\HelperClasses.cs" />
+    <Compile Include="Validation\ValidationExceptionTests.cs" />
+    <Compile Include="Validation\ValidationConfigParserTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validation\ValidationErrorsTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validation\ValidatorGroupTests.cs" />
+    <Compile Include="Validation\ValidatorReferenceTests.cs" />
+    <Compile Include="Validation\CollectionValidatorTests.cs" />
+    <Compile Include="Validation\Validators\ConditionValidatorTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validation\Validators\CreditCardValidatorTests.cs" />
+    <Compile Include="Validation\Validators\Integration\UrlValidatorIntegrationTests.cs" />
+    <Compile Include="Validation\Validators\Integration\EmailValidatorIntegrationTests.cs" />
+    <Compile Include="Validation\Validators\Integration\CreditCardValidatorIntegrationTests.cs" />
+    <Compile Include="Validation\Validators\Integration\ISBNValidatorIntegrationTests.cs" />
+    <Compile Include="Validation\Validators\ISBNValidatorTests.cs" />
+    <Compile Include="Validation\Validators\EmailValidatorTests.cs" />
+    <Compile Include="Validation\Validators\UrlValidatorTests.cs" />
+    <Compile Include="Validation\Validators\RegularExpressionValidatorTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validation\Validators\RequiredValidatorTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <EmbeddedResource Include="Context\Support\testobject.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Data\Spring\Objects\Factory\Config\two.properties" />
+    <EmbeddedResource Include="Data\Spring\Objects\Factory\Config\one.properties" />
+    <None Include="Context\Support\testobject.xsx">
+      <DependentUpon>testobject.xsd</DependentUpon>
+    </None>
+    <None Include="Spring.Core.Tests.build" />
+    <EmbeddedResource Include="Context\Support\contextB.xml" />
+    <EmbeddedResource Include="Context\Support\contextC.xml" />
+    <EmbeddedResource Include="Context\Support\import1.xml" />
+    <EmbeddedResource Include="Context\Support\contextA.xml" />
+    <EmbeddedResource Include="Context\Support\simpleContext.xml" />
+    <EmbeddedResource Include="Context\Support\invalidValueType.xml" />
+    <EmbeddedResource Include="Context\Support\invalidType.xml" />
+    <EmbeddedResource Include="Core\TypeResolution\aliasedObjects.xml" />
+    <EmbeddedResource Include="Core\IO\TestResource.txt" />
+    <Content Include="Data\PathMatcher\EmptyPattern.test" />
+    <Content Include="Data\PathMatcher\Examples.test" />
+    <Content Include="Data\PathMatcher\InBetween.test" />
+    <Content Include="Data\PathMatcher\MatchAll.test" />
+    <Content Include="Data\PathMatcher\PatternsAreCaseSensitive.test" />
+    <Content Include="Data\PathMatcher\SingleCaracters.test" />
+    <Content Include="Data\PathMatcher\SlurpPrependedDirectories.test" />
+    <Content Include="Data\PathMatcher\SpringAssembliesPrefix.test" />
+    <Content Include="Data\PathMatcher\ThisDirectory.test" />
+    <Content Include="Data\Spring\Context\Support\SPRNET-192.xml" />
+    <Content Include="Data\Spring\Objects\Factory\concurrent.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Config\AnotherDaoConfig.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Config\PPCWithTypesTests.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Config\TypeAliases.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Config\DaoConfig.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Config\DatabaseConfig.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Config\PPC-SPRNET-55.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Config\PPCTwoLocationsOneSectionTests.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Config\PPCTwoLocationsTwoSectionsTests.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Config\PropertyPlaceholderConfigurerTests.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Config\PropertyResourceConfigurerTests.xml" />
+    <Content Include="Data\Spring\Objects\Factory\leaf.xml" />
+    <Content Include="Data\Spring\Objects\Factory\middle.xml" />
+    <Content Include="Data\Spring\Objects\Factory\root.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\abstract.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\autowire.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\bad-external-resources.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\bad-named-constructor-arg.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\child.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\classnotfound.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\collections.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\constructor-arg.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\expressions.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\default-autowire.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\default-lazy-init.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\dependenciesmaterializethis.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\enums.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\event-wiring-prototypes.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\event-wiring.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\external-resources.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\factory-methods.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\factorycircle.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\field-props-factory.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\initializers.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\invalid-factory.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\invalid.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\invoke-factory.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\lazy-init-multithreaded.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\locale.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\no-objects.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\notfullyspecified.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\parent.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\reftypes.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\resource.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\Resources\resource-imports.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\satisfiedalldependencycheck.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\satisfiedobjectdependencycheck.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\satisfiedsimpledependencycheck.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\schema-validation.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\test.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\unsatisfiedalldependencycheckmissingobjects.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\unsatisfiedAllDependencyCheckMissingSimple.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\unsatisfiedobjectdependencycheck.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\unsatisfiedsimpledependencycheck.xml" />
+    <Content Include="Data\Spring\Objects\Factory\Xml\wellformed-but-bad.xml" />
+    <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithOneRequiredPropertyOmitted.xml" />
+    <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithThreeRequiredPropertiesOmitted.xml" />
+    <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithAllRequiredPropertiesProvided.xml" />
+    <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithCustomAttribute.xml" />
+    <Content Include="Spring.Core.Tests.dll.config" />
+    <EmbeddedResource Include="Context\contextlifecycle.xml" />
+    <EmbeddedResource Include="Context\Support\objects.xml" />
+    <EmbeddedResource Include="Objects\Factory\TestResource.txt" />
+    <EmbeddedResource Include="Objects\TestObject.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Tesla.sr-Cyrl-CS.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Spring.Context.Tests.sr-Cyrl-CS.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Images.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\SampleResources.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\SimpleAppContext.xml" />
+    <EmbeddedResource Include="Resources\Spring.Context.Tests.pt-BR.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Spring.Context.Tests.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Spring.Context.Tests.sr-SP-Cyrl.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Spring.Context.Tests.sr.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Tesla.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Tesla.sr-SP-Cyrl.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Tesla.sr.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="TestResource.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>echo "Copying .xml files for tests"
+xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Core.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2005\Spring.Core.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
new file mode 100644
index 00000000..60044192
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
@@ -0,0 +1,104 @@
+<?xml version="1.0" ?>
+<project name="Spring.Core.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+	<!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+	<target name="build">
+		<!--
+	        <copy file="../../../src/Spring/Spring.Core/Pool/Support/ISync.cs" todir="../../../CloverBuild/Pool/Support" verbose="true"/>
+		-->
+
+
+		<csc target="library" define="${current.build.defines.csc}"
+			warnaserror="true"
+			debug="${current.build.debug}"
+			output="${current.bin.dir}/${project::get-name()}.dll"
+			doc="${current.bin.dir}/${project::get-name()}.xml">
+			<nowarn>
+				<warning number="${nowarn.numbers.test},0219,0169" /> <!-- add 0414 for mono 2.0 -->
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+				<exclude name="Objects\Factory\Config\ConnectionStringsVariableSourceTests.cs"
+                 if="${framework::get-target-framework() != 'net-2.0'}"/>
+      </sources>
+			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
+				<include name="**/*.resx" />
+				<include name="**/*.xsd" />
+				<include name="**/*.txt" />
+				<include name="**/*.properties" />
+				<include name="**/SimpleAppContext.xml" />
+				<include name="**/Factory/Attributes/*.xml" />
+				<include name="**/Context/Support/*.xml" />
+				<include name="**/aliasedObjects.xml" />
+				<include name="**/contextlifecycle.xml" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+				<include name="System.EnterpriseServices.dll" />
+				<include name="System.Drawing.dll" />
+				<include name="System.Data.dll" />
+				<include name="System.Web.Services.dll" />
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+				<exclude name="CloverRuntime.dll" />
+			</references>
+		</csc>
+
+		<!-- for some reason, on my new machine the csc task doesn't create the resource assembly for the sr-SP-Cyrl culture so do it by hand (MLP)-->
+		<if test="${framework::get-target-framework() != 'net-2.0'}">
+		  <mkdir dir="${current.bin.dir}/sr-SP-Cyrl"/>
+		  <copy file="Resources/Spring.Context.Tests.sr-SP-Cyrl.resx" todir="${current.bin.dir}/sr-SP-Cyrl"/>
+		  <resgen input="${current.bin.dir}/sr-SP-Cyrl/Spring.Context.Tests.sr-SP-Cyrl.resx" output="${current.bin.dir}/sr-SP-Cyrl/Spring.Resources.Spring.Context.Tests.sr-SP-Cyrl.resources" />
+		  <copy file="Resources/Tesla.sr-SP-Cyrl.resx" todir="${current.bin.dir}/sr-SP-Cyrl"/>
+		  <resgen input="${current.bin.dir}/sr-SP-Cyrl/Tesla.sr-SP-Cyrl.resx" output="${current.bin.dir}/sr-SP-Cyrl/Spring.Resources.Tesla.sr-SP-Cyrl.resources" />
+		  <al output="${current.bin.dir}/sr-SP-Cyrl/Spring.Core.Tests.resources.dll"
+		      target="lib"
+		      culture="sr-SP-Cyrl">
+		    <sources>
+		      <include name="${current.bin.dir}/sr-SP-Cyrl/Spring.Resources.Spring.Context.Tests.sr-SP-Cyrl.resources"/>
+		      <include name="${current.bin.dir}/sr-SP-Cyrl/Spring.Resources.Tesla.sr-SP-Cyrl.resources" />
+		    </sources>
+		  </al>
+		</if>
+
+		<copy todir="${current.bin.dir}">
+			<fileset basedir="${project::get-base-directory()}/Data">
+				<include name="**/*.xml" />
+                          <include name="**/*.test" />
+			</fileset>
+		</copy>
+
+		<copy file="${project::get-base-directory()}/${project::get-name()}.dll-1.1.config"
+                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"
+                      if="${framework::get-target-framework() != 'net-2.0'}"/>
+
+                <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
+                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"
+                      if="${framework::get-target-framework() == 'net-2.0'}"/>
+
+        </target>
+	<target name="test" depends="build">
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
+			      appconfig="${current.bin.dir}/${project::get-name()}.dll.config" />
+		</nunit2outproc>
+	</target>
+<!--
+	<target name="test-mono-1.0" >
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll"
+			      appconfig="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll.config" />
+		</nunit2outproc>
+	</target>
+-->
+</project>
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll-1.1.config b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll-1.1.config
new file mode 100644
index 00000000..c7957adb
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll-1.1.config
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2002-2005 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.
+-->
+<configuration>
+
+  <configSections>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
+    <section name="objects" type="Spring.Objects.Factory.Xml.ObjectFactorySectionHandler, Spring.Core" />
+    
+    <section name="DaoConfiguration" type="System.Configuration.NameValueSectionHandler"/>
+    <section name="DatabaseConfiguration" type="System.Configuration.NameValueSectionHandler"/>
+
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />      
+    </sectionGroup>
+    
+    <sectionGroup name='spring'>
+      <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' />
+      <sectionGroup name="child">
+        <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
+      </sectionGroup>
+    </sectionGroup>
+
+    <!-- need a second section for another independent test as CongfigurationSettings.GetConfig will -->
+    <!-- not be called twice by .NET -->
+    <sectionGroup name='spring2'>
+      <section name="parsers" type="Spring.Context.Support.ConfigParsersSectionHandler, Spring.Core"/>
+      <section name='context' type='Spring.Context.Support.ContextHandler, Spring.Core'/>
+      <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
+      <sectionGroup name="child">
+        <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
+      </sectionGroup>
+      <sectionGroup name="grandchild">
+        <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
+      </sectionGroup>
+    </sectionGroup>
+  </configSections>
+
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Simple.NoOpLoggerFactoryAdapter, Common.Logging"/>
+    </logging>
+  </common>
+  
+  <spring>
+
+    <parsers>
+      <parser namespace="http://schemas.springframework.net/testobject" 
+              type="Spring.Context.Support.TestObjectConfigParser, Spring.Core.Tests"
+              schemaLocation="assembly://Spring.Core.Tests/Spring.Context.Support/testobject.xsd"/>
+    </parsers>
+
+    <!-- parent context -->
+    <context
+			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
+			name='Parent'>
+      <resource uri='config://spring/objects'/>
+      <!-- child context -->
+      <context name='Child'>
+        <resource uri='config://spring/child/objects'/>
+      </context>
+    </context>
+
+    <!-- parent context's objects -->
+    <objects xmlns='http://www.springframework.net' xmlns:to="http://schemas.springframework.net/testobject">
+      <object id='Parent' type='Spring.Objects.TestObject,Spring.Core.Tests'>
+        <property name='name' value='Parent'/>
+      </object>
+      <to:testobject>
+        <to:age>12</to:age>
+        <to:name>John</to:name>
+      </to:testobject>
+    </objects>
+
+
+    <!-- child context's objects -->
+    <child>
+      <objects xmlns='http://www.springframework.net'>
+        <object id='Child' type='Spring.Objects.TestObject,Spring.Core.Tests'>
+          <property name='name' value='Child'/>
+        </object>
+      </objects>
+    </child>
+  </spring>
+
+  <spring2>
+
+    <!-- parent context -->
+    <context
+			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
+			name='Parent'>
+      <resource uri='config://spring2/objects'/>
+      <!-- child context -->
+      <context name='Child'>
+        <resource uri='config://spring2/child/objects'/>
+        <!-- grandchild context -->
+        <context name='Grandchild'>
+          <resource uri='config://spring2/grandchild/objects'/>
+        </context>
+      </context>
+    </context>
+
+    <!-- parent context's objects -->
+    <objects xmlns='http://www.springframework.net'>
+      <object id='Parent' type='Spring.Objects.TestObject,Spring.Core.Tests'>
+        <property name='name' value='Parent'/>
+      </object>
+    </objects>
+
+    <!-- child context's objects -->
+    <child>
+      <objects xmlns='http://www.springframework.net'>
+        <object id='Child' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+          <property name='name' value='Child'/>
+        </object>
+      </objects>
+    </child>
+
+    <!-- grandchild context's objects -->
+    <grandchild>
+      <objects xmlns='http://www.springframework.net'>
+        <object id='Grandchild' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+          <property name='name' value='Grandchild'/>
+        </object>
+      </objects>
+    </grandchild>
+  </spring2>
+
+  <DaoConfiguration>
+    <add key="maxResults" value="1000"/>
+  </DaoConfiguration>
+
+  <DatabaseConfiguration>
+    <add key="connection.string" value="Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=;"/>
+  </DatabaseConfiguration>
+
+  <objects xmlns='http://www.springframework.net'>
+    <object name="foo" type="Spring.Objects.TestObject, Spring.Core.Tests" />
+    <object id="rod" type="Spring.Objects.TestObject, Spring.Core.Tests">
+      <property name="name">
+        <value>Rod</value>
+      </property>
+      <property name="age">
+        <value>31</value>
+      </property>
+    </object>
+    <object id="roderick" parent="rod">
+      <property name="name">
+        <value>Roderick</value>
+      </property>
+    </object>
+    <object id="kerry" type="Spring.Objects.TestObject, Spring.Core.Tests">
+      <property name="name">
+        <value>Kerry</value>
+      </property>
+      <property name="age">
+        <value>34</value>
+      </property>
+      <property name="spouse">
+        <ref local="rod" />
+      </property>
+    </object>
+    <object id="bootstrapObjectFactory" type="Spring.MockObjectFactory, Spring.Core.Tests"/>
+    <object id="bootstrapNonObjectFactory" type="Spring.Objects.TestObject, Spring.Core.Tests"/>
+  </objects>
+
+  <log4net>
+    <appender name="NullAppender" type="Spring.Objects.Factory.Xml.NullAppender, Spring.Core.Tests"/>
+    <root>
+      <level value="ALL" />
+      <appender-ref ref="NullAppender" />
+    </root>
+  </log4net>
+
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
+        <bindingRedirect oldVersion="2.0.6.0" newVersion="2.1.4.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
+</configuration>
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll.config b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll.config
new file mode 100644
index 00000000..b3173801
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll.config
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2002-2005 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.
+-->
+<configuration>
+
+  <configSections>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
+    <section name="objects" type="Spring.Objects.Factory.Xml.ObjectFactorySectionHandler, Spring.Core" />
+    
+    <section name="DaoConfiguration" type="System.Configuration.NameValueSectionHandler"/>
+    <section name="DatabaseConfiguration" type="System.Configuration.NameValueSectionHandler"/>
+
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />      
+    </sectionGroup>
+    
+    <sectionGroup name='spring'>
+      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
+      <section name='context' type='Spring.HookableContextHandler, Spring.Core.Tests'/>
+      <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
+      <sectionGroup name="child">
+        <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
+      </sectionGroup>
+    </sectionGroup>
+
+    <!-- need a second section for another independent test as CongfigurationSettings.GetConfig will -->
+    <!-- not be called twice by .NET -->
+    <sectionGroup name='spring2'>
+      <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' />
+      <sectionGroup name="child">
+        <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
+      </sectionGroup>
+      <sectionGroup name="grandchild">
+        <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
+      </sectionGroup>
+    </sectionGroup>
+  </configSections>
+
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Simple.NoOpLoggerFactoryAdapter, Common.Logging"/>
+    </logging>
+  </common>
+  
+  <spring>
+
+    <parsers>
+      <parser namespace="http://schemas.springframework.net/testobject" 
+              type="Spring.Context.Support.TestObjectConfigParser, Spring.Core.Tests"
+              schemaLocation="assembly://Spring.Core.Tests/Spring.Context.Support/testobject.xsd"/>
+    </parsers>
+
+    <!-- parent context -->
+    <context
+			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
+			name='Parent'>
+      <resource uri='config://spring/objects'/>
+      <!-- child context -->
+      <context name='Child'>
+        <resource uri='config://spring/child/objects'/>
+      </context>
+    </context>
+
+    <!-- parent context's objects -->
+    <objects xmlns='http://www.springframework.net' xmlns:to="http://schemas.springframework.net/testobject">
+      <object id='Parent' type='Spring.Objects.TestObject,Spring.Core.Tests'>
+        <property name='name' value='Parent'/>
+      </object>
+      <to:testobject>
+        <to:age>12</to:age>
+        <to:name>John</to:name>
+      </to:testobject>
+    </objects>
+
+
+    <!-- child context's objects -->
+    <child>
+      <objects xmlns='http://www.springframework.net'>
+        <object id='Child' type='Spring.Objects.TestObject,Spring.Core.Tests'>
+          <property name='name' value='Child'/>
+        </object>
+      </objects>
+    </child>
+  </spring>
+
+  <spring2>
+
+    <!-- parent context -->
+    <context
+			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
+			name='Parent'>
+      <resource uri='config://spring2/objects'/>
+      <!-- child context -->
+      <context name='Child'>
+        <resource uri='config://spring2/child/objects'/>
+        <!-- grandchild context -->
+        <context name='Grandchild'>
+          <resource uri='config://spring2/grandchild/objects'/>
+        </context>
+      </context>
+    </context>
+
+    <!-- parent context's objects -->
+    <objects xmlns='http://www.springframework.net'>
+      <object id='Parent' type='Spring.Objects.TestObject,Spring.Core.Tests'>
+        <property name='name' value='Parent'/>
+      </object>
+    </objects>
+
+    <!-- child context's objects -->
+    <child>
+      <objects xmlns='http://www.springframework.net'>
+        <object id='Child' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+          <property name='name' value='Child'/>
+        </object>
+      </objects>
+    </child>
+
+    <!-- grandchild context's objects -->
+    <grandchild>
+      <objects xmlns='http://www.springframework.net'>
+        <object id='Grandchild' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+          <property name='name' value='Grandchild'/>
+        </object>
+      </objects>
+    </grandchild>
+  </spring2>
+
+  <DaoConfiguration>
+    <add key="maxResults" value="1000"/>
+  </DaoConfiguration>
+
+  <DatabaseConfiguration>
+    <add key="connection.string" value="Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=;"/>
+  </DatabaseConfiguration>
+
+  <connectionStrings>
+    <add name="mySqlDataSource" connectionString="mySqlServerConnectionString"/>
+    <add name="myOracleDataSource" connectionString="myOracleConnectionString" providerName="System.Data.OracleClient"/>
+  </connectionStrings>
+  
+  <objects xmlns='http://www.springframework.net'>
+    <object name="foo" type="Spring.Objects.TestObject, Spring.Core.Tests" />
+    <object id="rod" type="Spring.Objects.TestObject, Spring.Core.Tests">
+      <property name="name">
+        <value>Rod</value>
+      </property>
+      <property name="age">
+        <value>31</value>
+      </property>
+    </object>
+    <object id="roderick" parent="rod">
+      <property name="name">
+        <value>Roderick</value>
+      </property>
+    </object>
+    <object id="kerry" type="Spring.Objects.TestObject, Spring.Core.Tests">
+      <property name="name">
+        <value>Kerry</value>
+      </property>
+      <property name="age">
+        <value>34</value>
+      </property>
+      <property name="spouse">
+        <ref local="rod" />
+      </property>
+    </object>
+    <object id="bootstrapObjectFactory" type="Spring.MockObjectFactory, Spring.Core.Tests"/>
+    <object id="bootstrapNonObjectFactory" type="Spring.Objects.TestObject, Spring.Core.Tests"/>
+  </objects>
+
+  <log4net>
+    <appender name="NullAppender" type="Spring.Objects.Factory.Xml.NullAppender, Spring.Core.Tests"/>
+    <root>
+      <level value="ALL" />
+      <appender-ref ref="NullAppender" />
+    </root>
+  </log4net>
+
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
+        <bindingRedirect oldVersion="2.0.6.0" newVersion="2.1.4.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
+</configuration>
diff --git a/test/Spring/Spring.Core.Tests/StandardsComplianceTest.cs b/test/Spring/Spring.Core.Tests/StandardsComplianceTest.cs
new file mode 100644
index 00000000..3f9e600a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/StandardsComplianceTest.cs
@@ -0,0 +1,93 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace Spring
+{
+	/// <summary>
+	/// Base class for tests that check standards compliance.
+	/// </summary>
+    public abstract class StandardsComplianceTest
+    {
+        #region Constructor (s) / Destructor
+        /// <summary>
+        /// Creates a new instance of the
+        /// <see cref="Spring.StandardsComplianceTest"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// This is an <see langword="abstract"/> class, and as such has no publicly visible
+        /// constructors.
+        /// </para>
+        /// </remarks>
+        protected StandardsComplianceTest () {}
+        #endregion
+
+        #region Properties
+        protected Type CheckedType {
+            get {
+                return checkedType;
+            }
+            set {
+                checkedType = value;
+            }
+        }
+        #endregion
+
+        #region Methods
+        private bool IsCheckedType (Type type) {
+            if (CheckedType.IsInterface) {
+                Type iface = type.GetInterface (CheckedType.Name, false);
+                return iface != null;
+            } else {
+                Type baseType = null;
+                while ((baseType = type.BaseType) != null) {
+                    if (baseType == CheckedType) {
+                        return true;
+                    }
+                    type = baseType;
+                }
+            }
+            return false;
+        }
+
+        protected void ProcessAssembly (Assembly a) {
+            foreach (Type t in a.GetTypes ()) {
+                if (IsCheckedType (t)) {
+                    CheckStandardsCompliance (a, t);
+                }
+            }
+        }
+
+        protected abstract void CheckStandardsCompliance (
+            Assembly assembly, Type t);
+        #endregion
+
+        #region Fields
+        private Type checkedType;
+        #endregion
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/StopWatch.cs b/test/Spring/Spring.Core.Tests/StopWatch.cs
new file mode 100644
index 00000000..667762e0
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/StopWatch.cs
@@ -0,0 +1,100 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring
+{
+    /// <summary>
+    /// A simple StopWatch implemetion for use in Performance Tests
+    /// </summary>
+    /// <example>
+    /// The following example shows the usage:
+    /// <code>
+    /// StopWatch watch = new StopWatch();
+    /// using (watch.Start("Duration: {0}"))
+    /// {
+    ///    // do some work...
+    /// }
+    /// </code>
+    /// The format string passed to the start method is used to print the result message. 
+    /// The example above will print <c>Duration: 0.123s</c>.
+    /// </example>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: StopWatch.cs,v 1.1 2008/05/16 10:02:42 oakinger Exp $</version>
+    public class StopWatch
+    {
+        private DateTime _startTime;
+        private TimeSpan _elapsed;
+
+        private class Stopper : IDisposable
+        {
+            private readonly StopWatch _owner;
+            private readonly string _format;
+
+            public Stopper(StopWatch owner, string format)
+            {
+                _owner = owner;
+                _format = format;
+            }
+
+            public void Dispose()
+            {
+                _owner.Stop(_format);
+                GC.SuppressFinalize(this);
+            }
+        }
+
+        /// <summary>
+        /// Starts the timer and returns and "handle" that must be disposed to stop the timer.
+        /// </summary>
+        /// <param name="outputFormat">the output format string, that is used to render the result message</param>
+        /// <returns>the handle to dispose for stopping the timer</returns>
+        public IDisposable Start(string outputFormat)
+        {
+            Stopper stopper = new Stopper(this, outputFormat);
+            _startTime = DateTime.Now;
+            return stopper;
+        }
+
+        private void Stop(string outputFormat)
+        {
+            _elapsed = DateTime.Now.Subtract(_startTime);
+            if (outputFormat != null)
+            {
+                Console.WriteLine(outputFormat, _elapsed);
+            }
+        }
+
+        public DateTime StartTime
+        {
+            get { return _startTime; }
+        }
+
+        public TimeSpan Elapsed
+        {
+            get { return _elapsed; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/StreamHelperDecorator.cs b/test/Spring/Spring.Core.Tests/StreamHelperDecorator.cs
new file mode 100644
index 00000000..bb9a6fa2
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/StreamHelperDecorator.cs
@@ -0,0 +1,64 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.IO;
+
+namespace Spring
+{
+    public delegate void StreamHelperCallback(out Stream stream);
+
+    /// <summary>
+    /// Helper class for template style Stream usage.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: StreamHelperDecorator.cs,v 1.2 2006/04/09 07:24:48 markpollack Exp $</version>
+    public class StreamHelperDecorator
+    {
+        private StreamHelperCallback callback;
+
+        public StreamHelperDecorator(StreamHelperCallback callback)
+        {
+            this.callback = callback;
+        }
+
+        public void Run()
+        {
+            Stream stream = null;
+            try
+            {
+                this.callback(out stream);
+            }
+            finally
+            {
+                if (stream != null)
+                {
+                    try
+                    {
+                        stream.Close();
+                    }
+                    catch
+                    {
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/StringResource.cs b/test/Spring/Spring.Core.Tests/StringResource.cs
new file mode 100644
index 00000000..2bac8839
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/StringResource.cs
@@ -0,0 +1,116 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Text;
+using Spring.Core.IO;
+using Spring.Util;
+
+#endregion
+
+namespace Spring
+{
+    /// <summary>
+    /// A <see cref="IResource"/> adapter implementation encapsulating a simply string.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: StringResource.cs,v 1.1 2008/03/20 10:35:54 oakinger Exp $</version>
+    public class StringResource : AbstractResource
+    {
+        #region Fields
+
+        private readonly string _description;
+        private readonly string _content;
+        private readonly Encoding _encoding;
+
+        #endregion
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="StringResource"/> class.
+        /// </summary>
+        public StringResource(string content)
+            : this(content, Encoding.Default, null)
+        {            
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="StringResource"/> class.
+        /// </summary>
+        public StringResource(string content, Encoding encoding)
+            : this(content, encoding, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="StringResource"/> class.
+        /// </summary>
+        public StringResource(string content, Encoding encoding, string description)
+        {
+            AssertUtils.ArgumentNotNull(encoding, "encoding");
+
+            _content = content==null ? string.Empty : content;
+            _encoding = encoding;
+            _description = description == null ? string.Empty : description;
+        }
+
+        /// <summary>
+        /// Get the <see cref="System.IO.Stream"/> to 
+        /// for accessing this resource.
+        /// </summary>
+        public override Stream InputStream
+        {
+            get
+            {
+                return new MemoryStream(_encoding.GetBytes(_content), false);
+            }
+        }
+
+        /// <summary>
+        /// Returns a description for this resource.
+        /// </summary>
+        /// <value>
+        /// A description for this resource.
+        /// </value>
+        /// <seealso cref="Spring.Core.IO.IResource.Description"/>
+        public override string Description
+        {
+            get { return _description; }
+        }
+
+        /// <summary>
+        /// This implementation always returns true
+        /// </summary>
+        public override bool IsOpen
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// This implemementation always returns true
+        /// </summary>
+        public override bool Exists
+        {
+            get { return true; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/TestResource.txt b/test/Spring/Spring.Core.Tests/TestResource.txt
new file mode 100644
index 00000000..0b7ad580
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/TestResource.txt
@@ -0,0 +1 @@
+Spring.TestResource.txt
diff --git a/test/Spring/Spring.Core.Tests/Threading/AsyncTestMethod.cs b/test/Spring/Spring.Core.Tests/Threading/AsyncTestMethod.cs
new file mode 100644
index 00000000..49b2d1dc
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Threading/AsyncTestMethod.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Threading;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Threading
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: AsyncTestMethod.cs,v 1.2 2008/02/02 10:24:38 oakinger Exp $</version>
+    public class AsyncTestMethod : AsyncTestTask
+    {
+        public delegate object TestMethod(object[] args);
+
+        private readonly TestMethod callback;
+        private readonly object[] args;
+        private object result;
+
+        private class ThreadStartTestMethodAdapter
+        {
+            private readonly ThreadStart threadStart;
+
+            public ThreadStartTestMethodAdapter(ThreadStart threadStart)
+            {
+                Assert.IsNotNull(threadStart);
+                this.threadStart = threadStart;
+            }
+
+            public object Execute(object[] args)
+            {
+                threadStart();
+                return null;
+            }
+        }
+
+        public AsyncTestMethod(int iterations, ThreadStart callback, params object[] args)
+            : this(iterations, new TestMethod(new ThreadStartTestMethodAdapter(callback).Execute), args)
+        {
+        }
+
+
+        public AsyncTestMethod(int iterations, TestMethod callback, params object[] args) : base(iterations)
+        {
+            Assert.IsNotNull(callback);
+            this.args = args;
+            this.callback = callback;
+        }
+
+        public override void DoExecute()
+        {
+            result = callback(args);
+        }
+
+        public object Result
+        {
+            get { return result; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Threading/AsyncTestTask.cs b/test/Spring/Spring.Core.Tests/Threading/AsyncTestTask.cs
new file mode 100644
index 00000000..bfe616f9
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Threading/AsyncTestTask.cs
@@ -0,0 +1,85 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Threading;
+
+#endregion
+
+namespace Spring.Threading
+{
+    /// <summary>
+    /// Base class for async test operations
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: AsyncTestTask.cs,v 1.2 2008/02/02 10:24:38 oakinger Exp $</version>
+    public abstract class AsyncTestTask
+    {
+        private Exception exception;
+        private Thread t;
+        private readonly int iterations;
+        private int iterationno;
+
+        public AsyncTestTask(int iterations)
+        {
+            this.iterations = iterations;
+            t = new Thread(new ThreadStart(Run));
+            t.IsBackground = true;
+        }
+
+        public abstract void DoExecute();
+
+        public AsyncTestTask Start()
+        {
+            t.Start();
+            return this;
+        }
+
+        public void Run()
+        {
+            int loop = 0;
+            try
+            {
+                iterationno = 0;
+                for(loop = 0; loop < iterations; loop++)
+                {
+                    DoExecute();
+                    Thread.Sleep(0);
+                }
+            }
+            catch(Exception ex)
+            {
+                iterationno = loop;
+                exception = ex;
+            }
+        }
+
+        public void AssertNoException()
+        {
+            t.Join();
+            if(exception != null)
+            {
+                throw new Exception("Exception occured in testtask on iteration " + iterationno, exception);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Threading/CallContextStorageTests.cs b/test/Spring/Spring.Core.Tests/Threading/CallContextStorageTests.cs
new file mode 100644
index 00000000..6d191aaa
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Threading/CallContextStorageTests.cs
@@ -0,0 +1,42 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Threading
+{
+    /// <summary>
+    /// Apply common thread-storage tests for <see cref="CallContextStorage"/>
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: CallContextStorageTests.cs,v 1.1 2007/02/02 21:31:08 oakinger Exp $</version>  
+    [TestFixture]
+    public class CallContextStorageTests : CommonThreadStorageTests
+    {
+        protected override IThreadStorage CreateStorage()
+        {
+            return new CallContextStorage();
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Threading/CommonThreadStorageTests.cs b/test/Spring/Spring.Core.Tests/Threading/CommonThreadStorageTests.cs
new file mode 100644
index 00000000..4ec9de82
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Threading/CommonThreadStorageTests.cs
@@ -0,0 +1,168 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Threading;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Threading
+{
+    /// <summary>
+    /// Any <see cref="IThreadStorage"/> implementation must pass these tests.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: CommonThreadStorageTests.cs,v 1.2 2007/05/14 21:31:32 oakinger Exp $</version>
+    public abstract class CommonThreadStorageTests
+    {
+        protected abstract IThreadStorage CreateStorage();
+
+        protected virtual void ThreadSetup()
+        {}
+
+        protected virtual void ThreadCleanup()
+        {}
+
+        [TestFixtureSetUp]
+        public void FixtureSetUp()
+        {
+            ThreadSetup();
+        }
+
+        [TestFixtureTearDown]
+        public void FixtureTearDown()
+        {
+            ThreadCleanup();
+        }
+
+				[TearDown]
+				public void TearDown()
+				{
+					// cleanup storage
+          IThreadStorage storage = CreateStorage();
+					storage.FreeNamedDataSlot("key");
+					storage.FreeNamedDataSlot("KEY");
+					storage.FreeNamedDataSlot("KeY");
+				}
+
+        [Test]
+        public void IsCaseSensitive()
+        {
+            IThreadStorage storage = CreateStorage();
+
+            object value1 = new object();
+            object value2 = new object();
+            object value3 = new object();
+
+            storage.SetData("key", value1);
+            storage.SetData("KEY", value2);
+            storage.SetData("KeY", value3);
+
+            Assert.AreSame(value1, storage.GetData("key"));
+            Assert.AreSame(value2, storage.GetData("KEY"));
+            Assert.AreSame(value3, storage.GetData("KeY"));
+        }
+
+        [Test]
+        public void AllowReplaceData()
+        {
+            IThreadStorage storage = CreateStorage();
+
+            object value1 = new object();
+            object value2 = new object();
+
+            storage.SetData("key", value1);
+            Assert.AreSame(value1, storage.GetData("key"));
+            storage.SetData("key", value2);
+            Assert.AreSame(value2, storage.GetData("key"));
+            storage.SetData("key", null);
+            Assert.AreSame(null, storage.GetData("key"));
+        }
+
+        [Test]
+        public void UnknownKeyReturnsNull()
+        {
+            IThreadStorage storage = CreateStorage();
+
+            Assert.AreSame(null, storage.GetData("key"));
+        }
+
+        [Test]
+        public void FreeNamedDataSlotRemovesData()
+        {
+            IThreadStorage storage = CreateStorage();
+
+            object value1 = new object();
+            storage.SetData("key", value1);
+            Assert.AreSame(value1, storage.GetData("key"));
+            storage.FreeNamedDataSlot("key");
+            Assert.AreSame(null, storage.GetData("key"));
+        }
+
+        [Test]
+        public void UsesDistinguishedStorageOnDifferentThreads()
+        {
+            IThreadStorage storage = CreateStorage();
+
+            object value1 = new object();
+            storage.SetData("key", value1);
+
+            ThreadTestHelper helper = new ThreadTestHelper(this,storage);
+            helper.Execute();
+
+            Assert.AreNotSame( value1, helper.value );
+            Assert.IsNull(helper.value);
+        }
+
+        #region Test Utility Classes
+
+        private class ThreadTestHelper
+        {
+            private CommonThreadStorageTests outer;
+            private IThreadStorage storage;
+
+            public object value;
+
+            public ThreadTestHelper(CommonThreadStorageTests outer, IThreadStorage storage)
+            {
+                this.outer = outer;
+                this.storage = storage;
+            }
+
+            public void Execute()
+            {
+                Thread t = new Thread(new ThreadStart(this.Run));
+                t.Start();
+                t.Join();
+            }
+
+            private void Run()
+            {
+                outer.ThreadSetup();
+                value = this.storage.GetData("key");
+            }
+        }
+
+        #endregion Test Utility Classes
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Threading/LatchTest.cs b/test/Spring/Spring.Core.Tests/Threading/LatchTest.cs
new file mode 100644
index 00000000..0623a318
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Threading/LatchTest.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Threading;
+using Spring.Threading;
+using NUnit.Framework;
+
+#region Licence
+
+/*
+ * Copyright 2002-2004 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
+
+namespace Spring.Threading
+{
+    [TestFixture]
+    public class LatchTest 
+    {
+
+        class Worker
+        {
+            public bool worked;
+            ISync startPermit;
+            ISync workedSync;
+
+            public Worker (ISync startPermit, ISync workedSync)
+            {
+                this.startPermit = startPermit;
+                this.workedSync = workedSync;
+            }
+
+            public void Work() 
+            {
+                // very slow worker initialization ...
+                // ... attach to messaging system
+                // ... connect to database
+                startPermit.Acquire();
+                // ... use resources initialized in Mush
+                // ... do real work
+                worked = true;
+                // ... we are finished
+                workedSync.Release();
+            }
+        }
+
+        [Test]
+        public void BossWorkerDemo() 
+        {
+            int n = 10;
+
+            Latch startPermit = new Latch();
+            Semaphore wait = new Semaphore(-(n - 1));
+            
+            Worker [] workers = new Worker[n];
+            for (int i=0; i<n; ++i) 
+            {
+                workers[i] = new Worker(startPermit, wait);
+                new Thread(new ThreadStart(workers[i].Work)).Start();
+            }
+            // very slow main initialization ...
+            // ... parse configuration
+            // ... initialize other resources used by workers
+            startPermit.Release();
+
+            // now it is our turn to wait for workers
+            wait.Acquire();
+
+            for (int i=0; i<n; ++i) 
+                Assert.IsTrue(workers[i].worked);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Threading/LogicalThreadContextTest.cs b/test/Spring/Spring.Core.Tests/Threading/LogicalThreadContextTest.cs
new file mode 100644
index 00000000..c5d4f38d
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Threading/LogicalThreadContextTest.cs
@@ -0,0 +1,93 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Threading
+{
+    /// <summary>
+    /// Test behaviour of LogicalThreadContext
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: LogicalThreadContextTest.cs,v 1.1 2007/02/02 21:31:08 oakinger Exp $</version>  
+    [TestFixture]
+    public class LogicalThreadContextTest
+    {
+        private class MockStorage : IThreadStorage
+        {
+            internal Hashtable data = new Hashtable();
+
+            public object GetData(string name)
+            {
+                return data[name];
+            }
+
+            public void SetData(string name, object value)
+            {
+                data[name] = value;
+            }
+
+            public void FreeNamedDataSlot(string name)
+            {
+                data.Remove(name);
+            }
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void StorageMustNotBeNull()
+        {
+            LogicalThreadContext.SetStorage(null);
+        }
+
+        [Test]
+        public void StorageMayBeSetMoreThanOnce()
+        {
+            LogicalThreadContext.SetStorage(new MockStorage());
+            LogicalThreadContext.SetStorage(new MockStorage());
+            LogicalThreadContext.SetStorage(new MockStorage());
+        }
+
+        [Test]
+        public void StorageIsUsedByFacadeMethods()
+        {
+            MockStorage storage = new MockStorage();
+            LogicalThreadContext.SetStorage(storage);
+
+            object value = new object();
+
+            LogicalThreadContext.SetData("key", value);
+            Assert.AreSame( value, storage.data["key"] );
+
+            object data = LogicalThreadContext.GetData("key");
+            Assert.AreSame(value, data);
+
+            LogicalThreadContext.FreeNamedDataSlot("key");
+
+            Assert.IsFalse( storage.data.ContainsKey("key") );
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Threading/SemaphoreTest.cs b/test/Spring/Spring.Core.Tests/Threading/SemaphoreTest.cs
new file mode 100644
index 00000000..cc2902a1
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Threading/SemaphoreTest.cs
@@ -0,0 +1,219 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Threading;
+using Spring.Pool;
+using Spring.Threading;
+using NUnit.Framework;
+
+
+namespace Spring.Threading
+{
+    [TestFixture]
+    public class SemaphoreTest
+    {
+        private static long SHORT_DELAY_MS = 300;
+        [Test]
+        public void UsingLikeAMutex ()
+        {
+            
+            Semaphore semaphore = new Semaphore (1);
+            Latch latch = new Latch ();
+            Helper helper = new Helper (semaphore, latch);
+            Thread thread = new Thread (new ThreadStart (helper.Go));
+            semaphore.Acquire ();
+            thread.Start ();
+            latch.Acquire ();
+            Assert.IsFalse (helper.gone);
+            semaphore.Release ();
+            thread.Join ();
+            Assert.IsTrue (helper.gone, "not gone");
+            
+        }
+        [Test]
+        public void AquireInSameThrad()
+        {
+            Semaphore s = new Semaphore(2);
+            Assert.AreEqual(2, s.Permits);
+            s.Acquire();
+            s.Acquire();
+            Assert.AreEqual(0, s.Permits);
+            
+        }
+        
+        [Test]
+        public void ReleaseMultipleTimesInSameThread()
+        {
+            Semaphore s = new Semaphore(2);
+            Assert.AreEqual(2, s.Permits);
+            s.Acquire();
+            s.Acquire();
+            s.Release(2);
+            Assert.AreEqual(2, s.Permits);            
+        }
+        
+        [Test]
+        public void AttemptWithNegativeMillisInSameThread()
+        {
+            Semaphore s = new Semaphore(2);
+            Assert.AreEqual(2, s.Permits);
+            s.Acquire();
+            Assert.IsTrue(s.Attempt(-400));
+            s.Release(2);
+            Assert.AreEqual(2, s.Permits);            
+        }
+        
+        [Test]
+        [ExpectedException(typeof(ArgumentOutOfRangeException))]
+        public void ReleaseMultipleBadArgument()
+        {
+            Semaphore s = new Semaphore(2);
+            Assert.AreEqual(2, s.Permits);
+            s.Acquire();
+            s.Acquire();
+            s.Release(-2);
+            Assert.AreEqual(2, s.Permits); 
+        }
+        
+        [Test]
+        public void AttemptInSameThread()
+        {
+            Semaphore s = new Semaphore(1);
+            Assert.IsTrue(s.Attempt(SHORT_DELAY_MS));
+            s.Release();
+            Assert.IsTrue(s.Attempt(SHORT_DELAY_MS));
+            s.Release();
+            Assert.IsTrue(s.Attempt(SHORT_DELAY_MS));
+            s.Release();
+            Assert.IsTrue(s.Attempt(SHORT_DELAY_MS));
+            s.Release();
+            Assert.IsTrue(s.Attempt(SHORT_DELAY_MS));
+            s.Release();
+            Assert.AreEqual(1, s.Permits);
+
+        }
+        
+        //TODO tests that interrupt a thread.
+        
+        [Test]
+        public void AquireReleaseInSameThread()
+        {
+            Semaphore s = new Semaphore(1);            
+            s.Acquire();
+            s.Release();
+            s.Acquire();
+            s.Release();
+            s.Acquire();
+            s.Release();
+            s.Acquire();
+            s.Release();
+            s.Acquire();
+            s.Release();
+            s.Acquire();
+            s.Release();
+            Assert.AreEqual(1, s.Permits);
+        }
+        
+        [Test]
+        public void AcquireReleaseInDifferentThreads()
+        {
+            Semaphore s = new Semaphore(0); 
+            AcquireReleaseWorker worker1 = new AcquireReleaseWorker(s);
+            Thread thread1 = new Thread(new ThreadStart(worker1.DoWork));
+            
+            thread1.Start();
+            Thread.Sleep(300);
+            s.Release();
+            s.Release();
+            s.Acquire();
+            s.Acquire();
+            s.Release();
+            thread1.Join();
+            
+        }
+        
+        [Test]
+        public void AttemptReleaseInDifferentThreads()
+        {
+            Semaphore s = new Semaphore(0); 
+            AttemptReleaseWorker worker1 = new AttemptReleaseWorker(s);
+            Thread thread1 = new Thread(new ThreadStart(worker1.DoWork));
+            
+            thread1.Start();
+            //TODO investigate...
+            //Assert.IsTrue(s.Attempt(SHORT_DELAY_MS));
+            s.Attempt(SHORT_DELAY_MS);
+            s.Release();
+            //Assert.IsTrue(s.Attempt(SHORT_DELAY_MS));
+            s.Attempt(SHORT_DELAY_MS);
+            s.Release();
+            s.Release();
+            thread1.Join();
+        }
+        
+        [Test]
+        public void TimetoMillis()
+        {
+            long millis = Utils.CurrentTimeMillis;
+            //hmm should be using UtcNow, the impl in CurrentTimeMillis doesn't use UTC.
+            long epochTime = ((DateTime.Now-new DateTime (1970, 1, 1)).Ticks)/TimeSpan.TicksPerMillisecond;
+            long delta = epochTime-millis;            
+            Assert.IsTrue(delta < 500);
+        }
+    }
+    
+    public class AcquireReleaseWorker
+    {
+        private Semaphore sem;
+        public AcquireReleaseWorker(Semaphore s)
+        {
+            sem = s;
+        }
+        
+        public void DoWork()
+        {
+            sem.Acquire();
+            sem.Release();
+            sem.Release();
+            sem.Acquire();
+        }
+    }
+    
+    public class AttemptReleaseWorker
+    {
+        private Semaphore sem;
+        public AttemptReleaseWorker(Semaphore s)
+        {
+            sem = s;
+        }
+        
+        public void DoWork()
+        {
+            long SHORT_DELAY_MS = 300;
+            sem.Release();
+            
+            //TODO can we do Assert.IsTrue here?
+            sem.Attempt(SHORT_DELAY_MS);
+            sem.Release();
+            sem.Attempt(SHORT_DELAY_MS);
+        }
+    }
+    
+}
diff --git a/test/Spring/Spring.Core.Tests/Threading/SyncHolderTest.cs b/test/Spring/Spring.Core.Tests/Threading/SyncHolderTest.cs
new file mode 100644
index 00000000..ba292412
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Threading/SyncHolderTest.cs
@@ -0,0 +1,68 @@
+using System.Threading;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+
+namespace Spring.Threading
+{
+    [TestFixture]
+	public class SyncHolderTest
+	{
+        DynamicMock mock;
+        ISync sync;
+
+        [SetUp]
+        public void SetUp ()
+        {
+            mock = new DynamicMock(typeof(ISync));
+            sync = (ISync) mock.Object;            
+        }
+
+        [TearDown]
+        public void TearDown ()
+        {
+            mock.Verify();            
+        }
+
+        class MySemaphore : Semaphore
+        {
+            public MySemaphore (long initialPermits) : base (initialPermits)
+            {}
+        }
+
+        [Test]
+        public void CanBeUsedWithTheUsingCSharpIdiomToAttemptOnAnISync ()
+        {
+            MySemaphore sync = new MySemaphore(1);
+            using (new SyncHolder(sync, 100))
+            {
+                Assert.AreEqual(0, sync.Permits);
+            }
+            Assert.AreEqual(1, sync.Permits);
+
+            sync = new MySemaphore(0);
+            try
+            {
+                using (new SyncHolder(sync, 100))
+                {
+                    Assert.IsTrue(false, "wrongly entered sync block");
+                }
+            }
+            catch (TimeoutException)
+            {
+                Assert.AreEqual(0, sync.Permits);
+            }
+        }
+
+        [Test]
+        [ExpectedException(typeof(ThreadStateException))]
+		public void CanBeUsedWithTheUsingCSharpIdiomToAcquireAnIsync()
+		{
+            mock.Expect("Acquire");
+            mock.Expect("Release");
+            using (new SyncHolder(sync))
+            {
+                throw new ThreadStateException();
+            }
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Threading/ThreadStaticStorageTests.cs b/test/Spring/Spring.Core.Tests/Threading/ThreadStaticStorageTests.cs
new file mode 100644
index 00000000..7356ba00
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Threading/ThreadStaticStorageTests.cs
@@ -0,0 +1,42 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Threading
+{
+    /// <summary>
+    /// Apply common thread-storage tests for <see cref="ThreadStaticStorage"/>
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ThreadStaticStorageTests.cs,v 1.1 2007/02/02 21:31:08 oakinger Exp $</version>  
+    [TestFixture]
+    public class ThreadStaticStorageTests : CommonThreadStorageTests
+    {
+        protected override IThreadStorage CreateStorage()
+        {
+            return new ThreadStaticStorage();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Util/ArrayUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/ArrayUtilsTests.cs
new file mode 100644
index 00000000..44e5dc88
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/ArrayUtilsTests.cs
@@ -0,0 +1,69 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Unit tests for the ArrayUtils class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ArrayUtilsTests.cs,v 1.5 2007/02/02 12:33:30 oakinger Exp $</version>
+	[TestFixture]
+    public sealed class ArrayUtilsTests
+    {
+        [Test]
+        public void AreEqual () 
+        {
+            object [] one = new string [] {"Foo", "Bar", "Baz"};
+            object [] two = new string [] {"Foo", "Bar", "Baz"};
+            Assert.IsTrue (ArrayUtils.AreEqual (one, two));
+            object [] three = new string [] {"Foo", "Ben", "Baz"};
+            Assert.IsFalse (ArrayUtils.AreEqual (one, three));
+        }
+
+        [Test]
+        public void AreEqualWithBadArguments () 
+        {
+            Assert.IsTrue (ArrayUtils.AreEqual (null, null));
+            object [] one = new string [] {"Foo", "Bar", "Baz"};
+            object [] two = null;
+            Assert.IsFalse (ArrayUtils.AreEqual (one, two));
+            object [] three = new string [] {"Foo", "Bar"};
+            Assert.IsFalse (ArrayUtils.AreEqual (one, three));
+        }
+
+        [Test]
+        public void HasLengthTests()
+        {
+            Assert.IsFalse(ArrayUtils.HasLength(null));
+            Assert.IsFalse(ArrayUtils.HasLength(new byte[0]));
+            Assert.IsTrue(ArrayUtils.HasLength(new byte[1]));
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Util/AssertUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/AssertUtilsTests.cs
new file mode 100644
index 00000000..3008a480
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/AssertUtilsTests.cs
@@ -0,0 +1,126 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Unit tests for the AssertUtils class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: AssertUtilsTests.cs,v 1.8 2007/05/30 22:39:28 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class AssertUtilsTests
+	{
+        [Test]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void StateTrue()
+        {
+            AssertUtils.State(false,"foo");
+        }
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void ArgumentNotNull () 
+		{
+			AssertUtils.ArgumentNotNull(null, "foo");
+		}
+
+		[Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+		public void ArgumentNotNullWithMessage ()
+		{
+			AssertUtils.ArgumentNotNull(null, "foo", "Bang!");
+		}
+
+		[Test]
+		public void ArgumentHasTextWithValidText()
+		{
+			AssertUtils.ArgumentHasText("... and no-one's getting fat 'cept Mama Cas!", "foo");
+		}
+
+		[Test]
+		public void ArgumentHasTextWithValidTextAndMessage()
+		{
+			AssertUtils.ArgumentHasText("... and no-one's getting fat 'cept Mama Cas!", "foo", "Bang!");
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void ArgumentHasText () 
+		{
+			AssertUtils.ArgumentHasText(null, "foo");
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void ArgumentHasTextWithMessage () 
+		{
+			AssertUtils.ArgumentHasText(null, "foo", "Bang!");
+		}
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void ArgumentHasLengthArgumentIsNull()
+        {
+            AssertUtils.ArgumentHasLength(null, "foo");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void ArgumentHasLengthArgumentIsNullWithMessage()
+        {
+            AssertUtils.ArgumentHasLength(null, "foo", "Bang!");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void ArgumentHasLengthArgumentIsEmpty()
+        {
+            AssertUtils.ArgumentHasLength(new byte[0], "foo");
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void ArgumentHasLengthArgumentIsEmptyWithMessage()
+        {
+            AssertUtils.ArgumentHasLength(new byte[0], "foo", "Bang!");
+        }
+
+        [Test]
+        public void ArgumentHasLengthArgumentHasElements()
+        {
+            AssertUtils.ArgumentHasLength(new byte[1], "foo");
+        }
+
+        [Test]
+        public void ArgumentHasLengthArgumentHasElementsWithMessage()
+        {
+            AssertUtils.ArgumentHasLength(new byte[1], "foo", "Bang!");
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Util/CollectionUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/CollectionUtilsTests.cs
new file mode 100644
index 00000000..ca211426
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/CollectionUtilsTests.cs
@@ -0,0 +1,305 @@
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+namespace Spring.Util
+{
+	[TestFixture]
+	public class CollectionUtilsTests
+	{
+		internal class NoContainsNoAddCollection : ICollection
+		{
+			internal class Iterator : IEnumerator
+			{
+				#region IEnumerator Members
+
+				public void Reset()
+				{
+					// TODO:  Add Iterator.Reset implementation
+				}
+
+				public object Current
+				{
+					get
+					{
+						// TODO:  Add Iterator.Current getter implementation
+						return null;
+					}
+				}
+
+				public bool MoveNext()
+				{
+					// TODO:  Add Iterator.MoveNext implementation
+					return false;
+				}
+
+				#endregion
+
+			}
+
+			public void CopyTo(Array array, int index)
+			{
+				throw new NotImplementedException();
+			}
+
+			public int Count
+			{
+				get { return 0; }
+			}
+
+			public object SyncRoot
+			{
+				get { throw new NotImplementedException(); }
+			}
+
+			public bool IsSynchronized
+			{
+				get { throw new NotImplementedException(); }
+			}
+
+			public IEnumerator GetEnumerator()
+			{
+				return new Iterator();
+			}
+		}
+		[Test]
+			[ExpectedException(typeof(ArgumentNullException))]
+			public void ContainsNullCollection()
+		{
+			CollectionUtils.Contains(null, null);	
+		}
+		[Test]
+			public void ContainsNullObject()
+		{
+			ArrayList list = new ArrayList();
+			list.Add(null);
+			Assert.IsTrue(CollectionUtils.Contains(list, null));
+		}
+		[Test]
+			[ExpectedException(typeof(InvalidOperationException))]
+			public void ContainsCollectionDoesNotImplementContains()
+		{
+			NoContainsNoAddCollection noAddCollection = new NoContainsNoAddCollection();
+			CollectionUtils.Contains(noAddCollection, new object());
+		}
+		[Test]
+			public void ContainsValidElement()
+		{
+			ArrayList list = new ArrayList();
+			list.Add(1);
+			list.Add(2);
+			list.Add(3);
+			list.Add(4);
+			
+			Assert.IsTrue(CollectionUtils.Contains(list, 3));
+		}
+		[Test]
+			public void ContainsDoesNotContainElement()
+		{
+			ArrayList list = new ArrayList();
+			list.Add(1);
+			list.Add(2);
+			list.Add(3);
+			list.Add(4);
+
+			Assert.IsFalse(CollectionUtils.Contains(list, 5));
+		}
+		[Test]
+			[ExpectedException(typeof(ArgumentNullException))]
+			public void AddNullCollection()
+		{
+			CollectionUtils.Add(null, null);
+		}
+		[Test]
+			public void AddNullObject()
+		{
+			ArrayList list = new ArrayList();
+			CollectionUtils.Add(list, null);
+			Assert.IsTrue(list.Count == 1);
+		}
+		[Test]
+			[ExpectedException(typeof(InvalidOperationException))]
+			public void AddCollectionDoesNotImplementAdd()
+		{
+			NoContainsNoAddCollection noAddCollection = new NoContainsNoAddCollection();
+			CollectionUtils.Add(noAddCollection, null);
+		}
+		[Test]
+			public void AddValidElement()
+		{
+			ArrayList list = new ArrayList();
+			object obj1 = new object();
+			CollectionUtils.Add(list, obj1);
+			Assert.IsTrue(list.Count == 1);
+		}
+		[Test]
+			[ExpectedException(typeof(ArgumentNullException))]
+			public void ContainsAllNullTargetCollection()
+		{
+			CollectionUtils.ContainsAll(null, new ArrayList());	
+		}
+
+		[Test]
+			[ExpectedException(typeof(ArgumentNullException))]
+			public void ContainsAllSourceNullCollection()
+		{
+			CollectionUtils.ContainsAll(new ArrayList(), null);	
+		}
+		[Test]
+			[ExpectedException(typeof(InvalidOperationException))]
+			public void ContainsAllDoesNotImplementContains()
+		{
+			CollectionUtils.ContainsAll(new NoContainsNoAddCollection(), new ArrayList());
+		}
+		[Test]
+			public void DoesNotContainAllElements()
+		{
+			ArrayList target = new ArrayList();
+			target.Add(1);
+			target.Add(2);
+			target.Add(3);
+
+			ArrayList source = new ArrayList();
+			source.Add(1);
+
+			Assert.IsTrue(CollectionUtils.ContainsAll(target, source));
+		}
+		[Test]
+			public void ContainsAllElements()
+		{
+			ArrayList target = new ArrayList();
+			target.Add(1);
+			target.Add(2);
+			target.Add(3);
+
+			ArrayList source = new ArrayList();
+			source.Add(1);
+			source.Add(2);
+			source.Add(3);
+
+			Assert.IsTrue(CollectionUtils.ContainsAll(target, source));
+		}
+		[Test]
+			public void ContainsAllElementsWithNoElementsInSourceCollection()
+		{
+			ArrayList target = new ArrayList();
+			target.Add(1);
+			target.Add(2);
+			target.Add(3);
+
+			ArrayList source = new ArrayList();
+			Assert.IsTrue(CollectionUtils.ContainsAll(target, source));
+		}
+		[Test]
+		public void ContainsAllElementsWithNoElementsEitherCollection()
+		{
+			ArrayList target = new ArrayList();
+			ArrayList source = new ArrayList();
+			Assert.IsFalse(CollectionUtils.ContainsAll(target, source));
+		}
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void ToArrayNullTargetCollection()
+		{
+			CollectionUtils.ToArrayList(null);	
+		}
+		[Test]
+		public void ToArrayAllElements()
+		{
+			ArrayList target = new ArrayList();
+			target.Add(1);
+			target.Add(2);
+			target.Add(3);
+
+			ArrayList source = CollectionUtils.ToArrayList(target);
+
+			Assert.AreEqual(target.Count, source.Count);
+		}
+		[Test]
+			public void EmptyArrayElements()
+		{
+			ArrayList source = CollectionUtils.ToArrayList(new NoContainsNoAddCollection());
+			Assert.AreEqual(0, source.Count);
+		}
+
+		[Test] 
+			[ExpectedException(typeof(ArgumentNullException))]
+		public void RemoveAllTargetNullCollection()
+		{
+			CollectionUtils.RemoveAll(null, new ArrayList());	
+		}
+		[Test] 
+			[ExpectedException(typeof(ArgumentNullException))]
+		public void RemoveAllSourceNullCollection()
+		{
+			CollectionUtils.RemoveAll(new ArrayList(), null);	
+		}
+		[Test]
+			[ExpectedException(typeof(InvalidOperationException))]
+			public void RemoveAllTargetCollectionDoesNotImplementContains()
+		{
+			CollectionUtils.RemoveAll(new NoContainsNoAddCollection(), new ArrayList());
+		}
+		[Test]
+		[ExpectedException(typeof(InvalidOperationException))]
+		public void RemoveAllTargetCollectionDoesNotImplementRemove()
+		{
+			CollectionUtils.RemoveAll(new NoContainsNoAddCollection(), new ArrayList());
+		}
+		[Test]
+			public void RemoveAllNoElements()
+		{
+			ArrayList target = new ArrayList();
+			target.Add(1);
+			target.Add(2);
+			target.Add(3);
+
+			ArrayList source = new ArrayList();
+			source.Add(4);
+			source.Add(5);
+			source.Add(6);
+
+			CollectionUtils.RemoveAll(target, source);
+			Assert.IsTrue(3 == target.Count);
+		}
+		[Test]
+		public void RemoveAllSomeElements()
+		{
+			ArrayList target = new ArrayList();
+			target.Add(1);
+			target.Add(2);
+			target.Add(3);
+			target.Add(4);
+			target.Add(5);
+
+			ArrayList source = new ArrayList();
+			source.Add(4);
+			source.Add(5);
+			source.Add(6);
+
+			CollectionUtils.RemoveAll(target, source);
+			Assert.IsTrue(3 == target.Count);
+		}
+		[Test]
+		public void RemoveAllAllElements()
+		{
+			ArrayList target = new ArrayList();
+			target.Add(1);
+			target.Add(2);
+			target.Add(3);
+			target.Add(4);
+			target.Add(5);
+
+			ArrayList source = new ArrayList();
+			source.Add(1);
+			source.Add(2);
+			source.Add(3);
+			source.Add(4);
+			source.Add(5);
+			source.Add(6);
+
+			CollectionUtils.RemoveAll(target, source);
+			Assert.IsTrue(0 == target.Count);
+		}
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Util/DefensiveEventRaiserTests.cs b/test/Spring/Spring.Core.Tests/Util/DefensiveEventRaiserTests.cs
new file mode 100644
index 00000000..3487e919
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/DefensiveEventRaiserTests.cs
@@ -0,0 +1,49 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Unit tests for the DefensiveEventRaiser class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: DefensiveEventRaiserTests.cs,v 1.2 2006/04/09 07:24:51 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class DefensiveEventRaiserTests
+    {
+        [Test]
+        public void RaiseSwallowsExceptionRaisedByHandlers () 
+        {
+            OneThirstyDude dude = new OneThirstyDude ();
+            Soda bru = new Soda ();
+            bru.Pop += new PopHandler (dude.HandlePopWithException);
+            bru.OnPop ("Iron Brew", new DefensiveEventRaiser ());
+            Assert.AreEqual ("Iron Brew", dude.Soda); // should have got through before exception was thrown
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Util/DelegateInfoTests.cs b/test/Spring/Spring.Core.Tests/Util/DelegateInfoTests.cs
new file mode 100644
index 00000000..9dabc074
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/DelegateInfoTests.cs
@@ -0,0 +1,186 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Unit tests for the DelegateInfo class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: DelegateInfoTests.cs,v 1.6 2006/04/09 07:24:51 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class DelegateInfoTests
+	{
+		[Test]
+		public void Instantiation()
+		{
+			new DelegateInfo(typeof (EventHandler));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void InstantiationWithBadType()
+		{
+			new DelegateInfo(typeof (string));
+		}
+
+		[Test]
+		public void IsDelegateWithBadType()
+		{
+			Assert.IsFalse(DelegateInfo.IsDelegate(typeof (string)));
+		}
+
+		[Test]
+		public void IsDelegateWithNullType()
+		{
+			Assert.IsFalse(DelegateInfo.IsDelegate(null));
+		}
+
+		[Test]
+		public void IsDelegate()
+		{
+			Assert.IsTrue(DelegateInfo.IsDelegate(typeof (EventHandler)));
+		}
+
+		[Test]
+		public void GetReturnType()
+		{
+			DelegateInfo del = new DelegateInfo(typeof (EventHandler));
+			Assert.AreEqual(typeof (void), del.GetReturnType());
+		}
+
+		[Test]
+		public void GetReturnTypeWithNonVoidReturningDelegate()
+		{
+			DelegateInfo del = new DelegateInfo(typeof (FooHandler));
+			Assert.AreEqual(typeof (string), del.GetReturnType());
+		}
+
+		[Test]
+		public void GetParameterTypesWithNoArgHandler()
+		{
+			DelegateInfo del = new DelegateInfo(typeof (NoParametersHandler));
+			Type[] types = del.GetParameterTypes();
+			Assert.IsNotNull(types);
+			Assert.AreEqual(0, types.Length);
+		}
+
+		[Test]
+		public void GetParameterTypes()
+		{
+			DelegateInfo del = new DelegateInfo(typeof (FooHandler));
+			Type[] types = del.GetParameterTypes();
+			Assert.IsNotNull(types);
+			Assert.AreEqual(3, types.Length);
+		}
+
+		[Test]
+		public void IsSignatureCompatibleWithBadMethods()
+		{
+			DelegateInfo del = new DelegateInfo(typeof (FooHandler));
+
+			// null method...
+			MethodInfo method = GetType().GetMethod("SeaBass said that? Well, if that guy over there is SeaBass...");
+			Assert.IsFalse(del.IsSignatureCompatible(method));
+
+			// method that doesn;t have the required number of parameters...
+			method = GetType().GetMethod("OddNumberOfParametersForFooHandler");
+			Assert.IsFalse(del.IsSignatureCompatible(method));
+
+			// method that doesn't have the required number of parameters...
+			method = GetType().GetMethod("IncompatibleParametersForFooHandler");
+			Assert.IsFalse(del.IsSignatureCompatible(method));
+		}
+
+		public string OddNumberOfParametersForFooHandler(string bar, int x)
+		{
+			return string.Empty;
+		}
+
+		public string IncompatibleParametersForFooHandler(string bar, int x, string nope)
+		{
+			return string.Empty;
+		}
+
+		[Test]
+		public void IsSignatureCompatibleWithInnerClassStaticMethod()
+		{
+			DelegateInfo del = new DelegateInfo(typeof (FooHandler));
+			MethodInfo method =
+				typeof (Yossarian).GetMethod(
+					"DoFoo",
+					BindingFlags.Public | BindingFlags.Static);
+			Assert.IsTrue(del.IsSignatureCompatible(method));
+		}
+
+		[Test]
+		public void IsSignatureCompatible()
+		{
+			DelegateInfo del = new DelegateInfo(typeof (FooHandler));
+			MethodInfo method = GetType().GetMethod("DoFoo");
+			Assert.IsFalse(del.IsSignatureCompatible(method));
+		}
+
+		[Test]
+		public void IsSignatureCompatibleStaticVersion()
+		{
+			EventInfo evt = typeof (Assembly).GetEvent("ModuleResolve");
+
+			MethodInfo rubbishMethod = GetType().GetMethod("MethodSignatureIsCompatibleStatic");
+			Assert.IsFalse(DelegateInfo.IsSignatureCompatible(evt, rubbishMethod));
+
+			MethodInfo compatibleMethod = typeof (Yossarian).GetMethod("Resolve");
+			Assert.IsTrue(DelegateInfo.IsSignatureCompatible(evt, compatibleMethod));
+
+			Assert.IsFalse(DelegateInfo.IsSignatureCompatible(null, compatibleMethod));
+			Assert.IsFalse(DelegateInfo.IsSignatureCompatible(evt, null));
+		}
+
+		private string DoFoo(string bar, int x, EventArgs e)
+		{
+			return bar;
+		}
+
+		internal sealed class Yossarian
+		{
+			public static string DoFoo(string bar, int x, EventArgs e)
+			{
+				return bar;
+			}
+
+			public Module Resolve(object sender, ResolveEventArgs e)
+			{
+				return null;
+			}
+		}
+	}
+
+	internal delegate string FooHandler(string bar, int x, EventArgs e);
+
+	internal delegate void NoParametersHandler();
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Util/EventRaiserTests.cs b/test/Spring/Spring.Core.Tests/Util/EventRaiserTests.cs
new file mode 100644
index 00000000..f525741e
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/EventRaiserTests.cs
@@ -0,0 +1,128 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Unit tests for the EventRaiser class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: EventRaiserTests.cs,v 1.3 2006/04/09 07:24:51 markpollack Exp $</version>
+	[TestFixture]
+    public sealed class EventRaiserTests
+    {
+        [Test]
+        public void Raise () 
+        {
+            OneThirstyDude dude = new OneThirstyDude ();
+            Soda bru = new Soda ();
+            bru.Pop += new PopHandler (dude.HandlePop);
+            bru.OnPop ("Iron Brew", new EventRaiser ());
+            Assert.AreEqual ("Iron Brew", dude.Soda);
+        }
+
+        [Test]
+        [ExpectedException (typeof (System.Reflection.TargetParameterCountException))]
+        public void RaiseWithBadNumberOfArguments () 
+        {
+            OneThirstyDude dude = new OneThirstyDude ();
+            Soda bru = new Soda ();
+            bru.Pop += new PopHandler (dude.HandlePop);
+            bru.OnPopWithBadNumberOfArguments ("Iron Brew", new EventRaiser ());
+        }
+
+        [Test]
+        public void RaiseWithNullEvent () 
+        {
+            OneThirstyDude dude = new OneThirstyDude ();
+            Soda bru = new Soda ();
+            bru.Pop += new PopHandler (dude.HandlePop);
+            bru.OnPopWithNullEvent ("Iron Brew", new EventRaiser ());
+            Assert.AreEqual (string.Empty, dude.Soda);
+        }
+
+        [Test][ExpectedException (typeof (FormatException), "Iron Brew")]
+        public void RaiseWithAnEventHandlerThatThrowsAnException () 
+        {
+            OneThirstyDude dude = new OneThirstyDude ();
+            Soda bru = new Soda ();
+            bru.Pop += new PopHandler (dude.HandlePopWithException);
+            bru.OnPop ("Iron Brew", new EventRaiser ());
+        }
+	}
+
+    internal delegate void PopHandler (object sender, string soda);
+
+    internal sealed class Soda 
+    {
+        public event PopHandler Pop;
+
+        public void OnPop (string soda, EventRaiser raiser) 
+        {
+            raiser.Raise (Pop, this, soda);
+        }
+
+        public void OnPopWithBadNumberOfArguments (string soda, EventRaiser raiser) 
+        {
+            raiser.Raise (Pop, /*this,*/ soda); // wrong number of args to the event
+        }
+
+        public void OnPopWithNullEvent (string soda, EventRaiser raiser) 
+        {
+            raiser.Raise (null, this, soda); // no event...
+        }
+    }
+
+    internal sealed class OneThirstyDude 
+    {
+        public void HandlePop (object sender, string soda) 
+        {
+            _soda = soda;
+        }
+
+        public void HandlePopWithException (object sender, string soda) 
+        {
+            _soda = soda;
+            throw new FormatException (soda);
+        }
+
+		public static void StaticHandlePop(object sender, string soda) 
+		{
+		}
+
+        public string Soda 
+        {
+            get 
+            {
+                return _soda;
+            }
+        }
+
+        private string _soda = string.Empty;
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Util/NumberUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/NumberUtilsTests.cs
new file mode 100644
index 00000000..3ce4c19a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/NumberUtilsTests.cs
@@ -0,0 +1,103 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Unit tests for the NumberUtils class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	/// <version>$Id: NumberUtilsTests.cs,v 1.2 2006/04/09 07:24:51 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class NumberUtilsTests
+	{
+		[Test]
+		public void IsInteger()
+		{
+			Assert.IsTrue(NumberUtils.IsInteger(10));
+			Assert.IsTrue(NumberUtils.IsInteger(10L));
+			Assert.IsTrue(NumberUtils.IsInteger((short) 10));
+			Assert.IsFalse(NumberUtils.IsInteger('e'));
+			Assert.IsFalse(NumberUtils.IsInteger(null));
+			Assert.IsFalse(NumberUtils.IsInteger(9.5D));
+			Assert.IsFalse(NumberUtils.IsInteger(9.5F));
+			Assert.IsFalse(NumberUtils.IsInteger(this));
+			Assert.IsFalse(NumberUtils.IsInteger(null));
+			Assert.IsFalse(NumberUtils.IsInteger(string.Empty));
+		}
+		
+		[Test]
+		public void IsDecimal()
+		{
+			Assert.IsFalse(NumberUtils.IsDecimal(10));
+			Assert.IsFalse(NumberUtils.IsDecimal(10L));
+			Assert.IsFalse(NumberUtils.IsDecimal((short) 10));
+			Assert.IsFalse(NumberUtils.IsDecimal('e'));
+			Assert.IsFalse(NumberUtils.IsDecimal(null));
+			Assert.IsTrue(NumberUtils.IsDecimal(9.5D));
+			Assert.IsTrue(NumberUtils.IsDecimal(9.5F));
+			Assert.IsFalse(NumberUtils.IsDecimal(this));
+			Assert.IsFalse(NumberUtils.IsDecimal(null));
+			Assert.IsFalse(NumberUtils.IsDecimal(string.Empty));
+		}
+
+		[Test]
+		public void IsNumber()
+		{
+			Assert.IsTrue(NumberUtils.IsNumber(10));
+			Assert.IsTrue(NumberUtils.IsNumber(10L));
+			Assert.IsTrue(NumberUtils.IsNumber((short) 10));
+			Assert.IsFalse(NumberUtils.IsNumber('e'));
+			Assert.IsFalse(NumberUtils.IsNumber(null));
+			Assert.IsTrue(NumberUtils.IsNumber(9.5D));
+			Assert.IsTrue(NumberUtils.IsNumber(9.5F));
+			Assert.IsFalse(NumberUtils.IsNumber(this));
+			Assert.IsFalse(NumberUtils.IsNumber(null));
+			Assert.IsFalse(NumberUtils.IsNumber(string.Empty));
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void NegateNull()
+		{
+			NumberUtils.Negate(null);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void NegateString()
+		{
+			NumberUtils.Negate(null);
+		}
+
+		[Test]
+		public void Negate()
+		{
+			Assert.AreEqual(-10, NumberUtils.Negate(10));
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Util/ObjectUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/ObjectUtilsTests.cs
new file mode 100644
index 00000000..5c52e08a
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/ObjectUtilsTests.cs
@@ -0,0 +1,354 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+#if NET_2_0
+using System.Collections.Generic;
+#endif
+using System.Reflection;
+using System.Security.Policy;
+using NUnit.Framework;
+using Spring.Objects;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Unit tests for the ObjectUtils class.
+    /// </summary>
+    /// <author>Rick Evans (.NET)</author>
+    /// <version>$Id: ObjectUtilsTests.cs,v 1.4 2007/08/17 02:43:30 markpollack Exp $</version>
+    [TestFixture]
+    public class ObjectUtilsTests
+    {
+        [Test]
+        public void NullSafeEqualsWithBothNull()
+        {
+            string first = null;
+            string second = null;
+            Assert.IsTrue(ObjectUtils.NullSafeEquals(first, second));
+        }
+
+        [Test]
+        public void NullSafeEqualsWithFirstNull()
+        {
+            string first = null;
+            string second = "";
+            Assert.IsFalse(ObjectUtils.NullSafeEquals(first, second));
+        }
+
+        [Test]
+        public void NullSafeEqualsWithSecondNull()
+        {
+            string first = "";
+            string second = null;
+            Assert.IsFalse(ObjectUtils.NullSafeEquals(first, second));
+        }
+
+        [Test]
+        public void NullSafeEqualsBothEquals()
+        {
+            string first = "this is it";
+            string second = "this is it";
+            Assert.IsTrue(ObjectUtils.NullSafeEquals(first, second));
+        }
+
+        [Test]
+        public void NullSafeEqualsNotEqual()
+        {
+            string first = "this is it";
+            int second = 12;
+            Assert.IsFalse(ObjectUtils.NullSafeEquals(first, second));
+        }
+
+        [Test]
+        public void IsAssignableAndNotTransparentProxyWithProxy()
+        {
+            AppDomain domain = null;
+            try
+            {
+                AppDomainSetup setup = new AppDomainSetup();
+                setup.ApplicationBase = Environment.CurrentDirectory;
+                domain = AppDomain.CreateDomain("Spring", new Evidence(AppDomain.CurrentDomain.Evidence), setup);
+                object foo = domain.CreateInstanceAndUnwrap(GetType().Assembly.FullName, typeof(Foo).FullName);
+                // the instance is definitely assignable to the supplied interface type...
+                bool isAssignable = ObjectUtils.IsAssignableAndNotTransparentProxy(typeof (IFoo), foo);
+                Assert.IsFalse(isAssignable, "Proxied instance was not recognized as such.");
+            }
+            finally
+            {
+                AppDomain.Unload(domain);
+            }
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void InstantiateTypeWithNullType()
+        {
+            ObjectUtils.InstantiateType(null);
+        }
+
+        [Test]
+        public void InstantiateType()
+        {
+            object foo = ObjectUtils.InstantiateType(typeof (TestObject));
+            Assert.IsNotNull(foo, "Failed to instantiate an instance of a valid Type.");
+            Assert.IsTrue(foo is TestObject, "The instantiated instance was not an instance of the type that was passed in.");
+        }
+#if NET_2_0
+        [Test]
+        [ExpectedException(typeof(FatalReflectionException))]
+        public void InstantiateTypeWithOpenGenericType()
+        {
+            ObjectUtils.InstantiateType(typeof(Dictionary<,>));
+        }
+#endif
+
+        [Test]
+        [ExpectedException(typeof(FatalReflectionException))]
+        public void InstantiateTypeWithAbstractType()
+        {
+            ObjectUtils.InstantiateType(typeof (AbstractType));
+        }
+
+        [Test]
+        [ExpectedException(typeof(FatalReflectionException))]
+        public void InstantiateTypeWithInterfaceType()
+        {
+            ObjectUtils.InstantiateType(typeof (IList));
+        }
+
+        [Test]
+        [ExpectedException(typeof(FatalReflectionException))]
+        public void InstantiateTypeWithTypeExposingNoZeroArgCtor()
+        {
+            ObjectUtils.InstantiateType(typeof(NoZeroArgConstructorType));
+        }
+
+        [Test]
+        public void InstantiateTypeWithPrivateCtor()
+        {
+            ConstructorInfo ctor = typeof (OnlyPrivateCtor).GetConstructor(
+                BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] {typeof (string)},
+                null);
+            object foo = ObjectUtils.InstantiateType(ctor, new object[] {"Chungking Express"});
+            Assert.IsNotNull(foo, "Failed to instantiate an instance of a valid Type.");
+            Assert.IsTrue(foo is OnlyPrivateCtor, "The instantiated instance was not an instance of the type that was passed in.");
+            Assert.AreEqual("Chungking Express", ((OnlyPrivateCtor) foo).Name);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void InstantiateTypeWithNullCtor()
+        {
+            ObjectUtils.InstantiateType(typeof(IList).GetConstructor(Type.EmptyTypes), new object[] { });
+        }
+
+        [Test]
+        public void InstantiateTypeWithCtorWithNoArgs()
+        {
+            Type type = typeof (TestObject);
+            ConstructorInfo ctor = type.GetConstructor(Type.EmptyTypes);
+            object foo = ObjectUtils.InstantiateType(ctor, ObjectUtils.EmptyObjects);
+            Assert.IsNotNull(foo, "Failed to instantiate an instance of a valid Type.");
+            Assert.IsTrue(foo is TestObject, "The instantiated instance was not an instance of the Type that was passed in.");
+        }
+
+        [Test]
+        public void InstantiateTypeWithCtorArgs()
+        {
+            Type type = typeof (TestObject);
+            ConstructorInfo ctor = type.GetConstructor(new Type[] {typeof (string), typeof (int)});
+            object foo = ObjectUtils.InstantiateType(ctor, new object[] {"Yakov Petrovich Golyadkin", 39});
+            Assert.IsNotNull(foo, "Failed to instantiate an instance of a valid Type.");
+            Assert.IsTrue(foo is TestObject, "The instantiated instance was not an instance of the Type that was passed in.");
+            TestObject obj = foo as TestObject;
+            Assert.AreEqual("Yakov Petrovich Golyadkin", obj.Name);
+            Assert.AreEqual(39, obj.Age);
+        }
+
+        [Test]
+        public void InstantiateTypeWithBadCtorArgs()
+        {
+            Type type = typeof (TestObject);
+            ConstructorInfo ctor = type.GetConstructor(new Type[] {typeof(string), typeof(int)});
+            try
+            {
+                ObjectUtils.InstantiateType(ctor, new object[] { 39, "Yakov Petrovich Golyadkin" });
+                Assert.Fail("Should throw an error");
+            }
+            catch
+            {
+                // ok...
+            }
+        }
+
+        [Test]
+        public void IsSimpleProperty()
+        {
+            Assert.IsTrue(ObjectUtils.IsSimpleProperty(typeof (string)));
+            Assert.IsTrue(ObjectUtils.IsSimpleProperty(typeof (long)));
+            Assert.IsTrue(ObjectUtils.IsSimpleProperty(typeof (bool)));
+            Assert.IsTrue(ObjectUtils.IsSimpleProperty(typeof (int)));
+            Assert.IsTrue(ObjectUtils.IsSimpleProperty(typeof (float)));
+            Assert.IsTrue(ObjectUtils.IsSimpleProperty(typeof (ushort)));
+            Assert.IsTrue(ObjectUtils.IsSimpleProperty(typeof (double)));
+            Assert.IsTrue(ObjectUtils.IsSimpleProperty(typeof (ulong)));
+            Assert.IsTrue(ObjectUtils.IsSimpleProperty(typeof (char)));
+            Assert.IsTrue(ObjectUtils.IsSimpleProperty(typeof (uint)));
+            Assert.IsTrue(ObjectUtils.IsSimpleProperty(typeof (string[])));
+            Assert.IsTrue(ObjectUtils.IsSimpleProperty(typeof (Type)));
+
+            Assert.IsFalse(ObjectUtils.IsSimpleProperty(typeof (TestObject)));
+            Assert.IsFalse(ObjectUtils.IsSimpleProperty(typeof (IList[])));
+        }
+
+        [Test]
+        public void EnumerateFirstElement()
+        {
+            string expected = "Hiya";
+            IList list = new string[] {expected, "Aw!", "Man!"};
+            IEnumerator enumerator = list.GetEnumerator();
+            object actual = ObjectUtils.EnumerateFirstElement(enumerator);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void EnumerateElementAtIndex()
+        {
+            string expected = "Mmm...";
+            IList list = new string[] {"Aw!", "Man!", expected};
+            IEnumerator enumerator = list.GetEnumerator();
+            object actual = ObjectUtils.EnumerateElementAtIndex(enumerator, 2);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void EnumerateElementAtIndexViaIEnumerable()
+        {
+            string expected = "Mmm...";
+            IList list = new string[] {"Aw!", "Man!", expected};
+            object actual = ObjectUtils.EnumerateElementAtIndex(list, 2);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentOutOfRangeException))]
+        public void EnumerateElementAtOutOfRangeIndex()
+        {
+            string expected = "Mmm...";
+            IList list = new string[] {"Aw!", "Man!", expected};
+            IEnumerator enumerator = list.GetEnumerator();
+            object actual = ObjectUtils.EnumerateElementAtIndex(enumerator, 12);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentOutOfRangeException))]
+        public void EnumerateElementAtOutOfRangeIndexViaIEnumerable()
+        {
+            string expected = "Mmm...";
+            IList list = new string[] {"Aw!", "Man!", expected};
+            object actual = ObjectUtils.EnumerateElementAtIndex(list, 12);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentOutOfRangeException))]
+        public void EnumerateElementAtNegativeIndex()
+        {
+            string expected = "Mmm...";
+            IList list = new string[] {"Aw!", "Man!", expected};
+            IEnumerator enumerator = list.GetEnumerator();
+            object actual = ObjectUtils.EnumerateElementAtIndex(enumerator, -10);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentOutOfRangeException))]
+        public void EnumerateElementAtNegativeIndexViaIEnumerable()
+        {
+            string expected = "Mmm...";
+            IList list = new string[] {"Aw!", "Man!", expected};
+            object actual = ObjectUtils.EnumerateElementAtIndex(list, -10);
+            Assert.AreEqual(expected, actual);
+        }
+
+        #region Helper Classes
+
+        private interface IFoo
+        {
+        }
+
+        private sealed class Foo : MarshalByRefObject, IFoo
+        {
+        }
+
+        /// <summary>
+        /// A class that doesn't have a parameterless constructor.
+        /// </summary>
+        private class NoZeroArgConstructorType
+        {
+            /// <summary>
+            /// Creates a new instance of the NoZeroArgConstructorType class.
+            /// </summary>
+            /// <param name="foo">A spurious argument (ignored).</param>
+            public NoZeroArgConstructorType(string foo)
+            {
+            }
+        }
+
+        /// <summary>
+        /// An abstract class. Doh!
+        /// </summary>
+        private abstract class AbstractType
+        {
+            /// <summary>
+            /// Creates a new instance of the AbstractType class.
+            /// </summary>
+            public AbstractType()
+            {
+            }
+        }
+
+        private class OnlyPrivateCtor
+        {
+            private OnlyPrivateCtor(string name)
+            {
+                _name = name;
+            }
+
+            public string Name
+            {
+                get { return _name; }
+                set { _name = value; }
+            }
+
+            private string _name;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Util/PathMatcherTest.cs b/test/Spring/Spring.Core.Tests/Util/PathMatcherTest.cs
new file mode 100644
index 00000000..cdac14b0
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/PathMatcherTest.cs
@@ -0,0 +1,109 @@
+#region License
+/*
+* Copyright 2002-2004 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.IO;
+using NUnit.Framework;
+
+namespace Spring.Util
+{
+    [TestFixture]
+	public class PathMatcherTest
+	{
+        string dir = "PathMatcher";
+
+        [Test]
+        public void TestFilesInDataPathMatcher ()
+        {
+            DirectoryInfo info = new DirectoryInfo(dir);
+            foreach (FileInfo file in info.GetFiles("*.test"))
+            {
+                ProcessFile (file);
+            }
+            
+        }
+
+       [Test, Explicit]
+       public void ThisIsATestForDebuggingPurposes ()
+       {
+           ProcessFile(new FileInfo(dir + "/Examples.test"));
+       }
+
+        private static void ProcessFile (FileInfo file)
+        {
+            bool trueness = true;
+            using (StreamReader r = file.OpenText())
+            {
+                string pattern = null;
+                string line;
+                int nline = 0;
+
+                bool expectingPattern = false;
+                while ((line = r.ReadLine()) != null)
+                {
+                    nline++;
+                    switch (line)
+                    {
+                        case "":
+                            if (expectingPattern)
+                            {
+                                pattern = line;
+                                expectingPattern = false;
+                                continue;
+                            }
+                            break;
+                        case "--match--":
+                        case "# <match>":
+                            trueness = true;
+                            break;
+                        case "--dont-match--":
+                        case "# <dont.match>":
+                            trueness = false;
+                            break;
+                        case "--pattern--":
+                        case "# <pattern>":
+                            expectingPattern = true;
+                            nline++;
+                            break;
+                        default:
+                            if (line.StartsWith("#"))
+                            {
+                                continue;
+                            }
+                            if (expectingPattern)
+                            {
+                                pattern = line;
+                                expectingPattern = false;
+                                continue;
+                            }
+                            AssertMatches(file, nline, trueness, line, pattern);
+                            AssertMatches(file, nline, trueness, line.Replace("/", "\\"), pattern);
+                            break;
+                    }
+                }
+            }
+        }
+
+        private static void AssertMatches (FileInfo file, int nline, bool trueness, string path, string pattern)
+        {
+                Assert.AreEqual(trueness, 
+                    PathMatcher.Match(pattern, path), 
+                    String.Format("\ntest file '{0}', line {1}:\npath '{2}' does {3} match '{4}' (translated to {5})", 
+                    file.Name, nline, path, trueness ? "not" : "", pattern, PathMatcher.BuildRegex(pattern))) ;
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Util/PatternMatchUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/PatternMatchUtilsTests.cs
new file mode 100644
index 00000000..49f474ee
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/PatternMatchUtilsTests.cs
@@ -0,0 +1,37 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+    /// Unit tests for the PatternMatchUtils class.
+	/// </summary>
+	/// <version>$Id: PatternMatchUtilsTests.cs,v 1.2 2007/07/31 18:19:59 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class PatternMatchUtilsTests
+    {
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Util/PropertiesTests.cs b/test/Spring/Spring.Core.Tests/Util/PropertiesTests.cs
new file mode 100644
index 00000000..db78ba66
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/PropertiesTests.cs
@@ -0,0 +1,188 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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
+
+#region Imports
+
+using System.IO;
+using System.Text;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Unit tests for Spring.Util.Properties.
+	/// </summary>
+	[TestFixture]
+	public class PropertiesTests
+	{
+        [Test]
+        public void Instantiation ()
+        {
+            Properties root = new Properties();
+            root.Add ("foo", "this");
+            root.Add ("bar", "is");
+            Properties props = new Properties(root);
+			props.SetProperty("myPropertyKey", "myPropertyValue");
+            Assert.AreEqual (3, props.Count);
+            Assert.AreEqual ("this", props.GetProperty ("foo"));
+            Assert.AreEqual ("is", props.GetProperty ("bar"));
+            Assert.AreEqual ("myPropertyValue", props.GetProperty ("myPropertyKey"));
+        }
+
+        [Test]
+        public void GetPropertyWithDefault ()
+        {
+            Properties props = new Properties();
+            props.Add ("foo", "this");
+            props.Add ("bar", "is");
+            Assert.AreEqual ("this", props.GetProperty ("foo"));
+            Assert.AreEqual ("is", props.GetProperty ("bar"));
+            Assert.AreEqual ("it", props.GetProperty ("baz", "it"));
+        }
+
+        [Test]
+        public void Remove ()
+        {
+            Properties props = new Properties();
+            props.Add ("foo", "this");
+            props.Add ("bar", "is");
+            Assert.AreEqual (2, props.Count);
+            props.Remove ("foo");
+            Assert.AreEqual (1, props.Count);
+            Assert.IsFalse (props.ContainsKey ("foo"));
+        }
+
+        [Test]
+        public void Store ()
+        {
+            Properties props = new Properties();
+            props.Add ("foo", "this");
+            props.Add ("bar", "is");
+            props.Add ("baz", "it");
+            FileInfo file = new FileInfo ("properties.test");
+            try 
+            {
+                // write 'em out with the specified header...
+                using (Stream cout = file.OpenWrite ()) 
+                {
+                    props.Store (cout, "My Properties");
+                }
+            }
+            finally 
+            {
+                try 
+                {
+                    file.Delete ();
+                } 
+                catch (IOException)
+                {
+                }
+            }
+        }
+
+        [Test]
+        public void ListAndLoad ()
+        {
+            Properties props = new Properties();
+            props.Add ("foo", "this");
+            props.Add ("bar", "is");
+            props.Add ("baz", "it");
+            FileInfo file = new FileInfo ("properties.test");
+            try 
+            {
+                // write 'em out...
+                using (Stream cout = file.OpenWrite ()) 
+                {
+                    props.List (cout);
+                }
+                // read 'em back in...
+                using (Stream cin = file.OpenRead ()) 
+                {
+                    props = new Properties ();
+                    props.Load (cin);
+                    Assert.AreEqual (3, props.Count);
+                    Assert.AreEqual ("this", props.GetProperty ("foo"));
+                    Assert.AreEqual ("is", props.GetProperty ("bar"));
+                    Assert.AreEqual ("it", props.GetProperty ("baz", "it"));
+                }
+            }
+            finally 
+            {
+                try 
+                {
+                    file.Delete ();
+                } 
+                catch (IOException)
+                {
+                }
+            }
+        }
+
+		[Test]
+		public void SimpleProperties()
+		{
+			string input = "key1=value1\r\nkey2:value2\r\n\r\n# a comment line\r\n   leadingspace : true";
+			Stream s = new MemoryStream(Encoding.ASCII.GetBytes(input));
+			Properties props = new Properties();
+			props.Load(s);
+
+			Assert.IsTrue("value1".Equals(props["key1"]));
+			Assert.IsTrue("value2".Equals(props["key2"]));
+			Assert.IsTrue("true".Equals(props["leadingspace"]));
+		}
+
+		[Test]
+		public void Continuation()
+		{
+			string input = "continued = this is a long value element \\\r\nthat uses continuation \\\r\n    xxx";
+			Stream s = new MemoryStream(Encoding.ASCII.GetBytes(input));
+			Properties props = new Properties();
+			props.Load(s);
+
+			Assert.IsTrue("this is a long value element that uses continuation xxx".Equals(props["continued"]));
+		}
+
+		[Test]
+		public void SeperatorEscapedWithinKey()
+		{
+			string input = "\\" + ":key:newvalue";
+			Stream s = new MemoryStream(Encoding.ASCII.GetBytes(input));
+			Properties props = new Properties();
+			props.Load(s);
+
+			Assert.IsTrue("newvalue".Equals(props[":key"]));
+		}
+
+		[Test]
+		public void EscapedCharactersInValue()
+		{
+			string input = "escaped=test\\ttest";
+			Stream s = new MemoryStream(Encoding.ASCII.GetBytes(input));
+			Properties props = new Properties();
+			props.Load(s);
+
+			Assert.IsTrue("test\ttest".Equals(props["escaped"]));
+		}
+
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs
new file mode 100644
index 00000000..ca7eb606
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs
@@ -0,0 +1,122 @@
+using System;
+using NUnit.Framework;
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Summary description for TestMemberwiseCopy.
+	/// </summary>
+	[TestFixture]
+	public class ReflectionUtilsMemberwiseCopyTests
+	{
+		[Test]
+		public void TestSameType()
+		{
+			SampleBaseClass i1 = new SampleDerivedClass("1st config val");
+			SampleBaseClass i2 = new SampleDerivedClass("2nd config val");
+
+			ReflectionUtils.MemberwiseCopy(i1, i2);
+
+			Assert.AreEqual(i1, i2);
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException), "object types are not related")]
+		public void DifferentTypesForbidden()
+		{
+			ReflectionUtils.MemberwiseCopy("test", 2);
+		}
+
+		[Test]
+		public void TestDerivedTypeAllowed()
+		{
+			SampleBaseClass i1 = new SampleDerivedClass("1st config val");
+			SampleBaseClass i2 = new SampleFurtherDerivedClass("2nd config val");
+
+			ReflectionUtils.MemberwiseCopy(i1, i2);
+
+			Assert.AreEqual(i1, i2);
+		}
+
+		[Test]
+		public void TestBaseTypeAllowed()
+		{
+			SampleBaseClass i1 = new SampleDerivedClass("1st config val");
+			SampleBaseClass i2 = new SampleFurtherDerivedClass("2nd config val");
+
+			ReflectionUtils.MemberwiseCopy(i2, i1);
+
+			Assert.AreEqual(i2, i1);
+		}
+	}
+	
+	#region Test Support Classes
+	
+	public class SampleBaseClass
+	{
+		private const string MyConstant = "SampleBaseClass.MyConstant";
+		private readonly string _someReadOnlyVal = "SampleBaseClass.SomeReadOnlyVal";
+		protected readonly string _someProtectedReadOnlyVal = "SampleBaseClass.SomeProtectedReadOnlyVal";
+		private string _someConfigVal = "SampleBaseClass.SomeConfigVal";
+
+		public SampleBaseClass(string someConfigVal)
+		{
+			if (someConfigVal == null) throw new ArgumentNullException("someConfigVal must not be null");
+			_someConfigVal = someConfigVal;
+			_someProtectedReadOnlyVal = "Protected" + someConfigVal;
+		}
+
+		public override int GetHashCode()
+		{
+			int result = _someReadOnlyVal != null ? _someReadOnlyVal.GetHashCode() : 0;
+			result = 29*result + (_someProtectedReadOnlyVal != null ? _someProtectedReadOnlyVal.GetHashCode() : 0);
+			result = 29*result + (_someConfigVal != null ? _someConfigVal.GetHashCode() : 0);
+			return result;
+		}
+
+		public override bool Equals(object obj)
+		{
+			if (this == obj) return true;
+			SampleBaseClass sampleBaseClass = obj as SampleBaseClass;
+			if (sampleBaseClass == null) return false;
+			if (!Equals(_someReadOnlyVal, sampleBaseClass._someReadOnlyVal)) return false;
+			if (!Equals(_someProtectedReadOnlyVal, sampleBaseClass._someProtectedReadOnlyVal)) return false;
+			if (!Equals(_someConfigVal, sampleBaseClass._someConfigVal)) return false;
+			return true;
+		}
+	}
+	
+	public class SampleDerivedClass : SampleBaseClass
+	{
+		private string _someConfigVal = "SampleDerivedClass.SomeConfigVal";
+
+		public SampleDerivedClass(string someConfigVal) : base(someConfigVal)
+		{
+			_someConfigVal = "SampleDerivedClass." + someConfigVal;
+		}
+
+		public override int GetHashCode()
+		{
+			return base.GetHashCode() + 29*(_someConfigVal != null ? _someConfigVal.GetHashCode() : 0);
+		}
+
+		public override bool Equals(object obj)
+		{
+			if (this == obj) return true;
+			SampleDerivedClass sampleDerivedClass = obj as SampleDerivedClass;
+			if (sampleDerivedClass == null) return false;
+			if (!base.Equals(obj)) return false;
+			if (!Equals(_someConfigVal, sampleDerivedClass._someConfigVal)) return false;
+			return true;
+		}
+	}
+	
+	public class SampleFurtherDerivedClass : SampleDerivedClass
+	{
+		public SampleFurtherDerivedClass(string someConfigVal) : base(someConfigVal)
+		{
+		}
+	}
+	
+	#endregion		
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs
new file mode 100644
index 00000000..62a05448
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs
@@ -0,0 +1,1133 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Runtime.CompilerServices;
+using System.Windows.Forms;
+using NUnit.Framework;
+
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Attributes;
+
+#endregion
+
+#if NET_2_0
+[assembly: InternalsVisibleTo("ReflectionUtils.IsTypeVisible.AssemblyTestName, PublicKey=001200000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+#endif
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Unit tests for the ReflectionUtils class.
+	/// </summary>
+	/// <version>$Id: ReflectionUtilsTests.cs,v 1.22 2008/04/02 16:21:49 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class ReflectionUtilsTests
+	{
+		[Test]
+		public void GetParameterTypes()
+		{
+			Type[] expectedParameterTypes = new Type[] { typeof(string) };
+			MethodInfo method = typeof(ReflectionUtilsObject).GetMethod("BadSpanglish");
+			Type[] parameterTypes = ReflectionUtils.GetParameterTypes(method);
+			Assert.IsTrue(ArrayUtils.AreEqual(expectedParameterTypes, parameterTypes));
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void GetParameterTypesWithNullMethodInfo()
+		{
+			ReflectionUtils.GetParameterTypes((MethodInfo) null);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void GetParameterTypesWithNullParametersArgs()
+		{
+			ReflectionUtils.GetParameterTypes((ParameterInfo[]) null);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void GetMatchingMethodsWithNullTypeToFindOn()
+		{
+			ReflectionUtils.GetMatchingMethods(null, new MethodInfo[] {}, true);
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentNullException))]
+		public void GetMatchingMethodsWithNullMethodsToFind()
+		{
+			ReflectionUtils.GetMatchingMethods(GetType(), null, true);
+		}
+
+		[Test]
+		public void GetMatchingMethodsWithPerfectMatch()
+		{
+			MethodInfo[] clonesMethods = typeof(ReflectionUtilsObjectClone).GetMethods(BindingFlags.Public | BindingFlags.DeclaredOnly | BindingFlags.Instance);
+			MethodInfo[] foundMethods = ReflectionUtils.GetMatchingMethods(typeof(ReflectionUtilsObject), clonesMethods, true);
+			Assert.AreEqual(clonesMethods.Length, foundMethods.Length);
+		}
+
+		[Test]
+		[ExpectedException(typeof(Exception))]
+		public void GetMatchingMethodsWithBadMatchStrict()
+		{
+            // lets include a protected method that ain't declared on the ReflectionUtilsObject class...
+			MethodInfo[] clonesMethods = typeof(ReflectionUtilsObjectClone).GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly | BindingFlags.Instance);
+			ReflectionUtils.GetMatchingMethods(typeof(ReflectionUtilsObject), clonesMethods, true);
+		}
+
+		[Test]
+		public void GetMatchingMethodsWithBadMatchNotStrict()
+		{
+            // lets include a protected method that ain't declared on the ReflectionUtilsObject class...
+			MethodInfo[] clonesMethods = typeof(ReflectionUtilsObjectClone).GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly | BindingFlags.Instance);
+			MethodInfo[] foundMethods = ReflectionUtils.GetMatchingMethods(typeof(ReflectionUtilsObject), clonesMethods, false);
+			// obviously is not strict, 'cos we got here without throwing an exception...
+			Assert.AreEqual(clonesMethods.Length, foundMethods.Length);
+		}
+
+        [Test]
+        [ExpectedException(typeof(Exception))]
+        public void GetMatchingMethodsWithBadReturnTypeMatchStrict()
+        {
+            // lets include a method that return type is different...
+            MethodInfo[] clonesMethods = typeof(ReflectionUtilsObjectBadClone).GetMethods(BindingFlags.Public | BindingFlags.DeclaredOnly | BindingFlags.Instance);
+            ReflectionUtils.GetMatchingMethods(typeof(ReflectionUtilsObject), clonesMethods, true);
+        }
+
+        [Test]
+        public void GetMatchingMethodsWithBadReturnTypeMatchNotStrict()
+        {
+            // lets include a method that return type is different...
+            MethodInfo[] clonesMethods = typeof(ReflectionUtilsObjectBadClone).GetMethods(BindingFlags.Public | BindingFlags.DeclaredOnly | BindingFlags.Instance);
+            MethodInfo[] foundMethods = ReflectionUtils.GetMatchingMethods(typeof(ReflectionUtilsObject), clonesMethods, false);
+            // obviously is not strict, 'cos we got here without throwing an exception...
+            Assert.AreEqual(clonesMethods.Length, foundMethods.Length);
+        }
+
+		[Test]
+		public void ParameterTypesMatch()
+		{
+			MethodInfo method = typeof (ReflectionUtilsObject).GetMethod("Spanglish");
+			Type[] types = new Type[] {typeof (string), typeof (object[])};
+			Assert.IsTrue(ReflectionUtils.ParameterTypesMatch(method, types));
+		}
+
+		[Test]
+		public void ParameterTypesDontMatchWithNonMatchingArgs()
+		{
+			Type[] types = new Type[] {typeof (string), typeof (object[])};
+
+			MethodInfo method = typeof (ReflectionUtilsObject).GetMethod("BadSpanglish");
+			Assert.IsFalse(ReflectionUtils.ParameterTypesMatch(method, types));
+			method = typeof (ReflectionUtilsObject).GetMethod("WickedSpanglish");
+			Assert.IsFalse(ReflectionUtils.ParameterTypesMatch(method, types));
+		}
+
+		[Test]
+		public void GetDefaultValue()
+		{
+			Assert.IsNull(ReflectionUtils.GetDefaultValue(GetType()));
+			Assert.AreEqual(Cuts.Superficial, ReflectionUtils.GetDefaultValue(typeof (Cuts)));
+			Assert.AreEqual(false, ReflectionUtils.GetDefaultValue(typeof (bool)));
+			Assert.AreEqual(DateTime.MinValue, ReflectionUtils.GetDefaultValue(typeof (DateTime)));
+			Assert.AreEqual(Char.MinValue, ReflectionUtils.GetDefaultValue(typeof (char)));
+			Assert.AreEqual(0, ReflectionUtils.GetDefaultValue(typeof (long)));
+			Assert.AreEqual(0, ReflectionUtils.GetDefaultValue(typeof (int)));
+			Assert.AreEqual(0, ReflectionUtils.GetDefaultValue(typeof (short)));
+		}
+
+        [Test]
+        public void PropertyIsIndexer()
+        {
+            Assert.IsTrue(ReflectionUtils.PropertyIsIndexer("Item", typeof(TestObject)));
+            Assert.IsFalse(ReflectionUtils.PropertyIsIndexer("Item", typeof(SideEffectObject)));
+            Assert.IsFalse(ReflectionUtils.PropertyIsIndexer("Count", typeof(SideEffectObject)));
+            Assert.IsTrue(ReflectionUtils.PropertyIsIndexer("MyItem", typeof(ObjectWithNonDefaultIndexerName)));
+        }
+
+		[Test]
+		public void MethodIsOnOneOfTheseInterfaces()
+		{
+			MethodInfo method = typeof (ReflectionUtilsObject).GetMethod("Spanglish");
+			Assert.IsTrue(ReflectionUtils.MethodIsOnOneOfTheseInterfaces(method, new Type[] {typeof (IFoo)}));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException))]
+		public void MethodIsOnOneOfTheseInterfacesWithNonInterfaceType()
+		{
+			MethodInfo method = typeof (ReflectionUtilsObject).GetMethod("Spanglish");
+			Assert.IsFalse(ReflectionUtils.MethodIsOnOneOfTheseInterfaces(method, new Type[] {GetType()}));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void MethodIsOnOneOfTheseInterfacesWithNullMethod()
+		{
+			MethodInfo method = null;
+			Assert.IsFalse(ReflectionUtils.MethodIsOnOneOfTheseInterfaces(method, new Type[] {GetType()}));
+		}
+
+		[Test]
+		public void MethodIsOnOneOfTheseInterfacesWithNullTypes()
+		{
+			MethodInfo method = typeof (ReflectionUtilsObject).GetMethod("Spanglish");
+			Assert.IsFalse(ReflectionUtils.MethodIsOnOneOfTheseInterfaces(method, null));
+		}
+
+        [Test]
+        public void MethodIsOnOneOfTheseInterfacesMultiple()
+        {
+            MethodInfo method = typeof(RequiredTestObject).GetMethod("set_ObjectFactory");
+            Assert.IsNotNull(method, "Could not get setter property for ObjectFactory");
+            Assert.IsTrue(ReflectionUtils.MethodIsOnOneOfTheseInterfaces(method, new Type[] { typeof (IObjectNameAware), typeof(IObjectFactoryAware)}));
+        }
+
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void ParameterTypesMatchWithNullArgs()
+		{
+			ReflectionUtils.ParameterTypesMatch(null, null);
+		}
+
+		[Test]
+		public void GetSignature()
+		{
+			MethodInfo method = typeof (ReflectionUtilsObject).GetMethod("Spanglish");
+			ArrayList list = new ArrayList();
+			foreach (ParameterInfo p in method.GetParameters())
+			{
+				list.Add(p.ParameterType);
+			}
+			string expected = "Spring.Util.ReflectionUtilsObject::Spanglish(System.String,System.Object[])";
+			Type[] pTypes = (Type[]) list.ToArray(typeof (Type));
+			string actual = ReflectionUtils.GetSignature(method.DeclaringType, method.Name, pTypes);
+			Assert.AreEqual(expected, actual);
+		}
+
+        [Test]
+        public void ToInterfaceArrayFromType()
+        {
+            Type[] expected = new Type[] { typeof(IFoo), typeof(IBar) };
+            Type[] actual = ReflectionUtils.ToInterfaceArray(typeof(IBar));
+            Assert.AreEqual(expected.Length, actual.Length);
+            Assert.AreEqual(expected[0], actual[0]);
+            Assert.AreEqual(expected[1], actual[1]);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void ToInterfaceArrayFromTypeWithNonInterface()
+        {
+            ReflectionUtils.ToInterfaceArray(typeof(ExplicitFoo));
+        }
+
+
+		[Test]
+		public void GetMethod()
+		{
+			MethodInfo actual = ReflectionUtils.GetMethod(
+				typeof (ReflectionUtilsObject),
+				"Spanglish",
+				new Type[] {typeof (string), typeof (object[])});
+			Assert.IsNotNull(actual);
+		}
+
+		[Test]
+		public void GetMethodWithExplicitInterfaceMethod()
+		{
+			MethodInfo actual = ReflectionUtils.GetMethod(
+				typeof (ExplicitFoo),
+				"Spring.Util.IFoo.Spanglish",
+				new Type[] {typeof (string), typeof (object[])});
+			Assert.IsNotNull(actual);
+		}
+
+		[Test]
+		public void GetMethodIsCaseInsensitive()
+		{
+			MethodInfo actual = ReflectionUtils.GetMethod(
+				typeof (ReflectionUtilsObject),
+				"spAngLISh",
+				new Type[] {typeof (string), typeof (object[])});
+			Assert.IsNotNull(actual, "ReflectionUtils.GetMethod would appear to be case sensitive.");
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentException),
+			"[Spring.Util.ReflectionUtilsTests] does not derive from the [System.Attribute] class.")]
+		public void CreateCustomAttributeForNonAttributeType()
+		{
+			ReflectionUtils.CreateCustomAttribute(GetType());
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void CreateCustomAttributeWithNullType()
+		{
+			ReflectionUtils.CreateCustomAttribute((Type) null);
+		}
+
+		[Test]
+		public void CreateCustomAttributeSunnyDayScenarios()
+		{
+			CustomAttributeBuilder builder = null;
+
+			builder = ReflectionUtils.CreateCustomAttribute(typeof(MyCustomAttribute));
+			Assert.IsNotNull(builder);
+
+			builder = ReflectionUtils.CreateCustomAttribute(typeof(MyCustomAttribute), "Rick");
+			Assert.IsNotNull(builder);
+
+			builder = ReflectionUtils.CreateCustomAttribute(typeof(MyCustomAttribute), "Rick");
+			Assert.IsNotNull(builder);
+
+			builder = ReflectionUtils.CreateCustomAttribute(new MyCustomAttribute("Rick"));
+			Assert.IsNotNull(builder);
+
+			builder = ReflectionUtils.CreateCustomAttribute(typeof(MyCustomAttribute), new MyCustomAttribute("Rick"));
+			Assert.IsNotNull(builder);
+
+			builder = ReflectionUtils.CreateCustomAttribute(typeof(MyCustomAttribute), new object[] {"Rick"}, new MyCustomAttribute("Evans"));
+			Assert.IsNotNull(builder);
+
+			// TODO : actually emit the attribute and check it...
+		}
+#if NET_2_0
+        [Test]
+        public void CreatCustomAttriubtesFromCustomAttributeData()
+        {
+            Type control = typeof (Control);
+            MethodInfo mi = control.GetMethod("get_Font");
+            System.Collections.Generic.IList<CustomAttributeData> attributes = CustomAttributeData.GetCustomAttributes(mi.ReturnParameter);
+            CustomAttributeBuilder builder = null;
+            foreach (CustomAttributeData customAttributeData in attributes)
+            {
+                builder = ReflectionUtils.CreateCustomAttribute(customAttributeData);
+                Assert.IsNotNull(builder);
+            }           
+
+        }
+#endif
+		[Test]
+		public void CreateCustomAttributeUsingDefaultValuesForTheConstructor()
+		{
+			CustomAttributeBuilder builder = null;
+			builder = ReflectionUtils.CreateCustomAttribute(typeof(AnotherCustomAttribute));
+			Assert.IsNotNull(builder);
+
+			AnotherCustomAttribute att
+				= (AnotherCustomAttribute) CheckForPresenceOfCustomAttribute(builder, typeof(AnotherCustomAttribute));
+			Assert.IsNull(att.Name);
+			Assert.AreEqual(0, att.Age);
+			Assert.IsFalse(att.HasSwallowedExplosives);
+		}
+
+		[Test]
+		public void CreateCustomAttributeFromSourceAttribute()
+		{
+			CustomAttributeBuilder builder = null;
+			AnotherCustomAttribute source = new AnotherCustomAttribute("Rick", 30, true);
+			builder = ReflectionUtils.CreateCustomAttribute(source);
+			Assert.IsNotNull(builder);
+
+			AnotherCustomAttribute att
+				= (AnotherCustomAttribute) CheckForPresenceOfCustomAttribute(builder, typeof(AnotherCustomAttribute));
+			Assert.AreEqual(source.Name, att.Name);
+			Assert.AreEqual(source.Age, att.Age);
+			Assert.AreEqual(source.HasSwallowedExplosives, att.HasSwallowedExplosives);
+		}
+
+		[Test]
+		public void CreateCustomAttributeUsingExplicitValuesForTheConstructor()
+		{
+			CustomAttributeBuilder builder = null;
+			const string expectedName = "Rick";
+			const int expectedAge = 30;
+			builder = ReflectionUtils.CreateCustomAttribute(typeof (AnotherCustomAttribute), new object[]
+				{
+					expectedName, expectedAge, true
+				});
+			Assert.IsNotNull(builder);
+
+			AnotherCustomAttribute att
+				= (AnotherCustomAttribute) CheckForPresenceOfCustomAttribute(builder, typeof (AnotherCustomAttribute));
+			Assert.AreEqual(expectedName, att.Name);
+			Assert.AreEqual(expectedAge, att.Age);
+			Assert.IsTrue(att.HasSwallowedExplosives);
+		}
+
+		[Test]
+		public void CreateCustomAttributeUsingExplicitValuesForTheConstructorAndASourceAttribute()
+		{
+			CustomAttributeBuilder builder = null;
+			const string expectedName = "Rick";
+			const int expectedAge = 30;
+			AnotherCustomAttribute source = new AnotherCustomAttribute(expectedName, expectedAge, false);
+			builder = ReflectionUtils.CreateCustomAttribute(typeof (AnotherCustomAttribute), new object[]
+				{
+					"Hoop", 2, true
+				}, source);
+			Assert.IsNotNull(builder);
+
+			AnotherCustomAttribute att
+				= (AnotherCustomAttribute) CheckForPresenceOfCustomAttribute(builder, typeof (AnotherCustomAttribute));
+			Assert.AreEqual(expectedName, att.Name);
+			Assert.AreEqual(expectedAge, att.Age);
+			Assert.IsFalse(att.HasSwallowedExplosives);
+		}
+
+		[Test]
+		public void HasAtLeastOneMethodWithName()
+		{
+			Type testType = typeof (ExtendedReflectionUtilsObject);
+			// declared method...
+			Assert.IsTrue(ReflectionUtils.HasAtLeastOneMethodWithName(testType, "Declared"));
+			// case insensitive method...
+			Assert.IsTrue(ReflectionUtils.HasAtLeastOneMethodWithName(testType, "deCLAReD"));
+			// superclass method...
+			Assert.IsTrue(ReflectionUtils.HasAtLeastOneMethodWithName(testType, "Spanglish"));
+			// static method...
+			Assert.IsTrue(ReflectionUtils.HasAtLeastOneMethodWithName(testType, "Static"));
+			// protected method...
+			Assert.IsTrue(ReflectionUtils.HasAtLeastOneMethodWithName(testType, "Protected"));
+			// non existent method...
+			Assert.IsFalse(ReflectionUtils.HasAtLeastOneMethodWithName(testType, "Sponglish"));
+			// null type...
+			Assert.IsFalse(ReflectionUtils.HasAtLeastOneMethodWithName(null, "Spanglish"));
+			// null method name...
+			Assert.IsFalse(ReflectionUtils.HasAtLeastOneMethodWithName(testType, null));
+			// empty method name...
+			Assert.IsFalse(ReflectionUtils.HasAtLeastOneMethodWithName(testType, ""));
+			// all nulls...
+			Assert.IsFalse(ReflectionUtils.HasAtLeastOneMethodWithName(null, null));
+		}
+
+		[Test]
+		[ExpectedException(typeof(NullReferenceException))]
+		public void GetTypeOfOrTypeWithNull()
+		{
+			ReflectionUtils.TypeOfOrType(null);
+		}
+
+		[Test]
+		public void GetTypeOfOrType()
+		{
+			Assert.AreEqual(typeof(string), ReflectionUtils.TypeOfOrType(typeof(string)));
+		}
+
+		[Test]
+		public void GetTypeOfOrTypeWithNonNullType()
+		{
+			Assert.AreEqual(typeof(string), ReflectionUtils.TypeOfOrType(string.Empty));
+		}
+
+		[Test]
+		public void GetTypes()
+		{
+			Type[] actual = ReflectionUtils.GetTypes(
+				new object[] {1, "I've never been to Taco Bell (sighs).", new ReflectionUtilsObject()});
+			Type[] expected = new Type[]
+				{
+					typeof (int),
+					typeof (string),
+					typeof (ReflectionUtilsObject),
+			};
+			Assert.IsTrue(ArrayUtils.AreEqual(expected, actual), "The ReflectionUtils.GetTypes method did not return a correct Type [] array. Yep, that's as helpful as it gets.");
+		}
+
+		[Test]
+		public void GetTypesWithEmptyArrayArgument()
+		{
+			Type[] actual = ReflectionUtils.GetTypes(new object[] {});
+			Assert.IsNotNull(actual, "The ReflectionUtils.GetTypes method returned null when given an empty array. Must return an empty Type [] array.");
+			Assert.IsTrue(actual.Length == 0, "The ReflectionUtils.GetTypes method returned a Type [] that had some elements in it when given an empty array. Must return an empty Type [] array.");
+		}
+
+		[Test]
+		public void GetTypesWithNullArrayArgument()
+		{
+			Type[] actual = ReflectionUtils.GetTypes(null);
+			Assert.IsNotNull(actual, "The ReflectionUtils.GetTypes method returned null when given null. Must return an empty Type [] array.");
+			Assert.IsTrue(actual.Length == 0, "The ReflectionUtils.GetTypes method returned a Type [] that had some elements in it when given null. Must return an empty Type [] array.");
+		}
+
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void GetDefaultValueWithZeroValueEnumType()
+		{
+			ReflectionUtils.GetDefaultValue(typeof(EnumWithNoValues));
+		}
+
+		[Test]
+		public void GetParameterTypesWithMethodThatHasRefParameters()
+		{
+			MethodInfo method = GetType().GetMethod("Add");
+			Type[] types = ReflectionUtils.GetParameterTypes(method);
+			Assert.IsNotNull(types);
+			Assert.AreEqual(2, types.Length);
+			// first method parameter is byRef, so type name must end in '&'
+			Assert.AreEqual("System.Int32&", types[0].FullName);
+			Assert.AreEqual("System.Int32", types[1].FullName);
+        }
+
+        [Test]
+        public void GetMethodByArgumentValuesResolvesToExactMatchIfAvailable()
+        {
+            GetMethodByArgumentValuesTarget.DummyArgumentType[] typedArg = new GetMethodByArgumentValuesTarget.DummyArgumentType[] {};
+            GetMethodByArgumentValuesTarget foo = new GetMethodByArgumentValuesTarget(1, typedArg );
+
+            Type type = typeof(GetMethodByArgumentValuesTarget);
+            MethodInfo[] candidateMethods = new MethodInfo[]
+                {
+                    type.GetMethod("MethodWithSimilarArguments", new Type[] {typeof(int), typeof(ICollection)})
+                    , type.GetMethod("MethodWithSimilarArguments", new Type[] {typeof(int), typeof(GetMethodByArgumentValuesTarget.DummyArgumentType[])})
+                    , type.GetMethod("MethodWithSimilarArguments", new Type[] {typeof(int), typeof(object[])})
+                };
+
+            // ensure noone changed our test class
+            Assert.IsNotNull(candidateMethods[0]);
+            Assert.IsNotNull(candidateMethods[1]);
+            Assert.IsNotNull(candidateMethods[2]);
+            Assert.AreEqual("ParamArrayMatch", foo.MethodWithSimilarArguments(1, new object()));
+            Assert.AreEqual("ExactMatch", foo.MethodWithSimilarArguments(1, (GetMethodByArgumentValuesTarget.DummyArgumentType[])typedArg));
+            Assert.AreEqual("AssignableMatch", foo.MethodWithSimilarArguments(1, (ICollection)typedArg));
+
+            MethodInfo resolvedMethod = ReflectionUtils.GetMethodByArgumentValues(candidateMethods, new object[] { 1, typedArg });
+            Assert.AreSame(candidateMethods[1], resolvedMethod);
+        }
+
+        [Test]
+        public void GetConstructorByArgumentValuesResolvesToExactMatchIfAvailable()
+        {
+            GetMethodByArgumentValuesTarget.DummyArgumentType[] typedArg = new GetMethodByArgumentValuesTarget.DummyArgumentType[] { };
+            Type type = typeof(GetMethodByArgumentValuesTarget);
+            ConstructorInfo[] candidateConstructors = new ConstructorInfo[]
+                {
+                    type.GetConstructor(new Type[] {typeof(int), typeof(ICollection)})
+                    , type.GetConstructor(new Type[] {typeof(int), typeof(GetMethodByArgumentValuesTarget.DummyArgumentType[])})
+                    , type.GetConstructor(new Type[] {typeof(int), typeof(object[])})
+                };
+
+            // ensure noone changed our test class
+            Assert.IsNotNull(candidateConstructors[0]);
+            Assert.IsNotNull(candidateConstructors[1]);
+            Assert.IsNotNull(candidateConstructors[2]);
+            Assert.AreEqual("ParamArrayMatch", new GetMethodByArgumentValuesTarget(1, new object()).SelectedConstructor);
+            Assert.AreEqual("ExactMatch", new GetMethodByArgumentValuesTarget(1, (GetMethodByArgumentValuesTarget.DummyArgumentType[])typedArg).SelectedConstructor);
+            Assert.AreEqual("AssignableMatch", new GetMethodByArgumentValuesTarget(1, (ICollection)typedArg).SelectedConstructor);
+
+            ConstructorInfo resolvedConstructor = ReflectionUtils.GetConstructorByArgumentValues(candidateConstructors, new object[] { 1, typedArg });
+            Assert.AreSame(candidateConstructors[1], resolvedConstructor);
+        }
+
+        #region GetInterfaces
+
+        [Test]
+        public void GetInterfaces()
+        {
+            Assert.AreEqual(
+                typeof(TestObject).GetInterfaces().Length,
+                ReflectionUtils.GetInterfaces(typeof(TestObject)).Length);
+
+            Assert.AreEqual(1, ReflectionUtils.GetInterfaces(typeof(IInterface1)).Length);
+            Assert.AreEqual(4, ReflectionUtils.GetInterfaces(typeof(IInterface2)).Length);
+        }
+
+        public interface IInterface1
+        {
+        }
+
+        public interface IInterface2 : IInterface3
+        {
+        }
+
+        public interface IInterface3 : IInterface4, IInterface5
+        {
+        }
+
+        public interface IInterface4
+        {
+        }
+
+        public interface IInterface5
+        {
+        }
+
+        #endregion
+
+        #region IsTypeVisible Tests
+
+        [Test]
+        public void IsTypeVisibleWithInternalType()
+        {
+            Type type = typeof(InternalType);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type));
+        }
+
+        [Test]
+        public void IsTypeVisibleWithPublicNestedTypeOnInternalType()
+        {
+            Type type = typeof(InternalType.PublicNestedType);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type));
+        }
+
+        [Test]
+        public void IsTypeVisibleWithInternalNestedTypeOnInternalType()
+        {
+            Type type = typeof(InternalType.InternalNestedType);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type));
+        }
+
+        [Test]
+        public void IsTypeVisibleWithProtectedInternalNestedTypeOnInternalType()
+        {
+            Type type = typeof(InternalType.ProtectedInternalNestedType);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type));
+        }
+
+        [Test]
+        public void IsTypeVisibleWithProtectedNestedTypeOnInternalType()
+        {
+            Type type = typeof(InternalType).GetNestedType("ProtectedNestedType", BindingFlags.NonPublic);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type));
+        }
+
+        [Test]
+        public void IsTypeVisibleWithPrivateNestedTypeOnInternalType()
+        {
+            Type type = typeof(InternalType).GetNestedType("PrivateNestedType", BindingFlags.NonPublic);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type));
+        }
+
+        [Test]
+        public void IsTypeVisibleWithPublicType()
+        {
+            Type type = typeof(PublicType);
+            Assert.IsTrue(ReflectionUtils.IsTypeVisible(type));
+        }
+
+        [Test]
+        public void IsTypeVisibleWithPublicNestedTypeOnPublicType()
+        {
+            Type type = typeof(PublicType.PublicNestedType);
+            Assert.IsTrue(ReflectionUtils.IsTypeVisible(type));
+        }
+
+        [Test]
+        public void IsTypeVisibleWithInternalNestedTypeOnPublicType()
+        {
+            Type type = typeof(PublicType.InternalNestedType);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type));
+        }
+
+        [Test]
+        public void IsTypeVisibleWithProtectedInternalNestedTypeOnPublicType()
+        {
+            Type type = typeof(PublicType.ProtectedInternalNestedType);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type));
+        }
+
+        [Test]
+        public void IsTypeVisibleWithProtectedNestedTypeOnPublicType()
+        {
+            Type type = typeof(PublicType).GetNestedType("ProtectedNestedType", BindingFlags.NonPublic);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type));
+        }
+
+        [Test]
+        public void IsTypeVisibleWithPrivateNestedTypeOnPublicType()
+        {
+            Type type = typeof(PublicType).GetNestedType("PrivateNestedType", BindingFlags.NonPublic);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type));
+        }
+
+#if NET_2_0
+        private static readonly string FRIENDLY_ASSEMBLY_NAME = "ReflectionUtils.IsTypeVisible.AssemblyTestName, PublicKey=001200000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293";
+
+        [Test]
+        public void IsTypeVisibleFromFriendlyAssemblyWithInternalType()
+        {
+            Type type = typeof(InternalType);
+            Assert.IsTrue(ReflectionUtils.IsTypeVisible(type, FRIENDLY_ASSEMBLY_NAME));
+        }
+
+        [Test]
+        public void IsTypeVisibleFromFriendlyAssemblyWithPublicNestedTypeOnInternalType()
+        {
+            Type type = typeof(InternalType.PublicNestedType);
+            Assert.IsTrue(ReflectionUtils.IsTypeVisible(type, FRIENDLY_ASSEMBLY_NAME));
+        }
+
+        [Test]
+        public void IsTypeVisibleFromFriendlyAssemblyWithInternalNestedTypeOnInternalType()
+        {
+            Type type = typeof(InternalType.InternalNestedType);
+            Assert.IsTrue(ReflectionUtils.IsTypeVisible(type, FRIENDLY_ASSEMBLY_NAME));
+        }
+
+        [Test]
+        public void IsTypeVisibleFromFriendlyAssemblyWithProtectedInternalNestedTypeOnInternalType()
+        {
+            Type type = typeof(InternalType.ProtectedInternalNestedType);
+            Assert.IsTrue(ReflectionUtils.IsTypeVisible(type, FRIENDLY_ASSEMBLY_NAME));
+        }
+
+        [Test]
+        public void IsTypeVisibleFromFriendlyAssemblyWithProtectedNestedTypeOnInternalType()
+        {
+            Type type = typeof(InternalType).GetNestedType("ProtectedNestedType", BindingFlags.NonPublic);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type, FRIENDLY_ASSEMBLY_NAME));
+        }
+
+        [Test]
+        public void IsTypeVisibleFromFriendlyAssemblyWithPrivateNestedTypeOnInternalType()
+        {
+            Type type = typeof(InternalType).GetNestedType("PrivateNestedType", BindingFlags.NonPublic);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type, FRIENDLY_ASSEMBLY_NAME));
+        }
+
+        [Test]
+        public void IsTypeVisibleFromFriendlyAssemblyWithPublicType()
+        {
+            Type type = typeof(PublicType);
+            Assert.IsTrue(ReflectionUtils.IsTypeVisible(type, FRIENDLY_ASSEMBLY_NAME));
+        }
+
+        [Test]
+        public void IsTypeVisibleFromFriendlyAssemblyWithPublicNestedTypeOnPublicType()
+        {
+            Type type = typeof(PublicType.PublicNestedType);
+            Assert.IsTrue(ReflectionUtils.IsTypeVisible(type, FRIENDLY_ASSEMBLY_NAME));
+        }
+
+        [Test]
+        public void IsTypeVisibleFromFriendlyAssemblyWithInternalNestedTypeOnPublicType()
+        {
+            Type type = typeof(PublicType.InternalNestedType);
+            Assert.IsTrue(ReflectionUtils.IsTypeVisible(type, FRIENDLY_ASSEMBLY_NAME));
+        }
+
+        [Test]
+        public void IsTypeVisibleFromFriendlyAssemblyWithProtectedInternalNestedTypeOnPublicType()
+        {
+            Type type = typeof(PublicType.ProtectedInternalNestedType);
+            Assert.IsTrue(ReflectionUtils.IsTypeVisible(type, FRIENDLY_ASSEMBLY_NAME));
+        }
+
+        [Test]
+        public void IsTypeVisibleFromFriendlyAssemblyWithProtectedNestedTypeOnPublicType()
+        {
+            Type type = typeof(PublicType).GetNestedType("ProtectedNestedType", BindingFlags.NonPublic);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type, FRIENDLY_ASSEMBLY_NAME));
+        }
+
+        [Test]
+        public void IsTypeVisibleFromFriendlyAssemblyWithPrivateNestedTypeOnPublicType()
+        {
+            Type type = typeof(PublicType).GetNestedType("PrivateNestedType", BindingFlags.NonPublic);
+            Assert.IsFalse(ReflectionUtils.IsTypeVisible(type, FRIENDLY_ASSEMBLY_NAME));
+        }
+#endif
+
+        #endregion
+
+        #region GetExplicitBaseException
+
+        [Test]
+        public void GetExplicitBaseExceptionWithNoInnerException()
+        {
+            Exception appEx = new ApplicationException();
+            Exception ex = ReflectionUtils.GetExplicitBaseException(appEx);
+
+            Assert.AreEqual(ex, appEx);
+        }
+
+        [Test]
+        public void GetExplicitBaseExceptionWithInnerException()
+        {
+            Exception dbzEx = new DivideByZeroException();
+            Exception appEx = new ApplicationException("Test message", dbzEx);
+            Exception ex = ReflectionUtils.GetExplicitBaseException(appEx);
+
+            Assert.AreEqual(ex, dbzEx);
+        }
+
+        [Test]
+        public void GetExplicitBaseExceptionWithInnerExceptions()
+        {
+            Exception dbzEx = new DivideByZeroException();
+            Exception sEx = new SystemException("Test message", dbzEx);
+            Exception appEx = new ApplicationException("Test message", sEx);
+            Exception ex = ReflectionUtils.GetExplicitBaseException(appEx);
+
+            Assert.AreEqual(ex, dbzEx);
+        }
+
+        [Test]
+        public void GetExplicitBaseExceptionWithNullReferenceExceptionAsRootException()
+        {
+            Exception nrEx = new NullReferenceException();
+            Exception appEx = new ApplicationException("Test message", nrEx);
+            Exception ex = ReflectionUtils.GetExplicitBaseException(appEx);
+
+            Assert.AreEqual(ex, appEx);
+        }
+
+        #endregion
+
+        #region Helper Methods
+
+        public int Add(ref int one, int two)
+        {
+            return one + two;
+        }
+
+		private Attribute CheckForPresenceOfCustomAttribute(
+			CustomAttributeBuilder attBuilder, Type attType)
+		{
+			Attribute[] atts = ApplyAndGetCustomAttributes(attBuilder);
+			Assert.IsNotNull(atts);
+			Assert.IsTrue(atts.Length == 1);
+			Attribute att = atts[0];
+			Assert.IsNotNull(att);
+			Assert.AreEqual(attType, att.GetType(), "Wrong Attribute applied to the class.");
+			return att;
+		}
+
+		private static Attribute[] ApplyAndGetCustomAttributes(CustomAttributeBuilder attBuilder) 
+		{
+			Type type = BuildTypeWithThisCustomAttribute(attBuilder);
+			object[] attributes = type.GetCustomAttributes(true);
+			return (Attribute[]) ArrayList.Adapter(attributes).ToArray(typeof(Attribute));
+		}
+
+		private static Type BuildTypeWithThisCustomAttribute(CustomAttributeBuilder attBuilder)
+		{
+			AssemblyName assemblyName = new AssemblyName();
+			assemblyName.Name = "AnAssembly";
+			AssemblyBuilder asmBuilder = Thread.GetDomain().DefineDynamicAssembly(
+				assemblyName, AssemblyBuilderAccess.Run);
+			ModuleBuilder modBuilder = asmBuilder.DefineDynamicModule("AModule");
+			TypeBuilder classBuilder = modBuilder.DefineType("AClass", TypeAttributes.Public);
+			classBuilder.SetCustomAttribute(attBuilder);
+			return classBuilder.CreateType();
+		}
+
+		#endregion
+	}
+
+	#region Simple Helper Classes
+
+    public class PublicType
+    {
+        public class PublicNestedType
+        {
+        }
+
+        internal class InternalNestedType
+        {
+        }
+
+        protected internal class ProtectedInternalNestedType
+        {
+        }
+
+        protected class ProtectedNestedType
+        {
+        }
+
+        private class PrivateNestedType
+        {
+        }
+    }
+
+    internal class InternalType
+    {
+        public class PublicNestedType
+        {
+        }
+
+        internal class InternalNestedType
+        {
+        }
+
+        protected internal class ProtectedInternalNestedType
+        {
+        }
+
+        protected class ProtectedNestedType
+        {
+        }
+
+        private class PrivateNestedType
+        {
+        }
+    }
+
+    internal enum EnumWithNoValues {}
+
+	internal enum Cuts
+	{
+		Superficial,
+		Deep,
+		Severing
+	}
+
+    internal interface IBar : IFoo
+    {
+    }
+
+	internal interface IFoo
+	{
+		bool Spanglish(string foo, object[] args);
+	}
+
+	internal sealed class ExplicitFoo : IFoo
+	{
+		bool IFoo.Spanglish(string foo, object[] args)
+		{
+			return false;
+		}
+	}
+
+	internal class ReflectionUtilsObject : IComparable
+	{
+		public bool Spanglish(string foo, object[] args)
+		{
+			return false;
+		}
+
+		public bool BadSpanglish(string foo)
+		{
+			return false;
+		}
+
+		public bool WickedSpanglish(string foo, string bar)
+		{
+			return false;
+		}
+
+		/// <summary>
+		/// Explicit interface implementation for ReflectionUtils.GetMethod tests
+		/// </summary>
+		/// <param name="obj"></param>
+		/// <returns></returns>
+		int IComparable.CompareTo(object obj)
+		{
+			return 0;
+		}
+	}
+
+	internal sealed class ExtendedReflectionUtilsObject : ReflectionUtilsObject
+	{
+		public void Declared(string name)
+		{
+		}
+
+		public void Protected()
+		{
+		}
+
+		public static void Static()
+		{
+		}
+	}
+
+	/// <summary>
+	/// Exposes methods with the same names as the ReflectionUtilsObject, used in
+	/// the tests for the GetMatchingMethods method.
+	/// </summary>
+	internal class ReflectionUtilsObjectClone
+	{
+		public bool Spanglish(string foo, object[] args)
+		{
+			return false;
+		}
+
+		public bool BadSpanglish(string foo)
+		{
+			return false;
+		}
+
+		public bool WickedSpanglish(string foo, string bar)
+		{
+			return false;
+		}
+
+        protected void Bingo()
+        {
+        }
+	}
+
+    /// <summary>
+    /// Exposes methods with the same names as the ReflectionUtilsObject, used in
+    /// the tests for the GetMatchingMethods method.
+    /// </summary>
+    internal class ReflectionUtilsObjectBadClone
+    {
+        public bool Spanglish(string foo, object[] args)
+        {
+            return false;
+        }
+
+        public string BadSpanglish(string foo)
+        {
+            return foo;
+        }
+
+        public bool WickedSpanglish(string foo, string bar)
+        {
+            return false;
+        }
+    }
+
+    internal class GetMethodByArgumentValuesTarget
+    {
+        public class DummyArgumentType {}
+
+        public string SelectedConstructor;
+
+        public GetMethodByArgumentValuesTarget(int flag, params object[] values)
+        {
+            SelectedConstructor = "ParamArrayMatch";
+        }
+
+        public GetMethodByArgumentValuesTarget(int flag, DummyArgumentType[] bars)
+        {
+            SelectedConstructor = "ExactMatch";
+        }
+
+        public GetMethodByArgumentValuesTarget(int flag, ICollection bars)
+        {
+            SelectedConstructor = "AssignableMatch";
+        }
+
+        public string MethodWithSimilarArguments(int flags, params object[] args)
+        {
+            return "ParamArrayMatch";
+        }
+
+        public string MethodWithSimilarArguments(int flags, DummyArgumentType[] bars)
+        {
+            return "ExactMatch";
+        }
+
+        public string MethodWithSimilarArguments(int flags, ICollection bar)
+        {
+            return "AssignableMatch";
+        }
+    }
+
+	public sealed class MyCustomAttribute : Attribute
+	{
+		public MyCustomAttribute()
+		{
+		}
+
+		public MyCustomAttribute(string name)
+		{
+			_name = name;
+		}
+
+		public string Name
+		{
+			get { return _name; }
+		}
+
+		private string _name;
+	}
+
+	/// <summary>
+	/// Used for testing that default values are supplied for the ctor args.
+	/// </summary>
+	public sealed class AnotherCustomAttribute : Attribute
+	{
+		public AnotherCustomAttribute(string name, int age, bool hasSwallowedExplosives)
+		{
+			_name = name;
+			_age = age;
+			_hasSwallowedExplosives = hasSwallowedExplosives;
+		}
+
+		public string Name
+		{
+			get { return _name; }
+			set { _name = value; }
+		}
+
+		public int Age
+		{
+			get { return _age; }
+			set { _age = value; }
+		}
+
+		public bool HasSwallowedExplosives
+		{
+			get { return _hasSwallowedExplosives; }
+			set { _hasSwallowedExplosives = value; }
+		}
+
+		private string _name;
+		private int _age;
+		private bool _hasSwallowedExplosives;
+	}
+
+    public sealed class ObjectWithNonDefaultIndexerName
+    {
+        private string[] favoriteQuotes = new string[10];
+
+        [IndexerName("MyItem")]       
+        public string this[int index]
+        {
+            get
+            {
+                if (index < 0 || index >= favoriteQuotes.Length)
+                {
+                    throw new ArgumentException("Index out of range");
+                }
+                return favoriteQuotes[index];
+            }
+            
+            set
+            {
+                if (index < 0 || index >= favoriteQuotes.Length)
+                {
+                    throw new ArgumentException("index is out of range.");
+                }
+                favoriteQuotes[index] = value;
+            }
+            
+        }
+    }
+	#endregion
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Util/SerializationTestUtils.cs b/test/Spring/Spring.Core.Tests/Util/SerializationTestUtils.cs
new file mode 100644
index 00000000..1b7ae0cf
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/SerializationTestUtils.cs
@@ -0,0 +1,112 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using NUnit.Framework;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Utilities for testing serializability of objects.
+	/// </summary>
+	/// <remarks>
+	/// Exposes static methods for use in other test cases.
+	/// </remarks>
+	/// <author>Rod Johnson</author>
+	/// <author>Simon White (.NET)</author>
+	[TestFixture]
+	public sealed class SerializationTestUtils
+	{
+		[Test]
+		[ExpectedException(typeof (SerializationException))]
+		public void WithNonSerializableObject()
+		{
+			TestObject o = new TestObject();
+			Assert.IsFalse(o is ISerializable);
+			Assert.IsFalse(IsSerializable(o));
+			TrySerialization(o);
+		}
+
+		[Test]
+		public void WithSerializableObject()
+		{
+			IPerson p = new SerializablePerson();
+			p.Age = 12;
+			Assert.IsTrue(p is ISerializable);
+			TrySerialization(p);
+			Assert.IsTrue(IsSerializable(p));
+			IPerson p2 = (IPerson) SerializeAndDeserialize(p);
+			Assert.IsTrue(p != p2);
+			Assert.AreEqual(12, p2.Age);
+		}
+
+		/// <summary>
+		/// Attempts to serialize the specified object to an in-memory stream.
+		/// </summary>
+		/// <param name="o">the object to serialize</param>
+		public static void TrySerialization(object o)
+		{
+			using (Stream stream = new MemoryStream())
+			{
+				BinaryFormatter bformatter = new BinaryFormatter();
+				bformatter.Serialize(stream, o);
+			}
+		}
+
+		/// <summary>
+		/// Tests whether the specified object is serializable.
+		/// </summary>
+		/// <param name="o">the object to test.</param>
+		/// <returns>true if the object is serializable, otherwise false.</returns>
+		public static bool IsSerializable(object o)
+		{
+			return o == null ? true : o.GetType().IsSerializable;
+		}
+
+		/// <summary>
+		/// Serializes the specified object to an in-memory stream, and returns
+		/// the result of deserializing the object stream.
+		/// </summary>
+		/// <param name="o">the object to use.</param>
+		/// <returns>the deserialized object.</returns>
+		public static object SerializeAndDeserialize(object o)
+		{
+			using (Stream stream = new MemoryStream())
+			{
+				BinaryFormatter bformatter = new BinaryFormatter();
+				bformatter.Serialize(stream, o);
+				stream.Flush();
+
+				stream.Seek(0, SeekOrigin.Begin);
+				object o2 = bformatter.Deserialize(stream);
+				return o2;
+			}
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Util/StringUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/StringUtilsTests.cs
new file mode 100644
index 00000000..10b75894
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/StringUtilsTests.cs
@@ -0,0 +1,435 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Util
+{
+	/// <summary>
+	/// Unit tests for the StringUtils class.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+	/// <author>Rick Evans</author>
+	/// <author>Griffin Caprio</author>
+	/// <version>$Id: StringUtilsTests.cs,v 1.3 2006/04/09 07:24:51 markpollack Exp $</version>
+	[TestFixture]
+	public sealed class StringUtilsTests
+	{
+		[Test]
+		public void SplitTests()
+		{
+			string testString = " a,b,,  c  ,d\n:e  ";
+			string delim = ",\n";
+			string[] res;
+			string[] res1 = new string[] {" a", "b", "", "  c  ", "d", ":e  "};
+			string[] res2 = new string[] {" a", "b", "  c  ", "d", ":e  "};
+			string[] res3 = new string[] {"a", "b", "", "c", "d", ":e"};
+			string[] res4 = new string[] {"a", "b", "c", "d", ":e"};
+
+			Assert.AreEqual(0, StringUtils.Split(null, null, false, false).Length);
+			Assert.AreEqual(testString, StringUtils.Split(testString, null, false, false)[0]);
+			Assert.IsTrue(ArrayUtils.AreEqual(res1, res = StringUtils.Split(testString, delim, false, false)), "Received '" + String.Join(",", res) + "'");
+			Assert.IsTrue(ArrayUtils.AreEqual(res2, res = StringUtils.Split(testString, delim, false, true)), "Received '" + String.Join(",", res) + "'");
+			Assert.IsTrue(ArrayUtils.AreEqual(res3, res = StringUtils.Split(testString, delim, true, false)), "Received '" + String.Join(",", res) + "'");
+			Assert.IsTrue(ArrayUtils.AreEqual(res4, res = StringUtils.Split(testString, delim, true, true)), "Received '" + String.Join(",", res) + "'");
+
+			Assert.IsTrue(ArrayUtils.AreEqual(new string[] {"one"}, res = StringUtils.Split("one", delim, true, true)), "Received '" + String.Join(",", res) + "'");
+		}
+
+		[Test]
+		public void HasLengthTests()
+		{
+			Assert.IsFalse(StringUtils.HasLength(null));
+			Assert.IsFalse(StringUtils.HasLength(""));
+			Assert.IsTrue(StringUtils.HasLength(" "));
+			Assert.IsTrue(StringUtils.HasLength("Hello"));
+		}
+
+		[Test]
+		public void HasTextTests()
+		{
+			Assert.IsFalse(StringUtils.HasText(null));
+			Assert.IsFalse(StringUtils.HasText(""));
+			Assert.IsFalse(StringUtils.HasText(" "));
+			Assert.IsTrue(StringUtils.HasText("12345"));
+			Assert.IsTrue(StringUtils.HasText("  12345  "));
+		}
+
+		[Test]
+		public void IsNullOrEmptyTests()
+		{
+			Assert.IsTrue(StringUtils.IsNullOrEmpty(null));
+			Assert.IsTrue(StringUtils.IsNullOrEmpty(""));
+			Assert.IsTrue(StringUtils.IsNullOrEmpty(" "));
+			Assert.IsFalse(StringUtils.IsNullOrEmpty("12345"));
+			Assert.IsFalse(StringUtils.IsNullOrEmpty("  12345  "));
+		}
+
+		[Test]
+		public void CollectionToDelimitedString()
+		{
+			Foo[] arr = new Foo[] {new Foo("Foo"), new Foo("Bar")};
+			Assert.AreEqual(
+				":Foo,:Bar", StringUtils.CollectionToCommaDelimitedString(arr));
+
+			Assert.AreEqual("null", StringUtils.CollectionToCommaDelimitedString(null));
+		}
+
+		[Test]
+		public void ArrayToDelimitedString()
+		{
+			Foo[] arr = new Foo[] {new Foo("Foo"), new Foo("Bar")};
+			Assert.AreEqual(
+				":Foo,:Bar", StringUtils.ArrayToCommaDelimitedString(arr));
+			Assert.AreEqual("null", StringUtils.ArrayToCommaDelimitedString(null));
+		}
+
+		[Test]
+		public void DelimitedListToStringArray()
+		{
+			string[] expected = new string[] {"Foo", "", "Bar"};
+			string input = "Foo,,Bar";
+			string[] actual = StringUtils.DelimitedListToStringArray(input, ",");
+			Assert.IsNotNull(actual);
+			Assert.AreEqual(expected.Length, actual.Length);
+			for (int i = 0; i < actual.Length; ++i)
+			{
+				Assert.AreEqual(expected[i], actual[i]);
+			}
+		}
+
+		[Test]
+		public void DelimitedListToStringArrayWithEmptyStringDelimiter()
+		{
+			string input = "Foo,,Bar";
+			string[] expected = new string[] {input};
+			string[] actual = StringUtils.DelimitedListToStringArray(input, string.Empty);
+			Assert.IsNotNull(actual);
+			Assert.AreEqual(expected.Length, actual.Length);
+			for (int i = 0; i < actual.Length; ++i)
+			{
+				Assert.AreEqual(expected[i], actual[i]);
+			}
+		}
+
+		[Test]
+		public void DelimitedListToStringArrayWithGuff()
+		{
+			string[] expected = new string[] {};
+			string[] actual = StringUtils.DelimitedListToStringArray(null, null);
+			Assert.IsNotNull(actual);
+			Assert.AreEqual(expected.Length, actual.Length);
+
+			string aString = "HungerHurtsButStarvingWorks...";
+			expected = new string[] {aString};
+			actual = StringUtils.DelimitedListToStringArray(aString, null);
+			Assert.IsNotNull(actual);
+			Assert.AreEqual(expected.Length, actual.Length);
+			Assert.AreEqual(aString, actual[0]);
+		}
+
+		[Test]
+		public void StripFirstAndLastCharacterWithNull()
+		{
+			string actual = StringUtils.StripFirstAndLastCharacter(null);
+			Assert.IsNotNull(actual, "StringUtils.StripFirstAndLastCharacter(null) should return String.Empty.");
+			Assert.AreEqual(String.Empty, actual, "StringUtils.StripFirstAndLastCharacter(null) should return String.Empty.");
+		}
+
+		[Test]
+		public void StripFirstAndLastCharacterWithEmptyString()
+		{
+			string actual = StringUtils.StripFirstAndLastCharacter(String.Empty);
+			Assert.IsNotNull(actual, "StringUtils.StripFirstAndLastCharacter(String.Empty) should return String.Empty.");
+			Assert.AreEqual(String.Empty, actual, "StringUtils.StripFirstAndLastCharacter(String.Empty) should return String.Empty.");
+		}
+
+		[Test]
+		public void StripFirstAndLastCharacterWithReallyShortStrings()
+		{
+			string actual = StringUtils.StripFirstAndLastCharacter("B");
+			Assert.IsNotNull(actual, "StringUtils.StripFirstAndLastCharacter(\"B\") should return String.Empty.");
+			Assert.AreEqual(String.Empty, actual, "StringUtils.StripFirstAndLastCharacter(\"B\") should return String.Empty.");
+
+			actual = StringUtils.StripFirstAndLastCharacter("BF");
+			Assert.IsNotNull(actual, "StringUtils.StripFirstAndLastCharacter(\"BF\") should return String.Empty.");
+			Assert.AreEqual(String.Empty, actual, "StringUtils.StripFirstAndLastCharacter(\"BF\") should return String.Empty.");
+		}
+
+		[Test]
+		public void StripFirstAndLastCharacterWorksLikeACharm()
+		{
+			string actual = StringUtils.StripFirstAndLastCharacter("There are 17 steps to winding up a bird chronicle correctly");
+			Assert.IsNotNull(actual);
+			Assert.AreEqual("here are 17 steps to winding up a bird chronicle correctl", actual);
+		}
+
+		[Test]
+		public void GetAntExpressionsWithNull()
+		{
+			IList actual = StringUtils.GetAntExpressions(null);
+			Assert.IsNotNull(actual);
+			string[] expected = new string[] {};
+			Assert.IsTrue(ArrayUtils.AreEqual(expected, (string[]) ArrayList.Adapter(actual).ToArray(typeof (string))));
+		}
+
+		[Test]
+		public void GetAntExpressionsWithEmptyString()
+		{
+			IList actual = StringUtils.GetAntExpressions(String.Empty);
+			Assert.IsNotNull(actual);
+			string[] expected = new string[] {};
+			Assert.IsTrue(ArrayUtils.AreEqual(expected, (string[]) ArrayList.Adapter(actual).ToArray(typeof (string))));
+		}
+
+		[Test]
+		public void GetAntExpressionsWithAStringThatDoesntHaveAnyExpressions()
+		{
+			IList actual = StringUtils.GetAntExpressions("I could really go a cup of tea right now... in fact I think I'll go get one.");
+			Assert.IsNotNull(actual);
+			string[] expected = new string[] {};
+			Assert.IsTrue(ArrayUtils.AreEqual(expected, (string[]) ArrayList.Adapter(actual).ToArray(typeof (string))));
+		}
+
+		[Test]
+		public void GetAntExpressionsWithAValidExpression()
+		{
+			IList actual = StringUtils.GetAntExpressions("${slurp}. Ah! That is one good cup of tea. That agent Cooper and his coffee... he sure was missing out on a good thing.");
+			CheckGetAntExpressions(actual, "slurp");
+		}
+
+		[Test]
+		public void GetAntExpressionsWithANestedExpression()
+		{
+			IList actual = StringUtils.GetAntExpressions("And yeah, I've never been a fan of the doughnut... ${blechh${shudder}}");
+			CheckGetAntExpressions(actual, "blechh${shudder");
+		}
+
+		[Test]
+		public void GetAntExpressionsWithACoupleOfDuplicatedValidExpressions()
+		{
+			IList actual = StringUtils.GetAntExpressions("${sigh}. Laura Palmer though... man, that sure was a tragedy. ${sigh}");
+			CheckGetAntExpressions(actual, "sigh");
+		}
+
+		[Test]
+		public void GetAntExpressionsWithACoupleOfUniqueValidExpressions()
+		{
+			IList actual = StringUtils.GetAntExpressions("${Mmm}. Has there been any good telly since then... ${thinks}");
+			CheckGetAntExpressions(actual, "Mmm", "thinks");
+		}
+
+		[Test]
+		public void GetAntExpressionsWithMalformedExpression()
+		{
+			IList actual = StringUtils.GetAntExpressions("Mmm... just what counts as ${a malformed{ expression?");
+			CheckGetAntExpressions(actual, new string[] {});
+		}
+
+		private static void CheckGetAntExpressions(IList actual, params string[] expected)
+		{
+			Assert.IsNotNull(actual);
+			Assert.IsTrue(ArrayUtils.AreEqual(
+				expected,
+				(string[]) ArrayList.Adapter(actual).ToArray(typeof (string))));
+		}
+
+		[Test]
+		[ExpectedException(typeof (FormatException))]
+		public void GetAntExpressionsIgnoresEmptyExpression()
+		{
+			StringUtils.GetAntExpressions("This is an empty expression ${}...");
+		}
+
+		[Test]
+		public void SetAntExpressionWithNullText()
+		{
+			string expected = String.Empty;
+			string actual = StringUtils.SetAntExpression(null, "foo", "bar");
+			Assert.IsNotNull(actual);
+			Assert.AreEqual(expected, actual);
+		}
+
+		[Test]
+		public void SetAntExpressionWithEmptyStringExpression()
+		{
+			string expected = String.Empty;
+			string actual = StringUtils.SetAntExpression("     ", "foo", "bar");
+			Assert.IsNotNull(actual);
+			Assert.AreEqual(expected, actual);
+		}
+
+		[Test]
+		public void SetAntExpressionWithMultipleEvaluations()
+		{
+			string expected = "Hey, do you want to hear the most annoying sound in the world? Mehhh! Mehhh!";
+			string actual = StringUtils.SetAntExpression("Hey, do you want to hear the most annoying sound in the world? ${foo}! ${foo}!", "foo", "Mehhh");
+			Assert.IsNotNull(actual);
+			Assert.AreEqual(expected, actual);
+		}
+
+		[Test]
+		public void SetAntExpressionWithNullReplacementValue()
+		{
+			string expected = "That John Denver... he's full of .";
+			string actual = StringUtils.SetAntExpression("That John Denver... he's full of ${bleep}.", "bleep", null);
+			Assert.IsNotNull(actual);
+			Assert.AreEqual(expected, actual);
+		}
+
+		[Test]
+		public void FullSurroundWithNulls()
+		{
+			Assert.AreEqual("Hi", StringUtils.Surround(null, "Hi", null));
+		}
+
+		[Test]
+		public void FullSurroundWithEmptyStrings()
+		{
+			Assert.AreEqual("Hi", StringUtils.Surround(string.Empty, "Hi", string.Empty));
+		}
+
+		[Test]
+		public void FullSurround()
+		{
+			Assert.AreEqual("[Hi]", StringUtils.Surround("[", "Hi", "]"));
+		}
+
+		[Test]
+		public void FullSurroundNullWithEmptyStrings()
+		{
+			Assert.AreEqual(string.Empty, StringUtils.Surround(string.Empty, null, string.Empty));
+		}
+
+		[Test]
+		public void FullSurroundEmptyStringWithEmptyStrings()
+		{
+			Assert.AreEqual(string.Empty, StringUtils.Surround(string.Empty, string.Empty, string.Empty));
+		}
+
+		[Test]
+		public void FullSurroundNullWithNulls()
+		{
+			Assert.AreEqual(string.Empty, StringUtils.Surround(null, null, null));
+		}
+
+		[Test]
+		public void SurroundWithEmptyStrings()
+		{
+			Assert.AreEqual("Hi", StringUtils.Surround(string.Empty, "Hi"));
+		}
+
+		[Test]
+		public void Surround()
+		{
+			Assert.AreEqual("-Hi-", StringUtils.Surround("-", "Hi"));
+		}
+
+		[Test]
+		public void SurroundNullWithEmptyStrings()
+		{
+			Assert.AreEqual(string.Empty, StringUtils.Surround(string.Empty, null));
+		}
+
+		[Test]
+		public void SurroundEmptyStringWithEmptyStrings()
+		{
+			Assert.AreEqual(string.Empty, StringUtils.Surround(string.Empty, string.Empty));
+		}
+
+		[Test]
+		public void SurroundNullWithNulls()
+		{
+			Assert.AreEqual(string.Empty, StringUtils.Surround(null, null));
+		}
+
+		[Test]
+		public void FullSurroundObjectWithNulls()
+		{
+			Assert.AreEqual(":Hi", StringUtils.Surround(null, new Foo("Hi"), null));
+		}
+
+		[Test]
+		public void FullSurroundObjectWithEmptyStrings()
+		{
+			Assert.AreEqual(":Hi", StringUtils.Surround(string.Empty, new Foo("Hi"), string.Empty));
+		}
+
+		[Test]
+		public void FullSurroundObject()
+		{
+			Assert.AreEqual("[:Hi]", StringUtils.Surround("[", new Foo("Hi"), "]"));
+		}
+
+		[Test]
+		public void SurroundObjectWithEmptyStrings()
+		{
+			Assert.AreEqual(":Hi", StringUtils.Surround(string.Empty, new Foo("Hi"), string.Empty));
+		}
+
+		[Test]
+		public void SurroundObject()
+		{
+			Assert.AreEqual("[:Hi]", StringUtils.Surround("[", new Foo("Hi"), "]"));
+		}
+
+		[Test]
+		public void ConvertEscapedCharactersNoEscapedCharacters()
+		{
+			string inputString = "foo bar is a funny term";
+			Assert.AreEqual(inputString, StringUtils.ConvertEscapedCharacters(inputString));
+		}
+
+		[Test]
+		public void ConvertEscapedCharactersAll()
+		{
+			string inputString = "newline\\n tab\\t return\\r";
+			Assert.AreEqual("newline\n tab\t return\r", StringUtils.ConvertEscapedCharacters(inputString));
+		}
+
+		[Test]
+		public void ConvertUnsupportedEscapedCharacters()
+		{
+			string inputString = "what is this\\g";
+			Assert.AreEqual(inputString, StringUtils.ConvertEscapedCharacters(inputString));
+		}
+
+		private sealed class Foo
+		{
+			public Foo(string bar)
+			{
+				this.bar = bar;
+			}
+
+			public override string ToString()
+			{
+				return ":" + bar;
+			}
+
+			private string bar;
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Util/SystemUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/SystemUtilsTests.cs
new file mode 100644
index 00000000..47581d52
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/SystemUtilsTests.cs
@@ -0,0 +1,80 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Threading;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// This class contains tests for SystemUtils
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: SystemUtilsTests.cs,v 1.1 2007/09/07 02:47:08 markpollack Exp $</version>
+    [TestFixture]
+    public class SystemUtilsTests
+    {
+        private static string threadName = "TestingThread";
+
+
+        [Test]
+        public void ThreadIdIsName()
+        {
+            Thread t = new Thread(new ThreadStart(AssertThreadName));
+            t.Name = threadName;
+            t.Start();
+            t.Join();
+        }
+
+
+        public void AssertThreadName()
+        {
+            Assert.AreEqual(threadName, SystemUtils.ThreadId);               
+        }
+
+        [Test]
+        public void ThreadIdIsInt()
+        {
+            Thread t = new Thread(new ThreadStart(AssertThreadIsInt));
+            t.Start();
+            t.Join();
+            
+        }
+
+        public void AssertThreadIsInt()
+        {
+            try
+            {
+                int.Parse(SystemUtils.ThreadId);
+            }
+            catch (Exception)
+            {
+                Assert.Fail("ThreadId should be an integer");
+            }
+        }
+
+        
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Util/UniqueKeyTests.cs b/test/Spring/Spring.Core.Tests/Util/UniqueKeyTests.cs
new file mode 100644
index 00000000..be6ac8fd
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Util/UniqueKeyTests.cs
@@ -0,0 +1,107 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Tests <see cref="UniqueKey"/> functionality.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: UniqueKeyTests.cs,v 1.1 2007/08/22 20:17:05 oakinger Exp $</version>
+    [TestFixture]
+    public class UniqueKeyTests
+    {
+        private class TestObject
+        {}
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void MustNotCallObjectSignatureWithType()
+        {
+            Type myType = typeof(TestObject);
+            UniqueKey.GetInstanceScopedString( (object)myType, "PartialKey");
+        }
+
+        [Test]
+        public void CreateTypeScopedKeyString()
+        {
+            string typeScopedKey = UniqueKey.GetTypeScopedString(typeof(TestObject), "PartialKey");
+            string expectedKey = string.Format("{0}.{1}", typeof(TestObject).FullName, "PartialKey");
+            Assert.AreEqual(expectedKey, typeScopedKey);
+        }
+
+        [Test]
+        public void CreateTypeScopedKey()
+        {
+            UniqueKey typeScopedKey = UniqueKey.GetTypeScoped(typeof(TestObject), "PartialKey");
+            UniqueKey expectedKey = UniqueKey.GetTypeScoped(typeof(TestObject), "PartialKey");
+
+            string expectedKeyString = string.Format("{0}.{1}", typeof(TestObject).FullName, "PartialKey");
+
+            // I know testing implementation details is not the best strategy, 
+            // but I want to receive an error if this fails (oakinger)
+            Assert.AreEqual(expectedKeyString, expectedKey.ToString());
+            Assert.AreEqual(expectedKeyString.GetHashCode(), expectedKey.GetHashCode());
+
+            // different instances...
+            Assert.AreNotSame(expectedKey, typeScopedKey);
+            // but equal
+            Assert.AreEqual(expectedKey, typeScopedKey);
+            Assert.AreEqual(expectedKey.GetHashCode(), typeScopedKey.GetHashCode());
+        }
+
+        [Test]
+        public void CreateInstanceScopedKeyString()
+        {
+            TestObject testObject = new TestObject();
+            string typeScopedKey = UniqueKey.GetInstanceScopedString(testObject, "PartialKey");
+            string expectedKey = string.Format("{0}[{1}].{2}", typeof(TestObject).FullName, testObject.GetHashCode(), "PartialKey");
+            Assert.AreEqual(expectedKey, typeScopedKey);      
+        }
+
+        [Test]
+        public void CreateInstanceScopedKey()
+        {
+            TestObject testObject = new TestObject();
+            UniqueKey instanceScopedKey = UniqueKey.GetInstanceScoped(testObject, "PartialKey");
+            UniqueKey expectedKey = UniqueKey.GetInstanceScoped(testObject, "PartialKey");
+
+            string expectedKeyString = string.Format("{0}[{1}].{2}", typeof(TestObject).FullName, testObject.GetHashCode(), "PartialKey");
+
+            // I know testing implementation details is not the best strategy, 
+            // but I want to receive an error if this fails (oakinger)
+            Assert.AreEqual(expectedKeyString, expectedKey.ToString());
+            Assert.AreEqual(expectedKeyString.GetHashCode(), expectedKey.GetHashCode());
+
+            // different instances...
+            Assert.AreNotSame(expectedKey, instanceScopedKey);
+            // but equal
+            Assert.AreEqual(expectedKey, instanceScopedKey);
+            Assert.AreEqual(expectedKey.GetHashCode(), instanceScopedKey.GetHashCode());
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Validation/Actions/ErrorMessageActionTests.cs b/test/Spring/Spring.Core.Tests/Validation/Actions/ErrorMessageActionTests.cs
new file mode 100644
index 00000000..4220f2a8
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/Actions/ErrorMessageActionTests.cs
@@ -0,0 +1,112 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 NUnit.Framework;
+
+using Spring.Context.Support;
+using Spring.Expressions;
+
+namespace Spring.Validation.Actions
+{
+    /// <summary>
+    /// Unit tests for the ErrorMessageAction class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ErrorMessageActionTests.cs,v 1.4 2008/02/05 20:40:26 aseovic Exp $</version>
+    [TestFixture]
+    public class ErrorMessageActionTests
+    {
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void WithNullMesageId()
+        {
+            new ErrorMessageAction(null, "errors");    
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void WithEmptyMesageId()
+        {
+            new ErrorMessageAction("", "errors");    
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void WithWhitespaceMesageId()
+        {
+            new ErrorMessageAction("\t   ", "errors");    
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void WithNullProviders()
+        {
+            new ErrorMessageAction("error", null);    
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void WithEmptyProviders()
+        {
+            new ErrorMessageAction("error", new string[0]);    
+        }
+
+        [Test]
+        public void WhenValid()
+        {
+            Inventor context = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            IValidationErrors errors = new ValidationErrors();
+            ErrorMessageAction action = new ErrorMessageAction("error", "errors");
+            
+            action.Execute(true, context, null, errors);
+            Assert.IsTrue(errors.IsEmpty);
+        }
+
+        [Test]
+        public void WhenInvalid()
+        {
+            Inventor context = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            IValidationErrors errors = new ValidationErrors();
+
+            ErrorMessageAction action = new ErrorMessageAction("{0}, {1}", "errors");
+            action.Parameters = new IExpression[] {Expression.Parse("Name"), Expression.Parse("Nationality")};
+            
+            action.Execute(false, context, null, errors);
+            Assert.IsFalse(errors.IsEmpty);
+            Assert.AreEqual(1, errors.GetErrors("errors").Count);
+            Assert.AreEqual(context.Name + ", " + context.Nationality, errors.GetResolvedErrors("errors", new NullMessageSource())[0]);
+        }
+
+        [Test]
+        public void WhenActionIsNotExecutedBecauseWhenExpressionReturnsFalse()
+        {
+            Inventor context = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            IValidationErrors errors = new ValidationErrors();
+
+            ErrorMessageAction action = new ErrorMessageAction("{0}, {1}", "errors");
+            action.When = Expression.Parse("false");
+            action.Execute(false, context, null, errors);
+            Assert.IsTrue(errors.IsEmpty);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Validation/Actions/ExpressionActionTests.cs b/test/Spring/Spring.Core.Tests/Validation/Actions/ExpressionActionTests.cs
new file mode 100644
index 00000000..f4462cf4
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/Actions/ExpressionActionTests.cs
@@ -0,0 +1,103 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+using NUnit.Framework;
+
+using Spring.Expressions;
+
+namespace Spring.Validation.Actions
+{
+    /// <summary>
+    /// Unit tests for the ExpressionAction class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ExpressionActionTests.cs,v 1.3 2006/04/09 07:24:52 markpollack Exp $</version>
+    [TestFixture]
+    public class ExpressionActionTests
+    {
+        [Test]
+        public void WhenValid()
+        {
+            Inventor context = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            IDictionary vars = new Hashtable();
+
+            ExpressionAction action = new ExpressionAction("#result = 'valid'", "#result = 'invalid'");
+            action.Execute(true, context, vars, null);
+            Assert.AreEqual("valid", vars["result"]);
+
+            action = new ExpressionAction(Expression.Parse("#result = Name"), Expression.Parse("#result = Nationality"));
+            action.Execute(true, context, vars, null);
+            Assert.AreEqual(context.Name, vars["result"]);
+
+            action = new ExpressionAction();
+            action.Valid = Expression.Parse("#result = DOB.Year");
+            action.Invalid = Expression.Parse("#result = DOB.Month");
+            action.Execute(true, context, vars, null);
+            Assert.AreEqual(context.DOB.Year, vars["result"]);
+
+            vars.Clear();
+            action = new ExpressionAction(null, "#result = 'invalid'");
+            action.Execute(true, context, vars, null);
+            Assert.IsFalse(vars.Contains("result"), "Result should not exist when valid expression is null.");
+        }
+
+        [Test]
+        public void WhenInvalid()
+        {
+            Inventor context = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            IDictionary vars = new Hashtable();
+
+            ExpressionAction action = new ExpressionAction("#result = 'valid'", "#result = 'invalid'");
+            action.Execute(false, context, vars, null);
+            Assert.AreEqual("invalid", vars["result"]);
+
+            action = new ExpressionAction(Expression.Parse("#result = Name"), Expression.Parse("#result = Nationality"));
+            action.Execute(false, context, vars, null);
+            Assert.AreEqual(context.Nationality, vars["result"]);
+
+            action = new ExpressionAction();
+            action.Valid = Expression.Parse("#result = DOB.Year");
+            action.Invalid = Expression.Parse("#result = DOB.Month");
+            action.Execute(false, context, vars, null);
+            Assert.AreEqual(context.DOB.Month, vars["result"]);
+
+            vars.Clear();
+            action = new ExpressionAction("#result = 'valid'", null);
+            action.Execute(false, context, vars, null);
+            Assert.IsFalse(vars.Contains("result"), "Result should not exist when invalid expression is null.");
+        }
+
+        [Test]
+        public void WhenActionIsNotExecutedBecauseWhenExpressionReturnsFalse()
+        {
+            Inventor context = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            IDictionary vars = new Hashtable();
+
+            ExpressionAction action = new ExpressionAction("#result = 'valid'", "#result = 'invalid'");
+            action.When = Expression.Parse("false");
+            action.Execute(true, context, vars, null);
+            Assert.IsFalse(vars.Contains("result"));
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Validation/AnyValidatorGroupTests.cs b/test/Spring/Spring.Core.Tests/Validation/AnyValidatorGroupTests.cs
new file mode 100644
index 00000000..3d63e69c
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/AnyValidatorGroupTests.cs
@@ -0,0 +1,111 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using NUnit.Framework;
+
+using Spring.Expressions;
+
+#endregion
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// Unit tests for the AnyValidatorGroup class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: AnyValidatorGroupTests.cs,v 1.4 2008/02/05 20:40:26 aseovic Exp $</version>
+    [TestFixture]
+    public sealed class AnyValidatorGroupTests
+    {
+        [Test]
+        public void WhenAllValidatorsReturnFalse()
+        {
+            AnyValidatorGroup vg = new AnyValidatorGroup();
+            vg.Validators.Add(new FalseValidator());
+            vg.Validators.Add(new FalseValidator());
+            vg.Validators.Add(new FalseValidator());
+
+            IValidationErrors errors = new ValidationErrors();
+            errors.AddError("existingErrors", new ErrorMessage("error", null));
+
+            bool valid = vg.Validate(new object(), errors);
+
+            Assert.IsFalse(valid, "Validation should fail when all inner validators return false.");
+            Assert.AreEqual(3, errors.GetErrors("errors").Count);
+            Assert.AreEqual(1, errors.GetErrors("existingErrors").Count);
+        }
+
+        [Test]
+        public void WhenAllValidatorsReturnTrue()
+        {
+            AnyValidatorGroup vg = new AnyValidatorGroup("true");
+            vg.Validators.Add(new TrueValidator());
+            vg.Validators.Add(new TrueValidator());
+            vg.Validators.Add(new TrueValidator());
+
+            IValidationErrors errors = new ValidationErrors();
+            errors.AddError("existingErrors", new ErrorMessage("error", null));
+
+            bool valid = vg.Validate(new object(), errors);
+
+            Assert.IsTrue(valid, "Validation should succeed when all inner validators return true.");
+            Assert.AreEqual(0, errors.GetErrors("errors").Count);
+            Assert.AreEqual(1, errors.GetErrors("existingErrors").Count);
+        }
+
+        [Test]
+        public void WhenSingleValidatorReturnsTrue()
+        {
+            AnyValidatorGroup vg = new AnyValidatorGroup(Expression.Parse("true"));
+            vg.Validators.Add(new FalseValidator());
+            vg.Validators.Add(new TrueValidator());
+            vg.Validators.Add(new FalseValidator());
+
+            IValidationErrors errors = new ValidationErrors();
+            errors.AddError("existingErrors", new ErrorMessage("error", null));
+
+            bool valid = vg.Validate(new object(), errors);
+
+            Assert.IsTrue(valid, "Validation should succeed when single inner validator returns true.");
+            Assert.AreEqual(0, errors.GetErrors("errors").Count);
+            Assert.AreEqual(1, errors.GetErrors("existingErrors").Count);
+        }
+
+        [Test]
+        public void WhenGroupIsNotValidatedBecauseWhenExpressionReturnsFalse()
+        {
+            AnyValidatorGroup vg = new AnyValidatorGroup("false");
+            vg.Validators.Add(new FalseValidator());
+            vg.Validators.Add(new FalseValidator());
+
+            IValidationErrors errors = new ValidationErrors();
+            errors.AddError("existingErrors", new ErrorMessage("error", null));
+
+            bool valid = vg.Validate(new object(), errors);
+
+            Assert.IsTrue(valid, "Validation should succeed when group validator is not evaluated.");
+            Assert.AreEqual(0, errors.GetErrors("errors").Count);
+            Assert.AreEqual(1, errors.GetErrors("existingErrors").Count);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Validation/CollectionValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/CollectionValidatorTests.cs
new file mode 100644
index 00000000..23e96ac4
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/CollectionValidatorTests.cs
@@ -0,0 +1,214 @@
+using System;
+using System.Collections;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using NUnit.Framework;
+using Spring.Collections;
+using Spring.Core.IO;
+using Spring.Expressions;
+using Spring.Objects;
+using Spring.Objects.Factory.Xml;
+using Spring.Validation.Actions;
+
+namespace Spring.Validation 
+{
+    /// <summary>
+    /// Unit tests for the CollectionValidator class.
+    /// </summary>
+    /// <author>Damjan Tomic</author>
+    [TestFixture]
+    public class CollectionValidatorTests
+    {
+        [Test]
+        public void TestCollection()
+        {
+            IList persons = new ArrayList();
+
+            persons.Add(new TestObject("Damjan Tomic", 24));
+            persons.Add(new TestObject("Goran Milosavljevic", 24));
+            persons.Add(new TestObject("Ivan Cikic", 28));
+            
+            RequiredValidator req = new RequiredValidator("Name", "true");
+
+            RegularExpressionValidator reg = new RegularExpressionValidator("Name", "true", @"[a-z]*\s[a-z]*");
+            reg.Options = RegexOptions.IgnoreCase;
+            
+            CollectionValidator validator = new CollectionValidator();
+            validator.Validators.Add(req);
+            validator.Validators.Add(reg);                        
+            
+            Assert.IsTrue(validator.Validate(persons, new ValidationErrors()));
+        }
+
+        [Test]
+        public void TestDifferentCollectionTypes()
+        {
+            const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+            <objects xmlns='http://www.springframework.net' xmlns:v='http://www.springframework.net/validation'>
+          <v:group id='validatePerson' when='T(Spring.Objects.TestObject) == #this.GetType()'>
+            <v:required id ='req' when='true' test='Name'/>
+            <v:regex id ='reg' test='Name'>
+              <v:property name='Expression' value='[a-z]*\s[a-z]*'/>
+              <v:property name='Options' value='IgnoreCase'/>
+              <v:message id='reg1' providers='regularni' when='true'>
+                 <v:param value='#this.ToString()'/> 
+              </v:message>
+            </v:regex>
+          </v:group>  
+           <v:collection id='collectionValidator' validate-all='true'>
+                <v:ref name='validatePerson'/>
+           </v:collection>
+           </objects>";
+
+            MemoryStream stream = new MemoryStream(new UTF8Encoding().GetBytes(xml));
+            IResource resource = new InputStreamResource(stream, "collectionValidator");
+
+            XmlObjectFactory objectFactory = new XmlObjectFactory(resource, null);
+            CollectionValidator validator = (CollectionValidator) objectFactory.GetObject("collectionValidator");
+            
+            IList listPersons = new ArrayList();
+            IDictionary dictPersons = new Hashtable();
+            ISet setPersons = new ListSet();  
+
+            listPersons.Add(new TestObject("DAMJAN Tomic", 24));
+            listPersons.Add(new TestObject("Goran Milosavljevic", 24));
+            listPersons.Add(new TestObject("Ivan CIKIC", 28));
+
+            dictPersons.Add(1, listPersons[0]);
+            dictPersons.Add(2, listPersons[1]);
+            dictPersons.Add(3, listPersons[2]);
+
+            setPersons.AddAll(listPersons);
+            IValidationErrors ve = new ValidationErrors();
+
+            Assert.IsTrue(validator.Validate(listPersons, ve));                        
+            Assert.IsTrue(ve.IsEmpty);                                    
+            Assert.IsTrue(validator.Validate(dictPersons, ve));
+            Assert.IsTrue(ve.IsEmpty);
+            Assert.IsTrue(validator.Validate(setPersons, ve));
+            Assert.IsTrue(ve.IsEmpty);
+        }
+
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestWithWrongArgumentType()
+        {
+            RequiredValidator req = new RequiredValidator("Name", "true");
+            CollectionValidator validator = new CollectionValidator();
+            validator.Validators.Add(req);
+            
+            TestObject tObj = new TestObject("Damjan Tomic", 24);
+            
+            //This should cause the ArgumentException because tObj is not a Collection
+            Assert.IsTrue(validator.Validate(tObj, new ValidationErrors()));              
+        }
+
+        [Test]
+        public void TestValidationErrorsAreCollected()
+        {
+            IList persons = new ArrayList();
+
+            persons.Add(new TestObject(null, 24));
+            persons.Add(new TestObject("Goran Milosavljevic", 24));
+            persons.Add(new TestObject("Ivan Cikic", 28));
+            persons.Add(new TestObject(null, 20));
+
+            RequiredValidator req = new RequiredValidator("Name", "true");
+            req.Actions.Add(new ErrorMessageAction("1", new string[] { "firstProvider", "secondProvider" }));
+
+            CollectionValidator validator = new CollectionValidator(true,true);
+            
+            validator.Validators.Add(req);
+
+            IValidationErrors ve = new ValidationErrors();
+
+            Assert.IsFalse(validator.Validate(persons, ve));
+            Assert.IsFalse(ve.IsEmpty);
+            
+        }
+        
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void TestWithNull()
+        {
+            CollectionValidator validator = new CollectionValidator();
+            //This should cause the ArgumentException because we passed null into Validate method
+            Assert.IsTrue(validator.Validate(null, new ValidationErrors()));
+        }
+        
+        [Test]
+        public void TestNestingCollectionValidator()
+        {            
+            Society soc = new Society();
+            soc.Members.Add(new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian"));
+            soc.Members.Add(new Inventor("Mihajlo Pupin", new DateTime(1854, 10, 9), "Serbian"));
+            
+            
+            RequiredValidator req = new RequiredValidator("Name", "true");
+
+            RegularExpressionValidator reg = new RegularExpressionValidator("Name", "true", @"[a-z]*\s[a-z]*");
+            reg.Options = RegexOptions.IgnoreCase;
+            
+            CollectionValidator validator = new CollectionValidator();
+            validator.Validators.Add(req);
+            validator.Validators.Add(reg);                        
+                       
+            validator.Context = Expression.Parse("Members");
+            
+            Assert.IsTrue(validator.Validate(soc, new ValidationErrors()));
+            
+            validator.Context = null;
+            Assert.IsTrue(validator.Validate(soc.Members, new ValidationErrors()));
+        }
+        
+        [Test]
+        public void TestNestingCollectionValidatorWithXMLDescription()
+        {     
+              const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+            <objects xmlns='http://www.springframework.net' xmlns:v='http://www.springframework.net/validation'>
+              <v:group id='validatePerson' when='T(Spring.Objects.TestObject) == #this.GetType()'>
+                <v:required id ='req' when='true' test='Name'/>
+                <v:regex id ='reg' test='Name'>
+                  <v:property name='Expression' value='[a-z]*\s[a-z]*'/>
+                  <v:property name='Options' value='IgnoreCase'/>
+                  <v:message id='reg1' providers='regExpr' when='true'>
+                     <v:param value='#this.ToString()'/> 
+                  </v:message>
+                </v:regex>
+              </v:group>  
+           
+              <v:group id='validator'>
+                  <v:collection id='collectionValidator' validate-all='true' context='Members' include-element-errors='true'>
+                      <v:ref name='validatePerson'/>
+                      <v:message id='coll1' providers='membersCollection' when='true'>
+                          <v:param value='#this.ToString()'/> 
+                      </v:message>
+                  </v:collection>     
+              </v:group>  
+           </objects>";
+
+            MemoryStream stream = new MemoryStream(new UTF8Encoding().GetBytes(xml));
+            IResource resource = new InputStreamResource(stream, "collection validator test");
+
+            XmlObjectFactory objectFactory = new XmlObjectFactory(resource, null);                        
+                     
+            ValidatorGroup validator = (ValidatorGroup) objectFactory.GetObject("validator");
+            Society soc = new Society();
+                         
+            soc.Members.Add(new TestObject("Damjan Tomic", 24));
+            soc.Members.Add(new TestObject("Goran Milosavljevic", 24));
+            soc.Members.Add(new TestObject("Ivan Cikic", 28));
+           
+            IValidationErrors err1 = new ValidationErrors();
+            
+            Assert.IsTrue(validator.Validate(soc, err1));
+            
+            soc.Members.Add(new TestObject("foo", 30));
+            soc.Members.Add(new TestObject("bar", 30));
+            Assert.IsFalse(validator.Validate(soc, err1));
+             
+        }                           
+    }            
+}
diff --git a/test/Spring/Spring.Core.Tests/Validation/ExclusiveValidatorGroupTests.cs b/test/Spring/Spring.Core.Tests/Validation/ExclusiveValidatorGroupTests.cs
new file mode 100644
index 00000000..62d75ac9
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/ExclusiveValidatorGroupTests.cs
@@ -0,0 +1,121 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using NUnit.Framework;
+
+using Spring.Expressions;
+using Spring.Validation.Actions;
+
+#endregion
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// Unit tests for the ExclusiveValidatorGroup class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ExclusiveValidatorGroupTests.cs,v 1.4 2008/02/05 20:40:26 aseovic Exp $</version>
+    [TestFixture]
+    public sealed class ExclusiveValidatorGroupTests
+    {
+        [Test]
+        public void WhenAllValidatorsReturnFalse()
+        {
+            ExclusiveValidatorGroup vg = new ExclusiveValidatorGroup();
+            vg.Actions.Add(new ErrorMessageAction("exclusiveError", "exclusiveErrors"));
+
+            vg.Validators.Add(new FalseValidator());
+            vg.Validators.Add(new FalseValidator());
+            vg.Validators.Add(new FalseValidator());
+
+            IValidationErrors errors = new ValidationErrors();
+            errors.AddError("existingErrors", new ErrorMessage("error", null));
+
+            bool valid = vg.Validate(new object(), errors);
+
+            Assert.IsFalse(valid, "Validation should fail when all inner validators return false.");
+            Assert.AreEqual(0, errors.GetErrors("errors").Count);
+            Assert.AreEqual(1, errors.GetErrors("exclusiveErrors").Count);
+            Assert.AreEqual(1, errors.GetErrors("existingErrors").Count);
+        }
+
+        [Test]
+        public void WhenAllValidatorsReturnTrue()
+        {
+            ExclusiveValidatorGroup vg = new ExclusiveValidatorGroup("true");
+            vg.Actions.Add(new ErrorMessageAction("exclusiveError", "exclusiveErrors"));
+
+            vg.Validators.Add(new TrueValidator());
+            vg.Validators.Add(new TrueValidator());
+            vg.Validators.Add(new TrueValidator());
+
+            IValidationErrors errors = new ValidationErrors();
+            errors.AddError("existingErrors", new ErrorMessage("error", null));
+
+            bool valid = vg.Validate(new object(), errors);
+
+            Assert.IsFalse(valid, "Validation should fail when all inner validators return true.");
+            Assert.AreEqual(0, errors.GetErrors("errors").Count);
+            Assert.AreEqual(1, errors.GetErrors("exclusiveErrors").Count);
+            Assert.AreEqual(1, errors.GetErrors("existingErrors").Count);
+        }
+
+        [Test]
+        public void WhenSingleValidatorReturnsTrue()
+        {
+            ExclusiveValidatorGroup vg = new ExclusiveValidatorGroup(Expression.Parse("true"));
+            vg.Actions.Add(new ErrorMessageAction("exclusiveError", "exclusiveErrors"));
+
+            vg.Validators.Add(new FalseValidator());
+            vg.Validators.Add(new TrueValidator());
+            vg.Validators.Add(new FalseValidator());
+
+            IValidationErrors errors = new ValidationErrors();
+            errors.AddError("existingErrors", new ErrorMessage("error", null));
+
+            bool valid = vg.Validate(new object(), errors);
+
+            Assert.IsTrue(valid, "Validation should succeed when single inner validator returns true.");
+            Assert.AreEqual(0, errors.GetErrors("errors").Count);
+            Assert.AreEqual(0, errors.GetErrors("exclusiveErrors").Count);
+            Assert.AreEqual(1, errors.GetErrors("existingErrors").Count);
+        }
+
+        [Test]
+        public void WhenGroupIsNotValidatedBecauseWhenExpressionReturnsFalse()
+        {
+            ExclusiveValidatorGroup vg = new ExclusiveValidatorGroup("false");
+            vg.Validators.Add(new FalseValidator());
+            vg.Validators.Add(new FalseValidator());
+
+            IValidationErrors errors = new ValidationErrors();
+            errors.AddError("existingErrors", new ErrorMessage("error", null));
+
+            bool valid = vg.Validate(new object(), errors);
+
+            Assert.IsTrue(valid, "Validation should succeed when group validator is not evaluated.");
+            Assert.AreEqual(0, errors.GetErrors("errors").Count);
+            Assert.AreEqual(1, errors.GetErrors("existingErrors").Count);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Validation/HelperClasses.cs b/test/Spring/Spring.Core.Tests/Validation/HelperClasses.cs
new file mode 100644
index 00000000..d46bbe94
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/HelperClasses.cs
@@ -0,0 +1,114 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Collections;
+
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Validation.Actions;
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// Helper classes for validation tests.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: HelperClasses.cs,v 1.2 2006/04/09 07:24:52 markpollack Exp $</version>
+    public class TrueValidator : BaseValidator
+    {
+        public TrueValidator()
+        {}
+
+        /// <summary>
+        /// Validates test object.
+        /// </summary>
+        /// <param name="objectToValidate">Object to validate.</param>
+        /// <returns><c>True</c> if specified object is valid, <c>False</c> otherwise.</returns>
+        protected override bool Validate(object objectToValidate)
+        {
+            return true;
+        }
+    }
+
+    public class FalseValidator : BaseValidator
+    {
+        public FalseValidator()
+        {
+            this.Actions.Add(new ErrorMessageAction("error", "errors"));
+        }
+
+        /// <summary>
+        /// Validates test object.
+        /// </summary>
+        /// <param name="objectToValidate">Object to validate.</param>
+        /// <returns><c>True</c> if specified object is valid, <c>False</c> otherwise.</returns>
+        protected override bool Validate(object objectToValidate)
+        {
+            return false;
+        }
+    }
+
+    public sealed class MockObjectDefinitionRegistry : IObjectDefinitionRegistry
+    {
+        private IDictionary objects = new Hashtable();
+
+        public int ObjectDefinitionCount
+        {
+            get { return this.objects.Count; }
+        }
+
+        public string[] GetObjectDefinitionNames()
+        {
+            return (string[]) new ArrayList(this.objects.Keys).ToArray(typeof(string));
+        }
+
+        public IObjectDefinition[] GetObjectDefinitions()
+        {
+            return (IObjectDefinition[]) new ArrayList(this.objects.Values).ToArray(typeof(IObjectDefinition));
+        }
+
+        public bool ContainsObjectDefinition(string name)
+        {
+            return objects.Contains(name);
+        }
+
+        public IObjectDefinition GetObjectDefinition(string name)
+        {
+            return (IObjectDefinition) objects[name];
+        }
+
+        public void RegisterObjectDefinition(string name, IObjectDefinition definition)
+        {
+            this.objects[name] = definition;
+        }
+
+        public string[] GetAliases(string name)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void RegisterAlias(string name, string theAlias)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Validation/ValidationConfigParserTests.cs b/test/Spring/Spring.Core.Tests/Validation/ValidationConfigParserTests.cs
new file mode 100644
index 00000000..94eabda7
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/ValidationConfigParserTests.cs
@@ -0,0 +1,203 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.IO;
+using System.Xml;
+using NUnit.Framework;
+using Spring.Core.IO;
+using Spring.Objects;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+using Spring.Validation.Actions;
+using Spring.Validation.Config;
+
+#endregion
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// Unit tests for the ValidationNamespaceParser class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ValidationConfigParserTests.cs,v 1.14 2007/08/08 17:48:45 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class ValidationConfigParserTests
+    {
+        [Test]
+        public void WhenConfigFileIsValid()
+        {
+            const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:v='http://www.springframework.net/validation'>
+    <v:group id='destinationAirportValidator'>
+        <v:ref name='airportCodeValidator' context='ReturningFrom.AirportCode'/>
+        <v:ref name='airportCodeValidator'/>
+	    <v:condition test='ReturningFrom.AirportCode != StartingFrom.AirportCode'>
+            <v:message id='error.destinationAirport.sameAsDeparture' providers='summary'/>
+        </v:condition>
+	    <v:validator type='Spring.Validation.RegularExpressionValidator, Spring.Core' test='ReturningFrom.AirportCode' when='true'>
+            <v:property name='Expression' value='[A-Z]*'/>
+            <v:message id='error.destinationAirport.invalidFormat' providers='summary'/>
+        </v:validator>
+    </v:group>
+
+    <v:required id='airportCodeValidator' test='#this'>
+        <v:message id='error.airportCode.dummy' providers='summary' when='false'/>
+        <v:message id='error.airportCode.required' providers='summary'>
+            <v:param value='#this.Abc'/>
+            <v:param value='#this.Xyz'/>
+        </v:message>
+        <v:action type='Spring.Validation.Actions.ExpressionAction, Spring.Core' when='true'>
+            <v:property name='Valid' value='#now = DateTime.Now'/>
+        </v:action>
+        <v:action type='Spring.Validation.Actions.ExpressionAction, Spring.Core'/>
+    </v:required>
+
+    <object id='myObject' type='DateTime'/>
+
+</objects>
+";
+            XmlDocument doc = new XmlDocument();
+
+            AssemblyResource validationSchema = new AssemblyResource("assembly://Spring.Core/Spring.Validation.Config/spring-validation-1.1.xsd");
+            AssemblyResource objectsSchema = new AssemblyResource("assembly://Spring.Core/Spring.Objects.Factory.Xml/spring-objects-1.1.xsd");
+
+#if !NET_2_0
+            XmlValidatingReader validatingReader = new XmlValidatingReader(xml, XmlNodeType.Document, null);
+            validatingReader.ValidationType = ValidationType.Schema;
+            validatingReader.Schemas.Add("http://www.springframework.net", new XmlTextReader(objectsSchema.InputStream));
+            validatingReader.Schemas.Add("http://www.springframework.net/validation", new XmlTextReader(validationSchema.InputStream));
+#else
+            XmlReaderSettings settings = new XmlReaderSettings();
+            settings.Schemas.Add("http://www.springframework.net", new XmlTextReader(objectsSchema.InputStream));
+            settings.Schemas.Add("http://www.springframework.net/validation", new XmlTextReader(validationSchema.InputStream));
+            settings.ValidationType = ValidationType.Schema;
+            XmlReader validatingReader = XmlReader.Create(new StringReader(xml), settings);
+#endif
+            doc.Load(validatingReader);
+            
+            MockObjectDefinitionRegistry registry = new MockObjectDefinitionRegistry();
+            IObjectDefinitionDocumentReader reader = new DefaultObjectDefinitionDocumentReader();
+
+            XmlReaderContext readerContext = new XmlReaderContext(null, new XmlObjectDefinitionReader(registry));
+            ObjectDefinitionParserHelper helper = new ObjectDefinitionParserHelper(readerContext);
+            helper.InitDefaults(doc.DocumentElement);
+            ParserContext parserContext = new ParserContext(helper.ReaderContext, helper);
+
+            ValidationNamespaceParser parser = new ValidationNamespaceParser();
+            foreach (XmlElement element in doc.DocumentElement.ChildNodes)
+            {
+                if (element.NamespaceURI == "http://www.springframework.net/validation")
+                {
+                    parser.ParseElement(element, parserContext);
+                }
+            }
+            IObjectDefinition[] defs = registry.GetObjectDefinitions();
+            Assert.AreEqual(2, defs.Length);
+
+            IObjectDefinition def = registry.GetObjectDefinition("destinationAirportValidator");
+            Assert.IsTrue(def.IsSingleton);
+            Assert.IsTrue(def.IsLazyInit);
+            Assert.IsTrue(typeof(IValidator).IsAssignableFrom(def.ObjectType));
+            PropertyValue validatorsProperty = def.PropertyValues.GetPropertyValue("Validators");
+            Assert.IsNotNull(validatorsProperty);
+            object validatorsObject = validatorsProperty.Value;
+            Assert.AreEqual(typeof(ManagedList), validatorsObject.GetType());
+            ManagedList validators = (ManagedList) validatorsObject;
+            Assert.AreEqual(4, validators.Count);
+
+            def = (IObjectDefinition) validators[3];
+            Assert.IsTrue(def.IsSingleton);
+            Assert.IsTrue(def.IsLazyInit);
+            Assert.AreEqual(typeof(RegularExpressionValidator), def.ObjectType);
+            Assert.AreEqual("[A-Z]*", def.PropertyValues.GetPropertyValue("Expression").Value);
+
+            def = registry.GetObjectDefinition("airportCodeValidator");
+            Assert.IsTrue(def.IsSingleton);
+            Assert.IsTrue(def.IsLazyInit);
+            Assert.IsTrue(typeof(IValidator).IsAssignableFrom(def.ObjectType));
+            PropertyValue actionsProperty = def.PropertyValues.GetPropertyValue("Actions");
+            Assert.IsNotNull(actionsProperty);
+            object actionsObject = actionsProperty.Value;
+            Assert.AreEqual(typeof(ManagedList), actionsObject.GetType());
+            ManagedList actions = (ManagedList) actionsObject;
+            Assert.AreEqual(4, actions.Count);
+
+            IObjectDefinition messageDefinition = (IObjectDefinition) actions[1];
+            Assert.AreEqual(typeof(ErrorMessageAction), messageDefinition.ObjectType);
+
+            IObjectDefinition actionDefinition = (IObjectDefinition) actions[2];
+            Assert.AreEqual(typeof(ExpressionAction), actionDefinition.ObjectType);
+            Assert.AreEqual("#now = DateTime.Now", actionDefinition.PropertyValues.GetPropertyValue("Valid").Value);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDefinitionStoreException))]
+        public void WhenConfigFileIsNotValid()
+        {
+            const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net' xmlns:v='http://www.springframework.net/validation'>
+    <v:required test='#this'>
+        <v:message id='error.airportCode.required' providers='summary'/>
+        <v:action type='Spring.Validation.Actions.ExpressionAction, Spring.Core' when='true'/>
+    </v:required>
+</objects>
+";
+            XmlDocument doc = new XmlDocument();
+
+            AssemblyResource validationSchema = new AssemblyResource("assembly://Spring.Core/Spring.Validation.Config/spring-validation-1.1.xsd");
+            AssemblyResource objectsSchema = new AssemblyResource("assembly://Spring.Core/Spring.Objects.Factory.Xml/spring-objects-1.1.xsd");
+
+#if !NET_2_0
+            XmlValidatingReader validatingReader = new XmlValidatingReader(xml, XmlNodeType.Document, null);
+            validatingReader.ValidationType = ValidationType.Schema;
+            validatingReader.Schemas.Add("http://www.springframework.net", new XmlTextReader(objectsSchema.InputStream));
+            validatingReader.Schemas.Add("http://www.springframework.net/validation", new XmlTextReader(validationSchema.InputStream));
+#else
+            XmlReaderSettings settings = new XmlReaderSettings();
+            settings.Schemas.Add("http://www.springframework.net", new XmlTextReader(objectsSchema.InputStream));
+            settings.Schemas.Add("http://www.springframework.net/validation", new XmlTextReader(validationSchema.InputStream));
+            settings.ValidationType = ValidationType.Schema;
+            XmlReader validatingReader = XmlReader.Create(new StringReader(xml), settings);
+#endif
+            doc.Load(validatingReader);
+
+            MockObjectDefinitionRegistry registry = new MockObjectDefinitionRegistry();
+            IObjectDefinitionDocumentReader reader = new DefaultObjectDefinitionDocumentReader();
+
+            XmlReaderContext readerContext = new XmlReaderContext(null, new XmlObjectDefinitionReader(registry));
+            ObjectDefinitionParserHelper helper = new ObjectDefinitionParserHelper(readerContext);
+            helper.InitDefaults(doc.DocumentElement);
+            ParserContext parserContext = new ParserContext(helper.ReaderContext, helper);
+
+            ValidationNamespaceParser parser = new ValidationNamespaceParser();
+            foreach (XmlElement element in doc.DocumentElement.ChildNodes)
+            {
+                if (element.NamespaceURI == "http://www.springframework.net/validation")
+                {
+                    parser.ParseElement(element, parserContext);
+                }
+            }
+        }       
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Validation/ValidationErrorsTests.cs b/test/Spring/Spring.Core.Tests/Validation/ValidationErrorsTests.cs
new file mode 100644
index 00000000..d3102db7
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/ValidationErrorsTests.cs
@@ -0,0 +1,187 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Xml.Serialization;
+using NUnit.Framework;
+
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Validation
+{
+	/// <summary>
+	/// Unit tests for the ValidationErrors class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+    /// <author>Goran Milosavljevic</author>
+    /// <version>$Id: ValidationErrorsTests.cs,v 1.7 2008/02/05 20:40:26 aseovic Exp $</version>
+	[TestFixture]
+	public sealed class ValidationErrorsTests
+	{
+		private const string GoodErrorKey = "key";
+		private ErrorMessage ErrorMessageTwo = new ErrorMessage("This Is Eva Green", null);
+		private ErrorMessage ErrorMessageOne = new ErrorMessage("Kissing Leads To Brain Disease", null);
+
+		[Test]
+		public void ContainsNoErrorsDirectlyAfterInstantiation()
+		{
+			IValidationErrors errors = new ValidationErrors();
+			Assert.IsTrue(errors.IsEmpty);
+			Assert.IsNotNull(errors.GetErrors(GoodErrorKey));
+		}
+
+		[Test]
+		[ExpectedException(typeof (ArgumentNullException))]
+		public void AddErrorWithNullMessage()
+		{
+			new ValidationErrors().AddError(GoodErrorKey, null);
+		}
+
+		[Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+		public void AddErrorWithNullKey()
+		{
+			IValidationErrors errors = new ValidationErrors();
+			errors.AddError(null, ErrorMessageOne);
+		}
+
+		[Test]
+		public void AddErrorSunnyDay()
+		{
+			IValidationErrors errors = new ValidationErrors();
+			errors.AddError(GoodErrorKey, ErrorMessageOne);
+			Assert.IsFalse(errors.IsEmpty);
+			Assert.IsNotNull(errors.GetErrors(GoodErrorKey));
+			Assert.AreEqual(1, errors.GetErrors(GoodErrorKey).Count);
+		}
+
+		[Test]
+		public void AddTwoErrorsSameKey()
+		{
+			IValidationErrors errors = new ValidationErrors();
+			errors.AddError(GoodErrorKey, ErrorMessageOne);
+			errors.AddError(GoodErrorKey, ErrorMessageTwo);
+			Assert.IsFalse(errors.IsEmpty);
+			Assert.IsNotNull(errors.GetErrors(GoodErrorKey));
+			Assert.AreEqual(2, errors.GetErrors(GoodErrorKey).Count);
+		}
+
+        [Test]
+        public void EmptyErrorsReturnEmptyCollections()
+        {
+            IValidationErrors errors = new ValidationErrors();
+
+            IList typedErrors = errors.GetErrors("xyz");
+            Assert.IsNotNull(typedErrors);
+            Assert.AreEqual(0, typedErrors.Count);
+
+            IList resolvedErrors = errors.GetResolvedErrors("xyz", new NullMessageSource());
+            Assert.IsNotNull(resolvedErrors);
+            Assert.AreEqual(0, resolvedErrors.Count);
+        }
+
+		[Test]
+		public void MergeErrorsWithNull()
+		{
+			IValidationErrors errors = new ValidationErrors();
+			errors.AddError(GoodErrorKey, ErrorMessageOne);
+			errors.AddError(GoodErrorKey, ErrorMessageTwo);
+			errors.MergeErrors(null);
+
+			// must be unchanged with no Exception thrown...
+			Assert.IsFalse(errors.IsEmpty);
+			Assert.IsNotNull(errors.GetErrors(GoodErrorKey));
+			Assert.AreEqual(2, errors.GetErrors(GoodErrorKey).Count);
+		}
+
+		[Test]
+		public void MergeErrors()
+		{
+			ValidationErrors otherErrors = new ValidationErrors();
+			const string anotherKey = "anotherKey";
+			otherErrors.AddError(anotherKey, ErrorMessageTwo);
+			otherErrors.AddError(GoodErrorKey, ErrorMessageTwo);
+
+
+			IValidationErrors errors = new ValidationErrors();
+			errors.AddError(GoodErrorKey, ErrorMessageOne);
+			errors.MergeErrors(otherErrors);
+
+			Assert.IsFalse(errors.IsEmpty);
+		    IList mergedErrors = errors.GetErrors(GoodErrorKey);
+		    Assert.IsNotNull(mergedErrors);
+			Assert.AreEqual(2, mergedErrors.Count);
+            Assert.AreEqual(ErrorMessageOne, mergedErrors[0]);
+            Assert.AreEqual(ErrorMessageTwo, mergedErrors[1]);
+
+			IList otherErrorsForKey = errors.GetErrors(anotherKey);
+			Assert.IsNotNull(otherErrorsForKey);
+            Assert.AreEqual(1, otherErrorsForKey.Count);
+            Assert.AreEqual(ErrorMessageTwo, otherErrorsForKey[0]);
+        }
+
+        [Test]
+        public void SerializeErrors()
+        {
+            ValidationErrors errors = new ValidationErrors();
+            ErrorMessageOne = new ErrorMessage("Kissing Leads To Brain Disease", new object[] {"Param11", 5, "Param13"});
+            ErrorMessageTwo = new ErrorMessage("This Is Eva Green", new object[] { "Param21", 'g' , new object[] {"Goran", "Milosavljevic"} });
+            ErrorMessage ErrorMessageThree = new ErrorMessage("Third error message", null);
+            ErrorMessage ErrorMessageFour = new ErrorMessage("Fourth error message", new object[]{});
+            errors.AddError("key1", ErrorMessageOne);
+            errors.AddError("key1", ErrorMessageTwo);
+            errors.AddError("key2", ErrorMessageThree);
+            errors.AddError("key3", ErrorMessageFour);
+
+            Stream streamBefore = new MemoryStream();
+            Stream streamAfter = new MemoryStream();
+
+            // serialize ValidationErrors
+            XmlSerializer serializer = new XmlSerializer(typeof(ValidationErrors));
+            serializer.Serialize(streamBefore, errors);
+            streamBefore.Position = 0;
+
+            // deserialize ValidationErrors
+            ValidationErrors result = (ValidationErrors) serializer.Deserialize(streamBefore);
+            
+            // serialize ValidationErrors
+            serializer.Serialize(streamAfter, result);
+            
+            // compare ValidationErrors instances
+            byte[] byteBefore = new byte[streamBefore.Length];
+            byte[] byteAfter = new byte[streamAfter.Length];
+            
+            Assert.AreEqual(byteAfter.Length, byteBefore.Length);
+            
+            streamBefore.Position = 0;
+            streamAfter.Position = 0;
+            streamBefore.Read(byteBefore, 0, (int) streamBefore.Length);
+            streamAfter.Read(byteAfter, 0, (int) streamAfter.Length);
+            
+            Assert.AreEqual(byteBefore, byteAfter);
+        }
+	}
+}
diff --git a/test/Spring/Spring.Core.Tests/Validation/ValidationExceptionTests.cs b/test/Spring/Spring.Core.Tests/Validation/ValidationExceptionTests.cs
new file mode 100644
index 00000000..2971989d
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/ValidationExceptionTests.cs
@@ -0,0 +1,86 @@
+#region License
+
+/*
+ * Copyright 2004 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.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+using NUnit.Framework;
+
+namespace Spring.Validation
+{
+	/// <summary>
+	/// Unit tests for the ValidationException class.
+	/// </summary>
+	/// <author>Aleksandar Seovic</author>
+	/// <version>$Id: ValidationExceptionTests.cs,v 1.1 2008/02/05 20:40:27 aseovic Exp $</version>
+	[TestFixture]
+	public sealed class ValidationExceptionTests
+	{
+        [Test]
+        public void InstantiationUsingDefaultConstructor()
+        {
+            ValidationException ex = new ValidationException();
+            Assert.IsNull(ex.ValidationErrors);
+        }
+        
+        [Test]
+		public void InstantiationSupplyingValidationErrors()
+		{
+            ValidationException ex = new ValidationException(new ValidationErrors());
+            Assert.IsTrue(ex.ValidationErrors.IsEmpty);
+		}
+
+        [Test]
+        public void InstantiationSupplyingMessageAndValidationErrors()
+        {
+            ValidationException ex = new ValidationException("my message", new ValidationErrors());
+            Assert.AreEqual("my message", ex.Message);
+            Assert.IsTrue(ex.ValidationErrors.IsEmpty);
+        }
+    
+        [Test]
+        public void InstantiationSupplyingMessageValidationErrorsAndRootCause()
+        {
+            Exception rootCause = new Exception("root cause");
+            ValidationException ex = new ValidationException("my message", rootCause, new ValidationErrors());
+            Assert.AreEqual("my message", ex.Message);
+            Assert.IsTrue(ex.ValidationErrors.IsEmpty);
+            Assert.AreEqual(rootCause, ex.InnerException);
+            Assert.AreEqual("root cause", ex.InnerException.Message);
+        }
+
+        [Test]
+        public void TestExceptionSerialization()
+        {
+            MemoryStream buffer = new MemoryStream();
+            BinaryFormatter serializer = new BinaryFormatter();
+
+            Exception rootCause = new Exception("root cause");
+            ValidationException e1 = new ValidationException("my message", rootCause, new ValidationErrors());
+            serializer.Serialize(buffer, e1);
+            buffer.Position = 0;
+            ValidationException e2 = (ValidationException)serializer.Deserialize(buffer);
+
+            Assert.AreEqual("my message", e2.Message);
+            Assert.IsTrue(e2.ValidationErrors.IsEmpty);
+            Assert.AreEqual("root cause", e2.InnerException.Message);
+        }
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Validation/ValidatorGroupTests.cs b/test/Spring/Spring.Core.Tests/Validation/ValidatorGroupTests.cs
new file mode 100644
index 00000000..c9a0fa9b
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/ValidatorGroupTests.cs
@@ -0,0 +1,123 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Collections;
+
+using NUnit.Framework;
+
+using Spring.Expressions;
+
+#endregion
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// Unit tests for the ValidatorGroup class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ValidatorGroupTests.cs,v 1.4 2008/02/05 20:40:26 aseovic Exp $</version>
+    [TestFixture]
+    public sealed class ValidatorGroupTests : ValidatorGroup
+    {
+        [Test]
+        public void WhenAllValidatorsReturnFalse()
+        {
+            ValidatorGroup vg = new ValidatorGroup();
+            vg.Validators.Add(new FalseValidator());
+            vg.Validators.Add(new FalseValidator());
+            vg.Validators.Add(new FalseValidator());
+
+            IValidationErrors errors = new ValidationErrors();
+            errors.AddError("existingErrors", new ErrorMessage("error", null));
+
+            bool valid = vg.Validate(new object(), errors);
+
+            Assert.IsFalse(valid, "Validation should fail when all inner validators return false.");
+            Assert.AreEqual(3, errors.GetErrors("errors").Count);
+            Assert.AreEqual(1, errors.GetErrors("existingErrors").Count);
+        }
+
+        [Test]
+        public void WhenAllValidatorsReturnTrue()
+        {
+            ValidatorGroup vg = new ValidatorGroup("true");
+            vg.Validators.Add(new TrueValidator());
+            vg.Validators.Add(new TrueValidator());
+            vg.Validators.Add(new TrueValidator());
+
+            IValidationErrors errors = new ValidationErrors();
+            errors.AddError("existingErrors", new ErrorMessage("error", null));
+
+            bool valid = vg.Validate(new object(), errors);
+
+            Assert.IsTrue(valid, "Validation should succeed when all inner validators return true.");
+            Assert.AreEqual(0, errors.GetErrors("errors").Count);
+            Assert.AreEqual(1, errors.GetErrors("existingErrors").Count);
+        }
+
+        [Test]
+        public void WhenSingleValidatorReturnsTrue()
+        {
+            ValidatorGroup vg = new ValidatorGroup(Expression.Parse("true"));
+            vg.Validators.Add(new FalseValidator());
+            vg.Validators.Add(new TrueValidator());
+            vg.Validators.Add(new FalseValidator());
+
+            IValidationErrors errors = new ValidationErrors();
+            errors.AddError("existingErrors", new ErrorMessage("error", null));
+
+            bool valid = vg.Validate(new object(), errors);
+
+            Assert.IsFalse(valid, "Validation should fail when single inner validator returns true.");
+            Assert.AreEqual(2, errors.GetErrors("errors").Count);
+            Assert.AreEqual(1, errors.GetErrors("existingErrors").Count);
+        }
+
+        [Test]
+        public void WhenGroupIsNotValidatedBecauseWhenExpressionReturnsFalse()
+        {
+            ValidatorGroup vg = new ValidatorGroup("false");
+            IList validators = new ArrayList();
+            validators.Add(new FalseValidator());
+            validators.Add(new FalseValidator());
+            vg.Validators = validators;
+
+            IValidationErrors errors = new ValidationErrors();
+            errors.AddError("existingErrors", new ErrorMessage("error", null));
+
+            bool valid = vg.Validate(new object(), errors);
+
+            Assert.IsTrue(valid, "Validation should succeed when group validator is not evaluated.");
+            Assert.AreEqual(0, errors.GetErrors("errors").Count);
+            Assert.AreEqual(1, errors.GetErrors("existingErrors").Count);
+        }
+
+        [Test]
+        [ExpectedException(typeof(NotSupportedException))]
+        public void TestNonSupportedValidateMethod()
+        {
+            this.Validate("xyz");
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Validation/ValidatorReferenceTests.cs b/test/Spring/Spring.Core.Tests/Validation/ValidatorReferenceTests.cs
new file mode 100644
index 00000000..3a22c0b0
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/ValidatorReferenceTests.cs
@@ -0,0 +1,100 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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 NUnit.Framework;
+
+using Spring.Expressions;
+using Spring.Objects.Factory.Support;
+
+namespace Spring.Validation
+{
+    /// <summary>
+    /// Unit tests for ValidatorReference class.
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    /// <version>$Id: ValidatorReferenceTests.cs,v 1.3 2008/02/05 20:40:27 aseovic Exp $</version>
+    [TestFixture]
+    public class ValidatorReferenceTests
+    {
+        [Test]
+        public void TrueValidatorReference()
+        {
+            StaticListableObjectFactory factory = new StaticListableObjectFactory();
+            factory.AddObject("validator", new TrueValidator());
+
+            ValidatorReference v = new ValidatorReference();
+            v.ObjectFactory = factory;
+            v.Name = "validator";
+
+            IValidationErrors errors = new ValidationErrors();
+
+            Assert.IsTrue(v.Validate(null, null, errors));
+            Assert.IsTrue(v.Validate(null, errors));
+        }
+
+        [Test]
+        public void FalseValidatorReference()
+        {
+            StaticListableObjectFactory factory = new StaticListableObjectFactory();
+            factory.AddObject("validator", new FalseValidator());
+
+            ValidatorReference v = new ValidatorReference();
+            v.ObjectFactory = factory;
+            v.Name = "validator";
+
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsFalse(v.Validate(null, null, errors));
+            Assert.IsFalse(v.Validate(null, errors));
+        }
+
+        [Test]
+        public void ContextNarrowing()
+        {
+            Inventor context = new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian");
+            
+            ConditionValidator cv1 = new ConditionValidator("DOB.Year == 1856", null);
+            ConditionValidator cv2 = new ConditionValidator("Year == 1856", null);
+            
+            StaticListableObjectFactory factory = new StaticListableObjectFactory();
+            factory.AddObject("cv1", cv1);
+            factory.AddObject("cv2", cv2);
+
+            ValidatorReference v1 = new ValidatorReference();
+            v1.ObjectFactory = factory;
+            v1.Name = "cv1";
+
+            IValidationErrors errors = new ValidationErrors();
+
+            Assert.IsTrue(v1.Validate(context, null, errors));
+            Assert.IsTrue(v1.Validate(context, errors));
+
+            ValidatorReference v2 = new ValidatorReference();
+            v2.ObjectFactory = factory;
+            v2.Name = "cv2";
+            v2.Context = Expression.Parse("DOB");
+
+            Assert.IsTrue(v2.Validate(context, null, errors));
+            Assert.IsTrue(v2.Validate(context, errors));
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/ConditionValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/ConditionValidatorTests.cs
new file mode 100644
index 00000000..805609ea
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/Validators/ConditionValidatorTests.cs
@@ -0,0 +1,100 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.Collections;
+
+using NUnit.Framework;
+
+using Spring.Context.Support;
+using Spring.Expressions;
+using Spring.Validation.Actions;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// Unit tests for the ConditionValidator class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ConditionValidatorTests.cs,v 1.9 2008/02/05 20:40:27 aseovic Exp $</version>
+    [TestFixture]
+    public sealed class ConditionValidatorTests
+    {
+        [Test]
+        public void StraightTrue()
+        {
+            ConditionValidator validator = new ConditionValidator();
+            validator.Test = Expression.Parse("true");
+            Assert.IsTrue(validator.Validate(null, new ValidationErrors()));
+        }
+
+        [Test]
+        public void StraightFalse()
+        {
+            ConditionValidator validator = new ConditionValidator("false", null);
+            Assert.IsFalse(validator.Validate(null, new ValidationErrors()));
+        }
+
+        [Test]
+        public void TrueScalarExpression()
+        {
+            Inventor tesla = new Inventor();
+            tesla.Name = "Nikola Tesla";
+
+            ConditionValidator validator = new ConditionValidator(Expression.Parse("Name == 'Nikola Tesla'"), null);
+            Assert.IsTrue(validator.Validate(tesla, new ValidationErrors()));
+        }
+
+        [Test]
+        public void FalseScalarExpression()
+        {
+            Inventor tesla = new Inventor();
+            tesla.Name = "Soltan Gris";
+
+            ConditionValidator validator = new ConditionValidator(Expression.Parse("Name == 'Nikola Tesla'"), null);
+            validator.Actions = new ErrorMessageAction[] {new ErrorMessageAction("Wrong name", "InventorValidator") };
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsFalse(validator.Validate(tesla, errors));
+            Assert.IsFalse(errors.IsEmpty);
+            IList namedErrors = errors.GetResolvedErrors("InventorValidator", new NullMessageSource());
+            Assert.AreEqual(1, namedErrors.Count);
+            string error = (string) namedErrors[0];
+            Assert.AreEqual("Wrong name", error);
+        }
+
+        [Test]
+        public void WhenValidatorIsNotEvaluatedBecauseWhenExpressionReturnsFalse()
+        {
+            ConditionValidator validator = new ConditionValidator();
+            validator.Test = Expression.Parse("false");
+            validator.When = Expression.Parse("false");
+            IValidationErrors errors = new ValidationErrors();
+
+            bool valid = validator.Validate(new object(), null, errors);
+
+            Assert.IsTrue(valid, "Validation should succeed when condition validator is not evaluated.");
+            Assert.AreEqual(0, errors.GetErrors("errors").Count);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/CreditCardValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/CreditCardValidatorTests.cs
new file mode 100644
index 00000000..7d0edaf5
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/Validators/CreditCardValidatorTests.cs
@@ -0,0 +1,49 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// Unit tests for the UrlValidator class.
+    /// </summary>
+    /// <author>Goran Milosavljevic</author>
+    [TestFixture]
+    public sealed class CreditCardValidatorTests
+    {              
+        [Test]
+        public void Validate()
+        {
+            CreditCardValidator validator = new CreditCardValidator();
+            validator.CardType = new Amex();
+            Assert.IsTrue(validator.Validate("378282246310005", new ValidationErrors()));
+            Assert.IsFalse(validator.Validate("444444444", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate(" ", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate(null, new ValidationErrors()));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/EmailValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/EmailValidatorTests.cs
new file mode 100644
index 00000000..6fd12878
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/Validators/EmailValidatorTests.cs
@@ -0,0 +1,62 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Text.RegularExpressions;
+using NUnit.Framework;
+
+using Spring.Context.Support;
+using Spring.Expressions;
+using Spring.Validation.Actions;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// Unit tests for the EmailValidator class.
+    /// </summary>
+    /// <author>Goran Milosavljevic</author>
+    [TestFixture]
+    public sealed class EmailValidatorTests
+    {              
+        [Test]
+        public void Validate()
+        {
+            EmailValidator validator = new EmailValidator();
+            Assert.IsTrue(validator.Validate("goran@eu.s4hc.com", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("goran.milosavljevic@s4hc.com", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("g.m.m@web_ask.com", new ValidationErrors()));
+
+            Assert.IsFalse(validator.Validate("@eu.s4hc.com", new ValidationErrors()));
+            Assert.IsFalse(validator.Validate("g @s4hc.com", new ValidationErrors()));
+            Assert.IsFalse(validator.Validate("g&@s", new ValidationErrors()));
+            Assert.IsFalse(validator.Validate("goran@s", new ValidationErrors()));
+            Assert.IsFalse(validator.Validate("goran@@", new ValidationErrors()));             
+            Assert.IsFalse(validator.Validate("goran@eu s4hc.com", new ValidationErrors()));             
+            Assert.IsTrue(validator.Validate(" ", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("", new ValidationErrors()));             
+            Assert.IsTrue(validator.Validate(null, new ValidationErrors()));             
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/ISBNValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/ISBNValidatorTests.cs
new file mode 100644
index 00000000..d5679410
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/Validators/ISBNValidatorTests.cs
@@ -0,0 +1,63 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// Unit tests for the ISBNValidator class.
+    /// </summary>
+    /// <author>Goran Milosavljevic</author>
+    [TestFixture]
+    public sealed class ISBNValidatorTests
+    {              
+        [Test]
+        public void Validate()
+        {
+            ISBNValidator validator = new ISBNValidator();
+            // validate ISBN10
+            Assert.IsTrue(validator.Validate("90-70002-34-5", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("1575843013", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("81-7525-766-0", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("1905158793", new ValidationErrors()));
+
+            // validate ISBN13
+            Assert.IsTrue(validator.Validate("978-1-905158-79-9", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("978-81-7525-766-5", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("978-90-70002-34-3", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("9789070002343", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("978907000234-3", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("9789070002-34-3", new ValidationErrors()));
+
+            Assert.IsFalse(validator.Validate("9789g70002-34-3", new ValidationErrors()));
+            Assert.IsFalse(validator.Validate("a789g70002343", new ValidationErrors()));
+            Assert.IsFalse(validator.Validate("978907000234x", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate(" ", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate(null, new ValidationErrors()));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/CreditCardValidatorIntegrationTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/CreditCardValidatorIntegrationTests.cs
new file mode 100644
index 00000000..579ecabd
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/CreditCardValidatorIntegrationTests.cs
@@ -0,0 +1,118 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Text;
+using NUnit.Framework;
+using Spring.Core.IO;
+using Spring.Objects;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// CreditCardValidator integration tests.
+    /// </summary>
+    /// <author>Goran Milosavljevic</author>
+    [TestFixture]
+    public class CreditCardValidatorIntegrationTests
+    {
+        [Test]
+        public void CreditCardValidatorTests()
+        {
+            const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+            <objects xmlns='http://www.springframework.net' xmlns:v='http://www.springframework.net/validation'>
+                <object id='ccAmex' type='Spring.Validation.Validators.Amex, Spring.Core'/>
+                <v:validator id='ccValidator' test='#this' type='Spring.Validation.Validators.CreditCardValidator, Spring.Core'>
+                  <v:property name='CardType' ref='ccAmex'/>
+                  <v:message id='error.airportCode.dummy' providers='summary' when='false'/>
+                </v:validator>
+            </objects>";
+            
+            MemoryStream stream = new MemoryStream(new UTF8Encoding().GetBytes(xml));
+            IResource resource = new InputStreamResource(stream, "ccValidator");
+            
+            XmlObjectFactory objectFactory = new XmlObjectFactory(resource, null);
+            object obj = objectFactory.GetObject("ccValidator");
+            
+            Assert.IsTrue(obj is CreditCardValidator);
+            CreditCardValidator validator = obj as CreditCardValidator;
+            Assert.IsNotNull(validator.CardType);
+            Assert.IsTrue(validator.CardType is Amex);
+            Assert.IsTrue(validator.Validate("378282246310005", new ValidationErrors()));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void WithNullCardType()
+        {
+            const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+            <objects xmlns='http://www.springframework.net' xmlns:v='http://www.springframework.net/validation'>
+                <v:validator id='ccValidator' test='#this' type='Spring.Validation.Validators.CreditCardValidator, Spring.Core'>
+                  <v:message id='error.airportCode.dummy' providers='summary' when='false'/>
+                </v:validator>
+            </objects>";
+
+            MemoryStream stream = new MemoryStream(new UTF8Encoding().GetBytes(xml));
+            IResource resource = new InputStreamResource(stream, "ccValidator");
+
+            XmlObjectFactory objectFactory = new XmlObjectFactory(resource, null);
+            object obj = objectFactory.GetObject("ccValidator");
+
+            Assert.IsTrue(obj is CreditCardValidator);
+            CreditCardValidator validator = obj as CreditCardValidator;
+            Assert.IsNull(validator.CardType);
+            Assert.IsTrue(validator.Validate("378282246310005", new ValidationErrors()));
+        }
+
+        [Test]
+        public void ErrorTests()
+        {
+            const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+            <objects xmlns='http://www.springframework.net' xmlns:v='http://www.springframework.net/validation'>
+                <object id='ccAmex' type='Spring.Validation.Validators.Amex, Spring.Core'/>
+                <v:validator id='ccValidator' test='Creditcard' type='Spring.Validation.Validators.CreditCardValidator, Spring.Core'>
+                    <v:property name='CardType' ref='ccAmex'/>
+                    <v:message id='errorKey' providers='validationSummary' />
+                </v:validator>
+            </objects>";
+
+            MemoryStream stream = new MemoryStream(new UTF8Encoding().GetBytes(xml));
+            IResource resource = new InputStreamResource(stream, "ccValidator");
+
+            XmlObjectFactory objectFactory = new XmlObjectFactory(resource, null);
+
+            IValidationErrors errors = new ValidationErrors();
+            Contact contact = new Contact();
+            IValidator validator = (IValidator)objectFactory.GetObject("ccValidator");
+
+            contact.Creditcard = "378282246310";
+            bool result = validator.Validate(contact, errors);
+           
+            Assert.IsNotNull(errors.GetErrors("validationSummary"));
+            Assert.IsFalse(result);
+        }    
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/EmailValidatorIntegrationTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/EmailValidatorIntegrationTests.cs
new file mode 100644
index 00000000..da3db52f
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/EmailValidatorIntegrationTests.cs
@@ -0,0 +1,59 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System.IO;
+using System.Text;
+using NUnit.Framework;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// EmailValidatorIntegration integration tests.
+    /// </summary>
+    /// <author>Goran Milosavljevic</author>
+    [TestFixture]
+    public class EmailValidatorIntegrationTests
+    {
+        [Test]
+        public void EmailValidatorTests()
+        {
+            const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+            <objects xmlns='http://www.springframework.net' xmlns:v='http://www.springframework.net/validation'>
+                <v:validator id='emailValidator' test='#this' type='Spring.Validation.Validators.EmailValidator, Spring.Core'/>
+            </objects>";
+            
+            MemoryStream stream = new MemoryStream(new UTF8Encoding().GetBytes(xml));
+            IResource resource = new InputStreamResource(stream, "emailValidator");
+
+            XmlObjectFactory objectFactory = new XmlObjectFactory(resource, null);
+            object obj = objectFactory.GetObject("emailValidator");
+            
+            Assert.IsTrue(obj is IValidator);
+            IValidator validator = obj as IValidator;
+            Assert.IsTrue(validator.Validate("goran@goran.com", new ValidationErrors()));
+        }        
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/ISBNValidatorIntegrationTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/ISBNValidatorIntegrationTests.cs
new file mode 100644
index 00000000..c9abd336
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/ISBNValidatorIntegrationTests.cs
@@ -0,0 +1,61 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System.IO;
+using System.Text;
+using NUnit.Framework;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// ISBNValidatorIntegration integration tests.
+    /// </summary>
+    /// <author>Goran Milosavljevic</author>
+    [TestFixture]
+    public class ISBNValidatorIntegrationTests
+    {
+        [Test]
+        public void ISBNValidatorTests()
+        {
+            const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+            <objects xmlns='http://www.springframework.net' xmlns:v='http://www.springframework.net/validation'>
+                <v:validator id='isbnValidator' test='#this' type='Spring.Validation.Validators.ISBNValidator, Spring.Core'>
+                    <v:message id='error.airportCode.dummy' providers='summary' when='false'/>
+                </v:validator>
+            </objects>";
+            
+            MemoryStream stream = new MemoryStream(new UTF8Encoding().GetBytes(xml));
+            IResource resource = new InputStreamResource(stream, "isbnValidator");
+
+            XmlObjectFactory objectFactory = new XmlObjectFactory(resource, null);
+            object obj = objectFactory.GetObject("isbnValidator");
+            
+            Assert.IsTrue(obj is IValidator);
+            IValidator validator = obj as IValidator;
+            Assert.IsTrue(validator.Validate("978-1-905158-79-9", new ValidationErrors()));
+        }        
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/UrlValidatorIntegrationTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/UrlValidatorIntegrationTests.cs
new file mode 100644
index 00000000..0ae69b93
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/Validators/Integration/UrlValidatorIntegrationTests.cs
@@ -0,0 +1,59 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System.IO;
+using System.Text;
+using NUnit.Framework;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// UrlValidatorIntegration integration tests.
+    /// </summary>
+    /// <author>Goran Milosavljevic</author>
+    [TestFixture]
+    public class UrlValidatorIntegrationTests
+    {
+        [Test]
+        public void ISBNValidatorTests()
+        {
+            const string xml = @"<?xml version='1.0' encoding='UTF-8' ?>
+            <objects xmlns='http://www.springframework.net' xmlns:v='http://www.springframework.net/validation'>
+                <v:validator id='urlValidator' test='#this' type='Spring.Validation.Validators.UrlValidator, Spring.Core'/>
+            </objects>";
+            
+            MemoryStream stream = new MemoryStream(new UTF8Encoding().GetBytes(xml));
+            IResource resource = new InputStreamResource(stream, "urlValidator");
+
+            XmlObjectFactory objectFactory = new XmlObjectFactory(resource, null);
+            object obj = objectFactory.GetObject("urlValidator");
+            
+            Assert.IsTrue(obj is IValidator);
+            IValidator validator = obj as IValidator;
+            Assert.IsTrue(validator.Validate("http://www.springframework.net", new ValidationErrors()));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/RegularExpressionValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/RegularExpressionValidatorTests.cs
new file mode 100644
index 00000000..a1e393a3
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/Validators/RegularExpressionValidatorTests.cs
@@ -0,0 +1,122 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Text.RegularExpressions;
+
+using NUnit.Framework;
+
+using Spring.Expressions;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+	/// <summary>
+	/// Unit tests for the RegularExpressionValidator class.
+	/// </summary>
+	/// <author>Rick Evans</author>
+	[TestFixture]
+	public sealed class RegularExpressionValidatorTests
+	{
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void WithNonString()
+		{
+			RegularExpressionValidator validator = new RegularExpressionValidator();
+			validator.Validate(this, new ValidationErrors());
+		}
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void WithNull()
+        {
+        	RegularExpressionValidator validator = new RegularExpressionValidator();
+            validator.Validate(null, new ValidationErrors());
+        }
+
+		[Test]
+		public void EmptyStringValidatesToTrue()
+		{
+			RegularExpressionValidator validator = new RegularExpressionValidator();
+			Assert.IsTrue(validator.Validate(string.Empty, new ValidationErrors()));
+		}
+
+		[Test]
+		public void WhitespaceStringDoesntEvaluateToTrueByDefault()
+		{
+			RegularExpressionValidator validator = new RegularExpressionValidator();
+			Assert.IsFalse(validator.Validate("   ", new ValidationErrors()));
+		}
+
+		[Test]
+		public void WhitespaceStringOnlyValidatesToTrueWhenGivenMatchingRegex()
+		{
+			RegularExpressionValidator validator = new RegularExpressionValidator();
+			validator.Expression = @"\s*";
+			Assert.IsTrue(validator.Validate("   ", new ValidationErrors()));
+		}
+
+        [Test]
+        public void CaseSensitiveStringMatching()
+        {
+        	RegularExpressionValidator validator = new RegularExpressionValidator("ToString()", "true", @"[A-Z][a-z]*");
+            Assert.IsTrue(validator.Validate("Aleksandar", new ValidationErrors()));
+            Assert.IsFalse(validator.Validate("ALEKSANDAR", new ValidationErrors()));
+            Assert.IsFalse(validator.Validate("aleksandar", new ValidationErrors()));
+        }
+
+        [Test]
+        public void CaseInsensitiveStringMatching()
+        {
+        	RegularExpressionValidator validator = new RegularExpressionValidator("ToString()", "true", @"[A-Z][a-z]*");
+            validator.Options = RegexOptions.IgnoreCase;
+            Assert.IsTrue(validator.Validate("Aleksandar", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("ALEKSANDAR", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("aleksandar", new ValidationErrors()));
+        }
+
+		[Test]
+		public void SunnyDayFailure_Invalid()
+		{
+			RegularExpressionValidator validator = new RegularExpressionValidator(Expression.Parse("'ljwdf87cwbh'"), Expression.Parse("true"), @"((\d{1,2}\.\d{1,3}\.\d{1,3}\.\d{1,3}))");
+			Assert.IsFalse(validator.Validate("ljwdf87cwbh", new ValidationErrors()));
+		}
+
+		[Test]
+		public void SunnyDay_Valid()
+		{
+			RegularExpressionValidator validator = new RegularExpressionValidator();
+			validator.Expression = @"((\d{1,2}\.\d{1,3}\.\d{1,3}\.\d{1,3}))";
+			Assert.IsTrue(validator.Validate("11.222.333.444", new ValidationErrors()));
+		}
+
+        [Test]
+        public void WhenValidatorIsNotEvaluatedBecauseWhenExpressionReturnsFalse()
+        {
+        	RegularExpressionValidator validator = new RegularExpressionValidator("'ljwdf87cwbh'", "false", @"((\d{1,2}\.\d{1,3}\.\d{1,3}\.\d{1,3}))");
+            bool valid = validator.Validate(null, new ValidationErrors());
+            Assert.IsTrue(valid, "Validation should succeed when regex validator is not evaluated.");
+        }
+
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/RequiredValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/RequiredValidatorTests.cs
new file mode 100644
index 00000000..d82ec0cf
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/Validators/RequiredValidatorTests.cs
@@ -0,0 +1,195 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using NUnit.Framework;
+
+using Spring.Expressions;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// Unit tests for the RequiredValidator class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: RequiredValidatorTests.cs,v 1.7 2008/02/05 20:40:27 aseovic Exp $</version>
+    [TestFixture]
+    public sealed class RequiredValidatorTests
+    {
+        [Test]
+        public void WithNull()
+        {
+            RequiredValidator validator = new RequiredValidator();
+            validator.Test = Expression.Parse("null");
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsFalse(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithZeroNumber()
+        {
+            RequiredValidator validator = new RequiredValidator("0", null);
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsFalse(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithPositiveNumber()
+        {
+            RequiredValidator validator = new RequiredValidator(Expression.Parse("100"), null);
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsTrue(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithNegativeNumber()
+        {
+            RequiredValidator validator = new RequiredValidator();
+            validator.Test = Expression.Parse("-100");
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsTrue(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithEmptyString()
+        {
+            RequiredValidator validator = new RequiredValidator("''", null);
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsFalse(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithWhitespaceOnlyString()
+        {
+            RequiredValidator validator = new RequiredValidator(Expression.Parse("'    '"), null);
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsFalse(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithKosherString()
+        {
+            RequiredValidator validator = new RequiredValidator();
+            validator.Test = Expression.Parse("'some non-empty string'");
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsTrue(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithKosherDate()
+        {
+            RequiredValidator validator = new RequiredValidator("DateTime.Today", null);
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsTrue(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithMinDate()
+        {
+            RequiredValidator validator = new RequiredValidator(Expression.Parse("DateTime.MinValue"), null);
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsFalse(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithMaxDate()
+        {
+            RequiredValidator validator = new RequiredValidator();
+            validator.Test = Expression.Parse("DateTime.MaxValue");
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsFalse(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithZeroFloat()
+        {
+            RequiredValidator validator = new RequiredValidator("0.00F", null);
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsFalse(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithKosherFloat()
+        {
+            RequiredValidator validator = new RequiredValidator(Expression.Parse("5.25F"), null);
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsTrue(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithZeroDouble()
+        {
+            RequiredValidator validator = new RequiredValidator("0.00D", null);
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsFalse(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithKosherDouble()
+        {
+            RequiredValidator validator = new RequiredValidator("5.25D", null);
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsTrue(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithMinChar()
+        {
+            RequiredValidator validator = new RequiredValidator();
+            validator.Test = Expression.Parse("char.MinValue");
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsFalse(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithWhitespaceChar()
+        {
+            RequiredValidator validator = new RequiredValidator();
+            validator.Test = Expression.Parse("' '.ToCharArray()[0]");
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsFalse(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WithKosherChar()
+        {
+            RequiredValidator validator = new RequiredValidator();
+            validator.Test = Expression.Parse("'xyz'.ToCharArray()[1]");
+            IValidationErrors errors = new ValidationErrors();
+            Assert.IsTrue(validator.Validate(null, errors));
+        }
+
+        [Test]
+        public void WhenValidatorIsNotEvaluatedBecauseWhenExpressionReturnsFalse()
+        {
+            RequiredValidator validator = new RequiredValidator("DateTime.MinValue", "false");
+            IValidationErrors errors = new ValidationErrors();
+
+            bool valid = validator.Validate(new object(), null, errors);
+
+            Assert.IsTrue(valid, "Validation should succeed when required validator is not evaluated.");
+            Assert.AreEqual(0, errors.GetErrors("errors").Count);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Validation/Validators/UrlValidatorTests.cs b/test/Spring/Spring.Core.Tests/Validation/Validators/UrlValidatorTests.cs
new file mode 100644
index 00000000..cd430002
--- /dev/null
+++ b/test/Spring/Spring.Core.Tests/Validation/Validators/UrlValidatorTests.cs
@@ -0,0 +1,67 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Text.RegularExpressions;
+using NUnit.Framework;
+
+using Spring.Context.Support;
+using Spring.Expressions;
+using Spring.Validation.Actions;
+
+#endregion
+
+namespace Spring.Validation.Validators
+{
+    /// <summary>
+    /// Unit tests for the UrlValidator class.
+    /// </summary>
+    /// <author>Goran Milosavljevic</author>
+    [TestFixture]
+    public sealed class UrlValidatorTests
+    {              
+        [Test]
+        public void Validate()
+        {
+            UrlValidator validator = new UrlValidator();
+            Assert.IsTrue(validator.Validate("http://puzzle.com", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("http://www.com", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("www.1.org", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("ww.1.com", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("http://www.google-com.123.com", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("https://www.google-com.com", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("http://google-com.com", new ValidationErrors()));
+            // just to make sure that we are ready for the Japanese market :)
+            Assert.IsTrue(validator.Validate("www.amazon.co.jp/C-�よるプログラミングWindows-上-Charles-Petzold/dp/4891002921", new ValidationErrors()));
+
+            Assert.IsFalse(validator.Validate("http://.com", new ValidationErrors()));
+            Assert.IsFalse(validator.Validate("http://www.google-com.123", new ValidationErrors()));
+            Assert.IsFalse(validator.Validate("http://1.1", new ValidationErrors()));
+            Assert.IsFalse(validator.Validate("ht:1.1", new ValidationErrors()));
+            Assert.IsFalse(validator.Validate("/:www.1.com", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate("", new ValidationErrors()));
+            Assert.IsTrue(validator.Validate(" ", new ValidationErrors()));             
+            Assert.IsTrue(validator.Validate(null, new ValidationErrors()));             
+        }
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/AssemblyInfo.cs b/test/Spring/Spring.Data.Integration.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..6263a7ed
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("Spring.Data.Integration Tests")]
+[assembly: AssemblyDescription("Integration tests for Spring.Data assembly")]
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AccountCreditDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AccountCreditDao.cs
new file mode 100644
index 00000000..50a9f67c
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/AccountCreditDao.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Data;
+using Spring.Data.Core;
+using Spring.Transaction.Interceptor;
+
+namespace Spring.Data
+{
+    public class AccountCreditDao : AdoDaoSupport, IAccountCreditDao
+    {
+       
+        public AccountCreditDao()
+        {
+        }
+
+        [Transaction()]
+        public void CreateCredit(float creditAmount)
+        {
+            AdoTemplate.ExecuteNonQuery(CommandType.Text,
+                    String.Format("insert into Credits (CreditAmount) VALUES ({0})",
+                    creditAmount));
+        }
+
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AccountDebitDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AccountDebitDao.cs
new file mode 100644
index 00000000..16e26a82
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/AccountDebitDao.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Data;
+using Spring.Data.Core;
+using Spring.Data.Support;
+
+namespace Spring.Data
+{
+    public class AccountDebitDao : AdoDaoSupport, IAccountDebitDao
+    {
+
+        public AccountDebitDao()
+        {
+        }
+
+        public void DebitAccount(float debitAmount)
+        {
+            AdoTemplate.ExecuteNonQuery(CommandType.Text, String.Format("insert into dbo.Debits (DebitAmount) VALUES ({0})",
+                                                                        debitAmount));
+        }
+
+
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AccountManager.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AccountManager.cs
new file mode 100644
index 00000000..7de83921
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/AccountManager.cs
@@ -0,0 +1,40 @@
+
+using System;
+using System.Data;
+using Spring.Transaction.Interceptor;
+
+namespace Spring.Data
+{
+    public class AccountManager : IAccountManager
+    {
+        private IAccountCreditDao creditDao;
+        private IAccountDebitDao debitDao;
+
+        public AccountManager()
+        {
+        }
+
+        public IAccountCreditDao AccountCreditDao
+        {
+            get { return creditDao; }
+            set { creditDao = value; }
+        }
+
+        public IAccountDebitDao AccountDebitDao
+        {
+            get { return debitDao; }
+            set { debitDao = value; }
+        }
+
+        [Transaction]
+        public void DoTransfer(float creditAmount, float debitAmount)
+        {
+            creditDao.CreateCredit(creditAmount);
+            debitDao.DebitAccount(debitAmount);
+ 
+        }
+
+    }
+
+
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AdoDaoTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AdoDaoTests.cs
new file mode 100644
index 00000000..120708b7
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/AdoDaoTests.cs
@@ -0,0 +1,87 @@
+using System;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Dao;
+using Spring.Objects;
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// Summary description for AdoTemplateTests.
+	/// </summary>
+	[TestFixture]
+	public class AdoDaoTests
+	{
+		public AdoDaoTests()
+		{
+		}	    	    
+
+	    [Test]
+	    public void SimpleCreate()
+	    {
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/nativeAdoTests.xml");
+            Assert.IsNotNull(ctx);
+            ITestObjectDao dao = (ITestObjectDao)ctx["testObjectDao"];
+            Assert.IsNotNull(dao);
+            dao.Create("John", 44);
+	    }
+        [Test]
+        public void SimpleDao()
+        {
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/templateTests.xml");
+            Assert.IsNotNull(ctx);
+            TestObjectDao dao = (TestObjectDao)ctx["testObjectDao"];
+            Assert.IsNotNull(dao);
+            Assert.AreEqual(10, dao.GetCount());
+            
+            Assert.AreEqual(3, dao.GetCount(33));
+            Assert.AreEqual(3, dao.GetCountByAltMethod(33));
+            Assert.AreEqual(3, dao.GetCountByCommandSetter(33));            
+            Assert.AreEqual(2, dao.GetCount(33,"George"));
+            
+            
+        }
+
+        [Test]
+        public void SimpleDao2()
+        {
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/templateTests.xml");
+            Assert.IsNotNull(ctx);
+            TestObjectDao dao = (TestObjectDao)ctx["testObjectDao"];
+            Assert.IsNotNull(dao);
+            Assert.AreEqual(1, dao.GetCountByDelegate());
+        }
+
+        [Test]
+        public void DaoOperations()
+        {
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/templateTests.xml");
+            Assert.IsNotNull(ctx);
+            TestObjectDao dao = (TestObjectDao)ctx["testObjectDao"];
+            dao.Create("George", 33);
+            TestObject to = dao.FindByName("George");
+            Assert.IsNotNull(to);
+            Assert.AreEqual("George", to.Name);
+            Assert.AreEqual(33, to.Age);
+
+            to.Age=34;
+            dao.Update(to);
+
+            TestObject to2 = dao.FindByName("George");
+            Assert.AreEqual(34, to2.Age);
+
+            dao.Delete("George");
+
+            TestObject to3 = dao.FindByName("George");
+            Assert.IsNull(to3);
+
+
+
+        }
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplatePerformanceTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplatePerformanceTests.cs
new file mode 100644
index 00000000..40606197
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplatePerformanceTests.cs
@@ -0,0 +1,269 @@
+#if NET_2_0
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using System.Diagnostics;
+using System.Threading;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Core;
+using Spring.Reflection.Dynamic;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// This calss contains tests for 
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AdoTemplatePerformanceTests.cs,v 1.1 2008/02/04 22:44:59 markpollack Exp $</version>
+    [TestFixture]
+    public class AdoTemplatePerformanceTests
+    {
+        private AdoTemplate adoTemplate;
+        private string cmdText = "insert into TestObjects(Age, Name) VALUES (24, 'John')";
+        private DateTime start, stop;
+
+        [SetUp]
+        public void CreateAdoTemplate()
+        {
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/adoTemplateTests.xml");
+            Assert.IsNotNull(ctx);
+            adoTemplate = ctx["adoTemplate"] as AdoTemplate;
+            Assert.IsNotNull(adoTemplate);
+            //CleanDb();
+        }
+
+        private void CleanDb()
+        {
+            adoTemplate.ExecuteNonQuery(CommandType.Text, "truncate table TestObjects");
+        }
+
+        [Test]
+        public void PerformanceWithOneTxTests()
+        {
+            UseAdoTemplateApiOneTx(1000);
+            CleanDb();
+        }
+
+        [Test]
+        public void PerformanceTests()
+        {
+            for (int i = 0; i < 10; i++)
+                DoTest(10000, true, 5000, true);
+        }
+
+        [Test]
+        public void ObjectInstantiatonTests()
+        {
+            int numIterations = 1000000;
+
+
+            start = DateTime.Now;
+            Type t = typeof (AccountCreditDao);
+            for (int i = 0; i < numIterations; i++)
+            {
+                //ObjectUtils.IsInstantiable(t);
+                IDynamicConstructor dc = DynamicConstructor.Create(t.GetConstructor(Type.EmptyTypes));                       
+                dc.Invoke(ObjectUtils.EmptyObjects);
+            }
+            stop = DateTime.Now;
+            double timeElapsed = Elapsed;
+            PrintTest("SafeConstructor", numIterations, timeElapsed);
+
+            start = DateTime.Now;
+            for (int i = 0; i < numIterations; i++)
+            {
+                ObjectUtils.InstantiateType(typeof (AccountCreditDao));
+            }
+            stop = DateTime.Now;
+            timeElapsed = Elapsed;
+            PrintTest("InstantiateType", numIterations, timeElapsed);
+
+        }
+
+        private void DoTest(int numIterations, bool standardApiFirst, int sleepTimeMs, bool oneTx)
+        {
+            Console.WriteLine("sleeping for " + sleepTimeMs);
+            Thread.Sleep(sleepTimeMs);
+            double stdTime;
+            double templateTime;
+            if (standardApiFirst)
+            {
+                if (oneTx)
+                {
+                    stdTime = UseStandardApiOneTx(numIterations);
+                }
+                else
+                {
+                    stdTime = UseStandardApi(numIterations);
+                }
+
+                CleanDb();
+                Console.WriteLine("sleeping for " + sleepTimeMs);
+                Thread.Sleep(sleepTimeMs);
+
+                if (oneTx)
+                {
+                    templateTime = UseAdoTemplateApiOneTx(numIterations);
+                }
+                else
+                {
+                    templateTime = UseAdoTemplateApi(numIterations);
+                }
+
+                CleanDb();
+            }
+            else
+            {
+                if (oneTx)
+                {
+                    templateTime = UseAdoTemplateApiOneTx(numIterations);
+                }
+                else
+                {
+                    templateTime = UseAdoTemplateApi(numIterations);
+                }
+
+                CleanDb();
+                Console.WriteLine("sleeping for " + sleepTimeMs);
+                Thread.Sleep(sleepTimeMs);
+
+                if (oneTx)
+                {
+                    stdTime = UseStandardApiOneTx(numIterations);
+                }
+                else
+                {
+                    stdTime = UseStandardApi(numIterations);
+                }
+
+                CleanDb();
+            }
+            Console.WriteLine("stdTime = " + stdTime + ", templateTime = " + templateTime);
+            double percentDiff = ((2*Math.Abs(stdTime - templateTime))/(stdTime + templateTime))*100;
+            Console.WriteLine("stdTime-templateTime=" + (stdTime - templateTime));
+            Console.WriteLine("% diff = " + percentDiff);
+        }
+
+        private double UseAdoTemplateApiOneTx(int numIterations)
+        {
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(adoTemplate.DbProvider);
+
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            double timeElapsed = 0;
+            tt.Execute(delegate(ITransactionStatus status)
+                           {
+                               start = DateTime.Now;
+                               for (int i = 0; i < numIterations; i++)
+                               {
+                                   adoTemplate.ExecuteNonQuery(CommandType.Text, cmdText);
+                               }
+                               stop = DateTime.Now;
+                               timeElapsed = Elapsed;
+                               PrintTest("AdoTemplateApi", numIterations, timeElapsed);
+                               return null;
+                           });
+            return timeElapsed;
+        }
+
+        private double UseAdoTemplateApi(int numIterations)
+        {
+            start = DateTime.Now;
+            for (int i = 0; i < numIterations; i++)
+            {
+                adoTemplate.ExecuteNonQuery(CommandType.Text, cmdText);
+            }
+            stop = DateTime.Now;
+            double timeElapsed = Elapsed;
+            PrintTest("AdoTemplateApi", numIterations, timeElapsed);
+            return timeElapsed;
+        }
+
+        private double UseStandardApiOneTx(int numIterations)
+        {
+            start = DateTime.Now;
+            using (SqlConnection connection = new SqlConnection(adoTemplate.DbProvider.ConnectionString))
+            {
+                using (SqlCommand command = new SqlCommand(cmdText, connection))
+                {
+                    connection.Open();
+                    SqlTransaction transaction = connection.BeginTransaction();
+                    command.Transaction = transaction;
+                    for (int i = 0; i < numIterations; i++)
+                    {
+                        command.ExecuteNonQuery();
+                    }
+                    // no error handling....
+                    transaction.Commit();                    
+                }
+            }
+            stop = DateTime.Now;
+            double timeElapsed = Elapsed;
+            PrintTest("StandardAPI", numIterations, timeElapsed);
+            return timeElapsed;
+        }
+
+        private double UseStandardApi(int numIterations)
+        {
+            start = DateTime.Now;
+            for (int i = 0; i < numIterations; i++)
+            {
+                using (SqlConnection connection = new SqlConnection(adoTemplate.DbProvider.ConnectionString))
+                {
+                    using (SqlCommand command = new SqlCommand(cmdText, connection))
+                    {
+                        connection.Open();
+                        command.ExecuteNonQuery();
+                    }
+                }
+            }
+            stop = DateTime.Now;
+            double timeElapsed = Elapsed;
+            PrintTest("StandardAPI", numIterations, timeElapsed);
+            return timeElapsed;
+        }
+
+
+        private double Elapsed
+        {
+            get { return (stop.Ticks - start.Ticks)/10000000f; }
+        }
+
+        private static void PrintTest(string name, int iterations, double duration)
+        {
+            Debug.WriteLine(
+                String.Format("{0,-60} {1,12:#,###} {2,12:##0.000} {3,12:#,###}", name, iterations, duration,
+                              iterations/duration));
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplateTests.cs
new file mode 100644
index 00000000..553e98af
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplateTests.cs
@@ -0,0 +1,288 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using System.Data.Common;
+using Common.Logging;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Common;
+using Spring.Data.Core;
+using Spring.Data.Support;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// Simple exercising of the AdoTemplate 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: AdoTemplateTests.cs,v 1.11 2008/01/29 18:22:33 markpollack Exp $</version>
+	[TestFixture]
+	public class AdoTemplateTests 
+	{
+		#region Fields
+        
+	    IAdoOperations adoOperations;
+	    IDbProvider dbProvider;
+	    
+		#endregion
+
+		#region Constants
+
+		/// <summary>
+		/// The shared ILog instance for this class (and derived classes). 
+		/// </summary>
+		protected static readonly ILog log =
+			LogManager.GetLogger(typeof (AdoTemplateTests));
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="AdoTemplateTests"/> class.
+                /// </summary>
+		public 	AdoTemplateTests()
+		{
+
+		}
+
+		#endregion
+
+		#region Methods
+	    
+	    [SetUp]
+        public void CreateAdoTemplate()
+        {
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/adoTemplateTests.xml");
+            Assert.IsNotNull(ctx);
+            dbProvider = ctx["DbProvider"] as IDbProvider;
+            Assert.IsNotNull(dbProvider);
+	        UserCredentialsDbProvider userCredentialsDbProvider = dbProvider as UserCredentialsDbProvider;
+            Assert.IsNotNull(userCredentialsDbProvider);
+
+	        //userCredentialsDbProvider.Username = "User ID=springqa";
+	        //userCredentialsDbProvider.Password = "Password=springqa";
+            userCredentialsDbProvider.SetCredentialsForCurrentThread("User ID=springqa", "Password=springqa");
+            adoOperations = new AdoTemplate(userCredentialsDbProvider);
+            
+        }
+	    
+	    
+	    
+	    [Test]
+	    public void FillDataSetNoParams()
+	    {
+	        String sql = "select TestObjectNo, Age, Name from TestObjects";
+	        DataSet dataSet = new DataSet();
+	        adoOperations.DataSetFill(dataSet, CommandType.Text, sql);
+	        Assert.AreEqual(1, dataSet.Tables.Count);
+	        Assert.AreEqual(4, dataSet.Tables["Table"].Rows.Count);
+	        
+	        dataSet = new DataSet();
+	        adoOperations.DataSetFill(dataSet, CommandType.Text, sql, new string[] {"TestObjects"});
+            Assert.AreEqual(1, dataSet.Tables.Count);
+            Assert.AreEqual(4, dataSet.Tables["TestObjects"].Rows.Count);
+	        
+	        dataSet = new DataSet();
+	        DataTableMappingCollection mappingCollection = 
+	            new DataTableMappingCollection();
+	        DataTableMapping testObjectsMapping = mappingCollection.Add("Table", "TestObjects");
+	        testObjectsMapping.ColumnMappings.Add("TestObjectNo", "UserID");
+	        testObjectsMapping.ColumnMappings.Add("Name", "UserName");
+            adoOperations.DataSetFill(dataSet, CommandType.Text, sql, mappingCollection);
+            Assert.AreEqual(1, dataSet.Tables.Count);
+            Assert.AreEqual(4, dataSet.Tables["TestObjects"].Rows.Count);	        
+	        foreach (DataRow testObjectRow in dataSet.Tables["TestObjects"].Rows)
+	        {
+	            Assert.IsNotNull(testObjectRow["UserID"]);
+	            Assert.IsNotNull(testObjectRow["Age"]);
+	            Assert.IsNotNull(testObjectRow["UserName"]);
+	        }
+	        
+	    }
+	    
+	    [Test]
+	    public void UpdateDataSet()
+	    {
+            String sql = "select TestObjectNo, Age, Name from TestObjects";
+            DataSet dataSet = new DataSet();
+            adoOperations.DataSetFill(dataSet, CommandType.Text, sql, new string[] {"TestObjects"});
+	        
+	        //Create and add new row.
+            DataRow myDataRow = dataSet.Tables["TestObjects"].NewRow();
+            myDataRow["Age"] = 101;
+            myDataRow["Name"] = "OldManWinter";    
+            dataSet.Tables["TestObjects"].Rows.Add(myDataRow);
+	        
+	        //TODO - think about api...
+	        IDbCommand insertCommand = dbProvider.CreateCommand();
+	        insertCommand.CommandText = "insert into TestObjects(Age,Name) values (@Age,@Name)";
+            IDbParameters parameters = adoOperations.CreateDbParameters();
+            parameters.Add("Name", DbType.String, 12, "Name");
+	        //TODO - remembering the -1 isn't all that natural... add string name, dbtype, string sourceCol)
+	        //or AddSourceCol("Age", SqlDbType.Int);  would copy into source col?
+            parameters.Add("Age", SqlDbType.Int, -1, "Age");
+	        
+	        //TODO - this isn't all that natural...
+	        ParameterUtils.CopyParameters(insertCommand, parameters);
+	        
+	        //insertCommand.Parameters.Add()
+	        
+	        adoOperations.DataSetUpdate(dataSet, "TestObjects", 
+	                                    insertCommand,
+	                                    null,
+	                                    null);
+
+	        //TODO avoid param Utils copy by adding argument...
+	        	        
+            //adoOperations.DataSetUpdate(dataSet, "TestObjects", 
+            //                            insertCommand, parameters,
+            //                            null, null,
+            //                            null, null);
+
+            //adoOperations.DataSetUpdate(dataSet, "TestObjects", 
+            //                            CommandType type, string sql, parameters,
+            //                            null, null,
+            //                            null, null);
+	        
+            //TODO how about breaking up the operations...
+
+	    }
+	    
+	    [Test]
+	    public void ExecuteQueryWithResultSetExtractor()
+	    {
+	        IResultSetExtractor rse = new TestObjectExtractor();
+	        String sql = "select TestObjectNo, Age, Name from TestObjects";
+	        IList testObjectList = (IList)adoOperations.QueryWithResultSetExtractor(CommandType.Text, sql, rse);
+	        Assert.AreEqual(1, testObjectList.Count);
+	        
+	        
+	        
+	    }
+
+
+	    [Test]
+	    public void ExecuteNonQueryText()
+	    {            
+	        int age = 18;
+	        int counter = 0;
+            String sql = String.Format("insert into TestObjects(Age, Name) VALUES ({0}, '{1}')", 
+                age++, "George" + counter++);
+	        adoOperations.ExecuteNonQuery(CommandType.Text, sql);
+            
+	        
+	        sql = "insert into TestObjects(Age,Name) values (@Age,@Name)";
+	        
+	        //One liners are hard due to no standard 'fallback' to use of '?' for property
+	        //placeholders.  Providers that use named parameters must always use named
+	        //parameters in SQL string.
+	        
+	        //NamedParameterAdoOperations ...
+	        
+	        
+	        //More portable IDbDataParameterCollection implemenation.
+	        // -> IDbParameters
+	        //Functionality of .NET 2.0 DbParameterCollection + common helper methods that
+	        //are commonly found (still) in subclasses.
+	        
+	        //How to create parameter collections?
+	        //1. Get as much milage/portabiliyt out of basic provider interface and 
+	        //    IDbDataParameter/IDataParameterCollection
+	        //    DbParameter/DbParameterCollection
+	        //    a. Must use only base DbType (can't cast as no shared base enumeration)
+	        //    b. Must use parameter prefix
+	        //    c. CLR null and DBNull.Value mapping.
+	        //    c. IsNullable is not writable in IDbDataParameter interface  (1.1 only)
+	        //    c2. SourceColumnNullMapping?
+	        //    d. No convenient Add( parameter data ) methods in 
+	        //       base Parameter Collection classes
+	        //       despite prevalence in provider implementations.
+	        //    d1. re-use of parameters - parameters are aware if they have been added to
+	        //        a collection of another command object.
+	        //    e. verbose
+
+	        
+	        IDbParameters parametersCreated = new DbParameters(dbProvider);
+
+	        IDbDataParameter p = dbProvider.CreateParameter();
+	        p.ParameterName = "@Name";
+	        p.DbType = DbType.String;
+	        p.Size = 12;
+	        p.Value = "George" + counter++;
+	        parametersCreated.AddParameter(p);
+	        
+            IDbDataParameter p2 = dbProvider.CreateParameter();
+            p2.ParameterName = "@Age";
+            p2.DbType = DbType.Int32;
+            p2.Value = age++;
+            parametersCreated.AddParameter(p2);
+	        
+        
+	        
+	        adoOperations.ExecuteNonQuery(CommandType.Text, sql, parametersCreated);
+	        
+	        //2.  Use IDbParameters abstraction.
+	        //    e. less verbose...
+            IDbParameters parameters = adoOperations.CreateDbParameters();
+            parameters.Add("Name", DbType.String, 12).Value = "George" + counter++;
+	        parameters.Add("Age", SqlDbType.Int).Value = age++;
+	        
+	        //Better to use date example...people like to pick provider specific subtype..
+            //parameters.AddWithValue("Age", age++);
+	        
+	        //parameters get 'cloned' before association with command, output values
+	        //are re-associated, and so the parameter collection is re-usable.
+	        adoOperations.ExecuteNonQuery(CommandType.Text, sql, parameters);
+	        
+	    }
+	    
+
+	    
+		#endregion
+
+        private class TestObjectExtractor    : IResultSetExtractor
+        {
+            public object ExtractData(IDataReader reader)
+            {
+                IList testObjects = new ArrayList();
+                while(reader.Read())
+                {   
+                    TestObject to = new TestObject();
+                    to.ObjectNumber = reader.GetInt32(0);
+                    to.Age = reader.GetInt32(1);
+                    to.Name = reader.GetString(2);
+                    testObjects.Add(to);
+                }	                
+                return testObjects;
+            }
+        }
+
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AutoDeclarativeTxTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AutoDeclarativeTxTests.cs
new file mode 100644
index 00000000..4956d835
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/AutoDeclarativeTxTests.cs
@@ -0,0 +1,76 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Common;
+using Spring.Transaction;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// Test case that uses the approach of automatically creating 
+	/// declarative transaction interceptors for objects identified via means
+	/// of transaction attributes.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: AutoDeclarativeTxTests.cs,v 1.4 2007/05/26 00:43:01 markpollack Exp $</version>
+	[TestFixture]
+	public class AutoDeclarativeTxTests 
+	{
+        private IDbProvider dbProvider;
+
+        private IPlatformTransactionManager transactionManager;
+
+        private IApplicationContext ctx;
+
+        [SetUp]
+        public void SetUp()
+        {
+            ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/autoDeclarativeServices.xml");
+            dbProvider = ctx["DbProvider"] as IDbProvider;
+            transactionManager = ctx["adoTransactionManager"] as IPlatformTransactionManager;
+            
+        }
+
+        [Test]
+        public void DeclarativeWithAttributes()
+        {
+            ITestObjectManager mgr = ctx["testObjectManager"] as ITestObjectManager; 
+            TestObjectDao dao = (TestObjectDao)ctx["testObjectDao"];
+            TransactionTemplateTests.PerformOperations(mgr, dao); 
+        }
+
+        [Test]
+        public void CoordinatorDeclarativeWithAttributes()
+        {
+            ITestCoordinator coord = ctx["testCoordinator"] as ITestCoordinator;
+            TestObjectDao dao = (TestObjectDao)ctx["testObjectDao"];
+            TransactionTemplateTests.PerformOperations(coord, dao);
+        }
+
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/CallCreateTestObject.cs b/test/Spring/Spring.Data.Integration.Tests/Data/CallCreateTestObject.cs
new file mode 100644
index 00000000..b292e42a
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/CallCreateTestObject.cs
@@ -0,0 +1,62 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Data.Common;
+using Spring.Data.Objects;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// Simple stored procedure with only 'in' args to create a testobject record 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: CallCreateTestObject.cs,v 1.2 2006/06/21 14:07:30 markpollack Exp $</version>
+	public class CallCreateTestObject : StoredProcedure
+	{
+        private static string procedureName = "CreateTestObject";
+	    
+        public CallCreateTestObject(IDbProvider dbProvider) : base(dbProvider, procedureName)
+		{
+            DeriveParameters();
+		    Compile();
+		}
+
+        public void Create(string name, int age)
+        {
+            //if know the ordering of input parameters for the SP
+            ExecuteNonQuery(name, age);
+            
+            //if want to use named params
+            /*
+            IDictionary inParams = new Hashtable();
+            inParams["@name"] = name;
+            inParams["@age"] = age;
+            IDictionary outParams = ExecuteNonQuery(inParams);
+            */
+        }
+
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/ConsoleLoggingAroundAdvice.cs b/test/Spring/Spring.Data.Integration.Tests/Data/ConsoleLoggingAroundAdvice.cs
new file mode 100644
index 00000000..63b1aaf4
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/ConsoleLoggingAroundAdvice.cs
@@ -0,0 +1,18 @@
+using System;
+using AopAlliance.Intercept;
+using Common.Logging;
+
+namespace Spring.Data
+{
+    public class ConsoleLoggingAroundAdvice : IMethodInterceptor
+    {
+        private static readonly ILog LOG = LogManager.GetLogger(typeof(ConsoleLoggingAroundAdvice));
+        public object Invoke(IMethodInvocation invocation)
+        {
+            LOG.Debug("Advice executing; calling the advised method [" + invocation.Method.Name + "]");
+            object returnValue = invocation.Proceed();
+            LOG.Debug("Advice executed; advised method [" + invocation.Method.Name + "] returned " + returnValue);
+            return returnValue;
+        }
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/CreateTestObject.sql b/test/Spring/Spring.Data.Integration.Tests/Data/CreateTestObject.sql
new file mode 100644
index 00000000..f5943fd0
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/CreateTestObject.sql
@@ -0,0 +1,7 @@
+CREATE PROCEDURE CreateTestObject
+{
+  @Age int,
+  @Name varchar(15)
+} AS
+
+INSERT INTO into TestObjects(Age, Name) VALUES (@Age, @Name)
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/CreateTestObjectNonQuery.cs b/test/Spring/Spring.Data.Integration.Tests/Data/CreateTestObjectNonQuery.cs
new file mode 100644
index 00000000..c5446208
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/CreateTestObjectNonQuery.cs
@@ -0,0 +1,55 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using Spring.Data.Common;
+using Spring.Data.Objects;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// Simple insert non query object with 'in' args to create a testobject.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: CreateTestObjectNonQuery.cs,v 1.2 2008/01/29 18:22:33 markpollack Exp $</version>
+	public class CreateTestObjectNonQuery : AdoNonQuery
+	{
+        private static string sql = "insert into TestObjects(Age,Name) values (@Age,@Name)";
+	    
+        public CreateTestObjectNonQuery(IDbProvider dbProvider) : base(dbProvider, sql)
+		{
+            DeclaredParameters.Add("Age", DbType.Int32);
+            DeclaredParameters.Add("Name", SqlDbType.NVarChar, 16);
+		    Compile();
+		}
+
+        public void Create(string name, int age)
+        {
+            ExecuteNonQuery(name, age);
+        }
+
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/CreditsDebitsSchema.sql b/test/Spring/Spring.Data.Integration.Tests/Data/CreditsDebitsSchema.sql
new file mode 100644
index 00000000..6566603a
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/CreditsDebitsSchema.sql
@@ -0,0 +1,51 @@
+USE [CreditsAndDebits]
+CREATE TABLE [Credits](
+	[CreditID] [int] IDENTITY NOT NULL,
+	[CreditAmount] [float] NOT NULL,
+ CONSTRAINT [PK_CreditID] PRIMARY KEY CLUSTERED 
+(
+	[CreditID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+
+USE [CreditsAndDebits]
+GO
+CREATE TABLE [Debits](
+	[DebitID] [int] IDENTITY NOT NULL,
+	[DebitAmount] [float] NOT NULL,
+ CONSTRAINT [PK_DebitID] PRIMARY KEY CLUSTERED 
+(
+	[DebitID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+
+
+USE [Credits]
+GO
+CREATE TABLE [Credits](
+	[CreditID] [int] IDENTITY NOT NULL,
+	[CreditAmount] [float] NOT NULL,
+ CONSTRAINT [PK_CreditID] PRIMARY KEY CLUSTERED 
+(
+	[CreditID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+
+USE [Debits]
+GO
+CREATE TABLE [Debits](
+	[DebitID] [int] IDENTITY NOT NULL,
+	[DebitAmount] [float] NOT NULL,
+ CONSTRAINT [PK_DebitID] PRIMARY KEY CLUSTERED 
+(
+	[DebitID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DTC1.1AppContext.xml b/test/Spring/Spring.Data.Integration.Tests/Data/DTC1.1AppContext.xml
new file mode 100644
index 00000000..ea5eb9aa
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/DTC1.1AppContext.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns='http://www.springframework.net'>
+
+    <!-- Available Catalogs: CreditsAndDebits, Credits, Debits -->
+    <!-- Database Providers -->
+    
+    <!-- for demos this serves double duty for CreditsAndDebits -->
+    <!-- for demos remember to change dbprovider for adoTemplateForDebitDb -->
+    
+    <object id="DbProvider" type="Spring.Data.Support.SqlProvider, Spring.Data">
+      <property name="ConnectionString" 
+                value="Data Source=NYCSUMPOLLL;Initial Catalog=Credits;Integrated Security=True"/>          
+    </object>
+
+    
+    <object id="DebitDbProvider" type="Spring.Data.Support.SqlProvider, Spring.Data">
+      <property name="ConnectionString" 
+                value="Data Source=NYCSUMPOLLL;Initial Catalog=Debits;Integrated Security=True"/>
+    </object>
+    
+    
+    <!-- Transaction Manager -->
+    <object id="transactionManager" 
+            type="Spring.Data.ServiceDomainPlatformTransactionManager, Spring.Data">
+    </object>
+    <!--
+    <object id="transactionManager" 
+            type="Spring.Data.AdoPlatformTransactionManager, Spring.Data">
+      <property name="DbProvider" ref="DbProvider"/>
+    </object>
+    -->
+    
+    <!--
+    <object id="transactionManager"
+            type="Spring.Data.TxScopeTransactionManager, Spring.Data">
+    </object>
+    -->   
+ 
+  <!-- AdoTemplate for DAO Implementation -->
+  <object id="adoTemplate" type="Spring.Data.AdoTemplate, Spring.Data">
+    <property name="DbProvider" ref="DbProvider"/>
+  </object>
+
+  <object id="adoTemplateForDebitDb" type="Spring.Data.AdoTemplate, Spring.Data">
+    <property name="DbProvider" ref="DebitDbProvider"/>
+  </object>
+
+  <!-- DAO Implementations -->
+  <object id="accountCreditDao" type="Spring.Data.AccountCreditDao, Spring.Data.Integration.Tests">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="accountDebitDao" type="Spring.Data.AccountDebitDao, Spring.Data.Integration.Tests">
+      <property name="AdoTemplate" ref="adoTemplateForDebitDb"/>
+  </object>
+
+  <!-- AOP Transactional Proxy Configuration for 'ServiceLayer' -->
+  
+    <!-- The DAO object that performs multiple data access operations -->
+    <object id="accountManagerTarget" 
+            type="Spring.Data.AccountManager, Spring.Data.Integration.Tests">
+      <property name="AccountCreditDao" ref="accountCreditDao"/>
+      <property name="AccountDebitDao" ref="accountDebitDao"/>
+    </object>
+
+
+    
+    <!-- Transactional Proxy for TestObjectManager using the ProxyFactoryObject -->
+    <object id="accountManager" 
+            type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+        
+        <property name="Target" ref="accountManagerTarget"/>
+        <property name="ProxyInterfaces">
+            <value>Spring.Data.IAccountManager</value>
+        </property>
+        <property name="InterceptorNames">
+            <value>transactionInterceptor</value>
+        </property>  
+            
+    </object>
+
+
+  <!-- Transaction Interceptor -->
+  <object id="transactionInterceptor" 
+          type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data">
+    <property name="TransactionManager" ref="transactionManager"/>
+    <!-- note do not have converter from string to this property type registered -->
+    <property name="TransactionAttributeSource" ref="attributeTransactionAttributeSource"/>
+  </object>
+
+  <object id="attributeTransactionAttributeSource"
+          type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data">
+  </object>
+
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContext.xml b/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContext.xml
new file mode 100644
index 00000000..14554243
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContext.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns='http://www.springframework.net'
+         xmlns:d="http://www.springframework.net/database"
+         xmlns:tx="http://www.springframework.net/tx"
+         xmlns:aop="http://www.springframework.net/aop">
+
+
+  <!-- Available Catalogs: CreditsAndDebits, Credits, Debits -->
+
+  <!-- Database Providers -->
+
+  <d:provider id="DebitDbProvider"
+               provider="SqlServer-2.0"                                       
+               connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Debits;Persist Security Info=True;User ID=springqa;Password=springqa"/>
+  <!--
+               connectionString="Data Source=NYCSUMPOLLL\SQLEXPRESS;Initial Catalog=Debits;Integrated Security=True;Pooling=False"/>
+           -->
+
+  <d:provider id="DbProvider"
+                provider="SqlServer-2.0"
+                connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Credits;Persist Security Info=True;User ID=springqa;Password=springqa"/>
+  <!--
+                  connectionString="Data Source=NYCSUMPOLLL\SQLEXPRESS;Initial Catalog=Credits;Integrated Security=True;Pooling=False"/>
+                  -->
+
+
+
+  <!-- Transaction Manager -->
+  <!--
+    <object id="transactionManager" 
+            type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data">
+      <property name="DbProvider" ref="DbProvider"/>
+    </object>
+    -->
+
+  <object id="transactionManager"
+          type="Spring.Data.Core.TxScopeTransactionManager, Spring.Data">
+  </object>
+
+
+  <!-- AdoTemplate for DAO Implementation -->
+  <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
+    <property name="DbProvider" ref="DbProvider"/>
+  </object>
+
+  <object id="adoTemplateForDebitDb" type="Spring.Data.Core.AdoTemplate, Spring.Data">
+    <property name="DbProvider" ref="DebitDbProvider"/>
+  </object>
+
+  <!-- DAO Implementations -->
+  <object id="accountCreditDao" type="Spring.Data.AccountCreditDao, Spring.Data.Integration.Tests">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="accountDebitDao" type="Spring.Data.AccountDebitDao, Spring.Data.Integration.Tests">
+    <property name="AdoTemplate" ref="adoTemplateForDebitDb"/>
+  </object>
+
+  <!-- AOP Transactional Proxy Configuration for 'ServiceLayer' -->
+
+  <!-- The DAO object that performs multiple data access operations -->
+  <object id="accountManager"
+          type="Spring.Data.AccountManager, Spring.Data.Integration.Tests">
+    <property name="AccountCreditDao" ref="accountCreditDao"/>
+    <property name="AccountDebitDao" ref="accountDebitDao"/>
+  </object>
+
+
+  <tx:attribute-driven transaction-manager="transactionManager"/>
+
+  <!-- Transactional Proxy for TestObjectManager using the ProxyFactoryObject -->
+
+  <!--
+  <object id="accountManager"
+          type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+
+    <property name="Target" ref="accountManagerTarget"/>
+    <property name="ProxyInterfaces">
+      <value>Spring.Data.IAccountManager</value>
+    </property>
+    <property name="InterceptorNames">
+      <value>transactionInterceptor</value>
+    </property>
+
+  </object>
+  -->
+
+
+
+  <!-- Transaction Interceptor -->
+  <!-- note do not have converter from string to TransactionAttributeSource property type registered -->
+  <!--
+  <object id="transactionInterceptor"
+          type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data">
+    <property name="TransactionManager" ref="transactionManager"/>
+
+    <property name="TransactionAttributeSource" ref="attributeTransactionAttributeSource"/>
+  </object>
+
+  <object id="attributeTransactionAttributeSource"
+          type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data">
+  </object>
+  -->
+
+  <object name="loggingAdvice" type="Spring.Aspects.Logging.SimpleLoggingAdvice, Spring.Aop">
+    <property name="logUniqueIdentifier" value="true"/>
+    <property name="logExecutionTime"    value="true"/>
+    <property name="logMethodArguments"  value="true"/>
+    <property name="Separator"           value=";"/>
+    <!--
+    <property name="LogLevel"            value="Debug"/>
+    -->
+  </object>
+
+  <object id="txAttributePointcut" type="Spring.Aop.Support.AttributeMatchMethodPointcut, Spring.Aop">
+    <property name="Attribute" value="Spring.Transaction.Interceptor.TransactionAttribute, Spring.Data"/>
+  </object>
+
+  <aop:config>
+    <!--
+    <aop:advisor id="exceptionProcessAdvisor" order="1"
+                 advice-ref="exceptionAdvice" 
+                 pointcut-ref="txAttributePointcut"/>
+                 -->
+
+    <aop:advisor id="loggingAdvisor" order="2"
+             advice-ref="loggingAdvice"
+             pointcut-ref="txAttributePointcut"/>
+  </aop:config>
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContextNoInterfaces.xml b/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContextNoInterfaces.xml
new file mode 100644
index 00000000..5fd2c76c
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/DTCAppContextNoInterfaces.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns='http://www.springframework.net'
+         xmlns:d="http://www.springframework.net/database">
+
+     <!-- Available Catalogs: CreditsAndDebits, Credits, Debits -->
+     <!-- Database Providers -->
+     <d:provider id="DbProvider" 
+                   provider="SqlServer-2.0" 
+                   connectionString="Data Source=NYCSUMPOLLL\SQLEXPRESS;Initial Catalog=Credits;Integrated Security=True;Pooling=False"/>
+
+     <d:provider id="DbProvider" 
+                   provider="SqlServer-2.0" 
+                   connectionString="Data Source=NYCSUMPOLLL\SQLEXPRESS;Initial Catalog=Debits;Integrated Security=True;Pooling=False"/>
+
+
+    <!-- Transaction Manager -->
+    <!--
+    <object id="transactionManager" 
+            type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data">
+      <property name="DbProvider" ref="DbProvider"/>
+    </object>
+    -->
+    
+    <object id="transactionManager"
+            type="Spring.Data.Core.TxScopeTransactionManager, Spring.Data">
+    </object>
+       
+ 
+  <!-- AdoTemplate for DAO Implementation -->
+  <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
+    <property name="DbProvider" ref="DbProvider"/>
+  </object>
+
+  <object id="adoTemplateForDebitDb" type="Spring.Data.Core.AdoTemplate, Spring.Data">
+    <property name="DbProvider" ref="DebitDbProvider"/>
+  </object>
+
+  <!-- DAO Implementations -->
+  <object id="accountCreditDao" type="Spring.Data.SimpleAccountCreditDao, Spring.Data.Integration.Tests">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="accountDebitDao" type="Spring.Data.SimpleAccountDebitDao, Spring.Data.Integration.Tests">
+      <property name="AdoTemplate" ref="adoTemplateForDebitDb"/>
+  </object>
+ 
+  <!-- The object that performs multiple data access operations.  The transactional
+       proxy is created for this class since it has transactional attributes applied
+       to its virtual methods.
+       -->
+  <object id="accountManager" 
+          type="Spring.Data.SimpleAccountManager, Spring.Data.Integration.Tests">
+    <property name="AccountCreditDao" ref="accountCreditDao"/>
+    <property name="AccountDebitDao" ref="accountDebitDao"/>
+  </object>
+
+
+
+
+  <!-- The rest of the config file is common no matter how many objects you add -->
+  <!-- that you would like to have declarative tx management applied to         -->
+  
+  <object id="autoProxyCreator" 
+          type="Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator, Spring.Aop">
+  </object>
+
+  <object id="transactionAdvisor"
+          type="Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor, Spring.Data"
+          autowire="constructor">
+  </object>
+
+
+  <!-- Transaction Interceptor -->
+  <object id="transactionInterceptor" 
+          type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data">
+    <property name="TransactionManager" ref="transactionManager"/>
+    <!-- note do not have converter from string to this property type registered -->
+    <property name="TransactionAttributeSource" ref="attributeTransactionAttributeSource"/>
+  </object>
+
+  <object id="attributeTransactionAttributeSource"
+          type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data">
+  </object>
+
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DTCTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/DTCTests.cs
new file mode 100644
index 00000000..c7dfefc3
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/DTCTests.cs
@@ -0,0 +1,65 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using NUnit.Framework;
+using Spring.Aop.Config;
+using Spring.Context;
+using Spring.Context.Support;
+using Common.Logging;
+using Common.Logging.Simple;
+using Spring.Objects.Factory.Xml;
+using Spring.Transaction.Config;
+
+#endregion
+
+namespace Spring.Data
+{
+    [TestFixture]
+	public class DTCTests 
+	{
+        private IApplicationContext ctx;
+
+        [SetUp]
+        public void SetUp()
+        {
+            //BasicConfigurator.Configure();
+            Console.WriteLine("Hello");
+            LogManager.Adapter = new ConsoleOutLoggerFactoryAdapter(new NameValueCollection());
+            NamespaceParserRegistry.RegisterParser(typeof(TxNamespaceParser));
+            NamespaceParserRegistry.RegisterParser(typeof(AopNamespaceParser));
+            string ctxName = "DTCAppContext.xml"; // for .NET 2.0
+            //string ctxName = "DTC1.1AppContext.xml"; // for .NET 1.1
+            ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/" + ctxName);            
+        }
+
+        [Test]
+        public void DeclarativeWithAttributes()
+        {
+            IAccountManager mgr = ctx["accountManager"] as IAccountManager;
+            mgr.DoTransfer(100, 100);
+        }
+
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DTCTestsNoInterfaces.cs b/test/Spring/Spring.Data.Integration.Tests/Data/DTCTestsNoInterfaces.cs
new file mode 100644
index 00000000..aa1d3df6
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/DTCTestsNoInterfaces.cs
@@ -0,0 +1,54 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Data
+{
+    [TestFixture]
+	public class DTCTestsNoInterfaces 
+	{
+        private IApplicationContext ctx;
+
+        [SetUp]
+        public void SetUp()
+        {
+            //BasicConfigurator.Configure();
+            string ctxName = "DTCAppContextNoInterfaces.xml"; // for .NET 2.0
+            //string ctxName = "DTC1.1AppContextNoInterfaces.xml"; // for .NET 1.1
+            ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/" + ctxName);            
+        }
+
+        [Test]
+        public void DeclarativeWithAttributes()
+        {
+            SimpleAccountManager mgr = ctx["accountManager"] as SimpleAccountManager;
+            mgr.DoTransfer(115, 115);
+        }
+
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/DeclarativeTxTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/DeclarativeTxTests.cs
new file mode 100644
index 00000000..efeba24a
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/DeclarativeTxTests.cs
@@ -0,0 +1,66 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Common;
+using Spring.Transaction;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: DeclarativeTxTests.cs,v 1.4 2006/11/15 20:31:08 aseovic Exp $</version>
+	[TestFixture]
+	public class DeclarativeTxTests 
+	{
+        private IDbProvider dbProvider;
+
+        private IPlatformTransactionManager transactionManager;
+
+        private IApplicationContext ctx;
+
+        [SetUp]
+        public void SetUp()
+        {
+            ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/declarativeServices.xml");
+            dbProvider = ctx["DbProvider"] as IDbProvider;
+            transactionManager = ctx["adoTransactionManager"] as IPlatformTransactionManager;
+            
+        }
+
+        [Test]
+        public void DeclarativeWithAttributes()
+        {
+            ITestObjectManager mgr = ctx["testObjectManager"] as ITestObjectManager; 
+            TestObjectDao dao = (TestObjectDao)ctx["testObjectDao"];
+            TransactionTemplateTests.PerformOperations(mgr, dao); 
+        }
+
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs
new file mode 100644
index 00000000..95674ed9
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.cs
@@ -0,0 +1,128 @@
+#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
+
+
+#if NET_2_0
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Common;
+using System.Data.SqlClient;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects;
+
+namespace Spring.Data.Generic
+{
+    [TestFixture]
+    public class GenericAdoTemplateTests
+    {
+        private AdoTemplate adoTemplate;
+
+        [SetUp]
+        public void SetUp()
+        {
+            IApplicationContext ctx =
+                new XmlApplicationContext(
+                    "assembly://Spring.Data.Integration.Tests/Spring.Data.Generic/GenericAdoTemplateTests.xml");
+
+            adoTemplate = ctx["adoTemplate"] as AdoTemplate;
+        }
+
+        [Test]
+        public void CommandDelegateUsage()
+        {
+            string postalCode = "1010";
+            int count = adoTemplate.Execute<int>(delegate(DbCommand command)
+                                                     {
+                                                         command.CommandText =
+                                                             "select count(*) from Customers where PostalCode = @PostalCode";
+
+                                                         DbParameter p = command.CreateParameter();
+                                                         p.ParameterName = "@PostalCode";
+                                                         p.Value = postalCode;
+                                                         command.Parameters.Add(p);
+
+                                                         return (int) command.ExecuteScalar();
+                                                     });
+            Assert.AreEqual(3, count);
+        }
+
+        public void CommandDelegateUsageDownCast()
+        {
+            string postalCode = "1010";
+            int count = adoTemplate.Execute<int>(delegate(DbCommand command)
+                                                     {
+                                                         SqlCommand sqlCommand = command as SqlCommand;
+                                                         command.CommandText =
+                                                             "select count(*) from Customers where PostalCode = @PostalCode";
+
+                                                         sqlCommand.Parameters.AddWithValue("@PostalCode", postalCode);
+
+                                                         return (int) command.ExecuteScalar();
+                                                     });
+            Assert.AreEqual(3, count);
+        }
+
+        [Test]
+        public void TestCallbacks()
+        {
+            TestObjectDao testDao = new TestObjectDao();
+            testDao.AdoTemplate = adoTemplate;
+            IList<TestObject> testObjects = testDao.FindAll();
+            Assert.IsNotNull(testObjects);
+        }
+
+        [Test]
+        public void TestQueryWithCommandCreators()
+        {
+            IDbCommandCreatorFactory ccf = new IDbCommandCreatorFactory(adoTemplate.DbProvider, CommandType.Text, "select TestObjectNo, Age, Name from TestObjects", null);
+            IDbCommandCreator cc = ccf.NewDbCommandCreator(null);
+            IList<TestObject> testObjects = adoTemplate.QueryWithCommandCreator(cc,
+                                                new TestObjectResultSetExtractor<List<TestObject>>());
+            Assert.IsNotNull(testObjects);
+            Assert.AreEqual(2, testObjects.Count);
+            foreach (TestObject o in testObjects)
+            {
+                Console.WriteLine(o);
+            }
+        }
+    }
+
+    internal class TestObjectResultSetExtractor<T> : IResultSetExtractor<T> where T : IList<TestObject>, new()
+    {
+        public T ExtractData(IDataReader reader)
+        {
+            T testObjectList = new T();
+            while(reader.Read())
+            {
+                TestObject to = new TestObject();
+                to.ObjectNumber = reader.GetInt32(0);
+                to.Age = reader.GetInt32(1);
+                to.Name = reader.GetString(2);
+                testObjectList.Add(to);
+            }
+            return testObjectList;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.xml b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.xml
new file mode 100644
index 00000000..852a0163
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/GenericAdoTemplateTests.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database">
+
+  <db:provider id="dbProvider" 
+              provider="SqlServer-1.1" 
+              connectionString="Data Source=MARKT60\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+
+  <object id="transactionManager" type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data">
+    <property name="DbProvider" ref="dbProvider"/>
+  </object>
+  
+  <object id="adoTemplate" type="Spring.Data.Generic.AdoTemplate, Spring.Data">
+    <property name="DbProvider" ref="dbProvider"/>
+    <property name="DataReaderWrapperType" value="Spring.Data.Support.NullMappingDataReader, Spring.Data"/>
+  </object>
+
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/ITestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/ITestObjectDao.cs
new file mode 100644
index 00000000..9fbc1b9c
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/ITestObjectDao.cs
@@ -0,0 +1,35 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+
+#if NET_2_0
+
+using System.Collections.Generic;
+using Spring.Objects;
+
+namespace Spring.Data.Generic
+{
+    public interface ITestObjectDao
+    {
+        IList<TestObject> FindAll();
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectDao.cs
new file mode 100644
index 00000000..1401bd62
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectDao.cs
@@ -0,0 +1,56 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+
+#if NET_2_0
+
+using System.Collections.Generic;
+using System.Data;
+using Spring.Objects;
+
+namespace Spring.Data.Generic
+{
+    /// <summary>
+    /// This is 
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: TestObjectDao.cs,v 1.3 2008/01/29 18:22:33 markpollack Exp $</version>
+    public class TestObjectDao : AdoDaoSupport, ITestObjectDao
+    {
+        public IList<TestObject> FindAll()
+        {
+            return AdoTemplate.QueryWithRowMapper(CommandType.Text,
+                "select TestObjectNo, Age, Name from TestObjects",
+                new TestObjectRowMapper<TestObject>());
+        }
+
+        public TestObject FindOne()
+        {
+            return AdoTemplate.QueryForObject(CommandType.Text,
+                                              "",
+                                              new TestObjectRowMapper<TestObject>());
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectRowMapper.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectRowMapper.cs
new file mode 100644
index 00000000..07cc7751
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Generic/TestObjectRowMapper.cs
@@ -0,0 +1,52 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+
+#if NET_2_0
+
+using System.Data;
+using Spring.Objects;
+using Spring.Data.Generic;
+
+namespace Spring.Data.Generic
+{
+    /// <summary>
+    /// This is 
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: TestObjectRowMapper.cs,v 1.3 2007/08/07 19:50:44 markpollack Exp $</version>
+    public class TestObjectRowMapper<T> : IRowMapper<T> where T : TestObject, new()
+    {
+        public T MapRow(IDataReader reader, int rowNum) 
+        {
+            if (reader == null) return new T();
+            T to = new T();
+            to.ObjectNumber = reader.GetInt32(0);
+            to.Age = reader.GetInt32(1);
+            to.Name = reader.GetString(2);
+            return to;
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/IAccountCreditDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/IAccountCreditDao.cs
new file mode 100644
index 00000000..098cb67c
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/IAccountCreditDao.cs
@@ -0,0 +1,9 @@
+
+
+namespace Spring.Data
+{
+    public interface IAccountCreditDao
+    {
+        void CreateCredit(float creditAmount);
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/IAccountDebitDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/IAccountDebitDao.cs
new file mode 100644
index 00000000..1ae6cc46
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/IAccountDebitDao.cs
@@ -0,0 +1,8 @@
+
+namespace Spring.Data
+{
+    public interface IAccountDebitDao
+    {
+        void DebitAccount(float debitAmount);
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/IAccountManager.cs b/test/Spring/Spring.Data.Integration.Tests/Data/IAccountManager.cs
new file mode 100644
index 00000000..9fb9daec
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/IAccountManager.cs
@@ -0,0 +1,8 @@
+
+namespace Spring.Data
+{
+    public interface IAccountManager
+    {
+        void DoTransfer(float creditAmount, float debitAmount);
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/ITestCoordinator.cs b/test/Spring/Spring.Data.Integration.Tests/Data/ITestCoordinator.cs
new file mode 100644
index 00000000..c2700fa4
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/ITestCoordinator.cs
@@ -0,0 +1,15 @@
+
+using Spring.Objects;
+
+namespace Spring.Data
+{
+    public interface ITestCoordinator
+    {
+        ITestObjectManager TestObjectManager
+        {
+            get; set;
+        }
+
+        void WorkOn(TestObject to1, TestObject to2);
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/ITestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/ITestObjectDao.cs
new file mode 100644
index 00000000..bc7c22dd
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/ITestObjectDao.cs
@@ -0,0 +1,23 @@
+using System.Collections;
+using Spring.Objects;
+
+namespace Spring.Data
+{
+    public interface ITestObjectDao
+    {
+        void Create(string name, int age);
+        void Update(TestObject to);
+        void Delete(string name);
+        TestObject FindByName(string name);
+        IList FindAll();
+        int GetCount();
+        int GetCountByDelegate();
+
+        int GetCount(int lowerAgeLimit);
+        int GetCount(int lowerAgeLimit, string name);
+        
+        //
+        int GetCountByAltMethod(int lowerAgeLimit);
+        int GetCountByCommandSetter(int lowerAgeLimit);
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/ITestObjectManager.cs b/test/Spring/Spring.Data.Integration.Tests/Data/ITestObjectManager.cs
new file mode 100644
index 00000000..1ad32bd3
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/ITestObjectManager.cs
@@ -0,0 +1,11 @@
+using Spring.Objects;
+
+namespace Spring.Data
+{
+    public interface ITestObjectManager
+    {
+        void SaveTwoTestObjects(TestObject to1, TestObject to2);
+
+        void DeleteTwoTestObjects(string name1, string name2);
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs
new file mode 100644
index 00000000..969ececc
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs
@@ -0,0 +1,100 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Common.Logging;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: MappingAdoQueryTests.cs,v 1.3 2006/11/13 07:05:00 markpollack Exp $</version>
+	[TestFixture]
+	public class MappingAdoQueryTests 
+	{
+		#region Fields
+	    IDbProvider dbProvider;
+		#endregion
+
+		#region Constants
+
+		/// <summary>
+		/// The shared ILog instance for this class (and derived classes). 
+		/// </summary>
+		protected static readonly ILog log =
+			LogManager.GetLogger(typeof (MappingAdoQueryTests));
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="MappingAdoQueryTests"/> class.
+                /// </summary>
+		public 	MappingAdoQueryTests()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+        [SetUp]
+        public void CreateDbProvider()
+        {
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/adoTemplateTests.xml");
+            Assert.IsNotNull(ctx);
+            dbProvider = ctx["DbProvider"] as IDbProvider;
+            Assert.IsNotNull(dbProvider);
+        }
+	    
+	    [Test]
+	    public void MappingAdoQuery()
+	    {
+	        TestObjectQuery testObjectQuery = new TestObjectQuery(dbProvider);
+	        IDictionary inParams = new Hashtable();
+            inParams.Add("UName", "George");
+	        IList testObjectList = testObjectQuery.QueryByNamedParam(inParams);
+	        Assert.AreEqual(2, testObjectList.Count);
+	    }
+
+
+
+	    #endregion
+
+        
+
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTestObjectDao.cs
new file mode 100644
index 00000000..14592522
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTestObjectDao.cs
@@ -0,0 +1,205 @@
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using System.Data.SqlClient;
+using System.Text;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Data
+{
+    public class NativeAdoTestObjectDao : ITestObjectDao
+    {
+        private String connectionString;
+
+        public string ConnectionString
+        {
+            get { return connectionString; }
+            set { connectionString = value; }
+        }
+
+
+        public IList ExplicitTx()
+        {
+            try
+            {
+                using (SqlConnection connection = new SqlConnection(connectionString))
+                {
+                    connection.Open();
+                    
+                    using (SqlTransaction transaction = connection.BeginTransaction())
+                    {
+                        using (SqlCommand command = new SqlCommand("sql"))
+                        {
+                            command.Connection = connection;
+                            command.Transaction = transaction;
+
+                            /*
+                             *   dbParameters.Add("savings", DbType.Decimal).Value = b.Savings.AsDecimal();
+  dbParameters.Add("accountId", DbType.Int).Value = account.EntityId;
+  dbParameters.Add("name", DbType.String).Value = b.Name;
+                             */
+                            command.Parameters.Add("@savings", SqlDbType.Decimal).Value = 1;// = b.Savings.AsDecimal();
+                            command.Parameters.Add("@accountId", SqlDbType.Int).Value = 2;
+                            command.Parameters.Add("@name", SqlDbType.NVarChar, 40).Value = 3;
+                            command.ExecuteNonQuery();
+                            //foreach (Benificiary b in Account.Beneficiaries)
+                            //{
+                                
+                            //}
+
+                            transaction.Commit();
+                        }
+                    }
+                }
+            } catch (Exception)
+            {
+                //log exception and rethrow
+            }
+            return null;
+        }
+
+        public IList FindAllPeople()
+        {
+            IList results = new ArrayList();
+            try
+            {
+                using (SqlConnection connection = new SqlConnection(connectionString))
+                {
+                    string sql = "select Name, Age from ...";
+
+                    using (SqlCommand command = new SqlCommand(sql, connection))
+                    {
+                        connection.Open();
+                        using (SqlDataReader reader = command.ExecuteReader())
+                        {
+                            while (reader.Read())
+                            {
+                                //process the result set - populate Person object, add to array
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                //throw application exception
+            }
+            return results;
+        }
+
+        public void Create2(string name, int age)
+        {
+            using (SqlConnection connection = new SqlConnection(connectionString))
+            {
+                String sql =
+                    String.Format("insert into TestObjects(Age, Name) " +
+                                  "VALUES ({0}, '{1}')",
+                                  age, name);
+
+                using (SqlCommand cmd = new SqlCommand(sql, connection))
+                {
+                    connection.Open();
+                    cmd.ExecuteNonQuery();
+                }
+            }
+        }
+
+        public void Create(string name, int age)
+        {
+            using (SqlConnection connection = new SqlConnection(connectionString))
+            {
+                SqlParameter p1 = new SqlParameter("name", SqlDbType.NVarChar);
+                p1.Value = "asdf";
+
+                /*
+                string strSql = "insert into TestObjects(Age,Name) values (@Age,@Name)";
+                
+                
+                SqlCommand comm = connection.CreateCommand();
+                comm.CommandText = strSql;
+                SqlParameter p1 = new SqlParameter();
+                p1.ParameterName = "@Age";
+                p1.Value = age;
+                
+                SqlParameter p2 = new SqlParameter();
+                p2.ParameterName = "@Name";
+                p2.Value = name;
+                
+                comm.Parameters.Add(p1);
+                comm.Parameters.Add(p2);
+                
+                */
+
+                StringBuilder sb = new StringBuilder();
+                sb.AppendFormat(
+                    "insert into TestObjects(Age, Name) VALUES ({0}, '{1}')",
+                    age, name);
+
+                SqlCommand comm = connection.CreateCommand();
+                comm.CommandText = sb.ToString();
+
+
+                connection.Open();
+                comm.ExecuteNonQuery();
+            }
+        }
+
+        public void Update(TestObject to)
+        {
+            // TODO:  Add NativeAdoTestObjectDao.Update implementation
+        }
+
+        public void Delete(string name)
+        {
+            // TODO:  Add NativeAdoTestObjectDao.Delete implementation
+        }
+
+        public TestObject FindByName(string name)
+        {
+            // TODO:  Add NativeAdoTestObjectDao.FindByName implementation
+            return null;
+        }
+
+        public System.Collections.IList FindAll()
+        {
+            // TODO:  Add NativeAdoTestObjectDao.FindAll implementation
+            return null;
+        }
+
+        public int GetCount()
+        {
+            // TODO:  Add NativeAdoTestObjectDao.GetCount implementation
+            return 0;
+        }
+
+        public int GetCountByDelegate()
+        {
+            // TODO:  Add NativeAdoTestObjectDao.GetCountByDelegate implementation
+            return 0;
+        }
+
+        public int GetCount(int lowerAgeLimit)
+        {
+            throw new NotImplementedException();
+        }
+
+        public int GetCount(int lowerAgeLimit, string name)
+        {
+            throw new NotImplementedException();
+        }
+
+        public int GetCountByAltMethod(int lowerAgeLimit)
+        {
+            throw new NotImplementedException();
+        }
+
+        public int GetCountByCommandSetter(int lowerAgeLimit)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTests.cs
new file mode 100644
index 00000000..447233e7
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/NativeAdoTests.cs
@@ -0,0 +1,64 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Data
+{
+	[TestFixture]
+	public class NativeAdoTests 
+	{
+	    [Test]
+        public void SimpleUsage()
+        {
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/nativeAdoTests.xml");
+            Assert.IsNotNull(ctx);
+            ITestObjectDao dao = (ITestObjectDao)ctx["testObjectDao"];
+            Assert.IsNotNull(dao);
+            dao.Create("John", 45);
+        }
+
+		[Test]
+		public void Helloworld()
+		{
+			string connString =
+				@"Data Source=MARKT60\SQL2005;Initial Catalog=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False";
+
+			SqlConnection conn = new SqlConnection(connString);
+			conn.Open();
+			//conn.BeginTransaction(IsolationLevel.Unspecified);
+			SqlTransaction trans = conn.BeginTransaction();
+			Console.WriteLine(trans.IsolationLevel);
+
+
+			
+		}
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs
new file mode 100644
index 00000000..6ac147cd
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/NestedTxScopeTests.cs
@@ -0,0 +1,176 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using System.Transactions;
+using NUnit.Framework;
+using Spring.Data.Common;
+using Spring.Data.Core;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// This class contains tests for nesting transaction scopes.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: NestedTxScopeTests.cs,v 1.3 2008/05/02 20:08:29 markpollack Exp $</version>
+    [TestFixture]
+    public class NestedTxScopeTests
+    {
+        
+
+
+        [Test]
+        public void TxTemplate()
+        {
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.SqlClient");
+            dbProvider.ConnectionString = @"Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa";
+            //IPlatformTransactionManager tm = new ServiceDomainPlatformTransactionManager();
+            //IPlatformTransactionManager tm = new TxScopeTransactionManager();
+            IPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            AdoTemplate adoTemplate = new AdoTemplate(dbProvider);
+
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.Required;
+            tt.Execute(delegate(ITransactionStatus status)
+                           {
+                               if (System.Transactions.Transaction.Current != null) Console.WriteLine("tx 1 id = " + System.Transactions.Transaction.Current.TransactionInformation.LocalIdentifier);
+                               Console.WriteLine("tx 1 'IsNewTransaction' = " + status.IsNewTransaction);
+                               adoTemplate.ExecuteNonQuery(CommandType.Text, "insert into Credits (CreditAmount) VALUES (@amount)", "amount", DbType.Decimal, 0,444);
+                               TransactionTemplate tt2 = new TransactionTemplate(tm);
+                               tt2.PropagationBehavior = TransactionPropagation.RequiresNew;
+                               
+                               tt2.Execute(delegate(ITransactionStatus status2)
+                                               {
+                                                   if (System.Transactions.Transaction.Current != null) Console.WriteLine("tx 2 = " + System.Transactions.Transaction.Current.TransactionInformation.LocalIdentifier);
+                                                   Console.WriteLine("tx 2 'IsNewTransaction' = " + status2.IsNewTransaction);
+                                                   adoTemplate.ExecuteNonQuery(CommandType.Text, "insert into dbo.Debits (DebitAmount) VALUES (@amount)", "amount", DbType.Decimal, 0,555);
+                                                   //throw new ArithmeticException("can't do the math.");
+                                                   status2.RollbackOnly = true;
+                                                   return null;
+                                               });
+                               
+                               if (System.Transactions.Transaction.Current != null) Console.WriteLine("tx id1 = " + System.Transactions.Transaction.Current.TransactionInformation.LocalIdentifier);                               
+                               return null;
+                           });
+        }
+
+        [Test]
+        public void TxScope()
+        {
+            Method1();
+        }
+        private void Method1()
+        {
+            string updateSql1 = "insert into Credits (CreditAmount) VALUES (333)";
+            using (TransactionScope ts =
+                new TransactionScope(TransactionScopeOption.Required))
+            {
+                Console.WriteLine("tx id1 = " +
+                  System.Transactions.Transaction.Current.TransactionInformation.LocalIdentifier);
+                using (SqlConnection cn2005 = new SqlConnection())
+                {
+                    cn2005.ConnectionString =
+                        @"Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa";
+                    SqlCommand cmd = new SqlCommand(updateSql1, cn2005);
+                    cn2005.Open();
+                    cmd.ExecuteNonQuery();
+                }
+                Method2();
+                Console.WriteLine("tx id1 = " +
+                  System.Transactions.Transaction.Current.TransactionInformation.LocalIdentifier);
+                ts.Complete();
+            }
+        }
+
+        private void Method2()
+        {
+            bool rollback = true;
+            string updateSql2 = "insert into Debits (DebitAmount) VALUES (222)";
+            using (TransactionScope ts =
+                new TransactionScope(TransactionScopeOption.RequiresNew))
+            {
+                Console.WriteLine("tx id2 = " +
+  System.Transactions.Transaction.Current.TransactionInformation.LocalIdentifier);
+                using (SqlConnection cn2005 = new SqlConnection())
+                {
+                    cn2005.ConnectionString = @"Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa";
+                    SqlCommand cmd = new SqlCommand(updateSql2, cn2005);
+                    cn2005.Open();
+                    cmd.ExecuteNonQuery();
+                }
+                if (rollback)
+                {
+                    System.Transactions.Transaction.Current.Rollback();
+                }
+                else
+                {
+                    ts.Complete(); 
+                }
+                Console.WriteLine("end of 2nd data access operation");
+                
+            }
+        }
+
+        [Test]
+        public void UnwantedPromotion()
+        {
+            TransactionOptions transactionoptions = new TransactionOptions();
+            transactionoptions.IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted;
+            using (TransactionScope ts = new TransactionScope(TransactionScopeOption.Required, transactionoptions))
+            {
+                InnerMethod();
+                InnerMethod();
+                ts.Complete();
+            }
+        }
+
+        private void InnerMethod()
+        {
+            string updateSql2 = "insert into Debits (DebitAmount) VALUES (222)";
+            using (SqlConnection cn2005 = new SqlConnection())
+            {
+                cn2005.ConnectionString = @"Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa";
+                SqlCommand cmd = new SqlCommand(updateSql2, cn2005);
+                cn2005.Open();
+                cmd.ExecuteNonQuery();
+
+                #region logging
+                Console.WriteLine("TransactionSynchronizationManager.CurrentTransactionIsolationLevel = " +
+                  TransactionSynchronizationManager.CurrentTransactionIsolationLevel);
+                Console.WriteLine("System.Transactions.Transaction.Current.IsolationLevel = " + System.Transactions.Transaction.Current.IsolationLevel);
+                string name = TransactionSynchronizationManager.CurrentTransactionName;
+                bool read = TransactionSynchronizationManager.CurrentTransactionReadOnly;
+                #endregion
+            }
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/AdoTemplateShipperDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/AdoTemplateShipperDao.cs
new file mode 100644
index 00000000..ffce1db9
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/AdoTemplateShipperDao.cs
@@ -0,0 +1,63 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using Spring.Data.Common;
+using Spring.Data.Core;
+using Spring.Data.Support;
+
+#endregion
+
+namespace Spring.Data.Northwind
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: AdoTemplateShipperDao.cs,v 1.3 2007/08/03 19:51:22 markpollack Exp $</version>
+	public class AdoTemplateShipperDao : AdoDaoSupport, IShipperDao
+    {
+        #region IShipperDao Members
+
+        public Shipper Create(string name, string phone)
+        {
+            string sql = "INSERT INTO Shippers (CompanyName, Phone) VALUES (@CompanyName, @Phone) SET @ShipperID = SCOPE_IDENTITY()";            
+            IDbParameters dbParameters = AdoTemplate.CreateDbParameters();
+            dbParameters.Add("CompanyName", SqlDbType.NVarChar, 40).Value = name;
+            
+            //Can we add automatic nullable support?
+            if (phone.Length == 0)
+                dbParameters.Add("Phone", SqlDbType.NVarChar, 24).Value = DBNull.Value;
+            else
+                dbParameters.Add("Phone", SqlDbType.NVarChar, 24).Value = phone;
+            
+            dbParameters.AddOut("ShipperID", SqlDbType.Int);
+            
+            int id = AdoTemplate.ExecuteNonQuery(CommandType.Text, sql, dbParameters);
+            
+            return new Shipper(id, name, phone); //10
+        }
+
+        #endregion
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/IShipperDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/IShipperDao.cs
new file mode 100644
index 00000000..a3adc553
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/IShipperDao.cs
@@ -0,0 +1,38 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Data.Northwind
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: IShipperDao.cs,v 1.1 2006/06/21 14:07:30 markpollack Exp $</version>
+	public interface IShipperDao 
+	{
+        Shipper Create(string name, string phone);
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/NativeAdoShipperDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/NativeAdoShipperDao.cs
new file mode 100644
index 00000000..6eaa9ebe
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/NativeAdoShipperDao.cs
@@ -0,0 +1,97 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using System.Data.SqlClient;
+
+#endregion
+
+namespace Spring.Data.Northwind
+{
+    /// <summary>
+    /// TODO: 
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: NativeAdoShipperDao.cs,v 1.1 2006/06/21 14:07:30 markpollack Exp $</version>
+    public class NativeAdoShipperDao : IShipperDao
+    {
+        #region IShipperDao Members
+
+        public Shipper Create(string name, string phone)
+        {
+            string connectionString = "Data Source=NYCSUMPOLLL;Initial Catalog=Northwind;Persist Security Info=True;User ID=springqa";
+            int id = 0;
+            using (SqlConnection connection = new SqlConnection(connectionString))
+            {
+                using (SqlCommand insertCommand = connection.CreateCommand())
+                {
+                    insertCommand.CommandText =
+                        "INSERT INTO Shippers (CompanyName, Phone) VALUES (@CompanyName, @Phone) SET @ShipperID = SCOPE_IDENTITY()";
+                    SqlParameter companyNameParameter = new SqlParameter("@CompanyName", SqlDbType.NVarChar, 40);
+                    companyNameParameter.Value = name;
+                    insertCommand.Parameters.Add(companyNameParameter);
+                    SqlParameter phoneParameter = new SqlParameter("@Phone", SqlDbType.NVarChar, 24);
+                    if (phone.Length == 0)
+                        phoneParameter.Value = DBNull.Value;
+                    else
+                        phoneParameter.Value = phone;
+                    insertCommand.Parameters.Add(phoneParameter);
+                    SqlParameter shipperIDParameter = new SqlParameter("@ShipperID", SqlDbType.Int);
+                    shipperIDParameter.Direction = ParameterDirection.Output;
+                    insertCommand.Parameters.Add(shipperIDParameter);
+                    insertCommand.Connection.Open();
+                    insertCommand.ExecuteNonQuery();
+                    id = (int) shipperIDParameter.Value;
+                }
+            }
+            return new Shipper(id, name, phone); //24
+        }
+
+        
+        public Shipper CreateShorter(string name, string phone)
+        {
+            string connectionString = "Data Source=NYCSUMPOLLL;Initial Catalog=Northwind;Persist Security Info=True;User ID=springqa";
+            int id = 0;
+            using (SqlConnection connection = new SqlConnection(connectionString))
+            {
+                using (SqlCommand insertCommand = connection.CreateCommand())
+                {
+                    insertCommand.CommandText =
+                        "INSERT INTO Shippers (CompanyName, Phone) VALUES (@CompanyName, @Phone) SET @ShipperID = SCOPE_IDENTITY()";
+                    insertCommand.Parameters.Add("@CompanyName", SqlDbType.NVarChar, 40).Value = name;
+                    if (phone.Length == 0)
+                        insertCommand.Parameters.Add("Phone", SqlDbType.NVarChar, 24).Value = DBNull.Value;
+                    else
+                        insertCommand.Parameters.Add("Phone", SqlDbType.NVarChar, 24).Value = phone;                               
+                    insertCommand.Parameters.Add("@ShipperID", SqlDbType.Int).Direction = ParameterDirection.Output;
+                    insertCommand.Connection.Open();
+                    insertCommand.ExecuteNonQuery();
+                    id = (int) insertCommand.Parameters["@ShipperID"].Value;
+                }
+            }
+            return new Shipper(id, name, phone); //17
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/Shipper.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/Shipper.cs
new file mode 100644
index 00000000..e610df5f
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Northwind/Shipper.cs
@@ -0,0 +1,88 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+
+#endregion
+
+namespace Spring.Data.Northwind
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: Shipper.cs,v 1.1 2006/06/21 14:07:30 markpollack Exp $</version>
+	public class Shipper 
+	{
+		#region Fields
+
+	    public int Id
+	    {
+	        get { return id; }
+	        set { id = value; }
+	    }
+
+	    public string Name
+	    {
+	        get { return name; }
+	        set { name = value; }
+	    }
+
+	    public string Phone
+	    {
+	        get { return phone; }
+	        set { phone = value; }
+	    }
+
+	    private int id;
+	    private string name;
+	    private string phone;
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="Shipper"/> class.
+                /// </summary>
+		public 	Shipper()
+		{
+
+		}
+
+	    public Shipper(int id, string name, string phone)
+	    {
+	        this.id = id;
+	        this.name = name;
+	        this.phone = phone;
+	    }
+
+	    #endregion
+
+		#region Properties
+
+		#endregion
+
+		#region Methods
+
+		#endregion
+
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs
new file mode 100644
index 00000000..85726274
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/StoredProcedureTests.cs
@@ -0,0 +1,180 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using NUnit.Framework;
+using Spring.Data.Common;
+using Spring.Data.Generic;
+using Spring.Data.Objects.Generic;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Data.Objects.Generic
+{
+    /// <summary>
+    /// This calss contains tests for 
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: StoredProcedureTests.cs,v 1.3 2007/08/07 19:50:44 markpollack Exp $</version>
+    [TestFixture]
+    public class StoredProcedureTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+        }
+
+        [Test]
+        public void TestReflection()
+        {
+            IRowMapper<TestObject> rm = new TestObjectRowMapper<TestObject>();
+
+            NamedResultSetProcessor<TestObject> rsp = new NamedResultSetProcessor<TestObject>("Test", rm);
+
+            IDictionary dict = new Hashtable();
+            dict.Add("Test", rsp);
+            DoWork(dict);
+
+        }
+
+        private void DoWork(IDictionary dict)
+        {
+            BindingFlags BINDING_FLAGS = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static |
+            BindingFlags.IgnoreCase;
+            object rsp = dict["Test"];
+            Assert.IsNotNull(rsp);
+
+            Type closedType = rsp.GetType();
+            foreach (Type parameter in closedType.GetGenericArguments())
+            {
+                Console.WriteLine("closed type param = " + parameter.ToString());
+            }
+
+            Console.WriteLine("closed type = " + closedType);
+
+            // typeof(NamedResultSetProcessor<>);
+            Type[] genericArgumentType = closedType.GetGenericArguments();
+            foreach (Type type in genericArgumentType)
+            {
+                Console.WriteLine("arg type= " + type);
+            }
+            Assert.AreEqual(1, genericArgumentType.Length);
+            //Type closedGenericType = openType.MakeGenericType(genericArgumentType);
+
+            PropertyInfo propertyInfo = closedType.GetProperty("Name", BINDING_FLAGS);
+            Assert.IsNotNull(propertyInfo);
+            object returnValue = propertyInfo.GetValue(rsp, null);
+
+            Assert.AreEqual("Test", returnValue.ToString());
+
+            PropertyInfo extractorPropInfo = closedType.GetProperty("RowMapper", BINDING_FLAGS);
+
+            Assert.IsNotNull(extractorPropInfo);
+
+            object rowmapper = extractorPropInfo.GetValue(rsp, null);
+
+            Type rowMapperclosedType = rowmapper.GetType();
+
+            Console.WriteLine("rowmapper closed type= " + rowMapperclosedType);
+
+            MethodInfo methodInfo = rowMapperclosedType.GetMethod("MapRow", BINDING_FLAGS);
+
+            //MethodInfo genMethodInfo = methodInfo.MakeGenericMethod(genericArgumentType);
+            object retVal = methodInfo.Invoke(rowmapper, new object[] { null, null});
+            Console.WriteLine("return val = " + retVal);
+
+
+        }
+
+        [Test]
+        public void Test()
+        {
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.SqlClient");
+            dbProvider.ConnectionString =
+                @"Data Source=MARKT60\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False";
+
+            TestObjectStoredProc sp = new TestObjectStoredProc(dbProvider);
+            IList<TestObject> testObjectList = sp.GetByName("George");
+            
+            Assert.IsNotNull(testObjectList);
+
+            TestObjectandVacationStoredProc vsp = new TestObjectandVacationStoredProc(dbProvider);
+
+            System.Collections.IDictionary outParams = vsp.ExecStoreProc("George");
+
+
+            testObjectList = outParams["testObjectRowMapper"] as IList<TestObject>;
+            Assert.IsNotNull(testObjectList);
+            Assert.AreEqual(1, testObjectList.Count);
+
+            IList<Vacation> vacationList = outParams["vacationRowMapper"] as IList<Vacation>;
+            Assert.IsNotNull(vacationList);
+            Assert.AreEqual(2, vacationList.Count);
+        }
+
+    }
+
+    public class TestObjectandVacationStoredProc : StoredProcedure
+    {
+        public TestObjectandVacationStoredProc(IDbProvider dbProvider)
+            : base(dbProvider, "SelectTestObjectAndVacations")
+        {
+            DeriveParameters();
+            AddRowMapper("testObjectRowMapper", new TestObjectRowMapper<TestObject>());
+            AddRowMapper("vacationRowMapper", new VacationRowMapper<Vacation>());
+            Compile();
+        }
+
+        public System.Collections.IDictionary ExecStoreProc(string name)
+        {
+            return Query<TestObject, Vacation>(name);
+        }
+    }
+
+    
+    public class TestObjectStoredProc : StoredProcedure
+    {
+        public TestObjectStoredProc(IDbProvider dbProvider)
+            : base(dbProvider, "SelectByName")
+        {           
+            DeriveParameters();
+            AddRowMapper("testObjectRowMapper", new TestObjectRowMapper<TestObject>() );
+            Compile();
+        }
+
+        public IList<TestObject> GetByName(string name)
+        {
+            System.Collections.IDictionary outParams = Query<TestObject>(name);
+            return outParams["testObjectRowMapper"] as IList<TestObject>;
+        }
+
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/Vacation.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/Vacation.cs
new file mode 100644
index 00000000..59d52966
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/Vacation.cs
@@ -0,0 +1,86 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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;
+
+namespace Spring.Data.Objects.Generic
+{
+
+    public class Vacation
+    {
+        private int id;
+        private string firstName;
+        private string lastName;
+        private int employeeId;
+        private DateTime startDate;
+        private DateTime endDate;
+
+
+        public int Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
+
+        public string FirstName
+        {
+            get { return firstName; }
+            set { firstName = value; }
+        }
+
+        public string LastName
+        {
+            get { return lastName; }
+            set { lastName = value; }
+        }
+
+        public int EmployeeId
+        {
+            get { return employeeId; }
+            set { employeeId = value; }
+        }
+
+        public DateTime StartDate
+        {
+            get { return startDate; }
+            set { startDate = value; }
+        }
+
+        public DateTime EndDate
+        {
+            get { return endDate; }
+            set { endDate = value; }
+        }
+
+
+        public override bool Equals(object obj)
+        {
+            if (this == obj) return true;
+            Vacation vacation = obj as Vacation;
+            if (vacation == null) return false;
+            return employeeId == vacation.employeeId && Equals(startDate, vacation.startDate);
+        }
+
+        public override int GetHashCode()
+        {
+            return employeeId + 29 * startDate.GetHashCode();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/VacationRowMapper.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/VacationRowMapper.cs
new file mode 100644
index 00000000..640a1320
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Objects/Generic/VacationRowMapper.cs
@@ -0,0 +1,54 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+
+#if NET_2_0
+
+using System;
+using System.Data;
+using Spring.Data.Generic;
+
+namespace Spring.Data.Objects.Generic
+{
+    /// <summary>
+    /// This is 
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: VacationRowMapper.cs,v 1.2 2007/07/25 18:43:28 markpollack Exp $</version>
+    public class VacationRowMapper<T> : IRowMapper<T> where T : Vacation, new()
+    {
+        public T MapRow(IDataReader reader, int rowNum) 
+        {
+            T vacation = new T();
+            vacation.Id = Decimal.ToInt32(reader.GetDecimal(0));
+            vacation.FirstName = reader.GetString(1);
+            vacation.LastName = reader.GetString(2);
+            vacation.EmployeeId = Decimal.ToInt32(reader.GetDecimal(3));
+            vacation.StartDate = reader.GetDateTime(4);
+            vacation.EndDate = reader.GetDateTime(5);
+            return vacation;
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs
new file mode 100644
index 00000000..112926aa
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs
@@ -0,0 +1,263 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#if (!NET_1_0)
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using System.Data.Common;
+using System.Data.OracleClient;
+using Common.Logging;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Common;
+using Spring.Data.Core;
+using Spring.Data.Support;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// TODO:
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: OracleAdoTemplateTests.cs,v 1.8 2007/08/03 19:51:22 markpollack Exp $</version>
+	[TestFixture]
+	public class OracleAdoTemplateTests
+	{
+		#region Fields
+
+	    private IAdoOperations adoOperations;
+	    private IDbProvider dbProvider;
+		#endregion
+
+		#region Constants
+
+		/// <summary>
+		/// The shared ILog instance for this class (and derived classes).
+		/// </summary>
+		protected static readonly ILog log =
+			LogManager.GetLogger(typeof (OracleAdoTemplateTests));
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="OracleAdoTemplateTests"/> class.
+        /// </summary>
+		public OracleAdoTemplateTests()
+		{
+
+		}
+
+		#endregion
+
+		#region Methods
+        [SetUp]
+        public void CreateAdoTemplate()
+        {
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/oracleAdoTemplateTests.xml");
+            Assert.IsNotNull(ctx);
+            dbProvider = ctx["DbProvider"] as IDbProvider;
+            Assert.IsNotNull(dbProvider);
+            adoOperations = new AdoTemplate(dbProvider);
+
+        }
+
+        [Test]
+        public void DataSetFillNoParams()
+        {
+            String sql = "select USER_ID, USER_NAME from USER_TABLE";
+            DataSet dataSet = new DataSet();
+            adoOperations.DataSetFill(dataSet, CommandType.Text, sql);
+            Assert.AreEqual(1, dataSet.Tables.Count);
+            Assert.AreEqual(18, dataSet.Tables["Table"].Rows.Count);
+
+            dataSet = new DataSet();
+            adoOperations.DataSetFill(dataSet, CommandType.Text, sql, new string[] {"TestObjects"});
+            Assert.AreEqual(1, dataSet.Tables.Count);
+            Assert.AreEqual(18, dataSet.Tables["TestObjects"].Rows.Count);
+
+            dataSet = new DataSet();
+            DataTableMappingCollection mappingCollection =
+                new DataTableMappingCollection();
+            DataTableMapping testObjectsMapping = mappingCollection.Add("Table", "TestObjects");
+            testObjectsMapping.ColumnMappings.Add("USER_ID", "UserID");
+            testObjectsMapping.ColumnMappings.Add("USER_NAME", "UserName");
+            adoOperations.DataSetFill(dataSet, CommandType.Text, sql, mappingCollection);
+            Assert.AreEqual(1, dataSet.Tables.Count);
+            Assert.AreEqual(18, dataSet.Tables["TestObjects"].Rows.Count);
+            foreach (DataRow testObjectRow in dataSet.Tables["TestObjects"].Rows)
+            {
+                Assert.IsNotNull(testObjectRow["UserID"]);
+                Assert.IsNotNull(testObjectRow["UserName"]);
+            }
+
+        }
+
+        [Test]
+        public void DataSetFillWithParameters()
+        {
+            String sql = "select USER_ID, USER_NAME from USER_TABLE where USER_ID < :maxId";
+            DataSet dataSet = new DataSet();
+            IDbParameters parameters = adoOperations.CreateDbParameters();
+            parameters.Add("maxId", OracleType.Int32).Value = 10;
+            adoOperations.DataSetFillWithParameters(dataSet, CommandType.Text, sql,
+                                      parameters,
+                                      new string[] {"TestObjects"});
+            Assert.AreEqual(1, dataSet.Tables.Count);
+            Assert.AreEqual(6, dataSet.Tables["TestObjects"].Rows.Count);
+        }
+
+        [Test]
+        public void DataSetUpdate()
+        {
+            //'pretend' unique key is the age...
+            String sql = "select USER_ID, USER_NAME from USER_TABLE";
+            DataSet dataSet = new DataSet();
+            adoOperations.DataSetFill(dataSet, CommandType.Text, sql, new string[] {"TestObjects"});
+
+            //Create and add new row.
+            DataRow myDataRow = dataSet.Tables["TestObjects"].NewRow();
+            myDataRow["USER_ID"] = 101;
+            myDataRow["USER_NAME"] = "OldManWinter";
+            dataSet.Tables["TestObjects"].Rows.Add(myDataRow);
+
+            IDbParameters parameters = adoOperations.CreateDbParameters();
+            //TODO - remembering the -1 isn't all that natural... add string name, dbtype, string sourceCol)
+            //or AddSourceCol("age", SqlDbType.Int);  would copy into source col?
+            parameters.Add("id", OracleType.Int32, -1, "USER_ID");
+            parameters.Add("name", DbType.String, 12, "USER_NAME");
+
+
+            //Extanious CommandTypes....
+            adoOperations.DataSetUpdate(dataSet, "TestObjects",
+                CommandType.Text, "insert into USER_TABLE(USER_ID, USER_NAME) values (:id,:name)", parameters,
+                CommandType.Text, null, null,
+                CommandType.Text, null, null);
+
+
+            //TODO - think about api...
+            /*
+            IDbCommand insertCommand = dbProvider.CreateCommand();
+            insertCommand.CommandText = "insert into USER_TABLE(USER_ID, USER_NAME) values (:id,:name)";
+            parameters = adoOperations.NewDbParameters();
+            //TODO - remembering the -1 isn't all that natural... add string name, dbtype, string sourceCol)
+            //or AddSourceCol("age", SqlDbType.Int);  would copy into source col?
+            parameters.Add("id", OracleType.Int32, -1, "USER_ID");
+            parameters.Add("name", DbType.String, 12, "USER_NAME");
+
+            //TODO - this isn't all that natural...
+            ParameterUtils.CopyParameters(insertCommand, parameters);
+
+
+            adoOperations.DataSetUpdate(dataSet, "TestObjects",
+                insertCommand,
+                null,
+                null);
+
+            */
+
+            //TODO avoid param Utils copy by adding argument...
+
+            //adoOperations.DataSetUpdate(dataSet, "TestObjects",
+            //                            insertCommand, parameters,
+            //                            null, null,
+            //                            null, null);
+
+            // or avoid all ref to command object....
+
+            //adoOperations.DataSetUpdate(dataSet, "TestObjects",
+            //                            CommandType type, string sql, parameters,
+            //                            null, null,
+            //                            null, null);
+
+            //TODO how about breaking up the operations...
+
+        }
+
+
+        [Test]
+        public void ExecuteQueryWithResultSetExtractor()
+        {
+            IResultSetExtractor rse = new TestObjectExtractor();
+            String sql = "select USER_ID, USER_NAME from USER_TABLE";
+            IList testObjectList = (IList)adoOperations.QueryWithResultSetExtractor(CommandType.Text, sql, rse);
+            Assert.AreEqual(18, testObjectList.Count);
+
+        }
+
+	    [Test]
+        public void ExecuteNonQueryText()
+        {
+            int counter = 0;
+
+            int user_id = 100;
+
+            string user_name = "George0";
+
+            String sql = String.Format("insert into USER_TABLE(USER_ID, USER_NAME) VALUES ({0}, '{1}')",
+                                       user_id, user_name);
+            adoOperations.ExecuteNonQuery(CommandType.Text, sql);
+
+
+            sql = "insert into USER_TABLE(USER_ID, USER_NAME) values (:id,:name)";
+            IDbParameters parameters = adoOperations.CreateDbParameters();
+
+	        int user_id1 = 101;
+	        string user_name1 = "George1";
+            parameters.Add("id", OracleType.Int32).Value = user_id1;
+	        counter++;
+            parameters.Add("name", DbType.String, 12).Value = user_name1;
+
+	        adoOperations.ExecuteNonQuery(CommandType.Text, sql, parameters);
+        }
+
+		#endregion
+
+        private class TestObjectExtractor    : IResultSetExtractor
+        {
+            public object ExtractData(IDataReader reader)
+            {
+                IList testObjects = new ArrayList();
+                while(reader.Read())
+                {
+                    TestObject to = new TestObject();
+                    //object foo = reader.GetDataTypeName(0);
+                    to.ObjectNumber = (int) reader.GetInt64(0);
+                    to.Name = reader.GetString(1);
+                    testObjects.Add(to);
+                }
+                return testObjects;
+            }
+        }
+
+
+	}
+}
+
+#endif // (!NET_1_0)
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs
new file mode 100644
index 00000000..6182dce5
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/SQLiteTests.cs
@@ -0,0 +1,414 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if NET_2_0
+
+#region Imports
+
+using System;
+//using System.Collections;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Odbc;
+using System.Data.OracleClient;
+using NUnit.Framework;
+using Spring.Data.Common;
+using Spring.Data.Generic;
+using Spring.Data.Objects;
+//using Sybase.Data.AseClient;
+
+#endregion
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// This class contains misc tests for specific providers
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: SQLiteTests.cs,v 1.1 2008/02/04 22:49:42 markpollack Exp $</version>
+    [TestFixture]
+    public class SQLiteTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+        }
+
+        [Test]
+        public void SqlServerTest()
+        {
+            string errorCode = "544";
+            string[] errorCodes = new string[4] {"544", "2627", "8114", "8115"};
+            //Array.IndexOf()
+            //Array.Sort(errorCodes);
+            foreach (string code in errorCodes)
+            {
+                Console.WriteLine(code);
+            }
+             //if (Array.BinarySearch(errorCodes, errorCode) >= 0)
+            if (Array.IndexOf(errorCodes, errorCode) >= 0)
+             {
+                 Console.WriteLine("yes");
+             }
+             else
+             {
+                 Assert.Fail("did not find error code");
+             }
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.SqlClient");
+            dbProvider.ConnectionString =
+                @"Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa";
+            AdoTemplate adoTemplate = new AdoTemplate(dbProvider);
+            try
+            {
+                adoTemplate.ExecuteNonQuery(CommandType.Text, "insert into Vacation (id) values (1)");
+            } catch (Exception e)
+            {
+                Console.Write(e);
+                throw;
+            }
+        }
+        [Test]
+        public void OracleTest()
+        {
+            //Data Source=XE;User ID=hr;Unicode=True
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.OracleClient");
+            dbProvider.ConnectionString = "Data Source=XE;User ID=hr;Password=hr;Unicode=True";
+            AdoTemplate adoTemplate = new AdoTemplate(dbProvider);
+            decimal count = (decimal) adoTemplate.ExecuteScalar(CommandType.Text, "select count(*) from emp");
+            Assert.AreEqual(14, count);
+
+            EmpProc empProc = new EmpProc(dbProvider);
+            IDictionary dict = empProc.GetEmployees();
+            foreach (DictionaryEntry entry in dict)
+            {
+                Console.WriteLine("Key = " + entry.Key + ", Value = " + entry.Value);
+            }
+            IList employeeList = dict["employees"] as IList;
+            foreach (Employee employee in employeeList)
+            {
+                Console.WriteLine(employee);
+            }
+
+        }
+
+        [Test]
+        public void Test()
+        {
+            //IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse1.15");
+            // dbProvider.ConnectionString = "Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';";
+
+
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("Odbc-2.0");
+            dbProvider.ConnectionString =
+                "Driver={Adaptive Server Enterprise};server=MARKT60;port=5000;Database=pubs2;uid=sa;pwd=;";
+            Assert.IsNotNull(dbProvider);
+            AdoTemplate adoTemplate = new AdoTemplate(dbProvider);
+            IList<string> authorList =
+                adoTemplate.QueryWithRowMapperDelegate<string>(CommandType.Text, "select au_lname from authors",
+                                                               delegate(IDataReader dataReader, int rowNum) { return dataReader.GetString(0); });
+            foreach (string s in authorList)
+            {
+                Console.WriteLine(s);
+            }
+            Assert.IsTrue(authorList.Count > 0);
+        }
+/*
+        [Test]
+        public void StoredProc()
+        {
+            //IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse1.15");
+            //dbProvider.ConnectionString = "Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';";
+
+
+            //IDbProvider dbProvider = DbProviderFactory.GetDbProvider("Odbc-2.0");
+            //dbProvider.ConnectionString =
+            //    "Driver={Adaptive Server Enterprise};server=MARKT60;port=5000;Database=pubs2;uid=sa;pwd=;";
+
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse-15");
+            dbProvider.ConnectionString = "Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';";
+            HelloProc proc = new HelloProc(dbProvider);
+            IDictionary dict = proc.GetResults();
+
+            Assert.AreEqual("Go Sybase", dict["@inoutParam"]);
+            Assert.AreEqual("Hello mango", dict["@outParam"]);
+            Assert.AreEqual(101, (int) dict["RETURN_VALUE"]);
+            foreach (DictionaryEntry entry in dict)
+            {
+                Console.WriteLine("Key = " + entry.Key + ", Value = " + entry.Value);
+            }
+        }
+
+        [Test]
+        public void StordProcAdoTemplate()
+        {
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse-15");
+            dbProvider.ConnectionString = "Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';";
+            AdoTemplate adoTemplate = new AdoTemplate(dbProvider);
+            IDbParameters parameters = new DbParameters(dbProvider);
+            parameters.Add("inParam", AseDbType.VarChar, 32).Value = "mango";
+            parameters.AddInOut("inoutParam", AseDbType.VarChar, 64).Value = "Sybase";
+            parameters.AddOut("outParam", AseDbType.VarChar, 64);
+            parameters.AddReturn("retValue", AseDbType.Integer);
+            adoTemplate.ExecuteNonQuery(CommandType.StoredProcedure, "sp_hello", parameters);
+
+
+            Assert.AreEqual("Go Sybase", parameters["@inoutParam"].Value);
+            Assert.AreEqual("Hello mango", parameters[2].Value);
+            Assert.AreEqual(101, (int) parameters[3].Value);
+        }
+*/
+        [Test]
+        public void DeriveParams()
+        {
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse-15");
+            dbProvider.ConnectionString = "Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';";
+            AdoTemplate adoTemplate = new AdoTemplate(dbProvider);
+            IDataParameter[] derivedParameters = adoTemplate.DeriveParameters("@sp_hello", true);
+            if (derivedParameters.Length == 0)
+            {
+                Console.WriteLine("Derived Parameters = 0!!!!");
+            }
+            for (int i = 0; i < derivedParameters.Length; i++)
+            {
+                Console.WriteLine("Parameter " + i + ", Name = " + derivedParameters[i].ParameterName + ", Value = " +
+                                  derivedParameters[i].Value);
+            }
+        }
+
+/*
+        [Test]
+        public void RawDeriveParams()
+        {
+            using (
+                AseConnection conn =
+                    new AseConnection("Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';"))
+            {
+                using (AseCommand cmd = new AseCommand("@sp_hello", conn))
+                {
+                    conn.Open();
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    AseCommandBuilder.DeriveParameters(cmd);
+                    Console.WriteLine("Number of parameters = " + cmd.Parameters.Count);
+                }
+            }
+        }
+*/
+        [Test]
+        public void QueryWithMapper()
+        {
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("SybaseAse-15");
+            dbProvider.ConnectionString = "Data Source='MARKT60';Port='5000';UID='sa';PWD='';Database='pubs2';";
+            PubDao pubDao = new PubDao(dbProvider);
+            IList<Sale> sales = pubDao.GetSales("5023");
+            Assert.AreEqual(50, sales.Count);
+        }
+
+        [Test]
+        public void QueryWithMapperODBC()
+        {
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("Odbc-2.0");
+            dbProvider.ConnectionString =
+                "Driver={Adaptive Server Enterprise};server=MARKT60;port=5000;Database=pubs2;uid=sa;pwd=;";
+            PubDao pubDao = new PubDao(dbProvider);
+            IList<Sale> sales = pubDao.GetSales("5023");
+            Assert.AreEqual(50, sales.Count);
+        }
+
+        [Test]
+        public void QueryRawODBC()
+        {
+            using (
+                OdbcConnection conn =
+                    new OdbcConnection(
+                        "Driver={Adaptive Server Enterprise};server=MARKT60;port=5000;Database=pubs2;uid=sa;pwd=;"))
+            {
+                using (OdbcCommand cmd = new OdbcCommand("history_proc @stor_id", conn))
+                {
+                    conn.Open();
+                    cmd.CommandType = CommandType.StoredProcedure;
+                    cmd.Parameters.Add("stor_id", OdbcType.NVarChar).Value = "5023";
+                    int i = 0;
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            i++;
+                        }
+                    }
+                    Assert.AreEqual(50, i);
+                }
+            }
+        }
+    }
+
+    public class PubDao : AdoDaoSupport
+    {
+        public PubDao(IDbProvider provider)
+        {
+            DbProvider = provider;
+        }
+
+        public IList<Sale> GetSales(string storeId)
+        {
+            return AdoTemplate.QueryWithRowMapperDelegate<Sale>(CommandType.StoredProcedure, "history_proc",
+                                                                delegate(IDataReader dataReader, int rowNum)
+                                                                    {
+                                                                        Sale sale = new Sale();
+                                                                        sale.Date = dataReader.GetDateTime(0);
+                                                                        sale.OrderNumber = dataReader.GetString(1);
+                                                                        sale.Quantity = dataReader.GetInt32(2);
+                                                                        sale.Title = dataReader.GetString(3);
+                                                                        sale.Discount = dataReader.GetFloat(4);
+                                                                        sale.Price = dataReader.GetFloat(5);
+                                                                        sale.Total = dataReader.GetFloat(6);
+                                                                        return sale;
+                                                                    }, "stor_id",
+                                                                DbType.String, 0, storeId);
+        }
+    }
+
+    public class Sale
+    {
+        private DateTime date;
+        private string orderNumber;
+        private int quantity;
+        private string title;
+        private float discount;
+        private float price;
+        private float total;
+
+
+        public DateTime Date
+        {
+            get { return date; }
+            set { date = value; }
+        }
+
+        public float Discount
+        {
+            get { return discount; }
+            set { discount = value; }
+        }
+
+        public string OrderNumber
+        {
+            get { return orderNumber; }
+            set { orderNumber = value; }
+        }
+
+        public int Quantity
+        {
+            get { return quantity; }
+            set { quantity = value; }
+        }
+
+        public string Title
+        {
+            get { return title; }
+            set { title = value; }
+        }
+
+        public float Price
+        {
+            get { return price; }
+            set { price = value; }
+        }
+
+        public float Total
+        {
+            get { return total; }
+            set { total = value; }
+        }
+    }
+/*
+    public class HelloProc : StoredProcedure
+    {
+        public HelloProc(IDbProvider provider) : base(provider, "sp_hello")
+        {
+            DeclaredParameters.Add("inParam", AseDbType.VarChar, 32).Value = "mango";
+            DeclaredParameters.AddInOut("inoutParam", AseDbType.VarChar, 64).Value = "Sybase";
+            DeclaredParameters.AddOut("outParam", AseDbType.VarChar, 64);
+            DeclaredParameters.AddReturn("retValue", AseDbType.Integer);
+            Compile();
+        }
+
+        public IDictionary GetResults()
+        {
+            return Query("mango", "Sybase");
+        }
+    }
+*/
+    public class EmpProc : StoredProcedure
+    {
+        public EmpProc(IDbProvider provider) : base(provider, "TEST.Get1CurOut")
+        {
+            //DeriveParameters();
+            DeclaredParameters.AddOut("P_CURSOR1", OracleType.Cursor);
+            AddRowMapper("employees", new EmployeeRowMapper());
+            Compile();
+        }
+
+        public IDictionary GetEmployees()
+        {
+            for (int i=0; i< DeclaredParameters.Count; i++)
+            {
+                Console.WriteLine("decarled parameter name = " + DeclaredParameters[i].ParameterName + ", type = " + DeclaredParameters[i].DbType);
+            }
+            return Query();
+        }
+    }
+
+    internal class EmployeeRowMapper : IRowMapper
+    {
+        public object MapRow(IDataReader reader, int rowNum)
+        {
+            Employee emp = new Employee();
+            emp.Number = reader.GetDecimal(0);
+            emp.Name = reader.GetString(1);
+            return emp;
+        }
+    }
+
+    internal class Employee
+    {
+        private decimal number;
+        private string name;
+
+        public decimal Number
+        {
+            get { return number; }
+            set { number = value; }
+        }
+
+        public string Name
+        {
+            get { return name; }
+            set { name = value; }
+        }
+
+        public override string ToString()
+        {
+            return "Number = " + number + ", Name = " + name;
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/SimpleAccountCreditDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/SimpleAccountCreditDao.cs
new file mode 100644
index 00000000..d351a87a
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/SimpleAccountCreditDao.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Data;
+using Spring.Data.Core;
+using Spring.Data.Support;
+
+namespace Spring.Data
+{
+    public class SimpleAccountCreditDao : AdoDaoSupport
+    {
+       
+        public SimpleAccountCreditDao()
+        {
+        }
+
+        /// <summary>
+        /// Insert into the credits table a credit amount
+        /// </summary>
+        /// <remarks>
+        /// Note that this method is not declared as virtual since
+        /// the transaction demarcation is done in the SimpleAccountManager
+        /// class and does not need to have a transactional proxy created for
+        /// it.  If one was not using a higher level class to 
+        /// demarcate transactions and instead wanted to demarcate at the DAO
+        /// directly, the method would be declared as virtual and the
+        /// transaction attributes (or corresponding XML declarations) would
+        /// be applied to this method.
+        /// </remarks>
+        /// <param name="creditAmount">the credit amount</param>
+        public void CreateCredit(float creditAmount)
+        {
+            AdoTemplate.ExecuteNonQuery(CommandType.Text,
+                    String.Format("insert into Credits(creditAmount) VALUES ({0})",
+                    creditAmount));
+        }
+
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/SimpleAccountDebitDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/SimpleAccountDebitDao.cs
new file mode 100644
index 00000000..2b1d9502
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/SimpleAccountDebitDao.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Data;
+using Spring.Data.Core;
+using Spring.Data.Support;
+
+namespace Spring.Data
+{
+    public class SimpleAccountDebitDao : AdoDaoSupport
+    {
+
+        public SimpleAccountDebitDao()
+        {
+        }
+
+        /// <summary>
+        /// Insert into the debits table a debit amount
+        /// </summary>
+        /// <remarks>
+        /// Note that this method is not declared as virtual since
+        /// the transaction demarcation is done in the SimpleAccountManager
+        /// class and does not need to have a transactional proxy created for
+        /// it.  If one was not using a higher level class to 
+        /// demarcate transactions and instead wanted to demarcate at the DAO
+        /// directly, the method would be declared as virtual and the
+        /// transaction attributes (or corresponding XML declarations) would
+        /// be applied to this method.
+        /// </remarks>
+        /// <param name="debitAmount">the debit amount</param>
+        public void DebitAccount(float debitAmount)
+        {
+            AdoTemplate.ExecuteNonQuery(CommandType.Text, String.Format("insert into dbo.Debits (DebitAmount) VALUES ({0})",
+                                                                        debitAmount));
+        }
+
+
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/SimpleAccountManager.cs b/test/Spring/Spring.Data.Integration.Tests/Data/SimpleAccountManager.cs
new file mode 100644
index 00000000..23544c7a
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/SimpleAccountManager.cs
@@ -0,0 +1,48 @@
+
+using Spring.Transaction.Interceptor;
+
+namespace Spring.Data
+{
+    
+    public class SimpleAccountManager
+    {
+        private SimpleAccountCreditDao creditDao;
+        private SimpleAccountDebitDao debitDao;
+
+        public SimpleAccountManager()
+        {
+        }
+
+        public SimpleAccountCreditDao AccountCreditDao
+        {
+            get { return creditDao; }
+            set { creditDao = value; }
+        }
+
+        public SimpleAccountDebitDao AccountDebitDao
+        {
+            get { return debitDao; }
+            set { debitDao = value; }
+        }
+
+        /// <summary>
+        /// Transfer money, performing both credit and debit database operations
+        /// within one transaction.
+        /// </summary>
+        /// <remarks>
+        /// The method is marked as virtual so that a transactional AOP proxy
+        /// can be created for it.
+        /// </remarks>
+        /// <param name="creditAmount">the credit amount.</param>
+        /// <param name="debitAmount">the debit amount.</param>
+        [Transaction()]
+        public virtual void DoTransfer(float creditAmount, float debitAmount)
+        {
+            creditDao.CreateCredit(creditAmount);
+            debitDao.DebitAccount(debitAmount);
+        }
+
+    }
+
+
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/StoredProcedureTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/StoredProcedureTests.cs
new file mode 100644
index 00000000..ff467699
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/StoredProcedureTests.cs
@@ -0,0 +1,131 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Common;
+using Spring.Data.Core;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// Integration tests for StoredProcedure support.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: StoredProcedureTests.cs,v 1.5 2008/01/29 18:22:33 markpollack Exp $</version>
+	[TestFixture]
+	public class StoredProcedureTests 
+	{
+	    
+        #region Fields
+        
+        IAdoOperations adoOperations;
+        IDbProvider dbProvider;
+	    
+        #endregion
+	    
+        [SetUp]
+        public void CreateAdoTemplate()
+        {
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/adoTemplateTests.xml");
+            Assert.IsNotNull(ctx);
+            dbProvider = ctx["DbProvider"] as IDbProvider;
+            Assert.IsNotNull(dbProvider);
+            adoOperations = new AdoTemplate(dbProvider);
+            
+        }
+	    
+	    [Test]
+	    public void ExecuteNonQueryTest()
+	    {
+	        CallCreateTestObject createTestObjectProcedure =
+	            new CallCreateTestObject(dbProvider);
+	        
+	        createTestObjectProcedure.Create("Gabriel", 1);
+	    }
+
+        [Test]
+        public void OutParamTest()
+        {
+            TestObjectStoredProcedure sproc = new TestObjectStoredProcedure(dbProvider);
+            IDbParameters parameters = sproc.DeclaredParameters;
+            Console.WriteLine("\n\n\n");
+            for (int i = 0; i < parameters.Count; i++)
+            {
+                Console.WriteLine("- Declared Parameter " + parameters[i].ParameterName);
+            }
+            IDictionary results = sproc.GetResults("George");
+            foreach (DictionaryEntry entry in results)
+            {
+                Console.WriteLine(entry.Key + 
+                    ", " + entry.Value);
+            }
+
+            IDictionary inParams = new Hashtable();
+            inParams.Add("@Name", "George");
+            results = sproc.GetResultsUsingInDictionary(inParams);
+            Console.WriteLine("\n\n\n");
+            foreach (DictionaryEntry entry in results)
+            {
+                Console.WriteLine(entry.Key +
+                    ", " + entry.Value);
+            }
+
+        }
+
+        [Test]
+        public void OutReturnValueTestWithAdoTemplate()
+        {
+            IDbParameters parameters = adoOperations.CreateDbParameters();
+            parameters.AddOut("Count", DbType.Int32);
+            parameters.AddReturn("RETURN_VALUE", DbType.Int32);
+            parameters.AddWithValue("Name", "George");
+            IList queryResults = adoOperations.QueryWithRowMapper(CommandType.StoredProcedure, "SelectByNameWithReturnAndOutValue",
+                                                                  new SimpleRowMapper(),
+                                                                  parameters);
+            for (int i = 0; i < parameters.Count;i++ )
+            {
+                Console.WriteLine("parameter " + i 
+                    + " name = " + parameters[i].ParameterName 
+                    + " value = " + parameters[i].Value);
+            }
+            //    Console.WriteLine("out parameter 'count' = " + parameters["count"]);
+            //Console.WriteLine("RETURN_VALE           = " + parameters["RETURN_VALUE"]);
+
+        }
+	}
+
+    internal class SimpleRowMapper : IRowMapper
+    {
+        public object MapRow(IDataReader reader, int rowNum)
+        {
+            return "hello";
+        }
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs
new file mode 100644
index 00000000..e2c9bdb7
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs
@@ -0,0 +1,95 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using Common.Logging;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Common;
+using Spring.Data.Core;
+
+#endregion
+
+namespace Spring.Data.Support
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: SimpleExceptionTranslationTests.cs,v 1.4 2007/08/03 19:51:23 markpollack Exp $</version>
+	[TestFixture]
+	public class SimpleExceptionTranslationTests 
+	{
+		#region Fields
+	    private IDbProvider dbProvider;
+	    private IAdoOperations adoOperations;
+		#endregion
+
+		#region Constants
+
+		/// <summary>
+		/// The shared ILog instance for this class (and derived classes). 
+		/// </summary>
+		protected static readonly ILog log =
+			LogManager.GetLogger(typeof (SimpleExceptionTranslationTests));
+
+		#endregion
+
+		#region Methods
+
+		[SetUp]
+        public void CreateAdoTemplate()
+        {
+			IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/adoTemplateTests.xml");
+            Assert.IsNotNull(ctx);
+            dbProvider = ctx["DbProvider"] as IDbProvider;
+            Assert.IsNotNull(dbProvider);
+            adoOperations = new AdoTemplate(dbProvider);
+        }
+	    
+        [Test]
+        public void ExecuteNonQueryText()
+        {
+            
+            string badSql = "insert into TestObjects(Age, Name) VALS (33, 'foo')";
+            try
+            {
+                adoOperations.ExecuteNonQuery(CommandType.Text, badSql);
+            } catch (BadSqlGrammarException e)
+            {
+                
+                log.Error("caught correct exception", e);
+            } catch (Exception e)
+            {
+                log.Error("caught incorrect exception ", e);
+
+                Assert.Fail("did not throw exception of type BadSqlGrammerException");
+            }
+            
+        }
+		#endregion
+
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestCoordinator.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestCoordinator.cs
new file mode 100644
index 00000000..71a83c1d
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestCoordinator.cs
@@ -0,0 +1,27 @@
+
+
+using Spring.Objects;
+
+namespace Spring.Data
+{
+    public class TestCoordinator : ITestCoordinator
+    {
+        private ITestObjectManager testObjectManager;
+
+
+        public ITestObjectManager TestObjectManager
+        {
+            get { return testObjectManager; }
+            set { testObjectManager = value; }
+        }
+
+        #region ITestCoordinator Members
+
+        public void WorkOn(TestObject to1, TestObject to2)
+        {
+            testObjectManager.SaveTwoTestObjects(to1,to2);
+        }
+
+        #endregion
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectDao.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectDao.cs
new file mode 100644
index 00000000..d5729c13
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectDao.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Collections;
+using System.Data;
+using Spring.Data.Common;
+using Spring.Data.Core;
+using Spring.Data.Support;
+using Spring.Objects;
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// AdoTemplate based implementation of ITestObjectDao data access layer.
+	/// </summary>
+	public class TestObjectDao : AdoDaoSupport, ITestObjectDao
+	{
+
+        public void Create(string name, int age)
+        {
+            AdoTemplate.ExecuteNonQuery(CommandType.Text,
+                String.Format("insert into TestObjects(Age, Name) VALUES ({0}, '{1}')", 
+                age, name));
+        }
+
+        public void Update(TestObject to)
+        {
+            AdoTemplate.ExecuteNonQuery(CommandType.Text,
+                String.Format("UPDATE TestObjects SET Age={0}, Name='{1}' where TestObjectNo = {2}",
+                to.Age,
+                to.Name,
+                to.ObjectNumber));
+        }
+
+        public void Delete(string name)
+        {
+            AdoTemplate.ExecuteNonQuery(CommandType.Text,
+                String.Format("delete from TestObjects where Name = '{0}'",
+                name));
+        }
+
+        public TestObject FindByName(string name)
+        {
+            IList toList = AdoTemplate.QueryWithRowMapper(CommandType.Text,
+                "select TestObjectNo, Age, Name from TestObjects where Name='"+name+"'",
+                new TestObjectRowMapper());
+            if (toList.Count > 0)
+            {
+                return (TestObject)toList[0];
+            }
+            else
+            {
+                return null;
+            }            
+        }
+
+        public IList FindAll()
+        {
+            return AdoTemplate.QueryWithRowMapper(CommandType.Text,
+                "select TestObjectNo, Age, Name from TestObjects",
+                new TestObjectRowMapper());
+        }
+
+        public int GetCount()
+        {
+            return (int)AdoTemplate.ExecuteScalar(CommandType.Text, "SELECT COUNT(*) FROM TestObjects");
+        }
+
+        public int GetCountByDelegate()
+        {
+            
+            return (int)AdoTemplate.Execute(new CommandDelegate(MyDelegate));
+        }
+
+	    public int GetCount(int lowerAgeLimit)
+	    {
+            return (int) AdoTemplate.ExecuteScalar(CommandType.Text, 
+                "SELECT COUNT(*) FROM TestObjects where age > @age","age",DbType.Int32, 0, lowerAgeLimit);
+	    }
+
+	    public int GetCount(int lowerAgeLimit, string name)
+	    {
+            IDbParameters dbParameters = AdoTemplate.CreateDbParameters();
+            dbParameters.Add("age", DbType.Int32).Value = lowerAgeLimit;
+	        dbParameters.Add("name", DbType.String).Value = name;
+            return (int)AdoTemplate.ExecuteScalar(CommandType.Text, "SELECT COUNT(*) FROM TestObjects where age > @age and name = @name", dbParameters);
+	    
+	    }
+
+	    public int GetCountByAltMethod(int lowerAgeLimit)
+	    {
+            return (int)AdoTemplate.ExecuteScalar(CommandType.Text, 
+                "SELECT COUNT(*) FROM TestObjects where age > @age", 
+                "age", DbType.Int32, 0, lowerAgeLimit);
+	    
+	    }
+
+	    public int GetCountByCommandSetter(int lowerAgeLimit)
+	    {
+            return (int) AdoTemplate.ExecuteScalar(CommandType.Text,
+                                                   "SELECT COUNT(*) FROM TestObjects where age > @age",
+                                                   new SimpleCommandSetter(lowerAgeLimit));
+	    }
+
+	    private class SimpleCommandSetter : ICommandSetter
+	    {
+            private int lowerLimit;
+	        public SimpleCommandSetter(int limit)
+	        {
+                lowerLimit = limit;	            
+	        }
+
+	        public void SetValues(IDbCommand dbCommand)
+	        {
+	            //wouldn't typically set param values this way....intended to set other IDbCommand props
+                dbCommand.CommandTimeout = 999999;
+	            
+                IDbDataParameter parameter = dbCommand.CreateParameter();
+                parameter.ParameterName = "age";
+                parameter.DbType = DbType.Int32;
+                parameter.Value = lowerLimit;
+                dbCommand.Parameters.Add(parameter);
+	        }
+	    }
+
+
+	    private Object MyDelegate(IDbCommand command)
+        {
+            command.CommandType = CommandType.Text;
+            command.CommandText = "SELECT COUNT(*) FROM TestObjects";            
+            return command.ExecuteScalar();
+        }
+
+
+        private class TestObjectRowMapper : IRowMapper
+        {
+            #region IRowMapper Members
+
+            public object MapRow(IDataReader dataReader, int rowNum)
+            {
+                TestObject to = new TestObject();
+                to.ObjectNumber = dataReader.GetInt32(0);
+                to.Age = dataReader.GetInt32(1);
+                to.Name = dataReader.GetString(2);
+                return to;                
+            }
+
+            #endregion
+
+        }
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs
new file mode 100644
index 00000000..d38b5c74
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs
@@ -0,0 +1,90 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Common.Logging;
+using Spring.Objects;
+using Spring.Transaction.Interceptor;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// Group together multiple ITestObjectDao operations.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TestObjectManager.cs,v 1.4 2008/03/21 14:10:23 markpollack Exp $</version>
+	public class TestObjectManager : ITestObjectManager
+	{
+		#region Fields
+        ITestObjectDao testObjectDao;
+        private static readonly ILog LOG = LogManager.GetLogger(typeof(TestObjectManager));
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TestObjectManager"/> class.
+        /// </summary>
+		public 	TestObjectManager()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+	    public ITestObjectDao TestObjectDao
+	    {
+	        get { return testObjectDao; }
+	        set { testObjectDao = value; }
+	    }
+
+	    #endregion
+
+		#region Methods
+
+        [Transaction]
+        public void SaveTwoTestObjects(TestObject to1, TestObject to2)
+        {
+            LOG.Debug("TransactionActive = " + TransactionSynchronizationManager.ActualTransactionActive);
+            //Console.WriteLine("TransactionSynchronizationManager.CurrentTransactionIsolationLevel = " +
+            //                  TransactionSynchronizationManager.CurrentTransactionIsolationLevel);
+            //Console.WriteLine("System.Transactions.Transaction.Current.IsolationLevel = " + System.Transactions.Transaction.Current.IsolationLevel);
+            testObjectDao.Create(to1.Name, to1.Age);
+            testObjectDao.Create(to2.Name, to2.Age);
+        }
+
+        [Transaction()]
+	    public void DeleteTwoTestObjects(string name1, string name2)
+        {
+            testObjectDao.Delete(name1);
+            testObjectDao.Delete(name2);
+        }
+
+		#endregion
+	}
+
+
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectQuery.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectQuery.cs
new file mode 100644
index 00000000..6c90a7ab
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectQuery.cs
@@ -0,0 +1,66 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using Spring.Data.Common;
+using Spring.Data.Objects;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TestObjectQuery.cs,v 1.2 2006/06/12 08:43:41 markpollack Exp $</version>
+    public class TestObjectQuery : MappingAdoQuery
+    {
+        private static string sql = "select TestObjectNo, Age, Name from TestObjects where Name = @UName";
+            
+        public TestObjectQuery(IDbProvider dbProvider) 
+            : base(dbProvider, sql)
+        {
+            //DeclaredParameters = new DbParameters(dbProvider);
+            try
+            {
+                DeclaredParameters.Add("UName", SqlDbType.VarChar, 50);
+            } catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
+            CommandType = CommandType.Text;
+            Compile();
+        }
+       
+	    protected override object MapRow(IDataReader reader, int num)
+	    {
+            TestObject to = new TestObject();
+            to.ObjectNumber = reader.GetInt32(0);
+            to.Age = reader.GetInt32(1);
+            to.Name = reader.GetString(2);
+	        return to;
+	    }
+    }
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectStoredProcedure.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectStoredProcedure.cs
new file mode 100644
index 00000000..eb74ec6b
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectStoredProcedure.cs
@@ -0,0 +1,63 @@
+#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
+
+#region Imports
+
+using System;
+using System.Collections;
+using Spring.Data.Common;
+using Spring.Data.Objects;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TestObjectStoredProcedure.cs,v 1.3 2008/01/29 18:22:33 markpollack Exp $</version>
+	public class TestObjectStoredProcedure : StoredProcedure
+	{
+        private static string procedureName = "SelectByNameWithReturnAndOutValue";
+            
+        public TestObjectStoredProcedure(IDbProvider dbProvider) : base(dbProvider, procedureName)
+        {           
+            //include return value
+            DeriveParameters(true);           
+            Compile();
+        }
+	    
+        public IDictionary GetResults(string name)
+        {
+            //the 100 is for the out parameter that is incorrectly classified as input-output
+            return Query(name);
+
+        }
+
+        public IDictionary GetResultsUsingInDictionary(IDictionary inParams)
+        {
+            return ExecuteNonQueryByNamedParam(inParams);
+        }
+
+
+	    
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevel.xml b/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevel.xml
new file mode 100644
index 00000000..49bc9d6f
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevel.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database"
+         xmlns:tx="http://www.springframework.net/tx"
+         xmlns:aop="http://www.springframework.net/aop">
+
+
+  <db:provider  id="DbProvider"
+              provider="SqlServer-2.0"
+              connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa"/>
+
+
+  <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
+    <property name="DbProvider" ref="DbProvider"/>
+  </object>
+
+  <object id="testObjectDao" type="Spring.Data.TestObjectDao, Spring.Data.Integration.Tests">
+    <property name="AdoTemplate" ref="adoTemplate"/>
+  </object>
+
+  <object id="testObjectManager" type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests">
+    <property name="TestObjectDao" ref="testObjectDao"/>
+  </object>
+
+  
+  <object id="TransactionManager" type="Spring.Data.Core.TxScopeTransactionManager, Spring.Data">
+  </object>
+ 
+
+  <!--
+  <object id="TransactionManager" type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data">
+    <property name="DbProvider" ref="DbProvider"/>
+  </object>
+  -->
+
+
+  <tx:advice id="txAdvice" transaction-manager="TransactionManager">
+    <tx:attributes>
+      <tx:method name="*"/>
+    </tx:attributes>
+  </tx:advice>
+
+  <object id="serviceOperation" type="Spring.Aop.Support.SdkRegularExpressionMethodPointcut, Spring.Aop">
+    <property name="patterns">
+      <list>
+        <value>TestObjectManager</value>
+      </list>
+    </property>
+  </object>
+
+  <aop:config>
+    <aop:advisor pointcut-ref="serviceOperation" advice-ref="txAdvice"/>
+  </aop:config>
+  
+    
+</objects>
+
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs
new file mode 100644
index 00000000..f6f1223d
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestTxIsolationLevelTests.cs
@@ -0,0 +1,97 @@
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#if NET_2_0
+#region Imports
+
+using System;
+using System.Data.SqlClient;
+using System.Transactions;
+using NUnit.Framework;
+using Spring.Aop.Config;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Config;
+using Spring.Objects;
+using Spring.Objects.Factory.Xml;
+using Spring.Transaction.Config;
+
+#endregion
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// Simple exercising of the AdoTemplate 
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: TestTxIsolationLevelTests.cs,v 1.1 2008/04/03 05:41:46 markpollack Exp $</version>
+    [TestFixture]
+    public class TestTxIsolationLevelTests
+    {
+        //investigate
+        //1. matching against methods in adotemplate when the pointcut for type should already exclude it?
+        //2. is isolaiton level applied correctly
+        //   a) TxScope w/ attributes
+        //   b) TxScope w/ xml
+        //   c) ado  w/ attriutes
+        //   d) ado  w/ xml
+        private ITestObjectManager testObjectManager;
+
+        [SetUp]
+        public void RollbackTestSetup()
+        {
+            NamespaceParserRegistry.RegisterParser(typeof (DatabaseNamespaceParser));
+            NamespaceParserRegistry.RegisterParser(typeof (TxNamespaceParser));
+            NamespaceParserRegistry.RegisterParser(typeof (AopNamespaceParser));
+            IApplicationContext ctx =
+                new XmlApplicationContext(
+                    "assembly://Spring.Data.Integration.Tests/Spring.Data/TestTxIsolationLevel.xml");
+            Assert.IsNotNull(ctx);
+            testObjectManager = ctx["testObjectManager"] as ITestObjectManager;
+            Assert.IsNotNull(testObjectManager);
+        }
+
+        [Test]
+        public void DoWork()
+        {
+            TestObject to1 = new TestObject("joe", 32);
+            TestObject to2 = new TestObject("mary", 35);
+            testObjectManager.SaveTwoTestObjects(to1, to2);
+        }
+
+        [Test]
+        public void Dowork2()
+        {
+            using (TransactionScope txScope = new TransactionScope())
+            {
+                string updateSql2 = "insert into Debits (DebitAmount) VALUES (222)";
+                using (SqlConnection cn2005 = new SqlConnection())
+                {
+                    cn2005.ConnectionString =
+                        @"Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa";
+                    SqlCommand cmd = new SqlCommand(updateSql2, cn2005);
+                    cn2005.Open();
+                    Console.WriteLine("Isolation level = " + System.Transactions.Transaction.Current.IsolationLevel);
+                }
+            }
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs
new file mode 100644
index 00000000..9f3de8b8
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/TransactionTemplateTests.cs
@@ -0,0 +1,230 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Data;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Common;
+using Spring.Data.Core;
+using Spring.Objects;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// Integration tests for transaction template functionality 
+	/// </summary>
+	/// <author>Mark Pollack</author>
+	/// <version>$Id: TransactionTemplateTests.cs,v 1.7 2007/08/03 19:51:22 markpollack Exp $</version>
+	[TestFixture]
+	public class TransactionTemplateTests 
+	{
+
+        private IDbProvider dbProvider;
+
+        private IPlatformTransactionManager transactionManager;
+
+        private IApplicationContext ctx;
+	    
+	    private IAdoOperations adoOperations;
+
+        [SetUp]
+        public void SetUp()
+        {
+            ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Integration.Tests/Spring.Data/templateTests.xml");
+            dbProvider = ctx["DbProvider"] as IDbProvider;
+            transactionManager = ctx["adoTransactionManager"] as IPlatformTransactionManager;
+            adoOperations = ctx["adoTemplate"] as IAdoOperations;
+            
+        }
+
+
+        /// <summary>
+        /// Test using ObjectNameAutoProxyCreator for declarative tx mgmt.
+        /// </summary>
+        /// <remarks>Note asserts to not actually check if same tx is used
+        /// for the multiple save and delete operations in TestObjectManager.
+        /// Useful for stepping through w/ debugger.
+        /// </remarks>
+        [Test]
+        public void DeclarativeViaAutoProxyCreator()
+        {
+            ITestObjectManager mgr = ctx["testObjectManager"] as ITestObjectManager; 
+            TestObjectDao dao = (TestObjectDao)ctx["testObjectDao"];
+            PerformOperations(mgr, dao);
+        }
+
+        /// <summary>
+        /// Test using TransactionProxyFactoryObject for declarative tx mgmt.
+        /// </summary>
+        /// <remarks>Note asserts to not actually check if same tx is used
+        /// for the multiple save and delete operations in TestObjectManager.
+        /// Useful for stepping through w/ debugger.
+        /// </remarks>
+        [Test]
+        public void DeclarativeViaTransactionProxyFactoryObject()
+        {
+            ITestObjectManager mgr = ctx["testObjectManagerTP"] as ITestObjectManager; 
+            ITestObjectDao dao = (ITestObjectDao)ctx["testObjectDao"];
+            PerformOperations(mgr, dao);
+        }
+        /// <summary>
+        /// Test using ProxyFactory with a transaction interceptor for declarative tx mgmt. 
+        /// </summary>
+        /// <remarks>Note asserts to not actually check if same tx is used
+        /// for the multiple save and delete operations in TestObjectManager.
+        /// Useful for stepping through w/ debugger.</remarks>
+        [Test]
+        public void DeclarativeViaProxyFactoryObject()
+        {
+            ITestObjectManager mgr = ctx["testObjectManagerPF"] as ITestObjectManager;
+	        TestObjectDao dao = (TestObjectDao)ctx["testObjectDao"];
+            PerformOperations(mgr, dao);
+
+        }
+
+        public static void PerformOperations(ITestCoordinator coordinator, ITestObjectDao dao)
+        {
+            TestObject to1 = new TestObject();
+            to1.Name = "Jack";
+            to1.Age = 7;
+            TestObject to2 = new TestObject();
+            to2.Name = "Jill";
+            to2.Age = 8;
+
+            coordinator.WorkOn(to1, to2);
+
+            coordinator.TestObjectManager.DeleteTwoTestObjects("Jack", "Jill");
+        }
+
+	    public static void PerformOperations(ITestObjectManager mgr,
+                                       ITestObjectDao dao)
+	    {
+	        Assert.IsNotNull(mgr);
+	        TestObject to1 = new TestObject();
+	        to1.Name = "Jack";
+	        to1.Age = 7;
+	        TestObject to2 = new TestObject();
+	        to2.Name = "Jill";
+	        to2.Age = 8;
+	        mgr.SaveTwoTestObjects(to1, to2);
+    
+	        TestObject to = dao.FindByName("Jack");
+	        Assert.IsNotNull(to);
+    
+	        to = dao.FindByName("Jill");
+	        Assert.IsNotNull(to);
+	        Assert.AreEqual("Jill", to.Name);
+    
+	        mgr.DeleteTwoTestObjects("Jack", "Jill");
+    
+	        to = dao.FindByName("Jack");
+	        Assert.IsNull(to);
+    
+	        to = dao.FindByName("Jill");
+	        Assert.IsNull(to);
+	    }
+
+	    [Test]
+        public void ExecuteTemplate()
+        {
+            TransactionTemplate tt = new TransactionTemplate(transactionManager);
+            object result = tt.Execute(new SimpleTransactionCallback(dbProvider));
+            Assert.AreEqual(2, (int)result);
+
+        }
+
+        [Test]
+        public void ExecuteTransactionManager()
+        {
+            DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+            def.PropagationBehavior = TransactionPropagation.Required;
+
+            //TODO change to property of name TransactionStatus...
+            ITransactionStatus status = transactionManager.GetTransaction(def);
+            
+            int iCount = 0;
+            try
+            {
+                iCount = (int)adoOperations.ExecuteScalar(CommandType.Text, "SELECT COUNT(*) FROM TestObjects");
+                /*
+                IAdoCommand cmd = new AdoCommand(dbProvider, CommandType.Text);
+                cmd.CommandText = "SELECT COUNT(*) FROM TestObjects";
+                iCount = (int)cmd.ExecuteScalar();
+                */
+
+                //other AdoCommands can be executed within same tx.
+            } catch (Exception e)
+            {
+                transactionManager.Rollback(status);
+                throw e;
+            }
+            transactionManager.Commit(status);
+            Assert.AreEqual(2, iCount);
+
+        }
+
+        
+        private class SimpleTransactionCallback : ITransactionCallback
+        {
+            private IDbProvider dbProvider;
+
+        public SimpleTransactionCallback(IDbProvider dbp)
+            {
+                dbProvider = dbp;
+            }
+            /// <summary>
+            /// Gets called by TransactionTemplate.Execute within a 
+            /// transaction context.
+            /// </summary>
+            /// <param name="status">The associated transaction status.</param>
+            /// <returns>a result object or <c>null</c></returns>
+            public object DoInTransaction(ITransactionStatus status)
+            {
+                AdoTemplate adoTemplate = new AdoTemplate(dbProvider);
+                return adoTemplate.Execute(new TestCommandCallback());
+            }
+        }
+	    
+        private class TestCommandCallback : ICommandCallback
+        {
+           
+            public Object DoInCommand(IDbCommand cmd)
+            {
+                cmd.CommandText = "SELECT COUNT(*) FROM TestObjects";
+                int count = (int)cmd.ExecuteScalar();
+
+                cmd.CommandText = "SELECT COUNT(*) FROM TestObjects";
+                count = (int)cmd.ExecuteScalar();
+
+                return count;
+
+            }
+        }
+	}
+}
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/adoTemplateTests.xml b/test/Spring/Spring.Data.Integration.Tests/Data/adoTemplateTests.xml
new file mode 100644
index 00000000..289a7da1
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/adoTemplateTests.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:d="http://www.springframework.net/database">
+
+  <!-- ;User ID=springqa;Password=springqa; -->
+
+ 
+  <d:provider id="DbProvider" 
+                provider="SqlServer-2.0" 
+                connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa"/>
+  <!-- Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa -->
+<!--
+  
+   <d:provider id="DbProvider" 
+                provider="SqlServer-1.1" 
+                connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+ -->                
+<!--
+  <object id="DbProvider" type="Spring.Data.Common.DbProviderFactoryObject, Spring.Data">
+    <property name="ProviderName" value="SqlServer-1.1"/>
+    <property name="ConnectionString" 
+                 value="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+
+  </object>
+  -->
+  
+
+  <object id="adoTemplate" 
+          type="Spring.Data.Core.AdoTemplate, Spring.Data">
+
+    <property name="DbProvider" ref="DbProvider"/>
+  </object>
+
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/autoDeclarativeServices.xml b/test/Spring/Spring.Data.Integration.Tests/Data/autoDeclarativeServices.xml
new file mode 100644
index 00000000..aba45ad8
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/autoDeclarativeServices.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database"
+         xmlns:tx="http://www.springframework.net/tx">
+
+  
+  <!--
+   <d:provider id="DbProvider"
+                 provider="SqlServer-2.0"
+                 connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa"/>
+  -->
+
+  <db:provider id="DbProvider" 
+                  provider="SqlServer-1.1" 
+                  connectionString="Data Source=MARKT60\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+    <object id="adoTransactionManager" 
+            type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data">
+            
+        <property name="DbProvider" ref="DbProvider"/>
+    </object>
+        
+    <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
+        <property name="DbProvider" ref="DbProvider"/>                
+    </object>
+
+    <object id="testObjectDao" type="Spring.Data.TestObjectDao, Spring.Data.Integration.Tests">
+        <property name="AdoTemplate" ref="adoTemplate"/>
+    </object>
+            
+    
+    <!-- The DAO object that performs multiple data access operations -->
+    <!--
+    <object id="testObjectManager" parent="TxProxyConfigurationTemplate">
+      <property name="Target">
+        <object id="testObjectManagerTarget" type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests">
+          <property name="TestObjectDao" ref="testObjectDao"/>
+        </object>
+      </property>
+    </object>
+    -->
+
+    <object id="testObjectManager" type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests">
+      <property name="TestObjectDao" ref="testObjectDao"/>
+    </object>
+
+    
+    <object id="consoleLoggingAroundAdvice" type="Spring.Data.ConsoleLoggingAroundAdvice"/>
+
+
+    <object id="testCoordinator" type="Spring.Data.TestCoordinator, Spring.Data.Integration.Tests">
+      <property name="TestObjectManager" ref="testObjectManager"/>
+    </object>
+
+    
+    <object id="testCoordinatorAOPProxy" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+      <property name="target" ref="testCoordinator"/>
+      <property name="InterceptorNames">
+        <list>
+          <value>aroundAdvisor</value>
+        </list>
+      </property>
+    </object>
+    
+    
+    <!--
+    <object id="testCoordinator" type="Spring.Aop.Framework.ProxyFactoryObject">
+      <property name="target">
+        <object id="testCoordinatorTarget" type="Spring.Data.TestCoordinator, Spring.Data.Integration.Tests">
+          <property name="TestObjectManager" ref="testObjectManager"/>
+        </object>
+      </property>
+      <property name="interceptorNames">
+        <list>
+          <value>consoleLoggingAroundAdvice</value>
+        </list>
+      </property>
+    </object>
+    -->
+
+    <!--
+    <object id="TxProxyConfigurationTemplate" abstract="true"
+      type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data">
+
+      <property name="PlatformTransactionManager" ref="adoTransactionManager"/>
+
+      <property name="TransactionAttributes">
+        <name-values>
+          <add key="*" value="PROPAGATION_REQUIRED"/>
+        </name-values>
+      </property>
+    </object>
+    -->
+    
+    <!-- The rest of the config file is common no matter how many objects you add -->
+    <!-- that you would like to have declarative tx management applied to -->    
+
+    <object id="autoProxyCreator" 
+            type="Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator, Spring.Aop">
+    </object>
+    
+    <object id="transactionAdvisor"
+            type="Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor, Spring.Data"
+            autowire="constructor">
+    </object>
+    
+
+    <object id="transactionInterceptor" 
+            type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data" autowire="byType">
+        <!--
+        <property name="TransactionManager" ref="adoTransactionManager"/>
+        <property name="TransactionAttributeSource" ref="attributeTransactionAttributeSource"/>        
+        -->
+    </object>
+    
+    <object id="attributeTransactionAttributeSource"
+            type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data">    
+    </object>
+
+
+
+    <object id="aroundAdvisor" type="Spring.Aop.Support.NameMatchMethodPointcutAdvisor, Spring.Aop">
+      <property name="Advice" ref="consoleLoggingAroundAdvice"/>
+      <property name="MappedNames">
+        <list>
+          <value>Spring.Data.TestCoordinator.Work*</value>
+        </list>
+      </property>
+    </object>
+
+    
+</objects>
+
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/declarativeServices.xml b/test/Spring/Spring.Data.Integration.Tests/Data/declarativeServices.xml
new file mode 100644
index 00000000..2e4f16ba
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/declarativeServices.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database">
+
+  <db:provider id="DbProvider"
+               provider="SqlServer-2.0"
+               connectionString="Data Source=MARKT60\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+
+    <object id="adoTemplate" type="Spring.Data.Core.AdoTemplate, Spring.Data">
+        <property name="DbProvider" ref="DbProvider"/>                
+    </object>
+
+    <object id="testObjectDao" type="Spring.Data.TestObjectDao, Spring.Data.Integration.Tests">
+        <property name="AdoTemplate" ref="adoTemplate"/>
+    </object>
+    
+        
+    <object id="adoTransactionManager" 
+            type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data">
+            
+        <property name="DbProvider" ref="DbProvider"/>
+    </object>
+    
+    <!-- Transactional Proxy for TestObjectManager using the ProxyFactoryObject -->
+    <object id="testObjectManager" 
+            type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+        
+        <property name="Target" ref="testObjectManagerTarget"/>
+        <property name="ProxyInterfaces">
+            <value>Spring.Data.ITestObjectManager</value>
+        </property>
+        <property name="InterceptorNames">
+            <value>transactionInterceptor</value>
+        </property>  
+            
+    </object>
+    
+
+    <!--
+    <object id="autoProxyCreator"
+      type="Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator, Spring.Aop">
+    </object>
+    -->
+
+    <object id="transactionAdvisor"
+				  type="Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor, Spring.Data"
+				  autowire="constructor">
+    </object>
+    
+    
+    <!-- Transaction Interceptor -->
+    <object id="transactionInterceptor" 
+            type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data">
+        <property name="TransactionManager" ref="adoTransactionManager"/>
+        <!-- note do not have converter from string to this property type registered -->
+        <property name="TransactionAttributeSource" ref="attributeTransactionAttributeSource"/>        
+    </object>
+    
+    <object id="attributeTransactionAttributeSource"
+            type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data">    
+    </object>
+
+
+    <!-- The DAO object that performs multiple data access operations -->
+    <!-- testObjectManagerTarget if not using autoproxy -->
+    <object id="testObjectManagerTarget" 
+            type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests">
+        <property name="TestObjectDao" ref="testObjectDao"/>
+    </object>
+    
+    
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/nativeAdoTests.xml b/test/Spring/Spring.Data.Integration.Tests/Data/nativeAdoTests.xml
new file mode 100644
index 00000000..1a68fb54
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/nativeAdoTests.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns='http://www.springframework.net'>
+
+
+    <object id="testObjectDao" 
+            type="Spring.Data.NativeAdoTestObjectDao, Spring.Data.Integration.Tests">            
+        <property name="ConnectionString" value="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+    </object>  
+    
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/oracleAdoTemplateTests.xml b/test/Spring/Spring.Data.Integration.Tests/Data/oracleAdoTemplateTests.xml
new file mode 100644
index 00000000..db101150
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/oracleAdoTemplateTests.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database">
+
+  <db:provider id="DbProvider" 
+                 provider="OracleODP-2.0" 
+                 connectionString="Data Source=AGORA; User Id=agora_user; Password=welcome"/>
+
+  <!--
+  <object id="DbProvider" 
+            type="Spring.Data.Support.Oracle.OracleClientProvider, Spring.Data">
+            
+        <property name="ConnectionString" 
+                  value="Data Source=agora; User Id=agora_user; Password=welcome;  Integrated Security=no;"/>
+    </object>
+  -->
+    <object id="adoTemplate" 
+            type="Spring.Data.Core.AdoTemplate, Spring.Data">
+            
+        <property name="DbProvider" ref="DbProvider"/>                
+    </object>
+    
+    
+</objects>
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/templateTests.xml b/test/Spring/Spring.Data.Integration.Tests/Data/templateTests.xml
new file mode 100644
index 00000000..fd1cf8e1
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/templateTests.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns='http://www.springframework.net'
+         xmlns:d="http://www.springframework.net/database">
+
+    <d:provider id="DbProvider" 
+               provider="System.Data.SqlClient"
+               connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;User ID=springqa; Password=springqa"/>
+
+  <object name="LoggingAdvice" type="Spring.Aspects.Logging.SimpleLoggingAdvice, Spring.Aop">
+    <property name="logUniqueIdentifier" value="true"/>
+    <property name="logExecutionTime"    value="true"/>
+    <property name="logMethodArguments"  value="true"/>
+
+    <property name="Separator"           value=";"/>
+    <property name="LogLevel"            value="Info"/>
+
+    <property name="HideProxyTypeNames"  value="true"/>
+    <property name="UseDynamicLogger"    value="true"/>
+  </object>
+
+  <object id="SetterAndMethodLoggingAdvisor" type="Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor, Spring.Aop">
+    <property name="advice" ref="LoggingAdvice" />
+    <property name="pattern" value=".*" />
+  </object>
+  
+    <object id="Parent" 
+          type="Spring.Objects.TestObject,Spring.Core.Tests">
+            
+        <property name="name" value="Parent"/>
+    </object>
+
+
+    <object id="adoTemplate" 
+            type="Spring.Data.Core.AdoTemplate, Spring.Data">
+            
+        <property name="DbProvider" ref="DbProvider"/>                
+    </object>
+
+    <object id="testObjectDao" 
+            type="Spring.Data.TestObjectDao, Spring.Data.Integration.Tests">
+            
+        <property name="AdoTemplate" ref="adoTemplate"/>
+    </object>
+    
+        
+    <object id="adoTransactionManager" 
+            type="Spring.Data.Core.AdoPlatformTransactionManager, Spring.Data">
+            
+        <property name="DbProvider" ref="DbProvider"/>
+    </object>
+    
+    <!-- Transaction AutoProxy based on Name for TestObjetManager -->
+    <object name="autoProxyCreator"
+            type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+
+      <property name="InterceptorNames">
+        <list>
+          <value>SetterAndMethodLoggingAdvisor</value>
+          <value>transactionInterceptor</value>
+        </list>
+      </property>
+      <!--
+        <property name="InterceptorNames" value="transactionInterceptor"/>
+        -->
+        <property name="ObjectNames">
+            <list>
+                <idref local="testObjectManager"/>
+            </list>
+        </property>
+    </object>
+    
+    <object id="testObjectManager" 
+            type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests">
+        
+        <property name="TestObjectDao" ref="testObjectDao"/>
+    </object>
+    
+    <!-- Transactional Proxy for TestObjectManager using the TransactionProxyFactory -->
+    <object id="testObjectManagerTP" 
+            type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data">
+        
+        <property name="PlatformTransactionManager" ref="adoTransactionManager"/>
+        <property name="Target">
+            <object type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests">
+                <property name="TestObjectDao" ref="testObjectDao"/>
+            </object>
+        </property> 
+        <property name="TransactionAttributes">
+            <name-values>
+                <add key="Save*" value="PROPAGATION_REQUIRED"/>
+                <add key="Delete*" value="PROPAGATION_REQUIRED"/>
+            </name-values>
+        </property>
+    </object>
+    
+    <!-- Transactional Proxy for TestObjectManager using the ProxyFactoryObject -->
+    <object id="testObjectManagerPF" 
+            type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+        
+        <property name="Target" ref="testObjectManagerTarget"/>
+        <property name="ProxyInterfaces">
+            <value>Spring.Data.ITestObjectManager</value>
+        </property>
+        <property name="InterceptorNames">
+            <value>transactionInterceptor</value>
+        </property>      
+        
+    </object>
+    
+    <!-- Transaction Interceptor -->
+    <object id="transactionInterceptor" 
+            type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data">
+        <property name="TransactionManager" ref="adoTransactionManager"/>
+        <!-- note do not have converter from string to this property type registered -->
+        <property name="TransactionAttributeSource" ref="methodMapTransactionAttributeSource"/>        
+    </object>
+    
+    <object name="methodMapTransactionAttributeSource" 
+            type="Spring.Transaction.Interceptor.MethodMapTransactionAttributeSource, Spring.Data">
+        <property name="MethodMap">
+           <dictionary>           
+              <entry key="Spring.Data.TestObjectManager.SaveTwoTestObjects, Spring.Data.Integration.Tests" 
+                     value="PROPAGATION_REQUIRED"/>
+              <entry key="Spring.Data.TestObjectManager.DeleteTwoTestObjects, Spring.Data.Integration.Tests" 
+                     value="PROPAGATION_REQUIRED"/>                     
+           </dictionary>        
+        </property>     
+    </object>
+    
+    <!-- The DAO object that performs multiple data access operations -->
+    <object id="testObjectManagerTarget" type="Spring.Data.TestObjectManager, Spring.Data.Integration.Tests">
+        <property name="TestObjectDao" ref="testObjectDao"/>
+    </object>
+    
+
+
+
+    
+    
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/testobjects-sqlserver.sql b/test/Spring/Spring.Data.Integration.Tests/Data/testobjects-sqlserver.sql
new file mode 100644
index 00000000..2ca45e5a
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Data/testobjects-sqlserver.sql
@@ -0,0 +1,65 @@
+
+
+USE Spring
+CREATE TABLE TestObjects
+(
+    TestObjectNo    int     IDENTITY NOT NULL,
+    Age             int,
+    Name            varchar(50)
+)
+
+
+CREATE PROCEDURE SelectByName 
+(
+  @Name varchar(50)
+  
+)
+
+as 
+  select TestObjectNo, Age,Name from TestObjects where Name = @Name
+
+return
+
+CREATE PROCEDURE SelectByNameWithReturnValue
+(
+  @Name varchar(50)
+  
+)
+
+as 
+  select * from TestObjects where Name = @Name
+
+return 5
+
+
+CREATE PROCEDURE SelectByNameWithReturnAndOutValue
+(
+  @Name varchar(50),
+  @Count int output
+  
+)
+
+as 
+  select * from TestObjects where Name = @Name
+  set @Count = 10
+return 5
+
+
+CREATE PROCEDURE CreateTestObject
+(
+  @Name varchar(50),
+  @Age  int
+)
+
+as
+  insert into TestObjects(Name, Age) Values (@Name, @Age)
+
+
+
+
+
+INSERT INTO TestObjects 
+    (Age, Name)
+VALUES
+    (1, 'Gabriel')
+    
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2003.csproj b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2003.csproj
new file mode 100644
index 00000000..89fe78d2
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2003.csproj
@@ -0,0 +1,371 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{A9D3732A-D40B-4C35-80CE-9C4A53D2DEAD}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Data.Integration.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = 'echo "Copying .xml files for tests"&#xd;&#xa;xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2003\Spring.Data.Integration.Tests\$(ConfigurationName)\ /y /s /q /d&#xd;&#xa;xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2003\Spring.Data.Integration.Tests\$(ConfigurationName)\ /y /s /q'
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Data.Integration.Tests\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Data.Integration.Tests\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\Net\1.1\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "System.Data.OracleClient"
+                    AssemblyName = "System.Data.OracleClient"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.OracleClient.dll"
+                />
+                <Reference
+                    Name = "Spring.Aop.2003"
+                    Project = "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core.Tests.2003"
+                    Project = "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Data.2003"
+                    Project = "{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Data.Integration.Tests.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Spring.Data.Integration.Tests.dll.config"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\AccountCreditDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\AccountDebitDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\AccountManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\AdoDaoTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\AdoTemplateTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\adoTemplateTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\autoDeclarativeServices.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\AutoDeclarativeTxTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\CallCreateTestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\ConsoleLoggingAroundAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\CreateTestObject.sql"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\CreateTestObjectNonQuery.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\CreditsDebitsSchema.sql"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\declarativeServices.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\DeclarativeTxTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\DTC1.1AppContext.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\DTCAppContext.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\DTCAppContextNoInterfaces.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\DTCTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\DTCTestsNoInterfaces.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IAccountCreditDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IAccountDebitDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\IAccountManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\ITestCoordinator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\ITestObjectDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\ITestObjectManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\MappingAdoQueryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NativeAdoTestObjectDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NativeAdoTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\nativeAdoTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\OracleAdoTemplateTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\oracleAdoTemplateTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\SimpleAccountCreditDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\SimpleAccountDebitDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\SimpleAccountManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\StoredProcedureTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\templateTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\TestCoordinator.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\TestObjectDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\TestObjectManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\TestObjectQuery.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\testobjects-sqlserver.sql"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\TestObjectStoredProcedure.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\TransactionTemplateTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Northwind\AdoTemplateShipperDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Northwind\IShipperDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Northwind\NativeAdoShipperDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Northwind\Shipper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Support\SimpleExceptionTranslationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2005.csproj b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2005.csproj
new file mode 100644
index 00000000..be5be8ee
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2005.csproj
@@ -0,0 +1,194 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{91766D21-C568-459F-9BEA-759B011F23CF}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Data.Integration.Tests</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.Integration.Tests\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>67, 618</NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.Integration.Tests\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DotNetMock, Version=0.7.4.0, Culture=neutral, PublicKeyToken=805ea88df19095f6">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\DotNetMock.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.5.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Data.OracleClient" />
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2005.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Data\AccountCreditDao.cs" />
+    <Compile Include="Data\AccountDebitDao.cs" />
+    <Compile Include="Data\AccountManager.cs" />
+    <Compile Include="Data\AdoDaoTests.cs" />
+    <Compile Include="Data\AdoTemplatePerformanceTests.cs" />
+    <Compile Include="Data\AdoTemplateTests.cs" />
+    <Compile Include="Data\AutoDeclarativeTxTests.cs" />
+    <Compile Include="Data\CallCreateTestObject.cs" />
+    <Compile Include="Data\ConsoleLoggingAroundAdvice.cs" />
+    <Compile Include="Data\TestTxIsolationLevelTests.cs" />
+    <Compile Include="Data\Generic\GenericAdoTemplateTests.cs" />
+    <Compile Include="Data\Generic\ITestObjectDao.cs" />
+    <Compile Include="Data\Objects\Generic\VacationRowMapper.cs" />
+    <Compile Include="Data\Objects\Generic\StoredProcedureTests.cs" />
+    <Compile Include="Data\Generic\TestObjectDao.cs" />
+    <Compile Include="Data\Generic\TestObjectRowMapper.cs" />
+    <Compile Include="Data\ITestCoordinator.cs" />
+    <Compile Include="Data\Objects\Generic\Vacation.cs" />
+    <Compile Include="Data\SimpleAccountManager.cs" />
+    <Compile Include="Data\SimpleAccountDebitDao.cs" />
+    <Compile Include="Data\SimpleAccountCreditDao.cs" />
+    <Compile Include="Data\DTCTestsNoInterfaces.cs" />
+    <Compile Include="Data\CreateTestObjectNonQuery.cs" />
+    <Compile Include="Data\DeclarativeTxTests.cs" />
+    <Compile Include="Data\DTCTests.cs" />
+    <Compile Include="Data\IAccountCreditDao.cs" />
+    <Compile Include="Data\IAccountDebitDao.cs" />
+    <Compile Include="Data\IAccountManager.cs" />
+    <Compile Include="Data\ITestObjectDao.cs" />
+    <Compile Include="Data\ITestObjectManager.cs" />
+    <Compile Include="Data\MappingAdoQueryTests.cs" />
+    <Compile Include="Data\NativeAdoTestObjectDao.cs" />
+    <Compile Include="Data\NativeAdoTests.cs" />
+    <Compile Include="Data\Northwind\AdoTemplateShipperDao.cs" />
+    <Compile Include="Data\Northwind\IShipperDao.cs" />
+    <Compile Include="Data\Northwind\NativeAdoShipperDao.cs" />
+    <Compile Include="Data\Northwind\Shipper.cs" />
+    <Compile Include="Data\SQLiteTests.cs" />
+    <Compile Include="Data\StoredProcedureTests.cs" />
+    <Compile Include="Data\Support\SimpleExceptionTranslationTests.cs" />
+    <Compile Include="Data\TestCoordinator.cs" />
+    <Compile Include="Data\TestObjectDao.cs" />
+    <Compile Include="Data\TestObjectManager.cs" />
+    <Compile Include="Data\TestObjectQuery.cs" />
+    <Compile Include="Data\TestObjectStoredProcedure.cs" />
+    <Compile Include="Data\TransactionTemplateTests.cs" />
+    <Compile Include="Data\NestedTxScopeTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\adoTemplateTests.xml" />
+    <EmbeddedResource Include="Data\declarativeServices.xml" />
+    <EmbeddedResource Include="Data\DTCAppContext.xml" />
+    <EmbeddedResource Include="Data\autoDeclarativeServices.xml" />
+    <EmbeddedResource Include="Data\DTCAppContextNoInterfaces.xml" />
+    <EmbeddedResource Include="Data\Generic\GenericAdoTemplateTests.xml" />
+    <EmbeddedResource Include="Data\nativeAdoTests.xml" />
+    <EmbeddedResource Include="Data\oracleAdoTemplateTests.xml" />
+    <EmbeddedResource Include="Data\templateTests.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Data.Integration.Tests.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\TestTxIsolationLevel.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
new file mode 100644
index 00000000..7a83d2b3
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<project name="Spring.Data.Integration.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+	<target name="build">
+		<!-- build Spring.Data.Integration.Tests -->
+		<csc target="library" define="${current.build.defines.csc}"
+		     warnaserror="true"
+		     debug="${current.build.debug}"
+                     output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml">
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+			</sources>
+			<resources basedir="Resources">
+				<include name="**/*" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+				<include name="*.dll" />
+				<include name="System.Data.OracleClient.dll" />
+				<exclude name="${project::get-name()}.dll" />
+				<exclude name="CloverRuntime.dll" />
+			</references>
+		</csc>
+	</target>
+	<target name="test" depends="build">
+	        <!-- skipping running of tests for now
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
+		</nunit2outproc>
+		-->
+	</target>
+</project>
diff --git a/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.dll.config b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.dll.config
new file mode 100644
index 00000000..770d107a
--- /dev/null
+++ b/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.dll.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+    </sectionGroup>
+    
+    <sectionGroup name="spring">
+      <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="INFO" />
+
+      </factoryAdapter>
+     
+    </logging>
+  </common>
+    
+  <spring>
+    <parsers>
+      <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" />
+    </parsers>
+  </spring>
+
+</configuration>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/AssemblyInfo.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..3da885ea
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Spring.Data.NHibernate Integration Tests")]
+[assembly: AssemblyDescription("Integration tests for Spring.Data.NHibernate assembly")]
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/AccountCreditDao.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/AccountCreditDao.cs
new file mode 100644
index 00000000..321c4b85
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/AccountCreditDao.cs
@@ -0,0 +1,22 @@
+using System;
+using Spring.Data;
+using Spring.Data.NHibernate.Support;
+
+namespace Spring.Data.NHibernate
+{
+    public class AccountCreditDao : HibernateDaoSupport, IAccountCreditDao
+    {
+       
+        public AccountCreditDao()
+        {
+        }
+
+        public void CreateCredit(float creditAmount)
+        {
+            Credit c = new Credit();
+            c.Amount = creditAmount;
+            HibernateTemplate.SaveOrUpdate(c);
+        }
+
+    }
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/AccountDebitDao.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/AccountDebitDao.cs
new file mode 100644
index 00000000..14edf586
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/AccountDebitDao.cs
@@ -0,0 +1,22 @@
+
+using Spring.Data.NHibernate.Support;
+
+namespace Spring.Data.NHibernate
+{
+    public class AccountDebitDao : HibernateDaoSupport, IAccountDebitDao
+    {
+
+        public AccountDebitDao()
+        {
+        }
+
+        public void DebitAccount(float debitAmount)
+        {
+            Debit d = new Debit();
+            d.Amount = debitAmount;
+            HibernateTemplate.SaveOrUpdate(d);
+        }
+
+
+    }
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/AccountManager.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/AccountManager.cs
new file mode 100644
index 00000000..e6a1b1a6
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/AccountManager.cs
@@ -0,0 +1,95 @@
+#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 Spring.Transaction.Interceptor;
+
+namespace Spring.Data.NHibernate
+{
+    public class AccountManager : IAccountManager
+    {
+        
+        private IAccountCreditDao creditDao;
+        private IAccountDebitDao debitDao;
+        private IAuditDao auditDao;
+
+        private bool throwException = false;
+        private bool throwExceptionAtEnd = false;
+
+        public AccountManager()
+        {
+        }
+
+        public IAccountCreditDao AccountCreditDao
+        {
+            get { return creditDao; }
+            set { creditDao = value; }
+        }
+
+        public IAccountDebitDao AccountDebitDao
+        {
+            get { return debitDao; }
+            set { debitDao = value; }
+        }
+
+        public IAuditDao AuditDao
+        {
+            get { return auditDao; }
+            set { auditDao = value; }
+        }
+
+
+        public bool ThrowException
+        {
+            get { return throwException; }
+            set { throwException = value; }
+        }
+
+        public bool ThrowExceptionAtEnd
+        {
+            get { return throwExceptionAtEnd; }
+            set { throwExceptionAtEnd = value; }
+        }
+
+
+        [Transaction()]
+        public void DoTransfer(float creditAmount, float debitAmount)
+        {
+            creditDao.CreateCredit(creditAmount);
+            if (ThrowException)
+            {
+                throw new ArithmeticException("Couldn't do the math....");
+            }
+            debitDao.DebitAccount(debitAmount);
+            if (AuditDao != null)
+            {
+                AuditDao.AuditOperation(DateTime.Now.ToString());
+            }
+            if (ThrowExceptionAtEnd)
+            {
+                throw new ArgumentException("Almost there...but not quite.");
+            }
+        }
+
+    }
+
+
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/AuditDao.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/AuditDao.cs
new file mode 100644
index 00000000..50fb5656
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/AuditDao.cs
@@ -0,0 +1,21 @@
+using System.Data;
+using log4net;
+using Spring.Data.Core;
+using Spring.Data.Support;
+
+namespace Spring.Data.NHibernate
+{
+    public class AuditDao : AdoDaoSupport, IAuditDao
+    {
+        protected static readonly ILog logger =
+            LogManager.GetLogger(typeof(AuditDao));
+        public void AuditOperation(string operationIdenfitier)
+        {
+            logger.Debug("Executing AUDIT operation.");
+            AdoTemplate.ExecuteNonQuery(CommandType.Text,
+                                        "insert into AuditTable (AuditId) values (@AuditId)",
+                                        "AuditId", DbType.String, 100, operationIdenfitier);
+            logger.Debug("AUDIT operation done.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/Credit.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/Credit.cs
new file mode 100644
index 00000000..81ec4b12
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/Credit.cs
@@ -0,0 +1,63 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Data.NHibernate
+{
+	public class Credit 
+	{
+		#region Fields
+
+	    private int creditId;
+	    private float amount;
+	    
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="Credit"/> class.
+                /// </summary>
+		public Credit()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+        public int CreditID
+        {
+            get { return creditId; }
+            set { creditId = value; }
+        }
+
+        public float Amount
+        {
+            get { return amount; }
+            set { amount = value; }
+        }
+		#endregion
+
+		#region Methods
+
+		#endregion
+
+	}
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/Credit.hbm.xml b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/Credit.hbm.xml
new file mode 100644
index 00000000..3447ab1c
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/Credit.hbm.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+    <class name="Spring.Data.NHibernate.Credit, Spring.Data.NHibernate.Integration.Tests" 
+           table="Credits" lazy="false">
+        <id name="CreditID" column="CreditID" type="Int32"> 
+            <generator class="identity" /> 
+        </id> 
+        <property name="Amount" column="CreditAmount"/> 
+    </class>
+</hibernate-mapping>
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/DbProviderTemplateTests.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/DbProviderTemplateTests.cs
new file mode 100644
index 00000000..27193782
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/DbProviderTemplateTests.cs
@@ -0,0 +1,78 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using log4net.Config;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+    /// <summary>
+    /// This class contains tests for execution of misc Hibernate usage, including userCredentialsDbProvider
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: DbProviderTemplateTests.cs,v 1.2 2008/03/21 14:10:37 markpollack Exp $</version>
+    [TestFixture]
+    public class DbProviderTemplateTests
+    {
+        private IApplicationContext ctx;
+        private UserCredentialsDbProvider userCredentialsDbProvider;
+
+        [SetUp]
+        public void SetUp()
+        {
+            BasicConfigurator.Configure();
+            ctx =
+                new XmlApplicationContext("assembly://Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate/dbProviderTemplateTests.xml");
+            userCredentialsDbProvider = ctx["DbProvider"] as UserCredentialsDbProvider;
+            Assert.IsNotNull(userCredentialsDbProvider);
+
+        }
+
+        [Test]
+        public void UserCredentialsDbProvider()
+        {
+            ITestObjectDao dao = (ITestObjectDao)ctx["testObjectDaoTransProxy"];
+
+            userCredentialsDbProvider.SetCredentialsForCurrentThread("User ID=springqa", "Password=springqa");
+            TestObject toGeorge = new TestObject();
+            toGeorge.Name = "George";
+            toGeorge.Age = 33;
+            dao.Create(toGeorge);
+
+            userCredentialsDbProvider.SetCredentialsForCurrentThread("User ID=springqa2", "Password=springqa2");
+
+            TestObject toMary = new TestObject();
+            toMary.Name = "Mary";
+            toMary.Age = 34;
+            dao.Create(toMary);
+        }
+
+
+
+        
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/Debit.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/Debit.cs
new file mode 100644
index 00000000..5df4c0a6
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/Debit.cs
@@ -0,0 +1,63 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+namespace Spring.Data.NHibernate
+{
+	public class Debit 
+	{
+		#region Fields
+
+	    private int debitId;
+	    private float amount;
+	    
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="Credit"/> class.
+                /// </summary>
+		public Debit()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+        public int DebitID
+        {
+            get { return debitId; }
+            set { debitId = value; }
+        }
+
+        public float Amount
+        {
+            get { return amount; }
+            set { amount = value; }
+        }
+		#endregion
+
+		#region Methods
+
+		#endregion
+
+	}
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/Debit.hbm.xml b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/Debit.hbm.xml
new file mode 100644
index 00000000..5ebfcef7
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/Debit.hbm.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+    <class name="Spring.Data.NHibernate.Debit, Spring.Data.NHibernate.Integration.Tests" 
+           table="Debits" lazy="false">
+        <id name="DebitID" column="DebitID" type="Int32"> 
+            <generator class="identity" /> 
+        </id> 
+        <property name="Amount" column="DebitAmount"/> 
+    </class>
+</hibernate-mapping>
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/IAccountCreditDao.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/IAccountCreditDao.cs
new file mode 100644
index 00000000..724cbb65
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/IAccountCreditDao.cs
@@ -0,0 +1,9 @@
+
+
+namespace Spring.Data.NHibernate
+{
+    public interface IAccountCreditDao
+    {
+        void CreateCredit(float creditAmount);
+    }
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/IAccountDebitDao.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/IAccountDebitDao.cs
new file mode 100644
index 00000000..beba4fec
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/IAccountDebitDao.cs
@@ -0,0 +1,8 @@
+
+namespace Spring.Data.NHibernate
+{
+    public interface IAccountDebitDao
+    {
+        void DebitAccount(float debitAmount);
+    }
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/IAccountManager.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/IAccountManager.cs
new file mode 100644
index 00000000..437cfe23
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/IAccountManager.cs
@@ -0,0 +1,17 @@
+
+namespace Spring.Data.NHibernate
+{
+    public interface IAccountManager
+    {
+        void DoTransfer(float creditAmount, float debitAmount);
+        
+        /// <summary>
+        /// For testing purposes...
+        /// </summary>
+        bool ThrowException
+        { 
+            get; 
+            set;
+        }
+    }
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/IAuditDao.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/IAuditDao.cs
new file mode 100644
index 00000000..e60dffa9
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/IAuditDao.cs
@@ -0,0 +1,28 @@
+#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
+
+
+namespace Spring.Data.NHibernate
+{
+    public interface IAuditDao
+    {
+        void AuditOperation(string operationIdenfitier);
+    }
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/ITestObjectDao.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/ITestObjectDao.cs
new file mode 100644
index 00000000..8a25a5ec
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/ITestObjectDao.cs
@@ -0,0 +1,42 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: ITestObjectDao.cs,v 1.1 2007/05/31 20:25:14 markpollack Exp $</version>
+	public interface ITestObjectDao 
+	{
+        void Create(TestObject to);
+        void Update(TestObject to);
+        void Delete(TestObject to);
+	    TestObject FindByName(string name);
+            //IList FindAll();
+            //int GetCount();
+            //int GetCountByDelegate();
+        void CreateUpdateRollback(TestObject to);
+        
+	}
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.cs
new file mode 100644
index 00000000..3f1a54b2
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.cs
@@ -0,0 +1,102 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using log4net;
+using log4net.Config;
+using NHibernate;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Common;
+using Spring.Data.Support;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// Use of Hibernate Template against database.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: MultipleDbTests.cs,v 1.1 2007/05/31 20:25:14 markpollack Exp $</version>
+	[TestFixture]
+	public class MultipleDbTests 
+	{
+		#region Fields
+
+        private IApplicationContext ctx;
+	    
+		#endregion
+	    
+
+		#region Constants
+
+		/// <summary>
+		/// The shared <see cref="log4net.ILog"/> instance for this class (and derived classes). 
+		/// </summary>
+		protected static readonly ILog log =
+			LogManager.GetLogger(typeof (TemplateTests));
+
+		#endregion
+
+		#region Constructor (s)
+	    
+		/// <summary>
+        /// Initializes a new instance of the <see cref="MultipleDbTests"/> class.
+        /// </summary>
+        public MultipleDbTests()
+		{
+
+		}
+
+		#endregion
+
+        [SetUp]
+        public void SetUp()
+        {
+            BasicConfigurator.Configure();
+            ctx =
+                new XmlApplicationContext("assembly://Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate/MultipleDbTests.xml");
+           
+        }
+
+        [Test]
+        public void MultipleDBAccess()
+        {
+            float transferAmount = 114;
+            IAccountManager mgr = null;
+
+                Assert.IsNotNull(ctx, "Application Context is null");
+                mgr = ctx["accountManager"] as IAccountManager;
+                Assert.IsNotNull(mgr, "accountManager not of expected type. Type = " + ctx["accountManager"].GetType().ToString());
+                mgr.DoTransfer(transferAmount, transferAmount);
+
+            
+
+        }	    
+
+
+    }
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.xml b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
new file mode 100644
index 00000000..70040ad8
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/MultipleDbTests.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database">
+
+  <db:provider id="DbProvider1" 
+                 provider="SqlServer-1.1" 
+                 connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+
+  <db:provider id="DbProvider2" 
+                 provider="SqlServer-1.1" 
+                 connectionString="Data Source=(local);Database=Spring2;User ID=springqa2;Password=springqa2;Trusted_Connection=False"/>
+
+  <object id="SessionFactory1" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate">
+
+    <property name="DbProvider" ref="DbProvider1"/>
+    <property name="MappingAssemblies">
+      <list>
+        <value>Spring.Data.NHibernate.Integration.Tests</value>
+      </list>
+    </property>
+    <property name="HibernateProperties">
+      <dictionary>
+
+        <entry key="hibernate.connection.provider"
+               value="NHibernate.Connection.DriverConnectionProvider"/>
+
+        <entry key="hibernate.dialect"
+               value="NHibernate.Dialect.MsSql2000Dialect"/>
+
+        <entry key="hibernate.connection.driver_class"
+               value="NHibernate.Driver.SqlClientDriver"/>
+
+      </dictionary>
+    </property>
+
+  </object>
+
+  <object id="SessionFactory2" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate">
+
+    <property name="DbProvider" ref="DbProvider2"/>
+    <property name="MappingAssemblies">
+      <list>
+        <value>Spring.Data.NHibernate.Integration.Tests</value>
+      </list>
+    </property>
+    <property name="HibernateProperties">
+      <dictionary>
+
+        <entry key="hibernate.connection.provider"
+               value="NHibernate.Connection.DriverConnectionProvider"/>
+
+        <entry key="hibernate.dialect"
+               value="NHibernate.Dialect.MsSql2000Dialect"/>
+
+        <entry key="hibernate.connection.driver_class"
+               value="NHibernate.Driver.SqlClientDriver"/>
+
+      </dictionary>
+    </property>
+
+  </object>
+
+
+  <object id="transactionManager"
+          type="Spring.Data.TxScopeTransactionManager, Spring.Data">
+  </object>
+
+  <object id="AccountCreditDao" type="Spring.Data.NHibernate.AccountCreditDao, Spring.Data.NHibernate.Integration.Tests">
+    <property name="SessionFactory" ref="SessionFactory1"/>
+  </object>
+  <object id="AccountDebitDao" type="Spring.Data.NHibernate.AccountDebitDao, Spring.Data.NHibernate.Integration.Tests">
+    <property name="SessionFactory" ref="SessionFactory2"/>
+  </object>
+
+  
+  <!-- The DAO object that performs multiple data access operations -->
+  <object id="accountManagerTarget" 
+          type="Spring.Data.NHibernate.AccountManager, Spring.Data.NHibernate.Integration.Tests">
+    <property name="AccountCreditDao" ref="AccountCreditDao"/>
+    <property name="AccountDebitDao" ref="AccountDebitDao"/>
+
+    <!--
+      <property name="AuditDao" ref="AuditDao"/>
+      -->
+
+
+    <!--
+      <property name="ThrowException" value="true"/>
+      -->
+
+    <!--
+      <property name="ThrowExceptionAtEnd" value="true"/>
+      -->
+
+  </object>
+
+
+  <!-- construct the transaction proxy based on [Transaction()] in DAO class -->
+  <!-- todo condense this xml for attribute usage for ease of use -->
+  <!--
+    <aop:transaction name=testObjectDao"
+                     target="NHTestObjectDao"
+                     interfaces="Spring.NHibernate.ITestObjectDao"
+                     transactionManager="hibernateTransactionManager"/>
+    -->
+
+  <!-- Transactional Proxy for TestObjectManager using the ProxyFactoryObject -->
+  <object id="accountManager" 
+          type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+
+    <property name="Target" ref="accountManagerTarget"/>
+
+    <property name="InterceptorNames">
+      <value>transactionInterceptor</value>
+    </property>
+
+  </object>
+
+  <!-- Transaction Interceptor based on attribute [Transaction()] -->
+  <object id="transactionInterceptor" 
+          type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data">
+    <property name="TransactionManager" ref="transactionManager"/>
+    <!-- note do not have converter from string to this property type registered -->
+    <property name="TransactionAttributeSource">
+      <object type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data"/>
+    </property>
+  </object>
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.cs
new file mode 100644
index 00000000..8526dc8e
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.cs
@@ -0,0 +1,149 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using log4net.Config;
+using NHibernate;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Common;
+using Spring.Data.NHibernate.Support;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: NHDAOTests.cs,v 1.1 2007/05/31 20:25:14 markpollack Exp $</version>
+	[TestFixture]
+	public class NHDAOTests 
+	{
+		#region Fields
+
+	    private IApplicationContext ctx;
+	    
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="NHDAOTests"/> class.
+        /// </summary>
+		public 	NHDAOTests()
+		{
+
+		}
+
+		#endregion
+	   	    
+		#region Properties
+
+		#endregion
+
+	    
+		#region Methods
+
+        [SetUp]
+        public void SetUp()
+        {
+            BasicConfigurator.Configure();
+            
+            ctx =
+                new XmlApplicationContext("assembly://Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate/NHDAOTests.xml");
+            ctx.Name = AbstractApplicationContext.DefaultRootContextName;
+            if (!ContextRegistry.IsContextRegistered(AbstractApplicationContext.DefaultRootContextName))
+            {
+                ContextRegistry.RegisterContext(ctx);
+            }
+        }
+
+        [Test]
+        public void DbProviderTransalation()
+        {
+
+            ISessionFactory sf = ctx["SessionFactory"] as ISessionFactory;
+            IDbProvider dbProvider = SessionFactoryUtils.GetDbProvider(sf);
+#if NET_2_0            
+            Assert.AreEqual("Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0",
+                                dbProvider.DbMetadata.ProductName);
+#else
+            Assert.AreEqual("Microsoft SQL Server, provider V1.0.5000.0 in framework .NET V1.1",
+                    dbProvider.DbMetadata.ProductName);
+#endif            
+        }
+
+	    
+        [Test]
+        public void SessionScopeOutsideTransaction()
+        {
+            float transferAmount = 113;
+            using (new SessionScope())
+            {
+                IAccountManager mgr = null;
+                mgr = ctx["accountManager"] as IAccountManager;
+                Assert.IsNotNull(mgr, "accountManager not of expected type. Type = " + ctx["accountManager"].GetType().ToString());
+                mgr.DoTransfer(transferAmount, transferAmount);
+            }
+        }
+
+        [Test]
+        public void DeclarativeWithAttributes()
+        {
+            float transferAmount = 113;
+            IAccountManager mgr = null;
+            try
+            {
+                Assert.IsNotNull(ctx,"Application Context is null");
+                mgr = ctx["accountManager"] as IAccountManager;
+                Assert.IsNotNull(mgr,"accountManager not of expected type. Type = " + ctx["accountManager"].GetType().ToString());
+                mgr.DoTransfer(transferAmount, transferAmount);
+                Assert.IsTrue(ContainsNewData(transferAmount));
+            } catch (Exception e)
+            {
+                if (mgr.ThrowException)
+                {
+                    Console.WriteLine(e.Message);
+                    Console.WriteLine(e.StackTrace);
+                    Assert.IsTrue(DoesNotContainNewData(transferAmount));
+                }
+            }
+        }
+
+	    private bool ContainsNewData(float amount)
+	    {
+	        //to be done
+	        return true;
+	    }
+
+	    private bool DoesNotContainNewData(float amount)
+	    {
+	        //to be done
+	        return true;
+	    }
+
+	    #endregion
+
+	}
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.xml b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.xml
new file mode 100644
index 00000000..d5c2ba2b
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHDAOTests.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database">
+
+    <db:provider id="DbProvider" 
+                   provider="System.Data.SqlClient" 
+                   connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa;Password=springqa"/>
+
+
+    <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate12">
+        <property name="DbProvider" ref="DbProvider"/>
+        
+      
+        <property name="MappingAssemblies">
+            <list>
+                <value>Spring.Data.NHibernate.Integration.Tests</value>
+            </list>
+        </property>
+        <property name="HibernateProperties">
+           <dictionary>
+
+                <entry key="hibernate.connection.provider"
+                       value="NHibernate.Connection.DriverConnectionProvider"/>
+
+                <entry key="hibernate.dialect"
+                       value="NHibernate.Dialect.MsSql2000Dialect"/>
+                     
+                <entry key="hibernate.connection.driver_class"
+                       value="NHibernate.Driver.SqlClientDriver"/>    
+                                     
+            </dictionary>
+        </property>
+                      
+    </object>
+
+    <object id="AccountCreditDao" type="Spring.Data.NHibernate.AccountCreditDao, Spring.Data.NHibernate.Integration.Tests">
+        <property name="SessionFactory" ref="SessionFactory"/>
+    </object>
+    <object id="AccountDebitDao" type="Spring.Data.NHibernate.AccountDebitDao, Spring.Data.NHibernate.Integration.Tests">
+        <property name="SessionFactory" ref="SessionFactory"/>
+    </object>
+
+    <object id="AuditDao" type="Spring.Data.NHibernate.AuditDao, Spring.Data.NHibernate.Integration.Tests">
+      <property name="DbProvider" ref="DbProvider"/>
+    </object>
+
+
+  <!-- The DAO object that performs multiple data access operations -->
+    <object id="accountManagerTarget" 
+            type="Spring.Data.NHibernate.AccountManager, Spring.Data.NHibernate.Integration.Tests">
+      <property name="AccountCreditDao" ref="AccountCreditDao"/>
+      <property name="AccountDebitDao" ref="AccountDebitDao"/>
+      
+      <!--
+      <property name="AuditDao" ref="AuditDao"/>
+      -->
+      
+      
+      <!--
+      <property name="ThrowException" value="true"/>
+      -->
+      
+      <!--
+      <property name="ThrowExceptionAtEnd" value="true"/>
+      -->
+     
+    </object> 
+    
+    <object id="hibernateTransactionManager" 
+            type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate12">
+        <!--  Comment out DbProvider if you want to have the tx mgr infer the DbProvider from
+              the session factory.  -->
+        <!--  Set the DbProvider explicitly if you would like to have ADO.NET and NHibernate 
+              operations take place within the same transaction.  -->
+        <property name="DbProvider" ref="DbProvider"/>
+        <property name="sessionFactory" ref="SessionFactory"/>
+
+    </object>
+    
+    <!-- construct the transaction proxy based on [Transaction()] in DAO class -->
+    <!-- todo condense this xml for attribute usage for ease of use -->
+    <!--
+    <aop:transaction name=testObjectDao"
+                     target="NHTestObjectDao"
+                     interfaces="Spring.NHibernate.ITestObjectDao"
+                     transactionManager="hibernateTransactionManager"/>
+    -->
+    
+    <!-- Transactional Proxy for TestObjectManager using the ProxyFactoryObject -->
+    <object id="accountManager" 
+            type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+        
+        <property name="Target" ref="accountManagerTarget"/>
+
+        <property name="InterceptorNames">
+            <value>transactionInterceptor</value>
+        </property>  
+            
+    </object>
+    
+    <!-- Transaction Interceptor based on attribute [Transaction()] -->
+    <object id="transactionInterceptor" 
+            type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data">
+        <property name="TransactionManager" ref="hibernateTransactionManager"/>
+        <!-- note do not have converter from string to this property type registered -->
+        <property name="TransactionAttributeSource">
+            <object type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data"/>            
+        </property>     
+    </object>   
+    
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHTestObjectDao.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHTestObjectDao.cs
new file mode 100644
index 00000000..646cd20f
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NHTestObjectDao.cs
@@ -0,0 +1,100 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NHibernate.Type;
+using Spring.Data.NHibernate.Support;
+using Spring.Transaction.Interceptor;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: NHTestObjectDao.cs,v 1.1 2007/05/31 20:25:14 markpollack Exp $</version>
+	public class NHTestObjectDao : HibernateDaoSupport, ITestObjectDao
+	{
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="NHTestObjectDao"/> class.
+                /// </summary>
+		public 	NHTestObjectDao()
+		{
+
+		}
+
+		#endregion
+
+        #region ITestObjectDao Members
+
+        [Transaction()]
+	    public void Create(TestObject to)
+	    {
+	        HibernateTemplate.Save(to);
+	    }
+
+        [Transaction()]
+	    public void Update(TestObject to)
+	    {
+	       HibernateTemplate.SaveOrUpdate(to);
+	    }
+
+        [Transaction()]
+	    public void Delete(TestObject to)
+	    {
+	        HibernateTemplate.Delete(to);
+	    }
+
+	    public TestObject FindByName(string name)
+        {
+	        IList result = HibernateTemplate.Find(
+                "select from TestObject as to where to.Name=?",
+                name,
+                TypeFactory.GetStringType(50)
+                );
+
+            if (result.Count > 0)
+            {
+                return (TestObject)result[0];
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public void CreateUpdateRollback(TestObject to)
+        {
+            HibernateTemplate.Save(to);
+            to.Name = "Updated Name";
+            HibernateTemplate.SaveOrUpdate(to);
+            throw new Exception("My expected exception for test purposes.");
+        }
+
+        #endregion
+	}
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NativeNHTestObjectDao.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NativeNHTestObjectDao.cs
new file mode 100644
index 00000000..cdef2842
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NativeNHTestObjectDao.cs
@@ -0,0 +1,114 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using NHibernate;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: NativeNHTestObjectDao.cs,v 1.1 2007/05/31 20:25:14 markpollack Exp $</version>
+	public class NativeNHTestObjectDao  : ITestObjectDao
+	{
+	    public ISessionFactory SessionFactory
+	    {
+	        get { return sessionFactory; }
+	        set { sessionFactory = value; }
+	    }
+
+	    private ISessionFactory sessionFactory;
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="NativeNHTestObjectDao"/> class.
+                /// </summary>
+		public 	NativeNHTestObjectDao()
+		{
+
+		}
+
+		#endregion
+
+
+		#region Methods
+
+		#endregion
+
+        #region ITestObjectDao Members
+
+        public void Create(TestObject to)
+        {
+            ISession session = null;
+            ITransaction transaction = null;
+	            
+            try
+            {
+                session = SessionFactory.OpenSession();
+                
+                transaction = session.BeginTransaction();
+	
+                session.Save(to);
+
+                transaction.Commit();
+            }
+            catch
+            {
+                if(transaction != null)
+                    transaction.Rollback(); 
+                throw; 
+            }
+            finally
+            {
+                if(session != null)
+                    session.Close();
+            }
+
+        }
+
+        public void Update(TestObject to)
+        {
+            // TODO:  Add NativeNHTestObjectDao.Update implementation
+        }
+
+        public void Delete(TestObject to)
+        {
+            // TODO:  Add NativeNHTestObjectDao.Delete implementation
+        }
+
+        public TestObject FindByName(string name)
+        {
+            // TODO:  Add NativeNHTestObjectDao.FindByName implementation
+            return null;
+        }
+
+        public void CreateUpdateRollback(TestObject to)
+        {
+            // TODO:  Add NativeNHTestObjectDao.CreateUpdateRollback implementation
+        }
+
+        #endregion
+    }
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NativeNHTests.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NativeNHTests.cs
new file mode 100644
index 00000000..a034b4c2
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/NativeNHTests.cs
@@ -0,0 +1,70 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using NHibernate;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	[TestFixture]
+	public class NativeNHTests 
+	{
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="NativeNHTests"/> class.
+                /// </summary>
+		public 	NativeNHTests()
+		{
+
+		}
+
+		#endregion
+
+
+		#region Methods
+
+	    [Test]
+	    public void CreateNative()
+	    {
+            IApplicationContext ctx =
+                new XmlApplicationContext("assembly://Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate/templateTests.xml");
+            ITestObjectDao dao = (ITestObjectDao)ctx.GetObject("nativeNHTestObjectDao");
+	        
+            TestObject toGeorge = new TestObject();
+            toGeorge.Name = "George";
+            toGeorge.Age = 34;
+            dao.Create(toGeorge);
+
+        }
+        #endregion
+
+    }
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TemplateTests.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TemplateTests.cs
new file mode 100644
index 00000000..5c5c3c3d
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TemplateTests.cs
@@ -0,0 +1,268 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using log4net;
+using log4net.Config;
+using NHibernate;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Data.Common;
+using Spring.Data.Config;
+using Spring.Data.Support;
+using Spring.Objects.Factory.Xml;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// Use of Hibernate Template against database.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TemplateTests.cs,v 1.2 2008/02/04 22:42:50 markpollack Exp $</version>
+	[TestFixture]
+	public class TemplateTests 
+	{
+		#region Fields
+        private IDbProvider dbProvider;
+
+        private IPlatformTransactionManager transactionManager;
+
+        private IApplicationContext ctx;
+		#endregion
+
+		#region Constants
+
+		/// <summary>
+		/// The shared <see cref="log4net.ILog"/> instance for this class (and derived classes). 
+		/// </summary>
+		protected static readonly ILog log =
+			LogManager.GetLogger(typeof (TemplateTests));
+
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TemplateTests"/> class.
+                /// </summary>
+		public 	TemplateTests()
+		{
+
+		}
+
+		#endregion
+
+        [SetUp]
+        public void SetUp()
+        {
+            //NamespaceParserRegistry.RegisterParser(typeof(DatabaseNamespaceParser));
+            BasicConfigurator.Configure();
+            ctx =
+                new XmlApplicationContext("assembly://Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate/templateTests.xml");
+            dbProvider = ctx["DbProvider"] as IDbProvider;
+            transactionManager = ctx["hibernateTransactionManager"] as IPlatformTransactionManager;
+            
+        }
+
+	    [Test]
+        public void ExceptionTranslator()
+        {
+	        ISessionFactory sessionFactory = ctx["SessionFactory"] as ISessionFactory;
+	        HibernateTemplate template = new HibernateTemplate(sessionFactory);
+            IAdoExceptionTranslator translator = template.AdoExceptionTranslator;
+	        Assert.IsNotNull(translator, "ADO.NET exception translator should not be null");
+	        
+	        
+	        Assert.IsInstanceOfType(typeof(ErrorCodeExceptionTranslator), translator);
+        }
+	    
+	    [Test]
+	    public void FallbackExceptionTranslator()
+	    {
+            //ISessionFactory sessionFactory = ctx["SessionFactory"] as ISessionFactory;
+            //HibernateTemplate template = new HibernateTemplate(sessionFactory);
+            IAdoExceptionTranslator fallbackTranslator = new FallbackExceptionTranslator();
+            fallbackTranslator.Translate("test", "sql", new Exception("foo"));
+	        
+	    }
+	    
+        [Test]
+        [Ignore("Just for demo purposes")]
+        public void DemoDao()
+        {
+
+            ITestObjectDao dao = (ITestObjectDao)ctx["testObjectDaoViaTxAttributes"];
+            TestObject toGeorge = new TestObject();
+            toGeorge.Name = "George";
+            toGeorge.Age = 33;
+            dao.Create(toGeorge);
+
+        }
+
+        [Test]
+        [Ignore("Just for demo purposes")]
+        public void SimpleDao()
+        {
+            ITestObjectDao dao = (ITestObjectDao)ctx["NHTestObjectDao"];
+            Assert.IsNotNull(dao);
+            TestObject to = dao.FindByName("Gabriel");
+            Assert.IsNotNull(to);
+            Assert.AreEqual("Gabriel", to.Name);
+
+        }
+
+	    /// <summary>
+	    /// Test simple data base operations using attributes for 
+	    /// declarative transaction demarcation.
+	    /// </summary>
+        [Test]
+        public void DaoOperationsViaProxyFactoryWithTxAttributes()
+        {
+
+            ITestObjectDao dao = (ITestObjectDao)ctx["testObjectDaoViaTxAttributes"];
+            ExecuteDaoOperations(dao);
+
+        }
+
+
+        [Test]
+        public void DaoOperationsViaTransactionProxy()
+        {
+
+            ITestObjectDao dao = (ITestObjectDao)ctx["testObjectDaoTransProxy"];
+            ExecuteDaoOperations(dao);
+
+        }
+
+        [Test]
+        public void DaoOperationsWithRollback()
+        {
+	        ITestObjectDao dao = (ITestObjectDao)ctx["testObjectDaoTransProxy"];
+            try 
+            {
+                ExecuteAndRollbackDaoOperations(dao);
+            } catch (Exception e)
+            {
+                TestObject to = dao.FindByName("Bugs");
+                Assert.IsNull(to);
+                
+                //just to get rid of compiler warning...
+                Assert.IsNotNull(e);
+            }
+        }
+
+        private static void ExecuteAndRollbackDaoOperations(ITestObjectDao dao)
+        {
+            TestObject toBugs = new TestObject();
+            toBugs.Name = "Bugs";
+            toBugs.Age = 33;
+            dao.CreateUpdateRollback(toBugs);
+
+        }
+	    private static void ExecuteDaoOperations(ITestObjectDao dao)
+	    {
+	        TestObject toGeorge = new TestObject();
+	        toGeorge.Name = "George";
+	        toGeorge.Age = 33;
+	        dao.Create(toGeorge);
+	        TestObject to = dao.FindByName("George");
+	        Assert.IsNotNull(to, "FindByName for George should not return null");
+	        Assert.AreEqual("George", to.Name);
+	        Assert.AreEqual(33, to.Age);
+    
+	        to.Age=34;
+	        dao.Update(to);
+    
+	        TestObject to2 = dao.FindByName("George");
+	        Assert.AreEqual(34, to2.Age);
+    
+	        dao.Delete(to);
+    
+	        TestObject to3 = dao.FindByName("George");
+	        Assert.IsNull(to3, "Should not have found TestObject with name George. TestObject = " + to.ToString()   );
+	    }
+
+
+	    [Test]
+        public void ExecuteTemplate()
+        {
+            ITestObjectDao dao = (ITestObjectDao)ctx["NHTestObjectDao"];
+            TransactionTemplate tt = new TransactionTemplate(transactionManager);
+            object result = tt.Execute(new SimpleTransactionCallback(dbProvider, dao));
+            TestObject to = result as TestObject;
+            Assert.IsNotNull(to,"FindByName for Gabriel should not return null");
+            Assert.AreEqual("Gabriel", to.Name);
+        }
+
+        [Test]
+        public void ExecuteTransactionManager()
+        {
+            DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+            def.PropagationBehavior = TransactionPropagation.Required;
+
+            ITransactionStatus status = transactionManager.GetTransaction(def);
+
+            ITestObjectDao dao = (ITestObjectDao)ctx["NHTestObjectDao"];
+            TestObject to;
+            try
+            {
+                 to = dao.FindByName("Gabriel");
+            } 
+            catch (Exception e)
+            {
+                transactionManager.Rollback(status);
+                throw e;
+            }
+            transactionManager.Commit(status);
+            Assert.IsNotNull(to,"FindByName for Gabriel should not return null");
+            Assert.AreEqual("Gabriel", to.Name);
+        }
+
+        private class SimpleTransactionCallback : ITransactionCallback
+        {
+            private IDbProvider dbProvider;
+            private ITestObjectDao dao;
+
+            public SimpleTransactionCallback(IDbProvider dbp, ITestObjectDao dao)
+            {
+                dbProvider = dbp;
+                this.dao = dao;
+            }
+            /// <summary>
+            /// Gets called by TransactionTemplate.Execute within a 
+            /// transaction context.
+            /// </summary>
+            /// <param name="status">The associated transaction status.</param>
+            /// <returns>a result object or <c>null</c></returns>
+            public object DoInTransaction(ITransactionStatus status)
+            {
+                return dao.FindByName("Gabriel");
+            }
+        }
+
+
+    }
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TestObject.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TestObject.cs
new file mode 100644
index 00000000..9a744c8f
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TestObject.cs
@@ -0,0 +1,76 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TestObject.cs,v 1.2 2008/02/04 22:42:50 markpollack Exp $</version>
+	public class TestObject 
+	{
+		#region Fields
+        private int age;
+        private string name;
+        private int objectNumber;
+         
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TestObject"/> class.
+        /// </summary>
+		public 	TestObject()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+	    public virtual int Age
+	    {
+	        get { return age; }
+	        set { age = value; }
+	    }
+
+	    public virtual string Name
+	    {
+	        get { return name; }
+	        set { name = value; }
+	    }
+
+	    public virtual int ObjectNumber
+	    {
+	        get { return objectNumber; }
+	        set { objectNumber = value; }
+	    }
+
+	    #endregion
+
+		#region Methods
+
+		#endregion
+
+	}
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TestObject.hbm.xml b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TestObject.hbm.xml
new file mode 100644
index 00000000..f7905780
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TestObject.hbm.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+    <class name="Spring.Data.NHibernate.TestObject, Spring.Data.NHibernate.Integration.Tests" table="TestObjects">
+        <id name="ObjectNumber" column="TestObjectNo" type="Int32"> 
+          <generator class="identity" /> 
+          
+          <!--
+          <generator class="sequence">
+            <param name="sequence">ID_SEQ</param>
+          </generator>
+          -->
+
+        </id> 
+        <property name="Age" column="Age" type="Int32"/> 
+        <property name="Name" type="String" length="50"/> 
+    </class>
+</hibernate-mapping>
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/creditdebit.sql b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/creditdebit.sql
new file mode 100644
index 00000000..88aaf966
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/creditdebit.sql
@@ -0,0 +1,18 @@
+
+CREATE TABLE [Credits](
+	[CreditID] [int] IDENTITY NOT NULL,
+	[CreditAmount] [float] NOT NULL,
+ CONSTRAINT [PK_CreditID] PRIMARY KEY CLUSTERED 
+(
+	[CreditID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
+
+CREATE TABLE [Debits](
+	[DebitID] [int] IDENTITY NOT NULL,
+	[DebitAmount] [float] NOT NULL,
+ CONSTRAINT [PK_DebitID] PRIMARY KEY CLUSTERED 
+(
+	[DebitID] ASC
+) ON [PRIMARY]
+) ON [PRIMARY]
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/dbProviderTemplateTests.xml b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/dbProviderTemplateTests.xml
new file mode 100644
index 00000000..436decff
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/dbProviderTemplateTests.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns='http://www.springframework.net'
+         xmlns:db="http://www.springframework.net/database">
+
+  <!--
+    <db:provider id="DbProvider" 
+                   provider="SqlServer-1.1" 
+                   connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+-->
+
+  <object id="DbProvider" type="Spring.Data.Common.UserCredentialsDbProvider, Spring.Data">
+    <property name="TargetDbProvider" ref="targetDbProvider"/>
+    <property name="Username" value="User ID=defaultName"/>
+    <property name="Password" value="Password=defaultPass"/>
+  </object>
+
+  <db:provider id="targetDbProvider" 
+               provider="SqlServer-2.0"
+               connectionString="Data Source=MARKT60\SQL2005;Trusted_Connection=False"/>
+
+
+  <db:provider id="standardDbProvider"
+             provider="SqlServer-2.0"
+             connectionString="Data Source=MARKT60\SQL2005;Trusted_Connection=False;User ID=springqa;Password=springqa"/>
+
+
+
+  <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate12">
+        <property name="DbProvider" ref="DbProvider"/>
+        <property name="MappingResources">
+          <list>
+            <value>assembly://Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate/TestObject.hbm.xml</value>
+          </list>
+        </property>
+        <!--
+        <property name="MappingAssemblies">
+            <list>
+                <value>Spring.Data.NHibernate.Integration.Tests</value>
+            </list>
+        </property>
+        -->
+        <property name="HibernateProperties">
+           <dictionary>
+            <!-- use connection provided by DbProvider 
+             <entry key="hibernate.connection.provider"
+                       value="NHibernate.Connection.DriverConnectionProvider"/>
+            -->
+             <entry key="hibernate.dialect"
+                    value="NHibernate.Dialect.MsSql2000Dialect"/>
+                     
+              <entry key="hibernate.connection.driver_class"
+                     value="NHibernate.Driver.SqlClientDriver"/>
+
+             <!--
+             <entry key="hibernate.dialect"
+                    value="NHibernate.Dialect.Oracle9Dialect"/>
+             -->             
+            </dictionary>
+        </property>
+                      
+    </object>
+
+  <!--
+    <object id="nativeNHTestObjectDao" type="Spring.Data.NHibernate.NativeNHTestObjectDao, Spring.Data.NHibernate.Integration.Tests">
+        <property name="SessionFactory" ref="SessionFactory"/>
+    </object>
+        
+    <object id="NHTestObjectDao" type="Spring.Data.NHibernate.NHTestObjectDao, Spring.Data.NHibernate.Integration.Tests">
+        <property name="SessionFactory" ref="SessionFactory"/>
+    </object>
+    -->
+    
+    <object id="hibernateTransactionManager" 
+            type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate12">
+            
+        <property name="DbProvider" ref="DbProvider"/>
+        <property name="sessionFactory" ref="SessionFactory"/>
+
+    </object>
+    
+
+       
+    <!-- Transactional Proxy for TestObjectDao using the TransactionProxyFactory -->
+    <object id="testObjectDaoTransProxy" 
+            type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data">
+        <property name="PlatformTransactionManager" ref="hibernateTransactionManager"/>
+        <property name="Target">
+            <object type="Spring.Data.NHibernate.NHTestObjectDao, Spring.Data.NHibernate.Integration.Tests">
+                <property name="SessionFactory" ref="SessionFactory"/>
+            </object>            
+        </property>
+        
+        <property name="ProxyInterfaces" value="Spring.Data.NHibernate.ITestObjectDao"/>
+        
+        <property name="TransactionAttributes">
+            <name-values>
+                <add key="Create*" value="PROPAGATION_REQUIRED"/>
+                <add key="Delete*" value="PROPAGATION_REQUIRED"/>
+                <add key="Update*" value="PROPAGATION_REQUIRED"/>
+                <add key="Find*" value="PROPAGATION_REQUIRED"/>
+            </name-values>
+        </property>
+    </object>    
+    
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/templateTests.xml b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/templateTests.xml
new file mode 100644
index 00000000..c4872b4d
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/templateTests.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns='http://www.springframework.net'
+		 xmlns:db="http://www.springframework.net/database">
+
+
+    <db:provider   id="DbProvider"  
+                   provider="SqlServer-1.1" 
+                   connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;User ID=springqa; Password=springqa"/>
+                   <!--
+                   connectionString="Data Source=(local);Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+                   -->
+  <!--                   
+    <db:provider id="DbProvider" 
+                   provider="OracleODP-2.0" 
+                   connectionString="Data Source=AGORA; User Id=agora_user; Password=welcome_bad"/>
+   -->
+  <!--
+  <db:provider id="DbProvider"
+             provider="System.Data.SqlClient"
+             connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;User ID=springqa; Password=springqa"/>
+             -->
+
+  <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate12">
+        <!-- TODO Provide dedicated NHibernate Schema -->
+        <property name="DbProvider" ref="DbProvider"/>
+        <property name="MappingResources">
+          <list>
+            <value>assembly://Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate/TestObject.hbm.xml</value>
+          </list>
+        </property>
+        <!--
+        <property name="MappingAssemblies">
+            <list>
+                <value>Spring.Data.NHibernate.Integration.Tests</value>
+            </list>
+        </property>
+        -->
+        <property name="HibernateProperties">
+           <dictionary>
+
+             <!--
+             <entry key="hibernate.connection.provider"
+                       value="NHibernate.Connection.DriverConnectionProvider"/>
+
+             <entry key="hibernate.dialect"
+                    value="NHibernate.Dialect.Oracle9Dialect"/>
+             -->
+
+             
+                <entry key="hibernate.dialect"
+                       value="NHibernate.Dialect.MsSql2000Dialect"/>
+                     
+                <entry key="hibernate.connection.driver_class"
+                       value="NHibernate.Driver.SqlClientDriver"/>    
+                                  
+            </dictionary>
+        </property>
+                      
+    </object>
+
+    <object id="nativeNHTestObjectDao" type="Spring.Data.NHibernate.NativeNHTestObjectDao, Spring.Data.NHibernate.Integration.Tests">
+        <property name="SessionFactory" ref="SessionFactory"/>
+    </object>
+        
+    <object id="NHTestObjectDao" type="Spring.Data.NHibernate.NHTestObjectDao, Spring.Data.NHibernate.Integration.Tests">
+        <property name="SessionFactory" ref="SessionFactory"/>
+    </object>
+    
+    <object id="hibernateTransactionManager" 
+            type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate12">
+            
+        <property name="DbProvider" ref="DbProvider"/>
+        <property name="sessionFactory" ref="SessionFactory"/>
+
+    </object>
+    
+
+       
+    <!-- Transactional Proxy for TestObjectDao using the TransactionProxyFactory -->
+    <object id="testObjectDaoTransProxy" 
+            type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data">
+        
+        <property name="PlatformTransactionManager" ref="hibernateTransactionManager"/>
+        <property name="Target">
+            <object type="Spring.Data.NHibernate.NHTestObjectDao, Spring.Data.NHibernate.Integration.Tests">
+                <property name="SessionFactory" ref="SessionFactory"/>
+            </object>            
+        </property>
+        
+        <property name="ProxyInterfaces" value="Spring.Data.NHibernate.ITestObjectDao"/>
+        
+        <property name="TransactionAttributes">
+            <name-values>
+                <add key="Create*" value="PROPAGATION_REQUIRED"/>
+                <add key="Delete*" value="PROPAGATION_REQUIRED"/>
+                <add key="Update*" value="PROPAGATION_REQUIRED"/>
+                <add key="Find*" value="PROPAGATION_REQUIRED"/>
+            </name-values>
+        </property>
+    </object>    
+    
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2003.csproj b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2003.csproj
new file mode 100644
index 00000000..175e4527
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2003.csproj
@@ -0,0 +1,267 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{8DA67FF2-C473-4329-8FF6-3747182196D7}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Data.NHibernate.Integration.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = 'echo "Copying .xml files for tests"&#xd;&#xa;xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2003\$(TargetName)\$(ConfigurationName)\ /y /s /q /d&#xd;&#xa;copy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2003\$(TargetName)\$(ConfigurationName)\$(TargetFileName).config'
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Data.NHibernate.Integration.Tests\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Data.NHibernate.Integration.Tests\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Data.2003"
+                    Project = "{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\Net\1.1\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "NHibernate"
+                    AssemblyName = "NHibernate"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\NHibernate.dll"
+                />
+                <Reference
+                    Name = "Castle.DynamicProxy"
+                    AssemblyName = "Castle.DynamicProxy"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\Castle.DynamicProxy.dll"
+                />
+                <Reference
+                    Name = "Iesi.Collections"
+                    AssemblyName = "Iesi.Collections"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\Iesi.Collections.dll"
+                />
+                <Reference
+                    Name = "log4net"
+                    AssemblyName = "log4net"
+                    HintPath = "..\..\..\lib\NHibernate12\net\1.1\log4net.dll"
+                />
+                <Reference
+                    Name = "Common.Logging.Log4Net"
+                    AssemblyName = "Common.Logging.Log4Net"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.Log4Net.dll"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "Spring.Data.NHibernate12.2003"
+                    Project = "{2E12AE3E-5690-46A5-9F89-80F1D3004ADB}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Data.NHibernate.Integration.Tests.dll.config"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\NHibernate\AccountCreditDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\AccountDebitDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\AccountManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\AuditDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Credit.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Credit.hbm.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\NHibernate\creditdebit.sql"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Debit.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Debit.hbm.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\NHibernate\IAccountCreditDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\IAccountDebitDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\IAccountManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\IAuditDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\ITestObjectDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\MultipleDbTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\MultipleDbTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\NHibernate\NativeNHTestObjectDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\NativeNHTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\NHDAOTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\NHDAOTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\NHibernate\NHTestObjectDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\TemplateTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\templateTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\NHibernate\TestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\TestObject.hbm.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2005.csproj b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2005.csproj
new file mode 100644
index 00000000..c1d9cdd8
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.2005.csproj
@@ -0,0 +1,129 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4A07E150-ED90-407C-8CAD-4760444DDFD9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate.Integration.Tests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate.Integration.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate.Integration.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate12\net\2.0\Castle.DynamicProxy.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.0.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate12\net\2.0\Iesi.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate12\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=1.2.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate12\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Data\NHibernate\AccountCreditDao.cs" />
+    <Compile Include="Data\NHibernate\AccountDebitDao.cs" />
+    <Compile Include="Data\NHibernate\AccountManager.cs" />
+    <Compile Include="Data\NHibernate\AuditDao.cs" />
+    <Compile Include="Data\NHibernate\Credit.cs" />
+    <Compile Include="Data\NHibernate\DbProviderTemplateTests.cs" />
+    <Compile Include="Data\NHibernate\Debit.cs" />
+    <Compile Include="Data\NHibernate\IAccountCreditDao.cs" />
+    <Compile Include="Data\NHibernate\IAccountDebitDao.cs" />
+    <Compile Include="Data\NHibernate\IAccountManager.cs" />
+    <Compile Include="Data\NHibernate\IAuditDao.cs" />
+    <Compile Include="Data\NHibernate\ITestObjectDao.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Data\NHibernate\MultipleDbTests.cs" />
+    <Compile Include="Data\NHibernate\NativeNHTestObjectDao.cs" />
+    <Compile Include="Data\NHibernate\NativeNHTests.cs" />
+    <Compile Include="Data\NHibernate\NHDAOTests.cs" />
+    <Compile Include="Data\NHibernate\NHTestObjectDao.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Data\NHibernate\TemplateTests.cs" />
+    <Compile Include="Data\NHibernate\TestObject.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\dbProviderTemplateTests.xml" />
+    <EmbeddedResource Include="Data\NHibernate\Credit.hbm.xml" />
+    <Content Include="Data\NHibernate\creditdebit.sql" />
+    <EmbeddedResource Include="Data\NHibernate\Debit.hbm.xml" />
+    <Content Include="Data\NHibernate\MultipleDbTests.xml" />
+    <EmbeddedResource Include="Data\NHibernate\NHDAOTests.xml" />
+    <EmbeddedResource Include="Data\NHibernate\templateTests.xml" />
+    <EmbeddedResource Include="Data\NHibernate\TestObject.hbm.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate12\Spring.Data.NHibernate12.2005.csproj">
+      <Project>{90F2D070-6F98-4926-A626-BD7A6071D6D9}</Project>
+      <Name>Spring.Data.NHibernate12.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Data.NHibernate.Integration.Tests.dll.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+  <PropertyGroup>
+    <PostBuildEvent>echo "Copying .xml files for tests"
+xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Data.NHibernate.Integration.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2005\Spring.Data.NHibernate.Integration.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build
new file mode 100644
index 00000000..f5e254bd
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build
@@ -0,0 +1,57 @@
+<?xml version="1.0" ?>
+<project name="Spring.Data.NHibernate.Integration.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+	Required properties:
+	  * current.bin.dir           - (path) root level to build to
+	  * current.build.debug       - (true|false) debug build?
+	  * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+	<target name="build">
+
+		<!-- build Spring.Data.NHibernate.Integration.Tests -->
+		<csc target="library" define="${current.build.defines.csc}"
+				warnaserror="true"
+				debug="${current.build.debug}"
+				output="${current.bin.dir}/${project::get-name()}.dll"
+				doc="${current.bin.dir}/${project::get-name()}.xml">
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+			</sources>
+			<references basedir="${current.bin.dir}">
+				<lib>
+					<include name="${nh12.lib.dir}"/>
+				</lib>
+				<include name="System.Data.dll" />
+				<include name="System.EnterpriseServices.dll" />
+				<include name="log4net.dll" />
+				<include name="NHibernate.dll" />
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+				<exclude name="Spring.Data.NHibernate.Tests.dll" />
+				<exclude name="Spring.Data.NHibernate12.dll" />
+				<exclude name="CloverRuntime.dll" />
+			</references>
+			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
+				<include name="**/*.xml" />
+			</resources>
+		</csc>
+
+        <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
+              tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
+
+	</target>
+	<target name="test" depends="build">
+			<!-- skipping running of tests for now
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+					   outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
+		</nunit2outproc>
+		-->
+	</target>
+</project>
diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.dll.config b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.dll.config
new file mode 100644
index 00000000..12e5ecbf
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.dll.config
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+    </sectionGroup>
+    <sectionGroup name="spring">
+      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
+    </sectionGroup>
+  </configSections>
+
+
+  <common>
+    <logging>
+
+      <factoryAdapter type="Common.Logging.Simple.ConsoleOutLoggerFactoryAdapter, Common.Logging">
+        <arg key="level" value="DEBUG" />
+
+      </factoryAdapter>
+
+    </logging>
+  </common>
+
+  <!--
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net129">
+        <arg key="configType" value="EXTERNAL" />
+      </factoryAdapter>
+    </logging>
+  </common>
+  -->
+
+  <spring>
+    <parsers>
+      <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" />
+    </parsers>
+  </spring>
+
+</configuration>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/AssemblyInfo.cs b/test/Spring/Spring.Data.NHibernate.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..3da885ea
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Spring.Data.NHibernate Integration Tests")]
+[assembly: AssemblyDescription("Integration tests for Spring.Data.NHibernate assembly")]
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfiguration.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfiguration.cs
new file mode 100644
index 00000000..62cf9e99
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfiguration.cs
@@ -0,0 +1,83 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Aop.Framework;
+using Spring.Aop.Framework.DynamicProxy;
+using Spring.Aop.Support;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Transaction;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Config
+{
+    /// <summary>
+    /// This class contains tests for 
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AopConfiguration.cs,v 1.2 2007/08/01 17:51:58 markpollack Exp $</version>
+    [TestFixture]
+    public class AopConfiguration
+    {
+        private IApplicationContext ctx;
+
+        [SetUp]
+        public void Setup()
+        {
+            ctx =
+                new XmlApplicationContext("assembly://Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Config/AopConfiguration.xml");
+           
+        }
+
+        [Test]
+        public void ProxyDataAccessAndServiceLayer()
+        {
+            Assert.IsFalse(AopUtils.IsAopProxy( ctx["DbProvider"] ));
+            Assert.IsFalse(AopUtils.IsAopProxy( ctx["SessionFactory"]   ));
+            Assert.IsFalse(AopUtils.IsAopProxy(ctx["hibernateTransactionManager"]));
+            Assert.IsFalse(AopUtils.IsAopProxy(ctx["transactionManager"]));
+            //Assert.IsTrue(AopUtils.IsAopProxy(ctx["testObjectDaoTransProxy"]));
+            Assert.IsTrue(AopUtils.IsAopProxy(ctx["TestObjectDao"]));
+            Assert.IsTrue(AopUtils.IsAopProxy(ctx["SimpleService"]));
+
+            CallCountingTransactionManager ccm = ctx["transactionManager"] as CallCountingTransactionManager;
+            Assert.IsNotNull(ccm);
+            Assert.AreEqual(0, ccm.begun);
+            Assert.AreEqual(0, ccm.commits);
+
+            LoggingAroundAdvice caa = ctx["loggingAroundAdvice"] as LoggingAroundAdvice;
+            Assert.IsNotNull(caa);
+            Assert.AreEqual(0, caa.numInvoked);
+            
+            ISimpleService simpleService = ctx["SimpleService"] as ISimpleService;
+            Assert.IsNotNull(simpleService);
+            simpleService.DoWork(new TestObject());
+            Assert.AreEqual(1, ccm.begun);
+            Assert.AreEqual(1, ccm.commits);
+            Assert.AreEqual(1, caa.numInvoked);
+        }
+
+        
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfiguration.xml b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfiguration.xml
new file mode 100644
index 00000000..bd470351
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfiguration.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database"
+         xmlns:tx="http://www.springframework.net/tx">
+
+
+  <!-- Database and NHibernate Configuration -->
+
+  <db:provider id="DbProvider"
+                   provider="SqlServer-2.0"
+                   connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa;"/>
+
+
+
+  <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate">
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="MappingResources">
+      <list>
+        <value>assembly://Spring.Data.NHibernate.Tests/Spring.Data.NHibernate/TestObject.hbm.xml</value>
+      </list>
+    </property>
+    <property name="HibernateProperties">
+      <dictionary>
+        <entry key="hibernate.dialect"
+               value="NHibernate.Dialect.MsSql2000Dialect"/>
+             
+        <entry key="hibernate.connection.driver_class"
+               value="NHibernate.Driver.SqlClientDriver"/>    
+
+      </dictionary>
+    </property>
+
+  </object>
+
+
+  <object id="TestObjectDao" type="Spring.Data.NHibernate.TestObjectDao, Spring.Data.NHibernate.Tests">
+    <property name="SessionFactory" ref="SessionFactory"/>
+  </object>
+
+  <object id="hibernateTransactionManager" type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate">
+
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="sessionFactory" ref="SessionFactory"/>
+
+  </object>
+
+  <object name="transactionManager" type="Spring.Transaction.CallCountingTransactionManager, Spring.Data.Tests"/>
+
+  <object name="SimpleService" type="Spring.Data.NHibernate.SimpleService, Spring.Data.NHibernate.Tests">
+    <property name="TestObjectDao" ref="TestObjectDao"/>
+  </object>
+
+  <object id="loggingAroundAdvice" type="Spring.Data.LoggingAroundAdvice, Spring.Data.Tests"/>
+  
+  <object id ="myAutoProxy" type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator">
+
+    <property name="InterceptorNames">
+      <list>
+        <value>loggingAroundAdvice</value>
+      </list>
+    </property>
+    
+    <property name="ProxyTargetType" value="false"/>
+    <property name="ExposeProxy" value="false"/>
+    <property name="Optimize" value="false"/>
+
+    <property name="ObjectNames">
+      <list>
+        <value>TestObjectDao</value>
+      </list>
+    </property>
+  </object>
+
+  <tx:attribute-driven transaction-manager="transactionManager"/>
+  
+  <!-- Transactional Proxy for TestObjectDao using the TransactionProxyFactory -->
+  <!--
+  <object id="testObjectDaoTransProxy"
+          type="Spring.Transaction.Interceptor.TransactionProxyFactoryObject, Spring.Data">
+
+    <property name="PlatformTransactionManager" ref="transactionManager"/>
+    <property name="Target" ref="SimpleService"/>
+
+    <property name="ProxyInterfaces" value="Spring.Data.NHibernate.ISimpleService"/>
+
+    <property name="TransactionAttributes">
+      <name-values>
+        <add key="Create*" value="PROPAGATION_REQUIRED"/>
+        <add key="Delete*" value="PROPAGATION_REQUIRED"/>
+        <add key="Update*" value="PROPAGATION_REQUIRED"/>
+        <add key="Find*"   value="PROPAGATION_REQUIRED"/>
+      </name-values>
+    </property>
+  </object>
+  -->
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfigurationTxPointcut.xml b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfigurationTxPointcut.xml
new file mode 100644
index 00000000..2e6cdae6
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfigurationTxPointcut.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database"
+         xmlns:tx="http://www.springframework.net/tx"
+         xmlns:aop="http://www.springframework.net/aop">
+
+
+  <!-- Database and NHibernate Configuration -->
+
+  <db:provider id="DbProvider"
+                   provider="SqlServer-2.0"
+                   connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Spring;Persist Security Info=True;User ID=springqa;Password=springqa;"/>
+
+
+
+  <object id="SessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate">
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="MappingResources">
+      <list>
+        <value>assembly://Spring.Data.NHibernate.Tests/Spring.Data.NHibernate/TestObject.hbm.xml</value>
+      </list>
+    </property>
+    <property name="HibernateProperties">
+      <dictionary>
+        <entry key="hibernate.dialect"
+               value="NHibernate.Dialect.MsSql2000Dialect"/>
+             
+        <entry key="hibernate.connection.driver_class"
+               value="NHibernate.Driver.SqlClientDriver"/>    
+
+      </dictionary>
+    </property>
+
+  </object>
+
+
+  <object id="TestObjectDao" type="Spring.Data.NHibernate.TestObjectDao, Spring.Data.NHibernate.Tests">
+    <property name="SessionFactory" ref="SessionFactory"/>
+  </object>
+
+  <object id="transactionManager" type="Spring.Data.NHibernate.HibernateTransactionManager, Spring.Data.NHibernate">
+
+    <property name="DbProvider" ref="DbProvider"/>
+    <property name="sessionFactory" ref="SessionFactory"/>
+
+  </object>
+
+
+  <object name="SimpleService" type="Spring.Data.NHibernate.SimpleService, Spring.Data.NHibernate.Tests">
+    <property name="TestObjectDao" ref="TestObjectDao"/>
+  </object>
+
+  <object name="hibernateTemplate" type="Spring.Data.NHibernate.HibernateTemplate, Spring.Data.NHibernate">
+    <property name="sessionFactory" ref="SessionFactory"/>
+  </object>
+  
+  <!-- once add 'internal' role for autoproxycreator that is created via the tx:attribute-driven element -->
+  <!-- then we can add advisors to the config and have them picked up by any 'user' role defined autoproxycreators -->
+
+  <object id="loggingAdvisor" type="Spring.Aop.Support.NameMatchMethodPointcutAdvisor, Spring.Aop">
+    <property name="Advice">
+      <object id="loggingAroundAdvice" type="Spring.Data.LoggingAroundAdvice, Spring.Data.Tests"/>
+    </property>
+    <property name="MappedNames">
+      <list>
+        <value>12341234asdf*</value>
+      </list>
+    </property>
+  </object>
+
+  <object id ="myAutoProxy" type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator">
+
+    <property name="InterceptorNames">
+      <list>
+        <value>loggingAdvisor</value>
+      </list>
+    </property>
+    
+    <property name="ProxyTargetType" value="false"/>
+    <property name="ExposeProxy" value="false"/>
+    <property name="Optimize" value="false"/>
+
+    <property name="ObjectNames">
+      <list>
+        <value>TestObjectDao</value>
+      </list>
+    </property>
+  </object>
+
+ 
+  <tx:attribute-driven transaction-manager="transactionManager"/>
+
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/HibernateTransactionManagerTests.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/HibernateTransactionManagerTests.cs
new file mode 100644
index 00000000..baae9730
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/HibernateTransactionManagerTests.cs
@@ -0,0 +1,1068 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Data;
+using NHibernate;
+using NHibernate.Cfg;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Spring.Dao;
+using Spring.Data.Common;
+using Spring.Data.Support;
+using Spring.Support;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+    /// <summary>
+    /// This class contains tests for the HibernateTransactionManager
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: HibernateTransactionManagerTests.cs,v 1.5 2008/01/29 20:07:38 markpollack Exp $</version>
+    [TestFixture]
+    public class HibernateTransactionManagerTests
+    {
+        private MockRepository mocks;
+
+        [SetUp]
+        public void Setup()
+        {
+            mocks = new MockRepository();
+        }
+
+        [Test]
+        public void TransactionCommit()
+        {
+            IDbProvider provider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            ISessionFactory sessionFactory = (ISessionFactory)mocks.CreateMock(typeof(ISessionFactory));
+            ISession session = (ISession)mocks.CreateMock(typeof(ISession));
+            ITransaction transaction = (ITransaction) mocks.CreateMock(typeof (ITransaction));
+            IQuery query = (IQuery) mocks.CreateMock(typeof (IQuery));
+
+            IList list = new ArrayList();
+            list.Add("test");
+            using (mocks.Ordered())
+            {
+                Expect.Call(sessionFactory.OpenSession()).Return(session);
+                Expect.Call(session.Connection).Return(connection);
+                Expect.Call(session.BeginTransaction(IsolationLevel.Serializable)).Return(transaction);
+                Expect.Call(session.IsOpen).Return(true);
+                Expect.Call(session.CreateQuery("some query string")).Return(query);
+                Expect.Call(query.List()).Return(list);
+                transaction.Commit();
+                LastCall.On(transaction).Repeat.Once();
+                Expect.Call(session.Close()).Return(null);
+            }
+
+            mocks.ReplayAll();
+
+
+            LocalSessionFactoryObjectStub lsfo = new LocalSessionFactoryObjectStub(sessionFactory);
+            lsfo.AfterPropertiesSet();
+
+            ISessionFactory sfProxy = lsfo.GetObject() as ISessionFactory;
+            Assert.IsNotNull(sfProxy);
+
+            HibernateTransactionManager tm = new HibernateTransactionManager();
+            tm.AdoExceptionTranslator = new FallbackExceptionTranslator();
+            tm.SessionFactory = sfProxy;
+            tm.DbProvider = provider;
+            TransactionTemplate tt = new TransactionTemplate(tm);
+
+            tt.TransactionIsolationLevel = IsolationLevel.Serializable;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sfProxy),"Hasn't thread session");
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(provider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+            Assert.IsTrue(!TransactionSynchronizationManager.ActualTransactionActive, "Actual transaction not active");
+
+            object result = tt.Execute(new TransactionCommitTxCallback(sfProxy, provider));
+
+            Assert.IsTrue(result == list, "Incorrect result list");
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sfProxy), "Hasn't thread session");
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(provider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+            Assert.IsTrue(!TransactionSynchronizationManager.ActualTransactionActive, "Actual transaction not active");
+
+
+            mocks.VerifyAll();
+
+        }
+
+
+        [Test]
+        public void TransactionRollback()
+        {
+
+            IDbProvider provider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            ISessionFactory sessionFactory = (ISessionFactory)mocks.CreateMock(typeof(ISessionFactory));
+            ISession session = (ISession)mocks.CreateMock(typeof(ISession));
+            ITransaction transaction = (ITransaction)mocks.CreateMock(typeof(ITransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(sessionFactory.OpenSession()).Return(session);
+                Expect.Call(session.Connection).Return(connection);
+                Expect.Call(session.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                Expect.Call(session.IsOpen).Return(true);
+
+                transaction.Rollback();
+                LastCall.On(transaction).Repeat.Once();
+
+                Expect.Call(session.Close()).Return(null);
+            }
+            mocks.ReplayAll();
+
+            HibernateTransactionManager tm = new HibernateTransactionManager(sessionFactory);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            try
+            {
+                tt.Execute(new TransactionRollbackTxCallback(sessionFactory));
+                Assert.Fail("Should have thrown exception");
+            } catch (ArgumentException)
+            {
+                
+            }
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(provider), "Hasn't thread db provider");
+            
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void TransactionRollbackOnly()
+        {            
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            ISessionFactory sessionFactory = (ISessionFactory)mocks.CreateMock(typeof(ISessionFactory));
+            ISession session = (ISession)mocks.CreateMock(typeof(ISession));
+            ITransaction transaction = (ITransaction)mocks.CreateMock(typeof(ITransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(sessionFactory.OpenSession()).Return(session);
+                Expect.Call(session.Connection).Return(connection);
+                Expect.Call(session.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                Expect.Call(session.IsOpen).Return(true);
+                Expect.Call(session.FlushMode).Return(FlushMode.Auto);
+                session.Flush();
+                LastCall.On(session).Repeat.Once();
+                transaction.Rollback();
+                LastCall.On(transaction).Repeat.Once();
+                Expect.Call(session.Close()).Return(null);
+            }
+            mocks.ReplayAll();
+
+
+            HibernateTransactionManager tm = new HibernateTransactionManager(sessionFactory);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+
+            tt.Execute(new TransactionRollbackOnlyTxCallback(sessionFactory));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+            
+            mocks.VerifyAll();
+            
+        }
+
+        [Test]
+        public void ParticipatingTransactionWithCommit()
+        {
+            IDbConnection connection = (IDbConnection) mocks.CreateMock(typeof (IDbConnection));
+            ISessionFactory sessionFactory = (ISessionFactory) mocks.CreateMock(typeof (ISessionFactory));
+            ISession session = (ISession) mocks.CreateMock(typeof (ISession));
+            ITransaction transaction = (ITransaction) mocks.CreateMock(typeof (ITransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(sessionFactory.OpenSession()).Return(session);
+                Expect.Call(session.Connection).Return(connection);
+                Expect.Call(session.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                Expect.Call(session.IsOpen).Return(true);
+                Expect.Call(session.FlushMode).Return(FlushMode.Auto);
+                session.Flush();
+                LastCall.On(session).Repeat.Once();
+                transaction.Commit();
+                LastCall.On(transaction).Repeat.Once();
+                Expect.Call(session.Close()).Return(null);
+            }
+
+            mocks.ReplayAll();
+
+            HibernateTransactionManager tm = new HibernateTransactionManager(sessionFactory);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            IList list = new ArrayList();
+            list.Add("test");
+
+            object result = tt.Execute(new ParticipatingTransactionWithCommitTxCallback(sessionFactory, list));
+            Assert.IsTrue(result == list);
+
+            mocks.VerifyAll();
+
+        }
+
+        [Test]
+        public void ParticipatingTransactionWithRollback()
+        {
+            IDbConnection connection = (IDbConnection) mocks.CreateMock(typeof (IDbConnection));
+            ISessionFactory sessionFactory = (ISessionFactory) mocks.CreateMock(typeof (ISessionFactory));
+            ISession session = (ISession) mocks.CreateMock(typeof (ISession));
+            ITransaction transaction = (ITransaction) mocks.CreateMock(typeof (ITransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(sessionFactory.OpenSession()).Return(session);
+                Expect.Call(session.Connection).Return(connection);
+                Expect.Call(session.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                Expect.Call(session.IsOpen).Return(true);
+                Expect.Call(session.FlushMode).Return(FlushMode.Auto);
+
+                transaction.Rollback();
+                LastCall.On(transaction).Repeat.Once();
+                Expect.Call(session.Close()).Return(null);
+            }
+            mocks.ReplayAll();
+
+
+            HibernateTransactionManager tm = new HibernateTransactionManager(sessionFactory);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            try
+            {
+                tt.Execute(new ParticipatingTransactionWithRollbackTxCallback(sessionFactory));
+                Assert.Fail("Should have thrown exception");
+            }
+            catch (ArgumentException)
+            {
+
+            }
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ParticipatingTransactionWithRollbackOnly()
+        {
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            ISessionFactory sessionFactory = (ISessionFactory)mocks.CreateMock(typeof(ISessionFactory));
+            ISession session = (ISession)mocks.CreateMock(typeof(ISession));
+            ITransaction transaction = (ITransaction)mocks.CreateMock(typeof(ITransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(sessionFactory.OpenSession()).Return(session);
+                Expect.Call(session.Connection).Return(connection);
+                Expect.Call(session.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                Expect.Call(session.IsOpen).Return(true);
+
+                transaction.Rollback();
+                LastCall.On(transaction).Repeat.Once();
+                Expect.Call(session.Close()).Return(null);
+            }
+            mocks.ReplayAll();
+
+
+            HibernateTransactionManager tm = new HibernateTransactionManager(sessionFactory);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            IList list = new ArrayList();
+            list.Add("test");
+            try
+            {
+                tt.Execute(new ParticipatingTransactionWithRollbackOnlyTxCallback(tt,sessionFactory,list));
+                Assert.Fail("Should have thrown UnexpectedRollbackException");
+            }
+            catch (UnexpectedRollbackException)
+            {
+
+            }
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ParticipatingTransactionWithWithRequiresNew()
+        {
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            ISessionFactory sessionFactory = (ISessionFactory)mocks.CreateMock(typeof(ISessionFactory));
+            ISession session1 = (ISession)mocks.CreateMock(typeof(ISession));
+            ISession session2 = (ISession)mocks.CreateMock(typeof(ISession));
+            ITransaction transaction = (ITransaction)mocks.CreateMock(typeof(ITransaction));
+
+            //using (mocks.Ordered())
+            //{
+                Expect.Call(sessionFactory.OpenSession()).Return(session1);
+                Expect.Call(session1.Connection).Return(connection);
+                Expect.Call(session1.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                Expect.Call(session1.IsOpen).Return(true);
+
+                Expect.Call(sessionFactory.OpenSession()).Return(session2);
+                Expect.Call(session2.Connection).Return(connection);
+                Expect.Call(session2.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                Expect.Call(session2.IsOpen).Return(true);
+
+                Expect.Call(session2.FlushMode).Return(FlushMode.Auto);
+                session2.Flush();
+                LastCall.On(session2).Repeat.Once();
+
+                transaction.Commit();
+                LastCall.On(transaction).Repeat.Twice();
+
+                Expect.Call(session1.Close()).Return(null);
+                Expect.Call(session2.Close()).Return(null);
+            //}
+
+            mocks.ReplayAll();
+
+            HibernateTransactionManager tm = new HibernateTransactionManager(sessionFactory);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.RequiresNew;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+
+            tt.Execute(new ParticipatingTransactionWithWithRequiresNewTxCallback(tt, sessionFactory));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+            
+            mocks.VerifyAll();
+
+        }
+
+        [Test]
+        public void ParticipatingTransactionWithWithNotSupported()
+        {
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            ISessionFactory sessionFactory = (ISessionFactory)mocks.CreateMock(typeof(ISessionFactory));
+            ISession session = (ISession)mocks.CreateMock(typeof(ISession));
+            ITransaction transaction = (ITransaction)mocks.CreateMock(typeof(ITransaction));
+
+            //using (mocks.Ordered())
+            //{
+                Expect.Call(sessionFactory.OpenSession()).Return(session).Repeat.Twice();
+                Expect.Call(session.Connection).Return(connection);
+
+
+                Expect.Call(session.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                Expect.Call(session.IsOpen).Return(true);
+                Expect.Call(session.FlushMode).Return(FlushMode.Auto).Repeat.Twice();
+                session.Flush();
+                LastCall.On(session).Repeat.Twice();
+                transaction.Commit();
+                LastCall.On(transaction).Repeat.Once();
+                Expect.Call(session.Close()).Return(null).Repeat.Twice();
+            //}
+            mocks.ReplayAll();
+
+
+            HibernateTransactionManager tm = new HibernateTransactionManager(sessionFactory);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.RequiresNew;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+
+            tt.Execute(new ParticipatingTransactionWithWithNotSupportedTxCallback(tt, sessionFactory));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+
+            mocks.VerifyAll();
+
+
+        }
+
+        [Test]
+        public void TransactionWithPropagationSupports()
+        {
+            ISessionFactory sessionFactory = (ISessionFactory)mocks.CreateMock(typeof(ISessionFactory));
+            ISession session = (ISession)mocks.CreateMock(typeof(ISession));
+
+            Expect.Call(sessionFactory.OpenSession()).Return(session);
+            Expect.Call(session.FlushMode).Return(FlushMode.Never);
+            session.FlushMode = FlushMode.Auto;
+            LastCall.IgnoreArguments();
+            session.Flush();
+            LastCall.IgnoreArguments();
+            session.FlushMode = FlushMode.Never;
+            Expect.Call(session.FlushMode).Return(FlushMode.Never);
+            Expect.Call(session.Close()).Return(null);
+
+            mocks.ReplayAll();
+
+
+            LocalSessionFactoryObjectStub lsfo = new LocalSessionFactoryObjectStub(sessionFactory);
+            lsfo.AfterPropertiesSet();
+            ISessionFactory sfProxy = (ISessionFactory) lsfo.GetObject();
+            Assert.IsNotNull(sfProxy);
+
+            HibernateTransactionManager tm = new HibernateTransactionManager(sessionFactory);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.Supports;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+
+            tt.Execute(new TransactionWithPropagationSupportsTxCallback(sessionFactory));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+
+            mocks.VerifyAll();
+
+        }
+
+        [Test]
+        public void TransactionWithPropagationSupportsAndInnerTransaction()
+        {
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            ISessionFactory sessionFactory = (ISessionFactory)mocks.CreateMock(typeof(ISessionFactory));
+            ISession session1 = (ISession)mocks.CreateMock(typeof(ISession));
+            ISession session2 = (ISession)mocks.CreateMock(typeof(ISession));
+            ITransaction transaction = (ITransaction)mocks.CreateMock(typeof(ITransaction));
+
+            Expect.Call(sessionFactory.OpenSession()).Return(session1);
+            Expect.Call(session1.Connection).Return(connection);
+            Expect.Call(session1.SessionFactory).Return(sessionFactory);
+            Expect.Call(session1.FlushMode).Return(FlushMode.Auto).Repeat.Twice();
+
+            session1.Flush();
+            LastCall.IgnoreArguments().Repeat.Twice();
+            Expect.Call(session1.Close()).Return(null);
+
+            Expect.Call(sessionFactory.OpenSession()).Return(session2);
+            Expect.Call(session2.Connection).Return(connection).Repeat.Twice();
+            Expect.Call(session2.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+            Expect.Call(session2.FlushMode).Return(FlushMode.Auto);
+            session2.Flush();
+            LastCall.IgnoreArguments();
+            Expect.Call(session2.IsOpen).Return(true);
+
+
+            transaction.Commit();
+            LastCall.On(transaction).Repeat.Once();
+
+
+            Expect.Call(session2.Close()).Return(null);
+
+            mocks.ReplayAll();
+
+            LocalSessionFactoryObjectStub lsfo = new LocalSessionFactoryObjectStub(sessionFactory);
+            lsfo.AfterPropertiesSet();
+            ISessionFactory sfProxy = (ISessionFactory)lsfo.GetObject();
+            Assert.IsNotNull(sfProxy);
+
+            HibernateTransactionManager tm = new HibernateTransactionManager(sessionFactory);
+            
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.Supports;
+            TransactionTemplate tt2 = new TransactionTemplate(tm);
+            tt2.PropagationBehavior = TransactionPropagation.Required;
+
+            HibernateTemplate ht = new HibernateTemplate(sessionFactory);
+            ht.TemplateFlushMode = TemplateFlushMode.Eager;
+            ht.ExposeNativeSession = true;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+
+            tt.Execute(new TransactionWithPropagationSupportsAndInnerTransactionTxCallback(tt2, sessionFactory, ht, session1, session2));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+            
+            mocks.ReplayAll();
+            
+        }
+
+
+        [Test]
+        public void TransactionCommitWithFlushFailure()
+        {
+            DoTransactionCommitWithFlushFailure(false);
+        }
+
+        [Test]
+        public void TransactionCommitWithFlushFailureAndFallbackTranslation()
+        {
+            DoTransactionCommitWithFlushFailure(true);
+        }
+
+        /// <summary>
+        /// Does the test transaction commit with flush failure.
+        /// </summary>
+        /// <param name="fallbackTranslation">if set to <c>true</c> if the exception throw
+        /// is of the type NHibernate.ADOException, in which case HibernateTransactionManager
+        /// will 'fallback' to using the error codes in the underlying exception thrown by
+        /// the provider, ie. a SqlException, MySqlException.  Otherwise, if it is 
+        /// another subclass of HibernateException, then perform a direct maping as 
+        /// found in SessionFactoryUtils.ConvertHibernateAccessException.</param>
+        private void DoTransactionCommitWithFlushFailure(bool fallbackTranslation)
+        {
+            #region Mock Setup
+
+            IDbProvider provider = new TestDbProvider();
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            ISessionFactory sessionFactory = (ISessionFactory)mocks.CreateMock(typeof(ISessionFactory));
+            ISession session = (ISession)mocks.CreateMock(typeof(ISession));
+            ITransaction transaction = (ITransaction)mocks.CreateMock(typeof(ITransaction));
+            Exception rootCause = null;
+            using (mocks.Ordered())
+            {
+                Expect.Call(sessionFactory.OpenSession()).Return(session);
+                Expect.Call(session.Connection).Return(connection);
+                Expect.Call(session.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                Expect.Call(session.IsOpen).Return(true);
+                transaction.Commit();
+                Exception sqlException = new TestSqlException("mymsg", "2627");
+                if (fallbackTranslation)
+                {
+                    //error code 2627 will map to a DataAccessIntegrity exception in sqlserver, which is the metadata
+                    //used by TestDbProvider.
+                    rootCause = sqlException;
+                    LastCall.On(transaction).Throw(new ADOException("mymsg", sqlException));
+                }
+                else
+                {
+                    rootCause = new PropertyValueException("mymsg", typeof(string), "Name");
+                    LastCall.On(transaction).Throw(rootCause);
+                }
+
+                transaction.Rollback();
+                LastCall.On(transaction).Repeat.Once();
+                Expect.Call(session.Close()).Return(null);
+            }
+
+            #endregion
+
+            mocks.ReplayAll();
+
+
+            HibernateTransactionManager tm = new HibernateTransactionManager(sessionFactory);
+            tm.DbProvider = provider;
+
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            IList list = new ArrayList();
+            list.Add("test");
+            try
+            {
+                tt.Execute(new TransactionCommitWithFlushFailureCallback(sessionFactory, list));
+                Assert.Fail("Should have thrown DataIntegrityViolationException");
+            }
+            catch (DataIntegrityViolationException ex)
+            {
+                Assert.AreEqual(rootCause, ex.InnerException);
+                Assert.IsTrue(ex.Message.IndexOf("mymsg") != -1);
+            }
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sessionFactory), "Hasn't thread session");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            mocks.VerifyAll();
+
+
+        }
+
+    }
+
+
+
+    #region Supporting classes for test TransactionCommit
+
+    public class TransactionCommitTxCallback : ITransactionCallback
+    {
+        private ISessionFactory sfProxy;
+        private IDbProvider provider;
+        public TransactionCommitTxCallback(ISessionFactory sessionFactory, IDbProvider provider)
+        {
+            sfProxy = sessionFactory;
+            this.provider = provider;
+        }
+        
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(sfProxy),"Has thread session");
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(provider), "Hasn't thread db provider");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+            HibernateTemplate ht = new HibernateTemplate(sfProxy);
+            return ht.Find("some query string");
+        }
+    }
+
+    public class LocalSessionFactoryObjectStub  : LocalSessionFactoryObject
+    {
+        private ISessionFactory sf;
+        public LocalSessionFactoryObjectStub(ISessionFactory sf)
+        {
+            this.sf = sf;
+        }
+
+        protected override ISessionFactory NewSessionFactory(Configuration config)
+        {
+            return sf;
+        }
+    }
+
+    #endregion
+
+    #region Supporting classes for test TransactionRollback
+
+    public class TransactionRollbackTxCallback : ITransactionCallback
+    {
+        private ISessionFactory sf;
+        public TransactionRollbackTxCallback(ISessionFactory sf)
+        {
+            this.sf = sf;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(sf),"Has thread session");
+            HibernateTemplate ht = new HibernateTemplate(sf);
+            return ht.ExecuteFind(new ThrowExceptionHibernateCallback());
+        }
+    }
+
+    public class ThrowExceptionHibernateCallback : IHibernateCallback
+    {
+        public object DoInHibernate(ISession session)
+        {
+            throw new ArgumentException("arg exception");
+        }
+    }
+
+    #endregion
+
+    #region Supporting classes for test TransactionRollbackOnly
+
+    public class TransactionRollbackOnlyTxCallback : ITransactionCallback
+    {
+        private ISessionFactory sf;
+        public TransactionRollbackOnlyTxCallback(ISessionFactory sf)
+        {
+            this.sf = sf;
+        }
+
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(sf), "Has thread session");
+            HibernateTemplate ht = new HibernateTemplate(sf);
+            ht.TemplateFlushMode = TemplateFlushMode.Eager;
+            ht.Execute(new HibernateDelegate(Del));
+            status.RollbackOnly = true;
+            return null;
+        }
+
+        private object Del(ISession session)
+        {
+            return null;
+        }
+    }
+    #endregion
+
+    #region Supporting classes for test ParticipatingTransactionWithCommit
+
+    public class ParticipatingTransactionWithCommitTxCallback : ITransactionCallback
+    {
+        private ISessionFactory sf;
+        private IList list;
+        public ParticipatingTransactionWithCommitTxCallback(ISessionFactory sf, IList list)
+        {
+            this.sf = sf;
+            this.list = list;
+        }
+
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(sf), "Has thread session");
+            HibernateTemplate ht = new HibernateTemplate(sf);
+            ht.TemplateFlushMode = TemplateFlushMode.Eager;
+            return ht.Execute(new HibernateDelegate(Del));
+        }
+
+        private object Del(ISession session)
+        {
+            return list;
+        }
+    }
+
+
+    #endregion
+
+    #region Supporting classes for test ParticipatingTransactionWithRollback
+    public class ParticipatingTransactionWithRollbackTxCallback : ITransactionCallback
+    {
+        private ISessionFactory sf;
+        public ParticipatingTransactionWithRollbackTxCallback(ISessionFactory sf)
+        {
+            this.sf = sf;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(sf), "Has thread session");
+            HibernateTemplate ht = new HibernateTemplate(sf);
+            ht.TemplateFlushMode = TemplateFlushMode.Eager;
+            return ht.ExecuteFind(new ThrowExceptionHibernateCallback());
+        }
+
+    }
+
+    #endregion
+
+    #region Supporting classes for test ParticipatingTransactionWithRollbackOnly
+
+    public class ParticipatingTransactionWithRollbackOnlyTxCallback : ITransactionCallback
+    {
+        private TransactionTemplate tt;
+        private ISessionFactory sf;
+        private IList list;
+        public ParticipatingTransactionWithRollbackOnlyTxCallback(TransactionTemplate tt, ISessionFactory sf, IList list)
+        {
+            this.tt = tt;
+            this.sf = sf;
+            this.list = list;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            return tt.Execute(new TransactionDelegate(TransactionMethod));
+        }
+
+        private object TransactionMethod(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(sf), "Has thread session");
+            HibernateTemplate ht = new HibernateTemplate(sf);
+            object returnValue = ht.Execute(new HibernateDelegate(Del));
+            status.RollbackOnly = true;
+            return null;
+        }
+
+        private object Del(ISession session)
+        {
+            return list;
+        }
+
+    }
+    #endregion
+
+    #region Supporting classes for test ParticipatingTransactionWithWithRequiresNew
+
+    public class ParticipatingTransactionWithWithRequiresNewTxCallback : ITransactionCallback
+    {
+        private TransactionTemplate tt;
+        private ISessionFactory sf;
+
+        public ParticipatingTransactionWithWithRequiresNewTxCallback(TransactionTemplate tt, ISessionFactory sf)
+        {
+            this.tt = tt;
+            this.sf = sf;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.GetResource(sf);
+            Assert.IsNotNull(holder,"Has thread session");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+
+            tt.Execute(new RequiresNewTxCallback(sf, holder));
+
+            Assert.IsTrue(holder.Session == SessionFactoryUtils.GetSession(sf, false),"Same thread session as before");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+            return null;
+        }
+
+
+    }
+
+    public class RequiresNewTxCallback : ITransactionCallback
+    {
+        private SessionHolder holder;
+        private ISessionFactory sf;
+
+        public RequiresNewTxCallback(ISessionFactory sf, SessionHolder holder)
+        {
+            this.holder = holder;
+            this.sf = sf;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            HibernateTemplate ht = new HibernateTemplate(sf);
+            ht.TemplateFlushMode = TemplateFlushMode.Eager;
+            return ht.ExecuteFind(new RequiresNewTxCallbackInner(holder));
+        }
+    }
+
+    public class RequiresNewTxCallbackInner : IHibernateCallback
+    {
+        private SessionHolder holder;
+
+        public RequiresNewTxCallbackInner(SessionHolder holder)
+        {
+            this.holder = holder;
+        }
+
+        public object DoInHibernate(ISession session)
+        {
+            Assert.IsTrue(session != holder.Session,"Not enclosing session");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+            return null;
+        }
+    }
+
+    #endregion
+
+
+    #region Supporting classes for test ParticipatingTransactionWithWithNotSupported
+
+    public class ParticipatingTransactionWithWithNotSupportedTxCallback : ITransactionCallback
+    {
+        private TransactionTemplate tt;
+        private ISessionFactory sf;
+
+        public ParticipatingTransactionWithWithNotSupportedTxCallback(TransactionTemplate tt, ISessionFactory sf)
+        {
+            this.tt = tt;
+            this.sf = sf;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            SessionHolder holder = (SessionHolder)TransactionSynchronizationManager.GetResource(sf);
+            Assert.IsNotNull(holder, "Has thread session");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+            tt.PropagationBehavior = TransactionPropagation.NotSupported;            
+            tt.Execute(new NotSupportedTxCallback(sf));
+
+            Assert.IsTrue(holder.Session == SessionFactoryUtils.GetSession(sf, false), "Same thread session as before");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+            return null;
+        }
+
+
+    }
+
+    public class NotSupportedTxCallback : ITransactionCallback
+    {
+        private ISessionFactory sf;
+
+        public NotSupportedTxCallback(ISessionFactory sf)
+        {
+            this.sf = sf;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sf), "Hasn't thread session");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsFalse(TransactionSynchronizationManager.ActualTransactionActive);
+
+            HibernateTemplate ht = new HibernateTemplate(sf);
+            ht.TemplateFlushMode = TemplateFlushMode.Eager;
+            return ht.ExecuteFind(new NotSupportedTxCallbackInner());
+        }
+    }
+
+    public class NotSupportedTxCallbackInner : IHibernateCallback
+    {
+
+        public object DoInHibernate(ISession session)
+        {
+            return null;
+        }
+    }
+
+    #endregion
+
+    #region Supporting classes for test TransactionWithPropagationSupports
+
+    public class TransactionWithPropagationSupportsTxCallback : ITransactionCallback
+    {
+        private ISessionFactory sf;
+        public TransactionWithPropagationSupportsTxCallback(ISessionFactory sf)
+        {
+
+            this.sf = sf;
+
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sf), "Hasn't thread session");
+            Assert.IsTrue(!status.IsNewTransaction, "Is not new transaction");
+
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsFalse(TransactionSynchronizationManager.ActualTransactionActive);
+
+            HibernateTemplate ht = new HibernateTemplate(sf);
+            ht.TemplateFlushMode = TemplateFlushMode.Eager;
+            object returnValue = ht.Execute(new HibernateDelegate(Del));
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(sf), "Has thread session");
+            return null;
+        }
+
+        private object Del(ISession session)
+        {
+            return null;
+        }
+    }
+
+    #endregion
+
+
+    #region Supporting classes for test ParticipatingTransactionWithWithNotSupported
+
+    public class TransactionWithPropagationSupportsAndInnerTransactionTxCallback : ITransactionCallback
+    {
+        private TransactionTemplate tt;
+        private ISessionFactory sf;
+        private HibernateTemplate ht;
+        private ISession session1;
+        private ISession session2;
+
+        public TransactionWithPropagationSupportsAndInnerTransactionTxCallback(TransactionTemplate tt, 
+            ISessionFactory sf, HibernateTemplate ht, ISession session1, ISession session2)
+        {
+            this.tt = tt;
+            this.sf = sf;
+            this.ht = ht;
+            this.session1 = session1;
+            this.session2 = session2;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(sf), "Hasn't thread session");
+            Assert.IsTrue(!status.IsNewTransaction, "Is not new transaction");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsFalse(TransactionSynchronizationManager.ActualTransactionActive);
+
+            ht.Execute(new HibernateDelegate(HibernateDelegate));
+
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(sf), "Has thread session");
+
+            tt.Execute(new PropagationSupportsTxCallback(ht, session2));
+
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsFalse(TransactionSynchronizationManager.ActualTransactionActive);
+  
+            return null;
+        }
+
+        private object HibernateDelegate(ISession session)
+        {
+            Assert.AreSame(session1, session);
+            return null;
+        }
+
+        public class PropagationSupportsTxCallback : ITransactionCallback
+        {
+            private HibernateTemplate ht;
+            private ISession session2;
+
+            public PropagationSupportsTxCallback(HibernateTemplate ht, ISession session2)
+            {
+                this.ht = ht;
+                this.session2 = session2;
+            }
+
+            public object DoInTransaction(ITransactionStatus status)
+            {
+                return ht.Execute(new HibernateDelegate(HibernateDelegate));
+            }
+
+            private object HibernateDelegate(ISession session)
+            {
+                Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+                Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+                Assert.AreSame(session2, session);
+                return null;
+            }
+        }
+
+
+    }
+
+
+
+    #endregion
+
+    #region Supporting classes for DoTransactionCommitWithFlushFailure
+
+    public class TransactionCommitWithFlushFailureCallback : ITransactionCallback
+    {
+        private ISessionFactory sessionFactory;
+        private IList list;
+
+        public TransactionCommitWithFlushFailureCallback(ISessionFactory sessionFactory, IList list)
+        {
+            this.sessionFactory = sessionFactory;
+            this.list = list;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(sessionFactory), "Has thread session");
+            HibernateTemplate ht = new HibernateTemplate(sessionFactory);
+            return ht.ExecuteFind(new TransactionCommitWithFlushFailureHibernateCallback(list));
+        }
+
+
+    }
+
+    public class TransactionCommitWithFlushFailureHibernateCallback : IHibernateCallback
+    {
+        private IList list;
+        public TransactionCommitWithFlushFailureHibernateCallback(IList list)
+        {
+            this.list = list;
+        }
+
+        public object DoInHibernate(ISession session)
+        {
+            return list;
+        }
+    }
+
+    #endregion
+
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/ISimpleService.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/ISimpleService.cs
new file mode 100644
index 00000000..99ef989b
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/ISimpleService.cs
@@ -0,0 +1,14 @@
+/*
+ * Created by: 
+ * Created: Monday, July 16, 2007
+ */
+
+using Spring.Objects;
+
+namespace Spring.Data.NHibernate
+{
+    public interface ISimpleService
+    {
+        void DoWork(TestObject testObject);
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/ITestObjectDao.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/ITestObjectDao.cs
new file mode 100644
index 00000000..46e48760
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/ITestObjectDao.cs
@@ -0,0 +1,41 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: ITestObjectDao.cs,v 1.1 2007/07/18 18:44:57 oakinger Exp $</version>
+	public interface ITestObjectDao 
+	{
+        void Create(TestObject to);
+        void Update(TestObject to);
+        void Delete(TestObject to);
+	    TestObject FindByName(string name);
+            //IList FindAll();
+            //int GetCount();
+            //int GetCountByDelegate();
+        void CreateUpdateRollback(TestObject to);
+        
+	}
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
new file mode 100644
index 00000000..877eac9d
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/LocalSessionFactoryObjectTests.cs
@@ -0,0 +1,84 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System.Collections;
+using System.IO;
+using NHibernate;
+using NHibernate.Cfg;
+using NUnit.Framework;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+    /// <summary>
+    /// This class contains tests for LocalSessionFactoryObject
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: LocalSessionFactoryObjectTests.cs,v 1.1 2008/01/29 20:07:18 markpollack Exp $</version>
+    [TestFixture]
+    public class LocalSessionFactoryObjectTests
+    {
+
+        [Test]
+        public void LocalSessionFactoryObjectWithDbProviderAndProperties()
+        {
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.SqlClient");
+            dbProvider.ConnectionString = "badConnectionString";
+            LocalSessionFactoryObject sfo = new LocalSessionFactoryObject();
+            sfo.DbProvider = dbProvider;
+            IDictionary properties = new Hashtable();
+            properties.Add("hibernate.connection.driver_class", "NHibernate.Driver.SqlClientDriver");
+            properties.Add("hibernate.connection.provider", "NHibernate.Connection.DriverConnectionProvider");
+            sfo.HibernateProperties = properties;
+            sfo.AfterPropertiesSet();
+
+            Assert.IsNotNull(sfo.Configuration);
+            Assert.AreEqual(sfo.Configuration.Properties[Environment.ConnectionProvider].ToString(),
+                            "NHibernate.Connection.DriverConnectionProvider");
+        }
+
+        [Test]
+        [ExpectedException(typeof(FileNotFoundException))]
+        public void LocalSessionFactoryObjectWithInvalidMapping()
+        {
+            LocalSessionFactoryObject sfo = new LocalSessionFactoryObject();
+            sfo.MappingResources = new string[] { "mapping.hbm.xml"};
+            sfo.AfterPropertiesSet();
+
+        }
+
+        [Test]
+        [ExpectedException(typeof(HibernateException))]
+        public void LocalSessionFactoryObjectWithInvalidProperties()
+        {
+            LocalSessionFactoryObject sfo = new LocalSessionFactoryObject();
+            IDictionary properties = new Hashtable();
+            properties.Add(Environment.ConnectionProvider, "myClass");
+            sfo.HibernateProperties = properties;
+            sfo.AfterPropertiesSet();
+        }
+    }
+
+   
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/NHTestObjectDao.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/NHTestObjectDao.cs
new file mode 100644
index 00000000..b5637055
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/NHTestObjectDao.cs
@@ -0,0 +1,101 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using NHibernate.Type;
+using Spring.Data.NHibernate.Support;
+
+
+#endregion
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// NHibernate based DAO implementation of ITestObjectDAao: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: NHTestObjectDao.cs,v 1.1 2007/07/18 18:44:57 oakinger Exp $</version>
+	public class TestObjectDao : HibernateDaoSupport, ITestObjectDao
+	{
+
+		#region Constructor (s)
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TestObjectDao"/> class.
+        /// </summary>
+		public TestObjectDao()
+		{
+
+		}
+
+		#endregion
+
+        #region ITestObjectDao Members
+
+
+	    public void Create(TestObject to)
+	    {
+	        //HibernateTemplate.Save(to);
+	    }
+
+
+	    public void Update(TestObject to)
+	    {
+	       HibernateTemplate.SaveOrUpdate(to);
+	    }
+
+
+	    public void Delete(TestObject to)
+	    {
+	        HibernateTemplate.Delete(to);
+	    }
+
+	    public TestObject FindByName(string name)
+        {
+	        IList result = HibernateTemplate.Find(
+                "select from TestObject as to where to.Name=?",
+                name,
+                TypeFactory.GetStringType(50)
+                );
+
+            if (result.Count > 0)
+            {
+                return (TestObject)result[0];
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public void CreateUpdateRollback(TestObject to)
+        {
+            HibernateTemplate.Save(to);
+            to.Name = "Updated Name";
+            HibernateTemplate.SaveOrUpdate(to);
+            throw new Exception("My expected exception for test purposes.");
+        }
+
+        #endregion
+	}
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/SimpleService.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/SimpleService.cs
new file mode 100644
index 00000000..0c6b2de5
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/SimpleService.cs
@@ -0,0 +1,51 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 Spring.Transaction.Interceptor;
+
+namespace Spring.Data.NHibernate
+{
+    /// <summary>
+    /// This is 
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: SimpleService.cs,v 1.1 2007/07/18 18:44:57 oakinger Exp $</version>
+    public class SimpleService : ISimpleService
+    {
+        private ITestObjectDao testObjectDao;
+
+
+        public ITestObjectDao TestObjectDao
+        {
+            get { return testObjectDao; }
+            set { testObjectDao = value; }
+        }
+
+        [Transaction()]
+        public void DoWork(TestObject testObject)
+        {
+            testObjectDao.Create(testObject);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Support/ConfigSectionSessionScopeSettingsTests.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Support/ConfigSectionSessionScopeSettingsTests.cs
new file mode 100644
index 00000000..a2cbcbf9
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Support/ConfigSectionSessionScopeSettingsTests.cs
@@ -0,0 +1,124 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using NHibernate;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Spring.Context.Support;
+using Spring.Objects.Factory.Config;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Support
+{
+    /// <summary>
+    /// Tests <see cref="ConfigSectionSessionScopeSettings"/> behaviour.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ConfigSectionSessionScopeSettingsTests.cs,v 1.1 2007/08/22 20:17:43 oakinger Exp $</version>
+    [TestFixture]
+    public class ConfigSectionSessionScopeSettingsTests
+    {
+        private class NameValueCollectionVariableSource : IVariableSource
+        {
+            private readonly NameValueCollection nameValuePairs = new NameValueCollection();
+
+            public NameValueCollectionVariableSource Add(string key, string value)
+            {
+                nameValuePairs.Add(key, value);
+                return this;
+            }
+
+            public string ResolveVariable(string name)
+            {
+                return nameValuePairs[name];
+            }
+        }
+
+        [Test]
+        public void CanCreateWithDefaults()
+        {
+            string SESSIONFACTORY_OBJECTNAME = ConfigSectionSessionScopeSettings.DEFAULT_SESSION_FACTORY_OBJECT_NAME;
+
+            // setup expected values
+            MockRepository mocks = new MockRepository();
+            ISessionFactory expectedSessionFactory = (ISessionFactory)mocks.CreateMock(typeof(ISessionFactory));
+            IInterceptor expectedEntityInterceptor = null;
+            bool expectedSingleSession = SessionScopeSettings.SINGLESESSION_DEFAULT;
+            FlushMode expectedDefaultFlushMode = SessionScopeSettings.FLUSHMODE_DEFAULT;
+
+            // create and register context
+            StaticApplicationContext appCtx = new StaticApplicationContext();
+            appCtx.Name = AbstractApplicationContext.DefaultRootContextName;
+            appCtx.ObjectFactory.RegisterSingleton(SESSIONFACTORY_OBJECTNAME, expectedSessionFactory);
+            ContextRegistry.Clear();
+            ContextRegistry.RegisterContext(appCtx);
+
+            ConfigSectionSessionScopeSettings settings = new ConfigSectionSessionScopeSettings(this.GetType(), (IVariableSource)null);
+
+            Assert.AreEqual(expectedSessionFactory, settings.SessionFactory);
+            Assert.AreEqual(expectedEntityInterceptor, settings.EntityInterceptor);
+            Assert.AreEqual(expectedSingleSession, settings.SingleSession);
+            Assert.AreEqual(expectedDefaultFlushMode, settings.DefaultFlushMode);
+        }
+
+        [Test]
+        public void CanCreateFromExplicitConfiguration()
+        {
+            string SESSIONFACTORY_OBJECTNAME = "SessionFactory";
+            string ENTITYINTERCEPTOR_OBJECTNAME = "EntityInterceptor";
+
+            MockRepository mocks = new MockRepository();
+            ISessionFactory expectedSessionFactory =  (ISessionFactory) mocks.CreateMock(typeof(ISessionFactory));
+            IInterceptor expectedEntityInterceptor = (IInterceptor) mocks.CreateMock(typeof(IInterceptor));
+            bool expectedSingleSession = false;
+            FlushMode expectedDefaultFlushMode = FlushMode.Auto;
+
+            // create and register context
+            StaticApplicationContext appCtx = new StaticApplicationContext();
+            appCtx.Name = AbstractApplicationContext.DefaultRootContextName;
+            appCtx.ObjectFactory.RegisterSingleton(SESSIONFACTORY_OBJECTNAME, expectedSessionFactory);
+            appCtx.ObjectFactory.RegisterSingleton(ENTITYINTERCEPTOR_OBJECTNAME, expectedEntityInterceptor);
+            ContextRegistry.Clear();
+            ContextRegistry.RegisterContext(appCtx);
+
+            // simulate config section
+            string thisTypeName = this.GetType().FullName;
+            NameValueCollectionVariableSource variableSource = new NameValueCollectionVariableSource()
+                .Add(thisTypeName + ".SessionFactoryObjectName", SESSIONFACTORY_OBJECTNAME)
+                .Add(thisTypeName + ".EntityInterceptorObjectName", ENTITYINTERCEPTOR_OBJECTNAME)
+                .Add(thisTypeName + ".SingleSession", expectedSingleSession.ToString().ToLower() ) // case insensitive!
+                .Add(thisTypeName + ".DefaultFlushMode", expectedDefaultFlushMode.ToString().ToLower() ) // case insensitive!
+                ;
+
+            
+            ConfigSectionSessionScopeSettings settings = new ConfigSectionSessionScopeSettings(this.GetType(), variableSource);
+
+            Assert.AreEqual( expectedSessionFactory, settings.SessionFactory );
+            Assert.AreEqual( expectedEntityInterceptor, settings.EntityInterceptor );
+            Assert.AreEqual( expectedSingleSession, settings.SingleSession );
+            Assert.AreEqual( expectedDefaultFlushMode, settings.DefaultFlushMode );
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Support/SessionScopeSettingsTests.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Support/SessionScopeSettingsTests.cs
new file mode 100644
index 00000000..e71a5fa6
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Support/SessionScopeSettingsTests.cs
@@ -0,0 +1,162 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using NHibernate;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Support
+{
+    /// <summary>
+    /// Tests <see cref="SessionScopeSettings"/> functionality.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: SessionScopeSettingsTests.cs,v 1.2 2008/04/25 13:25:09 markpollack Exp $</version>
+    [TestFixture]
+    public class SessionScopeSettingsTests
+    {
+        private class DerivedSessionScopeSettings : SessionScopeSettings
+        {
+            public DerivedSessionScopeSettings()
+                :base() // note, that we're calling default ctor here
+            {
+            }
+        }
+
+        private class LazyResolvingSessionScopeSettings : SessionScopeSettings
+        {
+            private readonly ISessionFactory sessionFactory;
+            private readonly IInterceptor entityInterceptor;
+
+
+            public LazyResolvingSessionScopeSettings(ISessionFactory sessionFactory, IInterceptor entityInterceptor)
+                : base() // note, that we're calling default ctor here
+            {
+                this.sessionFactory = sessionFactory;
+                this.entityInterceptor = entityInterceptor;
+            }
+
+            protected override ISessionFactory ResolveSessionFactory()
+            {
+                // simulates lazy resolving
+                return this.sessionFactory;
+            }
+
+            protected override IInterceptor ResolveEntityInterceptor()
+            {
+                // simulates lazy resolving
+                return this.entityInterceptor;
+            }
+        }
+
+        [Test]
+        public void CheckDefaults()
+        {
+            Assert.IsTrue( SessionScopeSettings.SINGLESESSION_DEFAULT );
+            Assert.AreEqual( FlushMode.Never, SessionScopeSettings.FLUSHMODE_DEFAULT );
+        }
+
+        [Test]
+        public void WorksAsExpected()
+        {
+            MockRepository mocks = new MockRepository();
+            ISessionFactory sessionFactory =  (ISessionFactory) mocks.CreateMock(typeof(ISessionFactory));
+            IInterceptor entityInterceptor = (IInterceptor) mocks.CreateMock(typeof(IInterceptor));
+            Assert.AreNotEqual( FlushMode.Auto, SessionScopeSettings.FLUSHMODE_DEFAULT ); // ensure noone changed our assumptions
+            SessionScopeSettings sss = new SessionScopeSettings(sessionFactory, entityInterceptor, !SessionScopeSettings.SINGLESESSION_DEFAULT, FlushMode.Auto );   
+
+            Assert.AreEqual( sessionFactory, sss.SessionFactory );
+            Assert.AreEqual( entityInterceptor, sss.EntityInterceptor);
+            Assert.AreEqual( !SessionScopeSettings.SINGLESESSION_DEFAULT, sss.SingleSession );
+            Assert.AreEqual( FlushMode.Auto, sss.DefaultFlushMode );
+        }
+
+        [Test]
+        public void CallingDefaultConstructorLeavesReferencesMarkedUninitialized()
+        {
+            DerivedSessionScopeSettings sss = new DerivedSessionScopeSettings();
+            // config values are set to their defaults
+            Assert.AreEqual(SessionScopeSettings.SINGLESESSION_DEFAULT, sss.SingleSession);
+            Assert.AreEqual(SessionScopeSettings.FLUSHMODE_DEFAULT, sss.DefaultFlushMode);
+
+            IInterceptor interceptor = sss.EntityInterceptor;
+            Assert.IsNull(interceptor);
+
+            try
+            {
+                ISessionFactory sessionFactory = sss.SessionFactory;
+                Assert.Fail("should fail, because derived classes must override ResolveSessionFactory()");
+            }
+            catch (NotImplementedException) { }
+        }
+
+        [Test]
+        public void CallingDefaultConstructorCausesLazyResolvingReferences()
+        {
+            MockRepository mocks = new MockRepository();
+            ISessionFactory expectedSessionFactory = (ISessionFactory)mocks.CreateMock(typeof(ISessionFactory));
+            IInterceptor expectedEntityInterceptor = (IInterceptor)mocks.CreateMock(typeof(IInterceptor));
+
+            SessionScopeSettings sss = new LazyResolvingSessionScopeSettings(expectedSessionFactory, expectedEntityInterceptor);
+
+            // config values are set to their defaults
+            Assert.AreEqual(SessionScopeSettings.SINGLESESSION_DEFAULT, sss.SingleSession);
+            Assert.AreEqual(SessionScopeSettings.FLUSHMODE_DEFAULT, sss.DefaultFlushMode);
+
+            Assert.AreSame(expectedSessionFactory, sss.SessionFactory);
+            Assert.AreSame(expectedEntityInterceptor, sss.EntityInterceptor);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void MissingSessionFactoryCausesArgumentExceptionDuringLazyResolving()
+        {
+            SessionScopeSettings sss = new LazyResolvingSessionScopeSettings(null, null);
+
+            // config values are set to their defaults
+            Assert.AreEqual(SessionScopeSettings.SINGLESESSION_DEFAULT, sss.SingleSession);
+            Assert.AreEqual(SessionScopeSettings.FLUSHMODE_DEFAULT, sss.DefaultFlushMode);
+
+            ISessionFactory sessionFactory = sss.SessionFactory;
+        }
+
+        [Test]
+        public void MissingEntityInterceptorIsOkDuringLazyResolving()
+        {
+            MockRepository mocks = new MockRepository();
+            ISessionFactory expectedSessionFactory = (ISessionFactory)mocks.CreateMock(typeof(ISessionFactory));
+
+            SessionScopeSettings sss = new LazyResolvingSessionScopeSettings(expectedSessionFactory, null);
+
+            // config values are set to their defaults
+            Assert.AreEqual(SessionScopeSettings.SINGLESESSION_DEFAULT, sss.SingleSession);
+            Assert.AreEqual(SessionScopeSettings.FLUSHMODE_DEFAULT, sss.DefaultFlushMode);
+
+            Assert.AreSame(expectedSessionFactory, sss.SessionFactory);
+            Assert.AreSame(null, sss.EntityInterceptor);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Support/SessionScopeTests.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Support/SessionScopeTests.cs
new file mode 100644
index 00000000..64bf223f
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Support/SessionScopeTests.cs
@@ -0,0 +1,324 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using NHibernate;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data.NHibernate.Support
+{
+    /// <summary>
+    /// Tests for SessionScope
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: SessionScopeTests.cs,v 1.5 2008/05/13 14:22:47 oakinger Exp $</version>
+    [TestFixture]
+    public class SessionScopeTests
+    {
+        private MockRepository repository;
+        private ISessionFactory expectedSessionFactory;
+        private IInterceptor expectedEntityInterceptor;
+        private bool expectedSingleSession;
+        private FlushMode expectedDefaultFlushMode;
+
+        [SetUp]
+        public void SetUp()
+        {
+            repository = new MockRepository();
+            expectedSessionFactory = (ISessionFactory)repository.CreateMock(typeof(ISessionFactory));
+            expectedEntityInterceptor = (IInterceptor)repository.CreateMock(typeof(IInterceptor));
+            expectedSingleSession = SessionScopeSettings.SINGLESESSION_DEFAULT;
+            expectedDefaultFlushMode = SessionScopeSettings.FLUSHMODE_DEFAULT;
+        }
+
+        [Test]
+        public void CanCreateAndClose()
+        {
+            using (SessionScope scope = new SessionScope(expectedSessionFactory, expectedEntityInterceptor, expectedSingleSession, expectedDefaultFlushMode, false))
+            {
+                // no op - just create & dispose
+                Assert.AreSame(expectedSessionFactory, scope.SessionFactory);
+                Assert.AreSame(expectedEntityInterceptor, scope.EntityInterceptor);
+                Assert.AreEqual(expectedSingleSession, scope.SingleSession);
+                Assert.AreEqual(expectedDefaultFlushMode, scope.DefaultFlushMode);
+
+                // ensure nothing got registered with TSM
+                Assert.IsFalse(TransactionSynchronizationManager.HasResource(expectedSessionFactory));
+
+                scope.Close();
+            }
+        }
+
+        [Test]
+        public void CanCreateAndCloseSimpleCtor()
+        {
+            using (repository.Ordered())
+            {
+                ISession session = (ISession) repository.CreateMock(typeof (ISession));
+                Expect.Call(expectedSessionFactory.OpenSession()).Return(session);
+                session.FlushMode = FlushMode.Never;
+                Expect.Call(session.Close()).Return(null);
+            }
+            repository.ReplayAll();            
+            using (SessionScope scope = new SessionScope(expectedSessionFactory, true))
+            {
+                // no op - just create & dispose
+                Assert.AreSame(expectedSessionFactory, scope.SessionFactory);
+                //Assert.AreSame(null, scope.EntityInterceptor);
+                Assert.AreEqual(expectedSingleSession, scope.SingleSession);
+                Assert.AreEqual(expectedDefaultFlushMode, scope.DefaultFlushMode);
+
+                // ensure SessionHolder object is registered with TSM
+                Assert.IsTrue(TransactionSynchronizationManager.HasResource(expectedSessionFactory));
+
+                SessionHolder sessionHolder =
+                    (SessionHolder) TransactionSynchronizationManager.GetResource(expectedSessionFactory);
+                // by default session is lazy, so ask for it.
+                Assert.IsNotNull(sessionHolder.Session);
+                scope.Close();
+            }
+            repository.VerifyAll();
+        }
+
+        [Test]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void OpeningTwiceThrowsInvalidOperationException()
+        {
+            using (SessionScope scope = new SessionScope(expectedSessionFactory, true))
+            {
+                scope.Open();
+            }
+        }
+
+        [Test]
+        public void ClosingTwiceIsIgnored()
+        {
+            using (SessionScope scope = new SessionScope(expectedSessionFactory, true))
+            {
+                scope.Close();
+                scope.Close();
+            }
+        }
+
+        [Test]
+        public void DisposeClosesScope()
+        {
+            SessionScope scope = new SessionScope(expectedSessionFactory, true);
+            Assert.IsTrue(scope.IsOpen);
+            scope.Dispose();
+            Assert.IsFalse(scope.IsOpen);
+        }
+
+        [Test]
+        public void DoesOpenImmediatelyOnOpenIsTrue()
+        {
+            SessionScope scope = null;
+            using (scope = new SessionScope(expectedSessionFactory, true))
+            {
+                // ensure is open
+                Assert.IsTrue(scope.IsOpen);
+                Assert.IsFalse(scope.IsParticipating);
+
+                scope.Close();
+                // ensure is closed
+                Assert.IsFalse(scope.IsOpen);
+                Assert.IsFalse(scope.IsParticipating);
+            }
+            Assert.IsFalse(scope.IsOpen);
+            Assert.IsFalse(scope.IsParticipating);
+
+            using (scope = new SessionScope(expectedSessionFactory, true))
+            {
+                // ensure is open
+                Assert.IsTrue(scope.IsOpen);
+                Assert.IsFalse(scope.IsParticipating);
+            }
+            // ensure dispose closes scope
+            Assert.IsFalse(scope.IsOpen);
+            Assert.IsFalse(scope.IsParticipating);
+        }
+
+        [Test]
+        public void DoesNotOpenImmediatelyOnOpenIsFalse()
+        {
+            SessionScope scope = null;
+            using (scope = new SessionScope(expectedSessionFactory, false))
+            {
+                // ensure is *not* open
+                Assert.IsFalse(scope.IsOpen);
+                Assert.IsFalse(scope.IsParticipating);
+
+                scope.Open();
+                // ensure is open now
+                Assert.IsTrue(scope.IsOpen);
+
+                scope.Close();
+                // ensure is closed
+                Assert.IsFalse(scope.IsOpen);
+                Assert.IsFalse(scope.IsParticipating);
+            }
+            // ensure is closed
+            Assert.IsFalse(scope.IsOpen);
+            Assert.IsFalse(scope.IsParticipating);
+        }
+
+        [Test]
+        public void SingleSessionRegistersSessionHolderWithTSM()
+        {
+            SessionScope scope = null;
+            using (scope = new SessionScope(expectedSessionFactory, null, true, FlushMode.Auto, true))
+            {
+                // ensure is open
+                Assert.IsTrue(scope.IsOpen);
+                Assert.IsFalse(scope.IsParticipating);
+
+                // ensure registered sessionholder with TSM
+                Assert.IsTrue(TransactionSynchronizationManager.HasResource(expectedSessionFactory));
+                // ensure a sessionHolder is registered
+                SessionHolder sessionHolder = TransactionSynchronizationManager.GetResource(expectedSessionFactory) as SessionHolder;
+                Assert.IsNotNull(sessionHolder);
+            }
+            // ensure scope is closed and sessionHolder is unregistered from TSM
+            Assert.IsFalse(scope.IsOpen);
+            Assert.IsFalse(TransactionSynchronizationManager.HasResource(expectedSessionFactory));
+        }
+
+        [Test]
+        public void SingleSessionAppliesDefaultFlushModeOnOpenSessionAndClosesSession()
+        {
+            ISession expectedSession = (ISession)repository.CreateMock(typeof(ISession));
+
+            Expect.Call(expectedSessionFactory.OpenSession()).Return(expectedSession);
+            expectedSession.FlushMode = FlushMode.Auto;
+            Expect.Call(expectedSession.Close()).Return(null);
+            repository.ReplayAll();
+
+            SessionScope scope = null;
+            using (scope = new SessionScope(expectedSessionFactory, null, true, FlushMode.Auto, true))
+            {
+                SessionHolder sessionHolder = (SessionHolder)TransactionSynchronizationManager.GetResource(expectedSessionFactory);
+                Assert.IsTrue(sessionHolder.ContainsSession(expectedSession));
+            }
+            // ensure scope is closed and sessionHolder is unregistered from TSM
+            Assert.IsFalse(scope.IsOpen);
+            Assert.IsFalse(TransactionSynchronizationManager.HasResource(expectedSessionFactory));
+
+            repository.VerifyAll();
+        }
+
+        [Test]
+        public void SingleSessionNestedSessionParticipatesInParentScopeSessionFactory()
+        {
+            SessionScope scope = null;
+            using (scope = new SessionScope(expectedSessionFactory, null, true, FlushMode.Auto, true))
+            {
+                Assert.IsTrue(scope.IsOpen);
+                Assert.IsFalse(scope.IsParticipating);
+
+                using (SessionScope innerScope = new SessionScope(expectedSessionFactory, true))
+                {
+                    // outer scope didn't change
+                    Assert.IsTrue(scope.IsOpen);
+                    Assert.IsFalse(scope.IsParticipating);
+
+                    // participating only - no SessionHolder will be registered!
+                    Assert.IsTrue(innerScope.IsOpen);
+                    Assert.IsTrue(innerScope.IsParticipating);
+
+                    innerScope.Close();
+
+                    Assert.IsFalse(innerScope.IsOpen);
+                    Assert.IsFalse(innerScope.IsParticipating);
+
+                    // outer scope didn't change
+                    Assert.IsTrue(scope.IsOpen);
+                    Assert.IsFalse(scope.IsParticipating);
+                    Assert.IsTrue(TransactionSynchronizationManager.HasResource(expectedSessionFactory));
+                }
+            }
+
+            // ensure scope is closed and sessionHolder is unregistered from TSM
+            Assert.IsFalse(scope.IsOpen);
+            Assert.IsFalse(TransactionSynchronizationManager.HasResource(expectedSessionFactory));
+        }
+
+        public class TestSessionScopeSettings : SessionScopeSettings
+        {
+            public TestSessionScopeSettings(ISessionFactory sessionFactory)
+                : base(sessionFactory)
+            {
+            }
+
+            protected override IInterceptor ResolveEntityInterceptor()
+            {
+                return DoResolveEntityInterceptor();
+            }
+
+            public virtual IInterceptor DoResolveEntityInterceptor()
+            {
+                return base.ResolveEntityInterceptor();
+            }
+        }
+
+        [Test]
+        public void ResolvesEntityInterceptorOnEachOpen()
+        {
+            TestSessionScopeSettings sss =
+                (TestSessionScopeSettings)repository.PartialMock(typeof(TestSessionScopeSettings), expectedSessionFactory);
+            ISession expectedSession = (ISession)repository.CreateMock(typeof(ISession));
+            sss.DefaultFlushMode = FlushMode.Never;
+
+            SessionScope sc = new SessionScope(sss, false);
+
+            using (repository.Ordered())
+            {
+                Expect.Call(sss.DoResolveEntityInterceptor()).Return(expectedEntityInterceptor);
+                Expect.Call(expectedSessionFactory.OpenSession(expectedEntityInterceptor)).Return(expectedSession);
+                expectedSession.FlushMode = FlushMode.Never;
+                Expect.Call(expectedSession.Close()).Return(null);
+
+                Expect.Call(sss.DoResolveEntityInterceptor()).Return(expectedEntityInterceptor);
+                Expect.Call(expectedSessionFactory.OpenSession(expectedEntityInterceptor)).Return(expectedSession);
+                expectedSession.FlushMode = FlushMode.Never;
+                Expect.Call(expectedSession.Close()).Return(null);
+            }
+            repository.ReplayAll();
+
+            sc.Open();
+            SessionHolder sessionHolder = (SessionHolder)TransactionSynchronizationManager.GetResource(expectedSessionFactory);
+            sessionHolder.ContainsSession(null); // force opening session
+            sc.Close();
+
+            sc.Open();
+            sessionHolder = (SessionHolder)TransactionSynchronizationManager.GetResource(expectedSessionFactory);
+            sessionHolder.ContainsSession(null); // force opening session
+            sc.Close();
+
+            repository.VerifyAll();
+        }
+
+     }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/TestObject.cs b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/TestObject.cs
new file mode 100644
index 00000000..5076a2b0
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/TestObject.cs
@@ -0,0 +1,76 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+
+namespace Spring.Data.NHibernate
+{
+	/// <summary>
+	/// TODO: 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TestObject.cs,v 1.1 2007/07/18 18:44:57 oakinger Exp $</version>
+	public class TestObject 
+	{
+		#region Fields
+        private int age;
+        private string name;
+        private int objectNumber;
+         
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TestObject"/> class.
+        /// </summary>
+		public 	TestObject()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+	    public int Age
+	    {
+	        get { return age; }
+	        set { age = value; }
+	    }
+
+	    public string Name
+	    {
+	        get { return name; }
+	        set { name = value; }
+	    }
+
+	    public int ObjectNumber
+	    {
+	        get { return objectNumber; }
+	        set { objectNumber = value; }
+	    }
+
+	    #endregion
+
+		#region Methods
+
+		#endregion
+
+	}
+}
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/TestObject.hbm.xml b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/TestObject.hbm.xml
new file mode 100644
index 00000000..60bd056e
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/TestObject.hbm.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
+    <class name="Spring.Data.NHibernate.TestObject, Spring.Data.NHibernate.Tests" table="TestObjects">
+        <id name="ObjectNumber" column="TestObjectNo" type="Int32"> 
+          <generator class="identity" /> 
+          
+          <!--
+          <generator class="sequence">
+            <param name="sequence">ID_SEQ</param>
+          </generator>
+          -->
+
+        </id> 
+        <property name="Age" column="Age" type="Int32"/> 
+        <property name="Name" type="String" length="50"/> 
+    </class>
+</hibernate-mapping>
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2003.csproj b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2003.csproj
new file mode 100644
index 00000000..571fac78
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2003.csproj
@@ -0,0 +1,207 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{8755D942-7828-4971-835B-37A5992C06C9}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Data.NHibernate.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = 'echo "Copying .xml files for tests"&#xd;&#xa;xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2003\Spring.Data.NHibernate.Tests\$(ConfigurationName)\ /y /s /q /d&#xd;&#xa;xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2003\Spring.Data.NHibernate.Tests\$(ConfigurationName)\ /y /s /q'
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Data.NHibernate.Tests\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Data.NHibernate.Tests\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "System.XML.dll"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\net\1.1\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Data.NHibernate.2003"
+                    Project = "{E8467024-8AE3-44A4-BAAD-1D78747EC7BD}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Aop.2003"
+                    Project = "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Data.2003"
+                    Project = "{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Data.Tests.2003"
+                    Project = "{C5585365-561C-4EC4-8956-87FFBD9AB1CD}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Castle.DynamicProxy"
+                    AssemblyName = "Castle.DynamicProxy"
+                    HintPath = "..\..\..\lib\NHibernate10\net\1.1\Castle.DynamicProxy.dll"
+                />
+                <Reference
+                    Name = "Iesi.Collections"
+                    AssemblyName = "Iesi.Collections"
+                    HintPath = "..\..\..\lib\NHibernate10\net\1.1\Iesi.Collections.dll"
+                />
+                <Reference
+                    Name = "log4net"
+                    AssemblyName = "log4net"
+                    HintPath = "..\..\..\lib\NHibernate10\net\1.1\log4net.dll"
+                />
+                <Reference
+                    Name = "NHibernate"
+                    AssemblyName = "NHibernate"
+                    HintPath = "..\..\..\lib\NHibernate10\net\1.1\NHibernate.dll"
+                />
+                <Reference
+                    Name = "Rhino.Mocks"
+                    AssemblyName = "Rhino.Mocks"
+                    HintPath = "..\..\..\lib\Net\1.1\Rhino.Mocks.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Data.NHibernate.Tests.dll.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\NHibernate\ISimpleService.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\ITestObjectDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\NHTestObjectDao.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\SimpleService.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\TestObject.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\TestObject.hbm.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Config\AopConfiguration.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Config\AopConfiguration.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\ConfigSectionSessionScopeSettingsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\SessionScopeSettingsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\NHibernate\Support\SessionScopeTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2005.csproj b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2005.csproj
new file mode 100644
index 00000000..eca1d86a
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.2005.csproj
@@ -0,0 +1,123 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{94E4E1B4-D424-4EB9-BF34-2EE8CC3D7048}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate.Tests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.NHibernate.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Castle.DynamicProxy, Version=1.1.5.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate10\net\2.0\Castle.DynamicProxy.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Iesi.Collections, Version=1.0.0.1, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate10\net\2.0\Iesi.Collections.dll</HintPath>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.9.0, Culture=neutral, PublicKeyToken=b32731d11ce58905">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate10\net\2.0\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="NHibernate, Version=1.0.4.0, Culture=neutral, PublicKeyToken=154fdcb44c4484fc">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\NHibernate10\net\2.0\NHibernate.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data.NHibernate\Spring.Data.NHibernate.2005.csproj">
+      <Project>{130E1609-45A7-4F65-B112-105F2DD3E2CE}</Project>
+      <Name>Spring.Data.NHibernate.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2005.csproj">
+      <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project>
+      <Name>Spring.Data.Tests.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Data\NHibernate\Config\AopConfiguration.cs" />
+    <Compile Include="Data\NHibernate\HibernateTransactionManagerTests.cs" />
+    <Compile Include="Data\NHibernate\ISimpleService.cs" />
+    <Compile Include="Data\NHibernate\ITestObjectDao.cs" />
+    <Compile Include="Data\NHibernate\LocalSessionFactoryObjectTests.cs" />
+    <Compile Include="Data\NHibernate\NHTestObjectDao.cs" />
+    <Compile Include="Data\NHibernate\SimpleService.cs" />
+    <Compile Include="Data\NHibernate\Support\ConfigSectionSessionScopeSettingsTests.cs" />
+    <Compile Include="Data\NHibernate\Support\SessionScopeSettingsTests.cs" />
+    <Compile Include="Data\NHibernate\Support\SessionScopeTests.cs" />
+    <Compile Include="Data\NHibernate\TestObject.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\Config\AopConfiguration.xml" />
+    <EmbeddedResource Include="Data\NHibernate\TestObject.hbm.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Data.NHibernate.Tests.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\NHibernate\Config\AopConfigurationTxPointcut.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+  <PropertyGroup>
+    <PostBuildEvent>echo "Copying .xml files for tests"
+xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Data.NHibernate.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2005\Spring.Data.NHibernate.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.build b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.build
new file mode 100644
index 00000000..126b1971
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.build
@@ -0,0 +1,61 @@
+<?xml version="1.0" ?>
+<project name="Spring.Data.NHibernate.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+	<!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+	<target name="build">
+		<csc target="library" define="${current.build.defines.csc}"
+		     warnaserror="true"
+		     debug="${current.build.debug}"
+      		     output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml">
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+			</sources>
+			<references basedir="${current.bin.dir}">
+				<lib>
+					<include name="${nh.lib.dir}"/>
+				</lib>
+				<include name="System.Data.dll" />
+				<include name="System.EnterpriseServices.dll" />
+				<include name="NHibernate.dll" />
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+				<exclude name="Spring.Data.NHibernate12.dll" />
+				<exclude name="CloverRuntime.dll" />
+			</references>
+			<resources prefix="Spring" dynamicprefix="true" failonempty="true">
+				<include name="**/*.xml" />
+			</resources>
+		</csc>
+
+        <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
+              tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
+
+<!-- copy nh libs -->
+		<copy todir="${current.bin.dir}" overwrite="true">
+			<fileset basedir="${nh.lib.dir}">
+				<include name="**/*.dll" />
+			</fileset>
+		</copy>
+
+	</target>
+
+	<target name="test" depends="build">
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll"
+			      appconfig="${current.bin.dir}/${project::get-name()}.dll.config" />
+		</nunit2outproc>
+	</target>
+
+</project>
diff --git a/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.dll.config b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.dll.config
new file mode 100644
index 00000000..3f8da4d1
--- /dev/null
+++ b/test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.dll.config
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+    </sectionGroup>
+    <sectionGroup name="spring">
+      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
+    </sectionGroup>
+  </configSections>
+
+<!--
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net129">
+        <arg key="configType" value="EXTERNAL" />
+      </factoryAdapter>
+    </logging>
+  </common>
+-->
+    
+  <spring>
+    <parsers>
+      <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>
+      <parser type="Spring.Transaction.Config.TxNamespaceParser, Spring.Data" />
+      <parser type="Spring.Aop.Config.AopNamespaceParser, Spring.Aop" />
+    </parsers>
+  </spring>
+
+</configuration>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/AssemblyInfo.cs b/test/Spring/Spring.Data.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..5bee2530
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("Spring.Data Tests")]
+[assembly: AssemblyDescription("Unit tests for Spring.Data assembly")]
diff --git a/test/Spring/Spring.Data.Tests/Dao/IncorrectResultSizeDataAccessExceptionTests.cs b/test/Spring/Spring.Data.Tests/Dao/IncorrectResultSizeDataAccessExceptionTests.cs
new file mode 100644
index 00000000..25645794
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Dao/IncorrectResultSizeDataAccessExceptionTests.cs
@@ -0,0 +1,15 @@
+using NUnit.Framework;
+namespace Spring.Dao
+{
+	[TestFixture]
+	public class IncorrectResultSizeDataAccessExceptionTests
+	{
+		[Test]
+		public void SizeGetter( )
+		{
+			IncorrectResultSizeDataAccessException ex = new IncorrectResultSizeDataAccessException( 1, 4 );
+			Assert.AreEqual( 1, ex.ExpectedSize );
+			Assert.AreEqual( 4, ex.ActualSize );
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Dao/IncorrectUpdateSemanticsDataAccessExceptionTests.cs b/test/Spring/Spring.Data.Tests/Dao/IncorrectUpdateSemanticsDataAccessExceptionTests.cs
new file mode 100644
index 00000000..55b67c59
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Dao/IncorrectUpdateSemanticsDataAccessExceptionTests.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Runtime.Serialization;
+using NUnit.Framework;
+namespace Spring.Dao
+{
+	[TestFixture]
+	public class IncorrectUpdateSemanticsDataAccessExceptionTests
+	{
+		[Serializable]
+		public class SampleException : IncorrectUpdateSemanticsDataAccessException
+		{
+			public SampleException() : base() {}
+			public SampleException( string message ) : base( message ) {}
+			public SampleException( string message, Exception inner ) : base( message, inner ) {}
+			protected SampleException( SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+			public override bool DataWasUpdated
+			{
+				get
+				{
+					return true;
+				}
+			}
+		}
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Dao/UncategorizedDataAccessExceptionTests.cs b/test/Spring/Spring.Data.Tests/Dao/UncategorizedDataAccessExceptionTests.cs
new file mode 100644
index 00000000..1a5f6d00
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Dao/UncategorizedDataAccessExceptionTests.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Runtime.Serialization;
+using NUnit.Framework;
+namespace Spring.Dao
+{
+	[TestFixture]
+	public class UncategorizedDataAccessExceptionTests
+	{
+		[Serializable]
+			public class SampleException : UncategorizedDataAccessException
+		{
+			public SampleException() : base() {}
+			public SampleException( string message ) : base( message ) {}
+			public SampleException( string message, Exception inner ) : base( message, inner ) {}
+			protected SampleException( SerializationInfo info, StreamingContext context ) : base( info, context ) {}
+		}
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Data/AdoPlatformTransactionManagerTests.cs b/test/Spring/Spring.Data.Tests/Data/AdoPlatformTransactionManagerTests.cs
new file mode 100644
index 00000000..fccacd8d
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/AdoPlatformTransactionManagerTests.cs
@@ -0,0 +1,1479 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Data;
+using System.Threading;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Spring.Dao;
+using Spring.Data.Common;
+using Spring.Data.Core;
+using Spring.Data.Support;
+using Spring.Support;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data
+{
+    /// <summary>
+    /// This class contains tests for AdoPlatformTransactionManager
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AdoPlatformTransactionManagerTests.cs,v 1.8 2007/12/07 07:31:05 markpollack Exp $</version>
+    [TestFixture]
+    public class AdoPlatformTransactionManagerTests
+    {
+        private MockRepository mocks;
+
+        [SetUp]
+        public void Setup()
+        {
+            mocks = new MockRepository();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.ResourceDictionary.Count == 0);
+            Assert.IsFalse(TransactionSynchronizationManager.SynchronizationActive);
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsFalse(TransactionSynchronizationManager.ActualTransactionActive);
+        }
+
+        [Test]
+        public void TransactionCommit()
+        {
+            #region Mock setup
+            IDbProvider dbProvider = (IDbProvider) mocks.CreateMock(typeof (IDbProvider));
+            IDbConnection connection = (IDbConnection) mocks.CreateMock(typeof (IDbConnection));
+            IDbTransaction transaction = (IDbTransaction) mocks.CreateMock(typeof (IDbTransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                connection.Open();
+                LastCall.On(connection).Repeat.Once();
+                Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                //standard tx timeout.
+                transaction.Commit();
+                LastCall.On(transaction).Repeat.Once();
+                connection.Dispose();
+            }
+
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+
+            TransactionTemplate tt = new TransactionTemplate(tm);
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            tt.Execute(new TransactionCommitTxCallback(dbProvider));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void TransactionRollback()
+        {
+            #region Mock Setup
+
+            IDbProvider dbProvider = (IDbProvider) mocks.CreateMock(typeof (IDbProvider));
+            IDbConnection connection = (IDbConnection) mocks.CreateMock(typeof (IDbConnection));
+            IDbTransaction transaction = (IDbTransaction) mocks.CreateMock(typeof (IDbTransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                connection.Open();
+                LastCall.On(connection).Repeat.Once();
+                Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                //standard tx timeout.
+                transaction.Rollback();
+                LastCall.On(transaction).Repeat.Once();
+
+                connection.Dispose();
+            }
+
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            Exception ex = new ArgumentException("test exception");
+            try
+            {
+                tt.Execute(new TransactionRollbackTxCallback(dbProvider, ex));
+                Assert.Fail("Should have thrown exception");
+            }
+            catch (ArgumentException e)
+            {
+                Assert.AreEqual(ex, e);
+            }
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ParticipatingTransactionWithRollbackOnly()
+        {
+            IDbProvider dbProvider = (IDbProvider) mocks.CreateMock(typeof (IDbProvider));
+            IDbConnection connection = (IDbConnection) mocks.CreateMock(typeof (IDbConnection));
+            IDbTransaction transaction = (IDbTransaction) mocks.CreateMock(typeof (IDbTransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                connection.Open();
+                LastCall.On(connection).Repeat.Once();
+                Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                //standard tx timeout.
+                transaction.Rollback();
+                LastCall.On(transaction).Repeat.Once();
+                connection.Dispose();
+            }
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            ITransactionStatus ts = tm.GetTransaction(new DefaultTransactionDefinition());
+            TestTransactionSynchronization synch =
+                new TestTransactionSynchronization(dbProvider, TransactionSynchronizationStatus.Rolledback);
+            TransactionSynchronizationManager.RegisterSynchronization(synch);
+
+            bool outerTransactionBoundaryReached = false;
+            try
+            {
+                Assert.IsTrue(ts.IsNewTransaction);
+                TransactionTemplate tt = new TransactionTemplate(tm);
+                TransactionTemplate tt2 = new TransactionTemplate(tm);
+                tt.Execute(new ParticipatingTxWithRollbackOnlyTxCallback(tt2, dbProvider));
+                outerTransactionBoundaryReached = true;
+                tm.Commit(ts);
+                Assert.Fail("Should have thrown UnexpectedRollbackException");
+            }
+            catch (UnexpectedRollbackException)
+            {
+                // expected
+                if (!outerTransactionBoundaryReached)
+                {
+                    tm.Rollback(ts);
+                }
+                Assert.IsTrue(outerTransactionBoundaryReached);
+            }
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsFalse(synch.beforeCommitCalled);
+            Assert.IsTrue(synch.beforeCompletionCalled);
+            Assert.IsFalse(synch.afterCommitCalled);
+            Assert.IsTrue(synch.afterCompletionCalled);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        [Ignore]
+        public void ParticipatingTransactionWithTransactionStartedFromSynch()
+        {
+        }
+
+        [Test]
+        [Ignore]
+        public void ParticipatingTransactionWithRollbackOnlyAndInnerSynch()
+        {
+        }
+
+        [Test]
+        public void PropagationRequiresNewWithExistingTransaction()
+        {
+            #region Mock Setup
+            IDbProvider dbProvider = (IDbProvider) mocks.CreateMock(typeof (IDbProvider));
+            IDbConnection connection = (IDbConnection) mocks.CreateMock(typeof (IDbConnection));
+            IDbTransaction transaction = (IDbTransaction) mocks.CreateMock(typeof (IDbTransaction));
+
+            Expect.Call(dbProvider.CreateConnection()).Return(connection).Repeat.Twice();
+            connection.Open();
+            LastCall.On(connection).Repeat.Twice();
+            Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction).Repeat.Twice();
+            //standard tx timeout.
+            transaction.Rollback();
+            LastCall.On(transaction).Repeat.Once();
+
+            transaction.Commit();
+            LastCall.On(transaction).Repeat.Once();
+
+            connection.Dispose();
+            LastCall.On(connection).Repeat.Twice();
+
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.RequiresNew;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            tt.Execute(new PropagationRequiresNewWithExistingTransactionCallback(tt, dbProvider));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void PropagationRequiresNewWithExistingTransactionAndUnrelatedDataSource()
+        {
+            IDbProvider dbProvider = (IDbProvider) mocks.CreateMock(typeof (IDbProvider));
+            IDbConnection connection = (IDbConnection) mocks.CreateMock(typeof (IDbConnection));
+            IDbTransaction transaction = (IDbTransaction) mocks.CreateMock(typeof (IDbTransaction));
+
+            Expect.Call(dbProvider.CreateConnection()).Return(connection);
+            connection.Open();
+            LastCall.On(connection).Repeat.Once();
+            Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+            transaction.Commit();
+            LastCall.On(transaction).Repeat.Once();
+            connection.Dispose();
+
+            IDbProvider dbProvider2 = (IDbProvider) mocks.CreateMock(typeof (IDbProvider));
+            IDbConnection connection2 = (IDbConnection) mocks.CreateMock(typeof (IDbConnection));
+            IDbTransaction transaction2 = (IDbTransaction) mocks.CreateMock(typeof (IDbTransaction));
+
+            Expect.Call(dbProvider2.CreateConnection()).Return(connection2);
+            connection2.Open();
+            LastCall.On(connection2).Repeat.Once();
+            Expect.Call(connection2.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction2);
+            transaction2.Rollback();
+            LastCall.On(transaction2).Repeat.Once();
+            connection2.Dispose();
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.RequiresNew;
+
+            AdoPlatformTransactionManager tm2 = new AdoPlatformTransactionManager(dbProvider2);
+            TransactionTemplate tt2 = new TransactionTemplate(tm2);
+            tt2.PropagationBehavior = TransactionPropagation.RequiresNew;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider2), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+
+            tt.Execute(new PropagationRequiresNewWithExistingTransactionCallback(tt2, dbProvider));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider2), "Hasn't thread db provider");
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void PropagationRequiresNewWithExistingTransactionAndUnrelatedFailingDataSource()
+        {
+            #region Mock Setup
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));            
+            IDbTransaction transaction = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+
+            Expect.Call(dbProvider.CreateConnection()).Return(connection);
+            connection.Open();
+            LastCall.On(connection).Repeat.Once();
+            Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+            transaction.Rollback();
+            LastCall.On(transaction).Repeat.Once();
+            connection.Dispose();
+
+            IDbProvider dbProvider2 = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection2 = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            IDbTransaction transaction2 = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+
+            Expect.Call(dbProvider2.CreateConnection()).Return(connection2);
+            connection2.Open();
+            Exception failure = new Exception("can't open connection");
+            LastCall.On(connection2).Throw(failure);
+
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.RequiresNew;
+
+            AdoPlatformTransactionManager tm2 = new AdoPlatformTransactionManager(dbProvider2);
+            tm2.TransactionSynchronization = TransactionSynchronizationState.Never;
+            TransactionTemplate tt2 = new TransactionTemplate(tm2);
+            tt2.PropagationBehavior = TransactionPropagation.RequiresNew;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider2), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            try
+            {
+                tt.Execute(
+                    new PropagationRequiresNewWithExistingTransactionAndUnrelatedFailingDataSourceCallback(tt2));
+                Assert.Fail("Should have thrown CannotCreateTransactionException");
+            } catch(CannotCreateTransactionException ex)
+            {
+                Assert.AreSame(failure, ex.InnerException);
+            }
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider2), "Hasn't thread db provider");
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void PropagationNotSupportedWithExistingTransaction()
+        {
+            #region Mock Setup
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            IDbTransaction transaction = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                connection.Open();
+                LastCall.On(connection).Repeat.Once();
+                Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                //standard tx timeout.
+                transaction.Commit();
+                LastCall.On(transaction).Repeat.Once();
+                connection.Dispose();
+            }
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.RequiresNew;
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            tt.Execute(new PropagationNotSupportedWithExistingTransactionCallback(tt, dbProvider));
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void PropagationNeverWithExistingTransaction()
+        {
+            #region Mock Setup
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            IDbTransaction transaction = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                connection.Open();
+                LastCall.On(connection).Repeat.Once();
+                Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                //standard tx timeout.
+                transaction.Rollback();
+                LastCall.On(transaction).Repeat.Once();
+
+                connection.Dispose();
+            }
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.RequiresNew;
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            try
+            {
+                tt.Execute(new PropagationNeverWithExistingTransactionCallback(tt));
+                Assert.Fail("Should have thrown IllegalTransactionStateException");
+            } catch (IllegalTransactionStateException)
+            {
+                //expected.
+            }
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void PropagationRequiresNewWithExistingConnection()
+        {
+            #region Mock Setup
+
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            IDbTransaction transaction = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+
+            Expect.Call(dbProvider.CreateConnection()).Return(connection);
+            connection.Open();
+            LastCall.On(connection).Repeat.Once();
+            connection.Dispose();
+
+            IDbConnection connection2 = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            IDbTransaction transaction2 = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+
+            Expect.Call(dbProvider.CreateConnection()).Return(connection2);
+            connection2.Open();
+            LastCall.On(connection2).Repeat.Once();
+            Expect.Call(connection2.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction2);
+            transaction2.Commit();
+            LastCall.On(transaction2).Repeat.Once();
+            connection2.Dispose();
+
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.Supports;
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            tt.Execute(new PropagationRequiresNewWithExistingConnectionCallback(tt, connection, connection2, dbProvider));
+
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void TransactionWithIsolation()
+        {
+            #region Mock setup
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            IDbTransaction transaction = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                connection.Open();
+                LastCall.On(connection).Repeat.Once();
+                Expect.Call(connection.BeginTransaction(IsolationLevel.Serializable)).Return(transaction);
+                //standard tx timeout.
+                transaction.Commit();
+                LastCall.On(transaction).Repeat.Once();
+                connection.Dispose();
+            }
+
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.RequiresNew;
+            tt.TransactionIsolationLevel = IsolationLevel.Serializable;
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+
+            tt.Execute(new TransactionCommitTxCallback(dbProvider));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void TransactionWithLongTimeout()
+        {
+            DoTransactionWithTimeout(10);            
+        }
+
+        [Test]
+        public void TransactionWithShortTimeout()
+        {
+            DoTransactionWithTimeout(1);
+        }
+
+        private void DoTransactionWithTimeout(int timeout)
+        {
+            #region Mock setup
+
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            IDbTransaction transaction = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+            IDbCommand command = (IDbCommand) mocks.CreateMock(typeof (IDbCommand));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                connection.Open();
+               
+                LastCall.On(connection).Repeat.Once();
+                Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                Expect.Call(connection.CreateCommand()).Return(command);
+                command.CommandText = "some SQL statement";
+                LastCall.On(command).Repeat.Once();
+                if (timeout > 1)
+                {
+                    command.CommandTimeout = (timeout - 1);
+                    transaction.Commit();
+                } else
+                {
+                    transaction.Rollback();
+                }                
+                LastCall.On(transaction).Repeat.Once();
+                connection.Dispose();
+            }
+
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.TransactionTimeout = timeout;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+
+            try
+            {
+                tt.Execute(new TransactionWithTimeoutCallback(dbProvider));
+                if (timeout <= 1)
+                {
+                    Assert.Fail("Should have thrown TransactionTimedOutException");
+                }
+            } catch (TransactionTimedOutException)
+            {
+                if (timeout <=1 )
+                {
+                    //expected
+                } else
+                {
+                    throw;
+                }
+            }
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void TransactionWithExceptionOnBegin()
+        {
+            #region Mock setup
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));       
+            
+            // CreateConnection is called in AdoPlatformTransactionManager.DoBegin
+            Expect.Call(dbProvider.CreateConnection()).Throw(new TestSqlException("Cannot begin", "314"));     
+            
+
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            try
+            {
+                tt.Execute(new TransactionDelegate(TransactionWithExceptionNoOp));                
+            } catch (CannotCreateTransactionException)
+            {
+                // expected
+            }
+
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+
+            mocks.VerifyAll();
+        }
+
+        private object TransactionWithExceptionNoOp(ITransactionStatus status)
+        {
+            return null;
+        }
+
+        [Test]
+        public void TransactionWithExceptionOnCommit()
+        {
+            #region Mock setup
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            IDbTransaction transaction = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                connection.Open();
+                LastCall.On(connection).Repeat.Once();
+                Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                //standard tx timeout.
+                transaction.Commit();
+                LastCall.On(transaction).Throw(new TestSqlException("Cannot commit", "314"));
+                connection.Dispose();
+            }
+
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            
+            try
+            {
+                tt.Execute(new TransactionDelegate(TransactionWithExceptionNoOp));
+            } catch (TransactionSystemException)
+            {
+                //expected
+            }
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            mocks.VerifyAll();
+            
+        }
+
+
+        [Test]
+        public void TransactionWithExceptionOnCommitAndRollbackOnCommitFailure()
+        {
+            #region Mock Setup
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            IDbTransaction transaction = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                connection.Open();
+                LastCall.On(connection).Repeat.Once();
+                Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                transaction.Commit();
+                LastCall.On(transaction).Throw(new TestSqlException("Cannot commit", "314"));
+
+                transaction.Rollback();
+                LastCall.On(transaction).Repeat.Once();
+
+                connection.Dispose();
+            }
+            #endregion
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            tm.RollbackOnCommitFailure = true;
+            TransactionTemplate tt = new TransactionTemplate(tm);
+
+            try
+            {
+                tt.Execute(new TransactionDelegate(TransactionWithExceptionNoOp));
+            }
+            catch (TransactionSystemException)
+            {
+                //expected
+            }
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void TransactionWithExceptionOnRollback()
+        {
+            #region Mock Setup
+
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            IDbTransaction transaction = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                connection.Open();
+                LastCall.On(connection).Repeat.Once();
+                Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                //standard tx timeout.
+                transaction.Rollback();
+                LastCall.On(transaction).Throw(new TestSqlException("Cannot commit", "314"));
+
+                connection.Dispose();
+            }
+
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+
+            try
+            {
+                tt.Execute(new TransactionDelegate(TransactionWithExceptionOnRollbackMethod));
+            }
+            catch (TransactionSystemException)
+            {
+                //expected
+            }
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+
+            mocks.VerifyAll();
+
+        }
+
+        private object TransactionWithExceptionOnRollbackMethod(ITransactionStatus status)
+        {
+            status.RollbackOnly = true;
+            return null;
+        }
+
+        [Test]
+        public void TransactionWithPropagationSupports()
+        {
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.Supports;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+
+            tt.Execute(new TransactionWithPropagationSupportsCallback(dbProvider));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void TransactionWithPropagationNotSupported()
+        {
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.NotSupported;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+
+            tt.Execute(new TransactionWithPropagationNotSupportedCallback(dbProvider));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void TransactionWithPropagationNever()
+        {
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.Never;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+
+            tt.Execute(new TransactionWithPropagationNotSupportedCallback(dbProvider));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ExistingTransactionWithPropagationNestedNotSupported()
+        {
+            #region Mock setup
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            IDbTransaction transaction = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                connection.Open();
+                LastCall.On(connection).Repeat.Once();
+                Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                
+                transaction.Rollback();
+                LastCall.On(transaction).Repeat.Once();
+                connection.Dispose();
+            }
+
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.Nested;
+            
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            try
+            {
+                tt.Execute(new ExistingTransactionWithPropagationNestedCallback(dbProvider, tt));
+                Assert.Fail("Should have thrown NestedTransactionNotSupportedException");
+            } catch (NestedTransactionNotSupportedException)
+            {
+                // expected 
+            }
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void TransactionWithPropagationNested()
+        {
+            #region Mock setup
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            IDbTransaction transaction = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                connection.Open();
+                LastCall.On(connection).Repeat.Once();
+                Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);
+                //standard tx timeout.
+                transaction.Commit();
+                LastCall.On(transaction).Repeat.Once();
+                connection.Dispose();
+            }
+
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.Nested;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+
+            tt.Execute(new TransactionDelegate(TransactionWithPropagationNestedMethod));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            mocks.VerifyAll();
+
+
+        }
+
+        private object TransactionWithPropagationNestedMethod(ITransactionStatus status)
+        {
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            return null;
+        }
+
+        [Test]
+        public void TransactionWithPropagationNestedAndRollback()
+        {
+            #region Mock setup
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            IDbTransaction transaction = (IDbTransaction)mocks.CreateMock(typeof(IDbTransaction));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                connection.Open();
+                LastCall.On(connection).Repeat.Once();
+                Expect.Call(connection.BeginTransaction(IsolationLevel.ReadCommitted)).Return(transaction);               
+                transaction.Rollback();
+                LastCall.On(transaction).Repeat.Once();
+                connection.Dispose();
+            }
+
+            #endregion
+
+            mocks.ReplayAll();
+
+            AdoPlatformTransactionManager tm = new AdoPlatformTransactionManager(dbProvider);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.Nested;
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+
+            tt.Execute(new TransactionDelegate(TransactionWithPropagationNestedAndRollbackMethod));
+
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(dbProvider), "Hasn't thread db provider");
+            mocks.VerifyAll();
+
+
+        }
+
+        private object TransactionWithPropagationNestedAndRollbackMethod(ITransactionStatus status)
+        {
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            status.RollbackOnly = true;
+            return null;
+        }
+    }
+
+    internal class ExistingTransactionWithPropagationNestedCallback : ITransactionCallback
+    {
+        private IDbProvider dbProvider;
+        private TransactionTemplate tt;
+
+        public ExistingTransactionWithPropagationNestedCallback(IDbProvider dbProvider, TransactionTemplate transactionTemplate)
+        {
+            this.dbProvider = dbProvider;
+            tt = transactionTemplate;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            //TODO: Note no support for savepoints at this time (1.1), so can't check that a savepoint isn't present.
+            
+            tt.Execute(new ExistingTransactionWithPropagationNestedCallback2(dbProvider));
+
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            //TODO: Note no support for savepoints at this time (1.1), so can't check that a savepoint isn't present.
+            return null;
+        }
+    }
+
+    internal class ExistingTransactionWithPropagationNestedCallback2 : ITransactionCallback
+    {
+        private IDbProvider dbProvider;
+
+        public ExistingTransactionWithPropagationNestedCallback2(IDbProvider provider)
+        {
+            dbProvider = provider;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(dbProvider), "Has thread db provider");
+            Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive, "Synchronizations active");
+            Assert.IsTrue(!status.IsNewTransaction, "Isn't new transaction");
+            //TODO: Note no support for savepoints at this time (1.1), so can't check that a savepoint is present.
+            return null;
+        }
+    }
+
+    #region Supporting class for TransactionWithPropagationNotSupported
+    internal class TransactionWithPropagationNotSupportedCallback : ITransactionCallback
+    {
+        private IDbProvider provider;
+
+        public TransactionWithPropagationNotSupportedCallback(IDbProvider provider)
+        {
+            this.provider = provider;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(provider), "Hasn't thread db provider");
+            Assert.IsTrue(!status.IsNewTransaction, "Is not new transaction");
+            return null;
+        }
+    }
+    #endregion
+
+    #region Supporting class for TransactionWithPropagationSupports
+    internal class TransactionWithPropagationSupportsCallback : ITransactionCallback
+    {
+        private IDbProvider provider;
+
+        public TransactionWithPropagationSupportsCallback(IDbProvider provider)
+        {
+            this.provider = provider;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(provider), "Hasn't thread db provider");
+            Assert.IsTrue(!status.IsNewTransaction,"Is not new transaction");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsFalse(TransactionSynchronizationManager.ActualTransactionActive);
+            return null;
+        }
+    }
+    #endregion
+
+
+    #region Supporting class for TransactionWithTimeout
+
+    internal class TransactionWithTimeoutCallback : ITransactionCallback
+    {
+        private IDbProvider provider;
+        public TransactionWithTimeoutCallback(IDbProvider provider)
+        {
+            this.provider = provider;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            try
+            {
+                Thread.Sleep(1500);
+            } catch (Exception)
+            {
+                
+            }
+            try
+            {
+                IDbConnection con = ConnectionUtils.GetConnection(provider);
+                IDbCommand cmd = con.CreateCommand();
+                cmd.CommandText = "some SQL statement";
+                ConnectionUtils.ApplyTransactionTimeout(cmd, provider);
+
+            } catch (Exception e)
+            {
+                if (e.GetType() != typeof(TransactionTimedOutException))
+                {
+                    throw new DataAccessResourceFailureException("", e);
+                }
+                throw;
+            }
+            return null;
+        }
+    }
+    #endregion
+
+    #region Supporting class for PropagationRequiresNewWithExistingConnection
+
+    internal class PropagationRequiresNewWithExistingConnectionCallback : ITransactionCallback
+    {
+        private TransactionTemplate tt;
+        private IDbProvider dbProvider;
+        private IDbConnection connection;
+        private IDbConnection connection2;
+
+        public PropagationRequiresNewWithExistingConnectionCallback(TransactionTemplate transactionTemplate, IDbConnection connection, IDbConnection connection2, IDbProvider provider)
+        {
+            tt = transactionTemplate;
+            this.connection = connection;
+            this.connection2 = connection2;
+            dbProvider = provider;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive, "Synchronizations active");
+            Assert.AreSame(connection, ConnectionUtils.GetConnection(dbProvider));
+            Assert.AreSame(connection, ConnectionUtils.GetConnection(dbProvider));
+            tt.PropagationBehavior = TransactionPropagation.RequiresNew;
+            tt.ReadOnly = true;
+            tt.Execute(new PropagationRequiresNewWithExistingConnectionCallback2(dbProvider, connection2));
+            Assert.AreSame(connection, ConnectionUtils.GetConnection(dbProvider));
+            return null;
+        }
+    }
+
+    internal class PropagationRequiresNewWithExistingConnectionCallback2 : ITransactionCallback
+    {
+        private IDbProvider dbProvider;
+        private IDbConnection connection2;
+
+
+        public PropagationRequiresNewWithExistingConnectionCallback2(IDbProvider dbProvider, IDbConnection connection2)
+        {
+            this.dbProvider = dbProvider;
+            this.connection2 = connection2;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(dbProvider), "Has thread db provider");
+            Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive, "Synchronizations active");
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            Assert.AreSame(connection2, ConnectionUtils.GetConnection(dbProvider));
+            Assert.AreSame(connection2, ConnectionUtils.GetConnection(dbProvider));
+
+            return null;
+        }
+    }
+
+    #endregion
+
+    #region Supporting classes for PropagationNeverWithExistingTransaction
+
+    internal class PropagationNeverWithExistingTransactionCallback : ITransactionCallback
+    {
+        private TransactionTemplate innerTxTemplate;
+
+        public PropagationNeverWithExistingTransactionCallback(TransactionTemplate transactionTemplate)
+        {
+            innerTxTemplate = transactionTemplate;
+        }
+
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            innerTxTemplate.PropagationBehavior = TransactionPropagation.Never;
+            innerTxTemplate.Execute(new PropagationNeverWithExistingTransactionCallback2());
+            Assert.Fail("Should have thrown IllegalTransactionStateException");
+            return null;
+        }        
+    }
+
+    internal class PropagationNeverWithExistingTransactionCallback2 : ITransactionCallback
+    {
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.Fail("Should have thrown IllegalTransactionStateException");
+            return null;
+        }
+    }
+
+    #endregion
+
+    #region Supporting classes for PropagationNotSupportedWithExistingTransaction
+
+    internal class PropagationNotSupportedWithExistingTransactionCallback : ITransactionCallback
+    {
+        private TransactionTemplate innerTxTemplate;
+        private IDbProvider dbProvider;
+
+        public PropagationNotSupportedWithExistingTransactionCallback(TransactionTemplate transactionTemplate, IDbProvider provider)
+        {
+            innerTxTemplate = transactionTemplate;
+            dbProvider = provider;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive, "Synchronization active");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            innerTxTemplate.PropagationBehavior = TransactionPropagation.NotSupported;
+            innerTxTemplate.Execute(new PropagationNotSupportedWithExistingTransactionCallback2(dbProvider));
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+            return null;
+        }
+    }
+
+    internal class PropagationNotSupportedWithExistingTransactionCallback2 : ITransactionCallback
+    {
+        private IDbProvider provider;
+
+        public PropagationNotSupportedWithExistingTransactionCallback2(IDbProvider provider)
+        {
+            this.provider = provider;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(!TransactionSynchronizationManager.HasResource(provider), "Hasn't thread db provider");
+            Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive);
+            Assert.IsTrue(!status.IsNewTransaction, "Isn't new transaction");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsFalse(TransactionSynchronizationManager.ActualTransactionActive);
+            status.RollbackOnly = true;
+            return null;
+        }
+    }
+
+    #endregion
+
+    #region Supporting class for PropagationRequiresNewWithExistingTransactionAndUnrelatedFailingDataSource
+
+    internal class PropagationRequiresNewWithExistingTransactionAndUnrelatedFailingDataSourceCallback : ITransactionCallback
+    {
+        private TransactionTemplate innerTxTemplate;
+
+
+        public PropagationRequiresNewWithExistingTransactionAndUnrelatedFailingDataSourceCallback(TransactionTemplate transactionTemplate)
+        {
+            innerTxTemplate = transactionTemplate;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive, "Synchronization active");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+            innerTxTemplate.Execute(new PropagationRequiresNewWithExistingTransactionAndUnrelatedFailingDataSourceCallback2());
+            return null;
+        }
+    }
+
+    internal class PropagationRequiresNewWithExistingTransactionAndUnrelatedFailingDataSourceCallback2 : ITransactionCallback
+    {
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            status.RollbackOnly = true;
+            return null;
+        }
+    }
+
+    #endregion
+
+    #region Supporting class for PropagationRequiresNewWithExistingTransaction
+
+    internal class PropagationRequiresNewWithExistingTransactionCallback : ITransactionCallback
+    {
+        private TransactionTemplate innerTxTemplate;
+        private IDbProvider dbProvider;
+
+        public PropagationRequiresNewWithExistingTransactionCallback(TransactionTemplate transactionTemplate,
+                                                                     IDbProvider provider)
+        {
+            innerTxTemplate = transactionTemplate;
+            dbProvider = provider;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive, "Synchronization active");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+            innerTxTemplate.Execute(new PropagationRequiresNewWithExistingTransactionCallback2(dbProvider));
+
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+            return null;
+        }
+    }
+
+    internal class PropagationRequiresNewWithExistingTransactionCallback2 : ITransactionCallback
+    {
+        private IDbProvider dbProvider;
+
+        public PropagationRequiresNewWithExistingTransactionCallback2(IDbProvider dbProvider)
+        {
+            this.dbProvider = dbProvider;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(dbProvider), "Has thread connection");
+            Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive, "Synchronization active");
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+            status.RollbackOnly = true;
+            return null;
+        }
+    }
+
+    #endregion
+
+    #region Supporting class for TransactionCommit test
+
+    internal class TransactionCommitTxCallback : ITransactionCallback
+    {
+        private IDbProvider provider;
+
+        public TransactionCommitTxCallback(IDbProvider provider)
+        {
+            this.provider = provider;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(provider), "Has thread db provider");
+            Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive);
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            return null;
+        }
+    }
+
+    #endregion
+
+    #region Supporting class for TransactionRollback test
+
+    internal class TransactionRollbackTxCallback : ITransactionCallback
+    {
+        private IDbProvider provider;
+        private Exception exception;
+
+        public TransactionRollbackTxCallback(IDbProvider provider, Exception exception)
+        {
+            this.provider = provider;
+            this.exception = exception;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(provider), "Hasn't thread db provider");
+            Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive);
+            Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+            throw exception;
+        }
+    }
+
+    #endregion
+
+    #region Supporting class for ParticipatingTxWithRollbackOnly test
+
+    internal class ParticipatingTxWithRollbackOnlyTxCallback : ITransactionCallback
+    {
+        private TransactionTemplate innerTxTemplate;
+        private IDbProvider dbProvider;
+
+
+        public ParticipatingTxWithRollbackOnlyTxCallback(TransactionTemplate transactionTemplate, IDbProvider dbProvider)
+        {
+            innerTxTemplate = transactionTemplate;
+            this.dbProvider = dbProvider;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(!status.IsNewTransaction, "Is existing transaction");
+            Assert.IsFalse(status.RollbackOnly, "Is not rollback-only");
+            innerTxTemplate.Execute(new ParticipatingTxWithRollbackOnlyTxCallback2(dbProvider));
+            Assert.IsTrue(!status.IsNewTransaction, "Is existing transaction");
+            Assert.IsTrue(status.RollbackOnly, "Is rollback-only");
+            return null;
+        }
+    }
+
+    internal class ParticipatingTxWithRollbackOnlyTxCallback2 : ITransactionCallback
+    {
+        private IDbProvider dbProvider;
+
+        public ParticipatingTxWithRollbackOnlyTxCallback2(IDbProvider dbProvider)
+        {
+            this.dbProvider = dbProvider;
+        }
+
+        public object DoInTransaction(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(dbProvider), "Has thread connection");
+            Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive, "Synchronization active");
+            Assert.IsTrue(!status.IsNewTransaction, "Is existing transaction");
+            status.RollbackOnly = true;
+            return null;
+        }
+    }
+
+    #endregion
+
+
+
+    #region Helper class
+
+    internal class TestTransactionSynchronization : ITransactionSynchronization
+    {
+        private IDbProvider provider;
+        private TransactionSynchronizationStatus status;
+
+        public bool beforeCommitCalled;
+        public bool beforeCompletionCalled;
+        public bool afterCommitCalled;
+        public bool afterCompletionCalled;
+
+        public TestTransactionSynchronization(IDbProvider provider,
+                                              TransactionSynchronizationStatus synchronizationStatus)
+        {
+            this.provider = provider;
+            status = synchronizationStatus;
+        }
+
+
+        public void Suspend()
+        {
+        }
+
+        public void Resume()
+        {
+        }
+
+        public void BeforeCommit(bool readOnly)
+        {
+            if (status == TransactionSynchronizationStatus.Committed)
+            {
+                Assert.Fail("Should never be called");
+            }
+            Assert.IsFalse(beforeCommitCalled);
+            beforeCommitCalled = true;
+        }
+
+        public void AfterCommit()
+        {
+            if (status != TransactionSynchronizationStatus.Committed)
+            {
+                Assert.Fail("Should never be called");
+            }
+            Assert.IsFalse(afterCommitCalled);
+            afterCommitCalled = true;
+        }
+
+        public void BeforeCompletion()
+        {
+            Assert.IsFalse(beforeCompletionCalled);
+            beforeCompletionCalled = true;
+        }
+
+        public void AfterCompletion(TransactionSynchronizationStatus syncStatus)
+        {
+            Assert.IsFalse(afterCompletionCalled);
+            afterCompletionCalled = true;
+            Assert.IsTrue(syncStatus == status);
+            Assert.IsTrue(TransactionSynchronizationManager.HasResource(provider));
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Data/AutoDeclarativeTxTests.cs b/test/Spring/Spring.Data.Tests/Data/AutoDeclarativeTxTests.cs
new file mode 100644
index 00000000..89cb582e
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/AutoDeclarativeTxTests.cs
@@ -0,0 +1,95 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Aop.Framework;
+using Spring.Aop.Framework.DynamicProxy;
+using Spring.Aop.Support;
+using Spring.Context;
+using Spring.Context.Support;
+using Common.Logging;
+using Common.Logging.Simple;
+using Spring.Objects;
+using Spring.Transaction;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// Test case that uses the approach of automatically creating 
+	/// declarative transaction interceptors for objects identified via means
+	/// of transaction attributes.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: AutoDeclarativeTxTests.cs,v 1.4 2007/08/21 19:26:04 markpollack Exp $</version>
+	[TestFixture]
+	public class AutoDeclarativeTxTests 
+	{
+        private IApplicationContext ctx;
+
+        [SetUp]
+        public void SetUp()
+        {
+            //LogManager.Adapter = new ConsoleOutLoggerFactoryAdapter();
+            ctx =
+                new XmlApplicationContext("assembly://Spring.Data.Tests/Spring.Data/AutoDeclarativeTxTests.xml");
+            
+        }
+
+
+
+        [Test]
+        public void CoordinatorDeclarativeWithAttributes()
+        {
+            ITestCoord coord = ctx["testCoordinator"] as ITestCoord;
+            Assert.IsNotNull(coord);
+            CallCountingTransactionManager ccm = ctx["transactionManager"] as CallCountingTransactionManager;
+            Assert.IsNotNull(ccm);
+            LoggingAroundAdvice advice = (LoggingAroundAdvice)ctx["consoleLoggingAroundAdvice"];
+            Assert.IsNotNull(advice);
+
+            ITestObjectMgr testObjectMgr = ctx["testObjectManager"] as ITestObjectMgr;
+            Assert.IsNotNull(testObjectMgr);
+            //Proxied due to NameMatchMethodPointcutAdvisor
+            Assert.IsTrue(AopUtils.IsAopProxy(coord));
+
+            //Proxied due to DefaultAdvisorAutoProxyCreator
+            Assert.IsTrue(AopUtils.IsAopProxy(testObjectMgr));
+
+
+            TestObject to1 = new TestObject("Jack", 7);
+            TestObject to2 = new TestObject("Jill", 6);
+
+            Assert.AreEqual(0, ccm.begun);
+            Assert.AreEqual(0, ccm.commits);
+            Assert.AreEqual(0, advice.numInvoked);
+            
+            coord.WorkOn(to1,to2);
+            
+            Assert.AreEqual(1, ccm.begun);
+            Assert.AreEqual(1, ccm.commits);
+            Assert.AreEqual(1, advice.numInvoked);
+        }
+
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Data/AutoDeclarativeTxTests.xml b/test/Spring/Spring.Data.Tests/Data/AutoDeclarativeTxTests.xml
new file mode 100644
index 00000000..c53a6496
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/AutoDeclarativeTxTests.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<objects xmlns='http://www.springframework.net'
+         xmlns:d="http://www.springframework.net/database">
+
+  
+ 
+    <object id="transactionManager"  type="Spring.Transaction.CallCountingTransactionManager, Spring.Data.Tests">
+
+    </object>
+        
+
+    <!-- declarative [Transaction] attributes applies here -->
+    <object id="testObjectManager" type="Spring.Data.TestObjectMgr, Spring.Data.Tests">
+
+    </object>
+
+    
+    <object id="consoleLoggingAroundAdvice" type="Spring.Data.LoggingAroundAdvice, Spring.Data.Tests"/>
+
+
+    <object id="testCoordinator" type="Spring.Data.TestCoord, Spring.Data.Tests">
+      <property name="TestObjectMgr" ref="testObjectManager"/>
+    </object>
+
+
+
+    <object id="aroundAdvisor" type="Spring.Aop.Support.NameMatchMethodPointcutAdvisor, Spring.Aop">
+      <property name="Advice" ref="consoleLoggingAroundAdvice"/>
+      <property name="MappedNames">
+        <list>
+          <value>WorkOn</value>
+        </list>
+      </property>
+    </object>
+
+  <!--
+  <object id="testObjManagerProxy" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+    <property name="target" ref="testObjectManager"/>
+    <property name="InterceptorNames">
+      <list>
+        <value>aroundAdvisor</value>
+      </list>
+    </property>
+  </object>
+  -->
+
+  <!-- The rest of the config file is common no matter how many objects you add -->
+  <!-- that you would like to have declarative tx management applied to -->
+
+  <object id="autoProxyCreator"
+          type="Spring.Aop.Framework.AutoProxy.DefaultAdvisorAutoProxyCreator, Spring.Aop">
+  </object>
+
+  <object id="transactionAdvisor"
+          type="Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor, Spring.Data"
+          autowire="constructor">
+  </object>
+
+
+  <object id="transactionInterceptor"
+          type="Spring.Transaction.Interceptor.TransactionInterceptor, Spring.Data" autowire="byType">
+  </object>
+    
+  <object id="attributeTransactionAttributeSource"
+          type="Spring.Transaction.Interceptor.AttributesTransactionAttributeSource, Spring.Data">    
+  </object>
+
+
+
+
+    
+</objects>
+
diff --git a/test/Spring/Spring.Data.Tests/Data/Common/AdditionalProviders.xml b/test/Spring/Spring.Data.Tests/Data/Common/AdditionalProviders.xml
new file mode 100644
index 00000000..8252971e
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/Common/AdditionalProviders.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns='http://www.springframework.net'>
+
+  <object id="Test-SqlServer-2.0" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0" />
+        <constructor-arg name="assemblyName" value="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="connectionType" value="System.Data.SqlClient.SqlConnection, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandType" value="System.Data.SqlClient.SqlCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="parameterType" value="System.Data.SqlClient.SqlParameter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="dataAdapterType" value="System.Data.SqlClient.SqlDataAdapter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandBuilderType" value="System.Data.SqlClient.SqlCommandBuilder, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="System.Data.SqlDbType, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="parameterDbTypeProperty" value="SqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="@"/>
+        <constructor-arg name="exceptionType" value="System.Data.SqlClient.SqlException, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Errors[0].Number.ToString()"/>
+
+        <!-- TODO select form system db all errors that have 'incorrect syntax' at the start of the error string-->
+        <property name="ErrorCodes.BadSqlGrammarCodes">
+          <value>156,170,207,208</value>
+        </property>
+        <property name="ErrorCodes.PermissionDeniedCodes">
+          <value>229</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>544,2627,8114,8115</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1205</value>
+        </property>
+      </object>
+    </constructor-arg>
+
+  </object>
+
+  <object id="Test-SqlServer-2.0-BadErrorCodeExpression" type="Spring.Data.Common.DbProvider, Spring.Data" singleton="false">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0" />
+        <constructor-arg name="assemblyName" value="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="connectionType" value="System.Data.SqlClient.SqlConnection, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandType" value="System.Data.SqlClient.SqlCommand, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="parameterType" value="System.Data.SqlClient.SqlParameter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="dataAdapterType" value="System.Data.SqlClient.SqlDataAdapter, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandBuilderType" value="System.Data.SqlClient.SqlCommandBuilder, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="System.Data.SqlDbType, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="parameterDbTypeProperty" value="SqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="@"/>
+        <constructor-arg name="exceptionType" value="System.Data.SqlClient.SqlException, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="useParameterPrefixInSql" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="156"/>
+
+        <!-- TODO select form system db all errors that have 'incorrect syntax' at the start of the error string-->
+        <property name="ErrorCodes.BadSqlGrammarCodes">
+          <value>156,170,207,208</value>
+        </property>
+        <property name="ErrorCodes.PermissionDeniedCodes">
+          <value>229</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>544,2627,8114,8115</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1205</value>
+        </property>
+      </object>
+    </constructor-arg>
+
+  </object>
+  
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Data/Common/AdditonalProviders.xml b/test/Spring/Spring.Data.Tests/Data/Common/AdditonalProviders.xml
new file mode 100644
index 00000000..066dd068
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/Common/AdditonalProviders.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns='http://www.springframework.net'>
+  <object id="MySqlPersonal" type="Spring.Data.Common.DbProvider, Spring.Data" lazy-init="true">
+    <constructor-arg name="dbMetaData">
+      <object type="Spring.Data.Common.DbMetadata">
+        <constructor-arg name="productName" value="MySQL, MySQL provider 1.0.7.30072"  />
+        <constructor-arg name="assemblyName" value="MySql.Data, Version=1.0.7.30072, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+        <constructor-arg name="connectionType" value="MySql.Data.MySqlClient.MySqlConnection"/>
+        <constructor-arg name="commandType" value="MySql.Data.MySqlClient.MySqlCommand"/>
+        <constructor-arg name="parameterType" value="MySql.Data.MySqlClient.MySqlParameter"/>
+        <constructor-arg name="dataAdapterType" value="MySql.Data.MySqlClient.MySqlDataAdapter"/>
+        <constructor-arg name="commandBuilderType" value="MySql.Data.MySqlClient.MySqlCommandBuilder"/>
+        <constructor-arg name="commandBuilderDeriveParametersMethod" value="DeriveParameters"/>
+        <constructor-arg name="parameterDbType" value="MySql.Data.MySqlClient.MySqlDbType"/>
+        <constructor-arg name="parameterDbTypeProperty" value="MySqlDbType"/>
+        <constructor-arg name="parameterIsNullableProperty" value="IsNullable"/>
+        <constructor-arg name="parameterNamePrefix" value="?"/>
+        <constructor-arg name="exceptionType" value="MySql.Data.MySqlClient.MySqlException"/>
+        <constructor-arg name="useParameterNamePrefixInParameterCollection" value="true"/>
+        <constructor-arg name="bindByName" value="true"/>
+        <!-- this is only true for .net 1.1 kept it here just in case we want to revert back to this strategy for
+             obtaining error codes-->
+        <constructor-arg name="errorCodeExceptionExpression" value="Number.ToString()"/>
+
+        <property name="ErrorCodes.badSqlGrammarCodes">
+          <value>1054,1064,1146</value>
+        </property>
+        <property name="ErrorCodes.DataAccessResourceFailureCodes">
+          <value>1</value>
+        </property>
+        <property name="ErrorCodes.DataIntegrityViolationCodes">
+          <value>1062</value>
+        </property>
+        <property name="ErrorCodes.CannotAcquireLockCodes">
+          <value>1205</value>
+        </property>
+        <property name="ErrorCodes.DeadlockLoserCodes">
+          <value>1213</value>
+        </property>
+      </object>
+    </constructor-arg>
+  </object>
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Data/Common/DbParametersTests.cs b/test/Spring/Spring.Data.Tests/Data/Common/DbParametersTests.cs
new file mode 100644
index 00000000..1506bbb8
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/Common/DbParametersTests.cs
@@ -0,0 +1,79 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if (NET_2_0)
+#region Imports
+
+using System.Data;
+using System.Data.OracleClient;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// This class contains tests for DbParameters
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: DbParametersTests.cs,v 1.3 2007/12/06 06:58:54 markpollack Exp $</version>
+    [TestFixture]
+    public class DbParametersTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+        }
+
+        [Test]
+        public void OracleClient()
+        {
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.OracleClient");
+            DbParameters dbParameters = new DbParameters(dbProvider);
+            dbParameters.Add("p1", DbType.String);
+            IDataParameter parameter = dbParameters[0];
+            Assert.AreEqual("p1", parameter.ParameterName);
+            dbParameters.SetValue("p1", "foo");
+            IDbDataParameter springParameter = dbParameters.GetValue("p1") as IDbDataParameter;
+            Assert.IsNotNull(springParameter);
+            Assert.AreEqual("foo", springParameter.Value);
+        }
+
+        [Test]
+        public void SqlClient()
+        {
+            IDbProvider dbProvider = DbProviderFactory.GetDbProvider("System.Data.SqlClient");
+            DbParameters dbParameters = new DbParameters(dbProvider);
+            dbParameters.Add("p1", DbType.String);
+            IDataParameter parameter = dbParameters[0];
+            Assert.AreEqual("@p1", parameter.ParameterName);
+            dbParameters.SetValue("p1", "foo");
+            IDbDataParameter springParameter = dbParameters.GetValue("p1") as IDbDataParameter;
+            Assert.IsNotNull(springParameter);
+            Assert.AreEqual("foo", springParameter.Value);
+        }
+
+        private static void TestParameterNaming(DbParameters dbParameters)
+        {
+
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Data/Common/DbProviderFactoryTests.cs b/test/Spring/Spring.Data.Tests/Data/Common/DbProviderFactoryTests.cs
new file mode 100644
index 00000000..796bb27b
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/Common/DbProviderFactoryTests.cs
@@ -0,0 +1,250 @@
+#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.Globalization;
+using System.Reflection;
+using System.Threading;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Core.IO;
+using Spring.Threading;
+using Spring.Util;
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// Test for loading of DbProviders
+    /// </summary>
+    /// <author>Mark Pollack (.NET)</author>
+    /// <version>$Id: DbProviderFactoryTests.cs,v 1.13 2008/04/02 19:37:20 markpollack Exp $</version>       
+    [TestFixture]
+    public class DbProviderFactoryTests
+    {
+        #region Helper classes for threading tests
+
+        public class AsyncTestDbProviderFactory : AsyncTestTask
+        {
+            private string providerName;
+
+            public AsyncTestDbProviderFactory(int iterations, string providerName)
+                : base(iterations)
+            {
+                this.providerName = providerName;
+            }
+
+            public override void DoExecute()
+            {
+                object result = DbProviderFactory.GetDbProvider(providerName);
+            }
+        }
+
+        #endregion
+
+        private static string altConfig = "assembly://Spring.Data.Tests/Spring.Data.Common/AdditionalProviders.xml";
+
+
+        [SetUp]
+        public void Setup()
+        {
+            DbProviderFactory.DBPROVIDER_ADDITIONAL_RESOURCE_NAME = altConfig; 
+        }
+
+#if NET_2_0   
+     
+        [Test]
+        public void ThreadSafety()
+        {
+            AsyncTestTask t1 = new AsyncTestDbProviderFactory(1000, "SqlServer-2.0").Start();
+            AsyncTestTask t2 = new AsyncTestDbProviderFactory(1000, "SqlServer-2.0").Start();
+            AsyncTestTask t3 = new AsyncTestDbProviderFactory(1000, "SqlServer-2.0").Start();
+            AsyncTestTask t4 = new AsyncTestDbProviderFactory(1000, "SqlServer-2.0").Start();
+            
+            t1.AssertNoException();
+            t2.AssertNoException();
+            t3.AssertNoException();
+            t4.AssertNoException();
+
+        }
+
+        [Test]
+        [Ignore("Can't guarantee test order")]
+        public void AdditionalResourceName()
+        {
+           
+            IDbProvider provider = DbProviderFactory.GetDbProvider("Test-SqlServer-2.0");
+            Assert.IsNotNull(provider);
+        }
+
+        [Test]
+        [Ignore("Can't guarantee test order")]
+        public void BadErrorExpression()
+        {
+
+            IDbProvider provider = DbProviderFactory.GetDbProvider("Test-SqlServer-2.0-BadErrorCodeExpression");
+            Assert.IsNotNull(provider);
+            string errorCode = provider.ExtractError(new Exception("foo"));
+            Assert.AreEqual("156",errorCode);
+        }
+
+        [Test]
+        public void DefaultInstanceWithSqlServer2005()
+        {
+            Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", false);
+            IApplicationContext ctx = DbProviderFactory.ApplicationContext;            
+            Thread.CurrentThread.CurrentCulture = new CultureInfo("tr-TR", false);
+            IDbProvider provider = DbProviderFactory.GetDbProvider("SqlServer-2.0");
+            AssertIsSqlServer2005(provider);
+            provider = DbProviderFactory.GetDbProvider("System.Data.SqlClient");
+            AssertIsSqlServer2005(provider);
+            Assert.IsNull(provider.ConnectionString);
+            Assert.IsNotNull(provider.CreateCommand());
+            Assert.IsNotNull(provider.CreateCommandBuilder());
+            Assert.IsNotNull(provider.CreateConnection());
+            Assert.IsNotNull(provider.CreateDataAdapter());
+            Assert.IsNotNull(provider.CreateParameter());
+            Assert.AreEqual("@Foo", provider.CreateParameterName("Foo"));
+        }
+        
+ 
+        [Test]
+        public void DefaultInstanceWithOleDb20()
+        {
+            IDbProvider provider = DbProviderFactory.GetDbProvider("OleDb-2.0");
+            Assert.AreEqual("OleDb, provider V2.0.0.0 in framework .NET V2", provider.DbMetadata.ProductName);
+            Assert.IsNotNull(provider.CreateCommand());
+            Assert.IsNotNull(provider.CreateCommandBuilder());
+            Assert.IsNotNull(provider.CreateConnection());
+            Assert.IsNotNull(provider.CreateDataAdapter());
+            Assert.IsNotNull(provider.CreateParameter());
+            Assert.AreEqual("?", provider.CreateParameterName("Foo"));
+        }
+        
+        [Test]
+        public void DefaultInstanceWithMicrsoftOracleClient20()
+        {
+            IDbProvider provider = DbProviderFactory.GetDbProvider("OracleClient-2.0");
+            Assert.AreEqual("Oracle, Microsoft provider V2.0.0.0", provider.DbMetadata.ProductName);
+            Assert.IsNotNull(provider.CreateCommand());
+            Assert.IsNotNull(provider.CreateCommandBuilder());
+            Assert.IsNotNull(provider.CreateConnection());
+            Assert.IsNotNull(provider.CreateDataAdapter());
+            Assert.IsNotNull(provider.CreateParameter());
+            Assert.AreEqual(":Foo", provider.CreateParameterName("Foo"));
+        }
+#endif
+       
+        [Test]   
+        [Ignore("until find out if can add oracle.dll to cvs repository")]
+        public void DefaultInstanceWithOracleClient20()
+        {
+            IDbProvider provider = DbProviderFactory.GetDbProvider("OracleODP-2.0");
+            Assert.AreEqual("Oracle, Oracle provider V2.102.2.20", provider.DbMetadata.ProductName);
+            Assert.IsNotNull(provider.CreateCommand());
+            Assert.IsNotNull(provider.CreateCommandBuilder());
+            Assert.IsNotNull(provider.CreateConnection());
+            Assert.IsNotNull(provider.CreateDataAdapter());
+            Assert.IsNotNull(provider.CreateParameter());
+            Assert.AreEqual(":Foo", provider.CreateParameterName("Foo")); 
+
+        }
+
+        /*
+        [Test]
+        public void DefaultInstanceWithMySql()
+        {
+            DbProviderFactory.DBPROVIDER_ADDITIONAL_RESOURCE_NAME =
+                "assembly://Spring.Data.Tests/Spring.Data.Common/AdditonalProviders.xml";
+            IDbProvider provider = DbProviderFactory.GetDbProvider("MySqlPersonal");
+            Assert.AreEqual("MySQL, MySQL provider 1.0.7.30072", provider.DbMetadata.ProductName);
+
+        }
+         
+        */
+
+        [Test]
+        public void TestDb2()
+        {
+            IApplicationContext ctx = DbProviderFactory.ApplicationContext;
+            string[] dbProviderNames = ctx.GetObjectNamesForType(typeof(IDbProvider));
+            Console.WriteLine(
+                String.Format("{0} DbProviders Available. [{1}]", dbProviderNames.Length,
+                              StringUtils.ArrayToCommaDelimitedString(dbProviderNames)));
+
+        }
+
+
+#if NET_1_1
+
+        [Test]
+        public void DefaultInstanceWithOleDb11()
+        {
+            IDbProvider provider = DbProviderFactory.GetDbProvider("OleDb-1.1");
+            Assert.AreEqual("OleDb, provider V1.0.5000.0 in framework .NET V1.1", provider.DbMetadata.ProductName);
+            Assert.IsNotNull(provider.CreateCommand());
+            Assert.IsNotNull(provider.CreateCommandBuilder());
+            Assert.IsNotNull(provider.CreateConnection());
+            Assert.IsNotNull(provider.CreateDataAdapter());
+            Assert.IsNotNull(provider.CreateParameter());
+            Assert.AreEqual("?", provider.CreateParameterName("Foo"));
+        }
+
+        [Test]
+        public void DefaultInstanceWithSqlServer2000()
+        {
+            IDbProvider provider = DbProviderFactory.GetDbProvider("SqlServer-1.1");
+            AssertIsSqlServer2000(provider);
+            Assert.IsNull(provider.ConnectionString);
+            Assert.IsNotNull(provider.CreateCommand());
+            Assert.IsNotNull(provider.CreateCommandBuilder());
+            Assert.IsNotNull(provider.CreateConnection());
+            Assert.IsNotNull(provider.CreateDataAdapter());
+            Assert.IsNotNull(provider.CreateParameter());
+            Assert.AreEqual("@Foo", provider.CreateParameterName("Foo"));
+        }
+
+        private void AssertIsSqlServer2000(IDbProvider provider)
+        {
+            Assert.AreEqual("Microsoft SQL Server, provider V1.0.5000.0 in framework .NET V1.1",
+                            provider.DbMetadata.ProductName);
+            AssertCommonSqlServerErrorCodes(provider);
+        }
+#endif
+        private void AssertIsSqlServer2005(IDbProvider provider)
+        {
+            Assert.AreEqual("Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0",
+                            provider.DbMetadata.ProductName);
+            AssertCommonSqlServerErrorCodes(provider);
+        }
+
+        private static void AssertCommonSqlServerErrorCodes(IDbProvider provider)
+        {
+            ErrorCodes codes = provider.DbMetadata.ErrorCodes;
+            Assert.IsTrue(codes.BadSqlGrammarCodes.Length > 0);
+            Assert.IsTrue(codes.DataIntegrityViolationCodes.Length > 0);
+            // This had better be a Bad SQL Grammar code
+            Assert.IsTrue(Array.IndexOf(codes.BadSqlGrammarCodes, "156") >= 0);
+            // This had better NOT be
+            Assert.IsFalse(Array.IndexOf(codes.BadSqlGrammarCodes, "1xx56") >= 0);
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Data/Common/UserCredentialsDbProviderTests.cs b/test/Spring/Spring.Data.Tests/Data/Common/UserCredentialsDbProviderTests.cs
new file mode 100644
index 00000000..199e744b
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/Common/UserCredentialsDbProviderTests.cs
@@ -0,0 +1,114 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System.Data;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+#endregion
+
+namespace Spring.Data.Common
+{
+    /// <summary>
+    /// This class contains tests for UserCredentialsDbProvider
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: UserCredentialsDbProviderTests.cs,v 1.1 2008/01/29 18:17:48 markpollack Exp $</version>
+    [TestFixture]
+    public class UserCredentialsDbProviderTests
+    {
+        private MockRepository mocks;
+
+        [SetUp]
+        public void Setup()
+        {
+            mocks = new MockRepository();
+        }
+
+        [Test]
+        public void StaticCredentials()
+        {
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                Expect.Call(dbProvider.ConnectionString).Return(
+                            @"Data Source=MARKT60\SQL2005;Database=Spring;Trusted_Connection=False");
+                Expect.Call(connection.ConnectionString = @"Data Source=MARKT60\SQL2005;Database=Spring;Trusted_Connection=False;User ID=springqa;Password=springqa");
+            }
+
+            mocks.ReplayAll();
+
+            UserCredentialsDbProvider provider = new UserCredentialsDbProvider();
+            provider.TargetDbProvider = dbProvider;
+            provider.Username = "User ID=springqa";
+            provider.Password = "Password=springqa";
+            Assert.AreEqual(connection, provider.CreateConnection());
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void NoCredentials()
+        {
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+            }
+
+            mocks.ReplayAll();
+            
+            UserCredentialsDbProvider provider = new UserCredentialsDbProvider();
+            provider.TargetDbProvider = dbProvider;
+            Assert.AreEqual(connection, provider.CreateConnection());
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ThreadBoundCredentials()
+        {
+            IDbProvider dbProvider = (IDbProvider)mocks.CreateMock(typeof(IDbProvider));
+            IDbConnection connection = (IDbConnection)mocks.CreateMock(typeof(IDbConnection));
+            using (mocks.Ordered())
+            {
+                Expect.Call(dbProvider.CreateConnection()).Return(connection);
+                Expect.Call(dbProvider.ConnectionString).Return(
+                            @"Data Source=MARKT60\SQL2005;Database=Spring;Trusted_Connection=False");
+                Expect.Call(connection.ConnectionString = @"Data Source=MARKT60\SQL2005;Database=Spring;Trusted_Connection=False;User ID=springqa;Password=springqa");
+            }
+
+            mocks.ReplayAll();
+
+            UserCredentialsDbProvider provider = new UserCredentialsDbProvider();
+            provider.TargetDbProvider = dbProvider;
+            provider.SetCredentialsForCurrentThread("User ID=springqa", "Password=springqa");
+            Assert.AreEqual(connection, provider.CreateConnection());
+
+            mocks.VerifyAll();
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Data/Core/ServiceDomainTransactionManagerTests.cs b/test/Spring/Spring.Data.Tests/Data/Core/ServiceDomainTransactionManagerTests.cs
new file mode 100644
index 00000000..0805b5ef
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/Core/ServiceDomainTransactionManagerTests.cs
@@ -0,0 +1,274 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+
+#if (!NET_1_0)
+
+#region Imports
+
+using System;
+using System.EnterpriseServices;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Spring.Data.Support;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data.Core
+{
+    /// <summary>
+    /// This class contains tests for ServiceDomainTransactionManager
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: ServiceDomainTransactionManagerTests.cs,v 1.5 2007/12/07 07:31:05 markpollack Exp $</version>
+    [TestFixture]
+    public class ServiceDomainTransactionManagerTests
+    {
+        private MockRepository mocks;
+
+        [SetUp]
+        public void Setup()
+        {
+            mocks = new MockRepository();
+        }
+
+        [Test]
+        public void TransactionCommit()
+        {
+            #region Mock Setup
+            IServiceDomainAdapter txAdapter = (IServiceDomainAdapter) mocks.CreateMock(typeof (IServiceDomainAdapter));
+            using (mocks.Ordered())
+            {
+                Expect.Call(txAdapter.IsInTransaction).Return(false);
+                SimpleServiceConfig serviceConfig = new SimpleServiceConfig();
+                ConfigureServiceConfig(serviceConfig, true);
+                txAdapter.Enter(serviceConfig);
+
+                //ProcessCommit - status.GlobalRollbackOnly check
+                Expect.Call(txAdapter.MyTransactionVote).Return(TransactionVote.Commit);
+                //DoCommit      - status.GlobalRollbackOnly check
+                Expect.Call(txAdapter.MyTransactionVote).Return(TransactionVote.Commit);
+
+                Expect.Call(txAdapter.IsInTransaction).Return(true);
+                //DoCommit      - check to call SetComplete or SetAbort
+                Expect.Call(txAdapter.MyTransactionVote).Return(TransactionVote.Commit);
+                txAdapter.SetComplete();
+                Expect.Call(txAdapter.Leave()).Return(TransactionStatus.Commited);
+
+            }
+            #endregion
+
+            mocks.ReplayAll();
+
+            IPlatformTransactionManager tm = new ServiceDomainPlatformTransactionManager(txAdapter);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.Execute(new TransactionDelegate(TransactionCommitMethod));
+
+            Assert.IsFalse(TransactionSynchronizationManager.SynchronizationActive);
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+
+            mocks.VerifyAll();
+
+        }
+
+        private object TransactionCommitMethod(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive);
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            return null;
+        }
+
+        [Test]
+        public void TransactionRollback()
+        {
+            #region Mock Setup
+            IServiceDomainAdapter txAdapter = (IServiceDomainAdapter)mocks.CreateMock(typeof(IServiceDomainAdapter));
+            using (mocks.Ordered())
+            {
+
+                Expect.Call(txAdapter.IsInTransaction).Return(false);
+                SimpleServiceConfig serviceConfig = new SimpleServiceConfig();
+                ConfigureServiceConfig(serviceConfig, true);
+                txAdapter.Enter(serviceConfig);
+                Expect.Call(txAdapter.IsInTransaction).Return(true);
+                txAdapter.SetAbort();
+                Expect.Call(txAdapter.Leave()).Return(TransactionStatus.Commited);
+
+            }
+            #endregion
+
+            mocks.ReplayAll();
+
+            IPlatformTransactionManager tm = new ServiceDomainPlatformTransactionManager(txAdapter);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            Exception ex = new ArgumentException("test exception");
+            try
+            {
+                tt.Execute(new TransactionRollbackTxCallback(ex));
+                Assert.Fail("Should have thrown exception");
+            }
+            catch (ArgumentException e)
+            {
+                Assert.AreEqual(ex, e);
+            }
+
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+
+            mocks.VerifyAll();
+        }
+
+
+        [Test]
+        public void PropagationRequiresNewWithExistingTransaction()
+        {
+            #region Mock Setup
+            IServiceDomainAdapter txAdapter = (IServiceDomainAdapter)mocks.CreateMock(typeof(IServiceDomainAdapter));
+            using (mocks.Ordered())
+            {
+
+                Expect.Call(txAdapter.IsInTransaction).Return(false);
+                SimpleServiceConfig serviceConfig = new SimpleServiceConfig();
+                ConfigureServiceConfig(serviceConfig, true);
+                txAdapter.Enter(serviceConfig);
+
+
+                Expect.Call(txAdapter.IsInTransaction).Return(true);
+                // inner tx
+                ConfigureServiceConfig(serviceConfig, false);
+                serviceConfig.TransactionOption = TransactionOption.RequiresNew;
+                serviceConfig.IsolationLevel = TransactionIsolationLevel.ReadCommitted;
+                txAdapter.Enter(serviceConfig);
+                Expect.Call(txAdapter.IsInTransaction).Return(true);
+                txAdapter.SetAbort();
+                Expect.Call(txAdapter.Leave()).Return(TransactionStatus.Aborted);
+                // innter tx aborted
+
+
+                //ProcessCommit - status.GlobalRollbackOnly check
+                Expect.Call(txAdapter.MyTransactionVote).Return(TransactionVote.Commit);
+                //DoCommit      - status.GlobalRollbackOnly check
+                Expect.Call(txAdapter.MyTransactionVote).Return(TransactionVote.Commit);
+
+                Expect.Call(txAdapter.IsInTransaction).Return(true);
+                //DoCommit      - check to call SetComplete or SetAbort
+                Expect.Call(txAdapter.MyTransactionVote).Return(TransactionVote.Commit);
+                txAdapter.SetComplete();
+
+                Expect.Call(txAdapter.Leave()).Return(TransactionStatus.Commited);
+
+            }
+            #endregion 
+
+            mocks.ReplayAll();
+
+            IPlatformTransactionManager tm = new ServiceDomainPlatformTransactionManager(txAdapter);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.RequiresNew;
+            tt.Execute(new PropagationRequiresNewWithExistingTransactionCallbackSD(tt));
+            mocks.VerifyAll();
+        }
+
+        #region Helper Methods
+        private SimpleServiceConfig ConfigureServiceConfig(SimpleServiceConfig serviceConfig, bool standardIsolationAndProp)
+        {
+            serviceConfig.TransactionDescription = null;
+
+            serviceConfig.TrackingEnabled = true;
+            serviceConfig.TrackingAppName = "Spring.NET";
+            serviceConfig.TrackingComponentName = "ServiceDomainPlatformTransactionManager";
+            if (standardIsolationAndProp)
+            {
+                serviceConfig.TransactionOption = TransactionOption.Required;
+                serviceConfig.IsolationLevel = TransactionIsolationLevel.ReadCommitted;
+            }
+            return serviceConfig;
+
+        }
+        #endregion
+
+
+        #region Supporting class for TransactionRollback test
+
+        internal class TransactionRollbackTxCallback : ITransactionCallback
+        {
+            private Exception exception;
+
+            public TransactionRollbackTxCallback(Exception exception)
+            {
+                this.exception = exception;
+            }
+
+            public object DoInTransaction(ITransactionStatus status)
+            {
+                Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive);
+                Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+                Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+                throw exception;
+            }
+        }
+
+        #endregion
+
+        #region Supporting class for PropagationRequiresNewWithExistingTransactionCallback test
+        internal class PropagationRequiresNewWithExistingTransactionCallbackSD : ITransactionCallback
+        {
+            private TransactionTemplate tt;
+
+            public PropagationRequiresNewWithExistingTransactionCallbackSD(TransactionTemplate tt)
+            {
+                this.tt = tt;
+            }
+
+            public object DoInTransaction(ITransactionStatus status)
+            {
+                Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+                Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive, "Synchronization active");
+                Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+                Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+                tt.Execute(new TransactionDelegate(TransactionMethod));
+                Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+                Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+                Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+                return null;
+            }
+
+            private object TransactionMethod(ITransactionStatus status)
+            {
+                Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive, "Synchronization active");
+                Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+                Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+                Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+                status.RollbackOnly = true;
+                return null; 
+            }
+        }
+
+        #endregion
+    }
+
+
+}
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerIntegrationTests.cs b/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerIntegrationTests.cs
new file mode 100644
index 00000000..5da87c9c
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerIntegrationTests.cs
@@ -0,0 +1,150 @@
+#if NET_2_0
+
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System.Reflection;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Spring.Data.Core;
+using Spring.Objects;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data.Core
+{
+    /// <summary>
+    /// This class contains tests for TxScopeTransactionManager and will directly a real TransactionScope object
+    /// but does not access any database
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: TxScopeTransactionManagerIntegrationTests.cs,v 1.1 2007/11/30 18:38:59 markpollack Exp $</version>
+    [TestFixture]
+    public class TxScopeTransactionManagerIntegrationTests
+    {
+        private MockRepository mocks;
+        [SetUp]
+        public void Setup()
+        {
+            mocks = new MockRepository();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.ResourceDictionary.Count == 0);
+            Assert.IsFalse(TransactionSynchronizationManager.SynchronizationActive);
+            Assert.IsNull(TransactionSynchronizationManager.CurrentTransactionName);
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            Assert.AreEqual(System.Data.IsolationLevel.Unspecified, TransactionSynchronizationManager.CurrentTransactionIsolationLevel);
+            Assert.IsFalse(TransactionSynchronizationManager.ActualTransactionActive);
+
+        }
+
+        [Test]
+        public void Commit()
+        {
+            TxScopeTransactionManager tm = new TxScopeTransactionManager();
+            TransactionTemplate tt = new TransactionTemplate(tm);
+
+            //tt.Name = "txName";
+
+            Assert.AreEqual(TransactionSynchronizationState.Always, tm.TransactionSynchronization);
+            Assert.IsFalse(TransactionSynchronizationManager.SynchronizationActive);
+            Assert.IsNull(TransactionSynchronizationManager.CurrentTransactionName);
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            tt.Execute(CommitTxDelegate);
+            Assert.IsFalse(TransactionSynchronizationManager.SynchronizationActive);
+            Assert.IsNull(TransactionSynchronizationManager.CurrentTransactionName);
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+        }
+
+        public object CommitTxDelegate(ITransactionStatus status)
+        {
+            Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive);
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+           
+            return null;
+        }
+
+        [Test]
+        public void TransactionInformation()
+        {
+            TxScopeTransactionManager tm = new TxScopeTransactionManager();
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.TransactionIsolationLevel = System.Data.IsolationLevel.ReadUncommitted;
+            tt.Execute(TransactionInformationTxDelegate);
+        }
+
+        public object TransactionInformationTxDelegate(ITransactionStatus status)
+        {
+
+            Assert.AreEqual(System.Transactions.IsolationLevel.ReadUncommitted,
+                            System.Transactions.Transaction.Current.IsolationLevel);
+
+            Assert.AreEqual(System.Data.IsolationLevel.ReadUncommitted,
+                            TransactionSynchronizationManager.CurrentTransactionIsolationLevel);
+            return null;
+        }
+
+
+        [Test]
+        public void Rollback()
+        {
+            ITransactionSynchronization sync =
+                (ITransactionSynchronization) mocks.DynamicMock(typeof (ITransactionSynchronization));
+            sync.BeforeCompletion();
+            LastCall.On(sync).Repeat.Once();
+            sync.AfterCompletion(TransactionSynchronizationStatus.Rolledback);
+            LastCall.On(sync).Repeat.Once();
+            mocks.ReplayAll();
+
+
+            TxScopeTransactionManager tm = new TxScopeTransactionManager();
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.TransactionTimeout = 10;
+            tt.Name = "txName";
+
+            Assert.IsFalse(TransactionSynchronizationManager.SynchronizationActive);
+            Assert.IsNull(TransactionSynchronizationManager.CurrentTransactionName);
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+            tt.Execute(delegate (ITransactionStatus status)
+                           {
+                               Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive);
+                               TransactionSynchronizationManager.RegisterSynchronization(sync);
+                               Assert.AreEqual("txName", TransactionSynchronizationManager.CurrentTransactionName);
+                               Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+                               status.RollbackOnly = true;
+                               return null;
+                           }
+            );
+
+            mocks.VerifyAll();
+
+        }
+
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerTests.cs b/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerTests.cs
new file mode 100644
index 00000000..ae839b1e
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/Core/TxScopeTransactionManagerTests.cs
@@ -0,0 +1,190 @@
+#if NET_2_0
+
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Transactions;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Spring.Data.Support;
+using Spring.Transaction;
+using Spring.Transaction.Support;
+
+#endregion
+
+namespace Spring.Data.Core
+{
+    /// <summary>
+    /// This calss contains tests for 
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: TxScopeTransactionManagerTests.cs,v 1.3 2007/12/07 07:31:05 markpollack Exp $</version>
+    [TestFixture]
+    public class TxScopeTransactionManagerTests
+    {
+        private MockRepository mocks;
+
+        [SetUp]
+        public void Setup()
+        {
+            mocks = new MockRepository();
+        }
+
+        [Test]
+
+        public void TransactionCommit()
+        {
+            ITransactionScopeAdapter txAdapter = (ITransactionScopeAdapter) mocks.CreateMock(typeof(ITransactionScopeAdapter));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(txAdapter.IsExistingTransaction).Return(false);
+                TransactionOptions txOptions = new TransactionOptions();
+                txOptions.IsolationLevel = IsolationLevel.ReadCommitted;
+                txAdapter.CreateTransactionScope(TransactionScopeOption.Required, txOptions, EnterpriseServicesInteropOption.None);
+
+                Expect.Call(txAdapter.RollbackOnly).Return(false);
+                txAdapter.Complete();
+                txAdapter.Dispose();
+            }
+            mocks.ReplayAll();
+
+            IPlatformTransactionManager tm = new TxScopeTransactionManager(txAdapter);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.Execute(delegate(ITransactionStatus status)
+                           {
+                               Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive);
+                               Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+                               return null;
+                           });
+
+            Assert.IsFalse(TransactionSynchronizationManager.SynchronizationActive);
+            Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);   
+
+            mocks.VerifyAll();
+
+
+        }
+
+        [Test]
+        public void TransactionRollback()
+        {
+            ITransactionScopeAdapter txAdapter = (ITransactionScopeAdapter)mocks.CreateMock(typeof(ITransactionScopeAdapter));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(txAdapter.IsExistingTransaction).Return(false);
+                TransactionOptions txOptions = new TransactionOptions();
+                txOptions.IsolationLevel = IsolationLevel.ReadCommitted;
+                txAdapter.CreateTransactionScope(TransactionScopeOption.Required, txOptions, EnterpriseServicesInteropOption.None);
+                txAdapter.Dispose();
+            }
+            mocks.ReplayAll();
+
+            IPlatformTransactionManager tm = new TxScopeTransactionManager(txAdapter);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+            Exception ex = new ArgumentException("test exception");
+            try
+            {
+                tt.Execute(delegate(ITransactionStatus status)
+                               {
+                                   Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive);
+                                   Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+                                   Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+                                   if (ex != null) throw ex;
+                                   return null;
+                               });
+                Assert.Fail("Should have thrown exception");
+            }
+            catch (ArgumentException e)
+            {
+                Assert.AreEqual(ex, e);
+            }
+
+            Assert.IsTrue(!TransactionSynchronizationManager.SynchronizationActive, "Synchronizations not active");
+
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void PropagationRequiresNewWithExistingTransaction()
+        {
+
+            ITransactionScopeAdapter txAdapter = (ITransactionScopeAdapter)mocks.CreateMock(typeof(ITransactionScopeAdapter));
+
+            using (mocks.Ordered())
+            {
+                Expect.Call(txAdapter.IsExistingTransaction).Return(false);
+                TransactionOptions txOptions = new TransactionOptions();
+                txOptions.IsolationLevel = IsolationLevel.ReadCommitted;
+                txAdapter.CreateTransactionScope(TransactionScopeOption.RequiresNew, txOptions, EnterpriseServicesInteropOption.None);
+
+                //inner tx actions
+                Expect.Call(txAdapter.IsExistingTransaction).Return(true);
+                txAdapter.CreateTransactionScope(TransactionScopeOption.RequiresNew, txOptions, EnterpriseServicesInteropOption.None);
+                txAdapter.Dispose();
+                //end inner tx actions
+
+                Expect.Call(txAdapter.RollbackOnly).Return(false);
+                txAdapter.Complete();
+                txAdapter.Dispose();
+                
+            }
+            mocks.ReplayAll();
+
+            IPlatformTransactionManager tm = new TxScopeTransactionManager(txAdapter);
+            TransactionTemplate tt = new TransactionTemplate(tm);
+            tt.PropagationBehavior = TransactionPropagation.RequiresNew;
+            tt.Execute(delegate(ITransactionStatus status)
+                           {
+                               Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+                               Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive, "Synchronization active");
+                               Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+                               Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+
+                               tt.Execute(delegate(ITransactionStatus status2)
+                                              {
+                                                  Assert.IsTrue(TransactionSynchronizationManager.SynchronizationActive, "Synchronization active");
+                                                  Assert.IsTrue(status2.IsNewTransaction, "Is new transaction");
+                                                  Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+                                                  Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+                                                  status2.RollbackOnly = true;
+                                                  return null;
+                                              });
+
+
+                               Assert.IsTrue(status.IsNewTransaction, "Is new transaction");
+                               Assert.IsFalse(TransactionSynchronizationManager.CurrentTransactionReadOnly);
+                               Assert.IsTrue(TransactionSynchronizationManager.ActualTransactionActive);
+                               return null;
+                           });
+
+            mocks.VerifyAll();
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Data/ITestCoord.cs b/test/Spring/Spring.Data.Tests/Data/ITestCoord.cs
new file mode 100644
index 00000000..4d895fc8
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/ITestCoord.cs
@@ -0,0 +1,15 @@
+
+using Spring.Objects;
+
+namespace Spring.Data
+{
+    public interface ITestCoord
+    {
+        ITestObjectMgr TestObjectMgr
+        {
+            get; set;
+        }
+
+        void WorkOn(TestObject to1, TestObject to2);
+    }
+}
diff --git a/test/Spring/Spring.Data.Tests/Data/ITestObjectMgr.cs b/test/Spring/Spring.Data.Tests/Data/ITestObjectMgr.cs
new file mode 100644
index 00000000..93dd5d5d
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/ITestObjectMgr.cs
@@ -0,0 +1,11 @@
+using Spring.Objects;
+
+namespace Spring.Data
+{
+    public interface ITestObjectMgr
+    {
+        void SaveTwoTestObjects(TestObject to1, TestObject to2);
+
+        void DeleteTwoTestObjects(string name1, string name2);
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Data/LoggingAroundAdvice.cs b/test/Spring/Spring.Data.Tests/Data/LoggingAroundAdvice.cs
new file mode 100644
index 00000000..ceb22779
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/LoggingAroundAdvice.cs
@@ -0,0 +1,25 @@
+
+using AopAlliance.Intercept;
+using Common.Logging;
+
+namespace Spring.Data
+{
+    public class LoggingAroundAdvice : IMethodInterceptor
+    {
+        public int numInvoked;
+        private static readonly ILog LOG = LogManager.GetLogger(typeof(LoggingAroundAdvice));
+        public object Invoke(IMethodInvocation invocation)
+        {
+            try
+            {
+                LOG.Debug("Advice executing; calling the advised method [" + invocation.Method.Name + "]");
+                object returnValue = invocation.Proceed();
+                LOG.Debug("Advice executed; advised method [" + invocation.Method.Name + "] returned " + returnValue);
+                return returnValue;
+            } finally
+            {
+                numInvoked++;
+            }
+        }
+    }
+}
diff --git a/test/Spring/Spring.Data.Tests/Data/Objects/AdoQueryTests.cs b/test/Spring/Spring.Data.Tests/Data/Objects/AdoQueryTests.cs
new file mode 100644
index 00000000..728bbf33
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/Objects/AdoQueryTests.cs
@@ -0,0 +1,157 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System.Collections;
+using System.Data;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Data.Objects
+{
+    /// <summary>
+    /// This class contains tests for AdoQuery subclasses
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AdoQueryTests.cs,v 1.3 2007/07/25 08:25:34 markpollack Exp $</version>
+    [TestFixture]
+    public class AdoQueryTests
+    {
+        private MockRepository mocks;
+
+        [SetUp]
+        public void Setup()
+        {
+            mocks = new MockRepository();
+        }
+
+/*
+        [Test]
+        public void QueryWithoutContextRhino()
+        {
+            IDbProvider provider = (IDbProvider) mocks.DynamicMock(typeof (IDbProvider));
+
+            IDbConnection connection = (IDbConnection) mocks.DynamicMock(typeof (IDbConnection));
+
+            Expect.Call(provider.CreateConnection()).Return(connection);
+
+            IDbCommand command = (IDbCommand) mocks.DynamicMock(typeof (IDbCommand));
+
+            IDataReader reader = (IDataReader) mocks.DynamicMock(typeof (IDataReader));
+            Expect.Call(reader.Read()).Return(true);
+            Expect.Call(reader.GetInt32(0)).Return(1);
+            Expect.Call(reader.Read()).Return(false);
+
+            Expect.Call(command.ExecuteReader()).Return(reader);
+            Expect.Call(provider.CreateCommand()).Return(command);
+            mocks.ReplayAll();
+
+            IntMappingQueryWithNoContext queryWithNoContext = new IntMappingQueryWithNoContext(provider);
+            queryWithNoContext.Compile();
+            IList list = queryWithNoContext.QueryByNamedParam(null, null);
+            Assert.IsTrue(list.Count != 0);
+            foreach (int count in list)
+            {
+                Assert.AreEqual(1, count);
+            }
+
+            mocks.VerifyAll();
+
+
+
+        }
+ */
+        [Test]
+        public void QueryWithoutContext()
+        {
+
+            //Prepare provider
+            IDynamicMock mockProvider = new DynamicMock(typeof(IDbProvider));
+
+            //Prepare connection to return from provider
+            IDynamicMock mockConnection = new DynamicMock(typeof(IDbConnection));
+            IDbConnection connection = (IDbConnection) mockConnection.Object;
+            mockProvider.ExpectAndReturn("CreateConnection", connection);
+
+            //Prepare command
+            IDynamicMock mockCommand = new DynamicMock(typeof(IDbCommand));
+
+            //Prepare reader to return from command
+            IDynamicMock mockReader = new DynamicMock(typeof (IDataReader));
+            mockReader.ExpectAndReturn("Read", true);
+            mockReader.ExpectAndReturn("GetInt32", 1, 0);
+            mockReader.ExpectAndReturn("Read", false);
+            IDataReader reader = (IDataReader) mockReader.Object;
+            mockCommand.ExpectAndReturn("ExecuteReader", reader);
+
+            //Preppare command to return from provider
+            IDbCommand command = (IDbCommand)mockCommand.Object;
+            mockProvider.ExpectAndReturn("CreateCommand", command);
+
+            
+            IDbProvider dbProvider = (IDbProvider)mockProvider.Object;
+
+
+            //Test MappingAdoQueryWithContext
+            IntMappingQueryWithNoContext queryWithNoContext = new IntMappingQueryWithNoContext(dbProvider);
+            queryWithNoContext.Compile();
+            //IList list = queryWithNoContext.QueryByNamedParam(null, null);
+            IList list = queryWithNoContext.Query();
+            Assert.IsTrue(list.Count != 0);
+            foreach (int count in list)
+            {
+                Assert.AreEqual(1, count);
+            }
+
+
+
+
+
+
+
+        }
+
+        public class IntMappingQueryWithNoContext : MappingAdoQueryWithContext
+        {
+            private static string sql = "select id from custmr";
+
+            public IntMappingQueryWithNoContext(IDbProvider dbProvider)
+                : base(dbProvider, sql)
+            {
+                CommandType = CommandType.Text;
+            }
+
+
+            protected override object MapRow(IDataReader reader, int rowNum, IDictionary inParams,
+                                             IDictionary callingContext)
+            {
+                Assert.IsNull(inParams);
+                Assert.IsNull(callingContext);
+                return reader.GetInt32(0);
+            }
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Data/TestCoord.cs b/test/Spring/Spring.Data.Tests/Data/TestCoord.cs
new file mode 100644
index 00000000..97d0b69f
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/TestCoord.cs
@@ -0,0 +1,27 @@
+
+
+using Spring.Objects;
+
+namespace Spring.Data
+{
+    public class TestCoord : ITestCoord
+    {
+        private ITestObjectMgr testObjectMgr;
+
+
+        public ITestObjectMgr TestObjectMgr
+        {
+            get { return testObjectMgr; }
+            set { testObjectMgr = value; }
+        }
+
+        #region ITestCoordinator Members
+
+        public void WorkOn(TestObject to1, TestObject to2)
+        {
+            testObjectMgr.SaveTwoTestObjects(to1,to2);
+        }
+
+        #endregion
+    }
+}
diff --git a/test/Spring/Spring.Data.Tests/Data/TestObjectMgr.cs b/test/Spring/Spring.Data.Tests/Data/TestObjectMgr.cs
new file mode 100644
index 00000000..6792cfec
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Data/TestObjectMgr.cs
@@ -0,0 +1,85 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using Common.Logging;
+using Spring.Objects;
+using Spring.Transaction;
+using Spring.Transaction.Interceptor;
+using Spring.Transaction.Support;
+using IsolationLevel=System.Data.IsolationLevel;
+
+#endregion
+
+namespace Spring.Data
+{
+	/// <summary>
+	/// Group together multiple ITestObjectDao operations.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TestObjectMgr.cs,v 1.3 2007/10/21 18:32:41 markpollack Exp $</version>
+	public class TestObjectMgr : ITestObjectMgr
+	{
+		#region Fields
+
+        private static readonly ILog LOG = LogManager.GetLogger(typeof(TestObjectMgr));
+		#endregion
+
+		#region Constructor (s)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TestObjectMgr"/> class.
+        /// </summary>
+		public 	TestObjectMgr()
+		{
+
+		}
+
+		#endregion
+
+
+
+    	#region Methods
+
+        [Transaction()]
+        public void SaveTwoTestObjects(TestObject to1, TestObject to2)
+        {
+            LOG.Debug("TransactionActive = " + TransactionSynchronizationManager.ActualTransactionActive);
+        }
+#if !NET_1_0 && !NET_1_1
+        [Transaction(TransactionPropagation.Required, IsolationLevel.Unspecified, Timeout = 50,
+           RollbackFor = new Type[]{typeof(ArgumentNullException)},
+           ReadOnly = false,
+           EnterpriseServicesInteropOption = System.Transactions.EnterpriseServicesInteropOption.Automatic,
+           NoRollbackFor = new Type[] { typeof(ArithmeticException), typeof(NotSupportedException) })]
+#else
+        [Transaction(TransactionPropagation.Required, IsolationLevel.Unspecified, Timeout = 50,
+           RollbackFor = new Type[]{typeof(ArgumentNullException)},
+           ReadOnly = false,
+           NoRollbackFor = new Type[] { typeof(ArithmeticException), typeof(NotSupportedException) })]
+#endif
+	    public void DeleteTwoTestObjects(string name1, string name2)
+        {
+        }
+
+		#endregion
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/DataExceptionTests.cs b/test/Spring/Spring.Data.Tests/DataExceptionTests.cs
new file mode 100644
index 00000000..f3da3195
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/DataExceptionTests.cs
@@ -0,0 +1,46 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring
+{
+    /// <summary>
+    /// Unit tests for all of the exception classes in the Spring.Data library...
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: DataExceptionTests.cs,v 1.6 2006/05/18 21:37:53 markpollack Exp $</version>
+    [TestFixture]
+    public sealed class DataExceptionTests : ExceptionsTest
+    {
+        [TestFixtureSetUp]
+        public void FixtureSetUp ()
+        {
+            AssemblyToCheck = Assembly.GetAssembly (typeof (Spring.Transaction.CannotCreateTransactionException));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2003.csproj b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2003.csproj
new file mode 100644
index 00000000..c3390c9d
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2003.csproj
@@ -0,0 +1,374 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{C5585365-561C-4EC4-8956-87FFBD9AB1CD}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Data.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = "0618"
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Data.Tests\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE,NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Data.Tests\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "System.Windows.Forms"
+                    AssemblyName = "System.Windows.Forms"
+                    HintPath = "..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
+                />
+                <Reference
+                    Name = "DotNetMock"
+                    AssemblyName = "DotNetMock"
+                    HintPath = "..\..\..\lib\Net\1.1\DotNetMock.dll"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\Net\1.1\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "Spring.Aop.2003"
+                    Project = "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core.Tests.2003"
+                    Project = "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Data.2003"
+                    Project = "{E10A3BED-795F-41CB-A4A8-8C4B342ACDDF}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "Rhino.Mocks"
+                    AssemblyName = "Rhino.Mocks"
+                    HintPath = "..\..\..\lib\Net\1.1\Rhino.Mocks.dll"
+                />
+                <Reference
+                    Name = "System.EnterpriseServices"
+                    AssemblyName = "System.EnterpriseServices"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.EnterpriseServices.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "DataExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Data.Tests.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Spring.Data.Tests.dll.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Dao\IncorrectResultSizeDataAccessExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\IncorrectUpdateSemanticsDataAccessExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Dao\UncategorizedDataAccessExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\AdoPlatformTransactionManagerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\AutoDeclarativeTxTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\AutoDeclarativeTxTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\ITestCoord.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\ITestObjectMgr.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\LoggingAroundAdvice.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\TestCoord.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\TestObjectMgr.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Common\AdditonalProviders.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Common\DbProviderFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Core\ServiceDomainTransactionManagerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Objects\AdoQueryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Support\ErrorCodeExceptionTranslatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Support\TestDbProvider.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Support\TestSqlException.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\CallCountingTransactionManager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\CommonTypes.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\HeuristicCompletionExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\InvalidTimeoutExceptionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Config\TxNamespaceParserTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Config\TxNamespaceParserTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\AbstractTransactionAspectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\DefaultTransactionAttributeTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\MatchAlwaysTransactionAttributeSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\MatchAlwaysTransactionAttributeSourceTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\NoRollbackRuleAttributeTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\RollbackRuleAttributeTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\RuleBasedTransactionAttributeTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\TransactionAttributeEditorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\TransactionAttributeSourceAdvisorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\TransactionAttributeSourceEditorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\TransactionAttributeSourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Interceptor\TransactionInterceptorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\AbstractPlatformTransactionManagerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\DefaultTransactionDefinitionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\DefaultTransactionStatusTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\ResourceHolderSupportTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\TransactionSynchronizationAdapterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\TransactionSynchronizationManagerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Transaction\Support\TransactionTemplateTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2005.csproj b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2005.csproj
new file mode 100644
index 00000000..579090e8
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2005.csproj
@@ -0,0 +1,190 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Data.Tests</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.Tests\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>67, 618</NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Data.Tests\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>618</NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DotNetMock, Version=0.7.4.0, Culture=neutral, PublicKeyToken=805ea88df19095f6">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\DotNetMock.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.5.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Data.OracleClient" />
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2005.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Dao\IncorrectResultSizeDataAccessExceptionTests.cs" />
+    <Compile Include="Dao\IncorrectUpdateSemanticsDataAccessExceptionTests.cs" />
+    <Compile Include="Dao\UncategorizedDataAccessExceptionTests.cs" />
+    <Compile Include="DataExceptionTests.cs" />
+    <Compile Include="Data\AdoPlatformTransactionManagerTests.cs" />
+    <Compile Include="Data\AutoDeclarativeTxTests.cs" />
+    <Compile Include="Data\Common\DbProviderFactoryTests.cs" />
+    <Compile Include="Data\LoggingAroundAdvice.cs" />
+    <Compile Include="Data\ITestCoord.cs" />
+    <Compile Include="Data\ITestObjectMgr.cs" />
+    <Compile Include="Data\Objects\AdoQueryTests.cs" />
+    <Compile Include="Data\TestCoord.cs" />
+    <Compile Include="Data\TestObjectMgr.cs" />
+    <Compile Include="Support\ErrorCodeExceptionTranslatorTests.cs" />
+    <Compile Include="Support\TestDbProvider.cs" />
+    <Compile Include="Support\TestSqlException.cs" />
+    <Compile Include="Transaction\CallCountingTransactionManager.cs" />
+    <Compile Include="Transaction\CommonTypes.cs" />
+    <Compile Include="Transaction\Config\TxNamespaceParserTests.cs" />
+    <Compile Include="Transaction\HeuristicCompletionExceptionTests.cs" />
+    <Compile Include="Transaction\Interceptor\DefaultTransactionAttributeTests.cs" />
+    <Compile Include="Transaction\Interceptor\MatchAlwaysTransactionAttributeSourceTests.cs" />
+    <Compile Include="Transaction\Interceptor\NoRollbackRuleAttributeTests.cs" />
+    <Compile Include="Transaction\Interceptor\RollbackRuleAttributeTests.cs" />
+    <Compile Include="Transaction\Interceptor\RuleBasedTransactionAttributeTests.cs" />
+    <Compile Include="Transaction\Interceptor\TransactionAttributeEditorTests.cs" />
+    <Compile Include="Transaction\Interceptor\TransactionAttributeSourceAdvisorTests.cs" />
+    <Compile Include="Transaction\Interceptor\TransactionAttributeSourceEditorTests.cs" />
+    <Compile Include="Transaction\InvalidTimeoutExceptionTests.cs" />
+    <Compile Include="Transaction\Support\AbstractPlatformTransactionManagerTests.cs" />
+    <Compile Include="Transaction\Support\DefaultTransactionDefinitionTests.cs" />
+    <Compile Include="Transaction\Support\DefaultTransactionStatusTests.cs" />
+    <Compile Include="Transaction\Support\ResourceHolderSupportTests.cs" />
+    <Compile Include="Transaction\Support\TransactionSynchronizationAdapterTests.cs" />
+    <Compile Include="Transaction\Support\TransactionSynchronizationManagerTests.cs" />
+    <Compile Include="Transaction\Support\TransactionTemplateTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\AutoDeclarativeTxTests.xml" />
+    <EmbeddedResource Include="Data\Common\AdditionalProviders.xml" />
+    <Content Include="Spring.Data.Tests.dll.config" />
+    <EmbeddedResource Include="Transaction\Interceptor\MatchAlwaysTransactionAttributeSourceTests.xml" />
+    <EmbeddedResource Include="Transaction\Config\TxNamespaceParserTests.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Data\Common\DbParametersTests.cs" />
+    <Compile Include="Data\Common\UserCredentialsDbProviderTests.cs" />
+    <Compile Include="Data\Core\ServiceDomainTransactionManagerTests.cs" />
+    <Compile Include="Data\Core\TxScopeTransactionManagerIntegrationTests.cs" />
+    <Compile Include="Data\Core\TxScopeTransactionManagerTests.cs" />
+    <Compile Include="Transaction\Interceptor\AbstractTransactionAspectTests.cs" />
+    <Compile Include="Transaction\Interceptor\TransactionAttributeSourceTests.cs" />
+    <Compile Include="Transaction\Interceptor\TransactionInterceptorTests.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>echo "Copying .xml files for tests"
+xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Data.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2005\Spring.Data.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
new file mode 100644
index 00000000..5b1e09db
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.build
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<project name="Spring.Data.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+	<target name="build">
+		<!-- build Spring.Data.Tests -->
+		<csc target="library" define="${current.build.defines.csc}"
+		     warnaserror="true"
+		     debug="${current.build.debug}"
+                     output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml">
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+			</sources>
+		        <resources prefix="Spring" dynamicprefix="true" failonempty="true">
+			        <include name="**/*.xml" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+				<exclude name="CloverRuntime.dll" />
+			</references>
+		</csc>
+
+                <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
+                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
+	</target>
+	<target name="test" depends="build">
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
+		</nunit2outproc>
+	</target>
+</project>
diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.dll.config b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.dll.config
new file mode 100644
index 00000000..259adbad
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.dll.config
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2002-2005 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.
+-->
+<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.ContextHandler, Spring.Core'/>
+      <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />      
+    </sectionGroup>
+
+<!--
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
+-->
+    <section name="DatabaseConfiguration" type="System.Configuration.NameValueSectionHandler"/>
+
+  </configSections>
+
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Simple.NoOpLoggerFactoryAdapter, Common.Logging"/>
+    </logging>
+  </common>
+  
+  <spring>
+
+    <context>
+      <resource uri="config://spring/objects"/>
+    </context>
+
+    <!-- parent context's objects -->
+    <objects xmlns='http://www.springframework.net'>
+
+    </objects>
+
+  </spring>
+
+
+  <DatabaseConfiguration>
+    <add key="connection.string" value="dsn=MyDSN;uid=sa;pwd=myPassword;"/>
+  </DatabaseConfiguration>
+
+<!--
+  <log4net>
+    <appender name="NullAppender" type="Spring.Objects.Factory.Xml.NullAppender, Spring.Core.Tests"/>
+    <root>
+      <level value="ALL" />
+      <appender-ref ref="NullAppender" />
+    </root>
+  </log4net>
+-->
+<!--
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
+        <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+-->
+</configuration>
diff --git a/test/Spring/Spring.Data.Tests/Support/ErrorCodeExceptionTranslatorTests.cs b/test/Spring/Spring.Data.Tests/Support/ErrorCodeExceptionTranslatorTests.cs
new file mode 100644
index 00000000..ab43bdfa
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Support/ErrorCodeExceptionTranslatorTests.cs
@@ -0,0 +1,111 @@
+#if !NET_1_0
+#region Licence
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Dao;
+using Spring.Data;
+using Spring.Data.Common;
+using Spring.Data.Support;
+
+#endregion
+
+namespace Spring.Support
+{
+	/// <summary>
+	/// Test the database exception translation.
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: ErrorCodeExceptionTranslatorTests.cs,v 1.8 2007/12/06 20:14:39 markpollack Exp $</version>
+	[TestFixture]
+	public class ErrorCodeExceptionTranslatorTests 
+	{
+		#region Fields
+        private static ErrorCodes ERROR_CODES = new ErrorCodes();
+	    
+	    private IDbProvider dbProvider = new TestDbProvider();
+		#endregion
+
+
+		#region Constructor (s)
+
+	    /// <summary>
+		/// Initializes a new instance of the <see cref="ErrorCodeExceptionTranslatorTests"/> class.
+        /// </summary>
+		public 	ErrorCodeExceptionTranslatorTests()
+		{
+
+		}
+
+		#endregion
+
+		#region Properties
+
+		#endregion
+
+
+	    
+	    [SetUp]
+        public void SetUp()
+        {
+            ERROR_CODES.BadSqlGrammarCodes = (new String[] { "1", "2" });
+            ERROR_CODES.InvalidResultSetAccessCodes = (new String[] { "3", "4" });
+            ERROR_CODES.DataAccessResourceFailureCodes = (new String[] { "5" });
+            ERROR_CODES.DataIntegrityViolationCodes = (new String[] { "544", "2627", "8114", "8115" });
+            ERROR_CODES.CannotAcquireLockCodes = (new String[] { "7" });
+            ERROR_CODES.DeadlockLoserCodes = (new String[] { "8" });
+            ERROR_CODES.CannotSerializeTransactionCodes = (new String[] { "9" });
+        }
+	    
+        [Test]
+	    public void ErrorCodeTransation()
+	    {
+	        IAdoExceptionTranslator exceptionTranslator = new ErrorCodeExceptionTranslator(dbProvider, ERROR_CODES);
+	        TestSqlException badSqlEx = new TestSqlException("", "1");
+	        
+	        BadSqlGrammarException bsgex = (BadSqlGrammarException)exceptionTranslator.Translate("task","SQL", badSqlEx);
+            Assert.AreEqual("SQL", bsgex.Sql);
+            Assert.AreEqual(badSqlEx, bsgex.InnerException);
+
+            TestSqlException invResEx = new TestSqlException("", "4");
+            InvalidResultSetAccessException irsex = (InvalidResultSetAccessException) exceptionTranslator.Translate("task", "SQL", invResEx);
+            Assert.AreEqual("SQL", irsex.Sql);
+            Assert.AreEqual(invResEx, irsex.InnerException);
+	        		
+	        CheckTranslation(exceptionTranslator, "5", typeof(DataAccessResourceFailureException));
+            CheckTranslation(exceptionTranslator, "544", typeof(DataIntegrityViolationException));
+		    CheckTranslation(exceptionTranslator, "7", typeof(CannotAcquireLockException));
+		    CheckTranslation(exceptionTranslator, "8", typeof(DeadlockLoserDataAccessException));
+		    CheckTranslation(exceptionTranslator, "9", typeof(CannotSerializeTransactionException));
+	    }
+
+	    private void CheckTranslation(IAdoExceptionTranslator translator, string errorCode, Type exType)
+	    {
+            TestSqlException sex = new TestSqlException("", errorCode);
+            DataAccessException ex = translator.Translate("", "", sex);
+            Assert.IsTrue(exType.IsAssignableFrom(ex.GetType()));
+            Assert.IsTrue(ex.InnerException == sex);
+	    }
+	}
+}
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Support/TestDbProvider.cs b/test/Spring/Spring.Data.Tests/Support/TestDbProvider.cs
new file mode 100644
index 00000000..94addf3e
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Support/TestDbProvider.cs
@@ -0,0 +1,167 @@
+#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
+
+#region Imports
+
+using System;
+using System.Data;
+using Spring.Data.Common;
+
+#endregion
+
+namespace Spring.Support
+{
+	/// <summary>
+	/// A fake provider class used to test exception translation functionality
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TestDbProvider.cs,v 1.11 2007/12/06 05:48:32 markpollack Exp $</version>
+	public class TestDbProvider : IDbProvider
+	{
+        private string connectionString;
+	    private IDbConnection connection;
+
+        protected IDbMetadata dbMetadata;
+	    
+	    public TestDbProvider()
+	    {
+            IDbProvider provider = DbProviderFactory.GetDbProvider("SqlServer-1.1");
+            dbMetadata = provider.DbMetadata;
+
+	    }
+
+        /// <summary>
+        /// Return metadata information about the database.
+        /// </summary>
+        public IDbMetadata DbMetadata
+        {
+            get
+            {
+                return dbMetadata;
+            }
+        }
+        /// <summary>
+        /// Connection string used to create connections.
+        /// </summary>
+        public string ConnectionString
+        {
+            set { connectionString = value; }
+            get { return connectionString; }
+        }
+	    public IDbCommand CreateCommand()
+	    {
+	        throw new NotImplementedException();
+	    }
+
+	    public IDbConnection CreateConnection()
+	    {
+	        return connection;
+	    }
+
+	    public IDbDataParameter CreateParameter()
+	    {
+	        throw new NotImplementedException();
+	    }
+
+
+	    public IDbDataAdapter CreateDataAdapter()
+	    {
+	        throw new NotImplementedException();
+	    }
+
+	    public object CreateCommandBuilder()
+	    {
+	        throw new NotImplementedException();
+	    }
+
+	    public string ExtractError(Exception e)
+	    {
+	        TestSqlException testSqlException = (TestSqlException)e;
+	        return testSqlException.ErrorNumber;
+	    }
+
+        public bool IsDataAccessException(Exception e)
+        {
+#if NET_2_0
+            if (e is System.Data.Common.DbException)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+#else       
+            return IsDataAccessExceptionBCL11(e);
+#endif
+        }
+
+	    public bool IsDataAccessExceptionBCL11(Exception e)
+	    {
+	        return true;
+	    }
+
+        public string CreateParameterName(string name)
+        {
+            if (dbMetadata.BindByName)
+            {
+                if (DbMetadata.UseParameterPrefixInSql)
+                {
+                    return DbMetadata.ParameterNamePrefix + name;
+                }
+                else
+                {
+                    return name;
+                }
+            }
+            else
+            {
+                return DbMetadata.ParameterNamePrefix;
+            }
+        }
+
+	    public string CreateParameterNameForCollection(string name)
+	    {
+            if (dbMetadata.BindByName)
+            {
+                if (DbMetadata.UseParameterNamePrefixInParameterCollection)
+                {
+                    return DbMetadata.ParameterNamePrefix + name;
+                }
+                else
+                {
+                    return name;
+                }
+            }
+            else
+            {
+                return DbMetadata.ParameterNamePrefix;
+            }
+	    }
+
+	    #region Stub method to set behavior
+
+	    public IDbConnection ConnectionToCreate
+	    {
+	        set { connection = value;}
+        }
+        #endregion
+    }
+}
diff --git a/test/Spring/Spring.Data.Tests/Support/TestSqlException.cs b/test/Spring/Spring.Data.Tests/Support/TestSqlException.cs
new file mode 100644
index 00000000..b7fb34cf
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Support/TestSqlException.cs
@@ -0,0 +1,84 @@
+#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
+
+#region Imports
+
+using System;
+using System.Runtime.Serialization;
+
+#endregion
+
+namespace Spring.Support
+{
+	/// <summary>
+	/// A simple exception class to test exception translation functionality 
+	/// </summary>
+	/// <author>Mark Pollack (.NET)</author>
+	/// <version>$Id: TestSqlException.cs,v 1.2 2006/06/26 18:57:31 markpollack Exp $</version>
+    [Serializable] 
+    public class TestSqlException : Exception
+    {
+
+
+        private string errorNumber;
+        
+        public TestSqlException() {}
+        
+        
+        public TestSqlException( string message ) : base( message ) {}
+        
+        public TestSqlException(string message, string errorNumber) :base (message)
+        {
+            ErrorNumber = errorNumber;
+        }
+
+        public TestSqlException( string message, Exception rootCause)
+            : base( message , rootCause ) {}
+
+        protected TestSqlException(
+            SerializationInfo info, StreamingContext context ) : base( info, context )
+        {
+            errorNumber = info.GetString( "errorNumber" );
+        }
+        
+        public string ErrorNumber
+        {
+            get { return errorNumber; }
+            set { errorNumber = value; }
+        }
+        /// <summary>
+        /// Override of <see cref="System.Exception.GetObjectData(SerializationInfo, StreamingContext)"/>
+        /// to allow for private serialization.
+        /// </summary>
+        /// <param name="info">
+        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
+        /// that holds the serialized object data about the exception.
+        /// </param>
+        /// <param name="context">
+        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
+        /// that contains contextual information about the source or destination.
+        /// </param>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            info.AddValue( "errorNumber", errorNumber );
+            base.GetObjectData( info, context );
+        }
+    }
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/CallCountingTransactionManager.cs b/test/Spring/Spring.Data.Tests/Transaction/CallCountingTransactionManager.cs
new file mode 100644
index 00000000..7341e7fc
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/CallCountingTransactionManager.cs
@@ -0,0 +1,68 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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 Spring.Transaction.Support;
+
+namespace Spring.Transaction
+{
+    /// <summary>
+    /// This is a test implementation to count the number of times PlatformTransactionManager methods
+    /// have been called.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: CallCountingTransactionManager.cs,v 1.1 2007/05/26 00:43:07 markpollack Exp $</version>
+    public class CallCountingTransactionManager : AbstractPlatformTransactionManager
+    {
+
+        public int begun;
+        public int commits;
+        public int rollbacks;
+        public int inflight;
+
+
+        protected override object DoGetTransaction()
+        {
+            return new object();
+        }
+
+        protected override void DoBegin(object transaction, ITransactionDefinition definition)
+        {
+            ++begun;
+            ++inflight;
+        }
+
+        protected override void DoCommit(DefaultTransactionStatus status)
+        {
+            ++commits;
+            --inflight;
+        }
+
+        protected override void DoRollback(DefaultTransactionStatus status)
+        {
+            ++rollbacks;
+            --inflight;
+        }
+
+        public void Clear()
+        {
+            begun = commits = rollbacks = inflight = 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Transaction/CommonTypes.cs b/test/Spring/Spring.Data.Tests/Transaction/CommonTypes.cs
new file mode 100644
index 00000000..c094dc8c
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/CommonTypes.cs
@@ -0,0 +1,370 @@
+using System;
+using System.Data;
+using DotNetMock;
+using Spring.Transaction.Support;
+
+namespace Spring.Transaction
+{
+	public class MyMockTxnObject : MockObject, ISmartTransactionObject
+	{
+		private ExpectationCounter _isRollbackOnlyCalls = new ExpectationCounter( "IsRollbackOnlyCalls" );
+		private bool _isRollbackOnly = false;
+
+		public MyMockTxnObject() : this( "MyMockTxnObject" ) {}
+		public MyMockTxnObject( string name ) : base( name ) {}
+
+
+
+	    public void SetExpectedRollbackOnlyCalls( int calls ) 
+		{
+			_isRollbackOnlyCalls.Expected = calls;
+		}
+		public void SetExpectedIsRollBackOnlyValue( bool isRollbackOnly ) 
+		{
+			_isRollbackOnly = isRollbackOnly;
+		}
+		#region ISmartTransactionObject Members
+
+        public bool RollbackOnly
+        {
+            get
+            {
+                _isRollbackOnlyCalls.Inc();
+                return _isRollbackOnly;
+            }
+        }
+
+		#endregion
+	}
+	public class MyMockTxnObjectSavepointMgr : MockObject, ISavepointManager, ISmartTransactionObject		
+	{
+		private string _savepoint;
+		private ExpectationString _expectedSavepoint = new ExpectationString("Savepoint");
+
+		public void SetSavepointToReturn( string savepoint )
+		{
+			_savepoint = savepoint;
+		}
+		public void SetExpectedSavepoint( string savepoint )
+		{
+			_expectedSavepoint.Expected = savepoint;
+		}
+		#region ISmartTransactionObject Members
+
+        public bool RollbackOnly
+        {
+            get
+            {   // TODO:  Add MyMockTxnObjectSavepointMgr.IsRollbackOnly implementation
+                return false;
+            }
+        }
+
+		#endregion
+
+		#region ISavepointManager Members
+		public void ReleaseSavepoint(string savepoint)
+		{
+			_expectedSavepoint.Actual = savepoint;
+		}
+
+		public void CreateSavepoint( string savepoint )
+		{
+			_expectedSavepoint.Actual = savepoint;
+		}
+
+		public void RollbackToSavepoint(string savepoint)
+		{
+			_expectedSavepoint.Actual = savepoint;
+		}
+
+		#endregion
+	}
+
+	public class MockTxnPlatformMgr : MockObject, IPlatformTransactionManager
+	{
+		private ExpectationCounter _commitCalls = new ExpectationCounter("CommitCalls");
+		private ExpectationCounter _getTransactionCalls = new ExpectationCounter("GetTxnCalls");
+		private ExpectationCounter _rollbackCalls = new ExpectationCounter("RollbackCalls");
+		private bool _throwRollbackException = false;
+
+		#region IPlatformTransactionManager Members
+		public void SetExpectedCommitCallCount( int count )
+		{
+			_commitCalls.Expected = count;
+		}
+		public void SetExpectedRollbackCallCount( int count )
+		{
+			_rollbackCalls.Expected = count;
+		}
+		public void SetExpectedGetTxnCallCount( int count )
+		{
+			_getTransactionCalls.Expected = count;
+		}
+		public bool ThrowRollbackException
+		{
+			set { _throwRollbackException = value; }	
+		}
+		public void Rollback(ITransactionStatus transactionStatus)
+		{
+			_rollbackCalls.Inc();
+			if ( _throwRollbackException )
+			{
+				throw new Exception("Rollback");
+			}
+		}
+
+		public void Commit(ITransactionStatus transactionStatus)
+		{
+			_commitCalls.Inc();
+		}
+
+		public ITransactionStatus GetTransaction(ITransactionDefinition definition)
+		{
+			_getTransactionCalls.Inc();
+			return null;
+		}
+
+		#endregion
+
+	}
+
+	public class MockTxnSync : MockObject, ITransactionSynchronization
+	{
+		#region ITransactionSynchronization Members
+
+		public void AfterCompletion(Spring.Transaction.Support.TransactionSynchronizationStatus status)
+		{
+			// TODO:  Add MockTxnSync.AfterCompletion implementation
+		}
+
+		public void BeforeCommit(bool readOnly)
+		{
+			// TODO:  Add MockTxnSync.BeforeCommit implementation
+		}
+	    
+	    public void AfterCommit()
+	    {
+	        
+	    }
+
+		public void Resume()
+		{
+			// TODO:  Add MockTxnSync.Resume implementation
+		}
+
+		public void BeforeCompletion()
+		{
+			// TODO:  Add MockTxnSync.BeforeCompletion implementation
+		}
+
+		public void Suspend()
+		{
+			// TODO:  Add MockTxnSync.Suspend implementation
+		}
+
+		#endregion
+	}
+
+	public class MockTxnDefinition : MockObject, ITransactionDefinition
+	{
+		private int _transactionTimeout = DefaultTransactionDefinition.TIMEOUT_DEFAULT;
+		private TransactionPropagation _transactionPropagation = TransactionPropagation.NotSupported;
+		private bool _readOnly = false;
+        private string _name = null;
+#if NET_2_0
+        private System.Transactions.EnterpriseServicesInteropOption _esInteropOption;
+
+#endif
+		#region ITransactionDefinition Members
+
+		public bool ReadOnly
+		{
+			get
+			{
+				return _readOnly;
+			}
+			set
+			{
+				_readOnly = value;
+			}
+		}
+
+		public int TransactionTimeout
+		{
+			get
+			{
+				return _transactionTimeout;
+			}
+			set
+			{
+				_transactionTimeout = value;
+			}
+		}
+
+		public IsolationLevel TransactionIsolationLevel
+		{
+			get
+			{
+				return IsolationLevel.Unspecified;
+			}
+		}
+
+		public TransactionPropagation PropagationBehavior
+		{
+			get
+			{
+				return _transactionPropagation;
+			}
+			set
+			{
+				_transactionPropagation = value;
+			}
+		}
+
+        public string Name
+        {
+            get
+            {
+                return _name;
+            }
+        }
+
+
+#if NET_2_0
+        public System.Transactions.EnterpriseServicesInteropOption EnterpriseServicesInteropOption
+        {
+            get { return _esInteropOption; }
+            set { _esInteropOption = value; }
+        }
+#endif
+
+		#endregion
+
+	}
+	public class MockTxnPlatformMgrAbstract : AbstractPlatformTransactionManager, IMockObject
+	{
+		private object _transaction;
+		private bool _isVerified;
+		private string _mockName;
+		private bool _isExistingTransaction;
+
+        private ExpectationCounter _doBeginCalls = new ExpectationCounter("DoBegin Calls");
+		private ExpectationCounter _doGetTxnCalls = new ExpectationCounter("DoGetTransaction Calls");
+		private ExpectationCounter _isExistingTxnCalls = new ExpectationCounter("IsExistingTransaction Calls");
+
+		
+		private bool _useSavepointForNestedTransaction;
+
+		public void SetExpectedCalls( string method, int calls )
+		{
+			switch ( method )
+			{
+				case "DoBegin":
+					_doBeginCalls.Expected = calls;
+					break;
+				case "IsExistingTransaction":
+					_isExistingTxnCalls.Expected = calls;
+					break;
+				case "DoGetTransaction":
+					_doGetTxnCalls.Expected = calls;
+					break;
+				default: 
+					break;
+			}
+		}
+		public void SetTransaction( object transaction )
+		{
+			_transaction = transaction;
+			_isExistingTransaction = true;
+		}
+		public object Transaction
+		{
+			get { return _transaction; }
+		}
+		public bool Savepoints
+		{
+			set { _useSavepointForNestedTransaction = value; }
+		}
+		#region IMockObject Members
+
+		public void NotImplemented(string methodName)
+		{
+			// TODO:  Add MockTxnPlatformMgrAbstract.NotImplemented implementation
+		}
+
+		public string MockName
+		{
+			get { return _mockName; } 
+			set { _mockName = value;}
+		}
+
+		#endregion
+
+		#region IVerifiable Members
+
+		public void Verify()
+		{
+			Verifier.Verify( this );
+			_isVerified = true;
+		}
+
+		public bool IsVerified
+		{
+			get { return _isVerified; }
+		}
+
+		#endregion
+
+		#region AbstractPlatformTransactionManager Impls
+		protected override void DoResume(object transaction, object suspendedResources)
+		{
+
+		}
+		protected override void DoCommit(DefaultTransactionStatus status)
+		{
+
+		}
+		protected override object DoGetTransaction()
+		{
+			_doGetTxnCalls.Inc();
+			if ( null == _transaction )
+			{
+				return new object();
+			}
+			else
+			{
+				return _transaction;
+			}
+		}
+		protected override object DoSuspend(object transaction)
+		{
+			return null;
+		}
+		protected override void DoBegin(object transaction, ITransactionDefinition definition)
+		{
+			_doBeginCalls.Inc();
+		}
+		protected override void DoSetRollbackOnly(DefaultTransactionStatus status)
+		{
+
+		}
+		protected override void DoRollback(DefaultTransactionStatus status)
+		{
+			
+		}
+		protected override bool IsExistingTransaction(object transaction)
+		{
+			_isExistingTxnCalls.Inc();
+			return _isExistingTransaction;
+		}
+
+		protected override bool UseSavepointForNestedTransaction()
+		{
+			return _useSavepointForNestedTransaction;
+		}
+
+		#endregion
+
+	}
+
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs
new file mode 100644
index 00000000..8bccb431
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs
@@ -0,0 +1,115 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+
+using NUnit.Framework;
+
+using Spring.Aop.Config;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects;
+using Spring.Objects.Factory.Xml;
+using Spring.Transaction.Interceptor;
+
+#endregion
+
+namespace Spring.Transaction.Config
+{
+    [TestFixture]
+    public class TxNamespaceParserTests
+    {
+        private IApplicationContext ctx;
+
+        [SetUp]
+        public void SetUp()
+        {
+            NamespaceParserRegistry.RegisterParser(typeof(TxNamespaceParser));
+            NamespaceParserRegistry.RegisterParser(typeof(AopNamespaceParser));
+            ctx = new XmlApplicationContext("assembly://Spring.Data.Tests/Spring.Transaction.Config/TxNamespaceParserTests.xml");
+        }
+
+        [Test]
+        public void Registered()
+        {
+            Assert.IsNotNull(NamespaceParserRegistry.GetParser("http://www.springframework.net/tx"));
+            Assert.IsTrue(ctx.ContainsObjectDefinition(AopNamespaceUtils.AUTO_PROXY_CREATOR_OBJECT_NAME));
+            Assert.IsTrue(ctx.ContainsObjectDefinition("Spring.Transaction.Interceptor.TransactionAttributeSourceAdvisor"));
+        }
+
+
+        [Test]
+        public void InvokeTransactional()
+        {
+            ITestObject testObject = TestObject;
+            CallCountingTransactionManager ptm = ctx["transactionManager"] as CallCountingTransactionManager;
+            Assert.IsNotNull(ptm);
+
+            // try with transactional
+            Assert.AreEqual(0, ptm.begun,"Should not have started any transactions");
+            testObject.GetDescription();
+            Assert.AreEqual(1, ptm.begun, "Should have 1 started transaction");
+            Assert.AreEqual(1, ptm.commits, "Should have 1 committed transaction");
+
+            // try with non-transaction
+            int i = testObject.Age;
+            Assert.AreEqual(1, ptm.begun, "Should not have started another transaction");
+
+            // try with exceptional
+            try
+            {
+                testObject.Exceptional(new ArgumentNullException());
+                Assert.Fail("Should not get here");
+            } catch (Exception)
+            {
+                Assert.AreEqual(2, ptm.begun, "Should have another started transaction");
+                Assert.AreEqual(1, ptm.rollbacks, "Should have 1 rolled back transaction");
+            }
+        }
+
+        private ITestObject TestObject
+        {
+            get
+            {
+                return ctx["testObject"] as
+                       ITestObject;
+            }
+        }
+
+        [Test]
+        public void RollbackRules()
+        {
+            TransactionInterceptor txInterceptor = ctx.GetObject("txRollbackAdvice") as TransactionInterceptor;
+            Assert.IsNotNull(txInterceptor);
+
+            MethodInfo getDescriptionMethod = typeof(ITestObject).GetMethod("GetDescription");
+            MethodInfo exceptionalMethod = typeof (ITestObject).GetMethod("Exceptional");
+            ITransactionAttributeSource txAttrSource = txInterceptor.TransactionAttributeSource;
+            ITransactionAttribute txAttr = txAttrSource.ReturnTransactionAttribute(getDescriptionMethod, typeof (ITestObject));
+            Assert.IsTrue(txAttr.RollbackOn(new System.ApplicationException()));
+
+            txAttr = txAttrSource.ReturnTransactionAttribute(exceptionalMethod, typeof (ITestObject));
+            Assert.IsFalse(txAttr.RollbackOn(new System.ArithmeticException()));
+        }
+    }
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.xml b/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.xml
new file mode 100644
index 00000000..78bda4d5
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+	       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns:tx="http://www.springframework.net/tx"
+         xmlns:aop="http://www.springframework.net/aop"
+         xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/schema/objects/spring-objects.xsd
+         http://www.springframework.net/tx http://www.springframework.net/schema/tx/spring-tx-1.1.xsd">
+
+  <object id="testObjectOperation" type="Spring.Aop.Support.SdkRegularExpressionMethodPointcut, Spring.Aop">
+    <property name="pattern" value="Spring.Objects.TestObject.*"/>
+  </object>
+  
+  <tx:advice id="txAdvice">
+    <tx:attributes>
+      <tx:method name="Get*" read-only="true"/>
+      <tx:method name="Exceptional"/>
+    </tx:attributes>
+  </tx:advice>
+
+  <!-- this advice is not applied, just testing advice definition itself. -->
+  <tx:advice id="txRollbackAdvice">
+    <tx:attributes>
+      <tx:method name="Get*" rollback-for="System.ApplicationException"/>
+      <tx:method name="Exceptional" no-rollback-for="System.ArithmeticException"/>
+    </tx:attributes>
+  </tx:advice>
+  
+  <!-- this will not match any object in the context, just used to check internal registration -->
+  <tx:attribute-driven/>  
+
+
+  <aop:config>
+
+    <aop:advisor pointcut-ref="testObjectOperation" advice-ref="txAdvice"/>
+
+  </aop:config>
+
+
+  <object name="transactionManager" type="Spring.Transaction.CallCountingTransactionManager, Spring.Data.Tests"/>
+
+  <object name="testObject" type="Spring.Objects.TestObject, Spring.Core.Tests"/>
+
+</objects>
diff --git a/test/Spring/Spring.Data.Tests/Transaction/HeuristicCompletionExceptionTests.cs b/test/Spring/Spring.Data.Tests/Transaction/HeuristicCompletionExceptionTests.cs
new file mode 100644
index 00000000..10968348
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/HeuristicCompletionExceptionTests.cs
@@ -0,0 +1,35 @@
+using System;
+using Spring.Transaction;
+using NUnit.Framework;
+
+namespace Spring.Transaction
+{
+	[TestFixture]
+	public class HeuristicCompletionExceptionTests
+	{
+		[Test]
+		public void TransactionOutcomeStateGetter() 
+		{
+			HeuristicCompletionException ex = new HeuristicCompletionException( TransactionOutcomeState.Unknown, new Exception() );
+			Assert.IsTrue( TransactionOutcomeState.Unknown == ex.OutcomeState );
+		}	
+		[Test]
+		public void TransactionOutcomeStateGetterCommittted() 
+		{
+			HeuristicCompletionException ex = new HeuristicCompletionException( TransactionOutcomeState.Committed, new Exception() );
+			Assert.IsTrue( TransactionOutcomeState.Committed == ex.OutcomeState );
+		}
+		[Test]
+		public void TransactionOutcomeStateGetterMixed() 
+		{
+			HeuristicCompletionException ex = new HeuristicCompletionException( TransactionOutcomeState.Mixed, new Exception() );
+			Assert.IsTrue( TransactionOutcomeState.Mixed == ex.OutcomeState );
+		}
+		[Test]
+		public void TransactionOutcomeStateGetterRolledback() 
+		{
+			HeuristicCompletionException ex = new HeuristicCompletionException( TransactionOutcomeState.Rolledback, new Exception() );
+			Assert.IsTrue( TransactionOutcomeState.Rolledback == ex.OutcomeState );
+		}
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/AbstractTransactionAspectTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/AbstractTransactionAspectTests.cs
new file mode 100644
index 00000000..1b0da2e3
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/AbstractTransactionAspectTests.cs
@@ -0,0 +1,252 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Spring.Data;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.Transaction.Interceptor
+{
+    /// <summary>
+    /// Mock object based tests for transaction aspects.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: AbstractTransactionAspectTests.cs,v 1.5 2007/10/21 18:16:58 markpollack Exp $</version>
+    [TestFixture]
+    public abstract class AbstractTransactionAspectTests
+    {
+        private MockRepository mocks;
+
+        [SetUp]
+        public void Setup()
+        {
+            mocks = new MockRepository();
+        }
+
+        [Test]
+        public void CopyAttributes()
+        {
+
+            IPlatformTransactionManager ptm = PlatformTxManagerForNewTransaction();
+            AttributesTransactionAttributeSource tas = new AttributesTransactionAttributeSource();
+            TestObjectMgr to = new TestObjectMgr();
+            ITestObjectMgr ito = (ITestObjectMgr)Advised(to, ptm, tas);
+
+            ito.DeleteTwoTestObjects("foo", "bar");
+
+        }
+
+        [Test]
+        public void CannotCommitTransaction()
+        {
+            ITransactionAttribute txatt = new DefaultTransactionAttribute();
+            MethodInfo m = typeof (ITestObject).GetMethod("GetDescription");
+            MethodMapTransactionAttributeSource tas = new MethodMapTransactionAttributeSource();
+            tas.AddTransactionalMethod(m, txatt);
+
+
+            IPlatformTransactionManager ptm = PlatformTxManagerForNewTransaction();
+
+            ITransactionStatus status = TransactionStatusForNewTransaction();
+            Expect.On(ptm).Call(ptm.GetTransaction(txatt)).Return(status);
+            UnexpectedRollbackException ex = new UnexpectedRollbackException("foobar", null);
+            ptm.Commit(status);
+            LastCall.On(ptm).Throw(ex);
+            mocks.ReplayAll();
+
+            TestObject to = new TestObject();
+            ITestObject ito = (ITestObject) Advised(to, ptm, tas);
+
+            try
+            {
+                ito.GetDescription();
+                Assert.Fail("Shouldn't have succeeded");
+            } catch (UnexpectedRollbackException thrown)
+            {
+                Assert.IsTrue(thrown == ex);
+            }
+
+            mocks.VerifyAll();
+
+
+            
+        }
+
+        private IPlatformTransactionManager PlatformTxManagerForNewTransaction()
+        {
+            return (IPlatformTransactionManager) mocks.DynamicMock(typeof(IPlatformTransactionManager));
+        }
+
+
+        [Test]
+        public void ProgrammaticRollback()
+        {
+            ITransactionAttribute txatt = new DefaultTransactionAttribute();
+            MethodInfo m = typeof(RollbackTestObject).GetMethod("GetDescription");
+
+            MethodMapTransactionAttributeSource tas = new MethodMapTransactionAttributeSource();
+            tas.AddTransactionalMethod(m, txatt);
+
+            ITransactionStatus status = TransactionStatusForNewTransaction();
+
+            IPlatformTransactionManager ptm = PlatformTxManagerForNewTransaction();
+
+            Expect.Call(ptm.GetTransaction(txatt)).Return(status).Repeat.Once();
+            ptm.Commit(status);
+            LastCall.On(ptm).Repeat.Once();
+
+            mocks.ReplayAll();
+            
+            RollbackTestObject to = new RollbackTestObject();
+
+            ITestObject ito = (ITestObject) Advised(to, ptm, tas);
+
+            Assert.AreEqual("test description", ito.GetDescription());
+
+            mocks.VerifyAll();
+
+
+        }
+
+        [Test]
+        public void RollbackOnException()
+        {
+            DoTestRollbackOnException(new Exception(), true, false);
+        }
+
+        [Test]
+        public void NoRollbackOnException()
+        {
+            DoTestRollbackOnException(new Exception(), false, false);
+        }
+
+        [Test]
+        public void RollbackOnExceptionWithRollbackException()
+        {
+            DoTestRollbackOnException(new Exception(), true, true);
+        }
+
+        [Test]
+        public void NoRollbackOnExceptionWithRollbackException()
+        {
+            DoTestRollbackOnException(new Exception(), false, true);
+        }
+
+        private void DoTestRollbackOnException(Exception exception, bool shouldRollback, bool rollbackException)
+        {
+            ITransactionAttribute txatt = new ConfigurableTransactionAttribute(shouldRollback);
+
+
+            MethodInfo mi = typeof (ITestObject).GetMethod("Exceptional");
+
+            MethodMapTransactionAttributeSource tas = new MethodMapTransactionAttributeSource();
+            tas.AddTransactionalMethod(mi, txatt);
+            ITransactionStatus status = TransactionStatusForNewTransaction();
+
+            IPlatformTransactionManager ptm =
+                (IPlatformTransactionManager) mocks.DynamicMock(typeof (IPlatformTransactionManager));
+
+            
+            Expect.On(ptm).Call(ptm.GetTransaction(txatt)).Return(status);
+            
+
+            if (shouldRollback)
+            {
+                ptm.Rollback(status);
+            }
+            else
+            {
+                ptm.Commit(status);
+            }
+            TransactionSystemException tex = new TransactionSystemException("system exception");
+            if (rollbackException)
+            {
+                LastCall.On(ptm).Throw(tex).Repeat.Once();
+            }
+            else
+            {
+                LastCall.On(ptm).Repeat.Once();
+            }
+            mocks.ReplayAll();
+
+            TestObject to = new TestObject();
+            ITestObject ito = (ITestObject) Advised(to, ptm, tas);
+
+            try
+            {
+                ito.Exceptional(exception);
+                Assert.Fail("Should have thrown exception");
+            } catch (Exception e)
+            {
+                if (rollbackException)
+                {
+                    Assert.AreEqual(tex, e);
+                }
+                else
+                {
+                    Assert.AreEqual(exception, e);
+                }
+            }
+
+            mocks.VerifyAll();
+
+        }
+
+        private ITransactionStatus TransactionStatusForNewTransaction()
+        {
+            return (ITransactionStatus) mocks.DynamicMock(typeof (ITransactionStatus));
+        }
+
+        protected abstract object Advised(object target, IPlatformTransactionManager ptm,
+                                               ITransactionAttributeSource tas);
+    }
+
+    internal class RollbackTestObject : TestObject
+    {
+        public override string GetDescription()
+        {
+            ITransactionStatus txStatus = TransactionInterceptor.CurrentTransactionStatus;
+            txStatus.RollbackOnly = true;
+            return "test description";
+        }
+
+    }
+
+    internal class ConfigurableTransactionAttribute : DefaultTransactionAttribute
+    {
+        private bool shouldRollback;
+        public ConfigurableTransactionAttribute(bool shouldRollback)
+        {
+            this.shouldRollback = shouldRollback;
+        }
+
+        public override bool RollbackOn(Exception exception)
+        {
+            return shouldRollback;
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/DefaultTransactionAttributeTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/DefaultTransactionAttributeTests.cs
new file mode 100644
index 00000000..e43e933d
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/DefaultTransactionAttributeTests.cs
@@ -0,0 +1,24 @@
+using System;
+using NUnit.Framework;
+
+namespace Spring.Transaction.Interceptor
+{
+	[TestFixture]
+	public class DefaultTransactionAttributeTests
+	{
+		[Test]
+		public void RollbackOnTests()
+		{
+			DefaultTransactionAttribute dta = new DefaultTransactionAttribute();
+			Assert.IsTrue( dta.RollbackOn( new SystemException()));
+            //mlp 3/17 changed rollback to rollback on all exceptions.
+			Assert.IsTrue( dta.RollbackOn( new TransactionSystemException()));
+		}
+		[Test]
+		public void ToStringTests()
+		{
+			DefaultTransactionAttribute dta = new DefaultTransactionAttribute();
+			Assert.AreEqual( "PROPAGATION_Required,ISOLATION_ReadCommitted,-System.Exception", dta.ToString());
+		}
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/MatchAlwaysTransactionAttributeSourceTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/MatchAlwaysTransactionAttributeSourceTests.cs
new file mode 100644
index 00000000..c6f4e821
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/MatchAlwaysTransactionAttributeSourceTests.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections;
+using System.Data;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Core.TypeResolution;
+
+namespace Spring.Transaction.Interceptor
+{
+    /// <summary>
+    /// Test MatchAlwaysTransactionAttributeSourceTests
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: MatchAlwaysTransactionAttributeSourceTests.cs,v 1.7 2008/05/27 19:07:03 markpollack Exp $</version>
+    [TestFixture]
+    public class MatchAlwaysTransactionAttributeSourceTests
+    {
+        [Test]
+        public void GetTransactionAttribute()
+        {
+            MatchAlwaysTransactionAttributeSource tas = new MatchAlwaysTransactionAttributeSource();
+            ITransactionAttribute ta = tas.ReturnTransactionAttribute(typeof (Object).GetMethod("GetHashCode"), null);
+            Assert.IsNotNull(ta);
+            Assert.IsTrue(TransactionPropagation.Required == ta.PropagationBehavior);
+            tas.TransactionAttribute = new DefaultTransactionAttribute(TransactionPropagation.Supports);
+            ta =
+                tas.ReturnTransactionAttribute(typeof (DataException).GetType().GetMethod("GetHashCode"),
+                                               typeof (DataException));
+            Assert.IsNotNull(ta);
+            Assert.IsTrue(TransactionPropagation.Supports == ta.PropagationBehavior);
+        }
+
+
+        [Test]
+        public void CanConfigureInAppContext()
+        {
+            TypeRegistry.RegisterType("TransactionPropagation", typeof(TransactionPropagation));
+            IApplicationContext ctx =
+                new XmlApplicationContext(
+                    "assembly://Spring.Data.Tests/Spring.Transaction.Interceptor/MatchAlwaysTransactionAttributeSourceTests.xml");
+            MatchAlwaysTransactionAttributeSource tas =
+                (MatchAlwaysTransactionAttributeSource) ctx.GetObject("MatchAlwaysTransactionAttributeSource");
+            Assert.AreEqual(TransactionPropagation.RequiresNew,
+                            tas.ReturnTransactionAttribute(null, null).PropagationBehavior);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/MatchAlwaysTransactionAttributeSourceTests.xml b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/MatchAlwaysTransactionAttributeSourceTests.xml
new file mode 100644
index 00000000..c1df9f7b
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/MatchAlwaysTransactionAttributeSourceTests.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns='http://www.springframework.net'>
+  <object id="MatchAlwaysTransactionAttributeSource"
+          type="Spring.Transaction.Interceptor.MatchAlwaysTransactionAttributeSource, Spring.Data">
+
+    <property name="transactionAttribute" value="PROPAGATION_REQUIRES_NEW" />
+  
+  </object>
+</objects>
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/NoRollbackRuleAttributeTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/NoRollbackRuleAttributeTests.cs
new file mode 100644
index 00000000..40999406
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/NoRollbackRuleAttributeTests.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Data;
+using System.Text;
+using NUnit.Framework;
+using Spring.Aop.Framework;
+
+namespace Spring.Transaction.Interceptor
+{
+	[TestFixture]
+	public class NoNoRollbackRuleAttributeTests
+	{
+		[Test]
+		public void FoundImmediatelyWithString()
+		{
+			NoRollbackRuleAttribute rr = new NoRollbackRuleAttribute("System.Exception");
+			Assert.IsTrue(rr.GetDepth(typeof(Exception)) == 0);
+		}
+		[Test]
+		public void FoundImmediatelyWithClass()
+		{
+			NoRollbackRuleAttribute rr = new NoRollbackRuleAttribute(typeof(Exception));
+			Assert.IsTrue(rr.GetDepth(typeof(Exception)) == 0);
+		}
+		[Test]
+		public void NotFound()
+		{
+			NoRollbackRuleAttribute rr = new NoRollbackRuleAttribute("System.Data.DataException");
+			Assert.IsTrue(rr.GetDepth(typeof(ApplicationException)) == -1);
+		}
+		[Test]
+		public void Ancestry()
+		{
+			NoRollbackRuleAttribute rr = new NoRollbackRuleAttribute("System.Exception");
+			Assert.IsTrue(rr.GetDepth(typeof(DataException)) == 2);
+		}
+		[Test]
+		public void AlwaysTrue()
+		{
+			NoRollbackRuleAttribute rr = new NoRollbackRuleAttribute("System.Exception");
+			Assert.IsTrue(rr.GetDepth(typeof(SystemException)) > 0);
+			Assert.IsTrue(rr.GetDepth(typeof(ApplicationException)) > 0);
+			Assert.IsTrue(rr.GetDepth(typeof(DataException)) > 0);
+			Assert.IsTrue(rr.GetDepth(typeof(TransactionSystemException)) > 0);
+		}
+		[Test]
+		[ExpectedException(typeof(AopConfigException))]
+		public void ConstructorArgMustBeAExceptionClass()
+		{
+			new NoRollbackRuleAttribute( typeof( StringBuilder ) );
+		}
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/RollbackRuleAttributeTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/RollbackRuleAttributeTests.cs
new file mode 100644
index 00000000..1bf95286
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/RollbackRuleAttributeTests.cs
@@ -0,0 +1,101 @@
+#region License
+
+/*
+ * Copyright 2002-2008 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.Data;
+using System.Text;
+using NUnit.Framework;
+using Spring.Aop.Framework;
+
+namespace Spring.Transaction.Interceptor
+{
+    [TestFixture]
+    public class RollbackRuleAttributeTests
+    {
+        [Test]
+        public void FoundImmediatelyWithString()
+        {
+            RollbackRuleAttribute rr = new RollbackRuleAttribute("System.Exception");
+            Assert.IsTrue(rr.GetDepth(typeof (Exception)) == 0);
+        }
+
+        [Test]
+        public void FoundImmediatelyWithClass()
+        {
+            RollbackRuleAttribute rr = new RollbackRuleAttribute(typeof (Exception));
+            Assert.IsTrue(rr.GetDepth(new Exception()) == 0);
+        }
+
+        [Test]
+        public void FoundImmediatelyWithType()
+        {
+            RollbackRuleAttribute rr = new RollbackRuleAttribute(typeof (Exception));
+            Assert.IsTrue(rr.GetDepth(typeof (Exception)) == 0);
+        }
+
+        [Test]
+        public void NotFound()
+        {
+            RollbackRuleAttribute rr = new RollbackRuleAttribute("System.Data.DataException");
+            Assert.IsTrue(rr.GetDepth(typeof (ApplicationException)) == -1);
+        }
+
+        [Test]
+        public void Ancestry()
+        {
+            RollbackRuleAttribute rr = new RollbackRuleAttribute("System.Exception");
+            Assert.IsTrue(rr.GetDepth(typeof (DataException)) == 2);
+        }
+
+        [Test]
+        public void AlwaysTrue()
+        {
+            RollbackRuleAttribute rr = new RollbackRuleAttribute("System.Exception");
+            Assert.IsTrue(rr.GetDepth(typeof (SystemException)) > 0);
+            Assert.IsTrue(rr.GetDepth(typeof (ApplicationException)) > 0);
+            Assert.IsTrue(rr.GetDepth(typeof (DataException)) > 0);
+            Assert.IsTrue(rr.GetDepth(typeof (TransactionSystemException)) > 0);
+        }
+
+        [Test]
+        [ExpectedException(typeof (AopConfigException))]
+        public void ConstructorArgMustBeAExceptionClass()
+        {
+            new RollbackRuleAttribute(typeof (StringBuilder));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void ConstructorArgMustBeAExceptionClassWithNullThrowableType()
+        {
+            new RollbackRuleAttribute((Type)null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void ConstructorArgExceptionStringNameVersionWithNull()
+        {
+            new RollbackRuleAttribute((String)null);
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/RuleBasedTransactionAttributeTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/RuleBasedTransactionAttributeTests.cs
new file mode 100644
index 00000000..9ac6438a
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/RuleBasedTransactionAttributeTests.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Collections;
+using System.Data;
+using NUnit.Framework;
+using Spring.Collections;
+
+namespace Spring.Transaction.Interceptor
+{
+	[TestFixture]
+	public class RuleBasedTransactionAttributeTests
+	{
+		[Test]
+			public void DefaultRule()
+		{
+			RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute();
+			Assert.IsTrue(rta.RollbackOn(new SystemException()));
+            //mlp 3/17 changed rollback to rollback on all exceptions.
+			Assert.IsTrue(rta.RollbackOn(new ApplicationException()));
+			Assert.IsTrue( rta.RollbackOn(new TransactionSystemException()));
+		}
+		[Test]
+			public void RuleForRollbackOnApplicationException()
+		{
+			IList list = new LinkedList();
+			list.Add(new RollbackRuleAttribute("Spring.Transaction.TransactionSystemException"));
+			RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute( TransactionPropagation.Required, list );
+
+			Assert.IsTrue( rta.RollbackOn(new SystemException()));
+            //mlp 3/17 changed rollback to rollback on all exceptions.
+			Assert.IsTrue( rta.RollbackOn(new ApplicationException()));
+			Assert.IsTrue(( rta.RollbackOn( new TransactionSystemException())));
+		}
+		[Test]
+			public void RuleForCommitOnUnchecked()
+		{
+			IList list = new LinkedList();
+			list.Add( new NoRollbackRuleAttribute("System.SystemException"));
+			list.Add(new RollbackRuleAttribute("Spring.Transaction.TransactionSystemException"));
+
+			RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute( TransactionPropagation.Required, list );
+			Assert.IsFalse( rta.RollbackOn(new SystemException()));
+			Assert.IsTrue( rta.RollbackOn(new TransactionSystemException()));
+		}
+		[Test]
+			public void RuleForSelectiveRollbackOnCheckedWithString()
+		{
+			IList list = new LinkedList();
+			list.Add( new RollbackRuleAttribute("Spring.Transaction.TransactionSystemException"));
+			RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute( TransactionPropagation.Required, list );
+			ruleForSelectionRollbackOnChecked( rta );
+		}
+		[Test]
+			public void RuleForSelectiveRollbackOnCheckedWithClass()
+		{
+			IList list = new LinkedList();
+			list.Add( new RollbackRuleAttribute(typeof(TransactionSystemException)));
+			RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute( TransactionPropagation.Required, list );
+			ruleForSelectionRollbackOnChecked( rta );
+		}
+		private void ruleForSelectionRollbackOnChecked( RuleBasedTransactionAttribute rta )
+		{
+			Assert.IsTrue(rta.RollbackOn(new SystemException()));
+			Assert.IsTrue( rta.RollbackOn(new TransactionSystemException()));
+		}
+		[Test]
+			public void RuleForCommitOnSubclassOfChecked()
+		{
+			IList list = new LinkedList();
+			list.Add( new RollbackRuleAttribute("System.Data.DataException"));
+			list.Add( new NoRollbackRuleAttribute("Spring.Transaction.TransactionSystemException"));
+			RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute( TransactionPropagation.Required, list );
+			
+			Assert.IsTrue( rta.RollbackOn(new SystemException()));
+			Assert.IsFalse( rta.RollbackOn(new TransactionSystemException()));																		 
+		}
+		[Test]
+			public void RollbackNever()
+		{
+			IList list = new LinkedList();
+			list.Add( new NoRollbackRuleAttribute("System.Exception"));
+			RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute( TransactionPropagation.Required, list );
+
+			Assert.IsFalse(rta.RollbackOn(new SystemException()));
+			Assert.IsFalse(rta.RollbackOn(new DataException()));
+			Assert.IsFalse(rta.RollbackOn(new ApplicationException()));
+			Assert.IsFalse(rta.RollbackOn(new TransactionSystemException()));
+		}
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeEditorTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeEditorTests.cs
new file mode 100644
index 00000000..c5e87b5a
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeEditorTests.cs
@@ -0,0 +1,158 @@
+using System;
+using System.Data;
+using System.Runtime.Remoting;
+using NUnit.Framework;
+
+namespace Spring.Transaction.Interceptor
+{
+	[TestFixture]
+	public class TransactionAttributeEditorTests
+	{
+		[Test]
+		public void NullTest()
+		{
+			TransactionAttributeEditor editor = new TransactionAttributeEditor( );
+			editor.SetAsText( null );
+			ITransactionAttribute ta = editor.Value;
+			Assert.IsNull( ta );
+		}
+
+		[Test]
+		public void EmptyStringTest()
+		{
+			TransactionAttributeEditor editor = new TransactionAttributeEditor( );
+			editor.SetAsText( String.Empty );
+			ITransactionAttribute ta = editor.Value;
+			Assert.IsNull( ta );
+		}
+
+		[Test]
+		public void ValidPropagationCodeOnly()
+		{
+			TransactionAttributeEditor editor = new TransactionAttributeEditor( );
+			editor.SetAsText( "PROPAGATION_REQUIRED" );
+			ITransactionAttribute ta = editor.Value;
+			Assert.IsTrue( ta != null );
+			Assert.IsTrue( ta.PropagationBehavior == TransactionPropagation.Required );
+			Assert.IsTrue( ta.TransactionIsolationLevel == IsolationLevel.ReadCommitted );
+			Assert.IsFalse( ta.ReadOnly );
+		}
+
+		[Test]
+		[ExpectedException( typeof ( ArgumentException ) )]
+		public void InvalidPropagationCodeOnly()
+		{
+			TransactionAttributeEditor editor = new TransactionAttributeEditor( );
+			editor.SetAsText( "INVALIDPROPAGATIONCODE" );
+		}
+
+		[Test]
+		public void ValidPropagationCodeAndIsolationCode()
+		{
+			TransactionAttributeEditor editor = new TransactionAttributeEditor( );
+			editor.SetAsText( "PROPAGATION_REQUIRED, ISOLATION_READUNCOMMITTED" );
+			ITransactionAttribute ta = editor.Value;
+			Assert.IsTrue( ta != null );
+			Assert.IsTrue( ta.PropagationBehavior == TransactionPropagation.Required );
+			Assert.IsTrue( ta.TransactionIsolationLevel == IsolationLevel.ReadUncommitted );
+		}
+
+		[Test]
+		[ExpectedException( typeof ( ArgumentException ) )]
+		public void ValidPropagationAndIsolationCodeAndInvalidRollbackRule()
+		{
+			TransactionAttributeEditor editor = new TransactionAttributeEditor( );
+			editor.SetAsText( "PROPAGATION_REQUIRED,ISOLATION_READUNCOMMITTED,XXX" );
+		}
+
+		[Test]
+		public void ValidPropagationCodeAndIsolationCodeAndRollbackRules1()
+		{
+			TransactionAttributeEditor editor = new TransactionAttributeEditor( );
+			editor.SetAsText( "PROPAGATION_MANDATORY,ISOLATION_REPEATABLEREAD,timeout_10,-DataException,+RemotingException" );
+			ITransactionAttribute ta = editor.Value;
+			Assert.IsNotNull( ta );
+			Assert.IsTrue( ta.PropagationBehavior == TransactionPropagation.Mandatory );
+			Assert.IsTrue( ta.TransactionIsolationLevel == IsolationLevel.RepeatableRead );
+			Assert.IsTrue( ta.TransactionTimeout == 10 );
+			Assert.IsFalse( ta.ReadOnly );
+			Assert.IsTrue( ta.RollbackOn( new SystemException( ) ) );
+			// Check for our bizarre customized rollback rules
+			Assert.IsTrue( ta.RollbackOn( new DataException( ) ) );
+			Assert.IsTrue( !ta.RollbackOn( new RemotingException( ) ) );
+		}
+
+		[Test]
+		public void ValidPropagationCodeAndIsolationCodeAndRollbackRules2()
+		{
+			TransactionAttributeEditor editor = new TransactionAttributeEditor( );
+			editor.SetAsText( "+DataException,readOnly,ISOLATION_READCOMMITTED,-RemotingException,PROPAGATION_SUPPORTS" );
+			ITransactionAttribute ta = editor.Value;
+			Assert.IsNotNull( ta );
+			Assert.IsTrue( ta.PropagationBehavior == TransactionPropagation.Supports );
+			Assert.IsTrue( ta.TransactionIsolationLevel == IsolationLevel.ReadCommitted );
+			Assert.IsTrue( ta.TransactionTimeout == -1 );
+			Assert.IsTrue( ta.ReadOnly );
+			Assert.IsTrue( ta.RollbackOn( new SystemException( ) ) );
+			// Check for our bizarre customized rollback rules
+			Assert.IsFalse( ta.RollbackOn( new DataException( ) ) );
+			Assert.IsTrue( ta.RollbackOn( new RemotingException( ) ) );
+		}
+
+		[Test]
+		public void DefaultTransactionAttributeToString()
+		{
+			DefaultTransactionAttribute source = new DefaultTransactionAttribute( );
+			source.PropagationBehavior = TransactionPropagation.Supports;
+			source.TransactionIsolationLevel = IsolationLevel.RepeatableRead;
+			source.TransactionTimeout = 10;
+			source.ReadOnly = true;
+
+			TransactionAttributeEditor editor = new TransactionAttributeEditor( );
+			editor.SetAsText( source.ToString( ) );
+			ITransactionAttribute ta = editor.Value;
+			Assert.AreEqual( source, ta );
+			Assert.AreEqual( ta.PropagationBehavior, TransactionPropagation.Supports );
+			Assert.AreEqual( ta.TransactionIsolationLevel, IsolationLevel.RepeatableRead );
+			Assert.AreEqual( ta.TransactionTimeout, 10 );
+			Assert.IsTrue( ta.ReadOnly );
+			Assert.IsTrue( ta.RollbackOn( new SystemException( ) ) );
+            //mlp 3/17 changed rollback to rollback on all exceptions.
+			Assert.IsTrue( ta.RollbackOn( new ApplicationException( ) ) );
+
+			source.TransactionTimeout = 9;
+			Assert.IsFalse( ta == source );
+			source.TransactionTimeout = 10;
+			Assert.AreEqual( ta, source );
+		}
+
+		[Test]
+			public void RuleBasedTransactionAttributeToString()
+		{
+			RuleBasedTransactionAttribute source = new RuleBasedTransactionAttribute();
+			source.PropagationBehavior = TransactionPropagation.Supports;
+			source.TransactionIsolationLevel = IsolationLevel.RepeatableRead;
+			source.TransactionTimeout = 10;
+			source.ReadOnly = true;
+			source.AddRollbackRule( new RollbackRuleAttribute("ArgumentException"));
+			source.AddRollbackRule( new NoRollbackRuleAttribute("IllegalTransactionStateException"));
+
+			TransactionAttributeEditor editor = new TransactionAttributeEditor();
+			editor.SetAsText( source.ToString() );
+			ITransactionAttribute ta = editor.Value;
+			Assert.AreEqual( source, ta );
+			Assert.AreEqual( ta.PropagationBehavior, TransactionPropagation.Supports );
+			Assert.AreEqual( ta.TransactionIsolationLevel, IsolationLevel.RepeatableRead );
+			Assert.AreEqual( ta.TransactionTimeout, 10 );
+			Assert.IsTrue( ta.ReadOnly );
+			Assert.IsTrue(ta.RollbackOn(new ArgumentException()));
+			Assert.IsFalse( ta.RollbackOn(new IllegalTransactionStateException()));
+		
+			source.ClearRollbackRules();
+			Assert.IsFalse( ta == source );
+			source.AddRollbackRule( new RollbackRuleAttribute("ArgumentException"));
+			source.AddRollbackRule( new NoRollbackRuleAttribute("IllegalTransactionStateException"));
+			Assert.AreEqual( ta, source );
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeSourceAdvisorTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeSourceAdvisorTests.cs
new file mode 100644
index 00000000..3adb1c9e
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeSourceAdvisorTests.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Specialized;
+using NUnit.Framework;
+using Spring.Util;
+
+namespace Spring.Transaction.Interceptor
+{
+	[TestFixture]
+	public class TransactionAttributeSourceAdvisorTests
+	{
+		[Test]
+		public void Serializability()
+		{
+			TransactionInterceptor ti = new TransactionInterceptor();
+			ti.TransactionAttributes = new NameValueCollection();
+			TransactionAttributeSourceAdvisor tas = new TransactionAttributeSourceAdvisor(ti);
+			SerializationTestUtils.SerializeAndDeserialize(tas);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeSourceEditorTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeSourceEditorTests.cs
new file mode 100644
index 00000000..8da00917
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeSourceEditorTests.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Data;
+using System.Reflection;
+using NUnit.Framework;
+
+namespace Spring.Transaction.Interceptor
+{
+	[TestFixture]
+	public class TransactionAttributeSourceEditorTests
+	{
+		[Test]
+		public void Null()
+		{
+			TransactionAttributeSourceEditor pe = new TransactionAttributeSourceEditor();
+			pe.SetAsText(null);
+			ITransactionAttributeSource tas = pe.Value;
+			MethodInfo m = typeof(object).GetMethod("GetHashCode");
+			Assert.IsTrue(tas.ReturnTransactionAttribute(m, null) == null);
+		}
+		[Test]
+			[ExpectedException(typeof(ArgumentException))]
+			public void Invalid()
+		{
+			TransactionAttributeSourceEditor pe = new TransactionAttributeSourceEditor();
+			pe.SetAsText("foo=bar");
+		}
+		[Test]
+			public void MatchesSpecific()
+		{
+			TransactionAttributeSourceEditor pe = new TransactionAttributeSourceEditor();
+			pe.SetAsText("System.Object.GetHashCode, Mscorlib =PROPAGATION_REQUIRED\n" +
+				"System.Object.Equals, Mscorlib =PROPAGATION_MANDATORY\n" +
+				"System.Object.*pe, Mscorlib=PROPAGATION_SUPPORTS");
+			ITransactionAttributeSource tas = pe.Value;
+
+			checkTransactionProperties(tas, typeof(object).GetMethod("GetHashCode"), TransactionPropagation.Required);
+			checkTransactionProperties(tas, typeof(object).GetMethod("Equals", new Type[] { typeof(object) }),TransactionPropagation.Mandatory);
+			checkTransactionProperties(tas, typeof(object).GetMethod( "GetType" ), TransactionPropagation.Supports);
+			checkTransactionProperties(tas, typeof(object).GetMethod("ToString") );
+		}
+		[Test]
+			public void MatchesAll()
+		{
+			TransactionAttributeSourceEditor pe = new TransactionAttributeSourceEditor();
+			pe.SetAsText("System.Object.*, Mscorlib=PROPAGATION_REQUIRED");
+			ITransactionAttributeSource tas = pe.Value;
+
+			checkTransactionProperties(tas, typeof(object).GetMethod("GetHashCode"), TransactionPropagation.Required);
+			checkTransactionProperties(tas, typeof(object).GetMethod("Equals", new Type[] { typeof(object) }),TransactionPropagation.Required);
+			checkTransactionProperties(tas, typeof(object).GetMethod("GetType"), TransactionPropagation.Required);
+			checkTransactionProperties(tas, typeof(object).GetMethod("ToString"), TransactionPropagation.Required);
+		}
+		private void checkTransactionProperties( ITransactionAttributeSource tas, MethodInfo method )
+		{
+			ITransactionAttribute ta = tas.ReturnTransactionAttribute( method, null );
+			Assert.IsNull(ta);
+		}
+		private void checkTransactionProperties( ITransactionAttributeSource tas, MethodInfo method, TransactionPropagation transactionPropagation )
+		{
+			ITransactionAttribute ta = tas.ReturnTransactionAttribute( method, null );
+			Assert.IsTrue( ta != null );
+			Assert.IsTrue( ta.TransactionIsolationLevel == IsolationLevel.ReadCommitted );
+			Assert.IsTrue( ta.PropagationBehavior == transactionPropagation);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeSourceTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeSourceTests.cs
new file mode 100644
index 00000000..d65bdd59
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionAttributeSourceTests.cs
@@ -0,0 +1,128 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System.Collections;
+using System.Collections.Specialized;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Transaction.Interceptor
+{
+    /// <summary>
+    /// This class contains tests for the various
+    /// <see cref="ITransactionAttributeSource"/> implementations.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: TransactionAttributeSourceTests.cs,v 1.1 2008/05/27 19:07:03 markpollack Exp $</version>
+    [TestFixture]
+    public class TransactionAttributeSourceTests
+    {
+        [Test]
+        public void MethodMapTransactionAttributeSource()
+        {
+            MethodMapTransactionAttributeSource tas = new MethodMapTransactionAttributeSource();
+            IDictionary methodMap = new Hashtable();
+            methodMap.Add("System.Object.GetHashCode, mscorlib", "PROPAGATION_REQUIRED");
+            methodMap.Add("System.Object.ToString, mscorlib",
+                          new DefaultTransactionAttribute(TransactionPropagation.Supports));
+            tas.MethodMap = methodMap;
+
+            ITransactionAttribute ta = tas.ReturnTransactionAttribute(typeof(object).GetMethod("GetHashCode"), null);
+            Assert.IsNotNull(ta);
+            Assert.AreEqual(TransactionPropagation.Required, ta.PropagationBehavior);
+
+            ta = tas.ReturnTransactionAttribute(typeof(object).GetMethod("ToString"), null);
+            Assert.IsNotNull(ta);
+            Assert.AreEqual(TransactionPropagation.Supports, ta.PropagationBehavior);
+        }
+
+
+        /// <summary>
+        /// Test that configuration of the IDictionary baesd map supports transaction attribute information
+        /// set via object (i.e. DefaultTransactionAttribute) as well as strings.
+        /// </summary>
+        [Test]
+        public void NameMatchTransactionAttributeSource()
+        {
+            NameMatchTransactionAttributeSource tas = new NameMatchTransactionAttributeSource();
+            IDictionary methodMap = new Hashtable();                     
+            methodMap.Add("GetHashCode", "PROPAGATION_REQUIRED");
+            methodMap.Add("ToString", new DefaultTransactionAttribute(TransactionPropagation.Supports));
+            tas.NameMap = methodMap;            
+            ITransactionAttribute ta = tas.ReturnTransactionAttribute(typeof (object).GetMethod("GetHashCode"), null);
+            Assert.IsNotNull(ta);
+            Assert.AreEqual(TransactionPropagation.Required, ta.PropagationBehavior);
+            ta = tas.ReturnTransactionAttribute(typeof (object).GetMethod("ToString"), null);
+            Assert.IsNotNull(ta);
+            Assert.AreEqual(TransactionPropagation.Supports, ta.PropagationBehavior);
+        }
+
+        [Test]
+        public void NameMatchTransactionAttributeSourceWithStarAtStartOfMethodName()
+        {
+            NameMatchTransactionAttributeSource tas = new NameMatchTransactionAttributeSource();
+            NameValueCollection attributes = new NameValueCollection();
+            attributes.Add("*ashCode", "PROPAGATION_REQUIRED");
+            tas.NameProperties = attributes;
+            ITransactionAttribute ta = tas.ReturnTransactionAttribute(typeof (object).GetMethod("GetHashCode"), null);
+            Assert.IsNotNull(ta);
+            Assert.AreEqual(TransactionPropagation.Required, ta.PropagationBehavior);
+        }
+
+        [Test]
+        public void NameMatchTransactionAttributeSourceWithStarAtEndOfMethodName()
+        {
+            NameMatchTransactionAttributeSource tas = new NameMatchTransactionAttributeSource();
+            NameValueCollection attributes = new NameValueCollection();
+            attributes.Add("GetHashCod*", "PROPAGATION_REQUIRED");
+            tas.NameProperties = attributes;
+            ITransactionAttribute ta = tas.ReturnTransactionAttribute(typeof(object).GetMethod("GetHashCode"), null);
+            Assert.IsNotNull(ta);
+            Assert.AreEqual(TransactionPropagation.Required, ta.PropagationBehavior);
+        }
+
+        [Test]
+        public void NameMatchTransactionAttributeSourceMostSpecificMethodNameIsDefinitelyMatched()
+        {
+            NameMatchTransactionAttributeSource tas = new NameMatchTransactionAttributeSource();
+            NameValueCollection attributes = new NameValueCollection();
+            attributes.Add("*", "PROPAGATION_REQUIRED");
+            attributes.Add("GetHashCode", "PROPAGATION_MANDATORY");
+            tas.NameProperties = attributes;
+            ITransactionAttribute ta = tas.ReturnTransactionAttribute(typeof(object).GetMethod("GetHashCode"), null);
+            Assert.IsNotNull(ta);
+            Assert.AreEqual(TransactionPropagation.Mandatory, ta.PropagationBehavior);
+        }
+
+        [Test]
+        public void NameMatchTransactionAttributeSourceWithEmptyMethodName()
+        {
+            NameMatchTransactionAttributeSource tas = new NameMatchTransactionAttributeSource();
+            NameValueCollection attributes = new NameValueCollection();
+            attributes.Add("", "PROPAGATION_MANDATORY");
+            tas.NameProperties = attributes;
+            ITransactionAttribute ta = tas.ReturnTransactionAttribute(typeof(object).GetMethod("GetHashCode"), null);
+            Assert.IsNull(ta);            
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionInterceptorTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionInterceptorTests.cs
new file mode 100644
index 00000000..65ce4dfb
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Interceptor/TransactionInterceptorTests.cs
@@ -0,0 +1,53 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Aop.Framework;
+
+#endregion
+
+namespace Spring.Transaction.Interceptor
+{
+    /// <summary>
+    /// This class contains mock objects tests the TransactionInterceptor 
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: TransactionInterceptorTests.cs,v 1.3 2007/10/21 18:16:58 markpollack Exp $</version>
+    [TestFixture]
+    public class TransactionInterceptorTests : AbstractTransactionAspectTests
+    {
+       
+
+        protected override object Advised(object target, IPlatformTransactionManager ptm,
+                                          ITransactionAttributeSource tas)
+        {
+            TransactionInterceptor ti = new TransactionInterceptor();
+            ti.TransactionManager = ptm;
+            Assert.AreEqual(ptm, ti.TransactionManager);
+            ti.TransactionAttributeSource = tas;
+            Assert.AreEqual(tas, ti.TransactionAttributeSource);
+            ProxyFactory pf = new ProxyFactory(target);
+            pf.AddAdvice(0, ti);
+            return pf.GetProxy();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Data.Tests/Transaction/InvalidTimeoutExceptionTests.cs b/test/Spring/Spring.Data.Tests/Transaction/InvalidTimeoutExceptionTests.cs
new file mode 100644
index 00000000..2179fae9
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/InvalidTimeoutExceptionTests.cs
@@ -0,0 +1,17 @@
+using System;
+using Spring.Transaction;
+using NUnit.Framework;
+
+namespace Spring.Transaction
+{
+	[TestFixture]
+	public class InvalidTimeoutExceptionTests
+	{
+		[Test]
+		public void TimeoutGetter()
+		{
+			InvalidTimeoutException ex = new InvalidTimeoutException( "bad timeout", 2000 );
+			Assert.IsTrue( 2000 == ex.Timeout );
+		}
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Support/AbstractPlatformTransactionManagerTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Support/AbstractPlatformTransactionManagerTests.cs
new file mode 100644
index 00000000..1a01a600
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Support/AbstractPlatformTransactionManagerTests.cs
@@ -0,0 +1,220 @@
+using System;
+using NUnit.Framework;
+
+namespace Spring.Transaction.Support
+{
+	[TestFixture]
+	public class AbstractPlatformTransactionManagerTests
+	{
+		private MockTxnPlatformMgrAbstract _mockTxnMgr;
+		
+		[SetUp]
+		public void Init()
+		{
+			_mockTxnMgr = new MockTxnPlatformMgrAbstract();
+			if ( TransactionSynchronizationManager.SynchronizationActive ) 
+			{
+				TransactionSynchronizationManager.ClearSynchronization();
+			}
+		}
+		[TearDown]
+		public void Destroy()
+		{
+			_mockTxnMgr.Verify();
+			_mockTxnMgr = null;
+			if ( TransactionSynchronizationManager.SynchronizationActive ) 
+			{
+				TransactionSynchronizationManager.ClearSynchronization();
+			}
+		}
+		[Test]
+		public void VanillaProperties()
+		{
+			Assert.AreEqual( TransactionSynchronizationState.Always, _mockTxnMgr.TransactionSynchronization);	
+			Assert.IsTrue(!_mockTxnMgr.NestedTransactionsAllowed);
+			Assert.IsTrue(!_mockTxnMgr.RollbackOnCommitFailure);
+			
+			_mockTxnMgr.NestedTransactionsAllowed = true;
+			_mockTxnMgr.RollbackOnCommitFailure = true;
+			_mockTxnMgr.TransactionSynchronization = TransactionSynchronizationState.OnActualTransaction;
+			
+			Assert.AreEqual( TransactionSynchronizationState.OnActualTransaction, _mockTxnMgr.TransactionSynchronization);	
+			Assert.IsTrue(_mockTxnMgr.NestedTransactionsAllowed);
+			Assert.IsTrue(_mockTxnMgr.RollbackOnCommitFailure);
+		}
+		[Test]
+		[ExpectedException(typeof(InvalidTimeoutException), "Invalid transaction timeout")]
+		public void DefinitionInvalidTimeoutException()
+		{
+			MockTxnDefinition def = new MockTxnDefinition();	
+			def.TransactionTimeout = -1000;
+			_mockTxnMgr.GetTransaction( def );
+		}
+		[Test]
+		[ExpectedException(typeof(IllegalTransactionStateException), "Transaction propagation 'mandatory' but no existing transaction found")]
+		public void DefinitionInvalidPropagationState()
+		{
+			MockTxnDefinition def = new MockTxnDefinition();	
+			def.PropagationBehavior = TransactionPropagation.Mandatory;
+			_mockTxnMgr.GetTransaction( def );
+		}
+
+		[Test]
+		[ExpectedException(typeof(IllegalTransactionStateException), "Transaction propagation 'never' but existing transaction found.")]
+		public void NeverPropagateState()
+		{
+			MockTxnDefinition def = new MockTxnDefinition();
+			def.PropagationBehavior = TransactionPropagation.Never;
+			setGeneralGetTransactionExpectations();
+			_mockTxnMgr.GetTransaction(def);
+		}
+		[Test]
+		[ExpectedException(typeof(NestedTransactionNotSupportedException), "Transaction manager does not allow nested transactions by default - specify 'NestedTransactionsAllowed' property with value 'true'")]
+		public void NoNestedTransactionsAllowed()
+		{
+			MockTxnDefinition def = new MockTxnDefinition();
+			def.PropagationBehavior = TransactionPropagation.Nested;
+			setGeneralGetTransactionExpectations();
+			_mockTxnMgr.GetTransaction(def);
+		}
+		[Test]
+		public void TransactionSuspendedSuccessfully()
+		{
+			MockTxnDefinition def = new MockTxnDefinition();
+			def.PropagationBehavior = TransactionPropagation.NotSupported;
+			def.ReadOnly = false;
+			setGeneralGetTransactionExpectations();
+
+			DefaultTransactionStatus status = (DefaultTransactionStatus)_mockTxnMgr.GetTransaction(def);	
+			Assert.IsNull( status.Transaction );
+			Assert.IsTrue( !status.IsNewTransaction );
+			Assert.IsTrue( status.NewSynchronization );
+			Assert.IsTrue( !status.ReadOnly );
+			Assert.IsNotNull( status.SuspendedResources);
+		}
+		[Test]
+		public void TransactionCreatedSuccessfully()
+		{
+			MockTxnDefinition def = new MockTxnDefinition();
+			def.PropagationBehavior = TransactionPropagation.RequiresNew;
+			def.ReadOnly = false;
+
+			setGeneralGetTransactionExpectations();
+
+			DefaultTransactionStatus status = (DefaultTransactionStatus)_mockTxnMgr.GetTransaction(def);	
+			Assert.AreEqual( _mockTxnMgr.Transaction, status.Transaction );
+			Assert.IsTrue( status.IsNewTransaction );
+			Assert.IsTrue( status.NewSynchronization );
+			Assert.IsTrue( !status.ReadOnly );
+			Assert.IsNotNull( status.SuspendedResources);
+		}
+		[Test]
+		public void NestedTransactionSuccessfully()
+		{
+			MockTxnDefinition def = new MockTxnDefinition();
+			def.PropagationBehavior = TransactionPropagation.Nested;
+			def.ReadOnly = false;
+
+			setGeneralGetTransactionExpectations();
+			_mockTxnMgr.SetExpectedCalls( "DoBegin", 1 );
+			_mockTxnMgr.Savepoints = false;
+			_mockTxnMgr.NestedTransactionsAllowed = true;
+
+			DefaultTransactionStatus status = (DefaultTransactionStatus)_mockTxnMgr.GetTransaction(def);	
+			Assert.AreEqual( _mockTxnMgr.Transaction, status.Transaction );
+			Assert.IsTrue( status.IsNewTransaction );
+			Assert.AreEqual( true, status.NewSynchronization );
+			Assert.IsTrue( !status.ReadOnly );
+			Assert.IsNull( status.SuspendedResources);
+		}
+
+		[Test]
+		public void NestedTransactionWithSavepoint()
+		{
+			MockTxnDefinition def = new MockTxnDefinition();
+			def.PropagationBehavior = TransactionPropagation.Nested;
+			def.ReadOnly = false;
+			setVanillaGetTransactionExpectations();
+			_mockTxnMgr.SetTransaction( new MyMockTxnObjectSavepointMgr());
+			_mockTxnMgr.SetExpectedCalls("DoBegin", 0);
+			_mockTxnMgr.Savepoints = true;
+			_mockTxnMgr.NestedTransactionsAllowed = true;
+
+			DefaultTransactionStatus status = (DefaultTransactionStatus)_mockTxnMgr.GetTransaction(def);	
+			Assert.AreEqual( _mockTxnMgr.Transaction, status.Transaction );
+			Assert.IsFalse( status.IsNewTransaction );
+			Assert.IsFalse( status.NewSynchronization );
+			Assert.IsTrue( !status.ReadOnly );
+			Assert.IsNull( status.SuspendedResources);
+		}
+		[Test]
+		public void DefaultPropagationBehavior()
+		{
+			MockTxnDefinition def = new MockTxnDefinition();
+			def.PropagationBehavior = TransactionPropagation.Required;
+			def.ReadOnly = true;
+			setGeneralGetTransactionExpectations();
+
+			DefaultTransactionStatus status = (DefaultTransactionStatus)_mockTxnMgr.GetTransaction(def);	
+			Assert.AreEqual( _mockTxnMgr.Transaction, status.Transaction );
+			Assert.IsTrue( !status.IsNewTransaction );
+			Assert.IsTrue( status.NewSynchronization );
+			Assert.IsTrue( status.ReadOnly );
+			Assert.IsNull( status.SuspendedResources);
+		}
+		[Test]
+		public void DefaultPropagationBehaviorWithNullDefinition()
+		{
+			setGeneralGetTransactionExpectations();
+
+			DefaultTransactionStatus status = (DefaultTransactionStatus)_mockTxnMgr.GetTransaction(null);	
+			Assert.AreEqual( _mockTxnMgr.Transaction, status.Transaction );
+			Assert.IsTrue( !status.IsNewTransaction );
+			Assert.IsTrue( status.NewSynchronization );
+			Assert.IsTrue( !status.ReadOnly );
+			Assert.IsNull( status.SuspendedResources);
+		}
+		[Test]
+		public void DefaultNoExistingTransaction()
+		{
+			setVanillaGetTransactionExpectations();
+			_mockTxnMgr.SetExpectedCalls( "DoBegin", 1 );
+
+			DefaultTransactionStatus status = (DefaultTransactionStatus)_mockTxnMgr.GetTransaction(null);	
+			Assert.IsNotNull( status.Transaction );
+			Assert.IsTrue( status.IsNewTransaction );
+			Assert.IsTrue( status.NewSynchronization );
+			Assert.IsTrue( !status.ReadOnly );
+			Assert.IsNull( status.SuspendedResources);
+		}
+		[Test]
+		public void DefaultBehaviorDefaultPropagationNoExistingTransaction()
+		{
+			setVanillaGetTransactionExpectations();
+			_mockTxnMgr.SetExpectedCalls( "DoBegin", 0 );
+			
+			MockTxnDefinition def = new MockTxnDefinition();
+			def.PropagationBehavior = TransactionPropagation.Never;
+			def.ReadOnly = true;
+
+			DefaultTransactionStatus status = (DefaultTransactionStatus)_mockTxnMgr.GetTransaction(def);	
+			Assert.IsNull( status.Transaction );
+			Assert.IsTrue( !status.IsNewTransaction );
+			Assert.IsTrue( status.NewSynchronization );
+			Assert.IsTrue( status.ReadOnly );
+			Assert.IsNull( status.SuspendedResources);
+		}
+		private void setGeneralGetTransactionExpectations()
+		{
+			_mockTxnMgr.SetTransaction( new object() );
+			setVanillaGetTransactionExpectations();
+		}
+
+		private void setVanillaGetTransactionExpectations()
+		{
+			_mockTxnMgr.SetExpectedCalls( "DoGetTransaction", 1);
+			_mockTxnMgr.SetExpectedCalls( "IsExistingTransaction", 1);
+		}
+
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Support/DefaultTransactionDefinitionTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Support/DefaultTransactionDefinitionTests.cs
new file mode 100644
index 00000000..277f3253
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Support/DefaultTransactionDefinitionTests.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Data;
+using NUnit.Framework;
+
+namespace Spring.Transaction.Support
+{
+	[TestFixture]
+	public class DefaultTransactionDefinitionTests
+	{
+		[Test]
+		public void VanillaTest()
+		{
+			DefaultTransactionDefinition def = new DefaultTransactionDefinition( TransactionPropagation.NotSupported);
+			Assert.IsTrue( def.PropagationBehavior == TransactionPropagation.NotSupported );
+			def.PropagationBehavior = TransactionPropagation.Nested;
+			Assert.IsTrue( def.PropagationBehavior == TransactionPropagation.Nested );
+			def.TransactionIsolationLevel = IsolationLevel.ReadCommitted;
+			Assert.IsTrue( def.TransactionIsolationLevel == IsolationLevel.ReadCommitted);
+			def.TransactionTimeout = 1000;
+			Assert.IsTrue( 1000 == def.TransactionTimeout );
+			Assert.IsTrue( false == def.ReadOnly );
+			def.ReadOnly = true;
+			Assert.IsTrue( true == def.ReadOnly );
+		}
+		[Test]
+		public void IsolationLeveNonDefaultl()
+		{
+			DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+			Assert.IsTrue( def.PropagationBehavior == TransactionPropagation.Required );
+		}
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void InvalidTimeout()
+		{
+			DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+			def.TransactionTimeout = -1000;
+		}
+		[Test]
+		public void DefinitionString()
+		{
+			DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+			DefaultTransactionDefinition def2 = new DefaultTransactionDefinition();
+
+			Assert.IsTrue( def.ToString() == def2.ToString());
+			def.Equals(def2);
+		}
+		[Test]
+			public void DefinitionStringFilled()
+		{
+			DefaultTransactionDefinition def = new DefaultTransactionDefinition( TransactionPropagation.Never );
+			def.TransactionIsolationLevel = IsolationLevel.Chaos;
+			def.TransactionTimeout = 1000;
+			def.ReadOnly = true;
+			Assert.AreEqual( "PROPAGATION_Never,ISOLATION_Chaos,timeout_1000,readOnly", def.ToString());
+			
+			DefaultTransactionDefinition def2 = new DefaultTransactionDefinition( TransactionPropagation.Never );
+			def2.TransactionIsolationLevel = IsolationLevel.Chaos;
+			def2.TransactionTimeout = 1000;
+			def2.ReadOnly = true;
+
+			Assert.IsTrue( def2.Equals(def));
+			Assert.IsTrue( def.GetHashCode() == def2.GetHashCode());
+		}
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Support/DefaultTransactionStatusTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Support/DefaultTransactionStatusTests.cs
new file mode 100644
index 00000000..37b40211
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Support/DefaultTransactionStatusTests.cs
@@ -0,0 +1,104 @@
+using System;
+using NUnit.Framework;
+using Spring.Transaction;
+
+namespace Spring.Transaction.Support
+{
+	[TestFixture]
+	public class DefaultTransactionStatusTests
+	{
+		[Test]
+		public void DefaultConstructorTests() 
+		{
+			MyMockTxnObject txn = new MyMockTxnObject();
+			txn.SetExpectedIsRollBackOnlyValue( false );
+			txn.SetExpectedRollbackOnlyCalls( 1 );
+
+			DefaultTransactionStatus stat = new DefaultTransactionStatus( txn, true, false, false, true, new object() );
+			Assert.IsNotNull( stat.Transaction );
+			Assert.IsTrue( !stat.ReadOnly );
+			Assert.IsTrue( !stat.NewSynchronization );
+			Assert.IsNotNull( stat.SuspendedResources );
+			Assert.IsTrue( stat.IsNewTransaction );
+			Assert.IsTrue( ! stat.RollbackOnly );
+			stat.RollbackOnly = true;
+			Assert.IsTrue( stat.RollbackOnly );
+			txn.Verify();
+		}
+		[Test]
+		[ExpectedException(typeof(NestedTransactionNotSupportedException))]
+		public void CreateSavepointException()
+		{
+			DefaultTransactionStatus stat = new DefaultTransactionStatus( new MyMockTxnObject(), true, false, false, true, new object() );
+			stat.CreateSavepoint( "mySavePoint" );
+		}
+		[Test]
+		[ExpectedException(typeof(NestedTransactionNotSupportedException))]
+		public void RollbackSavepointException()
+		{
+			DefaultTransactionStatus stat = new DefaultTransactionStatus( new MyMockTxnObject(), true, false, false, true, new object() );
+			stat.RollbackToSavepoint(null);
+		}
+		[Test]
+		[ExpectedException(typeof(NestedTransactionNotSupportedException))]
+		public void ReleaseSavepointException()
+		{
+			DefaultTransactionStatus stat = new DefaultTransactionStatus( new MyMockTxnObject(), true, false, false, true, new object() );
+			stat.ReleaseSavepoint(null);
+		}
+		[Test]
+		public void CreateSaveAndHoldValidSavepoint()
+		{
+			MyMockTxnObjectSavepointMgr saveMgr = new MyMockTxnObjectSavepointMgr();
+			saveMgr.SetSavepointToReturn( "savepoint" );
+			DefaultTransactionStatus status = new DefaultTransactionStatus( saveMgr , true, false, false, true, new object());
+			status.CreateAndHoldSavepoint( "savepoint" );
+			Assert.IsTrue( status.HasSavepoint );
+			Assert.AreEqual( "savepoint", status.Savepoint );
+		}
+		[Test]
+		[ExpectedException(typeof(TransactionUsageException))]
+		public void RollbackHeldSavepointException()
+		{
+			DefaultTransactionStatus stat = new DefaultTransactionStatus( new MyMockTxnObject(), true, false, false, true, new object() );
+			stat.RollbackToHeldSavepoint();
+		}
+		[Test]
+		public void RollbackHeldSavepointSuccess()
+		{
+			MyMockTxnObjectSavepointMgr saveMgr = new MyMockTxnObjectSavepointMgr();
+			string savepoint = "savepoint";
+			saveMgr.SetExpectedSavepoint( savepoint );
+			saveMgr.SetSavepointToReturn( savepoint );
+			DefaultTransactionStatus status = new DefaultTransactionStatus( saveMgr , true, false, false, true, new object());
+			status.CreateAndHoldSavepoint( savepoint );
+			Assert.IsTrue( status.HasSavepoint );
+			Assert.AreEqual( savepoint, status.Savepoint );
+
+			status.RollbackToHeldSavepoint();
+			saveMgr.Verify();
+		}
+		[Test]
+		[ExpectedException(typeof(TransactionUsageException))]
+		public void ReleaseHeldSavepointException()
+		{
+			DefaultTransactionStatus stat = new DefaultTransactionStatus( new MyMockTxnObject(), true, false, false, true, new object() );
+			stat.ReleaseHeldSavepoint();
+		}
+		[Test]
+		public void ReleaseHeldSavepointSuccess()
+		{
+			MyMockTxnObjectSavepointMgr saveMgr = new MyMockTxnObjectSavepointMgr();
+			string savepoint = "savepoint";
+			saveMgr.SetExpectedSavepoint( savepoint );
+			saveMgr.SetSavepointToReturn( savepoint );
+			DefaultTransactionStatus status = new DefaultTransactionStatus( saveMgr , true, false, false, true, new object());
+			status.CreateAndHoldSavepoint( savepoint );
+			Assert.IsTrue( status.HasSavepoint );
+			Assert.AreEqual( savepoint, status.Savepoint );
+
+			status.ReleaseHeldSavepoint();
+			saveMgr.Verify();
+		}
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Support/ResourceHolderSupportTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Support/ResourceHolderSupportTests.cs
new file mode 100644
index 00000000..4c47fea0
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Support/ResourceHolderSupportTests.cs
@@ -0,0 +1,75 @@
+using System;
+using NUnit.Framework;
+
+namespace Spring.Transaction.Support
+{
+	[TestFixture]
+	public class ResourceHolderSupportTests : ResourceHolderSupport
+	{
+		[TearDown]
+		public void Destroy()
+		{
+			Clear();
+		}
+		[Test]
+		public void PropertiesTest()
+		{
+			Assert.AreEqual( DateTime.MinValue, Deadline);	
+			Assert.IsTrue( !SynchronizedWithTransaction );
+			Assert.IsTrue( !RollbackOnly);
+			
+            //TODO investigate
+            /*
+			Deadline = DateTime.Now.AddDays(2);
+			Assert.IsTrue( HasDeadline );
+			Assert.AreEqual( DateTime.Now.AddDays(2).Date, Deadline.Date );
+            */
+
+			SynchronizedWithTransaction = true;
+			Assert.IsTrue( SynchronizedWithTransaction );
+
+			RollbackOnly = true;
+			Assert.IsTrue( RollbackOnly);
+		}
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void InvalidDeadline()
+		{
+			int time = TimeToLiveInSeconds;
+		}
+
+        /*
+        [Ignore("investigate...")]
+		[Test]
+		public void ZeroMilliseconds()
+		{
+			Deadline = DateTime.Now.AddDays(-1);
+			Assert.AreEqual( 0, TimeToLiveInMilliseconds );
+		}
+        */
+        /*
+		[Test]
+		public void MillisecondToLive()
+		{
+			Deadline = DateTime.Now.AddDays(1);
+			Assert.IsTrue( TimeToLiveInMilliseconds >= 0);
+		}
+        */
+        /*
+		[Test]
+		public void SetDeadline()
+		{
+			SetDeadlineInSeconds( 10 );
+			Assert.IsTrue( TimeToLiveInSeconds >= 0);
+		}
+        */
+        /*
+		[Test]
+		public void SetDeadlineMillis()
+		{
+			SetDeadlineInMilliseconds(1000);
+			Assert.IsTrue( TimeToLiveInMilliseconds >= 0);
+		}
+        */
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Support/TransactionSynchronizationAdapterTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Support/TransactionSynchronizationAdapterTests.cs
new file mode 100644
index 00000000..8152c9c1
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Support/TransactionSynchronizationAdapterTests.cs
@@ -0,0 +1,19 @@
+using System;
+using NUnit.Framework;
+
+namespace Spring.Transaction.Support
+{
+	[TestFixture]
+	public class TransactionSynchronizationAdapterTests : TransactionSynchronizationAdapter
+	{
+		[Test]
+		public void CoverageTests()
+		{
+			AfterCompletion( TransactionSynchronizationStatus.Committed );
+			BeforeCommit(false);
+			BeforeCompletion();
+			Resume();
+			Suspend();
+		}
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Support/TransactionSynchronizationManagerTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Support/TransactionSynchronizationManagerTests.cs
new file mode 100644
index 00000000..bb9c96b1
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Support/TransactionSynchronizationManagerTests.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections;
+using NUnit.Framework;
+
+namespace Spring.Transaction.Support
+{
+	[TestFixture]
+	public class TransactionSynchronizationManagerTests
+	{
+		[SetUp]
+		public void Init()
+		{
+			if ( TransactionSynchronizationManager.SynchronizationActive )
+			{
+				TransactionSynchronizationManager.ClearSynchronization();
+			}
+		}
+		[TearDown]
+		public void Destory()
+		{
+			if ( TransactionSynchronizationManager.SynchronizationActive )
+			{
+				TransactionSynchronizationManager.ClearSynchronization();
+			}
+		}
+		[Test]
+		[ExpectedException(typeof(InvalidOperationException))]
+		public void SynchronizationsInvalid()
+		{
+			IList syncs = TransactionSynchronizationManager.Synchronizations;
+		}
+		[Test]
+		[ExpectedException(typeof(InvalidOperationException))]
+		public void InitSynchronizationsInvalid()
+		{
+			TransactionSynchronizationManager.InitSynchronization();
+			TransactionSynchronizationManager.InitSynchronization();
+		}
+		[Test]
+		[ExpectedException(typeof(InvalidOperationException))]
+		public void SynchronizationsClearInvalid()
+		{
+			TransactionSynchronizationManager.ClearSynchronization();
+		}
+		[Test]
+		[ExpectedException(typeof(InvalidOperationException))]
+		public void RegisterSyncsInvalid()
+		{
+			TransactionSynchronizationManager.RegisterSynchronization(new MockTxnSync());
+		}
+		[Test]
+		public void SynchronizationsLifeCycle()
+		{
+			TransactionSynchronizationManager.InitSynchronization();
+			IList syncs = TransactionSynchronizationManager.Synchronizations;
+			Assert.AreEqual( 0, syncs.Count );
+			TransactionSynchronizationManager.RegisterSynchronization( new MockTxnSync() );
+			syncs = TransactionSynchronizationManager.Synchronizations;
+			Assert.AreEqual( 1, syncs.Count );
+			TransactionSynchronizationManager.ClearSynchronization();
+		}
+	}
+}
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Support/TransactionTemplateTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Support/TransactionTemplateTests.cs
new file mode 100644
index 00000000..c9f2e536
--- /dev/null
+++ b/test/Spring/Spring.Data.Tests/Transaction/Support/TransactionTemplateTests.cs
@@ -0,0 +1,80 @@
+using System;
+using NUnit.Framework;
+
+namespace Spring.Transaction.Support
+{
+	[TestFixture]
+	public class TransactionTemplateTests
+	{
+		[Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void NoTxnMgr()
+		{
+			TransactionTemplate temp = new TransactionTemplate();
+			temp.AfterPropertiesSet();
+		}
+		[Test]
+			public void TxnMgr()
+		{
+			TransactionTemplate temp = new TransactionTemplate();
+			temp.PlatformTransactionManager = new MockTxnPlatformMgr();
+			temp.AfterPropertiesSet();
+		}
+		[Test]
+		public void ExecuteException()
+		{
+			MockTxnPlatformMgr mock = new MockTxnPlatformMgr();
+			mock.SetExpectedGetTxnCallCount(1);
+			mock.SetExpectedRollbackCallCount(1);
+			TransactionTemplate temp = new TransactionTemplate(mock);
+			try 
+			{
+				temp.Execute(new TransactionDelegate(DummyExceptionMethod));
+				Assert.Fail("Should throw exception");
+			} catch
+			{
+				
+			}
+			mock.Verify();
+		}
+		[Test]
+		public void ExecuteExceptionRollbackException()
+		{
+			MockTxnPlatformMgr mock = new MockTxnPlatformMgr();
+			mock.SetExpectedGetTxnCallCount(1);
+			mock.SetExpectedRollbackCallCount(1);
+			mock.ThrowRollbackException = true;
+			TransactionTemplate temp = new TransactionTemplate(mock);
+			try 
+			{
+				temp.Execute(new TransactionDelegate(DummyExceptionMethod));
+				Assert.Fail("Should throw exception");
+			} 
+			catch
+			{
+				
+			}
+			mock.Verify();
+		}
+		[Test]
+		public void NullResult()
+		{
+			MockTxnPlatformMgr mock = new MockTxnPlatformMgr();
+			mock.SetExpectedGetTxnCallCount(1);
+			mock.SetExpectedCommitCallCount(1);
+			TransactionTemplate temp = new TransactionTemplate(mock);
+			temp.AfterPropertiesSet();
+			Assert.AreEqual( mock, temp.PlatformTransactionManager);
+			Assert.IsNull( temp.Execute(new TransactionDelegate(DummyTransactionMethod) ) );
+			mock.Verify();
+		}
+		public object DummyTransactionMethod( ITransactionStatus status )
+		{
+			return status;
+		}
+		public object DummyExceptionMethod( ITransactionStatus status )
+		{
+			throw new Exception("Bad Error");
+		}
+	}
+}
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/AssemblyInfo.cs b/test/Spring/Spring.Messaging.Nms.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..177a4f0e
--- /dev/null
+++ b/test/Spring/Spring.Messaging.Nms.Tests/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]		
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2003.csproj b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2003.csproj
new file mode 100644
index 00000000..f08c4c0e
--- /dev/null
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2003.csproj
@@ -0,0 +1,100 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{F58E0148-FA69-44D4-9AB0-65498E9F3221}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Messaging.Nms.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.NET.2003\Spring.Messaging.Nms.Tests\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.NET.2003\Spring.Messaging.Nms.Tests\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "Spring.Messaging.Nms.2003"
+                    Project = "{C17B27C2-4343-45BA-9A21-73C3CEC19BAD}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2005.csproj b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2005.csproj
new file mode 100644
index 00000000..0ad153e4
--- /dev/null
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2005.csproj
@@ -0,0 +1,60 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{FA7A6931-7DBE-4A32-A312-51FAD2E80332}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Messaging.Nms.Tests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</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\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.5.22, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Messaging.Nms\Spring.Messaging.Nms.2005.csproj">
+      <Project>{AEB1578C-9018-4D49-B440-789F38DD2F29}</Project>
+      <Name>Spring.Messaging.Nms.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build
new file mode 100644
index 00000000..12cdae9b
--- /dev/null
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<project name="Spring.Messaging.Nms.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+	<target name="build">
+		<!-- build Spring.Data.Tests -->
+		<csc target="library" define="${current.build.defines.csc}"
+		     warnaserror="true"
+		     debug="${current.build.debug}"
+                     output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml">
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+			</sources>
+		        <resources prefix="Spring" dynamicprefix="true" failonempty="true">
+			        <include name="**/*.xml" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+				<exclude name="CloverRuntime.dll" />
+			</references>
+		</csc>
+
+                <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
+                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
+	</target>
+	<target name="test" depends="build">
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
+		</nunit2outproc>
+	</target>
+</project>
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/AdaptableJobFactoryTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/AdaptableJobFactoryTest.cs
new file mode 100644
index 00000000..d6e9a38f
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/AdaptableJobFactoryTest.cs
@@ -0,0 +1,93 @@
+/*
+* Copyright 2002-2005 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.
+*/
+using System;
+
+using NUnit.Framework;
+
+using Quartz;
+using Quartz.Job;
+using Quartz.Spi;
+
+using Spring.Scheduling.Quartz;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary>
+    /// Tests for <see cref="AdaptableJobFactory" />.
+    /// </summary>
+    /// <author>Marko Lahma (.NET)</author>
+    [TestFixture]
+    public class AdaptableJobFactoryTest
+    {
+        private AdaptableJobFactory jobFactory;
+
+        [SetUp]
+        public void SetUp()
+        {
+            jobFactory = new AdaptableJobFactory();
+        }
+
+        [Test]
+        public void TestNewJob_IncompatibleJob()
+        {
+            try
+            {
+                // this actually fails already in Quartz level
+                TriggerFiredBundle bundle = TestUtil.CreateMinimalFiredBundleWithTypedJobDetail(typeof(object));
+                jobFactory.NewJob(bundle);
+                Assert.Fail("Created job which was not an IJob");
+            }
+            catch (ArgumentException)
+            {
+                // ok
+            }
+            catch (SchedulerException)
+            {
+                // ok
+            }
+            catch (Exception)
+            {
+                Assert.Fail("Got exception that was not instance of SchedulerException or ArgumentException");
+            }
+        }
+
+        [Test]
+        public void TestNewJob_ThreadStartJob()
+        {
+            // TODO ThreadStart is not the way to go
+        }
+
+        [Test]
+        public void TestNewJob_NormalIJob()
+        {
+            TriggerFiredBundle bundle = TestUtil.CreateMinimalFiredBundleWithTypedJobDetail(typeof(NoOpJob));
+            IJob job = jobFactory.NewJob(bundle);
+            Assert.IsNotNull(job, "Returned job was null");
+        }
+
+
+
+
+    }
+
+    internal class NoOpThreadStartJob : NoOpJob
+    {
+        public void Execute()
+        {
+            Execute(null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/CronTriggerObjectTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/CronTriggerObjectTest.cs
new file mode 100644
index 00000000..52d07ecc
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/CronTriggerObjectTest.cs
@@ -0,0 +1,92 @@
+/*
+* Copyright 2002-2005 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.
+*/
+
+using System;
+
+using NUnit.Framework;
+
+using Quartz;
+using Quartz.Job;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary>
+    /// Tests for <see cref="CronTriggerObject" />.
+    /// </summary>
+    /// <author>Marko Lahma (.NET)</author>
+    [TestFixture]
+    public class CronTriggerObjectTest : TriggerObjectTest
+    {
+        private CronTriggerObject cronTrigger;
+
+        [SetUp]
+        public void SetUp()
+        {
+            cronTrigger = new CronTriggerObject();
+            cronTrigger.ObjectName = TRIGGER_NAME;
+            Trigger = cronTrigger;
+        }
+
+        /// <summary>
+        /// Tests all possible misfire instructions for cron trigger 
+        /// from strings to int.
+        /// </summary>
+        [Test]
+        public void TestMisfireInstructionNames()
+        {
+            string[] names = new string[] { "DoNothing", "FireOnceNow", "SmartPolicy" };
+            foreach (string name in names)
+            {
+                cronTrigger.MisfireInstructionName = name;                
+            }
+        }
+
+        [Test]
+        public override void TestAfterPropertiesSet_Defaults()
+        {
+            cronTrigger.AfterPropertiesSet();
+            base.TestAfterPropertiesSet_Defaults();
+            AssertDateTimesEqualityWithAllowedDelta(DateTime.UtcNow, cronTrigger.StartTimeUtc, 1000);
+            Assert.AreEqual(TimeZone.CurrentTimeZone, cronTrigger.TimeZone, "trigger time zone mismatch");
+        }
+
+        [Test]
+        public override void TestAfterPropertiesSet_ValuesGiven()
+        {
+            TimeZone TZ = TimeZone.CurrentTimeZone;
+            cronTrigger.TimeZone = TZ;
+            cronTrigger.AfterPropertiesSet();
+            base.TestAfterPropertiesSet_ValuesGiven();
+            Assert.AreSame(TZ, cronTrigger.TimeZone, "trigger time zone mismatch");
+        }
+
+        
+        [Test]
+        public override void TestAfterPropertiesSet_JobDetailGiven()
+        {
+            const string jobName = "jobName";
+            const string jobGroup = "jobGroup";
+            JobDetail jd = new JobDetail(jobName, jobGroup, typeof (NoOpJob));
+            cronTrigger.JobDetail = jd;
+            cronTrigger.AfterPropertiesSet();
+            base.TestAfterPropertiesSet_JobDetailGiven();
+            Assert.AreSame(jd, cronTrigger.JobDetail, "job details weren't same");
+        }
+
+
+    }
+
+}
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/JobDetailObjectTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/JobDetailObjectTest.cs
new file mode 100644
index 00000000..a3e82eda
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/JobDetailObjectTest.cs
@@ -0,0 +1,132 @@
+/*
+* Copyright 2002-2005 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.
+*/
+
+using System;
+using System.Collections;
+
+using NUnit.Framework;
+
+using Quartz;
+using Quartz.Job;
+
+using Spring.Context.Support;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary>
+    /// Tests for <see cref="JobDetailObject" />.
+    /// </summary>
+    /// <author>Marko Lahma (.NET)</author>
+    [TestFixture]
+    public class JobDetailObjectTest
+    {
+        private JobDetailObject jobDetail;
+
+        [SetUp]
+        public void SetUp()
+        {               
+             jobDetail = new JobDetailObject();
+        }
+
+        [Test]
+        [ExpectedException(ExceptionType = typeof(ArgumentException))]
+        public void TestJobType_Null()
+        {
+            jobDetail.JobType = null;            
+        }
+
+        [Test]
+        public void TestJobType_NonIJob()
+        {
+            jobDetail.JobType = typeof(object);
+            Assert.AreEqual(typeof(object), jobDetail.JobType, "JobDetail did not create same type as expected");
+        }
+
+        [Test]
+        public void TestJobType_IJob()
+        {
+            Type CORRECT_IJOB = typeof (NoOpJob);
+            jobDetail.JobType = CORRECT_IJOB;
+            Assert.AreEqual(jobDetail.JobType, CORRECT_IJOB, "JobDetail did not register correct job type");
+        }
+
+
+        [Test]
+        [ExpectedException(ExceptionType = typeof(ArgumentException))]
+        public void TestJobDataAsMap_Null()
+        {
+            jobDetail.JobDataAsMap = null;
+        }
+
+        [Test]
+        public void TestJobDataAsMap_ProperValues()
+        {
+            IDictionary values = new Hashtable();
+            values["baz"] = "foo";
+            values["foo"] = 123;
+            values["bar"] = null;
+            jobDetail.JobDataAsMap = values;
+            Assert.AreEqual(values.Count, jobDetail.JobDataMap.Count, "Data of inequal size");
+            CollectionAssert.AreEqual(values.Keys, jobDetail.JobDataMap.Keys, "JobDataMap values not equal");
+        }
+
+        [Test]
+        public void TestAfterPropertiesSet_Defaults()
+        {
+            const string objectName = "springJobDetailObject";
+            jobDetail.ObjectName = objectName;
+            jobDetail.Group = null;
+            jobDetail.AfterPropertiesSet();
+            Assert.AreEqual(SchedulerConstants.DEFAULT_GROUP, jobDetail.Group, "Groups differ");
+            Assert.AreEqual(objectName, jobDetail.Name, "Names differ");
+        }
+
+        [Test]
+        public void TestAfterPropertiesSet_CustomNameAndGroup()
+        {
+            const string objectName = "springJobDetailObject";
+            const string jobDetailName = "jobDetailName";
+            const string jobDetailGroup = "jobDetailGroup";
+            jobDetail.ObjectName = objectName;
+            jobDetail.Name = jobDetailName;
+            jobDetail.Group = jobDetailGroup;
+            jobDetail.AfterPropertiesSet();
+            Assert.AreEqual(jobDetailGroup, jobDetail.Group, "Groups differ");
+            Assert.AreEqual(jobDetailName, jobDetail.Name, "Names differ");
+        }
+
+        [Test]
+        public void TestAfterPropertiesSet_ApplicationContextJobDataKeySetWithApplicationContext()
+        {
+            const string objectName = "springJobDetailObject";
+            jobDetail.ObjectName = objectName;
+            jobDetail.ApplicationContext = new XmlApplicationContext();
+            jobDetail.ApplicationContextJobDataKey = "applicationContextJobDataKey";
+            jobDetail.AfterPropertiesSet();
+        }
+
+        [Test]
+        [ExpectedException(ExceptionType =  typeof(ArgumentException))]
+        public void TestAfterPropertiesSet_ApplicationContextJobDataKeySetWithoutApplicationContext()
+        {
+            const string objectName = "springJobDetailObject";
+            jobDetail.ObjectName = objectName;
+            jobDetail.ApplicationContextJobDataKey = "applicationContextJobDataKey";
+            jobDetail.AfterPropertiesSet();
+        }
+
+    }
+}
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/MethodInvokingJobDetailFactoryObjectTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/MethodInvokingJobDetailFactoryObjectTest.cs
new file mode 100644
index 00000000..1be2228a
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/MethodInvokingJobDetailFactoryObjectTest.cs
@@ -0,0 +1,75 @@
+/*
+* Copyright 2002-2005 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.
+*/
+
+using NUnit.Framework;
+
+using Quartz;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Marko Lahma (.NET)</author>
+    [TestFixture]
+    public class MethodInvokingJobDetailFactoryObjectTest
+    {
+        private const string FACTORY_NAME = "springObjectFactory";
+        private MethodInvokingJobDetailFactoryObject factory;
+
+        [SetUp]
+        public void SetUp()
+        {
+            factory = new MethodInvokingJobDetailFactoryObject();
+            factory.ObjectName = FACTORY_NAME;
+            factory.TargetMethod = "Invoke";
+            factory.TargetObject = new InvocationCountingJob();
+        }
+
+        [Test]
+        public void TestGetObject_MinimalDefaults()
+        {
+            factory.AfterPropertiesSet();
+            JobDetail jd = (JobDetail) factory.GetObject();
+            Assert.IsNotNull(jd, "job detail was null");
+            Assert.AreEqual(FACTORY_NAME, jd.Name, "job name did not default to factory name");
+            Assert.AreEqual(jd.JobType, typeof(MethodInvokingJob), "factory did not create method invoking job");
+            Assert.IsTrue(jd.Durable, "job was not durable");
+            Assert.IsTrue(jd.Volatile, "job was not volatile");
+        }
+
+        [Test]
+        public void TestGetObject_ConcurrentJob()
+        {
+            factory.Concurrent = false;
+            factory.AfterPropertiesSet();
+            JobDetail jd = (JobDetail)factory.GetObject();
+            Assert.IsNotNull(jd, "job detail was null");
+            Assert.AreEqual(jd.JobType, typeof(StatefulMethodInvokingJob), "factory did not create stateful method invoking job");
+        }
+
+        [Test]
+        public void TestGetObject_TriggerListenersSet()
+        {
+            string[] LISTENER_NAMES = new string[] {"Foo", "Bar"};
+            factory.JobListenerNames = LISTENER_NAMES;
+            factory.AfterPropertiesSet();
+            JobDetail jd = (JobDetail)factory.GetObject();
+            CollectionAssert.AreEquivalent(LISTENER_NAMES, jd.JobListenerNames);
+        }
+
+    }
+}
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/MethodInvokingJobTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/MethodInvokingJobTest.cs
new file mode 100644
index 00000000..02f0e319
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/MethodInvokingJobTest.cs
@@ -0,0 +1,139 @@
+/*
+* Copyright 2002-2005 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.
+*/
+
+using System;
+using System.Threading;
+
+using NUnit.Framework;
+
+using Quartz;
+using Quartz.Job;
+using Quartz.Spi;
+
+using Rhino.Mocks;
+
+using Spring.Objects.Support;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Marko Lahma (.NET)</author>
+    [TestFixture]
+    public class MethodInvokingJobTest
+    {
+        private MethodInvokingJob methodInvokingJob;
+
+        [SetUp]
+        public void SetUp()
+        {
+            methodInvokingJob = new MethodInvokingJob();
+        }
+
+        [Test]
+        [ExpectedException(ExceptionType = typeof(ArgumentException))]
+        public void TestMethodInvoker_SetWithNull()
+        {
+            methodInvokingJob.MethodInvoker = null;
+        }
+
+        [Test]
+        [ExpectedException(ExceptionType = typeof(JobExecutionException))]
+        public void TestMethodInvocation_NullMethodInvokder()
+        {
+            methodInvokingJob.Execute(CreateMinimalJobExecutionContext());
+        }
+
+        [Test]
+        public void TestMethodInvoker_MethodSetCorrectly()
+        {
+            InvocationCountingJob job = new InvocationCountingJob();
+            MethodInvoker mi = new MethodInvoker();
+            mi.TargetObject = job;
+            mi.TargetMethod = "Invoke";
+            mi.Prepare();
+            methodInvokingJob.MethodInvoker = mi;
+            methodInvokingJob.Execute(CreateMinimalJobExecutionContext());
+            Assert.AreEqual(1, job.CounterValue, "Job was not invoked once");
+        }
+
+        [Test]
+        public void TestMethodInvoker_MethodSetCorrectlyThrowsException()
+        {
+            InvocationCountingJob job = new InvocationCountingJob();
+            MethodInvoker mi = new MethodInvoker();
+            mi.TargetObject = job;
+            mi.TargetMethod = "InvokeAndThrowException";
+            mi.Prepare();
+            methodInvokingJob.MethodInvoker = mi;
+            try
+            {
+                methodInvokingJob.Execute(CreateMinimalJobExecutionContext());
+                Assert.Fail("Successful invoke when method threw exception");
+            }
+            catch (JobExecutionException)
+            {
+                // ok
+            }
+            Assert.AreEqual(1, job.CounterValue, "Job was not invoked once");
+        }
+
+        
+        private static JobExecutionContext CreateMinimalJobExecutionContext()
+        {
+            MockRepository repo = new MockRepository();
+            IScheduler sched = (IScheduler) repo.DynamicMock(typeof (IScheduler));
+            JobExecutionContext ctx = new JobExecutionContext(sched, ConstructMinimalTriggerFiredBundle(), null);
+            return ctx;
+        }
+
+        private static TriggerFiredBundle ConstructMinimalTriggerFiredBundle()
+        {
+            JobDetail jd = new JobDetail("jobName", "jobGroup", typeof(NoOpJob));
+            SimpleTrigger trigger = new SimpleTrigger("triggerName", "triggerGroup");
+            TriggerFiredBundle retValue = new TriggerFiredBundle(jd, trigger, null, false, null, null, null, null);
+
+            return retValue;
+        }
+
+    }
+
+    /// <summary>
+    /// Test class for method invoker.
+    /// </summary>
+    public class InvocationCountingJob
+    {
+        private int counter;
+
+        public void Invoke()
+        {
+            Interlocked.Increment(ref counter);    
+        }
+
+        public void InvokeAndThrowException()
+        {
+            Interlocked.Increment(ref counter);
+            throw new Exception();
+        }
+
+
+        public int CounterValue
+        {
+            get { return counter; }
+        }
+    }
+}
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SchedulerFactoryObjectTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SchedulerFactoryObjectTest.cs
new file mode 100644
index 00000000..a6375e05
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SchedulerFactoryObjectTest.cs
@@ -0,0 +1,309 @@
+/*
+* Copyright 2002-2005 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.
+*/
+
+using System;
+using System.Collections;
+using System.Threading;
+
+using NUnit.Framework;
+
+using Quartz;
+using Quartz.Impl;
+
+using Rhino.Mocks;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Marko Lahma (.NET)</author>
+    [TestFixture]
+    public class SchedulerFactoryObjectTest
+    {
+        private MockRepository mockery = null;
+        private SchedulerFactoryObject factory;
+
+        [SetUp]
+        public void SetUp()
+        {
+            factory = new SchedulerFactoryObject();
+            TestSchedulerFactory.Mockery.BackToRecordAll();
+        }
+
+        [Test]
+        public void TestAfterPropertiesSet_Defaults()
+        {
+            factory.AfterPropertiesSet();
+            TestSchedulerFactory.Mockery.ReplayAll();
+        }
+
+        [Test]
+        public void TestAfterPropertiesSet_NullJobFactory()
+        {
+            factory.JobFactory = null;  
+            factory.AfterPropertiesSet();
+            TestSchedulerFactory.Mockery.ReplayAll();
+        }
+
+        [Test]
+        public void TestAfterPropertiesSet_NoAutoStartup()
+        {
+            // set expectations
+            TestSchedulerFactory.MockScheduler.JobFactory = null;
+            LastCall.IgnoreArguments();
+            TestSchedulerFactory.Mockery.ReplayAll();
+
+            factory.SchedulerFactoryType = typeof(TestSchedulerFactory);
+            factory.AutoStartup = false;
+            factory.AfterPropertiesSet();
+        }
+
+        [Test]
+        public void TestAfterPropertiesSet_AutoStartup()
+        {
+            InitForAfterPropertiesSetTest();
+
+            TestSchedulerFactory.MockScheduler.Start();
+            TestSchedulerFactory.Mockery.ReplayAll();
+
+            factory.SchedulerFactoryType = typeof (TestSchedulerFactory);
+            factory.AutoStartup = true;
+            factory.AfterPropertiesSet();
+        }
+
+        [Test]
+        public void TestAfterPropertiesSet_AddListeners()
+        {
+            mockery = new MockRepository();
+            InitForAfterPropertiesSetTest();
+            
+            factory.SchedulerListeners = new ISchedulerListener[] { (ISchedulerListener)mockery.CreateMock(typeof(ISchedulerListener)) };
+            TestSchedulerFactory.MockScheduler.AddSchedulerListener(null);
+            LastCall.IgnoreArguments();
+            
+            factory.GlobalJobListeners = new IJobListener[] { (IJobListener)mockery.CreateMock(typeof(IJobListener)) };
+            TestSchedulerFactory.MockScheduler.AddGlobalJobListener(null);
+            LastCall.IgnoreArguments();
+
+            factory.JobListeners = new IJobListener[] { (IJobListener)mockery.CreateMock(typeof(IJobListener)) };
+            TestSchedulerFactory.MockScheduler.AddJobListener(null);
+            LastCall.IgnoreArguments();
+
+            factory.GlobalTriggerListeners = new ITriggerListener[] { (ITriggerListener)mockery.CreateMock(typeof(ITriggerListener)) };
+            TestSchedulerFactory.MockScheduler.AddGlobalTriggerListener(null);
+            LastCall.IgnoreArguments();
+            
+            factory.TriggerListeners = new ITriggerListener[] { (ITriggerListener)mockery.CreateMock(typeof(ITriggerListener)) };
+            TestSchedulerFactory.MockScheduler.AddTriggerListener(null);
+            LastCall.IgnoreArguments();
+
+            TestSchedulerFactory.Mockery.ReplayAll();
+            mockery.ReplayAll();
+            factory.AfterPropertiesSet();
+        }
+
+        [Test]
+        public void TestAfterPropertiesSet_Calendars()
+        {
+            mockery = new MockRepository();
+            InitForAfterPropertiesSetTest();
+
+            const string calendarName = "calendar";
+            ICalendar cal = (ICalendar) mockery.CreateMock(typeof (ICalendar));
+            Hashtable calTable = new Hashtable();
+            calTable[calendarName] = cal;
+            factory.Calendars = calTable;
+            TestSchedulerFactory.MockScheduler.AddCalendar(calendarName, cal, true, true);
+
+            TestSchedulerFactory.Mockery.ReplayAll();
+            mockery.ReplayAll();
+            factory.AfterPropertiesSet();
+        }
+
+        [Test]
+        public void TestAfterPropertiesSet_Trigger_TriggerExists()
+        {
+            mockery = new MockRepository();
+            InitForAfterPropertiesSetTest();
+
+            const string TRIGGER_NAME = "trigName";
+            const string TRIGGER_GROUP = "trigGroup";
+            SimpleTrigger trigger = new SimpleTrigger(TRIGGER_NAME, TRIGGER_GROUP);
+            factory.Triggers = new Trigger[] { trigger };
+
+            Expect.Call(TestSchedulerFactory.MockScheduler.GetTrigger(TRIGGER_NAME, TRIGGER_GROUP)).Return(trigger);
+
+            TestSchedulerFactory.Mockery.ReplayAll();
+            mockery.ReplayAll();
+            factory.AfterPropertiesSet();
+        }
+
+        [Test]
+        public void TestAfterPropertiesSet_Trigger_TriggerDoesntExist()
+        {
+            mockery = new MockRepository();
+            InitForAfterPropertiesSetTest();
+
+            const string TRIGGER_NAME = "trigName";
+            const string TRIGGER_GROUP = "trigGroup";
+            SimpleTrigger trigger = new SimpleTrigger(TRIGGER_NAME, TRIGGER_GROUP);
+            factory.Triggers = new Trigger[] { trigger };
+
+            Expect.Call(TestSchedulerFactory.MockScheduler.GetTrigger(TRIGGER_NAME, TRIGGER_GROUP)).Return(null);
+            TestSchedulerFactory.MockScheduler.ScheduleJob(trigger);
+            LastCall.IgnoreArguments().Return(DateTime.UtcNow);
+                
+
+            TestSchedulerFactory.Mockery.ReplayAll();
+            mockery.ReplayAll();
+            factory.AfterPropertiesSet();
+
+        }
+
+
+        private void InitForAfterPropertiesSetTest()
+        {
+            factory.AutoStartup = false;
+            // set expectations
+            factory.SchedulerFactoryType = typeof(TestSchedulerFactory);
+            TestSchedulerFactory.MockScheduler.JobFactory = null;
+            LastCall.IgnoreArguments();
+        }
+
+        [Test]
+        public void TestAfterPropertiesSet_AutoStartup_WithDelay()
+        {
+            // set expectations
+            TestSchedulerFactory.MockScheduler.JobFactory = null;
+            LastCall.IgnoreArguments();
+            Expect.Call(TestSchedulerFactory.MockScheduler.SchedulerName).Return("schedName");
+            TestSchedulerFactory.MockScheduler.Start();
+            TestSchedulerFactory.Mockery.ReplayAll();
+
+            factory.SchedulerFactoryType = typeof(TestSchedulerFactory);
+            factory.AutoStartup = true;
+            factory.StartupDelay = 2;
+            factory.AfterPropertiesSet();
+            Thread.Sleep(TimeSpan.FromSeconds(3));
+
+        }
+
+        [Test]
+        public void TestStart()
+        {
+            // set expectations
+            TestSchedulerFactory.MockScheduler.JobFactory = null;
+            LastCall.IgnoreArguments();
+            TestSchedulerFactory.MockScheduler.Start();
+            TestSchedulerFactory.Mockery.ReplayAll();
+
+            factory.SchedulerFactoryType = typeof(TestSchedulerFactory);
+            factory.AutoStartup = false;
+            factory.AfterPropertiesSet();
+            factory.Start();
+        }
+
+        [Test]
+        public void TestStop()
+        {
+            // set expectations
+            TestSchedulerFactory.MockScheduler.JobFactory = null;
+            LastCall.IgnoreArguments();
+            TestSchedulerFactory.MockScheduler.Standby();
+            TestSchedulerFactory.Mockery.ReplayAll();
+
+            factory.SchedulerFactoryType = typeof(TestSchedulerFactory);
+            factory.AutoStartup = false;
+            factory.AfterPropertiesSet();
+            factory.Stop();
+        }
+
+        [Test]
+        public void TestGetObject()
+        {
+            factory.AfterPropertiesSet();
+            TestSchedulerFactory.Mockery.ReplayAll(); 
+            IScheduler sched = (IScheduler)factory.GetObject();
+            Assert.IsNotNull(sched, "scheduler was null");
+        }
+
+        [Test]
+        [ExpectedException(ExceptionType = typeof(ArgumentException))]
+        public void TestSchedulerFactoryType_InvalidType()
+        {
+            TestSchedulerFactory.Mockery.ReplayAll(); 
+            factory.SchedulerFactoryType = typeof(SchedulerFactoryObjectTest);
+        }
+
+        [Test]
+        public void TestSchedulerFactoryType_ValidType()
+        {
+            TestSchedulerFactory.Mockery.ReplayAll(); 
+            factory.SchedulerFactoryType = typeof(StdSchedulerFactory);
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            TestSchedulerFactory.Mockery.VerifyAll();
+            if (mockery != null)
+            {
+                mockery.VerifyAll();
+            }
+        }
+
+
+    }
+
+    public class TestSchedulerFactory : ISchedulerFactory
+    {
+        private static readonly MockRepository mockery = new MockRepository();
+        private static readonly IScheduler mockScheduler;
+
+        static TestSchedulerFactory()
+        {
+            mockScheduler = (IScheduler) mockery.CreateMock(typeof (IScheduler));
+        }
+
+        public static MockRepository Mockery
+        {
+            get { return mockery; }
+        }
+
+        public static IScheduler MockScheduler
+        {
+            get { return mockScheduler; }
+        }
+
+        public IScheduler GetScheduler()
+        {
+            return mockScheduler;
+        }
+
+        public IScheduler GetScheduler(string schedName)
+        {
+            return mockScheduler;
+        }
+
+        public ICollection AllSchedulers
+        {
+            get { return new ArrayList(); }
+        }
+    }
+
+
+}
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SimpleTriggerObjectTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SimpleTriggerObjectTest.cs
new file mode 100644
index 00000000..19ae7f61
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SimpleTriggerObjectTest.cs
@@ -0,0 +1,97 @@
+/*
+* Copyright 2002-2005 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.
+*/
+
+using System;
+
+using NUnit.Framework;
+
+using Quartz;
+using Quartz.Job;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary>
+    /// Tests for <see cref="SimpleTriggerObject" />.
+    /// </summary>
+    /// <author>Marko Lahma (.NET)</author>
+    [TestFixture]
+    public class SimpleTriggerObjectTest : TriggerObjectTest
+    {
+        private SimpleTriggerObject simpleTrigger;
+
+        [SetUp]
+        public void SetUp()
+        {
+            simpleTrigger = new SimpleTriggerObject();
+            simpleTrigger.ObjectName = TRIGGER_NAME;
+            Trigger = simpleTrigger;
+        }
+
+        /// <summary>
+        /// Tests all possible misfire instructions for cron trigger 
+        /// from strings to int.
+        /// </summary>
+        [Test]
+        public void TestMisfireInstructionNames()
+        {
+            string[] names = new string[] { "FireNow", "RescheduleNextWithExistingCount", "RescheduleNextWithRemainingCount", "RescheduleNowWithExistingRepeatCount", "RescheduleNowWithRemainingRepeatCount", "SmartPolicy" };
+            foreach (string name in names)
+            {
+                simpleTrigger.MisfireInstructionName = name;                
+            }
+        }
+
+        [Test]
+        public override void TestAfterPropertiesSet_Defaults()
+        {
+            simpleTrigger.AfterPropertiesSet();
+            base.TestAfterPropertiesSet_Defaults();
+        }
+
+        [Test]
+        public override void TestAfterPropertiesSet_ValuesGiven()
+        {
+            simpleTrigger.StartDelay = 100;
+            simpleTrigger.AfterPropertiesSet();
+            base.TestAfterPropertiesSet_ValuesGiven();
+        }
+
+        [Test]
+        public void TestAfterPropertiesSet_StartDelayGiven()
+        {
+            const int START_DELAY = 100000;
+            simpleTrigger.StartDelay = START_DELAY;
+            DateTime startTime = DateTime.UtcNow;
+            simpleTrigger.AfterPropertiesSet();
+            AssertDateTimesEqualityWithAllowedDelta(startTime.AddMilliseconds(START_DELAY), simpleTrigger.StartTimeUtc, 1000);
+        }
+
+        
+        [Test]
+        public override void TestAfterPropertiesSet_JobDetailGiven()
+        {
+            const string jobName = "jobName";
+            const string jobGroup = "jobGroup";
+            JobDetail jd = new JobDetail(jobName, jobGroup, typeof(NoOpJob));
+            simpleTrigger.JobDetail = jd;
+            simpleTrigger.AfterPropertiesSet();
+            base.TestAfterPropertiesSet_JobDetailGiven();
+            Assert.AreSame(jd, simpleTrigger.JobDetail, "job details weren't same");
+        }
+
+    }
+
+}
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SpringObjectJobFactoryTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SpringObjectJobFactoryTest.cs
new file mode 100644
index 00000000..7fe40a1f
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SpringObjectJobFactoryTest.cs
@@ -0,0 +1,103 @@
+/*
+* Copyright 2002-2005 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.
+*/
+
+using System.Collections;
+
+using NUnit.Framework;
+
+using Quartz;
+using Quartz.Job;
+using Quartz.Spi;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Marko Lahma (.NET)</author>
+    [TestFixture]
+    public class SpringObjectJobFactoryTest
+    {
+        private SpringObjectJobFactory factory;
+
+        [SetUp]
+        public void SetUp()
+        {
+            factory = new SpringObjectJobFactory();
+        }
+
+        [Test]
+        public void TestCreateJobInstance_SimpleDefaults()
+        {
+            Trigger trigger = new SimpleTrigger();
+            TriggerFiredBundle bundle = TestUtil.CreateMinimalFiredBundleWithTypedJobDetail(typeof (NoOpJob), trigger);
+
+            IJob job = factory.NewJob(bundle);
+            Assert.IsNotNull(job, "Created job was null");
+        }
+
+        [Test]
+        public void TestCreateJobInstance_SchedulerContextGiven()
+        {
+            IDictionary items = new Hashtable();
+            items["foo"] = "bar";
+            items["number"] = 123;
+            factory.SchedulerContext = new SchedulerContext(items);
+            Trigger trigger = new SimpleTrigger();
+            TriggerFiredBundle bundle = TestUtil.CreateMinimalFiredBundleWithTypedJobDetail(typeof(InjectableJob), trigger);
+
+            InjectableJob job = (InjectableJob) factory.NewJob(bundle);
+            Assert.IsNotNull(job, "Created job was null");
+            Assert.AreEqual("bar", job.Foo, "string injection failed");
+            Assert.AreEqual(123, job.Number, "integer injection failed");
+        }
+
+        [Test]
+        public void TestCreateJobInstance_IgnoredProperties()
+        {
+            factory.IgnoredUnknownProperties = new string[] {"foo", "baz"};
+            Trigger trigger = new SimpleTrigger();
+            trigger.JobDataMap["foo"] = "should not be injected";
+            trigger.JobDataMap["number"] = 123;
+            TriggerFiredBundle bundle = TestUtil.CreateMinimalFiredBundleWithTypedJobDetail(typeof(InjectableJob), trigger);
+
+            InjectableJob job = (InjectableJob)factory.NewJob(bundle);
+            Assert.IsNotNull(job, "Created job was null");
+            Assert.AreEqual(123, job.Number, "integer injection failed");
+            Assert.IsNull(job.Foo, "foo was injected when it was not supposed to    ");
+        }
+
+    }
+
+    public class InjectableJob : NoOpJob
+    {
+        private int number;
+        private string foo;
+
+
+        public int Number
+        {
+            get { return number; }
+            set { number = value; }
+        }
+
+        public string Foo
+        {
+            get { return foo; }
+            set { foo = value; }
+        }
+    }
+}
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/TestUtil.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/TestUtil.cs
new file mode 100644
index 00000000..ffaace6b
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/TestUtil.cs
@@ -0,0 +1,55 @@
+/*
+* Copyright 2002-2005 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.
+*/
+
+using System;
+
+using Quartz;
+using Quartz.Spi;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary>
+    /// Quartz.NET integration testing helpers.
+    /// </summary>
+    /// <author>Marko Lahma (.NET)</author>
+    public class TestUtil
+    {
+        /// <summary>
+        /// Creates the minimal fired bundle with job detail that has
+        /// given job type.
+        /// </summary>
+        /// <param name="jobType">Type of the job.</param>
+        /// <returns>Minimal TriggerFiredBundle</returns>
+        public static TriggerFiredBundle CreateMinimalFiredBundleWithTypedJobDetail(Type jobType)
+        {
+            return CreateMinimalFiredBundleWithTypedJobDetail(jobType, null);
+        }
+
+        /// <summary>
+        /// Creates the minimal fired bundle with job detail that has
+        /// given job type.
+        /// </summary>
+        /// <param name="jobType">Type of the job.</param>
+        /// <param name="trigger">The trigger.</param>
+        /// <returns>Minimal TriggerFiredBundle</returns>
+        public static TriggerFiredBundle CreateMinimalFiredBundleWithTypedJobDetail(Type jobType, Trigger trigger)
+        {
+            JobDetail jd = new JobDetail("jobName", "jobGroup", jobType);
+            TriggerFiredBundle bundle = new TriggerFiredBundle(jd, trigger, null, false, null, null, null, null);
+            return bundle;
+        }
+    }
+}
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/TriggerObjectTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/TriggerObjectTest.cs
new file mode 100644
index 00000000..e819f68c
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/TriggerObjectTest.cs
@@ -0,0 +1,89 @@
+/*
+* Copyright 2002-2005 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.
+*/
+
+using System;
+
+using NUnit.Framework;
+
+using Quartz;
+
+namespace Spring.Scheduling.Quartz
+{
+    /// <summary>
+    /// Base class for testing triggers. Contains common functionality.
+    /// </summary>
+    [TestFixture]
+    public abstract class TriggerObjectTest
+    {
+        private Trigger trigger;
+        protected const string TRIGGER_NAME = "trigger";
+
+
+        protected Trigger Trigger
+        {
+            set { trigger = value; }
+        }
+
+        [Test]
+        public virtual void TestAfterPropertiesSet_Defaults()
+        {
+            Assert.AreEqual(TRIGGER_NAME, trigger.Name, "trigger name mismatch");
+            Assert.AreEqual(SchedulerConstants.DEFAULT_GROUP, trigger.Group, "trigger group name mismatch");
+            AssertDateTimesEqualityWithAllowedDelta(DateTime.UtcNow, trigger.StartTimeUtc, 1000);
+            Assert.IsNull(trigger.JobName, "trigger job name not null");
+            Assert.AreEqual(SchedulerConstants.DEFAULT_GROUP, trigger.JobGroup, "trigger job group was not default");
+        }
+
+        [Test]
+        public virtual void TestAfterPropertiesSet_ValuesGiven()
+        {
+            const string NAME = "newName";
+            const string GROUP = "newGroup";
+            DateTime START_TIME = new DateTime(10000000);
+            trigger.Name = NAME;
+            trigger.Group = GROUP;
+            trigger.StartTimeUtc = START_TIME;
+            Assert.AreEqual(NAME, trigger.Name, "trigger name mismatch");
+            Assert.AreEqual(GROUP, trigger.Group, "trigger group name mismatch");
+            AssertDateTimesEqualityWithAllowedDelta(START_TIME, trigger.StartTimeUtc, 1000);
+        }
+
+        
+        [Test]
+        public virtual void TestAfterPropertiesSet_JobDetailGiven()
+        {
+            const string jobName = "jobName";
+            const string jobGroup = "jobGroup";
+            Assert.AreEqual(jobName, trigger.JobName, "trigger job name was not from job detail");
+            Assert.AreEqual(jobGroup, trigger.JobGroup, "trigger job group was not from job detail");
+        }
+
+        [Test]
+        public virtual void TestTriggerListenerNames_Valis()
+        {
+            string[] LISTENER_NAMES = new string[] {"Foo", "Bar", "Baz"};
+            trigger.TriggerListenerNames = LISTENER_NAMES;
+            CollectionAssert.AreEqual(LISTENER_NAMES, trigger.TriggerListenerNames, "Trigger listeners were not equal");
+        }
+
+        protected static void AssertDateTimesEqualityWithAllowedDelta(DateTime d1, DateTime d2, int allowedDeltaInMilliseconds)
+        {
+            int diffInMillis = (int) Math.Abs((d1 - d2).TotalMilliseconds);
+            Assert.LessOrEqual(diffInMillis, allowedDeltaInMilliseconds, "too much difference in times");
+        }
+    }
+
+}
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2003.csproj b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2003.csproj
new file mode 100644
index 00000000..5d64c651
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2003.csproj
@@ -0,0 +1,170 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{ED644EA8-B6AE-457C-BF32-516DAE541FAC}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Scheduling.Quartz.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = ""
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.NET.2003\Spring.Scheduling.Quartz.Tests\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.NET.2003\Spring.Scheduling.Quartz.Tests\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "Spring.Scheduling.Quartz.2003"
+                    Project = "{0C0D8C65-90DE-4914-9940-4C684C54971B}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    AssemblyName = "Spring.Core"
+                    HintPath = "..\..\..\lib\net\1.1\Spring.Core.dll"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\net\1.1\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "Quartz"
+                    AssemblyName = "Quartz"
+                    HintPath = "..\..\..\lib\net\1.1\Quartz.dll"
+                />
+                <Reference
+                    Name = "Nullables"
+                    AssemblyName = "Nullables"
+                    HintPath = "..\..\..\lib\net\1.1\Nullables.dll"
+                />
+                <Reference
+                    Name = "Rhino.Mocks"
+                    AssemblyName = "Rhino.Mocks"
+                    HintPath = "..\..\..\lib\net\1.1\Rhino.Mocks.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "Scheduling\Quartz\AdaptableJobFactoryTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\CronTriggerObjectTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\JobDetailObjectTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\MethodInvokingJobDetailFactoryObjectTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\MethodInvokingJobTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\SchedulerFactoryObjectTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\SimpleTriggerObjectTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\SpringObjectJobFactoryTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\TestUtil.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Scheduling\Quartz\TriggerObjectTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2005.csproj b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2005.csproj
new file mode 100644
index 00000000..0f965b95
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2005.csproj
@@ -0,0 +1,82 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Scheduling.Quartz.Tests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2005\Spring.Scheduling.Quartz.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.NET.2005\Spring.Scheduling.Quartz.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Quartz, Version=0.7.0.15571, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\net\2.0\Quartz.dll</HintPath>
+    </Reference>
+    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz\Spring.Scheduling.Quartz.2005.csproj">
+      <Project>{E823D54C-CE82-4868-929F-5F95A999F61E}</Project>
+      <Name>Spring.Scheduling.Quartz.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Scheduling\Quartz\AdaptableJobFactoryTest.cs" />
+    <Compile Include="Scheduling\Quartz\SchedulerFactoryObjectTest.cs" />
+    <Compile Include="Scheduling\Quartz\SpringObjectJobFactoryTest.cs" />
+    <Compile Include="Scheduling\Quartz\TestUtil.cs" />
+    <Compile Include="Scheduling\Quartz\TriggerObjectTest.cs" />
+    <Compile Include="Scheduling\Quartz\SimpleTriggerObjectTest.cs" />
+    <Compile Include="Scheduling\Quartz\CronTriggerObjectTest.cs" />
+    <Compile Include="Scheduling\Quartz\JobDetailObjectTest.cs" />
+    <Compile Include="Scheduling\Quartz\MethodInvokingJobDetailFactoryObjectTest.cs" />
+    <Compile Include="Scheduling\Quartz\MethodInvokingJobTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Spring.Scheduling.Quartz.Tests.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build
new file mode 100644
index 00000000..6968b985
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build
@@ -0,0 +1,60 @@
+<?xml version="1.0" ?>
+<project name="Spring.Scheduling.Quartz.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
+	<!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+    -->
+	<target name="build">
+
+		<csc target="library" define="${current.build.defines.csc}" 
+		     warnaserror="true"
+		     debug="${current.build.debug}" 
+      		     output="${current.bin.dir}/${project::get-name()}.dll" 
+		     doc="${current.bin.dir}/${project::get-name()}.xml">
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+			</sources>
+			<references basedir="${current.bin.dir}">
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+			</references>
+		</csc>
+		<copy todir="${current.bin.dir}">
+			<fileset basedir="${project::get-name()}/Data">
+				<include name="**/*.xml" />
+			        <include name="**/*.test" />
+			</fileset>
+		</copy>
+		<copy todir="${current.bin.dir}">
+			<fileset basedir="${project::get-name()}">
+				<include name="**/*.config" />
+			</fileset>
+		</copy>
+	</target>
+	<target name="test" depends="build">
+		<nunit2>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml" 
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" 
+			      appconfig="${current.bin.dir}/${project::get-name()}.dll.config" />
+		</nunit2>
+	</target>
+
+	<target name="test-mono-1.0" >
+		<nunit2>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml" 
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll" 
+			      appconfig="${bin.dir}/net/1.1/${current.build.config}/${project::get-name()}.dll.config" />
+		</nunit2>
+	</target>
+
+</project>
diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.dll.config b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.dll.config
new file mode 100644
index 00000000..245cdf36
--- /dev/null
+++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.dll.config
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Common.Logging"
+                          publicKeyToken="af08829b84f0328e" />
+        <!-- Assembly versions can be redirected in application, publisher policy, or machine configuration files. -->
+        <bindingRedirect oldVersion="1.1.0.0"
+                         newVersion="1.2.0.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/AssemblyInfo.cs b/test/Spring/Spring.Services.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..0b3cf995
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/AssemblyInfo.cs
@@ -0,0 +1,25 @@
+#region License
+
+/*
+ * Copyright 2002-2004 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.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Spring.Services Tests")]
+[assembly: AssemblyDescription("Unit tests for Spring.Services assembly")]
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/autowire.xml b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/autowire.xml
new file mode 100644
index 00000000..fc872c1e
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/autowire.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <!-- server -->
+
+  <object id="testObject" type="Spring.Objects.TestObject, Spring.Core.Tests" />
+
+  <object id="remotedTestObject" type="Spring.Remoting.SaoExporter, Spring.Services">
+    <property name="TargetName" value="testObject" />
+    <property name="ServiceName" value="RemotedTestObject" />
+  </object>
+
+  <!-- client -->
+
+  <object id="objectWithCtorArgRefShortcuts" type="Spring.Objects.TestObject, Spring.Core.Tests" singleton="false">
+    <constructor-arg ref="remoteTestObject"/>
+  </object>
+
+  <object id="rod2" type="Spring.Objects.Factory.Xml.ConstructorDependenciesObject, Spring.Core.Tests"
+  autowire="constructor">
+    <constructor-arg index="1">
+      <ref object="remoteTestObject"/>
+    </constructor-arg>
+    <constructor-arg index="0">
+      <ref object="remoteTestObject"/>
+    </constructor-arg>
+  </object>
+
+  <object id="kerry3" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="name" value="Kerry3" />
+    <property name="Sibling" ref="remoteTestObject"/>
+  </object>
+
+  <object id="remoteTestObject" type="Spring.Remoting.SaoFactoryObject, Spring.Services">
+    <property name="ServiceInterface" value="Spring.Objects.ITestObject, Spring.Core.Tests" />
+    <property name="ServiceUrl" value="tcp://localhost:8005/RemotedTestObject" />
+  </object>
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/cao.xml b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/cao.xml
new file mode 100644
index 00000000..29610b35
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/cao.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects 
+  xmlns="http://www.springframework.net"
+  xmlns:r="http://www.springframework.net/remoting">
+
+  <!-- server -->
+
+  <object id="counter1" type="Spring.Remoting.SimpleCounter, Spring.Services.Tests" singleton="false">
+    <constructor-arg type="int" value="1" />
+  </object>
+
+  <r:caoExporter id="counter1Exporter" targetName="counter1"/>
+
+  <!--
+		Old fashion way without remoting config parser...
+  <object type="Spring.Remoting.CaoExporter, Spring.Services">
+    <property name="TargetName" value="counter1" />
+  </object>
+  -->
+  
+
+  <!-- client -->
+
+  <r:caoFactory id="remoteCaoCounter1" remoteTargetName="counter1" serviceUrl="tcp://localhost:8005/">
+    <r:constructor-args>
+      <value type="int">7</value>
+    </r:constructor-args>
+  </r:caoFactory>
+
+  <!--
+		Old fashion way without remoting config parser...
+  <object id="remoteCaoCounter1" type="Spring.Remoting.CaoFactoryObject, Spring.Services">
+    <property name="RemoteTargetName" value="counter1" />
+    <property name="ServiceUrl" value="tcp://localhost:8005/" />
+    <property name="ConstructorArguments">
+      <list>
+        <value type="int">7</value>
+      </list>
+    </property>
+  </object>
+  -->
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/caoLifetimeService.xml b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/caoLifetimeService.xml
new file mode 100644
index 00000000..a4ef8145
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/caoLifetimeService.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects 
+  xmlns="http://www.springframework.net"
+  xmlns:r="http://www.springframework.net/remoting">
+
+  <!-- server -->
+
+  <object id="counter2" type="Spring.Remoting.SimpleCounter, Spring.Services.Tests">
+    <constructor-arg index="0" value="1" />
+  </object>
+
+  <r:caoExporter id="counter2Exporter" targetName="counter2" infinite="false">
+    <r:lifeTime initialLeaseTime="10s" renewOnCallTime="1s" sponsorshipTimeout="100ms"/>
+  </r:caoExporter>
+
+  <!--
+		Old fashion way without remoting config parser...
+  <object type="Spring.Remoting.CaoExporter, Spring.Services">
+    <property name="TargetName" value="counter2" />
+    <property name="Infinite" value="false" />
+    <property name="InitialLeaseTime" value="10s" />
+    <property name="RenewOnCallTime" value="1s" />
+    <property name="SponsorshipTimeout" value="100ms" />
+  </object>
+  -->
+  
+
+  <!-- client -->
+
+  <r:caoFactory id="remoteCaoCounter2" remoteTargetName="counter2" serviceUrl="tcp://localhost:8005/"/>
+  
+  <!--
+		Old fashion way without remoting config parser...
+  <object id="remoteCaoCounter2" type="Spring.Remoting.CaoFactoryObject, Spring.Services">
+    <property name="RemoteTargetName" value="counter2" />
+    <property name="ServiceUrl" value="tcp://localhost:8005/" />
+  </object>
+  -->
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/remotingConfigurer.xml b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/remotingConfigurer.xml
new file mode 100644
index 00000000..951a60a4
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/remotingConfigurer.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects 
+  xmlns="http://www.springframework.net"
+  xmlns:r="http://www.springframework.net/remoting">
+
+  <r:configurer filename="Spring.Services.Tests.dll.config" />
+
+  <!--
+		Old fashion way without remoting config parser...
+  <object type="Spring.Remoting.RemotingConfigurer, Spring.Services">
+    <property name="Filename" value="Spring.Services.Tests.dll.config" />
+  </object>
+  -->
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/saoLifetimeService.xml b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/saoLifetimeService.xml
new file mode 100644
index 00000000..2b9d795c
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/saoLifetimeService.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects 
+  xmlns="http://www.springframework.net"
+  xmlns:r="http://www.springframework.net/remoting">
+
+  <!-- server -->
+
+  <object id="counter" type="Spring.Remoting.SimpleCounter, Spring.Services.Tests">
+    <property name="Counter" value="1" />
+  </object>
+
+  <r:saoExporter id="saoCounter" targetName="counter" serviceName="RemotedSaoCounter" infinite="false">
+    <r:lifeTime initialLeaseTime="10s" renewOnCallTime="1s" sponsorshipTimeout="100ms"/>
+  </r:saoExporter>
+
+  <!--
+		Old fashion way without remoting config parser...
+  <object id="saoCounter" type="Spring.Remoting.SaoExporter, Spring.Services">
+    <property name="TargetName" value="counter" />
+    <property name="ServiceName" value="RemotedSaoCounter" />
+    <property name="Infinite" value="false" />
+    <property name="InitialLeaseTime" value="10s" />
+    <property name="RenewOnCallTime" value="1s" />
+    <property name="SponsorshipTimeout" value="100ms" />
+  </object>
+  -->
+
+  
+  <!-- client -->
+
+  <r:saoFactory id="remoteSaoCounter" 
+    serviceInterface="Spring.Remoting.ISimpleCounter, Spring.Services.Tests"
+    serviceUrl="tcp://localhost:8005/RemotedSaoCounter"/>
+  
+  <!--
+		Old fashion way without remoting config parser...
+  <object id="remoteSaoCounter" type="Spring.Remoting.SaoFactoryObject, Spring.Services">
+    <property name="ServiceInterface" value="Spring.Remoting.ISimpleCounter, Spring.Services.Tests" />
+    <property name="ServiceUrl" value="tcp://localhost:8005/RemotedSaoCounter" />
+  </object>
+  -->
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/saoSingleCall.xml b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/saoSingleCall.xml
new file mode 100644
index 00000000..3b728479
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/saoSingleCall.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects 
+  xmlns="http://www.springframework.net"
+  xmlns:r="http://www.springframework.net/remoting">
+
+  <!-- server -->
+
+  <object id="prototypeCounter" type="Spring.Remoting.SimpleCounter, Spring.Services.Tests" singleton="false">
+    <property name="Counter" value="1" />
+  </object>
+
+  <r:saoExporter targetName="prototypeCounter" serviceName="RemotedSaoSingleCallCounter"/>
+
+  <!--
+		Old fashion way without remoting config parser...
+  <object type="Spring.Remoting.SaoExporter, Spring.Services">
+    <property name="TargetName" value="prototypeCounter" />
+    <property name="ServiceName" value="RemotedSaoSingleCallCounter" />
+  </object>
+  -->
+  
+
+  <!-- client -->
+
+  <r:saoFactory id="remoteSaoSingleCallCounter"
+                serviceInterface="Spring.Remoting.ISimpleCounter, Spring.Services.Tests"
+                serviceUrl="tcp://localhost:8005/RemotedSaoSingleCallCounter"/>
+
+  <!--
+		Old fashion way without remoting config parser...
+  <object id="remoteSaoSingleCallCounter" type="Spring.Remoting.SaoFactoryObject, Spring.Services">
+    <property name="ServiceInterface" value="Spring.Remoting.ISimpleCounter, Spring.Services.Tests" />
+    <property name="ServiceUrl" value="tcp://localhost:8005/RemotedSaoSingleCallCounter" />
+  </object>
+  -->
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/saoSingleton-aop.xml b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/saoSingleton-aop.xml
new file mode 100644
index 00000000..e3514d39
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/saoSingleton-aop.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects 
+  xmlns="http://www.springframework.net"
+  xmlns:r="http://www.springframework.net/remoting">
+
+  <!-- server -->
+
+  <object id="singletonCounter" type="Spring.Remoting.SimpleCounter, Spring.Services.Tests">
+    <constructor-arg index="0" value="1" />
+  </object>
+
+  <r:saoExporter targetName="singletonCounter" serviceName="RemotedSaoSingletonCounter"/>
+
+  <!--
+		Old fashion way without remoting config parser...
+  <object type="Spring.Remoting.SaoExporter, Spring.Services">
+    <property name="TargetName" value="singletonCounter" />
+    <property name="ServiceName" value="RemotedSaoSingletonCounter" />
+  </object>
+  -->
+
+  
+  <!-- client -->
+  <!-- remoteSaoSingletonCounter -->
+  <r:saoFactory id="remoteSaoSingletonCounter"
+                serviceInterface="Spring.Remoting.ISimpleCounter, Spring.Services.Tests"
+                serviceUrl="tcp://localhost:8005/RemotedSaoSingletonCounter"/>
+               
+              
+
+  
+	<!--	Old fashion way without remoting config parser... -->
+  <!--
+  <object id="remoteCounter" type="Spring.Remoting.SaoFactoryObject, Spring.Services">
+    <property name="ServiceInterface" value="Spring.Remoting.ISimpleCounter, Spring.Services.Tests" />
+    <property name="ServiceUrl" value="tcp://localhost:8005/RemotedSaoSingletonCounter" />
+  </object>
+  -->
+  
+  
+  <object id="remoteCounter" type="Spring.Aop.Framework.ProxyFactoryObject, Spring.Aop">
+    <property name="target" ref="remoteSaoSingletonCounter"/>
+    <property name="interceptorNames">
+      <list>
+        <value>countAdvisor</value>
+      </list>
+    </property>
+    <property name="ProxyInterfaces">
+      <list>
+        <value>Spring.Remoting.ISimpleCounter, Spring.Services.Tests</value>
+      </list>
+    </property>
+  </object> 
+  
+  
+  <!-- NOTE - CAN NOT USE AUTO PROXY CREATOR FOR SAO SINCE CAN'T QUERY USING REFLECTION FOR
+       IMPLEMENTED INTERFACES ON TRANSPARENT PROXY -->
+  <!--
+  <object id="autoProxyCreator"
+        type="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator, Spring.Aop">
+    <property name="ObjectNames">
+      <list>
+        <value>remoteCounter</value>
+      </list>
+    </property>
+    <property name="interceptorNames">
+      <list>
+        <value>countAdvisor</value>
+      </list>
+    </property>
+  </object>
+  -->
+  
+
+  <object id="countAdvisor" type="Spring.Aop.Support.RegularExpressionMethodPointcutAdvisor, Spring.Aop">
+    <property name="pattern" value=".*Count.*"/>
+    <property name="advice" ref="countingBeforeAdvice"/>
+  </object>
+  <object id="countingBeforeAdvice" type="Spring.Aop.Framework.CountingBeforeAdvice"/>
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/saoSingleton.xml b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/saoSingleton.xml
new file mode 100644
index 00000000..3aca1bbb
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Remoting/saoSingleton.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects 
+  xmlns="http://www.springframework.net"
+  xmlns:r="http://www.springframework.net/remoting">
+
+  <!-- server -->
+
+  <object id="singletonCounter" type="Spring.Remoting.SimpleCounter, Spring.Services.Tests">
+    <constructor-arg index="0" value="1" />
+  </object>
+
+  <r:saoExporter targetName="singletonCounter" serviceName="RemotedSaoSingletonCounter"/>
+
+  <!--
+		Old fashion way without remoting config parser...
+  <object type="Spring.Remoting.SaoExporter, Spring.Services">
+    <property name="TargetName" value="singletonCounter" />
+    <property name="ServiceName" value="RemotedSaoSingletonCounter" />
+  </object>
+  -->
+
+  
+  <!-- client -->
+
+  <r:saoFactory id="remoteSaoSingletonCounter"
+                serviceInterface="Spring.Remoting.ISimpleCounter, Spring.Services.Tests"
+                serviceUrl="tcp://localhost:8005/RemotedSaoSingletonCounter"/>
+
+  <!--
+		Old fashion way without remoting config parser...
+  <object id="remoteSaoSingletonCounter" type="Spring.Remoting.SaoFactoryObject, Spring.Services">
+    <property name="ServiceInterface" value="Spring.Remoting.ISimpleCounter, Spring.Services.Tests" />
+    <property name="ServiceUrl" value="tcp://localhost:8005/RemotedSaoSingletonCounter" />
+  </object>
+  -->
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/Service.cs.fyi b/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/Service.cs.fyi
new file mode 100644
index 00000000..9416791d
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/Service.cs.fyi
@@ -0,0 +1,46 @@
+using System;
+using System.Web;
+using System.Web.Services;
+using System.Web.Services.Protocols;
+using System.Web.Services.Description;
+using System.Xml.Serialization;
+
+/// <summary>
+/// Test class used to generate the wsdl.
+/// </summary>
+[WebService(Namespace = "http://www.springframwework.net")]
+#if NET_2_0 
+[WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
+#endif
+//[SoapRpcService(Use=SoapBindingUse.Literal)]
+public class HelloWorldService : System.Web.Services.WebService
+{
+    public HelloWorldService()
+    {
+    }
+
+    [WebMethod]
+    public string SayHelloWorld()
+    {
+        return "Hello World !";
+    }
+
+    [WebMethod]
+    [return: XmlElement("out")]
+    public string SayHello(string name)
+    {
+        return String.Format("Hello {0} !", name);
+    }
+
+    [WebMethod]
+    [SoapDocumentMethod(OneWay = true)]
+    //[SoapRpcMethod(Use = SoapBindingUse.Literal, OneWay = true)]
+    public void LogHelloWorld()
+    {
+    }
+
+    [WebMethod(MessageName = "MyLogHello")]
+    public void LogHello(string name)
+    {
+    }
+}
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/configurableFactory.xml b/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/configurableFactory.xml
new file mode 100644
index 00000000..d87dd47c
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/configurableFactory.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+
+  <object id="withProxyType" type="Spring.Web.Services.WebServiceProxyFactory, Spring.Services">
+    <property name="ProxyType" value="Spring.Web.Services.WebServiceProxyFactoryTests+FakeProxyClass, Spring.Services.Tests"/>
+    <property name="ServiceInterface" value="Spring.Web.Services.WebServiceProxyFactoryTests+IHelloWorld, Spring.Services.Tests"/>
+    <property name="ProductTemplate">
+      <object>
+        <property name="Url" value="http://www.springframework.org/" />
+        <property name="Timeout" value="10000" />
+      </object>
+    </property>
+  </object>
+
+  <object id="withServiceUri" type="Spring.Web.Services.WebServiceProxyFactory, Spring.Services">
+    <property name="ServiceUri" value="assembly://Spring.Services.Tests/Spring.Data.Spring.Web.Services/document-literal.wsdl"/>
+    <property name="ServiceInterface" value="Spring.Web.Services.WebServiceProxyFactoryTests+IHelloWorld, Spring.Services.Tests"/>
+    <property name="ProductTemplate">
+      <object>
+        <property name="Url" value="http://www.springframework.org/" />
+        <property name="Timeout" value="10000" />
+      </object>
+    </property>
+  </object>
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/document-literal.wsdl b/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/document-literal.wsdl
new file mode 100644
index 00000000..cdf8055a
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/document-literal.wsdl
@@ -0,0 +1,162 @@
+<?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://www.springframwework.net" 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://www.springframwework.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+    <s:schema elementFormDefault="qualified" targetNamespace="http://www.springframwework.net">
+      <s:element name="SayHelloWorld">
+        <s:complexType />
+      </s:element>
+      <s:element name="SayHelloWorldResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="SayHelloWorldResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="SayHello">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="name" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="SayHelloResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="out" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="LogHelloWorld">
+        <s:complexType />
+      </s:element>
+      <s:element name="MyLogHello">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="name" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="MyLogHelloResponse">
+        <s:complexType />
+      </s:element>
+    </s:schema>
+  </wsdl:types>
+  <wsdl:message name="SayHelloWorldSoapIn">
+    <wsdl:part name="parameters" element="tns:SayHelloWorld" />
+  </wsdl:message>
+  <wsdl:message name="SayHelloWorldSoapOut">
+    <wsdl:part name="parameters" element="tns:SayHelloWorldResponse" />
+  </wsdl:message>
+  <wsdl:message name="SayHelloSoapIn">
+    <wsdl:part name="parameters" element="tns:SayHello" />
+  </wsdl:message>
+  <wsdl:message name="SayHelloSoapOut">
+    <wsdl:part name="parameters" element="tns:SayHelloResponse" />
+  </wsdl:message>
+  <wsdl:message name="LogHelloWorldSoapIn">
+    <wsdl:part name="parameters" element="tns:LogHelloWorld" />
+  </wsdl:message>
+  <wsdl:message name="MyLogHelloSoapIn">
+    <wsdl:part name="parameters" element="tns:MyLogHello" />
+  </wsdl:message>
+  <wsdl:message name="MyLogHelloSoapOut">
+    <wsdl:part name="parameters" element="tns:MyLogHelloResponse" />
+  </wsdl:message>
+  <wsdl:portType name="HelloWorldServiceSoap">
+    <wsdl:operation name="SayHelloWorld">
+      <wsdl:input message="tns:SayHelloWorldSoapIn" />
+      <wsdl:output message="tns:SayHelloWorldSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="SayHello">
+      <wsdl:input message="tns:SayHelloSoapIn" />
+      <wsdl:output message="tns:SayHelloSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="LogHelloWorld">
+      <wsdl:input message="tns:LogHelloWorldSoapIn" />
+    </wsdl:operation>
+    <wsdl:operation name="LogHello">
+      <wsdl:input name="MyLogHello" message="tns:MyLogHelloSoapIn" />
+      <wsdl:output name="MyLogHello" message="tns:MyLogHelloSoapOut" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="HelloWorldServiceSoap" type="tns:HelloWorldServiceSoap">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="SayHelloWorld">
+      <soap:operation soapAction="http://www.springframwework.net/SayHelloWorld" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="SayHello">
+      <soap:operation soapAction="http://www.springframwework.net/SayHello" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="LogHelloWorld">
+      <soap:operation soapAction="http://www.springframwework.net/LogHelloWorld" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+    </wsdl:operation>
+    <wsdl:operation name="LogHello">
+      <soap:operation soapAction="http://www.springframwework.net/MyLogHello" style="document" />
+      <wsdl:input name="MyLogHello">
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output name="MyLogHello">
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="HelloWorldServiceSoap12" type="tns:HelloWorldServiceSoap">
+    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="SayHelloWorld">
+      <soap12:operation soapAction="http://www.springframwework.net/SayHelloWorld" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="SayHello">
+      <soap12:operation soapAction="http://www.springframwework.net/SayHello" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="LogHelloWorld">
+      <soap12:operation soapAction="http://www.springframwework.net/LogHelloWorld" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+    </wsdl:operation>
+    <wsdl:operation name="LogHello">
+      <soap12:operation soapAction="http://www.springframwework.net/MyLogHello" style="document" />
+      <wsdl:input name="MyLogHello">
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output name="MyLogHello">
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="HelloWorldService">
+    <wsdl:port name="HelloWorldServiceSoap" binding="tns:HelloWorldServiceSoap">
+      <soap:address location="http://localhost/HelloWorld/Service.asmx" />
+    </wsdl:port>
+    <wsdl:port name="HelloWorldServiceSoap12" binding="tns:HelloWorldServiceSoap12">
+      <soap12:address location="http://localhost/HelloWorld/Service.asmx" />
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/nestedSchema.wsdl b/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/nestedSchema.wsdl
new file mode 100644
index 00000000..c0163225
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/nestedSchema.wsdl
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://mywsdlns" xmlns:ns1="http://myns" xmlns:soapenc12="http://www.w3.org/2003/05/soap-encoding" xmlns:tns="http://mywsdlns" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap11="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc11="http://schemas.xmlsoap.org/soap/encoding/" xmlns:soap12="http://www.w3.org/2003/05/soap-envelope">
+  <wsdl:types>
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://myns" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://myns">
+      <xsd:include schemaLocation="nestedSchema.xsd"/>
+    </xsd:schema>
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://mywsdlns">
+      <xsd:import namespace="http://myns"/>
+      <xsd:element name="testMethod">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element maxOccurs="1" minOccurs="1" name="userCredentials" nillable="true" type="ns1:UserCredentials"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="testMethodResponse">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element maxOccurs="1" minOccurs="1" name="out" nillable="true" type="xsd:string"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="WebServiceException" type="xsd:string"/>
+    </xsd:schema>
+  </wsdl:types>
+  <wsdl:message name="testMethodRequest">
+    <wsdl:part name="parameters" element="tns:testMethod"/>
+  </wsdl:message>
+  <wsdl:message name="WebServiceException">
+    <wsdl:part name="WebServiceException" element="tns:WebServiceException"/>
+  </wsdl:message>
+  <wsdl:message name="testMethodResponse">
+    <wsdl:part name="parameters" element="tns:testMethodResponse"/>
+  </wsdl:message>
+  <wsdl:portType name="SPPServiceSoap">
+    <wsdl:operation name="testMethod">
+      <wsdl:input name="testMethodRequest" message="tns:testMethodRequest"/>
+      <wsdl:output name="testMethodResponse" message="tns:testMethodResponse"/>
+      <wsdl:fault name="WebServiceException" message="tns:WebServiceException"/>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="SPPServiceHttpBinding" type="tns:SPPServiceSoap">
+    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="testMethod">
+      <wsdlsoap:operation soapAction=""/>
+      <wsdl:input name="testMethodRequest">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="testMethodResponse">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:output>
+      <wsdl:fault name="WebServiceException">
+        <wsdlsoap:fault name="WebServiceException" use="literal"/>
+      </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="SPPService">
+    <wsdl:port name="SPPServiceHttpPort" binding="tns:SPPServiceHttpBinding">
+      <wsdlsoap:address location="http://localhost/Test/"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/nestedSchema.xsd b/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/nestedSchema.xsd
new file mode 100644
index 00000000..475746d9
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/nestedSchema.xsd
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns="http://myns"
+	targetNamespace="http://myns"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <xsd:simpleType name="GUID">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="\{?[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\}?" />
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="UserCredentials">
+    <xsd:sequence>
+      <xsd:element minOccurs="1" maxOccurs="1" name="userId" type="GUID" />
+      <xsd:element minOccurs="1" maxOccurs="1" name="applicationName" type="xsd:string" />
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:element name="userCredentials" type="UserCredentials" />
+</xsd:schema>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/rpc-literal.wsdl b/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/rpc-literal.wsdl
new file mode 100644
index 00000000..ce4fe596
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/Web/Services/rpc-literal.wsdl
@@ -0,0 +1,116 @@
+<?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://www.springframwework.net" 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://www.springframwework.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types />
+  <wsdl:message name="SayHelloWorldSoapIn" />
+  <wsdl:message name="SayHelloWorldSoapOut">
+    <wsdl:part name="SayHelloWorldResult" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="SayHelloSoapIn">
+    <wsdl:part name="name" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="SayHelloSoapOut">
+    <wsdl:part name="out" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="LogHelloWorldSoapIn" />
+  <wsdl:message name="MyLogHelloSoapIn">
+    <wsdl:part name="name" type="s:string" />
+  </wsdl:message>
+  <wsdl:message name="MyLogHelloSoapOut" />
+  <wsdl:portType name="HelloWorldServiceSoap">
+    <wsdl:operation name="SayHelloWorld">
+      <wsdl:input message="tns:SayHelloWorldSoapIn" />
+      <wsdl:output message="tns:SayHelloWorldSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="SayHello">
+      <wsdl:input message="tns:SayHelloSoapIn" />
+      <wsdl:output message="tns:SayHelloSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="LogHelloWorld">
+      <wsdl:input message="tns:LogHelloWorldSoapIn" />
+    </wsdl:operation>
+    <wsdl:operation name="LogHello">
+      <wsdl:input name="MyLogHello" message="tns:MyLogHelloSoapIn" />
+      <wsdl:output name="MyLogHello" message="tns:MyLogHelloSoapOut" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="HelloWorldServiceSoap" type="tns:HelloWorldServiceSoap">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
+    <wsdl:operation name="SayHelloWorld">
+      <soap:operation soapAction="http://www.springframwework.net/SayHelloWorld" style="rpc" />
+      <wsdl:input>
+        <soap:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="SayHello">
+      <soap:operation soapAction="http://www.springframwework.net/SayHello" style="rpc" />
+      <wsdl:input>
+        <soap:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="LogHelloWorld">
+      <soap:operation soapAction="http://www.springframwework.net/LogHelloWorld" style="rpc" />
+      <wsdl:input>
+        <soap:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:input>
+    </wsdl:operation>
+    <wsdl:operation name="LogHello">
+      <soap:operation soapAction="http://www.springframwework.net/MyLogHello" style="rpc" />
+      <wsdl:input name="MyLogHello">
+        <soap:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:input>
+      <wsdl:output name="MyLogHello">
+        <soap:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:binding name="HelloWorldServiceSoap12" type="tns:HelloWorldServiceSoap">
+    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
+    <wsdl:operation name="SayHelloWorld">
+      <soap12:operation soapAction="http://www.springframwework.net/SayHelloWorld" style="rpc" />
+      <wsdl:input>
+        <soap12:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="SayHello">
+      <soap12:operation soapAction="http://www.springframwework.net/SayHello" style="rpc" />
+      <wsdl:input>
+        <soap12:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="LogHelloWorld">
+      <soap12:operation soapAction="http://www.springframwework.net/LogHelloWorld" style="rpc" />
+      <wsdl:input>
+        <soap12:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:input>
+    </wsdl:operation>
+    <wsdl:operation name="LogHello">
+      <soap12:operation soapAction="http://www.springframwework.net/MyLogHello" style="rpc" />
+      <wsdl:input name="MyLogHello">
+        <soap12:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:input>
+      <wsdl:output name="MyLogHello">
+        <soap12:body use="literal" namespace="http://www.springframwework.net" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="HelloWorldService">
+    <wsdl:port name="HelloWorldServiceSoap" binding="tns:HelloWorldServiceSoap">
+      <soap:address location="http://localhost/HelloWorld/Service.asmx" />
+    </wsdl:port>
+    <wsdl:port name="HelloWorldServiceSoap12" binding="tns:HelloWorldServiceSoap12">
+      <soap12:address location="http://localhost/HelloWorld/Service.asmx" />
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/localizer.xml b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/localizer.xml
new file mode 100644
index 00000000..e8875505
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/localizer.xml
@@ -0,0 +1,6 @@
+<objects>
+	<object 
+		name="localizer"
+		type="Spring.Services.WindowsService.Common.Localizer+ForApplication">
+	</object>
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/service.config b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/service.config
new file mode 100644
index 00000000..89a442fa
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/service.config
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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" />
+		</sectionGroup>
+	</configSections>
+	  
+	<spring>
+		<context type="Spring.Context.Support.XmlApplicationContext, Spring.Core">
+			<resource uri="file://~/service.xml" />
+		</context>
+	</spring>
+
+    <runtime>
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+         <probing privatePath="wwwroot\bin"/>
+      </assemblyBinding>
+   </runtime>
+</configuration>
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/service.xml b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/service.xml
new file mode 100644
index 00000000..f42b3f2c
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/service.xml
@@ -0,0 +1,25 @@
+<objects>
+	
+	<import resource="file://~/localizer.xml"/>
+
+    <object name="cassini" type="Cassini.Server, Cassini" init-method="Start" destroy-method="Stop">
+        <!--
+        <constructor-arg>
+            <value>8800</value>
+        </constructor-arg>
+        <constructor-arg>
+            <value>/</value>
+        </constructor-arg>
+        <constructor-arg>
+            <value>${spring.services.application.fullpath}/wwwroot</value>
+        </constructor-arg>        
+        -->
+        <constructor-arg index="0" value="90"/>
+        <constructor-arg index="1" value="/"/>
+        <constructor-arg index="2" value="${spring.services.application.fullpath}/wwwroot"/>
+        <!--
+        <constructor-arg index="2" value="C:\Documents and Settings\fede\Desktop\Spring.Net\build\VS.Net\Spring.Services.WindowsService.Process\Debug\deploy\cassini\wwwroot"/>
+        -->
+    </object>
+
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/watcher.xml b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/watcher.xml
new file mode 100644
index 00000000..16c4f45a
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/watcher.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--@ <code> @-->
+<objects>
+
+    <object name='watcher' 
+      type='Spring.Services.WindowsService.Common.Deploy.FileSystem.FileSystemApplicationWatcher'>
+      <!-- 
+      we can get access to the IApplication we are asked to monitor 
+      using a reference like the following
+      -->
+      <constructor-arg ref='.injected.application'/>
+
+      <!-- sometimes the windows OS will decide to not give you the same case you see in explorer:
+           in fact one should consider this OS case-insensitive with regard to file names ...
+           The following property, true by default can however be tuned
+	  <property name="ignoreCase" value="false"/>
+      -->
+
+      <property name="includes">
+        <list>
+          <value>wwwroot/bin/*.*</value> 
+          <value>service.config</value> 
+          <value>service.xml</value> 
+        </list>
+      </property>      
+      
+      <!--
+      <property name="excludes">
+        <list>
+          <value>Db/**/*.*</value> 
+          <value>Jobs</value>
+          <value>Jobs</value>
+          <value>**/*.log</value>
+        </list>
+      </property>
+      -->
+      
+    </object>
+    
+</objects>
+<!--@ </code> @-->
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/wwwroot/bin/Cassini.dll b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/wwwroot/bin/Cassini.dll
new file mode 100644
index 00000000..60ca15b0
Binary files /dev/null and b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Cassini/wwwroot/bin/Cassini.dll differ
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Echo/service.config b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Echo/service.config
new file mode 100644
index 00000000..714332af
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Echo/service.config
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--@ <code> @-->
+<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" />
+		</sectionGroup>
+	</configSections>
+	  
+	<appSettings>
+		<add key="port" value="10"/>
+	</appSettings>  
+
+	<spring>
+		<context type="Spring.Context.Support.XmlApplicationContext, Spring.Core">
+			<resource uri="file://~/service.xml" />
+		</context>
+	</spring>
+ 
+</configuration>
+<!--@ </code> @-->
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Echo/service.xml b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Echo/service.xml
new file mode 100644
index 00000000..8a9ca1d7
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Echo/service.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--@ <code> @-->
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+    <object name="echo" 
+      type="Spring.Services.WindowsService.Samples.Echo, Spring.Services.WindowsService.Tests" 
+      init-method="Start" destroy-method="Stop">
+      <property name="port"><value>${port}</value></property>
+    </object>
+
+    <object id="configurer" type="Spring.Objects.Factory.Config.PropertyPlaceholderConfigurer, Spring.Core">
+      <property name="locations">
+         <list>
+            <value>file://~/service.config</value>
+         </list>
+      </property>
+      <property name="configSections">
+         <list>
+            <value>appSettings</value>
+         </list>
+      </property>
+	</object>
+
+</objects>
+<!--@ </code> @-->
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Echo/watcher.xml b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Echo/watcher.xml
new file mode 100644
index 00000000..686e969c
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Echo/watcher.xml
@@ -0,0 +1,38 @@
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+    <object name='watcher' 
+      type='Spring.Services.WindowsService.Common.Deploy.FileSystem.FileSystemApplicationWatcher'>
+      <!-- 
+      we can get access to the IApplication we are asked to monitor 
+      using a reference like the following
+      -->
+      <constructor-arg ref='.injected.application'/>
+
+      <!-- sometimes the windows OS will decide to not give you the same case you see in explorer:
+           in fact one should consider this OS case-insensitive with regard to file names ...
+           The following property, true by default can however be tuned
+	  <property name="ignoreCase" value="false"/>
+      -->
+
+      <property name="includes">
+        <list>
+          <value>**/**</value> 
+        </list>
+      </property>      
+      
+      <!--
+      <property name="excludes">
+        <list>
+          <value>Db/**/*.*</value> 
+          <value>Jobs</value>
+          <value>Jobs</value>
+          <value>**/*.log</value>
+        </list>
+      </property>
+      -->
+      
+    </object>
+
+</objects>
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Simple/service.config b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Simple/service.config
new file mode 100644
index 00000000..d76f9bae
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Simple/service.config
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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" />
+		</sectionGroup>
+	</configSections>
+	  
+	<spring>
+		<context type="Spring.Context.Support.XmlApplicationContext, Spring.Core">
+			<resource uri="file://~/service.xml" />
+		</context>
+		<objects>
+		</objects>
+	</spring>
+
+</configuration>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Simple/service.xml b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Simple/service.xml
new file mode 100644
index 00000000..0b0a5406
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Simple/service.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--@ <code> @-->
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+	<!--@ <localizer> @-->
+	<!-- provides access to the ${spring.services.application.*} properties -->
+	<object 
+		name="localizer"
+		type="Spring.Services.WindowsService.Common.Localizer+ForApplication, Spring.Services.WindowsService.Common">
+		<!-- change this to access the property with another prefix, for example ${foo.application.base.dir}
+		-->
+		<property name="prefix" value="myPrefix"/>
+	</object>
+	<!--@ </localizer> @-->
+
+	<!--@ <simple> @-->
+    <object name="simple" 
+      type="Spring.Services.WindowsService.Samples.Simple, Spring.Services.WindowsService.Tests" 
+      init-method="Start" destroy-method="Stop">
+      <constructor-arg index="0" value="${myPrefix.application.name},${myPrefix.application.fullPath}"/>
+      <property name="AppName">
+        <value>${myPrefix.application.name}</value>
+      </property>
+      <property name="AppFullPath">
+        <value>${myPrefix.application.fullpath}</value>
+      </property>
+    </object>
+	<!--@ </simple> @-->
+   
+</objects>
+<!--@ </code> @-->
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Simple/watcher.xml b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Simple/watcher.xml
new file mode 100644
index 00000000..686e969c
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Spring/WindowsService/Simple/watcher.xml
@@ -0,0 +1,38 @@
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+
+    <object name='watcher' 
+      type='Spring.Services.WindowsService.Common.Deploy.FileSystem.FileSystemApplicationWatcher'>
+      <!-- 
+      we can get access to the IApplication we are asked to monitor 
+      using a reference like the following
+      -->
+      <constructor-arg ref='.injected.application'/>
+
+      <!-- sometimes the windows OS will decide to not give you the same case you see in explorer:
+           in fact one should consider this OS case-insensitive with regard to file names ...
+           The following property, true by default can however be tuned
+	  <property name="ignoreCase" value="false"/>
+      -->
+
+      <property name="includes">
+        <list>
+          <value>**/**</value> 
+        </list>
+      </property>      
+      
+      <!--
+      <property name="excludes">
+        <list>
+          <value>Db/**/*.*</value> 
+          <value>Jobs</value>
+          <value>Jobs</value>
+          <value>**/*.log</value>
+        </list>
+      </property>
+      -->
+      
+    </object>
+
+</objects>
diff --git a/test/Spring/Spring.Services.Tests/Data/Xml/watcher-0.xml b/test/Spring/Spring.Services.Tests/Data/Xml/watcher-0.xml
new file mode 100644
index 00000000..268467c4
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Xml/watcher-0.xml
@@ -0,0 +1,4 @@
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+</objects>
diff --git a/test/Spring/Spring.Services.Tests/Data/Xml/watcher-1.xml b/test/Spring/Spring.Services.Tests/Data/Xml/watcher-1.xml
new file mode 100644
index 00000000..325a405d
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Xml/watcher-1.xml
@@ -0,0 +1,23 @@
+<!--@ <code> @-->
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+    <object name='watcher' 
+      type='Spring.Services.WindowsService.Common.Deploy.FileSystem.FileSystemApplicationWatcher' 
+      singleton='false'>
+      <constructor-arg><ref object='.injected.application'/></constructor-arg>
+      <constructor-arg><ref object='configurer'/></constructor-arg>
+    </object>
+
+    <object name='configurer' 
+      type='Spring.Services.WindowsService.Common.Deploy.FileSystem.RegularExpressionFilterConfigurer' 
+      singleton='false'>
+        <property name='includes'>
+        <list>
+          <value>**/**</value>
+        </list>
+      </property>
+    </object>
+</objects>
+<!--@ </code> @-->
diff --git a/test/Spring/Spring.Services.Tests/Data/Xml/watcher-simple.xml b/test/Spring/Spring.Services.Tests/Data/Xml/watcher-simple.xml
new file mode 100644
index 00000000..eedce295
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Data/Xml/watcher-simple.xml
@@ -0,0 +1,26 @@
+<!--@ <code> @-->
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+	
+    <object name='watcher' 
+      type='Spring.Services.WindowsService.Common.Deploy.FileSystem.FileSystemApplicationWatcher'>
+      <!-- 
+      we can get access to the IApplication we are asked to monitor 
+      using a reference like the following 
+      -->
+      <constructor-arg ref='.injected.application'/>
+      <property name='includes'>
+        <list>
+          <value>foo/foo.bar</value>
+        </list>
+      </property>
+      <property name='excludes'>
+        <list>
+          <value>*.*</value>
+        </list>
+      </property>
+    </object>
+
+</objects>
+<!--@ </code> @-->
diff --git a/test/Spring/Spring.Services.Tests/EnterpriseServices/ServicedComponentExporterTests.cs b/test/Spring/Spring.Services.Tests/EnterpriseServices/ServicedComponentExporterTests.cs
new file mode 100644
index 00000000..b96b91f2
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/EnterpriseServices/ServicedComponentExporterTests.cs
@@ -0,0 +1,99 @@
+#region License
+
+/*
+ * Copyright 2007 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
+
+#if (!NET_1_0)
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.EnterpriseServices;
+using System.Reflection;
+using System.Reflection.Emit;
+
+using NUnit.Framework;
+using DotNetMock.Dynamic;
+using Spring.Objects.Factory;
+using Spring.Objects;
+
+#endregion
+
+namespace Spring.EnterpriseServices
+{
+	/// <summary>
+    /// Unit tests for the ServicedComponentExporter class.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: ServicedComponentExporterTests.cs,v 1.2 2007/05/16 10:03:25 oakinger Exp $</version>
+	[TestFixture]
+    public class ServicedComponentExporterTests
+	{
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void BailsWhenNotConfigured ()
+        {
+            ServicedComponentExporter exp = new ServicedComponentExporter();
+            exp.AfterPropertiesSet ();
+        }
+
+        [Test]
+        public void RegistersSimpleObjectWithNonDefaultTransactionOption()
+        {
+            ServicedComponentExporter exp = new ServicedComponentExporter();
+            exp.TargetName = "objectTest";
+            exp.ObjectName = "objectTestProxy";
+            exp.TypeAttributes = new ArrayList();
+            exp.TypeAttributes.Add(new TransactionAttribute(TransactionOption.RequiresNew));
+            exp.AfterPropertiesSet();
+
+            Type type = CreateWrapperType(exp, typeof(TestObject));
+
+            TransactionAttribute[] attrs =  (TransactionAttribute[])type.GetCustomAttributes(typeof(TransactionAttribute), false);
+            Assert.AreEqual(1, attrs.Length);
+            Assert.AreEqual(TransactionOption.RequiresNew, attrs[0].Value);
+        }
+
+        #region Private helpers classes
+
+        private Type CreateWrapperType(ServicedComponentExporter exporter, Type type)
+        {
+            MethodInfo createWrapperTypeMethodInfo = typeof(ServicedComponentExporter).GetMethod("CreateWrapperType", BindingFlags.Instance | BindingFlags.NonPublic);
+            Assert.IsNotNull(createWrapperTypeMethodInfo);
+
+            AssemblyName an = new AssemblyName();
+			an.Name = "Spring.EnterpriseServices.Tests";
+            AssemblyBuilder proxyAssembly = AppDomain.CurrentDomain.DefineDynamicAssembly(an, AssemblyBuilderAccess.RunAndSave);
+            ModuleBuilder module = proxyAssembly.DefineDynamicModule(an.Name, an.Name + ".dll", true);
+
+            IDynamicMock mockObjectFactory = new DynamicMock(typeof(IObjectFactory));
+            mockObjectFactory.ExpectAndReturn("GetType", type, new object[]{ exporter.TargetName });
+
+            object result = createWrapperTypeMethodInfo.Invoke(exporter, new object[] { module, mockObjectFactory.Object });
+            Assert.IsNotNull(result);
+            Assert.IsTrue(result is Type);
+
+            return (Type)result;
+        }
+
+        #endregion
+	}
+}
+
+#endif // (!NET_1_0)
diff --git a/test/Spring/Spring.Services.Tests/Remoting/BaseRemotingTestFixture.cs b/test/Spring/Spring.Services.Tests/Remoting/BaseRemotingTestFixture.cs
new file mode 100644
index 00000000..aeaa5478
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Remoting/BaseRemotingTestFixture.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Runtime.Remoting.Channels;
+using System.Runtime.Remoting.Channels.Tcp;
+using NUnit.Framework;
+using Spring.Context.Support;
+
+namespace Spring.Remoting
+{
+    public class BaseRemotingTestFixture
+    {
+        protected static TcpChannel channel;
+        private static object lockObject = new object();
+
+        [TestFixtureSetUp]
+        public virtual void FixtureSetUp()
+        {
+            lock (lockObject)
+            {
+                if (channel == null)
+                {
+                    try
+                    {
+                        foreach (IChannel registeredChannel in ChannelServices.RegisteredChannels)
+                        {
+                            if (registeredChannel is TcpChannel)
+                            {
+                                ((TcpChannel) registeredChannel).StopListening(null);
+                            }
+                            ChannelServices.UnregisterChannel(registeredChannel);
+                        }
+
+                        channel = new TcpChannel(8005);
+#if !NET_2_0 
+                        ChannelServices.RegisterChannel(channel);
+#else
+                        ChannelServices.RegisterChannel(channel, false);
+#endif
+                    }
+                    catch
+                    {
+                        // ignore duplicate registration exception if it occurs...
+                    }
+                }
+            }
+        }
+
+        [TearDown]
+        public virtual void TearDown()
+        {
+            ContextRegistry.Clear();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Remoting/CaoExporterTests.cs b/test/Spring/Spring.Services.Tests/Remoting/CaoExporterTests.cs
new file mode 100644
index 00000000..c9d4ebae
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Remoting/CaoExporterTests.cs
@@ -0,0 +1,82 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Remoting.Lifetime;
+
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Remoting.Support;
+
+#endregion
+
+namespace Spring.Remoting
+{
+	/// <summary>
+	/// Unit tests for the CaoExporter class.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: CaoExporterTests.cs,v 1.11 2007/02/20 19:39:47 aseovic Exp $</version>
+	[TestFixture]
+	public class CaoExporterTests : BaseRemotingTestFixture
+	{
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void BailsWhenNotConfigured ()
+        {
+            CaoExporter exp = new CaoExporter();
+            exp.AfterPropertiesSet ();
+        }
+
+        [Test]
+        public void RegistersSimpleObject()
+        {
+            IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Services.Tests/Spring.Data.Spring.Remoting/caoLifetimeService.xml");
+            ContextRegistry.RegisterContext(ctx);
+
+            ICaoRemoteFactory caoFactory = Activator.GetObject(typeof(ICaoRemoteFactory), "tcp://localhost:8005/counter2") as ICaoRemoteFactory;
+            Assert.IsNotNull(caoFactory, "Cao factory is null even though it has been registered.");
+
+            MarshalByRefObject cao = caoFactory.GetObject() as MarshalByRefObject;
+            Assert.IsNotNull(cao);
+        }
+
+		[Test]
+		public void RegistersWithLifetimeService()
+		{
+            IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Services.Tests/Spring.Data.Spring.Remoting/caoLifetimeService.xml");
+            ContextRegistry.RegisterContext(ctx);
+
+            ICaoRemoteFactory caoFactory = Activator.GetObject(typeof(ICaoRemoteFactory), "tcp://localhost:8005/counter2") as ICaoRemoteFactory;
+            Assert.IsNotNull(caoFactory, "Cao factory is null even though it has been registered.");
+
+            MarshalByRefObject cao = caoFactory.GetObject() as MarshalByRefObject;
+            Assert.IsNotNull(cao);
+
+            ILease lease = (ILease)cao.GetLifetimeService();
+			Assert.AreEqual(TimeSpan.FromMilliseconds(10000), lease.InitialLeaseTime, "InitialLeaseTime");
+			Assert.AreEqual(TimeSpan.FromMilliseconds(1000), lease.RenewOnCallTime, "RenewOnCallTime");
+			Assert.AreEqual(TimeSpan.FromMilliseconds(100), lease.SponsorshipTimeout, "SponsorshipTimeout");
+		}
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/Remoting/CaoFactoryObjectTests.cs b/test/Spring/Spring.Services.Tests/Remoting/CaoFactoryObjectTests.cs
new file mode 100644
index 00000000..aa16f428
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Remoting/CaoFactoryObjectTests.cs
@@ -0,0 +1,78 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Remoting
+{
+	/// <summary>
+	/// Unit tests for the CaoFactoryObject class.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: CaoFactoryObjectTests.cs,v 1.12 2007/02/20 19:39:52 aseovic Exp $</version>
+	[TestFixture]
+	public class CaoFactoryObjectTests : BaseRemotingTestFixture
+	{
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void BailsWhenNotConfigured ()
+        {
+            CaoFactoryObject cfo = new CaoFactoryObject();
+            cfo.AfterPropertiesSet ();
+        }
+
+		[Test]
+		public void GetSimpleObject()
+		{
+            IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Services.Tests/Spring.Data.Spring.Remoting/cao.xml");
+            ContextRegistry.RegisterContext(ctx);
+
+			object obj = ctx.GetObject("remoteCaoCounter1");
+
+			Assert.IsNotNull(obj, "Object is null even though a object has been registered.");
+			Assert.IsTrue((obj is ISimpleCounter), "Object should implement 'ISimpleCounter' interface.");
+
+			ISimpleCounter sc = (ISimpleCounter) obj;
+			Assert.AreEqual(7, sc.Counter, "Remote object hasn't been activated by the client.");
+            sc.Count();
+            Assert.AreEqual(8, sc.Counter);
+		}
+
+        [Test]
+        public void DisconnectFromClient()
+        {
+            IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Services.Tests/Spring.Data.Spring.Remoting/cao.xml");
+            ContextRegistry.RegisterContext(ctx);
+
+            object obj = ctx.GetObject("remoteCaoCounter1");
+            Assert.IsNotNull(obj, "CAO is null even though a CAO has been registered.");
+
+            IDisposable cao = obj as IDisposable;
+            Assert.IsNotNull(cao, "CAO should implement 'IDisposable' interface.");
+        }
+    }
+}
diff --git a/test/Spring/Spring.Services.Tests/Remoting/ISimpleCounter.cs b/test/Spring/Spring.Services.Tests/Remoting/ISimpleCounter.cs
new file mode 100644
index 00000000..2033f6a8
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Remoting/ISimpleCounter.cs
@@ -0,0 +1,40 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+
+#endregion
+
+namespace Spring.Remoting
+{
+    public interface ISimpleCounter
+    {
+        /// <summary>
+        /// Gets or Sets the Counter's value.
+        /// </summary>
+        int Counter { get; set; }
+
+        /// <summary>
+        /// Increments the counter by one.
+        /// </summary>
+        void Count();
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Remoting/RemoteObjectFactoryTests.cs b/test/Spring/Spring.Services.Tests/Remoting/RemoteObjectFactoryTests.cs
new file mode 100644
index 00000000..754fa29d
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Remoting/RemoteObjectFactoryTests.cs
@@ -0,0 +1,89 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using System.Runtime.Remoting.Lifetime;
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Remoting
+{
+    /// <summary>
+    /// Unit tests for the RemoteObjectFactory class.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: RemoteObjectFactoryTests.cs,v 1.5 2007/08/22 20:17:19 oakinger Exp $</version>
+    [TestFixture]
+    public class RemoteObjectFactoryTests
+    {
+        [Test]
+        [ExpectedException(typeof(ArgumentException), ExpectedMessage="The Target property is required.")]
+        public void BailsWhenNotConfigured()
+        {
+            RemoteObjectFactory factory = new RemoteObjectFactory();
+            factory.AfterPropertiesSet();
+        }
+
+        [Test]
+        public void CreateRemoteObject()
+        {
+            RemoteObjectFactory factory = new RemoteObjectFactory();
+            factory.Target = new SimpleCounter();
+            factory.AfterPropertiesSet();
+
+            object obj = factory.GetObject();
+
+            Assert.IsTrue((obj is MarshalByRefObject), "Object should derive from MarshalByRefObject.");
+        }
+
+        [Test]
+        public void ReturnsInterfaceImplementation()
+        {
+            RemoteObjectFactory factory = new RemoteObjectFactory();
+            factory.Target = new SimpleCounter();
+            factory.AfterPropertiesSet();
+
+            object obj = factory.GetObject();
+
+            Assert.IsTrue((obj is ISimpleCounter), "Object should implement an interface.");
+        }
+
+        [Test]
+        public void CreateRemoteObjectWithLeaseInfo()
+        {
+            RemoteObjectFactory factory = new RemoteObjectFactory();
+            factory.Target = new SimpleCounter();
+            factory.Infinite = false;
+            factory.InitialLeaseTime = TimeSpan.FromMilliseconds(10000);
+            factory.RenewOnCallTime = TimeSpan.FromMilliseconds(1000);
+            factory.SponsorshipTimeout = TimeSpan.FromMilliseconds(100);
+            MarshalByRefObject remoteObject = (MarshalByRefObject) factory.GetObject();
+
+            ILease lease = (ILease) remoteObject.InitializeLifetimeService();
+            Assert.AreEqual(TimeSpan.FromMilliseconds(10000), lease.InitialLeaseTime, "InitialLeaseTime");
+            Assert.AreEqual(TimeSpan.FromMilliseconds(1000), lease.RenewOnCallTime, "RenewOnCallTime");
+            Assert.AreEqual(TimeSpan.FromMilliseconds(100), lease.SponsorshipTimeout, "SponsorshipTimeout");
+        }
+    }
+}
diff --git a/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigParserTests.cs b/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigParserTests.cs
new file mode 100644
index 00000000..34d4f5cb
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigParserTests.cs
@@ -0,0 +1,38 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Remoting
+{
+	/// <summary>
+    /// Unit tests for the RemotingConfigParserTests class.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: RemotingConfigParserTests.cs,v 1.1 2006/05/20 22:16:59 bbaia Exp $</version>
+	[TestFixture]
+    public class RemotingConfigParserTests
+	{
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigurerTests.cs b/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigurerTests.cs
new file mode 100644
index 00000000..585d2e15
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Remoting/RemotingConfigurerTests.cs
@@ -0,0 +1,56 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System.Runtime.Remoting.Channels;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+
+#endregion
+
+namespace Spring.Remoting
+{
+	/// <summary>
+    /// Unit tests for the RemotingConfigurerTests class.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: RemotingConfigurerTests.cs,v 1.3 2007/02/20 19:40:02 aseovic Exp $</version>
+	[TestFixture]
+    public class RemotingConfigurerTests : BaseRemotingTestFixture
+	{
+        [Test]
+        [Explicit]
+        public void ConfiguresUsingFilename()
+        {
+            Assert.AreEqual(1, ChannelServices.RegisteredChannels.Length);
+            Assert.AreEqual(channel, ChannelServices.RegisteredChannels[0]);
+            ChannelServices.UnregisterChannel(channel);
+            Assert.AreEqual(0, ChannelServices.RegisteredChannels.Length);
+
+            IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Services.Tests/Spring.Data.Spring.Remoting/remotingConfigurer.xml");
+            ContextRegistry.RegisterContext(ctx);
+
+            Assert.AreEqual(1, ChannelServices.RegisteredChannels.Length);
+            Assert.AreEqual("tcp", ChannelServices.RegisteredChannels[0].ChannelName);
+        }
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/Remoting/SaoExporterTests.cs b/test/Spring/Spring.Services.Tests/Remoting/SaoExporterTests.cs
new file mode 100644
index 00000000..699b6db4
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Remoting/SaoExporterTests.cs
@@ -0,0 +1,47 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Remoting
+{
+	/// <summary>
+	/// Unit tests for the SaoExporter class.
+	/// </summary>
+	/// <author>Bruno Baia</author>
+	/// <author>Mark Pollack</author>
+	/// <version>$Id: SaoExporterTests.cs,v 1.4 2007/02/20 19:40:12 aseovic Exp $</version>
+	[TestFixture]
+	public class SaoExporterTests : BaseRemotingTestFixture
+	{
+        [Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void BailsWhenNotConfigured ()
+		{
+			SaoExporter exp = new SaoExporter();
+			exp.AfterPropertiesSet();
+		}
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/Remoting/SaoFactoryObjectTests.cs b/test/Spring/Spring.Services.Tests/Remoting/SaoFactoryObjectTests.cs
new file mode 100644
index 00000000..030786dd
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Remoting/SaoFactoryObjectTests.cs
@@ -0,0 +1,158 @@
+#region License
+
+/*
+ * Copyright 2005 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
+
+#region Imports
+
+using System;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Lifetime;
+using NUnit.Framework;
+using Spring.Aop.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Remoting
+{
+	/// <summary>
+	/// Unit tests for the SaoFactoryObject class.
+	/// </summary>
+	/// <author>Mark Pollack</author>
+	/// <author>Bruno Baia</author>
+	/// <version>$Id: SaoFactoryObjectTests.cs,v 1.12 2007/10/09 22:25:31 markpollack Exp $</version>
+	[TestFixture]
+	public class SaoFactoryObjectTests : BaseRemotingTestFixture
+	{
+	    [Test]
+		[ExpectedException(typeof(ArgumentException))]
+		public void BailsWhenNotConfigured ()
+		{
+			SaoFactoryObject sfo = new SaoFactoryObject();
+			sfo.AfterPropertiesSet();
+		}
+
+		/// <summary>
+		/// Make sure that transparent proxies are recognized 
+		/// correctly by the core object factory.
+		/// </summary>
+		/// <remarks>
+		/// This is a test for SPRNET-200
+		/// </remarks>
+		[Test]
+		public void WiringWithTransparentProxy()
+		{
+            IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Services.Tests/Spring.Data.Spring.Remoting/autowire.xml");
+            ContextRegistry.RegisterContext(ctx);
+
+			TestObject to = (TestObject) ctx.GetObject("kerry3");
+			Assert.IsNotNull(to, "Object is null even though a object has been configured.");
+			Assert.IsTrue(RemotingServices.IsTransparentProxy(to.Sibling), "IsTransparentProxy");
+			Assert.AreEqual("Kerry3", to.Name, "Name");
+
+			to = (TestObject) ctx.GetObject("objectWithCtorArgRefShortcuts");
+			Assert.IsTrue(RemotingServices.IsTransparentProxy(to.Spouse), "IsTransparentProxy");
+
+			ConstructorDependenciesObject cdo = (ConstructorDependenciesObject) ctx.GetObject("rod2");
+			Assert.IsTrue(RemotingServices.IsTransparentProxy(cdo.Spouse1), "IsTransparentProxy");
+			Assert.IsTrue(RemotingServices.IsTransparentProxy(cdo.Spouse2), "IsTransparentProxy");
+		}
+
+		[Test]
+		public void GetSaoWithSingletonMode()
+		{
+            IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Services.Tests/Spring.Data.Spring.Remoting/saoSingleton.xml");
+            ContextRegistry.RegisterContext(ctx);
+
+			object obj = ctx.GetObject("remoteSaoSingletonCounter");
+
+			Assert.IsNotNull(obj, "Object is null even though a object has been exported.");
+			Assert.IsTrue((obj is ISimpleCounter), "Object should implement 'ISimpleCounter' interface.");
+
+			ISimpleCounter sc = (ISimpleCounter) obj;
+			Assert.AreEqual(1, sc.Counter, "Remote object hasn't been activated by the server.");
+			sc.Count();
+			Assert.AreEqual(2, sc.Counter, "Remote object doesn't work in a 'Singleton' mode.");
+		}
+
+        [Test]
+        public void GetSaoWithSingletonModeAndAop()
+        {
+            IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Services.Tests/Spring.Data.Spring.Remoting/saoSingleton-aop.xml");
+            ContextRegistry.RegisterContext(ctx);
+
+            //object saoFactory = ctx.GetObject("&remoteCounter");
+            //Assert.IsNotNull(saoFactory);
+
+            object obj = ctx.GetObject("remoteCounter");
+
+            Assert.IsNotNull(obj, "Object is null even though a object has been exported.");
+            Assert.IsTrue(AopUtils.IsAopProxy(obj));
+            Assert.IsTrue((obj is ISimpleCounter), "Object should implement 'ISimpleCounter' interface.");
+            
+
+            MethodCounter aopCounter = ctx.GetObject("countingBeforeAdvice") as MethodCounter;
+            Assert.IsNotNull(aopCounter);
+
+            int aopCount = aopCounter.GetCalls("Count");
+            Assert.AreEqual(0, aopCount);
+
+            ISimpleCounter sc = (ISimpleCounter)obj;
+            Assert.AreEqual(1, sc.Counter, "Remote object hasn't been activated by the server.");
+            sc.Count();
+            Assert.AreEqual(2, sc.Counter, "Remote object doesn't work in a 'Singleton' mode.");
+            Assert.AreEqual(1, aopCounter.GetCalls("Count"));
+        }
+
+		[Test]
+		public void GetSaoWithSingleCallMode()
+		{
+            IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Services.Tests/Spring.Data.Spring.Remoting/saoSingleCall.xml");
+            ContextRegistry.RegisterContext(ctx);
+
+			object obj = ctx.GetObject("remoteSaoSingleCallCounter");
+
+			Assert.IsNotNull(obj, "Object is null even though a object has been exported.");
+			Assert.IsTrue((obj is ISimpleCounter), "Object should implement 'ISimpleCounter' interface.");
+
+			ISimpleCounter sc = (ISimpleCounter) obj;
+			Assert.IsNotNull(sc, "Object is null even though a object has been exported.");
+			Assert.AreEqual(1, sc.Counter, "Remote object hasn't been activated by the server.");
+			sc.Count();
+			Assert.AreEqual(1, sc.Counter, "Remote object don't works in a 'SingleCall' mode.");
+		}
+
+		[Test]
+		public void GetSaoWithLifetimeService()
+		{
+            IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Services.Tests/Spring.Data.Spring.Remoting/saoLifetimeService.xml");
+            ContextRegistry.RegisterContext(ctx);
+
+			MarshalByRefObject obj = (MarshalByRefObject) ctx.GetObject("remoteSaoCounter");
+			ILease lease = (ILease) obj.GetLifetimeService();
+
+			Assert.AreEqual(TimeSpan.FromMilliseconds(10000), lease.InitialLeaseTime, "InitialLeaseTime");
+			Assert.AreEqual(TimeSpan.FromMilliseconds(1000), lease.RenewOnCallTime, "RenewOnCallTime");
+			Assert.AreEqual(TimeSpan.FromMilliseconds(100), lease.SponsorshipTimeout, "SponsorshipTimeout");
+		}
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/Remoting/SimpleCounter.cs b/test/Spring/Spring.Services.Tests/Remoting/SimpleCounter.cs
new file mode 100644
index 00000000..0142d181
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Remoting/SimpleCounter.cs
@@ -0,0 +1,68 @@
+#region License
+
+/*
+ * Copyright 2004 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
+
+#region Imports
+
+
+#endregion
+
+namespace Spring.Remoting
+{
+	/// <summary>
+	/// A simple remote class.
+	/// </summary>
+	public class SimpleCounter : ISimpleCounter
+	{
+        protected int _counter;
+
+        /// <summary>
+        /// Create an instance of the Counter class.
+        /// </summary>
+		public SimpleCounter()
+		{
+            _counter = 0;
+		}
+
+		/// <summary>
+		/// Create an instance of the Counter class.
+		/// </summary>
+		/// <param name="initialCounter">Initial counter value.</param>
+		public SimpleCounter(int initialCounter)
+		{
+			_counter = initialCounter;
+		}
+
+        /// <summary>
+        /// Get or Set the Counter's value.
+        /// </summary>
+        public int Counter
+        {
+            get	{ return _counter; }
+            set	{ _counter = value; }
+        }
+        /// <summary>
+        /// Increment the counter by one.
+        /// </summary>
+        public void Count()
+        {
+            _counter++;
+        }
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs b/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs
new file mode 100644
index 00000000..5b033b6e
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/ServiceModel/ServiceExporterTests.cs
@@ -0,0 +1,278 @@
+#if NET_3_0
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.ServiceModel;
+
+using NUnit.Framework;
+using Spring.ServiceModel;
+
+#endregion
+
+namespace Spring.ServiceModel
+{
+    /// <summary>
+    /// Unit tests for the ServiceExporter class.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: ServiceExporterTests.cs,v 1.1 2007/09/21 14:27:35 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class ServiceExporterTests
+    {
+
+        #region Test classes
+
+        public interface IService
+        {
+            string SomeMethod(int param);
+        }
+
+        [ServiceContract(Namespace = "http://Spring.Services.Tests")]
+        public interface IDecoratedService
+        {
+            [OperationContract]
+            string SomeMethod(int param);
+        }
+
+        public class Service : IDecoratedService
+        {
+            public string SomeMethod(int param)
+            {
+                return param.ToString();
+            }
+        }
+
+        [ServiceContract(Namespace = "http://Spring.Services.Tests")]
+        public class DecoratedService : IService
+        {
+            [OperationContract]
+            public string SomeMethod(int param)
+            {
+                return param.ToString();
+            }
+        }
+
+        #endregion
+
+/*
+        WebServiceExporter wse = null;
+
+        [SetUp]
+        public void SetUp()
+        {
+            const string xml =
+    @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net'>
+	<object id='noDecoratedService' type='Spring.Web.Services.WebServiceExporterTests+NoDecoratedService, Spring.Web.Tests'/>
+    <object id='decoratedService' type='Spring.Web.Services.WebServiceExporterTests+DecoratedService, Spring.Web.Tests'/>
+</objects>";
+            Stream stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory objectFactory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+
+            wse = new WebServiceExporter();
+            wse.ObjectFactory = objectFactory;
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException), "The TargetName property is required.")]
+        public void NullConfig()
+        {
+            wse.ObjectName = "NullConfig";
+            wse.AfterPropertiesSet();
+        }
+
+        [Test]
+        public void ProxiesTargetInterfaces()
+        {
+            wse.ObjectName = "ProxiesTargetInterfaces";
+            wse.TargetName = "noDecoratedService";
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            Assert.IsTrue(typeof(IService).IsAssignableFrom(proxyType));
+        }
+
+        [Test]
+        public void CreatesWebServiceAttributeWithNoDecoratedClassAndMinimalConfig()
+        {
+            wse.ObjectName = "CreatesWebServiceAttributeWithNoDecoratedClassAndMinimalConfig";
+            wse.TargetName = "noDecoratedService";
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            object[] attrs = proxyType.GetCustomAttributes(typeof(WebServiceAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+
+            WebServiceAttribute wsa = attrs[0] as WebServiceAttribute;
+            Assert.AreEqual("CreatesWebServiceAttributeWithNoDecoratedClassAndMinimalConfig", wsa.Name);
+            Assert.AreEqual(string.Empty, wsa.Description);
+            Assert.AreEqual(WebServiceAttribute.DefaultNamespace, wsa.Namespace);
+        }
+
+        [Test]
+        public void CreatesWebServiceAttributeWithNoDecoratedClassAndFullConfig()
+        {
+            wse.ObjectName = "CreatesWebServiceAttributeWithNoDecoratedClassAndFullConfig";
+            wse.TargetName = "noDecoratedService";
+            wse.Name = "My web service name";
+            wse.Description = "My web service description";
+            wse.Namespace = "http://www.springframework.net";
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            object[] attrs = proxyType.GetCustomAttributes(typeof(WebServiceAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+
+            WebServiceAttribute wsa = attrs[0] as WebServiceAttribute;
+            Assert.AreEqual(wse.Name, wsa.Name);
+            Assert.AreEqual(wse.Description, wsa.Description);
+            Assert.AreEqual(wse.Namespace, wsa.Namespace);
+        }
+
+        [Test]
+        public void CreatesDefaultWebMethodAttributeWithNoDecoratedMethod()
+        {
+            wse.ObjectName = "CreatesDefaultWebMethodAttributeWithNoDecoratedMethod";
+            wse.TargetName = "noDecoratedService";
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            MethodInfo method = proxyType.GetMethod("SomeMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetCustomAttributes(typeof(WebMethodAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+        }
+
+        [Test]
+        public void CreatesCustomWebMethodAttributeWithNoDecoratedMethod()
+        {
+            wse.ObjectName = "CreatesCustomWebMethodAttributeWithNoDecoratedMethod";
+            wse.TargetName = "noDecoratedService";
+            wse.MemberAttributes.Add("SomeMethod", new WebMethodAttribute(true)); // default value is false
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            MethodInfo method = proxyType.GetMethod("SomeMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetCustomAttributes(typeof(WebMethodAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+
+            WebMethodAttribute wma = attrs[0] as WebMethodAttribute;
+            Assert.AreEqual(true, wma.EnableSession);
+        }
+
+        [Test]
+        public void OverridesExistingWebServiceAttributeWithDecoratedClass()
+        {
+            wse.ObjectName = "OverridesExistingWebServiceAttributeWithDecoratedClass";
+            wse.TargetName = "decoratedService";
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            object[] attrs = proxyType.GetCustomAttributes(typeof(WebServiceAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+
+            WebServiceAttribute wsa = attrs[0] as WebServiceAttribute;
+            Assert.AreEqual("OverridesExistingWebServiceAttributeWithDecoratedClass", wsa.Name);
+            Assert.AreEqual(string.Empty, wsa.Description);
+            Assert.AreEqual(WebServiceAttribute.DefaultNamespace, wsa.Namespace);
+        }
+
+        [Test]
+        public void UsesExistingWebMethodAttributeWithDecoratedMethod()
+        {
+            wse.ObjectName = "UsesExistingWebMethodAttributeWithDecoratedMethod";
+            wse.TargetName = "decoratedService";
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            MethodInfo method = proxyType.GetMethod("SomeMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetCustomAttributes(typeof(WebMethodAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+
+            WebMethodAttribute wma = attrs[0] as WebMethodAttribute;
+            Assert.AreEqual("SomeMethod description", wma.Description);
+        }
+
+        // TODO : attributes override
+        [Test]
+        [Ignore("Attributes override not implemented.")]
+        public void OverridesExistingWebMethodAttributeWithDecoratedMethod()
+        {
+            wse.ObjectName = "OverridesExistingWebMethodAttributeWithDecoratedMethod";
+            wse.TargetName = "decoratedService";
+            wse.MemberAttributes.Add("SomeMethod", new WebMethodAttribute(true)); // default value is false
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            MethodInfo method = proxyType.GetMethod("SomeMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetCustomAttributes(typeof(WebMethodAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+
+            WebMethodAttribute wma = attrs[0] as WebMethodAttribute;
+            Assert.AreEqual(true, wma.EnableSession);
+        }
+
+        #region Test classes
+
+        public interface IService
+        {
+            string SomeMethod(int param);
+        }
+
+        public class NoDecoratedService : IService
+        {
+            public string SomeMethod(int param)
+            {
+                return param.ToString();
+            }
+        }
+
+        [WebService(Name = "Decorated service")]
+        public class DecoratedService : IService
+        {
+            [WebMethod(Description="SomeMethod description")]
+            public string SomeMethod(int param)
+            {
+                return param.ToString();
+            }
+        }
+
+        #endregion
+*/
+    }
+}
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2003.csproj b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2003.csproj
new file mode 100644
index 00000000..32f72256
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2003.csproj
@@ -0,0 +1,269 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Services.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = 'echo "Copying .xml files for Spring.Services tests"&#xd;&#xa;xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2003\Spring.Services.Tests\$(ConfigurationName)\ /y /s /q /d&#xd;&#xa;xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2003\Spring.Services.Tests\$(ConfigurationName)\ /y /s /q'
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = "0618"
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Services.Tests\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "true"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Services.Tests\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\Net\1.1\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "system.runtime.remoting"
+                    AssemblyName = "System.Runtime.Remoting"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\system.runtime.remoting.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core.Tests.2003"
+                    Project = "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Services.2003"
+                    Project = "{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "System.Web.Services"
+                    AssemblyName = "System.Web.Services"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.Services.dll"
+                />
+                <Reference
+                    Name = "System.EnterpriseServices"
+                    AssemblyName = "System.EnterpriseServices"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.EnterpriseServices.dll"
+                />
+                <Reference
+                    Name = "DotNetMock"
+                    AssemblyName = "DotNetMock"
+                    HintPath = "..\..\..\lib\Net\1.1\DotNetMock.dll"
+                />
+                <Reference
+                    Name = "Spring.Aop.2003"
+                    Project = "{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Aop.Tests.2003"
+                    Project = "{2111596A-0327-4C9D-8919-294FBD988A23}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Services.Tests.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Spring.Services.Tests.dll.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\Spring\Remoting\autowire.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\Remoting\cao.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\Remoting\caoLifetimeService.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\Remoting\remotingConfigurer.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\Remoting\saoLifetimeService.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\Remoting\saoSingleCall.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\Remoting\saoSingleton.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\Remoting\saoSingleton-aop.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\Web\Services\configurableFactory.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\Web\Services\document-literal.wsdl"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\Web\Services\nestedSchema.wsdl"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Web\Services\nestedSchema.xsd"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Web\Services\rpc-literal.wsdl"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\Web\Services\Service.cs.fyi"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "EnterpriseServices\ServicedComponentExporterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\BaseRemotingTestFixture.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\CaoExporterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\CaoFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\ISimpleCounter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\RemoteObjectFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\RemotingConfigParserTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\RemotingConfigurerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\SaoExporterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\SaoFactoryObjectTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Remoting\SimpleCounter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Services\WebServiceProxyFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2005.csproj b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2005.csproj
new file mode 100644
index 00000000..dd74a801
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2005.csproj
@@ -0,0 +1,188 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{EB2687B7-8B26-4FBC-852A-4128D5CACAFC}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Services.Tests</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.Tests\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>0618</NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Services.Tests\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DotNetMock, Version=0.7.4.0, Culture=neutral, PublicKeyToken=805ea88df19095f6">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\DotNetMock.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <Name>nunit.framework</Name>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="EnterpriseServices\ServicedComponentExporterTests.cs" />
+    <Compile Include="Remoting\BaseRemotingTestFixture.cs" />
+    <Compile Include="Remoting\CaoExporterTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\CaoFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\RemotingConfigParserTests.cs" />
+    <Compile Include="Remoting\RemotingConfigurerTests.cs" />
+    <Compile Include="Remoting\ISimpleCounter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\RemoteObjectFactoryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\SaoExporterTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\SaoFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\SimpleCounter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\Services\WebServiceProxyFactoryTests.cs" />
+    <EmbeddedResource Include="Data\Spring\Web\Services\rpc-literal.wsdl" />
+    <EmbeddedResource Include="Data\Spring\Web\Services\document-literal.wsdl" />
+    <None Include="Data\Spring\Web\Services\nestedSchema.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Data\Spring\Web\Services\Service.cs.fyi" />
+    <None Include="Spring.Services.Tests.build" />
+    <None Include="Spring.Services.Tests.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Data\Spring\Web\Services\nestedSchema.wsdl">
+    </None>
+    <EmbeddedResource Include="Data\Spring\Remoting\autowire.xml">
+    </EmbeddedResource>
+    <EmbeddedResource Include="Data\Spring\Remoting\cao.xml">
+    </EmbeddedResource>
+    <EmbeddedResource Include="Data\Spring\Remoting\caoLifetimeService.xml">
+    </EmbeddedResource>
+    <EmbeddedResource Include="Data\Spring\Remoting\saoLifetimeService.xml">
+    </EmbeddedResource>
+    <EmbeddedResource Include="Data\Spring\Remoting\saoSingleCall.xml">
+    </EmbeddedResource>
+    <EmbeddedResource Include="Data\Spring\Remoting\saoSingleton.xml">
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\Spring\Remoting\remotingConfigurer.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Services\Spring.Services.2005.csproj">
+      <Project>{B58E34CF-6E70-481D-AC87-1BC2D13C21FB}</Project>
+      <Name>Spring.Services.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Aop.Tests\Spring.Aop.Tests.2005.csproj">
+      <Project>{2111596A-0327-4C9D-8919-294FBD988A23}</Project>
+      <Name>Spring.Aop.Tests.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2005.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\Spring\Web\Services\configurableFactory.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\Spring\Remoting\saoSingleton-aop.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>echo "Copying .xml files for Spring.Services tests"
+xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Services.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2005\Spring.Services.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2008.csproj b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2008.csproj
new file mode 100644
index 00000000..9605e10b
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2008.csproj
@@ -0,0 +1,192 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4374F018-9738-46BF-A399-4594CEE75B21}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Services.Tests</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Services.Tests\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0;NET_3_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Services.Tests\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0;NET_3_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DotNetMock, Version=0.7.4.0, Culture=neutral, PublicKeyToken=805ea88df19095f6">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\DotNetMock.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <Name>nunit.framework</Name>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Runtime.Serialization, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
+    <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="EnterpriseServices\ServicedComponentExporterTests.cs" />
+    <Compile Include="Remoting\BaseRemotingTestFixture.cs" />
+    <Compile Include="Remoting\CaoExporterTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\CaoFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\RemotingConfigParserTests.cs" />
+    <Compile Include="Remoting\RemotingConfigurerTests.cs" />
+    <Compile Include="Remoting\ISimpleCounter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\RemoteObjectFactoryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\SaoExporterTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\SaoFactoryObjectTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Remoting\SimpleCounter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ServiceModel\ServiceExporterTests.cs" />
+    <Compile Include="Web\Services\WebServiceProxyFactoryTests.cs" />
+    <EmbeddedResource Include="Data\Spring\Web\Services\rpc-literal.wsdl" />
+    <EmbeddedResource Include="Data\Spring\Web\Services\document-literal.wsdl" />
+    <None Include="Data\Spring\Web\Services\nestedSchema.wsdl" />
+    <None Include="Data\Spring\Web\Services\nestedSchema.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Data\Spring\Web\Services\Service.cs.fyi" />
+    <None Include="Spring.Services.Tests.build" />
+    <None Include="Spring.Services.Tests.dll.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <EmbeddedResource Include="Data\Spring\Remoting\autowire.xml">
+    </EmbeddedResource>
+    <EmbeddedResource Include="Data\Spring\Remoting\cao.xml">
+    </EmbeddedResource>
+    <EmbeddedResource Include="Data\Spring\Remoting\caoLifetimeService.xml">
+    </EmbeddedResource>
+    <EmbeddedResource Include="Data\Spring\Remoting\saoLifetimeService.xml">
+    </EmbeddedResource>
+    <EmbeddedResource Include="Data\Spring\Remoting\saoSingleCall.xml">
+    </EmbeddedResource>
+    <EmbeddedResource Include="Data\Spring\Remoting\saoSingleton.xml">
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\Spring\Remoting\remotingConfigurer.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Aop\Spring.Aop.2005.csproj">
+      <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
+      <Name>Spring.Aop.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Services\Spring.Services.2008.csproj">
+      <Project>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Project>
+      <Name>Spring.Services.2008</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Aop.Tests\Spring.Aop.Tests.2005.csproj">
+      <Project>{2111596A-0327-4C9D-8919-294FBD988A23}</Project>
+      <Name>Spring.Aop.Tests.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2005.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\Spring\Web\Services\configurableFactory.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>echo "Copying .xml files for Spring.Services tests"
+xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2008\Spring.Services.Tests\$(ConfigurationName)\ /y /s /q /d
+xcopy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2008\Spring.Services.Tests\$(ConfigurationName)\ /y /s /q</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
new file mode 100644
index 00000000..29371eed
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build
@@ -0,0 +1,57 @@
+<?xml version="1.0" ?>
+<project name="Spring.Services.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
+  <!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+-->
+  <target name="build">
+    <!-- build Spring.Services.Tests -->
+    <csc target="library" define="${current.build.defines.csc}"
+		     warnaserror="true"
+		     debug="${current.build.debug}"
+		     output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml">
+      <nowarn>
+        <warning number="${nowarn.numbers.test}" />
+      </nowarn>
+      <sources failonempty="true">
+        <include name="**/*.cs" />
+        <include name="../CommonAssemblyInfo.cs" />
+        <exclude name="**/WindowsService/**" />
+      </sources>
+      <resources prefix="Spring" dynamicprefix="true" failonempty="true">
+        <include name="**/*.xml" />
+        <include name="**/*.wsdl" />
+      </resources>
+      <references basedir="${current.bin.dir}">
+        <include name="*.dll" />
+        <exclude name="${project::get-name()}.dll" />
+	<exclude name="CloverRuntime.dll" />
+      </references>
+    </csc>
+    <copy todir="${current.bin.dir}">
+      <fileset basedir="${project::get-base-directory()}/Data">
+        <include name="**/*.xml" />
+        <include name="**/*.wsdl" />
+        <include name="**/*.xsd" />
+      </fileset>
+    </copy>
+    <copy todir="${current.bin.dir}">
+      <fileset basedir="${project::get-base-directory()}">
+        <include name="**/*.config" />
+      </fileset>
+    </copy>
+    <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
+          tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
+  </target>
+  <target name="test" depends="build">
+    <nunit2outproc>
+      <formatter type="Plain" />
+      <formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+      <test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
+    </nunit2outproc>
+  </target>
+</project>
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.dll.config b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.dll.config
new file mode 100644
index 00000000..b8a6a51e
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.dll.config
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2002-2007 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.
+-->
+<configuration>
+  
+  <configSections>
+    <sectionGroup name="spring">
+      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core" />
+    </sectionGroup>
+
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+    </sectionGroup>
+    
+  </configSections>
+  
+  <spring>
+    <parsers>
+      <parser type="Spring.Remoting.Config.RemotingNamespaceParser, Spring.Services" />
+    </parsers>
+  </spring>
+
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Simple.NoOpLoggerFactoryAdapter, Common.Logging"/>
+    </logging>
+  </common>
+  
+  <system.runtime.remoting>
+    <application>
+      <channels>
+        <channel ref="tcp" port="8005" />
+      </channels>
+    </application>
+  </system.runtime.remoting>
+  
+</configuration>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.WindowsService.Samples.csproj b/test/Spring/Spring.Services.Tests/Spring.Services.WindowsService.Samples.csproj
new file mode 100644
index 00000000..0bbb0a80
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.WindowsService.Samples.csproj
@@ -0,0 +1,141 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{9DAA763B-5855-45C5-826F-9710DB2D9073}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Services.WindowsService.Samples"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = 'copy "$(ProjectDir)WindowsService\Samples\service.*" "$(TargetDir).."&#xd;&#xa;copy "$(ProjectDir)WindowsService\Samples\watcher.xml" "$(TargetDir).."'
+                RootNamespace = "Spring.Service.Sample"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\deploy\sample\bin\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\deploy\sample\bin\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "System.Web"
+                    AssemblyName = "System.Web"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "System.Windows.Forms"
+                    AssemblyName = "System.Windows.Forms"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
+                />
+                <Reference
+                    Name = "System.Web.Services"
+                    AssemblyName = "System.Web.Services"
+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.Services.dll"
+                />
+                <Reference
+                    Name = "log4net"
+                    AssemblyName = "log4net"
+                    HintPath = "..\..\..\lib\log4net.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "WindowsService\Samples\ASMXExecutor.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Samples\echo.asmx"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "WindowsService\Samples\service.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "WindowsService\Samples\service.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "WindowsService\Samples\Simple.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Samples\watcher.xml"
+                    BuildAction = "Content"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.WindowsService.Tests.build b/test/Spring/Spring.Services.Tests/Spring.Services.WindowsService.Tests.build
new file mode 100644
index 00000000..3e224dbc
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.WindowsService.Tests.build
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<project name="Spring.Services.WindowsService.Tests" default="build">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+-->
+
+    <target name="copy-test-support-files">
+
+      <!-- test files -->
+    	<copy todir="${current.bin.dir}">
+    	    <fileset basedir="${project::get-base-directory()}">
+    	        <include name="Data/**/*.xml" />
+    	        <include name="Data/**/*.test" />
+    	    </fileset>
+    	</copy>
+
+      <!-- agiledocs -->
+    	<copy todir="${current.bin.dir}">
+    	    <fileset basedir="${project::get-base-directory()}/../../../doc/reference/src/templated">
+    	        <include name="*.dll" />
+    	    </fileset>
+    	</copy>
+
+      <!-- process definition files from src -->
+    	<!-- rough <copy> does not work ? ... -->
+    	<foreach item="File" property="filename">
+    	    <in>
+    		    <items>
+    				<include name="${project::get-base-directory()}/../../../src/Spring/Spring.Services/WindowsService/Process/**/*.xml"/>
+    		    </items>
+    		</in>
+    		<do>
+    			<copy todir="${current.bin.dir}/Data/Xml" verbose="true" file="${filename}"/>
+    		</do>
+    	</foreach>
+    </target>
+
+    <target name="build" depends="copy-test-support-files">
+        <csc target="library" define="${current.build.defines.csc}"
+			warnaserror="true"
+			debug="${current.build.debug}"
+			output="${current.bin.dir}/${project::get-name()}.dll" >
+            <nowarn>
+                <warning number="${nowarn.numbers}" />
+            </nowarn>
+            <sources failonempty="true">
+                <include name="WindowsService/Common/**/*.cs" />
+                <include name="WindowsService/TestUtils.cs" />
+                <include name="../CommonAssemblyInfo.cs" />
+            </sources>
+            <resources prefix="Spring.Services" dynamicprefix="true" failonempty="true">
+                <include name="tests.config" />
+            </resources>
+            <references basedir="${current.bin.dir}">
+                <include name="*.dll"/>
+                <exclude name="${project::get-name()}.dll"/>
+            </references>
+        </csc>
+    </target>
+
+    <target name="test" depends="build">
+         <nunit2outproc>
+            <formatter type="Plain" />
+            <formatter type="Xml" usefile="true" extension=".xml"
+	               outputdir="${current.bin.dir}/results" />
+            <test
+		assemblyname="${current.bin.dir}/${project::get-name()}.dll"
+		appconfig="${current.bin.dir}/${project::get-name()}.dll.config"/>
+         </nunit2outproc>
+    </target>
+
+
+</project>
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.WindowsService.Tests.csproj b/test/Spring/Spring.Services.Tests/Spring.Services.WindowsService.Tests.csproj
new file mode 100644
index 00000000..844d3e58
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Spring.Services.WindowsService.Tests.csproj
@@ -0,0 +1,322 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.3077"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{F39DE556-EAFB-41A0-AB2F-F02F2E038E62}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Services.WindowsService.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = 'xcopy /I /E /Y "$(ProjectDir)Data" "$(TargetDir)Data"&#xd;&#xa;copy "$(ProjectDir)..\..\..\src\Spring\Spring.Services\WindowsService\Process\*.xml" "$(TargetDir)Data\Xml"'
+                RootNamespace = "Spring.Services"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.Tests\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net\Spring.Services.WindowsService.Tests\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "Spring.Services.WindowsService.Common"
+                    Project = "{B8381347-51A1-4850-828C-3170FA93846C}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "DotNetMock"
+                    AssemblyName = "DotNetMock"
+                    HintPath = "..\..\..\lib\Net\1.1\DotNetMock.dll"
+                />
+                <Reference
+                    Name = "DotNetMock.Framework"
+                    AssemblyName = "DotNetMock.Framework"
+                    HintPath = "..\..\..\lib\Net\1.1\DotNetMock.Framework.dll"
+                />
+                <Reference
+                    Name = "log4net"
+                    AssemblyName = "log4net"
+                    HintPath = "..\..\..\lib\Net\1.1\log4net.dll"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\Net\1.1\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "System.Windows.Forms"
+                    AssemblyName = "System.Windows.Forms"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll"
+                />
+                <Reference
+                    Name = "NUnitForms"
+                    AssemblyName = "NUnitForms"
+                    HintPath = "..\..\..\lib\Net\1.1\NUnitForms.dll"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "AgileDocs.Core"
+                    AssemblyName = "AgileDocs.Core"
+                    HintPath = "..\..\..\doc\reference\src\templated\AgileDocs.Core.dll"
+                />
+                <Reference
+                    Name = "Spring.Threading"
+                    Project = "{4640D873-95DC-4130-98E2-2B931D390C20}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "System.Web"
+                    AssemblyName = "System.Web"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
+                />
+                <Reference
+                    Name = "System.Web.Services"
+                    AssemblyName = "System.Web.Services"
+                    HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.Services.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "tests.config"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Data\Spring\WindowsService\Cassini\localizer.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\WindowsService\Cassini\service.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\Spring\WindowsService\Cassini\service.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\WindowsService\Cassini\watcher.xml"
+                    BuildAction = "Content"
+                />
+                <Folder RelPath = "Data\Spring\WindowsService\Cassini\wwwroot\" />
+                <File
+                    RelPath = "Data\Spring\WindowsService\Echo\service.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\Spring\WindowsService\Echo\service.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\WindowsService\Echo\watcher.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\WindowsService\Simple\service.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Data\Spring\WindowsService\Simple\service.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\WindowsService\Simple\watcher.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Xml\watcher-0.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Xml\watcher-1.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Xml\watcher-simple.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "WindowsService\IntegrationTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\TestUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\ApplicationHostTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\ApplicationTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\LocalizerTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\ServiceSupportTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\UtilsTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\AggregatedDeployEventDispatcherTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\ApplicationWatcherManagerTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\DeployEventAggregatorTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\DeployManagerTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\NullSync.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\SpringAssembliesDeployerTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\TestingHandler.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\FileSystem\DefaultApplicationWatcherFactoryTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\FileSystem\FileSystemApplicationWatcherTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\FileSystem\FileSystemDeployLocationTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\FileSystem\FileSystemMonitorTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Deploy\FileSystem\RegularExpressionFilterConfigurerTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Common\Gui\ApplicationMonitorTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Samples\Echo\Echo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "WindowsService\Samples\Simple\Simple.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Services.Tests/Web/Services/WebServiceProxyFactoryTests.cs b/test/Spring/Spring.Services.Tests/Web/Services/WebServiceProxyFactoryTests.cs
new file mode 100644
index 00000000..8e70cc22
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/Web/Services/WebServiceProxyFactoryTests.cs
@@ -0,0 +1,585 @@
+#region License
+
+/*
+ * Copyright 2007 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
+
+#region Imports
+
+using System;
+using System.Reflection;
+using System.Xml.Serialization;
+using System.Web.Services;
+using System.Web.Services.Protocols;
+using System.Web.Services.Description;
+#if NET_3_0
+using System.ServiceModel;
+using System.ServiceModel.Description;
+using System.Runtime.Serialization;
+#endif
+
+using NUnit.Framework;
+using Spring.Core.IO;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Web.Services
+{
+    /// <summary>
+    /// Unit tests for the WebServiceProxyFactory class.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: WebServiceProxyFactoryTests.cs,v 1.8 2007/12/07 20:26:26 bbaia Exp $</version>
+    [TestFixture]
+    public class WebServiceProxyFactoryTests
+    {
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void BailsWhenNotConfigured()
+        {
+            WebServiceProxyFactory wspf = new WebServiceProxyFactory();
+            wspf.AfterPropertiesSet();
+        }
+
+        [Test]
+        public void DocumentLiteralWithDefaultConfig()
+        {
+            WebServiceProxyFactory wspf = new WebServiceProxyFactory();
+            wspf.ServiceUri = new AssemblyResource("assembly://Spring.Services.Tests/Spring.Data.Spring.Web.Services/document-literal.wsdl");
+            wspf.ServiceInterface = typeof(IHelloWorld);
+            wspf.AfterPropertiesSet();
+
+            object proxy = wspf.GetObject();
+            Assert.IsNotNull(proxy);
+
+            Type proxyType = proxy.GetType();
+            Assert.IsTrue(proxy is IHelloWorld);
+            Assert.IsTrue(proxy is SoapHttpClientProtocol);
+
+            object[] typeAttrs = proxyType.GetCustomAttributes(typeof(WebServiceBindingAttribute), false);
+            Assert.IsTrue(typeAttrs.Length > 0);
+
+            WebServiceBindingAttribute wsba = (WebServiceBindingAttribute)typeAttrs[0];
+            Assert.AreEqual("HelloWorldServiceSoap", wsba.Name);
+            Assert.AreEqual("http://www.springframwework.net", wsba.Namespace);
+
+            MethodInfo sayHelloWorldMethod = proxyType.GetMethod("SayHelloWorld");
+            Assert.IsNotNull(sayHelloWorldMethod);
+
+            object[] sdmaAttrs = sayHelloWorldMethod.GetCustomAttributes(typeof(SoapDocumentMethodAttribute), false);
+            Assert.IsTrue(sdmaAttrs.Length > 0);
+
+            SoapDocumentMethodAttribute sdma = (SoapDocumentMethodAttribute)sdmaAttrs[0];
+            Assert.AreEqual("http://www.springframwework.net/SayHelloWorld", sdma.Action);
+            Assert.AreEqual(SoapParameterStyle.Wrapped, sdma.ParameterStyle);
+            Assert.AreEqual(string.Empty, sdma.Binding);
+            Assert.AreEqual(false, sdma.OneWay);
+            Assert.AreEqual(string.Empty, sdma.RequestElementName);
+            Assert.AreEqual("http://www.springframwework.net", sdma.RequestNamespace);
+            Assert.AreEqual(string.Empty, sdma.ResponseElementName);
+            Assert.AreEqual("http://www.springframwework.net", sdma.ResponseNamespace);
+            Assert.AreEqual(SoapBindingUse.Literal, sdma.Use);
+
+            // Try to instantiate the proxy type
+            ObjectUtils.InstantiateType(proxyType);
+        }
+
+        [Test]
+        public void DocumentLiteralWithOneWay()
+        {
+            WebServiceProxyFactory wspf = new WebServiceProxyFactory();
+            wspf.ServiceUri = new AssemblyResource("assembly://Spring.Services.Tests/Spring.Data.Spring.Web.Services/document-literal.wsdl");
+            wspf.ServiceInterface = typeof(IHelloWorld);
+            wspf.AfterPropertiesSet();
+
+            object proxy = wspf.GetObject();
+            Assert.IsNotNull(proxy);
+
+            Type proxyType = proxy.GetType();
+            Assert.IsTrue(proxy is IHelloWorld);
+            Assert.IsTrue(proxy is SoapHttpClientProtocol);
+
+            MethodInfo logHelloWorldMethod = proxyType.GetMethod("LogHelloWorld");
+            Assert.IsNotNull(logHelloWorldMethod);
+
+            object[] methodAttrs = logHelloWorldMethod.GetCustomAttributes(typeof(SoapDocumentMethodAttribute), false);
+            Assert.IsTrue(methodAttrs.Length > 0);
+
+            SoapDocumentMethodAttribute sdma = (SoapDocumentMethodAttribute)methodAttrs[0];
+            Assert.AreEqual("http://www.springframwework.net/LogHelloWorld", sdma.Action);
+            Assert.AreEqual(SoapParameterStyle.Wrapped, sdma.ParameterStyle);
+            Assert.AreEqual(string.Empty, sdma.Binding);
+            Assert.AreEqual(true, sdma.OneWay);
+            Assert.AreEqual(string.Empty, sdma.RequestElementName);
+            Assert.AreEqual("http://www.springframwework.net", sdma.RequestNamespace);
+            Assert.AreEqual(string.Empty, sdma.ResponseElementName);
+            Assert.AreEqual(null, sdma.ResponseNamespace);
+            Assert.AreEqual(SoapBindingUse.Literal, sdma.Use);
+
+            // Try to instantiate the proxy type
+            ObjectUtils.InstantiateType(proxyType);
+        }
+
+        [Test]
+        public void DocumentLiteralWithMessageName()
+        {
+            WebServiceProxyFactory wspf = new WebServiceProxyFactory();
+            wspf.ServiceUri = new AssemblyResource("assembly://Spring.Services.Tests/Spring.Data.Spring.Web.Services/document-literal.wsdl");
+            wspf.ServiceInterface = typeof(IHelloWorld);
+            wspf.AfterPropertiesSet();
+
+            object proxy = wspf.GetObject();
+            Assert.IsNotNull(proxy);
+
+            Type proxyType = proxy.GetType();
+            Assert.IsTrue(proxy is IHelloWorld);
+            Assert.IsTrue(proxy is SoapHttpClientProtocol);
+
+            MethodInfo logHelloMethod = proxyType.GetMethod("LogHello");
+            Assert.IsNotNull(logHelloMethod);
+
+            object[] methodAttrs = logHelloMethod.GetCustomAttributes(typeof(SoapDocumentMethodAttribute), false);
+            Assert.IsTrue(methodAttrs.Length > 0);
+
+            SoapDocumentMethodAttribute sdma = (SoapDocumentMethodAttribute)methodAttrs[0];
+            Assert.AreEqual("http://www.springframwework.net/MyLogHello", sdma.Action);
+            Assert.AreEqual(SoapParameterStyle.Wrapped, sdma.ParameterStyle);
+            Assert.AreEqual(string.Empty, sdma.Binding);
+            Assert.AreEqual(false, sdma.OneWay);
+            Assert.AreEqual("MyLogHello", sdma.RequestElementName);
+            Assert.AreEqual("http://www.springframwework.net", sdma.RequestNamespace);
+            Assert.AreEqual("MyLogHelloResponse", sdma.ResponseElementName);
+            Assert.AreEqual("http://www.springframwework.net", sdma.ResponseNamespace);
+            Assert.AreEqual(SoapBindingUse.Literal, sdma.Use);
+
+            // Try to instantiate the proxy type
+            ObjectUtils.InstantiateType(proxyType);
+        }
+
+#if NET_2_0
+        [Test]
+        public void DocumentLiteralWithNamedOutParameter()
+        {
+            WebServiceProxyFactory wspf = new WebServiceProxyFactory();
+            wspf.ServiceUri = new AssemblyResource("assembly://Spring.Services.Tests/Spring.Data.Spring.Web.Services/document-literal.wsdl");
+            wspf.ServiceInterface = typeof(IHelloWorld);
+            wspf.AfterPropertiesSet();
+
+            object proxy = wspf.GetObject();
+            Assert.IsNotNull(proxy);
+
+            Type proxyType = proxy.GetType();
+            Assert.IsTrue(proxy is IHelloWorld);
+            Assert.IsTrue(proxy is SoapHttpClientProtocol);
+
+            MethodInfo sayHelloMethod = proxyType.GetMethod("SayHello");
+            Assert.IsNotNull(sayHelloMethod);
+
+            object[] sdmaAttrs = sayHelloMethod.GetCustomAttributes(typeof(SoapDocumentMethodAttribute), false);
+            Assert.IsTrue(sdmaAttrs.Length > 0);
+
+            SoapDocumentMethodAttribute sdma = (SoapDocumentMethodAttribute)sdmaAttrs[0];
+            Assert.AreEqual("http://www.springframwework.net/SayHello", sdma.Action);
+            Assert.AreEqual(SoapParameterStyle.Wrapped, sdma.ParameterStyle);
+            Assert.AreEqual(string.Empty, sdma.Binding);
+            Assert.AreEqual(false, sdma.OneWay);
+            Assert.AreEqual(string.Empty, sdma.RequestElementName);
+            Assert.AreEqual("http://www.springframwework.net", sdma.RequestNamespace);
+            Assert.AreEqual(string.Empty, sdma.ResponseElementName);
+            Assert.AreEqual("http://www.springframwework.net", sdma.ResponseNamespace);
+            Assert.AreEqual(SoapBindingUse.Literal, sdma.Use);
+
+            object[] xeAttrs = sayHelloMethod.ReturnTypeCustomAttributes.GetCustomAttributes(typeof(XmlElementAttribute), false);
+            Assert.IsTrue(xeAttrs.Length > 0);
+
+            XmlElementAttribute xea = (XmlElementAttribute)xeAttrs[0];
+            Assert.AreEqual("out", xea.ElementName);
+
+            // Try to instantiate the proxy type
+            ObjectUtils.InstantiateType(proxyType);
+        }
+
+        [Test]
+        public void RpcLiteralWithNamedOutParameter()
+        {
+            WebServiceProxyFactory wspf = new WebServiceProxyFactory();
+            wspf.ServiceUri = new AssemblyResource("assembly://Spring.Services.Tests/Spring.Data.Spring.Web.Services/rpc-literal.wsdl");
+            wspf.ServiceInterface = typeof(IHelloWorld);
+            wspf.AfterPropertiesSet();
+
+            object proxy = wspf.GetObject();
+            Assert.IsNotNull(proxy);
+
+            Type proxyType = proxy.GetType();
+            Assert.IsTrue(proxy is IHelloWorld);
+            Assert.IsTrue(proxy is SoapHttpClientProtocol);
+
+            MethodInfo sayHelloMethod = proxyType.GetMethod("SayHello");
+            Assert.IsNotNull(sayHelloMethod);
+
+            object[] srmaAttrs = sayHelloMethod.GetCustomAttributes(typeof(SoapRpcMethodAttribute), false);
+            Assert.IsTrue(srmaAttrs.Length > 0);
+
+            SoapRpcMethodAttribute srma = (SoapRpcMethodAttribute)srmaAttrs[0];
+            Assert.AreEqual("http://www.springframwework.net/SayHello", srma.Action);
+            Assert.AreEqual(string.Empty, srma.Binding);
+            Assert.AreEqual(false, srma.OneWay);
+            Assert.AreEqual(string.Empty, srma.RequestElementName);
+            Assert.AreEqual("http://www.springframwework.net", srma.RequestNamespace);
+            Assert.AreEqual(string.Empty, srma.ResponseElementName);
+            Assert.AreEqual("http://www.springframwework.net", srma.ResponseNamespace);
+            Assert.AreEqual(SoapBindingUse.Literal, srma.Use);
+
+            object[] xeAttrs = sayHelloMethod.ReturnTypeCustomAttributes.GetCustomAttributes(typeof(XmlElementAttribute), false);
+            Assert.IsTrue(xeAttrs.Length > 0);
+
+            XmlElementAttribute xea = (XmlElementAttribute)xeAttrs[0];
+            Assert.AreEqual("out", xea.ElementName);
+
+            // Try to instantiate the proxy type
+            ObjectUtils.InstantiateType(proxyType);
+        }
+
+        [Test]
+        public void RpcLiteralWithDefaultConfig()
+        {
+            WebServiceProxyFactory wspf = new WebServiceProxyFactory();
+            wspf.ServiceUri = new AssemblyResource("assembly://Spring.Services.Tests/Spring.Data.Spring.Web.Services/rpc-literal.wsdl");
+            wspf.ServiceInterface = typeof(IHelloWorld);
+            wspf.AfterPropertiesSet();
+
+            object proxy = wspf.GetObject();
+            Assert.IsNotNull(proxy);
+
+            Type proxyType = proxy.GetType();
+            Assert.IsTrue(proxy is IHelloWorld);
+            Assert.IsTrue(proxy is SoapHttpClientProtocol);
+
+            object[] typeAttrs = proxyType.GetCustomAttributes(typeof(WebServiceBindingAttribute), false);
+            Assert.IsTrue(typeAttrs.Length > 0);
+
+            WebServiceBindingAttribute wsba = (WebServiceBindingAttribute)typeAttrs[0];
+            Assert.AreEqual("HelloWorldServiceSoap", wsba.Name);
+            Assert.AreEqual("http://www.springframwework.net", wsba.Namespace);
+
+            MethodInfo sayHelloWorldMethod = proxyType.GetMethod("SayHelloWorld");
+            Assert.IsNotNull(sayHelloWorldMethod);
+
+            object[] srmaAttrs = sayHelloWorldMethod.GetCustomAttributes(typeof(SoapRpcMethodAttribute), false);
+            Assert.IsTrue(srmaAttrs.Length > 0);
+
+            SoapRpcMethodAttribute srma = (SoapRpcMethodAttribute)srmaAttrs[0];
+            Assert.AreEqual("http://www.springframwework.net/SayHelloWorld", srma.Action);
+            Assert.AreEqual(string.Empty, srma.Binding);
+            Assert.AreEqual(false, srma.OneWay);
+            Assert.AreEqual(string.Empty, srma.RequestElementName);
+            Assert.AreEqual("http://www.springframwework.net", srma.RequestNamespace);
+            Assert.AreEqual(string.Empty, srma.ResponseElementName);
+            Assert.AreEqual("http://www.springframwework.net", srma.ResponseNamespace);
+            Assert.AreEqual(SoapBindingUse.Literal, srma.Use);
+
+            // Try to instantiate the proxy type
+            ObjectUtils.InstantiateType(proxyType);
+        }
+
+        [Test]
+        public void RpcLiteralWithOneWay()
+        {
+            WebServiceProxyFactory wspf = new WebServiceProxyFactory();
+            wspf.ServiceUri = new AssemblyResource("assembly://Spring.Services.Tests/Spring.Data.Spring.Web.Services/rpc-literal.wsdl");
+            wspf.ServiceInterface = typeof(IHelloWorld);
+            wspf.AfterPropertiesSet();
+
+            object proxy = wspf.GetObject();
+            Assert.IsNotNull(proxy);
+
+            Type proxyType = proxy.GetType();
+            Assert.IsTrue(proxy is IHelloWorld);
+            Assert.IsTrue(proxy is SoapHttpClientProtocol);
+
+            MethodInfo logHelloWorldMethod = proxyType.GetMethod("LogHelloWorld");
+            Assert.IsNotNull(logHelloWorldMethod);
+
+            object[] methodAttrs = logHelloWorldMethod.GetCustomAttributes(typeof(SoapRpcMethodAttribute), false);
+            Assert.IsTrue(methodAttrs.Length > 0);
+
+            SoapRpcMethodAttribute srma = (SoapRpcMethodAttribute)methodAttrs[0];
+            Assert.AreEqual("http://www.springframwework.net/LogHelloWorld", srma.Action);
+            Assert.AreEqual(string.Empty, srma.Binding);
+            Assert.AreEqual(true, srma.OneWay);
+            Assert.AreEqual(string.Empty, srma.RequestElementName);
+            Assert.AreEqual("http://www.springframwework.net", srma.RequestNamespace);
+            Assert.AreEqual(string.Empty, srma.ResponseElementName);
+            Assert.AreEqual(null, srma.ResponseNamespace);
+            Assert.AreEqual(SoapBindingUse.Literal, srma.Use);
+
+            // Try to instantiate the proxy type
+            ObjectUtils.InstantiateType(proxyType);
+        }
+
+        [Test]
+        public void RpcLiteralWithMessageName()
+        {
+            WebServiceProxyFactory wspf = new WebServiceProxyFactory();
+            wspf.ServiceUri = new AssemblyResource("assembly://Spring.Services.Tests/Spring.Data.Spring.Web.Services/rpc-literal.wsdl");
+            wspf.ServiceInterface = typeof(IHelloWorld);
+            wspf.AfterPropertiesSet();
+
+            object proxy = wspf.GetObject();
+            Assert.IsNotNull(proxy);
+
+            Type proxyType = proxy.GetType();
+            Assert.IsTrue(proxy is IHelloWorld);
+            Assert.IsTrue(proxy is SoapHttpClientProtocol);
+
+            MethodInfo logHelloMethod = proxyType.GetMethod("LogHello");
+            Assert.IsNotNull(logHelloMethod);
+
+            object[] methodAttrs = logHelloMethod.GetCustomAttributes(typeof(SoapRpcMethodAttribute), false);
+            Assert.IsTrue(methodAttrs.Length > 0);
+
+            SoapRpcMethodAttribute srma = (SoapRpcMethodAttribute)methodAttrs[0];
+            Assert.AreEqual("http://www.springframwework.net/MyLogHello", srma.Action);
+            Assert.AreEqual(string.Empty, srma.Binding);
+            Assert.AreEqual(false, srma.OneWay);
+            Assert.AreEqual(string.Empty, srma.RequestElementName);
+            Assert.AreEqual("http://www.springframwework.net", srma.RequestNamespace);
+            Assert.AreEqual(string.Empty, srma.ResponseElementName);
+            Assert.AreEqual("http://www.springframwework.net", srma.ResponseNamespace);
+            Assert.AreEqual(SoapBindingUse.Literal, srma.Use);
+
+            // Try to instantiate the proxy type
+            ObjectUtils.InstantiateType(proxyType);
+        }
+#endif
+
+        [Test]
+        public void WrapProxyType()
+        {
+            WebServiceProxyFactory wspf = new WebServiceProxyFactory();
+            wspf.ProxyType = typeof(FakeProxyClass);
+            wspf.ServiceInterface = typeof(IHelloWorld);
+            wspf.AfterPropertiesSet();
+
+            object proxy = wspf.GetObject();
+            Assert.IsNotNull(proxy);
+
+            Type proxyType = proxy.GetType();
+            Assert.IsTrue(proxy is IHelloWorld);
+            Assert.IsTrue(proxy is SoapHttpClientProtocol);
+
+            // Try to instantiate the proxy type
+            ObjectUtils.InstantiateType(proxyType);
+        }
+
+        [Test]
+        public void ConfigureSoapHttpClientProtocolWithServiceUri()
+        {
+            IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Services.Tests/Spring.Data.Spring.Web.Services/configurableFactory.xml");
+            ContextRegistry.Clear();
+            ContextRegistry.RegisterContext(ctx);
+
+            object proxy = ctx.GetObject("withServiceUri");
+            Assert.IsNotNull(proxy);
+
+            Type proxyType = proxy.GetType();
+            Assert.IsTrue(proxy is IHelloWorld);
+            Assert.IsTrue(proxy is SoapHttpClientProtocol);
+
+            SoapHttpClientProtocol shcp = proxy as SoapHttpClientProtocol;
+            Assert.AreEqual("http://www.springframework.org/", shcp.Url);
+            Assert.AreEqual(10000, shcp.Timeout);
+
+            // Try to instantiate the proxy type
+            ObjectUtils.InstantiateType(proxyType);
+        }
+
+        [Test]
+        public void ConfigureSoapHttpClientProtocolWithProxyType()
+        {
+            IApplicationContext ctx = new XmlApplicationContext("assembly://Spring.Services.Tests/Spring.Data.Spring.Web.Services/configurableFactory.xml");
+            ContextRegistry.Clear();
+            ContextRegistry.RegisterContext(ctx);
+
+            object proxy = ctx.GetObject("withProxyType");
+            Assert.IsNotNull(proxy);
+
+            Type proxyType = proxy.GetType();
+            Assert.IsTrue(proxy is IHelloWorld);
+            Assert.IsTrue(proxy is SoapHttpClientProtocol);
+
+            SoapHttpClientProtocol shcp = proxy as SoapHttpClientProtocol;
+            Assert.AreEqual("http://www.springframework.org/", shcp.Url);
+            Assert.AreEqual(10000, shcp.Timeout);
+
+            // Try to instantiate the proxy type
+            ObjectUtils.InstantiateType(proxyType);
+        }
+
+        [Test]
+        public void UseCustomClientProtocolType()
+        {
+            WebServiceProxyFactory wspf = new WebServiceProxyFactory();
+            wspf.ServiceUri = new AssemblyResource("assembly://Spring.Services.Tests/Spring.Data.Spring.Web.Services/document-literal.wsdl");
+            wspf.ServiceInterface = typeof(IHelloWorld);
+            wspf.WebServiceProxyBaseType = typeof(CustomClientProtocol);
+            wspf.AfterPropertiesSet();
+
+            object proxy = wspf.GetObject();
+            Assert.IsNotNull(proxy);
+
+            Type proxyType = proxy.GetType();
+            Assert.IsTrue(proxy is IHelloWorld);
+            Assert.IsTrue(proxy is SoapHttpClientProtocol);
+            Assert.IsTrue(proxy is CustomClientProtocol);
+
+            // Try to instantiate the proxy type
+            ObjectUtils.InstantiateType(proxyType);
+        }
+
+        #region NestedSchema
+
+        [Test]
+        public void NestedSchema()
+        {
+            WebServiceProxyFactory wspf = new WebServiceProxyFactory();
+			// cf Post Build Events
+            wspf.ServiceUri = new FileSystemResource("file://~/Spring/Web/Services/nestedSchema.wsdl");
+            wspf.ServiceInterface = typeof(INestedSchema);
+            wspf.AfterPropertiesSet();
+
+            object proxy = wspf.GetObject();
+            Assert.IsNotNull(proxy);
+
+            Type proxyType = proxy.GetType();
+            Assert.IsTrue(proxy is INestedSchema);
+            Assert.IsTrue(proxy is SoapHttpClientProtocol);
+
+            // Try to instantiate the proxy type
+            ObjectUtils.InstantiateType(proxyType);
+        }
+
+        public interface INestedSchema
+        {
+            string testMethod(UserCredentials userCredentials);
+        }
+
+        public class UserCredentials
+        {
+        }
+
+        #endregion
+
+#if NET_3_0
+        public void WcfBasicHttpBinding()
+        {
+            using (ServiceHost host = new ServiceHost(typeof(WcfServiceImpl), new Uri("http://localhost:8000/WcfBasicHttpBinding/Service")))
+            {
+                host.AddServiceEndpoint(typeof(IWcfService), new BasicHttpBinding(), string.Empty);
+
+                ServiceMetadataBehavior smb = new ServiceMetadataBehavior();
+                smb.HttpGetEnabled = true;
+                host.Description.Behaviors.Add(smb);
+
+                host.Open();
+
+                WebServiceProxyFactory wspf = new WebServiceProxyFactory();
+                wspf.ServiceUri = new UrlResource("http://localhost:8000/WcfBasicHttpBinding/Service");
+                wspf.ServiceInterface = typeof(IWcfService);
+                wspf.AfterPropertiesSet();
+
+                object proxy = wspf.GetObject();
+                Assert.IsNotNull(proxy);
+
+                Type proxyType = proxy.GetType();
+                Assert.IsTrue(proxy is IWcfService);
+                Assert.IsTrue(proxy is SoapHttpClientProtocol);
+
+                IWcfService srv = proxy as IWcfService;
+                Assert.AreEqual("5", srv.WcfMethod(5));
+            }
+        }
+
+        [ServiceContract(Namespace="http://www.springframework.net/")]
+        public interface IWcfService
+        {
+            [OperationContract]
+            string WcfMethod(int count);
+        }
+
+        public class WcfServiceImpl : IWcfService
+        {
+            public string WcfMethod(int count)
+            {
+                return count.ToString();
+            }
+        }
+#endif
+
+        #region Test Classes
+
+        public interface IHelloWorld
+        {
+            string SayHelloWorld();
+            string SayHello(string name);
+            void LogHelloWorld();
+            void LogHello(string name);
+        }
+
+        /// <summary>
+        /// Fake Web Service proxy that does not implement any interface.
+        /// </summary>
+        /// <remarks>
+        /// Note that methods matchs IHelloWorld interface methods.
+        /// </remarks>
+        [WebServiceBinding(Name="FakeWebService")]
+        public class FakeProxyClass : SoapHttpClientProtocol
+        {
+            public FakeProxyClass()
+            {
+                this.Url = "http://www.fcporto.pt/";
+            }
+
+            public string SayHelloWorld()
+            {
+                return "Hello World !";
+            }
+
+            public string SayHello(string name)
+            {
+                return String.Format("Hello {0} !", name);
+            }
+
+            public void LogHelloWorld()
+            {
+            }
+
+            public void LogHello(string name)
+            {
+            }
+        }
+
+        public class CustomClientProtocol : SoapHttpClientProtocol
+        {
+        }
+
+        #endregion
+    }
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/ApplicationHostTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/ApplicationHostTest.cs
new file mode 100644
index 00000000..e250c709
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/ApplicationHostTest.cs
@@ -0,0 +1,76 @@
+#region License
+/*
+* Copyright 2002-2004 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;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+using Spring.Services.WindowsService.Common;
+
+namespace Spring.Services.WindowsService.Common
+{
+    [TestFixture]	
+    public class ApplicationHostTest
+	{
+        ApplicationHost host;
+        IConfigurableListableObjectFactory factory;
+        IDynamicMock factoryMock;
+
+        private ApplicationHost NewApplicationHost (AppDomain domain, IConfigurableListableObjectFactory factory)
+        {
+            BindingFlags InstantiationBindingFlags = BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.CreateInstance;
+            ConstructorInfo c = typeof(ApplicationHost).GetConstructor(InstantiationBindingFlags, null, new Type[] {typeof (AppDomain), factory.GetType()} , null);
+            return (ApplicationHost) c.Invoke(new object[] {domain, factory});
+        }
+
+        [SetUp]
+        public void SetUp ()
+        {
+            factoryMock = new DynamicMock(typeof(IConfigurableListableObjectFactory));
+            factory = (IConfigurableListableObjectFactory) factoryMock.Object;
+            host = NewApplicationHost (AppDomain.CurrentDomain, factory);
+        }
+
+        [TearDown]
+        public void TearDown ()
+        {
+            factoryMock.Verify ();
+        }
+
+        [Test]
+		public void WhenStartedPreInstantiateSingletonsOnFactory()
+		{
+            factoryMock.Expect("PreInstantiateSingletons");
+            host.Start();
+        }
+
+        [Test]
+		public void WhenStoppedDestroySingletons()
+		{
+            host.Start();
+            factoryMock.Expect("Dispose");
+            host.Stop();
+        }
+
+        [Test]
+        public void GivesAnInfiniteLifetimeByPreventingALeaseFromBeingCreated ()
+        {
+            Assert.IsNull(host.InitializeLifetimeService());
+        }
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/ApplicationTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/ApplicationTest.cs
new file mode 100644
index 00000000..0a9feb2c
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/ApplicationTest.cs
@@ -0,0 +1,112 @@
+#region License
+/*
+* Copyright 2002-2004 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.Collections.Specialized;
+using System.IO;
+using NUnit.Framework;
+using Spring.Services.WindowsService.Common;
+
+namespace Spring.Services.WindowsService.Common
+{
+    [TestFixture]
+    public class ApplicationTest
+	{
+        Application application;
+
+        [SetUp]
+        public void SetUp ()
+        {
+            application = new Application("testApp");
+        }
+
+        [Test]
+        public void ApplicationFullPathEqualsApplicationBase ()
+        {
+            Assert.AreEqual(application.FullPath,
+                application.DomainSetup.ApplicationBase,
+                "unexpected application base");
+        }
+
+        [Test]
+		public void DefaultPrivateBinPathIsBin()
+		{
+            Assert.AreEqual(
+                "bin",
+                application.DomainSetup.PrivateBinPath,
+                "bin subdirectory not in private path");
+        }
+
+        [Test]
+		public void ConfigurationFileNameIsHardCodedAsServiceDotConfig()
+		{
+            string expected = 
+                Path.Combine(application.FullPath, Application.ServiceConfig);
+            Assert.AreEqual(expected, application.DomainSetup.ConfigurationFile,
+                    "unexpected configuration file name");
+
+        }
+
+        [Test]
+        public void AFullPathAsNameIsReducedToLastPart ()
+        {
+            string fullpath = @"c:\spring\deploy\sample";
+            application = new Application(fullpath);
+            Assert.AreEqual("sample", application.Name);
+            Assert.AreEqual(
+                Path.Combine (fullpath, Application.ServiceConfig), 
+                application.DomainSetup.ConfigurationFile);
+        }
+
+        [Test]
+        public void BaseDirectoryCanBeSpecifiedWithFullPath ()
+        {
+            application = new Application(@"c:\spring\deploy\sample");
+            Assert.AreEqual(@"c:\spring\deploy\sample", application.ApplicationBase);
+            Assert.AreEqual("sample", application.Name);
+        }
+
+        [Test]
+        public void DomainSetupIsConfiguredToShadowCopyFiles ()
+        {
+            Assert.AreEqual("true", application.DomainSetup.ShadowCopyFiles);
+        }
+
+        [Test]
+        public void HashCodeIsTheSameOfTheFullPath ()
+        {
+            Assert.AreEqual(application.FullPath.GetHashCode(), application.GetHashCode());
+        }
+
+        [Test]
+        public void ShouldHonoursEqualsContract()
+        {
+            Assert.IsFalse(application.Equals(new object()));
+            Assert.IsFalse(application.Equals(null));
+            Assert.IsTrue(application.Equals(application));
+            Assert.IsTrue(application.Equals(new Application(application.FullPath)));
+        }
+
+        [Test]
+        public void DefaultConfigurerAllowToReferenceTheApplicationFullPathAndName ()
+        {
+            NameValueCollection collection = Application.DefaultConfigurer(application).Properties;
+            Assert.AreEqual(application.FullPath, collection[Application.ApplicationFullPathPlaceholder]);
+            Assert.AreEqual(application.Name, collection[Application.ApplicationNamePlaceholder]);
+            Assert.AreEqual(2, collection.Count);
+        }
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/AggregatedDeployEventDispatcherTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/AggregatedDeployEventDispatcherTest.cs
new file mode 100644
index 00000000..a1405c02
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/AggregatedDeployEventDispatcherTest.cs
@@ -0,0 +1,40 @@
+#region License
+/*
+* Copyright 2002-2004 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 DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Services.WindowsService.Common.Deploy;
+
+namespace Spring.Services.WindowsService.Common.Deploy
+{
+    [TestFixture]
+    public class AggregatedDeployEventDispatcherTest
+	{
+        [Test]
+		public void DisposeTriggerWhenDisposed ()
+		{
+		    DynamicMock mock = new DynamicMock(typeof(ITrigger));
+            ITrigger trigger = (ITrigger) mock.Object;            
+
+            mock.Expect("Dispose");
+            AggregatedDeployEventDispatcher dispatcher = new AggregatedDeployEventDispatcher(trigger);
+            dispatcher.Dispose();
+            mock.Verify();
+		}
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/ApplicationWatcherManagerTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/ApplicationWatcherManagerTest.cs
new file mode 100644
index 00000000..6fc0cdde
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/ApplicationWatcherManagerTest.cs
@@ -0,0 +1,203 @@
+#region License
+/*
+* Copyright 2002-2004 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.Collections;
+using System.IO;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using NUnit.Framework;
+using Spring.Services.WindowsService.Common.Deploy.FileSystem;
+using Spring.Threading;
+
+namespace Spring.Services.WindowsService.Common.Deploy
+{
+    [TestFixture]
+	public class ApplicationWatcherManagerTest
+	{
+        ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private IApplication application;
+        private string appName;
+        private ApplicationWatcherManager manager;
+        private ISync reconfigured;
+        private int nReconfigured;
+
+        [SetUp]
+        public void SetUp ()
+        {
+            nReconfigured = 0;
+            appName = Guid.NewGuid().ToString();
+            application = new Application(appName);
+            Directory.CreateDirectory(application.FullPath);
+            manager = new ApplicationWatcherManager(application, 10);
+            manager.Reconfigured += new EventHandler(manager_Reconfigured);
+            reconfigured = new Semaphore(0);
+        }
+
+        [TearDown]
+        public void TearDown ()
+        {
+            manager.Dispose ();
+            Directory.Delete(application.FullPath, true);
+        }
+
+        [Test]
+		public void RecreatesTheWatcherWhenItsDefinitonChanges()
+		{
+            Assert.IsTrue(manager.Watcher is NullApplicationWatcher);
+            File.Copy("Data/Xml/watcher-0.xml", application.WatcherXmlFullPath, true);
+            reconfigured.Acquire();
+            Assert.IsTrue(manager.Watcher is NullApplicationWatcher);
+            TestUtils.SafeCopyFile("Data/Xml/watcher-1.xml", application.WatcherXmlFullPath, true);
+            reconfigured.Acquire();
+            Assert.IsTrue(manager.Watcher is FileSystemApplicationWatcher);
+            TestUtils.SafeDeleteFile(application.WatcherXmlFullPath);
+            reconfigured.Acquire();
+            Assert.IsTrue(manager.Watcher is NullApplicationWatcher);
+            Assert.AreEqual(3, nReconfigured);
+        }
+
+        class Watcher : IApplicationWatcher
+        {
+            IApplication application;
+            public bool started, stopped, disposed, filters;
+
+            public IApplication Application
+            {
+                get { return application; }
+                set { application = value; }
+            }
+
+            public void StartWatching (IDeployEventDispatcher dispatcher)
+            {
+                started = true;
+            }
+
+            public void StopWatching ()
+            {
+                stopped = true;
+            }
+
+            public void SetFilters (IList allows, IList disallows)
+            {
+                filters = true;
+            }
+
+            public void Dispose ()
+            {
+                disposed = true;
+            }
+        }
+
+        class Factory : IApplicationWatcherFactory
+        {
+            public Watcher lastWatcher;
+            public int called = 0;
+
+            public IApplicationWatcher CreateApplicationWatcher (IApplication application)
+            {
+                called++;
+                lastWatcher = new Watcher();
+                lastWatcher.Application = application;
+                return lastWatcher;
+            }
+
+            public ApplicationWatcherManager CreateApplicationWatcherMonitor (IApplication application)
+            {
+                throw new NotImplementedException ();
+            }
+        }
+
+        [Test]
+        public void StopsAndDisposeTheOldWatcherAndStartTheNewWatcherWhenItChanges ()
+        {
+            TestUtils.ConfigureLog4Net();
+            IApplication application = new Application(appName);
+            Factory factory = new Factory();
+            ApplicationWatcherManager m = 
+                new ApplicationWatcherManager(factory, application, 100);
+            m.StartWatching(new ForwardingDeployEventDispatcher());
+            manager.Reconfigured -= new EventHandler(manager_Reconfigured);
+            m.Reconfigured += new EventHandler(manager_Reconfigured);
+
+
+            File.Copy("Data/Xml/watcher-0.xml", application.WatcherXmlFullPath, true);
+            reconfigured.Acquire();
+            log.Debug("first empty definition copied");
+            Assert.IsTrue(manager.Watcher is NullApplicationWatcher);
+            Watcher watcher1 = factory.lastWatcher;
+            Assert.IsTrue(watcher1.started);
+
+            bool ok = true;
+            do
+            {
+                try
+                {
+                    File.Copy("Data/Xml/watcher-1.xml", application.WatcherXmlFullPath, true);
+                }
+                catch (Exception e)
+                {
+                    ok = false;
+                    Thread.Sleep(100);
+                    log.Error("error copying file", e);
+                }
+            } while (ok == false);
+            reconfigured.Acquire(); 
+            log.Debug("good definition copied");
+            while (!(manager.Watcher is FileSystemApplicationWatcher))
+                Thread.Sleep(10);
+            Watcher watcher2 = factory.lastWatcher;
+            Assert.IsTrue(watcher2.started);
+            Assert.IsTrue(watcher1.stopped);
+            Assert.IsTrue(watcher1.disposed);
+            Assert.IsTrue(manager.Watcher is FileSystemApplicationWatcher);
+
+            do
+            {
+                try
+                {
+                    File.Delete(application.WatcherXmlFullPath);
+                }
+                catch (Exception e)
+                {
+                    log.Error("error cancelling file", e);
+                }
+            } while (File.Exists(application.WatcherXmlFullPath));
+
+            reconfigured.Acquire();
+            log.Debug("good definition deleted");
+            while (!(manager.Watcher is NullApplicationWatcher))
+                Thread.Sleep(10);
+            Watcher watcher3 = factory.lastWatcher;
+            Assert.IsTrue(watcher3.started);
+            Assert.IsTrue(watcher2.stopped);
+            Assert.IsTrue(watcher2.disposed);
+
+            Assert.IsTrue(manager.Watcher is NullApplicationWatcher);
+            Assert.AreEqual(3, nReconfigured);
+            Assert.AreEqual(3 + 1, factory.called); // +1 in ApplicationWatcherManager ctor
+        }
+
+        private void manager_Reconfigured(object sender, EventArgs e)
+        {
+            ++nReconfigured;
+            log.Debug("releasing reconfigured sync. n. of reconfigs: " + nReconfigured);
+            reconfigured.Release();
+        }
+    }
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/DeployEventAggregatorTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/DeployEventAggregatorTest.cs
new file mode 100644
index 00000000..2aecaf03
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/DeployEventAggregatorTest.cs
@@ -0,0 +1,99 @@
+#region License
+/*
+* Copyright 2002-2004 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 NUnit.Framework;
+using Spring.Services.WindowsService.Common.Deploy;
+
+namespace Spring.Services.WindowsService.Common.Deploy
+{
+    [TestFixture]
+	public class DeployEventAggregatorTest
+	{
+        DeployEventAggregator aggregator;
+
+        [SetUp]
+        public void SetUp ()
+        {
+            aggregator = new DeployEventAggregator();
+        }
+
+        [Test]
+        public void AdditionsAbsorbUpdates ()
+        {
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationAdded));
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationUpdated));
+            Assert.AreEqual(DeployEventType.ApplicationAdded, aggregator.Result.EventType);
+        }
+
+        [Test]
+        public void RemovalsEliminateAdditions ()
+        {
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationAdded));
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationRemoved));
+            Assert.AreEqual(DeployEventType.ApplicationNeverAdded, aggregator.Result.EventType);
+        }
+
+        [Test]
+        public void RemovalsEliminateAdditionsButThenCanAdd ()
+        {
+            RemovalsEliminateAdditions();
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationAdded));
+            Assert.AreEqual(DeployEventType.ApplicationAdded, aggregator.Result.EventType);
+        }
+
+        [Test]
+        public void MultipleEventsOfTheSameTypeCollapse ()
+        {
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationAdded));
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationAdded));
+            Assert.AreEqual(DeployEventType.ApplicationAdded, aggregator.Result.EventType);
+        }
+
+        [Test]
+        public void RemovalsSupercedesUpdatesButAdditionSuperceedesThem ()
+        {
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationUpdated));
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationRemoved));
+            Assert.AreEqual(DeployEventType.ApplicationRemoved, aggregator.Result.EventType);
+            // remove
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationAdded));
+            Assert.AreEqual(DeployEventType.ApplicationUpdated, aggregator.Result.EventType);
+        }
+
+        [Test]
+        public void ARemovalFollowedByAnAdditionResultInAnUpdate ()
+        {
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationRemoved));
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationAdded));
+            Assert.AreEqual(DeployEventType.ApplicationUpdated, aggregator.Result.EventType);
+        }
+
+        [Test]
+        public void ARemovalAfterAnAdditionFrozeStateUntilASecondAddition()
+        {
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationAdded));
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationUpdated));
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationRemoved));
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationUpdated));
+            Assert.AreEqual(DeployEventType.ApplicationNone, aggregator.Result.EventType);
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationAdded));
+            Assert.AreEqual(DeployEventType.ApplicationAdded, aggregator.Result.EventType);
+            aggregator.Aggregate(new DeployEventArgs(null, DeployEventType.ApplicationUpdated));
+            Assert.AreEqual(DeployEventType.ApplicationAdded, aggregator.Result.EventType);
+        }
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/DeployManagerTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/DeployManagerTest.cs
new file mode 100644
index 00000000..5971a864
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/DeployManagerTest.cs
@@ -0,0 +1,256 @@
+#region License
+/*
+* Copyright 2002-2004 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.Collections;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+using DotNetMock.Dynamic;
+using NUnit.Framework;
+using Spring.Services.WindowsService.Common;
+using Spring.Services.WindowsService.Common.Deploy;
+using Spring.Threading;
+
+namespace Spring.Services.WindowsService.Common.Deploy
+{
+    internal class MyDeploy : IDeployLocation
+    {
+        public event DeployEventHandler DeployEvent;
+        private ArrayList applications = new ArrayList ();
+        internal bool wasDisposed = false;
+
+        public void Raise (DeployEventArgs eventArgs)
+        {
+            if (DeployEvent != null)
+                DeployEvent (this, eventArgs);
+        }
+
+        public IList Applications
+        {
+            get { return applications; }
+        }
+
+        public void Add (IApplication application)
+        {
+            Raise (new DeployEventArgs (application, DeployEventType.ApplicationAdded));
+        }
+
+        public void Remove (IApplication application)
+        {
+            Raise (new DeployEventArgs (application, DeployEventType.ApplicationRemoved));
+        }
+
+        public void Update (IApplication application)
+        {
+            Raise(new DeployEventArgs(application, DeployEventType.ApplicationUpdated));
+        }
+
+        public void Dispose ()
+        {
+            wasDisposed = true;
+        }
+    }
+
+    [TestFixture]
+    public class DeployManagerTest
+    {
+        MyDeploy deployLocation;
+        IDeployer deployer;
+        DeployManager deployManager;
+        IDynamicMock deployerMock;
+        bool needVerifyDeployer = true;
+
+        class NullSpringDeployer : ISpringAssembliesDeployer
+        {
+            public void DeployForApplication (IApplication application)
+            {
+            }
+        }
+
+        [SetUp]
+        public void SetUp ()
+        {
+            deployerMock = new DynamicMock(typeof(IDeployer));
+            deployerMock.Strict = false;
+            deployer = (IDeployer) deployerMock.Object;
+            deployLocation = new MyDeploy ();
+            deployManager = new DeployManager (new DirectExecutor(), new NullSpringDeployer(), deployLocation, deployer);
+        }
+
+        [TearDown]
+        public void TearDown ()
+        {
+            if (needVerifyDeployer)
+                deployerMock.Verify();            
+        }
+
+        [Test]
+        public void ItIsOKToStopWhenNotStarted ()
+        {
+            needVerifyDeployer = false;
+            deployManager.Stop();
+        }
+
+        [Test]
+        public void WhenStartedDeploysExisitingApplications ()
+        {
+            foreach (IApplication application in deployManager.DeployLocation.Applications)
+            {
+                Assert.IsFalse (deployManager.IsDeployed (application), "application has not been deployed");
+            }
+            deployLocation.Applications.Add (new Application ("testApp"));
+            deployManager.Start();
+            foreach (IApplication application in deployLocation.Applications)
+            {
+                Assert.IsTrue (deployManager.IsDeployed (application), "application has not been deployed");
+            }
+            DeployInformation[] infos = deployManager.DeployInformations;
+            Assert.AreEqual(deployLocation.Applications.Count, infos.Length);
+            foreach (DeployInformation info in infos)
+            {
+                Assert.AreEqual(DeployStatus.Deployed, info.Status);
+            }
+            deployManager.Stop();
+        }
+
+
+        [Test]
+        public void WhenAnApplicationGetsCreatedDeploysIt ()
+        {
+            NewAssertedDeployed ();
+        }
+
+        [Test]
+        public void WhenAnApplicationGetsRemovedUndeployIt ()
+        {
+            IApplication application = NewAssertedDeployed ();
+            deployerMock.Expect("UnDeploy");
+            deployLocation.Remove (application);
+            Assert.IsFalse (deployManager.IsDeployed (application), "application has not been un-deployed");
+        }
+
+        [Test]
+        public void WhenAnApplicationGetsUpdatedUndeployAndRedeployIt ()
+        {
+            IApplication application = NewAssertedDeployed ();
+            deployerMock.Expect("UnDeploy");
+            deployerMock.Expect("Deploy");
+            deployLocation.Update(application);
+            Assert.IsTrue(deployManager.IsDeployed(application));
+        }
+
+        [Test]
+        public void DisposeLocationAndDeployerOnDispose ()
+        {
+            deployerMock.Expect("Dispose");
+            deployManager.Dispose();
+            Assert.IsTrue(deployLocation.wasDisposed);
+        }
+
+        [Test]
+        public void IfAnApplicationCannotBeDeployedTheOccurredExceptionWillBeAvailableToBeQueried ()
+        {
+            string noDeployReason = "";
+            Exception exception = new Exception(noDeployReason);
+
+            IApplication application = new Application("testApp");
+            deployerMock.ExpectAndThrow("Deploy", exception, application);
+            deployManager.Start();
+            deployLocation.Add(application);
+            Assert.IsFalse(deployManager.IsDeployed(application), "application considered deployed");
+            deployManager.Stop();
+            Assert.IsFalse(deployManager.IsDeployed(application), "application considered deployed");
+
+
+            DeployInformation[] infos = deployManager.DeployInformations;
+            Assert.AreEqual(1, infos.Length);
+            Assert.AreEqual(DeployStatus.CannotDeploy, infos[0].Status);
+            Assert.AreEqual(exception, infos[0].Error);
+        }
+
+        [Test]
+        public void AfterAnApplicationHasBeenRemovedItsInfosCannotBeQueried ()
+        {
+            IApplication application = new Application("testApp");
+            deployerMock.Expect("Deploy", application);
+            deployManager.Start();
+            deployLocation.Add(application);
+            Assert.IsTrue(deployManager.IsDeployed(application), "application considered deployed");
+
+            deployLocation.Remove(application);
+            DeployInformation[] infos = deployManager.DeployInformations;
+            Assert.AreEqual(0, infos.Length);
+            deployManager.Stop();
+        }
+
+        [Test]
+        public void KeepUndeployingApplicationsEvenIfThereAreExceptionsWhileUndeploying()
+        {
+            IApplication application = NewAssertedDeployed ();
+            deployerMock.ExpectAndThrow("UnDeploy", new Exception());            
+            deployManager.Start();
+            deployManager.Stop();
+            Assert.IsFalse(deployManager.IsDeployed(application), "failed to undeploy application still considered deployed");
+        }
+
+        private IApplication NewAssertedDeployed ()
+        {
+            IApplication application = new Application ("testApp");
+            deployLocation.Add (application);
+            Assert.IsTrue (deployManager.IsDeployed (application), "application has not been deployed");
+            deployerMock.Expect("Deploy");
+            return application;
+        }
+
+    }
+
+    [TestFixture]
+    public class DeployInformationTest
+    {
+        [Test]
+        public void SerializationOfDeployInformation ()
+        {
+            string tempDir = Environment.GetEnvironmentVariable("TEMP");
+            string tempFilename = Path.Combine(tempDir,"foo.dat");
+            FileInfo file = new FileInfo (tempFilename);
+            FileStream instream = null;
+            try 
+            {
+                DeployInformation ex = new DeployInformation(new Application("testApp"), DeployStatus.CannotDeploy, new Exception("bar"));
+                Stream outstream = file.OpenWrite ();
+                new BinaryFormatter ().Serialize (outstream, ex);
+                outstream.Flush ();
+                outstream.Close ();
+                instream = file.OpenRead ();
+                DeployInformation inex = (DeployInformation) new BinaryFormatter ().Deserialize (instream);
+                Assert.AreEqual(DeployStatus.CannotDeploy, inex.Status);
+                Assert.AreEqual("testApp", inex.Application.Name);
+                Assert.AreEqual("bar", inex.Error.Message);
+            }
+            finally 
+            {
+                try 
+                {
+                    instream.Close ();
+                    file.Delete ();
+                } 
+                catch {}
+            }
+        }       
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/DefaultApplicationWatcherFactoryTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/DefaultApplicationWatcherFactoryTest.cs
new file mode 100644
index 00000000..c5b20eff
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/DefaultApplicationWatcherFactoryTest.cs
@@ -0,0 +1,80 @@
+#region License
+/*
+* Copyright 2002-2004 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.IO;
+using NUnit.Framework;
+
+namespace Spring.Services.WindowsService.Common.Deploy.FileSystem
+{
+    [TestFixture]
+    public class DefaultApplicationWatcherFactoryTest
+    {
+        string xml = String.Format(@"
+<objects xmlns='http://www.springframework.net' 
+		xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' 
+		xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+    <object name='watcher' type='Spring.Services.WindowsService.Common.Deploy.FileSystem.FileSystemApplicationWatcher' singleton='false'>
+      <constructor-arg><ref object='{0}'/></constructor-arg>
+      <constructor-arg><ref object='configurer'/></constructor-arg>
+    </object>
+
+    <object name='configurer' type='Spring.Services.WindowsService.Common.Deploy.FileSystem.RegularExpressionFilterConfigurer' singleton='false'>
+        <property name='includes'>
+        <list>
+          <value>**/**</value>
+          <value>{1}</value>
+          <value>{2}</value>
+        </list>
+      </property>
+    </object>
+</objects>
+", DefaultApplicationWatcherFactory.InjectedApplicationName, 
+            "${spring.services.application.name}", 
+            "${spring.services.application.fullpath}");
+
+        private string xmlFile;
+        private IApplication application;
+        private IApplicationWatcher w;
+
+        [TearDown]
+        public void TearDown ()
+        {
+            File.Delete(xmlFile);
+        }
+
+        [SetUp]
+        public void SetUp()
+        {
+            xmlFile = Application.WatcherXml;
+            using (StreamWriter writer = File.CreateText(xmlFile))
+            {
+                writer.WriteLine(xml);
+            }
+            application = new Application(Path.GetFullPath("."));
+            w = DefaultApplicationWatcherFactory.Instance.CreateApplicationWatcher(application); 
+        }
+
+        [Test]
+        public void InjectTheApplicationToBeWatchedInTheApplicationContextDefinedForTheWatcher ()
+        {
+            Assert.IsNotNull(w);
+            Assert.IsTrue(w is FileSystemApplicationWatcher, "not a " + typeof(FileSystemApplicationWatcher));
+            Assert.AreSame(application, w.Application);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/FileSystemApplicationWatcherTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/FileSystemApplicationWatcherTest.cs
new file mode 100644
index 00000000..f7cb248b
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/FileSystemApplicationWatcherTest.cs
@@ -0,0 +1,353 @@
+#region License
+/*
+* Copyright 2002-2004 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.Collections;
+using System.IO;
+using System.Reflection;
+using log4net;
+using NUnit.Framework;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Xml;
+using Spring.Threading;
+
+namespace Spring.Services.WindowsService.Common.Deploy.FileSystem
+{
+    public class TestingDispatcher : IDeployEventDispatcher
+    {
+        ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        IList events = new ArrayList();
+        ISync wait = new Semaphore(0);
+
+        public void PerformDispatch (object sender)
+        {
+            lock (this)
+            {
+                log.Debug(String.Format("performing dispatch: {0} events", events.Count));
+                foreach (DeployEventArgs eventArgs in events)
+                {
+                    if (DeployEvent != null)
+                    {
+                        log.Debug(String.Format("raising event {0}", eventArgs.EventType));
+                        DeployEvent(sender, eventArgs);
+                    }
+                }
+                log.Debug(String.Format("clearing events list", events.Count));
+                events.Clear();
+            }
+        }
+
+        public void Dispatch (IDeployLocation sender, DeployEventType eventType, IApplication application)
+        {
+            lock (this)
+            {
+                log.Debug(String.Format("collecting event {0} (collected so far: {1})", eventType, events.Count));
+                events.Add(new DeployEventArgs(application, DeployEventType.ApplicationUpdated));
+                wait.Release();
+            }
+        }
+
+        public event DeployEventHandler DeployEvent;
+
+        public void Dispose ()
+        {
+        }
+
+        public void Wait()
+        {
+            wait.Acquire();
+        }
+
+        public void WaitAndPerformDispatch(object o)
+        {
+            Wait();
+            PerformDispatch(o);
+        }
+    }
+
+
+    // problems with dynamic mocks: too many calls 
+    public class MockFileSystemEventFilter : IFileSystemEventFilter
+    {
+        public bool called = false;
+        public bool accept;
+
+        public MockFileSystemEventFilter (bool accept)
+        {
+            this.accept = accept;
+        }
+
+        public bool Filter (FileSystemEventArgs args)
+        {
+            called = true;
+            return accept;
+        }
+    }
+
+
+    [TestFixture]
+    public class FilteringSupportTest
+    {
+        IList allow;
+        IList disallow;
+        FileSystemEventArgs anEvent;
+        FilteringSupport support;
+        FileSystemEventArgs springAssemblyEvent;
+        IApplication application;
+
+        [SetUp]
+        public void SetUp ()
+        {
+            allow = new ArrayList();
+            disallow = new ArrayList();
+            application = new Application(Path.GetFullPath("foo"));
+            anEvent = new FileSystemEventArgs(WatcherChangeTypes.All, "foo", "foo.dll");
+            springAssemblyEvent = 
+                new FileSystemEventArgs(WatcherChangeTypes.All, 
+                    Path.GetFullPath(SpringAssembliesDeployer.PrivateBinPathPrefix + "foo"), "foo.dll");
+            support = new FilteringSupport(allow, disallow, SpringAssembliesDeployer.DisallowFilter);
+        }
+
+        [Test]
+        public void AnEventIsAcceptedIfThereIsNoFilterDefined ()
+        {
+            Assert.IsTrue(support.Accept(anEvent), "event not accepted with no filter defined");
+        }
+
+        [Test]
+        public void EventsRelatedToSpringAssembliesAreNeverAccepted ()
+        {
+            Assert.IsFalse(support.Accept(springAssemblyEvent), "spring assemblies event accepted");
+            allow.Add(new RegularExpressionFilter(
+                String.Format ("**/{0}*/**", SpringAssembliesDeployer.PrivateBinPathPrefix), true));
+            Assert.IsFalse(support.Accept(springAssemblyEvent), "spring assemblies event accepted");
+        }
+
+        [Test]
+        public void AnEventIsAcceptedIfAtLeastOneAllowFilterFiltersIt ()
+        {
+
+            allow.Add(new MockFileSystemEventFilter(false));            
+            Assert.IsFalse(support.Accept(anEvent), "allowed when no allow filter allows");
+            allow.Add(new MockFileSystemEventFilter(true));            
+            Assert.IsTrue(support.Accept(anEvent), "not allowed when one allow filter allows");
+            allow.Add(new MockFileSystemEventFilter(false));
+            Assert.IsTrue(support.Accept(anEvent), "not allowed when one allow filter allows");
+        }
+
+        [Test]
+        public void AnEventIsNotAcceptedIfAtLeastOneDisallowFilterFiltersIt ()
+        {
+            disallow.Add(new MockFileSystemEventFilter(false));            
+            Assert.IsTrue(support.Accept(anEvent), "disallowed when no disallow filter disallows");
+            disallow.Add(new MockFileSystemEventFilter(true));            
+            Assert.IsFalse(support.Accept(anEvent), "allowed when one disallow filter disallows");
+            disallow.Add(new MockFileSystemEventFilter(false));
+            Assert.IsFalse(support.Accept(anEvent), "allowed when one disallow filter disallows");
+        }
+
+        [Test]
+        public void ADisallowingFilterDominatesAllowFilters ()
+        {
+            disallow.Add(new MockFileSystemEventFilter(true));            
+            allow.Add(new MockFileSystemEventFilter(false));            
+            Assert.IsFalse(support.Accept(anEvent), "event accepted when a disallow filter disallows");
+            allow.Add(new MockFileSystemEventFilter(true));            
+            Assert.IsFalse(support.Accept(anEvent), "event accepted when a disallow filter disallows");
+        }
+
+        [Test]
+        public void WithNoDisallowingFilterItDependsOnThePresenceOfAnAllowingFilters ()
+        {
+            disallow.Add(new MockFileSystemEventFilter(false));            
+            allow.Add(new MockFileSystemEventFilter(false));            
+            Assert.IsFalse(support.Accept(anEvent), "event accepted when a disallow filter disallows");
+            allow.Add(new MockFileSystemEventFilter(true));            
+            Assert.IsTrue(support.Accept(anEvent), "event not accepted when an allow filter allows and no disallow filter disallows");
+            disallow.Add(new MockFileSystemEventFilter(true));            
+            Assert.IsFalse(support.Accept(anEvent), "event accepted when a disallow filter disallows");
+        }
+
+        [Test]
+        public void IgnoreEventsRegardingTheDirectoryOfTheApplication()
+        {
+            FileSystemEventArgs e = 
+                new FileSystemEventArgs(WatcherChangeTypes.All, 
+                Directory.GetCurrentDirectory(), "foo");
+            Assert.IsFalse(support.IsApplicationEvent(e, application, true));
+
+            e = new FileSystemEventArgs(WatcherChangeTypes.All, 
+                Path.GetFullPath("foo"), "foo.dll");
+            Assert.IsTrue(support.IsApplicationEvent(e, application, true));
+
+            e = new FileSystemEventArgs(WatcherChangeTypes.All, 
+                Directory.GetCurrentDirectory(), "foo/foo.dll");
+            Assert.IsTrue(support.IsApplicationEvent(e, application, true));
+
+            e = new FileSystemApplicationWatcher(application, 
+                new NullWatcherConfigurer()).GenericApplicationEvent;
+            Assert.IsTrue(support.IsApplicationEvent(e, application, true));
+        }
+
+        [Test]
+        public void CanDecideIfAnEventIsAnApplicationEventIgnoringCase()
+        {
+            FileSystemEventArgs e = 
+                new FileSystemEventArgs(WatcherChangeTypes.All, 
+                Directory.GetCurrentDirectory(), "FOO/FOO.DLL");
+            application = new Application(Path.GetFullPath("foo").ToUpper());
+            Assert.IsTrue(support.IsApplicationEvent(e, application, true), "failed to match without case");
+            e = new FileSystemEventArgs(WatcherChangeTypes.All, "C:/", "foo/foo.dll");
+            Assert.IsFalse(support.IsApplicationEvent(e, application, false), "unexpected match with case");
+        }
+
+    }
+	
+
+    [TestFixture]
+	public class FileSystemApplicationWatcherTest
+	{
+        ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        Latch eventLatch;
+        string appName, anotherAppName;
+        string appFullPath, anotherAppFullPath;
+        private IDeployEventDispatcher dispatcher;
+        private FileSystemApplicationWatcher watcher;
+        private IApplication application;
+        private bool dispatched;
+        private ISync controlledEventLatch;
+
+
+        [SetUp]
+        public void SetUp ()
+        {
+            TestUtils.ConfigureLog4Net();
+            dispatched = false;
+            appName = Guid.NewGuid().ToString();
+            appFullPath = Path.GetFullPath(appName);
+            anotherAppName = Guid.NewGuid().ToString();
+            anotherAppFullPath = Path.GetFullPath(anotherAppName);
+            Directory.CreateDirectory(appFullPath);
+            Directory.CreateDirectory(anotherAppFullPath);
+            eventLatch = new Latch();
+            controlledEventLatch = new Latch();
+            dispatcher = new ForwardingDeployEventDispatcher();
+            application = new Application(appFullPath);
+            dispatcher.DeployEvent += new DeployEventHandler(dispatcher_DeployEvent);
+            watcher = new FileSystemApplicationWatcher(application);
+        }
+
+        [TearDown]
+        public void TearDown ()
+        {
+            if (watcher != null)
+            {
+                watcher.StopWatching();
+                watcher.Dispose();
+            }
+            dispatcher.DeployEvent -= new DeployEventHandler(dispatcher_DeployEvent);
+            Directory.Delete(appFullPath, true);
+            Directory.Delete(anotherAppFullPath, true);
+        }
+
+        [Test]
+		public void ProduceUpdateEventsForWatchedApplication()
+		{
+            TestingDispatcher controlledDispatcher = new TestingDispatcher();
+            controlledDispatcher.DeployEvent += new DeployEventHandler(controlledDispatcher_DeployEvent);
+            watcher.StartWatching(controlledDispatcher);
+            string subDir = Path.Combine(appFullPath, "foo");
+            Directory.CreateDirectory(subDir);
+            controlledDispatcher.WaitAndPerformDispatch(null);
+
+            using (File.Create(Path.Combine (subDir, "foo.bar"))) {}
+            controlledDispatcher.WaitAndPerformDispatch(null);
+        }
+
+        [Test]
+		public void DoNotProduceUpdateEventsForOtherApplications()
+		{
+            TestingDispatcher controlledDispatcher = new TestingDispatcher();
+            controlledDispatcher.DeployEvent += new DeployEventHandler(controlledDispatcher_DeployEvent);
+            watcher.StartWatching(controlledDispatcher);
+            string subDir = Path.Combine(anotherAppFullPath, "foo");
+            Directory.CreateDirectory(subDir);
+            using (File.Create(Path.Combine (subDir, "foo.bar"))) {}
+            dispatched = false;
+            controlledDispatcher.PerformDispatch(null);
+            Assert.IsFalse(dispatched);
+        }
+
+        [Test]
+        public void UsesEventFiltersToAllowAnEventToPropagated ()
+        {
+            MockFileSystemEventFilter filter = new MockFileSystemEventFilter(true);
+            watcher.StartWatching(dispatcher);
+            watcher.AddAllowFilter (filter);
+            string subDir = Path.Combine(appFullPath, "foo");
+            Directory.CreateDirectory(subDir);
+            using (File.Create(Path.Combine (appFullPath, "foo.bar"))) {}
+            eventLatch.Acquire();            
+            Assert.IsTrue(filter.called);
+        }
+
+        [Test]
+        public void CanBeConfiguredToIncludeOrExcludePathsForEvents ()
+        {
+            string simple = "Data/Xml/watcher-simple.xml";
+            XmlObjectFactory f = new XmlObjectFactory(new FileSystemResource(simple));
+            f.RegisterSingleton(DefaultApplicationWatcherFactory.InjectedApplicationName, application);
+            watcher = f["watcher"] as FileSystemApplicationWatcher;
+            Assert.IsNotNull(watcher, 
+                String.Format("test file [{0}] should define a file sistem resource!", simple));
+            Assert.AreEqual(1, watcher.Excludes.Count);
+            Assert.AreEqual(1, watcher.Includes.Count);
+
+            watcher.StartWatching(dispatcher);
+
+            // propagated
+            string subDir = Path.Combine(appFullPath, "foo");
+            Directory.CreateDirectory(subDir);
+            using (File.Create(Path.Combine (subDir, "foo.bar"))) {}
+            eventLatch.Acquire();            
+            Assert.IsFalse(dispatched);
+        }
+
+        [Test]
+        public void ByDefaultTheCaseIsIngoredButCanBeConfigured ()
+        {
+            Assert.IsTrue(watcher.IgnoreCase);
+            watcher.IgnoreCase = false;
+            Assert.IsFalse(watcher.IgnoreCase);
+        }
+
+        private void dispatcher_DeployEvent(object sender, DeployEventArgs args)
+        {
+            log.Debug("releasing latch");
+            eventLatch.Release();
+            log.Debug("latch released");
+        }
+
+        private void controlledDispatcher_DeployEvent(object sender, DeployEventArgs args)
+        {
+            dispatched = true;
+            log.Debug(String.Format("application = {0}", args.Application.FullPath));
+            log.Debug(String.Format("anotherAppFullPath = {0}", anotherAppFullPath));
+            controlledEventLatch.Release();
+        }
+    }
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/FileSystemDeployLocationTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/FileSystemDeployLocationTest.cs
new file mode 100644
index 00000000..b29dfe67
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/FileSystemDeployLocationTest.cs
@@ -0,0 +1,577 @@
+#region License
+/*
+* Copyright 2002-2004 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.IO;
+using System.Reflection;
+using System.Threading;
+using DotNetMock.Dynamic;
+using log4net;
+using NUnit.Framework;
+using Spring.Threading;
+using Spring.Services.WindowsService.Common;
+
+namespace Spring.Services.WindowsService.Common.Deploy.FileSystem
+{
+    public abstract class FileSystemDeployLocationTestsBase
+    {
+        protected ILog log = LogManager.GetLogger (MethodBase.GetCurrentMethod ().DeclaringType);
+
+        protected string deployPath;
+        protected string deploy = "deploy";
+        protected string sampleDir, sampleDir2;
+
+        protected FileSystemDeployLocation location;
+        protected TestingHandler handler;
+        protected TestingHandler dontUseHandler;
+        protected IDeployEventDispatcher dispatcher;
+        protected ITrigger trigger;
+        protected string serviceXml;
+        protected string watcherXml;
+        protected Latch triggeredLatch;
+
+        protected void SetUp_ ()
+        {
+            deployPath = Guid.NewGuid ().ToString ();
+            sampleDir = Path.Combine (deployPath, deploy);
+            sampleDir2 = Path.Combine (deployPath, deploy + "2");
+            serviceXml = Path.Combine (sampleDir, Application.ServiceXml);
+            watcherXml = Path.Combine (sampleDir, Application.WatcherXml);
+            triggeredLatch = new Latch();
+            trigger = new ThreadingTimerTrigger (50);
+            trigger.Triggered += new EventHandler(trigger_Triggered);
+            dispatcher = new AggregatedDeployEventDispatcher (trigger);
+            TestUtils.ConfigureLog4Net ();
+        }
+
+        protected void AddApplication ()
+        {
+            AddApplication (sampleDir);
+        }
+
+        protected void AddApplication (string dir)
+        {
+            Directory.CreateDirectory (dir);
+            File.Copy("Data/Xml/watcher-1.xml", new Application(dir).WatcherXmlFullPath);
+            using (File.Create (Path.Combine (dir, Application.ServiceXml)))
+            {}
+            Assert.IsTrue (Directory.Exists (dir), "directory does not exist: " + dir);
+        }
+
+        protected void trigger_Triggered (object sender, EventArgs e)
+        {
+            triggeredLatch.Release();
+        }
+
+        protected void InitHandlerAndStartLocation (ISync sync)
+        {
+            GC.SuppressFinalize (location);
+            InitHandler (sync);
+            location.StartWatching ();
+        }
+
+        protected void InitHandler (ISync sync)
+        {
+            location = new FileSystemDeployLocation (dispatcher, deployPath);
+            handler = NewHandler (sync);
+        }
+
+        protected TestingHandler NewHandler (ISync sync)
+        {
+            try
+            {
+                log.Debug("disconnecting testing handler");
+                location.DeployEvent -= new DeployEventHandler (dontUseHandler.Handle);
+            }
+            catch
+            {}
+            dontUseHandler = new TestingHandler (sync);
+            log.Debug("connecting testing handler");
+            location.DeployEvent += new DeployEventHandler (dontUseHandler.Handle);
+            return dontUseHandler;
+        }
+
+        public void TearDown_ ()
+        {
+            log.Debug("disposing location ");
+            if (location != null)
+            {
+                location.Dispose ();
+            }                
+            try
+            {
+                TestUtils.SafeDeleteDirectory(Path.GetFullPath (deployPath));
+            }
+            catch (Exception e)
+            {
+                log.Error("deploy folder not deleted", e);                
+            }
+            try
+            {
+                TestUtils.SafeDeleteDirectory(Path.GetFullPath (deployPath));
+            }
+            catch (Exception e)
+            {
+                log.Error("test folder not deleted", e);
+            }
+            Assert.IsFalse(Directory.Exists(Path.GetFullPath (deployPath)), "the root of the deploy directory still exist"); 
+        }
+    }
+
+    [TestFixture]
+    public class FileSystemDeployLocationTest_Mocked : FileSystemDeployLocationTestsBase
+    {
+        private DynamicMock factoryMock;
+        private DynamicMock watcherMock;
+        private IApplicationWatcherFactory factory;
+        private IApplicationWatcher watcher;
+        private bool deployEventDispatched;
+        private ISync forwardDispatcherSync;
+
+        [SetUp]
+        public void SetUp ()
+        {
+            base.SetUp_();
+            factoryMock = new DynamicMock(typeof(IApplicationWatcherFactory));
+            watcherMock = new DynamicMock(typeof(IApplicationWatcher));
+            factory = (IApplicationWatcherFactory) factoryMock.Object;
+            watcher = (IApplicationWatcher) watcherMock.Object;
+            deployEventDispatched = false;
+            forwardDispatcherSync = new Latch();
+        }
+
+        [TearDown]
+        public void TearDown ()
+        {
+            base.TearDown_();
+            factoryMock.Verify();
+            watcherMock.Verify();
+        }
+
+        [Test]
+        public void DisposeDispatcherOnDispose ()
+        {
+            DynamicMock mock = new DynamicMock (typeof (IDeployEventDispatcher));
+            IDeployEventDispatcher dispatcher = (IDeployEventDispatcher) mock.Object;
+            mock.Expect ("Dispose");
+            IDeployLocation location = new FileSystemDeployLocation (dispatcher, deployPath);
+            location.Dispose ();
+            mock.Verify ();
+        }
+
+        [Test]
+        public void ANewWatcherGetsCreatedAndAssociatedToAnyExistingApplication ()
+        {
+            factoryMock.ExpectAndReturn("CreateApplicationWatcherMonitor", watcher);
+            watcherMock.Expect("StartWatching");
+            AddApplication ();
+            location = new FileSystemDeployLocation (new ForwardingDeployEventDispatcher(), factory, deployPath, true);
+        }
+
+        [Test]
+        public void TheAssociatedWatcherIsStoppedAndDisposedWhenAnApplicationGetsRemoved ()
+        {
+            factoryMock.ExpectAndReturn("CreateApplicationWatcherMonitor", watcher);
+            watcherMock.Expect("StartWatching");
+            watcherMock.Expect("StopWatching");
+            watcherMock.Expect("Dispose");
+            AddApplication();
+            location = new FileSystemDeployLocation (new ForwardingDeployEventDispatcher(), factory, deployPath, true);
+            Directory.Delete(sampleDir, true);
+            triggeredLatch.Acquire();
+        }        
+
+        [Test]
+        public void TheAssociatedWatcherIsStoppedAndDisposedOnDispose ()
+        {
+            factoryMock.ExpectAndReturn("CreateApplicationWatcherMonitor", watcher);
+            watcherMock.Expect("StartWatching");
+            watcherMock.Expect("StopWatching");
+            watcherMock.Expect("Dispose");
+            AddApplication();
+            location = new FileSystemDeployLocation (new ForwardingDeployEventDispatcher(), factory, deployPath, true);
+            triggeredLatch.Acquire();
+            location.Dispose();
+        }        
+
+        [Test]
+        public void IgnoresExceptionAddingExistingApplication ()
+        {
+            factoryMock.ExpectAndThrow("CreateApplicationWatcherMonitor", new Exception("exception generated to test behaviour adding application"));
+            AddApplication();
+            location = new FileSystemDeployLocation (new ForwardingDeployEventDispatcher(), factory, deployPath, true);            
+        }
+
+        [Test] // Bug fix
+        public void NotInfiniteLoopRemovingAnApplicationWithAManagerThatThrowsExceptionWhenStopped ()
+        {
+            factoryMock.ExpectAndReturn("CreateApplicationWatcherMonitor", watcher);
+            watcherMock.Expect("StartWatching");
+            watcherMock.ExpectAndThrow("StopWatching", new Exception());
+            AddApplication();
+            ForwardingDeployEventDispatcher dispatcher = new ForwardingDeployEventDispatcher();
+            dispatcher.DeployEvent += new DeployEventHandler(dispatcher_DeployEvent);
+            location = new FileSystemDeployLocation (dispatcher, factory, deployPath, true);
+            Directory.Delete(sampleDir, true);
+            forwardDispatcherSync.Acquire();
+            Assert.IsTrue(deployEventDispatched, "removal not dispatched in case of error on application watcher");
+        }
+
+        [Test] // Bug fix
+        public void NotInfiniteLoopRemovingAnApplicationWithAManagerThatThrowsExceptionWhenDisposed ()
+        {
+            factoryMock.ExpectAndReturn("CreateApplicationWatcherMonitor", watcher);
+            watcherMock.Expect("StartWatching");
+            watcherMock.Expect("StopWatching");
+            watcherMock.ExpectAndThrow("Dispose", new Exception());
+            AddApplication();
+            ForwardingDeployEventDispatcher dispatcher = new ForwardingDeployEventDispatcher();
+            dispatcher.DeployEvent += new DeployEventHandler(dispatcher_DeployEvent);
+            location = new FileSystemDeployLocation (dispatcher, factory, deployPath, true);
+            Directory.Delete(sampleDir, true);
+            forwardDispatcherSync.Acquire();
+            Assert.IsTrue(deployEventDispatched, "removal not dispatched in case of error on application watcher");
+        }
+
+        class ExceptionDispatcher : IDeployEventDispatcher
+        {
+            public event DeployEventHandler DeployEvent;
+            ISync started, canContinue;
+
+            public ExceptionDispatcher (ISync started, ISync canContinue)
+            {
+                this.started = started;
+                this.canContinue = canContinue;
+            }
+
+            public void Dispose ()
+            {
+            }
+
+            public void Dispatch (IDeployLocation sender, DeployEventType eventType, IApplication application)
+            {
+                if (DeployEvent != null) DeployEvent(null, new DeployEventArgs(application, eventType));
+                started.Release();
+                canContinue.Acquire();
+                throw new Exception ("this dispatcher is for testing and always raises exception");
+            }
+
+        }
+
+        [Test]
+        public void IgnoreExceptionOnDispatcherWhenAdding ()
+        {
+            factoryMock.ExpectAndReturn("CreateApplicationWatcherMonitor", watcher);
+            factoryMock.ExpectAndReturn("CreateApplicationWatcherMonitor", watcher);
+            ISync canContinue = new Semaphore(0);
+            ISync started = new Semaphore(0);
+            IDeployEventDispatcher dispatcher = new ExceptionDispatcher(started, canContinue);
+            location = new FileSystemDeployLocation (dispatcher, factory, deployPath, true);
+            AddApplication();
+            started.Acquire();
+            canContinue.Release();
+            Assert.AreEqual(1, location.Applications.Count);
+            AddApplication(sampleDir2);
+            started.Acquire();
+            canContinue.Release();
+            Assert.AreEqual(2, location.Applications.Count);
+        }
+
+        [Test]
+        public void IgnoreExceptionOnDispatcherWhenRemoving ()
+        {
+            factoryMock.ExpectAndReturn("CreateApplicationWatcherMonitor", watcher);
+            factoryMock.ExpectAndReturn("CreateApplicationWatcherMonitor", watcher);
+            watcherMock.Expect("StartWatching");
+            watcherMock.Expect("StopWatching");
+            watcherMock.Expect("Dispose");
+            watcherMock.Expect("StartWatching");
+            watcherMock.Expect("StopWatching");
+            watcherMock.Expect("Dispose");
+            ISync canContinue = new Semaphore(0);
+            ISync started = new Semaphore(0);
+            AddApplication();
+            AddApplication(sampleDir2);
+            IDeployEventDispatcher dispatcher = new ExceptionDispatcher(started, canContinue);
+            location = new FileSystemDeployLocation (dispatcher, factory, deployPath, true);
+            Assert.AreEqual(2, location.Applications.Count);
+            Directory.Delete(sampleDir, true);
+            started.Acquire();
+            canContinue.Release();
+            Assert.AreEqual(1, location.Applications.Count);
+            Directory.Delete(sampleDir2, true);
+            started.Acquire();
+            canContinue.Release();
+            Assert.AreEqual(0, location.Applications.Count);
+        }
+
+        [Test]
+        public void OnlyApplicationsWithAManagerSuccesfullyStartedAreListed ()
+        {
+            factoryMock.ExpectAndReturn("CreateApplicationWatcherMonitor", watcher);
+            watcherMock.ExpectAndThrow("StartWatching", new Exception());
+            AddApplication();
+            dispatcher.DeployEvent += new DeployEventHandler(dispatcher_DeployEvent);
+            location = new FileSystemDeployLocation (dispatcher, factory, deployPath, true);
+            triggeredLatch.Acquire();
+            Assert.AreEqual(0, location.Applications.Count);
+            Assert.IsFalse(deployEventDispatched, "add dispatched in case of error on application watcher");
+        }
+
+        private void dispatcher_DeployEvent (object sender, DeployEventArgs args)
+        {
+            deployEventDispatched = true;
+            forwardDispatcherSync.Release();
+        }
+    }
+
+    [TestFixture]
+    public class FileSystemDeployLocationTest : FileSystemDeployLocationTestsBase
+    {
+        [SetUp]
+        public void SetUp ()
+        {
+            base.SetUp_ ();
+            InitHandler (new NullSync ());
+        }
+
+        [TearDown]
+        public void TearDown ()
+        {
+            log.Debug("tear down");
+            base.TearDown_();
+        }
+
+        private void AddInvalidApplication ()
+        {
+            Directory.CreateDirectory (sampleDir);
+            Assert.IsTrue (Directory.Exists (sampleDir), "directory does not exist: " + sampleDir);
+        }
+
+
+        [Test]
+        public void CreateDeployLocationPath ()
+        {
+            Assert.IsTrue (Directory.Exists (location.FullPath));
+            Assert.AreEqual (0, location.Applications.Count);
+        }
+
+        [Test]
+        public void ListExistingDirectoriesAsApplications ()
+        {
+            log.Debug ("start ListExistingDirectoriesAsApplications");
+            AddApplication ();
+            location = new FileSystemDeployLocation (deployPath);
+            Assert.AreEqual (1, location.Applications.Count);
+            log.Debug ("end ListExistingDirectoriesAsApplications");
+        }
+
+        [Test]
+        public void CreateAFileToPreventDeployDirectoryDeletion ()
+        {
+            location.StartWatching ();
+            Assert.IsTrue (File.Exists (location.LockFileName));
+        }
+
+        [Test]
+        public void LockFileIsDeletedOnDisposeOrStop ()
+        {
+            FileSystemDeployLocation location = 
+                new FileSystemDeployLocation (dispatcher, deployPath);
+            location.StartWatching ();
+            location.Dispose();
+            Assert.IsFalse (File.Exists (location.LockFileName));
+        }
+
+        [Test]
+        public void RaiseEventAddingAnApplication ()
+        {
+            Semaphore sync = new Semaphore (0);
+            InitHandlerAndStartLocation (sync);
+            AddApplication ();
+            sync.Acquire ();
+            Assert.IsTrue (handler.applicationAdded, "application not added");
+            Assert.AreEqual (1, location.Applications.Count);
+        }
+
+        [Test]
+        public void RaiseEventRemovingAnApplication ()
+        {
+            AddApplication ();
+            Semaphore sync = new Semaphore (0);
+            InitHandlerAndStartLocation (sync);
+            Directory.Delete (sampleDir, true);
+            Thread.SpinWait(1);
+            Assert.IsFalse(Directory.Exists(sampleDir), "directory still exists");
+            log.Debug("directory deleted");
+            sync.Acquire ();
+            log.Debug("sync acquired");
+            Assert.IsFalse (Directory.Exists (sampleDir), "directory still exists: " + sampleDir);
+            Assert.IsTrue (handler.applicationRemoved, "application not removed");
+            Assert.AreEqual (0, location.Applications.Count);
+        }
+
+        [Test]
+        public void RenamingADirectoryHostingAnApplicationItEqualsRemoveOldApplicationAndAddUnderNewName ()
+        {
+            Semaphore sync = new Semaphore (0);
+            InitHandlerAndStartLocation (sync);
+            AddApplication ();
+            sync.Acquire ();
+            Assert.IsTrue (handler.applicationAdded, "application not added");
+            Directory.Move (sampleDir, sampleDir2);
+            sync.Acquire (); // add or remove
+            sync.Acquire (); // add or remove
+            Assert.IsTrue (handler.applicationRemoved, "application was not removed");
+        }
+
+
+        //[Test, Ignore("Gets stuck when running entire WindowsService.Tests dll")]
+        [Test]
+        public void EventsAreRaisedOnlyForValidatedApplication ()
+        {
+            Semaphore sync = new Semaphore (0);
+            InitHandlerAndStartLocation (sync);
+            AddInvalidApplication ();
+            triggeredLatch.Acquire();
+            Assert.IsFalse (handler.applicationAdded, "invalid application was added");
+            Assert.AreEqual (0, location.Applications.Count, "invalid application was added");
+        }
+
+        [Test]
+        public void RemoveAfterSpringAssemblyDeploy ()
+        {
+            Semaphore sync = new Semaphore (0);
+            InitHandlerAndStartLocation (sync);
+            AddApplication();
+            sync.Acquire();
+            string springPrivateBin = Path.Combine(sampleDir, SpringAssembliesDeployer.PrivateBinPathPrefix);
+            Directory.CreateDirectory(springPrivateBin);
+            using (File.Create(Path.Combine(springPrivateBin, "foo.dll"))) {}
+            Directory.Delete(sampleDir, true);
+            Assert.IsFalse(Directory.Exists(sampleDir), "directory still exists");
+            log.Debug (String.Format ("directory {0} removed to simulate application removal", sampleDir));
+            sync.Acquire();
+            Assert.IsTrue (handler.applicationRemoved, "application not removed");
+            Assert.AreEqual (0, location.Applications.Count, "application not removed");
+        }
+
+        [Test]
+        public void AddingRemovingUpdatingOrRenamingAFileUnderAnApplicationDirectoryItGetsUpdated ()
+        {
+            Semaphore sync = new Semaphore (0);
+            AddApplication();
+            InitHandlerAndStartLocation (sync);
+            string subDir = Path.Combine(sampleDir, "foo");
+            Directory.CreateDirectory(subDir);
+            string aFile = Path.Combine(subDir, "foo.bar");
+            sync.Acquire();
+
+            // create
+            log.Debug (String.Format ("creating a file"));
+            using (File.Create(aFile)) {}
+            sync.Acquire();
+            Assert.IsTrue(handler.applicationUpdated, "new file created but application not updated");
+
+            // update
+            log.Debug (String.Format ("updating a file"));
+            handler.applicationUpdated = false;
+            File.SetLastWriteTime(aFile, DateTime.Now);
+            sync.Acquire();
+            Assert.IsTrue(handler.applicationUpdated, "new file created but application not updated");
+
+            // delete
+            log.Debug (String.Format ("deleting a file"));
+            handler.applicationUpdated = false;
+            File.Delete(aFile);
+            sync.Acquire();
+            Assert.IsTrue(handler.applicationUpdated, "new file created but application not updated");
+        }
+
+        [Test]
+        public void CanBeDisposedMoreThanOnce ()
+        {
+            IDeployLocation location = new FileSystemDeployLocation(dispatcher, 
+                DefaultApplicationWatcherFactory.Instance, deployPath, true);
+            location.Dispose();
+            location.Dispose();
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectDisposedException))]
+        public void CanBeStartedExplicitlyStartedButIsImplicitlyStoppedWhenDisposed ()
+        {
+            FileSystemDeployLocation location = new FileSystemDeployLocation(deployPath);
+            location.StartWatching();
+            location.Dispose();
+            location.StartWatching();
+        }
+
+        [Test]
+        public void EventsRelatedToFilesInDeployPathAreIgnored ()
+        {
+            FieldInfo f = location.GetType().GetField("_fileSystemWatcher", 
+                BindingFlags.GetField | BindingFlags.Instance | BindingFlags.NonPublic);
+            Assert.IsNotNull(f);
+            //FileSystemWatcher watcher = (FileSystemWatcher) f.GetValue(location);
+            FileSystemMonitor watcher = (FileSystemMonitor) f.GetValue(location);
+            Assert.IsNotNull(watcher);
+            Assert.AreEqual(NotifyFilters.DirectoryName | NotifyFilters.Attributes, watcher.NotifyFilter);
+            Assert.AreEqual(
+                Enum.Parse(typeof(NotifyFilters), 0.ToString()) , 
+                watcher.NotifyFilter & NotifyFilters.FileName);
+        }
+
+        [Test]
+        public void AnInvalidApplicationIsNotUpdatedNorRemovedButItWillNotBeListed ()
+        {
+            Semaphore sync = new Semaphore (0);
+            AddApplication();
+            InitHandlerAndStartLocation (sync);
+            File.Delete(serviceXml);
+            Assert.IsFalse(sync.Attempt(1000), "some events propagated, expecting no one");
+            Assert.IsFalse (handler.applicationUpdated, "application wrongly updated");
+            Assert.IsFalse(handler.applicationRemoved, "application wrongly removed");
+            Assert.AreEqual (0, location.Applications.Count, "application listed");
+
+            location.Dispose();            
+            location = new FileSystemDeployLocation (deployPath);
+            Assert.AreEqual (0, location.Applications.Count, "invalid application listed");
+        }
+
+        [Test]
+        public void AnInvalidApplicationIsNotUpdatedNorRemovedButWhenRemovedStillRaisesTheRemovedEvent ()
+        {
+            Semaphore sync = new Semaphore (0);
+            AddApplication();
+            InitHandlerAndStartLocation (sync);
+            File.Delete(serviceXml);
+            Assert.IsFalse(sync.Attempt(1000), "some events propagated, expecting no one");
+
+            // remove
+            TestUtils.SafeDeleteDirectory(sampleDir);
+            Thread.SpinWait(1);
+            Assert.IsFalse(Directory.Exists(sampleDir), "directory still exists");
+            log.Debug("directory deleted");
+            sync.Acquire ();
+            log.Debug("sync acquired");
+            Assert.IsFalse (Directory.Exists (sampleDir), "directory still exists: " + sampleDir);
+            Assert.IsTrue (handler.applicationRemoved, "application not removed");
+            Assert.AreEqual (0, location.Applications.Count);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/FileSystemMonitorTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/FileSystemMonitorTest.cs
new file mode 100644
index 00000000..8c5a03fe
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/FileSystemMonitorTest.cs
@@ -0,0 +1,261 @@
+using System;
+using System.IO;
+using System.Threading;
+using NUnit.Framework;
+using Spring.Threading;
+
+namespace Spring.Services.WindowsService.Common.Deploy.FileSystem
+{
+    class FileSystemMonitorTester
+    {
+        private string _path;
+        AutoResetEvent _resetEvent = new AutoResetEvent(false);
+
+        public FileSystemMonitorTester(string path)
+        {
+            this._path = path;
+        }
+
+        public void CreateFile(string fileName)
+        {
+            Directory.CreateDirectory(Path.Combine(_path, Path.GetDirectoryName(fileName)));
+            using (File.CreateText(Path.Combine(_path, fileName)))
+            {}
+        }
+
+        public void DeleteFile(string file)
+        {
+            File.Delete(Path.Combine(_path, file));
+        }
+
+        public void ChangeFile(string aFile)
+        {
+            using (StreamWriter writer = File.AppendText(Path.Combine(_path, aFile)))
+            {
+                writer.WriteLine("Random data");
+            }
+        }
+
+        public void RenameFile(string file, string newName)
+        {
+            File.Move(Path.Combine(_path, file), Path.Combine(_path, newName));
+        }
+
+        public bool TryToCauseAnError (ISync sync, long msecs)
+        {
+            new Thread(new ThreadStart(Go)).Start();
+            bool got = sync.Attempt(msecs);
+            _resetEvent.Set();
+            return got;
+        }
+
+        private void Go ()
+        {
+            string subDir = Guid.NewGuid().ToString();
+            Directory.CreateDirectory(Path.Combine (_path, subDir));
+            while (true)
+            {
+                if (_resetEvent.WaitOne(0, true))
+                    break;
+                string file = Path.Combine(subDir, Guid.NewGuid().ToString());
+                CreateFile(file);
+                ChangeFile(file);
+                DeleteFile(file);
+            }
+        }
+    }
+
+    [TestFixture]
+    public class FileSystemMonitorTest
+    {
+        FileSystemMonitor monitor;
+        string _path;
+        ISync sync;
+        long msecs;
+        FileSystemMonitorTester tester;
+        string aFile;
+
+        [SetUp]
+        public void SetUp ()
+        {
+            _path = Path.GetFullPath(Guid.NewGuid().ToString());
+            Directory.CreateDirectory(_path);
+            monitor = new FileSystemMonitor(_path);
+            monitor.Start();
+            tester = new FileSystemMonitorTester(_path);
+            sync = new Semaphore(0);
+            msecs = 1000;
+
+            aFile = "foo.txt";
+        }
+
+        [TearDown]
+        public void TearDown ()
+        {
+        	try
+        	{
+        		monitor.Stop();
+        		Directory.Delete(_path, true);
+        	}
+        	catch (IOException ex)
+        	{
+        		Console.Write(ex);
+        	}
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void DoesNotAcceptANonExistingDirectory ()
+        {
+            new FileSystemMonitor("oh-no");
+        }
+
+        [Test]
+        public void CanBeStoppedEvenIfNotStarted ()
+        {
+            monitor.Stop();
+
+            monitor = new FileSystemMonitor(_path);
+            monitor.Stop();
+            Assert.IsTrue(true);
+        }
+
+        [Test]
+        public void AllowRegisteringToCreatedEvents ()
+        {
+            monitor.Created += new FileSystemEventHandler(OnCreated);
+            tester.CreateFile(aFile);
+            Assert.IsTrue(sync.Attempt(msecs), "created event timed out");
+        }
+
+        [Test]
+        public void AllowRegisteringToDeletedEvents ()
+        {
+            tester.CreateFile(aFile);
+
+            monitor.Deleted += new FileSystemEventHandler(OnDeleted);
+            tester.DeleteFile(aFile);
+            Assert.IsTrue(sync.Attempt(msecs), "deleted event timed out");
+        }
+
+        [Test]
+        public void AllowRegisteringToChangedEvents ()
+        {
+            tester.CreateFile(aFile);
+            monitor.Changed += new FileSystemEventHandler(OnChanged);
+            tester.ChangeFile(aFile);
+            Assert.IsTrue(sync.Attempt(msecs), "changed event timed out");
+        }
+
+        [Test]
+        public void AllowRegisteringToRenamedEvents ()
+        {
+            tester.CreateFile(aFile);
+            monitor.Renamed += new RenamedEventHandler(OnRenamed);
+            tester.RenameFile(aFile, "oh-what");
+            Assert.IsTrue(sync.Attempt(msecs), "renamed event timed out");
+        }
+
+        [Test]
+        public void ErrorEventsAreNotFiltered ()
+        {            
+            monitor.InternalBufferSize = 4096;
+            monitor.PathMatcherExcludes = "**/*.*";
+            monitor.Error += new ErrorEventHandler(OnError);
+            monitor.Created += new FileSystemEventHandler(noOp);
+            monitor.Deleted += new FileSystemEventHandler(noOp);
+            Assert.IsTrue(tester.TryToCauseAnError(sync, msecs * 10), "error event timed out");
+        }
+
+        [Test]
+        public void SupportsNantLikePattensToFilterAllowedEvents ()
+        {
+            monitor.NotifyFilter = NotifyFilters.FileName;
+            monitor.IncludeSubdirectories = true;
+            monitor.PathMatcherIncludes = "**/sub/*.txt";
+
+            monitor.Created += new FileSystemEventHandler(OnCreated);
+            tester.CreateFile("sub/Bar.bar");
+            Assert.IsFalse(sync.Attempt(msecs), "created event NOT filtered and propagated");
+
+            tester.CreateFile("sub/Bar.txt");
+            Assert.IsTrue(sync.Attempt(msecs), "created event filtered and NOT propagated");
+        }
+
+        [Test]
+        public void SupportsNantLikePattensToFilterNotAllowedEvents ()
+        {
+            monitor.NotifyFilter = NotifyFilters.FileName;
+            monitor.IncludeSubdirectories = true;
+            monitor.PathMatcherExcludes = "**/sub/*.txt";
+
+            monitor.Created += new FileSystemEventHandler(OnCreated);
+            tester.CreateFile("sub/Bar.bar");
+            Assert.IsTrue(sync.Attempt(msecs), "created event filtered and NOT propagated");
+
+            tester.CreateFile("sub/Bar.txt");
+            Assert.IsFalse(sync.Attempt(msecs), "created event NOT filtered and propagated");
+        }
+
+        [Test]
+        public void CanBeStoppedOnAnEvent ()
+        {
+            //TODO: test with a buffer of capacity 1 to have blocked thread 
+            // when shut down
+
+            monitor.Created += new FileSystemEventHandler(ShutDownOnCreated);
+
+            // TODO: simulate a big number of 
+            // events and randomly shut down
+            tester.CreateFile(aFile);
+            tester.CreateFile("buzzWords");
+            Assert.IsTrue(sync.Attempt(msecs), "created event timed out");            
+
+            tester.DeleteFile(aFile);
+
+            // no more events: the monitor is stopped
+            sync = new Latch(); 
+            tester.CreateFile(aFile);
+            Assert.IsFalse(sync.Attempt(msecs), "created event NOT timed out");            
+        }
+
+        private void OnCreated(object sender, FileSystemEventArgs e)
+        {
+            Assert.AreEqual(WatcherChangeTypes.Created, e.ChangeType);
+            sync.Release();
+        }
+
+        private void OnDeleted(object sender, FileSystemEventArgs e)
+        {
+            Assert.AreEqual(WatcherChangeTypes.Deleted, e.ChangeType);
+            sync.Release();
+        }
+
+        private void OnChanged(object sender, FileSystemEventArgs e)
+        {
+            Assert.AreEqual(WatcherChangeTypes.Changed, e.ChangeType);
+            sync.Release();
+        }
+
+        private void OnRenamed(object sender, RenamedEventArgs e)
+        {
+            Assert.AreEqual(WatcherChangeTypes.Renamed, e.ChangeType);
+            sync.Release();
+        }
+
+        private void OnError (object sender, ErrorEventArgs e)
+        {
+            sync.Release();
+        }
+
+        private void ShutDownOnCreated(object sender, FileSystemEventArgs e)
+        {
+            monitor.Stop();
+            sync.Release();
+        }
+
+        private void noOp (object sender, FileSystemEventArgs e)
+        {            
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/RegularExpressionFilterConfigurerTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/RegularExpressionFilterConfigurerTest.cs
new file mode 100644
index 00000000..a4127e0e
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/FileSystem/RegularExpressionFilterConfigurerTest.cs
@@ -0,0 +1,130 @@
+#region License
+/*
+* Copyright 2002-2004 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.IO;
+using System.Text;
+using NUnit.Framework;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Xml;
+using Spring.Util;
+
+namespace Spring.Services.WindowsService.Common.Deploy.FileSystem
+{
+    [TestFixture]
+    public class RegularExpressionFilterConfigurerTest
+    {
+
+        string xml = String.Format (@"
+<objects xmlns='http://www.springframework.net' 
+		xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' 
+		xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+    <object name='watcher' type='Spring.Services.WindowsService.Common.Deploy.FileSystem.FileSystemApplicationWatcher' singleton='false'>
+      <constructor-arg><ref object='{0}'/></constructor-arg>
+      <constructor-arg><ref object='configurer'/></constructor-arg>
+    </object>
+    <object 
+        name='configurer' 
+        type='Spring.Services.WindowsService.Common.Deploy.FileSystem.RegularExpressionFilterConfigurer' 
+        singleton='false'>
+      <property name='includes'>
+        <list>
+          <value>bin/**/*.*</value>
+        </list>
+      </property>
+      <property name='excludes'>
+        <list>
+          <value>**/*.log</value>
+        </list>
+      </property>
+    </object>
+</objects>
+", DefaultApplicationWatcherFactory.InjectedApplicationName);
+
+        private string xmlFile;
+
+        [TearDown]
+        public void TearDown ()
+        {
+            File.Delete(xmlFile);
+        }
+
+        [SetUp]
+        public void SetUp()
+        {
+            xmlFile = Application.WatcherXml;
+            using (StreamWriter w = File.CreateText(xmlFile))
+            {
+                w.WriteLine(xml);
+            }
+        }
+
+        [Test]
+        public void CreationViaARegexFilterConfigurerPrependsApplicationFullPathToRegex()
+        {
+            IApplication application = new Application(Path.GetFullPath("."));
+            FileSystemApplicationWatcher w =
+                (FileSystemApplicationWatcher) DefaultApplicationWatcherFactory.Instance.CreateApplicationWatcher(application);
+            Assert.AreEqual(1, w.DisallowFilters.Count);
+            Assert.AreEqual(1, w.AllowFilters.Count);
+        	RegularExpressionFilter filter1 = w.AllowFilters[0] as RegularExpressionFilter;
+            Assert.AreEqual(
+                PathMatcher.ForwardifySlashes(application.FullPath + "/bin/**/*.*"), filter1.Patterns[0]);
+        	RegularExpressionFilter filter2 = w.DisallowFilters[0] as RegularExpressionFilter;
+            Assert.AreEqual(
+                PathMatcher.ForwardifySlashes(application.FullPath + "/**/*.log"), filter2.Patterns[0]);
+        }
+
+        [Test]
+        public void AnObjectCanBeInjectedFromCodeIntoTheContext ()
+        {
+            string inject = @"
+<objects xmlns='http://www.springframework.net' 
+		xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' 
+		xsi:schemaLocation='http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd'>
+
+    <object 
+        name='inject' 
+        type='Spring.Services.WindowsService.Common.Deploy.FileSystem.Inject' 
+        singleton='false'>
+      <property name='Application'>
+        <ref object='app'/>
+      </property>
+    </object>
+</objects>
+";            
+            XmlObjectFactory factory = new XmlObjectFactory(new InputStreamResource(new MemoryStream(Encoding.Default.GetBytes(inject)), ""));
+            IApplication app = new Application("foo");
+            factory.RegisterSingleton("app", app);
+            Inject injected = (Inject) factory.GetObject("inject");
+            Assert.IsNotNull(injected);
+            Assert.IsNotNull(injected.Application);
+            Assert.AreEqual(app, injected.Application);
+        }
+
+    }
+
+    public class Inject
+    {
+        IApplication application;
+        public IApplication Application
+        {
+            get { return application; }
+            set { application = value; }
+        }
+    }
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/NullSync.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/NullSync.cs
new file mode 100644
index 00000000..c4784416
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/NullSync.cs
@@ -0,0 +1,38 @@
+#region License
+/*
+* Copyright 2002-2004 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 Spring.Threading;
+
+namespace Spring.Services.WindowsService.Common.Deploy
+{
+    internal class NullSync : ISync
+    {
+        public void Acquire ()
+        {
+        }
+
+        public void Release ()
+        {
+        }
+
+        public bool Attempt (long msecs)
+        {
+            return true;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/SpringAssembliesDeployerTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/SpringAssembliesDeployerTest.cs
new file mode 100644
index 00000000..79efc732
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/SpringAssembliesDeployerTest.cs
@@ -0,0 +1,47 @@
+#region License
+/*
+* Copyright 2002-2004 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.IO;
+using NUnit.Framework;
+
+namespace Spring.Services.WindowsService.Common.Deploy
+{
+    [TestFixture]
+	public class SpringAssembliesDeployerTest
+	{
+        [Test]
+		public void RepeatedConfiguresDontAugmentPrivateBinPathList()
+		{
+            IApplication app = new Application("app");
+            SpringAssembliesDeployer deployer = new SpringAssembliesDeployer(String.Empty);
+            deployer.ConfigurePrivateBinForApplication(app);
+            deployer.ConfigurePrivateBinForApplication(app);
+            Assert.AreEqual(2, app.DomainSetup.PrivateBinPath.Split(';').Length);
+		}
+
+        [Test]
+        public void FilterMatchSpringAssembliesSubDir ()
+        {
+            string directory = Path.Combine("c:/", 
+                SpringAssembliesDeployer.PrivateBinPathPrefix + "foo/foo.dll");
+            FileSystemEventArgs args = 
+                new FileSystemEventArgs(WatcherChangeTypes.All, directory, "foo.dll");
+            Assert.IsTrue(SpringAssembliesDeployer.DisallowFilter.Filter(args));
+        }
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/TestingHandler.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/TestingHandler.cs
new file mode 100644
index 00000000..f93c00ef
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/Deploy/TestingHandler.cs
@@ -0,0 +1,63 @@
+#region License
+/*
+* Copyright 2002-2004 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;
+using log4net;
+using Spring.Services.WindowsService.Common.Deploy;
+using Spring.Threading;
+
+namespace Spring.Services.WindowsService.Common.Deploy
+{
+    public class TestingHandler
+    {
+        ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        public ISync sync;
+        public bool applicationAdded = false;
+        public bool applicationRemoved = false;
+        public bool applicationUpdated = false;
+        public bool eventGot = false;
+
+        public TestingHandler (ISync sync)
+        {
+            this.sync = sync;
+        }
+
+        public void Handle (object sender, DeployEventArgs args)
+        {
+            log.Debug(String.Format("handler #{0} application {1}, args.EventType {2}", 
+                GetHashCode(), args.Application.FullPath, args.EventType));
+
+            eventGot = true;
+
+            switch (args.EventType)
+            {
+                case DeployEventType.ApplicationAdded:
+                    applicationAdded = true;
+                    break;
+                case DeployEventType.ApplicationRemoved:
+                    applicationRemoved = true;
+                    break;
+                case DeployEventType.ApplicationUpdated:
+                    applicationUpdated = true;
+                    break;
+            }
+            sync.Release ();
+            log.Debug("sync released");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/Gui/ApplicationMonitorTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/Gui/ApplicationMonitorTest.cs
new file mode 100644
index 00000000..7ffbc974
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/Gui/ApplicationMonitorTest.cs
@@ -0,0 +1,409 @@
+using System;
+using System.Collections;
+using System.Drawing.Imaging;
+using System.Threading;
+using System.Windows.Forms;
+using DotNetMock.Dynamic;
+using NUnit.Extensions.Forms;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+using Spring.Services.WindowsService.Common;
+using Spring.Services.WindowsService.Common.Deploy;
+using Spring.Threading;
+
+namespace Spring.Services.WindowsService.Common.Gui
+{
+    class MockApplication : IApplication
+    {
+        static int count = 0;
+
+        public static void ResetCount()
+        {
+            count = 0;
+        }
+
+        int c;
+
+        public MockApplication()
+        {
+            c = count++;
+        }
+
+        public string Name
+        {
+            get
+            {
+                return "Mock" + c;
+            }
+        }
+
+        public AppDomainSetup DomainSetup
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public string ApplicationBase
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public string FullPath
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public string ServiceXmlFullPath
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public bool IsValid
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public string WatcherXmlFullPath
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public IConfigurableListableObjectFactory ObjectFactory
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public IObjectFactoryPostProcessor ObjectFactoryPostProcessor
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        public string DefaultPrivateBinPath
+        {
+            get { throw new NotImplementedException(); }
+        }
+    }
+
+    class MockService : ISpringService, ISpringServiceFactory
+    {
+        /// <summary>
+        /// Detailed informations about the deployed applications
+        /// </summary>
+        public DeployInformation[] DeployInformations
+        {
+            get
+            {
+                return new DeployInformation[]
+                    {
+                        new DeployInformation(new MockApplication(), DeployStatus.Deployed, null),
+                        new DeployInformation(new MockApplication(), DeployStatus.CannotDeploy, new Exception("fatal")),
+                    };
+            }
+        }
+
+        /// <summary>
+        /// Obtain a reference (possibly remote) to the spring service
+        /// </summary>
+        public ISpringService SpringService
+        {
+            get
+            {
+                return new MockService();
+            }
+        }
+
+        public string ServiceUrl
+        {
+            get { return "mock://mock.rem"; }
+            set {  }
+        }
+
+    }
+
+    class MyListBoxTester : ListBoxTester
+    {
+        public MyListBoxTester(string name, Form form) : base(name, form)
+        {
+        }
+
+        public void SelectByStringExact (string what)
+        {
+            int index = Properties.FindStringExact(what);
+            if (index != -1)
+            {
+                Select(index);
+            }            
+            else
+            {
+                Assert.Fail("listbox " + name + ": text " + what + " not found ");
+            }
+        }
+
+    }
+
+    [TestFixture]
+	public class ApplicationMonitorTest
+	{
+        Form form;
+        ISync started;
+        LabelTester appStatus;
+        MyListBoxTester boxTester;
+        ApplicationMonitor monitor;
+        LabelTester serviceStatus;
+
+        [SetUp]
+        public void SetUp ()
+        {
+            MockApplication.ResetCount();
+            started = new Latch();
+            new Thread(new ThreadStart(Go)).Start();
+            started.Acquire();
+            boxTester = new MyListBoxTester("applicationList", form);
+            appStatus = new LabelTester("applicationStatus", form);
+            serviceStatus = new LabelTester("serviceStatus", form);
+        }
+
+        [TearDown]
+        public void TearDown ()
+        {
+            form.Close();
+        }
+
+        [Test, Explicit]
+        public void Interactive ()
+        {
+            Go();
+        }
+
+        [Test]
+		public void ListsEachApplication()
+		{
+            Assert.AreEqual(2, boxTester.Properties.Items.Count);                
+		}
+
+        [Test]
+        public void AListBoxShowsApplicationNames ()
+        {
+            boxTester.SelectByStringExact("Mock1");
+            Assert.AreEqual("Mock1", boxTester.Properties.Text);                            
+        }
+
+        [Test]
+        public void ShowsApplicationStatus()
+        {
+            boxTester.Select(0);
+            IApplication application = boxTester.Properties.SelectedItem as IApplication;
+            Assert.AreEqual(application.Name + ": deployed", appStatus.Text);
+            Assert.AreEqual("the service seems to run normally, 2 application(s) found", serviceStatus.Text);            
+            ScreenShot ("application deployed status.gif");
+    
+            boxTester.Select(1);
+            application = boxTester.Properties.SelectedItem as IApplication;
+            Assert.AreEqual(application.Name + ": cannot deploy: fatal", appStatus.Text);
+            ScreenShot ("application deploy error status.gif");
+        }
+
+        [Test]
+        public void Updating ()
+        {
+            ButtonTester buttonTester = new ButtonTester("update", form);
+            monitor.ServiceFactory = new StoleScreenShotWhileUpdating(this);
+            buttonTester.Click();
+        }
+
+        private class StoleScreenShotWhileUpdating : ISpringServiceFactory
+        {
+            ApplicationMonitorTest test;
+
+            public StoleScreenShotWhileUpdating (ApplicationMonitorTest test)
+            {
+                this.test = test;
+            }
+
+            public ISpringService SpringService
+            {
+                get
+                {
+                    Assert.AreEqual("updating ...", test.serviceStatus.Text);
+                    test.ScreenShot("updating.gif");
+                    return null;
+                }
+            }
+
+            /// <summary>
+            /// The .NET remoting url for the remote service
+            /// </summary>
+            public string ServiceUrl
+            {
+                get { return ""; }
+                set {  }
+            }
+
+        }
+
+        [Test]
+        public void TheServiceFactoryCanBeSetToNull ()
+        {
+            monitor.ServiceFactory = null;
+            Assert.AreEqual(String.Empty, appStatus.Text);
+            Assert.AreEqual("service not available", serviceStatus.Text);
+        }
+
+        [Test]
+        public void ErrorsWhileGettingTheReferenceToTheServiceAreVisibleToTheUser ()
+        {
+            DynamicMock mockFactory = new DynamicMock(typeof(ISpringServiceFactory));
+            DynamicMock mockService = new DynamicMock(typeof(ISpringService));
+
+            mockService.ExpectAndThrow("DeployInformations", new Exception("this and that"));
+            mockFactory.ExpectAndReturn("SpringService", mockService.Object);
+
+            monitor.ServiceFactory = mockFactory.Object as ISpringServiceFactory;
+            Assert.AreEqual("service not available: this and that", serviceStatus.Text);
+            Assert.AreEqual(String.Empty, appStatus.Text);
+            ScreenShot ("service not available.gif");
+        }
+
+        private void ScreenShot (string name)
+        {
+            monitor.Refresh();
+            AgileDocs.Core.ScreenShot.TakeScreenShot(
+                monitor.Handle.ToInt32(), ImageFormat.Png, name);
+        }
+
+        ListView view;
+
+        [Test, Explicit]
+        public void ListView ()
+        {
+            view = new ListView();
+            view.Dock = DockStyle.Fill;
+            view.FullRowSelect = true;
+            view.MultiSelect = false;
+            view.HeaderStyle = ColumnHeaderStyle.Clickable;
+            view.GridLines = true;
+            view.View = View.Details;
+            view.Sorting = SortOrder.Ascending;
+
+            view.Columns.Add("Name", -1, HorizontalAlignment.Left);
+            view.Columns.Add("Status", -1, HorizontalAlignment.Left);
+
+            view.Items.Add(new ListViewItem(new string[] {"Mock1", "Deployed"}));
+            view.Items.Add(new ListViewItem(new string[] {"Mock2", "Error"}));
+
+            view.ColumnClick += new ColumnClickEventHandler(ColumnClick);
+
+            view.SelectedIndexChanged +=new EventHandler(view_SelectedIndexChanged);
+
+            view.MouseDown += new MouseEventHandler(view_MouseDown);
+
+            form = new Form();
+            form.Controls.Add(view);
+            System.Windows.Forms.Application.Run(form);
+        }
+
+        // Implements the manual sorting of items by columns.
+        class ListViewItemComparer : IComparer 
+        {
+            private int col;
+
+            public ListViewItemComparer() 
+            {
+                col=0;
+            }
+            public ListViewItemComparer(int column) 
+            {
+                col=column;
+            }
+            public int Compare(object x, object y) 
+            {
+                ListViewItem a = x as ListViewItem;
+                ListViewItem b = y as ListViewItem;
+                return String.Compare(a.SubItems[col].Text, b.SubItems[col].Text);
+                //return String.Compare(a.Text, b.Text);
+            }
+        }
+
+        private void ColumnClick(object o, ColumnClickEventArgs e)
+        {            
+            // Set the ListViewItemSorter property to a new ListViewItemComparer object.
+            view.ListViewItemSorter = new ListViewItemComparer(e.Column);
+            // Call the sort method to manually sort the column based on the ListViewItemComparer implementation.
+            view.Sort();
+        }
+
+        private void view_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            ListView v = (ListView) sender;
+            if (v.SelectedIndices.Count > 0)
+            {
+                int index = v.SelectedIndices[0];
+                ListViewItem item = v.Items[index];
+                form.Text = "item: " + item.SubItems[0].Text;
+            }
+        }
+
+        [Test, Explicit]
+        public void CreateMySplitControls()
+        {
+            // Create TreeView, ListView, and Splitter controls.
+            TreeView treeView1 = new TreeView();
+            ListView listView1 = new ListView();
+            Splitter splitter1 = new Splitter();
+
+            // Set the TreeView control to dock to the left side of the form.
+            treeView1.Dock = DockStyle.Left;
+            // Set the Splitter to dock to the left side of the TreeView control.
+            splitter1.Dock = DockStyle.Left;
+            // Set the minimum size the ListView control can be sized to.
+            splitter1.MinExtra = 100;
+            // Set the minimum size the TreeView control can be sized to.
+            splitter1.MinSize = 75;
+            // Set the ListView control to fill the remaining space on the form.
+            listView1.Dock = DockStyle.Fill;
+            // Add a TreeView and a ListView item to identify the controls on the form.
+            treeView1.Nodes.Add("TreeView Node");
+            listView1.Items.Add("ListView Item");
+
+            // Add the controls in reverse order to the form to ensure proper location.
+            form = new Form();
+            form.Controls.AddRange(new Control[]{listView1, splitter1, treeView1});
+            System.Windows.Forms.Application.Run(form);
+        }
+
+        private void Go()
+        {
+            form = new Form();
+            form.Load += new EventHandler(form_Load);
+            monitor = new ApplicationMonitor();
+            monitor.ServiceFactory = new MockService();
+            monitor.Dock = DockStyle.Fill;
+            form.Controls.Add(monitor);
+            System.Windows.Forms.Application.Run(form);
+        }
+
+        private void form_Load(object sender, EventArgs e)
+        {
+            started.Release();
+        }
+
+        ContextMenu menu = null;
+        private void view_MouseDown(object sender, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Right)
+            {
+                ListView v = sender as ListView;
+                v.ContextMenu = null;
+                ListViewItem itemAt = v.GetItemAt(e.X,  e.Y);
+                if (itemAt == null)
+                {
+                    return;
+                }
+                itemAt.Selected = true;
+                menu = new ContextMenu();
+                menu.MenuItems.Add("one");
+                menu.MenuItems.Add("two");
+                v.ContextMenu = menu;
+            }
+        }
+    }
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/LocalizerTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/LocalizerTest.cs
new file mode 100644
index 00000000..b4ef5e41
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/LocalizerTest.cs
@@ -0,0 +1,57 @@
+using System;
+using NUnit.Framework;
+
+namespace Spring.Services.WindowsService.Common
+{
+    [TestFixture]
+	public class Localizer_ForProcessTest
+	{
+        [Test]
+        public void ByDefaultIgnoreUnresolvablePlaceholders ()
+        {
+            Assert.IsTrue(new Localizer.ForProcess().IgnoreUnresolvablePlaceholders);
+        }
+
+        [Test]
+		public void YouCanDefineACustomPrefix()
+		{
+            string prefix = Guid.NewGuid().ToString();
+
+            Localizer.ForProcess localizer = new Localizer.ForProcess();
+
+            Assert.AreEqual(Localizer.DefaultPrefix, localizer.Prefix);
+            
+            localizer.Prefix = prefix;
+            foreach (string property in localizer.Properties)
+            {
+                Assert.IsTrue(property.StartsWith(prefix));
+            }
+		}
+	}
+
+    [TestFixture]
+	public class Localizer_ForApplicationTest
+	{
+        [Test]
+        public void ByDefaultIgnoreUnresolvablePlaceholders ()
+        {
+            Assert.IsTrue(new Localizer.ForApplication().IgnoreUnresolvablePlaceholders);
+        }
+
+        [Test]
+		public void YouCanDefineACustomPrefix()
+		{
+            string prefix = "FOO";
+
+            Localizer.ForApplication localizer = new Localizer.ForApplication();
+
+            Assert.AreEqual(Localizer.DefaultPrefix, localizer.Prefix);
+
+            localizer.Prefix = prefix;
+            foreach (string property in localizer.Properties)
+            {
+                Assert.IsTrue(property.StartsWith(prefix));
+            }
+        }
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/ServiceSupportTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/ServiceSupportTest.cs
new file mode 100644
index 00000000..2776c0d5
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/ServiceSupportTest.cs
@@ -0,0 +1,217 @@
+#region License
+/*
+* Copyright 2002-2004 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;
+using System.Threading;
+using log4net;
+using NUnit.Framework;
+using Spring.Threading;
+
+namespace Spring.Services.WindowsService.Common
+{
+    class StoppingHelper
+    {
+        private readonly ServiceSupport serviceSupport;
+        private readonly ISync stopping;
+        private readonly ISync stopped;
+        public bool wasStopped = false;
+
+        public StoppingHelper (ServiceSupport serviceSupport, ISync stopping, ISync stopped)
+        {
+            this.stopping = stopping;
+            this.stopped = stopped;
+            this.serviceSupport = serviceSupport;
+        }
+
+        public void Stop ()
+        {
+            ServiceSupportTest.Log ("stopping ...");
+            stopping.Release();
+            ServiceSupportTest.Log ("stopping sync released ...");
+            serviceSupport.Stop(true);
+            wasStopped = true;
+            ServiceSupportTest.Log ("releasing stopped sync ...");
+            stopped.Release();
+            ServiceSupportTest.Log ("stopped ...");
+        }
+    }
+
+    class BlockWhileStartingExecutor : IExecutor
+    {
+        private readonly ISync started;
+        private readonly ISync starting;
+        MyServiceSupport serviceSupport;
+        public bool wasStarted = false;
+
+        public BlockWhileStartingExecutor (ISync starting, ISync started)
+        {
+            this.starting = starting;
+            this.started = started;
+        }
+
+        public MyServiceSupport ServiceSupport
+        {
+            get { return serviceSupport; }
+            set { serviceSupport = value; }
+        }
+
+        public void Start ()
+        {
+            serviceSupport.Start(true);
+        }
+
+        public void Execute (IRunnable runnable)
+        {            
+            if (runnable == serviceSupport.StartedCommand)
+            {
+                ServiceSupportTest.Log ("waiting to start ...");
+                starting.Acquire();
+                ServiceSupportTest.Log ("starting ...");
+                runnable.Run();
+                wasStarted = true;
+                ServiceSupportTest.Log ("releasing started sync ...");
+                started.Release();
+                ServiceSupportTest.Log ("started ...");
+            }
+            else
+            {
+                ServiceSupportTest.Log ("unexpected runnable: " + runnable);
+                runnable.Run();
+            }
+        }
+    }
+
+    class MyServiceSupport : ServiceSupport 
+    {
+        public MyServiceSupport(IExecutor executor, IServiceable serviceable) : base(executor, serviceable)
+        {
+        }
+
+        public IRunnable StartedCommand
+        {
+            get
+            {
+                return base.startedCommand;
+            }
+        }
+
+        
+    }
+
+    class MyService : ServiceSupport.IServiceable
+    {
+        ISync _sync1;
+        ISync _sync2;
+
+        public MyService (ISync sync1, ISync sync2)
+        {
+            this._sync1 = sync1;
+            this._sync2 = sync2;
+        }
+        public void PerformStart ()
+        {
+        }
+
+        public void PerformStop ()
+        {
+        }
+
+        public void Dispose ()
+        {
+            lock (this)
+            {
+                _sync1.Release();
+                _sync2.Acquire();
+            }
+        }
+    }
+
+    [TestFixture]
+	public class ServiceSupportTest
+	{
+        MyService serviceable;
+        ServiceSupport serviceSupport;
+        ISync sync1;
+        ISync sync2;
+
+        static ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        [SetUp]
+        public void SetUp ()
+        {
+            sync1 = new Semaphore(0);
+            sync2 = new Semaphore(0);
+            serviceable = new MyService(sync1, sync2);
+            serviceSupport = new ServiceSupport(serviceable);
+        }
+
+        [Test(Description="Bugfix")] 
+        public void DoesNotLockTheServiceableWhenQueryingForStatus()
+        {
+            new Thread(new ThreadStart(serviceable.Dispose)).Start();
+            sync1.Acquire();
+            Assert.IsFalse(serviceSupport.StopRequested);
+            sync2.Release();
+        }
+
+        [Test]
+        public void WaitForStartedBeforeStopping()
+        {
+            MyService serviceable = new MyService(sync1, sync2);
+            ISync starting = new Latch();
+            ISync started = new Latch();
+            BlockWhileStartingExecutor executor = 
+                new BlockWhileStartingExecutor(starting, started);
+            MyServiceSupport support = new MyServiceSupport(executor, serviceable);
+            executor.ServiceSupport = support;
+            Thread startThread = new Thread(new ThreadStart(executor.Start));
+            startThread.Name = "start";
+            startThread.Start();
+            Log ("start thread started");
+            Latch stopping = new Latch();
+            Latch stopped = new Latch();
+            StoppingHelper helper = new StoppingHelper(support, stopping, stopped);
+            Thread stopThread = new Thread(new ThreadStart(helper.Stop));
+            stopThread.Name = "stop";
+            stopThread.Start();
+            Log ("stop thread started: waiting for stopping ...");
+            stopping.Acquire();
+            Log ("stopping in progress ...");
+            Assert.IsFalse(executor.wasStarted);
+            Assert.IsFalse(helper.wasStopped, "helper could stop before expected");
+            Log ("allow to start ...");
+            starting.Release();
+            Log ("waiting for started ...");
+            started.Acquire();
+            Assert.IsTrue(executor.wasStarted);
+            stopped.Acquire();
+            Log ("waiting for stop ...");
+            Assert.IsTrue(helper.wasStopped);
+            Log ("stopped ...");
+        }
+
+        public static void Log (string msg)
+        {
+            Thread currentThread = Thread.CurrentThread;
+            string message = String.Format("thread [#{1}-{2}], msg = {0}", msg, currentThread.GetHashCode(), currentThread.Name);
+            log.Debug(message);
+            Console.Out.WriteLine (message);
+        }
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Common/UtilsTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/Common/UtilsTest.cs
new file mode 100644
index 00000000..dbab9969
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Common/UtilsTest.cs
@@ -0,0 +1,36 @@
+#region License
+/*
+* Copyright 2002-2004 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 NUnit.Framework;
+
+namespace Spring.Services.WindowsService.Common
+{
+    [TestFixture]
+	public class UtilsTest
+	{
+        [Test]
+        public void CanBeUsedToCheckOnePathIsChildOfAnotherOne ()
+        {
+            Assert.IsTrue(Utils.AreParentAndChild(@"c:\parent", @"c:\parent\child"));
+            Assert.IsTrue(Utils.AreParentAndChild(@"parent", @"parent\child"));
+            Assert.IsTrue(Utils.AreParentAndChild(@"\\server\share", @"\\server\share\app"));
+            Assert.IsTrue(Utils.AreParentAndChild(@"c:\parent", @"c:\parent\child\foo.bar"));
+            Assert.IsFalse(Utils.AreParentAndChild(@"c:\parent", @"c:\parent2"));
+            Assert.IsFalse(Utils.AreParentAndChild(@"c:\parent", @"d:\parent\child"));
+        }
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/IntegrationTest.cs b/test/Spring/Spring.Services.Tests/WindowsService/IntegrationTest.cs
new file mode 100644
index 00000000..9640fc59
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/IntegrationTest.cs
@@ -0,0 +1,184 @@
+#region License
+/*
+* Copyright 2002-2004 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.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Reflection;
+using System.Threading;
+using NUnit.Framework;
+using Spring.Services.WindowsService.Common;
+using Spring.Services.WindowsService.Common.Deploy;
+using Spring.Services.WindowsService.Common.Deploy.FileSystem;
+using Spring.Threading;
+using Spring.Util;
+
+namespace Spring.Services.WindowsService
+{
+    [TestFixture]	
+    public class IntegrationTest
+	{
+        public class SyncedDeployer : IDeployer
+        {
+            private readonly ISync sync;
+            IDeployer helper = new DefaultDeployer(new SeparateAppDomainHostManager());
+            private Exception ex;
+
+            public SyncedDeployer(ISync sync)
+            {
+                this.sync = sync;
+            }
+
+            public void Deploy(IApplication application)
+            {
+                try
+                {
+                    helper.Deploy(application);
+                }
+                catch (Exception e)
+                {
+                    ex = e;
+                    sync.Release();
+                }
+                sync.Release();
+            }
+
+            public void UnDeploy(IApplication application)
+            {
+                helper.UnDeploy(application);
+            }
+
+            public void Dispose()
+            {
+                helper.Dispose();
+            }
+
+            public Exception Ex
+            {
+                get { return ex; }
+            }
+        }
+
+        DeployManager deployManager;
+        ISpringAssembliesDeployer springAssembliesDeployer;
+        FileSystemDeployLocation location;
+        SyncedDeployer defaultDeployer;
+        string deployPath = String.Format("deploy-{0}", Guid.NewGuid());
+        string baseOfConfigFiles = "Data/Spring/WindowsService";
+        Latch sync;
+
+        [SetUp]
+        public void SetUp ()
+        {
+            springAssembliesDeployer = new SpringAssembliesDeployer(".");
+            location = new FileSystemDeployLocation(deployPath);
+            location.StartWatching();
+            sync = new Latch();
+            defaultDeployer = new SyncedDeployer(sync);
+            deployManager = new DeployManager(springAssembliesDeployer, location, defaultDeployer);
+
+            deployManager.Start();
+        }
+
+        [TearDown]
+        public void TearDown ()
+        {
+            if (defaultDeployer.Ex != null)
+            {
+                Console.Out.WriteLine("defaultDeployer exception = {0}", defaultDeployer.Ex);
+            }
+            deployManager.Stop();
+            location.Dispose();
+            TestUtils.SafeDeleteDirectory(deployPath, 25);
+        }
+
+        [Test(Description="Any PropertyPlaceholderConfigurer in context will apply")]         
+        public void ServiceContextCanSpecifyAPropertyPlaceholderConfigurer ()
+        {
+            Deploy("Echo");
+
+            // test echo server just deployed
+            using (TcpClient client = new TcpClient())
+            {
+                client.Connect(IPAddress.Loopback, 10);
+                using (NetworkStream networkStream = client.GetStream())
+                {
+                    string guid = Guid.NewGuid().ToString();
+                    Receive(networkStream);
+                    Send (networkStream, guid);
+                    String responseData = Receive (networkStream);
+                    Assert.IsTrue(responseData.IndexOf(guid) != -1);
+                }
+            }            
+        }
+
+        [Test()]         
+        public void DeployPathAndDeployNameAreAvailableToTheApplication ()
+        {
+            string where = Deploy ("Simple");
+
+            using (TextReader reader = File.OpenText(Path.Combine(where, "simple.txt")))
+            {
+                string name = "simple";
+                string fullPath = Path.GetFullPath(where).ToLower();
+                Assert.AreEqual(name, reader.ReadLine());
+                Assert.AreEqual(fullPath, reader.ReadLine().ToLower());
+                Assert.AreEqual(String.Format("{0},{1}", name, fullPath), reader.ReadLine().ToLower(), "failed to configure in ctor");
+            }
+        }
+
+        private string Deploy(string app)
+        {
+            string src = Path.Combine(baseOfConfigFiles, app);
+            string dest = Path.Combine(deployPath, app);
+            Directory.CreateDirectory(dest);
+            string[] files = Directory.GetFiles(src);
+            foreach(string file in files)
+            {
+                File.Copy(
+                    file, 
+                    Path.Combine(dest, Path.GetFileName(file)));
+            }
+            // create new application
+            string fileName = Assembly.GetExecutingAssembly().Location;
+            File.Copy(fileName, 
+                      Path.Combine(dest, Path.GetFileName(fileName)));
+
+            Assert.IsTrue(sync.Attempt(20 * 1000), "Timeout expired");
+
+            return dest;
+        }
+
+        private string Receive(Stream stream)
+        {
+            byte [] data = new byte[1024];
+            String responseData = String.Empty;
+            Int32 bytes = stream.Read(data, 0, data.Length);
+            responseData = System.Text.Encoding.ASCII.GetString(data, 0, bytes);
+            Console.WriteLine("Received: [{0}]", responseData);
+            return responseData;
+        }
+
+        private void Send(Stream stream, string message)
+        {
+            byte [] data = System.Text.Encoding.ASCII.GetBytes(message + Environment.NewLine);         
+            stream.Write(data, 0, data.Length);
+        }
+	}
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Samples/ASMXExecutor.cs b/test/Spring/Spring.Services.Tests/WindowsService/Samples/ASMXExecutor.cs
new file mode 100644
index 00000000..54d05331
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Samples/ASMXExecutor.cs
@@ -0,0 +1,147 @@
+using System;
+using System.Globalization;
+using System.IO;
+using System.Runtime.Remoting;
+using System.Web;
+using System.Web.Hosting;
+
+namespace Spring.Service.Sample
+{
+    public class SoapWorkerRequest : SimpleWorkerRequest
+    {
+        private string soapstr;
+        private string soapAction;
+
+        public SoapWorkerRequest (string page, string soapstr,
+                                  string soapAction, TextWriter output) : base (page, null, output)
+        {
+            this.soapstr = soapstr;
+            this.soapAction = soapAction;
+        }
+
+        public override string GetHttpVerbName ()
+        {
+            return "POST";
+        }
+
+        public override int ReadEntityBody (byte[] buffer, int size)
+        {
+            char[] chars = soapstr.ToCharArray ();
+            for (int i = 0; i < chars.Length; i++)
+                buffer [i] = (byte) chars [i];
+            return chars.Length;
+        }
+
+        public override string GetKnownRequestHeader (int index)
+        {
+            string retval;
+            switch (index)
+            {
+                case 11:
+                    retval = String.Format ("{0}", soapstr.Length);
+                    break;
+                case 12:
+                    retval = "text/xml; charset=utf-8";
+                    break;
+                default:
+                    retval = null;
+                    break;
+            }
+            return retval;
+        }
+
+        public override string[][] GetUnknownRequestHeaders ()
+        {
+            string[] vals = {"SOAPAction", soapAction};
+            string[][] namesvals = {vals};
+            return namesvals;
+        }
+
+        public override string MapPath (string path)
+        {
+            if (path == GetFilePath ())
+                return GetFilePathTranslated ();
+            return base.MapPath (path);
+        }
+    }
+
+    public class MyExeHost : MarshalByRefObject
+    {
+        public void ProcessRequest (String page, string soapmsg, string soapAction)
+        {
+            HttpWorkerRequest hwr =
+                new SoapWorkerRequest (page, soapmsg, soapAction, Console.Out);
+            HttpRuntime.ProcessRequest (hwr);
+        }
+    }
+
+    internal class MyAspHost
+    {
+        public static object CreateApplicationHost (Type hostType,
+                                                    string virtualDir, string physicalDir)
+        {
+            if (!(physicalDir.EndsWith ("\\")))
+                physicalDir = physicalDir + "\\";
+            string aspDir = HttpRuntime.AspInstallDirectory;
+            string domainId = DateTime.Now.ToString (
+                DateTimeFormatInfo.InvariantInfo).GetHashCode ().ToString ("x");
+            string appName = (virtualDir + physicalDir).GetHashCode ().ToString ("x");
+            AppDomainSetup setup = new AppDomainSetup ();
+            setup.ApplicationName = appName;
+            setup.ConfigurationFile = "web.config";
+            AppDomain ad = AppDomain.CreateDomain (domainId, null, setup);
+            ad.SetData (".appDomain", "*");
+            ad.SetData (".appPath", physicalDir);
+            ad.SetData (".appVPath", virtualDir);
+            ad.SetData (".domainId", domainId);
+            ad.SetData (".hostingVirtualPath", virtualDir);
+            ad.SetData (".hostingInstallDir", aspDir);
+            ObjectHandle oh = ad.CreateInstance (hostType.Module.Assembly.FullName,
+                                                 hostType.FullName);
+            return oh.Unwrap ();
+        }
+
+        private static void Main (string[] args)
+        {
+            MyExeHost myHost = (MyExeHost) CreateApplicationHost (typeof (MyExeHost),
+                                                                  "/", Directory.GetCurrentDirectory ());
+            myHost.ProcessRequest (args [0], Console.In.ReadToEnd (), args [1]);
+        }
+    }
+}
+
+//To compile the program, open a Visual Studio .NET command prompt (or any other command prompt session with the C# compiler in the path) and run this command:
+//csc /t:exe /r:System.Web.dll WsHostTest.cs
+//Put the exe file in a directory with an ASMX file. Here’s the simple file I’ve used in my tests:
+//<%@ WebService Language="C#" Debug="true" Class="foo" %>
+//using System.Web.Services;
+//
+//
+//public class foo
+//{
+//    [WebMethod()]
+//    public string echo(string input)
+//    {
+//        return input;
+//    }
+//}
+//
+//I also created a file with the SOAP message I wanted to use as input for the program. Here is the contents of this file:
+//
+//<?xml version="1.0" encoding="utf-8"?>
+//<?xml version="1.0" encoding="utf-8"?>
+//<soap:Envelope
+//xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+//xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+//xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+//<soap:Body>
+//<echo xmlns="http://tempuri.org/">
+//<input>Howdy</input>
+//</echo>
+//</soap:Body>
+//</soap:Envelope>
+//</pre>
+//
+//To call the program, I entered this command line:
+//
+//WsHostTest echo.asmx http://tempuri.org/echo <soaptext.txt
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Samples/Echo/Echo.cs b/test/Spring/Spring.Services.Tests/WindowsService/Samples/Echo/Echo.cs
new file mode 100644
index 00000000..cb58567b
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Samples/Echo/Echo.cs
@@ -0,0 +1,87 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Reflection;
+using System.Threading;
+using log4net;
+          
+namespace Spring.Services.WindowsService.Samples
+{
+    public class Echo
+    {
+        private int port = 10;
+        private TcpListener tcpListener;
+        ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private Thread thread;
+
+        public int Port
+        {
+            set { port = value; }
+        }
+
+        public void Stop ()
+        {
+            if (!tcpListener.Pending())
+                tcpListener.Stop();
+        }
+
+        public void Start ()
+        {
+            log.Info("starting echo server");
+            tcpListener = new TcpListener (IPAddress.Loopback, port);
+            ThreadStart start = new ThreadStart(Run);
+            thread = new Thread(start);
+            thread.Start();
+        }
+
+        private void Run ()
+        {
+            log.Info("echo server running ");
+            tcpListener.Start ();
+    
+            while (true)
+            {
+//                if (!tcpListener.Pending())
+//                {
+//                    Thread.SpinWait(1 / 2 * 1000);
+//                    continue;                    
+//                }
+                Socket socketForClient;
+                try
+                {
+                    socketForClient = tcpListener.AcceptSocket ();
+                }
+                catch
+                {
+                    break;
+                }
+
+                if (socketForClient.Connected)
+                {
+                    log.Info ("Client connected");
+                    NetworkStream networkStream = new NetworkStream (socketForClient);
+                    StreamWriter streamWriter =
+                        new StreamWriter (networkStream);
+
+                    StreamReader streamReader =
+                        new StreamReader (networkStream);
+
+                    string theString = "Welcome, type something";
+
+                    streamWriter.WriteLine (theString);
+                    streamWriter.Flush ();
+                    theString = streamReader.ReadLine ();
+                    streamWriter.WriteLine ("You typed: " + theString);
+                    streamWriter.Flush ();
+
+                    log.Info("From client: " + theString);
+                    streamReader.Close ();
+                    networkStream.Close ();
+                    streamWriter.Close ();
+                }
+                socketForClient.Close ();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Samples/Simple.cs b/test/Spring/Spring.Services.Tests/WindowsService/Samples/Simple.cs
new file mode 100644
index 00000000..6a0b5ff2
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Samples/Simple.cs
@@ -0,0 +1,117 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Reflection;
+using System.Threading;
+using log4net;
+
+namespace Spring.Services.WindowsService.Samples
+{
+    public class Simple
+    {
+        string appName, appFullPath;
+        ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public void Start ()
+        {
+            if (log.IsDebugEnabled)
+            {
+                log.Debug (String.Format ("appName = {0}", appName));
+                log.Debug (String.Format ("appFullName = {0}", appFullPath));
+            }
+        }
+
+        public void Stop ()
+        {
+        }
+
+        public string AppName
+        {
+            get { return appName; }
+            set { appName = value; }
+        }
+        public string AppFullPath
+        {
+            get { return appFullPath; }
+            set { appFullPath = value; }
+        }
+    }
+
+    public class Echo
+    {
+        private int port = 10;
+        private TcpListener tcpListener;
+        ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private Thread thread;
+
+        public int Port
+        {
+            set { port = value; }
+        }
+
+        public void Stop ()
+        {
+            if (!tcpListener.Pending())
+                tcpListener.Stop();
+        }
+
+        public void Start ()
+        {
+            log.Info("starting echo server");
+            tcpListener = new TcpListener (IPAddress.Loopback, port);
+            ThreadStart start = new ThreadStart(Run);
+            thread = new Thread(start);
+            thread.Start();
+        }
+
+        private void Run ()
+        {
+            log.Info("echo server running ");
+            tcpListener.Start ();
+    
+            while (true)
+            {
+//                if (!tcpListener.Pending())
+//                {
+//                    Thread.SpinWait(1 / 2 * 1000);
+//                    continue;                    
+//                }
+                Socket socketForClient;
+                try
+                {
+                    socketForClient = tcpListener.AcceptSocket ();
+                }
+                catch
+                {
+                    break;
+                }
+
+                if (socketForClient.Connected)
+                {
+                    log.Info ("Client connected");
+                    NetworkStream networkStream = new NetworkStream (socketForClient);
+                    StreamWriter streamWriter =
+                        new StreamWriter (networkStream);
+
+                    StreamReader streamReader =
+                        new StreamReader (networkStream);
+
+                    string theString = "Welcome, type something";
+
+                    streamWriter.WriteLine (theString);
+                    streamWriter.Flush ();
+                    theString = streamReader.ReadLine ();
+                    streamWriter.WriteLine ("You typed: " + theString);
+                    streamWriter.Flush ();
+
+                    log.Info("From client: " + theString);
+                    streamReader.Close ();
+                    networkStream.Close ();
+                    streamWriter.Close ();
+                }
+                socketForClient.Close ();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Samples/Simple/Simple.cs b/test/Spring/Spring.Services.Tests/WindowsService/Samples/Simple/Simple.cs
new file mode 100644
index 00000000..65db0f6b
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Samples/Simple/Simple.cs
@@ -0,0 +1,41 @@
+using System.IO;
+using Spring.Core.IO;
+
+namespace Spring.Services.WindowsService.Samples
+{
+    public class Simple
+    {
+        private readonly string both;
+        string appName, appFullPath;
+
+        public Simple(string both)
+        {
+            this.both = both;
+        }
+
+        public void Start ()
+        {
+            using (TextWriter writer = File.CreateText(new FileSystemResource("~/simple.txt").File.FullName))
+            {
+                writer.WriteLine(AppName);
+                writer.WriteLine(AppFullPath);
+                writer.WriteLine(both);
+            }
+        }
+
+        public void Stop ()
+        {
+        }
+
+        public string AppName
+        {
+            get { return appName; }
+            set { appName = value; }
+        }
+        public string AppFullPath
+        {
+            get { return appFullPath; }
+            set { appFullPath = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Samples/echo.asmx b/test/Spring/Spring.Services.Tests/WindowsService/Samples/echo.asmx
new file mode 100644
index 00000000..d4478aa4
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Samples/echo.asmx
@@ -0,0 +1,12 @@
+<%@ WebService Language="C#" Debug="true" Class="foo" %>
+using System.Web.Services;
+
+
+public class foo
+{
+    [WebMethod()]
+    public string echo(string input)
+    {
+        return input;
+    }
+}
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Samples/service.config b/test/Spring/Spring.Services.Tests/WindowsService/Samples/service.config
new file mode 100644
index 00000000..9fe17e53
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Samples/service.config
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
+  </configSections>
+  <appSettings>
+    <!--
+    <add key="log4net.configuration.file" value="log4net.xml"/>
+    -->
+  </appSettings>
+  <log4net>
+    <!-- http://logging.apache.org/log4net/release/manual/introduction.html#HC-22669032 -->
+    <appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
+      <file value="../sample.log" />
+      <appendToFile value="true" />
+      <maximumFileSize value="100KB" />
+      <maxSizeRollBackups value="2" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%d [%t] %l - %m%n" />
+      </layout>
+    </appender>
+    <appender name="ColoredConsoleAppender" type="log4net.Appender.ColoredConsoleAppender">
+      <!--
+	    <mapping>
+		    <level value="ERROR" />
+		    <foreColor value="RED" />
+		    <level value="INFO" />
+		    <foreColor value="Green" />
+	    </mapping>
+	    -->
+      <threshold value="INFO"/>
+	    <layout type="log4net.Layout.PatternLayout">
+		    <conversionPattern value="%d{HH:mm:ss,fff} %-5p %c{2}(line:%L) - %m%n" />
+	    </layout>
+    </appender>
+    <appender name="OutputDebugString" type="log4net.Appender.OutputDebugStringAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <!-- <conversionPattern value="%t %l - %m%n" /> -->
+        <conversionPattern value="%d{HH:mm:ss,fff} %-5p %c{2}(line:%L) - %m%n" />
+      </layout>
+    </appender>
+    <root>
+      <level value="OFF" />
+      <appender-ref ref="RollingFile" />
+      <appender-ref ref="OutputDebugString" />
+      <appender-ref ref="ColoredConsoleAppender" />      
+    </root>
+	  <logger name="Spring.Services.WindowsService.Samples">
+		  <level value="ALL" />
+	  </logger>
+  </log4net>
+</configuration>
\ No newline at end of file
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Samples/service.xml b/test/Spring/Spring.Services.Tests/WindowsService/Samples/service.xml
new file mode 100644
index 00000000..0dc767bd
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Samples/service.xml
@@ -0,0 +1,20 @@
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+    <object name="simple" 
+      type="Spring.Services.WindowsService.Samples.Simple, Spring.Services.WindowsService.Samples" 
+      init-method="Start" destroy-method="Stop">
+      <property name="AppName">
+        <value>${spring.services.application.name}</value>
+      </property>
+      <property name="AppFullPath">
+        <value>${spring.services.application.fullpath}</value>
+      </property>
+    </object>
+
+    <object name="echo" 
+      type="Spring.Services.WindowsService.Samples.Echo, Spring.Services.WindowsService.Samples" 
+      init-method="Start" destroy-method="Stop">
+      <property name="port"><value>10</value></property>
+    </object>
+</objects>
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/Samples/watcher.xml b/test/Spring/Spring.Services.Tests/WindowsService/Samples/watcher.xml
new file mode 100644
index 00000000..4915add3
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/Samples/watcher.xml
@@ -0,0 +1,16 @@
+<objects xmlns="http://www.springframework.net" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
+    <object name='watcher' type='Spring.Services.WindowsService.Common.Deploy.FileSystem.FileSystemApplicationWatcher' singleton='false'>
+      <constructor-arg><ref object='.injected.application'/></constructor-arg>
+      <constructor-arg><ref object='configurer'/></constructor-arg>
+    </object>
+
+    <object name='configurer' type='Spring.Services.WindowsService.Common.Deploy.FileSystem.RegularExpressionFilterConfigurer' singleton='false'>
+        <property name='includes'>
+        <list>
+          <value>**/**</value>
+        </list>
+      </property>
+    </object>
+</objects>
diff --git a/test/Spring/Spring.Services.Tests/WindowsService/TestUtils.cs b/test/Spring/Spring.Services.Tests/WindowsService/TestUtils.cs
new file mode 100644
index 00000000..e8d1c2f5
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/WindowsService/TestUtils.cs
@@ -0,0 +1,123 @@
+#region License
+
+/*
+* Copyright 2002-2004 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.IO;
+using System.Threading;
+using log4net.Config;
+using Spring.Core.IO;
+
+namespace Spring.Services.WindowsService
+{
+    public class TestUtils
+    {
+        public static void ConfigureLog4Net()
+        {
+            AssemblyResource resource =
+                new AssemblyResource("assembly://Spring.Services.WindowsService.Tests/Spring.Services/tests.config");
+            XmlConfigurator.Configure(resource.InputStream);
+        }
+
+        public static void SafeDeleteFile (string file)
+        {
+            while(File.Exists(file))
+            {
+                try
+                {
+                    File.Delete(file);
+                } 
+                catch
+                {                    
+                    Thread.Sleep(100);
+                }
+            }
+        }
+
+        public static void SafeDeleteFile (string file, int maxTimes)
+        {
+            int times = 0;
+            while(File.Exists(file))
+            {
+                try
+                {
+                    File.Delete(file);
+                } 
+                catch
+                {                    
+                    if (++times > maxTimes)
+                    {
+                        return;
+                    }
+                    Thread.Sleep(100);
+                }
+            }
+        }
+
+        public static void SafeDeleteDirectory (string directory)
+        {
+            while(Directory.Exists(directory))
+            {
+                try
+                {
+                    Directory.Delete(directory, true);
+                } 
+                catch
+                {                    
+                    Thread.Sleep(100);
+                }
+            }
+        }
+
+        public static void SafeDeleteDirectory (string directory, int maxTimes)
+        {
+            int times = 0;
+            while(Directory.Exists(directory))
+            {
+                try
+                {
+                    Directory.Delete(directory, true);
+                } 
+                catch
+                {   
+                    if (++times > maxTimes)
+                    {
+                        return;
+                    }
+                    Thread.Sleep(100);
+                }
+            }
+        }
+
+        public static void SafeCopyFile (string filePath, string destPath, bool overWrite)
+        {
+            while(true)
+            {
+                try
+                {
+                    File.Copy(filePath, destPath, overWrite);
+                    return;
+                } 
+                catch
+                {                    
+                    Thread.Sleep(100);
+                }
+            }
+        }
+    }
+}
diff --git a/test/Spring/Spring.Services.Tests/tests.config b/test/Spring/Spring.Services.Tests/tests.config
new file mode 100644
index 00000000..458e5c84
--- /dev/null
+++ b/test/Spring/Spring.Services.Tests/tests.config
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<configSections>
+		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
+	</configSections>
+	<log4net>
+    <appender name="UdpAppender" type="log4net.Appender.UdpAppender">
+        <param name="RemoteAddress" value="127.0.0.1" />
+        <param name="RemotePort" value="8080" />
+        <layout type="log4net.Layout.XmlLayout">
+            <param name="Prefix" value="" /> 
+        </layout>
+    </appender>
+		<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+			<layout type="log4net.Layout.PatternLayout">
+				<param name="ConversionPattern" value="%d [%t] %-5p %c{1} - %m%n" />
+			</layout>
+		</appender>
+		<appender name="FileAppender" type="log4net.Appender.RollingFileAppender">
+			<file value="tests.log" />
+			<appendToFile value="true" />
+			<maximumFileSize value="1024KB" />
+			<maxSizeRollBackups value="4" />
+			<layout type="log4net.Layout.PatternLayout">
+				<param name="ConversionPattern" value="%d [%t] %-5p %c{1} [%x] - %m%n" />
+			</layout>
+		</appender>
+    <appender name="OutputDebugString" type="log4net.Appender.OutputDebugStringAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <!-- <conversionPattern value="%t %l - %m%n" /> -->
+        <conversionPattern value="%d{HH:mm:ss,fff} %-5p %c{2}(line:%L) - %m%n" />
+      </layout>
+    </appender>
+		<root>
+			<level value="ALL" />
+			<!-- <appender-ref ref="ConsoleAppender" /> -->
+			<appender-ref ref="FileAppender" />
+      <appender-ref ref="OutputDebugString" />
+      <appender-ref ref="UdpAppender" />
+		</root>
+		<!--
+	  <logger name="Spring.Services">
+		  <level value="ALL" />
+      <appender-ref ref="OutputDebugString" />
+	  </logger>	  
+	  -->
+	</log4net>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
+				<bindingRedirect oldVersion="2.0.6.0" newVersion="2.1.4.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/AssemblyInfo.cs b/test/Spring/Spring.Testing.NUnit.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..145f4d0a
--- /dev/null
+++ b/test/Spring/Spring.Testing.NUnit.Tests/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("Spring.Testing.NUnit Tests")]
+[assembly: AssemblyDescription("Unit tests for Spring.Testing.NUnit assembly")]
\ No newline at end of file
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2003.csproj b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2003.csproj
new file mode 100644
index 00000000..ab14073a
--- /dev/null
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2003.csproj
@@ -0,0 +1,133 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{E2689B4A-A951-420E-A274-BE5EBCD5F8D8}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Testing.NUnit.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = 'echo "Copying .xml files for tests"&#xd;&#xa;xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2003\$(TargetName)\$(ConfigurationName)\ /y /s /q /d&#xd;&#xa;copy  "$(ProjectDir)$(TargetFileName).config" ..\..\..\..\build\VS.Net.2003\$(TargetName)\$(ConfigurationName)\$(TargetFileName).config'
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "OnBuildSuccess"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Testing.NUnit.Tests\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Testing.NUnit.Tests\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "Spring.Testing.NUnit.2003"
+                    Project = "{6B8639E3-88BB-4F7B-9F23-699E84C30D58}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\Net\1.1\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "Spring.Data.Tests.2003"
+                    Project = "{C5585365-561C-4EC4-8956-87FFBD9AB1CD}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Testing.NUnit.Tests.dll.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Testing\NUnit\BaseTestAppContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Testing\NUnit\CachedAppContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Testing\NUnit\TestApplicationContext.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Testing\NUnit\AnotherTest\LoadAppContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2005.csproj b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2005.csproj
new file mode 100644
index 00000000..36d8f0cf
--- /dev/null
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2005.csproj
@@ -0,0 +1,89 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4D6D616B-7643-4D6B-8E5E-14ECFDB9AF82}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Spring</RootNamespace>
+    <AssemblyName>Spring.Testing.NUnit.Tests</AssemblyName>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Testing.NUnit.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Testing.NUnit.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Testing\NUnit\BaseTestAppContextTests.cs" />
+    <Compile Include="Testing\NUnit\AnotherTest\LoadAppContextTests.cs" />
+    <Compile Include="Testing\NUnit\CachedAppContextTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Data\Spring.Data.2005.csproj">
+      <Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
+      <Name>Spring.Data.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Testing.NUnit\Spring.Testing.NUnit.2005.csproj">
+      <Project>{ED204A7B-832F-44C7-BFE3-504AEBE1BCC8}</Project>
+      <Name>Spring.Testing.NUnit.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2005.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Data.Tests\Spring.Data.Tests.2005.csproj">
+      <Project>{ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0}</Project>
+      <Name>Spring.Data.Tests.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Testing\NUnit\TestApplicationContext.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Spring.Testing.NUnit.Tests.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build
new file mode 100644
index 00000000..b720384b
--- /dev/null
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<project name="Spring.Testing.NUnit.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
+<!--
+    Required properties:
+      * current.bin.dir           - (path) root level to build to
+      * current.build.debug       - (true|false) debug build?
+      * current.build.defines.csc - framework-specific build defines for C# compiler
+ -->
+	<target name="build">
+		<!-- build Spring.Data.Tests -->
+		<csc target="library" define="${current.build.defines.csc}"
+		     warnaserror="true"
+		     debug="${current.build.debug}"
+                     output="${current.bin.dir}/${project::get-name()}.dll"
+		     doc="${current.bin.dir}/${project::get-name()}.xml">
+			<nowarn>
+				<warning number="${nowarn.numbers.test}" />
+			</nowarn>
+			<sources failonempty="true">
+				<include name="**/*.cs" />
+				<include name="../CommonAssemblyInfo.cs" />
+			</sources>
+		        <resources prefix="Spring" dynamicprefix="true" failonempty="true">
+			        <include name="**/*.xml" />
+			</resources>
+			<references basedir="${current.bin.dir}">
+				<include name="*.dll" />
+				<exclude name="${project::get-name()}.dll" />
+				<exclude name="CloverRuntime.dll" />
+			</references>
+		</csc>
+
+                <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
+                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
+	</target>
+	<target name="test" depends="build">
+		<nunit2outproc>
+			<formatter type="Plain" />
+			<formatter type="Xml" usefile="true" extension=".xml"
+			           outputdir="${current.bin.dir}/results" />
+			<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
+		</nunit2outproc>
+	</target>
+</project>
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.dll.config b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.dll.config
new file mode 100644
index 00000000..0cfa9c7b
--- /dev/null
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.dll.config
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2002-2005 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.
+-->
+<configuration>
+
+  <configSections>
+
+    <sectionGroup name="common">
+      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+    </sectionGroup>
+    
+    <sectionGroup name='spring'>
+      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
+    </sectionGroup>
+
+  </configSections>
+
+  <common>
+    <logging>
+      <factoryAdapter type="Common.Logging.Simple.NoOpLoggerFactoryAdapter, Common.Logging"/>
+    </logging>
+  </common>
+  
+  <spring>
+    <parsers>
+      <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data" />
+    </parsers>
+  </spring>
+
+
+
+
+</configuration>
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/AnotherTest/LoadAppContextTests.cs b/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/AnotherTest/LoadAppContextTests.cs
new file mode 100644
index 00000000..85227876
--- /dev/null
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/AnotherTest/LoadAppContextTests.cs
@@ -0,0 +1,58 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#if !NET_1_0
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Testing.NUnit.Another
+{
+    /// <summary>
+    /// This class should be the first one executed that inherits from BaseSpringTests to be loaded by
+    /// NUnit. The second one should be CachedAppContextTests.  The package name starting with the
+    /// letter 'A' is on purpose, since this seems to match how NUnit iterates over tests in this
+    /// assembly.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: LoadAppContextTests.cs,v 1.3 2007/08/25 14:26:35 oakinger Exp $</version>
+    [TestFixture]
+    public class LoadAppContextTests : BaseTestAppContextTests
+    {
+
+        /// <summary>
+        /// Loads the application context.  If this test fails, see if you can coerce NUnit to 
+        /// execut it before CachedAppContextTests, or check if application context caching in 
+        /// Spring.Testing.NUnit is broken.
+        /// </summary>
+        [Test]
+        public void LoadApplicationContext()
+        {
+            Assert.AreEqual(1, LoadCount, "Either caching of application context is broken or this test was executed before CachedAppContextTests.");            
+        }
+
+        
+    }
+}
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/BaseTestAppContextTests.cs b/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/BaseTestAppContextTests.cs
new file mode 100644
index 00000000..b74faf34
--- /dev/null
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/BaseTestAppContextTests.cs
@@ -0,0 +1,41 @@
+#region License
+
+/*
+ * Copyright 2002-2007 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;
+
+namespace Spring.Testing.NUnit
+{
+    /// <summary>
+    /// This is 
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: BaseTestAppContextTests.cs,v 1.1 2007/08/20 18:38:11 markpollack Exp $</version>
+    public class BaseTestAppContextTests : AbstractTransactionalDbProviderSpringContextTests
+    {
+
+        protected override string[] ConfigLocations
+        {
+            get { return new string[] {"assembly://Spring.Testing.NUnit.Tests/Spring.Testing.NUnit/TestApplicationContext.xml"}; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/CachedAppContextTests.cs b/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/CachedAppContextTests.cs
new file mode 100644
index 00000000..c7605df0
--- /dev/null
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/CachedAppContextTests.cs
@@ -0,0 +1,55 @@
+#if !NET_1_0
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Testing.NUnit
+{
+    /// <summary>
+    /// This class should be the second one executed that inherits from BaseSpringTests to be loaded by
+    /// NUnit.  The first one should be LoadAppContextTests.
+    /// </summary>
+    /// <author>Mark Pollack</author>
+    /// <version>$Id: CachedAppContextTests.cs,v 1.2 2007/08/21 19:26:14 markpollack Exp $</version>
+    [TestFixture]
+    public class CachedAppContextTests : BaseTestAppContextTests
+    {
+
+        /// <summary>
+        /// Loads the cached application context.  If this test fails, see if you can coerce NUnit to 
+        /// execut it before CachedAppContextTests, or check if application context caching in 
+        /// Spring.Testing.NUnit is broken.
+        /// </summary>
+        [Test]
+        public void CachedApplicationContext()
+        {
+            Assert.AreEqual(0, LoadCount);
+        }
+
+        
+    }
+}
+#endif
\ No newline at end of file
diff --git a/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/TestApplicationContext.xml b/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/TestApplicationContext.xml
new file mode 100644
index 00000000..a5702f11
--- /dev/null
+++ b/test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/TestApplicationContext.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+         xmlns:db="http://www.springframework.net/database">
+
+  <db:provider id="DbProvider"
+               provider="SqlServer-2.0"
+               connectionString="Data Source=.\SQL2005;Database=Spring;User ID=springqa;Password=springqa;Trusted_Connection=False"/>
+
+
+  <object id="transactionManager"  type="Spring.Transaction.CallCountingTransactionManager, Spring.Data.Tests">
+
+  </object>
+  
+  <object name="Joe" type="Spring.Objects.TestObject, Spring.Core.Tests">
+    <property name="Name" value="Joe"/>
+  </object>
+  
+  
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/AssemblyInfo.cs b/test/Spring/Spring.Web.Tests/AssemblyInfo.cs
new file mode 100644
index 00000000..f1a18ca1
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/AssemblyInfo.cs
@@ -0,0 +1,24 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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.Reflection;
+
+[assembly: AssemblyTitle("Spring.Web Tests")]
+[assembly: AssemblyDescription("Unit tests for the Spring.Web assembly")]
diff --git a/test/Spring/Spring.Web.Tests/Caching/AspNetCacheTests.cs b/test/Spring/Spring.Web.Tests/Caching/AspNetCacheTests.cs
new file mode 100644
index 00000000..2c6ebb53
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Caching/AspNetCacheTests.cs
@@ -0,0 +1,216 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Threading;
+using System.Web;
+using System.Web.Caching;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+#endregion
+
+namespace Spring.Caching
+{
+    /// <summary>
+    /// Test AspNetCache behaviour.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: AspNetCacheTests.cs,v 1.2 2007/08/25 10:22:13 oakinger Exp $</version>
+    [TestFixture]
+    public class AspNetCacheTests
+    {
+        private AspNetCache thisCache;
+        private AspNetCache otherCache;
+        private readonly Cache aspCache = HttpRuntime.Cache;
+        private readonly TimeSpan ttl10Seconds = new TimeSpan(0, 0, 10);
+
+        MockRepository mocks;
+        AspNetCache.IRuntimeCache mockedRuntimeCache;
+        AspNetCache mockedCache;
+
+        [SetUp]
+        public void SetUp()
+        {
+            // cleanup underlying static asp.net cache
+            foreach (DictionaryEntry entry in HttpRuntime.Cache)
+            {
+                aspCache.Remove((string)entry.Key);
+            }
+
+            thisCache = new AspNetCache();
+            otherCache = new AspNetCache();
+
+            mocks = new MockRepository();
+            mockedRuntimeCache = (AspNetCache.IRuntimeCache)mocks.CreateMock(typeof(AspNetCache.IRuntimeCache));
+            mockedCache = new AspNetCache(mockedRuntimeCache);
+        }
+
+        [Test]
+        public void Get()
+        {
+            // set expectations
+            Expect.Call(mockedRuntimeCache.Get(mockedCache.GenerateKey("key"))).Return(null);
+            mocks.ReplayAll();
+            // verify
+            mockedCache.Get("key");
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Remove()
+        {
+            // set expectations
+            Expect.Call(mockedRuntimeCache.Remove(mockedCache.GenerateKey("key"))).Return(null);
+            mocks.ReplayAll();
+            // verify
+            mockedCache.Remove("key");
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void DoesNotAcceptNullKeysOnInsert()
+        {
+            thisCache.Insert(null, "value", TimeSpan.Zero, true);
+        }
+
+        [Test]
+        public void GetNullKeysReturnsNull()
+        {
+            Assert.IsNull(thisCache.Get(null));
+        }
+
+        [Test]
+        public void IgnoreNullKeysOnRemove()
+        {
+            thisCache.Remove(null);
+        }
+
+        [Test]
+        public void ReturnsOnlyKeysOwnedByCache()
+        {
+            DictionaryEntry[] mockedRuntimeCacheEntries = 
+                {
+                      new DictionaryEntry(mockedCache.GenerateKey("keyA"), null)
+                    , new DictionaryEntry(mockedCache.GenerateKey("keyB"), null)
+                    , new DictionaryEntry(thisCache.GenerateKey("keyC"), null)
+                    , new DictionaryEntry(otherCache.GenerateKey("keyD"), null)
+                };
+
+            // set expectations
+            Expect.Call(mockedRuntimeCache.GetEnumerator()).Return(mockedRuntimeCacheEntries.GetEnumerator());
+            mocks.ReplayAll();
+            // verify
+            ICollection keys = mockedCache.Keys;
+            Assert.AreEqual( new string[] { "keyA", "keyB" }, new ArrayList(keys).ToArray(typeof(string)) );
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void AddItemToCacheNoExpiration()
+        {
+            thisCache.Insert( "key", "thisValue", TimeSpan.Zero, false );
+            Assert.AreEqual(1, thisCache.Count);
+            Assert.AreEqual("thisValue", aspCache.Get(thisCache.GenerateKey("key")));
+
+            otherCache.Insert("key", "otherValue", TimeSpan.Zero, false);
+            Assert.AreEqual(1, otherCache.Count);
+            Assert.AreEqual("otherValue", aspCache.Get(otherCache.GenerateKey("key")));
+        }
+
+        [Test]
+        public void AddItemToCacheAbsoluteExpiration()
+        {
+            thisCache.Insert("key", "thisValue", ttl10Seconds, false);
+            Assert.AreEqual(1, thisCache.Count);
+            Assert.AreEqual("thisValue", aspCache.Get(thisCache.GenerateKey("key")));
+
+            otherCache.Insert("key", "otherValue", ttl10Seconds, false);
+            Assert.AreEqual(1, otherCache.Count);
+            Assert.AreEqual("otherValue", aspCache.Get(otherCache.GenerateKey("key")));
+        }
+
+        [Test]
+        public void AddItemToCacheSlidingExpiration()
+        {
+            thisCache.Insert("key", "thisValue", ttl10Seconds, true);
+            Assert.AreEqual(1, thisCache.Count);
+            Assert.AreEqual("thisValue", aspCache.Get(thisCache.GenerateKey("key")));
+
+            otherCache.Insert("key", "otherValue", ttl10Seconds, true);
+            Assert.AreEqual(1, otherCache.Count);
+            Assert.AreEqual("otherValue", aspCache.Get(otherCache.GenerateKey("key")));
+        }
+
+        [Test]
+        public void DifferentCacheNamesCauseSameKeyToBeDifferent()
+        {
+            Assert.AreNotEqual("key", thisCache.GenerateKey("key"));
+            Assert.AreNotEqual(thisCache.GenerateKey("key"), otherCache.GenerateKey("key"));
+        }
+
+        [Test]
+        public void PassesParametersToRuntimeCache()
+        {
+            MockRepository mocks = new MockRepository();
+            AspNetCache.IRuntimeCache runtimeCache = (AspNetCache.IRuntimeCache) mocks.CreateMock(typeof(AspNetCache.IRuntimeCache));            
+            AspNetCache cache = new AspNetCache(runtimeCache);
+
+            DateTime expectedAbsoluteExpiration = DateTime.Now;
+            TimeSpan expectedSlidingExpiration = ttl10Seconds;
+            CacheItemPriority expectedPriority = CacheItemPriority.Low;
+
+//          TODO: find way to test non-sliding expiration case
+//            runtimeCache.Insert(cache.GenerateKey("key"), "value", null, DateTime.Now.Add(ttl10Seconds), Cache.NoSlidingExpiration, expectedPriority, null);
+            runtimeCache.Insert(cache.GenerateKey("key"), "value", null, Cache.NoAbsoluteExpiration, ttl10Seconds, expectedPriority, null);
+
+            mocks.ReplayAll();
+
+//            cache.Insert( "key", "value", ttl10Seconds, false, expectedPriority );
+            cache.Insert("key", "value", ttl10Seconds, true, expectedPriority);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ZeroTTLCausesNoExpiration()
+        {
+            MockRepository mocks = new MockRepository();
+            AspNetCache.IRuntimeCache runtimeCache = (AspNetCache.IRuntimeCache)mocks.CreateMock(typeof(AspNetCache.IRuntimeCache));
+            AspNetCache cache = new AspNetCache(runtimeCache);
+
+            CacheItemPriority expectedPriority = CacheItemPriority.Low;
+
+            runtimeCache.Insert(cache.GenerateKey("key"), "value", null, Cache.NoAbsoluteExpiration, Cache.NoSlidingExpiration, expectedPriority, null);
+            runtimeCache.Insert(cache.GenerateKey("key"), "value", null, Cache.NoAbsoluteExpiration, Cache.NoSlidingExpiration, expectedPriority, null);
+
+            mocks.ReplayAll();
+
+            cache.Insert("key", "value", TimeSpan.Zero, true, expectedPriority);
+            cache.Insert("key", "value", TimeSpan.Zero, false, expectedPriority);
+
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.cs b/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.cs
new file mode 100644
index 00000000..b034fe62
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.cs
@@ -0,0 +1,262 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System.Configuration;
+using System.Reflection;
+using System.Web;
+using Common.Logging;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+using Spring.Objects.Factory.Xml;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: HttpApplicationConfigurerTests.cs,v 1.1 2007/07/27 13:29:21 oakinger Exp $</version>
+    [TestFixture]
+    public class HttpApplicationConfigurerTests
+    {
+        [TestFixtureSetUp]
+        public void SetUpFixture()
+        {
+            LogManager.Adapter = new Common.Logging.Simple.TraceLoggerFactoryAdapter();
+        }
+
+        [SetUp]
+        public void SetUp()
+        {
+            HttpApplicationConfigurer h1 = new HttpApplicationConfigurer();
+            h1.ApplicationTemplate = null;
+            h1.ModuleTemplates.Clear();
+        }
+
+        /// <summary>
+        /// All <see cref="HttpApplicationConfigurer"/> instances share the same underlying ApplicationTemplate
+        /// </summary>
+        [Test]
+        public void ShareApplicationTemplate()
+        {
+            RootObjectDefinition rod = new RootObjectDefinition();
+
+            HttpApplicationConfigurer h1 = new HttpApplicationConfigurer();
+            h1.ApplicationTemplate = rod;
+            Assert.AreEqual(rod, h1.ApplicationTemplate);
+
+            // h2 returns same template as h1
+            HttpApplicationConfigurer h2 = new HttpApplicationConfigurer();
+            Assert.AreEqual(rod, h2.ApplicationTemplate);
+            Assert.AreEqual(h2.ApplicationTemplate, h1.ApplicationTemplate);
+
+            // allows overriding
+            rod = new RootObjectDefinition();
+            h2.ApplicationTemplate = rod;
+            Assert.AreEqual(rod, h1.ApplicationTemplate);
+        }
+
+        /// <summary>
+        /// All <see cref="HttpApplicationConfigurer"/> instances share the same underlying ModuleTemplates table
+        /// </summary>
+        [Test]
+        public void ShareModuleTemplates()
+        {
+            // is never null
+            HttpApplicationConfigurer h1;
+            HttpApplicationConfigurer h2;
+            RootObjectDefinition rod;
+
+            // is shared
+            h1 = new HttpApplicationConfigurer();
+            Assert.IsNotNull(h1.ModuleTemplates);
+            h2 = new HttpApplicationConfigurer();
+            Assert.AreEqual(h1.ModuleTemplates, h2.ModuleTemplates);
+
+            // allows overriding
+            rod = new RootObjectDefinition();
+            h1.ModuleTemplates.Add("test", rod);
+            Assert.AreEqual(rod, h1.ModuleTemplates["test"]);
+            h2.ModuleTemplates.Add("test", rod);
+            Assert.AreEqual(1, h2.ModuleTemplates.Count);
+            Assert.AreEqual(rod, h2.ModuleTemplates["test"]);
+        }
+
+        [Test]
+        public void ConfiguresApplicationAndModulesFromTemplate()
+        {
+            StaticApplicationContext appContext = CreateTestContext();
+
+            HttpApplicationConfigurer h;
+            RootObjectDefinition rod;
+
+            h = new HttpApplicationConfigurer();
+            rod = new RootObjectDefinition();
+            rod.PropertyValues.Add("TestObject", new RuntimeObjectReference("testObject"));
+            h.ApplicationTemplate = rod;
+            rod = new RootObjectDefinition();
+            rod.PropertyValues.Add("TestObject", new RuntimeObjectReference("testObject1"));
+            h.ModuleTemplates.Add("TestModule1", rod);
+            rod = new RootObjectDefinition();
+            rod.PropertyValues.Add("TestObject", new RuntimeObjectReference("testObject2"));
+            h.ModuleTemplates.Add("TestModule2", rod);
+
+            TestModule m1 = new TestModule();
+            TestModule m2 = new TestModule();
+
+            TestApplication appObject = new TestApplication(new ModuleEntry[]
+                                                                {
+                                                                    new ModuleEntry("TestModule1", m1)
+                                                                    , new ModuleEntry("TestModule2", m2),
+                                                                });
+            HttpApplicationConfigurer.Configure(appContext, appObject);
+            // app configured
+            Assert.AreEqual(appContext.GetObject("testObject"), appObject.TestObject);
+            // modules configured
+            Assert.AreEqual(appContext.GetObject("testObject1"), m1.TestObject);
+            Assert.AreEqual(appContext.GetObject("testObject2"), m2.TestObject);
+        }
+
+        [Test]
+#if NET_2_0
+        [ExpectedException(typeof(ConfigurationErrorsException))]
+#else
+        [ExpectedException(typeof(System.Configuration.ConfigurationException))]
+#endif
+        public void ThrowsOnUnapplicableModuleTemplate()
+        {
+            StaticApplicationContext appContext = CreateTestContext();
+
+            HttpApplicationConfigurer h;
+            RootObjectDefinition rod;
+
+            h = new HttpApplicationConfigurer();
+            rod = new RootObjectDefinition();
+            rod.PropertyValues.Add("TestObject", new RuntimeObjectReference("testObject1"));
+            h.ModuleTemplates.Add("TestModule1", rod);
+
+            TestApplication appObject = new TestApplication(null);
+            HttpApplicationConfigurer.Configure(appContext, appObject);
+        }
+
+        [Test]
+        public void ConfigureUsingXmlApplicationContext()
+        {
+            XmlApplicationContext appContext = new XmlApplicationContext(false, ReadOnlyXmlTestResource.GetFilePath("HttpApplicationConfigurerTests.xml", typeof(HttpApplicationConfigurerTests)));
+
+            TestModule m1 = new TestModule();
+            TestModule m2 = new TestModule();
+
+            TestApplication appObject = new TestApplication(new ModuleEntry[]
+                                                                {
+                                                                    new ModuleEntry("TestModule1", m1)
+                                                                    , new ModuleEntry("TestModule2", m2),
+                                                                });
+            HttpApplicationConfigurer.Configure( appContext, appObject );
+            // app configured
+            Assert.AreEqual(appContext.GetObject("testObject"), appObject.TestObject);
+            // modules configured
+            Assert.AreEqual(appContext.GetObject("testObject1"), m1.TestObject);
+            Assert.AreEqual(null, m2.TestObject);
+        }
+
+        private static StaticApplicationContext CreateTestContext()
+        {
+            object testObject;
+            StaticApplicationContext appContext = new StaticApplicationContext();
+            appContext.RegisterSingleton("testObject", typeof(object), null);
+            appContext.RegisterSingleton("testObject1", typeof(object), null);
+            appContext.RegisterSingleton("testObject2", typeof(object), null);
+            appContext.Refresh();
+            testObject = appContext.GetObject("testObject");
+            Assert.IsNotNull(testObject);
+            return appContext;
+        }
+
+        #region Test Classes
+
+        public class ModuleEntry
+        {
+            // Fields
+            public readonly string Name;
+            public readonly IHttpModule Module;
+
+            public ModuleEntry(string name, IHttpModule module)
+            {
+                Name = name;
+                Module = module;
+            }
+        }
+
+        public class TestApplication : HttpApplication
+        {
+            private static readonly MethodInfo miAddModule =
+                typeof(HttpModuleCollection).GetMethod("AddModule", BindingFlags.Instance | BindingFlags.NonPublic);
+
+            private object testObject;
+
+            public TestApplication(ModuleEntry[] testModule)
+            {
+                HttpModuleCollection modules = this.Modules;
+                if (testModule != null)
+                {
+                    ModuleEntry moduleEntry = null;
+                    for (int i = 0; i < testModule.Length; i++)
+                    {
+                        moduleEntry = testModule[i];
+                        miAddModule.Invoke(modules, new object[] {moduleEntry.Name, moduleEntry.Module});
+                    }
+                }
+            }
+
+            public object TestObject
+            {
+                get { return this.testObject; }
+                set { this.testObject = value; }
+            }
+        }
+
+        public class TestModule : IHttpModule
+        {
+            private object testObject;
+
+            public object TestObject
+            {
+                get { return this.testObject; }
+                set { this.testObject = value; }
+            }
+
+            public void Init(HttpApplication context)
+            {
+            }
+
+            public void Dispose()
+            {
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.xml b/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.xml
new file mode 100644
index 00000000..8f62ca34
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Context/Support/HttpApplicationConfigurerTests.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd"
+>
+
+	<object id="testObject" type="System.Object" />
+	<object id="testObject1" type="System.Object" />
+
+	<object id="myApplicationConfigurer" type="Spring.Context.Support.HttpApplicationConfigurer, Spring.Web">
+		<property name="ApplicationTemplate">
+			<object>
+				<property name="TestObject" ref="testObject" />
+			</object>
+		</property>
+		<property name="ModuleTemplates">
+			<dictionary>
+				<entry key="TestModule1">
+					<object>
+						<property name="TestObject" ref="testObject1" />
+					</object>
+				</entry>
+			</dictionary>
+		</property>
+	</object>
+</objects>
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Context/Support/WebApplicationContextTests.cs b/test/Spring/Spring.Web.Tests/Context/Support/WebApplicationContextTests.cs
new file mode 100644
index 00000000..ea0be410
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Context/Support/WebApplicationContextTests.cs
@@ -0,0 +1,92 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Threading;
+using System.Web;
+using NUnit.Extensions.Asp.AspTester;
+using NUnit.Framework;
+using NUnitAspEx;
+using Spring.Objects.Factory;
+using Spring.TestSupport;
+using Spring.Threading;
+
+#endregion
+
+namespace Spring.Context.Support
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: WebApplicationContextTests.cs,v 1.1 2008/02/02 10:24:39 oakinger Exp $</version>
+    [AspTestFixture("/Test", "/Spring/Context/Support/WebApplicationContextTests")]
+    public class WebApplicationContextTests : WebFormTestCase
+    {
+        [Test]
+        public void CanAccessContextFromNonWebThread()
+        {
+            IApplicationContext ctx;
+
+            using (TestWebContext requestContext = new TestWebContext("/Test", "/DoesNotExist.oaspx"))
+            {
+                ctx = WebApplicationContext.Current;
+            }
+
+            AsyncTestMethod testMethod = new AsyncTestMethod(1, new AsyncTestMethod.TestMethod(DoBackgroundWork), ctx);
+            testMethod.Start();
+            testMethod.AssertNoException();
+        }
+
+        private static object DoBackgroundWork(object[] args)
+        {
+            IApplicationContext ctx = (IApplicationContext) args[0];
+
+            object o;
+            o = ctx.GetObject("singletonObject"); Assert.IsNotNull(o);
+            o = ctx.GetObject("prototypeObject"); Assert.IsNotNull(o);
+            o = ctx.GetObject("applicationScopedObject"); Assert.IsNotNull(o);
+            try
+            {
+                o = ctx.GetObject("requestScopedObject"); Assert.IsNotNull(o);
+                Assert.Fail("shouldn't be allowed");
+            }
+            catch(ObjectCreationException oce1)
+            {
+                Assert.IsTrue(-1 < oce1.Message.IndexOf("without a valid HttpContext.Current instance"));
+            }
+
+            try
+            {
+                o = ctx.GetObject("sessionScopedObject"); Assert.IsNotNull(o);
+                Assert.Fail("shouldn't be allowed");
+            }
+            catch (ObjectCreationException oce1)
+            {
+                Assert.IsTrue(-1 < oce1.Message.IndexOf("without a valid HttpContext.Current instance"));
+            }
+
+            return null;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Core/IO/WebResourceTests.cs b/test/Spring/Spring.Web.Tests/Core/IO/WebResourceTests.cs
new file mode 100644
index 00000000..f178f5d6
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Core/IO/WebResourceTests.cs
@@ -0,0 +1,57 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.TestSupport;
+
+#endregion
+
+namespace Spring.Core.IO
+{
+    /// <summary>
+    /// Unit tests for the WebResource class.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: WebResourceTests.cs,v 1.6 2008/03/14 12:02:45 oakinger Exp $</version>
+    [TestFixture]
+    public class WebResourceTests : FileSystemResourceCommonTests
+    {
+        private VirtualEnvironmentMock testVirtualEnvironment;
+
+        [TestFixtureSetUp]
+        public void SetUpFixture()
+        {
+            testVirtualEnvironment = new VirtualEnvironmentMock("/some.request", "somepathinfo", "/", true);
+        }
+
+        [TestFixtureTearDown]
+        public void ShutDownFixture()
+        {
+            testVirtualEnvironment.Dispose();
+        }
+
+        protected override FileSystemResource CreateResourceInstance(string resourceName)
+        {
+            return new WebResource(resourceName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Data/Spring/Context/Support/WebApplicationContextTests/Dummy.aspx b/test/Spring/Spring.Web.Tests/Data/Spring/Context/Support/WebApplicationContextTests/Dummy.aspx
new file mode 100644
index 00000000..0a7c23bd
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Data/Spring/Context/Support/WebApplicationContextTests/Dummy.aspx
@@ -0,0 +1,13 @@
+<%@ Page language="c#" EnableSessionState="false" AutoEventWireup="false" Inherits="Spring.Web.UI.Page" %><script language="c#" runat="server">
+protected override void OnLoad(EventArgs e)
+{
+	base.OnLoad(e);
+	try
+	{
+	    Session["disablesSession"] = "somevalue";
+	    NUnit.Framework.Assert.Fail("must not be able to access session");
+	}
+	catch(HttpException)
+	{}
+}
+</script>OK
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Data/Spring/Context/Support/WebApplicationContextTests/Web.Config b/test/Spring/Spring.Web.Tests/Data/Spring/Context/Support/WebApplicationContextTests/Web.Config
new file mode 100644
index 00000000..a537a5aa
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Data/Spring/Context/Support/WebApplicationContextTests/Web.Config
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<configuration>
+
+    <configSections>
+        <sectionGroup name="spring">
+            <section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/>
+            <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
+        </sectionGroup>
+
+        <sectionGroup name="common">
+            <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+        </sectionGroup>
+
+    </configSections>
+
+    <!-- to see logging output in the attached debugger -->
+    <common>
+        <logging>
+            <factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
+                <arg key="Level" value="ALL" />
+            </factoryAdapter>
+        </logging>
+    </common>
+
+    <system.web>
+        <compilation debug="true" />
+
+        <!--
+    The following needs to be configured in order to enable Spring.NET Web Framework features
+-->
+        <httpModules>
+            <add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+            <add name="NUnitAspExModule" type="NUnitAspEx.AspTestExecutionModule, NUnitAspEx" />
+        </httpModules>
+
+        <httpHandlers>
+            <add verb="*" path="*.oaspx" type="System.Web.UI.PageHandlerFactory"/>
+            <add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
+            <add verb="*" path="*.testmethod" type="NUnitAspEx.AspTestMethodHandler, NUnitAspEx" validate="false" />
+        </httpHandlers>
+
+    </system.web>
+
+    <spring>
+        <context>
+            <resource uri="config://spring/objects"/>
+        </context>
+        <objects xmlns="http://www.springframework.net">
+
+            <object type="Dummy.aspx"/>
+
+            <object id="singletonObject" type="System.Object" />
+            <object id="prototypeObject" type="System.Object" singleton="false" />
+            <object id="requestScopedObject" type="System.Object" scope="request" />
+            <object id="sessionScopedObject" type="System.Object" scope="session" />
+            <object id="applicationScopedObject" type="System.Object" scope="application" />
+
+        </objects>
+    </spring>
+
+</configuration>
diff --git a/test/Spring/Spring.Web.Tests/Data/Spring/Objects/Factory/Support/TestForm.aspx b/test/Spring/Spring.Web.Tests/Data/Spring/Objects/Factory/Support/TestForm.aspx
new file mode 100644
index 00000000..48b83c2b
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Data/Spring/Objects/Factory/Support/TestForm.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="c#" CodeBehind="TestForm.aspx.cs" Inherits="Spring.Data.Objects.Factory.Support.TestForm" AutoEventWireup="false" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Untitled Page</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div>
+    Look Ma!
+    </div>
+    </form>
+</body>
+</html>
diff --git a/test/Spring/Spring.Web.Tests/Data/Spring/Objects/Factory/Support/TestForm.aspx.cs b/test/Spring/Spring.Web.Tests/Data/Spring/Objects/Factory/Support/TestForm.aspx.cs
new file mode 100644
index 00000000..7a6cfe5b
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Data/Spring/Objects/Factory/Support/TestForm.aspx.cs
@@ -0,0 +1,20 @@
+using System;
+using Common.Logging;
+
+namespace Spring.Data.Objects.Factory.Support
+{
+    public class TestForm : Spring.Web.UI.Page
+    {
+        private ILog _log = LogManager.GetLogger(typeof(TestForm));
+
+        public TestForm()
+        {
+            this.Load += new EventHandler(Page_Load);
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            _log.Debug("loaded page!");
+        }
+    }
+}
diff --git a/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/DisablesSession.aspx b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/DisablesSession.aspx
new file mode 100644
index 00000000..0a7c23bd
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/DisablesSession.aspx
@@ -0,0 +1,13 @@
+<%@ Page language="c#" EnableSessionState="false" AutoEventWireup="false" Inherits="Spring.Web.UI.Page" %><script language="c#" runat="server">
+protected override void OnLoad(EventArgs e)
+{
+	base.OnLoad(e);
+	try
+	{
+	    Session["disablesSession"] = "somevalue";
+	    NUnit.Framework.Assert.Fail("must not be able to access session");
+	}
+	catch(HttpException)
+	{}
+}
+</script>OK
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/MaintainsSession1.aspx b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/MaintainsSession1.aspx
new file mode 100644
index 00000000..ca6ac839
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/MaintainsSession1.aspx
@@ -0,0 +1,7 @@
+<%@ Page language="c#" AutoEventWireup="false" Inherits="Spring.Web.UI.Page" %><script language="c#" runat="server">
+protected override void OnLoad(EventArgs e)
+{
+	base.OnLoad(e);
+	Session["maintainsSession"] = "somevalue";
+}
+</script>OK
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/MaintainsSession2.aspx b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/MaintainsSession2.aspx
new file mode 100644
index 00000000..197bff68
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/MaintainsSession2.aspx
@@ -0,0 +1,7 @@
+<%@ Page language="c#" AutoEventWireup="false" Inherits="Spring.Web.UI.Page" %><script language="c#" runat="server">
+protected override void OnLoad(EventArgs e)
+{
+	base.OnLoad(e);
+	NUnit.Framework.Assert.AreEqual( "somevalue", Session["maintainsSession"] );
+}
+</script>OK
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/TransferAfterSetResult.aspx b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/TransferAfterSetResult.aspx
new file mode 100644
index 00000000..2a669b6c
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/TransferAfterSetResult.aspx
@@ -0,0 +1,24 @@
+<%@ Page language="c#" AutoEventWireup="false" Inherits="Spring.Web.UI.Page" ClassName="TransferAfterSetResult" %>
+<script language="c#" runat="server">
+private void Save_Clicked(object sender, EventArgs e)
+{
+    SetResult("save");
+}
+</script>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<HTML>
+  <HEAD>
+    <title>GuestBook</title>
+  </HEAD>
+  <body>
+    <form id="GuestBook" method="post" runat="server">
+      <p><b>Guest Book:</b></p>
+      
+      <u>Enter your name:</u>
+      <table>
+      <tr><td>Name:</td><td><asp:textbox id="name" Runat="server"></asp:textbox></td></tr>
+      </table>
+      <asp:Button ID="save" Runat="server" Text="Save" OnClick="Save_Clicked"></asp:Button>
+    </form>
+  </body>
+</HTML>
diff --git a/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/TransferAfterSetResultSave.aspx b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/TransferAfterSetResultSave.aspx
new file mode 100644
index 00000000..6b18833f
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/TransferAfterSetResultSave.aspx
@@ -0,0 +1,12 @@
+<%@ Page language="c#" AutoEventWireup="false" EnableViewStateMac="false" Inherits="Spring.Web.UI.Page" %>
+<%@ Reference Page="TransferAfterSetResult.aspx" %>
+<script language="c#" runat="server">
+public string SomeProperty;
+
+protected override void OnLoad(EventArgs e)
+{
+    base.OnLoad(e);
+    NUnit.Framework.Assert.AreEqual( typeof(TransferAfterSetResult), this.PreviousPage.GetType() );
+    NUnit.Framework.Assert.AreEqual( "someValue", SomeProperty );
+}
+</script>OK
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/Web.Config.net-1.1 b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/Web.Config.net-1.1
new file mode 100644
index 00000000..d2c081ef
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/Web.Config.net-1.1
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<configuration>
+
+    <configSections>
+        <sectionGroup name="spring">
+            <section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/>
+            <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
+        </sectionGroup>
+
+        <sectionGroup name="common">
+            <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+        </sectionGroup>
+
+    </configSections>
+
+    <!-- to see logging output in the attached debugger -->
+    <common>
+        <logging>
+            <factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
+                <arg key="Level" value="ALL" />
+            </factoryAdapter>
+        </logging>
+    </common>
+
+    <system.web>
+        <compilation debug="true" />
+
+        <!--
+    The following needs to be configured in order to enable Spring.NET Web Framework features
+-->
+        <httpModules>
+            <add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+            <add name="NUnitAspExModule" type="NUnitAspEx.AspTestExecutionModule, NUnitAspEx" />
+        </httpModules>
+
+        <httpHandlers>
+			<add verb="*" path="*.oaspx" type="System.Web.UI.PageHandlerFactory"/>
+			<add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
+            <add verb="*" path="*.testmethod" type="NUnitAspEx.AspTestMethodHandler, NUnitAspEx" validate="false" />
+        </httpHandlers>
+
+    </system.web>
+
+    <!-- demonstrates how to configure IHttpModule instances -->
+    <spring>
+        <context>
+            <resource uri="config://spring/objects"/>
+        </context>
+        <objects xmlns="http://www.springframework.net">
+
+            <!-- "PreviousPage" property does not exist in net-1.1
+            <object type="TransferAfterSetResult.aspx">
+                <property name="Results">
+                    <dictionary>
+                        <entry key="save" value="transfer:TransferAfterSetResultSave.aspx" />
+                    </dictionary>
+                </property>
+            </object>
+            <object type="TransferAfterSetResultSave.aspx"/>
+            -->
+        </objects>
+    </spring>
+
+</configuration>
diff --git a/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/Web.Config.net-2.0 b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/Web.Config.net-2.0
new file mode 100644
index 00000000..48e00f1d
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Data/Spring/Web/Support/PageHandlerFactoryTests/Web.Config.net-2.0
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<configuration>
+
+    <configSections>
+        <sectionGroup name="spring">
+            <section name="context" type="Spring.Context.Support.WebContextHandler, Spring.Web"/>
+            <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
+        </sectionGroup>
+
+        <sectionGroup name="common">
+            <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
+        </sectionGroup>
+
+    </configSections>
+
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<!--
+			<dependentAssembly>
+				<assemblyIdentity name="Common.Logging" publicKeyToken="65e474d141e25e07" />
+				<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.2.0" />
+				<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" />
+				<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.2.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="nunit.core" publicKeyToken="96d09a1eb7f44a77" />
+				<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="2.4.5.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="nunit.core.interfaces" publicKeyToken="96d09a1eb7f44a77" />
+				<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="2.4.5.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" />
+				<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="2.4.5.0" />
+			</dependentAssembly>
+-->
+		</assemblyBinding>
+	</runtime>
+	
+    <!-- to see logging output in the attached debugger -->
+    <common>
+        <logging>
+            <factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
+                <arg key="Level" value="ALL" />
+            </factoryAdapter>
+        </logging>
+    </common>
+
+    <system.web>
+        <compilation debug="true" />
+
+        <!--
+    The following needs to be configured in order to enable Spring.NET Web Framework features
+-->
+        <httpModules>
+            <add name="SpringModule" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
+            <add name="NUnitAspExModule" type="NUnitAspEx.AspTestExecutionModule, NUnitAspEx" />
+        </httpModules>
+
+        <httpHandlers>
+			<add verb="*" path="*.oaspx" type="System.Web.UI.PageHandlerFactory"/>
+			<add verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
+            <add verb="*" path="*.testmethod" type="NUnitAspEx.AspTestMethodHandler, NUnitAspEx" validate="false" />
+        </httpHandlers>
+
+    </system.web>
+
+    <!-- demonstrates how to configure IHttpModule instances -->
+    <spring>
+        <context>
+            <resource uri="config://spring/objects"/>
+        </context>
+        <objects xmlns="http://www.springframework.net">
+
+            <object type="TransferAfterSetResult.aspx">
+                <property name="Results">
+                    <dictionary>
+                        <entry key="save" value="transfer:TransferAfterSetResultSave.aspx" />
+                    </dictionary>
+                </property>
+            </object>
+
+            <object type="TransferAfterSetResultSave.aspx">
+                <property name="SomeProperty" value="someValue" />
+            </object>
+        </objects>
+    </spring>
+
+</configuration>
diff --git a/test/Spring/Spring.Web.Tests/Globalization/Resolvers/DefaultWebCultureResolverTests.cs b/test/Spring/Spring.Web.Tests/Globalization/Resolvers/DefaultWebCultureResolverTests.cs
new file mode 100644
index 00000000..f041d292
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Globalization/Resolvers/DefaultWebCultureResolverTests.cs
@@ -0,0 +1,121 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Globalization;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+#endregion
+
+namespace Spring.Globalization.Resolvers
+{
+    /// <summary>
+    /// Tests DefaultWebCultureResolver behaviour.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: DefaultWebCultureResolverTests.cs,v 1.1 2007/08/25 14:26:36 oakinger Exp $</version>
+    [TestFixture]
+    public class DefaultWebCultureResolverTests
+    {
+        #region TestDefaultWebCultureResolver utility class
+
+        /// <summary>
+        /// Override GetRequestLanguage() to return test language instead of HttpRequest.UserLanguages[0]
+        /// </summary>
+        public class TestDefaultWebCultureResolver : DefaultWebCultureResolver
+        {
+            private string _requestLanguage;
+
+            // convenience setter method
+            public TestDefaultWebCultureResolver SetRequestLanguage(string requestLanguage)
+            {
+                _requestLanguage = requestLanguage;
+                return this;
+            }
+
+            // override to return our test language instead of HttpRequest.UserLanguages[0]!
+            protected override string GetRequestLanguage()
+            {
+                return _requestLanguage;
+            }
+        }
+
+        #endregion
+
+        private readonly CultureInfo EXPECTED_NEUTRALCULTURE = new CultureInfo("fr");
+
+        [TestFixtureSetUp]
+        public void TestFixtureSetUp()
+        {
+            // ensure, uiCulture and culture are set to different cultures
+            CultureTestScope.Set();
+        }
+
+        [TestFixtureTearDown]
+        public void TestFixtureTearDown()
+        {
+            CultureTestScope.Reset();
+        }
+
+        [Test]
+        public void DefaultCultureDefaultsToNull()
+        {
+            TestDefaultWebCultureResolver r = new TestDefaultWebCultureResolver();
+            Assert.IsNull(r.DefaultCulture);
+        }
+
+        [Test]
+        public void AlwaysReturnsDefaultCultureIfDefaultCultureIsSet()
+        {
+            TestDefaultWebCultureResolver r = new TestDefaultWebCultureResolver();
+            r.DefaultCulture = EXPECTED_NEUTRALCULTURE;
+
+            r.SetRequestLanguage(null);
+            Assert.AreEqual(EXPECTED_NEUTRALCULTURE, r.ResolveCulture());
+
+            r.SetRequestLanguage("de");
+            Assert.AreEqual(EXPECTED_NEUTRALCULTURE, r.ResolveCulture());
+        }
+
+        [Test]
+        public void ReturnsRequestCultureIfNoDefaultCulture()
+        {
+            TestDefaultWebCultureResolver r = new TestDefaultWebCultureResolver();
+            
+            r.SetRequestLanguage(EXPECTED_NEUTRALCULTURE.Name);
+            Assert.AreEqual(EXPECTED_NEUTRALCULTURE, r.ResolveCulture());
+        }
+
+        [Test]
+        public void ReturnsCurrentUICultureIfNoDefaultCultureIsSetAndNoOrInvalidRequestLanguage()
+        {
+            TestDefaultWebCultureResolver r = new TestDefaultWebCultureResolver();
+
+            r.SetRequestLanguage(null);
+            Assert.AreEqual(CultureInfo.CurrentUICulture, r.ResolveCulture());
+            
+            r.SetRequestLanguage("invalid culture name");
+            Assert.AreEqual(CultureInfo.CurrentUICulture, r.ResolveCulture());
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/MyNUnitAddinHelper.cs b/test/Spring/Spring.Web.Tests/MyNUnitAddinHelper.cs
new file mode 100644
index 00000000..412db0cf
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/MyNUnitAddinHelper.cs
@@ -0,0 +1,39 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using NUnit.Core.Extensibility;
+
+#endregion
+
+namespace Spring
+{
+    /// <summary>
+    /// Required for auto-registering NUnitAspEx extension with NUnit for this assembly
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: MyNUnitAddinHelper.cs,v 1.1 2007/12/03 16:11:31 oakinger Exp $</version>
+    [NUnitAddin]
+    public class MyNUnitAddinHelper : NUnitAspEx.NUnitAddinHelper
+    {
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectDefinitionFactoryTests.cs b/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectDefinitionFactoryTests.cs
new file mode 100644
index 00000000..31d1d9d8
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectDefinitionFactoryTests.cs
@@ -0,0 +1,125 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using NUnitAspEx;
+using Spring.TestSupport;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Unit tests for the WebObjectDefinitionFactory class.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: WebObjectDefinitionFactoryTests.cs,v 1.4 2008/03/14 12:02:45 oakinger Exp $</version>
+    [AspTestFixture("/Test", "/Spring/Objects/Factory/Support")]
+    public class WebObjectDefinitionFactoryTests
+    {
+        [Test]
+        public void CreateRootDefinition()
+        {
+            WebObjectDefinitionFactory factory = new WebObjectDefinitionFactory();
+            IConfigurableObjectDefinition definition
+                = factory.CreateObjectDefinition(
+                    typeof(TestObject).FullName, null, AppDomain.CurrentDomain);
+            Assert.IsNotNull(definition, "CreateObjectDefinition with no parent is returning null (it must never do so).");
+            Assert.AreEqual(typeof(TestObject), definition.ObjectType);
+            Assert.AreEqual(0, definition.PropertyValues.PropertyValues.Length,
+                            "Must not have any property values as none were passed in.");
+            Assert.AreEqual(0, definition.ConstructorArgumentValues.ArgumentCount,
+                            "Must not have any ctor args as none were passed in.");
+        }
+
+        [Test]
+        public void CreateChildDefinition()
+        {
+            WebObjectDefinitionFactory factory = new WebObjectDefinitionFactory();
+            IConfigurableObjectDefinition definition
+                = factory.CreateObjectDefinition(
+                    typeof(TestObject).FullName, "Aimee Mann", AppDomain.CurrentDomain);
+            Assert.IsNotNull(definition, "CreateObjectDefinition with no parent is returning null (it must never do so).");
+            Assert.AreEqual(typeof(TestObject), definition.ObjectType);
+            Assert.AreEqual(0, definition.PropertyValues.PropertyValues.Length,
+                            "Must not have any property values as none were passed in.");
+            Assert.AreEqual(0, definition.ConstructorArgumentValues.ArgumentCount,
+                            "Must not have any ctor args as none were passed in.");
+        }
+
+        [Test]
+        public void DoesNotResolveTypeNameToFullTypeInstanceIfAppDomainIsNull()
+        {
+            WebObjectDefinitionFactory factory = new WebObjectDefinitionFactory();
+            IConfigurableObjectDefinition definition
+                = factory.CreateObjectDefinition(
+                    typeof(TestObject).FullName, null, null);
+            Assert.IsNotNull(definition, "CreateObjectDefinition with no parent is returning null (it must never do so).");
+            Assert.AreEqual(typeof(TestObject).FullName, definition.ObjectTypeName);
+            Assert.AreEqual(0, definition.PropertyValues.PropertyValues.Length,
+                            "Must not have any property values as none were passed in.");
+            Assert.AreEqual(0, definition.ConstructorArgumentValues.ArgumentCount,
+                            "Must not have any ctor args as none were passed in.");
+        }
+
+        [Test]
+        public void ResolvesToPageRootDefinitionIfEndsWithASPX()
+        {
+            using (TestWebContext ctx = new TestWebContext("/Test", "testform.aspx"))
+            {
+                WebObjectDefinitionFactory factory = new WebObjectDefinitionFactory();
+                IWebObjectDefinition definition
+                    = (IWebObjectDefinition)factory.CreateObjectDefinition("/Test/testform.aspx", null, AppDomain.CurrentDomain);
+                Assert.IsNotNull(definition, "CreateObjectDefinition with no parent is returning null (it must never do so).");
+                Assert.IsTrue(definition.IsPage, ".aspx extension must result in a page instance");
+                Assert.AreEqual(typeof(RootWebObjectDefinition), definition.GetType());
+            }
+        }
+
+        [Test]
+        public void ResolvesToPageChildDefinitionIfEndsWithASPX()
+        {
+            using (TestWebContext ctx = new TestWebContext("/Test", "testform.aspx"))
+            {
+                WebObjectDefinitionFactory factory = new WebObjectDefinitionFactory();
+                IWebObjectDefinition definition
+                    = (IWebObjectDefinition)factory.CreateObjectDefinition("/Test/testform.aspx", "parentdefinition", AppDomain.CurrentDomain);
+                Assert.IsNotNull(definition, "CreateObjectDefinition with parent is returning null (it must never do so).");
+                Assert.IsTrue(definition.IsPage, ".aspx extension must result in a page instance");
+                Assert.AreEqual(typeof(ChildWebObjectDefinition), definition.GetType());
+            }
+        }
+
+        [Test]
+        [ExpectedException(typeof(ObjectCreationException))]
+        public void ThrowsArgumentExceptionOnNonExistingPath()
+        {
+            using (TestWebContext ctx = new TestWebContext("/Test", "testform.aspx"))
+            {
+                WebObjectDefinitionFactory factory = new WebObjectDefinitionFactory();
+                IWebObjectDefinition definition
+                    = (IWebObjectDefinition)factory.CreateObjectDefinition("/Test/DoesNotExist.aspx", "parentdefinition", AppDomain.CurrentDomain);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectFactoryTests.cs b/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectFactoryTests.cs
new file mode 100644
index 00000000..6111a7fb
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Objects/Factory/Support/WebObjectFactoryTests.cs
@@ -0,0 +1,86 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+using Spring.TestSupport;
+
+#endregion
+
+namespace Spring.Objects.Factory.Support
+{
+    /// <summary>
+    /// Unit tests for the WebObjectFactory class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: WebObjectFactoryTests.cs,v 1.5 2008/03/14 12:02:45 oakinger Exp $</version>
+    [TestFixture]
+    public sealed class WebObjectFactoryTests
+    {
+        [Test]
+        public void CanBeUsedOnNonWebThread()
+        {
+            WebObjectFactory wof;
+            RootWebObjectDefinition rwod;
+
+            // we need to create WOF within a valid HttpContext environment 'cause we will 
+            // make use of 'request' and 'session' scope.
+            using (new VirtualEnvironmentMock("/somedir/some.file", null, "/", true))
+            {
+                wof = new WebObjectFactory("/somedir/", false);
+            }
+
+            rwod = new RootWebObjectDefinition(typeof(object), new ConstructorArgumentValues(), new MutablePropertyValues());
+            rwod.Scope = ObjectScope.Application;
+            wof.RegisterObjectDefinition("applicationScopedObject", rwod);
+
+            rwod = new RootWebObjectDefinition(typeof(object), new ConstructorArgumentValues(), new MutablePropertyValues());
+            rwod.Scope = ObjectScope.Request;
+            wof.RegisterObjectDefinition("requestScopedObject", rwod);
+
+            rwod = new RootWebObjectDefinition(typeof(object), new ConstructorArgumentValues(), new MutablePropertyValues());
+            rwod.Scope = ObjectScope.Session;
+            wof.RegisterObjectDefinition("sessionScopedObject", rwod);
+
+            object o;
+            o = wof.GetObject("applicationScopedObject");
+            Assert.IsNotNull(o);
+
+            AssertGetObjectThrows(typeof(ObjectCreationException), wof, "requestScopedObject");
+            AssertGetObjectThrows(typeof(ObjectCreationException), wof, "sessionScopedObject");
+        }
+
+        private void AssertGetObjectThrows(Type exceptionType, WebObjectFactory wof, string objectName)
+        {
+            try
+            {
+                wof.GetObject(objectName);
+                Assert.Fail("must not reach this line");
+            }
+            catch (Exception ex)
+            {
+                Assert.AreEqual(exceptionType, ex.GetType());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2003.csproj b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2003.csproj
new file mode 100644
index 00000000..793e85e4
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2003.csproj
@@ -0,0 +1,352 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.10.6030"
+        SchemaVersion = "2.0"
+        ProjectGuid = "{EB2587B7-8B26-4FBC-852A-4128D5CACAFC}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Spring.Web.Tests"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                PreBuildEvent = ""
+                PostBuildEvent = 'echo "Copying .xml files for tests"&#xd;&#xa;xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2003\Spring.Web.Tests\$(ConfigurationName)\ /y /s /q /d&#xd;&#xa;'
+                RootNamespace = "Spring"
+                RunPostBuildEvent = "Always"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = "0618"
+                    Optimize = "false"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Web.Tests\Debug-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "true"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release-1.1"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE;NET_1_1"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    NoStdLib = "false"
+                    NoWarn = ""
+                    Optimize = "true"
+                    OutputPath = "..\..\..\build\VS.Net.2003\Spring.Web.Tests\Release-1.1\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                />
+                <Reference
+                    Name = "System.Web"
+                    AssemblyName = "System.Web"
+                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
+                />
+                <Reference
+                    Name = "nunit.framework"
+                    AssemblyName = "nunit.framework"
+                    HintPath = "..\..\..\lib\Net\1.1\nunit.framework.dll"
+                />
+                <Reference
+                    Name = "System.Web.Services"
+                    AssemblyName = "System.Web.Services"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.Services.dll"
+                />
+                <Reference
+                    Name = "System.Drawing"
+                    AssemblyName = "System.Drawing"
+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
+                />
+                <Reference
+                    Name = "Spring.Core.2003"
+                    Project = "{710961A3-0DF4-49E4-A26E-F5B9C044AC84}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Core.Tests.2003"
+                    Project = "{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Spring.Web.2003"
+                    Project = "{BA4789EB-281A-48EA-8763-28B9F0596A18}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+                <Reference
+                    Name = "Common.Logging"
+                    AssemblyName = "Common.Logging"
+                    HintPath = "..\..\..\lib\Net\1.1\Common.Logging.dll"
+                />
+                <Reference
+                    Name = "Rhino.Mocks"
+                    AssemblyName = "Rhino.Mocks"
+                    HintPath = "..\..\..\lib\Net\1.1\Rhino.Mocks.dll"
+                />
+                <Reference
+                    Name = "NUnitAsp"
+                    AssemblyName = "NUnitAsp"
+                    HintPath = "..\..\..\lib\Net\1.1\NUnitAsp.dll"
+                />
+                <Reference
+                    Name = "NUnitAspEx"
+                    AssemblyName = "NUnitAspEx"
+                    HintPath = "..\..\..\lib\Net\1.1\NUnitAspEx.dll"
+                />
+                <Reference
+                    Name = "nunit.core.interfaces"
+                    AssemblyName = "nunit.core.interfaces"
+                    HintPath = "..\..\..\lib\Net\1.1\nunit.core.interfaces.dll"
+                    Private = "False"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "MyNUnitAddinHelper.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Spring.Web.Tests.build"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Caching\AspNetCacheTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\HttpApplicationConfigurerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Context\Support\HttpApplicationConfigurerTests.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Core\IO\WebResourceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Support\TestForm.aspx"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Objects\Factory\Support\TestForm.aspx.cs"
+                    DependentUpon = "TestForm.aspx"
+                    SubType = "ASPXCodeBehind"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Data\Spring\Web\Support\PageHandlerFactoryTests\DisablesSession.aspx"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Web\Support\PageHandlerFactoryTests\MaintainsSession1.aspx"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Web\Support\PageHandlerFactoryTests\MaintainsSession2.aspx"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Web\Support\PageHandlerFactoryTests\TransferAfterSetResult.aspx"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Web\Support\PageHandlerFactoryTests\TransferAfterSetResultSave.aspx"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "Data\Spring\Web\Support\PageHandlerFactoryTests\Web.Config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "Globalization\Resolvers\DefaultWebCultureResolverTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\WebObjectDefinitionFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Objects\Factory\Support\WebObjectFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TestSupport\NUnitAdapter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TestSupport\TestPage.cs"
+                    SubType = "ASPXCodeBehind"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TestSupport\TestWebContext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TestSupport\TestWebContextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TestSupport\VirtualEnvironmentMock.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "TestSupport\VoidDelegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\HttpContextStorageTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Threading\HybridContextStorageTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ControlInterceptionTests.cs"
+                    SubType = "ASPXCodeBehind"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\ControlInterceptionTests.objects.xml"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "Util\WebDIPerformanceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Util\WebUtilsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Services\WebServiceExporterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\AbstractHandlerFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\MimeMediaTypeTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\PageHandlerFactoryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\Support\ResultTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\PageTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\UserControlTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\AbstractValidationControlTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\HeadTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\ValidationErrorsTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\ValidationErrorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "Web\UI\Controls\ValidationSummaryTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2005.csproj b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2005.csproj
new file mode 100644
index 00000000..6cd494bb
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2005.csproj
@@ -0,0 +1,198 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C67E47AA-1ACD-41B4-A465-4D336A2319CA}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>Spring.Web.Tests</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Spring</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Web.Tests\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>0618</NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\build\VS.Net.2005\Spring.Web.Tests\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET_2_0</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Caching\AspNetCacheTests.cs" />
+    <Compile Include="Context\Support\HttpApplicationConfigurerTests.cs" />
+    <Compile Include="Context\Support\WebApplicationContextTests.cs" />
+    <Compile Include="Core\IO\WebResourceTests.cs" />
+    <Compile Include="Data\Spring\Objects\Factory\Support\TestForm.aspx.cs">
+      <DependentUpon>TestForm.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Globalization\Resolvers\DefaultWebCultureResolverTests.cs" />
+    <Compile Include="MyNUnitAddinHelper.cs" />
+    <Compile Include="Objects\Factory\Support\WebObjectDefinitionFactoryTests.cs" />
+    <Compile Include="Objects\Factory\Support\WebObjectFactoryTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TestSupport\NUnitAdapter.cs" />
+    <Compile Include="TestSupport\TestPage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestSupport\TestWebContext.cs" />
+    <Compile Include="TestSupport\TestWebContextTests.cs" />
+    <Compile Include="TestSupport\VirtualEnvironmentMock.cs" />
+    <Compile Include="TestSupport\VoidDelegate.cs" />
+    <Compile Include="Threading\HttpContextStorageTests.cs" />
+    <Compile Include="Threading\HybridContextStorageTests.cs" />
+    <Compile Include="Util\ControlInterceptionTests.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Util\WebDIPerformanceTests.cs" />
+    <Compile Include="Util\WebUtilsTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\Services\WebServiceExporterTests.cs" />
+    <Compile Include="Web\Support\AbstractHandlerFactoryTests.cs" />
+    <Compile Include="Web\Support\MimeMediaTypeTests.cs" />
+    <Compile Include="Web\Support\PageHandlerFactoryTests.cs" />
+    <Compile Include="Web\Support\ResultTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Web\UI\Controls\AbstractValidationControlTests.cs" />
+    <Compile Include="Web\UI\Controls\HeadTests.cs" />
+    <Compile Include="Web\UI\Controls\ValidationErrorsTests.cs" />
+    <Compile Include="Web\UI\Controls\ValidationSummaryTests.cs" />
+    <Compile Include="Web\UI\PageTests.cs">
+    </Compile>
+    <Compile Include="Web\UI\UserControlTests.cs" />
+    <None Include="Data\Spring\Context\Support\WebApplicationContextTests\Web.Config" />
+    <None Include="Data\Spring\Web\Support\PageHandlerFactoryTests\Web.Config.net-1.1" />
+    <None Include="Data\Spring\Web\Support\PageHandlerFactoryTests\Web.Config.net-2.0" />
+    <None Include="Spring.Web.Tests.build" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Util\ControlInterceptionTests.objects.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Context\Support\HttpApplicationConfigurerTests.xml" />
+    <Content Include="Data\Spring\Context\Support\WebApplicationContextTests\Dummy.aspx" />
+    <Content Include="Data\Spring\Objects\Factory\Support\TestForm.aspx" />
+    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\TransferAfterSetResult.aspx" />
+    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\MaintainsSession1.aspx" />
+    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\MaintainsSession2.aspx" />
+    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\DisablesSession.aspx" />
+    <Content Include="Data\Spring\Web\Support\PageHandlerFactoryTests\TransferAfterSetResultSave.aspx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\antlr.runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="Common.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.core.interfaces, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.core.interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="NUnitAsp, Version=1.5.1.27647, Culture=neutral, PublicKeyToken=f9bdb8e9d00f2b23">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\NUnitAsp.dll</HintPath>
+    </Reference>
+    <Reference Include="NUnitAspEx, Version=1.0.2892.39670, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\NUnitAspEx.dll</HintPath>
+    </Reference>
+    <Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Net\2.0\Rhino.Mocks.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2005.csproj">
+      <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
+      <Name>Spring.Core.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web\Spring.Web.2005.csproj">
+      <Project>{BA4789EB-281A-48EA-8763-28B9F0596A18}</Project>
+      <Name>Spring.Web.2005</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2005.csproj">
+      <Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
+      <Name>Spring.Core.Tests.2005</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>echo "Copying .xml files for tests"
+xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2005\Spring.Web.Tests\$(ConfigurationName)\ /y /s /q /d
+</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
new file mode 100644
index 00000000..62314393
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.build
@@ -0,0 +1,50 @@
+<?xml version="1.0" ?>
+<project name="Spring.Web.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
+    <!--
+        Required properties:
+            * current.bin.dir           - (path) root level to build to
+            * build.debug               - (true|false) debug build?
+            * current.build.defines.csc - framework-specific build defines
+            * lib.dir                   - framework-specific assembly references
+    -->
+    <target name="build">
+        <!-- build Spring.Web -->
+        <csc target="library" define="${current.build.defines.csc}" warnaserror="true" debug="${current.build.debug}"
+            output="${current.bin.dir}/${project::get-name()}.dll" doc="${current.bin.dir}/${project::get-name()}.xml">
+            <nowarn>
+                <warning number="${nowarn.numbers.test}" /> <!-- 1701 -->
+            </nowarn>
+            <sources failonempty="true">
+                <include name="**/*.cs" />
+                <include name="../CommonAssemblyInfo.cs" />
+            </sources>
+            <resources prefix="Spring" dynamicprefix="true" failonempty="true">
+                <include name="**/*.resx" />
+                <include name="**/*.xsd" />
+                <include name="**/*.txt" />
+                <include name="**/*.xml" />
+                <exclude name="Data/**/*" />
+                <exclude name="obj/**/*" />
+            </resources>
+            <references basedir="${current.bin.dir}">
+                <include name="*.dll" />
+                <exclude name="${project::get-name()}.dll" />
+                <exclude name="CloverRuntime.dll" />
+                <include name="${lib.dir}/nunit.core.interfaces.dll" />
+            </references>
+        </csc>
+        <copy todir="${current.bin.dir}">
+            <fileset basedir="${project::get-base-directory()}/Data">
+                <include name="**/*.*" />
+            </fileset>
+        </copy>
+
+    </target>
+    <target name="test" depends="build">
+        <nunit2outproc>
+            <formatter type="Plain" />
+            <formatter type="Xml" usefile="true" extension=".xml" outputdir="${current.bin.dir}/results" />
+            <test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
+        </nunit2outproc>
+    </target>
+</project>
diff --git a/test/Spring/Spring.Web.Tests/TestSupport/NUnitAdapter.cs b/test/Spring/Spring.Web.Tests/TestSupport/NUnitAdapter.cs
new file mode 100644
index 00000000..88ce07c2
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/TestSupport/NUnitAdapter.cs
@@ -0,0 +1,285 @@
+#region Copyright (c) 2002, 2005 by James Shore
+/********************************************************************************************************************
+'
+' Copyright (c) 2002, 2005 by James Shore
+'
+' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 
+' documentation files (the "Software"), to deal in the Software without restriction, including without limitation 
+' the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+' to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+'
+' The above copyright notice and this permission notice shall be included in all copies or substantial portions 
+' of the Software.
+'
+' THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+' THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+' AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+' CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+' DEALINGS IN THE SOFTWARE.
+'
+'******************************************************************************************************************/
+#endregion
+
+#region Instructions
+/********************************************************************************************************************
+ * 
+ * This file allows NUnitAsp to be used with NUnit.  To use, copy this file 
+ * into your test project.  For additional information, see the NUnitAsp
+ * documentation in your download package or visit
+ * http://nunitasp.sourceforge.net.
+ * 
+ *******************************************************************************************************************/
+#endregion
+
+using System;
+using NUnit.Extensions.Asp;
+using NUnit.Framework;
+
+namespace Spring.TestSupport
+{ 
+	/// <summary>
+	/// Base class for NUnitAsp test fixtures.  Extend this class to use NUnitAsp.
+	/// </summary>
+	[TestFixture]
+	public abstract class WebFormTestCase : CompatibilityAdapter
+	{
+		private bool setupCalled = false;
+
+		/// <summary>
+		/// Do not call.  For use by NUnit only.
+		/// </summary>
+		[SetUp]
+		public void MasterSetUp() 
+		{
+			setupCalled = true;
+			HttpClient.Default = new HttpClient();
+			SetUp();
+		}
+
+		/// <summary>
+		/// Executed before each test method is run.  Override in subclasses to do subclass
+		/// set up.  NOTE: The [SetUp] attribute cannot be used in subclasses because it is already
+		/// in use.
+		/// </summary>
+		protected virtual void SetUp()
+		{
+		}
+
+		/// <summary>
+		/// Do not call.  For use by NUnit only.
+		/// </summary>
+		[TearDown]
+		public void MasterTearDown()
+		{
+			TearDown();
+		}
+
+		/// <summary>
+		/// Executed after each test method is run.  Override in subclasses to do subclass
+		/// clean up.  NOTE: [TearDown] attribute cannot be used in subclasses because it is
+		/// already in use.
+		/// </summary>
+		protected virtual void TearDown()
+		{
+		}
+
+		/// <summary>
+		/// The web form currently loaded by the browser.
+		/// </summary>
+		protected WebFormTester CurrentWebForm
+		{
+			get 
+			{
+				AssertSetUp();
+				return new WebFormTester(HttpClient.Default);
+			}
+		}
+
+		/// <summary>
+		/// The web browser.
+		/// </summary>
+		protected HttpClient Browser 
+		{
+			get 
+			{
+				AssertSetUp();
+				return HttpClient.Default;
+			}
+		}
+
+		private void AssertSetUp()
+		{
+			if (!setupCalled) 
+			{
+				Fail("A required setup method in WebFormTestCase was not called.  This is probably because you used the [SetUp] attribute in a subclass of WebFormTestCase.  That is not supported.  Override the SetUp() method instead.");
+			}
+		}
+	}
+
+
+
+
+
+
+
+
+
+// Everything below this line is for backwards compatibility and may be deleted.
+
+	/// <summary>
+	/// For backwards compatibility; will be deprecated in the future.
+	/// This class provides convenience methods for common assertions.  You
+	/// should use Assert and WebAssert methods instead.
+	/// </summary>
+	public class CompatibilityAdapter
+	{
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void AssertTrue(bool condition)
+		{
+			Assert.IsTrue(condition);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void AssertTrue(string message, bool condition)
+		{
+			Assert.IsTrue(condition, message);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void AssertEquals(object expected, object actual)
+		{
+			Assert.AreEqual(expected, actual);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void AssertEquals(string message, object expected, object actual)
+		{
+			Assert.AreEqual(expected, actual, message);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void AssertNotNull(object o)
+		{
+			Assert.IsNotNull(o);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void AssertNotNull(string message, object o)
+		{
+			Assert.IsNotNull(o, message);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void AssertNull(object o)
+		{
+			Assert.IsNull(o);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void AssertNull(string message, object o)
+		{
+			Assert.IsNull(o, message);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void AssertSame(object expected, object actual)
+		{
+			Assert.AreSame(expected, actual);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void AssertSame(string message, object expected, object actual)
+		{
+			Assert.AreSame(expected, actual, message);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void Fail(string message)
+		{
+			Assert.Fail(message);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void AssertVisibility(ControlTester tester, bool expectedVisibility)
+		{
+			if (expectedVisibility) WebAssert.Visible(tester);
+			else WebAssert.NotVisible(tester);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void AssertEquals(string[] expected, string[] actual)
+		{
+			WebAssert.AreEqual(expected, actual);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		public static void AssertEquals(string message, string[] expected, string[] actual)
+		{
+			WebAssert.AreEqual(expected, actual, message);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		//[CLSCompliant(false)]
+		public static void AssertEquals(string[][] expected, string[][] actual)
+		{
+			WebAssert.AreEqual(expected, actual);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		//[CLSCompliant(false)]
+		public static void AssertEquals(string message, string[][] expected, string[][] actual)
+		{
+			WebAssert.AreEqual(expected, actual, message);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		//[CLSCompliant(false)]
+		public static void AssertEqualsIgnoreOrder(string message, string[][] expected, string[][] actual)
+		{
+			WebAssert.AreEqualIgnoringOrder(expected, actual, message);
+		}
+
+		/// <summary>
+		/// For backwards compatibility; will be deprecated in the future.
+		/// </summary>
+		//[CLSCompliant(false)]
+		public static void AssertSortOrder(string message, string[][] data, int column, bool isAscending, DataType type)
+		{
+			WebAssert.Sorted(data, column, isAscending, type, message);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/TestSupport/TestPage.cs b/test/Spring/Spring.Web.Tests/TestSupport/TestPage.cs
new file mode 100644
index 00000000..ff9e781a
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/TestSupport/TestPage.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+using System.Reflection;
+using System.Web;
+using System.Web.UI;
+using Page=Spring.Web.UI.Page;
+
+namespace Spring.TestSupport
+{
+    public class TestPage : Page
+    {
+        public TestPage()
+        {
+            this.SharedState = CollectionsUtil.CreateCaseInsensitiveHashtable();
+        }
+
+        public TestPage( HttpContext context ) 
+            :this()
+        {
+            SetIntrinsics(context);
+        }
+
+        public virtual void SetIntrinsics(HttpContext context)
+        {
+            MethodInfo miSetIntrinsics = typeof(System.Web.UI.Page).GetMethod("SetIntrinsics",BindingFlags.Instance|BindingFlags.NonPublic, null, new Type[] { typeof(HttpContext) }, null);
+            miSetIntrinsics.Invoke(this, new object[] {context});
+        }
+
+        public virtual void InitRecursive( Control namingContainer )
+        {
+            MethodInfo miInitRecursive = typeof(System.Web.UI.Control).GetMethod("InitRecursive", BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof(Control) }, null);
+            miInitRecursive.Invoke(this, new object[] {null});
+        }
+
+        public new virtual void InitializeCulture()
+        {
+            base.InitializeCulture();
+        }
+
+        public override System.Web.SessionState.HttpSessionState Session
+        {
+            get
+            {
+                return null;
+            }
+        }
+//        protected override IDictionary CreateValidatorParameters()
+//        {
+//            return null;
+//        }
+
+        public new void SetResult(string resultName)
+        {
+            base.SetResult(resultName);
+        }
+
+        public string Render(string newLine)
+        {
+            StringWriter sw = new StringWriter();
+            HtmlTextWriter writer = new HtmlTextWriter(sw, "");
+            writer.NewLine = newLine;
+            base.Render(writer);
+            writer.Flush();
+            writer.Close();
+            string result = sw.GetStringBuilder().ToString();
+            return result;
+        }
+    }
+}
diff --git a/test/Spring/Spring.Web.Tests/TestSupport/TestWebContext.cs b/test/Spring/Spring.Web.Tests/TestSupport/TestWebContext.cs
new file mode 100644
index 00000000..62d5c1fa
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/TestSupport/TestWebContext.cs
@@ -0,0 +1,93 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections.Specialized;
+using System.IO;
+using System.Threading;
+using System.Web;
+using System.Web.Hosting;
+
+#endregion
+
+namespace Spring.TestSupport
+{
+    public class TestWebContext : IDisposable
+    {
+        private readonly TextWriter _out;
+        private readonly HttpWorkerRequest _wr;
+        [ThreadStatic] private static TestWebContext _wc;
+
+        public static void Create(string virtualPath, string page)
+        {
+            _wc = new TestWebContext(virtualPath, page);
+        }
+
+        public static void Release()
+        {
+            if (_wc != null)
+            {
+                _wc.Dispose();
+            }
+        }
+
+        public TestWebContext(string virtualPath, string page)
+        {
+            _out = new StringWriter();
+            HttpWorkerRequest wr;
+            object appPath = Thread.GetDomain().GetData(".appPath");
+            if (appPath != null)
+            {
+                wr = new SimpleWorkerRequest(page, string.Empty, _out);
+            }
+            else
+            {
+                string physDir = AppDomain.CurrentDomain.BaseDirectory + "\\";
+                wr = new SimpleWorkerRequest(virtualPath, physDir, page, string.Empty, _out);
+            }
+            HttpContext ctx = new HttpContext(wr);
+            HttpContext.Current = ctx;
+            HttpBrowserCapabilities browser = new HttpBrowserCapabilities();
+#if NET_2_0
+            browser.Capabilities = CollectionsUtil.CreateCaseInsensitiveHashtable();
+            browser.Capabilities[string.Empty] = "Test User Agent"; // string.Empty is the key for "user agent"
+#endif
+            ctx.Request.Browser = browser;
+            _wr = wr;
+        }
+
+        public HttpWorkerRequest HttpWorkerRequest
+        {
+            get { return _wr; }
+        }
+
+        public TextWriter Out
+        {
+            get { return _out; }
+        }
+
+        public void Dispose()
+        {
+            HttpContext.Current = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/TestSupport/TestWebContextTests.cs b/test/Spring/Spring.Web.Tests/TestSupport/TestWebContextTests.cs
new file mode 100644
index 00000000..e499218c
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/TestSupport/TestWebContextTests.cs
@@ -0,0 +1,62 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using NUnit.Framework;
+using Spring.Globalization;
+
+#endregion
+
+namespace Spring.TestSupport
+{
+    /// <summary>
+    /// The base class for tests to run within a TestWebContext
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: TestWebContextTests.cs,v 1.1 2008/03/15 11:19:39 oakinger Exp $</version>
+    public abstract class TestWebContextTests
+    {
+        [SetUp]
+        public void SetUp()
+        {
+            // ensure, uiCulture and culture are set to different cultures
+            CultureTestScope.Set();
+            TestWebContext.Create("/apppath", "testpage.aspx");
+            DoSetUp();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            DoTearDown();
+            TestWebContext.Release();
+            CultureTestScope.Reset();
+        }
+
+        protected virtual void DoSetUp()
+        {            
+        }
+
+        protected void DoTearDown()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/TestSupport/VirtualEnvironmentMock.cs b/test/Spring/Spring.Web.Tests/TestSupport/VirtualEnvironmentMock.cs
new file mode 100644
index 00000000..5c63a4ae
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/TestSupport/VirtualEnvironmentMock.cs
@@ -0,0 +1,72 @@
+using System;
+using System.IO;
+using Spring.Util;
+
+namespace Spring.TestSupport
+{
+    /// <summary>
+    /// Test environment implementation.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: VirtualEnvironmentMock.cs,v 1.5 2008/03/14 12:02:46 oakinger Exp $</version>
+    internal class VirtualEnvironmentMock : IVirtualEnvironment, IDisposable
+    {
+        private readonly IVirtualEnvironment _prevEnvironment;
+
+        private readonly string _currentVirtualFilePath;
+        private readonly string _pathInfo;
+        private string _currentExecutionFilePath;
+        private readonly string _applicationVirtualPath;
+
+        public VirtualEnvironmentMock(string currentVirtualFilePath, string pathInfo, string applicationVirtualPath, bool autoInitialize)
+        {
+            _currentVirtualFilePath = currentVirtualFilePath;
+            _pathInfo = (pathInfo == null || pathInfo.Length == 0) ? "" : "/" + pathInfo.TrimStart('/'); // prevent null string and ensure '/' prefixed
+            _applicationVirtualPath = "/" + ("" + applicationVirtualPath).Trim('/');
+            if (!_applicationVirtualPath.EndsWith("/")) _applicationVirtualPath = _applicationVirtualPath + "/";
+
+            _prevEnvironment = VirtualEnvironment.SetInstance(this);
+            if (autoInitialize)
+            {
+                VirtualEnvironment.SetInitialized();
+            }
+        }
+
+        public string ApplicationVirtualPath
+        {
+            get { return _applicationVirtualPath; }
+        }
+
+        public string CurrentVirtualPath
+        {
+            get
+            {
+                return _currentVirtualFilePath + _pathInfo;
+            }
+        }
+
+        public string CurrentVirtualFilePath
+        {
+            get { return _currentVirtualFilePath; }
+        }
+
+        public string CurrentExecutionFilePath
+        {
+            get { return this._currentExecutionFilePath; }
+            set { this._currentExecutionFilePath = value; }
+        }
+
+        public string MapPath(string virtualPath)
+        {
+            string basePath = Path.GetDirectoryName(new Uri(GetType().Assembly.CodeBase).LocalPath);
+            string resultPath = WebUtils.CreateAbsolutePath(this.ApplicationVirtualPath, virtualPath);
+            resultPath = basePath.TrimEnd('\\') + "\\" + resultPath.Replace('/', '\\').TrimStart('\\');
+            return resultPath;
+        }
+
+        public void Dispose()
+        {
+            VirtualEnvironment.SetInstance(_prevEnvironment);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/TestSupport/VoidDelegate.cs b/test/Spring/Spring.Web.Tests/TestSupport/VoidDelegate.cs
new file mode 100644
index 00000000..55b6fb14
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/TestSupport/VoidDelegate.cs
@@ -0,0 +1,7 @@
+namespace Spring.TestSupport
+{
+    /// <summary>
+    /// Signature of a method with no args and no return type
+    /// </summary>
+    internal delegate void VoidDelegate();
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Threading/HttpContextStorageTests.cs b/test/Spring/Spring.Web.Tests/Threading/HttpContextStorageTests.cs
new file mode 100644
index 00000000..69129c2b
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Threading/HttpContextStorageTests.cs
@@ -0,0 +1,54 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.IO;
+using System.Web;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Threading
+{
+    /// <summary>
+    /// Apply common thread-storage tests for <see cref="HttpContextStorage"/>
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: HttpContextStorageTests.cs,v 1.1 2007/02/02 21:31:18 oakinger Exp $</version>  
+    [TestFixture]
+    public class HttpContextStorageTests : CommonThreadStorageTests
+    {
+        protected override IThreadStorage CreateStorage()
+        {
+            return new HttpContextStorage();
+        }
+
+        protected override void ThreadSetup()
+        {
+            HttpContext.Current = new HttpContext(new HttpRequest("/page.aspx", "http://localhost/page.aspx", null), new HttpResponse(new StringWriter()));
+        }
+
+        protected override void ThreadCleanup()
+        {
+            HttpContext.Current = null;
+        }
+    }
+}
diff --git a/test/Spring/Spring.Web.Tests/Threading/HybridContextStorageTests.cs b/test/Spring/Spring.Web.Tests/Threading/HybridContextStorageTests.cs
new file mode 100644
index 00000000..1ff54849
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Threading/HybridContextStorageTests.cs
@@ -0,0 +1,54 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System.IO;
+using System.Web;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Threading
+{
+    /// <summary>
+    /// Apply common thread-storage tests for <see cref="HybridContextStorage"/>
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: HybridContextStorageTests.cs,v 1.1 2007/02/02 21:31:18 oakinger Exp $</version>  
+    [TestFixture]
+    public class HybridContextStorageTests : CommonThreadStorageTests
+    {
+        protected override IThreadStorage CreateStorage()
+        {
+            return new HybridContextStorage();
+        }
+
+        protected override void ThreadSetup()
+        {
+            HttpContext.Current = new HttpContext(new HttpRequest("/page.aspx", "http://localhost/page.aspx", null), new HttpResponse(new StringWriter()));
+        }
+
+        protected override void ThreadCleanup()
+        {
+            HttpContext.Current = null;
+        }
+    }
+}
diff --git a/test/Spring/Spring.Web.Tests/Util/ControlInterceptionTests.cs b/test/Spring/Spring.Web.Tests/Util/ControlInterceptionTests.cs
new file mode 100644
index 00000000..abe77f38
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Util/ControlInterceptionTests.cs
@@ -0,0 +1,296 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Web.UI;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.TestSupport;
+using Spring.Web.Support;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Unit tests for the ControlInterceptor class.
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ControlInterceptionTests.cs,v 1.9 2008/03/14 12:02:46 oakinger Exp $</version>
+    [TestFixture]
+    public class ControlInterceptionTests
+    {
+        private const string RES_OBJECTS =
+            "assembly://Spring.Web.Tests/Spring.Util/ControlInterceptionTests.objects.xml";
+
+				static ControlInterceptionTests()
+				{
+					Common.Logging.LogManager.Adapter = new Common.Logging.Simple.TraceLoggerFactoryAdapter();
+				}
+
+        [SetUp]
+        public void SetUp()
+        {
+            string physDir = AppDomain.CurrentDomain.BaseDirectory + "\\";
+            IApplicationContext appContext =
+                new XmlApplicationContext(AbstractApplicationContext.DefaultRootContextName, false, RES_OBJECTS);
+            ContextRegistry.RegisterContext(appContext);
+            appContext = new XmlApplicationContext("/controls/", false, appContext);
+            ContextRegistry.RegisterContext(appContext);
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            ContextRegistry.Clear();
+        }
+
+        [Test]
+        public void ADDandADDATInjectDependencies()
+        {
+            Control ctl = GetRootControl();
+
+            MockControl mock = new MockControl();
+            ctl.Controls.Add(mock);
+            Assert.IsTrue(mock.GotIt);
+
+            mock = new MockControl();
+            ctl.Controls.AddAt(0, mock);
+            Assert.IsTrue(mock.GotIt);
+        }
+
+        [Test]
+        public void HierarchyGetsInjectedAfterAttachToTree()
+        {
+            MockControl subControl = new MockControl();
+            MockControl subSubControl = new MockControl();
+            subControl.Controls.Add(subSubControl);
+
+            // DI occcurs *after* adding control(s) to rooted hierarchy
+            Assert.IsFalse(subControl.GotIt);
+            Assert.IsFalse(subSubControl.GotIt);
+
+            Control rootControl = GetRootControl();
+            rootControl.Controls.Add(subControl);
+            Assert.IsTrue(subControl.GotIt);
+            Assert.IsTrue(subSubControl.GotIt);
+
+            MockControl subSubSubControl = new MockControl();
+            subSubControl.Controls.Add(subSubSubControl);
+            Assert.IsTrue(subSubSubControl.GotIt);
+        }
+
+        [Test]
+        public void DealsWithNoninheritableControlCollections()
+        {
+            Control rootControl = GetRootControl();
+
+            Control ctl = new ControlWithNoninheritableCollectionType();
+            rootControl.Controls.Add(ctl);
+
+            MockControl subControl = new MockControl();
+            ctl.Controls.Add(subControl);
+            Assert.IsTrue(subControl.GotIt);
+
+            MockControl subControl2 = new MockControl();
+            ctl.Controls.AddAt(0, subControl2);
+            Assert.IsTrue(subControl2.GotIt);
+        }
+
+        [Test]
+        public void DealsWithControlCollectionsHavingNonStandardConstructor()
+        {
+            Control rootControl = GetRootControl();
+
+            Control ctl = new ControlWithCollectionTypeHavingNonStandardConstructor();
+            rootControl.Controls.Add(ctl);
+
+            MockControl subControl = new MockControl();
+            ctl.Controls.Add(subControl);
+            Assert.IsTrue(subControl.GotIt);
+
+            MockControl subControl2 = new MockControl();
+            ctl.Controls.AddAt(0, subControl2);
+            Assert.IsTrue(subControl2.GotIt);
+        }
+
+        [Test]
+        public void DealsWithControlsImplementingISupportsWebDependencyInjection()
+        {
+            Control rootControl = GetRootControl();
+
+            Control ctl = new ControlSupportingWebDI();
+            rootControl.Controls.Add(ctl);
+
+            MockControl subControl = new MockControl();
+            ctl.Controls.Add(subControl);
+            Assert.IsTrue(subControl.GotIt);
+
+            MockControl subControl2 = new MockControl();
+            ctl.Controls.AddAt(0, subControl2);
+            Assert.IsTrue(subControl2.GotIt);
+        }
+
+        [Test]
+        public void SetsApplicationContextOnIApplicationContextAware()
+        {
+            using (new TestWebContext("/", "context.aspx"))
+            {
+                Control rootControl = GetRootControl();
+
+                Control ctl = new ControlSupportingWebDI();
+                rootControl.Controls.Add(ctl);
+
+                MockControl subControl = new MockControl();
+                ctl.Controls.Add(subControl);
+                Assert.IsTrue(subControl.GotIt);
+                Assert.IsNotNull(subControl.ApplicationContext);
+                Assert.IsTrue(ContextRegistry.GetContext() == subControl.ApplicationContext);
+
+                // controls get AppContext from to their location (if any)
+                MockControl subControl2 = new MockControl("/controls");
+                ctl.Controls.AddAt(0, subControl2);
+                Assert.IsTrue(subControl2.GotIt);
+                Assert.IsNotNull(subControl2.ApplicationContext);
+                Assert.IsTrue(ContextRegistry.GetContext("/controls/") == subControl2.ApplicationContext);
+            }
+        }
+
+        private Control GetRootControl()
+        {
+            Page ctl = new Page();
+            WebDependencyInjectionUtils.InjectDependenciesRecursive(ContextRegistry.GetContext(), ctl);
+            return ctl;
+        }
+    }
+
+    #region Test Support Classes
+
+    public class MockControl : UserControl, IApplicationContextAware
+    {
+        private bool _gotIt = false;
+        private IApplicationContext _applicationContext;
+        private string _templateSourceDirectory = string.Empty;
+
+        public MockControl()
+        {
+        }
+
+        public MockControl(string _templateSourceDirectory)
+        {
+            this._templateSourceDirectory = _templateSourceDirectory;
+        }
+
+        public bool GotIt
+        {
+            get { return this._gotIt; }
+            set
+            {
+                // ensure DI occurs only once
+                Assert.IsFalse(GotIt);
+                this._gotIt = value;
+            }
+        }
+
+        public IApplicationContext ApplicationContext
+        {
+            get { return _applicationContext; }
+            set { _applicationContext = value; }
+        }
+
+        public override string TemplateSourceDirectory
+        {
+            get { return _templateSourceDirectory; }
+        }
+    }
+
+    public class SimpleControl : Control
+    {
+    }
+
+    internal class NoninheritableControlCollection : ControlCollection
+    {
+        public NoninheritableControlCollection(Control owner)
+            : base(owner)
+        {
+        }
+    }
+
+    public class ControlCollectionWithNonStandardConstructor : ControlCollection
+    {
+        private int _someValue;
+        private string _someAdditionalParameter;
+
+        public ControlCollectionWithNonStandardConstructor(Control owner, string someAdditionalParamater, int someValue)
+            : base(owner)
+        {
+            _someAdditionalParameter = someAdditionalParamater;
+            _someValue = someValue;
+        }
+
+        public int SomeValue
+        {
+            get { return this._someValue; }
+        }
+
+        public string SomeAdditionalParameter
+        {
+            get { return this._someAdditionalParameter; }
+        }
+    }
+
+    public class ControlWithNoninheritableCollectionType : Control
+    {
+        protected override ControlCollection CreateControlCollection()
+        {
+            return new NoninheritableControlCollection(this);
+        }
+    }
+
+    public class ControlWithCollectionTypeHavingNonStandardConstructor : Control
+    {
+        protected override ControlCollection CreateControlCollection()
+        {
+            return new ControlCollectionWithNonStandardConstructor(this, "someAdditionalParameter", 10);
+        }
+    }
+
+    public class ControlSupportingWebDI : Control, ISupportsWebDependencyInjection
+    {
+        private IApplicationContext _defaultApplicationContext;
+
+        public IApplicationContext DefaultApplicationContext
+        {
+            get { return this._defaultApplicationContext; }
+            set { this._defaultApplicationContext = value; }
+        }
+
+        protected override void AddedControl(Control control, int index)
+        {
+            WebDependencyInjectionUtils.InjectDependenciesRecursive(_defaultApplicationContext, control);
+            base.AddedControl(control, index);
+        }
+    }
+
+    #endregion Test Support Classes
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Util/ControlInterceptionTests.objects.xml b/test/Spring/Spring.Web.Tests/Util/ControlInterceptionTests.objects.xml
new file mode 100644
index 00000000..320c4faf
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Util/ControlInterceptionTests.objects.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<objects xmlns="http://www.springframework.net">
+
+  <object id="Spring.Util.MockControl" abstract="true">
+	<property name="GotIt" value="true" />
+  </object>
+
+</objects>		
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Util/WebDIPerformanceTests.cs b/test/Spring/Spring.Web.Tests/Util/WebDIPerformanceTests.cs
new file mode 100644
index 00000000..313a6c5d
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Util/WebDIPerformanceTests.cs
@@ -0,0 +1,140 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Data;
+using System.Web.UI.WebControls;
+using NUnit.Framework;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.TestSupport;
+
+#if NET_2_0
+using System.Collections;
+using System.Collections.Generic;
+#endif
+
+#endregion
+
+namespace Spring.Util
+{
+    [TestFixture]
+    public class WebDIPerformanceTests
+    {
+        private DataView CreateDataSource()
+        {
+            DataTable dt = new DataTable();
+            DataRow dr;
+
+            dt.Columns.Add(new DataColumn("IntegerValue", typeof(Int32)));
+            dt.Columns.Add(new DataColumn("StringValue", typeof(string)));
+            dt.Columns.Add(new DataColumn("CurrencyValue", typeof(double)));
+
+            for (int i = 0; i < 100; i++)
+            {
+                dr = dt.NewRow();
+
+                dr[0] = i;
+                dr[1] = "Item " + i;
+                dr[2] = 1.23 * (i + 1);
+
+                dt.Rows.Add(dr);
+            }
+
+            DataView dv = new DataView(dt);
+            return dv;
+        }
+
+        [Test, Explicit]
+        public void RunTestWithoutDI()
+        {
+            DataView dv = CreateDataSource();
+
+            int runs = 1000;
+
+            StopWatch watch = new StopWatch();
+            using (watch.Start("Duration: {0}"))
+            {
+                for (int i = 0; i < runs; i++)
+                {
+                    DataGrid grid = new DataGrid();
+                    grid.DataSource = dv;
+                    grid.DataBind();
+                }
+            }
+        }
+
+        [Test, Explicit]
+        public void RunTestWithDI()
+        {
+            DataView dv = CreateDataSource();
+            IApplicationContext ctx = new StaticApplicationContext();
+
+            int runs = 1000;
+
+            StopWatch watch = new StopWatch();
+            using (watch.Start("Duration: {0}"))
+            {
+                for (int i = 0; i < runs; i++)
+                {
+                    DataGrid grid = new DataGrid();
+                    Spring.Web.Support.WebDependencyInjectionUtils.InjectDependenciesRecursive(ctx, grid);
+                    grid.DataSource = dv;
+                    grid.DataBind();
+                }
+            }
+        }
+
+#if NET_2_0
+        [Test, Explicit]
+        public void TestHashtableVsDictionary()
+        {
+            int runs = 10000000;
+            Hashtable ht = new Hashtable();
+            Dictionary<object, object> dict = new Dictionary<object, object>();
+
+            for(int i = 0; i < 100000; i++)
+            {
+                ht.Add(i, new object());
+                dict.Add(new object(), new object());
+            }
+
+            StopWatch watch = new StopWatch();
+            using (watch.Start("Duration Hashtable: {0}"))
+            {
+                for (int i = 0; i < runs; i++)
+                {
+                    ht.ContainsKey(i);
+                }
+            }
+
+            using (watch.Start("Duration Dictionary: {0}"))
+            {
+                for (int i = 0; i < runs; i++)
+                {
+                    dict.ContainsKey(i);
+                }
+            }
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Util/WebUtilsTests.cs b/test/Spring/Spring.Web.Tests/Util/WebUtilsTests.cs
new file mode 100644
index 00000000..d8a903da
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Util/WebUtilsTests.cs
@@ -0,0 +1,220 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Objects.Factory;
+using Spring.Objects.Factory.Support;
+using Spring.TestSupport;
+
+#endregion
+
+namespace Spring.Util
+{
+    /// <summary>
+    /// Unit tests for the WebUtilsTests class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: WebUtilsTests.cs,v 1.9 2008/03/19 18:05:08 oakinger Exp $</version>
+    [TestFixture]
+    public sealed class WebUtilsTests
+    {
+        private const string ExpectedPageName = "foo";
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void GetPageTypeWithNullPageName()
+        {
+            WebObjectUtils.GetPageType(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void GetPageTypeWithEmptyStringPageName()
+        {
+            WebObjectUtils.GetPageType(string.Empty);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void GetPageTypeWithWhitespacedPageName()
+        {
+            WebObjectUtils.GetPageType("   ");
+        }
+
+        [Test]
+        [ExpectedException(typeof (ObjectCreationException))]
+        public void CreatePageInstanceWhenNotRunningInServerContext()
+        {
+            WebObjectUtils.CreatePageInstance("foo.aspx");
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void GetPageNameWithNullUrl()
+        {
+            WebUtils.GetPageName(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void GetPageNameWithEmptyUrl()
+        {
+            WebUtils.GetPageName(string.Empty);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void GetPageNameWithWhitespacedUrl()
+        {
+            WebUtils.GetPageName("   ");
+        }
+
+        [Test]
+        public void GetPageNameSunnyDay()
+        {
+            string pageName = WebUtils.GetPageName("foo.aspx");
+            Assert.AreEqual(ExpectedPageName, pageName);
+            pageName = WebUtils.GetPageName("~/foo.aspx");
+            Assert.AreEqual(ExpectedPageName, pageName);
+            pageName = WebUtils.GetPageName("~/Bingo/foo.aspx");
+            Assert.AreEqual(ExpectedPageName, pageName);
+            pageName = WebUtils.GetPageName("/Bingo/foo.aspx");
+            Assert.AreEqual(ExpectedPageName, pageName);
+            pageName = WebUtils.GetPageName("Bingo/foo.aspx");
+            Assert.AreEqual(ExpectedPageName, pageName);
+            pageName = WebUtils.GetPageName("~/Bingo/Rope/foo.aspx");
+            Assert.AreEqual(ExpectedPageName, pageName);
+            pageName = WebUtils.GetPageName("/Bingo/Rope/foo.aspx");
+            Assert.AreEqual(ExpectedPageName, pageName);
+            pageName = WebUtils.GetPageName("Bingo/Rope/foo.aspx");
+            Assert.AreEqual(ExpectedPageName, pageName);
+            pageName = WebUtils.GetPageName("http://www.madeleine.org/Bingo/Rope/foo.aspx");
+            Assert.AreEqual(ExpectedPageName, pageName);
+        }
+
+        [Test]
+        public void GetPageNameWherePageHasOddExtension()
+        {
+            string pageName = WebUtils.GetPageName("foo.odd");
+            Assert.AreEqual(ExpectedPageName, pageName);
+        }
+
+        /// <summary>
+        /// Dont quite know how this would get mapped by IIS, but
+        /// WebUtils.GetPageName should return the page as-is in any case.
+        /// </summary>
+        [Test]
+        public void GetPageNameWherePageHasNoExtension()
+        {
+            string pageName = WebUtils.GetPageName("foo");
+            Assert.AreEqual(ExpectedPageName, pageName);
+            pageName = WebUtils.GetPageName("http://www.madeleine.org/Bingo/Rope/foo");
+            Assert.AreEqual(ExpectedPageName, pageName);
+        }
+
+        [Test]
+        public void TestCreateAbsolutePath()
+        {
+            Assert.AreEqual("/", WebUtils.CreateAbsolutePath("", null));
+            Assert.AreEqual("/", WebUtils.CreateAbsolutePath("/", null));
+            Assert.AreEqual("/MyApp/", WebUtils.CreateAbsolutePath("/MyApp", null));
+            Assert.AreEqual("/MyApp/", WebUtils.CreateAbsolutePath("/MyApp", string.Empty));
+
+            Assert.AreEqual("/MyPath", WebUtils.CreateAbsolutePath(null, "/MyPath"));
+            Assert.AreEqual("/MyPath", WebUtils.CreateAbsolutePath(null, "~/MyPath"));
+
+            Assert.AreEqual("/MyPath", WebUtils.CreateAbsolutePath(string.Empty, "/MyPath"));
+            Assert.AreEqual("/MyPath", WebUtils.CreateAbsolutePath(string.Empty, "~/MyPath"));
+
+            Assert.AreEqual("/MyPath", WebUtils.CreateAbsolutePath("/", "MyPath"));
+            Assert.AreEqual("/MyPath", WebUtils.CreateAbsolutePath("/", "~/MyPath"));
+
+            Assert.AreEqual("/MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp", "MyPath"));
+            Assert.AreEqual("/MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp", "~/MyPath"));
+            Assert.AreEqual("/MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp/", "MyPath"));
+            Assert.AreEqual("/MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp/", "~/MyPath"));
+            Assert.AreEqual("/MyApp/MyPath", WebUtils.CreateAbsolutePath("/MyApp", "/MyApp/MyPath"));
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void CombineVirtualPathsDoesntAcceptNullRoot()
+        {
+            WebUtils.CombineVirtualPaths(null, string.Empty);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void CombineVirtualPathsDoesntAcceptEmptyRoot()
+        {
+            WebUtils.CombineVirtualPaths(string.Empty, string.Empty);
+        }
+        
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void CombineVirtualPathsDoesntAcceptNonRootedRoot()
+        {
+            WebUtils.CombineVirtualPaths("mypath", string.Empty);
+        }
+        
+        [Test]
+        public void CombineVirtualPathsInRootWeb()
+        {
+            // emulate root website context
+            using( new VirtualEnvironmentMock("/somedir/some.file", null, "/", true) )
+            {
+                CombineVirtualPathsSuite( "/" );
+            }            
+        }
+        
+        [Test]
+        public void CombineVirtualPathsInChildWeb()
+        {
+            // emulate child website context
+            using( new VirtualEnvironmentMock("/somedir/some.file", null, "/myapp", true) )
+            {
+                CombineVirtualPathsSuite( "/myapp/" );
+            }            
+        }
+        
+        private void CombineVirtualPathsSuite( string appPath )
+        {
+            Assert.AreEqual("/myotherdir/mypath", WebUtils.CombineVirtualPaths("/myotherdir", "mypath"));
+            Assert.AreEqual("/mypath", WebUtils.CombineVirtualPaths("/irrelevantdir", "/mypath")); // note: that's the difference from CreateAbsolutePath()
+            Assert.AreEqual(appPath + "mypath", WebUtils.CombineVirtualPaths("/irrelevantdir", "~/mypath"));            
+            Assert.AreEqual(appPath + "some/~/mypath", WebUtils.CombineVirtualPaths("/mydir", "~/some/~/mypath"));            
+            Assert.AreEqual("/mydir/some/~/mypath", WebUtils.CombineVirtualPaths("/mydir", "some/~/mypath"));            
+            Assert.AreEqual("/myotherdir/mypath/my.file", WebUtils.CombineVirtualPaths("/myotherdir/some.file", "mypath/my.file"));
+            Assert.AreEqual(appPath + "mypath/my.file", WebUtils.CombineVirtualPaths("/myotherdir/some.file", "~/mypath/my.file"));
+        }
+
+        [Test]
+        public void GetRelativePath()
+        {
+            // case-insensitive
+            Assert.AreEqual("/Mypath", WebUtils.GetRelativePath("/mydir/", "/myDir/Mypath"));
+            Assert.AreEqual("/mYpath", WebUtils.GetRelativePath("/Mydir", "/mYdir/mYpath"));
+            Assert.AreEqual("/myotherdir/mypath", WebUtils.GetRelativePath("/mydir", "/myotherdir/mypath"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs b/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs
new file mode 100644
index 00000000..583a9d90
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs
@@ -0,0 +1,283 @@
+#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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Text;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Web.Services;
+
+using NUnit.Framework;
+
+using Spring.Util;
+using Spring.Core.IO;
+using Spring.Objects.Factory.Xml;
+using Spring.Objects.Factory;
+
+#endregion
+
+namespace Spring.Web.Services
+{
+    /// <summary>
+    /// Unit tests for the WebServiceExporter class.
+    /// </summary>
+    /// <author>Bruno Baia</author>
+    /// <version>$Id: WebServiceExporterTests.cs,v 1.7 2007/12/07 20:26:38 bbaia Exp $</version>
+    [TestFixture]
+    public sealed class WebServiceExporterTests
+    {
+        WebServiceExporter wse = null;
+
+        [SetUp]
+        public void SetUp()
+        {
+            const string xml =
+    @"<?xml version='1.0' encoding='UTF-8' ?>
+<objects xmlns='http://www.springframework.net'>
+	<object id='noDecoratedService' type='Spring.Web.Services.WebServiceExporterTests+NoDecoratedService, Spring.Web.Tests'/>
+    <object id='decoratedService' type='Spring.Web.Services.WebServiceExporterTests+DecoratedService, Spring.Web.Tests'/>
+</objects>";
+            Stream stream = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            IObjectFactory objectFactory = new XmlObjectFactory(new InputStreamResource(stream, string.Empty));
+
+            wse = new WebServiceExporter();
+            wse.ObjectFactory = objectFactory;
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException), "The TargetName property is required.")]
+        public void NullConfig()
+        {
+            wse.ObjectName = "NullConfig";
+            wse.AfterPropertiesSet();
+        }
+
+        [Test]
+        public void ProxiesTargetInterfaces()
+        {
+            wse.ObjectName = "ProxiesTargetInterfaces";
+            wse.TargetName = "noDecoratedService";
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            Assert.IsTrue(typeof(IService).IsAssignableFrom(proxyType));
+        }
+
+        [Test]
+        public void CreatesWebServiceAttributeWithNoDecoratedClassAndMinimalConfig()
+        {
+            wse.ObjectName = "CreatesWebServiceAttributeWithNoDecoratedClassAndMinimalConfig";
+            wse.TargetName = "noDecoratedService";
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            object[] attrs = proxyType.GetCustomAttributes(typeof(WebServiceAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+
+            WebServiceAttribute wsa = attrs[0] as WebServiceAttribute;
+            Assert.AreEqual("CreatesWebServiceAttributeWithNoDecoratedClassAndMinimalConfig", wsa.Name);
+            Assert.AreEqual(string.Empty, wsa.Description);
+            Assert.AreEqual(WebServiceAttribute.DefaultNamespace, wsa.Namespace);
+        }
+
+        [Test]
+        public void CreatesWebServiceAttributeWithNoDecoratedClassAndFullConfig()
+        {
+            wse.ObjectName = "CreatesWebServiceAttributeWithNoDecoratedClassAndFullConfig";
+            wse.TargetName = "noDecoratedService";
+            wse.Name = "My web service name";
+            wse.Description = "My web service description";
+            wse.Namespace = "http://www.springframework.net";
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            object[] attrs = proxyType.GetCustomAttributes(typeof(WebServiceAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+
+            WebServiceAttribute wsa = attrs[0] as WebServiceAttribute;
+            Assert.AreEqual(wse.Name, wsa.Name);
+            Assert.AreEqual(wse.Description, wsa.Description);
+            Assert.AreEqual(wse.Namespace, wsa.Namespace);
+        }
+
+        [Test]
+        public void CreatesDefaultWebMethodAttributeWithNoDecoratedMethod()
+        {
+            wse.ObjectName = "CreatesDefaultWebMethodAttributeWithNoDecoratedMethod";
+            wse.TargetName = "noDecoratedService";
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            MethodInfo method = proxyType.GetMethod("SomeMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetCustomAttributes(typeof(WebMethodAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+        }
+
+        [Test]
+        public void CreatesCustomWebMethodAttributeWithNoDecoratedMethod()
+        {
+            wse.ObjectName = "CreatesCustomWebMethodAttributeWithNoDecoratedMethod";
+            wse.TargetName = "noDecoratedService";
+            wse.MemberAttributes.Add("SomeMethod", new WebMethodAttribute(true)); // default value is false
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            MethodInfo method = proxyType.GetMethod("SomeMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetCustomAttributes(typeof(WebMethodAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+
+            WebMethodAttribute wma = attrs[0] as WebMethodAttribute;
+            Assert.AreEqual(true, wma.EnableSession);
+        }
+
+        [Test]
+        public void OverridesExistingWebServiceAttributeWithDecoratedClass()
+        {
+            wse.ObjectName = "OverridesExistingWebServiceAttributeWithDecoratedClass";
+            wse.TargetName = "decoratedService";
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            object[] attrs = proxyType.GetCustomAttributes(typeof(WebServiceAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+
+            WebServiceAttribute wsa = attrs[0] as WebServiceAttribute;
+            Assert.AreEqual("OverridesExistingWebServiceAttributeWithDecoratedClass", wsa.Name);
+            Assert.AreEqual(string.Empty, wsa.Description);
+            Assert.AreEqual(WebServiceAttribute.DefaultNamespace, wsa.Namespace);
+        }
+
+        [Test]
+        public void UsesExistingWebMethodAttributeWithDecoratedMethod()
+        {
+            wse.ObjectName = "UsesExistingWebMethodAttributeWithDecoratedMethod";
+            wse.TargetName = "decoratedService";
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            MethodInfo method = proxyType.GetMethod("SomeMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetCustomAttributes(typeof(WebMethodAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+
+            WebMethodAttribute wma = attrs[0] as WebMethodAttribute;
+            Assert.AreEqual("SomeMethod description", wma.Description);
+        }
+
+        // TODO : attributes override
+        [Test]
+        [Ignore("Attributes override not implemented.")]
+        public void OverridesExistingWebMethodAttributeWithDecoratedMethod()
+        {
+            wse.ObjectName = "OverridesExistingWebMethodAttributeWithDecoratedMethod";
+            wse.TargetName = "decoratedService";
+            wse.MemberAttributes.Add("SomeMethod", new WebMethodAttribute(true)); // default value is false
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            MethodInfo method = proxyType.GetMethod("SomeMethod");
+            Assert.IsNotNull(method);
+
+            object[] attrs = method.GetCustomAttributes(typeof(WebMethodAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+
+            WebMethodAttribute wma = attrs[0] as WebMethodAttribute;
+            Assert.AreEqual(true, wma.EnableSession);
+        }
+
+
+        [Test]
+        public void AppliesCustomAttributeBuilderToType()
+        {
+            wse.ObjectName = "AppliesCustomAttributeBuilderToType";
+            wse.TargetName = "noDecoratedService";
+            wse.TypeAttributes = new CustomAttributeBuilder[] { 
+                new CustomAttributeBuilder(typeof(WebServiceAttribute).GetConstructor(Type.EmptyTypes), ObjectUtils.EmptyObjects) };
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+
+            object[] attrs = proxyType.GetCustomAttributes(typeof(WebServiceAttribute), true);
+            Assert.IsNotEmpty(attrs);
+            Assert.AreEqual(1, attrs.Length);
+
+            WebServiceAttribute wsa = attrs[0] as WebServiceAttribute;
+            Assert.AreEqual("AppliesCustomAttributeBuilderToType", wsa.Name);
+        }
+
+        [Test]
+        public void UseCustomWebServiceType()
+        {
+            wse.ObjectName = "UseCustomWebServiceType";
+            wse.TargetName = "noDecoratedService";
+            wse.WebServiceBaseType = typeof(CustomWebService);
+            wse.AfterPropertiesSet();
+
+            Type proxyType = wse.ObjectType;
+            Assert.IsTrue(typeof(CustomWebService).IsAssignableFrom(proxyType));
+        }
+
+        #region Test classes
+
+        public interface IService
+        {
+            string SomeMethod(int param);
+        }
+
+        public class NoDecoratedService : IService
+        {
+            public string SomeMethod(int param)
+            {
+                return param.ToString();
+            }
+        }
+
+        [WebService(Name = "Decorated service")]
+        public class DecoratedService : IService
+        {
+            [WebMethod(Description="SomeMethod description")]
+            public string SomeMethod(int param)
+            {
+                return param.ToString();
+            }
+        }
+
+        public class CustomWebService : WebService
+        {
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Web/Support/AbstractHandlerFactoryTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/AbstractHandlerFactoryTests.cs
new file mode 100644
index 00000000..153946fc
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Web/Support/AbstractHandlerFactoryTests.cs
@@ -0,0 +1,86 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Web;
+using NUnit.Framework;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: AbstractHandlerFactoryTests.cs,v 1.1 2008/03/19 18:05:08 oakinger Exp $</version>
+    [TestFixture]
+    public class AbstractHandlerFactoryTests : AbstractHandlerFactory
+    {
+        private class Type1 {}
+       
+        [Test]
+        public void FindWebObjectDefinition()
+        {
+            NamedObjectDefinition nod;
+
+            nod = Find("/path/o1.ext", "/path/o1.ext");
+            Assert.AreEqual( typeof(Type1), nod.ObjectDefinition.ObjectType);
+            Assert.AreEqual( "/path/o1.ext", nod.Name);
+
+            nod = Find("/path/o1.ext", "/o1.ext");
+            Assert.IsNull(nod);
+
+            nod = Find("/path/o1.ext", "/path/o1");
+            Assert.IsNull(nod);
+
+            nod = Find("/path/o1.ext", "o1.ext");
+            Assert.AreEqual(typeof(Type1), nod.ObjectDefinition.ObjectType);
+            Assert.AreEqual("o1.ext", nod.Name);
+
+            nod = Find("/path/o1.ext", "o1");
+            Assert.AreEqual(typeof(Type1), nod.ObjectDefinition.ObjectType);
+            Assert.AreEqual("o1", nod.Name);
+        }
+
+        private NamedObjectDefinition Find(string url, string objectName)
+        {
+            DefaultListableObjectFactory of = new DefaultListableObjectFactory();
+            RootObjectDefinition rod = new RootObjectDefinition(typeof(Type1));
+            of.RegisterObjectDefinition(objectName, rod);
+
+            return FindWebObjectDefinition( url, of );
+        }
+
+        #region AbstractHandlerFactory implementations
+
+        public override IHttpHandler GetHandler(HttpContext context, string requestType, string url,
+                                                string pathTranslated)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Web/Support/MimeMediaTypeTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/MimeMediaTypeTests.cs
new file mode 100644
index 00000000..e1ba007e
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Web/Support/MimeMediaTypeTests.cs
@@ -0,0 +1,94 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// Tests the MediaType class according to http://www.iana.org/assignments/media-types/
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: MimeMediaTypeTests.cs,v 1.1 2007/11/28 23:26:28 oakinger Exp $</version>
+    [TestFixture]
+    public class MimeMediaTypeTests
+    {
+        [Test]
+        public void CreateInstance()
+        {
+            Assert.AreEqual( MimeMediaType.Application.Octet, new MimeMediaType() );
+            MimeMediaType mt = new MimeMediaType("ApPlicatioN");
+            Assert.AreEqual("application", mt.ContentType);
+            Assert.AreEqual("*", mt.SubType);
+
+            Assert.AreEqual("*", new MimeMediaType("ApPlicatioN", null).SubType);
+            Assert.AreEqual("*", new MimeMediaType("ApPlicatioN", "").SubType);
+            Assert.AreEqual("bla", new MimeMediaType("ApPlicatioN", "bla").SubType);
+        }
+
+        [Test]
+        public void ToStringReturnsMimeTypeString()
+        {
+            Assert.AreEqual("application/subtype", new MimeMediaType("ApPlicatioN", "SubType").ToString());
+        }
+
+        [Test]
+        public void Parse()
+        {
+            MimeMediaType mt = MimeMediaType.Parse("text/html");
+            Assert.AreEqual("text", mt.ContentType);
+            Assert.AreEqual("html", mt.SubType);
+
+            try { mt = MimeMediaType.Parse(null); Assert.Fail(); }
+            catch (ArgumentNullException) { /* ok */ }
+            try { mt = MimeMediaType.Parse(""); Assert.Fail(); }
+            catch (ArgumentException) { /* ok */ }
+            try { mt = MimeMediaType.Parse("aasdfaDF"); Assert.Fail(); }
+            catch (ArgumentException) { /* ok */ }
+            try { mt = MimeMediaType.Parse("*"); Assert.Fail(); }
+            catch (ArgumentException) { /* ok */ }
+        }
+
+        [Test]
+        public void Equals()
+        {
+            MimeMediaType mt = MimeMediaType.Parse("text/html");
+            Assert.AreEqual(MimeMediaType.Text.Html, mt);
+            Assert.AreEqual(MimeMediaType.Parse("text/html"), mt);
+
+            Assert.AreNotEqual(MimeMediaType.Parse("text/xml"), mt);
+        }
+
+        [Test]
+        public void GetHashcode()
+        {
+            MimeMediaType mt = MimeMediaType.Parse("text/html");
+            Assert.AreEqual(MimeMediaType.Text.Html.GetHashCode(), mt.GetHashCode());
+            Assert.AreEqual(MimeMediaType.Parse("text/html").GetHashCode(), mt.GetHashCode());
+
+            Assert.AreNotEqual(MimeMediaType.Parse("text/xml").GetHashCode(), mt.GetHashCode());
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Web/Support/PageHandlerFactoryTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/PageHandlerFactoryTests.cs
new file mode 100644
index 00000000..39606add
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Web/Support/PageHandlerFactoryTests.cs
@@ -0,0 +1,129 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Web;
+using System.IO;
+using NUnit.Extensions.Asp.AspTester;
+using NUnit.Framework;
+using NUnitAspEx;
+using Spring.TestSupport;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: PageHandlerFactoryTests.cs,v 1.4 2008/01/27 23:29:55 oakinger Exp $</version>
+    [AspTestFixture("/Test", "/Spring/Web/Support/PageHandlerFactoryTests")]
+    public class PageHandlerFactoryTests : WebFormTestCase
+    {
+        [Test]
+        public void DisablesSessions()
+        {
+            AspTestClient client = new AspTestClient();
+            // a session-less page - checks, if session is correctly disabled
+            string result = client.GetPage("DisablesSession.aspx");
+            Assert.AreEqual("OK", result);
+        }
+
+        [Test]
+        public void MaintainsSession()
+        {
+            AspTestClient client = new AspTestClient();
+            string result = client.GetPage("MaintainsSession1.aspx");
+            Assert.AreEqual("OK", result);
+            Assert.AreEqual("somevalue", AspTestContext.HttpContext.Session["maintainsSession"]);
+
+            // checks previously set session variable
+            result = client.GetPage("MaintainsSession2.aspx");
+            Assert.AreEqual("OK", result);
+        }
+
+        [Test]
+        public void BCLPageHandlerFactoryBehavior()
+        {
+            using (TestWebContext ctx = new TestWebContext("/Test", "DoesNotExist.oaspx"))
+            {
+                try
+                {
+                    IHttpHandlerFactory phf = (IHttpHandlerFactory)Activator.CreateInstance(typeof(System.Web.UI.Page).Assembly.GetType("System.Web.UI.PageHandlerFactory"), true);
+                    phf.GetHandler(HttpContext.Current, "GET", ctx.HttpWorkerRequest.GetFilePath(), ctx.HttpWorkerRequest.GetFilePathTranslated());
+                }
+#if NET_2_0
+                catch (HttpException e)
+                {
+                    Assert.AreEqual(404, e.GetHttpCode());
+                    Assert.IsTrue(e.Message.IndexOf(ctx.HttpWorkerRequest.GetFilePath()) > 0);
+                }
+#else
+                catch (FileNotFoundException)
+                {
+                }
+#endif
+            }
+        }
+
+        [Test]
+        public void PageHandlerFactoryBehavesLikeSystemPageHandlerFactory()
+        {
+            using (TestWebContext ctx = new TestWebContext("/Test", "DoesNotExist.aspx"))
+            {
+                try
+                {
+                    IHttpHandlerFactory phf = new PageHandlerFactory();
+                    phf.GetHandler(HttpContext.Current, "GET", ctx.HttpWorkerRequest.GetFilePath(), ctx.HttpWorkerRequest.GetFilePathTranslated());
+                }
+#if NET_2_0
+                catch (HttpException e)
+                {
+                    Assert.AreEqual(404, e.GetHttpCode());
+                    Assert.IsTrue(e.Message.IndexOf(ctx.HttpWorkerRequest.GetFilePath()) > 0);
+                }
+#else
+                catch (FileNotFoundException)
+                {
+                }
+#endif
+            }
+        }
+
+#if NET_2_0
+        [Test]
+        public void TransferAfterSetResult()
+        {
+            TextBoxTester name = new TextBoxTester("name", CurrentWebForm);
+            ButtonTester save = new ButtonTester("save", CurrentWebForm);
+
+            Browser.GetPage("asptest://localhost/TransferAfterSetResult.aspx");
+            // Note, that page TransferAfterSetResultSave.aspx has 'EnableViewStateMac="false"'
+            // otherwise ViewState validation will fail on a Server.Transfer during a Postback!
+            save.Click();
+            string result = Browser.CurrentPageText;
+            Assert.AreEqual("OK", result);
+        }
+#endif
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs
new file mode 100644
index 00000000..ea6a44b1
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs
@@ -0,0 +1,338 @@
+#region License
+
+/*
+ * Copyright © 2002-2005 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+
+#endregion
+
+namespace Spring.Web.Support
+{
+    /// <summary>
+    /// Unit tests for the Result class.
+    /// </summary>
+    /// <author>Rick Evans</author>
+    /// <version>$Id: ResultTests.cs,v 1.4 2007/04/19 07:49:36 oakinger Exp $</version>
+    [TestFixture]
+    public sealed class ResultTests
+    {
+        private const string ExpectedTargetPageName = "Foo.aspx";
+
+        [Test]
+        public void DoesItDefaultToTheDefaultResultMode()
+        {
+            Result result = new Result();
+            Assert.AreEqual(Result.DefaultResultMode, result.Mode, "Not defaulting to the default ResultMode.");
+        }
+
+        [Test]
+        public void DefaultsToTransferMode()
+        {
+            Assert.AreEqual(ResultMode.Transfer, Result.DefaultResultMode,
+                            "Hey! Be sure to change the documentation since you've " +
+                            "obviously gone and changed the default transfer mode.");
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void InstantiationBailsWithNullResultString()
+        {
+            new Result(null);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void InstantiationBailsWithEmptyResultString()
+        {
+            new Result(string.Empty);
+        }
+
+        [Test]
+        [ExpectedException(typeof (ArgumentNullException))]
+        public void InstantiationBailsWithAllWhitespaceResultString()
+        {
+            new Result("    \n\t   ");
+        }
+
+        [Test]
+        public void WithNoResultModeAndNoParameters()
+        {
+            Result result = new Result(ExpectedTargetPageName);
+            Assert.AreEqual(Result.DefaultResultMode, result.Mode, "Not defaulting to the default ResultMode.");
+            Assert.IsNull(result.Parameters,
+                          "No parameters were passed but the Parameters property appears to be set to a non-null value anyway.");
+            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+                            "The TargetPage property is not being correctly extracted " +
+                            "from the result string passed into the ctor.");
+        }
+
+        [Test]
+        public void WithWhitespacePageAndNoResultModeAndNoParameters()
+        {
+            Result result = new Result("   " + ExpectedTargetPageName + "\n");
+            Assert.AreEqual(Result.DefaultResultMode, result.Mode, "Not defaulting to the default ResultMode.");
+            Assert.IsNull(result.Parameters,
+                          "No parameters were passed but the Parameters property appears to be set to a non-null value anyway.");
+            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+                            "The TargetPage property is not being correctly extracted " +
+                            "from the result string passed into the ctor.");
+        }
+
+        [Test]
+        public void WithTransferResultModeButNoParameters()
+        {
+            Result result = new Result("transfer:" + ExpectedTargetPageName);
+            Assert.AreEqual(ResultMode.Transfer, result.Mode, "Not extracting the correct ResultMode " +
+                                                              "from the result string passed into the ctor.");
+            Assert.AreEqual(true, result.PreserveForm, "ResultMode.Transfer must result in PreserveForm being 'true'");
+            Assert.IsNull(result.Parameters,
+                          "No parameters were passed but the Parameters property appears to be set to a non-null value anyway.");
+            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+                            "The TargetPage property is not being correctly extracted " +
+                            "from the result string passed into the ctor.");
+        }
+
+        [Test]
+        public void WithTransferNoPreserveResultMode()
+        {
+            Result result = new Result( "transfernopreserve:" + ExpectedTargetPageName );
+            Assert.AreEqual( ResultMode.TransferNoPreserve,result.Mode,"Not extracting the correct ResultMode " +
+                                                              "from the result string passed into the ctor." );
+            Assert.AreEqual( false,result.PreserveForm,"ResultMode.TransferNoPreserver must result in PreserveForm being 'false'" );
+        }
+
+        [Test]
+        public void WithWhitespacedRedirectResultMode()
+        {
+            Result result = new Result("    redirect:" + ExpectedTargetPageName);
+            Assert.AreEqual(ResultMode.Redirect, result.Mode, "Not extracting the correct ResultMode " +
+                                                              "from the result string passed into the ctor.");
+            Assert.IsNull(result.Parameters,
+                          "No parameters were passed but the Parameters property appears to be set to a non-null value anyway.");
+            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+                            "The TargetPage property is not being correctly extracted " +
+                            "from the result string passed into the ctor.");
+        }
+
+        [Test]
+        public void WithRedirectResultMode()
+        {
+            Result result = new Result("redirect:" + ExpectedTargetPageName);
+            Assert.AreEqual(ResultMode.Redirect, result.Mode, "Not extracting the correct ResultMode " +
+                                                              "from the result string passed into the ctor.");
+            Assert.IsNull(result.Parameters,
+                          "No parameters were passed but the Parameters property appears to be set to a non-null value anyway.");
+            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+                            "The TargetPage property is not being correctly extracted " +
+                            "from the result string passed into the ctor.");
+        }
+
+		[Test]
+		[ExpectedException(typeof(ArgumentOutOfRangeException))]
+		public void WithRubbishResultMode()
+		{
+			// note the incorrect spelling of the result mode prefix...
+			new Result("redirct:" + ExpectedTargetPageName);
+		}
+
+        [Test]
+        public void WithResultModeAndEmptyParameterDelimiterOnly()
+        {
+            Result result = new Result("transfer:" + ExpectedTargetPageName + "?");
+            Assert.AreEqual(ResultMode.Transfer, result.Mode, "Not extracting the correct ResultMode " +
+                                                              "from the result string passed into the ctor.");
+            Assert.IsNull(result.Parameters,
+                          "No parameters were passed (just the parameter delimiter) but the " +
+                          "Parameters property appears to be set to a non-null value anyway.");
+            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+                            "The TargetPage property is not being correctly extracted " +
+                            "from the result string passed into the ctor.");
+        }
+
+        [Test]
+        public void WithResultModeAndWhitespaceParameterDelimiterOnly()
+        {
+            Result result = new Result("redirect:" + ExpectedTargetPageName + "?     ");
+            Assert.AreEqual(ResultMode.Redirect, result.Mode, "Not extracting the correct ResultMode " +
+                                                              "from the result string passed into the ctor.");
+            Assert.IsNull(result.Parameters,
+                          "No parameters were passed (just the parameter delimiter) but the " +
+                          "Parameters property appears to be set to a non-null value anyway.");
+            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+                            "The TargetPage property is not being correctly extracted " +
+                            "from the result string passed into the ctor.");
+        }
+
+        [Test]
+        public void WithNoResultModeAndWhitespaceParameterDelimiterOnly()
+        {
+            Result result = new Result(ExpectedTargetPageName + "?     ");
+            Assert.AreEqual(Result.DefaultResultMode, result.Mode, "Not defaulting to the default ResultMode.");
+            Assert.IsNull(result.Parameters,
+                          "No parameters were passed (just the parameter delimiter) but the " +
+                          "Parameters property appears to be set to a non-null value anyway.");
+            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+                            "The TargetPage property is not being correctly extracted " +
+                            "from the result string passed into the ctor.");
+        }
+
+        [Test]
+        public void WithNoResultModeAndOneParameter()
+        {
+            const string key = "id";
+            const string value = "Nina Persson";
+            Result result = new Result(ExpectedTargetPageName + "?" + key + "=" + value);
+            Assert.AreEqual(Result.DefaultResultMode, result.Mode, "Not defaulting to the default ResultMode.");
+            Assert.IsNotNull(result.Parameters,
+                             "Parameters were passed but the Parameters property appears to be null (incorrectly).");
+            Assert.AreEqual(1, result.Parameters.Count,
+                            "Wrong number of query parameters parsed (only supplied one key-value pair).");
+            Assert.IsTrue(result.Parameters.Contains(key), "The 'id' parameter is not being correctly extracted " +
+                                                           "from the result string passed into the ctor.");
+            Assert.AreEqual(value, result.Parameters[key]);
+            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+                            "The TargetPage property is not being correctly extracted " +
+                            "from the result string passed into the ctor.");
+        }
+
+        [Test]
+        public void WithTransferResultModeAndOneParameter()
+        {
+            const string key = "id";
+            const string value = "Nina Persson";
+            Result result = new Result("transfer:" + ExpectedTargetPageName + "?" + key + "=" + value);
+            Assert.AreEqual(ResultMode.Transfer, result.Mode, "Not extracting the correct ResultMode " +
+                                                              "from the result string passed into the ctor.");
+            Assert.IsNotNull(result.Parameters,
+                             "Parameters were passed but the Parameters property appears to be null (incorrectly).");
+            Assert.AreEqual(1, result.Parameters.Count,
+                            "Wrong number of query parameters parsed (only supplied one key-value pair).");
+            Assert.IsTrue(result.Parameters.Contains(key), "The 'id' parameter is not being correctly extracted " +
+                                                           "from the result string passed into the ctor.");
+            Assert.AreEqual(value, result.Parameters[key]);
+            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+                            "The TargetPage property is not being correctly extracted " +
+                            "from the result string passed into the ctor.");
+        }
+
+        [Test]
+        [Ignore("How does one escape ampersands then?")]
+        public void ParametersHavingEmbeddedCharactersThatHaveToBeEscaped()
+        {
+            const string key = "id";
+            const string value = "Nina Persson & The Cardigans"; // notice the use of the embedded '&'...
+            Result result = new Result(ExpectedTargetPageName + "?" + key + "=" + value);
+            Assert.AreEqual(Result.DefaultResultMode, result.Mode, "Not defaulting to the default ResultMode.");
+            Assert.IsNotNull(result.Parameters,
+                             "Parameters were passed but the Parameters property appears to be null (incorrectly).");
+//            Assert.AreEqual(1, result.Parameters.Count,
+//                            "Wrong number of query parameters parsed (only supplied one key-value pair).");
+//            Assert.IsTrue(result.Parameters.Contains(key), "The 'id' parameter is not being correctly extracted " +
+//                                                           "from the result string passed into the ctor.");
+//            Assert.AreEqual(value, result.Parameters[key]);
+//            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+//                            "The TargetPage property is not being correctly extracted " +
+//                            "from the result string passed into the ctor.");
+        }
+
+        [Test]
+        public void WithTransferResultModeAndTwoParametersSplitUsingAmpersand()
+        {
+            const string pKey1 = "id";
+            const string pValue1 = "Nina Persson";
+            const string pKey2 = "verdict";
+            const string pValue2 = "schwing";
+            Result result =
+                new Result(ExpectedTargetPageName + "?" + pKey1 + "=" + pValue1 + "&" + pKey2 + "=" + pValue2);
+            Assert.AreEqual(ResultMode.Transfer, result.Mode, "Not extracting the correct ResultMode " +
+                                                              "from the result string passed into the ctor.");
+            Assert.IsNotNull(result.Parameters,
+                             "Parameters were passed but the Parameters property appears to be null (incorrectly).");
+            Assert.AreEqual(2, result.Parameters.Count,
+                            "Wrong number of query parameters parsed (supplied two key-value pairs).");
+            Assert.IsTrue(result.Parameters.Contains(pKey1), "The 'id' parameter is not being correctly extracted " +
+                                                             "from the result string passed into the ctor.");
+            Assert.AreEqual(pValue1, result.Parameters[pKey1]);
+            Assert.IsTrue(result.Parameters.Contains(pKey2),
+                          "The 'verdict' parameter is not being correctly extracted " +
+                          "from the result string passed into the ctor.");
+            Assert.AreEqual(pValue2, result.Parameters[pKey2]);
+            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+                            "The TargetPage property is not being correctly extracted " +
+                            "from the result string passed into the ctor.");
+        }
+
+        [Test]
+        public void WithWhitespacedPageAndTransferResultModeAndTwoParametersUsingAmpersands()
+        {
+            const string pKey1 = "id";
+            const string pValue1 = "Nina Persson";
+            const string pKey2 = "verdict";
+            const string pValue2 = "schwing";
+            Result result =
+                new Result("\n" + ExpectedTargetPageName + "   ?" + pKey1 + "=" + pValue1 + "&" + pKey2 + "=" + pValue2);
+            Assert.AreEqual(ResultMode.Transfer, result.Mode, "Not extracting the correct ResultMode " +
+                                                              "from the result string passed into the ctor.");
+            Assert.IsNotNull(result.Parameters,
+                             "Parameters were passed but the Parameters property appears to be null (incorrectly).");
+            Assert.AreEqual(2, result.Parameters.Count,
+                            "Wrong number of query parameters parsed (supplied two key-value pairs).");
+            Assert.IsTrue(result.Parameters.Contains(pKey1), "The 'id' parameter is not being correctly extracted " +
+                                                             "from the result string passed into the ctor.");
+            Assert.AreEqual(pValue1, result.Parameters[pKey1]);
+            Assert.IsTrue(result.Parameters.Contains(pKey2),
+                          "The 'verdict' parameter is not being correctly extracted " +
+                          "from the result string passed into the ctor.");
+            Assert.AreEqual(pValue2, result.Parameters[pKey2]);
+            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+                            "The TargetPage property is not being correctly extracted " +
+                            "from the result string passed into the ctor.");
+        }
+
+        [Test]
+        public void WithWhitespacedPageAndTransferResultModeAndTwoParametersUsingCommas()
+        {
+            const string pKey1 = "id";
+            const string pValue1 = "Nina Persson";
+            const string pKey2 = "verdict";
+            const string pValue2 = "schwing";
+            Result result =
+                new Result("\n" + ExpectedTargetPageName + "   ?" + pKey1 + "=" + pValue1 + "," + pKey2 + "=" + pValue2);
+            Assert.AreEqual(ResultMode.Transfer, result.Mode, "Not extracting the correct ResultMode " +
+                                                              "from the result string passed into the ctor.");
+            Assert.IsNotNull(result.Parameters,
+                             "Parameters were passed but the Parameters property appears to be null (incorrectly).");
+            Assert.AreEqual(2, result.Parameters.Count,
+                            "Wrong number of query parameters parsed (supplied two key-value pairs).");
+            Assert.IsTrue(result.Parameters.Contains(pKey1), "The 'id' parameter is not being correctly extracted " +
+                                                             "from the result string passed into the ctor.");
+            Assert.AreEqual(pValue1, result.Parameters[pKey1]);
+            Assert.IsTrue(result.Parameters.Contains(pKey2),
+                          "The 'verdict' parameter is not being correctly extracted " +
+                          "from the result string passed into the ctor.");
+            Assert.AreEqual(pValue2, result.Parameters[pKey2]);
+            Assert.AreEqual(ExpectedTargetPageName, result.TargetPage,
+                            "The TargetPage property is not being correctly extracted " +
+                            "from the result string passed into the ctor.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Web/UI/Controls/AbstractValidationControlTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/Controls/AbstractValidationControlTests.cs
new file mode 100644
index 00000000..2f395ec7
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Web/UI/Controls/AbstractValidationControlTests.cs
@@ -0,0 +1,129 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using System.Web.UI;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Spring.Context;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: AbstractValidationControlTests.cs,v 1.1 2008/03/19 12:07:15 oakinger Exp $</version>
+    [TestFixture]
+    public class AbstractValidationControlTests
+    {
+        public class TestValidationControl : AbstractValidationControl
+        {
+            private IValidationContainer _vc;
+
+            public TestValidationControl()
+            {
+            }
+
+            public TestValidationControl(IValidationContainer testVc)
+            {
+                _vc = testVc;
+            }
+
+            protected override Spring.Web.UI.Validation.IValidationErrorsRenderer CreateValidationErrorsRenderer()
+            {
+                throw new Exception("The method or operation is not implemented.");
+            }
+
+            protected override IValidationContainer ValidationContainer
+            {
+                get
+                {
+                    if (_vc != null) return _vc;
+                    return base.ValidationContainer;
+                }
+            }
+
+            public IMessageSource TheMessageSource
+            {
+                get { return base.MessageSource; }
+            }
+
+            public IValidationContainer TheValidationContainer
+            {
+                get { return base.ValidationContainer; }
+            }
+        }
+
+        [Test]
+        public void ResolveValidationContainerToEnclosingParentRecursively()
+        {
+            // direct containment
+            UserControl uc = new UserControl();
+            TestValidationControl vc = new TestValidationControl();
+            uc.Controls.Add(vc);
+            Assert.AreSame(uc, vc.TheValidationContainer);
+
+            // indirect containment
+            uc = new UserControl();
+            vc = new TestValidationControl();
+            Control inBetweenControl = new Panel();
+            inBetweenControl.Controls.Add(vc);
+            uc.Controls.Add(inBetweenControl);
+            Assert.AreSame(uc, vc.TheValidationContainer);
+        }
+
+        [Test]
+        public void ResolveValidationContainerToEnclosingPageRecursively()
+        {
+            // direct containment
+            Page page = new Page();
+            TestValidationControl vc = new TestValidationControl();
+            page.Controls.Add(vc);
+            Assert.AreSame(page, vc.TheValidationContainer);
+
+            // indirect containment
+            page = new Page();
+            vc = new TestValidationControl();
+            Control inBetweenControl = new System.Web.UI.WebControls.Panel();
+            inBetweenControl.Controls.Add(vc);
+            page.Controls.Add(inBetweenControl);
+            Assert.AreSame(page, vc.TheValidationContainer);
+        }
+
+        [Test]
+        public void DefaultsToValidationContainerMessageSource()
+        {
+            MockRepository mocks = new MockRepository();
+            IMessageSource messageSource = (IMessageSource)mocks.DynamicMock(typeof(IMessageSource));
+            IValidationContainer container = (IValidationContainer)mocks.DynamicMock(typeof(IValidationContainer));
+            TestValidationControl ctl = new TestValidationControl(container);
+
+            Expect.Call(container.MessageSource).Return(messageSource);
+            mocks.ReplayAll();
+
+            Assert.AreEqual(messageSource, ctl.TheMessageSource);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Web/UI/Controls/HeadTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/Controls/HeadTests.cs
new file mode 100644
index 00000000..27c10ff8
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Web/UI/Controls/HeadTests.cs
@@ -0,0 +1,164 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.IO;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using NUnit.Framework;
+using Spring.TestSupport;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// Tests behaviour of the &lt;Head&gt; server control
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: HeadTests.cs,v 1.1 2007/11/28 23:26:28 oakinger Exp $</version>
+    [TestFixture]
+    public class HeadTests
+    {
+        private const string CRLF = "\r\n";
+
+#if NET_2_0
+        [Test]
+        public void DontRenderHeadTagIfNestedWithinStandardHeadControl()
+        {
+            using (new TestWebContext("/", "testpage.aspx"))
+            {
+                TestPage page = new TestPage(HttpContext.Current);
+                HtmlHead htmlHead = new HtmlHead();
+                Head head = new Head();
+                head.Controls.Add(new LiteralControl("literal child"));
+                htmlHead.Controls.Add(head);
+                page.Controls.Add(htmlHead);
+
+                // initialize page to force head control initialization
+                page.InitRecursive(null);
+                string result = page.Render(string.Empty);
+                string expect = @"<head>literal child<title></title></head>";
+                Assert.AreEqual(expect, result);
+            }
+        }
+#endif
+
+        [Test]
+        public void StyleBlockRendersTypeAttribute()
+        {
+            TestPage page = new TestPage();
+            Head head = new Head();
+            page.Controls.Add(head);
+
+            page.Styles.Add("stylename", "stylevalue");
+
+            string result = page.Render(string.Empty);
+            string expect = @"<head><style type=""text/css"">stylename { stylevalue }</style></head>";
+            Assert.AreEqual(expect, result);
+        }
+
+        [Test]
+        public void StyleFileRendersTypeAttributeAndUsesCssRootPath()
+        {
+            const string STYLESHEETPATH = "filepath";
+
+            using (new TestWebContext("/", "testpage.aspx"))
+            {
+                TestPage page = new TestPage(HttpContext.Current);
+                Head head = new Head();
+                page.Controls.Add(head);
+
+                page.CssRoot = "testcssroot";
+                page.StyleFiles.Add("filename", STYLESHEETPATH);
+
+                string result = page.Render(string.Empty);
+                string expect = string.Format(@"<head><link rel=""stylesheet"" type=""text/css"" href=""/testcssroot/{0}"" /></head>", STYLESHEETPATH);
+                Assert.AreEqual(expect, result);
+            }
+        }
+
+        [Test]
+        public void ScriptBlockRendersTypeAttribute()
+        {
+            TestPage page = new TestPage();
+            Head head = new Head();
+            page.Controls.Add(head);
+
+            page.RegisterHeadScriptBlock( "scriptname", "scriptcode" );
+
+            string result = page.Render(string.Empty);
+            string expect = @"<head><script type=""text/javascript"">scriptcode</script></head>";
+            Assert.AreEqual(expect, result);
+        }
+
+        [Test]
+        public void ScriptEventRendersTypeAttribute()
+        {
+            TestPage page = new TestPage();
+            Head head = new Head();
+            page.Controls.Add(head);
+
+            page.RegisterHeadScriptEvent("scriptname", "elementname", "eventname", "scriptcode");
+
+            string result = page.Render(string.Empty);
+            string expect = @"<head><script type=""text/javascript"" for=""elementname"" event=""eventname"">scriptcode</script></head>";
+            Assert.AreEqual(expect, result);
+        }
+
+        [Test]
+        public void ScriptFileRendersTypeAttributeAndUsesScriptsRootPath()
+        {
+            const string SCRIPTFILEPATH = "filepath";
+
+            using (new TestWebContext("/", "testpage.aspx"))
+            {
+                TestPage page = new TestPage(HttpContext.Current);
+                Head head = new Head();
+                page.Controls.Add(head);
+
+                page.ScriptsRoot = "testscriptroot";
+                page.RegisterHeadScriptFile("filename", SCRIPTFILEPATH);
+
+                string result = page.Render(string.Empty);
+                string expect = string.Format(@"<head><script type=""text/javascript"" src=""/testscriptroot/{0}""></script></head>", SCRIPTFILEPATH);
+                Assert.AreEqual(expect, result);
+            }
+        }
+
+        [Test]
+        public void RenderChildrenFirst()
+        {
+            TestPage page = new TestPage();
+            Head head = new Head();
+            page.Controls.Add(head);
+            
+            head.Controls.Add(new LiteralControl("literal child"));
+            page.Styles.Add("stylename", "stylevalue");
+
+            string result = page.Render(string.Empty);
+            string expect = @"<head>literal child<style type=""text/css"">stylename { stylevalue }</style></head>";
+            Assert.AreEqual( expect, result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationErrorTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationErrorTests.cs
new file mode 100644
index 00000000..c68393b0
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationErrorTests.cs
@@ -0,0 +1,118 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using Spring.Util;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// This control allows for suppressing output of the 'action' attribute.
+    /// </summary>
+    /// <remarks>
+    /// the 'action' attribute rendered by the default <see cref="HtmlForm"/> control causes troubles 
+    /// in case of URL-rewriting. See e.g. <a href="http://www.thescripts.com/forum/thread408777.html">'thescripts.com' forum</a>
+    /// and also <a href="http://opensource.atlassian.com/projects/spring/browse/SPRNET-560">JIRA SPRNET-560</a> for more info.
+    /// </remarks>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ValidationErrorTests.cs,v 1.1 2008/03/19 12:07:15 oakinger Exp $</version>
+    public class ValidationErrorTests : HtmlForm
+    {
+        private bool suppressAction = false;
+        private string action = null;
+
+        /// <summary>
+        /// Sets or Gets a value indicating if the 'action' attribute shall be rendered. Defaults to 'false'
+        /// </summary>
+        /// <remarks>
+        /// The following possibilites are available:
+        /// <list>
+        /// <item>If <see cref="SuppressAction"/> is 'true', rendering of the 'action' attribute is suppressed.</item>
+        /// <item>If <see cref="SuppressAction"/> is 'false' and <see cref="Action"/> is not set,
+        ///       'action' attribute will.be rendered to <see cref="HttpRequest.RawUrl"/>
+        /// </item>
+        /// <item>If <see cref="SuppressAction"/> is 'false' and <see cref="Action"/> is set,
+        ///       'action' attribute will.be rendered to <see cref="Action"/>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        public bool SuppressAction
+        {
+            get { return this.suppressAction; }
+            set { this.suppressAction = value; }
+        }
+
+        /// <summary>
+        /// Sets or Gets an explicit url to be rendered
+        /// </summary>
+        /// <remarks>
+        /// The url specified here is only rendered, if <see cref="SuppressAction"/> is true.
+        /// </remarks>
+        public string Action
+        {
+            get { return this.action; }
+            set { this.action = value; }
+        }
+
+        /// <summary>
+        /// Renders attributes but performs 'action' suppressing logic.
+        /// </summary>
+        /// <param name="writer"></param>
+        protected override void RenderAttributes(HtmlTextWriter writer)
+        {
+            base.RenderAttributes(new ActionSupressingHtmlTextWriter(writer));
+            if (!this.suppressAction)
+            {
+                string url = (StringUtils.HasText(this.action)) ? this.action : Context.Request.RawUrl;
+                writer.WriteAttribute("action", url, true);
+            }
+        }
+
+        #region Nested type: ActionSupressingHtmlTextWriter
+
+        /// <summary>
+        /// This wrapper suppresses output of 'action' attributes.
+        /// </summary>
+        private class ActionSupressingHtmlTextWriter : HtmlTextWriter
+        {
+            public ActionSupressingHtmlTextWriter(HtmlTextWriter wrappedWriter)
+                : base(wrappedWriter.InnerWriter)
+            {
+            }
+
+            public override void WriteAttribute(string name, string value, bool fEncode)
+            {
+                if (string.Compare(name, "action", true) != 0)
+                {
+                    base.WriteAttribute(name, value, fEncode);
+                }
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationErrorsTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationErrorsTests.cs
new file mode 100644
index 00000000..576b1dbc
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationErrorsTests.cs
@@ -0,0 +1,46 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Web.UI.Validation;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ValidationErrorsTests.cs,v 1.1 2008/03/19 12:07:15 oakinger Exp $</version>
+    [TestFixture]
+    public class ValidationErrorsTests
+    {
+        [Test]
+        public void DefaultsToSpanValidationErrorsRenderer()
+        {
+            ValidationError vs = new ValidationError();
+            Assert.AreEqual(typeof(SpanValidationErrorsRenderer), vs.Renderer.GetType());
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationSummaryTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationSummaryTests.cs
new file mode 100644
index 00000000..5e5172bc
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Web/UI/Controls/ValidationSummaryTests.cs
@@ -0,0 +1,46 @@
+#region License
+
+/*
+ * Copyright © 2002-2008 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
+
+#region Imports
+
+using System;
+using NUnit.Framework;
+using Spring.Web.UI.Validation;
+
+#endregion
+
+namespace Spring.Web.UI.Controls
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: ValidationSummaryTests.cs,v 1.1 2008/03/19 12:07:17 oakinger Exp $</version>
+    [TestFixture]
+    public class ValidationSummaryTests
+    {
+        [Test]
+        public void DefaultsToDivValidationErrorsRenderer()
+        {
+            ValidationSummary vs = new ValidationSummary();
+            Assert.AreEqual(typeof (DivValidationErrorsRenderer), vs.Renderer.GetType());
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Web.Tests/Web/UI/PageTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/PageTests.cs
new file mode 100644
index 00000000..adb01c75
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Web/UI/PageTests.cs
@@ -0,0 +1,122 @@
+#region License
+
+/*
+ * Copyright 2002-2005 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
+
+#region Imports
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Threading;
+using System.Web;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Spring.Globalization;
+using Spring.Globalization.Resolvers;
+using Spring.Objects;
+using Spring.TestSupport;
+using Spring.Validation;
+using Spring.Web.Support;
+
+#endregion
+
+namespace Spring.Web.UI
+{
+    /// <summary>
+    /// Unit tests for the Page class.
+    /// </summary>
+    /// <author>Goran Milosavljevic</author>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: PageTests.cs,v 1.7 2008/03/15 11:19:39 oakinger Exp $</version>
+    [TestFixture]
+    public class PageTests : TestWebContextTests
+    {
+        [Test]
+        public void Validate()
+        {           
+            Page page = new TestPage(HttpContext.Current);
+            IValidator[] validators = new IValidator[] {new RequiredValidator("Name", null), new ConditionValidator("Loan == 0", "Age > 21")};
+            Contact contact = new Contact("Goran", 24, 0);
+            bool result = page.Validate(contact, validators);
+            Assert.IsTrue(result);
+
+            contact = new Contact(null, 24, 0);
+            result = page.Validate(contact, validators);
+            Assert.IsFalse(result);
+
+            contact = new Contact("Goran", 24, 1);
+            result = page.Validate(contact, validators);
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void DefaultsToDefaultWebCultureResolver()
+        {
+            TestPage page = new TestPage();
+            Assert.AreEqual( typeof(DefaultWebCultureResolver), page.CultureResolver.GetType() );            
+        }
+
+        [Test]
+        public void AllowsNeutralUserCulture()
+        {
+            TestPage page = new TestPage();
+            // DefaultWebCultureResolver does not allow culture to be set
+            page.CultureResolver = new DefaultCultureResolver();
+            page.UserCulture = new CultureInfo("de");
+            
+            page.InitializeCulture();
+            Assert.AreEqual( page.UserCulture, Thread.CurrentThread.CurrentUICulture );
+            Assert.AreEqual( CultureInfo.CreateSpecificCulture(page.UserCulture.Name), Thread.CurrentThread.CurrentCulture);
+        }
+
+        [Test]
+        public void SetResultThrowsVerboseExceptionOnUnknownResultName()
+        {
+            string RESULTNAME = "nonexistant result";
+
+            TestPage page = new TestPage();
+            try
+            {
+                page.SetResult(RESULTNAME);
+                Assert.Fail();
+            }
+            catch(ArgumentException ae)
+            {
+                string expected = string.Format("No URL mapping found for the specified result '{0}'.", RESULTNAME);
+                string msg = ae.Message.Substring(0, expected.Length);
+                Assert.AreEqual(expected, msg);
+            }
+        }
+
+        [Test]
+        public void SetResultSelectsCorrectResult()
+        {
+            MockRepository mocks = new MockRepository();
+            TestPage page = new TestPage();
+
+            Result theResult = (Result) mocks.CreateMock(typeof (Result));
+            theResult.Navigate(page);
+            mocks.ReplayAll();
+
+            page.Results.Add( "theResult", theResult );
+            page.SetResult("theResult");
+            mocks.VerifyAll();
+        }
+    }
+}
diff --git a/test/Spring/Spring.Web.Tests/Web/UI/UserControlTests.cs b/test/Spring/Spring.Web.Tests/Web/UI/UserControlTests.cs
new file mode 100644
index 00000000..c8750d97
--- /dev/null
+++ b/test/Spring/Spring.Web.Tests/Web/UI/UserControlTests.cs
@@ -0,0 +1,111 @@
+#region License
+
+/*
+ * Copyright © 2002-2007 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
+
+#region Imports
+
+using System.Web;
+using System.Web.UI;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Spring.TestSupport;
+using Spring.Validation;
+using Spring.Web.Support;
+
+#endregion
+
+namespace Spring.Web.UI
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <author>Erich Eichinger</author>
+    /// <version>$Id: UserControlTests.cs,v 1.2 2008/03/15 11:19:39 oakinger Exp $</version>
+    [TestFixture]
+    public class UserControlTests : TestWebContextTests
+    {
+        public class TestUserControl : UserControl
+        {
+            public TestUserControl()
+            {
+            }
+
+            public TestUserControl(Control parent)
+            {
+                parent.Controls.Add(this);
+            }
+
+            public new void SetResult(string name)
+            {
+                base.SetResult(name);
+            }
+        }
+
+        [Test]
+        public void SetResultSelectsCorrectResult()
+        {
+            MockRepository mocks = new MockRepository();
+            TestUserControl uc = new TestUserControl();
+            Result theResult = (Result)mocks.CreateMock(typeof(Result));
+
+            using (mocks.Ordered())
+            {
+                theResult.Navigate(uc);
+            }
+            mocks.ReplayAll();
+
+            uc.Results.Add("theResult", theResult);
+            uc.SetResult("theResult");
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void SetResultBubblesUpHierarchyUntilFirstMatch()
+        {
+            MockRepository mocks = new MockRepository();
+            TestUserControl c1 = new TestUserControl();
+            Control c11 = new Control(); c1.Controls.Add(c11);
+            TestUserControl c111 = new TestUserControl(c11);
+            Result theResult = (Result)mocks.CreateMock(typeof(Result));
+
+            using (mocks.Ordered())
+            {
+                theResult.Navigate(c1);
+            }
+            mocks.ReplayAll();
+
+            c1.Results.Add("theResult", theResult);
+            c111.SetResult("theResult");
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void ValidateSetsDefaultVariables()
+        {
+            TestPage page = new TestPage(HttpContext.Current);
+            TestUserControl c1 = new TestUserControl();
+            page.Controls.Add(c1);
+
+            ConditionValidator v1 = new ConditionValidator("#page == #this.Page", null);
+            ConditionValidator v2 = new ConditionValidator("#usercontrol == #this", null);
+
+            Assert.IsTrue(c1.Validate(c1, v1, v2));
+        }
+    }
+}
\ No newline at end of file